From: Michael Wagner <michael@wagnertech.de>
Date: Sat, 6 Jun 2026 13:23:50 +0000 (+0200)
Subject: date error in mapping
X-Git-Tag: mfinanz-mebil_0.2-2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/refs/heads/master?hp=6982501f82e4e2383a69aae3286275b7e9f66475

date error in mapping
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..ea87793ba
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,36 @@
+on:
+  push:
+    branches:
+    - "**"
+  pull_request:
+    branches:
+    - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: kivi-tests
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Installiere Perl Module und Postgresql
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo add-apt-repository universe
+          sudo apt-get update
+          sudo apt-get install postgresql postgresql-contrib libtest-deep-perl libtest-exception-perl libtest-output-perl libwww-perl liburi-find-perl libsys-cpu-perl libthread-pool-simple-perl libdbi-perl liblist-moreutils-perl libyaml-perl libregexp-ipv6-perl libpbkdf2-tiny-perl librose-object-perl librose-db-perl librose-db-object-perl libdigest-perl-md5-perl liblist-utilsby-perl libalgorithm-checkdigits-perl libhtml-restrict-perl libfile-slurp-perl libsort-naturally-perl libmath-round-perl libtext-csv-xs-perl libtemplate-perl libcam-pdf-perl libxml-libxml-perl libxml-writer-perl libemail-address-perl libemail-mime-perl libarchive-zip-perl libimager-perl libimager-qrcode-perl libstring-shellquote-perl libgd-gd2-perl libimage-info-perl libconfig-std-perl libdbd-pg-perl libdatetime-event-cron-perl libfile-copy-recursive-perl librest-client-perl libipc-run-perl libfile-mimeinfo-perl libencode-imaputf7-perl libmail-imapclient-perl libhttp-dav-perl libpdf-api2-perl libppi-perl cpanminus libuuid-tiny-perl
+      - name: install cpan modules that don't have deb packages
+        run: |
+          cpanm -L ${{ runner.temp }}/cpan HTML::Query
+      - name: Configurieren
+        run: |
+          cp config/kivitendo.conf.default config/kivitendo.conf
+          sed -i '/db[ ]*=/ s/$/ testdb/; /host/ s/localhost/127\.0\.0\.1/' config/kivitendo.conf
+          sudo sed -i '/host[ ]*all[ ]*all[ ]*127/s/scram-sha-256/trust/' /etc/postgresql/14/main/pg_hba.conf
+      - name: Postgresql starten
+        run: sudo service postgresql start
+      - name: Starten der Tests...
+        run: t/test.pl
+        env:
+          PERL5LIB: ${{ runner.temp }}/cpan/lib/perl5
diff --git a/.gitignore b/.gitignore
index 5c8f7d824..0783c911f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@
 /users/session_files/
 /users/templates-cache/
 /users/templates-cache-for-tests/
-/users/xvfb_display
+/users/texmf/
 /webdav/*
 crm
 pod2html*
diff --git a/.mailmap b/.mailmap
index bfb19e55b..aea483408 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,6 +34,9 @@ Roman Karuschka <karuschka@ok-it-services.de> Roman Karushka <karuschka@ok-it-se
 Roman Karuschka <karuschka@ok-it-services.de> roman <roman@omega.ok-it-services.de>
 Sven Schöling <s.schoeling@googlemail.com> <s.schoeling@linet-services.de>
 Sven Schöling <s.schoeling@googlemail.com> <sven.schoeling@opendynamic.de>
+Tamino Steinert <tamino.steinert@tamino.st> Tamino <tamino.steinert@web.de>
+Tamino Steinert <tamino.steinert@tamino.st> Tamino <tamino.steinert@tamino.st>
+Tamino Steinert <tamino.steinert@tamino.st> Tamino Steinert <74305567+z4m1n0@users.noreply.github.com>
 Timo Eickmeyer <timo@kivitendo-premium.de> T. Eickmeyer <timo@kivitendo-premium.de>
 Waldemar Toews <waldemar.toews@opendynamic.de> <toews@erp-d300.opendynamic.local>
 Wulf Coulmann <wulf@coulmann.de> Wulf <wulf@coulmann.de>
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..37c0afc19
--- /dev/null
+++ b/README.md
@@ -0,0 +1,40 @@
+<div align="center">
+<h1> kivitendo-erp </h1>
+<img src="image/kivitendo.png"><br>
+A Web-based ERP system for the German market.<br><br>
+</div>
+
+**kivitendo is a basic ERP system capable of handling:**
+
+- articles
+- goods
+- customers
+- suppliers
+- stock
+- offers
+- invoices
+- collection
+- booking preparation for financial accounting
+- contacts with basic CRM functions and much more.
+
+Although kivitendo is developed for the German speaking market, the UI is also available in English.
+
+## Online demo
+
+You can try it out [here](https://www.kivitendo.de/controller.pl?action=LoginScreen/user_login).
+
+## Installation
+
+An in depth installation guide can be found in the documentation (in German).
+
+You can also use our [ansible-playbook](https://github.com/kivitendo/kivitendo-ansible) to install it on an Ubuntu base.
+
+## Documentation
+
+Documentation for installation and configuration is only available in German, and can be found [here](https://www.kivitendo.de/kivi/doc/html/).
+
+The API is mostly documented in English in POD format and can be accessed with the perldoc command.
+
+## Mailing list
+
+To be updated regularly you can sign up for our mailing list [here](https://sourceforge.net/projects/lx-office/lists/lx-office-devel).
diff --git a/SL/AM.pm b/SL/AM.pm
index 2d8ed4cff..56faba3b2 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -57,6 +57,7 @@ use SL::Helper::UserPreferences::PositionsScrollbar;
 use SL::Helper::UserPreferences::PartPickerSearch;
 use SL::Helper::UserPreferences::TimeRecording;
 use SL::Helper::UserPreferences::UpdatePositions;
+use SL::Helper::UserPreferences::ItemInputPosition;
 
 use strict;
 
@@ -90,14 +91,17 @@ sub get_account {
     my $chart_obj = SL::DB::Manager::Chart->find_by(id => $form->{id}) || die "Can't open chart";
 
     my @chart_fields = qw(accno description charttype category link pos_bilanz
-                          pos_eur pos_er new_chart_id valid_from pos_bwa datevautomatik);
+                          pos_eur pos_er new_chart_id valid_from pos_bwa datevautomatik
+                          invalid);
     foreach my $cf ( @chart_fields ) {
       $form->{"$cf"} = $chart_obj->$cf;
     }
 
     my $active_taxkey = $chart_obj->get_active_taxkey;
-    $form->{$_}  = $active_taxkey->$_ foreach qw(taxkey_id pos_ustva tax_id startdate);
-    $form->{tax} = $active_taxkey->tax_id . '--' . $active_taxkey->taxkey_id;
+    if ($active_taxkey) {
+      $form->{$_}  = $active_taxkey->$_ foreach qw(taxkey_id pos_ustva tax_id startdate);
+      $form->{tax} = $active_taxkey->tax_id . '--' . $active_taxkey->taxkey_id;
+    }
 
     # check if there are any transactions for this chart
     $form->{orphaned} = $chart_obj->has_transaction ? 0 : 1;
@@ -232,7 +236,8 @@ sub _save_account {
                   pos_er = ?,
                   new_chart_id = ?,
                   valid_from = ?,
-                  datevautomatik = ?
+                  datevautomatik = ?,
+                  invalid = ?
                 WHERE id = ?|;
 
     @values = (
@@ -248,6 +253,7 @@ sub _save_account {
                   conv_i($form->{new_chart_id}),
                   conv_date($form->{valid_from}),
                   ($form->{datevautomatik} eq 'T') ? 'true':'false',
+                  $form->{invalid} ? 'true' : 'false',
                 $form->{id},
     );
 
@@ -556,6 +562,18 @@ sub longdescription_dialog_size_percentage {
   SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
 }
 
+sub layout_style {
+  SL::Helper::UserPreferences::DisplayPreferences->new()->get_layout_style();
+}
+
+sub part_picker_search_all_as_list_default {
+  SL::Helper::UserPreferences::PartPickerSearch->new()->get_all_as_list_default();
+}
+
+sub order_item_input_position {
+  SL::Helper::UserPreferences::ItemInputPosition->new()->get_order_item_input_position();
+}
+
 sub save_preferences {
   $main::lxdebug->enter_sub();
 
@@ -599,6 +617,15 @@ sub save_preferences {
   if (exists $form->{longdescription_dialog_size_percentage}) {
     SL::Helper::UserPreferences::DisplayPreferences->new()->store_longdescription_dialog_size_percentage($form->{longdescription_dialog_size_percentage})
   }
+  if (exists $form->{layout_style}) {
+    SL::Helper::UserPreferences::DisplayPreferences->new()->store_layout_style($form->{layout_style})
+  }
+  if (exists $form->{part_picker_search_all_as_list_default}) {
+    SL::Helper::UserPreferences::PartPickerSearch->new()->store_all_as_list_default($form->{part_picker_search_all_as_list_default})
+  }
+  if (exists $form->{order_item_input_position}) {
+    SL::Helper::UserPreferences::ItemInputPosition->new()->store_order_item_input_position($form->{order_item_input_position})
+  }
 
   $main::lxdebug->leave_sub();
 
@@ -1393,7 +1420,8 @@ sub get_warehouse {
        UNION
        SELECT DISTINCT bin_id, TRUE AS in_use FROM parts
      ) use ON use.bin_id = b.id
-     WHERE b.warehouse_id = ?;
+     WHERE b.warehouse_id = ?
+     ORDER by description;
 SQL
 
   $form->{BINS} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
diff --git a/SL/AP.pm b/SL/AP.pm
index d399b7c1b..753c94b5f 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -44,11 +44,14 @@ use SL::DB::Default;
 use SL::DB::Draft;
 use SL::DB::Order;
 use SL::DB::PurchaseInvoice;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
 use SL::Util qw(trim);
 use SL::DB;
 use Data::Dumper;
 use List::Util qw(sum0);
 use strict;
+use URI::Escape;
 
 sub post_transaction {
   my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
@@ -63,6 +66,16 @@ sub post_transaction {
 sub _post_transaction {
   my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my $payments_only = $params{payments_only};
   my $dbh = $provided_dbh || SL::DB->client->dbh;
 
@@ -71,14 +84,50 @@ sub _post_transaction {
 
   $form->{defaultcurrency} = $form->get_default_currency($myconfig);
   $form->{taxincluded} = 0 unless $form->{taxincluded};
+  $form->{script}      = 'ap.pl' unless $form->{script};
+
+  # make sure to have a id
+  my ($query, $sth, @values);
+  if (!$payments_only) {
+    # if we have an id delete old records
+    if ($form->{id}) {
 
+      # delete detail records
+      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+      do_query($form, $dbh, $query, $form->{id});
+
+    } else {
+
+      ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
+
+      $query =
+        qq|INSERT INTO ap (id, invnumber, employee_id,currency_id, taxzone_id) | .
+        qq|VALUES (?, ?, (SELECT e.id FROM employee e WHERE e.login = ?),
+                      (SELECT id FROM currencies WHERE name = ?), (SELECT taxzone_id FROM vendor WHERE id = ?) )|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{invnumber}, $::myconfig{login}, $form->{currency}, $form->{vendor_id});
+
+    }
+  }
+  # check default or record exchangerate
   if ($form->{currency} eq $form->{defaultcurrency}) {
     $form->{exchangerate} = 1;
   } else {
     $exchangerate         = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'sell');
-    $form->{exchangerate} = $exchangerate || $form->parse_amount($myconfig, $form->{exchangerate});
+    $form->{exchangerate} = $form->parse_amount($myconfig, $form->{exchangerate}, 5);
+
+    # if default exchangerate is not defined, define one
+    unless ($exchangerate) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0,  $form->{exchangerate});
+      # delete records exchangerate -> if user sets new invdate for record
+      $query = qq|UPDATE ap set exchangerate = NULL where id = ?|;
+      do_query($form, $dbh, $query, $form->{"id"});
+    }
+    # update record exchangerate, if the default is set and differs from current
+    if ($exchangerate && ($form->{exchangerate} != $exchangerate)) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate},
+                                 0, $form->{exchangerate}, $form->{id}, 'ap');
+    }
   }
-
   # get the charts selected
   $form->{AP_amounts}{"amount_$_"} = $form->{"AP_amount_chart_id_$_"} for (1 .. $form->{rowcount});
 
@@ -110,39 +159,13 @@ sub _post_transaction {
   # amount for total AP
   $form->{payables} = $form->{invtotal};
 
-  # update exchangerate
-  if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0,
-                               $form->{exchangerate});
-  }
-
-  my ($query, $sth, @values);
-
   if (!$payments_only) {
-    # if we have an id delete old records
-    if ($form->{id}) {
-
-      # delete detail records
-      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-      do_query($form, $dbh, $query, $form->{id});
-
-    } else {
-
-      ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
-
-      $query =
-        qq|INSERT INTO ap (id, invnumber, employee_id,currency_id, taxzone_id) | .
-        qq|VALUES (?, ?, (SELECT e.id FROM employee e WHERE e.login = ?),
-                      (SELECT id FROM currencies WHERE name = ?), (SELECT taxzone_id FROM vendor WHERE id = ?) )|;
-      do_query($form, $dbh, $query, $form->{id}, $form->{invnumber}, $::myconfig{login}, $form->{currency}, $form->{vendor_id});
-
-    }
-
     $query = qq|UPDATE ap SET invnumber = ?,
                 transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, deliverydate = ?, tax_point = ?, paid = ?, netamount = ?,
                 currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
-                globalproject_id = ?, direct_debit = ?, payment_id = ?, transaction_description = ?
+                globalproject_id = ?, direct_debit = ?, payment_id = ?, transaction_description = ?, intnotes = ?,
+                qrbill_data = ?
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),
@@ -154,6 +177,8 @@ sub _post_transaction {
                   $form->{storno_id}, conv_i($form->{globalproject_id}),
                   $form->{direct_debit} ? 't' : 'f',
                   conv_i($form->{payment_id}), $form->{transaction_description},
+                  $form->{intnotes},
+                  $form->{qrbill_data_encoded} ? uri_unescape($form->{qrbill_data_encoded}) : undef,
                   $form->{id});
     do_query($form, $dbh, $query, @values);
 
@@ -161,7 +186,7 @@ sub _post_transaction {
 
     # Link this record to the record it was created from.
     my $convert_from_oe_id = delete $form->{convert_from_oe_id};
-    if (!$form->{postasnew} && $convert_from_oe_id) {
+    if ($convert_from_oe_id) {
       RecordLinks->create_links('dbh'        => $dbh,
                                 'mode'       => 'ids',
                                 'from_table' => 'oe',
@@ -201,7 +226,7 @@ sub _post_transaction {
                    $form->{"AP_amount_chart_id_$i"});
         do_query($form, $dbh, $query, @values);
 
-        if ($form->{"tax_$i"} != 0) {
+        if ($form->{"tax_$i"} != 0 && !$form->{"reverse_charge_$i"}) {
           # insert detail records in acc_trans
           $query =
             qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
@@ -408,7 +433,7 @@ sub _post_transaction {
   }
 
   # hook for taxkey 94
-  $self->_reverse_charge($myconfig, $form);
+  $self->_reverse_charge($myconfig, $form) unless $payments_only;
   # safety check datev export
   if ($::instance_conf->get_datev_check_on_ap_transaction) {
     my $datev = SL::DATEV->new(
@@ -422,6 +447,9 @@ sub _post_transaction {
     }
   }
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   return 1;
 }
 
@@ -526,7 +554,7 @@ sub ap_transactions {
   my $query =
     qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
     qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
-    qq|  a.globalproject_id, a.storno, a.storno_id, a.direct_debit, | .
+    qq|  a.intnotes, a.globalproject_id, a.storno, a.storno_id, a.direct_debit, | .
     qq|  a.transaction_description, a.itime::DATE AS insertdate, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  e.name AS employee, | .
@@ -622,6 +650,10 @@ sub ap_transactions {
     $where .= " AND a.taxzone_id = ?";
     push(@values, $form->{taxzone_id});
   }
+  if ($form->{payment_id}) {
+    $where .= " AND a.payment_id = ?";
+    push(@values, $form->{payment_id});
+  }
   if ($form->{transaction_description}) {
     $where .= " AND a.transaction_description ILIKE ?";
     push(@values, like($form->{transaction_description}));
@@ -630,6 +662,10 @@ sub ap_transactions {
     $where .= " AND a.notes ILIKE ?";
     push(@values, like($form->{notes}));
   }
+  if ($form->{intnotes}) {
+    $where .= " AND a.intnotes ILIKE ?";
+    push(@values, like($form->{intnotes}));
+  }
   if ($form->{project_id}) {
     $where .=
       qq| AND ((a.globalproject_id = ?) OR EXISTS | .
@@ -658,6 +694,22 @@ sub ap_transactions {
     $where .= " AND a.duedate <= ?";
     push(@values, trim($form->{duedateto}));
   }
+  if ($form->{datepaidfrom}) {
+    $where .= " AND a.datepaid >= ?";
+    push(@values, trim($form->{datepaidfrom}));
+  }
+  if ($form->{datepaidto}) {
+    $where .= " AND a.datepaid <= ?";
+    push(@values, trim($form->{datepaidto}));
+  }
+  if ($form->{insertdatefrom}) {
+    $where .= " AND a.itime >= ?";
+    push(@values, trim($form->{insertdatefrom}));
+  }
+  if ($form->{insertdateto}) {
+    $where .= " AND a.itime <= ?";
+    push(@values, trim($form->{insertdateto}));
+  }
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});
@@ -665,6 +717,29 @@ sub ap_transactions {
     }
   }
 
+  $form->{fulltext} = trim($form->{fulltext});
+  if ($form->{fulltext}) {
+    my @fulltext_fields = qw(a.notes
+                             a.intnotes
+                             a.shipvia
+                             a.transaction_description
+                             a.quonumber
+                             a.ordnumber
+                             a.invnumber);
+    $where .= ' AND (';
+    $where .= join ' OR ', map {"$_ ILIKE ?"} @fulltext_fields;
+
+    $where .= <<SQL;
+      OR EXISTS (
+        SELECT files.id FROM files LEFT JOIN file_full_texts ON (file_full_texts.file_id = files.id)
+          WHERE files.object_id = a.id AND files.object_type = 'purchase_invoice'
+            AND file_full_texts.full_text ILIKE ?)
+SQL
+    $where .= ')'; # end AND
+
+    push(@values, like($form->{fulltext})) for 1 .. (scalar @fulltext_fields) + 1;
+  }
+
   if ($form->{parts_partnumber}) {
     $where .= <<SQL;
  AND EXISTS (
@@ -702,7 +777,7 @@ SQL
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
   my $sortorder = join(', ', map { "$_ $sortdir" } @a);
 
-  if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department taxzone))) {
+  if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department taxzone insertdate))) {
     $sortorder = $form->{sort} . " $sortdir";
   }
 
@@ -712,6 +787,26 @@ SQL
 
   $form->{AP} = [ @result ];
 
+  if ($form->{l_items} && scalar @{ $form->{AP} }) {
+    my ($items_query, $items_sth);
+    if ($form->{l_items}) {
+      $items_query =
+        qq|SELECT id
+          FROM invoice
+          WHERE trans_id  = ?
+          ORDER BY position|;
+
+      $items_sth = prepare_query($form, $dbh, $items_query);
+    }
+
+    foreach my $ap (@{ $form->{AP} }) {
+      do_statement($form, $items_sth, $items_query, $ap->{id});
+      $ap->{item_ids} = $dbh->selectcol_arrayref($items_sth);
+      $ap->{item_ids} = undef if !@{$ap->{item_ids}};
+    }
+    $items_sth->finish();
+  }
+
   $main::lxdebug->leave_sub();
 }
 
@@ -895,6 +990,8 @@ sub setup_form {
         $form->{"forex_$j"}           = $form->{"exchangerate_$i"};
         $form->{"AP_paid_$j"}         = $form->{acc_trans}{$key}->[$i-1]->{accno};
         $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
+        $form->{"defaultcurrency_paid_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{defaultcurrency_paid};
+        $form->{"fx_transaction_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{fx_transaction};
         $form->{paidaccounts}++;
 
       } else {
@@ -1016,6 +1113,19 @@ sub _storno {
 
   map { IO->set_datepaid(table => 'ap', id => $_, dbh => $dbh) } ($id, $new_id);
 
+  if ($form->{workflow_email_journal_id}) {
+    my $ap_transaction_storno = SL::DB::PurchaseInvoice->new(id => $new_id)->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{workflow_email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $ap_transaction_storno,
+      delete $form->{workflow_email_attachment_id}
+    );
+    $form->{callback} = delete $form->{workflow_email_callback};
+  }
+
+  $form->{storno_id} = $id;
   return 1;
 }
 
diff --git a/SL/AR.pm b/SL/AR.pm
index db8a4aca7..95a2cefba 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -42,6 +42,9 @@ use SL::DB::Draft;
 use SL::IO;
 use SL::MoreCommon;
 use SL::DB::Default;
+use SL::DB::Invoice;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
 use SL::TransNumber;
 use SL::Util qw(trim);
 use SL::DB;
@@ -61,21 +64,67 @@ sub post_transaction {
 sub _post_transaction {
   my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my $payments_only = $params{payments_only};
 
   my ($query, $sth, $null, $taxrate, $amount, $tax);
   my $exchangerate = 0;
   my $i;
+  $form->{script}      = 'ar.pl' unless $form->{script};
 
   my @values;
 
   my $dbh = $provided_dbh || SL::DB->client->dbh;
-  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
 
-  # set exchangerate
-  $form->{exchangerate} = ($form->{currency} eq $form->{defaultcurrency}) ? 1 :
-      ( $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy') ||
-        $form->parse_amount($myconfig, $form->{exchangerate}) );
+  # if we have an id delete old records else make one
+  if (!$payments_only) {
+    if ($form->{id}) {
+      # delete detail records
+      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
+      do_query($form, $dbh, $query, $form->{id});
+
+    } else {
+      $query = qq|SELECT nextval('glid')|;
+      ($form->{id}) = selectrow_query($form, $dbh, $query);
+      $query = qq|INSERT INTO ar (id, invnumber, employee_id, currency_id, taxzone_id) VALUES (?, 'dummy', ?, (SELECT id FROM currencies WHERE name=?), (SELECT taxzone_id FROM customer WHERE id = ?))|;
+      do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{currency}, $form->{customer_id});
+      if (!$form->{invnumber}) {
+        my $trans_number   = SL::TransNumber->new(type => 'invoice', dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
+        $form->{invnumber} = $trans_number->create_unique;
+      }
+    }
+  }
+
+  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
+  # check default or record exchangerate
+  if ($form->{currency} eq $form->{defaultcurrency}) {
+    $form->{exchangerate} = 1;
+  } else {
+    $exchangerate         = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
+    $form->{exchangerate} = $form->parse_amount($myconfig, $form->{exchangerate}, 5);
+
+    # if default exchangerate is not defined, define one
+    unless ($exchangerate) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
+      # delete records exchangerate -> if user sets new invdate for record
+      $query = qq|UPDATE ar set exchangerate = NULL where id = ?|;
+      do_query($form, $dbh, $query, $form->{"id"});
+    }
+    # update record exchangerate, if the default is set and differs from current
+    if ($exchangerate && ($form->{exchangerate} != $exchangerate)) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate},
+                                 $form->{exchangerate}, 0,  $form->{id}, 'ar');
+    }
+  }
 
   # get the charts selected
   $form->{AR_amounts}{"amount_$_"} = $form->{"AR_amount_chart_id_$_"} for (1 .. $form->{rowcount});
@@ -104,32 +153,11 @@ sub _post_transaction {
 
   $form->get_employee($dbh) unless $form->{employee_id};
 
-  # if we have an id delete old records else make one
-  if (!$payments_only) {
-    if ($form->{id}) {
-      # delete detail records
-      $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
-      do_query($form, $dbh, $query, $form->{id});
 
-    } else {
-      $query = qq|SELECT nextval('glid')|;
-      ($form->{id}) = selectrow_query($form, $dbh, $query);
-      $query = qq|INSERT INTO ar (id, invnumber, employee_id, currency_id, taxzone_id) VALUES (?, 'dummy', ?, (SELECT id FROM currencies WHERE name=?), (SELECT taxzone_id FROM customer WHERE id = ?))|;
-      do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{currency}, $form->{customer_id});
-      if (!$form->{invnumber}) {
-        my $trans_number   = SL::TransNumber->new(type => 'invoice', dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
-        $form->{invnumber} = $trans_number->create_unique;
-      }
-    }
-  }
 
   # amount for AR account
   $form->{receivables} = $form->round_amount($form->{amount}, 2) * -1;
 
-  # update exchangerate
-  $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0)
-    if ($form->{currency} ne $form->{defaultcurrency}) && !$form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, 'buy');
-
   if (!$payments_only) {
     $query =
       qq|UPDATE ar set
@@ -337,6 +365,9 @@ sub _post_transaction {
     }
   }
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   return 1;
 }
 
@@ -491,13 +522,15 @@ sub ar_transactions {
     qq|  a.type, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
-    qq|  c.id as customer_id, | .
+    qq|  c.id as customer_id, c.dunning_lock as customer_dunning_lock,| .
     qq|  e.name AS employee, | .
     qq|  e2.name AS salesman, | .
     qq|  dc.dunning_description, | .
     qq|  tz.description AS taxzone, | .
     qq|  pt.description AS payment_terms, | .
     qq|  d.description AS department, | .
+    qq|  s.shiptoname, s.shiptodepartment_1, s.shiptodepartment_2, | .
+    qq|  s.shiptostreet, s.shiptozipcode, s.shiptocity, s.shiptocountry, | .
     qq{  ( SELECT ch.accno || ' -- ' || ch.description
            FROM acc_trans at
            LEFT JOIN chart ch ON ch.id = at.chart_id
@@ -515,6 +548,10 @@ sub ar_transactions {
     qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
     qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| .
     qq|LEFT JOIN business b ON (b.id = c.business_id)| .
+    qq|LEFT JOIN shipto s ON (
+        (a.shipto_id = s.shipto_id) or
+        (a.id = s.trans_id and s.module = 'AR')
+       )| .
     qq|LEFT JOIN department d ON (d.id = a.department_id)|;
 
   my $where = "1 = 1";
@@ -577,6 +614,14 @@ sub ar_transactions {
     $where .= " AND a.taxzone_id = ?";
     push(@values, $form->{taxzone_id});
   }
+  if ($form->{department_id}) {
+    $where .= " AND a.department_id = ?";
+    push(@values, $form->{department_id});
+  }
+  if ($form->{payment_id}) {
+    $where .= " AND a.payment_id = ?";
+    push(@values, $form->{payment_id});
+  }
   foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description shipvia shippingpoint)) {
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
@@ -585,7 +630,7 @@ sub ar_transactions {
   }
   if ($form->{"project_id"}) {
     $where .=
-      qq|AND ((a.globalproject_id = ?) OR EXISTS | .
+      qq| AND ((a.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
       qq|   WHERE i.project_id = ? AND i.trans_id = a.id) | .
       qq| OR EXISTS | .
@@ -611,6 +656,14 @@ sub ar_transactions {
     $where .= " AND a.duedate <= ?";
     push(@values, trim($form->{duedateto}));
   }
+  if ($form->{datepaidfrom}) {
+    $where .= " AND a.datepaid >= ?";
+    push(@values, trim($form->{datepaidfrom}));
+  }
+  if ($form->{datepaidto}) {
+    $where .= " AND a.datepaid <= ?";
+    push(@values, trim($form->{datepaidto}));
+  }
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});
@@ -671,6 +724,35 @@ SQL
     $where .= ' AND COALESCE(paid_difference.amount, 0) + a.paid != 0';
   }
 
+  if ($form->{shiptoname}) {
+    $where .= " AND s.shiptoname ILIKE ?";
+    push(@values, like($form->{shiptoname}));
+  }
+  if ($form->{shiptodepartment_1}) {
+    $where .= " AND s.shiptodepartment_1 ILIKE ?";
+    push(@values, like($form->{shiptodepartment_1}));
+  }
+  if ($form->{shiptodepartment_2}) {
+    $where .= " AND s.shiptodepartment_2 ILIKE ?";
+    push(@values, like($form->{shiptodepartment_2}));
+  }
+  if ($form->{shiptostreet}) {
+    $where .= " AND s.shiptostreet ILIKE ?";
+    push(@values, like($form->{shiptostreet}));
+  }
+  if ($form->{shiptozipcode}) {
+    $where .= " AND s.shiptozipcode ILIKE ?";
+    push(@values, like($form->{shiptozipcode}));
+  }
+  if ($form->{shiptocity}) {
+    $where .= " AND s.shiptocity ILIKE ?";
+    push(@values, like($form->{shiptocity}));
+  }
+  if ($form->{shiptocountry}) {
+    $where .= " AND s.shiptocountry ILIKE ?";
+    push(@values, like($form->{shiptocountry}));
+  }
+
   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
                                                             'trans_id_field' => 'c.id',
                                                             'filter'         => $form,
@@ -695,6 +777,26 @@ SQL
 
   $form->{AR} = [ @result ];
 
+  if ($form->{l_items} && scalar @{ $form->{AR} }) {
+    my ($items_query, $items_sth);
+    if ($form->{l_items}) {
+      $items_query =
+        qq|SELECT id
+          FROM invoice
+          WHERE trans_id  = ?
+          ORDER BY position|;
+
+      $items_sth = prepare_query($form, $dbh, $items_query);
+    }
+
+    foreach my $ar (@{ $form->{AR} }) {
+      do_statement($form, $items_sth, $items_query, $ar->{id});
+      $ar->{item_ids} = $dbh->selectcol_arrayref($items_sth);
+      $ar->{item_ids} = undef if !@{$ar->{item_ids}};
+    }
+    $items_sth->finish();
+  }
+
   $main::lxdebug->leave_sub();
 }
 
@@ -755,6 +857,8 @@ sub setup_form {
         $form->{"forex_$j"}           = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
         $form->{"exchangerate_$i"}    = $form->{"forex_$j"};
         $form->{"paid_project_id_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{project_id};
+        $form->{"defaultcurrency_paid_$j"} = $form->{acc_trans}{$key}->[$i - 1]->{defaultcurrency_paid};
+        $form->{"fx_transaction_$j"}  = $form->{acc_trans}{$key}->[$i - 1]->{fx_transaction};
         $form->{paidaccounts}++;
 
       } else { # e.g. AR_amount, AR, AR_tax
@@ -885,6 +989,19 @@ sub _storno {
 
   map { IO->set_datepaid(table => 'ar', id => $_, dbh => $dbh) } ($id, $new_id);
 
+  if ($form->{workflow_email_journal_id}) {
+    my $ar_transaction_storno = SL::DB::Invoice->new(id => $new_id)->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{workflow_email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $ar_transaction_storno,
+      delete $form->{workflow_email_attachment_id}
+    );
+    $form->{callback} = delete $form->{workflow_email_callback};
+  }
+
+  $form->{storno_id} = $id;
   return 1;
 }
 
diff --git a/SL/Auth.pm b/SL/Auth.pm
index 6be693382..5d97aa01f 100644
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -12,6 +12,7 @@ use Regexp::IPv6 qw($IPv6_re);
 use SL::Auth::ColumnInformation;
 use SL::Auth::Constants qw(:all);
 use SL::Auth::DB;
+use SL::Auth::HTTPHeaders;
 use SL::Auth::LDAP;
 use SL::Auth::Password;
 use SL::Auth::SessionValue;
@@ -152,7 +153,7 @@ sub _read_auth_config {
   foreach my $module (split m{ +}, $self->{module}) {
     my $config_name;
     ($module, $config_name) = split m{:}, $module, 2;
-    $config_name          ||= $module eq 'DB' ? 'database' : lc($module);
+    $config_name          ||= $module eq 'DB' ? 'database' : $module eq 'HTTPHeaders' ? 'http_headers' : lc($module);
     my $config              = $::lx_office_conf{'authentication/' . $config_name};
 
     if (!$config) {
@@ -166,6 +167,9 @@ sub _read_auth_config {
     } elsif ($module eq 'LDAP') {
       push @{ $self->{authenticators} }, SL::Auth::LDAP->new($config);
 
+    } elsif ($module eq 'HTTPHeaders') {
+      push @{ $self->{authenticators} }, SL::Auth::HTTPHeaders->new($config);
+
     } else {
       my $locale = Locale->new('en');
       $self->mini_error($locale->text('Unknown authenticantion module #1 specified in "config/kivitendo.conf".', $module));
@@ -228,6 +232,12 @@ sub authenticate_root {
   return $result;
 }
 
+sub set_session_authenticated {
+  my ($self, $login, $result) = @_;
+
+  $self->set_session_value(SESSION_KEY_USER_AUTH() => $result, login => $login, client_id => $self->client->{id});
+}
+
 sub authenticate {
   my ($self, $login, $password) = @_;
 
@@ -252,7 +262,8 @@ sub authenticate {
     }
   }
 
-  $self->set_session_value(SESSION_KEY_USER_AUTH() => $result, login => $login, client_id => $self->client->{id});
+  $self->set_session_authenticated($login, $result);
+
   return $result;
 }
 
@@ -513,6 +524,9 @@ sub read_user {
 
   my %user_data;
 
+  # Set defaults for options not present in database
+  $user_data{follow_up_notify_by_email} = 1;
+
   while (my $ref = $sth->fetchrow_hashref()) {
     $user_data{$ref->{cfg_key}} = $ref->{cfg_value};
     @user_data{qw(id login)}    = @{$ref}{qw(id login)};
diff --git a/SL/Auth/HTTPHeaders.pm b/SL/Auth/HTTPHeaders.pm
new file mode 100644
index 000000000..e0f2aafb6
--- /dev/null
+++ b/SL/Auth/HTTPHeaders.pm
@@ -0,0 +1,161 @@
+package SL::Auth::HTTPHeaders;
+
+use List::MoreUtils qw(any);
+
+use SL::Auth::Constants qw(:all);
+
+use strict;
+
+my @required_config_options = qw(secret_header secret user_header client_id_header);
+
+sub new {
+  my $type        = shift;
+  my $self        = {};
+  $self->{config} = shift;
+
+  bless $self, $type;
+
+  return $self;
+}
+
+sub reset {
+  my ($self) = @_;
+}
+
+sub _env_var_for_header {
+  my ($header) = @_;
+
+  $header =~ s{-}{_}g;
+  return $ENV{'HTTP_' . uc($header)};
+}
+
+sub _authenticate {
+  my ($self, $type) = @_;
+
+  my $secret = _env_var_for_header($self->{config}->{secret_header}) // '';
+  if ($secret ne $self->{config}->{secret}) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "HTTPHeaders ${type}: bad secret sent by upstream server: $secret");
+    return (ERR_BACKEND);
+  }
+
+  my $client_id = _env_var_for_header($self->{config}->{client_id_header});
+  if (!$client_id) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "HTTPHeaders ${type}: no client ID header found");
+    return (ERR_PASSWORD);
+  }
+
+  # $::auth->set_client();
+
+  my $user = _env_var_for_header($self->{config}->{user_header});
+  if (!$user) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "HTTPHeaders ${type}: no user name header found");
+    return (ERR_PASSWORD);
+  }
+
+  $::lxdebug->message(LXDebug->DEBUG2(), "HTTPHeaders ${type}: OK client $client_id user $user");
+
+  return (OK, $client_id, $user);
+}
+
+sub authenticate {
+  my ($self) = @_;
+
+  my ($status, $client, $login) = $self->_authenticate('authenticate');
+
+  return $status;
+}
+
+sub can_change_password {
+  return 0;
+}
+
+sub requires_cleartext_password {
+  return 0;
+}
+
+sub change_password {
+  return ERR_BACKEND;
+}
+
+sub verify_config {
+  my $self = shift;
+  my $cfg  = $self->{config};
+
+  if (!$cfg) {
+    die 'config/kivitendo.conf: Key "authentication/http_headers" is missing.';
+  }
+
+  foreach (@required_config_options) {
+    next if $cfg->{$_};
+    die 'config/kivitendo.conf: Missing parameter in "authentication/http_headers": ' . $_;
+  }
+}
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Auth::HTTPHeaders - Automatically log in users based on headers
+sent by upstream servers
+
+=head1 OVERVIEW
+
+This module implements two modes for automatic log in for users:
+
+=over 4
+
+=item HTTP Basic Authentication
+
+=item passing user name & client ID via arbitrary headers
+
+=back
+
+The module must be enabled in the configuration file by setting
+C<authentication.module=HTTPHeaders>. It is then configured by the
+sections C<authentication/http_basic> & C<authentication/http_headers>.
+
+=head1 SUPPORTED AUTHENTICATION METHODS
+
+=head2 User name & client ID in HTTP headers
+
+Must be enabled by setting
+C<authentication/http_headers.enabled=1>. If enabled, it relies on
+upstream servers (web server, proxy server) doing the authentication
+with SSO solutions like Authelia & Authentik. These solutions must
+then send the user name of the authenticated user in an HTTP header &
+the desired client ID in another header.
+
+In order to ensure no malicious third party can simply set these
+header values, a shared secret must be configured in the configuration
+file & sent along in a third header field.
+
+The names of all three headers as well as the shared secret must be
+set in the configuration file's C<authentication/http_headers>
+section.
+
+This mode is mutually exclusive with the HTTP Basic Authentication
+mentioned below.
+
+=head2 HTTP Basic Authentication (RFC 7617)
+
+Must be enabled by setting C<authentication/http_basic.enabled=1>. If
+enabled, it relies on the web server doing the authentication for it &
+passing the result in the C<Authorization> header, which turns into e
+environment variable C<HTTP_AUTHORIZATION> according to the CGI
+specifications.
+
+This mode only supports using the default client as no way to pass the
+desired client ID has been implemented yet.
+
+This mode is mutually exclusive with the "User name & client ID in
+HTTP headers" mode mentioned above.
+
+=head1 AUTHOR
+
+Moritz Bunkus E<lt>m.bunkus@linet.deE<gt>
+
+=cut
+
+1;
diff --git a/SL/BackgroundJob/CheckBelowMinimumStock.pm b/SL/BackgroundJob/CheckBelowMinimumStock.pm
new file mode 100644
index 000000000..17d88a056
--- /dev/null
+++ b/SL/BackgroundJob/CheckBelowMinimumStock.pm
@@ -0,0 +1,164 @@
+package SL::BackgroundJob::CheckBelowMinimumStock;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::Mailer;
+use SL::DB::Part;
+use SL::Presenter::Part qw(part);
+use SL::Presenter::Tag qw(html_tag link_tag);
+use SL::Presenter::EscapedText qw(escape);
+use SL::DBUtils qw(selectall_hashref_query);
+use SL::Locale::String qw(t8);
+
+sub check_below_minimum_stock {
+  my ($self) = @_;
+
+  my $dbh = SL::DB->client->dbh;
+  my $query = <<SQL;
+  SELECT id, partnumber, description, rop, onhand
+  FROM parts
+  WHERE onhand < rop
+SQL
+
+  my $result = selectall_hashref_query($::form, $dbh, $query);
+
+  if (scalar @$result) {
+    my $error_string = t8("Missing parts:\nPartnumber\t- Name\t- Onhand\t- ROP\n");
+    my @ids = ();
+    foreach my $part_hash (@$result) {
+      $error_string.=
+          $part_hash->{partnumber}
+          . "\t- " . $part_hash->{description}
+          . "\t- " . $part_hash->{onhand}
+          . "\t- " . $part_hash->{rop}
+          . "\n";
+      push @ids, $part_hash->{id};
+    }
+    $self->{errors} = $error_string;
+    $self->{ids}    = \@ids;
+  }
+  return;
+}
+
+sub _email_user {
+  my ($self) = @_;
+  return unless ($self->{config} && $self->{config}->{send_email_to});
+  SL::DB::Manager::AuthUser->find_by(login => $self->{config}->{send_email_to})->get_config_value('email');
+}
+
+
+sub send_email {
+  my ($self) = @_;
+
+  my $email = $self->{job_obj}->data_as_hash->{mail_to} || $self->_email_user || undef;
+  return unless $email;
+
+  # additional email
+  $email .= " " . $self->{job_obj}->data_as_hash->{email} if $self->{job_obj}->data_as_hash->{email} =~ m/(\S+)@(\S+)$/;
+
+  my ($output, $content_type) = $self->_prepare_report;
+
+  my $mail              = Mailer->new;
+  $mail->{from}         = $self->{config}->{email_from};
+  $mail->{to}           = $email;
+  $mail->{subject}      = $self->{config}->{email_subject};
+  $mail->{content_type} = $content_type;
+  $mail->{message}      = $$output;
+
+  my $err = $mail->send;
+
+  if ($err) {
+    $self->{errors} .= t8('Mailer error #1', $err);
+  }
+
+  return
+}
+
+sub _prepare_report {
+  my ($self) = @_;
+
+  my $template = Template->new({ 'INTERPOLATE' => 0,
+                                 'EVAL_PERL'   => 0,
+                                 'ABSOLUTE'    => 1,
+                                 'CACHE_SIZE'  => 0,
+                               });
+
+  return unless $template;
+  my $email_template = $self->{config}->{email_template};
+  my $filename       = $email_template || ( (SL::DB::Default->get->templates || "templates/mails") . "/below_minimum_stock/error_email.html" );
+  my $content_type   = $filename =~ m/.html$/ ? 'text/html' : 'text/plain';
+
+  my @ids   = @{ $self->{ids} };
+  my @parts = @{ SL::DB::Manager::Part->get_all(where => [id => \@ids]) };
+
+
+  my $table_head = html_tag('tr',
+    html_tag('th', t8('Partnumber')) .
+    html_tag('th', t8('ROP')) .
+    html_tag('th', t8('Onhand'))
+  );
+
+  my $table_body;
+
+  $table_body .= html_tag('tr', $_ ) for
+    map {
+      html_tag('td',
+        link_tag(
+          $ENV{HTTP_ORIGIN} . $ENV{REQUEST_URI}
+          . '?action=Part/edit'
+          . '&part.id=' . escape($_->id)
+          # text
+          , $_->partnumber
+        )
+      ).
+      html_tag('td', $_->rop).
+      html_tag('td', $_->onhand)
+    } @parts;
+
+  my %params = (
+    SELF  => $self,
+    PARTS => \@parts,
+    part_table => html_tag('table', $table_head . $table_body),
+  );
+
+  my $output;
+  $template->process($filename, \%params, \$output) || die $template->error;
+
+  return (\$output, $content_type);
+}
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+
+  $self->{config} = $::lx_office_conf{check_below_minimum_stock} || {};
+
+  $self->check_below_minimum_stock();
+
+  if ($self->{errors}) {
+      # on error we have to inform the user
+      $self->send_email();
+      die $self->{errors};
+  }
+
+  return ;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SL::BackgroundJob::CheckMinimumStock - Checks for all parts if on hand is greater
+as minimum stock (onhand > rop)
+
+=head1 SYNOPSIS
+
+  use SL::BackgroundJob::CheckMinimumStock;
+  SL::BackgroundJob::CheckMinimumStock->new->run;;
+
+=cut
diff --git a/SL/BackgroundJob/CleanUpEmailSubfolders.pm b/SL/BackgroundJob/CleanUpEmailSubfolders.pm
new file mode 100644
index 000000000..3296bd8ec
--- /dev/null
+++ b/SL/BackgroundJob/CleanUpEmailSubfolders.pm
@@ -0,0 +1,58 @@
+package SL::BackgroundJob::CleanUpEmailSubfolders;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::IMAPClient;
+
+sub clean_up_record_subfolders {
+  my ($self) = @_;
+  my $imap_client = SL::IMAPClient->new(%{$::lx_office_conf{imap_client}});
+
+  my $open_sales_orders = SL::DB::Manager::Order->get_all(
+    query => [
+      vendor_id => undef,
+      closed => 0,
+    ],
+  );
+
+  $imap_client->clean_up_record_subfolders(active_records => $open_sales_orders);
+}
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+
+  $self->clean_up_record_subfolders();
+
+  return;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::CleanUpEmailSubfolders - Background job for removing all email
+subfolders except open records.
+
+=head1 SYNOPSIS
+
+This background job syncs all emails in subfolders and adds emails files to the
+corresponding record. After that is removes all subfolders except for open
+records.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/CloseProjectsBelongingToClosedSalesOrders.pm b/SL/BackgroundJob/CloseProjectsBelongingToClosedSalesOrders.pm
index feb887a74..358a77ffe 100644
--- a/SL/BackgroundJob/CloseProjectsBelongingToClosedSalesOrders.pm
+++ b/SL/BackgroundJob/CloseProjectsBelongingToClosedSalesOrders.pm
@@ -24,8 +24,7 @@ sub run {
       SELECT oe.globalproject_id
       FROM oe
       WHERE (oe.globalproject_id IS NOT NULL)
-        AND (oe.customer_id      IS NOT NULL)
-        AND NOT COALESCE(oe.quotation, FALSE)
+        AND oe.record_type = 'sales_order'
         AND     COALESCE(oe.closed,    FALSE)
     )
 EOSQL
diff --git a/SL/BackgroundJob/CloseQuotations.pm b/SL/BackgroundJob/CloseQuotations.pm
new file mode 100644
index 000000000..9e95484b5
--- /dev/null
+++ b/SL/BackgroundJob/CloseQuotations.pm
@@ -0,0 +1,70 @@
+package SL::BackgroundJob::CloseQuotations;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::Manager::Order;
+use SL::DB::Order::TypeData qw(:types);
+use SL::Locale::String qw(t8);
+
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+  my $data = $job_obj->data_as_hash;
+
+  my $dry_run = ($data->{dry_run}) ? 1 : 0;
+  my $today   = DateTime->today;
+  my $years   = $data->{years} // 1;
+  my $end     = $today->subtract(years => $years);
+
+  my $quotations = SL::DB::Manager::Order->get_all(where => [
+    record_type => [ REQUEST_QUOTATION_TYPE(), SALES_QUOTATION_TYPE() ],
+    transdate => { le => $end },
+    or => [ closed => 0, closed => undef],
+  ]);
+
+  my (@req_quos, @sal_quos);
+
+  my %dispatch = (
+    REQUEST_QUOTATION_TYPE() => \@req_quos,
+    SALES_QUOTATION_TYPE()   => \@sal_quos,
+  );
+
+  foreach my $quotation (@{ $quotations }) {
+    push @{ $dispatch{$quotation->record_type} }, $quotation->quonumber;
+
+    next if $dry_run;
+
+    $quotation->closed(1);
+    $quotation->save();
+  }
+
+  return $dry_run
+    ? t8('Request quotations not yet closed: #1 Sales quotations not yet closed: #2',
+      join(', ', @req_quos), join(', ', @sal_quos))
+    : t8('Request quotations closed: #1 Sales quotations closed: #2',
+      join(', ', @req_quos), join(', ', @sal_quos));
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::CloseQuotations —
+Background job for closing all request and sales quotations older than a given number of years
+
+=head1 SYNOPSIS
+
+=head1 AUTHOR
+
+Niklas Schmidt
+
+
+=cut
+
diff --git a/SL/BackgroundJob/ConvertTimeRecordings.pm b/SL/BackgroundJob/ConvertTimeRecordings.pm
index 45ded55e8..8f90d40b9 100644
--- a/SL/BackgroundJob/ConvertTimeRecordings.pm
+++ b/SL/BackgroundJob/ConvertTimeRecordings.pm
@@ -235,24 +235,6 @@ sub convert_with_linking {
         $do->save;
         $_->update_attributes(booked => 1) for @{$time_recordings_by_order_id->{$related_order_id}};
 
-        $related_order->link_to_record($do);
-
-        # TODO extend link_to_record for items, otherwise long-term no d.r.y.
-        foreach my $item (@{ $do->items }) {
-          foreach (qw(orderitems)) {
-            if ($item->{"converted_from_${_}_id"}) {
-              die unless $item->{id};
-              RecordLinks->create_links('mode'       => 'ids',
-                                        'from_table' => $_,
-                                        'from_ids'   => $item->{"converted_from_${_}_id"},
-                                        'to_table'   => 'delivery_order_items',
-                                        'to_id'      => $item->{id},
-              ) || die;
-              delete $item->{"converted_from_${_}_id"};
-            }
-          }
-        }
-
         # update delivered and item's ship for related order
         my $helper = SL::Helper::ShippedQty->new->calculate($related_order)->write_to_objects;
         $related_order->delivered($related_order->{delivered});
@@ -305,7 +287,7 @@ sub get_order_for_time_recording {
     }
 
     $orders = SL::DB::Manager::Order->get_all(where        => [customer_id      => $tr->customer_id,
-                                                               or               => [quotation => undef, quotation => 0],
+                                                               record_type      => 'sales_order',
                                                                globalproject_id => $project_id, ],
                                               with_objects => ['orderitems']);
 
diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index 4e3206317..7384d8c1b 100644
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -106,7 +106,9 @@ sub _log_msg {
 sub _generate_time_period_variables {
   my $config            = shift;
   my $period_start_date = shift;
-  my $period_end_date   = $period_start_date->clone->add(months => $config->get_billing_period_length)->subtract(days => 1);
+
+  my $period_length   = $config->periodicity eq 'o' ? $config->get_order_value_period_length : $config->get_billing_period_length;
+  my $period_end_date = $period_start_date->clone->add(months => $period_length)->subtract(days => 1);
 
   my @month_names       = ('',
                            $::locale->text('January'), $::locale->text('February'), $::locale->text('March'),     $::locale->text('April'),   $::locale->text('May'),      $::locale->text('June'),
@@ -227,7 +229,7 @@ sub _create_periodic_invoice {
   if (!$self->{db_obj}->db->with_transaction(sub {
     1;                          # make Emacs happy
 
-    $invoice = SL::DB::Invoice->new_from($order);
+    $invoice = SL::DB::Invoice->new_from($order, honor_recurring_billing_mode => 1);
 
     my $tax_point = ($invoice->tax_point // $time_period_vars->{period_end_date}->[0])->clone;
 
@@ -255,21 +257,8 @@ sub _create_periodic_invoice {
 
     $invoice->post(ar_id => $config->ar_chart_id) || die;
 
-    $order->link_to_record($invoice);
-
-    foreach my $item (@{ $invoice->items }) {
-      foreach (qw(orderitems)) {    # expand if needed (delivery_order_items)
-          if ($item->{"converted_from_${_}_id"}) {
-            die unless $item->{id};
-            RecordLinks->create_links('mode'       => 'ids',
-                                      'from_table' => $_,
-                                      'from_ids'   => $item->{"converted_from_${_}_id"},
-                                      'to_table'   => 'invoice',
-                                      'to_id'      => $item->{id},
-            ) || die;
-            delete $item->{"converted_from_${_}_id"};
-         }
-      }
+    foreach my $item (grep { ($_->recurring_billing_mode eq 'once') && !$_->recurring_billing_invoice_id } @{ $order->orderitems }) {
+      $item->update_attributes(recurring_billing_invoice_id => $invoice->id);
     }
 
     SL::DB::PeriodicInvoice->new(config_id         => $config->id,
diff --git a/SL/BackgroundJob/ImportRecordEmails.pm b/SL/BackgroundJob/ImportRecordEmails.pm
new file mode 100644
index 000000000..4b1614a95
--- /dev/null
+++ b/SL/BackgroundJob/ImportRecordEmails.pm
@@ -0,0 +1,294 @@
+package SL::BackgroundJob::ImportRecordEmails;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::IMAPClient;
+use SL::DB::EmailJournal;
+use SL::DB::Manager::EmailImport;
+use SL::Helper::EmailProcessing;
+use SL::Presenter::Tag qw(link_tag);
+use SL::Locale::String qw(t8);
+
+use List::MoreUtils qw(any);
+use Params::Validate qw(:all);
+use Try::Tiny;
+
+sub sync_record_email_folder {
+  my ($self, $config) = @_;
+
+  my %imap_config;
+  foreach my $key (qw(enabled hostname port ssl username password)) {
+    if (defined $config->{$key}) {
+      $imap_config{$key} = $config->{$key};
+    }
+  }
+
+  my $imap_client = SL::IMAPClient->new(%imap_config);
+
+  my $email_import = $imap_client->update_emails_from_folder(
+    folder => $config->{folder},
+    email_journal_params => {
+      record_type => $config->{record_type},
+    }
+  );
+  return "No emails to import." unless $email_import;
+  if ($config->{imported_imap_flag}) {
+    foreach my $email_journal (@{$email_import->email_journals}) {
+      $imap_client->set_flag_for_email(
+            email_journal => $email_journal,
+            flag          => $config->{imported_imap_flag},
+      );
+    }
+  }
+  my $result = "Created email import with id " . $email_import->id . " for ". scalar @{ $email_import->email_journals } . " emails.";
+
+  if ($config->{process_imported_emails}) {
+    my @function_names =
+      ref $config->{process_imported_emails} eq 'ARRAY' ?
+          @{$config->{process_imported_emails}}
+        : ($config->{process_imported_emails});
+    foreach my $email_journal (@{$email_import->email_journals}) {
+      my $created_records = 0;
+      foreach my $function_name (@function_names) {
+        eval {
+          my $processed = SL::Helper::EmailProcessing->process_attachments($function_name, $email_journal);
+          $created_records += $processed;
+          1;
+        } or do {
+          # # TODO: link not shown as link
+          # my $email_journal_link = link_tag(
+          #   $ENV{HTTP_ORIGIN} . $ENV{REQUEST_URI}
+          #   . '?action=EmailJournal/show'
+          #   . '&id=' . $email_journal->id
+          #   # text
+          #   , $email_journal->id
+          # );
+          my $email_journal_id = $email_journal->id;
+          $result .= t8("Error while processing email journal ('#1') attachments with '#2': ", $email_journal_id, $function_name) . $@ . ".";
+        };
+      }
+      if ($created_records  && $config->{processed_imap_flag}) {
+        $imap_client->set_flag_for_email(
+          email_journal => $email_journal,
+          flag          => $config->{processed_imap_flag},
+        );
+      } elsif ($config->{not_processed_imap_flag}) {
+        $imap_client->set_flag_for_email(
+          email_journal => $email_journal,
+          flag          => $config->{not_processed_imap_flag},
+        );
+      }
+    }
+    $result .= "Processed attachments with "
+      . join(', ', @function_names) . "."
+      if scalar @function_names;
+  }
+
+  return $result;
+}
+
+sub delete_email_imports {
+  my ($self, $email_import_ids_to_delete) = @_;
+
+  my @not_found_email_import_ids;
+  my @deleted_email_import_ids;
+  foreach my $email_import_id (@$email_import_ids_to_delete) {
+    my $email_import = SL::DB::Manager::EmailImport->find_by(id => $email_import_id);
+    unless ($email_import) {
+      push @not_found_email_import_ids, $email_import_id;
+      next;
+    }
+    $email_import->delete(cascade => 1);
+    push @deleted_email_import_ids, $email_import_id;
+  }
+
+  my $result = "";
+
+  $result .= t8("Deleted email import(s): ")
+    . join(', ', @deleted_email_import_ids) . "."
+    if scalar @deleted_email_import_ids;
+
+  $result .= t8("Could not find email import(s): ")
+    . join(', ', @not_found_email_import_ids) . " for deletion."
+    if scalar @not_found_email_import_ids;
+
+  return $result;
+}
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+
+  my $data;
+
+  try {
+    $data = $job_obj->data_as_hash;
+  } catch { die t8("Invalid YAML Configuration for this job. Reason: malformed YAML Data: #1. Please consult: Program -> Documentation -> HTML -> Configuration of Background-Jobs.", $_ ); };
+
+  my @config_params = %{$data};
+
+  my %config = validate_with(
+    params => \@config_params,
+    spec   => {
+      folder => {
+        type     => SCALAR,
+        optional => 1,
+      },
+      record_type => {
+        optional  => 1,
+        default   => 'catch_all',
+        callbacks => {
+          'valid record type' => sub {
+            my $valid_record_types = SL::DB::EmailJournal->meta->{columns}->{record_type}->{check_in};
+            unless (any {$_[0] eq $_} @$valid_record_types) {
+              die "record_type '$_[0]' is not valid. Possible values:\n- " . join("\n- ", @$valid_record_types);
+            }
+          },
+        },
+      },
+      process_imported_emails => {
+        type      => SCALAR | ARRAYREF,
+        optional  => 1,
+        callbacks => {
+          'function is implemented' => sub {
+            foreach my $function_name (ref $_[0] eq 'ARRAY' ? @{$_[0]} : ($_[0])) {
+              !!SL::Helper::EmailProcessing->can_function($function_name) or
+                die "Function '$function_name' not implemented in SL::Helper::EmailProcessing";
+            }
+            1;
+          }
+        }
+      },
+      processed_imap_flag        => { type => SCALAR,   optional => 1, },
+      not_processed_imap_flag    => { type => SCALAR,   optional => 1, },
+      email_import_ids_to_delete => { type => ARRAYREF, optional => 1, },
+      imported_imap_flag         => { type => SCALAR,   optional => 1, },
+      # email config
+      hostname    => { type => SCALAR,  },
+      port        => { type => SCALAR,  optional => 1},
+      ssl         => { type => BOOLEAN, default  => 1},
+      username    => { type => SCALAR,  },
+      password    => { type => SCALAR,  },
+      base_folder => { type => SCALAR,  optional => 1},
+
+    },
+    called => "YAML Configuration for this Background Job invalid. Please consult: Program -> Documentation -> HTML -> Configuration of Background-Jobs.",
+  );
+
+  my @results;
+  if (scalar $config{email_import_ids_to_delete}) {
+    push @results, $self->delete_email_imports($config{email_import_ids_to_delete});
+  }
+
+  push @results, $self->sync_record_email_folder(\%config);
+
+  return join("\n", grep { $_ ne ''} @results);
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::ImportPurchaseInvoiceEmails - Background job for syncing
+emails from a folder for records.
+
+=head1 SYNOPSIS
+
+This background job imports emails from an imap folder. The emails are
+imported into the email journal and can be processed with functions from
+SL::Helper::EmailProcessing.
+
+=head1 CONFIGURATION
+
+The data field in the backgroundjob config contains all configuration values:
+
+=over 4
+
+=item hostname
+
+required, hostname of IMAP server
+
+=item username
+
+required, login for IMAP server
+
+=item password
+
+required, password for login of IMAP server
+
+=item port
+
+optional Parameter IMAP port
+
+=item folder
+
+required, The IMAP folder to import emails from. Sub folders are separated by a forward slash,
+e.g. 'INBOX/Archive'. Subfolders are not synced. Default is 'INBOX'.
+
+=item record_type
+
+optional, The record type to set for each imported email in the email journal.
+Default is catch-all. Valid types are the well-known types of kivitendo records, ie ar_transaction, ap_transaction
+
+=item process_imported_emails
+
+optional, more processing can be automatically done in the job.
+Valid actions are defined in SL::Helper::EmailProcessing.pm
+
+Take a look at currently supported actions with
+
+ perldoc SL/Helper/EmailProcessing.pm
+
+
+=item processed_imap_flag
+
+Optional, requires a valid value in process_imported_emails
+
+If process_imported_emails is set and the process is successfully
+executed this custom IMAP Flag is added to the processed email.
+
+=item not_processed_imap_flag
+
+Optional, requires a valid value in process_imported_emails
+
+If process_imported_emails is set and the process is NOT
+successfully executed this custom IMAP Flag is added
+to the processed email.
+
+=item imported_imap_flag
+
+Optional
+
+If the import is successfully executed this custom IMAP Flag
+is added to the imported email.
+
+
+=back
+
+=head1 YAML Configuration example with ZUGFeRD Processing
+
+    hostname: meinedomain.de
+    username: eingangsrechnung@meinedomain.de
+    password: secret
+    folder: INBOX/vollimport
+    record_type: ap_transaction
+    process_imported_emails: zugferd
+    processed_imap_flag: $Label8
+    not_processed_imap_flag: $Label1
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/InventoryClearAll.pm b/SL/BackgroundJob/InventoryClearAll.pm
new file mode 100644
index 000000000..06cbe20a4
--- /dev/null
+++ b/SL/BackgroundJob/InventoryClearAll.pm
@@ -0,0 +1,91 @@
+package SL::BackgroundJob::InventoryClearAll;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::Inventory;
+use SL::Helper::Inventory qw(:ALL);
+use SL::Locale::String qw(t8);
+
+
+sub run {
+  my ($self, $job_obj) = @_;
+  my $data = $job_obj->data_as_hash;
+
+  my $comment        = $data->{comment} // 'vor Inventur';
+  my $date           = DateTime->today_local();
+  my $date_str       = $date->format_cldr('yyyy-MM-dd');
+  my $dry_run        = ($data->{dry_run}) ? 1 : 0;
+  my $employee_id    = SL::DB::Manager::Employee->current->id;
+  my $trans_type_in  = SL::DB::Manager::TransferType->find_by(description => 'correction', direction => 'in');
+  my $trans_type_out = SL::DB::Manager::TransferType->find_by(description => 'correction', direction => 'out');
+  my $warehouse_id;
+
+  if (exists $data->{warehouse}) {
+    $warehouse_id = SL::DB::Manager::Warehouse->find_by(description => $data->{warehouse});
+    die "Lager existiert nicht: $data->{warehouse}" if !defined $warehouse_id;
+  }
+
+  die "No parameter correction_date given"
+    if !exists $data->{correction_date};
+  die "Parameter correction_date $data->{correction_date} is not today $date_str"
+    if $data->{correction_date} ne $date_str;
+
+  my $stock_all      = get_stock(warehouse    => $warehouse_id,
+                                 by           => [ qw(bin chargenumber part) ],
+                                 with_objects => [ qw(part) ]);
+  my @stock          = grep { $_->{qty} != 0 } @{ $stock_all };
+  my $ntransactions  = scalar @stock;
+
+  my @trans;
+  foreach (@stock) {
+    my $qty = $_->{qty} * -1;
+
+    push @trans, "$_->{part}->{id} $qty $_->{part}->{unit}";
+
+    next if $dry_run;
+    my $x = SL::DB::Inventory->new();
+
+    $x->bestbefore  ($_->{bestbefore});
+    $x->bin_id      ($_->{bin_id});
+    $x->chargenumber($_->{chargenumber});
+    $x->comment     ($comment);
+    $x->employee_id ($employee_id);
+    $x->parts_id    ($_->{parts_id});
+    $x->qty         ($qty);
+    $x->shippingdate($date);
+    $x->trans_type  (($qty > 0) ? $trans_type_in : $trans_type_out);
+    $x->warehouse_id($_->{warehouse_id});
+
+    $x->save();
+  }
+
+  return $dry_run
+    ? t8('Inventory: #1 transactions not yet executed to clear all inventory slots. Parts: #2',
+      $ntransactions, join(',', @trans))
+    : t8('Inventory: #1 transactions executed to clear all inventory slots. Parts: #2',
+      $ntransactions, join(',', @trans));
+}
+
+1;
+
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::InventoryClearAll —
+Background job which performs all inventory transactions needed to empty all
+warehoue bins. Useful before stocktaking
+
+=head1 SYNOPSIS
+
+=head1 AUTHOR
+
+Niklas Schmidt
+
+
+=cut
diff --git a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
index 4cc2519d5..9e0c88d89 100644
--- a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
+++ b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
@@ -53,6 +53,16 @@ sub create_invoices {
     eval {
       my $sales_delivery_order = SL::DB::DeliveryOrder->new(id => $delivery_order_id)->load;
       $number                  = $sales_delivery_order->donumber;
+
+      # Only process open delivery orders. In this list should only be open
+      # delivery orders, but if the background job is restarted (for what
+      # reason so ever), a new creation of invoices for delivery orders which
+      # are closed now can be triggered.
+      # Prevent this.
+      if ($sales_delivery_order->closed) {
+        die "Delivery Order already closed!\n";
+      }
+
       my %conversion_params    = $data->{transdate} ? ('attributes' => { transdate => $data->{transdate} }) : ();
       my $invoice              = $sales_delivery_order->convert_to_invoice(%conversion_params);
 
diff --git a/SL/BackgroundJob/RemoveInvalidFileEntries.pm b/SL/BackgroundJob/RemoveInvalidFileEntries.pm
new file mode 100644
index 000000000..12cff1ca9
--- /dev/null
+++ b/SL/BackgroundJob/RemoveInvalidFileEntries.pm
@@ -0,0 +1,51 @@
+package SL::BackgroundJob::RemoveInvalidFileEntries;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::File;
+
+use constant WAITING_FOR_EXECUTION => 0;
+use constant SCAN_START            => 1;
+use constant DONE                  => 2;
+
+# Data format:
+# my $data = {
+#   file_errors = [
+#     "Ich bin ein Fehler",
+#   ],
+# }
+
+sub scan_file_entry {
+  my ($self)  = @_;
+  my $job_obj = $self->{job_obj};
+  $job_obj->set_data(status => SCAN_START())->save;
+
+  my @file_entries = @{ SL::DB::Manager::File->get_all() };
+
+  my @files = map { SL::File::Object->new(db_file => $_, id => $_->id, loaded => 1) } @file_entries;
+
+  my $data  = $job_obj->data_as_hash;
+  foreach my $file (@files) {
+    unless (eval {$file->get_file()}) {
+      #warn $@;
+      push(@{$data->{file_errors}}, $@);
+      $job_obj->update_attributes(data_as_hash => $data);
+      $file->loaded_db_file->delete();
+    }
+  }
+}
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+
+  $self->scan_file_entry();
+
+  $job_obj->set_data(status => DONE())->save;
+  return 1;
+}
+
+1;
diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm
index b715f9e07..f9ea74dcf 100644
--- a/SL/BackgroundJob/SelfTest.pm
+++ b/SL/BackgroundJob/SelfTest.pm
@@ -26,7 +26,7 @@ use Rose::Object::MakeMethods::Generic (
    'add_full_diag'  => { interface => 'add', hash_key => 'full_diag' },
   ],
   scalar => [
-   qw(diag tester config aggreg module_nr),
+   qw(diag tester config aggreg module_nr additional_email),
   ],
 );
 
@@ -44,14 +44,22 @@ sub setup {
   $self->aggreg(TAP::Parser::Aggregator->new);
 
   $self->modules(split /\s+/, $self->config->{modules});
+  $self->modules($self->{options}->{modules}) if $self->{options}->{modules};
 }
 
 sub run {
-  my $self        = shift;
+  my $self   = shift;
+  my $db_obj = shift;
+
+  # get custom options (module list || alternate email)
+  $self->{options} = $db_obj->data_as_hash;
   $self->setup;
 
   return 1 unless $self->modules;
 
+  # set additional mail
+  $self->additional_email($self->{options}->{email}) if $self->{options}->{email} =~ m/(\S+)@(\S+)$/;
+
   foreach my $module ($self->modules) {
     $self->run_module($module);
   }
@@ -124,10 +132,13 @@ sub _send_email {
   return if !$self->config || !$self->config->{send_email_to};
 
   my $user  = $self->_email_user;
-  my $email = $user ? $user->get_config_value('email') : undef;
-
+  my $email = $self->{options}->{mail_to} ? $self->{options}->{mail_to}
+            : $user                       ? $user->get_config_value('email')
+            : undef;
   return unless $email;
 
+  $email .= $self->additional_email ? ',' . $self->additional_email : '';
+
   my ($output, $content_type) = $self->_prepare_report;
 
   my $mail              = Mailer->new;
@@ -138,7 +149,7 @@ sub _send_email {
   $mail->{message}      = $$output;
 
   my $err = $mail->send;
-  $self->add_errors('Mailer error #1', $err) if $err;
+  $self->add_errors($::locale->text('Mailer error #1', $err)) if $err;
 
 }
 
diff --git a/SL/BackgroundJob/SelfTest/NovoclonStrict.pm b/SL/BackgroundJob/SelfTest/NovoclonStrict.pm
new file mode 100644
index 000000000..826567d94
--- /dev/null
+++ b/SL/BackgroundJob/SelfTest/NovoclonStrict.pm
@@ -0,0 +1,318 @@
+package SL::BackgroundJob::SelfTest::NovoclonStrict;
+
+use utf8;
+use strict;
+use parent qw(SL::BackgroundJob::SelfTest::Base);
+
+use DateTime;
+use List::MoreUtils qw(none notall);
+use SL::DB::DeliveryOrder;
+use SL::DB::Order;
+use SL::DB::PurchaseInvoice;
+
+use Rose::Object::MakeMethods::Generic (
+  'scalar --get_set_init' => [ qw(start_date) ],
+);
+
+sub init_start_date {
+  DateTime->new(day => 1, month => 1, year => DateTime->today->year);
+}
+
+
+sub run {
+  my ($self) = @_;
+
+  $self->tester->plan(tests => 8);
+
+  $self->check_no_missing_invoices;
+  $self->check_no_missing_deliveries;
+  $self->check_no_missing_order_confirmations;
+  $self->check_invoices_mailed;
+  $self->check_order_confirmations_mailed;
+  $self->check_quotations_mailed;
+  $self->check_purchase_invoices_sums_against_purchase_orders;
+  $self->check_purchase_invoices_sums_against_sales_orders;
+}
+
+sub check_no_missing_invoices {
+  my ($self) = @_;
+
+  my $days_delta           = 4;
+  my $title                = "Alle Verkaufslieferscheine sind $days_delta Werktage nach Lieferterimin geschlossen.";
+
+  my $latest_reqdate       = DateTime->today_local->subtract_businessdays(days => $days_delta);
+  my $open_delivery_orders = SL::DB::Manager::DeliveryOrder->get_all_sorted(where => ['!customer_id'  => undef,
+                                                                                      '!cusordnumber' => { ilike => ['muster'] },
+                                                                                      delivered       => 1,
+                                                                                      or              => [closed => undef, closed => 0],
+                                                                                      reqdate         => {le => $latest_reqdate},
+                                                                                      transdate       => {ge => $self->start_date},]
+  );
+
+  if (@$open_delivery_orders) {
+    $self->tester->ok(0, $title);
+    $self->tester->diag("Folgende Verkaufslieferscheine sind geliefert und nach Liefertermin länger als $days_delta Werktage offen. Vermutlich fehlt die Rechnung:");
+    $self->tester->diag("Lieferschein-Nummer: " . $_->donumber) for @$open_delivery_orders;
+
+  } else {
+    $self->tester->ok(1, $title);
+  }
+}
+
+sub check_no_missing_deliveries {
+  my ($self) = @_;
+
+  my $days_delta     = 2;
+  my $title          = "Alle offenen Auftragsbestätigungen mit Liefertermin vor mindestens $days_delta Werktagen haben eine Lieferung.";
+
+  my $latest_reqdate = DateTime->today_local->subtract_businessdays(days => $days_delta);
+  my $orders         = SL::DB::Manager::Order->get_all_sorted(where => [record_type     => 'sales_order',
+                                                                        or              => [closed    => undef, closed    => 0],
+                                                                        reqdate         => {le => $latest_reqdate},
+                                                                        transdate       => {ge => $self->start_date},]);
+  my %not_delivered;
+  foreach my $order (@$orders) {
+    my $lr = $order->linked_records(to => 'DeliveryOrder');
+    $lr    = [grep { !!$_->customer_id } @$lr];
+
+    if (scalar @$lr == 0) {
+      push @{ $not_delivered{no_delivery_order} }, $order->ordnumber;
+      next;
+    }
+
+    if (none { $_->delivered } @$lr) {
+      push @{ $not_delivered{none_delivered}    }, $order->ordnumber;
+      next;
+    }
+
+    if (notall { $_->delivered } @$lr) {
+      push @{ $not_delivered{notall_delivered}  }, $order->ordnumber;
+      next;
+    }
+  }
+
+  if (@{ $not_delivered{no_delivery_order} || [] } || @{ $not_delivered{none_delivered} || [] } || @{ $not_delivered{notall_delivered} || [] }) {
+    $self->tester->ok(0, $title);
+
+    if (@{ $not_delivered{no_delivery_order} || [] }) {
+      $self->tester->diag("Folgende offene fällige Auftragsbestätigungen haben keine Verkaufslieferscheine:");
+      $self->tester->diag("Auftrags-Nummer: " . $_) for @{ $not_delivered{no_delivery_order} };
+    }
+    if (@{ $not_delivered{none_delivered} || [] }) {
+      $self->tester->diag("Folgende offene fällige Auftragsbestätigungen haben Verkaufslieferscheine, von denen keine geliefert sind:");
+      $self->tester->diag("Auftrags-Nummer: " . $_) for @{ $not_delivered{none_delivered} };
+    }
+    if (@{ $not_delivered{notall_delivered} || [] }) {
+      $self->tester->diag("Folgende offene fällige Auftragsbestätigungen haben einen oder mehrere nicht gelieferte Verkaufslieferscheine:");
+      $self->tester->diag("Auftrags-Nummer: " . $_) for @{ $not_delivered{notall_delivered} };
+    }
+
+  } else {
+    $self->tester->ok(1, $title);
+  }
+}
+
+sub check_no_missing_order_confirmations {
+  my ($self) = @_;
+
+  my $days_delta       = 3;
+  my $title            = "Alle offenen Auftragseingänge älter als $days_delta Werktage haben eine Auftragsbestätigung.";
+
+  my $latest_transdate = DateTime->today_local->subtract_businessdays(days => $days_delta);
+
+  my $orders           = SL::DB::Manager::Order->get_all_sorted(where => [record_type     => 'sales_order_intake',
+                                                                          or              => [closed    => undef, closed    => 0],
+                                                                          transdate       => {le => $latest_transdate},
+                                                                          transdate       => {ge => $self->start_date},]);
+
+  # Check, if order confirmations are in the worklfow.
+  # (Maybe it is sufficient to list all order intakes which are not closed because
+  # they will be closed when an related order confirmation is created.)
+  my @not_confirmed_order_intakes;
+  foreach my $order (@$orders) {
+    my $lr = $order->linked_records(direction => 'to', recursive => 1);
+    $lr    = [grep { 'SL::DB::Order' eq ref $_ && $_->is_type('sales_order') } @$lr];
+    push @not_confirmed_order_intakes, $order->ordnumber if scalar @$lr == 0;
+  }
+
+  if (@not_confirmed_order_intakes) {
+    $self->tester->ok(0, $title);
+
+    $self->tester->diag("Folgende offene Auftragseingänge älter als $days_delta haben keine Auftragsbestätigung:");
+    $self->tester->diag("Auftrageingangs-Nummer: " . $_) for @not_confirmed_order_intakes;
+
+  } else {
+    $self->tester->ok(1, $title);
+  }
+
+}
+
+sub check_invoices_mailed {
+  my ($self) = @_;
+
+  my $title    = "Alle offenen Verkaufsrechnungen sind per Mail verschickt worden.";
+
+  my $invoices = SL::DB::Manager::Invoice->get_all_sorted(where => [invoice => 1,
+                                                                    type      => 'invoice',
+                                                                    or        => [storno => undef, storno => 0],
+                                                                    transdate => {ge => $self->start_date},]);
+  $invoices    = [grep { !$_->closed } @$invoices];
+
+  my @documents_not_mailed = $self->get_documents_not_mailed($invoices);
+  $self->complain_documtens_not_mailed(
+    \@documents_not_mailed,
+    main_title => $title,
+    sub_title  => "Folgende offenen Verkaufsrechungen sind nicht per Mail verschickt worden",
+    nr_title   => "Rechnungs-Nummer"
+  );
+}
+
+sub check_order_confirmations_mailed {
+  my ($self) = @_;
+
+  my $days_delta       = 1;
+  my $title            = "Alle offenen Auftragsbestätigungen älter als $days_delta Werktage sind per Mail verschickt worden.";
+
+  my $latest_transdate = DateTime->today_local->subtract_businessdays(days => $days_delta);
+
+  my $orders           = SL::DB::Manager::Order->get_all_sorted(where => [record_type     => 'sales_order',
+                                                                          or              => [closed    => undef, closed    => 0],
+                                                                          transdate       => {le => $latest_transdate},
+                                                                          transdate       => {ge => $self->start_date},]);
+
+  my @documents_not_mailed = $self->get_documents_not_mailed($orders);
+  $self->complain_documtens_not_mailed(
+    \@documents_not_mailed,
+    main_title => $title,
+    sub_title  => "Folgende offenen Auftragsbestätigungen älter als $days_delta Werktage sind nicht per Mail verschickt worden",
+    nr_title   => "Auftrags-Nummer"
+  );
+}
+
+sub check_quotations_mailed {
+  my ($self) = @_;
+
+  my $days_delta       = 3;
+  my $title            = "Alle offenen Angebote älter als $days_delta Werktage sind per Mail verschickt worden.";
+
+  my $latest_transdate = DateTime->today_local->subtract_businessdays(days => $days_delta);
+
+  my $orders           = SL::DB::Manager::Order->get_all_sorted(where => [record_type     => 'request_quotion',
+                                                                          or              => [closed    => undef, closed    => 0],
+                                                                          transdate       => {le => $latest_transdate},
+                                                                          transdate       => {ge => $self->start_date},]);
+
+  my @documents_not_mailed = $self->get_documents_not_mailed($orders);
+  $self->complain_documtens_not_mailed(
+    \@documents_not_mailed,
+    main_title => $title,
+    sub_title  => "Folgende offenen Angebote älter als $days_delta Werktage sind nicht per Mail verschickt worden",
+    nr_title   => "Angebots-Nummer"
+  );
+}
+
+sub get_documents_not_mailed {
+  my ($self, $objects) = @_;
+
+  my @documents_not_mailed;
+  foreach my $object (@$objects) {
+    my $mails = $object->linked_records(to => 'EmailJournal');
+    push @documents_not_mailed, $object->record_number if scalar @$mails == 0;
+  }
+
+  return @documents_not_mailed;
+}
+
+sub complain_documtens_not_mailed {
+  my ($self, $documents_not_mailed, %params) = @_;
+
+  my $main_title = $params{main_title} | '';
+  my $sub_title  = $params{sub_title}  | '';
+  my $nr_title   = $params{nr_title}   | '';
+
+  if (@{ $documents_not_mailed || [] }) {
+    $self->tester->ok(0, $main_title);
+
+    $self->tester->diag($sub_title . ":");
+    $self->tester->diag($nr_title . ": " . $_) for @$documents_not_mailed;
+
+  } else {
+    $self->tester->ok(1, $main_title);
+  }
+}
+
+# Check for all purchase invoices if the sum of all related purchase
+# orders is greater than the sum of all related purchase invoices.
+sub check_purchase_invoices_sums_against_purchase_orders {
+  my ($self) = @_;
+
+  my $title = "Die Netto-Summe der Einkaufsrechnungen ist kleiner oder gleich der Netto-Summe der Lieferantenaufträge.";
+
+  my $purchase_invoices = SL::DB::Manager::PurchaseInvoice->get_all_sorted(where => ['!storno' => 1,
+                                                                                     invoice   => 1,
+                                                                                     transdate => {ge => $self->start_date},]);
+
+  my @purchase_invoices_with_wrong_sums;
+  foreach my $purchase_invoice (@$purchase_invoices) {
+    if (!$purchase_invoice->check_sums_against_purchase_orders($purchase_invoice)) {
+      push @purchase_invoices_with_wrong_sums, $purchase_invoice;
+    }
+  }
+
+  if (@purchase_invoices_with_wrong_sums) {
+    $self->tester->ok(0, $title);
+    $self->tester->diag("Folgende " . scalar @purchase_invoices_with_wrong_sums . " Einkaufsrechnungen ergeben eine viel höhere Netto-Summe alsergeben eine viel höhere Netto-Summe als ursprüngliche beauftragt:");
+    $self->tester->diag("Einkaufsrechnungs-Nummer vom " . $_->transdate_as_date . ": " . $_->record_number) for @purchase_invoices_with_wrong_sums;
+
+  } else {
+    $self->tester->ok(1, $title);
+  }
+}
+
+# Check for all purchase invoices if the sum of all related sales
+# orders is greater than the sum of all related purchase invoices.
+sub check_purchase_invoices_sums_against_sales_orders {
+  my ($self) = @_;
+
+  my $title = "Die Summe der Einkaufsrechnungen ist kleiner oder gleich der Summe der Auftragsbestätigungen.";
+
+  my $purchase_invoices = SL::DB::Manager::PurchaseInvoice->get_all_sorted(where => ['!storno' => 1,
+                                                                                     invoice   => 1,
+                                                                                     transdate => {ge => $self->start_date},]);
+
+  my @purchase_invoices_with_wrong_sums;
+  foreach my $purchase_invoice (@$purchase_invoices) {
+    if (!$purchase_invoice->check_sums_against_sales_orders($purchase_invoice)) {
+      push @purchase_invoices_with_wrong_sums, $purchase_invoice;
+    }
+  }
+
+  if (@purchase_invoices_with_wrong_sums) {
+    $self->tester->ok(0, $title);
+    $self->tester->diag("Folgende " . scalar @purchase_invoices_with_wrong_sums . " Einkaufsrechnungen haben eine zu hohe Summe:");
+    $self->tester->diag("Einkaufsrechnungs vom " . $_->transdate_as_date . ": " . $_->record_number) for @purchase_invoices_with_wrong_sums;
+
+  } else {
+    $self->tester->ok(1, $title);
+  }
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::BackgroundJob::SelfTest::NovoclonStrict - special tests novoclon
+
+=head1 DESCRIPTION
+
+Special tests for novoclon.
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/SelfTest/Transactions.pm b/SL/BackgroundJob/SelfTest/Transactions.pm
index ab145cece..db0d13f77 100644
--- a/SL/BackgroundJob/SelfTest/Transactions.pm
+++ b/SL/BackgroundJob/SelfTest/Transactions.pm
@@ -165,7 +165,7 @@ sub check_verwaiste_invoice_eintraege {
 sub check_netamount_laut_invoice_ar {
   my ($self) = @_;
   my $query = qq|
-    select sum(round(cast(i.qty*(i.fxsellprice * (1-i.discount)) as numeric), 2))
+    select sum(round(cast(i.qty* i.sellprice / COALESCE(price_factor, 1) as numeric), 2))
     from invoice i
     left join ar a on (a.id = i.trans_id)
     where a.transdate >= ? and a.transdate <= ?;|;
@@ -523,7 +523,7 @@ sub check_missing_tax_bookings {
   # check tax bookings. all taxkey <> 0 should have tax bookings in acc_trans
 
   my $query = qq| select trans_id, chart.accno,transdate from acc_trans left join chart on (chart.id = acc_trans.chart_id)
-                    WHERE taxkey NOT IN (SELECT taxkey from tax where rate=0) AND trans_id NOT IN
+                    WHERE taxkey NOT IN (SELECT taxkey from tax where rate=0 OR reverse_charge_chart_id is not null) AND trans_id NOT IN
                     (select trans_id from acc_trans where chart_link ilike '%tax%' and trans_id IN
                     (SELECT trans_id from acc_trans where taxkey NOT IN (SELECT taxkey from tax where rate=0)))
                     AND transdate >= ? AND transdate <= ?|;
@@ -570,7 +570,7 @@ sub check_ar_paid_acc_trans {
   my $query = qq|
           select sum(ac.amount) as paid_amount, ar.invnumber,ar.paid
           from acc_trans ac left join ar on (ac.trans_id = ar.id)
-          WHERE ac.chart_link like '%AR_paid%'
+          WHERE (ac.chart_link like '%AR_paid%' OR ac.fx_transaction)
           AND ac.trans_id in (SELECT trans_id from acc_trans ac where ac.transdate >= ? AND ac.transdate <= ?)
           group by invnumber, paid having sum(ac.amount) <> ar.paid*-1|;
 
@@ -643,7 +643,7 @@ sub check_orphaned_reconciliated_links {
   my ($self) = @_;
 
   my $query = qq|
-          SELECT purpose from bank_transactions
+          SELECT id, purpose from bank_transactions
           WHERE cleared is true
           AND NOT EXISTS (SELECT bank_transaction_id from reconciliation_links WHERE bank_transaction_id = bank_transactions.id)
           AND transdate >= ? AND transdate <= ?|;
@@ -654,7 +654,7 @@ sub check_orphaned_reconciliated_links {
     $self->tester->ok(0, "Verwaiste abgeglichene Bankbewegungen gefunden. Bei folgenden Bankbewegungen ist die abgleichende Verknüpfung gelöscht worden:");
 
     for my $bt_orphaned (@{ $bt_cleared_no_link }) {
-      $self->tester->diag("Verwendungszweck: $bt_orphaned->{purpose}");
+      $self->tester->diag("ID: $bt_orphaned->{id} Verwendungszweck: $bt_orphaned->{purpose}");
     }
   } else {
     $self->tester->ok(1, "Keine verwaisten Einträge in abgeglichenen Bankbewegungen.");
@@ -693,7 +693,7 @@ sub check_orphaned_bank_transaction_acc_trans_links {
   my ($self) = @_;
 
   my $query = qq|
-          SELECT purpose from bank_transactions
+          SELECT id, purpose from bank_transactions
           WHERE invoice_amount <> 0
           AND NOT EXISTS (SELECT bank_transaction_id FROM bank_transaction_acc_trans WHERE bank_transaction_id = bank_transactions.id)
           AND itime > (SELECT min(itime) from bank_transaction_acc_trans)
@@ -705,7 +705,7 @@ sub check_orphaned_bank_transaction_acc_trans_links {
     $self->tester->ok(0, "Verwaiste Verknüpfungen zu Bankbewegungen gefunden. Bei folgenden Bankbewegungen ist eine interne Verknüpfung gelöscht worden:");
 
     for my $bt_orphaned (@{ $bt_assigned_no_link }) {
-      $self->tester->diag("Verwendungszweck: $bt_orphaned->{purpose}");
+      $self->tester->diag("ID: $bt_orphaned->{id} Verwendungszweck: $bt_orphaned->{purpose}");
     }
   } else {
     $self->tester->ok(1, "Keine verwaisten Einträge in verknüpften Bankbewegungen (Richtung Bank).");
diff --git a/SL/BackgroundJob/SendFollowUpReminder.pm b/SL/BackgroundJob/SendFollowUpReminder.pm
new file mode 100644
index 000000000..0796695ed
--- /dev/null
+++ b/SL/BackgroundJob/SendFollowUpReminder.pm
@@ -0,0 +1,322 @@
+package SL::BackgroundJob::SendFollowUpReminder;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::AuthUser;
+use SL::DB::FollowUp;
+use SL::Locale::String qw(t8);
+use SL::Mailer;
+use SL::Presenter;
+use SL::Util qw(trim);
+
+use DateTime;
+use File::Slurp qw(slurp);
+use List::Util qw(any);
+use Try::Tiny;
+use URI;
+
+sub create_job {
+  $_[0]->create_standard_job('7 6 1-5 * *'); # every workday at 06:07
+}
+
+use Rose::Object::MakeMethods::Generic (
+ 'scalar' => [ qw(params) ],
+);
+
+#
+# If job does not throw an error,
+# success in background_job_histories is 'success'.
+# It is 'failure' otherwise.
+#
+# Return value goes to result in background_job_histories.
+#
+sub run {
+  my ($self, $db_obj) = @_;
+
+  $self->{$_} = [] for qw(job_errors);
+
+  $self->initialize_params($db_obj->data_as_hash) if $db_obj;
+
+  my   @follow_up_date_where = ();
+  push @follow_up_date_where, (follow_up_date => { ge    => [ $self->params->{from_date} ]}) if $self->params->{from_date};
+  push @follow_up_date_where, (follow_up_date => { le    => [ $self->params->{to_date}   ]}) if $self->params->{to_date};
+
+  my $follow_ups = SL::DB::Manager::FollowUp->get_all(where        => ['done.id' => undef,
+                                                                       @follow_up_date_where, ],
+                                                      with_objects => ['done'],
+                                                      sort_by      => ['follow_up_date']);
+
+  # Collect follow ups for users with e-mail-address.
+  my $mail_to_by_employee_id;
+  foreach my $follow_up (@$follow_ups) {
+
+    # add link
+    $follow_up->{link} = URI->new_abs('fu.pl?action=edit&id=' . $follow_up->id, $::form->_get_request_uri);
+
+    foreach my $employee (@{ $follow_up->created_for_employees }) {
+      next if $employee->deleted;
+
+      if (!exists $mail_to_by_employee_id->{$employee->id}) {
+        my $user = SL::DB::Manager::AuthUser->find_by(login => $employee->login);
+        if ($user) {
+          my $mail_to = trim($user->get_config_value('email'));
+
+          next if !$mail_to;
+
+          $mail_to_by_employee_id->{$employee->id}->{mail_to} = $mail_to;
+        }
+      }
+
+      if (exists $mail_to_by_employee_id->{$employee->id}) {
+        push @{ $mail_to_by_employee_id->{$employee->id}->{follow_ups} }, $follow_up;
+      }
+    }
+  }
+
+  foreach (keys %$mail_to_by_employee_id) {
+    my ($message, $content_type) = $self->generate_message($mail_to_by_employee_id->{$_}->{follow_ups});
+
+    my $mail              = Mailer->new;
+    $mail->{from}         = $self->params->{email_from};
+    $mail->{to}           = $mail_to_by_employee_id->{$_}->{mail_to};
+    $mail->{bcc}          = SL::DB::Default->get->global_bcc;
+    $mail->{subject}      = $self->params->{email_subject};
+    $mail->{message}      = $message;
+    $mail->{content_type} = $content_type;
+
+    my $error = $mail->send;
+
+    if ($error) {
+      push @{ $self->{job_errors} }, $error;
+    }
+  }
+
+  my $msg = t8('Follow ups reminder sent.');
+
+  # die if errors exists
+  if (@{ $self->{job_errors} }) {
+    $msg .= t8('The following errors occurred:');
+    $msg .= join "\n", @{ $self->{job_errors} };
+    die $msg . "\n";
+  }
+
+  return $msg;
+}
+
+# helper
+sub initialize_params {
+  my ($self, $data) = @_;
+
+  # valid parameters with default values
+  my %valid_params = (
+    from_date      => undef,
+    to_date        => DateTime->today_local->to_kivitendo,
+    email_from     => $::lx_office_conf{follow_up_reminder}->{email_from},
+    email_subject  => $::lx_office_conf{follow_up_reminder}->{email_subject},
+    email_template => $::lx_office_conf{follow_up_reminder}->{email_template},
+  );
+
+  # check user input param names
+  foreach my $param (keys %$data) {
+    die "Not a valid parameter: $param" unless exists $valid_params{$param};
+  }
+
+  # set defaults
+  $self->params(
+    { map { ($_ => $data->{$_} // $valid_params{$_}) } keys %valid_params }
+  );
+
+  # convert date from string to object
+  my ($from_date, $to_date);
+  try {
+    if ($self->params->{from_date}) {
+      $from_date = DateTime->from_kivitendo($self->params->{from_date});
+      # Not undef and no other type.
+      die unless ref $from_date eq 'DateTime';
+    }
+    if ($self->params->{to_date}) {
+      $to_date = DateTime->from_kivitendo($self->params->{to_date});
+      # Not undef and no other type.
+      die unless ref $to_date eq 'DateTime';
+    }
+  } catch {
+    die t8("Cannot convert date.") ."\n" .
+        t8("Input from string: #1", $self->params->{from_date}) . "\n" .
+        t8("Input to string: #1",   $self->params->{to_date})   . "\n" .
+        t8("Details: #1", $_);
+  };
+
+  $self->params->{from_date} = $from_date;
+  $self->params->{to_date}   = $to_date;
+
+  $self->params->{email_from} = trim($self->params->{email_from});
+  die t8('No email sender address given.') if !$self->params->{email_from};
+
+  return $self->params;
+}
+
+sub generate_message {
+  my ($self, $follow_ups) = @_;
+
+  # Force scripts/locales.pl to parse this template:
+  # parse_html_template('fu/follow_up_reminder_mail')
+  my $email_template = $self->params->{email_template};
+  my $template       = 'fu/follow_up_reminder_mail';
+  my $content_type   = 'text/html';
+  my $render_type    = 'html';
+
+  if ($email_template) {
+    my $content;
+    try {
+      $content = slurp $email_template;
+
+    } catch {
+      $::lxdebug->message(LXDebug->WARN(), 'Cannot read template file. Error: ' . $_);
+    };
+
+    return $self->generate_message_simple_text($follow_ups) if !$content;
+
+    $template     = \$content;
+    $content_type = $email_template =~ m/.html$/ ? 'text/html' : 'text/plain';
+    $render_type  = $email_template =~ m/.html$/ ? 'html'      : 'text';
+  }
+
+  my $output = SL::Presenter->get->render($template,
+                                          {type => $render_type},
+                                          follow_ups => $follow_ups);
+
+  return ($output, $content_type);
+}
+
+sub generate_message_simple_text {
+  my ($self, $follow_ups) = @_;
+
+  my $output = t8('Unfinished follow-ups') . ":\n";
+  foreach my $follow_up (@$follow_ups) {
+    $output .= t8('Follow-Up Date') . ': ' . $follow_up->follow_up_date_as_date;
+    $output .= ': ' . $follow_up->note->subject;
+    $output .= ': (' . t8('by') . ' ' . $follow_up->created_by_employee->safe_name . ')';
+    $output .= ' (' . $follow_up->{link} . ')';
+    $output .= "\n";
+  }
+
+  $output .= "\n\n";
+
+  return ($output, 'text/plain');
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::SendFollowUpReminder - Send emails to employees to
+remind them of due follow ups
+
+=head1 SYNOPSIS
+
+Get all due follow ups. This are the ones that are not done yet and have a
+follow up date until today (configurable, see below).
+For each employee addreesed by this follow ups, an email is send (if the
+employees email address is configured).
+
+=head1 CONFIGURATION
+
+In the kivitendo configuration file (C<config/kivitendo.conf>) in the section
+"follow_up_reminder" some settings can be made:
+
+=over 4
+
+=item C<email_from>
+
+The senders email address. This information can be overwriten by
+data provided to the background job.
+
+=item C<email_subject>
+
+The subject of the emails. This information can be overwriten by
+data provided to the background job.
+
+=item C<email_template>
+
+A template file used to generate the emails content. It will be given an
+array of the follow ups in the template variable C<follow_ups>.
+You can provide a text or a html template.
+If not given, it defaults to C<fu/follow_up_reminder_mail.html> in the
+webpages directory.
+If given, but not found, a simple text version will be generated as
+content.
+This information can be overwriten by data provided to the background job.
+
+=back
+
+Also some data can be provided to configure this backgroung job.
+If there is data provided and it cannot be validated the background job
+fails.
+
+Example:
+
+  from_date: 01.01.2022
+  to_date: 01.07.2022
+  email_subject: To-Do
+
+=over 4
+
+=item C<from_date>
+
+The date from which on follow ups not done yet should be collected. It defaults
+undef which means from the beginning on.
+
+Example (format depends on your settings):
+
+from_date: 01.01.2022
+
+=item C<to_date>
+
+The date till which follow ups not done yet should be collected. It defaults
+to today.
+
+Example (format depends on your settings):
+
+to_date: 01.07.2022
+
+=item C<email_from>
+
+The senders email address. It defaults to the one given in the kivitendo
+configuration file (see above). This information must be provided some
+how.
+
+Example:
+
+email_from: bernd@kivitendo.de
+
+=item C<email_subject>
+
+The subject of the emails.
+It defaults to the one given in the kvitendo configuration file (see above).
+
+email_subject: To-Do
+
+=item C<email_template>
+
+A template file used to generate the emails content. It will be given an
+array of the follow ups in the template variable C<follow_ups>. You can
+provide a text or a html template.
+It defaults to the one given in the kvitendo configuration file (see above).
+
+email_template: templates/my_templates/my_reminder_template.txt
+
+=back
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/SetBankAccountsMasterData.pm b/SL/BackgroundJob/SetBankAccountsMasterData.pm
new file mode 100644
index 000000000..ffe40b730
--- /dev/null
+++ b/SL/BackgroundJob/SetBankAccountsMasterData.pm
@@ -0,0 +1,125 @@
+package SL::BackgroundJob::SetBankAccountsMasterData;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DBUtils;
+
+sub run {
+  my ($self, $db_obj)     = @_;
+
+  my $data                = $db_obj->data_as_hash;
+
+  die "No valid integer for months"  if $data->{months}    && $data->{months}     !~ /^[1-9][0-9]*$/;
+  die "No valid value for overwrite" if $data->{overwrite} && $data->{overwrite}  !~ /^(0|1)$/;
+  die "No valid value for dry_run"   if $data->{dry_run}   && $data->{dry_run}    !~ /^(0|1)$/;
+
+  $self->{dry_run}   = $data->{dry_run}    ? 1               : 0;
+  $self->{overwrite} = $data->{overwrite}  ? 1               : 0;
+  $self->{months}    = $data->{months}     ? $data->{months} : 6;
+
+  my (@updates_vendor, @updates_customer);
+
+  foreach my $vc_type (qw(customer vendor)) {
+    my $bank_vc = _get_bank_data_vc(vc => $vc_type, months => $self->{months});
+
+    foreach my $bank_vc_entry (@{ $bank_vc }) {
+      if ($bank_vc_entry->{remote_account_number}) {
+        my $vc =  $vc_type eq 'customer'
+                ? SL::DB::Customer->new(id => $bank_vc_entry->{customer_id})->load
+                : SL::DB::Vendor  ->new(id => $bank_vc_entry->{vendor_id})  ->load;
+
+        next if $vc->can('mandate_date_of_signature') && $vc->mandate_date_of_signature;
+        next if $vc->iban && !$self->{overwrite};
+
+        push @updates_customer, $vc->name . " -> " . $bank_vc_entry->{remote_account_number} if $vc_type eq 'customer';
+        push @updates_vendor,   $vc->name . " -> " . $bank_vc_entry->{remote_account_number} if $vc_type eq 'vendor';
+
+        next if $self->{dry_run};
+
+        $vc->update_attributes(iban => $bank_vc_entry->{remote_account_number}, bic => $bank_vc_entry->{remote_bank_code});
+      }
+    }
+  }
+  my $msg = $self->{dry_run} ? "DRY RUN Updates: " : "Updates: ";
+  $msg   .= "Customer: " . join (',', @updates_customer) . "\n Vendors: "  . join (',', @updates_vendor);
+
+  return $msg;
+}
+
+sub _get_bank_data_vc {
+  my (%params) = @_;
+
+  die "Need a defined value for params(vc)"     unless $params{vc};
+  die "Need a defined value for params(months)" unless $params{months};
+
+  die "Need valid vc param, got:"     . $params{vc}     unless $params{vc}     =~ /^(customer|vendor)$/;
+  die "Need valid months param, got:" . $params{months} unless $params{months} =~ /^[1-9][0-9]*$/;
+
+  my $vc_id = $params{vc} . '_id';
+
+  my $arap  =   $params{vc} eq 'customer' ? 'ar'
+              : $params{vc} eq 'vendor'   ? 'ap'
+              : undef;
+
+
+  my $dbh = SL::DB->client->dbh;
+  my $query = <<SQL;
+  SELECT bt.remote_bank_code, bt.remote_account_number, $vc_id
+  FROM $arap
+  LEFT JOIN bank_transaction_acc_trans bta ON id = bta.${arap}_id
+  LEFT JOIN bank_transactions bt ON bt.id = bta.bank_transaction_id
+  WHERE $vc_id IN (SELECT DISTINCT $vc_id FROM $arap WHERE transdate > now() - interval '$params{months} month' AND paid = amount)
+  AND bta.${arap}_id IS NOT NULL
+  GROUP BY bt.remote_account_number,bt.remote_bank_code, $vc_id
+  ORDER BY $vc_id
+SQL
+
+  my $result = selectall_hashref_query($::form, $dbh, $query);
+
+  return $result;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::SetBankAccountsMasterData —
+Background job for setting IBAN and BIC for Customers and Vendors
+regarding to the booked bank transactions for this companies.
+
+=head1 SYNOPSIS
+
+This background job searches all invoices which are paid by bank transactions
+and gets the IBAN and BIC for those transactions.
+If the IBAN and BICs in the master data are not yet set, they will be
+set via this background jobs.
+
+By default the job only adds IBAN and BIC for entries which have no
+manual entry before.
+The job accepts three parameters:
+
+C<dry_run> -> No data will be changed, instead the changes will be
+written to the job journal.
+
+C<months> -> The intervall in months for which invoices are fetched, defaults
+to 6 (months).
+
+C<overwrite> -> If set to 1 values in the master data will be changed
+even if they are already exists, except if a mandate_date_of_signature is
+found. Those data sets won't be changed because kivitendo assumes that there
+is a direct debit contract for exactly this account with this specific company.
+
+The job is deactivated by default. Administrators of installations
+where such a feature is wanted have to create a job entry manually.
+
+=head1 AUTHOR
+
+Jan Büren E<lt>jan@kivitendo.deE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/SetClosedTo.pm b/SL/BackgroundJob/SetClosedTo.pm
new file mode 100644
index 000000000..ca7d133ce
--- /dev/null
+++ b/SL/BackgroundJob/SetClosedTo.pm
@@ -0,0 +1,50 @@
+package SL::BackgroundJob::SetClosedTo;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::Helper::DateTime;
+
+sub create_job {
+  $_[0]->create_standard_job('1 0 10 * *'); # always the 10th of the month
+}
+
+
+sub run {
+  my ($self, $db_obj) = @_;
+  my $data       = $db_obj->data_as_hash;
+
+  my $subtract_month = $data->{subtract_month} || 1;
+  my $subtract_days  = $data->{subtract_days}  || 10;
+
+  die "No integer number for days or month" unless ($subtract_month =~ m/^\d+\z/
+                                                 && $subtract_days  =~ m/^\d+\z/);
+
+  # new closedto
+  my $new_closedto = DateTime->now_local->subtract(months => $subtract_month, days => $subtract_days);
+
+  my $defaults   = SL::DB::Default->get;
+
+  # dont accidently open the books
+  return 1 if ($defaults->closedto && $defaults->closedto >= $new_closedto);
+
+  $defaults->closedto($new_closedto);
+  $defaults->save || die "Cannot save closedto!";
+
+  return 1;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::SetClosedTo - Background job for
+periodically setting closedto (books closed until).
+Defaults to the end of the second last month.
+
+=cut
diff --git a/SL/BackgroundJob/SetNumberRange.pm b/SL/BackgroundJob/SetNumberRange.pm
index a7976f472..ca25c9143 100644
--- a/SL/BackgroundJob/SetNumberRange.pm
+++ b/SL/BackgroundJob/SetNumberRange.pm
@@ -23,15 +23,40 @@ sub run {
   if ($data->{multiplier}  && !($data->{multiplier} % 10 == 0)) {
     die "No valid input for multiplier should be 10, 100, .., 1000000";
   }
-  my $next_year  = DateTime->today_local->truncate(to => 'year')->add(years => 1)->year();
-  $next_year     = ($data->{digits_year} == 2) ? substr($next_year, 2, 2) : $next_year;
+  if ($data->{monthly} && $data->{monthly_strftime}) {
+    DateTime->today_local->strftime($data->{monthly_strftime}) // die "No valid input for montly_strftime";
+  }
+
+  # new year
+  my $running_year  =  $data->{current_year} ? DateTime->today_local->truncate(to => 'year')
+                     : DateTime->today_local->truncate(to => 'year')->add(years => 1)->year();
+
+  $running_year     = ($data->{digits_year} == 2) ? substr($running_year, 2, 2) : $running_year;
+
   my $multiplier = $data->{multiplier} || 100;
 
+  # or new month
+  my $today_dt   = DateTime->today_local;
+
+  my $today      =  $data->{monthly_strftime}     ? $today_dt->strftime($data->{monthly_strftime})
+                  : $today_dt->strftime('%y-%m-');
+
+  $today         =  $data->{monthly_postfix} ? $today . $data->{monthly_postfix} : $today . '000';
+
   my $defaults   = SL::DB::Default->get;
 
-  foreach (qw(invnumber cnnumber sonumber ponumber sqnumber rfqnumber sdonumber pdonumber)) {
-    my $current_number = SL::PrefixedNumber->new(number => $defaults->{$_});
-    $current_number->set_to($next_year * $multiplier);
+  my $current_number;
+  foreach (qw(invnumber cnnumber soinumber pqinumber sonumber ponumber pocnumber
+              sqnumber rfqnumber sdonumber pdonumber sudonumber rdonumber
+              s_reclamation_record_number p_reclamation_record_number           )) {
+
+
+    if ($data->{monthly}) {
+      $current_number = SL::PrefixedNumber->new(number => $today);
+    } else {
+      $current_number = SL::PrefixedNumber->new(number => $defaults->{$_});
+      $current_number->set_to($running_year * $multiplier);
+    }
     $defaults->{$_} = $current_number->get_current;
   }
   $defaults->save() || die "Could not change number ranges";
@@ -40,3 +65,47 @@ sub run {
 }
 
 1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::SetNumberRange —
+Background job for setting all kivitendo number ranges for a new year or a new month
+
+=head1 SYNOPSIS
+
+The job can either be run annually or monthly and defaults to annually.
+
+The background job accepts the following optional json encoded parameters in the data for monthly mode:
+
+C<monthly>: If set to true the job assumes it is the first of a new month
+
+C<monthly_postfix>: A user postfix can be defined as a string for the new number.
+If nothing is set three zeros are added as a postfix string ('000').
+
+C<monthly_strftime>: Year, month and day can optional be defined as user input in the
+same way as the C strftime method. If nothing is set 'y%-m%' is the default. More options at the
+time of writing can be found here: https://metacpan.org/pod/DateTime#strftime-Patterns
+
+The backgroud accepts the following optional json encoded parameters in the data for the annually mode (default):
+
+C<multiplier>: Multiplier to set the number range (defaults to 100)
+
+C<digits_year>: Handles the encoding of the year (can be 2 or 4, ie 24 or 2024). Defaults to 4
+
+C<current_year>: If set to 1 the current year will be used and not the next year.
+
+
+The latter option is useful if the jobs runs on the 1st of the new year.
+
+The job is deactivated by default. Administrators of installations
+where such a feature is wanted have to create a job entry manually.
+
+=head1 AUTHOR
+
+Jan Büren E<lt>jan@kivitendo.deE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/ShopOrderMassTransfer.pm b/SL/BackgroundJob/ShopOrderMassTransfer.pm
index 62437a706..0bfa1304d 100644
--- a/SL/BackgroundJob/ShopOrderMassTransfer.pm
+++ b/SL/BackgroundJob/ShopOrderMassTransfer.pm
@@ -61,6 +61,7 @@ sub create_order {
         }else{
           $order->save;
           $order->calculate_prices_and_taxes;
+          SL::DB::OrderVersion->new(oe_id => $order->id, version => 1)->save;
           my $snumbers = "ordernumber_" . $order->ordnumber;
           SL::DB::History->new(
                             trans_id    => $order->id,
diff --git a/SL/BackgroundJob/ShopPartMassCreate.pm b/SL/BackgroundJob/ShopPartMassCreate.pm
new file mode 100644
index 000000000..068d0b5f4
--- /dev/null
+++ b/SL/BackgroundJob/ShopPartMassCreate.pm
@@ -0,0 +1,249 @@
+package SL::BackgroundJob::ShopPartMassCreate;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use List::Util qw(first);
+use File::MimeInfo::Magic; # for mimetype
+use File::Slurp; # for read_file
+
+use SL::Shop;
+use SL::DB::Part;
+use SL::DB::ShopPart;
+use SL::DB::File;
+use SL::CVar;
+use SL::File;
+use SL::LXDebug;
+
+sub recurse_categories {
+  my ($categories, $categories_by_names) = @_;
+  foreach my $category (@{ $categories }) {
+    ${ $categories_by_names }{$category->{name}} = $category->{id};
+    recurse_categories($category->{children}, $categories_by_names);
+  }
+}
+
+sub get_shop_part {
+  my ($part_id, $shop_id) = @_;
+  my $exists = SL::DB::Manager::ShopPart->find_by( part_id => $part_id, shop_id => $shop_id );
+  if ($exists) {
+    return $exists;
+  }
+  return SL::DB::ShopPart->new( part_id => $part_id, shop_id => $shop_id );
+}
+
+sub get_shop_categories {
+  my ($cvar_categories, $categories_by_names) = @_;
+  # split on the pipe character
+  my @categories_names = split(/\|/, $cvar_categories);
+
+  my @shop_categories;
+  foreach my $category_name (@categories_names) {
+    # if the category exists in the shop
+    if (exists $categories_by_names->{$category_name}) {
+      push @shop_categories, [
+        $categories_by_names->{$category_name},
+        $category_name
+      ];
+    }
+  }
+  return \@shop_categories;
+}
+
+sub sanitize_filename {
+    my ($filename) = @_;
+    $filename =~ s/\W/_/g;
+    return $filename;
+}
+
+sub _warn {
+  my ($messages, $message) = @_;
+  $main::lxdebug->message(LXDebug::WARN(), $message);
+  push @$messages, $message;
+}
+
+sub run {
+  my ($self, $db_obj)     = @_;
+  my $data       = $db_obj->data_as_hash;
+
+  # get parameters
+  my $shop_id = $data->{shop_id} || 1;
+  my $images_import_path = $data->{images_import_path} || 'shopimages/product/';
+  my $cvar_categories = $data->{cvar_categories} || 'vm_product_categories';
+
+  my @messages;
+
+  # initialize shop
+  my $shop_config = SL::DB::Manager::Shop->get_first( query => [ id => $shop_id ] );
+  my $shop = SL::Shop->new( config => $shop_config );
+
+  # get the categories from the shop
+  my $connect = $shop->check_connectivity;
+  if (!$connect->{success}) {
+    return 'Error: could not connect to shop';
+  }
+  my $categories_shopdata = $shop->connector->get_categories();
+  if (!$categories_shopdata) {
+    return 'Error: could not get categories from shop';
+  }
+
+  # generate a hash of the category names and their ids
+  my %categories_by_names;
+  recurse_categories($categories_shopdata, \%categories_by_names);
+
+  # get all the parts from the database, that are marked as shop parts
+  my $parts = SL::DB::Manager::Part->get_all(query => [ shop => 1 ]);
+
+  # for every part
+  for my $part (@{ $parts }) {
+
+    # check if shop part already exists
+    my $shop_part = get_shop_part($part->id, $shop_id);
+
+    # get the custom variables from the part
+    my $cvars = CVar->get_custom_variables(module => 'IC', trans_id => $part->id);
+    my $cvar_categories = first { $_->{name} eq $cvar_categories } @{ $cvars };
+
+    # assign categories
+    my $shop_categories = get_shop_categories($cvar_categories->{value}, \%categories_by_names);
+
+    $shop_part->assign_attributes(
+      shop_description => '',
+      front_page       => '',
+      active           => 1,
+      shop_category    => $shop_categories,
+      active_price_source => 'master_data/sellprice',
+      metatag_keywords => '',
+      metatag_description => '',
+      metatag_title => '',
+    );
+
+    $shop_part->save;
+    $main::lxdebug->message(LXDebug->DEBUG1(), 'Shop part saved: ' . $shop_part->id);
+
+    if (!$shop_part->id) {
+      _warn(\@messages, 'Warning: shop part not saved, part id: ' . $part->id . ' part number: ' . $part->partnumber);
+      next;
+    }
+
+    # handle the images,
+    # the file names are under part->image
+
+    if (!$part->image) {
+      # go to next part if no images are found
+      next;
+    }
+
+    # get existing images from shop part
+    my $image_files = SL::DB::Manager::File->get_all( where => [ object_id => $part->id, object_type => 'shop_image' ] );
+
+    my %images_by_names = map { $_->{file_name} => $_ } @{ $image_files };
+
+    for my $image_name (split '\|', $part->image) {
+
+      my $fileobj;
+      if (exists $images_by_names{$image_name}) {
+        # I tried updating or deleting the file, but that didn't work
+        # so for now we'll just skip the image if an image with the same name already exists
+        # (atm there doesn't seem to be a mechanism in place to update or delete the files properly)
+        next;
+      }
+
+      my $image_path = $images_import_path . $image_name;
+
+      # uses File::MimeInfo::Magic
+      my $mime_type = mimetype($image_path);
+
+      # check if the file exists
+      if (! -e $image_path) {
+        _warn(\@messages, 'Warning: image file not found for part: ' . $part->id . ' file: ' . $image_name);
+        next;
+      }
+      # read file data into memory
+      my $file_data = File::Slurp::read_file($image_path);
+
+      $fileobj = SL::File->save(
+        object_id        => $part->id,
+        object_type      => 'shop_image',
+        mime_type        => $mime_type,
+        source           => 'uploaded',
+        file_type        => 'image',
+        file_name        => $image_name,
+        title            => sanitize_filename(substr($part->description, 0, 45)),
+        description      => '',
+        file_contents    => $file_data,
+        file_path        => $image_path,
+      );
+      if (!$fileobj) {
+        _warn(\@messages, 'Warning: file not saved for part: ' . $part->id . ' file: ' . $image_name);
+      }
+    }
+  }
+
+  if (@messages) {
+    return join("\n", @messages);
+  }
+  return 'Shop parts created successfully';
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::ShopPartMassCreate - Background job to create shop
+parts for all parts in the database that are marked as shop parts.
+
+=head1 SYNOPSIS
+
+This background job provides the basic functionality to create shop parts for
+all parts in the database that are marked as shop parts.
+
+It can also import images from a directory and assign them to the respective
+shop parts. See configuration below.
+
+It also assigns categories to the shop parts based on a custom variable of the
+part.
+
+The script may need individual adjustments to fit your specific use case.
+
+=head1 CONFIGURATION
+
+Accepts the following parameters:
+
+=over 4
+
+=item C<shop_id>
+
+The id of the shop to create the shop parts in, defaults to 1
+
+=item C<images_import_path>
+
+The path to the images to import, defaults to 'shopimages/product/'
+
+The file names of the images should be present in the 'image' field of the part,
+in the following format:
+  image1.jpg|image2.png|image3.gif
+
+The images themselves should be present in the images_import_path.
+
+=item C<cvar_categories>
+
+The name of the custom variable that contains the categories, defaults to 'vm_product_categories'
+
+Expects the Categories to be set in the custom variable of the part in the following format:
+  Category1|Category2|Category3
+
+Categories should be present in the shop under the same names.
+
+=back
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/ShopwareSetPaid.pm b/SL/BackgroundJob/ShopwareSetPaid.pm
new file mode 100644
index 000000000..738701316
--- /dev/null
+++ b/SL/BackgroundJob/ShopwareSetPaid.pm
@@ -0,0 +1,72 @@
+package SL::BackgroundJob::ShopwareSetPaid;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::Invoice;
+use SL::Locale::String qw(t8);
+use SL::Shop;
+
+sub run {
+  my ($self, $db_obj)     = @_;
+  my $data       = $db_obj->data_as_hash;
+
+  my $dry_run = ($data->{dry_run})  ? 1 : 0;
+  my $today   = ($data->{datepaid}) ? DateTime->from_kivitendo($data->{datepaid}) : DateTime->today_local;
+
+  my $paid_invoices = SL::DB::Manager::Invoice->get_all(query => [ and => [ datepaid => { ge => $today }, amount  =>   \'paid'  ]]);
+
+  my @shoporders;
+  foreach my $invoice (@{ $paid_invoices }) {
+    # check if we have a shop order invoice
+    my @linked_shop_orders = $invoice->linked_records(
+                               from => 'ShopOrder',
+                               via  => ['DeliveryOrder','Order'],
+                             );
+    my $shop_order = $linked_shop_orders[0][0];
+    if ( $shop_order ) {
+       #do update
+       push @shoporders, $shop_order->shop_ordernumber;
+       next if $dry_run;
+       my $shop_config = SL::DB::Manager::Shop->get_first( query => [ id => $shop_order->shop_id ] );
+       my $shop = SL::Shop->new( config => $shop_config );
+       $shop->connector->set_order_transaction_status($shop_order->shop_ordernumber, "paid");
+    }
+  }
+  # nothing found
+  return t8("No valid invoice(s) found") if scalar @shoporders == 0;
+
+  my $message = t8("The following Shop Orders: ") . join (', ', @shoporders);
+  $message   .= $dry_run ? t8(" would be set to the state 'paid'") : t8(" have been set to the state 'paid'");
+
+  return $message;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::ShopwareSetPaid
+
+Background job for setting the shopware state paid for shopware orders
+
+With the default values the job should be run once a day after all payments are booked.
+
+=head1 SYNOPSIS
+
+Accepts two params 'dry_run' and 'datepaid'.
+If 'dry_run' has trueish vale, the job simply returns what would have been done in the Background Job Journal.
+If 'datepaid' is set all Invoices with a datepaid higher or equal the 'datepaid' value are checked. Date should be
+in the correct system locales. If ommitted datepaid will be the current date.
+
+
+=head1 AUTHOR
+
+Jan Büren
+
+=cut
diff --git a/SL/BackgroundJob/SyncEmailFolder.pm b/SL/BackgroundJob/SyncEmailFolder.pm
new file mode 100644
index 000000000..e88289ae3
--- /dev/null
+++ b/SL/BackgroundJob/SyncEmailFolder.pm
@@ -0,0 +1,98 @@
+package SL::BackgroundJob::SyncEmailFolder;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use Params::Validate qw(:all);
+
+use SL::IMAPClient;
+use SL::DB::Manager::EmailImport;
+
+sub sync_email_folder {
+  my ($self) = @_;
+  my $folder = $self->{job_obj}->data_as_hash->{folder};
+
+  my $imap_client = SL::IMAPClient->new(%{$::lx_office_conf{imap_client}});
+
+  my $email_import = $imap_client->update_emails_from_folder(
+    folder => $folder
+  );
+  return unless $email_import;
+
+  return "Created email import: " . $email_import->id;
+}
+
+sub delete_email_imports {
+  my ($self) = @_;
+  my $job_obj = $self->{job_obj};
+
+  my $email_import_ids_to_delete =
+    $job_obj->data_as_hash->{email_import_ids_to_delete} || [];
+
+  my @deleted_email_imports_ids;
+  foreach my $email_import_id (@$email_import_ids_to_delete) {
+    my $email_import = SL::DB::Manager::EmailImport->find_by(id => $email_import_id);
+    next unless $email_import;
+    $email_import->delete(cascade => 1);
+    push @deleted_email_imports_ids, $email_import_id;
+  }
+  return unless @deleted_email_imports_ids;
+
+  return "Deleted email import(s): " . join(', ', @deleted_email_imports_ids);
+}
+
+sub run {
+  my ($self, $job_obj) = @_;
+  $self->{job_obj} = $job_obj;
+  my @bj_data = $job_obj->data_as_hash;
+  validate_with(
+    params => \@bj_data,
+    spec   => {
+      folder => {
+        type =>
+        SCALAR, optional => 1
+      },
+      email_import_ids_to_delete => {
+        type => ARRAYREF,
+        optional => 1,
+      }
+    },
+    called => "data filed in Background Job",
+  );
+
+  my @results;
+  push @results, $self->delete_email_imports();
+  push @results, $self->sync_email_folder();
+
+  return join(". ", grep { $_ ne ''} @results);
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::SyncEmailFolder - Background job for syncing emails from a folder
+
+=head1 SYNOPSIS
+
+This background job is used to sync emails from a folder. It can be used to sync
+emails from a folder on a regular basis for multiple folders. The folder to sync
+is specified in the data field 'folder' of the background job, by default the
+folder 'base_folder' from IMAP client is used. Sub folders are separated by a
+forward slash, e.g. 'INBOX/Archive'. Subfolders are not synced.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/SyncWebDAV.pm b/SL/BackgroundJob/SyncWebDAV.pm
new file mode 100644
index 000000000..9b325ae73
--- /dev/null
+++ b/SL/BackgroundJob/SyncWebDAV.pm
@@ -0,0 +1,163 @@
+package SL::BackgroundJob::SyncWebDAV;
+
+use strict;
+use warnings;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::BackgroundJobHistory;
+use HTTP::DAV;
+use File::Find;
+use Cwd;
+use Data::Dumper;
+
+sub create_job {
+  $_[0]->create_standard_job('0 3 * * *'); # daily at 3:00 am
+}
+
+sub run {
+  my $self    = shift;
+  my $db_obj  = shift;
+
+  my $options     = $db_obj->data_as_hash;
+  my $DELETE_ONLY = 0 || $options->{delete};
+
+  return unless $::instance_conf->get_webdav_sync_extern;
+
+  my $ret;
+
+  my $dav     = HTTP::DAV->new();
+  my $url     = $::instance_conf->get_webdav_sync_extern_url;
+  $url        =~ s|/\z||;  # no trailing slashes
+
+  $dav->credentials(
+       -user  =>  $::instance_conf->get_webdav_sync_extern_login,
+       -pass  =>  $::instance_conf->get_webdav_sync_extern_pass,
+       -url   =>  $url,
+  );
+  my $client_id   = $options->{client_id} || $::auth->get_session_value('client_id');
+  my $cwd = getcwd();
+
+  my @fails;
+
+  eval {
+
+    my (@webdav_dir_temp, @webdav_dir, @webdav_files);
+
+    # chdir to client root
+    my $webdav = $cwd. "/webdav/$client_id/";
+    chdir($webdav) or die "couldn't change into webdav dir"; # TODO throw better error message (Permission denied, etc)
+
+    find( { wanted => sub { push @webdav_dir_temp, -d && $_}, no_chdir => 1 }, '.');
+    find( { wanted => sub { push @webdav_files, -f && $_}, no_chdir => 1    }, '.');
+
+    shift @webdav_dir_temp; # first element would be undef after substr
+    foreach (@webdav_dir_temp) {
+      next unless $_;
+      push @webdav_dir, substr($_,2);
+    }
+    @webdav_files = map { substr($_,2) } grep { $_ =~ m/.*pdf/ } @webdav_files;
+
+    $ret = $dav->open(-url => $url) or die "Can't open url $url";
+    # Make a null lock on repo for 5minutes
+    #$ret = $dav->lock(-url => $url, -timeout => "30m") or die;
+
+    foreach (@webdav_dir) {
+      last if $DELETE_ONLY;
+
+      $ret             = $dav->options(-url => $url . '/' . $_);
+      next unless $ret =~ m/MKCOL/;
+
+      unless ( $dav->mkcol($_) ) {
+        push(@fails, "Cannot make dir $_");
+      };
+    }
+
+    #$dav->unlock(-url => $url); # UNLOCK after DIR sync
+    # now we have all dirs in sync, therefore we can place files
+    foreach (@webdav_files) {
+      last if $DELETE_ONLY;
+
+      $ret         = $dav->options(-url => $url . '/' . $_);
+      # $main::lxdebug->message(0, 'verzeichnis:'. $_ . '::' . $ret . ':' . $dav->message);
+      next unless $ret =~ m/MKCOL/;  # file not there #owncloud gives DELETE even if file not there
+      #$dav->lock(-url => $url . '/' . $_); # UNLOCK after DIR sync
+
+      # $main::lxdebug->message(0, 'datei:'. $_);
+      unless ( $dav->put(-local => $_, -url => $url . '/' . $_) ) {
+        push(@fails, "Cannot put file $_");
+      };
+      #$dav->unlock(-url => $url . '/' . $_); # UNLOCK after put
+    }
+
+    # maybe we delete some stuff
+    # TODO delete stuff here
+    if ($DELETE_ONLY) {
+      foreach (qw(anfragen bestellungen einkaufslieferscheine einkaufsrechnungen angebote
+             gutschriften lieferantenbestellungen rechnungen verkaufslieferscheine)) {
+        $ret = $dav->delete($url . "/$_");
+      }
+
+      # better, but not implemented - delete only local deleted stuff
+      # idea: propfind all the above dirs and check if child (rel_uri) exists locally
+      # if not, we can safely delete remote
+      # if (my $r=$dav->propfind( -url=>"$_/", -depth=>1) ) { ...
+    }
+
+    #$dav->unlock(-url => $url);
+    chdir($cwd);
+
+    1;
+
+  } or do {
+    my $error = "dav: " . $dav->message . ", eval: " . $! . ", eval 2: " . $@;
+   # $dav->unlock(-url => $url);    # unlock, just in case
+    # chdir($cwd);
+    die("Couldn't sync with external webdav repo at $url error code/protocol return:" . $error);
+  };
+
+  if ( @fails ) {
+    die join("\n", @fails);
+  };
+
+  return 1;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::ExternalSyncWebDAV - Background job for
+syncing all folders and files for current client to a external
+webdav-repository
+
+=head1 SYNOPSIS
+
+This background job copies all files and folders for one client
+to a external webdav-repo.
+A optional param C<delete> can be set to 1 to delete (clean)
+the external repo. If set to undef or 0 a folderwise copy will be
+executed.
+To test with different clients a param C<client_id> will overload
+the current client id.
+The settings for the external repo are in client config.
+If a lock still exists, the job returns a Internal Server Error
+from the webdav server.
+Only pdf files are considered valid files to copy.
+
+The job is supposed to run once a day.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Jan Büren E<lt>jan@kivitendo-premium.deE<gt>
+
+=cut
+
diff --git a/SL/BackgroundJob/UpdateEmployeeBaseData.pm b/SL/BackgroundJob/UpdateEmployeeBaseData.pm
new file mode 100644
index 000000000..b61a6b487
--- /dev/null
+++ b/SL/BackgroundJob/UpdateEmployeeBaseData.pm
@@ -0,0 +1,44 @@
+package SL::BackgroundJob::UpdateEmployeeBaseData;
+
+use strict;
+use utf8;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::BackgroundJob;
+use SL::DB::Employee;
+
+sub run {
+  my ($self, $db_obj, $end_date) = @_;
+
+  SL::DB::Manager::Employee->update_entries_for_authorized_users;
+
+  return 1;
+}
+
+1;
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::UpdateEmployeeBaseData - Background job for copying
+user data from the auth database to the "employee" table
+
+=head1 OVERVIEW
+
+When authentication via HTTP headers is active the regular login
+routine is skipped. That routine would normally copy values from the
+auth database to the employee table. This job can be run regularly to
+copy the same values.
+
+The job is enabled & set to run every five minutes by default.
+
+=head1 AUTHOR
+
+Moritz Bunkus E<lt>m.bunkus@linet.deE<gt>
+
+=cut
diff --git a/SL/BackgroundJob/UpdateExchangerates.pm b/SL/BackgroundJob/UpdateExchangerates.pm
new file mode 100644
index 000000000..3573257f9
--- /dev/null
+++ b/SL/BackgroundJob/UpdateExchangerates.pm
@@ -0,0 +1,164 @@
+package SL::BackgroundJob::UpdateExchangerates;
+
+use strict;
+use utf8;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::Exchangerate;
+use SL::DB::Currency;
+
+use Rose::Object::MakeMethods::Generic (
+  scalar => [ qw(worker) ],
+);
+
+
+sub create_job {
+  my $self_or_class = shift;
+
+  my $package       = ref($self_or_class) || $self_or_class;
+  $package          =~ s/SL::BackgroundJob:://;
+
+  my $cron_spec     = ('35 4 * * *'); # every day at 4:35 am
+
+  my $data = <<DATA;
+module: FromYahoo
+options:
+  translate:
+    £: GBP
+DATA
+
+  my %params = (cron_spec    => $cron_spec,
+                type         => 'interval',
+                active       => 1,
+                package_name => $package,
+                data         => $data);
+
+  my $job = SL::DB::Manager::BackgroundJob->find_by(package_name => $params{package_name});
+  if (!$job) {
+    $job = SL::DB::BackgroundJob->new(%params)->update_next_run_at;
+  } else {
+    $job->assign_attributes(%params)->update_next_run_at;
+  }
+
+  return $job;
+}
+
+sub run {
+  my ($self, $db_obj) = @_;
+
+  my $params = $db_obj->data_as_hash;
+
+  return $::locale->text('Parameter module must be given.') if !$params->{module};
+
+  # instanciate worker for given module
+  my $error;
+  eval {
+    my $worker_class = 'SL::BackgroundJob::UpdateExchangerates::' . $params->{module};
+    eval "require $worker_class";
+    $self->worker($worker_class->new(options => $params->{options}));
+    1;
+  } or do {
+    $error = $::locale->text('Could not load class #1 (#2): "#3"', $params->{module}, 'SL/BackgroundJob/UpdateExchangerates', $@);
+  };
+  return $error if $error;
+
+  my $default_currency = SL::DB::Currency->new(id => $::instance_conf->get_currency_id)->load;
+  my $transdate = DateTime->today_local;
+  my @rates_to_update;
+
+  # collect currencies that should be updated
+  foreach my $currency (@{SL::DB::Manager::Currency->get_all_sorted}) {
+    next if $currency->id == $default_currency->id;
+
+    my $exrate = SL::DB::Manager::Exchangerate->find_by(transdate => $transdate, currency_id => $currency->id);
+
+    if (!$exrate) {
+      push @rates_to_update, {from => $default_currency,
+                              to   => $currency,
+                              dir  => 'buy'};
+      push @rates_to_update, {from => $default_currency,
+                              to   => $currency,
+                              dir  => 'sell'};
+      next;
+    }
+
+    if (!$exrate->buy) {
+      push @rates_to_update, {from => $default_currency,
+                              to   => $currency,
+                              dir  => 'buy'};
+    }
+    if (!$exrate->sell) {
+      push @rates_to_update, {from => $default_currency,
+                              to   => $currency,
+                              dir  => 'sell'};
+    }
+  }
+
+  return "updated: 0" if scalar @rates_to_update == 0;
+
+  # update rates
+  $self->worker->update_rates(\@rates_to_update);
+
+  # save rates
+  my @updated;
+  foreach my $rate (@rates_to_update) {
+    my $exrate = SL::DB::Manager::Exchangerate->find_by_or_create(transdate => $transdate, currency_id => $rate->{to}->id);
+
+    next if !$exrate;           # should not happen
+
+    if ($rate->{rate}) {
+      $exrate->transdate($transdate) if !$exrate->transdate;
+      $exrate->currency($rate->{to}) if !$exrate->currency;
+
+      my $method = $rate->{dir};
+      if (!$exrate->$method) {
+        $exrate->$method($rate->{rate});
+        $exrate->save;
+        push @updated, $rate->{to}->name . " ($method: " . $rate->{rate} . ")";
+      }
+    }
+  }
+
+  return "updated: " . scalar @updated . ': ' . join ', ', @updated;
+}
+
+
+1;
+
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::UpdateExchangerates - Background job for updating the
+exchange rates for currencies
+
+=head1 SYNOPSIS
+
+This background job can update all exchange rates for currencies if the rates
+are not already present for the current date.
+A worker module must be given as data to the job (see documentation at
+SL::BackgroundJob::UpdateExchangerates::Base and
+SL::BackgroundJob::UpdateExchangerates::* as examples).
+The worker will be used to get the actual rates from some kind of service.
+Options to the worker can be given as data to the background job:
+
+module: FromOpenexchangerates
+options:
+  api_id: 1234565789
+  translate:
+    £: GBP
+
+=head1 Todo
+
+Better error handling / error notification
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
+
diff --git a/SL/BackgroundJob/UpdateExchangerates/Base.pm b/SL/BackgroundJob/UpdateExchangerates/Base.pm
new file mode 100644
index 000000000..84198d73a
--- /dev/null
+++ b/SL/BackgroundJob/UpdateExchangerates/Base.pm
@@ -0,0 +1,111 @@
+package SL::BackgroundJob::UpdateExchangerates::Base;
+
+use strict;
+
+use parent qw(Rose::Object);
+
+use Rose::Object::MakeMethods::Generic (
+  scalar => [ qw(options) ],
+);
+
+sub update_rates {
+  my ($self, $rates) = @_;
+  die 'needs to be overwritten';
+}
+
+sub translate_currency_name {
+  my ($self, $name) = @_;
+
+  return $name if (!$self->options->{translate});
+  return $self->options->{translate}->{$name} if $self->options->{translate}->{$name};
+  return $name;
+}
+
+
+1;
+
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::BackgroundJob::UpdateExchangerates::Base - Base class for background job to update exchange rates.
+
+=head1 SYNOPSIS
+
+  # in update-worker:
+  use parent qw(SL::BackgroundJob::UpdateExchangerates::Base);
+
+  # implement interface
+  sub update_rates {
+    my ($self, $rates) = @_;
+
+    foreach my $rate (@$rates) {
+      my $from = $self->translate_currency_name($rate->{from}->name);
+      my $to   = $self->translate_currency_name($rate->{to}->name);
+      if ( $from eq 'EUR' && $to eq 'USD') {
+        $rate->{rate} = 0.9205 if $rate->{dir} eq 'buy';
+        $rate->{rate} = 0.9202 if $rate->{dir} eq 'sell';
+      }
+    }
+  }
+
+=head1 DESCRIPTION
+
+This is a base class for a worker to update exchange rates.
+
+=head1 INTERFACE
+
+=over 4
+
+=item C<update_rates $rates>
+
+Your class will be instanciated and the update_rates method will be invoked.
+This method can update known requeseted rates. Therefor an array of hashes with
+information of the requested rates is provided. Each hash consists of the
+following keys:
+
+=over 5
+
+=item
+
+from: currency (instance of SL::DB::Currency) to be converted from
+
+=item
+
+to: currency (instance of SL::DB::Currency) to be converted to
+
+=item
+
+dir: 'bye' or 'sell'
+
+=back
+
+Your class should add a 'rate'-entry to each hash, if it can provide the rate
+information. If not, it should leave the hash-entry as it is.
+
+=back
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<translate_currency_name $name>
+
+Returns the translated currency name, if a translation is given. This can be used to translate client specific
+currency notations to the one used by the worker module. Translations are give as data to the background job:
+
+options:
+  translate:
+    £: GBP
+
+=back
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
+
diff --git a/SL/BackgroundJob/UpdateExchangerates/FromOpenexchangerates.pm b/SL/BackgroundJob/UpdateExchangerates/FromOpenexchangerates.pm
new file mode 100644
index 000000000..fb510cded
--- /dev/null
+++ b/SL/BackgroundJob/UpdateExchangerates/FromOpenexchangerates.pm
@@ -0,0 +1,47 @@
+package SL::BackgroundJob::UpdateExchangerates::FromOpenexchangerates;
+
+use strict;
+use utf8;
+
+use parent qw(SL::BackgroundJob::UpdateExchangerates::Base);
+
+use LWP::Simple;
+use SL::JSON;
+
+
+sub update_rates {
+  my ($self, $rates) = @_;
+
+  return if !$self->options->{api_id};
+
+  # 'https://openexchangerates.org/api/latest.json?app_id=xxx&base=EUR';
+  # setting base does not work for me, so get for default base USD and calculate ...
+  my $url;
+  $url .= 'https://openexchangerates.org/api/latest.json?app_id=';
+  $url .= $self->options->{api_id};
+
+  my $result = get($url);
+  return if !$result;
+  my $result_h = decode_json($result);
+
+  foreach my $rate (@$rates) {
+    my $base_rate = $result_h->{rates}->{ $self->translate_currency_name($rate->{from}->name) };
+    next if !$base_rate;
+
+    my $target_rate = $result_h->{rates}->{ $self->translate_currency_name($rate->{to}->name) };
+    next if !$target_rate;
+
+    my $exrate = $base_rate/$target_rate;
+
+    # buy and sell are the same, so do not differenciate
+    $rate->{rate} = $exrate;
+  }
+}
+
+
+1;
+
+
+#module: FromOpenexchangerates
+#options:
+#  api_id: ce3e48c3f3a54c4d968530a08bb87734
diff --git a/SL/BackgroundJob/UpdateExchangerates/SimpleTest.pm b/SL/BackgroundJob/UpdateExchangerates/SimpleTest.pm
new file mode 100644
index 000000000..4fd3173bc
--- /dev/null
+++ b/SL/BackgroundJob/UpdateExchangerates/SimpleTest.pm
@@ -0,0 +1,22 @@
+package SL::BackgroundJob::UpdateExchangerates::SimpleTest;
+
+use strict;
+use utf8;
+
+use parent qw(SL::BackgroundJob::UpdateExchangerates::Base);
+
+
+sub update_rates {
+  my ($self, $rates) = @_;
+
+  foreach my $rate (@$rates) {
+    my $from = $self->translate_currency_name($rate->{from}->name);
+    my $to   = $self->translate_currency_name($rate->{to}->name);
+    if ( $from eq 'EUR' && $to eq 'USD') {
+      $rate->{rate} = 0.9205 if $rate->{dir} eq 'buy';
+      $rate->{rate} = 0.9202 if $rate->{dir} eq 'sell';
+    }
+  }
+}
+
+1;
diff --git a/SL/BackgroundJob/ValidityTokenCleanup.pm b/SL/BackgroundJob/ValidityTokenCleanup.pm
new file mode 100644
index 000000000..a03f04d05
--- /dev/null
+++ b/SL/BackgroundJob/ValidityTokenCleanup.pm
@@ -0,0 +1,30 @@
+package SL::BackgroundJob::ValidityTokenCleanup;
+
+use strict;
+
+use parent qw(SL::BackgroundJob::Base);
+
+use SL::DB::ValidityToken;
+
+sub create_job {
+  $_[0]->create_standard_job('0 3 * * *'); # daily
+}
+
+sub run {
+  SL::DB::Manager::ValidityToken->cleanup;
+
+  return 1;
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::BackgroundJob::ValidityTokenCleanup - Background job for
+deleting all expired validity tokens
+
+=cut
diff --git a/SL/CP.pm b/SL/CP.pm
index 75e753e07..278133f53 100644
--- a/SL/CP.pm
+++ b/SL/CP.pm
@@ -136,7 +136,7 @@ sub get_openinvoices {
 
     # if this is a foreign currency transaction get exchangerate
     $ref->{exchangerate} =
-      $form->get_exchangerate($dbh, $ref->{curr}, $ref->{transdate}, $buysell)
+      $form->check_exchangerate($myconfig, $ref->{curr}, $ref->{transdate}, $buysell)
       if ($form->{currency} ne $form->{defaultcurrency});
     push @{ $form->{PR} }, $ref;
   }
diff --git a/SL/CT.pm b/SL/CT.pm
index b52c8794a..f6d95484f 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -66,6 +66,8 @@ sub search {
       "customernumber"     => "ct.customernumber",
       "vendornumber"       => "ct.vendornumber",
       "name"               => "ct.name",
+      "department_1"       => "ct.department_1",
+      "department_2"       => "ct.department_2",
       "contact"            => "ct.contact",
       "phone"              => "ct.phone",
       "fax"                => "ct.fax",
@@ -84,10 +86,12 @@ sub search {
       "insertdate"         => "ct.itime",
       "salesman"           => "e.name",
       "payment"            => "pt.description",
+      "taxzone"            => "tz.description",
       "pricegroup"         => "pg.pricegroup",
       "ustid"              => "ct.ustid",
       "creditlimit"        => "ct.creditlimit",
       "commercial_court"   => "ct.commercial_court",
+      "dunning_lock"       => "ct.dunning_lock",
     );
 
   $form->{sort} ||= "name";
@@ -102,7 +106,7 @@ sub search {
   }
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
 
-  if ($sortorder !~ /(business|creditlimit|id|discount|itime)/ && !$join_records) {
+  if ($sortorder !~ /(business|creditlimit|id|discount|itime|dunning_lock)/ && !$join_records) {
     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
@@ -113,8 +117,8 @@ sub search {
     push(@values, like($form->{"${cv}number"}));
   }
 
-  foreach my $key (qw(name contact email)) {
-    if ($form->{$key}) {
+  foreach my $key (qw(name department_1 department_2 contact email)) {
+    if ($form->{$key} ne '') {
       $where .= " AND ct.$key ILIKE ?";
       push(@values, like($form->{$key}));
     }
@@ -221,6 +225,16 @@ sub search {
     push(@values, conv_i($form->{salesman_id}));
   }
 
+  if ($form->{payment_id}) {
+    $where .= qq| AND (ct.payment_id = ?)|;
+    push(@values, $form->{payment_id});
+  }
+
+  if ($form->{taxzone_id}) {
+    $where .= qq| AND (ct.taxzone_id = ?)|;
+    push(@values, $form->{taxzone_id});
+  }
+
   if($form->{insertdatefrom}) {
     $where .= qq| AND (ct.itime::DATE >= ?)|;
     push@values, conv_date($form->{insertdatefrom});
@@ -231,6 +245,11 @@ sub search {
     push @values, conv_date($form->{insertdateto});
   }
 
+  if($form->{dunning_lock} ne '') {
+    $where .= qq| AND ct.dunning_lock = ?|;
+    push @values, $form->{dunning_lock};
+  }
+
   if ($form->{all}) {
     my @tokens = parse_line('\s+', 0, $form->{all});
       $where .= qq| AND (
@@ -287,7 +306,7 @@ sub search {
   }
   my $query =
     qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
-    qq|  pt.description as payment | .
+    qq|  pt.description as payment, tz.description as taxzone | .
     $pg_select .
     $main_cp_select .
     (qq|, NULL AS invnumber, NULL AS ordnumber, NULL AS quonumber, NULL AS invid, NULL AS module, NULL AS formtype, NULL AS closed | x!! $join_records) .
@@ -295,6 +314,7 @@ sub search {
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
     qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
     qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+    qq|LEFT JOIN tax_zones tz ON (ct.taxzone_id = tz.id) | .
     $pg_join .
     qq|WHERE $where|;
 
@@ -310,7 +330,7 @@ sub search {
       $query .=
         qq| UNION | .
         qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
-        qq|  pt.description as payment | .
+        qq|  pt.description as payment, tz.description as taxzone | .
         $pg_select .
         $main_cp_select .
         qq|, a.invnumber, a.ordnumber, a.quonumber, a.id AS invid, | .
@@ -321,6 +341,7 @@ sub search {
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        qq|LEFT JOIN tax_zones tz ON (ct.taxzone_id = tz.id) | .
         $pg_join .
         qq|WHERE $where AND (a.invoice = '1')|;
     }
@@ -330,7 +351,7 @@ sub search {
       $query .=
         qq| UNION | .
         qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
-        qq|  pt.description as payment | .
+        qq|  pt.description as payment, tz.description as taxzone | .
         $pg_select .
         $main_cp_select .
         qq|, ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
@@ -340,8 +361,9 @@ sub search {
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        qq|LEFT JOIN tax_zones tz ON (ct.taxzone_id = tz.id) | .
         $pg_join .
-        qq|WHERE $where AND (o.quotation = '0')|;
+        qq|WHERE $where AND ((o.record_type = 'sales_order') OR (o.record_type = 'purchase_order'))|;
     }
 
     if ( $form->{l_quonumber} ) {
@@ -349,7 +371,7 @@ sub search {
       $query .=
         qq| UNION | .
         qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
-        qq|  pt.description as payment | .
+        qq|  pt.description as payment, tz.description as taxzone | .
         $pg_select .
         $main_cp_select .
         qq|, ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
@@ -359,8 +381,9 @@ sub search {
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
         qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
         qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        qq|LEFT JOIN tax_zones tz ON (ct.taxzone_id = tz.id) | .
         $pg_join .
-        qq|WHERE $where AND (o.quotation = '1')|;
+        qq|WHERE $where AND ((o.record_type = 'sales_quotation') OR (o.record_type = 'request_quotation'))|;
     }
   }
 
diff --git a/SL/Common.pm b/SL/Common.pm
index 126a30ed8..3b2df5bc9 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -340,7 +340,7 @@ sub get_vc_details {
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_} * 1) } qw(discount creditlimit);
 
-  $query = qq|SELECT * FROM shipto WHERE (trans_id = ?)|;
+  $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND module LIKE 'CT'|;
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $vc_id);
 
   if ($vc eq 'customer') {
diff --git a/SL/Controller/AccTrans.pm b/SL/Controller/AccTrans.pm
index 80e37b7c1..b08c55f1e 100644
--- a/SL/Controller/AccTrans.pm
+++ b/SL/Controller/AccTrans.pm
@@ -17,7 +17,7 @@ sub action_list_transactions {
   my $acc_trans_table = $self->_mini_ledger($transactions);
   my $balances_table  = $self->_mini_trial_balance($transactions);
 
-  return $self->render('acc_trans/acc_trans', { header => 0 }, acc_trans_table => $acc_trans_table, balances_table => $balances_table);
+  return $self->render('acc_trans/acc_trans', { layout => 0 }, acc_trans_table => $acc_trans_table, balances_table => $balances_table);
 }
 
 sub _mini_ledger {
diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index c22fdca74..082b94ff8 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -119,7 +119,7 @@ sub action_new_user {
       countrycode  => $defaults->language('de'),
       numberformat => $defaults->numberformat('1.000,00'),
       dateformat   => $defaults->dateformat('dd.mm.yy'),
-      stylesheet   => "kivitendo.css",
+      stylesheet   => "design40.css",
       menustyle    => "neu",
     },
   ));
@@ -137,6 +137,8 @@ sub action_save_user {
   my $params = delete($::form->{user})          || { };
   my $props  = delete($params->{config_values}) || { };
   my $is_new = !$params->{id};
+  my $check_previously_used = delete($::form->{check_previously_used}) || 0;
+  my $assign_documents = delete($::form->{assign_documents}) || 0;
 
   # Assign empty arrays if the browser doesn't send those controls.
   $params->{clients} ||= [];
@@ -149,9 +151,29 @@ sub action_save_user {
   my @errors = $self->user->validate;
 
   if (@errors) {
-    flash('error', @errors);
-    $self->edit_user_form(title => $is_new ? t8('Create a new user') : t8('Edit User'));
-    return;
+    $self->js->flash('error', $_) foreach @errors;
+    return $self->js->render();
+  }
+
+  # check if given login name was previously used and show a dialog if so
+  if ($is_new && $check_previously_used && $self->check_loginname_previously_used()) {
+    $self->js->run('show_loginname_previously_used_dialog');
+    return $self->js->render();
+  }
+
+  # rename previous usernames in employee table, if not set to assign
+  if ($is_new && !$assign_documents) {
+    my $clients = SL::DB::Manager::AuthClient->get_all_sorted;
+    for my $client (@$clients) {
+      my $now = DateTime->now_local;
+      my $timestamp = $now->format_cldr('yyyyMMddHHmmss');
+
+      my $dbh = $client->dbconnect(AutoCommit => 1);
+      next if !$dbh;
+      $dbh->do(qq|UPDATE employee SET login = ? WHERE login = ?;|,undef,
+               $params->{'login'} . $timestamp, $params->{'login'});
+      $dbh->disconnect;
+    }
   }
 
   $self->user->save;
@@ -505,7 +527,7 @@ sub init_all_groups        { SL::DB::Manager::AuthGroup ->get_all_sorted
 sub init_all_printers      { SL::DB::Manager::Printer   ->get_all_sorted                                                     }
 sub init_all_dateformats   { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)      ]                                              }
 sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ]                                    }
-sub init_all_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ]                                              }
+sub init_all_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css design40.css) ]                                 }
 sub init_all_dbsources             { [ sort User->dbsources($::form)                               ] }
 sub init_all_used_dbsources        { { map { (join(':', $_->dbhost || 'localhost', $_->dbport || 5432, $_->dbname) => $_->name) } @{ $_[0]->all_clients }  } }
 sub init_all_accounting_methods    { [ { id => 'accrual',   name => t8('Accrual accounting')  }, { id => 'cash',     name => t8('Cash accounting')       } ] }
@@ -592,13 +614,6 @@ sub use_multiselect_js {
   return $self;
 }
 
-sub use_ckeditor_js {
-  my ($self) = @_;
-
-  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
-  return $self;
-}
-
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout(SL::Layout::AdminLogin->new);
@@ -608,7 +623,7 @@ sub login_form {
 
 sub edit_user_form {
   my ($self, %params) = @_;
-  $self->use_multiselect_js->use_ckeditor_js->render('admin/edit_user', %params);
+  $self->use_multiselect_js->render('admin/edit_user', %params);
 }
 
 sub edit_client_form {
@@ -762,4 +777,22 @@ sub check_database_superuser_privileges {
   return (%result, error => $::locale->text('The database user \'#1\' does not have superuser privileges.', $result{username}));
 }
 
+sub check_loginname_previously_used() {
+  my ($self) = @_;
+
+  my $clients = SL::DB::Manager::AuthClient->get_all_sorted;
+  for my $client (@$clients) {
+    my $dbh = $client->dbconnect();
+    next if !$dbh;
+    my ($result) = $dbh->selectrow_array(qq|SELECT login FROM employee WHERE login = ?;|,undef,
+                                        $self->user->{'login'});
+    $dbh->disconnect;
+
+    if ($result) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
 1;
diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 27a1c69a6..8941bb694 100644
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -99,7 +99,7 @@ sub action_save_and_execute {
   my ($self) = @_;
 
   $self->background_job(SL::DB::BackgroundJob->new) if !$self->background_job;
-  return unless $self->create_or_update;
+  return unless $self->create_or_update(1);
   $self->action_execute;
 }
 
@@ -170,6 +170,7 @@ sub create_or_update {
 
   if (@errors) {
     flash('error', @errors);
+    $self->setup_form_action_bar;
     $self->render('background_job/form', title => $is_new ? $::locale->text('Create a new background job') : $::locale->text('Edit background job'));
     return;
   }
@@ -178,7 +179,7 @@ sub create_or_update {
   $self->background_job->save;
 
   flash_later('info', $is_new ? $::locale->text('The background job has been created.') : $::locale->text('The background job has been saved.'));
-  return if $return;
+  return 1 if $return;
 
   $self->redirect_to($self->back_to);
 }
@@ -207,6 +208,7 @@ sub init_models {
     filtered => 0,
     sorted => {
       package_name => t8('Package name'),
+      description  => t8('Description'),
       type         => t8('Execution type'),
       active       => t8('Active'),
       cron_spec    => t8('Execution schedule'),
diff --git a/SL/Controller/BackgroundJobHistory.pm b/SL/Controller/BackgroundJobHistory.pm
index 4fbd7ece0..67d315a83 100644
--- a/SL/Controller/BackgroundJobHistory.pm
+++ b/SL/Controller/BackgroundJobHistory.pm
@@ -105,6 +105,7 @@ sub init_models {
     controller => $self,
     sorted => {
       package_name => t8('Package name'),
+      description  => t8('Description'),
       run_at       => t8('Run at'),
       status       => t8('Execution status'),
       result       => t8('Result'),
diff --git a/SL/Controller/BankImport.pm b/SL/Controller/BankImport.pm
index 1b20deca3..20c376418 100644
--- a/SL/Controller/BankImport.pm
+++ b/SL/Controller/BankImport.pm
@@ -137,7 +137,7 @@ sub import_transactions {
       next if $transaction->{error} || $transaction->{duplicate};
 
       SL::DB::BankTransaction->new(
-        map { ($_ => $transaction->{$_}) } qw(amount currency_id local_bank_account_id purpose remote_account_number remote_bank_code remote_name transaction_code transdate valutadate)
+        map { ($_ => $transaction->{$_}) } qw(amount currency_id local_bank_account_id purpose remote_account_number remote_bank_code remote_name transaction_code transdate valutadate end_to_end_id)
       )->save;
 
       $imported++;
@@ -170,16 +170,18 @@ sub make_transaction_idx {
   my ($transaction) = @_;
 
   if (ref($transaction) eq 'SL::DB::BankTransaction') {
-    $transaction = { map { ($_ => $transaction->$_) } qw(local_bank_account_id transdate valutadate amount purpose) };
+    $transaction = { map { ($_ => $transaction->$_) } qw(local_bank_account_id remote_account_number transdate valutadate amount purpose end_to_end_id) };
   }
 
+  my @other_fields =  $transaction->{end_to_end_id} && $::instance_conf->get_check_bt_duplicates_endtoend
+                   ? qw(end_to_end_id remote_account_number) : qw(purpose);
   return normalize_text(join '/',
                         map { $_ // '' }
                         ($transaction->{local_bank_account_id},
                          $transaction->{transdate}->ymd,
                          $transaction->{valutadate}->ymd,
                          (apply { s{0+$}{} } $transaction->{amount} * 1),
-                         $transaction->{purpose}));
+                         map { $transaction->{$_} } @other_fields));
 }
 
 sub init_bank_accounts {
diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 9d432d556..2f14193d7 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -55,7 +55,9 @@ sub action_search {
 
   $self->setup_search_action_bar;
   $self->render('bank_transactions/search',
-                 BANK_ACCOUNTS => $bank_accounts);
+                 BANK_ACCOUNTS => $bank_accounts,
+                 title         => t8('Search bank transactions'),
+               );
 }
 
 sub action_list_all {
@@ -96,6 +98,9 @@ sub gather_bank_transactions_and_proposals {
       @where
     ],
   );
+
+  my $has_batch_transaction = (grep { $_->is_batch_transaction } @{ $bank_transactions }) ? 1 : undef;
+
   # credit notes have a negative amount, treat differently
   my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where        => [ or => [ amount => { gt => \'paid' },                 # '} make emacs happy
                                                                                          and    => [ type    => 'credit_note',
@@ -107,37 +112,39 @@ sub gather_bank_transactions_and_proposals {
 
   my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where        => [amount => { ne => \'paid' }],                 #  '}] make emacs happy
                                                                        with_objects => ['vendor'  ,'payment_terms']);
-  my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where        => [chart_id               => $params{bank_account}->chart_id ,
-                                                                                             'sepa_export.executed' => 0,
-                                                                                             'sepa_export.closed'   => 0
-                                                                            ],
-                                                                            with_objects => ['sepa_export']);
 
   my @all_open_invoices;
   # filter out invoices with less than 1 cent outstanding
   push @all_open_invoices, map { $_->{is_ar}=1 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
   push @all_open_invoices, map { $_->{is_ar}=0 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
 
-  my %sepa_exports;
-  my %sepa_export_items_by_id = partition_by { $_->ar_id || $_->ap_id } @$all_open_sepa_export_items;
-
-  # first collect sepa export items to open invoices
-  foreach my $open_invoice (@all_open_invoices){
-    $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
-    $open_invoice->{skonto_type} = 'without_skonto';
-    foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) {
-      my $factor                   = ($_->ar_id == $open_invoice->id ? 1 : -1);
-      $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
-
-      $open_invoice->{skonto_type} = $_->payment_type;
-      $sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ };
-      $sepa_exports{$_->sepa_export_id}->{count}++;
-      $sepa_exports{$_->sepa_export_id}->{is_ar}++ if  $_->ar_id == $open_invoice->id;
-      $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount * $factor;
-      push @{ $sepa_exports{$_->sepa_export_id}->{invoices} }, $open_invoice;
+
+  my (%sepa_exports, %sepa_export_items_by_id, $all_open_sepa_export_items);
+  if ($has_batch_transaction) {
+    $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where        => [chart_id               => $params{bank_account}->chart_id ,
+                                                                                             'sepa_export.executed' => 0,
+                                                                                             'sepa_export.closed'   => 0
+                                                                            ],
+                                                                            with_objects => ['sepa_export']);
+    %sepa_export_items_by_id = partition_by { $_->ar_id || $_->ap_id } @$all_open_sepa_export_items;
+
+    # first collect sepa export items to open invoices
+    foreach my $open_invoice (@all_open_invoices){
+      $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
+      $open_invoice->{skonto_type} = 'without_skonto';
+      foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) {
+        my $factor                   = ($_->ar_id == $open_invoice->id ? 1 : -1);
+        $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+
+        $open_invoice->{skonto_type} = $_->payment_type;
+        $sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ };
+        $sepa_exports{$_->sepa_export_id}->{count}++;
+        $sepa_exports{$_->sepa_export_id}->{is_ar}++ if  $_->ar_id == $open_invoice->id;
+        $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount * $factor;
+        push @{ $sepa_exports{$_->sepa_export_id}->{invoices} }, $open_invoice;
+      }
     }
   }
-
   # try to match each bank_transaction with each of the possible open invoices
   # by awarding points
   my @proposals;
@@ -152,7 +159,7 @@ sub gather_bank_transactions_and_proposals {
 
     $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
 
-    if ( $bt->is_batch_transaction ) {
+    if ($has_batch_transaction && $bt->is_batch_transaction ) {
       my $found=0;
       foreach ( keys  %sepa_exports) {
         if ( abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
@@ -179,9 +186,9 @@ sub gather_bank_transactions_and_proposals {
     # score is stored in $bt->{agreement}
 
     foreach my $open_invoice (@all_open_invoices) {
-      ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice,
-        sepa_export_items => $all_open_sepa_export_items,
-      );
+
+      ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
+
       $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,
                                       $open_invoice->amount * ($open_invoice->{is_ar} ? 1 : -1), 2);
     }
@@ -212,6 +219,7 @@ sub gather_bank_transactions_and_proposals {
   my @otherproposals = grep {
        ($_->{agreement} >= $proposal_threshold)
     && (1 == scalar @{ $_->{proposals} })
+    && ($_->{proposals}->[0]->forex == 0)      # nyi forex invoices for automatic booking
   } @{ $bank_transactions };
 
   push @proposals, @otherproposals;
@@ -247,13 +255,17 @@ sub action_list {
     sort_dir     => $::form->{sort_dir},
   );
 
+  my $ui_tab =   $::instance_conf->get_no_bank_proposals ? 0
+               : scalar(@{ $proposals }) > 0             ? 1
+               : 0;
+
   $::request->layout->add_javascripts("kivi.BankTransaction.js");
   $self->render('bank_transactions/list',
                 title             => t8('Bank transactions MT940'),
                 BANK_TRANSACTIONS => $bank_transactions,
                 PROPOSALS         => $proposals,
                 bank_account      => $bank_account,
-                ui_tab            => scalar(@{ $proposals }) > 0 ? 1 : 0,
+                ui_tab            => $ui_tab,
               );
 }
 
@@ -300,7 +312,7 @@ sub action_create_invoice {
   ));
 
   # if we have exactly one ap match, use this directly
-  if (1 == scalar @{ $templates_ap }) {
+  if ($use_vendor_filter && 1 == scalar @{ $templates_ap }) {
     $self->redirect_to($self->load_ap_record_template_url($templates_ap->[0]));
 
   } else {
@@ -429,7 +441,7 @@ sub action_ajax_add_list {
 
   my @all_open_invoices = @{ $all_open_ar_invoices };
   # add ap invoices, filtering out subcent open amounts
-  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.005 } @{ $all_open_ap_invoices };
 
   @all_open_invoices = sort { $a->id <=> $b->id } @all_open_invoices;
 
@@ -512,8 +524,11 @@ sub save_invoices {
       push @{ $self->problems }, $self->save_single_bank_transaction(
         bank_transaction_id => $bank_transaction_id,
         invoice_ids         => $invoice_ids,
-        sources             => [  map { $::form->{"sources_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
-        memos               => [  map { $::form->{"memos_${bank_transaction_id}_${_}"}   } @{ $invoice_ids } ],
+        sources             => [  map { $::form->{"sources_${bank_transaction_id}_${_}"}           } @{ $invoice_ids } ],
+        memos               => [  map { $::form->{"memos_${bank_transaction_id}_${_}"}             } @{ $invoice_ids } ],
+        book_fx_bank_fees   => [  map { $::form->{"book_fx_bank_fees_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+        currency_ids        => [  map { $::form->{"currency_id_${bank_transaction_id}_${_}"}       } @{ $invoice_ids } ],
+        exchangerates       => [  map { $::form->parse_amount(\%::myconfig, $::form->{"exchangerate_${bank_transaction_id}_${_}"}) } @{ $invoice_ids } ],
       );
       $count += scalar( @{$invoice_ids} );
     }
@@ -581,11 +596,14 @@ sub save_single_bank_transaction {
   }
   my (@warnings);
 
+  my $transit_items_account = SL::DB::Manager::Chart->find_by(id => SL::DB::Default->get->transit_items_chart_id);
+
   my $worker = sub {
     my $bt_id                 = $data{bank_transaction_id};
     my $sign                  = $bank_transaction->amount < 0 ? -1 : 1;
     my $payment_received      = $bank_transaction->amount > 0;
     my $payment_sent          = $bank_transaction->amount < 0;
+    my ($has_negative_record, $has_positive_record);
 
 
     foreach my $invoice_id (@{ $params{invoice_ids} }) {
@@ -597,9 +615,22 @@ sub save_single_bank_transaction {
           message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id),
         };
       }
+      $has_positive_record = 1 if $invoice->amount > 0; # invoice
+      $has_negative_record = 1 if $invoice->amount < 0; # credit_note
       push @{ $data{invoices} }, $invoice;
     }
 
+    if (ref $transit_items_account eq 'SL::DB::Chart' && $has_positive_record
+        &&           scalar @{ $data{invoices} } == 2 && $has_negative_record) {
+
+      $self->_check_and_book_credit_note(
+        invoices      => $data{invoices},
+        chart_id      => $transit_items_account->id,
+        bt_id         => $bt_id,
+        transdate     => $bank_transaction->valutadate,
+        transit_chart => $transit_items_account         );
+
+    }
     if (   $payment_received
         && any {    ( $_->is_sales && ($_->amount < 0))
                  || (!$_->is_sales && ($_->amount > 0))
@@ -626,8 +657,11 @@ sub save_single_bank_transaction {
     my $n_invoices   = 0;
 
     foreach my $invoice (@{ $data{invoices} }) {
-      my $source = ($data{sources} // [])->[$n_invoices];
-      my $memo   = ($data{memos}   // [])->[$n_invoices];
+      my $source  = ($data{sources} // [])->[$n_invoices];
+      my $memo    = ($data{memos}   // [])->[$n_invoices];
+      my $fx_rate = ($data{exchangerates} // [])->[$n_invoices];
+      my $fx_book = ($data{book_fx_bank_fees}   // [])->[$n_invoices];
+      my $currency_id = ($data{currency_ids}   // [])->[$n_invoices];
 
       $n_invoices++ ;
       # safety check invoice open
@@ -644,12 +678,16 @@ sub save_single_bank_transaction {
 
       my ($payment_type, $free_skonto_amount);
       if ( defined $::form->{invoice_skontos}->{"$bt_id"} ) {
-        $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} });
+        $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} }) || '';
       } else {
         $payment_type = 'without_skonto';
       }
-
-      if ($payment_type eq 'free_skonto') {
+      # hack payment type use free_skonto for with_fuzzy_skonto
+      if ($payment_type eq 'with_fuzzy_skonto_pt') {
+        $free_skonto_amount = abs($invoice->open_amount - abs($bank_transaction->not_assigned_amount));
+        die "Invalid state for fuzzy skonto amount" unless $free_skonto_amount > 0;
+        $payment_type = 'free_skonto';  # we have a valid free_skonto amount, therefore go ...
+      } elsif ($payment_type eq 'free_skonto') {
         # parse user input > 0
         if ($::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id}) > 0) {
           $free_skonto_amount = $::form->parse_amount(\%::myconfig, $::form->{"free_skonto_amount"}->{"$bt_id"}{$invoice->id});
@@ -663,26 +701,53 @@ sub save_single_bank_transaction {
       }
     # pay invoice
     # TODO rewrite this: really booked amount should be a return value of Payment.pm
+    # -> quick and dirty done -> really booked amount is the first element of return array
     # also this controller shouldnt care about how to calc skonto. we simply delegate the
     # payment_type to the helper and get the corresponding bank_transaction values back
     # hotfix to get the signs right - compare absolute values and later set the signs
     # should be better done elsewhere - changing not_assigned_amount to abs feels seriously bogus
-
+    # default open amount
     my $open_amount = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount;
+    # if fx calc new open amount with skonto pt and set new exchange rate (default or for bank_transaction)
+    if ($fx_rate > 0) {
+      # 1. set new open amount
+      die "Exchangerate without currency"                     unless $currency_id;
+      die "Invoice currency differs from user input currency" unless $currency_id == $invoice->currency->id;
+      $open_amount  = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto_fx($fx_rate) : $invoice->open_amount_fx($fx_rate);
+      # 2. set daily default or custom record exchange rate
+      my $default_rate = $invoice->get_exchangerate_for_bank_transaction($bank_transaction->id);
+      if (!$default_rate) { # set new daily default
+        my $buysell = $invoice->is_sales ? 'buy' : 'sell';
+        my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_id,
+                                                        transdate => $bank_transaction->valutadate)
+              ||              SL::DB::Exchangerate->new(currency_id => $currency_id,
+                                                        transdate   => $bank_transaction->valutadate);
+        $ex->update_attributes($buysell => $fx_rate);
+        $bank_transaction->exchangerate(undef);       # maybe user reassigned bank_transaction
+      } elsif ($default_rate != $fx_rate) {           # set record (banktransaction) exchangerate
+        $bank_transaction->exchangerate($fx_rate);    # custom rate, will be displayed in ap, ir, is
+      } elsif (abs($default_rate - $fx_rate) < 0.001) {
+        # last valid state default rate is (nearly) the same as user input -> do nothing
+      } else { die "Invalid exchange rate state:" . $default_rate . " " . $fx_rate; }
+    } # end fx hook
+
+    # open amount is in default currency -> free_skonto is in default currency, no need to change
     $open_amount            = abs($open_amount);
     $open_amount           -= $free_skonto_amount if ($payment_type eq 'free_skonto');
     my $not_assigned_amount = abs($bank_transaction->not_assigned_amount);
     my $amount_for_booking  = ($open_amount < $not_assigned_amount) ? $open_amount : $not_assigned_amount;
+    my $fx_fee_amount       = $fx_book && ($open_amount < $not_assigned_amount) ? $not_assigned_amount - $open_amount : 0;
     my $amount_for_payment  = $amount_for_booking;
+    # add booking amount
+    # $amount_for_booking
 
     # get the right direction for the payment bookings (all amounts < 0 are stornos, credit notes or negative ap)
     $amount_for_payment *= -1 if $invoice->amount < 0;
     $free_skonto_amount *= -1 if ($free_skonto_amount && $invoice->amount < 0);
     # get the right direction for the bank transaction
+    # sign is simply the sign of amount in bank_transactions: positive for increase and negative for decrease
     $amount_for_booking *= $sign;
 
-    $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $amount_for_booking);
-
     # ... and then pay the invoice
     my @acc_ids = $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id,
                           trans_id      => $invoice->id,
@@ -691,8 +756,24 @@ sub save_single_bank_transaction {
                           source        => $source,
                           memo          => $memo,
                           skonto_amount => $free_skonto_amount,
+                          exchangerate  => $fx_rate,
+                          fx_book       => $fx_book,
+                          fx_fee_amount => $fx_fee_amount,
+                          currency_id   => $currency_id,
                           bt_id         => $bt_id,
                           transdate     => $bank_transaction->valutadate->to_kivitendo);
+    # First element is the booked amount for accno bank
+    my $bank_amount = shift @acc_ids;
+
+    if (!$invoice->forex) {
+      # die "Invalid state, calculated invoice_amount differs from expected invoice amount" unless (abs($bank_amount->{return_bank_amount}) - abs($amount_for_booking) < 0.001);
+      $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $amount_for_booking);
+    } else {
+      die "Invalid state, calculated invoice_amount differs from expected invoice amount: $amount_for_booking <> " . $bank_amount->{return_bank_amount}
+        unless $fx_book || (abs($bank_amount->{return_bank_amount}) - abs($amount_for_booking) < 0.005);
+      $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $bank_amount->{return_bank_amount});
+      #$bank_transaction->invoice_amount($bank_transaction->invoice_amount + $amount_for_booking);
+    }
     # ... and record the origin via BankTransactionAccTrans
     if (scalar(@acc_ids) < 2) {
       return {
@@ -806,16 +887,25 @@ sub action_unlink_bank_transaction {
         my $query = qq|UPDATE $type SET paid =
                         (SELECT COALESCE(abs(sum(amount)),0) FROM acc_trans
                          WHERE trans_id = ?
-                         AND chart_link ilike '%paid%')
-                       WHERE id = ?|;
+                         AND (chart_link ilike '%paid%'
+                              OR chart_id IN (SELECT fxgain_accno_id from defaults)
+                              OR chart_id IN (SELECT fxloss_accno_id from defaults)
+                             )
+                        )
+                        WHERE id = ?|;
 
         die if (do_query($::form, $bank_transaction->db->dbh, $query, $trans_id, $trans_id) == -1);
+
+        # undo datepaid if no payment exists
+        $query = qq|UPDATE $type SET datepaid = null WHERE ID = ? AND paid = 0|;
+        die if (do_query($::form, $bank_transaction->db->dbh, $query, $trans_id) == -1);
       }
       # 4. and delete all (if any) record links
       my $rl = SL::DB::Manager::RecordLink->delete_all(where => [ from_id => $bt_id, from_table => 'bank_transactions' ]);
 
       # 5. finally reset  this bank transaction
       $bank_transaction->invoice_amount(0);
+      $bank_transaction->exchangerate(undef);
       $bank_transaction->cleared(0);
       $bank_transaction->save;
       # 6. and add a log entry in history_erp
@@ -863,6 +953,9 @@ sub make_filter_summary {
     [ $filter->{"amount:number"},           $::locale->text('Amount')                                          ],
     [ $filter->{"bank_account_id:integer"}, $::locale->text('Local bank account')                              ],
     [ $filter->{"remote_name:substr::ilike"}, $::locale->text('Remote name')                                   ],
+    [ $filter->{"remote_account_number:substr::ilike"}, $::locale->text('Remote account number')               ],
+    [ $filter->{"remote_bank_code:substr::ilike"}     , $::locale->text('Remote bank code')                    ],
+    [ $filter->{"purpose:substr::ilike"}              , $::locale->text('Purpose')                             ],
   );
 
   for (@filters) {
@@ -873,17 +966,18 @@ sub make_filter_summary {
 }
 
 sub prepare_report {
-  my ($self)      = @_;
+  my ($self)       = @_;
 
-  my $callback    = $self->models->get_callback;
+  my $callback     = $self->models->get_callback;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Bank transactions');
+  $self->{report}  = $report;
 
-  my @columns     = qw(ids local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id);
-  my @sortable    = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount                                  purpose local_account_number local_bank_code);
+  my @columns      = qw(ids local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose end_to_end_id local_account_number local_bank_code id);
+  my @sortable     = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount                                  purpose local_account_number local_bank_code);
 
-  my %column_defs = (
+  my %column_defs  = (
     ids                 => { raw_header_data => checkbox_tag("", id => "check_all", checkall  => "[data-checkall=1]"),
                              'align'         => 'center',
                              raw_data        => sub { if (@{ $_[0]->linked_invoices }) {
@@ -902,13 +996,23 @@ sub prepare_report {
                                align => 'right' },
     invoice_amount        => { sub   => sub { $_[0]->invoice_amount_as_number },
                                align => 'right' },
-    invoices              => { sub   => sub { my @invnumbers; for my $obj (@{ $_[0]->linked_invoices }) {
-                                                                next unless $obj; push @invnumbers, $obj->invnumber } return \@invnumbers } },
+    invoices              => { sub      => sub { my @invnumbers; for my $obj (@{ $_[0]->linked_invoices }) {
+                                                                next unless $obj; push @invnumbers, $obj->invnumber } return \@invnumbers },
+                               obj_link => sub { my @links;      for my $obj (@{ $_[0]->linked_invoices }) {
+                                                                next unless $obj; my $script =  ref $obj eq 'SL::DB::GLTransaction' ? 'gl.pl'
+                                                                                            :   $obj->is_sales &&  $obj->invoice    ? 'is.pl'
+                                                                                            :   $obj->is_sales && !$obj->invoice    ? 'ar.pl'
+                                                                                            :  !$obj->is_sales &&  $obj->invoice    ? 'ir.pl'
+                                                                                            :  !$obj->is_sales && !$obj->invoice    ? 'ap.pl'
+                                                                                            :  die "Invalid invoice state for link";
+                                                                push @links,$script . "?action=edit&id=" . $obj->id } return \@links }
+                             },
     currency              => { sub   => sub { $_[0]->currency->name } },
     purpose               => { },
     local_account_number  => { sub   => sub { $_[0]->local_bank_account->account_number } },
     local_bank_code       => { sub   => sub { $_[0]->local_bank_account->bank_code } },
     local_bank_name       => { sub   => sub { $_[0]->local_bank_account->name } },
+    end_to_end_id         => { sub   => sub { $_[0]->end_to_end_id }, text => $::locale->text('End to end ID') },
     id                    => {},
   );
 
@@ -938,6 +1042,101 @@ sub prepare_report {
   );
 }
 
+sub _check_and_book_credit_note {
+  my $self   = shift;
+  my %params = @_;
+  Common::check_params(\%params, qw(chart_id transdate bt_id invoices transit_chart));
+
+  croak "No invoice "              unless (ref $params{invoices}->[0] eq 'SL::DB::PurchaseInvoice')
+                                       || (ref $params{invoices}->[0] eq 'SL::DB::Invoice'        );
+  croak "Not a valid date"         unless ref $params{transdate}      eq 'DateTime';
+  croak "Not a valid chart"        unless ref $params{transit_chart}  eq 'SL::DB::Chart';
+  croak "Need exactly two records" unless scalar @{ $params{invoices} } == 2;
+
+
+  my ($has_one_credit_note, $has_one_invoice, $amount, $credit_note_index, $credit_note_no, $invoice_no);
+  my $index = 0;
+  foreach my $invoice (@{ $params{invoices} }) {
+    if (   ( $invoice->is_sales && $invoice->type         eq 'credit_note')
+        || (!$invoice->is_sales && $invoice->invoice_type eq 'purchase_credit_note')) {
+      #     credit_notes          | purchase_credit_note
+      #  -1397.11000 | AR         |     504.74000 |  AP
+      #   1397.11000 | AR_paid    |    -504.74000 |  AP_paid
+
+      my $mult = $invoice->is_sales ? -1 : 1;  # multiplier for getting the right sign for credit_notes
+      $amount  = ($invoice->amount - $invoice->paid) * $mult;
+      #          (-200             - (-10))          * $mult = AR_paid (positive) |AP_paid (negative)
+
+      $has_one_credit_note += 1;
+      $credit_note_index    = $index;
+      $credit_note_no       = $invoice->invnumber;
+    } else {
+      $has_one_invoice     += 1;
+      $invoice_no           = $invoice->invnumber;
+    }
+    $index++;
+  }
+  die "Invalid state" unless ($has_one_credit_note == 1 && $has_one_invoice == 1);
+
+  foreach my $invoice (@{ $params{invoices} }) {
+    my $is_credit_note = $invoice->is_credit_note ?  1 : undef;
+    my $sign           = $invoice->is_credit_note ?  1 : -1;  # correct sign for bookings
+    my $paid_sign      = $invoice->is_credit_note ? -1 :  1;  # paid is always negative for credit_note
+
+    my $new_acc_trans = SL::DB::AccTransaction->new(trans_id   => $invoice->id,
+                                                    chart_id   => $params{transit_chart}->id,
+                                                    chart_link => $params{transit_chart}->link,
+                                                    amount     => $amount * $sign,
+                                                    transdate  => $params{transdate},
+                                                    source     => $is_credit_note ?  $invoice_no : $credit_note_no,
+                                                    memo       => t8('Automatically assigned with bank transaction'),
+                                                    taxkey     => 0,
+                                                    tax_id     => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
+
+    my $arap_booking= SL::DB::AccTransaction->new(trans_id   => $invoice->id,
+                                                  chart_id   => $invoice->reference_account->id,
+                                                  chart_link => $invoice->reference_account->link,
+                                                  amount     => $amount * $sign * -1,
+                                                  transdate  => $params{transdate},
+                                                  source     => '',
+                                                  taxkey     => 0,
+                                                  tax_id     => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
+    $new_acc_trans->save;
+    $arap_booking->save;
+    $invoice->update_attributes(paid => $invoice->paid + (abs($amount) * $paid_sign), datepaid => $params{transdate});
+
+    # link both acc_trans transactions
+    my $id_type = $invoice->is_sales ? 'ar' : 'ap';
+    my  %props_acc = (
+                       acc_trans_id        => $new_acc_trans->acc_trans_id,
+                       bank_transaction_id => $params{bt_id},
+                       $id_type            => $invoice->id,
+                     );
+    SL::DB::BankTransactionAccTrans->new(%props_acc)->save;
+        %props_acc = (
+                       acc_trans_id        => $arap_booking->acc_trans_id,
+                       bank_transaction_id => $params{bt_id},
+                       $id_type            => $invoice->id,
+                     );
+    SL::DB::BankTransactionAccTrans->new(%props_acc)->save;
+    # done
+
+    # Record a record link from the bank transaction to the credit note
+    if ($invoice->invoice_type =~ m/credit_note/) {
+      my %props = (
+        from_table => 'bank_transactions',
+        from_id    => $params{bt_id},
+        to_table   => $id_type,
+        to_id      => $invoice->id,
+      );
+      SL::DB::RecordLink->new(%props)->save;
+    }
+  }
+  # throw away the credit note
+  splice @{ $params{invoices} }, $credit_note_index, 1;
+  # and return nothing. hook is completely done
+}
+
 sub init_problems { [] }
 
 sub init_models {
@@ -1135,6 +1334,18 @@ purpose string before it will be assigned to the description field of a
 gl transaction or to the notes field of an ap transaction.
 You have to write your own custom code.
 
+=item C<_check_and_book_credit_note>
+
+This method takes a array of invoices with two entries one one valid credit note
+and books the amount of the credit note against the invoice via the default
+transfer items account (i.e. SKR04 1370) and adds a source and memo entry for the
+payment booking.
+Logical and visual linking of the payment booking and credit note record to the bank
+transaction will also be done (necessary cond. for unlinking a bank transaction).
+If the methods success the credit note will be deleted from
+the original caller's array and he can further process the data without pondering
+about the removed credit note data.
+
 =back
 
 =head1 AUTHOR
diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index 63f153fa8..3c5f919de 100644
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -156,6 +156,7 @@ sub send_file {
   }
 
   my $content_type    =  $params{type} || 'application/octet_stream';
+  my $content_disposition = $params{content_disposition} || 'attachment';
   my $attachment_name =  $params{name} || (!ref($file_name_or_content) ? $file_name_or_content : '');
   $attachment_name    =~ s:.*//::g;
 
@@ -165,7 +166,7 @@ sub send_file {
     $self->js->render unless $params{js_no_render};
   } else {
     print $::form->create_http_response(content_type        => $content_type,
-                                        content_disposition => 'attachment; filename="' . $attachment_name . '"',
+                                        content_disposition => $content_disposition . '; filename="' . $attachment_name . '"',
                                         content_length      => $size);
 
     if (!ref $file_name_or_content) {
diff --git a/SL/Controller/Buchungsgruppen.pm b/SL/Controller/Buchungsgruppen.pm
index a608a6eab..c108dc1c1 100644
--- a/SL/Controller/Buchungsgruppen.pm
+++ b/SL/Controller/Buchungsgruppen.pm
@@ -33,10 +33,12 @@ sub action_list {
       $chartlist{ $gruppe->id } = SL::DB::TaxzoneChart->get_all_accounts_by_buchungsgruppen_id($gruppe->id);
   }
 
+  my $title = t8('Booking groups');
   $self->setup_list_action_bar;
+  $::form->{title} = $title;
   $::form->header;
   $self->render('buchungsgruppen/list',
-                title           => t8('Booking groups'),
+                title           => $title,
                 BUCHUNGSGRUPPEN => $buchungsgruppen,
                 CHARTLIST       => \%chartlist,
                 TAXZONES        => $taxzones);
@@ -142,9 +144,7 @@ sub create_or_update {
 
     @errors = $self->config->validate; # check for description and inventory_accno_id
 
-    if (@errors) {
-      die "foo" . @errors . "\n";
-    };
+    return 0 if @errors;
 
     $self->config->save;
 
@@ -175,7 +175,8 @@ sub create_or_update {
 
     1;
   })) {
-    die @errors ? join("\n", @errors) . "\n" : $db->error . "\n";
+    my $error = @errors ? join("\n", @errors) . "\n" : $db->error . "\n";
+    $::form->show_generic_error($error);
     # die with rollback of taxzone save if saving of any of the taxzone_charts fails
     # only show the $db->error if we haven't already identified the likely error ourselves
   }
diff --git a/SL/Controller/Chart.pm b/SL/Controller/Chart.pm
index eb2b4739a..d6656d7a0 100644
--- a/SL/Controller/Chart.pm
+++ b/SL/Controller/Chart.pm
@@ -87,7 +87,6 @@ sub action_show {
 
 sub action_show_report_configuration_overview {
   my ($self) = @_;
-
   my @all_charts = sort { $a->accno cmp $b->accno } @{ SL::DB::Manager::Chart->get_all(inject_results => 1) };
   my @types      = qw(bilanz bwa er eur);
   my %headings   = (
@@ -118,7 +117,7 @@ sub action_show_report_configuration_overview {
     };
   }
 
-  $self->render('chart/report_configuration_overview', DATA => \@data);
+  $self->render('chart/report_configuration_overview', DATA => \@data, title => t8('Chart configuration overview regarding reports'));
 }
 
 sub init_charts {
diff --git a/SL/Controller/ChartOfAccounts.pm b/SL/Controller/ChartOfAccounts.pm
new file mode 100644
index 000000000..5f058afc4
--- /dev/null
+++ b/SL/Controller/ChartOfAccounts.pm
@@ -0,0 +1,158 @@
+package SL::Controller::ChartOfAccounts;
+
+use strict;
+use parent qw(SL::Controller::Base);
+
+use POSIX qw(strftime);
+
+use SL::CA;
+
+use SL::ReportGenerator;
+use SL::Controller::Helper::ReportGenerator;
+use SL::Locale::String;
+
+use Rose::Object::MakeMethods::Generic (
+  scalar                  => [ qw(report) ],
+);
+
+__PACKAGE__->run_before(sub { $::auth->assert('report'); });
+
+sub action_list {
+  my ($self) = @_;
+
+  if ( $::instance_conf->get_accounting_method eq 'cash' ) {
+    $::form->{method} = "cash";
+  }
+
+  $self->prepare_report;
+  $self->set_report_data;
+  $self->report->generate_with_headers;
+}
+
+# private functions
+
+sub prepare_report {
+  my ($self) = @_;
+
+  $self->report(SL::ReportGenerator->new(\%::myconfig, $::form));
+
+  $self->report->{title} = t8 ('Chart of Accounts');
+  my @columns     = qw(accno description debit credit);
+  my %column_defs = (
+    accno       => { text => t8('Account') },
+    description => { text => t8('Description') },
+    debit       => { text => t8('Debit') },
+    credit      => { text => t8('Credit') },
+  );
+
+  $self->report->set_options(
+    std_column_visibility => 1,
+    controller_class      => 'ChartOfAccounts',
+    output_format         => 'HTML',
+    title                 => t8('Chart of Accounts'),
+    allow_pdf_export      => 1,
+    allow_csv_export      => 1,
+    attachment_basename   => t8('chart_of_accounts') . strftime('_%Y%m%d', localtime time),
+  );
+  $self->report->set_columns(%column_defs);
+  $self->report->set_column_order(@columns);
+
+  $self->report->set_export_options(qw(list));
+  $self->report->set_options_from_form;
+  $self->report->set_sort_indicator($::form->{sort}, 1);
+}
+
+sub set_report_data {
+  my ($self) = @_;
+
+  my $debit_sum = 0.;
+  my $credit_sum = 0.;
+
+  # i tried to use the get_balance function from SL::DB::Manager::Chart here,
+  # but the results i got were different (numbers and defined balance/amount),
+  # the database queries in CA are more sophisticated, therefore i'm still using these for now,
+  # also performance wise they seem faster
+  CA->all_accounts(\%::myconfig, \%$::form);
+
+  my $formatted_zero = $::form->format_amount(\%::myconfig, 0., 2);
+
+  for my $chart (@{ $::form->{CA} }) {
+    my $balance = $chart->{amount};
+
+    my $link = "controller.pl?action=ListTransactions%2freport_settings&accno=$chart->{accno}&link=1";
+    if (defined($balance)) {
+      my %data = (
+        accno       => { data => $chart->{accno}, link => $link },
+        description => { data => $chart->{description} },
+        debit       => { data => $balance < 0 ? $::form->format_amount(\%::myconfig, $balance * -1., 2) : ''},
+        credit      => { data => $balance >= 0 ? $::form->format_amount(\%::myconfig, $balance, 2) : ''},
+      );
+      $data{$_}->{align} = 'right' for qw(debit credit);
+      map { $data{$_}->{class} = 'listheading' } keys %data if ($chart->{charttype} eq "H") ;
+      $self->report->add_data(\%data);
+
+      if ($balance < 0) {
+        $debit_sum += $balance;
+      } else {
+        $credit_sum += $balance;
+      }
+    }
+  }
+  my %data_total = (
+    accno       => { data => t8('Total') },
+    description => { data => '' },
+    debit       => { data => $::form->format_amount(\%::myconfig, $debit_sum * -1., 2)},
+    credit      => { data => $::form->format_amount(\%::myconfig, $credit_sum, 2)},
+  );
+  $data_total{$_}->{align} = 'right' for qw(debit credit);
+  $data_total{$_}->{class} = 'listtotal' for keys %data_total;
+
+  $self->report->add_data(\%data_total);
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::ChartOfAccounts - Controller for the chart of accounts report
+
+=head1 SYNOPSIS
+
+New controller for Reports -> Chart of Accounts.
+
+This replaces the old bin/mozilla/ca.pl chart_of_accounts sub.
+
+The rest of the functions from ca.pl are separated into the new ListTransactions.pm
+controller.
+
+=head1 DESCRIPTION
+
+Displays a list of all accounts with their balance.
+
+Clicking on an account number will open the form for Reports -> List Transactions, with
+the account number preselected.
+
+Export to PDF, CSV and Chart is possible.
+
+=head1 CAVEATS / TODO
+
+Database queries are still from SL::CA.
+
+I tried to use the get_balance function from SL::DB::Manager::Chart here,
+but the results i got were different (numbers and defined balance/amount).
+The database queries in CA are more sophisticated, therefore i'm still using these for now.
+Also performance wise they seem faster.
+
+=head1 BUGS
+
+None yet.
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+
+=cut
diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index bc0f28701..94d81d3d5 100644
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -17,19 +17,21 @@ use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::PriceSource::ALL;
 use SL::Template;
+use SL::DB::Order::TypeData;
+use SL::DB::DeliveryOrder::TypeData;
+use SL::DB::Reclamation::TypeData;
 use SL::Controller::TopQuickSearch;
 use SL::DB::Helper::AccountingPeriod qw(get_balance_startdate_method_options);
-use SL::Helper::ShippedQty;
 use SL::VATIDNr;
 use SL::ZUGFeRD;
 
 __PACKAGE__->run_before('check_auth');
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(defaults all_warehouses all_weightunits all_languages all_currencies all_templates all_price_sources h_unit_name available_quick_search_modules available_shipped_qty_item_identity_fields
+  'scalar --get_set_init' => [ qw(defaults all_warehouses all_weightunits all_languages all_currencies all_templates all_price_sources h_unit_name available_quick_search_modules
                                   all_project_statuses all_project_types zugferd_settings
-                                  posting_options payment_options accounting_options inventory_options profit_options balance_startdate_method_options
-                                  displayable_name_specs_by_module) ],
+                                  posting_options payment_options accounting_options inventory_options profit_options balance_startdate_method_options yearend_options
+                                  displayable_name_specs_by_module available_documents_with_no_positions) ],
 );
 
 sub action_edit {
@@ -53,8 +55,6 @@ sub action_save {
     undef $defaults->{$_} if !$defaults->{$_};
   }
 
-  $defaults->{$_} = $::form->parse_amount(\%::myconfig, $defaults->{$_}) for qw(customer_hourly_rate);
-
   $self->defaults->assign_attributes(%{ $defaults });
 
   my %errors_idx;
@@ -77,13 +77,21 @@ sub action_save {
       $existing_currency->name($new_name);
     }
   }
-
   if ($::form->{new_currency} && $new_currency_names{ $::form->{new_currency} }) {
     $errors_idx{1} = t8('Currency names must be unique.');
   }
 
   my @errors = map { $errors_idx{$_} } sort keys %errors_idx;
 
+  # check valid mail adresses
+  foreach (qw(email_sender_sales_quotation email_sender_request_quotation email_sender_sales_order
+             email_sender_purchase_order email_sender_sales_delivery_order email_sender_purchase_delivery_order
+             email_sender_invoice email_sender_purchase_invoice email_sender_letter email_sender_dunning
+             global_bcc)) {
+    next unless $defaults->{$_};
+    next if     $defaults->{$_} =~ /^[a-z0-9.]+\@[a-z0-9.-]+$/i;
+    push @errors, t8('The email entry for #1 looks invalid', $_);
+  }
   # Check templates
   $::form->{new_templates}        =~ s:/::g;
   $::form->{new_master_templates} =~ s:/::g;
@@ -200,6 +208,11 @@ sub init_balance_startdate_method_options {
   return SL::DB::Helper::AccountingPeriod::get_balance_startdate_method_options;
 }
 
+sub init_yearend_options {
+  [ { title => t8("default"),         value => "default"   },
+    { title => t8("simple"),          value => "simple"    }, ]
+}
+
 sub init_all_price_sources {
   my @classes = SL::PriceSource::ALL->all_price_sources;
 
@@ -210,10 +223,6 @@ sub init_available_quick_search_modules {
   [ SL::Controller::TopQuickSearch->new->available_modules ];
 }
 
-sub init_available_shipped_qty_item_identity_fields {
-  [ SL::Helper::ShippedQty->new->available_item_identity_fields ];
-}
-
 sub init_displayable_name_specs_by_module {
   +{
      'SL::DB::Customer' => {
@@ -231,6 +240,16 @@ sub init_displayable_name_specs_by_module {
   };
 }
 
+sub init_available_documents_with_no_positions {
+  my @docs = ( @{SL::DB::Order::TypeData::valid_types()},
+               @{SL::DB::DeliveryOrder::TypeData::valid_types()},
+               @{SL::DB::Reclamation::TypeData::valid_types()} );
+
+  my @available_docs = map { {name => $_, description => $::form->get_formname_translation($_)} } @docs;
+
+  return \@available_docs;
+}
+
 #
 # filters
 #
@@ -246,7 +265,7 @@ sub check_auth {
 sub edit_form {
   my ($self) = @_;
 
-  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side kivi.File ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side kivi.File);
 
   $self->setup_edit_form_action_bar;
   $self->render('client_config/form', title => t8('Client Configuration'),
diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index d1ff7199f..d35419719 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -23,6 +23,7 @@ use SL::Controller::CsvImport::Project;
 use SL::Controller::CsvImport::Order;
 use SL::Controller::CsvImport::DeliveryOrder;
 use SL::Controller::CsvImport::ARTransaction;
+use SL::Controller::CsvImport::APTransaction;
 use SL::JSON;
 use SL::Controller::CsvImport::BankTransaction;
 use SL::BackgroundJob::CsvImport;
@@ -105,7 +106,11 @@ sub action_result {
   $self->profile($profile);
 
   if ($data->{errors} and my $first_error =  $data->{errors}->[0]) {
-    flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2.', $first_error->[2], $first_error->[4]));
+    if ('ARRAY' eq ref $first_error) {
+      flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2.', $first_error->[2], $first_error->[4]));
+    } else {
+      flash('error', $::locale->text('There was an error parsing the csv file: #1', $first_error));
+    }
   }
 
   if ($data->{progress}{finished} || $data->{errors}) {
@@ -308,7 +313,7 @@ sub check_auth {
 sub check_type {
   my ($self) = @_;
 
-  die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts inventories customers_vendors billing_addresses addresses contacts projects orders delivery_orders bank_transactions ar_transactions);
+  die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts inventories customers_vendors billing_addresses addresses contacts projects orders delivery_orders bank_transactions ar_transactions ap_transactions);
   $self->type($::form->{profile}->{type});
 }
 
@@ -359,9 +364,10 @@ sub render_inputs {
             : $self->type eq 'delivery_orders'   ? $::locale->text('CSV import: delivery orders')
             : $self->type eq 'bank_transactions' ? $::locale->text('CSV import: bank transactions')
             : $self->type eq 'ar_transactions'   ? $::locale->text('CSV import: ar transactions')
+            : $self->type eq 'ap_transactions'   ? $::locale->text('CSV import: ap transactions')
             : die;
 
-  if ( any { $_ eq $self->{type} } qw(customers_vendors orders delivery_orders ar_transactions) ) {
+  if ( any { $_ eq $self->{type} } qw(customers_vendors orders delivery_orders ar_transactions ap_transactions) ) {
     $self->all_taxzones(SL::DB::Manager::TaxZone->get_all_sorted(query => [ obsolete => 0 ]));
   };
 
@@ -510,7 +516,7 @@ sub profile_from_form {
     $::form->{settings}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
   }
 
-  if ($self->type eq 'orders' or $self->{type} eq 'ar_transactions') {
+  if ( any { $_ eq $self->{type} } qw(orders ar_transactions ap_transactions) ) {
     $::form->{settings}->{max_amount_diff} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{max_amount_diff});
   }
 
@@ -731,6 +737,7 @@ sub init_worker {
        : $self->{type} eq 'delivery_orders'   ? SL::Controller::CsvImport::DeliveryOrder->new(@args)
        : $self->{type} eq 'bank_transactions' ? SL::Controller::CsvImport::BankTransaction->new(@args)
        : $self->{type} eq 'ar_transactions'   ? SL::Controller::CsvImport::ARTransaction->new(@args)
+       : $self->{type} eq 'ap_transactions'   ? SL::Controller::CsvImport::APTransaction->new(@args)
        :                                        die "Program logic error";
 }
 
diff --git a/SL/Controller/CsvImport/APTransaction.pm b/SL/Controller/CsvImport/APTransaction.pm
new file mode 100644
index 000000000..57ae37f15
--- /dev/null
+++ b/SL/Controller/CsvImport/APTransaction.pm
@@ -0,0 +1,643 @@
+package SL::Controller::CsvImport::APTransaction;
+
+use strict;
+
+use List::MoreUtils qw(any);
+
+use SL::Helper::Csv;
+use SL::Controller::CsvImport::Helper::Consistency;
+use SL::DB::PurchaseInvoice;
+use SL::DB::AccTransaction;
+use SL::DB::Department;
+use SL::DB::Project;
+use SL::DB::TaxZone;
+use SL::DB::Chart;
+use SL::TransNumber;
+use DateTime;
+
+use parent qw(SL::Controller::CsvImport::BaseMulti);
+
+use Rose::Object::MakeMethods::Generic
+(
+ 'scalar --get_set_init' => [ qw(settings charts_by taxkeys_by) ],
+);
+
+
+sub init_class {
+  my ($self) = @_;
+  $self->class(['SL::DB::PurchaseInvoice', 'SL::DB::AccTransaction']);
+}
+
+sub set_profile_defaults {
+  my ($self) = @_;
+
+  $self->controller->profile->_set_defaults(
+    ap_column                    => $::locale->text('Invoice'),
+    transaction_column           => $::locale->text('AccTransaction'),
+    max_amount_diff              => 0.02,
+    dont_save_anything_on_errors => 0,
+  );
+};
+
+
+sub init_settings {
+  my ($self) = @_;
+
+  return { map { ( $_ => $self->controller->profile->get($_) ) } qw(ap_column transaction_column max_amount_diff dont_save_anything_on_errors) };
+}
+
+sub init_profile {
+  my ($self) = @_;
+
+  my $profile = $self->SUPER::init_profile;
+
+  # SUPER::init_profile sets row_ident to the translated class name
+  # overwrite it with the user specified settings
+  foreach my $p (@{ $profile }) {
+    if ($p->{class} eq 'SL::DB::PurchaseInvoice') {
+      $p->{row_ident} = $self->_ap_column;
+    }
+    if ($p->{class} eq 'SL::DB::AccTransaction') {
+      $p->{row_ident} = $self->_transaction_column;
+    }
+  }
+
+  foreach my $p (@{ $profile }) {
+    my $prof = $p->{profile};
+    if ($p->{row_ident} eq $self->_ap_column) {
+      # no need to handle
+      delete @{$prof}{qw(amount cp_id datepaid delivery_term_id gldate invoice language_id netamount paid shipvia storno storno_id taxzone taxzone_id type)};
+    }
+    if ($p->{row_ident} eq $self->_transaction_column) {
+      # no need to handle
+      delete @{$prof}{qw(acc_trans_id cb_transaction chart_link cleared fx_transaction gldate memo ob_transaction source tax_id description trans_id transdate)};
+    }
+  }
+
+  return $profile;
+}
+
+sub init_existing_objects {
+  my ($self) = @_;
+
+  # only use objects of main class (the first one)
+  #eval "require " . $self->class->[0];
+  $self->existing_objects($self->manager_class->[0]->get_all);
+}
+
+sub get_duplicate_check_fields {
+  return {
+    vendor_and_invnumber => {
+      label     => $::locale->text('Vendor and Invoice Number'),
+      default   => 1,
+      std_check => 1,
+      maker     => sub {
+        my ($object, $worker) = @_;
+        return if ref $object ne $worker->class->[0];
+        return '__' . $object->vendor_id . '__' . $object->invnumber . '__';
+      },
+    },
+  };
+}
+
+sub check_std_duplicates {
+  my $self = shift;
+
+  my $duplicates = {};
+
+  my $all_fields = $self->get_duplicate_check_fields();
+
+  foreach my $key (keys(%{ $all_fields })) {
+    if ( $self->controller->profile->get('duplicates_'. $key) && (!exists($all_fields->{$key}->{std_check}) || $all_fields->{$key}->{std_check} )  ) {
+      $duplicates->{$key} = {};
+    }
+  }
+
+  my @duplicates_keys = keys(%{ $duplicates });
+
+  if ( !scalar(@duplicates_keys) ) {
+    return;
+  }
+
+  if ( $self->controller->profile->get('duplicates') eq 'check_db' ) {
+    foreach my $object (@{ $self->existing_objects }) {
+      foreach my $key (@duplicates_keys) {
+        my $value = exists($all_fields->{$key}->{maker}) ? $all_fields->{$key}->{maker}->($object, $self) : $object->$key;
+        $duplicates->{$key}->{$value} = 'db';
+      }
+    }
+  }
+
+  # only check main class (the first one)
+  foreach my $entry (@{ $self->controller->data }) {
+    my $object = $entry->{object};
+
+    next if ref $object ne $self->class->[0];
+    next if scalar @{ $entry->{errors} };
+
+    foreach my $key (@duplicates_keys) {
+      my $value = exists($all_fields->{$key}->{maker}) ? $all_fields->{$key}->{maker}->($object, $self) : $object->$key;
+
+      if ( exists($duplicates->{$key}->{$value}) ) {
+        push(@{ $entry->{errors} }, $duplicates->{$key}->{$value} eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file'));
+        last;
+      } else {
+        $duplicates->{$key}->{$value} = 'csv';
+      }
+    }
+  }
+}
+
+sub setup_displayable_columns {
+  my ($self) = @_;
+
+  $self->SUPER::setup_displayable_columns;
+
+  $self->add_displayable_columns($self->_ap_column,
+                                 { name => 'datatype',                description => $self->_ap_column . ' [1]'                                },
+                                 { name => 'currency_id',             description => $::locale->text('Currency (database ID)')                 },
+                                 { name => 'currency',                description => $::locale->text('Currency')                               },
+                                 { name => 'deliverydate',            description => $::locale->text('Delivery Date')                          },
+                                 { name => 'department_id',           description => $::locale->text('Department (database ID)')               },
+                                 { name => 'department',              description => $::locale->text('Department (description)')               },
+                                 { name => 'direct_debit',            description => $::locale->text('direct debit')                           },
+                                 { name => 'duedate',                 description => $::locale->text('Due Date')                               },
+                                 { name => 'employee_id',             description => $::locale->text('Employee (database ID)')                 },
+                                 { name => 'exchangerate',            description => $::locale->text('Exchangerate')                           },
+                                 { name => 'globalproject_id',        description => $::locale->text('Document Project (database ID)')         },
+                                 { name => 'globalprojectnumber',     description => $::locale->text('Document Project (number)')              },
+                                 { name => 'globalproject',           description => $::locale->text('Document Project (description)')         },
+                                 { name => 'intnotes',                description => $::locale->text('Internal Notes')                         },
+                                 { name => 'invnumber',               description => $::locale->text('Invoice Number')                         },
+                                 { name => 'is_sepa_blocked',         description => $::locale->text('Bank transfer via SEPA is blocked')      },
+                                 { name => 'notes',                   description => $::locale->text('Notes')                                  },
+                                 { name => 'orddate',                 description => $::locale->text('Order Date')                             },
+                                 { name => 'ordnumber',               description => $::locale->text('Order Number')                           },
+                                 { name => 'payment_id',              description => $::locale->text('Payment terms (database ID)')            },
+                                 { name => 'payment',                 description => $::locale->text('Payment terms (name)')                   },
+                                 { name => 'quonumber',               description => $::locale->text('Quotation Number')                       },
+                                 { name => 'quodate',                 description => $::locale->text('Quotation Date')                         },
+                                 { name => 'tax_point',               description => $::locale->text('Tax point')                              },
+                                 { name => 'taxincluded',             description => $::locale->text('Tax Included')                           },
+                                 { name => 'transaction_description', description => $::locale->text('Transaction description')                },
+                                 { name => 'transdate',               description => $::locale->text('Invoice Date')                           },
+                                 { name => 'vendor',                  description => $::locale->text('Vendor (name)')                          },
+                                 { name => 'vendornumber',            description => $::locale->text('Vendor Number')                          },
+                                 { name => 'vendor_gln',              description => $::locale->text('Vendor GLN')                             },
+                                 { name => 'vendor_id',               description => $::locale->text('Vendor (database ID)')                   },
+                                 { name => 'verify_amount',           description => $::locale->text('Amount (for verification)') . ' [2]'     },
+                                 { name => 'verify_netamount',        description => $::locale->text('Net amount (for verification)') . ' [2]' },
+                                 { name => 'apchart',                 description => $::locale->text('Payable account (account number)')       },
+  );
+
+  $self->add_displayable_columns($self->_transaction_column,
+                                 { name => 'datatype',      description => $self->_transaction_column . ' [1]'             },
+                                 { name => 'amount',        description => $::locale->text('Amount')                       },
+                                 { name => 'chart_id',      description => $::locale->text('Account number (database ID)') },
+                                 { name => 'project_id',    description => $::locale->text('Project (database ID)')        },
+                                 { name => 'project',       description => $::locale->text('Project (description)')        },
+                                 { name => 'projectnumber', description => $::locale->text('Project (number)')             },
+                                 { name => 'taxkey',        description => $::locale->text('Taxkey')                       },
+                                 { name => 'accno',         description => $::locale->text('Account number')               },
+                                );
+}
+
+sub init_taxkeys_by {
+  my ($self) = @_;
+
+  my $all_taxes = SL::DB::Manager::Tax->get_all;
+  return { map { $_->taxkey => $_->id } @{ $all_taxes } };
+}
+
+
+sub init_charts_by {
+  my ($self) = @_;
+
+  my $all_charts = SL::DB::Manager::Chart->get_all;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_charts } } ) } qw(id accno) };
+}
+
+sub check_objects {
+  my ($self) = @_;
+
+  $self->controller->track_progress(phase => 'building data', progress => 0);
+
+  my $i = 0;
+  my $num_data = scalar @{ $self->controller->data };
+  my $invoice_entry;
+
+  foreach my $entry (@{ $self->controller->data }) {
+    $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
+
+    if ($entry->{raw_data}->{datatype} eq $self->_ap_column) {
+      $entry->{info_data}->{datatype} = $::locale->text($self->_ap_column);
+      $self->handle_invoice($entry);
+      $invoice_entry = $entry;
+    } elsif ($entry->{raw_data}->{datatype} eq $self->_transaction_column ) {
+      die "Cannot process transaction row without an invoice row" if !$invoice_entry;
+      $entry->{info_data}->{datatype} = $::locale->text($self->_transaction_column);
+      $self->handle_transaction($entry, $invoice_entry);
+    } else {
+      die "unknown datatype";
+    };
+
+  } continue {
+    $i++;
+  } # finished data parsing
+
+  $self->add_info_columns($self->_ap_column,          { header => 'datatype', method => 'datatype' });
+  $self->add_info_columns($self->_transaction_column, { header => 'datatype', method => 'datatype' });
+
+  $self->add_transactions_to_ap(); # go through all data entries again, adding payable entry to ap lines while calculating amount and netamount
+
+  $self->check_verify_amounts();
+
+  foreach my $entry (@{ $self->controller->data }) {
+    next unless ($entry->{raw_data}->{datatype} eq $self->_ap_column);
+    unless ( $entry->{object}->validate_acc_trans ) {
+      push @{ $entry->{errors} }, $::locale->text('Error: ap transaction doesn\'t validate');
+    };
+  };
+
+  # add info columns that aren't directly part of the object to be imported
+  # but are always determined or should always be shown because they are mandatory
+  $self->add_info_columns($self->_ap_column,
+                          { header => $::locale->text('Vendor'),              method => 'vc_name'   },
+                          { header => $::locale->text('Payable account'),     method => 'apchart'   },
+                          { header => $::locale->text('Amount'),              method => 'amount'    },
+                          { header => $::locale->text('Net amount'),          method => 'netamount' },
+                          { header => $::locale->text('Tax zone'),            method => 'taxzone'   });
+
+  # Adding info_header this way only works, if the first invoice $self->controller->data->[0]
+
+  # Todo: access via ->[0] ok? Better: search first order column and use this
+  $self->add_info_columns($self->_ap_column, { header => $::locale->text('Department'),    method => 'department' }) if $self->controller->data->[0]->{info_data}->{department} or $self->controller->data->[0]->{raw_data}->{department};
+
+  $self->add_info_columns($self->_ap_column, { header => $::locale->text('Project Number'), method => 'globalprojectnumber' }) if $self->controller->data->[0]->{info_data}->{globalprojectnumber};
+
+  $self->add_columns($self->_ap_column,
+                     map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(payment department globalproject taxzone currency));
+  $self->add_columns($self->_ap_column, 'globalproject_id') if exists $self->controller->data->[0]->{raw_data}->{globalprojectnumber};
+  $self->add_columns($self->_ap_column, 'notes')            if exists $self->controller->data->[0]->{raw_data}->{notes};
+
+  # Todo: access via ->[1] ok? Better: search first item column and use this
+  $self->add_info_columns($self->_transaction_column, { header => $::locale->text('Chart'), method => 'accno' });
+  $self->add_columns($self->_transaction_column, 'amount');
+
+  $self->add_info_columns($self->_transaction_column, { header => $::locale->text('Project Number'), method => 'projectnumber' }) if $self->controller->data->[1]->{info_data}->{projectnumber};
+
+  # If requested to not save anything on errors, set all ap rows without error to an error
+  if ($self->controller->profile->get('dont_save_anything_on_errors')) {
+    my $any_errors = any { scalar @{ $_->{errors} } } @{ $self->controller->data };
+    if ($any_errors) {
+      foreach my $entry (grep { ($_->{raw_data}->{datatype} eq $self->_ap_column) && !scalar @{ $_->{errors} } } @{ $self->controller->data }) {
+        push @{ $entry->{errors} }, $::locale->text('There are some errors in the file and it was requested to not save any datasets on errors.');
+      }
+    }
+  }
+
+  # If invoice has errors, add error for acc_trans items
+  # If acc_trans item has an error, add an error to the invoice item
+  my $ap_entry;
+  foreach my $entry (@{ $self->controller->data }) {
+    # Search first order
+    if ($entry->{raw_data}->{datatype} eq $self->_ap_column) {
+      $ap_entry = $entry;
+    } elsif ( defined $ap_entry
+              && $entry->{raw_data}->{datatype} eq $self->_transaction_column
+              && scalar @{ $ap_entry->{errors} } > 0 ) {
+      push @{ $entry->{errors} }, $::locale->text('Error: invalid ap row for this transaction');
+    } elsif ( defined $ap_entry
+              && $entry->{raw_data}->{datatype} eq $self->_transaction_column
+              && scalar @{ $entry->{errors} } > 0 ) {
+      push @{ $ap_entry->{errors} }, $::locale->text('Error: invalid acc transactions for this ap row');
+    }
+  }
+}
+
+sub handle_invoice {
+
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  $object->transactions( [] ); # initialise transactions for ap object so methods work on unsaved transactions
+
+  my $vc_obj;
+  if (any { $entry->{raw_data}->{$_} } qw(vendor vendornumber vendor_gln vendor_id)) {
+    $self->check_vc($entry, 'vendor_id');
+    $vc_obj = SL::DB::Vendor->new(id => $object->vendor_id)->load if $object->vendor_id;
+  } else {
+    push @{ $entry->{errors} }, $::locale->text('Error: Vendor missing');
+  }
+
+  if (!$entry->{raw_data}->{invnumber}) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Invoice Number missing');
+  }
+
+  $self->check_apchart($entry); # checks for payable account
+  $self->check_payment($entry); # currency default from vendor used below
+  $self->check_department($entry);
+  $self->check_taxincluded($entry);
+  $self->check_project($entry, global => 1);
+  $self->check_taxzone($entry); # taxzone default from customer used below
+  $self->check_currency($entry); # currency default from customer used below
+  $self->handle_employee($entry);
+
+  if ($vc_obj ) {
+    # copy defaults from customer if not specified in import file
+    foreach (qw(payment_id language_id taxzone_id currency_id)) {
+      $object->$_($vc_obj->$_) unless $object->$_;
+    }
+  }
+}
+
+sub check_taxkey {
+  my ($self, $entry, $invoice_entry, $chart) = @_;
+
+  die "check_taxkey needs chart object as an argument" unless ref($chart) eq 'SL::DB::Chart';
+  # problem: taxkey is not unique in table tax, normally one of those entries is chosen directly from a dropdown
+  # so we check if the chart has an active taxkey, and if it matches the taxkey from the import, use the active taxkey
+  # if the chart doesn't have an active taxkey, use the first entry from Tax that matches the taxkey
+
+  my $object         = $entry->{object};
+  my $invoice_object = $invoice_entry->{object};
+
+  unless ( defined $entry->{raw_data}->{taxkey} ) {
+    push @{ $entry->{errors} }, $::locale->text('Error: taxkey missing'); # don't just assume 0, force taxkey in import
+    return 0;
+  };
+
+  my $tax = $chart->get_active_taxkey($invoice_object->deliverydate // $invoice_object->transdate // DateTime->today_local)->tax;
+  if ( $entry->{raw_data}->{taxkey} != $tax->taxkey ) {
+   # assume there is only one tax entry with that taxkey, can't guess
+    $tax = SL::DB::Manager::Tax->get_first( where => [ taxkey => $entry->{raw_data}->{taxkey} ]);
+  };
+
+  unless ( $tax ) {
+    push @{ $entry->{errors} }, $::locale->text('Error: invalid taxkey');
+    return 0;
+  };
+
+  $object->taxkey($tax->taxkey);
+  $object->tax_id($tax->id);
+  return 1;
+};
+
+sub handle_transaction {
+  my ($self, $entry, $invoice_entry) = @_;
+
+  # Prepare acc_trans data. amount is dealt with in add_transactions_to_ap
+
+  my $object = $entry->{object};
+
+  $self->check_project($entry, global => 0);
+  if ( $self->check_chart($entry) ) {
+    my $chart_obj = SL::DB::Manager::Chart->find_by(id => $object->chart_id);
+
+    unless ( $chart_obj->link =~ /AP_amount/ ) {
+      push @{ $entry->{errors} }, $::locale->text('Error: chart isn\'t an ap_amount chart');
+      return 0;
+    };
+
+    if ( $self->check_taxkey($entry, $invoice_entry, $chart_obj) ) {
+      # do nothing, taxkey was assigned, just continue
+    } else {
+      # missing taxkey, don't do anything
+      return 0;
+    };
+  } else {
+    return 0;
+  };
+
+  # check whether taxkey and automatic taxkey match
+  # die sprintf("taxkeys don't match: %s not equal default taxkey for chart %s: %s", $object->taxkey, $chart_obj->accno, $active_tax_for_chart->tax->taxkey) unless $object->taxkey == $active_tax_for_chart->tax->taxkey;
+
+  die "no taxkey for transaction object" unless $object->taxkey or $object->taxkey == 0;
+
+}
+
+sub check_chart {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  if (any { $entry->{raw_data}->{$_} } qw(accno chart_id)) {
+
+    # Check whether or not chart ID is valid.
+    if ($object->chart_id && !$self->charts_by->{id}->{ $object->chart_id }) {
+      push @{ $entry->{errors} }, $::locale->text('Error: invalid chart_id');
+      return 0;
+    }
+
+    # Map number to ID if given.
+    if (!$object->chart_id && $entry->{raw_data}->{accno}) {
+      my $chart = $self->charts_by->{accno}->{ $entry->{raw_data}->{accno} };
+      if (!$chart) {
+        push @{ $entry->{errors} }, $::locale->text('Error: invalid chart (accno)');
+        return 0;
+      }
+
+      $object->chart_id($chart->id);
+    }
+
+    # Map description to ID if given.
+    if (!$object->chart_id && $entry->{raw_data}->{description}) {
+      my $chart = $self->charts_by->{description}->{ $entry->{raw_data}->{description} };
+      if (!$chart) {
+        push @{ $entry->{errors} }, $::locale->text('Error: invalid chart');
+        return 0;
+      }
+
+      $object->chart_id($chart->id);
+    }
+
+    if ($object->chart_id) {
+      # add account number to preview
+      $entry->{info_data}->{accno} = $self->charts_by->{id}->{ $object->chart_id }->accno;
+    } else {
+      push @{ $entry->{errors} }, $::locale->text('Error: chart not found');
+      return 0;
+    }
+  } else {
+    push @{ $entry->{errors} }, $::locale->text('Error: chart missing');
+    return 0;
+  }
+
+  return 1;
+}
+
+sub check_apchart {
+  my ($self, $entry) = @_;
+
+  my $chart;
+
+  if ( $entry->{raw_data}->{apchart} ) {
+    my $apchart = $entry->{raw_data}->{apchart};
+    $chart = SL::DB::Manager::Chart->find_by(accno => $apchart);
+    unless ($chart) {
+      push @{ $entry->{errors} }, $::locale->text("Error: can't find ap chart with accno #1", $apchart);
+      return 0;
+    }
+  } elsif ( $::instance_conf->get_ap_chart_id ) {
+    $chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_ap_chart_id);
+  } else {
+    push @{ $entry->{errors} }, $::locale->text("Error: neither apchart passed, no default payable chart configured");
+    return 0;
+  };
+
+  unless ($chart->link eq 'AP') {
+    push @{ $entry->{errors} }, $::locale->text('Error: apchart isn\'t an AP chart');
+    return 0;
+  };
+
+  $entry->{info_data}->{apchart} = $chart->accno;
+  $entry->{object}->{apchart} = $chart;
+  return 1;
+};
+
+sub check_taxincluded {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  if ( $entry->{raw_data}->{taxincluded} ) {
+    if ( $entry->{raw_data}->{taxincluded} eq 'f' or $entry->{raw_data}->{taxincluded} eq '0' ) {
+      $object->taxincluded('0');
+    } elsif ( $entry->{raw_data}->{taxincluded} eq 't' or $entry->{raw_data}->{taxincluded} eq '1' ) {
+      $object->taxincluded('1');
+    } else {
+      push @{ $entry->{errors} }, $::locale->text('Error: taxincluded has to be t or f');
+      return 0;
+    };
+  } else {
+    push @{ $entry->{errors} }, $::locale->text('Error: taxincluded wasn\'t set');
+    return 0;
+  };
+  return 1;
+};
+
+sub check_verify_amounts {
+  my ($self) = @_;
+
+  # If amounts are given, show calculated amounts as info and given amounts (verify_xxx).
+  # And throw an error if the differences are too big.
+  my @to_verify = ( { column      => 'amount',
+                      raw_column  => 'verify_amount',
+                      info_header => 'Calc. Amount',
+                      info_method => 'calc_amount',
+                      err_msg     => $::locale->text('Amounts differ too much'),
+                    },
+                    { column      => 'netamount',
+                      raw_column  => 'verify_netamount',
+                      info_header => 'Calc. Net amount',
+                      info_method => 'calc_netamount',
+                      err_msg     => $::locale->text('Net amounts differ too much'),
+                    } );
+
+  foreach my $tv (@to_verify) {
+    if (exists $self->controller->data->[0]->{raw_data}->{ $tv->{raw_column} }) {
+      $self->add_raw_data_columns($self->_ap_column, $tv->{raw_column});
+      $self->add_info_columns($self->_ap_column,
+                              { header => $::locale->text($tv->{info_header}), method => $tv->{info_method} });
+    }
+
+    # check differences
+    foreach my $entry (@{ $self->controller->data }) {
+      if ($entry->{raw_data}->{datatype} eq $self->_ap_column) {
+        next if !$entry->{raw_data}->{ $tv->{raw_column} };
+        my $parsed_value = $::form->parse_amount(\%::myconfig, $entry->{raw_data}->{ $tv->{raw_column} });
+        # round $abs_diff, otherwise it might trigger for 0.020000000000021
+        my $abs_diff = $::form->round_amount(abs($entry->{object}->${ \$tv->{column} } - $parsed_value),2);
+        if ( $abs_diff > $self->settings->{'max_amount_diff'}) {
+          push @{ $entry->{errors} }, $::locale->text($tv->{err_msg});
+        }
+      }
+    }
+  }
+};
+
+sub add_transactions_to_ap {
+  my ($self) = @_;
+
+  # go through all verified ap and acc_trans rows in import, adding acc_trans objects to ap objects
+
+  my $ap_entry;  # the current ap row
+
+  foreach my $entry (@{ $self->controller->data }) {
+    # when we reach an ap_column for the first time, don't do anything, just store in $ap_entry
+    # when we reach an ap_column for the second time, save it
+    if ($entry->{raw_data}->{datatype} eq $self->_ap_column) {
+      if ( $ap_entry && $ap_entry->{object} ) { # won't trigger the first time, finishes the last object
+        if ( $ap_entry->{object}->{apchart} && $ap_entry->{object}->{apchart}->isa('SL::DB::Chart') ) {
+          $ap_entry->{object}->recalculate_amounts; # determine and set amount and netamount for ap
+          $ap_entry->{object}->create_ap_row(chart => $ap_entry->{object}->{apchart});
+          $ap_entry->{info_data}->{calc_amount}    = $ap_entry->{object}->amount_as_number;
+          $ap_entry->{info_data}->{calc_netamount} = $ap_entry->{object}->netamount_as_number;
+        } else {
+          push @{ $ap_entry->{errors} }, $::locale->text("The payable chart isn't a valid chart.");
+        };
+      };
+      $ap_entry = $entry; # remember as last ap_entry
+
+    } elsif ( defined $ap_entry && $entry->{raw_data}->{datatype} eq $self->_transaction_column ) {
+      push @{ $entry->{errors} }, $::locale->text('no tax_id in acc_trans') if !defined $entry->{object}->tax_id;
+      next if @{ $entry->{errors} };
+
+      my $acc_trans_objects = $ap_entry->{object}->add_ap_amount_row(
+        amount      => $entry->{object}->amount,
+        chart       => SL::DB::Manager::Chart->find_by(id => $entry->{object}->chart_id), # add_ap_amount takes chart obj. as argument
+        tax_id      => $entry->{object}->tax_id,
+        project_id  => $entry->{object}->project_id,
+        debug       => 0,
+      );
+
+    } else {
+      die "This should never happen\n";
+    };
+  }
+
+  # finish the final object
+  if ( $ap_entry->{object} ) {
+    if ( $ap_entry->{object}->{apchart} && $ap_entry->{object}->{apchart}->isa('SL::DB::Chart') ) {
+      $ap_entry->{object}->recalculate_amounts;
+      $ap_entry->{info_data}->{calc_amount}    = $ap_entry->{object}->amount_as_number;
+      $ap_entry->{info_data}->{calc_netamount} = $ap_entry->{object}->netamount_as_number;
+
+      $ap_entry->{object}->create_ap_row(chart => $ap_entry->{object}->{apchart});
+    } else {
+      push @{ $ap_entry->{errors} }, $::locale->text("The payable chart isn't a valid chart.");
+      return 0;
+    };
+  } else {
+    die "There was no final ap_entry object";
+  };
+}
+
+sub save_objects {
+  my ($self, %params) = @_;
+
+  # save all the Invoice objects
+  my $objects_to_save;
+  foreach my $entry (@{ $self->controller->data }) {
+    # only push the invoice objects that don't have an error
+    next if $entry->{raw_data}->{datatype} ne $self->_ap_column;
+    next if @{ $entry->{errors} };
+
+    die unless $entry->{object}->validate_acc_trans;
+
+    push @{ $objects_to_save }, $entry;
+  }
+
+  $self->SUPER::save_objects(data => $objects_to_save);
+}
+
+sub _ap_column {
+  $_[0]->settings->{'ap_column'}
+}
+
+sub _transaction_column {
+  $_[0]->settings->{'transaction_column'}
+}
+
+1;
diff --git a/SL/Controller/CsvImport/ARTransaction.pm b/SL/Controller/CsvImport/ARTransaction.pm
index 36760fe38..d5a5905a9 100644
--- a/SL/Controller/CsvImport/ARTransaction.pm
+++ b/SL/Controller/CsvImport/ARTransaction.pm
@@ -181,10 +181,7 @@ sub check_objects {
 
   $self->add_transactions_to_ar(); # go through all data entries again, adding receivable entry to ar lines while calculating amount and netamount
 
-  foreach my $entry (@{ $self->controller->data }) {
-    next unless ($entry->{raw_data}->{datatype} eq $self->_ar_column);
-    $self->check_verify_amounts($entry->{object});
-  };
+  $self->check_verify_amounts();
 
   foreach my $entry (@{ $self->controller->data }) {
     next unless ($entry->{raw_data}->{datatype} eq $self->_ar_column);
@@ -501,11 +498,6 @@ sub check_verify_amounts {
 
     # check differences
     foreach my $entry (@{ $self->controller->data }) {
-      if ( @{ $entry->{errors} } ) {
-        push @{ $entry->{errors} }, $::locale->text($tv->{err_msg});
-        return 0;
-      };
-
       if ($entry->{raw_data}->{datatype} eq $self->_ar_column) {
         next if !$entry->{raw_data}->{ $tv->{raw_column} };
         my $parsed_value = $::form->parse_amount(\%::myconfig, $entry->{raw_data}->{ $tv->{raw_column} });
@@ -534,10 +526,10 @@ sub add_transactions_to_ar {
         if ( $ar_entry->{object}->{archart} && $ar_entry->{object}->{archart}->isa('SL::DB::Chart') ) {
           $ar_entry->{object}->recalculate_amounts; # determine and set amount and netamount for ar
           $ar_entry->{object}->create_ar_row(chart => $ar_entry->{object}->{archart});
-          $ar_entry->{info_data}->{amount}    = $ar_entry->{object}->amount;
-          $ar_entry->{info_data}->{netamount} = $ar_entry->{object}->netamount;
+          $ar_entry->{info_data}->{calc_amount}    = $ar_entry->{object}->amount_as_number;
+          $ar_entry->{info_data}->{calc_netamount} = $ar_entry->{object}->netamount_as_number;
         } else {
-          push @{ $entry->{errors} }, $::locale->text("ar_chart isn't a valid chart");
+          push @{ $ar_entry->{errors} }, $::locale->text("The receivables chart isn't a valid chart.");
         };
       };
       $ar_entry = $entry; # remember as last ar_entry
@@ -563,8 +555,8 @@ sub add_transactions_to_ar {
   if ( $ar_entry->{object} ) {
     if ( $ar_entry->{object}->{archart} && $ar_entry->{object}->{archart}->isa('SL::DB::Chart') ) {
       $ar_entry->{object}->recalculate_amounts;
-      $ar_entry->{info_data}->{amount}    = $ar_entry->{object}->amount;
-      $ar_entry->{info_data}->{netamount} = $ar_entry->{object}->netamount;
+      $ar_entry->{info_data}->{calc_amount}    = $ar_entry->{object}->amount_as_number;
+      $ar_entry->{info_data}->{calc_netamount} = $ar_entry->{object}->netamount_as_number;
 
       $ar_entry->{object}->create_ar_row(chart => $ar_entry->{object}->{archart});
     } else {
diff --git a/SL/Controller/CsvImport/BankTransaction.pm b/SL/Controller/CsvImport/BankTransaction.pm
index 77063738c..1d447a34a 100644
--- a/SL/Controller/CsvImport/BankTransaction.pm
+++ b/SL/Controller/CsvImport/BankTransaction.pm
@@ -50,6 +50,7 @@ sub check_objects {
     $self->check_currency($entry, take_default => 1);
     $self->join_purposes($entry);
     $self->join_remote_names($entry);
+    $self->extract_end_to_end_id($entry);
     $self->check_existing($entry) unless @{ $entry->{errors} };
   } continue {
     $i++;
@@ -57,6 +58,7 @@ sub check_objects {
 
   $self->add_info_columns({ header => $::locale->text('Bank account'), method => 'local_bank_name' });
   $self->add_raw_data_columns("currency", "currency_id") if grep { /^currency(?:_id)?$/ } @{ $self->csv->header };
+  $self->add_info_columns({ header => $::locale->text('End to end ID'), method => 'end_to_end_id' });
 }
 
 sub check_existing {
@@ -76,7 +78,16 @@ sub check_existing {
     # * amount
     # * local_bank_account_id (case flatrate bank charges for two accounts in one bank: same purpose, transdate, remote_account_number(empty), amount. Just different local_bank_account_id)
     my $num;
-    if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, purpose => $object->purpose, amount => $object->amount, local_bank_account_id => $object->local_bank_account_id] ) ) {
+
+    my @conditions;
+
+    if ($object->end_to_end_id && $::instance_conf->get_check_bt_duplicates_endtoend) {
+      push @conditions, ( end_to_end_id => $object->end_to_end_id );
+    } else {
+      push @conditions, ( purpose => $object->purpose );
+    }
+
+    if ( $num = SL::DB::Manager::BankTransaction->get_all_count(query =>[ remote_account_number => $object->remote_account_number, transdate => $object->transdate, amount => $object->amount, local_bank_account_id => $object->local_bank_account_id, @conditions] ) ) {
       push(@{$entry->{errors}}, $::locale->text('Skipping due to existing bank transaction in database'));
     };
   } else {
@@ -111,7 +122,8 @@ sub _displayable_columns {
    { name => 'purpose10',             description => $::locale->text('Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")') },
    { name => 'purpose11',             description => $::locale->text('Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")') },
    { name => 'purpose12',             description => $::locale->text('Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")') },
-   { name => 'purpose13',             description => $::locale->text('Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")') }
+   { name => 'purpose13',             description => $::locale->text('Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")') },
+   { name => 'qr_reference',          description => $::locale->text('QR reference') }
  );
 }
 
@@ -167,6 +179,13 @@ sub check_bank_account {
     $object->local_bank_account_id($bank_account->id);
     $entry->{info_data}->{local_bank_name} = $bank_account->name;
   }
+
+  # Check if local bank account is marked for bank import
+  if ($object->local_bank_account_id && !$self->bank_accounts_by->{id}->{ $object->local_bank_account_id }->use_with_bank_import) {
+    push @{ $entry->{errors} }, $::locale->text('Error: local bank account is not marked for bank import, check settings under System -> Bank Accounts');
+    return 0;
+  }
+
   return $object->local_bank_account_id ? 1 : 0;
 }
 
@@ -195,6 +214,19 @@ sub join_remote_names {
   $object->remote_name($remote_name);
 }
 
+sub extract_end_to_end_id {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  return if $object->purpose !~ m{\b(?:end\W?to\W?end:|eref\+) *([^ ]+)}i;
+
+  my $id = $1;
+
+  $object->end_to_end_id($id) if $id !~ m{notprovided}i;
+  $entry->{info_data}->{end_to_end_id} = $object->end_to_end_id;
+}
+
 sub check_auth {
   $::auth->assert('config') if ! $::auth->assert('bank_transaction',1);
 }
diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 1aaec79c9..3df233267 100644
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -64,6 +64,10 @@ sub run {
   $self->controller->info_headers({ used => { }, headers => [ ] });
 
   my $objects  = $self->csv->get_objects;
+  if ($self->csv->errors) {
+    $self->controller->errors([ $self->csv->errors ]) ;
+    return;
+  }
 
   $self->controller->track_progress(progress => 70);
 
@@ -530,6 +534,33 @@ sub save_objects {
   return unless $data->[0];
   return unless $data->[0]{object};
 
+  # If we store into tables which get numbers from the TransNumberGenerator
+  # we have to lock all tables referenced by the storage table (or by
+  # tables stored alongside with the storage table) that are handled by
+  # the TransNumberGenerator, too.
+  # Otherwise we can run into a deadlock if someone saves a document via
+  # the user interface. The exact behavoir depends on timing.
+  # E.g. we are importing orders and a user want to
+  # book an invoice:
+  # web: locks ar (via before-save hook and TNG (or SL::TransNumber))
+  # importer: locks oe (via before-save hook and TNG) (*)
+  # importer: locks defaults (via before-save hook and TNG)
+  # web: wants to lock defaults (via before-save hook and TNG (or SL::TransNumber)) -> is waiting
+  # importer: wants to save oe and wants to lock referenced tables (here ar) -> is waiting
+  # --> deadlock
+  #
+  # (*) if the importer locks ar here, too, everything is fine, because it will wait here
+  # before locking the defaults table.
+  #
+  # List of referenced tables:
+  # (Locking is done in the transaction below)
+  my %referenced_tables_by_type = (
+    orders          => [qw(ar customer vendor)],
+    delivery_orders => [qw(customer vendor)   ],
+    ar_transactions => [qw(customer)          ],
+    ap_transactions => [qw(vendor)            ],
+  );
+
   $self->controller->track_progress(phase => 'saving data', progress => 0); # scale from 45..95%;
 
   my $last_index = $#$data;
@@ -538,6 +569,11 @@ sub save_objects {
   for my $chunk (0 .. $last_index / $chunk_size) {
     $self->controller->track_progress(progress => ($chunk_size * $chunk)/scalar(@$data) * 100); # scale from 45..95%;
     SL::DB->client->with_transaction(sub {
+
+      foreach my $refs (@{ $referenced_tables_by_type{$self->controller->{type}} || [] }) {
+        SL::DB->client->dbh->do("LOCK " . $refs) || die SL::DB->client->dbh->errstr;
+      }
+
       foreach my $entry_index ($chunk_size * $chunk .. min( $last_index, $chunk_size * ($chunk + 1) - 1 )) {
         my $entry = $data->[$entry_index];
 
diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm
index 9ddb86bea..94cfa8431 100644
--- a/SL/Controller/CsvImport/BaseMulti.pm
+++ b/SL/Controller/CsvImport/BaseMulti.pm
@@ -33,8 +33,8 @@ sub run {
 
   $self->controller->track_progress(progress => 10);
 
-  my $old_numberformat      = $::myconfig{numberformat};
-  $::myconfig{numberformat} = $self->controller->profile->get('numberformat');
+  local $::myconfig{numberformat} = $self->controller->profile->get('numberformat');
+  local $::myconfig{dateformat}   = $self->controller->profile->get('dateformat');
 
   $self->csv->parse;
 
@@ -71,6 +71,10 @@ sub run {
   $self->controller->info_headers($info_headers);
 
   my $objects  = $self->csv->get_objects;
+  if ($self->csv->errors) {
+    $self->controller->errors([ $self->csv->errors ]) ;
+    return;
+  }
 
   $self->controller->track_progress(progress => 70);
 
@@ -90,8 +94,6 @@ sub run {
   $self->fix_field_lengths;
 
   $self->controller->track_progress(progress => 100);
-
-  $::myconfig{numberformat} = $old_numberformat;
 }
 
 sub init_manager_class {
diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index 2f8b15c06..946b392a0 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -82,6 +82,7 @@ sub check_objects {
     $self->check_taxzone($entry,  take_default => 1);
     $self->check_currency($entry, take_default => 1);
     $self->check_salesman($entry);
+    $self->check_pricegroup($entry) if 'customer' eq $self->table;
 
     next if @{ $entry->{errors} };
 
@@ -116,7 +117,7 @@ sub check_objects {
     $i++;
   }
 
-  $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment delivery_term taxzone));
+  $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment delivery_term taxzone pricegroup));
   $self->add_cvar_raw_data_columns;
 }
 
@@ -294,6 +295,7 @@ sub setup_displayable_columns {
                                  { name => 'homepage',          description => $::locale->text('Homepage')                        },
                                  { name => 'iban',              description => $::locale->text('IBAN')                            },
                                  { name => 'pricegroup_id',     description => $::locale->text('Price group (database ID)')       },
+                                 { name => 'pricegroup',        description => $::locale->text('Price group (name)')              },
                                  { name => 'language_id',       description => $::locale->text('Language (database ID)')          },
                                  { name => 'language',          description => $::locale->text('Language (name)')                 },
                                  { name => 'name',              description => $::locale->text('Name')                            },
diff --git a/SL/Controller/CsvImport/DeliveryOrder.pm b/SL/Controller/CsvImport/DeliveryOrder.pm
index 2e5a9e9ab..209324997 100644
--- a/SL/Controller/CsvImport/DeliveryOrder.pm
+++ b/SL/Controller/CsvImport/DeliveryOrder.pm
@@ -16,7 +16,6 @@ use SL::DB::Part;
 use SL::DB::PaymentTerm;
 use SL::DB::Contact;
 use SL::DB::PriceFactor;
-use SL::DB::Pricegroup;
 use SL::DB::Shipto;
 use SL::DB::Unit;
 use SL::DB::Inventory;
@@ -34,7 +33,7 @@ use Rose::Object::MakeMethods::Generic
 (
  'scalar --get_set_init' => [ qw(settings languages_by all_parts parts_by part_counts_by
                                  contacts_by ct_shiptos_by
-                                 price_factors_by pricegroups_by units_by
+                                 price_factors_by units_by
                                  warehouses_by bins_by transfer_types_by) ],
 );
 
@@ -219,7 +218,7 @@ sub setup_displayable_columns {
                                  { name => 'language',                description => $::locale->text('Language (name)')                       },
                                  { name => 'language_id',             description => $::locale->text('Language (database ID)')                },
                                  { name => 'notes',                   description => $::locale->text('Notes')                                 },
-                                 { name => 'order_type',              description => $::locale->text('Delivery Order Type')                   },
+                                 { name => 'record_type',             description => $::locale->text('Delivery Order Type')                   },
                                  { name => 'ordnumber',               description => $::locale->text('Order Number')                          },
                                  { name => 'payment',                 description => $::locale->text('Payment terms (name)')                  },
                                  { name => 'payment_id',              description => $::locale->text('Payment terms (database ID)')           },
@@ -347,13 +346,6 @@ sub init_price_factors_by {
   return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_price_factors } } ) } qw(id description) };
 }
 
-sub init_pricegroups_by {
-  my ($self) = @_;
-
-  my $all_pricegroups = SL::DB::Manager::Pricegroup->get_all;
-  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_pricegroups } } ) } qw(id pricegroup) };
-}
-
 sub init_units_by {
   my ($self) = @_;
 
@@ -672,7 +664,7 @@ sub handle_stock {
       parts_id      => $item_obj->parts_id,
       warehouse_id  => $object->warehouse_id,
       bin_id        => $object->bin_id,
-      trans_type_id => $trans_type_id,
+      PURCHASE_DELIVERY_ORDER_TYPE() => $trans_type_id,
       qty           => $qty,
       chargenumber  => $object->chargenumber,
       employee_id   => $order_obj->employee_id,
@@ -689,11 +681,11 @@ sub handle_stock {
 sub handle_type {
   my ($self, $entry) = @_;
 
-  if (!exists $entry->{raw_data}->{order_type}) {
+  if (!exists $entry->{raw_data}->{record_type}) {
     # if no type is present - set to sales delivery order or purchase delivery
     # order depending on is_sales or customer/vendor
 
-    $entry->{object}->order_type(
+    $entry->{object}->record_type(
       $entry->{object}->customer_id  ? SALES_DELIVERY_ORDER_TYPE :
       $entry->{object}->vendor_id    ? PURCHASE_DELIVERY_ORDER_TYPE :
       $entry->{raw_data}->{is_sales} ? SALES_DELIVERY_ORDER_TYPE :
@@ -1047,31 +1039,6 @@ sub check_price_factor {
   return 1;
 }
 
-sub check_pricegroup {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-
-  # Check whether or not pricegroup ID is valid.
-  if ($object->pricegroup_id && !$self->pricegroups_by->{id}->{ $object->pricegroup_id }) {
-    push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
-    return 0;
-  }
-
-  # Map pricegroup to ID if given.
-  if (!$object->pricegroup_id && $entry->{raw_data}->{pricegroup}) {
-    my $pricegroup = $self->pricegroups_by->{pricegroup}->{ $entry->{raw_data}->{pricegroup} };
-    if (!$pricegroup) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
-      return 0;
-    }
-
-    $object->pricegroup_id($pricegroup->id);
-  }
-
-  return 1;
-}
-
 sub check_warehouse {
   my ($self, $entry) = @_;
 
diff --git a/SL/Controller/CsvImport/Helper/Consistency.pm b/SL/Controller/CsvImport/Helper/Consistency.pm
index 5538a738c..33eb42983 100644
--- a/SL/Controller/CsvImport/Helper/Consistency.pm
+++ b/SL/Controller/CsvImport/Helper/Consistency.pm
@@ -6,13 +6,14 @@ use Data::Dumper;
 use SL::DB::Default;
 use SL::DB::Currency;
 use SL::DB::TaxZone;
+use SL::DB::Pricegroup;
 use SL::DB::Project;
 use SL::DB::Department;
 
 use SL::Helper::Csv::Error;
 
 use parent qw(Exporter);
-our @EXPORT = qw(check_currency check_taxzone check_project check_department check_customer_vendor handle_salesman handle_employee);
+our @EXPORT = qw(check_currency check_taxzone check_pricegroup check_project check_department check_customer_vendor handle_salesman handle_employee);
 
 #
 # public functions
@@ -113,6 +114,31 @@ sub check_taxzone {
   return 1;
 }
 
+sub check_pricegroup {
+  my ($self, $entry) = @_;
+
+  my $object = $entry->{object};
+
+  # Check whether or not pricegroup ID is valid.
+  if ($object->pricegroup_id && !_pricegroups_by($self)->{id}->{ $object->pricegroup_id }) {
+    push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
+    return 0;
+  }
+
+  # Map pricegroup to ID if given.
+  if (!$object->pricegroup_id && $entry->{raw_data}->{pricegroup}) {
+    my $pricegroup = _pricegroups_by($self)->{pricegroup}->{ $entry->{raw_data}->{pricegroup} };
+    if (!$pricegroup) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
+      return 0;
+    }
+
+    $object->pricegroup_id($pricegroup->id);
+  }
+
+  return 1;
+}
+
 sub check_project {
   my ($self, $entry, %params) = @_;
 
@@ -266,6 +292,13 @@ sub _departments_by {
   return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_departments } } ) } qw(id description) };
 }
 
+sub _pricegroups_by {
+  my ($self) = @_;
+
+  my $all_pricegroups = SL::DB::Manager::Pricegroup->get_all;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_pricegroups } } ) } qw(id pricegroup) };
+}
+
 sub _projects_by {
   my ($self) = @_;
 
diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 503b4d185..b8adc456e 100644
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -14,7 +14,6 @@ use SL::DB::PaymentTerm;
 use SL::DB::Contact;
 use SL::DB::Department;
 use SL::DB::PriceFactor;
-use SL::DB::Pricegroup;
 use SL::DB::Project;
 use SL::DB::Shipto;
 use SL::DB::TaxZone;
@@ -26,7 +25,7 @@ use parent qw(SL::Controller::CsvImport::BaseMulti);
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(settings languages_by all_parts parts_by part_counts_by contacts_by ct_shiptos_by price_factors_by pricegroups_by units_by) ],
+ 'scalar --get_set_init' => [ qw(settings languages_by all_parts parts_by part_counts_by contacts_by ct_shiptos_by price_factors_by units_by) ],
 );
 
 
@@ -250,13 +249,6 @@ sub init_price_factors_by {
   return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_price_factors } } ) } qw(id description) };
 }
 
-sub init_pricegroups_by {
-  my ($self) = @_;
-
-  my $all_pricegroups = SL::DB::Manager::Pricegroup->get_all;
-  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_pricegroups } } ) } qw(id pricegroup) };
-}
-
 sub init_units_by {
   my ($self) = @_;
 
@@ -648,31 +640,6 @@ sub check_price_factor {
   return 1;
 }
 
-sub check_pricegroup {
-  my ($self, $entry) = @_;
-
-  my $object = $entry->{object};
-
-  # Check whether or not pricegroup ID is valid.
-  if ($object->pricegroup_id && !$self->pricegroups_by->{id}->{ $object->pricegroup_id }) {
-    push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
-    return 0;
-  }
-
-  # Map pricegroup to ID if given.
-  if (!$object->pricegroup_id && $entry->{raw_data}->{pricegroup}) {
-    my $pricegroup = $self->pricegroups_by->{pricegroup}->{ $entry->{raw_data}->{pricegroup} };
-    if (!$pricegroup) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid price group');
-      return 0;
-    }
-
-    $object->pricegroup_id($pricegroup->id);
-  }
-
-  return 1;
-}
-
 sub add_items_to_order {
   my ($self) = @_;
 
diff --git a/SL/Controller/CustomDataExport.pm b/SL/Controller/CustomDataExport.pm
index 7d5eddee9..f42c8b892 100644
--- a/SL/Controller/CustomDataExport.pm
+++ b/SL/Controller/CustomDataExport.pm
@@ -12,6 +12,7 @@ use POSIX qw(strftime);
 use Text::CSV_XS;
 
 use SL::DB::CustomDataExportQuery;
+use SL::Controller::Helper::ReportGenerator;
 use SL::Locale::String qw(t8);
 
 use Rose::Object::MakeMethods::Generic
@@ -30,27 +31,71 @@ __PACKAGE__->run_before('setup_javascripts');
 sub action_list {
   my ($self) = @_;
 
-  $self->render('custom_data_export/list', title => $::locale->text('Execute a custom data export query'));
+  $self->render('custom_data_export/list', title => $::locale->text('Execute a custom report query'));
 }
 
 sub action_export {
   my ($self) = @_;
 
-  if (!$::form->{format}) {
+  if (!$::form->{parameters_set}) {
     $self->setup_export_action_bar;
-    return $self->render('custom_data_export/export', title => t8("Execute custom data export '#1'", $self->query->name));
+    return $self->render('custom_data_export/export', title => t8("Execute custom report '#1'", $self->query->name));
   }
 
   $self->execute_query;
 
   if (scalar(@{ $self->rows // [] }) == 1) {
     $self->setup_empty_result_set_action_bar;
-    return $self->render('custom_data_export/empty_result_set', title => t8("Execute custom data export '#1'", $self->query->name));
+    return $self->render('custom_data_export/empty_result_set', title => t8("Execute custom report '#1'", $self->query->name));
   }
 
+  my $report = SL::ReportGenerator->new(\%::myconfig, $::form);
 
-  my $method = "export_as_" . $::form->{format};
-  $self->$method;
+  my $report_name =  $self->query->name;
+  $report_name    =~ s{[^[:word:]]+}{_}ig;
+  $report_name   .=  strftime('_%Y-%m-%d_%H-%M-%S', localtime());
+
+  $report->set_options(
+    std_column_visibility => 1,
+    controller_class      => 'CustomDataExport',
+    output_format         => 'HTML',
+    top_info_text         => $self->query->name,
+    title                 => $self->query->name,
+    allow_pdf_export      => 1,
+    allow_csv_export      => 1,
+    allow_chart_export    => 1,
+    attachment_basename   => $report_name,
+  );
+
+  my %column_defs;
+  foreach my $key (@{ $self->rows->[0] }) {
+    $column_defs{$key} = { text => $key, sub => sub { $_[0]->{$key} } };
+  }
+
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@{ $self->rows->[0] });
+
+  $report->set_export_options(qw(export id parameters_set parameters));
+  $report->set_options_from_form;
+
+  # Setup data objects (which in this case is an array of hashes).
+  my @objects;
+  foreach my $set_idx (1..$#{ $self->rows }) {
+    my %row_set;
+    foreach my $key_idx (0..$#{ $self->rows->[0] }) {
+      my $key   = $self->rows->[0]->[$key_idx];
+      my $value = $self->rows->[$set_idx]->[$key_idx];
+      $row_set{$key} = $value;
+    }
+    push @objects, \%row_set;
+  }
+
+  $self->report_generator_list_objects(report  => $report,
+                                       objects => \@objects,
+                                       options => {
+                                         action_bar_additional_submit_values => { id => $::form->{id}, },
+                                       },
+  );
 }
 
 #
@@ -59,6 +104,7 @@ sub action_export {
 
 sub check_auth {
   my ($self) = @_;
+  $::auth->assert('custom_data_report');
   $::auth->assert($self->query->access_right) if $self->query->access_right;
 }
 
@@ -94,7 +140,7 @@ sub setup_export_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Export'),
+        t8('Execute'),
         submit    => [ '#form', { action => 'CustomDataExport/export' } ],
         checks    => [ 'kivi.validate_form' ],
         accesskey => 'enter',
@@ -170,32 +216,4 @@ sub execute_query {
   ]);
 }
 
-sub export_as_csv {
-  my ($self) = @_;
-
-  my $csv = Text::CSV_XS->new({
-    binary   => 1,
-    sep_char => ';',
-    eol      => "\n",
-  });
-
-  my ($file_handle, $file_name) = File::Temp::tempfile;
-
-  binmode $file_handle, ":encoding(utf8)";
-
-  $csv->print($file_handle, $_) for @{ $self->rows };
-
-  $file_handle->close;
-
-  my $report_name =  $self->query->name;
-  $report_name    =~ s{[^[:word:]]+}{_}ig;
-  $report_name   .=  strftime('_%Y-%m-%d_%H-%M-%S.csv', localtime());
-
-  $self->send_file(
-    $file_name,
-    content_type => 'text/csv',
-    name         => $report_name,
-  );
-}
-
 1;
diff --git a/SL/Controller/CustomDataExportDesigner.pm b/SL/Controller/CustomDataExportDesigner.pm
index 17266323b..53045485a 100644
--- a/SL/Controller/CustomDataExportDesigner.pm
+++ b/SL/Controller/CustomDataExportDesigner.pm
@@ -27,13 +27,13 @@ sub action_list {
   my ($self) = @_;
 
   $self->setup_list_action_bar;
-  $self->render('custom_data_export_designer/list', title => $::locale->text('Design custom data export queries'));
+  $self->render('custom_data_export_designer/list', title => $::locale->text('Design custom report queries'));
 }
 
 sub action_edit {
   my ($self) = @_;
 
-  my $title = $self->query->id ? t8('Edit custom data export query') : t8('Add custom data export query');
+  my $title = $self->query->id ? t8('Edit custom report query') : t8('Add custom report query');
 
   $self->setup_edit_action_bar;
   $self->render('custom_data_export_designer/edit', title => $title);
@@ -42,7 +42,7 @@ sub action_edit {
 sub action_edit_parameters {
   my ($self) = @_;
 
-  my $title     = $self->query->id ? t8('Edit custom data export query') : t8('Add custom data export query');
+  my $title     = $self->query->id ? t8('Edit custom report query') : t8('Add custom report query');
   my @parameters = $self->gather_query_data;
 
   $self->setup_edit_parameters_action_bar;
@@ -58,7 +58,7 @@ sub action_save {
 
   $self->query->save;
 
-  flash_later('info', t8('The custom data export has been saved.'));
+  flash_later('info', t8('The custom report has been saved.'));
 
   $self->redirect_to($self->url_for(action => 'list'));
 }
@@ -68,7 +68,7 @@ sub action_delete {
 
   $self->query->delete;
 
-  flash_later('info', t8('The custom data export has been deleted.'));
+  flash_later('info', t8('The custom report has been deleted.'));
 
   $self->redirect_to($self->url_for(action => 'list'));
 }
diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm
index 193523a85..fb68c03aa 100644
--- a/SL/Controller/CustomVariableConfig.pm
+++ b/SL/Controller/CustomVariableConfig.pm
@@ -11,6 +11,7 @@ use SL::DB::CustomVariableValidity;
 use SL::DB::PartsGroup;
 use SL::Helper::Flash;
 use SL::Locale::String;
+use SL::Presenter::CustomVariableConfig;
 use Data::Dumper;
 
 use Rose::Object::MakeMethods::Generic (
@@ -38,6 +39,8 @@ our %translations = (
 
 our @types = qw(text textfield htmlfield number date bool select customer vendor part); # timestamp
 
+our @modules = qw(CT Contacts IC Projects RequirementSpecs ShipTo);
+
 #
 # actions
 #
@@ -48,6 +51,7 @@ sub action_list {
   my $configs = SL::DB::Manager::CustomVariableConfig->get_all_sorted(where => [ module => $self->module ]);
 
   $self->setup_list_action_bar;
+  $::form->{title} = t8('List of custom variables');
   $::form->header;
   $self->render('custom_variable_config/list',
                 title   => t8('List of custom variables'),
@@ -161,13 +165,10 @@ sub init_translated_types {
 sub init_modules {
   my ($self, %params) = @_;
 
-  return [ sort { $a->{description}->translated cmp $b->{description}->translated } (
-    { module => 'CT',               description => t8('Customers and vendors')          },
-    { module => 'Contacts',         description => t8('Contact persons')                },
-    { module => 'IC',               description => t8('Parts, services and assemblies') },
-    { module => 'Projects',         description => t8('Projects')                       },
-    { module => 'RequirementSpecs', description => t8('Requirement Specs')              },
-    { module => 'ShipTo',           description => t8('Shipping Address')               },
+  return [
+    sort { $a->{description}->translated cmp $b->{description}->translated } (
+    map +{ module => $_, description => $SL::Presenter::CustomVariableConfig::t8{$_} },
+    @modules
   )];
 }
 
diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index f9e251578..f1ec711e5 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -17,6 +17,7 @@ use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use SL::Controller::Helper::ParseFilter;
 
+use SL::DB::AuthGroup;
 use SL::DB::Customer;
 use SL::DB::Vendor;
 use SL::DB::Business;
@@ -265,10 +266,16 @@ sub _save {
       if ( !$self->{note_followup}->follow_up_date ) {
         $::form->error($::locale->text('Date missing!'));
       }
+      if (!$self->{note_followup}->{created_for_employees}) {
+        $::form->error($::locale->text('You must chose a user.'));
+      }
 
       $self->{note}->trans_id($self->{cv}->id);
       $self->{note}->save();
 
+      if (delete $self->{note_followup}->{not_done}) {
+        $self->{note_followup}->done->delete if $self->{note_followup}->done;
+      }
       $self->{note_followup}->save();
 
       $self->{note_followup_link}->follow_up_id($self->{note_followup}->id);
@@ -372,7 +379,7 @@ sub _transaction {
   my $db = $self->is_vendor() ? 'vendor' : 'customer';
   my $action = 'add';
 
-  if ($::instance_conf->get_feature_experimental_order && 'oe.pl' eq $script) {
+  if ('oe.pl' eq $script) {
     $script = 'controller.pl';
     $action = 'Order/' . $action;
   }
@@ -844,6 +851,46 @@ sub action_ajax_list_prices {
   $self->report_generator_list_objects(report => $report, objects => $prices, layout => 0, header => 0);
 }
 
+# open the dialog for customer/vendor details
+# called from SL::Presenter::customer_vendor
+sub action_show_customer_vendor_details_dialog {
+  my ($self) = @_;
+
+  my $is_customer = 'customer' eq $::form->{cv};
+  my $cv;
+  if ($is_customer) {
+    $cv = SL::DB::Customer->new(id => $::form->{cv_id})->load;
+  } else {
+    $cv = SL::DB::Vendor->new(id => $::form->{cv_id})->load;
+  }
+
+  my %details = map { $_ => $cv->$_ } @{$cv->meta->columns};
+  $details{discount_as_percent} = $cv->discount_as_percent;
+  $details{creditlimt}          = $cv->creditlimit_as_number;
+  $details{business}            = $cv->business->description      if $cv->business;
+  $details{language}            = $cv->language_obj->description  if $cv->language_obj;
+  $details{delivery_terms}      = $cv->delivery_term->description if $cv->delivery_term;
+  $details{payment_terms}       = $cv->payment->description       if $cv->payment;
+  $details{pricegroup}          = $cv->pricegroup->pricegroup     if $is_customer && $cv->pricegroup;
+
+  if ($is_customer) {
+    foreach my $entry (@{ $cv->additional_billing_addresses }) {
+      push @{ $details{ADDITIONAL_BILLING_ADDRESSES} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
+    }
+  }
+  foreach my $entry (@{ $cv->shipto }) {
+    push @{ $details{SHIPTO} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
+  }
+  foreach my $entry (@{ $cv->contacts }) {
+    push @{ $details{CONTACTS} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} };
+  }
+
+  $_[0]->render('common/show_vc_details', { layout => 0 },
+                is_customer => $is_customer,
+                %details);
+
+}
+
 sub is_vendor {
   return $::form->{db} eq 'vendor';
 }
@@ -860,7 +907,7 @@ sub is_orphaned {
   }
 
   my $arap      = $self->is_vendor ? 'ap' : 'ar';
-  my $num_args  = 3;
+  my $num_args  = 4;
 
   my $cv = $self->is_vendor ? 'vendor' : 'customer';
 
@@ -882,7 +929,13 @@ sub is_orphaned {
     SELECT a.id
     FROM delivery_orders a
     JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id)
-    WHERE ct.id = ?';
+    WHERE ct.id = ?
+
+    UNION
+
+    SELECT id
+    FROM price_rule_items
+    WHERE type LIKE \''. $cv .'\' AND value_int = ?';
 
 
   if ( $self->is_vendor ) {
@@ -934,6 +987,7 @@ sub _instantiate_args {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
     $self->{note_followup} = $self->{note}->follow_up;
     $self->{note_followup_link} = $self->{note_followup}->follow_up_link;
+
   } else {
     $self->{note} = SL::DB::Note->new();
     $self->{note_followup} = SL::DB::FollowUp->new();
@@ -948,6 +1002,13 @@ sub _instantiate_args {
   $self->{note_followup}->note($self->{note});
   $self->{note_followup}->created_by($curr_employee->id);
 
+  if (delete $::form->{note_followup_done}) {
+    $self->{note_followup}->done(SL::DB::FollowUpDone->new) if !$self->{note_followup}->done;
+    $self->{note_followup}->done->employee_id(SL::DB::Manager::Employee->current->id);
+  } else {
+    $self->{note_followup}->{not_done} = 1;
+  }
+
   $self->{note_followup_link}->trans_type($self->is_vendor() ? 'vendor' : 'customer');
   $self->{note_followup_link}->trans_info($self->{cv}->name);
 
@@ -1081,7 +1142,8 @@ sub _pre_render {
 
   $self->{all_business} = SL::DB::Manager::Business->get_all();
 
-  $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
+  $self->{all_employees}   = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+  $self->{all_auth_groups} = SL::DB::Manager::AuthGroup->get_all_sorted;
 
   $self->{all_greetings} = SL::DB::Manager::Greeting->get_all_sorted();
   if ($self->{cv}->id && $self->{cv}->greeting && !grep {$self->{cv}->greeting eq $_->description} @{$self->{all_greetings}}) {
@@ -1205,7 +1267,7 @@ sub _pre_render {
 
   $self->{template_args} ||= {};
 
-  $::request->{layout}->add_javascripts("$_.js") for qw (kivi.CustomerVendor kivi.File kivi.CustomerVendorTurnover ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->{layout}->add_javascripts("$_.js") for qw (kivi.CustomerVendor kivi.File chart kivi.CustomerVendorTurnover follow_up);
 
   $self->_setup_form_action_bar;
 }
diff --git a/SL/Controller/CustomerVendorTurnover.pm b/SL/Controller/CustomerVendorTurnover.pm
index 5a59f1fbd..c7cc25aa6 100644
--- a/SL/Controller/CustomerVendorTurnover.pm
+++ b/SL/Controller/CustomerVendorTurnover.pm
@@ -1,14 +1,18 @@
 package SL::Controller::CustomerVendorTurnover;
 use strict;
 use parent qw(SL::Controller::Base);
+
+use List::Util qw(first);
+
 use SL::DBUtils;
 use SL::DB::AccTransaction;
 use SL::DB::Invoice;
 use SL::DB::Order;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::EmailJournal;
 use SL::DB::Letter;
 use SL::DB;
-
+use SL::JSON qw(to_json);
 __PACKAGE__->run_before('check_auth');
 
 sub action_list_turnover {
@@ -47,7 +51,7 @@ sub action_list_turnover {
     $open_items = $self->_list_open_items($open_invoices);
   }
   my $open_orders = $self->_get_open_orders;
-  return $self->render('customer_vendor_turnover/turnover', { header => 0 },
+  return $self->render('customer_vendor_turnover/turnover', { layout => 0 },
                        open_orders => $open_orders,
                        open_items  => $open_items,
                        id          => $cv,
@@ -112,12 +116,20 @@ SQL
    $self->render('customer_vendor_turnover/count_open_items_by_year', { layout => 0 });
 }
 
-sub action_turnover_by_month {
+sub action_turnover {
 
   my ($self) = @_;
 
   return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
+  my $sort_dir   = 'DESC';
+  my $fill_holes = 0;
+
+  if ($::request->type eq 'json') {
+    $sort_dir   = 'ASC';
+    $fill_holes = 1;
+  }
+
   my $dbh = SL::DB->client->dbh;
   my $cv = $::form->{id};
   my ($db, $cv_type);
@@ -128,47 +140,114 @@ sub action_turnover_by_month {
     $db      = "ap";
     $cv_type = "vendor_id";
   }
-  my $query = <<SQL;
-  SELECT CONCAT(EXTRACT (MONTH FROM transdate),'/',EXTRACT (YEAR FROM transdate)) as date_part,
-         count(id)                                                                as count,
-         sum(amount)                                                              as amount,
-         sum(netamount)                                                           as netamount,
-         sum(paid)                                                                as paid
-    FROM $db WHERE $cv_type = ?
-GROUP BY EXTRACT (YEAR FROM transdate), EXTRACT (MONTH FROM transdate)
-ORDER BY EXTRACT (YEAR FROM transdate) DESC, EXTRACT (MONTH FROM transdate) DESC
-SQL
-   $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv);
-   $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
-}
 
-sub action_turnover_by_year {
-  my ($self) = @_;
+  my $year_where = ('month' eq $::form->{mode} && $::form->{year})
+                 ? 'AND EXTRACT (YEAR FROM transdate) = ?'
+                 : '';
 
-  return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{id};
 
-  my $dbh = SL::DB->client->dbh;
-  my $cv = $::form->{id};
-  my ($db, $cv_type);
-  if ($::form->{db} eq 'customer') {
-    $db      = "ar";
-    $cv_type = "customer_id";
+  my ($date_part_select, $group_by, $order_by);
+  if ('month' eq $::form->{mode}) {
+    $date_part_select = "CONCAT(EXTRACT (MONTH FROM transdate),'/',EXTRACT (YEAR FROM transdate))";
+    $group_by         = "EXTRACT (YEAR FROM transdate), EXTRACT (MONTH FROM transdate)";
+    $order_by         = "EXTRACT (YEAR FROM transdate) $sort_dir, EXTRACT (MONTH FROM transdate) $sort_dir";
   } else {
-    $db      = "ap";
-    $cv_type = "vendor_id";
+    $date_part_select = "EXTRACT (YEAR FROM transdate)";
+    $group_by         = "EXTRACT (YEAR FROM transdate)";
+    $order_by         = "EXTRACT (YEAR FROM transdate) $sort_dir";
   }
+
   my $query = <<SQL;
-  SELECT EXTRACT (YEAR FROM transdate) as date_part,
-         count(id)                     as count,
-         sum(amount)                   as amount,
-         sum(netamount)                as netamount,
-         sum(paid)                     as paid
-    FROM $db WHERE $cv_type = ?
-GROUP BY date_part
-ORDER BY date_part DESC
+  SELECT $date_part_select as date_part,
+         count(id)         as count,
+         sum(amount)       as amount,
+         sum(netamount)    as netamount,
+         sum(paid)         as paid
+  FROM $db WHERE $cv_type = ? $year_where
+  GROUP BY $group_by
+  ORDER BY $order_by
 SQL
-   $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv);
-   $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
+  $self->{turnover_statistic} = selectall_hashref_query($::form, $dbh, $query, $cv, ($::form->{year} || '') x !!('month' eq $::form->{mode} && $::form->{year}));
+
+  if ('month' eq $::form->{mode} && $fill_holes && ($::form->{year} || @{$self->{turnover_statistic}} > 1)) {
+    my $date_part_to_months = sub { my ($m, $y) = $_[0] =~ m{^(\d{1,2})/(\d{1,4})$}; return $m + 12*$y; };
+    my $months_to_date_part = sub { my $y = int(($_[0] - 1)/12); my $m = $_[0] - 12*$y; $m ||= 12; return "$m/$y"; };
+
+    my $start_month;
+    my $end_month;
+    if (!$::form->{year}) {
+      $start_month = $date_part_to_months->($self->{turnover_statistic}[ 0]->{date_part});
+      $end_month   = $date_part_to_months->($self->{turnover_statistic}[-1]->{date_part});
+
+    } else {
+      if ($sort_dir eq 'ASC') {
+        $start_month = $date_part_to_months->('1/'  . $::form->{year});
+        $end_month   = $date_part_to_months->('12/' . $::form->{year});
+      } else {
+        $start_month = $date_part_to_months->('12/' . $::form->{year});
+        $end_month   = $date_part_to_months->('1/'  . $::form->{year});
+      }
+    }
+
+    my $step      = ($start_month > $end_month) ? -1 : 1;
+    my @range     = ($step == 1) ? ($start_month .. $end_month) : reverse ($end_month .. $start_month);
+    my @new_stats = ();
+
+    my %stats_by_month = map { $date_part_to_months->($_->{date_part}) => $_ } grep { $_ } @{$self->{turnover_statistic} || []};
+    foreach my $month (@range) {
+      if ($stats_by_month{$month}) {
+        push @new_stats, $stats_by_month{$month};
+      } else {
+        push @new_stats, {date_part => $months_to_date_part->($month)};
+      }
+    }
+
+    $self->{turnover_statistic} = \@new_stats;
+  }
+
+  if ('month' ne $::form->{mode} && $fill_holes && @{$self->{turnover_statistic}} > 1) {
+    my $start          = $self->{turnover_statistic}[ 0]->{date_part};
+    my $end            = $self->{turnover_statistic}[-1]->{date_part};
+    my $step           = ($start > $end) ? -1 : 1;
+    my $next_date_part = $start;
+    my @new_stats      = ();
+
+    foreach my $stat (@{$self->{turnover_statistic}}) {
+      while ($stat->{date_part} != $next_date_part) {
+        push @new_stats, {date_part => $next_date_part};
+        $next_date_part += $step;
+      }
+      push @new_stats, $stat;
+      $next_date_part += $step;
+    }
+
+    $self->{turnover_statistic} = \@new_stats;
+  }
+
+  if (@{$self->{turnover_statistic}} > 1) {
+    my $query = <<SQL;
+      SELECT $date_part_select as date_part,
+         count(id)             as count,
+         sum(amount)           as amount,
+         sum(netamount)        as netamount,
+         sum(paid)             as paid
+      FROM $db WHERE $cv_type IS NOT NULL
+      GROUP BY $group_by
+      ORDER BY $order_by
+SQL
+    my $overall_turnover = selectall_hashref_query($::form, $dbh, $query);
+    foreach my $stat (@{$self->{turnover_statistic}}) {
+      my $overall_stat = first { $_->{date_part} eq $stat->{date_part} } @$overall_turnover;
+      $stat->{overall_netamount} = 0;
+      $stat->{'overall_' . $_} = $overall_stat->{$_} for keys %$overall_stat;
+    }
+  }
+
+  if ($::request->type eq 'json') {
+    $self->render(\ SL::JSON::to_json($self->{turnover_statistic}), { layout => 0, type => 'json', process => 0 });
+  } else {
+    $self->render('customer_vendor_turnover/count_turnover', { layout => 0 });
+  }
 }
 
 sub action_get_invoices {
@@ -204,7 +283,7 @@ sub action_get_orders {
     $orders = SL::DB::Manager::Order->get_all(
       query   => [
                    customer_id => $cv,
-                   quotation   => ($type eq 'quotation' ? 'T' : 'F')
+                   record_type => ($type eq 'quotation' ? SALES_QUOTATION_TYPE() : SALES_ORDER_TYPE())
                  ],
       sort_by => 'transdate DESC',
     );
@@ -212,7 +291,7 @@ sub action_get_orders {
     $orders = SL::DB::Manager::Order->get_all(
       query   => [
                    vendor_id => $cv,
-                   quotation => ($type eq 'quotation' ? 'T' : 'F')
+                   record_type => ($type eq 'quotation' ? REQUEST_QUOTATION_TYPE() : PURCHASE_ORDER_TYPE())
                  ],
       sort_by => 'transdate DESC',
     );
@@ -268,7 +347,7 @@ sub action_get_mails {
     $query = <<SQL;
 WITH
 oe_emails_customer
-       AS (SELECT rc.to_id, rc.from_id, oe.quotation, oe.quonumber, oe.ordnumber, c.id
+       AS (SELECT rc.to_id, rc.from_id, oe.record_type, oe.quonumber, oe.ordnumber, c.id
      FROM record_links rc
 LEFT JOIN oe oe      ON rc.from_id = oe.id
 LEFT JOIN customer c ON oe.customer_id = c.id
@@ -301,12 +380,12 @@ LEFT JOIN customer c ON l.customer_id = c.id
 
 SELECT ej.*,
  CASE
-  oec.quotation WHEN 'F' THEN 'Sales Order'
-                ELSE 'Quotation'
+  oec.record_type WHEN 'sales_order' THEN 'Sales Order'
+                  ELSE 'Quotation'
  END AS type,
  CASE
-  oec.quotation WHEN 'F' THEN oec.ordnumber
-                ELSE oec.quonumber
+  oec.record_type WHEN 'sales_order' THEN oec.ordnumber
+                  ELSE oec.quonumber
  END    AS recordnumber,
  oec.id AS record_id
      FROM email_journal ej
@@ -347,7 +426,7 @@ SQL
     $query = <<SQL;
 WITH
 oe_emails_vendor
-       AS (SELECT rc.to_id, rc.from_id, oe.quotation, oe.quonumber, oe.ordnumber, c.id
+       AS (SELECT rc.to_id, rc.from_id, oe.record_type, oe.quonumber, oe.ordnumber, c.id
      FROM record_links rc
 LEFT JOIN oe oe ON rc.from_id = oe.id
 LEFT JOIN vendor c ON oe.vendor_id = c.id
@@ -380,12 +459,12 @@ LEFT JOIN vendor c ON l.vendor_id = c.id
 
 SELECT ej.*,
  CASE
-  oec.quotation WHEN 'F' THEN 'Purchase Order'
-                ELSE 'Request quotation'
+  oec.record_type WHEN 'purchase_order' THEN 'Purchase Order'
+                  ELSE 'Request quotation'
  END AS type,
  CASE
-  oec.quotation WHEN 'F' THEN oec.ordnumber
-                ELSE oec.quonumber
+  oec.record_type WHEN 'purchase_order' THEN oec.ordnumber
+                  ELSE oec.quonumber
  END   AS recordnumber,
 oec.id AS record_id
      FROM email_journal ej
@@ -477,13 +556,11 @@ gets and shows a dunning statistic of the customer by month
 
 gets and shows a dunning statistic of the customer by year
 
-=item C<action_turnover_by_month>
+=item C<action_turnover>
 
 gets and shows an invoice statistic of customer/vendor by month
-
-=item C<action_turnover_by_year>
-
-gets and shows an invoice statistic of customer/vendor by year
+or year depending on $::form->{mode}. If $::form->{mode} eq 'month'
+get statistics by month, otherwise by year.
 
 =item C<action_get_invoices>
 
diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 7c4a99bfa..0603113a1 100644
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -15,30 +15,46 @@ use SL::File;
 use SL::MIME;
 use SL::Util qw(trim);
 use SL::YAML;
+use SL::DBUtils qw(selectall_hashref_query);
 use SL::DB::History;
-use SL::DB::Order;
 use SL::DB::Default;
 use SL::DB::Unit;
 use SL::DB::Order;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Part;
 use SL::DB::PartClassification;
 use SL::DB::PartsGroup;
 use SL::DB::Printer;
 use SL::DB::Language;
+use SL::DB::Reclamation;
+use SL::DB::Reclamation::TypeData qw(:types);
 use SL::DB::RecordLink;
 use SL::DB::Shipto;
 use SL::DB::Translation;
 use SL::DB::TransferType;
+use SL::DB::ValidityToken;
+use SL::DB::EmailJournal;
+use SL::DB::Warehouse;
+use SL::DB::Bin;
+use SL::DB::Helper::RecordLink qw(set_record_link_conversions RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
+use SL::DB::Helper::TypeDataProxy;
+use SL::DB::Helper::Record qw(get_object_name_from_type get_class_from_type);
+use SL::DB::DeliveryOrder;
+use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Manager::DeliveryOrderItem;
+use SL::DB::DeliveryOrderItemsStock;
+use SL::Model::Record;
 
 use SL::Helper::CreatePDF qw(:all);
 use SL::Helper::PrintOptions;
 use SL::Helper::ShippedQty;
+use SL::Helper::Inventory;
+use SL::Helper::DateTime;
 use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::Helper::UserPreferences::PositionsScrollbar;
 use SL::Helper::UserPreferences::UpdatePositions;
 
 use SL::Controller::Helper::GetModels;
-use SL::Controller::DeliveryOrder::TypeData qw(:types);
 
 use List::Util qw(first sum0);
 use List::UtilsBy qw(sort_by uniq_by);
@@ -48,23 +64,32 @@ use File::Spec;
 use Cwd;
 use Sort::Naturally;
 
-use Rose::Object::MakeMethods::Generic
-(
- scalar => [ qw(item_ids_to_delete is_custom_shipto_to_delete) ],
- 'scalar --get_set_init' => [ qw(order valid_types type cv p all_price_factors search_cvpartnumber show_update_button part_picker_classification_ids type_data) ],
+use Rose::Object::MakeMethods::Generic (
+    scalar => [qw(item_ids_to_delete is_custom_shipto_to_delete)],
+    'scalar --get_set_init' => [ qw(
+      order valid_types type cv p all_price_factors search_cvpartnumber
+      show_update_button part_picker_classification_ids type_data
+      ) ],
 );
 
 
 # safety
 __PACKAGE__->run_before('check_auth',
-                        except => [ qw(update_stock_information) ]);
+  except => [ qw(
+    update_stock_information
+    ) ]);
 
 __PACKAGE__->run_before('check_auth_for_edit',
-                        except => [ qw(update_stock_information edit show_customer_vendor_details_dialog price_popup stock_in_out_dialog load_second_rows) ]);
+  except => [ qw(
+    update_stock_information edit
+    stock_in_out_dialog load_second_rows
+    ) ]);
 
 __PACKAGE__->run_before('get_unalterable_data',
-                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction
-                                     print send_email) ]);
+  only => [ qw(
+    save save_as_new workflow_new_record workflow_invoice
+    save_and_ap_transaction print send_email
+    ) ]);
 
 #
 # actions
@@ -74,11 +99,14 @@ __PACKAGE__->run_before('get_unalterable_data',
 sub action_add {
   my ($self) = @_;
 
-  $self->order->transdate(DateTime->now_local());
-  $self->type_data->set_reqdate_by_type;
+  $self->pre_render();
 
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(
+      scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE()
+    )->token;
+  }
 
-  $self->pre_render();
   $self->render(
     'delivery_order/form',
     title => $self->get_title_for('add'),
@@ -86,39 +114,70 @@ sub action_add {
   );
 }
 
-sub action_add_from_order {
+sub action_add_from_record {
   my ($self) = @_;
-  # this interfers with init_order
-  $self->{converted_from_oe_id} = delete $::form->{id};
+  my $from_type = $::form->{from_type};
+  my $from_id   = $::form->{from_id};
+
+  die "No 'from_type' was given." unless ($from_type);
+  die "No 'from_id' was given."   unless ($from_id);
+
+  my %flags = ();
+  if (defined($::form->{from_item_ids})) {
+    my %use_item = map { $_ => 1 } @{$::form->{from_item_ids}};
+    $flags{item_filter} = sub {
+      my ($item) = @_;
+      return %use_item{$item->{RECORD_ITEM_ID()}};
+    }
+  }
+
+  my $record = SL::Model::Record->get_record($from_type, $from_id);
 
-  $self->type_data->validate($::form->{type});
+  # If we are coming from an order workflow, only consider not delivered
+  # quantities.
+  if (ref $record eq 'SL::DB::Order') {
+    # Calculate shipped qtys here to prevent calling calculate for every item
+    # via the items method.
+    SL::Helper::ShippedQty->new->calculate($record)->write_to(\@{$record->items});
 
-  my $order = SL::DB::Order->new(id => $self->{converted_from_oe_id})->load;
+    my @items_with_not_delivered_qty =
+      grep {$_->qty > 0}
+      map  {$_->qty($_->qty - $_->shipped_qty); $_}
+      @{$record->items_sorted};
 
-  $self->order(SL::DB::DeliveryOrder->new_from($order, type => $::form->{type}));
+    $flags{items} = \@items_with_not_delivered_qty;
+  }
+
+  my $delivery_order = SL::Model::Record->new_from_workflow($record, $self->type, %flags);
+  $self->order($delivery_order);
+  $self->reinit_after_new_order();
 
   $self->action_add;
 }
 
-# edit an existing order
-sub action_edit {
+sub action_add_from_email_journal {
   my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
 
-  if ($::form->{id}) {
-    $self->load_order;
+  $self->action_add();
+}
 
-  } else {
-    # this is to edit an order from an unsaved order object
+sub action_edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
 
-    # set item ids to new fake id, to identify them as new items
-    foreach my $item (@{$self->order->items_sorted}) {
-      $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-    }
-    # trigger rendering values for second row as hidden, because they
-    # are loaded only on demand. So we need to keep the values from
-    # the source.
-    $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
-  }
+  $self->action_edit();
+}
+
+# edit an existing order
+sub action_edit {
+  my ($self) = @_;
+  die "No 'id' was given." unless $::form->{id};
+
+  $self->load_order;
 
   $self->pre_render();
   $self->render(
@@ -128,47 +187,11 @@ sub action_edit {
   );
 }
 
-# edit a collective order (consisting of one or more existing orders)
-sub action_edit_collective {
-  my ($self) = @_;
-
-  # collect order ids
-  my @multi_ids = map {
-    $_ =~ m{^multi_id_(\d+)$} && $::form->{'multi_id_' . $1} && $::form->{'trans_id_' . $1} && $::form->{'trans_id_' . $1}
-  } grep { $_ =~ m{^multi_id_\d+$} } keys %$::form;
-
-  # fall back to add if no ids are given
-  if (scalar @multi_ids == 0) {
-    $self->action_add();
-    return;
-  }
-
-  # fall back to save as new if only one id is given
-  if (scalar @multi_ids == 1) {
-    $self->order(SL::DB::DeliveryOrder->new(id => $multi_ids[0])->load);
-    $self->action_save_as_new();
-    return;
-  }
-
-  # make new order from given orders
-  my @multi_orders = map { SL::DB::DeliveryOrder->new(id => $_)->load } @multi_ids;
-  $self->{converted_from_oe_id} = join ' ', map { $_->id } @multi_orders;
-  $self->order(SL::DB::DeliveryOrder->new_from_multi(\@multi_orders, sort_sources_by => 'transdate'));
-
-  $self->action_edit();
-}
-
 # delete the order
 sub action_delete {
   my ($self) = @_;
 
-  my $errors = $self->delete();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
+  SL::Model::Record->delete($self->order);
   flash_later('info', $self->type_data->text("delete"));
 
   my @redirect_params = (
@@ -183,20 +206,28 @@ sub action_delete {
 sub action_save {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
+  if ( $self->order->delivered ) {
+    $self->js->flash('error', t8('This record has already been delivered.'));
     return $self->js->render();
   }
 
+  $self->save();
+
   flash_later('info', $self->type_data->text("saved"));
 
-  my @redirect_params = (
-    action => 'edit',
-    type   => $self->type,
-    id     => $self->order->id,
-  );
+  my @redirect_params;
+  if ($::form->{back_to_caller}) {
+    @redirect_params = $::form->{callback} ? ($::form->{callback})
+                                           : (controller => 'LoginScreen', action => 'user_login');
+
+  } else {
+    @redirect_params = (
+      action   => 'edit',
+      type     => $self->type,
+      id       => $self->order->id,
+      callback => $::form->{callback},
+    );
+  }
 
   $self->redirect_to(@redirect_params);
 }
@@ -212,37 +243,38 @@ sub action_save_as_new {
     return $self->js->render();
   }
 
-  # load order from db to check if values changed
   my $saved_order = SL::DB::DeliveryOrder->new(id => $order->id)->load;
 
-  my %new_attrs;
-  # Lets assign a new number if the user hasn't changed the previous one.
-  # If it has been changed manually then use it as-is.
-  $new_attrs{number}    = (trim($order->number) eq $saved_order->number)
-                        ? ''
-                        : trim($order->number);
-
-  # Clear transdate unless changed
-  $new_attrs{transdate} = ($order->transdate == $saved_order->transdate)
-                        ? DateTime->today_local
-                        : $order->transdate;
-
-  # Set new reqdate unless changed if it is enabled in client config
-  $new_attrs{reqdate} = $self->type_data->get_reqdate_by_type($order->reqdate, $saved_order->reqdate);
-
-  # Update employee
-  $new_attrs{employee}  = SL::DB::Manager::Employee->current;
-
   # Create new record from current one
-  $self->order(SL::DB::DeliveryOrder->new_from($order, destination_type => $order->type, attributes => \%new_attrs));
+  my $new_order = SL::Model::Record->clone_for_save_as_new($saved_order, $order);
+  $self->order($new_order);
 
-  # no linked records on save as new
-  delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids);
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(
+      scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE()
+    )->token;
+  }
 
   # save
   $self->action_save();
 }
 
+# close a already saved order (potentially already delivered)
+sub action_close_order {
+  my ($self) = @_;
+
+  $self->order->update_attributes(
+    closed => 1
+  );
+
+  $self->js
+    ->flash("info", t8("The record has been closed."))
+    ->run('kivi.ActionBar.setDisabled', '#close_order',
+          t8('This record has already been closed.'))
+    ->html('#data-status-line', delivery_order_status_line($self->order))
+    ->render
+}
+
 # print the order
 #
 # This is called if "print" is pressed in the print dialog.
@@ -251,14 +283,16 @@ sub action_save_as_new {
 sub action_print {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
+  if ( !$self->order->delivered ) {
+    $self->save();
+    $self->js_reset_order_and_item_ids_after_save;
   }
 
-  $self->js_reset_order_and_item_ids_after_save;
+  my $redirect_url = $self->url_for(
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
 
   my $format      = $::form->{print_options}->{format};
   my $media       = $::form->{print_options}->{media};
@@ -269,12 +303,14 @@ sub action_print {
 
   # only pdf and opendocument by now
   if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf)) {
-    return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render;
+    flash_later('error', t8('Format \'#1\' is not supported yet/anymore.', $format));
+    return $self->js->redirect_to($redirect_url)->render;
   }
 
   # only screen or printer by now
   if (none { $media eq $_ } qw(screen printer)) {
-    return $self->js->flash('error', t8('Media \'#1\' is not supported yet/anymore.', $media))->render;
+    flash_later('error', t8('Media \'#1\' is not supported yet/anymore.', $media));
+    return $self->js->redirect_to($redirect_url)->render;
   }
 
   # create a form for generate_attachment_filename
@@ -283,22 +319,25 @@ sub action_print {
   $form->{type}             = $self->type;
   $form->{format}           = $format;
   $form->{formname}         = $formname;
-  $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
+  $form->{language}         =
+    '_' . $self->order->language->template_code if $self->order->language;
   my $pdf_filename          = $form->generate_attachment_filename();
-
   my $pdf;
-  my @errors = generate_pdf($self->order, \$pdf, { format     => $format,
-                                                   formname   => $formname,
-                                                   language   => $self->order->language,
-                                                   printer_id => $printer_id,
-                                                   groupitems => $groupitems });
+  my @errors = generate_pdf($self->order, \$pdf, {
+      format     => $format,
+      formname   => $formname,
+      language   => $self->order->language,
+      printer_id => $printer_id,
+      groupitems => $groupitems
+    });
   if (scalar @errors) {
-    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+    flash_later('error', t8('Generating the document failed: #1', $errors[0]));
+    return $self->js->redirect_to($redirect_url)->render;
   }
 
   if ($media eq 'screen') {
     # screen/download
-    $self->js->flash('info', t8('The PDF has been created'));
+    flash_later('info', t8('The document has been created.'));
     $self->send_file(
       \$pdf,
       type         => SL::MIME->mime_type_from_ext($pdf_filename),
@@ -314,30 +353,34 @@ sub action_print {
       content => $pdf,
     );
 
-    $self->js->flash('info', t8('The PDF has been printed'));
+    flash_later('info', t8('The document has been printed.'));
   }
 
-  my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $pdf_filename);
+  my @warnings = store_pdf_to_webdav_and_filemanagement(
+    $self->order, $pdf, $pdf_filename, $formname
+  );
   if (scalar @warnings) {
-    $self->js->flash('warning', $_) for @warnings;
+    flash_later('warning', $_) for @warnings;
   }
 
   $self->save_history('PRINTED');
 
-  $self->js
-    ->run('kivi.ActionBar.setEnabled', '#save_and_email_action')
-    ->render;
+  $self->js->redirect_to($redirect_url)->render;
 }
+
 sub action_preview_pdf {
   my ($self) = @_;
 
-  my $errors = $self->save();
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
+  if ( !$self->order->delivered ) {
+    $self->save();
+    $self->js_reset_order_and_item_ids_after_save;
   }
 
-  $self->js_reset_order_and_item_ids_after_save;
+  my $redirect_url = $self->url_for(
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
 
   my $format      = 'pdf';
   my $media       = 'screen';
@@ -350,103 +393,138 @@ sub action_preview_pdf {
   $form->{type}             = $self->type;
   $form->{format}           = $format;
   $form->{formname}         = $formname;
-  $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
+  $form->{language}         =
+    '_' . $self->order->language->template_code if $self->order->language;
   my $pdf_filename          = $form->generate_attachment_filename();
 
   my $pdf;
-  my @errors = generate_pdf($self->order, \$pdf, { format     => $format,
-                                                   formname   => $formname,
-                                                   language   => $self->order->language,
-                                                 });
+  my @errors = generate_pdf($self->order, \$pdf, {
+      format     => $format,
+      formname   => $formname,
+      language   => $self->order->language,
+    });
   if (scalar @errors) {
-    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+    flash_later('error', t8('Conversion to PDF failed: #1', $errors[0]));
+    return $self->js->redirect_to($redirect_url)->render;
   }
   $self->save_history('PREVIEWED');
-  $self->js->flash('info', t8('The PDF has been previewed'));
+  flash_later('info', t8('The PDF has been previewed'));
   # screen/download
   $self->send_file(
     \$pdf,
     type         => SL::MIME->mime_type_from_ext($pdf_filename),
     name         => $pdf_filename,
-    js_no_render => 0,
+    js_no_render => 1,
   );
+  $self->js->redirect_to($redirect_url)->render;
 }
 
 # open the email dialog
 sub action_save_and_show_email_dialog {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  my $cv_method = $self->cv;
-
-  if (!$self->order->$cv_method) {
-    return $self->js->flash('error', $self->cv eq 'customer' ? t8('Cannot send E-mail without customer given') : t8('Cannot send E-mail without vendor given'))
-                    ->render($self);
+  if (!$self->order->delivered) {
+    $self->save();
+    $self->js_reset_order_and_item_ids_after_save;
   }
 
-  my $email_form;
-  $email_form->{to}   = $self->order->contact->cp_email if $self->order->contact;
-  $email_form->{to} ||= $self->order->$cv_method->email;
-  $email_form->{cc}   = $self->order->$cv_method->cc;
-  $email_form->{bcc}  = join ', ', grep $_, $self->order->$cv_method->bcc, SL::DB::Default->get->global_bcc;
-  # Todo: get addresses from shipto, if any
+  my $cv = $self->order->customervendor
+    or return $self->js->flash('error',
+      $self->cv eq 'customer' ?
+           t8('Cannot send E-mail without customer given')
+         : t8('Cannot send E-mail without vendor given')
+    )->render($self);
 
   my $form = Form->new;
   $form->{$self->nr_key()}  = $self->order->number;
   $form->{cusordnumber}     = $self->order->cusordnumber;
   $form->{formname}         = $self->type;
   $form->{type}             = $self->type;
-  $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
-  $form->{language_id}      = $self->order->language->id                  if $self->order->language;
+  $form->{language}         =
+    '_' . $self->order->language->template_code if $self->order->language;
+  $form->{language_id}      =
+    $self->order->language->id                  if $self->order->language;
   $form->{format}           = 'pdf';
-  $form->{cp_id}            = $self->order->contact->cp_id if $self->order->contact;
+  $form->{cp_id}            =
+    $self->order->contact->cp_id if $self->order->contact;
 
+  my $email_form;
+  $email_form->{to} =
+       ($self->order->contact ? $self->order->contact->cp_email : undef)
+    || ($cv->is_customer ? $cv->delivery_order_mail : undef)
+    ||  $cv->email;
+  $email_form->{cc}  = $cv->cc;
+  $email_form->{bcc} = join ', ', grep $_, $cv->bcc;
+  # Todo: get addresses from shipto, if any
   $email_form->{subject}             = $form->generate_email_subject();
   $email_form->{attachment_filename} = $form->generate_attachment_filename();
   $email_form->{message}             = $form->generate_email_body();
   $email_form->{js_send_function}    = 'kivi.DeliveryOrder.send_email()';
 
   my %files = $self->get_files_for_email_dialog();
-  $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
-  my $dialog_html = $self->render('common/_send_email_dialog', { output => 0 },
-                                  email_form  => $email_form,
-                                  show_bcc    => $::auth->assert('email_bcc', 'may fail'),
-                                  FILES       => \%files,
-                                  is_customer => $self->type_data->is_customer,
-                                  ALL_EMPLOYEES => $self->{all_employees},
+
+  my @employees_with_email = grep {
+    my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login);
+    $user && !!trim($user->get_config_value('email'));
+  } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) };
+
+  my $dialog_html = $self->render(
+    'common/_send_email_dialog', { output => 0 },
+    email_form  => $email_form,
+    show_bcc    => $::auth->assert('email_bcc', 'may fail'),
+    FILES       => \%files,
+    is_customer => $self->type_data->properties("is_customer"),
+    ALL_EMPLOYEES => \@employees_with_email,
+    ALL_PARTNER_EMAIL_ADDRESSES => $cv->get_all_email_addresses(),
   );
 
   $self->js
-      ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html)
-      ->reinit_widgets
-      ->render($self);
+    ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html)
+    ->reinit_widgets
+    ->render($self);
 }
 
 # send email
-#
-# Todo: handling error messages: flash is not displayed in dialog, but in the main form
 sub action_send_email {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->run('kivi.DeliveryOrder.close_email_dialog');
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
+  if ( !$self->order->delivered ) {
+    eval {
+      $self->save();
+      1;
+    } or do {
+      $self->js->run('kivi.Order.close_email_dialog');
+      die $EVAL_ERROR;
+    };
   }
 
-  $self->js_reset_order_and_item_ids_after_save;
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
+
+  # Set the error handler to reload the document and display errors later,
+  # because the document is already saved and saving can have some side effects
+  # such as generating a document number, project number or record links,
+  # which will be up to date when the document is reloaded.
+  # Hint: Do not use "die" here and try to catch exceptions in subroutine
+  # calls. You should use "$::form->error" which respects the error handler.
+  local $::form->{__ERROR_HANDLER} = sub {
+      flash_later('error', $_[0]);
+      $self->redirect_to(@redirect_params);
+      $::dispatcher->end_request;
+  };
 
+  # move $::form->{email_form} to $::form
   my $email_form  = delete $::form->{email_form};
-  my %field_names = (to => 'email');
 
+  if ($email_form->{additional_to}) {
+    $email_form->{to} = join ', ', grep { $_ } $email_form->{to}, @{$email_form->{additional_to}};
+    delete $email_form->{additional_to};
+  }
+
+  my %field_names = (to => 'email');
   $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form };
 
   # for Form::cleanup which may be called in Form::send_email
@@ -456,19 +534,37 @@ sub action_send_email {
   $::form->{$_}     = $::form->{print_options}->{$_} for keys %{ $::form->{print_options} };
   $::form->{media}  = 'email';
 
-  if (($::form->{attachment_policy} // '') !~ m{^(?:old_file|no_file)$}) {
+  $::form->{attachment_policy} //= '';
+
+  # Is an old file version available?
+  my $attfile;
+  if ($::form->{attachment_policy} eq 'old_file') {
+    $attfile = SL::File->get_all(
+      object_id   => $self->order->id,
+      object_type => $::form->{formname},
+      file_type   => 'document',
+      print_variant => $::form->{formname},
+    );
+  }
+
+  if (   $::form->{attachment_policy} ne 'no_file'
+    && !($::form->{attachment_policy} eq 'old_file' && $attfile)) {
     my $pdf;
-    my @errors = generate_pdf($self->order, \$pdf, {media      => $::form->{media},
-                                                    format     => $::form->{print_options}->{format},
-                                                    formname   => $::form->{print_options}->{formname},
-                                                    language   => $self->order->language,
-                                                    printer_id => $::form->{print_options}->{printer_id},
-                                                    groupitems => $::form->{print_options}->{groupitems}});
+    my @errors = generate_pdf($self->order, \$pdf, {
+        media      => $::form->{media},
+        format     => $::form->{print_options}->{format},
+        formname   => $::form->{print_options}->{formname},
+        language   => $self->order->language,
+        printer_id => $::form->{print_options}->{printer_id},
+        groupitems => $::form->{print_options}->{groupitems}},
+    );
     if (scalar @errors) {
-      return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
+      $::form->error(t8('Generating the document failed: #1', $errors[0]));
     }
 
-    my @warnings = store_pdf_to_webdav_and_filemanagement($self->order, $pdf, $::form->{attachment_filename});
+    my @warnings = store_pdf_to_webdav_and_filemanagement(
+      $self->order, $pdf, $::form->{attachment_filename}, $::form->{formname}
+    );
     if (scalar @warnings) {
       flash_later('warning', $_) for @warnings;
     }
@@ -478,90 +574,77 @@ sub action_send_email {
     $sfile->fh->close;
 
     $::form->{tmpfile} = $sfile->file_name;
-    $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be called in Form::send_email
+    $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be
+                                           # called in Form::send_email
   }
 
-  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
+  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a
+                                    # linked record to the mail
   $::form->send_email(\%::myconfig, 'pdf');
 
+  $self->save_history('MAILED');
+  flash_later('info', t8('The email has been sent.'));
+
   # internal notes unless no email journal
   unless ($::instance_conf->get_email_journal) {
-
     my $intnotes = $self->order->intnotes;
     $intnotes   .= "\n\n" if $self->order->intnotes;
-    $intnotes   .= t8('[email]')                                                                                        . "\n";
-    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
-    $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
-    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
-    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
-    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
-    $intnotes   .= t8('Message')    . ": " . $::form->{message};
+    $intnotes   .= t8('[email]')                                . "\n";
+    $intnotes   .= t8('Date')       . ": " .
+      $::locale->format_date_object(
+        DateTime->now_local, precision => 'seconds'
+      ) . "\n";
+    $intnotes   .= t8('To (email)') . ": " . $::form->{email}   . "\n";
+    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}      . "\n"    if $::form->{cc};
+    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}     . "\n"    if $::form->{bcc};
+    $intnotes   .= t8('Subject')    . ": " . $::form->{subject} . "\n\n";
+    $intnotes   .= t8('Message')    . ": " . SL::HTML::Util->strip($::form->{message});
 
     $self->order->update_attributes(intnotes => $intnotes);
   }
 
-  $self->save_history('MAILED');
-
-  flash_later('info', t8('The email has been sent.'));
-
-  my @redirect_params = (
-    action => 'edit',
-    type   => $self->type,
-    id     => $self->order->id,
-  );
-
   $self->redirect_to(@redirect_params);
 }
 
-# save the order and redirect to the frontend subroutine for a new
-# delivery order
-sub action_save_and_delivery_order {
+sub action_workflow_new_record {
   my ($self) = @_;
-
-  $self->save_and_redirect_to(
-    controller => 'oe.pl',
-    action     => 'oe_delivery_order_from_order',
+  my $to_type = $::form->{to_type};
+  my $to_controller = get_object_name_from_type($to_type);
+
+  my %additional_params = ();
+  if ($::form->{only_selected_item_positions}) { # ids can be unset before save
+    my $item_positions = $::form->{selected_item_positions} || [];
+    my @from_item_ids = map { $self->order->items_sorted->[$_]->id } @$item_positions;
+    $additional_params{from_item_ids} = \@from_item_ids;
+  }
+
+  flash_later('info', $self->type_data->text('saved'));
+
+  $self->redirect_to(
+    controller => $to_controller,
+    action     => 'add_from_record',
+    type       => $to_type,
+    from_id    => $self->order->id,
+    from_type  => $self->order->type,
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+    %additional_params,
   );
 }
 
 # save the order and redirect to the frontend subroutine for a new
 # invoice
-sub action_save_and_invoice {
-  my ($self) = @_;
-
-  $self->save_and_redirect_to(
-    controller => 'oe.pl',
-    action     => 'oe_invoice_from_order',
-  );
-}
-
-# workflow from sales order to sales quotation
-sub action_sales_quotation {
-  $_[0]->workflow_sales_or_request_for_quotation();
-}
-
-# workflow from sales order to sales quotation
-sub action_request_for_quotation {
-  $_[0]->workflow_sales_or_request_for_quotation();
-}
-
-# workflow from sales quotation to sales order
-sub action_sales_order {
-  $_[0]->workflow_sales_or_purchase_order();
-}
-
-# workflow from rfq to purchase order
-sub action_purchase_order {
-  $_[0]->workflow_sales_or_purchase_order();
-}
-
-# workflow from purchase order to ap transaction
-sub action_save_and_ap_transaction {
+sub action_workflow_invoice {
   my ($self) = @_;
 
-  $self->save_and_redirect_to(
-    controller => 'ap.pl',
-    action     => 'add_from_purchase_order',
+  $self->redirect_to(
+    controller => 'do.pl',
+    action     => 'invoice_from_delivery_order_controller',
+    from_id    => $self->order->id,
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
   );
 }
 
@@ -571,11 +654,14 @@ sub action_save_and_ap_transaction {
 sub action_customer_vendor_changed {
   my ($self) = @_;
 
-  setup_order_from_cv($self->order);
+  $self->order(
+    SL::Model::Record->update_after_customer_vendor_change($self->order)
+  );
 
   my $cv_method = $self->cv;
 
-  if ($self->order->$cv_method->contacts && scalar @{ $self->order->$cv_method->contacts } > 0) {
+  if ( $self->order->$cv_method->contacts
+    && scalar @{ $self->order->$cv_method->contacts } > 0) {
     $self->js->show('#cp_row');
   } else {
     $self->js->hide('#cp_row');
@@ -608,40 +694,6 @@ sub action_customer_vendor_changed {
   $self->js->render();
 }
 
-# open the dialog for customer/vendor details
-sub action_show_customer_vendor_details_dialog {
-  my ($self) = @_;
-
-  my $is_customer = 'customer' eq $::form->{vc};
-  my $cv;
-  if ($is_customer) {
-    $cv = SL::DB::Customer->new(id => $::form->{vc_id})->load;
-  } else {
-    $cv = SL::DB::Vendor->new(id => $::form->{vc_id})->load;
-  }
-
-  my %details = map { $_ => $cv->$_ } @{$cv->meta->columns};
-  $details{discount_as_percent} = $cv->discount_as_percent;
-  $details{creditlimt}          = $cv->creditlimit_as_number;
-  $details{business}            = $cv->business->description      if $cv->business;
-  $details{language}            = $cv->language_obj->description  if $cv->language_obj;
-  $details{delivery_terms}      = $cv->delivery_term->description if $cv->delivery_term;
-  $details{payment_terms}       = $cv->payment->description       if $cv->payment;
-  $details{pricegroup}          = $cv->pricegroup->pricegroup     if $is_customer && $cv->pricegroup;
-
-  foreach my $entry (@{ $cv->shipto }) {
-    push @{ $details{SHIPTO} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
-  }
-  foreach my $entry (@{ $cv->contacts }) {
-    push @{ $details{CONTACTS} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} };
-  }
-
-  $_[0]->render('common/show_vc_details', { layout => 0 },
-                is_customer => $is_customer,
-                %details);
-
-}
-
 # called if a unit in an existing item row is changed
 sub action_unit_changed {
   my ($self) = @_;
@@ -652,8 +704,11 @@ sub action_unit_changed {
   my $old_unit_obj = SL::DB::Unit->new(name => $::form->{old_unit})->load;
   $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
 
-  $self->js
-    ->run('kivi.DeliveryOrder.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
+  $self->js->run(
+    'kivi.DeliveryOrder.update_sellprice',
+    $::form->{item_id},
+    $item->sellprice_as_number
+  );
   $self->js_redisplay_line_values;
   $self->js->render();
 }
@@ -679,12 +734,15 @@ sub action_add_item {
                                      ITEM => $item,
                                      ID   => $item_id,
                                      SELF => $self,
-                                     in_out => $self->type_data->transfer,
+                                     in_out => $self->type_data->properties("transfer"),
   );
 
   if ($::form->{insert_before_item_id}) {
     $self->js
-      ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+      ->before(
+        '.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')',
+        $row_as_html
+      );
   } else {
     $self->js
       ->append('#row_table_id', $row_as_html);
@@ -693,19 +751,26 @@ sub action_add_item {
   if ( $item->part->is_assortment ) {
     $form_attr->{qty_as_number} = 1 unless $form_attr->{qty_as_number};
     foreach my $assortment_item ( @{$item->part->assortment_items} ) {
-      my $attr = { parts_id => $assortment_item->parts_id,
-                   qty      => $assortment_item->qty * $::form->parse_amount(\%::myconfig, $form_attr->{qty_as_number}), # TODO $form_attr->{unit}
-                   unit     => $assortment_item->unit,
-                   description => $assortment_item->part->description,
-                 };
+      my $attr = {
+        parts_id => $assortment_item->parts_id,
+        qty      => $assortment_item->qty *
+          $::form->parse_amount(\%::myconfig, $form_attr->{qty_as_number}), # TODO $form_attr->{unit}
+        unit     => $assortment_item->unit,
+        description => $assortment_item->part->description,
+      };
       my $item = new_item($self->order, $attr);
 
-      # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
+      # set discount to 100% if item isn't supposed to be charged, overwriting
+      # any customer discount
       $item->discount(1) unless $assortment_item->charge;
 
       $self->order->add_items( $item );
       $self->get_item_cvpartnumber($item);
-      my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+      my $item_id = join('_',
+        'new',
+        Time::HiRes::gettimeofday(),
+        int rand 1000000000000
+      );
       my $row_as_html = $self->p->render('delivery_order/tabs/_row',
                                          ITEM => $item,
                                          ID   => $item_id,
@@ -713,7 +778,10 @@ sub action_add_item {
       );
       if ($::form->{insert_before_item_id}) {
         $self->js
-          ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+          ->before(
+            '.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')',
+            $row_as_html
+          );
       } else {
         $self->js
           ->append('#row_table_id', $row_as_html);
@@ -745,14 +813,16 @@ sub action_add_multi_items {
     push @items, $item;
     if ( $item->part->is_assortment ) {
       foreach my $assortment_item ( @{$item->part->assortment_items} ) {
-        my $attr = { parts_id => $assortment_item->parts_id,
-                     qty      => $assortment_item->qty * $item->qty, # TODO $form_attr->{unit}
-                     unit     => $assortment_item->unit,
-                     description => $assortment_item->part->description,
-                   };
+        my $attr = {
+          parts_id => $assortment_item->parts_id,
+          qty      => $assortment_item->qty * $item->qty, # TODO $form_attr->{unit}
+          unit     => $assortment_item->unit,
+          description => $assortment_item->part->description,
+        };
         my $item = new_item($self->order, $attr);
 
-        # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
+        # set discount to 100% if item isn't supposed to be charged, overwriting
+        # any customer discount
         $item->discount(1) unless $assortment_item->charge;
         push @items, $item;
       }
@@ -762,17 +832,24 @@ sub action_add_multi_items {
 
   foreach my $item (@items) {
     $self->get_item_cvpartnumber($item);
-    my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+    my $item_id = join('_',
+      'new',
+      Time::HiRes::gettimeofday(),
+      int rand 1000000000000
+    );
     my $row_as_html = $self->p->render('delivery_order/tabs/_row',
-                                       ITEM => $item,
-                                       ID   => $item_id,
-                                       SELF => $self,
-                                       in_out => $self->type_data->transfer,
+      ITEM => $item,
+      ID   => $item_id,
+      SELF => $self,
+      in_out => $self->type_data->properties("transfer"),
     );
 
     if ($::form->{insert_before_item_id}) {
       $self->js
-        ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+        ->before(
+          '.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')',
+          $row_as_html
+        );
     } else {
       $self->js
         ->append('#row_table_id', $row_as_html);
@@ -817,7 +894,9 @@ sub action_reorder_items {
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
   my $method = $sort_keys{$::form->{order_by}};
-  my @to_sort = map { { old_pos => $_->position, order_by => $method->($_) } } @{ $self->order->items_sorted };
+  my @to_sort =
+    map { { old_pos => $_->position, order_by => $method->($_) } }
+    @{ $self->order->items_sorted };
   if ($::form->{sort_dir}) {
     if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){
       @to_sort = sort { $a->{order_by} <=> $b->{order_by} } @to_sort;
@@ -836,16 +915,6 @@ sub action_reorder_items {
     ->render;
 }
 
-# show the popup to choose a price/discount source
-sub action_price_popup {
-  my ($self) = @_;
-
-  my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{orderitem_ids} };
-  my $item = $self->order->items_sorted->[$idx];
-
-  $self->render_price_dialog($item);
-}
-
 # save the order in a session variable and redirect to the part controller
 sub action_create_part {
   my ($self) = @_;
@@ -858,7 +927,9 @@ sub action_create_part {
     previousform => $previousform,
   );
 
-  flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
+  flash_later('info',
+    t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.')
+  );
 
   my @redirect_params = (
     controller    => 'Part',
@@ -874,58 +945,80 @@ sub action_create_part {
 sub action_return_from_create_part {
   my ($self) = @_;
 
-  $self->{created_part} = SL::DB::Part->new(id => delete $::form->{new_parts_id})->load if $::form->{new_parts_id};
+  $self->{created_part} = SL::DB::Part->new(
+    id => delete $::form->{new_parts_id}
+  )->load if $::form->{new_parts_id};
 
   $::auth->restore_form_from_session(delete $::form->{previousform});
 
-  # set item ids to new fake id, to identify them as new items
-  foreach my $item (@{$self->order->items_sorted}) {
-    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
+  $self->order($self->init_order);
+  $self->reinit_after_new_order();
 
-  $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row/longdescription as hidden,
-  # because they are loaded only on demand. So we need to keep the values
-  # from the source.
-  $_->{render_second_row}      = 1 for @{ $self->order->items_sorted };
-  $_->{render_longdescription} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'delivery_order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
+  if ($self->order->id) {
+    $self->pre_render();
+    $self->render(
+      'delivery_order/form',
+      title => $self->get_title_for('edit'),
+      %{$self->{template_args}}
+    );
+  } else {
+    $self->action_add;
+  }
 
 }
 
 sub action_stock_in_out_dialog {
   my ($self) = @_;
 
-  my $part    = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";
-  my $unit    = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit";
-  my $stock   = $::form->{stock};
-  my $row     = $::form->{row};
-  my $item_id = $::form->{item_id};
-  my $qty     = _parse_number($::form->{qty_as_number});
+  my $part        = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";
+  my $unit        = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit";
+  my $stock       = $::form->{stock};
+  my $row         = $::form->{row};
+  my $item_id     = $::form->{item_id};
+  my $qty         = _parse_number($::form->{qty_as_number});
+  my $row_ui_id   = $::form->{row_ui_id};
+  my $next_button = $::form->{next_button} eq 'true';
 
-  my $inout = $self->type_data->transfer;
+  my $inout = $self->type_data->properties("transfer");
 
   my @contents   = DO->get_item_availability(parts_id => $part->id);
   my $stock_info = DO->unpack_stock_information(packed => $stock);
 
   $self->merge_stock_data($stock_info, \@contents, $part, $unit);
 
+  my $delivered = $self->order->delivered;
   $self->render("delivery_order/stock_dialog", { layout => 0 },
-    WHCONTENTS => $self->order->delivered ? $stock_info : \@contents,
-    part       => $part,
-    do_qty     => $qty,
-    do_unit    => $unit->unit,
-    delivered  => $self->order->delivered,
-    row        => $row,
-    item_id    => $item_id,
+    WHCONTENTS  => \@contents,
+    STOCK_INFO  => $stock_info,
+    WAREHOUSES  => !$delivered ? SL::DB::Manager::Warehouse->get_all(query => [ or => [ invalid => 0, invalid => undef ]], with_objects=> ["bins",]) : [],
+    part        => $part,
+    do_qty      => $qty,
+    do_unit     => $unit->name,
+    delivered   => $self->order->delivered,
+    row         => $row,
+    item_id     => $item_id,
+    in_out      => $inout,
+    row_ui_id   => $row_ui_id,
+    next_button => $next_button,
+  );
+}
+
+sub action_add_stock_in_line_to_dialog {
+  my ($self) = @_;
+
+  my $do_qty       = _parse_number($::form->{do_qty});
+  my $qty_sum   = $::form->{qty_sum};
+  my $row_count = $::form->{row_count};
+  my $part      = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";
+
+  my $row_as_html = $self->p->render('delivery_order/stock_dialog/_stock_in_new_row',
+    WAREHOUSES => SL::DB::Manager::Warehouse->get_all(with_objects=> ["bins",]),
+    PART => $part,
+    pos  => $row_count + 1,
+    remaining_qty => $do_qty - $qty_sum,
   );
+
+  $self->js->append('#stock-in-out-table tbody', $row_as_html)->render();
 }
 
 sub action_update_stock_information {
@@ -940,7 +1033,10 @@ sub action_update_stock_information {
     stock_info => $yaml,
     stock_qty => $stock_qty,
   };
-  $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 });
+  $self->render(
+    \ SL::JSON::to_json($response),
+    { layout => 0, type => 'json', process => 0 }
+  );
 }
 
 sub merge_stock_data {
@@ -950,7 +1046,9 @@ sub merge_stock_data {
   if (!$self->order->delivered) {
     for my $row (@$contents) {
       # row here is in parts units. stock is in item units
-      $row->{available_qty} = _format_number($part->unit_obj->convert_to($row->{qty}, $unit));
+      $row->{available_qty} = _format_number(
+        $part->unit_obj->convert_to($row->{qty}, $unit)
+      );
 
       for my $sinfo (@{ $stock_info }) {
         next if $row->{bin_id}       != $sinfo->{bin_id} ||
@@ -987,7 +1085,8 @@ sub action_load_second_rows {
     $self->js_load_second_row($item, $item_id, 0);
   }
 
-  $self->js->run('kivi.DeliveryOrder.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback
+  # for lastcosts change-callback
+  $self->js->run('kivi.DeliveryOrder.init_row_handlers') if $self->order->is_sales;
 
   $self->js->render();
 }
@@ -1004,22 +1103,7 @@ sub action_update_row_from_master_data {
     $item->description($texts->{description});
     $item->longdescription($texts->{longdescription});
 
-    my $price_source = SL::PriceSource->new(record_item => $item, record => $self->order);
-
-    my $price_src;
-    if ($item->part->is_assortment) {
-    # add assortment items with price 0, as the components carry the price
-      $price_src = $price_source->price_from_source("");
-      $price_src->price(0);
-    } else {
-      $price_src = $price_source->best_price
-                 ? $price_source->best_price
-                 : $price_source->price_from_source("");
-      $price_src->price($::form->round_amount($price_src->price / $self->order->exchangerate, 5)) if $self->order->exchangerate;
-      $price_src->price(0) if !$price_source->best_price;
-    }
-
-
+    my ($price_src, undef) = SL::Model::Record->get_best_price_and_discount_source($self->order, $item, ignore_given => 1);
     $item->sellprice($price_src->price);
     $item->active_price_source($price_src);
 
@@ -1041,27 +1125,27 @@ sub action_update_row_from_master_data {
 }
 
 sub action_transfer_stock {
-  my ($self) = @_;
+  my ($self, $default_transfer) = @_;
 
   if ($self->order->delivered) {
-    return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render;
+    return $self->js->flash("error",
+      t8('The parts for this order have already been transferred')
+    )->render;
   }
 
   my $inout = $self->type_data->properties('transfer');
 
-  my $errors = $self->save;
-
-  if (@$errors) {
-    $self->js->flash('error', $_) for @$errors;
-    return $self->js->render;
-  }
+  $self->save;
 
   my $order = $self->order;
 
   # TODO move to type data
   my $trans_type = $inout eq 'in'
-    ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock")
-    : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped");
+    ? SL::DB::Manager::TransferType->find_by(
+        direction => "in", description => "stock")
+    : SL::DB::Manager::TransferType->find_by(
+        direction => "out", description => "shipped");
+
 
   my @transfer_requests;
 
@@ -1069,7 +1153,10 @@ sub action_transfer_stock {
     for my $stock (@{ $item->delivery_order_stock_entries }) {
       my $transfer = SL::DB::Inventory->new_from($stock);
       $transfer->trans_type($trans_type);
+      $transfer->oe_id($order->id);
       $transfer->qty($transfer->qty * -1) if $inout eq 'out';
+      $transfer->qty($transfer->qty * 1) if $inout eq 'in';
+      $transfer->comment(t8("Default transfer delivery order")) if $default_transfer;
 
       push @transfer_requests, $transfer if defined $transfer->qty && $transfer->qty != 0;
     };
@@ -1079,19 +1166,259 @@ sub action_transfer_stock {
     return $self->js->flash("error", t8("No stock to transfer"))->render;
   }
 
+  if ($inout eq 'out') { # check stock for enough qty
+    my @missing_qtys = SL::Helper::Inventory::check_stock_out_transfer_requests(
+      transfer_requests => \@transfer_requests,
+      default_transfer  => $default_transfer,
+    );
+
+    if (scalar @missing_qtys) {
+      my $error = t8('The stock is to low: #1.',
+        join(". ", map {
+              $_->{chargenumber} && $_->{bestbefore}
+            ? t8(
+                "For #1, #2 #3 are missing of batch with chargenumber #4 and bestbefore date of #5 in bin #6",
+                $_->{part}->displayable_name,
+                $::form->format_amount(\%::myconfig, $_->{missing_qty}),
+                $_->{part}->unit,
+                $_->{chargenumber},
+                DateTime->from_ymdhms($_->{bestbefore})->to_kivitendo,
+                $_->{bin}->full_description,
+              )
+            : $_->{chargenumber}
+            ? t8(
+                "For #1, #2 #3 are missing of batch with chargenumber #4 in bin #5",
+                $_->{part}->displayable_name,
+                $::form->format_amount(\%::myconfig, $_->{missing_qty}),
+                $_->{part}->unit,
+                $_->{chargenumber},
+                $_->{bin}->full_description,
+              )
+            : $_->{bestbefore}
+            ? t8(
+                "For #1, #2 #3 are missing with a bestbefore date of #4 in bin #5",
+                $_->{part}->displayable_name,
+                $::form->format_amount(\%::myconfig, $_->{missing_qty}),
+                $_->{part}->unit,
+                DateTime->from_ymdhms($_->{bestbefore})->to_kivitendo,
+                $_->{bin}->full_description,
+              )
+            : t8(
+                "For #1, #2 #3 are missing in bin #4",
+                $_->{part}->displayable_name,
+                $::form->format_amount(\%::myconfig, $_->{missing_qty}),
+                $_->{part}->unit,
+                $_->{bin}->full_description,
+              )
+            ;
+          } @missing_qtys
+        )
+      );
+      return $self->js->flash("error", $error)->render;
+    }
+  }
+
   SL::DB->client->with_transaction(sub {
+
     $_->save for @transfer_requests;
     $self->order->update_attributes(delivered => 1);
   });
+  # update qty and stock info
+  foreach my $item (@{$self->order->items}) {
+    $self->order->prepare_stock_info($item);
+    my $stock_info_yaml = $item->{stock_info};
+    my $item_position = $item->position;
+    my $stock_qty = $self->calculate_stock_in_out($item);
+    my $unit = $item->unit;
+    $self->js->text("[data-position=$item_position] .data-stock-qty", "$stock_qty $unit");
+    my $selector = "[data-position=$item_position] .data-stock-info";
+    $self->js->val($selector, $stock_info_yaml);
+  }
 
   $self->js
     ->flash("info", t8("Stock transfered"))
-    ->run('kivi.ActionBar.setDisabled', '#transfer_out_action', t8('The parts for this order have already been transferred'))
-    ->run('kivi.ActionBar.setDisabled', '#transfer_in_action', t8('The parts for this order have already been transferred'))
-    ->run('kivi.ActionBar.setDisabled', '#delete_action', t8('The parts for this order have already been transferred'))
-    ->replaceWith('#data-status-line', delivery_order_status_line($self->order))
+    ->run('kivi.ActionBar.setDisabled', '#save_action',
+          t8('This record has already been delivered.'))
+    ->run('kivi.ActionBar.setDisabled', '#save_and_close',
+          t8('This record has already been delivered.'))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_out_action',
+          t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_out_default_action',
+          t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_in_action',
+          t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_in_default_action',
+          t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#delete_action',
+          t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setEnabled', '#undo_transfer_action',
+          t8('The parts for this order have already been transferred'))
+    ->html('#data-status-line', delivery_order_status_line($self->order))
     ->render;
+}
 
+sub action_transfer_stock_default {
+  my ($self) = @_;
+  my $delivery_order = $self->order;
+  my @items = @{$delivery_order->items_sorted};
+
+  # get default bin if set in config
+  my ($default_warehouse_id, $default_bin_id);
+  if ($::instance_conf->get_transfer_default_use_master_default_bin) {
+    $default_warehouse_id = $::instance_conf->get_warehouse_id;
+    $default_bin_id       = $::instance_conf->get_bin_id;
+  }
+
+  my @transfer_requests = ();
+  my %parts_qty = ();
+  my %units_by_name = map { $_->name => $_ } @{ SL::DB::Manager::Unit->get_all };
+  foreach my $item (@items) {
+    my $part = $item->part;
+    my $base_unit_factor = $units_by_name{$part->unit}->factor || 1;
+    my $item_unit_factor = $units_by_name{$item->unit}->factor || 1;
+    my $qty = $item->qty * $item_unit_factor / $base_unit_factor;
+    return $self->js->flash('error', t8('Cannot transfer negative entries.'))->render() if $qty < 0;
+    $qty = 0 if (!$::instance_conf->get_transfer_default_services && $part->is_service);
+
+    $parts_qty{$part->id} += $qty if $qty;
+    push @transfer_requests, {
+      'warehouse_id'        => $part->warehouse_id || $default_warehouse_id,
+      'bin_id'              => $part->bin_id       || $default_bin_id,
+      'unit'                => $item->unit,
+      'qty'                 => $qty,
+      # added in check transfer_request out direction if possible
+      'chargenumber'        => undef, # $item->serialnumber, # Is not used in delivery order
+      'bestbefore'          => undef, # $item->bestbefore,   # Is not used in delivery order
+    }
+  }
+
+  # check transfer_requests are correctly
+  my %parts_errors = (); # missing_bin, missing_qty, multiple_options
+  my $grouped_qty_query = qq|
+    SELECT SUM(qty) as qty, chargenumber, bestbefore
+    FROM inventory
+    WHERE parts_id = ? AND bin_id = ?
+    GROUP BY chargenumber, bestbefore
+  |;
+  my $dbh = $self->order->dbh;
+  my $in_out_direction = $delivery_order->type_data->properties('transfer');
+  for my $idx (0 .. scalar @transfer_requests - 1) {
+    my $transfer_request = $transfer_requests[$idx];
+    next unless $transfer_request->{qty}; # empty request
+    my $item = $items[$idx];
+    my $part_id = $item->parts_id;
+    my $bin_id  = $transfer_request->{bin_id};
+    $parts_errors{$part_id}{missing_bin} = 1 unless $bin_id;
+    next                                     unless $bin_id;
+    if ($in_out_direction eq 'out') {
+      my @grouped_qty = selectall_hashref_query(
+        $::form, $dbh, $grouped_qty_query, $part_id, $bin_id);
+
+      if (1 < scalar grep {$_->{qty} != 0} @grouped_qty) {
+        $parts_errors{$part_id}{multiple_options} = 1;
+      }
+      my $max_qty = sum0(map {$_->{qty}} @grouped_qty);
+      if ($max_qty < $parts_qty{$part_id}) {
+        $parts_errors{$part_id}{missing_qty} = $parts_qty{$part_id} - $max_qty;
+        $parts_errors{$part_id}{bin_id}      = $bin_id;
+      }
+
+      next if $parts_errors{$part_id};
+      # find correct chargenumber and bestbefore
+      my $stock_info = first {$_->{qty} >= $transfer_request->{qty}} @grouped_qty;
+      $transfer_request->{chargenumber} = $stock_info->{chargenumber};
+      $transfer_request->{bestbefore}   = $stock_info->{bestbefore};
+    }
+  }
+
+  # auslagern soll immer gehen, auch wenn nicht genügend auf lager ist.
+  # der lagerplatz ist hier extra konfigurierbar, bspw. Lager-Korrektur mit
+  # Lagerplatz Lagerplatz-Korrektur
+  my $default_warehouse_id_ignore_onhand = $::instance_conf->get_warehouse_id_ignore_onhand;
+  my $default_bin_id_ignore_onhand       = $::instance_conf->get_bin_id_ignore_onhand;
+  if ($::instance_conf->get_transfer_default_ignore_onhand && $default_bin_id_ignore_onhand) {
+    foreach my $part_id (keys %parts_errors) {
+      # entsprechende defaults holen
+      # falls chargenumber, bestbefore oder anzahl nicht stimmt, auf automatischen
+      # lagerplatz wegbuchen!
+      for my $idx (0 .. scalar @transfer_requests - 1) {
+        my $transfer_request = $transfer_requests[$idx];
+        next unless $transfer_request->{qty}; # empty request
+
+        if ($items[$idx]->parts_id eq $part_id){
+          $transfer_request->{bin_id}        = $default_bin_id_ignore_onhand;
+          $transfer_request->{warehouse_id}  = $default_warehouse_id_ignore_onhand;
+        }
+      }
+      delete %parts_errors{$part_id};
+    }
+  }
+
+  # render errors
+  if (scalar keys %parts_errors) {
+    my @multiple_options = ();
+    foreach my $part_id (keys %parts_errors) {
+      my $part = SL::DB::Part->new(id => $part_id)->load();
+      if ($parts_errors{$part_id}{missing_bin}){
+        $self->js->error(t8('No standard bin set for #1.', $part->displayable_name));
+      }
+      if ($parts_errors{$part_id}{missing_qty}) {
+        my $bin = SL::DB::Manager::Bin->find_by(
+          id => $parts_errors{$part_id}{bin_id}
+        );
+        $self->js->error(
+          t8('There are #1 of "#2" missing from the bin #3 for transfer.',
+            $parts_errors{$part_id}{missing_qty}, $part->displayable_name, $bin->full_description));
+      }
+      if ($parts_errors{$part_id}{multiple_options}){
+        push @multiple_options, $part;
+      }
+    }
+    if (scalar @multiple_options) {
+        $self->js->error(t8(
+            "There are parts with multiple chargenumbers or bestbefore dates set. This can't be decided automatically. Pleas transfer this delivery order manually. Can't decided for #1.",
+            join ", ", map {$_->displayable_name} @multiple_options)
+        );
+    }
+    return $self->js->render();
+  }
+
+  # assign each delivery_order_item it's stock
+  for my $idx (0 .. scalar @transfer_requests - 1) {
+    my %transfer_request = %{$transfer_requests[$idx]};
+    next unless $transfer_request{qty}; # empty request
+
+    my $item = $items[$idx];
+    my @stocks = (SL::DB::DeliveryOrderItemsStock->new(%transfer_request));
+    $item->delivery_order_stock_entries(@stocks);
+  }
+
+  my $default_transfer = 1;
+  $self->action_transfer_stock($default_transfer);
+}
+
+sub action_undo_transfers {
+  my ( $self ) = @_;
+
+  SL::DB->client->with_transaction(sub {
+    foreach my $item (@{$self->order->orderitems}) {
+      foreach my $inv_item (@{ $item->delivery_order_stock_entries}) {
+        $inv_item->inventory->delete;
+        $inv_item->delete;
+      }
+    }
+    $self->order->update_attributes(delivered => 0);
+    $self->order->update_attributes(closed => 0);
+  });
+
+  flash_later('info', t8("Transfer undone"));
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
+
+  $self->redirect_to(@redirect_params);
 }
 
 sub js_load_second_row {
@@ -1155,7 +1482,8 @@ sub js_reset_order_and_item_ids_after_save {
 
   $self->js
     ->val('#id', $self->order->id)
-    ->val('#converted_from_oe_id', '')
+    ->val('#converted_from_record_type_ref', '')
+    ->val('#converted_from_record_id',  '')
     ->val('#order_' . $self->nr_key(), $self->order->number);
 
   my $idx = 0;
@@ -1163,13 +1491,17 @@ sub js_reset_order_and_item_ids_after_save {
     next if !$self->order->items_sorted->[$idx]->id;
     next if $form_item_id !~ m{^new};
     $self->js
-      ->val ('[name="orderitem_ids[+]"][value="' . $form_item_id . '"]', $self->order->items_sorted->[$idx]->id)
+      ->val (
+        '[name="orderitem_ids[+]"][value="' . $form_item_id . '"]',
+        $self->order->items_sorted->[$idx]->id)
       ->val ('#item_' . $form_item_id, $self->order->items_sorted->[$idx]->id)
-      ->attr('#item_' . $form_item_id, "id", 'item_' . $self->order->items_sorted->[$idx]->id);
+      ->attr('#item_' . $form_item_id, "id",
+        'item_' . $self->order->items_sorted->[$idx]->id);
   } continue {
     $idx++;
   }
-  $self->js->val('[name="converted_from_orderitems_ids[+]"]', '');
+  $self->js->val('[name="converted_from_record_item_type_refs[+]"]', '');
+  $self->js->val('[name="converted_from_record_item_ids[+]"]', '');
 }
 
 #
@@ -1179,17 +1511,18 @@ sub js_reset_order_and_item_ids_after_save {
 sub init_type {
   my ($self) = @_;
 
-  if (none { $::form->{type} eq $_ } @{$self->valid_types}) {
+  my $type = $self->order->record_type;
+  if (none { $type eq $_ } @{$self->valid_types}) {
     die "Not a valid type for delivery order";
   }
 
-  $self->type($::form->{type});
+  $self->type($type);
 }
 
 sub init_cv {
   my ($self) = @_;
 
-  return $self->type_data->customervendor;
+  return $self->type_data->properties("customervendor");
 }
 
 sub init_search_cvpartnumber {
@@ -1217,26 +1550,24 @@ sub init_order {
   $_[0]->make_order;
 }
 
-sub init_all_price_factors {
-  SL::DB::Manager::PriceFactor->get_all;
-}
-
 sub init_part_picker_classification_ids {
   my ($self)    = @_;
 
-  return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(where => $self->type_data->part_classification_query) } ];
+  return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(
+    where => $self->type_data->part_classification_query
+    ) } ];
 }
 
 sub check_auth {
   my ($self) = @_;
 
-  $::auth->assert($self->type_data->access('view') || 'DOES_NOT_EXIST');
+  $::auth->assert($self->type_data->rights('view') || 'DOES_NOT_EXIST');
 }
 
 sub check_auth_for_edit {
   my ($self) = @_;
 
-  $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST');
+  $::auth->assert($self->type_data->rights('edit') || 'DOES_NOT_EXIST');
 }
 
 # build the selection box for contacts
@@ -1261,7 +1592,11 @@ sub build_shipto_select {
   my ($self) = @_;
 
   select_tag('order.shipto_id',
-             [ {displayable_id => t8("No/individual shipping address"), shipto_id => ''}, $self->order->{$self->cv}->shipto ],
+             [ {
+                 displayable_id => t8("No/individual shipping address"),
+                 shipto_id => ''
+               },
+               $self->order->{$self->cv}->shipto ],
              value_key  => 'shipto_id',
              title_key  => 'displayable_id',
              default    => $self->order->shipto_id,
@@ -1301,11 +1636,7 @@ sub load_order {
 
   $self->order(SL::DB::DeliveryOrder->new(id => $::form->{id})->load);
 
-  # Add an empty custom shipto to the order, so that the dialog can render the cvar inputs.
-  # You need a custom shipto object to call cvars_by_config to get the cvars.
-  $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => [])) if !$self->order->custom_shipto;
-
-  $self->prepare_stock_info($_) for $self->order->items;
+  $self->reinit_after_new_order();
 
   return $self->order;
 }
@@ -1323,19 +1654,38 @@ sub make_order {
   # be retrieved via items until the order is saved. Adding empty items to new
   # order here solves this problem.
   my $order;
-  $order   = SL::DB::DeliveryOrder->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
-  $order ||= SL::DB::DeliveryOrder->new(orderitems  => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate($::form->{type}));
+  if ($::form->{id}) {
+    $order = SL::DB::DeliveryOrder->new(
+      id => $::form->{id}
+    )->load(
+      with => [
+        'orderitems',
+        'orderitems.part',
+      ]
+    );
+  } else {
+    $order = SL::DB::DeliveryOrder->new(
+      orderitems  => [],
+      currency_id => $::instance_conf->get_currency_id(),
+      record_type => $::form->{type}
+    );
+    $order = SL::Model::Record->update_after_new($order);
+  }
 
-  my $cv_id_method = $self->cv . '_id';
+  my $cv_id_method = $order->type_data->properties('customervendor'). '_id';
   if (!$::form->{id} && $::form->{$cv_id_method}) {
     $order->$cv_id_method($::form->{$cv_id_method});
-    setup_order_from_cv($order);
+    $order = SL::Model::Record->update_after_customer_vendor_change($order);
   }
 
-  my $form_orderitems                  = delete $::form->{order}->{orderitems};
+  # don't assign hashes as objects
+  my $form_orderitems = delete $::form->{order}->{orderitems};
 
   $order->assign_attributes(%{$::form->{order}});
 
+  # restore form values
+  $::form->{order}->{orderitems} = $form_orderitems;
+
   $self->setup_custom_shipto_from_form($order, $::form);
 
   # remove deleted items
@@ -1357,8 +1707,6 @@ sub make_order {
     $pos++;
   }
 
-  $self->prepare_stock_info($_) for $order->items, @items;
-
   $order->add_items(grep {!$_->id} @items);
 
   return $order;
@@ -1430,36 +1778,11 @@ sub new_item {
 
   $item->assign_attributes(%$attr);
 
-  my $part         = SL::DB::Part->new(id => $attr->{parts_id})->load;
-  my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
-
+  my $part = SL::DB::Part->new(id => $attr->{parts_id})->load;
+  $item->qty(1.0)          if !$item->qty;
   $item->unit($part->unit) if !$item->unit;
 
-  my $price_src;
-  if ( $part->is_assortment ) {
-    # add assortment items with price 0, as the components carry the price
-    $price_src = $price_source->price_from_source("");
-    $price_src->price(0);
-  } elsif (defined $item->sellprice) {
-    $price_src = $price_source->price_from_source("");
-    $price_src->price($item->sellprice);
-  } else {
-    $price_src = $price_source->best_price
-               ? $price_source->best_price
-               : $price_source->price_from_source("");
-    $price_src->price(0) if !$price_source->best_price;
-  }
-
-  my $discount_src;
-  if (defined $item->discount) {
-    $discount_src = $price_source->discount_from_source("");
-    $discount_src->discount($item->discount);
-  } else {
-    $discount_src = $price_source->best_discount
-                  ? $price_source->best_discount
-                  : $price_source->discount_from_source("");
-    $discount_src->discount(0) if !$price_source->best_discount;
-  }
+  my ($price_src, $discount_src) = SL::Model::Record->get_best_price_and_discount_source($record, $item, ignore_given => 0);
 
   my %new_attr;
   $new_attr{part}                   = $part;
@@ -1479,44 +1802,17 @@ sub new_item {
   # saved. Adding empty custom_variables to new orderitem here solves this problem.
   $new_attr{custom_variables} = [];
 
-  my $texts = get_part_texts($part, $record->language_id, description => $new_attr{description}, longdescription => $new_attr{longdescription});
+  my $texts = get_part_texts(
+    $part, $record->language_id,
+    description => $new_attr{description},
+    longdescription => $new_attr{longdescription}
+  );
 
   $item->assign_attributes(%new_attr, %{ $texts });
 
   return $item;
 }
 
-sub prepare_stock_info {
-  my ($self, $item) = @_;
-
-  $item->{stock_info} = SL::YAML::Dump([
-    map +{
-      delivery_order_items_stock_id => $_->id,
-      qty                           => $_->qty,
-      warehouse_id                  => $_->warehouse_id,
-      bin_id                        => $_->bin_id,
-      chargenumber                  => $_->chargenumber,
-      unit                          => $_->unit,
-    }, $item->delivery_order_stock_entries
-  ]);
-}
-
-sub setup_order_from_cv {
-  my ($order) = @_;
-
-  $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id currency_id));
-
-  $order->intnotes($order->customervendor->notes);
-
-  if ($order->is_sales) {
-    $order->salesman_id($order->customer->salesman_id || SL::DB::Manager::Employee->current->id);
-    $order->taxincluded(defined($order->customer->taxincluded_checked)
-                        ? $order->customer->taxincluded_checked
-                        : $::myconfig{taxincluded_checked});
-  }
-
-}
-
 # setup custom shipto from form
 #
 # The dialog returns form variables starting with 'shipto' and cvars starting
@@ -1531,10 +1827,22 @@ sub setup_custom_shipto_from_form {
   if ($order->shipto) {
     $self->is_custom_shipto_to_delete(1);
   } else {
-    my $custom_shipto = $order->custom_shipto || $order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
-
-    my $shipto_cvars  = {map { my ($key) = m{^shiptocvar_(.+)}; $key => delete $form->{$_}} grep { m{^shiptocvar_} } keys %$form};
-    my $shipto_attrs  = {map {                                  $_   => delete $form->{$_}} grep { m{^shipto}      } keys %$form};
+    my $custom_shipto =
+         $order->custom_shipto
+      || $order->custom_shipto(
+           SL::DB::Shipto->new(module => 'DO', custom_variables => [])
+         );
+
+    my $shipto_cvars  = {
+      map { my ($key) = m{^shiptocvar_(.+)}; $key => delete $form->{$_}}
+      grep { m{^shiptocvar_} }
+      keys %$form
+    };
+    my $shipto_attrs  = {
+      map { $_ => delete $form->{$_}}
+      grep { m{^shipto} }
+      keys %$form
+    };
 
     $custom_shipto->assign_attributes(%$shipto_attrs);
     $custom_shipto->cvar_by_name($_)->value($shipto_cvars->{$_}) for keys %$shipto_cvars;
@@ -1557,180 +1865,72 @@ sub get_unalterable_data {
   }
 }
 
-# delete the order
-#
-# And remove related files in the spool directory
-sub delete {
-  my ($self) = @_;
-
-  my $errors = [];
-  my $db     = $self->order->db;
-
-  $db->with_transaction(
-    sub {
-      my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $self->order->id ]) };
-      $self->order->delete;
-      my $spool = $::lx_office_conf{paths}->{spool};
-      unlink map { "$spool/$_" } @spoolfiles if $spool;
-
-      $self->save_history('DELETED');
-
-      1;
-  }) || push(@{$errors}, $db->error);
-
-  return $errors;
-}
-
 # save the order
 #
 # And delete items that are deleted in the form.
 sub save {
   my ($self) = @_;
 
-  my $errors = [];
-  my $db     = $self->order->db;
-
-  $db->with_transaction(sub {
-    # delete custom shipto if it is to be deleted or if it is empty
-    if ($self->order->custom_shipto && ($self->is_custom_shipto_to_delete || $self->order->custom_shipto->is_empty)) {
-      $self->order->custom_shipto->delete if $self->order->custom_shipto->shipto_id;
-      $self->order->custom_shipto(undef);
-    }
-
-    SL::DB::DeliveryOrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []};
-    $self->order->save(cascade => 1);
-
-    # link records
-    if ($::form->{converted_from_oe_id}) {
-      my @converted_from_oe_ids = split ' ', $::form->{converted_from_oe_id};
-      foreach my $converted_from_oe_id (@converted_from_oe_ids) {
-        my $src = SL::DB::Order->new(id => $converted_from_oe_id)->load;
-        $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/ && $self->order->is_type(PURCHASE_DELIVERY_ORDER_TYPE);
-        $src->link_to_record($self->order);
-      }
-      if (scalar @{ $::form->{converted_from_orderitems_ids} || [] }) {
-        my $idx = 0;
-        foreach (@{ $self->order->items_sorted }) {
-          my $from_id = $::form->{converted_from_orderitems_ids}->[$idx];
-          next if !$from_id;
-          SL::DB::RecordLink->new(from_table => 'orderitems',
-                                  from_id    => $from_id,
-                                  to_table   => 'orderitems',
-                                  to_id      => $_->id
-          )->save;
-          $idx++;
-        }
-      }
-    }
+  set_record_link_conversions($self->order,
+    delete $::form->{RECORD_TYPE_REF()}
+      => delete $::form->{RECORD_ID()},
+    delete $::form->{RECORD_ITEM_TYPE_REF()}
+      => delete $::form->{RECORD_ITEM_ID()},
+  );
 
-    $self->save_history('SAVED');
+  my $items_to_delete  = scalar @{ $self->item_ids_to_delete || [] }
+                       ? SL::DB::Manager::DeliveryOrderItem->get_all(where => [id => $self->item_ids_to_delete])
+                       : undef;
+
+  SL::Model::Record->save($self->order,
+    with_validity_token        => {
+      scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE(),
+      token => $::form->{form_validity_token}
+    },
+    delete_custom_shipto       => $self->order->custom_shipto && ($self->is_custom_shipto_to_delete || $self->order->custom_shipto->is_empty),
+    items_to_delete            => $items_to_delete,
+  );
 
-    1;
-  }) || push(@{$errors}, $db->error);
+  if ($::form->{email_journal_id}) {
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $::form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $self->order,
+      delete $::form->{email_attachment_id}
+    );
+  }
 
-  return $errors;
+  delete $::form->{form_validity_token};
 }
 
-sub workflow_sales_or_request_for_quotation {
+sub reinit_after_new_order {
   my ($self) = @_;
 
-  # always save
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) for @{ $errors };
-    return $self->js->render();
-  }
-
-  my $destination_type = $self->type_data->workflow("to_quotation_type");
-
-  $self->order(SL::DB::DeliveryOrder->new_from($self->order, destination_type => $destination_type));
-  $self->{converted_from_oe_id} = delete $::form->{id};
-
-  # set item ids to new fake id, to identify them as new items
-  foreach my $item (@{$self->order->items_sorted}) {
-    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
-
   # change form type
-  $::form->{type} = $destination_type;
+  $::form->{type} = $self->order->type;
   $self->type($self->init_type);
-  $self->cv  ($self->init_cv);
+  $self->type_data($self->init_type_data);
+  $self->cv($self->init_cv);
   $self->check_auth;
 
-  $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row as hidden, because they
-  # are loaded only on demand. So we need to keep the values from the
-  # source.
-  $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'delivery_order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
-}
-
-sub workflow_sales_or_purchase_order {
-  my ($self) = @_;
-
-  # always save
-  my $errors = $self->save();
+  $self->setup_custom_shipto_from_form($self->order, $::form);
 
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  my $destination_type = $self->type_data->workflow("to_order_type");
-
-  # check for direct delivery
-  # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
-  my $custom_shipto;
-  if ($self->type_data->workflow("to_order_copy_shipto") && $::form->{use_shipto} && $self->order->shipto) {
-    $custom_shipto = $self->order->shipto->clone('SL::DB::DeliveryOrder');
-  }
-
-  $self->order(SL::DB::DeliveryOrder->new_from($self->order, destination_type => $destination_type));
-  $self->{converted_from_oe_id} = delete $::form->{id};
-
-  # set item ids to new fake id, to identify them as new items
   foreach my $item (@{$self->order->items_sorted}) {
+    # set item ids to new fake id, to identify them as new items
     $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
 
-  if ($self->type_data->workflow("to_order_copy_shipto")) {
-    if ($::form->{use_shipto}) {
-      $self->order->custom_shipto($custom_shipto) if $custom_shipto;
-    } else {
-      # remove any custom shipto if not wanted
-      $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
-    }
+    # trigger rendering values for second row as hidden, because they
+    # are loaded only on demand. So we need to keep the values from the
+    # source.
+    $item->{render_second_row} = 1;
   }
 
-  # change form type
-  $::form->{type} = $destination_type;
-  $self->type($self->init_type);
-  $self->cv  ($self->init_cv);
-  $self->check_auth;
-
+  $self->order->prepare_stock_info($_) for $self->order->items;
   $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row as hidden, because they
-  # are loaded only on demand. So we need to keep the values from the
-  # source.
-  $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'delivery_order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
 }
 
+
 sub pre_render {
   my ($self) = @_;
 
@@ -1770,7 +1970,7 @@ sub pre_render {
     $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
   }
 
-  if ($self->order->${\ $self->type_data->nr_key } && $::instance_conf->get_webdav) {
+  if ($self->order->${\ $self->type_data->properties("nr_key") } && $::instance_conf->get_webdav) {
     my $webdav = SL::Webdav->new(
       type     => $self->type,
       number   => $self->order->number,
@@ -1782,13 +1982,15 @@ sub pre_render {
                                                 } } @all_objects;
   }
 
-  $self->{template_args}{in_out}                                 = $self->type_data->transfer;
+  $self->{template_args}{in_out}                                 = $self->type_data->properties("transfer");
   $self->{template_args}{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
 
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.DeliveryOrder kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
-                                                         calculate_qty kivi.Validator follow_up show_history);
+  $::request->{layout}->use_javascript("${_}.js") for qw(
+    kivi.SalesPurchase kivi.DeliveryOrder kivi.File calculate_qty kivi.Validator
+    follow_up show_history
+    );
   $self->setup_edit_action_bar;
 }
 
@@ -1796,23 +1998,64 @@ sub setup_edit_action_bar {
   my ($self, %params) = @_;
 
   my $deletion_allowed = $self->type_data->show_menu("delete");
-  my $may_edit_create  = $::auth->assert($self->type_data->access('edit') || 'DOES_NOT_EXIST', 1);
+  my $may_edit_create  = $::auth->assert(
+    $self->type_data->rights('edit') || 'DOES_NOT_EXIST', 1
+  );
+
+  my $confirmation_on_workflow = $self->order->delivered ? undef
+    : ( $self->order->is_sales && $::instance_conf->get_sales_delivery_order_check_stocked)    ? t8('This record has not been stocked out. Proceed?')
+    : (!$self->order->is_sales && $::instance_conf->get_purchase_delivery_order_check_stocked) ? t8('This record has not been stocked in. Proceed?')
+    : undef;
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       combobox => [
         action => [
           t8('Save'),
-          call     => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
-                                                           $::instance_conf->get_order_warn_no_deliverydate,
-          ],
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          id       => 'save_action',
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
+          disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
+                    : $self->order->delivered ? t8('This record has already been delivered.')
+                    :                           undef,
+        ],
+        action => [
+          t8('Save and Close'),
+          id       => 'save_and_close',
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'back_to_caller', value => 1 },
+              ],
+            }],
+          disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
+                    : $self->order->delivered ? t8('This record has already been delivered.')
+                    :                           undef,
+        ],
+        action => [
+          t8('Mark as closed'),
+          id       => 'close_order',
+          call     => [ 'kivi.DeliveryOrder.close_order' ],
+          confirm  => t8('This will remove the delivery order from showing as open even if contents are not delivered. Proceed?'),
+          disabled => !$may_edit_create    ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id    ? t8('This object has not been saved yet.')
+                    : $self->order->closed ? t8('This record has already been closed.')
+                    :                        undef,
         ],
         action => [
           t8('Save as new'),
-          call     => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action             => 'save_as_new',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
           disabled => !$may_edit_create                        ? t8('You do not have the permissions to access this function.')
                     : $self->type eq 'supplier_delivery_order' ? t8('Need a workflow for Supplier Delivery Order')
+                    : $self->type eq 'rma_delivery_order'      ? t8('Need a workflow for RMA Delivery Order.')
                     : !$self->order->id                        ? t8('This object has not been saved yet.')
                     :                                            undef,
         ],
@@ -1823,48 +2066,33 @@ sub setup_edit_action_bar {
           t8('Workflow'),
         ],
         action => [
-          t8('Save and Quotation'),
-          submit   => [ '#order_form', { action => "DeliveryOrder/sales_quotation" } ],
-          only_if  => $self->type_data->show_menu("save_and_quotation"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
-        ],
-        action => [
-          t8('Save and RFQ'),
-          submit   => [ '#order_form', { action => "DeliveryOrder/request_for_quotation" } ],
-          only_if  => $self->type_data->show_menu("save_and_rfq"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
-        ],
-        action => [
-          t8('Save and Sales Order'),
-          submit   => [ '#order_form', { action => "DeliveryOrder/sales_order" } ],
-          only_if  => $self->type_data->show_menu("save_and_sales_order"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
-        ],
-        action => [
-          t8('Save and Purchase Order'),
-          call     => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ],
-          only_if  => $self->type_data->show_menu("save_and_purchase_order"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
-        ],
-        action => [
-          t8('Save and Delivery Order'),
-          call     => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                              $::instance_conf->get_order_warn_no_deliverydate,
-          ],
-          only_if  => $self->type_data->show_menu("save_and_delivery_order"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
-        ],
-        action => [
-          t8('Save and Invoice'),
-          call     => [ 'kivi.DeliveryOrder.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
-          only_if  => $self->type_data->show_menu("save_and_invoice"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          t8('Create Invoice'),
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action             => 'workflow_invoice',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
+          only_if  => $self->type_data->show_menu("workflow_invoice"),
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id ? t8('This object has not been saved yet.')
+                    : undef,
+          confirm  =>   $confirmation_on_workflow,
         ],
         action => [
-          t8('Save and AP Transaction'),
-          call     => [ 'kivi.DeliveryOrder.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
-          only_if  => $self->type_data->show_menu("save_and_ap_transaction"),
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          t8('Create Reclamation'),
+          call      => [ 'kivi.DeliveryOrder.save', {
+              action             => 'workflow_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              form_params        => [
+                { name => 'to_type',
+                  value => $self->order->is_sales ? SALES_RECLAMATION_TYPE()
+                                                  : PURCHASE_RECLAMATION_TYPE() },
+              ],
+            }],
+          only_if  => $self->type_data->show_menu('workflow_reclamation'),
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id ? t8('This object has not been saved yet.')
+                    : undef,
+          confirm  => $confirmation_on_workflow,
         ],
 
       ], # end of combobox "Workflow"
@@ -1875,24 +2103,29 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and preview PDF'),
-           call    => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                  $::instance_conf->get_order_warn_no_deliverydate,
-          ],
+           call    => [ 'kivi.DeliveryOrder.save', {
+               action             => 'preview_pdf',
+               warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+               warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+             }],
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and print'),
-          call     => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                 $::instance_conf->get_order_warn_no_deliverydate,
+          call     => [ 'kivi.DeliveryOrder.show_print_options', {
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
           ],
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and E-mail'),
           id       => 'save_and_email_action',
-          call     => [ 'kivi.DeliveryOrder.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                                 $::instance_conf->get_order_warn_no_deliverydate,
-          ],
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action             => 'save_and_show_email_dialog',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
                     : !$self->order->id ? t8('This object has not been saved yet.')
                     :                     undef,
@@ -1923,7 +2156,22 @@ sub setup_edit_action_bar {
         action => [
           t8('Transfer out'),
           id       => 'transfer_out_action',
-          call     => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action => 'transfer_stock',
+            }],
+          disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id       ? t8('This object has not been saved yet.')
+                    : $self->order->delivered ? t8('The parts for this order have already been transferred')
+                    :                           undef,
+          only_if  => $self->type_data->properties('transfer') eq 'out',
+          confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
+        ],
+        action => [
+          t8('Transfer out via default'),
+          id       => 'transfer_out_default_action',
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action => 'transfer_stock_default',
+            }],
           disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
                     : !$self->order->id       ? t8('This object has not been saved yet.')
                     : $self->order->delivered ? t8('The parts for this order have already been transferred')
@@ -1934,7 +2182,22 @@ sub setup_edit_action_bar {
         action => [
           t8('Transfer in'),
           id       => 'transfer_in_action',
-          call     => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action => 'transfer_stock',
+            }],
+          disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id       ? t8('This object has not been saved yet.')
+                    : $self->order->delivered ? t8('The parts for this order have already been transferred')
+                    :                           undef,
+          only_if  => $self->type_data->properties('transfer') eq 'in',
+          confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
+        ],
+        action => [
+          t8('Transfer in via default'),
+          id       => 'transfer_in_default_action',
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action => 'transfer_stock_default',
+            }],
           disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
                     : !$self->order->id       ? t8('This object has not been saved yet.')
                     : $self->order->delivered ? t8('The parts for this order have already been transferred')
@@ -1942,6 +2205,18 @@ sub setup_edit_action_bar {
           only_if  => $self->type_data->properties('transfer') eq 'in',
           confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
         ],
+        action => [
+          t8('Undo Transfer'),
+          id       => 'undo_transfer_action',
+          call     => [ 'kivi.DeliveryOrder.save', {
+              action => 'undo_transfers',
+            }],
+          disabled => !$may_edit_create       ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id       ? t8('This object has not been saved yet.')
+                    : undef,
+          disabled => !$self->order->delivered,
+          confirm => t8('Do you really want undo transfers the stock and set this order to undelivered?'),
+        ],
       ],
 
       combobox => [
@@ -1998,7 +2273,10 @@ sub generate_pdf {
   );
 
   if (!defined $template_file) {
-    push @errors, $::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files);
+    push @errors, $::locale->text(
+      'Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.',
+      join ', ', map { "'$_'"} @template_files
+    );
   }
 
   return @errors if scalar @errors;
@@ -2072,10 +2350,14 @@ sub get_item_cvpartnumber {
   return if !$self->order->customervendor;
 
   if ($self->cv eq 'vendor') {
-    my @mms = grep { $_->make eq $self->order->customervendor->id } @{$item->part->makemodels};
+    my @mms =
+      grep { $_->make eq $self->order->customervendor->id }
+      @{$item->part->makemodels};
     $item->{cvpartnumber} = $mms[0]->model if scalar @mms;
   } elsif ($self->cv eq 'customer') {
-    my @cps = grep { $_->customer_id eq $self->order->customervendor->id } @{$item->part->customerprices};
+    my @cps =
+      grep { $_->customer_id eq $self->order->customervendor->id }
+      @{$item->part->customerprices};
     $item->{cvpartnumber} = $cps[0]->customer_partnumber if scalar @cps;
   }
 }
@@ -2105,22 +2387,7 @@ sub get_part_texts {
 }
 
 sub nr_key {
-  return $_[0]->type_data->nr_key;
-}
-
-sub save_and_redirect_to {
-  my ($self, %params) = @_;
-
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  flash_later('info', $self->type_data->text("saved"));
-
-  $self->redirect_to(%params, id => $self->order->id);
+  return $_[0]->type_data->properties("nr_key");
 }
 
 sub save_history {
@@ -2139,7 +2406,7 @@ sub save_history {
 }
 
 sub store_pdf_to_webdav_and_filemanagement {
-  my($order, $content, $filename) = @_;
+  my($order, $content, $filename, $variant) = @_;
 
   my @errors;
 
@@ -2168,7 +2435,8 @@ sub store_pdf_to_webdav_and_filemanagement {
                      source        => 'created',
                      file_type     => 'document',
                      file_name     => $filename,
-                     file_contents => $content);
+                     file_contents => $content,
+                     print_variant => $variant);
       1;
     } or do {
       push @errors, t8('Storing PDF in storage backend failed: #1', $@);
@@ -2209,7 +2477,8 @@ sub calculate_stock_in_out {
 }
 
 sub init_type_data {
-  SL::Controller::DeliveryOrder::TypeData->new($_[0]);
+  my ($self) = @_;
+  SL::DB::Helper::TypeDataProxy->new('SL::DB::DeliveryOrder', $self->order->record_type);
 }
 
 sub init_valid_types {
@@ -2407,7 +2676,7 @@ editor or on text processing application).
 
 =item *
 
-A warning when leaving the page without saveing unchanged inputs.
+A warning when leaving the page without saving unchanged inputs.
 
 
 =back
diff --git a/SL/Controller/DeliveryOrder/TypeData.pm b/SL/Controller/DeliveryOrder/TypeData.pm
deleted file mode 100644
index 0650e08b3..000000000
--- a/SL/Controller/DeliveryOrder/TypeData.pm
+++ /dev/null
@@ -1,101 +0,0 @@
-package SL::Controller::DeliveryOrder::TypeData;
-
-use strict;
-use Exporter qw(import);
-use Scalar::Util qw(weaken);
-use SL::Locale::String qw(t8);
-use SL::DB::DeliveryOrder::TypeData qw(:types :subs);
-
-my @export_types = qw(SALES_DELIVERY_ORDER_TYPE PURCHASE_DELIVERY_ORDER_TYPE SUPPLIER_DELIVERY_ORDER_TYPE RMA_DELIVERY_ORDER_TYPE);
-
-our @EXPORT_OK = (@export_types);
-our %EXPORT_TAGS = (types => \@export_types);
-
-use Rose::Object::MakeMethods::Generic scalar => [ qw(c) ];
-
-sub new {
-  my ($class, $controller) = @_;
-  my $o = bless {}, $class;
-
-  if ($controller) {
-    $o->c($controller);
-    weaken($o->{c});
-  }
-
-  return $o;
-}
-
-sub validate {
-  my ($self, $string) = @_;
-  validate_type($string);
-}
-
-sub text {
-  my ($self, $string) = @_;
-  get3($self->c->type, "text", $string);
-}
-
-sub show_menu {
-  my ($self, $string) = @_;
-  get3($self->c->type, "show_menu", $string);
-}
-
-sub workflow {
-  my ($self, $string) = @_;
-  get3($self->c->type, "workflow", $string);
-}
-
-sub properties {
-  my ($self, $string) = @_;
-  get3($self->c->type, "properties", $string);
-}
-
-sub access {
-  my ($self, $string) = @_;
-  get3($_[0]->c->type, "rights", $string);
-}
-
-sub is_quotation {
-  get3($_[0]->c->type, "properties", "is_quotation");
-}
-
-sub customervendor {
-  get3($_[0]->c->type, "properties", "customervendor");
-}
-
-sub is_customer {
-  get3($_[0]->c->type, "properties", "is_customer");
-}
-
-sub nr_key {
-  get3($_[0]->c->type, "properties", "nr_key");
-}
-
-sub transfer {
-  get3($_[0]->c->type, "properties", "transfer");
-}
-
-sub part_classification_query {
-  my ($self, $string) = @_;
-  get($self->c->type, "part_classification_query");
-}
-
-sub set_reqdate_by_type {
-  my ($self) = @_;
-
-  if (!$self->c->order->reqdate) {
-    $self->c->order->reqdate(DateTime->today_local->next_workday(extra_days => 1));
-  }
-}
-
-sub get_reqdate_by_type {
-  my ($self, $reqdate, $saved_reqdate) = @_;
-
-  if ($reqdate == $saved_reqdate) {
-    return DateTime->today_local->next_workday(extra_days => 1);
-  } else {
-    return $reqdate;
-  }
-}
-
-1;
diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 6d7aaa908..0a120c6ec 100644
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Controller::Base);
 
 use Clone qw(clone);
 use SL::DB::OrderItem;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Business;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
@@ -49,9 +50,10 @@ sub action_list {
 sub prepare_report {
   my ($self)      = @_;
 
-  my $vc          = $self->vc;
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $vc           = $self->vc;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Delivery Plan');
+  $self->{report}  = $report;
 
   my @columns     = qw(reqdate customer vendor ordnumber partnumber description qty shipped_qty not_shipped_qty);
 
@@ -95,6 +97,7 @@ sub prepare_report {
   $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->finalize; # for filter laundering
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
+  $self->{assembly_item_number} = $::form->{assembly_item_number} ? $::form->{assembly_item_number} : undef;
   $report->set_options(
     raw_top_info_text     => $self->render('delivery_plan/report_top',    { output => 0 }),
     raw_bottom_info_text  => $self->render('delivery_plan/report_bottom', { output => 0 }, models => $self->models),
@@ -115,7 +118,7 @@ sub calc_qtys {
 sub make_filter_summary {
   my ($self) = @_;
   my $vc     = $self->vc;
-  my ($business, $employee, $department);
+  my ($business, $employee, $department, $assembly_item_number);
 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
@@ -123,6 +126,7 @@ sub make_filter_summary {
   $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
   $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};
   $department = SL::DB::Department->new(id => $filter->{order}{department_id})->load->description if $filter->{order}{department_id};
+  $assembly_item_number = $::form->{assembly_item_number};
 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],
@@ -139,6 +143,7 @@ sub make_filter_summary {
     [ $business,                                                      $::locale->text('Customer type')                                      ],
     [ $department,                                                    $::locale->text('Department')                                         ],
     [ $employee,                                                      $::locale->text('Employee')                                           ],
+    [ $assembly_item_number,                                          $::locale->text('Assembly Item Number')                               ],
   );
 
   my %flags = (
@@ -160,14 +165,13 @@ sub make_filter_summary {
 
 sub delivery_plan_query_linked_items {
   my ($self) = @_;
-  my $vc     = $self->vc;
+  my $record_type = ($self->vc eq 'customer' ? SALES_ORDER_TYPE() : PURCHASE_ORDER_TYPE());
   my $employee_id = SL::DB::Manager::Employee->current->id;
   my $oe_owner = $_[0]->all_edit_right ? '' : " oe.employee_id = $employee_id AND";
 
   [
-  "order.${vc}_id" => { gt => 0 },
+  record_type => $record_type,
   'order.closed' => 0,
-  or => [ 'order.quotation' => 0, 'order.quotation' => undef ],
 
   # filter by shipped_qty < qty, read from innermost to outermost
   'id' => [ \"
@@ -176,8 +180,7 @@ sub delivery_plan_query_linked_items {
       FROM orderitems oi, oe, record_links rl, delivery_order_items doi
       WHERE
         oe.id = oi.trans_id AND
-        oe.${vc}_id IS NOT NULL AND
-        (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+        oe.record_type = '$record_type' AND
         NOT oe.closed AND
         $oe_owner
         doi.id = rl.to_id AND
@@ -195,8 +198,7 @@ sub delivery_plan_query_linked_items {
     SELECT oi.id FROM orderitems oi, oe
     WHERE
       oe.id = oi.trans_id AND
-      oe.${vc}_id IS NOT NULL AND
-      (oe.quotation = 'f' OR oe.quotation IS NULL) AND
+      oe.record_type = '$record_type' AND
       NOT oe.closed AND
       $oe_owner
       NOT EXISTS (
@@ -218,6 +220,28 @@ sub init_models {
 
   my $query = $self->delivery_plan_query_linked_items;
 
+  if ($::form->{assembly_item_number}) {
+
+    my $assembly_parts = SL::DB::Manager::Part->get_all(where => [ partnumber => { ilike => '%' . $::form->{assembly_item_number} . '%' } ]);
+
+    my @assemblies;
+
+    foreach my $assembly_part (@{ $assembly_parts }) {
+      push @assemblies, SL::DB::Manager::Assembly->get_all(where => [parts_id =>$assembly_part->id]);
+    }
+
+    if (scalar @assemblies > 0) {
+      my %assembly_ids;
+      foreach my $list (@assemblies) {
+        foreach my $assembly (@{ $list }) {
+          $assembly_ids{$assembly->id} = 1;
+        }
+      }
+      my @assembly_ids_array = (keys %assembly_ids);
+      $::form->{filter}{part}{id} = { or => [ @assembly_ids_array ] };
+    }
+  }
+
   SL::Controller::Helper::GetModels->new(
     controller   => $self,
     model        => 'OrderItem',
@@ -258,14 +282,8 @@ sub link_to {
 
   if ($object->isa('SL::DB::Order')) {
     my $type   = $object->type;
-    my $vc     = $object->is_sales ? 'customer' : 'vendor';
     my $id     = $object->id;
-
-    if ($::instance_conf->get_feature_experimental_order) {
-      return "controller.pl?action=Order/$action&type=$type&id=$id";
-    } else {
-      return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
-    }
+    return "controller.pl?action=Order/$action&type=$type&id=$id";
   }
   if ($object->isa('SL::DB::Part')) {
     my $id     = $object->id;
diff --git a/SL/Controller/DeliveryTerm.pm b/SL/Controller/DeliveryTerm.pm
index d566b5c9f..86c0ed19f 100644
--- a/SL/Controller/DeliveryTerm.pm
+++ b/SL/Controller/DeliveryTerm.pm
@@ -4,8 +4,10 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
+use SL::DB::Customer;
 use SL::DB::DeliveryTerm;
 use SL::DB::Language;
+use SL::DB::Vendor;
 use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 
@@ -110,6 +112,15 @@ sub create_or_update {
     $self->{delivery_term}->save_attribute_translation('description_long', $language, $::form->{"translation_" . $language->id});
   }
 
+  if ($::form->{remove_customer_vendor_delivery_terms}) {
+    foreach my $class (qw(Customer Vendor)) {
+      "SL::DB::Manager::${class}"->update_all(
+        set   => { delivery_term_id => undef },
+        where => [ delivery_term_id => $self->{delivery_term}->id ],
+      );
+    }
+  }
+
   flash_later('info', $is_new ? $::locale->text('The delivery term has been created.') : $::locale->text('The delivery term has been saved.'));
   $self->redirect_to(action => 'list');
 }
diff --git a/SL/Controller/DeliveryValueReport.pm b/SL/Controller/DeliveryValueReport.pm
index ae2032fcc..f5608336e 100644
--- a/SL/Controller/DeliveryValueReport.pm
+++ b/SL/Controller/DeliveryValueReport.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Controller::Base);
 
 use Clone qw(clone);
 use SL::DB::OrderItem;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Business;
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
@@ -63,10 +64,11 @@ sub action_list {
 sub prepare_report {
   my ($self)      = @_;
 
-  my $vc          = $self->vc;
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  my $csv_option  = $::form->{report_generator_output_format};
-  $self->{report} = $report;
+  my $vc           = $self->vc;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  my $csv_option   = $::form->{report_generator_output_format};
+  $report->{title} = t8('Delivery Value Report');
+  $self->{report}  = $report;
 
   my @columns     = qw(reqdate customer vendor ordnumber partnumber description unit qty netto_qty
                        not_shipped_qty netto_not_shipped_qty shipped_qty netto_shipped_qty delivered_qty
@@ -192,6 +194,7 @@ sub make_filter_summary {
 sub init_models {
   my ($self) = @_;
   my $vc     = $self->vc;
+  my $record_type = ($vc eq 'customer' ? SALES_ORDER_TYPE() : PURCHASE_ORDER_TYPE());
   SL::Controller::Helper::GetModels->new(
     controller            => $self,
     model                 => 'OrderItem',
@@ -204,7 +207,7 @@ sub init_models {
     },
     # show only open (sales|purchase) orders
     query                 => [ 'order.closed' => '0',  "order.${vc}_id" => { gt => 0 },
-                               'order.quotation' => 0                                  ],
+                               'order.record_type' => $record_type                       ],
     with_objects          => [ 'order', "order.$vc", 'part' ],
     additional_url_params => { vc => $vc},
   )
@@ -232,14 +235,8 @@ sub link_to {
 
   if ($object->isa('SL::DB::Order')) {
     my $type   = $object->type;
-    my $vc     = $object->is_sales ? 'customer' : 'vendor';
     my $id     = $object->id;
-
-    if ($::instance_conf->get_feature_experimental_order) {
-      return "controller.pl?action=Order/$action&type=$type&id=$id";
-    } else {
-      return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
-    }
+    return "controller.pl?action=Order/$action&type=$type&id=$id";
   }
   if ($object->isa('SL::DB::Part')) {
     my $id     = $object->id;
diff --git a/SL/Controller/DispositionManager.pm b/SL/Controller/DispositionManager.pm
new file mode 100644
index 000000000..0e70c5069
--- /dev/null
+++ b/SL/Controller/DispositionManager.pm
@@ -0,0 +1,426 @@
+package SL::Controller::DispositionManager;
+
+use strict;
+
+use parent qw(SL::Controller::Base);
+
+use SL::Controller::Helper::GetModels;
+use SL::Controller::Helper::ReportGenerator;
+use SL::DB::Part;
+use SL::DB::PurchaseBasketItem;
+use SL::DB::Order;
+use SL::DB::OrderItem;
+use SL::DB::Vendor;
+use SL::PriceSource;
+use SL::Locale::String qw(t8);
+use SL::Helper::Flash qw(flash flash_later);
+use SL::DBUtils;
+
+use Data::Dumper;
+
+use Rose::Object::MakeMethods::Generic (
+ 'scalar --get_set_init' => [ qw(models) ],
+);
+
+sub action_list_parts {
+  my ($self) = @_;
+  $self->prepare_report(t8('Reorder Level List'), $::form->{noshow} ? 1 : 0 );
+
+  my $objects = $::form->{noshow} ? [] : $self->models->get;
+
+  $self->_setup_list_action_bar;
+  $self->report_generator_list_objects(
+    report => $self->{report}, objects => $objects);
+}
+
+sub prepare_report {
+  my ($self, $title, $noshow ) = @_;
+
+  my $report = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $self->{report} = $report;
+
+  my @columns  = qw(
+    partnumber description available onhand rop ordered
+    );
+  my @visible  = qw(
+    partnumber description available onhand rop ordered
+    );
+  my @sortable = qw(partnumber description);
+
+  my %column_defs = (
+    partnumber  => {
+      sub      => sub { $_[0]->partnumber },
+      text     => t8('Part Number'),
+      obj_link => sub { $_[0]->presenter->link_to },
+    },
+    description => {
+      sub      => sub { $_[0]->description },
+      text     => t8('Part Description'),
+      obj_link => sub { $_[0]->presenter->link_to },
+    },
+    available   => {
+      sub  => sub { $::form->format_amount(\%::myconfig,$_[0]->onhandqty,2); },
+      text => t8('Available Stock'),
+    },
+    onhand      => {
+      sub  => sub { $::form->format_amount(\%::myconfig,$_[0]->stockqty,2); },
+      text => t8('Total Stock'),
+    },
+    rop         => {
+      sub  => sub { $::form->format_amount(\%::myconfig,$_[0]->rop,2); },
+      text => t8('Rop'),
+    },
+    ordered     => {
+      sub => sub { $::form->format_amount(
+                     \%::myconfig,$_[0]->get_open_ordered_qty,2); },
+      text => t8('Ordered purchase'),
+    },
+  );
+
+  map { $column_defs{$_}->{visible} = 1 } @visible;
+
+  $report->set_options(
+    controller_class     => 'DispositionManager',
+    output_format        => 'HTML',
+    title                => t8($title),
+    allow_pdf_export     => 0,
+    allow_csv_export     => 0,
+    allow_chart_export   => 0,
+    no_data_message      => !$noshow,
+  );
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
+
+  unless ( $noshow ) {
+    if ($report->{options}{output_format} =~ /^(pdf|csv)$/i) {
+      $self->models->disable_plugin('paginated');
+    }
+    $self->models->finalize; # for filter laundering
+    $self->models->set_report_generator_sort_options(
+      report => $report, sortable_columns => \@sortable
+    );
+  }
+  my $parts = $self->_get_parts(0);
+  my $top    = $self->render('disposition_manager/list_parts', { output => 0 },
+                             noshow => $noshow,
+                             PARTS => $parts,
+                             title => t8('Short onhand Ordered'),
+                           );
+  my $bottom = $noshow ? undef : $self->render(
+    'disposition_manager/reorder_level_list/report_bottom',
+    { output => 0}, models => $self->models );
+  $report->set_options(
+    raw_top_info_text    => $top,
+    raw_bottom_info_text => $bottom,
+  );
+}
+
+sub action_add_to_purchase_basket{
+  my ($self) = @_;
+
+  my $employee = SL::DB::Manager::Employee->current;
+
+  my $parts_to_add = delete($::form->{ids}) || [];
+  foreach my $id (@{ $parts_to_add }) {
+    my $part = SL::DB::Manager::Part->find_by(id => $id)
+      or die "Can't find part with id: $id\n";
+    my $needed_qty = $part->order_qty < ($part->rop - $part->onhandqty) ?
+                       $part->rop - $part->onhandqty
+                     : $part->order_qty;
+    my $basket_part = SL::DB::PurchaseBasketItem->new(
+      part_id    => $part->id,
+      qty        => $needed_qty,
+      orderer_id => $employee->id,
+    )->save;
+ }
+
+ $self->redirect_to(
+   controller => 'DispositionManager',
+   action     => 'show_basket',
+ );
+
+}
+
+sub action_show_basket {
+  my ($self) = @_;
+
+  $::request->{layout}->add_javascripts(
+    'kivi.DispositionManager.js', 'kivi.Part.js'
+  );
+  my $basket_items = SL::DB::Manager::PurchaseBasketItem->get_all(
+    query => [ cleared => 'F' ],
+    with_objects => [ 'part', 'part.makemodels' ]
+  );
+  $self->_setup_show_basket_action_bar;
+  $self->render(
+    'disposition_manager/show_purchase_basket',
+    BASKET_ITEMS => $basket_items,
+    title => t8('Purchase basket'),
+  );
+}
+
+sub action_show_vendor_items {
+  my ($self) = @_;
+
+  my $makemodels_parts;
+  if ($::form->{vendor_id}) {
+    $makemodels_parts = SL::DB::Manager::Part->get_all(
+      query => [
+        'purchase_basket_item.id' => undef,
+        'makemodels.make' => $::form->{vendor_id},
+      ],
+      sort_by => 'onhand',
+      with_objects => [ 'makemodels', 'purchase_basket_item' ]
+    );
+  };
+
+  $self->render(
+    'disposition_manager/_show_vendor_parts',
+    { layout => 0 },
+    MAKEMODEL_ITEMS => $makemodels_parts
+  );
+}
+
+sub action_transfer_to_purchase_order {
+  my ($self) = @_;
+  my @error_report;
+
+  my $basket_item_ids = $::form->{ids};
+  my $vendor_item_ids = $::form->{vendor_part_ids};
+
+  unless (($basket_item_ids && scalar @{ $basket_item_ids})
+      || ( $vendor_item_ids && scalar @{ $vendor_item_ids}))
+    {
+    $self->js->flash('error', t8('There are no items selected'));
+    return $self->js->render();
+  }
+
+  # check for same vendor
+  my %basket_id_vendor_id_map =
+    map {$::form->{basket_ids}->[$_] => $::form->{vendor_ids}->[$_]}
+    (0..$#{$::form->{vendor_ids}});
+
+  my $vendor_id = $::form->{vendor_id_selected} || $basket_id_vendor_id_map{@{$basket_item_ids}[0]} || $basket_id_vendor_id_map{@{$basket_item_ids}[0]};
+
+  my @different_vendor_ids =
+    grep { $basket_id_vendor_id_map{$_} ne $vendor_id }
+    @{$basket_item_ids};
+  if (scalar @different_vendor_ids) {
+    $self->js->flash('error', t8('There are mulitple vendors selected'));
+    return $self->js->render();
+  }
+
+  $self->redirect_to(
+    controller => 'Order',
+    action     => 'add_from_purchase_basket',
+    type       => 'purchase_order',
+    basket_item_ids => $basket_item_ids || [],
+    vendor_item_ids => $vendor_item_ids || [],
+    vendor_id       => $vendor_id,
+  );
+}
+
+sub action_delete_purchase_basket_items {
+
+  my ($self) = @_;
+  my @error_report;
+
+  my $basket_item_ids = $::form->{ids};
+
+  if ($basket_item_ids && scalar @{ $basket_item_ids}) {
+    SL::DB::Manager::PurchaseBasketItem->delete_all(
+      where => [ id => $basket_item_ids]);
+  } else {
+    $self->js->flash('error', t8('There are no items selected'));
+    return $self->js->render();
+  }
+
+  flash_later('info', t8('Selected items deleted'));
+
+  $self->redirect_to(
+    controller => 'DispositionManager',
+    action     => 'show_basket',
+  );
+}
+
+sub _get_parts {
+  my ($self, $ordered) = @_;
+
+  my $query = <<SQL;
+ WITH available AS (
+   SELECT inv.parts_id, sum(qty) as sum
+   FROM inventory inv
+   LEFT JOIN warehouse w ON inv.warehouse_id = w.id
+   WHERE NOT w.invalid
+   GROUP BY inv.parts_id
+
+   UNION ALL
+
+   SELECT p.id, 0 as sum
+   FROM parts p
+   WHERE p.id NOT IN ( SELECT distinct parts_id from inventory)
+     AND NOT p.obsolete
+     AND p.rop != 0
+ )
+
+ SELECT p.id
+ FROM parts p
+ LEFT JOIN available ava ON ava.parts_id = p.id
+ WHERE ( ava.sum < p.rop )
+   AND p.id NOT IN ( SELECT part_id FROM purchase_basket_items )
+   AND NOT p.obsolete
+ ORDER BY p.partnumber
+SQL
+  my @ids = selectall_array_query($::form, $::form->get_standard_dbh, $query);
+  return unless scalar @ids;
+  my $parts = SL::DB::Manager::Part->get_all( query => [ id => \@ids ] );
+  my $parts_to_order = [ grep { !$_->get_open_ordered_qty } @{$parts} ];
+  return $parts_to_order if !$ordered;
+  my $parts_ordered = [
+    map { $_->id } grep { $_->get_open_ordered_qty } @{$parts}
+  ];
+  return $parts_ordered if $ordered;
+};
+
+sub init_models {
+  my ($self) = @_;
+  my $parts1 = $self->_get_parts(1) || [];
+  my @parts = @{$parts1};
+  my $get_models =  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model => 'Part',
+    sorted => {
+      _default => {
+        by  => 'partnumber',
+        dir => 1,
+      },
+      partnumber  => $::locale->text('Part Number'),
+      description => $::locale->text('Description'),
+     },
+    query => [
+      (id => \@parts) x !!@parts,
+      (id => undef) x !@parts,
+    ],
+    paginated => {
+      form_params => [ qw(page per_page) ],
+      per_page    => 35,
+    }
+  );
+  return $get_models;
+}
+
+
+
+sub _setup_list_action_bar {
+  my ($self) = @_;
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Purchasebasket'),
+        submit  => [
+          '#form', { action => "DispositionManager/add_to_purchase_basket" } ],
+        tooltip => t8('Add to purchase basket'),
+      ],
+    );
+  }
+}
+
+sub _setup_show_basket_action_bar {
+  my ($self) = @_;
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Reload'),
+        link => $self->url_for(
+          controller => 'DispositionManager',
+          action     => 'show_basket',
+        ),
+      ],
+      action => [
+        t8('Action'),
+        call    => [ 'kivi.DispositionManager.create_purchase_order' ],
+        tooltip => t8('Create purchase order'),
+      ],
+      action => [
+        t8('Delete'),
+        call    => [ 'kivi.DispositionManager.delete_purchase_basket_items' ],
+        tooltip => t8('Delete selected from purchase basket'),
+      ],
+    );
+  }
+}
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::DispositionManager Controller to manage purchase orders for parts
+
+=head1 DESCRIPTION
+
+This controller shows a list of parts using the filter minimum stock (rop).
+From this list it is possible to put parts in a purchase basket to order.
+It's also possible to put parts from the parts edit form in the purchase basket.
+
+From the purchase basket you can create a purchase order by using the filter vendor.
+The quantity to order will be prefilled by the value min_qty_to_order from parts or
+makemodel(vendor_parts) or default to qty 1.
+
+Tables:
+
+=over 2
+
+=item purchase_basket
+
+=back
+
+Dependencies:
+
+=over 2
+
+=item parts
+
+=item makemodels
+
+
+=back
+
+=head1 URL ACTIONS
+
+=over 4
+
+=item C<action_list_parts>
+
+List the parts by the filter min stock (rop) and not in an open purchase order.
+
+=item C<action_add_to_purchase_basket>
+
+Adds one or more parts to the purchase basket.
+
+=item C<action_show_basket>
+
+Shows a list with parts which are in the basket.
+This list can be filtered by vendor. Then you can create a purchase order.
+When filtered by vendor, a table with the parts from the vendor of the purchase basket and
+a table with all parts from the vendor will be shown. From there you can mark
+the parts and create an order
+
+=item C<action_transfer_to_purchase_order>
+
+Transfers the marked and by vendor filtered parts to a purchase order.
+Deletes the entry in the purchase basket.
+
+=back
+
+=head1 BUGS
+
+None yet. :)
+
+=head1 AUTHOR
+
+W. Hahn E<lt>wh@futureworldsearch.netE<gt>
+
+=cut
diff --git a/SL/Controller/EmailJournal.pm b/SL/Controller/EmailJournal.pm
index 376dfb3d1..289427fb0 100644
--- a/SL/Controller/EmailJournal.pm
+++ b/SL/Controller/EmailJournal.pm
@@ -4,13 +4,34 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
+use SL::ZUGFeRD;
+use SL::Controller::ZUGFeRD;
 use SL::Controller::Helper::GetModels;
 use SL::DB::Employee;
 use SL::DB::EmailJournal;
 use SL::DB::EmailJournalAttachment;
+use SL::Presenter::EmailJournal;
+use SL::Presenter::Record qw(grouped_record_list);
+use SL::Presenter::Tag qw(html_tag div_tag button_tag);
 use SL::Helper::Flash;
-use SL::Locale::String;
-use SL::System::TaskServer;
+use SL::Locale::String qw(t8);
+
+use SL::DB::Order;
+use SL::DB::Order::TypeData;
+use SL::DB::DeliveryOrder;
+use SL::DB::DeliveryOrder::TypeData;
+use SL::DB::Reclamation;
+use SL::DB::Reclamation::TypeData;
+use SL::DB::Invoice;
+use SL::DB::Invoice::TypeData;
+use SL::DB::PurchaseInvoice;
+use SL::DB::PurchaseInvoice::TypeData;
+
+use SL::DB::Manager::Customer;
+use SL::DB::Manager::Vendor;
+
+use List::Util qw(first);
+use List::MoreUtils qw(any);
 
 use Rose::Object::MakeMethods::Generic
 (
@@ -19,6 +40,178 @@ use Rose::Object::MakeMethods::Generic
 );
 
 __PACKAGE__->run_before('add_stylesheet');
+__PACKAGE__->run_before('add_js');
+
+my %RECORD_TYPES_INFO = (
+  Order => {
+    controller => 'Order',
+    class      => 'Order',
+    types => SL::DB::Order::TypeData->valid_types(),
+  },
+  DeliveryOrder => {
+    controller => 'DeliveryOrder',
+    class      => 'DeliveryOrder',
+    types => SL::DB::DeliveryOrder::TypeData->valid_types(),
+  },
+  Reclamation => {
+    controller => 'Reclamation',
+    class      => 'Reclamation',
+    types => SL::DB::Reclamation::TypeData->valid_types(),
+  },
+  GlTransaction => {
+    controller => 'gl.pl',
+    class      => 'GLTransaction',
+    types => [
+      'gl_transaction',
+    ],
+  },
+  ArTransaction => {
+    controller => 'ar.pl',
+    class      => 'Invoice',
+    types => [
+      'ar_transaction',
+    ],
+  },
+  Invoice => {
+    controller => 'is.pl',
+    class      => 'Invoice',
+    types => SL::DB::Invoice::TypeData->valid_types(),
+  },
+  ApTransaction => {
+    controller => 'ap.pl',
+    class      => 'PurchaseInvoice',
+    types => [
+      'ap_transaction',
+    ],
+  },
+  PurchaseInvoice => {
+    controller => 'ir.pl',
+    class      => 'PurchaseInvoice',
+    types => SL::DB::PurchaseInvoice::TypeData->valid_types(),
+  },
+  GlRecordTemplate => {
+    controller => 'gl.pl',
+    class      => 'RecordTemplate',
+    types => [
+      'gl_transaction_template',
+    ],
+  },
+  ArRecordTemplate => {
+    controller => 'ar.pl',
+    class      => 'RecordTemplate',
+    types => [
+      'ar_transaction_template',
+    ],
+  },
+  ApRecordTemplate => {
+    controller => 'ap.pl',
+    class      => 'RecordTemplate',
+    types => [
+      'ap_transaction_template',
+    ],
+  },
+);
+my %RECORD_TYPE_TO_CONTROLLER =
+  map {
+    my $controller = $RECORD_TYPES_INFO{$_}->{controller};
+    map { $_ => $controller } @{ $RECORD_TYPES_INFO{$_}->{types} }
+  } keys %RECORD_TYPES_INFO;
+my %RECORD_TYPE_TO_MODEL =
+  map {
+    my $class = $RECORD_TYPES_INFO{$_}->{class};
+    map { $_ => "SL::DB::$class" } @{ $RECORD_TYPES_INFO{$_}->{types} }
+  } keys %RECORD_TYPES_INFO;
+my %RECORD_TYPE_TO_MANAGER =
+  map {
+    my $class = $RECORD_TYPES_INFO{$_}->{class};
+    map { $_ => "SL::DB::Manager::$class" } @{ $RECORD_TYPES_INFO{$_}->{types} }
+  } keys %RECORD_TYPES_INFO;
+my @ALL_RECORD_TYPES =
+  map { @{ $RECORD_TYPES_INFO{$_}->{types} } } keys %RECORD_TYPES_INFO;
+my %RECORD_TYPE_TO_NR_KEY =
+  map {
+    my $model = $RECORD_TYPE_TO_MODEL{$_};
+    if (any {$model eq $_} qw(SL::DB::Invoice SL::DB::PurchaseInvoice)) {
+      $_ => 'invnumber';
+    } elsif (any {$model eq $_} qw(SL::DB::RecordTemplate)) {
+      $_ => 'template_name';
+    } elsif (any {$model eq $_} qw(SL::DB::GLTransaction)) {
+      $_ => 'reference';
+    } else {
+      my $type_data = SL::DB::Helper::TypeDataProxy->new($model, $_);
+      $_ => $type_data->properties('nr_key');
+    }
+  } @ALL_RECORD_TYPES;
+
+# has do be done at runtime for translation to work
+sub get_record_types_with_info {
+  my @record_types_with_info = ();
+  for my $record_class (
+      'SL::DB::Order', 'SL::DB::DeliveryOrder', 'SL::DB::Reclamation',
+      'SL::DB::Invoice', 'SL::DB::PurchaseInvoice',
+    ) {
+    my $type_data = "${record_class}::TypeData";
+    my $valid_types = $type_data->valid_types();
+    for my $type (@$valid_types) {
+      push @record_types_with_info, {
+        record_type     => $type,
+        text            => $type_data->can('get3')->($type, 'text', 'type'),
+        customervendor  => $type_data->can('get3')->($type, 'properties', 'customervendor'),
+        workflow_needed => $type_data->can('get3')->($type, 'properties', 'worflow_needed'),
+        can_workflow    => (
+          any {
+            $_ ne 'delete' && $type_data->can('get3')->($type, 'show_menu', $_)
+          } keys %{$type_data->can('get')->($type, 'show_menu')}
+        ),
+      };
+    }
+  }
+  push @record_types_with_info, (
+    # transactions
+    # gl_transaction can be for vendor and customer
+    { record_type => 'gl_transaction', customervendor => 'customer', workflow_needed => 0, can_workflow => 1, text => t8('GL Transaction')},
+    { record_type => 'gl_transaction', customervendor => 'vendor',   workflow_needed => 0, can_workflow => 1, text => t8('GL Transaction')},
+    { record_type => 'ar_transaction', customervendor => 'customer', workflow_needed => 0, can_workflow => 1, text => t8('AR Transaction')},
+    { record_type => 'ap_transaction', customervendor => 'vendor',   workflow_needed => 0, can_workflow => 1, text => t8('AP Transaction')},
+    # templates
+    { record_type => 'gl_transaction_template', is_template => 1, customervendor => 'customer', workflow_needed => 0, can_workflow => 0, text => t8('GL Transaction')},
+    { record_type => 'gl_transaction_template', is_template => 1, customervendor => 'vendor',   workflow_needed => 0, can_workflow => 0, text => t8('GL Transaction')},
+    { record_type => 'ar_transaction_template', is_template => 1, customervendor => 'customer', workflow_needed => 0, can_workflow => 0, text => t8('AR Transaction')},
+    { record_type => 'ap_transaction_template', is_template => 1, customervendor => 'vendor',   workflow_needed => 0, can_workflow => 0, text => t8('AP Transaction')},
+  );
+  return @record_types_with_info;
+}
+
+# has do be done at runtime for translation to work
+sub get_record_types_to_text {
+  my @record_types_with_info = get_record_types_with_info();
+
+  my %record_types_to_text = ();
+  $record_types_to_text{$_->{record_type}} = $_->{text} for @record_types_with_info;
+  $record_types_to_text{'catch_all'} = t8("Catch-all");
+
+  return %record_types_to_text;
+}
+
+sub record_types_for_customer_vendor_type_and_action {
+  my ($self, $customer_vendor_type, $action) = @_;
+  return [
+    map { $_->{record_type} }
+    grep {
+      # No gl_transaction in standard workflows
+      # They can't be filtered by customer/vendor or open/closed and polute the list
+      ($_->{record_type} ne 'gl_transaction')
+    }
+    grep {
+      ($_->{customervendor} eq $customer_vendor_type)
+      && ($action eq 'workflow_record' ? $_->{can_workflow} : 1)
+      && ($action eq 'create_new'      ? $_->{workflow_needed} : 1)
+      && ($action eq 'linking_record'  ? !$_->{is_template} : 1)
+      && ($action eq 'template_record' ? $_->{is_template} : 1)
+    }
+    $self->get_record_types_with_info()
+  ];
+}
 
 #
 # actions
@@ -28,15 +221,22 @@ sub action_list {
   my ($self) = @_;
 
   $::auth->assert('email_journal');
+  # default filter
+  $::form->{filter} ||= {"obsolete:eq_ignore_empty" => 0};
 
   if ( $::instance_conf->get_email_journal == 0 ) {
     flash('info',  $::locale->text('Storing the emails in the journal is currently disabled in the client configuration.'));
   }
   $self->setup_list_action_bar;
+  my @record_types_with_info = $self->get_record_types_with_info();
+  my %record_types_to_text   = $self->get_record_types_to_text();
   $self->render('email_journal/list',
                 title   => $::locale->text('Email journal'),
                 ENTRIES => $self->models->get,
-                MODELS  => $self->models);
+                MODELS  => $self->models,
+                RECORD_TYPES_WITH_INFO => \@record_types_with_info,
+                RECORD_TYPES_TO_TEXT   => \%record_types_to_text,
+              );
 }
 
 sub action_show {
@@ -52,10 +252,86 @@ sub action_show {
     $::form->error(t8('You do not have permission to access this entry.'));
   }
 
+  my @record_types_with_info = $self->get_record_types_with_info();
+  my %record_types_to_text   = $self->get_record_types_to_text();
+
+  my $customer = $self->find_customer_vendor_from_email('customer', $self->entry);
+  my $vendor   = $self->find_customer_vendor_from_email('vendor'  , $self->entry);
+
+  my $record_type_info =
+    first {$_->{record_type} eq $self->entry->record_type}
+    @record_types_with_info;
+  my $cv_type_found = $record_type_info ? $record_type_info->{customervendor}
+                    : defined $vendor   ? 'vendor'
+                    : 'customer';
+
+  my $record_types = $self->record_types_for_customer_vendor_type_and_action(
+    $cv_type_found, 'workflow_record'
+  );
+
   $self->setup_show_action_bar;
-  $self->render('email_journal/show',
-                title   => $::locale->text('View sent email'),
-                back_to => $back_to);
+  $self->render(
+    'email_journal/show',
+    title                  => $::locale->text('View email'),
+    CUSTOMER               => $customer,
+    VENDOR                 => $vendor,
+    CV_TYPE_FOUND          => $cv_type_found,
+    RECORD_TYPES_WITH_INFO => \@record_types_with_info,
+    RECORD_TYPES_TO_TEXT   => \%record_types_to_text,
+    back_to  => $back_to,
+  );
+}
+
+sub action_attachment_preview {
+  my ($self) = @_;
+
+  eval {
+    $::auth->assert('email_journal');
+
+    my $attachment_id = $::form->{attachment_id};
+    die "no 'attachment_id' was given" unless $attachment_id;
+
+    my $attachment;
+    $attachment = SL::DB::EmailJournalAttachment->new(
+      id => $attachment_id,
+    )->load;
+
+
+    if (!$self->can_view_all
+        && $attachment->email_journal->sender_id
+        && ($attachment->email_journal->sender_id != SL::DB::Manager::Employee->current->id)) {
+      $::form->error(t8('You do not have permission to access this entry.'));
+    }
+
+    my $output = SL::Presenter::EmailJournal::attachment_preview(
+      $attachment,
+      style => "height: 1800px"
+    );
+
+    $self->render( \$output, { layout => 0, process => 0,});
+  } or do {
+    $self->render('generic/error', { layout => 0 }, label_error => $@);
+  };
+}
+
+sub action_show_attachment {
+  my ($self) = @_;
+
+  $::auth->assert('email_journal');
+
+  my $attachment_id      = $::form->{attachment_id};
+  my $attachment = SL::DB::EmailJournalAttachment->new(id => $attachment_id)->load;
+
+  if (!$self->can_view_all && ($attachment->email_journal->sender_id != SL::DB::Manager::Employee->current->id)) {
+    $::form->error(t8('You do not have permission to access this entry.'));
+  }
+
+  return $self->send_file(
+    \$attachment->content,
+    name => $attachment->name,
+    type => $attachment->mime_type,
+    content_disposition => 'inline',
+  );
 }
 
 sub action_download_attachment {
@@ -69,13 +345,188 @@ sub action_download_attachment {
     $::form->error(t8('You do not have permission to access this entry.'));
   }
   my $ref = \$attachment->content;
-  if ( $attachment->file_id > 0 ) {
+  # hot hot fix don't offer some random version of this file if we have a real saved state in the email journal
+  if (!$ref && $attachment->file_id > 0 ) {
     my $file = SL::File->get(id => $attachment->file_id );
     $ref = $file->get_content if $file;
   }
   $self->send_file($ref, name => $attachment->name, type => $attachment->mime_type);
 }
 
+sub action_apply_record_action {
+  my ($self) = @_;
+  my $email_journal_id   = $::form->{email_journal_id};
+  my $attachment_id      = $::form->{attachment_id};
+  my $customer_vendor    = $::form->{customer_vendor_selection};
+  my $customer_vendor_id = $::form->{"${customer_vendor}_id"};
+  my $action             = $::form->{action_selection};
+  my $record_id          = $::form->{"record_id"};
+  my $record_type        = $::form->{"record_type"};
+     $record_type      ||= $::form->{"${customer_vendor}_${action}_type_selection"};
+
+  die t8("No record is selected.")               unless $record_id || $action eq 'new_record';
+  die t8("No record type is selected.")          unless $record_type;
+  die "no 'email_journal_id' was given"          unless $email_journal_id;
+  die "no 'customer_vendor_selection' was given" unless $customer_vendor;
+  die "no 'action_selection' was given"          unless $action;
+
+  if ($action eq 'linking_record') {
+    return $self->link_and_add_attachment_to_record({
+        email_journal_id => $email_journal_id,
+        attachment_id    => $attachment_id,
+        record_type      => $record_type,
+        record_id        => $record_id,
+      });
+  }
+
+  my %additional_params = ();
+  if ($action eq 'new_record') {
+    $additional_params{action} = 'add_from_email_journal';
+    $additional_params{"${customer_vendor}_id"} = $customer_vendor_id;
+  } elsif ($action eq 'template_record') {
+    $additional_params{action} = 'load_record_template_from_email_journal';
+    $additional_params{id} = $record_id;
+    $additional_params{form_defaults} = {
+      email_journal_id    => $email_journal_id,
+      email_attachment_id => $attachment_id,
+      callback            => $::form->{back_to},
+    };
+  } else { # workflow_record
+    $additional_params{action} = 'edit_with_email_journal_workflow';
+    $additional_params{id} = $record_id;
+  }
+
+  $self->redirect_to(
+    controller          => $RECORD_TYPE_TO_CONTROLLER{$record_type},
+    type                => $record_type,
+    email_journal_id    => $email_journal_id,
+    email_attachment_id => $attachment_id,
+    callback            => $::form->{back_to},
+    %additional_params,
+  );
+}
+
+sub action_ap_transaction_template_with_zugferd_import {
+  my ($self) = @_;
+  my $email_journal_id = $::form->{email_journal_id};
+  die "no 'email_journal_id' was given" unless $email_journal_id;
+
+  my $record_id   = $::form->{"record_id"};
+  my $record_type = $::form->{"record_type"};
+  die "ZUGFeRD-Import only implemented for ap transaction templates" unless $record_type == 'ap_transaction';
+
+  my $attachment_id = $::form->{attachment_id};
+
+  my $form_defaults;
+  if ($attachment_id) {
+    my $attachment = SL::DB::EmailJournalAttachment->new(id => $attachment_id)->load();
+    my $content = $attachment->content; # scalar ref
+
+    if ($content =~ m/^%PDF|<\?xml/) {
+
+      my %res;
+      if ( $content =~ m/^%PDF/ ) {
+        %res = %{SL::ZUGFeRD->extract_from_pdf($content)};
+      } else {
+        %res = %{SL::ZUGFeRD->extract_from_xml($content)};
+      }
+
+      if ($res{'result'} == SL::ZUGFeRD::RES_OK()) {
+        my $ap_template = SL::DB::RecordTemplate->new(id => $record_id)->load();
+        my $vendor = $ap_template->vendor;
+
+        $form_defaults = SL::Controller::ZUGFeRD->build_ap_transaction_form_defaults(\%res, vendor => $vendor);
+        flash_later('info',
+          t8("The ZUGFeRD/Factur-X invoice '#1' has been loaded.", $attachment->name));
+      }
+    }
+  }
+
+  $form_defaults->{email_journal_id}    = $email_journal_id;
+  $form_defaults->{email_attachment_id} = $attachment_id;
+  $form_defaults->{callback}            = $::form->{back_to};
+
+  $self->redirect_to(
+    controller         => 'ap.pl',
+    action             => 'load_zugferd',
+    record_template_id => $record_id,
+    form_defaults      => $form_defaults,
+  );
+}
+
+sub action_update_attachment_preview {
+  my ($self) = @_;
+  $::auth->assert('email_journal');
+  my $attachment_id = $::form->{attachment_id};
+
+  my $attachment;
+  $attachment = SL::DB::EmailJournalAttachment->new(
+    id => $attachment_id,
+  )->load if $attachment_id;
+
+  $self->js
+    ->replaceWith('#attachment_preview',
+      SL::Presenter::EmailJournal::attachment_preview(
+        $attachment,
+        style => "height:1800px"
+      )
+    )
+    ->render();
+}
+
+sub action_update_record_list {
+  my ($self) = @_;
+  $::auth->assert('email_journal');
+  my $customer_vendor_type = $::form->{customer_vendor_selection};
+  my $customer_vendor_id   = $::form->{"${customer_vendor_type}_id"};
+  my $action               = $::form->{action_selection};
+  my $record_type          = $::form->{"${customer_vendor_type}_${action}_type_selection"};
+  my $record_number        = $::form->{record_number};
+  my $with_closed          = $::form->{with_closed};
+
+  $record_type ||= $self->record_types_for_customer_vendor_type_and_action($customer_vendor_type, $action);
+
+  my @records = $self->get_records_for_types(
+    $record_type,
+    customer_vendor_type => $customer_vendor_type,
+    customer_vendor_id   => $customer_vendor_id,
+    record_number        => $record_number,
+    with_closed          => $with_closed,
+  );
+
+  my $new_div = $self->get_records_div(\@records);
+
+  $self->js->replaceWith('#record_list', $new_div);
+  $self->js->hide('#record_toggle_closed') if scalar @records < 20;
+  $self->js->show('#record_toggle_open')   if scalar @records < 20;
+  $self->js->render();
+}
+
+sub action_toggle_obsolete {
+  my ($self) = @_;
+
+  $::auth->assert('email_journal');
+
+  $self->entry(SL::DB::EmailJournal->new(id => $::form->{id})->load);
+
+  if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Employee->current->id)) {
+    $::form->error(t8('You do not have permission to access this entry.'));
+  }
+
+  $self->entry->obsolete(!$self->entry->obsolete);
+  $self->entry->save;
+
+  $self->js
+  ->val('#obsolete', $self->entry->obsolete_as_bool_yn)
+  ->flash('info',
+    $self->entry->obsolete ?
+      $::locale->text('Email marked as obsolete.')
+    : $::locale->text('Email marked as not obsolete.')
+  )->render();
+
+  return;
+}
+
 #
 # filters
 #
@@ -88,6 +539,199 @@ sub add_stylesheet {
 # helpers
 #
 
+sub get_records_for_types {
+  my ($self, $record_types, %params) = @_;
+  $record_types = [ $record_types ] unless ref $record_types eq 'ARRAY';
+
+  my $cv_type       = $params{customer_vendor_type};
+  my $cv_id         = $params{customer_vendor_id};
+  my $record_number = $params{record_number};
+  my $with_closed   = $params{with_closed};
+
+  my @records = ();
+  foreach my $record_type (@$record_types) {
+    my $manager = $RECORD_TYPE_TO_MANAGER{$record_type};
+    my $model = $RECORD_TYPE_TO_MODEL{$record_type};
+    my %additional_where = ();
+    if ($cv_type && $cv_id && $record_type !~ /^gl_transaction/) {
+      $additional_where{"${cv_type}_id"} = $cv_id;
+    }
+    if ($record_number) {
+      my $nr_key = $RECORD_TYPE_TO_NR_KEY{$record_type};
+      $additional_where{$nr_key} = { ilike => "%$record_number%" };
+    }
+    unless ($with_closed) {
+      if (any {$_ eq 'closed'} $model->meta->columns) {
+        $additional_where{closed} = 0;
+      } elsif (any {$_ eq 'paid'} $model->meta->columns) {
+        $additional_where{amount} = { gt => \'paid' };
+      }
+    }
+    my $records_of_type = $manager->get_all(
+      where => [
+        $manager->type_filter($record_type),
+        %additional_where,
+      ],
+    );
+    push @records, @$records_of_type;
+  }
+
+  return @records;
+}
+
+sub get_records_div {
+  my ($self, $records) = @_;
+  my $div = div_tag(
+    grouped_record_list(
+      $records,
+      with_columns => [ qw(email_journal_action) ],
+    ),
+    id => 'record_list',
+  );
+  return $div;
+}
+
+sub link_and_add_attachment_to_record {
+ my ($self, $params) = @_;
+
+  my $email_journal_id = $params->{email_journal_id};
+  my $attachment_id    = $params->{attachment_id};
+  my $record_type      = $params->{record_type};
+  my $record_id        = $params->{record_id};
+
+  my $record_type_model = $RECORD_TYPE_TO_MODEL{$record_type};
+  my $record = $record_type_model->new(id => $record_id)->load;
+  my $email_journal = SL::DB::EmailJournal->new(id => $email_journal_id)->load;
+
+  if ($attachment_id) {
+    my $attachment = SL::DB::EmailJournalAttachment->new(id => $attachment_id)->load;
+    $attachment->add_file_to_record($record);
+  }
+
+  $email_journal->link_to_record($record);
+
+  $self->js->flash('info',
+    $::locale->text('Linked email and attachment to ') . $record->displayable_name
+  )->render();
+}
+
+sub find_customer_vendor_from_email {
+  my ($self, $cv_type, $email_journal) = @_;
+
+  my $manager = $cv_type eq 'customer' ? 'SL::DB::Manager::Customer'
+              : $cv_type eq 'vendor'   ? 'SL::DB::Manager::Vendor'
+              : die "No valid customer vendor option: $cv_type";
+
+  my $email_address = $email_journal->from;
+  $email_address =~ s/.*<(.*)>/$1/; # address can look like "name surname <email_address>"
+
+  # Separate query otherwise cv without contacts and shipto is not found
+  my $customer_vendor;
+  $customer_vendor ||= $manager->get_first(
+    where => [
+      or => [
+        email => $email_address,
+        cc    => $email_address,
+        bcc   => $email_address,
+      ],
+    ],
+  );
+  $customer_vendor ||= $manager->get_first(
+    where => [
+      or => [
+        'contacts.cp_email' => $email_address,
+        'contacts.cp_privatemail' => $email_address,
+      ],
+    ],
+    with_objects => [ 'contacts'],
+  );
+  $customer_vendor ||= $manager->get_first(
+    where => [
+      or => [
+        'shipto.shiptoemail' => $email_address,
+      ],
+    ],
+    with_objects => [ 'shipto' ],
+  );
+  if ($manager eq 'SL::DB::Manager::Customer') {
+    $customer_vendor ||= $manager->get_first(
+      where => [
+        or => [
+          'additional_billing_addresses.email' => $email_address,
+        ],
+      ],
+      with_objects => [ 'additional_billing_addresses' ],
+    );
+  }
+
+  # if no exact match is found search for domain and match only on one hit
+  unless ($customer_vendor) {
+    my $email_domain = $email_address;
+    $email_domain =~ s/.*@(.*)/$1/;
+    my @domain_hits_cusotmer_vendor = ();
+    my @domain_hits = ();
+    push @domain_hits, @{$manager->get_all(
+      where => [
+        or => [
+          email => {ilike => "%$email_domain"},
+          cc    => {ilike => "%$email_domain"},
+          bcc   => {ilike => "%$email_domain"},
+        ],
+      ],
+    )};
+    push @domain_hits, @{$manager->get_all(
+      where => [
+        or => [
+          'contacts.cp_email'       => {ilike => "%$email_domain"},
+          'contacts.cp_privatemail' => {ilike => "%$email_domain"},
+        ],
+      ],
+      with_objects => [ 'contacts'],
+    )};
+    push @domain_hits, @{$manager->get_all(
+      where => [
+        or => [
+          'shipto.shiptoemail' => {ilike => "%$email_domain"},
+        ],
+      ],
+      with_objects => [ 'shipto' ],
+    )};
+    push @domain_hits, @{$manager->get_all(
+      where => [
+        or => [
+          'shipto.shiptoemail' => {ilike => "%$email_domain"},
+        ],
+      ],
+      with_objects => [ 'shipto' ],
+    )};
+    if ($manager eq 'SL::DB::Manager::Customer') {
+      push @domain_hits, @{$manager->get_all(
+        where => [
+          or => [
+            'additional_billing_addresses.email' => {ilike => "%$email_domain"},
+          ],
+        ],
+        with_objects => [ 'additional_billing_addresses' ],
+      )};
+    }
+    # update on only one unique customer_vendor
+    if (scalar @domain_hits) {
+      my $first_customer_vendor = $domain_hits[0];
+      unless (any {$_->id != $first_customer_vendor->id} @domain_hits) {
+        $customer_vendor = $first_customer_vendor;
+      }
+    }
+  }
+
+  return $customer_vendor;
+}
+
+sub add_js {
+  $::request->{layout}->use_javascript("${_}.js") for qw(
+    kivi.EmailJournal
+    );
+}
+
 sub init_can_view_all { $::auth->assert('email_employee_readall', 1) }
 
 sub init_models {
@@ -108,6 +752,9 @@ sub init_models {
       sent_on         => t8('Sent on'),
       status          => t8('Status'),
       extended_status => t8('Extended status'),
+      record_type     => t8('Record Type'),
+      obsolete        => t8('Obsolete'),
+      linked_to       => t8('Linked to'),
     },
   );
 }
@@ -128,11 +775,22 @@ sub init_filter_summary {
                        @filters;
 
   my %status = (
-    failed  => $::locale->text('failed'),
-    ok      => $::locale->text('succeeded'),
+    send_failed     => $::locale->text('send failed'),
+    sent            => $::locale->text('sent'),
+    imported        => $::locale->text('imported'),
   );
   push @filter_strings, $status{ $filter->{'status:eq_ignore_empty'} } if $filter->{'status:eq_ignore_empty'};
 
+
+  my %record_type_to_text = $self->get_record_types_to_text();
+  push @filter_strings, $record_type_to_text{ $filter->{'record_type:eq_ignore_empty'} } if $filter->{'record_type:eq_ignore_empty'};
+
+  push @filter_strings, $::locale->text('Obsolete')     if $filter->{'obsolete:eq_ignore_empty'} eq '1';
+  push @filter_strings, $::locale->text('Not obsolete') if $filter->{'obsolete:eq_ignore_empty'} eq '0';
+
+  push @filter_strings, $::locale->text('Linked')       if $filter->{'linked_to:eq_ignore_empty'} eq '1';
+  push @filter_strings, $::locale->text('Not linked')   if $filter->{'linked_to:eq_ignore_empty'} eq '0';
+
   return join ', ', @filter_strings;
 }
 
diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index 8dacec241..3f5925a91 100644
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -55,27 +55,34 @@ __PACKAGE__->run_before('check_object_params', only => [ qw(list ajax_delete aja
 # model:  base name of the rose model
 # right:  access right used for import
 my %file_types = (
-  'sales_quotation'             => { gen => 1, gltype => '',   dir =>'SalesQuotation',       model => 'Order',          right => 'import_ar'  },
-  'sales_order'                 => { gen => 5, gltype => '',   dir =>'SalesOrder',           model => 'Order',          right => 'import_ar'  },
-  'sales_delivery_order'        => { gen => 1, gltype => '',   dir =>'SalesDeliveryOrder',   model => 'DeliveryOrder',  right => 'import_ar'  },
-  'invoice'                     => { gen => 1, gltype => 'ar', dir =>'SalesInvoice',         model => 'Invoice',        right => 'import_ar'  },
-  'invoice_for_advance_payment' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice',         model => 'Invoice',        right => 'import_ar'  },
-  'final_invoice'               => { gen => 1, gltype => 'ar', dir =>'SalesInvoice',         model => 'Invoice',        right => 'import_ar'  },
-  'credit_note'                 => { gen => 1, gltype => '',   dir =>'CreditNote',           model => 'Invoice',        right => 'import_ar'  },
-  'request_quotation'           => { gen => 7, gltype => '',   dir =>'RequestForQuotation',  model => 'Order',          right => 'import_ap'  },
-  'purchase_order'              => { gen => 7, gltype => '',   dir =>'PurchaseOrder',        model => 'Order',          right => 'import_ap'  },
-  'purchase_delivery_order'     => { gen => 7, gltype => '',   dir =>'PurchaseDeliveryOrder',model => 'DeliveryOrder',  right => 'import_ap'  },
-  'purchase_invoice'            => { gen => 6, gltype => 'ap', dir =>'PurchaseInvoice',      model => 'PurchaseInvoice',right => 'import_ap'  },
-  'vendor'                      => { gen => 0, gltype => '',   dir =>'Vendor',               model => 'Vendor',         right => 'xx'         },
-  'customer'                    => { gen => 1, gltype => '',   dir =>'Customer',             model => 'Customer',       right => 'xx'         },
-  'project'                     => { gen => 0, gltype => '',   dir =>'Project',              model => 'Project',        right => 'xx'         },
-  'part'                        => { gen => 0, gltype => '',   dir =>'Part',                 model => 'Part',           right => 'xx'         },
-  'gl_transaction'              => { gen => 6, gltype => 'gl', dir =>'GeneralLedger',        model => 'GLTransaction',  right => 'import_ap'  },
-  'draft'                       => { gen => 0, gltype => '',   dir =>'Draft',                model => 'Draft',          right => 'xx'         },
-  'csv_customer'                => { gen => 1, gltype => '',   dir =>'Reports',              model => 'Customer',       right => 'xx'         },
-  'csv_vendor'                  => { gen => 1, gltype => '',   dir =>'Reports',              model => 'Vendor',         right => 'xx'         },
-  'shop_image'                  => { gen => 0, gltype => '',   dir =>'ShopImages',           model => 'Part',           right => 'xx'         },
-  'letter'                      => { gen => 7, gltype => '',   dir =>'Letter',               model => 'Letter',         right => 'sales_letter_edit | purchase_letter_edit' },
+  'sales_quotation'             => { gen => 7, gltype => '',   dir =>'SalesQuotation',            model => 'Order',          right => 'import_ar'  },
+  'sales_order_intake'          => { gen => 7, gltype => '',   dir =>'SalesOrderIntake',          model => 'Order',          right => 'import_ar'  },
+  'sales_order'                 => { gen => 7, gltype => '',   dir =>'SalesOrder',                model => 'Order',          right => 'import_ar'  },
+  'sales_delivery_order'        => { gen => 7, gltype => '',   dir =>'SalesDeliveryOrder',        model => 'DeliveryOrder',  right => 'import_ar'  },
+  'sales_reclamation'           => { gen => 7, gltype => '',   dir =>'SalesReclamation',          model => 'Reclamation',    right => 'import_ar'  },
+  'invoice'                     => { gen => 7, gltype => 'ar', dir =>'SalesInvoice',              model => 'Invoice',        right => 'import_ar'  },
+  'invoice_for_advance_payment' => { gen => 7, gltype => 'ar', dir =>'SalesInvoice',              model => 'Invoice',        right => 'import_ar'  },
+  'final_invoice'               => { gen => 7, gltype => 'ar', dir =>'SalesInvoice',              model => 'Invoice',        right => 'import_ar'  },
+  'credit_note'                 => { gen => 7, gltype => '',   dir =>'CreditNote',                model => 'Invoice',        right => 'import_ar'  },
+  'request_quotation'           => { gen => 7, gltype => '',   dir =>'RequestForQuotation',       model => 'Order',          right => 'import_ap'  },
+  'purchase_quotation_intake'   => { gen => 7, gltype => '',   dir =>'PurchaseQuotationIntake',   model => 'Order',          right => 'import_ap'  },
+  'purchase_order'              => { gen => 7, gltype => '',   dir =>'PurchaseOrder',             model => 'Order',          right => 'import_ap'  },
+  'purchase_order_confirmation' => { gen => 7, gltype => '',   dir =>'PurchaseOrderConfirmation', model => 'Order',          right => 'import_ap'  },
+  'purchase_delivery_order'     => { gen => 7, gltype => '',   dir =>'PurchaseDeliveryOrder',     model => 'DeliveryOrder',  right => 'import_ap'  },
+  'purchase_reclamation'        => { gen => 7, gltype => '',   dir =>'PurchaseReclamation',       model => 'Reclamation',    right => 'import_ap'  },
+  'purchase_invoice'            => { gen => 7, gltype => 'ap', dir =>'PurchaseInvoice',           model => 'PurchaseInvoice',right => 'import_ap'  },
+  'supplier_delivery_order'     => { gen => 7, gltype => '',   dir =>'SupplierDeliveryOrder',     model => 'DeliveryOrder',  right => 'import_ap'  },
+  'rma_delivery_order'          => { gen => 7, gltype => '',   dir =>'RMADeliveryOrder',          model => 'DeliveryOrder',  right => 'import_ar'  },
+  'vendor'                      => { gen => 0, gltype => '',   dir =>'Vendor',                    model => 'Vendor',         right => 'xx'         },
+  'customer'                    => { gen => 1, gltype => '',   dir =>'Customer',                  model => 'Customer',       right => 'xx'         },
+  'project'                     => { gen => 0, gltype => '',   dir =>'Project',                   model => 'Project',        right => 'xx'         },
+  'part'                        => { gen => 0, gltype => '',   dir =>'Part',                      model => 'Part',           right => 'xx'         },
+  'gl_transaction'              => { gen => 6, gltype => 'gl', dir =>'GeneralLedger',             model => 'GLTransaction',  right => 'import_ap'  },
+  'draft'                       => { gen => 0, gltype => '',   dir =>'Draft',                     model => 'Draft',          right => 'xx'         },
+  'csv_customer'                => { gen => 1, gltype => '',   dir =>'Reports',                   model => 'Customer',       right => 'xx'         },
+  'csv_vendor'                  => { gen => 1, gltype => '',   dir =>'Reports',                   model => 'Vendor',         right => 'xx'         },
+  'shop_image'                  => { gen => 0, gltype => '',   dir =>'ShopImages',                model => 'Part',           right => 'xx'         },
+  'letter'                      => { gen => 7, gltype => '',   dir =>'Letter',                    model => 'Letter',         right => 'sales_letter_edit | purchase_letter_edit' },
 );
 
 #--- 4 locale ---#
@@ -150,8 +157,8 @@ sub action_ajax_unimport {
 
 sub action_ajax_rename {
   my ($self) = @_;
-  my ($id, $version) = split /_/, $::form->{id};
-  my $file = SL::File->get(id => $id);
+  my $guid = $::form->{id};
+  my $file = SL::File->get(guid => $guid);
   if ( ! $file ) {
     $self->js->flash('error', $::locale->text('File not exists !'))->render();
     return;
@@ -272,7 +279,7 @@ sub action_ajax_files_uploaded {
                                       );
 
         if ($existobj) {
-          push @existing, $existobj->id.'_'.$sfile->file_name;
+          push @existing, ($existobj->versions)[0]->file_version->guid.'_'.$sfile->file_name;
         } else {
           my $fileobj = SL::File->save(object_id        => $self->object_id,
                                        object_type      => $self->object_type,
@@ -386,16 +393,10 @@ sub _delete_all {
   my ($self, $do_unimport, $infotext) = @_;
   my $files = '';
   my $ids = $::form->{ids};
-  foreach my $id_version (@{ $::form->{$ids} || [] }) {
-    my ($id, $version) = split /_/, $id_version;
-    my $dbfile = SL::File->get(id => $id);
-    if ( $dbfile ) {
-      if ( $version ) {
-        $dbfile->version($version);
-        $files .= ' ' . $dbfile->file_name if $dbfile->delete_version;
-      } else {
-        $files .= ' ' . $dbfile->file_name if $dbfile->delete;
-      }
+  foreach my $version_guid (@{ $::form->{$ids} || [] }) {
+    my $dbfile = SL::File->get(guid => $version_guid);
+    if ($dbfile) {
+      $files .= ' ' . $dbfile->file_name if $dbfile->delete_file_version;
     }
   }
   $self->js->flash('info', $infotext . $files) if $files;
@@ -501,9 +502,9 @@ sub _mk_render {
       $self->js->html('#'.$self->file_type.'_list_'.$self->object_type, $output);
       if ( $self->existing && scalar(@{$self->existing}) > 0) {
         my $first = shift @{$self->existing};
-        my ($first_id, $sfile) = split('_', $first, 2);
-        my $file = SL::File->get(id => $first_id );
-        $self->js->run('kivi.File.askForRename', $first_id, $file->file_type, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
+        my ($first_guid, $sfile) = split('_', $first, 2);
+        my $file = SL::File->get(guid => $first_guid );
+        $self->js->run('kivi.File.askForRename', $first_guid, $file->file_type, $file->file_name, $sfile, join (',', @{$self->existing}), $self->is_global);
       }
       $self->js->render();
     } else {
@@ -628,7 +629,7 @@ sub _get_sources {
   return @sources;
 }
 
-# ignores all errros
+# ignores all errors
 # todo: cache thumbs?
 sub _create_thumbnail {
   my ($file, $size) = @_;
diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm
index f4f09ff09..7dfb9243d 100644
--- a/SL/Controller/FinancialControllingReport.pm
+++ b/SL/Controller/FinancialControllingReport.pm
@@ -16,7 +16,7 @@ use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(project_types models) ],
 );
 
-__PACKAGE__->run_before(sub { $::auth->assert('sales_order_edit'); });
+__PACKAGE__->run_before(sub { $::auth->assert('sales_financial_controlling'); });
 
 my %sort_columns = (
   ordnumber               => t8('Order'),
@@ -46,8 +46,9 @@ sub action_list {
 sub prepare_report {
   my ($self)      = @_;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Financial Controlling Report');
+  $self->{report}  = $report;
 
   my @columns     = qw(customer globalprojectnumber globalproject_type transaction_description ordnumber net_amount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p
                        billable_amount billable_amount_p other_amount);
@@ -277,12 +278,7 @@ sub link_to {
   if ($object->isa('SL::DB::Order')) {
     my $type = $object->type;
     my $id   = $object->id;
-
-    if ($::instance_conf->get_feature_experimental_order) {
-      return "controller.pl?action=Order/$action&type=$type&id=$id";
-    } else {
-      return "oe.pl?action=$action&type=$type&vc=customer&id=$id";
-    }
+    return "controller.pl?action=Order/$action&type=$type&id=$id";
   }
   if ($object->isa('SL::DB::Customer')) {
     my $id     = $object->id;
diff --git a/SL/Controller/FinancialOverview.pm b/SL/Controller/FinancialOverview.pm
index c0c7d183c..edfe33da4 100644
--- a/SL/Controller/FinancialOverview.pm
+++ b/SL/Controller/FinancialOverview.pm
@@ -41,7 +41,7 @@ sub prepare_report {
   my ($self)      = @_;
 
   $self->report(SL::ReportGenerator->new(\%::myconfig, $::form));
-
+  $self->report->{title} =t8('Financial Overview');
   my @columns = (qw(year quarter month), @{ $self->types });
 
   $self->number_columns([ grep { !m/^(?:month|year|quarter)$/ } @columns ]);
@@ -141,9 +141,9 @@ sub calculate_one_time_data {
       my $month                              = $object->transdate->month - 1;
       my $tdata                              = $self->data->{$type};
 
-      $tdata->{months}->[$month]            += $object->netamount;
-      $tdata->{quarters}->[int($month / 3)] += $object->netamount;
-      $tdata->{year}                        += $object->netamount;
+      $tdata->{months}->[$month]            += $object->netamount_base_currency;
+      $tdata->{quarters}->[int($month / 3)] += $object->netamount_base_currency;
+      $tdata->{year}                        += $object->netamount_base_currency;
     }
   }
 }
@@ -151,23 +151,52 @@ sub calculate_one_time_data {
 sub calculate_periodic_invoices {
   my ($self)     = @_;
 
+  my %billed_once_item_ids;
   my $start_date = DateTime->new(year => $self->year, month =>  1, day =>  1, time_zone => $::locale->get_local_time_zone);
   my $end_date   = DateTime->new(year => $self->year, month => 12, day => 31, time_zone => $::locale->get_local_time_zone);
 
-  $self->calculate_one_periodic_invoice(config => $_, start_date => $start_date, end_date => $end_date) for @{ $self->objects->{periodic_invoices_cfg} };
+  foreach my $config (@{ $self->objects->{periodic_invoices_cfg} }) {
+    $self->calculate_one_periodic_invoice(
+      config               => $config,
+      start_date           => $start_date,
+      end_date             => $end_date,
+      billed_once_item_ids => \%billed_once_item_ids,
+    );
+  }
 }
 
 sub calculate_one_periodic_invoice {
   my ($self, %params) = @_;
 
   # Calculate sales order advance
-  my $net  = $params{config}->order->netamount * $params{config}->get_billing_period_length / $params{config}->get_order_value_period_length;
   my $sord = $self->data->{sales_orders};
 
+  my ($net, $net_once) = (0, 0);
+
+  foreach my $item (@{ $params{config}->order->orderitems }) {
+    next if $item->recurring_billing_mode eq 'never';
+
+    my $item_net = $item->qty * (1 - $item->discount) * $item->sellprice;
+
+    if ($item->recurring_billing_mode eq 'once') {
+      next if $item->recurring_billing_invoice_id || $params{billed_once_invoice_id}->{$item->id};
+
+      $params{billed_once_invoice_id}->{$item->id} = 1;
+      $net_once                                   += $item_net;
+
+    } else {
+      $net += $item_net;
+    }
+  }
+
+  $net = $net * $params{config}->get_billing_period_length / $params{config}->get_order_value_period_length;
+
   foreach my $date ($params{config}->calculate_invoice_dates(start_date => $params{start_date}, end_date => $params{end_date}, past_dates => 1)) {
-    $sord->{months  }->[ $date->month   - 1 ] += $net;
-    $sord->{quarters}->[ $date->quarter - 1 ] += $net;
-    $sord->{year}                             += $net;
+    $sord->{months  }->[ $date->month   - 1 ] += $net + $net_once;
+    $sord->{quarters}->[ $date->quarter - 1 ] += $net + $net_once;
+    $sord->{year}                             += $net + $net_once;
+
+    $net_once = 0;
   }
 
   # Calculate total sales order value
diff --git a/SL/Controller/GenericPresenterTest.pm b/SL/Controller/GenericPresenterTest.pm
new file mode 100644
index 000000000..6599f6c28
--- /dev/null
+++ b/SL/Controller/GenericPresenterTest.pm
@@ -0,0 +1,27 @@
+package SL::Controller::GenericPresenterTest;
+
+use strict;
+
+use parent qw(SL::Controller::Base);
+
+sub action_show {
+  my ($self) = @_;
+
+  $self->render(
+    'presenter/test_page',
+    defaults => {
+      from_date => '1.2.2022',
+      to_date => '3.4.2022',
+      dialog => {
+          year => '2022',                 # numeric year
+          type => 'monthly',              # the radio button selection:
+                                          # 'yearly', 'monthly', 'quarterly'
+          quarter => 'B',                 # the quarter as a letter code:
+                                          # 'A', 'B', 'C', 'D' A being 1st quarter etc.
+          month => '6',                   # numeric month
+      }
+    }
+  );
+}
+
+1;
diff --git a/SL/Controller/Helper/ReportGenerator.pm b/SL/Controller/Helper/ReportGenerator.pm
index be9b8306d..becc19659 100644
--- a/SL/Controller/Helper/ReportGenerator.pm
+++ b/SL/Controller/Helper/ReportGenerator.pm
@@ -12,7 +12,9 @@ use SL::ReportGenerator;
 
 use Exporter 'import';
 our @EXPORT = qw(
-  action_report_generator_export_as_pdf action_report_generator_export_as_csv
+  action_report_generator_export_as_pdf
+  action_report_generator_export_as_csv
+  action_report_generator_export_as_chart
   action_report_generator_back report_generator_do
   report_generator_list_objects
 );
@@ -26,7 +28,7 @@ sub _setup_action_bar {
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        $type eq 'pdf' ? $::locale->text('PDF export') : $::locale->text('CSV export'),
+        $type eq 'pdf' ? $::locale->text('PDF export') : $type eq 'csv' ? $::locale->text('CSV export') : $::locale->text('Chart export'),
         submit => [ '#report_generator_form', { $key => "${value}report_generator_export_as_${type}" } ],
       ],
       action => [
@@ -92,6 +94,27 @@ sub action_report_generator_export_as_csv {
   print $::form->parse_html_template('report_generator/csv_export_options', { 'HIDDEN' => \@form_values });
 }
 
+sub action_report_generator_export_as_chart {
+  my ($self) = @_;
+
+  delete $::form->{action_report_generator_export_as_chart};
+
+  if ($::form->{report_generator_chart_options_set}) {
+    $self->report_generator_do('Chart');
+    return;
+  }
+
+  my $fields      = delete $::form->{report_generator_chart_fields};
+  my @form_values = $::form->flatten_variables(grep { ($_ ne 'login') && ($_ ne 'password') } keys %{ $::form });
+
+  $::form->{title} = $::locale->text('Chart export -- options');
+
+  _setup_action_bar($self, 'chart'); # Sub not exported, therefore don't call via object.
+
+  $::form->header;
+  print $::form->parse_html_template('report_generator/chart_export_options', { 'HIDDEN' => \@form_values, fields => $fields });
+}
+
 sub action_report_generator_back {
   $_[0]->report_generator_do('HTML');
 }
diff --git a/SL/Controller/ImageUpload.pm b/SL/Controller/ImageUpload.pm
index a2497f56b..4ecdbf4ad 100644
--- a/SL/Controller/ImageUpload.pm
+++ b/SL/Controller/ImageUpload.pm
@@ -20,7 +20,7 @@ my %object_loader = (
   sales_order     => [ "SL::DB::Order", [ sales => 1, quotation => 0 ] ],
   sales_quotation => [ "SL::DB::Order", [ sales => 1, quotation => 1 ] ],
   purchase_order  => [ "SL::DB::Order", [ sales => 0, quotation => 1 ] ],
-  sales_delivery_order => [ "SL::DB::DeliveryOrder", [ order_type => 'sales_delivery_order' ] ],
+  sales_delivery_order => [ "SL::DB::DeliveryOrder", [ record_type => 'sales_delivery_order' ] ],
 );
 
 
diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm
index a4c11f6a0..6940b2eb5 100644
--- a/SL/Controller/Inventory.pm
+++ b/SL/Controller/Inventory.pm
@@ -574,7 +574,7 @@ sub action_save_stocktaking {
         stocktaking_cutoff_date => $::form->{cutoff_date_as_date},
       });
       1;
-    } or do { $transfer_error = $EVAL_ERROR->error; }
+    } or do { $transfer_error = ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->error : $EVAL_ERROR; }
   });
 
   return $self->js->flash('error', $transfer_error)->render()
@@ -722,7 +722,7 @@ sub sanitize_target {
   my ($self) = @_;
 
   $self->warehouse($self->warehouses->[0])       if !$self->warehouse || !$self->warehouse->id;
-  $self->bin      ($self->warehouse->bins->[0])  if !$self->bin       || !$self->bin->id;
+  $self->bin      ($self->warehouse->bins_sorted_naturally->[0])  if !$self->bin       || !$self->bin->id;
 #  foreach my $warehouse ( $self->warehouses ) {
 #      $warehouse->{BINS} = [];
 #      foreach my $bin ( $self->bins ) {
@@ -768,7 +768,7 @@ sub build_warehouse_select {
 }
 
 sub build_bin_select {
-  select_tag('bin_id', [ $_[0]->warehouse->bins ],
+  select_tag('bin_id', $_[0]->warehouse->bins_sorted_naturally,
     title_key => 'description',
     default   => $_[0]->bin->id,
   );
@@ -812,7 +812,7 @@ grouped_ids as (
      from last_inventories
  group by trans_id
  order by max(itime)
-     desc limit 10
+     desc limit 20
 )
 select unnest(ids)
   from grouped_ids
@@ -867,8 +867,9 @@ sub prepare_stocktaking_report {
 
   my $callback    = $self->stocktaking_models->get_callback;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Stocktaking Journal');
+  $self->{report}  = $report;
 
   my @columns     = qw(itime employee ean partnumber part qty unit bin chargenumber comment cutoff_date);
   my @sortable    = qw(itime employee ean partnumber part qty bin chargenumber comment cutoff_date);
diff --git a/SL/Controller/Invoice.pm b/SL/Controller/Invoice.pm
new file mode 100644
index 000000000..58469a553
--- /dev/null
+++ b/SL/Controller/Invoice.pm
@@ -0,0 +1,160 @@
+package SL::Controller::Invoice;
+
+use strict;
+
+use parent qw(SL::Controller::Base);
+
+use Archive::Zip;
+use Params::Validate qw(:all);
+
+use SL::DB::File;
+use SL::DB::Invoice;
+use SL::DB::Employee;
+
+use SL::Webdav;
+use SL::File;
+use SL::Locale::String qw(t8);
+use SL::MoreCommon qw(listify);
+
+__PACKAGE__->run_before('check_auth');
+
+sub check_auth {
+  my ($self) = validate_pos(@_, { isa => 'SL::Controller::Invoice' }, 1);
+
+  return 1 if  $::auth->assert('ar_transactions', 1); # may edit all invoices
+  my @ids = listify($::form->{id});
+  $::auth->assert() unless has_rights_through_projects(\@ids);
+  return 1;
+}
+
+sub has_rights_through_projects {
+  my ($ids) = validate_pos(@_, {
+    type => ARRAYREF,
+  });
+  return 0 unless scalar @{$ids}; # creating new invoices isn't allowed without invoice_edit
+  my $current_employee = SL::DB::Manager::Employee->current;
+  my $id_placeholder = join(', ', ('?') x @{$ids});
+  # Count of ids where the use has no access to
+  my $query = <<SQL;
+  SELECT count(id) FROM ar
+  WHERE NOT EXISTS (
+    SELECT * from employee_project_invoices WHERE project_id = ar.globalproject_id and employee_id = ?
+  ) AND id IN ($id_placeholder)
+SQL
+  my ($no_access_count) = SL::DB->client->dbh->selectrow_array($query, undef, $current_employee->id, @{$ids});
+  return !$no_access_count;
+}
+
+sub action_webdav_pdf_export {
+  my ($self) = @_;
+  my $ids  = $::form->{id};
+
+  my $invoices = SL::DB::Manager::Invoice->get_all(where => [ id => $ids ]);
+
+  my @file_names_and_file_paths;
+  my @errors;
+  foreach my $invoice (@{$invoices}) {
+    my $record_type = $invoice->record_type;
+    $record_type = 'invoice' if $record_type eq 'ar_transaction';
+    $record_type = 'invoice' if $record_type eq 'invoice_storno';
+    my $webdav = SL::Webdav->new(
+      type     => $record_type,
+      number   => $invoice->record_number,
+    );
+    my @latest_object = $webdav->get_all_latest();
+    unless (scalar @latest_object) {
+      push @errors, t8(
+        "No Dokument found for record '#1'. Please deselect it or create a document it.",
+        $invoice->displayable_name()
+      );
+      next;
+    }
+    push @file_names_and_file_paths, {
+      file_name => $latest_object[0]->basename . "." . $latest_object[0]->extension,
+      file_path => $latest_object[0]->full_filedescriptor(),
+    }
+  }
+
+  if (scalar @errors) {
+    die join("\n", @errors);
+  }
+  $self->_create_and_send_zip(\@file_names_and_file_paths);
+}
+
+sub action_files_pdf_export {
+  my ($self) = @_;
+
+  my $ids  = $::form->{id};
+
+  my $invoices = SL::DB::Manager::Invoice->get_all(where => [ id => $ids ]);
+
+  my @file_names_and_file_paths;
+  my @errors;
+  foreach my $invoice (@{$invoices}) {
+    my $record_type = $invoice->record_type;
+    $record_type = 'invoice' if $record_type eq 'ar_transaction';
+    $record_type = 'invoice' if $record_type eq 'invoice_storno';
+    my @file_objects = SL::File->get_all(
+      object_type => $record_type,
+      object_id   => $invoice->id,
+      file_type   => 'document',
+      source      => 'created',
+    );
+
+    unless (scalar @file_objects) {
+      push @errors, t8(
+        "No Dokument found for record '#1'. Please deselect it or create a document it.",
+        $invoice->displayable_name()
+      );
+      next;
+    }
+    foreach my $file_object (@file_objects) {
+      eval {
+        push @file_names_and_file_paths, {
+          file_name => $file_object->file_name,
+          file_path => $file_object->get_file(),
+        };
+      } or do {
+        push @errors, $@,
+      };
+    }
+  }
+
+  if (scalar @errors) {
+    die join("\n", @errors);
+  }
+  $self->_create_and_send_zip(\@file_names_and_file_paths);
+}
+
+sub _create_and_send_zip {
+  my ($self, $file_names_and_file_paths) = validate_pos(@_,
+    { isa => 'SL::Controller::Invoice' },
+    {
+      type => ARRAYREF,
+      callbacks => {
+        "has 'file_name' and 'file_path'" => sub {
+          foreach my $file_entry (@{$_[0]}) {
+            return 0 unless defined $file_entry->{file_name}
+                         && defined $file_entry->{file_path};
+          }
+          return 1;
+        }
+      }
+    });
+
+  my ($fh, $zipfile) = File::Temp::tempfile();
+  my $zip = Archive::Zip->new();
+  foreach my $file (@{$file_names_and_file_paths}) {
+    $zip->addFile($file->{file_path}, $file->{file_name});
+  }
+  $zip->writeToFileHandle($fh) == Archive::Zip::AZ_OK() or die 'error writing zip file';
+  close($fh);
+
+  $self->send_file(
+    $zipfile,
+    name => t8('pdf_records.zip'), unlink => 1,
+    type => 'application/zip',
+  );
+}
+
+1;
diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 4faf452cf..f7397c46b 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -160,16 +160,6 @@ sub action_delete {
   $self->redirect_to(action => 'list');
 }
 
-sub action_delete_letter_drafts {
-  my ($self, %params) = @_;
-
-  my @ids =  grep { /^checked_(.*)/ && $::form->{$_} } keys %$::form;
-
-  SL::DB::Manager::LetterDraft->delete_all(query => [ ids => \@ids ]) if @ids;
-
-  $self->redirect_to(action => 'add');
-}
-
 sub action_list {
   my ($self, %params) = @_;
 
@@ -249,15 +239,15 @@ sub action_print_letter {
 
     # set some form defaults for printing webdav copy variables
     if ( $::form->{media} eq 'email') {
-      my $mail             = Mailer->new;
-      my $signature        = $::myconfig{signature};
-      $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
-      $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ path => $result{file_name},
-                                name => $params{email}->{attachment_filename} }];
-      $mail->{message}    .=  "\n-- \n$signature";
-      $mail->{message}     =~ s/\r//g;
-      $mail->{record_id}   =  $letter->id;
+      my $mail              = Mailer->new;
+      $mail->{$_}           = $params{email}->{$_} for qw(to cc subject message bcc);
+      $mail->{from}         = qq|"$::myconfig{name}" <$::myconfig{email}>|;
+      $mail->{attachments}  = [{ path => $result{file_name},
+                                 name => $params{email}->{attachment_filename} }];
+      $mail->{message}      =~ s/\r//g;
+      $mail->{message}     .=  $::form->create_email_signature();
+      $mail->{record_id}    =  $letter->id;
+      $mail->{content_type} = 'text/html';
       $mail->send;
       unlink $result{file_name};
 
@@ -310,6 +300,7 @@ sub action_delete_drafts {
   my @ids = @{ $::form->{ids} || [] };
   SL::DB::Manager::LetterDraft->delete_all(where => [ id => \@ids ]) if @ids;
 
+  flash('info', t8('Draft deleted'));
   $self->action_add(skip_drafts => 1);
 }
 
@@ -325,7 +316,7 @@ sub action_send_email {
 sub _display {
   my ($self, %params) = @_;
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter kivi.SalesPurchase kivi.File);
+  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Letter kivi.SalesPurchase kivi.File);
 
   my $letter = $self->letter;
 
@@ -370,8 +361,9 @@ sub _update {
 sub prepare_report {
   my ($self) = @_;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Letters');
+  $self->{report}  = $report;
 
   my @columns  = qw(date subject letternumber customer_id vendor_id contact date);
   my @sortable = qw(date subject letternumber customer_id vendor_id contact date);
@@ -609,7 +601,7 @@ sub setup_load_letter_draft_action_bar {
       ],
       action => [
         t8('Delete'),
-        submit  => [ '#form', { action => 'delete_drafts' } ],
+        submit  => [ '#form', { action => 'Letter/delete_drafts' } ],
         checks  => [ [ 'kivi.check_if_entries_selected', '[name="ids[+]"]' ] ],
         confirm => t8('Do you really want to delete this draft?'),
       ],
diff --git a/SL/Controller/LiquidityProjection.pm b/SL/Controller/LiquidityProjection.pm
index 1c18f3420..9f5137d36 100644
--- a/SL/Controller/LiquidityProjection.pm
+++ b/SL/Controller/LiquidityProjection.pm
@@ -11,8 +11,7 @@ use SL::Util qw(_hashify);
 __PACKAGE__->run_before('check_auth');
 
 use Rose::Object::MakeMethods::Generic (
-  scalar                  => [ qw(liquidity) ],
-  'scalar --get_set_init' => [ qw(oe_report_columns_str) ],
+  scalar => [ qw(liquidity) ],
 );
 
 
@@ -30,12 +29,28 @@ sub action_show {
     type              => 1,
     salesman          => 1,
     buchungsgruppe    => 1,
+    parts_group       => 1,
   };
 
   $self->setup_show_action_bar;
   $self->render('liquidity_projection/show', title => t8('Liquidity projection'));
 }
 
+sub action_list_orders {
+  my ($self) = @_;
+
+  my @orders = SL::LiquidityProjection->orders_for_time_period(
+    after  => $::form->{after}  ? DateTime->from_kivitendo($::form->{after})  : undef,
+    before => $::form->{before} ? DateTime->from_kivitendo($::form->{before}) : undef,
+  );
+
+  $self->render(
+    'liquidity_projection/list_orders',
+    title  => t8('Sales Orders'),
+    ORDERS => \@orders,
+  );
+}
+
 #
 # filters
 #
@@ -53,30 +68,25 @@ sub link_to_old_orders {
 
   my $reqdate = $params{reqdate};
   my $months  = $params{months} * 1;
+  my $today   = DateTime->today_local->truncate(to => 'month');
+  my %url_params;
 
   my $fields  = '';
 
   if ($reqdate eq 'old') {
-    $fields .= '&reqdate_unset_or_old=Y';
+    $url_params{before} = $today->to_kivitendo;
 
   } elsif ($reqdate eq 'future') {
-    my @now  = localtime;
-    $fields .= '&reqdatefrom=' . $self->iso_to_display(SL::LiquidityProjection::_the_date($now[5] + 1900, $now[4] + 1 + $months) . '-01');
+    $url_params{after} = $today->add(months => $months)->to_kivitendo;
 
   } else {
-    $reqdate =~ m/(\d+)-(\d+)/;
-    $fields .=  '&reqdatefrom=' . $self->iso_to_display($reqdate . '-01');
-    $fields .=  '&reqdateto='   . $self->iso_to_display($reqdate . sprintf('-%02d', DateTime->last_day_of_month(year => $1, month => $2)->day));
-
+    $reqdate            =~ m/(\d+)-(\d+)/;
+    my $date            = DateTime->new_local(year => $1, month => $2, day => 1);
+    $url_params{after}  = $date->to_kivitendo;
+    $url_params{before} = $date->add(months => 1)->to_kivitendo;
   }
 
-  return "oe.pl?action=orders&type=sales_order&vc=customer&" . $self->oe_report_columns_str . $fields;
-}
-
-sub iso_to_display {
-  my ($self, $date) = @_;
-
-  $::locale->reformat_date({ dateformat => 'yyyy-mm-dd' }, $date, $::myconfig{dateformat});
+  return $self->url_for(action => 'list_orders', %url_params);
 }
 
 sub setup_show_action_bar {
diff --git a/SL/Controller/ListTransactions.pm b/SL/Controller/ListTransactions.pm
new file mode 100644
index 000000000..87df44ce2
--- /dev/null
+++ b/SL/Controller/ListTransactions.pm
@@ -0,0 +1,573 @@
+package SL::Controller::ListTransactions;
+
+use strict;
+use parent qw(SL::Controller::Base);
+
+use POSIX qw(strftime);
+use List::Util qw(first);
+use Archive::Zip;
+
+use SL::DB::Chart;
+use SL::DB::AccTransaction;
+use SL::CA;
+
+use SL::ReportGenerator;
+use SL::Controller::Helper::ReportGenerator;
+use SL::Locale::String;
+use SL::SessionFile::Random;
+use SL::Helper::Flash qw(flash);
+use SL::Presenter::EscapedText qw(escape);
+
+use SL::Presenter::DatePeriod qw(get_dialog_defaults_from_report_generator
+                                  populate_hidden_variables);
+
+use Rose::Object::MakeMethods::Generic (
+  scalar                  => [ qw(defaults title account from_date to_date report_type report) ],
+  'scalar --get_set_init' => [ qw(accounts_list) ],
+);
+
+__PACKAGE__->run_before(sub { $::auth->assert('report'); });
+
+# actions
+
+sub action_report_settings {
+  my ($self) = @_;
+
+  $self->set_defaults;
+
+  # if we're coming from a linked entry we want to pre-select the chart picker
+  if ($::form->{link}) {
+    my $account = first { $_->{accno} eq $::form->{accno} } @{ $self->accounts_list };
+    $self->defaults->{chart_id} = $account->{chart_id};
+  }
+
+  $self->setup_report_settings_action_bar;
+  $self->render('list_transactions/report_settings',
+    title => t8('List Transactions'),
+    accounts_list => $self->accounts_list,
+    defaults => $self->defaults,
+  );
+}
+
+sub action_list {
+  my ($self) = @_;
+
+  $self->set_dates;
+
+  $self->report_type('HTML');
+
+  # set account number from chart picker chart_id
+  my $account = first { $_->{chart_id} eq $::form->{chart_id} } @{ $self->accounts_list };
+  if (!$account) {
+    flash('error', t8('No account selected. Please select an account.'));
+    return $self->action_report_settings;
+  }
+  $::form->{accno} = $account->{accno};
+
+  $self->set_title;
+
+  $self->setup_list_action_bar;
+  $self->prepare_report;
+  $self->set_report_data;
+  $self->report->generate_with_headers;
+}
+
+sub action_export_options_all_charts {
+  my ($self) = @_;
+
+  $self->set_dates;
+
+  # misusing the set_defaults function here a bit to easily
+  # get the values from the form,
+  # we have to get the values here because we have to forward them
+  # to the csv options form using a hidden array
+  $self->set_defaults;
+
+  $self->defaults->{fromdate} = $self->from_date;
+  $self->defaults->{todate} = $self->to_date;
+
+  # dialog state is returned in a nested hash, this has to be flattened here
+  my @hidden;
+  push @hidden, map {
+    { key => 'dateperiod_selected_preset_' . $_, value => $self->defaults->{dialog}->{$_} }
+  } keys %{ $self->defaults->{dialog} };
+  delete($self->defaults->{dialog});
+
+  # handle the rest of the state
+  push @hidden, map {
+    { key => $_, value => $self->defaults->{$_} }
+  } keys %{ $self->defaults };
+
+  if ($::form->{output_format} eq 'PDF') {
+    $self->setup_export_options_action_bar(output_format => 'PDF');
+    $self->render('report_generator/pdf_export_options',
+      title => t8('PDF export -- options'),
+      HIDDEN => \@hidden,
+    );
+  } else {
+    $self->setup_export_options_action_bar(output_format => 'CSV');
+    $self->render('report_generator/csv_export_options',
+      title => t8('CSV export -- options'),
+      HIDDEN => \@hidden,
+    );
+  }
+}
+
+sub action_export_all_charts {
+  my ($self) = @_;
+
+  my $output_format = $::form->{output_format} // 'CSV';
+
+  my $zip = Archive::Zip->new();
+
+  for my $account (@{ $self->accounts_list }) {
+    next if $account->{charttype} eq "H" || !defined($account->{balance});
+
+    $::form->{accno} = $account->{accno};
+
+    my $sfile = SL::SessionFile::Random->new(mode => "w");
+
+    $self->set_title;
+    $self->report_type($output_format);
+
+    $self->prepare_report;
+    $self->set_report_data;
+    if  ($output_format eq 'PDF') {
+      my $output = $self->report->generate_pdf_content(want_binary_pdf => 1);
+      $sfile->fh->print($output);
+    } else {
+      $self->report->_generate_csv_content($sfile->fh);
+    }
+    $sfile->fh->close;
+
+    # we need to sanitize the account number before using it in the filename
+    # to prevent unexpected outcomes due to slashes etc.
+    my $sanitized_accno = $account->{accno} =~ s/[^A-Za-z0-9\-\.\_\ ]/_/gr;
+
+    $zip->addFile(
+      $sfile->{file_name},
+      t8('list_of_transactions') . "_" . t8('account') . "_" . $sanitized_accno . ($output_format eq 'PDF' ? '.pdf' : '.csv')
+    );
+  }
+
+  my $zipfile = SL::SessionFile::Random->new(mode => "w");
+  unless ( $zip->writeToFileNamed($zipfile->file_name) == Archive::Zip::AZ_OK ) {
+    die 'zipfile write error';
+  }
+  $zipfile->fh->close;
+
+  $self->send_file(
+    $zipfile->file_name,
+    type => 'application/zip',
+    name => t8('list_of_transactions') . strftime('_%Y%m%d', localtime time) . '.zip',
+  );
+}
+
+# local functions
+
+sub set_defaults {
+  my ($self) = @_;
+
+  # use values from form, then report generator form, then fallback
+  my %fallback = (
+    #accno         => $self->accounts_list->[0]->{accno},
+    chart_id      => '',
+    reporttype    => 'custom',
+    year          => DateTime->today->year,
+    duetyp        => '13',
+    dateperiod_from_date => '',
+    dateperiod_to_date => '',
+    show_subtotals => 0,
+    sort          => 'transdate',
+  );
+  my %defaults;
+  for (keys %fallback) {
+    $defaults{$_} = $::form->{$_} // $::form->{'report_generator_hidden_' . $_} // $fallback{$_};
+  }
+
+  $defaults{dialog} = get_dialog_defaults_from_report_generator('dateperiod');
+
+  $self->defaults(\%defaults);
+}
+
+sub set_title {
+  my ($self) = @_;
+  my $account = first { $_->{accno} eq $::form->{accno} } @{ $self->accounts_list };
+  $self->title(escape(join(" ", t8('List Transactions'), t8('Account'), $account->{text})));
+}
+
+sub set_dates {
+  my ($self) = @_;
+
+  # set dates according to selection
+  $self->from_date($::form->{dateperiod_from_date});
+  $self->to_date($::form->{dateperiod_to_date});
+
+  # set this into form here for the CA-> routines
+  $::form->{fromdate} = $self->from_date;
+  $::form->{todate}   = $self->to_date;
+  # (no further checks needed, a reasonable error is shown when dates are invalid)
+}
+
+sub prepare_report {
+  my ($self) = @_;
+
+  $self->report(SL::ReportGenerator->new(\%::myconfig, $::form));
+
+  my @columns     = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);
+  my %column_defs = (
+    transdate   => { text => t8('Date'), },
+    reference   => { text => t8('Reference'), },
+    description => { text => t8('Description'), },
+    debit       => { text => t8('Debit'), },
+    credit      => { text => t8('Credit'), },
+    gegenkonto  => { text => t8('Gegenkonto'), },
+    ustkonto    => { text => t8('USt-Konto'), },
+    balance     => { text => t8('Balance'), },
+    ustrate     => { text => t8('Satz %'), },
+  );
+
+  $self->report->set_options(
+    std_column_visibility => 1,
+    controller_class      => 'ListTransactions',
+    output_format         => $self->report_type,
+    title                 => $self->title,
+    allow_pdf_export      => 1,
+    allow_csv_export      => 1,
+    allow_chart_export    => 0,
+    attachment_basename   => t8('list_of_transactions') . strftime('_%Y%m%d', localtime time),
+    top_info_text         => $self->get_top_info_text,
+  );
+  $self->report->set_columns(%column_defs);
+  $self->report->set_column_order(@columns);
+
+  my @hidden_variables = qw(accno chart_id show_subtotals sort);
+  populate_hidden_variables('dateperiod', \@hidden_variables);
+
+  $self->report->set_export_options(qw(list), @hidden_variables);
+  $self->report->set_options_from_form;
+  $self->report->set_sort_indicator($::form->{sort}, 1);
+  # this is getting triggered but doesn't seem to have an effect
+  #$::locale->set_numberformat_wo_thousands_separator(\%::myconfig) if lc($self->report->{options}->{output_format}) eq 'csv';
+}
+
+sub set_report_data {
+  my ($self) = @_;
+
+  CA->all_transactions(\%::myconfig, \%$::form);
+
+  # this data is used in custom header
+  $self->{eb_value} = $::form->{beginning_balance};
+  $self->{saldo_old} = $::form->{saldo_old} + $::form->{beginning_balance};
+  # "Jahresverkehrszahlen alt"
+  $self->{debit_old} = $::form->{old_balance_debit};
+  $self->{credit_old} = $::form->{old_balance_credit};
+
+  $self->set_report_custom_headers();
+
+  # initialise totals
+  $self->{total_debit} = 0.;
+  $self->{total_credit} = 0.;
+  my $subtotal_debit = 0.;
+  my $subtotal_credit = 0.;
+  $self->{balance} = $self->{saldo_old};
+
+  # used for subtotals below
+  my $sort_key = $::form->{sort};
+
+  my $idx = 0;
+  for my $tr (@{ $::form->{CA} }) {
+
+    # sum up totals
+    $self->{total_debit} += $tr->{debit};
+    $self->{total_credit} += $tr->{credit};
+    $subtotal_debit += $tr->{debit};
+    $subtotal_credit += $tr->{credit};
+    $self->{balance} -= $tr->{debit};
+    $self->{balance} += $tr->{credit};
+
+    # formatting
+    my $credit = $tr->{credit} ? $::form->format_amount(\%::myconfig, $tr->{credit}, 2) : '0';
+    my $debit = $tr->{debit} ? $::form->format_amount(\%::myconfig, $tr->{debit}, 2) : '0';
+    my $ustrate = '';
+    if ($tr->{ustrate}) {
+      # only format to decimal point when not zero (analog to previous behavior in ca.pl)
+      $ustrate = $tr->{ustrate} != 0 ? $::form->format_amount(\%::myconfig, $tr->{ustrate} * 100, 2) : '0';
+    }
+
+    my $gegenkonto_string = "";
+    foreach my $gegenkonto (@{ $tr->{GEGENKONTO} }) {
+      if ($gegenkonto_string eq "") {
+        $gegenkonto_string = $gegenkonto->{accno};
+      } else {
+        $gegenkonto_string .= ", " . $gegenkonto->{accno};
+      }
+    }
+
+    my $reference_link = "$tr->{module}.pl?action=edit&id=$tr->{id}";
+
+    my %data = (
+      transdate   => { data => $tr->{transdate}, },
+      reference   => { data => $tr->{reference}, link => $reference_link },
+      description => { data => $tr->{description}, },
+      gegenkonto  => { data => $gegenkonto_string, },
+      debit       => { data => $debit },
+      credit      => { data => $credit },
+      ustkonto    => { data => $tr->{ustkonto}, },
+      ustrate     => { data => $ustrate },
+      balance     => { data => $::form->format_amount(\%::myconfig, $self->{balance}, 2, 'DRCR') },
+    );
+    $data{$_}->{align} = 'right' for qw(debit credit ustkonto ustrate balance);
+    # use a row set here in order to keep the table coloring intact
+    my @row_set;
+    push @row_set, \%data;
+
+    # show subtotals if setting enabled and ( last element reached or
+    # next element has a different value in the field selected by sort key )
+    if ( ($::form->{show_subtotals}) &&
+      ( ($idx == scalar @{ $::form->{CA} } - 1) ||
+        ($tr->{$sort_key} ne $::form->{CA}->[$idx + 1]->{$sort_key}) ) ) {
+
+      my %data = map { $_ => { class => 'listtotal' } } keys %{ $self->report->{columns} };
+      $data{credit}->{data} = $::form->format_amount(\%::myconfig, $subtotal_credit, 2);
+      $data{debit}->{data} = $::form->format_amount(\%::myconfig, $subtotal_debit, 2);
+      $data{$_}->{align} = 'right' for qw(debit credit);
+      push @row_set, \%data;
+
+      $subtotal_credit = 0.;
+      $subtotal_debit = 0.;
+    }
+    $self->report->add_data(\@row_set);
+    $idx++;
+  }
+
+  # debit credit and balance totals line
+  my %data = map { $_ => { class => 'listtotal' } } keys %{ $self->report->{columns} };
+  $data{credit}->{data} = $::form->format_amount(\%::myconfig, $self->{total_credit}, 2);
+  $data{debit}->{data} = $::form->format_amount(\%::myconfig, $self->{total_debit}, 2);
+  $data{balance}->{data} = $::form->format_amount(\%::myconfig, $self->{balance}, 2, 'DRCR');
+  $data{$_}->{align} = 'right' for qw(debit credit balance);
+  $self->report->add_data(\%data);
+
+  # get data for the footer line from the CA->all_transactions request
+  $self->{saldo_new} = $::form->{saldo_new} + $::form->{beginning_balance};
+  # "Jahresverkehrszahlen neu"
+  $self->{debit_new} = $::form->{current_balance_debit};
+  $self->{credit_new} = $::form->{current_balance_credit};
+
+  $self->set_report_footer_lines();
+}
+
+sub set_report_footer_lines {
+  my ($self) = @_;
+  # line 1
+  my %data = map { $_ => { class => 'listtotal' } } keys %{ $self->report->{columns} };
+  $data{reference}->{data} = t8('EB-Wert');
+  $data{description}  = { data => t8('Saldo neu'), class => 'listtotal', colspan => 2 };
+  $data{debit}        = { data => t8('Jahresverkehrszahlen neu'), class => 'listtotal', colspan => 2 };
+  $self->report->add_data(\%data);
+
+  # line 2
+  my %data2 = map { $_ => { class => 'listtotal' } } keys %{ $self->report->{columns} };
+  $data2{reference}->{data} = format_debit_credit($self->{eb_value});
+  $data2{description} = { data => format_debit_credit($self->{saldo_new}), class => 'listtotal', colspan => 2 };
+  $data2{debit}->{data} = $::form->format_amount(\%::myconfig, abs($self->{debit_new}) , 2) . " S";
+  $data2{credit}->{data} = $::form->format_amount(\%::myconfig, $self->{credit_new}, 2) . " H";
+  $self->report->add_data(\%data2);
+}
+
+sub set_report_custom_headers {
+  my ($self) = @_;
+
+  my @custom_headers = ();
+  # line 1
+  push @custom_headers, [
+    { text => t8('Letzte Buchung'), },
+    { text => t8('EB-Wert'), },
+    { text => t8('Saldo alt'), 'colspan' => 2, },
+    { text => t8('Jahresverkehrszahlen alt'), 'colspan' => 2, },
+    { text => '', 'colspan' => 2, },
+  ];
+  push @custom_headers, [
+    { text => $::form->{last_transaction}, },
+    { text => format_debit_credit($self->{eb_value}), },
+    { text => format_debit_credit($self->{saldo_old}), 'colspan' => 2, },
+    { text => $::form->format_amount(\%::myconfig, abs($self->{debit_old}), 2) . " S", },
+    { text => $::form->format_amount(\%::myconfig, $self->{credit_old}, 2) . " H", },
+    { text => '', 'colspan' => 2, },
+  ];
+  # line 2
+  # sorting is selected with radio button
+  #my $link = "controller.pl?action=ListTransactions%2freport_settings&accno=$::form->{accno}&fromdate=$::form->{fromdate}&todate=$::form->{todate}&show_subtotals=$::form->{show_subtotals}";
+  push @custom_headers, [
+    { text => t8('Date'), }, # link => $link . "&sort=transdate", },
+    { text => t8('Reference'), }, #'link' => $link . "&sort=reference",  },
+    { text => t8('Description'), }, #'link' => $link . "&sort=description",  },
+    { text => t8('Gegenkonto'), },
+    { text => t8('Debit'), },
+    { text => t8('Credit'), },
+    { text => t8('USt-Konto'), },
+    { text => t8('Satz %'), },
+    { text => t8('Balance'), },
+  ];
+
+  $self->report->set_custom_headers(@custom_headers);
+}
+
+# action bar
+
+sub setup_report_settings_action_bar {
+  my ($self, %params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Show'),
+        submit    => [ '#report_settings', { action => 'ListTransactions/list' } ],
+        accesskey => 'enter',
+      ],
+      combobox => [
+        action => [
+          t8('Export'),
+        ],
+        action => [
+          t8('Export all accounts to CSV (ZIP file)'),
+          submit => [ '#report_settings', {
+            action => 'ListTransactions/export_options_all_charts',
+            output_format => 'CSV',
+          } ],
+        ],
+        action => [
+          t8('Export all accounts to PDF (ZIP file)'),
+          submit => [ '#report_settings', {
+            action => 'ListTransactions/export_options_all_charts',
+            output_format => 'PDF',
+          } ],
+        ],
+      ], # end of combobox "Export"
+    );
+  }
+}
+
+sub setup_export_options_action_bar {
+  my ($self, %params) = @_;
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Export'),
+        submit    => [ '#report_generator_form', {
+          action => 'ListTransactions/export_all_charts',
+          output_format => $params{output_format},
+        } ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Back'),
+        submit => [ '#report_generator_form', { action => 'ListTransactions/report_settings' } ],
+      ],
+    );
+  }
+}
+
+sub setup_list_action_bar {
+  my ($self, %params) = @_;
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Back'),
+        submit => [ '#report_generator_form', { action => 'ListTransactions/report_settings' } ],
+      ],
+    );
+  }
+}
+
+# helper
+
+sub get_top_info_text {
+  my ($self) = @_;
+  my @text;
+  if ($::form->{department}) {
+    my ($department) = split /--/, $::form->{department};
+    push @text, $::locale->text('Department') . " : $department";
+  }
+  if ($::form->{projectnumber}) {
+    push @text, $::locale->text('Project Number') . " : $::form->{projectnumber}<br>";
+  }
+  push @text, join " ", t8('Period:'), $::form->{fromdate}, t8('to'), $::form->{todate};
+  push @text, join " ", t8('Report date:'), $::locale->format_date_object(DateTime->now_local);
+  push @text, join " ", t8('Company:'), $::instance_conf->get_company;
+  join "\n", @text;
+}
+
+sub format_debit_credit {
+  my $dc = shift;
+  my $formatted_dc  = $::form->format_amount(\%::myconfig, abs($dc), 2) . ' ';
+  $formatted_dc    .= ($dc > 0) ? t8('Credit (one letter abbreviation)') : t8('Debit (one letter abbreviation)');
+  $formatted_dc;
+}
+
+sub init_accounts_list {
+  CA->all_accounts(\%::myconfig, \%$::form);
+  my @accounts_list = map { {
+    text => "$_->{accno} - $_->{description}",
+    accno => $_->{accno},
+    chart_id => $_->{id},
+    balance => $_->{amount},
+    charttype => $_->{charttype},
+  } } @{ $::form->{CA} };
+  \@accounts_list;
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::ListTransactions - Controller for the ListTransactions report
+
+=head1 SYNOPSIS
+
+New controller for Reports -> ListTransactions.
+
+This replaces the functions from bin/mozilla/ca.pl.
+
+The chart_of_accounts functionality is implemented separately in
+SL::Controller::ChartOfAccounts.
+
+=head1 DESCRIPTION / Key Features
+
+A form is shown to select the accounts and the date period, as well as
+options and the sorting of the report.
+
+At this point, exporting all accounts is possible via Export -> Export all
+accounts to CSV / PDF (ZIP file).
+
+This will export all accounts for the selected time period and options,
+and offer the resulting file for download.
+
+The date period selection makes use of a new presenter SL::Presenter::DatePeriod.
+
+If no date is selected all transactions are shown.
+
+The resulting report should be equivalent to the old behavior, except
+for the sorting, that has to be selected in advance now.
+
+=head1 CAVEATS / TODO
+
+Database queries are still from SL::CA.
+
+The database queries in SL::CA are quite sophisticated, therefore i'm still using
+these for now.
+
+=head1 BUGS
+
+None yet.
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+
+=cut
diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index faf2ffaac..79c031021 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -3,11 +3,12 @@ package SL::Controller::Order;
 use strict;
 use parent qw(SL::Controller::Base);
 
-use SL::Helper::Flash qw(flash_later);
+use SL::Helper::Flash qw(flash flash_later);
 use SL::HTML::Util;
 use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);
 use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
+use SL::IMAPClient;
 use SL::PriceSource;
 use SL::Webdav;
 use SL::File;
@@ -18,6 +19,7 @@ use SL::DB::AdditionalBillingAddress;
 use SL::DB::AuthUser;
 use SL::DB::History;
 use SL::DB::Order;
+use SL::DB::OrderItem;
 use SL::DB::Default;
 use SL::DB::Unit;
 use SL::DB::Part;
@@ -26,10 +28,19 @@ use SL::DB::PartsGroup;
 use SL::DB::Printer;
 use SL::DB::Note;
 use SL::DB::Language;
+use SL::DB::Reclamation;
 use SL::DB::RecordLink;
-use SL::DB::RequirementSpec;
 use SL::DB::Shipto;
 use SL::DB::Translation;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
+use SL::DB::Helper::RecordLink qw(set_record_link_conversions RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
+use SL::DB::Helper::TypeDataProxy;
+use SL::DB::Helper::Record qw(get_object_name_from_type get_class_from_type);
+use SL::Model::Record;
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Reclamation::TypeData qw(:types);
 
 use SL::Helper::CreatePDF qw(:all);
 use SL::Helper::PrintOptions;
@@ -37,12 +48,13 @@ use SL::Helper::ShippedQty;
 use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::Helper::UserPreferences::PositionsScrollbar;
 use SL::Helper::UserPreferences::UpdatePositions;
+use SL::Helper::UserPreferences::ItemInputPosition;
 
 use SL::Controller::Helper::GetModels;
 
 use List::Util qw(first sum0);
 use List::UtilsBy qw(sort_by uniq_by);
-use List::MoreUtils qw(any none pairwise first_index);
+use List::MoreUtils qw(uniq any none pairwise first_index);
 use English qw(-no_match_vars);
 use File::Spec;
 use Cwd;
@@ -51,23 +63,21 @@ use Sort::Naturally;
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(item_ids_to_delete is_custom_shipto_to_delete) ],
- 'scalar --get_set_init' => [ qw(order valid_types type cv p all_price_factors search_cvpartnumber show_update_button part_picker_classification_ids) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p all_price_factors
+                              search_cvpartnumber show_update_button
+                              part_picker_classification_ids
+                              is_final_version type_data) ],
 );
 
 
 # safety
-__PACKAGE__->run_before('check_auth');
+__PACKAGE__->run_before('check_auth',
+                        except => [ qw(close_quotations) ]);
 
 __PACKAGE__->run_before('check_auth_for_edit',
-                        except => [ qw(edit show_customer_vendor_details_dialog price_popup load_second_rows) ]);
-
-__PACKAGE__->run_before('recalc',
-                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_final_invoice save_and_ap_transaction
-                                     print send_email) ]);
-
-__PACKAGE__->run_before('get_unalterable_data',
-                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_final_invoice save_and_ap_transaction
-                                     print send_email) ]);
+                        except => [ qw(edit price_popup load_second_rows close_quotations) ]);
+__PACKAGE__->run_before('get_basket_info_from_from',
+                        except => [ qw(close_quotations) ]);
 
 #
 # actions
@@ -77,50 +87,104 @@ __PACKAGE__->run_before('get_unalterable_data',
 sub action_add {
   my ($self) = @_;
 
-  $self->order->transdate(DateTime->now_local());
-  my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval       :
-                   $self->type eq sales_order_type()     ? $::instance_conf->get_delivery_date_interval : 1;
+  $self->pre_render();
 
-  if (   ($self->type eq sales_order_type()     &&  $::instance_conf->get_deliverydate_on)
-      || ($self->type eq sales_quotation_type() &&  $::instance_conf->get_reqdate_on)
-      && (!$self->order->reqdate)) {
-    $self->order->reqdate(DateTime->today_local->next_workday(extra_days => $extra_days));
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
   }
 
-
-  $self->pre_render();
   $self->render(
     'order/form',
-    title => $self->get_title_for('add'),
+    title => $self->type_data->text('add'),
     %{$self->{template_args}}
   );
 }
 
+sub action_add_from_record {
+  my ($self) = @_;
+  my $from_type = $::form->{from_type};
+  my $from_id   = $::form->{from_id};
+
+  die "No 'from_type' was given." unless ($from_type);
+  die "No 'from_id' was given."   unless ($from_id);
+
+  my %flags = ();
+  if (defined($::form->{from_item_ids})) {
+    my %use_item = map { $_ => 1 } @{$::form->{from_item_ids}};
+    $flags{item_filter} = sub {
+      my ($item) = @_;
+      return %use_item{$item->{RECORD_ITEM_ID()}};
+    }
+  }
+
+  my $record = SL::Model::Record->get_record($from_type, $from_id);
+  my $order = SL::Model::Record->new_from_workflow($record, $self->type, %flags);
+  $self->order($order);
+
+  $self->reinit_after_new_order();
+
+  $self->action_add();
+}
+
+sub action_add_from_purchase_basket {
+  my ($self) = @_;
+
+  my $basket_item_ids = $::form->{basket_item_ids} || [];
+  my $vendor_item_ids = $::form->{vendor_item_ids} || [];
+  my $vendor_id       = $::form->{vendor_id};
+
+
+  unless (scalar @{ $basket_item_ids} || scalar @{ $vendor_item_ids}) {
+    $self->js->flash('error', t8('There are no items selected'));
+    return $self->js->render();
+  }
+
+  my $order = SL::DB::Order->create_from_purchase_basket(
+    $basket_item_ids, $vendor_item_ids, $vendor_id
+  );
+
+  $self->order($order);
+
+  $self->reinit_after_new_order();
+
+  $self->action_add();
+}
+
+sub action_add_from_email_journal {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+
+  $self->action_add();
+}
+
+sub action_edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  $self->action_edit();
+}
+
 # edit an existing order
 sub action_edit {
   my ($self) = @_;
+  die "No 'id' was given." unless $::form->{id};
 
-  if ($::form->{id}) {
-    $self->load_order;
-
-  } else {
-    # this is to edit an order from an unsaved order object
+  $self->load_order;
 
-    # set item ids to new fake id, to identify them as new items
-    foreach my $item (@{$self->order->items_sorted}) {
-      $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+  if ($self->order->is_sales && $::lx_office_conf{imap_client}->{enabled}) {
+    my $imap_client = SL::IMAPClient->new(%{$::lx_office_conf{imap_client}});
+    if ($imap_client) {
+      $imap_client->update_email_files_for_record(record => $self->order);
     }
-    # trigger rendering values for second row as hidden, because they
-    # are loaded only on demand. So we need to keep the values from
-    # the source.
-    $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
   }
 
-  $self->recalc();
   $self->pre_render();
   $self->render(
     'order/form',
-    title => $self->get_title_for('edit'),
+    title => $self->type_data->text('edit'),
     %{$self->{template_args}}
   );
 }
@@ -149,27 +213,26 @@ sub action_edit_collective {
 
   # make new order from given orders
   my @multi_orders = map { SL::DB::Order->new(id => $_)->load } @multi_ids;
-  $self->{converted_from_oe_id} = join ' ', map { $_->id } @multi_orders;
-  $self->order(SL::DB::Order->new_from_multi(\@multi_orders, sort_sources_by => 'transdate'));
+  my $target_type = SALES_ORDER_TYPE();
+  my $order = SL::Model::Record->new_from_workflow_multi(\@multi_orders, $target_type, sort_sources_by => 'transdate');
+  $self->order($order);
+  $self->reinit_after_new_order();
 
-  $self->action_edit();
+  $self->action_add();
 }
 
 # delete the order
 sub action_delete {
   my ($self) = @_;
 
-  my $errors = $self->delete();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  my $text = $self->type eq sales_order_type()       ? $::locale->text('The order has been deleted')
-           : $self->type eq purchase_order_type()    ? $::locale->text('The order has been deleted')
-           : $self->type eq sales_quotation_type()   ? $::locale->text('The quotation has been deleted')
-           : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been deleted')
+  SL::Model::Record->delete($self->order);
+  my $text = $self->type eq SALES_ORDER_INTAKE_TYPE()        ? $::locale->text('The order intake has been deleted')
+           : $self->type eq SALES_ORDER_TYPE()               ? $::locale->text('The order confirmation has been deleted')
+           : $self->type eq PURCHASE_ORDER_TYPE()            ? $::locale->text('The order has been deleted')
+           : $self->type eq PURCHASE_ORDER_CONFIRMATION_TYPE() ? $::locale->text('The order confirmation has been deleted')
+           : $self->type eq SALES_QUOTATION_TYPE()           ? $::locale->text('The quotation has been deleted')
+           : $self->type eq REQUEST_QUOTATION_TYPE()         ? $::locale->text('The rfq has been deleted')
+           : $self->type eq PURCHASE_QUOTATION_INTAKE_TYPE() ? $::locale->text('The quotation intake has been deleted')
            : '';
   flash_later('info', $text);
 
@@ -185,19 +248,9 @@ sub action_delete {
 sub action_save {
   my ($self) = @_;
 
-  my $errors = $self->save();
+  $self->save();
 
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  my $text = $self->type eq sales_order_type()       ? $::locale->text('The order has been saved')
-           : $self->type eq purchase_order_type()    ? $::locale->text('The order has been saved')
-           : $self->type eq sales_quotation_type()   ? $::locale->text('The quotation has been saved')
-           : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved')
-           : '';
-  flash_later('info', $text);
+  flash_later('info', $self->type_data->text('saved'));
 
   my @redirect_params;
   if ($::form->{back_to_caller}) {
@@ -216,7 +269,25 @@ sub action_save {
   $self->redirect_to(@redirect_params);
 }
 
-# save the order as new document an open it for edit
+# create new version and set version number
+sub action_add_subversion {
+  my ($self) = @_;
+
+  SL::DB->client->with_transaction(
+    sub {
+      SL::Model::Record->increment_subversion($self->order);
+      $self->save();
+      1;
+    }
+  );
+
+  $self->redirect_to(action => 'edit',
+                     type   => $self->type,
+                     id     => $self->order->id,
+  );
+}
+
+# save the order as new document and open it for edit
 sub action_save_as_new {
   my ($self) = @_;
 
@@ -227,48 +298,25 @@ sub action_save_as_new {
     return $self->js->render();
   }
 
-  # load order from db to check if values changed
   my $saved_order = SL::DB::Order->new(id => $order->id)->load;
 
-  my %new_attrs;
-  # Lets assign a new number if the user hasn't changed the previous one.
-  # If it has been changed manually then use it as-is.
-  $new_attrs{number}    = (trim($order->number) eq $saved_order->number)
-                        ? ''
-                        : trim($order->number);
-
-  # Clear transdate unless changed
-  $new_attrs{transdate} = ($order->transdate == $saved_order->transdate)
-                        ? DateTime->today_local
-                        : $order->transdate;
-
-  # Set new reqdate unless changed if it is enabled in client config
-  if ($order->reqdate == $saved_order->reqdate) {
-    my $extra_days = $self->type eq sales_quotation_type() ? $::instance_conf->get_reqdate_interval       :
-                     $self->type eq sales_order_type()     ? $::instance_conf->get_delivery_date_interval : 1;
-
-    if (   ($self->type eq sales_order_type()     &&  !$::instance_conf->get_deliverydate_on)
-        || ($self->type eq sales_quotation_type() &&  !$::instance_conf->get_reqdate_on)) {
-      $new_attrs{reqdate} = '';
-    } else {
-      $new_attrs{reqdate} = DateTime->today_local->next_workday(extra_days => $extra_days);
-    }
-  } else {
-    $new_attrs{reqdate} = $order->reqdate;
-  }
-
-  # Update employee
-  $new_attrs{employee}  = SL::DB::Manager::Employee->current;
+  # Create new record from current one
+  my $new_order = SL::Model::Record->clone_for_save_as_new($saved_order, $order);
+  $self->order($new_order);
 
   # Warn on obsolete items
-  my @obsolete_positions = map { $_->position } grep { $_->part->obsolete } @{ $order->items_sorted };
-  flash_later('warning', t8('This record containts obsolete items at position #1', join ', ', @obsolete_positions)) if @obsolete_positions;
+  my @obsolete_positions = map { $_->position } grep { $_->part->obsolete } @{ $self->order->items_sorted };
+  flash_later('warning', t8('This record contains obsolete items at position #1', join ', ', @obsolete_positions)) if @obsolete_positions;
 
-  # Create new record from current one
-  $self->order(SL::DB::Order->new_from($order, destination_type => $order->type, attributes => \%new_attrs));
+  # Warn on order locked items if they are not wanted for this record type
+  if ($self->type_data->no_order_locked_parts) {
+    my @order_locked_positions = map { $_->position } grep { $_->part->order_locked } @{ $self->order->items_sorted };
+    flash_later('warning', t8('This record contains not orderable items at position #1', join ', ', @order_locked_positions)) if @order_locked_positions;
+  }
 
-  # no linked records on save as new
-  delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids);
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
+  }
 
   # save
   $self->action_save();
@@ -282,12 +330,7 @@ sub action_save_as_new {
 sub action_print {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
+  $self->save();
 
   $self->js_reset_order_and_item_ids_after_save;
 
@@ -371,11 +414,7 @@ sub action_print {
 sub action_preview_pdf {
   my ($self) = @_;
 
-  my $errors = $self->save();
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
+  $self->save();
 
   $self->js_reset_order_and_item_ids_after_save;
 
@@ -429,39 +468,36 @@ sub action_preview_pdf {
 sub action_save_and_show_email_dialog {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
+  if (!$self->is_final_version) {
+    $self->save();
+    $self->js_reset_order_and_item_ids_after_save;
   }
 
-  $self->js_reset_order_and_item_ids_after_save;
-
-  my $cv_method = $self->cv;
+  my $cv = $self->order->customervendor
+    or return $self->js->flash('error',
+      $self->type_data->properties('is_customer') ?
+          t8('Cannot send E-mail without customer given')
+        : t8('Cannot send E-mail without vendor given')
+    )->render($self);
 
-  if (!$self->order->$cv_method) {
-    return $self->js->flash('error', $self->cv eq 'customer' ? t8('Cannot send E-mail without customer given') : t8('Cannot send E-mail without vendor given'))
-                    ->render($self);
-  }
+  my $form = Form->new;
+  $form->{$self->nr_key()}         = $self->order->number;
+  $form->{cusordnumber}            = $self->order->cusordnumber;
+  $form->{formname}                = $self->type;
+  $form->{type}                    = $self->type;
+  $form->{language}                = '_' . $self->order->language->template_code if $self->order->language;
+  $form->{language_id}             = $self->order->language->id                  if $self->order->language;
+  $form->{format}                  = 'pdf';
+  $form->{cp_id}                   = $self->order->contact->cp_id if $self->order->contact;
+  $form->{transaction_description} = $self->order->transaction_description;
 
   my $email_form;
-  $email_form->{to}   = $self->order->contact->cp_email if $self->order->contact;
-  $email_form->{to} ||= $self->order->$cv_method->email;
-  $email_form->{cc}   = $self->order->$cv_method->cc;
-  $email_form->{bcc}  = join ', ', grep $_, $self->order->$cv_method->bcc, SL::DB::Default->get->global_bcc;
+  $email_form->{to} =
+       ($self->order->contact ? $self->order->contact->cp_email : undef)
+    ||  $cv->email;
+  $email_form->{cc}  = $cv->cc;
+  $email_form->{bcc} = join ', ', grep $_, $cv->bcc;
   # Todo: get addresses from shipto, if any
-
-  my $form = Form->new;
-  $form->{$self->nr_key()}  = $self->order->number;
-  $form->{cusordnumber}     = $self->order->cusordnumber;
-  $form->{formname}         = $self->type;
-  $form->{type}             = $self->type;
-  $form->{language}         = '_' . $self->order->language->template_code if $self->order->language;
-  $form->{language_id}      = $self->order->language->id                  if $self->order->language;
-  $form->{format}           = 'pdf';
-  $form->{cp_id}            = $self->order->contact->cp_id if $self->order->contact;
-
   $email_form->{subject}             = $form->generate_email_subject();
   $email_form->{attachment_filename} = $form->generate_attachment_filename();
   $email_form->{message}             = $form->generate_email_body();
@@ -474,40 +510,56 @@ sub action_save_and_show_email_dialog {
     $user && !!trim($user->get_config_value('email'));
   } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) };
 
-
-  my $all_partner_email_addresses = $self->order->customervendor->get_all_email_addresses();
-
-  my $dialog_html = $self->render('common/_send_email_dialog', { output => 0 },
-                                  email_form    => $email_form,
-                                  show_bcc      => $::auth->assert('email_bcc', 'may fail'),
-                                  FILES         => \%files,
-                                  is_customer   => $self->cv eq 'customer',
-                                  ALL_EMPLOYEES => \@employees_with_email,
-                                  ALL_PARTNER_EMAIL_ADDRESSES => $all_partner_email_addresses,
+  my $dialog_html = $self->render(
+    'common/_send_email_dialog', { output => 0 },
+    email_form    => $email_form,
+    show_bcc      => $::auth->assert('email_bcc', 'may fail'),
+    FILES         => \%files,
+    is_customer   => $self->type_data->properties('is_customer'),
+    ALL_EMPLOYEES => \@employees_with_email,
+    ALL_PARTNER_EMAIL_ADDRESSES => $cv->get_all_email_addresses(),
+    is_final_version => $self->is_final_version,
   );
 
   $self->js
-      ->run('kivi.Order.show_email_dialog', $dialog_html)
-      ->reinit_widgets
-      ->render($self);
+    ->run('kivi.Order.show_email_dialog', $dialog_html)
+    ->reinit_widgets
+    ->render($self);
 }
 
 # send email
-#
-# Todo: handling error messages: flash is not displayed in dialog, but in the main form
 sub action_send_email {
   my ($self) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->run('kivi.Order.close_email_dialog');
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
+  if (!$self->is_final_version) {
+    eval {
+      $self->save();
+      1;
+    } or do {
+      $self->js->run('kivi.Order.close_email_dialog');
+      die $EVAL_ERROR;
+    };
   }
 
-  $self->js_reset_order_and_item_ids_after_save;
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->order->id,
+  );
 
+  # Set the error handler to reload the document and display errors later,
+  # because the document is already saved and saving can have some side effects
+  # such as generating a document number, project number or record links,
+  # which will be up to date when the document is reloaded.
+  # Hint: Do not use "die" here and try to catch exceptions in subroutine
+  # calls. You should use "$::form->error" which respects the error handler.
+  local $::form->{__ERROR_HANDLER} = sub {
+      flash_later('error', $_[0]);
+      $self->redirect_to(@redirect_params);
+      $::dispatcher->end_request;
+  };
+
+  # move $::form->{email_form} to $::form
   my $email_form  = delete $::form->{email_form};
 
   if ($email_form->{additional_to}) {
@@ -516,7 +568,6 @@ sub action_send_email {
   }
 
   my %field_names = (to => 'email');
-
   $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form };
 
   # for Form::cleanup which may be called in Form::send_email
@@ -531,25 +582,37 @@ sub action_send_email {
   # Is an old file version available?
   my $attfile;
   if ($::form->{attachment_policy} eq 'old_file') {
-    $attfile = SL::File->get_all(object_id     => $self->order->id,
-                                 object_type   => $self->type,
-                                 file_type     => 'document',
-                                 print_variant => $::form->{formname});
+    $attfile = SL::File->get_all(
+      object_id     => $self->order->id,
+      object_type   => $self->type,
+      print_variant => $::form->{formname},
+    );
+  }
+
+  if ($self->is_final_version && $::form->{attachment_policy} eq 'old_file' && !$attfile) {
+    $::form->error(t8('Re-sending a final version was requested, but the latest version of the document could not be found'));
   }
 
-  if ($::form->{attachment_policy} ne 'no_file' && !($::form->{attachment_policy} eq 'old_file' && $attfile)) {
+  if ( !$self->is_final_version
+    &&   $::form->{attachment_policy} ne 'no_file'
+    && !($::form->{attachment_policy} eq 'old_file' && $attfile)
+  ) {
     my $doc;
-    my @errors = $self->generate_doc(\$doc, {media      => $::form->{media},
-                                             format     => $::form->{print_options}->{format},
-                                             formname   => $::form->{print_options}->{formname},
-                                             language   => $self->order->language,
-                                             printer_id => $::form->{print_options}->{printer_id},
-                                             groupitems => $::form->{print_options}->{groupitems}});
+    my @errors = $self->generate_doc(\$doc, {
+        media      => $::form->{media},
+        format     => $::form->{print_options}->{format},
+        formname   => $::form->{print_options}->{formname},
+        language   => $self->order->language,
+        printer_id => $::form->{print_options}->{printer_id},
+        groupitems => $::form->{print_options}->{groupitems},
+      });
     if (scalar @errors) {
-      return $self->js->flash('error', t8('Generating the document failed: #1', $errors[0]))->render($self);
+      $::form->error(t8('Generating the document failed: #1', $errors[0]));
     }
 
-    my @warnings = $self->store_doc_to_webdav_and_filemanagement($doc, $::form->{attachment_filename}, $::form->{formname});
+    my @warnings = $self->store_doc_to_webdav_and_filemanagement(
+      $doc, $::form->{attachment_filename}, $::form->{formname}
+    );
     if (scalar @warnings) {
       flash_later('warning', $_) for @warnings;
     }
@@ -559,36 +622,53 @@ sub action_send_email {
     $sfile->fh->close;
 
     $::form->{tmpfile} = $sfile->file_name;
-    $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be called in Form::send_email
+    $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be
+                                           # called in Form::send_email
   }
 
-  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
+  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a
+                                    # linked record to the mail
   $::form->send_email(\%::myconfig, $::form->{print_options}->{format});
 
+  flash_later('info', t8('The email has been sent.'));
+  $self->save_history('MAILED');
+
   # internal notes unless no email journal
   unless ($::instance_conf->get_email_journal) {
     my $intnotes = $self->order->intnotes;
     $intnotes   .= "\n\n" if $self->order->intnotes;
-    $intnotes   .= t8('[email]')                                                                                        . "\n";
-    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
-    $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
-    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
-    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
-    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
+    $intnotes   .= t8('[email]')                                       . "\n";
+    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(
+                                               DateTime->now_local,
+                                               precision => 'seconds') . "\n";
+    $intnotes   .= t8('To (email)') . ": " . $::form->{email}          . "\n";
+    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}             . "\n"    if $::form->{cc};
+    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}            . "\n"    if $::form->{bcc};
+    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}        . "\n\n";
     $intnotes   .= t8('Message')    . ": " . SL::HTML::Util->strip($::form->{message});
 
     $self->order->update_attributes(intnotes => $intnotes);
   }
 
-  $self->save_history('MAILED');
-
-  flash_later('info', t8('The email has been sent.'));
+  if ($::instance_conf->get_lock_oe_subversions && !$self->is_final_version) {
+    my $file_id;
+    if ($::instance_conf->get_doc_storage && $::form->{attachment_policy} ne 'no_file') {
+      # self is generated on the fly. form is a file from the dms
+      # TODO: for the case Filesystem and Webdav we want the real file from the filesystem
+      #       for the nyi case DMS/CMIS we need a gloid or whatever the system offers (elo_id for ELO)
+      #       DMS kivi version should have a record_link to email_journal
+      #       the record link has to refer to the correct version -> helper table file <-> file_version
+      $file_id = $self->{file_id} || $::form->{file_id};
+      $::form->error("No file id") unless $file_id;
+    }
 
-  my @redirect_params = (
-    action => 'edit',
-    type   => $self->type,
-    id     => $self->order->id,
-  );
+    # email is sent -> set this version to final and link to journal and file
+    my $current_version = SL::DB::Manager::OrderVersion->get_all(where => [oe_id => $self->order->id, final_version => 0]);
+    $::form->error("Invalid version state") unless scalar @{ $current_version } == 1;
+    $current_version->[0]->update_attributes(file_id          => $file_id,
+                                             email_journal_id => $::form->{email_journal_id},
+                                             final_version    => 1);
+  }
 
   $self->redirect_to(@redirect_params);
 }
@@ -710,7 +790,7 @@ sub action_get_has_active_periodic_invoices {
   $config  ||= SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $::form->{id}) if $::form->{id};
 
   my $has_active_periodic_invoices =
-       $self->type eq sales_order_type()
+       $self->type eq SALES_ORDER_TYPE()
     && $config
     && $config->active
     && (!$config->end_date || ($config->end_date > DateTime->today_local))
@@ -719,24 +799,31 @@ sub action_get_has_active_periodic_invoices {
   $_[0]->render(\ !!$has_active_periodic_invoices, { type => 'text' });
 }
 
-# save the order and redirect to the frontend subroutine for a new
-# delivery order
-sub action_save_and_delivery_order {
+sub action_save_and_new_record {
   my ($self) = @_;
-
-  $self->save_and_redirect_to(
-    controller => 'oe.pl',
-    action     => 'oe_delivery_order_from_order',
-  );
-}
-
-sub action_save_and_supplier_delivery_order {
-  my ($self) = @_;
-
-  $self->save_and_redirect_to(
-    controller => 'controller.pl',
-    action     => 'DeliveryOrder/add_from_order',
-    type       => 'supplier_delivery_order',
+  my $to_type = $::form->{to_type};
+  my $to_controller = get_object_name_from_type($to_type);
+
+  $self->save();
+  flash_later('info', $self->type_data->text('saved'));
+
+  my %additional_params = ();
+  if ($::form->{only_selected_item_positions}) { # ids can be unset before save
+    my $item_positions = $::form->{selected_item_positions} || [];
+    my @from_item_ids = map { $self->order->items_sorted->[$_]->id } @$item_positions;
+    $additional_params{from_item_ids} = \@from_item_ids;
+  }
+
+  $self->redirect_to(
+    controller => $to_controller,
+    action     => 'add_from_record',
+    type       => $to_type,
+    from_id    => $self->order->id,
+    from_type  => $self->order->type,
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+    %additional_params,
   );
 }
 
@@ -748,6 +835,9 @@ sub action_save_and_invoice {
   $self->save_and_redirect_to(
     controller => 'oe.pl',
     action     => 'oe_invoice_from_order',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
   );
 }
 
@@ -758,6 +848,9 @@ sub action_save_and_invoice_for_advance_payment {
     controller       => 'oe.pl',
     action           => 'oe_invoice_from_order',
     new_invoice_type => 'invoice_for_advance_payment',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
   );
 }
 
@@ -768,27 +861,25 @@ sub action_save_and_final_invoice {
     controller       => 'oe.pl',
     action           => 'oe_invoice_from_order',
     new_invoice_type => 'final_invoice',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
   );
 }
 
-# workflow from sales order to sales quotation
-sub action_sales_quotation {
-  $_[0]->workflow_sales_or_request_for_quotation();
-}
-
-# workflow from sales order to sales quotation
-sub action_request_for_quotation {
-  $_[0]->workflow_sales_or_request_for_quotation();
-}
-
-# workflow from sales quotation to sales order
-sub action_sales_order {
-  $_[0]->workflow_sales_or_purchase_order();
-}
+# workflows to all types of this controller
+sub action_save_and_order_workflow {
+  my ($self) = @_;
 
-# workflow from rfq to purchase order
-sub action_purchase_order {
-  $_[0]->workflow_sales_or_purchase_order();
+  $self->save_and_redirect_to(
+    action     => 'order_workflow',
+    type       => $self->type,
+    to_type    => $::form->{to_type},
+    use_shipto => $::form->{use_shipto},
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+  );
 }
 
 # workflow from purchase order to ap transaction
@@ -798,16 +889,64 @@ sub action_save_and_ap_transaction {
   $self->save_and_redirect_to(
     controller => 'ap.pl',
     action     => 'add_from_purchase_order',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
   );
 }
 
+sub action_order_workflow {
+  my ($self) = @_;
+
+  $self->load_order;
+
+  my $destination_type = $::form->{to_type} ? $::form->{to_type} : '';
+
+  my $from_side        = $self->order->is_sales ? 'sales' : 'purchase';
+  my $to_side          = (any { $destination_type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), SALES_QUOTATION_TYPE())) ? 'sales' : 'purchase';
+
+  # check for direct delivery
+  # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
+  my $custom_shipto;
+  if (   $from_side eq 'sales' && $to_side eq 'purchase'
+      && $::form->{use_shipto} && $self->order->shipto) {
+    $custom_shipto = $self->order->shipto->clone('SL::DB::Order');
+  }
+
+  my $no_linked_records =    (any { $destination_type eq $_ } (SALES_QUOTATION_TYPE(), REQUEST_QUOTATION_TYPE()))
+                          && $from_side eq $to_side;
+
+  $self->order(SL::Model::Record->new_from_workflow($self->order, $destination_type, no_linked_records => $no_linked_records));
+
+  delete $::form->{id};
+
+  if (!$no_linked_records) {
+    $self->{converted_from_oe_id}         = $self->order->{ RECORD_ID()      };
+    $_   ->{converted_from_orderitems_id} = $_          ->{ RECORD_ITEM_ID() } for @{ $self->order->items_sorted };
+  }
+
+  if ($from_side eq 'sales' && $to_side eq 'purchase') {
+    if ($::form->{use_shipto}) {
+      $self->order->custom_shipto($custom_shipto) if $custom_shipto;
+    } else {
+      # remove any custom shipto if not wanted
+      $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
+    }
+  }
+
+  $self->reinit_after_new_order();
+
+  $self->action_add;
+}
+
 # set form elements in respect to a changed customer or vendor
 #
 # This action is called on an change of the customer/vendor picker.
 sub action_customer_vendor_changed {
   my ($self) = @_;
 
-  setup_order_from_cv($self->order);
+  $self->order(SL::Model::Record->update_after_customer_vendor_change($self->order));
+
   $self->recalc();
 
   my $cv_method = $self->cv;
@@ -852,45 +991,6 @@ sub action_customer_vendor_changed {
   $self->js->render();
 }
 
-# open the dialog for customer/vendor details
-sub action_show_customer_vendor_details_dialog {
-  my ($self) = @_;
-
-  my $is_customer = 'customer' eq $::form->{vc};
-  my $cv;
-  if ($is_customer) {
-    $cv = SL::DB::Customer->new(id => $::form->{vc_id})->load;
-  } else {
-    $cv = SL::DB::Vendor->new(id => $::form->{vc_id})->load;
-  }
-
-  my %details = map { $_ => $cv->$_ } @{$cv->meta->columns};
-  $details{discount_as_percent} = $cv->discount_as_percent;
-  $details{creditlimt}          = $cv->creditlimit_as_number;
-  $details{business}            = $cv->business->description      if $cv->business;
-  $details{language}            = $cv->language_obj->description  if $cv->language_obj;
-  $details{delivery_terms}      = $cv->delivery_term->description if $cv->delivery_term;
-  $details{payment_terms}       = $cv->payment->description       if $cv->payment;
-  $details{pricegroup}          = $cv->pricegroup->pricegroup     if $is_customer && $cv->pricegroup;
-
-  if ($is_customer) {
-    foreach my $entry (@{ $cv->additional_billing_addresses }) {
-      push @{ $details{ADDITIONAL_BILLING_ADDRESSES} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
-    }
-  }
-  foreach my $entry (@{ $cv->shipto }) {
-    push @{ $details{SHIPTO} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
-  }
-  foreach my $entry (@{ $cv->contacts }) {
-    push @{ $details{CONTACTS} }, { map { $_ => $entry->$_ } @{$entry->meta->columns} };
-  }
-
-  $_[0]->render('common/show_vc_details', { layout => 0 },
-                is_customer => $is_customer,
-                %details);
-
-}
-
 # called if a unit in an existing item row is changed
 sub action_unit_changed {
   my ($self) = @_;
@@ -922,13 +1022,16 @@ sub action_update_item_input_row {
 
   my $record       = $self->order;
   my $item         = SL::DB::OrderItem->new(%$form_attr);
+  $item->qty(1) if !$item->qty;
   $item->unit($item->part->unit);
 
-  my ($price_src, $discount_src) = get_best_price_and_discount_source($record, $item, 0);
+  my ($price_src, $discount_src) = SL::Model::Record->get_best_price_and_discount_source($record, $item, ignore_given => 0);
+
+  my $texts = get_part_texts($item->part, $record->language_id);
 
   $self->js
     ->val     ('#add_item_unit',                $item->unit)
-    ->val     ('#add_item_description',         $item->part->description)
+    ->val     ('#add_item_description',         $texts->{description})
     ->val     ('#add_item_sellprice_as_number', '')
     ->attr    ('#add_item_sellprice_as_number', 'placeholder', $price_src->price_as_number)
     ->attr    ('#add_item_sellprice_as_number', 'title',       $price_src->source_description)
@@ -968,7 +1071,7 @@ sub action_add_item {
       ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
   } else {
     $self->js
-      ->append('#row_table_id', $row_as_html);
+      ->before('#row_table_footer', $row_as_html);
   }
 
   if ( $item->part->is_assortment ) {
@@ -998,7 +1101,7 @@ sub action_add_item {
           ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
       } else {
         $self->js
-          ->append('#row_table_id', $row_as_html);
+          ->before('#row_table_footer', $row_as_html);
       }
     };
   };
@@ -1007,12 +1110,19 @@ sub action_add_item {
     ->val('.add_item_input', '')
     ->attr('.add_item_input', 'placeholder', '')
     ->attr('.add_item_input', 'title', '')
+    ->attr('#add_item_qty_as_number', 'placeholder', '1')
     ->run('kivi.Order.init_row_handlers')
     ->run('kivi.Order.renumber_positions')
     ->focus('#add_item_parts_id_name');
 
   $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id};
 
+  # alternate scroll behaviour if item input below positions and unlimited scroll height
+  $self->js->run('kivi.Order.scroll_page_after_row_insert', $item_id)
+    if 0 == SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height
+    && SL::Helper::UserPreferences::ItemInputPosition->new()->get_order_item_input_position
+       // $::instance_conf->get_order_item_input_position;
+
   $self->js_redisplay_amounts_and_taxes;
   $self->js->render();
 }
@@ -1173,31 +1283,25 @@ sub action_create_part {
 sub action_return_from_create_part {
   my ($self) = @_;
 
-  $self->{created_part} = SL::DB::Part->new(id => delete $::form->{new_parts_id})->load if $::form->{new_parts_id};
+  $self->{created_part} = SL::DB::Part->new(
+    id => delete $::form->{new_parts_id}
+  )->load if $::form->{new_parts_id};
 
   $::auth->restore_form_from_session(delete $::form->{previousform});
 
-  # set item ids to new fake id, to identify them as new items
-  foreach my $item (@{$self->order->items_sorted}) {
-    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
-
-  $self->recalc();
-  $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row/longdescription as hidden,
-  # because they are loaded only on demand. So we need to keep the values
-  # from the source.
-  $_->{render_second_row}      = 1 for @{ $self->order->items_sorted };
-  $_->{render_longdescription} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
+  $self->order($self->init_order);
+  $self->reinit_after_new_order();
 
+  if ($self->order->id) {
+    $self->pre_render();
+    $self->render(
+      'order/form',
+      title => $self->type_data->text('edit'),
+      %{$self->{template_args}}
+    );
+  } else {
+    $self->action_add;
+  }
 }
 
 # load the second row for one or more items
@@ -1233,8 +1337,7 @@ sub action_update_row_from_master_data {
     $item->description($texts->{description});
     $item->longdescription($texts->{longdescription});
 
-    my ($price_src, $discount_src) = get_best_price_and_discount_source($self->order, $item, 1);
-
+    my ($price_src, $discount_src) = SL::Model::Record->get_best_price_and_discount_source($self->order, $item, ignore_given => 1);
     $item->sellprice($price_src->price);
     $item->active_price_source($price_src);
     $item->discount($discount_src->discount);
@@ -1265,23 +1368,8 @@ sub action_update_row_from_master_data {
 sub action_save_phone_note {
   my ($self) = @_;
 
-  if (!$::form->{phone_note}->{subject} || !$::form->{phone_note}->{body}) {
-    return $self->js->flash('error', t8('Phone note needs a subject and a body.'))->render;
-  }
-
-  my $phone_note;
-  if ($::form->{phone_note}->{id}) {
-    $phone_note = first { $_->id == $::form->{phone_note}->{id} } @{$self->order->phone_notes};
-    return $self->js->flash('error', t8('Phone note not found for this order.'))->render if !$phone_note;
-  }
-
-  $phone_note = SL::DB::Note->new() if !$phone_note;
-  my $is_new  = !$phone_note->id;
-
-  $phone_note->assign_attributes(%{ $::form->{phone_note} },
-                                 trans_id     => $self->order->id,
-                                 trans_module => 'oe',
-                                 employee     => SL::DB::Manager::Employee->current);
+  my $phone_note = $self->parse_phone_note;
+  my $is_new     = !$phone_note->id;
 
   $phone_note->save;
   $self->order(SL::DB::Order->new(id => $self->order->id)->load);
@@ -1292,6 +1380,7 @@ sub action_save_phone_note {
     ->replaceWith('#phone-notes', $tab_as_html)
     ->html('#num_phone_notes', (scalar @{$self->order->phone_notes}) ? ' (' . scalar @{$self->order->phone_notes} . ')' : '')
     ->flash('info', $is_new ? t8('Phone note has been created.') : t8('Phone note has been updated.'))
+    ->reinit_widgets
     ->render;
 }
 
@@ -1311,9 +1400,86 @@ sub action_delete_phone_note {
     ->replaceWith('#phone-notes', $tab_as_html)
     ->html('#num_phone_notes', (scalar @{$self->order->phone_notes}) ? ' (' . scalar @{$self->order->phone_notes} . ')' : '')
     ->flash('info', t8('Phone note has been deleted.'))
+    ->reinit_widgets
     ->render;
 }
 
+sub action_close_quotations {
+  my ($self) = @_;
+
+  my @redirect_params = $::form->{callback} ? ($::form->{callback})
+                                            : (controller => 'LoginScreen', action => 'user_login');
+
+  if (!$::form->{ids} || !@{$::form->{ids}}) {
+    flash_later('info', t8('Nothing selected!'));
+    $self->redirect_to(@redirect_params);
+    $::dispatcher->end_request;
+  }
+
+  my $sales_quotations   = SL::DB::Manager::Order->get_all(where => [id            => $::form->{ids},
+                                                                     or             => [closed => 0, closed => undef],
+                                                                     record_type    => SALES_QUOTATION_TYPE()]);
+
+  my $request_quotations = SL::DB::Manager::Order->get_all(where => [id            => $::form->{ids},
+                                                                     or             => [closed => 0, closed => undef],
+                                                                     record_type    => REQUEST_QUOTATION_TYPE()]);
+
+  $::auth->assert('sales_quotation_edit')   if scalar @$sales_quotations;
+  $::auth->assert('request_quotation_edit') if scalar @$request_quotations;
+
+  my $employee_id = SL::DB::Manager::Employee->current->id;
+  SL::DB->client->with_transaction(sub {
+    SL::DB::Manager::Order->update_all(set   => {closed => 1},
+                                       where => [id => $::form->{ids}]);
+
+    foreach my $quotation (@$sales_quotations, @$request_quotations) {
+      SL::DB::History->new(
+        trans_id    => $quotation->id,
+        employee_id => $employee_id,
+        what_done   => $quotation->type,
+        snumbers    => 'quonumber_' . $quotation->number,
+        addition    => 'SAVED',
+      )->save;
+    }
+
+    1;
+  }) || do {
+    $::form->error(t8('Closing the selected quotations failed: #1', SL::DB->client->error));
+  };
+
+  flash_later('info', t8('The selected quotations where closed.'));
+  $self->redirect_to(@redirect_params);
+}
+
+sub action_show_conversion_to_purchase_delivery_order_item_selection {
+  my ($self) = @_;
+
+  my $items = $self->order->items_sorted;
+
+  if (@$items) {
+    my @part_ids          = uniq map { $_->{parts_id} } @$items;
+    my %parts_by_id       = map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => \@part_ids ]) };
+    my %make_models_by_id = map { ($_->parts_id => $_->model) } @{
+      SL::DB::Manager::MakeModel->get_all(
+        where => [
+          parts_id => \@part_ids,
+          make     => $::form->{order}->{vendor_id},
+        ])
+    };
+
+    foreach my $item (@$items) {
+      $item->{partnumber}        = $parts_by_id{ $item->{parts_id} }->partnumber;
+      $item->{vendor_partnumber} = $make_models_by_id{ $item->{parts_id} };
+    }
+  }
+
+  $self->render(
+    'order/tabs/_purchase_delivery_order_item_selection',
+    { layout => 0 },
+    ITEMS => $items,
+  );
+}
+
 sub js_load_second_row {
   my ($self, $item, $item_id, $do_parse) = @_;
 
@@ -1410,7 +1576,8 @@ sub js_reset_order_and_item_ids_after_save {
 
   $self->js
     ->val('#id', $self->order->id)
-    ->val('#converted_from_oe_id', '')
+    ->val('#converted_from_record_type_ref', '')
+    ->val('#converted_from_record_id',  '')
     ->val('#order_' . $self->nr_key(), $self->order->number);
 
   my $idx = 0;
@@ -1424,7 +1591,9 @@ sub js_reset_order_and_item_ids_after_save {
   } continue {
     $idx++;
   }
-  $self->js->val('[name="converted_from_orderitems_ids[+]"]', '');
+  $self->js->val('[name="converted_from_record_item_type_refs[+]"]', '');
+  $self->js->val('[name="converted_from_record_item_ids[+]"]', '');
+  $self->js->val('[name="basket_item_ids[+]"]', '');
 }
 
 #
@@ -1432,27 +1601,24 @@ sub js_reset_order_and_item_ids_after_save {
 #
 
 sub init_valid_types {
-  [ sales_order_type(), purchase_order_type(), sales_quotation_type(), request_quotation_type() ];
+  $_[0]->type_data->valid_types;
 }
 
 sub init_type {
   my ($self) = @_;
 
-  if (none { $::form->{type} eq $_ } @{$self->valid_types}) {
+  my $type = $self->order->record_type;
+  if (none { $type eq $_ } @{$self->valid_types}) {
     die "Not a valid type for order";
   }
 
-  $self->type($::form->{type});
+  $self->type($type);
 }
 
 sub init_cv {
   my ($self) = @_;
 
-  my $cv = (any { $self->type eq $_ } (sales_order_type(),    sales_quotation_type()))   ? 'customer'
-         : (any { $self->type eq $_ } (purchase_order_type(), request_quotation_type())) ? 'vendor'
-         : die "Not a valid type for order";
-
-  return $cv;
+  return $self->type_data->properties('customervendor');
 }
 
 sub init_search_cvpartnumber {
@@ -1486,31 +1652,33 @@ sub init_all_price_factors {
 
 sub init_part_picker_classification_ids {
   my ($self)    = @_;
-  my $attribute = 'used_for_' . ($self->type =~ m{sales} ? 'sale' : 'purchase');
 
-  return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(where => [ $attribute => 1 ]) } ];
+  return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(
+    where => $self->type_data->part_classification_query()) } ];
+}
+
+sub init_is_final_version {
+  # VALID States for current Sales Version
+  # 1. save create version without email_id             -> open
+  # 2. send email set email_id for version 1            -> final
+  # 3. save and subversion new version without email_id -> open
+  # 4. send email set email_id for current subversion   -> final
+  # for all versions > 1 set postfix -2 .. -n for recordnumber
+  return $::instance_conf->get_lock_oe_subversions    ?  # conf enabled
+         $_[0]->order->id                             ?  # is saved
+         $_[0]->order->is_final_version               :  # is final
+         undef                                        :  # is not final
+         undef;                                          # conf disabled
 }
 
 sub check_auth {
   my ($self) = @_;
-
-  my $right_for = { map { $_ => $_.'_edit' . ' | ' . $_.'_view' } @{$self->valid_types} };
-
-  my $right   = $right_for->{ $self->type };
-  $right    ||= 'DOES_NOT_EXIST';
-
-  $::auth->assert($right);
+  $::auth->assert($self->type_data->rights('view'));
 }
 
 sub check_auth_for_edit {
   my ($self) = @_;
-
-  my $right_for = { map { $_ => $_.'_edit' } @{$self->valid_types} };
-
-  my $right   = $right_for->{ $self->type };
-  $right    ||= 'DOES_NOT_EXIST';
-
-  $::auth->assert($right);
+  $::auth->assert($self->type_data->rights('edit'));
 }
 
 # build the selection box for contacts
@@ -1593,7 +1761,13 @@ sub build_tax_rows {
 
   my $rows_as_html;
   foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {
-    $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);
+    $rows_as_html .= $self->p->render(
+      'order/tabs/_tax_row',
+      SELF => $self,
+      TAX => $tax,
+      TAXINCLUDED => $self->order->taxincluded,
+      QUOTATION => $self->order->quotation
+    );
   }
   return $rows_as_html;
 }
@@ -1627,9 +1801,7 @@ sub load_order {
 
   $self->order(SL::DB::Order->new(id => $::form->{id})->load);
 
-  # Add an empty custom shipto to the order, so that the dialog can render the cvar inputs.
-  # You need a custom shipto object to call cvars_by_config to get the cvars.
-  $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => [])) if !$self->order->custom_shipto;
+  $self->reinit_after_new_order();
 
   return $self->order;
 }
@@ -1647,27 +1819,53 @@ sub make_order {
   # be retrieved via items until the order is saved. Adding empty items to new
   # order here solves this problem.
   my $order;
-  $order   = SL::DB::Order->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
-  $order ||= SL::DB::Order->new(orderitems  => [],
-                                quotation   => (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type())),
-                                currency_id => $::instance_conf->get_currency_id(),);
+  if ($::form->{id}) {
+    $order   = SL::DB::Order->new(
+      id => $::form->{id}
+    )->load(
+      with => [
+        'orderitems',
+        'orderitems.part',
+      ]
+    );
+  } else {
+    $order = SL::DB::Order->new(
+      orderitems  => [],
+      record_type => $::form->{type},
+      currency_id => $::instance_conf->get_currency_id(),
+    );
+    $order = SL::Model::Record->update_after_new($order)
+  }
 
-  my $cv_id_method = $self->cv . '_id';
+  my $cv_id_method = $order->type_data->properties('customervendor'). '_id';
   if (!$::form->{id} && $::form->{$cv_id_method}) {
     $order->$cv_id_method($::form->{$cv_id_method});
-    setup_order_from_cv($order);
+    $order = SL::Model::Record->update_after_customer_vendor_change($order);
   }
 
-  my $form_orderitems                  = delete $::form->{order}->{orderitems};
-  my $form_periodic_invoices_config    = delete $::form->{order}->{periodic_invoices_config};
+  # don't assign hashes as objects
+  my $form_orderitems               = delete $::form->{order}->{orderitems};
+  my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config};
 
   $order->assign_attributes(%{$::form->{order}});
 
+  # restore form values
+  $::form->{order}->{orderitems}               = $form_orderitems;
+  $::form->{order}->{periodic_invoices_config} = $form_periodic_invoices_config;
+
   $self->setup_custom_shipto_from_form($order, $::form);
 
-  if (my $periodic_invoices_config_attrs = $form_periodic_invoices_config ? SL::YAML::Load($form_periodic_invoices_config) : undef) {
-    my $periodic_invoices_config = $order->periodic_invoices_config || $order->periodic_invoices_config(SL::DB::PeriodicInvoicesConfig->new);
-    $periodic_invoices_config->assign_attributes(%$periodic_invoices_config_attrs);
+  if (
+    my $periodic_invoices_config_attrs = $form_periodic_invoices_config ?
+        SL::YAML::Load($form_periodic_invoices_config)
+      : undef
+  ) {
+    my $periodic_invoices_config =
+         $order->periodic_invoices_config
+      || $order->periodic_invoices_config(SL::DB::PeriodicInvoicesConfig->new);
+    $periodic_invoices_config->assign_attributes(
+      %$periodic_invoices_config_attrs
+    );
   }
 
   # remove deleted items
@@ -1741,17 +1939,19 @@ sub new_item {
   $item->qty(1.0)                   if !$item->qty;
   $item->unit($item->part->unit)    if !$item->unit;
 
-  my ($price_src, $discount_src) = get_best_price_and_discount_source($record, $item, 0);
+  my ($price_src, $discount_src) = SL::Model::Record->get_best_price_and_discount_source($record, $item, ignore_given => 0);
+
+  my $texts = get_part_texts($item->part, $record->language_id);
 
   my %new_attr;
-  $new_attr{description}            = $item->part->description     if ! $item->description;
+  $new_attr{description}            = $texts->{description}        if ! $item->description;
   $new_attr{qty}                    = 1.0                          if ! $item->qty;
   $new_attr{price_factor_id}        = $item->part->price_factor_id if ! $item->price_factor_id;
   $new_attr{sellprice}              = $price_src->price;
   $new_attr{discount}               = $discount_src->discount;
   $new_attr{active_price_source}    = $price_src;
   $new_attr{active_discount_source} = $discount_src;
-  $new_attr{longdescription}        = $item->part->notes           if ! defined $attr->{longdescription};
+  $new_attr{longdescription}        = $texts->{longdescription}    if ! defined $attr->{longdescription};
   $new_attr{project_id}             = $record->globalproject_id;
   $new_attr{lastcost}               = $record->is_sales ? $item->part->lastcost : 0;
 
@@ -1760,29 +1960,22 @@ sub new_item {
   # saved. Adding empty custom_variables to new orderitem here solves this problem.
   $new_attr{custom_variables} = [];
 
-  my $texts = get_part_texts($item->part, $record->language_id, description => $new_attr{description}, longdescription => $new_attr{longdescription});
-
-  $item->assign_attributes(%new_attr, %{ $texts });
+  $item->assign_attributes(%new_attr);
 
   return $item;
 }
 
-sub setup_order_from_cv {
-  my ($order) = @_;
-
-  $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id currency_id language_id));
-
-  $order->intnotes($order->customervendor->notes);
-
-  return if !$order->is_sales;
-
-  $order->salesman_id($order->customer->salesman_id || SL::DB::Manager::Employee->current->id);
-  $order->taxincluded(defined($order->customer->taxincluded_checked)
-                      ? $order->customer->taxincluded_checked
-                      : $::myconfig{taxincluded_checked});
+sub get_basket_info_from_from {
+  my ($self) = @_;
 
-  my $address = $order->customer->default_billing_address;;
-  $order->billing_address_id($address ? $address->id : undef);
+  my $order = $self->order;
+  my $basket_item_ids = $::form->{basket_item_ids};
+  if (scalar @{ $basket_item_ids || [] }) {
+    for my $idx (0 .. $#{ $order->items_sorted }) {
+      my $order_item = $order->items_sorted->[$idx];
+      $order_item->{basket_item_id} = $basket_item_ids->[$idx];
+    }
+  }
 }
 
 # setup custom shipto from form
@@ -1799,7 +1992,11 @@ sub setup_custom_shipto_from_form {
   if ($order->shipto) {
     $self->is_custom_shipto_to_delete(1);
   } else {
-    my $custom_shipto = $order->custom_shipto || $order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
+    my $custom_shipto =
+       $order->custom_shipto
+    || $order->custom_shipto(
+         SL::DB::Shipto->new(module => 'OE', custom_variables => [])
+       );
 
     my $shipto_cvars  = {map { my ($key) = m{^shiptocvar_(.+)}; $key => delete $form->{$_}} grep { m{^shiptocvar_} } keys %$form};
     my $shipto_attrs  = {map {                                  $_   => delete $form->{$_}} grep { m{^shipto}      } keys %$form};
@@ -1844,28 +2041,48 @@ sub get_unalterable_data {
   }
 }
 
-# delete the order
+# parse new or updated phone note
 #
-# And remove related files in the spool directory
-sub delete {
+# And put them into the order object.
+sub parse_phone_note {
   my ($self) = @_;
 
-  my $errors = [];
-  my $db     = $self->order->db;
+  if (!$::form->{phone_note}->{subject} || !$::form->{phone_note}->{body}) {
+    die t8('Phone note needs a subject and a body.');
+  }
 
-  $db->with_transaction(
-    sub {
-      my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $self->order->id ]) };
-      $self->order->delete;
-      my $spool = $::lx_office_conf{paths}->{spool};
-      unlink map { "$spool/$_" } @spoolfiles if $spool;
+  my $phone_note;
+  if ($::form->{phone_note}->{id}) {
+    $phone_note = first { $_->id == $::form->{phone_note}->{id} } @{$self->order->phone_notes};
+    die t8('Phone note not found for this order.') if !$phone_note;
+  }
 
-      $self->save_history('DELETED');
+  $phone_note = SL::DB::Note->new() if !$phone_note;
+  my $is_new  = !$phone_note->id;
 
-      1;
-  }) || push(@{$errors}, $db->error);
+  $phone_note->assign_attributes(%{ $::form->{phone_note} },
+                                 trans_id     => $self->order->id,
+                                 trans_module => 'oe',
+                                 employee     => SL::DB::Manager::Employee->current);
 
-  return $errors;
+  $self->order->add_phone_notes($phone_note) if $is_new;
+  return $phone_note;
+}
+
+sub check_if_periodic_invoices_contact_matches_customer {
+  my ($self) = @_;
+
+  return if !$self->order->is_type(SL::DB::Order::SALES_ORDER_TYPE());
+
+  my $cfg = SL::DB::Manager::PeriodicInvoicesConfig->find_by(oe_id => $self->order->id);
+  return if !$cfg || !$cfg->email_recipient_contact_id;
+
+  my $contact = SL::DB::Manager::Contact->find_by(cp_id => $cfg->email_recipient_contact_id);
+  return if !$contact;
+
+  if ($contact->cp_cv_id != $self->order->customer_id) {
+    $cfg->update_attributes(email_recipient_contact_id => undef);
+  }
 }
 
 # save the order
@@ -1874,189 +2091,136 @@ sub delete {
 sub save {
   my ($self) = @_;
 
-  my $errors = [];
-  my $db     = $self->order->db;
+  my $is_new = !$self->order->id;
 
-  # check for new or updated phone note
-  if ($::form->{phone_note}->{subject} || $::form->{phone_note}->{body}) {
-    if (!$::form->{phone_note}->{subject} || !$::form->{phone_note}->{body}) {
-      return [t8('Phone note needs a subject and a body.')];
-    }
-
-    my $phone_note;
-    if ($::form->{phone_note}->{id}) {
-      $phone_note = first { $_->id == $::form->{phone_note}->{id} } @{$self->order->phone_notes};
-      return [t8('Phone note not found for this order.')] if !$phone_note;
-    }
+  $self->parse_phone_note if $::form->{phone_note}->{subject} || $::form->{phone_note}->{body};
 
-    $phone_note = SL::DB::Note->new() if !$phone_note;
-    my $is_new  = !$phone_note->id;
+  # Test for order locked items if they are not wanted for this record type.
+  if ($self->type_data->no_order_locked_parts) {
+    my @order_locked_positions = map { $_->position } grep { $_->part->order_locked } @{ $self->order->items_sorted };
+    die t8('This record contains not orderable items at position #1', join ', ', @order_locked_positions) if @order_locked_positions;
+  }
 
-    $phone_note->assign_attributes(%{ $::form->{phone_note} },
-                                   trans_id     => $self->order->id,
-                                   trans_module => 'oe',
-                                   employee     => SL::DB::Manager::Employee->current);
+  # create first version if none exists
+  $self->order->add_order_version(SL::DB::OrderVersion->new(version => 1)) if !$self->order->order_version;
 
-    $self->order->add_phone_notes($phone_note) if $is_new;
-  }
+  set_record_link_conversions($self->order,
+    delete $::form->{RECORD_TYPE_REF()}
+      => delete $::form->{RECORD_ID()},
+    delete $::form->{RECORD_ITEM_TYPE_REF()}
+      => delete $::form->{RECORD_ITEM_ID()},
+  );
 
-  $db->with_transaction(sub {
-    # delete custom shipto if it is to be deleted or if it is empty
-    if ($self->order->custom_shipto && ($self->is_custom_shipto_to_delete || $self->order->custom_shipto->is_empty)) {
-      $self->order->custom_shipto->delete if $self->order->custom_shipto->shipto_id;
-      $self->order->custom_shipto(undef);
+  my @converted_from_oe_ids;
+  if ($self->order->{RECORD_TYPE_REF()} eq 'SL::DB::Order'
+      && $self->order->{RECORD_ID()}) {
+    @converted_from_oe_ids = split ' ', $self->order->{RECORD_ID()};
+  }
+
+  # check for purchase basket items
+  my %basket_item_id_to_orderitem =
+    map { $_->{basket_item_id} => $_ }
+    grep { $_->{basket_item_id} ne '' }
+    $self->order->orderitems;
+  my @basket_item_ids = keys %basket_item_id_to_orderitem;
+  if (scalar @basket_item_ids) {
+    my $basket_items = SL::DB::Manager::PurchaseBasketItem->get_all(
+      where => [ id => \@basket_item_ids ]);
+    if (scalar @$basket_items != scalar @basket_item_ids) {
+      my %basket_item_exists = map { $_->id => 1 } @$basket_items;
+      my @missing_for_positions =
+        map { $_->position }
+        map { $basket_item_id_to_orderitem{$_} }
+        grep { !$basket_item_exists{$_} }
+        @basket_item_ids;
+      return [t8('Purchase basket item not existing any more for position(s): #1.',
+                 join(',', @missing_for_positions))];
     }
+  }
 
-    SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete || []};
-    $self->order->save(cascade => 1);
-
-    # link records
-    if ($::form->{converted_from_oe_id}) {
-      my @converted_from_oe_ids = split ' ', $::form->{converted_from_oe_id};
+  my $objects_to_close = scalar @converted_from_oe_ids
+                       ? SL::DB::Manager::Order->get_all(where => [
+                           id => \@converted_from_oe_ids,
+                           or => [  record_type => SALES_QUOTATION_TYPE(),
+                                    record_type => REQUEST_QUOTATION_TYPE(),
+                                   (record_type => PURCHASE_QUOTATION_INTAKE_TYPE()) x $self->order->is_type(PURCHASE_ORDER_TYPE()),
+                                   (record_type => PURCHASE_ORDER_TYPE())            x $self->order->is_type(PURCHASE_ORDER_CONFIRMATION_TYPE())  ]
+                           ])
+                       : undef;
+
+  my $items_to_delete  = scalar @{ $self->item_ids_to_delete || [] }
+                       ? SL::DB::Manager::OrderItem->get_all(where => [id => $self->item_ids_to_delete])
+                       : undef;
+
+  SL::Model::Record->save($self->order,
+                          with_validity_token  => { scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE(), token => $::form->{form_validity_token} },
+                          delete_custom_shipto => $self->order->custom_shipto && ($self->is_custom_shipto_to_delete || $self->order->custom_shipto->is_empty),
+                          items_to_delete      => $items_to_delete,
+                          objects_to_close     => $objects_to_close,
+                          link_requirement_specs_linking_to_created_from_objects => \@converted_from_oe_ids,
+                          set_project_in_linked_requirement_specs                => 1,
+  );
 
-      foreach my $converted_from_oe_id (@converted_from_oe_ids) {
-        my $src = SL::DB::Order->new(id => $converted_from_oe_id)->load;
-        $src->update_attributes(closed => 1) if $src->type =~ /_quotation$/;
-        $src->link_to_record($self->order);
-      }
-      if (scalar @{ $::form->{converted_from_orderitems_ids} || [] }) {
-        my $idx = 0;
-        foreach (@{ $self->order->items_sorted }) {
-          my $from_id = $::form->{converted_from_orderitems_ids}->[$idx];
-          next if !$from_id;
-          SL::DB::RecordLink->new(from_table => 'orderitems',
-                                  from_id    => $from_id,
-                                  to_table   => 'orderitems',
-                                  to_id      => $_->id
-          )->save;
-          $idx++;
-        }
-      }
+  if ($::form->{email_journal_id}) {
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $::form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $self->order,
+      delete $::form->{email_attachment_id}
+    );
+  }
 
-      $self->link_requirement_specs_linking_to_created_from_objects(@converted_from_oe_ids);
+  if ($is_new && $self->order->is_sales && $::lx_office_conf{imap_client}->{enabled}) {
+    my $imap_client = SL::IMAPClient->new(%{$::lx_office_conf{imap_client}});
+    if ($imap_client) {
+      $imap_client->create_folder_for_record(record => $self->order);
     }
+  }
 
-    $self->set_project_in_linked_requirement_specs if $self->order->globalproject_id;
-
-    $self->save_history('SAVED');
-
-    1;
-  }) || push(@{$errors}, $db->error);
+  $self->check_if_periodic_invoices_contact_matches_customer;
 
-  return $errors;
+  delete $::form->{form_validity_token};
 }
 
-sub workflow_sales_or_request_for_quotation {
+sub reinit_after_new_order {
   my ($self) = @_;
 
-  # always save
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) for @{ $errors };
-    return $self->js->render();
-  }
-
-  my $destination_type = $::form->{type} eq sales_order_type() ? sales_quotation_type() : request_quotation_type();
-
-  $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));
-  delete $::form->{id};
-
-  # no linked records from order to quotations
-  delete $::form->{$_} for qw(converted_from_oe_id converted_from_orderitems_ids);
-
-  # set item ids to new fake id, to identify them as new items
-  foreach my $item (@{$self->order->items_sorted}) {
-    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
-
   # change form type
-  $::form->{type} = $destination_type;
+  $::form->{type} = $self->order->type;
   $self->type($self->init_type);
-  $self->cv  ($self->init_cv);
+  $self->type_data($self->init_type_data);
+  $self->cv($self->init_cv);
   $self->check_auth;
 
-  $self->recalc();
-  $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row as hidden, because they
-  # are loaded only on demand. So we need to keep the values from the
-  # source.
-  $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
-}
-
-sub workflow_sales_or_purchase_order {
-  my ($self) = @_;
-
-  # always save
-  my $errors = $self->save();
+  $self->setup_custom_shipto_from_form($self->order, $::form);
 
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
-
-  my $destination_type = $::form->{type} eq sales_quotation_type()   ? sales_order_type()
-                       : $::form->{type} eq request_quotation_type() ? purchase_order_type()
-                       : $::form->{type} eq purchase_order_type()    ? sales_order_type()
-                       : $::form->{type} eq sales_order_type()       ? purchase_order_type()
-                       : '';
-
-  # check for direct delivery
-  # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
-  my $custom_shipto;
-  if (   $::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type()
-      && $::form->{use_shipto} && $self->order->shipto) {
-    $custom_shipto = $self->order->shipto->clone('SL::DB::Order');
-  }
-
-  $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));
-  $self->{converted_from_oe_id} = delete $::form->{id};
-
-  # set item ids to new fake id, to identify them as new items
   foreach my $item (@{$self->order->items_sorted}) {
+    # set item ids to new fake id, to identify them as new items
     $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  }
 
-  if ($::form->{type} eq sales_order_type() && $destination_type eq purchase_order_type()) {
-    if ($::form->{use_shipto}) {
-      $self->order->custom_shipto($custom_shipto) if $custom_shipto;
-    } else {
-      # remove any custom shipto if not wanted
-      $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
-    }
+    # trigger rendering values for second row as hidden, because they
+    # are loaded only on demand. So we need to keep the values from the
+    # source.
+    $item->{render_second_row} = 1;
   }
 
-  # change form type
-  $::form->{type} = $destination_type;
-  $self->type($self->init_type);
-  $self->cv  ($self->init_cv);
-  $self->check_auth;
+  # Warn on order locked items if they are not wanted for this record type
+  if ($self->type_data->no_order_locked_parts) {
+    my @order_locked_positions =
+      map { $_->position }
+      grep { $_->part->order_locked }
+      @{ $self->order->items_sorted };
+    flash('warning', t8(
+        'This record contains not orderable items at position #1',
+        join ', ', @order_locked_positions)
+    ) if @order_locked_positions;
+  }
 
-  $self->recalc();
   $self->get_unalterable_data();
-  $self->pre_render();
-
-  # trigger rendering values for second row as hidden, because they
-  # are loaded only on demand. So we need to keep the values from the
-  # source.
-  $_->{render_second_row} = 1 for @{ $self->order->items_sorted };
-
-  $self->render(
-    'order/form',
-    title => $self->get_title_for('edit'),
-    %{$self->{template_args}}
-  );
+  $self->recalc();
 }
 
-
 sub pre_render {
   my ($self) = @_;
 
@@ -2072,7 +2236,9 @@ sub pre_render {
                                                                            sort_by => 'name');
   $self->{all_payment_terms}          = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id,
                                                                                                         obsolete => 0 ] ]);
-  $self->{all_delivery_terms}         = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+  $self->{all_delivery_terms}         = SL::DB::Manager::DeliveryTerm->get_valid($self->order->delivery_term_id);
+  $self->{all_statuses}               = SL::DB::Manager::OrderStatus->get_all_sorted(where => [ or => [ id => $self->order->order_status_id,
+                                                                                                        obsolete => 0,  ] ] );
   $self->{current_employee_id}        = SL::DB::Manager::Employee->current->id;
   $self->{periodic_invoices_status}   = $self->get_periodic_invoices_status($self->order->periodic_invoices_config);
   $self->{order_probabilities}        = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
@@ -2097,7 +2263,7 @@ sub pre_render {
     $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
   }
 
-  if (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())) {
+  if (any { $self->type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), PURCHASE_ORDER_TYPE(), PURCHASE_ORDER_CONFIRMATION_TYPE())) {
     # Calculate shipped qtys here to prevent calling calculate for every item via the items method.
     # Do not use write_to_objects to prevent order->delivered to be set, because this should be
     # the value from db, which can be set manually or is set when linked delivery orders are saved.
@@ -2116,17 +2282,19 @@ sub pre_render {
                                                 } } @all_objects;
   }
 
-  if (   (any { $self->type eq $_ } (sales_quotation_type(), sales_order_type()))
+  if (   (any { $self->type eq $_ } (SALES_QUOTATION_TYPE(), SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE()))
       && $::instance_conf->get_transport_cost_reminder_article_number_id ) {
     $self->{template_args}->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
   }
   $self->{template_args}->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
+  $self->{template_args}->{order_item_input_position} = SL::Helper::UserPreferences::ItemInputPosition->new()->get_order_item_input_position
+                                                      // $::instance_conf->get_order_item_input_position;
 
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
   $self->{template_args}->{num_phone_notes} = scalar @{ $self->order->phone_notes || [] };
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Validator kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
+  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Validator kivi.SalesPurchase kivi.Order kivi.File
                                                          edit_periodic_invoices_config calculate_qty follow_up show_history);
   $self->setup_edit_action_bar;
 }
@@ -2134,57 +2302,76 @@ sub pre_render {
 sub setup_edit_action_bar {
   my ($self, %params) = @_;
 
-  my $deletion_allowed = (any { $self->type eq $_ } (sales_quotation_type(), request_quotation_type()))
-                      || (($self->type eq sales_order_type())    && $::instance_conf->get_sales_order_show_delete)
-                      || (($self->type eq purchase_order_type()) && $::instance_conf->get_purchase_order_show_delete);
-
+  my @valid = qw(
+    kivi.Order.check_cv
+  );
+  push @valid, "kivi.Order.check_duplicate_parts" if $::instance_conf->get_order_warn_duplicate_parts;
+  push @valid, "kivi.Order.check_valid_reqdate"   if $::instance_conf->get_order_warn_no_deliverydate;
   my @req_trans_cost_art = qw(kivi.Order.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
-  my @req_cusordnumber   = qw(kivi.Order.check_cusordnumber_presence)           x($self->type eq sales_order_type() && $::instance_conf->get_order_warn_no_cusordnumber);
+  my @req_cusordnumber   = qw(kivi.Order.check_cusordnumber_presence)           x(( any {$self->type eq $_} (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE()) ) && $::instance_conf->get_order_warn_no_cusordnumber);
 
   my $has_invoice_for_advance_payment;
-  if ($self->order->id && $self->type eq sales_order_type()) {
+  if ($self->order->id && $self->type eq SALES_ORDER_TYPE()) {
     my $lr = $self->order->linked_records(direction => 'to', to => ['Invoice']);
     $has_invoice_for_advance_payment = any {'SL::DB::Invoice' eq ref $_ && "invoice_for_advance_payment" eq $_->type} @$lr;
   }
 
   my $has_final_invoice;
-  if ($self->order->id && $self->type eq sales_order_type()) {
+  if ($self->order->id && $self->type eq SALES_ORDER_TYPE()) {
     my $lr = $self->order->linked_records(direction => 'to', to => ['Invoice']);
     $has_final_invoice               = any {'SL::DB::Invoice' eq ref $_ && "final_invoice" eq $_->type} @$lr;
   }
 
-  my $right_for         = { map { $_ => $_.'_edit' } @{$self->valid_types} };
-  my $right             = $right_for->{ $self->type };
-  $right              ||= 'DOES_NOT_EXIST';
-  my $may_edit_create   = $::auth->assert($right, 'may fail');
+  my $may_edit_create   = $::auth->assert($self->type_data->rights('edit'), 'may fail');
+
+  my $is_final_version = $self->is_final_version;
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       combobox => [
         action => [
           t8('Save'),
-          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
-                                                    $::instance_conf->get_order_warn_no_deliverydate,
-          ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'],
                          @req_trans_cost_art, @req_cusordnumber,
           ],
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
         ],
         action => [
           t8('Save and Close'),
-          call      => [ 'kivi.Order.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
-                                                    $::instance_conf->get_order_warn_no_deliverydate,
-                                                    1
-          ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'back_to_caller', value => 1 },
+              ],
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices', ['kivi.validate_form','#order_form'],
                          @req_trans_cost_art, @req_cusordnumber,
           ],
-          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
+        ],
+        action => [
+          t8('Create Sub-Version'),
+          call      => [ 'kivi.Order.save', { action => 'add_subversion' } ],
+          only_if   => $::instance_conf->get_lock_oe_subversions,
+          disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
+                    : !$is_final_version ? t8('This sub-version is not yet finalized')
+                    :                      undef,
         ],
         action => [
           t8('Save as new'),
-          call      => [ 'kivi.Order.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_as_new',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
@@ -2200,87 +2387,177 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and Quotation'),
-          submit   => [ '#order_form', { action => "Order/sales_quotation" } ],
-          checks   => [ @req_trans_cost_art, @req_cusordnumber ],
-          only_if  => (any { $self->type eq $_ } (sales_order_type())),
+          call     => [ 'kivi.submit_ajax_form', $self->url_for(action => "save_and_order_workflow", to_type => SALES_QUOTATION_TYPE()), '#order_form' ],
+          checks   => [ @valid, @req_trans_cost_art, @req_cusordnumber ],
+          only_if  => $self->type_data->show_menu('save_and_quotation'),
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and RFQ'),
-          submit   => [ '#order_form', { action => "Order/request_for_quotation" } ],
-          only_if  => (any { $self->type eq $_ } (purchase_order_type())),
+          call     => [ 'kivi.Order.purchase_check_for_direct_delivery', { to_type => REQUEST_QUOTATION_TYPE() } ],
+          checks   => [ @valid ],
+          only_if  => $self->type_data->show_menu('save_and_rfq'),
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Purchase Quotation Intake'),
+          call     => [ 'kivi.submit_ajax_form', $self->url_for(action => "save_and_order_workflow", to_type => PURCHASE_QUOTATION_INTAKE_TYPE()), '#order_form' ],
+          only_if  => $self->type_data->show_menu('save_and_purchase_quotation_intake'),
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
-          t8('Save and Sales Order'),
-          submit   => [ '#order_form', { action => "Order/sales_order" } ],
-          checks   => [ @req_trans_cost_art ],
-          only_if  => (any { $self->type eq $_ } (sales_quotation_type(), purchase_order_type())),
+          t8('Save and Sales Order Intake'),
+          call     => [ 'kivi.submit_ajax_form', $self->url_for(action => "save_and_order_workflow", to_type => SALES_ORDER_INTAKE_TYPE()), '#order_form' ],
+          only_if  => $self->type_data->show_menu('save_and_sales_order_intake'),
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Sales Order Confirmation'),
+          call     => [ 'kivi.submit_ajax_form', $self->url_for(action => "save_and_order_workflow", to_type => SALES_ORDER_TYPE()), '#order_form' ],
+          checks   => [ @valid, @req_trans_cost_art ],
+          only_if  => $self->type_data->show_menu('save_and_sales_order'),
           disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and Purchase Order'),
-          call      => [ 'kivi.Order.purchase_order_check_for_direct_delivery' ],
-          checks    => [ @req_trans_cost_art, @req_cusordnumber ],
-          only_if   => (any { $self->type eq $_ } (sales_order_type(), request_quotation_type())),
+          call      => [ 'kivi.Order.purchase_check_for_direct_delivery', { to_type => PURCHASE_ORDER_TYPE() } ],
+          checks    => [ @valid, @req_trans_cost_art, @req_cusordnumber ],
+          only_if   => $self->type_data->show_menu('save_and_purchase_order'),
+          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Purchase Order Confirmation'),
+          call      => [ 'kivi.Order.purchase_check_for_direct_delivery', { to_type => PURCHASE_ORDER_CONFIRMATION_TYPE() } ],
+          checks    => [ @valid, @req_trans_cost_art, @req_cusordnumber ],
+          only_if   => $self->type_data->show_menu('save_and_purchase_order_confirmation'),
           disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
-          t8('Save and Delivery Order'),
-          call      => [ 'kivi.Order.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                       $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                                        ],
+          t8('Save and Sales Delivery Order'),
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'to_type', value => SALES_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
-          only_if   => (any { $self->type eq $_ } (sales_order_type(), purchase_order_type())),
+          only_if   => $self->type_data->show_menu('save_and_sales_delivery_order'),
+          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Purchase Delivery Order'),
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'to_type', value => PURCHASE_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
+          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
+                         @req_trans_cost_art, @req_cusordnumber,
+          ],
+          only_if   => $self->type_data->show_menu('save_and_purchase_delivery_order'),
+          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Purchase Delivery Order with item selection'),
+          call      => [
+            'kivi.Order.show_purchase_delivery_order_select_items', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'to_type', value => PURCHASE_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
+          checks    => [ @req_trans_cost_art, @req_cusordnumber ],
+          only_if   => $self->type_data->show_menu('save_and_purchase_delivery_order'),
           disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and Supplier Delivery Order'),
-          call      => [ 'kivi.Order.save', 'save_and_supplier_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                       $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                                        ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'to_type', value => SUPPLIER_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
-          only_if   => (any { $self->type eq $_ } (purchase_order_type())),
+          only_if   => $self->type_data->show_menu('save_and_supplier_delivery_order'),
+          disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+        ],
+        action => [
+          t8('Save and Reclamation'),
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+              form_params        => [
+                { name => 'to_type',
+                  value => $self->order->is_sales ? SALES_RECLAMATION_TYPE()
+                                                  : PURCHASE_RECLAMATION_TYPE() },
+              ],
+            }],
+          only_if   => $self->type_data->show_menu('save_and_reclamation'),
           disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
         ],
         action => [
           t8('Save and Invoice'),
-          call      => [ 'kivi.Order.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_invoice',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
           disabled  => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
+          only_if   => $self->type_data->show_menu('save_and_invoice'),
         ],
         action => [
           ($has_invoice_for_advance_payment ? t8('Save and Further Invoice for Advance Payment') : t8('Save and Invoice for Advance Payment')),
-          call      => [ 'kivi.Order.save', 'save_and_invoice_for_advance_payment', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_invoice_for_advance_payment',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
           disabled  => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
                      : $has_final_invoice ? t8('This order has already a final invoice.')
                      :                      undef,
-          only_if   => (any { $self->type eq $_ } (sales_order_type())),
+          only_if   => $self->type_data->show_menu('save_and_invoice_for_advance_payment'),
         ],
         action => [
           t8('Save and Final Invoice'),
-          call      => [ 'kivi.Order.save', 'save_and_final_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_final_invoice',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
           checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
                          @req_trans_cost_art, @req_cusordnumber,
           ],
           disabled  => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
                      : $has_final_invoice ? t8('This order has already a final invoice.')
                      :                      undef,
-          only_if   => (any { $self->type eq $_ } (sales_order_type())) && $has_invoice_for_advance_payment,
+          only_if   => $self->type_data->show_menu('save_and_final_invoice') && $has_invoice_for_advance_payment,
         ],
         action => [
           t8('Save and AP Transaction'),
-          call      => [ 'kivi.Order.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
-          only_if   => (any { $self->type eq $_ } (purchase_order_type())),
+          call      => [ 'kivi.Order.save', {
+              action             => 'save_and_ap_transaction',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+            }],
+          only_if   => $self->type_data->show_menu('save_and_ap_transaction'),
           disabled  => !$may_edit_create  ? t8('You do not have the permissions to access this function.') : undef,
         ],
 
@@ -2292,29 +2569,38 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and preview PDF'),
-          call     => [ 'kivi.Order.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
-                                                          $::instance_conf->get_order_warn_no_deliverydate,
-                      ],
+          call     => [ 'kivi.Order.save', {
+              action             => 'preview_pdf',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
           checks   => [ @req_trans_cost_art, @req_cusordnumber ],
-          disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.') : undef,
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
+          only_if  => $self->type_data->show_menu('save_and_print'),
         ],
         action => [
           t8('Save and print'),
-          call     => [ 'kivi.Order.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
-                                                         $::instance_conf->get_order_warn_no_deliverydate,
-                      ],
+          call     => [ 'kivi.Order.show_print_options', { warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+                                                           warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate },
+          ],
           checks   => [ @req_trans_cost_art, @req_cusordnumber ],
-          disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.') : undef,
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
+          only_if  => $self->type_data->show_menu('save_and_print'),
         ],
         action => [
-          t8('Save and E-mail'),
+          ($is_final_version ? t8('E-mail') : t8('Save and E-mail')),
           id       => 'save_and_email_action',
-          call     => [ 'kivi.Order.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                         $::instance_conf->get_order_warn_no_deliverydate,
-                      ],
-          disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
-                    : !$self->order->id  ? t8('This object has not been saved yet.')
-                    :                      undef,
+          call     => [ 'kivi.Order.save', {
+              action             => 'save_and_show_email_dialog',
+              warn_on_duplicates => $::instance_conf->get_order_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_order_warn_no_deliverydate,
+            }],
+          disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
+                    : !$self->order->id ? t8('This object has not been saved yet.')
+                    : undef,
+          only_if  => $self->type_data->show_menu('save_and_email'),
         ],
         action => [
           t8('Download attachments of all parts'),
@@ -2331,7 +2617,7 @@ sub setup_edit_action_bar {
         disabled => !$may_edit_create  ? t8('You do not have the permissions to access this function.')
                   : !$self->order->id  ? t8('This object has not been saved yet.')
                   :                      undef,
-        only_if  => $deletion_allowed,
+        only_if  => $self->type_data->show_menu('delete'),
       ],
 
       combobox => [
@@ -2466,7 +2752,7 @@ sub make_periodic_invoices_config_from_yaml {
 sub get_periodic_invoices_status {
   my ($self, $config) = @_;
 
-  return                      if $self->type ne sales_order_type();
+  return                      if $self->type ne SALES_ORDER_TYPE();
   return t8('not configured') if !$config;
 
   my $active = ('HASH' eq ref $config)                           ? $config->{active}
@@ -2476,29 +2762,6 @@ sub get_periodic_invoices_status {
   return $active ? t8('active') : t8('inactive');
 }
 
-sub get_title_for {
-  my ($self, $action) = @_;
-
-  return '' if none { lc($action)} qw(add edit);
-
-  # for locales:
-  # $::locale->text("Add Sales Order");
-  # $::locale->text("Add Purchase Order");
-  # $::locale->text("Add Quotation");
-  # $::locale->text("Add Request for Quotation");
-  # $::locale->text("Edit Sales Order");
-  # $::locale->text("Edit Purchase Order");
-  # $::locale->text("Edit Quotation");
-  # $::locale->text("Edit Request for Quotation");
-
-  $action = ucfirst(lc($action));
-  return $self->type eq sales_order_type()       ? $::locale->text("$action Sales Order")
-       : $self->type eq purchase_order_type()    ? $::locale->text("$action Purchase Order")
-       : $self->type eq sales_quotation_type()   ? $::locale->text("$action Quotation")
-       : $self->type eq request_quotation_type() ? $::locale->text("$action Request for Quotation")
-       : '';
-}
-
 sub get_item_cvpartnumber {
   my ($self, $item) = @_;
 
@@ -2538,81 +2801,18 @@ sub get_part_texts {
   return $texts;
 }
 
-sub get_best_price_and_discount_source {
-  my ($record, $item, $ignore_given) = @_;
-
-  my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
-
-  my $price_src;
-  if ( $item->part->is_assortment ) {
-    # add assortment items with price 0, as the components carry the price
-    $price_src = $price_source->price_from_source("");
-    $price_src->price(0);
-  } elsif (!$ignore_given && defined $item->sellprice) {
-    $price_src = $price_source->price_from_source("");
-    $price_src->price($item->sellprice);
-  } else {
-    $price_src = $price_source->best_price
-               ? $price_source->best_price
-               : $price_source->price_from_source("");
-    $price_src->price($::form->round_amount($price_src->price / $record->exchangerate, 5)) if $record->exchangerate;
-    $price_src->price(0) if !$price_source->best_price;
-  }
-
-  my $discount_src;
-  if (!$ignore_given && defined $item->discount) {
-    $discount_src = $price_source->discount_from_source("");
-    $discount_src->discount($item->discount);
-  } else {
-    $discount_src = $price_source->best_discount
-                  ? $price_source->best_discount
-                  : $price_source->discount_from_source("");
-    $discount_src->discount(0) if !$price_source->best_discount;
-  }
-
-  return ($price_src, $discount_src);
-}
-
-sub sales_order_type {
-  'sales_order';
-}
-
-sub purchase_order_type {
-  'purchase_order';
-}
-
-sub sales_quotation_type {
-  'sales_quotation';
-}
-
-sub request_quotation_type {
-  'request_quotation';
-}
-
 sub nr_key {
-  return $_[0]->type eq sales_order_type()       ? 'ordnumber'
-       : $_[0]->type eq purchase_order_type()    ? 'ordnumber'
-       : $_[0]->type eq sales_quotation_type()   ? 'quonumber'
-       : $_[0]->type eq request_quotation_type() ? 'quonumber'
-       : '';
+  my ($self) = @_;
+
+  return $self->type_data->properties('nr_key');
 }
 
 sub save_and_redirect_to {
   my ($self, %params) = @_;
 
-  my $errors = $self->save();
-
-  if (scalar @{ $errors }) {
-    $self->js->flash('error', $_) foreach @{ $errors };
-    return $self->js->render();
-  }
+  $self->save();
 
-  my $text = $self->type eq sales_order_type()       ? $::locale->text('The order has been saved')
-           : $self->type eq purchase_order_type()    ? $::locale->text('The order has been saved')
-           : $self->type eq sales_quotation_type()   ? $::locale->text('The quotation has been saved')
-           : $self->type eq request_quotation_type() ? $::locale->text('The rfq has been saved')
-           : '';
-  flash_later('info', $text);
+  flash_later('info', $self->type_data->text('saved'));
 
   $self->redirect_to(%params, id => $self->order->id);
 }
@@ -2655,16 +2855,19 @@ sub store_doc_to_webdav_and_filemanagement {
       push @errors, t8('Storing the document to the WebDAV folder failed: #1', $@);
     };
   }
+  my $file_obj;
   if ($order->id && $::instance_conf->get_doc_storage) {
     eval {
-      SL::File->save(object_id     => $order->id,
-                     object_type   => $order->type,
-                     mime_type     => SL::MIME->mime_type_from_ext($filename),
-                     source        => 'created',
-                     file_type     => 'document',
-                     file_name     => $filename,
-                     file_contents => $content,
-                     print_variant => $variant);
+      $file_obj = SL::File->save(object_id     => $order->id,
+                                 object_type   => $order->type,
+                                 mime_type     => SL::MIME->mime_type_from_ext($filename),
+                                 source        => 'created',
+                                 file_type     => 'document',
+                                 file_name     => $filename,
+                                 file_contents => $content,
+                                 print_variant => $variant);
+
+      $self->{file_id}  = $file_obj->id;
       1;
     } or do {
       push @errors, t8('Storing the document in the storage backend failed: #1', $@);
@@ -2674,30 +2877,9 @@ sub store_doc_to_webdav_and_filemanagement {
   return @errors;
 }
 
-sub link_requirement_specs_linking_to_created_from_objects {
-  my ($self, @converted_from_oe_ids) = @_;
-
-  return unless @converted_from_oe_ids;
-
-  my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => \@converted_from_oe_ids ]);
-  foreach my $rs_order (@{ $rs_orders }) {
-    SL::DB::RequirementSpecOrder->new(
-      order_id            => $self->order->id,
-      requirement_spec_id => $rs_order->requirement_spec_id,
-      version_id          => $rs_order->version_id,
-    )->save;
-  }
-}
-
-sub set_project_in_linked_requirement_specs {
+sub init_type_data {
   my ($self) = @_;
-
-  my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => $self->order->id ]);
-  foreach my $rs_order (@{ $rs_orders }) {
-    next if $rs_order->requirement_spec->project_id == $self->order->globalproject_id;
-
-    $rs_order->requirement_spec->update_attributes(project_id => $self->order->globalproject_id);
-  }
+  SL::DB::Helper::TypeDataProxy->new('SL::DB::Order', $self->order->record_type);
 }
 
 1;
@@ -2880,7 +3062,7 @@ editor or on text processing application).
 
 =item *
 
-A warning when leaving the page without saveing unchanged inputs.
+A warning when leaving the page without saving unchanged inputs.
 
 
 =back
diff --git a/SL/Controller/OrderItem.pm b/SL/Controller/OrderItem.pm
index 7cdfb3555..d7ee7f333 100644
--- a/SL/Controller/OrderItem.pm
+++ b/SL/Controller/OrderItem.pm
@@ -84,7 +84,7 @@ sub init_model {
 }
 
 sub check_auth {
-  $::auth->assert('sales_order_edit');
+  $::auth->assert('sales_order_item_search');
 }
 
 1;
diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index aae4e531e..8965377e7 100644
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -3,42 +3,53 @@ package SL::Controller::Part;
 use strict;
 use parent qw(SL::Controller::Base);
 
+use Carp;
 use Clone qw(clone);
+use Data::Dumper;
+use DateTime;
+use File::Temp;
+use List::Util qw(sum);
+use List::UtilsBy qw(extract_by);
+use POSIX qw(strftime);
+use Text::CSV_XS;
+
+use SL::CVar;
+use SL::Controller::Helper::GetModels;
+use SL::DB::Business;
+use SL::DB::BusinessModel;
+use SL::DB::Helper::ValidateAssembly qw(validate_assembly);
+use SL::DB::History;
 use SL::DB::Part;
 use SL::DB::PartsGroup;
 use SL::DB::PriceRuleItem;
+use SL::DB::PurchaseBasketItem;
 use SL::DB::Shop;
-use SL::Controller::Helper::GetModels;
-use SL::Locale::String qw(t8);
-use SL::JSON;
-use List::Util qw(sum);
-use List::UtilsBy qw(extract_by);
 use SL::Helper::Flash;
-use Data::Dumper;
-use DateTime;
-use SL::DB::History;
-use SL::DB::Helper::ValidateAssembly qw(validate_assembly);
-use SL::CVar;
+use SL::Helper::PrintOptions;
+use SL::Helper::UserPreferences::PartPickerSearch;
+use SL::JSON;
+use SL::Locale::String qw(t8);
 use SL::MoreCommon qw(save_form);
-use Carp;
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Part;
 use SL::Presenter::Tag qw(select_tag);
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(parts models part p warehouses multi_items_models
-                                  makemodels shops_not_assigned
+                                  makemodels businessmodels shops_not_assigned
                                   customerprices
                                   orphaned
                                   assortment assortment_items assembly assembly_items
                                   all_pricegroups all_translations all_partsgroups all_units
                                   all_buchungsgruppen all_payment_terms all_warehouses
                                   parts_classification_filter
-                                  all_languages all_units all_price_factors) ],
+                                  all_languages all_units all_price_factors
+                                  all_businesses) ],
   'scalar'                => [ qw(warehouse bin stock_amounts journal) ],
 );
 
 # safety
-__PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit') },
+__PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit', 1) || $::auth->assert('part_service_assembly_details') },
                         except => [ qw(ajax_autocomplete part_picker_search part_picker_result) ]);
 
 __PACKAGE__->run_before(sub { $::auth->assert('developer') },
@@ -125,10 +136,24 @@ sub action_save {
   my @errors = $self->part->validate;
   return $self->js->error(@errors)->render if @errors;
 
+  if ($is_new) {
+    # Ensure CVars that should be enabled by default actually are when
+    # creating new parts.
+    my @default_valid_configs =
+      grep { ! $_->{flag_defaults_to_invalid} }
+      grep { $_->{module} eq 'IC' }
+      @{ CVar->get_configs() };
+
+    $::form->{"cvar_" . $_->{name} . "_valid"} = 1 for @default_valid_configs;
+  } else {
+    $self->{lastcost_modified} = $self->check_lastcost_modified;
+  }
+
   # $self->part has been loaded, parsed and validated without errors and is ready to be saved
   $self->part->db->with_transaction(sub {
 
     $self->part->save(cascade => 1);
+    $self->part->set_lastcost_assemblies_and_assortiments if $self->{lastcost_modified};
 
     SL::DB::History->new(
       trans_id    => $self->part->id,
@@ -227,10 +252,15 @@ sub action_use_as_new {
   $::form->{oldpartnumber} = $oldpart->partnumber;
 
   $self->part($oldpart->clone_and_reset_deep);
-  $self->parse_form;
+  $self->parse_form(use_as_new => 1);
   $self->part->partnumber(undef);
 
-  $self->render_form;
+  if (!$::auth->assert('part_service_assembly_edit_prices', 'may_fail')) {
+    # No right to edit prices -> remove prices for new part.
+    $self->part->$_(undef) for qw(sellprice lastcost listprice);
+  }
+
+  $self->render_form(use_as_new => 1);
 }
 
 sub action_edit {
@@ -239,6 +269,30 @@ sub action_edit {
   $self->render_form;
 }
 
+sub action_add_to_basket {
+  my ( $self ) = @_;
+
+  if ( !$self->_is_in_purchase_basket && scalar @{$self->part->makemodels}) {
+
+    my $part = $self->part;
+
+    my $needed_qty = $part->order_qty < ($part->rop - $part->onhandqty) ?
+                     $part->rop - $part->onhandqty
+                   : $part->order_qty;
+
+    my $basket_part = SL::DB::PurchaseBasketItem->new(
+      part_id     => $part->id,
+      qty         => $needed_qty,
+      orderer     => SL::DB::Manager::Employee->current,
+    )->save;
+
+    $self->js->flash('info', t8('Part added to purchasebasket'))->render;
+  } else {
+    $self->js->flash('error', t8('Part already in purchasebasket or has no vendor'))->render;
+  }
+  return 1;
+}
+
 sub render_form {
   my ($self, %params) = @_;
 
@@ -249,7 +303,10 @@ sub render_form {
   %assortment_vars = %{ $self->prepare_assortment_render_vars } if $self->part->is_assortment;
   %assembly_vars   = %{ $self->prepare_assembly_render_vars   } if $self->part->is_assembly;
 
-  $params{CUSTOM_VARIABLES}  = CVar->get_custom_variables(module => 'IC', trans_id => $self->part->id);
+  $params{CUSTOM_VARIABLES}  = $params{use_as_new} && $::form->{old_id}
+                            ?  CVar->get_custom_variables(module => 'IC', trans_id => $::form->{old_id})
+                            :  CVar->get_custom_variables(module => 'IC', trans_id => $self->part->id);
+
 
   if (scalar @{ $params{CUSTOM_VARIABLES} }) {
     CVar->render_inputs('variables' => $params{CUSTOM_VARIABLES}, show_disabled_message => 1, partsgroup_id => $self->part->partsgroup_id);
@@ -482,11 +539,13 @@ sub action_add_makemodel_row {
 
   my $position = scalar @{$self->makemodels} + 1;
 
-  my $mm = SL::DB::MakeModel->new(# parts_id    => $::form->{part}->{id},
-                                  make        => $vendor->id,
-                                  model       => '',
-                                  lastcost    => 0,
-                                  sortorder    => $position,
+  my $mm = SL::DB::MakeModel->new(# parts_id           => $::form->{part}->{id},
+                                  make                 => $vendor->id,
+                                  model                => '',
+                                  part_description     => '',
+                                  part_longdescription => '',
+                                  lastcost             => 0,
+                                  sortorder            => $position,
                                  ) or die "Can't create MakeModel object";
 
   my $row_as_html = $self->p->render('part/_makemodel_row',
@@ -502,6 +561,42 @@ sub action_add_makemodel_row {
     ->render;
 }
 
+sub action_add_businessmodel_row {
+  my ($self) = @_;
+
+  my $business_id = $::form->{add_businessmodel};
+
+  my $business = SL::DB::Manager::Business->find_by(id => $business_id) or
+    return $self->js->error(t8("No business selected or found!"))->render;
+
+  if ( grep { $business_id == $_->business_id } @{ $self->businessmodels } ) {
+    return $self->js
+      ->scroll_into_view('#content')
+      ->flash('error', (t8("This business has already been added.")))
+      ->render;
+  };
+
+  my $position = scalar @{ $self->businessmodels } + 1;
+
+  my $bm = SL::DB::BusinessModel->new(#parts_id             => $::form->{part}->{id},
+                                      business             => $business,
+                                      model                => '',
+                                      part_description     => '',
+                                      part_longdescription => '',
+                                      position             => $position,
+  ) or die "Can't create BusinessModel object";
+
+  my $row_as_html = $self->p->render('part/_businessmodel_row',
+                                     businessmodel => $bm);
+
+  # after selection focus on the model field in the row that was just added
+  $self->js
+    ->append('#businessmodel_rows', $row_as_html)  # append in tbody
+    ->val('#add_businessmodel', '')
+    ->run('kivi.Part.focus_last_businessmodel_input')
+    ->render;
+}
+
 sub action_add_customerprice_row {
   my ($self) = @_;
 
@@ -517,10 +612,12 @@ sub action_add_customerprice_row {
   my $position = scalar @{ $self->customerprices } + 1;
 
   my $cu = SL::DB::PartCustomerPrice->new(
-                      customer_id         => $customer->id,
-                      customer_partnumber => '',
-                      price               => 0,
-                      sortorder           => $position,
+                      customer_id          => $customer->id,
+                      customer_partnumber  => '',
+                      part_description     => '',
+                      part_longdescription => '',
+                      price                => 0,
+                      sortorder            => $position,
   ) or die "Can't create Customerprice object";
 
   my $row_as_html = $self->p->render(
@@ -584,7 +681,7 @@ sub action_warehouse_changed {
     die unless ref($self->warehouse) eq 'SL::DB::Warehouse';
 
     if ( $self->warehouse->id and @{$self->warehouse->bins} ) {
-      $self->bin($self->warehouse->bins_sorted->[0]);
+      $self->bin($self->warehouse->bins_sorted_naturally->[0]);
       $self->js
         ->html('#bin', $self->build_bin_select)
         ->focus('#part_bin_id');
@@ -652,7 +749,9 @@ sub action_part_picker_search {
   $search_term  ||= $self->models->filtered->laundered->{all_with_makemodel_substr_multi__ilike};
   $search_term  ||= $self->models->filtered->laundered->{all_with_customer_partnumber_substr_multi__ilike};
 
-  $_[0]->render('part/part_picker_search', { layout => 0 }, search_term => $search_term);
+  my $all_as_list = SL::Helper::UserPreferences::PartPickerSearch->new()->get_all_as_list_default;
+
+  $_[0]->render('part/part_picker_search', { layout => 0 }, search_term => $search_term, all_as_list => $all_as_list);
 }
 
 sub action_part_picker_result {
@@ -675,6 +774,157 @@ sub action_show {
   }
 }
 
+sub action_showdetails {
+  my ($self, %params) = @_;
+
+  my @bindata;
+  my $bins = SL::DB::Manager::Bin->get_all(with_objects => ['warehouse' ]);
+  my %bins_by_id = map { $_->id => $_ } @$bins;
+  my $inventories = SL::DB::Manager::Inventory->get_all(where => [ parts_id => $self->part->id],
+    with_objects => ['parts', 'trans_type' ], sort_by => 'bin_id ASC');
+  foreach my $bin (@{ $bins }) {
+    $bin->{qty} = 0;
+  }
+
+  foreach my $inv (@{ $inventories }) {
+    my $bin = $bins_by_id{ $inv->bin_id };
+    $bin->{qty}      += $inv->qty;
+    $bin->{unit}     =  $inv->parts->unit;
+  }
+  my $sum = 0;
+  for my $bin (@{ $bins }) {
+    push @bindata , {
+      'warehouse'    => $bin->warehouse->description,
+      'description'  => $bin->description,
+      'qty'          => $bin->{qty},
+      'unit'         => $bin->{unit},
+    } if $bin->{qty} != 0;
+
+    $sum += $bin->{qty};
+  }
+
+  my $todate   = DateTime->now_local;
+  my $fromdate = DateTime->now_local->add_duration(DateTime::Duration->new(years => -1));
+  my $average  = 0;
+  foreach my $inv (@{ $inventories }) {
+    $average += abs($inv->qty) if $inv->shippingdate && $inv->trans_type->direction eq 'out' &&
+    DateTime->compare($inv->shippingdate,$fromdate) != -1 &&
+    DateTime->compare($inv->shippingdate,$todate)   == -1;
+  }
+  my $openitems = SL::DB::Manager::OrderItem->get_all(where => [ parts_id => $self->part->id, 'order.closed' => 0 ],
+    with_objects => ['order'],);
+  my ($not_delivered, $ordered) = 0;
+  for my $openitem (@{ $openitems }) {
+    if($openitem -> order -> type eq 'sales_order') {
+      $not_delivered += $openitem->qty - $openitem->shipped_qty;
+    } elsif ( $openitem->order->type eq 'purchase_order' ) {
+      $ordered += $openitem->qty - $openitem->delivered_qty;
+    }
+  }
+
+  my $stock_amounts = $self->part->get_simple_stock_sql;
+
+  my $output = SL::Presenter->get->render('part/showdetails',
+    part          => $self->part,
+    stock_amounts => $stock_amounts,
+    average       => $average/12,
+    fromdate      => $fromdate,
+    todate        => $todate,
+    sum           => $sum,
+    not_delivered => $not_delivered,
+    ordered       => $ordered,
+    print_options   => SL::Helper::PrintOptions->get_print_options(
+      form => Form->new(
+        type     => 'part',
+        printers => SL::DB::Manager::Printer->get_all_sorted,
+      ),
+      options => {
+        dialog_name_prefix     => 'print_options.',
+        show_headers           => 1,
+        no_queue               => 1,
+        no_postscript          => 1,
+        no_opendocument        => 1,
+        hide_language_id_print => 1,
+        no_html                => 1,
+      },
+    ),
+  );
+  $self->render(\$output, { layout => 0, process => 0 });
+}
+
+sub action_print_label {
+  my ($self) = @_;
+  # TODO: implement
+  return $self->render('generic/error', { layout => 1 }, label_error => t8('Not implemented yet!'));
+}
+
+sub action_export_assembly_assortment_components {
+  my ($self) = @_;
+
+  my $bom_or_charge = $self->part->is_assembly ? 'bom' : 'charge';
+
+  my @rows = ([
+    $::locale->text('Partnumber'),
+    $::locale->text('Description'),
+    $::locale->text('Type'),
+    $::locale->text('Classification'),
+    $::locale->text('Qty'),
+    $::locale->text('Unit'),
+    $self->part->is_assembly ? $::locale->text('BOM') : $::locale->text('Charge'),
+    $::locale->text('Line Total'),
+    $::locale->text('Sellprice'),
+    $::locale->text('Lastcost'),
+    $::locale->text('Partsgroup'),
+  ]);
+
+  foreach my $item (@{ $self->part->items }) {
+    my $part = $item->part;
+
+    my @row = (
+      $part->partnumber,
+      $part->description,
+      SL::Presenter::Part::type_abbreviation($part->part_type),
+      SL::Presenter::Part::classification_abbreviation($part->classification_id),
+      $item->qty_as_number,
+      $part->unit,
+      $item->$bom_or_charge ? $::locale->text('yes') : $::locale->text('no'),
+      $::form->format_amount(\%::myconfig, $item->linetotal_sellprice, 3, 0),
+      $part->sellprice_as_number,
+      $part->lastcost_as_number,
+      $part->partsgroup ? $part->partsgroup->partsgroup : '',
+    );
+
+    push @rows, \@row;
+  }
+
+  my $csv = Text::CSV_XS->new({
+    sep_char => ';',
+    eol      => "\n",
+    binary   => 1,
+  });
+
+  my ($file_handle, $file_name) = File::Temp::tempfile;
+
+  binmode $file_handle, ":encoding(utf8)";
+
+  $csv->print($file_handle, $_) for @rows;
+
+  $file_handle->close;
+
+  my $type_prefix     = $self->part->is_assembly ? 'assembly' : 'assortment';
+  my $part_number     = $self->part->partnumber;
+  $part_number        =~ s{[^[:word:]]+}{_}g;
+  my $timestamp       = strftime('_%Y-%m-%d_%H-%M-%S', localtime());
+  my $attachment_name = sprintf('%s_components_%s_%s.csv', $type_prefix, $part_number, $timestamp);
+
+  $self->send_file(
+    $file_name,
+    content_type => 'text/csv',
+    name         => $attachment_name,
+  );
+
+}
+
 # helper functions
 sub validate_add_items {
   scalar @{$::form->{add_items}};
@@ -729,7 +979,7 @@ sub add {
 
 sub _set_javascript {
   my ($self) = @_;
-  $::request->layout->use_javascript("${_}.js")  for qw(kivi.Part kivi.File kivi.PriceRule ckeditor/ckeditor ckeditor/adapters/jquery kivi.ShopPart kivi.Validator);
+  $::request->layout->use_javascript("${_}.js")  for qw(kivi.Part kivi.File kivi.PriceRule kivi.ShopPart kivi.Validator);
   $::request->layout->add_javascripts_inline("\$(function(){kivi.PriceRule.load_price_rules_for_part(@{[ $self->part->id ]})});") if $self->part->id;
 }
 
@@ -775,13 +1025,25 @@ sub check_part_not_modified {
 
 }
 
-sub parse_form {
+sub check_lastcost_modified {
   my ($self) = @_;
 
+  return    (abs($self->part->lastcost                                               - $self->part->last_price_update->lastcost)     >= 0.009)
+         || (abs(($self->part->price_factor ? $self->part->price_factor->factor : 1) - $self->part->last_price_update->price_factor) >= 0.009);
+}
+
+sub parse_form {
+  my ($self, %params) = @_;
+
   my $is_new = !$self->part->id;
 
   my $params = delete($::form->{part}) || { };
 
+  if (!$::auth->assert('part_service_assembly_edit_prices', 'may_fail')) {
+    # No right to set or change prices, so delete prices from params.
+    delete $params->{$_} for qw(sellprice_as_number lastcost_as_number listprice_as_number);
+  }
+
   delete $params->{id};
   $self->part->assign_attributes(%{ $params});
   $self->part->bin_id(undef) unless $self->part->warehouse_id;
@@ -801,14 +1063,23 @@ sub parse_form {
     $self->part->add_assemblies( @{ $self->assembly_items } );
   };
 
-  $self->part->translations([]);
+  # Update lastcost for assemblies
+  if ($self->part->is_assembly) {
+    my $lastcost_sum = $self->recalc_item_totals(part_type => $self->part->part_type, price_type => 'lastcost');
+    $self->part->lastcost($lastcost_sum);
+  }
+
+  $self->part->translations([]) unless $params{use_as_new};
   $self->parse_form_translations;
 
-  $self->part->prices([]);
-  $self->parse_form_prices;
+  if ($::auth->assert('part_service_assembly_edit_prices', 'may_fail')) {
+    $self->part->prices([]);
+    $self->parse_form_prices;
+  }
 
   $self->parse_form_customerprices;
   $self->parse_form_makemodels;
+  $self->parse_form_businessmodels;
 }
 
 sub parse_form_prices {
@@ -855,13 +1126,21 @@ sub parse_form_makemodels {
     my $vendor = SL::DB::Manager::Vendor->find_by(id => $makemodel->{make}) || die "Can't find vendor from make";
 
     my $id = $makemodels_map->{$makemodel->{id}} ? $makemodels_map->{$makemodel->{id}}->id : undef;
-    my $mm = SL::DB::MakeModel->new( # parts_id   => $self->part->id, # will be assigned by row add_makemodels
-                                     id         => $id,
-                                     make       => $makemodel->{make},
-                                     model      => $makemodel->{model} || '',
-                                     lastcost   => $::form->parse_amount(\%::myconfig, $makemodel->{lastcost_as_number}),
-                                     sortorder  => $position,
+    my $mm = SL::DB::MakeModel->new( # parts_id           => $self->part->id, # will be assigned by row add_makemodels
+                                     id                   => $id,
+                                     make                 => $makemodel->{make},
+                                     model                => $makemodel->{model} || '',
+                                     part_description     => $makemodel->{part_description},
+                                     part_longdescription => $makemodel->{part_longdescription},
+                                     lastcost             => $::form->parse_amount(\%::myconfig, $makemodel->{lastcost_as_number}),
+                                     sortorder            => $position,
                                    );
+
+    if (!$::auth->assert('part_service_assembly_edit_prices', 'may_fail')) {
+      # No right to edit prices -> restore old lastcost.
+      $mm->lastcost($makemodels_map->{$id} ? $makemodels_map->{$id}->lastcost : undef);
+    }
+
     if ($makemodels_map->{$mm->id} && !$makemodels_map->{$mm->id}->lastupdate && $makemodels_map->{$mm->id}->lastcost == 0 && $mm->lastcost == 0) {
       # lastupdate isn't set, original lastcost is 0 and new lastcost is 0
       # don't change lastupdate
@@ -878,6 +1157,36 @@ sub parse_form_makemodels {
   };
 }
 
+sub parse_form_businessmodels {
+  my ($self) = @_;
+
+  my $make_key = sub { return $_[0]->parts_id . '+' . $_[0]->business_id; };
+
+  my $businessmodels_map;
+  if ( $self->part->businessmodels ) { # check for new parts or parts without businessmodels
+    $businessmodels_map = { map { $make_key->($_) => Rose::DB::Object::Helpers::clone($_) } @{$self->part->businessmodels} };
+  };
+
+  $self->part->businessmodels([]);
+
+  my $position = 0;
+  my $businessmodels = delete($::form->{businessmodels}) || [];
+  foreach my $businessmodel ( @{$businessmodels} ) {
+    next unless $businessmodel->{business_id};
+
+    $position++;
+    my $bm = SL::DB::BusinessModel->new( #parts_id            => $self->part->id,            # will be assigned by row add_businessmodels
+                                         business_id          => $businessmodel->{business_id},
+                                         model                => $businessmodel->{model} || '',
+                                         part_description     => $businessmodel->{part_description} || '',
+                                         part_longdescription => $businessmodel->{part_longdescription} || '',
+                                         position             => $position,
+    );
+
+    $self->part->add_businessmodels($bm);
+  };
+}
+
 sub parse_form_customerprices {
   my ($self) = @_;
 
@@ -900,9 +1209,17 @@ sub parse_form_customerprices {
                                      id                   => $id,
                                      customer_id          => $customerprice->{customer_id},
                                      customer_partnumber  => $customerprice->{customer_partnumber} || '',
+                                     part_description     => $customerprice->{part_description},
+                                     part_longdescription => $customerprice->{part_longdescription},
                                      price                => $::form->parse_amount(\%::myconfig, $customerprice->{price_as_number}),
                                      sortorder            => $position,
                                    );
+
+    if (!$::auth->assert('part_service_assembly_edit_prices', 'may_fail')) {
+      # No right to edit prices -> restore old price.
+      $cu->price($customerprices_map->{$id} ? $customerprices_map->{$id}->price : undef);
+    }
+
     if ($customerprices_map->{$cu->id} && !$customerprices_map->{$cu->id}->lastupdate && $customerprices_map->{$cu->id}->price == 0 && $cu->price == 0) {
       # lastupdate isn't set, original price is 0 and new lastcost is 0
       # don't change lastupdate
@@ -919,7 +1236,7 @@ sub parse_form_customerprices {
 }
 
 sub build_bin_select {
-  select_tag('part.bin_id', [ @{ $_[0]->warehouse->bins_sorted } ],
+  select_tag('part.bin_id', [ @{ $_[0]->warehouse->bins_sorted_naturally } ],
     title_key => 'description',
     default   => $_[0]->bin->id,
   );
@@ -943,7 +1260,7 @@ sub init_part {
   # used by edit, save, delete and add
 
   if ( $::form->{part}{id} ) {
-    return SL::DB::Part->new(id => $::form->{part}{id})->load(with => [ qw(makemodels customerprices prices translations partsgroup shop_parts shop_parts.shop) ]);
+    return SL::DB::Part->new(id => $::form->{part}{id})->load(with => [ qw(makemodels businessmodels customerprices prices translations partsgroup shop_parts shop_parts.shop) ]);
   } elsif ( $::form->{id} ) {
     return SL::DB::Part->new(id => $::form->{id})->load; # used by inventory tab
   } else {
@@ -1012,11 +1329,13 @@ sub init_makemodels {
     next unless $makemodel->{make};
     $position++;
     my $mm = SL::DB::MakeModel->new( # parts_id   => $self->part->id, # will be assigned by row add_makemodels
-                                    id        => $makemodel->{id},
-                                    make      => $makemodel->{make},
-                                    model     => $makemodel->{model} || '',
-                                    lastcost  => $::form->parse_amount(\%::myconfig, $makemodel->{lastcost_as_number} || 0),
-                                    sortorder => $position,
+                                    id                   => $makemodel->{id},
+                                    make                 => $makemodel->{make},
+                                    model                => $makemodel->{model} || '',
+                                    part_description     => $makemodel->{part_description} || '',
+                                    part_longdescription => $makemodel->{part_longdescription} || '',
+                                    lastcost             => $::form->parse_amount(\%::myconfig, $makemodel->{lastcost_as_number} || 0),
+                                    sortorder            => $position,
                                   ) or die "Can't create mm";
     # $mm->id($makemodel->{id}) if $makemodel->{id};
     push(@makemodel_array, $mm);
@@ -1024,6 +1343,28 @@ sub init_makemodels {
   return \@makemodel_array;
 }
 
+sub init_businessmodels {
+  my ($self) = @_;
+
+  my @businessmodel_array = ();
+  my $businessmodels = delete($::form->{businessmodels}) || [];
+
+  foreach my $businessmodel ( @{$businessmodels} ) {
+    next unless $businessmodel->{business_id};
+
+    my $bm = SL::DB::BusinessModel->new(#parts_id            => $self->part->id,             # will be assigned by row add_businessmodels
+                                        business_id          => $businessmodel->{business_id},
+                                        model                => $businessmodel->{model} || '',
+                                        part_description     => $businessmodel->{part_description} || '',
+                                        part_longdescription => $businessmodel->{part_longdescription} || '',
+                                  ) or die "Can't create bm";
+
+    push(@businessmodel_array, $bm);
+  };
+
+  return \@businessmodel_array;
+}
+
 sub init_customerprices {
   my ($self) = @_;
 
@@ -1035,11 +1376,13 @@ sub init_customerprices {
     next unless $customerprice->{customer_id};
     $position++;
     my $cu = SL::DB::PartCustomerPrice->new( # parts_id   => $self->part->id, # will be assigned by row add_customerprices
-                                    id                  => $customerprice->{id},
-                                    customer_partnumber => $customerprice->{customer_partnumber},
-                                    customer_id         => $customerprice->{customer_id} || '',
-                                    price               => $::form->parse_amount(\%::myconfig, $customerprice->{price_as_number} || 0),
-                                    sortorder           => $position,
+                                    id                   => $customerprice->{id},
+                                    customer_partnumber  => $customerprice->{customer_partnumber},
+                                    customer_id          => $customerprice->{customer_id} || '',
+                                    part_description     => $customerprice->{part_description},
+                                    part_longdescription => $customerprice->{part_longdescription},
+                                    price                => $::form->parse_amount(\%::myconfig, $customerprice->{price_as_number} || 0),
+                                    sortorder            => $position,
                                   ) or die "Can't create cu";
     # $cu->id($customerprice->{id}) if $customerprice->{id};
     push(@customerprice_array, $cu);
@@ -1082,11 +1425,18 @@ sub init_all_partsgroups {
 
 sub init_all_buchungsgruppen {
   my ($self) = @_;
-  if ( $self->part->orphaned ) {
-    return SL::DB::Manager::Buchungsgruppe->get_all_sorted;
-  } else {
+  if (!$self->part->orphaned) {
     return SL::DB::Manager::Buchungsgruppe->get_all_sorted(where => [ id => $self->part->buchungsgruppen_id ]);
   }
+
+  return SL::DB::Manager::Buchungsgruppe->get_all_sorted(
+    where => [
+      or => [
+        id       => $self->part->buchungsgruppen_id,
+        obsolete => 0,
+      ],
+    ]
+  );
 }
 
 sub init_shops_not_assigned {
@@ -1123,6 +1473,10 @@ sub init_all_pricegroups {
   SL::DB::Manager::Pricegroup->get_all_sorted(query => [ obsolete => 0 ]);
 }
 
+sub init_all_businesses {
+  SL::DB::Manager::Business->get_all_sorted;
+}
+
 # model used to filter/display the parts in the multi-items dialog
 sub init_multi_items_models {
   SL::Controller::Helper::GetModels->new(
@@ -1230,6 +1584,21 @@ sub form_check_partnumber_is_unique {
   return 1;
 }
 
+sub form_check_buchungsgruppe {
+  my ($self) = @_;
+
+  return 1 if $::form->{part}->{obsolete};
+
+  my $buchungsgruppe = SL::DB::Buchungsgruppe->new(id => $::form->{part}->{buchungsgruppen_id})->load;
+
+  return 1 if !$buchungsgruppe->obsolete;
+
+  $self->js->flash('error', t8("The booking group '#1' is obsolete and cannot be used with active articles.", $buchungsgruppe->description))
+    ->focus('#part_buchungsgruppen_id');
+
+  return 0;
+}
+
 # general checking functions
 
 sub check_part_id {
@@ -1244,6 +1613,7 @@ sub check_form {
   $self->form_check_assortment_items_unique || return 0;
   $self->form_check_assembly_items_exist    || return 0;
   $self->form_check_partnumber_is_unique    || return 0;
+  $self->form_check_buchungsgruppe          || return 0;
 
   return 1;
 }
@@ -1342,6 +1712,18 @@ sub parse_add_items_to_objects {
   return \@item_objects;
 }
 
+sub _is_in_purchase_basket {
+  my ( $self ) = @_;
+
+  return SL::DB::Manager::PurchaseBasketItem->get_all_count( query => [ part_id => $self->part->id ] );
+}
+
+sub _is_ordered {
+  my ( $self ) = @_;
+
+  return $self->part->get_ordered_qty( $self->part->id );
+}
+
 sub _setup_form_action_bar {
   my ($self) = @_;
 
@@ -1375,11 +1757,29 @@ sub _setup_form_action_bar {
           disabled => !$self->part->id                                    ? t8('The object has not been saved yet.')
                     : !$may_edit                                          ? t8('You do not have the permissions to access this function.')
                     : !$::auth->assert('purchase_order_edit', 'may fail') ? t8('You do not have the permissions to access this function.')
+                    : $self->part->order_locked                           ? t8('This part should not be ordered any more.')
                     :                                                       undef,
           only_if  => !$::form->{inline_create},
         ],
       ],
 
+      combobox => [
+        action => [
+          t8('Export'),
+          only_if => $self->part->is_assembly || $self->part->is_assortment,
+        ],
+        action => [
+          $self->part->is_assembly ? t8('Assembly items') : t8('Assortment items'),
+          submit   => [ '#ic', { action => "Part/export_assembly_assortment_components" } ],
+          checks   => ['kivi.validate_form'],
+          disabled => !$self->part->id                                    ? t8('The object has not been saved yet.')
+                    : !$may_edit                                          ? t8('You do not have the permissions to access this function.')
+                    : !$::auth->assert('purchase_order_edit', 'may fail') ? t8('You do not have the permissions to access this function.')
+                    :                                                       undef,
+          only_if  => $self->part->is_assembly || $self->part->is_assortment,
+        ],
+      ],
+
       action => [
         t8('Abort'),
         submit   => [ '#ic', { action => "Part/abort" } ],
@@ -1397,6 +1797,16 @@ sub _setup_form_action_bar {
                   :                          undef,
       ],
 
+      action => [
+        t8('Add to basket'),
+        call     => [ 'kivi.Part.add_to_basket' ],
+        disabled => !$self->part->id       ? t8('This object has not been saved yet.')
+                  : $self->_is_in_purchase_basket ? t8('Part already in purchasebasket')
+                  : $self->_is_ordered ? t8('Part already ordered')
+                  : !scalar @{$self->part->makemodels} ? t8('No vendors to add to purchasebasket')
+                  : undef,
+      ],
+
       'separator',
 
       action => [
diff --git a/SL/Controller/PartsPriceHistory.pm b/SL/Controller/PartsPriceHistory.pm
index 82263b876..7cf59fe8d 100644
--- a/SL/Controller/PartsPriceHistory.pm
+++ b/SL/Controller/PartsPriceHistory.pm
@@ -70,10 +70,11 @@ sub column_defs {
   my ($self) = @_;
 
   return {
-    valid_from => { text => $::locale->text('Date'),       sub => sub { $_[0]->valid_from_as_timestamp }},
-    lastcost   => { text => $::locale->text('Lastcost'),   sub => sub { $_[0]->lastcost_as_number }},
-    listprice  => { text => $::locale->text('List Price'), sub => sub { $_[0]->listprice_as_number }},
-    sellprice  => { text => $::locale->text('Sell Price'), sub => sub { $_[0]->sellprice_as_number }},
+    valid_from   => { text => $::locale->text('Date'),         sub => sub { $_[0]->valid_from_as_timestamp }},
+    lastcost     => { text => $::locale->text('Lastcost'),     sub => sub { $_[0]->lastcost_as_number }},
+    listprice    => { text => $::locale->text('List Price'),   sub => sub { $_[0]->listprice_as_number }},
+    sellprice    => { text => $::locale->text('Sell Price'),   sub => sub { $_[0]->sellprice_as_number }},
+    price_factor => { text => $::locale->text('Price Factor'), sub => sub { $_[0]->price_factor_as_number }},
   };
 }
 
@@ -86,7 +87,7 @@ sub prepare_report {
 
   my $title       = $::locale->text('Price history for master data');
 
-  my @columns     = qw(valid_from lastcost listprice sellprice);
+  my @columns     = qw(valid_from lastcost listprice sellprice price_factor);
 
   my $column_defs = $self->column_defs;
 
diff --git a/SL/Controller/PartsPriceUpdate.pm b/SL/Controller/PartsPriceUpdate.pm
index 8481998d4..738f29693 100644
--- a/SL/Controller/PartsPriceUpdate.pm
+++ b/SL/Controller/PartsPriceUpdate.pm
@@ -92,7 +92,7 @@ sub _create_filter_for_priceupdate {
   my @where_values;
   my $where = '1 = 1';
 
-  for my $item (qw(partnumber drawing microfiche make model pg.partsgroup description serialnumber)) {
+  for my $item (qw(partnumber drawing microfiche pg.partsgroup description serialnumber)) {
     my $column = $item;
     $column =~ s/.*\.//;
     next unless $filter->{$column};
@@ -130,10 +130,14 @@ sub _create_filter_for_priceupdate {
 
   }
 
-  for my $column (qw(make model)) {
-    next unless ($filter->{$column});
-    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;
-    push @where_values, "%$filter->{$column}%";
+  if ($filter->{make}) {
+    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE make = ?) |;
+    push @where_values, $filter->{make};
+  }
+
+  if ($filter->{model}) {
+    $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE model ILIKE ?) |;
+    push @where_values, "%$filter->{model}%";
   }
 
   return ($where, @where_values);
@@ -273,7 +277,7 @@ sub init_pricegroups_by_id {
 }
 
 sub check_rights {
-  $::auth->assert('part_service_assembly_edit');
+  $::auth->assert('part_service_assembly_edit & part_service_assembly_edit_prices');
 }
 
 sub init_filter {
diff --git a/SL/Controller/PayPostingImport.pm b/SL/Controller/PayPostingImport.pm
index c8d39091d..733dc5d28 100644
--- a/SL/Controller/PayPostingImport.pm
+++ b/SL/Controller/PayPostingImport.pm
@@ -17,7 +17,15 @@ sub action_upload_pay_postings {
   my ($self, %params) = @_;
 
   $self->setup_pay_posting_action_bar;
-  $self->render('pay_posting_import/form', title => $::locale->text('Import Pay Postings'));
+
+  # new closedto
+  my $today = DateTime->now();
+  $today->subtract(months => 1);
+
+  my $dt = DateTime->last_day_of_month(year  => $today->year, month => $today->month);
+
+  my $new_closedto = $dt->to_kivitendo();
+  $self->render('pay_posting_import/form', title => $::locale->text('Import Pay Postings'), closedto => $new_closedto);
 }
 
 sub action_import_datev_pay_postings {
@@ -39,6 +47,9 @@ sub action_import_datev_pay_postings {
   if (parse_and_import($self)) {
     flash_later('info', t8("All pay postings successfully imported."));
   }
+  if ($::form->{set_closedto} && _set_closedto($self)) {
+    flash_later('info', t8("Books closed until:") . ' ' . $::form->{closedto});
+  }
   $self->setup_pay_posting_action_bar;
   $self->render('pay_posting_import/form', title => $::locale->text('Imported Pay Postings'));
 }
@@ -124,6 +135,19 @@ sub parse_and_import {
   }) or do { die t8("Cannot add Booking, reason: #1 DB: #2 ", $@, SL::DB->client->error) };
 }
 
+
+sub _set_closedto {
+  my $self     = shift;
+  die "no date:" . $::form->{closedto} unless $::form->{closedto};
+
+  my $defaults   = SL::DB::Default->get;
+
+  $defaults->closedto(DateTime->from_kivitendo($::form->{closedto}));
+  $defaults->save || die "Cannot save closedto!";
+
+  return 1;
+}
+
 sub check_auth {
   $::auth->assert('general_ledger');
 }
diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm
index 0579c5349..6b7ec06b4 100644
--- a/SL/Controller/PriceRule.pm
+++ b/SL/Controller/PriceRule.pm
@@ -17,7 +17,7 @@ use SL::Locale::String;
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(models price_rule vc pricegroups partsgroups businesses) ],
+ 'scalar --get_set_init' => [ qw(models price_rule vc pricegroups partsgroups businesses cvar_configs) ],
 );
 
 # __PACKAGE__->run_before('check_auth');
@@ -80,7 +80,9 @@ sub action_destroy {
 sub action_add_item_row {
   my ($self, %params) = @_;
 
-  my $item = SL::DB::PriceRuleItem->new(type => $::form->{type});
+  my $item = $::form->{type} =~ m{cvar/(\d+)}
+    ? SL::DB::PriceRuleItem->new(type => 'cvar', custom_variable_configs_id => $1)
+    : SL::DB::PriceRuleItem->new(type => $::form->{type});
 
   my $html = $self->render('price_rule/item', { output => 0 }, item => $item);
 
@@ -189,6 +191,10 @@ sub prepare_report {
   if ( $report->{options}{output_format} =~ /^(pdf|csv)$/i ) {
     $self->models->disable_plugin('paginated');
   }
+
+  my $title        = t8('Price Rules');
+  $report->{title} = $title; #for browser titlebar (title-tag)
+
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'PriceRule',
@@ -235,7 +241,10 @@ sub make_filter_summary {
 }
 
 sub all_price_rule_item_types {
-  SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->vc || $_[0]->price_rule->type);
+  my $item_types = SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->vc || $_[0]->price_rule->type);
+  my @cvar_types = map [ "cvar/" . $_->id, $_->presenter->description_with_module ], @{$_[0]->cvar_configs };
+
+  [ @$item_types, @cvar_types ];
 }
 
 sub add_javascripts  {
@@ -255,7 +264,9 @@ sub init_price_rule {
 
   my @items;
   for my $raw_item (@$items) {
-    my $item = $raw_item->{id} ? $old_items{ $raw_item->{id} } || SL::DB::PriceRuleItem->new(id => $raw_item->{id})->load : SL::DB::PriceRuleItem->new;
+    my $item = $raw_item->{id}
+      ? $old_items{ $raw_item->{id} } || SL::DB::PriceRuleItem->new(id => $raw_item->{id})->load
+      : SL::DB::PriceRuleItem->new;
     $item->assign_attributes(%$raw_item);
     push @items, $item;
   }
@@ -281,6 +292,16 @@ sub init_partsgroups {
   SL::DB::Manager::PartsGroup->get_all;
 }
 
+sub init_cvar_configs {
+  # eligible cvars for this are all that are reachable from a record or recorditem (all modules but requirement spec)
+  # and of a type that price rules support (currently: id-based with picker, numeric or date) and by special request select
+  SL::DB::Manager::CustomVariableConfig->get_all(where => [
+    "!module" => 'RequirementSpecs',
+    type => [ qw(timestamp date number integer customer vendor part select) ],
+  ]) ;
+}
+
+
 sub all_price_types {
   SL::DB::Manager::PriceRule->all_price_types;
 }
diff --git a/SL/Controller/PriceSource.pm b/SL/Controller/PriceSource.pm
index c0c113cd0..2304948f1 100644
--- a/SL/Controller/PriceSource.pm
+++ b/SL/Controller/PriceSource.pm
@@ -126,6 +126,8 @@ sub _make_record_item {
         $obj->${\"$method\_as_date"}($value);
       } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
         $obj->${\"$method\_as_number"}($value);
+      } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) {
+        $obj->$method(($value // '') eq '' ? undef : $value * 1);
       } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
         $obj->$method(!!$value);
       } else {
@@ -180,6 +182,8 @@ sub _make_record {
       $obj->${\"$method\_as_date"}($::form->{$method});
     } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Numeric|Float|DoublePrecsion)$/) {
       $obj->${\"$method\_as\_number"}($::form->{$method});
+    } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::(?:Big)?(?:Int(?:eger)?|Serial)$/) {
+      $obj->$method(($::form->{$method} // '') eq '' ? undef : $::form->{$method} * 1)
     } elsif ((ref $obj->meta->column($method)) =~ /^Rose::DB::Object::Metadata::Column::Boolean$/) {
       $obj->$method(!!$::form->{$method});
     } else {
diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index 702db8907..351c5d35a 100644
--- a/SL/Controller/Project.pm
+++ b/SL/Controller/Project.pm
@@ -248,7 +248,7 @@ sub display_form {
 
   CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} };
 
-  $::request->layout->use_javascript("$_.js") for qw(kivi.File ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->layout->use_javascript("$_.js") for qw(kivi.File ckeditor5/ckeditor ckeditor5/translations/de);
   $self->setup_edit_action_bar(callback => $params{callback});
 
   $self->render('project/form', %params);
@@ -304,8 +304,9 @@ sub prepare_report {
 
   my $callback    = $self->models->get_callback;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Projects');
+  $self->{report}  = $report;
 
   my @columns     = qw(project_status customer projectnumber description active valid project_type);
   my @sortable    = qw(projectnumber description customer              project_type project_status);
diff --git a/SL/Controller/Reclamation.pm b/SL/Controller/Reclamation.pm
new file mode 100644
index 000000000..6b6ee5b4e
--- /dev/null
+++ b/SL/Controller/Reclamation.pm
@@ -0,0 +1,2532 @@
+package SL::Controller::Reclamation;
+
+use strict;
+use parent qw(SL::Controller::Base);
+
+use SL::Helper::Flash qw(flash_later);
+use SL::HTML::Util;
+use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);
+use SL::Presenter::ReclamationFilter qw(filter);
+use SL::Locale::String qw(t8);
+use SL::SessionFile::Random;
+use SL::PriceSource;
+use SL::ReportGenerator;
+use SL::Controller::Helper::ReportGenerator;
+use SL::Webdav;
+use SL::File;
+use SL::MIME;
+use SL::Util qw(trim);
+use SL::YAML;
+use SL::DB::History;
+use SL::DB::Reclamation;
+use SL::DB::ReclamationItem;
+use SL::DB::Default;
+use SL::DB::Printer;
+use SL::DB::Language;
+use SL::DB::RecordLink;
+use SL::DB::Shipto;
+use SL::DB::Translation;
+use SL::DB::ValidityToken;
+use SL::DB::EmailJournal;
+use SL::DB::Helper::RecordLink qw(set_record_link_conversions RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
+use SL::DB::Helper::TypeDataProxy;
+use SL::DB::Helper::Record qw(get_object_name_from_type get_class_from_type);
+
+use SL::Helper::CreatePDF qw(:all);
+use SL::Helper::PrintOptions;
+use SL::Helper::UserPreferences::PositionsScrollbar;
+use SL::Helper::UserPreferences::UpdatePositions;
+
+use SL::Controller::Helper::GetModels;
+
+use SL::DB::Order;
+use SL::DB::DeliveryOrder;
+use SL::DB::Invoice;
+use SL::Model::Record;
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Reclamation::TypeData qw(:types);
+
+use List::Util qw(first sum0);
+use List::UtilsBy qw(sort_by uniq_by);
+use List::MoreUtils qw(any none pairwise first_index);
+use English qw(-no_match_vars);
+use File::Spec;
+use Cwd;
+use Sort::Naturally;
+
+use Rose::Object::MakeMethods::Generic
+(
+ scalar => [ qw(item_ids_to_delete is_custom_shipto_to_delete) ],
+ 'scalar --get_set_init' => [qw(
+    all_price_factors cv models p part_picker_classification_ids reclamation
+    search_cvpartnumber show_update_button type valid_types type_data
+ )],
+);
+
+
+# safety
+__PACKAGE__->run_before('check_auth');
+
+__PACKAGE__->run_before('recalc',
+                        only => [qw(
+                          save save_as_new print preview_pdf send_email
+                          save_and_show_email_dialog
+                          save_and_new_record
+                          save_and_credit_note
+                       )]);
+
+__PACKAGE__->run_before('get_unalterable_data',
+                        only => [qw(
+                          save save_as_new print preview_pdf send_email
+                          save_and_show_email_dialog
+                          save_and_new_record
+                          save_and_credit_note
+                        )]);
+
+#
+# actions
+#
+
+# add a new reclamation
+sub action_add {
+  my ($self) = @_;
+
+  $self->pre_render();
+
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECLAMATION_SAVE())->token;
+  }
+
+  $self->render(
+    'reclamation/form',
+    title => $self->type_data->text('add'),
+    %{$self->{template_args}},
+  );
+}
+
+sub action_add_from_record {
+  my ($self) = @_;
+  my $from_type = $::form->{from_type};
+  my $from_id   = $::form->{from_id};
+
+  die "No 'from_type' was given." unless ($from_type);
+  die "No 'from_id' was given."   unless ($from_id);
+
+  my %flags = ();
+  if (defined($::form->{from_item_ids})) {
+    my %use_item = map { $_ => 1 } @{$::form->{from_item_ids}};
+    $flags{item_filter} = sub {
+      my ($item) = @_;
+      return %use_item{$item->{RECORD_ITEM_ID()}};
+    }
+  }
+
+  my $record = SL::Model::Record->get_record($from_type, $from_id);
+  my $reclamation = SL::Model::Record->new_from_workflow($record, $self->type, %flags);
+  $self->reclamation($reclamation);
+  $self->reinit_after_new_reclamation();
+
+  if ($record->type eq SALES_RECLAMATION_TYPE()) { # check for direct delivery
+    # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
+    if ($::form->{use_shipto}) {
+      my $custom_shipto = $record->shipto->clone('SL::DB::Reclamation');
+      $self->reclamation->custom_shipto($custom_shipto) if $custom_shipto;
+    } else {
+      # remove any custom shipto if not wanted
+      $self->reclamation->custom_shipto(SL::DB::Shipto->new(module => 'RC', custom_variables => []));
+    }
+  }
+
+  $self->action_add;
+}
+
+sub action_add_from_email_journal {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+
+  $self->action_add();
+}
+
+sub action_edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  $self->action_edit();
+}
+
+# edit an existing reclamation
+sub action_edit {
+  my ($self) = @_;
+  die "No 'id' was given." unless $::form->{id};
+
+  $self->load_reclamation();
+
+  $self->pre_render();
+  $self->render(
+    'reclamation/form',
+    title => $self->type_data->text('edit'),
+    %{$self->{template_args}},
+  );
+}
+
+# delete the reclamation
+sub action_delete {
+  my ($self) = @_;
+
+
+  SL::Model::Record->delete($self->reclamation);
+  flash_later('info', $self->type_data->text('delete'));
+
+  my @redirect_params = (
+    action => 'add',
+    type   => $self->type,
+  );
+
+  $self->redirect_to(@redirect_params);
+}
+
+# save the reclamation
+sub action_save {
+  my ($self) = @_;
+
+  $self->save();
+
+  flash_later('info', t8('The reclamation has been saved'));
+
+  my @redirect_params;
+  if ($::form->{back_to_caller}) {
+    @redirect_params = $::form->{callback} ? ($::form->{callback})
+                                           : (controller => 'LoginScreen', action => 'user_login');
+  } else {
+    @redirect_params = (
+      action => 'edit',
+      type   => $self->type,
+      id     => $self->reclamation->id,
+      callback => $::form->{callback},
+    );
+  }
+
+  $self->redirect_to(@redirect_params);
+}
+
+sub action_list {
+  my ($self) = @_;
+
+  $self->_setup_search_action_bar;
+  $self->prepare_report;
+  $self->report_generator_list_objects(
+    report => $self->{report},
+    objects => $self->models->get,
+    options => {
+      action_bar_additional_submit_values => {
+        type => $self->type,
+      },
+    },
+  );
+}
+
+# save the reclamation as new document an open it for edit
+sub action_save_as_new {
+  my ($self) = @_;
+
+  my $reclamation = $self->reclamation;
+
+  if (!$reclamation->id) {
+    $self->js->flash('error', t8('This object has not been saved yet.'));
+    return $self->js->render();
+  }
+
+  my $saved_reclamation = SL::DB::Reclamation->new(id => $reclamation->id)->load;
+
+  # Create new record from current one
+  my $new_reclamation = SL::Model::Record->clone_for_save_as_new($saved_reclamation, $reclamation);
+  $self->reclamation($new_reclamation);
+
+  if (!$::form->{form_validity_token}) {
+    $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECLAMATION_SAVE())->token;
+  }
+
+  # save
+  $self->action_save();
+}
+
+# print the reclamation
+#
+# This is called if "print" is pressed in the print dialog.
+# If PDF creation was requested and succeeded, the pdf is offered for download
+# via send_file (which uses ajax in this case).
+sub action_print {
+  my ($self) = @_;
+
+  $self->save();
+
+  $self->js_reset_reclamation_and_item_ids_after_save;
+
+  my $format      = $::form->{print_options}->{format};
+  my $media       = $::form->{print_options}->{media};
+  my $formname    = $::form->{print_options}->{formname};
+  my $copies      = $::form->{print_options}->{copies};
+  my $groupitems  = $::form->{print_options}->{groupitems};
+  my $printer_id  = $::form->{print_options}->{printer_id};
+
+  # only pdf and opendocument by now
+  if (none { $format eq $_ } qw(pdf opendocument opendocument_pdf)) {
+    return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render;
+  }
+
+  # only screen or printer by now
+  if (none { $media eq $_ } qw(screen printer)) {
+    return $self->js->flash('error', t8('Media \'#1\' is not supported yet/anymore.', $media))->render;
+  }
+
+  # create a form for generate_attachment_filename
+  my $form   = Form->new;
+  $form->{record_number} = $self->reclamation->record_number;
+  $form->{type}          = $self->type;
+  $form->{format}        = $format;
+  $form->{formname}      = $formname;
+  $form->{language}      = '_' . $self->reclamation->language->template_code if $self->reclamation->language;
+  my $pdf_filename       = $form->generate_attachment_filename();
+
+  my $pdf;
+  my @errors = generate_pdf($self->reclamation, \$pdf, {
+                              format     => $format,
+                              formname   => $formname,
+                              language   => $self->reclamation->language,
+                              printer_id => $printer_id,
+                              groupitems => $groupitems,
+                            });
+  if (scalar @errors) {
+    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+  }
+
+  if ($media eq 'screen') { # screen/download
+    $self->js->flash('info', t8('The PDF has been created'));
+    $self->send_file(
+      \$pdf,
+      type         => SL::MIME->mime_type_from_ext($pdf_filename),
+      name         => $pdf_filename,
+      js_no_render => 1,
+    );
+  } elsif ($media eq 'printer') { # printer
+    my $printer_id = $::form->{print_options}->{printer_id};
+    SL::DB::Printer->new(id => $printer_id)->load->print_document(
+      copies  => $copies,
+      content => $pdf,
+    );
+    $self->js->flash('info', t8('The PDF has been printed'));
+  }
+
+  my @warnings = store_pdf_to_webdav_and_filemanagement($self->reclamation, $pdf, $pdf_filename);
+  if (scalar @warnings) {
+    $self->js->flash('warning', $_) for @warnings;
+  }
+
+  $self->save_history('PRINTED');
+
+  $self->js
+    ->run('kivi.ActionBar.setEnabled', '#save_and_email_action')
+    ->render;
+}
+
+sub action_preview_pdf {
+  my ($self) = @_;
+
+  $self->save();
+
+  $self->js_reset_reclamation_and_item_ids_after_save;
+
+  my $format      = 'pdf';
+  my $media       = 'screen';
+  my $formname    = $self->type;
+
+  # only pdf
+  # create a form for generate_attachment_filename
+  my $form   = Form->new;
+  $form->{record_number} = $self->reclamation->record_number;
+  $form->{type}          = $self->type;
+  $form->{format}        = $format;
+  $form->{formname}      = $formname;
+  $form->{language}      = '_' . $self->reclamation->language->template_code if $self->reclamation->language;
+  my $pdf_filename       = $form->generate_attachment_filename();
+
+  my $pdf;
+  my @errors = generate_pdf($self->reclamation, \$pdf, {
+                             format     => $format,
+                             formname   => $formname,
+                             language   => $self->reclamation->language,
+                           });
+  if (scalar @errors) {
+    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+  }
+  $self->save_history('PREVIEWED');
+  $self->js->flash('info', t8('The PDF has been previewed'));
+  # screen/download
+  $self->send_file(
+    \$pdf,
+    type         => SL::MIME->mime_type_from_ext($pdf_filename),
+    name         => $pdf_filename,
+    js_no_render => 0,
+  );
+}
+
+# open the email dialog
+sub action_save_and_show_email_dialog {
+  my ($self) = @_;
+
+  $self->save();
+  $self->js_reset_reclamation_and_item_ids_after_save;
+
+  my $cv = $self->reclamation->customervendor
+    or return $self->js->flash('error',
+      $self->type_data->properties('is_customer') ?
+          t8('Cannot send E-mail without customer given')
+        : t8('Cannot send E-mail without vendor given')
+    )->render($self);
+
+  my $form = Form->new;
+  $form->{record_number}    = $self->reclamation->record_number;
+  $form->{cv_record_number} = $self->reclamation->cv_record_number;
+  $form->{formname}         = $self->type;
+  $form->{type}             = $self->type;
+  $form->{language}         = '_' . $self->reclamation->language->template_code if $self->reclamation->language;
+  $form->{language_id}      = $self->reclamation->language->id                  if $self->reclamation->language;
+  $form->{format}           = 'pdf';
+  $form->{cp_id}            = $self->reclamation->contact->cp_id if $self->reclamation->contact;
+
+  my $email_form;
+  $email_form->{to} =
+       ($self->reclamation->contact ? $self->reclamation->contact->cp_email : undef)
+    ||  $cv->email;
+  $email_form->{cc}  = $cv->cc;
+  $email_form->{bcc} = join ', ', grep $_, $cv->bcc;
+  # TODO: get addresses from shipto, if any
+  $email_form->{subject}             = $form->generate_email_subject();
+  $email_form->{attachment_filename} = $form->generate_attachment_filename();
+  $email_form->{message}             = $form->generate_email_body();
+  $email_form->{js_send_function}    = 'kivi.Reclamation.send_email()';
+
+  my %files = $self->get_files_for_email_dialog();
+
+  my @employees_with_email = grep {
+    my $user = SL::DB::Manager::AuthUser->find_by(login => $_->login);
+    $user && !!trim($user->get_config_value('email'));
+  } @{ SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]) };
+
+  my $dialog_html = $self->render(
+    'common/_send_email_dialog', { output => 0 },
+    email_form  => $email_form,
+    show_bcc    => $::auth->assert('email_bcc', 'may fail'),
+    FILES       => \%files,
+    is_customer => $self->type_data->properties('is_customer'),
+    ALL_EMPLOYEES => \@employees_with_email,
+    ALL_PARTNER_EMAIL_ADDRESSES => $cv->get_all_email_addresses(),
+  );
+
+  $self->js
+    ->run('kivi.Reclamation.show_email_dialog', $dialog_html)
+    ->reinit_widgets
+    ->render($self);
+}
+
+# send email
+sub action_send_email {
+  my ($self) = @_;
+
+  eval {
+    $self->save();
+    1;
+  } or do {
+    $self->js->run('kivi.Reclamation.close_email_dialog');
+    die $EVAL_ERROR;
+  };
+
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+    id     => $self->reclamation->id,
+  );
+
+  # Set the error handler to reload the document and display errors later,
+  # because the document is already saved and saving can have some side effects
+  # such as generating a document number, project number or record links,
+  # which will be up to date when the document is reloaded.
+  # Hint: Do not use "die" here and try to catch exceptions in subroutine
+  # calls. You should use "$::form->error" which respects the error handler.
+  local $::form->{__ERROR_HANDLER} = sub {
+      flash_later('error', $_[0]);
+      $self->redirect_to(@redirect_params);
+      $::dispatcher->end_request;
+  };
+
+  # move $::form->{email_form} to $::form
+  my $email_form  = delete $::form->{email_form};
+
+  if ($email_form->{additional_to}) {
+    $email_form->{to} = join ', ', grep { $_ } $email_form->{to}, @{$email_form->{additional_to}};
+    delete $email_form->{additional_to};
+  }
+
+  my %field_names = (to => 'email');
+  $::form->{ $field_names{$_} // $_ } = $email_form->{$_} for keys %{ $email_form };
+
+  # for Form::cleanup which may be called in Form::send_email
+  $::form->{cwd}    = getcwd();
+  $::form->{tmpdir} = $::lx_office_conf{paths}->{userspath};
+
+  $::form->{$_}     = $::form->{print_options}->{$_} for keys %{$::form->{print_options}};
+  $::form->{media}  = 'email';
+
+  $::form->{attachment_policy} //= '';
+
+  # Is an old file version available?
+  my $attfile;
+  if ($::form->{attachment_policy} eq 'old_file') {
+    $attfile = SL::File->get_all(
+      object_id     => $self->reclamaiton->id,
+      object_type   => $self->type,
+      print_variant => $::form->{formname},
+    );
+  }
+
+  if (   $::form->{attachment_policy} ne 'no_file'
+    && !($::form->{attachment_policy} eq 'old_file' && $attfile)
+  ) {
+    my $pdf;
+    my @errors = generate_pdf(
+      $self->reclamation, \$pdf, {
+        media      => $::form->{media},
+        format     => $::form->{print_options}->{format},
+        formname   => $::form->{print_options}->{formname},
+        language   => $self->reclamation->language,
+        printer_id => $::form->{print_options}->{printer_id},
+        groupitems => $::form->{print_options}->{groupitems},
+      });
+    if (scalar @errors) {
+      $::form->error(t8('Generating the document failed: #1', $errors[0]));
+    }
+
+    my @warnings = store_pdf_to_webdav_and_filemanagement(
+      $self->reclamation, $pdf, $::form->{attachment_filename}
+    );
+    if (scalar @warnings) {
+      flash_later('warning', $_) for @warnings;
+    }
+
+    my $sfile = SL::SessionFile::Random->new(mode => "w");
+    $sfile->fh->print($pdf);
+    $sfile->fh->close;
+
+    $::form->{tmpfile} = $sfile->file_name;
+    $::form->{tmpdir}  = $sfile->get_path; # for Form::cleanup which may be
+                                           # called in Form::send_email
+  }
+
+  $::form->{id} = $self->reclamation->id; # this is used in SL::Mailer to
+                                          # create a linked record to the mail
+  $::form->send_email(\%::myconfig, 'pdf');
+
+  flash_later('info', t8('The email has been sent.'));
+  $self->save_history('MAILED');
+
+  # internal notes unless no email journal
+  unless ($::instance_conf->get_email_journal) {
+    my $intnotes = $self->reclamation->intnotes;
+    $intnotes   .= "\n\n" if $self->reclamation->intnotes;
+    $intnotes   .= t8('[email]')                                       . "\n";
+    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(
+                                               DateTime->now_local,
+                                               precision => 'seconds') . "\n";
+    $intnotes   .= t8('To (email)') . ": " . $::form->{email}          . "\n";
+    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}             . "\n"    if $::form->{cc};
+    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}            . "\n"    if $::form->{bcc};
+    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}        . "\n\n";
+    $intnotes   .= t8('Message')    . ": " . SL::HTML::Util->strip($::form->{message});
+
+    $self->reclamation->update_attributes(intnotes => $intnotes);
+  }
+
+  $self->redirect_to(@redirect_params);
+}
+
+sub action_save_and_new_record {
+  my ($self) = @_;
+  my $to_type = $::form->{to_type};
+  my $to_controller = get_object_name_from_type($to_type);
+
+  $self->save();
+  flash_later('info', t8('The reclamation has been saved'));
+
+  my %additional_params = ();
+  if ($::form->{only_selected_item_positions}) { # ids can be unset before save
+    my $item_positions = $::form->{selected_item_positions} || [];
+    my @from_item_ids = map { $self->reclamation->items_sorted->[$_]->id } @$item_positions;
+    $additional_params{from_item_ids} = \@from_item_ids;
+  }
+
+  $self->redirect_to(
+    controller => $to_controller,
+    action     => 'add_from_record',
+    type       => $to_type,
+    from_id    => $self->reclamation->id,
+    from_type  => $self->reclamation->type,
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+    %additional_params,
+  );
+}
+
+# save the reclamation and redirect to the frontend subroutine for a new
+# credit_note
+sub action_save_and_credit_note {
+  my ($self) = @_;
+
+  # always save
+  $self->save();
+
+  if (!$self->reclamation->is_sales) {
+    $self->js->flash('error', t8("Can't convert Purchase Reclamation to Credit Note"));
+    return $self->js->render();
+  }
+
+  flash_later('info', t8('The reclamation has been saved'));
+  $self->redirect_to(
+    controller => 'is.pl',
+    action     => 'credit_note_from_reclamation',
+    from_id    => $self->reclamation->id,
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+  );
+}
+
+# set form elements in respect to a changed customer or vendor
+#
+# This action is called on an change of the customer/vendor picker.
+sub action_customer_vendor_changed {
+  my ($self) = @_;
+
+  $self->reclamation(
+    SL::Model::Record->update_after_customer_vendor_change($self->reclamation));
+
+  $self->recalc();
+
+  if ( $self->reclamation->customervendor->contacts
+       && scalar @{ $self->reclamation->customervendor->contacts } > 0) {
+    $self->js->show('#cp_row');
+  } else {
+    $self->js->hide('#cp_row');
+  }
+
+  if ($self->reclamation->customervendor->shipto
+      && scalar @{ $self->reclamation->customervendor->shipto } > 0) {
+    $self->js->show('#shipto_selection');
+  } else {
+    $self->js->hide('#shipto_selection');
+  }
+
+  $self->js->val( '#reclamation_salesman_id', $self->reclamation->salesman_id) if $self->reclamation->is_sales;
+
+  $self->js
+    ->replaceWith('#reclamation_cp_id',            $self->build_contact_select)
+    ->replaceWith('#reclamation_shipto_id',        $self->build_shipto_select)
+    ->replaceWith('#shipto_inputs  ',              $self->build_shipto_inputs)
+    ->replaceWith('#business_info_row',            $self->build_business_info_row)
+    ->val(        '#reclamation_taxzone_id',       $self->reclamation->taxzone_id)
+    ->val(        '#reclamation_taxincluded',      $self->reclamation->taxincluded)
+    ->val(        '#reclamation_currency_id',      $self->reclamation->currency_id)
+    ->val(        '#reclamation_payment_id',       $self->reclamation->payment_id)
+    ->val(        '#reclamation_delivery_term_id', $self->reclamation->delivery_term_id)
+    ->val(        '#reclamation_intnotes',         $self->reclamation->intnotes)
+    ->val(        '#reclamation_language_id',      $self->reclamation->customervendor->language_id)
+    ->focus(      '#reclamation_' . $self->cv . '_id')
+    ->run('kivi.Reclamation.update_exchangerate');
+
+  $self->js_redisplay_amounts_and_taxes;
+  $self->js_redisplay_cvpartnumbers;
+  $self->js->render();
+}
+
+# called if a unit in an existing item row is changed
+sub action_unit_changed {
+  my ($self) = @_;
+
+  my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{reclamation_item_ids} };
+  my $item = $self->reclamation->items_sorted->[$idx];
+
+  my $old_unit_obj = SL::DB::Unit->new(name => $::form->{old_unit})->load;
+  $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
+
+  $self->recalc();
+
+  $self->js
+    ->run('kivi.Reclamation.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
+  $self->js_redisplay_line_values;
+  $self->js_redisplay_amounts_and_taxes;
+  $self->js->render();
+}
+
+# add an item row for a new item entered in the input row
+sub action_add_item {
+  my ($self) = @_;
+
+  delete $::form->{add_item}->{create_part_type};
+
+  my $form_attr = $::form->{add_item};
+
+  unless ($form_attr->{parts_id}) {
+    $self->js->flash('error', t8("No part was selected."));
+    return $self->js->render();
+  }
+
+
+  my $item = new_item($self->reclamation, $form_attr);
+
+  $self->reclamation->add_items($item);
+
+  $self->recalc();
+
+  $self->get_item_cvpartnumber($item);
+
+  my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+  my $row_as_html = $self->p->render('reclamation/tabs/basic_data/_row',
+                                     ITEM => $item,
+                                     ID   => $item_id,
+                                     SELF => $self,
+  );
+
+  if ($::form->{insert_before_item_id}) {
+    $self->js
+      ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+  } else {
+    $self->js
+      ->append('#row_table_id', $row_as_html);
+  }
+
+  if ( $item->part->is_assortment ) {
+    $form_attr->{qty_as_number} = 1 unless $form_attr->{qty_as_number};
+    foreach my $assortment_item ( @{$item->part->assortment_items} ) {
+      my $attr = { parts_id => $assortment_item->parts_id,
+                   qty      => $assortment_item->qty * $::form->parse_amount(\%::myconfig, $form_attr->{qty_as_number}), # TODO $form_attr->{unit}
+                   unit     => $assortment_item->unit,
+                   description => $assortment_item->part->description,
+                 };
+      my $item = new_item($self->reclamation, $attr);
+
+      # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
+      $item->discount(1) unless $assortment_item->charge;
+
+      $self->reclamation->add_items( $item );
+      $self->recalc();
+      $self->get_item_cvpartnumber($item);
+      my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+      my $row_as_html = $self->p->render('reclamation/tabs/basic_data/_row',
+                                         ITEM => $item,
+                                         ID   => $item_id,
+                                         SELF => $self,
+      );
+      if ($::form->{insert_before_item_id}) {
+        $self->js
+          ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+      } else {
+        $self->js
+          ->append('#row_table_id', $row_as_html);
+      }
+    };
+  };
+
+  $self->js
+    ->val('.add_item_input', '')
+    ->run('kivi.Reclamation.init_row_handlers')
+    ->run('kivi.Reclamation.renumber_positions')
+    ->focus('#add_item_parts_id_name');
+
+  $self->js->run('kivi.Reclamation.row_table_scroll_down') if !$::form->{insert_before_item_id};
+
+  $self->js_redisplay_amounts_and_taxes;
+  $self->js->render();
+}
+
+# add item rows for multiple items at once
+sub action_add_multi_items {
+  my ($self) = @_;
+
+  my @form_attr = grep { $_->{qty_as_number} } @{ $::form->{add_items} };
+  unless (scalar(@form_attr)) {
+    $self->js->flash('error', t8("No part was selected."));
+    return $self->js->render();
+  }
+
+  my @items;
+  foreach my $attr (@form_attr) {
+    my $item = new_item($self->reclamation, $attr);
+    push @items, $item;
+    if ( $item->part->is_assortment ) {
+      foreach my $assortment_item ( @{$item->part->assortment_items} ) {
+        my $attr = { parts_id => $assortment_item->parts_id,
+                     qty      => $assortment_item->qty * $item->qty, # TODO $form_attr->{unit}
+                     unit     => $assortment_item->unit,
+                     description => $assortment_item->part->description,
+                   };
+        my $item = new_item($self->reclamation, $attr);
+
+        # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
+        $item->discount(1) unless $assortment_item->charge;
+        push @items, $item;
+      }
+    }
+  }
+  $self->reclamation->add_items(@items);
+
+  $self->recalc();
+
+  foreach my $item (@items) {
+    $self->get_item_cvpartnumber($item);
+    my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+    my $row_as_html = $self->p->render('reclamation/tabs/basic_data/_row',
+                                       ITEM => $item,
+                                       ID   => $item_id,
+                                       SELF => $self,
+    );
+
+    if ($::form->{insert_before_item_id}) {
+      $self->js
+        ->before ('.row_entry:has(#item_' . $::form->{insert_before_item_id} . ')', $row_as_html);
+    } else {
+      $self->js
+        ->append('#row_table_id', $row_as_html);
+    }
+  }
+
+  $self->js
+    ->run('kivi.Part.close_picker_dialogs')
+    ->run('kivi.Reclamation.init_row_handlers')
+    ->run('kivi.Reclamation.renumber_positions')
+    ->focus('#add_item_parts_id_name');
+
+  $self->js->run('kivi.Reclamation.row_table_scroll_down') if !$::form->{insert_before_item_id};
+
+  $self->js_redisplay_amounts_and_taxes;
+  $self->js->render();
+}
+
+# recalculate all linetotals, amounts and taxes and redisplay them
+sub action_recalc_amounts_and_taxes {
+  my ($self) = @_;
+
+  $self->recalc();
+
+  $self->js_redisplay_line_values;
+  $self->js_redisplay_amounts_and_taxes;
+  $self->js->render();
+}
+
+sub action_update_exchangerate {
+  my ($self) = @_;
+
+  my $data = {
+    is_standard   => $self->reclamation->currency_id == $::instance_conf->get_currency_id,
+    currency_name => $self->reclamation->currency->name,
+    exchangerate  => $self->reclamation->daily_exchangerate_as_null_number,
+  };
+
+  $self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
+}
+
+# redisplay item rows if they are sorted by an attribute
+sub action_reorder_items {
+  my ($self) = @_;
+
+  my %sort_keys = (
+    partnumber   => sub { $_[0]->part->partnumber },
+    description  => sub { $_[0]->description },
+    reason       => sub { $_[0]->reason eq undef ? "" : $_[0]->reason->name },
+    reason_description_ext => sub { $_[0]->reason_description_ext },
+    reason_description_int => sub { $_[0]->reason_description_int },
+    qty          => sub { $_[0]->qty },
+    sellprice    => sub { $_[0]->sellprice },
+    discount     => sub { $_[0]->discount },
+    cvpartnumber => sub { $_[0]->{cvpartnumber} },
+  );
+
+  $self->get_item_cvpartnumber($_) for @{$self->reclamation->items_sorted};
+
+  my $method = $sort_keys{$::form->{order_by}};
+  my @to_sort = map { { old_pos => $_->position, order_by => $method->($_) } } @{ $self->reclamation->items_sorted };
+  if ($::form->{sort_dir}) {
+    if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){
+      @to_sort = sort { $a->{order_by} <=> $b->{order_by} } @to_sort;
+    } else {
+      @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort;
+    }
+  } else {
+    if ( $::form->{order_by} =~ m/qty|sellprice|discount/ ){
+      @to_sort = sort { $b->{order_by} <=> $a->{order_by} } @to_sort;
+    } else {
+      @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort;
+    }
+  }
+  $self->js
+    ->run('kivi.Reclamation.redisplay_items', \@to_sort)
+    ->render;
+}
+
+# show the popup to choose a price/discount source
+sub action_price_popup {
+  my ($self) = @_;
+
+  my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{reclamation_item_ids} };
+  my $item = $self->reclamation->items_sorted->[$idx];
+  if ($item->is_linked_to_record) {
+    $self->js->flash('error', t8("Can't change price of a linked item"));
+    return $self->js->render();
+  }
+
+  $self->render_price_dialog($item);
+}
+
+# save the reclamation in a session variable and redirect to the part controller
+sub action_create_part {
+  my ($self) = @_;
+
+  my $previousform = $::auth->save_form_in_session(non_scalars => 1);
+
+  my $callback     = $self->url_for(
+    action       => 'return_from_create_part',
+    type         => $self->type, # type is needed for check_auth on return
+    previousform => $previousform,
+  );
+
+  flash_later('info', t8('You are adding a new part while you are editing another document. You will be redirected to your document when saving the new part or aborting this form.'));
+
+  my @redirect_params = (
+    controller => 'Part',
+    action     => 'add',
+    part_type  => $::form->{add_item}->{create_part_type},
+    callback   => $callback,
+    show_abort => 1,
+  );
+
+  $self->redirect_to(@redirect_params);
+}
+
+sub action_return_from_create_part {
+  my ($self) = @_;
+
+  $self->{created_part} = SL::DB::Part->new(
+    id => delete $::form->{new_parts_id}
+  )->load if $::form->{new_parts_id};
+
+  $::auth->restore_form_from_session(delete $::form->{previousform});
+  $self->reclamation($self->init_reclamation);
+  $self->reinit_after_new_reclamation();
+
+  if ($self->reclamation->id) {
+    $self->pre_render();
+    $self->render(
+      'reclamation/form',
+      title => $self->type_data->text('edit'),
+      %{$self->{template_args}},
+    );
+  } else {
+    $self->action_add;
+  }
+}
+
+# load the second row for one or more items
+#
+# This action gets the html code for all items second rows by rendering a template for
+# the second row and sets the html code via client js.
+sub action_load_second_rows {
+  my ($self) = @_;
+
+  foreach my $item_id (@{ $::form->{reclamation_item_ids} }) {
+    my $idx  = first_index { $_ eq $item_id } @{ $::form->{reclamation_item_ids} };
+    my $item = $self->reclamation->items_sorted->[$idx];
+
+    $self->js_load_second_row($item, $item_id, 0);
+  }
+
+  $self->js->run('kivi.Reclamation.init_row_handlers') if $self->reclamation->is_sales; # for lastcosts change-callback
+
+  $self->js->render();
+}
+
+# update description, notes and sellprice from master data
+sub action_update_row_from_master_data {
+  my ($self) = @_;
+
+  foreach my $item_id (@{ $::form->{item_ids} }) {
+    my $idx   = first_index { $_ eq $item_id } @{ $::form->{reclamation_item_ids} };
+    my $item  = $self->reclamation->items_sorted->[$idx];
+
+    if ($item->is_linked_to_record) {
+      $self->js->flash_later('error', t8("Can't change data of a linked item. Part: " . $item->part->partnumber));
+      next;
+    }
+
+    my $texts = get_part_texts($item->part, $self->reclamation->language_id);
+
+    $item->description($texts->{description});
+    $item->longdescription($texts->{longdescription});
+
+    my ($price_src, undef) = SL::Model::Record->get_best_price_and_discount_source($self->reclamation, $item, ignore_given => 1);
+    $item->sellprice($price_src->price);
+    $item->active_price_source($price_src);
+
+    $self->js
+      ->run('kivi.Reclamation.update_sellprice', $item_id, $item->sellprice_as_number)
+      ->html('.row_entry:has(#item_' . $item_id
+             . ') [name = "partnumber"] a', $item->part->partnumber)
+      ->val ('.row_entry:has(#item_' . $item_id
+             . ') [name = "reclamation.reclamation_items[].description"]',
+             $item->description)
+      ->val ('.row_entry:has(#item_' . $item_id
+             . ') [name = "reclamation.reclamation_items[].longdescription"]',
+             $item->longdescription);
+
+    if ($self->search_cvpartnumber) {
+      $self->get_item_cvpartnumber($item);
+      $self->js->html('.row_entry:has(#item_' . $item_id
+                      . ') [name = "cvpartnumber"]', $item->{cvpartnumber});
+    }
+  }
+
+  $self->recalc();
+  $self->js_redisplay_line_values;
+  $self->js_redisplay_amounts_and_taxes;
+
+  $self->js->render();
+}
+
+sub js_load_second_row {
+  my ($self, $item, $item_id, $do_parse) = @_;
+
+  if ($do_parse) {
+    # Parse values from form (they are formated while rendering (template)).
+    # Workaround to pre-parse number-cvars (parse_custom_variable_values does
+    # not parse number values). This parsing is not necessary at all, if we
+    # assure that the second row/cvars are only loaded once.
+    foreach my $var (@{ $item->cvars_by_config }) {
+      if ($var->config->type eq 'number' && exists($var->{__unparsed_value})) {
+        $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value}));
+      }
+    }
+    $item->parse_custom_variable_values;
+  }
+
+  my $row_as_html = $self->p->render('reclamation/tabs/basic_data/_second_row', ITEM => $item, TYPE => $self->type);
+
+  $self->js
+    ->html('#second_row_' . $item_id, $row_as_html)
+    ->data('#second_row_' . $item_id, 'loaded', 1);
+}
+
+sub js_redisplay_line_values {
+  my ($self) = @_;
+
+  my @data = map {[
+       $::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0),
+      ]} @{ $self->reclamation->items_sorted };
+
+  $self->js
+    ->run('kivi.Reclamation.redisplay_line_values', $self->reclamation->is_sales, \@data);
+}
+
+sub js_redisplay_amounts_and_taxes {
+  my ($self) = @_;
+
+  if (scalar @{ $self->reclamation->taxes }) {
+    $self->js->show('#taxincluded_row_id');
+  } else {
+    $self->js->hide('#taxincluded_row_id');
+  }
+
+  if ($self->reclamation->taxincluded) {
+    $self->js->hide('#subtotal_row_id');
+  } else {
+    $self->js->show('#subtotal_row_id');
+  }
+
+  $self->js
+    ->html('#netamount_id', $::form->format_amount(\%::myconfig, $self->reclamation->netamount, -2))
+    ->html('#amount_id',    $::form->format_amount(\%::myconfig, $self->reclamation->amount,    -2))
+    ->remove('.tax_row')
+    ->insertBefore($self->build_tax_rows, '#amount_row_id');
+}
+
+sub js_redisplay_cvpartnumbers {
+  my ($self) = @_;
+
+  $self->get_item_cvpartnumber($_) for @{$self->reclamation->items_sorted};
+
+  my @data = map {[$_->{cvpartnumber}]} @{ $self->reclamation->items_sorted };
+
+  $self->js
+    ->run('kivi.Reclamation.redisplay_cvpartnumbers', \@data);
+}
+sub js_reset_reclamation_and_item_ids_after_save {
+  my ($self) = @_;
+
+  $self->js
+    ->val('#id', $self->reclamation->id)
+    ->val('#converted_from_record_type_ref', '')
+    ->val('#converted_from_record_id',  '')
+    ->val('#reclamation_record_number', $self->reclamation->record_number);
+
+  my $idx = 0;
+  foreach my $form_item_id (@{ $::form->{reclamation_item_ids} }) {
+    next if !$self->reclamation->items_sorted->[$idx]->id;
+    next if $form_item_id !~ m{^new};
+    $self->js
+      ->val ('[name="reclamation_item_ids[+]"][value="' . $form_item_id . '"]',
+             $self->reclamation->items_sorted->[$idx]->id)
+      ->val ('#item_' . $form_item_id,
+             $self->reclamation->items_sorted->[$idx]->id)
+      ->attr('#item_' . $form_item_id, "id",
+             'item_' . $self->reclamation->items_sorted->[$idx]->id);
+  } continue {
+    $idx++;
+  }
+  $self->js->val('[name="converted_from_record_item_type_refs[+]"]', '');
+  $self->js->val('[name="converted_from_record_item_ids[+]"]', '');
+}
+
+#
+# helpers
+#
+
+sub init_valid_types {
+  $_[0]->type_data->valid_types;
+}
+
+sub init_type {
+  my ($self) = @_;
+
+  my $type = $self->reclamation->record_type;
+  if (none { $type eq $_ } @{$self->valid_types}) {
+    die "Not a valid type for reclamation";
+  }
+
+  $self->type($type);
+}
+
+sub init_cv {
+  my ($self) = @_;
+
+  $self->type_data->properties('customervendor');
+}
+
+sub init_search_cvpartnumber {
+  my ($self) = @_;
+
+  my $user_prefs = SL::Helper::UserPreferences::PartPickerSearch->new();
+  my $search_cvpartnumber;
+  if ($self->type_data->properties('is_customer')) {
+    $search_cvpartnumber = !!$user_prefs->get_sales_search_customer_partnumber()
+  } else {
+    $search_cvpartnumber = !!$user_prefs->get_purchase_search_makemodel();
+  }
+
+  return $search_cvpartnumber;
+}
+
+sub init_show_update_button {
+  my ($self) = @_;
+
+  !!SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button();
+}
+
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    sorted => {
+      _default  => {
+        by  => 'record_number',
+        dir => 0,
+      },
+      id                      => t8('ID'),
+      record_number           => t8('Reclamation Number'),
+      employee                => t8('Employee'),
+      salesman                => t8('Salesman'),
+      customer                => t8('Customer'),
+      vendor                  => t8('Vendor'),
+      contact                 => t8('Contact'),
+      language                => t8('Language'),
+      department              => t8('Department'),
+      globalproject           => t8('Project Number'),
+      cv_record_number        => ($self->type_data->properties('is_customer') ? t8('Customer Record Number') : t8('Vendor Record Number')),
+      transaction_description => t8('Description'),
+      notes                   => t8('Notes'),
+      intnotes                => t8('Internal Notes'),
+      shippingpoint           => t8('Shipping Point'),
+      shipvia                 => t8('Ship via'),
+      shipto_id               => t8('Shipping Address'),
+      amount                  => t8('Total'),
+      netamount               => t8('Subtotal'),
+      delivery_term           => t8('Delivery Terms'),
+      payment                 => t8('Payment Terms'),
+      currency                => t8('Currency'),
+      exchangerate            => t8('Exchangerate'),
+      taxincluded             => t8('Tax Included'),
+      taxzone                 => t8('Tax zone'),
+      tax_point               => t8('Tax point'),
+      reqdate                 => t8('Deadline'),
+      transdate               => t8('Booking Date'),
+      itime                   => t8('Creation Time'),
+      mtime                   => t8('Last modification Time'),
+      delivered               => t8('Delivered'),
+      closed                  => t8('Closed'),
+    },
+    query => [
+      SL::DB::Manager::Reclamation->type_filter($self->type),
+      (salesman_id => SL::DB::Manager::Employee->current->id) x ($self->reclamation->is_sales  && !$::auth->assert('sales_all_edit', 1)),
+      (employee_id => SL::DB::Manager::Employee->current->id) x ($self->reclamation->is_sales  && !$::auth->assert('sales_all_edit', 1)),
+      (employee_id => SL::DB::Manager::Employee->current->id) x (!$self->reclamation->is_sales && !$::auth->assert('purchase_all_edit', 1)),
+    ],
+
+    with_objects => [
+        'customer',      'vendor',   'employee',   'salesman',
+        'contact',       'language', 'department', 'globalproject',
+        'delivery_term', 'payment',  'currency',   'taxzone',
+      ],
+    );
+}
+
+sub init_p {
+  SL::Presenter->get;
+}
+
+sub init_reclamation {
+  $_[0]->make_reclamation;
+}
+
+sub init_all_price_factors {
+  SL::DB::Manager::PriceFactor->get_all;
+}
+
+sub init_part_picker_classification_ids {
+  my ($self)    = @_;
+
+  return [ map { $_->id } @{ SL::DB::Manager::PartClassification->get_all(where => $self->type_data->part_classification_query()) } ];
+}
+
+sub check_auth {
+  my ($self) = @_;
+  $::auth->assert($self->type_data->rights('edit'));
+}
+
+# build the selection box for contacts
+#
+# Needed, if customer/vendor changed.
+sub build_contact_select {
+  my ($self) = @_;
+
+  select_tag('reclamation.contact_id', [ $self->reclamation->customervendor->contacts ],
+    value_key  => 'cp_id',
+    title_key  => 'full_name_dep',
+    default    => $self->reclamation->contact_id,
+    with_empty => 1,
+    style      => 'width: 300px',
+  );
+}
+
+# build the selection box for shiptos
+#
+# Needed, if customer/vendor changed.
+sub build_shipto_select {
+  my ($self) = @_;
+
+  select_tag('reclamation.shipto_id',
+             [ {displayable_id => t8("No/individual shipping address"),
+                shipto_id => '',
+               },
+               $self->reclamation->customervendor->shipto
+             ],
+             value_key  => 'shipto_id',
+             title_key  => 'displayable_id',
+             default    => $self->reclamation->shipto_id,
+             with_empty => 0,
+             style      => 'width: 300px',
+  );
+}
+
+# build the inputs for the cusom shipto dialog
+#
+# Needed, if customer/vendor changed.
+sub build_shipto_inputs {
+  my ($self) = @_;
+
+  my $content = $self->p->render('common/_ship_to_dialog',
+                                 cv_obj      => $self->reclamation->customervendor,
+                                 cs_obj      => $self->reclamation->custom_shipto,
+                                 cvars       => $self->reclamation->custom_shipto->cvars_by_config,
+                                 id_selector => '#reclamation_shipto_id');
+
+  div_tag($content, id => 'shipto_inputs');
+}
+
+# render the info line for business
+#
+# Needed, if customer/vendor changed.
+sub build_business_info_row
+{
+  $_[0]->p->render('reclamation/tabs/basic_data/_business_info_row', SELF => $_[0]);
+}
+
+# build the rows for displaying taxes
+#
+# Called if amounts where recalculated and redisplayed.
+sub build_tax_rows {
+  my ($self) = @_;
+
+  my $rows_as_html;
+  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->reclamation->taxes }) {
+    $rows_as_html .= $self->p->render(
+                       'reclamation/tabs/basic_data/_tax_row',
+                       SELF => $self,
+                       TAX => $tax,
+                       TAXINCLUDED => $self->reclamation->taxincluded,
+                     );
+  }
+  return $rows_as_html;
+}
+
+sub render_price_dialog {
+  my ($self, $record_item) = @_;
+
+  my $price_source = SL::PriceSource->new(
+                       record_item => $record_item,
+                       record => $self->reclamation,
+                     );
+
+  $self->js
+    ->run(
+      'kivi.io.price_chooser_dialog',
+      t8('Available Prices'),
+      $self->render(
+        'reclamation/tabs/basic_data/_price_sources_dialog',
+        { output => 0 },
+        price_source => $price_source,
+      ),
+    )
+    ->reinit_widgets;
+
+#   if (@errors) {
+#     $self->js->text('#dialog_flash_error_content', join ' ', @errors);
+#     $self->js->show('#dialog_flash_error');
+#   }
+
+  $self->js->render;
+}
+
+# load or create a new reclamation object
+#
+# And assign changes from the form to this object.
+# If the reclamation is loaded from db, check if items are deleted in the form,
+# remove them form the object and collect them for removing from db on saving.
+# Then create/update items from form (via make_item) and add them.
+sub make_reclamation {
+  my ($self) = @_;
+
+  # add_items adds items to an reclamation with no items for saving, but they
+  # cannot be retrieved via items until the reclamation is saved. Adding empty
+  # items to new reclamation here solves this problem.
+  my $reclamation;
+  if ($::form->{id}) {
+    $reclamation = SL::DB::Reclamation->new(id => $::form->{id})->load();
+  } else {
+    $reclamation = SL::DB::Reclamation->new(
+                     record_type        => $::form->{type},
+                     reclamation_items  => [],
+                     currency_id => $::instance_conf->get_currency_id(),
+                   );
+    $reclamation = SL::Model::Record->update_after_new($reclamation)
+  }
+
+  my $cv_id_method = $reclamation->type_data->properties('customervendor'). '_id';
+  if (!$::form->{id} && $::form->{$cv_id_method}) {
+    $reclamation->$cv_id_method($::form->{$cv_id_method});
+    $reclamation = SL::Model::Record->update_after_customer_vendor_change($reclamation);
+  }
+
+  # don't assign hashes as objects
+  my $form_reclamation_items = delete $::form->{reclamation}->{reclamation_items};
+
+  $reclamation->assign_attributes(%{$::form->{reclamation}});
+
+  # restore form values
+  $::form->{reclamation}->{reclamation_items} = $form_reclamation_items;
+
+  $self->setup_custom_shipto_from_form($reclamation, $::form);
+
+  # remove deleted items
+  $self->item_ids_to_delete([]);
+  foreach my $idx (reverse 0..$#{$reclamation->reclamation_items}) {
+    my $item = $reclamation->reclamation_items->[$idx];
+    if (none { $item->id == $_->{id} } @{$form_reclamation_items}) {
+      splice @{$reclamation->reclamation_items}, $idx, 1;
+      push @{$self->item_ids_to_delete}, $item->id;
+    }
+  }
+
+  my @items;
+  my $pos = 1;
+  foreach my $form_attr (@{$form_reclamation_items}) {
+    my $item = make_item($reclamation, $form_attr);
+    $item->position($pos);
+    push @items, $item;
+    $pos++;
+  }
+  $reclamation->add_items(grep {!$_->id} @items);
+
+  return $reclamation;
+}
+
+# create or update items from form
+#
+# Make item objects from form values. For items already existing read from db.
+# Create a new item else. And assign attributes.
+sub make_item {
+  my ($record, $attr) = @_;
+
+  my $item;
+  $item = first { $_->id == $attr->{id} } @{$record->items} if $attr->{id};
+
+  my $is_new = !$item;
+
+  # add_custom_variables adds cvars to an reclamation_item with no cvars for
+  # saving, but they cannot be retrieved via custom_variables until the
+  # reclamation/reclamation_item is saved. Adding empty custom_variables to new
+  # reclamationitem here solves this problem.
+  $item ||= SL::DB::ReclamationItem->new(custom_variables => []);
+
+  $item->assign_attributes(%$attr);
+
+  if ($is_new) {
+    my $texts = get_part_texts($item->part, $record->language_id);
+    $item->longdescription($texts->{longdescription})              if !defined $attr->{longdescription};
+    $item->project_id($record->globalproject_id)                   if !defined $attr->{project_id};
+    $item->lastcost($record->is_sales ? $item->part->lastcost : 0) if !defined $attr->{lastcost_as_number};
+  }
+
+  return $item;
+}
+
+sub load_reclamation {
+  my ($self) = @_;
+
+  return if !$::form->{id};
+
+  $self->reclamation(SL::DB::Reclamation->new(id => $::form->{id})->load);
+
+  $self->reinit_after_new_reclamation();
+
+  return $self->reclamation;
+}
+
+# create a new item
+#
+# This is used to add one item
+sub new_item {
+  my ($record, $attr) = @_;
+
+  my $item = SL::DB::ReclamationItem->new;
+
+  # Remove attributes where the user left or set the inputs empty.
+  # So these attributes will be undefined and we can distinguish them
+  # from zero later on.
+  for (qw(qty_as_number sellprice_as_number discount_as_percent)) {
+    delete $attr->{$_} if $attr->{$_} eq '';
+  }
+
+  $item->assign_attributes(%$attr);
+
+  my $part = SL::DB::Part->new(id => $attr->{parts_id})->load;
+  $item->qty(1.0)          if !$item->qty;
+  $item->unit($part->unit) if !$item->unit;
+
+  my ($price_src, $discount_src) = SL::Model::Record->get_best_price_and_discount_source($record, $item, ignore_given => 0);
+
+  my %new_attr;
+  $new_attr{part}                   = $part;
+  $new_attr{description}            = $part->description     if ! $item->description;
+  $new_attr{qty}                    = 1.0                    if ! $item->qty;
+  $new_attr{price_factor_id}        = $part->price_factor_id if ! $item->price_factor_id;
+  $new_attr{sellprice}              = $price_src->price;
+  $new_attr{discount}               = $discount_src->discount;
+  $new_attr{active_price_source}    = $price_src;
+  $new_attr{active_discount_source} = $discount_src;
+  $new_attr{longdescription}        = $part->notes           if ! defined $attr->{longdescription};
+  $new_attr{project_id}             = $record->globalproject_id;
+  $new_attr{lastcost}               = $record->is_sales ? $part->lastcost : 0;
+
+  # add_custom_variables adds cvars to an reclamationitem with no cvars for saving, but
+  # they cannot be retrieved via custom_variables until the reclamation/reclamationitem is
+  # saved. Adding empty custom_variables to new reclamationitem here solves this problem.
+  $new_attr{custom_variables} = [];
+
+  my $texts = get_part_texts($part, $record->language_id,
+                description => $new_attr{description},
+                longdescription => $new_attr{longdescription},
+              );
+
+  $item->assign_attributes(%new_attr, %{ $texts });
+
+  $item->reclamation($record);
+  return $item;
+}
+
+# setup custom shipto from form
+#
+# The dialog returns form variables starting with 'shipto' and cvars starting
+# with 'shiptocvar_'.
+# Mark it to be deleted if a shipto from master data is selected
+# (i.e. reclamation has a shipto).
+# Else, update or create a new custom shipto. If the fields are empty, it
+# will not be saved on save.
+sub setup_custom_shipto_from_form {
+  my ($self, $reclamation, $form) = @_;
+
+  if ($reclamation->shipto) {
+    $self->is_custom_shipto_to_delete(1);
+  } else {
+    my $custom_shipto =    $reclamation->custom_shipto
+                        || $reclamation->custom_shipto(
+                             SL::DB::Shipto->new(module => 'RC', custom_variables => [])
+                           );
+
+    my $shipto_cvars  = {map { my ($key) = m{^shiptocvar_(.+)}; $key => delete $form->{$_}} grep { m{^shiptocvar_} } keys %$form};
+    my $shipto_attrs  = {map {                                  $_   => delete $form->{$_}} grep { m{^shipto}      } keys %$form};
+
+    $custom_shipto->assign_attributes(%$shipto_attrs);
+    $custom_shipto->cvar_by_name($_)->value($shipto_cvars->{$_}) for keys %$shipto_cvars;
+  }
+}
+
+# recalculate prices and taxes
+#
+# Using the PriceTaxCalculator. Store linetotals in the item objects.
+sub recalc {
+  my ($self) = @_;
+
+  my %pat = $self->reclamation->calculate_prices_and_taxes();
+
+  pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->reclamation->items_sorted}, @{$pat{items}};
+}
+
+# get data for saving, printing, ..., that is not changed in the form
+#
+# Only cvars for now.
+sub get_unalterable_data {
+  my ($self) = @_;
+
+  foreach my $item (@{ $self->reclamation->items }) {
+    # autovivify all cvars that are not in the form (cvars_by_config can do it).
+    # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
+    foreach my $var (@{ $item->cvars_by_config }) {
+      if ($var->config->type eq 'number' && exists($var->{__unparsed_value})) {
+        $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value}));
+      }
+    }
+    $item->parse_custom_variable_values;
+  }
+}
+
+# save the reclamation
+#
+# And delete items that are deleted in the form.
+sub save {
+  my ($self) = @_;
+
+  set_record_link_conversions($self->reclamation,
+    delete $::form->{RECORD_TYPE_REF()}
+      => delete $::form->{RECORD_ID()},
+    delete $::form->{RECORD_ITEM_TYPE_REF()}
+      => delete $::form->{RECORD_ITEM_ID()},
+  );
+
+  my $items_to_delete  = scalar @{ $self->item_ids_to_delete || [] }
+                       ? SL::DB::Manager::ReclamationItem->get_all(where => [id => $self->item_ids_to_delete])
+                       : undef;
+
+  SL::Model::Record->save($self->reclamation,
+                          with_validity_token  => { scope => SL::DB::ValidityToken::SCOPE_RECLAMATION_SAVE(), token => $::form->{form_validity_token} },
+                          delete_custom_shipto => $self->reclamation->custom_shipto && ($self->is_custom_shipto_to_delete || $self->reclamation->custom_shipto->is_empty),
+                          items_to_delete      => $items_to_delete,
+  );
+
+  if ($::form->{email_journal_id}) {
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $::form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $self->reclamation,
+      delete $::form->{email_attachment_id}
+    );
+  }
+
+  delete $::form->{form_validity_token};
+}
+
+sub reinit_after_new_reclamation {
+  my ($self) = @_;
+
+  # change form type
+  $::form->{type} = $self->reclamation->type;
+  $self->type($self->init_type);
+  $self->type_data($self->init_type_data);
+  $self->cv($self->init_cv);
+  $self->check_auth;
+
+  $self->setup_custom_shipto_from_form($self->reclamation, $::form);
+
+  foreach my $item (@{$self->reclamation->items_sorted}) {
+    # set item ids to new fake id, to identify them as new items
+    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+
+    # trigger rendering values for second row as hidden, because they
+    # are loaded only on demand. So we need to keep the values from the
+    # source.
+    $item->{render_second_row} = 1;
+  }
+
+  $self->get_unalterable_data();
+  $self->recalc();
+}
+
+sub pre_render {
+  my ($self) = @_;
+
+  $self->{all_taxzones}               = SL::DB::Manager::TaxZone->get_all_sorted();
+  $self->{all_currencies}             = SL::DB::Manager::Currency->get_all_sorted();
+  $self->{all_departments}            = SL::DB::Manager::Department->get_all_sorted();
+  $self->{all_languages}              = SL::DB::Manager::Language->get_all_sorted();
+  $self->{all_employees}              = SL::DB::Manager::Employee->get_all(
+                                          where => [ or => [
+                                                        id => $self->reclamation->employee_id,
+                                                        deleted => 0 ] ],
+                                                     sort_by => 'name');
+  $self->{all_salesmen}               = SL::DB::Manager::Employee->get_all(
+                                          where => [ or => [
+                                                        id => $self->reclamation->salesman_id,
+                                                        deleted => 0 ] ],
+                                          sort_by => 'name');
+  $self->{all_payment_terms}          = SL::DB::Manager::PaymentTerm->get_all_sorted(
+                                          where => [ or => [
+                                                        id => $self->reclamation->payment_id,
+                                                        obsolete => 0 ] ]);
+  $self->{all_delivery_terms}         = SL::DB::Manager::DeliveryTerm->get_all_sorted();
+  $self->{current_employee_id}        = SL::DB::Manager::Employee->current->id;
+
+  $self->{positions_scrollbar_height} = SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height();
+
+  my $print_form = Form->new('');
+  $print_form->{type}        = $self->type;
+  $print_form->{printers}    = SL::DB::Manager::Printer->get_all_sorted;
+  $self->{print_options}     = SL::Helper::PrintOptions->get_print_options(
+    form => $print_form,
+    options => {dialog_name_prefix => 'print_options.',
+                show_headers       => 1,
+                no_queue           => 1,
+                no_postscript      => 1,
+                no_opendocument    => 0,
+                no_html            => 1},
+  );
+  foreach my $item (@{$self->reclamation->reclamation_items}) {
+    my $price_source = SL::PriceSource->new(record_item => $item, record => $self->reclamation);
+    $item->active_price_source(   $price_source->price_from_source(   $item->active_price_source   ));
+    $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
+  }
+
+  if ($self->reclamation->record_number && $::instance_conf->get_webdav) {
+    my $webdav = SL::Webdav->new(
+      type     => $self->type,
+      number   => $self->reclamation->record_number,
+    );
+    my @all_objects = $webdav->get_all_objects;
+    @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename,
+                                                    type => t8('File'),
+                                                    link => File::Spec->catfile($_->full_filedescriptor),
+                                                } } @all_objects;
+  }
+
+  $self->get_item_cvpartnumber($_) for @{$self->reclamation->items_sorted};
+
+  $::request->{layout}->use_javascript("${_}.js") for
+    qw(kivi.SalesPurchase kivi.Reclamation kivi.File
+       calculate_qty kivi.Validator follow_up
+       show_history
+      );
+  $self->_setup_edit_action_bar;
+}
+
+sub prepare_report {
+  my ($self)         = @_;
+
+  my $report         =  SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title}   =  t8('Sales Reclamations');
+  if ($self->type eq PURCHASE_RECLAMATION_TYPE()){
+    $report->{title} = t8('Purchase Reclamations');
+  }
+
+  $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->models->add_additional_url_params(type => $self->type);
+  $self->models->finalize; # for filter laundering
+
+  my $callback    = $self->models->get_callback;
+
+  $self->{report} = $report;
+
+  # TODO: shipto_id is not linked to custom_shipto
+  my @columns_order = qw(
+    id
+    record_number
+    employee
+    salesman
+    customer
+    vendor
+    contact
+    language
+    department
+    globalproject
+    cv_record_number
+    transaction_description
+    notes
+    intnotes
+    shippingpoint
+    shipvia
+    amount
+    netamount
+    delivery_term
+    payment
+    currency
+    exchangerate
+    taxincluded
+    taxzone
+    tax_point
+    reqdate
+    transdate
+    itime
+    mtime
+    delivered
+    closed
+  );
+
+  my @default_columns = qw(
+    record_number
+    employee
+    department
+    globalproject
+    cv_record_number
+    transaction_description
+    amount
+    reqdate
+    transdate
+    itime
+    mtime
+    delivered
+    closed
+  );
+
+  my %column_defs = (
+    id => {
+      obj_link => sub {$self->url_for(action => 'edit', id => $_[0]->id, type => $self->type, callback => $callback)},
+      sub      => sub { $_[0]->id },
+    },
+    record_number => {
+      obj_link => sub {$self->url_for(action => 'edit', id => $_[0]->id, type => $self->type, callback => $callback)},
+      sub      => sub { $_[0]->record_number },
+    },
+    employee => {
+      sub      => sub { $_[0]->employee ? $_[0]->employee->name : '' },
+    },
+    salesman => {
+      sub      => sub { $_[0]->salesman ? $_[0]->salesman->name : '' },
+    },
+    language => {
+      sub      => sub { $_[0]->language ? $_[0]->language->article_code : '' },
+    },
+    department => {
+      sub      => sub { $_[0]->department ? $_[0]->department->description : '' },
+    },
+    globalproject => {
+      obj_link => sub { $_[0]->globalproject_id ?
+       $self->url_for(
+          controller => "controller.pl",
+          action => 'Project/edit',
+          id => $_[0]->globalproject_id,
+          callback => $callback
+        ) : '' },
+      sub      => sub { !$_[0]->globalproject ? '' : $_[0]->globalproject->projectnumber },
+    },
+    cv_record_number => {
+      sub      => sub { $_[0]->cv_record_number },
+    },
+    transaction_description => {
+      sub      => sub { $_[0]->transaction_description },
+    },
+    notes => {
+      sub      => sub { $_[0]->notes },
+    },
+    intnotes => {
+      sub      => sub { $_[0]->intnotes },
+    },
+    shippingpoint => {
+      sub      => sub { $_[0]->shippingpoint },
+    },
+    shipvia => {
+      sub      => sub { $_[0]->shipvia },
+    },
+    # TODO: custom ship to is not safed in reclamation
+    #shipto_id => {
+    #  sub      => sub { $_[0]->shipto ? $_[0]->shipto->shiptoname : '' },
+    #},
+    amount  => {
+      sub      => sub { $_[0]->amount_as_number },
+    },
+    netamount  => {
+      sub      => sub { $_[0]->netamount_as_number },
+    },
+    delivery_term => {
+      obj_link => sub { $_[0]->delivery_term_id ?
+       $self->url_for(
+          controller => "controller.pl",
+          action => 'DeliveryTerm/edit',
+          id => $_[0]->delivery_term_id,
+          callback => $callback
+        ) : '' },
+      sub      => sub { $_[0]->delivery_term ? $_[0]->delivery_term->description : '' },
+    },
+    payment => {
+      obj_link => sub { $_[0]->payment_id ?
+       $self->url_for(
+          controller => "controller.pl",
+          action => 'PaymentTerm/edit',
+          id => $_[0]->payment_id,
+          callback => $callback
+        ) : '' },
+      sub      => sub { $_[0]->payment ? $_[0]->payment->description : '' },
+    },
+    currency => {
+      sub      => sub { $_[0]->currency ? $_[0]->currency->name : '' },
+    },
+    exchangerate  => {
+      sub      => sub { $_[0]->exchangerate ? $_[0]->exchangerate_as_number : '' },
+    },
+    taxincluded => {
+      sub      => sub { $_[0]->taxincluded ? t8('Yes') : t8('No') },
+    },
+    taxzone => {
+      obj_link => sub { $_[0]->taxzone_id ?
+       $self->url_for(
+          controller => "controller.pl",
+          action => 'Taxzones/edit',
+          id => $_[0]->taxzone_id,
+          callback => $callback
+        ) : '' },
+      sub      => sub { $_[0]->taxzone ? $_[0]->taxzone->description : '' },
+    },
+    tax_point  => {
+      sub      => sub { $_[0]->tax_point ? ($_[0]->tax_point)->to_kivitendo(precision => 'day') : '' },
+    },
+    reqdate  => {
+      sub      => sub { $_[0]->reqdate ? ($_[0]->reqdate)->to_kivitendo(precision => 'day') : '' },
+    },
+    transdate  => {
+      sub      => sub { $_[0]->transdate ? ($_[0]->transdate)->to_kivitendo(precision => 'day') : '' },
+    },
+    itime      => {
+      sub      => sub { $_[0]->itime->to_kivitendo(precision => 'minute') }
+    },
+    mtime      => {
+      sub      => sub { $_[0]->mtime ? $_[0]->mtime->to_kivitendo(precision => 'minute') : '' }
+    },
+    delivered => {
+      sub      => sub { $_[0]->delivered ? t8('Yes') : t8('No') },
+    },
+    closed => {
+      sub      => sub { $_[0]->closed ? t8('Yes') : t8('No') },
+    },
+  );
+  if ($self->type_data->properties('is_customer')) {
+    $column_defs{customer} = ({
+      raw_data => sub { $_[0]->customervendor->presenter->customer(display => 'table-cell', callback => $callback) },
+      sub      => sub { $_[0]->customervendor->name },
+    });
+    $column_defs{contact} = ({
+      obj_link => sub { $self->url_for(
+          controller => "controller.pl",
+          action => 'CustomerVendor/edit',
+          db => 'customer',
+          id => $_[0]->customer_id
+        ) . '#contacts'
+      },
+      sub      => sub { $_[0]->contact ? $_[0]->contact->cp_name : '' },
+    });
+  } else {
+    $column_defs{vendor} = ({
+      raw_data => sub { $_[0]->customervendor->presenter->vendor(display => 'table-cell', callback => $callback) },
+      sub      => sub { $_[0]->customervendor->name },
+    });
+    $column_defs{contact} = ({
+      obj_link => sub { $self->url_for(
+          controller => "controller.pl",
+          action => 'CustomerVendor/edit',
+          db => 'vendor',
+          id => $_[0]->vendor_id
+        ) . "#contacts"
+      },
+      sub      => sub { $_[0]->contact ? $_[0]->contact->cp_name : '' },
+    });
+  }
+  $column_defs{$_}->{text} ||= t8( $self->models->get_sort_spec->{$_}->{title} || $_ ) for keys %column_defs;
+
+  unless ($::form->{active_in_report}) {
+    $::form->{active_in_report}->{$_} = 1 foreach @default_columns;
+  }
+  $self->models->add_additional_url_params(
+    active_in_report => $::form->{active_in_report});
+  map { $column_defs{$_}->{visible} = $::form->{active_in_report}->{"$_"} }
+    keys %column_defs;
+
+  ## add cvars TODO: Add own cvars
+  #my %cvar_column_defs = map {
+  #  my $cfg = $_;
+  #  (('cvar_' . $cfg->name) => {
+  #    sub     => sub { my $var = $_[0]->cvar_by_name($cfg->name); $var ? $var->value_as_text : '' },
+  #    text    => $cfg->description,
+  #    visible => $self->include_cvars->{ $cfg->name } ? 1 : 0,
+  #  })
+  #} @{ $self->includeable_cvar_configs };
+
+  #push @columns, map { 'cvar_' . $_->name } @{ $self->includeable_cvar_configs };
+  #%column_defs = (%column_defs, %cvar_column_defs);
+
+  #my @cvar_column_form_names = ('_include_cvars_from_form', map { "include_cvars_" . $_->name } @{ $self->includeable_cvar_configs });
+
+  # make all sortable
+  my @sortable = keys %column_defs;
+
+  my $filter_html = SL::Presenter::ReclamationFilter::filter(
+    $::form->{filter}, $self->type, active_in_report => $::form->{active_in_report}
+  );
+
+  $report->set_options(
+    std_column_visibility => 1,
+    controller_class      => 'Reclamation',
+    output_format         => 'HTML',
+    raw_top_info_text     => $self->render(
+     'reclamation/_report_top',
+     { output => 0 },
+     FILTER_HTML => $filter_html,
+    ),
+    raw_bottom_info_text  => $self->render(
+     'reclamation/_report_bottom',
+     { output => 0 },
+     models => $self->models
+    ),
+    title                 => $self->type_data->text('list'),
+    allow_pdf_export      => 1,
+    allow_csv_export      => 1,
+  );
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns_order);
+  #$report->set_export_options(qw(list filter), @cvar_column_form_names); TODO: for cvars
+  $report->set_export_options(qw(list filter active_in_report));
+  $report->set_options_from_form;
+  $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
+}
+
+sub _setup_edit_action_bar {
+  my ($self, %params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      combobox => [
+        action => [
+          t8('Save'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+            }],
+          checks    => [
+            ['kivi.validate_form','#reclamation_form'],
+          ],
+        ],
+        action => [
+          t8('Save and Close'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'back_to_caller', value => 1 },
+              ],
+            }],
+          checks    => [
+            ['kivi.validate_form','#reclamation_form'],
+          ],
+        ],
+        action => [
+          t8('Save as new'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_as_new',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+            }],
+          disabled  => !$self->reclamation->id ? t8('This object has not been saved yet.') : undef,
+        ],
+      ], # end of combobox "Save"
+
+      combobox => [
+        action => [
+          t8('Workflow'),
+        ],
+        action => [
+          t8('Save and Sales Reclamation'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type', value => SALES_RECLAMATION_TYPE() },
+              ],
+            }],
+          only_if  => $self->type_data->show_menu('save_and_sales_reclamation'),
+        ],
+        action => [
+          t8('Save and Purchase Reclamation'),
+          call      => [ 'kivi.Reclamation.purchase_reclamation_check_for_direct_delivery', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type', value => PURCHASE_RECLAMATION_TYPE() },
+              ],
+            }
+          ],
+          only_if  => $self->type_data->show_menu('save_and_purchase_reclamation'),
+        ],
+        action => [
+          t8('Save and Order'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type',
+                  value => $self->reclamation->is_sales ? SALES_ORDER_TYPE()
+                                                        : PURCHASE_ORDER_TYPE() },
+              ],
+            }],
+        ],
+        action => [
+          t8('Save and RMA Delivery Order'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type', value => RMA_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
+          only_if  => $self->type_data->show_menu('save_and_rma_delivery_order'),
+        ],
+        action => [
+          t8('Save and Supplier Delivery Order'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_new_record',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type', value => SUPPLIER_DELIVERY_ORDER_TYPE() },
+              ],
+            }],
+          only_if  => $self->type_data->show_menu('save_and_supplier_delivery_order'),
+        ],
+        action => [
+          t8('Save and Credit Note'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_credit_note',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+              form_params        => [
+                { name => 'to_type', value => 'credit_note' },
+              ],
+            }],
+          only_if  => $self->type_data->show_menu('save_and_credit_note'),
+        ],
+      ], # end of combobox "Workflow"
+
+      combobox => [
+        action => [
+          t8('Export'),
+        ],
+        action => [
+          t8('Save and preview PDF'),
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'preview_pdf',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+            }],
+        ],
+        action => [
+          t8('Save and print'),
+          call => [
+            'kivi.Reclamation.show_print_options',
+            $::instance_conf->get_reclamation_warn_duplicate_parts,
+            $::instance_conf->get_reclamation_warn_no_reqdate,
+          ],
+        ],
+        action => [
+          t8('Save and E-mail'),
+          id   => 'save_and_email_action',
+          call      => [ 'kivi.Reclamation.save', {
+              action             => 'save_and_show_email_dialog',
+              warn_on_duplicates => $::instance_conf->get_reclamation_warn_duplicate_parts,
+              warn_on_reqdate    => $::instance_conf->get_reclamation_warn_no_reqdate,
+            }],
+          disabled => !$self->reclamation->id ? t8('This object has not been saved yet.') : undef,
+        ],
+        action => [
+          t8('Download attachments of all parts'),
+          call     => [ 'kivi.File.downloadReclamationitemsFiles', $::form->{type}, $::form->{id} ],
+          disabled => !$self->reclamation->id ? t8('This object has not been saved yet.') : undef,
+          only_if  => $::instance_conf->get_doc_storage,
+        ],
+      ], # end of combobox "Export"
+
+      action => [
+        t8('Delete'),
+        call     => [ 'kivi.Reclamation.delete_reclamation' ],
+        confirm  => t8('Do you really want to delete this object?'),
+        disabled => !$self->reclamation->id ? t8('This object has not been saved yet.') : undef,
+        only_if  => $self->type_data->show_menu('delete'),
+      ],
+
+      combobox => [
+        action => [
+          t8('more')
+        ],
+        action => [
+          t8('Follow-Up'),
+          call     => [ 'kivi.Reclamation.follow_up_window' ],
+          disabled => !$self->reclamation->id ? t8('This object has not been saved yet.') : undef,
+          only_if  => $::auth->assert('productivity', 1),
+        ],
+        action => [
+          t8('History'),
+          call     => [ 'set_history_window', $self->reclamation->id, 'id' ],
+          disabled => !$self->reclamation->id ? t8('This record has not been saved yet.') : undef,
+        ],
+      ], # end of combobox "more"
+    );
+  }
+}
+
+sub _setup_search_action_bar {
+  my ($self, %params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Update'),
+        submit    => [ '#search_form', { action => 'Reclamation/list', type => $self->type } ],
+        accesskey => 'enter',
+      ],
+      link => [
+        t8('Add'),
+        link => $self->url_for(action => 'add', type => $self->type),
+      ],
+    );
+  }
+}
+
+sub generate_pdf {
+  my ($reclamation, $pdf_ref, $params) = @_;
+
+  my @errors = ();
+
+  my $print_form = Form->new('');
+  $print_form->{type}        = $reclamation->type;
+  $print_form->{formname}    = $params->{formname} || $reclamation->type;
+  $print_form->{format}      = $params->{format}   || 'pdf';
+  $print_form->{media}       = $params->{media}    || 'file';
+  $print_form->{groupitems}  = $params->{groupitems};
+  $print_form->{printer_id}  = $params->{printer_id};
+  $print_form->{language_id} = $params->{language} ? $params->{language}->id : undef;
+  $print_form->{media}       = 'file'       if $print_form->{media} eq 'screen';
+
+  $reclamation->language($params->{language});
+
+  # Make reclamation available in template
+  $print_form->{reclamation} = $reclamation;
+
+  my $template_ext;
+  my $template_type;
+  my $variable_content_types;
+  if ($print_form->{format} =~ /(opendocument|oasis)/i) {
+    $template_ext  = 'odt';
+    $template_type = 'OpenDocument';
+
+    # add variables for printing with the built-in parser
+    $reclamation->flatten_to_form($print_form, format_amounts => 1);
+    $reclamation->add_legacy_template_arrays($print_form);
+
+    $variable_content_types = {
+      longdescription => 'html',
+      notes           => 'html',
+      $::form->get_variable_content_types_for_cvars,
+    }
+  }
+
+  # search for the template
+  my ($template_file, @template_files) = SL::Helper::CreatePDF->find_template(
+    name        => $print_form->{formname},
+    extension   => $template_ext,
+    email       => $print_form->{media} eq 'email',
+    language    => $params->{language},
+    printer_id  => $print_form->{printer_id},
+  );
+
+  if (!defined $template_file) {
+    push @errors, t8(
+      'Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.',
+      join ', ',
+      map { "'$_'"} @template_files
+    );
+  }
+
+  return @errors if scalar @errors;
+
+  $print_form->throw_on_error(sub {
+    eval {
+      $print_form->prepare_for_printing;
+
+      $$pdf_ref = SL::Helper::CreatePDF->create_pdf(
+        format        => $print_form->{format},
+        template_type => $template_type,
+        template      => $template_file,
+        variables     => $print_form,
+        variable_content_types => $variable_content_types,
+      );
+      1;
+    } || push @errors, ref($EVAL_ERROR) eq 'SL::X::FormError' ? $EVAL_ERROR->error : $EVAL_ERROR;
+  });
+
+  return @errors;
+}
+
+sub get_files_for_email_dialog {
+  my ($self) = @_;
+
+  my %files = map { ($_ => []) } qw(versions files cv_files project_files part_files);
+
+  return %files if !$::instance_conf->get_doc_storage;
+
+  if ($self->reclamation->id) {
+    $files{versions} = [
+      SL::File->get_all_versions(
+        object_id => $self->reclamation->id,
+        object_type => $self->reclamation->type,
+        file_type => 'document')
+    ];
+    $files{files} = [
+      SL::File->get_all(
+        object_id => $self->reclamation->id,
+        object_type => $self->reclamation->type,
+        file_type => 'attachment')
+    ];
+    $files{cv_files} = [
+      SL::File->get_all(
+        object_id => $self->reclamation->customervendor->id,
+        object_type => $self->cv,
+        file_type => 'attachment')
+    ];
+    $files{project_files} = [
+      SL::File->get_all(
+        object_id => $self->reclamation->globalproject_id,
+        object_type => 'project',
+        file_type => 'attachment')
+    ];
+  }
+
+  my @parts =
+    uniq_by { $_->{id} }
+    map {
+      +{ id         => $_->part->id,
+         partnumber => $_->part->partnumber }
+    } @{$self->reclamation->items_sorted};
+
+  foreach my $part (@parts) {
+    my @pfiles = SL::File->get_all(object_id => $part->{id}, object_type => 'part');
+    push @{ $files{part_files} }, map { +{ %{ $_ }, partnumber => $part->{partnumber} } } @pfiles;
+  }
+
+  foreach my $key (keys %files) {
+    $files{$key} = [ sort_by { lc $_->{db_file}->{file_name} } @{ $files{$key} } ];
+  }
+
+  return %files;
+}
+
+sub get_item_cvpartnumber {
+  my ($self, $item) = @_;
+
+  return if !$self->search_cvpartnumber;
+  return if !$self->reclamation->customervendor;
+
+  if (!$self->reclamation->is_sales) {
+    my @mms = grep { $_->make eq $self->reclamation->customervendor->id } @{$item->part->makemodels};
+    $item->{cvpartnumber} = $mms[0]->model if scalar @mms;
+  } elsif ($self->reclamation->is_sales) {
+    my @cps = grep { $_->customer_id eq $self->reclamation->customervendor->id } @{$item->part->customerprices};
+    $item->{cvpartnumber} = $cps[0]->customer_partnumber if scalar @cps;
+  }
+}
+
+sub get_part_texts {
+  my ($part_or_id, $language_or_id, %defaults) = @_;
+
+  my $part        = ref($part_or_id)     ? $part_or_id         : SL::DB::Part->load_cached($part_or_id);
+  my $language_id = ref($language_or_id) ? $language_or_id->id : $language_or_id;
+  my $texts       = {
+    description     => $defaults{description}     // $part->description,
+    longdescription => $defaults{longdescription} // $part->notes,
+  };
+
+  return $texts unless $language_id;
+
+  my $translation = SL::DB::Manager::Translation->get_first(
+    where => [
+      parts_id    => $part->id,
+      language_id => $language_id,
+    ]);
+
+  $texts->{description}     = $translation->translation     if $translation && $translation->translation;
+  $texts->{longdescription} = $translation->longdescription if $translation && $translation->longdescription;
+
+  return $texts;
+}
+
+sub save_history {
+  my ($self, $addition) = @_;
+
+  SL::DB::History->new(
+    trans_id    => $self->reclamation->id,
+    employee_id => SL::DB::Manager::Employee->current->id,
+    what_done   => $self->reclamation->type,
+    snumbers    => 'record_number_' . $self->reclamation->record_number,
+    addition    => $addition,
+  )->save;
+}
+
+sub store_pdf_to_webdav_and_filemanagement {
+  my($reclamation, $content, $filename) = @_;
+
+  my @errors;
+
+  # copy file to webdav folder
+  if ($reclamation->record_number && $::instance_conf->get_webdav_documents) {
+    my $webdav = SL::Webdav->new(
+      type     => $reclamation->type,
+      number   => $reclamation->record_number,
+    );
+    my $webdav_file = SL::Webdav::File->new(
+      webdav   => $webdav,
+      filename => $filename,
+    );
+    eval {
+      $webdav_file->store(data => \$content);
+      1;
+    } or do {
+      push @errors, t8('Storing PDF to webdav folder failed: #1', $@);
+    };
+  }
+  if ($reclamation->id && $::instance_conf->get_doc_storage) {
+    eval {
+      SL::File->save(object_id     => $reclamation->id,
+                     object_type   => $reclamation->type,
+                     mime_type     => 'application/pdf',
+                     source        => 'created',
+                     file_type     => 'document',
+                     file_name     => $filename,
+                     file_contents => $content);
+      1;
+    } or do {
+      push @errors, t8('Storing PDF in storage backend failed: #1', $@);
+    };
+  }
+
+  return @errors;
+}
+
+sub init_type_data {
+  my ($self) = @_;
+  SL::DB::Helper::TypeDataProxy->new('SL::DB::Reclamation', $self->reclamation->record_type);
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::Reclamation - controller for reclamations
+
+=head1 SYNOPSIS
+
+This is a new form to enter reclamations, written with the use
+of controller and java script techniques.
+
+The aim is to provide the user a good experience and a fast workflow.
+
+=head2 Key Features
+
+=over 4
+
+=item *
+
+One input row, so that input happens every time at the same place.
+
+=item *
+
+Use of pickers where possible.
+
+=item *
+
+Possibility to enter more than one item at once.
+
+=item *
+
+Item list in a scrollable area, so that the workflow buttons stay at
+the bottom.
+
+=item *
+
+Ordering item rows with drag and drop is possible. Sorting item rows is
+possible (by partnumber, description, reason, qty, sellprice
+and discount for now).
+
+=item *
+
+No C<update> is necessary. All entries and calculations are managed
+with ajax-calls and the page only reloads on C<save>.
+
+=item *
+
+User can see changes immediately, because of the use of java script
+and ajax.
+
+=item *
+
+Parts that are linked though RecordLinks are protected against price editing.
+
+=back
+
+=head1 CODE
+
+=head2 Layout
+
+=over 4
+
+=item * C<SL/Controller/Reclamation.pm>
+
+the controller
+
+=item * C<template/webpages/reclamation/form.html>
+
+main form
+
+=item * C<template/webpages/reclamation/tabs/basic_data.html>
+
+Main tab for basic_data.
+
+This is the only tab here for now. "webdav", "documents", "attachements" and
+"linked records" tabs are reused from generic code.
+
+=over 4
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_business_info_row.html>
+
+For displaying information on business type
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_item_input.html>
+
+The input line for items
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_row.html>
+
+One row for already entered items
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_second_row.html>
+
+Foldable second row for already entered items with more fields
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_tax_row.html>
+
+Displaying tax information
+
+=item * C<template/webpages/reclamation/tabs/basic_data/_price_sources_dialog.html>
+
+Dialog for selecting price and discount sources
+
+=back
+
+=item * C<js/kivi.Reclamation.js>
+
+java script functions
+
+=back
+
+=head1 KNOWN BUGS AND CAVEATS
+
+=over 4
+
+=item *
+
+Table header is not sticky in the scrolling area.
+
+=item *
+
+Sorting does not include C<position>, neither does reordering.
+
+This behavior was implemented intentionally. But we can discuss, which behavior
+should be implemented.
+
+=back
+
+=head1 To discuss / Nice to have
+
+=over 4
+
+=item *
+
+Possibility to select PriceSources in input row?
+
+=item *
+
+This controller uses a (changed) copy of the template for the PriceSource
+dialog. Maybe there could be used one code source.
+
+=item *
+
+A warning when leaving the page without saving unchanged inputs.
+
+=back
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Controller/ReclamationReason.pm b/SL/Controller/ReclamationReason.pm
new file mode 100644
index 000000000..c91cea2b9
--- /dev/null
+++ b/SL/Controller/ReclamationReason.pm
@@ -0,0 +1,280 @@
+package SL::Controller::ReclamationReason;
+
+use strict;
+
+use parent qw(SL::Controller::Base);
+
+use SL::DB::ReclamationReason;
+use SL::Helper::Flash;
+use SL::Locale::String;
+use List::MoreUtils qw(any);
+use SL::CVar;
+
+use Rose::Object::MakeMethods::Generic (
+  scalar                  => [ qw(reclamation_reason) ],
+  'scalar --get_set_init' => [ qw(reclamation_reason) ],
+);
+
+__PACKAGE__->run_before('check_auth');
+__PACKAGE__->run_before('load_reclamation_reason', only => [ qw(edit delete) ]);
+
+sub check_auth {
+  $::auth->assert('config');
+}
+
+#
+# actions
+#
+
+sub action_list {
+  my ($self, %params) = @_;
+
+  $self->setup_list_action_bar;
+  $self->render(
+    'reclamation_reason/list',
+    title => $::locale->text('Reclamation Reasons'),
+    RECLAMATION_REASONS => SL::DB::Manager::ReclamationReason->get_all_sorted(),
+  );
+}
+
+sub action_sort_list {
+  my ($self, %params) = @_;
+
+  $self->setup_sort_list_action_bar;
+  $self->render(
+    'reclamation_reason/sort_list',
+    title => $::locale->text('reclamation reasons'),
+    RECLAMATION_REASONS => SL::DB::Manager::ReclamationReason->get_all_sorted(),
+  );
+}
+
+sub action_new {
+  my ($self) = @_;
+
+  $self->reclamation_reason(SL::DB::ReclamationReason->new());
+  $self->show_form(title => t8('Add reclamation reason'));
+}
+
+sub action_edit {
+  my ($self) = @_;
+
+  $self->show_form(
+    title       => t8('Edit reclamation reason'),
+  );
+}
+
+sub action_save {
+  my ($self) = @_;
+
+  if ($::form->{id}) {
+    $self->load_reclamation_reason();
+  }
+
+  $self->create_or_save;
+}
+
+sub action_delete {
+  my ($self) = @_;
+
+  if (!$self->reclamation_reason->db->with_transaction(sub {
+    $self->reclamation_reason->delete();
+    flash_later('info',  $::locale->text('The reclamation reason has been deleted.'));
+
+    1;
+  })) {
+    flash_later('error', $::locale->text('The reclamation reason is in use and cannot be deleted.'))
+  };
+
+  $self->redirect_to(action => 'list');
+}
+
+#
+# ajax actions
+#
+
+sub action_reorder {
+  my ($self) = @_;
+
+  SL::DB::ReclamationReason->reorder_list(@{ $::form->{reclamation_reason_id} || [] });
+
+  $self->render(\'', { type => 'json' });
+}
+
+#
+# action bars
+#
+
+sub setup_form_action_bar {
+  my ($self) = @_;
+
+  my $is_new = !$self->reclamation_reason->id;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        $is_new ? t8('Create') : t8('Save'),
+        submit    => [ '#form', { action => 'ReclamationReason/save' } ],
+        checks    => [ 'kivi.validate_form' ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Delete'),
+        submit   => [ '#form', { action => 'ReclamationReason/delete' } ],
+        confirm  => t8('Do you really want to delete this reclamation reason?'),
+        only_if  => !$is_new,
+      ],
+      link => [
+        t8('Abort'),
+        link => $self->url_for(action => 'list'),
+      ],
+    );
+  }
+  $::request->layout->add_javascripts('kivi.Validator.js');
+}
+
+sub setup_list_action_bar {
+  my ($self) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Add'),
+        link => $self->url_for(action => 'new'),
+      ],
+      link => [
+        t8('Sort'),
+        link => $self->url_for(action => 'sort_list'),
+      ],
+    );
+  }
+}
+
+sub setup_sort_list_action_bar {
+  my ($self) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Add'),
+        link => $self->url_for(action => 'new'),
+      ],
+      link => [
+        t8('List'),
+        link => $self->url_for(action => 'list'),
+      ],
+    );
+  }
+}
+
+#
+# helpers
+#
+
+sub create_or_save {
+  my ($self) = @_;
+
+  unless ($self->reclamation_reason) {
+    $self->reclamation_reason(SL::DB::ReclamationReason->new());
+  }
+
+  my $is_new = !$self->reclamation_reason->id;
+
+  my $params = delete($::form->{reclamation_reason}) || { };
+  delete $params->{id};
+
+  my @errors;
+
+  my $db = $self->reclamation_reason->db;
+  if (!$db->with_transaction(sub {
+
+    # assign attributes and validate
+    $self->reclamation_reason->assign_attributes( %{$params} ) ;
+
+    push(@errors, $self->reclamation_reason->validate); # check data before DB error
+
+    if (@errors) {
+      die @errors . "\n";
+    };
+    $self->reclamation_reason->save;
+    1;
+  })) {
+    die @errors ? join("\n", @errors) . "\n" : $db->error . "\n";
+  }
+
+  flash_later('info', $is_new ? t8('The reclamation reason has been created.') : t8('The reclamation reason has been saved.'));
+  $self->redirect_to(action => 'list');
+}
+
+sub show_form {
+  my ($self, %params) = @_;
+
+  $self->setup_form_action_bar;
+  $self->render(
+    'reclamation_reason/form',
+    %params,
+  );
+}
+
+sub load_reclamation_reason {
+  my ($self) = @_;
+
+  $self->reclamation_reason(SL::DB::ReclamationReason->new(id => $::form->{id})->load);
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::ReclamationReason - controller for reclamation_reasons
+
+=head1 SYNOPSIS
+
+This is a small controller to add end edit reclamation_reasons.
+
+=head2 Key Features
+
+=over 4
+
+=item *
+
+Adding, editing, deleting and sorting of reclamation reasons.
+
+=item *
+
+Reasons can be valid for purchase, sales or both.
+
+=back
+
+=head1 CODE
+
+=head2 Layout
+
+=over 4
+
+=item * C<SL/Controller/ReclamationReason.pm>
+
+the controller
+
+=item * C<template/webpages/reclamation_reason/form.html>
+
+main form
+
+=item * C<template/webpages/reclamation_reason/list.html>
+
+list form
+
+=item * C<template/webpages/reclamation_reason/sort_list.html>
+
+sorting form
+
+=back
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Controller/Reconciliation.pm b/SL/Controller/Reconciliation.pm
index 9cf25a378..6e9bb2936 100644
--- a/SL/Controller/Reconciliation.pm
+++ b/SL/Controller/Reconciliation.pm
@@ -30,7 +30,10 @@ sub action_search {
   my ($self) = @_;
 
   $self->setup_search_action_bar;
-  $self->render('reconciliation/search');
+  $self->render('reconciliation/search',
+                title => t8('Reconciliation with bank'),
+               );
+
 }
 
 sub action_reconciliation {
@@ -45,7 +48,8 @@ sub action_reconciliation {
   $self->setup_reconciliation_action_bar;
   $self->render('reconciliation/form',
                 ui_tab => scalar(@{$self->{PROPOSALS}}) > 0?1:0,
-                title => t8('Reconciliation'));
+                title => t8('Reconciliation'),
+               );
 }
 
 sub action_load_overview {
@@ -257,7 +261,7 @@ sub _get_proposals {
       if ($linked_record->to_table eq 'ar') {
         $invoice = SL::DB::Manager::Invoice->find_by(id => $linked_record->to_id);
         #find payments
-        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_link => { like => '%AR_paid%' }, transdate => $bt->transdate ]);
+        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $bt->local_bank_account->chart_id , transdate => $bt->transdate ]);
         foreach my $payment (@{ $payments }) {
           $check_sum += $payment->amount;
           push @{ $proposal->{BB} }, $payment;
@@ -266,7 +270,7 @@ sub _get_proposals {
       if ($linked_record->to_table eq 'ap') {
         $invoice = SL::DB::Manager::PurchaseInvoice->find_by(id => $linked_record->to_id);
         #find payments
-        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_link => { like => '%AP_paid%' }, transdate => $bt->transdate ]);
+        my $payments = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $bt->local_bank_account->chart_id, transdate => $bt->transdate ]);
         foreach my $payment (@{ $payments }) {
           $check_sum += $payment->amount;
           push @{ $proposal->{BB} }, $payment;
diff --git a/SL/Controller/RecordLinks.pm b/SL/Controller/RecordLinks.pm
index 49661cbe0..ea7fbfed1 100644
--- a/SL/Controller/RecordLinks.pm
+++ b/SL/Controller/RecordLinks.pm
@@ -12,6 +12,7 @@ use SL::DB::DeliveryOrder;
 use SL::DB::Invoice;
 use SL::DB::Letter;
 use SL::DB::PurchaseInvoice;
+use SL::DB::Reclamation;
 use SL::DB::RecordLink;
 use SL::DB::RequirementSpec;
 use SL::DBUtils qw(like);
@@ -38,24 +39,29 @@ my %link_type_defaults = (
 );
 
 my @link_type_specifics = (
-  { title => t8('Requirement spec'),        type => 'requirement_spec',        model => 'RequirementSpec', number => 'id', project => 'project', description => 'title', date => undef, filter => 'working_copy_filter', },
-  { title => t8('Shop Order'),              type => 'shop_order',              model => 'ShopOrder',       number => 'shop_ordernumber', date => 'order_date', project => undef, },
-  { title => t8('Sales quotation'),         type => 'sales_quotation',         model => 'Order',           number => 'quonumber', },
-  { title => t8('Sales Order'),             type => 'sales_order',             model => 'Order',           number => 'ordnumber', },
-  { title => t8('Sales delivery order'),    type => 'sales_delivery_order',    model => 'DeliveryOrder',   number => 'donumber',  },
-  { title => t8('RMA delivery order'),      type => 'rma_delivery_order',      model => 'DeliveryOrder',   number => 'rdonumber', },
-  { title => t8('Sales Invoice'),           type => 'invoice',                 model => 'Invoice',         number => 'invnumber', },
-  { title => t8('Request for Quotation'),   type => 'request_quotation',       model => 'Order',           number => 'quonumber', },
-  { title => t8('Purchase Order'),          type => 'purchase_order',          model => 'Order',           number => 'ordnumber', },
-  { title => t8('Purchase delivery order'), type => 'purchase_delivery_order', model => 'DeliveryOrder',   number => 'donumber',  },
-  { title => t8('Supplier delivery order'), type => 'supplier_delivery_order', model => 'DeliveryOrder',   number => 'sdonumber', },
-  { title => t8('Purchase Invoice'),        type => 'purchase_invoice',        model => 'PurchaseInvoice', number => 'invnumber', },
-  { title => t8('Letter'),                  type => 'letter',                  model => 'Letter',          number => 'letternumber', description => 'subject', description_title => t8('Subject'), date => 'date', project => undef },
-  { title => t8('Email'),                   type => 'email_journal',           model => 'EmailJournal',    number => 'id', description => 'subject', description_title => t8('Subject'), },
-  { title => t8('AR Transaction'),          type => 'ar_transaction',          model => 'Invoice',         number => 'invnumber', },
-  { title => t8('AP Transaction'),          type => 'ap_transaction',          model => 'PurchaseInvoice', number => 'invnumber', },
-  { title => t8('Dunning'),                 type => 'dunning',                 model => 'Dunning',         number => 'dunning_id', },
-  { title => t8('GL Transaction'),          type => 'gl_transaction',          model => 'GLTransaction',   number => 'reference', },
+  { title => t8('Requirement spec'),            type => 'requirement_spec',            model => 'RequirementSpec', number => 'id', project => 'project', description => 'title', date => undef, filter => 'working_copy_filter', },
+  { title => t8('Shop Order'),                  type => 'shop_order',                  model => 'ShopOrder',       number => 'shop_ordernumber', date => 'order_date', project => undef, description => undef, },
+  { title => t8('Sales quotation'),             type => 'sales_quotation',             model => 'Order',           number => 'quonumber',     },
+  { title => t8('Sales Order Intake'),          type => 'sales_order_intake',          model => 'Order',           number => 'ordnumber',     },
+  { title => t8('Sales Order'),                 type => 'sales_order',                 model => 'Order',           number => 'ordnumber',     },
+  { title => t8('Sales delivery order'),        type => 'sales_delivery_order',        model => 'DeliveryOrder',   number => 'donumber',      },
+  { title => t8('RMA delivery order'),          type => 'rma_delivery_order',          model => 'DeliveryOrder',   number => 'rdonumber',     },
+  { title => t8('Sales Reclamation'),           type => 'sales_reclamation',           model => 'Reclamation',     number => 'record_number', },
+  { title => t8('Sales Invoice'),               type => 'invoice',                     model => 'Invoice',         number => 'invnumber',     },
+  { title => t8('Request for Quotation'),       type => 'request_quotation',           model => 'Order',           number => 'quonumber',     },
+  { title => t8('Purchase Quotation Intake'),   type => 'purchase_quotation_intake',   model => 'Order',           number => 'quonumber',     },
+  { title => t8('Purchase Order'),              type => 'purchase_order',              model => 'Order',           number => 'ordnumber',     },
+  { title => t8('Purchase Order Confirmation'), type => 'purchase_order_confirmation', model => 'Order',           number => 'ordnumber',     },
+  { title => t8('Purchase delivery order'),     type => 'purchase_delivery_order',     model => 'DeliveryOrder',   number => 'donumber',      },
+  { title => t8('Supplier delivery order'),     type => 'supplier_delivery_order',     model => 'DeliveryOrder',   number => 'sdonumber',     },
+  { title => t8('Purchase Reclamation'),        type => 'purchase_reclamation',        model => 'Reclamation',     number => 'record_number', },
+  { title => t8('Purchase Invoice'),            type => 'purchase_invoice',            model => 'PurchaseInvoice', number => 'invnumber',     },
+  { title => t8('Letter'),                      type => 'letter',                      model => 'Letter',          number => 'letternumber', description => 'subject', description_title => t8('Subject'), date => 'date', project => undef },
+  { title => t8('Email'),                       type => 'email_journal',               model => 'EmailJournal',    number => 'id',           description => 'subject', description_title => t8('Subject'), project => undef, date => 'sent_on', },
+  { title => t8('AR Transaction'),              type => 'ar_transaction',              model => 'Invoice',         number => 'invnumber',     },
+  { title => t8('AP Transaction'),              type => 'ap_transaction',              model => 'PurchaseInvoice', number => 'invnumber',     },
+  { title => t8('Dunning'),                     type => 'dunning',                     model => 'Dunning',         number => 'dunning_id',   project => undef, description => undef, },
+  { title => t8('GL Transaction'),              type => 'gl_transaction',              model => 'GLTransaction',   number => 'reference',    project => undef },
 );
 
 my @link_types = map { +{ %link_type_defaults, %{ $_ } } } @link_type_specifics;
@@ -67,9 +73,14 @@ my @link_types = map { +{ %link_type_defaults, %{ $_ } } } @link_type_specifics;
 sub action_ajax_list {
   my ($self) = @_;
 
+  my %order_centric_params = (
+    with_myself           => $::instance_conf->get_record_links_from_order_with_myself,
+    with_sales_quotations => $::instance_conf->get_record_links_from_order_with_quotations
+  );
+
   eval {
-    my $linked_records = ($::instance_conf->get_always_record_links_from_order && ref $self->object ne 'SL::DB::Order')
-                       ?  $self->get_order_centric_linked_records
+    my $linked_records = $::instance_conf->get_always_record_links_from_order
+                       ?  $self->object->sales_order_centric_linked_records(%order_centric_params)
                        :  $self->object->linked_records(direction => 'both', recursive => 1, save_path => 1);
 
     push @{ $linked_records }, $self->object->sepa_export_items if $self->object->can('sepa_export_items');
@@ -118,12 +129,14 @@ sub action_ajax_add_filter {
   my @link_type_select = map { [ $_->{type}, $_->{title} ] } @link_types;
   my @projects         = map { [ $_->id, $_->presenter->project(display => 'inline', style => 'both', no_link => 1) ] } @{ SL::DB::Manager::Project->get_all_sorted };
   my $is_sales         = $self->object->can('customer_id') && $self->object->customer_id;
+  my $is_purchase      = $self->object->can('vendor_id')   && $self->object->vendor_id;
 
   $self->render(
     'record_links/add_filter',
     { layout          => 0 },
     is_sales          => $is_sales,
-    DEFAULT_LINK_TYPE => $is_sales ? 'sales_quotation' : 'request_quotation',
+    is_purchase       => $is_purchase,
+    DEFAULT_LINK_TYPE => $is_sales ? 'sales_quotation' : $is_purchase ? 'request_quotation' : 'email_journal',
     LINK_TYPES        => \@link_type_select,
     PROJECTS          => \@projects,
   );
@@ -132,8 +145,11 @@ sub action_ajax_add_filter {
 sub action_ajax_add_list {
   my ($self) = @_;
 
+  my $class       = 'SL::DB::'          . $self->link_type_desc->{model};
   my $manager     = 'SL::DB::Manager::' . $self->link_type_desc->{model};
-  my $vc          = $self->link_type =~ m/shop|sales_|^invoice|requirement_spec|letter|^ar_/ ? 'customer' : 'vendor';
+  my $vc          = !($class->can('customer_id') || $class->can('vendor_id')) ? undef
+                  : $self->link_type =~ m/shop|sales_|^invoice|requirement_spec|letter|^ar_/ ? 'customer'
+                  : 'vendor';
   my $project     = $self->link_type_desc->{project};
   my $project_id  = "${project}_id";
   my $description = $self->link_type_desc->{description};
@@ -141,13 +157,12 @@ sub action_ajax_add_list {
   my $number      = $self->link_type_desc->{number};
 
   my @where = $filter && $manager->can($filter) ? $manager->$filter($self->link_type) : ();
-  push @where, ("${vc}.${vc}number"     => { ilike => like($::form->{vc_number}) })               if $::form->{vc_number};
-  push @where, ("${vc}.name"            => { ilike => like($::form->{vc_name}) })                 if $::form->{vc_name};
+  push @where, ("${vc}.${vc}number"     => { ilike => like($::form->{vc_number}) })               if $vc && $::form->{vc_number};
+  push @where, ("${vc}.name"            => { ilike => like($::form->{vc_name}) })                 if $vc && $::form->{vc_name};
   push @where, ($description            => { ilike => like($::form->{transaction_description}) }) if $::form->{transaction_description};
-  push @where, ($project_id             => $::form->{globalproject_id})                           if $::form->{globalproject_id} && $manager->can($project_id);
+  push @where, ($project_id             => $::form->{globalproject_id})                           if $::form->{globalproject_id} && $class->can($project_id);
 
   if ($::form->{number}) {
-    my $class    = 'SL::DB::' . $self->link_type_desc->{model};
     my $col_type = ref $class->meta->column($number);
     if ($col_type =~ /^Rose::DB::Object::Metadata::Column::(?:Integer|Serial)$/) {
       push @where, ($number => $::form->{number});
@@ -156,11 +171,12 @@ sub action_ajax_add_list {
     }
   }
 
-  my @with_objects = ($vc);
-  push @with_objects, $project if $manager->can($project_id);
+  my @with_objects = ();
+  push @with_objects, $vc      if $vc;
+  push @with_objects, $project if $class->can($project_id);
 
   # show the newest records first (should be better for 80% of the cases TODO sortable click
-  my $objects = $manager->get_all_sorted(where => \@where, with_objects => \@with_objects, sort_by => 'itime',  sort_dir => 'ASC');
+  my $objects = $manager->get_all(where => \@where, with_objects => \@with_objects, sort_by => 'itime',  sort_dir => 'ASC');
   my $output  = $self->render(
     'record_links/add_list',
     { output => 0 },
@@ -248,24 +264,4 @@ sub check_auth {
   $::auth->assert('record_links');
 }
 
-# internal
-
-sub get_order_centric_linked_records {
-  my ($self) = @_;
-
-  my $all_linked_records = $self->object->linked_records(direction => 'from', recursive => 1);
-  my $filtered_orders = [ grep { 'SL::DB::Order' eq ref $_ && $_->is_type('sales_order') } @$all_linked_records ];
-
-  # no orders no call to linked_records via batch mode
-  # but instead return default list
-  return $self->object->linked_records(direction => 'both', recursive => 1, save_path => 1)
-    unless scalar @$filtered_orders;
-
-  # we have a order, therefore get the tree view from the top (order)
-  my $id_ref = [ map { $_->id } @$filtered_orders ];
-  my $linked_records = SL::DB::Order->new->linked_records(direction => 'to', recursive => 1, batch => $id_ref);
-  push @{ $linked_records }, @$filtered_orders;
-
-  return $linked_records;
-}
 1;
diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index afbe2bba6..c7d3276ad 100644
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -334,8 +334,7 @@ sub setup {
 
   $::auth->assert('requirement_spec_edit');
   $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec);
-  $::request->{layout}->use_javascript("${_}.js")  for qw(jquery.jstree jquery/jquery.contextMenu jquery/jquery.hotkeys requirement_spec ckeditor/ckeditor ckeditor/adapters/jquery kivi.Part kivi.CustomerVendor
-                                                          ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->{layout}->use_javascript("${_}.js")  for qw(jquery.jstree jquery/jquery.contextMenu jquery/jquery.hotkeys requirement_spec kivi.Part kivi.CustomerVendor ckeditor5/ckeditor ckeditor5/translations/de);
   $self->init_visible_section;
 
   return 1;
@@ -478,10 +477,10 @@ sub create_or_update {
 }
 
 sub prepare_report {
-  my ($self)      = @_;
-
-  my $is_template = $::form->{is_template};
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
+  my ($self)       = @_;
+  my $is_template  = $::form->{is_template};
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Requirement Spec Templates');
 
   $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->finalize; # for filter laundering
diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm
index 398c86a47..60f9b43eb 100644
--- a/SL/Controller/RequirementSpecOrder.pm
+++ b/SL/Controller/RequirementSpecOrder.pm
@@ -10,6 +10,7 @@ use List::Util qw(first);
 
 use SL::DB::Customer;
 use SL::DB::Order;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Part;
 use SL::DB::RequirementSpec;
 use SL::DB::RequirementSpecOrder;
@@ -93,7 +94,7 @@ sub action_update {
   my $order    = $self->rs_order->order;
   my $sections = $self->requirement_spec->sections_sorted;
 
-  if (!$::auth->assert($order->quotation ? 'sales_quotation_edit' : 'sales_order_edit', 1)) {
+  if (!$::auth->assert($order->type_data->rights('edit'), 1)) {
     return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render;
   }
 
@@ -368,11 +369,12 @@ sub create_order {
   my $reqdate    = !$::form->{quotation} ? undef
                  : $customer->payment_id ? $customer->payment->calc_date
                  :                         DateTime->today_local->next_workday(extra_days => $::instance_conf->get_reqdate_interval)->to_kivitendo;
+  my $record_type = $::form->{quotation} ? SALES_QUOTATION_TYPE() : SALES_ORDER_TYPE();
   my $order      = SL::DB::Order->new(
+    record_type             => $record_type,
     globalproject_id        => $self->requirement_spec->project_id,
     transdate               => DateTime->today_local,
     reqdate                 => $reqdate,
-    quotation               => !!$::form->{quotation},
     orderitems              => [ @orderitems, @add_items ],
     customer_id             => $customer->id,
     taxincluded             => $customer->taxincluded,
diff --git a/SL/Controller/SalesPurchase.pm b/SL/Controller/SalesPurchase.pm
index ab31b8c65..59ab1951e 100644
--- a/SL/Controller/SalesPurchase.pm
+++ b/SL/Controller/SalesPurchase.pm
@@ -19,10 +19,10 @@ sub action_check_duplicate_invnumber {
                  );
   # we are modifying a existing daily booking - allow this if
   # booking conditions are not super strict
-  undef $exists_ap if ($::instance_conf->get_ap_changeable != 0
+  undef $exists_ap if ($exists_ap
+                    && $::instance_conf->get_ap_changeable != 0
                     && $exists_ap->gldate == DateTime->today_local);
 
-
   $_[0]->render(\ !!$exists_ap, { type => 'text' });
 }
 
diff --git a/SL/Controller/ScanQRBill.pm b/SL/Controller/ScanQRBill.pm
new file mode 100644
index 000000000..21d99cc0e
--- /dev/null
+++ b/SL/Controller/ScanQRBill.pm
@@ -0,0 +1,213 @@
+package SL::Controller::ScanQRBill;
+
+use strict;
+use parent qw(SL::Controller::Base);
+
+use List::Util qw(first);
+use URI::Escape;
+
+use SL::Helper::QrBillParser;
+use SL::DB::Vendor;
+use SL::DB::Chart;
+use SL::DB::Tax;
+use SL::DB::ValidityToken;
+
+use Rose::Object::MakeMethods::Generic(
+  #scalar => [ qw() ],
+  'scalar --get_set_init' => [ qw(vendors accounts_AP_amount accounts_AP taxcharts) ],
+);
+
+# check permissions
+__PACKAGE__->run_before(sub { $::auth->assert('ap_transactions'); });
+
+################ actions #################
+
+sub action_scan_view {
+  my ($self) = @_;
+
+  $::request->layout->add_javascripts('html5-qrcode.js');
+  $::request->layout->add_javascripts('kivi.ScanQRBill.js');
+
+  $self->render('scan_qrbill/scan_view',
+    transaction_success => $::form->{transaction_success} // '0',
+    invoice_number => $::form->{invnumber} // '',
+    developer => $::auth->assert('developer', 1) ? '1' : '0',
+  );
+}
+
+sub action_handle_scan_result {
+  my ($self) = @_;
+
+  my $qrtext = $::form->{qrtext};
+
+  # load text into object
+  $self->{qr_obj} = SL::Helper::QrBillParser->new($qrtext);
+
+  # check if valid qr-bill
+  if (!$self->{qr_obj}->is_valid) {
+    return $self->js
+      ->run('kivi.ScanQRBill.popupInvalidQRBill', $self->{qr_obj}->error)
+      ->render();
+  }
+
+  my $vendor_name = $self->{qr_obj}->{creditor}->{name};
+  $self->{vendor} = first { $_->{name} eq $vendor_name } @{ $self->vendors };
+
+  if (!$self->{vendor}) {
+    return $self->js
+      ->run('kivi.ScanQRBill.popupVendorNotFound', $vendor_name)
+      ->render();
+  }
+
+  $self->prepare_add_purchase_transaction();
+}
+
+################# internal ###############
+
+sub prepare_add_purchase_transaction {
+  my ($self) = @_;
+
+  my $qr_obj = $self->{qr_obj};
+
+  my $token = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
+  my $html = $self->render('scan_qrbill/_add_purchase_transaction',
+    { output => 0 },
+    vendor => {
+      name => $self->{vendor}->{name},
+      number => $self->{vendor}->{vendornumber},
+      id => $self->{vendor}->{id},
+    },
+    qrbill => {
+      unstructured_message => $qr_obj->{additional_information}->{unstructured_message},
+      reference_type => $qr_obj->{payment_reference}->{reference_type},
+      reference => $qr_obj->{payment_reference}->{reference},
+      amount => $qr_obj->{payment_amount_information}->{amount},
+      currency => $qr_obj->{payment_amount_information}->{currency},
+      data_encoded => uri_escape($qr_obj->raw_data),
+    },
+    accounts_AP_amount => $self->accounts_AP_amount,
+    accounts_AP => $self->accounts_AP,
+    taxcharts => $self->taxcharts,
+    form_validity_token => $token,
+  );
+
+  $self->js->html('#main-content', $html)->render();
+}
+
+sub init_vendors {
+  SL::DB::Manager::Vendor->get_all();
+}
+
+sub init_accounts_AP_amount {
+  [ map { {
+      text => "$_->{accno} - $_->{description}",
+      accno => $_->{accno},
+      id => $_->{id},
+      chart_id => $_->{id},
+    } } @{ SL::DB::Manager::Chart->get_all(
+      query   => [ SL::DB::Manager::Chart->link_filter('AP_amount') ],
+      sort_by => 'accno ASC') }
+  ];
+}
+
+sub init_accounts_AP {
+  [ map { {
+      text => "$_->{accno} - $_->{description}",
+      accno => $_->{accno},
+      id => $_->{id},
+      chart_id => $_->{id},
+    } } @{ SL::DB::Manager::Chart->get_all(
+      query   => [ SL::DB::Manager::Chart->link_filter('AP') ],
+      sort_by => 'accno ASC') }
+  ];
+}
+
+sub init_taxcharts {
+  [ map { {
+      text => "$_->{taxkey} - $_->{taxdescription} " . ($_->{rate} * 100) .' %',
+      id => "$_->{id}--$_->{rate}",
+    } } @{ SL::DB::Manager::Tax->get_all(
+    where   => [ chart_categories => { like => '%E%' }],
+    sort_by => 'taxkey, rate') }
+  ];
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::ScanQRBill - Controller for scanning swiss QR-Bills using the mobile template
+
+=head1 DESCRIPTION
+
+Renders the scan view in the mobile template and handles the scan result.
+
+The scanned QR-Bill data is parsed and the vendor is searched in the database.
+
+If everything is valid an add purchase transaction view is rendered and
+the QR-Bill can be saved as a purchase transaction.
+
+The post function from ap.pl is used to save the purchase transaction.
+
+The raw data of the QR-Bill is stored with the purchase transaction in the ap table
+in the field qrbill_data.
+The data can later be accessed again using the parser module SL::Helper::QrBillParser.
+
+=head1 SECURITY CONSIDERATIONS
+
+In theory an attacker could try to insert a malicious Javascript code into a qr code,
+that is then scanned, and redisplayed in the browser (XSS).
+
+Therefore it is important to escape any data coming from the qr code when it is rendered
+in the templates. For this we use the template toolkit html filter: [% qrdata | html %],
+Jquery's text function: $('#qrdata').text(qrdata);, and URI::Escape; for the raw data.
+
+For database insertion we use prepared statements (AP.pm).
+
+=head1 TESTING
+
+To simplify testing the scan view shows some buttons to send example qr codes, when in
+developer mode. Sending is implemented in Javascript in js/kivi.ScanQRBill.js.
+
+=head1 URL ACTIONS
+
+=over 4
+
+=item C<scan_view>
+
+Renders the scan view in the mobile template.
+
+=item C<handle_scan_result>
+
+Handles the scan result and renders the add purchase transaction view.
+
+=back
+
+=head1 TODO
+
+=head2 Additional features:
+
+=over 4
+
+=item * automatically extract invoice number and dates etc. from "SWICO-String" if present
+
+=item * Option to add the vendor if not found
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+
+=cut
diff --git a/SL/Controller/SellPriceInformation.pm b/SL/Controller/SellPriceInformation.pm
index ccb0d5fcc..3b6285f9e 100644
--- a/SL/Controller/SellPriceInformation.pm
+++ b/SL/Controller/SellPriceInformation.pm
@@ -65,27 +65,29 @@ sub set_sort_params {
 sub column_defs {
   my ($self) = @_;
   return {
-    transdate   => { text => $::locale->text('Date'),
-                      sub => sub { $_[0]->order->transdate_as_date }},
-    ordnumber   => { text => $::locale->text('Number'),
-                      sub => sub { $_[0]->order->number },
-                 obj_link => sub { $self->link_to($_[0]->order) }},
-    customer    => { text => $::locale->text('Customer'),
-                      sub => sub { $_[0]->order->customer->name },
-                 obj_link => sub { $self->link_to($_[0]->order->customer) }},
-    customer    => { text => $::locale->text('Customer'),
-                      sub => sub { $_[0]->order->customer->name },
-                 obj_link => sub { $self->link_to($_[0]->order->customer) }},
-    ship        => { text => $::locale->text('Delivered'),
-                      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty) . ' ' . $_[0]->unit }},
-    qty         => { text => $::locale->text('Qty'),
-                      sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit }},
-    sellprice   => { text => $::locale->text('Sell Price'),
-                      sub => sub { $_[0]->sellprice_as_number }},
-    discount    => { text => $::locale->text('Discount'),
-                      sub => sub { $_[0]->discount_as_percent . "%" }},
-    amount      => { text => $::locale->text('Amount'),
-                      sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty * $_[0]->sellprice * (1 - $_[0]->discount), 2) }},
+    transdate    => { text => $::locale->text('Date'),
+                       sub => sub { $_[0]->order->transdate_as_date }},
+    ordnumber    => { text => $::locale->text('Number'),
+                       sub => sub { $_[0]->order->number },
+                  obj_link => sub { $self->link_to($_[0]->order) }},
+    customer     => { text => $::locale->text('Customer'),
+                       sub => sub { $_[0]->order->customer->name },
+                  obj_link => sub { $self->link_to($_[0]->order->customer) }},
+    customer     => { text => $::locale->text('Customer'),
+                       sub => sub { $_[0]->order->customer->name },
+                  obj_link => sub { $self->link_to($_[0]->order->customer) }},
+    ship         => { text => $::locale->text('Delivered'),
+                       sub => sub { $::form->format_amount(\%::myconfig, $_[0]->shipped_qty) . ' ' . $_[0]->unit }},
+    qty          => { text => $::locale->text('Qty'),
+                       sub => sub { $_[0]->qty_as_number . ' ' . $_[0]->unit }},
+    price_factor => { text => $::locale->text('Price Factor'),
+                      sub => sub { $_[0]->price_factor_as_number }},
+    sellprice    => { text => $::locale->text('Sell Price'),
+                       sub => sub { $_[0]->sellprice_as_number }},
+    discount     => { text => $::locale->text('Discount'),
+                       sub => sub { $_[0]->discount_as_percent . "%" }},
+    amount       => { text => $::locale->text('Amount'),
+                       sub => sub { $::form->format_amount(\%::myconfig, $_[0]->qty * $_[0]->sellprice * (1 - $_[0]->discount) / ($_[0]->price_factor ? $_[0]->price_factor : 1.0), 2) }},
   };
 }
 
@@ -99,9 +101,9 @@ sub prepare_report {
   my $title    = $::locale->text('Sales Price information');
   $title      .= ': ' . $::locale->text($::form->{filter}->{order}{type}) if $::form->{filter}->{order}{type};
 
-  my @columns  = qw(transdate ordnumber customer ship qty sellprice discount amount);
-  my @visible  = qw(transdate ordnumber customer ship qty sellprice discount amount);
-  my @sortable = qw(transdate ordnumber customer          sellprice discount       );
+  my @columns  = qw(transdate ordnumber customer ship qty price_factor sellprice discount amount);
+  my @visible  = qw(transdate ordnumber customer ship qty price_factor sellprice discount amount);
+  my @sortable = qw(transdate ordnumber customer          sellprice              discount       );
 
   my $column_defs = $self->column_defs;
 
@@ -137,14 +139,8 @@ sub link_to {
 
   if ($object->isa('SL::DB::Order')) {
     my $type   = $object->type;
-    my $vc     = $object->is_sales ? 'customer' : 'vendor';
     my $id     = $object->id;
-
-    if ($::instance_conf->get_feature_experimental_order) {
-      return "controller.pl?action=Order/$action&type=$type&id=$id";
-    } else {
-      return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
-    }
+    return "controller.pl?action=Order/$action&type=$type&id=$id";
   }
   if ($object->isa('SL::DB::Customer')) {
     my $id     = $object->id;
diff --git a/SL/Controller/ShopOrder.pm b/SL/Controller/ShopOrder.pm
index 3e61c636a..a83ee5a66 100644
--- a/SL/Controller/ShopOrder.pm
+++ b/SL/Controller/ShopOrder.pm
@@ -135,13 +135,17 @@ sub action_undelete_order {
 sub action_transfer {
   my ( $self ) = @_;
 
+  $::form->{customer} ||= $::form->{partial_transfer_customer_id};
+
   my $customer = SL::DB::Manager::Customer->find_by(id => $::form->{customer});
-  die "Can't find customer" unless $customer;
+  die "Can't find customer" unless ref $customer eq 'SL::DB::Customer';
+
   my $employee = SL::DB::Manager::Employee->current;
   die "Can't find employee" unless $employee;
 
   die "Can't load shop_order form form->import_id" unless $self->shop_order;
-  my $order = $self->shop_order->convert_to_sales_order(customer => $customer, employee => $employee);
+  my $order = $self->shop_order->convert_to_sales_order(customer => $customer, employee => $employee,
+                                                        pos_ids  => $::form->{pos_ids}               );
 
   if ($order->{error}){
     flash_later('error',@{$order->{errors}});
@@ -150,6 +154,7 @@ sub action_transfer {
     $order->db->with_transaction( sub {
       $order->calculate_prices_and_taxes;
       $order->save;
+      SL::DB::OrderVersion->new(oe_id => $order->id, version => 1)->save;
 
       my $snumbers = "ordernumber_" . $order->ordnumber;
       SL::DB::History->new(
@@ -170,8 +175,7 @@ sub action_transfer {
       $self->shop_order->save;
       $self->shop_order->link_to_record($order);
     }) || die $order->db->error;
-    my $order_controller = $::instance_conf->get_feature_experimental_order ? 'Order' :'oe.pl';
-    $self->redirect_to(controller => $order_controller, action => 'edit', type => 'sales_order', vc => 'customer', id => $order->id);
+    $self->redirect_to(controller => 'Order', action => 'edit', type => 'sales_order', vc => 'customer', id => $order->id);
   }
 }
 
@@ -369,6 +373,8 @@ Marks the shoporder obsolete = false
 =item C<action_transfer>
 
 Transfers one shoporder to an order.
+If the optional  $::form->{pos_ids} exists, they will be added
+as a param for the convert_to_sales_order method
 
 =item C<action_apply_customer>
 
diff --git a/SL/Controller/SimpleSystemSetting.pm b/SL/Controller/SimpleSystemSetting.pm
index f23edbfd9..987a07b2d 100644
--- a/SL/Controller/SimpleSystemSetting.pm
+++ b/SL/Controller/SimpleSystemSetting.pm
@@ -32,10 +32,12 @@ my %supported_types = (
     list_attributes => [
       { method => 'name',                                      title => t8('Name'), },
       { method => 'iban',                                      title => t8('IBAN'), },
+      { method => 'qr_iban',                                   title => t8('QR-IBAN (Swiss)'), },
       { method => 'bank',                                      title => t8('Bank'), },
       { method => 'bank_code',                                 title => t8('Bank code'), },
       { method => 'bank_account_id',                           title => t8('Bank Account Id Number (Swiss)'), },
       { method => 'bic',                                       title => t8('BIC'), },
+      {                                                        title => t8('Use with bank import'), formatter => sub { $_[0]->use_with_bank_import ? t8('yes') : t8('no') } },
       {                                                        title => t8('Use for Factur-X/ZUGFeRD'), formatter => sub { $_[0]->use_for_zugferd ? t8('yes') : t8('no') } },
       {                                                        title => t8('Use for Swiss QR-Bill'), formatter => sub { $_[0]->use_for_qrbill ? t8('yes') : t8('no') } },
       { method => 'reconciliation_starting_date_as_date',      title => t8('Date'),    align => 'right' },
@@ -175,6 +177,21 @@ my %supported_types = (
     ],
   },
 
+  order_status => {
+    # Make locales.pl happy: $self->render("simple_system_setting/_order_status_form")
+    class  => 'OrderStatus',
+    titles => {
+      list => t8('RFQ/Order Statuses'),
+      add  => t8('Add rfq/order status'),
+      edit => t8('Edit rfq/order status'),
+    },
+    list_attributes => [
+      { method => 'name',        title => t8('Name') },
+      { method => 'description', title => t8('Description') },
+      { method => 'obsolete',    title => t8('Obsolete'), formatter => sub { $_[0]->obsolete ? t8('yes') : t8('no') } },
+    ],
+  },
+
   project_status => {
     class  => 'ProjectStatus',
     titles => {
@@ -373,7 +390,7 @@ sub check_type_and_auth {
 }
 
 sub setup_javascript {
-  $::request->layout->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->layout->use_javascript("${_}.js") for qw();
 }
 
 sub init_class               { "SL::DB::"          . $_[0]->config->{class}                  }
diff --git a/SL/Controller/Test.pm b/SL/Controller/Test.pm
index 30638a18a..c94814161 100644
--- a/SL/Controller/Test.pm
+++ b/SL/Controller/Test.pm
@@ -14,4 +14,10 @@ sub action_dump_form {
   $self->render(\$output, { type => 'text' });
 }
 
+sub action_ckeditor_test_page {
+  my ($self) = @_;
+
+  $self->render("test/ckeditor");
+}
+
 1;
diff --git a/SL/Controller/TimeRecording.pm b/SL/Controller/TimeRecording.pm
index 930f346d6..32974e13f 100644
--- a/SL/Controller/TimeRecording.pm
+++ b/SL/Controller/TimeRecording.pm
@@ -102,7 +102,7 @@ sub action_mark_as_booked {
 sub action_edit {
   my ($self) = @_;
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.TimeRecording ckeditor/ckeditor ckeditor/adapters/jquery kivi.Validator);
+  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.TimeRecording kivi.Validator);
 
   if ($self->use_duration) {
     flash('warning', t8('This entry is using start and end time. This information will be overwritten on saving.')) if !$self->time_recording->is_duration_used;
@@ -274,8 +274,8 @@ sub init_all_time_recording_articles {
 
 sub init_all_orders {
   my $orders = SL::DB::Manager::Order->get_all(query => [or             => [ closed    => 0, closed    => undef, id => $_[0]->time_recording->order_id ],
-                                                         or             => [ quotation => 0, quotation => undef ],
-                                                         '!customer_id' => undef]);
+                                                         record_type    => 'sales_order',
+                                                        ]);
   return [ map { [$_->id, sprintf("%s %s", $_->number, $_->customervendor->name) ] } sort { $a->number <=> $b->number } @{$orders||[]} ];
 }
 
@@ -322,7 +322,7 @@ sub prepare_report {
     order        => { text => t8('Sales Order'),  sub => sub { $_[0]->order && $_[0]->order->number } },
     customer     => { text => t8('Customer'),     sub => sub { $_[0]->customer->displayable_name } },
     part         => { text => t8('Article'),      sub => sub { $_[0]->part && $_[0]->part->displayable_name } },
-    project      => { text => t8('Project'),      sub => sub { $_[0]->project && $_[0]->project->full_description(sytle => 'both') } },
+    project      => { text => t8('Project'),      sub => sub { $_[0]->project && $_[0]->project->full_description(style => 'both') } },
     description  => { text => t8('Description'),  sub => sub { $_[0]->description_as_stripped_html },
                       raw_data => sub { $_[0]->description_as_restricted_html }, # raw_data only used for html(?)
                       obj_link => sub { $self->url_for(action => 'edit', 'id' => $_[0]->id, callback => $self->models->get_callback) }  },
@@ -373,7 +373,7 @@ sub make_filter_summary {
   my @filter_strings;
 
   my $staff_member = $filter->{staff_member_id} ? SL::DB::Employee->new(id => $filter->{staff_member_id})->load->safe_name                         : '';
-  my $project      = $filter->{project_id}      ? SL::DB::Project->new (id => $filter->{project_id})     ->load->full_description(sytle => 'both') : '';
+  my $project      = $filter->{project_id}      ? SL::DB::Project->new (id => $filter->{project_id})     ->load->full_description(style => 'both') : '';
 
   my @filters = (
     [ $filter->{"date:date::ge"},                              t8('From Date')       ],
diff --git a/SL/Controller/TopQuickSearch.pm b/SL/Controller/TopQuickSearch.pm
index 4d0aa9492..80536ee26 100644
--- a/SL/Controller/TopQuickSearch.pm
+++ b/SL/Controller/TopQuickSearch.pm
@@ -20,15 +20,19 @@ my @available_modules = (
   'SL::Controller::TopQuickSearch::Assortment',
   'SL::Controller::TopQuickSearch::Contact',
   'SL::Controller::TopQuickSearch::SalesQuotation',
+  'SL::Controller::TopQuickSearch::SalesOrderIntake',
   'SL::Controller::TopQuickSearch::SalesOrder',
   'SL::Controller::TopQuickSearch::SalesDeliveryOrder',
   'SL::Controller::TopQuickSearch::RequestForQuotation',
+  'SL::Controller::TopQuickSearch::PurchaseQuotationIntake',
   'SL::Controller::TopQuickSearch::PurchaseOrder',
+  'SL::Controller::TopQuickSearch::PurchaseOrderConfirmation',
   'SL::Controller::TopQuickSearch::PurchaseDeliveryOrder',
   'SL::Controller::TopQuickSearch::GLTransaction',
   'SL::Controller::TopQuickSearch::Customer',
   'SL::Controller::TopQuickSearch::Vendor',
   'SL::Controller::TopQuickSearch::PhoneNumber',
+  'SL::Controller::TopQuickSearch::Project',
 );
 my %modules_by_name;
 
diff --git a/SL/Controller/TopQuickSearch/DeliveryOrder.pm b/SL/Controller/TopQuickSearch/DeliveryOrder.pm
index fd2694cd1..e5fb5c9e6 100644
--- a/SL/Controller/TopQuickSearch/DeliveryOrder.pm
+++ b/SL/Controller/TopQuickSearch/DeliveryOrder.pm
@@ -71,11 +71,10 @@ sub redirect_to_search {
 
 sub redirect_to_object {
   SL::Controller::Base->new->url_for(
-    controller => 'do.pl',
-    action     => 'edit',
-    type       => $_[0]->type,
-    vc         => $_[0]->vc,
+    controller => 'controller.pl',
+    action     => 'DeliveryOrder/edit',
     id         => $_[1],
+    type       => $_[0]->type,
   );
 }
 
diff --git a/SL/Controller/TopQuickSearch/GLTransaction.pm b/SL/Controller/TopQuickSearch/GLTransaction.pm
index 53d05ea42..c834ba4c3 100644
--- a/SL/Controller/TopQuickSearch/GLTransaction.pm
+++ b/SL/Controller/TopQuickSearch/GLTransaction.pm
@@ -25,20 +25,19 @@ sub query_autocomplete {
   my $limit = $::form->{limit} || 40; # max number of results per type (AR/AP/GL)
   my $term  = $::form->{term}  || '';
 
-  my $descriptionquery = { ilike => like($term) };
-  my $referencequery   = { ilike => like($term) };
-  my $apinvnumberquery = { ilike => like($term) };
-  my $namequery        = { ilike => like($term) };
-  my $arinvnumberquery = { ilike => '%' . SL::Util::trim($term) };
+  my $descriptionquery        = { ilike => like($term) };
+  my $referencequery          = { ilike => like($term) };
+  my $apinvnumberquery        = { ilike => like($term) };
+  my $namequery               = { ilike => like($term) };
+  my $arinvnumber_left_query  = { ilike => '%' . SL::Util::trim($term) };
+  my $arinvnumber_right_query = { ilike => SL::Util::trim($term) . '%' };
   # ar match is more restrictive. Left fuzzy beginning so it also matches "Storno zu $INVNUMBER"
-  # and numbers like 000123 if you only enter 123.
-  # When used in quicksearch short numbers like 1 or 11 won't match because of the
-  # ajax autocomplete minlimit of 3 characters
+  # and numbers like 000123 if you only enter 123. Right beginning searches from the begin.
 
   my (@glfilter, @arfilter, @apfilter);
 
   push( @glfilter, (or => [ description => $descriptionquery, reference => $referencequery ] ) );
-  push( @arfilter, (or => [ invnumber   => $arinvnumberquery, name      => $namequery ] ) );
+  push( @arfilter, (or => [ invnumber   => $arinvnumber_left_query, invnumber => $arinvnumber_right_query, name => $namequery ] ) );
   push( @apfilter, (or => [ invnumber   => $apinvnumberquery, name      => $namequery ] ) );
 
   my $gls = SL::DB::Manager::GLTransaction->get_all(  query => [ @glfilter ], limit => $limit, sort_by => 'transdate DESC');
diff --git a/SL/Controller/TopQuickSearch/OERecord.pm b/SL/Controller/TopQuickSearch/OERecord.pm
index d63dee03c..74f0431f1 100644
--- a/SL/Controller/TopQuickSearch/OERecord.pm
+++ b/SL/Controller/TopQuickSearch/OERecord.pm
@@ -64,22 +64,12 @@ sub redirect_to_search {
 }
 
 sub redirect_to_object {
-  if ($::instance_conf->get_feature_experimental_order) {
-    SL::Controller::Base->new->url_for(
-      controller => 'Order',
-      action     => 'edit',
-      type       => $_[0]->type,
-      id         => $_[1],
-    );
-  } else {
-    SL::Controller::Base->new->url_for(
-      controller => 'oe.pl',
-      action     => 'edit',
-      type       => $_[0]->type,
-      vc         => $_[0]->vc,
-      id         => $_[1],
-    );
-  }
+  SL::Controller::Base->new->url_for(
+    controller => 'Order',
+    action     => 'edit',
+    type       => $_[0]->type,
+    id         => $_[1],
+  );
 }
 
 sub type {
diff --git a/SL/Controller/TopQuickSearch/Project.pm b/SL/Controller/TopQuickSearch/Project.pm
new file mode 100644
index 000000000..4db152f8c
--- /dev/null
+++ b/SL/Controller/TopQuickSearch/Project.pm
@@ -0,0 +1,96 @@
+package SL::Controller::TopQuickSearch::Project;
+
+use strict;
+use parent qw(Rose::Object);
+
+use SL::Locale::String qw(t8);
+use SL::DB::Project;
+use SL::Controller::Helper::GetModels;
+use SL::Controller::Base;
+
+use Rose::Object::MakeMethods::Generic (
+  'scalar --get_set_init' => [ qw(models) ],
+);
+
+sub auth { 'project_edit' }
+
+sub name { 'project' }
+
+sub description_config { t8('Projects') }
+
+sub description_field { t8('Projects') }
+
+sub query_autocomplete {
+  my ($self) = @_;
+
+  my $objects = $self->models->get;
+
+  [
+    map {
+     value       => $_->full_description,
+     label       => $_->full_description,
+     id          => $_->id,
+    }, @$objects
+  ];
+}
+
+sub select_autocomplete {
+  $_[0]->redirect_to_object($::form->{id});
+}
+
+sub do_search {
+  my ($self) = @_;
+
+  my $objects = $self->models->get;
+
+  return !@$objects     ? ()
+       : @$objects == 1 ? $self->redirect_to_object($objects->[0]->id)
+       :                  $self->redirect_to_search($::form->{term});
+}
+
+sub redirect_to_search {
+  my ($self, $term) = @_;
+
+  SL::Controller::Base->new->url_for(
+    controller => 'controller.pl',
+    action     => 'Project/list',
+    all        => $term,
+  );
+
+}
+
+sub redirect_to_object {
+  my ($self, $term) = @_;
+  SL::Controller::Base->new->url_for(
+    controller => 'controller.pl',
+    action     => 'Project/edit',
+    id         => $term,
+  );
+}
+
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model      => 'Project',
+    source     => {
+      filter => {
+        'all:substr:multi::ilike' => $::form->{term},
+      },
+    },
+    sorted     => {
+      _default   => {
+        by  => 'itime',
+        dir => 0,
+      },
+      itime => t8('Date'),
+    },
+    paginated  => {
+      per_page => 10,
+    },
+    with_objects => [ qw(customer) ]
+  )
+}
+
+1;
diff --git a/SL/Controller/TopQuickSearch/PurchaseOrderConfirmation.pm b/SL/Controller/TopQuickSearch/PurchaseOrderConfirmation.pm
new file mode 100644
index 000000000..ba3c0d07f
--- /dev/null
+++ b/SL/Controller/TopQuickSearch/PurchaseOrderConfirmation.pm
@@ -0,0 +1,20 @@
+package SL::Controller::TopQuickSearch::PurchaseOrderConfirmation;
+
+use strict;
+use parent qw(SL::Controller::TopQuickSearch::OERecord);
+
+use SL::Locale::String qw(t8);
+
+sub auth { 'purchase_order_edit | purchase_order_view' }
+
+sub name { 'purchase_order_confirmation' }
+
+sub description_config { t8('Purchase Order Confirmations') }
+
+sub description_field { t8('Purchase Order Confirmations') }
+
+sub type { 'purchase_order_confirmation' }
+
+sub vc { 'vendor' }
+
+1;
diff --git a/SL/Controller/TopQuickSearch/PurchaseQuotationIntake.pm b/SL/Controller/TopQuickSearch/PurchaseQuotationIntake.pm
new file mode 100644
index 000000000..1c0c4faf1
--- /dev/null
+++ b/SL/Controller/TopQuickSearch/PurchaseQuotationIntake.pm
@@ -0,0 +1,20 @@
+package SL::Controller::TopQuickSearch::PurchaseQuotationIntake;
+
+use strict;
+use parent qw(SL::Controller::TopQuickSearch::OERecord);
+
+use SL::Locale::String qw(t8);
+
+sub auth { 'request_quotation_edit | request_quotation_view' }
+
+sub name { 'purchase_quotation_intake' }
+
+sub description_config { t8('Purchase Quotation Intakes') }
+
+sub description_field { t8('Purchase Quotation Intakes') }
+
+sub type { 'purchase_quotation_intake' }
+
+sub vc { 'vendor' }
+
+1;
diff --git a/SL/Controller/TopQuickSearch/SalesOrderIntake.pm b/SL/Controller/TopQuickSearch/SalesOrderIntake.pm
new file mode 100644
index 000000000..63218a1c0
--- /dev/null
+++ b/SL/Controller/TopQuickSearch/SalesOrderIntake.pm
@@ -0,0 +1,20 @@
+package SL::Controller::TopQuickSearch::SalesOrderIntake;
+
+use strict;
+use parent qw(SL::Controller::TopQuickSearch::OERecord);
+
+use SL::Locale::String qw(t8);
+
+sub auth { 'sales_order_edit | sales_order_view' }
+
+sub name { 'sales_order_intake' }
+
+sub description_config { t8('Sales Order Intakes') }
+
+sub description_field { t8('Sales Order Intakes') }
+
+sub type { 'sales_order_intake' }
+
+sub vc { 'customer' }
+
+1;
diff --git a/SL/Controller/YearEndTransactions.pm b/SL/Controller/YearEndTransactions.pm
index 43b4fee56..934a76c56 100644
--- a/SL/Controller/YearEndTransactions.pm
+++ b/SL/Controller/YearEndTransactions.pm
@@ -12,6 +12,7 @@ use SL::DBUtils;
 use Data::Dumper;
 use List::Util qw(sum);
 use SL::ClientJS;
+use SL::DB::Default;
 
 use SL::DB::Chart;
 use SL::DB::GLTransaction;
@@ -20,7 +21,7 @@ use SL::DB::Employee;
 use SL::DB::Helper::AccountingPeriod qw(get_balance_starting_date get_balance_startdate_method_options);
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(cb_date cb_startdate ob_date) ],
+  'scalar --get_set_init' => [ qw(cb_date cb_startdate ob_date defaults) ],
 );
 
 __PACKAGE__->run_before('check_auth');
@@ -30,10 +31,9 @@ sub action_form {
 
   $self->cb_startdate($::locale->parse_date_to_object($self->get_balance_starting_date($self->cb_date)));
 
-  my $defaults         = SL::DB::Default->get;
-  my $carry_over_chart = SL::DB::Manager::Chart->find_by( id => $defaults->carry_over_account_chart_id     );
-  my $profit_chart     = SL::DB::Manager::Chart->find_by( id => $defaults->profit_carried_forward_chart_id );
-  my $loss_chart       = SL::DB::Manager::Chart->find_by( id => $defaults->loss_carried_forward_chart_id   );
+  my $carry_over_chart = SL::DB::Manager::Chart->find_by( id => $self->defaults->carry_over_account_chart_id     );
+  my $profit_chart     = SL::DB::Manager::Chart->find_by( id => $self->defaults->profit_carried_forward_chart_id );
+  my $loss_chart       = SL::DB::Manager::Chart->find_by( id => $self->defaults->loss_carried_forward_chart_id   );
 
   $self->render('yearend/form',
                 title                            => t8('Year-end closing'),
@@ -50,7 +50,7 @@ sub action_year_end_bookings {
   $self->_parse_form;
 
   eval {
-    _year_end_bookings( start_date => $self->cb_startdate,
+    $self->_year_end_bookings( start_date => $self->cb_startdate,
                         cb_date    => $self->cb_date,
                       );
     1;
@@ -59,7 +59,7 @@ sub action_year_end_bookings {
     return $self->js->render;
   };
 
-  my ($report_data, $profit_loss_sum) = _report(
+  my ($report_data, $profit_loss_sum) = $self->_report(
                                                 cb_date    => $self->cb_date,
                                                 start_date => $self->cb_startdate,
                                                );
@@ -98,7 +98,7 @@ sub action_update_charts {
 
   $self->_parse_form;
 
-  my ($report_data, $profit_loss_sum) = _report(
+  my ($report_data, $profit_loss_sum) = $self->_report(
                                                 cb_date   => $self->cb_date,
                                                 start_date => $self->cb_startdate,
                                                );
@@ -123,17 +123,21 @@ sub _parse_form {
 }
 
 sub _year_end_bookings {
-  my (%params) = @_;
+  my ($self, %params) = @_;
 
   my $start_date = delete $params{start_date};
   my $cb_date    = delete $params{cb_date};
 
-  my $defaults         = SL::DB::Default->get;
-  my $carry_over_chart = SL::DB::Manager::Chart->find_by( id => $defaults->carry_over_account_chart_id     ) // die t8('No carry-over chart configured!');
-  my $profit_chart     = SL::DB::Manager::Chart->find_by( id => $defaults->profit_carried_forward_chart_id ) // die t8('No profit carried forward chart configured!');
-  my $loss_chart       = SL::DB::Manager::Chart->find_by( id => $defaults->loss_carried_forward_chart_id   ) // die t8('No profit and loss carried forward chart configured!');
+  my $carry_over_chart = SL::DB::Manager::Chart->find_by( id => $self->defaults->carry_over_account_chart_id     ) // die t8('No carry-over chart configured!');
+  my $profit_chart     = SL::DB::Manager::Chart->find_by( id => $self->defaults->profit_carried_forward_chart_id ) // die t8('No profit carried forward chart configured!');
+  my $loss_chart;
+  if ( $self->defaults->yearend_method eq 'simple' ) {
+    $loss_chart       = $profit_chart;
+  } else {
+    $loss_chart     = SL::DB::Manager::Chart->find_by( id => $self->defaults->loss_carried_forward_chart_id   ) // die t8('No profit and loss carried forward chart configured!');
+  }
 
-  my ($report_data, $profit_loss_sum) = _report(
+  my ($report_data, $profit_loss_sum) = $self->_report(
                                                 start_date => $start_date,
                                                 cb_date    => $cb_date,
                                                );
@@ -288,7 +292,7 @@ sub _year_end_bookings {
                               @{$report_data};
     $profit_loss_sum ||= 0;
     my $pl_chart;
-    if ( $profit_loss_sum > 0 ) {
+    if ( $profit_loss_sum > 0 || $self->defaults->yearend_method eq 'simple' ) {
       $pl_chart = $profit_chart;
     } else {
       $pl_chart = $loss_chart;
@@ -297,90 +301,93 @@ sub _year_end_bookings {
     my $pl_debit_balance  = 0;
     my $pl_credit_balance = 0;
     # soll = debit, haben = credit
-    my $pl_cb_debit_entry = SL::DB::GLTransaction->new(
-      employee_id    => $employee_id,
-      transdate      => $cb_date,
-      reference      => 'SB ' . $cb_date->year,
-      description    => 'Automatische SB-Buchungen Erfolgskonten Soll für ' . $cb_date->year,
-      ob_transaction => 0,
-      cb_transaction => 1,
-      taxincluded    => 0,
-      transactions   => [],
-    );
-    my $pl_cb_credit_entry = SL::DB::GLTransaction->new(
-      employee_id    => $employee_id,
-      transdate      => $cb_date,
-      reference      => 'SB ' . $cb_date->year,
-      description    => 'Automatische SB-Buchungen Erfolgskonten Haben für ' . $cb_date->year,
-      ob_transaction => 0,
-      cb_transaction => 1,
-      taxincluded    => 0,
-      transactions   => [],
-    );
-
-    foreach my $profit_loss_account ( @profit_loss_accounts ) {
-      # $main::lxdebug->message(0, sprintf("found chart %s with balance %s", $profit_loss_account->{accno}, $profit_loss_account->{amount_with_cb}));
-      my $chart = $charts_by_id{ $profit_loss_account->{chart_id} };
-
-      next if $profit_loss_account->{amount_with_cb} == 0;
+    if ( $self->defaults->yearend_method ne 'simple' ) {
+      my $pl_cb_debit_entry = SL::DB::GLTransaction->new(
+        employee_id    => $employee_id,
+        transdate      => $cb_date,
+        reference      => 'SB ' . $cb_date->year,
+        description    => 'Automatische SB-Buchungen Erfolgskonten Soll für ' . $cb_date->year,
+        ob_transaction => 0,
+        cb_transaction => 1,
+        taxincluded    => 0,
+        transactions   => [],
+      );
+      my $pl_cb_credit_entry = SL::DB::GLTransaction->new(
+        employee_id    => $employee_id,
+        transdate      => $cb_date,
+        reference      => 'SB ' . $cb_date->year,
+        description    => 'Automatische SB-Buchungen Erfolgskonten Haben für ' . $cb_date->year,
+        ob_transaction => 0,
+        cb_transaction => 1,
+        taxincluded    => 0,
+        transactions   => [],
+      );
 
-      if ( $profit_loss_account->{amount_with_cb} < 0 ) {
-        $pl_debit_balance -= $profit_loss_account->{amount_with_cb};
-        $pl_cb_debit_entry->add_chart_booking(
-          chart  => $chart,
-          tax_id => 0,
-          credit => - $profit_loss_account->{amount_with_cb},
-        );
-      } else {
-        $pl_credit_balance += $profit_loss_account->{amount_with_cb};
-        $pl_cb_credit_entry->add_chart_booking(
-          chart  => $chart,
-          tax_id => 0,
-          debit  => $profit_loss_account->{amount_with_cb},
-        );
+      foreach my $profit_loss_account ( @profit_loss_accounts ) {
+        # $main::lxdebug->message(0, sprintf("found chart %s with balance %s", $profit_loss_account->{accno}, $profit_loss_account->{amount_with_cb}));
+        my $chart = $charts_by_id{ $profit_loss_account->{chart_id} };
+
+        next if $profit_loss_account->{amount_with_cb} == 0;
+
+        if ( $profit_loss_account->{amount_with_cb} < 0 ) {
+          $pl_debit_balance -= $profit_loss_account->{amount_with_cb};
+          $pl_cb_debit_entry->add_chart_booking(
+            chart  => $chart,
+            tax_id => 0,
+            credit => - $profit_loss_account->{amount_with_cb},
+          );
+        } else {
+          $pl_credit_balance += $profit_loss_account->{amount_with_cb};
+          $pl_cb_credit_entry->add_chart_booking(
+            chart  => $chart,
+            tax_id => 0,
+            debit  => $profit_loss_account->{amount_with_cb},
+          );
+        };
       };
-    };
-
-    # $main::lxdebug->message(0, "pl_debit_balance  = $pl_debit_balance");
-    # $main::lxdebug->message(0, "pl_credit_balance = $pl_credit_balance");
 
-    $pl_cb_debit_entry->add_chart_booking(
-      chart  => $pl_chart,
-      tax_id => 0,
-      debit  => $pl_debit_balance,
-    ) if $pl_debit_balance;
+      # $main::lxdebug->message(0, "pl_debit_balance  = $pl_debit_balance");
+      # $main::lxdebug->message(0, "pl_credit_balance = $pl_credit_balance");
 
-    $pl_cb_credit_entry->add_chart_booking(
-      chart  => $pl_chart,
-      tax_id => 0,
-      credit => $pl_credit_balance,
-    ) if $pl_credit_balance;
+      $pl_cb_debit_entry->add_chart_booking(
+        chart  => $pl_chart,
+        tax_id => 0,
+        debit  => $pl_debit_balance,
+      ) if $pl_debit_balance;
 
-    # printf("debit : %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $pl_cb_debit_entry->transactions };
-    # printf("credit: %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $pl_cb_credit_entry->transactions };
+      $pl_cb_credit_entry->add_chart_booking(
+        chart  => $pl_chart,
+        tax_id => 0,
+        credit => $pl_credit_balance,
+      ) if $pl_credit_balance;
 
-    $pl_cb_debit_entry->post  if scalar @{ $pl_cb_debit_entry->transactions }  > 1;
-    $pl_cb_credit_entry->post if scalar @{ $pl_cb_credit_entry->transactions } > 1;
+      # printf("debit : %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $pl_cb_debit_entry->transactions };
+      # printf("credit: %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $pl_cb_credit_entry->transactions };
 
+      $pl_cb_debit_entry->post  if scalar @{ $pl_cb_debit_entry->transactions }  > 1;
+      $pl_cb_credit_entry->post if scalar @{ $pl_cb_credit_entry->transactions } > 1;
+    };
     ######### profit-loss transfer #########
     # and finally transfer the new balance of the profit-loss account via the carry-over account
     # we want to use profit_loss_sum with cb!
 
     if ( $profit_loss_sum != 0 ) {
-
-      my $carry_over_cb_entry = SL::DB::GLTransaction->new(
-        employee_id    => $employee_id,
-        transdate      => $cb_date,
-        reference      => 'SB ' . $cb_date->year,
-        description    => sprintf('Automatische SB-Buchung für %s %s',
-                                  $profit_loss_sum >= 0 ? 'Gewinnvortrag' : 'Verlustvortrag',
-                                  $cb_date->year,
-                                 ),
-        ob_transaction => 0,
-        cb_transaction => 1,
-        taxincluded    => 0,
-        transactions   => [],
-      );
+      my $carry_over_cb_entry;
+      if ($self->defaults->yearend_method ne 'simple') {
+        $carry_over_cb_entry = SL::DB::GLTransaction->new(
+          employee_id    => $employee_id,
+          transdate      => $cb_date,
+          reference      => 'SB ' . $cb_date->year,
+          description    => sprintf('Automatische SB-Buchung für %s %s',
+                                    $profit_loss_sum >= 0 ? 'Gewinnvortrag' : 'Verlustvortrag',
+                                    $cb_date->year,
+                                   ),
+          ob_transaction => 0,
+          cb_transaction => 1,
+          taxincluded    => 0,
+          transactions   => [],
+        );
+      };
       my $carry_over_ob_entry = SL::DB::GLTransaction->new(
         employee_id    => $employee_id,
         transdate      => $ob_date,
@@ -404,16 +411,18 @@ sub _year_end_bookings {
         $amount2 = 'debit';
       };
 
-      $carry_over_cb_entry->add_chart_booking(
-        chart    => $carry_over_chart,
-        tax_id   => 0,
-        $amount1 => abs($profit_loss_sum),
-      );
-      $carry_over_cb_entry->add_chart_booking(
-        chart    => $pl_chart,
-        tax_id   => 0,
-        $amount2 => abs($profit_loss_sum),
-      );
+      if ($self->defaults->yearend_method ne 'simple') {
+        $carry_over_cb_entry->add_chart_booking(
+          chart    => $carry_over_chart,
+          tax_id   => 0,
+          $amount1 => abs($profit_loss_sum),
+        );
+        $carry_over_cb_entry->add_chart_booking(
+          chart    => $pl_chart,
+          tax_id   => 0,
+          $amount2 => abs($profit_loss_sum),
+        );
+      };
       $carry_over_ob_entry->add_chart_booking(
         chart    => $carry_over_chart,
         tax_id   => 0,
@@ -428,7 +437,9 @@ sub _year_end_bookings {
       # printf("debit : %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $carry_over_ob_entry->transactions };
       # printf("credit: %s -> %s\n", $_->chart->displayable_name, $_->amount) foreach @{ $carry_over_ob_entry->transactions };
 
-      $carry_over_cb_entry->post if scalar @{ $carry_over_cb_entry->transactions } > 1;
+      if ($self->defaults->yearend_method ne 'simple') {
+        $carry_over_cb_entry->post if scalar @{ $carry_over_cb_entry->transactions } > 1;
+      };
       $carry_over_ob_entry->post if scalar @{ $carry_over_ob_entry->transactions } > 1;
     };
 
@@ -449,15 +460,14 @@ SQL
 }
 
 sub _report {
-  my (%params) = @_;
+  my ($self, %params) = @_;
 
   my $start_date = delete $params{start_date};
   my $cb_date    = delete $params{cb_date};
 
-  my $defaults = SL::DB::Default->get;
   die "no carry over account defined"
-    unless defined $defaults->carry_over_account_chart_id
-           and $defaults->carry_over_account_chart_id > 0;
+    unless defined $self->defaults->carry_over_account_chart_id
+           and $self->defaults->carry_over_account_chart_id > 0;
 
   my $salden_query = <<SQL;
 select c.id as chart_id,
@@ -486,7 +496,7 @@ SQL
   my $report = selectall_hashref_query($::form, $dbh, $salden_query,
                                        $start_date,
                                        $cb_date,
-                                       $defaults->carry_over_account_chart_id,
+                                       $self->defaults->carry_over_account_chart_id,
                                       );
   # profit_loss_sum is the actual profit/loss for the year, without cb, use "amount_without_cb")
   my $profit_loss_sum = sum map { $_->{amount_without_cb} }
@@ -512,5 +522,5 @@ sub check_auth {
 sub init_ob_date        { $::locale->parse_date_to_object($::form->{ob_date})      }
 sub init_cb_startdate   { $::locale->parse_date_to_object($::form->{cb_startdate}) }
 sub init_cb_date        { $::locale->parse_date_to_object($::form->{cb_date})      }
-
+sub init_defaults       { SL::DB::Default->get }
 1;
diff --git a/SL/Controller/ZUGFeRD.pm b/SL/Controller/ZUGFeRD.pm
index 699e5fe5e..dff05e12d 100644
--- a/SL/Controller/ZUGFeRD.pm
+++ b/SL/Controller/ZUGFeRD.pm
@@ -1,14 +1,18 @@
 package SL::Controller::ZUGFeRD;
 use strict;
+use warnings;
 use parent qw(SL::Controller::Base);
 
 use SL::DB::RecordTemplate;
 use SL::Locale::String qw(t8);
 use SL::Helper::DateTime;
+use SL::XMLInvoice;
 use SL::VATIDNr;
 use SL::ZUGFeRD;
+use SL::SessionFile;
 
 use XML::LibXML;
+use List::Util qw(first);
 
 
 __PACKAGE__->run_before('check_auth');
@@ -16,35 +20,53 @@ __PACKAGE__->run_before('check_auth');
 sub action_upload_zugferd {
   my ($self, %params) = @_;
 
-  $self->setup_zugferd_action_bar;
+  $self->pre_render();
   $self->render('zugferd/form', title => $::locale->text('Factur-X/ZUGFeRD import'));
 }
 
-sub action_import_zugferd {
-  my ($self, %params) = @_;
+sub find_vendor_by_taxnumber {
+  my $taxnumber = shift @_;
+
+  # 1.1 check if we a have a vendor with this tax number (vendor.taxnumber)
+  my $vendor = SL::DB::Manager::Vendor->find_by(
+    taxnumber => $taxnumber,
+    or    => [
+      obsolete => undef,
+      obsolete => 0,
+    ]);
+
+  if (!$vendor) {
+    # 1.2 If no vendor with the exact VAT ID number is found, the
+    # number might be stored slightly different in the database
+    # (e.g. with spaces breaking up groups of numbers). Iterate over
+    # all existing vendors with VAT ID numbers, normalize their
+    # representation and compare those.
 
-  die t8("missing file for action import") unless $::form->{file};
-  die t8("can only parse a pdf file")      unless $::form->{file} =~ m/^%PDF/;
+    my $vendors = SL::DB::Manager::Vendor->get_all(
+      where => [
+        '!taxnumber' => undef,
+        '!taxnumber' => '',
+        or       => [
+          obsolete => undef,
+          obsolete => 0,
+        ],
+      ]);
 
-  my $info = SL::ZUGFeRD->extract_from_pdf($::form->{file});
+    foreach my $other_vendor (@{ $vendors }) {
+      next unless $other_vendor->taxnumber eq $taxnumber;
 
-  if ($info->{result} != SL::ZUGFeRD::RES_OK()) {
-    # An error occurred; log message from parser:
-    $::lxdebug->message(LXDebug::DEBUG1(), "Could not extract ZUGFeRD data, error message: " . $info->{message});
-    die t8("Could not extract Factur-X/ZUGFeRD data, data and error message:") . $info->{message};
+      $vendor = $other_vendor;
+      last;
+    }
   }
-  # valid ZUGFeRD metadata
-  my $dom   = XML::LibXML->load_xml(string => $info->{invoice_xml});
+}
 
-  # 1. check if ZUGFeRD SellerTradeParty has a VAT-ID
-  my $ustid = $dom->findnodes('//ram:SellerTradeParty/ram:SpecifiedTaxRegistration')->string_value;
-  die t8("No VAT Info for this Factur-X/ZUGFeRD invoice," .
-         " please ask your vendor to add this for his Factur-X/ZUGFeRD data.") unless $ustid;
+sub find_vendor_by_ustid {
+  my $ustid = shift @_;
 
   $ustid = SL::VATIDNr->normalize($ustid);
 
   # 1.1 check if we a have a vendor with this VAT-ID (vendor.ustid)
-  my $vc     = $dom->findnodes('//ram:SellerTradeParty/ram:Name')->string_value;
   my $vendor = SL::DB::Manager::Vendor->find_by(
     ustid => $ustid,
     or    => [
@@ -77,72 +99,201 @@ sub action_import_zugferd {
     }
   }
 
-  die t8("Please add a valid VAT-ID for this vendor: #1", $vc) unless (ref $vendor eq 'SL::DB::Vendor');
+  return $vendor;
+}
+
+sub find_vendor {
+  my ($ustid, $taxnumber) = @_;
+  my $vendor;
+
+  if ( $ustid ) {
+    $vendor = find_vendor_by_ustid($ustid);
+  }
+
+  if (ref $vendor eq 'SL::DB::Vendor') { return $vendor; }
+
+  if ( $taxnumber ) {
+    $vendor = find_vendor_by_taxnumber($taxnumber);
+  }
+
+  if (ref $vendor eq 'SL::DB::Vendor') { return $vendor; }
+
+  return undef;
+}
+
+sub action_import_zugferd {
+  my ($self, %params) = @_;
+
+  my $file = $::form->{file};
+  my $file_name = $::form->{file_name};
+
+  my %res; # result data structure returned by SL::ZUGFeRD->extract_from_{pdf,xml}()
+
+  die t8("missing file for action import")   unless $file;
+  die t8("can only parse a pdf or xml file") unless $file =~ m/^%PDF|<\?xml/;
+
+  if ( $::form->{file} =~ m/^%PDF/ ) {
+    %res = %{SL::ZUGFeRD->extract_from_pdf($file)};
+  } else {
+    %res = %{SL::ZUGFeRD->extract_from_xml($file)};
+  }
+
+  if ($res{'result'} != SL::ZUGFeRD::RES_OK()) {
+    # An error occurred; log message from parser:
+    die(t8("Could not extract Factur-X/ZUGFeRD data, data and error message:") . " $res{'message'}");
+  }
+
+  my $form_defaults = $self->build_ap_transaction_form_defaults(\%res);
 
-  # 2. check if we have a ap record template for this vendor (TODO only the oldest template is choosen)
-  my $template_ap = SL::DB::Manager::RecordTemplate->get_first(where => [vendor_id => $vendor->id]);
-  die t8("No AP Record Template for this vendor found, please add one") unless (ref $template_ap eq 'SL::DB::RecordTemplate');
+  # save the zugferd file to session file for reuse in ap.pl
+  my $session_file = SL::SessionFile->new($file_name, mode => 'w');
+  $session_file->fh->print($file);
+  $session_file->fh->close;
+  $form_defaults->{zugferd_session_file} = $file_name;
 
+  $form_defaults->{callback} = $self->url_for(action => 'upload_zugferd');
 
-  # 3. parse the zugferd data and fill the ap record template
-  # -> no need to check sign (credit notes will be negative) just record thei ZUGFeRD type in ap.notes
-  # -> check direct debit (defaults to no)
-  # -> set amount (net amount) and unset taxincluded
-  #    (template and user cares for tax and if there is more than one booking accno)
-  # -> date (can be empty)
-  # -> duedate (may be empty)
-  # -> compare record iban and generate a warning if this differs from vendor's master data iban
-  my $total     = $dom->findnodes('//ram:SpecifiedTradeSettlementHeaderMonetarySummation' .
-                                  '/ram:TaxBasisTotalAmount')->string_value;
+  $self->redirect_to(
+    controller    => 'ap.pl',
+    action        => 'load_zugferd',
+    form_defaults => $form_defaults,
+  );
+}
+
+sub build_ap_transaction_form_defaults {
+  my ($self, $data, %params) = @_;
+  my $vendor = $params{vendor};
+
+  my $parser = $data->{'invoice_xml'};
+
+  my %metadata = %{$parser->metadata};
+  my @items = @{$parser->items};
+
+  my $intnotes = t8("ZUGFeRD Import. Type: #1", $metadata{'type'})->translated;
+  my $iban = $metadata{'iban'};
+  my $invnumber = $metadata{'invnumber'};
+
+  if ($vendor) {
+    if ($metadata{'ustid'} && $vendor->ustid && ($metadata{'ustid'} ne $vendor->ustid)) {
+      $intnotes .= "\n" . t8('USt-IdNr.') . ': '
+      . t8("Record VAT ID #1 doesn't match vendor VAT ID #2", $metadata{'ustid'}, $vendor->ustid);
+    }
+    if ($metadata{'taxnumber'} && $vendor->taxnumber && ($metadata{'taxnumber'} ne $vendor->taxnumber)) {
+      $intnotes .= "\n" . t8("Tax Number") . ': '
+      . t8("Record tax ID #1 doesn't match vendor tax ID #2", $metadata{'taxnumber'}, $vendor->taxnumber);
+    }
+  } else {
+    if ( ! ($metadata{'ustid'} or $metadata{'taxnumber'}) ) {
+      die t8("Cannot process this invoice: neither VAT ID nor tax ID present.");
+    }
+
+    $vendor = find_vendor($metadata{'ustid'}, $metadata{'taxnumber'});
+
+    die t8("Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor " .
+            "#3 exists and whether it has the correct tax ID/VAT ID." ,
+             $metadata{'ustid'},
+             $metadata{'taxnumber'},
+             $metadata{'vendor_name'},
+    ) unless $vendor;
+  }
 
-  my $invnumber = $dom->findnodes('//rsm:ExchangedDocument/ram:ID')->string_value;
+
+  # Check IBAN specified on bill matches the one we've got in
+  # the database for this vendor.
+  if ($iban) {
+    $intnotes .= "\nIBAN: ";
+    $intnotes .= $iban ne $vendor->iban ?
+          t8("Record IBAN #1 doesn't match vendor IBAN #2", $iban, $vendor->iban)
+        : $iban
+  }
+
+  # Use invoice creation date as due date if there's no due date
+  $metadata{'duedate'} = $metadata{'transdate'} unless defined $metadata{'duedate'};
 
   # parse dates to kivi if set/valid
-  my ($transdate, $duedate, $dt_to_kivi, $due_dt_to_kivi);
-  $transdate = $dom->findnodes('//ram:IssueDateTime')->string_value;
-  $duedate   = $dom->findnodes('//ram:DueDateDateTime')->string_value;
-  $transdate =~ s/^\s+|\s+$//g;
-  $duedate   =~ s/^\s+|\s+$//g;
-
-  if ($transdate =~ /^[0-9]{8}$/) {
-    $dt_to_kivi = DateTime->new(year  => substr($transdate,0,4),
-                                month => substr ($transdate,4,2),
-                                day   => substr($transdate,6,2))->to_kivitendo;
+  foreach my $key ( qw(transdate duedate) ) {
+    next unless defined $metadata{$key};
+    $metadata{$key} =~ s/^\s+|\s+$//g;
+
+    if ($metadata{$key} =~ /^([0-9]{4})-?([0-9]{2})-?([0-9]{2})$/) {
+    $metadata{$key} = DateTime->new(year  => $1,
+                                    month => $2,
+                                    day   => $3)->to_kivitendo;
+    }
   }
-  if ($duedate =~ /^[0-9]{8}$/) {
-    $due_dt_to_kivi = DateTime->new(year  => substr($duedate,0,4),
-                                    month => substr ($duedate,4,2),
-                                    day   => substr($duedate,6,2))->to_kivitendo;
+
+  # Try to fill in AP account to book against
+  my $ap_chart_id = $::instance_conf->get_ap_chart_id;
+
+  unless ( defined $ap_chart_id ) {
+    # If no default account is configured, just use the first AP account found.
+    my ($ap_chart) = @{SL::DB::Manager::Chart->get_all(
+      where   => [ link => 'AP' ],
+      sort_by => [ 'accno' ],
+    )};
+    $ap_chart_id = $ap_chart->id;
   }
 
-  my $type = $dom->findnodes('//rsm:ExchangedDocument/ram:TypeCode')->string_value;
-
-  my $dd   = $dom->findnodes('//ram:ApplicableHeaderTradeSettlement' .
-                             '/ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode')->string_value;
-  my $direct_debit = $dd == 59 ? 1 : 0;
-
-  my $iban = $dom->findnodes('//ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans' .
-                             '/ram:PayeePartyCreditorFinancialAccount/ram:IBANID')->string_value;
-  my $ibanmessage;
-  $ibanmessage = $iban ne $vendor->iban ? "Record IBAN $iban doesn't match vendor IBAN " . $vendor->iban : $iban if $iban;
-
-  my $url = $self->url_for(
-    controller                           => 'ap.pl',
-    action                               => 'load_record_template',
-    id                                   => $template_ap->id,
-    'form_defaults.amount_1'             => $::form->format_amount(\%::myconfig, $total, 2),
-    'form_defaults.transdate'            => $dt_to_kivi,
-    'form_defaults.invnumber'            => $invnumber,
-    'form_defaults.duedate'              => $due_dt_to_kivi,
-    'form_defaults.no_payment_bookings'  => 0,
-    'form_defaults.paid_1_suggestion'    => $::form->format_amount(\%::myconfig, $total, 2),
-    'form_defaults.notes'                => "ZUGFeRD Import. Type: $type\nIBAN: " . $ibanmessage,
-    'form_defaults.taxincluded'          => 0,
-    'form_defaults.direct_debit'          => $direct_debit,
+  my $currency = SL::DB::Manager::Currency->find_by(
+    name => $metadata{'currency'},
+    );
+
+  my $default_ap_amount_chart = SL::DB::Manager::Chart->find_by(
+    id => $::instance_conf->get_expense_accno_id
+  );
+  # Fallback if there's no default AP amount chart configured
+  $default_ap_amount_chart ||= SL::DB::Manager::Chart->find_by(charttype => 'A');
+
+  my $active_taxkey = $default_ap_amount_chart->get_active_taxkey;
+  my $taxes = SL::DB::Manager::Tax->get_all(
+    where   => [ chart_categories => {
+        like => '%' . $default_ap_amount_chart->category . '%'
+      }],
+    sort_by => 'taxkey, rate',
   );
+  die t8(
+    "No tax found for chart #1", $default_ap_amount_chart->displayable_name
+  ) unless scalar @{$taxes};
+
+  # parse items
+  my $row = 0;
+  my %item_form = ();
+  foreach my $i (@items) {
+    $row++;
+
+    my %item = %{$i};
+
+    my $net_total = $::form->format_amount(\%::myconfig, $item{'subtotal'}, 2);
+
+    my $tax_rate = $item{'tax_rate'};
+    $tax_rate /= 100 if $tax_rate > 1; # XML data is usually in percent
 
-  $self->redirect_to($url);
+    my $tax   = first { $tax_rate              == $_->rate } @{ $taxes };
+    $tax    //= first { $active_taxkey->tax_id == $_->id }   @{ $taxes };
+    $tax    //= $taxes->[0];
 
+    $item_form{"AP_amount_chart_id_${row}"}          = $default_ap_amount_chart->id;
+    $item_form{"previous_AP_amount_chart_id_${row}"} = $default_ap_amount_chart->id;
+    $item_form{"amount_${row}"}                      = $net_total;
+    $item_form{"taxchart_${row}"}                    = $tax->id . '--' . $tax->rate;
+  }
+  $item_form{rowcount} = $row;
+
+  return {
+    vendor_id            => $vendor->id,
+    vendor               => $vendor->name,
+    invnumber            => $invnumber,
+    transdate            => $metadata{'transdate'},
+    duedate              => $metadata{'duedate'},
+    no_payment_bookings  => 0,
+    intnotes             => $intnotes,
+    taxincluded          => 0,
+    direct_debit         => $metadata{'direct_debit'},
+    currency             => $currency->name,
+    AP_chart_id          => $ap_chart_id,
+    paid_1_suggestion    => $::form->format_amount(\%::myconfig, $metadata{'total'}, 2),
+    %item_form,
+  },
 }
 
 sub check_auth {
@@ -162,6 +313,16 @@ sub setup_zugferd_action_bar {
   }
 }
 
+sub pre_render {
+  my ($self) = @_;
+
+  $::request->{layout}->use_javascript("${_}.js") for qw(
+    kivi.ZUGFeRD
+  );
+
+  $self->setup_zugferd_action_bar;
+}
+
 
 1;
 __END__
@@ -172,8 +333,7 @@ __END__
 
 =head1 NAME
 
-SL::Controller::ZUGFeRD
-Controller for importing ZUGFeRD pdf files to kivitendo
+SL::Controller::ZUGFeRD - Controller for importing ZUGFeRD PDF files or XML invoices to kivitendo
 
 =head1 FUNCTIONS
 
@@ -183,43 +343,71 @@ Controller for importing ZUGFeRD pdf files to kivitendo
 
 Creates a web from with a single upload dialog.
 
-=item C<action_import_zugferd $pdf>
+=item C<action_import_zugferd $file>
+
+Expects a single PDF with ZUGFeRD, Factur-X or XRechnung
+metadata. Alternatively, it can also process said data as a
+standalone XML file.
+
+Checks if the param <C$pdf> is set and a valid PDF or XML
+file. Calls helper functions to validate and extract the
+ZUGFeRD/Factur-X/XRechnung data. The invoice needs to have a
+valid VAT ID (EU) or tax number (Germany) and a vendor with
+the same VAT ID or tax number enrolled in Kivitendo.
 
-Expects a single pdf with ZUGFeRD 2.0 metadata.
-Checks if the param <C$pdf> is set and a valid pdf file.
-Calls helper functions to validate and extract the ZUGFeRD data.
-Needs a valid VAT ID (EU) for this vendor and
-expects one ap template for this vendor in kivitendo.
+It parses some basic ZUGFeRD data (invnumber, total net amount,
+transdate, duedate, vendor VAT ID, IBAN, etc.) and also
+extracts the invoice's items.
 
-Parses some basic ZUGFeRD data (invnumber, total net amount,
-transdate, duedate, vendor VAT ID, IBAN) and uses the first
-found ap template for this vendor to fill this template with
-ZUGFeRD data.
-If the vendor's master data contain a IBAN and the
-ZUGFeRD record has a IBAN also these values will be compared.
-If they  don't match a warning will be writte in ap.notes.
-Furthermore the ZUGFeRD type code will be written to ap.notes.
-No callback implemented.
+If the invoice has a IBAN also, it will be be compared to the
+IBAN saved for the vendor (if any). If they  don't match a
+warning will be writte in ap.intnotes. Furthermore the ZUGFeRD
+type code will be written to ap.intnotes. No callback
+implemented.
 
 =back
 
-=head1 TODO and CAVEAT
+=head1 CAVEAT
 
-This is just a very basic Parser for ZUGFeRD data.
-We assume that the ZUGFeRD generator is a company with a
-valid European VAT ID. Furthermore this vendor needs only
-one and just noe ap template (the first match will be used).
+This is just a very basic Parser for ZUGFeRD/Factur-X/XRechnung invoices.
+We assume that the invoice's creator is a company with a valid
+European VAT ID or German tax number and enrolled in
+Kivitendo.
+
+=head1 TODO
+
+This implementation could be improved as follows:
+
+=over 4
+
+=item Automatic upload of invoice
+
+Right now, one has to use the "Book and upload" button to
+upload the raw invoice document to WebDAV or DMS and attach it
+to the invoice. This should be a simple matter of setting a
+check box when uploading.
+
+=item Handling of vendor invoices
+
+There is no reason this functionality could not be used to
+import vendor invoices as well. Since these tend to be very
+lengthy, the ability to import them would be very beneficial.
+
+=item Automatic handling of payment purpose
 
-The ZUGFeRD data should also be extracted in the helper package
-and maybe a model should be used for this.
-The user should set one ap template as a default for ZUGFeRD.
-The ZUGFeRD pdf should be written to WebDAV or DMS.
 If the ZUGFeRD data has a payment purpose set, this should
 be the default for the SEPA-XML export.
 
+=back
+
+=head1 AUTHORS
+
+=over 4
+
+=item Jan Büren E<lt>jan@kivitendo-premium.deE<gt>,
 
-=head1 AUTHOR
+=item Johannes Graßler E<lt>info@computer-grassler.deE<gt>,
 
-Jan Büren E<lt>jan@kivitendo-premium.deE<gt>,
+=back
 
 =cut
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 86cb729bc..f07ab1526 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -33,11 +33,13 @@ use strict;
 use SL::DBUtils;
 use SL::DATEV::CSV;
 use SL::DB;
+use Encode qw(encode);
 use SL::HTML::Util ();
 use SL::Iconv;
 use SL::Locale::String qw(t8);
 use SL::VATIDNr;
 
+use Archive::Zip;
 use Data::Dumper;
 use DateTime;
 use Exporter qw(import);
@@ -48,6 +50,7 @@ use List::Util qw(min max sum);
 use List::UtilsBy qw(partition_by sort_by);
 use Text::CSV_XS;
 use Time::HiRes qw(gettimeofday);
+use XML::LibXML;
 
 {
   my $i = 0;
@@ -188,6 +191,7 @@ sub from {
  my $self = shift;
 
  if (@_) {
+   die "Invalid type, need DateTime Object" unless ref $_[0] eq 'DateTime';
    $self->{from} = $_[0];
  }
 
@@ -198,6 +202,7 @@ sub to {
  my $self = shift;
 
  if (@_) {
+   die "Invalid type, need DateTime Object" unless ref $_[0] eq 'DateTime';
    $self->{to} = $_[0];
  }
 
@@ -348,6 +353,8 @@ sub csv_export {
     $csv_file->close;
     $self->{warnings} = $datev_csv->warnings;
 
+    $self->_create_xml_and_documents if $self->{documents} && $self->{guids} && %{ $self->{guids} };
+
     # convert utf-8 to cp1252//translit if set
     if ($::instance_conf->get_datev_export_format eq 'cp1252-translit') {
 
@@ -394,6 +401,7 @@ sub locked {
  }
  return $self->{locked};
 }
+
 sub imported {
  my $self = shift;
 
@@ -403,6 +411,81 @@ sub imported {
  return $self->{imported};
 }
 
+sub documents {
+ my $self = shift;
+
+ if (@_) {
+   $self->{documents} = $_[0];
+ }
+ return $self->{documents};
+}
+
+sub _create_xml_and_documents {
+  my $self = shift;
+
+  die "No guids" unless %{ $self->{guids} };
+
+  my $today = DateTime->now_local;
+  my $doc   = XML::LibXML::Document->new('1.0', 'utf-8');
+
+  my $root  = $doc->createElement('archive');
+  #<archive xmlns="http://xml.datev.de/bedi/tps/document/v05.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xml.datev.de/bedi/tps/document/v05.0 Document_v050.xsd" version="5.0" generatingSystem="DATEV-Musterdaten">
+
+  $root->setAttribute('xmlns'              => 'http://xml.datev.de/bedi/tps/document/v05.0');
+  $root->setAttribute('xmlns:xsi'          => 'http://www.w3.org/2001/XMLSchema-instance');
+  $root->setAttribute('xsi:schemaLocation' => 'http://xml.datev.de/bedi/tps/document/v05.0 Document_v050.xsd');
+  $root->setAttribute('version'            => '5.0');
+  $root->setAttribute('generatingSystem'   => 'kivitendo');
+
+  # header with timestamp
+  my $header_tag = $doc->createElement('header');
+  $root->appendChild($header_tag);
+  my $date_tag = $doc->createElement('date');
+  $date_tag->appendTextNode($today);
+  $header_tag->appendChild($date_tag);
+
+
+  # content
+  my $content_node = $doc->createElement('content');
+  $root->appendChild($content_node);
+  # we have n document childs
+  foreach my $guid (keys %{ $self->{guids} }) {
+    # 1. get filename and file location
+    my $file_version = SL::DB::Manager::FileVersion->find_by(guid => $guid);
+    die "Invalid guid $guid" unless ref $file_version eq 'SL::DB::FileVersion';
+    # file_name has to be unique add guid if needed
+    my $filename_for_zip = (exists $self->{files}{$file_version->file_name})
+                           ? $file_version->file_name . '__' . $guid
+                           : $file_version->file_name;
+    $filename_for_zip = $guid . '.pdf';
+    $self->{files}{$filename_for_zip} = $file_version->get_system_location;
+    # create xml metadata for files
+    my $document_node = $doc->createElement('document');
+    # set attr
+    $document_node->setAttribute('guid'      => $guid);
+    $document_node->setAttribute('processID' => '1');
+    $document_node->setAttribute('type'      => '1');
+    $content_node->appendChild($document_node);
+    my $extension_node = $doc->createElement('extension');
+    $extension_node->setAttribute('xsi:type' => 'File');
+    $extension_node->setAttribute('name'     => $filename_for_zip);
+    $document_node->appendChild($extension_node);
+  }
+  $doc->setDocumentElement($root);
+
+  # create Archive::Zip in Export Path
+  my $zip = Archive::Zip->new();
+  # add metadata document
+  $zip->addString($doc->toString(), 'document.xml');
+  # add real files
+  foreach my $filename (keys %{ $self->{files} }) {
+#    my $enc_filename = encode('Windows-1252', $filename);
+    $zip->addFile($self->{files}{$filename}, $filename);
+  }
+  die "Cannot write Belege-XML.zip" unless ($zip->writeToFileNamed($self->export_path . 'Belege-XML.zip')
+                                            == Archive::Zip::AZ_OK());
+}
+
 sub generate_datev_data {
   $main::lxdebug->enter_sub();
 
@@ -907,6 +990,38 @@ sub generate_datev_lines {
     }
     # set lock for each transaction
     $datev_data{locked} = $self->locked;
+    # add guids if datev export with documents is requested
+    if ($self->documents) {
+      # add all document links for the latest created/uploaded document
+      my $latest_document = SL::DB::Manager::File->get_first(query =>
+                                [
+                                  object_id   => $transaction->[$haben]->{trans_id},
+                                  file_type   => 'document',
+                                  mime_type   => 'application/pdf',
+                                  or          => [
+                                                   object_type => 'gl_transaction',
+                                                   object_type => 'purchase_invoice',
+                                                   object_type => 'invoice',
+                                                   object_type => 'credit_note',
+                                                 ],
+                                ],
+                                  sort_by   => 'itime DESC');
+      if (ref $latest_document eq 'SL::DB::File') {
+      #if (scalar @{ $latest_documents }) {
+        # if we have a booking document add guid from the latest version
+        # one record may be referenced to more transaction (credit booking with different accounts)
+        # therefore collect guids in hash
+        # not yet implemented -> datev steigt aus, sobald ein komma getrennter wert erscheint
+        #foreach my $latest_document (@{ $latest_documents }) {
+          die "No file datatype:" . ref $latest_document unless (ref $latest_document eq 'SL::DB::File');
+          my $latest_guid = $latest_document->file_versions_sorted->[-1]->guid;
+
+          $self->{guids}{$latest_guid} = 1;
+          $datev_data{document_guid}  .= $datev_data{document_guid} ?  ',' : '';
+          $datev_data{document_guid}  .= $latest_guid;
+        # }
+      }
+    }
 
     push(@datev_lines, \%datev_data) if $datev_data{umsatz};
   }
@@ -956,6 +1071,50 @@ SQL
   return 1;
 }
 
+sub check_document_export {
+  my ($self) = @_;
+
+  # no dms enabled and works only for type Filesystem
+  return 0 unless $::instance_conf->get_doc_storage
+               && $::instance_conf->get_doc_storage_for_documents eq 'Filesystem';
+
+  return 1;
+
+}
+
+sub check_all_bookings_have_documents {
+  my $self   = shift;
+  my %params = @_;
+
+  die "Need from date" unless $params{from};
+  die "Need to date"   unless $params{to};
+
+  $self->from($params{from});
+  $self->to($params{to});
+
+  my $fromto = $self->fromto;
+  # not all last month ar ap gl booking have an entry -> rent ?
+  my $query = qq|
+  select distinct trans_id,object_id from acc_trans
+  left join files on files.object_id=trans_id
+  where $fromto
+  and object_id is null
+  and trans_id not in (select id from gl)
+  LIMIT 1|;
+
+  my ($booking_has_no_document)  = selectrow_query($::form, SL::DB->client->dbh, $query);
+  return defined $booking_has_no_document ? 0 : 1;
+
+}
+
+
+
+sub _u8 {
+  my ($value) = @_;
+  return encode('UTF-8', $value // '');
+}
+
+
 sub DESTROY {
   clean_temporary_directories();
 }
@@ -1175,6 +1334,17 @@ Will throw an error if more than one distinct size is detected.
 The error message gives a short hint with the value of the (at least)
 two mismatching number length domains.
 
+=item check_document_export
+
+Returns 1 if DMS feature is enabled and Backend is Filesystem
+
+=item check_all_bookings_have_documents
+
+Returns 1 if all ar and ap transactions for this period have a document entry in files.
+Therefore all ar and ap transactions may be exported.
+Note: DATEV accepts only PDF and for some gl bookings a document makes no sense
+
+
 =back
 
 =head1 ATTRIBUTES
diff --git a/SL/DATEV/CSV.pm b/SL/DATEV/CSV.pm
index 8b8e88598..8c43c76d8 100644
--- a/SL/DATEV/CSV.pm
+++ b/SL/DATEV/CSV.pm
@@ -153,11 +153,28 @@ my @kivitendo_to_datev = (
                               kivi_datev_name => 'not yet implemented',
                             },
                             {
-                              kivi_datev_name => 'not yet implemented',
+                              kivi_datev_name => 'document_guid',
                               csv_header_name => t8('Link to invoice'),
                               max_length      => 210, # DMS Application shortcut and GUID
                                                       # Example: "BEDI"
                                                       # "8DB85C02-4CC3-FF3E-06D7-7F87EEECCF3A".
+                              type            => 'Text',
+                              default         => '',
+                              input_check     => sub { my ($check) = @_; return 1 unless $check;
+                                                       my @guids = split(/,/,$check);
+                                                       foreach my $guid (@guids) {
+                                                         return unless ($guid =~ m/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/);
+                                                       }
+                                                       return 1; },
+                              formatter       => sub { my ($input) = @_; return '' unless $input;
+                                                       my @guids = split (/,/,$input);
+                                                       my $first = shift @guids;
+                                                       my $bedi = 'BEDI "' . $first . '"';
+                                                       foreach my $guid (@guids) {
+                                                         $bedi .= ',"' . $guid . '"';
+                                                       }
+                                                       return $bedi; },
+
                             }, # pos 20
                             {
                               kivi_datev_name => 'not yet implemented',
@@ -490,18 +507,19 @@ my @kivitendo_to_datev = (
                             {
                               kivi_datev_name => 'not yet implemented',
                             },
-                            {
-                              kivi_datev_name => 'not yet implemented',
-                            },
-                            {
-                              kivi_datev_name => 'not yet implemented',
-                            },
-                            {
-                              kivi_datev_name => 'not yet implemented',
-                            },
-                            {
-                              kivi_datev_name => 'not yet implemented',
-                            },  # pos 120
+                            # DATEV Prüfprogramm says: Only 116 fields are allowed
+                            #{
+                            #  kivi_datev_name => 'not yet implemented',
+                            #},
+                            #{
+                            #  kivi_datev_name => 'not yet implemented',
+                            #},
+                            #{
+                            #  kivi_datev_name => 'not yet implemented',
+                            #},
+                            #{
+                            #  kivi_datev_name => 'not yet implemented',
+                            #},  # pos 120
   );
 
 sub new {
@@ -554,13 +572,16 @@ sub header {
     next unless $datev->{$k};
     $meta_datev{$k} = substr $datev->{$k}, 0, $v;
   }
+  my $coa = $::instance_conf->get_coa eq 'Germany-DATEV-SKR03EU' ? '03'
+          : $::instance_conf->get_coa eq 'Germany-DATEV-SKR04EU' ? '04'
+          : '';
 
   my @header_row_1 = (
     "EXTF", "510", 21, "Buchungsstapel", 7, $created_on, "", "ki",
     "kivitendo-datev", "", $meta_datev{beraternr}, $meta_datev{mandantennr},
     $self->first_day_of_fiscal_year->ymd(''), $length_of_accounts,
     $self->from->ymd(''), $self->to->ymd(''), "", "", 1, "", $self->locked,
-    $default_curr, "", "", "",""
+    $default_curr, "", "", "","", $coa, "", "", "", ""
   );
   push @header, [ @header_row_1 ];
 
diff --git a/SL/DB.pm b/SL/DB.pm
index a59fd6fdf..a19f76b52 100644
--- a/SL/DB.pm
+++ b/SL/DB.pm
@@ -142,8 +142,10 @@ sub with_transaction {
     if (blessed $error) {
       if ($error->isa('SL::X::DBError')) {
         # gobble the exception
-      } else {
+      } elsif ($error->can('rethrow')) {
         $error->rethrow;
+      } else {
+        croak $self->error;
       }
     } else {
       die $self->error;
diff --git a/SL/DB/AuthUser.pm b/SL/DB/AuthUser.pm
index 2565d067f..07c7c983f 100644
--- a/SL/DB/AuthUser.pm
+++ b/SL/DB/AuthUser.pm
@@ -11,7 +11,9 @@ use SL::DB::Helper::Util;
 use constant CONFIG_VARS => qw(copies countrycode dateformat timeformat default_media default_printer_id
                                email favorites fax hide_cvar_search_options mandatory_departments menustyle name
                                numberformat show_form_details signature stylesheet taxincluded_checked tel
-                               template_format focus_position form_cvars_nr_cols item_multiselect);
+                               template_format focus_position form_cvars_nr_cols item_multiselect
+                               follow_up_notify_by_email
+                               );
 
 __PACKAGE__->meta->add_relationship(
   groups => {
diff --git a/SL/DB/BackgroundJob.pm b/SL/DB/BackgroundJob.pm
index 1fc8d992d..255f5f8ea 100644
--- a/SL/DB/BackgroundJob.pm
+++ b/SL/DB/BackgroundJob.pm
@@ -47,6 +47,7 @@ sub run {
 
     $history = SL::DB::BackgroundJobHistory
       ->new(package_name => $self->package_name,
+            description  => $self->description,
             run_at       => $run_at,
             status       => SL::DB::BackgroundJobHistory::SUCCESS(),
             result       => $result,
@@ -62,7 +63,7 @@ sub run {
       ->new(package_name => $self->package_name,
             run_at       => $run_at,
             status       => SL::DB::BackgroundJobHistory::FAILURE(),
-            error_col    => $error,
+            error_col    => '' . $error,
             data         => $self->data);
     $history->save;
 
diff --git a/SL/DB/BankTransaction.pm b/SL/DB/BankTransaction.pm
index b07cdf11f..bada24ea6 100644
--- a/SL/DB/BankTransaction.pm
+++ b/SL/DB/BankTransaction.pm
@@ -54,7 +54,7 @@ sub is_batch_transaction {
 
 
 sub get_agreement_with_invoice {
-  my ($self, $invoice, %params) = @_;
+  my ($self, $invoice) = @_;
 
   carp "get_agreement_with_invoice needs an invoice object as its first argument"
     unless ref($invoice) eq 'SL::DB::Invoice' or ref($invoice) eq 'SL::DB::PurchaseInvoice';
@@ -79,9 +79,12 @@ sub get_agreement_with_invoice {
     payment_within_30_days      => 1,
     remote_account_number       => 3,
     skonto_exact_amount         => 5,
+    skonto_fuzzy_amount         => 3,
     wrong_sign                  => -4,
     sepa_export_item            => 5,
+    end_to_end_id               => 8,
     batch_sepa_transaction      => 20,
+    qr_reference                => 20,
   );
 
   my ($agreement,$rule_matches);
@@ -91,6 +94,16 @@ sub get_agreement_with_invoice {
     $rule_matches .= 'batch_sepa_transaction(' . $points{'batch_sepa_transaction'} . ') ';
   }
 
+  # check swiss qr reference if feature enabled
+  if ($::instance_conf->get_create_qrbill_invoices == 1) {
+    if ($self->{qr_reference} && $invoice->{qr_reference} &&
+        $self->{qr_reference} eq $invoice->{qr_reference}) {
+
+      $agreement += $points{qr_reference};
+      $rule_matches .= 'qr_reference(' . $points{'qr_reference'} . ') ';
+    }
+  }
+
   # compare banking arrangements
   my ($iban, $bank_code, $account_number);
   $bank_code      = $invoice->customer->bank_code      if $invoice->is_sales;
@@ -139,6 +152,14 @@ sub get_agreement_with_invoice {
     $agreement += $points{skonto_exact_amount};
     $rule_matches .= 'skonto_exact_amount(' . $points{'skonto_exact_amount'} . ') ';
     $invoice->{skonto_type} = 'with_skonto_pt';
+  } elsif (   $::instance_conf->get_fuzzy_skonto
+           && $invoice->skonto_date && $::instance_conf->get_fuzzy_skonto_percentage > 0
+           && abs(abs($invoice->amount_less_skonto) - abs($self->amount))
+              < abs($invoice->amount / (100 / $::instance_conf->get_fuzzy_skonto_percentage))) {
+    # we have a skonto within the range of fuzzy skonto percentage (default 0.5%)
+    $agreement += $points{skonto_fuzzy_amount};
+    $rule_matches .= 'skonto_fuzzy_amount(' . $points{'skonto_fuzzy_amount'} . ') ';
+    $invoice->{skonto_type} = 'with_fuzzy_skonto_pt';
   }
 
   #search invoice number in purpose
@@ -146,19 +167,19 @@ sub get_agreement_with_invoice {
   # invnumber has to have at least 3 characters
   my $squashed_purpose = $self->purpose;
   $squashed_purpose =~ s/ //g;
-  if (length($invnumber) > 4 && $squashed_purpose =~ /$invnumber/ && $invoice->is_sales){
+  if (length($invnumber) > 4 && $squashed_purpose =~ /\Q$invnumber/ && $invoice->is_sales){
     $agreement      += $points{own_invoice_in_purpose};
     $rule_matches   .= 'own_invoice_in_purpose(' . $points{'own_invoice_in_purpose'} . ') ';
-  } elsif (length($invnumber) > 3 && $squashed_purpose =~ /$invnumber/ ) {
+  } elsif (length($invnumber) > 3 && $squashed_purpose =~ /\Q$invnumber/ ) {
     $agreement      += $points{invoice_in_purpose};
     $rule_matches   .= 'invoice_in_purpose(' . $points{'invoice_in_purpose'} . ') ';
   } else {
     # only check number part of invoice number
     $invnumber      =~ s/[A-Za-z_]+//g;
-    if (length($invnumber) > 4 && $squashed_purpose =~ /$invnumber/ && $invoice->is_sales){
+    if (length($invnumber) > 4 && $squashed_purpose =~ /\Q$invnumber/ && $invoice->is_sales){
       $agreement    += $points{own_invnumber_in_purpose};
       $rule_matches .= 'own_invnumber_in_purpose(' . $points{'own_invnumber_in_purpose'} . ') ';
-    } elsif (length($invnumber) > 3 && $squashed_purpose =~ /$invnumber/ ) {
+    } elsif (length($invnumber) > 3 && $squashed_purpose =~ /\Q$invnumber/ ) {
       $agreement    += $points{invnumber_in_purpose};
       $rule_matches .= 'invnumber_in_purpose(' . $points{'invnumber_in_purpose'} . ') ';
     }
@@ -198,7 +219,7 @@ sub get_agreement_with_invoice {
   my $depositorname;
   $depositorname = $invoice->customer->depositor if $invoice->is_sales;
   $depositorname = $invoice->vendor->depositor   if ! $invoice->is_sales;
-  if ( $depositorname && $self->remote_name =~ /$depositorname/ ) {
+  if ( $depositorname && $self->remote_name =~ /\Q$depositorname/ ) {
     $agreement += $points{depositor_matches};
     $rule_matches .= 'depositor_matches(' . $points{'depositor_matches'} . ') ';
   }
@@ -247,32 +268,27 @@ sub get_agreement_with_invoice {
     }
   }
 
-  # if there is exactly one non-executed sepa_export_item for the invoice
-  my $seis = $params{sepa_export_items}
-           ? [ grep { $invoice->id == ($invoice->is_sales ? $_->ar_id : $_->ap_id) } @{ $params{sepa_export_items} } ]
-           : $invoice->find_sepa_export_items({ executed => 0 });
+  my $seis = $invoice->find_sepa_export_items({ executed => 0 });
   if ($seis) {
-    if (scalar @$seis == 1) {
-      my $sei = $seis->[0];
-
-      # test for amount and id matching only, sepa transfer date and bank
-      # transaction date needn't match
-      if (abs($self->amount) == ($sei->amount) && $invoice->id == $sei->arap_id) {
-        $agreement    += $points{sepa_export_item};
-        $rule_matches .= 'sepa_export_item(' . $points{'sepa_export_item'} . ') ';
-      }
-    } else {
-      # zero or more than one sepa_export_item, do nothing for this invoice
-      # zero: do nothing, no sepa_export_item exists, no match
-      # more than one: does this ever apply? Currently you can't create sepa
-      # exports for invoices that already have a non-executed sepa_export
-      # TODO: Catch the more than one case. User is allowed to split
-      # payments for one invoice item in one sepa export.
+
+    # test if end to end id matches for any sepa export
+    if ($self->end_to_end_id &&
+        grep { $self->end_to_end_id eq $_->end_to_end_id } @{ $seis }) {
+      $agreement    += $points{end_to_end_id};
+      $rule_matches .= 'end_to_end_id(' . $points{'end_to_end_id'} . ') ';
     }
-  }
 
+    # if there is exactly one non-executed sepa_export_item for the invoice
+    # test for amount and id matching only, sepa transfer date and bank
+    # transaction date needn't match
+    if (scalar @{ $seis } == 1 && $invoice->id       == $seis->[0]->arap_id
+                               && abs($self->amount) == $seis->[0]->amount  ) {
+      $agreement    += $points{sepa_export_item};
+      $rule_matches .= 'sepa_export_item(' . $points{'sepa_export_item'} . ') ';
+    }
+  }
   return ($agreement,$rule_matches);
-};
+}
 
 sub _check_string {
     my $bankstring = shift;
diff --git a/SL/DB/Buchungsgruppe.pm b/SL/DB/Buchungsgruppe.pm
index cad8bb628..62ee8e55f 100644
--- a/SL/DB/Buchungsgruppe.pm
+++ b/SL/DB/Buchungsgruppe.pm
@@ -21,7 +21,21 @@ sub validate {
     push(@errors, $::locale->text('Booking group #1 needs a valid inventory account', $self->description)) unless $inventory_accno;
   } else {
     push @errors, $::locale->text('The booking group needs an inventory account.');
-  };
+  }
+
+  if ($self->id && $self->obsolete) {
+    require SL::DB::Part;
+
+    my $in_use = SL::DB::Manager::Part->get_first(
+      where => [
+        buchungsgruppen_id => $self->id,
+        obsolete           => 0,
+      ]);
+
+    if ($in_use) {
+      push @errors, $::locale->text('The booking group cannot be marked obsolete while still being used by active parts.');
+    }
+  }
 
   return @errors;
 }
diff --git a/SL/DB/Business.pm b/SL/DB/Business.pm
index 91cdd672a..b4381ebc5 100644
--- a/SL/DB/Business.pm
+++ b/SL/DB/Business.pm
@@ -39,4 +39,27 @@ sub displayable_name {
   return join ' ', grep $_, $self->id, $self->description;
 }
 
+sub orphaned {
+  my ($self) = @_;
+  die 'not an accessor' if @_ > 1;
+
+  return 1 unless $self->id;
+
+  my @relations = qw(
+    SL::DB::Customer
+    SL::DB::Vendor
+    SL::DB::BusinessModel
+  );
+
+  for my $class (@relations) {
+    eval "require $class";
+    return 0 if $class->_get_manager_class->get_all_count(query => [ business_id => $self->id ]);
+  }
+
+  eval "require SL::DB::PriceRuleItem";
+  return 0 if SL::DB::Manager::PriceRuleItem->get_all_count(query => [ type => 'business', value_int => $self->id ]);
+
+  return 1;
+}
+
 1;
diff --git a/SL/DB/BusinessModel.pm b/SL/DB/BusinessModel.pm
new file mode 100644
index 000000000..a13f969aa
--- /dev/null
+++ b/SL/DB/BusinessModel.pm
@@ -0,0 +1,16 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::BusinessModel;
+
+use strict;
+
+use SL::DB::MetaSetup::BusinessModel;
+use SL::DB::Helper::ActsAsList(group_by => [ qw(parts_id) ]);
+
+__PACKAGE__->meta->initialize;
+
+# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
+__PACKAGE__->meta->make_manager_class;
+
+1;
diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index eeae39aaf..75dc26ebd 100644
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -40,7 +40,7 @@ sub parse_value {
 
   if ($type =~ m{^(?:customer|vendor|part|number)}) {
     return $self->number_value(!defined($unparsed) ? undef
-                               : (any { ref($unparsed) eq $_ } qw(SL::DB::Customer SL::DB::Vendor SL::DB::Part)) ? $unparsed->id * 1
+                               : (any { ref($unparsed) eq $_ } qw(SL::DB::Customer SL::DB::Vendor SL::DB::Part)) ? $unparsed->id
                                : $unparsed * 1);
   }
 
@@ -76,17 +76,17 @@ sub value {
   if ( $type eq 'customer' ) {
     require SL::DB::Customer;
 
-    my $id = int($self->number_value);
+    my $id = defined($self->number_value) ? int($self->number_value) : undef;
     return $id ? SL::DB::Customer->new(id => $id)->load() : undef;
   } elsif ( $type eq 'vendor' ) {
     require SL::DB::Vendor;
 
-    my $id = int($self->number_value);
+    my $id = defined($self->number_value) ? int($self->number_value) : undef;
     return $id ? SL::DB::Vendor->new(id => $id)->load() : undef;
   } elsif ( $type eq 'part' ) {
     require SL::DB::Part;
 
-    my $id = int($self->number_value);
+    my $id = defined($self->number_value) ? int($self->number_value) : undef;
     return $id ? SL::DB::Part->new(id => $id)->load() : undef;
   } elsif ( $type eq 'date' ) {
     return $self->timestamp_value ? $self->timestamp_value->clone->truncate(to => 'day') : undef;
diff --git a/SL/DB/Customer.pm b/SL/DB/Customer.pm
index d72d0c91a..92a5ca675 100644
--- a/SL/DB/Customer.pm
+++ b/SL/DB/Customer.pm
@@ -24,7 +24,8 @@ use SL::DB::Helper::DisplayableNamePreferences (
                {name => 'city',           title => t8('City') },
                {name => 'zipcode',        title => t8('Zipcode')},
                {name => 'email',          title => t8('E-Mail') },
-               {name => 'phone',          title => t8('Phone')  }, ]
+               {name => 'phone',          title => t8('Phone')  },
+               {name => 'country',        title => t8('Country') }, ]
 );
 
 use SL::DB::VC;
diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index 45d658876..f95f9a10e 100644
--- a/SL/DB/DeliveryOrder.pm
+++ b/SL/DB/DeliveryOrder.pm
@@ -4,7 +4,7 @@ use strict;
 
 use Carp;
 
-use Rose::DB::Object::Helpers ();
+use Rose::DB::Object::Helpers qw(as_tree strip);
 
 use SL::DB::MetaSetup::DeliveryOrder;
 use SL::DB::Manager::DeliveryOrder;
@@ -12,14 +12,16 @@ use SL::DB::Helper::AttrHTML;
 use SL::DB::Helper::AttrSorted;
 use SL::DB::Helper::FlattenToForm;
 use SL::DB::Helper::LinkedRecords;
+use SL::DB::Helper::TypeDataProxy;
 use SL::DB::Helper::TransNumberGenerator;
-
-use SL::DB::Part;
-use SL::DB::Unit;
+use SL::DB::Helper::RecordLink qw(RECORD_ID RECORD_TYPE_REF);
 
 use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::Reclamation::TypeData qw(:types);
 
 use SL::Helper::Number qw(_format_total _round_total);
+use SL::Helper::ShippedQty;
 
 use List::Util qw(first);
 use List::MoreUtils qw(any pairwise);
@@ -44,6 +46,8 @@ __PACKAGE__->attr_html('notes');
 __PACKAGE__->attr_sorted('items');
 
 __PACKAGE__->before_save('_before_save_set_donumber');
+__PACKAGE__->after_save('_after_save_link_records');
+__PACKAGE__->after_save('_mark_orders_if_delivered');
 
 # hooks
 
@@ -55,6 +59,30 @@ sub _before_save_set_donumber {
   return 1;
 }
 
+sub _after_save_link_records {
+  my ($self) = @_;
+
+  my @allowed_record_sources = qw(SL::DB::Reclamation SL::DB::Order);
+  my @allowed_item_sources = qw(SL::DB::ReclamationItem SL::DB::OrderItem);
+
+  SL::DB::Helper::RecordLink::link_records(
+    $self,
+    \@allowed_record_sources,
+    \@allowed_item_sources,
+  );
+}
+
+sub _mark_orders_if_delivered {
+  my ($self) = @_;
+  my $orders = $self->linked_records(from => 'Order');
+  SL::Helper::ShippedQty->new->calculate($orders)->write_to_objects;
+  foreach my $order (@$orders) {
+    next if $order->is_sales != $self->is_sales;
+    $order->update_attributes(delivered => $order->{delivered});
+  }
+  return 1;
+}
+
 # methods
 
 sub items { goto &orderitems; }
@@ -75,11 +103,11 @@ sub sales_order {
     ],
   );
 
-  return first { $_->is_type('sales_order') } @{ $orders };
+  return first { $_->is_type(SALES_ORDER_TYPE()) } @{ $orders };
 }
 
 sub type {
-  goto &order_type;
+  goto &record_type;
 }
 
 sub is_type {
@@ -87,12 +115,8 @@ sub is_type {
 }
 
 sub displayable_type {
-  my $type = shift->type;
-
-  return $::locale->text('Sales Delivery Order')    if $type eq 'sales_delivery_order';
-  return $::locale->text('Purchase Delivery Order') if $type eq 'purchase_delivery_order';
-
-  die 'invalid type';
+  my ($self) = @_;
+  return $self->type_data->text('type');
 }
 
 sub displayable_name {
@@ -115,6 +139,22 @@ sub number {
   goto &donumber;
 }
 
+sub preceding_purchase_order_confirmations {
+  my ($self) = @_;
+
+  my @lrs = ();
+  if ($self->id) {
+    @lrs = grep { $_->record_type eq PURCHASE_ORDER_CONFIRMATION_TYPE() } @{$self->linked_records(from => 'SL::DB::Order')};
+  } else {
+    if ('SL::DB::Order' eq $self->{RECORD_TYPE_REF()}) {
+      my $order = SL::DB::Order->load_cached($self->{RECORD_ID()});
+      push @lrs, $order if $order->record_type eq PURCHASE_ORDER_CONFIRMATION_TYPE();
+    }
+  }
+
+  return \@lrs;
+}
+
 sub _clone_orderitem_cvar {
   my ($cvar) = @_;
 
@@ -124,68 +164,151 @@ sub _clone_orderitem_cvar {
   return $cloned;
 }
 
+sub convert_to_reclamation {
+  my ($self, %params) = @_;
+
+  $params{destination_type} = $self->is_sales ? SALES_RECLAMATION_TYPE()
+                                              : PURCHASE_RECLAMATION_TYPE();
+
+  my $reclamation = SL::DB::Reclamation->new_from($self, %params);
+
+  return $reclamation;
+}
+
 sub new_from {
   my ($class, $source, %params) = @_;
 
-  croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) eq 'SL::DB::Order';
+  my %allowed_sources = map { $_ => 1 } qw(
+    SL::DB::Reclamation
+    SL::DB::Order
+    SL::DB::DeliveryOrder
+  );
+  unless( $allowed_sources{ref $source} ) {
+    croak("Unsupported source object type '" . ref($source) . "'");
+  }
 
-  my ($item_parent_id_column, $item_parent_column);
+  my %record_args = (
+    donumber => undef,
+    employee => SL::DB::Manager::Employee->current,
+    closed    => 0,
+    delivered => 0,
+    record_type => $params{destination_type},
+    transdate => DateTime->today_local,
+  );
 
-  if (ref($source) eq 'SL::DB::Order') {
-    $item_parent_id_column = 'trans_id';
-    $item_parent_column    = 'order';
+  if ( ref($source) eq 'SL::DB::Order' ) {
+    map{ ( $record_args{$_} = $source->$_ ) } # {{{ for vim folds
+    qw(
+      billing_address_id
+      cp_id
+      currency_id
+      cusordnumber
+      customer_id
+      delivery_term_id
+      department_id
+      globalproject_id
+      intnotes
+      language_id
+      notes
+      payment_id
+      reqdate
+      salesman_id
+      shippingpoint
+      shipvia
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_confirmation_number
+      vendor_id
+    );
+    if ($source->record_type eq PURCHASE_ORDER_CONFIRMATION_TYPE()) {
+      $record_args{ordnumber} = join ' ', map { $_->ordnumber } @{$source->preceding_purchase_orders()};
+    } else {
+      $record_args{ordnumber} = $source->ordnumber;
+    }
+    # }}} for vim folds
+  } elsif ( ref($source) eq 'SL::DB::Reclamation' ) {
+    map{ ( $record_args{$_} = $source->$_ ) } # {{{ for vim folds
+    qw(
+      billing_address_id
+      currency_id
+      customer_id
+      delivery_term_id
+      department_id
+      globalproject_id
+      intnotes
+      language_id
+      notes
+      payment_id
+      reqdate
+      salesman_id
+      shippingpoint
+      shipvia
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_id
+    );
+    $record_args{cp_id} = $source->contact_id;
+    $record_args{cusordnumber} = $source->cv_record_number;
+    $record_args{is_sales} = $source->is_sales;
+    # }}} for vim folds
+  } elsif ( ref($source) eq 'SL::DB::DeliveryOrder' ) {
+    map{ ( $record_args{$_} = $source->$_ ) } # {{{ for vim folds
+    qw(
+      billing_address_id
+      cp_id
+      currency_id
+      cusordnumber
+      customer_id
+      delivery_term_id
+      department_id
+      donumber
+      globalproject_id
+      intnotes
+      language_id
+      notes
+      ordnumber
+      oreqnumber
+      payment_id
+      reqdate
+      salesman_id
+      shippingpoint
+      shipto_id
+      shipvia
+      taxincluded
+      taxzone_id
+      transdate
+      transaction_description
+      vendor_confirmation_number
+      vendor_id
+    );
+    # }}} for vim folds
   }
 
-  my %args = ( map({ ( $_ => $source->$_ ) } qw(cp_id currency_id customer_id cusordnumber delivery_term_id department_id employee_id globalproject_id intnotes language_id notes
-                                                ordnumber payment_id reqdate salesman_id shippingpoint shipvia taxincluded taxzone_id transaction_description vendor_id billing_address_id
-                                             )),
-               closed    => 0,
-               delivered => 0,
-               order_type => $params{type},
-               transdate => DateTime->today_local,
-            );
-
   # Custom shipto addresses (the ones specific to the sales/purchase
   # record and not to the customer/vendor) are only linked from
   # shipto → delivery_orders. Meaning delivery_orders.shipto_id
   # will not be filled in that case.
   if (!$source->shipto_id && $source->id) {
-    $args{custom_shipto} = $source->custom_shipto->clone($class) if $source->can('custom_shipto') && $source->custom_shipto;
-
+    $record_args{custom_shipto} = $source->custom_shipto->clone($class) if $source->can('custom_shipto') && $source->custom_shipto;
   } else {
-    $args{shipto_id} = $source->shipto_id;
+    $record_args{shipto_id} = $source->shipto_id;
   }
 
   # infer type from legacy fields if not given
-  $args{order_type} //= $source->customer_id ? 'sales_delivery_order'
-                      : $source->vendor_id   ? 'purchase_delivery_order'
-                      : $source->is_sales    ? 'sales_delivery_order'
-                      : croak "need some way to set delivery order type from source";
+  $record_args{record_type} //= $source->customer_id ? SALES_DELIVERY_ORDER_TYPE()
+                              : $source->vendor_id   ? PURCHASE_DELIVERY_ORDER_TYPE()
+                              : $source->is_sales    ? SALES_DELIVERY_ORDER_TYPE()
+                              : croak "need some way to set delivery order type from source";
 
-  my $delivery_order = $class->new(%args);
+  my $delivery_order = $class->new(%record_args);
   $delivery_order->assign_attributes(%{ $params{attributes} }) if $params{attributes};
-  my $items          = delete($params{items}) || $source->items_sorted;
-  my %item_parents;
-
-  # do not copy items when converting to supplier delivery order
-  my @items = $delivery_order->is_type(SUPPLIER_DELIVERY_ORDER_TYPE) ? () : map {
-    my $source_item      = $_;
-    my $source_item_id   = $_->$item_parent_id_column;
-    my @custom_variables = map { _clone_orderitem_cvar($_) } @{ $source_item->custom_variables };
-
-    $item_parents{$source_item_id} ||= $source_item->$item_parent_column;
-    my $item_parent                  = $item_parents{$source_item_id};
-
-    my $current_do_item = SL::DB::DeliveryOrderItem->new(map({ ( $_ => $source_item->$_ ) }
-                                         qw(base_qty cusordnumber description discount lastcost longdescription marge_price_factor parts_id price_factor price_factor_id
-                                            project_id qty reqdate sellprice serialnumber transdate unit active_discount_source active_price_source
-                                         )),
-                                   custom_variables => \@custom_variables,
-                                   ordnumber        => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber,
-                                 );
-    $current_do_item->{"converted_from_orderitems_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::Order';
-    $current_do_item;
-  } @{ $items };
+
+  my $items = delete($params{items}) || $source->items_sorted;
+  my @items = ( $delivery_order->is_type(SUPPLIER_DELIVERY_ORDER_TYPE()) && ref($source) ne 'SL::DB::Reclamation' ) ?
+                ()
+              : map { SL::DB::DeliveryOrderItem->new_from($_, %params) } @{ $items };
 
   @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};
   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
@@ -193,11 +316,18 @@ sub new_from {
 
   $delivery_order->items(\@items);
 
+  unless ($params{no_linked_records}) {
+    $delivery_order->{ RECORD_ID() } = $source->id;
+    $delivery_order->{ RECORD_TYPE_REF() } = ref $source;
+  }
+
   return $delivery_order;
 }
 
 sub new_from_time_recordings {
   my ($class, $sources, %params) = @_;
+  require SL::DB::Part;
+  require SL::DB::Unit;
 
   croak("Unsupported object type in sources")                                      if any { ref($_) ne 'SL::DB::TimeRecording' }            @$sources;
   croak("Cannot create delivery order from source records of different customers") if any { $_->customer_id != $sources->[0]->customer_id } @$sources;
@@ -303,8 +433,7 @@ sub new_from_time_recordings {
 
   } else {
     my %args = (
-      is_sales    => 1,
-      order_type  => 'sales_delivery_order',
+      record_type => SALES_DELIVERY_ORDER_TYPE,
       delivered   => 0,
       customer_id => $sources->[0]->customer_id,
       taxzone_id  => $sources->[0]->customer->taxzone_id,
@@ -323,14 +452,14 @@ sub new_from_time_recordings {
 # legacy for compatibility
 # use type_data cusomtervendor and transfer direction instead
 sub is_sales {
-  if ($_[0]->order_type) {
-   return SL::DB::DeliveryOrder::TypeData::get3($_[0]->order_type, "properties", "is_customer");
+  if ($_[0]->record_type) {
+   return SL::DB::DeliveryOrder::TypeData::get3($_[0]->record_type, "properties", "is_customer");
   }
   return $_[0]{is_sales};
 }
 
 sub customervendor {
-  SL::DB::DeliveryOrder::TypeData::get3($_[0]->order_type, "properties", "is_customer") ? $_[0]->customer : $_[0]->vendor;
+  SL::DB::DeliveryOrder::TypeData::get3($_[0]->record_type, "properties", "is_customer") ? $_[0]->customer : $_[0]->vendor;
 }
 
 sub convert_to_invoice {
@@ -342,22 +471,6 @@ sub convert_to_invoice {
   if (!$self->db->with_transaction(sub {
     require SL::DB::Invoice;
     $invoice = SL::DB::Invoice->new_from($self, %params)->post || die;
-    $self->link_to_record($invoice);
-    # TODO extend link_to_record for items, otherwise long-term no d.r.y.
-    foreach my $item (@{ $invoice->items }) {
-      foreach (qw(delivery_order_items)) {    # expand if needed (orderitems)
-        if ($item->{"converted_from_${_}_id"}) {
-          die unless $item->{id};
-          RecordLinks->create_links('mode'       => 'ids',
-                                    'from_table' => $_,
-                                    'from_ids'   => $item->{"converted_from_${_}_id"},
-                                    'to_table'   => 'invoice',
-                                    'to_id'      => $item->{id},
-          ) || die;
-          delete $item->{"converted_from_${_}_id"};
-        }
-      }
-    }
     $self->update_attributes(closed => 1);
     1;
   })) {
@@ -376,6 +489,10 @@ sub digest {
     $self->date->to_kivitendo;
 }
 
+sub type_data {
+  SL::DB::Helper::TypeDataProxy->new(ref $_[0], $_[0]->type);
+}
+
 1;
 __END__
 
diff --git a/SL/DB/DeliveryOrder/TypeData.pm b/SL/DB/DeliveryOrder/TypeData.pm
index 8b523fb5a..26e250ce6 100644
--- a/SL/DB/DeliveryOrder/TypeData.pm
+++ b/SL/DB/DeliveryOrder/TypeData.pm
@@ -3,7 +3,6 @@ package SL::DB::DeliveryOrder::TypeData;
 use strict;
 use Carp;
 use Exporter qw(import);
-use Scalar::Util qw(weaken);
 use SL::Locale::String qw(t8);
 
 use constant {
@@ -26,18 +25,14 @@ my %type_data = (
       saved  => t8('Delivery Order has been saved'),
       add    => t8("Add Sales Delivery Order"),
       edit   => t8("Edit Sales Delivery Order"),
+      list   => t8("Sales Delivery Orders"),
+      type   => t8("Sales Delivery Order"),
       attachment => t8("sales_delivery_order_list"),
     },
     show_menu => {
-      save_and_quotation      => 0,
-      save_and_rfq            => 0,
-      save_and_sales_order    => 0,
-      save_and_purchase_order => 0,
-      save_and_delivery_order => 0,
-      save_and_ap_transaction => 0,
-      save_and_invoice        => 0,
-      delete                  => sub { $::instance_conf->get_sales_delivery_order_show_delete },
-      new_controller          => 0,
+      workflow_invoice     => 1,
+      workflow_reclamation => sub { $::instance_conf->get_show_sales_reclamation },
+      delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
     },
     properties => {
       customervendor => "customer",
@@ -45,12 +40,23 @@ my %type_data = (
       nr_key         => "donumber",
       transfer       => 'out',
       transnumber    => 'sdonumber',
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub {
+        DateTime->today_local->next_workday(extra_days => 1);
+      },
     },
     part_classification_query => [ "used_for_sale" => 1 ],
     rights => {
       edit => "sales_delivery_order_edit",
       view => "sales_delivery_order_edit | sales_delivery_order_view",
     },
+    features => {
+      price_tax   => 0,
+      stock       => 1,
+      subversions => 0,
+    },
   },
   PURCHASE_DELIVERY_ORDER_TYPE() => {
     text => {
@@ -58,18 +64,14 @@ my %type_data = (
       saved  => t8('Delivery Order has been saved'),
       add    => t8("Add Purchase Delivery Order"),
       edit   => t8("Edit Purchase Delivery Order"),
+      list   => t8("Purchase Delivery Orders"),
+      type   => t8("Purchase Delivery Order"),
       attachment => t8("purchase_delivery_order_list"),
     },
     show_menu => {
-      save_and_quotation      => 0,
-      save_and_rfq            => 0,
-      save_and_sales_order    => 0,
-      save_and_purchase_order => 0,
-      save_and_delivery_order => 0,
-      save_and_ap_transaction => 0,
-      save_and_invoice        => 0,
-      delete                  => sub { $::instance_conf->get_sales_delivery_order_show_delete },
-      new_controller          => 0,
+      workflow_invoice     => 1,
+      workflow_reclamation => sub { $::instance_conf->get_show_purchase_reclamation },
+      delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
     },
     properties => {
       customervendor => "vendor",
@@ -77,12 +79,23 @@ my %type_data = (
       nr_key         => "donumber",
       transfer       => 'in',
       transnumber    => 'pdonumber',
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub {
+        DateTime->today_local->next_workday(extra_days => 1);
+      },
     },
     part_classification_query => [ "used_for_purchase" => 1 ],
     rights => {
       edit => "purchase_delivery_order_edit",
       view => "purchase_delivery_order_edit | purchase_delivery_order_view",
     },
+    features => {
+      price_tax   => 0,
+      stock       => 1,
+      subversions => 0,
+    },
   },
   SUPPLIER_DELIVERY_ORDER_TYPE() => {
     text => {
@@ -90,18 +103,14 @@ my %type_data = (
       saved  => t8('Supplier Delivery Order has been saved'),
       add    => t8("Add Supplier Delivery Order"),
       edit   => t8("Edit Supplier Delivery Order"),
+      list   => t8("Supplier Delivery Orders"),
+      type   => t8("Supplier Delivery Order"),
       attachment => t8("supplier_delivery_order_list"),
     },
     show_menu => {
-      save_and_quotation      => 0,
-      save_and_rfq            => 0,
-      save_and_sales_order    => 0,
-      save_and_purchase_order => 0,
-      save_and_delivery_order => 0,
-      save_and_ap_transaction => 0,
-      save_and_invoice        => 0,
-      delete                  => sub { $::instance_conf->get_sales_delivery_order_show_delete },
-      new_controller          => 1,
+      workflow_invoice     => 0,
+      workflow_reclamation => 0,
+      delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
     },
     properties => {
       customervendor => "vendor",
@@ -109,12 +118,23 @@ my %type_data = (
       nr_key         => "donumber",
       transfer       => 'out',
       transnumber    => 'sudonumber',
+      worflow_needed => 1,
+    },
+    defaults => {
+      reqdate => sub {
+        DateTime->today_local->next_workday(extra_days => 1);
+      },
     },
     part_classification_query => [ "used_for_purchase" => 1 ],
     rights => {
       edit => "purchase_delivery_order_edit",
       view => "purchase_delivery_order_edit | purchase_delivery_order_view",
     },
+    features => {
+      price_tax   => 0,
+      stock       => 1,
+      subversions => 0,
+    },
   },
   RMA_DELIVERY_ORDER_TYPE() => {
     text => {
@@ -122,18 +142,14 @@ my %type_data = (
       saved  => t8('Delivery Order has been saved'),
       add    => t8("Add RMA Delivery Order"),
       edit   => t8("Edit RMA Delivery Order"),
+      list   => t8("RMA Delivery Orders"),
+      type   => t8("RMA Delivery Order"),
       attachment => t8("rma_delivery_order_list"),
     },
     show_menu => {
-      save_and_quotation      => 0,
-      save_and_rfq            => 0,
-      save_and_sales_order    => 0,
-      save_and_purchase_order => 0,
-      save_and_delivery_order => 0,
-      save_and_ap_transaction => 0,
-      save_and_invoice        => 0,
-      delete                  => sub { $::instance_conf->get_sales_delivery_order_show_delete },
-      new_controller          => 1,
+      workflow_invoice     => 0,
+      workflow_reclamation => 0,
+      delete => sub { $::instance_conf->get_sales_delivery_order_show_delete },
     },
     properties => {
       customervendor => "customer",
@@ -141,12 +157,23 @@ my %type_data = (
       nr_key         => "donumber",
       transfer       => 'in',
       transnumber    => 'rdonumber',
+      worflow_needed => 1,
+    },
+    defaults => {
+      reqdate => sub {
+        DateTime->today_local->next_workday(extra_days => 1);
+      },
     },
     part_classification_query => [ "used_for_sale" => 1 ],
     rights => {
       edit => "sales_delivery_order_edit",
       view => "sales_delivery_order_edit | sales_delivery_order_view",
     },
+    features => {
+      price_tax   => 0,
+      stock       => 1,
+      subversions => 0,
+    },
   },
 );
 
diff --git a/SL/DB/DeliveryOrderItem.pm b/SL/DB/DeliveryOrderItem.pm
index 7850a6445..e1a0783e4 100644
--- a/SL/DB/DeliveryOrderItem.pm
+++ b/SL/DB/DeliveryOrderItem.pm
@@ -2,9 +2,15 @@ package SL::DB::DeliveryOrderItem;
 
 use strict;
 
+use Carp;
+
+use Rose::DB::Object::Helpers qw(as_tree strip);
+
 use SL::DB::MetaSetup::DeliveryOrderItem;
+use SL::DB::Manager::DeliveryOrderItem;
 use SL::DB::Helper::ActsAsList;
 use SL::DB::Helper::LinkedRecords;
+use SL::DB::Helper::RecordLink qw(RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
 use SL::DB::Helper::RecordItem;
 use SL::DB::Helper::CustomVariables (
   sub_module  => 'delivery_order_items',
@@ -17,8 +23,6 @@ use SL::DB::Helper::CustomVariables (
   },
 );
 
-__PACKAGE__->meta->make_manager_class;
-
 __PACKAGE__->meta->add_relationship(
   delivery_order_stock_entries => {
     type         => 'one to many',
@@ -36,7 +40,121 @@ __PACKAGE__->configure_acts_as_list(group_by => [qw(delivery_order_id)]);
 
 # methods
 
+sub new_from {
+  my ($class, $source, %params) = @_;
+
+  my %allowed_sources = map { $_ => 1 } qw(
+      SL::DB::ReclamationItem
+      SL::DB::OrderItem
+      SL::DB::DeliveryOrderItem
+  );
+  unless( $allowed_sources{ref $source} ) {
+    croak("Unsupported source object type '" . ref($source) . "'");
+  }
+
+  my @custom_variables = map { _clone_cvar_for_delivery_order_item($_) } @{ $source->custom_variables };
+
+  my %item_args;
+  if (ref($source) eq 'SL::DB::ReclamationItem') {
+    map { $item_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      active_discount_source
+      active_price_source
+      base_qty
+      description
+      discount
+      lastcost
+      longdescription
+      parts_id
+      position
+      price_factor
+      price_factor_id
+      pricegroup_id
+      project_id
+      qty
+      reqdate
+      sellprice
+      serialnumber
+      unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+    # }}} for vim folds
+  } elsif (ref($source) eq 'SL::DB::OrderItem') {
+    map { $item_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      active_discount_source
+      active_price_source
+      base_qty
+      cusordnumber
+      description
+      discount
+      lastcost
+      longdescription
+      marge_price_factor
+      parts_id
+      position
+      price_factor
+      price_factor_id
+      project_id
+      qty
+      reqdate
+      sellprice
+      serialnumber
+      transdate
+      unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+    $item_args{ordnumber}        = ref($source->record) eq 'SL::DB::Order' ? $source->record->ordnumber : $source->ordnumber;
+    # }}} for vim folds
+  } elsif (ref($source) eq 'SL::DB::DeliveryOrderItem') {
+    map { $item_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      active_discount_source
+      active_price_source
+      base_qty
+      cusordnumber
+      description
+      discount
+      lastcost
+      longdescription
+      marge_price_factor
+      parts_id
+      position
+      price_factor
+      price_factor_id
+      project_id
+      qty
+      reqdate
+      sellprice
+      serialnumber
+      transdate
+      unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+    # }}} for vim folds
+  }
+
+  my $item = $class->new(%item_args);
+
+  unless ($params{no_linked_records}) {
+    $item->{ RECORD_ITEM_ID() } = $source->id;
+    $item->{ RECORD_ITEM_TYPE_REF() } = ref $source;
+  }
+
+  return $item;
+}
+
+sub _clone_cvar_for_delivery_order_item {
+  my ($cvar) = @_;
+
+  my $cloned = $_->clone_and_reset;
+  $cloned->sub_module('delivery_order_items');
+
+  return $cloned;
+}
+
 sub record { goto &delivery_order }
+sub record_id { goto &delivery_order_id }
 
 sub displayable_delivery_order_info {
   my ($self, $dec) = @_;
diff --git a/SL/DB/EmailImport.pm b/SL/DB/EmailImport.pm
new file mode 100644
index 000000000..64e9294ac
--- /dev/null
+++ b/SL/DB/EmailImport.pm
@@ -0,0 +1,18 @@
+package SL::DB::EmailImport;
+
+use strict;
+
+use SL::DB::MetaSetup::EmailImport;
+use SL::DB::Manager::EmailImport;
+
+__PACKAGE__->meta->add_relationship(
+  email_journals => {
+    type      => 'one to many',
+    class     => 'SL::DB::EmailJournal',
+    column_map => { id => 'email_import_id' },
+  },
+);
+
+__PACKAGE__->meta->initialize;
+
+1;
diff --git a/SL/DB/EmailJournal.pm b/SL/DB/EmailJournal.pm
index 5f3a51da8..ed851f967 100644
--- a/SL/DB/EmailJournal.pm
+++ b/SL/DB/EmailJournal.pm
@@ -2,9 +2,16 @@ package SL::DB::EmailJournal;
 
 use strict;
 
+use Carp qw(croak);
+use List::Util qw(first);
+
+use SL::Webdav;
+use SL::File;
+
 use SL::DB::MetaSetup::EmailJournal;
 use SL::DB::Manager::EmailJournal;
 use SL::DB::Helper::AttrSorted;
+use SL::DB::Helper::LinkedRecords;
 
 __PACKAGE__->meta->add_relationship(
   attachments  => {
@@ -29,6 +36,78 @@ sub compare_to {
   return $result || ($self->id <=> $other->id);
 }
 
+sub link_to_record_with_attachment {
+  my ($self, $record, $attachment_or_id) = @_;
+
+  if ($attachment_or_id ne '') {
+    my $attachment = ref $attachment_or_id ?
+        $attachment_or_id
+      : first {$_->id == $attachment_or_id} @{$self->attachments_sorted};
+    croak "Email journal attachment does not belong to this email journal"
+      unless  $attachment && $attachment->email_journal_id == $self->id;
+    $attachment->add_file_to_record($record);
+  }
+
+  $self->link_to_record($record);
+}
+
+sub linked {
+  my ($self) = @_;
+
+  return !!scalar @{$self->linked_records};
+}
+
+sub process_attachments_as_purchase_invoices {
+  my ($self) = @_;
+
+  my $attachments = $self->attachments_sorted;
+  foreach my $attachment (@$attachments) {
+    my $ap_invoice = $attachment->create_ap_invoice();
+    next unless $ap_invoice;
+
+    # link to email journal
+    $self->link_to_record($ap_invoice);
+
+    # copy file to webdav folder
+    if ($::instance_conf->get_webdav_documents) {
+      my $webdav = SL::Webdav->new(
+        type     => 'accounts_payable',
+        number   => $ap_invoice->invnumber,
+      );
+      my $webdav_file = SL::Webdav::File->new(
+        webdav => $webdav,
+        filename => $attachment->name,
+      );
+      eval {
+        $webdav_file->store(data => \$attachment->content);
+        1;
+      } or do {
+        die 'Storing the ZUGFeRD file to the WebDAV folder failed: ' . $@;
+      };
+    }
+    # copy file to doc storage
+    if ($::instance_conf->get_doc_storage) {
+      eval {
+        SL::File->save(
+          object_id     => $ap_invoice->id,
+          object_type   => 'purchase_invoice',
+          mime_type     => 'application/pdf',
+          source        => 'uploaded',
+          file_type     => 'document',
+          file_name     => $attachment->name,
+          file_contents => $attachment->content,
+        );
+        1;
+      } or do {
+        die 'Storing the ZUGFeRD file in the storage backend failed: ' . $@;
+      };
+    }
+  }
+
+  my $new_ext_status = join('_', $self->extended_status, 'processed');
+  $self->update({ extended_status => $new_ext_status});
+}
+
 1;
 
 __END__
diff --git a/SL/DB/EmailJournalAttachment.pm b/SL/DB/EmailJournalAttachment.pm
index 0627e83d5..820e0df4a 100644
--- a/SL/DB/EmailJournalAttachment.pm
+++ b/SL/DB/EmailJournalAttachment.pm
@@ -6,6 +6,62 @@ use SL::DB::MetaSetup::EmailJournalAttachment;
 use SL::DB::Manager::EmailJournalAttachment;
 use SL::DB::Helper::ActsAsList (group_by => [ qw(email_journal_id) ]);
 
+use SL::Webdav;
+use SL::File;
+
 __PACKAGE__->meta->initialize;
 
+sub add_file_to_record {
+  my ($self, $record) = @_;
+
+  # copy file to webdav folder
+  if ($::instance_conf->get_webdav_documents) {
+    my $record_type = $record->record_type;
+    # TODO: file and webdav use different types
+    $record_type = 'accounts_payable' if $record_type eq 'ap_transaction';
+    $record_type = 'invoice'          if $record_type eq 'ar_transaction';
+    $record_type = 'general_ledger'   if $record_type eq 'gl_transaction';
+    $record_type = 'invoice'          if $record_type eq 'invoice_storno';
+    $record_type = 'purchase_invoice' if $record_type eq 'purchase_credit_note';
+    my $webdav = SL::Webdav->new(
+      type     => $record_type,
+      number   => $record->record_number,
+    );
+    my $webdav_file = SL::Webdav::File->new(
+      webdav => $webdav,
+      filename => $self->name,
+    );
+    eval {
+      $webdav_file->store(data => \$self->content);
+      1;
+    } or do {
+      die 'Storing the attachment file to the WebDAV folder failed: ' . $@;
+    };
+  }
+  # copy file to doc storage
+  if ($::instance_conf->get_doc_storage) {
+    my $record_type = $record->record_type;
+    # TODO: file and webdav use different types
+    $record_type = 'purchase_invoice' if $record_type eq 'ap_transaction';
+    $record_type = 'purchase_invoice' if $record_type eq 'purchase_credit_note';
+    $record_type = 'invoice'          if $record_type eq 'ar_transaction';
+    $record_type = 'invoice'          if $record_type eq 'invoice_storno';
+    eval {
+      SL::File->save(
+        object_id     => $record->id,
+        object_type   => $record_type,
+        source        => 'uploaded',
+        file_type     => 'document',
+        file_name     => $self->name,
+        file_contents => $self->content,
+        mime_type     => $self->mime_type,
+      );
+      1;
+    } or do {
+      die 'Storing the attachment file to the file management failed: ' . $@;
+    };
+  }
+
+}
+
 1;
diff --git a/SL/DB/File.pm b/SL/DB/File.pm
index 0405b743a..4bdb21bf3 100644
--- a/SL/DB/File.pm
+++ b/SL/DB/File.pm
@@ -7,6 +7,7 @@ use strict;
 
 use SL::DB::MetaSetup::File;
 use SL::DB::Manager::File;
+use SL::DB::Helper::AttrSorted;
 
 __PACKAGE__->meta->add_relationship(
   full_text            => {
@@ -16,8 +17,18 @@ __PACKAGE__->meta->add_relationship(
   },
 );
 
+__PACKAGE__->meta->add_relationship(
+  file_versions        => {
+    type               => 'one to many',
+    class              => 'SL::DB::FileVersion',
+    column_map         => { id => 'file_id' },
+  },
+);
+
+
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->attr_sorted({unsorted => 'file_versions', position => 'version'});
 
 1;
 __END__
diff --git a/SL/DB/FileVersion.pm b/SL/DB/FileVersion.pm
new file mode 100644
index 000000000..c924f065e
--- /dev/null
+++ b/SL/DB/FileVersion.pm
@@ -0,0 +1,61 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::FileVersion;
+
+use strict;
+
+use SL::DB::MetaSetup::FileVersion;
+use SL::DB::Manager::FileVersion;
+
+__PACKAGE__->meta->initialize;
+
+
+sub get_system_location {
+  my ($self) = @_;
+
+  my $filesystem_file = $self->doc_path . $self->file_location;
+
+  die "Invalid state, file has vanished at: $filesystem_file" unless -f $filesystem_file;
+
+  return $filesystem_file;
+
+}
+
+sub file_name {
+  my ($self) = @_;
+
+  return $self->file->file_name;
+
+}
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SL::DB::FileVersion
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<get_system_location>
+
+Returns the filesystem's file location for this exact version.
+Dies if no plain file exists at the expected location.
+
+=item C<file_name>
+
+Shortcut for $self->file->file_name.
+
+
+=back
+
+=head1 AUTHOR
+
+Jan E<lt>jan@kivitendo.deE<gt>
+=cut
diff --git a/SL/DB/FollowUp.pm b/SL/DB/FollowUp.pm
index b7121b237..b66d009b5 100644
--- a/SL/DB/FollowUp.pm
+++ b/SL/DB/FollowUp.pm
@@ -13,6 +13,15 @@ __PACKAGE__->meta->add_relationships(
     class        => 'SL::DB::FollowUpLink',
     column_map   => { id => 'follow_up_id' },
   },
+  created_for_employees => {
+    type       => 'many to many',
+    map_class  => 'SL::DB::FollowUpCreatedForEmployee',
+  },
+  done => {
+    type       => 'one to one',
+    class      => 'SL::DB::FollowUpDone',
+    column_map => { id => 'follow_up_id' },
+  },
 );
 
 __PACKAGE__->meta->initialize;
diff --git a/SL/DB/FollowUpCreatedForEmployee.pm b/SL/DB/FollowUpCreatedForEmployee.pm
new file mode 100644
index 000000000..d83c619aa
--- /dev/null
+++ b/SL/DB/FollowUpCreatedForEmployee.pm
@@ -0,0 +1,13 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::FollowUpCreatedForEmployee;
+
+use strict;
+
+use SL::DB::MetaSetup::FollowUpCreatedForEmployee;
+use SL::DB::Manager::FollowUpCreatedForEmployee;
+
+__PACKAGE__->meta->initialize;
+
+1;
diff --git a/SL/DB/FollowUpDone.pm b/SL/DB/FollowUpDone.pm
new file mode 100644
index 000000000..70d7a40e7
--- /dev/null
+++ b/SL/DB/FollowUpDone.pm
@@ -0,0 +1,13 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::FollowUpDone;
+
+use strict;
+
+use SL::DB::MetaSetup::FollowUpDone;
+use SL::DB::Manager::FollowUpDone;
+
+__PACKAGE__->meta->initialize;
+
+1;
diff --git a/SL/DB/GLTransaction.pm b/SL/DB/GLTransaction.pm
index 1dbf2c813..06263378b 100644
--- a/SL/DB/GLTransaction.pm
+++ b/SL/DB/GLTransaction.pm
@@ -4,15 +4,13 @@ use strict;
 
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::MetaSetup::GLTransaction;
+use SL::DB::Manager::GLTransaction;
 use SL::Locale::String qw(t8);
 use List::Util qw(sum);
 use SL::DATEV;
 use Carp;
 use Data::Dumper;
 
-# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
-__PACKAGE__->meta->make_manager_class;
-
 __PACKAGE__->meta->add_relationship(
   transactions   => {
     type         => 'one to many',
@@ -27,6 +25,10 @@ __PACKAGE__->meta->add_relationship(
 
 __PACKAGE__->meta->initialize;
 
+sub record_type {return 'gl_transaction';}
+sub record_number {goto &id;}
+sub displayable_name {goto &oneline_summary;}
+
 sub abbreviation {
   my $self = shift;
 
@@ -152,7 +154,7 @@ sub add_chart_booking {
     $taxamount *= -1;
   };
 
-  next unless $netamount; # skip entries with netamount 0
+  return unless $netamount; # skip entries with netamount 0
 
   # initialise transactions if it doesn't exist yet
   $self->transactions([]) unless $self->transactions;
diff --git a/SL/DB/Helper/ALL.pm b/SL/DB/Helper/ALL.pm
index 93848a0fa..62a366254 100644
--- a/SL/DB/Helper/ALL.pm
+++ b/SL/DB/Helper/ALL.pm
@@ -27,6 +27,7 @@ use SL::DB::BankTransactionAccTrans;
 use SL::DB::Bin;
 use SL::DB::Buchungsgruppe;
 use SL::DB::Business;
+use SL::DB::BusinessModel;
 use SL::DB::Chart;
 use SL::DB::Contact;
 use SL::DB::ContactDepartment;
@@ -55,6 +56,7 @@ use SL::DB::Department;
 use SL::DB::Draft;
 use SL::DB::Dunning;
 use SL::DB::DunningConfig;
+use SL::DB::EmailImport;
 use SL::DB::EmailJournal;
 use SL::DB::EmailJournalAttachment;
 use SL::DB::Employee;
@@ -62,9 +64,12 @@ use SL::DB::EmployeeProjectInvoices;
 use SL::DB::Exchangerate;
 use SL::DB::File;
 use SL::DB::FileFullText;
+use SL::DB::FileVersion;
 use SL::DB::Finanzamt;
 use SL::DB::FollowUp;
 use SL::DB::FollowUpAccess;
+use SL::DB::FollowUpCreatedForEmployee;
+use SL::DB::FollowUpDone;
 use SL::DB::FollowUpLink;
 use SL::DB::GLTransaction;
 use SL::DB::GenericTranslation;
@@ -82,6 +87,8 @@ use SL::DB::Object::Hooks;
 use SL::DB::Object;
 use SL::DB::Order;
 use SL::DB::OrderItem;
+use SL::DB::OrderStatus;
+use SL::DB::OrderVersion;
 use SL::DB::Part;
 use SL::DB::PartClassification;
 use SL::DB::PartCustomerPrice;
@@ -103,7 +110,11 @@ use SL::DB::ProjectPhaseParticipant;
 use SL::DB::ProjectRole;
 use SL::DB::ProjectStatus;
 use SL::DB::ProjectType;
+use SL::DB::PurchaseBasketItem;
 use SL::DB::PurchaseInvoice;
+use SL::DB::Reclamation;
+use SL::DB::ReclamationItem;
+use SL::DB::ReclamationReason;
 use SL::DB::ReconciliationLink;
 use SL::DB::RecordLink;
 use SL::DB::RecordTemplate;
@@ -148,6 +159,7 @@ use SL::DB::Unit;
 use SL::DB::UnitsLanguage;
 use SL::DB::UserPreference;
 use SL::DB::VC;
+use SL::DB::ValidityToken;
 use SL::DB::Vendor;
 use SL::DB::Warehouse;
 
diff --git a/SL/DB/Helper/ALLAuth.pm b/SL/DB/Helper/ALLAuth.pm
index 730c54c94..fd38b2149 100644
--- a/SL/DB/Helper/ALLAuth.pm
+++ b/SL/DB/Helper/ALLAuth.pm
@@ -2,10 +2,18 @@ package SL::DB::Helper::ALLAuth;
 
 use strict;
 
+use SL::DB::AuthClient;
+use SL::DB::AuthClientGroup;
+use SL::DB::AuthClientUser;
 use SL::DB::AuthGroup;
 use SL::DB::AuthGroupRight;
-use SL::DB::AuthUserConfig;
+use SL::DB::AuthMasterRight;
+use SL::DB::AuthSchemaInfo;
+use SL::DB::AuthSession;
+use SL::DB::AuthSessionContent;
 use SL::DB::AuthUser;
+use SL::DB::AuthUserConfig;
+use SL::DB::AuthUserGroup;
 
 1;
 
diff --git a/SL/DB/Helper/DisplayableNamePreferences.pm b/SL/DB/Helper/DisplayableNamePreferences.pm
index 5080ea245..01982816c 100644
--- a/SL/DB/Helper/DisplayableNamePreferences.pm
+++ b/SL/DB/Helper/DisplayableNamePreferences.pm
@@ -21,9 +21,6 @@ sub import {
   $params{title} && $params{options}  or croak 'need params title and options';
 
   $prefs_specs{$importing} = \%params;
-  $prefs{$importing}       = SL::Helper::UserPreferences::DisplayableName->new(
-    module => $importing
-  );
 
   # Don't 'goto' to Exporters import, it would try to parse @params
   __PACKAGE__->export_to_level(1, $class, @EXPORT);
@@ -50,7 +47,7 @@ sub displayable_name_prefs {
   my $class_or_self = shift;
   my $class         = ref($class_or_self) || $class_or_self;
 
-  return $prefs{$class};
+  return SL::Helper::UserPreferences::DisplayableName->new(module => $class);
 }
 
 sub displayable_name_specs {
@@ -91,15 +88,15 @@ names configured via user preferences
   # Controller configuring a displayable name
   # can get specs to display title and options
   # and the user prefs to read and set them
-  my specs => SL::DB::SomeObject->displayable_name_specs;
-  my prefs => SL::DB::SomeObject->displayable_name_prefs;
+  my specs = SL::DB::SomeObject->displayable_name_specs;
+  my prefs = SL::DB::SomeObject->displayable_name_prefs;
 
 
 This mixin provides a method C<displayable_name> for the calling module
-which returns the a string depending on the settings of the
-C<UserPreferences> (see also L<SL::Helper::UserPrefernces::DisplayableName>.
-The value in the user preferences is scanned for a pattern like E<lt>%name%E<gt>, which
-will be replaced by the value of C<$object-E<gt>name>.
+which returns a string depending on the settings of the
+C<UserPreferences> (see also L<SL::Helper::UserPrefernces::DisplayableName>).
+The value in the user preferences is scanned for a pattern like
+E<lt>%name%E<gt>, which will be replaced by the value of C<$object-E<gt>name>.
 
 =head1 CONFIGURATION
 
@@ -134,7 +131,7 @@ user.
 
 =item C<displayable_name_prefs>
 
-This returns an instance of the L<SL::Helper::UserPrefernces::DisplayableName>
+This returns an instance of the L<SL::Helper::UserPreferences::DisplayableName>
 (see there) for the calling class. This can be used to read and set the
 preferences.
 
diff --git a/SL/DB/Helper/FlattenToForm.pm b/SL/DB/Helper/FlattenToForm.pm
index 591073e18..4f2e73e3d 100644
--- a/SL/DB/Helper/FlattenToForm.pm
+++ b/SL/DB/Helper/FlattenToForm.pm
@@ -3,7 +3,7 @@ package SL::DB::Helper::FlattenToForm;
 use strict;
 
 use parent qw(Exporter);
-our @EXPORT = qw(flatten_to_form);
+our @EXPORT = qw(flatten_to_form prepare_stock_info);
 
 use List::MoreUtils qw(uniq any);
 
@@ -15,7 +15,8 @@ sub flatten_to_form {
   _copy($self, $form, '', '', 0, qw(id type taxzone_id ordnumber quonumber invnumber donumber cusordnumber taxincluded shippingpoint shipvia notes intnotes cp_id
                                     employee_id salesman_id closed department_id language_id payment_id delivery_customer_id delivery_vendor_id shipto_id proforma
                                     globalproject_id delivered transaction_description container_type accepted_by_customer invoice storno storno_id dunning_config_id
-                                    orddate quodate reqdate gldate duedate deliverydate datepaid transdate tax_point delivery_term_id billing_address_id));
+                                    orddate quodate reqdate gldate duedate deliverydate datepaid transdate tax_point delivery_term_id billing_address_id
+                                    vendor_confirmation_number));
   $form->{currency} = $form->{curr} = $self->currency_id ? $self->currency->name || '' : '';
 
   if ( $vc eq 'customer' ) {
@@ -27,9 +28,10 @@ sub flatten_to_form {
   };
 
   if (_has($self, 'transdate')) {
-    my $transdate_idx = ref($self) eq 'SL::DB::Order'   ? ($self->quotation ? 'quodate' : 'orddate')
-                      : ref($self) eq 'SL::DB::Invoice' ? 'invdate'
-                      :                                   'transdate';
+    my $transdate_idx = ref($self) eq 'SL::DB::Order'         ? ($self->quotation ? 'quodate' : 'orddate')
+                      : ref($self) eq 'SL::DB::Invoice'       ? 'invdate'
+                      : ref($self) eq 'SL::DB::DeliveryOrder' ? 'dodate'
+                      :                                         'transdate';
     $form->{$transdate_idx} = $self->transdate->to_lxoffice;
   }
 
@@ -74,6 +76,7 @@ sub flatten_to_form {
   my $items_name = ref($self) eq 'SL::DB::Order'         ? 'orderitems'
                  : ref($self) eq 'SL::DB::DeliveryOrder' ? 'delivery_order_items'
                  : ref($self) eq 'SL::DB::Invoice'       ? 'invoice'
+                 : ref($self) eq 'SL::DB::Reclamation'   ? 'reclamation_items'
                  : '';
 
   my %cvar_validity = _determine_cvar_validity($self, $vc);
@@ -110,6 +113,10 @@ sub flatten_to_form {
       $form->{"deliverydate_oe_${idx}"} = $date;
       $form->{"reqdate_${idx}"}         = $date;
     }
+    if (ref($self) eq 'SL::DB::DeliveryOrder'){
+      my $in_out   = $form->{type} =~ /^sales|^supplier/ ? 'out' : 'in';
+      $form->{"stock_" . $in_out . "_" . ${idx}} = prepare_stock_info($self,$item);
+    }
   }
 
   _copy_custom_variables($self, $form, 'vc_cvar_', '', $cvar_validity{vc});
@@ -118,6 +125,21 @@ sub flatten_to_form {
   return $self;
 }
 
+sub prepare_stock_info {
+  my ($self, $item) = @_;
+
+  $item->{stock_info} = SL::YAML::Dump([
+    map +{
+      delivery_order_items_stock_id => $_->id,
+      qty                           => $_->qty,
+      warehouse_id                  => $_->warehouse_id,
+      bin_id                        => $_->bin_id,
+      chargenumber                  => $_->chargenumber,
+      unit                          => $_->unit,
+    }, $item->delivery_order_stock_entries
+  ]);
+}
+
 sub _has {
   my ($obj, $column) = @_;
   return $obj->can($column) && $obj->$column;
diff --git a/SL/DB/Helper/LegacyPrinting.pm b/SL/DB/Helper/LegacyPrinting.pm
new file mode 100644
index 000000000..abcb80f0a
--- /dev/null
+++ b/SL/DB/Helper/LegacyPrinting.pm
@@ -0,0 +1,118 @@
+package SL::DB::Helper::LegacyPrinting;
+
+use strict;
+
+use parent qw(Exporter);
+our @EXPORT = qw(map_keys_to_arrays format_as_number);
+
+sub map_keys_to_arrays {
+  my ($items, $keys, $template_arrays) = @_;
+
+  for my $key (@$keys) {
+    # handle nested keys
+    if ($key =~ /\./) {
+      my ($k1, $k2) = split /\./, $key;
+      $template_arrays->{$k1} = [ map { { $k2 => $_->{$k1}->{$k2} } } @$items ];
+    } else {
+      $template_arrays->{$key} = [ map {
+        if (ref $_ eq 'HASH') {
+          $_->{$key}
+        } else {
+          $_->can($key) ? $_->$key
+                        : $_->{$key}
+        }
+      } @$items ];
+    }
+  }
+}
+
+sub format_as_number {
+  my ($keys, $template_arrays) = @_;
+
+  for my $key (@$keys) {
+    $template_arrays->{$key} = [ map {
+      $::form->format_amount(\%::myconfig, $_, 2, 0),
+    } @{ $template_arrays->{$key} } ];
+  }
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::DB::Helper::LegacyPrinting - Helper functions to support printing using the built-it template parser
+
+=head1 DESCRIPTION
+
+The new Reclamation controller, and possibly other future controllers, only support printing using Template Toolkit (TT)
+for parsing the templates. For OpenDocument templates however, template toolkit cannot be used.
+
+Template Toolkit (TT) can access Rose DB objects directly, which is a feature not available in the built-in parser.
+For positions in a loop, such as positions in a table, the built-in parser expects the data in a specific format.
+Therefore, we need to prepare the data accordingly before it can be processed by the built-in parser.
+
+In the past this was done in the respective modules, e.g. SL/OE.pm. The idea would be to extract the data from the Rose
+DB objects. That should hopefully result in less and simpler code.
+
+=head1 FUNCTIONS
+
+=head2 C<map_keys_to_arrays ($items, $keys, $template_arrays)>
+
+Extracts the given keys from the given list of Rose DB objects and adds them to the given hash reference,
+in the format that the built in template parser expects.
+
+The expected format looks like the following, e.g.:
+
+  # 'qty_as_number' => [
+  #                      '1.00',
+  #                      '3.00'
+  #                    ],
+  # 'part' => [
+  #             {
+  #               'partnumber' => '000013'
+  #             },
+  #             {
+  #               'partnumber' => '000004'
+  #             }
+  #           ],
+  # 'position' => [
+  #                 1,
+  #                 2
+  #               ],
+  # 'unit' => [
+  #             'Stck',
+  #             'Stck'
+  #           ],
+
+=over 4
+
+=item C<$items>
+
+A reference to a list of Rose DB objects from which the keys should be extracted.
+
+=item C<$keys>
+
+A reference to a list of keys that should be extracted from the Rose DB object.
+Nested keys should be denoted by a dot. E.g.:
+
+  qw( qty_as_number part.partnumber position unit )
+
+=item C<$template_arrays>
+
+A reference to a hash to which the extracted keys should be added.
+
+=back
+
+=head2 C<format_as_number ($keys, $template_arrays)>
+
+Formats the given keys in the given hash reference as numbers.
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
diff --git a/SL/DB/Helper/LinkedRecords.pm b/SL/DB/Helper/LinkedRecords.pm
index 4614e5a8d..206d40f48 100644
--- a/SL/DB/Helper/LinkedRecords.pm
+++ b/SL/DB/Helper/LinkedRecords.pm
@@ -4,10 +4,10 @@ use strict;
 
 require Exporter;
 our @ISA    = qw(Exporter);
-our @EXPORT = qw(linked_records link_to_record);
+our @EXPORT = qw(linked_records link_to_record sales_order_centric_linked_records);
 
 use Carp;
-use List::MoreUtils qw(any);
+use List::MoreUtils qw(any none);
 use List::UtilsBy qw(uniq_by);
 use Sort::Naturally;
 use SL::DBUtils;
@@ -306,7 +306,7 @@ sub sort_linked_records {
   $sort_dir = $sort_dir * 1 ? 1 : -1;
 
   my %numbers = ( 'SL::DB::SalesProcess'    => sub { $_[0]->id },
-                  'SL::DB::Order'           => sub { $_[0]->quotation ? $_[0]->quonumber : $_[0]->ordnumber },
+                  'SL::DB::Order'           => sub { $_[0]->record_number },
                   'SL::DB::DeliveryOrder'   => sub { $_[0]->donumber },
                   'SL::DB::Invoice'         => sub { $_[0]->invnumber },
                   'SL::DB::PurchaseInvoice' => sub { $_[0]->invnumber },
@@ -331,24 +331,27 @@ sub sort_linked_records {
   };
 
   my %scores;
-  %scores = ( 'SL::DB::SalesProcess'    =>  10,
-              'SL::DB::RequirementSpec' =>  15,
-              'SL::DB::Order'           =>  sub { $scores{ $_[0]->type } },
-              sales_quotation           =>  20,
-              sales_order               =>  30,
-              sales_delivery_order      =>  40,
-              'SL::DB::DeliveryOrder'   =>  sub { $scores{ $_[0]->type } },
-              'SL::DB::Invoice'         =>  50,
-              request_quotation         => 120,
-              purchase_order            => 130,
-              purchase_delivery_order   => 140,
-              'SL::DB::PurchaseInvoice' => 150,
-              'SL::DB::GLTransaction'   => 170,
-              'SL::DB::Letter'          => 200,
-              'SL::DB::ShopOrder'       => 250,
-              'SL::DB::EmailJournal'    => 300,
-              'SL::DB::Dunning'         => 350,
-              UNKNOWN                   => 999,
+  %scores = ( 'SL::DB::SalesProcess'      => 10,
+              'SL::DB::RequirementSpec'   => 15,
+              'SL::DB::Order'             => sub { $scores{ $_[0]->type } },
+              sales_quotation             => 20,
+              sales_order_intake          => 25,
+              sales_order                 => 30,
+              sales_delivery_order        => 40,
+              'SL::DB::DeliveryOrder'     => sub { $scores{ $_[0]->type } },
+              'SL::DB::Invoice'           => 50,
+              request_quotation           => 120,
+              purchase_quotation_intake   => 125,
+              purchase_order              => 130,
+              purchase_order_confirmation => 135,
+              purchase_delivery_order     => 140,
+              'SL::DB::PurchaseInvoice'   => 150,
+              'SL::DB::GLTransaction'     => 170,
+              'SL::DB::Letter'            => 200,
+              'SL::DB::ShopOrder'         => 250,
+              'SL::DB::EmailJournal'      => 300,
+              'SL::DB::Dunning'           => 350,
+              UNKNOWN                     => 999,
             );
   my $score_xtor = sub {
     my $score = $scores{ ref($_[0]) };
@@ -395,6 +398,61 @@ sub filter_linked_records {
   return \@records;
 }
 
+sub sales_order_centric_linked_records {
+  my ($self, %params) = @_;
+
+  my $with_sales_quotations = $params{with_sales_quotations};
+  my $with_myself           = $params{with_myself};
+
+  my $all_linked_records = $self->linked_records(direction => 'both', recursive => 1, save_path => 1);
+
+  if (!$with_sales_quotations) {
+    $all_linked_records = [ grep { !('SL::DB::Order' eq ref $_ && $_->is_sales && $_->quotation) } @$all_linked_records ];
+  }
+
+  if ($with_myself) {
+    $self->{_record_link_to_myself} = 1;
+    push @$all_linked_records, $self;
+  }
+
+  my $filtered_orders = [ grep {
+    'SL::DB::Order' eq ref $_ &&
+    ($_->is_type('sales_order') || $_->is_type('sales_order_intake')) &&
+    $_->{_record_link_direction} eq 'from'
+  } @$all_linked_records ];
+
+  # no orders no call to linked_records via batch mode
+  # but instead return default list
+  return $all_linked_records unless scalar @$filtered_orders;
+
+  # we have an order, therefore get the tree view from the top (order)
+  my $id_ref = [ map { $_->id } @$filtered_orders ];
+
+  my $linked_records = SL::DB::Order->new->linked_records(direction => 'to', recursive => 1, batch => $id_ref);
+
+  # Remove entries that are already in all_linked_records.
+  $linked_records = [ grep { my $id = $_->id; none { $_->id == $id } @$all_linked_records } @$linked_records ];
+
+  # Remove quotations if requested.
+  if (!$with_sales_quotations) {
+    $linked_records = [ grep { !('SL::DB::Order' eq ref $_ && $_->is_sales && $_->quotation) } @$linked_records ];
+  }
+
+  # Mark or remove myself.
+  if ($with_myself) {
+    $_->{_record_link_to_myself}  = 1 for grep { $_->id == $self->id } @$linked_records;
+  } else {
+    $linked_records = [ grep { $_->id != $self->id } @$linked_records ];
+  }
+
+  # All remaining links found via order are two more steps away from myself.
+  $_->{_record_link_depth} += 2 for @{ $linked_records };
+
+  push @{ $linked_records }, @$all_linked_records;
+
+  return $linked_records;
+}
+
 1;
 
 __END__
@@ -405,7 +463,7 @@ __END__
 
 SL::DB::Helper::LinkedRecords - Mixin for retrieving linked records via the table C<record_links>
 
-SYNOPSIS
+=head1 SYNOPSIS
 
   # In SL::DB::<Object>
   use SL::DB::Helper::LinkedRecords;
@@ -458,6 +516,12 @@ SYNOPSIS
     %params,
   );
 
+  # get order centric linked records
+  $invoice->sales_order_centric_linked_records(
+    with_myself           => 1,
+    with_sales_quotations => 1
+  );
+
   # add a new link
   $order->link_to_record($invoice);
   $order->link_to_record($purchase_order, bidirectional => 1);
@@ -680,13 +744,40 @@ Note: If the latter has a default setting it will always mask the creation time.
 
 Returns an array reference.
 
-Can only be called both as a class function since it is not exported.
+Can only be called as a class function since it is not exported.
+
+=item C<sales_order_centric_linked_records %params>
+
+Get linked records from the view of a reachable sales order in the path
+prior to this record. If no sales order is found, recursive linked records
+for both directions are returned.
+
+=over 2
+
+=item * C<with_sales_quotations>
+
+Since the view from a sales order is requested, normally no sales quotation
+prior to the sales order will be returned. If this parameter is truish, then
+a sales quotation would be included.
+This parameter is optional and defaults to false.
+
+=item * C<with_myself>
+
+The records returned by L</linked_records> do not include the requesting record
+itself. However, if you want to display the same linked records for every
+record in the same workflow, it can be usefull to include the record itself.
+C<_record_link_to_myself> will be set to a truish value in that record in
+that case.
+This parameter is optional and defaults to false.
+
+=back
 
 =back
 
 =head1 EXPORTS
 
-This mixin exports the functions L</linked_records> and
+This mixin exports the functions L</linked_records>,
+L</sales_order_centric_linked_records> and
 L</link_to_record>.
 
 =head1 BUGS
diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm
index bc477fcc4..126722d19 100644
--- a/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@ -104,13 +104,13 @@ my %kivitendo_package_names = (
   assortment_items               => 'assortment_item',
   background_jobs                => 'background_job',
   background_job_histories       => 'background_job_history',
-  ap                             => 'purchase_invoice',
   bank_accounts                  => 'bank_account',
   bank_transactions              => 'bank_transaction',
   bank_transaction_acc_trans     => 'bank_transaction_acc_trans',
   buchungsgruppen                => 'buchungsgruppe',
   bin                            => 'bin',
   business                       => 'business',
+  business_models                => 'business_model',
   chart                          => 'chart',
   contact_departments            => 'contact_department',
   contact_titles                 => 'contact_title',
@@ -138,15 +138,19 @@ my %kivitendo_package_names = (
   drafts                         => 'draft',
   dunning                        => 'dunning',
   dunning_config                 => 'dunning_config',
+  email_imports                  => 'EmailImport',
   email_journal                  => 'EmailJournal',
   email_journal_attachments      => 'EmailJournalAttachment',
   employee                       => 'employee',
   employee_project_invoices      => 'EmployeeProjectInvoices',
   exchangerate                   => 'exchangerate',
   files                          => 'file',
+  file_versions                  => 'file_version',
   file_full_texts                => 'file_full_text',
   finanzamt                      => 'finanzamt',
   follow_up_access               => 'follow_up_access',
+  follow_up_created_for_employees => 'follow_up_created_for_employee',
+  follow_up_done                 => 'follow_up_done',
   follow_up_links                => 'follow_up_link',
   follow_ups                     => 'follow_up',
   generic_translations           => 'generic_translation',
@@ -161,8 +165,10 @@ my %kivitendo_package_names = (
   makemodel                      => 'make_model',
   mebil_mapping                  => 'mebil_mapping',
   notes                          => 'note',
+  order_statuses                 => 'order_status',
   orderitems                     => 'order_item',
   oe                             => 'order',
+  oe_version                     => 'order_version',
   parts                          => 'part',
   partsgroup                     => 'parts_group',
   part_classifications           => 'PartClassification',
@@ -184,6 +190,10 @@ my %kivitendo_package_names = (
   project_roles                  => 'project_role',
   project_statuses               => 'project_status',
   project_types                  => 'project_type',
+  purchase_basket_items          => 'purchase_basket_item',
+  reclamations                   => 'Reclamation',
+  reclamation_items              => 'ReclamationItem',
+  reclamation_reasons            => 'ReclamationReason',
   reconciliation_links           => 'reconciliation_link',
   record_links                   => 'record_link',
   record_templates               => 'record_template',
@@ -227,6 +237,7 @@ my %kivitendo_package_names = (
   units                          => 'unit',
   units_language                 => 'units_language',
   user_preferences               => 'user_preference',
+  validity_tokens                => 'ValidityToken',
   vendor                         => 'vendor',
   warehouse                      => 'warehouse',
 );
diff --git a/SL/DB/Helper/Payment.pm b/SL/DB/Helper/Payment.pm
index 6d624fa19..f5a190ced 100644
--- a/SL/DB/Helper/Payment.pm
+++ b/SL/DB/Helper/Payment.pm
@@ -4,7 +4,7 @@ use strict;
 
 use parent qw(Exporter);
 our @EXPORT = qw(pay_invoice);
-our @EXPORT_OK = qw(skonto_date amount_less_skonto within_skonto_period percent_skonto reference_account reference_amount open_amount open_percent remaining_skonto_days skonto_amount check_skonto_configuration valid_skonto_amount get_payment_suggestions validate_payment_type open_sepa_transfer_amount get_payment_select_options_for_bank_transaction exchangerate forex _skonto_charts_and_tax_correction);
+our @EXPORT_OK = qw(skonto_date amount_less_skonto within_skonto_period percent_skonto reference_account open_amount skonto_amount valid_skonto_amount validate_payment_type get_payment_select_options_for_bank_transaction forex _skonto_charts_and_tax_correction get_exchangerate_for_bank_transaction get_exchangerate _add_bank_fx_fees open_amount_fx open_amount_less_skonto);
 our %EXPORT_TAGS = (
   "ALL" => [@EXPORT, @EXPORT_OK],
 );
@@ -15,6 +15,7 @@ use Carp;
 use Data::Dumper;
 use DateTime;
 use List::Util qw(sum);
+use Params::Validate qw(:all);
 
 use SL::DATEV qw(:CONSTANTS);
 use SL::DB::Exchangerate;
@@ -28,7 +29,7 @@ use SL::Locale::String qw(t8);
 
 sub pay_invoice {
   my ($self, %params) = @_;
-
+  # todo named params
   require SL::DB::Tax;
 
   my $is_sales = ref($self) eq 'SL::DB::Invoice';
@@ -65,11 +66,12 @@ sub pay_invoice {
     # amount, but if amount is passed, make sure it matches the expected value
     # note: the parameter isn't used at all - amount_less_skonto will always be used
     # partial skonto payments are therefore impossible to book
-    croak "amount $params{amount} doesn't match amount less skonto: " . $self->amount_less_skonto . "\n" if $params{amount} && abs($self->amount_less_skonto - $params{amount} ) > 0.0000001;
-    croak "payment type with_skonto_pt can't be used if payments have already been made" if $self->paid != 0;
+    croak "amount $params{amount} doesn't match open amount less skonto: "
+          . $self->open_amount_less_skonto . "\n" if $params{amount}
+                                                  && abs($self->open_amount_less_skonto - $params{amount} ) > 0.0000001;
+    # croak "payment type with_skonto_pt can't be used if payments have already been made" if $self->paid != 0;
   }
 
-
   my $transdate_obj;
   if (ref($params{transdate}) eq 'DateTime') {
     $transdate_obj = $params{transdate};
@@ -89,31 +91,39 @@ sub pay_invoice {
     croak t8('Cannot post transaction above the maximum future booking date!') if $transdate_obj > DateTime->now->add( days => $::instance_conf->get_max_future_booking_interval );
   };
 
-  # currency is either passed or use the invoice currency if it differs from the default currency
-  # TODO remove
-  my ($exchangerate,$currency);
-  if ($params{currency} || $params{currency_id}) {
-    if ($params{currency} || $params{currency_id} ) { # currency was specified
-      $currency = SL::DB::Manager::Currency->find_by(name => $params{currency}) || SL::DB::Manager::Currency->find_by(id => $params{currency_id});
-    } else { # use invoice currency
-      $currency = SL::DB::Manager::Currency->find_by(id => $self->currency_id);
-    };
-    die "no currency" unless $currency;
-    if ($currency->id == $::instance_conf->get_currency_id) {
-      $exchangerate = 1;
-    } else {
-      my $rate = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency->id,
-                                                        transdate   => $transdate_obj,
-                                                       );
-      if ($rate) {
-        $exchangerate = $is_sales ? $rate->buy : $rate->sell;
-      } else {
-        die "No exchange rate for " . $transdate_obj->to_kivitendo;
-      };
-    };
-  } else { # no currency param given or currency is the same as default_currency
+  # currency has to be passed and caller has to be sure to assign it for a forex invoice
+  # dies if called for a invoice with the default currency (TODO: Params::Validate before)
+  my ($exchangerate, $currency);
+  my $fx_gain_loss_amount    = 0;
+  my $return_bank_amount     = 0;
+  if ($params{currency} || $params{currency_id} && $self->forex) { # currency was specified
+    $currency = SL::DB::Manager::Currency->find_by(name => $params{currency}) || SL::DB::Manager::Currency->find_by(id => $params{currency_id});
+
+    die "No currency found" unless ref $currency eq 'SL::DB::Currency';
+    die "No exchange rate" unless $params{exchangerate} > 0;
+
+    $exchangerate = $params{exchangerate};
+
+    my $new_open_amount = ( $self->open_amount / $self->get_exchangerate ) * $exchangerate;
+    # caller wants to book fees and set a fee amount
+    if ($params{fx_book} && $params{fx_fee_amount} > 0) {
+      die "Bank Fees can only be added for AP transactions or Sales Credit Notes"
+        unless $self->invoice_type =~ m/^purchase_invoice$|^ap_transaction$|^credit_note$/;
+
+      $self->_add_bank_fx_fees(fee           => _round($params{fx_fee_amount}),
+                               bt_id         => $params{bt_id},
+                               bank_chart_id => $params{chart_id},
+                               memo          => $params{memo},
+                               source        => $params{source},
+                               transdate_obj => $transdate_obj  );
+      # invoice_amount add gl booking
+      $return_bank_amount += _round($params{fx_fee_amount}); # invoice_type needs negative bank_amount
+    }
+  } elsif (!$self->forex) { # invoices uses default currency. no exchangerate
     $exchangerate = 1;
-  };
+  } else {
+    die "Cannot calculate exchange rate, if invoices uses the default currency";
+  }
 
   # absolute skonto amount for invoice, use as reference sum to see if the
   # calculated skontos add up
@@ -133,8 +143,6 @@ sub pay_invoice {
   my $source = $params{source} // '';
 
   my $rounded_params_amount = _round( $params{amount} ); # / $exchangerate);
-  my $fx_gain_loss_amount = 0; # for fx_gain and fx_loss
-
   my $db = $self->db;
   $db->with_transaction(sub {
     my $new_acc_trans;
@@ -151,15 +159,15 @@ sub pay_invoice {
       # stage because we don't use $params{amount} ?!
 
       my $pay_amount = $rounded_params_amount;
-      $pay_amount = $self->amount_less_skonto if $params{payment_type} eq 'with_skonto_pt';
+      $pay_amount = $self->open_amount_less_skonto if $params{payment_type} eq 'with_skonto_pt';
 
       # bank account and AR/AP
-      $paid_amount += $pay_amount * $exchangerate;
+      $paid_amount += $pay_amount;
 
       my $amount = (-1 * $pay_amount) * $mult;
 
-
       # total amount against bank, do we already know this by now?
+      # Yes, method requires this
       $new_acc_trans = SL::DB::AccTransaction->new(trans_id   => $self->id,
                                                    chart_id   => $account_bank->id,
                                                    chart_link => $account_bank->link,
@@ -171,46 +179,46 @@ sub pay_invoice {
                                                    taxkey     => 0,
                                                    tax_id     => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
       $new_acc_trans->save;
-
+      $return_bank_amount += $amount;
       push @new_acc_ids, $new_acc_trans->acc_trans_id;
-      # deal with fxtransaction
-      if ( $self->currency_id != $::instance_conf->get_currency_id ) {
-        my $fxamount = _round($amount - ($amount * $exchangerate));
+      # deal with fxtransaction ...
+      # if invoice exchangerate differs from exchangerate of payment
+      # add fxloss or fxgain
+      if ($exchangerate != 1 && $self->get_exchangerate and $self->get_exchangerate != 1 and $self->get_exchangerate != $exchangerate) {
+        my $fxgain_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxgain_accno_id) || die "Can't determine fxgain chart";
+        my $fxloss_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id) || die "Can't determine fxloss chart";
+        #
+        # AMOUNT == EUR / fx rate payment * (fx rate invoice - fx rate payment)
+        # AR.pm
+        # $amount = $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - $form->{"exchangerate_$i"}) * -1, 2);
+        # AP.pm
+        # exchangerate gain/loss
+        # $amount = $form->round_amount($form->{"paid_$i"} * ($form->{exchangerate} - $form->{"exchangerate_$i"}), 2);
+        # =>
+        my $fx_gain_loss_sign = $is_sales ? -1 : 1;  # multiplier for getting the right sign depending on ar/ap
+
+        $fx_gain_loss_amount  = _round($params{amount} / $exchangerate * ( $self->get_exchangerate - $exchangerate)) * $fx_gain_loss_sign;
+
+        my $gain_loss_chart  = $fx_gain_loss_amount > 0 ? $fxgain_chart : $fxloss_chart;
+        # for sales    add loss to ar.paid and subtract gain from ar.paid
+        $paid_amount += abs($fx_gain_loss_amount) if $fx_gain_loss_amount < 0 && $self->is_sales;   # extract if we have fx_loss
+        $paid_amount -= abs($fx_gain_loss_amount) if $fx_gain_loss_amount > 0 && $self->is_sales;   # but add if to match original invoice amount (arap)
+        # for purchase add gain to ap.paid and subtract loss from ap.paid
+        $paid_amount += abs($fx_gain_loss_amount) if $fx_gain_loss_amount > 0 && !$self->is_sales; # but add if to match original invoice amount (arap)
+        $paid_amount -= abs($fx_gain_loss_amount) if $fx_gain_loss_amount < 0 && !$self->is_sales; # extract if we have fx_loss
+
         $new_acc_trans = SL::DB::AccTransaction->new(trans_id       => $self->id,
-                                                     chart_id       => $account_bank->id,
-                                                     chart_link     => $account_bank->link,
-                                                     amount         => $fxamount * -1,
+                                                     chart_id       => $gain_loss_chart->id,
+                                                     chart_link     => $gain_loss_chart->link,
+                                                     amount         => $fx_gain_loss_amount,
                                                      transdate      => $transdate_obj,
                                                      source         => $source,
                                                      memo           => $memo,
                                                      taxkey         => 0,
-                                                     fx_transaction => 1,
+                                                     fx_transaction => 0, # probably indicates a real bank account in foreign currency
                                                      tax_id         => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
         $new_acc_trans->save;
         push @new_acc_ids, $new_acc_trans->acc_trans_id;
-        # if invoice exchangerate differs from exchangerate of payment
-        # deal with fxloss and fxamount
-        if ($self->exchangerate and $self->exchangerate != 1 and $self->exchangerate != $exchangerate) {
-          my $fxgain_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxgain_accno_id) || die "Can't determine fxgain chart";
-          my $fxloss_chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id) || die "Can't determine fxloss chart";
-          my $gain_loss_amount = _round($amount * ($exchangerate - $self->exchangerate ) * -1,2);
-          my $gain_loss_chart = $gain_loss_amount > 0 ? $fxgain_chart : $fxloss_chart;
-          $fx_gain_loss_amount = $gain_loss_amount;
-
-          $new_acc_trans = SL::DB::AccTransaction->new(trans_id       => $self->id,
-                                                       chart_id       => $gain_loss_chart->id,
-                                                       chart_link     => $gain_loss_chart->link,
-                                                       amount         => $gain_loss_amount,
-                                                       transdate      => $transdate_obj,
-                                                       source         => $source,
-                                                       memo           => $memo,
-                                                       taxkey         => 0,
-                                                       fx_transaction => 0,
-                                                       tax_id         => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
-          $new_acc_trans->save;
-          push @new_acc_ids, $new_acc_trans->acc_trans_id;
-
-        }
       }
     }
     # skonto cases
@@ -246,7 +254,7 @@ sub pay_invoice {
         push @new_acc_ids, $new_acc_trans->acc_trans_id;
 
         $reference_amount -= abs($amount);
-        $paid_amount      += -1 * $amount * $exchangerate;
+        $paid_amount      += -1 * $amount;
         $skonto_amount_check -= $skonto_booking->{'skonto_amount'};
       }
     }
@@ -266,11 +274,11 @@ sub pay_invoice {
     }
 
     # regardless of payment_type there is always only exactly one arap booking
-    # TODO: compare $arap_amount to running total
+    # TODO: compare $arap_amount to running total and/or use this as running total for ar.paid|ap.paid
     my $arap_booking= SL::DB::AccTransaction->new(trans_id   => $self->id,
                                                   chart_id   => $reference_account->id,
                                                   chart_link => $reference_account->link,
-                                                  amount     => _round($arap_amount * $mult * $exchangerate - $fx_gain_loss_amount),
+                                                  amount     => _round($arap_amount * $mult - $fx_gain_loss_amount),
                                                   transdate  => $transdate_obj,
                                                   source     => '', #$params{source},
                                                   taxkey     => 0,
@@ -278,12 +286,17 @@ sub pay_invoice {
     $arap_booking->save;
     push @new_acc_ids, $arap_booking->acc_trans_id;
 
+    $self->paid($self->paid + _round($paid_amount)) if $paid_amount;
+    $self->datepaid($transdate_obj);
+    $self->save;
+
     # hook for invoice_for_advance_payment DATEV always pairs, acc_trans_id has to be higher than arap_booking ;-)
     if ($self->invoice_type eq 'invoice_for_advance_payment') {
       my $clearing_chart = SL::DB::Chart->new(id => $::instance_conf->get_advance_payment_clearing_chart_id)->load;
       die "No Clearing Chart for Advance Payment" unless ref $clearing_chart eq 'SL::DB::Chart';
 
       # what does ptc say
+      # DONT SAVE $self sellprice, fxsellprice trouble: redmine #352
       my %inv_calc = $self->calculate_prices_and_taxes();
       my @trans_ids = keys %{ $inv_calc{amounts} };
       die "Invalid state for advance payment more than one trans_id" if (scalar @trans_ids > 1);
@@ -339,11 +352,6 @@ sub pay_invoice {
         push @new_acc_ids, $tax_booking->acc_trans_id;
       }
     }
-    $fx_gain_loss_amount *= -1 if $self->is_sales;
-    $self->paid($self->paid + _round($paid_amount) + $fx_gain_loss_amount) if $paid_amount;
-    $self->datepaid($transdate_obj);
-    $self->save;
-
     # make sure transactions will be reloaded the next time $self->transactions
     # is called, as pay_invoice saves the acc_trans objects individually rather
     # than adding them to the transaction relation array.
@@ -380,17 +388,20 @@ sub pay_invoice {
     1;
 
   }) || die t8('error while paying invoice #1 : ', $self->invnumber) . $db->error . "\n";
-  return wantarray ? @new_acc_ids : 1;
+
+  $return_bank_amount *= -1;   # negative booking is positive bank transaction
+                               # positive booking is negative bank transaction
+  return wantarray ? ( { return_bank_amount => $return_bank_amount }, @new_acc_ids) : 1;
 }
 
 sub skonto_date {
-
   my $self = shift;
 
-  return undef unless ref $self->payment_terms;
+  return undef unless ref $self->payment_terms eq 'SL::DB::PaymentTerm';
   return undef unless $self->payment_terms->terms_skonto > 0;
+
   return DateTime->from_object(object => $self->transdate)->add(days => $self->payment_terms->terms_skonto);
-};
+}
 
 sub reference_account {
   my $self = shift;
@@ -402,37 +413,24 @@ sub reference_account {
   my $link_filter = $is_sales ? 'AR' : 'AP';
 
   my $acc_trans = SL::DB::Manager::AccTransaction->find_by(
-     trans_id   => $self->id,
+     'trans_id'    => $self->id,
+     '!chart_id'   => $::instance_conf->get_advance_payment_clearing_chart_id,
      SL::DB::Manager::AccTransaction->chart_link_filter("$link_filter")
   );
 
-  return undef unless ref $acc_trans;
-
-  my $reference_account = SL::DB::Manager::Chart->find_by(id => $acc_trans->chart_id);
-
-  return $reference_account;
-};
-
-sub reference_amount {
-  my $self = shift;
-
-  my $is_sales = ref($self) eq 'SL::DB::Invoice';
-
-  require SL::DB::Manager::AccTransaction;
-
-  my $link_filter = $is_sales ? 'AR' : 'AP';
-
-  my $acc_trans = SL::DB::Manager::AccTransaction->find_by(
-     trans_id   => $self->id,
-     SL::DB::Manager::AccTransaction->chart_link_filter("$link_filter")
-  );
+  my $id;
 
-  return undef unless ref $acc_trans;
+  if (! $acc_trans) {
+    $id = $is_sales ? $::instance_conf->get_ar_chart_id : $::instance_conf->get_ap_chart_id;
+    return undef unless $id;
+  } else {
+    $id = $acc_trans->chart_id;
+  }
 
-  # this should be the same as $self->amount
-  return $acc_trans->amount;
-};
+  my $reference_account = SL::DB::Manager::Chart->find_by(id => $id);
 
+  return $reference_account;
+}
 
 sub open_amount {
   my $self = shift;
@@ -443,38 +441,45 @@ sub open_amount {
   # numerically, so round this value when checking for cent threshold >= 0.01
 
   return ($self->amount // 0) - ($self->paid // 0);
-};
+}
 
-sub open_percent {
-  my $self = shift;
+sub open_amount_fx {
+  validate_pos(
+    @_,
+      {  can       => [ qw(forex get_exchangerate open_amount) ],
+         callbacks => { 'has forex'        => sub { return $_[0]->forex },
+                        'has exchangerate' => sub { return $_[0]->get_exchangerate > 0 } } },
+      {  callbacks => {
+           'is a positive real'          => sub { return $_[0] =~ m/^[+]?\d+(\.\d+)?$/ }, },
+      }
+  );
 
-  return 0 if $self->amount == 0;
-  my $open_percent;
-  if ( $self->open_amount < 0 ) {
-    # overpaid, currently treated identically
-    $open_percent = $self->open_amount * 100 / $self->amount;
-  } else {
-    $open_percent = $self->open_amount * 100 / $self->amount;
-  };
+  my ($self, $fx_rate) = @_;
 
-  return _round($open_percent) || 0;
-};
+  return ( $self->open_amount / $self->get_exchangerate ) * $fx_rate;
 
-sub skonto_amount {
-  my $self = shift;
+}
 
-  return $self->amount - $self->amount_less_skonto;
-};
+sub amount_less_skonto_fx {
+  validate_pos(
+    @_,
+      {  can       => [ qw(forex get_exchangerate percent_skonto) ],
+         callbacks => { 'has forex'      => sub { return $_[0]->forex } } },
+      {  callbacks => {
+           'is a positive real'          => sub { return $_[0] =~ m/^[+]?\d+(\.\d+)?$/ }, },
+      }
+  );
 
-sub remaining_skonto_days {
-  my $self = shift;
+  my ($self, $fx_rate) = @_;
 
-  return undef unless ref $self->skonto_date;
+  return ( $self->amount_less_skonto / $self->get_exchangerate ) * $fx_rate;
+}
 
-  my $dur = DateTime::Duration->new($self->skonto_date - DateTime->today);
-  return $dur->delta_days();
+sub skonto_amount {
+  my $self = shift;
 
-};
+  return $self->amount - $self->amount_less_skonto;
+}
 
 sub percent_skonto {
   my $self = shift;
@@ -486,7 +491,7 @@ sub percent_skonto {
   $percent_skonto = $self->payment_terms->percent_skonto;
 
   return $percent_skonto;
-};
+}
 
 sub amount_less_skonto {
   # amount that has to be paid if skonto applies, always return positive rounded values
@@ -499,60 +504,89 @@ sub amount_less_skonto {
 
   return _round($self->amount - ( $self->amount * $percent_skonto) );
 
-};
-
-sub check_skonto_configuration {
+}
+sub open_amount_less_skonto {
+  # amount that has to be paid if skonto applies, always return positive rounded values
+  # no, rare case, but credit_notes and negative ap have negative amounts
+  # and therefore this comment may be misguiding
+  # the result is rounded so we can directly compare it with the user input
   my $self = shift;
 
-  my $is_sales = ref($self) eq 'SL::DB::Invoice';
-
-  my $skonto_configured = 1; # default is assume skonto works
-
-  # my $transactions = $self->transactions;
-  foreach my $transaction (@{ $self->transactions }) {
-    # find all transactions with an AR_amount or AP_amount link
-    my $tax = SL::DB::Manager::Tax->get_first( where => [taxkey => $transaction->taxkey, id => $transaction->tax_id ]);
-
-    # acc_trans entries for the taxes (chart_link == A[RP]_tax) often
-    # have combinations of taxkey & tax_id that don't exist in
-    # tax. Those must be skipped.
-    next if !$tax && ($transaction->chart_link !~ m{A[RP]_amount});
-
-    croak "no tax for taxkey " . $transaction->{taxkey} unless ref $tax;
-
-    $transaction->{chartlinks} = { map { $_ => 1 } split(m/:/, $transaction->chart_link) };
-    if ( $is_sales && $transaction->{chartlinks}->{AR_amount} ) {
-      $skonto_configured = 0 unless $tax->skonto_sales_chart_id;
-    } elsif ( !$is_sales && $transaction->{chartlinks}->{AP_amount}) {
-      $skonto_configured = 0 unless $tax->skonto_purchase_chart_id;
-    };
-  };
+  my $percent_skonto = $self->percent_skonto || 0;
 
-  return $skonto_configured;
-};
+  my $open_amount = ($self->amount // 0) - ($self->paid // 0);
+  return _round($open_amount - ( $self->amount * $percent_skonto) );
 
-sub open_sepa_transfer_amount {
-  my $self = shift;
+}
+sub _add_bank_fx_fees {
+  my ($self, %params)   = @_;
+  my $amount = $params{fee};
 
-  my ($vc, $key, $type);
-  if ( ref($self) eq 'SL::DB::Invoice' ) {
-    $vc   = 'customer';
-    $key  = 'ap_id';
-    $type = 'ar';
-  } else {
-    $vc   = 'vendor';
-    $key  = 'ap_id';
-    $type = 'ap';
-  };
+  croak "no amount passed for bank fx fees"   unless abs(_round($amount)) >= 0.01;
+  croak "no banktransaction.id passed"        unless $params{bt_id};
+  croak "no bank chart id passed"             unless $params{bank_chart_id};
+  croak "no banktransaction.transdate passed" unless ref $params{transdate_obj} eq 'DateTime';
 
-  my $sql = qq|SELECT SUM(sei.amount) AS amount FROM sepa_export_items sei | .
-            qq| LEFT JOIN sepa_export se ON (sei.sepa_export_id = se.id)   | .
-            qq| WHERE $key = ? AND NOT se.closed AND (se.vc = '$vc')       |;
+  $params{memo}   //= '';
+  $params{source} //= '';
 
-  my ($open_sepa_amount) = $self->db->dbh->selectrow_array($sql, undef, $self->id);
+  my ($credit, $debit);
+  $credit = SL::DB::Chart->load_cached($params{bank_chart_id});
+  $debit  = SL::DB::Manager::Chart->find_by(description => 'Nebenkosten des Geldverkehrs');
+  croak("No such Chart ID")  unless ref $credit eq 'SL::DB::Chart' && ref $debit eq 'SL::DB::Chart';
+  my $notes = SL::HTML::Util->strip($self->notes);
 
-  return $open_sepa_amount || 0;
+  my $current_transaction = SL::DB::GLTransaction->new(
+         employee_id    => $self->employee_id,
+         transdate      => $params{transdate_obj},
+         notes          => $params{source} . ' ' . $params{memo},
+         description    => $notes || $self->invnumber,
+         reference      => t8('Automatic Foreign Exchange Bank Fees') . " "  . $self->invnumber,
+         department_id  => $self->department_id ? $self->department_id : undef,
+         imported       => 0, # not imported
+         taxincluded    => 0,
+    )->add_chart_booking(
+         chart  => $debit,
+         debit  => abs($amount),
+         source => t8('Automatic Foreign Exchange Bank Fees') . " "  . $self->invnumber,
+         memo   => $params{memo},
+         tax_id => 0,
+    )->add_chart_booking(
+         chart  => $credit,
+         credit => abs($amount),
+         source => t8('Automatic Foreign Exchange Bank Fees') . " "  . $self->invnumber,
+         memo   => $params{memo},
+         tax_id => 0,
+    )->post;
 
+    # add a stable link acc_trans_id to bank_transactions.id
+    foreach my $transaction (@{ $current_transaction->transactions }) {
+      my %props_acc = (
+           acc_trans_id        => $transaction->acc_trans_id,
+           bank_transaction_id => $params{bt_id},
+           gl                  => $current_transaction->id,
+      );
+      SL::DB::BankTransactionAccTrans->new(%props_acc)->save;
+    }
+    # Record a record link from banktransactions to gl
+    my %props_rl = (
+         from_table => 'bank_transactions',
+         from_id    => $params{bt_id},
+         to_table   => 'gl',
+         to_id      => $current_transaction->id,
+    );
+    SL::DB::RecordLink->new(%props_rl)->save;
+    # Record a record link from ap to gl
+    # linked gl booking will appear in tab linked records
+    # this is just a link for convenience
+    %props_rl = (
+         from_table => $self->is_sales ? 'ar' : 'ap', # yep sales credit notes
+         #from_table => 'ap',
+         from_id    => $self->id,
+         to_table   => 'gl',
+         to_id      => $current_transaction->id,
+    );
+    SL::DB::RecordLink->new(%props_rl)->save;
 }
 
 sub _skonto_charts_and_tax_correction {
@@ -571,6 +605,7 @@ sub _skonto_charts_and_tax_correction {
   my (@skonto_charts, $inv_calc, $total_skonto_rounded);
 
   $inv_calc = $self->get_tax_and_amount_by_tax_chart_id();
+  die t8('Cannot calculate Amount and Tax for this booking correctly, please check chart settings') unless $inv_calc;
 
   # foreach tax.chart_id || $entry->{ta..id}
   while (my ($tax_chart_id, $entry) = each %{ $inv_calc } ) {
@@ -590,10 +625,12 @@ sub _skonto_charts_and_tax_correction {
     my $skonto_netamount_rounded   = _round($skonto_netamount_unrounded);
     my $chart_id                   = $is_sales ? $tax->skonto_sales_chart->id : $tax->skonto_purchase_chart->id;
 
+    my $credit_note_multiplier = $self->is_credit_note ? -1 : 1;
     # entry net + tax for caller
     my $rec_net = {
       chart_id               => $chart_id,
-      skonto_amount          => _round($skonto_netamount_unrounded + $skonto_taxamount_unrounded),
+      skonto_amount          => _round($skonto_netamount_unrounded + $skonto_taxamount_unrounded)
+                                * $credit_note_multiplier,
     };
     push @skonto_charts, $rec_net;
     $total_skonto_rounded += $rec_net->{skonto_amount};
@@ -609,6 +646,12 @@ sub _skonto_charts_and_tax_correction {
     croak("No such Chart ID")  unless ref $credit eq 'SL::DB::Chart' && ref $debit eq 'SL::DB::Chart';
     my $notes = SL::HTML::Util->strip($self->notes);
 
+    my $debit_state = ( $is_sales && !$self->is_credit_note)        ? 1
+                    : (!$is_sales && !$self->is_credit_note)        ? 0
+                    : $self->invoice_type eq 'purchase_credit_note' ? 1
+                    : $self->invoice_type eq 'credit_note'          ? 0
+                    : die "invalid type state";
+
     my $current_transaction = SL::DB::GLTransaction->new(
          employee_id    => $self->employee_id,
          transdate      => $params{transdate_obj},
@@ -619,13 +662,13 @@ sub _skonto_charts_and_tax_correction {
          imported       => 0, # not imported
          taxincluded    => 0,
       )->add_chart_booking(
-         chart  => $is_sales ? $debit : $credit,
+         chart  => $debit_state ? $debit : $credit,
          debit  => abs($skonto_taxamount_rounded),
          source => t8('Skonto Tax Correction for') . " " . $self->invnumber,
          memo   => $params{memo},
          tax_id => 0,
       )->add_chart_booking(
-         chart  => $is_sales ? $credit : $debit,
+         chart  => $debit_state ? $credit : $debit,
          credit => abs($skonto_taxamount_rounded),
          source => t8('Skonto Tax Correction for') . " " . $self->invnumber,
          memo   => $params{memo},
@@ -680,15 +723,21 @@ sub _skonto_charts_and_tax_correction {
 
 sub within_skonto_period {
   my $self = shift;
-  my $dateref = shift || DateTime->now->truncate( to => 'day' );
-
-  return undef unless ref $dateref eq 'DateTime';
-  return 0 unless $self->skonto_date;
-
+  validate(
+    @_,
+       { transdate => {
+                        isa => 'DateTime',
+                        callbacks => {
+                          'self has a skonto date'  => sub { ref $self->skonto_date eq 'DateTime' },
+                        },
+                      },
+       }
+    );
   # return 1 if requested date (or today) is inside skonto period
   # this will also return 1 if date is before the invoice date
-  return $dateref <= $self->skonto_date;
-};
+  my (%params) = @_;
+  return $params{transdate} <= $self->skonto_date;
+}
 
 sub valid_skonto_amount {
   my $self = shift;
@@ -699,91 +748,63 @@ sub valid_skonto_amount {
 
   # does this work for other currencies?
   return ($self->amount*$max_skonto_percent) > $amount;
-};
+}
 
 sub get_payment_select_options_for_bank_transaction {
-  my ($self, $bt_id, %params) = @_;
-
+  my ($self, $bt_id) = @_;
 
-  # CAVEAT template code expects with_skonto_pt at position 1 for visual help
-  # due to skonto_charts, we cannot offer skonto for credit notes and neg ap
-  my $skontoable = $self->amount > 0 ? 1 : 0;
   my @options;
-  if(!$self->skonto_date) {
+
+  # 1. no sane skonto support for foreign currency yet
+  if ($self->forex) {
     push(@options, { payment_type => 'without_skonto', display => t8('without skonto'), selected => 1 });
-    # wrong call to presenter or not implemented? disabled option is ignored
-    # push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt'), disabled => 1 });
-    push(@options, { payment_type => 'free_skonto', display => t8('free skonto') }) if $skontoable;
     return @options;
   }
-  # valid skonto date, check if skonto is preferred
+  # 2. no skonto available -> done
+  if (!$self->skonto_date) {
+    push(@options, { payment_type => 'without_skonto', display => t8('without skonto'), selected => 1 });
+    push(@options, { payment_type => 'free_skonto', display => t8('free skonto') });
+    return @options;
+  }
+
+  # 2. valid skonto date, check if date is within skonto period
+  # CAVEAT template code expects with_skonto_pt at position 1 for visual help
+  # [% is_skonto_pt   = SELECT_OPTIONS.1.selected %]
+
   my $bt = SL::DB::BankTransaction->new(id => $bt_id)->load;
-  if ($self->skonto_date && $self->within_skonto_period($bt->transdate)) {
+  croak "No Bank Transaction with ID $bt_id found" unless ref $bt eq 'SL::DB::BankTransaction';
+
+  if (ref $self->skonto_date eq 'DateTime' &&  $self->within_skonto_period(transdate => $bt->transdate)) {
     push(@options, { payment_type => 'without_skonto', display => t8('without skonto') });
-    push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt'), selected => 1 }) if $skontoable;
+    push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt'), selected => 1 });
+    push(@options, { payment_type => 'with_fuzzy_skonto_pt', display => t8('with fuzzy skonto acc. to pt')});
   } else {
     push(@options, { payment_type => 'without_skonto', display => t8('without skonto') , selected => 1 });
-    push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt')}) if $skontoable;
+    push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt')});
+    push(@options, { payment_type => 'with_fuzzy_skonto_pt', display => t8('with fuzzy skonto acc. to pt')});
   }
-  push(@options, { payment_type => 'free_skonto', display => t8('free skonto') }) if $skontoable;
+  push(@options, { payment_type => 'free_skonto', display => t8('free skonto') });
   return @options;
 }
 
-sub exchangerate {
+sub get_exchangerate {
   my ($self) = @_;
 
   return 1 if $self->currency_id == $::instance_conf->get_currency_id;
 
+  # return record exchange rate if set
+  return $self->exchangerate if $self->exchangerate && $self->exchangerate > 0;
+
+  # none defined check daily exchangerate at records transdate
   die "transdate isn't a DateTime object:" . ref($self->transdate) unless ref($self->transdate) eq 'DateTime';
+
   my $rate = SL::DB::Manager::Exchangerate->find_by(currency_id => $self->currency_id,
                                                     transdate   => $self->transdate,
                                                    );
   return undef unless $rate;
 
   return $self->is_sales ? $rate->buy : $rate->sell; # also undef if not defined
-};
-
-sub get_payment_suggestions {
-
-  my ($self, %params) = @_;
-
-  my $open_amount = $self->open_amount;
-  $open_amount   -= $self->open_sepa_transfer_amount if $params{sepa};
-
-  $self->{invoice_amount_suggestion} = $open_amount;
-  undef $self->{payment_select_options};
-  push(@{$self->{payment_select_options}} , { payment_type => 'without_skonto',  display => t8('without skonto') });
-  if ( $self->within_skonto_period ) {
-    # If there have been no payments yet suggest amount_less_skonto, otherwise the open amount
-    if ( $open_amount &&                   # invoice amount not 0
-         $open_amount == $self->amount &&  # no payments yet, or sum of payments and sepa export amounts is zero
-         $self->check_skonto_configuration) {
-      $self->{invoice_amount_suggestion} = $self->amount_less_skonto;
-      push(@{$self->{payment_select_options}} , { payment_type => 'with_skonto_pt',  display => t8('with skonto acc. to pt') , selected => 1 });
-    } else {
-      if ( ( $self->valid_skonto_amount($self->open_amount) || $self->valid_skonto_amount($open_amount) ) and not $params{sepa} ) {
-        # Will never be reached
-        die "This case is as dead as the dead cat. Go to start, don't pick 2,000 \$";
-        $self->{invoice_amount_suggestion} = $open_amount;
-        # only suggest difference_as_skonto if open_amount exactly matches skonto_amount
-        # AND we aren't in SEPA mode
-        my $selected = 0;
-        $selected = 1 if _round($open_amount) == _round($self->skonto_amount);
-        push(@{$self->{payment_select_options}} , { payment_type => 'difference_as_skonto',  display => t8('difference as skonto') , selected => $selected });
-      };
-    };
-  } else {
-    # invoice was configured with skonto, but skonto date has passed, or no skonto available
-    $self->{invoice_amount_suggestion} = $open_amount;
-    # difference_as_skonto doesn't make any sense for SEPA transfer, as this doesn't cause any actual payment
-    if ( $self->valid_skonto_amount($self->open_amount) && not $params{sepa} ) {
-      # probably also dead code
-      die "This case is as dead as the dead cat. Go to start, don't pick 2,000 \$";
-      push(@{$self->{payment_select_options}} , { payment_type => 'difference_as_skonto',  display => t8('difference as skonto') , selected => 0 });
-    };
-  };
-  return 1;
-};
+}
 
 # locales for payment type
 #
@@ -803,7 +824,31 @@ sub validate_payment_type {
 sub forex {
   my ($self) = @_;
   $self->currency_id == $::instance_conf->get_currency_id ? return 0 : return 1;
-};
+}
+
+sub get_exchangerate_for_bank_transaction {
+  validate_pos(
+    @_,
+      {  can       => [ qw(forex is_sales) ],
+         callbacks => { 'has forex'      => sub { return $_[0]->forex } } },
+      {  callbacks => {
+           'is an integer'               => sub { return $_[0] =~ /^[1-9][0-9]*$/                                              },
+           'is a valid bank transaction' => sub { ref SL::DB::BankTransaction->load_cached($_[0]) eq 'SL::DB::BankTransaction' },
+           'has a valid valuta date'     => sub { ref SL::DB::BankTransaction->load_cached($_[0])->valutadate eq 'DateTime'    },
+         },
+      }
+  );
+
+  my ($self, $bt_id) = @_;
+
+  my $bt   = SL::DB::BankTransaction->load_cached($bt_id);
+  my $rate = SL::DB::Manager::Exchangerate->find_by(currency_id => $self->currency_id,
+                                                    transdate   => $bt->valutadate,
+                                                   );
+  return undef unless $rate;
+
+  return $self->is_sales ? $rate->buy : $rate->sell; # also undef if not defined
+}
 
 sub _round {
   my $value = shift;
@@ -856,6 +901,12 @@ Transdate can either be a date object or a date string.
 Chart_id is the id of the payment booking chart.
 Amount is either a positive or negative number, and for the case 'free_skonto' might be zero.
 
+If the parameters currency and exchangerate exists the method will determine gain and
+loss rates for exchangerates.
+
+If the parameters fx_book is true and fx_fee_amount exists as number the method will book the costs of
+foreign exchanges with a link GL Record.
+
 CAVEAT! The helper tries to get the sign right and all calls from BankTransaction are
 positive (abs($value)) values.
 
@@ -886,6 +937,7 @@ or in a certain currency:
   $ap->pay_invoice(chart_id      => $bank->chart_id,
                    amount        => 500,
                    currency      => 'USD',
+                   exchangerate  => 0.9820,
                    transdate     => DateTime->now->to_kivitendo,
                    memo          => 'foobar',
                    source        => 'barfoo',
@@ -961,6 +1013,15 @@ the configured percentage (e.g. 2%) from the total amount.
 
 The returned value is rounded to two decimals.
 
+=item C<open_amount_less_skonto>
+
+The same as amount_less_skonto but calculates skonto against the current
+open amount, i.e. some amount of the invoice is reduced because of a linked
+credit note.
+
+The returned value is rounded to two decimals.
+
+
 =item C<skonto_date>
 
 The date up to which skonto may be taken. This is calculated from the invoice
@@ -970,15 +1031,26 @@ This method can also be used to determine whether skonto applies for the
 invoice, as it returns undef if there is no payment term or skonto days is set
 to 0.
 
-=item C<within_skonto_period [DATE]>
+=item C<within_skonto_period [transdate =E<gt> DateTime]>
 
-Returns 0 or 1.
+Returns 1 if skonto_date is in a skontoable period otherwise undef.
 
-Checks whether the invoice has payment terms configured, and whether the date
-is within the skonto max date. If no date is passed the current date is used.
 
-You can also pass a dateref object as a parameter to check whether skonto
-applies for that date rather than the current date.
+Expects transdate to be set and to be a DateTime object.
+Expects calling object to be a Invoice object with a skonto_date set.
+
+Throws a error if any of the two mandantory conditions are not met.
+
+If the conditions are met the routine simply checks if the param transdate
+is within the max allowed date of the invoices skonto date.
+
+Example usage:
+
+ my $inv = SL::DB::Invoice->new;
+ my $bt  = SL::DB::BankTransaction->new;
+
+ my $payment_date_is_skontoable =
+   (ref $inv->skonto_date eq 'DateTime' && $inv->within_skonto_period(transdate => $bt->transdate));
 
 =item C<valid_skonto_amount>
 
@@ -1037,19 +1109,6 @@ C<_skonto_charts_and_tax_correction> generates one entry for each tax type entry
 Unrounded total open amount of invoice (amount - paid).
 Doesn't take into account pending SEPA transfers.
 
-=item C<open_percent>
-
-Percentage of the invoice that is still unpaid, e.g. 100,00 if no payments have
-been made yet, 0,00 if fully paid.
-
-=item C<remaining_skonto_days>
-
-How many days skonto can still be taken, calculated from current day. Returns 0
-if current day is the max skonto date, and negative number if skonto date has
-already passed.
-
-Returns undef if skonto is not configured for that invoice.
-
 =item C<get_payment_suggestions %params>
 
 Creates data intended for an L.select_tag dropdown that can be used in a
@@ -1157,6 +1216,6 @@ for credit notes or negative ap transactions with a positive sign.
 
 =head1 AUTHOR
 
-G. Richardson E<lt>grichardson@kivitendo-premium.de<gt>
+G. Richardson E<lt>grichardson@kivitendo-premium.deE<gt>
 
 =cut
diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index bde711a79..dbf16bd43 100644
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -19,6 +19,8 @@ sub calculate_prices_and_taxes {
   require SL::DB::PriceFactor;
   require SL::DB::Unit;
 
+  my $marge_calculations = $self->can('marge_total');
+
   SL::DB::Part->load_cached(map { $_->parts_id } @{ $self->items }) if @{ $self->items || [] };
 
   my %units_by_name       = map { ( $_->name => $_ ) } @{ SL::DB::Manager::Unit->get_all        };
@@ -53,7 +55,7 @@ sub calculate_prices_and_taxes {
   };
 
   $self->netamount(  0);
-  $self->marge_total(0);
+  $self->marge_total(0) if $marge_calculations;
 
   SL::DB::Manager::Chart->cache_taxkeys(date => $self->effective_tax_point);
 
@@ -83,6 +85,7 @@ sub _get_exchangerate {
 
 sub _calculate_item {
   my ($self, $item, $idx, $data, %params) = @_;
+  my $marge_calculations = $self->can('marge_total');
 
   my $part       = SL::DB::Part->load_cached($item->parts_id);
   return unless $part;
@@ -105,7 +108,7 @@ sub _calculate_item {
   my $sellprice = $item->sellprice;
 
   $item->price_factor(      ! $item->price_factor_obj   ? 1 : ($item->price_factor_obj->factor   || 1));
-  $item->marge_price_factor(! $part->price_factor ? 1 : ($part->price_factor->factor || 1));
+  $item->marge_price_factor(! $part->price_factor ? 1 : ($part->price_factor->factor || 1)) if $marge_calculations;
   my $linetotal = _round($sellprice * (1 - $item->discount) * $item->qty / $item->price_factor, 2) * $data->{exchangerate};
   $linetotal    = _round($linetotal,                                                            2);
 
@@ -140,19 +143,19 @@ sub _calculate_item {
   my $linetotal_cost = 0;
 
   if (!$linetotal) {
-    $item->marge_total(  0);
-    $item->marge_percent(0);
+    $item->marge_total(  0) if $marge_calculations;
+    $item->marge_percent(0) if $marge_calculations;
 
   } else {
     my $lastcost       = !(($item->lastcost // 0) * 1) ? ($part->lastcost || 0) : $item->lastcost;
-    $linetotal_cost    = _round($lastcost * $item->qty / $item->marge_price_factor, 2);
+    $linetotal_cost    = _round($lastcost * $item->qty / ( $marge_calculations ? $item->marge_price_factor : 1 ), 2);
     my $linetotal_net  = $self->taxincluded ? $linetotal - $tax_amount : $linetotal;
 
-    $item->marge_total(  $linetotal_net - $linetotal_cost);
-    $item->marge_percent($item->marge_total * 100 / $linetotal_net);
+    $item->marge_total(  $linetotal_net - $linetotal_cost) if $marge_calculations;
+    $item->marge_percent($item->marge_total * 100 / $linetotal_net) if $marge_calculations;
 
     unless ($data->{allow_optional_items} && $item->optional) {
-      $self->marge_total(  $self->marge_total + $item->marge_total);
+      $self->marge_total(  $self->marge_total + $item->marge_total) if $marge_calculations;
       $data->{lastcost_total} += $linetotal_cost;
     }
   }
@@ -178,12 +181,13 @@ sub _calculate_item {
     taxkey_id      => $taxkey->id,
   };
 
-  _dbg("CALCULATE! ${idx} i.qty " . $item->qty . " i.sellprice " . $item->sellprice . " sellprice $sellprice num_dec $num_dec taxamount $tax_amount " .
-       "i.linetotal $linetotal netamount " . $self->netamount . " marge_total " . $item->marge_total . " marge_percent " . $item->marge_percent);
+  #_dbg("CALCULATE! ${idx} i.qty " . $item->qty . " i.sellprice " . $item->sellprice . " sellprice $sellprice num_dec $num_dec taxamount $tax_amount " .
+  #     "i.linetotal $linetotal netamount " . $self->netamount . " marge_total " . $item->marge_total . " marge_percent " . $item->marge_percent);
 }
 
 sub _calculate_amounts {
   my ($self, $data, %params) = @_;
+  my $marge_calculations = $self->can('marge_total');
 
   my $tax_diff = 0;
   foreach my $chart_id (keys %{ $data->{taxes_by_chart_id} }) {
@@ -203,7 +207,7 @@ sub _calculate_amounts {
     $data->{amounts}->{ $data->{last_incex_chart_id} }->{amount} += $data->{invoicediff} if $data->{last_incex_chart_id};
   }
 
-  _dbg("Sna " . $self->netamount . " idiff " . $data->{invoicediff} . " tdiff ${tax_diff}");
+  #_dbg("Sna " . $self->netamount . " idiff " . $data->{invoicediff} . " tdiff ${tax_diff}");
 
   my $tax              = sum values %{ $data->{taxes_by_chart_id} };
   $amount              = $netamount + $tax;
@@ -213,7 +217,7 @@ sub _calculate_amounts {
 
   $self->netamount(    $netamount);
   $self->amount(       $grossamount);
-  $self->marge_percent($self->netamount ? ($self->netamount - $data->{lastcost_total}) * 100 / $self->netamount : 0);
+  $self->marge_percent($self->netamount ? ($self->netamount - $data->{lastcost_total}) * 100 / $self->netamount : 0) if $marge_calculations;
 }
 
 sub _calculate_assembly_item {
diff --git a/SL/DB/Helper/Record.pm b/SL/DB/Helper/Record.pm
new file mode 100644
index 000000000..564fc3abc
--- /dev/null
+++ b/SL/DB/Helper/Record.pm
@@ -0,0 +1,83 @@
+package SL::DB::Helper::Record;
+
+use strict;
+use warnings;
+use Carp;
+use Exporter qw(import);
+use SL::DB::Order::TypeData;
+use SL::DB::DeliveryOrder::TypeData;
+use SL::DB::Reclamation::TypeData;
+
+my @export_subs = qw(get_object_name_from_type get_class_from_type);
+
+our @EXPORT_OK = (@export_subs);
+our %EXPORT_TAGS = (subs => \@export_subs);
+
+my %type_to_object_name = ();
+$type_to_object_name{$_} = 'Order'         for (@{(SL::DB::Order::TypeData::valid_types)});
+$type_to_object_name{$_} = 'DeliveryOrder' for (@{(SL::DB::DeliveryOrder::TypeData::valid_types)});
+$type_to_object_name{$_} = 'Reclamation'   for (@{(SL::DB::Reclamation::TypeData::valid_types)});
+# TODO: rewrite when invoice type data is available
+$type_to_object_name{invoice}                     = 'Invoice';
+$type_to_object_name{invoice_for_advance_payment} = 'Invoice';
+$type_to_object_name{final_invoice}               = 'Invoice';
+$type_to_object_name{credit_note}                 = 'Invoice';
+$type_to_object_name{purchase_invoice}            = 'PurchaseInvoice';
+
+sub get_object_name_from_type {
+  my ($type) = @_;
+  return $type_to_object_name{$type} // croak "invalid type '$type'";
+}
+
+sub get_class_from_type {
+  my ($type) = @_;
+  return 'SL::DB::' . get_object_name_from_type($type);
+}
+
+1;
+
+__END__
+
+=encoding utf8
+
+=head1 NAME
+
+SL::DB::Helper::Record - Helper methods for record objects
+
+=head1 SYNOPSIS
+
+  use SL::DB::Helper::Record;
+
+=head1 DESCRIPTION
+
+This modul includes helper methods for the handling of record object.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<get_object_name_from_type $type>
+
+Returns the name string for corresponding record type:
+
+  SL::DB::Helper::Record::get_class_from_type('sales_order');
+  # Order
+
+=item C<get_class_from_type $type>
+
+Returns the class string for corresponding record type:
+
+  SL::DB::Helper::Record::get_class_from_type('sales_order');
+  # SL::DB::Order
+
+=back
+
+=head1 BUGS
+
+nothing yet
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/DB/Helper/RecordLink.pm b/SL/DB/Helper/RecordLink.pm
new file mode 100644
index 000000000..b83122875
--- /dev/null
+++ b/SL/DB/Helper/RecordLink.pm
@@ -0,0 +1,189 @@
+package SL::DB::Helper::RecordLink;
+
+use strict;
+use parent qw(Exporter);
+
+use Carp qw(croak);
+
+use SL::MoreCommon qw(listify);
+
+use constant RECORD_ID            => 'converted_from_record_id';
+use constant RECORD_TYPE_REF      => 'converted_from_record_type_ref';
+use constant RECORD_ITEM_ID       => 'converted_from_record_item_id';
+use constant RECORD_ITEM_TYPE_REF => 'converted_from_record_item_type_ref';
+
+our @EXPORT_OK = qw(RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF set_record_link_conversions);
+
+sub link_records {
+  my ($self, $allowed_linked_records, $allowed_linked_record_items) = @_;
+
+  my %allowed_linked_records = map {$_ => 1} @$allowed_linked_records;
+  my %allowed_linked_record_items = map {$_ => 1} @$allowed_linked_record_items;
+
+  return 1 unless my $from_record_ids = $self->{RECORD_ID()};
+  my @from_record_ids = split / /, $from_record_ids;
+
+  my $from_record_type = $self->{RECORD_TYPE_REF()};
+  unless ($allowed_linked_records{$from_record_type}) {
+    croak("Not allowed @{[ RECORD_TYPE_REF ]}: $from_record_type");
+  }
+
+  for my $id (@from_record_ids) {
+    my $from_record = $from_record_type->new(id => $id)->load;
+    $from_record->link_to_record($self);
+  }
+
+  #clear converted_from;
+  delete $self->{$_} for RECORD_ID, RECORD_TYPE_REF;
+
+  for my $item (@{ $self->items_sorted }) {
+    link_record_item($self, $item, \%allowed_linked_record_items);
+  }
+
+  1;
+}
+
+sub link_record_item {
+  my ($self, $record_item, $allowed_linked_record_items) = @_;
+
+  return 1 unless my $from_item_id = $record_item->{RECORD_ITEM_ID()};
+
+  my $from_item_type = $record_item->{RECORD_ITEM_TYPE_REF()};
+  unless ($allowed_linked_record_items->{$from_item_type}) {
+    croak("Not allowed @{[ RECORD_ITEM_TYPE_REF() ]}: $from_item_type");
+  }
+
+  $from_item_type->new(id => $from_item_id)->load
+    ->link_to_record($record_item);
+
+  #clear converted_from;
+  delete $record_item->{$_} for RECORD_ITEM_ID, RECORD_ITEM_TYPE_REF;
+}
+
+
+sub set_record_link_conversions {
+  my ($record, $from_type, $from_ids, $item_types, $item_ids) = @_;
+
+  return unless listify($from_ids);
+
+  $record->{ RECORD_TYPE_REF() } = $from_type;
+  $record->{ RECORD_ID() } = $from_ids;
+
+  my $idx = 0;
+  my $items = $record->items_sorted;
+
+  $item_ids ||= [];
+  croak "more item ids than items in record" if @$item_ids > @$items;
+
+  for my $idx (0..$#$item_ids) {
+    my $item = $items->[$idx];
+
+    $item->{ RECORD_ITEM_TYPE_REF() } = $item_types->[$idx];
+    $item->{ RECORD_ITEM_ID() }       = $item_ids->[$idx];
+  }
+}
+
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::DB::Helper::RecordLink - creates record links that are stored in the gived objects
+
+=head1 SYNOPSIS
+
+    # in the consuming class
+    __PACKAGE__->after_save_hook("link_records_hook");
+
+    sub link_records_hook {
+      my ($self) = @_;
+      SL::DB::Helper::RecordLink::link_records(
+        $self,
+        [ qw(SL::DB::Order) ],        # list of allowed record sources
+        [ qw(SL::DB::OrderItem) ],    # list of allowed record item sources
+      )
+    }
+
+    # set conversion data in record
+    sub prepare_linked_records {
+      my @converted_from_ids      = @{ $::form->{converted_from_oe_ids} };
+      my @converted_from_item_ids = @{ $::form->{converted_from_orderitem_ids} };
+
+      set_record_link_conversion(
+        $self->order,                                     # the record to modify
+        'SL::DB::Order'     => \@converted_from_ids,      # singular or multiple source record ids
+        'SL::DB::OrderItem' => \@converted_from_item_ids  # ids of items, each item will get one id
+      );
+    }
+
+=head1 DESCRIPTION
+
+This module implements reusable after save hooks for dealing with record links for records created from other records.
+
+It reacts to non-rose attributes set in the underlying hashes of the given record:
+
+=over 4
+
+=item * C<converted_from_record_id>
+
+=item * C<converted_from_record_type_ref>
+
+=item * C<converted_from_record_item_id>
+
+=item * C<converted_from_record_item_type_ref>
+
+=back
+
+If a typeref is given that is not explicitely whitelisted, an error will be thrown.
+
+The older C<converted_from_oe_ids> etc forms can be converted with TODO
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item * C<set_record_link_conversions> $record, $record_type => \@ids, $item_type => \@item_ids
+
+Register the given ids in the object to be linked after saving.
+
+Item ids will be assigned one by one to sorted_items.
+
+This function can be exported on demand to the calling package.
+
+=item * C<link_records> $record, \@allowed_record_types, \@allowed_item_types
+
+Intended as a post-save hook.
+Evaluates the stored ids from L </set_record_link_conversions>
+and links the creating objects to the given one.
+
+=back
+
+=head1 CONSTANTS
+
+Aöll of these can be exported on demand if the calling code wants to set or read the markers in a record manually.
+
+=over 4
+
+=item * C<RECORD_ID> = C<converted_from_record_id>
+
+=item * C<RECORD_TYPE_REF> = C<converted_from_record_type_ref>
+
+=item * C<RECORD_ITEM_ID> = C<converted_from_record_item_id>
+
+=item * C<RECORD_ITEM_TYPE_REF> = C<converted_from_record_item_type_ref>
+
+=back
+
+=head1 BUGS
+
+None yet. :)
+
+=head1 AUTHOR
+
+Sven Schöling $<lt>s.schoeling@googlemail.comE<gt>
+
+=cut
diff --git a/SL/DB/Helper/SalesPurchaseInvoice.pm b/SL/DB/Helper/SalesPurchaseInvoice.pm
index 59e4697e7..84dc1cf28 100644
--- a/SL/DB/Helper/SalesPurchaseInvoice.pm
+++ b/SL/DB/Helper/SalesPurchaseInvoice.pm
@@ -14,9 +14,9 @@ sub get_tax_and_amount_by_tax_chart_id {
 
   foreach my $transaction (@{ $self->transactions }) {
     next if $transaction->chart_link =~ m/(^${ARAP}$|paid)/;
-
+    next unless $transaction->chart_link;
     my $tax_or_netamount = $transaction->chart_link =~ m/tax/            ? 'tax'
-                         : $transaction->chart_link =~ m/(${ARAP}_amount|IC_cogs)/ ? 'netamount'
+                         : $transaction->chart_link =~ m/(${ARAP}_amount|IC_cogs|IC)/ ? 'netamount'
                          : undef;
     if ($tax_or_netamount eq 'netamount') {
       $tax_and_amount_by_tax_id->{ $transaction->tax->chart_id }->{$tax_or_netamount} ||= 0;
diff --git a/SL/DB/Helper/TransNumberGenerator.pm b/SL/DB/Helper/TransNumberGenerator.pm
index eb89ea8b3..f5694ec1b 100644
--- a/SL/DB/Helper/TransNumberGenerator.pm
+++ b/SL/DB/Helper/TransNumberGenerator.pm
@@ -19,25 +19,34 @@ sub do_scoping {
   SL::DB::Manager::DeliveryOrder->type_filter($_[0]);
 }
 
+sub rec_scoping {
+  SL::DB::Manager::Reclamation->type_filter($_[0]);
+}
+
 sub parts_scoping {
  # SL::DB::Manager::Part->type_filter($_[0]);
 }
 
-my %specs = ( ar                      => { number_column => 'invnumber',                                                                           },
-              sales_quotation         => { number_column => 'quonumber',      number_range_column => 'sqnumber',       scoping => \&oe_scoping,    },
-              sales_order             => { number_column => 'ordnumber',      number_range_column => 'sonumber',       scoping => \&oe_scoping,    },
-              request_quotation       => { number_column => 'quonumber',      number_range_column => 'rfqnumber',      scoping => \&oe_scoping,    },
-              purchase_order          => { number_column => 'ordnumber',      number_range_column => 'ponumber',       scoping => \&oe_scoping,    },
-              sales_delivery_order    => { number_column => 'donumber',       number_range_column => 'sdonumber',      scoping => \&do_scoping,    },
-              purchase_delivery_order => { number_column => 'donumber',       number_range_column => 'pdonumber',      scoping => \&do_scoping,    },
-              supplier_delivery_order => { number_column => 'donumber',       number_range_column => 'sudonumber',     scoping => \&do_scoping,    },
-              rma_delivery_order      => { number_column => 'donumber',       number_range_column => 'rdonumber',      scoping => \&do_scoping,    },
-              customer                => { number_column => 'customernumber', number_range_column => 'customernumber',                             },
-              vendor                  => { number_column => 'vendornumber',   number_range_column => 'vendornumber',                               },
-              part                    => { number_column => 'partnumber',     number_range_column => 'articlenumber',  scoping => \&parts_scoping, },
-              service                 => { number_column => 'partnumber',     number_range_column => 'servicenumber',  scoping => \&parts_scoping, },
-              assembly                => { number_column => 'partnumber',     number_range_column => 'assemblynumber', scoping => \&parts_scoping, },
-              assortment              => { number_column => 'partnumber',     number_range_column => 'assortmentnumber', scoping => \&parts_scoping, },
+my %specs = ( ar                          => { number_column => 'invnumber',                                                                           },
+              sales_quotation             => { number_column => 'quonumber',      number_range_column => 'sqnumber',       scoping => \&oe_scoping,    },
+              sales_order_intake          => { number_column => 'ordnumber',      number_range_column => 'soinumber',      scoping => \&oe_scoping,    },
+              sales_order                 => { number_column => 'ordnumber',      number_range_column => 'sonumber',       scoping => \&oe_scoping,    },
+              request_quotation           => { number_column => 'quonumber',      number_range_column => 'rfqnumber',      scoping => \&oe_scoping,    },
+              purchase_quotation_intake   => { number_column => 'quonumber',      number_range_column => 'pqinumber',      scoping => \&oe_scoping,    },
+              purchase_order              => { number_column => 'ordnumber',      number_range_column => 'ponumber',       scoping => \&oe_scoping,    },
+              purchase_order_confirmation => { number_column => 'ordnumber',      number_range_column => 'pocnumber',      scoping => \&oe_scoping,    },
+              sales_delivery_order        => { number_column => 'donumber',       number_range_column => 'sdonumber',      scoping => \&do_scoping,    },
+              purchase_delivery_order     => { number_column => 'donumber',       number_range_column => 'pdonumber',      scoping => \&do_scoping,    },
+              supplier_delivery_order     => { number_column => 'donumber',       number_range_column => 'sudonumber',     scoping => \&do_scoping,    },
+              rma_delivery_order          => { number_column => 'donumber',       number_range_column => 'rdonumber',      scoping => \&do_scoping,    },
+              sales_reclamation           => { number_column => 'record_number',  number_range_column => 's_reclamation_record_number',scoping => \&rec_scoping,   },
+              purchase_reclamation        => { number_column => 'record_number',  number_range_column => 'p_reclamation_record_number',scoping => \&rec_scoping,   },
+              customer                    => { number_column => 'customernumber', number_range_column => 'customernumber',                             },
+              vendor                      => { number_column => 'vendornumber',   number_range_column => 'vendornumber',                               },
+              part                        => { number_column => 'partnumber',     number_range_column => 'articlenumber',                              },
+              service                     => { number_column => 'partnumber',     number_range_column => 'servicenumber',                              },
+              assembly                    => { number_column => 'partnumber',     number_range_column => 'assemblynumber',                             },
+              assortment                  => { number_column => 'partnumber',     number_range_column => 'assortmentnumber',                           },
             );
 
 sub get_next_trans_number {
@@ -100,7 +109,6 @@ sub get_next_trans_number {
   my $range_table    = ($business ? $business : SL::DB::Default->get)->load(for_update => 1);
 
   my $start_number   = $range_table->$number_range_column;
-  $start_number      = $range_table->articlenumber if ($number_range_column =~ /^(assemblynumber|assortmentnumber)$/) && (length($start_number)//0 < 1);
   my $sequence       = SL::PrefixedNumber->new(number => $start_number // 0);
 
   if (!$fill_holes_in_range) {
diff --git a/SL/DB/Helper/TypeDataProxy.pm b/SL/DB/Helper/TypeDataProxy.pm
new file mode 100644
index 000000000..c4cb2cca5
--- /dev/null
+++ b/SL/DB/Helper/TypeDataProxy.pm
@@ -0,0 +1,153 @@
+package SL::DB::Helper::TypeDataProxy;
+
+use strict;
+
+sub new {
+  my ($class, $record_class, $type) = @_;
+
+  my $type_data_class = $record_class . '::TypeData';
+  eval "require $type_data_class" or die "invalid type data class '$type_data_class'";
+
+  bless [
+    $type,
+    $type_data_class
+  ], $class;
+}
+
+# convenience methods for common topics in type data
+sub text {
+  _via("get3", [ "text" ], @_);
+}
+
+sub properties {
+  _via("get3", [ "properties" ], @_);
+}
+
+sub defaults {
+  _via("get3", [ "defaults" ], @_);
+}
+
+sub show_menu {
+  _via("get3", [ "show_menu" ], @_);
+}
+
+sub rights {
+  _via("get3", [ "rights" ], @_);
+}
+
+sub workflow {
+  _via("get3", [ "workflow" ], @_);
+}
+
+sub features {
+  _via("get3", [ "features" ], @_);
+}
+
+sub part_classification_query {
+  _via("get", [ "part_classification_query" ], @_);
+}
+
+sub no_order_locked_parts {
+  _via("get", [ "no_order_locked_parts" ], @_);
+}
+
+sub _via {
+  my $method = shift;
+  my $additional_args = shift;
+  my $self = shift;
+  $self->[1]->can($method)->($self->[0], @$additional_args, @_);
+}
+
+sub AUTOLOAD {
+  our $AUTOLOAD;
+
+  my ($self, @args) = @_;
+
+  my $method = $AUTOLOAD;
+  $method    =~ s/.*:://;
+
+  return if $method eq 'DESTROY';
+
+  if (my $sub = $self->[1]->can($method)) {
+    return $sub->($self->[0], @args);
+  } else {
+    die "no method $method in $self->[1]";
+  }
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::DB::Helper::TypeDataProxy - proxy for accessing type data from a record instance
+
+=head1 SYNOPSIS
+
+    # in a SL::DB::Record type
+    sub type_data {
+      SL::DB::Helper::TypeDataProxy->new(ref $_[0], $_[0]->type);
+    }
+
+    # in consuming code with a record object
+    # the methods are only available if the TypeData class supports them
+    $record->type_data->is_type(...)
+    $record->type_data->valid_types
+    $record->type_data->text('edit')
+    $record->type_data->properties('is_customer')
+
+=head1 DESCRIPTION
+
+Wrap the static type information of a given record into an accessible sub object.
+Only works if a TypeData class exists that knows about the return values of the given type
+Since this does not operate on the live objects but rather wraps a snapshot,
+this will not get updated if the creating object changes.
+
+=head1 PROXIED METHODS
+
+=over 4
+
+=item * C<valid_types>
+
+Returns the known sub types of this record
+
+=item * C<is_type> $type
+
+Checks whether this record is of the given type
+
+=item * C<is_valid_type>
+
+=item * C<validate_type>
+
+Check whether this record has a valid type. C<is_valid_type> returns boolish, C<validate_type> will throw if the validation fails.
+
+=item * C<text> $action
+
+Returns the translated text for this action and action
+
+=item * C<properties> $property
+
+Returns the named property for this type
+
+=item * C<show_menu> $action
+
+Rtuens whether the given menu action is valid for this type
+
+=item * C<rights> $action
+
+Returns the needed rights for this action with this type
+
+=back
+
+=head1 BUGS
+
+None yet. :)
+
+=head1 AUTHOR
+
+Sven Schöling $<lt>s.schoeling@googlemail.comE<gt>
+
+=cut
diff --git a/SL/DB/Helper/ZUGFeRD.pm b/SL/DB/Helper/ZUGFeRD.pm
index f989d3d94..adeed0161 100644
--- a/SL/DB/Helper/ZUGFeRD.pm
+++ b/SL/DB/Helper/ZUGFeRD.pm
@@ -4,17 +4,29 @@ use strict;
 use utf8;
 
 use parent qw(Exporter);
-our @EXPORT = qw(create_zugferd_data create_zugferd_xmp_data);
+our @EXPORT_CREATE = qw(create_zugferd_data create_zugferd_xmp_data);
+our @EXPORT_IMPORT = qw(import_zugferd_data);
+our @EXPORT_OK = (@EXPORT_CREATE, @EXPORT_IMPORT);
+our %EXPORT_TAGS     = (
+  ALL => (@EXPORT_CREATE, @EXPORT_IMPORT),
+  CREATE => \@EXPORT_CREATE,
+  IMPORT => \@EXPORT_IMPORT,
+);
 
 use SL::DB::BankAccount;
 use SL::DB::GenericTranslation;
+use SL::DB::Chart;
 use SL::DB::Tax;
 use SL::DB::TaxKey;
+use SL::DB::RecordTemplate;
 use SL::Helper::ISO3166;
 use SL::Helper::ISO4217;
 use SL::Helper::UNECERecommendation20;
 use SL::VATIDNr;
 use SL::ZUGFeRD qw(:PROFILES);
+use SL::Locale::String qw(t8);
+
+use SL::Controller::ZUGFeRD;
 
 use Carp;
 use Encode qw(encode);
@@ -22,6 +34,7 @@ use List::MoreUtils qw(any pairwise);
 use List::Util qw(first sum);
 use Template;
 use XML::Writer;
+use Params::Validate qw(:all);
 
 my @line_names = qw(LineOne LineTwo LineThree);
 
@@ -93,6 +106,52 @@ sub _parse_our_address {
   return @result;
 }
 
+sub _buyer_contact_information {
+  my ($self, %params) = @_;
+
+  my $contact = $params{contact};
+
+  #       <ram:DefinedTradeContact>
+  $params{xml}->startTag("ram:DefinedTradeContact");
+
+  $params{xml}->dataElement("ram:PersonName", _u8(join(" ", $contact->cp_givenname, $contact->cp_name)));
+  $params{xml}->dataElement("ram:DepartmentName", _u8($contact->cp_abteilung));
+
+  my $phone_number = first {$_} (
+    $contact->cp_phone1,
+    $contact->cp_phone2,
+    $contact->cp_mobile1,
+    $contact->cp_mobile2,
+    $contact->cp_satphone,
+  );
+  if ($phone_number) {
+    $params{xml}->startTag("ram:TelephoneUniversalCommunication");
+    $params{xml}->dataElement("ram:CompleteNumber", _u8($phone_number));
+    $params{xml}->endTag;
+  }
+
+  if (_is_profile($self, PROFILE_FACTURX_EXTENDED())) {
+    my $fax_number = first {$_} (
+      $contact->cp_fax,
+      $contact->cp_satfax,
+    );
+    if ($fax_number) {
+      $params{xml}->startTag("ram:FaxUniversalCommunication");
+      $params{xml}->dataElement("ram:CompleteNumber", _u8($fax_number));
+      $params{xml}->endTag;
+    }
+  }
+
+  if ($contact->cp_email) {
+    $params{xml}->startTag("ram:EmailURIUniversalCommunication");
+    $params{xml}->dataElement("ram:URIID", _u8($contact->cp_email));
+    $params{xml}->endTag;
+  }
+
+  $params{xml}->endTag;
+  #       </ram:DefinedTradeContact>
+}
+
 sub _customer_postal_trade_address {
   my (%params) = @_;
 
@@ -109,6 +168,25 @@ sub _customer_postal_trade_address {
   #       </ram:PostalTradeAddress>
 }
 
+sub _buyer_communication {
+  my (%params) = @_;
+  my $customer = $params{customer};
+
+  my $buyer_electronic_address = first {$_} (
+    $customer->invoice_mail,
+    $customer->email,
+  );
+  if ($buyer_electronic_address) {
+    $params{xml}->startTag("ram:URIUniversalCommunication");
+    $params{xml}->dataElement("ram:URIID", _u8($buyer_electronic_address), schemeID => 'EM');
+    $params{xml}->endTag;
+  } elsif ($customer->gln) {
+    $params{xml}->startTag("ram:URIUniversalCommunication");
+    $params{xml}->dataElement("ram:URIID", _u8($customer->gln), schemeID => '0088');
+    $params{xml}->endTag;
+  }
+}
+
 sub _tax_rate_and_code {
   my ($taxzone, $tax) = @_;
 
@@ -150,9 +228,14 @@ sub _line_item {
   $params{xml}->startTag("ram:SpecifiedTradeProduct");
   $params{xml}->dataElement("ram:SellerAssignedID", _u8($params{item}->part->partnumber));
   $params{xml}->dataElement("ram:Name",             _u8($params{item}->description));
+  $params{xml}->dataElement("ram:Description",      _u8($params{item}->longdescription_as_stripped_html))
+    if $params{item}->longdescription_as_stripped_html;
   $params{xml}->endTag;
 
   $params{xml}->startTag("ram:SpecifiedLineTradeAgreement");
+  $params{xml}->startTag("ram:GrossPriceProductTradePrice");
+  $params{xml}->dataElement("ram:ChargeAmount", _r2($item_ptc->{sellprice}));
+  $params{xml}->endTag;
   $params{xml}->startTag("ram:NetPriceProductTradePrice");
   $params{xml}->dataElement("ram:ChargeAmount", _r2($item_ptc->{sellprice}));
   $params{xml}->endTag;
@@ -308,7 +391,22 @@ sub _format_payment_terms_description {
 sub _payment_terms {
   my ($self, %params) = @_;
 
-  return unless $self->payment_terms;
+  return if !$self->payment_terms && !$self->duedate;
+
+  if (!$self->payment_terms) { # only duedate
+    #     <ram:SpecifiedTradePaymentTerms>
+    $params{xml}->startTag("ram:SpecifiedTradePaymentTerms");
+
+    #       <ram:DueDateDateTime>
+    $params{xml}->startTag("ram:DueDateDateTime");
+    $params{xml}->dataElement("udt:DateTimeString", $self->duedate->strftime('%Y%m%d'), format => "102");
+    $params{xml}->endTag;
+    #       </ram:DueDateDateTime>
+
+    $params{xml}->endTag;
+    #     </ram:SpecifiedTradePaymentTerms>
+    return;
+  }
 
   my %payment_terms_vars = _calculate_payment_terms_values($self);
 
@@ -502,7 +600,9 @@ sub _buyer_trade_party {
   $params{xml}->dataElement("ram:ID",   _u8($self->customer->customernumber));
   $params{xml}->dataElement("ram:Name", _u8($self->customer->name));
 
+  _buyer_contact_information($self, %params, contact => $self->contact) if ($self->cp_id);
   _customer_postal_trade_address(%params, customer => $self->customer);
+  _buyer_communication(%params, customer => $self->customer);
   _specified_tax_registration($self->customer->ustid, %params) if $self->customer->ustid;
 
   $params{xml}->endTag;
@@ -640,6 +740,12 @@ sub _validate_data {
     }
   }
 
+  if ($self->amount - $self->paid > 0) {
+    if (!$self->duedate && !$self->payment_terms) {
+      SL::X::ZUGFeRDValidation->throw(message => $prefix . $::locale->text('In case the amount due is positive, either due date or payment term must be set.'));
+    }
+  }
+
   if (_is_profile($self, PROFILE_XRECHNUNG())) {
     if (!$self->customer->c_vendor_routing_id) {
       SL::X::ZUGFeRDValidation->throw(message => $prefix . $::locale->text('The value \'our routing id at customer\' must be set in the customer\'s master data for profile #1.', 'XRechnung 2.0'));
@@ -672,9 +778,8 @@ sub create_zugferd_data {
 
   # <rsm:CrossIndustryInvoice>
   $params{xml}->startTag("rsm:CrossIndustryInvoice",
-                         "xmlns:a"   => "urn:un:unece:uncefact:data:standard:QualifiedDataType:100",
                          "xmlns:rsm" => "urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100",
-                         "xmlns:qdt" => "urn:un:unece:uncefact:data:standard:QualifiedDataType:10",
+                         "xmlns:qdt" => "urn:un:unece:uncefact:data:standard:QualifiedDataType:100",
                          "xmlns:ram" => "urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100",
                          "xmlns:xs"  => "http://www.w3.org/2001/XMLSchema",
                          "xmlns:udt" => "urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100");
@@ -700,4 +805,168 @@ sub create_zugferd_xmp_data {
   };
 }
 
+sub import_zugferd_data {
+  my ($self, $zugferd_parser) = @_;
+  validate_pos(@_,
+    {
+      isa => 'SL::DB::PurchaseInvoice',
+    },
+    {
+      # document class of SL::XMLInvoice
+      can => qw(metadata items)
+    }
+  );
+
+  my %metadata = %{$zugferd_parser->metadata};
+  my @items = @{$zugferd_parser->items};
+
+  my $intnotes = t8("ZUGFeRD Import. Type: #1", $metadata{'type'})->translated;
+  my $iban = $metadata{'iban'};
+  my $invnumber = $metadata{'invnumber'};
+
+  if ( ! ($metadata{'ustid'} or $metadata{'taxnumber'}) ) {
+    die t8("Cannot process this invoice: neither VAT ID nor tax ID present.");
+  }
+
+  my $vendor = SL::Controller::ZUGFeRD::find_vendor($metadata{'ustid'}, $metadata{'taxnumber'});
+
+  die t8("Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor " .
+          "#3 exists and whether it has the correct tax ID/VAT ID." ,
+           $metadata{'ustid'},
+           $metadata{'taxnumber'},
+           $metadata{'vendor_name'},
+  ) unless $vendor;
+
+
+  # Check IBAN specified on bill matches the one we've got in
+  # the database for this vendor.
+  if ($iban) {
+    $intnotes .= "\nIBAN: ";
+    $intnotes .= $iban ne $vendor->iban ?
+    t8("Record IBAN #1 doesn't match vendor IBAN #2", $iban, $vendor->iban)
+    : $iban
+  }
+
+  # Use invoice creation date as due date if there's no due date
+  $metadata{'duedate'} = $metadata{'transdate'} unless defined $metadata{'duedate'};
+
+  # parse dates to kivi if set/valid
+  foreach my $key ( qw(transdate duedate) ) {
+    next unless defined $metadata{$key};
+    $metadata{$key} =~ s/^\s+|\s+$//g;
+
+    if ($metadata{$key} =~ /^([0-9]{4})-?([0-9]{2})-?([0-9]{2})$/) {
+    $metadata{$key} = DateTime->new(year  => $1,
+                                    month => $2,
+                                    day   => $3)->to_kivitendo;
+    }
+  }
+
+  my $currency = SL::DB::Manager::Currency->find_by(
+    name => $metadata{'currency'},
+    );
+
+  my $default_ap_amount_chart = SL::DB::Manager::Chart->find_by(
+    id => $::instance_conf->get_expense_accno_id
+  );
+  # Fallback if there's no default AP amount chart configured
+  $default_ap_amount_chart ||= SL::DB::Manager::Chart->find_by(charttype => 'A');
+
+  my $active_taxkey = $default_ap_amount_chart->get_active_taxkey;
+  my $taxes = SL::DB::Manager::Tax->get_all(
+    where   => [ chart_categories => {
+        like => '%' . $default_ap_amount_chart->category . '%'
+      }],
+    sort_by => 'taxkey, rate',
+  );
+  die t8(
+    "No tax found for chart #1", $default_ap_amount_chart->displayable_name
+  ) unless scalar @{$taxes};
+
+  my %template_params;
+  my $template_ap = SL::DB::Manager::RecordTemplate->get_first(where => [vendor_id => $vendor->id]);
+  if ($template_ap) {
+    $template_params{globalproject_id}        = $template_ap->project_id;
+    $template_params{payment_id}              = $template_ap->payment_id;
+    $template_params{department_id}           = $template_ap->department_id;
+    $template_params{ordnumber}               = $template_ap->ordnumber;
+    $template_params{transaction_description} = $template_ap->transaction_description;
+    $template_params{notes}                   = $template_ap->notes;
+  }
+
+  # Try to fill in AP account to book against
+  my $ap_chart_id = $template_ap ? $template_ap->ar_ap_chart_id
+                  : $::instance_conf->get_ap_chart_id;
+  my $ap_chart;
+  if ( $ap_chart_id ne '' ) {
+    $ap_chart = SL::DB::Manager::Chart->find_by(id => $ap_chart_id);
+  } else {
+    # If no default account is configured, just use the first AP account found.
+    ($ap_chart) = @{SL::DB::Manager::Chart->get_all(
+      where   => [ link => 'AP' ],
+      sort_by => [ 'accno' ],
+    )};
+  }
+
+  my $today = DateTime->today_local;
+  my $duedate =
+      $metadata{duedate} ?
+        $metadata{duedate}
+    : $vendor->payment ?
+        $vendor->payment->calc_date(reference_date => $today)->to_kivitendo
+    : $today->to_kivitendo;
+
+  my %params = (
+    invoice      => 0,
+    vendor_id    => $vendor->id,
+    taxzone_id   => $vendor->taxzone_id,
+    currency_id  => $currency->id,
+    direct_debit => $metadata{'direct_debit'},
+    invnumber    => $invnumber,
+    transdate    => $metadata{transdate} || $today->to_kivitendo,
+    duedate      => $metadata{duedate}   || $today->to_kivitendo,
+    taxincluded  => 0,
+    intnotes     => $intnotes,
+    transactions => [],
+    %template_params,
+  );
+
+  $self->assign_attributes(%params);
+
+  # parse items
+  my $template_item;
+  if ($template_ap && scalar @{$template_ap->items}) {
+    $template_item = $template_ap->items->[0];
+  }
+  foreach my $i (@items) {
+    my %item = %{$i};
+
+    my $net_total = $item{'subtotal'};
+
+    # set default values for items
+    my %line_params;
+    $line_params{amount} = $net_total;
+    if ($template_item) {
+      $line_params{tax_id}     = $template_item->tax->id;
+      $line_params{chart}      = $template_item->chart;
+      $line_params{project_id} = $template_item->project_id;
+    } else {
+      my $tax_rate  = $item{'tax_rate'};
+         $tax_rate /= 100 if $tax_rate > 1; # XML data is usually in percent
+      my $tax   = first { $tax_rate              == $_->rate } @{ $taxes };
+         $tax //= first { $active_taxkey->tax_id == $_->id }   @{ $taxes };
+         $tax //= $taxes->[0];
+      $line_params{tax_id}  = $tax->id;
+      $line_params{chart}   = $default_ap_amount_chart;
+    }
+
+    $self->add_ap_amount_row(%line_params);
+  }
+  $self->recalculate_amounts();
+
+  $self->create_ap_row(chart => $ap_chart);
+
+  return $self;
+}
+
 1;
diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index d1ce5be87..f882438cd 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp;
 use List::Util qw(first sum);
 
-use Rose::DB::Object::Helpers qw(has_loaded_related forget_related);
+use Rose::DB::Object::Helpers qw(has_loaded_related forget_related as_tree strip);
 use SL::DB::MetaSetup::Invoice;
 use SL::DB::Manager::Invoice;
 use SL::DB::Helper::Payment qw(:ALL);
@@ -16,11 +16,11 @@ use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PDF_A;
 use SL::DB::Helper::PriceTaxCalculator;
 use SL::DB::Helper::PriceUpdater;
+use SL::DB::Helper::RecordLink qw(RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
 use SL::DB::Helper::SalesPurchaseInvoice;
 use SL::DB::Helper::TransNumberGenerator;
-use SL::DB::Helper::ZUGFeRD;
+use SL::DB::Helper::ZUGFeRD qw(:CREATE);
 use SL::Locale::String qw(t8);
-use SL::DB::CustomVariable;
 
 __PACKAGE__->meta->add_relationship(
   invoiceitems => {
@@ -77,6 +77,7 @@ __PACKAGE__->attr_html('notes');
 __PACKAGE__->attr_sorted('items');
 
 __PACKAGE__->before_save('_before_save_set_invnumber');
+__PACKAGE__->after_save('_after_save_link_records');
 
 # hooks
 
@@ -88,11 +89,26 @@ sub _before_save_set_invnumber {
   return 1;
 }
 
+sub _after_save_link_records {
+  my ($self) = @_;
+
+  my @allowed_record_sources = qw(SL::DB::Reclamation SL::DB::Order SL::DB::DeliveryOrder);
+  my @allowed_item_sources = qw(SL::DB::ReclamationItem SL::DB::OrderItem SL::DB::DeliveryOrderItem);
+
+  SL::DB::Helper::RecordLink::link_records(
+    $self,
+    \@allowed_record_sources,
+    \@allowed_item_sources,
+    close_source_quotations => 1,
+  );
+}
+
 # methods
 
 sub items { goto &invoiceitems; }
 sub add_items { goto &add_invoiceitems; }
 sub record_number { goto &invnumber; };
+sub record_type { goto &invoice_type; };
 
 sub is_sales {
   # For compatibility with Order, DeliveryOrder
@@ -137,6 +153,17 @@ sub closed {
   return $self->paid >= $self->amount;
 }
 
+sub convert_to_reclamation {
+  my ($self, %params) = @_;
+  $params{destination_type} = $self->is_sales ? 'sales_reclamation'
+                                              : 'purchase_reclamation';
+
+  require SL::DB::Reclamation;
+  my $reclamation = SL::DB::Reclamation->new_from($self, %params);
+
+  return $reclamation;
+}
+
 sub _clone_orderitem_delivery_order_item_cvar {
   my ($cvar) = @_;
 
@@ -218,6 +245,15 @@ sub new_from {
   my $items   = delete($params{items}) || $source->items_sorted;
   my %item_parents;
 
+  if ($params{honor_recurring_billing_mode}) {
+    $items = [
+      grep {    !$_->can('recurring_billing_mode')
+             || ($_->recurring_billing_mode eq 'always')
+             || (($_->recurring_billing_mode eq 'once') && !$_->recurring_billing_invoice_id)
+      } @{ $items }
+    ];
+  }
+
   my @items = map {
     my $source_item      = $_;
     my $source_item_id   = $_->$item_parent_id_column;
@@ -236,11 +272,14 @@ sub new_from {
                                donumber         => ref($item_parent) eq 'SL::DB::DeliveryOrder' ? $item_parent->donumber  : $source_item->can('donumber') ? $source_item->donumber : '',
                              );
 
-    $current_invoice_item->{"converted_from_orderitems_id"}           = $_->{id} if ref($item_parent) eq 'SL::DB::Order';
-    $current_invoice_item->{"converted_from_delivery_order_items_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::DeliveryOrder';
+    $current_invoice_item->{RECORD_ITEM_ID()}           = $_->{id};
+    $current_invoice_item->{RECORD_ITEM_TYPE_REF()}     = ref $source_item;
     $current_invoice_item;
   } @{ $items };
 
+  $invoice->{RECORD_ID()}           = $source->id;
+  $invoice->{RECORD_TYPE_REF()}     = ref $source;
+
   @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};
   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
@@ -360,7 +399,9 @@ sub add_ar_amount_row {
   if ( $tax and $tax->rate != 0 ) {
     ($netamount, $taxamount) = Form->calculate_tax($params{amount}, $tax->rate, $self->taxincluded, $roundplaces);
   };
-  next unless $netamount; # netamount mustn't be zero
+
+  return unless $netamount; # netamount mustn't be zero
+
   my $sign = $self->customer_id ? 1 : -1;
   my $acc = SL::DB::AccTransaction->new(
     amount     => $netamount * $sign,
@@ -549,6 +590,12 @@ sub invoice_type {
   return 'invoice';
 }
 
+sub is_credit_note {
+  my ($self) = @_;
+
+  return $self->invoice_type eq 'credit_note' ? 1 : undef;
+}
+
 sub displayable_state {
   my $self = shift;
 
@@ -626,6 +673,12 @@ sub effective_tax_point {
   return $self->tax_point || $self->deliverydate || $self->transdate;
 }
 
+sub netamount_base_currency {
+  my ($self) = @_;
+
+  return $self->netamount; # already matches base currency
+}
+
 1;
 
 __END__
diff --git a/SL/DB/Invoice/TypeData.pm b/SL/DB/Invoice/TypeData.pm
new file mode 100644
index 000000000..b4f43aaac
--- /dev/null
+++ b/SL/DB/Invoice/TypeData.pm
@@ -0,0 +1,329 @@
+package SL::DB::Invoice::TypeData;
+
+use strict;
+use Carp;
+use Exporter qw(import);
+use SL::Locale::String qw(t8);
+
+use constant {
+  INVOICE_TYPE                            =>  'invoice',
+  INVOICE_FOR_ADVANCE_PAYMENT_TYPE        =>  'invoice_for_advance_payment',
+  INVOICE_FOR_ADVANCE_PAYMENT_STORNO_TYPE =>  'invoice_for_advance_payment_storno',
+  FINAL_INVOICE_TYPE                      =>  'final_invoice',
+  INVOICE_STORNO_TYPE                     =>  'invoice_storno',
+  CREDIT_NOTE_TYPE                        =>  'credit_note',
+  CREDIT_NOTE_STORNO_TYPE                 =>  'credit_note_storno',
+};
+
+my @export_types = qw(PURCHASE_INVOICE_TYPE PURCHASE_CREDIT_NOTE_TYPE);
+my @export_subs = qw(valid_types validate_type is_valid_type get get3);
+
+our @EXPORT_OK = (@export_types, @export_subs);
+our %EXPORT_TAGS = (types => \@export_types, subs => \@export_subs);
+
+my %type_data = (
+  INVOICE_TYPE() => {
+    text => {
+      delete     => t8('The invoice has been deleted'),
+      list       => t8("Invoices"),
+      add        => t8("Add Invoice"),
+      edit       => t8("Edit Invoice"),
+      type       => t8("Invoice"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 1,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  INVOICE_FOR_ADVANCE_PAYMENT_TYPE() => {
+    text => {
+      delete     => t8('The invoice for advance payment has been deleted'),
+      list       => t8("Invoices for Advance Payment"),
+      add        => t8("Add Invoice for Advance Payment"),
+      edit       => t8("Edit Invoice for Advance Payment"),
+      type       => t8("Invoice for Advance Payment"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 1,
+      final_invoice               => 1,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  INVOICE_FOR_ADVANCE_PAYMENT_STORNO_TYPE() => {
+    text => {
+      delete     => t8('The strono invoice for advance payment has been deleted'),
+      list       => t8("Storno Invoices for Advance Payment"),
+      add        => t8("Add Storno Invoice for Advance Payment"),
+      edit       => t8("Edit Storno Invoice for Advance Payment"),
+      type       => t8("Storno Invoice for Advance Payment"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 1,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  FINAL_INVOICE_TYPE() => {
+    text => {
+      delete     => t8('The final invoice has been deleted'),
+      list       => t8("Final Invoices"),
+      add        => t8("Add Final Invoice"),
+      edit       => t8("Edit Final Invoice"),
+      type       => t8("Final Invoice"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 1,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  INVOICE_STORNO_TYPE() => {
+    text => {
+      delete     => t8('The storno invoice has been deleted'),
+      list       => t8("Storno Invoices"),
+      add        => t8("Add Storno Invoice"),
+      edit       => t8("Edit Storno Invoice"),
+      type       => t8("Storno Invoice"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 1,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  CREDIT_NOTE_TYPE() => {
+    text => {
+      delete     => t8('The credit note has been deleted'),
+      list       => t8("Credit Notes"),
+      add        => t8("Add Credit Note"),
+      edit       => t8("Edit Credit Note"),
+      type       => t8("Credit Note"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  CREDIT_NOTE_STORNO_TYPE() => {
+    text => {
+      delete     => t8('The storno credit note has been deleted'),
+      list       => t8("Storno Credit Notes"),
+      add        => t8("Add Storno Credit Note"),
+      edit       => t8("Edit Storno Credit Note"),
+      type       => t8("Storno Credit Note"),
+    },
+    show_menu => {
+      invoice_for_advance_payment => 0,
+      final_invoice               => 0,
+      credit_note                 => 1,
+      sales_order                 => 1,
+      sales_reclamation           => 0,
+      use_as_new => 1,
+      # delete     => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "invnumber",
+      worflow_needed => 1,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_sales" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+);
+
+my @valid_types = (
+  INVOICE_TYPE,
+  INVOICE_FOR_ADVANCE_PAYMENT_TYPE,
+  INVOICE_FOR_ADVANCE_PAYMENT_STORNO_TYPE,
+  FINAL_INVOICE_TYPE,
+  INVOICE_STORNO_TYPE,
+  CREDIT_NOTE_TYPE,
+  CREDIT_NOTE_STORNO_TYPE,
+);
+
+my %valid_types = map { $_ => $_ } @valid_types;
+
+sub valid_types {
+  \@valid_types;
+}
+
+sub is_valid_type {
+  !!exists $type_data{$_[0]};
+}
+
+sub validate_type {
+  my ($type) = @_;
+
+  return $valid_types{$type} // croak "invalid type '$type'";
+}
+
+sub get {
+  my ($type, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}->{$key} // die "unknown property '$key'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+sub get3 {
+  my ($type, $topic, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}{$topic}{$key} // croak "unknown property '$key' in topic '$topic' for type '$type'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+1;
diff --git a/SL/DB/InvoiceItem.pm b/SL/DB/InvoiceItem.pm
index 80c406b77..d14409bb2 100644
--- a/SL/DB/InvoiceItem.pm
+++ b/SL/DB/InvoiceItem.pm
@@ -3,7 +3,9 @@ package SL::DB::InvoiceItem;
 use strict;
 
 use SL::DB::MetaSetup::InvoiceItem;
+use SL::DB::Manager::InvoiceItem;
 use SL::DB::Helper::ActsAsList;
+use SL::DB::Helper::AttrHTML;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::RecordItem;
 use SL::DB::Helper::CustomVariables (
@@ -16,8 +18,7 @@ use SL::DB::Helper::CustomVariables (
     },
   },
 );
-
-__PACKAGE__->meta->make_manager_class;
+use Rose::DB::Object::Helpers qw(as_tree strip);
 
 __PACKAGE__->configure_acts_as_list(group_by => [qw(trans_id)]);
 
@@ -37,6 +38,8 @@ __PACKAGE__->meta->add_relationships(
 
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->attr_html('longdescription');
+
 sub record {
   my ($self) = @_;
 
diff --git a/SL/DB/Manager/Chart.pm b/SL/DB/Manager/Chart.pm
index d70e7f939..af2a9d372 100644
--- a/SL/DB/Manager/Chart.pm
+++ b/SL/DB/Manager/Chart.pm
@@ -9,8 +9,10 @@ use SL::DB::Helper::Sorted;
 use SL::DB::Helper::Paginated;
 use SL::DB::Helper::Filtered;
 use SL::MoreCommon qw(listify);
-use DateTime;
 use SL::DBUtils;
+
+use Carp;
+use DateTime;
 use Data::Dumper;
 
 sub object_class { 'SL::DB::Chart' }
@@ -38,7 +40,30 @@ __PACKAGE__->add_filter_specs(
     my ($key, $value) = @_;
     return __PACKAGE__->booked_filter($value);
   },
+  status => sub {
+    my ($key, $value) = @_;
+    return __PACKAGE__->invalid_filter($value);
+  },
+
 );
+sub invalid_filter {
+  my ($class, $status) = @_;
+
+  croak "Wrong call, need status invalid, all or valid, got:" . $status unless $status =~ m/invalid|all|valid/;
+
+  my @filter;
+
+  if ($status eq 'all') {
+     push @filter, ( id => [ \"SELECT id FROM chart" ] );
+  } elsif ($status eq 'valid') {
+     push @filter, ( id => [ \"SELECT id FROM chart WHERE NOT invalid" ] );
+  } elsif ($status eq 'invalid') {
+     push @filter, ( id => [ \"SELECT id FROM chart WHERE invalid" ] );
+  } else { die "Wrong state for invalid_filter"; }
+
+  return @filter;
+}
+
 
 sub booked_filter {
   my ($class, $booked) = @_;
diff --git a/SL/DB/Manager/DeliveryOrder.pm b/SL/DB/Manager/DeliveryOrder.pm
index e9c1ee7f2..923569271 100644
--- a/SL/DB/Manager/DeliveryOrder.pm
+++ b/SL/DB/Manager/DeliveryOrder.pm
@@ -30,7 +30,7 @@ sub type_filter {
   my $type  = lc(shift || '');
   my $prefix = shift // '';
 
-  return "${prefix}order_type" => validate_type($type);
+  return "${prefix}record_type" => validate_type($type);
 }
 
 sub _sort_spec {
diff --git a/SL/DB/Manager/DeliveryOrderItem.pm b/SL/DB/Manager/DeliveryOrderItem.pm
new file mode 100644
index 000000000..35f7bf3cc
--- /dev/null
+++ b/SL/DB/Manager/DeliveryOrderItem.pm
@@ -0,0 +1,50 @@
+package SL::DB::Manager::DeliveryOrderItem;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+use SL::DB::Helper::Sorted;
+
+sub object_class { 'SL::DB::DeliveryOrderItem' }
+
+__PACKAGE__->make_manager_methods;
+
+sub _sort_spec {
+  return ( columns => { position => [ 'delivery_order_id', 'position' ], },
+           default => [ 'position', 1 ],
+           nulls   => { }
+         );
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::DB::Manager::DeliveryOrderItem - Manager for models for the
+'delivery_order_items' table
+
+=head1 SYNOPSIS
+
+This is a standard Rose::DB::Manager based model manager and can be
+used as such.
+
+=head1 FUNCTIONS
+
+None yet.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/DB/Manager/DeliveryTerm.pm b/SL/DB/Manager/DeliveryTerm.pm
index 6ac2f0a38..abc2722de 100644
--- a/SL/DB/Manager/DeliveryTerm.pm
+++ b/SL/DB/Manager/DeliveryTerm.pm
@@ -18,4 +18,20 @@ sub _sort_spec {
                       });
 }
 
+sub get_valid {
+  my ($class, $with_this_id) = @_;
+
+  my @conditions = (obsolete => 0);
+
+  if ($with_this_id) {
+    @conditions = (
+      or => [
+        id => $with_this_id,
+        @conditions,
+      ]);
+  }
+
+  return $class->get_all_sorted(query => \@conditions);
+}
+
 1;
diff --git a/SL/DB/Manager/EmailImport.pm b/SL/DB/Manager/EmailImport.pm
new file mode 100644
index 000000000..879965ef6
--- /dev/null
+++ b/SL/DB/Manager/EmailImport.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::EmailImport;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::EmailImport' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/EmailJournal.pm b/SL/DB/Manager/EmailJournal.pm
index 948d7c619..c51d350af 100644
--- a/SL/DB/Manager/EmailJournal.pm
+++ b/SL/DB/Manager/EmailJournal.pm
@@ -6,17 +6,52 @@ use parent qw(SL::DB::Helper::Manager);
 
 use SL::DB::Helper::Paginated;
 use SL::DB::Helper::Sorted;
+use SL::DB::Helper::Filtered;
 
 sub object_class { 'SL::DB::EmailJournal' }
 
 __PACKAGE__->make_manager_methods;
 
+__PACKAGE__->add_filter_specs(
+  linked_to => sub {
+    my ($key, $value, $prefix) = @_;
+
+    # if $value is truish, we want at least one link otherwise we want none
+    my $comp = !!$value ? '>' : '=';
+
+    # table emial_journal is aliased as t1
+    return
+      \qq{(
+        SELECT CASE WHEN count(*) $comp 0 THEN TRUE ELSE FALSE END
+        FROM record_links
+        WHERE (
+            (record_links.from_table = 'email_journal'::varchar(50))
+            AND record_links.from_id = t1.id
+          ) OR (
+            (record_links.to_table = 'email_journal'::varchar(50))
+            AND record_links.to_id = t1.id
+          )
+        )} => \'TRUE';
+  },
+);
+
 sub _sort_spec {
   return (
     default => [ 'sent_on', 0 ],
     columns => {
       SIMPLE => 'ALL',
       sender => 'sender.name',
+      linked_to => qq{(
+        SELECT count(*)
+        FROM record_links
+        WHERE
+          ( record_links.from_table = 'email_journal'::varchar(50)
+            AND record_links.from_id = email_journal.id
+          ) OR (
+            record_links.to_table = 'email_journal'::varchar(50)
+            AND record_links.to_id = email_journal.id
+          )
+      )}
     },
   );
 }
diff --git a/SL/DB/Manager/FileVersion.pm b/SL/DB/Manager/FileVersion.pm
new file mode 100644
index 000000000..ca7d1afd1
--- /dev/null
+++ b/SL/DB/Manager/FileVersion.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::FileVersion;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::FileVersion' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/FollowUpCreatedForEmployee.pm b/SL/DB/Manager/FollowUpCreatedForEmployee.pm
new file mode 100644
index 000000000..f6e7e4c50
--- /dev/null
+++ b/SL/DB/Manager/FollowUpCreatedForEmployee.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::FollowUpCreatedForEmployee;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::FollowUpCreatedForEmployee' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/FollowUpDone.pm b/SL/DB/Manager/FollowUpDone.pm
new file mode 100644
index 000000000..f46a32c30
--- /dev/null
+++ b/SL/DB/Manager/FollowUpDone.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::FollowUpDone;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::FollowUpDone' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/GLTransaction.pm b/SL/DB/Manager/GLTransaction.pm
new file mode 100644
index 000000000..5ad3369fa
--- /dev/null
+++ b/SL/DB/Manager/GLTransaction.pm
@@ -0,0 +1,21 @@
+package SL::DB::Manager::GLTransaction;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+
+sub object_class { 'SL::DB::GLTransaction' }
+
+__PACKAGE__->make_manager_methods;
+
+sub type_filter {
+  my $class = shift;
+  my $type  = lc(shift || '');
+
+  return if $type eq 'gl_transaction';
+
+  die "Unknown type $type";
+}
+
+1;
diff --git a/SL/DB/Manager/Invoice.pm b/SL/DB/Manager/Invoice.pm
index 5dc943f85..39836dd6b 100644
--- a/SL/DB/Manager/Invoice.pm
+++ b/SL/DB/Manager/Invoice.pm
@@ -16,11 +16,14 @@ sub type_filter {
   my $type  = lc(shift || '');
 
   return (or  => [ invoice => 0, invoice => undef                                               ]) if $type eq 'ar_transaction';
+  return (type => 'invoice_for_advance_payment'                                                  ) if $type eq 'invoice_for_advance_payment';
+  return (and => [ type => 'invoice_for_advance_payment', amount => { lt => 0 }                 ]) if $type eq 'invoice_for_advance_payment_storno';
+  return (type => 'final_invoice'                                                                ) if $type eq 'final_invoice';
   return (and => [ invoice => 1, amount  => { ge => 0 }, or => [ storno => 0, storno => undef ] ]) if $type =~ m/^(?:sales_)?invoice$/;
   return (and => [ invoice => 1, amount  => { lt => 0 }, or => [ storno => 0, storno => undef ] ]) if $type eq 'credit_note';
   return (and => [ invoice => 1, amount  => { lt => 0 },         storno => 1                    ]) if $type =~ m/(?:invoice_)?storno/;
   return (and => [ invoice => 1, amount  => { ge => 0 },         storno => 1                    ]) if $type eq 'credit_note_storno';
-  return (amount => {gt => 'paid'}) if $type eq 'open';
+  return (amount => {gt => \'paid'}) if $type eq 'open';
 
   die "Unknown type $type";
 }
diff --git a/SL/DB/Manager/InvoiceItem.pm b/SL/DB/Manager/InvoiceItem.pm
new file mode 100644
index 000000000..e481928c2
--- /dev/null
+++ b/SL/DB/Manager/InvoiceItem.pm
@@ -0,0 +1,50 @@
+package SL::DB::Manager::InvoiceItem;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+use SL::DB::Helper::Sorted;
+
+sub object_class { 'SL::DB::InvoiceItem' }
+
+__PACKAGE__->make_manager_methods;
+
+sub _sort_spec {
+  return ( columns => { position => [ 'trans_id', 'position' ], },
+           default => [ 'position', 1 ],
+           nulls   => { }
+         );
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::DB::Manager::InvoiceItem - Manager for models for the
+'invoice' table
+
+=head1 SYNOPSIS
+
+This is a standard Rose::DB::Manager based model manager and can be
+used as such.
+
+=head1 FUNCTIONS
+
+None yet.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/DB/Manager/Order.pm b/SL/DB/Manager/Order.pm
index ff5169bfa..378b96b8d 100644
--- a/SL/DB/Manager/Order.pm
+++ b/SL/DB/Manager/Order.pm
@@ -4,10 +4,13 @@ use strict;
 
 use parent qw(SL::DB::Helper::Manager);
 
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::Helper::Paginated;
 use SL::DB::Helper::Sorted;
 use SL::DB::Helper::Filtered;
 
+use List::MoreUtils qw(any);
+
 sub object_class { 'SL::DB::Order' }
 
 __PACKAGE__->make_manager_methods;
@@ -28,10 +31,15 @@ sub type_filter {
   my $type   = lc(shift || '');
   my $prefix = shift || '';
 
-  return (and => [ "!${prefix}customer_id" => undef,         "${prefix}quotation" => 1                       ]) if $type eq 'sales_quotation';
-  return (and => [ "!${prefix}vendor_id"   => undef,         "${prefix}quotation" => 1                       ]) if $type eq 'request_quotation';
-  return (and => [ "!${prefix}customer_id" => undef, or => [ "${prefix}quotation" => 0, "${prefix}quotation" => undef ] ]) if $type eq 'sales_order';
-  return (and => [ "!${prefix}vendor_id"   => undef, or => [ "${prefix}quotation" => 0, "${prefix}quotation" => undef ] ]) if $type eq 'purchase_order';
+  return ("${prefix}record_type" => $type) if( any {$type eq $_} (
+      SALES_ORDER_INTAKE_TYPE(),
+      SALES_ORDER_TYPE(),
+      SALES_QUOTATION_TYPE(),
+      PURCHASE_ORDER_TYPE(),
+      PURCHASE_ORDER_CONFIRMATION_TYPE(),
+      REQUEST_QUOTATION_TYPE(),
+      PURCHASE_QUOTATION_INTAKE_TYPE(),
+    ));
 
   die "Unknown type $type";
 }
diff --git a/SL/DB/Manager/OrderStatus.pm b/SL/DB/Manager/OrderStatus.pm
new file mode 100644
index 000000000..235646823
--- /dev/null
+++ b/SL/DB/Manager/OrderStatus.pm
@@ -0,0 +1,27 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::OrderStatus;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+use SL::DB::Helper::Paginated;
+use SL::DB::Helper::Sorted;
+
+sub object_class { 'SL::DB::OrderStatus' }
+
+__PACKAGE__->make_manager_methods;
+
+sub _sort_spec {
+  return (
+    default       => [ 'position', 1 ],
+    columns       => {
+      SIMPLE      => 'ALL',
+      name        => 'lower(order_status.name)',
+      description => 'lower(order_status.description)',
+    });
+}
+
+1;
diff --git a/SL/DB/Manager/OrderVersion.pm b/SL/DB/Manager/OrderVersion.pm
new file mode 100644
index 000000000..6df0f70a8
--- /dev/null
+++ b/SL/DB/Manager/OrderVersion.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::OrderVersion;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::OrderVersion' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/Part.pm b/SL/DB/Manager/Part.pm
index b46f851cf..b101d1a14 100644
--- a/SL/DB/Manager/Part.pm
+++ b/SL/DB/Manager/Part.pm
@@ -78,10 +78,9 @@ sub get_ordered_qty {
     FROM orderitems oi
     LEFT JOIN oe ON (oi.trans_id = oe.id)
     WHERE (oi.parts_id IN ($placeholders))
-      AND (NOT COALESCE(oe.quotation, FALSE))
+      AND oe.record_type = 'purchase_order'
       AND (NOT COALESCE(oe.closed,    FALSE))
       AND (NOT COALESCE(oe.delivered, FALSE))
-      AND (COALESCE(oe.vendor_id, 0) <> 0)
     GROUP BY oi.parts_id
 SQL
 
@@ -91,6 +90,75 @@ SQL
   return %qty_by_id;
 }
 
+sub get_open_ordered_qty {
+  my $class    = shift;
+  my $part_id  = shift;
+  return () unless $part_id;
+
+  my $query = <<SQL;
+WITH
+open_qty AS (
+  SELECT parts_id, sum(oi.qty) as sum
+  FROM orderitems oi
+  LEFT OUTER JOIN oe o ON (oi.trans_id = o.id)
+  WHERE
+    oi.parts_id = ?
+    AND (o.record_type = 'purchase_order')
+    AND (NOT COALESCE(o.closed,    FALSE))
+    AND (NOT COALESCE(o.delivered, FALSE))
+    AND (COALESCE(o.vendor_id, 0) <> 0)
+  GROUP BY oi.parts_id
+),
+
+open_orderitems_ids AS (
+  SELECT oi.id, parts_id
+  FROM orderitems oi
+  LEFT OUTER JOIN oe o ON (oi.trans_id = o.id)
+  WHERE
+    oi.parts_id = ?
+    AND (o.record_type = 'purchase_order')
+    AND (NOT COALESCE(o.closed,    FALSE))
+    AND (NOT COALESCE(o.delivered, FALSE))
+    AND (o.vendor_id is not null)
+),
+
+delivered_qty AS (
+  SELECT parts_id, sum(qty) AS sum
+  FROM delivery_order_items
+  WHERE id IN (
+    SELECT to_id from record_links
+    WHERE
+      from_id IN ( SELECT id FROM open_orderitems_ids)
+      AND from_table = 'orderitems'
+      AND to_table = 'delivery_order_items'
+  ) AND parts_id = ?
+  GROUP BY parts_id
+),
+
+open_ordered_qty AS (
+  SELECT
+    oq.parts_id,
+    oq.sum AS ordered_sum,
+    COALESCE(dq.sum,0.00) AS sum,
+    sum(COALESCE(oq.sum,0.00) - COALESCE(dq.sum,0.00)) AS open_qty
+  FROM open_qty oq
+  LEFT JOIN delivered_qty dq ON dq.parts_id = oq.parts_id
+  GROUP BY oq.parts_id, oq.sum, dq.sum
+)
+
+SELECT open_qty FROM open_ordered_qty
+
+SQL
+
+  my ($open_qty) = selectfirst_array_query(
+    $::form, $class->object_class->init_db->dbh,
+    $query, $part_id, $part_id, $part_id
+  );
+
+  $open_qty ||= 0;
+  return $open_qty
+}
+
 sub _sort_spec {
   (
     default  => [ 'partnumber', 1 ],
diff --git a/SL/DB/Manager/PriceRuleItem.pm b/SL/DB/Manager/PriceRuleItem.pm
index ba3694c47..97b3e87f6 100644
--- a/SL/DB/Manager/PriceRuleItem.pm
+++ b/SL/DB/Manager/PriceRuleItem.pm
@@ -13,28 +13,44 @@ sub object_class { 'SL::DB::PriceRuleItem' }
 __PACKAGE__->make_manager_methods;
 
 use SL::Locale::String qw(t8);
+use List::Util qw(first);
 
-my @types = qw(
-  part customer vendor business partsgroup qty reqdate transdate pricegroup
-);
+use SL::DB::CustomVariableConfig;
 
 my %ops = (
   'num'  => { eq => '=', le => '<=', ge => '>=' },
   'date' => { eq => '=', lt => '<', gt => '>' },
 );
 
-my %types = (
-  'customer'            => { description => t8('Customer'),           customer => 1, vendor => 0, data_type => 'int',  data => sub { $_[0]->customer->id }, },
-  'vendor'              => { description => t8('Vendor'),             customer => 0, vendor => 1, data_type => 'int',  data => sub { $_[0]->vendor->id }, },
-  'business'            => { description => t8('Type of Business'),   customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[0]->customervendor->business_id }, exclude_nulls => 1 },
-  'reqdate'             => { description => t8('Reqdate'),            customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->reqdate }, ops => 'date' },
-  'transdate'           => { description => t8('Transdate'),          customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->transdate }, ops => 'date' },
-  'part'                => { description => t8('Part'),               customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->id }, },
-  'pricegroup'          => { description => t8('Pricegroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->pricegroup_id }, exclude_nulls => 1 },
-  'partsgroup'          => { description => t8('Partsgroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 },
-  'qty'                 => { description => t8('Qty'),                customer => 1, vendor => 1, data_type => 'num',  data => sub { $_[1]->qty }, ops => 'num' },
+my @types = (
+  { type => 'customer',   description => t8('Customer'),           customer => 1, vendor => 0, data_type => 'int',  data => sub { $_[0]->customer->id }, },
+  { type => 'vendor',     description => t8('Vendor'),             customer => 0, vendor => 1, data_type => 'int',  data => sub { $_[0]->vendor->id }, },
+  { type => 'business',   description => t8('Type of Business'),   customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[0]->customervendor->business_id }, exclude_nulls => 1 },
+  { type => 'reqdate',    description => t8('Reqdate'),            customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->reqdate }, ops => 'date' },
+  { type => 'transdate',  description => t8('Transdate'),          customer => 1, vendor => 1, data_type => 'date', data => sub { $_[0]->transdate }, ops => 'date' },
+  { type => 'part',       description => t8('Part'),               customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->id }, },
+  { type => 'pricegroup', description => t8('Pricegroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->pricegroup_id }, exclude_nulls => 1 },
+  { type => 'partsgroup', description => t8('Partsgroup'),         customer => 1, vendor => 1, data_type => 'int',  data => sub { $_[1]->part->partsgroup_id }, exclude_nulls => 1 },
+  { type => 'qty',        description => t8('Qty'),                customer => 1, vendor => 1, data_type => 'num',  data => sub { $_[1]->qty }, ops => 'num' },
+);
+
+# text, textfield, htmlfield, bool are not supported
+our %price_rule_type_by_cvar_type = (
+  select    => 'text',
+  customer  => 'int',
+  vendor    => 'int',
+  part      => 'int',
+  number    => 'num',
+  date      => 'date',
+  text      => undef,
+  textfield => undef,
+  htmlfield => undef,
+  bool      => undef,
 );
 
+
+# ITEM.part.cvar_by_name(var.config.name)
+
 sub not_matching_sql_and_values {
   my ($class, %params) = @_;
 
@@ -43,14 +59,16 @@ sub not_matching_sql_and_values {
 
   my (@tokens, @values);
 
-  for my $type (@types) {
-    my $def = $types{$type};
+  for my $def (@types, cached_cvar_types()) {
+    my $type = $def->{type};
     next unless $def->{$params{type}};
 
     my $value = $def->{data}->(@args);
 
+    my $type_token = $def->{cvar_config} ? "custom_variable_configs_id = '$def->{cvar_config}'" : "type = '$type'";
+
     if ($def->{exclude_nulls} && !defined $value) {
-      push @tokens, "type = '$type'";
+      push @tokens, $type_token;
     } else {
       my @sub_tokens;
       if ($def->{ops}) {
@@ -65,29 +83,128 @@ sub not_matching_sql_and_values {
         push @values, $value;
       }
 
-      push @tokens, "type = '$type' AND (@{[ join(' OR ', map qq|($_)|, @sub_tokens) ]})";
+      push @tokens, "$type_token AND (@{[ join(' OR ', map qq|($_)|, @sub_tokens) ]})";
     }
   }
 
   return join(' OR ', map "($_)", @tokens), @values;
 }
 
+sub cached_cvar_types {
+  my $cache = $::request->cache("SL::DB::PriceRuleItem::cvar_types", []);
+
+  @$cache = generate_cvar_types() if !@$cache;
+  @$cache
+}
+
+# we only generate cvar types for cvar price_rules that are actually used to keep the query smaller
+# these are cached per request
+sub generate_cvar_types {
+  my @supported_cvar_modules = qw(CT Contacts IC Projects ShipTo);
+
+  my $cvar_configs = SL::DB::Manager::CustomVariableConfig->get_all(query => [ module => \@supported_cvar_modules ]);
+
+  my @types;
+
+  my %ops_by_cvar_type = (
+    number    => 'num',
+    date      => 'date',
+  );
+
+  for my $config (@$cvar_configs) {
+    # cvars can be pretty complicated, but most of that luckily doesn't affect price rule filtering:
+    #   - editable flags are copied to submodule entries - so those need to be preferred
+    #   - cvars may be invalid - but in that case they just won't get crated so we won't find any
+    #   - cvars may be restricted to partgroups, but again, in that case we simply won't find any
+    #   - cvars may have different types of values () just like price_rule_items, but the ->value
+    #     accessor already handles that, so we only need to set the price_rule type accordingly
+
+
+    my %data_by_module = (
+      IC => sub {
+        raw_value(
+          $config->processed_flags->{editable}
+            ? $_[1]->cvar_by_name($config->name)->value
+            : $_[1]->part->cvar_by_name($config->name)->value
+        );
+      },
+      CT => sub {
+        raw_value(
+          $_[0]->customervendor->cvar_by_name($config->name)->value
+        );
+      },
+      Projects => sub {
+        raw_value(
+          $_[1]->project ? $_[1]->project->cvar_by_name($config->name)->value :
+          $_[0]->globalproject ? $_[0]->globalproject->cvar_by_name($config->name)->value : undef
+        );
+      },
+      Contacts => sub {
+        raw_value(
+          $_[0]->contact ? $_[0]->contact->cvar_by_name($config->name)->value : undef
+        );
+      },
+      ShipTo => sub {
+        raw_value(
+          $_[0]->custom_shipto ? $_[0]->custom_shipto->cvar_by_name($config->name)->value :
+          $_[0]->can('shipto') && $_[0]->shipto ? $_[0]->shipto->cvar_by_name($config->name)->value : undef
+
+        );
+      },
+    );
+
+    my $data_type;
+    if (exists $price_rule_type_by_cvar_type{$config->type}) {
+      # known but undef typedefs are ignored.
+      # those cvar configs are not supported and can not be used in price rules
+      $data_type = $price_rule_type_by_cvar_type{$config->type} or next;
+    } else {
+      die "cvar type @{[$config->type]} " . $config->description . " is not supported in price rules";
+    }
+
+    my $ops = $ops_by_cvar_type{$config->type};
+
+    push @types, {
+      type          => "cvar_" . $config->id,
+      description   => $config->description,
+      customer      => 1,
+      vendor        => 1,
+      data_type     => $data_type,
+      data          => $data_by_module{$config->module},
+      exclude_nulls => 1,
+      cvar_config   => $config->id,
+      ops           => $ops,
+    };
+  }
+
+  @types;
+}
+
+sub raw_value {
+  my ($value) = @_;
+  return if !defined $value;
+  return $value->id if (ref $value) =~ /Part|Customer|Contact|Vendor|Project/;
+  return $value if (ref $value) =~ /DateTime/;
+  die "reference value unsupported for binding to price_rules, got ref " . ref $value if ref $value;
+  $value;
+}
+
 sub get_all_types {
   my ($class, $vc) = @_;
 
   $vc
-  ? [ map { [ $_, $types{$_}{description} ] } grep { $types{$_}{$vc} } map { $_ } @types ]
-  : [ map { [ $_, $types{$_}{description} ] } map { $_ } @types ]
+  ? [ map { [ $_->{type}, $_->{description} ] } grep { $_->{$vc} } @types ]
+  : [ map { [ $_->{type}, $_->{description} ] } @types ]
 }
 
 sub get_type {
-  $types{$_[1]}
+  grep { $_->{type} eq $_[1] } @types
 }
 
 sub filter_match {
   my ($self, $type, $value) = @_;
 
-  my $type_def = $types{$type};
+  my $type_def = first { $_->{type} eq $type } @types;
 
   if (!$type_def->{ops}) {
     my $evalue   = $::form->get_standard_dbh->quote($value);
diff --git a/SL/DB/Manager/PurchaseBasketItem.pm b/SL/DB/Manager/PurchaseBasketItem.pm
new file mode 100644
index 000000000..72e778a4b
--- /dev/null
+++ b/SL/DB/Manager/PurchaseBasketItem.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::PurchaseBasketItem;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::PurchaseBasketItem' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/PurchaseInvoice.pm b/SL/DB/Manager/PurchaseInvoice.pm
index ca0bb106e..e5b01f027 100644
--- a/SL/DB/Manager/PurchaseInvoice.pm
+++ b/SL/DB/Manager/PurchaseInvoice.pm
@@ -16,7 +16,8 @@ sub type_filter {
   my $type  = lc(shift || '');
 
   return (or  => [ invoice => 0, invoice => undef                       ]) if $type eq 'ap_transaction';
-  return (and => [ invoice => 1, or => [ storno => 0, storno => undef ] ]) if $type =~ m/^(?:purchase_)?invoice$/;
+  return (and => [ invoice => 1, amount => { lt => 0 }, or => [ storno => 0, storno => undef ] ]) if $type eq 'purchase_credit_note';
+  return (and => [ invoice => 1, amount => { ge => 0 }, or => [ storno => 0, storno => undef ] ]) if $type =~ m/^(?:purchase_)?invoice$/;
   return (and => [ invoice => 1,         storno => 1                    ]) if $type =~ m/(?:invoice_)?storno/;
 
   die "Unknown type $type";
diff --git a/SL/DB/Manager/Reclamation.pm b/SL/DB/Manager/Reclamation.pm
new file mode 100644
index 000000000..c382bd4d2
--- /dev/null
+++ b/SL/DB/Manager/Reclamation.pm
@@ -0,0 +1,73 @@
+package SL::DB::Manager::Reclamation;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+use SL::DB::Helper::Paginated;
+use SL::DB::Helper::Sorted;
+use SL::DB::Helper::Filtered;
+
+sub object_class { 'SL::DB::Reclamation' }
+
+__PACKAGE__->make_manager_methods;
+
+__PACKAGE__->add_filter_specs(
+  type => sub {
+    my ($key, $value, $prefix) = @_;
+    return __PACKAGE__->type_filter($value, $prefix);
+  },
+  # todo when is this used?
+  #all => sub {
+  #  my ($key, $value, $prefix) = @_;
+  #  return or => [ map { $prefix . $_ => $value } qw(record_number customer.name vendor.name transaction_description) ]
+  #}
+);
+
+sub type_filter {
+  my $class  = shift;
+  my $type   = lc(shift || '');
+  my $prefix = shift || '';
+
+  return (and => [ "!customer_id" => undef ]) if $type eq 'sales_reclamation';
+  return (and => [ "!vendor_id"   => undef ]) if $type eq 'purchase_reclamation';
+
+  die "Unknown type $type";
+}
+
+sub _sort_spec {
+  return (
+    default                   => [ 'transdate', 1 ],
+    nulls                     => {
+      transaction_description => 'FIRST',
+      default                 => 'LAST',
+    },
+    columns                   => {
+      SIMPLE                  => 'ALL',
+      customer                => 'lower(customer.name)',
+      vendor                  => 'lower(vendor.name)',
+      employee                => 'lower(employee.name)',
+      salesman                => 'lower(salesman.name)',
+      contact                 => 'lower(contact.cp_name)',
+      language                => 'lower(language.article_code)',
+      department              => 'lower(department.description)',
+      globalprojectnumber     => 'lower(globalproject.projectnumber)',
+      delivery_term           => 'lower(delivery_term.description)',
+      payment                 => 'lower(payment.description)',
+      currency                => 'lower(currency.name)',
+      taxzone                 => 'lower(taxzone.description)',
+
+      # Bug in Rose::DB::Object: the next should be
+      # "globalproject.project_type.description". This workaround will
+      # only work if no other table with "project_type" is visible in
+      # the current query
+      globalproject_type      => 'lower(project_type.description)',
+
+      map { ( $_ => "lower(reclamations.$_)" ) }
+        qw(record_number cv_record_number shippingpoint shipvia notes intnotes
+           transaction_description
+        ),
+    });
+}
+
+1;
diff --git a/SL/DB/Manager/ReclamationItem.pm b/SL/DB/Manager/ReclamationItem.pm
new file mode 100644
index 000000000..c5b346053
--- /dev/null
+++ b/SL/DB/Manager/ReclamationItem.pm
@@ -0,0 +1,14 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::Manager::ReclamationItem;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::ReclamationItem' }
+
+__PACKAGE__->make_manager_methods;
+
+1;
diff --git a/SL/DB/Manager/ReclamationReason.pm b/SL/DB/Manager/ReclamationReason.pm
new file mode 100644
index 000000000..068e3bd7b
--- /dev/null
+++ b/SL/DB/Manager/ReclamationReason.pm
@@ -0,0 +1,25 @@
+package SL::DB::Manager::ReclamationReason;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+use SL::DB::Helper::Paginated;
+use SL::DB::Helper::Filtered;
+
+use SL::DB::Helper::Sorted;
+
+sub object_class { 'SL::DB::ReclamationReason' }
+
+__PACKAGE__->make_manager_methods;
+__PACKAGE__->add_filter_specs(
+  all => sub {
+    my ($key, $value, $prefix) = @_;
+    return or => [ map { $prefix . $_ => $value } qw(reclamation_reason) ]
+  },
+);
+
+sub _sort_spec {
+  return ( default => [ 'position', 1 ],
+           columns => { SIMPLE => 'ALL' });
+}
+1;
diff --git a/SL/DB/Manager/RecordTemplate.pm b/SL/DB/Manager/RecordTemplate.pm
index 48c782746..d81421d84 100644
--- a/SL/DB/Manager/RecordTemplate.pm
+++ b/SL/DB/Manager/RecordTemplate.pm
@@ -6,11 +6,39 @@ use base qw(SL::DB::Helper::Manager);
 
 use SL::DB::Helper::Paginated;
 use SL::DB::Helper::Sorted;
+use SL::DB::Helper::Filtered;
+
+use List::MoreUtils qw(any);
 
 sub object_class { 'SL::DB::RecordTemplate' }
 
 __PACKAGE__->make_manager_methods;
 
+__PACKAGE__->add_filter_specs(
+  type => sub {
+    my ($key, $value, $prefix) = @_;
+    return __PACKAGE__->type_filter($value, $prefix);
+  },
+);
+
+sub type_filter {
+  my $class  = shift;
+  my $type   = lc(shift || '');
+  my $prefix = shift || '';
+
+  # remove '_template' if needed
+  my $template_type = $type;
+  $template_type =~ s/_template$//;
+
+  return ("${prefix}template_type" => $template_type) if( any {$template_type eq $_} (
+      'gl_transaction',
+      'ar_transaction',
+      'ap_transaction',
+    ));
+
+  die "Unknown type $type";
+}
+
 sub _sort_spec {
   return (
     default => [ 'template_name', 1 ],
diff --git a/SL/DB/Manager/ValidityToken.pm b/SL/DB/Manager/ValidityToken.pm
new file mode 100644
index 000000000..e3535d266
--- /dev/null
+++ b/SL/DB/Manager/ValidityToken.pm
@@ -0,0 +1,36 @@
+package SL::DB::Manager::ValidityToken;
+
+use strict;
+
+use parent qw(SL::DB::Helper::Manager);
+
+sub object_class { 'SL::DB::ValidityToken' }
+
+use Carp;
+
+__PACKAGE__->make_manager_methods;
+
+sub cleanup {
+  my ($class) = @_;
+  $class->delete_all(where => [ valid_until => { lt => DateTime->now_local }]);
+}
+
+sub fetch_valid_token {
+  my ($class, %params) = @_;
+
+  croak "missing required parameter 'scope'" if !$params{scope};
+
+  return undef if !$params{token};
+
+  my $token_obj = $class->get_first(
+    where => [
+      scope       => $params{scope},
+      token       => $params{token},
+      valid_until => { ge => DateTime->now_local },
+    ],
+    for_update => 1);
+
+  return $token_obj;
+}
+
+1;
diff --git a/SL/DB/MetaSetup/AdditionalBillingAddress.pm b/SL/DB/MetaSetup/AdditionalBillingAddress.pm
index 3e37db98a..4c7a8a26f 100644
--- a/SL/DB/MetaSetup/AdditionalBillingAddress.pm
+++ b/SL/DB/MetaSetup/AdditionalBillingAddress.pm
@@ -16,6 +16,7 @@ __PACKAGE__->meta->columns(
   default_address => { type => 'boolean', default => 'false', not_null => 1 },
   department_1    => { type => 'text' },
   department_2    => { type => 'text' },
+  dunning_mail    => { type => 'text' },
   email           => { type => 'text' },
   fax             => { type => 'text' },
   gln             => { type => 'text' },
diff --git a/SL/DB/MetaSetup/BackgroundJob.pm b/SL/DB/MetaSetup/BackgroundJob.pm
index ce2ed7e1f..81b175e25 100644
--- a/SL/DB/MetaSetup/BackgroundJob.pm
+++ b/SL/DB/MetaSetup/BackgroundJob.pm
@@ -12,6 +12,7 @@ __PACKAGE__->meta->columns(
   active       => { type => 'boolean' },
   cron_spec    => { type => 'varchar', length => 255 },
   data         => { type => 'text' },
+  description  => { type => 'text' },
   id           => { type => 'serial', not_null => 1 },
   last_run_at  => { type => 'timestamp' },
   next_run_at  => { type => 'timestamp' },
diff --git a/SL/DB/MetaSetup/BackgroundJobHistory.pm b/SL/DB/MetaSetup/BackgroundJobHistory.pm
index ca784fdc4..5fea4d0da 100644
--- a/SL/DB/MetaSetup/BackgroundJobHistory.pm
+++ b/SL/DB/MetaSetup/BackgroundJobHistory.pm
@@ -10,6 +10,7 @@ __PACKAGE__->meta->table('background_job_histories');
 
 __PACKAGE__->meta->columns(
   data         => { type => 'text' },
+  description  => { type => 'text' },
   error        => { type => 'text', alias => 'error_col' },
   id           => { type => 'serial', not_null => 1 },
   package_name => { type => 'varchar', length => 255 },
diff --git a/SL/DB/MetaSetup/BankAccount.pm b/SL/DB/MetaSetup/BankAccount.pm
index d8367789f..738b3f1da 100644
--- a/SL/DB/MetaSetup/BankAccount.pm
+++ b/SL/DB/MetaSetup/BankAccount.pm
@@ -19,11 +19,13 @@ __PACKAGE__->meta->columns(
   id                              => { type => 'integer', not_null => 1, sequence => 'id' },
   name                            => { type => 'text' },
   obsolete                        => { type => 'boolean', default => 'false', not_null => 1 },
+  qr_iban                         => { type => 'text' },
   reconciliation_starting_balance => { type => 'numeric', precision => 15, scale => 5 },
   reconciliation_starting_date    => { type => 'date' },
   sortkey                         => { type => 'integer', not_null => 1 },
   use_for_qrbill                  => { type => 'boolean', default => 'false', not_null => 1 },
   use_for_zugferd                 => { type => 'boolean', default => 'false', not_null => 1 },
+  use_with_bank_import            => { type => 'boolean', default => 'true', not_null => 1 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/BankTransaction.pm b/SL/DB/MetaSetup/BankTransaction.pm
index 70c4132df..0fe255cb8 100644
--- a/SL/DB/MetaSetup/BankTransaction.pm
+++ b/SL/DB/MetaSetup/BankTransaction.pm
@@ -12,11 +12,14 @@ __PACKAGE__->meta->columns(
   amount                => { type => 'numeric', not_null => 1, precision => 15, scale => 5 },
   cleared               => { type => 'boolean', default => 'false', not_null => 1 },
   currency_id           => { type => 'integer', not_null => 1 },
+  end_to_end_id         => { type => 'text' },
+  exchangerate          => { type => 'numeric', precision => 15, scale => 5 },
   id                    => { type => 'serial', not_null => 1 },
   invoice_amount        => { type => 'numeric', default => '0', precision => 15, scale => 5 },
   itime                 => { type => 'timestamp', default => 'now()' },
   local_bank_account_id => { type => 'integer', not_null => 1 },
   purpose               => { type => 'text' },
+  qr_reference          => { type => 'text' },
   remote_account_number => { type => 'text' },
   remote_bank_code      => { type => 'text' },
   remote_name           => { type => 'text' },
diff --git a/SL/DB/MetaSetup/Buchungsgruppe.pm b/SL/DB/MetaSetup/Buchungsgruppe.pm
index e89cb4b1c..e03765d2c 100644
--- a/SL/DB/MetaSetup/Buchungsgruppe.pm
+++ b/SL/DB/MetaSetup/Buchungsgruppe.pm
@@ -12,6 +12,7 @@ __PACKAGE__->meta->columns(
   description        => { type => 'text' },
   id                 => { type => 'integer', not_null => 1, sequence => 'id' },
   inventory_accno_id => { type => 'integer', not_null => 1 },
+  obsolete           => { type => 'boolean', default => 'false', not_null => 1 },
   sortkey            => { type => 'integer', not_null => 1 },
 );
 
diff --git a/SL/DB/MetaSetup/BusinessModel.pm b/SL/DB/MetaSetup/BusinessModel.pm
new file mode 100644
index 000000000..1da32ff6f
--- /dev/null
+++ b/SL/DB/MetaSetup/BusinessModel.pm
@@ -0,0 +1,39 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::BusinessModel;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('business_models');
+
+__PACKAGE__->meta->columns(
+  business_id          => { type => 'integer', not_null => 1 },
+  itime                => { type => 'timestamp', default => 'now()' },
+  model                => { type => 'text' },
+  mtime                => { type => 'timestamp' },
+  part_description     => { type => 'text' },
+  part_longdescription => { type => 'text' },
+  parts_id             => { type => 'integer', not_null => 1 },
+  position             => { type => 'integer' },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'parts_id', 'business_id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  business => {
+    class       => 'SL::DB::Business',
+    key_columns => { business_id => 'id' },
+  },
+
+  parts => {
+    class       => 'SL::DB::Part',
+    key_columns => { parts_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/Chart.pm b/SL/DB/MetaSetup/Chart.pm
index 993fd0d56..1b7628815 100644
--- a/SL/DB/MetaSetup/Chart.pm
+++ b/SL/DB/MetaSetup/Chart.pm
@@ -15,6 +15,7 @@ __PACKAGE__->meta->columns(
   datevautomatik => { type => 'boolean', default => 'false' },
   description    => { type => 'text' },
   id             => { type => 'integer', not_null => 1, sequence => 'id' },
+  invalid        => { type => 'boolean', default => 'false' },
   itime          => { type => 'timestamp', default => 'now()' },
   link           => { type => 'text', not_null => 1 },
   mtime          => { type => 'timestamp' },
diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index 1785a6e2f..6bd0abb66 100644
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -34,6 +34,8 @@ __PACKAGE__->meta->columns(
   depositor                 => { type => 'text' },
   direct_debit              => { type => 'boolean', default => 'false' },
   discount                  => { type => 'float', precision => 4, scale => 4 },
+  dunning_lock              => { type => 'boolean', default => 'false', not_null => 1 },
+  dunning_mail              => { type => 'text' },
   email                     => { type => 'text' },
   fax                       => { type => 'text' },
   gln                       => { type => 'text' },
diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 295c6e778..0a609c81e 100644
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -22,14 +22,15 @@ __PACKAGE__->meta->columns(
   allow_new_purchase_invoice                => { type => 'boolean', default => 'true', not_null => 1 },
   allow_sales_invoice_from_sales_order      => { type => 'boolean', default => 'true', not_null => 1 },
   allow_sales_invoice_from_sales_quotation  => { type => 'boolean', default => 'true', not_null => 1 },
+  allowed_documents_with_no_positions       => { type => 'array' },
   always_record_links_from_order            => { type => 'boolean', default => 'false' },
   ap_add_doc                                => { type => 'boolean', default => 'false', not_null => 1 },
   ap_changeable                             => { type => 'integer', default => 2, not_null => 1 },
-  ap_chart_id                               => { type => 'integer' },
+  ap_chart_id                               => { type => 'integer', not_null => 1 },
   ap_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
   ar_add_doc                                => { type => 'boolean', default => 'false', not_null => 1 },
   ar_changeable                             => { type => 'integer', default => 2, not_null => 1 },
-  ar_chart_id                               => { type => 'integer' },
+  ar_chart_id                               => { type => 'integer', not_null => 1 },
   ar_paid_accno_id                          => { type => 'integer' },
   ar_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
   articlenumber                             => { type => 'text' },
@@ -41,6 +42,7 @@ __PACKAGE__->meta->columns(
   bin_id_ignore_onhand                      => { type => 'integer' },
   businessnumber                            => { type => 'text' },
   carry_over_account_chart_id               => { type => 'integer' },
+  check_bt_duplicates_endtoend              => { type => 'boolean', default => 'false' },
   closedto                                  => { type => 'date' },
   cnnumber                                  => { type => 'text' },
   co_ustid                                  => { type => 'text' },
@@ -79,11 +81,23 @@ __PACKAGE__->meta->columns(
   dunning_ar_amount_fee                     => { type => 'integer' },
   dunning_ar_amount_interest                => { type => 'integer' },
   dunning_creator                           => { type => 'enum', check_in => [ 'current_employee', 'invoice_employee' ], db_type => 'dunning_creator', default => 'current_employee' },
+  dunning_original_invoice_creation_mode    => { type => 'enum', check_in => [ 'create_new', 'use_last_created_or_create_new' ], db_type => 'invoice_creation_mode', default => 'create_new' },
   duns                                      => { type => 'text' },
   email_attachment_part_files_checked       => { type => 'boolean', default => 'true' },
   email_attachment_record_files_checked     => { type => 'boolean', default => 'true' },
   email_attachment_vc_files_checked         => { type => 'boolean', default => 'true' },
   email_journal                             => { type => 'integer', default => 2 },
+  email_sender_dunning                      => { type => 'text', default => '' },
+  email_sender_invoice                      => { type => 'text', default => '' },
+  email_sender_letter                       => { type => 'text', default => '' },
+  email_sender_purchase_delivery_order      => { type => 'text', default => '' },
+  email_sender_purchase_invoice             => { type => 'text', default => '' },
+  email_sender_purchase_order               => { type => 'text', default => '' },
+  email_sender_request_quotation            => { type => 'text', default => '' },
+  email_sender_sales_delivery_order         => { type => 'text', default => '' },
+  email_sender_sales_order                  => { type => 'text', default => '' },
+  email_sender_sales_quotation              => { type => 'text', default => '' },
+  email_subject_transaction_description     => { type => 'boolean', default => 'false' },
   expense_accno_id                          => { type => 'integer' },
   fa_bufa_nr                                => { type => 'text' },
   fa_dauerfrist                             => { type => 'text' },
@@ -96,9 +110,9 @@ __PACKAGE__->meta->columns(
   feature_datev                             => { type => 'boolean', default => 'true', not_null => 1 },
   feature_erfolgsrechnung                   => { type => 'boolean', default => 'false', not_null => 1 },
   feature_eurechnung                        => { type => 'boolean', default => 'true', not_null => 1 },
-  feature_experimental_assortment           => { type => 'boolean', default => 'true', not_null => 1 },
-  feature_experimental_order                => { type => 'boolean', default => 'true', not_null => 1 },
   feature_ustva                             => { type => 'boolean', default => 'true', not_null => 1 },
+  fuzzy_skonto                              => { type => 'boolean', default => 'true' },
+  fuzzy_skonto_percentage                   => { type => 'float', default => '0.5', precision => 4, scale => 4 },
   fxgain_accno_id                           => { type => 'integer' },
   fxloss_accno_id                           => { type => 'integer' },
   gl_add_doc                                => { type => 'boolean', default => 'false', not_null => 1 },
@@ -110,7 +124,6 @@ __PACKAGE__->meta->columns(
   inventory_system                          => { type => 'text' },
   invnumber                                 => { type => 'text' },
   invoice_mail_settings                     => { type => 'enum', check_in => [ 'cp', 'invoice_mail', 'invoice_mail_cc_cp' ], db_type => 'invoice_mail_settings', default => 'cp' },
-  invoice_prevent_browser_back              => { type => 'boolean', default => 'false', not_null => 1 },
   ir_add_doc                                => { type => 'boolean', default => 'false', not_null => 1 },
   ir_changeable                             => { type => 'integer', default => 2, not_null => 1 },
   ir_show_mark_as_paid                      => { type => 'boolean', default => 'true' },
@@ -119,23 +132,30 @@ __PACKAGE__->meta->columns(
   is_transfer_out                           => { type => 'boolean', default => 'false', not_null => 1 },
   itime                                     => { type => 'timestamp', default => 'now()' },
   language_id                               => { type => 'integer' },
+  layout_style                              => { type => 'text' },
   letternumber                              => { type => 'integer' },
+  lock_oe_subversions                       => { type => 'boolean', default => 'false', not_null => 1 },
   loss_carried_forward_chart_id             => { type => 'integer' },
   max_future_booking_interval               => { type => 'integer', default => 360 },
   mtime                                     => { type => 'timestamp' },
+  no_bank_proposals                         => { type => 'boolean', default => 'false' },
   normalize_part_descriptions               => { type => 'boolean', default => 'true' },
   normalize_vc_names                        => { type => 'boolean', default => 'true' },
   order_always_project                      => { type => 'boolean', default => 'false' },
+  order_item_input_position                 => { type => 'integer', default => '0', not_null => 1 },
   order_warn_duplicate_parts                => { type => 'boolean', default => 'true' },
   order_warn_no_cusordnumber                => { type => 'boolean', default => 'false' },
   order_warn_no_deliverydate                => { type => 'boolean', default => 'true' },
+  p_reclamation_record_number               => { type => 'text', default => '0', not_null => 1 },
   parts_image_css                           => { type => 'text', default => 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;' },
   parts_listing_image                       => { type => 'boolean', default => 'true' },
   parts_show_image                          => { type => 'boolean', default => 'true' },
   partsgroup_required                       => { type => 'boolean', default => 'false', not_null => 1 },
   payments_changeable                       => { type => 'integer', default => '0', not_null => 1 },
   pdonumber                                 => { type => 'text' },
+  pocnumber                                 => { type => 'text' },
   ponumber                                  => { type => 'text' },
+  pqinumber                                 => { type => 'text' },
   precision                                 => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 },
   print_interpolate_variables_in_positions  => { type => 'boolean', default => 'true', not_null => 1 },
   produce_assembly_same_warehouse           => { type => 'boolean', default => 'true' },
@@ -148,8 +168,14 @@ __PACKAGE__->meta->columns(
   purchase_delivery_order_check_stocked     => { type => 'boolean', default => 'false' },
   purchase_delivery_order_show_delete       => { type => 'boolean', default => 'true' },
   purchase_order_show_delete                => { type => 'boolean', default => 'true' },
+  purchase_reclamation_show_delete          => { type => 'boolean', default => 'true', not_null => 1 },
+  qrbill_copy_invnumber                     => { type => 'boolean', default => 'false' },
   quick_search_modules                      => { type => 'array' },
   rdonumber                                 => { type => 'text' },
+  reclamation_warn_duplicate_parts          => { type => 'boolean', default => 'true', not_null => 1 },
+  reclamation_warn_no_reqdate               => { type => 'boolean', default => 'true', not_null => 1 },
+  record_links_from_order_with_myself       => { type => 'boolean', default => 'false' },
+  record_links_from_order_with_quotations   => { type => 'boolean', default => 'false' },
   reqdate_interval                          => { type => 'integer', default => '0' },
   reqdate_on                                => { type => 'boolean', default => 'true' },
   require_transaction_description_ps        => { type => 'boolean', default => 'false', not_null => 1 },
@@ -159,15 +185,18 @@ __PACKAGE__->meta->columns(
   rmanumber                                 => { type => 'text' },
   rndgain_accno_id                          => { type => 'integer' },
   rndloss_accno_id                          => { type => 'integer' },
+  s_reclamation_record_number               => { type => 'text', default => '0', not_null => 1 },
   sales_delivery_order_check_service        => { type => 'boolean', default => 'true' },
   sales_delivery_order_check_stocked        => { type => 'boolean', default => 'false' },
   sales_delivery_order_show_delete          => { type => 'boolean', default => 'true' },
   sales_order_show_delete                   => { type => 'boolean', default => 'true' },
   sales_purchase_order_ship_missing_column  => { type => 'boolean', default => 'false' },
   sales_purchase_record_numbers_changeable  => { type => 'boolean', default => 'false', not_null => 1 },
+  sales_reclamation_show_delete             => { type => 'boolean', default => 'true', not_null => 1 },
   sales_serial_eq_charge                    => { type => 'boolean', default => 'false', not_null => 1 },
   sdonumber                                 => { type => 'text' },
   sepa_creditor_id                          => { type => 'text' },
+  sepa_export_xml                           => { type => 'boolean', default => 'true' },
   sepa_reference_add_vc_vc_id               => { type => 'boolean', default => 'false' },
   sepa_set_duedate_as_default_exec_date     => { type => 'boolean', default => 'false' },
   sepa_set_skonto_date_as_default_exec_date => { type => 'boolean', default => 'false' },
@@ -175,9 +204,16 @@ __PACKAGE__->meta->columns(
   servicenumber                             => { type => 'text' },
   shipped_qty_require_stock_out             => { type => 'boolean', default => 'false', not_null => 1 },
   show_bestbefore                           => { type => 'boolean', default => 'false' },
+  show_invoice_for_advance_payment          => { type => 'boolean', default => 'true', not_null => 1 },
   show_longdescription_select_item          => { type => 'boolean', default => 'false' },
+  show_purchase_order_confirmation          => { type => 'boolean', default => 'true', not_null => 1 },
+  show_purchase_quotation_intake            => { type => 'boolean', default => 'true', not_null => 1 },
+  show_purchase_reclamation                 => { type => 'boolean', default => 'true', not_null => 1 },
+  show_sales_order_intake                   => { type => 'boolean', default => 'true', not_null => 1 },
+  show_sales_reclamation                    => { type => 'boolean', default => 'true', not_null => 1 },
   show_weight                               => { type => 'boolean', default => 'false', not_null => 1 },
   signature                                 => { type => 'text' },
+  soinumber                                 => { type => 'text' },
   sonumber                                  => { type => 'text' },
   sqnumber                                  => { type => 'text' },
   stocktaking_bin_id                        => { type => 'integer' },
@@ -191,6 +227,7 @@ __PACKAGE__->meta->columns(
   transfer_default_ignore_onhand            => { type => 'boolean', default => 'false' },
   transfer_default_services                 => { type => 'boolean', default => 'true' },
   transfer_default_use_master_default_bin   => { type => 'boolean', default => 'false' },
+  transit_items_chart_id                    => { type => 'integer' },
   transport_cost_reminder_article_number_id => { type => 'integer' },
   undo_transfer_interval                    => { type => 'integer', default => 7 },
   vc_greetings_use_textfield                => { type => 'boolean' },
@@ -203,8 +240,13 @@ __PACKAGE__->meta->columns(
   warn_no_delivery_order_for_invoice        => { type => 'boolean', default => 'false' },
   webdav                                    => { type => 'boolean', default => 'false' },
   webdav_documents                          => { type => 'boolean', default => 'false' },
+  webdav_sync_extern                        => { type => 'boolean', default => 'false' },
+  webdav_sync_extern_login                  => { type => 'text' },
+  webdav_sync_extern_pass                   => { type => 'text' },
+  webdav_sync_extern_url                    => { type => 'text' },
   weightunit                                => { type => 'varchar', length => 5 },
   workflow_po_ap_chart_id                   => { type => 'integer' },
+  yearend_method                            => { type => 'text', default => 'default', not_null => 1 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/DeliveryOrder.pm b/SL/DB/MetaSetup/DeliveryOrder.pm
index 994fa96d7..2ab10c362 100644
--- a/SL/DB/MetaSetup/DeliveryOrder.pm
+++ b/SL/DB/MetaSetup/DeliveryOrder.pm
@@ -9,39 +9,40 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('delivery_orders');
 
 __PACKAGE__->meta->columns(
-  billing_address_id      => { type => 'integer' },
-  closed                  => { type => 'boolean', default => 'false' },
-  cp_id                   => { type => 'integer' },
-  currency_id             => { type => 'integer', not_null => 1 },
-  cusordnumber            => { type => 'text' },
-  customer_id             => { type => 'integer' },
-  delivered               => { type => 'boolean', default => 'false' },
-  delivery_term_id        => { type => 'integer' },
-  department_id           => { type => 'integer' },
-  donumber                => { type => 'text', not_null => 1 },
-  employee_id             => { type => 'integer' },
-  globalproject_id        => { type => 'integer' },
-  id                      => { type => 'integer', not_null => 1, sequence => 'id' },
-  intnotes                => { type => 'text' },
-  itime                   => { type => 'timestamp', default => 'now()' },
-  language_id             => { type => 'integer' },
-  mtime                   => { type => 'timestamp' },
-  notes                   => { type => 'text' },
-  order_type              => { type => 'text', not_null => 1 },
-  ordnumber               => { type => 'text' },
-  oreqnumber              => { type => 'text' },
-  payment_id              => { type => 'integer' },
-  reqdate                 => { type => 'date' },
-  salesman_id             => { type => 'integer' },
-  shippingpoint           => { type => 'text' },
-  shipto_id               => { type => 'integer' },
-  shipvia                 => { type => 'text' },
-  tax_point               => { type => 'date' },
-  taxincluded             => { type => 'boolean' },
-  taxzone_id              => { type => 'integer', not_null => 1 },
-  transaction_description => { type => 'text' },
-  transdate               => { type => 'date', default => 'now()' },
-  vendor_id               => { type => 'integer' },
+  billing_address_id         => { type => 'integer' },
+  closed                     => { type => 'boolean', default => 'false' },
+  cp_id                      => { type => 'integer' },
+  currency_id                => { type => 'integer', not_null => 1 },
+  cusordnumber               => { type => 'text' },
+  customer_id                => { type => 'integer' },
+  delivered                  => { type => 'boolean', default => 'false' },
+  delivery_term_id           => { type => 'integer' },
+  department_id              => { type => 'integer' },
+  donumber                   => { type => 'text', not_null => 1 },
+  employee_id                => { type => 'integer' },
+  globalproject_id           => { type => 'integer' },
+  id                         => { type => 'integer', not_null => 1, sequence => 'id' },
+  intnotes                   => { type => 'text' },
+  itime                      => { type => 'timestamp', default => 'now()' },
+  language_id                => { type => 'integer' },
+  mtime                      => { type => 'timestamp' },
+  notes                      => { type => 'text' },
+  ordnumber                  => { type => 'text' },
+  oreqnumber                 => { type => 'text' },
+  payment_id                 => { type => 'integer' },
+  record_type                => { type => 'enum', check_in => [ 'sales_delivery_order', 'purchase_delivery_order', 'supplier_delivery_order', 'rma_delivery_order' ], db_type => 'delivery_order_types', not_null => 1 },
+  reqdate                    => { type => 'date' },
+  salesman_id                => { type => 'integer' },
+  shippingpoint              => { type => 'text' },
+  shipto_id                  => { type => 'integer' },
+  shipvia                    => { type => 'text' },
+  tax_point                  => { type => 'date' },
+  taxincluded                => { type => 'boolean' },
+  taxzone_id                 => { type => 'integer', not_null => 1 },
+  transaction_description    => { type => 'text' },
+  transdate                  => { type => 'date', default => 'now()' },
+  vendor_confirmation_number => { type => 'text' },
+  vendor_id                  => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/DeliveryOrderItem.pm b/SL/DB/MetaSetup/DeliveryOrderItem.pm
index 7d24d1ca2..6c8f5a2ed 100644
--- a/SL/DB/MetaSetup/DeliveryOrderItem.pm
+++ b/SL/DB/MetaSetup/DeliveryOrderItem.pm
@@ -22,6 +22,7 @@ __PACKAGE__->meta->columns(
   longdescription        => { type => 'text' },
   marge_price_factor     => { type => 'numeric', default => 1, precision => 15, scale => 5 },
   mtime                  => { type => 'timestamp' },
+  orderer_id             => { type => 'integer' },
   ordnumber              => { type => 'text' },
   parts_id               => { type => 'integer', not_null => 1 },
   position               => { type => 'integer', not_null => 1 },
@@ -47,6 +48,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { delivery_order_id => 'id' },
   },
 
+  orderer => {
+    class       => 'SL::DB::Employee',
+    key_columns => { orderer_id => 'id' },
+  },
+
   part => {
     class       => 'SL::DB::Part',
     key_columns => { parts_id => 'id' },
diff --git a/SL/DB/MetaSetup/DeliveryTerm.pm b/SL/DB/MetaSetup/DeliveryTerm.pm
index cfaabde3b..6dcf94c98 100644
--- a/SL/DB/MetaSetup/DeliveryTerm.pm
+++ b/SL/DB/MetaSetup/DeliveryTerm.pm
@@ -14,6 +14,7 @@ __PACKAGE__->meta->columns(
   id               => { type => 'integer', not_null => 1, sequence => 'id' },
   itime            => { type => 'timestamp', default => 'now()' },
   mtime            => { type => 'timestamp' },
+  obsolete         => { type => 'boolean', default => 'false', not_null => 1 },
   sortkey          => { type => 'integer', not_null => 1 },
 );
 
diff --git a/SL/DB/MetaSetup/EmailImport.pm b/SL/DB/MetaSetup/EmailImport.pm
new file mode 100644
index 000000000..21060b70b
--- /dev/null
+++ b/SL/DB/MetaSetup/EmailImport.pm
@@ -0,0 +1,24 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::EmailImport;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('email_imports');
+
+__PACKAGE__->meta->columns(
+  folder    => { type => 'text', not_null => 1 },
+  host_name => { type => 'text', not_null => 1 },
+  id        => { type => 'serial', not_null => 1 },
+  itime     => { type => 'timestamp', default => 'now()', not_null => 1 },
+  user_name => { type => 'text', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/EmailJournal.pm b/SL/DB/MetaSetup/EmailJournal.pm
index d6dceb7ac..7e1e6bc1e 100644
--- a/SL/DB/MetaSetup/EmailJournal.pm
+++ b/SL/DB/MetaSetup/EmailJournal.pm
@@ -9,18 +9,24 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('email_journal');
 
 __PACKAGE__->meta->columns(
-  body            => { type => 'text', not_null => 1 },
-  extended_status => { type => 'text', not_null => 1 },
-  from            => { type => 'text', not_null => 1 },
-  headers         => { type => 'text', not_null => 1 },
-  id              => { type => 'serial', not_null => 1 },
-  itime           => { type => 'timestamp', default => 'now()', not_null => 1 },
-  mtime           => { type => 'timestamp', default => 'now()', not_null => 1 },
-  recipients      => { type => 'text', not_null => 1 },
-  sender_id       => { type => 'integer' },
-  sent_on         => { type => 'timestamp', default => 'now()', not_null => 1 },
-  status          => { type => 'text', not_null => 1 },
-  subject         => { type => 'text', not_null => 1 },
+  body               => { type => 'text', not_null => 1 },
+  email_import_id    => { type => 'integer' },
+  extended_status    => { type => 'text', not_null => 1 },
+  folder             => { type => 'text' },
+  folder_uidvalidity => { type => 'text' },
+  from               => { type => 'text', not_null => 1 },
+  headers            => { type => 'text', not_null => 1 },
+  id                 => { type => 'serial', not_null => 1 },
+  itime              => { type => 'timestamp', default => 'now()', not_null => 1 },
+  mtime              => { type => 'timestamp', default => 'now()', not_null => 1 },
+  obsolete           => { type => 'boolean', default => 'false', not_null => 1 },
+  recipients         => { type => 'text', not_null => 1 },
+  record_type        => { type => 'enum', check_in => [ 'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation', 'purchase_quotation_intake', 'sales_order_intake', 'sales_delivery_order', 'purchase_delivery_order', 'supplier_delivery_order', 'rma_delivery_order', 'sales_reclamation', 'purchase_reclamation', 'invoice', 'invoice_for_advance_payment', 'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno', 'credit_note', 'credit_note_storno', 'purchase_invoice', 'purchase_credit_note', 'ap_transaction', 'ar_transaction', 'gl_transaction', 'purchase_order_confirmation', 'catch_all' ], db_type => 'email_journal_record_type' },
+  sender_id          => { type => 'integer' },
+  sent_on            => { type => 'timestamp', default => 'now()', not_null => 1 },
+  status             => { type => 'enum', check_in => [ 'sent', 'send_failed', 'imported' ], db_type => 'email_journal_status', not_null => 1 },
+  subject            => { type => 'text', not_null => 1 },
+  uid                => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -28,6 +34,11 @@ __PACKAGE__->meta->primary_key_columns([ 'id' ]);
 __PACKAGE__->meta->allow_inline_column_values(1);
 
 __PACKAGE__->meta->foreign_keys(
+  email_import => {
+    class       => 'SL::DB::EmailImport',
+    key_columns => { email_import_id => 'id' },
+  },
+
   sender => {
     class       => 'SL::DB::Employee',
     key_columns => { sender_id => 'id' },
diff --git a/SL/DB/MetaSetup/File.pm b/SL/DB/MetaSetup/File.pm
index e5fd62246..416a1b122 100644
--- a/SL/DB/MetaSetup/File.pm
+++ b/SL/DB/MetaSetup/File.pm
@@ -9,7 +9,7 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('files');
 
 __PACKAGE__->meta->columns(
-  backend       => { type => 'text' },
+  backend       => { type => 'enum', check_in => [ 'Filesystem', 'Webdav' ], db_type => 'files_backends', not_null => 1 },
   backend_data  => { type => 'text' },
   description   => { type => 'text' },
   file_name     => { type => 'text', not_null => 1 },
@@ -19,10 +19,11 @@ __PACKAGE__->meta->columns(
   mime_type     => { type => 'text', not_null => 1 },
   mtime         => { type => 'timestamp' },
   object_id     => { type => 'integer', not_null => 1 },
-  object_type   => { type => 'text', not_null => 1 },
+  object_type   => { type => 'enum', check_in => [ 'sales_quotation', 'sales_order', 'sales_order_intake', 'request_quotation', 'purchase_quotation_intake', 'purchase_order', 'purchase_order_confirmation', 'sales_delivery_order', 'supplier_delivery_order', 'purchase_delivery_order', 'rma_delivery_order', 'invoice', 'invoice_for_advance_payment', 'final_invoice', 'credit_note', 'purchase_invoice', 'sales_reclamation', 'purchase_reclamation', 'dunning', 'dunning1', 'dunning2', 'dunning3', 'dunning_orig_invoice', 'dunning_invoice', 'customer', 'vendor', 'gl_transaction', 'part', 'shop_image', 'draft', 'letter', 'project', 'statement' ], db_type => 'file_object_types', not_null => 1 },
   print_variant => { type => 'text' },
   source        => { type => 'text', not_null => 1 },
   title         => { type => 'varchar', length => 45 },
+  uid           => { type => 'text' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/FileVersion.pm b/SL/DB/MetaSetup/FileVersion.pm
new file mode 100644
index 000000000..2db43eebb
--- /dev/null
+++ b/SL/DB/MetaSetup/FileVersion.pm
@@ -0,0 +1,34 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::FileVersion;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('file_versions');
+
+__PACKAGE__->meta->columns(
+  backend       => { type => 'text', not_null => 1 },
+  doc_path      => { type => 'text', not_null => 1 },
+  file_id       => { type => 'integer', not_null => 1 },
+  file_location => { type => 'text', not_null => 1 },
+  guid          => { type => 'text', not_null => 1 },
+  itime         => { type => 'timestamp', default => 'now()', not_null => 1 },
+  mtime         => { type => 'timestamp' },
+  version       => { type => 'integer', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'guid' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  file => {
+    class       => 'SL::DB::File',
+    key_columns => { file_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/FollowUp.pm b/SL/DB/MetaSetup/FollowUp.pm
index 1659f8f4c..d3947038b 100644
--- a/SL/DB/MetaSetup/FollowUp.pm
+++ b/SL/DB/MetaSetup/FollowUp.pm
@@ -9,14 +9,12 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('follow_ups');
 
 __PACKAGE__->meta->columns(
-  created_by       => { type => 'integer', not_null => 1 },
-  created_for_user => { type => 'integer', not_null => 1 },
-  done             => { type => 'boolean', default => 'false' },
-  follow_up_date   => { type => 'date', not_null => 1 },
-  id               => { type => 'integer', not_null => 1, sequence => 'follow_up_id' },
-  itime            => { type => 'timestamp', default => 'now()' },
-  mtime            => { type => 'timestamp' },
-  note_id          => { type => 'integer', not_null => 1 },
+  created_by     => { type => 'integer', not_null => 1 },
+  follow_up_date => { type => 'date', not_null => 1 },
+  id             => { type => 'integer', not_null => 1, sequence => 'follow_up_id' },
+  itime          => { type => 'timestamp', default => 'now()' },
+  mtime          => { type => 'timestamp' },
+  note_id        => { type => 'integer', not_null => 1 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -29,11 +27,6 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { created_by => 'id' },
   },
 
-  created_for_employee => {
-    class       => 'SL::DB::Employee',
-    key_columns => { created_for_user => 'id' },
-  },
-
   note => {
     class       => 'SL::DB::Note',
     key_columns => { note_id => 'id' },
diff --git a/SL/DB/MetaSetup/FollowUpCreatedForEmployee.pm b/SL/DB/MetaSetup/FollowUpCreatedForEmployee.pm
new file mode 100644
index 000000000..698b4d090
--- /dev/null
+++ b/SL/DB/MetaSetup/FollowUpCreatedForEmployee.pm
@@ -0,0 +1,32 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::FollowUpCreatedForEmployee;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('follow_up_created_for_employees');
+
+__PACKAGE__->meta->columns(
+  employee_id  => { type => 'integer', not_null => 1 },
+  follow_up_id => { type => 'integer', not_null => 1 },
+  id           => { type => 'serial', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->foreign_keys(
+  employee => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
+  follow_up => {
+    class       => 'SL::DB::FollowUp',
+    key_columns => { follow_up_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/FollowUpDone.pm b/SL/DB/MetaSetup/FollowUpDone.pm
new file mode 100644
index 000000000..a8f864f3b
--- /dev/null
+++ b/SL/DB/MetaSetup/FollowUpDone.pm
@@ -0,0 +1,38 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::FollowUpDone;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('follow_up_done');
+
+__PACKAGE__->meta->columns(
+  done_at      => { type => 'timestamp', default => 'now()', not_null => 1 },
+  employee_id  => { type => 'integer' },
+  follow_up_id => { type => 'integer', not_null => 1 },
+  id           => { type => 'serial', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->unique_keys([ 'follow_up_id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  employee => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
+  follow_up => {
+    class       => 'SL::DB::FollowUp',
+    key_columns => { follow_up_id => 'id' },
+    rel_type    => 'one to one',
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/Invoice.pm b/SL/DB/MetaSetup/Invoice.pm
index e80b110e4..d94dada92 100644
--- a/SL/DB/MetaSetup/Invoice.pm
+++ b/SL/DB/MetaSetup/Invoice.pm
@@ -26,6 +26,7 @@ __PACKAGE__->meta->columns(
   duedate                   => { type => 'date' },
   dunning_config_id         => { type => 'integer' },
   employee_id               => { type => 'integer' },
+  exchangerate              => { type => 'numeric', precision => 15, scale => 5 },
   gldate                    => { type => 'date', default => 'now' },
   globalproject_id          => { type => 'integer' },
   id                        => { type => 'integer', not_null => 1, sequence => 'glid' },
@@ -44,6 +45,8 @@ __PACKAGE__->meta->columns(
   ordnumber                 => { type => 'text' },
   paid                      => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
   payment_id                => { type => 'integer' },
+  qr_reference              => { type => 'text' },
+  qr_unstructured_message   => { type => 'text' },
   qrbill_without_amount     => { type => 'boolean', default => 'false' },
   quodate                   => { type => 'date' },
   quonumber                 => { type => 'text' },
diff --git a/SL/DB/MetaSetup/InvoiceItem.pm b/SL/DB/MetaSetup/InvoiceItem.pm
index 8a67022fc..173392950 100644
--- a/SL/DB/MetaSetup/InvoiceItem.pm
+++ b/SL/DB/MetaSetup/InvoiceItem.pm
@@ -19,8 +19,10 @@ __PACKAGE__->meta->columns(
   description            => { type => 'text' },
   discount               => { type => 'float', precision => 4, scale => 4 },
   donumber               => { type => 'text' },
+  expense_chart_id       => { type => 'integer' },
   fxsellprice            => { type => 'numeric', precision => 15, scale => 5 },
   id                     => { type => 'integer', not_null => 1, sequence => 'invoiceid' },
+  inventory_chart_id     => { type => 'integer' },
   itime                  => { type => 'timestamp', default => 'now()' },
   lastcost               => { type => 'numeric', precision => 15, scale => 5 },
   longdescription        => { type => 'text' },
@@ -39,6 +41,8 @@ __PACKAGE__->meta->columns(
   sellprice              => { type => 'numeric', precision => 15, scale => 5 },
   serialnumber           => { type => 'text' },
   subtotal               => { type => 'boolean', default => 'false' },
+  tax_chart_type         => { type => 'varchar', length => 20 },
+  tax_id                 => { type => 'integer' },
   trans_id               => { type => 'integer' },
   transdate              => { type => 'text' },
   unit                   => { type => 'varchar', length => 20 },
@@ -49,6 +53,16 @@ __PACKAGE__->meta->primary_key_columns([ 'id' ]);
 __PACKAGE__->meta->allow_inline_column_values(1);
 
 __PACKAGE__->meta->foreign_keys(
+  expense_chart => {
+    class       => 'SL::DB::Chart',
+    key_columns => { expense_chart_id => 'id' },
+  },
+
+  inventory_chart => {
+    class       => 'SL::DB::Chart',
+    key_columns => { inventory_chart_id => 'id' },
+  },
+
   part => {
     class       => 'SL::DB::Part',
     key_columns => { parts_id => 'id' },
@@ -69,6 +83,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { project_id => 'id' },
   },
 
+  tax => {
+    class       => 'SL::DB::Tax',
+    key_columns => { tax_id => 'id' },
+  },
+
   unit_obj => {
     class       => 'SL::DB::Unit',
     key_columns => { unit => 'name' },
diff --git a/SL/DB/MetaSetup/MakeModel.pm b/SL/DB/MetaSetup/MakeModel.pm
index e13461a6d..9f1ea2b3d 100644
--- a/SL/DB/MetaSetup/MakeModel.pm
+++ b/SL/DB/MetaSetup/MakeModel.pm
@@ -9,15 +9,17 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('makemodel');
 
 __PACKAGE__->meta->columns(
-  id         => { type => 'serial', not_null => 1 },
-  itime      => { type => 'timestamp', default => 'now()' },
-  lastcost   => { type => 'numeric', precision => 15, scale => 5 },
-  lastupdate => { type => 'date' },
-  make       => { type => 'integer' },
-  model      => { type => 'text' },
-  mtime      => { type => 'timestamp' },
-  parts_id   => { type => 'integer' },
-  sortorder  => { type => 'integer' },
+  id                   => { type => 'serial', not_null => 1 },
+  itime                => { type => 'timestamp', default => 'now()' },
+  lastcost             => { type => 'numeric', precision => 15, scale => 5 },
+  lastupdate           => { type => 'date' },
+  make                 => { type => 'integer' },
+  model                => { type => 'text' },
+  mtime                => { type => 'timestamp' },
+  part_description     => { type => 'text' },
+  part_longdescription => { type => 'text' },
+  parts_id             => { type => 'integer' },
+  sortorder            => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/Order.pm b/SL/DB/MetaSetup/Order.pm
index 5dda64254..ba136e103 100644
--- a/SL/DB/MetaSetup/Order.pm
+++ b/SL/DB/MetaSetup/Order.pm
@@ -9,48 +9,50 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('oe');
 
 __PACKAGE__->meta->columns(
-  amount                  => { type => 'numeric', precision => 15, scale => 5 },
-  billing_address_id      => { type => 'integer' },
-  closed                  => { type => 'boolean', default => 'false' },
-  cp_id                   => { type => 'integer' },
-  currency_id             => { type => 'integer', not_null => 1 },
-  cusordnumber            => { type => 'text' },
-  customer_id             => { type => 'integer' },
-  delivered               => { type => 'boolean', default => 'false' },
-  delivery_customer_id    => { type => 'integer' },
-  delivery_term_id        => { type => 'integer' },
-  delivery_vendor_id      => { type => 'integer' },
-  department_id           => { type => 'integer' },
-  employee_id             => { type => 'integer' },
-  exchangerate            => { type => 'numeric', precision => 15, scale => 5 },
-  expected_billing_date   => { type => 'date' },
-  globalproject_id        => { type => 'integer' },
-  id                      => { type => 'integer', not_null => 1, sequence => 'id' },
-  intnotes                => { type => 'text' },
-  itime                   => { type => 'timestamp', default => 'now()' },
-  language_id             => { type => 'integer' },
-  marge_percent           => { type => 'numeric', precision => 15, scale => 5 },
-  marge_total             => { type => 'numeric', precision => 15, scale => 5 },
-  mtime                   => { type => 'timestamp' },
-  netamount               => { type => 'numeric', precision => 15, scale => 5 },
-  notes                   => { type => 'text' },
-  order_probability       => { type => 'integer', default => '0', not_null => 1 },
-  ordnumber               => { type => 'text', not_null => 1 },
-  payment_id              => { type => 'integer' },
-  proforma                => { type => 'boolean', default => 'false' },
-  quonumber               => { type => 'text' },
-  quotation               => { type => 'boolean', default => 'false' },
-  reqdate                 => { type => 'date' },
-  salesman_id             => { type => 'integer' },
-  shippingpoint           => { type => 'text' },
-  shipto_id               => { type => 'integer' },
-  shipvia                 => { type => 'text' },
-  tax_point               => { type => 'date' },
-  taxincluded             => { type => 'boolean' },
-  taxzone_id              => { type => 'integer', not_null => 1 },
-  transaction_description => { type => 'text' },
-  transdate               => { type => 'date', default => 'now' },
-  vendor_id               => { type => 'integer' },
+  amount                     => { type => 'numeric', precision => 15, scale => 5 },
+  billing_address_id         => { type => 'integer' },
+  closed                     => { type => 'boolean', default => 'false' },
+  cp_id                      => { type => 'integer' },
+  currency_id                => { type => 'integer', not_null => 1 },
+  cusordnumber               => { type => 'text' },
+  customer_id                => { type => 'integer' },
+  delivered                  => { type => 'boolean', default => 'false' },
+  delivery_customer_id       => { type => 'integer' },
+  delivery_term_id           => { type => 'integer' },
+  delivery_vendor_id         => { type => 'integer' },
+  department_id              => { type => 'integer' },
+  employee_id                => { type => 'integer' },
+  exchangerate               => { type => 'numeric', precision => 15, scale => 5 },
+  expected_billing_date      => { type => 'date' },
+  globalproject_id           => { type => 'integer' },
+  id                         => { type => 'integer', not_null => 1, sequence => 'id' },
+  intnotes                   => { type => 'text' },
+  itime                      => { type => 'timestamp', default => 'now()' },
+  language_id                => { type => 'integer' },
+  marge_percent              => { type => 'numeric', precision => 15, scale => 5 },
+  marge_total                => { type => 'numeric', precision => 15, scale => 5 },
+  mtime                      => { type => 'timestamp' },
+  netamount                  => { type => 'numeric', precision => 15, scale => 5 },
+  notes                      => { type => 'text' },
+  order_probability          => { type => 'integer', default => '0', not_null => 1 },
+  order_status_id            => { type => 'integer' },
+  ordnumber                  => { type => 'text', not_null => 1 },
+  payment_id                 => { type => 'integer' },
+  proforma                   => { type => 'boolean', default => 'false' },
+  quonumber                  => { type => 'text' },
+  record_type                => { type => 'enum', check_in => [ 'request_quotation', 'sales_quotation', 'purchase_quotation_intake', 'purchase_order', 'sales_order_intake', 'sales_order', 'purchase_order_confirmation' ], db_type => 'order_types', not_null => 1 },
+  reqdate                    => { type => 'date' },
+  salesman_id                => { type => 'integer' },
+  shippingpoint              => { type => 'text' },
+  shipto_id                  => { type => 'integer' },
+  shipvia                    => { type => 'text' },
+  tax_point                  => { type => 'date' },
+  taxincluded                => { type => 'boolean' },
+  taxzone_id                 => { type => 'integer', not_null => 1 },
+  transaction_description    => { type => 'text' },
+  transdate                  => { type => 'date', default => 'now' },
+  vendor_confirmation_number => { type => 'text' },
+  vendor_id                  => { type => 'integer' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -113,6 +115,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { language_id => 'id' },
   },
 
+  order_status => {
+    class       => 'SL::DB::OrderStatus',
+    key_columns => { order_status_id => 'id' },
+  },
+
   payment_terms => {
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
diff --git a/SL/DB/MetaSetup/OrderItem.pm b/SL/DB/MetaSetup/OrderItem.pm
index e83b65bda..4e1a6d213 100644
--- a/SL/DB/MetaSetup/OrderItem.pm
+++ b/SL/DB/MetaSetup/OrderItem.pm
@@ -9,37 +9,40 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('orderitems');
 
 __PACKAGE__->meta->columns(
-  active_discount_source => { type => 'text', default => '', not_null => 1 },
-  active_price_source    => { type => 'text', default => '', not_null => 1 },
-  base_qty               => { type => 'float', precision => 4, scale => 4 },
-  cusordnumber           => { type => 'text' },
-  description            => { type => 'text' },
-  discount               => { type => 'float', precision => 4, scale => 4 },
-  id                     => { type => 'integer', not_null => 1, sequence => 'orderitemsid' },
-  itime                  => { type => 'timestamp', default => 'now()' },
-  lastcost               => { type => 'numeric', precision => 15, scale => 5 },
-  longdescription        => { type => 'text' },
-  marge_percent          => { type => 'numeric', precision => 15, scale => 5 },
-  marge_price_factor     => { type => 'numeric', default => 1, precision => 15, scale => 5 },
-  marge_total            => { type => 'numeric', precision => 15, scale => 5 },
-  mtime                  => { type => 'timestamp' },
-  optional               => { type => 'boolean', default => 'false' },
-  ordnumber              => { type => 'text' },
-  parts_id               => { type => 'integer' },
-  position               => { type => 'integer', not_null => 1 },
-  price_factor           => { type => 'numeric', default => 1, precision => 15, scale => 5 },
-  price_factor_id        => { type => 'integer' },
-  pricegroup_id          => { type => 'integer' },
-  project_id             => { type => 'integer' },
-  qty                    => { type => 'numeric', precision => 25, scale => 5 },
-  reqdate                => { type => 'date' },
-  sellprice              => { type => 'numeric', precision => 15, scale => 5 },
-  serialnumber           => { type => 'text' },
-  ship                   => { type => 'float', precision => 4, scale => 4 },
-  subtotal               => { type => 'boolean', default => 'false' },
-  trans_id               => { type => 'integer' },
-  transdate              => { type => 'text' },
-  unit                   => { type => 'varchar', length => 20 },
+  active_discount_source       => { type => 'text', default => '', not_null => 1 },
+  active_price_source          => { type => 'text', default => '', not_null => 1 },
+  base_qty                     => { type => 'float', precision => 4, scale => 4 },
+  cusordnumber                 => { type => 'text' },
+  description                  => { type => 'text' },
+  discount                     => { type => 'float', precision => 4, scale => 4 },
+  id                           => { type => 'integer', not_null => 1, sequence => 'orderitemsid' },
+  itime                        => { type => 'timestamp', default => 'now()' },
+  lastcost                     => { type => 'numeric', precision => 15, scale => 5 },
+  longdescription              => { type => 'text' },
+  marge_percent                => { type => 'numeric', precision => 15, scale => 5 },
+  marge_price_factor           => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  marge_total                  => { type => 'numeric', precision => 15, scale => 5 },
+  mtime                        => { type => 'timestamp' },
+  optional                     => { type => 'boolean', default => 'false' },
+  orderer_id                   => { type => 'integer' },
+  ordnumber                    => { type => 'text' },
+  parts_id                     => { type => 'integer' },
+  position                     => { type => 'integer', not_null => 1 },
+  price_factor                 => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  price_factor_id              => { type => 'integer' },
+  pricegroup_id                => { type => 'integer' },
+  project_id                   => { type => 'integer' },
+  qty                          => { type => 'numeric', precision => 25, scale => 5 },
+  recurring_billing_invoice_id => { type => 'integer' },
+  recurring_billing_mode       => { type => 'enum', check_in => [ 'never', 'once', 'always' ], db_type => 'items_recurring_billing_mode', default => 'always', not_null => 1 },
+  reqdate                      => { type => 'date' },
+  sellprice                    => { type => 'numeric', precision => 15, scale => 5 },
+  serialnumber                 => { type => 'text' },
+  ship                         => { type => 'float', precision => 4, scale => 4 },
+  subtotal                     => { type => 'boolean', default => 'false' },
+  trans_id                     => { type => 'integer' },
+  transdate                    => { type => 'text' },
+  unit                         => { type => 'varchar', length => 20 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
@@ -52,6 +55,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { trans_id => 'id' },
   },
 
+  orderer => {
+    class       => 'SL::DB::Employee',
+    key_columns => { orderer_id => 'id' },
+  },
+
   part => {
     class       => 'SL::DB::Part',
     key_columns => { parts_id => 'id' },
@@ -72,6 +80,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { project_id => 'id' },
   },
 
+  recurring_billing_invoice => {
+    class       => 'SL::DB::Invoice',
+    key_columns => { recurring_billing_invoice_id => 'id' },
+  },
+
   unit_obj => {
     class       => 'SL::DB::Unit',
     key_columns => { unit => 'name' },
diff --git a/SL/DB/MetaSetup/OrderStatus.pm b/SL/DB/MetaSetup/OrderStatus.pm
new file mode 100644
index 000000000..364bb32d8
--- /dev/null
+++ b/SL/DB/MetaSetup/OrderStatus.pm
@@ -0,0 +1,28 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::OrderStatus;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('order_statuses');
+
+__PACKAGE__->meta->columns(
+  description => { type => 'text' },
+  id          => { type => 'serial', not_null => 1 },
+  itime       => { type => 'timestamp', default => 'now()' },
+  mtime       => { type => 'timestamp' },
+  name        => { type => 'text', not_null => 1 },
+  obsolete    => { type => 'boolean', default => 'false', not_null => 1 },
+  position    => { type => 'integer', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->unique_keys([ 'name' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/OrderVersion.pm b/SL/DB/MetaSetup/OrderVersion.pm
new file mode 100644
index 000000000..00023a3d0
--- /dev/null
+++ b/SL/DB/MetaSetup/OrderVersion.pm
@@ -0,0 +1,43 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::OrderVersion;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('oe_version');
+
+__PACKAGE__->meta->columns(
+  email_journal_id => { type => 'integer' },
+  file_id          => { type => 'integer' },
+  final_version    => { type => 'boolean', default => 'false' },
+  itime            => { type => 'timestamp', default => 'now()' },
+  mtime            => { type => 'timestamp' },
+  oe_id            => { type => 'integer', not_null => 1 },
+  version          => { type => 'integer', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'oe_id', 'version' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  email_journal => {
+    class       => 'SL::DB::EmailJournal',
+    key_columns => { email_journal_id => 'id' },
+  },
+
+  file => {
+    class       => 'SL::DB::File',
+    key_columns => { file_id => 'id' },
+  },
+
+  oe => {
+    class       => 'SL::DB::Order',
+    key_columns => { oe_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/Part.pm b/SL/DB/MetaSetup/Part.pm
index ef6ed69f5..eacff8fd2 100644
--- a/SL/DB/MetaSetup/Part.pm
+++ b/SL/DB/MetaSetup/Part.pm
@@ -29,8 +29,10 @@ __PACKAGE__->meta->columns(
   mtime              => { type => 'timestamp' },
   not_discountable   => { type => 'boolean', default => 'false' },
   notes              => { type => 'text' },
-  obsolete           => { type => 'boolean', default => 'false' },
+  obsolete           => { type => 'boolean', default => 'false', not_null => 1 },
   onhand             => { type => 'numeric', default => '0', precision => 25, scale => 5 },
+  order_locked       => { type => 'boolean', default => 'false' },
+  order_qty          => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
   part_type          => { type => 'enum', check_in => [ 'part', 'service', 'assembly', 'assortment' ], db_type => 'part_type_enum', not_null => 1 },
   partnumber         => { type => 'text', not_null => 1 },
   partsgroup_id      => { type => 'integer' },
@@ -41,6 +43,7 @@ __PACKAGE__->meta->columns(
   sellprice          => { type => 'numeric', precision => 15, scale => 5 },
   shop               => { type => 'boolean', default => 'false' },
   stockable          => { type => 'boolean', default => 'false' },
+  tariff_code        => { type => 'text' },
   unit               => { type => 'varchar', length => 20, not_null => 1 },
   ve                 => { type => 'integer' },
   warehouse_id       => { type => 'integer' },
diff --git a/SL/DB/MetaSetup/PartCustomerPrice.pm b/SL/DB/MetaSetup/PartCustomerPrice.pm
index c3d424344..499e9caea 100644
--- a/SL/DB/MetaSetup/PartCustomerPrice.pm
+++ b/SL/DB/MetaSetup/PartCustomerPrice.pm
@@ -9,13 +9,15 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('part_customer_prices');
 
 __PACKAGE__->meta->columns(
-  customer_id         => { type => 'integer', not_null => 1 },
-  customer_partnumber => { type => 'text', default => '' },
-  id                  => { type => 'serial', not_null => 1 },
-  lastupdate          => { type => 'date', default => 'now()' },
-  parts_id            => { type => 'integer', not_null => 1 },
-  price               => { type => 'numeric', default => '0', precision => 15, scale => 5 },
-  sortorder           => { type => 'integer', default => '0' },
+  customer_id          => { type => 'integer', not_null => 1 },
+  customer_partnumber  => { type => 'text', default => '' },
+  id                   => { type => 'serial', not_null => 1 },
+  lastupdate           => { type => 'date', default => 'now()' },
+  part_description     => { type => 'text' },
+  part_longdescription => { type => 'text' },
+  parts_id             => { type => 'integer', not_null => 1 },
+  price                => { type => 'numeric', default => '0', precision => 15, scale => 5 },
+  sortorder            => { type => 'integer', default => '0' },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/PartsPriceHistory.pm b/SL/DB/MetaSetup/PartsPriceHistory.pm
index 7d21cd367..19745b516 100644
--- a/SL/DB/MetaSetup/PartsPriceHistory.pm
+++ b/SL/DB/MetaSetup/PartsPriceHistory.pm
@@ -9,12 +9,13 @@ use parent qw(SL::DB::Object);
 __PACKAGE__->meta->table('parts_price_history');
 
 __PACKAGE__->meta->columns(
-  id         => { type => 'serial', not_null => 1 },
-  lastcost   => { type => 'numeric', precision => 15, scale => 5 },
-  listprice  => { type => 'numeric', precision => 15, scale => 5 },
-  part_id    => { type => 'integer', not_null => 1 },
-  sellprice  => { type => 'numeric', precision => 15, scale => 5 },
-  valid_from => { type => 'timestamp', not_null => 1 },
+  id           => { type => 'serial', not_null => 1 },
+  lastcost     => { type => 'numeric', precision => 15, scale => 5 },
+  listprice    => { type => 'numeric', precision => 15, scale => 5 },
+  part_id      => { type => 'integer', not_null => 1 },
+  price_factor => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  sellprice    => { type => 'numeric', precision => 15, scale => 5 },
+  valid_from   => { type => 'timestamp', not_null => 1 },
 );
 
 __PACKAGE__->meta->primary_key_columns([ 'id' ]);
diff --git a/SL/DB/MetaSetup/PurchaseBasketItem.pm b/SL/DB/MetaSetup/PurchaseBasketItem.pm
new file mode 100644
index 000000000..107c0a3cf
--- /dev/null
+++ b/SL/DB/MetaSetup/PurchaseBasketItem.pm
@@ -0,0 +1,38 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::PurchaseBasketItem;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('purchase_basket_items');
+
+__PACKAGE__->meta->columns(
+  cleared    => { type => 'boolean', default => 'false', not_null => 1 },
+  id         => { type => 'serial', not_null => 1 },
+  itime      => { type => 'timestamp', default => 'now()' },
+  mtime      => { type => 'timestamp' },
+  orderer_id => { type => 'integer' },
+  part_id    => { type => 'integer' },
+  qty        => { type => 'numeric', not_null => 1, precision => 15, scale => 5 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  orderer => {
+    class       => 'SL::DB::Employee',
+    key_columns => { orderer_id => 'id' },
+  },
+
+  part => {
+    class       => 'SL::DB::Part',
+    key_columns => { part_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/PurchaseInvoice.pm b/SL/DB/MetaSetup/PurchaseInvoice.pm
index 4a443ac61..f16bceee3 100644
--- a/SL/DB/MetaSetup/PurchaseInvoice.pm
+++ b/SL/DB/MetaSetup/PurchaseInvoice.pm
@@ -19,12 +19,14 @@ __PACKAGE__->meta->columns(
   direct_debit            => { type => 'boolean', default => 'false' },
   duedate                 => { type => 'date' },
   employee_id             => { type => 'integer' },
+  exchangerate            => { type => 'numeric', precision => 15, scale => 5 },
   gldate                  => { type => 'date', default => 'now' },
   globalproject_id        => { type => 'integer' },
   id                      => { type => 'integer', not_null => 1, sequence => 'glid' },
   intnotes                => { type => 'text' },
   invnumber               => { type => 'text', not_null => 1 },
   invoice                 => { type => 'boolean', default => 'false' },
+  is_sepa_blocked         => { type => 'boolean', default => 'false' },
   itime                   => { type => 'timestamp', default => 'now()' },
   language_id             => { type => 'integer' },
   mtime                   => { type => 'timestamp' },
@@ -34,6 +36,7 @@ __PACKAGE__->meta->columns(
   ordnumber               => { type => 'text' },
   paid                    => { type => 'numeric', default => '0', not_null => 1, precision => 15, scale => 5 },
   payment_id              => { type => 'integer' },
+  qrbill_data             => { type => 'text' },
   quodate                 => { type => 'date' },
   quonumber               => { type => 'text' },
   shipvia                 => { type => 'text' },
diff --git a/SL/DB/MetaSetup/Reclamation.pm b/SL/DB/MetaSetup/Reclamation.pm
new file mode 100644
index 000000000..835b0a7f2
--- /dev/null
+++ b/SL/DB/MetaSetup/Reclamation.pm
@@ -0,0 +1,125 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::Reclamation;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('reclamations');
+
+__PACKAGE__->meta->columns(
+  amount                  => { type => 'numeric', precision => 15, scale => 5 },
+  billing_address_id      => { type => 'integer' },
+  closed                  => { type => 'boolean', default => 'false', not_null => 1 },
+  contact_id              => { type => 'integer' },
+  currency_id             => { type => 'integer', not_null => 1 },
+  customer_id             => { type => 'integer' },
+  cv_record_number        => { type => 'text' },
+  delivered               => { type => 'boolean', default => 'false', not_null => 1 },
+  delivery_term_id        => { type => 'integer' },
+  department_id           => { type => 'integer' },
+  employee_id             => { type => 'integer', not_null => 1 },
+  exchangerate            => { type => 'numeric', precision => 15, scale => 5 },
+  globalproject_id        => { type => 'integer' },
+  id                      => { type => 'integer', not_null => 1, sequence => 'id' },
+  intnotes                => { type => 'text' },
+  itime                   => { type => 'timestamp', default => 'now()' },
+  language_id             => { type => 'integer' },
+  mtime                   => { type => 'timestamp' },
+  netamount               => { type => 'numeric', precision => 15, scale => 5 },
+  notes                   => { type => 'text' },
+  payment_id              => { type => 'integer' },
+  record_number           => { type => 'text', not_null => 1 },
+  record_type             => { type => 'enum', check_in => [ 'sales_reclamation', 'purchase_reclamation' ], db_type => 'reclamation_types', not_null => 1 },
+  reqdate                 => { type => 'date' },
+  salesman_id             => { type => 'integer' },
+  shippingpoint           => { type => 'text' },
+  shipto_id               => { type => 'integer' },
+  shipvia                 => { type => 'text' },
+  tax_point               => { type => 'date' },
+  taxincluded             => { type => 'boolean', not_null => 1 },
+  taxzone_id              => { type => 'integer', not_null => 1 },
+  transaction_description => { type => 'text' },
+  transdate               => { type => 'date', default => 'now()' },
+  vendor_id               => { type => 'integer' },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  billing_address => {
+    class       => 'SL::DB::AdditionalBillingAddress',
+    key_columns => { billing_address_id => 'id' },
+  },
+
+  contact => {
+    class       => 'SL::DB::Contact',
+    key_columns => { contact_id => 'cp_id' },
+  },
+
+  currency => {
+    class       => 'SL::DB::Currency',
+    key_columns => { currency_id => 'id' },
+  },
+
+  customer => {
+    class       => 'SL::DB::Customer',
+    key_columns => { customer_id => 'id' },
+  },
+
+  delivery_term => {
+    class       => 'SL::DB::DeliveryTerm',
+    key_columns => { delivery_term_id => 'id' },
+  },
+
+  department => {
+    class       => 'SL::DB::Department',
+    key_columns => { department_id => 'id' },
+  },
+
+  employee => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
+  globalproject => {
+    class       => 'SL::DB::Project',
+    key_columns => { globalproject_id => 'id' },
+  },
+
+  language => {
+    class       => 'SL::DB::Language',
+    key_columns => { language_id => 'id' },
+  },
+
+  payment => {
+    class       => 'SL::DB::PaymentTerm',
+    key_columns => { payment_id => 'id' },
+  },
+
+  salesman => {
+    class       => 'SL::DB::Employee',
+    key_columns => { salesman_id => 'id' },
+  },
+
+  shipto => {
+    class       => 'SL::DB::Shipto',
+    key_columns => { shipto_id => 'shipto_id' },
+  },
+
+  taxzone => {
+    class       => 'SL::DB::TaxZone',
+    key_columns => { taxzone_id => 'id' },
+  },
+
+  vendor => {
+    class       => 'SL::DB::Vendor',
+    key_columns => { vendor_id => 'id' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/ReclamationItem.pm b/SL/DB/MetaSetup/ReclamationItem.pm
new file mode 100644
index 000000000..05469d17d
--- /dev/null
+++ b/SL/DB/MetaSetup/ReclamationItem.pm
@@ -0,0 +1,81 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::ReclamationItem;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('reclamation_items');
+
+__PACKAGE__->meta->columns(
+  active_discount_source => { type => 'text', default => '', not_null => 1 },
+  active_price_source    => { type => 'text', default => '', not_null => 1 },
+  base_qty               => { type => 'float', precision => 4, scale => 4 },
+  description            => { type => 'text' },
+  discount               => { type => 'float', precision => 4, scale => 4 },
+  id                     => { type => 'serial', not_null => 1 },
+  itime                  => { type => 'timestamp', default => 'now()' },
+  lastcost               => { type => 'numeric', precision => 15, scale => 5 },
+  longdescription        => { type => 'text' },
+  mtime                  => { type => 'timestamp' },
+  parts_id               => { type => 'integer', not_null => 1 },
+  position               => { type => 'integer', not_null => 1 },
+  price_factor           => { type => 'numeric', default => 1, precision => 15, scale => 5 },
+  price_factor_id        => { type => 'integer' },
+  pricegroup_id          => { type => 'integer' },
+  project_id             => { type => 'integer' },
+  qty                    => { type => 'float', precision => 4, scale => 4 },
+  reason_description_ext => { type => 'text' },
+  reason_description_int => { type => 'text' },
+  reason_id              => { type => 'integer', not_null => 1 },
+  reclamation_id         => { type => 'integer', not_null => 1 },
+  reqdate                => { type => 'date' },
+  sellprice              => { type => 'numeric', precision => 15, scale => 5 },
+  serialnumber           => { type => 'text' },
+  unit                   => { type => 'varchar', length => 20 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+__PACKAGE__->meta->foreign_keys(
+  part => {
+    class       => 'SL::DB::Part',
+    key_columns => { parts_id => 'id' },
+  },
+
+  price_factor_obj => {
+    class       => 'SL::DB::PriceFactor',
+    key_columns => { price_factor_id => 'id' },
+  },
+
+  pricegroup => {
+    class       => 'SL::DB::Pricegroup',
+    key_columns => { pricegroup_id => 'id' },
+  },
+
+  project => {
+    class       => 'SL::DB::Project',
+    key_columns => { project_id => 'id' },
+  },
+
+  reason => {
+    class       => 'SL::DB::ReclamationReason',
+    key_columns => { reason_id => 'id' },
+  },
+
+  reclamation => {
+    class       => 'SL::DB::Reclamation',
+    key_columns => { reclamation_id => 'id' },
+  },
+
+  unit_obj => {
+    class       => 'SL::DB::Unit',
+    key_columns => { unit => 'name' },
+  },
+);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/ReclamationReason.pm b/SL/DB/MetaSetup/ReclamationReason.pm
new file mode 100644
index 000000000..29e6523bf
--- /dev/null
+++ b/SL/DB/MetaSetup/ReclamationReason.pm
@@ -0,0 +1,27 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::ReclamationReason;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('reclamation_reasons');
+
+__PACKAGE__->meta->columns(
+  description        => { type => 'text', not_null => 1 },
+  id                 => { type => 'serial', not_null => 1 },
+  itime              => { type => 'timestamp', default => 'now()' },
+  mtime              => { type => 'timestamp' },
+  name               => { type => 'text', not_null => 1 },
+  position           => { type => 'integer', not_null => 1 },
+  valid_for_purchase => { type => 'boolean', default => 'false', not_null => 1 },
+  valid_for_sales    => { type => 'boolean', default => 'false', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+1;
+;
diff --git a/SL/DB/MetaSetup/ShopOrderItem.pm b/SL/DB/MetaSetup/ShopOrderItem.pm
index ae7d21aab..4c795a096 100644
--- a/SL/DB/MetaSetup/ShopOrderItem.pm
+++ b/SL/DB/MetaSetup/ShopOrderItem.pm
@@ -11,7 +11,10 @@ __PACKAGE__->meta->table('shop_order_items');
 __PACKAGE__->meta->columns(
   active_price_source => { type => 'text' },
   description         => { type => 'text' },
+  discount            => { type => 'float', precision => 4, scale => 4 },
+  discount_code       => { type => 'text' },
   id                  => { type => 'serial', not_null => 1 },
+  identifier          => { type => 'text' },
   partnumber          => { type => 'text' },
   position            => { type => 'integer' },
   price               => { type => 'numeric', precision => 15, scale => 5 },
diff --git a/SL/DB/MetaSetup/ValidityToken.pm b/SL/DB/MetaSetup/ValidityToken.pm
new file mode 100644
index 000000000..0f7c7d050
--- /dev/null
+++ b/SL/DB/MetaSetup/ValidityToken.pm
@@ -0,0 +1,26 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::ValidityToken;
+
+use strict;
+
+use parent qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('validity_tokens');
+
+__PACKAGE__->meta->columns(
+  id          => { type => 'serial', not_null => 1 },
+  itime       => { type => 'timestamp', default => 'now()', not_null => 1 },
+  scope       => { type => 'text', not_null => 1 },
+  token       => { type => 'text', not_null => 1 },
+  valid_until => { type => 'timestamp', not_null => 1 },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+__PACKAGE__->meta->unique_keys([ 'scope', 'token' ]);
+
+__PACKAGE__->meta->allow_inline_column_values(1);
+
+1;
+;
diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index fdaa1e8bf..07d58928d 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -8,6 +8,8 @@ use DateTime;
 use List::Util qw(max);
 use List::MoreUtils qw(any);
 
+use SL::DBUtils ();
+use SL::DB::PurchaseBasketItem;
 use SL::DB::MetaSetup::Order;
 use SL::DB::Manager::Order;
 use SL::DB::Helper::Attr;
@@ -17,10 +19,17 @@ use SL::DB::Helper::FlattenToForm;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PriceTaxCalculator;
 use SL::DB::Helper::PriceUpdater;
+use SL::DB::Helper::TypeDataProxy;
 use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::Payment qw(forex);
+use SL::DB::Helper::RecordLink qw(RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
+use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::RecordLinks;
-use Rose::DB::Object::Helpers qw(as_tree);
+use Rose::DB::Object::Helpers qw(as_tree strip);
+
+use SL::DB::Order::TypeData qw(:types validate_type);
+use SL::DB::Reclamation::TypeData qw(:types);
 
 __PACKAGE__->meta->add_relationship(
   orderitems => {
@@ -57,6 +66,11 @@ __PACKAGE__->meta->add_relationship(
       sort_by      => 'notes.itime',
     }
   },
+  order_version => {
+    type                   => 'one to many',
+    class                  => 'SL::DB::OrderVersion',
+    column_map             => { id => 'oe_id' },
+  },
 );
 
 SL::DB::Helper::Attr::make(__PACKAGE__, daily_exchangerate => 'numeric');
@@ -70,6 +84,9 @@ __PACKAGE__->before_save('_before_save_set_ord_quo_number');
 __PACKAGE__->before_save('_before_save_create_new_project');
 __PACKAGE__->before_save('_before_save_remove_empty_custom_shipto');
 __PACKAGE__->before_save('_before_save_set_custom_shipto_module');
+__PACKAGE__->after_save('_after_save_link_records');
+__PACKAGE__->after_save('_after_save_close_reachable_intakes'); # uses linked records (order matters)
+__PACKAGE__->before_save('_before_save_delete_from_purchase_basket');
 
 # hooks
 
@@ -80,8 +97,7 @@ sub _before_save_set_ord_quo_number {
   # least an empty string, even if we're saving a quotation.
   $self->ordnumber('') if !$self->ordnumber;
 
-  my $field = $self->quotation ? 'quonumber' : 'ordnumber';
-  $self->create_trans_number if !$self->$field;
+  $self->create_trans_number if !$self->record_number;
 
   return 1;
 }
@@ -89,7 +105,7 @@ sub _before_save_create_new_project {
   my ($self) = @_;
 
   # force new project, if not set yet
-  if ($::instance_conf->get_order_always_project && !$self->globalproject_id && ($self->type eq 'sales_order')) {
+  if ($::instance_conf->get_order_always_project && !$self->globalproject_id && ($self->type eq SALES_ORDER_TYPE())) {
 
     die t8("Error while creating project with project number of new order number, project number #1 already exists!", $self->ordnumber)
       if SL::DB::Manager::Project->find_by(projectnumber => $self->ordnumber);
@@ -127,6 +143,63 @@ sub _before_save_set_custom_shipto_module {
   return 1;
 }
 
+sub _after_save_link_records {
+  my ($self) = @_;
+
+  my @allowed_record_sources = qw(SL::DB::Reclamation SL::DB::Order SL::DB::EmailJournal);
+  my @allowed_item_sources = qw(SL::DB::ReclamationItem SL::DB::OrderItem);
+
+  SL::DB::Helper::RecordLink::link_records(
+    $self,
+    \@allowed_record_sources,
+    \@allowed_item_sources,
+  );
+
+  return 1;
+}
+
+sub _after_save_close_reachable_intakes {
+  my ($self) = @_;
+
+  # Close reachable sales order intakes in the from-workflow if this is a sales order
+  if (SALES_ORDER_TYPE() eq $self->type) {
+    my $lr = $self->linked_records(direction => 'from', recursive => 1);
+    $lr    = [grep { 'SL::DB::Order' eq ref $_ && !$_->closed && $_->is_type(SALES_ORDER_INTAKE_TYPE()) } @$lr];
+    if (@$lr) {
+      SL::DB::Manager::Order->update_all(set   => {closed => 1},
+                                         where => [id => [map {$_->id} @$lr]]);
+    }
+  }
+
+  return 1;
+}
+
+sub _before_save_delete_from_purchase_basket {
+  my ($self) = @_;
+
+  my @basket_item_ids =
+    grep { defined($_) && $_ ne ''}
+    map { $_->{basket_item_id} }
+    $self->orderitems;
+  return 1 unless scalar @basket_item_ids;
+
+  # check if all items are still in the basket
+  my $basket_item_count = SL::DB::Manager::PurchaseBasketItem->get_all_count(
+    where => [ id => \@basket_item_ids ]
+  );
+  if ($basket_item_count != scalar @basket_item_ids) {
+    die "Error while saving order: some items are not in the purchase basket anymore.";
+  }
+
+  if (scalar @basket_item_ids) {
+    SL::DB::Manager::PurchaseBasketItem->delete_all(
+      where => [ id => \@basket_item_ids]
+    );
+  }
+
+  return 1;
+}
+
 # methods
 
 sub items { goto &orderitems; }
@@ -135,25 +208,38 @@ sub record_number { goto &number; }
 
 sub type {
   my $self = shift;
-
-  return 'sales_order'       if $self->customer_id && ! $self->quotation;
-  return 'purchase_order'    if $self->vendor_id   && ! $self->quotation;
-  return 'sales_quotation'   if $self->customer_id &&   $self->quotation;
-  return 'request_quotation' if $self->vendor_id   &&   $self->quotation;
-
-  return;
+  SL::DB::Order::TypeData::validate_type($self->record_type);
+  return $self->record_type;
 }
 
 sub is_type {
   return shift->type eq shift;
 }
 
+sub quotation {
+  my $type = $_[0]->type();
+  any { $type eq $_ } (
+    SALES_ORDER_INTAKE_TYPE(),
+    SALES_QUOTATION_TYPE(),
+    REQUEST_QUOTATION_TYPE(),
+    PURCHASE_QUOTATION_INTAKE_TYPE(),
+  );
+}
+
+sub intake {
+  my $type = $_[0]->type();
+  any { $type eq $_ } (
+    SALES_ORDER_INTAKE_TYPE(),
+    PURCHASE_QUOTATION_INTAKE_TYPE(),
+  );
+}
+
 sub deliverydate {
   # oe doesn't have deliverydate, but it does have reqdate.
   # But this has a different meaning for sales quotations.
   # deliverydate can be used to determine tax if tax_point isn't set.
 
-  return $_[0]->reqdate if $_[0]->type ne 'sales_quotation';
+  return $_[0]->reqdate if $_[0]->type ne SALES_QUOTATION_TYPE();
 }
 
 sub effective_tax_point {
@@ -163,14 +249,8 @@ sub effective_tax_point {
 }
 
 sub displayable_type {
-  my $type = shift->type;
-
-  return $::locale->text('Sales quotation')   if $type eq 'sales_quotation';
-  return $::locale->text('Request quotation') if $type eq 'request_quotation';
-  return $::locale->text('Sales Order')       if $type eq 'sales_order';
-  return $::locale->text('Purchase Order')    if $type eq 'purchase_order';
-
-  die 'invalid type';
+  my ($self) = @_;
+  return $self->type_data->text('type');
 }
 
 sub displayable_name {
@@ -179,7 +259,7 @@ sub displayable_name {
 
 sub is_sales {
   croak 'not an accessor' if @_ > 1;
-  return !!shift->customer_id;
+  $_[0]->type_data->properties('is_customer');
 }
 
 sub daily_exchangerate {
@@ -187,8 +267,8 @@ sub daily_exchangerate {
 
   return 1 if $self->currency_id == $::instance_conf->get_currency_id;
 
-  my $rate = (any { $self->is_type($_) } qw(sales_quotation sales_order))      ? 'buy'
-           : (any { $self->is_type($_) } qw(request_quotation purchase_order)) ? 'sell'
+  my $rate = (any { $self->is_type($_) } (SALES_QUOTATION_TYPE(), SALES_ORDER_TYPE()))      ? 'buy'
+           : (any { $self->is_type($_) } (REQUEST_QUOTATION_TYPE(), PURCHASE_ORDER_TYPE())) ? 'sell'
            : undef;
   return if !$rate;
 
@@ -249,22 +329,6 @@ sub convert_to_invoice {
   if (!$self->db->with_transaction(sub {
     require SL::DB::Invoice;
     $invoice = SL::DB::Invoice->new_from($self, %params)->post || die;
-    $self->link_to_record($invoice);
-    # TODO extend link_to_record for items, otherwise long-term no d.r.y.
-    foreach my $item (@{ $invoice->items }) {
-      foreach (qw(orderitems)) {
-        if ($item->{"converted_from_${_}_id"}) {
-          die unless $item->{id};
-          RecordLinks->create_links('mode'       => 'ids',
-                                    'from_table' => $_,
-                                    'from_ids'   => $item->{"converted_from_${_}_id"},
-                                    'to_table'   => 'invoice',
-                                    'to_id'      => $item->{id},
-          ) || die;
-          delete $item->{"converted_from_${_}_id"};
-        }
-      }
-    }
     $self->update_attributes(closed => 1);
     1;
   })) {
@@ -282,23 +346,6 @@ sub convert_to_delivery_order {
     require SL::DB::DeliveryOrder;
     $delivery_order = SL::DB::DeliveryOrder->new_from($self, @args);
     $delivery_order->save;
-    $self->link_to_record($delivery_order);
-    # TODO extend link_to_record for items, otherwise long-term no d.r.y.
-    foreach my $item (@{ $delivery_order->items }) {
-      foreach (qw(orderitems)) {    # expand if needed (delivery_order_items)
-        if ($item->{"converted_from_${_}_id"}) {
-          die unless $item->{id};
-          RecordLinks->create_links('dbh'        => $self->db->dbh,
-                                    'mode'       => 'ids',
-                                    'from_table' => $_,
-                                    'from_ids'   => $item->{"converted_from_${_}_id"},
-                                    'to_table'   => 'delivery_order_items',
-                                    'to_id'      => $item->{id},
-          ) || die;
-          delete $item->{"converted_from_${_}_id"};
-        }
-      }
-    }
 
     $self->update_attributes(delivered => 1) unless $::instance_conf->get_shipped_qty_require_stock_out;
     1;
@@ -309,6 +356,17 @@ sub convert_to_delivery_order {
   return $delivery_order;
 }
 
+sub convert_to_reclamation {
+  my ($self, %params) = @_;
+  $params{destination_type} = $self->is_sales ? SALES_RECLAMATION_TYPE()
+                                              : PURCHASE_RECLAMATION_TYPE();
+
+  require SL::DB::Reclamation;
+  my $reclamation = SL::DB::Reclamation->new_from($self, %params);
+
+  return $reclamation;
+}
+
 sub _clone_orderitem_cvar {
   my ($cvar) = @_;
 
@@ -318,73 +376,235 @@ sub _clone_orderitem_cvar {
   return $cloned;
 }
 
+sub create_from_purchase_basket {
+  my ($class, $basket_item_ids, $vendor_item_ids, $vendor_id) = @_;
+
+  my ($vendor, $employee);
+  $vendor   = SL::DB::Manager::Vendor->find_by(id => $vendor_id);
+  $employee = SL::DB::Manager::Employee->current;
+
+  my @orderitem_maps = (); # part, qty, orderer_id
+  if ($basket_item_ids && scalar @{ $basket_item_ids}) {
+    my $basket_items = SL::DB::Manager::PurchaseBasketItem->get_all(
+      query => [ id => $basket_item_ids ],
+      with_objects => ['part'],
+    );
+    push @orderitem_maps, map {{
+        basket_item_id => $_->id,
+        part       => $_->part,
+        qty        => $_->qty,
+        orderer_id => $_->orderer_id,
+      }} @{$basket_items};
+  }
+  if ($vendor_item_ids && scalar @{ $vendor_item_ids}) {
+    my $vendor_items = SL::DB::Manager::Part->get_all(
+      query => [ id => $vendor_item_ids ] );
+    push @orderitem_maps, map {{
+        basket_item_id => undef,
+        part       => $_,
+        qty        => $_->order_qty || 1,
+        orderer_id => $employee->id,
+      }} @{$vendor_items};
+  }
+
+  my $order = $class->new(
+    vendor_id               => $vendor->id,
+    employee_id             => $employee->id,
+    intnotes                => $vendor->notes,
+    salesman_id             => $employee->id,
+    payment_id              => $vendor->payment_id,
+    delivery_term_id        => $vendor->delivery_term_id,
+    taxzone_id              => $vendor->taxzone_id,
+    currency_id             => $vendor->currency_id,
+    transdate               => DateTime->today_local,
+    record_type             => PURCHASE_ORDER_TYPE(),
+  );
+
+  my @order_items;
+  my $i = 0;
+  foreach my $orderitem_map (@orderitem_maps) {
+    $i++;
+    my $part = $orderitem_map->{part};
+    my $qty = $orderitem_map->{qty};
+    my $orderer_id = $orderitem_map->{orderer_id};
+
+    my $order_item = SL::DB::OrderItem->new(
+      part                => $part,
+      qty                 => $qty,
+      unit                => $part->unit,
+      description         => $part->description,
+      price_factor_id     => $part->price_factor_id,
+      price_factor        =>
+        $part->price_factor_id ? $part->price_factor->factor
+                               : '',
+      orderer_id          => $orderer_id,
+      position            => $i,
+    );
+    $order_item->{basket_item_id} = $orderitem_map->{basket_item_id};
+
+    my $price_source  = SL::PriceSource->new(
+      record_item => $order_item, record => $order);
+    $order_item->sellprice(
+      $price_source->best_price ? $price_source->best_price->price
+                                : 0);
+    $order_item->active_price_source(
+      $price_source->best_price ? $price_source->best_price->source
+                                : '');
+    push @order_items, $order_item;
+  }
+
+  $order->assign_attributes(orderitems => \@order_items);
+
+  $order->calculate_prices_and_taxes;
+
+  foreach my $item(@{ $order->orderitems }){
+    $item->parse_custom_variable_values;
+    $item->{custom_variables} = \@{ $item->cvars_by_config };
+  }
+
+  return $order;
+}
+
 sub new_from {
   my ($class, $source, %params) = @_;
 
-  croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) eq 'SL::DB::Order';
+  unless (any {ref($source) eq $_} qw(
+    SL::DB::Order
+    SL::DB::Reclamation
+  )) {
+    croak("Unsupported source object type '" . ref($source) . "'");
+  }
   croak("A destination type must be given as parameter")         unless $params{destination_type};
 
   my $destination_type  = delete $params{destination_type};
 
   my @from_tos = (
-    { from => 'sales_quotation',   to => 'sales_order',       abbr => 'sqso' },
-    { from => 'request_quotation', to => 'purchase_order',    abbr => 'rqpo' },
-    { from => 'sales_quotation',   to => 'sales_quotation',   abbr => 'sqsq' },
-    { from => 'sales_order',       to => 'sales_order',       abbr => 'soso' },
-    { from => 'request_quotation', to => 'request_quotation', abbr => 'rqrq' },
-    { from => 'purchase_order',    to => 'purchase_order',    abbr => 'popo' },
-    { from => 'sales_order',       to => 'purchase_order',    abbr => 'sopo' },
-    { from => 'purchase_order',    to => 'sales_order',       abbr => 'poso' },
-    { from => 'sales_order',       to => 'sales_quotation',   abbr => 'sosq' },
-    { from => 'purchase_order',    to => 'request_quotation', abbr => 'porq' },
+    { from => SALES_QUOTATION_TYPE(),             to => SALES_ORDER_TYPE(),                 abbr => 'sqso'   },
+    { from => REQUEST_QUOTATION_TYPE(),           to => PURCHASE_ORDER_TYPE(),              abbr => 'rqpo'   },
+    { from => SALES_QUOTATION_TYPE(),             to => SALES_QUOTATION_TYPE(),             abbr => 'sqsq'   },
+    { from => SALES_ORDER_TYPE(),                 to => SALES_ORDER_TYPE(),                 abbr => 'soso'   },
+    { from => REQUEST_QUOTATION_TYPE(),           to => REQUEST_QUOTATION_TYPE(),           abbr => 'rqrq'   },
+    { from => PURCHASE_ORDER_TYPE(),              to => PURCHASE_ORDER_TYPE(),              abbr => 'popo'   },
+    { from => SALES_ORDER_TYPE(),                 to => PURCHASE_ORDER_TYPE(),              abbr => 'sopo'   },
+    { from => PURCHASE_ORDER_TYPE(),              to => SALES_ORDER_TYPE(),                 abbr => 'poso'   },
+    { from => SALES_ORDER_TYPE(),                 to => SALES_QUOTATION_TYPE(),             abbr => 'sosq'   },
+    { from => PURCHASE_ORDER_TYPE(),              to => REQUEST_QUOTATION_TYPE(),           abbr => 'porq'   },
+    { from => REQUEST_QUOTATION_TYPE(),           to => SALES_QUOTATION_TYPE(),             abbr => 'rqsq'   },
+    { from => REQUEST_QUOTATION_TYPE(),           to => SALES_ORDER_TYPE(),                 abbr => 'rqso'   },
+    { from => SALES_QUOTATION_TYPE(),             to => REQUEST_QUOTATION_TYPE(),           abbr => 'sqrq'   },
+    { from => SALES_ORDER_TYPE(),                 to => REQUEST_QUOTATION_TYPE(),           abbr => 'sorq'   },
+    { from => SALES_RECLAMATION_TYPE(),           to => SALES_ORDER_TYPE(),                 abbr => 'srso'   },
+    { from => PURCHASE_RECLAMATION_TYPE(),        to => PURCHASE_ORDER_TYPE(),              abbr => 'prpo'   },
+    { from => SALES_ORDER_INTAKE_TYPE(),          to => SALES_ORDER_INTAKE_TYPE(),          abbr => 'soisoi' },
+    { from => SALES_ORDER_INTAKE_TYPE(),          to => SALES_QUOTATION_TYPE(),             abbr => 'soisq'  },
+    { from => SALES_ORDER_INTAKE_TYPE(),          to => REQUEST_QUOTATION_TYPE(),           abbr => 'soirq'  },
+    { from => SALES_ORDER_INTAKE_TYPE(),          to => SALES_ORDER_TYPE(),                 abbr => 'soiso'  },
+    { from => SALES_ORDER_INTAKE_TYPE(),          to => PURCHASE_ORDER_TYPE(),              abbr => 'soipo'  },
+    { from => SALES_QUOTATION_TYPE(),             to => SALES_ORDER_INTAKE_TYPE(),          abbr => 'sqsoi'  },
+    { from => PURCHASE_QUOTATION_INTAKE_TYPE(),   to => PURCHASE_QUOTATION_INTAKE_TYPE(),   abbr => 'pqipqi' },
+    { from => PURCHASE_QUOTATION_INTAKE_TYPE(),   to => SALES_QUOTATION_TYPE(),             abbr => 'pqisq'  },
+    { from => PURCHASE_QUOTATION_INTAKE_TYPE(),   to => SALES_ORDER_TYPE(),                 abbr => 'pqiso'  },
+    { from => PURCHASE_QUOTATION_INTAKE_TYPE(),   to => PURCHASE_ORDER_TYPE(),              abbr => 'pqipo'  },
+    { from => REQUEST_QUOTATION_TYPE(),           to => PURCHASE_QUOTATION_INTAKE_TYPE(),   abbr => 'rqpqi'  },
+    { from => PURCHASE_ORDER_CONFIRMATION_TYPE(), to => PURCHASE_ORDER_CONFIRMATION_TYPE(), abbr => 'pocpoc' },
+    { from => PURCHASE_ORDER_CONFIRMATION_TYPE(), to => SALES_QUOTATION_TYPE(),             abbr => 'pocsq' },
+    { from => PURCHASE_ORDER_CONFIRMATION_TYPE(), to => SALES_ORDER_TYPE(),                 abbr => 'pocso' },
+    { from => PURCHASE_ORDER_CONFIRMATION_TYPE(), to => PURCHASE_ORDER_TYPE(),              abbr => 'pocpo' },
+    { from => PURCHASE_ORDER_TYPE(),              to => PURCHASE_ORDER_CONFIRMATION_TYPE(), abbr => 'popoc' },
   );
-  my $from_to = (grep { $_->{from} eq $source->type && $_->{to} eq $destination_type} @from_tos)[0];
-  croak("Cannot convert from '" . $source->type . "' to '" . $destination_type . "'") if !$from_to;
+  my $from_to = (grep { $_->{from} eq $source->record_type && $_->{to} eq $destination_type} @from_tos)[0];
+  croak("Cannot convert from '" . $source->record_type . "' to '" . $destination_type . "'") if !$from_to;
 
   my $is_abbr_any = sub {
-    any { $from_to->{abbr} eq $_ } @_;
-  };
+    my (@abbrs) = @_;
 
-  my ($item_parent_id_column, $item_parent_column);
+    my $missing_abbr;
+    if (any { $missing_abbr = $_; !grep { $_->{abbr} eq $missing_abbr } @from_tos } @abbrs) {
+      die "no such workflow abbreviation '$missing_abbr'";
+    }
+
+    any { $from_to->{abbr} eq $_ } @abbrs;
+  };
 
+  my %args;
   if (ref($source) eq 'SL::DB::Order') {
-    $item_parent_id_column = 'trans_id';
-    $item_parent_column    = 'order';
+    %args = ( map({ ( $_ => $source->$_ ) } qw(amount cp_id currency_id cusordnumber customer_id delivery_customer_id delivery_term_id delivery_vendor_id
+                                               department_id exchangerate globalproject_id intnotes marge_percent marge_total language_id netamount notes
+                                               ordnumber payment_id quonumber reqdate salesman_id shippingpoint shipvia taxincluded tax_point taxzone_id
+                                               transaction_description vendor_id billing_address_id
+                                            )),
+                 closed    => 0,
+                 delivered => 0,
+                 transdate => DateTime->today_local,
+                 employee  => SL::DB::Manager::Employee->current,
+              );
+    # reqdate in quotation is 'offer is valid    until reqdate'
+    # reqdate in order     is 'will be delivered until reqdate'
+    # both dates are setable (on|off)
+    # and may have a additional interval in days (+ n days)
+    # dies if this convention will change
+    $args{reqdate} = $from_to->{to} =~ m/_quotation$/
+                   ? $::instance_conf->get_reqdate_on
+                   ? DateTime->today_local->next_workday(extra_days => $::instance_conf->get_reqdate_interval)->to_kivitendo
+                   : undef
+                   : $from_to->{to} =~ m/_order$/
+                   ? $::instance_conf->get_deliverydate_on
+                   ? DateTime->today_local->next_workday(extra_days => $::instance_conf->get_delivery_date_interval)->to_kivitendo
+                   : undef
+                   : $from_to->{to} =~ m/^sales_order_intake$/
+                   # ? $source->reqdate
+                   ? undef
+                   : $from_to->{to} =~ m/^purchase_quotation_intake$/
+                   ? $source->reqdate
+                   : $from_to->{to} =~ m/^purchase_order_confirmation$/
+                   ? $source->reqdate
+                   : die "Wrong state for reqdate";
+  } elsif ( ref($source) eq 'SL::DB::Reclamation') {
+    %args = ( map({ ( $_ => $source->$_ ) } qw(
+        amount billing_address_id currency_id customer_id delivery_term_id department_id
+        exchangerate globalproject_id intnotes language_id netamount
+        notes payment_id  reqdate salesman_id shippingpoint shipvia taxincluded
+        tax_point taxzone_id transaction_description vendor_id
+      )),
+      cp_id     => $source->{contact_id},
+      closed    => 0,
+      delivered => 0,
+      transdate => DateTime->today_local,
+      employee  => SL::DB::Manager::Employee->current,
+   );
   }
 
-  my %args = ( map({ ( $_ => $source->$_ ) } qw(amount cp_id currency_id cusordnumber customer_id delivery_customer_id delivery_term_id delivery_vendor_id
-                                                department_id exchangerate globalproject_id intnotes marge_percent marge_total language_id netamount notes
-                                                ordnumber payment_id quonumber reqdate salesman_id shippingpoint shipvia taxincluded tax_point taxzone_id
-                                                transaction_description vendor_id billing_address_id
-                                             )),
-               quotation => !!($destination_type =~ m{quotation$}),
-               closed    => 0,
-               delivered => 0,
-               transdate => DateTime->today_local,
-               employee  => SL::DB::Manager::Employee->current,
-            );
-
-  if ( $is_abbr_any->(qw(sopo poso)) ) {
+  if ( $is_abbr_any->(qw(soipo sopo poso rqso soisq sosq porq rqsq sqrq soirq sorq pqisq pqiso pocsq pocso)) ) {
     $args{ordnumber} = undef;
     $args{quonumber} = undef;
-    $args{reqdate}   = DateTime->today_local->next_workday();
   }
-  if ( $is_abbr_any->(qw(sopo)) ) {
+  if ( $is_abbr_any->(qw(soipo sopo sqrq soirq sorq)) ) {
     $args{customer_id}      = undef;
     $args{salesman_id}      = undef;
     $args{payment_id}       = undef;
     $args{delivery_term_id} = undef;
   }
-  if ( $is_abbr_any->(qw(poso)) ) {
+  if ( $is_abbr_any->(qw(poso rqsq pqisq pqiso pocsq pocso)) ) {
     $args{vendor_id} = undef;
   }
   if ( $is_abbr_any->(qw(soso)) ) {
-    $args{periodic_invoices_config} = $source->periodic_invoices_config->clone_and_reset if $source->periodic_invoices_config;
+    if ($source->periodic_invoices_config) {
+      $args{periodic_invoices_config} = $source->periodic_invoices_config->clone_and_reset;
+
+      if ($args{periodic_invoices_config}->active == 1) {
+        $args{periodic_invoices_config}->active(0);
+        flash_later('info', $::locale->text('Periodic invoices config set to inactive.'));
+      }
+    }
   }
-  if ( $is_abbr_any->(qw(sosq porq)) ) {
+  if ( $is_abbr_any->(qw(sqrq soirq sorq)) ) {
+    $args{cusordnumber} = undef;
+  }
+  if ( $is_abbr_any->(qw(soiso pocpoc pocpo popoc)) ) {
     $args{ordnumber} = undef;
+  }
+  if ( $is_abbr_any->(qw(rqpqi pqisq)) ) {
     $args{quonumber} = undef;
-    $args{reqdate}   = DateTime->today_local->next_workday();
   }
 
   # Custom shipto addresses (the ones specific to the sales/purchase
@@ -398,38 +618,50 @@ sub new_from {
     $args{shipto_id} = $source->shipto_id;
   }
 
+  $args{record_type} = $destination_type;
+
   my $order = $class->new(%args);
   $order->assign_attributes(%{ $params{attributes} }) if $params{attributes};
   my $items = delete($params{items}) || $source->items_sorted;
 
-  my %item_parents;
-
   my @items = map {
     my $source_item      = $_;
-    my $source_item_id   = $_->$item_parent_id_column;
     my @custom_variables = map { _clone_orderitem_cvar($_) } @{ $source_item->custom_variables };
 
-    $item_parents{$source_item_id} ||= $source_item->$item_parent_column;
-    my $item_parent                  = $item_parents{$source_item_id};
-
-    my $current_oe_item = SL::DB::OrderItem->new(map({ ( $_ => $source_item->$_ ) }
-                                                     qw(active_discount_source active_price_source base_qty cusordnumber
-                                                        description discount lastcost longdescription
-                                                        marge_percent marge_price_factor marge_total
-                                                        ordnumber parts_id price_factor price_factor_id pricegroup_id
-                                                        project_id qty reqdate sellprice serialnumber ship subtotal transdate unit
-                                                        optional
-                                                     )),
-                                                 custom_variables => \@custom_variables,
-    );
-    if ( $is_abbr_any->(qw(sopo)) ) {
+    my $current_oe_item;
+    if (ref($source) eq 'SL::DB::Order') {
+      $current_oe_item = SL::DB::OrderItem->new(map({ ( $_ => $source_item->$_ ) }
+                                                       qw(active_discount_source active_price_source base_qty cusordnumber
+                                                          description discount lastcost longdescription
+                                                          marge_percent marge_price_factor marge_total
+                                                          ordnumber parts_id price_factor price_factor_id pricegroup_id
+                                                          project_id qty reqdate sellprice serialnumber ship subtotal transdate unit
+                                                          optional recurring_billing_mode position
+                                                       )),
+                                                   custom_variables => \@custom_variables,
+      );
+    } elsif (ref($source) eq 'SL::DB::Reclamation') {
+      $current_oe_item = SL::DB::OrderItem->new(
+        map({ ( $_ => $source_item->$_ ) } qw(
+          active_discount_source active_price_source base_qty description
+          discount lastcost longdescription parts_id price_factor
+          price_factor_id pricegroup_id project_id qty reqdate sellprice
+          serialnumber unit position
+        )),
+        custom_variables => \@custom_variables,
+      );
+    }
+    if ( $is_abbr_any->(qw(soipo sopo)) ) {
       $current_oe_item->sellprice($source_item->lastcost);
       $current_oe_item->discount(0);
     }
-    if ( $is_abbr_any->(qw(poso)) ) {
+    if ( $is_abbr_any->(qw(poso rqsq rqso pqisq pqiso pocsq pocso)) ) {
       $current_oe_item->lastcost($source_item->sellprice);
     }
-    $current_oe_item->{"converted_from_orderitems_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::Order';
+    unless ($params{no_linked_records}) {
+      $current_oe_item->{ RECORD_ITEM_ID() } = $source_item->{id};
+      $current_oe_item->{ RECORD_ITEM_TYPE_REF() } = ref($source_item);
+    }
     $current_oe_item;
   } @{ $items };
 
@@ -439,6 +671,11 @@ sub new_from {
 
   $order->items(\@items);
 
+  unless ($params{no_linked_records}) {
+    $order->{ RECORD_ID()       } = $source->{id};
+    $order->{ RECORD_TYPE_REF() } = ref($source);
+  }
+
   return $order;
 }
 
@@ -506,10 +743,11 @@ sub new_from_multi {
   push @items, @{$_->items_sorted} for @$sources;
   # make order from first source and all items
   my $order = $class->new_from($sources->[0],
-                               destination_type => 'sales_order',
+                               destination_type => SALES_ORDER_TYPE(),
                                attributes       => \%attributes,
                                items            => \@items,
                                %params);
+  $order->{RECORD_ID()} = join ' ', map { $_->id } @$sources; # link all sources
 
   return $order;
 }
@@ -517,20 +755,12 @@ sub new_from_multi {
 sub number {
   my $self = shift;
 
-  return if !$self->type;
-
-  my %number_method = (
-    sales_order       => 'ordnumber',
-    sales_quotation   => 'quonumber',
-    purchase_order    => 'ordnumber',
-    request_quotation => 'quonumber',
-  );
-
-  return $self->${ \ $number_method{$self->type} }(@_);
+  my $nr_key = $self->type_data->properties('nr_key');
+  return $self->$nr_key(@_);
 }
 
 sub customervendor {
-  $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor;
+  $_[0]->type_data->properties('is_customer') ? $_[0]->customer : $_[0]->vendor;
 }
 
 sub date {
@@ -547,6 +777,77 @@ sub digest {
     $self->date->to_kivitendo;
 }
 
+sub current_version_number {
+  my ($self) = @_;
+
+  my $query = <<EOSQL;
+    SELECT max(version)
+    FROM oe_version
+    WHERE (oe_id = ?)
+EOSQL
+
+  my ($current_version_number) = SL::DBUtils::selectfirst_array_query($::form, $self->db->dbh, $query, ($self->id));
+  die "Invalid State. No version linked" unless $current_version_number;
+
+  return $current_version_number;
+}
+
+sub is_final_version {
+  my ($self) = @_;
+
+  my $order_versions_count = SL::DB::Manager::OrderVersion->get_all_count(where => [ oe_id => $self->id, final_version => 0 ]);
+  die "Invalid version state" unless $order_versions_count < 2;
+  my $final_version = $order_versions_count == 1 ? 0 : 1;
+
+  return $final_version;
+}
+
+sub increment_version_number {
+  my ($self) = @_;
+
+  die t8('This sub-version is not yet finalized') if !$self->is_final_version;
+
+  my $current_version_number = $self->current_version_number;
+  my $new_version_number     = $current_version_number + 1;
+
+  my $new_number = $self->number;
+  $new_number    =~ s/-$current_version_number$//;
+  $self->number($new_number . '-' . $new_version_number);
+  $self->add_order_version(SL::DB::OrderVersion->new(version => $new_version_number));
+}
+
+sub netamount_base_currency {
+  my ($self) = @_;
+
+  return $self->netamount unless $self->forex;
+
+  if ( defined $self->exchangerate ) {
+    return $self->netamount * $self->exchangerate;
+  } else {
+    return $self->netamount * $self->daily_exchangerate;
+  }
+}
+
+sub preceding_purchase_orders {
+  my ($self) = @_;
+
+  my @lrs = ();
+  if ($self->id) {
+    @lrs = grep { $_->record_type eq PURCHASE_ORDER_TYPE() } @{$self->linked_records(from => 'SL::DB::Order')};
+  } else {
+    if ('SL::DB::Order' eq $self->{RECORD_TYPE_REF()}) {
+      my $order = SL::DB::Order->load_cached($self->{RECORD_ID()});
+      push @lrs, $order if $order->record_type eq PURCHASE_ORDER_TYPE();
+    }
+  }
+
+  return \@lrs;
+}
+
+sub type_data {
+  SL::DB::Helper::TypeDataProxy->new(ref $_[0], $_[0]->type);
+}
+
 1;
 
 __END__
@@ -709,6 +1010,12 @@ saved.
 
 C<params> other then C<sort_sources_by> are passed to C<new_from>.
 
+=head2 C<increment_version_number>
+
+Checks if the current version of the order is finalized, increments
+the version number and adds a new order_version to the order.
+Dies if the version is not final.
+
 =head1 BUGS
 
 Nothing here yet.
diff --git a/SL/DB/Order/TypeData.pm b/SL/DB/Order/TypeData.pm
new file mode 100644
index 000000000..752a4fe8a
--- /dev/null
+++ b/SL/DB/Order/TypeData.pm
@@ -0,0 +1,469 @@
+package SL::DB::Order::TypeData;
+
+use strict;
+use Carp;
+use Exporter qw(import);
+use SL::Locale::String qw(t8);
+
+use constant {
+  SALES_ORDER_TYPE                 => 'sales_order',
+  PURCHASE_ORDER_TYPE              => 'purchase_order',
+  SALES_QUOTATION_TYPE             => 'sales_quotation',
+  REQUEST_QUOTATION_TYPE           => 'request_quotation',
+  PURCHASE_QUOTATION_INTAKE_TYPE   => 'purchase_quotation_intake',
+  SALES_ORDER_INTAKE_TYPE          => 'sales_order_intake',
+  PURCHASE_ORDER_CONFIRMATION_TYPE => 'purchase_order_confirmation',
+};
+
+my @export_types = qw(SALES_ORDER_TYPE PURCHASE_ORDER_TYPE REQUEST_QUOTATION_TYPE SALES_QUOTATION_TYPE
+                      PURCHASE_QUOTATION_INTAKE_TYPE SALES_ORDER_INTAKE_TYPE PURCHASE_ORDER_CONFIRMATION_TYPE);
+my @export_subs = qw(valid_types validate_type is_valid_type get get3);
+
+our @EXPORT_OK = (@export_types, @export_subs);
+our %EXPORT_TAGS = (types => \@export_types, subs => \@export_subs);
+
+my %type_data = (
+  SALES_ORDER_TYPE() => {
+    text => {
+      delete => t8('The order confirmation has been deleted'),
+      saved  => t8('The order confirmation has been saved'),
+      add    => t8("Add Sales Order"),
+      edit   => t8("Edit Sales Order"),
+      list   => t8("Sales Orders"),
+      type   => t8("Sales Order"),
+      attachment => t8("sales_order_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 1,
+      save_and_rfq                         => 1,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 0,
+      save_and_purchase_order              => 1,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 1,
+      save_and_purchase_delivery_order     => 0,
+      save_and_supplier_delivery_order     => 0,
+      save_and_reclamation                 => sub { $::instance_conf->get_show_sales_reclamation },
+      save_and_invoice_for_advance_payment => sub { $::instance_conf->get_show_invoice_for_advance_payment },
+      save_and_final_invoice               => sub { $::instance_conf->get_show_invoice_for_advance_payment },
+      save_and_ap_transaction              => 0,
+      save_and_invoice                     => 1,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => sub { $::instance_conf->get_sales_order_show_delete },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "ordnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub {
+        if ($::instance_conf->get_deliverydate_on) {
+          return DateTime->today_local->next_workday(
+            extra_days => $::instance_conf->get_delivery_date_interval());
+        } else {
+          return ;
+        }
+      },
+    },
+    part_classification_query => [ "used_for_sale" => 1 ],
+    no_order_locked_parts     => 0,
+    rights => {
+      edit => "sales_order_edit",
+      view => "sales_order_edit | sales_order_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  PURCHASE_ORDER_TYPE() => {
+    text => {
+      delete => t8('The order has been deleted'),
+      saved  => t8('The order has been saved'),
+      add    => t8("Add Purchase Order"),
+      edit   => t8("Edit Purchase Order"),
+      list   => t8("Purchase Orders"),
+      type   => t8("Purchase Order"),
+      attachment => t8("purchase_order_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 0,
+      save_and_rfq                         => 1,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 0,
+      save_and_purchase_order_confirmation => sub { $::instance_conf->get_show_purchase_order_confirmation },
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 1,
+      save_and_supplier_delivery_order     => 1,
+      save_and_reclamation                 => sub { $::instance_conf->get_show_purchase_reclamation },
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 1,
+      save_and_invoice                     => 1,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => sub { $::instance_conf->get_purchase_order_show_delete },
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "ordnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    no_order_locked_parts     => 1,
+    rights => {
+      edit => "purchase_order_edit",
+      view => "purchase_order_edit | purchase_order_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  SALES_QUOTATION_TYPE() => {
+    text => {
+      delete => t8('The quotation has been deleted'),
+      saved  => t8('The quotation has been saved'),
+      add    => t8("Add Quotation"),
+      edit   => t8("Edit Quotation"),
+      list   => t8("Quotations"),
+      type   => t8("Quotation"),
+      attachment => t8("quotation_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 0,
+      save_and_rfq                         => 1,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => sub { $::instance_conf->get_show_sales_order_intake },
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 0,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 0,
+      save_and_supplier_delivery_order     => 0,
+      save_and_reclamation                 => 0,
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 0,
+      save_and_invoice                     => 1,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => 1,
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "quonumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub {
+        if ($::instance_conf->get_reqdate_on) {
+          return DateTime->today_local->next_workday(
+            extra_days => $::instance_conf->get_reqdate_interval());
+        } else {
+          return ;
+        }
+      },
+    },
+    part_classification_query => [ "used_for_sale" => 1 ],
+    no_order_locked_parts     => 0,
+    rights => {
+      edit => "sales_quotation_edit",
+      view => "sales_quotation_edit | sales_quotation_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  REQUEST_QUOTATION_TYPE() => {
+    text => {
+      delete => t8('The rfq has been deleted'),
+      saved  => t8('The rfq has been saved'),
+      add    => t8("Add Request for Quotation"),
+      edit   => t8("Edit Request for Quotation"),
+      list   => t8("Request for Quotations"),
+      type   => t8("Request for Quotation"),
+      attachment => t8("rfq_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 1,
+      save_and_rfq                         => 0,
+      save_and_purchase_quotation_intake   => sub { $::instance_conf->get_show_purchase_quotation_intake },
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 1,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 0,
+      save_and_supplier_delivery_order     => 0,
+      save_and_reclamation                 => 0,
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 0,
+      save_and_invoice                     => 1,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => 1,
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "quonumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    no_order_locked_parts     => 1,
+    rights => {
+      edit => "request_quotation_edit",
+      view => "request_quotation_edit | request_quotation_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  PURCHASE_QUOTATION_INTAKE_TYPE() => {
+    text => {
+      delete     => t8('The quotation intake has been deleted'),
+      saved      => t8('The quotation intake has been saved'),
+      add        => t8('Add Purchase Quotation Intake'),
+      edit       => t8('Edit Purchase Quotation Intake'),
+      list       => t8('Purchase Quotation Intakes'),
+      type       => t8('Purchase Quotation Intake'),
+      attachment => t8('purchase_quotation_intake_list'),
+    },
+    show_menu => {
+      save_and_quotation                   => 1,
+      save_and_rfq                         => 0,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 1,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 0,
+      save_and_supplier_delivery_order     => 0,
+      save_and_reclamation                 => 0,
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 0,
+      save_and_invoice                     => 0,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => 1,
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "quonumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    no_order_locked_parts     => 0,
+    rights => {
+      edit => "request_quotation_edit",
+      view => "request_quotation_edit | request_quotation_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  SALES_ORDER_INTAKE_TYPE() => {
+    text => {
+      delete => t8('The order intake has been deleted'),
+      saved  => t8('The order intake has been saved'),
+      add    => t8("Add Sales Order Intake"),
+      edit   => t8("Edit Sales Order Intake"),
+      list   => t8("Sales Order Intakes"),
+      type   => t8("Sales Order Intake"),
+      attachment => t8("sales_order_intake_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 1,
+      save_and_rfq                         => 1,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 1,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 0,
+      save_and_supplier_delivery_order     => 0,
+      save_and_reclamation                 => 0,
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 0,
+      save_and_invoice                     => 0,
+      save_and_print                       => 1,
+      save_and_email                       => 1,
+      delete => sub { $::instance_conf->get_sales_order_show_delete },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "ordnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub {
+        if ($::instance_conf->get_deliverydate_on) {
+          return DateTime->today_local->next_workday(
+            extra_days => $::instance_conf->get_delivery_date_interval());
+        } else {
+          return ;
+        }
+      },
+    },
+    part_classification_query => [ "used_for_sale" => 1 ],
+    no_order_locked_parts     => 0,
+    rights => {
+      edit => "sales_order_edit",
+      view => "sales_order_edit | sales_order_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+  PURCHASE_ORDER_CONFIRMATION_TYPE() => {
+    text => {
+      delete => t8('The order confirmation has been deleted'),
+      saved  => t8('The order confirmation has been saved'),
+      add    => t8("Add Purchase Order Confirmation"),
+      edit   => t8("Edit Purchase Order Confirmation"),
+      list   => t8("Purchase Order Confirmations"),
+      type   => t8("Purchase Order Confirmation"),
+      attachment => t8("purchase_order_confirmation_list"),
+    },
+    show_menu => {
+      save_and_quotation                   => 1,
+      save_and_rfq                         => 0,
+      save_and_purchase_quotation_intake   => 0,
+      save_and_sales_order_intake          => 0,
+      save_and_sales_order                 => 1,
+      save_and_purchase_order              => 1,
+      save_and_purchase_order_confirmation => 0,
+      save_and_sales_delivery_order        => 0,
+      save_and_purchase_delivery_order     => 1,
+      save_and_supplier_delivery_order     => 1,
+      save_and_reclamation                 => sub { $::instance_conf->get_show_purchase_reclamation },
+      save_and_invoice_for_advance_payment => 0,
+      save_and_final_invoice               => 0,
+      save_and_ap_transaction              => 1,
+      save_and_invoice                     => 1,
+      save_and_print                       => 0,
+      save_and_email                       => 0,
+      delete => sub { $::instance_conf->get_purchase_order_show_delete },
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "ordnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    no_order_locked_parts     => 0,
+    rights => {
+      edit => "purchase_order_edit",
+      view => "purchase_order_edit | sales_order_view",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => sub { $::instance_conf->get_lock_oe_subversions },
+    },
+  },
+);
+
+my @valid_types = (
+  SALES_QUOTATION_TYPE,
+  REQUEST_QUOTATION_TYPE,
+  SALES_ORDER_INTAKE_TYPE,
+  PURCHASE_QUOTATION_INTAKE_TYPE,
+  SALES_ORDER_TYPE,
+  PURCHASE_ORDER_TYPE,
+  PURCHASE_ORDER_CONFIRMATION_TYPE,
+);
+
+my %valid_types = map { $_ => $_ } @valid_types;
+
+sub valid_types {
+  \@valid_types;
+}
+
+sub is_valid_type {
+  !!exists $type_data{$_[0]};
+}
+
+sub validate_type {
+  my ($type) = @_;
+
+  return $valid_types{$type} // croak "invalid type '$type'";
+}
+
+sub get {
+  my ($type, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}->{$key} // die "unknown property '$key'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+sub get3 {
+  my ($type, $topic, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}{$topic}{$key} // croak "unknown property '$key' in topic '$topic' for type '$type'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+1;
+
+__END__
+
+todo:
+
+features:
+- price_tax_calculation
+- subversioning for sales_orders
+- final invoices for sales_orders
+- payment_terms
+- periodic invoices for some types
+- auto close quotations for some types
+-
diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index cc0a92f95..0792f8b63 100644
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -18,6 +18,7 @@ use SL::DB::Helper::CustomVariables (
   },
 );
 use SL::Helper::ShippedQty;
+use Rose::DB::Object::Helpers qw(as_tree strip);
 
 __PACKAGE__->meta->initialize;
 
@@ -47,6 +48,7 @@ sub linked_delivery_order_items {
 sub delivered_qty { goto &shipped_qty }
 
 sub record { goto &order }
+sub record_id { goto &trans_id }
 
 1;
 
diff --git a/SL/DB/OrderStatus.pm b/SL/DB/OrderStatus.pm
new file mode 100644
index 000000000..6e54371c4
--- /dev/null
+++ b/SL/DB/OrderStatus.pm
@@ -0,0 +1,28 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::OrderStatus;
+
+use strict;
+
+use SL::DB::MetaSetup::OrderStatus;
+use SL::DB::Manager::OrderStatus;
+
+use SL::DB::Helper::ActsAsList;
+
+__PACKAGE__->meta->initialize;
+
+sub validate {
+  my ($self) = @_;
+
+  my @errors;
+  push @errors, $::locale->text('The name is missing.') if !$self->name;
+
+  my $not_unique_count = SL::DB::Manager::OrderStatus->get_all_count(where => ['!id' => $self->id,
+                                                                               name  => $self->name]);
+  push @errors, $::locale->text('The name is not unique.') if $not_unique_count;
+
+  return @errors;
+}
+
+1;
diff --git a/SL/DB/OrderVersion.pm b/SL/DB/OrderVersion.pm
new file mode 100644
index 000000000..5b59d66c7
--- /dev/null
+++ b/SL/DB/OrderVersion.pm
@@ -0,0 +1,13 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::OrderVersion;
+
+use strict;
+
+use SL::DB::MetaSetup::OrderVersion;
+use SL::DB::Manager::OrderVersion;
+
+__PACKAGE__->meta->initialize;
+
+1;
diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm
index 89261af01..b75bbb5e9 100644
--- a/SL/DB/Part.pm
+++ b/SL/DB/Part.pm
@@ -8,10 +8,10 @@ use List::Util qw(sum);
 use Rose::DB::Object::Helpers qw(as_tree);
 
 use SL::Locale::String qw(t8);
+use SL::Helper::Inventory;
 use SL::DBUtils;
 use SL::DB::MetaSetup::Part;
 use SL::DB::Manager::Part;
-use SL::DB::Chart;
 use SL::DB::Helper::AttrHTML;
 use SL::DB::Helper::AttrSorted;
 use SL::DB::Helper::TransNumberGenerator;
@@ -47,6 +47,11 @@ __PACKAGE__->meta->add_relationships(
     manager_args => { sort_by => 'sortorder' },
     column_map   => { id => 'parts_id' },
   },
+  businessmodels     => {
+    type         => 'one to many',
+    class        => 'SL::DB::BusinessModel',
+    column_map   => { id => 'parts_id' },
+  },
   customerprices => {
     type         => 'one to many',
     class        => 'SL::DB::PartCustomerPrice',
@@ -80,15 +85,24 @@ __PACKAGE__->meta->add_relationships(
     type         => 'one to one',
     class        => 'SL::DB::PartsPriceHistory',
     column_map   => { id => 'part_id' },
-    manager_args => { sort_by => 'valid_from DESC', limit => 1 },
+    manager_args => { sort_by => 'valid_from DESC, id DESC', limit => 1 },
+  },
+  purchase_basket_item => {
+    type         => 'one to one',
+    class        => 'SL::DB::PurchaseBasketItem',
+    column_map   => { id => 'part_id' },
   },
 );
 
 __PACKAGE__->meta->initialize;
 
+use Rose::Object::MakeMethods::Generic (
+  'scalar --get_set_init' => [ qw(onhandqty stockqty get_open_ordered_qty) ],
+);
 __PACKAGE__->attr_html('notes');
 __PACKAGE__->attr_sorted({ unsorted => 'makemodels',     position => 'sortorder' });
 __PACKAGE__->attr_sorted({ unsorted => 'customerprices', position => 'sortorder' });
+__PACKAGE__->attr_sorted('businessmodels');
 
 __PACKAGE__->before_save('_before_save_set_partnumber');
 __PACKAGE__->before_save('_before_save_set_assembly_weight');
@@ -129,7 +143,7 @@ sub items_checksum {
   # changed when saving
 
   return join(' ', sort map { $_->part->id } @{$self->items});
-};
+}
 
 sub validate {
   my ($self) = @_;
@@ -148,7 +162,7 @@ sub validate {
 
   unless ( $self->id ) {
     push @errors, $::locale->text('The partnumber already exists.') if SL::DB::Manager::Part->get_all_count(where => [ partnumber => $self->partnumber ]);
-  };
+  }
 
   if ($self->is_assortment && $self->orphaned && scalar @{$self->assortment_items} == 0) {
     # when assortment isn't orphaned form doesn't contain any items
@@ -212,7 +226,7 @@ sub new_assortment {
 sub last_modification {
   my ($self) = @_;
   return $self->mtime // $self->itime;
-};
+}
 
 sub used_in_record {
   my ($self) = @_;
@@ -232,6 +246,7 @@ sub used_in_record {
   }
   return 0;
 }
+
 sub orphaned {
   my ($self) = @_;
   die 'not an accessor' if @_ > 1;
@@ -304,6 +319,7 @@ sub get_taxkey {
 
 sub get_chart {
   my ($self, %params) = @_;
+  require SL::DB::Chart;
 
   my $type    = (any { $_ eq $params{type} } qw(income expense inventory)) ? $params{type} : croak("Invalid 'type' parameter '$params{type}'");
   my $taxzone = $params{ defined($params{taxzone}) ? 'taxzone' : 'taxzone_id' } * 1;
@@ -356,7 +372,7 @@ sub get_stock {
   my ($stock) = selectrow_query($::form, $self->db->dbh, $query, @values);
 
   return $stock || 0; # never return undef
-};
+}
 
 
 # this is designed to ignore chargenumbers, expiration dates and just give a list of how much <-> where
@@ -443,7 +459,7 @@ select unnest(ids)
 SQL
 
   my $objs  = SL::DB::Manager::Inventory->get_all(
-    query        => [ id => [ \"$query" ] ],                           # make emacs happy "
+    query        => [ id => [ \"$query" ] ],                           # make emacs happy "]]
     with_objects => [ 'parts', 'trans_type', 'bin', 'bin.warehouse' ], # prevent lazy loading in template
     sort_by      => 'itime DESC',
   );
@@ -470,16 +486,16 @@ sub clone_and_reset_deep {
   my $clone = $self->clone_and_reset; # resets id and partnumber (primary key and unique constraint)
   $clone->makemodels(   map { $_->clone_and_reset } @{$self->makemodels}   ) if @{$self->makemodels};
   $clone->translations( map { $_->clone_and_reset } @{$self->translations} ) if @{$self->translations};
-
+  $clone->custom_variables( map { $_->clone_and_reset } @{$self->custom_variables} ) if @{$self->custom_variables};
   if ( $self->is_assortment ) {
     # use clone rather than reset_and_clone because the unique constraint would also remove parts_id
     $clone->assortment_items( map { $_->clone } @{$self->assortment_items} );
     $_->assortment_id(undef) foreach @{ $clone->assortment_items }
-  };
+  }
 
   if ( $self->is_assembly ) {
     $clone->assemblies( map { $_->clone_and_reset } @{$self->assemblies});
-  };
+  }
 
   if ( $self->prices ) {
     $clone->prices( map { $_->clone } @{$self->prices}); # pricegroup_id gets reset here because it is part of a unique contraint
@@ -487,9 +503,9 @@ sub clone_and_reset_deep {
       foreach my $price ( @{$clone->prices} ) {
         $price->id(undef);
         $price->parts_id(undef);
-      };
-    };
-  };
+      }
+    }
+  }
 
   return $clone;
 }
@@ -514,7 +530,7 @@ sub item_diffs {
   @removals  = grep { !exists( $comparison{$_} ) } @self_part_ids       if @self_part_ids;
 
   return \@additions, \@removals;
-};
+}
 
 sub items_sellprice_sum {
   my ($self, %params) = @_;
@@ -535,7 +551,7 @@ sub items_lastcost_sum {
   return unless $self->is_assortment or $self->is_assembly;
   return unless $self->items;
   sum map { $_->linetotal_lastcost } @{$self->items};
-};
+}
 
 sub items_weight_sum {
   my ($self) = @_;
@@ -543,7 +559,51 @@ sub items_weight_sum {
   return unless $self->is_assembly;
   return unless $self->items;
   sum map { $_->linetotal_weight} @{$self->items};
-};
+}
+
+sub set_lastcost_assemblies_and_assortiments {
+  my ($self) = @_;
+
+  return 1 unless $self->id;  # not saved yet
+
+  require SL::DB::AssortmentItem;
+  require SL::DB::Assembly;
+
+  # 1. check all
+  my $assortments = SL::DB::Manager::AssortmentItem->get_all(where => [parts_id => $self->id ]);
+  my $assemblies  = SL::DB::Manager::Assembly->get_all(      where => [parts_id => $self->id ]);
+
+  foreach my $assembly (@{ $assemblies }) {
+    my $a = $assembly->assembly_part;
+    $a->update_attributes(lastcost => $a->items_lastcost_sum);
+    $a->set_lastcost_assemblies_and_assortiments;
+  }
+  foreach my $assortment (@{ $assortments }) {
+    my $a = $assortment->assortment;
+    $a->update_attributes(lastcost => $a->items_lastcost_sum);
+    $a->set_lastcost_assemblies_and_assortiments;
+  }
+  return 1;
+}
+
+sub init_onhandqty{
+  my ($self) = @_;
+  my $qty = SL::Helper::Inventory::get_onhand(part => $self->id) || 0;
+  return $qty;
+}
+
+sub init_stockqty{
+  my ($self) = @_;
+  my $qty = SL::Helper::Inventory::get_stock(part => $self->id) || 0;
+  return $qty;
+}
+
+sub init_get_open_ordered_qty {
+  my ($self) = @_;
+  my $result = SL::DB::Manager::Part->get_open_ordered_qty($self->id);
+
+  return $result;
+}
 
 1;
 
diff --git a/SL/DB/PartsGroup.pm b/SL/DB/PartsGroup.pm
index 4a7f607f4..5a11b516a 100644
--- a/SL/DB/PartsGroup.pm
+++ b/SL/DB/PartsGroup.pm
@@ -56,6 +56,9 @@ sub orphaned {
     return 0 if $class->_get_manager_class->get_all_count(query => [ partsgroup_id => $self->id ]);
   }
 
+  eval "require SL::DB::PriceRuleItem";
+  return 0 if SL::DB::Manager::PriceRuleItem->get_all_count(query => [ type => 'partsgroup', value_int => $self->id ]);
+
   return 1;
 }
 
diff --git a/SL/DB/PriceRuleItem.pm b/SL/DB/PriceRuleItem.pm
index 006556d4c..6e45bda44 100644
--- a/SL/DB/PriceRuleItem.pm
+++ b/SL/DB/PriceRuleItem.pm
@@ -99,6 +99,11 @@ sub pricegroup {
   SL::DB::Pricegroup->load_cached($_[0]->value_int);
 }
 
+sub cvar_config {
+  die "not a cvar price rule item" unless $_[0]->type eq 'cvar';
+  &custom_variable_configs
+}
+
 sub full_description {
   my ($self) = @_;
 
@@ -128,9 +133,38 @@ sub full_description {
      : $op eq 'lt' ? t8('Transdate is before #1', $self->value_date_as_date)
      : $op eq 'gt' ? t8('Transdate is after #1',  $self->value_date_as_date)
      : do { die "unknown op $op for type $type" } )
+  : $type eq 'cvar' ? $self->cvar_rule_description($type, $op)
   : do { die "unknown type $type" }
 }
 
+sub cvar_rule_description {
+  my ($self, $type, $op) = @_;
+  my $config      = $self->cvar_config;
+  my $description = $config->description;
+
+  t8('Custom Variables (Abbreviation)') . ' ' . (
+      $config->type eq 'select'   ? t8("#1 is #2", $description, $self->value_text)
+    : $config->type eq 'customer' ? t8("#1 is #2", $description, $self->customer->displayable_name)
+    : $config->type eq 'vendor'   ? t8("#1 is #2", $description, $self->vendor->displayable_name)
+    : $config->type eq 'part'     ? t8("#1 is #2", $description, $self->part->displayable_name)
+    : $config->type eq 'number'   ? (
+          $op eq 'eq' ? t8('#1 equals #2',             $description, $self->value_num_as_number)
+        : $op eq 'lt' ? t8('#1 less than #2',          $description, $self->value_num_as_number)
+        : $op eq 'gt' ? t8('#1 more than #2',          $description, $self->value_num_as_number)
+        : $op eq 'le' ? t8('#1 equal or less than #2', $description, $self->value_num_as_number)
+        : $op eq 'ge' ? t8('#1 equal or more than #2', $description, $self->value_num_as_number)
+        : do { die "unknown op $op for type ", $config->type }
+      )
+     : $config->type eq 'date'     ? (
+           $op eq 'eq' ? t8('#1 is #2',        $description, $self->value_date_as_date)
+         : $op eq 'lt' ? t8('#1 is before #2', $description, $self->value_date_as_date)
+         : $op eq 'gt' ? t8('#1 is after #2',  $description, $self->value_date_as_date)
+         : do { die "unknown op $op for type ", $config->type }
+       )
+    : do { die "unknown type " . $config->type }
+  );
+}
+
 sub validate {
   my ($self) = @_;
 
diff --git a/SL/DB/Pricegroup.pm b/SL/DB/Pricegroup.pm
index a7cfc2053..4a3dd6c1e 100644
--- a/SL/DB/Pricegroup.pm
+++ b/SL/DB/Pricegroup.pm
@@ -77,6 +77,9 @@ sub orphaned {
     return 0 if $class->_get_manager_class->get_all_count(query => [ active_price_source => 'pricegroup/' . $self->id ]);
   }
 
+  eval "require SL::DB::PriceRuleItem";
+  return 0 if SL::DB::Manager::PriceRuleItem->get_all_count(query => [ type => 'pricegroup', value_int => $self->id ]);
+
   return 1;
 }
 
diff --git a/SL/DB/Project.pm b/SL/DB/Project.pm
index 54975350c..08e998243 100644
--- a/SL/DB/Project.pm
+++ b/SL/DB/Project.pm
@@ -105,7 +105,7 @@ sub may_employee_view_project_invoices {
     LIMIT 1
 EOSQL
 
-  return !!$self->db->dbh->selectrow_arrayref($query, undef, $employee_id, $self->id)->[0];
+  return !!($self->db->dbh->selectrow_arrayref($query, undef, $employee_id, $self->id)||[])->[0];
 }
 
 1;
diff --git a/SL/DB/PurchaseBasketItem.pm b/SL/DB/PurchaseBasketItem.pm
new file mode 100644
index 000000000..af0d5cde1
--- /dev/null
+++ b/SL/DB/PurchaseBasketItem.pm
@@ -0,0 +1,13 @@
+# This file has been auto-generated only because it didn't exist.
+# Feel free to modify it at will; it will not be overwritten automatically.
+
+package SL::DB::PurchaseBasketItem;
+
+use strict;
+
+use SL::DB::MetaSetup::PurchaseBasketItem;
+use SL::DB::Manager::PurchaseBasketItem;
+
+__PACKAGE__->meta->initialize;
+
+1;
diff --git a/SL/DB/PurchaseInvoice.pm b/SL/DB/PurchaseInvoice.pm
index 3eb320ee3..ca4bf5960 100644
--- a/SL/DB/PurchaseInvoice.pm
+++ b/SL/DB/PurchaseInvoice.pm
@@ -4,6 +4,7 @@ use strict;
 
 use Carp;
 use Data::Dumper;
+use List::Util qw(sum);
 
 use SL::DB::MetaSetup::PurchaseInvoice;
 use SL::DB::Manager::PurchaseInvoice;
@@ -11,9 +12,11 @@ use SL::DB::Helper::AttrHTML;
 use SL::DB::Helper::AttrSorted;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::Payment qw(:ALL);
+use SL::DB::Helper::RecordLink qw(RECORD_ID RECORD_TYPE_REF RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
 use SL::DB::Helper::SalesPurchaseInvoice;
+use SL::DB::Helper::ZUGFeRD qw(:IMPORT);
 use SL::Locale::String qw(t8);
-use Rose::DB::Object::Helpers qw(has_loaded_related forget_related);
+use Rose::DB::Object::Helpers qw(has_loaded_related forget_related as_tree strip);
 
 # The calculator hasn't been adjusted for purchase invoices yet.
 # use SL::DB::Helper::PriceTaxCalculator;
@@ -57,9 +60,30 @@ __PACKAGE__->meta->initialize;
 __PACKAGE__->attr_html('notes');
 __PACKAGE__->attr_sorted('items');
 
+__PACKAGE__->after_save('_after_save_link_records');
+
+# hooks
+
+sub _after_save_link_records {
+  my ($self) = @_;
+
+  my @allowed_record_sources = qw(SL::DB::Reclamation SL::DB::Order);
+  my @allowed_item_sources = qw(SL::DB::ReclamationItem SL::DB::OrderItem);
+
+  SL::DB::Helper::RecordLink::link_records(
+    $self,
+    \@allowed_record_sources,
+    \@allowed_item_sources,
+    close_source_quotations => 1,
+  );
+}
+
+# methods
+
 sub items { goto &invoiceitems; }
 sub add_items { goto &add_invoiceitems; }
-sub record_number { goto &invnumber; };
+sub record_number { goto &invnumber; }
+sub record_type { goto &invoice_type; }
 
 sub is_sales {
   # For compatibility with Order, DeliveryOrder
@@ -87,7 +111,7 @@ sub abbreviation {
   return t8('Invoice (one letter abbreviation)'). '(' . t8('Storno (one letter abbreviation)') . ')' if $self->storno;
   return t8('Invoice (one letter abbreviation)');
 
-};
+}
 
 sub oneline_summary {
   my $self = shift;
@@ -109,9 +133,15 @@ sub link {
 sub invoice_type {
   my ($self) = @_;
 
-  return 'ap_transaction' if !$self->invoice;
+  return 'purchase_credit_note'  if  $self->amount < 0;
+  return 'ap_transaction'        if !$self->invoice;
   return 'purchase_invoice';
 }
+sub is_credit_note {
+  my ($self) = @_;
+
+  return $self->invoice_type eq 'purchase_credit_note' ? 1 : undef;
+}
 
 sub displayable_type {
   my ($self) = @_;
@@ -122,7 +152,26 @@ sub displayable_type {
 
 sub displayable_name {
   join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number);
-};
+}
+
+sub convert_to_reclamation {
+  my ($self, %params) = @_;
+  $params{destination_type} = $self->is_sales ? 'sales_reclamation'
+                                              : 'purchase_reclamation';
+
+  require SL::DB::Reclamation;
+  my $reclamation = SL::DB::Reclamation->new_from($self, %params);
+
+  return $reclamation;
+}
+
+sub create_from_zugferd_data {
+  my ($class, $data) = @_;
+
+  my $ap_invoice = $class->new();
+
+  $ap_invoice->import_zugferd_data($data);
+}
 
 sub create_ap_row {
   my ($self, %params) = @_;
@@ -132,6 +181,8 @@ sub create_ap_row {
   # only allow this method for ap invoices (Kreditorenbuchung)
   die if $self->invoice and not $self->vendor_id;
 
+  return 0 unless scalar @{$self->transactions} > 0;
+
   my $acc_trans = [];
   my $chart = $params{chart} || SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_ap_chart_id);
   die "illegal chart in create_ap_row" unless $chart;
@@ -153,7 +204,7 @@ sub create_ap_row {
   $self->add_transactions( $acc );
   push( @$acc_trans, $acc );
   return $acc_trans;
-};
+}
 
 sub add_ap_amount_row {
   my ($self, %params ) = @_;
@@ -174,8 +225,9 @@ sub add_ap_amount_row {
 
   if ( $tax and $tax->rate != 0 ) {
     ($netamount, $taxamount) = Form->calculate_tax($params{amount}, $tax->rate, $self->taxincluded, $roundplaces);
-  };
-  next unless $netamount; # netamount mustn't be zero
+  }
+
+  return unless $netamount; # netamount mustn't be zero
 
   my $sign = $self->vendor_id ? -1 : 1;
   my $acc = SL::DB::AccTransaction->new(
@@ -205,9 +257,80 @@ sub add_ap_amount_row {
      );
      $self->add_transactions( $acc );
      push( @$acc_trans, $acc );
-  };
+  }
   return $acc_trans;
-};
+}
+
+sub validate_acc_trans {
+  my ($self, %params) = @_;
+  # should be able to check unsaved invoice objects with several acc_trans lines
+
+  die "validate_acc_trans can't check invoice object with empty transactions" unless $self->transactions;
+
+  my @transactions = @{$self->transactions};
+  # die "invoice has no acc_transactions" unless scalar @transactions > 0;
+
+  return 0 unless scalar @transactions > 0;
+  return 0 unless $self->has_loaded_related('transactions');
+
+  $::lxdebug->message(LXDebug->DEBUG1(), sprintf("starting validatation of purchase invoice %s with trans_id %s and taxincluded %s\n", $self->invnumber // '', $self->id // '', $self->taxincluded // ''));
+  foreach my $acc ( @transactions ) {
+    $::lxdebug->message(LXDebug->DEBUG1(), sprintf("chart: %s  amount: %s   tax_id: %s  link: %s\n", $acc->chart->accno, $acc->amount, $acc->tax_id, $acc->chart->link));
+  }
+
+  my $acc_trans_sum = sum map { $_->amount } @transactions;
+
+  unless ( $::form->round_amount($acc_trans_sum, 10) == 0 ) {
+    my $string = "sum of acc_transactions isn't 0: $acc_trans_sum\n";
+
+    foreach my $trans ( @transactions ) {
+      $string .= sprintf("  %s %s %s\n", $trans->chart->accno, $trans->taxkey, $trans->amount);
+    }
+    $::lxdebug->message(LXDebug->DEBUG1(), $string);
+    return 0;
+  }
+
+  # only use the first AP entry, so it also works for paid invoices
+  my @ap_transactions = map { $_->amount } grep { $_->chart_link eq 'AP' } @transactions;
+  my $ap_sum = $ap_transactions[0];
+  # my $ap_sum = sum map { $_->amount } grep { $_->chart_link eq 'AP' } @transactions;
+
+  my $sign = $self->vendor_id ? 1 : -1;
+
+  unless ( $::form->round_amount($ap_sum * $sign, 2) == $::form->round_amount($self->amount, 2) ) {
+
+    $::lxdebug->message(LXDebug->DEBUG1(), sprintf("debug: (ap_sum) %s = %s (amount)\n",  $::form->round_amount($ap_sum * $sign, 2) , $::form->round_amount($self->amount, 2) ) );
+    foreach my $trans ( @transactions ) {
+      $::lxdebug->message(LXDebug->DEBUG1(), sprintf("  %s %s %s %s\n", $trans->chart->accno, $trans->taxkey, $trans->amount, $trans->chart->link));
+    }
+
+    die sprintf("sum of ap (%s) isn't equal to invoice amount (%s)", $::form->round_amount($ap_sum * $sign, 2), $::form->round_amount($self->amount, 2));
+  }
+
+  return 1;
+}
+
+sub recalculate_amounts {
+  my ($self, %params) = @_;
+  # calculate and set amount and netamount from acc_trans objects
+
+  croak ("Can only recalculate amounts for ap transactions") if $self->invoice;
+
+  return undef unless $self->has_loaded_related('transactions');
+
+  my ($netamount, $taxamount);
+
+  my @transactions = @{$self->transactions};
+
+  foreach my $acc ( @transactions ) {
+    $netamount += $acc->amount if $acc->chart->link =~ /AP_amount/;
+    $taxamount += $acc->amount if $acc->chart->link =~ /AP_tax/;
+  }
+
+  my $sign = $self->vendor_id ? -1 : 1;
+  $self->amount   (($netamount + $taxamount) * $sign);
+  $self->netamount(($netamount)              * $sign);
+}
 
 sub mark_as_paid {
   my ($self) = @_;
@@ -221,6 +344,12 @@ sub effective_tax_point {
   return $self->tax_point || $self->deliverydate || $self->transdate;
 }
 
+sub netamount_base_currency {
+  my ($self) = @_;
+
+  return $self->netamount; # already matches base currency
+}
+
 1;
 
 
@@ -238,6 +367,17 @@ SL::DB::PurchaseInvoice: Rose model for purchase invoices (table "ap")
 
 =over 4
 
+=item C<create_ap_row>
+
+=item C<add_ap_amount_row>
+
+=item C<validate_acc_trans>
+
+=item C<recalculate_amounts>
+
+These functions are similar to the ones in the C<SL::DB::Invoice> module. See
+there for more information.
+
 =item C<mark_as_paid>
 
 Marks the invoice as paid by setting its C<paid> member to the value of C<amount>.
diff --git a/SL/DB/PurchaseInvoice/TypeData.pm b/SL/DB/PurchaseInvoice/TypeData.pm
new file mode 100644
index 000000000..d4fdf07d3
--- /dev/null
+++ b/SL/DB/PurchaseInvoice/TypeData.pm
@@ -0,0 +1,131 @@
+package SL::DB::PurchaseInvoice::TypeData;
+
+use strict;
+use Carp;
+use Exporter qw(import);
+use SL::Locale::String qw(t8);
+
+use constant {
+  PURCHASE_INVOICE_TYPE     => 'purchase_invoice',
+  PURCHASE_CREDIT_NOTE_TYPE => 'purchase_credit_note',
+};
+
+my @export_types = qw(PURCHASE_INVOICE_TYPE PURCHASE_CREDIT_NOTE_TYPE);
+my @export_subs = qw(valid_types validate_type is_valid_type get get3);
+
+our @EXPORT_OK = (@export_types, @export_subs);
+our %EXPORT_TAGS = (types => \@export_types, subs => \@export_subs);
+
+my %type_data = (
+  PURCHASE_INVOICE_TYPE() => {
+    text => {
+      delete     => t8('The purchase invoice has been deleted'),
+      list       => t8("Purchase Invoices"),
+      add        => t8("Add Purchase Invoice"),
+      edit       => t8("Edit Purchase Invoice"),
+      type       => t8("Purchase Invoice"),
+    },
+    show_menu => {
+      purchase_reclamation => 1,
+      use_as_new           => 1,
+      # delete => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "invnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  PURCHASE_CREDIT_NOTE_TYPE() => {
+    text => {
+      delete     => t8('The purchase credit note has been deleted'),
+      list       => t8("Purchase Credit Notes"),
+      add        => t8("Add Purchase Credit Note"),
+      edit       => t8("Edit Purchase Credit Note"),
+      type       => t8("Purchase Credit Note"),
+    },
+    show_menu => {
+      purchase_reclamation => 0,
+      use_as_new           => 1,
+      # delete => sub { die "not implemented" },
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "invnumber",
+      worflow_needed => 0,
+    },
+    defaults => {
+      # TODO
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    rights => {
+      # TODO
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+);
+
+my @valid_types = (
+  PURCHASE_INVOICE_TYPE,
+  PURCHASE_CREDIT_NOTE_TYPE,
+);
+
+my %valid_types = map { $_ => $_ } @valid_types;
+
+sub valid_types {
+  \@valid_types;
+}
+
+sub is_valid_type {
+  !!exists $type_data{$_[0]};
+}
+
+sub validate_type {
+  my ($type) = @_;
+
+  return $valid_types{$type} // croak "invalid type '$type'";
+}
+
+sub get {
+  my ($type, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}->{$key} // die "unknown property '$key'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+sub get3 {
+  my ($type, $topic, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}{$topic}{$key} // croak "unknown property '$key' in topic '$topic' for type '$type'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+1;
diff --git a/SL/DB/Reclamation.pm b/SL/DB/Reclamation.pm
new file mode 100644
index 000000000..02273a285
--- /dev/null
+++ b/SL/DB/Reclamation.pm
@@ -0,0 +1,665 @@
+package SL::DB::Reclamation;
+
+use utf8;
+use strict;
+
+use Carp;
+use DateTime;
+use List::Util qw(max sum0);
+use List::MoreUtils qw(any);
+
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Reclamation::TypeData qw(:types);
+use SL::DB::MetaSetup::Reclamation;
+use SL::DB::Manager::Reclamation;
+use SL::DB::Helper::Attr;
+use SL::DB::Helper::AttrHTML;
+use SL::DB::Helper::AttrSorted;
+use SL::DB::Helper::FlattenToForm;
+use SL::DB::Helper::LinkedRecords;
+use SL::DB::Helper::PriceTaxCalculator;
+use SL::DB::Helper::PriceUpdater;
+use SL::DB::Helper::TypeDataProxy;
+use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::Helper::RecordLink qw(RECORD_ID RECORD_TYPE_REF);
+use SL::Locale::String qw(t8);
+use SL::RecordLinks;
+use Rose::DB::Object::Helpers qw(as_tree strip);
+use SL::DB::Helper::LegacyPrinting qw(map_keys_to_arrays format_as_number);
+
+__PACKAGE__->meta->add_relationship(
+
+  reclamation_items => {
+    type         => 'one to many',
+    class        => 'SL::DB::ReclamationItem',
+    column_map   => { id => 'reclamation_id' },
+    manager_args => {
+      with_objects => [ 'part', 'reason' ]
+    }
+  },
+  custom_shipto            => {
+    type                   => 'one to one',
+    class                  => 'SL::DB::Shipto',
+    column_map             => { id => 'trans_id' },
+    query_args             => [ module => 'Reclamation' ],
+  },
+  exchangerate_obj         => {
+    type                   => 'one to one',
+    class                  => 'SL::DB::Exchangerate',
+    column_map             => { currency_id => 'currency_id', transdate => 'transdate' },
+  },
+);
+
+SL::DB::Helper::Attr::make(__PACKAGE__, daily_exchangerate => 'numeric');
+
+__PACKAGE__->meta->initialize;
+
+__PACKAGE__->attr_html('notes');
+__PACKAGE__->attr_sorted('items');
+
+__PACKAGE__->before_save('_before_save_set_record_number');
+__PACKAGE__->before_save('_before_save_remove_empty_custom_shipto');
+__PACKAGE__->before_save('_before_save_set_custom_shipto_module');
+__PACKAGE__->after_save('_after_save_link_records');
+
+# hooks
+
+sub _before_save_set_record_number {
+  my ($self) = @_;
+
+  $self->create_trans_number if !$self->record_number;
+
+  return 1;
+}
+
+sub _before_save_remove_empty_custom_shipto {
+  my ($self) = @_;
+
+  $self->custom_shipto(undef) if $self->custom_shipto && $self->custom_shipto->is_empty;
+
+  return 1;
+}
+
+sub _before_save_set_custom_shipto_module {
+  my ($self) = @_;
+
+  $self->custom_shipto->module('Reclamation') if $self->custom_shipto;
+
+  return 1;
+}
+
+sub _after_save_link_records {
+  my ($self) = @_;
+
+  my @allowed_record_sources = qw(SL::DB::Reclamation SL::DB::Order SL::DB::DeliveryOrder SL::DB::Invoice SL::DB::PurchaseInvoice);
+  my @allowed_item_sources = qw(SL::DB::ReclamationItem SL::DB::OrderItem SL::DB::DeliveryOrderItem SL::DB::InvoiceItem);
+
+  SL::DB::Helper::RecordLink::link_records(
+    $self,
+    \@allowed_record_sources,
+    \@allowed_item_sources,
+  );
+}
+
+# methods
+
+sub items { goto &reclamation_items; }
+sub add_items { goto &add_reclamation_items; }
+sub record_items { goto &reclamation_items; }
+
+sub type {
+  my $self = shift;
+  die "invalid type: " . $self->record_type if (!any { $self->record_type eq $_ } (
+      SALES_RECLAMATION_TYPE(),
+      PURCHASE_RECLAMATION_TYPE(),
+    ));
+  return $self->record_type;
+}
+
+sub is_type {
+  my ($self, $type) = @_;
+  return $self->type eq $type;
+}
+
+sub effective_tax_point {
+  my ($self) = @_;
+
+  return $self->tax_point || $self->reqdate || $self->transdate;
+}
+
+sub displayable_type {
+  my ($self) = @_;
+  return $self->type_data->text('type');
+}
+
+sub displayable_name {
+  join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number);
+};
+
+sub is_sales {
+  croak 'not an accessor' if @_ > 1;
+  $_[0]->type_data->properties('is_customer');
+}
+
+sub daily_exchangerate {
+  my ($self, $val) = @_;
+
+  return 1 if $self->currency_id == $::instance_conf->get_currency_id;
+
+  my $rate = (any { $self->is_type($_) } (SALES_RECLAMATION_TYPE()))    ? 'buy'
+           : (any { $self->is_type($_) } (PURCHASE_RECLAMATION_TYPE())) ? 'sell'
+           : undef;
+  return if !$rate;
+
+  if (defined $val) {
+    croak t8('exchange rate has to be positive') if $val <= 0;
+    if (!$self->exchangerate_obj) {
+      $self->exchangerate_obj(SL::DB::Exchangerate->new(
+        currency_id => $self->currency_id,
+        transdate   => $self->transdate,
+        $rate       => $val,
+      ));
+    } elsif (!defined $self->exchangerate_obj->$rate) {
+      $self->exchangerate_obj->$rate($val);
+    } else {
+      croak t8('exchange rate already exists, no update allowed');
+    }
+  }
+  return $self->exchangerate_obj->$rate if $self->exchangerate_obj;
+}
+
+sub taxes {
+  my ($self) = @_;
+  # add taxes to recalmation
+  my %pat = $self->calculate_prices_and_taxes();
+  my @taxes;
+  foreach my $tax_id (keys %{ $pat{taxes_by_tax_id} }) {
+    my $netamount = sum0 map { $pat{amounts}->{$_}->{amount} } grep { $pat{amounts}->{$_}->{tax_id} == $tax_id } keys %{ $pat{amounts} };
+    push(@taxes, { amount    => $pat{taxes_by_tax_id}->{$tax_id},
+                                netamount => $netamount,
+                                tax       => SL::DB::Tax->new(id => $tax_id)->load });
+  }
+  return \@taxes;
+}
+
+sub displayable_state {
+  my ($self) = @_;
+
+  return $self->closed ? $::locale->text('closed') : $::locale->text('open');
+}
+
+sub valid_reclamation_reasons {
+  my ($self) = @_;
+
+  my $valid_for_type = ($self->type =~ m{sales} ? 'valid_for_sales' : 'valid_for_purchase');
+  return SL::DB::Manager::ReclamationReason->get_all_sorted(
+      where => [  $valid_for_type => 1 ]);
+}
+
+sub convert_to_order {
+  my ($self, %params) = @_;
+
+  my $order;
+  $params{destination_type} = $self->is_sales ? SALES_ORDER_TYPE()
+                                              : PURCHASE_ORDER_TYPE();
+  if (!$self->db->with_transaction(sub {
+    require SL::DB::Order;
+    $order = SL::DB::Order->new_from($self, %params);
+    $order->save;
+
+    1;
+  })) {
+    return undef, $self->db->error->db_error->db_error;
+  }
+
+  return $order;
+}
+
+sub convert_to_delivery_order {
+  my ($self, %params) = @_;
+
+  my $delivery_order;
+  if (!$self->db->with_transaction(sub {
+    require SL::DB::DeliveryOrder;
+    $delivery_order = SL::DB::DeliveryOrder->new_from($self, %params);
+    $delivery_order->save;
+
+    $self->update_attributes(delivered => 1) unless $::instance_conf->get_shipped_qty_require_stock_out;
+    1;
+  })) {
+    return undef, $self->db->error->db_error->db_error;
+  }
+
+  return $delivery_order;
+}
+
+sub add_legacy_template_arrays {
+  my ($self, $print_form) = @_;
+
+  # for now using the keys that are used in the latex template: template/print/marei/sales_reclamation.tex
+  # (nested keys: part.partnumber, reason.description)
+  my @keys = qw( position part.partnumber description longdescription reqdate serialnumber projectnumber reason.description
+    reason_description_ext qty_as_number unit sellprice_as_number discount_as_number discount_as_percent linetotal );
+
+  my @tax_keys = qw( tax.taxdescription amount );
+
+  my %template_arrays;
+  map_keys_to_arrays($self->items_sorted, \@keys, \%template_arrays);
+  map_keys_to_arrays($self->taxes, \@tax_keys, \%template_arrays);
+
+  format_as_number([ qw(linetotal) ], \%template_arrays);
+  $print_form->{TEMPLATE_ARRAYS} = \%template_arrays;
+}
+
+#TODO(Werner): überprüfen ob alle Felder richtig gestetzt werden
+sub new_from {
+  my ($class, $source, %params) = @_;
+  my %allowed_sources = map { $_ => 1 } qw(
+    SL::DB::Reclamation
+    SL::DB::Order
+    SL::DB::DeliveryOrder
+    SL::DB::Invoice
+    SL::DB::PurchaseInvoice
+  );
+  unless( $allowed_sources{ref $source} ) {
+    croak("Unsupported source object type '" . ref($source) . "'");
+  }
+  croak("A destination type must be given as parameter") unless $params{destination_type};
+
+  my $destination_type  = delete $params{destination_type};
+
+  my @from_tos = (
+    #Reclamation
+    { from => SALES_RECLAMATION_TYPE(),       to => SALES_RECLAMATION_TYPE(),    abbr => 'srsr', },
+    { from => PURCHASE_RECLAMATION_TYPE(),    to => PURCHASE_RECLAMATION_TYPE(), abbr => 'prpr', },
+    { from => SALES_RECLAMATION_TYPE(),       to => PURCHASE_RECLAMATION_TYPE(), abbr => 'srpr', },
+    { from => PURCHASE_RECLAMATION_TYPE(),    to => SALES_RECLAMATION_TYPE(),    abbr => 'prsr', },
+    #Order
+    { from => SALES_ORDER_TYPE(),             to => SALES_RECLAMATION_TYPE(),    abbr => 'sosr', },
+    { from => PURCHASE_ORDER_TYPE(),          to => PURCHASE_RECLAMATION_TYPE(), abbr => 'popr', },
+    #Delivery Order
+    { from => SALES_DELIVERY_ORDER_TYPE(),    to => SALES_RECLAMATION_TYPE(),    abbr => 'sdsr', },
+    { from => PURCHASE_DELIVERY_ORDER_TYPE(), to => PURCHASE_RECLAMATION_TYPE(), abbr => 'pdpr', },
+    #Invoice
+    { from => 'invoice',                 to => SALES_RECLAMATION_TYPE(),    abbr => 'sisr', },
+    { from => 'purchase_invoice',        to => PURCHASE_RECLAMATION_TYPE(), abbr => 'pipr', },
+  );
+  my $from_to = (grep { $_->{from} eq $source->record_type && $_->{to} eq $destination_type} @from_tos)[0];
+  if (!$from_to) {
+    croak("Cannot convert from '" . $source->record_type . "' to '" . $destination_type . "'");
+  }
+
+  my $is_abbr_any = sub {
+    any { $from_to->{abbr} eq $_ } @_;
+  };
+
+  my %record_args = (
+    record_number => undef,
+    record_type   => $destination_type,
+    employee => SL::DB::Manager::Employee->current,
+    closed    => 0,
+    delivered => 0,
+    transdate => DateTime->today_local,
+  );
+  if ( $is_abbr_any->(qw(srsr prpr srpr prsr)) ) { #Reclamation
+    map { $record_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      amount
+      billing_address_id
+      contact_id
+      currency_id
+      customer_id
+      cv_record_number
+      delivery_term_id
+      department_id
+      exchangerate
+      globalproject_id
+      intnotes
+      language_id
+      netamount
+      notes
+      payment_id
+      reqdate
+      salesman_id
+      shippingpoint
+      shipvia
+      tax_point
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_id
+    ); # }}} for vim folds
+  } elsif ( $is_abbr_any->(qw(sosr popr)) ) { #Order
+    map { $record_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      amount
+      billing_address_id
+      currency_id
+      customer_id
+      delivery_term_id
+      department_id
+      exchangerate
+      globalproject_id
+      intnotes
+      language_id
+      netamount
+      notes
+      payment_id
+      salesman_id
+      shippingpoint
+      shipvia
+      tax_point
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_id
+    );
+    $record_args{contact_id} = $source->cp_id;
+    $record_args{cv_record_number} = $source->cusordnumber;
+    # }}} for vim folds
+  } elsif ( $is_abbr_any->(qw(sdsr pdpr)) ) { #DeliveryOrder
+    map { $record_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      billing_address_id
+      currency_id
+      customer_id
+      delivery_term_id
+      department_id
+      globalproject_id
+      intnotes
+      language_id
+      notes
+      payment_id
+      salesman_id
+      shippingpoint
+      shipvia
+      tax_point
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_id
+    );
+    $record_args{contact_id} = $source->cp_id;
+    $record_args{cv_record_number} = $source->cusordnumber;
+    # }}} for vim folds
+  } elsif ( $is_abbr_any->(qw(sisr)) ) { #Invoice(ar)
+    map { $record_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      amount
+      billing_address_id
+      currency_id
+      customer_id
+      delivery_term_id
+      department_id
+      globalproject_id
+      intnotes
+      language_id
+      netamount
+      notes
+      payment_id
+      salesman_id
+      shippingpoint
+      shipvia
+      tax_point
+      taxincluded
+      taxzone_id
+      transaction_description
+    );
+    $record_args{contact_id} = $source->cp_id;
+    $record_args{cv_record_number} = $source->cusordnumber;
+    # }}} for vim folds
+  } elsif ( $is_abbr_any->(qw(pipr)) ) { #Invoice(ap)
+    map { $record_args{$_} = $source->$_ } # {{{ for vim folds
+    qw(
+      amount
+      currency_id
+      delivery_term_id
+      department_id
+      globalproject_id
+      intnotes
+      language_id
+      netamount
+      notes
+      payment_id
+      shipvia
+      tax_point
+      taxincluded
+      taxzone_id
+      transaction_description
+      vendor_id
+    );
+    $record_args{contact_id} = $source->cp_id;
+    # }}} for vim folds
+  }
+
+  if ( ($from_to->{from} =~ m{sales}) && ($from_to->{to} =~ m{purchase}) ) {
+    $record_args{customer_id}      = undef;
+    $record_args{billing_address_id} = undef;
+    $record_args{salesman_id}      = undef;
+    $record_args{payment_id}       = undef;
+    $record_args{delivery_term_id} = undef;
+  }
+  if ( ($from_to->{from} =~ m{purchase}) && ($from_to->{to} =~ m{sales}) ) {
+    $record_args{vendor_id} = undef;
+    $record_args{salesman_id} = undef;
+    $record_args{payment_id} = undef;
+    $record_args{delivery_term_id} = undef;
+  }
+
+
+  if ($source->can('shipto_id')) {
+    # Custom shipto addresses (the ones specific to the sales/purchase record and
+    # not to the customer/vendor) are only linked from shipto → record.
+    # Meaning record.shipto_id will not be filled in that case.
+    if (!$source->shipto_id && $source->id) {
+      $record_args{custom_shipto} = $source->custom_shipto->clone($class) if $source->can('custom_shipto') && $source->custom_shipto;
+    } elsif ($source->shipto_id) {
+      $record_args{shipto_id} = $source->shipto_id;
+    }
+  }
+
+  my $reclamation = $class->new(%record_args);
+  $reclamation->assign_attributes(%{ $params{attributes} }) if $params{attributes};
+
+  unless ($params{no_linked_records}) {
+    $reclamation->{RECORD_TYPE_REF()} = ref($source);
+    $reclamation->{RECORD_ID()} = $source->id;
+  };
+
+  my $items = delete($params{items}) || $source->items;
+
+  my @items = map { SL::DB::ReclamationItem->new_from($_, $from_to->{to}, no_linked_records => $params{no_linked_records}); } @{ $items };
+
+  @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};
+  @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
+  @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
+
+  $reclamation->items(\@items);
+  return $reclamation;
+}
+
+sub customervendor {
+  my ($reclamation) = @_;
+  return $reclamation->is_sales ? $reclamation->customer : $reclamation->vendor;
+}
+
+sub date {
+  goto &transdate;
+}
+
+sub digest {
+  my ($self) = @_;
+
+  sprintf "%s %s %s (%s)",
+    $self->record_number,
+    $self->customervendor->name,
+    $self->amount_as_number,
+    $self->date->to_kivitendo;
+}
+
+sub type_data {
+  SL::DB::Helper::TypeDataProxy->new(ref $_[0], $_[0]->type);
+}
+
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::DB::Reclamation - reclamation Datenbank Objekt.
+
+=head1 FUNCTIONS
+
+=head2 C<type>
+
+Returns one of the following string types:
+
+=over 4
+
+=item sales_reclamation
+
+=item purchase_reclamation
+
+=item sales_quotation
+
+=item request_quotation
+
+=back
+
+=head2 C<is_type TYPE>
+
+Returns true if the reclamation is of the given type.
+
+=head2 C<daily_exchangerate $val>
+
+Gets or sets the exchangerate object's value. This is the value from the
+table C<exchangerate> depending on the reclamation's currency, the transdate and
+if it is a sales or purchase reclamation.
+
+The reclamation object (respectively the table C<oe>) has an own column
+C<exchangerate> which can be get or set with the accessor C<exchangerate>.
+
+The idea is to drop the legacy table C<exchangerate> in the future and to
+give all relevant tables it's own C<exchangerate> column.
+
+So, this method is here if you need to access the "legacy" exchangerate via
+an reclamation object.
+
+=over 4
+
+=item C<$val>
+
+(optional) If given, the exchangerate in the "legacy" table is set to this
+value, depending on currency, transdate and sales or purchase.
+
+=back
+
+=head2 C<convert_to_delivery_order %params>
+
+Creates a new delivery reclamation with C<$self> as the basis by calling
+L<SL::DB::DeliveryReclamation::new_from>. That delivery reclamation is saved, and
+C<$self> is linked to the new invoice via
+L<SL::DB::RecordLink>. C<$self>'s C<delivered> attribute is set to
+C<true>, and C<$self> is saved.
+
+The arguments in C<%params> are passed to
+L<SL::DB::DeliveryReclamation::new_from>.
+
+Returns C<undef> on failure. Otherwise the new delivery reclamation will be
+returned.
+
+=head2 C<convert_to_invoice %params>
+
+Creates a new invoice with C<$self> as the basis by calling
+L<SL::DB::Invoice::new_from>. That invoice is posted, and C<$self> is
+linked to the new invoice via L<SL::DB::RecordLink>. C<$self>'s
+C<closed> attribute is set to C<true>, and C<$self> is saved.
+
+The arguments in C<%params> are passed to L<SL::DB::Invoice::post>.
+
+Returns the new invoice instance on success and C<undef> on
+failure. The whole process is run inside a transaction. On failure
+nothing is created or changed in the database.
+
+At the moment only sales quotations and sales reclamations can be converted.
+
+=head2 C<add_legacy_template_arrays $print_form>
+
+For printing OpenDocument documents we need to extract loop variables (items and
+taxes) from the Rose DB object and add them to the form, in the format that the
+built-in template parser expects.
+
+<$print_form> Print form used in the controller.
+
+=head2 C<new_from $source, %params>
+
+Creates a new C<SL::DB::Reclamation> instance and copies as much
+information from C<$source> as possible. At the moment only records with the
+same destination type as the source type and sales reclamations from
+sales quotations and purchase reclamations from requests for quotations can be
+created.
+
+The C<transdate> field will be set to the current date.
+
+The conversion copies the reclamation items as well.
+
+Returns the new reclamation instance. The object returned is not
+saved.
+
+C<%params> can include the following options
+(C<destination_type> is mandatory):
+
+=over 4
+
+=item C<destination_type>
+
+(mandatory)
+The type of the newly created object. Can be C<sales_quotation>,
+C<sales_reclamation>, C<purchase_quotation> or C<purchase_reclamation> for now.
+
+=item C<items>
+
+An optional array reference of RDBO instances for the items to use. If
+missing then the method C<items_sorted> will be called on
+C<$source>. This option can be used to override the sorting, to
+exclude certain positions or to add additional ones.
+
+=item C<skip_items_negative_qty>
+
+If trueish then items with a negative quantity are skipped. Items with
+a quantity of 0 are not affected by this option.
+
+=item C<skip_items_zero_qty>
+
+If trueish then items with a quantity of 0 are skipped.
+
+=item C<item_filter>
+
+An optional code reference that is called for each item with the item
+as its sole parameter. Items for which the code reference returns a
+falsish value will be skipped.
+
+=item C<attributes>
+
+An optional hash reference. If it exists then it is passed to C<new>
+allowing the caller to set certain attributes for the new delivery
+reclamation.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Sven Schöling <s.schoeling@linet-services.de>
+
+=cut
diff --git a/SL/DB/Reclamation/TypeData.pm b/SL/DB/Reclamation/TypeData.pm
new file mode 100644
index 000000000..e9ccfb204
--- /dev/null
+++ b/SL/DB/Reclamation/TypeData.pm
@@ -0,0 +1,137 @@
+package SL::DB::Reclamation::TypeData;
+
+use strict;
+use Carp;
+use Exporter qw(import);
+use SL::Locale::String qw(t8);
+
+use constant {
+  SALES_RECLAMATION_TYPE    => 'sales_reclamation',
+  PURCHASE_RECLAMATION_TYPE => 'purchase_reclamation',
+};
+
+my @export_types = qw(SALES_RECLAMATION_TYPE PURCHASE_RECLAMATION_TYPE);
+my @export_subs = qw(valid_types validate_type is_valid_type get get3);
+
+our @EXPORT_OK = (@export_types, @export_subs);
+our %EXPORT_TAGS = (types => \@export_types, subs => \@export_subs);
+
+my %type_data = (
+  SALES_RECLAMATION_TYPE() => {
+    text => {
+      delete     => t8('The reclamation has been deleted'),
+      list       => t8("Sales Reclamations"),
+      add        => t8("Add Sales Reclamation"),
+      edit       => t8("Edit Sales Reclamation"),
+      type       => t8("Sales Reclamation"),
+    },
+    show_menu => {
+      save_and_sales_reclamation       => 0,
+      save_and_purchase_reclamation    => 1,
+      save_and_rma_delivery_order      => 1,
+      save_and_supplier_delivery_order => 0,
+      save_and_credit_note             => 1,
+      delete                           => sub { $::instance_conf->get_sales_reclamation_show_delete },
+    },
+    properties => {
+      customervendor => "customer",
+      is_customer    => 1,
+      nr_key         => "record_number",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_sale" => 1 ],
+    rights => {
+      edit => "sales_reclamation_edit",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+  PURCHASE_RECLAMATION_TYPE() => {
+    text => {
+      delete     => t8('The reclamation has been deleted'),
+      list       => t8("Purchase Reclamations"),
+      add        => t8("Add Purchase Reclamation"),
+      edit       => t8("Edit Purchase Reclamation"),
+      type       => t8("Purchase Reclamation"),
+    },
+    show_menu => {
+      save_and_sales_reclamation       => 1,
+      save_and_purchase_reclamation    => 0,
+      save_and_rma_delivery_order      => 0,
+      save_and_supplier_delivery_order => 1,
+      save_and_credit_note             => 0,
+      delete                           => sub { $::instance_conf->get_purchase_reclamation_show_delete },
+    },
+    properties => {
+      customervendor => "vendor",
+      is_customer    => 0,
+      nr_key         => "record_number",
+      worflow_needed => 0,
+    },
+    defaults => {
+      reqdate => sub { return; },
+    },
+    part_classification_query => [ "used_for_purchase" => 1 ],
+    rights => {
+      edit => "purchase_reclamation_edit",
+    },
+    features => {
+      price_tax   => 1,
+      stock       => 0,
+      subversions => 0,
+    },
+  },
+);
+
+my @valid_types = (
+  SALES_RECLAMATION_TYPE,
+  PURCHASE_RECLAMATION_TYPE,
+);
+
+my %valid_types = map { $_ => $_ } @valid_types;
+
+sub valid_types {
+  \@valid_types;
+}
+
+sub is_valid_type {
+  !!exists $type_data{$_[0]};
+}
+
+sub validate_type {
+  my ($type) = @_;
+
+  return $valid_types{$type} // croak "invalid type '$type'";
+}
+
+sub get {
+  my ($type, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}->{$key} // die "unknown property '$key'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+sub get3 {
+  my ($type, $topic, $key) = @_;
+
+  croak "invalid type '$type'" unless exists $type_data{$type};
+
+  my $ret = $type_data{$type}{$topic}{$key} // croak "unknown property '$key' in topic '$topic' for type '$type'";
+
+  ref $ret eq 'CODE'
+    ? $ret->()
+    : $ret;
+}
+
+1;
diff --git a/SL/DB/ReclamationItem.pm b/SL/DB/ReclamationItem.pm
new file mode 100644
index 000000000..af6a18167
--- /dev/null
+++ b/SL/DB/ReclamationItem.pm
@@ -0,0 +1,145 @@
+package SL::DB::ReclamationItem;
+
+use utf8;
+use strict;
+
+use List::MoreUtils qw(any);
+use Rose::DB::Object::Helpers qw(as_tree strip);
+
+use SL::DB::MetaSetup::ReclamationItem;
+use SL::DB::Manager::ReclamationItem;
+use SL::DB::Helper::ActsAsList;
+use SL::DB::Helper::LinkedRecords;
+use SL::DB::Helper::RecordItem;
+use SL::DB::Helper::RecordLink qw(RECORD_ITEM_ID RECORD_ITEM_TYPE_REF);
+use SL::DB::Helper::CustomVariables (
+  sub_module  => 'reclamation_items',
+  cvars_alias => 1,
+  overloads   => {
+    parts_id => {
+      class => 'SL::DB::Part',
+      module => 'IC',
+    }
+  },
+);
+
+__PACKAGE__->meta->initialize;
+
+__PACKAGE__->configure_acts_as_list(group_by => [qw(reclamation_id)]);
+
+sub is_linked_to_record {
+  my ($self) = @_;
+
+  if(scalar(@{$self->linked_records}) || $self->{RECORD_ITEM_TYPE_REF()}) {
+    return 1;
+  }
+
+  return 0;
+}
+
+#TODO(Werner): überprüfen ob alle Felder richtig gestetzt werden
+sub new_from {
+  my ($class, $source, $parent_type, %params) = @_;
+  unless (any {ref($source) eq $_}
+    qw(
+      SL::DB::ReclamationItem
+      SL::DB::OrderItem
+      SL::DB::DeliveryOrderItem
+      SL::DB::InvoiceItem
+    )
+  ) {
+    croak("Unsupported source object type '" . ref($source) . "'");
+  }
+  my @custom_variables = map { _clone_cvar_for_reclamation_item($_) } @{ $source->custom_variables };
+
+
+  my %item_args;
+  if (ref($source) eq 'SL::DB::ReclamationItem') {
+    map { $item_args{$_} = $source->$_ } qw(
+      active_discount_source active_price_source base_qty description discount
+      lastcost longdescription parts_id position price_factor price_factor_id
+      pricegroup_id project_id qty reason_description_ext reason_description_int
+      reason_id reqdate sellprice serialnumber
+      unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+  } elsif (ref($source) eq 'SL::DB::OrderItem') {
+    map { $item_args{$_} = $source->$_ } qw(
+      active_discount_source active_price_source base_qty description discount
+      lastcost longdescription parts_id position price_factor price_factor_id
+      pricegroup_id project_id qty reqdate sellprice serialnumber unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+  } elsif (ref($source) eq 'SL::DB::DeliveryOrderItem') {
+    map { $item_args{$_} = $source->$_ } qw(
+      active_discount_source active_price_source base_qty description discount
+      lastcost longdescription parts_id position price_factor price_factor_id
+      pricegroup_id project_id qty reqdate sellprice serialnumber unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+  } elsif (ref($source) eq 'SL::DB::InvoiceItem') {
+    map { $item_args{$_} = $source->$_ } qw(
+      active_discount_source active_price_source base_qty description discount
+      lastcost longdescription parts_id position price_factor price_factor_id
+      pricegroup_id project_id qty sellprice serialnumber unit
+    );
+    $item_args{custom_variables} = \@custom_variables;
+  }
+
+  my $item = $class->new(%item_args);
+
+  if ( $source->record->is_sales() && ($parent_type =~ m{purchase}) ) {
+    $item->sellprice($source->lastcost);
+    $item->discount(0);
+  }
+  if ( !$source->record->is_sales() && ($parent_type =~ m{sales}) ) {
+    $item->lastcost($source->sellprice);
+  }
+
+  $item->assign_attributes(%{ $params{attributes} }) if $params{attributes};
+
+  unless ($params{no_linked_records}) {
+    $item->{RECORD_ITEM_TYPE_REF()} = ref($source);
+    $item->{RECORD_ITEM_ID()} = $source->id;
+  }
+
+  return $item;
+}
+
+sub _clone_cvar_for_reclamation_item {
+  my ($cvar) = @_;
+
+  my $cloned = $_->clone_and_reset;
+  $cloned->sub_module('reclamation_items');
+
+  return $cloned;
+}
+
+sub customervendor {
+  my ($self) = @_;
+
+  return $self->reclamation->customervendor;
+}
+
+sub record { goto &reclamation }
+sub record_id { goto &reclamation_id }
+sub trans_id { goto &reclamation_id }
+sub date { goto &reqdate }
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SL::DB::ReclamationItems: Rose model for reclamationitems
+
+=head1 FUNCTIONS
+
+=head1 AUTHORS
+
+G. Richardson E<lt>grichardson@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/DB/ReclamationReason.pm b/SL/DB/ReclamationReason.pm
new file mode 100644
index 000000000..77f34adc0
--- /dev/null
+++ b/SL/DB/ReclamationReason.pm
@@ -0,0 +1,24 @@
+package SL::DB::ReclamationReason;
+
+use strict;
+
+use SL::DB::MetaSetup::ReclamationReason;
+use SL::DB::Manager::ReclamationReason;
+use SL::DB::Helper::ActsAsList
+
+__PACKAGE__->meta->initialize;
+
+sub validate {
+  my ($self) = @_;
+
+  my @errors;
+  if (!$self->name) {
+      push @errors, $::locale->text('The name is missing.');
+  }
+  if (!$self->description) {
+    push @errors, $::locale->text('The description is missing.');
+  }
+  return @errors;
+}
+
+1;
diff --git a/SL/DB/RecordTemplate.pm b/SL/DB/RecordTemplate.pm
index 1360c9576..c135bc308 100644
--- a/SL/DB/RecordTemplate.pm
+++ b/SL/DB/RecordTemplate.pm
@@ -19,6 +19,16 @@ __PACKAGE__->meta->add_relationship(
 __PACKAGE__->meta->initialize;
 
 sub items { goto &record_template_items; }
+sub record_type { goto &template_type; }
+
+sub date {
+  goto &mtime;
+}
+
+sub displayable_name {
+  my ($self) = @_;
+  return join ' ', $self->template_name_to_use, $self->mtime->to_kivitendo;
+}
 
 sub _replace_variables {
   my ($self, %params) = @_;
diff --git a/SL/DB/SepaExportItem.pm b/SL/DB/SepaExportItem.pm
index 0bcab3e3f..e8e1bba64 100644
--- a/SL/DB/SepaExportItem.pm
+++ b/SL/DB/SepaExportItem.pm
@@ -1,8 +1,6 @@
 package SL::DB::SepaExportItem;
 
 use strict;
-use SL::DB::SepaExport;
-
 use SL::DB::MetaSetup::SepaExportItem;
 
 __PACKAGE__->meta->initialize;
diff --git a/SL/DB/Shipto.pm b/SL/DB/Shipto.pm
index 6cfcba66f..0c7d4dfbd 100644
--- a/SL/DB/Shipto.pm
+++ b/SL/DB/Shipto.pm
@@ -50,7 +50,7 @@ sub is_empty {
   # todo: consider cvars
   my @fields_to_consider = grep { !m{^ (?: itime | mtime | shipto_id | trans_id | shiptocp_gender | module ) $}x } map {$_->name} $self->meta->columns;
 
-  return all { trim($self->$_) eq '' } @fields_to_consider;
+  return all { (trim($self->$_)||'') eq '' } @fields_to_consider;
 }
 
 sub detach {
@@ -65,6 +65,7 @@ sub clone {
   my $module = $type =~ m{::Order$}               ? 'OE'
              : $type =~ m{::DeliveryOrder$}       ? 'DO'
              : $type =~ m{::Invoice$}             ? 'AR'
+             : $type =~ m{::Reclamation$}         ? 'RC'
              : $type =~ m{::(?:Customer|Vendor)$} ? 'CT'
              :                                      croak "Unsupported target class '$type'";
 
diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index bcae3214d..18ad34af0 100644
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -29,7 +29,6 @@ sub validate {
 
   # not yet implemented checks
   if ($self->{connector} eq 'shopware6') {
-    push @errors, $::locale->text('Transaction Description is not yet implemented')  if $self->{transaction_description};
     push @errors, $::locale->text('Shipping cost article is not implemented')        if $self->{shipping_costs_parts_id};
     push @errors, $::locale->text('Fetch from last order number is not implemented') if $self->{last_order_number};
   } else {
diff --git a/SL/DB/ShopOrder.pm b/SL/DB/ShopOrder.pm
index 6a53387b5..a43156c1d 100644
--- a/SL/DB/ShopOrder.pm
+++ b/SL/DB/ShopOrder.pm
@@ -6,10 +6,8 @@ package SL::DB::ShopOrder;
 use strict;
 
 use SL::DBUtils;
-use SL::DB::Shop;
 use SL::DB::MetaSetup::ShopOrder;
 use SL::DB::Manager::ShopOrder;
-use SL::DB::PaymentTerm;
 use SL::DB::Helper::LinkedRecords;
 use SL::Locale::String qw(t8);
 use Carp;
@@ -30,13 +28,28 @@ sub convert_to_sales_order {
   my $customer  = delete $params{customer};
   my $employee  = delete $params{employee};
   my $transdate = delete $params{transdate} // DateTime->today_local;
+
   croak "param customer is missing" unless ref($customer) eq 'SL::DB::Customer';
   croak "param employee is missing" unless ref($employee) eq 'SL::DB::Employee';
 
+  # check if caller wants optional partial transfer and create partial soi array
+  my $partial_transfer;
+  my %pos_ids;
+  if ($params{pos_ids}) {
+    $partial_transfer = 1;
+    %pos_ids          =  %{ delete $params{pos_ids} };
+    # TODO check if pos_ids is a valid hash
+  }
+  my @soi = $partial_transfer
+          ? grep { $pos_ids{$_->id} } @{ $self->shop_order_items }
+          : @{ $self->shop_order_items };
+
   require SL::DB::Order;
+  use SL::DB::Order::TypeData qw(:types);
   require SL::DB::OrderItem;
   require SL::DB::Part;
   require SL::DB::Shipto;
+  require SL::DB::Shop;
   my @error_report;
 
   my @items = map{
@@ -55,10 +68,10 @@ sub convert_to_sales_order {
         unit                => $part->unit,
         position            => $_->position,
         active_price_source => $_->active_price_source,
+        discount            => $_->discount,
       );
     }
-  }@{ $self->shop_order_items };
-
+  } @soi;
   if(!scalar(@error_report)){
 
     my $shipto_id;
@@ -102,6 +115,7 @@ sub convert_to_sales_order {
       currency_id             => $customer->currency_id,
       transaction_description => $shop->transaction_description,
       transdate               => $transdate,
+      record_type             => SALES_ORDER_TYPE(),
     );
      return $order;
    }else{
@@ -239,7 +253,9 @@ sub get_customer{
                                                     obsolete => 'F',
                                                   );
   }
-  $customer->update_attributes(invoice_mail => $self->billing_email) if $customer->invoice_mail ne $self->billing_email;
+  if( ref $customer eq 'SL::DB::Customer') {
+    $customer->update_attributes(invoice_mail => $self->billing_email) if $customer->invoice_mail ne $self->billing_email;
+  }
 
   return $customer;
 }
diff --git a/SL/DB/Unit.pm b/SL/DB/Unit.pm
index 508aa7477..2c58ec66d 100644
--- a/SL/DB/Unit.pm
+++ b/SL/DB/Unit.pm
@@ -1,7 +1,7 @@
 package SL::DB::Unit;
 
 use List::MoreUtils qw(any);
-
+use List::Util qw(first);
 
 use strict;
 
@@ -15,6 +15,11 @@ __PACKAGE__->meta->add_relationships(
     class        => 'SL::DB::Unit',
     column_map   => { base_unit => 'name' },
   },
+  translations => {
+    type         => 'one to many',
+    class        => 'SL::DB::UnitsLanguage',
+    column_map   => { name => 'unit' },
+  },
 );
 
 __PACKAGE__->meta->initialize;
@@ -66,4 +71,23 @@ sub is_time_based {
   return any { $_->id == $self->id } @{ SL::DB::Manager::Unit->time_based_units };
 }
 
+sub get_translation_obj {
+  my ($self, $language) = @_;
+
+  my $language_id = (ref($language) eq 'SL::DB::Language' ? $language->id : $language) || undef;
+
+  return first { $_->language_id => $language_id } @{ $self->translations || [] };
+}
+
+sub get_translation {
+  my ($self, $language, $qty) = @_;
+
+  my $translation     = $self->name; # fallback, if no translation found
+  my $translation_obj = $self->get_translation_obj(language => $language);
+  if ($translation_obj) {
+    $translation = (($qty // 0) > 1 || ($qty // 0) == 0) ? $translation_obj->localized_plural : $translation_obj->localized;
+  }
+  return $translation;
+}
+
 1;
diff --git a/SL/DB/VC.pm b/SL/DB/VC.pm
index 3cc7490d9..66eb0add6 100644
--- a/SL/DB/VC.pm
+++ b/SL/DB/VC.pm
@@ -32,7 +32,7 @@ SQL
          AND e.transdate = o.transdate)
     FROM oe o
     WHERE (o.${type}_id = ?)
-      AND NOT COALESCE(o.quotation, FALSE)
+      AND ((o.record_type = 'sales_order') OR (o.record_type = 'purchase_order'))
       AND NOT COALESCE(o.closed,    FALSE)
 SQL
 
diff --git a/SL/DB/ValidityToken.pm b/SL/DB/ValidityToken.pm
new file mode 100644
index 000000000..747b11471
--- /dev/null
+++ b/SL/DB/ValidityToken.pm
@@ -0,0 +1,46 @@
+package SL::DB::ValidityToken;
+
+use strict;
+
+use Carp;
+use Digest::SHA qw(sha256_hex);
+use Time::HiRes qw(gettimeofday);
+
+use SL::DB::MetaSetup::ValidityToken;
+use SL::DB::Manager::ValidityToken;
+
+__PACKAGE__->meta->initialize;
+
+use constant SCOPE_SALES_INVOICE_POST    => 'SalesInvoice::Post';
+use constant SCOPE_PURCHASE_INVOICE_POST => 'PurchaseInvoice::Post';
+use constant SCOPE_DELIVERY_ORDER_SAVE   => 'DeliveryOrder::Save';
+use constant SCOPE_ORDER_SAVE            => 'Order::Save';
+use constant SCOPE_RECLAMATION_SAVE      => 'Reclamation::Save';
+use constant SCOPE_GL_TRANSACTION_POST   => 'GLTransaction::Post';
+
+sub create {
+  my ($class, %params) = @_;
+
+  croak "missing required parameter 'scope'" if !$params{scope};
+
+  my $token_obj = $class->new(
+    scope       => $params{scope},
+    valid_until => $params{valid_until} // DateTime->now_local->add(hours => 24),
+  );
+
+  while (1) {
+    my $token_value = join('-', gettimeofday(), $$, int(rand(1 << 63)));
+
+    $token_obj->token(sha256_hex($token_value));
+
+    last if eval {
+      $token_obj->save;
+      1;
+    };
+  }
+
+  return $token_obj;
+}
+
+
+1;
diff --git a/SL/DB/Warehouse.pm b/SL/DB/Warehouse.pm
index 8345709da..ac4f314ad 100644
--- a/SL/DB/Warehouse.pm
+++ b/SL/DB/Warehouse.pm
@@ -2,6 +2,8 @@ package SL::DB::Warehouse;
 
 use strict;
 
+use Sort::Naturally;
+
 use SL::DB::MetaSetup::Warehouse;
 use SL::DB::Manager::Warehouse;
 use SL::DB::Helper::ActsAsList;
@@ -19,6 +21,9 @@ __PACKAGE__->meta->initialize;
 sub bins_sorted {
   return [ sort { $a->id <=> $b->id } @{ shift()->bins || [] } ];
 }
+sub bins_sorted_naturally {
+  return [ sort { ncmp ($a->description,  $b->description) } @{ shift()->bins || [] } ];
+}
 
 sub first_bin {
   return shift()->bins_sorted->[0];
diff --git a/SL/DN.pm b/SL/DN.pm
index 76ee1b834..054370d92 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -78,9 +78,11 @@ sub get_config {
   }
 
   $query =
-    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar, dunning_creator
+    qq|SELECT dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar, dunning_creator,
+              dunning_original_invoice_creation_mode
        FROM defaults|;
-  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}, $form->{dunning_creator})
+  ($form->{AR_amount_fee}, $form->{AR_amount_interest}, $form->{AR}, $form->{dunning_creator},
+   $form->{dunning_original_invoice_creation_mode})
     = selectrow_query($form, $dbh, $query);
 
   $main::lxdebug->leave_sub();
@@ -147,9 +149,9 @@ sub _save_config {
   }
 
   $query  = qq|UPDATE defaults SET dunning_ar_amount_fee = ?, dunning_ar_amount_interest = ?, dunning_ar = ?,
-               dunning_creator = ?|;
+               dunning_creator = ?, dunning_original_invoice_creation_mode = ?|;
   @values = (conv_i($form->{AR_amount_fee}), conv_i($form->{AR_amount_interest}), conv_i($form->{AR}),
-             $form->{dunning_creator});
+             $form->{dunning_creator}, $form->{dunning_original_invoice_creation_mode});
   do_query($form, $dbh, $query, @values);
 
   return 1;
@@ -333,14 +335,14 @@ sub save_dunning {
 
   # Save PDFs in filemanagement and webdav after transation succeeded,
   # because otherwise files in the storage may exists if the transaction
-  # failed. Ignore all errros.
-  # Todo: Maybe catch errros and display them as warnings or non fatal errors in the status.
+  # failed. Ignore all errors.
+  # Todo: Maybe catch errors and display them as warnings or non fatal errors in the status.
   if (!$error && $form->{DUNNING_PDFS_STORAGE} && scalar @{ $form->{DUNNING_PDFS_STORAGE} }) {
     _store_pdf_to_webdav_and_filemanagement($_->{dunning_id}, $_->{path}, $_->{name}) for @{ $form->{DUNNING_PDFS_STORAGE} };
   }
 
-  $error       = 'unknown errror' if !$error && !$rc;
-  $rc->{error} = $error           if $error;
+  $error       = 'unknown error' if !$error && !$rc;
+  $rc->{error} = $error          if $error;
 
   $::lxdebug->leave_sub;
 
@@ -431,7 +433,7 @@ sub _save_dunning {
   $form->{DUNNING_PDFS_EMAIL} = [];
 
   $form->{dunning_id} = $dunning_id;
-
+  $form->{media} = 'email' if $send_email;
   $self->create_invoice_for_fees($myconfig, $form, $dbh, $dunning_id);
 
   $self->print_invoice_for_fees($myconfig, $form, $dunning_id, $dbh);
@@ -456,12 +458,15 @@ sub send_email {
   my $query =
     qq|SELECT
          dcfg.email_body,     dcfg.email_subject, dcfg.email_attachment,
-         COALESCE (NULLIF(c.invoice_mail, ''), c.email) AS recipient, c.name,
+         COALESCE (NULLIF(aba.dunning_mail, ''), NULLIF(aba.email,''),
+                   NULLIF(c.dunning_mail, ''),
+                   NULLIF(c.invoice_mail, ''), c.email) AS recipient, c.name,
          (SELECT login from employee where id = ar.employee_id) as invoice_employee_login
        FROM dunning d
        LEFT JOIN dunning_config dcfg ON (d.dunning_config_id = dcfg.id)
        LEFT JOIN ar                  ON (d.trans_id          = ar.id)
        LEFT JOIN customer c          ON (ar.customer_id      = c.id)
+       LEFT JOIN additional_billing_addresses aba ON (aba.id = ar.billing_address_id)
        WHERE (d.dunning_id = ?)
        LIMIT 1|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
@@ -514,7 +519,8 @@ sub send_email {
   $mail->{record_id}   = \@ids;
   $mail->{record_type} = 'dunning';
 
-  $mail->send();
+  my $error = $mail->send();
+  die "Mailer error during 'send': $error\n" if $error;
 
   $main::lxdebug->leave_sub();
 }
@@ -617,6 +623,16 @@ sub get_invoices {
     push(@values, $form->{department_id});
   }
 
+  if ($form->{payment_id}) {
+    $where .= " AND a.payment_id = ?";
+    push(@values, $form->{payment_id});
+  }
+
+  if ($form->{invoice}) {
+    $where .= " AND a.invoice = ?";
+    push(@values, $form->{invoice});
+  }
+
   my %columns = (
     "ordnumber" => "a.ordnumber",
     "invnumber" => "a.invnumber",
@@ -659,7 +675,9 @@ sub get_invoices {
          a.direct_debit,
          pt.description as payment_term,
          dep.description as departmentname,
-         ct.invoice_mail AS cv_email,
+         COALESCE (NULLIF(aba.dunning_mail, ''), NULLIF(aba.email,''),
+                   NULLIF(ct.dunning_mail, ''),
+                   NULLIF(ct.invoice_mail, ''), ct.email) AS recipient,
          cfg.dunning_description, cfg.dunning_level,
 
          d.transdate AS dunning_date, d.duedate AS dunning_duedate,
@@ -676,6 +694,7 @@ sub get_invoices {
        FROM ar a
 
        LEFT JOIN customer ct ON (a.customer_id = ct.id)
+       LEFT JOIN additional_billing_addresses aba ON (aba.id = a.billing_address_id)
        LEFT JOIN department dep ON (a.department_id = dep.id)
        LEFT JOIN payment_terms pt ON (a.payment_id = pt.id)
        LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id)
@@ -702,10 +721,11 @@ sub get_invoices {
        ))
         $paid
         AND (a.duedate < current_date)
+        AND ct.dunning_lock = false
 
        $where
 
-       ORDER BY a.id, transdate, duedate, name|;
+       ORDER BY ct.name, a.id, transdate, duedate |;
   my $sth = prepare_execute_query($form, $dbh, $query, $id_for_max_dunning_level, @values);
 
   $form->{DUNNINGS} = [];
@@ -1204,6 +1224,59 @@ sub print_original_invoice {
 
   die "Invalid invoice object" unless ref($invoice) eq 'SL::DB::Invoice';
 
+  my $filestore_enabled = SL::DB::Default->get->webdav
+                       || SL::DB::Default->get->doc_storage;
+  if ($::instance_conf->get_dunning_original_invoice_creation_mode eq 'use_last_created_or_create_new'
+      && $filestore_enabled) {
+    my ($file_name, $file_path);
+    # search file in files and webdav
+    if (SL::DB::Default->get->doc_storage) {
+      my $file_entry = SL::DB::Manager::File->get_first(
+        query => [
+          object_type => $invoice->type,
+          object_id   => $invoice->id,
+        ],
+      );
+      if ($file_entry) {
+        my $file = SL::File::Object->new(
+          db_file => $file_entry,
+          id => $file_entry->id,
+          loaded => 1,
+        );
+        $file_name = $file->file_name();
+        $file_path = $file->get_file();
+      }
+    } elsif (SL::DB::Default->get->webdav) {
+      my $webdav = SL::Webdav->new(
+        type   => $invoice->type,
+        number => $invoice->record_number,
+      );
+      my @latest_object = $webdav->get_all_latest();
+      if (scalar @latest_object) {
+        $file_name = $latest_object[0]->basename . "." . $latest_object[0]->extension;
+        $file_path = $latest_object[0]->full_filedescriptor();
+      }
+    } # end file search
+
+    my $attachment_filename    = $form->get_formname_translation('invoice') . "_" . $invoice->invnumber . ".pdf";
+    if ($file_name ne '' and $file_path ne '') {
+      my $spool = $::lx_office_conf{paths}->{spool};
+      my $spool_path = File::Spec->catfile($spool, $file_name);
+
+      copy($file_path, $spool_path) or die "The copy operation failed: $!";
+
+      push @{ $form->{DUNNING_PDFS} }        , $file_name;
+      push @{ $form->{DUNNING_PDFS_EMAIL} }  , {
+        'path'       => $file_path,
+        'name'       => $file_name, };
+      push @{ $form->{DUNNING_PDFS_STORAGE} }, {
+        'dunning_id' => $dunning_id,
+        'path'       => $file_path,
+        'name'       => $file_name };
+      return;
+    }
+  }
+
   my $print_form          = Form->new('');
   $print_form->{type}     = 'invoice';
   $print_form->{formname} = 'invoice',
diff --git a/SL/DO.pm b/SL/DO.pm
index ebc605159..500d1efb1 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -44,6 +44,7 @@ use SL::CVar;
 use SL::DB::DeliveryOrder;
 use SL::DB::DeliveryOrder::TypeData qw(:types is_valid_type);
 use SL::DB::Status;
+use SL::DB::ValidityToken;
 use SL::DBUtils;
 use SL::Helper::ShippedQty;
 use SL::HTML::Restrict;
@@ -67,20 +68,23 @@ sub transactions {
   # connect to database
   my $dbh = $form->get_standard_dbh($myconfig);
 
-  my (@where, @values, $where);
+  my (@where, @values);
 
   my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
 
+  $form->{l_order_confirmation_number} = 'Y' if $form->{order_confirmation_number};
+
   my $query =
     qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.cusordnumber,
          dord.transdate, dord.reqdate,
+         dord.vendor_confirmation_number,
          ct.${vc}number, ct.name, ct.business_id,
          dord.${vc}_id, dord.globalproject_id,
          dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
          dord.transaction_description, dord.itime::DATE AS insertdate,
          pr.projectnumber AS globalprojectnumber,
          dep.description AS department,
-         dord.order_type,
+         dord.record_type,
          e.name AS employee,
          sm.name AS salesman
        FROM delivery_orders dord
@@ -93,7 +97,7 @@ sub transactions {
 |;
 
   if ($form->{type} && is_valid_type($form->{type})) {
-    push @where, 'dord.order_type = ?';
+    push @where, 'dord.record_type = ?';
     push @values, $form->{type};
   }
 
@@ -140,12 +144,25 @@ sub transactions {
     push @values, $::myconfig{login};
   }
 
-  foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
+  foreach my $item (qw(donumber ordnumber cusordnumber transaction_description vendor_confirmation_number)) {
     next unless ($form->{$item});
     push @where,  qq|dord.$item ILIKE ?|;
     push @values, like($form->{$item});
   }
 
+  if ($form->{order_confirmation_number}) {
+    push @where, qq|(EXISTS (SELECT id FROM oe
+                             WHERE ordnumber ILIKE ?
+                               AND record_type = 'purchase_order_confirmation'
+                               AND id IN
+                               (SELECT from_id FROM record_links
+                                WHERE to_id = dord.id
+                                  AND to_table = 'delivery_orders'
+                                  AND from_table = 'oe')
+                    ))|;
+    push @values, like($form->{order_confirmation_number});
+  }
+
   if (($form->{open} || $form->{closed}) &&
       ($form->{open} ne $form->{closed})) {
     push @where, ($form->{open} ? "NOT " : "") . "COALESCE(dord.closed, FALSE)";
@@ -191,6 +208,36 @@ sub transactions {
     push @values, conv_date($form->{insertdateto});
   }
 
+  $form->{fulltext} = trim($form->{fulltext});
+  if ($form->{fulltext}) {
+    my @fulltext_fields = qw(dord.notes
+                             dord.intnotes
+                             dord.shippingpoint
+                             dord.shipvia
+                             dord.transaction_description
+                             dord.donumber
+                             dord.ordnumber
+                             dord.cusordnumber
+                             dord.oreqnumber
+                             dord.vendor_confirmation_number
+                             oe.ordnumber
+                            );
+    my $tmp_where = '';
+    $tmp_where .= join ' OR ', map {"$_ ILIKE ?"} @fulltext_fields;
+    push(@values, like($form->{fulltext})) for 1 .. (scalar @fulltext_fields);
+
+    $tmp_where .= <<SQL;
+      OR EXISTS (
+        SELECT files.id FROM files LEFT JOIN file_full_texts ON (file_full_texts.file_id = files.id)
+          WHERE files.object_id = dord.id AND files.object_type = ?
+            AND file_full_texts.full_text ILIKE ?)
+SQL
+    push(@values, $form->{type});
+    push(@values, like($form->{fulltext}));
+    push @where, $tmp_where;
+
+  }
+
   if ($form->{parts_partnumber}) {
     push @where, <<SQL;
       EXISTS (
@@ -218,6 +265,27 @@ SQL
     push @values, like($form->{parts_description});
   }
 
+  if ($form->{chargenumber}) {
+    push @where, <<SQL;
+      EXISTS (
+        SELECT delivery_order_items_stock.id
+        FROM delivery_order_items_stock
+        LEFT JOIN delivery_order_items ON (delivery_order_items.id = delivery_order_items_stock.delivery_order_item_id)
+        WHERE delivery_order_items.delivery_order_id = dord.id
+          AND delivery_order_items_stock.chargenumber ILIKE ?
+        LIMIT 1
+      )
+SQL
+    push @values, like($form->{chargenumber});
+  }
+
+  if ($form->{ids}) {
+    unshift @{$form->{ids}}, 0; # no error and no results if no ids are given
+    my $placeholders = join(', ', ('?') x scalar(@{$form->{ids}}));
+    push @where, "dord.id IN ($placeholders)";
+    push @values, @{$form->{ids}};
+  }
+
   if ($form->{all}) {
     my @tokens = parse_line('\s+', 0, $form->{all});
     # ordnumber quonumber customer.name vendor.name transaction_description
@@ -246,6 +314,7 @@ SQL
     "transaction_description" => "dord.transaction_description",
     "department"              => "lower(dep.description)",
     "insertdate"              => "dord.itime",
+    "vendor_confirmation_number" => "dord.vendor_confirmation_number",
   );
 
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
@@ -258,23 +327,63 @@ SQL
 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 
+  my $record_type = $vc eq 'customer' ? 'sales_order' : 'purchase_order';
   if (scalar @{ $form->{DO} }) {
     $query =
       qq|SELECT id
          FROM oe
-         WHERE NOT COALESCE(quotation, FALSE)
-           AND (ordnumber = ?)
-           AND (COALESCE(${vc}_id, 0) != 0)|;
+         WHERE (record_type = '$record_type'
+           AND ordnumber = ?)|;
 
     my $sth = prepare_query($form, $dbh, $query);
 
+
+    my ($items_query, $items_sth);
+    if ($form->{l_items}) {
+      $items_query =
+        qq|SELECT id
+          FROM delivery_order_items
+          WHERE delivery_order_id = ?
+          ORDER BY position|;
+
+      $items_sth = prepare_query($form, $dbh, $items_query);
+    }
+
+    my ($order_confirmation_query, $order_confirmation_sth);
+    if ($form->{l_order_confirmation_number}) {
+      $order_confirmation_query =
+        qq|SELECT id, ordnumber FROM oe
+           WHERE id IN
+               (SELECT from_id FROM record_links
+                WHERE from_table = 'oe'
+                  AND to_table = 'delivery_orders'
+                  AND to_id = ?)
+             AND record_type = 'purchase_order_confirmation' ORDER BY ordnumber|;
+
+      $order_confirmation_sth = prepare_query($form, $dbh, $order_confirmation_query);
+    }
+
     foreach my $dord (@{ $form->{DO} }) {
+      if ($form->{l_items}) {
+        do_statement($form, $items_sth, $items_query, $dord->{id});
+        $dord->{item_ids} = $dbh->selectcol_arrayref($items_sth);
+        $dord->{item_ids} = undef if !@{$dord->{item_ids}};
+      }
+
+      if ($form->{l_order_confirmation_number}) {
+        do_statement($form, $order_confirmation_sth, $order_confirmation_query, $dord->{id});
+        my @r = @{$order_confirmation_sth->fetchall_arrayref()};
+        push @{$dord->{order_confirmation_numbers}}, { id => $_->[0], number => $_->[1] } for @r;
+      }
+
       next unless ($dord->{ordnumber});
       do_statement($form, $sth, $query, $dord->{ordnumber});
       ($dord->{oe_id}) = $sth->fetchrow_array();
     }
 
     $sth->finish();
+    $items_sth->finish()              if $form->{l_items};
+    $order_confirmation_sth->finish() if $form->{l_order_confirmation_number};
   }
 
   $main::lxdebug->leave_sub();
@@ -298,6 +407,16 @@ sub _save {
   my $myconfig = \%main::myconfig;
   my $form     = $main::form;
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my $dbh = SL::DB->client->dbh;
   my $restricter = SL::HTML::Restrict->create;
 
@@ -334,7 +453,7 @@ sub _save {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
-    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, order_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
+    $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, record_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|;
     do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}), $form->{taxzone_id}, SALES_DELIVERY_ORDER_TYPE);
   }
 
@@ -430,7 +549,7 @@ SQL
                $form->{"qty_$i"}, $baseqty,
                $form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
                $form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}),
-               $form->{"serialnumber_$i"},
+               trim($form->{"serialnumber_$i"}),
                $form->{"lastcost_$i"},
                conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
                conv_i($form->{"marge_price_factor_$i"}),
@@ -521,7 +640,7 @@ SQL
          shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?,
          delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, billing_address_id = ?,
          globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?,
-         order_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
+         record_type = ?, taxzone_id = ?, taxincluded = ?, payment_id = ?, currency_id = (SELECT id FROM currencies WHERE name = ?),
          delivery_term_id = ?
        WHERE id = ?|;
 
@@ -574,6 +693,9 @@ SQL
 
   Common::webdav_folder($form);
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   $main::lxdebug->leave_sub();
 
   return 1;
@@ -852,8 +974,10 @@ sub retrieve {
                                            trans_id   => $doi->{delivery_order_items_id},
                                           );
     map { $doi->{"ic_cvar_$_->{name}"} = $_->{value} } @{ $cvars };
-  }
 
+    my $makemodel = SL::DB::Manager::MakeModel->find_by(parts_id => $doi->{id}, make =>$form->{vendor_id});
+    $doi->{vendor_partnumber} = $makemodel->model if $makemodel;
+  }
   if ($mode eq 'single') {
     my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in';
 
@@ -945,7 +1069,7 @@ sub order_details {
                            (SELECT description FROM warehouse WHERE id = ?) AS warehouse|;
   my $h_bin_wh = prepare_query($form, $dbh, $q_bin_wh);
 
-  my $in_out   = $form->{type} =~ /^sales/ ? 'out' : 'in';
+  my $in_out   = $form->{type} =~ /^sales|^supplier/ ? 'out' : 'in';
 
   my $num_si   = 0;
 
diff --git a/SL/DefaultManager/Swiss.pm b/SL/DefaultManager/Swiss.pm
index f5f553edb..982216422 100644
--- a/SL/DefaultManager/Swiss.pm
+++ b/SL/DefaultManager/Swiss.pm
@@ -4,7 +4,7 @@ use strict;
 use parent qw(Rose::Object);
 
 # client defaults
-sub chart_of_accounts       { 'Switzerland-deutsch-MWST-2014' }
+sub chart_of_accounts       { 'Switzerland-deutsch-MWST-2024' }
 sub accounting_method       { 'accrual' }
 sub inventory_system        { 'periodic' }
 sub profit_determination    { 'balance' }
diff --git a/SL/Dev/Part.pm b/SL/Dev/Part.pm
index 967a1f75b..14fc088cc 100644
--- a/SL/Dev/Part.pm
+++ b/SL/Dev/Part.pm
@@ -141,8 +141,7 @@ SL::Dev::Part - create part objects for testing, with minimal defaults
   # see individual functions for special parameters
   my $part     = new_part(
     partnumber   => 'Test 001',
-    warehouse_id => $bin->warehouse->id,
-    bin_id       => $bin->id,
+    rop          => 20,
   );
 
 =head1 FUNCTIONS
diff --git a/SL/Dev/Payment.pm b/SL/Dev/Payment.pm
index a093ed444..b67f8737d 100644
--- a/SL/Dev/Payment.pm
+++ b/SL/Dev/Payment.pm
@@ -70,7 +70,9 @@ sub create_bank_transaction {
  my $record = delete $params{record};
  die "bank_transactions can only be created for invoices" unless ref($record) eq 'SL::DB::Invoice' or ref($record) eq 'SL::DB::PurchaseInvoice';
 
- my $multiplier = $record->is_sales ? 1 : -1;
+ my $multiplier = $record->invoice_type =~ m/^purchase_invoice$|^ap_transaction$|^credit_note$/   ? -1
+                : $record->invoice_type =~ m/invoice|ar_transaction|^purchase_credit_note$/       ?  1
+                : die "invalid state";
  my $amount = (delete $params{amount} || $record->amount) * $multiplier;
 
  my $bank_chart;
diff --git a/SL/Dev/Record.pm b/SL/Dev/Record.pm
index 73f06d0f5..5dbea2211 100644
--- a/SL/Dev/Record.pm
+++ b/SL/Dev/Record.pm
@@ -2,16 +2,28 @@ package SL::Dev::Record;
 
 use strict;
 use base qw(Exporter);
-our @EXPORT_OK = qw(create_invoice_item
-                    create_sales_invoice
-                    create_credit_note
+our @EXPORT_OK = qw(
+                    create_project
+                    create_department
+
                     create_order_item
-                    create_sales_order
-                    create_purchase_order
                     create_delivery_order_item
+                    create_invoice_item
+                    create_reclamation_item
+
+                    create_sales_quotation
+                    create_sales_order
                     create_sales_delivery_order
+                    create_sales_invoice
+                    create_credit_note
+                    create_sales_reclamation
+
+                    create_purchase_quotation
+                    create_purchase_order
                     create_purchase_delivery_order
-                    create_project create_department
+                    create_minimal_purchase_invoice
+                    create_purchase_reclamation
+
                     create_ap_transaction
                     create_ar_transaction
                     create_gl_transaction
@@ -20,7 +32,12 @@ our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
 use SL::DB::Invoice;
 use SL::DB::InvoiceItem;
+use SL::DB::Order;
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::DeliveryOrder;
 use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Reclamation;
+use SL::DB::Reclamation::TypeData qw(:types);
 use SL::DB::Employee;
 use SL::Dev::Part qw(new_part);
 use SL::Dev::CustomerVendor qw(new_vendor new_customer);
@@ -33,12 +50,19 @@ use List::Util qw(sum);
 use Data::Dumper;
 use SL::Locale::String qw(t8);
 use SL::DATEV;
+use SL::Model::Record;
 
 my %record_type_to_item_type = ( sales_invoice        => 'SL::DB::InvoiceItem',
+                                 purchase_invoice     => 'SL::DB::InvoiceItem',
                                  credit_note          => 'SL::DB::InvoiceItem',
                                  sales_order          => 'SL::DB::OrderItem',
+                                 sales_quotation      => 'SL::DB::OrderItem',
+                                 request_quotation    => 'SL::DB::OrderItem',
                                  purchase_order       => 'SL::DB::OrderItem',
                                  sales_delivery_order => 'SL::DB::DeliveryOrderItem',
+                                 purchase_delivery_order => 'SL::DB::DeliveryOrderItem',
+                                 sales_reclamation    => 'SL::DB::ReclamationItem',
+                                 purchase_reclamation => 'SL::DB::ReclamationItem',
                                );
 
 sub create_sales_invoice {
@@ -72,6 +96,39 @@ sub create_sales_invoice {
   return $invoice;
 }
 
+sub create_minimal_purchase_invoice {
+  my (%params) = @_;
+
+  my $record_type = 'purchase_invoice';
+  my $invoiceitems = delete $params{invoiceitems} // _create_two_items($record_type);
+  _check_items($invoiceitems, $record_type);
+
+  my $vendor = delete $params{vendor} // new_vendor(name => 'Testvendor')->save;
+  die "illegal vendor" unless defined $vendor && ref($vendor) eq 'SL::DB::Vendor';
+
+  my $invoice = SL::DB::PurchaseInvoice->new(
+    invoice      => 1,
+    type         => 'purchase_invoice',
+    vendor       => $vendor->id,
+    taxzone_id   => $vendor->taxzone->id,
+    invnumber    => delete $params{invnumber}   // undef,
+    currency_id  => $params{currency_id} // $::instance_conf->get_currency_id,
+    taxincluded  => $params{taxincluded} // 0,
+    employee_id  => $params{employee_id} // SL::DB::Manager::Employee->current->id,
+    transdate    => $params{transdate}   // DateTime->today_local->to_kivitendo,
+    payment_id   => $params{payment_id}  // undef,
+    gldate       => DateTime->today,
+    invoiceitems => $invoiceitems,
+  );
+  $invoice->assign_attributes(%params) if %params;
+
+  # TODO: PTC can't deal with purchase invoices, so for now just save via Rose,
+  # no amount/tax/acc_trans calculations.
+
+  $invoice->save;
+  return $invoice;
+}
+
 sub create_credit_note {
   my (%params) = @_;
 
@@ -117,7 +174,7 @@ sub create_sales_delivery_order {
   die "illegal customer" unless ref($customer) eq 'SL::DB::Customer';
 
   my $delivery_order = SL::DB::DeliveryOrder->new(
-    order_type   => SALES_DELIVERY_ORDER_TYPE,
+    record_type  => SALES_DELIVERY_ORDER_TYPE,
     'closed'     => undef,
     customer_id  => $customer->id,
     taxzone_id   => $customer->taxzone_id,
@@ -130,7 +187,7 @@ sub create_sales_delivery_order {
     orderitems   => $orderitems,
   );
   $delivery_order->assign_attributes(%params) if %params;
-  $delivery_order->save;
+  SL::Model::Record->save($delivery_order);
   return $delivery_order;
 }
 
@@ -142,10 +199,10 @@ sub create_purchase_delivery_order {
   _check_items($orderitems, $record_type);
 
   my $vendor = $params{vendor} // new_vendor(name => 'Testvendor')->save;
-  die "illegal customer" unless ref($vendor) eq 'SL::DB::Vendor';
+  die "illegal vendor" unless ref($vendor) eq 'SL::DB::Vendor';
 
   my $delivery_order = SL::DB::DeliveryOrder->new(
-    order_type   => PURCHASE_DELIVERY_ORDER_TYPE,
+    record_type  => PURCHASE_DELIVERY_ORDER_TYPE,
     'closed'     => undef,
     vendor_id    => $vendor->id,
     taxzone_id   => $vendor->taxzone_id,
@@ -158,70 +215,94 @@ sub create_purchase_delivery_order {
     orderitems   => $orderitems,
   );
   $delivery_order->assign_attributes(%params) if %params;
-  $delivery_order->save;
+  SL::Model::Record->save($delivery_order);
   return $delivery_order;
 }
 
+sub create_sales_quotation {
+  my (%params) = @_;
+  $params{type} = SALES_QUOTATION_TYPE();
+  _create_sales_order_or_quotation(%params);
+}
+
 sub create_sales_order {
   my (%params) = @_;
+  $params{type} = SALES_ORDER_TYPE();
+  _create_sales_order_or_quotation(%params);
+}
 
-  my $record_type = 'sales_order';
-  my $orderitems = delete $params{orderitems} // _create_two_items($record_type);
-  _check_items($orderitems, $record_type);
+sub create_purchase_quotation {
+  my (%params) = @_;
+  $params{type} = REQUEST_QUOTATION_TYPE();
+  # TODO: set a with reqdate
+  _create_purchase_order_or_quotation(%params);
+}
+
+sub create_purchase_order {
+  my (%params) = @_;
+  $params{type} = PURCHASE_ORDER_TYPE();
+  _create_purchase_order_or_quotation(%params);
+}
+
+sub create_sales_reclamation {
+  my (%params) = @_;
+
+  my $record_type = SALES_RECLAMATION_TYPE();
+  my $reclamation_items = delete $params{reclamation_items} // _create_two_items($record_type);
+  _check_items($reclamation_items, $record_type);
 
   my $save = delete $params{save} // 0;
 
-  my $customer = $params{customer} // new_customer(name => 'Testcustomer')->save;
-  die "illegal customer" unless ref($customer) eq 'SL::DB::Customer';
+  my $customer = $params{customer} // new_customer(name => 'Test_Customer')->save;
+  die "'customer' is not of type SL::DB::Customer" unless ref($customer) eq 'SL::DB::Customer';
 
-  my $order = SL::DB::Order->new(
+  my $reclamation = SL::DB::Reclamation->new(
+    record_type  => $record_type,
     customer_id  => delete $params{customer_id} // $customer->id,
     taxzone_id   => delete $params{taxzone_id}  // $customer->taxzone->id,
     currency_id  => delete $params{currency_id} // $::instance_conf->get_currency_id,
     taxincluded  => delete $params{taxincluded} // 0,
-    employee_id  => delete $params{employee_id} // SL::DB::Manager::Employee->current->id,
-    salesman_id  => delete $params{employee_id} // SL::DB::Manager::Employee->current->id,
     transdate    => delete $params{transdate}   // DateTime->today,
-    orderitems   => $orderitems,
+    'closed'     => undef,
+    reclamation_items => $reclamation_items,
   );
-  $order->assign_attributes(%params) if %params;
+  $reclamation->assign_attributes(%params) if %params;
 
   if ( $save ) {
-    $order->calculate_prices_and_taxes;
-    $order->save;
+    SL::Model::Record->save($reclamation);
   }
-  return $order;
+  return $reclamation;
 }
 
-sub create_purchase_order {
+sub create_purchase_reclamation {
   my (%params) = @_;
 
-  my $record_type = 'purchase_order';
-  my $orderitems = delete $params{orderitems} // _create_two_items($record_type);
-  _check_items($orderitems, $record_type);
+  my $record_type = PURCHASE_RECLAMATION_TYPE();
+  my $reclamation_items = delete $params{reclamation_items} // _create_two_items($record_type);
+  _check_items($reclamation_items, $record_type);
 
   my $save = delete $params{save} // 0;
 
-  my $vendor = $params{vendor} // new_vendor(name => 'Testvendor')->save;
-  die "illegal vendor" unless ref($vendor) eq 'SL::DB::Vendor';
+  my $vendor = $params{vendor} // new_vendor(name => 'Test_Vendor')->save;
+  die "'vendor' is not of type SL::DB::Vendor" unless ref($vendor) eq 'SL::DB::Vendor';
 
-  my $order = SL::DB::Order->new(
+  my $reclamation = SL::DB::Reclamation->new(
+    record_type  => $record_type,
     vendor_id    => delete $params{vendor_id}   // $vendor->id,
     taxzone_id   => delete $params{taxzone_id}  // $vendor->taxzone->id,
     currency_id  => delete $params{currency_id} // $::instance_conf->get_currency_id,
     taxincluded  => delete $params{taxincluded} // 0,
     transdate    => delete $params{transdate}   // DateTime->today,
     'closed'     => undef,
-    orderitems   => $orderitems,
+    reclamation_items => $reclamation_items,
   );
-  $order->assign_attributes(%params) if %params;
+  $reclamation->assign_attributes(%params) if %params;
 
   if ( $save ) {
-    $order->calculate_prices_and_taxes; # not tested for purchase orders
-    $order->save;
+    SL::Model::Record->save($reclamation);
   }
-  return $order;
-};
+  return $reclamation;
+}
 
 sub _check_items {
   my ($items, $record_type) = @_;
@@ -249,6 +330,13 @@ sub create_delivery_order_item {
   return _create_item(record_type => 'sales_delivery_order', %params);
 }
 
+sub create_reclamation_item {
+  my (%params) = @_;
+
+  # record_type can be sales or purchase; make sure one is set
+  return _create_item(record_type => 'sales_reclamation', %params);
+}
+
 sub _create_item {
   my (%params) = @_;
 
@@ -652,6 +740,70 @@ sub create_gl_transaction {
   return $gl_transaction;
 }
 
+sub _create_sales_order_or_quotation {
+  my (%params) = @_;
+
+  my $record_type = delete $params{type};
+  die "illegal type" unless $record_type eq SALES_ORDER_TYPE() or $record_type eq SALES_QUOTATION_TYPE();
+
+  my $orderitems = delete $params{orderitems} // _create_two_items($record_type);
+  _check_items($orderitems, $record_type);
+
+  my $save = delete $params{save} // 0;
+
+  my $customer = $params{customer} // new_customer(name => 'Testcustomer')->save;
+  die "illegal customer" unless ref($customer) eq 'SL::DB::Customer';
+
+  my $record = SL::DB::Order->new(
+    record_type  => $record_type,
+    customer_id  => delete $params{customer_id} // $customer->id,
+    taxzone_id   => delete $params{taxzone_id}  // $customer->taxzone->id,
+    currency_id  => delete $params{currency_id} // $::instance_conf->get_currency_id,
+    taxincluded  => delete $params{taxincluded} // 0,
+    employee_id  => delete $params{employee_id} // SL::DB::Manager::Employee->current->id,
+    salesman_id  => delete $params{employee_id} // SL::DB::Manager::Employee->current->id,
+    transdate    => delete $params{transdate}   // DateTime->today,
+    orderitems   => $orderitems,
+  );
+  $record->assign_attributes(%params) if %params;
+
+  if ( $save ) {
+    SL::Model::Record->save($record);
+  }
+  return $record;
+}
+
+sub _create_purchase_order_or_quotation {
+  my (%params) = @_;
+
+  my $record_type = delete $params{type};
+  die "illegal type" unless $record_type eq PURCHASE_ORDER_TYPE() or $record_type eq REQUEST_QUOTATION_TYPE();
+  my $orderitems = delete $params{orderitems} // _create_two_items($record_type);
+  _check_items($orderitems, $record_type);
+
+  my $save = delete $params{save} // 0;
+
+  my $vendor = $params{vendor} // new_vendor(name => 'Testvendor')->save;
+  die "illegal vendor" unless ref($vendor) eq 'SL::DB::Vendor';
+
+  my $record = SL::DB::Order->new(
+    record_type  => $record_type,
+    vendor_id    => delete $params{vendor_id}   // $vendor->id,
+    taxzone_id   => delete $params{taxzone_id}  // $vendor->taxzone->id,
+    currency_id  => delete $params{currency_id} // $::instance_conf->get_currency_id,
+    taxincluded  => delete $params{taxincluded} // 0,
+    transdate    => delete $params{transdate}   // DateTime->today,
+    'closed'     => undef,
+    orderitems   => $orderitems,
+  );
+  $record->assign_attributes(%params) if %params;
+
+  if ( $save ) {
+    SL::Model::Record->save($record);
+  }
+  return $record;
+};
+
 sub _transaction_tax_helper {
   # checks for hash-entries with key tax, tax_id or taxkey
   # returns an SL::DB::Tax object
@@ -740,6 +892,16 @@ Example with params:
     taxincluded => 1,
   );
 
+=head2 C<create_minimal_purchase_invoice %PARAMS>
+
+Creates a new purchase invoice (table ap, invoice = 1), without any acc_trans
+entries, amount or tax calculations! (PTC can't deal with purchase invoices yet)
+
+Should only be used for basic testing of conversions from one record_type to
+another, and specifically for testing the individual items of conversions.
+
+For usage examples see C<create_sales_invoice>.
+
 =head2 C<create_credit_note %PARAMS>
 
 Create a credit note (sales). Use positive quantities when adding items.
@@ -791,6 +953,18 @@ Example: create 100 orders with the same part for 100 new customers:
     orderitems => [ SL::Dev::Record::create_order_item(part => $part1, qty => 1, sellprice => 9) ]
   ) for 1 .. 100;
 
+=head2 C<create_sales_quotation %PARAMS>
+
+See C<create_sales_order>
+
+=head2 C<create_purchase_quotation %PARAMS>
+
+See comments for C<create_sales_quotation>.
+
+Example:
+
+  my $purchase_quotation = SL::Dev::Record::create_purchase_quotation(save => 1);
+
 =head2 C<create_purchase_order %PARAMS>
 
 See comments for C<create_sales_order>.
@@ -799,7 +973,6 @@ Example:
 
   my $purchase_order = SL::Dev::Record::create_purchase_order(save => 1);
 
-
 =head2 C<create_item %PARAMS>
 
 Creates an item from a part object that can be added to a record.
diff --git a/SL/Dispatcher/AuthHandler/Base.pm b/SL/Dispatcher/AuthHandler/Base.pm
new file mode 100644
index 000000000..8c1f31b69
--- /dev/null
+++ b/SL/Dispatcher/AuthHandler/Base.pm
@@ -0,0 +1,144 @@
+package SL::Dispatcher::AuthHandler::Base;
+
+use strict;
+use parent qw(Rose::Object);
+
+use Encode ();
+use MIME::Base64 ();
+
+use SL::Layout::Dispatcher;
+
+sub _env_var_for_header {
+  my ($header) = @_;
+
+  $header =~ s{-}{_}g;
+  return $ENV{'HTTP_' . uc($header)};
+}
+
+sub _parse_http_basic_auth {
+  my ($self) = @_;
+
+  my $cfg = $::lx_office_conf{'authentication/http_basic'};
+
+  return unless $cfg && $cfg->{enabled};
+
+  # See RFC 7617.
+
+  # Requires that the server passes the 'Authorization' header as the
+  # environment variable 'HTTP_AUTHORIZATION'. Example code for
+  # Apache:
+
+  # SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+
+  my $data = _env_var_for_header('Authorization');
+
+  return unless ($data // '') =~ m{^basic +(.+)}i;
+
+  $data = Encode::decode('utf-8', MIME::Base64::decode($1));
+
+  return unless $data =~ m{(.+?):(.+)};
+
+  return ($1, $2);
+}
+
+sub _parse_http_headers_auth {
+  my ($self) = @_;
+
+  my $cfg = $::lx_office_conf{'authentication/http_headers'};
+
+  return unless $cfg && ($::lx_office_conf{'authentication'}->{module} =~ m{HTTPHeaders});
+
+  foreach (qw(secret_header secret user_header client_id_header)) {
+    next if $cfg->{$_};
+    die 'config/kivitendo.conf: Missing parameter in "authentication/http_headers": ' . $_;
+  }
+
+  my $secret = _env_var_for_header($cfg->{secret_header}) // '';
+  if ($secret ne $cfg->{secret}) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "_parse_http_headers_auth: bad secret sent by upstream server: $secret");
+    return;
+  }
+
+  my $client_id = _env_var_for_header($cfg->{client_id_header});
+  if (!$client_id) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "_parse_http_headers_auth: no client ID header found");
+    return;
+  }
+
+  # $::auth->set_client();
+
+  my $user = _env_var_for_header($cfg->{user_header});
+  if (!$user) {
+    $::lxdebug->message(LXDebug->DEBUG2(), "_parse_http_headers_auth: no user name header found");
+    return;
+  }
+
+  $::lxdebug->message(LXDebug->DEBUG2(), "_parse_http_headers_auth: OK client $client_id user $user");
+
+  return ($client_id, $user);
+}
+
+1;
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Dispatcher::AuthHandler::Base - Base class for different modules
+handling user authentication
+
+=head1 OVERVIEW
+
+This module acts as a base class for the modules in the
+C<SL::Dispatcher::AuthHandler> namespace. It contains a couple of
+shared helper functions.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<_env_var_for_header $header_name>
+
+Static method returning the name of an environment variable that holds
+the value of the HTTP request header named C<$header_name> according
+to the CGI specifications.
+
+=item C<_parse_http_headers_auth>
+
+When HTTP headers authentication is enabled in the configuration file,
+this function parses the content of the configured HTTP request
+headers. First, it ensures that the configuration is complete; if not,
+an exception is thrown.
+
+Next, it ensures that the shared secret was sent and equals the
+expected value.
+
+Lastly it fetches the name of the logged in user & the client ID sent
+by the upstream servers & returns both as a two-element list.
+
+This function returns an empty list if either the authentication
+module is not C<HTTPHeaders> or if the configuration option
+C<authentication/http_headers.enabled> is not true.
+
+=item C<_parse_http_basic_auth>
+
+When HTTP Basic Authentication is enabled in the configuration file,
+this function parses the content of the C<Authorization> HTTP request
+header via the corresponding environment variable according to the CGI
+spec. It extracts the user name & password from the header & returns
+both as a two-element list.
+
+This function returns an empty list if either the authentication
+module is not C<HTTPHeaders> or if the configuration option
+C<authentication/http_basic.enabled> is not true.
+
+=back
+
+=head1 AUTHOR
+
+Moritz Bunkus E<lt>m.bunkus@linet.deE<gt>
+
+=cut
diff --git a/SL/Dispatcher/AuthHandler/None.pm b/SL/Dispatcher/AuthHandler/None.pm
index b581b44e2..7a383ffd2 100644
--- a/SL/Dispatcher/AuthHandler/None.pm
+++ b/SL/Dispatcher/AuthHandler/None.pm
@@ -1,11 +1,34 @@
 package SL::Dispatcher::AuthHandler::None;
 
 use strict;
+use parent qw(SL::Dispatcher::AuthHandler::Base);
 
-use parent qw(Rose::Object);
+use SL::Auth::Constants;
 
 sub handle {
-  %::myconfig = User->get_default_myconfig;
+  my ($self) = @_;
+
+
+  my ($http_auth_login,     $http_auth_password) = $self->_parse_http_basic_auth;
+  my ($http_headers_client, $http_headers_login) = $self->_parse_http_headers_auth;
+
+  my $client_id = $http_headers_client // $::auth->get_default_client_id;
+  my $login     = $http_headers_login  // $http_auth_login;
+
+  if ($client_id && $login) {
+    $::auth->set_client($client_id);
+    %::myconfig = User->get_default_myconfig($::auth->read_user(login => $login));
+
+    $::auth->create_or_refresh_session;
+    $::auth->set_session_value('client_id', $client_id);
+    $::auth->set_session_value('login',     $login);
+
+    $::auth->set_session_authenticated($login, SL::Auth::Constants::SESSION_OK());
+
+  } else {
+    %::myconfig = User->get_default_myconfig;
+  }
+
   return 1;
 }
 
diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index acdf29c5c..8b15e6809 100644
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -1,23 +1,22 @@
 package SL::Dispatcher::AuthHandler::User;
 
 use strict;
-use parent qw(Rose::Object);
-
-use Encode ();
-use MIME::Base64 ();
+use parent qw(SL::Dispatcher::AuthHandler::Base);
 
+use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::Layout::Dispatcher;
 
 sub handle {
   my ($self, %param) = @_;
 
-  my ($http_auth_login, $http_auth_password) = $self->_parse_http_basic_auth;
+  my ($http_auth_login,     $http_auth_password) = $self->_parse_http_basic_auth;
+  my ($http_headers_client, $http_headers_login) = $self->_parse_http_headers_auth;
 
-  my $login = $::form->{'{AUTH}login'} // $http_auth_login // $::auth->get_session_value('login');
+  my $login = $::form->{'{AUTH}login'} // $http_auth_login // $http_headers_login // $::auth->get_session_value('login');
 
   return $self->_error(%param) if !defined $login;
 
-  my $client_id = $::form->{'{AUTH}client_id'} // $::auth->get_session_value('client_id') // $::auth->get_default_client_id;
+  my $client_id = $::form->{'{AUTH}client_id'} // $http_headers_client // $::auth->get_session_value('client_id') // $::auth->get_default_client_id;
 
   return $self->_error(%param) if !$client_id || !$::auth->set_client($client_id);
 
@@ -26,11 +25,17 @@ sub handle {
   return $self->_error(%param) unless $::myconfig{login};
 
   $::locale = Locale->new($::myconfig{countrycode});
+
+  # user can force a layout version
+  my $user_prefs = SL::Helper::UserPreferences::DisplayPreferences->new();
+  $::request->is_mobile(0) if ($user_prefs->get_layout_style || '') eq 'desktop';
+  $::request->is_mobile(1) if ($user_prefs->get_layout_style || '') eq 'mobile';
   $::request->{layout} = $::request->is_mobile
     ? SL::Layout::Dispatcher->new(style => 'mobile')
     : SL::Layout::Dispatcher->new(style => $::myconfig{menustyle});
 
   my $ok   =  $::auth->is_api_token_cookie_valid;
+  $ok    ||=                            $http_headers_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, \'dummy!'));
   $ok    ||=  $::form->{'{AUTH}login'}                      && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $::form->{'{AUTH}password'}));
   $ok    ||= !$::form->{'{AUTH}login'} &&  $http_auth_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $http_auth_password));
   $ok    ||= !$::form->{'{AUTH}login'} && !$http_auth_login && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, undef));
@@ -53,26 +58,4 @@ sub _error {
   return 0;
 }
 
-sub _parse_http_basic_auth {
-  my ($self) = @_;
-
-  # See RFC 7617.
-
-  # Requires that the server passes the 'Authorization' header as the
-  # environment variable 'HTTP_AUTHORIZATION'. Example code for
-  # Apache:
-
-  # SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-
-  my $data = $ENV{HTTP_AUTHORIZATION};
-
-  return unless ($data // '') =~ m{^basic +(.+)}i;
-
-  $data = Encode::decode('utf-8', MIME::Base64::decode($1));
-
-  return unless $data =~ m{(.+?):(.+)};
-
-  return ($1, $2);
-}
-
 1;
diff --git a/SL/FU.pm b/SL/FU.pm
index 822e31fe3..23242495b 100644
--- a/SL/FU.pm
+++ b/SL/FU.pm
@@ -7,7 +7,11 @@ use List::Util qw(first);
 use SL::Common;
 use SL::DBUtils;
 use SL::DB;
+use SL::DB::FollowUpCreatedForEmployee;
+use SL::Mailer;
 use SL::Notes;
+use SL::Template;
+use SL::Template::PlainText;
 
 use strict;
 
@@ -15,8 +19,12 @@ sub save {
   my ($self, %params) = @_;
   $main::lxdebug->enter_sub();
 
+  my $is_new   = !$params{id};
+
   my $rc = SL::DB->client->with_transaction(\&_save, $self, %params);
 
+  FU->send_email_notification(%params) if ($is_new);
+
   $::lxdebug->leave_sub;
   return $rc;
 }
@@ -34,13 +42,13 @@ sub _save {
   if (!$params{id}) {
     ($params{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('follow_up_id')|);
 
-    $query = qq|INSERT INTO follow_ups (created_by, done, note_id, follow_up_date, created_for_user, id)
-                VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
+    $query = qq|INSERT INTO follow_ups (created_by, note_id, follow_up_date, id)
+                VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?)|;
 
     push @values, $::myconfig{login};
 
   } else {
-    $query = qq|UPDATE follow_ups SET done = ?, note_id = ?, follow_up_date = ?, created_for_user = ? WHERE id = ?|;
+    $query = qq|UPDATE follow_ups SET note_id = ?, follow_up_date = ? WHERE id = ?|;
   }
 
   $params{note_id} = Notes->save('id'           => $params{note_id},
@@ -50,9 +58,15 @@ sub _save {
                                  'body'         => $params{body},
                                  'dbh'          => $dbh,);
 
-  $params{done} = 1 if (!defined $params{done});
+  do_query($form, $dbh, $query, @values, conv_i($params{note_id}), $params{follow_up_date}, conv_i($params{id}));
 
-  do_query($form, $dbh, $query, @values, $params{done} ? 't' : 'f', conv_i($params{note_id}), $params{follow_up_date}, conv_i($params{created_for_user}), conv_i($params{id}));
+  $params{done} = 1 if (!defined $params{done});
+  if ($params{done}) {
+    do_query($form, $dbh, qq|INSERT INTO follow_up_done (follow_up_id, employee_id) VALUES (?, (SELECT id FROM employee WHERE login = ?))|,
+             conv_i($params{id}), $::myconfig{login});
+  } else {
+    do_query($form, $dbh, qq|DELETE FROM follow_up_done WHERE follow_up_id = ?|, conv_i($params{id}));
+  }
 
   do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($params{id}));
 
@@ -65,6 +79,15 @@ sub _save {
 
   $sth->finish();
 
+  do_query($form, $dbh, qq|DELETE FROM follow_up_created_for_employees WHERE follow_up_id = ?|, conv_i($params{id}));
+
+  $query = qq|INSERT INTO follow_up_created_for_employees (follow_up_id, employee_id) VALUES (?, ?)|;
+  $sth   = prepare_query($form, $dbh, $query);
+
+  foreach my $employee_id (@{ $params{created_for_employees} }) {
+    do_statement($form, $sth, $query, conv_i($params{id}), $employee_id);
+  }
+
   return 1;
 }
 
@@ -79,10 +102,14 @@ sub finish {
   my $myconfig = \%main::myconfig;
   my $form     = $main::form;
 
-  SL::DB->client->with_transaction(sub {
-    do_query($form, SL::DB->client->dbh, qq|UPDATE follow_ups SET done = TRUE WHERE id = ?|, conv_i($params{id}));
-    1;
-  }) or do { die SL::DB->client->error };
+  my ($done)   = selectrow_query($::form, SL::DB->client->dbh, qq|SELECT id FROM follow_up_done WHERE follow_up_id = ?|, conv_i($params{id}));
+  if (!$done) {
+    SL::DB->client->with_transaction(sub {
+      do_query($form, SL::DB->client->dbh, qq|INSERT INTO follow_up_done (follow_up_id, employee_id) VALUES (?, (SELECT id FROM employee WHERE login = ?))|,
+               conv_i($params{id}), $myconfig->{login});
+      1;
+    }) or do { die SL::DB->client->error };
+  }
 
   $main::lxdebug->leave_sub();
 }
@@ -127,11 +154,17 @@ sub retrieve {
   my ($query, @values);
 
   my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $::myconfig{login});
-  $query            = qq|SELECT fu.*, n.subject, n.body, n.created_by
+  $query            = qq|SELECT fu.*, n.subject, n.body, n.created_by,
+                         follow_up_done.follow_up_id AS done,
+                         date_trunc('second', follow_up_done.done_at) AS done_at,
+                         COALESCE(done_by.name, done_by.login) AS done_by_employee_name
                          FROM follow_ups fu
                          LEFT JOIN notes n ON (fu.note_id = n.id)
+                         LEFT JOIN follow_up_created_for_employees ON (follow_up_created_for_employees.follow_up_id = fu.id)
+                         LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = fu.id)
+                         LEFT JOIN employee done_by ON (follow_up_done.employee_id = done_by.id)
                          WHERE (fu.id = ?)
-                           AND (   (fu.created_by = ?) OR (fu.created_for_user = ?)
+                           AND (   (fu.created_by = ?) OR (follow_up_created_for_employees.employee_id = ?)
                                 OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
   my $ref           = selectfirst_hashref_query($form, $dbh, $query, conv_i($params{id}), $employee_id, $employee_id, $employee_id);
 
@@ -208,7 +241,7 @@ sub follow_ups {
 
   if ($params{done} ne $params{not_done}) {
     my $not  = $params{not_done} ? 'NOT' : '';
-    $where  .= qq| AND $not COALESCE(fu.done, FALSE)|;
+    $where  .= qq| AND $not EXISTS (SELECT id FROM follow_up_done WHERE follow_up_id = fu.id)|;
   }
 
   if ($params{not_id}) {
@@ -249,7 +282,7 @@ sub follow_ups {
     push @values, conv_date($params{itime_to});
   }
   if ($params{created_for}) {
-    $where .= qq| AND fu.created_for_user = ?|;
+    $where .= qq| AND follow_up_created_for_employees.employee_id = ?|;
     push @values, conv_i($params{created_for});
   }
 
@@ -264,7 +297,7 @@ sub follow_ups {
     my %sort_columns = (
       'follow_up_date' => [ qw(fu.follow_up_date fu.id) ],
       'created_on'     => [ qw(created_on fu.id) ],
-      'subject'        => [ qw(lower(n.subject)) ],
+      'subject'        => [ qw(n.subject) ],
       );
 
     my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
@@ -272,16 +305,17 @@ sub follow_ups {
     $order_by   = 'ORDER BY ' . join(', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} });
   }
 
-  $query  = qq|SELECT fu.*, n.subject, n.body, n.created_by,
+  $query  = qq|SELECT DISTINCT fu.*, n.subject, n.body, n.created_by,
                  fu.follow_up_date <= current_date AS due,
                  fu.itime::DATE                    AS created_on,
                  COALESCE(eby.name,  eby.login)    AS created_by_name,
-                 COALESCE(efor.name, efor.login)   AS created_for_user_name
+                 follow_up_done.follow_up_id       AS done
                FROM follow_ups fu
                LEFT JOIN notes    n    ON (fu.note_id          = n.id)
                LEFT JOIN employee eby  ON (n.created_by        = eby.id)
-               LEFT JOIN employee efor ON (fu.created_for_user = efor.id)
-               WHERE ((fu.created_by = ?) OR (fu.created_for_user = ?)
+               LEFT JOIN follow_up_created_for_employees ON (follow_up_created_for_employees.follow_up_id = fu.id)
+               LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = fu.id)
+               WHERE ((fu.created_by = ?) OR (follow_up_created_for_employees.employee_id = ?)
                       $where_user)
                  $where
                $order_by|;
@@ -295,6 +329,11 @@ sub follow_ups {
 
   foreach my $fu (@{ $follow_ups }) {
     $fu->{LINKS} = $self->retrieve_links(%{ $fu });
+
+    my $fu_created_for_employees = SL::DB::Manager::FollowUpCreatedForEmployee->get_all(
+      where       => [follow_up_id => $fu->{id}],
+      with_obects => ['employee']);
+    $fu->{created_for_user_name} = join "\n", map { $_->employee->safe_name } @{$fu_created_for_employees};
   }
 
   if ($form->{sort} eq 'title') {
@@ -338,43 +377,47 @@ sub link_details {
     };
 
   } elsif ($params{trans_type} eq 'sales_quotation') {
-    my $script = 'oe.pl';
-    my $action = 'edit';
-    if ($::instance_conf->get_feature_experimental_order) {
-      $script = 'controller.pl';
-      $action = 'Order/edit';
-    }
     $link = {
-      'url'   => $script . '?action=' . $action . '&type=sales_quotation&id=' . $params{trans_id},
+      'url'   => 'controller.pl?action=Order/edit&type=sales_quotation&id=' . $params{trans_id},
       'title' => $locale->text('Sales quotation') . " $params{trans_info}",
     };
 
+  } elsif ($params{trans_type} eq 'sales_order_intake') {
+      my $script = 'controller.pl';
+      my $action = 'Order/edit';
+      $link = {
+        'url'   => $script . '?action=' . $action . '&type=sales_quotation_intake&id=' . $params{trans_id},
+        'title' => $locale->text('Order Intake') . " $params{trans_info}",
+      };
+
   } elsif ($params{trans_type} eq 'sales_delivery_order') {
 
     $link = {
-      'url'   => 'do.pl?action=edit&type=sales_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
+      'url'   => 'controller.pl?action=DeliveryOrder/edit&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
       'title' => $locale->text('Sales delivery order') .' '. $params{trans_info},
     };
 
   } elsif ($params{trans_type} eq 'purchase_delivery_order') {
 
     $link = {
-      'url'   => 'do.pl?action=edit&type=purchase_delivery_order&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
+      'url'   => 'controller.pl?action=DeliveryOrder/edit&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
       'title' => $locale->text('Purchase delivery order') .' '. $params{trans_info},
     };
 
   } elsif ($params{trans_type} eq 'sales_order') {
-    my $script = 'oe.pl';
-    my $action = 'edit';
-    if ($::instance_conf->get_feature_experimental_order) {
-      $script = 'controller.pl';
-      $action = 'Order/edit';
-    }
     $link = {
-      'url'   => $script . '?action=' . $action . '&type=sales_order&id=' . $params{trans_id},
+      'url'   => 'controller.pl?action=Order/edit&type=sales_order&id=' . $params{trans_id},
       'title' => $locale->text('Sales Order') . " $params{trans_info}",
     };
 
+  } elsif ($params{trans_type} eq 'sales_reclamation') {
+      my $script = 'controller.pl';
+      my $action = 'Reclamation/edit';
+      $link = {
+        'url'   => $script . '?action=' . $action . '&type=sales_reclamation&id=' . $params{trans_id},
+        'title' => $locale->text('Sales Reclamation') . " $params{trans_info}",
+      };
+
   } elsif ($params{trans_type} eq 'sales_invoice') {
     $link = {
       'url'   => 'is.pl?action=edit&type=invoice&id=' . $params{trans_id},
@@ -400,29 +443,33 @@ sub link_details {
     };
 
   } elsif ($params{trans_type} eq 'request_quotation') {
-    my $script = 'oe.pl';
-    my $action = 'edit';
-    if ($::instance_conf->get_feature_experimental_order) {
-      $script = 'controller.pl';
-      $action = 'Order/edit';
-    }
     $link = {
-      'url'   => $script . '?action=' . $action . '&type=request_quotation&id=' . $params{trans_id},
+      'url'   => 'controller.pl?action=Order/edit&type=request_quotation&id=' . $params{trans_id},
       'title' => $locale->text('Request quotation') . " $params{trans_info}",
     };
 
+  } elsif ($params{trans_type} eq 'purchase_quotation_intake') {
+      my $script = 'controller.pl';
+      my $action = 'Order/edit';
+      $link = {
+        'url'   => $script . '?action=' . $action . '&type=purchase_quotation_intake&id=' . $params{trans_id},
+        'title' => $locale->text('Quotation Intake') . " $params{trans_info}",
+      };
+
   } elsif ($params{trans_type} eq 'purchase_order') {
-    my $script = 'oe.pl';
-    my $action = 'edit';
-    if ($::instance_conf->get_feature_experimental_order) {
-      $script = 'controller.pl';
-      $action = 'Order/edit';
-    }
     $link = {
-      'url'   => $script . '?action=' . $action . '&type=purchase_order&id=' . $params{trans_id},
+      'url'   => 'controller.pl?action=Order/edit&type=purchase_order&id=' . $params{trans_id},
       'title' => $locale->text('Purchase Order') . " $params{trans_info}",
     };
 
+  } elsif ($params{trans_type} eq 'purchase_reclamation') {
+      my $script = 'controller.pl';
+      my $action = 'Reclamation/edit';
+      $link = {
+        'url'   => $script . '?action=' . $action . '&type=purchase_reclamation&id=' . $params{trans_id},
+        'title' => $locale->text('Purchase Reclamation') . " $params{trans_info}",
+      };
+
   } elsif ($params{trans_type} eq 'vendor_invoice') {
     $link = {
       'url'   => 'ir.pl?action=edit&type=invoice&id=' . $params{trans_id},
@@ -513,4 +560,79 @@ sub retrieve_access_rights {
   return $access;
 }
 
+sub send_email_notification {
+  $main::lxdebug->enter_sub();
+  my ($self, %params) = @_;
+
+  my $notify_cfg = $main::lx_office_conf{follow_up_notify};
+  if (!$notify_cfg
+   || !$notify_cfg->{email_subject}
+   || !$notify_cfg->{email_from}
+   || !$notify_cfg->{email_template}) {
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
+  my $employee = SL::DB::Manager::Employee->current;
+
+  my @for_employees_ids = @{$params{created_for_employees}};
+
+  my $placeholders = join ', ', map {'?'} @for_employees_ids;
+  my $query = <<SQL;
+  SELECT login
+  FROM employee
+  WHERE id in ($placeholders)
+SQL
+
+  my $dbh = $employee->dbh;
+  my $hash_key = 'login';
+  my $hashref = $dbh->selectall_hashref(
+    $query, $hash_key, undef, @for_employees_ids
+  );
+  my @logins = keys %$hashref;
+
+  foreach my $login (@logins) {
+    my %recipient  = $main::auth->read_user(
+      login => $login,
+    );
+
+    if (!$recipient{follow_up_notify_by_email} || !$recipient{email}) {
+      next;
+    }
+
+    my %template_params = (
+      follow_up_subject => $params{subject},
+      follow_up_body    => $params{body},
+      follow_up_date    => $params{follow_up_date},
+      creator_name      => $employee->name  || $::form->{login},
+      recipient_name    => $recipient{name} || $recipient{login},
+    );
+
+    my $template = Template->new({ENCODING    => 'utf8'});
+
+    my $body_file = $notify_cfg->{email_template};
+    my $content_type   = $body_file =~ m/.html$/ ? 'text/html' : 'text/plain';
+
+    my $message;
+    $template->process($body_file, \%template_params, \$message)
+    || die $template->error;
+
+    my $param_form = Form->new();
+    $param_form->{$_} = $template_params{$_} for keys %template_params;
+
+    my $mail              = Mailer->new();
+    $mail->{from}         = $notify_cfg->{email_from};
+    $mail->{to}           = $recipient{email};
+    $mail->{subject}      = SL::Template::PlainText->new(form => $param_form)
+                              ->substitute_vars($notify_cfg->{email_subject});
+    $mail->{content_type} = $content_type;
+    $mail->{message}      = $message;
+    $mail->{charset}      = 'UTF-8';
+
+    $mail->send();
+  }
+
+  $main::lxdebug->leave_sub();
+}
+
 1;
diff --git a/SL/File.pm b/SL/File.pm
index ca065e0c7..e008b3c67 100644
--- a/SL/File.pm
+++ b/SL/File.pm
@@ -4,11 +4,14 @@ use strict;
 
 use parent qw(Rose::Object);
 
+use Carp;
 use SL::File::Backend;
 use SL::File::Object;
+use SL::DB;
 use SL::DB::History;
 use SL::DB::ShopImage;
 use SL::DB::File;
+use SL::DB::FileVersion;
 use SL::Helper::UserPreferences;
 use SL::Controller::Helper::ThumbnailCreator qw(file_probe_type);
 use SL::JSON;
@@ -21,11 +24,39 @@ use constant RENAME_NEW_VERSION => 4;
 
 sub get {
   my ($self, %params) = @_;
-  die "no id or dbfile" unless $params{id} || $params{dbfile};
-  $params{dbfile} = SL::DB::Manager::File->get_first(query => [id => $params{id}]) if !$params{dbfile};
-  die 'not found' unless $params{dbfile};
-  $main::lxdebug->message(LXDebug->DEBUG2(), "object_id=".$params{dbfile}->object_id." object_type=".$params{dbfile}->object_type." dbfile=".$params{dbfile});
-  SL::File::Object->new(db_file => $params{dbfile}, id => $params{dbfile}->id, loaded => 1);
+  croak "no id or dbfile or guid" unless $params{id} || $params{dbfile} || $params{guid};
+  croak "dbfile has to be of type SL::DB::File"
+    if defined $params{dbfile} && ref $params{dbfile} ne 'SL::DB::File';
+
+  my $dbfile;
+  my $file_version;
+  if (defined $params{guid}) {
+    $file_version = SL::DB::Manager::FileVersion->get_first(where => [guid => $params{guid}]);
+    die 'file version with guid not found: ' . $params{guid} unless $file_version;
+    $dbfile = $file_version->file;
+    if (defined $params{dbfile}) {
+      croak "dbfile doesn't match guid" if $dbfile->id != $params{dbfile}->id;
+    }
+    if (defined $params{id}) {
+      croak "id doesn't match guid" if $dbfile->id != $params{id};
+    }
+  } elsif (defined $params{dbfile}) {
+    $dbfile = $params{dbfile};
+    if (defined $params{id}) {
+      croak "id doesn't match dbfile id" if $dbfile->_id != $params{id};
+    }
+  } elsif (defined $params{id}) {
+    $dbfile = SL::DB::Manager::File->get_first(query => [id => $params{id}]);
+    die 'file with id not found: ' . $params{id} unless $dbfile;
+  }
+
+  my %object_params = (
+    db_file => $dbfile,
+    id => $dbfile->id,
+    loaded => 1,
+  );
+  $object_params{file_version} = $file_version if $file_version;
+  SL::File::Object->new(%object_params);
 }
 
 sub get_version_count {
@@ -53,6 +84,7 @@ sub get_all {
   push @query, (mime_type     => $params{mime_type})     if $params{mime_type};
   push @query, (source        => $params{source})        if $params{source};
   push @query, (print_variant => $params{print_variant}) if $params{print_variant};
+  push @query, (uid           => $params{uid})           if $params{uid};
 
   my $sortby = $params{sort_by} || 'itime DESC,file_name ASC';
 
@@ -70,22 +102,17 @@ sub get_all_versions {
     @fileobjs = $self->get_all(%params);
   }
   foreach my $fileobj (@fileobjs) {
-    $main::lxdebug->message(LXDebug->DEBUG2(), "obj=" . $fileobj . " id=" . $fileobj->id." versions=".$fileobj->version_count);
-    my $maxversion = $fileobj->version_count;
-    $fileobj->version($maxversion);
+    my @file_versions = reverse @{$fileobj->loaded_db_file->file_versions_sorted};
+    my $latest_file_version = shift @file_versions;
+    $fileobj->version($latest_file_version->version);
+    $fileobj->file_version($latest_file_version);
     push @versionobjs, $fileobj;
-    if ($maxversion > 1) {
-      for my $version (2..$maxversion) {
-        $main::lxdebug->message(LXDebug->DEBUG2(), "clone for version=".($maxversion-$version+1));
-        eval {
-          my $clone = $fileobj->clone;
-          $clone->version($maxversion-$version+1);
-          $clone->newest(0);
-          $main::lxdebug->message(LXDebug->DEBUG2(), "clone version=".$clone->version." mtime=". $clone->mtime);
-          push @versionobjs, $clone;
-          1;
-        } or do {$::lxdebug->message(LXDebug::WARN(), "clone for version=".($maxversion-$version+1) . "failed: " . $@)};
-      }
+    foreach my $file_version (@file_versions) {
+      my $clone = $fileobj->clone;
+      $clone->version($file_version->version);
+      $clone->file_version($file_version);
+      $clone->newest(0);
+      push @versionobjs, $clone;
     }
   }
   return @versionobjs;
@@ -104,6 +131,7 @@ sub get_all_count {
   push @query, (mime_type     => $params{mime_type})     if $params{mime_type};
   push @query, (source        => $params{source})        if $params{source};
   push @query, (print_variant => $params{print_variant}) if $params{print_variant};
+  push @query, (uid           => $params{uid})           if $params{uid};
 
   my $cnt = SL::DB::Manager::File->get_all_count(query => [@query]);
   return $cnt;
@@ -128,10 +156,10 @@ sub delete {
   my ($self, %params) = @_;
   die "no id or dbfile in delete" unless $params{id} || $params{dbfile};
   my $rc = 0;
-  eval {
-    $rc = SL::DB->client->with_transaction(\&_delete, $self, %params);
+  SL::DB->client->with_transaction(sub {
+    $rc = $self->_delete(%params);
     1;
-  } or do { die $@ };
+  }) or do { die SL::DB->client->error };
   return $rc;
 }
 
@@ -164,7 +192,7 @@ sub _delete {
   }
   if ($backend->delete(%params)) {
     my $do_delete = 0;
-    if ( $params{last} || $params{version} || $params{all_but_notlast} ) {
+    if ( $params{last} || $params{file_version} || $params{all_but_notlast} ) {
       if ( $backend->get_version_count(%params) > 0 ) {
         $params{dbfile}->mtime(DateTime->now_local);
         $params{dbfile}->save;
@@ -184,10 +212,10 @@ sub save {
   my ($self, %params) = @_;
 
   my $obj;
-  eval {
-    $obj = SL::DB->client->with_transaction(\&_save, $self, %params);
+  SL::DB->client->with_transaction(sub {
+    $obj = $self->_save(%params);
     1;
-  } or do { die $@ };
+  }) or do { die SL::DB->client->error };
   return $obj;
 }
 
@@ -221,6 +249,7 @@ sub _save {
         title          => $params{title},
         description    => $params{description},
         print_variant  => $params{print_variant},
+        uid            => $params{uid},
       );
       $file->itime($params{mtime})    if $params{mtime};
       $params{itime} = $params{mtime} if $params{mtime};
@@ -292,6 +321,7 @@ sub rename {
                                                   mime_type     => $file->mime_type,
                                                   source        => $file->source,
                                                   file_type     => $file->file_type,
+                                                  uid           => $file->uid,
                                                   file_name     => $params{to}
                                                 ) > 0;
 
diff --git a/SL/File/Backend.pm b/SL/File/Backend.pm
index 2f1da83d3..c6af0fd18 100644
--- a/SL/File/Backend.pm
+++ b/SL/File/Backend.pm
@@ -100,6 +100,11 @@ If this parameter is set all versions of the file are deleted except the latest
 If none of the two parameters C<all_versions> or C<all__but_notlast> is set
 all version of the file are deleted.
 
+=item C<file_version>
+
+If this parameter is set only this file version will be deleted. The object has
+to be of type C<SL::DB::FileVersion>.
+
 =back
 
 =item C<rename PARAMS>
diff --git a/SL/File/Backend/Filesystem.pm b/SL/File/Backend/Filesystem.pm
index 758142bf3..d2ff9d3ed 100644
--- a/SL/File/Backend/Filesystem.pm
+++ b/SL/File/Backend/Filesystem.pm
@@ -4,10 +4,16 @@ use strict;
 
 use parent qw(SL::File::Backend);
 use SL::DB::File;
+use SL::DB::FileVersion;
+
+use Carp;
+use List::Util qw(first);
+
 use File::Copy;
 use File::Slurp;
 use File::stat;
 use File::Path qw(make_path);
+use UUID::Tiny ':std';
 
 #
 # public methods
@@ -16,46 +22,30 @@ use File::Path qw(make_path);
 sub delete {
   my ($self, %params) = @_;
   die "no dbfile in backend delete" unless $params{dbfile};
-  my $last_version  = $params{dbfile}->backend_data;
-  my $first_version = 1;
-  $last_version     = 0                               if $params{last};
-  $last_version     = $params{dbfile}->backend_data-1 if $params{all_but_notlast};
-  $last_version     = $params{version}                if $params{version};
-  $first_version    = $params{version}                if $params{version};
-
-  if ($last_version > 0 ) {
-    for my $version ( $first_version..$last_version) {
-      my $file_path = $self->_filesystem_path($params{dbfile},$version);
-      unlink($file_path);
-    }
-    if ($params{version}) {
-      for my $version ( $last_version+1 .. $params{dbfile}->backend_data) {
-        my $from = $self->_filesystem_path($params{dbfile},$version);
-        my $to   = $self->_filesystem_path($params{dbfile},$version - 1);
-        die "file not exists in backend delete" unless -f $from;
-        rename($from,$to);
-      }
-      $params{dbfile}->backend_data($params{dbfile}->backend_data-1);
-    }
-    elsif ($params{all_but_notlast}) {
-      my $from = $self->_filesystem_path($params{dbfile},$params{dbfile}->backend_data);
-      my $to   = $self->_filesystem_path($params{dbfile},1);
-      die "file not exists in backend delete" unless -f $from;
-      rename($from,$to);
-      $params{dbfile}->backend_data(1);
+
+  my @versions_to_delete;
+  if ($params{file_version}) {
+    croak "file_version has to be of type SL::DB::FileVersion"
+      unless ref $params{file_version} eq 'SL::DB::FileVersion';
+    @versions_to_delete = ($params{file_version});
+  } else {
+    my @versions = @{$params{dbfile}->file_versions_sorted};
+    if ($params{last}) {
+      my $last = pop @versions;
+      @versions_to_delete = ($last);
+    } elsif ($params{all_but_notlast}) {
+      pop @versions; # remove last
+      @versions_to_delete = @versions;
     } else {
-      $params{dbfile}->backend_data(0);
-    }
-    unless ($params{dbfile}->backend_data) {
-      my $dir_path = $self->_filesystem_path($params{dbfile});
-      rmdir($dir_path);
+      @versions_to_delete = @versions;
     }
-  } else {
-    my $file_path = $self->_filesystem_path($params{dbfile},$params{dbfile}->backend_data);
-    die "file not exists in backend delete" unless -f $file_path;
-    unlink($file_path);
-    $params{dbfile}->backend_data($params{dbfile}->backend_data-1);
   }
+
+  foreach my $version (@versions_to_delete) {
+    unlink($version->get_system_location());
+    $version->delete;
+  }
+
   return 1;
 }
 
@@ -64,9 +54,11 @@ sub rename {
 
 sub save {
   my ($self, %params) = @_;
-  die 'dbfile not exists' unless $params{dbfile};
-  my $dbfile = $params{dbfile};
-  die 'no file contents' unless $params{file_path} || $params{file_contents};
+
+  die 'dbfile not exists' unless ref $params{dbfile} eq 'SL::DB::File';
+  die 'no file contents'  unless $params{file_path} || $params{file_contents};
+
+  my $dbfile = delete $params{dbfile};
 
   # Do not save and do not create a new version of the document if file size of last version is the same.
   if ($dbfile->source eq 'created' && $self->get_version_count(dbfile => $dbfile)) {
@@ -76,19 +68,31 @@ sub save {
     return 1 if $last_file_size == $new_file_size;
   }
 
-  $dbfile->backend_data(0) unless $dbfile->backend_data;
-  $dbfile->backend_data($dbfile->backend_data*1+1);
-  $dbfile->save->load;
+  my @versions = @{$dbfile->file_versions_sorted};
+  my $new_version_number = scalar @versions ? $versions[-1]->version + 1 : 1;
 
-  my $tofile = $self->_filesystem_path($dbfile);
+  my $tofile = $self->_filesystem_path($dbfile, $new_version_number);
   if ($params{file_path} && -f $params{file_path}) {
     File::Copy::copy($params{file_path}, $tofile);
-  }
-  elsif ($params{file_contents}) {
+  } elsif ($params{file_contents}) {
     open(OUT, "> " . $tofile);
     print OUT $params{file_contents};
     close(OUT);
   }
+
+  # save file version
+  my $doc_path = $::lx_office_conf{paths}->{document_path};
+  my $rel_file = $tofile;
+  $rel_file    =~ s/$doc_path//;
+  my $fv = SL::DB::FileVersion->new(
+    file_id       => $dbfile->id,
+    version       => $new_version_number,
+    file_location => $rel_file,
+    doc_path      => $doc_path,
+    backend       => 'Filesystem',
+    guid          => create_uuid_as_string(UUID_V4),
+  )->save;
+
   if ($params{mtime}) {
     utime($params{mtime}, $params{mtime}, $tofile);
   }
@@ -98,17 +102,14 @@ sub save {
 sub get_version_count {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};
-  return $params{dbfile}->backend_data//0 * 1;
+  my $file_id = $params{dbfile}->id;
+  return 0 unless defined $file_id;
+  return SL::DB::Manager::FileVersion->get_all_count(where => [file_id => $file_id]);
 }
 
 sub get_mtime {
   my ($self, %params) = @_;
-  die "no dbfile" unless $params{dbfile};
-  die "unknown version" if $params{version} &&
-                          ($params{version} < 0 || $params{version} > $params{dbfile}->backend_data);
-  my $path = $self->_filesystem_path($params{dbfile}, $params{version});
-
-  die "No file found at $path. Expected: $params{dbfile}{file_name}, file.id: $params{dbfile}{id}" if !-f $path;
+  my $path = $self->get_filepath(%params);
 
   my $dt = DateTime->from_epoch(epoch => stat($path)->mtime, time_zone => $::locale->get_local_time_zone()->name, locale => $::lx_office_conf{system}->{language})->clone();
   return $dt;
@@ -140,32 +141,7 @@ sub enabled {
 }
 
 sub sync_from_backend {
-  my ($self, %params) = @_;
-  my @query = (file_type => $params{file_type});
-  push @query, (file_name => $params{file_name}) if $params{file_name};
-  push @query, (mime_type => $params{mime_type}) if $params{mime_type};
-  push @query, (source    => $params{source})    if $params{source};
-
-  my $sortby = $params{sort_by} || 'itime DESC,file_name ASC';
-
-  my @files = @{ SL::DB::Manager::File->get_all(query => [@query], sort_by => $sortby) };
-  for (@files) {
-    $main::lxdebug->message(LXDebug->DEBUG2(), "file id=" . $_->id." version=".$_->backend_data);
-    my $newversion = $_->backend_data;
-    for my $version ( reverse 1 .. $_->backend_data ) {
-      my $path = $self->_filesystem_path($_, $version);
-      $main::lxdebug->message(LXDebug->DEBUG2(), "path=".$path." exists=".( -f $path?1:0));
-      last if -f $path;
-      $newversion = $version - 1;
-    }
-    $main::lxdebug->message(LXDebug->DEBUG2(), "newversion=".$newversion." version=".$_->backend_data);
-    if ( $newversion < $_->backend_data ) {
-      $_->backend_data($newversion);
-      $_->save   if $newversion >  0;
-      $_->delete if $newversion <= 0;
-    }
-  }
-
+  die "Not implemented";
 }
 
 #
@@ -177,14 +153,20 @@ sub _filesystem_path {
 
   die "No files backend enabled" unless $::instance_conf->get_doc_files || $::lx_office_conf{paths}->{document_path};
 
+  unless ($version) {
+    my $file_version = SL::DB::Manager::FileVersion->get_first(
+      where   => [file_id => $dbfile->id],
+      sort_by => 'version DESC'
+    ) or die "Could not find a file version for file with id " . $dbfile->id;
+    $version = $file_version->version;
+  }
+
   # use filesystem with depth 3
-  $version    = $dbfile->backend_data if !$version || $version < 1 || $version > $dbfile->backend_data;
   my $iddir   = sprintf("%04d", $dbfile->id % 1000);
   my $path    = File::Spec->catdir($::lx_office_conf{paths}->{document_path}, $::auth->client->{id}, $iddir, $dbfile->id);
   if (!-d $path) {
     File::Path::make_path($path, { chmod => 0770 });
   }
-  return $path if !$version;
   return File::Spec->catdir($path, $dbfile->id . '_' . $version);
 }
 
diff --git a/SL/File/Backend/Webdav.pm b/SL/File/Backend/Webdav.pm
index bf8f9af61..a78fe60bf 100644
--- a/SL/File/Backend/Webdav.pm
+++ b/SL/File/Backend/Webdav.pm
@@ -4,6 +4,7 @@ use strict;
 
 use parent qw(SL::File::Backend);
 use SL::DB::File;
+use SL::DB::FileVersion;
 
 use SL::System::Process;
 use File::Copy;
@@ -12,6 +13,7 @@ use File::Basename;
 use File::Path qw(make_path);
 use File::MimeInfo::Magic;
 use File::stat;
+use UUID::Tiny ':std';
 
 #
 # public methods
@@ -59,14 +61,29 @@ sub save {
     print OUT $params{file_contents};
     close(OUT);
   }
+
+  # save file version
+  my $doc_path = $self->get_rootdir();
+  my $rel_file = $tofile;
+  $rel_file    =~ s/$doc_path//;
+  my $fv = SL::DB::FileVersion->new(
+    file_id       => $params{dbfile}->id,
+    version       => 1, # Webdav doesn't have versions by now.
+    file_location => $rel_file,
+    doc_path      => $doc_path,
+    backend       => 'Webdav',
+    guid          => create_uuid_as_string(UUID_V4),
+  )->save;
+
   return 1;
 }
 
 sub get_version_count {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};
-  ## TODO
-  return 1;
+  # TODO: Webdav doesn't have versions by now.
+  my ($path, undef, undef) = $self->webdav_path($params{dbfile});
+  return (-f $path || 0) * 1; # return 1 if file is found otherwise 0
 }
 
 sub get_mtime {
@@ -114,11 +131,18 @@ sub enabled {
 
 my %type_to_path = (
   sales_quotation             => 'angebote',
+  sales_order_intake          => 'auftragseingaenge',
   sales_order                 => 'bestellungen',
   request_quotation           => 'anfragen',
+  purchase_quotation_intake   => 'angebotseingaenge',
   purchase_order              => 'lieferantenbestellungen',
+  purchase_order_confirmation => 'lieferantenauftragsbestaetigungen',
   sales_delivery_order        => 'verkaufslieferscheine',
   purchase_delivery_order     => 'einkaufslieferscheine',
+  purchase_reclamation        => 'einkaufsreklamation',
+  sales_reclamation           => 'verkaufsreklamation',
+  supplier_delivery_order     => 'beistelllieferscheine',
+  rma_delivery_order          => 'retourenlieferscheine',
   credit_note                 => 'gutschriften',
   invoice                     => 'rechnungen',
   invoice_for_advance_payment => 'rechnungen',
@@ -138,11 +162,17 @@ my %type_to_path = (
 
 my %type_to_model = (
   sales_quotation             => 'Order',
+  sales_order_intake          => 'Order',
   sales_order                 => 'Order',
   request_quotation           => 'Order',
+  purchase_quotation_intake   => 'Order',
   purchase_order              => 'Order',
   sales_delivery_order        => 'DeliveryOrder',
   purchase_delivery_order     => 'DeliveryOrder',
+  sales_reclamation           => 'Reclamation',
+  purchase_reclamation        => 'Reclamation',
+  supplier_delivery_order     => 'DeliveryOrder',
+  rma_delivery_order          => 'DeliveryOrder',
   credit_note                 => 'Invoice',
   invoice                     => 'Invoice',
   invoice_for_advance_payment => 'Invoice',
@@ -161,8 +191,9 @@ my %type_to_model = (
 );
 
 my %model_to_number = (
-  Order           => 'ordnumber',
-  DeliveryOrder   => 'ordnumber',
+  Order           => 'record_number',
+  DeliveryOrder   => 'record_number',
+  Reclamation     => 'record_number',
   Invoice         => 'invnumber',
   PurchaseInvoice => 'invnumber',
   Part            => 'partnumber',
@@ -188,6 +219,7 @@ sub webdav_path {
     $dbfile->backend_data($number);
     $dbfile->save;
   }
+  $number =~ s/\//-/g; # replace forbidden char;
   $main::lxdebug->message(LXDebug->DEBUG2(), "file_name=" . $dbfile->file_name ." number=".$number);
 
   my @fileparts = split(/_/, $dbfile->file_name);
diff --git a/SL/File/Object.pm b/SL/File/Object.pm
index 42a651f98..dc009e99f 100644
--- a/SL/File/Object.pm
+++ b/SL/File/Object.pm
@@ -6,7 +6,7 @@ use DateTime;
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw() ],
-  'scalar --get_set_init' => [ qw(db_file loaded id version newest) ],
+  'scalar --get_set_init' => [ qw(db_file loaded id file_version version newest) ],
 );
 
 #use SL::DB::Helper::Attr;
@@ -97,8 +97,8 @@ sub delete_last_version {
   SL::File->delete(dbfile => $_[0]->loaded_db_file, last => 1 )
 }
 
-sub delete_version {
-  SL::File->delete(dbfile => $_[0]->loaded_db_file, version => $_[0]->version )
+sub delete_file_version {
+  SL::File->delete(dbfile => $_[0]->loaded_db_file, file_version => $_[0]->file_version )
 }
 
 sub purge {
@@ -129,11 +129,12 @@ sub clone {
 }
 
 
-sub init_db_file { die 'must always have a db file'; }
-sub init_loaded  { 0 }
-sub init_id      { 0 }
-sub init_version { 0 }
-sub init_newest  { 1 }
+sub init_db_file      { die 'must always have a db file'; }
+sub init_loaded       { 0 }
+sub init_id           { 0 }
+sub init_version      { 0 }
+sub init_file_version { undef }
+sub init_newest       { 1 }
 
 1;
 
@@ -218,9 +219,11 @@ Following methods are wrapper to read the attributes of L<SL::DB::File> :
 
 =back
 
-Additional are there special methods. If the Object is created by SL::File::get_all_versions()
-or by "$object->versions"
-it has a version number. So the different mtime, filepath or content can be retrieved:
+Additional are there special methods. If the Object is created by
+C<SL::File::get_all_versions()> or by C<$object->versions>. It has a version
+number in C<version> and a version object in C<file_version> of type
+C<SL::DB::FileVersion>. So the different mtime, filepath or content can be
+retrieved:
 
 =over 4
 
diff --git a/SL/Form.pm b/SL/Form.pm
index fd79b9628..0f998e1e5 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -49,6 +49,7 @@ use File::Copy;
 use File::Temp ();
 use IO::File;
 use Math::BigInt;
+use Params::Validate qw(:all);
 use POSIX qw(strftime);
 use SL::Auth;
 use SL::Auth::DB;
@@ -432,7 +433,7 @@ sub header {
 
   $layout->use_javascript("$_.js") for (qw(
     jquery jquery-ui jquery.cookie jquery.checkall jquery.download
-    jquery/jquery.form jquery/fixes client_js
+    jquery/jquery.form jquery/fixes namespace client_js
     jquery/jquery.tooltipster.min
     common part_selection
   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
@@ -468,7 +469,7 @@ sub header {
 
   # output
   print $self->create_http_response(content_type => 'text/html', charset => 'UTF-8');
-  print $doctypes{$params{doctype} || 'transitional'}, $/;
+  print $doctypes{$params{doctype} || $::request->layout->html_dialect}, $/;
   print <<EOT;
 <html>
  <head>
@@ -555,11 +556,13 @@ sub _prepare_html_template {
   }
   $language = "de" unless ($language);
 
-  my $webpages_path = $::request->layout->webpages_path;
+  my $webpages_path     = $::request->layout->webpages_path;
+  my $webpages_fallback = $::request->layout->webpages_fallback_path;
 
-  if (-f "${webpages_path}/${file}.html") {
-    $file = "${webpages_path}/${file}.html";
+  my @templates = first { -f } map { "${_}/${file}.html" } grep { defined } $webpages_path, $webpages_fallback;
 
+  if (@templates) {
+    $file = $templates[0];
   } elsif (ref $file eq 'SCALAR') {
     # file is a scalarref, use inline mode
   } else {
@@ -900,7 +903,8 @@ sub parse_template {
     my $file_obj = $self->store_pdf($self);
     $self->{print_file_id} = $file_obj->id if $file_obj;
   }
-  if ($self->{media} eq 'email') {
+  # dn has its own send email method, but sets media for print templates
+  if ($self->{media} eq 'email' && !$self->{dunning_id}) {
     if ( getcwd() eq $self->{"tmpdir"} ) {
       # in the case of generating pdf we are in the tmpdir, but WHY ???
       $self->{tmpfile} = $userspath."/".$self->{tmpfile};
@@ -984,6 +988,7 @@ sub send_email {
       if ($attfile) {
         $attfile->{override_file_name} = $attachment_name if $attachment_name;
         push @attfiles, $attfile;
+        $self->{file_id} = $attfile->id;
       }
 
     } else {
@@ -1013,17 +1018,17 @@ sub send_email {
   $mail->{message} .= $full_signature;
   $self->{emailerr} = $mail->send();
 
-  if ($self->{emailerr}) {
-    $self->cleanup;
-    $self->error($::locale->text('The email was not sent due to the following error: #1.', $self->{emailerr}));
-  }
-
   $self->{email_journal_id} = $mail->{journalentry};
   $self->{snumbers}  = "emailjournal" . "_" . $self->{email_journal_id};
   $self->{what_done} = $::form->{type};
   $self->{addition}  = "MAILED";
   $self->save_history;
 
+  if ($self->{emailerr}) {
+    $self->cleanup;
+    $self->error($::locale->text('The email was not sent due to the following error: #1.', $self->{emailerr}));
+  }
+
   #write back for message info and mail journal
   $self->{cc}  = $mail->{cc};
   $self->{bcc} = $mail->{bcc};
@@ -1097,7 +1102,10 @@ sub get_formname_translation {
     pick_list                   => $main::locale->text('Pick List'),
     proforma                    => $main::locale->text('Proforma Invoice'),
     purchase_order              => $main::locale->text('Purchase Order'),
+    purchase_order_confirmation => $main::locale->text('Purchase Order Confirmation'),
     request_quotation           => $main::locale->text('RFQ'),
+    purchase_quotation_intake   => $main::locale->text('Purchase Quotation Intake'),
+    sales_order_intake          => $main::locale->text('Sales Order Intake'),
     sales_order                 => $main::locale->text('Confirmation'),
     sales_quotation             => $main::locale->text('Quotation'),
     storno_invoice              => $main::locale->text('Storno Invoice'),
@@ -1105,6 +1113,8 @@ sub get_formname_translation {
     purchase_delivery_order     => $main::locale->text('Delivery Order'),
     supplier_delivery_order     => $main::locale->text('Supplier Delivery Order'),
     rma_delivery_order          => $main::locale->text('RMA Delivery Order'),
+    sales_reclamation           => $main::locale->text('Sales Reclamation'),
+    purchase_reclamation        => $main::locale->text('Purchase Reclamation'),
     dunning                     => $main::locale->text('Dunning'),
     dunning1                    => $main::locale->text('Payment Reminder'),
     dunning2                    => $main::locale->text('Dunning'),
@@ -1139,13 +1149,13 @@ sub get_number_prefix_for_type {
 
   my $prefix =
       (first { $self->{type} eq $_ } qw(invoice invoice_for_advance_payment final_invoice credit_note)) ? 'inv'
-    : ($self->{type} =~ /_quotation$/)                                                                  ? 'quo'
+    : ($self->{type} =~ /_quotation/)                                                                   ? 'quo'
     : ($self->{type} =~ /_delivery_order$/)                                                             ? 'do'
     : ($self->{type} =~ /letter/)                                                                       ? 'letter'
     :                                                                                                     'ord';
 
   # better default like this?
-  # : ($self->{type} =~ /(sales|purcharse)_order/           :  'ord';
+  # : ($self->{type} =~ /(sales|purchase)_order/           :  'ord';
   # :                                                           'prefix_undefined';
 
   $main::lxdebug->leave_sub();
@@ -1201,6 +1211,9 @@ sub generate_email_subject {
   $main::lxdebug->enter_sub();
   my ($self) = @_;
 
+  my $defaults = SL::DB::Default->get;
+
+  my $sep = ' / ';
   my $subject = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
   my $prefix  = $self->get_number_prefix_for_type();
 
@@ -1209,7 +1222,11 @@ sub generate_email_subject {
   }
 
   if ($self->{cusordnumber}) {
-    $subject = $self->get_cusordnumber_translation() . ' ' . $self->{cusordnumber} . ' / ' . $subject;
+    $subject = $self->get_cusordnumber_translation() . ' ' . $self->{cusordnumber} . $sep . $subject;
+  }
+
+  if ($defaults->email_subject_transaction_description) {
+    $subject .=  $sep . $self->{transaction_description} if $self->{transaction_description};
   }
 
   $main::lxdebug->leave_sub();
@@ -1421,22 +1438,31 @@ sub update_balance {
 sub update_exchangerate {
   $main::lxdebug->enter_sub();
 
-  my ($self, $dbh, $curr, $transdate, $buy, $sell) = @_;
-  my ($query);
-  # some sanity check for currency
-  if ($curr eq '') {
-    $main::lxdebug->leave_sub();
-    return;
-  }
-  $query = qq|SELECT name AS curr FROM currencies WHERE id=(SELECT currency_id FROM defaults)|;
-
-  my ($defaultcurrency) = selectrow_query($self, $dbh, $query);
-
-  if ($curr eq $defaultcurrency) {
+  validate_pos(@_,
+                 { isa  => 'Form'},
+                 { isa  => 'DBI::db'},
+                 { type => SCALAR, callbacks  => { is_fx_currency     => sub { shift ne $_[1]->[0]->{defaultcurrency} } } }, # should be ISO three letter codes for currency identification (ISO 4217)
+                 { type => SCALAR, callbacks  => { is_valid_kivi_date => sub { shift =~ m/\d+\d+\d+/ } } }, # we have three numers
+                 { type => SCALAR, callbacks  => { is_null_or_ar_int  => sub {    $_[0] == 0
+                                                                               || $_[0] >  0
+                                                                               && $_[1]->[0]->{script} =~ m/cp\.pl|ar\.pl|is\.pl/ } } }, # value buy fxrate
+                 { type => SCALAR, callbacks  => { is_null_or_ap_int  => sub {    $_[0] == 0
+                                                                               || $_[0] >  0
+                                                                               && $_[1]->[0]->{script} =~ m/cp\.pl|ap\.pl|ir\.pl/  } } }, # value sell fxrate
+                 { type => SCALAR, callbacks  => { is_current_form_id => sub { $_[0] == $_[1]->[0]->{id} } },              optional => 1 },
+                 { type => SCALAR, callbacks  => { is_valid_fx_table  => sub { shift =~ m/(ar|ap|bank_transactions)/  } }, optional => 1 }
+              );
+
+  my ($self, $dbh, $curr, $transdate, $buy, $sell, $id, $record_table) = @_;
+
+  # record has a exchange rate and should be updated
+  if ($record_table && $id) {
+    do_query($self, $dbh, qq|UPDATE $record_table SET exchangerate = ? WHERE id = ?|, $buy || $sell, $id);
     $main::lxdebug->leave_sub();
     return;
   }
 
+  my ($query);
   $query = qq|SELECT e.currency_id FROM exchangerate e
                  WHERE e.currency_id = (SELECT cu.id FROM currencies cu WHERE cu.name=?) AND e.transdate = ?
                  FOR UPDATE|;
@@ -1462,6 +1488,7 @@ sub update_exchangerate {
   }
 
   if ($sth->fetchrow_array) {
+    # die "this never happens never"; # except for credit or debit bookings
     $query = qq|UPDATE exchangerate
                 SET $set
                 WHERE currency_id = (SELECT id FROM currencies WHERE name = ?)
@@ -1477,80 +1504,34 @@ sub update_exchangerate {
   $main::lxdebug->leave_sub();
 }
 
-sub save_exchangerate {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
-
-  SL::DB->client->with_transaction(sub {
-    my $dbh = SL::DB->client->dbh;
-
-    my ($buy, $sell);
-
-    $buy  = $rate if $fld eq 'buy';
-    $sell = $rate if $fld eq 'sell';
-
-
-    $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
-    1;
-  }) or do { die SL::DB->client->error };
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_exchangerate {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $dbh, $curr, $transdate, $fld) = @_;
-  my ($query);
-
-  unless ($transdate && $curr) {
-    $main::lxdebug->leave_sub();
-    return 1;
-  }
-
-  $query = qq|SELECT name AS curr FROM currencies WHERE id = (SELECT currency_id FROM defaults)|;
-
-  my ($defaultcurrency) = selectrow_query($self, $dbh, $query);
-
-  if ($curr eq $defaultcurrency) {
-    $main::lxdebug->leave_sub();
-    return 1;
-  }
-
-  $query = qq|SELECT e.$fld FROM exchangerate e
-                 WHERE e.currency_id = (SELECT id FROM currencies WHERE name = ?) AND e.transdate = ?|;
-  my ($exchangerate) = selectrow_query($self, $dbh, $query, $curr, $transdate);
-
-
-
-  $main::lxdebug->leave_sub();
-
-  return $exchangerate;
-}
-
 sub check_exchangerate {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $currency, $transdate, $fld) = @_;
+  validate_pos(@_,
+                 { isa  => 'Form'},
+                 { type => HASHREF, callbacks => { has_yy_in_dateformat => sub { $_[0]->{dateformat} =~ m/yy/ } } },
+                 { type => SCALAR, callbacks  => { is_fx_currency       => sub { shift ne $_[1]->[0]->{defaultcurrency} } } }, # should be ISO three letter codes for currency identification (ISO 4217)
+                 { type => SCALAR | HASHREF, callbacks  => { is_valid_kivi_date   => sub { shift =~ m/\d+.\d+.\d+/ } } }, # we have three numbers. Either DateTime or form scalar
+                 { type => SCALAR, callbacks  => { is_buy_or_sell_rate  => sub { shift =~ m/^(buy|sell)$/ } } },
+                 { type => SCALAR | UNDEF,   callbacks  => { is_current_form_id   => sub { $_[0] == $_[1]->[0]->{id} } },              optional => 1 },
+                 { type => SCALAR, callbacks  => { is_valid_fx_table    => sub { shift =~ m/^(ar|ap)$/  } }, optional => 1 }
+              );
+  my ($self, $myconfig, $currency, $transdate, $fld, $id, $record_table) = @_;
 
-  if ($fld !~/^buy|sell$/) {
-    $self->error('Fatal: check_exchangerate called with invalid buy/sell argument');
-  }
-
-  unless ($transdate) {
-    $main::lxdebug->leave_sub();
-    return "";
-  }
+  my $dbh   = $self->get_standard_dbh($myconfig);
 
-  my ($defaultcurrency) = $self->get_default_currency($myconfig);
+  # callers wants a check if record has a exchange rate and should be fetched instead
+  if ($record_table && $id) {
+    my ($record_exchange_rate) = selectrow_query($self, $dbh, qq|SELECT exchangerate FROM $record_table WHERE id = ?|, $id);
+    if ($record_exchange_rate && $record_exchange_rate > 0) {
 
-  if ($currency eq $defaultcurrency) {
-    $main::lxdebug->leave_sub();
-    return 1;
+      $main::lxdebug->leave_sub();
+      # second param indicates record exchange rate
+      return ($record_exchange_rate, 1);
+    }
   }
 
-  my $dbh   = $self->get_standard_dbh($myconfig);
+  # fetch default from exchangerate table
   my $query = qq|SELECT e.$fld FROM exchangerate e
                  WHERE e.currency_id = (SELECT id FROM currencies WHERE name = ?) AND e.transdate = ?|;
 
@@ -1667,9 +1648,11 @@ sub set_payment_options {
   $self->{payment_terms} =~ s/<\%mandator_id\%>/$self->{mandator_id}/g;
 
   map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
-
-  $self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
-
+  # put amounts in form for print template
+  foreach (keys %formatted_amounts) {
+    next if $_  =~ m/(^total$|^invtotal$)/;
+    $self->{$_} = $formatted_amounts{$_};
+  }
 }
 
 sub get_template_language {
@@ -1769,8 +1752,8 @@ sub add_shipto {
                      shiptocontact = ?,
                      shiptophone = ?,
                      shiptofax = ?,
-                     shiptoemail = ?
-                     shiptocp_gender = ?,
+                     shiptoemail = ?,
+                     shiptocp_gender = ?
                    WHERE shipto_id = ?|;
     do_query($self, $dbh, $query, @values, $self->{shipto_id});
   } else {
@@ -2587,26 +2570,40 @@ sub create_links {
            c.accno, c.description,
            a.acc_trans_id, a.source, a.amount, a.memo, a.transdate, a.gldate, a.cleared, a.project_id, a.taxkey, a.chart_id,
            p.projectnumber,
-           t.rate, t.id
+           t.rate, t.id,
+           a.fx_transaction
          FROM acc_trans a
          LEFT JOIN chart c ON (c.id = a.chart_id)
          LEFT JOIN project p ON (p.id = a.project_id)
          LEFT JOIN tax t ON (t.id= a.tax_id)
          WHERE a.trans_id = ?
-         AND a.fx_transaction = '0'
          ORDER BY a.acc_trans_id, a.transdate|;
     $sth = $dbh->prepare($query);
     do_statement($self, $sth, $query, $self->{id});
 
     # get exchangerate for currency
-    $self->{exchangerate} =
-      $self->get_exchangerate($dbh, $self->{currency}, $self->{transdate}, $fld);
+    ($self->{exchangerate}, $self->{record_forex}) = $self->check_exchangerate($myconfig, $self->{currency}, $self->{transdate}, $fld,
+                                                                               $self->{id}, $arap);
+
     my $index = 0;
+    my @fx_transaction_entries;
 
     # store amounts in {acc_trans}{$key} for multiple accounts
     while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+      # skip fx_transaction entries and add them for post processing
+      if ($ref->{fx_transaction}) {
+        die "first entry in a record transaction should not be fx_transaction" unless @fx_transaction_entries;
+        push @{ $fx_transaction_entries[-1] }, $ref;
+        next;
+      } else {
+        push @fx_transaction_entries, [ $ref ];
+      }
+
+
+      # credit and debit bookings calc fx rate for positions
+      # also used as exchangerate_$i for payments - exchangerate here can come from frontend or from bank transactions
       $ref->{exchangerate} =
-        $self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate}, $fld);
+        $self->check_exchangerate($myconfig, $self->{currency}, $ref->{transdate}, $fld);
       if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
         $index++;
       }
@@ -2618,6 +2615,36 @@ sub create_links {
       push @{ $self->{acc_trans}{ $xkeyref{ $ref->{accno} } } }, $ref;
     }
 
+    # post process fx_transactions.
+    # old bin/mozilla code first posts the intended foreign currency amount and then the correction for exchange flagged as fx_transaction
+    # for example: when posting 20 USD on a system in EUR with an exchangerate of 1.1, the resulting acc_trans will say:
+    #   +20 no fx (intended: 20 USD)
+    #    +2    fx (but it's actually 22 EUR)
+    #
+    # for payments this is followed by the fxgain/loss. when paying the above invoice with 20 USD at 1.3 exchange:
+    #   -20 no fx (intended: 20 USD)
+    #    -6    fx (but it's actually 26 EUR)
+    #    +4    fx (but 4 of them go to fxgain)
+    #
+    # bin/mozilla/ controllers will display the intended amount as is, but would have to guess at the actual book value
+    # without the extra fields
+    #
+    # bank transactions however will convert directly into internal currency, so a foreign currency invoice might end up
+    # having non-fxtransactions. to make sure that these are roundtrip safe, flag the fx-transaction payments as fx and give the
+    # intendended internal amount
+    #
+    # this still operates on the cached entries of form->{acc_trans}
+    for my $fx_block (@fx_transaction_entries) {
+      my ($ref, @fx_entries) = @$fx_block;
+      for my $fx_ref (@fx_entries) {
+        if ($fx_ref->{chart_id} == $ref->{chart_id}) {
+          $ref->{defaultcurrency_paid} //= $ref->{amount};
+          $ref->{defaultcurrency_paid} += $fx_ref->{amount};
+          $ref->{fx_transaction} = 1;
+        }
+      }
+    }
+
     $sth->finish;
     #check das:
     $query =
@@ -2647,21 +2674,11 @@ sub create_links {
     $ref = selectfirst_hashref_query($self, $dbh, $query);
     map { $self->{$_} = $ref->{$_} } keys %$ref;
 
-    if ($self->{"$self->{vc}_id"}) {
-
-      # only setup currency
-      ($self->{currency}) = $self->{defaultcurrency} if !$self->{currency};
-
-    } else {
-
-      $self->lastname_used($dbh, $myconfig, $table, $module);
-
-      # get exchangerate for currency
-      $self->{exchangerate} =
-        $self->get_exchangerate($dbh, $self->{currency}, $self->{transdate}, $fld);
-
-    }
-
+    # failsafe, set currency if caller has not yet assigned one
+    $self->lastname_used($dbh, $myconfig, $table, $module) unless ($self->{"$self->{vc}_id"});
+    $self->{currency} = $self->{defaultcurrency}           unless $self->{currency};
+    $self->{exchangerate} =
+      $self->check_exchangerate($myconfig, $self->{currency}, $self->{transdate}, $fld);
   }
 
   $main::lxdebug->leave_sub();
@@ -2954,12 +2971,16 @@ sub save_status {
 # $main::locale->text('invoice_for_advance_payment')
 # $main::locale->text('final_invoice')
 # $main::locale->text('proforma')
+# $main::locale->text('storno_invoice')
+# $main::locale->text('sales_order_intake')
 # $main::locale->text('sales_order')
 # $main::locale->text('pick_list')
 # $main::locale->text('purchase_order')
+# $main::locale->text('purchase_order_confirmation')
 # $main::locale->text('bin_list')
 # $main::locale->text('sales_quotation')
 # $main::locale->text('request_quotation')
+# $main::locale->text('purchase_quotation_intake')
 
 sub save_history {
   $main::lxdebug->enter_sub();
@@ -3190,8 +3211,10 @@ sub prepare_for_printing {
 
   if ($self->{type} =~ /_delivery_order$/) {
     DO->order_details(\%::myconfig, $self);
-  } elsif ($self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order/) {
+  } elsif ($self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order|purchase_quotation_intake/) {
     OE->order_details(\%::myconfig, $self);
+  } elsif ($self->{type} =~ /reclamation/) {
+    # skip reclamation here, legacy template arrays are added in the reclamation controller
   } else {
     IS->invoice_details(\%::myconfig, $self, $::locale);
   }
@@ -3342,9 +3365,7 @@ sub calculate_arap {
     my $tax_id = $self->{"tax_id_$i"};
 
     my $selected_tax = SL::DB::Manager::Tax->find_by(id => "$tax_id");
-
-    if ( $selected_tax ) {
-
+    if ( $selected_tax && !$selected_tax->reverse_charge_chart_id) {
       if ( $buysell eq 'sell' ) {
         $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
       } else {
@@ -3355,6 +3376,8 @@ sub calculate_arap {
       $self->{"taxrate_$i"} = $selected_tax->rate;
     };
 
+    $self->{"taxkey_$i"} = $selected_tax->taxkey if ($selected_tax && $selected_tax->reverse_charge_chart_id);
+
     ($self->{"amount_$i"}, $self->{"tax_$i"}) = $self->calculate_tax($self->{"amount_$i"},$self->{"taxrate_$i"},$taxincluded,$roundplaces);
 
     $netamount  += $self->{"amount_$i"};
@@ -3571,6 +3594,36 @@ Can be called wit C<option> mail to generate a different error message.
 Returns undef if no save operation has been done yet ($self->{id} not present).
 Returns undef if no concurrent write process is detected otherwise a error message.
 
+=back
+
+=over 4
+
+=item C<check_exchangerate>  $myconfig, $currency, $transdate, $fld, $id, $record_table
+
+Needs a local myconfig, a currency string, a date of the transaction, a field (fld) which
+has to be either the buy or sell exchangerate and checks if there is already a buy or
+sell exchangerate for this date.
+Returns 0 or (NULL) if no entry is found or the already stored exchangerate.
+If the optional parameter id and record_table is passed, the method tries to look up
+a custom exchangerate for a record with id. record_table can either be ar, ap or bank_transactions.
+If none is found the default (daily) entry will be checked.
+The method is very strict about the parameters and tries to fail if anything does
+not look like the expected type.
+
+=item C<update_exchangerate> $dbh, $curr, $transdate, $buy, $sell, $id, $record_table
+
+Needs a dbh connection, a currency string, a date of the transaction, buy (0|1), sell (0|1) which
+determines if either the buy or sell or both exchangerates should be updated and updates
+the exchangerate for this currency for this date.
+If the optional parameter id and record_table is passed, the method saves
+a custom exchangerate for a record with id. record_table can either be ar, ap or bank_transactions.
+
+The method is very strict about the parameters and tries to fail if anything does not look
+like the expected type.
+
+
+
+
 =back
 
 =cut
diff --git a/SL/GL.pm b/SL/GL.pm
index 46c2d49b1..57aa145a1 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -46,6 +46,8 @@ use SL::DATEV qw(:CONSTANTS);
 use SL::DBUtils;
 use SL::DB::Chart;
 use SL::DB::Draft;
+use SL::DB::ValidityToken;
+use SL::DB::GLTransaction;
 use SL::Util qw(trim);
 use SL::DB;
 
@@ -77,6 +79,16 @@ sub _post_transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_GL_TRANSACTION_POST(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my ($debit, $credit) = (0, 0);
   my $project_id;
 
@@ -213,6 +225,9 @@ sub _post_transaction {
     }
   }
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   return 1;
 }
 
@@ -783,6 +798,19 @@ sub _storno {
     do_query($form, $dbh, $query, (values %$row));
   }
 
+  if ($form->{workflow_email_journal_id}) {
+    my $ar_transaction_storno = SL::DB::GLTransaction->new(id => $new_id)->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{workflow_email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment(
+      $ar_transaction_storno,
+      delete $form->{workflow_email_attachment_id}
+    );
+    $form->{callback} = delete $form->{workflow_email_callback};
+  }
+
+  $form->{storno_id} = $id;
   return 1;
 }
 
diff --git a/SL/HTML/Restrict.pm b/SL/HTML/Restrict.pm
index ad8ff387b..3be417112 100644
--- a/SL/HTML/Restrict.pm
+++ b/SL/HTML/Restrict.pm
@@ -7,7 +7,7 @@ use HTML::Restrict ();
 
 sub create {
   my ($class, %params)    = @_;
-  $params{allowed_tags} //= { map { ($_ => ['/']) } qw(b strong i em u ul ol li sub sup s strike br p div) };
+  $params{allowed_tags} //= { map { ($_ => ['/']) } qw(b strong i em u ul ol li sub sup s strike br p div table caption thead tbody tr th td) };
 
   return HTML::Restrict->new(rules => $params{allowed_tags});
 }
diff --git a/SL/Helper/Csv.pm b/SL/Helper/Csv.pm
index 0d471eb09..5da955242 100644
--- a/SL/Helper/Csv.pm
+++ b/SL/Helper/Csv.pm
@@ -315,9 +315,21 @@ sub _make_objects {
   local $::myconfig{numberformat} = $self->numberformat if $self->numberformat;
   local $::myconfig{dateformat}   = $self->dateformat   if $self->dateformat;
 
+  my $line_nr = 0;
   for my $line (@{ $self->_data }) {
-    my $tmp_obj = $self->dispatcher->dispatch($line);
-    push @objs, $tmp_obj;
+    $line_nr++;
+    eval {
+      my $tmp_obj = $self->dispatcher->dispatch($line);
+      push @objs, $tmp_obj;
+      1;
+    } or do {
+      $self->_push_error([
+        $line,
+        0,
+        "making objects failed: $@",
+        0,
+        $line_nr]);
+    };
   }
 
   $self->_objects(\@objs);
@@ -442,14 +454,16 @@ Parse the data into objects and return those.
 
 This method will return an arrayref of all objects.
 
+If an error occurs while making the objects, it is put errors, too.
+
 =item C<get_data>
 
 Returns an arrayref of the raw lines as hashrefs.
 
 =item C<errors>
 
-Return all errors that came up during parsing. See error handling for detailed
-information.
+Return all errors that came up during parsing or making objects.
+See error handling for detailed information.
 
 =back
 
@@ -642,6 +656,9 @@ Note that the last entry can be off, but will give an estimate.
 Error handling is also known to break on new Perl versions and need to be
 adjusted from time to time due to changes in Text::CSV_XS.
 
+If an error occurs while making the objects, it is put into errors, too.
+Here the line is also an estimation.
+
 =head1 CAVEATS
 
 =over 4
diff --git a/SL/Helper/EmailProcessing.pm b/SL/Helper/EmailProcessing.pm
new file mode 100644
index 000000000..64431b994
--- /dev/null
+++ b/SL/Helper/EmailProcessing.pm
@@ -0,0 +1,128 @@
+package SL::Helper::EmailProcessing;
+
+use strict;
+use warnings;
+
+use Carp;
+
+use XML::LibXML;
+
+use SL::ZUGFeRD;
+use SL::Locale::String qw(t8);
+
+use SL::DB::PurchaseInvoice;
+
+sub process_attachments {
+  my ($self, $function_name, $email_journal, %params) = @_;
+
+  my $full_function_name = "process_attachments_$function_name";
+  unless ($self->can($full_function_name)) {
+    croak "Function not implemented for: $function_name";
+  }
+
+  my @processed_files;
+  my @errors;
+  foreach my $attachment (@{$email_journal->attachments_sorted}) {
+    my $attachment_name = $attachment->name;
+    my $error = $self->$full_function_name($email_journal, $attachment, %params);
+    if ($error) {
+      push @errors, "$attachment_name: $error.";
+    } else {
+      push @processed_files, $attachment_name;
+    }
+  }
+  my $extended_status = t8("Processed attachments with function '#1':", $function_name);
+  if (scalar @processed_files) {
+    $extended_status .= "\n" . t8("Processed successfully: ")
+      . join(', ', @processed_files);
+  }
+  if (scalar @errors) {
+    $extended_status .= "\n" . t8("Errors while processing: ")
+      . "\n" . join("\n", @errors);
+  }
+  unless (scalar @processed_files || scalar @errors) {
+    $extended_status .= "\n" . t8("No attachments.");
+  }
+  $email_journal->extended_status(
+    join "\n", $email_journal->extended_status, $extended_status
+  );
+  $email_journal->save;
+  return scalar @processed_files;
+}
+
+sub can_function {
+  my ($self, $function_name) = @_;
+  $self->can("process_attachments_$function_name")
+}
+
+sub process_attachments_zugferd {
+  my ($self, $email_journal, $attachment, %params) = @_;
+
+  my $content = $attachment->content; # scalar ref
+
+  return t8("Not a PDF or XML file") unless $content =~ m/^%PDF|<\?xml/;
+
+  my %res;
+  if ( $content =~ m/^%PDF/ ) {
+    %res = %{SL::ZUGFeRD->extract_from_pdf($content)};
+  } else {
+    %res = %{SL::ZUGFeRD->extract_from_xml($content)};
+  }
+
+  unless ($res{'result'} == SL::ZUGFeRD::RES_OK()) {
+    # my $error = $res{'message'}; # technical error
+    my $error = t8('No vaild Factur-X/ZUGFeRD file');
+    return $error;
+  }
+
+  my $purchase_invoice;
+  eval {
+    $purchase_invoice = SL::DB::PurchaseInvoice->create_from_zugferd_data($res{invoice_xml})->save();
+    1;
+  } or do {
+    my $error = $@;
+    return $error;
+  };
+
+  $self->_add_attachment_to_record($email_journal, $attachment, $purchase_invoice);
+
+  return 0;
+}
+
+sub _add_attachment_to_record {
+  my ($self, $email_journal, $attachment, $record) = @_;
+
+  $attachment->add_file_to_record($record);
+
+  $email_journal->link_to_record($record);
+}
+
+1;
+
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Helper::EmailProcessing - Helper functions for processing email attachments
+
+=head1 SYNOPSIS
+
+This module provides helper functions for processing email attachments.
+
+=head1 METHODS
+
+=head2 process_attachments($function_name, $email_journal, %params)
+
+Processes the attachments of an email journal. The function to be used for processing is determined by the first argument.
+
+=head2 process_attachments_zugferd($function_name, $email_journal, %params)
+
+Processes the attachments of an email journal. If it is a ZUGFeRD Invoiue it creates the PurchaseInvoice and links it to the email_journal.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
+
diff --git a/SL/Helper/ISO3166.pm b/SL/Helper/ISO3166.pm
index 4a7b2452e..fe845041e 100644
--- a/SL/Helper/ISO3166.pm
+++ b/SL/Helper/ISO3166.pm
@@ -11,254 +11,254 @@ use List::Util qw(first);
 
 my @alpha_2_mappings = (
   [ 'AD', qr{^(?:AD|Andorra)$}i ],
-  [ 'AE', qr{^(?:AE|United Arab Emirates)$}i ],
+  [ 'AE', qr{^(?:AE|United Arab Emirates|Vereinigte Arabische Emirate)$}i ],
   [ 'AF', qr{^(?:AF|Afghanistan)$}i ],
-  [ 'AG', qr{^(?:AG|Antigua and Barbuda)$}i ],
+  [ 'AG', qr{^(?:AG|Antigua and Barbuda|Antigua und Barbuda)$}i ],
   [ 'AI', qr{^(?:AI|Anguilla)$}i ],
-  [ 'AL', qr{^(?:AL|Albania)$}i ],
-  [ 'AM', qr{^(?:AM|Armenia)$}i ],
+  [ 'AL', qr{^(?:AL|Albania|Albanien)$}i ],
+  [ 'AM', qr{^(?:AM|Armenia|Armenien)$}i ],
   [ 'AO', qr{^(?:AO|Angola)$}i ],
-  [ 'AQ', qr{^(?:AQ|Antarctica)$}i ],
-  [ 'AR', qr{^(?:AR|Argentina)$}i ],
-  [ 'AS', qr{^(?:AS|American Samoa)$}i ],
+  [ 'AQ', qr{^(?:AQ|Antarctica|Antarktis)$}i ],
+  [ 'AR', qr{^(?:AR|Argentina|Argentinien)$}i ],
+  [ 'AS', qr{^(?:AS|American Samoa|Amerikanisch-Samoa)$}i ],
   [ 'AT', qr{^(?:AT|A|Austria|Österreich)$}i ],
-  [ 'AU', qr{^(?:AU|Australia)$}i ],
+  [ 'AU', qr{^(?:AU|Australia|Australien)$}i ],
   [ 'AW', qr{^(?:AW|Aruba)$}i ],
-  [ 'AX', qr{^(?:AX|Åland Islands)$}i ],
-  [ 'AZ', qr{^(?:AZ|Azerbaijan)$}i ],
-  [ 'BA', qr{^(?:BA|Bosnia and Herzegovina)$}i ],
+  [ 'AX', qr{^(?:AX|Åland Islands|Åland)$}i ],
+  [ 'AZ', qr{^(?:AZ|Azerbaijan|Aserbaidschan)$}i ],
+  [ 'BA', qr{^(?:BA|Bosnia and Herzegovina|Bosnien und Herzegowina)$}i ],
   [ 'BB', qr{^(?:BB|Barbados)$}i ],
-  [ 'BD', qr{^(?:BD|Bangladesh)$}i ],
+  [ 'BD', qr{^(?:BD|Bangladesh|Bangladesch)$}i ],
   [ 'BE', qr{^(?:BE|Belgium|Belgien)$}i ],
   [ 'BF', qr{^(?:BF|Burkina Faso)$}i ],
-  [ 'BG', qr{^(?:BG|Bulgaria)$}i ],
+  [ 'BG', qr{^(?:BG|Bulgaria|Bulgarien)$}i ],
   [ 'BH', qr{^(?:BH|Bahrain)$}i ],
   [ 'BI', qr{^(?:BI|Burundi)$}i ],
   [ 'BJ', qr{^(?:BJ|Benin)$}i ],
-  [ 'BL', qr{^(?:BL|Saint Barthélemy)$}i ],
+  [ 'BL', qr{^(?:BL|Saint Barthélemy|Saint-Barthélemy)$}i ],
   [ 'BM', qr{^(?:BM|Bermuda)$}i ],
-  [ 'BN', qr{^(?:BN|Brunei Darussalam)$}i ],
-  [ 'BO', qr{^(?:BO|Bolivia \(Plurinational State of\))$}i ],
+  [ 'BN', qr{^(?:BN|Brunei Darussalam|Brunei)$}i ],
+  [ 'BO', qr{^(?:BO|Bolivia \(Plurinational State of\)|Bolivien)$}i ],
   [ 'BQ', qr{^(?:BQ|Bonaire, Sint Eustatius and Saba)$}i ],
-  [ 'BR', qr{^(?:BR|Brazil)$}i ],
+  [ 'BR', qr{^(?:BR|Brazil|Brasilien)$}i ],
   [ 'BS', qr{^(?:BS|Bahamas)$}i ],
   [ 'BT', qr{^(?:BT|Bhutan)$}i ],
-  [ 'BV', qr{^(?:BV|Bouvet Island)$}i ],
+  [ 'BV', qr{^(?:BV|Bouvet Island|Bouvetinsel)$}i ],
   [ 'BW', qr{^(?:BW|Botswana)$}i ],
   [ 'BY', qr{^(?:BY|Belarus)$}i ],
   [ 'BZ', qr{^(?:BZ|Belize)$}i ],
-  [ 'CA', qr{^(?:CA|Canada)$}i ],
-  [ 'CC', qr{^(?:CC|Cocos \(Keeling\) Islands|Cocos Islands|Keeling Islands)$}i ],
-  [ 'CD', qr{^(?:CD|Congo, Democratic Republic of the)$}i ],
-  [ 'CF', qr{^(?:CF|Central African Republic)$}i ],
-  [ 'CG', qr{^(?:CG|Congo)$}i ],
+  [ 'CA', qr{^(?:CA|Canada|Kanada)$}i ],
+  [ 'CC', qr{^(?:CC|Cocos \(Keeling\) Islands|Cocos Islands|Keeling Islands|Kokosinseln)$}i ],
+  [ 'CD', qr{^(?:CD|Congo, Democratic Republic of the|Demokratische Republik Kongo)$}i ],
+  [ 'CF', qr{^(?:CF|Central African Republic|Zentralafrikanische Republik)$}i ],
+  [ 'CG', qr{^(?:CG|Congo|Republik Kongo)$}i ],
   [ 'CH', qr{^(?:CH|Switzerland|Schweiz)$}i ],
-  [ 'CI', qr{^(?:CI|Côte d'Ivoire)$}i ],
-  [ 'CK', qr{^(?:CK|Cook Islands)$}i ],
+  [ 'CI', qr{^(?:CI|Côte d'Ivoire|Elfenbeinküste)$}i ],
+  [ 'CK', qr{^(?:CK|Cook Islands|Cookinseln)$}i ],
   [ 'CL', qr{^(?:CL|Chile)$}i ],
-  [ 'CM', qr{^(?:CM|Cameroon)$}i ],
-  [ 'CN', qr{^(?:CN|China)$}i ],
-  [ 'CO', qr{^(?:CO|Colombia)$}i ],
+  [ 'CM', qr{^(?:CM|Cameroon|Kamerun)$}i ],
+  [ 'CN', qr{^(?:CN|China|P\.?\s?R\.?\s?(of )?C\.?(hina)?|Volksrepublik China)$}i ],
+  [ 'CO', qr{^(?:CO|Colombia|Kolumbien)$}i ],
   [ 'CR', qr{^(?:CR|Costa Rica)$}i ],
-  [ 'CU', qr{^(?:CU|Cuba)$}i ],
-  [ 'CV', qr{^(?:CV|Cabo Verde)$}i ],
+  [ 'CU', qr{^(?:CU|Cuba|Kuba)$}i ],
+  [ 'CV', qr{^(?:CV|Cabo Verde|Kap Verde)$}i ],
   [ 'CW', qr{^(?:CW|Curaçao)$}i ],
-  [ 'CX', qr{^(?:CX|Christmas Island)$}i ],
-  [ 'CY', qr{^(?:CY|Cyprus)$}i ],
-  [ 'CZ', qr{^(?:CZ|Czechia)$}i ],
+  [ 'CX', qr{^(?:CX|Christmas Island|Weihnachtsinsel)$}i ],
+  [ 'CY', qr{^(?:CY|Cyprus|Zypern)$}i ],
+  [ 'CZ', qr{^(?:CZ|Czechia|Czech Republic|Tschechien|Tschechische Republik)$}i ],
   [ 'DE', qr{^(?:DE|Germany|D|Deutschland)$}i ],
-  [ 'DJ', qr{^(?:DJ|Djibouti)$}i ],
-  [ 'DK', qr{^(?:DK|Denmark)$}i ],
+  [ 'DJ', qr{^(?:DJ|Djibouti|Dschibuti)$}i ],
+  [ 'DK', qr{^(?:DK|Denmark|Dänemark)$}i ],
   [ 'DM', qr{^(?:DM|Dominica)$}i ],
-  [ 'DO', qr{^(?:DO|Dominican Republic)$}i ],
-  [ 'DZ', qr{^(?:DZ|Algeria)$}i ],
+  [ 'DO', qr{^(?:DO|Dominican Republic|Dominikanische Republik)$}i ],
+  [ 'DZ', qr{^(?:DZ|Algeria|Algerien)$}i ],
   [ 'EC', qr{^(?:EC|Ecuador)$}i ],
-  [ 'EE', qr{^(?:EE|Estonia)$}i ],
-  [ 'EG', qr{^(?:EG|Egypt)$}i ],
-  [ 'EH', qr{^(?:EH|Western Sahara)$}i ],
+  [ 'EE', qr{^(?:EE|Estonia|Estland)$}i ],
+  [ 'EG', qr{^(?:EG|Egypt|Ägypten)$}i ],
+  [ 'EH', qr{^(?:EH|Western Sahara|Westsahara)$}i ],
   [ 'ER', qr{^(?:ER|Eritrea)$}i ],
   [ 'ES', qr{^(?:ES|Spain|Spanien)$}i ],
-  [ 'ET', qr{^(?:ET|Ethiopia)$}i ],
-  [ 'FI', qr{^(?:FI|Finland)$}i ],
-  [ 'FJ', qr{^(?:FJ|Fiji)$}i ],
-  [ 'FK', qr{^(?:FK|Falkland Islands \(Malvinas\)|Falkland Islands|Falklands)$}i ],
-  [ 'FM', qr{^(?:FM|Micronesia \(Federated States of\)|Micronesia)$}i ],
-  [ 'FO', qr{^(?:FO|Faroe Islands)$}i ],
-  [ 'FR', qr{^(?:FR|France)$}i ],
-  [ 'GA', qr{^(?:GA|Gabon)$}i ],
-  [ 'GB', qr{^(?:GB|United Kingdom of Great Britain and Northern Ireland)$}i ],
+  [ 'ET', qr{^(?:ET|Ethiopia|Äthiopien)$}i ],
+  [ 'FI', qr{^(?:FI|Finland|Finnland)$}i ],
+  [ 'FJ', qr{^(?:FJ|Fiji|Fidschi)$}i ],
+  [ 'FK', qr{^(?:FK|Falkland Islands \(Malvinas\)|Falkland Islands|Falklands|Falklandinseln)$}i ],
+  [ 'FM', qr{^(?:FM|Micronesia \(Federated States of\)|Micronesia|Föderierte Staaten von Mikronesien)$}i ],
+  [ 'FO', qr{^(?:FO|Faroe Islands|Färöer)$}i ],
+  [ 'FR', qr{^(?:FR|France|Frankreich)$}i ],
+  [ 'GA', qr{^(?:GA|Gabon|Gabun)$}i ],
+  [ 'GB', qr{^(?:GB|United Kingdom( of Great Britain and Northern Ireland)?|Vereinigtes Königreich)$}i ],
   [ 'GD', qr{^(?:GD|Grenada)$}i ],
-  [ 'GE', qr{^(?:GE|Georgia)$}i ],
-  [ 'GF', qr{^(?:GF|French Guiana)$}i ],
+  [ 'GE', qr{^(?:GE|Georgia|Georgien)$}i ],
+  [ 'GF', qr{^(?:GF|French Guiana|Französisch-Guayana)$}i ],
   [ 'GG', qr{^(?:GG|Guernsey)$}i ],
   [ 'GH', qr{^(?:GH|Ghana)$}i ],
   [ 'GI', qr{^(?:GI|Gibraltar)$}i ],
-  [ 'GL', qr{^(?:GL|Greenland)$}i ],
+  [ 'GL', qr{^(?:GL|Greenland|Grönland)$}i ],
   [ 'GM', qr{^(?:GM|Gambia)$}i ],
   [ 'GN', qr{^(?:GN|Guinea)$}i ],
   [ 'GP', qr{^(?:GP|Guadeloupe)$}i ],
-  [ 'GQ', qr{^(?:GQ|Equatorial Guinea)$}i ],
-  [ 'GR', qr{^(?:GR|Greece)$}i ],
-  [ 'GS', qr{^(?:GS|South Georgia and the South Sandwich Islands)$}i ],
+  [ 'GQ', qr{^(?:GQ|Equatorial Guinea|Äquatorialguinea)$}i ],
+  [ 'GR', qr{^(?:GR|Greece|Griechenland)$}i ],
+  [ 'GS', qr{^(?:GS|South Georgia and the South Sandwich Islands|Südgeorgien und die Südlichen Sandwichinseln)$}i ],
   [ 'GT', qr{^(?:GT|Guatemala)$}i ],
   [ 'GU', qr{^(?:GU|Guam)$}i ],
   [ 'GW', qr{^(?:GW|Guinea-Bissau)$}i ],
   [ 'GY', qr{^(?:GY|Guyana)$}i ],
-  [ 'HK', qr{^(?:HK|Hong Kong)$}i ],
-  [ 'HM', qr{^(?:HM|Heard Island and McDonald Islands)$}i ],
+  [ 'HK', qr{^(?:HK|Hong Kong|Hongkong)$}i ],
+  [ 'HM', qr{^(?:HM|Heard Island and McDonald Islands|Heard und McDonaldinseln)$}i ],
   [ 'HN', qr{^(?:HN|Honduras)$}i ],
-  [ 'HR', qr{^(?:HR|Croatia)$}i ],
+  [ 'HR', qr{^(?:HR|Croatia|Kroatien)$}i ],
   [ 'HT', qr{^(?:HT|Haiti)$}i ],
-  [ 'HU', qr{^(?:HU|Hungary)$}i ],
-  [ 'ID', qr{^(?:ID|Indonesia)$}i ],
-  [ 'IE', qr{^(?:IE|Ireland)$}i ],
+  [ 'HU', qr{^(?:HU|Hungary|Ungarn)$}i ],
+  [ 'ID', qr{^(?:ID|Indonesia|Indonesien)$}i ],
+  [ 'IE', qr{^(?:IE|Ireland|Irland)$}i ],
   [ 'IL', qr{^(?:IL|Israel)$}i ],
   [ 'IM', qr{^(?:IM|Isle of Man)$}i ],
-  [ 'IN', qr{^(?:IN|India)$}i ],
-  [ 'IO', qr{^(?:IO|British Indian Ocean Territory)$}i ],
-  [ 'IQ', qr{^(?:IQ|Iraq)$}i ],
+  [ 'IN', qr{^(?:IN|India|Indien)$}i ],
+  [ 'IO', qr{^(?:IO|British Indian Ocean Territory|Britisches Territorium im Indischen Ozean)$}i ],
+  [ 'IQ', qr{^(?:IQ|Iraq|Irak)$}i ],
   [ 'IR', qr{^(?:IR|Iran \(Islamic Republic of\)|Iran)$}i ],
-  [ 'IS', qr{^(?:IS|Iceland)$}i ],
+  [ 'IS', qr{^(?:IS|Iceland|Island)$}i ],
   [ 'IT', qr{^(?:IT|Italy|Italien)$}i ],
   [ 'JE', qr{^(?:JE|Jersey)$}i ],
-  [ 'JM', qr{^(?:JM|Jamaica)$}i ],
-  [ 'JO', qr{^(?:JO|Jordan)$}i ],
+  [ 'JM', qr{^(?:JM|Jamaica|Jamaika)$}i ],
+  [ 'JO', qr{^(?:JO|Jordan|Jordanien)$}i ],
   [ 'JP', qr{^(?:JP|Japan)$}i ],
-  [ 'KE', qr{^(?:KE|Kenya)$}i ],
-  [ 'KG', qr{^(?:KG|Kyrgyzstan)$}i ],
-  [ 'KH', qr{^(?:KH|Cambodia)$}i ],
+  [ 'KE', qr{^(?:KE|Kenya|Kenia)$}i ],
+  [ 'KG', qr{^(?:KG|Kyrgyzstan|Kirgisistan)$}i ],
+  [ 'KH', qr{^(?:KH|Cambodia|Kambodscha)$}i ],
   [ 'KI', qr{^(?:KI|Kiribati)$}i ],
-  [ 'KM', qr{^(?:KM|Comoros)$}i ],
-  [ 'KN', qr{^(?:KN|Saint Kitts and Nevis)$}i ],
-  [ 'KP', qr{^(?:KP|Korea \(Democratic People's Republic of\))$}i ],
-  [ 'KR', qr{^(?:KR|Korea, Republic of|Republic of Korea|Korea)$}i ],
+  [ 'KM', qr{^(?:KM|Comoros|Komoren)$}i ],
+  [ 'KN', qr{^(?:KN|Saint Kitts and Nevis|St\. Kitts und Nevis)$}i ],
+  [ 'KP', qr{^(?:KP|Korea \(Democratic People's Republic of\)|Nordkorea)$}i ],
+  [ 'KR', qr{^(?:KR|Korea, Republic of|Republic of Korea|Korea|Südkorea)$}i ],
   [ 'KW', qr{^(?:KW|Kuwait)$}i ],
   [ 'KY', qr{^(?:KY|Cayman Islands)$}i ],
-  [ 'KZ', qr{^(?:KZ|Kazakhstan)$}i ],
-  [ 'LA', qr{^(?:LA|Lao People's Democratic Republic)$}i ],
-  [ 'LB', qr{^(?:LB|Lebanon)$}i ],
-  [ 'LC', qr{^(?:LC|Saint Lucia)$}i ],
+  [ 'KZ', qr{^(?:KZ|Kazakhstan|Kasachstan)$}i ],
+  [ 'LA', qr{^(?:LA|Lao People's Democratic Republic|Laos)$}i ],
+  [ 'LB', qr{^(?:LB|Lebanon|Libanon)$}i ],
+  [ 'LC', qr{^(?:LC|Saint Lucia|St\. Lucia)$}i ],
   [ 'LI', qr{^(?:LI|Liechtenstein)$}i ],
   [ 'LK', qr{^(?:LK|Sri Lanka)$}i ],
   [ 'LR', qr{^(?:LR|Liberia)$}i ],
   [ 'LS', qr{^(?:LS|Lesotho)$}i ],
-  [ 'LT', qr{^(?:LT|Lithuania)$}i ],
+  [ 'LT', qr{^(?:LT|Lithuania|Litauen)$}i ],
   [ 'LU', qr{^(?:LU|Luxembourg|Luxemburg)$}i ],
-  [ 'LV', qr{^(?:LV|Latvia)$}i ],
-  [ 'LY', qr{^(?:LY|Libya)$}i ],
-  [ 'MA', qr{^(?:MA|Morocco)$}i ],
+  [ 'LV', qr{^(?:LV|Latvia|Lettland)$}i ],
+  [ 'LY', qr{^(?:LY|Libya|Libyen)$}i ],
+  [ 'MA', qr{^(?:MA|Morocco|Marokko)$}i ],
   [ 'MC', qr{^(?:MC|Monaco)$}i ],
-  [ 'MD', qr{^(?:MD|Moldova, Republic of)$}i ],
+  [ 'MD', qr{^(?:MD|Moldova, Republic of|Moldau)$}i ],
   [ 'ME', qr{^(?:ME|Montenegro)$}i ],
   [ 'MF', qr{^(?:MF|Saint Martin \(French part\)|Saint Martin)$}i ],
-  [ 'MG', qr{^(?:MG|Madagascar)$}i ],
-  [ 'MH', qr{^(?:MH|Marshall Islands)$}i ],
-  [ 'MK', qr{^(?:MK|North Macedonia)$}i ],
+  [ 'MG', qr{^(?:MG|Madagascar|Madagaskar)$}i ],
+  [ 'MH', qr{^(?:MH|Marshall Islands|Marshallinseln)$}i ],
+  [ 'MK', qr{^(?:MK|North Macedonia|Nordmazedonien)$}i ],
   [ 'ML', qr{^(?:ML|Mali)$}i ],
   [ 'MM', qr{^(?:MM|Myanmar)$}i ],
-  [ 'MN', qr{^(?:MN|Mongolia)$}i ],
-  [ 'MO', qr{^(?:MO|Macao)$}i ],
-  [ 'MP', qr{^(?:MP|Northern Mariana Islands)$}i ],
+  [ 'MN', qr{^(?:MN|Mongolia|Mongolei)$}i ],
+  [ 'MO', qr{^(?:MO|Macao|Macau)$}i ],
+  [ 'MP', qr{^(?:MP|Northern Mariana Islands|Nördliche Marianen)$}i ],
   [ 'MQ', qr{^(?:MQ|Martinique)$}i ],
-  [ 'MR', qr{^(?:MR|Mauritania)$}i ],
+  [ 'MR', qr{^(?:MR|Mauritania|Mauretanien)$}i ],
   [ 'MS', qr{^(?:MS|Montserrat)$}i ],
   [ 'MT', qr{^(?:MT|Malta)$}i ],
   [ 'MU', qr{^(?:MU|Mauritius)$}i ],
-  [ 'MV', qr{^(?:MV|Maldives)$}i ],
+  [ 'MV', qr{^(?:MV|Maldives|Malediven)$}i ],
   [ 'MW', qr{^(?:MW|Malawi)$}i ],
-  [ 'MX', qr{^(?:MX|Mexico)$}i ],
+  [ 'MX', qr{^(?:MX|Mexico|Mexiko)$}i ],
   [ 'MY', qr{^(?:MY|Malaysia)$}i ],
-  [ 'MZ', qr{^(?:MZ|Mozambique)$}i ],
+  [ 'MZ', qr{^(?:MZ|Mozambique|Mosambik)$}i ],
   [ 'NA', qr{^(?:NA|Namibia)$}i ],
-  [ 'NC', qr{^(?:NC|New Caledonia)$}i ],
+  [ 'NC', qr{^(?:NC|New Caledonia|Neukaledonien)$}i ],
   [ 'NE', qr{^(?:NE|Niger)$}i ],
-  [ 'NF', qr{^(?:NF|Norfolk Island)$}i ],
+  [ 'NF', qr{^(?:NF|Norfolk Island|Norfolkinsel)$}i ],
   [ 'NG', qr{^(?:NG|Nigeria)$}i ],
   [ 'NI', qr{^(?:NI|Nicaragua)$}i ],
   [ 'NL', qr{^(?:NL|Netherlands|Niederlande)$}i ],
-  [ 'NO', qr{^(?:NO|Norway)$}i ],
+  [ 'NO', qr{^(?:NO|Norway|Norwegen)$}i ],
   [ 'NP', qr{^(?:NP|Nepal)$}i ],
   [ 'NR', qr{^(?:NR|Nauru)$}i ],
   [ 'NU', qr{^(?:NU|Niue)$}i ],
-  [ 'NZ', qr{^(?:NZ|New Zealand)$}i ],
+  [ 'NZ', qr{^(?:NZ|New Zealand|Neuseeland)$}i ],
   [ 'OM', qr{^(?:OM|Oman)$}i ],
   [ 'PA', qr{^(?:PA|Panama)$}i ],
   [ 'PE', qr{^(?:PE|Peru)$}i ],
-  [ 'PF', qr{^(?:PF|French Polynesia)$}i ],
-  [ 'PG', qr{^(?:PG|Papua New Guinea)$}i ],
-  [ 'PH', qr{^(?:PH|Philippines)$}i ],
+  [ 'PF', qr{^(?:PF|French Polynesia|Französisch-Polynesien)$}i ],
+  [ 'PG', qr{^(?:PG|Papua New Guinea|Papua-Neuguinea)$}i ],
+  [ 'PH', qr{^(?:PH|Philippines|Philippinen)$}i ],
   [ 'PK', qr{^(?:PK|Pakistan)$}i ],
-  [ 'PL', qr{^(?:PL|Poland)$}i ],
-  [ 'PM', qr{^(?:PM|Saint Pierre and Miquelon)$}i ],
-  [ 'PN', qr{^(?:PN|Pitcairn)$}i ],
+  [ 'PL', qr{^(?:PL|Poland|Polen)$}i ],
+  [ 'PM', qr{^(?:PM|Saint Pierre and Miquelon|Saint-Pierre und Miquelon)$}i ],
+  [ 'PN', qr{^(?:PN|Pitcairn|Pitcairninseln)$}i ],
   [ 'PR', qr{^(?:PR|Puerto Rico)$}i ],
-  [ 'PS', qr{^(?:PS|Palestine, State of)$}i ],
+  [ 'PS', qr{^(?:PS|Palestine, State of|Palästina)$}i ],
   [ 'PT', qr{^(?:PT|Portugal)$}i ],
   [ 'PW', qr{^(?:PW|Palau)$}i ],
   [ 'PY', qr{^(?:PY|Paraguay)$}i ],
-  [ 'QA', qr{^(?:QA|Qatar)$}i ],
+  [ 'QA', qr{^(?:QA|Qatar|Katar)$}i ],
   [ 'RE', qr{^(?:RE|Réunion)$}i ],
-  [ 'RO', qr{^(?:RO|Romania)$}i ],
-  [ 'RS', qr{^(?:RS|Serbia)$}i ],
-  [ 'RU', qr{^(?:RU|Russian Federation)$}i ],
-  [ 'RW', qr{^(?:RW|Rwanda)$}i ],
-  [ 'SA', qr{^(?:SA|Saudi Arabia)$}i ],
-  [ 'SB', qr{^(?:SB|Solomon Islands)$}i ],
+  [ 'RO', qr{^(?:RO|Romania|Rumänien)$}i ],
+  [ 'RS', qr{^(?:RS|Serbia|Serbien)$}i ],
+  [ 'RU', qr{^(?:RU|Russian Federation|Russia|Russland)$}i ],
+  [ 'RW', qr{^(?:RW|Rwanda|Ruanda)$}i ],
+  [ 'SA', qr{^(?:SA|Saudi Arabia|Saudi-Arabien)$}i ],
+  [ 'SB', qr{^(?:SB|Solomon Islands|Salomonen)$}i ],
   [ 'SC', qr{^(?:SC|Seychelles)$}i ],
   [ 'SD', qr{^(?:SD|Sudan)$}i ],
-  [ 'SE', qr{^(?:SE|Sweden)$}i ],
-  [ 'SG', qr{^(?:SG|Singapore)$}i ],
+  [ 'SE', qr{^(?:SE|Sweden|Schweden)$}i ],
+  [ 'SG', qr{^(?:SG|Singapore|Singapur)$}i ],
   [ 'SH', qr{^(?:SH|Saint Helena, Ascension and Tristan da Cunha)$}i ],
-  [ 'SI', qr{^(?:SI|Slovenia)$}i ],
-  [ 'SJ', qr{^(?:SJ|Svalbard and Jan Mayen)$}i ],
-  [ 'SK', qr{^(?:SK|Slovakia)$}i ],
+  [ 'SI', qr{^(?:SI|Slovenia|Slowenien)$}i ],
+  [ 'SJ', qr{^(?:SJ|Svalbard and Jan Mayen|Spitzbergen und Jan Mayen)$}i ],
+  [ 'SK', qr{^(?:SK|Slovakia|Slowakei)$}i ],
   [ 'SL', qr{^(?:SL|Sierra Leone)$}i ],
   [ 'SM', qr{^(?:SM|San Marino)$}i ],
   [ 'SN', qr{^(?:SN|Senegal)$}i ],
   [ 'SO', qr{^(?:SO|Somalia)$}i ],
   [ 'SR', qr{^(?:SR|Suriname)$}i ],
-  [ 'SS', qr{^(?:SS|South Sudan)$}i ],
-  [ 'ST', qr{^(?:ST|Sao Tome and Principe)$}i ],
+  [ 'SS', qr{^(?:SS|South Sudan|Südsudan)$}i ],
+  [ 'ST', qr{^(?:ST|Sao Tome and Principe|São Tomé und Príncipe)$}i ],
   [ 'SV', qr{^(?:SV|El Salvador)$}i ],
   [ 'SX', qr{^(?:SX|Sint Maarten \(Dutch part\)|Sint Maarten)$}i ],
-  [ 'SY', qr{^(?:SY|Syrian Arab Republic)$}i ],
+  [ 'SY', qr{^(?:SY|Syrian Arab Republic|Syrien)$}i ],
   [ 'SZ', qr{^(?:SZ|Eswatini)$}i ],
-  [ 'TC', qr{^(?:TC|Turks and Caicos Islands)$}i ],
-  [ 'TD', qr{^(?:TD|Chad)$}i ],
-  [ 'TF', qr{^(?:TF|French Southern Territories)$}i ],
+  [ 'TC', qr{^(?:TC|Turks and Caicos Islands|Turks- und Caicosinseln)$}i ],
+  [ 'TD', qr{^(?:TD|Chad|Tschad)$}i ],
+  [ 'TF', qr{^(?:TF|French Southern Territories|Französische Süd- und Antarktisgebiete)$}i ],
   [ 'TG', qr{^(?:TG|Togo)$}i ],
   [ 'TH', qr{^(?:TH|Thailand)$}i ],
-  [ 'TJ', qr{^(?:TJ|Tajikistan)$}i ],
+  [ 'TJ', qr{^(?:TJ|Tajikistan|Tadschikistan)$}i ],
   [ 'TK', qr{^(?:TK|Tokelau)$}i ],
-  [ 'TL', qr{^(?:TL|Timor-Leste)$}i ],
+  [ 'TL', qr{^(?:TL|Timor-Leste|Osttimor)$}i ],
   [ 'TM', qr{^(?:TM|Turkmenistan)$}i ],
-  [ 'TN', qr{^(?:TN|Tunisia)$}i ],
+  [ 'TN', qr{^(?:TN|Tunisia|Tunesien)$}i ],
   [ 'TO', qr{^(?:TO|Tonga)$}i ],
-  [ 'TR', qr{^(?:TR|Turkey)$}i ],
-  [ 'TT', qr{^(?:TT|Trinidad and Tobago)$}i ],
+  [ 'TR', qr{^(?:TR|Turkey|Türkei)$}i ],
+  [ 'TT', qr{^(?:TT|Trinidad and Tobago|Trinidad und Tobago)$}i ],
   [ 'TV', qr{^(?:TV|Tuvalu)$}i ],
-  [ 'TW', qr{^(?:TW|Taiwan, Province of China)$}i ],
-  [ 'TZ', qr{^(?:TZ|Tanzania, United Republic of)$}i ],
+  [ 'TW', qr{^(?:TW|Taiwan, Province of China|Taiwan)$}i ],
+  [ 'TZ', qr{^(?:TZ|Tanzania, United Republic of|Tansania)$}i ],
   [ 'UA', qr{^(?:UA|Ukraine)$}i ],
   [ 'UG', qr{^(?:UG|Uganda)$}i ],
   [ 'UM', qr{^(?:UM|United States Minor Outlying Islands)$}i ],
-  [ 'US', qr{^(?:US|United States of America)$}i ],
+  [ 'US', qr{^(?:US|United States of America|Vereinigte Staaten|U\.?\s?S\.?\s?A\.?)$}i ],
   [ 'UY', qr{^(?:UY|Uruguay)$}i ],
-  [ 'UZ', qr{^(?:UZ|Uzbekistan)$}i ],
-  [ 'VA', qr{^(?:VA|Holy See)$}i ],
-  [ 'VC', qr{^(?:VC|Saint Vincent and the Grenadines)$}i ],
+  [ 'UZ', qr{^(?:UZ|Uzbekistan|Usbekistan)$}i ],
+  [ 'VA', qr{^(?:VA|Holy See|Vatikanstadt)$}i ],
+  [ 'VC', qr{^(?:VC|Saint Vincent and the Grenadines|St\. Vincent und die Grenadinen)$}i ],
   [ 'VE', qr{^(?:VE|Venezuela \(Bolivian Republic of\)|Venezuela)$}i ],
-  [ 'VG', qr{^(?:VG|Virgin Islands \(British\))$}i ],
-  [ 'VI', qr{^(?:VI|Virgin Islands \(U\.?S\.?\))$}i ],
-  [ 'VN', qr{^(?:VN|Viet Nam)$}i ],
+  [ 'VG', qr{^(?:VG|Virgin Islands \(British\)|Britische Jungferninseln)$}i ],
+  [ 'VI', qr{^(?:VI|Virgin Islands \(U\.?S\.?\)|Amerikanische Jungferninseln)$}i ],
+  [ 'VN', qr{^(?:VN|Viet Nam|Vietnam)$}i ],
   [ 'VU', qr{^(?:VU|Vanuatu)$}i ],
-  [ 'WF', qr{^(?:WF|Wallis and Futuna)$}i ],
+  [ 'WF', qr{^(?:WF|Wallis and Futuna|Wallis und Futuna)$}i ],
   [ 'WS', qr{^(?:WS|Samoa)$}i ],
-  [ 'YE', qr{^(?:YE|Yemen)$}i ],
+  [ 'YE', qr{^(?:YE|Yemen|Jemen)$}i ],
   [ 'YT', qr{^(?:YT|Mayotte)$}i ],
-  [ 'ZA', qr{^(?:ZA|South Africa)$}i ],
-  [ 'ZM', qr{^(?:ZM|Zambia)$}i ],
-  [ 'ZW', qr{^(?:ZW|Zimbabwe)$}i ],
+  [ 'ZA', qr{^(?:ZA|South Africa|Südafrika)$}i ],
+  [ 'ZM', qr{^(?:ZM|Zambia|Sambia)$}i ],
+  [ 'ZW', qr{^(?:ZW|Zimbabwe|Simbabwe)$}i ],
 );
 
 sub map_name_to_alpha_2_code {
diff --git a/SL/Helper/Inventory.pm b/SL/Helper/Inventory.pm
index 944a41019..88a64ebbc 100644
--- a/SL/Helper/Inventory.pm
+++ b/SL/Helper/Inventory.pm
@@ -6,8 +6,9 @@ use DateTime;
 use Exporter qw(import);
 use List::Util qw(min sum);
 use List::UtilsBy qw(sort_by);
-use List::MoreUtils qw(any);
+use List::MoreUtils qw(any none);
 use POSIX qw(ceil);
+use Scalar::Util qw(blessed);
 
 use SL::Locale::String qw(t8);
 use SL::MoreCommon qw(listify);
@@ -17,7 +18,7 @@ use SL::Helper::Number qw(_format_number _round_number);
 use SL::Helper::Inventory::Allocation;
 use SL::X;
 
-our @EXPORT_OK = qw(get_stock get_onhand allocate allocate_for_assembly produce_assembly check_constraints);
+our @EXPORT_OK = qw(get_stock get_onhand allocate allocate_for_assembly produce_assembly check_constraints check_allocations_for_assembly);
 our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
 sub _get_stock_onhand {
@@ -196,9 +197,12 @@ sub allocate {
     last if $rest_qty == 0;
   }
   if ($rest_qty > 0) {
-    die SL::X::Inventory::Allocation->new(
-      code    => 'not enough to allocate',
-      message => t8("can not allocate #1 units of #2, missing #3 units", _format_number($qty), $part->displayable_name, _format_number($rest_qty)),
+    die SL::X::Inventory::Allocation::MissingQty->new(
+      code             => 'not enough to allocate',
+      message          => t8("can not allocate #1 units of #2, missing #3 units", _format_number($qty), $part->displayable_name, _format_number($rest_qty)),
+      part_description => $part->displayable_name,
+      to_allocate_qty  => $qty,
+      missing_qty      => $rest_qty,
     );
   } else {
     if ($params{constraints}) {
@@ -228,20 +232,41 @@ sub allocate_for_assembly {
     $parts_to_allocate{ $assembly->part->id } += $assembly->qty * $qty;
   }
 
-  my @allocations;
+  my (@allocations, @errors);
 
   for my $part_id (keys %parts_to_allocate) {
     my $part = SL::DB::Part->load_cached($part_id);
-    push @allocations, allocate(%params, part => $part, qty => $parts_to_allocate{$part_id});
-    if ($wh_strict) {
-      die SL::X::Inventory::Allocation->new(
-        code    => "wrong warehouse for part",
-        message => t8('Part #1 exists in warehouse #2, but not in warehouse #3 ',
-                        $part->partnumber . ' ' . $part->description,
-                        SL::DB::Manager::Warehouse->find_by(id => $allocations[-1]->{warehouse_id})->description,
-                        $wh->description),
-      ) unless $allocations[-1]->{warehouse_id} == $wh->id;
-    }
+
+    eval {
+      push @allocations, allocate(%params, part => $part, qty => $parts_to_allocate{$part_id});
+      if ($wh_strict) {
+        die SL::X::Inventory::Allocation->new(
+          code    => "wrong warehouse for part",
+          message => t8('Part #1 exists in warehouse #2, but not in warehouse #3 ',
+                          $part->partnumber . ' ' . $part->description,
+                          SL::DB::Manager::Warehouse->find_by(id => $allocations[-1]->{warehouse_id})->description,
+                          $wh->description),
+        ) unless $allocations[-1]->{warehouse_id} == $wh->id;
+      }
+      1;
+    } or do {
+      my $ex = $@;
+      die $ex unless blessed($ex) && $ex->can('rethrow');
+
+      if ($ex->isa('SL::X::Inventory::Allocation')) {
+        push @errors, $@;
+      } else {
+        $ex->rethrow;
+      }
+    };
+  }
+
+  if (@errors) {
+    die SL::X::Inventory::Allocation::Multi->new(
+      code    => "multiple errors during allocation",
+      message => "multiple errors during allocation",
+      errors  => \@errors,
+    );
   }
 
   @allocations;
@@ -303,6 +328,8 @@ sub produce_assembly {
 
   my $allocations = $params{allocations};
   my $strict_wh = $::instance_conf->get_produce_assembly_same_warehouse ? $bin->warehouse : undef;
+  my $consume_service = $::instance_conf->get_produce_assembly_transfer_service;
+
   if ($params{auto_allocate}) {
     Carp::croak("produce_assembly: can't have both allocations and auto_allocate") if $params{allocations};
     $allocations = [ allocate_for_assembly(part => $part, qty => $qty, warehouse => $strict_wh, chargenumber => $params{chargenumber}) ];
@@ -327,15 +354,10 @@ sub produce_assembly {
 
   # check whether allocations are sane
   if (!$params{no_check_allocations} && !$params{auto_allocate}) {
-    my %allocations_by_part = map { $_->parts_id  => $_->qty } @$allocations;
-    for my $assembly ($part->assemblies) {
-      $allocations_by_part{ $assembly->parts_id } -= $assembly->qty * $qty;
-    }
-
     die SL::X::Inventory::Allocation->new(
       code    => "allocations are insufficient for production",
       message => t8('can not allocate enough resources for production'),
-    ) if any { $_ < 0 } values %allocations_by_part;
+    ) if !check_allocations_for_assembly(part => $part, qty => $qty, allocations => $allocations);
   }
 
   my @transfers;
@@ -378,6 +400,96 @@ sub produce_assembly {
   @transfers;
 }
 
+sub check_allocations_for_assembly {
+  my (%params) = @_;
+
+  my $part = $params{part} or Carp::croak('check_allocations_for_assembly needs a part');
+  my $qty  = $params{qty}  or Carp::croak('check_allocations_for_assembly needs a qty');
+
+  my $check_overfulfilment = !!$params{check_overfulfilment};
+  my $allocations          = $params{allocations};
+
+  my $consume_service      = $::instance_conf->get_produce_assembly_transfer_service;
+
+  my %allocations_by_part;
+  for (@{ $allocations || []}) {
+    $allocations_by_part{$_->parts_id} //= 0;
+    $allocations_by_part{$_->parts_id}  += $_->qty;
+  }
+
+  for my $assembly ($part->assemblies) {
+    next if $assembly->part->type eq 'service' && !$consume_service;
+    $allocations_by_part{ $assembly->parts_id } -= $assembly->qty * $qty;
+  }
+
+  return (none { $_ < 0 } values %allocations_by_part) && (!$check_overfulfilment || (none { $_ > 0 } values %allocations_by_part));
+}
+
+sub check_stock_out_transfer_requests {
+  my (%params) = @_;
+
+  my $transfer_requests = $params{transfer_requests} or Carp::croak('check_stock_out_transfer_requests needs transfer_requests');
+  my $default_transfer = $params{default_transfer} || 0;
+
+  my $grouped_qtys; # part_id -> bin_id -> chargenumber -> bestbefore -> qty;
+  my %part_ids;
+  my %bin_ids;
+  my %chargenumbers;
+  foreach my $request (@$transfer_requests) {
+    $grouped_qtys
+      ->{$request->parts_id}
+      ->{$request->bin_id}
+      ->{$request->chargenumber}
+      ->{$request->bestbefore} += -$request->qty; # qty is negative
+    $bin_ids{$request->bin_id} = 1;
+    $chargenumbers{$request->chargenumber} = 1;
+  }
+
+  my $stocks = get_stock(
+    by => [qw(part bin chargenumber bestbefore)],
+    part => [keys %$grouped_qtys],
+    bin  => [keys %bin_ids],
+    chargenumber => [keys %chargenumbers],
+  );
+
+  # make stock searchable
+  my $available_qty;
+  foreach my $stock (@$stocks) {
+    $available_qty
+      ->{$stock->{parts_id}}
+      ->{$stock->{bin_id}}
+      ->{$stock->{chargenumber}}
+      ->{DateTime->from_kivitendo($stock->{bestbefore}) || undef} = $stock->{qty};
+  }
+
+  my @missing_qtys;
+  foreach my $p_id (keys %{$grouped_qtys}) {
+    foreach my $b_id (keys %{$grouped_qtys->{$p_id}}) {
+      next if $default_transfer
+           && $::instance_conf->get_transfer_default_ignore_onhand
+           && $::instance_conf->get_bin_id_ignore_onhand eq $b_id;
+      foreach my $cn (keys %{$grouped_qtys->{$p_id}->{$b_id}}) {
+        foreach my $bb (keys %{$grouped_qtys->{$p_id}->{$b_id}->{$cn}}) {
+          my $available_stock = $available_qty->{$p_id}->{$b_id}->{$cn}->{$bb};
+          if ($available_stock < $grouped_qtys->{$p_id}->{$b_id}->{$cn}->{$bb}) {
+            my $part = SL::DB::Manager::Part->find_by(id => $p_id);
+            my $bin  = SL::DB::Manager::Bin->find_by(id => $b_id);
+            push @missing_qtys, {
+              missing_qty  => $grouped_qtys->{$p_id}->{$b_id}->{$cn}->{$bb} - $available_stock,
+              part         => $part,
+              bin          => $bin,
+              chargenumber => $cn,
+              bestbefore   => $bb
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return @missing_qtys;
+}
+
 sub default_show_bestbefore {
   $::instance_conf->get_show_bestbefore
 }
@@ -434,12 +546,13 @@ SL::WH - Warehouse and Inventory API
 
   # create allocation manually, bypassing checks. all of these need to be passed, even undefs
   my $allocation = SL::Helper::Inventory::Allocation->new(
-    part_id           => $part->id,
+    parts_id          => $part->id,
     qty               => 15,
     bin_id            => $bin_obj->id,
     warehouse_id      => $bin_obj->warehouse_id,
     chargenumber      => '1823772365',
     bestbefore        => undef,
+    comment           => undef,
     for_object_id     => $order->id,
   );
 
@@ -627,6 +740,56 @@ compute the required amount for each assembly part and allocate all of them.
 
 =item * produce_assembly
 
+=item * check_allocations_for_assembly PARAMS
+
+Checks if enough quantity is allocated for production. Returns a trueish
+value if there is enough allocated, a falsish one otherwise (but see the
+parameter C<check_overfulfilment>).
+
+Accepted parameters:
+
+=over 4
+
+=item * part
+
+The part object to be assembled. Mandatory.
+
+=item * qty
+
+The quantity of the part to be assembled. Mandatory.
+
+=item * allocations
+
+An array ref of the allocations.
+
+=item * check_overfulfilment
+
+Whether or not overfulfilment should be checked. If more quantity is allocated
+than needed for production a falsish value is returned. Optional.
+
+=back
+
+=item * check_stock_out_transfer_requests PARAMS
+
+Checks if enough stock is availbale for the transfer requests. Returns a list
+of missing quantities as hashref with the keys C<part>, C<bin>, C<missing_qty>, C<chargenumber>
+and C<bestbefore>. C<chargenumber> and C<bestbefore> can be C<undef> if not set
+in the transfer requests. 
+
+Accepted parameters:
+
+=over 4
+
+=item * transfer_requests
+
+Transfer requests to stock out as arrayref. Mandatory.
+
+=item * default_transfer
+
+Has to be trueish if the transfer requests are for a delivery order called with
+'Transfer out via default'. Optional, Default 0.
+
+=back
 
 =back
 
@@ -703,6 +866,8 @@ each of the following attributes to be set at creation time:
 
 =item * bestbefore
 
+=item * comment
+
 =item * for_object_id
 
 If set the allocations will be marked as allocated for the given object.
diff --git a/SL/Helper/Inventory/Allocation.pm b/SL/Helper/Inventory/Allocation.pm
index e406bf40c..cf4b31a0d 100644
--- a/SL/Helper/Inventory/Allocation.pm
+++ b/SL/Helper/Inventory/Allocation.pm
@@ -48,12 +48,13 @@ SL::Helper::Inventory::Allocation - Inventory API allocation data structure
 
   # all of these need to be present
   my $allocation = SL::Helper::Inventory::Allocation->new(
-    part_id           => $part->id,
+    parts_id          => $part->id,
     qty               => 15,
     bin_id            => $bin_obj->id,
     warehouse_id      => $bin_obj->warehouse_id,
     chargenumber      => '1823772365',           # can be undef
     bestbefore        => undef,                  # can be undef
+    comment           => undef,                  # can be undef
     for_object_id     => $order->id,             # can be undef
   );
 
diff --git a/SL/Helper/PrintOptions.pm b/SL/Helper/PrintOptions.pm
index 9108a224e..eab17294b 100644
--- a/SL/Helper/PrintOptions.pm
+++ b/SL/Helper/PrintOptions.pm
@@ -50,8 +50,14 @@ sub get_print_options {
       opthash("purchase_order",      $form->{PD}{purchase_order},      $locale->text('Purchase Order')),
       opthash("bin_list",            $form->{PD}{bin_list},            $locale->text('Bin List'))
     ) : undef,
+    ($form->{type} eq 'purchase_order_confirmation') ? (
+      opthash("purchase_order_confirmation", $form->{PD}{purchase_order}, $locale->text('Purchase Order Confirmation')),
+    ) : undef,
     ($form->{type} eq 'credit_note') ?
       opthash("credit_note",         $form->{PD}{credit_note},         $locale->text('Credit Note')) : undef,
+    ($form->{type} eq 'sales_order_intake') ? (
+      opthash("sales_order_intake",  $form->{PD}{sales_order_intake},  $locale->text('Sales Order Intake')),
+    ) : undef,
     ($form->{type} eq 'sales_order') ? (
       opthash("sales_order",         $form->{PD}{sales_order},         $locale->text('Confirmation')),
       opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
@@ -61,14 +67,17 @@ sub get_print_options {
       opthash('sales_quotation',     $form->{PD}{sales_quotation},     $locale->text('Quotation')) : undef,
     ($form->{type} =~ /request_quotation$/) ?
       opthash('request_quotation',   $form->{PD}{request_quotation},   $locale->text('Request for Quotation')) : undef,
-    ($form->{type} eq 'invoice') ? (
+    ($form->{type} eq 'purchase_quotation_intake') ? (
+      opthash("purchase_quotation_intake", $form->{PD}{purchase_quotation_intake},  $locale->text('Purchase Quotation Intake')),
+    ) : undef,
+    ($form->{type} eq 'invoice' && $form->{storno} && $form->{storno_id}) ? (
+      opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
+    ) : undef,
+    ($form->{type} eq 'invoice' && !($form->{storno} && $form->{storno_id})) ? (
       opthash("invoice",             $form->{PD}{invoice},             $locale->text('Invoice')),
       opthash("proforma",            $form->{PD}{proforma},            $locale->text('Proforma Invoice')),
       opthash("invoice_copy",        $form->{PD}{invoice_copy},        $locale->text('Invoice Copy')),
     ) : undef,
-    ($form->{type} eq 'invoice' && $form->{storno}) ? (
-      opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
-    ) : undef,
     ($form->{type} eq 'invoice_for_advance_payment') ? (
       opthash("invoice_for_advance_payment", $form->{PD}{invoice_for_advance_payment},      $locale->text('Invoice for Advance Payment')),
     ) : undef,
@@ -78,10 +87,16 @@ sub get_print_options {
     ($form->{type} =~ /^supplier_delivery_order$/) ? (
       opthash('supplier_delivery_order', $form->{PD}{supplier_delivery_order},  $locale->text('Supplier Delivery Order')),
     ) : undef,
+    ($form->{type} =~ /^rma_delivery_order$/) ? (
+      opthash('rma_delivery_order', $form->{PD}{rma_delivery_order},  $locale->text('RMA Delivery Order')),
+    ) : undef,
     ($form->{type} =~ /(sales|purchase)_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
       opthash('pick_list',           $form->{PD}{pick_list},           $locale->text('Pick List')),
     ) : undef,
+    ($form->{type} =~ /_reclamation$/) ? (
+      opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Reclamation')),
+    ) : undef,
     ($form->{type} =~ /^letter$/) ? (
       opthash('letter',              $form->{PD}{letter},              $locale->text('Letter')),
     ) : undef;
@@ -101,9 +116,9 @@ sub get_print_options {
         if ($form->{media} ne 'email');
 
   push @FORMAT, grep $_,
-    ($::lx_office_conf{print_templates}->{opendocument} &&     $::lx_office_conf{applications}->{openofficeorg_writer}  &&     $::lx_office_conf{applications}->{xvfb}
-                                                        && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
-     && !$options->{no_opendocument_pdf}) ?
+    ($::lx_office_conf{print_templates}->{opendocument} &&     $::lx_office_conf{applications}->{openofficeorg_writer}
+                                                        && (-x $::lx_office_conf{applications}->{openofficeorg_writer})
+                                                        && !$options->{no_opendocument_pdf}) ?
       opthash("opendocument_pdf",    $form->{DF}{"opendocument_pdf"},  $locale->text("PDF (OpenDocument/OASIS)")) : undef,
     ($::lx_office_conf{print_templates}->{latex}) ?
       opthash("pdf",                 $form->{DF}{pdf},                 $locale->text('PDF')) : undef,
diff --git a/SL/Helper/QrBill.pm b/SL/Helper/QrBill.pm
index c448eb28b..713d2a20b 100644
--- a/SL/Helper/QrBill.pm
+++ b/SL/Helper/QrBill.pm
@@ -1,16 +1,24 @@
+# This module consists of helper methods for generating Swiss
+# billing QR-Code.
 package SL::Helper::QrBill;
 
 use strict;
 use warnings;
 
-use Imager;
-use Imager::QRCode;
+use File::Spec ();
+use Imager ();
+use Imager::QRCode ();
+
+our $VERSION = '0.02';
 
 my %Config = (
-  cross_file => 'image/CH-Kreuz_7mm.png',
+  img_dir    => 'image',
+  cross_file => 'CH-Kreuz_7mm.png',
   out_file   => 'out.png',
 );
 
+# Validate data, populate structures and return a
+# SL::Helper::QrBill object.
 sub new {
   my $class = shift;
 
@@ -22,9 +30,20 @@ sub new {
   return $self;
 }
 
+# Populate the data structures with data received by the
+# constructor.
 sub _init {
   my $self = shift;
-  my ($biller_information, $biller_data, $payment_information, $invoice_recipient_data, $ref_nr_data) = @_;
+  my ($biller_information, $biller_data, $payment_information, $invoice_recipient_data, $ref_nr_data, $additional_information) = @_;
+
+  my $address = sub {
+    my ($href) = @_;
+    my $address_type = $href->{address_type};
+    return ((map $href->{$_}, qw(address_row1 address_row2)), '', '')
+      if $address_type eq 'K';
+    return  (map $href->{$_}, qw(street street_no postalcode city))
+      if $address_type eq 'S';
+  };
 
   $self->{data}{header} = [
     'SPC',  # QRType
@@ -37,10 +56,7 @@ sub _init {
   $self->{data}{biller_data} = [
     $biller_data->{address_type},
     $biller_data->{company},
-    $biller_data->{address_row1},
-    $biller_data->{address_row2},
-    '',
-    '',
+    $address->($biller_data),
     $biller_data->{countrycode},
   ];
   $self->{data}{payment_information} = [
@@ -50,10 +66,7 @@ sub _init {
   $self->{data}{invoice_recipient_data} = [
     $invoice_recipient_data->{address_type},
     $invoice_recipient_data->{name},
-    $invoice_recipient_data->{address_row1},
-    $invoice_recipient_data->{address_row2},
-    '',
-    '',
+    $address->($invoice_recipient_data),
     $invoice_recipient_data->{countrycode},
   ];
   $self->{data}{ref_nr_data} = [
@@ -61,51 +74,142 @@ sub _init {
     $ref_nr_data->{ref_number},
   ];
   $self->{data}{additional_information} = [
-    '',
+    $additional_information->{unstructured_message},
     'EPD', # End Payment Data
   ];
 }
 
+# Return the regular expressions used for validating data.
+sub _get_regexes {
+  return (
+    'biller information' => [
+      [ 'iban', qr{^(?:CH|LI)[0-9a-zA-Z]{19}$} ],
+    ],
+    'biller data' => [
+      [ 'address_type', qr{^[KS]$}     ],
+      [ 'company',      qr{^.{1,70}$}  ],
+      [ 'address_row1', qr{^.{0,70}$}  ], # combined (K)
+      [ 'address_row2', qr{^.{0,70}$}  ], # "
+      [ 'street',       qr{^.{0,70}$}  ], # structured (S)
+      [ 'street_no',    qr{^.{0,16}$}  ], # "
+      [ 'postalcode',   qr{^.{0,16}$}  ], # "
+      [ 'city',         qr{^.{0,35}$}  ], # "
+      [ 'countrycode',  qr{^[A-Z]{2}$} ],
+    ],
+    'payment information' => [
+      [ 'amount',   qr{^(?:(?:0|[1-9][0-9]{0,8})\.[0-9]{2})?$} ],
+      [ 'currency', qr{^(?:CHF|EUR)$}                          ],
+    ],
+    'invoice recipient data' => [
+      [ 'address_type', qr{^[KS]$}     ],
+      [ 'name',         qr{^.{1,70}$}  ],
+      [ 'address_row1', qr{^.{0,70}$}  ], # combined (K)
+      [ 'address_row2', qr{^.{0,70}$}  ], # "
+      [ 'street',       qr{^.{0,70}$}  ], # structured (S)
+      [ 'street_no',    qr{^.{0,16}$}  ], # "
+      [ 'postalcode',   qr{^.{0,16}$}  ], # "
+      [ 'city',         qr{^.{0,35}$}  ], # "
+      [ 'countrycode',  qr{^[A-Z]{2}$} ],
+    ],
+    'reference number data' => [
+      [ 'type', qr{^(?:QRR|NON)$} ],
+    ],
+    'additional information' => [
+      [ 'unstructured_message', qr{^.{0,140}$} ],
+    ],
+    additional => {
+      'ref_nr'  => {
+        QRR => qr{^\d{27}$},
+        NON => qr{^$},
+      },
+      'qr_iban' => qr{^.{4}3[01][0-9]{3}.{12}$},
+    },
+  );
+}
+
+# Validate the data with regular expressions and exit ungracefully
+# if conditions are not matched.
 sub _init_check {
   my $self = shift;
-  my ($biller_information, $biller_data, $payment_information, $invoice_recipient_data, $ref_nr_data) = @_;
+  my ($biller_information, $biller_data, $payment_information, $invoice_recipient_data, $ref_nr_data, $additional_information) = @_;
 
   my $check_re = sub {
     my ($group, $href, $elem, $regex) = @_;
-    defined $href->{$elem} && $href->{$elem} =~ $regex
-      or die "field '$elem' in group '$group' not valid", "\n";
+    my $error = undef;
+    if (!exists $href->{$elem}) {
+      $error = 'does not exist';
+    } elsif (!defined $href->{$elem}) {
+      $error = 'is not defined';
+    } elsif ($href->{$elem} !~ $regex) {
+      $error = 'is not valid';
+    }
+    die "field '$elem' in group '$group' $error", "\n" if defined $error;
   };
 
+  my %regexes = _get_regexes();
+
   my $group = 'biller information';
-  $check_re->($group, $biller_information, 'iban', qr{^(?:CH|LI)[0-9a-zA-Z]{19}$});
+  foreach my $re (@{$regexes{$group}}) {
+    $check_re->($group, $biller_information, @$re);
+  }
 
   $group = 'biller data';
-  $check_re->($group, $biller_data, 'address_type', qr{^[KS]$});
-  $check_re->($group, $biller_data, 'company', qr{^.{1,70}$});
-  $check_re->($group, $biller_data, 'address_row1', qr{^.{0,70}$});
-  $check_re->($group, $biller_data, 'address_row2', qr{^.{0,70}$});
-  $check_re->($group, $biller_data, 'countrycode', qr{^[A-Z]{2}$});
+  foreach my $re (grep $_->[0] =~ /^(?:address_type|company)$/, @{$regexes{$group}}) {
+    $check_re->($group, $biller_data, @$re);
+  }
+  if ($biller_data->{address_type} eq 'K') {
+    foreach my $re (grep $_->[0] =~ /^address_row[12]$/, @{$regexes{$group}}) {
+      $check_re->($group, $biller_data, @$re);
+    }
+  } elsif ($biller_data->{address_type} eq 'S') {
+    foreach my $re (grep $_->[0] =~ /^(?:street(?:_no)?|postalcode|city)$/, @{$regexes{$group}}) {
+      $check_re->($group, $biller_data, @$re);
+    }
+  }
+  foreach my $re (grep $_->[0] =~ /^countrycode$/, @{$regexes{$group}}) {
+    $check_re->($group, $biller_data, @$re);
+  }
 
   $group = 'payment information';
-  $check_re->($group, $payment_information, 'amount', qr{^(?:(?:0|[1-9][0-9]{0,8})\.[0-9]{2})?$});
-  $check_re->($group, $payment_information, 'currency', qr{^(?:CHF|EUR)$});
+  foreach my $re (@{$regexes{$group}}) {
+    $check_re->($group, $payment_information, @$re);
+  }
 
   $group = 'invoice recipient data';
-  $check_re->($group, $invoice_recipient_data, 'address_type', qr{^[KS]$});
-  $check_re->($group, $invoice_recipient_data, 'name', qr{^.{1,70}$});
-  $check_re->($group, $invoice_recipient_data, 'address_row1', qr{^.{0,70}$});
-  $check_re->($group, $invoice_recipient_data, 'address_row2', qr{^.{0,70}$});
-  $check_re->($group, $invoice_recipient_data, 'countrycode', qr{^[A-Z]{2}$});
+  foreach my $re (grep $_->[0] =~ /^(?:address_type|name)$/, @{$regexes{$group}}) {
+    $check_re->($group, $invoice_recipient_data, @$re);
+  }
+  if ($invoice_recipient_data->{address_type} eq 'K') {
+    foreach my $re (grep $_->[0] =~ /^address_row[12]$/, @{$regexes{$group}}) {
+      $check_re->($group, $invoice_recipient_data, @$re);
+    }
+  } elsif ($invoice_recipient_data->{address_type} eq 'S') {
+    foreach my $re (grep $_->[0] =~ /^(?:street(?:_no)?|postalcode|city)$/, @{$regexes{$group}}) {
+      $check_re->($group, $invoice_recipient_data, @$re);
+    }
+  }
+  foreach my $re (grep $_->[0] =~ /^countrycode$/, @{$regexes{$group}}) {
+    $check_re->($group, $invoice_recipient_data, @$re);
+  }
 
   $group = 'reference number data';
-  my %ref_nr_regexes = (
-    QRR => qr{^\d{27}$},
-    NON => qr{^$},
-  );
-  $check_re->($group, $ref_nr_data, 'type', qr{^(?:QRR|SCOR|NON)$});
-  $check_re->($group, $ref_nr_data, 'ref_number', $ref_nr_regexes{$ref_nr_data->{type}});
+  foreach my $re (@{$regexes{$group}}) {
+    $check_re->($group, $ref_nr_data, @$re);
+  }
+  $check_re->($group, $ref_nr_data, 'ref_number', $regexes{additional}->{ref_nr}{$ref_nr_data->{type}});
+
+  $group = 'biller information';
+  if ($ref_nr_data->{type} eq 'QRR') {
+    $check_re->($group, $biller_information, 'iban', $regexes{additional}->{qr_iban});
+  }
+
+  $group = 'additional information';
+  foreach my $re (@{$regexes{$group}}) {
+    $check_re->($group, $additional_information, @$re);
+  }
 }
 
+# Generate the QR-Code image by calling internal methods.
 sub generate {
   my $self = shift;
   my $out_file = $_[0] // $Config{out_file};
@@ -118,6 +222,7 @@ sub generate {
   $self->_write($out_file);
 }
 
+# Return a new Imager::QRCode object.
 sub _qrcode {
   my $self = shift;
 
@@ -128,15 +233,17 @@ sub _qrcode {
   );
 }
 
+# Read the cross file and scale the resulting image.
 sub _cross {
   my $self = shift;
 
   my $cross = Imager->new();
-  $cross->read(file => $Config{cross_file}) or die $cross->errstr, "\n";
+  $cross->read(file => File::Spec->catfile(@Config{qw(img_dir cross_file)})) or die $cross->errstr, "\n";
 
   return $cross->scale(xpixels => 35, ypixels => 35, qtype => 'mixing');
 }
 
+# Order and modify the structured data, form the text and plot it.
 sub _plot {
   my $self = shift;
 
@@ -163,6 +270,7 @@ sub _plot {
   return $self->{qrcode}->plot($text);
 }
 
+# Paste cross image onto the middle of the QR-Code image.
 sub _paste {
   my $self = shift;
 
@@ -173,6 +281,7 @@ sub _paste {
   );
 }
 
+# Write the QR-Code image to a file.
 sub _write {
   my $self = shift;
   my ($out_file) = @_;
@@ -188,7 +297,7 @@ __END__
 
 =head1 NAME
 
-SL::Helper::QrBill - Helper methods for generating Swiss QR-Code
+SL::Helper::QrBill - Helper methods for generating Swiss billing QR-Code
 
 =head1 SYNOPSIS
 
@@ -201,6 +310,7 @@ SL::Helper::QrBill - Helper methods for generating Swiss QR-Code
          \%payment_information,
          \%invoice_recipient_data,
          \%ref_nr_data,
+         \%additional_information,
        );
        $qr_image->generate($out_file);
      } or do {
@@ -210,13 +320,13 @@ SL::Helper::QrBill - Helper methods for generating Swiss QR-Code
 
 =head1 DESCRIPTION
 
-This module generates the Swiss QR-Code with data provided to the constructor.
+This module generates the Swiss billing QR-Code with data provided to the constructor.
 
 =head1 METHODS
 
 =head2 C<new>
 
-Creates a new object. Expects five references to hashes as arguments.
+Creates a new object. Expects six references to hashes as arguments.
 
 The hashes are structured as follows:
 
@@ -237,13 +347,15 @@ country code.
 
 =item C<%biller_data>
 
-Fields: address_type, company, address_row1, address_row2 and countrycode.
+Fields (mandatory): address_type, company and countrycode.
+Fields (combined): address_row1 and address_row2.
+Fields (structured): street, street_no, postalcode and city.
 
 =over 4
 
 =item C<address_type>
 
-Fixed length; 1-digit, alphanumerical. 'K' implemented only.
+Fixed length; 1-digit, alphanumerical.
 
 =item C<company>
 
@@ -251,11 +363,27 @@ Maximum of 70 characters, name (surname allowable) or company.
 
 =item C<address_row1>
 
-Maximum of 70 characters, street/nr.
+Maximum of 70 characters, street/no.
 
 =item C<address_row2>
 
-Maximum of 70 characters, postal code/place.
+Maximum of 70 characters, postal code/city.
+
+=item C<street>
+
+Maximum of 70 characters, street.
+
+=item C<street_no>
+
+Maximum of 16 characters, street no.
+
+=item C<postalcode>
+
+Maximum of 16 characters, postal code.
+
+=item C<city>
+
+Maximum of 35 characters, city.
 
 =item C<countrycode>
 
@@ -282,13 +410,15 @@ CHF/EUR.
 
 =item C<%invoice_recipient_data>
 
-Fields: address_type, name, address_row1, address_row2 and countrycode.
+Fields (mandatory): address_type, name and countrycode.
+Fields (combined): address_row1 and address_row2.
+Fields (structured): street, street_no, postalcode and city.
 
 =over 4
 
 =item C<address_type>
 
-Fixed length; 1-digit, alphanumerical. 'K' implemented only.
+Fixed length; 1-digit, alphanumerical.
 
 =item C<name>
 
@@ -296,11 +426,27 @@ Maximum of 70 characters, name (surname allowable) or company.
 
 =item C<address_row1>
 
-Maximum of 70 characters, street/nr.
+Maximum of 70 characters, street/no.
 
 =item C<address_row2>
 
-Maximum of 70 characters, postal code/place.
+Maximum of 70 characters, postal code/city.
+
+=item C<street>
+
+Maximum of 70 characters, street.
+
+=item C<street_no>
+
+Maximum of 16 characters, street no.
+
+=item C<postalcode>
+
+Maximum of 16 characters, postal code.
+
+=item C<city>
+
+Maximum of 35 characters, city.
 
 =item C<countrycode>
 
@@ -316,7 +462,7 @@ Fields: type and ref_number.
 
 =item C<type>
 
-Maximum of 4 characters, alphanumerical. QRR/SCOR/NON.
+Maximum of 4 characters, alphanumerical. QRR/NON.
 
 =item C<ref_number>
 
@@ -324,6 +470,18 @@ QR-Reference: 27 characters, numerical; without Reference: empty.
 
 =back
 
+=item C<%additional_information>
+
+Fields: unstructured_message.
+
+=over 4
+
+=item C<unstructured_message>
+
+Maximum of 140 characters, unstructured message.
+
+=back
+
 =back
 
 =head2 C<generate>
@@ -331,6 +489,11 @@ QR-Reference: 27 characters, numerical; without Reference: empty.
 Generates the QR-Code image. Accepts filename of image as argument.
 Defaults to C<out.png>.
 
+=head1 TESTS
+
+Tests may be invoked by executing C<t/test.pl t/helper/qrbill.t>
+within the root directory of the repository.
+
 =head1 AUTHOR
 
 Steven Schubiger E<lt>stsc@refcnt.orgE<gt>
diff --git a/SL/Helper/QrBillFunctions.pm b/SL/Helper/QrBillFunctions.pm
new file mode 100644
index 000000000..3d37a28bb
--- /dev/null
+++ b/SL/Helper/QrBillFunctions.pm
@@ -0,0 +1,341 @@
+package SL::Helper::QrBillFunctions;
+
+use List::Util qw(first);
+
+use SL::Util qw(trim);
+
+use strict;
+use warnings;
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(
+  get_street_name_from_address_line
+  get_building_number_from_address_line
+  get_postal_code_from_address_line
+  get_town_name_from_address_line
+  get_qrbill_account
+  assemble_ref_number
+  get_ref_number_formatted
+  get_iban_formatted
+  get_amount_formatted
+);
+
+use constant {
+  REGEX_STREET_NAME_FROM_ADDRESS_LINE     => qr{^([^\d]+)\s*},
+  REGEX_BUILDING_NUMBER_FROM_ADDRESS_LINE => qr{(\d+.*)},
+  REGEX_POSTAL_CODE_FROM_ADDRESS_LINE     => qr{^(\d+).*$},
+  REGEX_TOWN_FROM_ADDRESS_LINE            => qr{^\d+\s(.*)$},
+};
+
+sub get_street_name_from_address_line {
+  my $address_line = $_[0];
+
+  my ($street_name) = $address_line =~ REGEX_STREET_NAME_FROM_ADDRESS_LINE;
+
+  return trim($street_name) // '';
+}
+
+sub get_building_number_from_address_line {
+  my $address_line = $_[0];
+
+  my ($building_number) = $address_line =~ REGEX_BUILDING_NUMBER_FROM_ADDRESS_LINE;
+
+  return trim($building_number) // '';
+}
+
+sub get_postal_code_from_address_line {
+  my $address_line = $_[0];
+
+  my ($postal_code) = $address_line =~ REGEX_POSTAL_CODE_FROM_ADDRESS_LINE;
+
+  return trim($postal_code) // '';
+}
+
+sub get_town_name_from_address_line {
+  my $address_line = $_[0];
+
+  my ($town_name) = $address_line =~ REGEX_TOWN_FROM_ADDRESS_LINE;
+
+  return trim($town_name) // '';
+}
+
+sub get_qrbill_account {
+  $main::lxdebug->enter_sub();
+
+  my $qr_account;
+
+  my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted;
+
+  $qr_account = first { $_->use_for_qrbill } @{ $bank_accounts };
+
+  if (!$qr_account) {
+    return undef, $::locale->text('No bank account flagged for QRBill usage was found.');
+  }
+
+  $main::lxdebug->leave_sub();
+  return $qr_account, undef;
+}
+
+sub assemble_ref_number {
+  $main::lxdebug->enter_sub();
+
+  my $bank_id = $_[0];
+  my $customer_number = $_[1];
+  my $invoice_number = $_[2] // "0";
+
+  # check values (analog to checks in makro)
+  # - bank_id
+  #     in-/output: a string containing a 6 digit number
+  if (!($bank_id =~ /^\d*$/) || length($bank_id) != 6) {
+    return undef, $::locale->text('Bank account id number invalid. Must be 6 digits.');
+  }
+
+  # - customer_number
+  #     input: a string containing up to 6 digits [0-9]
+  #     output: non-digits removed, 6 digits, filled with leading zeros
+  $customer_number = remove_non_digits($customer_number);
+  if (!check_digits_and_max_length($customer_number, 6)) {
+    return undef, $::locale->text('Customer number invalid. Must be less then or equal to 6 digits after non-digits removed.');
+  }
+  # fill with zeros
+  $customer_number = sprintf "%06d", $customer_number;
+
+  # - invoice_number
+  #     input: a string containing up to 14 digits, may be zero
+  #     output: non-digits removed, 14 digits, filled with leading zeros
+  $invoice_number = remove_non_digits($invoice_number);
+  if (!check_digits_and_max_length($invoice_number, 14)) {
+    return undef, $::locale->text('Invoice number invalid. Must be less then or equal to 14 digits after non-digits removed.');
+  }
+  # fill with zeros
+  $invoice_number = sprintf "%014d", $invoice_number;
+
+  # assemble ref. number
+  my $ref_number = $bank_id . $customer_number . $invoice_number;
+
+  # calculate check digit
+  my $ref_number_cpl = $ref_number . calculate_check_digit($ref_number);
+
+  $main::lxdebug->leave_sub();
+  return $ref_number_cpl, undef;
+}
+
+sub get_ref_number_formatted {
+  $main::lxdebug->enter_sub();
+
+  my $ref_number = $_[0];
+
+  # create ref. number in format:
+  # 'XX XXXXX XXXXX XXXXX XXXXX XXXXX' (2 digits + 5 x 5 digits)
+  my $ref_number_spaced = substr($ref_number, 0, 2) . ' ' .
+                          substr($ref_number, 2, 5) . ' ' .
+                          substr($ref_number, 7, 5) . ' ' .
+                          substr($ref_number, 12, 5) . ' ' .
+                          substr($ref_number, 17, 5) . ' ' .
+                          substr($ref_number, 22, 5);
+
+  $main::lxdebug->leave_sub();
+  return $ref_number_spaced;
+}
+
+sub get_iban_formatted {
+  $main::lxdebug->enter_sub();
+
+  my $iban = $_[0];
+
+  # create iban number in format:
+  # 'XXXX XXXX XXXX XXXX XXXX X' (5 x 4 + 1digits)
+  my $iban_spaced = substr($iban, 0, 4) . ' ' .
+                    substr($iban, 4, 4) . ' ' .
+                    substr($iban, 8, 4) . ' ' .
+                    substr($iban, 12, 4) . ' ' .
+                    substr($iban, 16, 4) . ' ' .
+                    substr($iban, 20, 1);
+
+  $main::lxdebug->leave_sub();
+  return $iban_spaced;
+}
+
+sub get_amount_formatted {
+  $main::lxdebug->enter_sub();
+
+  my $amount = $_[0];
+
+  # parameter should be a string containing a number
+  # with 2 digits after the pointi'm also getting in the town
+  unless ($amount =~ /^\d+\.\d{2}$/) {
+    return undef;
+  }
+
+  my $r = reverse $amount;
+  # this matches the digits left of the '.'
+  $r =~ m/^\d{2}\./g;
+  # '\G' continuous the search where the last stopped,
+  # matches three digits and substitutes with a space
+  $r =~ s/\G(\d{3})(?=\d)/$1 /g;
+  $r = reverse $r;
+
+  $main::lxdebug->leave_sub();
+  return $r;
+}
+
+### internal functions
+
+sub remove_non_digits {
+  my $s = $_[0];
+  $s =~ s/[^0-9]//g;
+  return $s;
+}
+
+sub check_digits_and_max_length {
+  my $s = $_[0];
+  my $length = $_[1];
+
+  return 0 if (!($s =~ /^\d*$/) || length($s) > $length);
+  return 1;
+}
+
+sub calculate_check_digit {
+  # calculate ESR check digit using algorithm: "modulo 10, recursive"
+  my $ref_number_str = $_[0];
+
+  my @m = (0, 9, 4, 6, 8, 2, 7, 1, 3, 5);
+  my $carry = 0;
+
+  my @ref_number_split = map int($_), split(//, $ref_number_str);
+
+  for my $v (@ref_number_split) {
+    $carry = @m[($carry + $v) % 10];
+  }
+
+  return (10 - $carry) % 10;
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Helper::QrBillFunctions - Additional helper functions for the swiss QR bill
+
+=head1 SYNOPSIS
+
+  use SL::Helper::QrBillFunctions qw(get_qrbill_account assemble_ref_number
+    get_ref_number_formatted get_iban_formatted get_amount_formatted);
+
+  # get qr-account data
+  my ($qr_account, $error) = get_qrbill_account();
+
+  my ($ref_number, $error) = assemble_ref_number(
+    $qr_account->{'bank_account_id'},
+    $form->{'customernumber'},
+    $form->{'invnumber'},
+  );
+
+  # get ref. number/iban formatted with spaces and set into form for template
+  # processing
+  $form->{'ref_number_formatted'} = get_ref_number_formatted($ref_number);
+  $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'});
+
+  # format amount for template
+  my $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'}));
+  my $amount_formatted = get_amount_formatted($amount);
+
+=head1 DESCRIPTION
+
+Helper functions moved from SL::Template::OpenDocument.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<get_street_name_from_address_line>
+
+Returns the street name from a combined street name and number.
+
+=item C<get_street_number_from_address_line>
+
+Returns the street number from a combined street name and number.
+
+=item C<get_postal_code_from_address_line>
+
+Returns the postal code from an combined postal code and town.
+
+=item C<get_town_name_from_address_line>
+
+Returns the town name from an combined postal code and town.
+
+=item C<get_qrbill_account>
+
+Return the bank account flagged for the QR bill. And a string containing an
+error message as second return value or undef if no error occurred.
+
+=item C<assemble_ref_number>
+
+Assembles and returns the Swiss reference number. 27 digits, formed
+from the parameters plus one check digit. And a string containing an error
+message as second return value or undef if no error occurred.
+
+Non-digits will be removed and remaining numbers filled up with leading zeros.
+
+Parameters:
+
+=over 4
+
+=item C<bank_id>
+
+"Bankkonto Identifikationsnummer". A string containing a 6 digit number.
+
+=item C<customer_number>
+
+Kivitendo customer number. A string containing up to 6 digits.
+
+=item C<invoice_number>
+
+Kivitendo invoice number. A string containing up to 14 digits, may be zero.
+
+=back
+
+=item C<get_ref_number_formatted>
+
+Given a reference number, return it in format:
+
+'XX XXXXX XXXXX XXXXX XXXXX XXXXX' (2 digits + 5 x 5 digits)
+
+=item C<get_iban_formatted>
+
+Given a IBAN number, return it in format:
+
+'XXXX XXXX XXXX XXXX XXXX X' (5 x 4 + 1digits)
+
+=item C<get_amount_formatted>
+
+Given an amount, return it in format: 'X XXX.XX'
+Or undef if an error occurred.
+
+=back
+
+=head1 ERROR HANDLING
+
+The functions C<get_qrbill_account> and C<assemble_ref_number> return
+undef when an error occurs and a string containing an error message as
+second return value.
+
+The function C<get_amount_formatted> returns undef if an error occurred.
+
+The other functions always return a result.
+
+=head1 TESTS
+
+Tests for functions see t/helper/qrbill_functions.t.
+
+Run: C<t/test.pl t/helper/qrbill_functions.t>
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@gmx.chE<gt>
+
+=cut
diff --git a/SL/Helper/QrBillParser.pm b/SL/Helper/QrBillParser.pm
new file mode 100644
index 000000000..3e6d8740d
--- /dev/null
+++ b/SL/Helper/QrBillParser.pm
@@ -0,0 +1,530 @@
+package SL::Helper::QrBillParser;
+
+use strict;
+use warnings;
+
+use SL::Helper::QrBillFunctions qw(
+  get_street_name_from_address_line
+  get_building_number_from_address_line
+  get_postal_code_from_address_line
+  get_town_name_from_address_line
+);
+
+use Rose::Object::MakeMethods::Generic(
+  scalar                  => [ qw(is_valid error raw_data) ],
+  'scalar --get_set_init' => [ qw(spec) ],
+);
+
+our $VERSION = '0.01';
+
+use constant {
+  REGEX_QRTYPE               => qr{^SPC$},
+  REGEX_VERSION              => qr{^0200$},
+  REGEX_CODING               => qr{^1$},
+  REGEX_IBAN                 => qr{^(?:CH|LI)[0-9a-zA-Z]{19}$},
+  REGEX_ADDRESS_TYPE         => qr{^[KS]$},
+  REGEX_NAME                 => qr{^.{1,70}$},
+  REGEX_ADDRESS_LINE         => qr{^.{0,70}$},
+  REGEX_POSTAL_CODE          => qr{^.{0,16}$},
+  REGEX_TOWN                 => qr{^.{0,35}$},
+  REGEX_COUNTRY              => qr{^[A-Za-z]{2}$},
+  REGEX_AMOUNT               => qr{^(?:(?:0|[1-9][0-9]{0,8})\.[0-9]{2})?$},
+  REGEX_CURRENCY             => qr{^(?:CHF|EUR)$},
+  REGEX_REFERENCE_TYPE       => qr{^(?:QRR|SCOR|NON)$},
+  REGEX_REFERENCE            => qr{^.{0,27}$},
+  REGEX_UNSTRUCTURED_MESSAGE => qr{^.{0,140}$},
+  REGEX_TRAILER              => qr{^EPD$},
+  REGEX_BILL_INFORMATION     => qr{^.{0,140}$},
+  REGEX_ALTERNATIVE_SCHEME_PARAMETER      => qr{^.{0,100}$},
+};
+
+sub new {
+  my $class = shift;
+
+  my $self = bless {}, $class;
+
+  $self->init(@_);
+
+  return $self;
+}
+
+sub init {
+  my $self = shift;
+  my ($qrtext) = @_;
+
+  my @lines = split /(?:\n|\r\n)/, $qrtext;
+
+  $self->is_valid(1);
+  $self->error('');
+  $self->raw_data($qrtext);
+
+  for my $section ( @{$self->spec} ) {
+    for my $field ( @{$section->{fields}} ) {
+      my $value = $lines[$field->{line_number}];
+
+      if (!test_value($value, $field->{test}, $field->{status})) {
+        $self->error("Test failed: Section: '$section->{section}' Field: '$field->{name}' Value: '$value'");
+        $self->is_valid(0);
+        last;
+      }
+
+      $self->{$section->{section}} = {} if (!$self->{$section->{section}});
+      $self->{$section->{section}}->{$field->{name}} = $value;
+    }
+    last if $self->error;
+  }
+}
+
+sub get_creditor_field {
+  my $self = shift;
+  my ($structured_field, $extract_field, $extract_fn) = @_;
+
+  if ($self->{creditor}->{address_type} eq 'S') {
+    return $self->{creditor}->{$structured_field};
+  }
+  # extract
+  my $r = $extract_fn->($self->{creditor}->{$extract_field});
+
+  return $r // '';
+}
+
+sub get_creditor_street_name {
+  return shift->get_creditor_field(
+    'street_or_address_line_1',
+    'street_or_address_line_1',
+    \&get_street_name_from_address_line
+  );
+}
+
+sub get_creditor_building_number {
+  return shift->get_creditor_field(
+    'building_number_or_address_line_2',
+    'street_or_address_line_1',
+    \&get_building_number_from_address_line
+  );
+}
+
+sub get_creditor_post_code {
+  return shift->get_creditor_field(
+    'postal_code',
+    'building_number_or_address_line_2',
+    \&get_postal_code_from_address_line
+  );
+}
+
+sub get_creditor_town_name {
+  return shift->get_creditor_field(
+    'town',
+    'building_number_or_address_line_2',
+    \&get_town_name_from_address_line
+  );
+}
+
+sub init_spec {
+  [
+    {
+      section => 'header',
+      fields  => [
+        {
+          name        => 'qrtype',
+          line_number => 0,
+          test        => REGEX_QRTYPE,
+          status      => 'M'
+        },
+        {
+          name        => 'version',
+          line_number => 1,
+          test        => REGEX_VERSION,
+          status      => 'M'
+        },
+        {
+          name        => 'coding',
+          line_number => 2,
+          test        => REGEX_CODING,
+          status      => 'M'
+        }
+      ]
+    },
+    {
+      section => 'creditor_information',
+      fields  => [
+        {
+          name        => 'iban',
+          line_number => 3,
+          test        => REGEX_IBAN,
+          status      => 'M'
+        }
+      ]
+    },
+    {
+      section => 'creditor',
+      fields  => [
+        {
+          name        => 'address_type',
+          line_number => 4,
+          test        => REGEX_ADDRESS_TYPE,
+          status      => 'M',
+        },
+        {
+          name        => 'name',
+          line_number => 5,
+          test        => REGEX_NAME,
+          status      => 'M',
+        },
+        {
+          name        => 'street_or_address_line_1',
+          line_number => 6,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'O'
+        },
+        {
+          name        => 'building_number_or_address_line_2',
+          line_number => 7,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'O'
+        },
+        {
+          name        => 'postal_code',
+          line_number => 8,
+          test        => REGEX_POSTAL_CODE,
+          status      => 'D'
+        },
+        {
+          name        => 'town',
+          line_number => 9,
+          test        => REGEX_TOWN,
+          status      => 'D'
+        },
+        {
+          name        => 'country',
+          line_number => 10,
+          test        => REGEX_COUNTRY,
+          status      => 'M'
+        }
+      ]
+    },
+    {
+      section => 'ultimate_creditor',
+      fields  => [
+        {
+          name        => 'address_type',
+          line_number => 11,
+          test        => REGEX_ADDRESS_TYPE,
+          status      => 'X'
+        },
+        {
+          name        => 'name',
+          line_number => 12,
+          test        => REGEX_NAME,
+          status      => 'X'
+        },
+        {
+          name        => 'street_or_address_line_1',
+          line_number => 13,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'X'
+        },
+        {
+          name        => 'building_number_or_address_line_2',
+          line_number => 14,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'X'
+        },
+        {
+          name        => 'postal_code',
+          line_number => 15,
+          test        => REGEX_POSTAL_CODE,
+          status      => 'X'
+        },
+        {
+          name        => 'town',
+          line_number => 16,
+          test        => REGEX_TOWN,
+          status      => 'X'
+        },
+        {
+          name        => 'country',
+          line_number => 17,
+          test        => REGEX_COUNTRY,
+          status      => 'X'
+        }
+      ]
+    },
+    {
+      section => 'payment_amount_information',
+      fields  => [
+        {
+          name        => 'amount',
+          line_number => 18,
+          test        => REGEX_AMOUNT,
+          status      => 'O'
+        },
+        {
+          name        => 'currency',
+          line_number => 19,
+          test        => REGEX_CURRENCY,
+          status      => 'M'
+        }
+      ]
+    },
+    {
+      section => 'ultimate_debtor',
+      fields  => [
+        {
+          name        => 'address_type',
+          line_number => 20,
+          test        => REGEX_ADDRESS_TYPE,
+          status      => 'D'
+        },
+        {
+          name        => 'name',
+          line_number => 21,
+          test        => REGEX_NAME,
+          status      => 'D'
+        },
+        {
+          name        => 'street_or_address_line_1',
+          line_number => 22,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'O'
+        },
+        {
+          name        => 'building_number_or_address_line_2',
+          line_number => 23,
+          test        => REGEX_ADDRESS_LINE,
+          status      => 'O'
+        },
+        {
+          name        => 'postal_code',
+          line_number => 24,
+          test        => REGEX_POSTAL_CODE,
+          status      => 'D'
+        },
+        {
+          name        => 'town',
+          line_number => 25,
+          test        => REGEX_TOWN,
+          status      => 'D'
+        },
+        {
+          name        => 'country',
+          line_number => 26,
+          test        => REGEX_COUNTRY,
+          status      => 'D'
+        }
+      ]
+    },
+    {
+      section => 'payment_reference',
+      fields  => [
+        {
+          name        => 'reference_type',
+          line_number => 27,
+          test        => REGEX_REFERENCE_TYPE,
+          status      => 'M'
+        },
+        {
+          name        => 'reference',
+          line_number => 28,
+          test        => REGEX_REFERENCE,
+          status      => 'D'
+        }
+      ]
+    },
+    {
+      section => 'additional_information',
+      fields  => [
+        {
+          name        => 'unstructured_message',
+          line_number => 29,
+          test        => REGEX_UNSTRUCTURED_MESSAGE,
+          status      => 'O'
+        },
+        {
+          name        => 'trailer',
+          line_number => 30,
+          test        => REGEX_TRAILER,
+          status      => 'M'
+        },
+        {
+          name        => 'bill_information',
+          line_number => 31,
+          test        => REGEX_BILL_INFORMATION,
+          status      => 'A'
+        }
+      ]
+    },
+    {
+      section => 'alternative_scheme',
+      fields  => [
+        {
+          name        => 'alternative_scheme_parameter1',
+          line_number => 32,
+          test        => REGEX_ALTERNATIVE_SCHEME_PARAMETER,
+          status      => 'A'
+        },
+        {
+          name        => 'alternative_scheme_parameter2',
+          line_number => 33,
+          test        => REGEX_ALTERNATIVE_SCHEME_PARAMETER,
+          status      => 'A'
+        }
+      ]
+    }
+  ];
+}
+
+### helper
+
+sub test_value {
+  my ($value, $test, $status) = @_;
+
+  # mandatory fields must have a content
+  return 0 if $status eq 'M' && length $value <= 0;
+
+  # optional fields can be empty
+  return 1 if $status eq 'O' && length $value == 0;
+
+  # dependent fields can be empty
+  return 1 if $status eq 'D' && length $value == 0;
+
+  # "do not fill" fields cannot have a content
+  if ($status eq 'X') {
+    return 1 if ($value eq '');
+    return 0;
+  }
+
+  # additional fields can be undefined
+  if ($status eq 'A') {
+    return 1 if !defined($value);
+    return 0 if $value !~ $test;
+    return 1;
+  }
+
+  return 0 if !defined($value);
+  return 0 if $value !~ $test;
+  return 1;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Helper::QrBillParser - Helper for parsing QR bill data
+
+=head1 SYNOPSIS
+
+  use SL::Helper::QrBillParser;
+
+  my $qr_obj = SL::Helper::QrBillParser->new($item->{qrbill_data});
+
+  my $valid = $qr_obj->is_valid;
+  my $error_message = $qr_obj->error;
+  my $qrtext = $qr_obj->raw_data;
+
+  # data for remittance information
+  my $reference = $qr_obj->{payment_reference}->{reference};
+  my $unstructured_message = $qr_obj->{additional_information}->{unstructured_message}
+
+  # set currency and amount
+  my $currency = $qr_obj->{payment_amount_information}->{currency};
+  my $amount = $qr_obj->{payment_amount_information}->{amount}
+
+  # set creditor name and address from qr data
+  my $creditor_name = $qr_obj->{creditor}->{name};
+  my $creditor_street_name = $qr_obj->get_creditor_street_name;
+  my $creditor_building_number = $qr_obj->get_creditor_building_number;
+  my $creditor_postal_code = $qr_obj->get_creditor_post_code;
+  my $creditor_town_name = $qr_obj->get_creditor_town_name;
+  my $creditor_country = $qr_obj->{creditor}->{country}
+
+  # set creditor iban
+  my $creditor_iban = $qr_obj->{creditor_information}->{iban};
+
+=head1 DESCRIPTION
+
+This is simple helper to parse swiss qr bill data from a string into an object.
+
+Some methods are provided to easily retrieve the creditor address data.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<new>
+
+  my $qr_obj = SL::Helper::QrBillParser->new($item->{qrbill_data});
+
+Creates a new object from the qr bill data string.
+
+=item C<is_valid>
+
+  my $valid = $qr_obj->is_valid;
+
+Returns true if the qr bill data is valid.
+
+=item C<error>
+
+  my $error_message = $qr_obj->error;
+
+Returns the error message if the qr bill data is invalid.
+
+=item C<raw_data>
+
+  my $qrtext = $qr_obj->raw_data;
+
+Returns the raw qr bill data string.
+
+=item C<get_creditor_street_name>
+
+  my $creditor_street_name = $qr_obj->get_creditor_street_name;
+
+Returns the creditor street name.
+
+=item C<get_creditor_building_number>
+
+  my $creditor_building_number = $qr_obj->get_creditor_building_number;
+
+Returns the creditor building number.
+
+=item C<get_creditor_post_code>
+
+  my $creditor_postal_code = $qr_obj->get_creditor_post_code;
+
+Returns the creditor postal code.
+
+=item C<get_creditor_town_name>
+
+  my $creditor_town_name = $qr_obj->get_creditor_town_name;
+
+Returns the creditor town name.
+
+=back
+
+=head1 TESTS
+
+Tests for functions see t/helper/qrbill_parser.t.
+
+Run: C<t/test.pl t/helper/qrbill_parser.t>
+
+=head1 LIMITATIONS
+
+Basic validation is performed based on the status code and regular expressions.
+However complete checks of dependent fields would require more elaborate logic.
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+Steven Schubiger E<lt>stsc@refcnt.orgE<gt>
+
+=cut
diff --git a/SL/Helper/UNECERecommendation20.pm b/SL/Helper/UNECERecommendation20.pm
index e79991cb6..5c5e0647b 100644
--- a/SL/Helper/UNECERecommendation20.pm
+++ b/SL/Helper/UNECERecommendation20.pm
@@ -24,6 +24,7 @@ my @mappings = (
   [ 'MIN', qr{^min(?:ute)?$}i ],
   [ 'HUR', qr{^(?:h(?:our)?|std(?:unde)?)$}i ],
   [ 'DAY', qr{^(?:day|tag)$}i ],
+  [ 'WEE', qr{^(?:week|woche)$}i ],
   [ 'MON', qr{^mon(?:th|at|atlich)?$}i ],
   [ 'QAN', qr{^quart(?:er|al|alsweise)?$}i ],
   [ 'ANN', qr{^(?:yearly|annually|jährlich|Jahr)?$}i ],
@@ -38,6 +39,17 @@ my @mappings = (
   [ 'MLT', qr{^(?:ml|milli *liter|milli *litre)$}i ],
   [ 'LTR', qr{^(?:l|liter|litre)$}i ],
 
+  # digital information
+  [ 'C37', qr{^(?:kbit|kilobit?)$}i ],
+  [ 'D36', qr{^(?:mbit|megabit?)$}i ],
+  [ 'B68', qr{^(?:gbit|gigabit?)$}i ],
+  [ 'AD', qr{^(?:b|byte)$}i ],
+  [ '2P', qr{^(?:kb|kilobyte)$}i ],
+  [ '4L', qr{^(?:mb|megabyte)$}i ],
+  [ 'E34', qr{^(?:gb|gigabyte)$}i ],
+  [ 'E35', qr{^(?:tb|terabyte)$}i ],
+  [ 'E36', qr{^(?:pb|petabyte)$}i ],
+  
   # miscellaneous
   [ 'C62', qr{^(?:stck|stück|pieces?|pc|psch|pauschal|licenses?|lizenz(?:en)?)$}i ],
 );
diff --git a/SL/Helper/UserPreferences.pm b/SL/Helper/UserPreferences.pm
index 2e5f127dc..75debacee 100644
--- a/SL/Helper/UserPreferences.pm
+++ b/SL/Helper/UserPreferences.pm
@@ -139,7 +139,7 @@ sub _update {
 
 ### defaults stuff
 
-sub init_login             { SL::DB::Manager::Employee->current->login    }
+sub init_login             { $::myconfig{login}                           }
 sub init_namespace         { ref $_[0]                                    }
 sub init_upgrade_callbacks { +{}                                          }
 sub init_current_version   { version->parse((ref $_[0])->VERSION)->numify }
diff --git a/SL/Helper/UserPreferences/DisplayPreferences.pm b/SL/Helper/UserPreferences/DisplayPreferences.pm
index f3bcae381..68b81cfee 100644
--- a/SL/Helper/UserPreferences/DisplayPreferences.pm
+++ b/SL/Helper/UserPreferences/DisplayPreferences.pm
@@ -17,6 +17,27 @@ sub store_longdescription_dialog_size_percentage {
   $_[0]->user_prefs->store('longdescription_dialog_size_percentage', $_[1]);
 }
 
+sub get_layout_style {
+  my $value   = $_[0]->user_prefs->get('layout_style');
+  $value    //= $::instance_conf->get_layout_style;
+  return $value;
+}
+
+sub store_layout_style {
+  my ($self, $style) = @_;
+
+  if (!$style) {
+    $self->user_prefs->delete('layout_style');
+    return;
+  }
+
+  if ( !($style eq 'desktop' || $style eq 'mobile' || $style eq 'auto') ) {
+    die "unknown layout style '$style'";
+  }
+
+  $self->user_prefs->store('layout_style', $style);
+}
+
 sub init_user_prefs {
   SL::Helper::UserPreferences->new(
     namespace => $_[0]->namespace,
@@ -45,16 +66,31 @@ to store user settings for various display settings.
   use SL::Helper::UserPreferences::DisplayPreferences;
   my $prefs = SL::Helper::UserPreferences::DisplayPreferences->new();
 
-  $prefs->store_use_duration(1);
+  $prefs->store_longdescription_dialog_size_percentage(25);
   my $value = $prefs->get_longdescription_dialog_size_percentage;
 
 =head1 DESCRIPTION
 
 This module manages storing the user's choise for settings for
 various display settings.
-For now the preferred procentual size of the edit-dialog for longdescriptions
+
+=head2 These settings are supported:
+
+=over 4
+
+=item longdescription_dialog_size_percentage
+
+The preferred procentual size of the edit-dialog for longdescriptions
 of positions can be stored.
 
+=item layout_style
+
+Here the layout style can be forced to be 'desktop' or 'mobile'
+regardless of the user agend string. If this user setting is unset
+then the setting from the client configuration will be used.
+
+=back
+
 =head1 BUGS
 
 None yet :)
diff --git a/SL/Helper/UserPreferences/ItemInputPosition.pm b/SL/Helper/UserPreferences/ItemInputPosition.pm
new file mode 100644
index 000000000..dea4ebe04
--- /dev/null
+++ b/SL/Helper/UserPreferences/ItemInputPosition.pm
@@ -0,0 +1,86 @@
+package SL::Helper::UserPreferences::ItemInputPosition;
+
+use strict;
+use parent qw(Rose::Object);
+
+use Carp;
+use List::MoreUtils qw(none);
+
+use SL::Helper::UserPreferences;
+
+use Rose::Object::MakeMethods::Generic (
+  'scalar --get_set_init' => [ qw(user_prefs) ],
+);
+
+sub get_order_item_input_position {
+  $_[0]->user_prefs->get('order_item_input_position')
+}
+
+sub store_order_item_input_position {
+  my ($self, $value) = @_;
+
+  if ($value eq 'default') {
+    $self->user_prefs->delete('order_item_input_position');
+  } else {
+    $self->user_prefs->store('order_item_input_position', $value);
+  }
+}
+
+sub init_user_prefs {
+  SL::Helper::UserPreferences->new(
+    namespace => $_[0]->namespace,
+  )
+}
+
+# read only stuff
+sub namespace     { 'ItemInputPosition' }
+sub version       { 1 }
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Helper::UserPreferences::ItemInputPosition - preferences intended
+to store user settings for the behavior of the item input in record masks
+
+=head1 SYNOPSIS
+
+  use SL::Helper::UserPreferences::ItemInputPosition;
+  my $prefs = SL::Helper::UserPreferences::ItemInputPosition->new();
+
+  $prefs->store_order_item_input_position(1);
+  my $value = $prefs->get_order_item_input_position;
+
+=head1 DESCRIPTION
+
+Currently this only applies to the item input in L<SL::Controller::Order> forms.
+
+Readable values:
+
+=over 4
+
+=item * undefined - use client setting
+
+=item * 0 - render above the positions
+
+=item * 1 - render below the positions
+
+=back
+
+For storage C<default> is used to delete the value since form values can not be undefined.
+
+=head1 BUGS
+
+None yet :)
+
+=head1 AUTHOR
+
+Sven Schöling E<lt>s.schoeling@googlemail.comE<gt>
+
+=cut
diff --git a/SL/Helper/UserPreferences/PartPickerSearch.pm b/SL/Helper/UserPreferences/PartPickerSearch.pm
index 7d4821d0c..0cc157317 100644
--- a/SL/Helper/UserPreferences/PartPickerSearch.pm
+++ b/SL/Helper/UserPreferences/PartPickerSearch.pm
@@ -20,6 +20,10 @@ sub get_purchase_search_makemodel {
   !!$_[0]->user_prefs->get('purchase_search_makemodel');
 }
 
+sub get_all_as_list_default {
+  !!$_[0]->user_prefs->get('all_as_list_default', $_[1]);
+}
+
 sub store_sales_search_customer_partnumber {
   $_[0]->user_prefs->store('sales_search_customer_partnumber', $_[1]);
 }
@@ -28,6 +32,10 @@ sub store_purchase_search_makemodel {
   $_[0]->user_prefs->store('purchase_search_makemodel', $_[1]);
 }
 
+sub store_all_as_list_default {
+  $_[0]->user_prefs->store('all_as_list_default', $_[1]);
+}
+
 sub init_user_prefs {
   SL::Helper::UserPreferences->new(
     namespace => $_[0]->namespace,
diff --git a/SL/IC.pm b/SL/IC.pm
index 2a9460745..d657e160b 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -131,7 +131,7 @@ sub assembly_item {
 #   l_warehouse  l_bin
 #
 # exclusives:
-#   itemstatus  = active | onhand | short | obsolete | orphaned
+#   itemstatus  = active | onhand | short | order_locked | obsolete | orphaned
 #   searchitems = part | assembly | service
 #
 # joining filters:
@@ -178,7 +178,7 @@ sub all_parts {
   $form->{parts}     = +{ };
   $form->{soldtotal} = undef if $form->{l_soldtotal}; # security fix. top100 insists on putting strings in there...
 
-  my @simple_filters       = qw(partnumber ean description partsgroup microfiche drawing onhand);
+  my @simple_filters       = qw(partnumber ean description partsgroup microfiche drawing onhand notes);
   my @project_filters      = qw(projectnumber projectdescription);
   my @makemodel_filters    = qw(make model);
   my @invoice_oi_filters   = qw(serialnumber soldtotal);
@@ -186,7 +186,7 @@ sub all_parts {
   my @like_filters         = (@simple_filters, @invoice_oi_filters);
   my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
   my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop insertdate));
-  my %no_simple_l_switches = (warehouse => 'wh.description as warehouse', bin => 'bin.description as bin');
+  my %no_simple_l_switches = (warehouse => 'wh.description as warehouse', bin => 'bin.description as bin',  price_factor_description => 'pfac.description as price_factor_description');
   my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
   my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
   my @deliverydate_flags   = qw(deliverydate);
@@ -201,7 +201,13 @@ sub all_parts {
 
   my %joins = (
     partsgroup => 'LEFT JOIN partsgroup pg      ON (pg.id       = p.partsgroup_id)',
-    makemodel  => 'LEFT JOIN makemodel mm       ON (mm.parts_id = p.id)',
+    makemodel  => "LEFT JOIN LATERAL (
+                      SELECT string_agg(mv.vendornumber || ' ' || mv.name, ', ') AS make,
+                             string_agg(mm.model, ', ')                          AS model
+                        FROM makemodel mm
+                             LEFT JOIN vendor mv ON (mv.id = mm.make)
+                      WHERE  mm.parts_id = p.id
+                   ) mm ON TRUE",
     pfac       => 'LEFT JOIN price_factors pfac ON (pfac.id     = p.price_factor_id)',
     invoice_oi =>
       q|LEFT JOIN (
@@ -210,21 +216,20 @@ sub all_parts {
        ) AS ioi ON ioi.parts_id = p.id|,
     apoe       =>
       q|LEFT JOIN (
-         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id,    NULL AS deliverydate, globalproject_id, 'invoice'    AS ioi FROM ap UNION
-         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,            deliverydate, globalproject_id, 'invoice'    AS ioi FROM ar UNION
-         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, reqdate AS deliverydate, globalproject_id, 'orderitems' AS ioi FROM oe
+         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, 'purchase_invoice' AS record_type, NULL AS customer_id,         vendor_id,    NULL AS deliverydate, globalproject_id, 'invoice'    AS ioi FROM ap UNION
+         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, 'sales_invoice'    AS record_type,         customer_id, NULL AS vendor_id,            deliverydate, globalproject_id, 'invoice'    AS ioi FROM ar UNION
+         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,                       record_type::text,   customer_id,         vendor_id, reqdate AS deliverydate, globalproject_id, 'orderitems' AS ioi FROM oe
        ) AS apoe ON ((ioi.trans_id = apoe.id) AND (ioi.ioi = apoe.ioi))|,
     cv         =>
       q|LEFT JOIN (
            SELECT id, name, 'customer' AS cv FROM customer UNION
            SELECT id, name, 'vendor'   AS cv FROM vendor
          ) AS cv ON cv.id = apoe.customer_id OR cv.id = apoe.vendor_id|,
-    mv         => 'LEFT JOIN vendor AS mv ON mv.id = mm.make',
     project    => 'LEFT JOIN project AS pj ON pj.id = COALESCE(ioi.project_id, apoe.globalproject_id)',
     warehouse  => 'LEFT JOIN warehouse AS wh ON wh.id = p.warehouse_id',
     bin        => 'LEFT JOIN bin ON bin.id = p.bin_id',
   );
-  my @join_order = qw(partsgroup makemodel mv invoice_oi apoe cv pfac project warehouse bin);
+  my @join_order = qw(partsgroup makemodel invoice_oi apoe cv pfac project warehouse bin);
 
   my %table_prefix = (
      deliverydate => 'apoe.', serialnumber => 'ioi.',
@@ -239,7 +244,7 @@ sub all_parts {
      description  => 'p.',
      qty          => 'ioi.',
      serialnumber => 'ioi.',
-     quotation    => 'apoe.',
+     record_type  => 'apoe.',
      cv           => 'cv.',
      "ioi.id"     => ' ',
      "ioi.ioi"    => ' ',
@@ -391,6 +396,7 @@ sub all_parts {
     push @where_tokens, '    p.obsolete',              if /obsolete/;
     push @where_tokens, 'p.onhand > 0',                if /onhand/;
     push @where_tokens, 'p.onhand < p.rop',            if /short/;
+    push @where_tokens, 'p.order_locked',              if /order_locked/;
   }
 
   my $q_assembly_lastcost =
@@ -405,8 +411,10 @@ sub all_parts {
   # all_parts is based upon the assumption that every parameter is named like the column it represents
   # unfortunately make would have to match vendor.name which is already taken for vendor.name in bsooqr mode.
   # fortunately makemodel doesn't need to be displayed later, so adding a special clause to where_token is sufficient.
+  # the lateral join mm already creates a string consisting of vendornumbers and vendornames in mm.make
+  # and the models in mm.make
   if ($form->{make}) {
-    push @where_tokens, 'mv.name ILIKE ?';
+    push @where_tokens, 'mm.make ILIKE ?';
     push @bind_vars, like($form->{make});
   }
   if ($form->{model}) {
@@ -434,22 +442,21 @@ sub all_parts {
   my $bsooqr        = any { $form->{$_} } @oe_flags;
   my @bsooqr_tokens = ();
 
-  push @select_tokens, @qsooqr_flags, 'quotation', 'cv', 'ioi.id', 'ioi.ioi'  if $bsooqr;
+  push @select_tokens, @qsooqr_flags, 'record_type', 'cv', 'ioi.id', 'ioi.ioi'  if $bsooqr;
   push @select_tokens, @deliverydate_flags                                    if $bsooqr && $form->{l_deliverydate};
   push @select_tokens, $q_assembly_lastcost                                   if $form->{l_assembly} && $form->{l_lastcost};
   push @bsooqr_tokens, q|module = 'ir' AND NOT ioi.assemblyitem|              if $form->{bought};
   push @bsooqr_tokens, q|module = 'is' AND NOT ioi.assemblyitem|              if $form->{sold};
-  push @bsooqr_tokens, q|module = 'oe' AND NOT quotation AND cv = 'customer'| if $form->{ordered};
-  push @bsooqr_tokens, q|module = 'oe' AND NOT quotation AND cv = 'vendor'|   if $form->{onorder};
-  push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'customer'| if $form->{quoted};
-  push @bsooqr_tokens, q|module = 'oe' AND     quotation AND cv = 'vendor'|   if $form->{rfq};
+  push @bsooqr_tokens, q|module = 'oe' AND record_type = 'sales_order'|       if $form->{ordered};
+  push @bsooqr_tokens, q|module = 'oe' AND record_type = 'purchase_order'|    if $form->{onorder};
+  push @bsooqr_tokens, q|module = 'oe' AND record_type = 'sales_quotation'|   if $form->{quoted};
+  push @bsooqr_tokens, q|module = 'oe' AND record_type = 'request_quotation'| if $form->{rfq};
   push @where_tokens, join ' OR ', map { "($_)" } @bsooqr_tokens              if $bsooqr;
 
   $joins_needed{partsgroup}  = 1;
   $joins_needed{pfac}        = 1;
   $joins_needed{project}     = 1 if grep { $form->{$_} || $form->{"l_$_"} } @project_filters;
   $joins_needed{makemodel}   = 1 if grep { $form->{$_} || $form->{"l_$_"} } @makemodel_filters;
-  $joins_needed{mv}          = 1 if $joins_needed{makemodel};
   $joins_needed{cv}          = 1 if $bsooqr;
   $joins_needed{apoe}        = 1 if $joins_needed{project} || $joins_needed{cv}   || grep { $form->{$_} || $form->{"l_$_"} } @apoe_filters;
   $joins_needed{invoice_oi}  = 1 if $joins_needed{project} || $joins_needed{apoe} || grep { $form->{$_} || $form->{"l_$_"} } @invoice_oi_filters;
@@ -805,14 +812,18 @@ SQL
     }
 
     $form->{"${_}_accno_$index"} = $accounts{"${_}_accno"} for qw(inventory income expense);
+    $form->{"${_}_accno_id_$index"} = $accounts{"${_}_accno_id"} for qw(inventory expense); # only for purchase_invoice
 
     $sth_tax->execute($accounts{$inc_exp}, quote_db_date($transdate)) || $::form->dberror($query_tax);
-    $ref = $sth_tax->fetchrow_hashref or next;
+    my $tax_ref;
+    $tax_ref = $sth_tax->fetchrow_hashref or next;
+
+    $form->{"expense_accno_tax_id_$index"} = $tax_ref->{tax_id}; # only for purchase_invoice
 
-    $form->{"taxaccounts_$index"} = $ref->{"accno"};
-    $form->{"taxaccounts"} .= "$ref->{accno} "if $form->{"taxaccounts"} !~ /$ref->{accno}/;
+    $form->{"taxaccounts_$index"} = $tax_ref->{"accno"};
+    $form->{"taxaccounts"} .= "$tax_ref->{accno} "if $form->{"taxaccounts"} !~ /$tax_ref->{accno}/;
 
-    $form->{"$ref->{accno}_${_}"} = $ref->{$_} for qw(rate description taxnumber tax_id);
+    $form->{"$tax_ref->{accno}_${_}"} = $tax_ref->{$_} for qw(rate description taxnumber tax_id);
   }
 
   $sth_tax->finish;
@@ -880,7 +891,10 @@ sub prepare_parts_for_printing {
   }
 
   my $placeholders = join ', ', ('?') x scalar(@part_ids);
-  my $query        = qq|SELECT mm.parts_id, mm.model, mm.lastcost, v.name AS make
+  my $query        = qq|SELECT mm.parts_id, mm.model,
+                        mm.part_description AS mm_part_description,
+                        mm.part_longdescription AS mm_part_longdescription,
+                        mm.lastcost, v.name AS make
                         FROM makemodel mm
                         LEFT JOIN vendor v ON (mm.make = v.id)
                         WHERE mm.parts_id IN ($placeholders)|;
@@ -896,10 +910,33 @@ sub prepare_parts_for_printing {
 
   $sth->finish();
 
+
+  $query            = qq|SELECT bm.parts_id,
+                         bm.model                AS business_model,
+                         bm.part_description     AS bm_part_description,
+                         bm.part_longdescription AS bm_part_longdescription,
+                         b.description           AS business_make
+                         FROM business_models bm
+                         LEFT JOIN business b ON (bm.business_id = b.id)
+                         WHERE bm.parts_id IN ($placeholders)|;
+
+  my %businessmodel = ();
+
+  $sth              = prepare_execute_query($form, $dbh, $query, @part_ids);
+
+  while (my $ref = $sth->fetchrow_hashref()) {
+    $businessmodel{$ref->{parts_id}} ||= [];
+    push @{ $businessmodel{$ref->{parts_id}} }, $ref;
+  }
+
+  $sth->finish();
+
   $query           = qq|SELECT
                         cp.parts_id,
-                        cp.customer_partnumber AS customer_model,
-                        c.name                 AS customer_make
+                        cp.customer_partnumber  AS customer_model,
+                        cp.part_description     AS cm_part_description,
+                        cp.part_longdescription AS cm_part_longdescription,
+                        c.name                  AS customer_make
                         FROM part_customer_prices cp
                         LEFT JOIN customer c ON (cp.customer_id = c.id)
                         WHERE cp.parts_id IN ($placeholders)|;
@@ -915,7 +952,7 @@ sub prepare_parts_for_printing {
 
   $sth->finish();
 
-  my @columns = qw(ean image microfiche drawing);
+  my @columns = qw(ean image microfiche drawing tariff_code);
 
   $query      = qq|SELECT id, | . join(', ', @columns) . qq|
                    FROM parts
@@ -924,7 +961,7 @@ sub prepare_parts_for_printing {
   my %data    = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
 
   my %template_arrays;
-  map { $template_arrays{$_} = [] } (qw(make model customer_make customer_model), @columns);
+  map { $template_arrays{$_} = [] } (qw(make model mm_part_description mm_part_longdescription business_make business_model bm_part_description bm_part_longdescription customer_make customer_model cm_part_description cm_part_longdescription), @columns);
 
   foreach my $i (1 .. $rowcount) {
     my $id = $form->{"${prefix}${i}"};
@@ -937,19 +974,34 @@ sub prepare_parts_for_printing {
 
     push @{ $template_arrays{make} },  [];
     push @{ $template_arrays{model} }, [];
+    push @{ $template_arrays{mm_part_description} },     [];
+    push @{ $template_arrays{mm_part_longdescription} }, [];
 
     if ($makemodel{$id}) {
       foreach my $ref (@{ $makemodel{$id} }) {
-        map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model);
+        map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model mm_part_description mm_part_longdescription);
+      }
+    }
+
+    push @{ $template_arrays{business_make} },           [];
+    push @{ $template_arrays{business_model} },          [];
+    push @{ $template_arrays{bm_part_description} },     [];
+    push @{ $template_arrays{bm_part_longdescription} }, [];
+
+    if ($businessmodel{$id}) {
+      foreach my $ref (@{ $businessmodel{$id} }) {
+        map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(business_make business_model bm_part_description bm_part_longdescription);
       }
     }
 
     push @{ $template_arrays{customer_make} },  [];
     push @{ $template_arrays{customer_model} }, [];
+    push @{ $template_arrays{cm_part_description} },     [];
+    push @{ $template_arrays{cm_part_longdescription} }, [];
 
     if ($customermodel{$id}) {
       foreach my $ref (@{ $customermodel{$id} }) {
-        push @{ $template_arrays{$_}->[-1] }, $ref->{$_} for qw(customer_make customer_model);
+        push @{ $template_arrays{$_}->[-1] }, $ref->{$_} for qw(customer_make customer_model cm_part_description cm_part_longdescription);
       }
     }
 
diff --git a/SL/IMAPClient.pm b/SL/IMAPClient.pm
new file mode 100644
index 000000000..d4dffc948
--- /dev/null
+++ b/SL/IMAPClient.pm
@@ -0,0 +1,833 @@
+package SL::IMAPClient;
+
+use strict;
+use warnings;
+use utf8;
+
+use Carp;
+use Params::Validate qw(:all);
+use List::MoreUtils qw(any);
+use IO::Socket::INET;
+use IO::Socket::SSL;
+use Mail::IMAPClient;
+use Email::MIME;
+use File::MimeInfo::Magic;
+use Encode qw(encode decode);
+use Encode::IMAPUTF7;
+use SL::Locale;
+
+use SL::SessionFile;
+use SL::Locale::String qw(t8);
+use SL::DB::EmailImport;
+use SL::DB::EmailJournal;
+use SL::DB::EmailJournalAttachment;
+use SL::DB::Order::TypeData;
+
+use SL::DB::Order;
+
+sub new {
+  my $class = shift;
+  my %params = validate(@_, {
+    enabled     => {
+      type      => BOOLEAN,
+      callbacks => {'is enabled' => sub { !!shift }},
+      optional  => 1,
+    },
+    hostname    => { type => SCALAR,  },
+    port        => { type => SCALAR,  optional => 1, },
+    ssl         => { type => BOOLEAN, },
+    username    => { type => SCALAR,  },
+    password    => { type => SCALAR,  },
+    base_folder => { type => SCALAR, default => 'INBOX', },
+  });
+
+  # get translation at runtime
+  my $client_locale = $::locale;
+  my $server_locale = Locale->new($::lx_office_conf{server}->{language});
+  $::locale = $server_locale;
+  my %record_type_to_folder =
+    map { $_ => SL::DB::Order::TypeData->can('get3')->($_, 'text', 'list') }
+    @{SL::DB::Order::TypeData->valid_types()};
+  $::locale = $client_locale;
+  my %record_folder_to_type = reverse %record_type_to_folder;
+
+  my $self = bless {
+    %params,
+    record_type_to_folder => \%record_type_to_folder,
+    record_folder_to_type => \%record_folder_to_type,
+  }, $class;
+  $self->_create_imap_client();
+  return $self;
+}
+
+sub DESTROY {
+  my ($self) = @_;
+  if ($self->{imap_client}) {
+    $self->{imap_client}->logout();
+  }
+}
+
+sub store_email_in_email_folder {
+  my $self = shift;
+  my %params = validate(@_, {
+    email_as_string => {
+      type => SCALAR,
+      callbacks => {'is not empty' => sub {shift ne ''}},
+    },
+    folder          => {
+      type => SCALAR,
+      callbacks => {'is not empty' => sub {shift ne ''}},
+    },
+  });
+
+  my $folder_string = $self->get_folder_string_from_path(folder_path => $params{folder});
+  $self->{imap_client}->append_string($folder_string, $params{email_as_string})
+    or die "Could not store email in folder '$folder_string': "
+           . $self->{imap_client}->LastError() . "\n";
+}
+
+sub set_flag_for_email {
+  my $self = shift;
+  my %params = validate(@_, {
+    email_journal => { isa => 'SL::DB::EmailJournal', },
+    flag          => { type => SCALAR, },
+  });
+  my $email_journal = $params{email_journal};
+  my $flag          = $params{flag};
+
+  my $folder_string = $email_journal->folder;
+
+  $self->{imap_client}->select($folder_string)
+    or die "Could not select IMAP folder '$folder_string': $@\n";
+
+  my $folder_uidvalidity = $self->{imap_client}->uidvalidity($folder_string)
+    or die "Could not get UIDVALIDITY for folder '$folder_string': $@\n";
+
+  if ($folder_uidvalidity != $email_journal->folder_uidvalidity) {
+    die "Folder has changed: $folder_string\n"
+  }
+
+  my $uid = $email_journal->uid;
+  $self->{imap_client}->set_flag($flag, [$uid])
+    or die "Could not add flag '$flag' to message '$uid': "
+           . $self->{imap_client}->LastError() . "\n";
+}
+
+sub update_emails_from_folder {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder               => {
+      type     => SCALAR | UNDEF,
+      optional => 1,
+    },
+    email_journal_params => {
+      type     => HASHREF | UNDEF,
+      optional => 1,
+    },
+  });
+  my $folder_path = $params{folder} || $self->{base_folder};
+
+  my $folder_string = $self->get_folder_string_from_path(folder_path => $folder_path);
+  my $email_import =
+    $self->_update_emails_from_folder_strings(
+      base_folder_path     => $folder_path,
+      folder_strings       => [$folder_string],
+      email_journal_params => $params{email_journal_params},
+    );
+
+  return $email_import;
+}
+
+sub update_emails_from_subfolders {
+  my $self = shift;
+  my %params = validate(@_, {
+    base_folder           => {
+      type     => SCALAR,
+      optional => 1,
+    },
+    email_journal_params => {
+      type     => HASHREF | UNDEF,
+      optional => 1,
+    },
+  });
+  my $base_folder_path = $params{base_folder} || $self->{base_folder};
+
+  my $base_folder_string = $self->get_folder_string_from_path(folder_path => $base_folder_path);
+  my @subfolder_strings = $self->{imap_client}->folders($base_folder_string)
+    or die "Could not get subfolders via IMAP: $@\n";
+  @subfolder_strings = grep { $_ ne $base_folder_string } @subfolder_strings;
+
+  my $email_import =
+    $self->_update_emails_from_folder_strings(
+      base_folder_path     => $base_folder_path,
+      folder_strings       => \@subfolder_strings,
+      email_journal_params => $params{email_journal_params},
+    );
+
+  return $email_import;
+}
+
+sub _update_emails_from_folder_strings {
+  my $self = shift;
+  my %params = validate(@_, {
+    base_folder_path => { type => SCALAR,   },
+    folder_strings   => { type => ARRAYREF, },
+    email_journal_params => {
+      type     => HASHREF | UNDEF,
+      optional => 1,
+    },
+  });
+
+  my $dbh = SL::DB->client->dbh;
+
+  my $email_import;
+  SL::DB->client->with_transaction(sub {
+    foreach my $folder_string (@{$params{folder_strings}}) {
+      $self->{imap_client}->select($folder_string)
+        or die "Could not select IMAP folder '$folder_string': $@\n";
+
+      my $folder_uidvalidity = $self->{imap_client}->uidvalidity($folder_string)
+        or die "Could not get UIDVALIDITY for folder '$folder_string': $@\n";
+
+      my $msg_uids = $self->{imap_client}->messages
+        or die "Could not get messages via IMAP: $@\n";
+
+      my $query = <<SQL;
+        SELECT uid
+        FROM email_imports ei
+        LEFT JOIN email_journal ej
+          ON ej.email_import_id = ei.id
+        WHERE ei.host_name = ?
+          AND ei.user_name = ?
+          AND ej.folder = ?
+          AND ej.folder_uidvalidity = ?
+SQL
+
+      my $existing_uids = $dbh->selectall_hashref($query, 'uid', undef,
+        $self->{hostname}, $self->{username}, $folder_string, $folder_uidvalidity);
+
+      my @new_msg_uids = grep { !$existing_uids->{$_} } @$msg_uids;
+
+      next unless @new_msg_uids;
+
+      $email_import ||= $self->_create_email_import(folder_path => $params{base_folder_path})->save();
+
+      foreach my $new_uid (@new_msg_uids) {
+        my $new_email_string = $self->{imap_client}->message_string($new_uid);
+        my $email = Email::MIME->new($new_email_string);
+        my $email_journal = $self->_create_email_journal(
+          email                => $email,
+          email_import         => $email_import,
+          uid                  => $new_uid,
+          folder_string        => $folder_string,
+          folder_uidvalidity   => $folder_uidvalidity,
+          email_journal_params => $params{email_journal_params},
+        );
+        $email_journal->save();
+      }
+    }
+  });
+
+  return $email_import;
+}
+
+sub _create_email_import {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_path => { type => SCALAR, },
+  });
+  my $email_import = SL::DB::EmailImport->new(
+    host_name => $self->{hostname},
+    user_name => $self->{username},
+    folder    => $params{folder_path},
+  );
+  return $email_import;
+}
+
+sub _create_email_journal {
+  my $self = shift;
+  my %params = validate(@_, {
+    email                => { isa => 'Email::MIME', },
+    email_import         => { isa => 'SL::DB::EmailImport', },
+    uid                  => { type => SCALAR, },
+    folder_string        => { type => SCALAR, },
+    folder_uidvalidity   => { type => SCALAR, },
+    email_journal_params => { type => HASHREF | UNDEF, optional => 1},
+  });
+
+  my $email = $params{email};
+  if ($email->content_type) { # decode header
+    my $charset = $email->content_type =~ /charset="([A-Z0-9!#$%&'+-^_`{}~]+)"/i ? $1 : undef;
+    if ($charset) {
+      map { $email->header_str_set($_ => decode($charset, $email->header($_))) }
+        $email->header_names;
+    }
+  }
+
+  my $text_part;
+  my %text_parts;
+  my @parts = $email->parts;
+  _find_text_parts(
+    text_parts => \%text_parts,
+    parts      => \@parts,
+  );
+  my @accepted_text_content_types = ('text/html', 'text/plain', '');
+  $text_part ||= $text_parts{$_} for @accepted_text_content_types;
+  my $body_text = $text_part ? $text_part->body_str : '';
+
+  my %header_map = map { $_ => $email->header_str($_) } $email->header_names;
+  # We need to store the Content-Type header for the text part
+  $header_map{'Content-Type'} = $text_part ? $text_part->content_type : 'text/plain';
+  my $header_string = join "\r\n",
+    (map { $_ . ': ' . $header_map{$_} } keys %header_map);
+
+  my $date = _parse_date($email->header_str('Date'));
+
+  my $recipients = $email->header_str('To');
+  $recipients .= ', ' . $email->header_str('Cc')  if ($email->header_str('Cc'));
+  $recipients .= ', ' . $email->header_str('Bcc') if ($email->header_str('Bcc'));
+
+  my @attachments = ();
+  $email->walk_parts(sub {
+    my ($part) = @_;
+    my $filename = $part->filename;
+    if ($filename) {
+      my $mime_type = _cleanup_content_type($part->content_type);
+      my $content = $part->body;
+      my $attachment = SL::DB::EmailJournalAttachment->new(
+        name      => $filename,
+        content   => $content,
+        mime_type => $mime_type,
+      );
+      push @attachments, $attachment;
+    }
+  });
+
+  my $email_journal = SL::DB::EmailJournal->new(
+    email_import_id    => $params{email_import}->id,
+    folder             => $params{folder_string},
+    folder_uidvalidity => $params{folder_uidvalidity},
+    uid                => $params{uid},
+    status             => 'imported',
+    extended_status    => '',
+    from               => $email->header_str('From') || '',
+    recipients         => $recipients,
+    sent_on            => $date,
+    subject            => $email->header_str('Subject') || '',
+    body               => $body_text,
+    headers            => $header_string,
+    attachments        => \@attachments,
+    %{$params{email_journal_params}},
+  );
+
+  return $email_journal;
+}
+
+sub _find_text_parts {
+  my %params = validate(@_,{
+    text_parts => {type => HASHREF,},
+    parts      => {
+      type => ARRAYREF,
+      callbacks => {
+        "contains only 'Email::MIME'" => sub {
+          !scalar grep {ref $_ ne 'Email::MIME'} @{$_[0]}
+        },
+      },
+    },
+  });
+  for my $part (@{$params{parts}}) {
+    my $content_type = _cleanup_content_type($part->content_type);
+    if ($content_type =~ m!^text/! or $content_type eq '') {
+      $params{text_parts}->{$content_type} ||= $part;
+    }
+    my @subparts = $part->subparts;
+    if (scalar @subparts) {
+      _find_text_parts(
+        text_parts => $params{text_parts},
+        parts      => \@subparts,
+      );
+    }
+  }
+};
+
+sub _cleanup_content_type {
+  my ($content_type) = @_;
+  $content_type =~ s/\A\s+//; # Remove whitespaces at begin
+  $content_type =~ s/\s+\z//; # Remove whitespaces at end
+  $content_type =~ s/;.+//;   # For S/MIME, etc.
+  return $content_type;
+};
+
+sub _parse_date {
+  my ($date) = @_;
+  return '' unless $date;
+  my $parse_date = $date;
+  # replace whitespaces with single space
+  $parse_date =~ s/\s+/ /g;
+  # remove leading and trailing whitespaces
+  $parse_date =~ s/^\s+|\s+$//g;
+  # remove day-name
+  $parse_date =~ s/^[A-Z][a-z][a-z], //;
+  # add missing seconds
+  $parse_date =~ s/( \d\d:\d\d) /$1:00 /;
+  my $strp = DateTime::Format::Strptime->new(
+    pattern   => '%d %b %Y %H:%M:%S %z',
+    time_zone => 'UTC',
+  );
+  my $dt = $strp->parse_datetime($parse_date)
+    or die "Could not parse date: $date\n";
+  return $dt->strftime('%Y-%m-%d %H:%M:%S');
+}
+
+sub update_email_files_for_record {
+  my $self = shift;
+  my %params = validate(@_,{
+    record => {
+      isa => [qw(SL::DB::Order)],
+      can => ['id', 'type'],
+    },
+  });
+  my $record = $params{record};
+  my $folder_string = $self->_get_folder_string_for_record(record => $record);
+  return unless $self->{imap_client}->exists($folder_string);
+  $self->{imap_client}->select($folder_string)
+    or die "Could not select IMAP folder '$folder_string': $@\n";
+
+  my $msg_uids = $self->{imap_client}->messages
+    or die "Could not get messages via IMAP: $@\n";
+
+  my $dbh = $record->dbh;
+  my $query = <<SQL;
+    SELECT uid
+    FROM files
+    WHERE object_id = ?
+      AND object_type = ?
+      AND source = 'uploaded'
+      AND file_type = 'attachment'
+SQL
+  my $existing_uids = $dbh->selectall_hashref($query, 'uid', undef,
+                                              $record->id, $record->type);
+  my @new_msg_uids = grep { !$existing_uids->{$_} } @$msg_uids;
+
+  foreach my $msg_uid (@new_msg_uids) {
+    my $sess_fname = "mail_download_" . $record->type . "_" . $record->id . "_" . $msg_uid;
+
+    my $file_name =
+      decode('MIME-Header', $self->{imap_client}->subject($msg_uid)) . '.eml';
+    my $sfile      = SL::SessionFile->new($sess_fname, mode => 'w');
+    $self->{imap_client}->message_to_file($sfile->fh, $msg_uid)
+      or die "Could not fetch message $msg_uid from IMAP: $@\n";
+    $sfile->fh->close;
+
+    my $mime_type = File::MimeInfo::Magic::magic($sfile->file_name);
+    my $fileobj = SL::File->save(
+      object_id        => $record->id,
+      object_type      => $record->type,
+      mime_type        => $mime_type,
+      source           => 'uploaded',
+      uid              => "$msg_uid",
+      file_type        => 'attachment',
+      file_name        => $file_name,
+      file_path        => $sfile->file_name
+    );
+    unlink($sfile->file_name);
+  }
+}
+
+sub update_email_subfolders_and_files_for_records {
+  my ($self) = @_;
+  my $base_folder_path = $self->{base_folder};
+  my $base_folder_string = $self->get_folder_string_from_path(folder_path => $base_folder_path);
+
+  my $folder_strings = $self->{imap_client}->folders($base_folder_string)
+    or die "Could not get folders via IMAP: $@\n";
+  my @subfolder_strings = grep { $_ ne $base_folder_string } @$folder_strings;
+
+  # Store the emails to the records
+  foreach my $subfolder_string (@subfolder_strings) {
+    my $ilike_folder_path = $self->get_ilike_folder_path_from_string(folder_string => $subfolder_string);
+    my (
+      $ilike_record_folder_path, # is greedily matched
+      $ilike_customer_number, # no spaces allowed
+      $ilike_customer_name,
+      $record_folder,
+      $ilike_record_number
+    ) = $ilike_folder_path =~ m|^(.+)/([^\s]+) (.+)/(.+)/(.+)|;
+
+    my $record_type = $self->{record_folder_to_type}->{$record_folder};
+    next unless $record_type;
+
+    my $number_field = SL::DB::Order::TypeData->can('get3')->(
+      $record_type, 'properties', 'nr_key');
+    my $record = SL::DB::Manager::Order->get_first(
+      query => [
+        and => [
+          record_type => $record_type,
+          $number_field => { ilike => $ilike_record_number },
+        ],
+    ]);
+    next unless $record;
+    $self->update_email_files_for_record(record => $record);
+  }
+
+  return \@subfolder_strings;
+}
+
+sub create_folder {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_string => {type => SCALAR},
+  });
+  my $folder_string = $params{folder_string};
+  return if $self->{imap_client}->exists($folder_string);
+  $self->{imap_client}->create($folder_string)
+    or die "Could not create IMAP folder '$folder_string': $@\n";
+  $self->{imap_client}->subscribe($folder_string)
+    or die "Could not subscribe to IMAP folder '$folder_string': $@\n";
+  return;
+}
+
+sub get_folder_string_from_path {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_path => {type => SCALAR},
+  });
+  my $folder_path = $params{folder_path};
+  my $separator = $self->{imap_client}->separator();
+  if ($separator ne '/') {
+    my $replace_sep = $separator ne '_' ? '_' : '-';
+    $folder_path =~ s|\Q${separator}|$replace_sep|g; # \Q -> escape special chars
+    $folder_path =~ s|/|${separator}|g; # replace / with separator
+  }
+  my $folder_string = encode('IMAP-UTF-7', $folder_path);
+  return $folder_string;
+}
+
+sub get_ilike_folder_path_from_string {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_string => {type => SCALAR},
+  });
+  my $folder_string = $params{folder_string};
+  my $separator = $self->{imap_client}->separator();
+  my $folder_path = decode('IMAP-UTF-7', $folder_string);
+  $folder_path =~ s|\Q${separator}|/|g; # \Q -> escape special chars
+  $folder_path =~ s|-|_|g; # for ilike matching
+  return $folder_path;
+}
+
+sub create_folder_for_record {
+  my $self = shift;
+  my %params = validate(@_,{
+    record => {
+      isa => [qw(SL::DB::Order)],
+    },
+  });
+  my $record = $params{record};
+  my $folder_string = $self->_get_folder_string_for_record(record => $record);
+  $self->create_folder(folder_string => $folder_string);
+  return;
+}
+
+sub clean_up_imported_emails_from_folder {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_path => {type => SCALAR},
+  });
+  my $folder_path = $params{folder_path};
+  my $folder_string = $self->get_folder_string_from_path(folder_path => $folder_path);
+  $self->_clean_up_imported_emails_from_folder_strings([$folder_string]);
+}
+
+
+sub _clean_up_imported_emails_from_folder_strings {
+  my $self = shift;
+  my %params = validate(@_, {
+    folder_strings => {type => ARRAYREF},
+  });
+  my $folder_strings = $params{folder_strings};
+  my $dbh = SL::DB->client->dbh;
+
+  foreach my $folder_string (@$folder_strings) {
+    $self->{imap_client}->select($folder_string)
+      or die "Could not select IMAP folder '$folder_string': $@\n";
+
+    my $folder_uidvalidity = $self->{imap_client}->uidvalidity($folder_string)
+      or die "Could not get UIDVALIDITY for folder '$folder_string': $@\n";
+
+    my $msg_uids = $self->{imap_client}->messages
+      or die "Could not get messages via IMAP: $@\n";
+
+    my $query = <<SQL;
+      SELECT uid
+      FROM email_imports ei
+      LEFT JOIN email_journal ej
+        ON ej.email_import_id = ei.id
+      WHERE ei.host_name = ?
+        AND ei.user_name = ?
+        AND ej.folder = ?
+        AND ej.folder_uidvalidity = ?
+SQL
+
+    my $existing_uids = $dbh->selectall_hashref($query, 'uid', undef,
+      $self->{hostname}, $self->{username}, $folder_string, $folder_uidvalidity);
+
+    my @imported_msg_uids = grep { $existing_uids->{$_} } @$msg_uids;
+
+    next unless scalar @imported_msg_uids;
+
+    $self->{imap_client}->delete_message(\@imported_msg_uids)
+      or die "Could not delete messages via IMAP: $@\n";
+  }
+}
+
+sub clean_up_record_subfolders {
+  my $self = shift;
+  my %params = validate(@_, {
+    active_records => {type => ARRAYREF},
+  });
+  my $active_records = $params{active_records};
+
+  my $subfolder_strings =
+    $self->update_email_subfolders_and_files_for_records();
+
+  my @active_folder_strings = map { $self->_get_folder_string_for_record(record => $_) }
+    @$active_records;
+
+  my %keep_folder = map { $_ => 1 } @active_folder_strings;
+  my @folders_to_delete = grep { !$keep_folder{$_} } @$subfolder_strings;
+
+  foreach my $folder (@folders_to_delete) {
+    $self->{imap_client}->delete($folder)
+      or die "Could not delete IMAP folder '$folder': $@\n";
+  }
+}
+
+sub _get_folder_string_for_record {
+  my $self = shift;
+  my %params = validate(@_, {
+    record => {
+      isa => [qw(SL::DB::Order)],
+      can => ['record_type', 'customervendor', 'number'],
+    },
+  });
+  my $record = $params{record};
+
+  my $customer_vendor = $record->customervendor;
+
+  #repalce / with _
+  my %string_parts = ();
+  $string_parts{cv_number}     = $customer_vendor->number;
+  $string_parts{cv_name}       = $customer_vendor->name;
+  $string_parts{record_number} = $record->number;
+  foreach my $key (keys %string_parts) {
+    $string_parts{$key} =~ s|/|_|g;
+  }
+
+  my $record_folder_path =
+    $self->{base_folder} . '/' .
+    $string_parts{cv_number} . ' ' . $string_parts{cv_name} . '/' .
+    $self->{record_type_to_folder}->{$record->record_type} . '/' .
+    $string_parts{record_number};
+  my $folder_string = $self->get_folder_string_from_path(folder_path => $record_folder_path);
+  return $folder_string;
+}
+
+sub _create_imap_client {
+  my ($self) = @_;
+
+  my $socket;
+  if ($self->{ssl}) {
+    $socket = IO::Socket::SSL->new(
+      Proto    => 'tcp',
+      PeerAddr => $self->{hostname},
+      PeerPort => $self->{port} || 993,
+    );
+  } else {
+    $socket = IO::Socket::INET->new(
+      Proto    => 'tcp',
+      PeerAddr => $self->{hostname},
+      PeerPort => $self->{port} || 143,
+    );
+  }
+  if (!$socket) {
+    die "Failed to create socket for IMAP client: $@\n";
+  }
+
+  my $imap_client = Mail::IMAPClient->new(
+    Socket   => $socket,
+    User     => $self->{username},
+    Password => $self->{password},
+    Uid      => 1,
+    peek     => 1, # Don't change the \Seen flag
+  ) or do {
+    die "Failed to create IMAP Client: $@\n"
+  };
+
+  $imap_client->IsAuthenticated() or do {
+    die "IMAP Client login failed: " . $imap_client->LastError() . "\n";
+  };
+
+  $self->{imap_client} = $imap_client;
+  return $imap_client;
+}
+
+1;
+
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::IMAPClient - Base class for interacting with email server from kivitendo
+
+=head1 SYNOPSIS
+
+  use SL::IMAPClient;
+
+  # uses the config in config/kivitendo.conf
+  my $imap_client = SL::IMAPClient->new(%{$::lx_office_conf{imap_client}});
+
+  # can also be used with a custom config
+  my %config = (
+    enabled     => 1,
+    hostname    => 'imap.example.com',
+    username    => 'test_user',
+    password    => 'test_password',
+    ssl         => 1,
+    base_folder => 'INBOX',
+  );
+  my $imap_client = SL::IMAPClient->new(%config);
+
+  # create email folder for record
+  # folder structure: base_folder/customer_vendor_number customer_vendor_name/type/record_number
+  # e.g. INBOX/1234 Testkunde/Angebot/123
+  # if the folder already exists, nothing happens
+  $imap_client->create_folder_for_record($record);
+
+  # update emails for record
+  # fetches all emails from the IMAP server and saves them as attachments
+  $imap_client->update_email_files_for_record(record => $record);
+
+=head1 OVERVIEW
+
+Mail can be sent from kivitendo via the sendmail command or the smtp protocol.
+
+
+=head1 INTERNAL DATA TYPES
+
+=over 2
+
+=item C<%$self->{record_type_to_folder}>
+
+  Due to the lack of a single global mapping for $record->type,
+  type is mapped to the corresponding translation. All types which
+  use this module are currently mapped and should be mapped.
+
+=item C<%$self->record_folder_to_type>
+
+  The reverse mapping of C<%$self->{record_type_to_folder}>.
+
+=back
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<new>
+
+  Creates a new SL::IMAPClient object with the given config.
+
+=item C<DESTROY>
+
+  Destructor. Disconnects from the IMAP server.
+
+=item C<update_emails_from_folder>
+
+  Updates the emails for a folder. Checks which emails are missing and
+  fetches these from the IMAP server. Returns the created email import object.
+
+=item C<update_emails_from_subfolders>
+
+  Updates the emails for all subfolders of a folder. Checks which emails are
+  missing and fetches these from the IMAP server. Returns the created email
+  import object.
+
+=item C<_update_emails_from_folder_strings>
+
+  Updates the emails for a list of folder strings. Checks which emails are
+  missing and fetches these from the IMAP server. Returns the created
+  email import object.
+
+=item C<update_email_files_for_record>
+
+  Updates the email files for a record. Checks which emails are missing and
+  fetches these from the IMAP server.
+
+=item C<update_email_subfolders_and_files_for_records>
+
+    Updates all subfolders and the email files for all records.
+
+=item C<create_folder>
+
+  Creates a folder on the IMAP server. If the folder already exists, nothing
+  happens.
+
+=item C<get_folder_string_from_path>
+
+  Converts a folder path to a folder string. The folder path is like path
+  on unix filesystem. The folder string is the path on the IMAP server.
+  The folder string is encoded in IMAP-UTF-7.
+
+=item C<get_ilike_folder_path_from_string>
+
+  Converts a folder string to a folder path. The folder path is like path
+  on unix filesystem. The folder string is the path on the IMAP server.
+  The folder string is encoded in IMAP-UTF-7. It can happend that
+  C<get_folder_string_from_path> and C<get_ilike_folder_path_from_string>
+  don't cancel each other out. This is because the IMAP server can have a
+  different separator than the unix filesystem. The changes are made so that a
+  ILIKE query on the database works.
+
+=item C<create_folder_for_record>
+
+  Creates a folder for a record on the IMAP server. The folder structure
+  is like this: base_folder/customer_vendor_number customer_vendor_name/type/record_number
+  e.g. INBOX/1234 Testkunde/Angebot/123
+  If the folder already exists, nothing happens.
+
+=item C<clean_up_record_subfolders>
+
+  Gets a list of acitve records. Syncs all subfolders and add email files to
+  the records. Then deletes all subfolders which are not corresponding to an
+  active record.
+
+=item C<_get_folder_string_for_record>
+
+  Returns the folder string for a record. The folder structure is like this:
+  base_folder/customer_vendor_number customer_vendor_name/type/record_number
+  e.g. INBOX/1234 Testkunde/Angebot/123. This is passed through
+  C<get_folder_string_from_path>.
+
+=item C<_create_imap_client>
+
+  Creates a new IMAP client and logs in. The IMAP client is stored in
+  $self->{imap_client}.
+
+=back
+
+=head1 BUGS
+
+The mapping from record to email folder is not bijective. If the record or
+customer number has special characters, the mapping can fail. Read
+C<get_ilike_folder_path_from_string> for more information.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/IO.pm b/SL/IO.pm
index c0d6987f3..e1374feb3 100644
--- a/SL/IO.pm
+++ b/SL/IO.pm
@@ -77,5 +77,30 @@ SQL
   $main::lxdebug->leave_sub();
 }
 
+sub get_active_taxes_for_chart {
+  my ($self, $chart_id, $transdate, $tax_id) = @_;
+
+  my $chart         = SL::DB::Chart->new(id => $chart_id)->load;
+  my $active_taxkey = $chart->get_active_taxkey($transdate);
+
+  my $where = [ chart_categories => { like => '%' . $chart->category . '%' } ];
+
+  if ( defined $tax_id && $tax_id >= 0 ) {
+    $where = [ or => [ chart_categories => { like => '%' . $chart->category . '%' },
+                       id               => $tax_id
+                     ]
+             ];
+  }
+
+  my $taxes         = SL::DB::Manager::Tax->get_all(
+    where   => $where,
+    sort_by => 'taxkey, rate',
+  );
+
+  my $default_tax            = first { $active_taxkey->tax_id == $_->id } @{ $taxes };
+  $default_tax->{is_default} = 1 if $default_tax;
+
+  return @{ $taxes };
+}
 
 1;
diff --git a/SL/IR.pm b/SL/IR.pm
index 3d8ee3637..f27f6696a 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -40,16 +40,19 @@ use SL::ARAP;
 use SL::Common;
 use SL::CVar;
 use SL::DATEV qw(:CONSTANTS);
+use SL::Util qw(trim);
 use SL::DBUtils;
 use SL::DB::Draft;
 use SL::DO;
 use SL::GenericTranslations;
 use SL::HTML::Restrict;
 use SL::IO;
+use SL::Locale::String qw(t8);
 use SL::MoreCommon;
 use SL::DB::Default;
 use SL::DB::TaxZone;
 use SL::DB::MakeModel;
+use SL::DB::ValidityToken;
 use SL::DB;
 use SL::Presenter::Part qw(type_abbreviation classification_abbreviation);
 use List::Util qw(min);
@@ -72,6 +75,16 @@ sub post_invoice {
 sub _post_invoice {
   my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my $payments_only = $params{payments_only};
   my $dbh = $provided_dbh || SL::DB->client->dbh;
   my $restricter = SL::HTML::Restrict->create;
@@ -84,14 +97,14 @@ sub _post_invoice {
 
   my ($query, $sth, @values, $project_id);
   my ($allocated, $taxrate, $taxamount, $taxdiff, $item);
-  my ($amount, $linetotal, $lastinventoryaccno, $lastexpenseaccno);
+  my ($amount, $linetotal, $last_inventory_accno_tax_id_key, $last_expense_accno_tax_id_key);
   my ($netamount, $invoicediff, $expensediff) = (0, 0, 0);
   my $exchangerate = 0;
   my ($basefactor, $baseqty, @taxaccounts, $totaltax);
 
   my $all_units = AM->retrieve_units($myconfig, $form);
 
-#markierung
+  #markierung
   if (!$payments_only) {
     if ($form->{id}) {
       &reverse_invoice($dbh, $form);
@@ -100,16 +113,25 @@ sub _post_invoice {
       do_query($form, $dbh, qq|INSERT INTO ap (id, invnumber, currency_id, taxzone_id) VALUES (?, '', (SELECT id FROM currencies WHERE name=?), ?)|, $form->{id}, $form->{currency}, $form->{taxzone_id});
     }
   }
-
   if ($form->{currency} eq $defaultcurrency) {
     $form->{exchangerate} = 1;
   } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, 'sell');
+    $exchangerate         = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, 'sell');
+    $form->{exchangerate} = $form->parse_amount($myconfig, $form->{exchangerate}, 5);
+
+    # if default exchangerate is not defined, define one
+    unless ($exchangerate) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, 0,  $form->{exchangerate});
+      # delete records exchangerate -> if user sets new invdate for record
+      $query = qq|UPDATE ap set exchangerate = NULL where id = ?|;
+      do_query($form, $dbh, $query, $form->{"id"});
+    }
+    # update record exchangerate, if the default is set and differs from current
+    if ($exchangerate && ($form->{exchangerate} != $exchangerate)) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate},
+                                 0, $form->{exchangerate}, $form->{id}, 'ap');
+    }
   }
-
-  $form->{exchangerate} = $exchangerate || $form->parse_amount($myconfig, $form->{exchangerate});
-  $form->{exchangerate} = 1 unless ($form->{exchangerate} * 1);
-
   my %item_units;
   my $q_item_unit = qq|SELECT unit FROM parts WHERE id = ?|;
   my $h_item_unit = prepare_query($form, $dbh, $q_item_unit);
@@ -127,7 +149,10 @@ sub _post_invoice {
     $form->{"qty_$i"}  = $form->parse_amount($myconfig, $form->{"qty_$i"});
     $form->{"qty_$i"} *= -1 if $form->{storno};
 
-    if ( $::instance_conf->get_inventory_system eq 'periodic') {
+    if ( ($form->{"tax_chart_type_$i"} eq 'expense')
+      || ($form->{"tax_chart_type_$i"} eq ''
+          && $::instance_conf->get_inventory_system eq 'periodic')
+    ) {
       # inventory account number is overwritten with expense account number, so
       # never book incoming to inventory account but always to expense account
       $form->{"inventory_accno_$i"} = $form->{"expense_accno_$i"}
@@ -155,6 +180,14 @@ sub _post_invoice {
     $allocated   = 0;
     $taxrate     = 0;
 
+    # preset tax_id and accno for all taxaccounts
+    foreach $item (@taxaccounts) {
+      my $accno  = $item;
+      my $tax_id = $form->{"${item}_tax_id"};
+      $form->{amount}{$item . "_" . $tax_id}{tax_id} = $tax_id;
+      $form->{amount}{$item . "_" . $tax_id}{accno}  = $item;
+    }
+
     $form->{"sellprice_$i"} = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
     (my $fxsellprice = $form->{"sellprice_$i"}) =~ /\.(\d+)/;
     my $dec = length $1;
@@ -192,17 +225,18 @@ sub _post_invoice {
           foreach $item (@taxaccounts) {
             $taxamount =
               $form->round_amount($linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"})), 2);
-            $taxdiff                              += $taxamount;
-            $form->{amount}{ $form->{id} }{$item} -= $taxamount;
+            $taxdiff += $taxamount;
+            $form->{amount}{$item . "_" . $form->{"${item}_tax_id"}}{amount} -= $taxamount;
           }
-          $form->{amount}{ $form->{id} }{ $taxaccounts[0] } += $taxdiff;
+          my $first_taxaccno = $taxaccounts[0];
+          $form->{amount}{ $first_taxaccno . "_" . $form->{"${first_taxaccno}_tax_id"} }{amount} += $taxdiff;
 
         } else {
-          map { $form->{amount}{ $form->{id} }{$_} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
+          map { $form->{amount}{$_ . "_" . $form->{"${_}_tax_id"}}{amount} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
         }
 
       } else {
-        map { $form->{amount}{ $form->{id} }{$_} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
+        map { $form->{amount}{$_ . "_" . $form->{"${_}_tax_id"}}{amount} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
       }
 
       # add purchase to inventory, this one is without the tax!
@@ -213,19 +247,26 @@ sub _post_invoice {
       # this is the difference for the inventory
       $invoicediff += ($amount - $linetotal);
 
-      $form->{amount}{ $form->{id} }{ $form->{"inventory_accno_$i"} } -= $linetotal;
+      my $inventory_key = $form->{"inventory_accno_$i"} . "_" . $form->{"expense_accno_tax_id_$i"};
+      $form->{amount}{$inventory_key}{amount} -= $linetotal;
+      $form->{amount}{$inventory_key}{accno}   = $form->{"inventory_accno_$i"};
+      $form->{amount}{$inventory_key}{tax_id}  = $form->{"expense_accno_tax_id_$i"};
 
       # adjust and round sellprice
       $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate}, $decimalplaces);
 
-      $lastinventoryaccno = $form->{"inventory_accno_$i"};
+      $last_inventory_accno_tax_id_key = $inventory_key;
 
       next if $payments_only;
 
-      # update parts table by setting lastcost to current price, don't allow negative values by using abs
-      $query = qq|UPDATE parts SET lastcost = ? WHERE id = ?|;
-      @values = (abs($fxsellprice * $form->{exchangerate} / $basefactor), conv_i($form->{"id_$i"}));
-      do_query($form, $dbh, $query, @values);
+      # change lastcost for part and all assemblies and assortments recursively
+      my $a = SL::DB::Part->load_cached(conv_i($form->{"id_$i"}));
+      my $part_price_factor = $a->price_factor_id ? $a->price_factor->factor : 1;
+      my $new_lastcost      = abs($fxsellprice * $form->{exchangerate} / $basefactor / $price_factor * $part_price_factor);
+      if ( abs($a->lastcost - $new_lastcost) >= 0.009 ) {
+        $a->update_attributes(lastcost => $new_lastcost);
+        $a->set_lastcost_assemblies_and_assortiments;
+      }
 
       # check if we sold the item already and
       # make an entry for the expense and inventory
@@ -352,13 +393,13 @@ sub _post_invoice {
           foreach $item (@taxaccounts) {
             $taxamount = $linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"}));
             $totaltax += $taxamount;
-            $form->{amount}{ $form->{id} }{$item} -= $taxamount;
+            $form->{amount}{$item . "_" . $form->{"${item}_tax_id"}}{amount} -= $taxamount;
           }
         } else {
-          map { $form->{amount}{ $form->{id} }{$_} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
+          map { $form->{amount}{$_ . "_" . $form->{"${_}_tax_id"}}{amount} -= $linetotal * $form->{"${_}_rate"} } @taxaccounts;
         }
       } else {
-        map { $form->{amount}{ $form->{id} }{$_} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
+        map { $form->{amount}{$_ . "_" . $form->{"${_}_tax_id"}}{amount} -= $taxamount * $form->{"${_}_rate"} / $taxrate } @taxaccounts;
       }
 
       $amount    = $form->{"sellprice_$i"} * $form->{"qty_$i"} * $form->{exchangerate} / $price_factor;
@@ -369,18 +410,26 @@ sub _post_invoice {
       $expensediff += ($amount - $linetotal);
 
       # add amount to expense
-      $form->{amount}{ $form->{id} }{ $form->{"expense_accno_$i"} } -= $linetotal;
+      my $expense_key = $form->{"expense_accno_$i"} . "_" . $form->{"expense_accno_tax_id_$i"};
+      $form->{amount}{$expense_key}{amount} -= $linetotal;
+      $form->{amount}{$expense_key}{accno}   = $form->{"expense_accno_$i"};
+      $form->{amount}{$expense_key}{tax_id}  = $form->{"expense_accno_tax_id_$i"};
 
-      $lastexpenseaccno = $form->{"expense_accno_$i"};
+      $last_expense_accno_tax_id_key = $expense_key;
 
       # adjust and round sellprice
       $form->{"sellprice_$i"} = $form->round_amount($form->{"sellprice_$i"} * $form->{exchangerate}, $decimalplaces);
 
       next if $payments_only;
 
-      # update lastcost
-      $query = qq|UPDATE parts SET lastcost = ? WHERE id = ?|;
-      do_query($form, $dbh, $query, $form->{"sellprice_$i"} / $basefactor, conv_i($form->{"id_$i"}));
+      # change lastcost for part and all assemblies and assortments recursively
+      my $a = SL::DB::Part->load_cached(conv_i($form->{"id_$i"}));
+      my $part_price_factor = $a->price_factor_id ? $a->price_factor->factor : 1;
+      my $new_lastcost      = abs($fxsellprice * $form->{exchangerate} / $basefactor / $price_factor * $part_price_factor);
+      if ( abs($a->lastcost - $new_lastcost) >= 0.009 ) {
+        $a->update_attributes(lastcost => $new_lastcost);
+        $a->set_lastcost_assemblies_and_assortiments;
+      }
     }
 
     next if $payments_only;
@@ -410,6 +459,7 @@ sub _post_invoice {
                            project_id = ?, serialnumber = ?, price_factor_id = ?,
                            price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?,
                            active_price_source = ?, active_discount_source = ?
+                           ,expense_chart_id = ?, inventory_chart_id = ?, tax_id = ?, tax_chart_type = ?
         WHERE id = ?
 SQL
 
@@ -417,9 +467,10 @@ SQL
                $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"} * -1,
                $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
                $form->{"unit_$i"}, conv_date($form->{deliverydate}),
-               conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"},
+               conv_i($form->{"project_id_$i"}), trim($form->{"serialnumber_$i"}),
                conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}),
                $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
+               $form->{"expense_chart_id_$i"}, $form->{"inventory_chart_id_$i"}, $form->{"tax_id_$i"}, $form->{"tax_chart_type_$i"},
                conv_i($form->{"invoice_id_$i"}));
     do_query($form, $dbh, $query, @values);
     push @processed_invoice_ids, $form->{"invoice_id_$i"};
@@ -477,10 +528,11 @@ SQL
     $netamount = $amount;
 
     foreach $item (split / /, $form->{taxaccounts}) {
-      $amount                               = $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate};
-      $form->{amount}{ $form->{id} }{$item} = $form->round_amount($amount, 2);
+      my $key = $item . "_" . $form->{"${item}_tax_id"};
+      $amount = $form->{amount}{$key}{amount} * $form->{exchangerate};
+      $form->{amount}{$key}{amount} = $form->round_amount($amount, 2);
 
-      $amount     = $form->{amount}{ $form->{id} }{$item} * -1;
+      $amount     = $form->{amount}{$key}{amount} * -1;
       $tax       += $amount;
       $netamount -= $amount;
     }
@@ -493,33 +545,33 @@ SQL
     # in the sales invoice case rounding errors only have to be corrected for
     # income accounts, it is enough to add the total rounding error to one of
     # the income accounts, with the one assigned to the last row being used
-    # (lastinventoryaccno)
+    # (last_inventory_accno_tax_id_key)
 
     # in the purchase invoice case rounding errors may be split between
     # inventory accounts and expense accounts. After rounding, an error of 1
     # cent is introduced if the total rounding error exceeds 0.005. The total
     # error is made up of $invoicediff and $expensediff, however, so if both
     # values are below 0.005, but add up to a total >= 0.005, correcting
-    # lastinventoryaccno and lastexpenseaccno separately has no effect after
+    # last_inventory_accno_tax_id_key and last_expense_accno_tax_id_key separately has no effect after
     # rounding. This caused bug 1579. Therefore when the combined total exceeds
     # 0.005, but neither do individually, the account with the larger value
     # shall receive the total rounding error, and the next time it is rounded
     # the 1 cent correction will be introduced.
 
-    $form->{amount}{ $form->{id} }{$lastinventoryaccno} -= $invoicediff if $lastinventoryaccno;
-    $form->{amount}{ $form->{id} }{$lastexpenseaccno}   -= $expensediff if $lastexpenseaccno;
+    $form->{amount}{$last_inventory_accno_tax_id_key}{amount} -= $invoicediff if $last_inventory_accno_tax_id_key;
+    $form->{amount}{$last_expense_accno_tax_id_key}{amount}   -= $expensediff if $last_expense_accno_tax_id_key;
 
     if ( (abs($expensediff)+abs($invoicediff)) >= 0.005 and abs($expensediff) < 0.005 and abs($invoicediff) < 0.005 ) {
 
       # in total the rounding error adds up to 1 cent effectively, correct the
       # larger of the two numbers
 
-      if ( abs($form->{amount}{ $form->{id} }{$lastinventoryaccno}) > abs($form->{amount}{ $form->{id} }{$lastexpenseaccno}) ) {
+      if ( abs($form->{amount}{$last_inventory_accno_tax_id_key}{amount}) > abs($form->{amount}{$last_expense_accno_tax_id_key}{amount}) ) {
         # $invoicediff has already been deducted, now also deduct expensediff
-        $form->{amount}{ $form->{id} }{$lastinventoryaccno}   -= $expensediff;
+        $form->{amount}{$last_inventory_accno_tax_id_key}{amount} -= $expensediff;
       } else {
         # expensediff has already been deducted, now also deduct invoicediff
-        $form->{amount}{ $form->{id} }{$lastexpenseaccno}   -= $invoicediff;
+        $form->{amount}{$last_expense_accno_tax_id_key}{amount}   -= $invoicediff;
       };
     };
 
@@ -529,57 +581,66 @@ SQL
     $netamount = $amount;
 
     foreach my $item (split / /, $form->{taxaccounts}) {
-      $form->{amount}{ $form->{id} }{$item}  = $form->round_amount($form->{amount}{ $form->{id} }{$item}, 2);
-      $amount                                = $form->round_amount( $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate} * -1, 2);
-      $paiddiff                             += $amount - $form->{amount}{ $form->{id} }{$item} * $form->{exchangerate} * -1;
-      $form->{amount}{ $form->{id} }{$item}  = $form->round_amount($amount * -1, 2);
-      $amount                                = $form->{amount}{ $form->{id} }{$item} * -1;
-      $tax                                  += $amount;
+      my $key = $item . "_" . $form->{"${item}_tax_id"};
+      $form->{amount}{$key}{amount}  = $form->round_amount($form->{amount}{$key}{amount}, 2);
+      $amount                        = $form->round_amount( $form->{amount}{$key}{amount} * $form->{exchangerate} * -1, 2);
+      $paiddiff                     += $amount - $form->{amount}{$key}{amount} * $form->{exchangerate} * -1;
+      $form->{amount}{$key}{amount}  = $form->round_amount($amount * -1, 2);
+      $amount                        = $form->{amount}{$key}{amount} * -1;
+      $tax                          += $amount;
     }
   }
 
-  $form->{amount}{ $form->{id} }{ $form->{AP} } = $netamount + $tax;
-
-
-  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $paiddiff, 2) if $form->{paid} != 0;
-
-# update exchangerate
-
-  $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, 0, $form->{exchangerate})
-    if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
-
-# record acc_trans transactions
+  # record acc_trans transactions
   my $taxdate = $form->{tax_point} || $form->{deliverydate} || $form->{invdate};
-  foreach my $trans_id (keys %{ $form->{amount} }) {
-    foreach my $accno (keys %{ $form->{amount}{$trans_id} }) {
-      $form->{amount}{$trans_id}{$accno} = $form->round_amount($form->{amount}{$trans_id}{$accno}, 2);
+  foreach my $accno_tax_id_key (keys %{ $form->{amount} }) {
+    $form->{amount}{$accno_tax_id_key}{amount} = $form->round_amount($form->{amount}{$accno_tax_id_key}{amount}, 2);
+
+
+    next if $payments_only || !$form->{amount}{$accno_tax_id_key}{amount};
+    my $amount = $form->{amount}{$accno_tax_id_key}{amount};
+    my $accno  = $form->{amount}{$accno_tax_id_key}{accno};
+    my $tax_id = $form->{amount}{$accno_tax_id_key}{tax_id};
+
+    $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id, chart_link)
+                VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+                (SELECT taxkey
+                 FROM tax
+                 WHERE id = ?),
+                ?,
+                ?,
+                (SELECT link FROM chart WHERE accno = ?))|;
+    @values = (conv_i($form->{id}), $accno, $amount,
+               conv_date($form->{invdate}), $tax_id, $project_id, $tax_id, $accno);
+    do_query($form, $dbh, $query, @values);
+  }
 
+  my $ap_amount = $netamount + $tax;
+  my $ap_accno  = $form->{AP};
+  $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id, chart_link)
+              VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
+              (SELECT taxkey_id
+               FROM taxkeys
+               WHERE chart_id= (SELECT id
+                                FROM chart
+                                WHERE accno = ?)
+               AND startdate <= ?
+               ORDER BY startdate DESC LIMIT 1),
+              ?,
+              (SELECT tax_id
+               FROM taxkeys
+               WHERE chart_id= (SELECT id
+                                FROM chart
+                                WHERE accno = ?)
+               AND startdate <= ?
+               ORDER BY startdate DESC LIMIT 1),
+              (SELECT link FROM chart WHERE accno = ?))|;
+  @values = (conv_i($form->{id}), $ap_accno, $ap_amount,
+             conv_date($form->{invdate}), $ap_accno, conv_date($taxdate), $project_id, $ap_accno, conv_date($taxdate), $ap_accno);
+  do_query($form, $dbh, $query, @values) unless $payments_only;
 
-      next if $payments_only || !$form->{amount}{$trans_id}{$accno};
 
-      $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, tax_id, chart_link)
-                  VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
-                  (SELECT taxkey_id
-                   FROM taxkeys
-                   WHERE chart_id= (SELECT id
-                                    FROM chart
-                                    WHERE accno = ?)
-                   AND startdate <= ?
-                   ORDER BY startdate DESC LIMIT 1),
-                  ?,
-                  (SELECT tax_id
-                   FROM taxkeys
-                   WHERE chart_id= (SELECT id
-                                    FROM chart
-                                    WHERE accno = ?)
-                   AND startdate <= ?
-                   ORDER BY startdate DESC LIMIT 1),
-                  (SELECT link FROM chart WHERE accno = ?))|;
-      @values = ($trans_id, $accno, $form->{amount}{$trans_id}{$accno},
-                 conv_date($form->{invdate}), $accno, conv_date($taxdate), $project_id, $accno, conv_date($taxdate), $accno);
-      do_query($form, $dbh, $query, @values);
-    }
-  }
+  $form->{paid} = $form->round_amount($form->{paid} * $form->{exchangerate} + $paiddiff, 2) if $form->{paid} != 0;
 
   # deduct payment differences from paiddiff
   for my $i (1 .. $form->{paidaccounts}) {
@@ -591,7 +652,7 @@ SQL
 
   # force AP entry if 0
 
-  $form->{amount}{ $form->{id} }{ $form->{AP} } = $form->{paid} if $form->{amount}{$form->{id}}{$form->{AP}} == 0;
+  $ap_amount = $form->{paid} if $ap_amount == 0;
 
   my %already_cleared = %{ $params{already_cleared} // {} };
 
@@ -619,7 +680,7 @@ SQL
                     :                                                                                'f';
 
     # record AP
-    if ($form->{amount}{ $form->{id} }{ $form->{AP} } != 0) {
+    if ($ap_amount != 0) {
       $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, project_id, cleared, tax_id, chart_link)
                   VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?,
                           (SELECT taxkey_id
@@ -691,7 +752,8 @@ SQL
 
     $paiddiff = 0;
 
-    # update exchange rate
+    # update exchange rate for PAYMENTS
+    $form->{script} = 'ir.pl';
     $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, 0, $form->{"exchangerate_$i"})
       if ($form->{currency} ne $defaultcurrency) && !$exchangerate;
   }
@@ -779,7 +841,8 @@ SQL
   $form->add_shipto($dbh, $form->{id}, "AP");
 
   # delete zero entries
-  do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE amount = 0|);
+  do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE amount = 0 AND trans_id = ?|, $form->{id});
+
 
   Common::webdav_folder($form);
 
@@ -845,6 +908,9 @@ SQL
     }
   }
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   return 1;
 }
 
@@ -939,12 +1005,6 @@ sub delete_invoice {
 
     my @values = (conv_i($form->{id}));
 
-    # delete zero entries
-    # wtf? use case for this?
-    $query = qq|DELETE FROM acc_trans WHERE amount = 0|;
-    do_query($form, $dbh, $query);
-
-
     my @queries = (
       qq|DELETE FROM invoice WHERE trans_id = ?|,
       qq|DELETE FROM ap WHERE id = ?|,
@@ -1014,7 +1074,7 @@ sub retrieve_invoice {
   $form->{mtime} = $form->{itime} if !$form->{mtime};
   $form->{lastmtime} = $form->{mtime};
 
-  $form->{exchangerate}  = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "sell");
+  ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, "sell", conv_i($form->{id}), 'ap');
 
   # get shipto
   $query = qq|SELECT * FROM shipto WHERE (trans_id = ?) AND (module = 'AP')|;
@@ -1039,6 +1099,7 @@ sub retrieve_invoice {
         i.price_factor_id, i.price_factor, i.marge_price_factor, i.discount, i.active_price_source, i.active_discount_source,
         p.partnumber, p.part_type, pr.projectnumber, pg.partsgroup
         ,p.classification_id
+        ,i.expense_chart_id, i.inventory_chart_id, i.tax_id, i.tax_chart_type
 
         FROM invoice i
         JOIN parts p ON (i.parts_id = p.id)
@@ -1072,27 +1133,40 @@ sub retrieve_invoice {
     }
 
     # get tax rates and description
-    my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
-    $query =
-      qq|SELECT c.accno, t.taxdescription, t.rate, t.id as tax_id,
-                c.accno as taxnumber   -- taxnumber is same as accno, but still accessed as taxnumber in code
-         FROM tax t
-         LEFT JOIN chart c ON (c.id = t.chart_id)
-         WHERE t.id in
-           (SELECT tk.tax_id FROM taxkeys tk
-            WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
-              AND (startdate <= $transdate)
-            ORDER BY startdate DESC
-            LIMIT 1)
-         ORDER BY c.accno|;
-    my $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
-    $ref->{taxaccounts} = "";
+    my $get_default_tax = $ref->{tax_id} eq '' ? 1 : 0;
+    my $stw;
+    if ($get_default_tax) {
+      my $accno_id = ($form->{vc} eq "customer") ? $ref->{income_accno} : $ref->{expense_accno};
+      my $query =
+        qq|SELECT c.accno, t.taxdescription, t.rate, t.id as tax_id,
+                  c.accno as taxnumber   -- taxnumber is same as accno, but still accessed as taxnumber in code
+           FROM tax t
+           LEFT JOIN chart c ON (c.id = t.chart_id)
+           WHERE t.id in
+             (SELECT tk.tax_id FROM taxkeys tk
+              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
+                AND (startdate <= $transdate)
+              ORDER BY startdate DESC
+              LIMIT 1)
+           ORDER BY c.accno|;
+      $stw = prepare_execute_query($form, $dbh, $query, $accno_id);
+
+    } else { # use saved tax_id
+      my $query =
+        qq|SELECT c.accno, t.taxdescription, t.rate, t.id as tax_id,
+                  c.accno as taxnumber   -- taxnumber is same as accno, but still accessed as taxnumber in code
+           FROM tax t
+           LEFT JOIN chart c ON (c.id = t.chart_id)
+           WHERE t.id = ?
+           ORDER BY c.accno|;
+
+      $stw = prepare_execute_query($form, $dbh, $query, $ref->{tax_id});
+    }
 
-    my $i = 0;
+    $ref->{taxaccounts} = "";
     while (my $ptr = $stw->fetchrow_hashref("NAME_lc")) {
       if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
-        $i++;
-        $ptr->{accno} = $i;
+        $ptr->{accno} = "NO_ACCNO_" . $ptr->{tax_id};
       }
 
       $ref->{taxaccounts} .= "$ptr->{accno} ";
@@ -1132,7 +1206,7 @@ sub get_vendor {
   $dateformat .= "yy" if $myconfig->{dateformat} !~ /^y/;
 
   my $vid = conv_i($params->{vendor_id});
-  my $vnr = conv_i($params->{vendornumber});
+  my $vnr = $params->{vendornumber};
 
   my $duedate =
     ($params->{invdate})
@@ -1145,8 +1219,7 @@ sub get_vendor {
   if ($vid) {
     $where .= 'AND v.id = ?';
     push @values, $vid;
-  }
-  if ($vnr) {
+  } elsif ($vnr) {
     $where .= 'AND v.vendornumber = ?';
     push @values, $vnr;
   }
@@ -1164,6 +1237,8 @@ sub get_vendor {
        LEFT JOIN currencies cu    ON (v.currency_id = cu.id)
        WHERE 1=1 $where|;
   my $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
+  die t8("Cannot find a single vendor. Maybe there is no vendor yet?") unless $ref;
+
   map { $params->{$_} = $ref->{$_} } keys %$ref;
 
   # use vendor currency
@@ -1181,7 +1256,7 @@ sub get_vendor {
                  WHERE (e.currency_id = o.currency_id)
                    AND (e.transdate = o.transdate)) AS exch
               FROM oe o
-              WHERE (o.vendor_id = ?) AND (o.quotation = '0') AND (o.closed = '0')|;
+              WHERE (o.vendor_id = ?) AND (o.record_type = 'purchase_order') AND (o.closed = '0')|;
   my $sth = prepare_execute_query($form, $dbh, $query, $vid);
   while (my ($amount, $exch) = $sth->fetchrow_array()) {
     $exch = 1 unless $exch;
diff --git a/SL/IS.pm b/SL/IS.pm
index fdc70ab3a..a2bfac665 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -39,29 +39,35 @@ use List::Util qw(max sum0);
 use List::MoreUtils qw(any);
 
 use Carp;
+use Data::Dumper;
+
 use SL::AM;
 use SL::ARAP;
 use SL::CVar;
 use SL::Common;
 use SL::DATEV qw(:CONSTANTS);
+use SL::Util qw(trim);
 use SL::DBUtils;
 use SL::DO;
 use SL::GenericTranslations;
 use SL::HTML::Restrict;
+use SL::Locale::String qw(t8);
 use SL::MoreCommon;
 use SL::IC;
 use SL::IO;
 use SL::TransNumber;
 use SL::DB::Chart;
+use SL::DB::Customer;
 use SL::DB::Default;
 use SL::DB::Draft;
 use SL::DB::Tax;
 use SL::DB::TaxZone;
+use SL::DB::ValidityToken;
 use SL::TransNumber;
 use SL::DB;
 use SL::Presenter::Part qw(type_abbreviation classification_abbreviation);
-use Data::Dumper;
-
+use SL::Helper::QrBillFunctions qw(get_qrbill_account assemble_ref_number);
+use SL::Helper::ISO3166;
 use strict;
 use constant PCLASS_OK             =>   0;
 use constant PCLASS_NOTFORSALE     =>   1;
@@ -620,6 +626,32 @@ sub invoice_details {
   $form->{iap_final_amount_nofmt} = $form->{invtotal_nofmt} - $form->{iap_amount_nofmt};
   $form->{iap_final_amount}       = $form->format_amount($myconfig, $form->{iap_final_amount_nofmt}, 2);
 
+  # set variables for swiss QR bill, if feature enabled
+  # handling errors gracefully (don't die if undef)
+  my $create_qrbill_invoices = $::instance_conf->get_create_qrbill_invoices;
+  if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') {
+    my ($qr_account, $error) = get_qrbill_account();
+
+    # case 1: QR-Reference number and QR-IBAN
+    # case 2: without reference number and regular IBAN
+    if ($create_qrbill_invoices == 1) {
+      $form->{qrbill_iban} = $qr_account->{qr_iban};
+    } elsif ($create_qrbill_invoices == 2) {
+      $form->{qrbill_iban} = $qr_account->{iban};
+    }
+
+    my $biller_country = $::instance_conf->get_address_country() || 'CH';
+    my $biller_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($biller_country);
+    $form->{qrbill_biller_countrycode} = $biller_countrycode;
+
+    my $customer_country = $form->{billing_address_id} ?
+                            $form->{billing_address_country} || 'CH' :
+                            $form->{country} || 'CH';
+    my $customer_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($customer_country);
+    $form->{qrbill_customer_countrycode} = $customer_countrycode;
+
+    $form->{qrbill_amount} = sprintf("%.2f", $form->parse_amount($myconfig, $form->{'total'}));
+  }
   $main::lxdebug->leave_sub();
 }
 
@@ -741,6 +773,16 @@ sub post_invoice {
 sub _post_invoice {
   my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
 
+  my $validity_token;
+  if (!$form->{id}) {
+    $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+      scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST(),
+      token => $form->{form_validity_token},
+    );
+
+    die $::locale->text('The form is not valid anymore.') if !$validity_token;
+  }
+
   my $payments_only = $params{payments_only};
   my $dbh = $provided_dbh || SL::DB->client->dbh;
   my $restricter = SL::HTML::Restrict->create;
@@ -793,14 +835,23 @@ sub _post_invoice {
   if ($form->{currency} eq $defaultcurrency) {
     $form->{exchangerate} = 1;
   } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, 'buy');
+    $exchangerate         = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, 'buy');
+    $form->{exchangerate} = $form->parse_amount($myconfig, $form->{exchangerate}, 5);
+
+    # if default exchangerate is not defined, define one
+    unless ($exchangerate) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate}, $form->{exchangerate}, 0);
+      # delete records exchangerate -> if user sets new invdate for record
+      $query = qq|UPDATE ar set exchangerate = NULL where id = ?|;
+      do_query($form, $dbh, $query, $form->{"id"});
+    }
+    # update record exchangerate, if the default is set and differs from current
+    if ($exchangerate && ($form->{exchangerate} != $exchangerate)) {
+      $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate},
+                                 $form->{exchangerate}, 0, $form->{id}, 'ar');
+    }
   }
 
-  $form->{exchangerate} =
-    ($exchangerate)
-    ? $exchangerate
-    : $form->parse_amount($myconfig, $form->{exchangerate});
-
   $form->{expense_inventory} = "";
 
   my %baseunits;
@@ -916,7 +967,11 @@ sub _post_invoice {
 
       next if $payments_only;
 
-      if ($form->{"inventory_accno_$i"} || $form->{"part_type_$i"} eq 'assembly') {
+
+
+      # do cogs only if inventory_sytem perpetual is active
+      if  ($::instance_conf->get_inventory_system eq 'perpetual'
+        && $form->{"inventory_accno_$i"} || $form->{"part_type_$i"} eq 'assembly') {
 
         if ($form->{"part_type_$i"} eq 'assembly') {
           # record assembly item as allocated
@@ -969,7 +1024,7 @@ SQL
                  $form->{"sellprice_$i"}, $fxsellprice,
                  $form->{"discount_$i"}, $allocated, 'f',
                  $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
-                 $form->{"serialnumber_$i"}, $pricegroup_id,
+                 trim($form->{"serialnumber_$i"}), $pricegroup_id,
                  $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
                  $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
                  $form->{"lastcost_$i"},
@@ -990,7 +1045,7 @@ SQL
                                   dbh          => $dbh);
     }
     # link previous items with invoice items
-    foreach (qw(delivery_order_items orderitems invoice)) {
+    foreach (qw(delivery_order_items orderitems invoice reclamation_items)) {
       if (!$form->{useasnew} && $form->{"converted_from_${_}_id_$i"}) {
         RecordLinks->create_links('dbh'        => $dbh,
                                   'mode'       => 'ids',
@@ -1077,12 +1132,6 @@ SQL
   # reverse AR
   $form->{amount}{ $form->{id} }{ $form->{AR} } *= -1;
 
-  # update exchangerate
-  if (($form->{currency} ne $defaultcurrency) && !$exchangerate) {
-    $form->update_exchangerate($dbh, $form->{currency}, $form->{invdate},
-                               $form->{exchangerate}, 0);
-  }
-
   $project_id = conv_i($form->{"globalproject_id"});
   # entsprechend auch beim Bestimmen des Steuerschlüssels in Taxkey.pm berücksichtigen
   my $taxdate = $form->{tax_point} ||$form->{deliverydate} || $form->{invdate};
@@ -1137,6 +1186,8 @@ SQL
           }
           # no tax, no prob
           if ($tax and $tax->rate != 0) {
+            die "Need a valid chart id for table defaults column advance_payment_taxable_7"  if $tax->taxkey == 2 && ! $::instance_conf->get_advance_payment_taxable_7_id;
+            die "Need a valid chart id for table defaults column advance_payment_taxable_19" if $tax->taxkey == 3 && ! $::instance_conf->get_advance_payment_taxable_19_id;
             my $transfer_chart = $tax->taxkey == 2 ? SL::DB::Chart->new(id => $::instance_conf->get_advance_payment_taxable_7_id)->load
                               :  $tax->taxkey == 3 ? SL::DB::Chart->new(id => $::instance_conf->get_advance_payment_taxable_19_id)->load
                               :  undef;
@@ -1411,8 +1462,10 @@ SQL
 
       $diff = 0;
 
-      # update exchange rate
+      # update exchange rate for PAYMENTS
+      # exchangerate contains a new exchangerate of the payment date
       if (($form->{currency} ne $defaultcurrency) && !$exchangerate) {
+        $form->{script} = 'is.pl';
         $form->update_exchangerate($dbh, $form->{currency},
                                    $form->{"datepaid_$i"},
                                    $form->{"exchangerate_$i"}, 0);
@@ -1467,6 +1520,43 @@ SQL
 
   $amount = $form->round_amount( $netamount + $tax, 2, 1);
 
+  # qr reference
+  my $qr_reference;
+  if ($form->{has_qr_reference}) {
+    # (re-)generate reference number
+
+    # get qr-account data
+    my ($qr_account, $error) = get_qrbill_account();
+    die $error if !$qr_account;
+
+    # get customer object
+    my $customer_obj = SL::DB::Customer->load_cached(conv_i($form->{customer_id}));
+
+    # assemble reference number with check digit
+    ($qr_reference, $error) = assemble_ref_number($qr_account->{bank_account_id},
+                                                  $customer_obj->{customernumber},
+                                                  $form->{invnumber});
+    die $error if !$qr_reference;
+  } else {
+    # if the reference number has been previously defined keep it
+    if (defined $form->{qr_reference}) {
+      $qr_reference = $form->{qr_reference};
+    } else {
+      $qr_reference = undef;
+    }
+  }
+
+  # add invoice number to unstructured message if feature enabled in client config
+  my $qr_unstructured_message = $form->{"qr_unstructured_message"};
+  if ($::instance_conf->get_qrbill_copy_invnumber && $form->{formname} eq 'invoice') {
+    my $invnumber = $form->{"invnumber"};
+    if ($qr_unstructured_message eq '') {
+      $qr_unstructured_message = $invnumber;
+    } elsif (rindex($qr_unstructured_message, $invnumber) == -1) {
+      $qr_unstructured_message .= '; ' . $invnumber;
+    }
+  }
+
   # save AR record
   #erweiterung fuer lieferscheinnummer (donumber) 12.02.09 jb
 
@@ -1484,7 +1574,7 @@ SQL
                 globalproject_id               = ?, delivery_customer_id             = ?,
                 transaction_description        = ?, delivery_vendor_id               = ?,
                 donumber    = ?, invnumber_for_credit_note = ?,        direct_debit  = ?, qrbill_without_amount = ?,
-                delivery_term_id = ?
+                qr_reference = ?, qr_unstructured_message = ?, delivery_term_id = ?
               WHERE id = ?|;
   @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
              conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}), conv_date($form->{tax_point}), conv_i($form->{"customer_id"}),
@@ -1498,7 +1588,7 @@ SQL
                 conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}),
                        $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
                        $form->{"donumber"}, $form->{"invnumber_for_credit_note"},        $form->{direct_debit} ? 't' : 'f', $form->{qrbill_without_amount} ? 't' : 'f',
-                conv_i($form->{delivery_term_id}),
+                $qr_reference, $qr_unstructured_message, conv_i($form->{delivery_term_id}),
                 conv_i($form->{"id"}));
   do_query($form, $dbh, $query, @values);
 
@@ -1512,6 +1602,14 @@ SQL
          WHERE id = ?!;
     do_query($form, $dbh, $query, "Rechnung storniert am $form->{invdate} ", conv_i($form->{"storno_id"}));
     do_query($form, $dbh, qq|UPDATE ar SET paid = amount WHERE id = ?|, conv_i($form->{"id"}));
+
+    $query = <<SQL;
+      UPDATE orderitems
+      SET recurring_billing_invoice_id = NULL
+      WHERE recurring_billing_invoice_id = ?
+SQL
+
+    do_query($form, $dbh, $query, conv_i($form->{"storno_id"}));
   }
 
   # maybe we are in a larger transaction and the current
@@ -1529,27 +1627,18 @@ SQL
 
   Common::webdav_folder($form);
 
-  if ($form->{convert_from_ar_ids}) {
-    RecordLinks->create_links('dbh'        => $dbh,
-                              'mode'       => 'ids',
-                              'from_table' => 'ar',
-                              'from_ids'   => $form->{convert_from_ar_ids},
-                              'to_table'   => 'ar',
-                              'to_id'      => $form->{id},
-    );
-    delete $form->{convert_from_ar_ids};
-  }
-
   # Link this record to the records it was created from.
-  if ($form->{convert_from_oe_ids}) {
-    RecordLinks->create_links('dbh'        => $dbh,
-                              'mode'       => 'ids',
-                              'from_table' => 'oe',
-                              'from_ids'   => $form->{convert_from_oe_ids},
-                              'to_table'   => 'ar',
-                              'to_id'      => $form->{id},
+  foreach (qw(oe ar reclamations)) {
+    if ($form->{"convert_from_${_}_ids"}) {
+      RecordLinks->create_links('dbh'        => $dbh,
+                                'mode'       => 'ids',
+                                'from_table' => $_,
+                                'from_ids'   => $form->{"convert_from_${_}_ids"},
+                                'to_table'   => 'ar',
+                                'to_id'      => $form->{id},
       );
-    delete $form->{convert_from_oe_ids};
+      delete $form->{"convert_from_${_}_ids"};
+    }
   }
 
   my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
@@ -1616,6 +1705,9 @@ SQL
     $shop->connector->set_orderstatus($shop_order->shop_trans_id, "completed");
   }
 
+  $validity_token->delete if $validity_token;
+  delete $form->{form_validity_token};
+
   return 1;
 }
 
@@ -1684,7 +1776,7 @@ sub transfer_out {
     my ($err, $qty, $wh_id, $bin_id, $chargenumber);
 
     if ($::instance_conf->get_sales_serial_eq_charge && $form->{"serialnumber_$i"}) {
-      my @serials = split(" ", $form->{"serialnumber_$i"});
+      my @serials = split(" ", trim($form->{"serialnumber_$i"}));
       if (scalar @serials != $form->{"qty_$i"}) {
         push @errors, $::locale->text("Cannot transfer #1 qty with #2 serial number(s)", $form->{"qty_$i"}, scalar @serials);
         last;
@@ -2251,7 +2343,7 @@ sub _retrieve_invoice {
            a.mtime, a.itime,
            a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type,
            a.transaction_description, a.donumber, a.invnumber_for_credit_note,
-           a.marge_total, a.marge_percent, a.direct_debit, a.qrbill_without_amount, a.delivery_term_id,
+           a.marge_total, a.marge_percent, a.direct_debit, a.qrbill_without_amount, a.qr_reference, a.qr_unstructured_message, a.delivery_term_id,
            dc.dunning_description,
            e.name AS employee
          FROM ar a
@@ -2263,11 +2355,12 @@ sub _retrieve_invoice {
     $form->{mtime} = $form->{itime} if !$form->{mtime};
     $form->{lastmtime} = $form->{mtime};
 
-    $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
+    ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate($myconfig, $form->{currency}, $form->{invdate}, "buy", $id, 'ar');
 
     foreach my $vc (qw(customer vendor)) {
       next if !$form->{"delivery_${vc}_id"};
-      ($form->{"delivery_${vc}_string"}) = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|, $id);
+      ($form->{"delivery_${vc}_string"}) = selectrow_query($form, $dbh, qq|SELECT name FROM customer WHERE id = ?|,
+                                                           $form->{"delivery_${vc}_id"});
     }
 
     # get shipto
@@ -2445,7 +2538,7 @@ sub get_customer {
        LEFT JOIN currencies cu ON (c.currency_id=cu.id)
        WHERE 1 = 1 $where|;
   $ref = selectfirst_hashref_query($form, $dbh, $query, @values);
-
+  die t8("Cannot find a single customer. Maybe there is no customer yet?") unless $ref;
   delete $ref->{salesman_id} if !$ref->{salesman_id};
   delete $ref->{payment_id}  if !$ref->{payment_id};
 
@@ -2492,7 +2585,7 @@ sub get_customer {
             AND e.transdate = o.transdate)
        FROM oe o
        WHERE o.customer_id = ?
-         AND o.quotation = '0'
+         AND o.record_type = 'sales_order'
          AND o.closed = '0'|;
   my $sth = prepare_execute_query($form, $dbh, $query, $cid);
 
diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index acb34c582..e214c0574 100644
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -19,7 +19,6 @@ BEGIN {
   { name => "parent",                              url => "http://search.cpan.org/~corion/",    debian => 'libparent-perl' },
   { name => "Algorithm::CheckDigits",              url => "http://search.cpan.org/~mamawe/",    debian => 'libalgorithm-checkdigits-perl' },
   { name => "Archive::Zip",    version => '1.40',  url => "http://search.cpan.org/~phred/",     debian => 'libarchive-zip-perl' },
-  { name => "CAM::PDF",                            url => "https://metacpan.org/pod/CAM::PDF",  debian => 'libcam-pdf-perl' },
   { name => "CGI",             version => '3.43',  url => "http://search.cpan.org/~leejo/",     debian => 'libcgi-pm-perl' }, # 4.09 is not core anymore (perl 5.20)
   { name => "Clone",                               url => "http://search.cpan.org/~rdf/",       debian => 'libclone-perl' },
   { name => "Config::Std",                         url => "http://search.cpan.org/~dconway/",   debian => 'libconfig-std-perl' },
@@ -34,6 +33,7 @@ BEGIN {
   { name => "Exception::Class", version => '1.44', url => "https://metacpan.org/pod/Exception::Class", debian => 'libexception-class-perl' },
   { name => "Email::Address",  version => '1.888', url => "http://search.cpan.org/~rjbs/",      debian => 'libemail-address-perl' },
   { name => "Email::MIME",                         url => "http://search.cpan.org/~rjbs/",      debian => 'libemail-mime-perl' },
+  { name => "Encode::IMAPUTF7",                    url => "https://metacpan.org/pod/Encode::IMAPUTF7", debian => 'libencode-imaputf7-perl' },
   { name => "FCGI",            version => '0.72',  url => "http://search.cpan.org/~mstrout/",   debian => 'libfcgi-perl' },
   { name => "File::Copy::Recursive",               url => "http://search.cpan.org/~dmuey/",     debian => 'libfile-copy-recursive-perl' },
   { name => "File::Flock",   version => '2008.01', url => "http://search.cpan.org/~muir/",      debian => 'libfile-flock-perl' },
@@ -52,6 +52,7 @@ BEGIN {
   { name => "LWP::Authen::Digest",                 url => "http://search.cpan.org/~gaas/",      debian => 'libwww-perl', dist_name => 'libwww-perl' },
   { name => "LWP::UserAgent",                      url => "http://search.cpan.org/~gaas/",      debian => 'libwww-perl', dist_name => 'libwww-perl' },
   { name => "Math::Round",                         url => "https://metacpan.org/pod/Math::Round", debian => 'libmath-round-perl' },
+  { name => "Mail::IMAPClient",                    url => "https://metacpan.org/pod/Mail::IMAPClient", debian => 'libmail-imapclient-perl' },
   { name => "Params::Validate",                    url => "http://search.cpan.org/~drolsky/",   debian => 'libparams-validate-perl' },
   { name => "PBKDF2::Tiny",    version => '0.005', url => "http://search.cpan.org/~dagolden/",  debian => 'libpbkdf2-tiny-perl' },
   { name => "PDF::API2",       version => '2.000', url => "http://search.cpan.org/~areibens/",  debian => 'libpdf-api2-perl' },
@@ -69,12 +70,14 @@ BEGIN {
   { name => "Text::Unidecode",                     url => "http://search.cpan.org/~sburke/",    debian => 'libtext-unidecode-perl' },
   { name => "Try::Tiny",                           url => "https://metacpan.org/release/Try-Tiny", debian => 'libtry-tiny-perl' },
   { name => "URI",             version => '1.35',  url => "http://search.cpan.org/~gaas/",      debian => 'liburi-perl' },
+  { name => "UUID::Tiny",                          url => "https://metacpan.org/pod/UUID::Tiny",  debian => 'libuuid-tiny-perl' },
   { name => "XML::LibXML",                         url => "https://metacpan.org/pod/XML::LibXML", debian => 'libxml-libxml-perl' },
   { name => "XML::Writer",     version => '0.602', url => "http://search.cpan.org/~josephw/",   debian => 'libxml-writer-perl' },
   { name => "YAML",            version => '0.62',  url => "http://search.cpan.org/~ingy/",      debian => 'libyaml-perl' },
 );
 
 @optional_modules = (
+  { name => 'HTTP::DAV', version => 0.46,          url => 'http://search.cpan.org/~cosimo/',    debian => 'libhttp-dav-perl' },
   { name => "IO::Socket::SSL",                     url => "http://search.cpan.org/~sullr/",     debian => 'libio-socket-ssl-perl' },
   { name => "Net::LDAP",                           url => "http://search.cpan.org/~gbarr/",     debian => 'libnet-ldap-perl' },
   # Net::SMTP is core since 5.7.3
@@ -98,6 +101,10 @@ BEGIN {
   { name => "URI::Find",                           url => "http://search.cpan.org/~mschwern/",  debian => 'liburi-find-perl' },
   { name => "GD",              version => '2.00',  url => "http://search.cpan.org/~lds/",       debian => 'libgd-perl' },
   { name => "Rose::DB::Object", version => 0.809,  url => "http://search.cpan.org/~jsiracusa/", debian => 'librose-db-object-perl' },
+  { name => "PPI",                                 url => "ttps://metacpan.org/pod/PPI",        debian => 'libppi-perl' },
+
+  # first available in debian trixie and ubuntu 23.10
+  { name => "HTML::Query",                         url => "http://search.cpan.org/~kamelkev/",  debian => 'libhtml-query-perl' },
 );
 
 $_->{fullname} = join ' ', grep $_, @$_{qw(name version)}
diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index 4c767961d..d03db2a5c 100644
--- a/SL/InstanceConfiguration.pm
+++ b/SL/InstanceConfiguration.pm
@@ -62,6 +62,11 @@ sub get_address {
   return join "\n", grep { $_ } ($self->get_address_street1, $self->get_address_street2, $zipcode_city, $self->get_address_country);
 }
 
+sub get_layout_style {
+  return $_[0]->data->{layout_style} if exists $_[0]->data->{layout_style};
+  return '';
+}
+
 sub AUTOLOAD {
   our $AUTOLOAD;
 
@@ -121,6 +126,11 @@ Returns an array of configured currencies.
 Returns the default currency or undef if no currency has been
 configured.
 
+=item C<get_layout_style>
+
+Returns the forced default layout style or '' if the database column
+does not exist yet.
+
 =item C<get_accounting_method>
 
 Returns the default accounting method, accrual or cash
@@ -242,14 +252,6 @@ Returns the configuration for storing documents in the corresponding WebDAV fold
 
 Returns the configuration for "vertreter"
 
-=item C<get_feature_experimental_assortment>
-
-Returns the configuration for experimental feature "assortment"
-
-=item C<get_feature_experimental_order>
-
-Returns the configuration for the experimental feature "order"
-
 =item C<get_parts_show_image>
 
 Returns the configuarion for show image in parts
diff --git a/SL/InstanceState.pm b/SL/InstanceState.pm
new file mode 100644
index 000000000..585edaedf
--- /dev/null
+++ b/SL/InstanceState.pm
@@ -0,0 +1,65 @@
+package SL::InstanceState;
+
+use strict;
+
+use SL::DB::Manager::Employee;
+
+use parent qw(Rose::Object);
+
+
+sub has_employee_project_invoices {
+  SL::DB::Manager::Employee->current && @{SL::DB::Manager::Employee->current->project_invoice_permissions};
+}
+
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::InstanceState - Provides instance-specific status information
+
+=head1 SYNOPSIS
+
+While instance configuration settings are provided via C<SL::InstanceConf>,
+this module provides non-configuration information of the instance.
+
+The intention is to use the state information in the menu, e.g. to enable
+or disable some menu entries if some condition is met.
+
+Example: If a user has no right to see invoices, the menu entry for this report
+was shown anyway, because the user may has the right to access project invoices.
+Now, the display of the menu entry can be made dependent on the status.
+See C<SL::Menu>.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<has_employee_project_invoices>
+
+Returns trueish if the current employee has the right to access
+some project invoices.
+
+=back
+
+=head1 TODO
+
+As for now, no global instance of this class is provided. If this information
+should be used in e.g. templates or some other programm code, then a global
+instance may should be provided.
+
+=head1 BUGS
+
+none so far
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut
diff --git a/SL/Layout/Admin.pm b/SL/Layout/Admin.pm
index 03832b555..57ed1c97b 100644
--- a/SL/Layout/Admin.pm
+++ b/SL/Layout/Admin.pm
@@ -1,7 +1,7 @@
 package SL::Layout::Admin;
 
 use strict;
-use parent qw(SL::Layout::None);
+use parent qw(SL::Layout::Design40Switch);
 
 use SL::Menu;
 use SL::Layout::None;
diff --git a/SL/Layout/AdminLogin.pm b/SL/Layout/AdminLogin.pm
index df482a6da..009d00d4f 100644
--- a/SL/Layout/AdminLogin.pm
+++ b/SL/Layout/AdminLogin.pm
@@ -1,7 +1,7 @@
 package SL::Layout::AdminLogin;
 
 use strict;
-use parent qw(SL::Layout::None);
+use parent qw(SL::Layout::Design40Switch);
 
 sub start_content {
   "<div id='admin' class='admin'>\n";
diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index c64a99ab0..a9f08356a 100644
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -3,6 +3,8 @@ package SL::Layout::Base;
 use strict;
 use parent qw(Rose::Object);
 
+use SL::Version;
+
 use File::Slurp qw(read_file);
 use List::MoreUtils qw(uniq);
 use Time::HiRes qw();
@@ -42,33 +44,46 @@ sub webpages_path {
   "templates/webpages";
 }
 
+sub webpages_fallback_path {
+}
+
+sub html_dialect {
+  'transitional'
+}
+
+sub allow_stylesheet_fallback {
+  1
+}
+
 sub get {
   $_[0]->sub_layouts;
   return grep { $_ } ($_[0]->sub_layouts_by_name->{$_[1]});
 }
 
-sub init_auto_reload_resources_param {
-  if ($::lx_office_conf{debug}->{auto_reload_resources}) {
-    return sprintf('?rand=%d-%d-%d', Time::HiRes::gettimeofday(), int(rand 1000000000000));
-  }
+sub _current_git_ref {
+  my $git_dir = SL::System::Process::exe_dir() . '/.git';
 
-  if ($::lx_office_conf{debug}{git_commit_reload_resources}) {
-    my $git_dir = SL::System::Process::exe_dir() . '/.git';
+  return unless -d $git_dir;
 
-    return '' unless -d $git_dir;
+  my $content = eval { scalar(read_file($git_dir . '/HEAD')) };
 
-    my $content = eval { scalar(read_file($git_dir . '/HEAD')) };
+  return unless ($content // '') =~ m{\Aref: ([^\r\n]+)};
 
-    return '' unless ($content // '') =~ m{\Aref: ([^\r\n]+)};
+  $content = eval { scalar(read_file($git_dir . '/' . $1)) };
 
-    $content = eval { scalar(read_file($git_dir . '/' . $1)) };
+  return unless ($content // '') =~ m{\A([0-9a-fA-F]+)};
 
-    return '' unless ($content // '') =~ m{\A([0-9a-fA-F]+)};
+  return $1;
+}
 
-    return '?rand=' . $1;
-  }
+sub init_auto_reload_resources_param {
+  my $value;
 
-  return '';
+  $value   = sprintf('%d-%d-%d', Time::HiRes::gettimeofday(), int(rand 1000000000000)) if $::lx_office_conf{debug}->{auto_reload_resources};
+  $value ||= _current_git_ref();
+  $value ||= SL::Version->get_version;
+
+  return $value ? "?rand=${value}" : '';
 }
 
 ##########################################
@@ -135,7 +150,7 @@ sub _find_stylesheet {
   my ($self, $stylesheet, $css_path) = @_;
 
   return "$css_path/$stylesheet" if -f "$css_path/$stylesheet";
-  return "css/$stylesheet"       if -f "css/$stylesheet";
+  return "css/$stylesheet"       if -f "css/$stylesheet" && $self->allow_stylesheet_fallback;
   return $stylesheet             if -f $stylesheet;
   return $stylesheet             if $stylesheet =~ /^http/; # external
 }
@@ -326,6 +341,58 @@ stylesheets. Javascripts are resolved relative to the C<js/> basedir.
 Setting directly with C<stylesheets> and C<javascripts> is eprecated.
 
 
+=head1 BEHAVIOUR SWITCHES FOR SUB LAYOUTS
+
+Certain methods have been added to adjust behaviour in sub layouts. Most of these are single case uses.
+
+=over 4
+
+=item * sublayouts_by_name
+
+Contains a map that holds named sublayouts. If a sublayout needs to targeted
+directly, the compositing layout needs to add it here. Initially introduced for
+the ActionPlan.
+
+=item * webpages_path
+
+Overrides the default webpages path "templates/webpages". Used for mobile and design40 styles.
+
+Note that this does not have fallback behaviour by default. It is intended for
+stylesheets where the templates are so incompatible that a complete fork of the
+templates dir is sensible.
+
+=item * webpages_fallback_path
+
+Allows partial template sets to fallback to other paths in case a template
+wasn't found. Intended to be used in conjunction with L</webpages_path>.
+
+Note: in case a template can't be found at all, generic/error.html will be
+rendered, and the fallback doesn't work in this case.
+
+
+=item * allow_stylesheet_fallback
+
+Defaults to true. The default behaviour is that stylesheets not found in the
+stylesheet path of the user will fallback to files found in css/. This is
+usually desirable for shared stuff like common.css, which contains behaviour
+styling. If a stylesheet comes from a separate generator, this can be used to
+turn falllback off. Files can still be included with the complete path though.
+A request for "common.css" would not find "css/common.css", but a request for
+"css/common.css" would be found.
+
+Also see the next section L</GORY DETAILS ABOUT JAVASCRIPT AND STYLESHEET OVERLOADING>
+
+=item * html_dialect
+
+Default 'transitional'. Controls the html dialect that the header will
+generate. Used in combination with template overriding for html5.
+
+See also L<SL::Form/header>
+
+=back
+
+
+
 =head1 GORY DETAILS ABOUT JAVASCRIPT AND STYLESHEET OVERLOADING
 
 The original code used to store one stylesheet in C<< $form->{stylesheet} >> and
diff --git a/SL/Layout/Classic.pm b/SL/Layout/Classic.pm
index e8974c143..9fedef26c 100644
--- a/SL/Layout/Classic.pm
+++ b/SL/Layout/Classic.pm
@@ -1,7 +1,7 @@
 package SL::Layout::Classic;
 
 use strict;
-use parent qw(SL::Layout::Base);
+use parent qw(SL::Layout::Design40Switch);
 
 use SL::Layout::Top;
 use SL::Layout::MenuLeft;
diff --git a/SL/Layout/Design40Switch.pm b/SL/Layout/Design40Switch.pm
new file mode 100644
index 000000000..3bf546717
--- /dev/null
+++ b/SL/Layout/Design40Switch.pm
@@ -0,0 +1,55 @@
+package SL::Layout::Design40Switch;
+
+use strict;
+use parent qw(SL::Layout::Base);
+
+sub is_design40 {
+  $::myconfig{stylesheet} =~ /design40/i;
+}
+
+sub webpages_path {
+  is_design40() ? "templates/design40_webpages" : $_[0]->SUPER::webpages_path
+}
+
+sub webpages_fallback_path {
+  is_design40() ? "templates/webpages" : $_[0]->SUPER::webpages_fallback_path
+}
+
+sub allow_stylesheet_fallback {
+  !is_design40();
+}
+
+sub html_dialect {
+  is_design40() ? 'html5' : $_[0]->SUPER::html_dialect
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Layout::Design40Switch - Layout switch for Design 4.0
+
+=head1 SYNOPSIS
+
+Detects whether the user selected the Design4.0 stylesheet, and if so,
+overrides some implementation details.
+
+=head1 DESCRIPTION
+
+Once activated, it will set the templates to use C<templates/design40_webpages> instead.
+
+It will also disable css fallback, so that common.css etc won't interfere.
+
+=head1 BUGS
+
+None yet. :)
+
+=head1 AUTHOR
+
+Sven Schöling $<lt>s.schoeling@googlemail.comE<gt>
+
+=cut
diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index de3c7f3c0..dccd9ac5a 100644
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -1,7 +1,7 @@
 package SL::Layout::Javascript;
 
 use strict;
-use parent qw(SL::Layout::Base);
+use parent qw(SL::Layout::Design40Switch);
 
 use SL::Layout::None;
 use SL::Layout::DHTMLMenu;
diff --git a/SL/Layout/Login.pm b/SL/Layout/Login.pm
index dc0a31686..d9336694b 100644
--- a/SL/Layout/Login.pm
+++ b/SL/Layout/Login.pm
@@ -1,7 +1,7 @@
 package SL::Layout::Login;
 
 use strict;
-use parent qw(SL::Layout::None);
+use parent qw(SL::Layout::Design40Switch);
 
 sub start_content {
   "<div id='login' class='login'>\n";
diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index 1504f9711..336ac5c78 100644
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -1,7 +1,7 @@
 package SL::Layout::None;
 
 use strict;
-use parent qw(SL::Layout::Base);
+use parent qw(SL::Layout::Design40Switch);
 
 use List::MoreUtils qw(apply);
 
diff --git a/SL/Layout/V3.pm b/SL/Layout/V3.pm
index dc39a1887..a79039b1d 100644
--- a/SL/Layout/V3.pm
+++ b/SL/Layout/V3.pm
@@ -1,7 +1,7 @@
 package SL::Layout::V3;
 
 use strict;
-use parent qw(SL::Layout::Base);
+use parent qw(SL::Layout::Design40Switch);
 
 use SL::Layout::None;
 use SL::Layout::Top;
diff --git a/SL/LiquidityProjection.pm b/SL/LiquidityProjection.pm
index 5954e0056..0fd489d91 100644
--- a/SL/LiquidityProjection.pm
+++ b/SL/LiquidityProjection.pm
@@ -40,11 +40,12 @@ sub new {
 # Monat ihre Saldierungsperiode haben, außer Wartungsverträgen, die
 # für den jeweiligen Monat bereits abgerechnet wurden.
 #
-# Diese Werte sollen zusätzlich optional nach Verkäufer(in) und nach
-# Buchungsgruppe aufgeschlüsselt werden.
+# Diese Werte sollen zusätzlich optional nach Verkäufer(in),
+# Buchungsgruppe und Warengruppe aufgeschlüsselt werden.
 #
 # Diese Lösung geht deshalb immer über die Positionen der Belege
-# (wegen der Buchungsgruppe) und berechnet die Summen daraus manuell.
+# (wegen der Buchungsgruppen & Warengruppen) und berechnet die Summen
+# daraus manuell.
 #
 # Alle Aufträge, deren Lieferdatum leer ist, oder deren Lieferdatum
 # vor dem aktuellen Monat liegt, werden in einer Kategorie 'alt'
@@ -70,12 +71,14 @@ sub new {
 # Monat vorgemerkt.
 #
 # 4. Es werden für alle offenen Kundenaufträge die Positionen
-# ausgelesen und mit Verkäufer(in), Buchungsgruppe verknüpft. Aus
-# Menge, Einzelpreis und Zeilenrabatt wird die Zeilensumme berechnet.
+# ausgelesen und mit Verkäufer(in), Buchungsgruppe, Warengruppe
+# verknüpft. Aus Menge, Einzelpreis und Zeilenrabatt wird die
+# Zeilensumme berechnet.
 #
 # 5. Mit den Informationen aus 3. und 4. werden Datenstrukturen
 # initialisiert, die für die Gesamtsummen, für alle Verkäufer(innen),
-# für alle Buchungsgruppen, für alle Monate Werte enthalten.
+# für alle Buchungsgruppen, für alle Warengruppen, für alle Monate
+# Werte enthalten.
 #
 # 6. Es wird über alle Einträge aus 4. iteriert. Die Zeilensummen
 # werden in den entsprechenden Datenstrukturen aus 5. addiert.
@@ -94,7 +97,8 @@ sub new {
 # den Aufträgen nie vorgekommen ist (sprich Rechnung enthält
 # Positionen, die im Auftrag nicht enthalten sind, und die komplett
 # andere Buchungsgruppen verwenden), so wird schlicht die allererste
-# in 4. gefundene Buchungsgruppe damit belastet.
+# in 4. gefundene Buchungsgruppe damit belastet. Analog passiert dies
+# auch für Warengruppen.
 
 sub create {
   my ($self)   = @_;
@@ -127,8 +131,9 @@ SQL
 
   # 2. Auslesen aktiver Wartungsvertragskonfigurationen
   $query = <<SQL;
-    SELECT (oi.qty * (1 - oi.discount) * oi.sellprice) AS linetotal,
+    SELECT (oi.qty * (1 - oi.discount) * oi.sellprice) AS linetotal, oi.recurring_billing_mode,
       bg.description AS buchungsgruppe,
+      pg.partsgroup AS parts_group,
       CASE WHEN COALESCE(e.name, '') = '' THEN e.login ELSE e.name END AS salesman,
       pcfg.periodicity, pcfg.order_value_periodicity, pcfg.id AS config_id,
       EXTRACT(year FROM pcfg.start_date) AS start_year, EXTRACT(month FROM pcfg.start_date) AS start_month
@@ -137,9 +142,13 @@ SQL
     LEFT JOIN periodic_invoices_configs pcfg ON (oi.trans_id                              = pcfg.oe_id)
     LEFT JOIN parts p                        ON (oi.parts_id                              = p.id)
     LEFT JOIN buchungsgruppen bg             ON (p.buchungsgruppen_id                     = bg.id)
+    LEFT JOIN partsgroup pg                  ON (p.partsgroup_id                          = pg.id)
     LEFT JOIN employee e                     ON (COALESCE(oe.salesman_id, oe.employee_id) = e.id)
     WHERE pcfg.active
-      AND NOT pcfg.periodicity = 'o'
+      AND (pcfg.periodicity <> 'o')
+      AND (   (oi.recurring_billing_mode = 'always')
+           OR (    (oi.recurring_billing_mode = 'once')
+               AND (oi.recurring_billing_invoice_id IS NULL)))
 SQL
 
   # 3. Iterieren über Saldierungsintervalle, vormerken
@@ -153,6 +162,15 @@ SQL
       my $billing_len = $SL::DB::PeriodicInvoicesConfig::PERIOD_LENGTHS{ $ref->{periodicity} } || 1;
 
       if (($date ge $self->{min_date}) && (!$periodic_invoices{ $ref->{config_id} } || !$periodic_invoices{ $ref->{config_id} }->{$date})) {
+        if ($ref->{recurring_billing_mode} eq 'once') {
+          push @scentries, { buchungsgruppe => $ref->{buchungsgruppe},
+                             salesman       => $ref->{salesman},
+                             linetotal      => $ref->{linetotal},
+                             date           => $date,
+                           };
+          last;
+        }
+
         my $order_value_periodicity = $ref->{order_value_periodicity} eq 'p' ? $ref->{periodicity} : $ref->{order_value_periodicity};
         my $order_value_len         = $SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIOD_LENGTHS{$order_value_periodicity} || 1;
 
@@ -160,6 +178,7 @@ SQL
                            salesman       => $ref->{salesman},
                            linetotal      => $ref->{linetotal} * $billing_len / $order_value_len,
                            date           => $date,
+                           parts_group    => $ref->{parts_group},
                          };
       }
 
@@ -172,15 +191,16 @@ SQL
   $query = <<SQL;
     SELECT (oi.qty * (1 - oi.discount) * oi.sellprice) AS linetotal,
       bg.description AS buchungsgruppe,
+      pg.partsgroup AS parts_group,
       CASE WHEN COALESCE(e.name, '') = '' THEN e.login ELSE e.name END AS salesman,
       oe.ordnumber, EXTRACT(month FROM oe.reqdate) AS month, EXTRACT(year  FROM oe.reqdate) AS year
     FROM orderitems oi
     LEFT JOIN oe                 ON (oi.trans_id                              = oe.id)
     LEFT JOIN parts p            ON (oi.parts_id                              = p.id)
     LEFT JOIN buchungsgruppen bg ON (p.buchungsgruppen_id                     = bg.id)
+    LEFT JOIN partsgroup pg      ON (p.partsgroup_id                          = pg.id)
     LEFT JOIN employee e         ON (COALESCE(oe.salesman_id, oe.employee_id) = e.id)
-    WHERE (oe.customer_id IS NOT NULL)
-      AND NOT COALESCE(oe.quotation, FALSE)
+    WHERE oe.record_type = 'sales_order'
       AND NOT COALESCE(oe.closed,    FALSE)
       AND (oe.id NOT IN (SELECT oe_id FROM periodic_invoices_configs WHERE periodicity <> 'o'))
 SQL
@@ -190,6 +210,7 @@ SQL
   my @entries               = selectall_hashref_query($::form, $dbh, $query);
   my @salesmen              = uniq map { $_->{salesman}       } (@entries, @scentries);
   my @buchungsgruppen       = uniq map { $_->{buchungsgruppe} } (@entries, @scentries);
+  my @parts_groups          = uniq map { $_->{parts_group}    } (@entries, @scentries);
   my @now                   = localtime;
   my @dates                 = map { $self->_date_for($now[5] + 1900, $now[4] + $_) } (0..$self->{params}->{months} + 1);
   my %dates_by_ordnumber    = map { $_->{ordnumber} => $self->_date_for($_) } @entries;
@@ -202,9 +223,11 @@ SQL
                         support        =>               { map { $_ => 0 } @dates },
                         salesman       => { map { $_ => { map { $_ => 0 } @dates } } @salesmen        },
                         buchungsgruppe => { map { $_ => { map { $_ => 0 } @dates } } @buchungsgruppen },
+                        parts_group    => { map { $_ => { map { $_ => 0 } @dates } } @parts_groups    },
                         sorted         => { month          => [ sort { ($date_sorter{$a} || $a) cmp ($date_sorter{$b} || $b) } @dates           ],
                                             salesman       => [ sort { $a                       cmp $b                       } @salesmen        ],
                                             buchungsgruppe => [ sort { $a                       cmp $b                       } @buchungsgruppen ],
+                                            parts_group    => [ sort { $a                       cmp $b                       } @parts_groups    ],
                                             type           => [ qw(order partial support)                                                       ],
                                           },
                       };
@@ -217,6 +240,7 @@ SQL
     $projection->{order}->{$date}                                      += $ref->{linetotal};
     $projection->{salesman}->{ $ref->{salesman} }->{$date}             += $ref->{linetotal};
     $projection->{buchungsgruppe}->{ $ref->{buchungsgruppe} }->{$date} += $ref->{linetotal};
+    $projection->{parts_group}->{ $ref->{parts_group} }->{$date}       += $ref->{linetotal};
   }
 
   # 7. Aufsummieren der Wartungsvertragspositionen
@@ -227,6 +251,7 @@ SQL
     $projection->{support}->{$date}                                    += $ref->{linetotal};
     $projection->{salesman}->{ $ref->{salesman} }->{$date}             += $ref->{linetotal};
     $projection->{buchungsgruppe}->{ $ref->{buchungsgruppe} }->{$date} += $ref->{linetotal};
+    $projection->{parts_group}->{ $ref->{parts_group} }->{$date}       += $ref->{linetotal};
   }
 
   if (%dates_by_ordnumber) {
@@ -235,11 +260,13 @@ SQL
     $query         = <<SQL;
       SELECT (i.qty * (1 - i.discount) * i.sellprice) AS linetotal,
         bg.description AS buchungsgruppe,
+        pg.partsgroup AS parts_group,
         ar.ordnumber
       FROM invoice i
       LEFT JOIN ar                 ON (i.trans_id           = ar.id)
       LEFT JOIN parts p            ON (i.parts_id           = p.id)
       LEFT JOIN buchungsgruppen bg ON (p.buchungsgruppen_id = bg.id)
+      LEFT JOIN partsgroup pg      ON (p.partsgroup_id      = pg.id)
       WHERE (ar.ordnumber IN ($ordnumbers))
 SQL
 
@@ -250,11 +277,13 @@ SQL
       my $date           = $dates_by_ordnumber{    $ref->{ordnumber} } || die;
       my $salesman       = $salesman_by_ordnumber{ $ref->{ordnumber} } || die;
       my $buchungsgruppe = $projection->{buchungsgruppe}->{ $ref->{buchungsgruppe} } ? $ref->{buchungsgruppe} : $buchungsgruppen[0];
+      my $parts_group    = $projection->{parts_group}->{    $ref->{parts_group}    } ? $ref->{parts_group}    : $parts_groups[0];
 
       $projection->{partial}->{$date}                           -= $ref->{linetotal};
       $projection->{total}->{$date}                             -= $ref->{linetotal};
       $projection->{salesman}->{$salesman}->{$date}             -= $ref->{linetotal};
       $projection->{buchungsgruppe}->{$buchungsgruppe}->{$date} -= $ref->{linetotal};
+      $projection->{parts_group}->{$parts_group}->{$date}       -= $ref->{linetotal};
     }
   }
 
@@ -300,4 +329,52 @@ sub _date_for {
   :                              $date;
 }
 
+sub orders_for_time_period {
+  my ($class, %params) = @_;
+
+  my $dbh = SL::DB::Order->new->db->dbh;
+
+  my @recurring_orders;
+
+  # 1. Alle aktiven Konfigurationen für wiederkehrende Rechnungen auslesen.
+
+  my $configs = SL::DB::Manager::PeriodicInvoicesConfig->get_all(where => [ active => 1 ]);
+
+  my %calc_params;
+  $calc_params{start_date} = $params{after}->clone                   if $params{after};
+  $calc_params{end_date}   = $params{before}->clone->add(days => -1) if $params{before};
+  $calc_params{end_date} //= $calc_params{start_date}->clone->add(years => 1);
+
+  foreach my $config (@{ $configs }) {
+    my @dates = $config->calculate_invoice_dates(%calc_params);
+    next unless @dates;
+
+    my $order = SL::DB::Order->new(id => $config->oe_id)->load(with_objects => [ qw(customer employee) ]);
+    $order->{is_recurring} = 1;
+
+    push @recurring_orders, $order;
+  }
+
+  my @where = (
+    record_type    => 'sales_order',
+    or             => [ closed    => undef, closed    => 0, ],
+  );
+  push @where, (reqdate => { ge => $params{after}->clone })  if $params{after};
+  push @where, (reqdate => { lt => $params{before}->clone }) if $params{before};
+  push @where, '!id' => [ map { $_->id } @recurring_orders ] if @recurring_orders;
+
+  # 1. Auslesen aller offenen Aufträge, deren Lieferdatum im
+  # gewünschten Bereich liegt
+  my $regular_orders = SL::DB::Manager::Order->get_all(
+    where        => \@where,
+    with_objects => [ qw(customer employee) ],
+  );
+
+  return sort {
+         ($a->transdate          <=> $b->transdate)
+      || ($a->reqdate            <=> $b->reqdate)
+      || (lc($a->customer->name) cmp lc($b->customer->name))
+  } (@recurring_orders, @{ $regular_orders });
+}
+
 1;
diff --git a/SL/Locale.pm b/SL/Locale.pm
index 3b91502d5..5bbb77ca5 100644
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -271,7 +271,7 @@ sub findsub {
   $sub_name   = first { defined(&{ "::${_}" }) } @{ $self->{texts_reverse}->{$text_rev} } if $self->{texts_reverse}->{$text_rev};
   $sub_name ||= $text_rev if ($text_rev =~ m/^[a-z][a-z0-9_]+$/) && defined &{ "::${text_rev}" };
 
-  $main::form->error("$text not defined in locale/$self->{countrycode}/all") if !$sub_name;
+  $main::form->error($self->quote_special_chars('HTML', "$text not defined in locale/$self->{countrycode}/all")) if !$sub_name;
 
   $main::lxdebug->leave_sub();
 
diff --git a/SL/MT940.pm b/SL/MT940.pm
index 2a97e5e79..825ea24c0 100644
--- a/SL/MT940.pm
+++ b/SL/MT940.pm
@@ -23,6 +23,19 @@ sub _join_entries {
     ($from..$to);
 }
 
+sub _extract_end_to_end_id {
+  my ($parts) = @_;
+
+  foreach my $value (values %{ $parts }) {
+    if ($value =~ m{^(?:end\W?to\W?end:|eref\+) *(.+)}i) {
+      my $id = $1;
+      return $id =~ m{notprovided}i ? undef : $id;
+    }
+  }
+
+  return undef;
+}
+
 sub parse {
   my ($class, $file_name, %params) = @_;
 
@@ -69,7 +82,11 @@ sub parse {
 
       $local_bank_code      = $1;
       $local_account_number = $2;
-
+    } elsif  ($line->[0] =~ m{^:25:([A-Z]{6}[A-Z0-9]{2}(?:[A-Z0-9]{3})?)/(\d+)}) {
+      # case SWIFT code with 11 chars :25:SOBKDEB2XXX/5436636296EUR
+      # https://stackoverflow.com/questions/3028150/what-is-proper-regex-expression-for-swift-codes
+      $local_bank_code      = $1;
+      $local_account_number = $2;
     } elsif ($line->[0] =~ m{^:61: (\d{2}) (\d{2}) (\d{2}) (\d{4})? (C|D|RC|RD) ([a-zA-Z]?) (\d+) (?:, (\d*))? N (.{3}) (.*)}x) {
       #                            1       2       3       4        5           6           7          8         9      10
       # :61:2008060806CR952,N051NONREF
@@ -112,11 +129,13 @@ sub parse {
       );
 
     } elsif (%transaction && ($line->[0] =~ m{^:86:})) {
-      if ($line->[0] =~ m{^:86:\d+\?(.+)}) {
+      if ($line->[0] =~ m{^:86:\d+([^\d])(.+)}) {
         # structured
-        my %parts = map { ((substr($_, 0, 2) // '0') * 1 => substr($_, 2)) } split m{\?}, $1;
+        my ($separator, $rest) = ($1, $2);
+        my %parts              = map { ((substr($_, 0, 2) // '0') * 1 => substr($_, 2)) } split quotemeta($separator), $rest;
 
-        $transaction{purpose}               = _join_entries(\%parts, 20, 29);
+        $transaction{end_to_end_id}         = _extract_end_to_end_id(\%parts);
+        $transaction{purpose}               = join ' ', grep({ $_ ne '' } _join_entries(\%parts, 20, 29), _join_entries(\%parts, 60, 63));
         $transaction{remote_name}           = _join_entries(\%parts, 32, 33, '');
         $transaction{remote_bank_code}      = $parts{30};
         $transaction{remote_account_number} = $parts{31};
diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index f242120a9..a539c1a6c 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -23,6 +23,8 @@
 
 package Mailer;
 
+use IO::Socket::INET;
+use IO::Socket::SSL;
 use Email::Address;
 use Email::MIME::Creator;
 use Encode;
@@ -38,6 +40,7 @@ use SL::DB::Employee;
 use SL::Locale::String qw(t8);
 use SL::Template;
 use SL::Version;
+use SL::IMAPClient;
 
 use strict;
 
@@ -61,6 +64,20 @@ my %type_to_table = (
   sales_delivery_order    => 'delivery_orders',
   dunning                 => 'dunning',
 );
+my %type_to_email = (
+  sales_quotation         => sub { $::instance_conf->get_email_sender_sales_quotation         },
+  request_quotation       => sub { $::instance_conf->get_email_sender_request_quotation       },
+  sales_order             => sub { $::instance_conf->get_email_sender_sales_order             },
+  purchase_order          => sub { $::instance_conf->get_email_sender_purchase_order          },
+  invoice                 => sub { $::instance_conf->get_email_sender_invoice                 },
+  credit_note             => sub { $::instance_conf->get_email_sender_invoice                 },
+  purchase_invoice        => sub { $::instance_conf->get_email_sender_purchase_invoice        },
+  letter                  => sub { $::instance_conf->get_email_sender_letter                  },
+  purchase_delivery_order => sub { $::instance_conf->get_email_sender_purchase_delivery_order },
+  sales_delivery_order    => sub { $::instance_conf->get_email_sender_sales_delivery_order    },
+  dunning                 => sub { $::instance_conf->get_email_sender_dunning                 },
+);
+
 
 sub new {
   my ($type, %params) = @_;
@@ -253,12 +270,12 @@ sub send {
   $self->{driver} = eval { $self->_create_driver };
   if (!$self->{driver}) {
     my $error = $@;
-    $self->_store_in_journal('failed', 'driver could not be created; check your configuration & log files');
+    $self->_store_in_journal('send_failed', 'driver could not be created; check your configuration & log files');
     $::lxdebug->message(LXDebug::WARN(), "Mailer error during 'send': $error");
 
     return $error;
   }
-
+  $self->_default_from;  # set from for records if configured in client config
   # Set defaults & headers
   $self->{charset}        =  'UTF-8';
   $self->{content_type} ||=  "text/plain";
@@ -270,6 +287,7 @@ sub send {
   );
   $self->{mail_attachments} = [];
 
+  my $email_as_string;
   my $error;
   my $ok = eval {
     # Clean up To/Cc/Bcc address fields
@@ -284,11 +302,21 @@ sub send {
     $self->{driver}->print($email->as_string);
     $self->{driver}->send;
 
+    $email_as_string = $email->as_string;
     1;
   };
 
   $error = $@ if !$ok;
 
+  # TODO: Error is not for sending emial
+  # in SL::Form->send_email error is treated as error for sending email
+  if ($ok) {
+    eval {$self->_store_in_imap_sent_folder($email_as_string); 1} or do {
+      $ok = 0;
+      $error = $@;
+    };
+  }
+
   # create journal and link to record
   $self->{journalentry} = $self->_store_in_journal;
   $self->_create_record_link if $self->{journalentry};
@@ -302,6 +330,36 @@ sub _all_recipients {
   return map { @{ $self->{addresses}->{$_} || [] } } qw(to cc bcc);
 }
 
+sub _get_header_string {
+  my ($self) = @_;
+  my $header_string =
+    join "\r\n",
+      (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] });
+  return $header_string;
+}
+
+sub _store_in_imap_sent_folder {
+  my ($self, $email_as_string) = @_;
+
+  my $from_email = $self->{from};
+  my $user_email = $::myconfig{email};
+  my $imap_config =
+       $::lx_office_conf{"sent_emails_in_imap/email/$from_email"}
+    || $::lx_office_conf{"sent_emails_in_imap/email/$user_email"}
+    || $::lx_office_conf{sent_emails_in_imap}
+    || {};
+  return unless ($imap_config->{enabled});
+
+  my $folder = delete $imap_config->{folder};
+  my $imap_client = SL::IMAPClient->new(%$imap_config);
+  $imap_client->store_email_in_email_folder(
+    email_as_string => $email_as_string,
+    folder => $folder ||'Sent/Kivitendo',
+  );
+
+  return 1;
+}
+
 sub _store_in_journal {
   my ($self, $status, $extended_status) = @_;
 
@@ -310,11 +368,11 @@ sub _store_in_journal {
   return if $journal_enable == 0;
 
   $status          //= $self->{driver}->status if $self->{driver};
-  $status          //= 'failed';
+  $status          //= 'send_failed';
   $extended_status //= $self->{driver}->extended_status if $self->{driver};
   $extended_status //= 'unknown error';
 
-  my $headers = join "\r\n", (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] });
+  my $headers = $self->_get_header_string;
 
   my $jentry = SL::DB::EmailJournal->new(
     sender          => SL::DB::Manager::Employee->current,
@@ -336,7 +394,7 @@ sub _create_record_link {
   my ($self) = @_;
 
   # check for custom/overloaded types and ids (form != controller)
-  my $record_type = $self->{record_type} || $::form->{type};
+  my $record_type = $self->{record_type} || $::form->{type} || '';
   my $record_id   = $self->{record_id}   || $::form->{id};
 
   # you may send mails for unsaved objects (no record_id => unlinkable case)
@@ -351,6 +409,15 @@ sub _create_record_link {
   }
 }
 
+
+sub _default_from {
+  my ($self) = @_;
+
+  my $record_type  = $self->{record_type} || $::form->{type} || $self->{driver}{form}{formname} || '';
+  my $record_email = exists $type_to_email{$record_type} ? $type_to_email{$record_type}->() : undef;
+  $self->{from}    = $record_email if $record_email;
+}
+
 1;
 
 
diff --git a/SL/Mailer/SMTP.pm b/SL/Mailer/SMTP.pm
index ce5439722..09aea0ce9 100644
--- a/SL/Mailer/SMTP.pm
+++ b/SL/Mailer/SMTP.pm
@@ -20,11 +20,13 @@ sub init {
 
   Rose::Object::init(
     @_,
-    status          => 'failed',
+    status          => 'send_failed',
     extended_status => 'no send attempt made',
   );
 
-  my $cfg           = $::lx_office_conf{mail_delivery} || {};
+  my $email         = $self->myconfig->{email};
+  my $cfg           = $::lx_office_conf{"mail_delivery/email/$email"} || $::lx_office_conf{mail_delivery} || {};
+
   $self->{security} = exists $security_config{lc $cfg->{security}} ? lc $cfg->{security} : 'none';
   my $sec_cfg       = $security_config{ $self->{security} };
 
@@ -96,11 +98,13 @@ sub send {
 
   my $ok = $self->{smtp}->dataend;
   $self->extended_status($self->{smtp}->message);
-  $self->status('ok') if $ok;
+  $self->status('sent') if $ok;
 
   $self->{smtp}->quit;
 
   delete $self->{smtp};
+
+  die $self->extended_status if !$ok;
 }
 
 sub keep_from_header {
diff --git a/SL/Mailer/Sendmail.pm b/SL/Mailer/Sendmail.pm
index 59c43cdd1..c638a3d4d 100644
--- a/SL/Mailer/Sendmail.pm
+++ b/SL/Mailer/Sendmail.pm
@@ -18,7 +18,7 @@ sub init {
 
   Rose::Object::init(
     @_,
-    status          => 'failed',
+    status          => 'send_failed',
     extended_status => 'no send attempt made',
   );
 
@@ -48,7 +48,7 @@ sub send {
 
   $self->{sendmail}->close or do { $self->extended_status("sendmail: $!"); die $self->extended_status; };
 
-  $self->status('ok');
+  $self->status('sent');
   $self->extended_status('');
 
   delete $self->{sendmail};
diff --git a/SL/Menu.pm b/SL/Menu.pm
index 0c6df2247..083b4b842 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -5,6 +5,7 @@ use strict;
 use SL::Auth;
 use File::Spec;
 use SL::MoreCommon qw(uri_encode);
+use SL::InstanceState;
 use SL::YAML;
 
 our %menu_cache;
@@ -40,10 +41,12 @@ sub new {
       _merge($nodes, $nodes_by_id, $data);
     }
 
+    my $instance_state = SL::InstanceState->new;
 
     my $self = bless {
       nodes => $nodes,
       by_id => $nodes_by_id,
+      instance_state => $instance_state,
     }, $package;
 
     $self->build_tree;
@@ -196,6 +199,8 @@ sub parse_access_string {
     } else {
       if ($token =~ m{^ client / (.*) }x) {
         push @{$cur_ary}, $self->parse_instance_conf_string($1);
+      } elsif ($token =~ m{^ state / (.*) }x) {
+        push @{$cur_ary}, $self->parse_instance_state_string($1);
       } else {
         push @{$cur_ary}, $::auth->check_right($::myconfig{login}, $token, 1);
       }
@@ -239,6 +244,11 @@ sub parse_instance_conf_string {
   return $::instance_conf->data->{$setting};
 }
 
+sub parse_instance_state_string {
+  my ($self, $setting) = @_;
+  return $self->{instance_state}->$setting;
+}
+
 sub clear_access {
   my ($self) = @_;
   for my $node ($self->tree_walk("all")) {
diff --git a/SL/Model/Record.pm b/SL/Model/Record.pm
new file mode 100644
index 000000000..cef72f3dc
--- /dev/null
+++ b/SL/Model/Record.pm
@@ -0,0 +1,604 @@
+package SL::Model::Record;
+
+use strict;
+
+use Carp;
+
+use SL::DB::Employee;
+use SL::DB::Order;
+use SL::DB::DeliveryOrder;
+use SL::DB::Reclamation;
+use SL::DB::RequirementSpecOrder;
+use SL::DB::History;
+use SL::DB::Invoice;
+use SL::DB::Status;
+use SL::DB::ValidityToken;
+use SL::DB::Order::TypeData qw(:types);
+use SL::DB::DeliveryOrder::TypeData qw(:types);
+use SL::DB::Reclamation::TypeData qw(:types);
+use SL::DB::Helper::Record qw(get_class_from_type);
+
+use SL::Util qw(trim);
+use SL::Locale::String qw(t8);
+use SL::PriceSource;
+
+
+sub update_after_new {
+  my ($class, $new_record, %flags) = @_;
+
+  $new_record->transdate(DateTime->now_local());
+
+  my $default_reqdate = $new_record->type_data->defaults('reqdate');
+  $new_record->reqdate($default_reqdate);
+
+  return $new_record;
+}
+
+sub update_after_customer_vendor_change {
+  my ($class, $record) = @_;
+  my $new_customervendor = $record->customervendor;
+
+  $record->$_($new_customervendor->$_) for (qw(
+    taxzone_id payment_id delivery_term_id currency_id language_id
+    ));
+
+  $record->intnotes($new_customervendor->notes);
+
+  return $record if !$record->is_sales;
+  if ($record->is_sales) {
+    my $new_customer = $new_customervendor;
+    $record->salesman_id($new_customer->salesman_id
+      || SL::DB::Manager::Employee->current->id);
+    $record->taxincluded(defined($new_customer->taxincluded_checked)
+      ? $new_customer->taxincluded_checked
+      : $::myconfig{taxincluded_checked});
+    if ($record->type_data->features('price_tax')) {
+      my $address = $new_customer->default_billing_address;;
+      $record->billing_address_id($address ? $address->id : undef);
+    }
+  }
+
+  return $record;
+}
+
+sub get_record {
+  my ($class, $type, $id) = @_;
+  my $record_class = get_class_from_type($type);
+  return $record_class->new(id => $id)->load;
+}
+
+sub new_from_workflow {
+  my ($class, $source_object, $target_type, %flags) = @_;
+
+  $flags{destination_type} = $target_type;
+  my %defaults_flags = (
+    no_linked_records => 0,
+  );
+  %flags = (%defaults_flags, %flags);
+
+  my $target_class = get_class_from_type($target_type);
+  my $target_object = ${target_class}->new_from($source_object, %flags);
+  return $target_object;
+}
+
+sub new_from_workflow_multi {
+  my ($class, $source_objects, $target_type, %flags) = @_;
+
+  my $target_class = get_class_from_type($target_type);
+  my $target_object = ${target_class}->new_from_multi($source_objects, %flags);
+
+  return $target_object;
+}
+
+sub increment_subversion {
+  my ($class, $record, %flags) = @_;
+
+  if ($record->type_data->features('subversions')) {
+    $record->increment_version_number;
+  } else {
+    die t8('Subversions are not supported or disabled for this record type.');
+  }
+
+  return;
+}
+
+sub get_best_price_and_discount_source {
+  my ($class, $record, $item, %flags) = @_;
+
+  my $ignore_given = !!$flags{ignore_given};
+
+  my $price_source = SL::PriceSource->new(record_item => $item, record => $record);
+
+  my $price_src;
+  if ( $item->part->is_assortment ) {
+    # add assortment items with price 0, as the components carry the price
+    $price_src = $price_source->price_from_source("");
+    $price_src->price(0);
+  } elsif (!$ignore_given && defined $item->sellprice) {
+    $price_src = $price_source->price_from_source("");
+    $price_src->price($item->sellprice);
+  } else {
+    $price_src = $price_source->best_price
+               ? $price_source->best_price
+               : $price_source->price_from_source("");
+
+    $price_src->price($::form->round_amount($price_src->price / $record->exchangerate, 5)) if $record->can('exchangerate') && $record->exchangerate;
+    $price_src->price(0) if !$price_source->best_price;
+  }
+
+  my $discount_src;
+  if (!$ignore_given && defined $item->discount) {
+    $discount_src = $price_source->discount_from_source("");
+    $discount_src->discount($item->discount);
+  } else {
+    $discount_src = $price_source->best_discount
+                  ? $price_source->best_discount
+                  : $price_source->discount_from_source("");
+    $discount_src->discount(0) if !$price_source->best_discount;
+  }
+
+  return ($price_src, $discount_src);
+}
+
+sub delete {
+  my ($class, $record, %flags) = @_;
+
+  my $errors = [];
+  my $db = $record->db;
+
+  $db->with_transaction(
+    sub {
+      my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $record->id ]) };
+      $record->delete;
+      my $spool = $::lx_office_conf{paths}->{spool};
+      unlink map { "$spool/$_" } @spoolfiles if $spool;
+
+      _save_history($record,'DELETED');
+
+      1;
+  }) || push(@{$errors}, $db->error);
+
+  die t8("Errors while deleting record:") . "\n" . join("\n", @{$errors}) . "\n" if scalar @{$errors};
+}
+
+sub _get_history_snumbers {
+  my ($record) = @_;
+
+  my $number_type = $record->type_data->properties( 'nr_key');
+  my $snumbers    = $number_type . '_' . $record->$number_type;
+
+  return $snumbers;
+}
+
+sub _save_history {
+  my ($record, $addition) = @_;
+
+  SL::DB::History->new(
+    trans_id    => $record->id,
+    employee_id => SL::DB::Manager::Employee->current->id,
+    what_done   => $record->type,
+    snumbers    => _get_history_snumbers($record),
+    addition    => $addition,
+  )->save;
+}
+
+sub save {
+  my ($class, $record, %params) = @_;
+
+  # Test for no items
+  if (scalar @{$record->items} == 0
+      && !grep { $record->record_type eq $_ }
+         @{$::instance_conf->get_allowed_documents_with_no_positions() || []}) {
+    die t8('The action you\'ve chosen has not been executed because the document does not contain any item yet.');
+  }
+
+  $record->calculate_prices_and_taxes() if $record->type_data->features('price_tax');
+
+  foreach my $item (@{ $record->items }) {
+    # autovivify all cvars that are not in the form (cvars_by_config can do it).
+    # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
+    foreach my $var (@{ $item->cvars_by_config }) {
+      $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
+    }
+    $item->parse_custom_variable_values;
+  }
+
+  SL::DB->client->with_transaction(sub {
+    # validity token
+    my $validity_token;
+    if (my $validity_token_specs = $params{with_validity_token}) {
+      if (!defined $validity_token_specs->{scope} || !exists $validity_token_specs->{token}) {
+        croak ('you must provide a hash ref "with_validity_token" with the keys "scope" and "token" if you want the token to be handled');
+      }
+
+      if (!$record->id) {
+        $validity_token = SL::DB::Manager::ValidityToken->fetch_valid_token(
+          scope => $validity_token_specs->{scope},
+          token => $validity_token_specs->{token},
+        );
+
+        die $::locale->text('The form is not valid anymore.') if !$validity_token;
+      }
+    }
+
+    # delete custom shipto if it is to be deleted or if it is empty
+    if ($params{delete_custom_shipto}) { # flag?
+      if ($record->custom_shipto) {
+        $record->custom_shipto->delete if $record->custom_shipto->shipto_id;
+        $record->custom_shipto(undef);
+      }
+    }
+
+    $_->delete for @{ $params{items_to_delete} || [] };
+
+    $record->save(cascade => 1);
+
+    if ($params{objects_to_close} && @{$params{objects_to_close}}) {
+      $_->update_attributes(closed => 1) for @{$params{objects_to_close}};
+    }
+
+    # link records for requirement specs
+    if (my $converted_from_ids = $params{link_requirement_specs_linking_to_created_from_objects}) {
+      _link_requirement_specs_linking_to_created_from_objects($record, $converted_from_ids);
+    }
+
+    if ($params{set_project_in_linked_requirement_specs}) { # flag?
+      _set_project_in_linked_requirement_specs($record);
+    }
+
+    _save_history($record, 'SAVED');
+
+    $validity_token->delete if $validity_token;
+
+    1;
+  }) or die t8('Saving the record failed: #1', SL::DB->client->error);
+}
+
+# Todo: put this into SL::DB::Order?
+sub _link_requirement_specs_linking_to_created_from_objects {
+  my ($record, $converted_from_oe_ids) = @_;
+
+  return unless  $converted_from_oe_ids;
+  return unless @$converted_from_oe_ids;
+
+  my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => $converted_from_oe_ids ]);
+  foreach my $rs_order (@{ $rs_orders }) {
+    SL::DB::RequirementSpecOrder->new(
+      order_id            => $record->id,
+      requirement_spec_id => $rs_order->requirement_spec_id,
+      version_id          => $rs_order->version_id,
+    )->save;
+  }
+}
+
+sub _set_project_in_linked_requirement_specs {
+  my ($record) = @_;
+
+  return unless $record->globalproject_id;
+
+  my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => $record->id ]);
+  foreach my $rs_order (@{ $rs_orders }) {
+    next if $rs_order->requirement_spec->project_id == $record->globalproject_id;
+
+    $rs_order->requirement_spec->update_attributes(project_id => $record->globalproject_id);
+  }
+}
+
+sub clone_for_save_as_new {
+  my ($class, $saved_record, $changed_record, %params) = @_;
+
+  # changed_record
+  my %new_attrs;
+  # Lets assign a new number if the user hasn't changed the previous one.
+  # If it has been changed manually then use it as-is.
+  $new_attrs{record_number}    = (trim($changed_record->record_number) eq $saved_record->record_number)
+                        ? ''
+                        : trim($changed_record->record_number);
+
+  # Clear transdate unless changed
+  $new_attrs{transdate} = ($changed_record->transdate == $saved_record->transdate)
+                        ? DateTime->today_local
+                        : $changed_record->transdate;
+
+  # Set new reqdate unless changed if it is enabled in client config
+  if ($changed_record->reqdate == $saved_record->reqdate) {
+      $new_attrs{reqdate} = $changed_record->type_data->defaults('reqdate');
+  }
+
+  # Update employee
+  $new_attrs{employee}  = SL::DB::Manager::Employee->current;
+
+
+  my $new_record = SL::Model::Record->new_from_workflow($changed_record, $saved_record->type, no_linked_records => 1, attributes => \%new_attrs);
+
+  return $new_record;
+}
+
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Model::Record - shared computations for orders (Order), delivery orders (DeliveryOrder), invoices (Invoice) and reclamations (Reclamation)
+
+=head1 DESCRIPTION
+
+This module contains shared behaviour among the main record object types. A given record needs to be already parsed into a Rose object.
+All records are treated agnostically and the underlying class needs to implement a type_data call to query for differing behaviour.
+
+Currently the following classes and types are supported:
+
+=over 4
+
+=item * L<SL::DB::Order>
+
+=over 4
+
+=item * C<sales_order>
+
+=item * C<purchase_order>
+
+=item * C<sales_quotation>
+
+=item * C<purchase_quotation>
+
+=item * C<purchase_quotation_intake>
+
+=item * C<sales_order_intake>
+
+=back
+
+=item * L<SL::DB::DeliveryOrder>
+
+=over 4
+
+=item * C<sales_delivery_order>
+
+=item * C<purchase_delivery_order>
+
+=item * C<supplier_delivery_order>
+
+=item * C<rma_delivery_order>
+
+=back
+
+=item * L<SL::DB::Reclamation>
+
+=over 4
+
+=item * C<sales_reclamation>
+
+=item * C<purchase_reclamation>
+
+=back
+
+=back
+
+The base record types need to implement a type_data call that can be queried
+for various type informations.
+
+     +-------+              type_data()      +-------------------------+
+     | Order | ---------------proxy------->  | SL::DB::Order::TypeData |
+     +-------+                               +-------------------------+
+
+     +---------------+      type_data()      +---------------------------------+
+     | DeliveryOrder |  ------proxy------->  | SL::DB::DeliveryOrder::TypeData |
+     +---------------+                       +---------------------------------+
+
+     ...
+
+Any Record that implements the necessary type_data callbacks can be used as a
+record in here .
+
+Invoices are not supported as of now, but are planned for the future.
+
+The old delivery order C<sales_delivery_order> and C<purchase_delivery_order>
+must be implemented in the new DeliveryOrder Controller
+
+=head1 METHODS
+
+=over 4
+
+=item C<update_after_new>
+
+Updates a record_object corresponding to type_data.
+Sets reqdate and transdate.
+
+Returns the record object.
+
+=item C<update_after_customer_vendor_change>
+
+Updates a record_object corresponding to customer/vendor and type_data.
+Sets taxzone_id, payment_id, delivery_term_id, currency_id, language_id and
+intnotes to customer/vendor. For sales records salesman and taxincluded is set.
+Also for sales record with the feature 'price_tax' the billing address is updated.
+
+Returns the record object.
+
+=item C<new_from_workflow>
+
+Expects source_object, target_type and can have flags.
+Creates a new record from a by target_class->new_from(source_record).
+Set default flag no_link_record to false.
+
+Throws an error if the target_type doesn't exist.
+
+Returns the new record object.
+
+=item C<new_from_workflow_multi>
+
+Expects an arrayref with source_objects, target_type and can have flags.
+Creates a new record object from one or more source objects.
+
+Returns the new record object.
+
+=item C<increment_subversion>
+
+Only for orders.
+
+Increments the record's subversion number.
+
+=item C<get_best_price_and_discount_source>
+
+Get the best price and discount source for an item. You have
+to pass the record and the item.
+
+If the flag C<ignore_given> is not set and a price or discount already exists
+for this item, these will be used. This means, that the price source and
+discount source are set to empty and price of the price source is set to
+the existing price and/or the discount of the discount source is set to
+the existing discount.
+
+If the flag C<ignore_given> is set, the best price and discount source
+is determined via C<SL::PriceSource> and a given price or discount in the
+item will be ignored. This can be used to get an default price/discount
+that can be displayed to the user even if a price/discount is already
+entered.
+
+Returns an reference to an array where the first element is the best
+price source and the second element is the best discount source.
+
+=item C<delete>
+
+Expects a record to delete.
+Deletes the whole record and puts an entry in the history.
+Cleans up the spool directory.
+Dies and throws an error if there is a dberror.
+
+TODO: check status order once old deliveryorder (do) is implemented.
+
+=item C<save>
+
+Expects a record to be saved and params to handle stuff like validity_token, custom_shipto,
+items_to_delete, close objects and requirement_specs.
+
+=over 2
+
+=item * L<params:>
+
+=over 4
+
+=item * C<with_validity_token → scope>
+
+=item * C<delete custom shipto if empty>
+
+=item * C<items_to_delete>
+
+=item * C<objects_to_close>
+
+=item * C<link_requirement_specs_linking_to_created_from_objects>
+
+=item * C<set_project_in_linked_requirement_specs>
+
+=back
+
+Sets an entry in the history.
+
+Dies and throws an error when there is an error.
+
+=back
+
+=back
+
+=over 4
+
+=item C<clone_for_save_as_new>
+
+Expects the saved record and the record to be changed.
+
+Sets the actual employee.
+
+Also sets a new transdate, new reqdate and an empty recordnumber if it wasn't already changed in the old record.
+
+=item C<_save_history>
+
+Expects a record and an addition reason for the history (SAVED,DELETED,...)
+
+=item C<_get_history_snumbers>
+
+Expects a record, returns snumber for the history entry.
+
+=back
+
+=head1 BUGS
+
+None yet. :)
+
+=head1 FURTHER WORK
+
+=over 4
+
+=item *
+
+Handling of price sources and prices in controllers
+
+=item *
+
+Handling of shippedqty calculations in controllers
+
+=item *
+
+Autovivification of unparsed cvar configs is still in parsing code
+
+=item *
+
+sellprice changed handling
+
+=back
+
+
+The traits currently encoded in the type data classes should also be extended to cover:
+
+=over 4
+
+=item *
+
+PeriodicInvoices
+
+=item *
+
+Exchangerates
+
+=item *
+
+Payments for invoices
+
+=back
+
+In later stages the following things should be implemented:
+
+=over 4
+
+=item *
+
+Further encapsulate the linking logic for creating linked records.
+
+=item *
+
+Better tests for auto-close of quotations and auto-delivered of delivery orders on save. Best to move those into post-save hooks as well.
+
+=item *
+
+More tests of workflow related conversions from frontend (current tests are mostly at the SL::Model::Record boundary).
+
+=item *
+
+More tests for error handling in controllers. I.e. if the given recordnumber is kept.
+
+=back
+
+=head1 AUTHORS
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+Werner Hahn E<lt>wh@futureworldsearch.netE<gt>
+
+...
+
+=cut
diff --git a/SL/OE.pm b/SL/OE.pm
index 4ce1b1035..c5b3bebae 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -68,7 +68,7 @@ sub transactions {
 
   my $query;
   my $ordnumber = 'ordnumber';
-  my $quotation = '0';
+  my $record_type = $form->{type};
 
   my @values;
   my $where;
@@ -78,9 +78,10 @@ sub transactions {
   my $rate = ($form->{vc} eq 'customer') ? 'buy' : 'sell';
 
   if ($form->{type} =~ /_quotation$/) {
-    $quotation = '1';
     $ordnumber = 'quonumber';
 
+  } elsif ($form->{type} eq 'purchase_quotation_intake') {
+    $ordnumber = 'quonumber';
   } elsif ($form->{type} eq 'sales_order') {
     $periodic_invoices_columns = qq| , COALESCE(pcfg.active, 'f') AS periodic_invoices |;
     $periodic_invoices_joins   = qq| LEFT JOIN periodic_invoices_configs pcfg ON (o.id = pcfg.oe_id) |;
@@ -88,27 +89,40 @@ sub transactions {
 
   my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
 
+  if ($form->{type} !~ /_quotation/) {
+    $form->{hide_amounts} = !(   ($vc eq 'customer' && $::auth->assert('sales_order_reports_amounts',    1))
+                              || ($vc eq 'vendor'   && $::auth->assert('purchase_order_reports_amounts', 1)) );
+    $form->{hide_links}   = $form->{hide_amounts};
+  }
+
+  if ($form->{hide_amounts}) {
+    $form->{"l_$_"} = '' for qw(remaining_amount remaining_netamount amount netamount marge_total marge_percent expected_netamount tax);
+  }
+
   my %billed_amount;
   my %billed_netamount;
-  if ($form->{l_remaining_amount} || $form->{l_remaining_netamount}) {
-    $query = <<'';
-      SELECT from_id, ar.amount, ar.netamount FROM (
+  if (!$form->{hide_amounts} && ($form->{l_remaining_amount} || $form->{l_remaining_netamount})) {
+    my $arap = $form->{vc} eq "customer" ? "ar" : "ap";
+
+    $query = <<"SQL";
+      SELECT from_id, ${arap}.amount, $arap.netamount FROM (
         SELECT from_id, to_id
         FROM record_links
-        WHERE from_table = 'oe' AND to_table = 'ar'
+        WHERE from_table = 'oe' AND to_table = '$arap'
         UNION
         SELECT rl1.from_id, rl2.to_id
         FROM record_links rl1
         LEFT JOIN record_links rl2 ON (rl1.to_table = rl2.from_table AND rl1.to_id = rl2.from_id)
-        WHERE rl1.from_table = 'oe' AND rl2.to_table = 'ar'
+        WHERE rl1.from_table = 'oe' AND rl2.to_table = '$arap'
         UNION
         SELECT rl1.from_id, rl3.to_id
         FROM record_links rl1
         JOIN record_links rl2 ON (rl1.to_table = rl2.from_table AND rl1.to_id = rl2.from_id)
         JOIN record_links rl3 ON (rl2.to_table = rl3.from_table AND rl2.to_id = rl3.from_id)
-        WHERE rl1.from_table = 'oe' AND rl2.to_table = 'ar' AND rl3.to_table = 'ar'
+        WHERE rl1.from_table = 'oe' AND rl2.to_table = '$arap' AND rl3.to_table = '$arap'
       ) rl
-      LEFT JOIN ar ON ar.id = rl.to_id
+      LEFT JOIN $arap ON $arap.id = rl.to_id
+SQL
 
     for my $ref (@{ selectall_hashref_query($form, $dbh, $query) }) {
       $billed_amount{   $ref->{from_id}} += $ref->{amount};
@@ -123,25 +137,34 @@ sub transactions {
     $phone_notes_join    = qq| JOIN notes phone_notes ON (o.id = phone_notes.trans_id AND phone_notes.trans_module LIKE 'oe') |;
   }
 
+  my $amount_columns = $form->{hide_amounts}
+                     ? ''
+                     : qq| , o.amount, o.netamount, o.marge_total, o.marge_percent, (o.netamount * o.order_probability / 100) AS expected_netamount |;
+
   $query =
-    qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
-    qq|  o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
+    qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate | .
+    $amount_columns .
+    qq|  , ct.${vc}number, ct.name, o.${vc}_id, o.globalproject_id, | .
     qq|  o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
     qq|  o.transaction_description, | .
-    qq|  o.marge_total, o.marge_percent, | .
     qq|  o.exchangerate, | .
     qq|  o.itime::DATE AS insertdate, | .
-    qq|  o.intnotes, | .
+    qq|  o.intnotes,| .
+    qq|  o.vendor_confirmation_number,| .
     qq|  department.description as department, | .
     qq|  ex.$rate AS daily_exchangerate, | .
     qq|  pt.description AS payment_terms, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  e.name AS employee, s.name AS salesman, | .
     qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id,  | .
-    qq|  tz.description AS taxzone | .
+    qq|  tz.description AS taxzone, | .
+    qq|  shipto.shiptoname, shipto.shiptodepartment_1, shipto.shiptodepartment_2, | .
+    qq|  shipto.shiptostreet, shipto.shiptozipcode, shipto.shiptocity, shipto.shiptocountry, | .
+    qq|  order_statuses.name AS order_status | .
     $periodic_invoices_columns .
     $phone_notes_columns .
-    qq|  , o.order_probability, o.expected_billing_date, (o.netamount * o.order_probability / 100) AS expected_netamount | .
+    qq|  , o.order_probability, o.expected_billing_date, | .
+    qq|  (employee_id = (SELECT id FROM employee WHERE login = ?)) AS is_own  | .
     qq|FROM oe o | .
     qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
     qq|LEFT JOIN contacts cp ON (o.cp_id = cp.cp_id) | .
@@ -153,10 +176,18 @@ sub transactions {
     qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| .
     qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
     qq|LEFT JOIN department   ON (o.department_id = department.id) | .
+    qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | .
+    qq|LEFT JOIN shipto ON (
+        (o.shipto_id = shipto.shipto_id) or
+        (o.id = shipto.trans_id and shipto.module = 'OE')
+       )| .
     qq|$periodic_invoices_joins | .
     $phone_notes_join .
-    qq|WHERE (o.quotation = ?) |;
-  push(@values, $quotation);
+    qq|WHERE (o.record_type = ?) |;
+
+
+  push @values, $::myconfig{login};
+  push(@values, $record_type);
 
   if ($form->{department_id}) {
     $query .= qq| AND o.department_id = ?|;
@@ -165,7 +196,7 @@ sub transactions {
 
   if ($form->{"project_id"}) {
     $query .=
-      qq|AND ((globalproject_id = ?) OR EXISTS | .
+      qq| AND ((globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM orderitems oi | .
       qq|   WHERE oi.project_id = ? AND oi.trans_id = o.id))|;
     push(@values, conv_i($form->{"project_id"}), conv_i($form->{"project_id"}));
@@ -238,6 +269,11 @@ SQL
     push(@values, like($form->{cusordnumber}));
   }
 
+  if ($form->{vendor_confirmation_number}) {
+    $query .= qq| AND o.vendor_confirmation_number ILIKE ?|;
+    push(@values, like($form->{vendor_confirmation_number}));
+  }
+
   if($form->{transdatefrom}) {
     $query .= qq| AND o.transdate >= ?|;
     push(@values, conv_date($form->{transdatefrom}));
@@ -313,8 +349,13 @@ SQL
     push(@values, like($form->{intnotes}));
   }
 
+  if ($form->{order_status_id}) {
+    $query .= qq| AND o.order_status_id = ?|;
+    push(@values, $form->{order_status_id});
+  }
+
   if ($form->{phone_notes}) {
-    $query .= qq| AND (phone_notes.subject ILIKE ? OR phone_notes.body ILIKE ?)|;
+    $query .= qq| AND (phone_notes.subject ILIKE ? OR regexp_replace(phone_notes.body, '<[^>]*>', '', 'g') ILIKE ?)|;
     push(@values, like($form->{phone_notes}), like($form->{phone_notes}));
   }
 
@@ -327,7 +368,8 @@ SQL
                              o.transaction_description
                              o.quonumber
                              o.ordnumber
-                             o.cusordnumber);
+                             o.cusordnumber
+                             o.vendor_confirmation_number);
     $query .= ' AND (';
     $query .= join ' ILIKE ? OR ', @fulltext_fields;
     $query .= ' ILIKE ?';
@@ -343,7 +385,7 @@ SQL
       OR EXISTS (
         SELECT notes.id FROM notes
           WHERE notes.trans_id = o.id AND notes.trans_module LIKE 'oe'
-            AND (notes.subject ILIKE ? OR notes.body ILIKE ?))
+            AND (notes.subject ILIKE ? OR regexp_replace(notes.body, '<[^>]*>', '', 'g') ILIKE ?))
 SQL
 
     $query .= <<SQL;
@@ -388,6 +430,35 @@ SQL
     push @values, like($form->{parts_description});
   }
 
+  if ($form->{shiptoname}) {
+    $query .= " AND shipto.shiptoname ILIKE ?";
+    push(@values, like($form->{shiptoname}));
+  }
+  if ($form->{shiptodepartment_1}) {
+    $query .= " AND shipto.shiptodepartment_1 ILIKE ?";
+    push(@values, like($form->{shiptodepartment_1}));
+  }
+  if ($form->{shiptodepartment_2}) {
+    $query .= " AND shipto.shiptodepartment_2 ILIKE ?";
+    push(@values, like($form->{shiptodepartment_2}));
+  }
+  if ($form->{shiptostreet}) {
+    $query .= " AND shipto.shiptostreet ILIKE ?";
+    push(@values, like($form->{shiptostreet}));
+  }
+  if ($form->{shiptozipcode}) {
+    $query .= " AND shipto.shiptozipcode ILIKE ?";
+    push(@values, like($form->{shiptozipcode}));
+  }
+  if ($form->{shiptocity}) {
+    $query .= " AND shipto.shiptocity ILIKE ?";
+    push(@values, like($form->{shiptocity}));
+  }
+  if ($form->{shiptocountry}) {
+    $query .= " AND shipto.shiptocountry ILIKE ?";
+    push(@values, like($form->{shiptocountry}));
+  }
+
   if ($form->{all}) {
     my @tokens = parse_line('\s+', 0, $form->{all});
     # ordnumber quonumber customer.name vendor.name transaction_description
@@ -429,6 +500,8 @@ SQL
     "payment_terms"           => "pt.description",
     "department"              => "department.description",
     "intnotes"                => "o.intnotes",
+    "order_status"            => "order_statuses.name",
+    "vendor_confirmation_number" => "o.vendor_confirmation_number",
   );
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}"  . ", o.itime ${sortdir}";
@@ -442,41 +515,70 @@ SQL
   my %id = ();
   $form->{OE} = [];
   while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
-    $ref->{billed_amount}    = $billed_amount{$ref->{id}};
-    $ref->{billed_netamount} = $billed_netamount{$ref->{id}};
-    if ($ref->{billed_amount} < 0) { # case: credit note(s) higher than invoices
-      $ref->{remaining_amount} = $ref->{amount} + $ref->{billed_amount};
-      $ref->{remaining_netamount} = $ref->{netamount} + $ref->{billed_netamount};
-    } else {
-      $ref->{remaining_amount} = $ref->{amount} - $ref->{billed_amount};
-      $ref->{remaining_netamount} = $ref->{netamount} - $ref->{billed_netamount};
+    if (!$form->{hide_amounts}) {
+      $ref->{billed_amount}    = $billed_amount{$ref->{id}};
+      $ref->{billed_netamount} = $billed_netamount{$ref->{id}};
+      if ($ref->{billed_amount} < 0) { # case: credit note(s) higher than invoices
+        $ref->{remaining_amount} = $ref->{amount} + $ref->{billed_amount};
+        $ref->{remaining_netamount} = $ref->{netamount} + $ref->{billed_netamount};
+      } else {
+        $ref->{remaining_amount} = $ref->{amount} - $ref->{billed_amount};
+        $ref->{remaining_netamount} = $ref->{netamount} - $ref->{billed_netamount};
+      }
     }
+
     $ref->{exchangerate} ||= $ref->{daily_exchangerate};
     $ref->{exchangerate} ||= 1;
+
     push @{ $form->{OE} }, $ref if $ref->{id} != $id{ $ref->{id} };
     $id{ $ref->{id} } = $ref->{id};
   }
 
   $sth->finish;
 
+  if ($form->{l_items} && scalar @{ $form->{OE} }) {
+    my ($items_query, $items_sth);
+    if ($form->{l_items}) {
+      $items_query =
+        qq|SELECT id
+          FROM orderitems
+          WHERE trans_id  = ?
+          ORDER BY position|;
+
+      $items_sth = prepare_query($form, $dbh, $items_query);
+    }
+
+    foreach my $oe (@{ $form->{OE} }) {
+      do_statement($form, $items_sth, $items_query, $oe->{id});
+      $oe->{item_ids} = $dbh->selectcol_arrayref($items_sth);
+      $oe->{item_ids} = undef if !@{$oe->{item_ids}};
+    }
+    $items_sth->finish();
+  }
+
   $main::lxdebug->leave_sub();
 }
 
 sub transactions_for_todo_list {
   $main::lxdebug->enter_sub();
 
-  my $self     = shift;
-  my %params   = @_;
+  my $self                   = shift;
+  my %params                 = @_;
+
+  my $myconfig               = \%main::myconfig;
+  my $form                   = $main::form;
 
-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
+  my $dbh                    = $params{dbh} || $form->get_standard_dbh($myconfig);
 
-  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
+  my $query                  = qq|SELECT id FROM employee WHERE login = ?|;
+  my ($e_id)                 = selectrow_query($form, $dbh, $query, $::myconfig{login});
 
-  my $query    = qq|SELECT id FROM employee WHERE login = ?|;
-  my ($e_id)   = selectrow_query($form, $dbh, $query, $::myconfig{login});
+  my $sales_purchase_filter  = 'AND (1 = 0';
+  $sales_purchase_filter    .= $params{sales}    ? qq| OR customer_id IS NOT NULL| : '';
+  $sales_purchase_filter    .= $params{purchase} ? qq| OR vendor_id   IS NOT NULL| : '';
+  $sales_purchase_filter    .= ')';
 
-  $query       =
+  $query                     =
     qq|SELECT oe.id, oe.transdate, oe.reqdate, oe.quonumber, oe.transaction_description, oe.amount,
          CASE WHEN (COALESCE(oe.customer_id, 0) = 0) THEN 'vendor' ELSE 'customer' END AS vc,
          c.name AS customer,
@@ -486,11 +588,12 @@ sub transactions_for_todo_list {
        LEFT JOIN customer c ON (oe.customer_id = c.id)
        LEFT JOIN vendor v   ON (oe.vendor_id   = v.id)
        LEFT JOIN employee e ON (oe.employee_id = e.id)
-       WHERE (COALESCE(quotation, FALSE) = TRUE)
+       WHERE ((oe.record_type = 'sales_quotation') OR (oe.record_type = 'request_quotation'))
          AND (COALESCE(closed,    FALSE) = FALSE)
          AND ((oe.employee_id = ?) OR (oe.salesman_id = ?))
          AND NOT (oe.reqdate ISNULL)
          AND (oe.reqdate < current_date)
+         $sales_purchase_filter
        ORDER BY transdate|;
 
   my $quotations = selectall_hashref_query($form, $dbh, $query, $e_id, $e_id);
@@ -500,469 +603,6 @@ sub transactions_for_todo_list {
   return $quotations;
 }
 
-sub save {
-  my ($self, $myconfig, $form) = @_;
-  $main::lxdebug->enter_sub();
-
-  my $rc = SL::DB->client->with_transaction(\&_save, $self, $myconfig, $form);
-
-  $::lxdebug->leave_sub;
-
-  return $rc;
-}
-
-sub _save {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my $dbh = SL::DB->client->dbh;
-  my $restricter = SL::HTML::Restrict->create;
-
-  my ($query, @values, $sth, $null);
-  my $exchangerate = 0;
-
-  my $all_units = AM->retrieve_units($myconfig, $form);
-  $form->{all_units} = $all_units;
-
-  my $ic_cvar_configs = CVar->get_configs(module => 'IC',
-                                          dbh    => $dbh);
-
-  $form->{employee_id} = (split /--/, $form->{employee})[1] if !$form->{employee_id};
-  unless ($form->{employee_id}) {
-    $form->get_employee($dbh);
-  }
-
-  my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
-
-  my $number_field         = $form->{type} =~ m{order} ? 'ordnumber' : 'quonumber';
-  my $trans_number         = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{$number_field}, id => $form->{id});
-  $form->{$number_field} ||= $trans_number->create_unique; # set $form->{ordnumber} or $form->{quonumber}
-  my $is_new               = !$form->{id};
-
-  if ($form->{id}) {
-    $query = qq|DELETE FROM custom_variables
-                WHERE (config_id IN (SELECT id        FROM custom_variable_configs WHERE (module = 'ShipTo')))
-                  AND (trans_id  IN (SELECT shipto_id FROM shipto                  WHERE (module = 'OE') AND (trans_id = ?)))|;
-    do_query($form, $dbh, $query, $form->{id});
-
-    $query = qq|DELETE FROM shipto | .
-             qq|WHERE trans_id = ? AND module = 'OE'|;
-    do_query($form, $dbh, $query, $form->{id});
-
-  } else {
-
-    $query = qq|SELECT nextval('id')|;
-    ($form->{id}) = selectrow_query($form, $dbh, $query);
-
-    $query = qq|INSERT INTO oe (id, ordnumber, employee_id, currency_id, taxzone_id) VALUES (?, '', ?, (SELECT currency_id FROM defaults), ?)|;
-    do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{taxzone_id});
-  }
-
-  my $amount    = 0;
-  my $linetotal = 0;
-  my $discount  = 0;
-  my $project_id;
-  my $reqdate;
-  my $taxrate;
-  my $taxbase;
-  my $taxdiff;
-  my $taxamount = 0;
-  my $fxsellprice;
-  my %taxbase;
-  my @taxaccounts;
-  my %taxaccounts;
-  my $netamount = 0;
-  my @processed_orderitems;
-
-  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
-  my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
-  my $price_factor;
-
-  for my $i (1 .. $form->{rowcount}) {
-
-    map({ $form->{"${_}_$i"} = $form->parse_amount($myconfig, $form->{"${_}_$i"}) } qw(qty ship));
-
-    if ($form->{"id_$i"}) {
-
-      # get item baseunit
-      $query = qq|SELECT unit FROM parts WHERE id = ?|;
-      my ($item_unit) = selectrow_query($form, $dbh, $query, $form->{"id_$i"});
-
-      my $basefactor = 1;
-      if (defined($all_units->{$item_unit}->{factor}) &&
-          (($all_units->{$item_unit}->{factor} * 1) != 0)) {
-        $basefactor = $all_units->{$form->{"unit_$i"}}->{factor} / $all_units->{$item_unit}->{factor};
-      }
-      my $baseqty = $form->{"qty_$i"} * $basefactor;
-
-      $form->{"marge_percent_$i"} = $form->parse_amount($myconfig, $form->{"marge_percent_$i"}) * 1;
-      $form->{"marge_absolut_$i"} = $form->parse_amount($myconfig, $form->{"marge_absolut_$i"}) * 1;
-
-      $form->{"lastcost_$i"} = $form->parse_amount($myconfig, $form->{"lastcost_$i"});
-
-      # keep entered selling price
-      my $fxsellprice =
-        $form->parse_amount($myconfig, $form->{"sellprice_$i"});
-
-      my ($dec) = ($fxsellprice =~ /\.(\d+)/);
-      $dec = length $dec;
-      my $decimalplaces = ($dec > 2) ? $dec : 2;
-
-      # undo discount formatting
-      $form->{"discount_$i"} = $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
-
-      # deduct discount
-      $form->{"sellprice_$i"} = $fxsellprice * (1 - $form->{"discount_$i"});
-
-      # round linetotal at least to 2 decimal places
-      $price_factor = $price_factors{ $form->{"price_factor_id_$i"} } || 1;
-      $linetotal    = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor, 2);
-
-      $form->{"inventory_accno_$i"} *= 1;
-      $form->{"expense_accno_$i"}   *= 1;
-
-      @taxaccounts = split(/ /, $form->{"taxaccounts_$i"});
-      $taxrate     = 0;
-      $taxdiff     = 0;
-
-      map { $taxrate += $form->{"${_}_rate"} } @taxaccounts;
-
-      if ($form->{taxincluded}) {
-        $taxamount = $linetotal * $taxrate / (1 + $taxrate);
-        $taxbase   = $linetotal - $taxamount;
-
-        # we are not keeping a natural price, do not round
-        $form->{"sellprice_$i"} =
-          $form->{"sellprice_$i"} * (1 / (1 + $taxrate));
-      } else {
-        $taxamount = $linetotal * $taxrate;
-        $taxbase   = $linetotal;
-      }
-
-      if ($form->round_amount($taxrate, 7) == 0) {
-        if ($form->{taxincluded}) {
-          foreach my $item (@taxaccounts) {
-            $taxamount = $form->round_amount($linetotal * $form->{"${item}_rate"} / (1 + abs($form->{"${item}_rate"})), 2);
-            $taxaccounts{$item} += $taxamount;
-            $taxdiff            += $taxamount;
-            $taxbase{$item}     += $taxbase;
-          }
-          $taxaccounts{ $taxaccounts[0] } += $taxdiff;
-        } else {
-          foreach my $item (@taxaccounts) {
-            $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
-            $taxbase{$item}     += $taxbase;
-          }
-        }
-      } else {
-        foreach my $item (@taxaccounts) {
-          $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate;
-          $taxbase{$item} += $taxbase;
-        }
-      }
-
-      $netamount += $form->{"sellprice_$i"} * $form->{"qty_$i"} / $price_factor;
-
-      $reqdate = ($form->{"reqdate_$i"}) ? $form->{"reqdate_$i"} : undef;
-
-      # Get pricegroup_id and save it. Unfortunately the interface
-      # also uses ID "0" for signalling that none is selected, but "0"
-      # must not be stored in the database. Therefore we cannot simply
-      # use conv_i().
-      ($null, my $pricegroup_id) = split(/--/, $form->{"sellprice_pg_$i"});
-      $pricegroup_id *= 1;
-      $pricegroup_id  = undef if !$pricegroup_id;
-
-      # force new project, if not set yet
-      if ($::instance_conf->get_order_always_project && !$form->{"globalproject_id"} && ($form->{type} eq 'sales_order')) {
-        require SL::DB::Customer;
-        my $customer = SL::DB::Manager::Customer->find_by(id => $form->{customer_id});
-        die "Can't find customer" unless $customer;
-        die $main::locale->text("Error while creating project with project number of new order number, project number #1 already exists!", $form->{ordnumber})
-          if SL::DB::Manager::Project->find_by(projectnumber => $form->{ordnumber});
-
-        my $new_project = SL::DB::Project->new(
-          projectnumber     => $form->{ordnumber},
-          description       => $customer->name,
-          customer_id       => $customer->id,
-          active            => 1,
-          project_type_id   => $::instance_conf->get_project_type_id,
-          project_status_id => $::instance_conf->get_project_status_id,
-        );
-        $new_project->save;
-        $form->{"globalproject_id"} = $new_project->id;
-      }
-
-      CVar->get_non_editable_ic_cvars(form               => $form,
-                                      dbh                => $dbh,
-                                      row                => $i,
-                                      sub_module         => 'orderitems',
-                                      may_converted_from => ['orderitems', 'invoice']);
-
-      my $position = $i;
-
-      # save detail record in orderitems table
-      if (! $form->{"orderitems_id_$i"}) {
-        $query = qq|SELECT nextval('orderitemsid')|;
-        ($form->{"orderitems_id_$i"}) = selectrow_query($form, $dbh, $query);
-
-        $query = qq|INSERT INTO orderitems (id, position) VALUES (?, ?)|;
-        do_query($form, $dbh, $query, $form->{"orderitems_id_$i"}, conv_i($position));
-      }
-
-      my $orderitems_id = $form->{"orderitems_id_$i"};
-      push @processed_orderitems, $orderitems_id;
-
-       $query = <<SQL;
-         UPDATE orderitems SET
-          trans_id = ?, position = ?, parts_id = ?, description = ?, longdescription = ?, qty = ?, base_qty = ?,
-          sellprice = ?, discount = ?, unit = ?, reqdate = ?, project_id = ?, serialnumber = ?, ship = ?,
-          pricegroup_id = ?, subtotal = ?,
-          marge_percent = ?, marge_total = ?, lastcost = ?, price_factor_id = ?,
-          active_price_source = ?, active_discount_source = ?,
-          price_factor = (SELECT factor FROM price_factors WHERE id = ?), marge_price_factor = ?
-        WHERE id = ?
-SQL
-      @values = (
-           conv_i($form->{id}), conv_i($position), conv_i($form->{"id_$i"}),
-           $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}),
-           $form->{"qty_$i"}, $baseqty,
-           $fxsellprice, $form->{"discount_$i"},
-           $form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
-           $form->{"serialnumber_$i"}, $form->{"ship_$i"},
-           $pricegroup_id, $form->{"subtotal_$i"} ? 't' : 'f',
-           $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
-           $form->{"lastcost_$i"}, conv_i($form->{"price_factor_id_$i"}),
-           $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
-           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}),
-           conv_i($orderitems_id),
-      );
-
-      do_query($form, $dbh, $query, @values);
-
-      $form->{"sellprice_$i"} = $fxsellprice;
-      $form->{"discount_$i"} *= 100;
-
-      CVar->save_custom_variables(module       => 'IC',
-                                  sub_module   => 'orderitems',
-                                  trans_id     => $orderitems_id,
-                                  configs      => $ic_cvar_configs,
-                                  variables    => $form,
-                                  name_prefix  => 'ic_',
-                                  name_postfix => "_$i",
-                                  dbh          => $dbh);
-
-      # link previous items with orderitems
-      # assume we have a new workflow if we link from invoice or order to quotation
-      # unluckily orderitems are used for quotation and orders - therefore one more
-      # check to be sure NOT to link from order to quotation
-      foreach (qw(orderitems)) {
-        if (!$form->{saveasnew} && !$form->{useasnew} && $form->{"converted_from_${_}_id_$i"}
-              && $form->{type} !~ 'quotation') {
-          RecordLinks->create_links('dbh'        => $dbh,
-                                    'mode'       => 'ids',
-                                    'from_table' => $_,
-                                    'from_ids'   => $form->{"converted_from_${_}_id_$i"},
-                                    'to_table'   => 'orderitems',
-                                    'to_id'      => $orderitems_id,
-          );
-        }
-        delete $form->{"converted_from_${_}_id_$i"};
-      }
-    }
-  }
-
-  # search for orphaned ids
-  $query  = sprintf 'SELECT id FROM orderitems WHERE trans_id = ? AND NOT id IN (%s)', join ', ', ("?") x scalar @processed_orderitems;
-  @values = (conv_i($form->{id}), map { conv_i($_) } @processed_orderitems);
-  my @orphaned_ids = map { $_->{id} } selectall_hashref_query($form, $dbh, $query, @values);
-
-  if (scalar @orphaned_ids) {
-    # clean up orderitems
-    $query  = sprintf 'DELETE FROM orderitems WHERE id IN (%s)', join ', ', ("?") x scalar @orphaned_ids;
-    do_query($form, $dbh, $query, @orphaned_ids);
-  }
-
-  $reqdate = ($form->{reqdate}) ? $form->{reqdate} : undef;
-
-  # add up the tax
-  my $tax = 0;
-  map { $tax += $form->round_amount($taxaccounts{$_}, 2) } keys %taxaccounts;
-
-  $amount = $form->round_amount($netamount + $tax, 2, 1);
-  $netamount = $form->round_amount($netamount, 2);
-
-  if ($form->{currency} eq $form->{defaultcurrency}) {
-    $form->{exchangerate} = 1;
-  } else {
-    $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, ($form->{vc} eq 'customer') ? 'buy' : 'sell');
-  }
-
-  # from inputfield (exchangerate) or hidden (forex)
-  my $exchangerate_from_form = $form->{forex} || $form->parse_amount($myconfig, $form->{exchangerate});
-
-  $form->{exchangerate} = $exchangerate || $exchangerate_from_form;
-
-  my $quotation = $form->{type} =~ /_order$/ ? 'f' : 't';
-
-  # save OE record
-  $query =
-    qq|UPDATE oe SET
-         ordnumber = ?, quonumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?,
-         customer_id = ?, amount = ?, netamount = ?, reqdate = ?, tax_point = ?, taxincluded = ?,
-         shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, currency_id = (SELECT id FROM currencies WHERE name=?), closed = ?,
-         delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?,
-         taxzone_id = ?, shipto_id = ?, billing_address_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?,delivery_term_id = ?,
-         globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ?
-         , order_probability = ?, expected_billing_date = ?
-       WHERE id = ?|;
-
-  @values = ($form->{ordnumber} || '', $form->{quonumber},
-             $form->{cusordnumber}, conv_date($form->{transdate}),
-             conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
-             $amount, $netamount, conv_date($reqdate), conv_date($form->{tax_point}),
-             $form->{taxincluded} ? 't' : 'f', $form->{shippingpoint},
-             $form->{shipvia}, $restricter->process($form->{notes}), $form->{intnotes},
-             $form->{currency}, $form->{closed} ? 't' : 'f',
-             $form->{delivered} ? "t" : "f", $form->{proforma} ? 't' : 'f',
-             $quotation, conv_i($form->{department_id}),
-             conv_i($form->{language_id}), conv_i($form->{taxzone_id}),
-             conv_i($form->{shipto_id}), conv_i($form->{billing_address_id}), conv_i($form->{payment_id}),
-             conv_i($form->{delivery_vendor_id}),
-             conv_i($form->{delivery_customer_id}),
-             conv_i($form->{delivery_term_id}),
-             conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
-             conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
-             $form->{transaction_description},
-             $form->{marge_total} * 1, $form->{marge_percent} * 1,
-             $form->{order_probability} * 1, conv_date($form->{expected_billing_date}),
-             conv_i($form->{id}));
-  do_query($form, $dbh, $query, @values);
-
-  $form->new_lastmtime('oe');
-
-  $form->{ordtotal} = $amount;
-
-  $form->{name} = $form->{ $form->{vc} };
-  $form->{name} =~ s/--\Q$form->{"$form->{vc}_id"}\E//;
-
-  # add shipto
-  if (!$form->{shipto_id}) {
-    $form->add_shipto($dbh, $form->{id}, "OE");
-  }
-
-  # save printed, emailed, queued
-  $form->save_status($dbh);
-
-  # Link this record to the records it was created from.
-  $form->{convert_from_oe_ids} =~ s/^\s+//;
-  $form->{convert_from_oe_ids} =~ s/\s+$//;
-  my @convert_from_oe_ids      =  split m/\s+/, $form->{convert_from_oe_ids};
-  delete $form->{convert_from_oe_ids};
-  if (!$form->{useasnew} && scalar @convert_from_oe_ids) {
-    RecordLinks->create_links('dbh'        => $dbh,
-                              'mode'       => 'ids',
-                              'from_table' => 'oe',
-                              'from_ids'   => \@convert_from_oe_ids,
-                              'to_table'   => 'oe',
-                              'to_id'      => $form->{id},
-      );
-    $self->_close_quotations_rfqs('dbh'     => $dbh,
-                                  'from_id' => \@convert_from_oe_ids,
-                                  'to_id'   => $form->{id});
-  }
-
-  if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
-    if ($form->{vc} eq 'customer') {
-      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
-    }
-    if ($form->{vc} eq 'vendor') {
-      $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, 0, $form->{exchangerate});
-    }
-  }
-
-  $form->{saved_xyznumber} = $form->{$form->{type} =~ /_quotation$/ ?
-                                       "quonumber" : "ordnumber"};
-
-  Common::webdav_folder($form);
-
-  $self->save_periodic_invoices_config(dbh         => $dbh,
-                                       oe_id       => $form->{id},
-                                       config_yaml => $form->{periodic_invoices_config})
-    if ($form->{type} eq 'sales_order');
-
-  $self->_link_created_sales_order_to_requirement_specs_for_sales_quotations(
-    type               => $form->{type},
-    converted_from_ids => \@convert_from_oe_ids,
-    sales_order_id     => $form->{id},
-    is_new             => $is_new,
-  );
-
-  $self->_set_project_in_linked_requirement_spec(
-    type           => $form->{type},
-    project_id     => $form->{globalproject_id},
-    sales_order_id => $form->{id},
-  );
-
-  $main::lxdebug->leave_sub();
-
-  return 1;
-}
-
-sub _link_created_sales_order_to_requirement_specs_for_sales_quotations {
-  my ($self, %params) = @_;
-
-  # If this is a sales order created from a sales quotation and if
-  # that sales quotation was created from a requirement spec document
-  # then link the newly created sales order to the requirement spec
-  # document, too.
-
-  return if !$params{is_new};
-  return if  $params{type} ne 'sales_order';
-  return if !@{ $params{converted_from_ids} };
-
-  my $oe_objects       = SL::DB::Manager::Order->get_all(where => [ id => $params{converted_from_ids} ]);
-  my @sales_quotations = grep { $_->is_type('sales_quotation') } @{ $oe_objects };
-
-  return if !@sales_quotations;
-
-  my $rs_orders = SL::DB::Manager::RequirementSpecOrder->get_all(where => [ order_id => [ map { $_->id } @sales_quotations ] ]);
-
-  return if !@{ $rs_orders };
-
-  $rs_orders->[0]->db->with_transaction(sub {
-    foreach my $rs_order (@{ $rs_orders }) {
-      SL::DB::RequirementSpecOrder->new(
-        order_id            => $params{sales_order_id},
-        requirement_spec_id => $rs_order->requirement_spec_id,
-        version_id          => $rs_order->version_id,
-      )->save;
-    }
-
-    1;
-  });
-}
-
-sub _set_project_in_linked_requirement_spec {
-  my ($self, %params) = @_;
-
-  return if  $params{type} ne 'sales_order';
-  return if !$params{project_id} || !$params{sales_order_id};
-
-  my $query = <<SQL;
-    UPDATE requirement_specs
-    SET project_id = ?
-    WHERE id IN (
-      SELECT so.requirement_spec_id
-      FROM requirement_spec_orders so
-      WHERE so.order_id = ?
-    )
-SQL
-
-  do_query($::form, $::form->get_standard_dbh, $query, $params{project_id}, $params{sales_order_id});
-}
-
 sub save_periodic_invoices_config {
   my ($self, %params) = @_;
 
@@ -993,74 +633,6 @@ sub load_periodic_invoice_config {
   }
 }
 
-sub _close_quotations_rfqs {
-  $main::lxdebug->enter_sub();
-
-  my $self     = shift;
-  my %params   = @_;
-
-  Common::check_params(\%params, qw(from_id to_id));
-
-  my $myconfig = \%main::myconfig;
-  my $form     = $main::form;
-
-  my $dbh      = $params{dbh} || SL::DB->client->dbh;
-
-  SL::DB->client->with_transaction(sub {
-
-    my $query    = qq|SELECT quotation FROM oe WHERE id = ?|;
-    my $sth      = prepare_query($form, $dbh, $query);
-
-    do_statement($form, $sth, $query, conv_i($params{to_id}));
-
-    my ($quotation) = $sth->fetchrow_array();
-
-    if ($quotation) {
-      return 1;
-    }
-
-    my @close_ids;
-
-    foreach my $from_id (@{ $params{from_id} }) {
-      $from_id = conv_i($from_id);
-      do_statement($form, $sth, $query, $from_id);
-      ($quotation) = $sth->fetchrow_array();
-      push @close_ids, $from_id if ($quotation);
-    }
-
-    $sth->finish();
-
-    if (scalar @close_ids) {
-      $query = qq|UPDATE oe SET closed = TRUE WHERE id IN (| . join(', ', ('?') x scalar @close_ids) . qq|)|;
-      do_query($form, $dbh, $query, @close_ids);
-    }
-    1;
-  }) or do { die SL::DB->client->error };
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my $rc = SL::DB::Order->new->db->with_transaction(sub {
-    my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $form->{id} ]) };
-
-    SL::DB::Order->new(id => $form->{id})->delete;
-
-    my $spool = $::lx_office_conf{paths}->{spool};
-    unlink map { "$spool/$_" } @spoolfiles if $spool;
-
-    1;
-  }) or do { die SL::DB->client->error };
-
-  $main::lxdebug->leave_sub();
-
-  return $rc;
-}
-
 sub retrieve {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
@@ -1252,10 +824,11 @@ sub _retrieve {
            p.classification_id,
            o.sellprice, o.parts_id AS id, o.unit, o.discount, p.notes AS partnotes, p.part_type,
            o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
-           o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,
+           o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.recurring_billing_mode, o.longdescription,
            o.price_factor_id, o.price_factor, o.marge_price_factor, o.active_price_source, o.active_discount_source,
            pr.projectnumber, p.formel,
-           pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup
+           pg.partsgroup, o.pricegroup_id, (SELECT pricegroup FROM pricegroup WHERE id=o.pricegroup_id) as pricegroup,
+           e.name as orderer, e.id as orderer_id
          FROM orderitems o
          JOIN parts p ON (o.parts_id = p.id)
          JOIN oe ON (o.trans_id = oe.id)
@@ -1263,11 +836,12 @@ sub _retrieve {
          LEFT JOIN chart c2 ON ((SELECT tc.income_accno_id  FROM taxzone_charts tc WHERE tc.taxzone_id = ? and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c2.id)
          LEFT JOIN chart c3 ON ((SELECT tc.expense_accno_id FROM taxzone_charts tc WHERE tc.taxzone_id = ? and tc.buchungsgruppen_id = p.buchungsgruppen_id) = c3.id)
          LEFT JOIN project pr ON (o.project_id = pr.id)
-         LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id) | .
+         LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
+         LEFT JOIN employee e ON (o.orderer_id = e.id) | .
       ($form->{id}
        ? qq|WHERE o.trans_id = ?|
        : qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
-      qq|ORDER BY o.trans_id, o.position|;
+      qq| ORDER BY o.trans_id, o.position|;
 
     @ids = $form->{id} ? ($form->{id}) : @ids;
     $sth = prepare_execute_query($form, $dbh, $query, @values);
@@ -1376,7 +950,7 @@ sub _retrieve {
 
   }
 
-  $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate}, ($form->{vc} eq 'customer') ? "buy" : "sell");
+  $form->{exchangerate} = $form->check_exchangerate($myconfig, $form->{currency}, $form->{transdate}, ($form->{vc} eq 'customer') ? "buy" : "sell");
 
   Common::webdav_folder($form);
 
@@ -1385,30 +959,6 @@ sub _retrieve {
   return 1;
 }
 
-sub retrieve_simple {
-  $main::lxdebug->enter_sub();
-
-  my $self     = shift;
-  my %params   = @_;
-
-  Common::check_params(\%params, qw(id));
-
-  my $myconfig    = \%main::myconfig;
-  my $form        = $main::form;
-
-  my $dbh         = $params{dbh} || $form->get_standard_dbh($myconfig);
-
-  my $oe_query    = qq|SELECT * FROM oe         WHERE id = ?|;
-  my $oi_query    = qq|SELECT * FROM orderitems WHERE trans_id = ? ORDER BY position|;
-
-  my $order            = selectfirst_hashref_query($form, $dbh, $oe_query, conv_i($params{id}));
-  $order->{orderitems} = selectall_hashref_query(  $form, $dbh, $oi_query, conv_i($params{id}));
-
-  $main::lxdebug->leave_sub();
-
-  return $order;
-}
-
 sub order_details {
   $main::lxdebug->enter_sub();
 
@@ -1490,6 +1040,7 @@ sub order_details {
   my @arrays =
     qw(runningnumber number description longdescription qty qty_nofmt ship ship_nofmt unit bin
        partnotes serialnumber reqdate sellprice sellprice_nofmt listprice listprice_nofmt netprice netprice_nofmt
+       orderer
        discount discount_nofmt p_discount discount_sub discount_sub_nofmt nodiscount_sub nodiscount_sub_nofmt
        linetotal linetotal_nofmt nodiscount_linetotal nodiscount_linetotal_nofmt tax_rate projectnumber projectdescription
        price_factor price_factor_name partsgroup weight weight_nofmt lineweight lineweight_nofmt optional);
@@ -1799,21 +1350,6 @@ OE.pm is part of the OE module. OE is responsible for sales and purchase orders,
 
 =over 4
 
-=item retrieve_simple PARAMS
-
-simple OE retrieval by id. does not look up customer, vendor, units or any other stuff. only oe and orderitems.
-
-  my $order = retrieve_simple(id => 2);
-
-  $order => {
-    %_OE_CONTENT,
-    orderitems => [
-      %_ORDERITEM_ROW_1,
-      %_ORDERITEM_ROW_2,
-      ...
-    ]
-  }
-
 =back
 
 =cut
diff --git a/SL/Presenter.pm b/SL/Presenter.pm
index 44332bd91..888b26bfb 100644
--- a/SL/Presenter.pm
+++ b/SL/Presenter.pm
@@ -6,6 +6,7 @@ use parent qw(Rose::Object);
 
 use Carp;
 use Template;
+use List::Util qw(first);
 
 use SL::Presenter::EscapedText qw(is_escaped);
 
@@ -45,11 +46,14 @@ sub render {
   # Look for the file given by $template if $template is not a reference.
   my $source;
   if (!ref $template) {
-    my $webpages_path = $::request->layout->webpages_path;
+    my $webpages_path     = $::request->layout->webpages_path;
+    my $webpages_fallback = $::request->layout->webpages_fallback_path;
 
     my $ext = $options->{type} eq 'text' ? 'txt' : $options->{type};
-    $source = "${webpages_path}/${template}.${ext}";
-    croak "Template file ${source} not found" unless -f $source;
+
+    $source = first { -f } map { "${_}/${template}.${ext}" } grep { defined } $webpages_path, $webpages_fallback;
+
+    croak "Template file ${template} not found" unless $source;
 
   } elsif (ref($template) eq 'SCALAR') {
     # Normal scalar reference: hand over to Template
@@ -98,7 +102,10 @@ sub render {
 sub get_template {
   my ($self) = @_;
 
-  my $webpages_path = $::request->layout->webpages_path;
+  my $webpages_path     = $::request->layout->webpages_path;
+  my $webpages_fallback = $::request->layout->webpages_fallback_path;
+
+  my $include_path = join ':', grep defined, $webpages_path, $webpages_fallback;
 
   # Make locales.pl parse generic/exception.html, too:
   # $::form->parse_html_template("generic/exception")
@@ -108,7 +115,7 @@ sub get_template {
                     ABSOLUTE     => 1,
                     CACHE_SIZE   => 0,
                     PLUGIN_BASE  => 'SL::Template::Plugin',
-                    INCLUDE_PATH => ".:$webpages_path",
+                    INCLUDE_PATH => ".:$include_path",
                     COMPILE_EXT  => '.tcc',
                     COMPILE_DIR  => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
                     ERROR        => "${webpages_path}/generic/exception.html",
@@ -146,7 +153,9 @@ SL::Presenter - presentation layer class
   use SL::DB::Order;
   use SL::Presenter::Record qw(grouped_record_list);
 
-  my $quotation = SL::DB::Manager::Order->get_first(where => { quotation => 1 });
+  my $quotation = SL::DB::Manager::Order->get_first(
+    where => [ or => ['record_type' => 'sales_quotation',
+                      'record_type' => 'request_quotation' ]]);
   my $records   = $quotation->linked_records(direction => 'to');
   my $html      = grouped_record_list($records);
 
diff --git a/SL/Presenter/ALL.pm b/SL/Presenter/ALL.pm
index 974b1a6e4..18e300f2c 100644
--- a/SL/Presenter/ALL.pm
+++ b/SL/Presenter/ALL.pm
@@ -4,8 +4,10 @@ use strict;
 
 use SL::Presenter::Chart;
 use SL::Presenter::CustomerVendor;
+use SL::Presenter::DatePeriod;
 use SL::Presenter::DeliveryOrder;
 use SL::Presenter::Dunning;
+use SL::Presenter::EmailJournal;
 use SL::Presenter::EscapedText;
 use SL::Presenter::FileObject;
 use SL::Presenter::Invoice;
@@ -19,17 +21,21 @@ use SL::Presenter::RequirementSpec;
 use SL::Presenter::RequirementSpecItem;
 use SL::Presenter::RequirementSpecTextBlock;
 use SL::Presenter::SepaExport;
+use SL::Presenter::SepaExportItem;
 use SL::Presenter::ShopOrder;
 use SL::Presenter::Text;
 use SL::Presenter::Tag;
 use SL::Presenter::BankAccount;
+use SL::Presenter::BankTransaction;
 use SL::Presenter::MaterialComponents;
 
 our %presenters = (
   chart                       => 'SL::Presenter::Chart',
   customer_vendor             => 'SL::Presenter::CustomerVendor',
+  date_period                 => 'SL::Presenter::DatePeriod',
   delivery_order              => 'SL::Presenter::DeliveryOrder',
   dunning                     => 'SL::Presenter::Dunning',
+  email_journal               => 'SL::Presenter::EmailJournal',
   escaped_text                => 'SL::Presenter::EscapedText',
   file_object                 => 'SL::Presenter::FileObject',
   invoice                     => 'SL::Presenter::Invoice',
@@ -43,10 +49,12 @@ our %presenters = (
   requirement_spec_item       => 'SL::Presenter::RequirementSpecItem',
   requirement_spec_text_block => 'SL::Presenter::RequirementSpecTextBlock',
   sepa_export                 => 'SL::Presenter::SepaExport',
+  sepa_exprot_item            => 'SL::Presenter::SepaExportItem',
   shop_order                  => 'SL::Presenter::ShopOrder',
   text                        => 'SL::Presenter::Text',
   tag                         => 'SL::Presenter::Tag',
   bank_account                => 'SL::Presenter::BankAccount',
+  bank_transaction            => 'SL::Presenter::BankTransaction',
   M                           => 'SL::Presenter::MaterialComponents',
 );
 
diff --git a/SL/Presenter/BankTransaction.pm b/SL/Presenter/BankTransaction.pm
new file mode 100644
index 000000000..b7adf7421
--- /dev/null
+++ b/SL/Presenter/BankTransaction.pm
@@ -0,0 +1,76 @@
+package SL::Presenter::BankTransaction;
+
+use strict;
+use utf8;
+
+use SL::Locale::String qw(t8);
+use SL::Presenter::EscapedText qw(escape);
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(show bank_transaction);
+
+use Carp;
+
+sub show {goto &bank_account};
+
+sub bank_transaction {
+  my ($bank_transaction) = @_;
+  my $bank_account = $bank_transaction->local_bank_account;
+
+  escape(join ' ', (
+    t8('Bank transaction'),
+    $bank_transaction->transdate . ":",
+    $bank_account->bank_code,
+    $bank_account->account_number,
+    "→",
+    $bank_transaction->remote_bank_code,
+    $bank_transaction->remote_account_number,
+    "-",
+    $bank_transaction->amount . $bank_transaction->currency->name,
+  ));
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::BankTransaction - Presenter module for SL::DB::BankTransaction objects
+
+=head1 SYNOPSIS
+
+  my $object = SL::DB::Manager::BankTransaction->get_first();
+  my $html   = SL::Presenter::BankTransaction::bank_transaction($object);
+  # or
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object>
+
+Alias for C<bank_transaction $object>.
+
+=item C<bank_transaction $object>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the bank transaction object
+C<$object>.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/Chart.pm b/SL/Presenter/Chart.pm
index 3a4f48390..6bb4c1512 100644
--- a/SL/Presenter/Chart.pm
+++ b/SL/Presenter/Chart.pm
@@ -10,7 +10,7 @@ our @EXPORT_OK = qw(chart_picker chart);
 use Carp;
 use Data::Dumper;
 use SL::Presenter::EscapedText qw(escape is_escaped);
-use SL::Presenter::Tag qw(input_tag name_to_id html_tag);
+use SL::Presenter::Tag qw(input_tag name_to_id html_tag link_tag);
 
 sub chart {
   my ($chart, %params) = @_;
@@ -19,17 +19,16 @@ sub chart {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="am.pl?action=edit_account&id=' . escape($chart->id) . '">',
-    escape($chart->accno),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($chart->accno);
+  if (! delete $params{no_link}) {
+    my $href = 'am.pl?action=edit_account&id=' . escape($chart->id);
+    $text = link_tag($href, $text, %params);
+  }
   is_escaped($text);
 }
 
 sub chart_picker {
   my ($name, $value, %params) = @_;
-
   $value = SL::DB::Manager::Chart->find_by(id => $value) if $value && !ref $value;
   my $id = delete($params{id}) || name_to_id($name);
   my $fat_set_item = delete $params{fat_set_item};
@@ -38,9 +37,16 @@ sub chart_picker {
   push @classes, 'chart_autocomplete';
   push @classes, 'chartpicker_fat_set_item' if $fat_set_item;
 
+  # If there is no 'onClick' parameter, set it to 'this.select()',
+  # so that the user can type directly in the input field
+  # to search another chart.
+  if (!grep { m{onclick}i } keys %params) {
+    $params{onClick} = 'this.select()';
+  }
+
   my $ret =
     input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) .
-    join('', map { $params{$_} ? input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type category choose booked)) .
+    join('', map { $params{$_} ? input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type category choose booked status)) .
     input_tag("", (ref $value && $value->can('displayable_name')) ? $value->displayable_name : '', id => "${id}_name", %params);
 
   $::request->layout->add_javascripts('autocomplete_chart.js');
@@ -82,15 +88,20 @@ see L<SL::Presenter>
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the chart object C<$object>
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
-=over 4
+=over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the chart's name linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
+
+=item * no_link
+
+If falsish (the default) then the account number will be linked to the "edit"
+dialog.
 
 =back
 
@@ -157,6 +168,13 @@ the item object. There is an example on the test page.
 Without fat_set_item only the variables id and name (displayable name) are
 available.
 
+=item * status
+
+If C<%params> contains C<status> only charts of this status will be used
+for autocompletion. C<status> can be one of the following strings:
+C<valid>, C<invalid> or C<all>. C<valid> is the default if C<status> is
+not given.
+
 =back
 
 C<chart_picker> will register its javascript for inclusion in the next header
diff --git a/SL/Presenter/CustomVariableConfig.pm b/SL/Presenter/CustomVariableConfig.pm
new file mode 100644
index 000000000..e0c83c56c
--- /dev/null
+++ b/SL/Presenter/CustomVariableConfig.pm
@@ -0,0 +1,35 @@
+package SL::Presenter::CustomVariableConfig;
+
+use strict;
+
+use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Locale::String qw(t8);
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(cvar_config_description_with_module);
+
+our %t8 = (
+  CT                => t8('Customers and vendors'),
+  Contacts          => t8('Contact persons'),
+  IC                => t8('Parts, services and assemblies'),
+  Projects          => t8('Projects'),
+  RequirementSpecs  => t8('Requirement Specs'),
+  ShipTo            => t8('Shipping Address'),
+);
+
+
+sub cvar_config_description_with_module {
+  my ($cvar_config) = @_;
+
+  my $module = $t8{$cvar_config->module};
+  my $description = $cvar_config->description;
+
+  escape("($module) $description");
+}
+
+sub description_with_module {
+  goto &cvar_config_description_with_module;
+}
+
+
+1;
diff --git a/SL/Presenter/CustomerVendor.pm b/SL/Presenter/CustomerVendor.pm
index ab951720a..3ba63b917 100644
--- a/SL/Presenter/CustomerVendor.pm
+++ b/SL/Presenter/CustomerVendor.pm
@@ -3,7 +3,7 @@ package SL::Presenter::CustomerVendor;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
-use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag);
+use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag link_tag img_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(customer_vendor customer vendor customer_vendor_picker customer_picker vendor_picker);
@@ -32,13 +32,12 @@ sub _customer_vendor {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $callback = $params{callback} ? '&callback=' . $::form->escape($params{callback}) : '';
-
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=CustomerVendor/edit&amp;db=' . $type . '&amp;id=' . escape($cv->id) . '">',
-    escape($cv->name),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($cv->name);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=CustomerVendor/edit&db=' . $type
+               . '&id=' . escape($cv->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
@@ -65,12 +64,31 @@ sub customer_vendor_picker {
   # do not use reserved html attribute 'type' for cv type
   $params{cv_type} = delete $params{type};
 
+  my $show_details = delete $params{show_details} // 0;
+
+  # If there is no 'onClick' parameter, set it to 'this.select()',
+  # so that the user can type directly in the input field
+  # to search another customer/vendor.
+  if (!grep { m{onclick}i } keys %params) {
+    $params{onClick} = 'this.select()';
+  }
+
   my $ret =
     input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id,
       'data-customer-vendor-picker-data' => JSON::to_json(\%params),
     ) .
     input_tag("", ref $value  ? $value->displayable_name : '', id => "${id}_name", %params);
 
+  if ($show_details) {
+    $ret .= img_tag(src => 'image/detail.png', alt => $::locale->text('Show details'),
+      title => $::locale->text('Show details'), class => "button-image info",
+      onclick => "kivi.CustomerVendor.show_cv_details_dialog('#${id}', '$params{cv_type}')" );
+
+    $ret .= link_tag('javascript:;', $::locale->text('Edit'),
+      title => $::locale->text('Open in new window'),
+      onclick => "kivi.CustomerVendor.open_customervendor_tab('#${id}', '$params{cv_type}')" );
+  }
+
   $::request->layout->add_javascripts('kivi.CustomerVendor.js');
   $::request->presenter->need_reinit_widgets($id);
 
@@ -113,15 +131,15 @@ vendor Rose::DB objects
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the customer object C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the customer's name linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -135,15 +153,15 @@ the "edit customer" dialog from the master data menu.
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the vendor object C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the vendor's name linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -162,6 +180,37 @@ parameters.
 
 =back
 
+=over 4
+
+=item C<customer_vendor_picker $name, $value, %params>
+
+Renders a customer/vendor picker. The name will be both id and name
+of the resulting hidden C<id> input field (but the ID can be
+overwritten with C<$params{id}>).
+
+An additional dummy input field is rendered that will contain the
+customer/vendor's name.
+
+C<$value> can be a customer/vendor ID or a C<Rose::DB:Object> instance.
+If it is an instance then the type will be determined automatically.
+
+However the type, C<customer> or C<vendor>, can also be specified using
+C<$type>.
+
+On top of that there are wrapper functions C<customer_picker> and
+C<vendor_picker> that set the type automatically.
+
+If C<$show_details> is true then the picker will be rendered with an
+additional button to open the customer/vendor details dialog and a
+link to open the customer/vendor in a new tab. This can be used in the
+record views as well as in account receivable/payable.
+
+=back
+
+=head1 TESTS
+
+For the pickers see Developer tools -> Customer/Vendor Test.
+
 =head1 BUGS
 
 Nothing here yet.
diff --git a/SL/Presenter/DatePeriod.pm b/SL/Presenter/DatePeriod.pm
new file mode 100644
index 000000000..5c7ca677e
--- /dev/null
+++ b/SL/Presenter/DatePeriod.pm
@@ -0,0 +1,284 @@
+package SL::Presenter::DatePeriod;
+
+use strict;
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(
+  date_period_picker
+  get_dialog_defaults_from_report_generator
+  populate_hidden_variables
+);
+
+use SL::Presenter::Tag qw(name_to_id);
+
+sub date_period_picker {
+  my ($name, $value_from, $value_to, %params) = @_;
+
+  my $id = name_to_id($name);
+  my @classes = $params{class} ? ($params{class}) : ();
+  push @classes, 'date_period_picker';
+
+  my $dialog_defaults = {
+    year => $params{dialog_defaults}->{year} // DateTime->today->year,
+    type => $params{dialog_defaults}->{type} // 'yearly',
+    quarter => $params{dialog_defaults}->{quarter} // 'A',
+    month => $params{dialog_defaults}->{month} // '1',
+  };
+
+  my $html = SL::Presenter->get->render(
+    'presenter/date_period/date_period_picker',
+    id => $id,
+    classes => \@classes,
+    defaults => {
+      report_period_from_date => $value_from || '',
+      report_period_to_date => $value_to || '',
+      dialog => $dialog_defaults
+    },
+    years_list => get_years(),
+    months_list => get_months(),
+  );
+  $::request->layout->add_javascripts('kivi.Presenter.DatePeriodPicker.js');
+
+  return $html;
+}
+
+### convenience functions
+
+sub get_dialog_defaults_from_report_generator {
+  my ($name) = @_;
+
+  my $id = name_to_id($name);
+
+  my %fallback_dateperiod_dialog = (
+    year => DateTime->today->year,
+    type => 'yearly',
+    quarter => 'A',
+    month => '1',
+  );
+  my %defaults_dialog;
+  for (keys %fallback_dateperiod_dialog) {
+    $defaults_dialog{$_} = $::form->{$id . '_selected_preset_' . $_} //
+                            $::form->{'report_generator_hidden_' . $id . '_selected_preset_' . $_} //
+                            $fallback_dateperiod_dialog{$_};
+  }
+  return \%defaults_dialog;
+}
+
+sub populate_hidden_variables {
+  my ($name, $hidden_variables_ref) = @_;
+
+  my $id = name_to_id($name);
+
+  my @vars = qw(
+    _from_date
+    _to_date
+    _selected_preset_year
+    _selected_preset_type
+    _selected_preset_quarter
+    _selected_preset_month
+  );
+
+  push @{ $hidden_variables_ref }, map { $id . $_ } @vars;
+}
+
+### helper
+
+sub get_months {
+  my $dt = DateTime->now;
+  my $months = $dt->{locale}->{locale_data}->{month_format_wide};
+  my $i = 0;
+  [ map { $i++; [ $i, $::locale->text($_) ] } @{ $months } ];
+}
+
+sub get_years {
+  my $current = DateTime->today->year;
+  [ map { [ $current - $_, $current - $_, ] } (0..39) ];
+}
+
+sub picker { goto &date_period_picker }
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Presenter::DatePeriod - Date period stuff
+
+=head1 SYNOPSIS
+
+  # use in perl code
+  use SL::Presenter::DatePeriod qw(date_period_picker);
+  my $html   = date_period_picker('my-picker-id', '', '');
+  my $html   = date_period_picker('my-other-picker-id', $from_date, $to_date);
+
+  # use in template
+  [% P.date_period.picker('my-picker-id', '', '') %]
+  [% P.date_period.picker('my-other-picker-id',
+                            defaults.from_date,
+                            defaults.to_date,
+                            dialog_defaults => defaults.dialog) %]
+
+see also L<SL::Presenter>
+
+=head1 DATE PERIOD PICKER UI DESCRIPTION
+
+Two date input fields are shown: 'From' and 'To', to select a date period.
+
+Additionally a button is shown: 'Select from preset'.
+
+When clicked it shows a dialog that allows the selection of a date period
+from sensible presets.
+
+=over 2
+
+=item Dialog:
+
+The dialog shows a select 'Year', containing the current year plus years up
+to forty years back.
+
+A period is selected with a radio button, that is either 'yearly' (default),
+'quarterly' or 'monthly'.
+
+For quarterly and monthly there is a select shown containing the respective
+values.
+
+=back
+
+=head1 FUNCTIONS
+
+=over 2
+
+=item C<date_period_picker $name, $value_from, $value_to, %params>
+
+Renders a date period picker with preset dialog.
+
+C<$name> should be a unique name. It is converted to an id for the main
+element. This id is also used as a prefix for all sub-elements that need an id.
+
+B<Important:> The selected dates are available from the form elements
+
+C<id _ '_from_date'> and C<id _ '_to_date'>.
+
+In above example this would be C<'my-picker-id_from_date'> and
+C<'my-picker-id_to_date'>.
+
+C<$value_from> and C<$value_to> are used as preset values for the respective
+date fields. This may be useful to keep entered value between page switches.
+
+C<$params> Classes in C<class> are forwarded to the main element.
+
+If you want to keep the selection over multiple requests this has to be handled
+in the controller.
+
+C<$params> can therefor contain a hash called C<dialog_defaults> with the
+key/values:
+
+  year => DateTime->today->year,  # numeric year
+  type => 'yearly',               # the radio button selection:
+                                  # 'yearly', 'monthly', 'quarterly'
+  quarter => 'A',                 # the quarter as a letter code:
+                                  # 'A', 'B', 'C', 'D' A being 1st quarter etc.
+  month => '1',                   # numeric month
+
+The values will be used to pre-select the dialog fields.
+
+These values are also set into some hidden fields with the id in the format
+e.g.: C<id _ '_selected_preset_year'>.
+
+Convenience functions to handle report generator hidden variables are provided.
+E.g.:
+
+  use SL::Presenter::DatePeriod qw(get_dialog_defaults_from_report_generator
+                                    populate_hidden_variables);
+
+  # use values from form, then report generator form, then fallback
+  my %fallback = (
+    dateperiod_from_date => '',
+    dateperiod_to_date => '',
+    # other fields e.g.:
+    # chart_id      => '',
+  );
+  my %defaults;
+  for (keys %fallback) {
+    $defaults{$_} = $::form->{$_} // $::form->{'report_generator_hidden_' . $_} // $fallback{$_};
+  }
+
+  # set dialog defaults
+  $defaults{dialog} = get_dialog_defaults_from_report_generator('dateperiod');
+
+  # set hidden fields for the report generator
+  my @hidden_variables = qw(chart_id);    # e.g.
+  populate_hidden_variables('dateperiod', \@hidden_variables);
+
+=item C<get_dialog_defaults_from_report_generator $name>
+
+Convenience function to get the dialog defaults from hidden report generator
+fields. (Use in controller.)
+
+First uses form fields: C<$id . '_selected_preset_' ...>.
+Then report generator fields: C<'report_generator_hidden_' . $id . '_selected_preset_' ...>
+
+C<$name> name of the date picker.
+
+=item C<populate_hidden_variables $name $hidden_variables_ref>
+
+Convenience function Add hidden variables to report a generator.
+(Use in controller.)
+
+C<$name> name of the date picker.
+
+C<$hidden_variables_ref> reference to the hidden variable array.
+
+=back
+
+=head1 USE / MOTIVATION / GOAL
+
+Use date_period_picker when you want to select a date period with preset
+dialog.
+
+Planned use: ListTransactions report settings view (new, replacement for
+ca/list).
+
+Possible uses in report settings views for:
+
+  - rp/erfolgsrechnung (swiss)
+  - rp/trial_balance
+  - Inventory/stock_usage
+
+And possibly more.
+
+Current implementations for report periods repeat a lot of template and
+perl code in different places. Hopefully this can be reduced.
+
+While this UI may require slightly more clicks than previous / current
+implementations, the interface is much more concise. It is easier on the eyes
+and fits better into the new design 4.0.
+
+=head1 LIMITATIONS
+
+If multiple date_period_picker elements were to be used on the same page the
+handling of hidden variables becomes ugly.
+
+  my @hidden_variables = qw(
+    dateperiod_from_date
+    dateperiod_to_date
+    dateperiod_selected_preset_year
+    dateperiod_selected_preset_type
+    # ... etc.
+  );
+
+Convenience functions are provided to help handle this. Currently i don't see
+another way of handling this.
+
+=head1 BUGS
+
+None atm :)
+
+=head1 AUTHOR
+
+Cem Aydin E<lt>cem.aydin@revamp-it.chE<gt>
+
+=cut
diff --git a/SL/Presenter/DeliveryOrder.pm b/SL/Presenter/DeliveryOrder.pm
index 9f525b3f0..56ac939fe 100644
--- a/SL/Presenter/DeliveryOrder.pm
+++ b/SL/Presenter/DeliveryOrder.pm
@@ -5,63 +5,43 @@ use strict;
 use SL::DB::DeliveryOrder::TypeData ();
 use SL::Locale::String qw(t8);
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(sales_delivery_order purchase_delivery_order delivery_order_status_line);
+our @EXPORT_OK = qw(
+  show delivery_order delivery_order_status_line
+  sales_delivery_order purchase_delivery_order
+  rma_delivery_order supplier_delivery_order
+);
 
 use Carp;
 
-sub sales_delivery_order {
-  my ($delivery_order, %params) = @_;
+sub show {goto &delivery_order};
 
-  return _do_record($delivery_order, 'sales_delivery_order', %params);
-}
+sub sales_delivery_order {goto &delivery_order}
 
-sub rma_delivery_order {
-  my ($delivery_order, %params) = @_;
+sub rma_delivery_order {goto &delivery_order};
 
-  return _do_new_record($delivery_order, 'rma_delivery_order', %params);
-}
+sub purchase_delivery_order {goto &delivery_order};
 
-sub purchase_delivery_order {
-  my ($delivery_order, %params) = @_;
+sub supplier_delivery_order {goto &delivery_order};
 
-  return _do_record($delivery_order, 'purchase_delivery_order', %params);
-}
-
-sub supplier_delivery_order {
+sub delivery_order {
   my ($delivery_order, %params) = @_;
-
-  return _do_new_record($delivery_order, 'supplier_delivery_order', %params);
-}
-
-sub _do_new_record {
-  my ($delivery_order, $type, %params) = @_;
+  my $type = $delivery_order->record_type;
 
   $params{display} ||= 'inline';
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="contoller.pl?action=DeliveryOrder/edit&amp;type=' . $type . '&amp;id=' . escape($delivery_order->id) . '">',
-    escape($delivery_order->donumber),
-    $params{no_link} ? '' : '</a>',
-  );
-  is_escaped($text);
-}
-
-sub _do_record {
-  my ($delivery_order, $type, %params) = @_;
-
-  $params{display} ||= 'inline';
-
-  croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
+  my $text = escape($delivery_order->donumber);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=DeliveryOrder/edit'
+               . '&type=' . $type
+               . '&id=' . escape($delivery_order->id);
+    $text = link_tag($href, $text, %params);
+  }
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="do.pl?action=edit&amp;type=' . $type . '&amp;id=' . escape($delivery_order->id) . '">',
-    escape($delivery_order->donumber),
-    $params{no_link} ? '' : '</a>',
-  );
   is_escaped($text);
 }
 
@@ -111,60 +91,63 @@ for sales and purchase delivery orders
 =head1 SYNOPSIS
 
   # Sales delivery orders:
-  my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ is_sales => 1 ]);
+  my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ record_type  => SALES_DELIVERY_ORDER_TYPE ]);
   my $html   = SL::Presenter::DeliveryOrder::sales_delivery_order($object, display => 'inline');
 
   # Purchase delivery orders:
-  my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ or => [ is_sales => undef, is_sales => 0 ]]);
+  my $object = SL::DB::Manager::DeliveryOrder->get_first(where => [ record_type  => PURCHASE_DELIVERY_ORDER_TYPE ]);
   my $html   = SL::Presenter::DeliveryOrder::purchase_delivery_order($object, display => 'inline');
 
+  #...
+
+  # or for all types:
+  my $html   = SL::Presenter::DeliveryOrder::delivery_order($object);
+  my $html   = $object->presenter->show();
+
 =head1 FUNCTIONS
 
 =over 4
 
-=item C<sales_delivery_order $object, %params>
+=item C<show $object %params>
 
-Returns a rendered version (actually an instance of
-L<SL::Presenter::EscapedText>) of the sales delivery order object
-C<$object>.
+Alias for C<delivery_order $object %params>.
 
-C<%params> can include:
+=item C<sales_delivery_order $object, %params>
 
-=over 2
+Alias for C<delivery_order $object %params>.
 
-=item * display
+=item C<purchase_delivery_order $object, %params>
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's delivery
-order number linked to the corresponding 'edit' action.
+Alias for C<delivery_order $object %params>.
 
-=item * no_link
+=item C<rma_delivery_order $object, %params>
 
-If falsish (the default) then the delivery order number will be linked
-to the "edit delivery order" dialog from the sales menu.
+Alias for C<delivery_order $object %params>.
 
-=back
+=item C<supplier_delivery_order $object, %params>
 
-=item C<purchase_delivery_order $object, %params>
+Alias for C<delivery_order $object %params>.
+
+=item C<delivery_order $object, %params>
 
 Returns a rendered version (actually an instance of
-L<SL::Presenter::EscapedText>) of the purchase delivery order object
+L<SL::Presenter::EscapedText>) of the sales delivery order object
 C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+L<SL::Presenter::Tag/link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's delivery
-order number linked to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
 If falsish (the default) then the delivery order number will be linked
-to the "edit delivery order" dialog from the purchase menu.
+to the "edit delivery order" dialog from the sales menu.
 
 =back
 
diff --git a/SL/Presenter/Dunning.pm b/SL/Presenter/Dunning.pm
index de4961439..81a5070f4 100644
--- a/SL/Presenter/Dunning.pm
+++ b/SL/Presenter/Dunning.pm
@@ -6,10 +6,12 @@ use SL::Presenter::EscapedText qw(escape is_escaped);
 use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(dunning);
+our @EXPORT_OK = qw(show dunning);
 
 use Carp;
 
+sub show {goto &dunning};
+
 sub dunning {
   my ($dunning, %params) = @_;
 
@@ -18,9 +20,8 @@ sub dunning {
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
   my $text = escape($dunning->dunning_config->dunning_description);
-
   if (! delete $params{no_link}) {
-    my @flags;
+    my @flags = ();
     push @flags, 'showold=1';
     push @flags, 'l_mails=1'      if $::instance_conf->get_email_journal;
     push @flags, 'l_webdav=1'     if $::instance_conf->get_webdav;
@@ -35,3 +36,57 @@ sub dunning {
 }
 
 1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::Dunning - Presenter module for SL::DB::Dunning objects
+
+=head1 SYNOPSIS
+
+  my $object = SL::DB::Manager::Dunning->get_first();
+  my $html   = SL::Presenter::Dunning::dunning($object);
+  # or
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object>
+
+Alias for C<dunning $object %params>.
+
+=item C<dunning $object %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the dunning object
+C<$object>.
+
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
+
+=over 2
+
+=item * no_link
+
+If falsish (the default) then the  dunning will be linked to the "show" dialog.
+
+=back
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/EmailJournal.pm b/SL/Presenter/EmailJournal.pm
index 5bdfcd887..cc28aa0ac 100644
--- a/SL/Presenter/EmailJournal.pm
+++ b/SL/Presenter/EmailJournal.pm
@@ -3,12 +3,18 @@ package SL::Presenter::EmailJournal;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag html_tag div_tag);
+use SL::Locale::String qw(t8);
+use SL::SessionFile::Random;
+use SL::DB::EmailJournalAttachment;
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(email_journal);
+our @EXPORT_OK = qw(show email_journal entry_status attachment_preview);
 
 use Carp;
 
+sub show {goto &email_journal};
+
 sub email_journal {
   my ($email_journal_entry, %params) = @_;
 
@@ -16,15 +22,58 @@ sub email_journal {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=EmailJournal/show&amp;id=' . escape($email_journal_entry->id) . '">',
-    escape($email_journal_entry->subject),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($email_journal_entry->subject);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=EmailJournal/show'
+               . '&id=' . escape($email_journal_entry->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
 
+sub entry_status {
+  my ($email_journal_entry, %params) = @_;
+
+  my %status_to_text = (
+    sent            => t8('sent'),
+    send_failed     => t8('send failed'),
+    imported        => t8('imported'),
+  );
+
+  my $status = $email_journal_entry->status;
+  my $text   = $status_to_text{$status} || $status;
+
+  return $text;
+}
+
+sub attachment_preview {
+  my ($attachment_or_id, %params) = @_;
+
+  if (! $attachment_or_id) {
+    return is_escaped(div_tag('', id => 'attachment_preview'));
+  }
+  my $attachment_id = ref $attachment_or_id ? $attachment_or_id->id
+     : $attachment_or_id;
+
+  require SL::Controller::EmailJournal;
+  my $src_url = SL::Controller::EmailJournal->new->url_for(
+      action => 'show_attachment',
+      attachment_id => $attachment_id
+  );
+
+  $params{style} .= "; display:flex; resize:both; overflow:hidden; padding-bottom:5px";
+  my $attachment_preview = div_tag(
+    html_tag('iframe', '', src => $src_url,
+      width => "100%", height => '100%',
+      "flex-grow" => '1',
+      ),
+    id => 'attachment_preview',
+    %params
+  );
+  return is_escaped($attachment_preview);
+}
+
 1;
 
 __END__
@@ -43,6 +92,8 @@ SL::Presenter::EmailJournal - Presenter module for mail entries in email_journal
 
   my $journal_entry = SL::DB::Manager::EmailJournal->get_first();
   my $html   = SL::Presenter::EmailJournal::email_journal($journal_entry, display => 'inline');
+  # or
+  my $html   = $journal_entry->presenter->show();
 
   # pp $html
   # <a href="controller.pl?action=EmailJournal/show&amp;id=1">IDEV Daten fuer webdav/idev/2017-KW-26.csv erzeugt</a>
@@ -51,22 +102,24 @@ SL::Presenter::EmailJournal - Presenter module for mail entries in email_journal
 
 =over 4
 
+=item C<show $object %params>
+
+Alias for C<email_journal $object %params>.
+
 =item C<email_journal $object, %params>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the email journal object C<$object>
 .
 
-
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
diff --git a/SL/Presenter/FileObject.pm b/SL/Presenter/FileObject.pm
index a339f9482..8b7f12f49 100644
--- a/SL/Presenter/FileObject.pm
+++ b/SL/Presenter/FileObject.pm
@@ -54,7 +54,8 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the file object
 C<$file_object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
diff --git a/SL/Presenter/GL.pm b/SL/Presenter/GL.pm
index cf0998b05..980652ee1 100644
--- a/SL/Presenter/GL.pm
+++ b/SL/Presenter/GL.pm
@@ -3,12 +3,15 @@ package SL::Presenter::GL;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(gl_transaction);
+our @EXPORT_OK = qw(show gl_transaction);
 
 use Carp;
 
+sub show {goto &gl_transaction};
+
 sub gl_transaction {
   my ($gl_transaction, %params) = @_;
 
@@ -16,11 +19,11 @@ sub gl_transaction {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="gl.pl?action=edit&amp;id=' . escape($gl_transaction->id) . '">',
-    escape($gl_transaction->reference),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($gl_transaction->reference);
+  if (! delete $params{no_link}) {
+    my $href = 'gl.pl?action=edit&id=' . escape($gl_transaction->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
@@ -41,25 +44,31 @@ SL::Presenter::GL - Presenter module for GL transaction
 
   my $object = SL::DB::Manager::GLTransaction->get_first();
   my $html   = SL::Presenter::GL::gl_transaction($object, display => 'inline');
+  # or
+  my $html   = $object->presenter->show();
 
 =head1 FUNCTIONS
 
 =over 4
 
+=item C<show $object %params>
+
+Alias for C<gl_transaction $object %params>.
+
 =item C<gl_transaction $object, %params>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of a gl object C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the trans_id number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
diff --git a/SL/Presenter/Invoice.pm b/SL/Presenter/Invoice.pm
index ba662edc2..76eecef8f 100644
--- a/SL/Presenter/Invoice.pm
+++ b/SL/Presenter/Invoice.pm
@@ -3,12 +3,15 @@ package SL::Presenter::Invoice;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(invoice sales_invoice ar_transaction purchase_invoice ap_transaction);
+our @EXPORT_OK = qw(show invoice sales_invoice ar_transaction purchase_invoice ap_transaction);
 
 use Carp;
 
+sub show {goto &invoice};
+
 sub invoice {
   my ($invoice, %params) = @_;
 
@@ -58,11 +61,12 @@ sub _is_ir_record {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="' . $controller . '.pl?action=edit&amp;type=invoice&amp;id=' . escape($invoice->id) . '">',
-    escape($invoice->invnumber),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($invoice->invnumber);
+  if (! delete $params{no_link}) {
+    my $href = $controller . '.pl?action=edit&type=invoice'
+               . '&id=' . escape($invoice->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
@@ -100,26 +104,31 @@ transaction, purchase invoice and AP transaction Rose::DB objects
 
   # use with any of the above ar/ap/is/ir types:
   my $html   = SL::Presenter::Invoice::invoice($object, display => 'inline');
+  my $html   = $object->presenter->show();
 
 =head1 FUNCTIONS
 
 =over 4
 
+=item C<show $object>
+
+Alias for C<invoice $object %params>.
+
 =item C<invoice $object, %params>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of an ar/ap/is/ir object C<$object> . Determines
 which type (sales or purchase, invoice or not) the object is.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -134,15 +143,15 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the sales invoice object C<$object>
 .
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -157,15 +166,15 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the AR transaction object C<$object>
 .
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -180,15 +189,15 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the purchase invoice object
 C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number name
-linked to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
@@ -203,15 +212,15 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the AP transaction object C<$object>
 .
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
diff --git a/SL/Presenter/ItemsList.pm b/SL/Presenter/ItemsList.pm
new file mode 100644
index 000000000..fab13c8fc
--- /dev/null
+++ b/SL/Presenter/ItemsList.pm
@@ -0,0 +1,22 @@
+package SL::Presenter::ItemsList;
+
+use strict;
+
+use File::Spec;
+
+use SL::Presenter;
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(items_list);
+
+sub items_list {
+  my ($items, %params) = @_;
+
+  my $text_mode = !!delete $params{as_text};
+
+  my $output = SL::Presenter->get->render('presenter/items_list/items_list', { type => $text_mode ? 'text' : 'html' }, %params, items => $items);
+
+  $output =~ s{\n$}{}x if $text_mode;
+
+  return $output;
+}
diff --git a/SL/Presenter/Letter.pm b/SL/Presenter/Letter.pm
index 0747bfd3d..2661d51f6 100644
--- a/SL/Presenter/Letter.pm
+++ b/SL/Presenter/Letter.pm
@@ -3,12 +3,15 @@ package SL::Presenter::Letter;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(letter);
+our @EXPORT_OK = qw(show letter);
 
 use Carp;
 
+sub show {goto &letter};
+
 sub letter {
   my ($letter, %params) = @_;
 
@@ -16,11 +19,12 @@ sub letter {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=Letter/edit&amp;letter.id=' . escape($letter->id) . '">',
-    escape($letter->letternumber),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($letter->letternumber);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=Letter/edit'
+               . '&letter.id=' . escape($letter->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
@@ -41,26 +45,32 @@ SL::Presenter::Letter - Presenter module for letter objects
 
   my $letter = SL::DB::Manager::Letter->get_first(where => [ … ]);
   my $html   = SL::Presenter::Letter::letter($letter, display => 'inline');
+  # or
+  my $html   = $letter->presenter->show();
 
 =head1 FUNCTIONS
 
 =over 4
 
+=item C<show $object>
+
+Alias for C<letter $object %params>.
+
 =item C<letter $object, %params>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the letter object C<$object>
 .
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the invoice number linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
diff --git a/SL/Presenter/MaterialComponents.pm b/SL/Presenter/MaterialComponents.pm
index 30123b719..d0ddfc483 100644
--- a/SL/Presenter/MaterialComponents.pm
+++ b/SL/Presenter/MaterialComponents.pm
@@ -13,6 +13,7 @@ use Exporter qw(import);
 our @EXPORT_OK = qw(
   button_tag
   input_tag
+  textarea_tag
   date_tag
   submit_tag
   icon
@@ -231,6 +232,28 @@ sub input_tag {
   );
 }
 
+sub textarea_tag {
+  my ($name, $value, %attributes) = @_;
+
+  _set_id_attribute(\%attributes, $attributes{name});
+
+  my $class = delete $attributes{class};
+  my $icon  = $attributes{icon}
+    ? icon(delete $attributes{icon}, class => 'prefix')
+    : '';
+
+  my $label = $attributes{label}
+    ? html_tag('label', delete $attributes{label}, for => $attributes{id})
+    : '';
+
+  html_tag('div',
+    $icon .
+    html_tag('textarea', $value, class => 'materialize-textarea', %attributes, name => $name) .
+    $label,
+    class => [ grep $_, $class, INPUT_FIELD ],
+  );
+}
+
 sub date_tag {
   my ($name, $value, %attributes) = @_;
 
@@ -280,10 +303,11 @@ sub select_tag {
     : '';
 
   my $label = $attributes{label}
-    ? html_tag('label', delete $attributes{label}, for => $attributes{id})
+    ? html_tag('label', delete $attributes{label}, for => $attributes{id}, class => 'active')
     : '';
 
-  my $select_html = SL::Presenter::Tag::select_tag($name, $collection, %attributes);
+  my $select_html = SL::Presenter::Tag::select_tag($name, $collection, %attributes,
+    class => 'browser-default');
 
   html_tag('div',
     $icon . $select_html . $label,
@@ -343,9 +367,20 @@ directly as classes.
 
 =back
 
-=head1 BUGS
+=head1 BUGS & ISSUES
+
+There is a bug in MaterializeCSS, when using a Materialize select element on an iphone,
+the wrong element is selected. This is currently worked around in the presenter by using
+the 'browser-default' class on the select element as well as the 'active' class on the
+label (to prevent the label from overlapping the select element).
+This should be fixed, upstream, in MaterializeCSS. However it seems that the project is
+not maintained anymore (according to github issues[^1]). There is a community fork[^2],
+which it's still maintained and where the problem seems to be fixed already. It is currently
+in alpha V. 2.0.3-alpha. Maybe it would be good to consider switching to that fork at some
+point.
 
-Nothing here yet.
+[1]: e.g. https://github.com/Dogfalo/materialize/issues/6688
+[2]: https://github.com/materializecss/materialize
 
 =head1 AUTHOR
 
diff --git a/SL/Presenter/Order.pm b/SL/Presenter/Order.pm
index 35005a718..d39042acf 100644
--- a/SL/Presenter/Order.pm
+++ b/SL/Presenter/Order.pm
@@ -3,57 +3,45 @@ package SL::Presenter::Order;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(sales_quotation sales_order request_quotation purchase_order);
+our @EXPORT_OK = qw(show order sales_quotation sales_order_intake sales_order request_quotation purchase_quotation_intake purchase_order purchase_order_confirmation);
 
 use Carp;
 
-sub sales_quotation {
-  my ($order, %params) = @_;
+sub show {goto &order}
 
-  return _oe_record($order, 'sales_quotation', %params);
-}
+sub sales_quotation {goto &order}
 
-sub sales_order {
-  my ($order, %params) = @_;
+sub sales_order_intake {goto &order}
 
-  return _oe_record($order, 'sales_order', %params);
-}
+sub sales_order {goto &order}
 
-sub request_quotation {
-  my ($order, %params) = @_;
+sub request_quotation {goto &order}
 
-  return _oe_record($order, 'request_quotation', %params);
-}
+sub purchase_quotation_intake {goto &order}
 
-sub purchase_order {
-  my ($order, %params) = @_;
+sub purchase_order {goto &order}
 
-  return _oe_record($order, 'purchase_order', %params);
-}
+sub purchase_order_confirmation {goto &order}
 
-sub _oe_record {
-  my ($order, $type, %params) = @_;
+sub order {
+  my ($order, %params) = @_;
+  my $type = $order->record_type;
 
   $params{display} ||= 'inline';
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $number_method = $order->quotation ? 'quonumber' : 'ordnumber';
-
-  my $link_start = '';
-  my $link_end   = '';
-  unless ($params{no_link}) {
-    my $action  = $::instance_conf->get_feature_experimental_order
-                ? 'controller.pl?action=Order/edit'
-                : 'oe.pl?action=edit';
-    $link_start = '<a href="' . $action . '&amp;type=' . $type . '&amp;id=' . escape($order->id) . '">';
-    $link_end   = '</a>';
+  my $text = escape($order->record_number);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=Order/edit'
+               . '&type=' . $type
+               . '&id=' . escape($order->id);
+    $text = link_tag($href, $text, %params);
   }
 
-  my $text = join '', ($link_start, escape($order->$number_method), $link_end);
-
   is_escaped($text);
 }
 
@@ -69,7 +57,9 @@ __END__
 =head1 NAME
 
 SL::Presenter::Order - Presenter module for Rose::DB objects for sales
-quotations, sales orders, requests for quotations and purchase orders
+quotations, sales order_intakes, sales orders,
+requests for quotations, purchase_quotation_intakes,
+purchase orders and purchase order confirmations
 
 =head1 SYNOPSIS
 
@@ -89,98 +79,62 @@ quotations, sales orders, requests for quotations and purchase orders
   my $object = SL::DB::Manager::Order->get_first(where => [ SL::DB::Manager::Order->type_filter('purchase_order') ]);
   my $html   = SL::Presenter::Order::purchase_order($object, display => 'inline');
 
+  # or for all types:
+  my $html   = SL::Presenter::Order::order($object);
+  my $html   = $object->presenter->show();
+
 =head1 FUNCTIONS
 
 =over 4
 
-=item C<sales_quotation $object, %params>
+=item C<show $object %params>
 
-Returns a rendered version (actually an instance of
-L<SL::Presenter::EscapedText>) of the sales quotation object
-C<$object>.
+Alias for C<order $object %params>.
 
-C<%params> can include:
+=item C<sales_quotation $object %params>
 
-=over 2
+Alias for C<order $object %params>.
 
-=item * display
+=item C<sales_order_intake $object %params>
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's
-quotation number linked to the corresponding 'edit' action.
+Alias for C<order $object %params>.
 
-=item * no_link
+=item C<sales_order $object %params>
 
-If falsish (the default) then the order number will be linked to the
-"edit quotation" dialog from the sales menu.
+Alias for C<order $object %params>.
 
-=back
+=item C<request_quotation $object %params>
 
-=item C<sales_order $object, %params>
+Alias for C<order $object %params>.
 
-Returns a rendered version (actually an instance of
-L<SL::Presenter::EscapedText>) of the sales order object C<$object>.
+=item C<purchase_quotation_intake $object %params>
 
-C<%params> can include:
+Alias for C<order $object %params>.
 
-=over 2
-
-=item * display
+=item C<purchase_order $object %params>
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's
-order number linked to the corresponding 'edit' action.
-
-=item * no_link
-
-If falsish (the default) then the  order number will be linked
-to the "edit order" dialog from the sales menu.
-
-=back
-
-=item C<request_quotation $object, %params>
-
-Returns a rendered version (actually an instance of
-L<SL::Presenter::EscapedText>) of the request for quotation object
-C<$object>.
-
-C<%params> can include:
-
-=over 2
-
-=item * display
-
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's
-quotation number linked to the corresponding 'edit' action.
-
-=item * no_link
-
-If falsish (the default) then the order number will be linked to the
-"edit request for quotation" dialog from the purchase menu.
-
-=back
+Alias for C<order $object %params>.
 
-=item C<purchase_order $object, %params>
+=item C<order $object %params>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the purchase order object
 C<$object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the objects's
-order number linked to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * no_link
 
 If falsish (the default) then the  order number will be linked
-to the "edit order" dialog from the purchase menu.
+to the "edit order" dialog.
 
 =back
 
diff --git a/SL/Presenter/Part.pm b/SL/Presenter/Part.pm
index 2f8624d74..1436ef2f0 100644
--- a/SL/Presenter/Part.pm
+++ b/SL/Presenter/Part.pm
@@ -6,12 +6,13 @@ use SL::DB::Part;
 use SL::DB::PartClassification;
 use SL::Locale::String qw(t8);
 use SL::Presenter::EscapedText qw(escape is_escaped);
-use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag);
+use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag link_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(
   part_picker part select_classification classification_abbreviation
   type_abbreviation separate_abbreviation typeclass_abbreviation
+  vendor_price_dropdown
 );
 our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
@@ -24,11 +25,12 @@ sub part {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=Part/edit&part.id=' . escape($part->id) . '">',
-    escape($part->partnumber),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($part->partnumber);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=Part/edit'
+               . '&part.id=' . escape($part->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
@@ -42,6 +44,13 @@ sub part_picker {
   my @classes = $params{class} ? ($params{class}) : ();
   push @classes, 'part_autocomplete';
 
+  # If there is no 'onClick' parameter, set it to 'this.select()',
+  # so that the user can type directly in the input field
+  # to search another part.
+  if (!grep { m{onclick}i } keys %params) {
+    $params{onClick} = 'this.select()';
+  }
+
   my $ret =
     input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id,
       'data-part-picker-data' => JSON::to_json(\%params),
@@ -132,6 +141,31 @@ sub select_classification {
   select_tag( $name, $collection, %attributes );
 }
 
+sub vendor_price_dropdown {
+  my ($name, $part, %attributes) = @_;
+
+  $attributes{value_key} = 'id';
+  $attributes{title_key} = 'text';
+
+  my @vendor_price_list = map {{
+        id => $_->vendor->id,
+        text => $_->vendor->vendornumber . "--" .$_->vendor->name
+                   . " ("
+                     . $::form->format_amount(\%::myconfig, $_->lastcost, 2)
+                   . ")",
+      }}
+    @{$part->makemodels};
+
+  my $count = scalar(@vendor_price_list);
+  if ($count) {
+    $attributes{size}    = $count;
+    $attributes{default} = $vendor_price_list[0]->{id};
+    select_tag( $name, \@vendor_price_list, %attributes );
+  } else {
+    html_tag('span', $::locale->text('No vendor available'));
+  }
+}
+
 1;
 
 __END__
@@ -163,15 +197,20 @@ see L<SL::Presenter>
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the part object C<$object>
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 4
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the part's name linked
-to the corresponding 'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
+
+=item * no_link
+
+If falsish (the default) then the part number will be linked to the "edit"
+dialog.
 
 =back
 
@@ -213,6 +252,25 @@ The id of the selected item.
 
 =over 2
 
+=item C<vendor_price_dropdown $name, $part, %params>
+
+Returns an HTML select tag with all available vendors with the best price
+for the given part. The value of the select tag is the vendor id.
+
+C<%params> can include:
+
+=over 4
+
+=item * default
+
+The id of the selected vendor.
+
+=back
+
+=back
+
+=over 2
+
 =item C<part_picker $name, $value, %params>
 
 All-in-one picker widget for parts. The name will be both id and name
diff --git a/SL/Presenter/Project.pm b/SL/Presenter/Project.pm
index 8aecdfe49..7ae4c79db 100644
--- a/SL/Presenter/Project.pm
+++ b/SL/Presenter/Project.pm
@@ -3,7 +3,7 @@ package SL::Presenter::Project;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
-use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag);
+use SL::Presenter::Tag qw(input_tag html_tag name_to_id select_tag link_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(project project_picker);
@@ -19,14 +19,19 @@ sub project {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $description = $project->full_description(style => $params{style});
-  my $callback    = $params{callback} ? '&callback=' . $::form->escape($params{callback}) : '';
+  my $description = $project->full_description(style => delete $params{style});
+  my $callback    = $params{callback} ?
+                      '&callback=' . $::form->escape(delete $params{callback})
+                    : '';
+
+  my $text = escape($description);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=Project/edit'
+               . '&id=' . escape($project->id)
+               . $callback;
+    $text = link_tag($href, $text, %params);
+  }
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=Project/edit&amp;id=' . escape($project->id) . $callback . '">',
-    escape($description),
-    $params{no_link} ? '' : '</a>',
-  );
   is_escaped($text);
 }
 
@@ -41,6 +46,13 @@ sub project_picker {
 
   my %data_params = map { $_ => delete $params{$_}  } grep { defined $params{$_} } qw(customer_id active valid description_style);
 
+  # If there is no 'onClick' parameter, set it to 'this.select()',
+  # so that the user can type directly in the input field
+  # to search another project.
+  if (!grep { m{onclick}i } keys %params) {
+    $params{onClick} = 'this.select()';
+  }
+
   my $ret =
     input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id,
               'data-project-picker-data' => JSON::to_json(\%data_params),
@@ -81,22 +93,26 @@ SL::Presenter::Project - Presenter module for project Rose::DB objects
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the project object C<$customer>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
 =item * display
 
-Either C<inline> (the default) or C<table-cell>. At the moment both
-representations are identical and produce the project's description
-(controlled by the C<style> parameter) linked to the corresponding
-'edit' action.
+Either C<inline> (the default) or C<table-cell>. Is passed to the function
+C<SL::Presenter::Tag::link_tag>.
 
 =item * style
 
 Determines what exactly will be output. Can be one of the values with
 C<both> being the default if it is missing:
 
+=item * no_link
+
+If falsish (the default) then the description will be linked to the "edit"
+dialog.
+
 =over 2
 
 =item C<projectnumber> (or simply C<number>)
diff --git a/SL/Presenter/Reclamation.pm b/SL/Presenter/Reclamation.pm
new file mode 100644
index 000000000..219ef0094
--- /dev/null
+++ b/SL/Presenter/Reclamation.pm
@@ -0,0 +1,110 @@
+package SL::Presenter::Reclamation;
+
+use strict;
+
+use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag qw(link_tag);
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(show sales_reclamation purchase_reclamation);
+
+use Carp;
+
+sub show {goto &reclamation};
+
+sub sales_reclamation {goto &reclamation}
+sub purchase_reclamation {goto &reclamation}
+
+sub reclamation {
+  my ($reclamation, %params) = @_;
+
+  $params{display} ||= 'inline';
+
+  my $text = escape($reclamation->record_number);
+  unless ($params{no_link}) {
+    my $href = 'controller.pl?action=Reclamation/edit&id=' . escape($reclamation->id);
+    $text =  link_tag($href, $text, %params);
+  }
+
+  is_escaped($text);
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::Reclamation - Presenter module for Rose::DB objects for sales
+reclamations and purchase reclamations
+
+=head1 SYNOPSIS
+
+  # Sales reclamations:
+  my $object = SL::DB::Manager::Reclamation->get_first(
+    where => [ SL::DB::Manager::Reclamation->type_filter('sales_reclamation') ]
+  );
+  my $html   = SL::Presenter::Reclamation::sales_reclamation($object);
+
+  # Purchase reclamations:
+  my $object = SL::DB::Manager::Reclamation->get_first(
+    where => [ SL::DB::Manager::Reclamation->type_filter('purchase_reclamation') ]
+  );
+  my $html   = SL::Presenter::Reclamation::purchase_reclamation($object);
+
+  # or for all types:
+  my $html   = SL::Presenter::Reclamation::reclamation(
+    $object, display => 'inline'
+  );
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object %params>
+
+Alias for C<reclamation $object %params>.
+
+=item C<sales_reclamation $object, %params>
+
+Alias for C<reclamation $object %params>.
+
+=item C<purchase_reclamation $object, %params>
+
+Alias for C<reclamation $object %params>.
+
+=item C<reclamation $object %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the sales reclamation object C<$object>.
+
+C<%params> can include:
+
+=over 2
+
+=item * no_link
+
+If falsish (the default) then the  reclamation number will be linked to the
+"edit reclamation" dialog.
+
+=back
+
+When C<$params{no_link}> is falsish, other C<%params> get passed to
+L<SL::Presenter::Tag/link_tag> .
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/ReclamationFilter.pm b/SL/Presenter/ReclamationFilter.pm
new file mode 100644
index 000000000..a7f0dc354
--- /dev/null
+++ b/SL/Presenter/ReclamationFilter.pm
@@ -0,0 +1,609 @@
+package SL::Presenter::ReclamationFilter;
+
+use strict;
+
+use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag qw(html_tag input_tag select_tag date_tag checkbox_tag);
+use SL::Locale::String qw(t8);
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(
+filter
+);
+
+use Carp;
+
+sub filter {
+  my ($filter, $reclamation_type, %params) = @_;
+
+  $filter ||= undef; #filter should not be '' (empty string);
+  my %default_filter_elements = ( # {{{
+    'reason_names' => {
+      'position' => 1,
+      'text' => t8("Reclamation Reason"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.reclamation_items.reason.name:substr::ilike',
+      'input_default' => $filter->{reclamation_items}->{reason}->{'name:substr::ilike'},
+      'active' => 1,
+    },
+    'id' => {
+      'position' => 2,
+      'text' => t8("Reclamation ID"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.id:number',
+      'input_default' =>$filter->{'id:number'},
+      'report_id' => 'id',
+      'active' => 0,
+    },
+    'record_number' => {
+      'position' => 3,
+      'text' => t8("Reclamation Number"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.record_number:substr::ilike',
+      'input_default' =>$filter->{'record_number:substr::ilike'},
+      'report_id' => 'record_number',
+      'active' => 1,
+    },
+    'employee' => {
+      'position' => 4,
+      'text' => t8("Employee Name"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.employee.name:substr::ilike',
+      'input_default' =>$filter->{employee}->{'name:substr::ilike'},
+      'report_id' => 'employee',
+      'active' => 1,
+    },
+    'salesman' => {
+      'position' => 5,
+      'text' => t8("Salesman Name"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.salesman.name:substr::ilike',
+      'input_default' =>$filter->{salesman}->{'name:substr::ilike'},
+      'report_id' => 'salesman',
+      'active' => 1,
+    },
+    # 6,7 for Customer/Vendor
+    'customer' => {
+      'position' => 6,
+      'text' => t8("Customer Name"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.customer.name:substr::ilike',
+      'input_default' => $filter->{customer}->{'name:substr::ilike'},
+      'report_id' => 'customer',
+      'active' => ($reclamation_type eq 'sales_reclamation' ? 1 : 0),
+    },
+    'vendor' => {
+      'position' => 6,
+      'text' => t8("Vendor Name"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.vendor.name:substr::ilike',
+      'input_default' => $filter->{vendor}->{'name:substr::ilike'},
+      'report_id' => 'vendor',
+      'active' => ($reclamation_type eq 'purchase_reclamation' ? 1 : 0),
+    },
+    'customer_number' => {
+      'position' => 7,
+      'text' => t8("Customer Number"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.customer.customernumber:substr::ilike',
+      'input_default' => $filter->{customer}->{'customernumber:substr::ilike'},
+      'active' => ($reclamation_type eq 'sales_reclamation' ? 1 : 0),
+    },
+    'vendor_number' => {
+      'position' => 7,
+      'text' => t8("Vendor Number"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.vendor.vendornumber:substr::ilike',
+      'input_default' => $filter->{vendor}->{'vendornumber:substr::ilike'},
+      'active' => ($reclamation_type eq 'purchase_reclamation' ? 1 : 0),
+    },
+    'contact_name' => {
+      'position' => 8,
+      'text' => t8("Contact Name"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.contact.cp_name:substr::ilike',
+      'input_default' =>$filter->{contact}->{'cp_name:substr::ilike'},
+      'report_id' => 'contact',
+      'active' => 1,
+    },
+    'language_code' => {
+      'position' => 9,
+      'text' => t8("Language Code"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.language.article_code:substr::ilike',
+      'input_default' =>$filter->{language}->{'article_code:substr::ilike'},
+      'report_id' => 'language',
+      'active' => 1,
+    },
+    'department_description' => {
+      'position' => 10,
+      'text' => t8("Department Description"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.department.description:substr::ilike',
+      'input_default' =>$filter->{department}->{'description:substr::ilike'},
+      'report_id' => 'department',
+      'active' => 1,
+    },
+    'globalproject_projectnumber' => {
+      'position' => 11,
+      'text' => t8("Project Number"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.globalproject.projectnumber:substr::ilike',
+      'input_default' =>$filter->{globalproject}->{'projectnumber:substr::ilike'},
+      'report_id' => 'globalproject',
+      'active' => 1,
+    },
+    'globalproject_description' => {
+      'position' => 12,
+      'text' => t8("Project Description"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.globalproject.description:substr::ilike',
+      'input_default' =>$filter->{globalproject}->{'description:substr::ilike'},
+      'active' => 1,
+    },
+    'cv_record_number' => {
+      'position' => 13,
+      'text' => ($reclamation_type eq 'sales_reclamation'
+                  ? t8("Customer Record Number")
+                  : t8("Vendor Record Number")
+                ),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.cv_record_number:substr::ilike',
+      'input_default' => $filter->{'cv_record_number:substr::ilike'},
+      'report_id' => 'cv_record_number',
+      'active' => 1,
+    },
+    'transaction_description' => {
+      'position' => 14,
+      'text' => t8("Description"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.transaction_description:substr::ilike',
+      'input_default' =>$filter->{'transaction_description:substr::ilike'},
+      'report_id' => 'transaction_description',
+      'active' => 1,
+    },
+    'notes' => {
+      'position' => 15,
+      'text' => t8("Notes"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.notes:substr::ilike',
+      'input_default' =>$filter->{'notes:substr::ilike'},
+      'report_id' => 'notes',
+      'active' => 1,
+    },
+    'intnotes' => {
+      'position' => 16,
+      'text' => t8("Internal Notes"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.intnotes:substr::ilike',
+      'input_default' =>$filter->{'intnotes:substr::ilike'},
+      'report_id' => 'intnotes',
+      'active' => 1,
+    },
+    'shippingpoint' => {
+      'position' => 17,
+      'text' => t8("Shipping Point"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.shippingpoint:substr::ilike',
+      'input_default' =>$filter->{'shippingpoint:substr::ilike'},
+      'report_id' => 'shippingpoint',
+      'active' => 1,
+    },
+    'shipvia' => {
+      'position' => 18,
+      'text' => t8("Ship via"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.shipvia:substr::ilike',
+      'input_default' =>$filter->{'shipvia:substr::ilike'},
+      'report_id' => 'shipvia',
+      'active' => 1,
+    },
+    'amount' => {
+      'position' => 19,
+      'text' => t8("Total"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.amount:number',
+      'input_default' =>$filter->{'amount:number'},
+      'report_id' => 'amount',
+      'active' => 1,
+    },
+    'netamount' => {
+      'position' => 20,
+      'text' => t8("Subtotal"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.netamount:number',
+      'input_default' =>$filter->{'netamount:number'},
+      'report_id' => 'netamount',
+      'active' => 1,
+    },
+    'delivery_term_description' => {
+      'position' => 21,
+      'text' => t8("Delivery Terms"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.delivery_term.description:substr::ilike',
+      'input_default' =>$filter->{delivery_term}->{'description:substr::ilike'},
+      'report_id' => 'delivery_term',
+      'active' => 1,
+    },
+    'payment_description' => {
+      'position' => 22,
+      'text' => t8("Payment Terms"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.payment.description:substr::ilike',
+      'input_default' =>$filter->{payment}->{'description:substr::ilike'},
+      'report_id' => 'payment',
+      'active' => 1,
+    },
+    'currency_name' => {
+      'position' => 23,
+      'text' => t8("Currency"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.currency.name:substr::ilike',
+      'input_default' =>$filter->{currency}->{'name:substr::ilike'},
+      'report_id' => 'currency',
+      'active' => 1,
+    },
+    'exchangerate' => {
+      'position' => 24,
+      'text' => t8("Exchangerate"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.exchangerate:number',
+      'input_default' =>$filter->{'exchangerate:number'},
+      'report_id' => 'exchangerate',
+      'active' => 1,
+    },
+    'taxincluded' => {
+      'position' => 25,
+      'text' => t8("Tax Included"),
+      'input_type' => 'yes_no_tag',
+      'input_name' => 'filter.taxincluded',
+      'input_default' =>$filter->{taxincluded},
+      'report_id' => 'taxincluded',
+      'active' => 1,
+    },
+    'taxzone_description' => {
+      'position' => 26,
+      'text' => t8("Tax zone"),
+      'input_type' => 'input_tag',
+      'input_name' => 'filter.taxzone.description:substr::ilike',
+      'input_default' =>$filter->{taxzone}->{'description:substr::ilike'},
+      'report_id' => 'taxzone',
+      'active' => 1,
+    },
+    'tax_point' => {
+      'position' => 27,
+      'text' => t8("Tax point"),
+      'input_type' => 'date_tag',
+      'input_name' => 'tax_point',
+      'input_default_ge' => $filter->{'tax_pont' . ':date::ge'},
+      'input_default_le' => $filter->{'tax_pont' . ':date::le'},
+      'report_id' => 'tax_point',
+      'active' => 1,
+    },
+    'reqdate' => {
+      'position' => 28,
+      'text' => t8("Deadline"),
+      'input_type' => 'date_tag',
+      'input_name' => 'reqdate',
+      'input_default_ge' => $filter->{'reqdate' . ':date::ge'},
+      'input_default_le' => $filter->{'reqdate' . ':date::le'},
+      'report_id' => 'reqdate',
+      'active' => 1,
+    },
+    'transdate' => {
+      'position' => 29,
+      'text' => t8("Booking Date"),
+      'input_type' => 'date_tag',
+      'input_name' => 'transdate',
+      'input_default_ge' => $filter->{'transdate' . ':date::ge'},
+      'input_default_le' => $filter->{'transdate' . ':date::le'},
+      'report_id' => 'transdate',
+      'active' => 1,
+    },
+    'itime' => {
+      'position' => 30,
+      'text' => t8("Creation Time"),
+      'input_type' => 'date_tag',
+      'input_name' => 'itime',
+      'input_default_ge' => $filter->{'itime' . ':date::ge'},
+      'input_default_le' => $filter->{'itime' . ':date::le'},
+      'report_id' => 'itime',
+      'active' => 1,
+    },
+    'mtime' => {
+      'position' => 31,
+      'text' => t8("Last modification Time"),
+      'input_type' => 'date_tag',
+      'input_name' => 'mtime',
+      'input_default_ge' => $filter->{'mtime' . ':date::ge'},
+      'input_default_le' => $filter->{'mtime' . ':date::le'},
+      'report_id' => 'mtime',
+      'active' => 1,
+    },
+    'delivered' => {
+      'position' => 32,
+      'text' => t8("Delivered"),
+      'input_type' => 'yes_no_tag',
+      'input_name' => 'filter.delivered',
+      'input_default' =>$filter->{delivered},
+      'report_id' => 'delivered',
+      'active' => 1,
+    },
+    'closed' => {
+      'position' => 33,
+      'text' => t8("Closed"),
+      'input_type' => 'yes_no_tag',
+      'input_name' => 'filter.closed',
+      'input_default' =>$filter->{closed},
+      'report_id' => 'closed',
+      'active' => 1,
+    },
+  ); # }}}
+
+  # combine default and param values for filter_element,
+  # only replace the lowest occurrence
+  my %filter_elements = %default_filter_elements;
+  while(my ($key, $value) = each (%{$params{filter_elements}})) {
+    if(exists $filter_elements{$key}) {
+      $filter_elements{$key} = ({
+        %{$filter_elements{$key}},
+        %{$value},
+      });
+    } else {
+      $filter_elements{$key} = $value;
+    }
+  }
+
+  my @filter_element_params =
+    sort { $a->{position} <=> $b->{position} }
+    grep { $_->{active} }
+    values %filter_elements;
+
+  my @filter_elements;
+  for my $filter_element_param (@filter_element_params) {
+    unless($filter_element_param->{active}) {
+      next;
+    }
+
+    my $filter_element = _create_input_element($filter_element_param, %params);
+
+    push @filter_elements, $filter_element;
+  }
+
+  my $filter_form_div = _create_filter_form(\@filter_elements, %params);
+
+  is_escaped($filter_form_div);
+}
+
+sub _create_input_element {
+  my ($element_param, %params) = @_;
+
+  my $element_th =  html_tag('th', $element_param->{text}, align => 'right');
+
+  my $element_input = '';
+
+  if($element_param->{input_type} eq 'input_tag') {
+
+    $element_input = input_tag($element_param->{input_name}, $element_param->{input_default});
+
+  } elsif ($element_param->{input_type} eq 'yes_no_tag') {
+
+    $element_input = select_tag($element_param->{input_name}, [ [ 1 => t8('Yes') ], [ 0 => t8('No') ] ], default => $element_param->{input_default}, with_empty => 1)
+
+  } elsif($element_param->{input_type} eq 'date_tag') {
+
+    my $after_input =
+      html_tag('th', t8("After"), align => 'right') .
+      html_tag('td',
+        date_tag("filter." . $element_param->{input_name} . ":date::ge", $element_param->{input_default_ge})
+      )
+    ;
+    my $before_input =
+      html_tag('th', t8("Before"), align => 'right') .
+      html_tag('td',
+        date_tag("filter." . $element_param->{input_name} . ":date::le", $element_param->{input_default_le})
+      )
+    ;
+
+    $element_input =
+      html_tag('table',
+        html_tag('tr', $after_input)
+        .
+        html_tag('tr', $before_input)
+      )
+    ;
+  }
+
+  my $element_input_td =  html_tag('td',
+    $element_input,
+    nowrap => 1,
+  );
+
+  my $element_checkbox_td =  '';
+  unless($params{no_show} || $element_param->{report_id} eq '') {
+    my $checkbox =  checkbox_tag('active_in_report.' . $element_param->{report_id}, checked => $params{active_in_report}->{$element_param->{report_id}}, for_submit => 1);
+    $element_checkbox_td = html_tag('td', $checkbox);
+  }
+
+  return $element_th . $element_input_td . $element_checkbox_td;
+}
+
+sub _create_filter_form {
+  my ($ref_elements, %params) = @_;
+
+  my $filter_table = _create_input_div($ref_elements, %params);
+
+  my $filter_form = html_tag('form', $filter_table, method => 'post', action => 'controller.pl', id => 'search_form');
+
+  return $filter_form;
+}
+
+sub _create_input_div {
+  my ($ref_elements, %params) = @_;
+  my @elements = @{$ref_elements};
+
+  my $div_columns = "";
+
+  $params{count_columns} ||= 4;
+  my $elements_per_column = (int((scalar(@{$ref_elements}) - 1) / $params{count_columns}) + 1);
+  for my $i (0 .. ($params{count_columns} - 1)) {
+
+    my $rows = "";
+    for my $j (0 .. ($elements_per_column - 1) ) {
+      my $idx = $elements_per_column * $i + $j;
+      my $element = $elements[$idx];
+      $rows .= html_tag('tr', $element);
+
+    }
+    $div_columns .= html_tag('div',
+      html_tag('table',
+        html_tag('tr',
+          html_tag('td')
+          . html_tag('th', t8('Filter'))
+          . ( $params{no_show} ? '' : html_tag('th', t8('Show')) )
+        )
+        . $rows
+      ),
+      style => "flex:1");
+  }
+
+  my $input_div = html_tag('div', $div_columns, style => "display:flex;flex-wrap:wrap");
+
+  return $input_div;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::ReclamationFilter - Presenter module for a generic Filter on
+Reclamation.
+
+=head1 SYNOPSIS
+
+  # in Reclamation Controller
+  my $filter_html = SL::Presenter::ReclamationFilter::filter(
+    $::form->{filter}, $self->type, active_in_report => $::form->{active_in_report}
+  );
+
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<filter $filter, $reclamation_type, %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of a filter form for reclamations of type
+C<$reclamation_type>.
+
+C<$filter> should be the C<filter> value of the last C<$::form>. This is used to
+get the previous values of the input fields.
+
+C<%params> can include:
+
+=over 2
+
+=item * no_show
+
+If falsish (the default) then a check box is added after the input field. Which
+specifies whether the corresponding column appears in the report. The value of
+the check box can be changed by the user.
+
+=item * active_in_report
+
+If C<$params{no_show}> is falsish, this is used to set the values of the check
+boxes, after the input fields. This can be set to the C<active_in_report> value
+of the last C<$::form>.
+
+=item * filter_elements
+
+Is combined with the default filter elements. This can be used to override
+default values of the filter elements or to add a new ones.
+
+  #deactivate the id and record_number fields
+  $params{filter_elements} = ({
+    id => {active => 0},
+    record_number => {active => 0}
+  });
+
+=back
+
+=back
+
+=head1 FILTER ELEMENTS
+
+A filter element is stored in and as a hash map. Each filter has a unique key
+and should have entries for:
+
+=over 4
+
+=item * position
+
+Is a number after which the elements are ordered. This can be a float.
+
+=item * text
+
+Is shown before the input field.
+
+=item * input_type
+
+This must be C<input_tag>, C<yes_no_tag> or C<date_tag>. It sets the input type
+for the filter.
+
+=over 2
+
+=item * input_tag
+
+Creates a text input field. The default value of this field is set to the
+C<input_default> entry of the filter element. C<input_name> is used to set the
+name of the field, which should match the filter syntax.
+
+=item * yes_no_tag
+
+Creates a yes/no input field. The default value of this field is set to the
+C<input_default> entry of the filter element. C<input_name> is used to set the
+name of the field, which should match the filter syntax.
+
+=item * date_tag
+
+Creates two date input fields. One filters for after the date and the other
+filters for before the date. The default values of these fields are set to the
+C<input_default_ge> and C<input_default_le> entries of the filter element.
+C<input_name> is used to set the names of these fields, which should match the
+filter syntax. For the first field ":date::ge" and for the second ":date::le" is
+added to the end of C<input_name>.
+
+=back
+
+=item * report_id
+
+Is used to generate the id of the check box after the input field. The value of
+the check box can be found in the form under
+C<$::form-E<gt>{'active_in_report'}-E<gt>{report_id}>.
+
+=item * active
+
+If falsish the element is ignored.
+
+=item * input_name, input_default, input_default_ge, input_default_le
+
+Look at I<input_tag> to see how they are used.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/Record.pm b/SL/Presenter/Record.pm
index 592af556a..3b39607a1 100644
--- a/SL/Presenter/Record.pm
+++ b/SL/Presenter/Record.pm
@@ -4,6 +4,7 @@ use strict;
 
 use SL::Presenter;
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag qw(html_tag button_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(grouped_record_list empty_record_list record_list record);
@@ -13,6 +14,538 @@ use SL::Util;
 use Carp;
 use List::Util qw(first);
 
+my @ORDERED_TYPES = qw(
+  requirement_spec
+  shop_order
+  sales_quotation
+  sales_order_intake
+  sales_order
+  sales_delivery_order
+  rma_delivery_order
+  sales_reclamation
+  sales_invoice
+  ar_transaction
+  request_quotation
+  purchase_quotation_intake
+  purchase_order
+  purchase_order_confirmation
+  purchase_delivery_order
+  supplier_delivery_order
+  purchase_reclamation
+  purchase_invoice
+  ap_transaction
+  gl_transaction
+  bank_transaction
+  sepa_collection
+  sepa_transfer
+  letter
+  email_journal
+  dunning
+  ar_transaction_template
+  ap_transaction_template
+  gl_transaction_template
+  );
+
+my %TYPE_TO_PARAMS = (
+  # sub gets other params as arguments to override if needed
+  # has to encoupsulated in a sub for evaluation of locale translations
+  requirement_spec => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Requirement specs'),
+      type    => 'requirement_spec',
+      columns => [
+        [ $::locale->text('Requirement spec number'), sub { $_[0]->presenter->requirement_spec(display => 'table-cell') } ],
+        [ $::locale->text('Customer'),                'customer'                                                      ],
+        [ $::locale->text('Title'),                   'title'                                                         ],
+        [ $::locale->text('Project'),                 'project',                                                      ],
+        [ $::locale->text('Status'),                  sub { $_[0]->status->description }                              ],
+      ],
+      %params,
+    }
+  },
+  shop_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Shop Orders'),
+      type    => 'shop_order',
+      columns => [
+        [ $::locale->text('Shop Order Date'),         sub { $_[0]->order_date->to_kivitendo }                         ],
+        [ $::locale->text('Shop Order Number'),       sub { $_[0]->presenter->shop_order(display => 'table-cell') }   ],
+        [ $::locale->text('Transfer Date'),           'transfer_date'                                                 ],
+        [ $::locale->text('Amount'),                  'amount'                                                        ],
+      ],
+      %params,
+    }
+  },
+  sales_quotation => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Quotations'),
+      type    => 'sales_quotation',
+      columns => [
+        [ $::locale->text('Quotation Date'),          'transdate'                                                                ],
+        [ $::locale->text('Quotation Number'),        sub { $_[0]->presenter->sales_quotation(display => 'table-cell') }         ],
+        [ $::locale->text('Customer'),                'customer'                                                                 ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  request_quotation => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Request Quotations'),
+      type    => 'request_quotation',
+      columns => [
+        [ $::locale->text('Quotation Date'),          'transdate'                                                                ],
+        [ $::locale->text('Quotation Number'),        sub { $_[0]->presenter->request_quotation(display => 'table-cell') }       ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                   ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  purchase_quotation_intake => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Quotation Intakes'),
+      type    => 'purchase_quotation_intake',
+      columns => [
+        [ $::locale->text('Quotation Date'),          'transdate'                                                                ],
+        [ $::locale->text('Quotation Number'),        sub { $_[0]->presenter->purchase_quotation_intake(display => 'table-cell') } ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                   ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  sales_order_intake => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Order Intakes'),
+      type    => 'sales_order_intake',
+      columns => [
+        [ $::locale->text('Order Date'),              'transdate'                                                                ],
+        [ $::locale->text('Order Number'),            sub { $_[0]->presenter->sales_order_intake(display => 'table-cell') }      ],
+        [ $::locale->text('Quotation'),               'quonumber' ],
+        [ $::locale->text('Customer'),                'customer'                                                                 ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  sales_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Orders'),
+      type    => 'sales_order',
+      columns => [
+        [ $::locale->text('Order Date'),              'transdate'                                                                ],
+        [ $::locale->text('Order Number'),            sub { $_[0]->presenter->sales_order(display => 'table-cell') }             ],
+        [ $::locale->text('Quotation'),               'quonumber' ],
+        [ $::locale->text('Customer'),                'customer'                                                                 ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  purchase_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Orders'),
+      type    => 'purchase_order',
+      columns => [
+        [ $::locale->text('Order Date'),              'transdate'                                                                ],
+        [ $::locale->text('Order Number'),            sub { $_[0]->presenter->purchase_order(display => 'table-cell') }          ],
+        [ $::locale->text('Request for Quotation'),   'quonumber' ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  purchase_order_confirmation => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Order Confirmations'),
+      type    => 'purchase_order_confirmation',
+      columns => [
+        [ $::locale->text('Confirmation Date'),       'transdate'                                                                    ],
+        [ $::locale->text('Confirmation Number'),     sub { $_[0]->presenter->purchase_order_confirmation(display => 'table-cell') } ],
+        [ $::locale->text('Request for Quotation'),   'quonumber'                                                                    ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                       ],
+        [ $::locale->text('Net amount'),              'netamount'                                                                    ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                      ],
+        [ $::locale->text('Project'),                 'globalproject',                                                               ],
+        [ $::locale->text('Closed'),                  'closed'                                                                       ],
+      ],
+      %params,
+    }
+  },
+  sales_delivery_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Delivery Orders'),
+      type    => 'sales_delivery_order',
+      columns => [
+        [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
+        [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->sales_delivery_order(display => 'table-cell') }    ],
+        [ $::locale->text('Order Number'),            'ordnumber' ],
+        [ $::locale->text('Customer'),                'customer'                                                                 ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Delivered'),               'delivered'                                                                ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  rma_delivery_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('RMA Delivery Orders'),
+      type    => 'rma_delivery_order',
+      columns => [
+        [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
+        [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->rma_delivery_order(display => 'table-cell') }    ],
+        [ $::locale->text('Order Number'),            'ordnumber' ],
+        [ $::locale->text('Customer'),                'customer'                                                                 ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Delivered'),               'delivered'                                                                ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  purchase_delivery_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Delivery Orders'),
+      type    => 'purchase_delivery_order',
+      columns => [
+        [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
+        [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->purchase_delivery_order(display => 'table-cell') } ],
+        [ $::locale->text('Order Number'),            'ordnumber' ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Delivered'),               'delivered'                                                                ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  supplier_delivery_order => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Supplier Delivery Orders'),
+      type    => 'supplier_delivery_order',
+      columns => [
+        [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
+        [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->supplier_delivery_order(display => 'table-cell') } ],
+        [ $::locale->text('Order Number'),            'ordnumber' ],
+        [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
+        [ $::locale->text('Project'),                 'globalproject', ],
+        [ $::locale->text('Delivered'),               'delivered'                                                                ],
+        [ $::locale->text('Closed'),                  'closed'                                                                   ],
+      ],
+      %params,
+    }
+  },
+  sales_reclamation => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Reclamations'),
+      type    => 'sales_reclamation',
+      columns => [
+        [ $::locale->text('Reclamation Date'),        'transdate'                                                          ],
+        [ $::locale->text('Reclamation Number'),      sub { $_[0]->presenter->sales_reclamation(display => 'table-cell') } ],
+        [ $::locale->text('Customer'),                'customer'                                                           ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                            ],
+        [ $::locale->text('Project'),                 'globalproject',                                                     ],
+        [ $::locale->text('Delivered'),               'delivered'                                                          ],
+        [ $::locale->text('Closed'),                  'closed'                                                             ],
+      ],
+      %params,
+    }
+  },
+  purchase_reclamation => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Reclamations'),
+      type    => 'purchase_reclamation',
+      columns => [
+        [ $::locale->text('Reclamation Date'),        'transdate'                                                          ],
+        [ $::locale->text('Reclamation Number'),      sub { $_[0]->presenter->purchase_reclamation(display => 'table-cell') } ],
+        [ $::locale->text('Vendor'),                'vendor'                                                           ],
+        [ $::locale->text('Transaction description'), 'transaction_description'                                            ],
+        [ $::locale->text('Project'),                 'globalproject',                                                     ],
+        [ $::locale->text('Delivered'),               'delivered'                                                          ],
+        [ $::locale->text('Closed'),                  'closed'                                                             ],
+      ],
+      %params,
+    }
+  },
+  sales_invoice => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Sales Invoices'),
+      type    => 'sales_invoice',
+      columns => [
+        [ $::locale->text('Invoice Date'),            'transdate'               ],
+        [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
+        [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->sales_invoice(display => 'table-cell') } ],
+        [ $::locale->text('Quotation Number'),        'quonumber' ],
+        [ $::locale->text('Order Number'),            'ordnumber' ],
+        [ $::locale->text('Customer'),                'customer'                ],
+        [ $::locale->text('Net amount'),              'netamount'               ],
+        [ $::locale->text('Paid'),                    'paid'                    ],
+        [ $::locale->text('Transaction description'), 'transaction_description' ],
+      ],
+      %params,
+    }
+  },
+  purchase_invoice => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Purchase Invoices'),
+      type    => 'purchase_invoice',
+      columns => [
+        [ $::locale->text('Invoice Date'),                 'transdate'               ],
+        [ $::locale->text('Invoice Number'),               sub { $_[0]->presenter->purchase_invoice(display => 'table-cell') } ],
+        [ $::locale->text('Request for Quotation Number'), 'quonumber' ],
+        [ $::locale->text('Order Number'),                 'ordnumber' ],
+        [ $::locale->text('Vendor'),                       'vendor'                 ],
+        [ $::locale->text('Net amount'),                   'netamount'               ],
+        [ $::locale->text('Paid'),                         'paid'                    ],
+        [ $::locale->text('Transaction description'),      'transaction_description' ],
+      ],
+      %params,
+    }
+  },
+  ar_transaction => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('AR Transactions'),
+      type    => 'ar_transaction',
+      columns => [
+        [ $::locale->text('Invoice Date'),            'transdate'               ],
+        [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
+        [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->ar_transaction(display => 'table-cell') } ],
+        [ $::locale->text('Customer'),                'customer'                ],
+        [ $::locale->text('Net amount'),              'netamount'               ],
+        [ $::locale->text('Paid'),                    'paid'                    ],
+        [ $::locale->text('Transaction description'), 'transaction_description' ],
+      ],
+      %params,
+    }
+  },
+  ap_transaction => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('AP Transactions'),
+      type    => 'ap_transaction',
+      columns => [
+        [ $::locale->text('Invoice Date'),            'transdate'                      ],
+        [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->ap_transaction(display => 'table-cell') } ],
+        [ $::locale->text('Vendor'),                  'vendor'                         ],
+        [ $::locale->text('Net amount'),              'netamount'                      ],
+        [ $::locale->text('Paid'),                    'paid'                           ],
+        [ $::locale->text('Transaction description'), 'transaction_description'        ],
+      ],
+      %params,
+    }
+  },
+  gl_transaction => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('GL Transactions'),
+      type    => 'gl_transaction',
+      columns => [
+        [ $::locale->text('Transdate'),        'transdate'                                                    ],
+        [ $::locale->text('Reference'),   'reference'                                                    ],
+        [ $::locale->text('Description'), sub { $_[0]->presenter->gl_transaction(display => 'table-cell') } ],
+      ],
+      %params,
+    }
+  },
+  bank_transaction => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Bank transactions'),
+      type    => 'bank_transactions',
+      columns => [
+        [ $::locale->text('Transdate'),            'transdate'                      ],
+        [ $::locale->text('Local Bank Code'),      sub { $_[0]->local_bank_account->presenter->bank_code }  ],
+        [ $::locale->text('Local account number'), sub { $_[0]->local_bank_account->presenter->account_number }  ],
+        [ $::locale->text('Remote Bank Code'),     'remote_bank_code' ],
+        [ $::locale->text('Remote account number'),'remote_account_number' ],
+        [ $::locale->text('Valutadate'),           'valutadate' ],
+        [ $::locale->text('Amount'),               'amount' ],
+        [ $::locale->text('Currency'),             sub { $_[0]->currency->name } ],
+        [ $::locale->text('Remote name'),          'remote_name' ],
+        [ $::locale->text('Purpose'),              'purpose' ],
+      ],
+      %params,
+    }
+  },
+  # sepa_export gets called from sepa_transfer and sepa_collection
+  sepa_export => sub {
+    my (%params) = @_;
+
+    my ($source, $destination) = $params{type} eq 'sepa_transfer' ? qw(our vc)                                 : qw(vc our);
+    $params{title}             = $params{type} eq 'sepa_transfer' ? $::locale->text('Bank transfers via SEPA') : $::locale->text('Bank collections via SEPA');
+    $params{with_columns}      = [ grep { $_ ne 'record_link_direction' } @{ $params{with_columns} || [] } ];
+
+    delete $params{edit_record_links};
+
+    {
+      columns => [
+        [ $::locale->text('Export Number'),    'sepa_export',                                  ],
+        [ $::locale->text('Execution date'),   'execution_date'                                ],
+        [ $::locale->text('Export date'),      sub { $_[0]->sepa_export->itime->to_kivitendo } ],
+        [ $::locale->text('Source BIC'),       "${source}_bic"                                 ],
+        [ $::locale->text('Source IBAN'),      "${source}_iban"                                ],
+        [ $::locale->text('Destination BIC'),  "${destination}_bic"                            ],
+        [ $::locale->text('Destination IBAN'), "${destination}_iban"                           ],
+        [ $::locale->text('Amount'),           'amount'                                        ],
+      ],
+      %params,
+    }
+  },
+  sepa_transfer => sub {
+    my (%params) = @_;
+    my %type_params = _get_type_params('sepa_export', %params, type => 'sepa_transfer');
+    return \%type_params;
+  },
+  sepa_collection => sub {
+    my (%params) = @_;
+    my %type_params = _get_type_params('sepa_export', %params, type => 'sepa_collection');
+    return \%type_params;
+  },
+  letter => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Letters'),
+      type    => 'letter',
+      columns => [
+        [ $::locale->text('Date'),         'date'                                                ],
+        [ $::locale->text('Letternumber'), sub { $_[0]->presenter->letter(display => 'table-cell') } ],
+        [ $::locale->text('Customer'),     'customer'                                            ],
+        [ $::locale->text('Reference'),    'reference'                                           ],
+        [ $::locale->text('Subject'),      'subject'                                             ],
+      ],
+      %params,
+    }
+  },
+  email_journal => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Email'),
+      type    => 'email_journal',
+      columns => [
+        [ $::locale->text('Sent on'), sub { $_[0]->sent_on->to_kivitendo(precision => 'seconds') } ],
+        [ $::locale->text('Subject'), sub { $_[0]->presenter->email_journal(display => 'table-cell') } ],
+        [ $::locale->text('Status'),  'status'                                                     ],
+        [ $::locale->text('From'),    'from'                                                       ],
+        [ $::locale->text('To'),      'recipients'                                                 ],
+      ],
+      %params,
+    }
+  },
+  dunning => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('Dunnings'),
+      type    => 'dunning',
+      columns => [
+        [ $::locale->text('Dunning Level'),   sub { $_[0]->presenter->dunning(display => 'table-cell') } ],
+        [ $::locale->text('Dunning Date'),    'transdate'                                                ],
+        [ $::locale->text('Dunning Duedate'), 'duedate'                                                  ],
+        [ $::locale->text('Total Fees'),      'fee'                                                      ],
+        [ $::locale->text('Interest'),        'interest'                                                 ],
+      ],
+      %params,
+    }
+  },
+  gl_transaction_template => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('GL Transaction Template'),
+      type    => 'gl_transaction_template',
+      columns => [
+        [ $::locale->text('Name'),                    'template_name_to_use'              ],
+        [ $::locale->text('Transaction description'), 'transaction_description',          ],
+        [ $::locale->text('Create Date'),              sub { $_[0]->itime->to_kivitendo } ],
+        [ $::locale->text('Modification date'),        sub { $_[0]->mtime->to_kivitendo } ],
+      ],
+      %params,
+    }
+  },
+  ar_transaction_template => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('AR Transaction Template'),
+      type    => 'ar_transaction_template',
+      columns => [
+        [ $::locale->text('Name'),                    'template_name_to_use'             ],
+        [ $::locale->text('Customer'),                'customer'                         ],
+        [ $::locale->text('Project'),                 'project',                         ],
+        [ $::locale->text('Transaction description'), 'transaction_description',         ],
+        [ $::locale->text('Create Date'),             sub { $_[0]->itime->to_kivitendo } ],
+        [ $::locale->text('Modification date'),       sub { $_[0]->mtime->to_kivitendo } ],
+      ],
+      %params,
+    }
+  },
+  ap_transaction_template => sub {
+    my (%params) = @_;
+    {
+      title   => $::locale->text('AP Transaction Template'),
+      type    => 'ap_transaction_template',
+      columns => [
+        [ $::locale->text('Name'),                    'template_name_to_use'             ],
+        [ $::locale->text('Vendor'),                  'vendor'                           ],
+        [ $::locale->text('Project'),                 'project',                         ],
+        [ $::locale->text('Transaction description'), 'transaction_description',         ],
+        [ $::locale->text('Create Date'),             sub { $_[0]->itime->to_kivitendo } ],
+        [ $::locale->text('Modification date'),       sub { $_[0]->mtime->to_kivitendo } ],
+      ],
+      %params,
+    }
+  },
+);
+
+sub _get_type_params {
+  my ($type, %params) = @_;
+
+  my $type_params = $TYPE_TO_PARAMS{$type};
+  croak "Unknown type '$type'" unless $type_params;
+
+  return %{$type_params->(%params)};
+}
+
 sub _arrayify {
   my ($array) = @_;
   return []     if !defined $array;
@@ -26,11 +559,11 @@ sub record {
   my %grouped = _group_records( [ $record ] ); # pass $record as arrayref
   my $type    = (keys %grouped)[0];
 
-  $record->presenter->sales_invoice(   $record, %params) if $type eq 'sales_invoices';
-  $record->presenter->purchase_invoice($record, %params) if $type eq 'purchase_invoices';
-  $record->presenter->ar_transaction(  $record, %params) if $type eq 'ar_transactions';
-  $record->presenter->ap_transaction(  $record, %params) if $type eq 'ap_transactions';
-  $record->presenter->gl_transaction(  $record, %params) if $type eq 'gl_transactions';
+  $record->presenter->sales_invoice(   $record, %params) if $type eq 'sales_invoice';
+  $record->presenter->purchase_invoice($record, %params) if $type eq 'purchase_invoice';
+  $record->presenter->ar_transaction(  $record, %params) if $type eq 'ar_transaction';
+  $record->presenter->ap_transaction(  $record, %params) if $type eq 'ap_transaction';
+  $record->presenter->gl_transaction(  $record, %params) if $type eq 'gl_transaction';
 
   return '';
 }
@@ -43,41 +576,38 @@ sub grouped_record_list {
   my %groups = _sort_grouped_lists(_group_records($list));
   my $output = '';
 
-  $output .= _requirement_spec_list(       $groups{requirement_specs},        %params) if $groups{requirement_specs};
-  $output .= _shop_order_list(             $groups{shop_orders},              %params) if $groups{shop_orders};
-  $output .= _sales_quotation_list(        $groups{sales_quotations},         %params) if $groups{sales_quotations};
-  $output .= _sales_order_list(            $groups{sales_orders},             %params) if $groups{sales_orders};
-  $output .= _sales_delivery_order_list(   $groups{sales_delivery_orders},    %params) if $groups{sales_delivery_orders};
-  $output .= _rma_delivery_order_list(     $groups{rma_delivery_orders},      %params) if $groups{rma_delivery_orders};
-  $output .= _sales_invoice_list(          $groups{sales_invoices},           %params) if $groups{sales_invoices};
-  $output .= _ar_transaction_list(         $groups{ar_transactions},          %params) if $groups{ar_transactions};
-
-  $output .= _request_quotation_list(      $groups{purchase_quotations},      %params) if $groups{purchase_quotations};
-  $output .= _purchase_order_list(         $groups{purchase_orders},          %params) if $groups{purchase_orders};
-  $output .= _purchase_delivery_order_list($groups{purchase_delivery_orders}, %params) if $groups{purchase_delivery_orders};
-  $output .= _supplier_delivery_order_list($groups{supplier_delivery_orders}, %params) if $groups{supplier_delivery_orders};
-  $output .= _purchase_invoice_list(       $groups{purchase_invoices},        %params) if $groups{purchase_invoices};
-  $output .= _ap_transaction_list(         $groups{ap_transactions},          %params) if $groups{ap_transactions};
+  foreach my $type (@ORDERED_TYPES) {
+    $output .= record_list($groups{$type}, _get_type_params($type, %params)) if $groups{$type};
+  }
 
-  $output .= _gl_transaction_list(         $groups{gl_transactions},          %params) if $groups{gl_transactions};
+  $output  = SL::Presenter->get->render('presenter/record/grouped_record_list', %params, output => $output);
 
-  $output .= _bank_transactions(           $groups{bank_transactions},        %params) if $groups{bank_transactions};
+  return $output;
+}
 
-  $output .= _sepa_collection_list(        $groups{sepa_collections},         %params) if $groups{sepa_collections};
-  $output .= _sepa_transfer_list(          $groups{sepa_transfers},           %params) if $groups{sepa_transfers};
+sub grouped_list { goto &grouped_record_list }
 
-  $output .= _letter_list(                 $groups{letters},                  %params) if $groups{letters};
-  $output .= _email_journal_list(          $groups{email_journals},           %params) if $groups{email_journals};
+sub simple_grouped_record_list {
+  my ($list, %params) = @_;
 
-  $output .= _dunning_list(                $groups{dunnings},                 %params) if $groups{dunnings};
+  my %groups = _sort_grouped_lists(_group_records($list));
+  my $output = '';
 
-  $output  = SL::Presenter->get->render('presenter/record/grouped_record_list', %params, output => $output);
+  foreach my $type (@ORDERED_TYPES) {
+    my $ordered_records = $groups{$type};
+    next unless $ordered_records;
+    my %type_params = _get_type_params($type, %params);
+    my $type_output = html_tag('b', $type_params{title} . ": ");
+    $type_output .= join (', ',
+      map { $_->presenter->show(%params) }
+      @{ $ordered_records }
+    );
+    $output .= html_tag('div', $type_output);
+  }
 
   return $output;
 }
 
-sub grouped_list { goto &grouped_record_list }
-
 sub empty_record_list {
   my (%params) = @_;
   return grouped_record_list([], %params);
@@ -108,13 +638,39 @@ sub record_list {
     push @columns, {
       title => $::locale->text('Link direction'),
       data  => sub {
-          $_[0]->{_record_link_depth} > 1
+          $_[0]->{_record_link_to_myself}
+        ? $::locale->text('Row is the record itself')
+        : $_[0]->{_record_link_depth} > 1
         ? $::locale->text('Row was linked to another record')
         : $_[0]->{_record_link_direction} eq 'from'
         ? $::locale->text('Row was source for current record')
         : $::locale->text('Row was created from current record') },
     };
   }
+  if ($with_columns{email_journal_action}) {
+    push @columns, {
+      title => $::locale->text('Action'),
+      data  => sub {
+        my $id = $_[0]->id;
+        my $record_type = $_[0]->record_type;
+        if ($record_type eq 'ap_transaction' && ref $_[0] eq 'SL::DB::RecordTemplate') {
+          return is_escaped(
+            button_tag(
+              "kivi.EmailJournal.ap_transaction_template_with_zugferd_import(
+              '$id', '$record_type');",
+              $::locale->text('Select (with Factur-X/ZUGFeRD import)'),
+            )
+          );
+        } else {
+          return is_escaped(button_tag(
+              "kivi.EmailJournal.apply_action_with_attachment(
+              '$id', '$record_type');",
+              $::locale->text('Select'),
+            ));
+        }
+      },
+    };
+  }
 
   my %column_meta   = map { $_->name => $_ } @{ $list->[0]->meta->columns       };
   my %relationships = map { $_->name => $_ } @{ $list->[0]->meta->relationships };
@@ -181,27 +737,35 @@ sub list { goto &record_list }
 sub _group_records {
   my ($list) = @_;
   my %matchers = (
-    requirement_specs        => sub { (ref($_[0]) eq 'SL::DB::RequirementSpec')                                         },
-    shop_orders              => sub { (ref($_[0]) eq 'SL::DB::ShopOrder')       &&  $_[0]->id                           },
-    sales_quotations         => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('sales_quotation')   },
-    sales_orders             => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('sales_order')       },
-    sales_delivery_orders    => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('sales_delivery_order') },
-    rma_delivery_orders      => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('rma_delivery_order')   },
-    sales_invoices           => sub { (ref($_[0]) eq 'SL::DB::Invoice')         &&  $_[0]->invoice                      },
-    ar_transactions          => sub { (ref($_[0]) eq 'SL::DB::Invoice')         && !$_[0]->invoice                      },
-    purchase_quotations      => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('request_quotation') },
-    purchase_orders          => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('purchase_order')    },
-    purchase_delivery_orders => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('purchase_delivery_order') },
-    supplier_delivery_orders => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('supplier_delivery_order') },
-    purchase_invoices        => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') &&  $_[0]->invoice                      },
-    ap_transactions          => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') && !$_[0]->invoice                      },
-    sepa_collections         => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ar_id                        },
-    sepa_transfers           => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ap_id                        },
-    gl_transactions          => sub { (ref($_[0]) eq 'SL::DB::GLTransaction')                                           },
-    bank_transactions        => sub { (ref($_[0]) eq 'SL::DB::BankTransaction') &&  $_[0]->id                           },
-    letters                  => sub { (ref($_[0]) eq 'SL::DB::Letter')          &&  $_[0]->id                           },
-    email_journals           => sub { (ref($_[0]) eq 'SL::DB::EmailJournal')    &&  $_[0]->id                           },
-    dunnings                 => sub { (ref($_[0]) eq 'SL::DB::Dunning')                                                 },
+    requirement_spec            => sub { (ref($_[0]) eq 'SL::DB::RequirementSpec')                                         },
+    shop_order                  => sub { (ref($_[0]) eq 'SL::DB::ShopOrder')       &&  $_[0]->id                           },
+    sales_quotation             => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('sales_quotation')   },
+    sales_order_intake          => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('sales_order_intake') },
+    sales_order                 => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('sales_order')       },
+    sales_delivery_order        => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('sales_delivery_order') },
+    rma_delivery_order          => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('rma_delivery_order')   },
+    sales_reclamation           => sub { (ref($_[0]) eq 'SL::DB::Reclamation')     &&  $_[0]->is_type('sales_reclamation') },
+    sales_invoice               => sub { (ref($_[0]) eq 'SL::DB::Invoice')         &&  $_[0]->invoice                      },
+    ar_transaction              => sub { (ref($_[0]) eq 'SL::DB::Invoice')         && !$_[0]->invoice                      },
+    request_quotation           => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('request_quotation') },
+    purchase_quotation_intake   => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('purchase_quotation_intake') },
+    purchase_order              => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('purchase_order')    },
+    purchase_order_confirmation => sub { (ref($_[0]) eq 'SL::DB::Order')           &&  $_[0]->is_type('purchase_order_confirmation')   },
+    purchase_delivery_order     => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('purchase_delivery_order') },
+    supplier_delivery_order     => sub { (ref($_[0]) eq 'SL::DB::DeliveryOrder')   &&  $_[0]->is_type('supplier_delivery_order') },
+    purchase_reclamation        => sub { (ref($_[0]) eq 'SL::DB::Reclamation')     &&  $_[0]->is_type('purchase_reclamation')},
+    purchase_invoice            => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') &&  $_[0]->invoice                      },
+    ap_transaction              => sub { (ref($_[0]) eq 'SL::DB::PurchaseInvoice') && !$_[0]->invoice                      },
+    sepa_collection             => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ar_id                        },
+    sepa_transfer               => sub { (ref($_[0]) eq 'SL::DB::SepaExportItem')  &&  $_[0]->ap_id                        },
+    gl_transaction              => sub { (ref($_[0]) eq 'SL::DB::GLTransaction')                                           },
+    bank_transaction            => sub { (ref($_[0]) eq 'SL::DB::BankTransaction') &&  $_[0]->id                           },
+    letter                      => sub { (ref($_[0]) eq 'SL::DB::Letter')          &&  $_[0]->id                           },
+    email_journal               => sub { (ref($_[0]) eq 'SL::DB::EmailJournal')    &&  $_[0]->id                           },
+    dunning                     => sub { (ref($_[0]) eq 'SL::DB::Dunning')                                                 },
+    gl_transaction_template     => sub { (ref($_[0]) eq 'SL::DB::RecordTemplate')  &&  $_[0]->template_type eq 'gl_transaction' },
+    ar_transaction_template     => sub { (ref($_[0]) eq 'SL::DB::RecordTemplate')  &&  $_[0]->template_type eq 'ar_transaction' },
+    ap_transaction_template     => sub { (ref($_[0]) eq 'SL::DB::RecordTemplate')  &&  $_[0]->template_type eq 'ap_transaction' },
   );
 
   my %groups;
@@ -230,416 +794,6 @@ sub _sort_grouped_lists {
   return %groups;
 }
 
-sub _requirement_spec_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Requirement specs'),
-    type    => 'requirement_spec',
-    columns => [
-      [ $::locale->text('Requirement spec number'), sub { $_[0]->presenter->requirement_spec(display => 'table-cell') } ],
-      [ $::locale->text('Customer'),                'customer'                                                      ],
-      [ $::locale->text('Title'),                   'title'                                                         ],
-      [ $::locale->text('Project'),                 'project',                                                      ],
-      [ $::locale->text('Status'),                  sub { $_[0]->status->description }                              ],
-    ],
-    %params,
-  );
-}
-
-sub _shop_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Shop Orders'),
-    type    => 'shop_order',
-    columns => [
-      [ $::locale->text('Shop Order Date'),         sub { $_[0]->order_date->to_kivitendo }                         ],
-      [ $::locale->text('Shop Order Number'),       sub { $_[0]->presenter->shop_order(display => 'table-cell') }   ],
-      [ $::locale->text('Transfer Date'),           'transfer_date'                                                 ],
-      [ $::locale->text('Amount'),                  'amount'                                                        ],
-    ],
-    %params,
-  );
-}
-
-sub _sales_quotation_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Sales Quotations'),
-    type    => 'sales_quotation',
-    columns => [
-      [ $::locale->text('Quotation Date'),          'transdate'                                                                ],
-      [ $::locale->text('Quotation Number'),        sub { $_[0]->presenter->sales_quotation(display => 'table-cell') }         ],
-      [ $::locale->text('Customer'),                'customer'                                                                 ],
-      [ $::locale->text('Net amount'),              'netamount'                                                                ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _request_quotation_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Request Quotations'),
-    type    => 'request_quotation',
-    columns => [
-      [ $::locale->text('Quotation Date'),          'transdate'                                                                ],
-      [ $::locale->text('Quotation Number'),        sub { $_[0]->presenter->request_quotation(display => 'table-cell') }       ],
-      [ $::locale->text('Vendor'),                  'vendor'                                                                   ],
-      [ $::locale->text('Net amount'),              'netamount'                                                                ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _sales_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Sales Orders'),
-    type    => 'sales_order',
-    columns => [
-      [ $::locale->text('Order Date'),              'transdate'                                                                ],
-      [ $::locale->text('Order Number'),            sub { $_[0]->presenter->sales_order(display => 'table-cell') }             ],
-      [ $::locale->text('Quotation'),               'quonumber' ],
-      [ $::locale->text('Customer'),                'customer'                                                                 ],
-      [ $::locale->text('Net amount'),              'netamount'                                                                ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _purchase_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Purchase Orders'),
-    type    => 'purchase_order',
-    columns => [
-      [ $::locale->text('Order Date'),              'transdate'                                                                ],
-      [ $::locale->text('Order Number'),            sub { $_[0]->presenter->purchase_order(display => 'table-cell') }          ],
-      [ $::locale->text('Request for Quotation'),   'quonumber' ],
-      [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
-      [ $::locale->text('Net amount'),              'netamount'                                                                ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _sales_delivery_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Sales Delivery Orders'),
-    type    => 'sales_delivery_order',
-    columns => [
-      [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
-      [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->sales_delivery_order(display => 'table-cell') }    ],
-      [ $::locale->text('Order Number'),            'ordnumber' ],
-      [ $::locale->text('Customer'),                'customer'                                                                 ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Delivered'),               'delivered'                                                                ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _rma_delivery_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('RMA Delivery Orders'),
-    type    => 'rma_delivery_order',
-    columns => [
-      [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
-      [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->rma_delivery_order(display => 'table-cell') }    ],
-      [ $::locale->text('Order Number'),            'ordnumber' ],
-      [ $::locale->text('Customer'),                'customer'                                                                 ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Delivered'),               'delivered'                                                                ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _purchase_delivery_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Purchase Delivery Orders'),
-    type    => 'purchase_delivery_order',
-    columns => [
-      [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
-      [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->purchase_delivery_order(display => 'table-cell') } ],
-      [ $::locale->text('Order Number'),            'ordnumber' ],
-      [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Delivered'),               'delivered'                                                                ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _supplier_delivery_order_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Supplier Delivery Orders'),
-    type    => 'supplier_delivery_order',
-    columns => [
-      [ $::locale->text('Delivery Order Date'),     'transdate'                                                                ],
-      [ $::locale->text('Delivery Order Number'),   sub { $_[0]->presenter->supplier_delivery_order(display => 'table-cell') } ],
-      [ $::locale->text('Order Number'),            'ordnumber' ],
-      [ $::locale->text('Vendor'),                  'vendor'                                                                 ],
-      [ $::locale->text('Transaction description'), 'transaction_description'                                                  ],
-      [ $::locale->text('Project'),                 'globalproject', ],
-      [ $::locale->text('Delivered'),               'delivered'                                                                ],
-      [ $::locale->text('Closed'),                  'closed'                                                                   ],
-    ],
-    %params,
-  );
-}
-
-sub _sales_invoice_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Sales Invoices'),
-    type    => 'sales_invoice',
-    columns => [
-      [ $::locale->text('Invoice Date'),            'transdate'               ],
-      [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
-      [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->sales_invoice(display => 'table-cell') } ],
-      [ $::locale->text('Quotation Number'),        'quonumber' ],
-      [ $::locale->text('Order Number'),            'ordnumber' ],
-      [ $::locale->text('Customer'),                'customer'                ],
-      [ $::locale->text('Net amount'),              'netamount'               ],
-      [ $::locale->text('Paid'),                    'paid'                    ],
-      [ $::locale->text('Transaction description'), 'transaction_description' ],
-    ],
-    %params,
-  );
-}
-
-sub _purchase_invoice_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Purchase Invoices'),
-    type    => 'purchase_invoice',
-    columns => [
-      [ $::locale->text('Invoice Date'),                 'transdate'               ],
-      [ $::locale->text('Invoice Number'),               sub { $_[0]->presenter->purchase_invoice(display => 'table-cell') } ],
-      [ $::locale->text('Request for Quotation Number'), 'quonumber' ],
-      [ $::locale->text('Order Number'),                 'ordnumber' ],
-      [ $::locale->text('Vendor'),                       'vendor'                 ],
-      [ $::locale->text('Net amount'),                   'netamount'               ],
-      [ $::locale->text('Paid'),                         'paid'                    ],
-      [ $::locale->text('Transaction description'),      'transaction_description' ],
-    ],
-    %params,
-  );
-}
-
-sub _ar_transaction_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('AR Transactions'),
-    type    => 'ar_transaction',
-    columns => [
-      [ $::locale->text('Invoice Date'),            'transdate'               ],
-      [ $::locale->text('Type'),                    sub { $_[0]->displayable_type } ],
-      [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->ar_transaction(display => 'table-cell') } ],
-      [ $::locale->text('Customer'),                'customer'                ],
-      [ $::locale->text('Net amount'),              'netamount'               ],
-      [ $::locale->text('Paid'),                    'paid'                    ],
-      [ $::locale->text('Transaction description'), 'transaction_description' ],
-    ],
-    %params,
-  );
-}
-
-sub _ap_transaction_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('AP Transactions'),
-    type    => 'ap_transaction',
-    columns => [
-      [ $::locale->text('Invoice Date'),            'transdate'                      ],
-      [ $::locale->text('Invoice Number'),          sub { $_[0]->presenter->ap_transaction(display => 'table-cell') } ],
-      [ $::locale->text('Vendor'),                  'vendor'                         ],
-      [ $::locale->text('Net amount'),              'netamount'                      ],
-      [ $::locale->text('Paid'),                    'paid'                           ],
-      [ $::locale->text('Transaction description'), 'transaction_description'        ],
-    ],
-    %params,
-  );
-}
-
-sub _gl_transaction_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('GL Transactions'),
-    type    => 'gl_transaction',
-    columns => [
-      [ $::locale->text('Transdate'),        'transdate'                                                    ],
-      [ $::locale->text('Reference'),   'reference'                                                    ],
-      [ $::locale->text('Description'), sub { $_[0]->presenter->gl_transaction(display => 'table-cell') } ],
-    ],
-    %params,
-  );
-}
-
-sub _bank_transactions {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Bank transactions'),
-    type    => 'bank_transactions',
-    columns => [
-      [ $::locale->text('Transdate'),            'transdate'                      ],
-      [ $::locale->text('Local Bank Code'),      sub { $_[0]->local_bank_account->presenter->bank_code }  ],
-      [ $::locale->text('Local account number'), sub { $_[0]->local_bank_account->presenter->account_number }  ],
-      [ $::locale->text('Remote Bank Code'),     'remote_bank_code' ],
-      [ $::locale->text('Remote account number'),'remote_account_number' ],
-      [ $::locale->text('Valutadate'),           'valutadate' ],
-      [ $::locale->text('Amount'),               'amount' ],
-      [ $::locale->text('Currency'),             sub { $_[0]->currency->name } ],
-      [ $::locale->text('Remote name'),          'remote_name' ],
-      [ $::locale->text('Purpose'),              'purpose' ],
-    ],
-    %params,
-  );
-}
-
-sub _sepa_export_list {
-  my ($list, %params) = @_;
-
-  my ($source, $destination) = $params{type} eq 'sepa_transfer' ? qw(our vc)                                 : qw(vc our);
-  $params{title}             = $params{type} eq 'sepa_transfer' ? $::locale->text('Bank transfers via SEPA') : $::locale->text('Bank collections via SEPA');
-  $params{with_columns}      = [ grep { $_ ne 'record_link_direction' } @{ $params{with_columns} || [] } ];
-
-  delete $params{edit_record_links};
-
-  return record_list(
-    $list,
-    columns => [
-      [ $::locale->text('Export Number'),    'sepa_export',                                  ],
-      [ $::locale->text('Execution date'),   'execution_date'                                ],
-      [ $::locale->text('Export date'),      sub { $_[0]->sepa_export->itime->to_kivitendo } ],
-      [ $::locale->text('Source BIC'),       "${source}_bic"                                 ],
-      [ $::locale->text('Source IBAN'),      "${source}_iban"                                ],
-      [ $::locale->text('Destination BIC'),  "${destination}_bic"                            ],
-      [ $::locale->text('Destination IBAN'), "${destination}_iban"                           ],
-      [ $::locale->text('Amount'),           'amount'                                        ],
-    ],
-    %params,
-  );
-}
-
-sub _sepa_transfer_list {
-  my ($list, %params) = @_;
-  _sepa_export_list($list, %params, type => 'sepa_transfer');
-}
-
-sub _sepa_collection_list {
-  my ($list, %params) = @_;
-  _sepa_export_list($list, %params, type => 'sepa_collection');
-}
-
-sub _letter_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Letters'),
-    type    => 'letter',
-    columns => [
-      [ $::locale->text('Date'),         'date'                                                ],
-      [ $::locale->text('Letternumber'), sub { $_[0]->presenter->letter(display => 'table-cell') } ],
-      [ $::locale->text('Customer'),     'customer'                                            ],
-      [ $::locale->text('Reference'),    'reference'                                           ],
-      [ $::locale->text('Subject'),      'subject'                                             ],
-    ],
-    %params,
-  );
-}
-
-sub _email_journal_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Email'),
-    type    => 'email_journal',
-    columns => [
-      [ $::locale->text('Sent on'), sub { $_[0]->sent_on->to_kivitendo(precision => 'seconds') } ],
-      [ $::locale->text('Subject'), sub { $_[0]->presenter->email_journal(display => 'table-cell') } ],
-      [ $::locale->text('Status'),  'status'                                                     ],
-      [ $::locale->text('From'),    'from'                                                       ],
-      [ $::locale->text('To'),      'recipients'                                                 ],
-    ],
-    %params,
-  );
-}
-sub _dunning_list {
-  my ($list, %params) = @_;
-
-  return record_list(
-    $list,
-    title   => $::locale->text('Dunnings'),
-    type    => 'dunning',
-    columns => [
-      [ $::locale->text('Dunning Level'),   sub { $_[0]->presenter->dunning(display => 'table-cell') } ],
-      [ $::locale->text('Dunning Date'),    'transdate'                                                ],
-      [ $::locale->text('Dunning Duedate'), 'duedate'                                                  ],
-      [ $::locale->text('Total Fees'),      'fee'                                                      ],
-      [ $::locale->text('Interest'),        'interest'                                                 ],
-    ],
-    %params,
-  );
-}
-
 1;
 
 __END__
@@ -661,6 +815,8 @@ sales/purchase/general ledger record Rose::DB objects
 
   # Give HTML representation:
   my $html = SL::Presenter->get->grouped_record_list($records);
+  # simple html version:
+  my $html = SL::Presenter->get->simple_grouped_record_list($records);
 
 =head1 OVERVIEW
 
@@ -680,14 +836,17 @@ Example:
   my $record = SL::DB::Manager::AccTransaction->get_first()->record;
   my $html   = SL::Presenter->get->record($record, display => 'inline');
 
-=item C<grouped_record_list $list, %params>
-
 =item C<empty_record_list>
 
 Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of an empty list of records. Is usually
 only called by L<grouped_record_list> if its list is empty.
 
+=item C<simple_grouped_record_list $list, %params>
+
+Generates a simple list of records. The order of the records is the
+same as in L<grouped_record_list>.
+
 =item C<grouped_record_list $list, %params>
 
 Given a number of Rose::DB objects in the array reference C<$list>
@@ -710,6 +869,8 @@ The order in which the records are grouped is:
 
 =item * rma delivery orders
 
+=item * sales reclamation
+
 =item * sales invoices
 
 =item * AR transactions
@@ -722,6 +883,8 @@ The order in which the records are grouped is:
 
 =item * supplier delivery orders
 
+=item * purchase reclamation
+
 =item * purchase invoices
 
 =item * AP transactions
diff --git a/SL/Presenter/RequirementSpec.pm b/SL/Presenter/RequirementSpec.pm
index 33746df76..37885910e 100644
--- a/SL/Presenter/RequirementSpec.pm
+++ b/SL/Presenter/RequirementSpec.pm
@@ -3,12 +3,15 @@ package SL::Presenter::RequirementSpec;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(requirement_spec);
+our @EXPORT_OK = qw(show requirement_spec);
 
 use Carp;
 
+sub show {goto &requirement_spec};
+
 sub requirement_spec {
   my ($requirement_spec, %params) = @_;
 
@@ -16,13 +19,57 @@ sub requirement_spec {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=RequirementSpec/show&amp;id=' . escape($requirement_spec->id) . '">',
-    escape($requirement_spec->id),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($requirement_spec->id);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=RequirementSpec/show'
+               . '&id=' . escape($requirement_spec->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
 
 1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::RequirementSpec - Presenter module for SL::DB::RequirementSpec objects
+
+=head1 SYNOPSIS
+
+  my $object = SL::DB::Manager::RequirementSpec->get_first();
+  my $html   = SL::Presenter::RequirementSpec::requirement_spec($object);
+  # or
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object>
+
+Alias for C<requirement_spec $object %params>.
+
+=item C<requirement_spec $object %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the bank transaction object
+C<$object>. C<%params> gets passed to L<SL::Presenter::Tag/link_tag>.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/SepaExport.pm b/SL/Presenter/SepaExport.pm
index e2b5423ab..fe45446a9 100644
--- a/SL/Presenter/SepaExport.pm
+++ b/SL/Presenter/SepaExport.pm
@@ -3,6 +3,7 @@ package SL::Presenter::SepaExport;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
 our @EXPORT_OK = qw(sepa_export);
@@ -16,11 +17,14 @@ sub sepa_export {
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="sepa.pl?action=bank_transfer_edit&amp;vc=' . escape($sepa_export->vc) . '&amp;id=' . escape($sepa_export->id) . '">',
-    escape($sepa_export->id),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($sepa_export->id);
+  if (! delete $params{no_link}) {
+    my $href = 'sepa.pl?action=bank_transfer_edit'
+               . '&vc=' . escape($sepa_export->vc)
+               . '&id=' . escape($sepa_export->id);
+    $text = link_tag($href, $text, %params);
+  }
+
   is_escaped($text);
 }
 
diff --git a/SL/Presenter/SepaExportItem.pm b/SL/Presenter/SepaExportItem.pm
new file mode 100644
index 000000000..995393919
--- /dev/null
+++ b/SL/Presenter/SepaExportItem.pm
@@ -0,0 +1,89 @@
+package SL::Presenter::SepaExportItem;
+
+use strict;
+use utf8;
+
+use SL::Locale::String qw(t8);
+use SL::Presenter::EscapedText qw(escape);
+
+use Exporter qw(import);
+our @EXPORT_OK = qw(show sepa_export_item);
+
+use Carp;
+
+sub show {goto &sepa_export_item};
+
+sub sepa_export_item {
+  my ($sepa_export_item) = @_;
+
+  my ($title, $source, $destination) = $sepa_export_item->ap_id ?
+      (t8('Bank transfer via SEPA'), 'our', 'vc')
+    : (t8('Bank collections via SEPA'), 'vc', 'our')
+  ;
+
+  my $source_bic       = "${source}_bic";
+  my $source_iban      = "${source}_iban";
+  my $destination_bic  = "${destination}_bic";
+  my $destination_iban = "${destination}_iban";
+
+  escape(join ' ', (
+     $title,
+     $sepa_export_item->sepa_export_id . ":",
+     t8('Execution date'), $sepa_export_item->execution_date,
+     "-",
+     t8('Export date'), $sepa_export_item->sepa_export->itime->to_kivitendo,
+     "-",
+     $sepa_export_item->$source_bic,
+     $sepa_export_item->$source_iban,
+     "→",
+     $sepa_export_item->$destination_bic,
+     $sepa_export_item->$destination_iban,
+     "-",
+     t8('Amount'), $sepa_export_item->amount,
+  ));
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::SepaExportItem - Presenter module for SL::DB::SepaExportItem objects
+
+=head1 SYNOPSIS
+
+  my $object = SL::DB::Manager::SepaExportItem->get_first();
+  my $html   = SL::Presenter::SepaExportItem::sepa_export_item($object);
+  # or
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object>
+
+Alias for C<sepa_export_item $object>.
+
+=item C<sepa_export_item $object>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the sepa export item object
+C<$object>.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/ShopOrder.pm b/SL/Presenter/ShopOrder.pm
index 9c0bfee3a..805194ffa 100644
--- a/SL/Presenter/ShopOrder.pm
+++ b/SL/Presenter/ShopOrder.pm
@@ -3,25 +3,86 @@ package SL::Presenter::ShopOrder;
 use strict;
 
 use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag         qw(link_tag);
 
 use Exporter qw(import);
-our @EXPORT_OK = qw(shop_order);
+our @EXPORT_OK = qw(show shop_order);
 
 use Carp;
 
+sub show {goto &shop_order};
+
 sub shop_order {
-  my ($shop_order, $type, %params) = @_;
+  my ($shop_order, %params) = @_;
 
   $params{display} ||= 'inline';
 
   croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
 
-  my $text = join '', (
-    $params{no_link} ? '' : '<a href="controller.pl?action=ShopOrder/show&amp;id='. escape($shop_order->id) .'">',
-    escape($shop_order->shop_ordernumber),
-    $params{no_link} ? '' : '</a>',
-  );
+  my $text = escape($shop_order->shop_ordernumber);
+  if (! delete $params{no_link}) {
+    my $href = 'controller.pl?action=ShopOrder/show'
+               . '&id='. escape($shop_order->id);
+    $text = link_tag($href, $text, %params);
+  }
 
   is_escaped($text);
 }
+
 1;
+
+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Presenter::ShopOrder - Presenter module for SL::DB::ShopOrder objects
+
+=head1 SYNOPSIS
+
+  my $object = SL::DB::Manager::ShopOrder->get_first();
+  my $html   = SL::Presenter::ShopOrder::shop_order($object);
+  # or
+  my $html   = $object->presenter->show();
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<show $object>
+
+Alias for C<shop_order $object %params>.
+
+=item C<shop_order $object %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the shop order object
+C<$object>.
+
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
+
+=over 2
+
+=item * no_link
+
+If falsish (the default) then the shop order will be linked to the "show" dialog.
+
+=back
+
+C<%params> gets passed to L<SL::Presenter::Tag/link_tag>.
+
+=back
+
+=head1 BUGS
+
+Nothing here yet.
+
+=head1 AUTHOR
+
+Tamino Steinert E<lt>tamino.steinert@tamino.stE<gt>
+
+=cut
diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index a140fe4e4..e0bf92624 100644
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -3,6 +3,7 @@ package SL::Presenter::Tag;
 use strict;
 
 use SL::HTML::Restrict;
+use SL::Locale::String qw(t8);
 use SL::Presenter::EscapedText qw(escape);
 use Scalar::Util qw(blessed);
 
@@ -11,7 +12,8 @@ our @EXPORT_OK = qw(
   html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag
   checkbox_tag button_tag submit_tag ajax_submit_tag input_number_tag
   stringify_attributes textarea_tag link_tag date_tag
-  div_tag radio_button_tag img_tag);
+  div_tag radio_button_tag img_tag multi_level_select_tag input_tag_trim
+  input_email_tag);
 our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
 use Carp;
@@ -87,6 +89,17 @@ sub input_tag {
   html_tag('input', undef, %attributes, name => $name, value => $value);
 }
 
+sub input_tag_trim {
+  my ($name, $value, %attributes) = @_;
+  $attributes{'data-validate'} .= ' trimmed_whitespaces';
+
+  _set_id_attribute(\%attributes, $name);
+  $::request->layout->add_javascripts('kivi.Validator.js');
+  $::request->presenter->need_reinit_widgets($attributes{id});
+
+  input_tag($name, $value, %attributes);
+}
+
 sub hidden_tag {
   my ($name, $value, %attributes) = @_;
   input_tag($name, $value, %attributes, type => 'hidden');
@@ -244,6 +257,148 @@ sub select_tag {
   return $select_html;
 }
 
+sub multi_level_select_tag {
+  my ($name, $collection, $levels, %attributes) = @_;
+
+  _set_id_attribute(\%attributes, $name);
+  my $id = $attributes{id};
+
+  $collection = [] if defined($collection) && !ref($collection) && ($collection eq '');
+
+  my $surround_tag = delete($attributes{surround_tag});
+
+  my $multi_level_select_tag = "";
+  my %level_keys = ();
+
+  my $base_attributes  = delete($attributes{"level_1"}) || {};
+
+  my $base_name        = delete($base_attributes->{name});
+  my $base_value_key   = $base_attributes->{value_key} || 'id';
+  my $base_title_key   = $base_attributes->{title_key} || $base_value_key;
+  my $base_default     = $base_attributes->{default};
+  my $base_default_key = $base_attributes->{default_key};
+
+  $level_keys{1} = {
+    "value" => $base_value_key,
+    "title" => $base_title_key,
+  };
+  $base_attributes->{id} = $id . "_level_1";
+  $base_attributes->{onchange} = $id . "_on_chanche_level_1(this)";
+  my $current_select = select_tag(
+    $base_name,
+    $collection,
+    %{$base_attributes}
+  );
+  if ($surround_tag) {
+    $multi_level_select_tag .= html_tag($surround_tag, $current_select);
+  } else {
+    $multi_level_select_tag .= $current_select;
+  }
+
+  my $last_object;
+  if ($base_default) {
+    ($last_object) = grep { $_->{$base_value_key} eq $base_default } @{$collection};
+  } elsif ($base_default_key) {
+    ($last_object) = grep { $_->{$base_default_key} } @{$collection};
+  } else {
+    $last_object = $collection->[0];
+  }
+  foreach my $level (2 .. $levels) {
+    my $current_attributes = delete($attributes{"level_$level"}) || {};
+
+    my $current_name          = delete($current_attributes->{name});
+    my $current_value_key     = $current_attributes->{value_key} || 'id';
+    my $current_title_key     = $current_attributes->{title_key} || $current_value_key;
+    my $current_default       = $current_attributes->{default};
+    my $current_default_key   = $current_attributes->{default_key};
+    my $current_object_key    = delete($current_attributes->{object_key});
+    die "need object_key in level_$level in multi_level_select_tag" unless $current_object_key;
+
+    $level_keys{$level} = {
+      "value"  => $current_value_key,
+      "title"  => $current_title_key,
+      "object" => $current_object_key,
+    };
+
+    $current_attributes->{id} = $id . "_level_$level";
+    $current_attributes->{onchange} = $id . "_on_chanche_level_${level}(this)" unless $level eq $levels;
+    my $current_collection = $last_object->{$current_object_key};
+    my $current_select = select_tag(
+      $current_name,
+      $current_collection,
+      %{$current_attributes}
+    );
+    if ($surround_tag) {
+      $multi_level_select_tag .= html_tag($surround_tag, $current_select);
+    } else {
+      $multi_level_select_tag .= $current_select;
+    }
+
+    if ($current_default) {
+      ($last_object) = grep { $_->{$current_value_key} eq $current_default } @{$current_collection};
+    } elsif ($current_default_key) {
+      ($last_object) = grep { $_->{$current_default_key} } @{$current_collection};
+    } else {
+      $last_object = $current_collection->[0];
+    }
+  }
+
+  my $code = "";
+
+  if ($levels > 1) {
+    my $js_option_string = ""; # js hash map (level->value->{[value: 1, title: 'foo'], ...})
+
+    my @current_collections = @{$collection};
+    my @next_collections = ();
+    foreach my $level (1 .. ($levels - 1)) {
+      $js_option_string .= "'${level}': {";
+      foreach my $option (@current_collections) {
+        $js_option_string .= "'" . $option->{$level_keys{$level}{value}} . "': [";
+        map { $js_option_string .= "{ value: '" . $_->{$level_keys{$level + 1}{value}}
+                                .  "', title: '" . $_->{$level_keys{$level + 1}{title}}
+                                .  "'}," } @{$option->{$level_keys{$level + 1}{object}}};
+        $js_option_string .= "],";
+        push @next_collections, @{$option->{$level_keys{$level + 1}{object}}};
+      }
+      $js_option_string .= "},";
+      @current_collections = @next_collections;
+      @next_collections = ();
+    }
+
+    $code .= javascript( qq|
+      var ${id}_options = {
+        $js_option_string
+      };
+    |);
+    foreach my $level (1 .. ($levels - 1)) {
+      my $next_level = $level + 1;
+      $code .= javascript( qq|
+      function ${id}_on_chanche_level_${level}(select_${level}) {
+        var value = select_${level}.value;
+        for (var i = ${next_level}; i < $levels + 1; i++) {
+          var id = '${id}_level_' + i;
+          var select_i = document.getElementById(id);
+          while (select_i.options.length) {
+            select_i.options.remove(0);
+          }
+          select_i.disabled = true;
+        }
+        var id_${next_level} = '${id}_level_${next_level}';
+        var select_${next_level} = document.getElementById(id_${next_level});
+        for (var i=0; i < ${id}_options[${level}][value].length; i++) {
+          var option = new Option(${id}_options[${level}][value][i].title, ${id}_options[${level}][value][i].value)
+          select_${next_level}.options.add(option);
+        }
+        select_${next_level}.disabled = false;
+        select_${next_level}.selectedIndex = -1;
+      }
+      |);
+    }
+  }
+
+  return $multi_level_select_tag . $code;
+}
+
 sub checkbox_tag {
   my ($name, %attributes) = @_;
 
@@ -302,10 +457,16 @@ sub button_tag {
 
   _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name};
   $attributes{type} ||= 'button';
+  $attributes{tag}  ||= 'input';
 
   $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm};
 
-  html_tag('input', undef, %attributes, value => $value, (onclick => $onclick)x!!$onclick);
+  if ( $attributes{tag} eq 'input' ) {
+    html_tag('input', undef, %attributes, value => $value, (onclick => $onclick)x!!$onclick)
+  }
+  elsif ( $attributes{tag} eq 'button' ) {
+    html_tag('button', undef, %attributes, value => $value, (onclick => $onclick)x!!$onclick);
+  }
 }
 
 sub submit_tag {
@@ -350,6 +511,26 @@ sub input_number_tag {
   );
 }
 
+sub input_email_tag {
+  my ($name, $value, %params) = @_;
+
+  my $show_icon = $value || delete($params{show_icon_always});
+
+  # _set_id_attribute removes the no_id param
+  my $no_id_wanted = $params{no_id};
+  _set_id_attribute(\%params, $name);
+  $params{no_id} = $no_id_wanted;
+
+  my $html = input_tag_trim($name, $value, %params);
+
+  my $link_id   = $params{id} ? $params{id} . '_link' : undef;
+  $html        .= link_tag(escape('mailto:' . $value),
+                           img_tag(src => 'image/mail.png', alt => t8('Send email'), border => 0),
+                           (id    => $link_id)x!!$link_id,
+                           (style => 'display:none')x!$show_icon);
+
+  return '<span>' . $html . '</span>';
+}
 
 sub javascript {
   my ($data) = @_;
@@ -376,6 +557,10 @@ sub textarea_tag {
   $attributes{rows}  *= 1; # required by standard
   $attributes{cols}  *= 1; # required by standard
 
+  if (join_values(class => $attributes{class}) =~ /\btexteditor\b/) {
+    $::request->{layout}->add_javascripts("$_.js") for qw(ckeditor5/ckeditor ckeditor5/translations/de);
+  }
+
   html_tag('textarea', $content, %attributes, name => $name);
 }
 
@@ -505,6 +690,26 @@ Creates a HTML 'input type=text' tag named C<$name> with the value
 C<$value> and with arbitrary HTML attributes from C<%attributes>. The
 tag's C<id> defaults to C<name_to_id($name)>.
 
+=item C<input_tag_trim $name, $value, %attributes>
+
+This is a wrapper around C<input_tag> that adds ' trimmed_whitespaces' to
+$attributes{'data-validate'} and loads C<js/kivi.Validator.js>. This will trim
+the whitespaces around the input.
+
+=item C<input_email_tag $name, $value, %params>
+
+This creates an C<input_tag_trim> and a C<link_tag> with an C<img_tag> for an
+email icon. The link opens a 'mailto:' url with the value of the C<input_tag>.
+The style of the C<link_tag> is set to 'display:none' if there is no value or
+if the param C<show_icon_always> is truish.
+All but the C<show_icon_always> params are forwared to the C<input_tag_trim>
+as attributes.
+This tag does not offer any javascript magic. The input value is only
+evaluated when the tag is created.
+The 'id' attrubute of the C<link_tag> is set to the 'id' of the C<input_tag>
+with the string '_link' appended. This can be used to show/hide set the
+C<link_tag> or set the link target dynamically.
+
 =item C<submit_tag $name, $value, %attributes>
 
 Creates a HTML 'input type=submit class=submit' tag named C<$name> with the
@@ -700,6 +905,103 @@ Example for use of optgroups:
   # Later in the template:
   [% L.select_tag('the_selection', COLLECTION, with_optgroups=1, title_key='name') %]
 
+=item C<multi_level_select_tag $name, \@collection, $levels, %attributes>
+
+Creates multiple HTML 'select' tags, one for each level. Each tag ist created
+with C<select_tag>.
+
+The parameters for C<select_tag> are created from the values stored in the
+corrosponding level attributes. The attributes for each level are in
+C<%attributes{level_i}>, starting with 1.
+
+The following are used directly from each level:
+
+=over 4
+
+=item I<name> is deleted from level attributes.
+The I<name> is used for the name of the 'select' tag.
+
+=item I<object_key> is deleted from level attriutes.
+The I<object_key> is used to get the level objects for the current level
+from the object of the previous level, this is intended for the use of RSDB object.
+Each level attributes must contain I<object_key>, except level_1.
+
+=item I<id> is overridden.
+The I<id> is set to a specific value for use in JavaScript.
+
+=item I<value_key> names the key for the value of level object. Defaults to
+C<id>.
+
+=item I<title_key> names the key for the titel of level object. Defaults to
+C<$attributes{value_key}>.
+
+=item I<default> is used to find the default level object.
+
+=item I<default_key> names the key for the default feld of level object. Is
+ignored if I<default> is set.
+
+=item I<\@collection> is used for the level object of level 1. The objects of the next
+level are taken from the previous level via the <object_key>. On each level the
+objects must be a hash reference or a blessed reference.
+
+=back
+
+A I<surround_tag> can be specified, which generates an C<html_tag> with the
+corresponding tag around every C<select_tag>.
+
+Example:
+
+  # First in a controller:
+    my @collection = (
+    { 'description' => 'foo_1', 'id' => '1',
+      'key_1' => [
+        { 'id' => 3, 'description' => "bar_1",
+          'key_2' => [
+            { 'id' => 1, 'value' => "foobar_1", },
+            { 'id' => 2, 'value' => "foobar_2", },
+          ], },
+        { 'id' => 4, 'description' => "bar_2",
+        'key_2' => [], },
+      ], },
+    { 'description' => 'foo_2', 'id' => '2',
+      'key_1' => [
+        { 'id' => 1, 'description' => "bar_1",
+          'key_2' => [
+            { 'id' => 3, 'value' => "foobar_3", },
+            { 'id' => 4, 'value' => "foobar_4", },
+          ], },
+        { 'id' => 2, 'description' => "bar_2",
+          'stock' => [
+            { 'id' => 5, 'value' => "test_5", },
+          ], },
+      ], },
+  );
+
+  # Later in the template (in a table):
+  [% L.multi_level_select_tag("multi_select_foo_bar_foobar", COLLECTION, 3,
+      surround_tag="td",
+      level_1={
+        name="foo.id",
+        value_key="id",
+        title_key="description",
+        default="2",
+      },
+      level_2={
+        object_key="key_1",
+        name="bar.id",
+        value_key="id",
+        title_key="description",
+        default="1",
+      },
+      level_3={
+        object_key="key_2",
+        name="foobar.id",
+        value_key="id",
+        title_key="value",
+        default="4",
+      },
+  ) %]
+
 =back
 
 =head1 BUGS
diff --git a/SL/Presenter/WebdavObject.pm b/SL/Presenter/WebdavObject.pm
index 7318f0ce6..2c721100f 100644
--- a/SL/Presenter/WebdavObject.pm
+++ b/SL/Presenter/WebdavObject.pm
@@ -55,7 +55,8 @@ Returns a rendered version (actually an instance of
 L<SL::Presenter::EscapedText>) of the webdav object
 C<$webdav_object>.
 
-C<%params> can include:
+Remaining C<%params> are passed to the function
+C<SL::Presenter::Tag::link_tag>. It can include:
 
 =over 2
 
diff --git a/SL/PriceSource.pm b/SL/PriceSource.pm
index 05168ce67..762472e7e 100644
--- a/SL/PriceSource.pm
+++ b/SL/PriceSource.pm
@@ -43,7 +43,7 @@ sub price_from_source {
     my $class = SL::PriceSource::ALL->price_source_class_by_name($source_name);
     my $source_object = $self->price_source_by_class($class);
 
-    $source_object
+    $source_object && $spec
       ? $source_object->price_from_source($source, $spec)
       : empty_price();
   }
diff --git a/SL/PriceSource/ALL.pm b/SL/PriceSource/ALL.pm
index e7c553e0a..b63db71f0 100644
--- a/SL/PriceSource/ALL.pm
+++ b/SL/PriceSource/ALL.pm
@@ -16,7 +16,7 @@ my %price_sources_by_name = (
   vendor_discount   => 'SL::PriceSource::Vendor',
   pricegroup        => 'SL::PriceSource::Pricegroup',
   makemodel         => 'SL::PriceSource::Makemodel',
-  customerprice     => 'SL::PriceSource::CustomerPrice',
+  customer_price    => 'SL::PriceSource::CustomerPrice',
   business          => 'SL::PriceSource::Business',
   price_rules       => 'SL::PriceSource::PriceRules',
 );
@@ -27,7 +27,7 @@ my @price_sources_order = qw(
   vendor_discount
   pricegroup
   makemodel
-  customerprice
+  customer_price
   business
   price_rules
 );
diff --git a/SL/PriceSource/Vendor.pm b/SL/PriceSource/Vendor.pm
index 0f0a0cfeb..634612844 100644
--- a/SL/PriceSource/Vendor.pm
+++ b/SL/PriceSource/Vendor.pm
@@ -18,7 +18,7 @@ sub available_discounts {
 
   return if     $self->record->is_sales;
   return unless $self->record->vendor;
-  return unless $self->record->vendor->discount != 0;
+  return unless ($self->record->vendor->discount//0) != 0;
 
   SL::PriceSource::Discount->new(
     discount     => $self->record->vendor->discount,
@@ -78,4 +78,3 @@ sub best_discount {
 }
 
 1;
-
diff --git a/SL/RP.pm b/SL/RP.pm
index 28d01af19..a53cde7fd 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1055,7 +1055,6 @@ sub trial_balance {
          $customer_join
          WHERE $saldowhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND c.accno = ? AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL)) AS saldo,
@@ -1066,7 +1065,6 @@ sub trial_balance {
          $customer_join
          WHERE $sumwhere
            $dpt_where_without_arapgl
-           $dpt_where
            $customer_where
            $project
          AND ac.amount > 0
@@ -1077,7 +1075,6 @@ sub trial_balance {
          JOIN chart c ON (ac.chart_id = c.id)
          $customer_join
          WHERE $sumwhere
-           $dpt_where
            $dpt_where_without_arapgl
            $customer_where
            $project
diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index 275e2e33a..14019c26d 100644
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -10,6 +10,7 @@ use Text::CSV_XS;
 use strict;
 use SL::Helper::GlAttachments qw(append_gl_pdf_attachments);
 use SL::Helper::CreatePDF     qw(merge_pdfs);
+use SL::JSON qw(to_json);
 
 # Cause locales.pl to parse these files:
 # parse_html_template('report_generator/html_report')
@@ -29,6 +30,7 @@ sub new {
     'controller_class   '   => '',
     'allow_pdf_export'      => 1,
     'allow_csv_export'      => 1,
+    'allow_chart_export'    => 1,
     'html_template'         => 'report_generator/html_report',
     'pdf_export'            => {
       'paper_size'          => 'a4',
@@ -52,6 +54,10 @@ sub new {
       'headers'             => 1,
       'encoding'            => 'UTF-8',
     },
+    'chart_export'          => {
+      'assignment_x'        => '',
+      'assignments_y'       => [],
+    },
   };
   $self->{export}   = {
     'nextsub'       => '',
@@ -168,6 +174,8 @@ sub set_options {
       $self->{options}->{pdf_export}->{$_} = $value->{$_} for keys %{ $value };
     } elsif ($key eq 'csv_export') {
       $self->{options}->{csv_export}->{$_} = $value->{$_} for keys %{ $value };
+    } elsif ($key eq 'chart_export') {
+      $self->{options}->{chart_export}->{$_} = $value->{$_} for keys %{ $value };
     } else {
       $self->{options}->{$key} = $value;
     }
@@ -185,7 +193,7 @@ sub set_options_from_form {
     $self->{options}->{$key} = $form->{$full_key} if (defined $form->{$full_key});
   }
 
-  foreach my $format (qw(pdf csv)) {
+  foreach my $format (qw(pdf csv chart)) {
     my $opts = $self->{options}->{"${format}_export"};
     foreach my $key (keys %{ $opts }) {
       my $full_key = "report_generator_${format}_options_${key}";
@@ -255,8 +263,11 @@ sub generate_with_headers {
   } elsif ($format eq 'pdf') {
     $self->generate_pdf_content();
 
+  } elsif ($format eq 'chart') {
+    $self->generate_chart_content();
+
   } else {
-    $form->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)');
+    $form->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF, Chart)');
   }
 }
 
@@ -401,7 +412,8 @@ sub prepare_html_content {
     'RAW_BOTTOM_INFO_TEXT' => $opts->{raw_bottom_info_text},
     'ALLOW_PDF_EXPORT'     => $allow_pdf_export,
     'ALLOW_CSV_EXPORT'     => $opts->{allow_csv_export},
-    'SHOW_EXPORT_BUTTONS'  => ($allow_pdf_export || $opts->{allow_csv_export}) && $self->{data_present},
+    'ALLOW_CHART_EXPORT'   => $opts->{allow_chart_export},
+    'SHOW_EXPORT_BUTTONS'  => ($allow_pdf_export || $opts->{allow_csv_export} || $opts->{allow_chart_export}) && $self->{data_present},
     'HEADER_ROWS'          => $header_rows,
     'NUM_COLUMNS'          => scalar @column_headers,
     'ROWS'                 => \@rows,
@@ -418,10 +430,10 @@ sub prepare_html_content {
 }
 
 sub create_action_bar_actions {
-  my ($self, $variables) = @_;
+  my ($self, $variables, %params) = @_;
 
   my @actions;
-  foreach my $type (qw(pdf csv)) {
+  foreach my $type (qw(pdf csv chart)) {
     next unless $variables->{"ALLOW_" . uc($type) . "_EXPORT"};
 
     my $key   = $variables->{CONTROLLER_DISPATCH} ? 'action' : 'report_generator_dispatch_to';
@@ -429,8 +441,13 @@ sub create_action_bar_actions {
     $value    = $variables->{CONTROLLER_DISPATCH} . "/${value}" if $variables->{CONTROLLER_DISPATCH};
 
     push @actions, action => [
-      $type eq 'pdf' ? $::locale->text('PDF export') : $::locale->text('CSV export'),
-      submit => [ '#report_generator_form', { $key => $value } ],
+      $type eq 'pdf' ? $::locale->text('PDF export') : $type eq 'csv' ? $::locale->text('CSV export') : $::locale->text('Chart export'),
+      submit => [ '#report_generator_form', {(
+            $key => $value,
+            defined $params{action_bar_additional_submit_values}
+            ? %{$params{action_bar_additional_submit_values}}
+            : undef
+          )} ],
     ];
   }
 
@@ -449,7 +466,7 @@ sub create_action_bar_actions {
 sub setup_action_bar {
   my ($self, $variables, %params) = @_;
 
-  my @actions = $self->create_action_bar_actions($variables);
+  my @actions = $self->create_action_bar_actions($variables, %params);
 
   if ($params{action_bar_setup_hook}) {
     $params{action_bar_setup_hook}->(@actions);
@@ -466,7 +483,6 @@ sub generate_html_content {
   $params{action_bar} //= 1;
 
   my $variables = $self->prepare_html_content(%params);
-
   $self->setup_action_bar($variables, %params) if $params{action_bar};
 
   my $stuff  = $self->{form}->parse_html_template($self->{options}->{html_template}, $variables);
@@ -853,6 +869,62 @@ sub _generate_csv_content {
   }
 }
 
+sub generate_chart_content {
+  my ($self, %params) = @_;
+
+  $params{action_bar} //= 1;
+
+  my $opts            = $self->{options};
+
+  my $assignment_x  = $opts->{chart_export}->{assignment_x};
+  my $assignments_y = $opts->{chart_export}->{assignments_y};
+
+  my @labels;
+  my @datasets;
+  foreach my $row_set (@{ $self->{data} }) {
+    next if ('ARRAY' ne ref $row_set);
+    foreach my $row (@{ $row_set }) {
+      my $label = $row->{$assignment_x}->{data}->[0];
+      if ($label) {
+        push @labels, $label;
+
+        my @set;
+        foreach my $assignment_y (@$assignments_y) {
+          my $y = $row->{$assignment_y}->{data}->[0];
+          push @set, $y;
+        }
+        push @datasets, \@set;
+      }
+    }
+  }
+
+  my $variables = {
+    'TITLE'                => $opts->{title},
+    'TOP_INFO_TEXT'        => $self->html_format($opts->{top_info_text}),
+    'RAW_TOP_INFO_TEXT'    => $opts->{raw_top_info_text},
+    'BOTTOM_INFO_TEXT'     => $self->html_format($opts->{bottom_info_text}),
+    'RAW_BOTTOM_INFO_TEXT' => $opts->{raw_bottom_info_text},
+    'EXPORT_VARIABLE_LIST' => join(' ', @{ $self->{export}->{variable_list} }),
+    'EXPORT_NEXTSUB'       => $self->{export}->{nextsub},
+    'DATA_PRESENT'         => $self->{data_present},
+    'CONTROLLER_DISPATCH'  => $opts->{controller_class},
+    'TABLE_CLASS'          => $opts->{table_class},
+    'SKIP_BUTTONS'         => !!$params{action_bar},
+  };
+
+  $::request->layout->add_javascripts('chart.js', 'kivi.ChartReport.js');
+
+  $::form->header;
+  print $::form->parse_html_template('report_generator/chart_report',
+                                      {
+                                        labels      => to_json(\@labels),
+                                        datasets    => to_json(\@datasets),
+                                        data_labels => to_json($assignments_y),
+                                        %$variables,
+                                      }
+  );
+}
+
 sub check_for_pdf_api {
   return eval { require PDF::API2; 1; } ? 1 : 0;
 }
diff --git a/SL/SEPA.pm b/SL/SEPA.pm
index fc92bcf16..a6a74e1aa 100644
--- a/SL/SEPA.pm
+++ b/SL/SEPA.pm
@@ -29,6 +29,8 @@ sub retrieve_open_invoices {
 
   my $mandate  = $params{vc} eq 'customer' ? " AND COALESCE(vc.mandator_id, '') <> '' AND vc.mandate_date_of_signature IS NOT NULL " : '';
 
+  my $is_sepa_blocked = $params{vc} eq 'customer' ? 'FALSE' : "${arap}.is_sepa_blocked";
+
   # open_amount is not the current open amount according to bookkeeping, but
   # the open amount minus the SEPA transfer amounts that haven't been closed yet
   my $query =
@@ -38,14 +40,15 @@ sub retrieve_open_invoices {
          (${arap}.amount - (${arap}.amount * pt.percent_skonto)) as amount_less_skonto,
          (${arap}.amount * pt.percent_skonto) as skonto_amount,
          vc.name AS vcname, vc.language_id, ${arap}.duedate as duedate, ${arap}.direct_debit,
+         ${is_sepa_blocked} AS is_sepa_blocked,
          vc.${vc_vc_id} as vc_vc_id,
 
          COALESCE(vc.iban, '') <> '' AND COALESCE(vc.bic, '') <> '' ${mandate} AS vc_bank_info_ok,
 
          ${arap}.amount - ${arap}.paid - COALESCE(open_transfers.amount, 0) AS open_amount,
          COALESCE(open_transfers.amount, 0) AS transfer_amount,
-         pt.description as pt_description
-
+         pt.description as pt_description,
+         (current_date < (${arap}.transdate + pt.terms_skonto)) as within_skonto_period
        FROM ${arap}
        LEFT JOIN ${vc} vc ON (${arap}.${vc}_id = vc.id)
        LEFT JOIN (SELECT sei.${arap}_id, SUM(sei.amount) + SUM(COALESCE(sei.skonto_amount,0)) AS amount
@@ -58,7 +61,7 @@ sub retrieve_open_invoices {
 
        LEFT JOIN payment_terms pt ON (${arap}.payment_id = pt.id)
 
-       WHERE ${arap}.amount > (COALESCE(open_transfers.amount, 0) + ${arap}.paid)
+       WHERE (${arap}.amount - (COALESCE(open_transfers.amount, 0) + ${arap}.paid)) >= 0.01
 
        ORDER BY lower(vc.name) ASC, lower(${arap}.invnumber) ASC
 |;
@@ -69,17 +72,14 @@ sub retrieve_open_invoices {
   # add some more data to $results:
   # create drop-down data for payment types and suggest amount to be paid according
   # to open amount or skonto
+  # One minor fault: amount_less_skonto does not subtract the not yet booked sepa transfer amounts
 
   foreach my $result ( @$results ) {
-    my $invoice = $vc eq 'customer' ? SL::DB::Manager::Invoice->find_by(         id => $result->{id} )
-                                    : SL::DB::Manager::PurchaseInvoice->find_by( id => $result->{id} );
-
-    $invoice->get_payment_suggestions(sepa => 1); # consider amounts of open entries in sepa_export_items
-    $result->{skonto_amount}             = $invoice->skonto_amount;
-    $result->{within_skonto_period}      = $invoice->within_skonto_period;
-    $result->{invoice_amount_suggestion} = $invoice->{invoice_amount_suggestion};
-    $result->{payment_select_options}    = $invoice->{payment_select_options};
-  };
+    my   @options;
+    push @options, { payment_type => 'without_skonto',  display => t8('without skonto') };
+    push @options, { payment_type => 'with_skonto_pt',  display => t8('with skonto acc. to pt'), selected => 1 } if $result->{within_skonto_period};
+    $result->{payment_select_options}  = \@options;
+  }
 
   $main::lxdebug->leave_sub();
 
@@ -165,7 +165,7 @@ sub _create_export {
     $h_item_id->execute() || $::form->dberror($q_item_id);
     my ($item_id)      = $h_item_id->fetchrow_array();
 
-    my $end_to_end_id  = strftime "LXO%Y%m%d%H%M%S", localtime;
+    my $end_to_end_id  = strftime "KIVITENDO%Y%m%d%H%M%S", localtime;
     my $item_id_len    = length "$item_id";
     my $num_zeroes     = 35 - $item_id_len - length $end_to_end_id;
     $end_to_end_id    .= '0' x $num_zeroes if (0 < $num_zeroes);
@@ -247,7 +247,8 @@ sub retrieve_export {
                   $columns
                 FROM sepa_export_items sei
                 $joins
-                WHERE sei.sepa_export_id = ?|;
+                WHERE sei.sepa_export_id = ?
+                ORDER BY sei.id|;
 
     $export->{items} = selectall_hashref_query($form, $dbh, $query, conv_i($params{id}));
 
diff --git a/SL/SEPA/XML.pm b/SL/SEPA/XML.pm
index a4cf5f5ad..0e3afebea 100644
--- a/SL/SEPA/XML.pm
+++ b/SL/SEPA/XML.pm
@@ -5,14 +5,44 @@ use utf8;
 
 use Carp;
 use Encode;
-use List::Util qw(first sum);
 use List::MoreUtils qw(any);
+use List::Util qw(first sum);
 use POSIX qw(strftime);
 use XML::Writer;
 
 use SL::Iconv;
 use SL::SEPA::XML::Transaction;
 
+use constant V3_0_0 => 3_000_000;
+use constant V3_8_0 => 3_800_000;
+
+sub get_supported_versions {
+  return (
+    versions => [
+      { id => V3_0_0(), description => "v3.0.0" },
+      { id => V3_8_0(), description => "v3.8.0" },
+    ],
+    default => get_default_version(),
+  );
+}
+
+sub get_default_version {
+  my $today          = DateTime->today_local;
+  my $cutoff_v3_8_0  = DateTime->new_local(year => 2025, month => 10, day => 1);
+
+  return V3_8_0() if $today >= $cutoff_v3_8_0;
+  return V3_0_0();
+}
+
+sub is_version_valid {
+  shift while @_ && ref($_[0]);
+
+  my $id       = $_[0];
+  my %versions = get_supported_versions();
+
+  return any { $_->{id} == $id } @{ $versions{versions} };
+}
+
 sub new {
   my $class = shift;
   my $self  = {};
@@ -31,14 +61,16 @@ sub _init {
   $self->{transactions} = [];
   $self->{src_charset}  = 'UTF-8';
   $self->{grouped}      = 0;
+  $self->{version}      = get_default_version();
 
-  map { $self->{$_} = $params{$_} if (exists $params{$_}) } qw(src_charset company creditor_id message_id grouped collection);
+  map { $self->{$_} = $params{$_} if (exists $params{$_}) } qw(src_charset company creditor_id message_id grouped collection version);
 
   $self->{iconv} = SL::Iconv->new($self->{src_charset}, "UTF-8") || croak "Unsupported source charset $self->{src_charset}.";
 
   my $missing_parameter = first { !$self->{$_} } qw(company message_id);
   croak "Missing parameter: $missing_parameter" if ($missing_parameter);
   croak "Missing parameter: creditor_id"        if !$self->{creditor_id} && $self->{collection};
+  croak "Invalid parameter: version"            if !is_version_valid($self->{version});
 
   map { $self->{$_} = $self->_replace_special_chars($self->{iconv}->convert($self->{$_})) } qw(company message_id creditor_id);
 }
@@ -124,6 +156,23 @@ sub _restricted_identification_sepa2 {
   return substr $string, 0, 35;
 }
 
+sub _emit_cdtr_scheme_id {
+  my ($self, $xml) = @_;
+
+  $xml->startTag('CdtrSchmeId');
+  $xml->startTag('Id');
+  $xml->startTag('PrvtId');
+  $xml->startTag('Othr');
+  $xml->dataElement('Id', encode('UTF-8', substr($self->{creditor_id}, 0, 35)));
+  $xml->startTag('SchmeNm');
+  $xml->dataElement('Prtry', 'SEPA');
+  $xml->endTag('SchmeNm');
+  $xml->endTag('Othr');
+  $xml->endTag('PrvtId');
+  $xml->endTag('Id');
+  $xml->endTag('CdtrSchmeId');
+}
+
 sub to_xml {
   my $self = shift;
 
@@ -134,7 +183,7 @@ sub to_xml {
   my $xml    = XML::Writer->new(OUTPUT      => \$output,
                                 DATA_MODE   => 1,
                                 DATA_INDENT => 2,
-                                ENCODING    => 'utf-8');
+                                ENCODING    => 'UTF-8');
 
   my @now       = localtime;
   my $time_zone = strftime "%z", @now;
@@ -143,9 +192,16 @@ sub to_xml {
   my $is_coll   = $self->{collection};
   my $cd_src    = $is_coll ? 'Cdtr'              : 'Dbtr';
   my $cd_dst    = $is_coll ? 'Dbtr'              : 'Cdtr';
-  my $pain_id   = $is_coll ? 'pain.008.001.02'   : 'pain.001.001.03';
   my $pain_elmt = $is_coll ? 'CstmrDrctDbtInitn' : 'CstmrCdtTrfInitn';
   my @pii_base  = (strftime('PII%Y%m%d%H%M%S', @now), rand(1000000000));
+  my $pain_id   = $is_coll && ($self->{version}  == V3_0_0()) ? 'pain.008.001.02'
+                : $is_coll && ($self->{version}  == V3_8_0()) ? 'pain.008.001.08'
+                : !$is_coll && ($self->{version} == V3_0_0()) ? 'pain.001.001.03'
+                : !$is_coll && ($self->{version} == V3_8_0()) ? 'pain.001.001.09'
+                :                                               die("programming error: version not handled for pain ID");
+  my $bic_elt   = $self->{version} == V3_0_0() ? 'BIC'
+                : $self->{version} == V3_8_0() ? 'BICFI'
+                :                                die("programming error: version not handled for BIC element name");
 
   my $grouped_transactions = $self->_group_transactions();
 
@@ -194,7 +250,22 @@ sub to_xml {
     }
     $xml->endTag('PmtTpInf');
 
-    $xml->dataElement($is_coll ? 'ReqdColltnDt' : 'ReqdExctnDt', $master_transaction->get('execution_date'));
+    if ($self->{version} == V3_0_0()) {
+      $xml->dataElement($is_coll ? 'ReqdColltnDt' : 'ReqdExctnDt', $master_transaction->get('execution_date'));
+
+    } elsif ($self->{version} == V3_8_0()) {
+      if ($is_coll) {
+        $xml->dataElement('ReqdColltnDt', $master_transaction->get('execution_date'));
+      } else {
+        $xml->startTag('ReqdExctnDt');
+        $xml->dataElement('Dt', $master_transaction->get('execution_date'));
+        $xml->endTag('ReqdExctnDt');
+      }
+
+    } else {
+      die("programming error: version not handled for ReqdColl/ExctnDt");
+    }
+
     $xml->startTag($cd_src);
     $xml->dataElement('Nm', encode('UTF-8', substr($self->{company}, 0, 70)));
     $xml->endTag($cd_src);
@@ -207,12 +278,16 @@ sub to_xml {
 
     $xml->startTag($cd_src . 'Agt');
     $xml->startTag('FinInstnId');
-    $xml->dataElement('BIC', $master_transaction->get('src_bic', 20));
+    $xml->dataElement($bic_elt, $master_transaction->get('src_bic', 20));
     $xml->endTag('FinInstnId');
     $xml->endTag($cd_src . 'Agt');
 
     $xml->dataElement('ChrgBr', 'SLEV');
 
+    if ($is_coll && ($self->{version}  == V3_8_0())) {
+      $self->_emit_cdtr_scheme_id($xml);
+    }
+
     foreach my $transaction (@{ $transaction_group->{transactions} }) {
       $xml->startTag($is_coll ? 'DrctDbtTxInf' : 'CdtTrfTxInf');
 
@@ -230,20 +305,12 @@ sub to_xml {
         $xml->startTag('MndtRltdInf');
         $xml->dataElement('MndtId', $self->_restricted_identification_sepa2($transaction->get('mandator_id')));
         $xml->dataElement('DtOfSgntr', $self->_restricted_identification_sepa2($transaction->get('date_of_signature')));
-        $xml->endTag('MndtRltdInf');
 
-        $xml->startTag('CdtrSchmeId');
-        $xml->startTag('Id');
-        $xml->startTag('PrvtId');
-        $xml->startTag('Othr');
-        $xml->dataElement('Id', encode('UTF-8', substr($self->{creditor_id}, 0, 35)));
-        $xml->startTag('SchmeNm');
-        $xml->dataElement('Prtry', 'SEPA');
-        $xml->endTag('SchmeNm');
-        $xml->endTag('Othr');
-        $xml->endTag('PrvtId');
-        $xml->endTag('Id');
-        $xml->endTag('CdtrSchmeId');
+        if ($self->{version}  == V3_0_0()) {
+          $self->_emit_cdtr_scheme_id($xml);
+        }
+
+        $xml->endTag('MndtRltdInf');
 
         $xml->endTag('DrctDbtTx');
 
@@ -257,7 +324,7 @@ sub to_xml {
 
       $xml->startTag("${cd_dst}Agt");
       $xml->startTag('FinInstnId');
-      $xml->dataElement('BIC', $transaction->get('dst_bic', 20));
+      $xml->dataElement($bic_elt, $transaction->get('dst_bic', 20));
       $xml->endTag('FinInstnId');
       $xml->endTag("${cd_dst}Agt");
 
diff --git a/SL/ShopConnector/Shopware6.pm b/SL/ShopConnector/Shopware6.pm
index 6d04a1b33..e97c37add 100644
--- a/SL/ShopConnector/Shopware6.pm
+++ b/SL/ShopConnector/Shopware6.pm
@@ -374,8 +374,17 @@ sub sync_all_images {
 
     # 2.1 no image with this title, create metadata for media and upload image
     if (!$current_image_id) {
+      # get media folder id
+      $ret = $self->connector->GET('api/media-folder');
+      $response_code = $ret->responseCode();
+      die "Request failed, response code was: $response_code\n" . $ret->responseContent() unless $response_code == 200;
+      my $media_folder_id;
+      try {
+        $media_folder_id = from_json($ret->responseContent())->{data}->[0]->{id};
+      } catch { die "Malformed JSON Data: $_ " . $ret->responseContent();  };
+
       # not yet uploaded, create media entry
-      $ret = $self->connector->POST("/api/media?_response=true");
+      $ret = $self->connector->POST("/api/media?_response=true", to_json({"mediaFolderId" => $media_folder_id}));
       $response_code = $ret->responseCode();
       die "Request failed, response code was: $response_code\n" . $ret->responseContent() unless $response_code == 200;
       try {
@@ -679,7 +688,7 @@ sub get_version {
   #  2. request version number
 
   $ret = $self->connector;
-  if (200 != $ret->responseCode()) {
+  if (!defined $ret || 200 != $ret->responseCode()) {
     $return->{success}         = 0;
     $return->{data}->{version} = $self->{errors}; # whatever init puts in errors
     return $return;
@@ -711,6 +720,62 @@ sub set_orderstatus {
   my $response_code = $ret->responseCode();
   die "Request failed, response code was: $response_code\n" . $ret->responseContent() unless $response_code eq '200';
 
+}
+sub set_order_transaction_status {
+  my ($self, $ordnumber, $transition) = @_;
+
+  croak t8("No Order Number")         unless $ordnumber;
+  croak "NO valid transition value"   unless $transition =~ m/(paid)/;
+
+  # first fetch order_transaction id
+  my %fetched_order  = $self->get_fetched_order_structure;
+  my $assoc          = $self->all_open_orders();
+
+  # overwrite filter for exactly one ordnumber
+  $assoc->{filter}->[0]->{value} = $ordnumber;
+  $assoc->{filter}->[0]->{type}  = 'equals';
+  $assoc->{filter}->[0]->{field} = 'orderNumber';
+
+  # 1. fetch the order and import it as a kivi order
+  # 2. return the number of processed order (1)
+  my $one_order = $self->connector->POST('api/search/order', to_json($assoc));
+  # 1. check for bad request or connection problems
+  if ($one_order->responseCode() != 200) {
+    $fetched_order{error}   = 1;
+    $fetched_order{message} = $one_order->responseCode() . ' ' . $one_order->responseContent();
+    die "Invalid response code:" . $fetched_order{message};
+  }
+
+  # 1.1 parse json or exit
+  my $content;
+  try {
+    $content = from_json($one_order->responseContent());
+  } catch {
+    $fetched_order{error}   = 1;
+    $fetched_order{message} = "Malformed JSON Data: $_ " . $one_order->responseContent();
+    die "Invalid JSON Data:" . $fetched_order{message};
+  };
+
+  # 2. check if we found ONE order at all
+  my $total = $content->{total};
+  if ($total == 0) {
+    $fetched_order{number_of_orders} = 0;
+    die \%fetched_order;
+  } elsif ($total != 1) {
+    $fetched_order{error}   = 1;
+    $fetched_order{message} = "More than one Order returned. Invalid State: $total";
+    die "Invalid State:" . $fetched_order{message};
+  }
+  # we assume just one transaction at all
+  die "Can only sync one single Transaction " unless scalar @{ $content->{data}->[0]->{transactions} } == 1;
+
+  my $order_transaction_id = $content->{data}->[0]->{transactions}->[0]->{id};
+  my $ret;
+  $ret = $self->connector->POST("/api/_action/order_transaction/$order_transaction_id/state/$transition");
+
+  my $response_code = $ret->responseCode();
+  die "Request failed, response code was: $response_code\n" . $ret->responseContent() unless $response_code eq '200';
+
 }
 
 sub init_connector {
@@ -767,7 +832,16 @@ sub import_data_to_shop_order {
     my $position = 0;
     my $active_price_source = $self->config->price_source;
     #Mapping Positions
+    my %discount_identifier;
     foreach my $pos (@positions) {
+      if ($pos->{type} eq 'promotion') {
+        next unless $pos->{payload}->{discountType} eq 'percentage';
+        foreach my $discount_pos (@{ $pos->{payload}->{composition} }) {
+          $discount_identifier{$discount_pos->{id}} = { discount_percentage => $pos->{payload}->{value},
+                                                        discount_code       => $pos->{payload}->{code}   };
+        }
+        next;
+      }
       $position++;
       my $price       = $::form->round_amount($pos->{unitPrice}, 2); # unit
       my %pos_columns = ( description          => $pos->{product}->{name},
@@ -779,10 +853,20 @@ sub import_data_to_shop_order {
                           shop_trans_id        => $pos->{id}, # pos id or shop_trans_id ? or dont care?
                           shop_order_id        => $id,
                           active_price_source  => $active_price_source,
+                          identifier           => $pos->{identifier},
                         );
       my $pos_insert = SL::DB::ShopOrderItem->new(%pos_columns);
       $pos_insert->save;
     }
+    # add discount if percentage
+    while ((my $identifier, my $discount_ref) = each (%discount_identifier)) {
+      # load and update shop order position
+      my $soi = SL::DB::Manager::ShopOrderItem->find_by(identifier => $identifier);
+      die "No Shop Order Item for discount found! identfier: " . $identifier unless ref $soi eq 'SL::DB::ShopOrderItem';
+
+      $soi->update_attributes(discount      => $discount_ref->{discount_percentage} / 100,
+                              discount_code => $discount_ref->{discount_code}       );
+    }
     $shop_order->positions($position);
 
     if ( $self->config->shipping_costs_parts_id ) {
@@ -911,7 +995,7 @@ sub map_data_to_shoporder {
     delivery_phone          => $shipto->{phone},
     delivery_street         => $shipto->{street},
     delivery_vat            => $shipto->{vatId},
-    delivery_zipcode        => $shipto->{zipCode},
+    delivery_zipcode        => $shipto->{zipcode},
 #    host                    => $shop}->{hosts},
     netamount               => $import->{amountNet},
     order_date              => $orderdate,
@@ -1086,6 +1170,14 @@ By guessing the correct german name for the english language some translation fo
 also be synced. This should be more clear (language configuration for shops) and the order
 synchronisation should also handle this (longdescription is simply copied from part.notes)
 
+=item * Shopware6 Promotion Codes
+
+Shopware6 Promotion Codes with discounts for specific positions (called line items in Shopware)
+are in a single line item of the type 'promotion'. kivitendo uses a simple real number in the
+range of 0 .. 1 to add a discount for a line item.
+This implementation adds a percentual discount for the correct positions and does not process
+the discount line item afterwards. The original Shopware Promotion Code is also saved.
+
 =back
 
 =head1 AUTHOR
diff --git a/SL/ShopConnector/WooCommerce.pm b/SL/ShopConnector/WooCommerce.pm
index 77aea400b..8e5aa6beb 100644
--- a/SL/ShopConnector/WooCommerce.pm
+++ b/SL/ShopConnector/WooCommerce.pm
@@ -539,7 +539,6 @@ sub send_request {
       message => "Error: $status_line",
     );
   }
-  #$main::lxdebug->dump(0, "TST: WooCommerce send_request return ", \%return);
   return \%return;
 
 }
diff --git a/SL/TODO.pm b/SL/TODO.pm
index ff29abb0a..08df5af06 100644
--- a/SL/TODO.pm
+++ b/SL/TODO.pm
@@ -40,7 +40,7 @@ sub get_user_config {
     $cfg = { map { $_ => 1 } qw(show_after_login show_follow_ups show_follow_ups_login show_overdue_sales_quotations show_overdue_sales_quotations_login) };
   }
 
-  if (! $main::auth->check_right($params{login}, 'sales_quotation_edit')) {
+  if (! $main::auth->check_right($params{login}, 'sales_quotation_edit | sales_quotation_view | request_quotation_edit | request_quotation_view')) {
     map { delete $cfg->{$_} } qw(show_overdue_sales_quotations show_overdue_sales_quotations_login);
   }
 
diff --git a/SL/Template.pm b/SL/Template.pm
index b20a7b1a3..fdd1887fd 100644
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -47,7 +47,7 @@ sub available_templates {
        -d ($::lx_office_conf{paths}->{templates} . "/$_")
     && !/^\.\.?$/
     && !m/\.(?:html|tex|sty|odt)$/
-    && !m/^(?:webpages$|mobile_webpages$|pdf$|print$|mail$|\.)/
+    && !m/^(?:webpages$|mobile_webpages$|design40_webpages$|pdf$|print$|mail$|\.)/
   } keys %dir_h;
 
   tie %dir_h, 'IO::Dir', "$::lx_office_conf{paths}->{templates}/print";
diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 293db2e18..42918b89b 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -8,6 +8,8 @@ use Carp;
 use Cwd;
 use English qw(-no_match_vars);
 use File::Basename;
+use File::Path;
+use File::Spec;
 use File::Temp;
 use HTML::Entities ();
 use List::MoreUtils qw(any);
@@ -41,7 +43,7 @@ sub _format_text {
 }
 
 my %html_replace = (
-  '</p>'      => "\n\n",
+  '</p>'      => "\\par\n",
   '<ul>'      => "\\begin{itemize} ",
   '</ul>'     => "\\end{itemize} ",
   '<ol>'      => "\\begin{enumerate} ",
@@ -101,6 +103,7 @@ sub _format_html {
   $content =~ s{ ^ \s+ }{}gx;                                                               # remove white space at the start of the text
   $content =~ s{ ^ ( \\newline \  )+ }{ _lb_to_space($1) }gxe;                              # convert line breaks at the start of the text to vertical space
   $content =~ s{ ( \n\n+ ) ( \\newline \  )+ }{ $1 . _lb_to_space($2) }gxe;                 # convert line breaks at the start of a paragraph to vertical space
+  $content =~ s{ ( \\par\n+ ) ( \\newline \  )+ }{ $1 . _lb_to_space($2) }gxe;              # convert line breaks at the start of a paragraph to vertical space
   $content =~ s{ ( \\end\{ [^\}]+ \} \h* ) ( \\newline \  )+ }{ $1 . _lb_to_space($2) }gxe; # convert line breaks after LaTeX environments like lists to vertical space
   $content =~ s{ ^ \h+ \\newline }{\\newline}gmx;
   $content =~ s{ \n\n \h* \\newline \h* }{\n\n}gmx;
@@ -445,8 +448,6 @@ sub _force_mandatory_packages {
 
         push @new_lines, (
           "\\usepackage[a-${version},mathxmp]{pdfx}[2018/12/22]\n",
-          "\\usepackage[genericmode]{tagpdf}\n",
-          "\\tagpdfsetup{activate-all}\n",
           "\\hypersetup{pdfstartview=}\n",
         );
       }
@@ -456,6 +457,7 @@ sub _force_mandatory_packages {
       push @new_lines, map { $self->_embed_file_directive($_) } @{ $self->{pdf_attachments} // [] };
 
       next;
+
     }
 
     push @new_lines, $line;
@@ -532,12 +534,25 @@ sub _texinputs_path {
   return join(':', grep({ $_ } ('.', $exe_dir . '/texmf', $exe_dir . '/users', $templates_path, $ENV{TEXINPUTS})), '');
 }
 
+sub _setup_env {
+  my ($self) = @_;
+
+  my $userspath    = $::lx_office_conf{paths}->{userspath};
+  $ENV{openin_any} = "r";
+  $ENV{TEXINPUTS}  = $self->_texinputs_path($self->{form}->{templates});
+  $ENV{TEXMFHOME}  = File::Spec->rel2abs($userspath . "/texmf", SL::System::Process::exe_dir());
+  $ENV{TEXMFVAR}   = $ENV{TEXMFHOME} . "/var";
+
+  File::Path::make_path($ENV{TEXMFVAR});
+}
+
 sub convert_to_postscript {
   my ($self) = @_;
   my ($form, $userspath) = ($self->{"form"}, $self->{"userspath"});
 
   # Convert the tex file to postscript
-  local $ENV{TEXINPUTS} = $self->_texinputs_path($form->{templates});
+  local ($ENV{TEXINPUTS}, $ENV{TEXMFHOME}, $ENV{TEXMFVAR}, $ENV{openin_any});
+  $self->_setup_env;
 
   if (!chdir("$userspath")) {
     $self->{"error"} = "chdir : $!";
@@ -548,22 +563,14 @@ sub convert_to_postscript {
   $form->{tmpfile} =~ s/\Q$userspath\E\///g;
 
   my $latex = $self->_get_latex_path();
-  my $old_home = $ENV{HOME};
-  my $old_openin_any = $ENV{openin_any};
-  $ENV{HOME}   = $userspath =~ m|^/| ? $userspath : getcwd();
-  $ENV{openin_any} = "r";
 
-  for (my $run = 1; $run <= 2; $run++) {
-    if (system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
-               "> $form->{tmpfile}.err") == -1) {
-      die "system call to $latex failed: $!";
-    }
-    if ($?) {
-      $ENV{HOME} = $old_home;
-      $ENV{openin_any} = $old_openin_any;
-      $self->{"error"} = $form->cleanup($latex);
-      return 0;
-    }
+  if (system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
+             "> $form->{tmpfile}.err") == -1) {
+    die "system call to $latex failed: $!";
+  }
+  if ($?) {
+    $self->{"error"} = $form->cleanup($latex);
+    return 0;
   }
 
   $form->{tmpfile} =~ s/tex$/dvi/;
@@ -571,8 +578,6 @@ sub convert_to_postscript {
   if (system("dvips $form->{tmpfile} -o -q > /dev/null") == -1) {
     die "system call to dvips failed: $!";
   }
-  $ENV{HOME} = $old_home;
-  $ENV{openin_any} = $old_openin_any;
 
   if ($?) {
     $self->{"error"} = "dvips : $?";
@@ -591,7 +596,8 @@ sub convert_to_pdf {
   my ($form, $userspath) = ($self->{"form"}, $self->{"userspath"});
 
   # Convert the tex file to PDF
-  local $ENV{TEXINPUTS} = $self->_texinputs_path($form->{templates});
+  local ($ENV{TEXINPUTS}, $ENV{TEXMFHOME}, $ENV{TEXMFVAR}, $ENV{openin_any});
+  $self->_setup_env;
 
   if (!chdir("$userspath")) {
     $self->{"error"} = "chdir : $!";
@@ -602,27 +608,17 @@ sub convert_to_pdf {
   $form->{tmpfile} =~ s/\Q$userspath\E\///g;
 
   my $latex = $self->_get_latex_path();
-  my $old_home = $ENV{HOME};
-  my $old_openin_any = $ENV{openin_any};
-  $ENV{HOME}   = $userspath =~ m|^/| ? $userspath : getcwd();
-  $ENV{openin_any} = "r";
 
-  for (my $run = 1; $run <= 2; $run++) {
-    if (system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
-               "> $form->{tmpfile}.err") == -1) {
-      die "system call to $latex failed: $!";
-    }
+  if (system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
+             "> $form->{tmpfile}.err") == -1) {
+    die "system call to $latex failed: $!";
+  }
 
-    if ($?) {
-      $ENV{HOME}     = $old_home;
-      $ENV{openin_any} = $old_openin_any;
-      $self->{error} = $form->cleanup($latex);
-      return 0;
-    }
+  if ($?) {
+    $self->{error} = $form->cleanup($latex);
+    return 0;
   }
 
-  $ENV{HOME} = $old_home;
-  $ENV{openin_any} = $old_openin_any;
   $form->{tmpfile} =~ s/tex$/pdf/;
 
   $self->cleanup();
@@ -631,7 +627,7 @@ sub convert_to_pdf {
 }
 
 sub _get_latex_path {
-  return $::lx_office_conf{applications}->{latex} || 'pdflatex';
+  return $::lx_office_conf{applications}->{latex} || 'latexmk --pdflatex';
 }
 
 sub get_mime_type() {
diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm
index 66d8f83ac..06dd6d973 100644
--- a/SL/Template/OpenDocument.pm
+++ b/SL/Template/OpenDocument.pm
@@ -7,20 +7,22 @@ use Encode;
 use HTML::Entities;
 use POSIX 'setsid';
 use XML::LibXML;
+use File::Basename;
 
 use SL::Iconv;
 use SL::Template::OpenDocument::Styles;
 
-use SL::DB::BankAccount;
 use SL::Helper::QrBill;
-use SL::Helper::ISO3166;
+use SL::Helper::QrBillFunctions qw(
+  get_ref_number_formatted get_iban_formatted get_amount_formatted
+  get_street_name_from_address_line get_building_number_from_address_line
+);
 
 use Cwd;
 # use File::Copy;
 # use File::Spec;
 # use File::Temp qw(:mktemp);
 use IO::File;
-use List::Util qw(first);
 
 use strict;
 
@@ -200,7 +202,7 @@ sub find_end {
 
     } elsif ((substr($text, $pos + 4, 4) eq 'else') && (1 == $depth)) {
       if (!$var) {
-        $self->{"error"} = '<%else%> outside of <%if%> / <%ifnot%>.';
+        $self->{error} = '<%else%> outside of <%if%> / <%ifnot%>.';
         return undef;
       }
 
@@ -256,7 +258,7 @@ sub parse_block {
 
           ($table_row, $contents) = $self->find_end($contents, length($1));
           if (!$table_row) {
-            $self->{"error"} = "Unclosed <\%foreachrow\%>." unless ($self->{"error"});
+            $self->{error} = "Unclosed <\%foreachrow\%>." unless ($self->{"error"});
             $main::lxdebug->leave_sub();
             return undef;
           }
@@ -311,7 +313,7 @@ sub parse_block {
         substr($contents, 0, $pos_foreach) = "";
 
         if ($contents !~ m|^(\&lt;\%foreach (.*?)\%\&gt;)|) {
-          $self->{"error"} = "Malformed <\%foreach\%>.";
+          $self->{error} = "Malformed <\%foreach\%>.";
           $main::lxdebug->leave_sub();
           return undef;
         }
@@ -323,7 +325,7 @@ sub parse_block {
         my $block;
         ($block, $contents) = $self->find_end($contents);
         if (!$block) {
-          $self->{"error"} = "Unclosed <\%foreach\%>." unless ($self->{"error"});
+          $self->{error} = "Unclosed <\%foreach\%>." unless ($self->{error});
           $main::lxdebug->leave_sub();
           return undef;
         }
@@ -354,12 +356,18 @@ sub parse {
   my $self = $_[0];
 
   local *OUT = $_[1];
-  my $form = $self->{"form"};
+  my $form = $self->{form};
 
   close(OUT);
 
+  my $is_qr_bill = $::instance_conf->get_create_qrbill_invoices &&
+                   ($form->{formname} eq 'invoice' ||
+                    $form->{formname} eq 'invoice_for_advance_payment') &&
+                   $form->{template_meta}->{printer}->{template_code} =~ m/qr/ ?
+                   1 : 0;
+
   my $qr_image_path;
-  if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') {
+  if ($is_qr_bill) {
     # the biller account information, biller address and the reference number,
     # are needed in the template aswell as in the qr-code generation, therefore
     # assemble these and add to $::form
@@ -367,22 +375,22 @@ sub parse {
   }
 
   my $file_name;
-  if ($form->{"IN"} =~ m|^/|) {
-    $file_name = $form->{"IN"};
+  if ($form->{IN} =~ m|^/|) {
+    $file_name = $form->{IN};
   } else {
-    $file_name = $form->{"templates"} . "/" . $form->{"IN"};
+    $file_name = $form->{templates} . "/" . $form->{IN};
   }
 
   my $zip = Archive::Zip->new();
   if (Archive::Zip->AZ_OK != $zip->read($file_name)) {
-    $self->{"error"} = "File not found/is not a OpenDocument file.";
+    $self->{error} = "File not found/is not a OpenDocument file.";
     $main::lxdebug->leave_sub();
     return 0;
   }
 
   my $contents = Encode::decode('utf-8-strict', $zip->contents("content.xml"));
   if (!$contents) {
-    $self->{"error"} = "File is not a OpenDocument file.";
+    $self->{error} = "File is not a OpenDocument file.";
     $main::lxdebug->leave_sub();
     return 0;
   }
@@ -435,7 +443,7 @@ sub parse {
     $zip->contents("styles.xml", Encode::encode('utf-8-strict', $new_styles));
   }
 
-  if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') {
+  if ($is_qr_bill) {
     # get placeholder path from odt XML
     my $qr_placeholder_path;
     my $dom = XML::LibXML->load_xml(string => $contents);
@@ -457,10 +465,10 @@ sub parse {
     );
   }
 
-  $zip->writeToFileNamed($form->{"tmpfile"}, 1);
+  $zip->writeToFileNamed($form->{tmpfile}, 1);
 
   my $res = 1;
-  if ($form->{"format"} =~ /pdf/) {
+  if ($form->{format} =~ /pdf/) {
     $res = $self->convert_to_pdf();
   }
 
@@ -468,256 +476,125 @@ sub parse {
   return $res;
 }
 
-sub get_qrbill_account {
-  $main::lxdebug->enter_sub();
-  my ($self) = @_;
-
-  my $qr_account;
-
-  my $bank_accounts     = SL::DB::Manager::BankAccount->get_all;
-  $qr_account = scalar(@{ $bank_accounts }) == 1 ?
-    $bank_accounts->[0] :
-    first { $_->use_for_qrbill } @{ $bank_accounts };
-
-  if (!$qr_account) {
-    $::form->error($::locale->text('No bank account flagged for QRBill usage was found.'));
-  }
-
-  $main::lxdebug->leave_sub();
-  return $qr_account;
-}
-
-sub remove_letters_prefix {
-  my $s = $_[0];
-  $s =~ s/^[a-zA-Z]+//;
-  return $s;
-}
-
-sub check_digits_and_max_length {
-  my $s = $_[0];
-  my $length = $_[1];
-
-  return 0 if (!($s =~ /^\d*$/) || length($s) > $length);
-  return 1;
-}
-
-sub calculate_check_digit {
-  # calculate ESR check digit using algorithm: "modulo 10, recursive"
-  my $ref_number_str = $_[0];
-
-  my @m = (0, 9, 4, 6, 8, 2, 7, 1, 3, 5);
-  my $carry = 0;
-
-  my @ref_number_split = map int($_), split(//, $ref_number_str);
-
-  for my $v (@ref_number_split) {
-    $carry = @m[($carry + $v) % 10];
-  }
-
-  return (10 - $carry) % 10;
-}
-
-sub assemble_ref_number {
-  $main::lxdebug->enter_sub();
-
-  my $bank_id = $_[0];
-  my $customer_number = $_[1];
-  my $order_number = $_[2] // "0";
-  my $invoice_number = $_[3] // "0";
-
-  # check values (analog to checks in makro)
-  # - bank_id
-  #     input: 6 digits, only numbers
-  #     output: 6 digits, only numbers
-  if (!($bank_id =~ /^\d*$/) || length($bank_id) != 6) {
-    $::form->error($::locale->text('Bank account id number invalid. Must be 6 digits.'));
-  }
-
-  # - customer_number
-  #     input: prefix (letters) + up to 6 digits (numbers)
-  #     output: prefix removed, 6 digits, filled with leading zeros
-  $customer_number = remove_letters_prefix($customer_number);
-  if (!check_digits_and_max_length($customer_number, 6)) {
-    $::form->error($::locale->text('Customer number invalid. Must be less then or equal to 6 digits after prefix.'));
-  }
-  # fill with zeros
-  $customer_number = sprintf "%06d", $customer_number;
-
-  # - order_number
-  #     input: prefix (letters) + up to 7 digits, may be zero
-  #     output: prefix removed, 7 digits, filled with leading zeros
-  $order_number = remove_letters_prefix($order_number);
-  if (!check_digits_and_max_length($order_number, 7)) {
-    $::form->error($::locale->text('Order number invalid. Must be less then or equal to 7 digits after prefix.'));
-  }
-  # fill with zeros
-  $order_number = sprintf "%07d", $order_number;
-
-  # - invoice_number
-  #     input: prefix (letters) + up to 7 digits, may be zero
-  #     output: prefix removed, 7 digits, filled with leading zeros
-  $invoice_number = remove_letters_prefix($invoice_number);
-  if (!check_digits_and_max_length($invoice_number, 7)) {
-    $::form->error($::locale->text('Invoice number invalid. Must be less then or equal to 7 digits after prefix.'));
-  }
-  # fill with zeros
-  $invoice_number = sprintf "%07d", $invoice_number;
-
-  # assemble ref. number
-  my $ref_number = $bank_id . $customer_number . $order_number . $invoice_number;
-
-  # calculate check digit
-  my $ref_number_cpl = $ref_number . calculate_check_digit($ref_number);
-
-  $main::lxdebug->leave_sub();
-  return $ref_number_cpl;
-}
-
-sub get_ref_number_formatted {
-  $main::lxdebug->enter_sub();
-
-  my $ref_number = $_[0];
-
-  # create ref. number in format:
-  # 'XX XXXXX XXXXX XXXXX XXXXX XXXXX' (2 digits + 5 x 5 digits)
-  my $ref_number_spaced = substr($ref_number, 0, 2) . ' ' .
-                          substr($ref_number, 2, 5) . ' ' .
-                          substr($ref_number, 7, 5) . ' ' .
-                          substr($ref_number, 12, 5) . ' ' .
-                          substr($ref_number, 17, 5) . ' ' .
-                          substr($ref_number, 22, 5);
-
-  $main::lxdebug->leave_sub();
-  return $ref_number_spaced;
-}
-
-sub get_iban_formatted {
-  $main::lxdebug->enter_sub();
-
-  my $iban = $_[0];
-
-  # create iban number in format:
-  # 'XXXX XXXX XXXX XXXX XXXX X' (5 x 4 + 1digits)
-  my $iban_spaced = substr($iban, 0, 4) . ' ' .
-                    substr($iban, 4, 4) . ' ' .
-                    substr($iban, 8, 4) . ' ' .
-                    substr($iban, 12, 4) . ' ' .
-                    substr($iban, 16, 4) . ' ' .
-                    substr($iban, 20, 1);
-
-  $main::lxdebug->leave_sub();
-  return $iban_spaced;
-}
-
-sub get_amount_formatted {
-  $main::lxdebug->enter_sub();
-
-  unless ($_[0] =~ /^\d+\.\d{2}$/) {
-    $::form->error($::locale->text('Amount has wrong format.'));
-  }
-
-  local $_ = shift;
-  $_ = reverse split //;
-  m/^\d{2}\./g;
-  s/\G(\d{3})(?=\d)/$1 /g;
-
-  $main::lxdebug->leave_sub();
-  return scalar reverse split //;
-}
-
 sub generate_qr_code {
   $main::lxdebug->enter_sub();
   my $self = $_[0];
-  my $form = $self->{"form"};
+  my $form = $self->{form};
 
   # assemble data for QR-Code
 
-  # get qr-account data
-  my $qr_account = $self->get_qrbill_account();
+  if (!$form->{qrbill_iban}) {
+    $::form->error($::locale->text('No bank account flagged for QRBill usage was found.'));
+  }
 
   my %biller_information = (
-    'iban' => $qr_account->{'iban'}
+    iban => $form->{qrbill_iban}
   );
 
-  my $biller_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code(
-    $::instance_conf->get_address_country()
-  );
-  if (!$biller_countrycode) {
+  if (!$form->{qrbill_biller_countrycode}) {
     $::form->error($::locale->text('Error mapping biller countrycode.'));
   }
   my %biller_data = (
-    'address_type' => 'K',
-    'company' => $::instance_conf->get_company(),
-    'address_row1' => $::instance_conf->get_address_street1(),
-    'address_row2' => $::instance_conf->get_address_zipcode() . ' ' . $::instance_conf->get_address_city(),
-    'countrycode' => $biller_countrycode,
+    address_type => 'S',
+    company => $::instance_conf->get_company(),
+    street => get_street_name_from_address_line($::instance_conf->get_address_street1()),
+    street_no => get_building_number_from_address_line($::instance_conf->get_address_street1()),
+    postalcode => $::instance_conf->get_address_zipcode(),
+    city => $::instance_conf->get_address_city(),
+    countrycode => $form->{qrbill_biller_countrycode},
   );
 
-  my $amount;
-  if ($form->{'qrbill_without_amount'}) {
+  my ($amount, $amount_formatted);
+  if ($form->{qrbill_without_amount}) {
     $amount = '';
+    $amount_formatted = '';
   } else {
-    $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'}));
+    $amount = $form->{qrbill_amount};
+
+    # format amount for template
+    $amount_formatted = get_amount_formatted($amount);
+    if (!$amount_formatted) {
+      $::form->error($::locale->text('Amount has wrong format.'));
+    }
   }
 
   my %payment_information = (
-    'amount' => $amount,
-    'currency' => $form->{'currency'},
+    amount => $amount,
+    currency => $form->{currency},
   );
 
-  my $customer_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($form->{'country'});
-  if (!$customer_countrycode) {
+  # get address data from billing address if given, otherwise from invoice
+  my $street_name = get_street_name_from_address_line($form->{billing_address_id} ?
+      $form->{billing_address_street} :
+      $form->{street});
+  my $building_number = get_building_number_from_address_line($form->{billing_address_id} ?
+      $form->{billing_address_street} :
+      $form->{street});
+  my $postalcode = $form->{billing_address_id} ?
+      $form->{billing_address_zipcode} :
+      $form->{zipcode};
+  my $city = $form->{billing_address_id} ?
+      $form->{billing_address_city} :
+      $form->{city};
+
+  # validate address data
+  if ($postalcode !~ m/^\d{4,}$/) {
+    $::form->error($::locale->text('Zipcode missing or wrong format.'));
+  }
+  if (!$city) {
+    $::form->error($::locale->text('No city given.'));
+  }
+  if (!$form->{qrbill_customer_countrycode}) {
     $::form->error($::locale->text('Error mapping customer countrycode.'));
   }
+
   my %invoice_recipient_data = (
-    'address_type' => 'K',
-    'name' => $form->{'name'},
-    'address_row1' => $form->{'street'},
-    'address_row2' => $form->{'zipcode'} . ' ' . $form->{'city'},
-    'countrycode' => $customer_countrycode,
+    address_type => 'S',
+    name => $form->{billing_address_id} ?
+              $form->{billing_address_name} :
+              $form->{name},
+    street => $street_name,
+    street_no => $building_number,
+    postalcode => $postalcode,
+    city => $city,
+    countrycode => $form->{qrbill_customer_countrycode},
   );
 
   my %ref_nr_data;
   if ($::instance_conf->get_create_qrbill_invoices == 1) {
-    # generate ref.-no. with check digit
-    my $ref_number = assemble_ref_number(
-      $qr_account->{'bank_account_id'},
-      $form->{'customernumber'},
-      $form->{'ordnumber'},
-      $form->{'invnumber'},
-    );
+    # fill reference number with zeros when printing preview (before booking)
+    my $reference_number = $form->{id} ? $form->{qr_reference} : '0' x 27;
+
     %ref_nr_data = (
-      'type' => 'QRR',
-      'ref_number' => $ref_number,
+      type => 'QRR',
+      ref_number => $reference_number,
     );
     # get ref. number/iban formatted with spaces and set into form for template
     # processing
-    $form->{'ref_number'} = $ref_number;
-    $form->{'ref_number_formatted'} = get_ref_number_formatted($ref_number);
+    $form->{ref_number} = $reference_number;
+    $form->{ref_number_formatted} = get_ref_number_formatted($reference_number);
   } elsif ($::instance_conf->get_create_qrbill_invoices == 2) {
     %ref_nr_data = (
-      'type' => 'NON',
-      'ref_number' => '',
+      type => 'NON',
+      ref_number => '',
     );
   } else {
     $::form->error($::locale->text('Error getting QR-Bill type.'));
   }
 
-  # set into form for template processing
-  $form->{'biller_information'} = \%biller_information;
-  $form->{'biller_data'} = \%biller_data;
-  $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'});
-
-  # format amount for template
-  $form->{'amount_formatted'} = get_amount_formatted(
-    sprintf(
-      "%.2f",
-      $form->parse_amount(\%::myconfig, $form->{'total'})
-    )
+  my %additional_information = (
+    unstructured_message => $form->{qr_unstructured_message}
   );
 
+  # set into form for template processing
+  $form->{biller_information} = \%biller_information;
+  $form->{biller_data} = \%biller_data;
+  $form->{iban_formatted} = get_iban_formatted($form->{qrbill_iban});
+  $form->{amount_formatted} = $amount_formatted;
+  $form->{unstructured_message} = $form->{qr_unstructured_message};
+
   # set outfile
-  my $outfile = $form->{"tmpdir"} . '/' . 'qr-code.png';
+  my $outfile = $form->{tmpdir} . '/' . 'qr-code.png';
 
   # generate QR-Code Image
   eval {
@@ -727,6 +604,7 @@ sub generate_qr_code {
      \%payment_information,
      \%invoice_recipient_data,
      \%ref_nr_data,
+     \%additional_information
    );
    $qr_image->generate($outfile);
   } or do {
@@ -738,133 +616,6 @@ sub generate_qr_code {
   return $outfile;
 }
 
-sub is_xvfb_running {
-  $main::lxdebug->enter_sub();
-
-  my ($self) = @_;
-
-  local *IN;
-  my $dfname = $self->{"userspath"} . "/xvfb_display";
-  my $display;
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "    Looking for $dfname\n");
-  if ((-f $dfname) && open(IN, $dfname)) {
-    my $pid = <IN>;
-    chomp($pid);
-    $display = <IN>;
-    chomp($display);
-    my $xauthority = <IN>;
-    chomp($xauthority);
-    close(IN);
-
-    $main::lxdebug->message(LXDebug->DEBUG2(), "      found with $pid and $display\n");
-
-    if ((! -d "/proc/$pid") || !open(IN, "/proc/$pid/cmdline")) {
-      $main::lxdebug->message(LXDebug->DEBUG2(), "  no/wrong process #1\n");
-      unlink($dfname, $xauthority);
-      $main::lxdebug->leave_sub();
-      return undef;
-    }
-    my $line = <IN>;
-    close(IN);
-    if ($line !~ /xvfb/i) {
-      $main::lxdebug->message(LXDebug->DEBUG2(), "      no/wrong process #2\n");
-      unlink($dfname, $xauthority);
-      $main::lxdebug->leave_sub();
-      return undef;
-    }
-
-    $ENV{"XAUTHORITY"} = $xauthority;
-    $ENV{"DISPLAY"} = $display;
-  } else {
-    $main::lxdebug->message(LXDebug->DEBUG2(), "      not found\n");
-  }
-
-  $main::lxdebug->leave_sub();
-
-  return $display;
-}
-
-sub spawn_xvfb {
-  $main::lxdebug->enter_sub();
-
-  my ($self) = @_;
-
-  $main::lxdebug->message(LXDebug->DEBUG2, "spawn_xvfb()\n");
-
-  my $display = $self->is_xvfb_running();
-
-  if ($display) {
-    $main::lxdebug->leave_sub();
-    return $display;
-  }
-
-  $display = 99;
-  while ( -f "/tmp/.X${display}-lock") {
-    $display++;
-  }
-  $display = ":${display}";
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  display $display\n");
-
-  my $mcookie = `mcookie`;
-  die("Installation error: mcookie not found.") if ($? != 0);
-  chomp($mcookie);
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  mcookie $mcookie\n");
-
-  my $xauthority = "/tmp/.Xauthority-" . $$ . "-" . time() . "-" . int(rand(9999999));
-  $ENV{"XAUTHORITY"} = $xauthority;
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  xauthority $xauthority\n");
-
-  if (system("xauth add \"${display}\" . \"${mcookie}\"") == -1) {
-    die "system call to xauth failed: $!";
-  }
-  if ($? != 0) {
-    $self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started (xauth: $!)";
-    $main::lxdebug->leave_sub();
-    return undef;
-  }
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  about to fork()\n");
-
-  my $pid = fork();
-  if (0 == $pid) {
-    $main::lxdebug->message(LXDebug->DEBUG2(), "  Child execing\n");
-    exec($::lx_office_conf{applications}->{xvfb}, $display, "-screen", "0", "640x480x8", "-nolisten", "tcp");
-  }
-  sleep(3);
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  parent dont sleeping\n");
-
-  local *OUT;
-  my $dfname = $self->{"userspath"} . "/xvfb_display";
-  if (!open(OUT, ">", $dfname)) {
-    $self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started ($dfname: $!)";
-    unlink($xauthority);
-    kill($pid);
-    $main::lxdebug->leave_sub();
-    return undef;
-  }
-  print(OUT "$pid\n$display\n$xauthority\n");
-  close(OUT);
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  parent re-testing\n");
-
-  if (!$self->is_xvfb_running()) {
-    $self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started.";
-    unlink($xauthority, $dfname);
-    kill($pid);
-    $main::lxdebug->leave_sub();
-    return undef;
-  }
-
-  $main::lxdebug->message(LXDebug->DEBUG2(), "  spawn OK\n");
-
-  $main::lxdebug->leave_sub();
-
-  return $display;
-}
-
 sub _run_python_uno {
   my ($self, @args) = @_;
 
@@ -927,9 +678,9 @@ sub spawn_openoffice {
         my $ssres = setsid();
         $main::lxdebug->message(LXDebug->DEBUG2(), "  Child execing\n");
         my @cmdline = ($::lx_office_conf{applications}->{openofficeorg_writer},
-                       "-minimized", "-norestore", "-nologo", "-nolockcheck",
-                       "-headless",
-                       "-accept=socket,host=localhost,port=" .
+                       "--minimized", "--norestore", "--nologo", "--nolockcheck",
+                       "--headless",
+                       "--accept=socket,host=localhost,port=" .
                        $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;");
         exec(@cmdline);
       } else {
@@ -948,7 +699,7 @@ sub spawn_openoffice {
   }
 
   if (!$res) {
-    $self->{"error"} = "Conversion from OpenDocument to PDF failed because " .
+    $self->{error} = "Conversion from OpenDocument to PDF failed because " .
       "OpenOffice could not be started.";
   }
 
@@ -962,30 +713,27 @@ sub convert_to_pdf {
 
   my ($self) = @_;
 
-  my $form = $self->{"form"};
+  my $form = $self->{form};
 
-  my $filename = $form->{"tmpfile"};
+  my $filename = $form->{tmpfile};
   $filename =~ s/.odt$//;
   if (substr($filename, 0, 1) ne "/") {
     $filename = getcwd() . "/${filename}";
   }
 
-  if (substr($self->{"userspath"}, 0, 1) eq "/") {
-    $ENV{'HOME'} = $self->{"userspath"};
+  if (substr($self->{userspath}, 0, 1) eq "/") {
+    $ENV{HOME} = $self->{userspath};
   } else {
-    $ENV{'HOME'} = getcwd() . "/" . $self->{"userspath"};
+    $ENV{HOME} = getcwd() . "/" . $self->{userspath};
   }
 
-  if (!$self->spawn_xvfb()) {
-    $main::lxdebug->leave_sub();
-    return 0;
-  }
+  my $outdir = dirname($filename);
 
   if (!$::lx_office_conf{print_templates}->{openofficeorg_daemon}) {
     if (system($::lx_office_conf{applications}->{openofficeorg_writer},
-               "-minimized", "-norestore", "-nologo", "-nolockcheck", "-headless",
-               "file:${filename}.odt",
-               "macro://" . (split('/', $filename))[-1] . "/Standard.Conversion.ConvertSelfToPDF()") == -1) {
+               "--minimized", "--norestore", "--nologo", "--nolockcheck", "--headless",
+               "--convert-to", "pdf", "--outdir", $outdir,
+               "file:${filename}.odt") == -1) {
       die "system call to $::lx_office_conf{applications}->{openofficeorg_writer} failed: $!";
     }
   } else {
@@ -999,7 +747,7 @@ sub convert_to_pdf {
 
   my $res = $?;
   if ((0 == $?) || (-f "${filename}.pdf" && -s "${filename}.pdf")) {
-    $form->{"tmpfile"} =~ s/odt$/pdf/;
+    $form->{tmpfile} =~ s/odt$/pdf/;
 
     unlink($filename . ".odt");
 
@@ -1009,7 +757,7 @@ sub convert_to_pdf {
   }
 
   unlink($filename . ".odt", $filename . ".pdf");
-  $self->{"error"} = "Conversion from OpenDocument to PDF failed. " .
+  $self->{error} = "Conversion from OpenDocument to PDF failed. " .
     "Exit code: $res";
 
   $main::lxdebug->leave_sub();
@@ -1030,7 +778,7 @@ sub format_string {
 sub get_mime_type() {
   my ($self) = @_;
 
-  if ($self->{"form"}->{"format"} =~ /pdf/) {
+  if ($self->{form}->{format} =~ /pdf/) {
     return "application/pdf";
   } else {
     return "application/vnd.oasis.opendocument.text";
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index abb604693..71489104c 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -72,6 +72,7 @@ sub hidden_tag    { return _call_presenter('hidden_tag',    @_); }
 sub select_tag    { return _call_presenter('select_tag',    @_); }
 sub checkbox_tag  { return _call_presenter('checkbox_tag',  @_); }
 sub input_tag     { return _call_presenter('input_tag',     @_); }
+sub input_tag_trim{ return _call_presenter('input_tag_trim',@_); }
 sub javascript    { return _call_presenter('javascript',    @_); }
 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }
@@ -87,6 +88,7 @@ sub radio_button_tag         { return _call_presenter('radio_button_tag',
 sub img_tag                  { return _call_presenter('img_tag',                  @_); }
 sub restricted_html          { return _call_presenter('restricted_html',          @_); }
 sub stripped_html            { return _call_presenter('stripped_html',            @_); }
+sub multi_level_select_tag   { return _call_presenter('multi_level_select_tag',   @_); }
 
 sub _set_id_attribute {
   my ($attributes, $name, $unique) = @_;
@@ -228,9 +230,9 @@ sub areainput_tag {
 
   return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1;
 
-  return '<span>'
+  return '<span class="area-input">'
     . $self->input_tag($name, $value, %attributes, size => $cols)
-    . "<img src=\"image/edit-entry.png\" onclick=\"kivi.switch_areainput_to_textarea('${id}')\" style=\"margin-left: 2px;\">"
+    . "<span class=\"switch-to-textarea\" onclick=\"kivi.switch_areainput_to_textarea('${id}')\"></span>"
     . '</span>';
 }
 
@@ -426,6 +428,8 @@ The following functions are just forwarded to L<SL::Presenter::Tag>:
 
 =item * C<input_tag $name, $value, %attributes>
 
+=item * C<input_tag_trim $name, $value, %attributes>
+
 =item * C<hidden_tag $name, $value, %attributes>
 
 =item * C<checkbox_tag $name, %attributes>
diff --git a/SL/TransNumber.pm b/SL/TransNumber.pm
index b6fa365e8..e19c111ec 100644
--- a/SL/TransNumber.pm
+++ b/SL/TransNumber.pm
@@ -17,7 +17,7 @@ use Rose::Object::MakeMethods::Generic
 );
 
 my @SUPPORTED_TYPES = (
-  qw(invoice invoice_for_advance_payment final_invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order purchase_order sales_quotation request_quotation part service assembly assortment letter),
+  qw(invoice invoice_for_advance_payment final_invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order_intake sales_order purchase_order purchase_order_confirmation sales_quotation request_quotation purchase_quotation_intake part service assembly assortment letter),
   @{ SL::DB::DeliveryOrder::TypeData::valid_types() },
 );
 
@@ -52,10 +52,10 @@ sub _get_filters {
     $filters{table}         = $type;
 
   } elsif ($type =~ /_delivery_order$/ && SL::DB::DeliveryOrder::TypeData::is_valid_type($type)) {
-    $filters{trans_number}  = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'nr_key'),
-    $filters{numberfield}   = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'transnumber'),
+    $filters{trans_number}  = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'nr_key');
+    $filters{numberfield}   = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'transnumber');
     $filters{table}         = "delivery_orders";
-    $filters{where}         = "order_type = ?";
+    $filters{where}         = "record_type = ?";
     $filters{values}        = [ $::form->{type} ];
 
   } elsif ($type =~ /_order$/) {
@@ -65,6 +65,20 @@ sub _get_filters {
     $filters{where}         = 'NOT COALESCE(quotation, FALSE)';
     $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
 
+  } elsif ($type =~ /^sales_order_intake$/) {
+    $filters{trans_number}  = "ordnumber";
+    $filters{numberfield}   = "soinumber";
+    $filters{table}         = "oe";
+    $filters{where}         = 'NOT COALESCE(quotation, FALSE)';
+    $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
+
+  } elsif ($type =~ /^purchase_order_confirmation$/) {
+    $filters{trans_number}  = "ordnumber";
+    $filters{numberfield}   = "pocnumber";
+    $filters{table}         = "oe";
+    $filters{where}         = 'record_type = ?';
+    $filters{values}        = $type;
+
   } elsif ($type =~ /_quotation$/) {
     $filters{trans_number}  = "quonumber";
     $filters{numberfield}   = $type eq 'sales_quotation' ? "sqnumber" : "rfqnumber";
@@ -72,6 +86,12 @@ sub _get_filters {
     $filters{where}         = 'COALESCE(quotation, FALSE)';
     $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
 
+  } elsif ($type =~ /^purchase_quotation_intake$/) {
+    $filters{trans_number}  = "quonumber";
+    $filters{numberfield}   = "pqinumber";
+    $filters{table}         = "oe";
+    $filters{where}         = 'COALESCE(quotation, FALSE) AND (vendor_id IS NOT NULL)';
+
   } elsif ($type =~ /^(part|service|assembly|assortment)$/) {
     $filters{trans_number}  = "partnumber";
     my %numberfield_hash = ( service    => 'servicenumber',
diff --git a/SL/User.pm b/SL/User.pm
index 68fd2c520..77feaefd9 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -541,7 +541,7 @@ sub get_default_myconfig {
     css_path     => 'css',      # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user
     dateformat   => $defaults->dateformat('dd.mm.yy'),
     numberformat => $defaults->numberformat('1.000,00'),
-    stylesheet   => $defaults->stylesheet('kivitendo.css'),
+    stylesheet   => $defaults->stylesheet($::lx_office_conf{system}{stylesheet}),
     timeformat   => $defaults->timeformat('hh:mm'),
     %user_config,
   );
diff --git a/SL/VK.pm b/SL/VK.pm
index 5a3db9cdc..667f065b2 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -163,7 +163,7 @@ sub invoice_transactions {
   }
   if ($form->{project_id}) {
     $where .=
-      qq|AND ((ar.globalproject_id = ?) OR EXISTS | .
+      qq| AND ((ar.globalproject_id = ?) OR EXISTS | .
       qq|  (SELECT * FROM invoice i | .
       qq|   WHERE i.project_id = ? AND i.trans_id = ar.id))|;
     push(@values, $form->{"project_id"}, $form->{"project_id"});
@@ -202,4 +202,3 @@ sub invoice_transactions {
 }
 
 1;
-
diff --git a/SL/WH.pm b/SL/WH.pm
index 52e174ff0..44c40d6d6 100644
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -36,6 +36,7 @@
 package WH;
 
 use Carp qw(croak);
+use List::MoreUtils qw(any);
 
 use SL::AM;
 use SL::DBUtils;
@@ -269,7 +270,7 @@ sub get_warehouse_journal {
 
   # if of a property number or description is requested,
   # automatically check the matching id too.
-  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
+  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
 
   # customize shown entry for not available fields.
   $filter{na} = '-' unless $filter{na};
@@ -319,32 +320,32 @@ sub get_warehouse_journal {
   }
 
   $select_tokens{'trans'} = {
-     "parts_id"             => "i1.parts_id",
-     "qty"                  => "ABS(SUM(i1.qty))",
-     "partnumber"           => "p.partnumber",
-     "partdescription"      => "p.description",
-     "classification_id"    => "p.classification_id",
-     "part_type"            => "p.part_type",
-     "bindescription"       => "b.description",
-     "chargenumber"         => "i1.chargenumber",
-     "bestbefore"           => "i1.bestbefore",
-     "warehousedescription" => "w.description",
-     "partunit"             => "p.unit",
-     "bin_from"             => "b1.description",
-     "bin_to"               => "b2.description",
-     "warehouse_from"       => "w1.description",
-     "warehouse_to"         => "w2.description",
-     "comment"              => "i1.comment",
-     "trans_type"           => "tt.description",
-     "trans_id"             => "i1.trans_id",
-     "id"                   => "i1.id",
-     "oe_id"                => "COALESCE(i1.oe_id, i2.oe_id)",
-     "invoice_id"           => "COALESCE(i1.invoice_id, i2.invoice_id)",
-     "date"                 => "i1.shippingdate",
-     "itime"                => "i1.itime",
-     "shippingdate"         => "i1.shippingdate",
-     "employee"             => "e.name",
-     "projectnumber"        => "COALESCE(pr.projectnumber, '$filter{na}')",
+     "parts_id"          => "i1.parts_id",
+     "qty"               => "ABS(SUM(i1.qty))",
+     "partnumber"        => "p.partnumber",
+     "partdescription"   => "p.description",
+     "classification_id" => "p.classification_id",
+     "part_type"         => "p.part_type",
+     "bin"               => "b.description",
+     "chargenumber"      => "i1.chargenumber",
+     "bestbefore"        => "i1.bestbefore",
+     "warehouse"         => "w.description",
+     "partunit"          => "p.unit",
+     "bin_from"          => "b1.description",
+     "bin_to"            => "b2.description",
+     "warehouse_from"    => "w1.description",
+     "warehouse_to"      => "w2.description",
+     "comment"           => "i1.comment",
+     "trans_type"        => "tt.description",
+     "trans_id"          => "i1.trans_id",
+     "id"                => "i1.id",
+     "oe_id"             => "COALESCE(i1.oe_id, i2.oe_id)",
+     "invoice_id"        => "COALESCE(i1.invoice_id, i2.invoice_id)",
+     "date"              => "i1.shippingdate",
+     "itime"             => "i1.itime",
+     "shippingdate"      => "i1.shippingdate",
+     "employee"          => "e.name",
+     "projectnumber"     => "COALESCE(pr.projectnumber, '$filter{na}')",
      };
 
   $select_tokens{'out'} = {
@@ -427,10 +428,7 @@ sub get_warehouse_journal {
   if ($form->{l_oe_id}) {
     $q_oe_id = <<SQL;
       SELECT dord.id AS id, dord.donumber AS number,
-        CASE
-          WHEN dord.customer_id IS NULL THEN 'purchase_delivery_order'
-          ELSE                               'sales_delivery_order'
-        END AS type
+      dord.record_type::text AS type
       FROM delivery_orders dord
       WHERE dord.id = ?
 
@@ -519,7 +517,7 @@ sub get_warehouse_report {
   # filters
   my (@filter_ary, @filter_vars, @wh_bin_filter_ary, @wh_bin_filter_vars);
 
-  delete $form->{include_empty_bins} unless ($form->{l_warehousedescription} || $form->{l_bindescription});
+  delete $form->{include_empty_bins} unless ($form->{l_warehouse} || $form->{l_bin});
 
   if ($filter{warehouse_id}) {
     push @wh_bin_filter_ary,  "w.id = ?";
@@ -600,7 +598,7 @@ sub get_warehouse_report {
 
   # if of a property number or description is requested,
   # automatically check the matching id too.
-  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
+  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
 
   # make order, search in $filter and $form
   my $sort_col    =  $form->{sort};
@@ -628,20 +626,22 @@ sub get_warehouse_report {
      "partdescription"      => "p.description",
      "classification_id"    => "p.classification_id",
      "part_type"            => "p.part_type",
-     "bindescription"       => "b.description",
+     "bin"                  => "b.description",
      "binid"                => "b.id",
      "chargenumber"         => "i.chargenumber",
      "bestbefore"           => "i.bestbefore",
      "ean"                  => "p.ean",
      "chargeid"             => "c.id",
-     "warehousedescription" => "w.description",
+     "warehouse"            => "w.description",
      "partunit"             => "p.unit",
      "stock_value"          => ($form->{stock_value_basis} // '') eq 'list_price' ? "p.listprice / COALESCE(pfac.factor, 1)" : "p.lastcost / COALESCE(pfac.factor, 1)",
      "purchase_price"       => "p.lastcost",
      "list_price"           => "p.listprice",
+     "price_factor"         => ($form->{l_purchase_price} || $form->{l_list_price}) ? "pfac.description" : undef,
   );
   $form->{l_classification_id}  = 'Y';
   $form->{l_part_type}          = 'Y';
+  $form->{l_price_factor}       = 'Y' if $form->{l_purchase_price} || $form->{l_list_price};
 
   my $select_clause = join ', ', map { +/^l_/; "$select_tokens{$'} AS $'" }
         ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form),
@@ -651,14 +651,45 @@ sub get_warehouse_report {
         ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form),
           qw(l_parts_id l_partunit) );
 
+  my @join_values = ();
   my %join_tokens = (
-    "stock_value" => "LEFT JOIN price_factors pfac ON (p.price_factor_id = pfac.id)",
-    );
+    "stock_value"  => "LEFT JOIN price_factors pfac ON (p.price_factor_id = pfac.id)",
+  );
+  $join_tokens{price_factor} = "LEFT JOIN price_factors pfac ON (p.price_factor_id = pfac.id)" if !$form->{l_stock_value};
 
   my $joins = join ' ', grep { $_ } map { +/^l_/; $join_tokens{"$'"} }
         ( grep( { !/qty/ and !/^l_cvar/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form),
           qw(l_parts_id l_qty l_partunit) );
 
+  # add cvar for sorting
+  if (($form->{sort} // '') =~ /^cvar_/) {
+    my $sort_name = $form->{sort};
+    my $cvar_name = $sort_name;
+    $cvar_name =~ s/^cvar_//;
+    my $cvar_configs = CVar->get_configs('module' => 'IC');
+    my @allowed_cvar_names =
+      map {$_->{name}}
+      grep {$_->{type} =~ m/text|textfield|htmlfield/}
+      @$cvar_configs;
+    unless (any {$sort_name eq 'cvar_' . $_} @allowed_cvar_names) {
+      die "unsupported sort on cvar field";
+    }
+
+    $select_clause .= ", cvar_fields.$sort_name";
+    $group_clause  .= ", cvar_fields.$sort_name";
+    $joins .= qq|
+      LEFT JOIN (
+        SELECT text_value as $sort_name, trans_id
+        FROM custom_variable_configs cvar_cfg
+        LEFT JOIN custom_variables cvar
+        ON (cvar_cfg.module = 'IC' AND cvar_cfg.name = ?
+            AND cvar_cfg.id = cvar.config_id)
+      ) cvar_fields ON (cvar_fields.trans_id = p.id)
+      |;
+    push @join_values, $cvar_name
+  }
+  @filter_vars = (@join_values, @filter_vars);
+
   my ($cvar_where, @cvar_values) = CVar->build_filter_query(
     module         => 'IC',
     trans_id_field => 'p.id',
@@ -724,8 +755,8 @@ sub get_warehouse_report {
   if ($form->{include_empty_bins}) {
     $query =
       qq|SELECT
-           w.id AS warehouseid, w.description AS warehousedescription,
-           b.id AS binid, b.description AS bindescription
+           w.id AS warehouseid, w.description AS warehouse,
+           b.id AS binid, b.description AS bin
          FROM bin b
          LEFT JOIN warehouse w ON (b.warehouse_id = w.id)|;
 
@@ -748,7 +779,7 @@ sub get_warehouse_report {
     }
     $sth->finish();
 
-    if (grep { $orderby eq $_ } qw(bindescription warehousedescription)) {
+    if (grep { $orderby eq $_ } qw(bin warehouse)) {
       @contents = sort { ($a->{$orderby} cmp $b->{$orderby}) * (($form->{order}) ? 1 : -1) } @contents;
     }
   }
diff --git a/SL/Webdav.pm b/SL/Webdav.pm
index 85f6249ad..3b4c31487 100644
--- a/SL/Webdav.pm
+++ b/SL/Webdav.pm
@@ -18,13 +18,18 @@ use Rose::Object::MakeMethods::Generic (
 
 my %type_to_path = (
   sales_quotation             => 'angebote',
+  sales_order_intake          => 'auftragseingaenge',
   sales_order                 => 'bestellungen',
   request_quotation           => 'anfragen',
+  purchase_quotation_intake   => 'angebotseingaenge',
   purchase_order              => 'lieferantenbestellungen',
+  purchase_order_confirmation => 'lieferantenauftragsbestaetigungen',
   sales_delivery_order        => 'verkaufslieferscheine',
   purchase_delivery_order     => 'einkaufslieferscheine',
   supplier_delivery_order     => 'beistelllieferscheine',
   rma_delivery_order          => 'retourenlieferscheine',
+  purchase_reclamation        => 'einkaufsreklamation',
+  sales_reclamation           => 'verkaufsreklamation',
   credit_note                 => 'gutschriften',
   invoice                     => 'rechnungen',
   invoice_for_advance_payment => 'rechnungen',
diff --git a/SL/X.pm b/SL/X.pm
index e1707cd0e..185bd7696 100644
--- a/SL/X.pm
+++ b/SL/X.pm
@@ -43,6 +43,14 @@ use Exception::Class (
     isa                 => 'SL::X::Base',
     fields              => [ qw(code) ],
   },
+  'SL::X::Inventory::Allocation::MissingQty' => {
+    isa                 => 'SL::X::Inventory::Allocation',
+    fields              => [ qw(code part_description to_allocate_qty missing_qty) ],
+  },
+  'SL::X::Inventory::Allocation::Multi' => {
+    isa                 => 'SL::X::Inventory::Allocation',
+    fields              => [ qw(errors) ],
+  },
 );
 
 1;
diff --git a/SL/XMLInvoice.pm b/SL/XMLInvoice.pm
new file mode 100644
index 000000000..2e2bf494b
--- /dev/null
+++ b/SL/XMLInvoice.pm
@@ -0,0 +1,113 @@
+package SL::XMLInvoice;
+
+use strict;
+use warnings;
+
+use List::Util qw(first);
+use XML::LibXML;
+
+use SL::Locale::String qw(t8);
+use SL::XMLInvoice::UBL;
+use SL::XMLInvoice::CrossIndustryInvoice;
+use SL::XMLInvoice::CrossIndustryDocument;
+
+use constant RES_OK => 0;
+use constant RES_XML_PARSING_FAILED => 1;
+use constant RES_UNKNOWN_ROOT_NODE_TYPE => 2;
+
+our @document_modules = qw(
+  SL::XMLInvoice::CrossIndustryDocument
+  SL::XMLInvoice::CrossIndustryInvoice
+  SL::XMLInvoice::UBL
+);
+
+=head1 NAME
+
+SL::XMLInvoice - Top level factory class for XML Invoice parsers.
+
+=head1 DESCRIPTION
+
+C<SL::XMLInvoice> is an abstraction layer allowing the application to pass any
+supported XML invoice document for parsing, with C<SL::XMLInvoice> handling all
+details from there: depending on its document type declaration, this class will
+pick and instatiate the appropriate child class for parsing the document and
+return an object exposing its data with the standardized structure outlined
+below.
+
+See L <SL::XMLInvoice::Base>
+for details on the shared interface of the returned instances.
+
+=head1 SYNOPSIS
+
+  # $xml_data contains an XML document as flat scalar
+  my $invoice_parser = SL::XMLInvoice->new($xml_data);
+
+  # %metadata is a hash of document level metadata items
+  my %metadata = %{$invoice_parser->metadata};
+
+  # @items is an array of hashes, each representing a line
+  # item on the bill
+  my @items = @{$invoice_parser->items};
+
+=cut
+
+sub new {
+  my ($class, $xml_data) = @_;
+  my $self = {};
+
+  $self->{message} = '';
+  $self->{dom} = eval { XML::LibXML->load_xml(string => $xml_data, expand_entities => 0) };
+
+  if ( ! $self->{dom} ) {
+    $self->{message} = t8("Parsing the XML data failed: #1", $xml_data);
+    $self->{result} = RES_XML_PARSING_FAILED;
+    return $self;
+  }
+
+  # Determine parser class to use
+  my $type = first {
+    $_->check_signature($self->{dom})
+  } @document_modules;
+
+  unless ( $type ) {
+    $self->{result} = RES_UNKNOWN_ROOT_NODE_TYPE;
+
+    my @supported = map { $_->supported } @document_modules;
+
+    $self->{message} =  t8("Could not parse XML Invoice: unknown XML invoice type\nsupported: #1",
+                           join ",\n", @supported
+                        );
+    return $self;
+  }
+
+  bless $self, $type;
+
+  # Implementation sanity check for child classes: make sure they are aware of
+  # the keys the hash returned by their metadata() method must contain.
+  my @missing_data_keys = grep { !${$self->_data_keys}{$_} } @{ $self->data_keys };
+  if ( scalar(@missing_data_keys) > 0 ) {
+    die "Incomplete implementation: the following metadata keys appear to be missing from $type: " . join(", ", @missing_data_keys);
+  }
+
+  # Implementation sanity check for child classes: make sure they are aware of
+  # the keys the hashes returned by their items() method must contain.
+  my @missing_item_keys = ();
+  foreach my $item_key ( @{$self->item_keys} ) {
+    unless ( ${$self->_item_keys}{$item_key}) { push @missing_item_keys, $item_key; }
+  }
+  if ( scalar(@missing_item_keys) > 0 ) {
+    die "Incomplete implementation: the following item keys appear to be missing from $type: " . join(", ", @missing_item_keys);
+  }
+
+  $self->parse_xml;
+
+  # Ensure these methods are implemented in the child class
+  $self->metadata;
+  $self->items;
+
+  $self->{result} = RES_OK;
+  return $self;
+}
+
+1;
+
diff --git a/SL/XMLInvoice/Base.pm b/SL/XMLInvoice/Base.pm
new file mode 100644
index 000000000..9ba2d7fac
--- /dev/null
+++ b/SL/XMLInvoice/Base.pm
@@ -0,0 +1,240 @@
+package SL::XMLInvoice::Base;
+
+use strict;
+use warnings;
+
+=head1 ATTRIBUTES
+
+=over 4
+
+=item dom
+
+A XML::LibXML document object model (DOM) object created from the XML data supplied.
+
+=item message
+
+Will contain a detailed error message if the C<result> attribute is anything
+other than C<SL::XMLInvoice::RES_OK>.
+
+=item result
+
+A status field indicating whether the supplied XML data could be parsed. It
+can take the following values:
+
+=item SL::XMLInvoice::RES_OK
+
+File has been parsed successfully.
+
+=item SL::XMLInvoice::RES_XML_PARSING FAILED
+
+Parsing the file failed.
+
+=item SL::XMLInvoice::RES_UNKNOWN_ROOT_NODE_TYPE
+
+The root node is of an unknown type. Currently, C<rsm:CrossIndustryInvoice> and
+C<ubl:Invoice> are supported.
+
+=back
+
+=head1 METHODS
+
+=head2 Data structure definition methods (only in C<SL::XMLInvoice>)
+
+These methods are only implemented in C<SL::XMLInvoice> itself and define the
+data structures to be exposed by any child classes.
+
+=over 4
+
+=item data_keys()
+
+Returns all keys the hash returned by any child's C<metadata()> method must
+contain. If you add keys to this list, you need to add them to all classes
+inheriting from C<SL::XMLInvoice> as well. An application may use this method
+to discover the metadata keys guaranteed to be present.
+
+=cut
+
+sub data_keys {
+  my @keys = (
+    'currency',      # The bill's currency, such as "EUR"
+    'direct_debit',  # Boolean: whether the bill will get paid by direct debit (1) or not (0)
+    'duedate',       # The bill's due date in YYYY-MM-DD format.
+    'gross_total',   # The invoice's sum total with tax included
+    'iban',          # The creditor's IBAN
+    'invnumber',     # The invoice's number
+    'net_total',     # The invoice's sum total without tax
+    'taxnumber',     # The creditor's tax number (Steuernummer in Germany). May be present if
+                     # there is no VAT ID (USTiD in Germany).
+    'transdate',     # The date the invoice was issued in YYYY-MM-DD format.
+    'type',          # Numeric invoice type code, e.g. 380
+    'ustid',         # The creditor's UStID.
+    'vendor_name',   # The vendor's company name
+  );
+  return \@keys;
+}
+
+=item item_keys()
+
+Returns all keys the item hashes returned by any child's C<items()> method must
+contain. If you add keys to this list, you need to add them to all classes
+inheriting from C<SL::XMLInvoice> as well. An application may use this method
+to discover the metadata keys guaranteed to be present.
+
+=back
+
+=cut
+
+sub item_keys  {
+  my @keys = (
+    'currency',
+    'description',
+    'price',
+    'quantity',
+    'subtotal',
+    'tax_rate',
+    'tax_scheme',
+    'vendor_partno',
+  );
+  return \@keys;
+}
+
+=head2 User/application facing methods
+
+Any class inheriting from C<SL::XMLInvoice> must implement the following
+methods. To ensure this happens, C<SL::XMLInvoice> contains stub functions that
+raise an exception if a child class does not override them.
+
+=over 4
+
+=item new($xml_data)
+
+Constructor for C<SL::XMLInvoice>. This method takes a scalar containing the
+entire XML document to be parsed as a flat string as its sole argument. It will
+instantiate the appropriate child class to parse the XML document in question,
+call its C<parse_xml> method and return the C<SL::XMLInvoice> child object it
+instantiated. From that point on, the structured data retrieved from the XML
+document will be available through the object's C<metadata> and C<items()>
+methods.
+
+=item metadata()
+
+This method returns a hash of document level metadata, such as the invoice
+number, the total, or the the issuance date. Its keys are the keys returned by
+the C<(data_keys()> method. Its values are plain scalars containing strings or
+C<undef> for any data items not present or empty in the XML document.
+
+=cut
+
+sub metadata {
+  my $self = shift;
+  die "Children of $self must implement a metadata() method returning the bill's metadata as a hash.";
+}
+
+=item check_signature($dom)
+
+This static method takes a DOM object and returns 1 if this DOM object can be
+parsed by the child class in question, 0 otherwise. C<SL::XMLInvoice> uses this
+method to determine which child class to instantiate for a given document. All
+child classes must implement this method.
+
+=cut
+
+sub check_signature {
+  my $self = shift;
+  die "Children of $self must implement a check_signature() method returning 1 for supported XML, 0 for unsupported XML.";
+}
+
+=item supported()
+
+This static method returns an array of free-form strings describing XML invoice
+types parseable by the child class. C<SL::XMLInvoice> uses this method to
+output a list of supported XML invoice types if its constructor fails to find
+to find an appropriate child class to parse the given document with. All child
+classes must implement this method.
+
+=cut
+
+sub supported {
+  my $self = shift;
+  die "Children of $self must implement a supported() method returning a list of supported XML invoice types.";
+}
+
+
+=item items()
+
+This method returns an array of hashes containing line item metadata, such as
+the quantity, price for one unit, or subtotal. These hashes' keys are the keys
+returned by the C<(item_keys()> method. Its values are plain scalars containing
+strings or C<undef> for any data items not present or empty in the XML
+document.
+
+=cut
+
+sub items {
+  my $self = shift;
+  die "Children of $self must implement a item() method returning the bill's items as a hash.";
+}
+
+
+=item parse_xml()
+
+This method is only implemented in child classes of C<SL::XMLInvoice> and is
+called by the C<SL::XMLInvoice> constructor once the appropriate child class has been
+determined and instantiated. It uses C<$self->{dom}>, an C<XML::LibXML>
+instance to iterate through the XML document to parse. That XML document is
+created by the C<SL::XMLInvoice> constructor.
+
+=back
+
+=cut
+
+sub parse_xml {
+  my $self = shift;
+  die "Children of $self must implement a parse_xml() method.";
+}
+
+=head2 Internal methods
+
+These methods' purpose is child classs selection and making sure child classes
+implent the interface promised by C<SL::XMLInvoice::Base>. You can safely ignore them
+if you don't plan on implementing any child classes.
+
+=over 4
+
+=item _data_keys()
+
+Returns a list of all keys present in the hash returned by the class'
+C<metadata()> method. Must be implemented in all classes inheriting from
+C<SL::XMLInvoice> This list must contain the same keys as the list returned by
+C<data_keys>. Omitting this method from a child class will cause an exception.
+
+=cut
+
+sub _data_keys {
+  my $self = shift;
+  die "Children of $self must implement a _data_keys() method returning the keys an invoice item hash will contain.";
+}
+
+=item _item_keys()
+
+Returns a list of all keys present in the hashes returned by the class'
+C<items()> method. Must be implemented in all classes inheriting from
+C<SL::XMLInvoice> This list must contain the same keys as the list returned by
+C<item_keys>. Omitting this method from a child class will cause an exception.
+
+=back
+
+=head1 AUTHOR
+
+  Johannes Grassler <info@computer-grassler.de>
+
+=cut
+
+sub _item_keys {
+  my $self = shift;
+  die "Children of $self must implement a _item_keys() method returning the keys an invoice item hash will contain.";
+}
+
+
+
+1;
diff --git a/SL/XMLInvoice/CrossIndustryDocument.pm b/SL/XMLInvoice/CrossIndustryDocument.pm
new file mode 100644
index 000000000..811f6912a
--- /dev/null
+++ b/SL/XMLInvoice/CrossIndustryDocument.pm
@@ -0,0 +1,217 @@
+package SL::XMLInvoice::CrossIndustryDocument;
+
+use strict;
+use warnings;
+
+use parent qw(SL::XMLInvoice::Base);
+
+use constant ITEMS_XPATH => '//ram:IncludedSupplyChainTradeLineItem';
+
+=head1 NAME
+
+SL::XMLInvoice::CrossIndustryDocument - XML parser for UN/CEFACT Cross Industry Document
+
+=head1 DESCRIPTION
+
+C<SL::XMLInvoice::CrossIndustryInvoice> parses XML invoices in UN/CEFACT Cross
+Industry Document format (also known as ZUgFeRD 1p0 or ZUgFeRD 1.0)  and makes
+their data available through the interface defined by C<SL::XMLInvoice>. Refer
+to L<SL::XMLInvoice> for a detailed description of that interface.
+
+See L<https://unece.org/trade/uncefact/xml-schemas> for that format's
+specification.
+
+=head1 OPERATION
+
+This module is fairly simple. It keeps two hashes of XPath statements exposed
+by methods:
+
+=over 4
+
+=item scalar_xpaths()
+
+This hash is keyed by the keywords C<data_keys> mandates. Values are XPath
+statements specifying the location of this field in the invoice XML document.
+
+=item item_xpaths()
+
+This hash is keyed by the keywords C<item_keys> mandates. Values are XPath
+statements specifying the location of this field inside a line item.
+
+=back
+
+When invoked by the C<SL::XMLInvoice> constructor, C<parse_xml()> will first
+use the XPath statements from the C<scalar_xpaths()> hash to populate the hash
+returned by the C<metadata()> method.
+
+After that, it will use the XPath statements from the C<scalar_xpaths()> hash
+to iterate over the invoice's line items and populate the array of hashes
+returned by the C<items()> method.
+
+=head1 AUTHOR
+
+  Johannes Grassler <info@computer-grassler.de>
+
+=cut
+
+sub supported {
+  my @supported = ( "UN/CEFACT Cross Industry Document/ZUGFeRD 1.0 (urn:ferd:CrossIndustryDocument:invoice:1p0)" );
+  return @supported;
+}
+
+sub check_signature {
+  my ($self, $dom) = @_;
+
+  my $rootnode = $dom->documentElement;
+
+  foreach my $attr ( $rootnode->attributes ) {
+    if ( $attr->getData =~ m/urn:ferd:CrossIndustryDocument:invoice:1p0/ ) {
+      return 1;
+      }
+    }
+
+  return 0;
+}
+
+# XML XPath expressions for global metadata
+sub scalar_xpaths {
+  return {
+    currency => ['//ram:InvoiceCurrencyCode'],
+    direct_debit => ['//ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode'],
+    duedate => ['//ram:DueDateDateTime/udt:DateTimeString', '//ram:EffectiveSpecifiedPeriod/ram:CompleteDateTime/udt:DateTimeString'],
+    gross_total => ['//ram:DuePayableAmount'],
+    iban => ['//ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount/ram:IBANID'],
+    invnumber => ['//rsm:HeaderExchangedDocument/ram:ID'],
+    net_total => ['//ram:TaxBasisTotalAmount'],
+    transdate => ['//ram:IssueDateTime/udt:DateTimeString'],
+    taxnumber => ['//ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID="FC"]'],
+    type => ['//rsm:HeaderExchangedDocument/ram:TypeCode'],
+    ustid => ['//ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID="VA"]'],
+    vendor_name => ['//ram:SellerTradeParty/ram:Name'],
+  };
+}
+
+sub item_xpaths {
+  return {
+    'currency' => ['./ram:SpecifiedSupplyChainTradeAgreement/ram:GrossPriceProductTradePrice/ram:ChargeAmount[attribute::currencyID]',
+                   './ram:SpecifiedSupplyChainTradeAgreement/ram:GrossPriceProductTradePrice/ram:BasisAmount'],
+    'price' => ['./ram:SpecifiedSupplyChainTradeAgreement/ram:GrossPriceProductTradePrice/ram:ChargeAmount',
+               './ram:SpecifiedSupplyChainTradeAgreement/ram:GrossPriceProductTradePrice/ram:BasisAmount'],
+    'description' => ['./ram:SpecifiedTradeProduct/ram:Name'],
+    'quantity' => ['./ram:SpecifiedSupplyChainTradeDelivery/ram:BilledQuantity',],
+    'subtotal' => ['./ram:SpecifiedSupplyChainTradeSettlement/ram:SpecifiedTradeSettlementMonetarySummation/ram:LineTotalAmount'],
+    'tax_rate' => ['./ram:SpecifiedSupplyChainTradeSettlement/ram:ApplicableTradeTax/ram:ApplicablePercent'],
+    'tax_scheme' => ['./ram:SpecifiedSupplyChainTradeSettlement/ram:ApplicableTradeTax/ram:TypeCode'],
+    'vendor_partno' => ['./ram:SpecifiedTradeProduct/ram:SellerAssignedID'],
+  };
+}
+
+
+# Metadata accessor method
+sub metadata {
+  my $self = shift;
+  return $self->{_metadata};
+}
+
+# Item list accessor method
+sub items {
+  my $self = shift;
+  return $self->{_items};
+}
+
+sub _xpath_context {
+  my $xc = XML::LibXML::XPathContext->new;
+  $xc->registerNs(udt => 'urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15');
+  $xc->registerNs(ram => 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12');
+  $xc->registerNs(rsm => 'urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:1p0');
+  $xc;
+}
+
+# Data keys we return
+sub _data_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->scalar_xpaths};
+
+  return \%keys;
+}
+
+# Item keys we return
+sub _item_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->item_xpaths};
+
+  return \%keys;
+}
+
+# Main parser subroutine for retrieving XML data
+sub parse_xml {
+  my $self = shift;
+  $self->{_metadata} = {};
+  $self->{_items} = ();
+
+  my $xc = _xpath_context();
+
+  # Retrieve scalar metadata from DOM
+  foreach my $key ( keys %{$self->scalar_xpaths} ) {
+    foreach my $xpath ( @{${$self->scalar_xpaths}{$key}} ) {
+      unless ( $xpath ) {
+        # Skip keys without xpath list
+        ${$self->{_metadata}}{$key} = undef;
+        next;
+      }
+      my $value = $xc->find($xpath, $self->{dom});
+      if ( $value ) {
+        # Get rid of extraneous white space
+        $value = $value->string_value;
+        $value =~ s/\n|\r//g;
+        $value =~ s/\s{2,}/ /g;
+        ${$self->{_metadata}}{$key} = $value;
+        last; # first matching xpath wins
+      } else {
+        ${$self->{_metadata}}{$key} = undef;
+      }
+    }
+  }
+
+
+  # Convert payment code metadata field to Boolean
+  # See https://service.unece.org/trade/untdid/d16b/tred/tred4461.htm for other valid codes.
+  if (${$self->{_metadata}}{'direct_debit'}) {
+    ${$self->{_metadata}}{'direct_debit'} = ${$self->{_metadata}}{'direct_debit'} == 59 ? 1 : 0;
+  }
+
+  my @items;
+  $self->{_items} = \@items;
+
+  foreach my $item ( $xc->findnodes(ITEMS_XPATH, $self->{dom}) ) {
+    my %line_item;
+    foreach my $key ( keys %{$self->item_xpaths} ) {
+      foreach my $xpath ( @{${$self->item_xpaths}{$key}} ) {
+        unless ( $xpath ) {
+          # Skip keys without xpath list
+          $line_item{$key} = undef;
+          next;
+        }
+        my $value = $xc->find($xpath, $item);
+        if ( $value ) {
+          # Get rid of extraneous white space
+          $value = $value->string_value;
+          $value =~ s/\n|\r//g;
+          $value =~ s/\s{2,}/ /g;
+          $line_item{$key} = $value;
+          last; # first matching xpath wins
+        } else {
+          $line_item{$key} = undef;
+        }
+      }
+    }
+    push @items, \%line_item;
+  }
+
+}
+
+1;
diff --git a/SL/XMLInvoice/CrossIndustryInvoice.pm b/SL/XMLInvoice/CrossIndustryInvoice.pm
new file mode 100644
index 000000000..583a262ea
--- /dev/null
+++ b/SL/XMLInvoice/CrossIndustryInvoice.pm
@@ -0,0 +1,211 @@
+package SL::XMLInvoice::CrossIndustryInvoice;
+
+use strict;
+use warnings;
+
+use parent qw(SL::XMLInvoice::Base);
+
+use constant ITEMS_XPATH => '//ram:IncludedSupplyChainTradeLineItem';
+
+=head1 NAME
+
+SL::XMLInvoice::CrossIndustryInvoice - XML parser for UN/CEFACT Cross Industry Invoice
+
+=head1 DESCRIPTION
+
+C<SL::XMLInvoice::CrossIndustryInvoice> parses XML invoices in UN/CEFACT Cross
+Industry Invoice format and makes their data available through the interface
+defined by C<SL::XMLInvoice>. Refer to L<SL::XMLInvoice> for a detailed
+description of that interface.
+
+See L<https://unece.org/trade/uncefact/xml-schemas> for that format's
+specification.
+
+=head1 OPERATION
+
+This module is fairly simple. It keeps two hashes of XPath statements exposed
+by methods:
+
+=over 4
+
+=item scalar_xpaths()
+
+This hash is keyed by the keywords C<data_keys> mandates. Values are XPath
+statements specifying the location of this field in the invoice XML document.
+
+=item item_xpaths()
+
+This hash is keyed by the keywords C<item_keys> mandates. Values are XPath
+statements specifying the location of this field inside a line item.
+
+=back
+
+When invoked by the C<SL::XMLInvoice> constructor, C<parse_xml()> will first
+use the XPath statements from the C<scalar_xpaths()> hash to populate the hash
+returned by the C<metadata()> method.
+
+After that, it will use the XPath statements from the C<scalar_xpaths()> hash
+to iterate over the invoice's line items and populate the array of hashes
+returned by the C<items()> method.
+
+=head1 AUTHOR
+
+  Johannes Grassler <info@computer-grassler.de>
+
+=cut
+
+sub supported {
+  my @supported = ( "UN/CEFACT Cross Industry Invoice (urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100)" );
+  return @supported;
+}
+
+sub check_signature {
+  my ($self, $dom) = @_;
+
+  my $rootnode = $dom->documentElement;
+
+  foreach my $attr ( $rootnode->attributes ) {
+    if ( $attr->getData =~ m/urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100/ ) {
+      return 1;
+      }
+    }
+
+  return 0;
+}
+
+# XML XPath expressions for global metadata
+sub scalar_xpaths {
+  return {
+    currency => '//ram:InvoiceCurrencyCode',
+    direct_debit => '//ram:SpecifiedTradeSettlementPaymentMeans/ram:TypeCode',
+    duedate => '//ram:DueDateDateTime/udt:DateTimeString',
+    gross_total => '//ram:DuePayableAmount',
+    iban => '//ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount/ram:IBANID',
+    invnumber => '//rsm:ExchangedDocument/ram:ID',
+    net_total => '//ram:SpecifiedTradeSettlementHeaderMonetarySummation' . '//ram:TaxBasisTotalAmount',
+    transdate => '//ram:IssueDateTime/udt:DateTimeString',
+    taxnumber => '//ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID="FC"]',
+    type => '//rsm:ExchangedDocument/ram:TypeCode',
+    ustid => '//ram:SellerTradeParty/ram:SpecifiedTaxRegistration/ram:ID[@schemeID="VA"]',
+    vendor_name => '//ram:SellerTradeParty/ram:Name',
+  };
+}
+
+sub item_xpaths {
+  return {
+    'currency' => undef, # Only global currency in CrossIndustryInvoice
+    'price' => './ram:SpecifiedLineTradeAgreement/ram:NetPriceProductTradePrice',
+    'description' => './ram:SpecifiedTradeProduct/ram:Name',
+    'quantity' => './ram:SpecifiedLineTradeDelivery/ram:BilledQuantity',
+    'subtotal' => './ram:SpecifiedLineTradeSettlement/ram:SpecifiedTradeSettlementLineMonetarySummation/ram:LineTotalAmount',
+    'tax_rate' => './ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:RateApplicablePercent',
+    'tax_scheme' => './ram:SpecifiedLineTradeSettlement/ram:ApplicableTradeTax/ram:TypeCode',
+    'vendor_partno' => './ram:SpecifiedTradeProduct/ram:SellerAssignedID',
+  };
+}
+
+
+# Metadata accessor method
+sub metadata {
+  my $self = shift;
+  return $self->{_metadata};
+}
+
+# Item list accessor method
+sub items {
+  my $self = shift;
+  return $self->{_items};
+}
+
+sub _xpath_context {
+  my $xc = XML::LibXML::XPathContext->new;
+  $xc->registerNs(udt => 'urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100');
+  $xc->registerNs(ram => 'urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100');
+  $xc->registerNs(rsm => 'urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100');
+  $xc;
+}
+
+# Data keys we return
+sub _data_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->scalar_xpaths};
+
+  return \%keys;
+}
+
+# Item keys we return
+sub _item_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->item_xpaths};
+
+  return \%keys;
+}
+
+# Main parser subroutine for retrieving XML data
+sub parse_xml {
+  my $self = shift;
+  $self->{_metadata} = {};
+  $self->{_items} = ();
+
+  my $xc = _xpath_context();
+
+  # Retrieve scalar metadata from DOM
+  foreach my $key ( keys %{$self->scalar_xpaths} ) {
+    my $xpath = ${$self->scalar_xpaths}{$key};
+    unless ( $xpath ) {
+      # Skip keys without xpath expression
+      ${$self->{_metadata}}{$key} = undef;
+      next;
+    }
+    my $value = $xc->find($xpath, $self->{dom});
+    if ( $value ) {
+      # Get rid of extraneous white space
+      $value = $value->string_value;
+      $value =~ s/\n|\r//g;
+      $value =~ s/\s{2,}/ /g;
+      ${$self->{_metadata}}{$key} = $value;
+    } else {
+      ${$self->{_metadata}}{$key} = undef;
+    }
+  }
+
+
+  # Convert payment code metadata field to Boolean
+  # See https://service.unece.org/trade/untdid/d16b/tred/tred4461.htm for other valid codes.
+  if (${$self->{_metadata}}{'direct_debit'}) {
+    ${$self->{_metadata}}{'direct_debit'} = ${$self->{_metadata}}{'direct_debit'} == 59 ? 1 : 0;
+  }
+
+  my @items;
+  $self->{_items} = \@items;
+
+  foreach my $item ( $xc->findnodes(ITEMS_XPATH, $self->{dom}) ) {
+    my %line_item;
+    foreach my $key ( keys %{$self->item_xpaths} ) {
+      my $xpath = ${$self->item_xpaths}{$key};
+      unless ( $xpath ) {
+        # Skip keys without xpath expression
+        $line_item{$key} = undef;
+        next;
+      }
+      my $value = $xc->find($xpath, $item);
+      if ( $value ) {
+        # Get rid of extraneous white space
+        $value = $value->string_value;
+        $value =~ s/\n|\r//g;
+        $value =~ s/\s{2,}/ /g;
+        $line_item{$key} = $value;
+      } else {
+        $line_item{$key} = undef;
+      }
+    }
+    push @items, \%line_item;
+  }
+
+}
+
+1;
diff --git a/SL/XMLInvoice/UBL.pm b/SL/XMLInvoice/UBL.pm
new file mode 100644
index 000000000..e3b0e1a8d
--- /dev/null
+++ b/SL/XMLInvoice/UBL.pm
@@ -0,0 +1,217 @@
+package SL::XMLInvoice::UBL;
+
+use strict;
+use warnings;
+
+use parent qw(SL::XMLInvoice::Base);
+
+use constant ITEMS_XPATH => '//cac:InvoiceLine';
+
+=head1 NAME
+
+SL::XMLInvoice::UBL - XML parser for Universal Business Language invoices
+
+=head1 DESCRIPTION
+
+C<SL::XMLInvoice::UBL> parses XML invoices in Oasis Universal Business
+Language format and makes their data available through the interface defined
+by C<SL::XMLInvoice>. Refer to L<SL::XMLInvoice> for a detailed description of
+that interface.
+
+See L<http://docs.oasis-open.org/ubl/os-UBL-2.1/UBL-2.1.html#T-INVOICE> for
+that format's specification.
+
+=head1 OPERATION
+
+This module is fairly simple. It keeps two hashes of XPath statements exposed
+by methods:
+
+=over 4
+
+=item scalar_xpaths()
+
+This hash is keyed by the keywords C<data_keys> mandates. Values are XPath
+statements specifying the location of this field in the invoice XML document.
+
+=item item_xpaths()
+
+This hash is keyed by the keywords C<item_keys> mandates. Values are XPath
+statements specifying the location of this field inside a line item.
+
+=back
+
+When invoked by the C<SL::XMLInvoice> constructor, C<parse_xml()> will first
+use the XPath statements from the C<scalar_xpaths()> hash to populate the hash
+returned by the C<metadata()> method.
+
+After that, it will use the XPath statements from the C<scalar_xpaths()> hash
+to iterate over the invoice's line items and populate the array of hashes
+returned by the C<items()> method.
+
+=head1 AUTHOR
+
+  Johannes Grassler <info@computer-grassler.de>
+
+=cut
+
+sub supported {
+  my @supported = ( "Oasis Universal Business Language (UBL) invoice version 2 (urn:oasis:names:specification:ubl:schema:xsd:Invoice-2)" );
+  return @supported;
+}
+
+sub check_signature {
+  my ($self, $dom) = @_;
+
+  my $rootnode = $dom->documentElement;
+
+  foreach my $attr ( $rootnode->attributes ) {
+    if ( $attr->getData =~ m/urn:oasis:names:specification:ubl:schema:xsd:Invoice-2/ ) {
+      return 1;
+      }
+    }
+
+  return 0;
+}
+
+# XML XPath expressions for scalar metadata
+sub scalar_xpaths {
+  return {
+    currency => '//cbc:DocumentCurrencyCode',
+    direct_debit => '//cbc:PaymentMeansCode[@listID="UN/ECE 4461"]',
+    duedate => '//cbc:DueDate',
+    gross_total => '//cac:LegalMonetaryTotal/cbc:TaxInclusiveAmount',
+    iban => '//cac:PayeeFinancialAccount/cbc:ID',
+    invnumber => '//cbc:ID',
+    net_total => '//cac:LegalMonetaryTotal/cbc:TaxExclusiveAmount',
+    transdate => '//cbc:IssueDate',
+    type => '//cbc:InvoiceTypeCode',
+    taxnumber => '//cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID',
+    ustid => '//cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme/cbc:CompanyID',
+    vendor_name => '//cac:AccountingSupplierParty/cac:Party/cac:PartyName/cbc:Name',
+  };
+}
+
+# XML XPath expressions for parsing bill items
+sub item_xpaths {
+  return {
+    'currency' => './cbc:LineExtensionAmount[attribute::currencyID]',
+    'price' => './cac:Price/cbc:PriceAmount',
+    'description' => './cac:Item/cbc:Description',
+    'quantity' => './cbc:InvoicedQuantity',
+    'subtotal' => './cbc:LineExtensionAmount',
+    'tax_rate' => './/cac:ClassifiedTaxCategory/cbc:Percent',
+    'tax_scheme' => './cac:Item/cac:ClassifiedTaxCategory/cac:TaxScheme/cbc:ID',
+    'vendor_partno' => './cac:Item/cac:SellersItemIdentification/cbc:ID',
+  };
+}
+
+
+# Metadata accessor method
+sub metadata {
+  my $self = shift;
+  return $self->{_metadata};
+}
+
+# Item list accessor method
+sub items {
+  my $self = shift;
+  return $self->{_items};
+}
+
+sub _xpath_context {
+  my $xc = XML::LibXML::XPathContext->new;
+  $xc->registerNs(cac => 'urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2');
+  $xc->registerNs(cec => 'urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2');
+  $xc->registerNs(cbc => 'urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2');
+  $xc;
+}
+
+
+# Data keys we return
+sub _data_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->scalar_xpaths};
+
+  return \%keys;
+}
+
+# Item keys we return
+sub _item_keys {
+  my $self = shift;
+  my %keys;
+
+  map { $keys{$_} = 1; } keys %{$self->item_xpaths};
+
+  return \%keys;
+}
+
+# Main parser subroutine for retrieving XML data
+sub parse_xml {
+  my $self = shift;
+  $self->{_metadata} = {};
+  $self->{_items} = ();
+
+  my $xc = _xpath_context();
+
+  # Retrieve scalar metadata from DOM
+  foreach my $key ( keys %{$self->scalar_xpaths} ) {
+    my $xpath = ${$self->scalar_xpaths}{$key};
+    my $value = $xc->find($xpath, $self->{dom});
+    if ( $value ) {
+      # Get rid of extraneous white space
+      $value = $value->string_value;
+      $value =~ s/\n|\r//g;
+      $value =~ s/\s{2,}/ /g;
+      ${$self->{_metadata}}{$key} = $value;
+    } else {
+      ${$self->{_metadata}}{$key} = undef;
+    }
+  }
+
+  # Convert payment code metadata field to Boolean
+  # See https://service.unece.org/trade/untdid/d16b/tred/tred4461.htm for other valid codes.
+  if (${$self->{_metadata}}{'direct_debit'}) {
+    ${$self->{_metadata}}{'direct_debit'} = ${$self->{_metadata}}{'direct_debit'} == 59 ? 1 : 0;
+  }
+
+  # UBL does not have a specified way of designating the tax scheme, so we'll
+  # have to guess whether it's a tax ID or VAT ID (not using
+  # SL::VATIDNr->validate here to keep this code portable):
+
+  if ( ${$self->{_metadata}}{'ustid'} =~ qr"/" ) {
+      # Unset this since the 'taxid' key has been retrieved with the same xpath
+      # expression.
+      ${$self->{_metadata}}{'ustid'} = undef;
+  } else {
+      # Unset this since the 'ustid' key has been retrieved with the same xpath
+      # expression.
+      ${$self->{_metadata}}{'taxnumber'} = undef;
+  }
+
+  my @items;
+  $self->{_items} = \@items;
+
+  foreach my $item ( $xc->findnodes(ITEMS_XPATH, $self->{dom}) ) {
+    my %line_item;
+    foreach my $key ( keys %{$self->item_xpaths} ) {
+      my $xpath = ${$self->item_xpaths}{$key};
+      my $value = $xc->find($xpath, $item);
+      if ( $value ) {
+        # Get rid of extraneous white space
+        $value = $value->string_value;
+        $value =~ s/\n|\r//g;
+        $value =~ s/\s{2,}/ /g;
+        $line_item{$key} = $value;
+      } else {
+        $line_item{$key} = undef;
+      }
+    }
+    push @items, \%line_item;
+  }
+
+
+}
+
+1;
diff --git a/SL/ZUGFeRD.pm b/SL/ZUGFeRD.pm
index 38d762311..c387f14cf 100644
--- a/SL/ZUGFeRD.pm
+++ b/SL/ZUGFeRD.pm
@@ -4,12 +4,13 @@ use strict;
 use warnings;
 use utf8;
 
-use CAM::PDF;
+use PDF::API2;
 use Data::Dumper;
 use List::Util qw(first);
 use XML::LibXML;
 
 use SL::Locale::String qw(t8);
+use SL::XMLInvoice;
 
 use parent qw(Exporter);
 our @EXPORT_PROFILES = qw(PROFILE_FACTURX_EXTENDED PROFILE_XRECHNUNG);
@@ -19,19 +20,16 @@ our %EXPORT_TAGS     = (PROFILES => \@EXPORT_PROFILES);
 use constant PROFILE_FACTURX_EXTENDED => 0;
 use constant PROFILE_XRECHNUNG        => 1;
 
-use constant RES_OK                              => 0;
-use constant RES_ERR_FILE_OPEN                   => 1;
-use constant RES_ERR_NO_XMP_METADATA             => 2;
-use constant RES_ERR_NO_XML_INVOICE              => 3;
-use constant RES_ERR_NOT_ZUGFERD                 => 4;
-use constant RES_ERR_UNSUPPORTED_ZUGFERD_VERSION => 5;
+use constant RES_OK => 0;
+use constant RES_ERR_FILE_OPEN => -1;
+use constant RES_ERR_NO_ATTACHMENT => -2;
 
 our @customer_settings = (
-  [ 0,                                  t8('Do not create Factur-X/ZUGFeRD invoices')                                    ],
-  [ PROFILE_FACTURX_EXTENDED() * 2 + 1, t8('Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\'')             ],
-  [ PROFILE_FACTURX_EXTENDED() * 2 + 2, t8('Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\' (test mode)') ],
-  [ PROFILE_XRECHNUNG()        * 2 + 1, t8('Create with profile \'XRechnung 2.0.0\'')                                    ],
-  [ PROFILE_XRECHNUNG()        * 2 + 2, t8('Create with profile \'XRechnung 2.0.0\' (test mode)')                        ],
+  [ 0,                                  t8('Do not create Factur-X/ZUGFeRD invoices')                                   ],
+  [ PROFILE_FACTURX_EXTENDED() * 2 + 1, t8('Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\'')             ],
+  [ PROFILE_FACTURX_EXTENDED() * 2 + 2, t8('Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\' (test mode)') ],
+  [ PROFILE_XRECHNUNG()        * 2 + 1, t8('Create with profile \'XRechnung 2.0.0\'')                                   ],
+  [ PROFILE_XRECHNUNG()        * 2 + 2, t8('Create with profile \'XRechnung 2.0.0\' (test mode)')                       ],
 );
 
 sub convert_customer_setting {
@@ -47,140 +45,190 @@ sub convert_customer_setting {
 
 sub _extract_zugferd_invoice_xml {
   my $doc        = shift;
-  my $names_dict = $doc->getValue($doc->getRootDict->{Names}) or return {};
-  my $files_tree = $names_dict->{EmbeddedFiles}               or return {};
-  my @agenda     = $files_tree;
-  my $ret        = {};
+  my %res_fail;
+
+  # unfortunately PDF::API2 has no public facing api to access the actual pdf name dictionaries
+  # so we need to use the internal data, just like with PDF::CAM before
+  #
+  # PDF::API2 will internally read $doc->{pdf}{Root}{Names} for us, but after that every entry
+  # in the tree may be an indirect object (Objind) before realising it.
+  #
+  # The actual embedded files will be located at $doc->{pdf}{Root}{Names}{EmbeddedFiles}
+  #
+
+  my $node = $doc->{pdf};
+  for (qw(Root Names EmbeddedFiles)) {
+    $node = $node->{$_};
+    if (!ref $node) {
+      return {
+        result  => RES_ERR_NO_ATTACHMENT(),
+        message => "unexpected unbless node while trying to access $_ node",
+      }
+    }
+    if ('PDF::API2::Basic::PDF::Objind' eq ref $node) {
+      $node->realise;
+    }
+    # after realising it should be a Dict
+    if ('PDF::API2::Basic::PDF::Dict' ne ref $node) {
+      return {
+        result  => RES_ERR_NO_ATTACHMENT(),
+        message => "unexpected node type [@{[ref($node)]}] after realising $_ node",
+      }
+    }
+  }
+
+  # now we have an array of possible attachments
+  my @agenda     = $node;
+
+  my $parser;  # SL::XMLInvoice object used as return value
+  my @res;     # Temporary storage for error messages encountered during
+               # attempts to process attachments.
 
   # Hardly ever more than single leaf, but...
 
   while (@agenda) {
-    my $item = $doc->getValue(shift @agenda);
+    my $item = shift @agenda;
 
     if ($item->{Kids}) {
-      my $kids = $doc->getValue($item->{Kids});
-      push @agenda, @$kids
+      my @kids = $item->{Kids}->realise->elements;
+      push @agenda, @kids;
 
     } else {
-      my $nodes = $doc->getValue($item->{Names});
-      my @names = map { $doc->getValue($_)} @$nodes;
+      my @names = $item->{Names}->realise->elements;
 
+      TRY_NEXT:
       while (@names) {
         my ($k, $v)  = splice @names, 0, 2;
-        my $ef_node  = $v->{EF};
-        my $ef_dict  = $doc->getValue($ef_node);
-        my $fnode    = (values %$ef_dict)[0];
-        my $any_num  = $fnode->{value};
-        my $obj_node = $doc->dereference($any_num);
-        my $content  = $doc->decodeOne($obj_node->{value}, 0) // '';
+        my $fnode    = $v->realise->{EF}->realise->{F}->realise;
 
-        #print "1\n";
+        $fnode->read_stream(1);
 
-        next if $content !~ m{<rsm:CrossIndustryInvoice};
-        #print "2\n";
+        my $content  = $fnode->{' stream'};
 
-        my $dom = eval { XML::LibXML->load_xml(string => $content) };
-        return $content if $dom && ($dom->documentElement->nodeName eq 'rsm:CrossIndustryInvoice');
+        $parser = SL::XMLInvoice->new($content);
+
+        # Caveat: this will only ever catch the first attachment looking like
+        #         an XML invoice.
+        if ( $parser->{result} == SL::XMLInvoice::RES_OK ){
+          return $parser;
+        } else {
+          push @res, t8(
+            "Could not parse PDF embedded attachment #1: #2",
+            $k,
+            $parser->{result}
+          );
+        }
       }
     }
   }
 
-  return undef;
+  # There's going to be at least one attachment that failed to parse as XML by
+  # this point - if there were no attachments at all, we would have bailed out
+  # a lot earlier.
+
+  %res_fail = (
+    result  => RES_ERR_FILE_OPEN,
+    message => join("; ", @res),
+  );
+
+  return \%res_fail;
 }
 
 sub _get_xmp_metadata {
   my ($doc) = @_;
 
-  my $node = $doc->getValue($doc->getRootDict->{Metadata});
-  if ($node && $node->{StreamData} && defined($node->{StreamData}->{value})) {
-    return $node->{StreamData}->{value};
-  }
-
-  return undef;
+  $doc->xmpMetadata;
 }
 
 sub extract_from_pdf {
   my ($self, $file_name) = @_;
+  my @warnings;
 
-  my $pdf_doc = CAM::PDF->new($file_name);
+  my $pdf_doc = PDF::API2->openScalar($file_name);
 
   if (!$pdf_doc) {
     return {
-      result  => RES_ERR_FILE_OPEN(),
+      result  => RES_ERR_FILE_OPEN,
       message => $::locale->text('The file \'#1\' could not be opened for reading.', $file_name),
     };
   }
 
   my $xmp = _get_xmp_metadata($pdf_doc);
+
   if (!defined $xmp) {
-    return {
-      result  => RES_ERR_NO_XMP_METADATA(),
-      message => $::locale->text('The file \'#1\' does not contain the required XMP meta data.', $file_name),
-    };
-  }
+      push @warnings, $::locale->text('The file \'#1\' does not contain the required XMP meta data.', $file_name);
+  } else {
+    my $dom = eval { XML::LibXML->load_xml(string => $xmp, expand_entities => 0) };
 
-  my $bad = {
-    result  => RES_ERR_NO_XMP_METADATA(),
-    message => $::locale->text('Parsing the XMP metadata failed.'),
-  };
+    push @warnings, $::locale->text('Parsing the XMP metadata failed.'), if !$dom;
 
-  my $dom = eval { XML::LibXML->load_xml(string => $xmp) };
+    my $xpc = XML::LibXML::XPathContext->new($dom);
+    $xpc->registerNs('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
 
-  return $bad if !$dom;
+    my $zugferd_version;
 
-  my $xpc = XML::LibXML::XPathContext->new($dom);
-  $xpc->registerNs('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+    my $test = $xpc->findnodes('/x:xmpmeta/rdf:RDF/rdf:Description');
 
-  my $zugferd_version;
+    foreach my $node ($xpc->findnodes('/x:xmpmeta/rdf:RDF/rdf:Description')) {
+      my $ns = first { ref($_) eq 'XML::LibXML::Namespace' } $node->attributes;
+      next unless $ns;
 
-  foreach my $node ($xpc->findnodes('/x:xmpmeta/rdf:RDF/rdf:Description')) {
-    my $ns = first { ref($_) eq 'XML::LibXML::Namespace' } $node->attributes;
-    next unless $ns;
+      if ($ns->getData =~ m{urn:zugferd:pdfa:CrossIndustryDocument:invoice:2p0}) {
+        $zugferd_version = 'zugferd:2p0';
+        last;
+      }
 
-    if ($ns->getData =~ m{urn:zugferd:pdfa:CrossIndustryDocument:invoice:2p0}) {
-      $zugferd_version = 'zugferd:2p0';
-      last;
-    }
+      if ($ns->getData =~ m{urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0}) {
+        $zugferd_version = 'factur-x:1p0';
+        last;
+      }
 
-    if ($ns->getData =~ m{urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0}) {
-      $zugferd_version = 'factur-x:1p0';
-      last;
+      if ($ns->getData =~ m{zugferd|factur-x}i) {
+        $zugferd_version = 'unsupported';
+        last;
+      }
     }
 
-    if ($ns->getData =~ m{zugferd|factur-x}i) {
-      $zugferd_version = 'unsupported';
-      last;
+    if (!$zugferd_version) {
+        push @warnings, $::locale->text('The XMP metadata does not declare the Factur-X/ZUGFeRD data.'),
     }
-  }
-
-  if (!$zugferd_version) {
-    return {
-      result  => RES_ERR_NOT_ZUGFERD(),
-      message => $::locale->text('The XMP metadata does not declare the Factur-X/ZUGFeRD data.'),
-    };
-  }
 
-  if ($zugferd_version eq 'unsupported') {
-    return {
-      result  => RES_ERR_UNSUPPORTED_ZUGFERD_VERSION(),
-      message => $::locale->text('The Factur-X/ZUGFeRD version used is not supported.'),
-    };
+    if ($zugferd_version eq 'unsupported') {
+        push @warnings, $::locale->text('The Factur-X/ZUGFeRD version used is not supported.'),
+    }
   }
 
   my $invoice_xml = _extract_zugferd_invoice_xml($pdf_doc);
 
-  if (!defined $invoice_xml) {
-    return {
-      result  => RES_ERR_NO_XML_INVOICE(),
-      message => $::locale->text('The Factur-X/ZUGFeRD XML invoice was not found.'),
-    };
-  }
+  my %res;
 
-  return {
-    result       => RES_OK(),
+  %res = (
+    result       => $invoice_xml->{result},
+    message      => $invoice_xml->{message},
     metadata_xmp => $xmp,
     invoice_xml  => $invoice_xml,
-  };
+    warnings     => \@warnings,
+  );
+
+  return \%res;
+}
+
+sub extract_from_xml {
+  my ($self, $data) = @_;
+
+  my %res;
+
+  my $invoice_xml = SL::XMLInvoice->new($data);
+
+  %res = (
+    result       => $invoice_xml->{result},
+    message      => $invoice_xml->{message},
+    metadata_xmp => undef,
+    invoice_xml  => $invoice_xml,
+    warnings     => [],
+  );
+
+  return \%res;
 }
 
 1;
@@ -200,55 +248,109 @@ SL::ZUGFeRD - Helper functions for dealing with PDFs containing Factur-X/ZUGFeRD
     my $pdf  = '/path/to/my.pdf';
     my $info = SL::ZUGFeRD->extract_from_pdf($pdf);
 
+    my $xml  = '<?xml version="1.0" encoding="UTF-8"?> ...';
+    my $info = SL::ZUGFeRD->extract_from_xml($xml);
+
     if ($info->{result} != SL::ZUGFeRD::RES_OK()) {
       # An error occurred; log message from parser:
       $::lxdebug->message(LXDebug::DEBUG1(), "Could not extract ZUGFeRD data from $pdf: " . $info->{message});
       return;
     }
 
-    # Parse & handle invoice XML:
-    my $dom = XML::LibXML->load_xml(string => $info->{invoice_xml});
+    # Access invoice XML data:
+    my $inv = ${$info}{'invoice_xml};
+    my %metadata = %{$inv->metadata};
+    my @items = @{$inv->items};
+    my $dom = $inv->dom;
 
 
 =head1 FUNCTIONS
 
-=over 4
-
-=item C<extract_from_pdf> C<$file_name>
+=head2 extract_from_pdf E<lt>file_nameE<gt>
 
-Opens an existing PDF in the file system and tries to extract
-Factur-X/ZUGFeRD invoice data from it. First it'll parse the XMP
+Opens an existing PDF file in the file system and tries to extract
+Factur-X/XRechnung/ZUGFeRD invoice data from it. First it'll parse the XMP
 metadata and look for the Factur-X/ZUGFeRD declaration inside. If the
-declaration isn't found or the declared version isn't 2p0, an error is
-returned.
+declaration isn't found or the declared version isn't 2p0, an warning is
+recorded in the returned data structure's C<warnings> key.
 
-Otherwise it'll continue to look through all embedded files in the
-PDF. The first embedded XML file with a root node of
-C<rsm:CrossCountryInvoice> will be returnd.
+Regardless of metadata presence, it will continue to iterate over all files
+embedded in the PDF and attempt to parse them with SL::XMLInvoice. If it
+succeeds, the first SL::XMLInvoice object that indicates successful parsing is
+returned.
 
 Always returns a hash ref containing the key C<result>, a number that
 can be one of the following constants:
 
 =over 4
 
-=item C<RES_OK> (0): parsing was OK; the returned hash will also
-contain the keys C<xmp_metadata> and C<invoice_xml> which will contain
-the XML text of the metadata & the Factur-X/ZUGFeRD invoice.
+=item C<RES_OK> (0): parsing was OK.
+
+=item C<RES_ERR_…> (all values != 0): parsing failed. Values > 0 indicate a failure
+in C<SL::XMLInvoice>, Values < 0 indicate a failure in C<SL::ZUGFeRD>.
+
+=back
+
+Other than that, the hash ref contains the following keys:
+
+=over 4
+
+=item C<message> - An error message detailing the problem upon nonzero C<result>, undef otherwise.
+
+=item C<metadata_xmp> - The XMP metadata extracted from the Factur-X/ZUGFeRD invoice (if present)
+
+=item C<invoice_xml> - An SL::XMLInvoice object holding the data extracted from the parsed XML invoice.
+
+=item C<warnings> - Warnings encountered upon extracting/parsing XML files (if any)
+
+=back
+
+=head2 extract_from_xml E<lt>stringE<gt>
+
+Takes a string containing an XML document with Factur-X/XRechnung/ZUGFeRD
+invoice data and attempts to parse it using C<SL::XMLInvoice>.
+
+If parsing is successful, an SL::XMLInvoice object containing the document's
+parsed data is returned.
+
+This method always returns a hash ref containing the key C<result>, a number that
+can be one of the following constants:
+
+=over 4
+
+=item C<RES_OK> (0): parsing was OK.
 
-=item C<RES_ERR_…> (all values E<gt> 0): parsing failed; the hash will
-also contain a key C<message> which contains a human-readable
-information about what exactly failed.
+=item C<RES_ERR_…> (all values != 0): parsing failed. Values > 0 indicate a failure
+in C<SL::XMLInvoice>, Values < 0 indicate a failure in C<SL::ZUGFeRD>.
 
 =back
 
+Other than that, the hash ref contains the following keys:
+
+=over 4
+
+=item C<message> - An error message detailing the problem upon nonzero C<result>, undef otherwise.
+
+=item C<metadata_xmp> - Always undef and only present to let downstream code expecting its presence fail gracefully.
+
+=item C<invoice_xml> - An SL::XMLInvoice object holding the data extracted from the parsed XML invoice.
+
+=item C<warnings> - Warnings encountered upon extracting/parsing XML data (if any)
+
 =back
 
 =head1 BUGS
 
 Nothing here yet.
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Moritz Bunkus E<lt>m.bunkus@linet-services.deE<gt>
+=over 4
+
+=item Moritz Bunkus E<lt>m.bunkus@linet-services.deE<gt>
+
+=item Johannes Graßler E<lt>info@computer-grassler.deE<gt>
+
+=back
 
 =cut
diff --git a/SL/mebil/Mapping.pm b/SL/mebil/Mapping.pm
index 5ff100147..7bef2260d 100644
--- a/SL/mebil/Mapping.pm
+++ b/SL/mebil/Mapping.pm
@@ -34,7 +34,7 @@ sub calc_mapping {
 			$sql = "SELECT SUM(ac.amount) AS saldo
 						FROM acc_trans ac 
 						JOIN chart c ON (c.id = ac.chart_id) 
-						WHERE (ac.transdate <= '31.12.$year') 
+						WHERE (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy')) 
 						AND (c.accno = '$mapping->{fromacc}') ";
 			my $result = SL::DBUtils::selectall_hashref_query($self->{error_channel}, $self->{dbh}, $sql);		
 			$fromacc{$mapping->{fromacc}} = $result->[0]->{saldo};
@@ -45,7 +45,7 @@ sub calc_mapping {
 			$sql = "SELECT SUM(ac.amount)* -1 AS saldo
 						FROM acc_trans ac 
 						JOIN chart c ON (c.id = ac.chart_id) 
-						WHERE (ac.transdate <= '31.12.$year') 
+						WHERE (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy')) 
 						AND (c.accno = '$mapping->{fromacc}') ";
 			my @result = SL::DBUtils::selectfirst_array_query($self->{error_channel}, $self->{dbh}, $sql);		
 			$fromacc{$mapping->{fromacc}} = $result[0];
@@ -106,7 +106,7 @@ sub rule2sql {
 	my $values = "";
 	my $invert = "";
 	my $start = "";
-	my $end = "AND (ac.transdate <= '31.12.$year')";
+	my $end = "AND (ac.transdate <= TO_DATE('31.12.$year','dd.mm.yyyy'))";
 	my $py = $year - 1;
 	
 	# parse rule
@@ -133,12 +133,12 @@ sub rule2sql {
 			$invert = "* (-1)";
 		}
 		elsif ($1 eq "START") {
-			$start = "AND (ac.transdate >= '01.01.$2')";
+			$start = "AND (ac.transdate >= TO_DATE('01.01.$2','dd.mm.yyyy'))";
 			$start =~ s/YEAR/$year/;
 			$start =~ s/PY/$py/;
 		}
 		elsif ($1 eq "END") {
-			$end = "AND (ac.transdate <= '31.12.$2')";
+			$end = "AND (ac.transdate <= TO_DATE('31.12.$2','dd.mm.yyyy'))";
 			$end =~ s/YEAR/$year/;
 			$end =~ s/PY/$py/;
 		}
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/content.txt b/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/content.txt
deleted file mode 100644
index 98b3bd91e..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/content.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-!3 !-fit-!
-|'''Date: '''|!-7:00:14 PM (MEZ) on Montag, Januar 18, 2021-!|
-|'''Test Page: '''|.FrontPage.AaNeuInstallation|
-|'''Command: '''|!-java -cp fitnesse.jar:/usr/lib/mtest/TestPhp.jar:/usr/lib/mtest/fitlibrary.jar:/usr/lib/mtest/log4j.jar:/usr/lib/mtest/fitnesse.jar fitlibrary.suite.FitLibraryServer epic-ts 8080 1-!|
-|'''Exit code: '''|!-0-!|
-|'''Time elapsed: '''|!-11.781 seconds-!|
-----'''Standard Output:'''
-{{{Executing script: sudo apt-get update
-Ign:1 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena InRelease
-OK:2 http://ftp-stud.hs-esslingen.de/ubuntu xenial InRelease
-OK:3 http://archive.canonical.com/ubuntu xenial InRelease
-Holen:4 http://debian.fhem.de/nightly  InRelease [1.912 B]
-OK:5 http://ftp-stud.hs-esslingen.de/ubuntu xenial-updates InRelease
-OK:6 http://wagnertech.de/debian stable InRelease
-OK:7 http://ftp-stud.hs-esslingen.de/ubuntu xenial-backports InRelease
-OK:8 http://wagnertech.de/debian testing InRelease
-OK:9 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena Release
-Fehl:4 http://debian.fhem.de/nightly  InRelease
-  Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Holen:10 http://security.ubuntu.com/ubuntu xenial-security InRelease [109 kB]
-Es wurden 111 kB in 2 s geholt (41,4 kB/s).
-Paketlisten werden gelesen...
-Error: W: Während der Überprüfung der Signatur trat ein Fehler auf. Das Depot wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. GPG-Fehler: http://debian.fhem.de/nightly  InRelease: Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Error: W: Fehlschlag beim Holen von http://debian.fhem.de/nightly/InRelease Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Error: W: Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden ignoriert oder alte an ihrer Stelle benutzt.
-Executing script: sudo apt-get install kivitendo
-Paketlisten werden gelesen...
-Abhängigkeitsbaum wird aufgebaut....
-Statusinformationen werden eingelesen....
-kivitendo ist schon die neueste Version (3.5.4-gdc2a8f7M).
-Die folgenden Pakete wurden automatisch installiert und werden nicht mehr benötigt:
-  libclamav7 libllvm4.0
-Verwenden Sie »sudo apt autoremove«, um sie zu entfernen.
-0 aktualisiert, 0 neu installiert, 0 zu entfernen und 36 nicht aktualisiert.
-}}}
\ No newline at end of file
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/properties.xml b/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AaNeuInstallation/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/0-20210218193836.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/0-20210218193836.zip
deleted file mode 100644
index 0dec99e5c..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/0-20210218193836.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/10-20210218191703.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/10-20210218191703.zip
deleted file mode 100644
index dabd49c61..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/10-20210218191703.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/13-20210218191806.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/13-20210218191806.zip
deleted file mode 100644
index 5b81d7ef4..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/13-20210218191806.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/14-20210218192411.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/14-20210218192411.zip
deleted file mode 100644
index 4b7cdf2e0..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/14-20210218192411.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/19-20210218192733.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/19-20210218192733.zip
deleted file mode 100644
index ddc3dc063..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/19-20210218192733.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/7-20210218191404.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/7-20210218191404.zip
deleted file mode 100644
index 3152fc0c3..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/7-20210218191404.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/content.txt b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/content.txt
deleted file mode 100644
index 1ec37c48a..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/content.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-!3 !-fit-!
-|'''Date: '''|!-9:42:29 PM (MEZ) on Donnerstag, Januar 27, 2022-!|
-|'''Test Page: '''|.FrontPage.AbDeinstallieren|
-|'''Command: '''|!-java -cp fitnesse.jar:/usr/lib/mtest/mtest.jar:/usr/lib/mtest/fitlibrary.jar:/usr/lib/mtest/log4j.jar:/usr/lib/mtest/fitnesse.jar fitlibrary.suite.FitLibraryServer epic-ts 8080 1-!|
-|'''Exit code: '''|!-0-!|
-|'''Time elapsed: '''|!-12.363 seconds-!|
-----'''Standard Output:'''
-{{{------------------------------
-Executing script: sudo apt-get -y remove kivitendo
-Paketlisten werden gelesen...
-Abhängigkeitsbaum wird aufgebaut....
-Statusinformationen werden eingelesen....
-Die folgenden Pakete wurden automatisch installiert und werden nicht mehr benötigt:
-  aqbanking-tools libalgorithm-checkdigits-perl libanyevent-perl
-  libapache2-mod-fcgid libaqbanking-data libaqbanking35 libaqbanking35-plugins
-  libaqebics0 libaqhbci22 libaqofxconnect7 libbit-vector-perl libcam-pdf-perl
-  libcarp-clan-perl libclass-data-inheritable-perl libclass-factory-util-perl
-  libclass-std-perl libclone-pp-perl libconfig-std-perl
-  libconvert-nls-date-format-perl libcrypt-pbkdf2-perl libcrypt-rc4-perl
-  libdaemon-generic-perl libdata-structure-util-perl
-  libdatetime-event-cron-perl libdatetime-format-builder-perl
-  libdatetime-format-mysql-perl libdatetime-format-oracle-perl
-  libdatetime-format-pg-perl libdatetime-format-strptime-perl
-  libdatetime-set-perl libdigest-sha3-perl libexception-class-perl
-  libfile-flock-perl libfile-slurp-perl libfont-ttf-perl libgd-perl
-  libgwenhywfar-data libgwenhywfar60 libhtml-restrict-perl libio-event-perl
-  libktoblzcheck1v5 liblist-utilsby-perl libmath-round-perl
-  libnamespace-autoclean-perl libnet-sslglue-perl
-  libpackage-deprecationmanager-perl libpbkdf2-tiny-perl libpdf-api2-perl
-  libregexp-ipv6-perl librose-datetime-perl librose-db-object-perl
-  librose-db-perl librose-object-perl libset-crontab-perl libset-infinite-perl
-  libsort-naturally-perl libsql-reservedwords-perl libstring-shellquote-perl
-  libtext-csv-xs-perl libtext-pdf-perl libtext-unidecode-perl
-  libtime-clock-perl libtype-tiny-perl libxml-writer-perl libxmlsec1
-  libyaml-perl libyaml-syck-perl tcsh
-Verwenden Sie »sudo apt autoremove«, um sie zu entfernen.
-Die folgenden Pakete werden ENTFERNT:
-  kivitendo
-0 aktualisiert, 0 neu installiert, 1 zu entfernen und 14 nicht aktualisiert.
-Nach dieser Operation werden 23,2 MB Plattenplatz freigegeben.
-(Lese Datenbank ... 
-(Lese Datenbank ... 5%
-(Lese Datenbank ... 10%
-(Lese Datenbank ... 15%
-(Lese Datenbank ... 20%
-(Lese Datenbank ... 25%
-(Lese Datenbank ... 30%
-(Lese Datenbank ... 35%
-(Lese Datenbank ... 40%
-(Lese Datenbank ... 45%
-(Lese Datenbank ... 50%
-(Lese Datenbank ... 55%
-(Lese Datenbank ... 60%
-(Lese Datenbank ... 65%
-(Lese Datenbank ... 70%
-(Lese Datenbank ... 75%
-(Lese Datenbank ... 80%
-(Lese Datenbank ... 85%
-(Lese Datenbank ... 90%
-(Lese Datenbank ... 95%
-(Lese Datenbank ... 100%
-(Lese Datenbank ... 235134 Dateien und Verzeichnisse sind derzeit installiert.)
-Entfernen von kivitendo (3.5.8-3M) ...
-------------------------------
-Executing script: sudo rm -r /opt/kivitendo-erp
-------------------------------
-Executing script: sudo bin/remove-database
-GUI herunterfahren ...
-Lösche bestende Datenbanken ...
-DROP DATABASE
-DROP DATABASE
-Lösche kivitendo-user
-DROP ROLE
-GUI starten ...
-ok.
-}}}
\ No newline at end of file
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/properties.xml b/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AbDeinstallieren/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/1-20210218193907.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/1-20210218193907.zip
deleted file mode 100644
index b82f3a8e6..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/1-20210218193907.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/content.txt b/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/content.txt
deleted file mode 100644
index 1d2d32d64..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/content.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-!3 !-fit-!
-|'''Date: '''|!-9:43:16 PM (MEZ) on Donnerstag, Januar 27, 2022-!|
-|'''Test Page: '''|.FrontPage.AdNeuInstallation|
-|'''Command: '''|!-java -cp fitnesse.jar:/usr/lib/mtest/mtest.jar:/usr/lib/mtest/fitlibrary.jar:/usr/lib/mtest/log4j.jar:/usr/lib/mtest/fitnesse.jar fitlibrary.suite.FitLibraryServer epic-ts 8080 2-!|
-|'''Exit code: '''|!-0-!|
-|'''Time elapsed: '''|!-33.228 seconds-!|
-----'''Standard Output:'''
-{{{------------------------------
-Executing script: sudo apt-get update
-OK:1 http://wagnertech.de/debian stable InRelease
-Ign:2 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena InRelease
-OK:3 http://archive.canonical.com/ubuntu xenial InRelease
-OK:4 http://wagnertech.de/debian testing InRelease
-OK:5 http://ftp-stud.hs-esslingen.de/ubuntu xenial InRelease
-Holen:6 http://ftp-stud.hs-esslingen.de/ubuntu xenial-updates InRelease [99,8 kB]
-Holen:7 http://debian.fhem.de/nightly  InRelease [1.912 B]
-Holen:8 http://ftp-stud.hs-esslingen.de/ubuntu xenial-backports InRelease [97,4 kB]
-OK:9 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena Release
-Holen:10 http://security.ubuntu.com/ubuntu xenial-security InRelease [99,8 kB]
-Fehl:7 http://debian.fhem.de/nightly  InRelease
-  Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 95D737016F529CF1
-Es wurden 299 kB in 2 s geholt (104 kB/s).
-Paketlisten werden gelesen...
-stderr: W: Während der Überprüfung der Signatur trat ein Fehler auf. Das Depot wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. GPG-Fehler: http://debian.fhem.de/nightly  InRelease: Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 95D737016F529CF1
-stderr: W: Fehlschlag beim Holen von http://debian.fhem.de/nightly/InRelease Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 95D737016F529CF1
-stderr: W: Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden ignoriert oder alte an ihrer Stelle benutzt.
-------------------------------
-Executing script: echo kivitendo |sudo apt-get install -y kivitendo
-Paketlisten werden gelesen...
-Abhängigkeitsbaum wird aufgebaut....
-Statusinformationen werden eingelesen....
-Die folgenden NEUEN Pakete werden installiert:
-  kivitendo
-0 aktualisiert, 1 neu installiert, 0 zu entfernen und 14 nicht aktualisiert.
-Es müssen 6.241 kB an Archiven heruntergeladen werden.
-Nach dieser Operation werden 23,2 MB Plattenplatz zusätzlich benutzt.
-Holen:1 http://wagnertech.de/debian testing/main i386 kivitendo all 3.5.8-4 [6.241 kB]
-Es wurden 6.241 kB in 3 s geholt (1.712 kB/s).
-Vormals nicht ausgewähltes Paket kivitendo wird gewählt.
-(Lese Datenbank ... 
-(Lese Datenbank ... 5%
-(Lese Datenbank ... 10%
-(Lese Datenbank ... 15%
-(Lese Datenbank ... 20%
-(Lese Datenbank ... 25%
-(Lese Datenbank ... 30%
-(Lese Datenbank ... 35%
-(Lese Datenbank ... 40%
-(Lese Datenbank ... 45%
-(Lese Datenbank ... 50%
-(Lese Datenbank ... 55%
-(Lese Datenbank ... 60%
-(Lese Datenbank ... 65%
-(Lese Datenbank ... 70%
-(Lese Datenbank ... 75%
-(Lese Datenbank ... 80%
-(Lese Datenbank ... 85%
-(Lese Datenbank ... 90%
-(Lese Datenbank ... 95%
-(Lese Datenbank ... 100%
-(Lese Datenbank ... 231789 Dateien und Verzeichnisse sind derzeit installiert.)
-Vorbereitung zum Entpacken von .../kivitendo_3.5.8-4_all.deb ...
-Entpacken von kivitendo (3.5.8-4) ...
-kivitendo (3.5.8-4) wird eingerichtet ...
-Type new kivitendo admin and DB password:
-No user named 'kivitendo' found. It is now created.
-ALTER ROLE
-adding kivitendo user access to /etc/postgresql/9.5/main//pg_hba.conf
-Unrecognized escape \R passed through at /opt/kivitendo-erp/scripts/installation_check.pl line 163.
-
-Checking Required Modules:
-Looking for parent ....................................................... 0.232
-Looking for Algorithm::CheckDigits ........................................ 0.50
-Looking for Archive::Zip 1.40 ............................................. 1.56
-Looking for CAM::PDF ...................................................... 1.60
-Looking for CGI 3.43 ...................................................... 4.26
-Looking for Clone ......................................................... 0.38
-Looking for Config::Std .................................................. 0.901
-Looking for Daemon::Generic 0.71 .......................................... 0.84
-Looking for DateTime ...................................................... 1.21
-Looking for DateTime::Event::Cron 0.08 .................................... 0.08
-Looking for DateTime::Format::Strptime .................................... 1.63
-Looking for DateTime::Set 0.12 .......................................... 0.3600
-Looking for DBI 1.50 ..................................................... 1.634
-Looking for DBD::Pg 1.49 ................................................. 3.5.3
-Looking for Digest::SHA ................................................... 5.95
-Looking for Exception::Class 1.44 ......................................... 1.44
-Looking for Email::Address 1.888 ......................................... 1.908
-Looking for Email::MIME .................................................. 1.937
-Looking for FCGI 0.72 ..................................................... 0.77
-Looking for File::Copy::Recursive ......................................... 0.38
-Looking for File::Flock 2008.01 ........................................ 2014.01
-Looking for File::MimeInfo ................................................ 0.27
-Looking for File::Slurp ................................................ 9999.19
-Looking for GD ............................................................ 2.53
-Looking for HTML::Parser .................................................. 3.72
-Looking for HTML::Restrict ............................................... 2.2.4
-Looking for Image::Info ................................................... 1.28
-Looking for JSON .......................................................... 2.90
-Looking for List::MoreUtils 0.30 ......................................... 0.413
-Looking for List::UtilsBy 0.09 ............................................ 0.10
-Looking for LWP::Authen::Digest (from libwww-perl) .................. no version
-Looking for LWP::UserAgent (from libwww-perl) ............................. 6.15
-Looking for Math::Round ................................................... 0.07
-Looking for Params::Validate .............................................. 1.22
-Looking for PBKDF2::Tiny 0.005 ........................................... 0.005
-Looking for PDF::API2 2.000 .............................................. 2.025
-Looking for Regexp::IPv6 0.03 ............................................. 0.03
-Looking for Rose::Object ................................................. 0.860
-Looking for Rose::DB ..................................................... 0.777
-Looking for Rose::DB::Object 0.788 ....................................... 0.815
-Looking for Set::Infinite 0.63 ............................................ 0.63
-Looking for String::ShellQuote 1.01 ....................................... 1.03
-Looking for Sort::Naturally ............................................... 1.03
-Looking for Template 2.18 ................................................. 2.24
-Looking for Text::CSV_XS 0.23 ............................................. 1.21
-Looking for Text::Iconv 1.2 ................................................ 1.7
-Looking for Text::Unidecode ............................................... 1.27
-Looking for Try::Tiny ..................................................... 0.24
-Looking for URI 1.35 ...................................................... 1.71
-Looking for XML::LibXML ................................................. 2.0123
-Looking for XML::Writer 0.602 ............................................ 0.625
-Looking for YAML 0.62 ..................................................... 1.15
-Looking for pdfinfo executable .......................................... 0.41.0
-
-Result:
-All ......................................................................... OK
-
-Standard check done, everything is OK and up to date. Have a look at the --help
-section of this script to see some more advanced checks for developer and
-optional dependencies, as well as LaTeX packages you might need.
-}}}
\ No newline at end of file
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/properties.xml b/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AdNeuInstallation/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/30-20210218194445.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/30-20210218194445.zip
deleted file mode 100644
index 8bdbabed7..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/30-20210218194445.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/content.txt b/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/content.txt
deleted file mode 100644
index bcc306176..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/content.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-!3 !-fit-!
-|'''Date: '''|!-7:45:26 PM (MEZ) on Donnerstag, Februar 18, 2021-!|
-|'''Test Page: '''|.FrontPage.AlAktualisierung|
-|'''Command: '''|!-java -cp fitnesse.jar:/usr/lib/mtest/TestPhp.jar:/usr/lib/mtest/fitlibrary.jar:/usr/lib/mtest/log4j.jar:/usr/lib/mtest/fitnesse.jar fitlibrary.suite.FitLibraryServer epic-ts 8080 9-!|
-|'''Exit code: '''|!-0-!|
-|'''Time elapsed: '''|!-13.191 seconds-!|
-----'''Standard Output:'''
-{{{Executing script: sudo apt-get update
-Holen:1 http://debian.fhem.de/nightly  InRelease [1.912 B]
-Ign:2 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena InRelease
-OK:3 http://wagnertech.de/debian stable InRelease
-OK:4 http://ftp-stud.hs-esslingen.de/ubuntu xenial InRelease
-OK:5 http://archive.canonical.com/ubuntu xenial InRelease
-OK:6 http://wagnertech.de/debian testing InRelease
-OK:7 http://ftp-stud.hs-esslingen.de/ubuntu xenial-updates InRelease
-OK:8 http://ftp-stud.hs-esslingen.de/ubuntu xenial-backports InRelease
-OK:9 http://ftp-stud.hs-esslingen.de/pub/Mirrors/packages.linuxmint.com serena Release
-OK:10 http://security.ubuntu.com/ubuntu xenial-security InRelease
-Fehl:1 http://debian.fhem.de/nightly  InRelease
-  Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Es wurden 1.912 B in 2 s geholt (761 B/s).
-Paketlisten werden gelesen...
-Error: W: Während der Überprüfung der Signatur trat ein Fehler auf. Das Depot wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. GPG-Fehler: http://debian.fhem.de/nightly  InRelease: Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Error: W: Fehlschlag beim Holen von http://debian.fhem.de/nightly/InRelease Die folgenden Signaturen konnten nicht überprüft werden, weil ihr öffentlicher Schlüssel nicht verfügbar ist: NO_PUBKEY 6AD8A2BE3436D09A
-Error: W: Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden ignoriert oder alte an ihrer Stelle benutzt.
-Executing script: sudo apt-get -y full-upgrade
-Paketlisten werden gelesen...
-Abhängigkeitsbaum wird aufgebaut....
-Statusinformationen werden eingelesen....
-Paketaktualisierung (Upgrade) wird berechnet...
-Die folgenden Pakete wurden automatisch installiert und werden nicht mehr benötigt:
-  libclamav7 libllvm4.0
-Verwenden Sie »sudo apt autoremove«, um sie zu entfernen.
-Die folgenden Pakete sind zurückgehalten worden:
-  fhem
-0 aktualisiert, 0 neu installiert, 0 zu entfernen und 1 nicht aktualisiert.
-Executing script: apt-cache policy kivitendo
-kivitendo:
-  Installiert:           3.5.6.1-0
-  Installationskandidat: 3.5.6.1-0
-  Versionstabelle:
- *** 3.5.6.1-0 500
-        500 http://wagnertech.de/debian testing/main i386 Packages
-        500 http://wagnertech.de/debian testing/main amd64 Packages
-        100 /var/lib/dpkg/status
-     3.5.4-2 500
-        500 http://wagnertech.de/debian stable/main i386 Packages
-        500 http://wagnertech.de/debian stable/main amd64 Packages
-}}}
\ No newline at end of file
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/properties.xml b/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/AlAktualisierung/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/18-20210118192451.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/18-20210118192451.zip
deleted file mode 100644
index 9a7d8641b..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/18-20210118192451.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/19-20210118192820.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/19-20210118192820.zip
deleted file mode 100644
index 4bd538ad8..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/19-20210118192820.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/20-20210118192928.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/20-20210118192928.zip
deleted file mode 100644
index cf9db81fa..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/20-20210118192928.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/23-20210118192928.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/23-20210118192928.zip
deleted file mode 100644
index 56d5221ca..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/23-20210118192928.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/24-20210118193058.zip b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/24-20210118193058.zip
deleted file mode 100644
index 4e3ad9cf3..000000000
Binary files a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/24-20210118193058.zip and /dev/null differ
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/content.txt b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/content.txt
deleted file mode 100644
index a6368b0ac..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/content.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-!3 !-fit-!
-|'''Date: '''|!-7:30:59 PM (MEZ) on Montag, Januar 18, 2021-!|
-|'''Test Page: '''|.FrontPage.BaDatenbankEinspielen|
-|'''Command: '''|!-java -cp fitnesse.jar:/usr/lib/mtest/TestPhp.jar:/usr/lib/mtest/fitlibrary.jar:/usr/lib/mtest/log4j.jar:/usr/lib/mtest/fitnesse.jar fitlibrary.suite.FitLibraryServer epic-ts 8080 5-!|
-|'''Exit code: '''|!--1-!|
-|'''Time elapsed: '''|!-12.991 seconds-!|
-----'''Standard Output:'''
-{{{Executing script: sudo bin/reset-database 2>&1
-Diese Datenbanken sind verfügbar
-etc/firma-3.5.6.1.dump
-Bitte gewünschte Version eingeben
-}}}----'''Internal Exceptions:'''
-{{{ java.lang.Exception: A size value could not be read. Fragment=||
-	fit.FitProtocol.readSize(FitProtocol.java:44)
-	fitnesse.components.FitClient.attemptToListenToFit(FitClient.java:86)
-	fitnesse.components.FitClient.listenToFit(FitClient.java:76)
-	fitnesse.components.FitClient.access$100(FitClient.java:14)
-	fitnesse.components.FitClient$FitListeningRunnable.run(FitClient.java:133)
-	java.lang.Thread.run(Thread.java:748)
-}}}{{{ java.lang.Exception: A size value could not be read. Fragment=||
-	fit.FitProtocol.readSize(FitProtocol.java:44)
-	fitnesse.components.FitClient.attemptToListenToFit(FitClient.java:86)
-	fitnesse.components.FitClient.listenToFit(FitClient.java:76)
-	fitnesse.components.FitClient.access$100(FitClient.java:14)
-	fitnesse.components.FitClient$FitListeningRunnable.run(FitClient.java:133)
-	java.lang.Thread.run(Thread.java:748)
-}}}
\ No newline at end of file
diff --git a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/properties.xml b/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/ErrorLogs/FrontPage/BaDatenbankEinspielen/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/FitNesse b/Test/FitNesseRoot/FitNesse
deleted file mode 120000
index fc9ce7831..000000000
--- a/Test/FitNesseRoot/FitNesse
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/FitNesse
\ No newline at end of file
diff --git a/Test/FitNesseRoot/FrontPage b/Test/FitNesseRoot/FrontPage
deleted file mode 120000
index 9db6eec70..000000000
--- a/Test/FitNesseRoot/FrontPage
+++ /dev/null
@@ -1 +0,0 @@
-../FitnessePages
\ No newline at end of file
diff --git a/Test/FitNesseRoot/PageFooter b/Test/FitNesseRoot/PageFooter
deleted file mode 120000
index 148c4c188..000000000
--- a/Test/FitNesseRoot/PageFooter
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/PageFooter
\ No newline at end of file
diff --git a/Test/FitNesseRoot/PageHeader b/Test/FitNesseRoot/PageHeader
deleted file mode 120000
index a70744fa1..000000000
--- a/Test/FitNesseRoot/PageHeader
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/PageHeader
\ No newline at end of file
diff --git a/Test/FitNesseRoot/RecentChanges/content.txt b/Test/FitNesseRoot/RecentChanges/content.txt
deleted file mode 100644
index da43d2d86..000000000
--- a/Test/FitNesseRoot/RecentChanges/content.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-|FrontPage.MappingSuite.CalcMapping||19:03:27 Di., Dez. 13, 2022|
-|FrontPage.MappingSuite.ShowMapping||18:44:25 Di., Dez. 13, 2022|
-|FrontPage.MappingSuite||12:36:18 Di., Dez. 13, 2022|
-|FrontPage.AlAktualisierung||19:45:06 Do, Feb 18, 2021|
-|FrontPage.AdNeuInstallation||19:39:22 Do, Feb 18, 2021|
-|FrontPage.AbDeinstallieren||19:21:22 Do, Feb 18, 2021|
-|FrontPage.CaFunktionstest||16:43:08 Do, Feb 18, 2021|
-|FrontPage.AbAktualisierung||19:46:32 Mo, Jan 18, 2021|
-|FrontPage.AaNeuInstallation||19:43:39 Mo, Jan 18, 2021|
-|FrontPage.BaDatenbankEinspielen||19:32:02 Mo, Jan 18, 2021|
-|FrontPage||18:43:41 Mo, Jan 18, 2021|
diff --git a/Test/FitNesseRoot/RecentChanges/properties.xml b/Test/FitNesseRoot/RecentChanges/properties.xml
deleted file mode 100644
index 72aa2b6a6..000000000
--- a/Test/FitNesseRoot/RecentChanges/properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<properties>
-	<Edit>true</Edit>
-	<Files>true</Files>
-	<Properties>true</Properties>
-	<RecentChanges>true</RecentChanges>
-	<Refactor>true</Refactor>
-	<Search>true</Search>
-	<Versions>true</Versions>
-	<WhereUsed>true</WhereUsed>
-</properties>
diff --git a/Test/FitNesseRoot/content.txt b/Test/FitNesseRoot/content.txt
deleted file mode 120000
index de7f38a1f..000000000
--- a/Test/FitNesseRoot/content.txt
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/content.txt
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/css b/Test/FitNesseRoot/files/css
deleted file mode 120000
index 21ff92092..000000000
--- a/Test/FitNesseRoot/files/css
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/files/css
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/html b/Test/FitNesseRoot/files/html
deleted file mode 120000
index 805a03734..000000000
--- a/Test/FitNesseRoot/files/html
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/files/html
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/images b/Test/FitNesseRoot/files/images
deleted file mode 120000
index a73c49ad4..000000000
--- a/Test/FitNesseRoot/files/images
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/files/images
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/javascript b/Test/FitNesseRoot/files/javascript
deleted file mode 120000
index 1c2def4b7..000000000
--- a/Test/FitNesseRoot/files/javascript
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/files/javascript
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/templates b/Test/FitNesseRoot/files/templates
deleted file mode 120000
index c508e4e0e..000000000
--- a/Test/FitNesseRoot/files/templates
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/files/templates
\ No newline at end of file
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AaNeuInstallation/20210118190014_2_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AaNeuInstallation/20210118190014_2_0_0_0.xml
deleted file mode 100644
index c4d16cf93..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AaNeuInstallation/20210118190014_2_0_0_0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AaNeuInstallation</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>69</runTimeInMillis>
-    <content><![CDATA[<table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get update</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get install kivitendo</td>
-	</tr>
-</table>
-<br/>Während der Installation werden auf der Kommandozeile diverse Passwörter gefragt. Immer "kivitendo" eingeben!]]></content>
-    <relativePageName>AaNeuInstallation</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191404_2_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191404_2_0_0_0.xml
deleted file mode 100644
index 6676d58db..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191404_2_0_0_0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>84</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191703_1_2_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191703_1_2_0_0.xml
deleted file mode 100644
index acc6873ad..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191703_1_2_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>1</right>
-      <wrong>2</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>43</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo rm -r /opt/kivitendo</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191806_2_1_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191806_2_1_0_0.xml
deleted file mode 100644
index c268288bd..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218191806_2_1_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>1</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>9</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo rm -r /opt/kivitendo-erp</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192411_3_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192411_3_0_0_0.xml
deleted file mode 100644
index f6cb28f57..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192411_3_0_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>3</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>12</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo rm -r /opt/kivitendo-erp</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-<br/>]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192733_3_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192733_3_0_0_0.xml
deleted file mode 100644
index 1c6294c29..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218192733_3_0_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>3</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>104</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo rm -r /opt/kivitendo-erp</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-<br/>]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218193836_3_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218193836_3_0_0_0.xml
deleted file mode 100644
index e494b8de2..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20210218193836_3_0_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>3</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>17</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo rm -r /opt/kivitendo-erp</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-<br/>]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20220127214229_3_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20220127214229_3_0_0_0.xml
deleted file mode 100644
index ce27623bd..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AbDeinstallieren/20220127214229_3_0_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AbDeinstallieren</rootPath>
-    <result>
-    <counts>
-      <right>3</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>31</runTimeInMillis>
-    <content><![CDATA[Um eine Neuinstallation zu simulieren, muss erst die alte Version entfernt werden:<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y remove kivitendo</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo rm -r /opt/kivitendo-erp</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo bin/remove-database</td>
-	</tr>
-</table>
-<br/>]]></content>
-    <relativePageName>AbDeinstallieren</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20210218193907_2_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20210218193907_2_0_0_0.xml
deleted file mode 100644
index 1d3b5568a..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20210218193907_2_0_0_0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AdNeuInstallation</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>9</runTimeInMillis>
-    <content><![CDATA[<table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get update</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>echo kivitendo |sudo apt-get install kivitendo</td>
-	</tr>
-</table>
-<br/>Während der Installation werden auf der Kommandozeile diverse Passwörter gefragt. Immer "kivitendo" eingeben!]]></content>
-    <relativePageName>AdNeuInstallation</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20220127214316_2_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20220127214316_2_0_0_0.xml
deleted file mode 100644
index fc21d1064..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AdNeuInstallation/20220127214316_2_0_0_0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AdNeuInstallation</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>31</runTimeInMillis>
-    <content><![CDATA[<table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get update</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>echo kivitendo |sudo apt-get install -y kivitendo</td>
-	</tr>
-</table>
-<br/>Während der Installation werden auf der Kommandozeile diverse Passwörter gefragt. Immer "kivitendo" eingeben!]]></content>
-    <relativePageName>AdNeuInstallation</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194445_2_1_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194445_2_1_0_0.xml
deleted file mode 100644
index d17d701b9..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194445_2_1_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AlAktualisierung</rootPath>
-    <result>
-    <counts>
-      <right>2</right>
-      <wrong>1</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>20</runTimeInMillis>
-    <content><![CDATA[<table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get update</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo apt-get install -y full-upgrade</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>apt-cache policy kivitendo</td>
-	</tr>
-</table>
-<br/>Falls die Aktualisierung mit der Hand gemacht wird und dabei nach einem Passwort gefragt wird, muss immer "kivitendo" eingegeben werden!<br/>]]></content>
-    <relativePageName>AlAktualisierung</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194525_3_0_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194525_3_0_0_0.xml
deleted file mode 100644
index d390bf3eb..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.AlAktualisierung/20210218194525_3_0_0_0.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>AlAktualisierung</rootPath>
-    <result>
-    <counts>
-      <right>3</right>
-      <wrong>0</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>15</runTimeInMillis>
-    <content><![CDATA[<table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get update</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>sudo apt-get -y full-upgrade</td>
-	</tr>
-	<tr>
-		<td class="pass">call script</td>
-		<td>apt-cache policy kivitendo</td>
-	</tr>
-</table>
-<br/>Falls die Aktualisierung mit der Hand gemacht wird und dabei nach einem Passwort gefragt wird, muss immer "kivitendo" eingegeben werden!<br/>]]></content>
-    <relativePageName>AlAktualisierung</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192451_0_1_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192451_0_1_0_0.xml
deleted file mode 100644
index 44ec15eec..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192451_0_1_0_0.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>BaDatenbankEinspielen</rootPath>
-    <result>
-    <counts>
-      <right>0</right>
-      <wrong>1</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>23</runTimeInMillis>
-    <content><![CDATA[Kivitendo hat mehrere Datenbaken: Eine für die Nutzerverwaltung (kivitendo_auth) und je eine pro Mandat. Für den Test wird eine zweite DB namens "firma" verwendet.<br/><br/>Die "firma"-DB liegt in verschiedenen Versionen vor. Daher fragt das Skript auf der Kommandozeile nach der Version. Hier muss nur die Nummer (z.B. "3.5.7") eingegeben werden.<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo bin/reset-database</td>
-	</tr>
-</table>
-]]></content>
-    <relativePageName>BaDatenbankEinspielen</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192820_0_1_0_0.xml b/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192820_0_1_0_0.xml
deleted file mode 100644
index b295a4e9c..000000000
--- a/Test/FitNesseRoot/files/testResults/FrontPage.BaDatenbankEinspielen/20210118192820_0_1_0_0.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<testResults>
-  <FitNesseVersion>v20111026</FitNesseVersion>
-  <rootPath>BaDatenbankEinspielen</rootPath>
-    <result>
-    <counts>
-      <right>0</right>
-      <wrong>1</wrong>
-      <ignores>0</ignores>
-      <exceptions>0</exceptions>
-    </counts>
-    <runTimeInMillis>5</runTimeInMillis>
-    <content><![CDATA[Kivitendo hat mehrere Datenbaken: Eine für die Nutzerverwaltung (kivitendo_auth) und je eine pro Mandat. Für den Test wird eine zweite DB namens "firma" verwendet.<br/><br/>Die "firma"-DB liegt in verschiedenen Versionen vor. Daher fragt das Skript auf der Kommandozeile nach der Version. Hier muss nur die Nummer (z.B. "3.5.7") eingegeben werden.<br/><br/><table border="1" cellspacing="0">
-	<tr>
-		<td colspan="2">test.util.CallScript</td>
-	</tr>
-	<tr>
-		<td class="fail">call script</td>
-		<td>sudo bin/reset-database</td>
-	</tr>
-</table>
-]]></content>
-    <relativePageName>BaDatenbankEinspielen</relativePageName>
-    
-    
-    
-  </result>
-  
-    <finalCounts>
-    <right>0</right>
-    <wrong>0</wrong>
-    <ignores>0</ignores>
-    <exceptions>0</exceptions>
-  </finalCounts>
-  <totalRunTimeInMillis>0</totalRunTimeInMillis>
-  
-</testResults>
-
diff --git a/Test/FitNesseRoot/properties b/Test/FitNesseRoot/properties
deleted file mode 120000
index a53ad86e8..000000000
--- a/Test/FitNesseRoot/properties
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/properties
\ No newline at end of file
diff --git a/Test/FitNesseRoot/properties.xml b/Test/FitNesseRoot/properties.xml
deleted file mode 120000
index c509679d3..000000000
--- a/Test/FitNesseRoot/properties.xml
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mtest/FitNesseRoot/properties.xml
\ No newline at end of file
diff --git a/Test/FitNesseRoot/updateDoNotCopyOverList b/Test/FitNesseRoot/updateDoNotCopyOverList
deleted file mode 100644
index 5eb95426b..000000000
--- a/Test/FitNesseRoot/updateDoNotCopyOverList
+++ /dev/null
@@ -1,4 +0,0 @@
-FitNesseRoot/files/css/fitnesse.css
-FitNesseRoot/files/css/fitnesse_print.css
-FitNesseRoot/FrontPage/content.txt
-FitNesseRoot/FrontPage/properties.xml
diff --git a/Test/FitNesseRoot/updateList b/Test/FitNesseRoot/updateList
deleted file mode 100644
index a8621145c..000000000
--- a/Test/FitNesseRoot/updateList
+++ /dev/null
@@ -1,1446 +0,0 @@
-FitNesseRoot/files/images/executionStatus/Thumbs.db
-FitNesseRoot/files/images/executionStatus/error.gif
-FitNesseRoot/files/images/executionStatus/ok.gif
-FitNesseRoot/files/images/executionStatus/output.gif
-FitNesseRoot/files/images/FitNesseInstallerLogo.png
-FitNesseRoot/files/images/FitNesseLogo.gif
-FitNesseRoot/files/images/FitNesseLogo.psd
-FitNesseRoot/files/images/FitNesseLogoMedium.jpg
-FitNesseRoot/files/images/FitnesseStarted.png
-FitNesseRoot/files/images/Thumbs.db
-FitNesseRoot/files/images/collapsableClosed.gif
-FitNesseRoot/files/images/collapsableOpen.gif
-FitNesseRoot/files/images/fail.png
-FitNesseRoot/files/images/fitnesse_architecture.jpg
-FitNesseRoot/files/images/folder.gif
-FitNesseRoot/files/images/importedPage.jpg
-FitNesseRoot/files/images/pass.png
-FitNesseRoot/files/images/plus.png
-FitNesseRoot/files/images/stop.gif
-FitNesseRoot/files/images/unrun.png
-FitNesseRoot/files/images/virtualPage.jpg
-FitNesseRoot/files/css/fitnesse_base.css
-FitNesseRoot/files/css/jquery.autocomplete.css
-FitNesseRoot/files/javascript/jsunit/app/jsUnitCore.js
-FitNesseRoot/files/javascript/jsunit/app/jsUnitMockTimeout.js
-FitNesseRoot/files/javascript/jsunit/app/jsUnitTestManager.js
-FitNesseRoot/files/javascript/jsunit/app/jsUnitTestSuite.js
-FitNesseRoot/files/javascript/jsunit/app/jsUnitTracer.js
-FitNesseRoot/files/javascript/jsunit/app/jsUnitVersionCheck.js
-FitNesseRoot/files/javascript/jsunit/app/xbDebug.js
-FitNesseRoot/files/javascript/SpreadsheetTranslator.js
-FitNesseRoot/files/javascript/WikiFormatter.js
-FitNesseRoot/files/javascript/clientSideSort.js
-FitNesseRoot/files/javascript/fitnesse.js
-FitNesseRoot/files/javascript/fitnesseTreeControl.js
-FitNesseRoot/files/javascript/jquery-1.3.2.min.js
-FitNesseRoot/files/javascript/jsUnitTestLink.js
-FitNesseRoot/files/javascript/spreadsheetSupport.js
-FitNesseRoot/files/javascript/textareaWrapSupport.js
-FitNesseRoot/files/javascript/wikiFormatterSupport.js
-FitNesseRoot/files/html/index.html
-FitNesseRoot/files/html/treeControl.html
-FitNesseRoot/files/templates/addChildPagePopup.vm
-FitNesseRoot/files/templates/compareHistory.vm
-FitNesseRoot/files/templates/pageFooter.vm
-FitNesseRoot/files/templates/pageHead.vm
-FitNesseRoot/files/templates/pageHistory.vm
-FitNesseRoot/files/templates/pageHistoryXML.vm
-FitNesseRoot/files/templates/pageTitle.vm
-FitNesseRoot/files/templates/refactorForm.vm
-FitNesseRoot/files/templates/searchForm.vm
-FitNesseRoot/files/templates/searchResultsEntry.vm
-FitNesseRoot/files/templates/searchResultsFooter.vm
-FitNesseRoot/files/templates/searchResultsHeader.vm
-FitNesseRoot/files/templates/suiteExecutionReport.vm
-FitNesseRoot/files/templates/suiteHistoryXML.vm
-FitNesseRoot/files/templates/suiteOverview.vm
-FitNesseRoot/files/templates/suiteOverviewNode.vm
-FitNesseRoot/files/templates/suiteXML.vm
-FitNesseRoot/files/templates/testExecutionReport.vm
-FitNesseRoot/files/templates/testHistory.vm
-FitNesseRoot/files/templates/testHistoryXML.vm
-FitNesseRoot/files/templates/testResults.vm
-FitNesseRoot/FitNesse/FitNesse/content.txt
-FitNesseRoot/FitNesse/FitNesse/properties.xml
-FitNesseRoot/FitNesse/JunkPage/content.txt
-FitNesseRoot/FitNesse/JunkPage/properties.xml
-FitNesseRoot/FitNesse/ReadProtectedPage/content.txt
-FitNesseRoot/FitNesse/ReadProtectedPage/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/GrandChildPageOne/GreatGrandChildPageOne/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/GrandChildPageOne/GreatGrandChildPageOne/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/GrandChildPageOne/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/GrandChildPageOne/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageOne/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageThree/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageThree/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageTwo/GrandChildPageTwo/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageTwo/GrandChildPageTwo/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildPageTwo/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildPageTwo/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/ChildWithUnicode/content.txt
-FitNesseRoot/FitNesse/SampleWiki/ChildWithUnicode/properties.xml
-FitNesseRoot/FitNesse/SampleWiki/content.txt
-FitNesseRoot/FitNesse/SampleWiki/properties.xml
-FitNesseRoot/FitNesse/SliM/content.txt
-FitNesseRoot/FitNesse/SliM/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildOne/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildOne/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithAliasLinkToNonExistentPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithAliasLinkToNonExistentPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithAliasLinkToNonExistentSubPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithAliasLinkToNonExistentSubPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithLinkToNonExistentPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithLinkToNonExistentPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithSubPageLinkToNonExistentPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/ChildWithSubPageLinkToNonExistentPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludedPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludedPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludingPage/ChildIncludingPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludingPage/ChildIncludingPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludingPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/IncludingPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/AcceptanceTestPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/FixtureList/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/FixtureList/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/PageFooter/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/PageFooter/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/PageHeader/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/PageHeader/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/AlwaysSecureOperation/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/AlwaysSecureOperation/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureReadOperations/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureReadOperations/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureTestOperations/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureTestOperations/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureWriteOperations/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SecureWriteOperations/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestInsecureReadPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestInsecureReadPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestReadChildOfSecurePage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestReadChildOfSecurePage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureFilesAccess/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureFilesAccess/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureSuitePage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureSuitePage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureTestPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/TestSecureTestPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteAuthenticationTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestEditExistingPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestEditExistingPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestEditNewPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestEditNewPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUnicodeCharacters/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUnicodeCharacters/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInProperties/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInProperties/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInRecentChanges/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInRecentChanges/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInVersions/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameInVersions/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameSaved/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/TestUserNameSaved/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteEditResponderTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAndAppendLastRow/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/CopyAppendLastRowAndIncrementColumnValues/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/IncrementColumnsValues/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/IncrementColumnsValues/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/MaxTimeDivision/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/MaxTimeDivision/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/MultipleDivision/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/MultipleDivision/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TearDown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TimeRangeDivision/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TimeRangeDivision/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TimedMultipleDivision/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/TimedMultipleDivision/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFitDecoratorTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestArraysInColumnFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestArraysInColumnFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestMissingField/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestMissingField/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestMissingMethod/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestMissingMethod/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestSaveAndRecallSymbol/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/TestSaveAndRecallSymbol/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteColumnFixtureSpec/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestBlankAndNullCells/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestBlankAndNullCells/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestCannotResolveGracefullyNamedFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestCannotResolveGracefullyNamedFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestFixtureNotFound/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestFixtureNotFound/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestFixtureNotFoundAfterTackingOnFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestFixtureNotFoundAfterTackingOnFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestNoDefaultConstructor/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestNoDefaultConstructor/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestNotFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestNotFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestParsingOfObjects/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestParsingOfObjects/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestTackOnFixtureNotFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/TestTackOnFixtureNotFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteGeneralFixtureSpec/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteRowFixtureSpec/TestBasicRowFixture/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteRowFixtureSpec/TestBasicRowFixture/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteRowFixtureSpec/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/SuiteRowFixtureSpec/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteFixtureTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddChildToNonExistentPageTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddChildToNonExistentPageTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddDefaultWithNameOfSuiteTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddDefaultWithNameOfSuiteTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddDefaultWithNameOfTestTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddDefaultWithNameOfTestTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddInvalidChildNameTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddInvalidChildNameTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddNormalWithNameOfSuiteTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddNormalWithNameOfSuiteTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddNormalWithNameOfTestTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddNormalWithNameOfTestTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddSimpleChildPageTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddSimpleChildPageTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddSuitePageTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddSuitePageTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddTestPageTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/AddTestPageTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/CantAddChildWithNoNameTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/CantAddChildWithNoNameTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/AddChildResponderSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteFileSection/TestFileSectionOrder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteFileSection/TestFileSectionOrder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteFileSection/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteFileSection/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestCantMovePageBeneathSelf/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestCantMovePageBeneathSelf/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMoveIncludedPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMoveIncludedPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageInsideItself/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageInsideItself/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageThreeLevelsDown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageThreeLevelsDown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithAbsoluteInternalReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithAbsoluteInternalReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithExternalReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithExternalReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithManyLevelsOfSubPages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithManyLevelsOfSubPages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithRelativeInternalReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithRelativeInternalReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithSubPages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMovePageWithSubPages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMoveToNonExistentPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestMoveToNonExistentPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestReferencesOfChildOfMovedPageAreRenamed/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestReferencesOfChildOfMovedPageAreRenamed/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestSimpleMove/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/TestSimpleMove/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteMoveResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuitePropertiesResponder/TestPropertyCheckboxesArePresent/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuitePropertiesResponder/TestPropertyCheckboxesArePresent/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuitePropertiesResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuitePropertiesResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestProtectedWidgetsAreNotRenamed/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestProtectedWidgetsAreNotRenamed/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameChildPageWithAbsoluteReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameChildPageWithAbsoluteReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameChildPageWithSiblingReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameChildPageWithSiblingReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameDoesNotMove/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameDoesNotMove/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameMovesChildPages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenameMovesChildPages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageThatRefersToItself/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageThatRefersToItself/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasAbsoluteReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasAbsoluteReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasLinkReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasLinkReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasSubLinkReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithAliasSubLinkReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithBackwardsSearchReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithBackwardsSearchReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithSiblingReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithSiblingReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithSubpageReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/TestRenamePageWithSubpageReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRenameResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplaceContentsInPageHierarchy/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplaceContentsInPageHierarchy/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplacementWithPatternGroups/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplacementWithPatternGroups/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplacesContent/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/TestReplacesContent/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteReplaceResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRunResponder/TestLinearClassPath/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRunResponder/TestLinearClassPath/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRunResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteRunResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/SamplePages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/SamplePages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestContentSearch/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestContentSearch/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestSearchForm/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestSearchForm/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestTitleSearch/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/TestTitleSearch/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteSearchResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/DoTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/DoTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestErrorOccurred/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestErrorOccurred/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestExecutedOk/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestExecutedOk/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestOutputCaptured/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/TestOutputCaptured/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteExecutionStatusMessages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/SetUpAndTearDownShouldBeIncludedProperly/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/SetUpAndTearDownShouldBeIncludedProperly/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestExecutionStatusBox/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestExecutionStatusBox/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestFirstTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestFirstTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestNotSuiteFilter/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestNotSuiteFilter/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestOneSubPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestOneSubPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestPrunedPageIsExcluded/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestPrunedPageIsExcluded/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestSuiteFilter/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestSuiteFilter/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestSuiteWithOneXrefWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestSuiteWithOneXrefWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestTwoSubPages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/TestTwoSubPages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreCollapsable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreCollapsable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreCollapsableWithVariable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreCollapsableWithVariable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreHidden/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreHidden/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreUncollapsedWithVariable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/TestSetUpAndTearDownAreUncollapsedWithVariable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/SuiteSetUpAndTearDown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestPathIsIncluded/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestPathIsIncluded/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestStatusBox/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/TestStatusBox/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteTestResponders/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteVersionResponder/TestUsenameInVersionList/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteVersionResponder/TestUsenameInVersionList/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteVersionResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/SuiteVersionResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestNameResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestNameResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestPacketResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestPacketResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestRssResponder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestRssResponder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestShutdown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/TestShutdown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteResponderTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ChainTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ChainTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ChainWithInstanceTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ChainWithInstanceTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/DefineTableTypeTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/DefineTableTypeTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ErikPragtBug/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ErikPragtBug/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/HashTableTests/ShouldConvertHashWidgetToHashTable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/HashTableTests/ShouldConvertHashWidgetToHashTable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/HashTableTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/HashTableTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LastLibraryPreceedsEarlierLibraryTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LastLibraryPreceedsEarlierLibraryTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/LibraryInSetUpAndPageTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/LibraryInSetUpAndPageTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/LibraryInSetUpTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/LibraryInSetUpTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/LibraryInSetUpSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/OneLibraryTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/OneLibraryTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/LibrarySuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/MultiByteCharsInSlim/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/MultiByteCharsInSlim/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ParameterizedScenarios/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ParameterizedScenarios/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/QueryTableSuite/TestMatching/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/QueryTableSuite/TestMatching/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/QueryTableSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/QueryTableSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/RegularExpressionMatching/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/RegularExpressionMatching/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/BlankCellsInNestedScenariosShouldWork/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/BlankCellsInNestedScenariosShouldWork/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/BrotherScenarioLibraryIsIncluded/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/BrotherScenarioLibraryIsIncluded/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/DoesntFailIfScenariosIncludedTwice/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/DoesntFailIfScenariosIncludedTwice/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ManyUnclesAreIncluded/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ManyUnclesAreIncluded/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/NewPageThing/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/NewPageThing/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/NoScenarioSectionIfThereAreNone/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/NoScenarioSectionIfThereAreNone/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/ScenarioLibraryOrderIsCorrect/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/ScenarioLibraryOrderIsCorrect/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/ScenarioLibraryOrderTestParent/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/ScenarioLibraryOrderSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibariesOrderTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibrariesAreIncludedInTheCorrectOrder/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibrariesAreIncludedInTheCorrectOrder/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibrariesOnlyIncludedInTestPages/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenarioLibrariesOnlyIncludedInTestPages/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenariosOnlyInSlimTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/ScenariosOnlyInSlimTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/ScenarioLibraryTestSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolCanHoldInstanceUsedAsParameter/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolCanHoldInstanceUsedAsParameter/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolDollarDollar/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolDollarDollar/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolsCanBeBlankOrNull/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SlimSymbolsCanBeBlankOrNull/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SuiteSpecificationsPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SuiteSpecificationsPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SystemUnderTestTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/SystemUnderTestTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TableTableReturnsNull/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TableTableReturnsNull/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestCanPassSymbolsIntoConstructors/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestCanPassSymbolsIntoConstructors/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestComparators/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestComparators/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestOrderedQueryWithDuplicateRows/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestOrderedQueryWithDuplicateRows/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestPageWithInclude/IncludedPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestPageWithInclude/IncludedPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestPageWithInclude/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestPageWithInclude/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSequentialArgumentProcessing/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSequentialArgumentProcessing/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSubsetQuery/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSubsetQuery/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSymbolsDontGetTurnedToStringsInTheOutput/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestSymbolsDontGetTurnedToStringsInTheOutput/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTryingParameterizationIsntTooGreedy/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTwoIdenticalTablesOnPageDontConflict/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/TestTwoIdenticalTablesOnPageDontConflict/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSlimTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateAbsoluteSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateBackwardSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateNestedBackSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateRelativeSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/CreateSubPageSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingAbsoluteSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingAbsoluteSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingBackwardSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingBackwardSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingNestedBackSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingNestedBackSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingRelativeSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingRelativeSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingSubPageSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestCreatingSubPageSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestRemovingSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestRemovingSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestRenameSymbolicLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestRenameSymbolicLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestSymbolicLinkBehavior/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/TestSymbolicLinkBehavior/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteSymbolicLinkTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryFailCountIsSumOfFailuresAndExceptions/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryFailCountIsSumOfFailuresAndExceptions/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryForSuiteCountsTestsNotAsserts/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryForSuiteCountsTestsNotAsserts/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasBreadCrumbs/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasBreadCrumbs/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreenDateFieldIfNoErrors/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreenDateFieldIfNoErrors/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreenPassCountWhenNonZero/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreenPassCountWhenNonZero/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyDateIfNeitherPassNorFail/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyDateIfNeitherPassNorFail/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyFailureCountWhenZero/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyFailureCountWhenZero/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyPassCountWhenZero/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasGreyPassCountWhenZero/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasRedDateFieldIfFailure/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasRedDateFieldIfFailure/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasRedFailureCountWhenNonZero/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryHasRedFailureCountWhenNonZero/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryLineIsLinkToTestResult/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryLineIsLinkToTestResult/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryWithOneTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryWithOneTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryWithTwoTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/PageHistoryWithTwoTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTestHistoryTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineIsLinkToPageHistory/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineIsLinkToPageHistory/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineResultElementsAreLinksToTestResults/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineResultElementsAreLinksToTestResults/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineShouldShowLastTwentyResults/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineShouldShowLastTwentyResults/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineShouldShowPassFailResultsInColor/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryLineShouldShowPassFailResultsInColor/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryShouldHaveTitle/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/TopLevelHistoryShouldHaveTitle/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/SuiteTopLevelTestHistory/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteTestHistory/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAccessVirtualChild/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAccessVirtualChild/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAliasLinkToNonExistentPageDefersToRemoteServer/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAliasLinkToNonExistentPageDefersToRemoteServer/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAliasLinkToNonExistentSubPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestAliasLinkToNonExistentSubPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestIncludedPageInRange/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestIncludedPageInRange/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestIncludedPageOutOfRange/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestIncludedPageOutOfRange/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestQuestionMarkLinkDefersToRemoteServer/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestQuestionMarkLinkDefersToRemoteServer/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestQuestionMarkLinkForChildPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestQuestionMarkLinkForChildPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestVirtualLinkConnection/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestVirtualLinkConnection/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestVirtualLinkError/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/TestVirtualLinkError/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteVirtualWikiTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsTestsInclude/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsTestsInclude/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsTestsIncludeWithHelp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsTestsIncludeWithHelp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsUsage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ContentsUsage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SetUpLinkTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SetUpLinkTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ShouldNotBeAbleToIncludeParentPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/ShouldNotBeAbleToIncludeParentPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SimpleWidgets/DavidHookersBug/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SimpleWidgets/DavidHookersBug/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SimpleWidgets/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/SimpleWidgets/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestBackwardsSearchWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestBackwardsSearchWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestBrokenWikiWordLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestBrokenWikiWordLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestClasspathContainingVariable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestClasspathContainingVariable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestClasspathPrecededByDefine/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestClasspathPrecededByDefine/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestCollapsableSections/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestCollapsableSections/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestComment/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestComment/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContents/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContents/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsFilters/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsFilters/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsHelp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsHelp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsProperties/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsProperties/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsRegraced/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsRegraced/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsWithRecursion/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestContentsWithRecursion/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestEmailWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestEmailWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestEvaluator/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestEvaluator/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestExistingWikiWordLink/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestExistingWikiWordLink/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestExpression/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestExpression/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestGtSubPageWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestGtSubPageWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestGtSubPageWidgetInAlias/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestGtSubPageWidgetInAlias/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHash/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHash/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHelp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHelp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpLinkWithVariable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpLinkWithVariable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestHttpStatus/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestInclude/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestInclude/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeBackwardsSearchPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeBackwardsSearchPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeCollapsed/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeCollapsed/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeIsCollapsable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeIsCollapsable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSeamless/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSeamless/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSetUpTearDownWithPageName/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSetUpTearDownWithPageName/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSubPage/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestIncludeSubPage/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestLineBreak/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestLineBreak/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestLinkAlias/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestLinkAlias/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestMultiLineTable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestMultiLineTable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestNormalListWithLeadingNumbers/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestNormalListWithLeadingNumbers/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestNumericList/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestNumericList/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestParentVariables/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestParentVariables/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestRunningPageName/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSimpleList/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSimpleList/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSimpleTable/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSimpleTable/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubList/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubList/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubPageWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubPageWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubPageWidgetInAlias/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestSubPageWidgetInAlias/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTables/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTables/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTheXrefWidget/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTheXrefWidget/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTitleTag/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestTitleTag/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariables/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariables/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariablesFromSystemProperties/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariablesFromSystemProperties/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariablesWithBracesBracketsAndParents/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/TestVariablesWithBracesBracketsAndParents/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiPagePath/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiPagePath/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiPageReference/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiPageReference/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiWord/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/WikiWord/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWidgetTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/CreateSecureWiki/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/CreateSecureWiki/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/ScenarioLibrary/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/ScenarioLibrary/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/SetUp/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestAutomaticUpdate/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestAutomaticUpdate/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestCantImportFromSecureWiki/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestCantImportFromSecureWiki/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportFromSecureWikiWithCredentials/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportFromSecureWikiWithCredentials/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportingSampleWiki/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportingSampleWiki/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportingUnicodeCharacters/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestImportingUnicodeCharacters/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestOrphanedPagesAreRemoved/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestOrphanedPagesAreRemoved/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestPropertiesPageHasImportForm/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestPropertiesPageHasImportForm/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestPropertiesPageHasUpdateForm/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestPropertiesPageHasUpdateForm/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestUnmodifiedPagesAreNotImported/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestUnmodifiedPagesAreNotImported/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestUpdatingImportedWiki/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestUpdatingImportedWiki/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestWaterMarkAndEditButtons/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/TestWaterMarkAndEditButtons/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiImportTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestBreadCrumbs/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestBreadCrumbs/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestHeadersAndFooters/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestHeadersAndFooters/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationDefault/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationDefault/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithSuite/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithSuite/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithTest/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/TestNavigationWithTest/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/SuiteWikiPageResponderTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/TearDown/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/TearDown/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/SuiteAcceptanceTestsDummy/content.txt
-FitNesseRoot/FitNesse/SuiteAcceptanceTestsDummy/properties.xml
-FitNesseRoot/FitNesse/SuiteFitAcceptanceTests/TestFixtures/content.txt
-FitNesseRoot/FitNesse/SuiteFitAcceptanceTests/TestFixtures/properties.xml
-FitNesseRoot/FitNesse/SuiteFitAcceptanceTests/content.txt
-FitNesseRoot/FitNesse/SuiteFitAcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/AcceptanceTestPatterns/content.txt
-FitNesseRoot/FitNesse/UserGuide/AcceptanceTestPatterns/properties.xml
-FitNesseRoot/FitNesse/UserGuide/AcceptanceTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/AcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ActionFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/ActionFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ActionFixtureCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/ActionFixtureCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/AdministeringFitnesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/AdministeringFitnesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/AttentionMessagesInTestResults/content.txt
-FitNesseRoot/FitNesse/UserGuide/AttentionMessagesInTestResults/properties.xml
-FitNesseRoot/FitNesse/UserGuide/BeingAsister/content.txt
-FitNesseRoot/FitNesse/UserGuide/BeingAsister/properties.xml
-FitNesseRoot/FitNesse/UserGuide/BuildOperateCheck/content.txt
-FitNesseRoot/FitNesse/UserGuide/BuildOperateCheck/properties.xml
-FitNesseRoot/FitNesse/UserGuide/BuildingClassPaths/content.txt
-FitNesseRoot/FitNesse/UserGuide/BuildingClassPaths/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ClassPath/content.txt
-FitNesseRoot/FitNesse/UserGuide/ClassPath/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ColumnFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/ColumnFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ColumnFixtureCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/ColumnFixtureCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ColumnFixtureDesign/content.txt
-FitNesseRoot/FitNesse/UserGuide/ColumnFixtureDesign/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CommandLineArguments/content.txt
-FitNesseRoot/FitNesse/UserGuide/CommandLineArguments/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CommandLineOption/content.txt
-FitNesseRoot/FitNesse/UserGuide/CommandLineOption/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CommentTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/CommentTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CommonIncludes/content.txt
-FitNesseRoot/FitNesse/UserGuide/CommonIncludes/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ComparisonExpressionsInFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/ComparisonExpressionsInFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ControllingFitNesseFromTheCommandLine/content.txt
-FitNesseRoot/FitNesse/UserGuide/ControllingFitNesseFromTheCommandLine/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CreatingTestTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/CreatingTestTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CustomizingLookAndFeel/content.txt
-FitNesseRoot/FitNesse/UserGuide/CustomizingLookAndFeel/properties.xml
-FitNesseRoot/FitNesse/UserGuide/CustomizingTestExecution/content.txt
-FitNesseRoot/FitNesse/UserGuide/CustomizingTestExecution/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DataTypesInFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/DataTypesInFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DebuggingFitNesseTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/DebuggingFitNesseTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DebugingFixtureCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/DebugingFixtureCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DeliveringTheRightSystem/content.txt
-FitNesseRoot/FitNesse/UserGuide/DeliveringTheRightSystem/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitServer/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitServer/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitServerProtocol/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/FitServerProtocol/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesignNotes/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesigningWithActionFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesigningWithActionFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DesigningWithRowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DesigningWithRowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/DotNetFitServer/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/DotNetFitServer/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/DotNetTestRunner/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/DotNetTestRunner/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestBlankAndNullKeywords/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestBlankAndNullKeywords/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestBooleanSymbols/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestBooleanSymbols/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestErrorKeyword/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestErrorKeyword/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestExceptionKeywordHandler/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestExceptionKeywordHandler/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestFailKeyword/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestFailKeyword/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestSaveAndRecallSymbols/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/TestSaveAndRecallSymbols/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteDefaultCellHandlerTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestCustomHandler/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestCustomHandler/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestHandlerLoader/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestHandlerLoader/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestRangeHandlers/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestRangeHandlers/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestSubstringHandlers/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/TestSubstringHandlers/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/SuiteOptionalAndCustomHandlerTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/TestQuerySymbols/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/TestQuerySymbols/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteCellHandlerTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFitServerTests/TestPathParser/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFitServerTests/TestPathParser/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFitServerTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFitServerTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestActionFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestActionFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestExecuteOnColumnFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestExecuteOnColumnFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestFixtureParameters/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestFixtureParameters/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestImportFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestImportFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestItemsWithSomeCommonProperties/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestItemsWithSomeCommonProperties/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestRowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestRowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestRowFixtureAllowsDups/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestRowFixtureAllowsDups/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestTableFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestTableFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestWhiteSpace/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/TestWhiteSpace/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteFixtureTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/SuitePacketBuilder/FormPacketServiceFitTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/SuitePacketBuilder/FormPacketServiceFitTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/SuitePacketBuilder/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/SuitePacketBuilder/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteLifeWorkSheetsOnlineTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestArrayConversion/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestArrayConversion/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestCustomTypeConversion/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestCustomTypeConversion/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestEnumConversion/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestEnumConversion/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestPrimitiveTypeConversion/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/TestPrimitiveTypeConversion/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/SuiteTypeConversionTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TearDown/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TearDown/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestCustomType/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestCustomType/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestFieldsPropertiesAndMethods/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestFieldsPropertiesAndMethods/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestGracefulFixtureNames/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestGracefulFixtureNames/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestGracefulMemberNames/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/TestGracefulMemberNames/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/SuiteAcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DotNet/content.txt
-FitNesseRoot/FitNesse/UserGuide/DotNet/properties.xml
-FitNesseRoot/FitNesse/UserGuide/DownloadingAndInstallingFitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/DownloadingAndInstallingFitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/EditingFitNessePages/content.txt
-FitNesseRoot/FitNesse/UserGuide/EditingFitNessePages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ExceptionsInFitTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/ExceptionsInFitTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ExecutingTestsOutsideTheUserInterface/content.txt
-FitNesseRoot/FitNesse/UserGuide/ExecutingTestsOutsideTheUserInterface/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ExternalHtmlPages/content.txt
-FitNesseRoot/FitNesse/UserGuide/ExternalHtmlPages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FilesSection/content.txt
-FitNesseRoot/FitNesse/UserGuide/FilesSection/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitFramework/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitFramework/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/AnotherSuiteFixtureExample/SuiteSetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/AnotherSuiteFixtureExample/SuiteSetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/AnotherSuiteFixtureExample/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/AnotherSuiteFixtureExample/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ArrayFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ArrayFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CalculateFixture/WritingFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CalculateFixture/WritingFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CalculateFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CalculateFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CombinationFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CombinationFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CommentFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/CommentFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ConstraintFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ConstraintFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/DoFixtureSummary/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/DoFixtureSummary/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/FixtureDetails/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/FixtureDetails/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/SetUpTearDown/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/SetUpTearDown/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/SpecialisedIssues/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/SpecialisedIssues/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/WhenActionsFail/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/WhenActionsFail/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/WritingFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/WritingFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DoFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DotGraphics/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/DotGraphics/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ExperimentalExtensions/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ExperimentalExtensions/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ExtendedCamelCase/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ExtendedCamelCase/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FaQ4Programmers/KeepTags/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FaQ4Programmers/KeepTags/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FaQ4Programmers/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FaQ4Programmers/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FileCompareFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FileCompareFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FitBook/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FitBook/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FitLibraryFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FitLibraryFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FolderRunner/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/FolderRunner/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/GridFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/GridFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/HowTo/IgnoreTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/HowTo/IgnoreTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/HowTo/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/HowTo/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ImageFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ImageFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ImageNameGraphic/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ImageNameGraphic/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/LatestChanges/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/LatestChanges/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/MetaTypeAdapter/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/MetaTypeAdapter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/NestedTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/NestedTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/OtherLanguages/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/OtherLanguages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ParamRowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ParamRowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SequenceFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SequenceFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetUpFixture/WritingFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetUpFixture/WritingFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetUpFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SetUpFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SubsetFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SubsetFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/SuiteSetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/SuiteSetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChat/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChat/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithDifferentName/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithDifferentName/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithKeywords/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithKeywords/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithSkippedKeywords/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/TestChatWithSkippedKeywords/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtureExample/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/CustomerSuiteFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/CustomerSuiteFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/ProgrammerSuiteFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/ProgrammerSuiteFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/SuiteFixtureDetailsAndRationale/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/SuiteFixtureDetailsAndRationale/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SuiteFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SupportForGraphics/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/SupportForGraphics/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TaggedStrings/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TaggedStrings/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ToStringArrayFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/ToStringArrayFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TreeList/AnotherTreeExample/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TreeList/AnotherTreeExample/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TreeList/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/TreeList/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/WritingListFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/WritingListFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitLibraryUserGuide/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitNesseTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitNesseTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitNesseWontStart/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitNesseWontStart/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitProtocol/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitProtocol/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitServer/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitServer/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitServerProtocol/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitServerProtocol/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FitTableStyles/content.txt
-FitNesseRoot/FitNesse/UserGuide/FitTableStyles/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FiveMinuteIntroduction/content.txt
-FitNesseRoot/FitNesse/UserGuide/FiveMinuteIntroduction/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ActionFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ActionFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ColumnFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ColumnFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ImportFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/ImportFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/RowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/RowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/SummaryFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/SummaryFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/TableFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/TableFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/BasicFitFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/ArrayFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/ArrayFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/CalculateFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/CalculateFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/CombinationFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/CombinationFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/ConstraintFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/ConstraintFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/DoFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/DoFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SequenceFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SequenceFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SetFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SetFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SetUpFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SetUpFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SubsetFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/SubsetFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/FitLibraryFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/GalleryIntroduction/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/GalleryIntroduction/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FixtureArguments/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FixtureArguments/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FixtureSymbols/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FixtureSymbols/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FlowMode/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/FlowMode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/MarkupVariables/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/MarkupVariables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/SystemUnderTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/SystemUnderTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/TargetObject/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/TargetObject/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/ImportantConcepts/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/PageFooter/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/PageFooter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/SourceCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/SourceCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/TableOfContents/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/TableOfContents/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/content.txt
-FitNesseRoot/FitNesse/UserGuide/FixtureGallery/properties.xml
-FitNesseRoot/FitNesse/UserGuide/FormattingOption/content.txt
-FitNesseRoot/FitNesse/UserGuide/FormattingOption/properties.xml
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/CreateExampleAcceptanceTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/CreateExampleAcceptanceTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/FitNesseWontStart/content.txt
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/FitNesseWontStart/properties.xml
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/content.txt
-FitNesseRoot/FitNesse/UserGuide/GettingStarted/properties.xml
-FitNesseRoot/FitNesse/UserGuide/GracefulName/content.txt
-FitNesseRoot/FitNesse/UserGuide/GracefulName/properties.xml
-FitNesseRoot/FitNesse/UserGuide/KeywordsInTestTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/KeywordsInTestTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/LastModificationTime/content.txt
-FitNesseRoot/FitNesse/UserGuide/LastModificationTime/properties.xml
-FitNesseRoot/FitNesse/UserGuide/LinksWithinPages/content.txt
-FitNesseRoot/FitNesse/UserGuide/LinksWithinPages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/LogFiles/content.txt
-FitNesseRoot/FitNesse/UserGuide/LogFiles/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupAliasLink/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupAliasLink/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupBold/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupBold/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupCenter/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupCenter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupCollapsableSection/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupCollapsableSection/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupComments/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupComments/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupContents/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupContents/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupCrossReference/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupCrossReference/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupEditWikiPage/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupEditWikiPage/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupExpressions/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupExpressions/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupExternalLink/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupExternalLink/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupHashTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupHashTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupHeaderAndFooter/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupHeaderAndFooter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupHeaders/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupHeaders/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupHorizontalRule/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupHorizontalRule/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupInternalLink/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupInternalLink/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupItalics/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupItalics/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupLanguageReference/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupLanguageReference/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupLists/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupLists/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupLiteralText/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupLiteralText/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupNote/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupNote/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupPageInclude/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupPageInclude/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupPath/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupPath/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupPicture/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupPicture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupPreformatted/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupPreformatted/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupStrike/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupStrike/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupStyle/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupStyle/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupVariables/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupVariables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupVirtualWiki/VirtualWikiNetworkError/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupVirtualWiki/VirtualWikiNetworkError/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MarkupVirtualWiki/content.txt
-FitNesseRoot/FitNesse/UserGuide/MarkupVirtualWiki/properties.xml
-FitNesseRoot/FitNesse/UserGuide/MultiLanguageFitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/MultiLanguageFitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/OneMinuteDescription/content.txt
-FitNesseRoot/FitNesse/UserGuide/OneMinuteDescription/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PageFooter/content.txt
-FitNesseRoot/FitNesse/UserGuide/PageFooter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PageHeader/content.txt
-FitNesseRoot/FitNesse/UserGuide/PageHeader/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PageProperties/content.txt
-FitNesseRoot/FitNesse/UserGuide/PageProperties/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ParameterizedIncludes/content.txt
-FitNesseRoot/FitNesse/UserGuide/ParameterizedIncludes/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ParametersInFixtures/content.txt
-FitNesseRoot/FitNesse/UserGuide/ParametersInFixtures/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ParametricRowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/ParametricRowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PasswordCipher/content.txt
-FitNesseRoot/FitNesse/UserGuide/PasswordCipher/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PasswordFile/content.txt
-FitNesseRoot/FitNesse/UserGuide/PasswordFile/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PasteFromExcel/content.txt
-FitNesseRoot/FitNesse/UserGuide/PasteFromExcel/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollExample/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollExample/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/ChangeBetweenTwoPaydays/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/ChangeBetweenTwoPaydays/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/FicaTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/FicaTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/PageFooter/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/PageFooter/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/PayrollChequePrintingTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/PayrollChequePrintingTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/SetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/SetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/TearDown/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/TearDown/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/PayrollTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PlainTextTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/PlainTextTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/PluginUsage/content.txt
-FitNesseRoot/FitNesse/UserGuide/PluginUsage/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ProjectDeathByRequirements/content.txt
-FitNesseRoot/FitNesse/UserGuide/ProjectDeathByRequirements/properties.xml
-FitNesseRoot/FitNesse/UserGuide/QuickReferenceGuide/content.txt
-FitNesseRoot/FitNesse/UserGuide/QuickReferenceGuide/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RefactoringWikiPages/content.txt
-FitNesseRoot/FitNesse/UserGuide/RefactoringWikiPages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulPackets/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulPackets/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/JsonProperties/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/JsonProperties/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/PageHistoryXml/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/PageHistoryXml/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/RestfulSuiteXmlFormat/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/RestfulSuiteXmlFormat/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/TestHistoryXml/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/TestHistoryXml/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulServices/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RestfulTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/RestfulTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RootPage/content.txt
-FitNesseRoot/FitNesse/UserGuide/RootPage/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowEntryFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowEntryFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixtureCode/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixtureCode/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixtureFunctions/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixtureFunctions/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixtureMultipleKeys/VirtualWikiNetworkError/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixtureMultipleKeys/VirtualWikiNetworkError/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixtureMultipleKeys/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixtureMultipleKeys/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RowFixtureOld/content.txt
-FitNesseRoot/FitNesse/UserGuide/RowFixtureOld/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RssFeed/content.txt
-FitNesseRoot/FitNesse/UserGuide/RssFeed/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RunningAcceptanceTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/RunningAcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RunningFromJunit/content.txt
-FitNesseRoot/FitNesse/UserGuide/RunningFromJunit/properties.xml
-FitNesseRoot/FitNesse/UserGuide/RunningFromMaven/content.txt
-FitNesseRoot/FitNesse/UserGuide/RunningFromMaven/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SampleOperateForTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/SampleOperateForTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SampleParameterizedPage/content.txt
-FitNesseRoot/FitNesse/UserGuide/SampleParameterizedPage/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SampleSetupForTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/SampleSetupForTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SecurityDescription/SpnegoAuthentication/content.txt
-FitNesseRoot/FitNesse/UserGuide/SecurityDescription/SpnegoAuthentication/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SecurityDescription/content.txt
-FitNesseRoot/FitNesse/UserGuide/SecurityDescription/properties.xml
-FitNesseRoot/FitNesse/UserGuide/ShortcutKeys/content.txt
-FitNesseRoot/FitNesse/UserGuide/ShortcutKeys/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SisterSites/content.txt
-FitNesseRoot/FitNesse/UserGuide/SisterSites/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/CommentTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/CommentTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ConstructorArguments/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ConstructorArguments/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/CustomTypes/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/CustomTypes/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/DataTypes/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/DataTypes/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/DecisionTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/DecisionTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/DefineTableType/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/DefineTableType/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ExceptionHandling/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ExceptionHandling/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/GracefulNames/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/GracefulNames/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ImportTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ImportTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/LibraryTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/LibraryTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/OrderedQueryTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/OrderedQueryTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/QueryTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/QueryTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ScenarioTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ScenarioTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ScriptTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ScriptTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SlimProtocol/PortManagement/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SlimProtocol/PortManagement/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SlimProtocol/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SlimProtocol/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SubsetQueryTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SubsetQueryTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SymbolsInTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SymbolsInTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/SystemUnderTest/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/SystemUnderTest/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/TableTable/ReportTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/TableTable/ReportTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/TableTable/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/TableTable/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/ValueComparisons/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/ValueComparisons/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SliM/content.txt
-FitNesseRoot/FitNesse/UserGuide/SliM/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SourceCodeControl/GitPlugin/content.txt
-FitNesseRoot/FitNesse/UserGuide/SourceCodeControl/GitPlugin/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SourceCodeControl/content.txt
-FitNesseRoot/FitNesse/UserGuide/SourceCodeControl/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SpecialPages/content.txt
-FitNesseRoot/FitNesse/UserGuide/SpecialPages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SpecialWikiFunctions/content.txt
-FitNesseRoot/FitNesse/UserGuide/SpecialWikiFunctions/properties.xml
-FitNesseRoot/FitNesse/UserGuide/StartingAndStoppingFitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/StartingAndStoppingFitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SubWiki/content.txt
-FitNesseRoot/FitNesse/UserGuide/SubWiki/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SymbolicLinks/content.txt
-FitNesseRoot/FitNesse/UserGuide/SymbolicLinks/properties.xml
-FitNesseRoot/FitNesse/UserGuide/SymbolsInTestTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/SymbolsInTestTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TableFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/TableFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestDevelopmentEnvironment/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestDevelopmentEnvironment/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestHistory/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestHistory/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestResultsFormat/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestResultsFormat/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestRunner/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestRunner/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/CrossReferenceSuites/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/CrossReferenceSuites/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SubWikiSuites/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SubWikiSuites/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SuiteQuery/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SuiteQuery/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SuiteSetUpAndSuiteTearDown/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/SuiteSetUpAndSuiteTearDown/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/TagsAndFilters/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/TagsAndFilters/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSuites/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSuites/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestSystems/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestSystems/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TestTableStyles/content.txt
-FitNesseRoot/FitNesse/UserGuide/TestTableStyles/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TimedActionFixture/VirtualWikiNetworkError/content.txt
-FitNesseRoot/FitNesse/UserGuide/TimedActionFixture/VirtualWikiNetworkError/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TimedActionFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/TimedActionFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TodaysDate/content.txt
-FitNesseRoot/FitNesse/UserGuide/TodaysDate/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/EachRegularPlaceHasaCategory/content.txt
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/EachRegularPlaceHasaCategory/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/SetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/SetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/content.txt
-FitNesseRoot/FitNesse/UserGuide/TriviaGameUserStories/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TroubleshootingAcceptanceTests/content.txt
-FitNesseRoot/FitNesse/UserGuide/TroubleshootingAcceptanceTests/properties.xml
-FitNesseRoot/FitNesse/UserGuide/TwoMinuteExample/content.txt
-FitNesseRoot/FitNesse/UserGuide/TwoMinuteExample/properties.xml
-FitNesseRoot/FitNesse/UserGuide/VariableScope/content.txt
-FitNesseRoot/FitNesse/UserGuide/VariableScope/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WhatIsFitNesse/content.txt
-FitNesseRoot/FitNesse/UserGuide/WhatIsFitNesse/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WhereUsed/content.txt
-FitNesseRoot/FitNesse/UserGuide/WhereUsed/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WikiImport/content.txt
-FitNesseRoot/FitNesse/UserGuide/WikiImport/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WikiWord/content.txt
-FitNesseRoot/FitNesse/UserGuide/WikiWord/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WorkingWithWikiPages/content.txt
-FitNesseRoot/FitNesse/UserGuide/WorkingWithWikiPages/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/FrontPage/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/FrontPage/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SetUp/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SetUp/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestFinalScores/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestFinalScores/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestGames/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestGames/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestGamesWithFancyFixture/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/TestGamesWithFancyFixture/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteGames/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/PerfectGameTiming/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/PerfectGameTiming/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestGutterGameTiming/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestGutterGameTiming/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestNoMarksTiming/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestNoMarksTiming/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestSpareAndStrikeTiming/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/TestSpareAndStrikeTiming/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/SuiteTiming/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/BowlingGameProject/properties.xml
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/content.txt
-FitNesseRoot/FitNesse/UserGuide/WritingFitTables/properties.xml
-FitNesseRoot/FitNesse/UserGuide/content.txt
-FitNesseRoot/FitNesse/UserGuide/properties.xml
-FitNesseRoot/FitNesse/content.txt
-FitNesseRoot/FitNesse/properties.xml
-FitNesseRoot/PageFooter/content.txt
-FitNesseRoot/PageFooter/properties.xml
-FitNesseRoot/PageHeader/content.txt
-FitNesseRoot/PageHeader/properties.xml
diff --git a/Test/FitnessePages/3-20210118183720.zip b/Test/FitnessePages/3-20210118183720.zip
deleted file mode 100644
index 2fc4f3d70..000000000
Binary files a/Test/FitnessePages/3-20210118183720.zip and /dev/null differ
diff --git a/Test/FitnessePages/5-20210118184035.zip b/Test/FitnessePages/5-20210118184035.zip
deleted file mode 100644
index 23f7c2d0d..000000000
Binary files a/Test/FitnessePages/5-20210118184035.zip and /dev/null differ
diff --git a/Test/FitnessePages/AbDeinstallieren/11-20210218191800.zip b/Test/FitnessePages/AbDeinstallieren/11-20210218191800.zip
deleted file mode 100644
index e2139ffed..000000000
Binary files a/Test/FitnessePages/AbDeinstallieren/11-20210218191800.zip and /dev/null differ
diff --git a/Test/FitnessePages/AbDeinstallieren/2-20210218191029.zip b/Test/FitnessePages/AbDeinstallieren/2-20210218191029.zip
deleted file mode 100644
index 92cc2aa86..000000000
Binary files a/Test/FitnessePages/AbDeinstallieren/2-20210218191029.zip and /dev/null differ
diff --git a/Test/FitnessePages/AbDeinstallieren/5-20210218191037.zip b/Test/FitnessePages/AbDeinstallieren/5-20210218191037.zip
deleted file mode 100644
index badb4abb6..000000000
Binary files a/Test/FitnessePages/AbDeinstallieren/5-20210218191037.zip and /dev/null differ
diff --git a/Test/FitnessePages/AbDeinstallieren/8-20210218191653.zip b/Test/FitnessePages/AbDeinstallieren/8-20210218191653.zip
deleted file mode 100644
index fc9b7b408..000000000
Binary files a/Test/FitnessePages/AbDeinstallieren/8-20210218191653.zip and /dev/null differ
diff --git a/Test/FitnessePages/AdNeuInstallation/17-20210218193807.zip b/Test/FitnessePages/AdNeuInstallation/17-20210218193807.zip
deleted file mode 100644
index 19569b9f9..000000000
Binary files a/Test/FitnessePages/AdNeuInstallation/17-20210218193807.zip and /dev/null differ
diff --git a/Test/FitnessePages/AdNeuInstallation/21-20210218193819.zip b/Test/FitnessePages/AdNeuInstallation/21-20210218193819.zip
deleted file mode 100644
index 8c8101712..000000000
Binary files a/Test/FitnessePages/AdNeuInstallation/21-20210218193819.zip and /dev/null differ
diff --git a/Test/FitnessePages/AlAktualisierung/25-20210218194426.zip b/Test/FitnessePages/AlAktualisierung/25-20210218194426.zip
deleted file mode 100644
index 51e371145..000000000
Binary files a/Test/FitnessePages/AlAktualisierung/25-20210218194426.zip and /dev/null differ
diff --git a/Test/FitnessePages/AlAktualisierung/28-20210218194432.zip b/Test/FitnessePages/AlAktualisierung/28-20210218194432.zip
deleted file mode 100644
index 90987ab02..000000000
Binary files a/Test/FitnessePages/AlAktualisierung/28-20210218194432.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/11-20210118190132.zip b/Test/FitnessePages/BaDatenbankEinspielen/11-20210118190132.zip
deleted file mode 100644
index 837bae575..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/11-20210118190132.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/2-20210118185803.zip b/Test/FitnessePages/BaDatenbankEinspielen/2-20210118185803.zip
deleted file mode 100644
index 58c1713cd..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/2-20210118185803.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/21-20210118190206.zip b/Test/FitnessePages/BaDatenbankEinspielen/21-20210118190206.zip
deleted file mode 100644
index 940545819..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/21-20210118190206.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/25-20210118193043.zip b/Test/FitnessePages/BaDatenbankEinspielen/25-20210118193043.zip
deleted file mode 100644
index 41e61a32e..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/25-20210118193043.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/27-20210118193153.zip b/Test/FitnessePages/BaDatenbankEinspielen/27-20210118193153.zip
deleted file mode 100644
index 0dc0c0a8b..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/27-20210118193153.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/4-20210118185839.zip b/Test/FitnessePages/BaDatenbankEinspielen/4-20210118185839.zip
deleted file mode 100644
index faca95257..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/4-20210118185839.zip and /dev/null differ
diff --git a/Test/FitnessePages/BaDatenbankEinspielen/9-20210118185933.zip b/Test/FitnessePages/BaDatenbankEinspielen/9-20210118185933.zip
deleted file mode 100644
index c95444a13..000000000
Binary files a/Test/FitnessePages/BaDatenbankEinspielen/9-20210118185933.zip and /dev/null differ
diff --git a/Test/FitnessePages/CaFunktionstest/0-20210118192436.zip b/Test/FitnessePages/CaFunktionstest/0-20210118192436.zip
deleted file mode 100644
index a9dc16720..000000000
Binary files a/Test/FitnessePages/CaFunktionstest/0-20210118192436.zip and /dev/null differ
diff --git a/Test/FitnessePages/CaFunktionstest/15-20210118191456.zip b/Test/FitnessePages/CaFunktionstest/15-20210118191456.zip
deleted file mode 100644
index 3eef370a6..000000000
Binary files a/Test/FitnessePages/CaFunktionstest/15-20210118191456.zip and /dev/null differ
diff --git a/Test/FitnessePages/CaFunktionstest/content.txt b/Test/FitnessePages/CaFunktionstest/content.txt
index 1041b6b18..67f4ea3da 100644
--- a/Test/FitnessePages/CaFunktionstest/content.txt
+++ b/Test/FitnessePages/CaFunktionstest/content.txt
@@ -3,7 +3,9 @@ Vorbereitung:
 - Browser starten
 - URL eingeben: http://<ip>/kivitendo/
 - Mit michael/michael anmelden
-- Falls die Frage nach dem Upgrade kommt Ja/Weiter klicken
+- Falls die Meldung kommt, "Fehler! kivitendo muss die Authentifizierungsdatenbank aktualisieren", mit dem Passwort "kivitendo"
+im Administrationsbereich anmelden und den Upgrade durchführen.
+- Falls die Frage nach dem Upgrade kommt Ja/Weiter klicken.
 
 Funktionstest:
 
diff --git a/Test/etc/auth_3.9.2.dump b/Test/etc/auth_3.9.2.dump
new file mode 100644
index 000000000..1c340856b
--- /dev/null
+++ b/Test/etc/auth_3.9.2.dump
@@ -0,0 +1,905 @@
+--
+-- PostgreSQL database dump
+--
+
+\restrict 7ORcvckz8vcHkck0VJfFbdyNwzkfePflTJHwaai2zf5AmjJ4Kqo25TYwtJcNjsN
+
+-- Dumped from database version 13.23 (Debian 13.23-0+deb11u3)
+-- Dumped by pg_dump version 13.23 (Debian 13.23-0+deb11u3)
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- Name: auth; Type: SCHEMA; Schema: -; Owner: kivitendo
+--
+
+CREATE SCHEMA auth;
+
+
+ALTER SCHEMA auth OWNER TO kivitendo;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: clients; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.clients (
+    id integer NOT NULL,
+    name text NOT NULL,
+    dbhost text NOT NULL,
+    dbport integer DEFAULT 5432 NOT NULL,
+    dbname text NOT NULL,
+    dbuser text NOT NULL,
+    dbpasswd text NOT NULL,
+    is_default boolean DEFAULT false NOT NULL,
+    task_server_user_id integer
+);
+
+
+ALTER TABLE auth.clients OWNER TO kivitendo;
+
+--
+-- Name: clients_groups; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.clients_groups (
+    client_id integer NOT NULL,
+    group_id integer NOT NULL
+);
+
+
+ALTER TABLE auth.clients_groups OWNER TO kivitendo;
+
+--
+-- Name: clients_id_seq; Type: SEQUENCE; Schema: auth; Owner: kivitendo
+--
+
+CREATE SEQUENCE auth.clients_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE auth.clients_id_seq OWNER TO kivitendo;
+
+--
+-- Name: clients_id_seq; Type: SEQUENCE OWNED BY; Schema: auth; Owner: kivitendo
+--
+
+ALTER SEQUENCE auth.clients_id_seq OWNED BY auth.clients.id;
+
+
+--
+-- Name: clients_users; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.clients_users (
+    client_id integer NOT NULL,
+    user_id integer NOT NULL
+);
+
+
+ALTER TABLE auth.clients_users OWNER TO kivitendo;
+
+--
+-- Name: group_id_seq; Type: SEQUENCE; Schema: auth; Owner: kivitendo
+--
+
+CREATE SEQUENCE auth.group_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE auth.group_id_seq OWNER TO kivitendo;
+
+--
+-- Name: group; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth."group" (
+    id integer DEFAULT nextval('auth.group_id_seq'::regclass) NOT NULL,
+    name text NOT NULL,
+    description text
+);
+
+
+ALTER TABLE auth."group" OWNER TO kivitendo;
+
+--
+-- Name: group_rights; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.group_rights (
+    group_id integer NOT NULL,
+    "right" text NOT NULL,
+    granted boolean NOT NULL
+);
+
+
+ALTER TABLE auth.group_rights OWNER TO kivitendo;
+
+--
+-- Name: master_rights; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.master_rights (
+    id integer NOT NULL,
+    "position" integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    category boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE auth.master_rights OWNER TO kivitendo;
+
+--
+-- Name: master_rights_id_seq; Type: SEQUENCE; Schema: auth; Owner: kivitendo
+--
+
+CREATE SEQUENCE auth.master_rights_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE auth.master_rights_id_seq OWNER TO kivitendo;
+
+--
+-- Name: master_rights_id_seq; Type: SEQUENCE OWNED BY; Schema: auth; Owner: kivitendo
+--
+
+ALTER SEQUENCE auth.master_rights_id_seq OWNED BY auth.master_rights.id;
+
+
+--
+-- Name: schema_info; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.schema_info (
+    tag text NOT NULL,
+    login text,
+    itime timestamp without time zone DEFAULT now()
+);
+
+
+ALTER TABLE auth.schema_info OWNER TO kivitendo;
+
+--
+-- Name: session; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.session (
+    id text NOT NULL,
+    ip_address inet,
+    mtime timestamp without time zone,
+    api_token text
+);
+
+
+ALTER TABLE auth.session OWNER TO kivitendo;
+
+--
+-- Name: session_content; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.session_content (
+    session_id text NOT NULL,
+    sess_key text NOT NULL,
+    sess_value text,
+    auto_restore boolean
+);
+
+
+ALTER TABLE auth.session_content OWNER TO kivitendo;
+
+--
+-- Name: user_id_seq; Type: SEQUENCE; Schema: auth; Owner: kivitendo
+--
+
+CREATE SEQUENCE auth.user_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE auth.user_id_seq OWNER TO kivitendo;
+
+--
+-- Name: user; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth."user" (
+    id integer DEFAULT nextval('auth.user_id_seq'::regclass) NOT NULL,
+    login text NOT NULL,
+    password text
+);
+
+
+ALTER TABLE auth."user" OWNER TO kivitendo;
+
+--
+-- Name: user_config; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.user_config (
+    user_id integer NOT NULL,
+    cfg_key text NOT NULL,
+    cfg_value text
+);
+
+
+ALTER TABLE auth.user_config OWNER TO kivitendo;
+
+--
+-- Name: user_group; Type: TABLE; Schema: auth; Owner: kivitendo
+--
+
+CREATE TABLE auth.user_group (
+    user_id integer NOT NULL,
+    group_id integer NOT NULL
+);
+
+
+ALTER TABLE auth.user_group OWNER TO kivitendo;
+
+--
+-- Name: clients id; Type: DEFAULT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients ALTER COLUMN id SET DEFAULT nextval('auth.clients_id_seq'::regclass);
+
+
+--
+-- Name: master_rights id; Type: DEFAULT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.master_rights ALTER COLUMN id SET DEFAULT nextval('auth.master_rights_id_seq'::regclass);
+
+
+--
+-- Data for Name: clients; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.clients (id, name, dbhost, dbport, dbname, dbuser, dbpasswd, is_default, task_server_user_id) FROM stdin;
+1	firma	localhost	5432	firma	kivitendo	kivitendo	t	\N
+\.
+
+
+--
+-- Data for Name: clients_groups; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.clients_groups (client_id, group_id) FROM stdin;
+1	1
+\.
+
+
+--
+-- Data for Name: clients_users; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.clients_users (client_id, user_id) FROM stdin;
+1	1
+\.
+
+
+--
+-- Data for Name: group; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth."group" (id, name, description) FROM stdin;
+1	Vollzugriff	Vollzugriff
+\.
+
+
+--
+-- Data for Name: group_rights; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.group_rights (group_id, "right", granted) FROM stdin;
+1	customer_vendor_edit	t
+1	customer_vendor_all_edit	t
+1	part_service_assembly_edit	t
+1	part_service_assembly_details	t
+1	shop_part_edit	t
+1	assembly_edit	t
+1	project_edit	t
+1	project_edit_view_invoices_permission	t
+1	show_extra_record_tab_customer	t
+1	show_extra_record_tab_vendor	t
+1	requirement_spec_edit	t
+1	sales_quotation_edit	t
+1	shop_order	t
+1	sales_order_edit	t
+1	sales_delivery_order_edit	t
+1	invoice_edit	t
+1	dunning_edit	t
+1	sales_letter_edit	t
+1	sales_all_edit	t
+1	sales_edit_prices	t
+1	show_ar_transactions	t
+1	delivery_plan	t
+1	delivery_value_report	t
+1	sales_letter_report	t
+1	import_ar	t
+1	request_quotation_edit	t
+1	purchase_order_edit	t
+1	purchase_delivery_order_edit	t
+1	vendor_invoice_edit	t
+1	purchase_letter_edit	t
+1	purchase_all_edit	t
+1	purchase_edit_prices	t
+1	show_ap_transactions	t
+1	purchase_letter_report	t
+1	import_ap	t
+1	warehouse_contents	t
+1	warehouse_management	t
+1	general_ledger	t
+1	gl_transactions	t
+1	ar_transactions	t
+1	ap_transactions	t
+1	datev_export	t
+1	cash	t
+1	bank_transaction	t
+1	report	t
+1	advance_turnover_tax_return	t
+1	batch_printing	f
+1	config	t
+1	admin	t
+1	edit_shop_config	t
+1	custom_data_export_designer	t
+1	email_bcc	f
+1	email_journal	f
+1	email_employee_readall	f
+1	productivity	f
+1	display_admin_link	f
+1	record_links	f
+1	all_drafts_edit	f
+1	time_recording	t
+1	time_recording_show_all	t
+1	time_recording_edit_all	t
+1	assortment_edit	t
+1	request_quotation_view	t
+1	sales_invoice_view	t
+1	purchase_invoice_view	t
+1	sales_delivery_order_view	t
+1	purchase_delivery_order_view	t
+1	sales_quotation_view	t
+1	purchase_order_view	t
+1	sales_order_view	t
+1	sales_reclamation_edit	t
+1	purchase_reclamation_edit	t
+1	custom_data_report	t
+1	sales_financial_controlling	t
+1	part_service_assembly_edit_prices	t
+1	sales_order_item_search	t
+1	sales_report	t
+1	sales_order_reports_amounts	t
+1	purchase_order_reports_amounts	t
+1	customer_report_view	t
+1	vendor_report_view	t
+1	contact_person_report_view	t
+\.
+
+
+--
+-- Data for Name: master_rights; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.master_rights (id, "position", name, description, category) FROM stdin;
+1	100	master_data	Master Data	t
+2	200	customer_vendor_edit	Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)	f
+3	300	customer_vendor_all_edit	Create customers and vendors. Edit all vendors. Edit all customers	f
+4	400	part_service_assembly_edit	Create and edit parts, services, assemblies	f
+5	500	part_service_assembly_details	Show details and reports of parts, services, assemblies	f
+6	600	project_edit	Create and edit projects	f
+7	700	ar	AR	t
+8	800	requirement_spec_edit	Create and edit requirement specs	f
+9	900	sales_quotation_edit	Create and edit sales quotations	f
+10	1000	sales_order_edit	Create and edit sales orders	f
+11	1100	sales_delivery_order_edit	Create and edit sales delivery orders	f
+12	1200	invoice_edit	Create and edit invoices and credit notes	f
+13	1300	dunning_edit	Create and edit dunnings	f
+14	1400	sales_letter_edit	Edit sales letters	f
+15	1500	sales_all_edit	View/edit all employees sales documents	f
+17	1700	show_ar_transactions	Show AR transactions as part of AR invoice report	f
+18	1800	delivery_plan	Show delivery plan	f
+19	1900	delivery_value_report	Show delivery value report	f
+20	2000	sales_letter_report	Show sales letters report	f
+21	2100	ap	AP	t
+22	2200	request_quotation_edit	Create and edit RFQs	f
+23	2300	purchase_order_edit	Create and edit purchase orders	f
+24	2400	purchase_delivery_order_edit	Create and edit purchase delivery orders	f
+25	2500	vendor_invoice_edit	Create and edit vendor invoices	f
+26	2600	show_ap_transactions	Show AP transactions as part of AP invoice report	f
+27	2700	warehouse	Warehouse management	t
+28	2800	warehouse_contents	View warehouse content	f
+29	2900	warehouse_management	Warehouse management	f
+30	3000	general_ledger_cash	General ledger and cash	t
+32	3200	datev_export	DATEV Export	f
+33	3300	cash	Receipt, payment, reconciliation	f
+34	3400	bank_transaction	Bank transactions	f
+35	3500	reports	Reports	t
+36	3600	report	All reports	f
+37	3700	advance_turnover_tax_return	Advance turnover tax return	f
+38	3800	batch_printing_category	Batch Printing	t
+39	3900	batch_printing	Batch Printing	f
+31	3100	general_ledger	AP/AR Aging & Journal	f
+16	1600	sales_edit_prices	Edit prices and discount (if not used, textfield is ONLY set readonly)	f
+50	2050	import_ar	Import AR from Scanner or Email	f
+52	2550	purchase_letter_edit	Edit purchase letters	f
+53	2650	purchase_letter_report	Show purchase letters report	f
+55	3130	gl_transactions	General Ledger Transaction	f
+56	3150	ar_transactions	AR Transactions	f
+57	3170	ap_transactions	AP Transactions	f
+51	2680	import_ap	Import AP from Scanner or Email	f
+58	550	assembly_edit	Always edit assembly items (user can change/delete items even if assemblies are already produced)	f
+61	950	shop_order	Get shoporders	f
+63	610	show_extra_record_tab_customer	Show record tab in customer	f
+64	611	show_extra_record_tab_vendor	Show record tab in vendor	f
+65	602	project_edit_view_invoices_permission	Projects: edit the list of employees allowed to view invoices	f
+66	2560	purchase_all_edit	View/edit all employees purchase documents	f
+67	2570	purchase_edit_prices	Edit prices and discount (if not used, textfield is ONLY set readonly)	f
+40	5000	configuration	Configuration	t
+41	5100	config	Change kivitendo installation settings (most entries in the 'System' menu)	f
+42	5200	admin	Client administration: configuration, editing templates, task server control, background jobs (remaining entries in the 'System' menu)	f
+43	5300	others	Others	t
+44	5400	email_bcc	May set the BCC field when sending emails	f
+69	4300	time_recording	Create, edit and list time recordings	f
+46	5600	display_admin_link	Show administration link	f
+47	6000	all_drafts_edit	Edit all drafts	f
+70	4320	time_recording_show_all	List time recordings of all staff members	f
+71	4340	time_recording_edit_all	Edit time recordings of all staff members	f
+54	5750	record_links	Linked Records	f
+59	5275	custom_data_export_designer	Custom data export	f
+62	5250	edit_shop_config	Create and edit webshops	f
+68	4000	productivity_category	Productivity	t
+45	4100	productivity	Productivity (TODO list, Follow-Ups)	f
+48	4200	email_journal	E-Mail-Journal	f
+49	4250	email_employee_readall	Read all employee e-mails	f
+60	580	shop_part_edit	Create and edit shopparts	f
+72	5220	developer	See various menu entries intended for developers	f
+73	560	assortment_edit	Always edit assortment items (user can change/delete items even if assortments are already used)	f
+74	910	sales_quotation_view	View sales quotations	f
+75	1010	sales_order_view	View sales orders	f
+76	1110	sales_delivery_order_view	View sales delivery orders	f
+77	1210	sales_invoice_view	View sales invoices and credit notes	f
+78	2210	request_quotation_view	View RFQs	f
+79	2310	purchase_order_view	View purchase orders	f
+80	2410	purchase_delivery_order_view	View purchase delivery orders	f
+81	2510	purchase_invoice_view	View purchase invoices	f
+82	1150	sales_reclamation_edit	Create and edit sales reclamation	f
+83	2450	purchase_reclamation_edit	Create and edit purchase reclamation	f
+84	3720	custom_data_report	May use Custom Data Report at all	f
+85	1760	sales_financial_controlling	Show sales financial controlling	f
+86	410	part_service_assembly_edit_prices	Edit prices for parts, services, assemblies	f
+87	1750	sales_order_item_search	Show sales order item search	f
+88	1770	sales_report	Show sales report	f
+89	1015	sales_order_reports_amounts	Show sales order reports with amounts (and links to open documents)	f
+90	2315	purchase_order_reports_amounts	Show purchase order reports with amounts (and links to open documents)	f
+91	310	customer_report_view	View customer report	f
+92	320	vendor_report_view	View vendor report	f
+93	330	contact_person_report_view	View contact person report	f
+\.
+
+
+--
+-- Data for Name: schema_info; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.schema_info (tag, login, itime) FROM stdin;
+add_api_token	admin	2018-11-30 19:52:50.606337
+add_batch_printing_to_full_access	admin	2018-11-30 19:52:50.612204
+auth_schema_normalization_1	admin	2018-11-30 19:52:50.679835
+password_hashing	admin	2018-11-30 19:52:50.757564
+remove_menustyle_v4	admin	2018-11-30 19:52:50.787919
+remove_menustyle_xml	admin	2018-11-30 19:52:50.79445
+session_content_auto_restore	admin	2018-11-30 19:52:50.799888
+release_3_0_0	admin	2018-11-30 19:52:50.831311
+clients	admin	2018-11-30 19:52:50.877394
+clients_webdav	admin	2018-11-30 19:52:50.98643
+foreign_key_constraints_on_delete	admin	2018-11-30 19:52:50.993769
+release_3_2_0	admin	2018-11-30 19:52:51.066536
+add_master_rights	admin	2018-11-30 19:52:51.076355
+bank_transaction_rights	admin	2018-11-30 19:52:51.158372
+delivery_plan_rights	admin	2018-11-30 19:52:51.184635
+delivery_process_value	admin	2018-11-30 19:52:51.192706
+details_and_report_of_parts	admin	2018-11-30 19:52:51.221993
+productivity_rights	admin	2018-11-30 19:52:51.232101
+requirement_spec_rights	admin	2018-11-30 19:52:51.255307
+rights_for_showing_ar_and_ap_transactions	admin	2018-11-30 19:52:51.262267
+sales_letter_rights	admin	2018-11-30 19:52:51.2917
+release_3_3_0	admin	2018-11-30 19:52:51.296489
+client_task_server	admin	2018-11-30 19:52:51.304536
+remove_insecurely_hashed_passwords	admin	2018-11-30 19:52:51.33197
+session_content_primary_key	admin	2018-11-30 19:52:51.339007
+release_3_4_0	admin	2018-11-30 19:52:51.368148
+master_rights_position_gaps	admin	2021-01-16 23:27:44.749094
+all_drafts_edit	admin	2021-01-16 23:27:44.847437
+mail_journal_rights	admin	2021-01-16 23:27:44.899515
+other_file_sources	admin	2021-01-16 23:27:44.931875
+purchase_letter_rights	admin	2021-01-16 23:27:44.946762
+record_links_rights	admin	2021-01-16 23:27:44.964905
+split_transaction_rights	admin	2021-01-16 23:27:44.984987
+other_file_sources2	admin	2021-01-16 23:27:45.030195
+rename_general_ledger_rights	admin	2021-01-16 23:27:45.043693
+release_3_5_0	admin	2021-01-16 23:27:45.066912
+assembly_edit_right	admin	2021-01-16 23:27:45.095898
+custom_data_export_rights	admin	2021-01-16 23:27:45.120899
+webshop_api_rights	admin	2021-01-16 23:27:45.140731
+webshop_api_rights_2	admin	2021-01-16 23:27:45.167397
+release_3_5_1	admin	2021-01-16 23:27:45.175067
+release_3_5_2	admin	2021-01-16 23:27:45.183556
+customer_vendor_record_extra_tab_rights	admin	2021-01-16 23:27:45.189809
+release_3_5_3	admin	2021-01-16 23:27:45.19872
+rights_for_viewing_project_specific_invoices	admin	2021-01-16 23:27:45.210894
+release_3_5_4	admin	2021-01-16 23:27:45.21948
+right_purchase_all_edit	admin	2021-01-16 23:27:45.227773
+rights_sales_purchase_edit_prices	admin	2021-01-16 23:27:45.256678
+master_rights_positions_fix	admin	2021-01-16 23:27:45.267954
+release_3_5_5	admin	2021-01-16 23:27:45.285413
+release_3_5_6	admin	2021-01-16 23:27:45.313788
+release_3_5_6_1	admin	2021-01-16 23:27:45.326867
+right_productivity_as_category	admin	2023-12-16 23:40:01.312572
+right_time_recording	admin	2023-12-16 23:40:01.391342
+rights_time_recording_show_edit_all	admin	2023-12-16 23:40:01.402884
+release_3_5_7	admin	2023-12-16 23:40:01.417409
+move_shop_part_edit_right	admin	2023-12-16 23:40:01.422614
+right_develop	admin	2023-12-16 23:40:01.429334
+right_assortment_edit	admin	2023-12-16 23:40:01.43762
+release_3_5_8	admin	2023-12-16 23:40:01.445316
+convert_columns_to_html_for_sending_html_emails	admin	2023-12-16 23:40:01.453269
+release_3_6_0	admin	2023-12-16 23:40:01.460452
+rights_view_docs	admin	2023-12-16 23:40:01.466624
+release_3_6_1	admin	2023-12-16 23:40:01.504979
+rights_for_reclamation	admin	2026-04-24 23:21:20.921849
+release_3_7_0	admin	2026-04-24 23:21:21.063779
+release_3_8_0	admin	2026-04-24 23:21:21.069875
+release_3_9_0	admin	2026-04-24 23:21:21.077871
+right_custom_data_report	admin	2026-04-24 23:21:21.08353
+right_financial_controlling	admin	2026-04-24 23:21:21.165759
+right_part_master_data_prices	admin	2026-04-24 23:21:21.176266
+right_sales_order_item_search	admin	2026-04-24 23:21:21.187545
+right_sales_report	admin	2026-04-24 23:21:21.198104
+rights_order_reports_amounts	admin	2026-04-24 23:21:21.208217
+rights_view_cv_report	admin	2026-04-24 23:21:21.226621
+rights_view_cp_report	admin	2026-04-24 23:21:21.237947
+release_3_9_1	admin	2026-04-24 23:21:21.246782
+set_all_users_to_design40	admin	2026-04-24 23:21:21.253369
+release_3_9_2	admin	2026-04-24 23:21:21.260221
+\.
+
+
+--
+-- Data for Name: session; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.session (id, ip_address, mtime, api_token) FROM stdin;
+5b7fa09a8133611fb5d808e8ab3aade3	127.0.0.1	2026-04-24 23:22:03.159092	7a18b42b57b7f86f45fec836318b2d79
+\.
+
+
+--
+-- Data for Name: session_content; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.session_content (session_id, sess_key, sess_value, auto_restore) FROM stdin;
+5b7fa09a8133611fb5d808e8ab3aade3	session_auth_status_root	--- 0\n	\N
+5b7fa09a8133611fb5d808e8ab3aade3	session_auth_status_user	--- 0\n	\N
+5b7fa09a8133611fb5d808e8ab3aade3	client_id	--- 1\n	\N
+5b7fa09a8133611fb5d808e8ab3aade3	login	--- michael\n	\N
+\.
+
+
+--
+-- Data for Name: user; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth."user" (id, login, password) FROM stdin;
+1	michael	{PBKDF2}eb582ba54e6c4aefdf12345026c9e4eb8e:42f75af3ca486e0de3e9d6e655d1db0f0e8122b0040f3f64ac92ff683e89a1ed
+\.
+
+
+--
+-- Data for Name: user_config; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.user_config (user_id, cfg_key, cfg_value) FROM stdin;
+1	mandatory_departments	0
+1	signature	
+1	numberformat	1.000,00
+1	countrycode	de
+1	tel	
+1	menustyle	neu
+1	vclimit	200
+1	phone_extension	
+1	dateformat	dd.mm.yy
+1	name	michael
+1	email	
+1	phone_password	
+1	fax	
+1	stylesheet	design40.css
+\.
+
+
+--
+-- Data for Name: user_group; Type: TABLE DATA; Schema: auth; Owner: kivitendo
+--
+
+COPY auth.user_group (user_id, group_id) FROM stdin;
+1	1
+\.
+
+
+--
+-- Name: clients_id_seq; Type: SEQUENCE SET; Schema: auth; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('auth.clients_id_seq', 1, true);
+
+
+--
+-- Name: group_id_seq; Type: SEQUENCE SET; Schema: auth; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('auth.group_id_seq', 1, true);
+
+
+--
+-- Name: master_rights_id_seq; Type: SEQUENCE SET; Schema: auth; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('auth.master_rights_id_seq', 93, true);
+
+
+--
+-- Name: user_id_seq; Type: SEQUENCE SET; Schema: auth; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('auth.user_id_seq', 1, true);
+
+
+--
+-- Name: clients clients_dbhost_dbport_dbname_key; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients
+    ADD CONSTRAINT clients_dbhost_dbport_dbname_key UNIQUE (dbhost, dbport, dbname);
+
+
+--
+-- Name: clients_groups clients_groups_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_groups
+    ADD CONSTRAINT clients_groups_pkey PRIMARY KEY (client_id, group_id);
+
+
+--
+-- Name: clients clients_name_key; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients
+    ADD CONSTRAINT clients_name_key UNIQUE (name);
+
+
+--
+-- Name: clients clients_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients
+    ADD CONSTRAINT clients_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: clients_users clients_users_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_users
+    ADD CONSTRAINT clients_users_pkey PRIMARY KEY (client_id, user_id);
+
+
+--
+-- Name: group group_name_key; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth."group"
+    ADD CONSTRAINT group_name_key UNIQUE (name);
+
+
+--
+-- Name: group group_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth."group"
+    ADD CONSTRAINT group_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: group_rights group_rights_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.group_rights
+    ADD CONSTRAINT group_rights_pkey PRIMARY KEY (group_id, "right");
+
+
+--
+-- Name: master_rights master_rights_name_key; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.master_rights
+    ADD CONSTRAINT master_rights_name_key UNIQUE (name);
+
+
+--
+-- Name: master_rights master_rights_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.master_rights
+    ADD CONSTRAINT master_rights_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: schema_info schema_info_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.schema_info
+    ADD CONSTRAINT schema_info_pkey PRIMARY KEY (tag);
+
+
+--
+-- Name: session_content session_content_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.session_content
+    ADD CONSTRAINT session_content_pkey PRIMARY KEY (session_id, sess_key);
+
+
+--
+-- Name: session session_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.session
+    ADD CONSTRAINT session_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: user_config user_config_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.user_config
+    ADD CONSTRAINT user_config_pkey PRIMARY KEY (user_id, cfg_key);
+
+
+--
+-- Name: user_group user_group_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.user_group
+    ADD CONSTRAINT user_group_pkey PRIMARY KEY (user_id, group_id);
+
+
+--
+-- Name: user user_login_key; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth."user"
+    ADD CONSTRAINT user_login_key UNIQUE (login);
+
+
+--
+-- Name: user user_pkey; Type: CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth."user"
+    ADD CONSTRAINT user_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: clients_groups clients_groups_client_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_groups
+    ADD CONSTRAINT clients_groups_client_id_fkey FOREIGN KEY (client_id) REFERENCES auth.clients(id) ON DELETE CASCADE;
+
+
+--
+-- Name: clients_groups clients_groups_group_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_groups
+    ADD CONSTRAINT clients_groups_group_id_fkey FOREIGN KEY (group_id) REFERENCES auth."group"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: clients clients_task_server_user_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients
+    ADD CONSTRAINT clients_task_server_user_id_fkey FOREIGN KEY (task_server_user_id) REFERENCES auth."user"(id);
+
+
+--
+-- Name: clients_users clients_users_client_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_users
+    ADD CONSTRAINT clients_users_client_id_fkey FOREIGN KEY (client_id) REFERENCES auth.clients(id) ON DELETE CASCADE;
+
+
+--
+-- Name: clients_users clients_users_user_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.clients_users
+    ADD CONSTRAINT clients_users_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth."user"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: group_rights group_rights_group_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.group_rights
+    ADD CONSTRAINT group_rights_group_id_fkey FOREIGN KEY (group_id) REFERENCES auth."group"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: session_content session_content_session_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.session_content
+    ADD CONSTRAINT session_content_session_id_fkey FOREIGN KEY (session_id) REFERENCES auth.session(id) ON DELETE CASCADE;
+
+
+--
+-- Name: user_config user_config_user_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.user_config
+    ADD CONSTRAINT user_config_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth."user"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: user_group user_group_group_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.user_group
+    ADD CONSTRAINT user_group_group_id_fkey FOREIGN KEY (group_id) REFERENCES auth."group"(id) ON DELETE CASCADE;
+
+
+--
+-- Name: user_group user_group_user_id_fkey; Type: FK CONSTRAINT; Schema: auth; Owner: kivitendo
+--
+
+ALTER TABLE ONLY auth.user_group
+    ADD CONSTRAINT user_group_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth."user"(id) ON DELETE CASCADE;
+
+
+--
+-- PostgreSQL database dump complete
+--
+
+\unrestrict 7ORcvckz8vcHkck0VJfFbdyNwzkfePflTJHwaai2zf5AmjJ4Kqo25TYwtJcNjsN
+
diff --git a/Test/etc/firma_3.9.2.dump b/Test/etc/firma_3.9.2.dump
new file mode 100644
index 000000000..b5301965e
--- /dev/null
+++ b/Test/etc/firma_3.9.2.dump
@@ -0,0 +1,17070 @@
+--
+-- PostgreSQL database dump
+--
+
+\restrict udx77cffGFXywKFftV0c2RVJe11A5uBWmVHFObbmFi2ktDIoGnYu7nKcwi6FgOa
+
+-- Dumped from database version 13.23 (Debian 13.23-0+deb11u3)
+-- Dumped by pg_dump version 13.23 (Debian 13.23-0+deb11u3)
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+--
+-- Name: tax; Type: SCHEMA; Schema: -; Owner: kivitendo
+--
+
+CREATE SCHEMA tax;
+
+
+ALTER SCHEMA tax OWNER TO kivitendo;
+
+--
+-- Name: pg_trgm; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
+
+
+--
+-- Name: EXTENSION pg_trgm; Type: COMMENT; Schema: -; Owner: 
+--
+
+COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching based on trigrams';
+
+
+--
+-- Name: custom_data_export_query_parameter_default_value_type_enum; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.custom_data_export_query_parameter_default_value_type_enum AS ENUM (
+    'none',
+    'current_user_login',
+    'sql_query',
+    'fixed_value'
+);
+
+
+ALTER TYPE public.custom_data_export_query_parameter_default_value_type_enum OWNER TO kivitendo;
+
+--
+-- Name: custom_data_export_query_parameter_type_enum; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.custom_data_export_query_parameter_type_enum AS ENUM (
+    'text',
+    'number',
+    'date',
+    'timestamp'
+);
+
+
+ALTER TYPE public.custom_data_export_query_parameter_type_enum OWNER TO kivitendo;
+
+--
+-- Name: datev_export_format_enum; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.datev_export_format_enum AS ENUM (
+    'cp1252',
+    'cp1252-translit',
+    'utf-8'
+);
+
+
+ALTER TYPE public.datev_export_format_enum OWNER TO kivitendo;
+
+--
+-- Name: delivery_order_types; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.delivery_order_types AS ENUM (
+    'sales_delivery_order',
+    'purchase_delivery_order',
+    'supplier_delivery_order',
+    'rma_delivery_order'
+);
+
+
+ALTER TYPE public.delivery_order_types OWNER TO kivitendo;
+
+--
+-- Name: dunning_creator; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.dunning_creator AS ENUM (
+    'current_employee',
+    'invoice_employee'
+);
+
+
+ALTER TYPE public.dunning_creator OWNER TO kivitendo;
+
+--
+-- Name: email_journal_record_type; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.email_journal_record_type AS ENUM (
+    'sales_order',
+    'purchase_order',
+    'sales_quotation',
+    'request_quotation',
+    'purchase_quotation_intake',
+    'sales_order_intake',
+    'sales_delivery_order',
+    'purchase_delivery_order',
+    'supplier_delivery_order',
+    'rma_delivery_order',
+    'sales_reclamation',
+    'purchase_reclamation',
+    'invoice',
+    'invoice_for_advance_payment',
+    'invoice_for_advance_payment_storno',
+    'final_invoice',
+    'invoice_storno',
+    'credit_note',
+    'credit_note_storno',
+    'purchase_invoice',
+    'purchase_credit_note',
+    'ap_transaction',
+    'ar_transaction',
+    'gl_transaction',
+    'purchase_order_confirmation',
+    'catch_all'
+);
+
+
+ALTER TYPE public.email_journal_record_type OWNER TO kivitendo;
+
+--
+-- Name: email_journal_status; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.email_journal_status AS ENUM (
+    'sent',
+    'send_failed',
+    'imported'
+);
+
+
+ALTER TYPE public.email_journal_status OWNER TO kivitendo;
+
+--
+-- Name: file_object_types; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.file_object_types AS ENUM (
+    'sales_quotation',
+    'sales_order',
+    'sales_order_intake',
+    'request_quotation',
+    'purchase_quotation_intake',
+    'purchase_order',
+    'purchase_order_confirmation',
+    'sales_delivery_order',
+    'supplier_delivery_order',
+    'purchase_delivery_order',
+    'rma_delivery_order',
+    'invoice',
+    'invoice_for_advance_payment',
+    'final_invoice',
+    'credit_note',
+    'purchase_invoice',
+    'sales_reclamation',
+    'purchase_reclamation',
+    'dunning',
+    'dunning1',
+    'dunning2',
+    'dunning3',
+    'dunning_orig_invoice',
+    'dunning_invoice',
+    'customer',
+    'vendor',
+    'gl_transaction',
+    'part',
+    'shop_image',
+    'draft',
+    'letter',
+    'project',
+    'statement'
+);
+
+
+ALTER TYPE public.file_object_types OWNER TO kivitendo;
+
+--
+-- Name: files_backends; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.files_backends AS ENUM (
+    'Filesystem',
+    'Webdav'
+);
+
+
+ALTER TYPE public.files_backends OWNER TO kivitendo;
+
+--
+-- Name: invoice_creation_mode; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.invoice_creation_mode AS ENUM (
+    'create_new',
+    'use_last_created_or_create_new'
+);
+
+
+ALTER TYPE public.invoice_creation_mode OWNER TO kivitendo;
+
+--
+-- Name: invoice_mail_settings; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.invoice_mail_settings AS ENUM (
+    'cp',
+    'invoice_mail',
+    'invoice_mail_cc_cp'
+);
+
+
+ALTER TYPE public.invoice_mail_settings OWNER TO kivitendo;
+
+--
+-- Name: items_recurring_billing_mode; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.items_recurring_billing_mode AS ENUM (
+    'never',
+    'once',
+    'always'
+);
+
+
+ALTER TYPE public.items_recurring_billing_mode OWNER TO kivitendo;
+
+--
+-- Name: order_types; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.order_types AS ENUM (
+    'request_quotation',
+    'sales_quotation',
+    'purchase_quotation_intake',
+    'purchase_order',
+    'sales_order_intake',
+    'sales_order',
+    'purchase_order_confirmation'
+);
+
+
+ALTER TYPE public.order_types OWNER TO kivitendo;
+
+--
+-- Name: part_type_enum; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.part_type_enum AS ENUM (
+    'part',
+    'service',
+    'assembly',
+    'assortment'
+);
+
+
+ALTER TYPE public.part_type_enum OWNER TO kivitendo;
+
+--
+-- Name: reclamation_types; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.reclamation_types AS ENUM (
+    'sales_reclamation',
+    'purchase_reclamation'
+);
+
+
+ALTER TYPE public.reclamation_types OWNER TO kivitendo;
+
+--
+-- Name: record_template_type; Type: TYPE; Schema: public; Owner: kivitendo
+--
+
+CREATE TYPE public.record_template_type AS ENUM (
+    'ar_transaction',
+    'ap_transaction',
+    'gl_transaction'
+);
+
+
+ALTER TYPE public.record_template_type OWNER TO kivitendo;
+
+--
+-- Name: add_parts_price_history_entry(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.add_parts_price_history_entry() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF      (TG_OP = 'UPDATE')
+        AND ((OLD.lastcost        IS NULL AND NEW.lastcost        IS NULL) OR (OLD.lastcost     = NEW.lastcost))
+        AND ((OLD.listprice       IS NULL AND NEW.listprice       IS NULL) OR (OLD.listprice    = NEW.listprice))
+        AND ((OLD.sellprice       IS NULL AND NEW.sellprice       IS NULL) OR (OLD.sellprice    = NEW.sellprice))
+        AND ((OLD.price_factor_id IS NULL AND NEW.price_factor_id IS NULL) OR
+             ( (SELECT factor FROM price_factors WHERE price_factors.id = OLD.price_factor_id) = (SELECT factor FROM price_factors WHERE price_factors.id = NEW.price_factor_id) ))
+        THEN
+      RETURN NEW;
+    END IF;
+
+    INSERT INTO parts_price_history (part_id, lastcost, listprice, sellprice, price_factor, valid_from)
+    VALUES (NEW.id, NEW.lastcost, NEW.listprice, NEW.sellprice, COALESCE((SELECT factor FROM price_factors WHERE price_factors.id = NEW.price_factor_id), 1), now());
+
+    RETURN NEW;
+  END;
+$$;
+
+
+ALTER FUNCTION public.add_parts_price_history_entry() OWNER TO kivitendo;
+
+--
+-- Name: chart_category_to_sgn(character); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.chart_category_to_sgn(character) RETURNS integer
+    LANGUAGE sql
+    AS $_$SELECT  1 WHERE $1 IN ('I', 'L', 'Q')
+      UNION 
+    SELECT -1 WHERE $1 IN ('E', 'A')$_$;
+
+
+ALTER FUNCTION public.chart_category_to_sgn(character) OWNER TO kivitendo;
+
+--
+-- Name: check_bin_belongs_to_wh(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.check_bin_belongs_to_wh() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$BEGIN
+        IF NEW.bin_id IS NULL AND NEW.warehouse_id IS NULL THEN
+          RETURN NEW;
+        END IF;
+        IF NEW.bin_id IN (SELECT id FROM bin WHERE warehouse_id = NEW.warehouse_id) THEN
+          RETURN NEW;
+        ELSE
+          RAISE EXCEPTION 'bin (id=%) does not belong to warehouse (id=%).', NEW.bin_id, NEW.warehouse_id;
+          RETURN NULL;
+        END IF;
+      END;$$;
+
+
+ALTER FUNCTION public.check_bin_belongs_to_wh() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_acc_trans_after_ar_ap_gl_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_acc_trans_after_ar_ap_gl_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM acc_trans WHERE trans_id = OLD.id;
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_acc_trans_after_ar_ap_gl_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_after_customer_vendor_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_after_customer_vendor_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM contacts
+    WHERE cp_cv_id = OLD.id;
+
+    DELETE FROM shipto
+    WHERE (trans_id = OLD.id)
+      AND (module   = 'CT');
+
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_after_customer_vendor_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_ap_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_ap_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'ap' AND from_id = OLD.id)
+         OR (to_table   = 'ap' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_ap_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_ar_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_ar_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'ar' AND from_id = OLD.id)
+         OR (to_table   = 'ar' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_ar_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = TG_TABLE_NAME AND from_id = OLD.id)
+         OR (to_table   = TG_TABLE_NAME AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_delivery_order_items_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_delivery_order_items_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'delivery_order_items' AND from_id = OLD.id)
+         OR (to_table   = 'delivery_order_items' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_delivery_order_items_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_delivery_orders_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_delivery_orders_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'delivery_orders' AND from_id = OLD.id)
+         OR (to_table   = 'delivery_orders' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_delivery_orders_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_dunning_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_dunning_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'dunning' AND from_id = OLD.id)
+         OR (to_table   = 'dunning' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_dunning_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_gl_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_gl_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'gl' AND from_id = OLD.id)
+         OR (to_table   = 'gl' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_gl_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_invoice_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_invoice_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'invoice' AND from_id = OLD.id)
+         OR (to_table   = 'invoice' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_invoice_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_letter_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_letter_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'letter' AND from_id = OLD.id)
+         OR (to_table   = 'letter' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_letter_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_oe_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_oe_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'oe' AND from_id = OLD.id)
+         OR (to_table   = 'oe' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_oe_delete() OWNER TO kivitendo;
+
+--
+-- Name: clean_up_record_links_before_orderitems_delete(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.clean_up_record_links_before_orderitems_delete() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = 'orderitems' AND from_id = OLD.id)
+         OR (to_table   = 'orderitems' AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.clean_up_record_links_before_orderitems_delete() OWNER TO kivitendo;
+
+--
+-- Name: delete_custom_variables_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.delete_custom_variables_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF (TG_TABLE_NAME IN ('orderitems', 'delivery_order_items', 'invoice', 'reclamation_items')) THEN
+      PERFORM delete_custom_variables_with_sub_module('IC', TG_TABLE_NAME, old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'parts') THEN
+      PERFORM delete_custom_variables_with_sub_module('IC', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME IN ('customer', 'vendor')) THEN
+      PERFORM delete_custom_variables_with_sub_module('CT', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'contacts') THEN
+      PERFORM delete_custom_variables_with_sub_module('Contacts', '', old.cp_id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'project') THEN
+      PERFORM delete_custom_variables_with_sub_module('Projects', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'shipto') THEN
+      PERFORM delete_custom_variables_with_sub_module('ShipTo', '', old.shipto_id);
+    END IF;
+
+    RETURN old;
+  END;
+$$;
+
+
+ALTER FUNCTION public.delete_custom_variables_trigger() OWNER TO kivitendo;
+
+--
+-- Name: delete_custom_variables_with_sub_module(text, text, integer); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.delete_custom_variables_with_sub_module(config_module text, cvar_sub_module text, old_id integer) RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM custom_variables
+    WHERE EXISTS (SELECT id FROM custom_variable_configs cfg WHERE (cfg.module = config_module) AND (custom_variables.config_id = cfg.id))
+      AND (COALESCE(sub_module, '') = cvar_sub_module)
+      AND (trans_id                 = old_id);
+
+    RETURN TRUE;
+  END;
+$$;
+
+
+ALTER FUNCTION public.delete_custom_variables_with_sub_module(config_module text, cvar_sub_module text, old_id integer) OWNER TO kivitendo;
+
+--
+-- Name: delete_requirement_spec_custom_variables_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.delete_requirement_spec_custom_variables_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM custom_variables WHERE (sub_module = '' OR sub_module IS NULL)
+                                   AND trans_id = OLD.id
+                                   AND (SELECT module FROM custom_variable_configs WHERE id = config_id) = 'RequirementSpecs';
+
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.delete_requirement_spec_custom_variables_trigger() OWNER TO kivitendo;
+
+--
+-- Name: delivery_orders_before_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.delivery_orders_before_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+        BEGIN
+          DELETE FROM status                     WHERE trans_id = OLD.id;
+          DELETE FROM delivery_order_items_stock WHERE delivery_order_item_id IN (SELECT id FROM delivery_order_items WHERE delivery_order_id = OLD.id);
+          DELETE FROM shipto                     WHERE (trans_id = OLD.id) AND (module = 'OE');
+
+          RETURN OLD;
+        END;
+      $$;
+
+
+ALTER FUNCTION public.delivery_orders_before_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: first_agg(anyelement, anyelement); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.first_agg(anyelement, anyelement) RETURNS anyelement
+    LANGUAGE sql IMMUTABLE STRICT
+    AS $_$
+  SELECT $1;
+$_$;
+
+
+ALTER FUNCTION public.first_agg(anyelement, anyelement) OWNER TO kivitendo;
+
+--
+-- Name: follow_up_close_when_oe_closed_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.follow_up_close_when_oe_closed_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF COALESCE(NEW.closed, FALSE) AND NOT COALESCE(OLD.closed, FALSE) THEN
+      INSERT INTO follow_up_done (follow_up_id)
+        SELECT follow_ups.id
+        FROM follow_ups
+        LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = follow_ups.id)
+        WHERE follow_up_done.id IS NULL
+          AND follow_ups.id IN (
+          SELECT follow_up_id
+          FROM follow_up_links
+          WHERE (trans_id   = NEW.id)
+            AND (trans_type IN ('sales_quotation',   'sales_order',    'sales_delivery_order',
+                                'request_quotation', 'purchase_order', 'purchase_delivery_order'))
+       );
+    END IF;
+
+    RETURN NEW;
+  END;
+$$;
+
+
+ALTER FUNCTION public.follow_up_close_when_oe_closed_trigger() OWNER TO kivitendo;
+
+--
+-- Name: follow_up_delete_notes_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.follow_up_delete_notes_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM notes
+    WHERE (trans_id     = OLD.id)
+      AND (trans_module = 'fu');
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.follow_up_delete_notes_trigger() OWNER TO kivitendo;
+
+--
+-- Name: follow_up_delete_when_customer_vendor_is_deleted_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.follow_up_delete_when_customer_vendor_is_deleted_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM follow_ups
+    WHERE id IN (
+      SELECT follow_up_id
+      FROM follow_up_links
+      WHERE (trans_id   = OLD.id)
+        AND (trans_type IN ('customer', 'vendor'))
+    );
+
+    DELETE FROM notes
+    WHERE (trans_id     = OLD.id)
+      AND (trans_module = 'ct');
+
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.follow_up_delete_when_customer_vendor_is_deleted_trigger() OWNER TO kivitendo;
+
+--
+-- Name: follow_up_delete_when_oe_is_deleted_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.follow_up_delete_when_oe_is_deleted_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM follow_ups
+    WHERE id IN (
+      SELECT follow_up_id
+      FROM follow_up_links
+      WHERE (trans_id   = OLD.id)
+        AND (trans_type IN ('sales_quotation',   'sales_order',    'sales_delivery_order',    'sales_invoice',
+                            'request_quotation', 'purchase_order', 'purchase_delivery_order', 'purchase_invoice'))
+    );
+
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.follow_up_delete_when_oe_is_deleted_trigger() OWNER TO kivitendo;
+
+--
+-- Name: generic_translations_delete_on_delivery_terms_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.generic_translations_delete_on_delivery_terms_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM generic_translations
+      WHERE translation_id = OLD.id AND translation_type LIKE 'SL::DB::DeliveryTerm/description_long';
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.generic_translations_delete_on_delivery_terms_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: generic_translations_delete_on_payment_terms_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.generic_translations_delete_on_payment_terms_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM generic_translations
+    WHERE (translation_id = OLD.id)
+      AND (translation_type IN ('SL::DB::PaymentTerm/description_long', 'SL::DB::PaymentTerm/description_long_invoice'));
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.generic_translations_delete_on_payment_terms_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: generic_translations_delete_on_tax_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.generic_translations_delete_on_tax_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    DELETE FROM generic_translations
+      WHERE translation_id = OLD.id AND translation_type LIKE 'SL::DB::Tax/taxdescription';
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.generic_translations_delete_on_tax_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: oe_before_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.oe_before_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+        BEGIN
+          DELETE FROM status WHERE trans_id = OLD.id;
+          DELETE FROM shipto WHERE (trans_id = OLD.id) AND (module = 'OE');
+
+          RETURN OLD;
+        END;
+      $$;
+
+
+ALTER FUNCTION public.oe_before_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: recalculate_all_spec_item_time_estimations(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.recalculate_all_spec_item_time_estimations() RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+  DECLARE
+    rspec RECORD;
+  BEGIN
+    FOR rspec IN SELECT id FROM requirement_specs LOOP
+      PERFORM recalculate_spec_item_time_estimation(rspec.id);
+    END LOOP;
+
+    RETURN TRUE;
+  END;
+$$;
+
+
+ALTER FUNCTION public.recalculate_all_spec_item_time_estimations() OWNER TO kivitendo;
+
+--
+-- Name: recalculate_spec_item_time_estimation(integer); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.recalculate_spec_item_time_estimation(the_requirement_spec_id integer) RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+  DECLARE
+    item RECORD;
+  BEGIN
+    FOR item IN
+      SELECT DISTINCT parent_id
+      FROM requirement_spec_items
+      WHERE (requirement_spec_id = the_requirement_spec_id)
+        AND (item_type           = 'sub-function-block')
+    LOOP
+      RAISE DEBUG 'hmm function-block with sub: %', item.parent_id;
+      PERFORM update_requirement_spec_item_time_estimation(item.parent_id, the_requirement_spec_id);
+    END LOOP;
+
+    FOR item IN
+      SELECT DISTINCT parent_id
+      FROM requirement_spec_items
+      WHERE (requirement_spec_id = the_requirement_spec_id)
+        AND (item_type           = 'function-block')
+        AND (id NOT IN (
+          SELECT parent_id
+          FROM requirement_spec_items
+          WHERE (requirement_spec_id = the_requirement_spec_id)
+            AND (item_type           = 'sub-function-block')
+        ))
+    LOOP
+      RAISE DEBUG 'hmm section with function-block: %', item.parent_id;
+      PERFORM update_requirement_spec_item_time_estimation(item.parent_id, the_requirement_spec_id);
+    END LOOP;
+
+    PERFORM update_requirement_spec_item_time_estimation(NULL, the_requirement_spec_id);
+
+    RETURN TRUE;
+  END;
+$$;
+
+
+ALTER FUNCTION public.recalculate_spec_item_time_estimation(the_requirement_spec_id integer) OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.requirement_spec_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF TG_WHEN = 'AFTER' THEN
+      DELETE FROM trigger_information WHERE (key = 'deleting_requirement_spec') AND (value = CAST(OLD.id AS TEXT));
+
+      RETURN OLD;
+    END IF;
+
+    RAISE DEBUG 'before delete trigger on %', OLD.id;
+
+    INSERT INTO trigger_information (key, value) VALUES ('deleting_requirement_spec', CAST(OLD.id AS TEXT));
+
+    RAISE DEBUG '  Converting items into sections items for %', OLD.id;
+    UPDATE requirement_spec_items SET item_type  = 'section', parent_id = NULL WHERE requirement_spec_id = OLD.id;
+
+    RAISE DEBUG '  And we out for %', OLD.id;
+
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.requirement_spec_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_item_before_delete_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.requirement_spec_item_before_delete_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    RAISE DEBUG 'delete trig RSitem old id %', OLD.id;
+    INSERT INTO trigger_information (key, value) VALUES ('deleting_requirement_spec_item', CAST(OLD.id AS TEXT));
+    DELETE FROM requirement_spec_items WHERE (parent_id         = OLD.id);
+    DELETE FROM trigger_information    WHERE (key = 'deleting_requirement_spec_item') AND (value = CAST(OLD.id AS TEXT));
+    RAISE DEBUG 'delete trig END %', OLD.id;
+    RETURN OLD;
+  END;
+$$;
+
+
+ALTER FUNCTION public.requirement_spec_item_before_delete_trigger() OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_item_time_estimation_updater_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.requirement_spec_item_time_estimation_updater_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  DECLARE
+    do_new BOOLEAN;
+  BEGIN
+    RAISE DEBUG 'updateRSITE op %', TG_OP;
+    IF ((TG_OP = 'UPDATE') OR (TG_OP = 'DELETE')) THEN
+      RAISE DEBUG 'UPDATE trigg op % OLD.id % OLD.parent_id %', TG_OP, OLD.id, OLD.parent_id;
+      PERFORM update_requirement_spec_item_time_estimation(OLD.parent_id, OLD.requirement_spec_id);
+      RAISE DEBUG 'UPDATE trigg op % END %', TG_OP, OLD.id;
+    END IF;
+    do_new = FALSE;
+
+    IF (TG_OP = 'UPDATE') THEN
+      do_new = OLD.parent_id <> NEW.parent_id;
+    END IF;
+
+    IF (do_new OR (TG_OP = 'INSERT')) THEN
+      RAISE DEBUG 'UPDATE trigg op % NEW.id % NEW.parent_id %', TG_OP, NEW.id, NEW.parent_id;
+      PERFORM update_requirement_spec_item_time_estimation(NEW.parent_id, NEW.requirement_spec_id);
+      RAISE DEBUG 'UPDATE trigg op % END %', TG_OP, NEW.id;
+    END IF;
+
+    RETURN NULL;
+  END;
+$$;
+
+
+ALTER FUNCTION public.requirement_spec_item_time_estimation_updater_trigger() OWNER TO kivitendo;
+
+--
+-- Name: set_mtime(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.set_mtime() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$    BEGIN        NEW.mtime := 'now';        RETURN NEW;    END;$$;
+
+
+ALTER FUNCTION public.set_mtime() OWNER TO kivitendo;
+
+--
+-- Name: shop_images_reorder_position(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.shop_images_reorder_position() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  UPDATE shop_images
+  SET position = reordered.new_position
+  FROM (
+    SELECT id, rank() OVER (PARTITION BY object_id ORDER BY position ASC) AS new_position
+    FROM shop_images
+    WHERE shop_images.object_id = OLD.object_id
+  ) reordered
+  WHERE shop_images.id = reordered.id
+  AND shop_images.position IS DISTINCT FROM reordered.new_position;
+
+  RETURN OLD;
+END;
+$$;
+
+
+ALTER FUNCTION public.shop_images_reorder_position() OWNER TO kivitendo;
+
+--
+-- Name: time_recordings_set_date_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.time_recordings_set_date_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF NEW.start_time IS NOT NULL THEN
+      NEW.date = NEW.start_time::DATE;
+    END IF;
+    RETURN NEW;
+  END;
+$$;
+
+
+ALTER FUNCTION public.time_recordings_set_date_trigger() OWNER TO kivitendo;
+
+--
+-- Name: time_recordings_set_duration_trigger(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.time_recordings_set_duration_trigger() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+  BEGIN
+    IF NEW.start_time IS NOT NULL AND NEW.end_time IS NOT NULL THEN
+      NEW.duration = EXTRACT(EPOCH FROM (NEW.end_time - NEW.start_time))/60;
+    END IF;
+    RETURN NEW;
+  END;
+$$;
+
+
+ALTER FUNCTION public.time_recordings_set_duration_trigger() OWNER TO kivitendo;
+
+--
+-- Name: update_onhand(); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.update_onhand() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  IF tg_op = 'INSERT' THEN
+    UPDATE parts SET onhand = COALESCE(onhand, 0) + new.qty WHERE id = new.parts_id;
+    RETURN new;
+  ELSIF tg_op = 'DELETE' THEN
+    UPDATE parts SET onhand = COALESCE(onhand, 0) - old.qty WHERE id = old.parts_id;
+    RETURN old;
+  ELSE
+    UPDATE parts SET onhand = COALESCE(onhand, 0) - old.qty + new.qty WHERE id = old.parts_id;
+    RETURN new;
+  END IF;
+END;
+$$;
+
+
+ALTER FUNCTION public.update_onhand() OWNER TO kivitendo;
+
+--
+-- Name: update_requirement_spec_item_time_estimation(integer, integer); Type: FUNCTION; Schema: public; Owner: kivitendo
+--
+
+CREATE FUNCTION public.update_requirement_spec_item_time_estimation(item_id integer, item_requirement_spec_id integer) RETURNS boolean
+    LANGUAGE plpgsql
+    AS $$
+  DECLARE
+    current_row RECORD;
+    new_row     RECORD;
+  BEGIN
+    IF EXISTS(
+      SELECT *
+      FROM trigger_information
+      WHERE ((key = 'deleting_requirement_spec_item') AND (value = CAST(item_id                  AS TEXT)))
+         OR ((key = 'deleting_requirement_spec')      AND (value = CAST(item_requirement_spec_id AS TEXT)))
+      LIMIT 1
+    ) THEN
+      RAISE DEBUG 'updateRSIE: item_id % or requirement_spec_id % is about to be deleted; do not update', item_id, item_requirement_spec_id;
+      RETURN FALSE;
+    END IF;
+
+    -- item_id IS NULL means that a section has been updated. The
+    -- requirement spec itself must therefore be updated.
+    IF item_id IS NULL THEN
+      SELECT COALESCE(time_estimation, 0) AS time_estimation
+      INTO current_row
+      FROM requirement_specs
+      WHERE id = item_requirement_spec_id;
+
+      SELECT COALESCE(SUM(time_estimation), 0) AS time_estimation
+      INTO new_row
+      FROM requirement_spec_items
+      WHERE (parent_id IS NULL)
+        AND (requirement_spec_id = item_requirement_spec_id);
+
+      IF current_row.time_estimation <> new_row.time_estimation THEN
+        RAISE DEBUG 'updateRSIE: updating requirement_spec % itself: old estimation % new %.', item_requirement_spec_id, current_row.time_estimation, new_row.time_estimation;
+
+        UPDATE requirement_specs
+        SET time_estimation = new_row.time_estimation
+        WHERE id = item_requirement_spec_id;
+      END IF;
+
+      RETURN TRUE;
+    END IF;
+
+    -- If we're here it means that either a sub-function-block or a
+    -- function-block has been updated. item_id is the parent's ID of
+    -- the updated item -- meaning the ID of the item that needs to be
+    -- updated now.
+
+    SELECT COALESCE(time_estimation, 0) AS time_estimation
+    INTO current_row
+    FROM requirement_spec_items
+    WHERE id = item_id;
+
+    SELECT COALESCE(SUM(time_estimation), 0) AS time_estimation
+    INTO new_row
+    FROM requirement_spec_items
+    WHERE (parent_id = item_id);
+
+    IF current_row.time_estimation = new_row.time_estimation THEN
+      RAISE DEBUG 'updateRSIE: item %: nothing to do', item_id;
+      RETURN TRUE;
+    END IF;
+
+    RAISE DEBUG 'updateRSIE: updating item %: old estimation % new %.', item_id, current_row.time_estimation, new_row.time_estimation;
+
+    UPDATE requirement_spec_items
+    SET time_estimation = new_row.time_estimation
+    WHERE id = item_id;
+
+    RETURN TRUE;
+  END;
+$$;
+
+
+ALTER FUNCTION public.update_requirement_spec_item_time_estimation(item_id integer, item_requirement_spec_id integer) OWNER TO kivitendo;
+
+--
+-- Name: first(anyelement); Type: AGGREGATE; Schema: public; Owner: kivitendo
+--
+
+CREATE AGGREGATE public.first(anyelement) (
+    SFUNC = public.first_agg,
+    STYPE = anyelement
+);
+
+
+ALTER AGGREGATE public.first(anyelement) OWNER TO kivitendo;
+
+--
+-- Name: acc_trans_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.acc_trans_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.acc_trans_id_seq OWNER TO kivitendo;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: acc_trans; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.acc_trans (
+    acc_trans_id bigint DEFAULT nextval('public.acc_trans_id_seq'::regclass) NOT NULL,
+    trans_id integer NOT NULL,
+    chart_id integer NOT NULL,
+    amount numeric(15,5),
+    transdate date DEFAULT ('now'::text)::date,
+    gldate date DEFAULT ('now'::text)::date,
+    source text,
+    cleared boolean DEFAULT false NOT NULL,
+    fx_transaction boolean DEFAULT false NOT NULL,
+    ob_transaction boolean DEFAULT false NOT NULL,
+    cb_transaction boolean DEFAULT false NOT NULL,
+    project_id integer,
+    memo text,
+    taxkey integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    chart_link text NOT NULL,
+    tax_id integer NOT NULL
+);
+
+
+ALTER TABLE public.acc_trans OWNER TO kivitendo;
+
+--
+-- Name: additional_billing_addresses; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.additional_billing_addresses (
+    id integer NOT NULL,
+    customer_id integer,
+    name text,
+    department_1 text,
+    department_2 text,
+    contact text,
+    street text,
+    zipcode text,
+    city text,
+    country text,
+    gln text,
+    email text,
+    phone text,
+    fax text,
+    default_address boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    dunning_mail text
+);
+
+
+ALTER TABLE public.additional_billing_addresses OWNER TO kivitendo;
+
+--
+-- Name: additional_billing_addresses_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.additional_billing_addresses_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.additional_billing_addresses_id_seq OWNER TO kivitendo;
+
+--
+-- Name: additional_billing_addresses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.additional_billing_addresses_id_seq OWNED BY public.additional_billing_addresses.id;
+
+
+--
+-- Name: ap; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.ap (
+    id integer DEFAULT nextval(('glid'::text)::regclass) NOT NULL,
+    invnumber text NOT NULL,
+    transdate date DEFAULT ('now'::text)::date,
+    gldate date DEFAULT ('now'::text)::date,
+    vendor_id integer,
+    taxincluded boolean DEFAULT false,
+    amount numeric(15,5) DEFAULT 0 NOT NULL,
+    netamount numeric(15,5) DEFAULT 0 NOT NULL,
+    paid numeric(15,5) DEFAULT 0 NOT NULL,
+    datepaid date,
+    duedate date,
+    invoice boolean DEFAULT false,
+    ordnumber text,
+    notes text,
+    employee_id integer,
+    quonumber text,
+    intnotes text,
+    department_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    shipvia text,
+    cp_id integer,
+    language_id integer,
+    payment_id integer,
+    storno boolean DEFAULT false,
+    taxzone_id integer NOT NULL,
+    type text,
+    orddate date,
+    quodate date,
+    globalproject_id integer,
+    storno_id integer,
+    transaction_description text,
+    direct_debit boolean DEFAULT false,
+    deliverydate date,
+    delivery_term_id integer,
+    currency_id integer NOT NULL,
+    tax_point date,
+    exchangerate numeric(15,5),
+    qrbill_data text,
+    is_sepa_blocked boolean DEFAULT false
+);
+
+
+ALTER TABLE public.ap OWNER TO kivitendo;
+
+--
+-- Name: ap_gl; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.ap_gl (
+    ap_id integer NOT NULL,
+    gl_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.ap_gl OWNER TO kivitendo;
+
+--
+-- Name: ar; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.ar (
+    id integer DEFAULT nextval(('glid'::text)::regclass) NOT NULL,
+    invnumber text NOT NULL,
+    transdate date DEFAULT ('now'::text)::date,
+    gldate date DEFAULT ('now'::text)::date,
+    customer_id integer,
+    taxincluded boolean,
+    amount numeric(15,5) DEFAULT 0 NOT NULL,
+    netamount numeric(15,5) DEFAULT 0 NOT NULL,
+    paid numeric(15,5) DEFAULT 0 NOT NULL,
+    datepaid date,
+    duedate date,
+    deliverydate date,
+    invoice boolean DEFAULT false,
+    shippingpoint text,
+    notes text,
+    ordnumber text,
+    employee_id integer,
+    quonumber text,
+    cusordnumber text,
+    intnotes text,
+    department_id integer,
+    shipvia text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    cp_id integer,
+    language_id integer,
+    payment_id integer,
+    delivery_customer_id integer,
+    delivery_vendor_id integer,
+    storno boolean DEFAULT false,
+    taxzone_id integer NOT NULL,
+    shipto_id integer,
+    type text,
+    dunning_config_id integer,
+    orddate date,
+    quodate date,
+    globalproject_id integer,
+    salesman_id integer,
+    marge_total numeric(15,5),
+    marge_percent numeric(15,5),
+    storno_id integer,
+    transaction_description text,
+    donumber text,
+    invnumber_for_credit_note text,
+    direct_debit boolean DEFAULT false,
+    delivery_term_id integer,
+    currency_id integer NOT NULL,
+    tax_point date,
+    qrbill_without_amount boolean DEFAULT false,
+    billing_address_id integer,
+    qr_reference text,
+    exchangerate numeric(15,5),
+    qr_unstructured_message text
+);
+
+
+ALTER TABLE public.ar OWNER TO kivitendo;
+
+--
+-- Name: assembly_assembly_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.assembly_assembly_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.assembly_assembly_id_seq OWNER TO kivitendo;
+
+--
+-- Name: assembly; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.assembly (
+    id integer NOT NULL,
+    parts_id integer NOT NULL,
+    qty real,
+    bom boolean,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    assembly_id integer DEFAULT nextval('public.assembly_assembly_id_seq'::regclass) NOT NULL,
+    "position" integer
+);
+
+
+ALTER TABLE public.assembly OWNER TO kivitendo;
+
+--
+-- Name: assortment_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.assortment_items (
+    assortment_id integer NOT NULL,
+    parts_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    qty real NOT NULL,
+    "position" integer NOT NULL,
+    unit character varying(20) NOT NULL,
+    charge boolean DEFAULT true
+);
+
+
+ALTER TABLE public.assortment_items OWNER TO kivitendo;
+
+--
+-- Name: background_job_histories; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.background_job_histories (
+    id integer NOT NULL,
+    package_name character varying(255),
+    run_at timestamp without time zone,
+    status character varying(255),
+    result text,
+    error text,
+    data text,
+    description text
+);
+
+
+ALTER TABLE public.background_job_histories OWNER TO kivitendo;
+
+--
+-- Name: background_job_histories_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.background_job_histories_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.background_job_histories_id_seq OWNER TO kivitendo;
+
+--
+-- Name: background_job_histories_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.background_job_histories_id_seq OWNED BY public.background_job_histories.id;
+
+
+--
+-- Name: background_jobs; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.background_jobs (
+    id integer NOT NULL,
+    type character varying(255),
+    package_name character varying(255),
+    last_run_at timestamp without time zone,
+    next_run_at timestamp without time zone,
+    data text,
+    active boolean,
+    cron_spec character varying(255),
+    node_id text,
+    description text
+);
+
+
+ALTER TABLE public.background_jobs OWNER TO kivitendo;
+
+--
+-- Name: background_jobs_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.background_jobs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.background_jobs_id_seq OWNER TO kivitendo;
+
+--
+-- Name: background_jobs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.background_jobs_id_seq OWNED BY public.background_jobs.id;
+
+
+--
+-- Name: id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    MAXVALUE 2147483647
+    CACHE 1;
+
+
+ALTER TABLE public.id OWNER TO kivitendo;
+
+--
+-- Name: bank_accounts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.bank_accounts (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    account_number character varying(100),
+    bank_code character varying(100),
+    iban character varying(100),
+    bic character varying(100),
+    bank text,
+    chart_id integer NOT NULL,
+    name text,
+    reconciliation_starting_date date,
+    reconciliation_starting_balance numeric(15,5),
+    obsolete boolean DEFAULT false NOT NULL,
+    sortkey integer NOT NULL,
+    use_for_zugferd boolean DEFAULT false NOT NULL,
+    use_for_qrbill boolean DEFAULT false NOT NULL,
+    bank_account_id character varying,
+    use_with_bank_import boolean DEFAULT true NOT NULL,
+    qr_iban text
+);
+
+
+ALTER TABLE public.bank_accounts OWNER TO kivitendo;
+
+--
+-- Name: bank_transaction_acc_trans; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.bank_transaction_acc_trans (
+    bank_transaction_id integer NOT NULL,
+    acc_trans_id bigint NOT NULL,
+    ar_id integer,
+    ap_id integer,
+    gl_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.bank_transaction_acc_trans OWNER TO kivitendo;
+
+--
+-- Name: bank_transaction_acc_trans_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.bank_transaction_acc_trans_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.bank_transaction_acc_trans_id_seq OWNER TO kivitendo;
+
+--
+-- Name: bank_transactions; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.bank_transactions (
+    id integer NOT NULL,
+    transaction_id integer,
+    remote_bank_code text,
+    remote_account_number text,
+    transdate date NOT NULL,
+    valutadate date NOT NULL,
+    amount numeric(15,5) NOT NULL,
+    remote_name text,
+    purpose text,
+    invoice_amount numeric(15,5) DEFAULT 0,
+    local_bank_account_id integer NOT NULL,
+    currency_id integer NOT NULL,
+    cleared boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    transaction_code text,
+    transaction_text text,
+    qr_reference text,
+    exchangerate numeric(15,5),
+    end_to_end_id text,
+    CONSTRAINT bank_transactions_check CHECK ((abs(invoice_amount) <= abs(amount)))
+);
+
+
+ALTER TABLE public.bank_transactions OWNER TO kivitendo;
+
+--
+-- Name: bank_transactions_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.bank_transactions_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.bank_transactions_id_seq OWNER TO kivitendo;
+
+--
+-- Name: bank_transactions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.bank_transactions_id_seq OWNED BY public.bank_transactions.id;
+
+
+--
+-- Name: bin; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.bin (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    warehouse_id integer NOT NULL,
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.bin OWNER TO kivitendo;
+
+--
+-- Name: buchungsgruppen; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.buchungsgruppen (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    inventory_accno_id integer NOT NULL,
+    sortkey integer NOT NULL,
+    obsolete boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.buchungsgruppen OWNER TO kivitendo;
+
+--
+-- Name: business; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.business (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    discount real,
+    customernumberinit text,
+    salesman boolean DEFAULT false,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.business OWNER TO kivitendo;
+
+--
+-- Name: business_models; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.business_models (
+    parts_id integer NOT NULL,
+    business_id integer NOT NULL,
+    model text,
+    part_description text,
+    part_longdescription text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    "position" integer
+);
+
+
+ALTER TABLE public.business_models OWNER TO kivitendo;
+
+--
+-- Name: bwa_categories; Type: VIEW; Schema: public; Owner: kivitendo
+--
+
+CREATE VIEW public.bwa_categories AS
+ SELECT "*VALUES*".column1 AS id,
+    "*VALUES*".column2 AS description
+   FROM ( VALUES (1,'Umsatzerlöse'::text), (2,'Best.Verdg.FE/UE'::text), (3,'Aktiv.Eigenleistung'::text), (4,'Mat./Wareneinkauf'::text), (5,'So.betr.Erlöse'::text), (10,'Personalkosten'::text), (11,'Raumkosten'::text), (12,'Betriebl.Steuern'::text), (13,'Vers./Beiträge'::text), (14,'Kfz.Kosten o.St.'::text), (15,'Werbe-Reisek.'::text), (16,'Kosten Warenabgabe'::text), (17,'Abschreibungen'::text), (18,'Rep./instandhlt.'::text), (19,'Übrige Steuern'::text), (20,'Sonst.Kosten'::text), (30,'Zinsaufwand'::text), (31,'Sonst.neutr.Aufw.'::text), (32,'Zinserträge'::text), (33,'Sonst.neutr.Ertrag'::text), (34,'Verr.kalk.Kosten'::text), (35,'Steuern Eink.u.Ertr.'::text)) "*VALUES*";
+
+
+ALTER TABLE public.bwa_categories OWNER TO kivitendo;
+
+--
+-- Name: chart; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.chart (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    accno text NOT NULL,
+    description text,
+    charttype character(1) DEFAULT 'A'::bpchar,
+    category character(1),
+    link text NOT NULL,
+    taxkey_id integer,
+    pos_bwa integer,
+    pos_bilanz integer,
+    pos_eur integer,
+    datevautomatik boolean DEFAULT false,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    new_chart_id integer,
+    valid_from date,
+    pos_er integer,
+    invalid boolean DEFAULT false
+);
+
+
+ALTER TABLE public.chart OWNER TO kivitendo;
+
+--
+-- Name: contact_departments; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.contact_departments (
+    id integer NOT NULL,
+    description text NOT NULL
+);
+
+
+ALTER TABLE public.contact_departments OWNER TO kivitendo;
+
+--
+-- Name: contact_departments_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.contact_departments_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.contact_departments_id_seq OWNER TO kivitendo;
+
+--
+-- Name: contact_departments_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.contact_departments_id_seq OWNED BY public.contact_departments.id;
+
+
+--
+-- Name: contact_titles; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.contact_titles (
+    id integer NOT NULL,
+    description text NOT NULL
+);
+
+
+ALTER TABLE public.contact_titles OWNER TO kivitendo;
+
+--
+-- Name: contact_titles_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.contact_titles_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.contact_titles_id_seq OWNER TO kivitendo;
+
+--
+-- Name: contact_titles_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.contact_titles_id_seq OWNED BY public.contact_titles.id;
+
+
+--
+-- Name: contacts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.contacts (
+    cp_id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    cp_cv_id integer,
+    cp_title text,
+    cp_givenname text,
+    cp_name text,
+    cp_email text,
+    cp_phone1 text,
+    cp_phone2 text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    cp_fax text,
+    cp_mobile1 text,
+    cp_mobile2 text,
+    cp_satphone text,
+    cp_satfax text,
+    cp_project text,
+    cp_privatphone text,
+    cp_privatemail text,
+    cp_abteilung text,
+    cp_gender character(1),
+    cp_street text,
+    cp_zipcode text,
+    cp_city text,
+    cp_birthday date,
+    cp_position text,
+    cp_main boolean DEFAULT false
+);
+
+
+ALTER TABLE public.contacts OWNER TO kivitendo;
+
+--
+-- Name: csv_import_profile_settings; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.csv_import_profile_settings (
+    id integer NOT NULL,
+    csv_import_profile_id integer NOT NULL,
+    key text NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.csv_import_profile_settings OWNER TO kivitendo;
+
+--
+-- Name: csv_import_profile_settings_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.csv_import_profile_settings_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.csv_import_profile_settings_id_seq OWNER TO kivitendo;
+
+--
+-- Name: csv_import_profile_settings_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.csv_import_profile_settings_id_seq OWNED BY public.csv_import_profile_settings.id;
+
+
+--
+-- Name: csv_import_profiles; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.csv_import_profiles (
+    id integer NOT NULL,
+    name text NOT NULL,
+    type character varying(20) NOT NULL,
+    is_default boolean DEFAULT false,
+    login text
+);
+
+
+ALTER TABLE public.csv_import_profiles OWNER TO kivitendo;
+
+--
+-- Name: csv_import_profiles_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.csv_import_profiles_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.csv_import_profiles_id_seq OWNER TO kivitendo;
+
+--
+-- Name: csv_import_profiles_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.csv_import_profiles_id_seq OWNED BY public.csv_import_profiles.id;
+
+
+--
+-- Name: csv_import_report_rows; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.csv_import_report_rows (
+    id integer NOT NULL,
+    csv_import_report_id integer NOT NULL,
+    col integer NOT NULL,
+    "row" integer NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.csv_import_report_rows OWNER TO kivitendo;
+
+--
+-- Name: csv_import_report_rows_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.csv_import_report_rows_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.csv_import_report_rows_id_seq OWNER TO kivitendo;
+
+--
+-- Name: csv_import_report_rows_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.csv_import_report_rows_id_seq OWNED BY public.csv_import_report_rows.id;
+
+
+--
+-- Name: csv_import_report_status; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.csv_import_report_status (
+    id integer NOT NULL,
+    csv_import_report_id integer NOT NULL,
+    "row" integer NOT NULL,
+    type text NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.csv_import_report_status OWNER TO kivitendo;
+
+--
+-- Name: csv_import_report_status_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.csv_import_report_status_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.csv_import_report_status_id_seq OWNER TO kivitendo;
+
+--
+-- Name: csv_import_report_status_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.csv_import_report_status_id_seq OWNED BY public.csv_import_report_status.id;
+
+
+--
+-- Name: csv_import_reports; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.csv_import_reports (
+    id integer NOT NULL,
+    session_id text NOT NULL,
+    profile_id integer NOT NULL,
+    type text NOT NULL,
+    file text NOT NULL,
+    numrows integer NOT NULL,
+    numheaders integer NOT NULL,
+    test_mode boolean NOT NULL
+);
+
+
+ALTER TABLE public.csv_import_reports OWNER TO kivitendo;
+
+--
+-- Name: csv_import_reports_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.csv_import_reports_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.csv_import_reports_id_seq OWNER TO kivitendo;
+
+--
+-- Name: csv_import_reports_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.csv_import_reports_id_seq OWNED BY public.csv_import_reports.id;
+
+
+--
+-- Name: currencies; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.currencies (
+    id integer NOT NULL,
+    name text NOT NULL
+);
+
+
+ALTER TABLE public.currencies OWNER TO kivitendo;
+
+--
+-- Name: currencies_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.currencies_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.currencies_id_seq OWNER TO kivitendo;
+
+--
+-- Name: currencies_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.currencies_id_seq OWNED BY public.currencies.id;
+
+
+--
+-- Name: custom_data_export_queries; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_data_export_queries (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    sql_query text NOT NULL,
+    access_right text,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public.custom_data_export_queries OWNER TO kivitendo;
+
+--
+-- Name: custom_data_export_queries_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.custom_data_export_queries_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.custom_data_export_queries_id_seq OWNER TO kivitendo;
+
+--
+-- Name: custom_data_export_queries_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.custom_data_export_queries_id_seq OWNED BY public.custom_data_export_queries.id;
+
+
+--
+-- Name: custom_data_export_query_parameters; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_data_export_query_parameters (
+    id integer NOT NULL,
+    query_id integer NOT NULL,
+    name text NOT NULL,
+    description text,
+    parameter_type public.custom_data_export_query_parameter_type_enum NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    default_value_type public.custom_data_export_query_parameter_default_value_type_enum NOT NULL,
+    default_value text
+);
+
+
+ALTER TABLE public.custom_data_export_query_parameters OWNER TO kivitendo;
+
+--
+-- Name: custom_data_export_query_parameters_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.custom_data_export_query_parameters_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.custom_data_export_query_parameters_id_seq OWNER TO kivitendo;
+
+--
+-- Name: custom_data_export_query_parameters_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.custom_data_export_query_parameters_id_seq OWNED BY public.custom_data_export_query_parameters.id;
+
+
+--
+-- Name: custom_variable_config_partsgroups; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_variable_config_partsgroups (
+    custom_variable_config_id integer NOT NULL,
+    partsgroup_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.custom_variable_config_partsgroups OWNER TO kivitendo;
+
+--
+-- Name: custom_variable_configs_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.custom_variable_configs_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.custom_variable_configs_id OWNER TO kivitendo;
+
+--
+-- Name: custom_variable_configs; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_variable_configs (
+    id integer DEFAULT nextval('public.custom_variable_configs_id'::regclass) NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    type text NOT NULL,
+    module text NOT NULL,
+    default_value text,
+    options text,
+    searchable boolean NOT NULL,
+    includeable boolean NOT NULL,
+    included_by_default boolean NOT NULL,
+    sortkey integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    flags text,
+    first_tab boolean DEFAULT false NOT NULL,
+    CONSTRAINT custom_variable_configs_name_description_type_module_not_empty CHECK (((type <> ''::text) AND (module <> ''::text) AND (name <> ''::text) AND (description <> ''::text))),
+    CONSTRAINT custom_variable_configs_options_not_empty_for_select CHECK (((type <> 'select'::text) OR (COALESCE(options, ''::text) <> ''::text)))
+);
+
+
+ALTER TABLE public.custom_variable_configs OWNER TO kivitendo;
+
+--
+-- Name: custom_variables_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.custom_variables_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.custom_variables_id OWNER TO kivitendo;
+
+--
+-- Name: custom_variables; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_variables (
+    id integer DEFAULT nextval('public.custom_variables_id'::regclass) NOT NULL,
+    config_id integer NOT NULL,
+    trans_id integer NOT NULL,
+    bool_value boolean,
+    timestamp_value timestamp without time zone,
+    text_value text,
+    number_value numeric(25,5),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    sub_module text DEFAULT ''::text NOT NULL
+);
+
+
+ALTER TABLE public.custom_variables OWNER TO kivitendo;
+
+--
+-- Name: custom_variables_validity; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.custom_variables_validity (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    config_id integer NOT NULL,
+    trans_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now()
+);
+
+
+ALTER TABLE public.custom_variables_validity OWNER TO kivitendo;
+
+--
+-- Name: customer; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.customer (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    name text NOT NULL,
+    department_1 text,
+    department_2 text,
+    street text,
+    zipcode text,
+    city text,
+    country text,
+    contact text,
+    phone text,
+    fax text,
+    homepage text,
+    email text,
+    notes text,
+    discount real,
+    taxincluded boolean,
+    creditlimit numeric(15,5) DEFAULT 0,
+    customernumber text,
+    cc text,
+    bcc text,
+    business_id integer,
+    taxnumber text,
+    account_number text,
+    bank_code text,
+    bank text,
+    language text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    obsolete boolean DEFAULT false,
+    username text,
+    user_password text,
+    salesman_id integer,
+    c_vendor_id text,
+    language_id integer,
+    payment_id integer,
+    taxzone_id integer NOT NULL,
+    greeting text,
+    ustid text,
+    iban text,
+    bic text,
+    direct_debit boolean DEFAULT false,
+    depositor text,
+    taxincluded_checked boolean,
+    mandator_id text,
+    mandate_date_of_signature date,
+    delivery_term_id integer,
+    hourly_rate numeric(8,2),
+    currency_id integer NOT NULL,
+    gln text,
+    pricegroup_id integer,
+    order_lock boolean DEFAULT false,
+    commercial_court text,
+    invoice_mail text,
+    contact_origin text,
+    delivery_order_mail text,
+    create_zugferd_invoices integer DEFAULT '-1'::integer NOT NULL,
+    natural_person boolean DEFAULT false,
+    c_vendor_routing_id text,
+    postal_invoice boolean DEFAULT false,
+    dunning_mail text,
+    dunning_lock boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.customer OWNER TO kivitendo;
+
+--
+-- Name: datev; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.datev (
+    beraternr character varying(7),
+    beratername character varying(9),
+    mandantennr character varying(5),
+    dfvkz character varying(2),
+    datentraegernr character varying(3),
+    abrechnungsnr character varying(6),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.datev OWNER TO kivitendo;
+
+--
+-- Name: datev_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.datev_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.datev_id_seq OWNER TO kivitendo;
+
+--
+-- Name: datev_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.datev_id_seq OWNED BY public.datev.id;
+
+
+--
+-- Name: defaults; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.defaults (
+    inventory_accno_id integer,
+    income_accno_id integer,
+    expense_accno_id integer,
+    fxgain_accno_id integer,
+    fxloss_accno_id integer,
+    invnumber text,
+    sonumber text,
+    weightunit character varying(5),
+    businessnumber text,
+    version character varying(8),
+    closedto date,
+    revtrans boolean DEFAULT false,
+    ponumber text,
+    sqnumber text,
+    rfqnumber text,
+    customernumber text,
+    vendornumber text,
+    articlenumber text,
+    servicenumber text,
+    coa text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    rmanumber text,
+    cnnumber text,
+    accounting_method text,
+    inventory_system text,
+    profit_determination text,
+    dunning_ar_amount_fee integer,
+    dunning_ar_amount_interest integer,
+    dunning_ar integer,
+    pdonumber text,
+    sdonumber text,
+    ar_paid_accno_id integer,
+    id integer NOT NULL,
+    language_id integer,
+    datev_check_on_sales_invoice boolean DEFAULT true,
+    datev_check_on_purchase_invoice boolean DEFAULT true,
+    datev_check_on_ar_transaction boolean DEFAULT true,
+    datev_check_on_ap_transaction boolean DEFAULT true,
+    datev_check_on_gl_transaction boolean DEFAULT true,
+    payments_changeable integer DEFAULT 0 NOT NULL,
+    is_changeable integer DEFAULT 2 NOT NULL,
+    ir_changeable integer DEFAULT 2 NOT NULL,
+    ar_changeable integer DEFAULT 2 NOT NULL,
+    ap_changeable integer DEFAULT 2 NOT NULL,
+    gl_changeable integer DEFAULT 2 NOT NULL,
+    show_bestbefore boolean DEFAULT false,
+    sales_order_show_delete boolean DEFAULT true,
+    purchase_order_show_delete boolean DEFAULT true,
+    sales_delivery_order_show_delete boolean DEFAULT true,
+    purchase_delivery_order_show_delete boolean DEFAULT true,
+    is_show_mark_as_paid boolean DEFAULT true,
+    ir_show_mark_as_paid boolean DEFAULT true,
+    ar_show_mark_as_paid boolean DEFAULT true,
+    ap_show_mark_as_paid boolean DEFAULT true,
+    warehouse_id integer,
+    bin_id integer,
+    company text,
+    taxnumber text,
+    co_ustid text,
+    duns text,
+    sepa_creditor_id text,
+    templates text,
+    max_future_booking_interval integer DEFAULT 360,
+    "precision" numeric(15,5) DEFAULT 0.01 NOT NULL,
+    webdav boolean DEFAULT false,
+    webdav_documents boolean DEFAULT false,
+    vertreter boolean DEFAULT false,
+    parts_show_image boolean DEFAULT true,
+    parts_listing_image boolean DEFAULT true,
+    parts_image_css text DEFAULT 'border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;'::text,
+    normalize_vc_names boolean DEFAULT true,
+    normalize_part_descriptions boolean DEFAULT true,
+    assemblynumber text,
+    show_weight boolean DEFAULT false NOT NULL,
+    transfer_default boolean DEFAULT true,
+    transfer_default_use_master_default_bin boolean DEFAULT false,
+    transfer_default_ignore_onhand boolean DEFAULT false,
+    warehouse_id_ignore_onhand integer,
+    bin_id_ignore_onhand integer,
+    balance_startdate_method text,
+    currency_id integer NOT NULL,
+    customer_hourly_rate numeric(8,2),
+    signature text,
+    requirement_spec_section_order_part_id integer,
+    transfer_default_services boolean DEFAULT true,
+    rndgain_accno_id integer,
+    rndloss_accno_id integer,
+    global_bcc text DEFAULT ''::text,
+    customer_projects_only_in_sales boolean DEFAULT false NOT NULL,
+    reqdate_interval integer DEFAULT 0,
+    require_transaction_description_ps boolean DEFAULT false NOT NULL,
+    sales_purchase_order_ship_missing_column boolean DEFAULT false,
+    allow_sales_invoice_from_sales_quotation boolean DEFAULT true NOT NULL,
+    allow_sales_invoice_from_sales_order boolean DEFAULT true NOT NULL,
+    allow_new_purchase_delivery_order boolean DEFAULT true NOT NULL,
+    allow_new_purchase_invoice boolean DEFAULT true NOT NULL,
+    disabled_price_sources text[],
+    transport_cost_reminder_article_number_id integer,
+    is_transfer_out boolean DEFAULT false NOT NULL,
+    ap_chart_id integer NOT NULL,
+    ar_chart_id integer NOT NULL,
+    letternumber integer,
+    order_always_project boolean DEFAULT false,
+    project_status_id integer,
+    project_type_id integer,
+    feature_balance boolean DEFAULT true NOT NULL,
+    feature_datev boolean DEFAULT true NOT NULL,
+    feature_erfolgsrechnung boolean DEFAULT false NOT NULL,
+    feature_eurechnung boolean DEFAULT true NOT NULL,
+    feature_ustva boolean DEFAULT true NOT NULL,
+    order_warn_duplicate_parts boolean DEFAULT true,
+    show_longdescription_select_item boolean DEFAULT false,
+    email_journal integer DEFAULT 2,
+    quick_search_modules text[],
+    stocktaking_warehouse_id integer,
+    stocktaking_bin_id integer,
+    stocktaking_cutoff_date date,
+    stocktaking_qty_threshold numeric(25,5) DEFAULT 0,
+    bcc_to_login boolean DEFAULT false NOT NULL,
+    create_part_if_not_found boolean DEFAULT false,
+    fa_bufa_nr text,
+    fa_dauerfrist text,
+    fa_steuerberater_city text,
+    fa_steuerberater_name text,
+    fa_steuerberater_street text,
+    fa_steuerberater_tel text,
+    fa_voranmeld text,
+    doc_delete_printfiles boolean DEFAULT false,
+    doc_max_filesize integer DEFAULT 10000000,
+    doc_storage boolean DEFAULT false,
+    doc_storage_for_documents text DEFAULT 'Filesystem'::text,
+    doc_storage_for_attachments text DEFAULT 'Filesystem'::text,
+    doc_storage_for_images text DEFAULT 'Filesystem'::text,
+    doc_files boolean DEFAULT false,
+    doc_files_rootpath text DEFAULT './documents'::text,
+    doc_webdav boolean DEFAULT false,
+    shipped_qty_require_stock_out boolean DEFAULT false NOT NULL,
+    sepa_reference_add_vc_vc_id boolean DEFAULT false,
+    assortmentnumber text,
+    doc_storage_for_shopimages text DEFAULT 'Filesystem'::text,
+    datev_export_format public.datev_export_format_enum DEFAULT 'cp1252-translit'::public.datev_export_format_enum,
+    order_warn_no_deliverydate boolean DEFAULT true,
+    sepa_set_duedate_as_default_exec_date boolean DEFAULT false,
+    sepa_set_skonto_date_as_default_exec_date boolean DEFAULT false,
+    sepa_set_skonto_date_buffer_in_days integer DEFAULT 0,
+    delivery_date_interval integer DEFAULT 0,
+    email_attachment_vc_files_checked boolean DEFAULT true,
+    email_attachment_part_files_checked boolean DEFAULT true,
+    email_attachment_record_files_checked boolean DEFAULT true,
+    invoice_mail_settings public.invoice_mail_settings DEFAULT 'cp'::public.invoice_mail_settings,
+    dunning_creator public.dunning_creator DEFAULT 'current_employee'::public.dunning_creator,
+    address_street1 text,
+    address_street2 text,
+    address_zipcode text,
+    address_city text,
+    address_country text,
+    workflow_po_ap_chart_id integer,
+    carry_over_account_chart_id integer,
+    profit_carried_forward_chart_id integer,
+    loss_carried_forward_chart_id integer,
+    contact_departments_use_textfield boolean,
+    contact_titles_use_textfield boolean,
+    create_zugferd_invoices integer,
+    vc_greetings_use_textfield boolean,
+    sales_serial_eq_charge boolean DEFAULT false NOT NULL,
+    undo_transfer_interval integer DEFAULT 7,
+    create_qrbill_invoices integer,
+    customer_ustid_taxnummer_unique boolean DEFAULT false,
+    vendor_ustid_taxnummer_unique boolean DEFAULT false,
+    sales_delivery_order_check_stocked boolean DEFAULT false,
+    purchase_delivery_order_check_stocked boolean DEFAULT false,
+    ir_add_doc boolean DEFAULT false NOT NULL,
+    ar_add_doc boolean DEFAULT false NOT NULL,
+    ap_add_doc boolean DEFAULT false NOT NULL,
+    gl_add_doc boolean DEFAULT false NOT NULL,
+    reqdate_on boolean DEFAULT true,
+    deliverydate_on boolean DEFAULT true,
+    sales_delivery_order_check_service boolean DEFAULT true,
+    purchase_delivery_order_check_service boolean DEFAULT true,
+    produce_assembly_same_warehouse boolean DEFAULT true,
+    produce_assembly_transfer_service boolean DEFAULT false,
+    warn_no_delivery_order_for_invoice boolean DEFAULT false,
+    order_warn_no_cusordnumber boolean DEFAULT false,
+    partsgroup_required boolean DEFAULT false NOT NULL,
+    print_interpolate_variables_in_positions boolean DEFAULT true NOT NULL,
+    sales_purchase_record_numbers_changeable boolean DEFAULT false NOT NULL,
+    always_record_links_from_order boolean DEFAULT false,
+    sudonumber text,
+    rdonumber text,
+    advance_payment_clearing_chart_id integer,
+    advance_payment_taxable_19_id integer,
+    advance_payment_taxable_7_id integer,
+    p_reclamation_record_number text DEFAULT 0 NOT NULL,
+    s_reclamation_record_number text DEFAULT 0 NOT NULL,
+    sales_reclamation_show_delete boolean DEFAULT true NOT NULL,
+    purchase_reclamation_show_delete boolean DEFAULT true NOT NULL,
+    reclamation_warn_no_reqdate boolean DEFAULT true NOT NULL,
+    reclamation_warn_duplicate_parts boolean DEFAULT true NOT NULL,
+    soinumber text,
+    pqinumber text,
+    lock_oe_subversions boolean DEFAULT false NOT NULL,
+    qrbill_copy_invnumber boolean DEFAULT false,
+    email_sender_sales_quotation text DEFAULT ''::text,
+    email_sender_request_quotation text DEFAULT ''::text,
+    email_sender_sales_order text DEFAULT ''::text,
+    email_sender_purchase_order text DEFAULT ''::text,
+    email_sender_invoice text DEFAULT ''::text,
+    email_sender_purchase_invoice text DEFAULT ''::text,
+    email_sender_letter text DEFAULT ''::text,
+    email_sender_purchase_delivery_order text DEFAULT ''::text,
+    email_sender_sales_delivery_order text DEFAULT ''::text,
+    email_sender_dunning text DEFAULT ''::text,
+    dunning_original_invoice_creation_mode public.invoice_creation_mode DEFAULT 'create_new'::public.invoice_creation_mode,
+    record_links_from_order_with_myself boolean DEFAULT false,
+    record_links_from_order_with_quotations boolean DEFAULT false,
+    layout_style text,
+    allowed_documents_with_no_positions text[],
+    fuzzy_skonto boolean DEFAULT true,
+    fuzzy_skonto_percentage real DEFAULT 0.5,
+    transit_items_chart_id integer,
+    webdav_sync_extern boolean DEFAULT false,
+    webdav_sync_extern_url text,
+    webdav_sync_extern_login text,
+    webdav_sync_extern_pass text,
+    yearend_method text DEFAULT 'default'::text NOT NULL,
+    pocnumber text,
+    sepa_export_xml boolean DEFAULT true,
+    no_bank_proposals boolean DEFAULT false,
+    check_bt_duplicates_endtoend boolean DEFAULT false,
+    show_invoice_for_advance_payment boolean DEFAULT true NOT NULL,
+    show_sales_order_intake boolean DEFAULT true NOT NULL,
+    show_purchase_quotation_intake boolean DEFAULT true NOT NULL,
+    show_purchase_order_confirmation boolean DEFAULT true NOT NULL,
+    show_sales_reclamation boolean DEFAULT true NOT NULL,
+    show_purchase_reclamation boolean DEFAULT true NOT NULL,
+    email_subject_transaction_description boolean DEFAULT false,
+    order_item_input_position integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.defaults OWNER TO kivitendo;
+
+--
+-- Name: defaults_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.defaults_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.defaults_id_seq OWNER TO kivitendo;
+
+--
+-- Name: defaults_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.defaults_id_seq OWNED BY public.defaults.id;
+
+
+--
+-- Name: delivery_order_items_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.delivery_order_items_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.delivery_order_items_id OWNER TO kivitendo;
+
+--
+-- Name: delivery_order_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.delivery_order_items (
+    id integer DEFAULT nextval('public.delivery_order_items_id'::regclass) NOT NULL,
+    delivery_order_id integer NOT NULL,
+    parts_id integer NOT NULL,
+    description text,
+    qty numeric(25,5),
+    sellprice numeric(15,5),
+    discount real,
+    project_id integer,
+    reqdate date,
+    serialnumber text,
+    ordnumber text,
+    transdate text,
+    cusordnumber text,
+    unit character varying(20),
+    base_qty real,
+    longdescription text,
+    lastcost numeric(15,5),
+    price_factor_id integer,
+    price_factor numeric(15,5) DEFAULT 1,
+    marge_price_factor numeric(15,5) DEFAULT 1,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    pricegroup_id integer,
+    "position" integer NOT NULL,
+    active_price_source text DEFAULT ''::text NOT NULL,
+    active_discount_source text DEFAULT ''::text NOT NULL,
+    orderer_id integer
+);
+
+
+ALTER TABLE public.delivery_order_items OWNER TO kivitendo;
+
+--
+-- Name: delivery_order_items_stock; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.delivery_order_items_stock (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    delivery_order_item_id integer NOT NULL,
+    qty numeric(15,5) NOT NULL,
+    unit character varying(20) NOT NULL,
+    warehouse_id integer NOT NULL,
+    bin_id integer NOT NULL,
+    chargenumber text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    bestbefore date
+);
+
+
+ALTER TABLE public.delivery_order_items_stock OWNER TO kivitendo;
+
+--
+-- Name: delivery_orders; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.delivery_orders (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    donumber text NOT NULL,
+    ordnumber text,
+    transdate date DEFAULT now(),
+    vendor_id integer,
+    customer_id integer,
+    reqdate date,
+    shippingpoint text,
+    notes text,
+    intnotes text,
+    employee_id integer,
+    closed boolean DEFAULT false,
+    delivered boolean DEFAULT false,
+    cusordnumber text,
+    oreqnumber text,
+    department_id integer,
+    shipvia text,
+    cp_id integer,
+    language_id integer,
+    shipto_id integer,
+    globalproject_id integer,
+    salesman_id integer,
+    transaction_description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    taxzone_id integer NOT NULL,
+    taxincluded boolean,
+    delivery_term_id integer,
+    currency_id integer NOT NULL,
+    payment_id integer,
+    tax_point date,
+    billing_address_id integer,
+    record_type public.delivery_order_types NOT NULL,
+    vendor_confirmation_number text
+);
+
+
+ALTER TABLE public.delivery_orders OWNER TO kivitendo;
+
+--
+-- Name: delivery_terms; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.delivery_terms (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    description text,
+    description_long text,
+    sortkey integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    obsolete boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.delivery_terms OWNER TO kivitendo;
+
+--
+-- Name: department; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.department (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.department OWNER TO kivitendo;
+
+--
+-- Name: drafts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.drafts (
+    id character varying(50) NOT NULL,
+    module character varying(50) NOT NULL,
+    submodule character varying(50) NOT NULL,
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    form text,
+    employee_id integer
+);
+
+
+ALTER TABLE public.drafts OWNER TO kivitendo;
+
+--
+-- Name: dunning; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.dunning (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    trans_id integer,
+    dunning_id integer,
+    dunning_level integer,
+    transdate date,
+    duedate date,
+    fee numeric(15,5),
+    interest numeric(15,5),
+    dunning_config_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    fee_interest_ar_id integer,
+    original_invoice_printed boolean DEFAULT false
+);
+
+
+ALTER TABLE public.dunning OWNER TO kivitendo;
+
+--
+-- Name: dunning_config; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.dunning_config (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    dunning_level integer,
+    dunning_description text,
+    active boolean,
+    auto boolean,
+    email boolean,
+    terms integer,
+    payment_terms integer,
+    fee numeric(15,5),
+    interest_rate numeric(15,5),
+    email_body text,
+    email_subject text,
+    email_attachment boolean,
+    template text,
+    create_invoices_for_fees boolean DEFAULT true,
+    print_original_invoice boolean
+);
+
+
+ALTER TABLE public.dunning_config OWNER TO kivitendo;
+
+--
+-- Name: email_imports; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.email_imports (
+    id integer NOT NULL,
+    host_name text NOT NULL,
+    user_name text NOT NULL,
+    folder text NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public.email_imports OWNER TO kivitendo;
+
+--
+-- Name: email_imports_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.email_imports_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.email_imports_id_seq OWNER TO kivitendo;
+
+--
+-- Name: email_imports_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.email_imports_id_seq OWNED BY public.email_imports.id;
+
+
+--
+-- Name: email_journal; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.email_journal (
+    id integer NOT NULL,
+    sender_id integer,
+    "from" text NOT NULL,
+    recipients text NOT NULL,
+    sent_on timestamp without time zone DEFAULT now() NOT NULL,
+    subject text NOT NULL,
+    body text NOT NULL,
+    headers text NOT NULL,
+    extended_status text NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    email_import_id integer,
+    folder text,
+    uid integer,
+    obsolete boolean DEFAULT false NOT NULL,
+    folder_uidvalidity text,
+    status public.email_journal_status NOT NULL,
+    record_type public.email_journal_record_type
+);
+
+
+ALTER TABLE public.email_journal OWNER TO kivitendo;
+
+--
+-- Name: email_journal_attachments; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.email_journal_attachments (
+    id integer NOT NULL,
+    "position" integer NOT NULL,
+    email_journal_id integer NOT NULL,
+    name text NOT NULL,
+    mime_type text NOT NULL,
+    content bytea NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    file_id integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.email_journal_attachments OWNER TO kivitendo;
+
+--
+-- Name: email_journal_attachments_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.email_journal_attachments_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.email_journal_attachments_id_seq OWNER TO kivitendo;
+
+--
+-- Name: email_journal_attachments_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.email_journal_attachments_id_seq OWNED BY public.email_journal_attachments.id;
+
+
+--
+-- Name: email_journal_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.email_journal_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.email_journal_id_seq OWNER TO kivitendo;
+
+--
+-- Name: email_journal_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.email_journal_id_seq OWNED BY public.email_journal.id;
+
+
+--
+-- Name: employee; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.employee (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    login text,
+    startdate date DEFAULT ('now'::text)::date,
+    enddate date,
+    sales boolean DEFAULT true,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    name text,
+    deleted boolean DEFAULT false,
+    deleted_email text,
+    deleted_signature text,
+    deleted_tel text,
+    deleted_fax text
+);
+
+
+ALTER TABLE public.employee OWNER TO kivitendo;
+
+--
+-- Name: employee_project_invoices; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.employee_project_invoices (
+    employee_id integer NOT NULL,
+    project_id integer NOT NULL
+);
+
+
+ALTER TABLE public.employee_project_invoices OWNER TO kivitendo;
+
+--
+-- Name: eur_categories; Type: VIEW; Schema: public; Owner: kivitendo
+--
+
+CREATE VIEW public.eur_categories AS
+ SELECT "*VALUES*".column1 AS id,
+    "*VALUES*".column2 AS description
+   FROM ( VALUES (1,'Umsatzerlöse'::text), (2,'sonstige Erlöse'::text), (3,'Privatanteile'::text), (4,'Zinserträge'::text), (5,'Ausserordentliche Erträge'::text), (6,'Vereinnahmte Umsatzst.'::text), (7,'Umsatzsteuererstattungen'::text), (8,'Wareneingänge'::text), (9,'Löhne und Gehälter'::text), (10,'Gesetzl. sozialer Aufw.'::text), (11,'Mieten'::text), (12,'Gas, Strom, Wasser'::text), (13,'Instandhaltung'::text), (14,'Steuern, Versich., Beiträge'::text), (15,'Kfz-Steuern'::text), (16,'Kfz-Versicherungen'::text), (17,'Sonst. Fahrzeugkosten'::text), (18,'Werbe- und Reisekosten'::text), (19,'Instandhaltung u. Werkzeuge'::text), (20,'Fachzeitschriften, Bücher'::text), (21,'Miete für Einrichtungen'::text), (22,'Rechts- und Beratungskosten'::text), (23,'Bürobedarf, Porto, Telefon'::text), (24,'Sonstige Aufwendungen'::text), (25,'Abschreibungen auf Anlagever.'::text), (26,'Abschreibungen auf GWG'::text), (27,'Vorsteuer'::text), (28,'Umsatzsteuerzahlungen'::text), (29,'Zinsaufwand'::text), (30,'Ausserordentlicher Aufwand'::text), (31,'Betriebliche Steuern'::text)) "*VALUES*";
+
+
+ALTER TABLE public.eur_categories OWNER TO kivitendo;
+
+--
+-- Name: exchangerate; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.exchangerate (
+    transdate date,
+    buy numeric(15,5),
+    sell numeric(15,5),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    id integer NOT NULL,
+    currency_id integer NOT NULL
+);
+
+
+ALTER TABLE public.exchangerate OWNER TO kivitendo;
+
+--
+-- Name: exchangerate_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.exchangerate_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.exchangerate_id_seq OWNER TO kivitendo;
+
+--
+-- Name: exchangerate_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.exchangerate_id_seq OWNED BY public.exchangerate.id;
+
+
+--
+-- Name: file_full_texts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.file_full_texts (
+    id integer NOT NULL,
+    file_id integer NOT NULL,
+    full_text text NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.file_full_texts OWNER TO kivitendo;
+
+--
+-- Name: file_full_texts_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.file_full_texts_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.file_full_texts_id_seq OWNER TO kivitendo;
+
+--
+-- Name: file_full_texts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.file_full_texts_id_seq OWNED BY public.file_full_texts.id;
+
+
+--
+-- Name: file_versions; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.file_versions (
+    guid text NOT NULL,
+    file_id integer NOT NULL,
+    version integer NOT NULL,
+    file_location text NOT NULL,
+    doc_path text NOT NULL,
+    backend text NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.file_versions OWNER TO kivitendo;
+
+--
+-- Name: files; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.files (
+    id integer NOT NULL,
+    object_id integer NOT NULL,
+    file_name text NOT NULL,
+    file_type text NOT NULL,
+    mime_type text NOT NULL,
+    source text NOT NULL,
+    backend_data text,
+    title character varying(45),
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    print_variant text,
+    object_type public.file_object_types NOT NULL,
+    backend public.files_backends NOT NULL,
+    uid text
+);
+
+
+ALTER TABLE public.files OWNER TO kivitendo;
+
+--
+-- Name: files_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.files_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.files_id_seq OWNER TO kivitendo;
+
+--
+-- Name: files_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.files_id_seq OWNED BY public.files.id;
+
+
+--
+-- Name: finanzamt; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.finanzamt (
+    fa_land_nr text,
+    fa_bufa_nr text,
+    fa_name text,
+    fa_strasse text,
+    fa_plz text,
+    fa_ort text,
+    fa_telefon text,
+    fa_fax text,
+    fa_plz_grosskunden text,
+    fa_plz_postfach text,
+    fa_postfach text,
+    fa_blz_1 text,
+    fa_kontonummer_1 text,
+    fa_bankbezeichnung_1 text,
+    fa_blz_2 text,
+    fa_kontonummer_2 text,
+    fa_bankbezeichnung_2 text,
+    fa_oeffnungszeiten text,
+    fa_email text,
+    fa_internet text,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.finanzamt OWNER TO kivitendo;
+
+--
+-- Name: finanzamt_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.finanzamt_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.finanzamt_id_seq OWNER TO kivitendo;
+
+--
+-- Name: finanzamt_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.finanzamt_id_seq OWNED BY public.finanzamt.id;
+
+
+--
+-- Name: follow_up_access; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.follow_up_access (
+    who integer NOT NULL,
+    what integer NOT NULL,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.follow_up_access OWNER TO kivitendo;
+
+--
+-- Name: follow_up_access_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.follow_up_access_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.follow_up_access_id_seq OWNER TO kivitendo;
+
+--
+-- Name: follow_up_access_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.follow_up_access_id_seq OWNED BY public.follow_up_access.id;
+
+
+--
+-- Name: follow_up_created_for_employees; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.follow_up_created_for_employees (
+    id integer NOT NULL,
+    follow_up_id integer NOT NULL,
+    employee_id integer NOT NULL
+);
+
+
+ALTER TABLE public.follow_up_created_for_employees OWNER TO kivitendo;
+
+--
+-- Name: follow_up_created_for_employees_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.follow_up_created_for_employees_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.follow_up_created_for_employees_id_seq OWNER TO kivitendo;
+
+--
+-- Name: follow_up_created_for_employees_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.follow_up_created_for_employees_id_seq OWNED BY public.follow_up_created_for_employees.id;
+
+
+--
+-- Name: follow_up_done; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.follow_up_done (
+    id integer NOT NULL,
+    follow_up_id integer NOT NULL,
+    done_at timestamp without time zone DEFAULT now() NOT NULL,
+    employee_id integer
+);
+
+
+ALTER TABLE public.follow_up_done OWNER TO kivitendo;
+
+--
+-- Name: follow_up_done_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.follow_up_done_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.follow_up_done_id_seq OWNER TO kivitendo;
+
+--
+-- Name: follow_up_done_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.follow_up_done_id_seq OWNED BY public.follow_up_done.id;
+
+
+--
+-- Name: follow_up_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.follow_up_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.follow_up_id OWNER TO kivitendo;
+
+--
+-- Name: follow_up_link_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.follow_up_link_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.follow_up_link_id OWNER TO kivitendo;
+
+--
+-- Name: follow_up_links; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.follow_up_links (
+    id integer DEFAULT nextval('public.follow_up_link_id'::regclass) NOT NULL,
+    follow_up_id integer NOT NULL,
+    trans_id integer NOT NULL,
+    trans_type text NOT NULL,
+    trans_info text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.follow_up_links OWNER TO kivitendo;
+
+--
+-- Name: follow_ups; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.follow_ups (
+    id integer DEFAULT nextval('public.follow_up_id'::regclass) NOT NULL,
+    follow_up_date date NOT NULL,
+    note_id integer NOT NULL,
+    created_by integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.follow_ups OWNER TO kivitendo;
+
+--
+-- Name: generic_translations; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.generic_translations (
+    id integer NOT NULL,
+    language_id integer,
+    translation_type character varying(100) NOT NULL,
+    translation_id integer,
+    translation text
+);
+
+
+ALTER TABLE public.generic_translations OWNER TO kivitendo;
+
+--
+-- Name: generic_translations_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.generic_translations_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.generic_translations_id_seq OWNER TO kivitendo;
+
+--
+-- Name: generic_translations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.generic_translations_id_seq OWNED BY public.generic_translations.id;
+
+
+--
+-- Name: gl; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.gl (
+    id integer DEFAULT nextval(('glid'::text)::regclass) NOT NULL,
+    reference text,
+    description text,
+    transdate date DEFAULT ('now'::text)::date,
+    gldate date DEFAULT ('now'::text)::date,
+    employee_id integer,
+    notes text,
+    department_id integer,
+    taxincluded boolean,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    type text,
+    ob_transaction boolean,
+    cb_transaction boolean,
+    storno boolean DEFAULT false,
+    storno_id integer,
+    deliverydate date,
+    imported boolean DEFAULT false,
+    tax_point date,
+    transaction_description text
+);
+
+
+ALTER TABLE public.gl OWNER TO kivitendo;
+
+--
+-- Name: glid; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.glid
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    MAXVALUE 2147483647
+    CACHE 1;
+
+
+ALTER TABLE public.glid OWNER TO kivitendo;
+
+--
+-- Name: greetings; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.greetings (
+    id integer NOT NULL,
+    description text NOT NULL
+);
+
+
+ALTER TABLE public.greetings OWNER TO kivitendo;
+
+--
+-- Name: greetings_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.greetings_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.greetings_id_seq OWNER TO kivitendo;
+
+--
+-- Name: greetings_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.greetings_id_seq OWNED BY public.greetings.id;
+
+
+--
+-- Name: history_erp; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.history_erp (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    trans_id integer,
+    employee_id integer,
+    addition text,
+    what_done text,
+    itime timestamp without time zone DEFAULT now(),
+    snumbers text
+);
+
+
+ALTER TABLE public.history_erp OWNER TO kivitendo;
+
+--
+-- Name: inventory; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.inventory (
+    warehouse_id integer NOT NULL,
+    parts_id integer NOT NULL,
+    oe_id integer,
+    delivery_order_items_stock_id integer,
+    shippingdate date NOT NULL,
+    employee_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    bin_id integer NOT NULL,
+    qty numeric(25,5),
+    trans_id integer NOT NULL,
+    trans_type_id integer NOT NULL,
+    project_id integer,
+    chargenumber text DEFAULT ''::text NOT NULL,
+    comment text,
+    bestbefore date,
+    id integer NOT NULL,
+    invoice_id integer
+);
+
+
+ALTER TABLE public.inventory OWNER TO kivitendo;
+
+--
+-- Name: inventory_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.inventory_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.inventory_id_seq OWNER TO kivitendo;
+
+--
+-- Name: inventory_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.inventory_id_seq OWNED BY public.inventory.id;
+
+
+--
+-- Name: invoice; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.invoice (
+    id integer DEFAULT nextval(('invoiceid'::text)::regclass) NOT NULL,
+    trans_id integer,
+    parts_id integer,
+    description text,
+    qty numeric(25,5),
+    allocated real,
+    sellprice numeric(15,5),
+    fxsellprice numeric(15,5),
+    discount real,
+    assemblyitem boolean DEFAULT false,
+    project_id integer,
+    deliverydate date,
+    serialnumber text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    pricegroup_id integer,
+    ordnumber text,
+    transdate text,
+    cusordnumber text,
+    unit character varying(20),
+    base_qty real,
+    subtotal boolean DEFAULT false,
+    longdescription text,
+    marge_total numeric(15,5),
+    marge_percent numeric(15,5),
+    lastcost numeric(15,5),
+    price_factor_id integer,
+    price_factor numeric(15,5) DEFAULT 1,
+    marge_price_factor numeric(15,5) DEFAULT 1,
+    donumber text,
+    "position" integer NOT NULL,
+    active_price_source text DEFAULT ''::text NOT NULL,
+    active_discount_source text DEFAULT ''::text NOT NULL,
+    inventory_chart_id integer,
+    expense_chart_id integer,
+    tax_id integer,
+    tax_chart_type character varying(20)
+);
+
+
+ALTER TABLE public.invoice OWNER TO kivitendo;
+
+--
+-- Name: invoiceid; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.invoiceid
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    MAXVALUE 2147483647
+    CACHE 1;
+
+
+ALTER TABLE public.invoiceid OWNER TO kivitendo;
+
+--
+-- Name: language; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.language (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    template_code text,
+    article_code text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    output_numberformat text,
+    output_dateformat text,
+    output_longdates boolean,
+    obsolete boolean DEFAULT false
+);
+
+
+ALTER TABLE public.language OWNER TO kivitendo;
+
+--
+-- Name: leads; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.leads (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    lead character varying(50)
+);
+
+
+ALTER TABLE public.leads OWNER TO kivitendo;
+
+--
+-- Name: letter; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.letter (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    customer_id integer,
+    letternumber text,
+    subject text,
+    greeting text,
+    body text,
+    employee_id integer,
+    salesman_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    date date,
+    reference text,
+    intnotes text,
+    cp_id integer,
+    vendor_id integer
+);
+
+
+ALTER TABLE public.letter OWNER TO kivitendo;
+
+--
+-- Name: letter_draft; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.letter_draft (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    customer_id integer,
+    cp_id integer,
+    letternumber text,
+    date date,
+    intnotes text,
+    reference text,
+    subject text,
+    greeting text,
+    body text,
+    employee_id integer,
+    salesman_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    vendor_id integer
+);
+
+
+ALTER TABLE public.letter_draft OWNER TO kivitendo;
+
+--
+-- Name: makemodel_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.makemodel_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.makemodel_id_seq OWNER TO kivitendo;
+
+--
+-- Name: makemodel; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.makemodel (
+    parts_id integer,
+    model text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    lastcost numeric(15,5),
+    lastupdate date,
+    sortorder integer,
+    make integer,
+    id integer DEFAULT nextval('public.makemodel_id_seq'::regclass) NOT NULL,
+    part_description text,
+    part_longdescription text
+);
+
+
+ALTER TABLE public.makemodel OWNER TO kivitendo;
+
+--
+-- Name: note_id; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.note_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.note_id OWNER TO kivitendo;
+
+--
+-- Name: notes; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.notes (
+    id integer DEFAULT nextval('public.note_id'::regclass) NOT NULL,
+    subject text,
+    body text,
+    created_by integer NOT NULL,
+    trans_id integer,
+    trans_module character varying(10),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.notes OWNER TO kivitendo;
+
+--
+-- Name: oe; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.oe (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    ordnumber text NOT NULL,
+    transdate date DEFAULT ('now'::text)::date,
+    vendor_id integer,
+    customer_id integer,
+    amount numeric(15,5),
+    netamount numeric(15,5),
+    reqdate date,
+    taxincluded boolean,
+    shippingpoint text,
+    notes text,
+    employee_id integer,
+    closed boolean DEFAULT false,
+    quonumber text,
+    cusordnumber text,
+    intnotes text,
+    department_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    shipvia text,
+    cp_id integer,
+    language_id integer,
+    payment_id integer,
+    delivery_customer_id integer,
+    delivery_vendor_id integer,
+    taxzone_id integer NOT NULL,
+    proforma boolean DEFAULT false,
+    shipto_id integer,
+    order_probability integer DEFAULT 0 NOT NULL,
+    expected_billing_date date,
+    globalproject_id integer,
+    delivered boolean DEFAULT false,
+    salesman_id integer,
+    marge_total numeric(15,5),
+    marge_percent numeric(15,5),
+    transaction_description text,
+    delivery_term_id integer,
+    currency_id integer NOT NULL,
+    exchangerate numeric(15,5),
+    tax_point date,
+    billing_address_id integer,
+    order_status_id integer,
+    record_type public.order_types NOT NULL,
+    vendor_confirmation_number text
+);
+
+
+ALTER TABLE public.oe OWNER TO kivitendo;
+
+--
+-- Name: oe_version; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.oe_version (
+    oe_id integer NOT NULL,
+    version integer NOT NULL,
+    final_version boolean DEFAULT false,
+    email_journal_id integer,
+    file_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.oe_version OWNER TO kivitendo;
+
+--
+-- Name: order_statuses; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.order_statuses (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text,
+    "position" integer NOT NULL,
+    obsolete boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.order_statuses OWNER TO kivitendo;
+
+--
+-- Name: order_statuses_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.order_statuses_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.order_statuses_id_seq OWNER TO kivitendo;
+
+--
+-- Name: order_statuses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.order_statuses_id_seq OWNED BY public.order_statuses.id;
+
+
+--
+-- Name: orderitems; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.orderitems (
+    trans_id integer,
+    parts_id integer,
+    description text,
+    qty numeric(25,5),
+    sellprice numeric(15,5),
+    discount real,
+    project_id integer,
+    reqdate date,
+    ship real,
+    serialnumber text,
+    id integer DEFAULT nextval(('orderitemsid'::text)::regclass) NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    pricegroup_id integer,
+    ordnumber text,
+    transdate text,
+    cusordnumber text,
+    unit character varying(20),
+    base_qty real,
+    subtotal boolean DEFAULT false,
+    longdescription text,
+    marge_total numeric(15,5),
+    marge_percent numeric(15,5),
+    lastcost numeric(15,5),
+    price_factor_id integer,
+    price_factor numeric(15,5) DEFAULT 1,
+    marge_price_factor numeric(15,5) DEFAULT 1,
+    "position" integer NOT NULL,
+    active_price_source text DEFAULT ''::text NOT NULL,
+    active_discount_source text DEFAULT ''::text NOT NULL,
+    optional boolean DEFAULT false,
+    recurring_billing_mode public.items_recurring_billing_mode DEFAULT 'always'::public.items_recurring_billing_mode NOT NULL,
+    recurring_billing_invoice_id integer,
+    orderer_id integer
+);
+
+
+ALTER TABLE public.orderitems OWNER TO kivitendo;
+
+--
+-- Name: orderitemsid; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.orderitemsid
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    MAXVALUE 2147483647
+    CACHE 1
+    CYCLE;
+
+
+ALTER TABLE public.orderitemsid OWNER TO kivitendo;
+
+--
+-- Name: part_classifications; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.part_classifications (
+    id integer NOT NULL,
+    description text,
+    abbreviation text,
+    used_for_purchase boolean DEFAULT true NOT NULL,
+    used_for_sale boolean DEFAULT true NOT NULL,
+    report_separate boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.part_classifications OWNER TO kivitendo;
+
+--
+-- Name: part_classifications_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.part_classifications_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.part_classifications_id_seq OWNER TO kivitendo;
+
+--
+-- Name: part_classifications_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.part_classifications_id_seq OWNED BY public.part_classifications.id;
+
+
+--
+-- Name: part_customer_prices; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.part_customer_prices (
+    id integer NOT NULL,
+    parts_id integer NOT NULL,
+    customer_id integer NOT NULL,
+    customer_partnumber text DEFAULT ''::text,
+    price numeric(15,5) DEFAULT 0,
+    sortorder integer DEFAULT 0,
+    lastupdate date DEFAULT now(),
+    part_description text,
+    part_longdescription text
+);
+
+
+ALTER TABLE public.part_customer_prices OWNER TO kivitendo;
+
+--
+-- Name: part_customer_prices_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.part_customer_prices_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.part_customer_prices_id_seq OWNER TO kivitendo;
+
+--
+-- Name: part_customer_prices_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.part_customer_prices_id_seq OWNED BY public.part_customer_prices.id;
+
+
+--
+-- Name: parts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.parts (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    partnumber text NOT NULL,
+    description text,
+    listprice numeric(15,5),
+    sellprice numeric(15,5),
+    lastcost numeric(15,5),
+    priceupdate date DEFAULT ('now'::text)::date,
+    weight real,
+    notes text,
+    makemodel boolean DEFAULT false,
+    rop real,
+    shop boolean DEFAULT false,
+    obsolete boolean DEFAULT false NOT NULL,
+    bom boolean DEFAULT false,
+    image text,
+    drawing text,
+    microfiche text,
+    partsgroup_id integer,
+    ve integer,
+    gv numeric(15,5),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    unit character varying(20) NOT NULL,
+    formel text,
+    not_discountable boolean DEFAULT false,
+    buchungsgruppen_id integer,
+    payment_id integer,
+    ean text,
+    price_factor_id integer,
+    onhand numeric(25,5) DEFAULT 0,
+    stockable boolean DEFAULT false,
+    has_sernumber boolean DEFAULT false,
+    warehouse_id integer,
+    bin_id integer,
+    classification_id integer DEFAULT 0,
+    part_type public.part_type_enum NOT NULL,
+    order_qty numeric(15,5) DEFAULT 0 NOT NULL,
+    order_locked boolean DEFAULT false,
+    tariff_code text
+);
+
+
+ALTER TABLE public.parts OWNER TO kivitendo;
+
+--
+-- Name: parts_price_history; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.parts_price_history (
+    id integer NOT NULL,
+    part_id integer NOT NULL,
+    valid_from timestamp without time zone NOT NULL,
+    lastcost numeric(15,5),
+    listprice numeric(15,5),
+    sellprice numeric(15,5),
+    price_factor numeric(15,5) DEFAULT 1
+);
+
+
+ALTER TABLE public.parts_price_history OWNER TO kivitendo;
+
+--
+-- Name: parts_price_history_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.parts_price_history_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.parts_price_history_id_seq OWNER TO kivitendo;
+
+--
+-- Name: parts_price_history_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.parts_price_history_id_seq OWNED BY public.parts_price_history.id;
+
+
+--
+-- Name: partsgroup; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.partsgroup (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    partsgroup text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    obsolete boolean DEFAULT false,
+    sortkey integer NOT NULL
+);
+
+
+ALTER TABLE public.partsgroup OWNER TO kivitendo;
+
+--
+-- Name: payment_terms; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.payment_terms (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    description_long text,
+    terms_netto integer,
+    terms_skonto integer,
+    percent_skonto real,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    sortkey integer NOT NULL,
+    auto_calculation boolean NOT NULL,
+    description_long_invoice text,
+    obsolete boolean DEFAULT false
+);
+
+
+ALTER TABLE public.payment_terms OWNER TO kivitendo;
+
+--
+-- Name: periodic_invoices; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.periodic_invoices (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    config_id integer NOT NULL,
+    ar_id integer NOT NULL,
+    period_start_date date NOT NULL,
+    itime timestamp without time zone DEFAULT now()
+);
+
+
+ALTER TABLE public.periodic_invoices OWNER TO kivitendo;
+
+--
+-- Name: periodic_invoices_configs; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.periodic_invoices_configs (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    oe_id integer NOT NULL,
+    periodicity character varying(1) NOT NULL,
+    print boolean DEFAULT false,
+    printer_id integer,
+    copies integer,
+    active boolean DEFAULT true,
+    terminated boolean DEFAULT false,
+    start_date date,
+    end_date date,
+    ar_chart_id integer NOT NULL,
+    extend_automatically_by integer,
+    first_billing_date date,
+    order_value_periodicity character varying(1) NOT NULL,
+    direct_debit boolean DEFAULT false NOT NULL,
+    send_email boolean DEFAULT false NOT NULL,
+    email_recipient_contact_id integer,
+    email_recipient_address text,
+    email_sender text,
+    email_subject text,
+    email_body text,
+    CONSTRAINT periodic_invoices_configs_valid_order_value_periodicity CHECK (((order_value_periodicity)::text = ANY (ARRAY[('p'::character varying)::text, ('m'::character varying)::text, ('q'::character varying)::text, ('b'::character varying)::text, ('y'::character varying)::text, ('2'::character varying)::text, ('3'::character varying)::text, ('4'::character varying)::text, ('5'::character varying)::text]))),
+    CONSTRAINT periodic_invoices_configs_valid_periodicity CHECK (((periodicity)::text = ANY (ARRAY[('o'::character varying)::text, ('m'::character varying)::text, ('q'::character varying)::text, ('b'::character varying)::text, ('y'::character varying)::text])))
+);
+
+
+ALTER TABLE public.periodic_invoices_configs OWNER TO kivitendo;
+
+--
+-- Name: price_factors; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.price_factors (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    factor numeric(15,5),
+    sortkey integer
+);
+
+
+ALTER TABLE public.price_factors OWNER TO kivitendo;
+
+--
+-- Name: price_rule_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.price_rule_items (
+    id integer NOT NULL,
+    price_rules_id integer NOT NULL,
+    type text,
+    op text,
+    custom_variable_configs_id integer,
+    value_text text,
+    value_int integer,
+    value_date date,
+    value_num numeric(15,5),
+    itime timestamp without time zone,
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.price_rule_items OWNER TO kivitendo;
+
+--
+-- Name: price_rule_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.price_rule_items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.price_rule_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: price_rule_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.price_rule_items_id_seq OWNED BY public.price_rule_items.id;
+
+
+--
+-- Name: price_rules; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.price_rules (
+    id integer NOT NULL,
+    name text,
+    type text,
+    priority integer DEFAULT 3 NOT NULL,
+    price numeric(15,5),
+    reduction numeric(15,5),
+    obsolete boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone,
+    mtime timestamp without time zone,
+    discount numeric(15,5)
+);
+
+
+ALTER TABLE public.price_rules OWNER TO kivitendo;
+
+--
+-- Name: price_rules_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.price_rules_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.price_rules_id_seq OWNER TO kivitendo;
+
+--
+-- Name: price_rules_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.price_rules_id_seq OWNED BY public.price_rules.id;
+
+
+--
+-- Name: pricegroup; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.pricegroup (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    pricegroup text NOT NULL,
+    obsolete boolean DEFAULT false,
+    sortkey integer NOT NULL
+);
+
+
+ALTER TABLE public.pricegroup OWNER TO kivitendo;
+
+--
+-- Name: prices; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.prices (
+    parts_id integer NOT NULL,
+    pricegroup_id integer NOT NULL,
+    price numeric(15,5),
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.prices OWNER TO kivitendo;
+
+--
+-- Name: prices_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.prices_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.prices_id_seq OWNER TO kivitendo;
+
+--
+-- Name: prices_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.prices_id_seq OWNED BY public.prices.id;
+
+
+--
+-- Name: printers; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.printers (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    printer_description text NOT NULL,
+    printer_command text,
+    template_code text
+);
+
+
+ALTER TABLE public.printers OWNER TO kivitendo;
+
+--
+-- Name: project; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    projectnumber text,
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    active boolean DEFAULT true,
+    customer_id integer,
+    valid boolean DEFAULT true,
+    project_type_id integer NOT NULL,
+    start_date date,
+    end_date date,
+    billable_customer_id integer,
+    budget_cost numeric(15,5) DEFAULT 0 NOT NULL,
+    order_value numeric(15,5) DEFAULT 0 NOT NULL,
+    budget_minutes integer DEFAULT 0 NOT NULL,
+    timeframe boolean DEFAULT false NOT NULL,
+    project_status_id integer NOT NULL
+);
+
+
+ALTER TABLE public.project OWNER TO kivitendo;
+
+--
+-- Name: project_participants; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_participants (
+    id integer NOT NULL,
+    project_id integer NOT NULL,
+    employee_id integer NOT NULL,
+    project_role_id integer NOT NULL,
+    minutes integer DEFAULT 0 NOT NULL,
+    cost_per_hour numeric(15,5),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.project_participants OWNER TO kivitendo;
+
+--
+-- Name: project_participants_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_participants_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_participants_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_participants_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_participants_id_seq OWNED BY public.project_participants.id;
+
+
+--
+-- Name: project_phase_participants; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_phase_participants (
+    id integer NOT NULL,
+    project_phase_id integer NOT NULL,
+    employee_id integer NOT NULL,
+    project_role_id integer NOT NULL,
+    minutes integer DEFAULT 0 NOT NULL,
+    cost_per_hour numeric(15,5),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.project_phase_participants OWNER TO kivitendo;
+
+--
+-- Name: project_phase_participants_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_phase_participants_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_phase_participants_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_phase_participants_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_phase_participants_id_seq OWNED BY public.project_phase_participants.id;
+
+
+--
+-- Name: project_phases; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_phases (
+    id integer NOT NULL,
+    project_id integer,
+    start_date date,
+    end_date date,
+    name text NOT NULL,
+    description text NOT NULL,
+    budget_minutes integer DEFAULT 0 NOT NULL,
+    budget_cost numeric(15,5) DEFAULT 0 NOT NULL,
+    general_minutes integer DEFAULT 0 NOT NULL,
+    general_cost_per_hour numeric(15,5) DEFAULT 0 NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.project_phases OWNER TO kivitendo;
+
+--
+-- Name: project_phases_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_phases_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_phases_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_phases_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_phases_id_seq OWNED BY public.project_phases.id;
+
+
+--
+-- Name: project_roles; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_roles (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.project_roles OWNER TO kivitendo;
+
+--
+-- Name: project_roles_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_roles_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_roles_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_roles_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_roles_id_seq OWNED BY public.project_roles.id;
+
+
+--
+-- Name: project_statuses; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_statuses (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.project_statuses OWNER TO kivitendo;
+
+--
+-- Name: project_status_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_status_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_status_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_status_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_status_id_seq OWNED BY public.project_statuses.id;
+
+
+--
+-- Name: project_types; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.project_types (
+    id integer NOT NULL,
+    "position" integer NOT NULL,
+    description text,
+    internal boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.project_types OWNER TO kivitendo;
+
+--
+-- Name: project_types_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.project_types_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.project_types_id_seq OWNER TO kivitendo;
+
+--
+-- Name: project_types_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.project_types_id_seq OWNED BY public.project_types.id;
+
+
+--
+-- Name: purchase_basket_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.purchase_basket_items (
+    id integer NOT NULL,
+    part_id integer,
+    orderer_id integer,
+    qty numeric(15,5) NOT NULL,
+    cleared boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.purchase_basket_items OWNER TO kivitendo;
+
+--
+-- Name: purchase_basket_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.purchase_basket_items_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.purchase_basket_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: purchase_basket_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.purchase_basket_items_id_seq OWNED BY public.purchase_basket_items.id;
+
+
+--
+-- Name: reclamation_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.reclamation_items (
+    id integer NOT NULL,
+    reclamation_id integer NOT NULL,
+    reason_id integer NOT NULL,
+    reason_description_ext text,
+    reason_description_int text,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    project_id integer,
+    parts_id integer NOT NULL,
+    description text,
+    longdescription text,
+    serialnumber text,
+    base_qty real,
+    qty real,
+    unit character varying(20),
+    sellprice numeric(15,5),
+    lastcost numeric(15,5),
+    discount real,
+    pricegroup_id integer,
+    price_factor_id integer,
+    price_factor numeric(15,5) DEFAULT 1,
+    active_price_source text DEFAULT ''::text NOT NULL,
+    active_discount_source text DEFAULT ''::text NOT NULL,
+    reqdate date,
+    CONSTRAINT reclamation_items_position_check CHECK (("position" > 0))
+);
+
+
+ALTER TABLE public.reclamation_items OWNER TO kivitendo;
+
+--
+-- Name: reclamation_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.reclamation_items_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.reclamation_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: reclamation_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.reclamation_items_id_seq OWNED BY public.reclamation_items.id;
+
+
+--
+-- Name: reclamation_reasons; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.reclamation_reasons (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    valid_for_sales boolean DEFAULT false NOT NULL,
+    valid_for_purchase boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.reclamation_reasons OWNER TO kivitendo;
+
+--
+-- Name: reclamation_reasons_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.reclamation_reasons_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.reclamation_reasons_id_seq OWNER TO kivitendo;
+
+--
+-- Name: reclamation_reasons_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.reclamation_reasons_id_seq OWNED BY public.reclamation_reasons.id;
+
+
+--
+-- Name: reclamations; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.reclamations (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    record_number text NOT NULL,
+    transdate date DEFAULT now(),
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    delivered boolean DEFAULT false NOT NULL,
+    closed boolean DEFAULT false NOT NULL,
+    employee_id integer NOT NULL,
+    globalproject_id integer,
+    delivery_term_id integer,
+    shipto_id integer,
+    department_id integer,
+    contact_id integer,
+    shipvia text,
+    transaction_description text,
+    shippingpoint text,
+    cv_record_number text,
+    reqdate date,
+    amount numeric(15,5),
+    netamount numeric(15,5),
+    payment_id integer,
+    currency_id integer NOT NULL,
+    taxincluded boolean NOT NULL,
+    tax_point date,
+    exchangerate numeric(15,5),
+    taxzone_id integer NOT NULL,
+    notes text,
+    intnotes text,
+    language_id integer,
+    salesman_id integer,
+    customer_id integer,
+    vendor_id integer,
+    billing_address_id integer,
+    record_type public.reclamation_types NOT NULL,
+    CONSTRAINT reclamations_customervendor_check CHECK ((((customer_id IS NOT NULL) AND (vendor_id IS NULL)) OR ((vendor_id IS NOT NULL) AND (customer_id IS NULL))))
+);
+
+
+ALTER TABLE public.reclamations OWNER TO kivitendo;
+
+--
+-- Name: reconciliation_links; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.reconciliation_links (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    bank_transaction_id integer NOT NULL,
+    acc_trans_id bigint NOT NULL,
+    rec_group integer NOT NULL
+);
+
+
+ALTER TABLE public.reconciliation_links OWNER TO kivitendo;
+
+--
+-- Name: record_links; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.record_links (
+    from_table character varying(50) NOT NULL,
+    from_id integer NOT NULL,
+    to_table character varying(50) NOT NULL,
+    to_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.record_links OWNER TO kivitendo;
+
+--
+-- Name: record_links_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.record_links_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.record_links_id_seq OWNER TO kivitendo;
+
+--
+-- Name: record_links_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.record_links_id_seq OWNED BY public.record_links.id;
+
+
+--
+-- Name: record_template_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.record_template_items (
+    id integer NOT NULL,
+    record_template_id integer NOT NULL,
+    chart_id integer NOT NULL,
+    tax_id integer NOT NULL,
+    project_id integer,
+    amount1 numeric(15,5) NOT NULL,
+    amount2 numeric(15,5),
+    source text,
+    memo text
+);
+
+
+ALTER TABLE public.record_template_items OWNER TO kivitendo;
+
+--
+-- Name: record_template_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.record_template_items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.record_template_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: record_template_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.record_template_items_id_seq OWNED BY public.record_template_items.id;
+
+
+--
+-- Name: record_templates; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.record_templates (
+    id integer NOT NULL,
+    template_name text NOT NULL,
+    template_type public.record_template_type NOT NULL,
+    customer_id integer,
+    vendor_id integer,
+    currency_id integer NOT NULL,
+    department_id integer,
+    project_id integer,
+    employee_id integer,
+    taxincluded boolean DEFAULT false NOT NULL,
+    direct_debit boolean DEFAULT false NOT NULL,
+    ob_transaction boolean DEFAULT false NOT NULL,
+    cb_transaction boolean DEFAULT false NOT NULL,
+    reference text,
+    description text,
+    ordnumber text,
+    notes text,
+    ar_ap_chart_id integer,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    show_details boolean DEFAULT false NOT NULL,
+    payment_id integer,
+    transaction_description text
+);
+
+
+ALTER TABLE public.record_templates OWNER TO kivitendo;
+
+--
+-- Name: record_templates_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.record_templates_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.record_templates_id_seq OWNER TO kivitendo;
+
+--
+-- Name: record_templates_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.record_templates_id_seq OWNED BY public.record_templates.id;
+
+
+--
+-- Name: requirement_spec_acceptance_statuses; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_acceptance_statuses (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_acceptance_statuses OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_acceptance_statuses_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_acceptance_statuses_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_acceptance_statuses_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_acceptance_statuses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_acceptance_statuses_id_seq OWNED BY public.requirement_spec_acceptance_statuses.id;
+
+
+--
+-- Name: requirement_spec_complexities; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_complexities (
+    id integer NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_complexities OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_complexities_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_complexities_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_complexities_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_complexities_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_complexities_id_seq OWNED BY public.requirement_spec_complexities.id;
+
+
+--
+-- Name: requirement_spec_item_dependencies; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_item_dependencies (
+    depending_item_id integer NOT NULL,
+    depended_item_id integer NOT NULL
+);
+
+
+ALTER TABLE public.requirement_spec_item_dependencies OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_items (
+    id integer NOT NULL,
+    requirement_spec_id integer NOT NULL,
+    item_type text NOT NULL,
+    parent_id integer,
+    "position" integer NOT NULL,
+    fb_number text NOT NULL,
+    title text,
+    description text,
+    complexity_id integer,
+    risk_id integer,
+    time_estimation numeric(12,2) DEFAULT 0 NOT NULL,
+    is_flagged boolean DEFAULT false NOT NULL,
+    acceptance_status_id integer,
+    acceptance_text text,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone,
+    order_part_id integer,
+    sellprice_factor numeric(10,5) DEFAULT 1,
+    CONSTRAINT valid_item_type CHECK (((item_type = 'section'::text) OR (item_type = 'function-block'::text) OR (item_type = 'sub-function-block'::text))),
+    CONSTRAINT valid_parent_id_for_item_type CHECK (
+CASE
+    WHEN (item_type = 'section'::text) THEN (parent_id IS NULL)
+    ELSE (parent_id IS NOT NULL)
+END)
+);
+
+
+ALTER TABLE public.requirement_spec_items OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_items_id_seq OWNED BY public.requirement_spec_items.id;
+
+
+--
+-- Name: requirement_spec_orders; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_orders (
+    id integer NOT NULL,
+    requirement_spec_id integer NOT NULL,
+    order_id integer NOT NULL,
+    version_id integer,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE public.requirement_spec_orders OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_orders_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_orders_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_orders_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_orders_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_orders_id_seq OWNED BY public.requirement_spec_orders.id;
+
+
+--
+-- Name: requirement_spec_parts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_parts (
+    id integer NOT NULL,
+    requirement_spec_id integer NOT NULL,
+    part_id integer NOT NULL,
+    unit_id integer NOT NULL,
+    qty numeric(15,5) NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL
+);
+
+
+ALTER TABLE public.requirement_spec_parts OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_parts_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_parts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_parts_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_parts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_parts_id_seq OWNED BY public.requirement_spec_parts.id;
+
+
+--
+-- Name: requirement_spec_pictures; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_pictures (
+    id integer NOT NULL,
+    requirement_spec_id integer NOT NULL,
+    text_block_id integer NOT NULL,
+    "position" integer NOT NULL,
+    number text NOT NULL,
+    description text,
+    picture_file_name text NOT NULL,
+    picture_content_type text NOT NULL,
+    picture_mtime timestamp without time zone DEFAULT now() NOT NULL,
+    picture_content bytea NOT NULL,
+    picture_width integer NOT NULL,
+    picture_height integer NOT NULL,
+    thumbnail_content_type text NOT NULL,
+    thumbnail_content bytea NOT NULL,
+    thumbnail_width integer NOT NULL,
+    thumbnail_height integer NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_pictures OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_pictures_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_pictures_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_pictures_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_pictures_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_pictures_id_seq OWNED BY public.requirement_spec_pictures.id;
+
+
+--
+-- Name: requirement_spec_predefined_texts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_predefined_texts (
+    id integer NOT NULL,
+    description text NOT NULL,
+    title text NOT NULL,
+    text text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    useable_for_text_blocks boolean DEFAULT false NOT NULL,
+    useable_for_sections boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.requirement_spec_predefined_texts OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_predefined_texts_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_predefined_texts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_predefined_texts_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_predefined_texts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_predefined_texts_id_seq OWNED BY public.requirement_spec_predefined_texts.id;
+
+
+--
+-- Name: requirement_spec_risks; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_risks (
+    id integer NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_risks OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_risks_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_risks_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_risks_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_risks_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_risks_id_seq OWNED BY public.requirement_spec_risks.id;
+
+
+--
+-- Name: requirement_spec_statuses; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_statuses (
+    id integer NOT NULL,
+    name text NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_statuses OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_statuses_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_statuses_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_statuses_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_statuses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_statuses_id_seq OWNED BY public.requirement_spec_statuses.id;
+
+
+--
+-- Name: requirement_spec_text_blocks; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_text_blocks (
+    id integer NOT NULL,
+    requirement_spec_id integer NOT NULL,
+    title text NOT NULL,
+    text text,
+    "position" integer NOT NULL,
+    output_position integer DEFAULT 1 NOT NULL,
+    is_flagged boolean DEFAULT false NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.requirement_spec_text_blocks OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_text_blocks_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_text_blocks_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_text_blocks_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_text_blocks_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_text_blocks_id_seq OWNED BY public.requirement_spec_text_blocks.id;
+
+
+--
+-- Name: requirement_spec_types; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_types (
+    id integer NOT NULL,
+    description text NOT NULL,
+    "position" integer NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    section_number_format text DEFAULT 'A00'::text NOT NULL,
+    function_block_number_format text DEFAULT 'FB000'::text NOT NULL,
+    template_file_name text
+);
+
+
+ALTER TABLE public.requirement_spec_types OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_types_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_types_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_types_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_types_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_types_id_seq OWNED BY public.requirement_spec_types.id;
+
+
+--
+-- Name: requirement_spec_versions; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_spec_versions (
+    id integer NOT NULL,
+    version_number integer,
+    description text NOT NULL,
+    comment text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    requirement_spec_id integer NOT NULL,
+    working_copy_id integer
+);
+
+
+ALTER TABLE public.requirement_spec_versions OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_versions_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_spec_versions_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_spec_versions_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_spec_versions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_spec_versions_id_seq OWNED BY public.requirement_spec_versions.id;
+
+
+--
+-- Name: requirement_specs; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.requirement_specs (
+    id integer NOT NULL,
+    type_id integer NOT NULL,
+    status_id integer,
+    customer_id integer,
+    project_id integer,
+    title text NOT NULL,
+    hourly_rate numeric(8,2) DEFAULT 0 NOT NULL,
+    working_copy_id integer,
+    previous_section_number integer NOT NULL,
+    previous_fb_number integer NOT NULL,
+    is_template boolean DEFAULT false,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    time_estimation numeric(12,2) DEFAULT 0 NOT NULL,
+    previous_picture_number integer DEFAULT 0 NOT NULL,
+    CONSTRAINT requirement_specs_is_template_or_has_customer_status_type CHECK ((is_template OR ((type_id IS NOT NULL) AND (status_id IS NOT NULL) AND (customer_id IS NOT NULL))))
+);
+
+
+ALTER TABLE public.requirement_specs OWNER TO kivitendo;
+
+--
+-- Name: requirement_specs_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.requirement_specs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.requirement_specs_id_seq OWNER TO kivitendo;
+
+--
+-- Name: requirement_specs_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.requirement_specs_id_seq OWNED BY public.requirement_specs.id;
+
+
+--
+-- Name: schema_info; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.schema_info (
+    tag text NOT NULL,
+    login text,
+    itime timestamp without time zone DEFAULT now()
+);
+
+
+ALTER TABLE public.schema_info OWNER TO kivitendo;
+
+--
+-- Name: sepa_export_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.sepa_export_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.sepa_export_id_seq OWNER TO kivitendo;
+
+--
+-- Name: sepa_export; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.sepa_export (
+    id integer DEFAULT nextval('public.sepa_export_id_seq'::regclass) NOT NULL,
+    employee_id integer NOT NULL,
+    executed boolean DEFAULT false,
+    closed boolean DEFAULT false,
+    itime timestamp without time zone DEFAULT now(),
+    vc character varying(10)
+);
+
+
+ALTER TABLE public.sepa_export OWNER TO kivitendo;
+
+--
+-- Name: sepa_export_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.sepa_export_items (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    sepa_export_id integer NOT NULL,
+    ap_id integer,
+    chart_id integer NOT NULL,
+    amount numeric(25,5),
+    reference character varying(140),
+    requested_execution_date date,
+    executed boolean DEFAULT false,
+    execution_date date,
+    our_iban character varying(100),
+    our_bic character varying(100),
+    vc_iban character varying(100),
+    vc_bic character varying(100),
+    end_to_end_id character varying(35),
+    our_depositor text,
+    vc_depositor text,
+    ar_id integer,
+    vc_mandator_id text,
+    vc_mandate_date_of_signature date,
+    payment_type text DEFAULT 'without_skonto'::text,
+    skonto_amount numeric(25,5)
+);
+
+
+ALTER TABLE public.sepa_export_items OWNER TO kivitendo;
+
+--
+-- Name: sepa_export_message_ids; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.sepa_export_message_ids (
+    id integer NOT NULL,
+    sepa_export_id integer NOT NULL,
+    message_id text NOT NULL
+);
+
+
+ALTER TABLE public.sepa_export_message_ids OWNER TO kivitendo;
+
+--
+-- Name: sepa_export_message_ids_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.sepa_export_message_ids_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.sepa_export_message_ids_id_seq OWNER TO kivitendo;
+
+--
+-- Name: sepa_export_message_ids_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.sepa_export_message_ids_id_seq OWNED BY public.sepa_export_message_ids.id;
+
+
+--
+-- Name: shipto; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shipto (
+    trans_id integer,
+    shiptoname text,
+    shiptodepartment_1 text,
+    shiptodepartment_2 text,
+    shiptostreet text,
+    shiptozipcode text,
+    shiptocity text,
+    shiptocountry text,
+    shiptocontact text,
+    shiptophone text,
+    shiptofax text,
+    shiptoemail text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    module text,
+    shipto_id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    shiptocp_gender text,
+    shiptogln text
+);
+
+
+ALTER TABLE public.shipto OWNER TO kivitendo;
+
+--
+-- Name: shop_images; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shop_images (
+    id integer NOT NULL,
+    file_id integer,
+    "position" integer,
+    thumbnail_content bytea,
+    org_file_width integer,
+    org_file_height integer,
+    thumbnail_content_type text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    object_id text NOT NULL
+);
+
+
+ALTER TABLE public.shop_images OWNER TO kivitendo;
+
+--
+-- Name: shop_images_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.shop_images_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.shop_images_id_seq OWNER TO kivitendo;
+
+--
+-- Name: shop_images_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.shop_images_id_seq OWNED BY public.shop_images.id;
+
+
+--
+-- Name: shop_order_items; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shop_order_items (
+    id integer NOT NULL,
+    shop_trans_id text NOT NULL,
+    shop_order_id integer,
+    description text,
+    partnumber text,
+    "position" integer,
+    tax_rate numeric(15,2),
+    quantity numeric(25,5),
+    price numeric(15,5),
+    active_price_source text,
+    discount real,
+    discount_code text,
+    identifier text
+);
+
+
+ALTER TABLE public.shop_order_items OWNER TO kivitendo;
+
+--
+-- Name: shop_order_items_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.shop_order_items_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.shop_order_items_id_seq OWNER TO kivitendo;
+
+--
+-- Name: shop_order_items_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.shop_order_items_id_seq OWNED BY public.shop_order_items.id;
+
+
+--
+-- Name: shop_orders; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shop_orders (
+    id integer NOT NULL,
+    shop_trans_id text NOT NULL,
+    shop_ordernumber text,
+    shop_customer_comment text,
+    amount numeric(15,5),
+    netamount numeric(15,5),
+    order_date timestamp without time zone,
+    shipping_costs numeric(15,5),
+    shipping_costs_net numeric(15,5),
+    shipping_costs_id integer,
+    tax_included boolean,
+    payment_id integer,
+    payment_description text,
+    shop_id integer,
+    host text,
+    remote_ip text,
+    transferred boolean DEFAULT false,
+    transfer_date date,
+    kivi_customer_id integer,
+    shop_customer_id integer,
+    shop_customer_number text,
+    customer_lastname text,
+    customer_firstname text,
+    customer_company text,
+    customer_street text,
+    customer_zipcode text,
+    customer_city text,
+    customer_country text,
+    customer_greeting text,
+    customer_department text,
+    customer_vat text,
+    customer_phone text,
+    customer_fax text,
+    customer_email text,
+    customer_newsletter boolean,
+    shop_c_billing_id integer,
+    shop_c_billing_number text,
+    billing_lastname text,
+    billing_firstname text,
+    billing_company text,
+    billing_street text,
+    billing_zipcode text,
+    billing_city text,
+    billing_country text,
+    billing_greeting text,
+    billing_department text,
+    billing_vat text,
+    billing_phone text,
+    billing_fax text,
+    billing_email text,
+    sepa_account_holder text,
+    sepa_iban text,
+    sepa_bic text,
+    shop_c_delivery_id integer,
+    shop_c_delivery_number text,
+    delivery_lastname text,
+    delivery_firstname text,
+    delivery_company text,
+    delivery_street text,
+    delivery_zipcode text,
+    delivery_city text,
+    delivery_country text,
+    delivery_greeting text,
+    delivery_department text,
+    delivery_vat text,
+    delivery_phone text,
+    delivery_fax text,
+    delivery_email text,
+    obsolete boolean DEFAULT false NOT NULL,
+    positions integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.shop_orders OWNER TO kivitendo;
+
+--
+-- Name: shop_orders_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.shop_orders_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.shop_orders_id_seq OWNER TO kivitendo;
+
+--
+-- Name: shop_orders_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.shop_orders_id_seq OWNED BY public.shop_orders.id;
+
+
+--
+-- Name: shop_parts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shop_parts (
+    id integer NOT NULL,
+    shop_id integer NOT NULL,
+    part_id integer NOT NULL,
+    shop_description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    last_update timestamp without time zone,
+    show_date date,
+    sortorder integer,
+    front_page boolean DEFAULT false NOT NULL,
+    active boolean DEFAULT false NOT NULL,
+    shop_category text[],
+    active_price_source text,
+    metatag_keywords text,
+    metatag_description text,
+    metatag_title text
+);
+
+
+ALTER TABLE public.shop_parts OWNER TO kivitendo;
+
+--
+-- Name: shop_parts_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.shop_parts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.shop_parts_id_seq OWNER TO kivitendo;
+
+--
+-- Name: shop_parts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.shop_parts_id_seq OWNED BY public.shop_parts.id;
+
+
+--
+-- Name: shops; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.shops (
+    id integer NOT NULL,
+    description text,
+    obsolete boolean DEFAULT false NOT NULL,
+    sortkey integer,
+    connector text,
+    pricetype text,
+    price_source text,
+    taxzone_id integer,
+    last_order_number integer,
+    orders_to_fetch integer,
+    server text,
+    port integer,
+    login text,
+    password text,
+    protocol text DEFAULT 'http'::text NOT NULL,
+    path text DEFAULT '/'::text NOT NULL,
+    realm text,
+    transaction_description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone DEFAULT now(),
+    shipping_costs_parts_id integer,
+    use_part_longdescription boolean DEFAULT false,
+    proxy text DEFAULT ''::text
+);
+
+
+ALTER TABLE public.shops OWNER TO kivitendo;
+
+--
+-- Name: shops_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.shops_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.shops_id_seq OWNER TO kivitendo;
+
+--
+-- Name: shops_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.shops_id_seq OWNED BY public.shops.id;
+
+
+--
+-- Name: status; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.status (
+    trans_id integer,
+    formname text,
+    printed boolean DEFAULT false,
+    emailed boolean DEFAULT false,
+    spoolfile text,
+    chart_id integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.status OWNER TO kivitendo;
+
+--
+-- Name: status_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.status_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.status_id_seq OWNER TO kivitendo;
+
+--
+-- Name: status_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.status_id_seq OWNED BY public.status.id;
+
+
+--
+-- Name: stocktakings; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.stocktakings (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    inventory_id integer,
+    warehouse_id integer NOT NULL,
+    bin_id integer NOT NULL,
+    parts_id integer NOT NULL,
+    employee_id integer NOT NULL,
+    qty numeric(25,5) NOT NULL,
+    comment text,
+    chargenumber text DEFAULT ''::text NOT NULL,
+    bestbefore date,
+    cutoff_date date NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.stocktakings OWNER TO kivitendo;
+
+--
+-- Name: tax; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.tax (
+    chart_id integer,
+    rate numeric(15,5) DEFAULT 0 NOT NULL,
+    taxkey integer NOT NULL,
+    taxdescription text NOT NULL,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    chart_categories text NOT NULL,
+    skonto_sales_chart_id integer,
+    skonto_purchase_chart_id integer,
+    reverse_charge_chart_id integer
+);
+
+
+ALTER TABLE public.tax OWNER TO kivitendo;
+
+--
+-- Name: tax_zones; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.tax_zones (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    sortkey integer NOT NULL,
+    obsolete boolean DEFAULT false
+);
+
+
+ALTER TABLE public.tax_zones OWNER TO kivitendo;
+
+--
+-- Name: taxkeys; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.taxkeys (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    chart_id integer NOT NULL,
+    tax_id integer NOT NULL,
+    taxkey_id integer NOT NULL,
+    pos_ustva integer,
+    startdate date NOT NULL
+);
+
+
+ALTER TABLE public.taxkeys OWNER TO kivitendo;
+
+--
+-- Name: taxzone_charts; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.taxzone_charts (
+    id integer NOT NULL,
+    taxzone_id integer NOT NULL,
+    buchungsgruppen_id integer NOT NULL,
+    income_accno_id integer NOT NULL,
+    expense_accno_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now()
+);
+
+
+ALTER TABLE public.taxzone_charts OWNER TO kivitendo;
+
+--
+-- Name: taxzone_charts_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.taxzone_charts_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.taxzone_charts_id_seq OWNER TO kivitendo;
+
+--
+-- Name: taxzone_charts_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.taxzone_charts_id_seq OWNED BY public.taxzone_charts.id;
+
+
+--
+-- Name: time_recording_articles; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.time_recording_articles (
+    id integer NOT NULL,
+    part_id integer NOT NULL,
+    "position" integer NOT NULL
+);
+
+
+ALTER TABLE public.time_recording_articles OWNER TO kivitendo;
+
+--
+-- Name: time_recording_articles_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.time_recording_articles_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.time_recording_articles_id_seq OWNER TO kivitendo;
+
+--
+-- Name: time_recording_articles_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.time_recording_articles_id_seq OWNED BY public.time_recording_articles.id;
+
+
+--
+-- Name: time_recordings; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.time_recordings (
+    id integer NOT NULL,
+    customer_id integer NOT NULL,
+    project_id integer,
+    start_time timestamp without time zone,
+    end_time timestamp without time zone,
+    description text NOT NULL,
+    staff_member_id integer NOT NULL,
+    employee_id integer NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    mtime timestamp without time zone DEFAULT now() NOT NULL,
+    booked boolean DEFAULT false,
+    payroll boolean DEFAULT false,
+    part_id integer,
+    date date NOT NULL,
+    duration integer,
+    order_id integer
+);
+
+
+ALTER TABLE public.time_recordings OWNER TO kivitendo;
+
+--
+-- Name: time_recordings_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.time_recordings_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.time_recordings_id_seq OWNER TO kivitendo;
+
+--
+-- Name: time_recordings_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.time_recordings_id_seq OWNED BY public.time_recordings.id;
+
+
+--
+-- Name: todo_user_config; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.todo_user_config (
+    employee_id integer NOT NULL,
+    show_after_login boolean DEFAULT true,
+    show_follow_ups boolean DEFAULT true,
+    show_follow_ups_login boolean DEFAULT true,
+    show_overdue_sales_quotations boolean DEFAULT true,
+    show_overdue_sales_quotations_login boolean DEFAULT true,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.todo_user_config OWNER TO kivitendo;
+
+--
+-- Name: todo_user_config_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.todo_user_config_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.todo_user_config_id_seq OWNER TO kivitendo;
+
+--
+-- Name: todo_user_config_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.todo_user_config_id_seq OWNED BY public.todo_user_config.id;
+
+
+--
+-- Name: transfer_type; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.transfer_type (
+    id integer DEFAULT nextval('public.id'::regclass) NOT NULL,
+    direction character varying(10) NOT NULL,
+    description text,
+    sortkey integer,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone
+);
+
+
+ALTER TABLE public.transfer_type OWNER TO kivitendo;
+
+--
+-- Name: translation; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.translation (
+    parts_id integer,
+    language_id integer,
+    translation text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    longdescription text,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.translation OWNER TO kivitendo;
+
+--
+-- Name: translation_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.translation_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.translation_id_seq OWNER TO kivitendo;
+
+--
+-- Name: translation_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.translation_id_seq OWNED BY public.translation.id;
+
+
+--
+-- Name: trigger_information; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.trigger_information (
+    id integer NOT NULL,
+    key text NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.trigger_information OWNER TO kivitendo;
+
+--
+-- Name: trigger_information_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.trigger_information_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.trigger_information_id_seq OWNER TO kivitendo;
+
+--
+-- Name: trigger_information_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.trigger_information_id_seq OWNED BY public.trigger_information.id;
+
+
+--
+-- Name: units; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.units (
+    name character varying(20) NOT NULL,
+    base_unit character varying(20),
+    factor numeric(20,5),
+    type character varying(20),
+    sortkey integer NOT NULL,
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.units OWNER TO kivitendo;
+
+--
+-- Name: units_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.units_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.units_id_seq OWNER TO kivitendo;
+
+--
+-- Name: units_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.units_id_seq OWNED BY public.units.id;
+
+
+--
+-- Name: units_language; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.units_language (
+    unit character varying(20) NOT NULL,
+    language_id integer NOT NULL,
+    localized character varying(20),
+    localized_plural character varying(20),
+    id integer NOT NULL
+);
+
+
+ALTER TABLE public.units_language OWNER TO kivitendo;
+
+--
+-- Name: units_language_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.units_language_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.units_language_id_seq OWNER TO kivitendo;
+
+--
+-- Name: units_language_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.units_language_id_seq OWNED BY public.units_language.id;
+
+
+--
+-- Name: user_preferences; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.user_preferences (
+    id integer NOT NULL,
+    login text NOT NULL,
+    namespace text NOT NULL,
+    version numeric(15,5),
+    key text NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.user_preferences OWNER TO kivitendo;
+
+--
+-- Name: user_preferences_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.user_preferences_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.user_preferences_id_seq OWNER TO kivitendo;
+
+--
+-- Name: user_preferences_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.user_preferences_id_seq OWNED BY public.user_preferences.id;
+
+
+--
+-- Name: validity_tokens; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.validity_tokens (
+    id integer NOT NULL,
+    scope text NOT NULL,
+    token text NOT NULL,
+    itime timestamp without time zone DEFAULT now() NOT NULL,
+    valid_until timestamp without time zone NOT NULL
+);
+
+
+ALTER TABLE public.validity_tokens OWNER TO kivitendo;
+
+--
+-- Name: validity_tokens_id_seq; Type: SEQUENCE; Schema: public; Owner: kivitendo
+--
+
+CREATE SEQUENCE public.validity_tokens_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.validity_tokens_id_seq OWNER TO kivitendo;
+
+--
+-- Name: validity_tokens_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: kivitendo
+--
+
+ALTER SEQUENCE public.validity_tokens_id_seq OWNED BY public.validity_tokens.id;
+
+
+--
+-- Name: vendor; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.vendor (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    name text NOT NULL,
+    department_1 text,
+    department_2 text,
+    street text,
+    zipcode text,
+    city text,
+    country text,
+    contact text,
+    phone text,
+    fax text,
+    homepage text,
+    email text,
+    notes text,
+    taxincluded boolean,
+    vendornumber text,
+    cc text,
+    bcc text,
+    business_id integer,
+    taxnumber text,
+    discount real,
+    creditlimit numeric(15,5),
+    account_number text,
+    bank_code text,
+    bank text,
+    language text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    obsolete boolean DEFAULT false,
+    username text,
+    user_password text,
+    salesman_id integer,
+    v_customer_id text,
+    language_id integer,
+    payment_id integer,
+    taxzone_id integer NOT NULL,
+    greeting text,
+    ustid text,
+    iban text,
+    bic text,
+    direct_debit boolean DEFAULT false,
+    depositor text,
+    delivery_term_id integer,
+    currency_id integer NOT NULL,
+    gln text,
+    natural_person boolean DEFAULT false
+);
+
+
+ALTER TABLE public.vendor OWNER TO kivitendo;
+
+--
+-- Name: warehouse; Type: TABLE; Schema: public; Owner: kivitendo
+--
+
+CREATE TABLE public.warehouse (
+    id integer DEFAULT nextval(('id'::text)::regclass) NOT NULL,
+    description text,
+    itime timestamp without time zone DEFAULT now(),
+    mtime timestamp without time zone,
+    sortkey integer,
+    invalid boolean
+);
+
+
+ALTER TABLE public.warehouse OWNER TO kivitendo;
+
+--
+-- Name: report_categories; Type: TABLE; Schema: tax; Owner: kivitendo
+--
+
+CREATE TABLE tax.report_categories (
+    id integer NOT NULL,
+    description text,
+    subdescription text
+);
+
+
+ALTER TABLE tax.report_categories OWNER TO kivitendo;
+
+--
+-- Name: report_headings; Type: TABLE; Schema: tax; Owner: kivitendo
+--
+
+CREATE TABLE tax.report_headings (
+    id integer NOT NULL,
+    category_id integer NOT NULL,
+    type text,
+    description text,
+    subdescription text
+);
+
+
+ALTER TABLE tax.report_headings OWNER TO kivitendo;
+
+--
+-- Name: report_variables; Type: TABLE; Schema: tax; Owner: kivitendo
+--
+
+CREATE TABLE tax.report_variables (
+    id integer NOT NULL,
+    "position" text NOT NULL,
+    heading_id integer,
+    description text,
+    taxbase text,
+    dec_places text,
+    valid_from date
+);
+
+
+ALTER TABLE tax.report_variables OWNER TO kivitendo;
+
+--
+-- Name: additional_billing_addresses id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.additional_billing_addresses ALTER COLUMN id SET DEFAULT nextval('public.additional_billing_addresses_id_seq'::regclass);
+
+
+--
+-- Name: background_job_histories id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.background_job_histories ALTER COLUMN id SET DEFAULT nextval('public.background_job_histories_id_seq'::regclass);
+
+
+--
+-- Name: background_jobs id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.background_jobs ALTER COLUMN id SET DEFAULT nextval('public.background_jobs_id_seq'::regclass);
+
+
+--
+-- Name: bank_transactions id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transactions ALTER COLUMN id SET DEFAULT nextval('public.bank_transactions_id_seq'::regclass);
+
+
+--
+-- Name: contact_departments id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_departments ALTER COLUMN id SET DEFAULT nextval('public.contact_departments_id_seq'::regclass);
+
+
+--
+-- Name: contact_titles id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_titles ALTER COLUMN id SET DEFAULT nextval('public.contact_titles_id_seq'::regclass);
+
+
+--
+-- Name: csv_import_profile_settings id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profile_settings ALTER COLUMN id SET DEFAULT nextval('public.csv_import_profile_settings_id_seq'::regclass);
+
+
+--
+-- Name: csv_import_profiles id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profiles ALTER COLUMN id SET DEFAULT nextval('public.csv_import_profiles_id_seq'::regclass);
+
+
+--
+-- Name: csv_import_report_rows id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_rows ALTER COLUMN id SET DEFAULT nextval('public.csv_import_report_rows_id_seq'::regclass);
+
+
+--
+-- Name: csv_import_report_status id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_status ALTER COLUMN id SET DEFAULT nextval('public.csv_import_report_status_id_seq'::regclass);
+
+
+--
+-- Name: csv_import_reports id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_reports ALTER COLUMN id SET DEFAULT nextval('public.csv_import_reports_id_seq'::regclass);
+
+
+--
+-- Name: currencies id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.currencies ALTER COLUMN id SET DEFAULT nextval('public.currencies_id_seq'::regclass);
+
+
+--
+-- Name: custom_data_export_queries id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_data_export_queries ALTER COLUMN id SET DEFAULT nextval('public.custom_data_export_queries_id_seq'::regclass);
+
+
+--
+-- Name: custom_data_export_query_parameters id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_data_export_query_parameters ALTER COLUMN id SET DEFAULT nextval('public.custom_data_export_query_parameters_id_seq'::regclass);
+
+
+--
+-- Name: datev id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.datev ALTER COLUMN id SET DEFAULT nextval('public.datev_id_seq'::regclass);
+
+
+--
+-- Name: defaults id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults ALTER COLUMN id SET DEFAULT nextval('public.defaults_id_seq'::regclass);
+
+
+--
+-- Name: email_imports id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_imports ALTER COLUMN id SET DEFAULT nextval('public.email_imports_id_seq'::regclass);
+
+
+--
+-- Name: email_journal id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal ALTER COLUMN id SET DEFAULT nextval('public.email_journal_id_seq'::regclass);
+
+
+--
+-- Name: email_journal_attachments id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal_attachments ALTER COLUMN id SET DEFAULT nextval('public.email_journal_attachments_id_seq'::regclass);
+
+
+--
+-- Name: exchangerate id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.exchangerate ALTER COLUMN id SET DEFAULT nextval('public.exchangerate_id_seq'::regclass);
+
+
+--
+-- Name: file_full_texts id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_full_texts ALTER COLUMN id SET DEFAULT nextval('public.file_full_texts_id_seq'::regclass);
+
+
+--
+-- Name: files id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.files ALTER COLUMN id SET DEFAULT nextval('public.files_id_seq'::regclass);
+
+
+--
+-- Name: finanzamt id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.finanzamt ALTER COLUMN id SET DEFAULT nextval('public.finanzamt_id_seq'::regclass);
+
+
+--
+-- Name: follow_up_access id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_access ALTER COLUMN id SET DEFAULT nextval('public.follow_up_access_id_seq'::regclass);
+
+
+--
+-- Name: follow_up_created_for_employees id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_created_for_employees ALTER COLUMN id SET DEFAULT nextval('public.follow_up_created_for_employees_id_seq'::regclass);
+
+
+--
+-- Name: follow_up_done id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_done ALTER COLUMN id SET DEFAULT nextval('public.follow_up_done_id_seq'::regclass);
+
+
+--
+-- Name: generic_translations id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.generic_translations ALTER COLUMN id SET DEFAULT nextval('public.generic_translations_id_seq'::regclass);
+
+
+--
+-- Name: greetings id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.greetings ALTER COLUMN id SET DEFAULT nextval('public.greetings_id_seq'::regclass);
+
+
+--
+-- Name: inventory id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory ALTER COLUMN id SET DEFAULT nextval('public.inventory_id_seq'::regclass);
+
+
+--
+-- Name: order_statuses id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.order_statuses ALTER COLUMN id SET DEFAULT nextval('public.order_statuses_id_seq'::regclass);
+
+
+--
+-- Name: part_classifications id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_classifications ALTER COLUMN id SET DEFAULT nextval('public.part_classifications_id_seq'::regclass);
+
+
+--
+-- Name: part_customer_prices id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_customer_prices ALTER COLUMN id SET DEFAULT nextval('public.part_customer_prices_id_seq'::regclass);
+
+
+--
+-- Name: parts_price_history id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts_price_history ALTER COLUMN id SET DEFAULT nextval('public.parts_price_history_id_seq'::regclass);
+
+
+--
+-- Name: price_rule_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rule_items ALTER COLUMN id SET DEFAULT nextval('public.price_rule_items_id_seq'::regclass);
+
+
+--
+-- Name: price_rules id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rules ALTER COLUMN id SET DEFAULT nextval('public.price_rules_id_seq'::regclass);
+
+
+--
+-- Name: prices id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.prices ALTER COLUMN id SET DEFAULT nextval('public.prices_id_seq'::regclass);
+
+
+--
+-- Name: project_participants id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_participants ALTER COLUMN id SET DEFAULT nextval('public.project_participants_id_seq'::regclass);
+
+
+--
+-- Name: project_phase_participants id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phase_participants ALTER COLUMN id SET DEFAULT nextval('public.project_phase_participants_id_seq'::regclass);
+
+
+--
+-- Name: project_phases id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phases ALTER COLUMN id SET DEFAULT nextval('public.project_phases_id_seq'::regclass);
+
+
+--
+-- Name: project_roles id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_roles ALTER COLUMN id SET DEFAULT nextval('public.project_roles_id_seq'::regclass);
+
+
+--
+-- Name: project_statuses id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_statuses ALTER COLUMN id SET DEFAULT nextval('public.project_status_id_seq'::regclass);
+
+
+--
+-- Name: project_types id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_types ALTER COLUMN id SET DEFAULT nextval('public.project_types_id_seq'::regclass);
+
+
+--
+-- Name: purchase_basket_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.purchase_basket_items ALTER COLUMN id SET DEFAULT nextval('public.purchase_basket_items_id_seq'::regclass);
+
+
+--
+-- Name: reclamation_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items ALTER COLUMN id SET DEFAULT nextval('public.reclamation_items_id_seq'::regclass);
+
+
+--
+-- Name: reclamation_reasons id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_reasons ALTER COLUMN id SET DEFAULT nextval('public.reclamation_reasons_id_seq'::regclass);
+
+
+--
+-- Name: record_links id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_links ALTER COLUMN id SET DEFAULT nextval('public.record_links_id_seq'::regclass);
+
+
+--
+-- Name: record_template_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items ALTER COLUMN id SET DEFAULT nextval('public.record_template_items_id_seq'::regclass);
+
+
+--
+-- Name: record_templates id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates ALTER COLUMN id SET DEFAULT nextval('public.record_templates_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_acceptance_statuses id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_acceptance_statuses ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_acceptance_statuses_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_complexities id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_complexities ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_complexities_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_items_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_orders id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_orders_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_parts id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_parts ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_parts_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_pictures id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_pictures ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_pictures_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_predefined_texts id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_predefined_texts ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_predefined_texts_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_risks id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_risks ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_risks_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_statuses id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_statuses ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_statuses_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_text_blocks id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_text_blocks ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_text_blocks_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_types id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_types ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_types_id_seq'::regclass);
+
+
+--
+-- Name: requirement_spec_versions id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_versions ALTER COLUMN id SET DEFAULT nextval('public.requirement_spec_versions_id_seq'::regclass);
+
+
+--
+-- Name: requirement_specs id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs ALTER COLUMN id SET DEFAULT nextval('public.requirement_specs_id_seq'::regclass);
+
+
+--
+-- Name: sepa_export_message_ids id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_message_ids ALTER COLUMN id SET DEFAULT nextval('public.sepa_export_message_ids_id_seq'::regclass);
+
+
+--
+-- Name: shop_images id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_images ALTER COLUMN id SET DEFAULT nextval('public.shop_images_id_seq'::regclass);
+
+
+--
+-- Name: shop_order_items id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_order_items ALTER COLUMN id SET DEFAULT nextval('public.shop_order_items_id_seq'::regclass);
+
+
+--
+-- Name: shop_orders id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_orders ALTER COLUMN id SET DEFAULT nextval('public.shop_orders_id_seq'::regclass);
+
+
+--
+-- Name: shop_parts id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_parts ALTER COLUMN id SET DEFAULT nextval('public.shop_parts_id_seq'::regclass);
+
+
+--
+-- Name: shops id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shops ALTER COLUMN id SET DEFAULT nextval('public.shops_id_seq'::regclass);
+
+
+--
+-- Name: status id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.status ALTER COLUMN id SET DEFAULT nextval('public.status_id_seq'::regclass);
+
+
+--
+-- Name: taxzone_charts id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts ALTER COLUMN id SET DEFAULT nextval('public.taxzone_charts_id_seq'::regclass);
+
+
+--
+-- Name: time_recording_articles id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recording_articles ALTER COLUMN id SET DEFAULT nextval('public.time_recording_articles_id_seq'::regclass);
+
+
+--
+-- Name: time_recordings id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings ALTER COLUMN id SET DEFAULT nextval('public.time_recordings_id_seq'::regclass);
+
+
+--
+-- Name: todo_user_config id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.todo_user_config ALTER COLUMN id SET DEFAULT nextval('public.todo_user_config_id_seq'::regclass);
+
+
+--
+-- Name: translation id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.translation ALTER COLUMN id SET DEFAULT nextval('public.translation_id_seq'::regclass);
+
+
+--
+-- Name: trigger_information id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.trigger_information ALTER COLUMN id SET DEFAULT nextval('public.trigger_information_id_seq'::regclass);
+
+
+--
+-- Name: units id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units ALTER COLUMN id SET DEFAULT nextval('public.units_id_seq'::regclass);
+
+
+--
+-- Name: units_language id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units_language ALTER COLUMN id SET DEFAULT nextval('public.units_language_id_seq'::regclass);
+
+
+--
+-- Name: user_preferences id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.user_preferences ALTER COLUMN id SET DEFAULT nextval('public.user_preferences_id_seq'::regclass);
+
+
+--
+-- Name: validity_tokens id; Type: DEFAULT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.validity_tokens ALTER COLUMN id SET DEFAULT nextval('public.validity_tokens_id_seq'::regclass);
+
+
+--
+-- Data for Name: acc_trans; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.acc_trans (acc_trans_id, trans_id, chart_id, amount, transdate, gldate, source, cleared, fx_transaction, ob_transaction, cb_transaction, project_id, memo, taxkey, itime, mtime, chart_link, tax_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: additional_billing_addresses; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.additional_billing_addresses (id, customer_id, name, department_1, department_2, contact, street, zipcode, city, country, gln, email, phone, fax, default_address, itime, mtime, dunning_mail) FROM stdin;
+\.
+
+
+--
+-- Data for Name: ap; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.ap (id, invnumber, transdate, gldate, vendor_id, taxincluded, amount, netamount, paid, datepaid, duedate, invoice, ordnumber, notes, employee_id, quonumber, intnotes, department_id, itime, mtime, shipvia, cp_id, language_id, payment_id, storno, taxzone_id, type, orddate, quodate, globalproject_id, storno_id, transaction_description, direct_debit, deliverydate, delivery_term_id, currency_id, tax_point, exchangerate, qrbill_data, is_sepa_blocked) FROM stdin;
+\.
+
+
+--
+-- Data for Name: ap_gl; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.ap_gl (ap_id, gl_id, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: ar; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.ar (id, invnumber, transdate, gldate, customer_id, taxincluded, amount, netamount, paid, datepaid, duedate, deliverydate, invoice, shippingpoint, notes, ordnumber, employee_id, quonumber, cusordnumber, intnotes, department_id, shipvia, itime, mtime, cp_id, language_id, payment_id, delivery_customer_id, delivery_vendor_id, storno, taxzone_id, shipto_id, type, dunning_config_id, orddate, quodate, globalproject_id, salesman_id, marge_total, marge_percent, storno_id, transaction_description, donumber, invnumber_for_credit_note, direct_debit, delivery_term_id, currency_id, tax_point, qrbill_without_amount, billing_address_id, qr_reference, exchangerate, qr_unstructured_message) FROM stdin;
+\.
+
+
+--
+-- Data for Name: assembly; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.assembly (id, parts_id, qty, bom, itime, mtime, assembly_id, "position") FROM stdin;
+\.
+
+
+--
+-- Data for Name: assortment_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.assortment_items (assortment_id, parts_id, itime, mtime, qty, "position", unit, charge) FROM stdin;
+\.
+
+
+--
+-- Data for Name: background_job_histories; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.background_job_histories (id, package_name, run_at, status, result, error, data, description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: background_jobs; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.background_jobs (id, type, package_name, last_run_at, next_run_at, data, active, cron_spec, node_id, description) FROM stdin;
+1	interval	CleanBackgroundJobHistory	\N	2018-12-01 03:00:00	\N	t	0 3 * * *	\N	\N
+3	interval	BackgroundJobCleanup	\N	2018-12-01 03:00:00	\N	t	0 3 * * *	\N	\N
+4	interval	SelfTest	\N	2018-12-01 02:20:00	\N	t	20 2 * * *	\N	\N
+2	interval	CreatePeriodicInvoices	\N	2018-12-01 03:00:00	\N	t	0 3 * * *	\N	\N
+5	interval	CleanAuthSessions	\N	2018-12-01 06:30:00	\N	t	30 6 * * *	\N	\N
+6	interval	CreateOrUpdateFileFullTexts	\N	2023-12-17 03:20:00	\N	t	20 3 * * *	\N	\N
+7	interval	UpdateEmployeeBaseData	\N	2026-04-24 23:21:55.809799	\N	t	*/5 * * * *	\N	\N
+8	interval	ValidityTokenCleanup	\N	2026-04-24 23:21:56.049298	\N	t	0 3 * * *	\N	\N
+\.
+
+
+--
+-- Data for Name: bank_accounts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.bank_accounts (id, account_number, bank_code, iban, bic, bank, chart_id, name, reconciliation_starting_date, reconciliation_starting_balance, obsolete, sortkey, use_for_zugferd, use_for_qrbill, bank_account_id, use_with_bank_import, qr_iban) FROM stdin;
+\.
+
+
+--
+-- Data for Name: bank_transaction_acc_trans; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.bank_transaction_acc_trans (bank_transaction_id, acc_trans_id, ar_id, ap_id, gl_id, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: bank_transactions; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.bank_transactions (id, transaction_id, remote_bank_code, remote_account_number, transdate, valutadate, amount, remote_name, purpose, invoice_amount, local_bank_account_id, currency_id, cleared, itime, transaction_code, transaction_text, qr_reference, exchangerate, end_to_end_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: bin; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.bin (id, warehouse_id, description, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: buchungsgruppen; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.buchungsgruppen (id, description, inventory_accno_id, sortkey, obsolete) FROM stdin;
+860	Standard 7%	53	2	f
+859	Standard 19%	53	1	f
+\.
+
+
+--
+-- Data for Name: business; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.business (id, description, discount, customernumberinit, salesman, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: business_models; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.business_models (parts_id, business_id, model, part_description, part_longdescription, itime, mtime, "position") FROM stdin;
+\.
+
+
+--
+-- Data for Name: chart; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.chart (id, accno, description, charttype, category, link, taxkey_id, pos_bwa, pos_bilanz, pos_eur, datevautomatik, itime, mtime, new_chart_id, valid_from, pos_er, invalid) FROM stdin;
+1	0027	EDV-Software	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+2	0090	Geschäftsbauten	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+3	0200	Techn.Anlagen und Maschinen	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+4	0210	Maschinen	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+5	0380	Sonst.Transportmittel	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+6	0400	Betriebsausstattung	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+19	1791	Umsatzsteuer frühere Jahre	A	E		0	\N	\N	28	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	28	f
+20	1800	Privatentnahme allgemein	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+21	1810	Privatsteuern	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+22	1820	Sonderausgaben beschränkt abzugsfähig	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+23	1830	Sonderausgaben unbeschr.anzugsfähig	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+24	1840	Zuwendungen, Spenden	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+25	1890	Privateinlagen	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+26	2110	Zinsaufwendung f.kurzf.Verbindlichk	A	E		0	30	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+27	2120	Zinsaufwendung f.langf.Verbindlichk	A	E		0	30	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+28	2130	Diskontaufwendung	A	E		0	30	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+29	2310	Anlagenabgänge Sachanlagen Restbuchw.b.Buchverlust	A	E		0	31	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+30	2315	Anlagenabgänge Sachanlagen Restbuchw.b.Buchgewinn	A	I		0	31	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+31	2320	Verluste Abgang Gegenst.d.Anlagever	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+32	2650	Sonstige Zinsen und änliche Erträge	A	I		0	32	\N	4	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	4	f
+33	2720	Ertr.a.d.Abgang v.Gegens.d.Anlageve	A	I		0	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+34	2742	Versicherungsentschädigungen	A	I		0	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+35	3000	Roh,-Hilfs,-und Betriebsstoffe	A	E	IC	9	4	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+36	3300	Wareneingang 7% Vorsteuer	A	E	AP_amount:IC_cogs	8	4	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+41	3550	Steuerfreier innergem.Erwerb	A	E	AP_amount:IC_cogs	0	\N	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+44	3750	Erhaltene Boni 7% Vorsteuer	A	I	AP_paid	8	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+46	3780	Erhaltene Rabatte 7% Vorsteuer	A	I	AP_paid	8	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+48	3800	Bezugsnebenkosten	A	E	AP_amount:IC_cogs:IC_expense	0	4	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+49	3830	Leergut	A	E	AP_amount:IC_cogs	0	4	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+50	3850	Zölle und Einfuhrabgaben	A	E	AP_amount:IC_cogs	0	4	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+51	3960	Bestandsver.Roh-,Hilfs-.Betriebs.sow.bez.Waren	A	E		0	2	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+52	3970	Bestand Roh-,Hilfs-,u.Betriebsstoff	A	A	IC	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+53	3980	Bestand Waren	A	A	IC	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+54	4000	Material-und Stoffverbrauch	A	E	IC_cogs	0	20	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+55	4110	Löhne	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+56	3990	Verrechnete Stoffkosten	A	E	IC_cogs	0	4	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+57	4120	Gehälter	A	E		0	10	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+58	4125	Ehegattengehalt	A	E		0	10	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+59	4138	Beiträge zur Berufsgenossenschaft	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+60	4139	Ausgleichsabgabe i.S.d.Schwerbehinterdengesetzes	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+61	4140	Freiwillig soziale Aufwendungen lohnsteuerfrei	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+62	4145	Freiwillige sozi.Aufw.lohnsteuerpflichtig.	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+63	4149	Pauschale Lohnsteuera.sons.Bezüge (z.B.Fahrtkostenzu)	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+64	4150	Krankengeldzuschüsse	A	E		0	10	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+65	4175	Fahrtkostenerst.Wohnung/Arbeitsstät	A	E		0	10	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+66	4190	Aushilfslöhne	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+67	4199	Lohnsteuer für Aushilfe	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+68	4200	Raumkosten	A	E	AP_amount	9	11	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+69	4210	Miete	A	E	AP_amount	9	11	\N	11	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	11	f
+70	4220	Pacht	A	E	AP_amount	0	\N	\N	11	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	11	f
+71	4230	Heizung	A	E	AP_amount	9	11	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+72	4240	Gas,Strom, Wasser	A	E	AP_amount	9	11	\N	12	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	12	f
+74	4260	Instandhaltung betrieb.Räume	A	E	AP_amount	9	11	\N	13	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	13	f
+75	4280	Sonstige Raumkosten	A	E	AP_amount	9	11	\N	13	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	13	f
+76	4301	Nicht abziehbare Vorsteuer 7%	A	E	AP_paid	0	20	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+78	4320	Gewerbesteuer	A	E		0	12	\N	31	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	31	f
+37	3400	Wareneingang 16%/19% Vorsteuer	A	E	AP_amount:IC_cogs	9	4	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+73	4250	Reinigung	A	E	AP_amount	9	11	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+90	4550	Garagenmiete	A	E	AP_amount	0	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+91	4570	Leasingfahrzeugkosten	A	E	AP_amount	0	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+92	4580	Sonstige Kfz-Kosten	A	E	AP_amount	9	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+93	4600	Werbe-und Reisekosten	A	E	AP_amount	9	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+95	4638	Geschenke ausschließl.betrieb.genut	A	E	AP_amount	9	\N	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+96	4640	Repräsentationskosten	A	E	AP_amount	9	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+97	4650	Bewirtungskosten	A	E	AP_amount	9	20	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+98	4653	Aufmerksamkeiten	A	E	AP_amount	9	\N	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+99	4654	Nicht abzugsfähige Bewirtungskosten	A	E	AP_amount	0	\N	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+100	4660	Reisekosten Arbeitnehmer	A	E	AP_amount	9	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+893	8732	Gewährte Skonti 5% USt	A	I	AR_paid	2	1	\N	1	t	2021-01-16 23:40:37.788147	\N	\N	\N	\N	f
+894	3732	Erhaltene Skonti 5 % Vorsteuer	A	E	AP_paid	8	4	\N	\N	t	2021-01-16 23:40:37.788147	\N	\N	\N	\N	f
+895	8735	Gewährte Skonti 16 % USt	A	I	AR_paid	3	1	\N	1	t	2021-01-16 23:40:37.788147	\N	\N	\N	1	f
+896	3737	Erhaltene Skonti 16 % USt	A	E	AP_paid	9	4	\N	\N	t	2021-01-16 23:40:37.788147	\N	\N	\N	\N	f
+897	1568	Abziehbare Vorsteuer 5 %	A	E	AP_tax:IC_taxpart:IC_taxservice	8	\N	\N	27	t	2021-01-16 23:40:37.788147	\N	\N	\N	27	f
+79	4340	Sonstige Betriebssteuern	A	E		0	12	\N	31	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	31	f
+80	4350	Verbrauchssteuer	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+81	4355	Ökosteuer	A	E		0	12	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+82	4396	Steuerl.abzugs.Verspätungszuschl.u.Zwangsgelder	A	E		0	\N	\N	31	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	31	f
+83	4397	Steuerl.n.abzugsf.Verspätungszuschläge u.Zwangsgelder	A	E		0	\N	\N	31	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	31	f
+84	4500	Fahrzeugkosten	A	E	AP_amount	0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+85	4530	Laufende Kfz-Betriebskosten	A	E	AP_amount	9	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+89	4540	Kfz-Reparaturen	A	E	AP_amount	9	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+101	4663	Reisekosten Arbeitn.m.Vorsteuerabzu f.öffentl.Verkehrsm.	A	E	AP_amount	8	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+102	4664	Reisekosten Arbeitn.Verpflegungmehr	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+103	4666	Reisekosten Arbeitn.Übernachtungsaufwand	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+104	4668	Kilometerentgelderstattung Arbeitnehmer	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+105	4670	Reisekosten Unternehmer	A	E	AP_amount	9	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+106	4673	Reisek.Untern.m.Vorsteuerabzug (öffentl.Verkehrsm.	A	E	AP_amount	8	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+107	4674	Reisekosten Untern.Verpflegungsmehr	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+108	4676	Reisekosten Untern.Übernachtungsauf	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+109	4700	Kosten der Warenabgabe	A	E	AP_amount:IC_cogs	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+110	4710	Verpackungsmaterial	A	E	AP_amount:IC_cogs	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+111	4730	Ausgangsfracht	A	E	AP_amount:IC_cogs	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+112	4750	Transportversicherung	A	E	AP_amount:IC_cogs:IC_expense	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+113	4760	Verkaufsprovision	A	E	AP_amount:IC_expense	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+114	4780	Fremdarbeiten	A	E	AP_amount:IC_expense	0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+115	4790	Aufwand für Gewährleistungen	A	E	AP_amount:IC_expense	0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+116	4800	Rep.u.Instandhaltungen v.techn.Anlagen u.Maschinen	A	E	AP_amount	9	18	\N	19	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	19	f
+117	4806	Wartungskosten für Hard-u.Software	A	E	AP_amount:IC_expense	9	18	\N	19	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	19	f
+118	4809	Sonstige Reparaturen u.Instandhalt.	A	E	AP_amount	9	\N	\N	19	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	19	f
+119	4810	Mietleasing	A	E	AP_amount	0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+120	4815	Kaufleasing	A	E	AP_amount	0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+121	4822	Abschreibungen a.immat.Vermögensgeg	A	E		0	\N	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+122	4824	Abschreibung a.d.Geschäft-o.Firmenw	A	E		0	\N	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+123	4840	Außerplanmäßig Abschr.a.Sachanlagen	A	E		0	\N	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+124	4855	Sofortabschreibung GWG	A	E	AP_amount	0	\N	\N	26	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	26	f
+125	4860	Abschreibungen auf aktivierte GWG	A	E		0	\N	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+126	4900	Sonstige betriebliche Aufwendungen	A	E	AP_amount	9	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+127	4905	Sons.Aufw.betriebl. und regelmäßig	A	E	AP_amount	9	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+128	4909	Fremdleistungen	A	E	AP_amount	0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+129	4910	Porto	A	E	AP_amount	0	20	\N	23	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	23	f
+130	4920	Telefon	A	E	AP_amount	9	20	\N	23	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	23	f
+131	4925	Telefax	A	E	AP_amount	9	20	\N	23	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	23	f
+132	4930	Bürobedarf	A	E	AP_amount	9	20	\N	23	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	23	f
+133	4940	Zeitschriften, Bücher	A	E	AP_amount	8	20	\N	20	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	20	f
+134	4945	Fortbildungskosten	A	E	AP_amount	9	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+135	4946	Freiwillige Sozialleistungen	A	E	AP_amount	0	\N	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+136	4950	Rechts- und Beratungskosten	A	E	AP_amount	9	20	\N	22	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	22	f
+137	4955	Buchführungskosten	A	E	AP_amount	9	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+138	4957	Abschluß- und Prüfungskosten	A	E	AP_amount	9	20	\N	22	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	22	f
+139	4960	Mieten für Einrichtungen	A	E	AP_amount	9	20	\N	21	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	21	f
+140	4969	Aufwend.f.Abraum-u.Abfallbeseitigung	A	E	AP_amount	9	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+141	4970	Nebenkosten des Geldverkehrs	A	E		0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+142	4980	Betriebsbedarf	A	E	AP_amount	9	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+143	4985	Werkzeuge und Kleingeräte	A	E	AP_amount	9	\N	\N	19	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	19	f
+149	8200	Erlöse	A	I	AR_amount:IC_sale:IC_income	0	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+219	3582	Wareneinkauf ohne Vorsteuerabzug(EÜR)	A	E		0	4	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+94	4610	Werbekosten	A	E	AP_amount	9	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+192	4510	Kfz-Steuer	A	E	AP_amount	0	19	\N	15	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	15	f
+193	4520	Kfz-Versicherungen	A	E	AP_amount	0	14	\N	16	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	16	f
+196	1767	Im anderen EG-Staat steuerpfl. Lieferung	A	 		10	0	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+197	0853	Satzungsm.Rücklagen 0% Vorbelast.(st.Einlagekto.)	A	Q		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+198	1607	Vblk.a.LuL ohne Vorsteuer (EÜR)	A	L	AP	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+199	1609	Gegenkonto 1605-1607 b.Aufteilung d.Vblk.n.Steuers.(EÜR)	A	L		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+200	2125	Zinsaufwend.f.Gebäude,die z.Betriebsvermögen gehören	A	E		0	\N	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+152	8320	Erlöse aus im and.EG-Land steuerpfl.Lieferungen	A	I	AR_amount:IC_sale:IC_income	10	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+153	8500	Provisionserlöse	A	I	AR_amount:IC_income	3	5	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+156	8520	Erlöse Abfallverwertung	A	I	AR_amount:IC_sale	3	\N	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+157	8540	Erlös Leergut	A	I	AR_amount:IC_sale	3	5	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+168	8829	Erl.a.Anlagenverk.bei Buchgewinn	A	I	AR_amount	3	\N	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+169	8900	Unentgeltliche Wertabgaben	A	I	AR_amount	0	\N	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+170	8905	Entnahme v. Gegenst.o.USt.	A	I		0	5	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+173	8919	Entnahme durch den Untern.f.Zwecke außerhalb d.Untern.(Waren)o.USt	A	I		0	5	\N	3	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+174	8924	Verwendung v.Gegenständen f.Zwecke außerhalb d.Untern.o.USt.	A	I		0	\N	\N	3	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+179	8955	Umsatzsteuervergütungen	A	I		0	\N	\N	7	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	7	f
+180	9000	Saldenvorträge,Sachkonten	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+181	9008	Saldenvorträge,Debitoren	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+182	9009	Saldenvorträge,Kreditoren	A	L		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+183	9090	Summenvortragskonto	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+185	8800	Erlöse aus Anlagenverkäufen	A	I	AR_amount	3	\N	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+186	4380	Beiträge	A	E	AP_amount	0	\N	\N	14	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	14	f
+187	4360	Versicherungen	A	E	AP_amount	0	13	\N	14	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	14	f
+188	4390	Sonstige Abgaben	A	E	AP_amount	0	\N	\N	14	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	14	f
+189	0631	Vblk.geg.Kreditinst.- Restlaufzeit b.1 Jahr	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+190	0640	Vblk.geg.Kreditinst.- Restlaufzeit 1 bis 5 Jahre	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+191	0650	Vblk.geg.Kreditinst.- Restlaufzeit grösser als 5 Jahre	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+201	1445	Ford.a.LuL z.allg.USt-Satz o.eines Kleinuntern.(EÜR)	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+202	1446	Ford.aLuL z.erm.USt.-Satz (EÜR)	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+203	1447	Ford.a.steuerfr.od.nicht steuerb.LuL (EÜR)	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+204	1448	Ford.a.LuL n.Durchschnittss.gem.§24UStG(EÜR)	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+205	1449	Gegenkto. 1445-1448 bei Aufteil.d.Ford.n.Steuers.(EÜR)	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+206	1605	Vblk.a.LuL z.allg.Umsatzsteuersatz (EÜR)	A	L	AP	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+207	1606	Vblk.a.LuL zum erm.Umsatzsteuersatz (EÜR)	A	L	AP	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+208	2212	Kapitalertragssteuer 20%	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+209	2342	Einst.in SoPo m.Rücklageanteil (Existenzgründungsrücklage)	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+210	2351	Gründstücksaufwend.f.Gebäude,die nicht z.Betriebsverm.gehören	A	E		0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+211	2376	Grundsteuer f.Gebäude,die nicht z.Betriebsvermögen geh.	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+212	2733	Erträge a.d.Auflösung v.SoPo m.Rücklageant.(Exitenzgründungszusch.)	A	I		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+213	2746	Steuerfr.Erträge a.d.Auflös.v.SoPo m.Rücklageanteil	A	I		0	\N	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+214	2747	Sonst.steuerfreie Betriebseinnahmen	A	I		0	\N	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+215	2797	Entnahmen a.satzungsmäßigen Rücklagen	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+216	3559	Steuerfreie Einfuhren	A	E	AP_amount:IC_cogs	0	\N	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+217	3580	Wareneinkauf z.allg.Umsatzsteuersatz (EÜR)	A	E		0	4	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+218	3581	Wareneinkauf z.erm.Umsatzsteuersatz(EÜR)	A	E		0	4	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+155	8508	Provisionserlöse 16%/19% USt.	A	I	AR_amount:IC_income	3	\N	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+236	4678	Kilometergelderstatt.(Wohn.-Arbeitsst.abziehb.Teil)	A	E		0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+237	4679	Fahrten zw.Wohn.und Arbeitsstätte (nicht abziehb.Teil)	A	E		0	\N	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+238	4680	Fahrten zw.Wohn.-und Arbeitsstätte (Haben)	A	E		0	\N	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+240	4830	Abschreibungen auf Sachanlagen (o.Kfz u.Geb.)	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+241	4832	Abschreibungen auf Kfz	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+242	4841	Absetzung f.außergew.techn.u.wirtschaftl.AfA bei Gebäuden	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+220	3589	Gegenkto.3580-3582 b.Aufteilung d.WE n.Steuersätzen(EüR)	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+221	4261	Instandhlt.betriebl.Räume in Geb.die nicht z.BV gehören	A	E		0	\N	\N	11	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	11	f
+222	4271	Abgaben f.betriebl.genutzten Grundbesitz,d.nicht z.BV gehört	A	E		0	\N	\N	11	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	11	f
+223	4288	Aufwend.f.ein häusliches Arbeitszimmer(abziehb.Anteil)	A	E		0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+224	4289	Aufwend.f.ein häusliches Arbeitszimmer(nicht abziehb.Anteil)	A	E		0	11	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+225	4361	Versicherungen f.Gebäude,die zum BV gehören	A	E		0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+226	4505	Fahrzeugkosten f.Kfz,die nicht zum BV gehören	A	E		0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+227	4515	Kfz-Steuer f.Kfz,die nicht zum BV gehören	A	E		0	\N	\N	15	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	15	f
+228	4525	Kfz-Versicherung f.Kfz,die nicht zum BV gehören	A	E		0	\N	\N	16	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	16	f
+229	4535	Lfd.Kfz-Betriebskosten f.Kfz,die nicht zum BV gehören	A	E		0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+230	4545	Kfz-Rep.für Kfz,die nicht zum BV gehören	A	E		0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+231	4555	Garagenmiete f.Kfz,die nicht zum BV gehören	A	E		0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+232	4560	Mautgebühren	A	E		0	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+233	4565	Mautgebühren f. Kfz,die nicht zum BV gehören	A	E		0	\N	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+234	4651	Sonst.eingeschr.abziehb.Betriebsausgaben (abziehb.Anteil)	A	E		0	20	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+235	4652	Sonst.eingeschr.abziehb.Betriebsausgaben(nicht abziehb.Teil)	A	E		0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+247	4965	Mietleasing	A	E		9	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+243	4842	Absetzung f.außergew.techn.u.wirtschaftl.AfA des Kfz	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+244	4843	Absetzung f.außergew.techn.u.wirtschaftl.AfA sonst.WG	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+245	4851	Sonderabschreibung nach §7g(1)u.(2)EStG (ohne Kfz)	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+246	4852	Sonderabschreibung n.§7g(1)u.(2)EStG (für Kfz)	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+248	4966	Gewerbest.zu berücksicht.Mietleasing §8 GewStG	A	E		0	\N	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+249	8580	Erlöse zum allg.Umsatzsteuersatz (EÜR)	A	I		0	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+250	8581	Erlöse zum ermä.Umsatzsteuersatz (EÜR)	A	I		0	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+251	8582	Erlöse steuerfrei u.nicht steuerbar (EÜR)	A	I		0	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+252	8589	Gegenkonto 8580-8582 b.Aufteilung d.Erlöse n.Steuersätzen(EÜR)	A	C		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+257	1000	Kasse	A	A	AR_paid:AP_paid	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+264	2501	Ausserordentliche Erträge finanzwirksam	A	I		0	\N	\N	5	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	5	f
+265	2505	Ausserordentliche Erträge nicht finanzwirksam	A	I		0	\N	\N	5	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	5	f
+266	4130	Gesetzlich soziale Aufwendungen	A	E		0	10	\N	10	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	10	f
+267	4630	Geschenke bis 35 EUR abzugsfähig	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+268	4635	Geschenke über 35EUR nicht abzugsf.	A	E	AP_amount	0	15	\N	18	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	18	f
+269	4655	Nicht abzugsf.Betriebsausg.a.Werbe-Repräsentatisonk.etc.	A	E	AP_amount	9	15	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+270	4805	Rep.u.Instandhalt.v.and.Anlagen u.Betriebs-u.Geschäftsausst.	A	E	AP_amount	9	18	\N	19	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	19	f
+272	8195	Erlöse als Kleinunternehmer i.S.d.§19(1)UStG	A	I	AR_amount	0	1	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+277	8960	Bestandsveränderung unf.Erz.	A	E		0	2	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+278	8970	Bestandsveränd.unf.Leist.	A	E		0	2	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+279	8980	Bestandsveränd.fert..Leist.	A	E		0	2	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+280	8990	And.aktiv.Eigenleistungen	A	E		0	3	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+281	3090	Energiestoffe (Fert.).	A	E	IC	9	4	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+282	4595	Fremdfahrzeuge	A	E	AP_amount	0	14	\N	17	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	17	f
+283	1450	Ford.a.LuL n.Durchschnittss.gem.§24UStG(EÜR)	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+304	8949	Unentgeltl.Zuwendung v.Waren o.USt.	A	I		0	5	\N	3	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+305	4126	Tantiemen	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+306	4127	Geschäftsführergehälter	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+307	4167	Pauschale Lohnsteuer auf sonst.Bezüge(z.B.Direktversicherung	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+308	4170	Vermögenswirksame Leistungen	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+286	1580	Gegenkonto Vorsteuer §4/3 EStG	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+287	1581	Auflösung Vorst.a.Vorjahr §4/3 EStG	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+288	1582	Vorst.aus Investitionen §4/3 EStG	A	E		0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+289	1584	abziehb.VorSt IG Erwerb Neufzg.b.Lief. o. USt.Ident.Nr	A	E	AR_tax	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+291	1592	Fremdgeld	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+292	3100	Fremdleistungen	A	E	AP_amount	9	5	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+295	3600	Nicht abziehbare Vorsteuer	A	E		0	5	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+296	3610	Nicht abziehb.Vorsteuer 7%	A	E		0	5	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+298	2739	Erträge Aufl. Sopo m.R.(Ansparafa)	A	I		0	5	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+299	8590	Verrechnete sons. Sachbezüge keine Waren	A	I	AR_amount	0	5	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+301	8939	Unentgeltl.Zuw.v.Gegens.ohne Ust	A	I		0	5	\N	3	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+309	4180	Bedienungsgelder	A	E		0	10	\N	9	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	9	f
+310	4826	Außerplan.AfA a.immat.Vermögensgeg.	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+311	4850	Abschr.a.Sachanl.aufgr.steuerl.Sondervorschriften	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+312	4870	Abschreibungen auf Finanzanlagen	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+313	4875	Abschr.a.Wertp.d.Umlaufvermögens	A	E		0	17	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+314	4880	Abschreibungen auf Umlaufverm. o.Wertpapiere (soweit unübl.Höhe	A	E		0	17	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+315	2208	Solidaritätszuschlag	A	E		0	35	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+316	2209	Solidaritätszuschlag für Vorjahr	A	E		0	19	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+317	2375	Grundsteuer	A	E		0	19	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+318	2400	Forderungsverlust-übliche Höhe	A	E		0	20	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+321	2341	Einstellungen in SoPo m.Rücklageanteil (Ansparabschreibung	A	E		0	20	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+322	2100	Zinsen und ähnl.Aufwendungen	A	E		0	30	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+323	2107	Zinsaufwendung-betriebliche Steuern §223aAO	A	E		0	30	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+324	2140	Zinsähnliche Aufwendungen	A	E		0	30	\N	29	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	29	f
+325	2000	Außerordentliche Aufwendung	A	E		0	31	\N	30	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	30	f
+326	2010	Betriebsfremde Aufwendungen soweit n.außerord.	A	E		0	31	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+327	2020	Periodenfremde Aufwend.(soweit n.außerordentlich	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+329	2170	Nicht abziehbare Vorsteuer	A	E		0	31	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+330	2171	Nicht abziehbare Vorsteuer 7%	A	E		0	31	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+332	2280	Stnachzahl.Vorj.v.Einkomm u.Ertrag	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+333	2285	Steuernachzahlung Vorj.f.sons.Steue	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+334	2289	Erträge a.d.Aufl.v. Rück.f.sons.Ste	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+335	2350	Grundstücksaufwendungen	A	E		9	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+336	2380	Zuwend.,Spenden,steuerlich n.abziehbar	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+337	2450	Einstell.i.d.Pauschalwertbe.z.Forde	A	E		0	31	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+338	2657	Zinserträge-betriebliche Steuern	A	I		0	32	\N	4	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	4	f
+339	2670	Diskonterträge	A	I		0	32	\N	4	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	4	f
+340	2680	Zinsähnliche Erträge	A	I		0	32	\N	4	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	4	f
+347	8727	Erlösschmä.and.EG Land stpfl.Liefer	A	I		0	32	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+348	2500	Außerordentliche Erträge	A	I		0	33	\N	5	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	5	f
+349	2510	Betriebsfremde Erträge nichtaußerorden	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+350	2520	Periodenfremde Erträge nicht außero	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+351	2600	Erträge aus Beteiligungen	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+354	2710	Ertrag a.d.Zuschreib.d.Anlagevermög	A	I		0	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+355	2715	Ertr.a.Zuschreib.d.Umlaufvermögens	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+356	2725	Ertr.a.d.Abg.v.Gegenst.d.Umlaufverm	A	I		0	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+357	2730	Ertr.a.Herabsetzung d.PWB zu Forderungen	A	I		0	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+358	2732	Ertr. aus abgeschriebenen Forderung	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+297	3650	Nicht abziehb.Vorsteuer 16%/19%	A	E		0	5	\N	8	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+331	2175	Nicht abziehbare Vorsteuer 16%/19%	A	E		0	31	\N	24	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	24	f
+274	8808	Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1bUStG(b.Buchverlust)	A	E		0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+147	8135	Steuerfr.innergem.Lief.v.Neufahrz.an Abn.o.USt-Ident-Nr.	A	I	AR_amount:IC_sale	0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+144	8120	Steuerfreie Umsätze §4Nr.1a UstG	A	I	AR_amount:IC_sale:IC_income	0	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+148	8150	Sonstige steuerfreie Umsätze §42-7UStG	A	I	AR_amount:IC_sale:IC_income	0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+253	8827	Erlöse a.Verk.Sachanlagen steuerfr.§4Nr.1aUStG(bei Buchgewinn)	A	I		0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+359	2735	Ertr.a.d.Auflösung v.Rückstellungen	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+360	2743	Investitionszuschüsse-steuerpflicht	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+361	2744	Investitionszulage-steuerfrei	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+362	2750	Grundstückserträge	A	I		3	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+363	2284	Ertr.a.d.Aufl.v.Rücks.f.St.v.Ein.Er	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+364	2287	Steuererstattung Vorj.f.sons.Steuer	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+365	2282	Sterstat.Vorj.Steuer v.Eink.u.Ertrag	A	I		0	33	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+367	4990	Kalkulatorischer Unternehmerlohn	A	E		0	34	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+368	4992	Kalkulatorische Zinsen	A	E		0	34	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+369	4993	Kalkulatorische Aschreibungen	A	E		0	34	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+370	4994	Kalkulatorische Wagnisse	A	E		0	34	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+371	4995	Kalkulatorischer Lohn f.unentgeltl.Mitarbeiter	A	E		0	34	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+372	2200	Körperschaftssteuer	A	E		0	35	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+373	2214	Anrechenb.Soli auf Kapitalertragssteuer 20%	A	E		0	35	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+374	2215	Zinsabschlagsteuer	A	E		0	35	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+375	2218	Anrechb.Solidari.zuschlag a.Zinsabschlagst.	A	E		0	35	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+775	1776	Umsatzsteuer 19 %	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	6	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	6	f
+145	8125	Steuerfrei innergem. Lieferungen §41bUStG	A	I	AR_amount:IC_sale:IC_income	0	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+146	8130	Liefe.d.1.Abnehm.bei innergem.Dreiecksg §25b2UStG	A	I	AR_amount:IC_sale:IC_income	0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+254	8828	Erlöse a.Verk.Sachanlagen steuerfr.§4Nr.1bUStG(b.Buchgewinn)	A	I		0	\N	\N	2	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+86	8100	Steuerfreie Umsätze §4Nr.8ff UstG	A	I	AR_amount	0	1	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+273	8807	Erlöse a.Verk.Sachanlagen steuerfrei§4Nr.1aUStG(b.Buchverlust)	A	E		0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+87	8110	Sonstige steuerfreie Umsätze Inland	A	I	AR_amount	0	\N	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+160	8600	Sonstige Erlöse betriebl.u.regelmäß	A	I	AR_amount	3	5	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+353	2700	Sonstige Erträge	A	I		3	33	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+195	1775	Umsatzsteuer 16%	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	6	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	6	f
+150	8310	Erlöse Inland stpfl. EG-Lieferung7%	A	I	AR_amount:IC_sale:IC_income	12	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+154	8506	Provisionserlöse 7% USt.	A	I	AR_amount:IC_income	2	\N	\N	2	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+158	8591	Sachbezüge 7% Ust (Waren)	A	I	AR_amount	2	5	\N	2	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+163	8750	Gewährte Boni 7% USt.	A	E	AR_paid	2	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+165	8780	Gewährte Rabatte 7% USt.	A	E	AR_paid	2	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+172	8915	Entnah.d.Untern.f.Zwecke ausserh.d.Untern.7%USt	A	I	AR_amount	2	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+176	8930	Verwendung v.Gegenst.f.Zwecke außerhalb d.Unternehmens 7% USt.	A	I	AR_amount	2	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+303	8945	Unentgeltl.Zuw.von Waren 7% Ust	A	I		2	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+319	2401	Forderungsverluste 7% USt.(übliche Höhe	A	E		2	20	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+151	8315	Erlös Inland stpfl.EG-Lieferung 16%/19%	A	I	AR_amount:IC_sale:IC_income	13	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+159	8595	Sachbezüge 16%/19% Ust (Waren)	A	I	AR_amount	3	5	\N	2	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+284	1577	Abzieb.Vorst.n.allg.Durchschnittss.UStVA Kz.63	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+259	1571	Abziehbare Vorsteuer 7%	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+261	1575	Abziehbare Vorsteuer 16%	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+776	1576	Abziehbare Vorsteuer 19 %	A	E	AP_tax:IC_taxpart:IC_taxservice	9	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+40	3440	Innergem.Erwerb v.Neufahrz.v.Lief.o.USt.Identnr.16%/19%VSt.u.16%/19%USt.	A	E	AP_amount:IC_cogs	19	\N	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+45	3760	Erhaltene Boni 16%/19% Vorsteuer	A	I	AP_paid	9	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+88	8300	Erlöse 7 % / 5 % USt	A	I	AR_amount:IC_sale:IC_income	2	1	\N	1	t	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	\N	\N	1	f
+343	8710	Erlösschmälerung 7% USt.	A	I		2	32	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+7	0410	Geschäftsausstattung	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+8	0420	Büroeinrichtung	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+9	0430	Ladeneinrichtung	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+10	0440	Werkzeuge	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+11	0480	Geringwertige Wirtschaftsg.b.410EUR	A	A	AP_amount	9	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+12	1200	Bank	A	A	AR_paid:AP_paid	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+13	1360	Geldtransit	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+14	1400	Ford. a.Lieferungen und Leistungen	A	A	AR	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+15	1590	Durchlaufende Posten	A	A		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+16	1600	Verbindlichkeiten aus Lief.u.Leist.	A	L	AP	0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+345	8725	Erlösschmä.Inl.stpfl.EG-Lief. 7%USt	A	I		12	32	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+271	8190	Erlöse,die mit den Durchschnittssätzen d.§24UStG vers.werd.	A	I	AR_amount	0	\N	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+178	8950	Nicht steuerbare Umsätze	A	I		0	5	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+293	3110	Leist.v.ausländ.Untern. 7% VSt.u.7%USt.	A	E	AP_amount	8	5	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+366	1785	Umsatzsteuer n.§13b UStG	A	I		0	33	\N	7	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	7	f
+290	1588	Bezahlte Einfuhrumsatzsteuer	A	E		0	\N	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+285	1578	Abzieb.Vorst.n.§13b	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+47	3790	Erhaltene Rabatte 16%/19% Vorsteuer	A	I	AP_paid	9	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+77	4305	Nicht abziehbare Vorsteuer 16%/19%	A	E	AP_paid	0	20	\N	\N	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+164	8760	Gewährte Boni 16%/19% USt.	A	E	AR_paid	3	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+166	8790	Gewährte Rabatte 16%/19% Ust.	A	E	AR_paid	3	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+167	8820	Erlöse aus Anlageverkäufen Sachanl.verm.b.Buchgewinn16%/19%Ust	A	I	AR_amount	3	5	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+171	8910	Entnahme des Untern.f.Zwecke ausserh.d.Untern 16%/19%(Waren)	A	I	AR_amount	3	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+175	8925	Unentgeltl.Erbring.sons.Leis.16%/19%USt	A	I	AR_amount	3	\N	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+177	8935	Unentgeltl.Zuwend.v.Gegens. 16%/19% Ust	A	I	AR_amount	3	\N	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+255	8921	Verwend.v.Gegenst.f.Zwecke außerh.d.Untern.16%/19%USt(Kfz-Nutzung)	A	I		0	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+256	8922	Verwend.f.Gegenst.f.Zwecke außerh.d.Untern.16%/19%USt(Telefonnutzung)	A	I		0	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+275	8809	Erlöse aus Verk.Sachanlagevermögen16%/19% USt (bei Buchverlust)	A	E		0	\N	\N	2	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	2	f
+276	8801	Erlöse aus Anlagenverkäufen Sachanl.verm.b.Buchverl.16%/19%USt.	A	E		3	5	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+300	8920	Verw.v.Gegens.f.Zwecke ausserh.d.Untern.16%/19%USt.	A	I		3	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+302	8940	Unentgeltl.Zuw.v Waren 16%/19% Ust	A	I		3	5	\N	3	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	3	f
+320	2405	Forderungsverluste 16%/19% USt.(übliche Höhe	A	E		3	20	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+184	8400	Erlöse 19 % / 16 % USt	A	I	AR_amount:IC_sale:IC_income	3	1	\N	1	t	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	\N	\N	1	f
+17	1780	Umsatzsteuer-Vorauszahlungen	A	E		0	\N	\N	28	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	28	f
+18	1790	Umsatzsteuer Vorjahr	A	E		0	\N	\N	28	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	28	f
+239	4831	Abschreibung auf Gebäude	A	E		0	17	\N	25	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	25	f
+341	8650	Erlöse Zinsen und Diskotspesen	A	I		0	32	\N	4	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	4	f
+342	8700	Erlösschmälerungen	A	I		0	32	\N	1	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+344	8720	Erlösschmälerung 16%/19% USt.	A	I		3	32	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+346	8726	Erlösschmä.Inl.stpfl.EG-Lief.16%/19%USt	A	I		13	32	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+294	3120	Leist.v.ausländ.Untern. 16%/19% VSt.u.16%/19%USt.	A	E	AP_amount	9	5	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+862	1570	Anrechenbare Vorsteuer	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	\N	f	2018-11-30 19:55:46.317645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+863	1574	Abziehbare Vorsteuer aus innergem. Erwerb 19 %	A	E	AP_tax:IC_taxpart:IC_taxservice	19	\N	\N	\N	f	2018-11-30 19:55:46.317645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+864	1774	Umsatzsteuer aus innergem. Erwerb 19 %	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	\N	f	2018-11-30 19:55:46.317645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+262	1772	Umsatzsteuer 7% innergem.Erwerb	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	6	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	6	f
+258	1572	Abziehbare Vorsteuer 7% innergem. Erwerb	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+260	1573	Abziehbare Vorsteuer 16% innergem. Erwerb	A	E	AP_tax:IC_taxpart:IC_taxservice	0	\N	\N	27	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	27	f
+39	3425	Innergem. Erwerb 16%/19% VSt u. USt.	A	E	AP_amount:IC_cogs	0	4	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+38	3420	Innergem. Erwerb 7% VSt u. USt.	A	E	AP_amount:IC_cogs	0	4	\N	8	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	8	f
+194	1771	Umsatzsteuer 7%	A	I	AR_tax:IC_taxpart:IC_taxservice	2	\N	\N	6	f	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	6	f
+161	8731	Gewährte Skonti 7% USt	A	I	AR_paid	2	1	\N	1	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	1	f
+42	3731	Erhaltene Skonti 7% Vorsteuer	A	E	AP_paid	8	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+43	3735	Erhaltene Skonti 16%/19% Vorsteuer	A	E	AP_paid	9	4	\N	\N	t	2018-11-30 19:55:43.8645	2018-11-30 19:56:03.190929	\N	\N	\N	f
+263	1773	Umsatzsteuer 5 %	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	28	f	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	\N	\N	28	f
+162	8736	Gewährte Skonti 19 % USt	A	I	AR_paid	3	1	\N	1	f	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	\N	\N	1	f
+1110	1711	Erhaltene, versteuerte Anzahlungen 7 % USt (Verbindlichkeiten)	A	L	AR_amount	0	\N	\N	\N	f	2023-12-16 23:40:35.617575	\N	\N	\N	\N	f
+1112	1718	Erhaltene, versteuerte Anzahlungen 19 % USt (Verbindlichkeiten)	A	L	AR_amount	0	\N	\N	\N	f	2023-12-16 23:40:35.628546	\N	\N	\N	\N	f
+1108	1593	Verrechnungskonto erhalt. Anzahl. bei Buchung über Debitorenkonto	A	L	AR	0	\N	\N	\N	f	2023-12-16 23:40:35.603336	2023-12-16 23:40:35.67778	\N	\N	\N	f
+1114	1787	Umsatzsteuer nach §13b UStG 19%	A	I	AR_tax:IC_taxpart:IC_taxservice	0	\N	\N	\N	f	2023-12-16 23:40:35.919304	\N	\N	\N	\N	f
+328	2150	Aufwendungen aus Kursdifferenzen	A	E	AR_paid:AP_paid	0	31	\N	24	f	2018-11-30 19:55:43.8645	2026-04-24 23:21:56.503662	\N	\N	24	f
+352	2660	Erträge aus Kursdifferenzen	A	I	AR_paid:AP_paid	0	33	\N	2	f	2018-11-30 19:55:43.8645	2026-04-24 23:21:56.503662	\N	\N	2	f
+\.
+
+
+--
+-- Data for Name: contact_departments; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.contact_departments (id, description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: contact_titles; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.contact_titles (id, description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: contacts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.contacts (cp_id, cp_cv_id, cp_title, cp_givenname, cp_name, cp_email, cp_phone1, cp_phone2, itime, mtime, cp_fax, cp_mobile1, cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, cp_abteilung, cp_gender, cp_street, cp_zipcode, cp_city, cp_birthday, cp_position, cp_main) FROM stdin;
+\.
+
+
+--
+-- Data for Name: csv_import_profile_settings; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.csv_import_profile_settings (id, csv_import_profile_id, key, value) FROM stdin;
+1	1	charset	UTF-8
+2	1	full_preview	0
+3	1	update_policy	skip
+4	1	numberformat	1000.00
+5	1	sep_char	;
+6	1	quote_char	"
+7	1	escape_char	"
+8	1	json_mappings	[]
+9	1	duplicates	no_check
+10	1	dont_edit_profile	1
+\.
+
+
+--
+-- Data for Name: csv_import_profiles; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.csv_import_profiles (id, name, type, is_default, login) FROM stdin;
+1	MT940	bank_transactions	t	default
+\.
+
+
+--
+-- Data for Name: csv_import_report_rows; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.csv_import_report_rows (id, csv_import_report_id, col, "row", value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: csv_import_report_status; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.csv_import_report_status (id, csv_import_report_id, "row", type, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: csv_import_reports; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.csv_import_reports (id, session_id, profile_id, type, file, numrows, numheaders, test_mode) FROM stdin;
+\.
+
+
+--
+-- Data for Name: currencies; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.currencies (id, name) FROM stdin;
+1	EUR
+2	USD
+\.
+
+
+--
+-- Data for Name: custom_data_export_queries; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_data_export_queries (id, name, description, sql_query, access_right, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: custom_data_export_query_parameters; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_data_export_query_parameters (id, query_id, name, description, parameter_type, itime, mtime, default_value_type, default_value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: custom_variable_config_partsgroups; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_variable_config_partsgroups (custom_variable_config_id, partsgroup_id, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: custom_variable_configs; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_variable_configs (id, name, description, type, module, default_value, options, searchable, includeable, included_by_default, sortkey, itime, mtime, flags, first_tab) FROM stdin;
+\.
+
+
+--
+-- Data for Name: custom_variables; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_variables (id, config_id, trans_id, bool_value, timestamp_value, text_value, number_value, itime, mtime, sub_module) FROM stdin;
+\.
+
+
+--
+-- Data for Name: custom_variables_validity; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.custom_variables_validity (id, config_id, trans_id, itime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: customer; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.customer (id, name, department_1, department_2, street, zipcode, city, country, contact, phone, fax, homepage, email, notes, discount, taxincluded, creditlimit, customernumber, cc, bcc, business_id, taxnumber, account_number, bank_code, bank, language, itime, mtime, obsolete, username, user_password, salesman_id, c_vendor_id, language_id, payment_id, taxzone_id, greeting, ustid, iban, bic, direct_debit, depositor, taxincluded_checked, mandator_id, mandate_date_of_signature, delivery_term_id, hourly_rate, currency_id, gln, pricegroup_id, order_lock, commercial_court, invoice_mail, contact_origin, delivery_order_mail, create_zugferd_invoices, natural_person, c_vendor_routing_id, postal_invoice, dunning_mail, dunning_lock) FROM stdin;
+\.
+
+
+--
+-- Data for Name: datev; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.datev (beraternr, beratername, mandantennr, dfvkz, datentraegernr, abrechnungsnr, itime, mtime, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: defaults; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.defaults (inventory_accno_id, income_accno_id, expense_accno_id, fxgain_accno_id, fxloss_accno_id, invnumber, sonumber, weightunit, businessnumber, version, closedto, revtrans, ponumber, sqnumber, rfqnumber, customernumber, vendornumber, articlenumber, servicenumber, coa, itime, mtime, rmanumber, cnnumber, accounting_method, inventory_system, profit_determination, dunning_ar_amount_fee, dunning_ar_amount_interest, dunning_ar, pdonumber, sdonumber, ar_paid_accno_id, id, language_id, datev_check_on_sales_invoice, datev_check_on_purchase_invoice, datev_check_on_ar_transaction, datev_check_on_ap_transaction, datev_check_on_gl_transaction, payments_changeable, is_changeable, ir_changeable, ar_changeable, ap_changeable, gl_changeable, show_bestbefore, sales_order_show_delete, purchase_order_show_delete, sales_delivery_order_show_delete, purchase_delivery_order_show_delete, is_show_mark_as_paid, ir_show_mark_as_paid, ar_show_mark_as_paid, ap_show_mark_as_paid, warehouse_id, bin_id, company, taxnumber, co_ustid, duns, sepa_creditor_id, templates, max_future_booking_interval, "precision", webdav, webdav_documents, vertreter, parts_show_image, parts_listing_image, parts_image_css, normalize_vc_names, normalize_part_descriptions, assemblynumber, show_weight, transfer_default, transfer_default_use_master_default_bin, transfer_default_ignore_onhand, warehouse_id_ignore_onhand, bin_id_ignore_onhand, balance_startdate_method, currency_id, customer_hourly_rate, signature, requirement_spec_section_order_part_id, transfer_default_services, rndgain_accno_id, rndloss_accno_id, global_bcc, customer_projects_only_in_sales, reqdate_interval, require_transaction_description_ps, sales_purchase_order_ship_missing_column, allow_sales_invoice_from_sales_quotation, allow_sales_invoice_from_sales_order, allow_new_purchase_delivery_order, allow_new_purchase_invoice, disabled_price_sources, transport_cost_reminder_article_number_id, is_transfer_out, ap_chart_id, ar_chart_id, letternumber, order_always_project, project_status_id, project_type_id, feature_balance, feature_datev, feature_erfolgsrechnung, feature_eurechnung, feature_ustva, order_warn_duplicate_parts, show_longdescription_select_item, email_journal, quick_search_modules, stocktaking_warehouse_id, stocktaking_bin_id, stocktaking_cutoff_date, stocktaking_qty_threshold, bcc_to_login, create_part_if_not_found, fa_bufa_nr, fa_dauerfrist, fa_steuerberater_city, fa_steuerberater_name, fa_steuerberater_street, fa_steuerberater_tel, fa_voranmeld, doc_delete_printfiles, doc_max_filesize, doc_storage, doc_storage_for_documents, doc_storage_for_attachments, doc_storage_for_images, doc_files, doc_files_rootpath, doc_webdav, shipped_qty_require_stock_out, sepa_reference_add_vc_vc_id, assortmentnumber, doc_storage_for_shopimages, datev_export_format, order_warn_no_deliverydate, sepa_set_duedate_as_default_exec_date, sepa_set_skonto_date_as_default_exec_date, sepa_set_skonto_date_buffer_in_days, delivery_date_interval, email_attachment_vc_files_checked, email_attachment_part_files_checked, email_attachment_record_files_checked, invoice_mail_settings, dunning_creator, address_street1, address_street2, address_zipcode, address_city, address_country, workflow_po_ap_chart_id, carry_over_account_chart_id, profit_carried_forward_chart_id, loss_carried_forward_chart_id, contact_departments_use_textfield, contact_titles_use_textfield, create_zugferd_invoices, vc_greetings_use_textfield, sales_serial_eq_charge, undo_transfer_interval, create_qrbill_invoices, customer_ustid_taxnummer_unique, vendor_ustid_taxnummer_unique, sales_delivery_order_check_stocked, purchase_delivery_order_check_stocked, ir_add_doc, ar_add_doc, ap_add_doc, gl_add_doc, reqdate_on, deliverydate_on, sales_delivery_order_check_service, purchase_delivery_order_check_service, produce_assembly_same_warehouse, produce_assembly_transfer_service, warn_no_delivery_order_for_invoice, order_warn_no_cusordnumber, partsgroup_required, print_interpolate_variables_in_positions, sales_purchase_record_numbers_changeable, always_record_links_from_order, sudonumber, rdonumber, advance_payment_clearing_chart_id, advance_payment_taxable_19_id, advance_payment_taxable_7_id, p_reclamation_record_number, s_reclamation_record_number, sales_reclamation_show_delete, purchase_reclamation_show_delete, reclamation_warn_no_reqdate, reclamation_warn_duplicate_parts, soinumber, pqinumber, lock_oe_subversions, qrbill_copy_invnumber, email_sender_sales_quotation, email_sender_request_quotation, email_sender_sales_order, email_sender_purchase_order, email_sender_invoice, email_sender_purchase_invoice, email_sender_letter, email_sender_purchase_delivery_order, email_sender_sales_delivery_order, email_sender_dunning, dunning_original_invoice_creation_mode, record_links_from_order_with_myself, record_links_from_order_with_quotations, layout_style, allowed_documents_with_no_positions, fuzzy_skonto, fuzzy_skonto_percentage, transit_items_chart_id, webdav_sync_extern, webdav_sync_extern_url, webdav_sync_extern_login, webdav_sync_extern_pass, yearend_method, pocnumber, sepa_export_xml, no_bank_proposals, check_bt_duplicates_endtoend, show_invoice_for_advance_payment, show_sales_order_intake, show_purchase_quotation_intake, show_purchase_order_confirmation, show_sales_reclamation, show_purchase_reclamation, email_subject_transaction_description, order_item_input_position) FROM stdin;
+\N	\N	\N	\N	\N	\N	\N	\N	\N	2.4.0.0	\N	f	\N	\N	\N	\N	\N	\N	\N	Germany-DATEV-SKR03EU	2018-11-30 19:55:38.426226	\N	\N	\N	accrual	perpetual	balance	\N	\N	\N	0	0	\N	1	\N	t	t	t	t	t	0	2	2	2	2	2	f	t	t	t	t	t	t	t	t	\N	\N	\N	\N	\N	\N	\N	\N	360	0.01000	f	f	f	t	f	border:0;float:left;max-width:250px;margin-top:20px:margin-right:10px;margin-left:10px;	t	t	\N	f	t	f	f	\N	\N	closedto	1	100.00	\N	\N	t	\N	\N		f	0	f	f	t	t	t	t	\N	\N	f	16	14	\N	f	\N	\N	t	t	f	t	t	t	f	2	{contact,gl_transaction}	\N	\N	\N	0.00000	f	t	\N	\N	\N	\N	\N	\N	\N	f	10000000	f	Filesystem	Filesystem	Filesystem	f	./documents	f	f	f	\N	Filesystem	cp1252-translit	t	f	f	0	0	t	t	t	cp	current_employee						\N	\N	\N	\N	t	t	1	t	f	7	0	f	f	f	f	f	f	f	f	t	t	t	t	t	f	f	f	f	t	f	f	0	0	1108	1112	1110	0	0	t	t	t	t	\N	\N	f	f											create_new	f	f	\N	\N	t	0.5	15	f	\N	\N	\N	default	\N	t	f	f	t	t	t	t	t	t	f	0
+\.
+
+
+--
+-- Data for Name: delivery_order_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.delivery_order_items (id, delivery_order_id, parts_id, description, qty, sellprice, discount, project_id, reqdate, serialnumber, ordnumber, transdate, cusordnumber, unit, base_qty, longdescription, lastcost, price_factor_id, price_factor, marge_price_factor, itime, mtime, pricegroup_id, "position", active_price_source, active_discount_source, orderer_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: delivery_order_items_stock; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.delivery_order_items_stock (id, delivery_order_item_id, qty, unit, warehouse_id, bin_id, chargenumber, itime, mtime, bestbefore) FROM stdin;
+\.
+
+
+--
+-- Data for Name: delivery_orders; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.delivery_orders (id, donumber, ordnumber, transdate, vendor_id, customer_id, reqdate, shippingpoint, notes, intnotes, employee_id, closed, delivered, cusordnumber, oreqnumber, department_id, shipvia, cp_id, language_id, shipto_id, globalproject_id, salesman_id, transaction_description, itime, mtime, taxzone_id, taxincluded, delivery_term_id, currency_id, payment_id, tax_point, billing_address_id, record_type, vendor_confirmation_number) FROM stdin;
+\.
+
+
+--
+-- Data for Name: delivery_terms; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.delivery_terms (id, description, description_long, sortkey, itime, mtime, obsolete) FROM stdin;
+\.
+
+
+--
+-- Data for Name: department; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.department (id, description, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: drafts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.drafts (id, module, submodule, description, itime, form, employee_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: dunning; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.dunning (id, trans_id, dunning_id, dunning_level, transdate, duedate, fee, interest, dunning_config_id, itime, mtime, fee_interest_ar_id, original_invoice_printed) FROM stdin;
+\.
+
+
+--
+-- Data for Name: dunning_config; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.dunning_config (id, dunning_level, dunning_description, active, auto, email, terms, payment_terms, fee, interest_rate, email_body, email_subject, email_attachment, template, create_invoices_for_fees, print_original_invoice) FROM stdin;
+\.
+
+
+--
+-- Data for Name: email_imports; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.email_imports (id, host_name, user_name, folder, itime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: email_journal; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.email_journal (id, sender_id, "from", recipients, sent_on, subject, body, headers, extended_status, itime, mtime, email_import_id, folder, uid, obsolete, folder_uidvalidity, status, record_type) FROM stdin;
+\.
+
+
+--
+-- Data for Name: email_journal_attachments; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.email_journal_attachments (id, "position", email_journal_id, name, mime_type, content, itime, mtime, file_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: employee; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.employee (id, login, startdate, enddate, sales, itime, mtime, name, deleted, deleted_email, deleted_signature, deleted_tel, deleted_fax) FROM stdin;
+1107	michael	2021-01-16	\N	t	2021-01-16 23:40:38.27028	\N	michael	f	\N	\N	\N	\N
+\.
+
+
+--
+-- Data for Name: employee_project_invoices; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.employee_project_invoices (employee_id, project_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: exchangerate; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.exchangerate (transdate, buy, sell, itime, mtime, id, currency_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: file_full_texts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.file_full_texts (id, file_id, full_text, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: file_versions; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.file_versions (guid, file_id, version, file_location, doc_path, backend, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: files; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.files (id, object_id, file_name, file_type, mime_type, source, backend_data, title, description, itime, mtime, print_variant, object_type, backend, uid) FROM stdin;
+\.
+
+
+--
+-- Data for Name: finanzamt; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.finanzamt (fa_land_nr, fa_bufa_nr, fa_name, fa_strasse, fa_plz, fa_ort, fa_telefon, fa_fax, fa_plz_grosskunden, fa_plz_postfach, fa_postfach, fa_blz_1, fa_kontonummer_1, fa_bankbezeichnung_1, fa_blz_2, fa_kontonummer_2, fa_bankbezeichnung_2, fa_oeffnungszeiten, fa_email, fa_internet, id) FROM stdin;
+10	1010	Saarlouis 	Gaswerkweg 25	66740	Saarlouis	06831/4490	06831/449397		66714	1440	59000000	59301502	BBK SAARBRUECKEN	59010066	7761668	POSTBANK SAARBRUECKEN	Mo,Di,Do 7.30-15.30, Mi 7.30-18,Fr 7.30-12			1
+10	1020	Merzig 	Am Gaswerk	66663	Merzig	06861/7030	06861/703133		66653	100232	59000000	59301502	BBK SAARBRUECKEN	59010066	7761668	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 7.30-12.00			2
+10	1030	Neunkirchen 	Uhlandstr.	66538	Neunkirchen	06821/1090	06821/109275		66512	1234	59000000	59001508	BBK SAARBRUECKEN	59010066	2988669	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 07.30-12.00			3
+10	1040	Saarbrücken Am Stadtgr 	Am Stadtgraben 2-4	66111	Saarbrücken	0681/30000	0681/3000329		66009	100952	59000000	59001502	BBK SAARBRUECKEN	59010066	7766663	POSTBANK SAARBRUECKEN	Mo,Di,Do 7.30-15.30, Mi 7.30-18,Fr 7.30-12			4
+10	1055	Saarbrücken MainzerStr 	Mainzer Str.109-111	66121	Saarbrücken	0681/30000	0681/3000762		66009	100944	59000000	59001502	BBK SAARBRUECKEN	59010066	7766663	POSTBANK SAARBRUECKEN	Mo,Mi,Fr 8.30-12.00, zus. Mi 13.30 - 15.30			5
+10	1060	St. Wendel 	Marienstr. 27	66606	St. Wendel	06851/8040	06851/804189		66592	1240	59000000	59001508	BBK SAARBRUECKEN	59010066	2988669	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 07.30-12.00			6
+10	1070	Sulzbach 	Vopeliusstr. 8	66280	Sulzbach	06897/9082-0	06897/9082110		66272	1164	59000000	59001502	BBK SAARBRUECKEN	59010066	7766663	POSTBANK SAARBRUECKEN	Mo,Mi,Fr 08.30-12.00, zus. Mi 13.30-18.00			7
+10	1075	Homburg 	Schillerstr. 15	66424	Homburg	06841/6970	06841/697199		66406	1551	59000000	59001508	BBK SAARBRUECKEN	59010066	2988669	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 07.30-12.00			8
+10	1085	St. Ingbert 	Rentamtstr. 39	66386	St. Ingbert	06894/984-01	06894/984159		66364	1420	59000000	59001508	BBK SAARBRUECKEN	59010066	2988669	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 7.30-12.00			9
+10	1090	Völklingen 	Marktstr.	66333	Völklingen	06898/20301	06898/203133		66304	101440	59000000	59001502	BBK SAARBRUECKEN	59010066	7766663	POSTBANK SAARBRUECKEN	Mo-Do 7.30-15.30,Mi bis 18.00,Fr 07.30-12.00			10
+11	1113	Berlin Charlottenburg	Bismarckstraße 48	10627	Berlin	030 9024-13-0	030 9024-13-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	facharlottenburg@berlin.de	http://www.berlin.de/ofd	11
+11	1114	Berlin Kreuzberg	Mehringdamm 22	10961	Berlin	030 9024-14-0	030 9024-14-900	10958			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fakreuzberg@berlin.de	http://www.berlin.de/oberfinanzdirektion	12
+11	1115	Berlin Neukölln																faneukoelln@berlin.de		13
+11	1116	Berlin Neukölln	Thiemannstr. 1	12059	Berlin	030 9024-16-0	030 9024-16-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	faneukoelln@berlin.de	http://www.berlin.de/oberfinanzdirektion	14
+11	1117	Berlin Reinickendorf	Eichborndamm 208	13403	Berlin	030 9024-17-0	030 9024-17-900	13400			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fareinickendorf@berlin.de	http://www.berlin.de/oberfinanzdirektion	15
+11	1118	Berlin Schöneberg	Bülowstraße 85/88	10783	Berlin	030/9024-18-0	030/9024-18-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Montag und Freitag: 8:00 - 13:00 Uhr Donnerstag: 11:00 - 18:00 Uhr	faschoeneberg@berlin.de	http://www.berlin.de/oberfinanzdirektion	16
+11	1119	Berlin Spandau	Nonnendammallee 15-21	13599	Berlin	030/9024-19-0	030/9024-19-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	faspandau@berlin.de	http://www.berlin.de/oberfinanzdirektion	17
+11	1120	Berlin Steglitz	Schloßstr. 58/59	12165	Berlin	030/9024-20-0	030/9024-20-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fasteglitz@berlin.de	http://www.berlin.de/oberfinanzdirektion	18
+11	1121	Berlin Tempelhof	Tempelhofer Damm 234/236	12099	Berlin	030 9024-21-0	030 9024-21-900	12096			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fatempelhof@berlin.de	http://www.berlin.de/oberfinanzdirektion	19
+11	1123	Berlin Wedding	Osloer Straße 37	13359	Berlin	030 9024-23-0	030 9024-23-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fawedding@berlin.de	http://www.berlin.de/oberfinanzdirektion	20
+11	1124	Berlin Wilmersdorf	Blissestr. 5	10713	Berlin	030/9024-24-0	030/9024-24-900	10702			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fawilmersdorf@berlin.de	http://www.berlin.de/oberfinanzdirektion	21
+11	1125	Berlin Zehlendorf	Martin-Buber-Str. 20/21	14163	Berlin	030 9024-25-0	030 9024-25-900	14160			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fazehlendorf@berlin.de	http://www.berlin.de/oberfinanzdirektion	22
+11	1127	Berlin für Körperschaften I	Gerichtstr. 27	13347	Berlin	030 9024-27-0	030 9024-27-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fakoerperschaften1@berlin.de	http://www.berlin.de/oberfinanzdirektion	23
+11	1128	Berlin Pankow/Weißennsee - nur KFZ-Steuer -	Berliner Straße 32	13089	Berlin	030/4704-0	030/94704-1777	13083			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	pankow.weissensee@berlin.de	http://www.berlin.de/oberfinanzdirektion	24
+11	1129	Berlin für Körperschaften III	Volkmarstr. 13	12099	Berlin	030/70102-0	030/70102-100		12068	420844	10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fakoeperschaften3@berlin.de	http://www.berlin.de/oberfinanzdirektion	25
+11	1130	Berlin für Körperschaften IV	Magdalenenstr. 25	10365	Berlin	030 9024-30-0	030 9024-30-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fakoeperschaften4@berlin.de	http://www.berlin.de/oberfinanzdirektion	26
+11	1131	Berlin Friedrichsh./Prenzb.	Pappelallee 78/79	10437	Berlin	030 9024-28-0	030 9024-28-900	10431			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fafriedrichshain.prenzlauerberg@berlin.de	http://www.berlin.de/oberfinanzdirektion	27
+11	1132	Berlin Lichtenb./Hohenschh.	Josef-Orlopp-Str. 62	10365	Berlin	030/5501-0	030/55012222	10358			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	falichtenberg.hohenschoenhausen@berlin.de	http://www.berlin.de/oberfinanzdirektion	28
+11	1133	Berlin Hellersdorf/Marzahn	Allee der Kosmonauten 29	12681	Berlin	030 9024-26-0	030 9024-26-900	12677			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fahellersdorf.marzahn@berlin.de	http://www.berlin.de/oberfinanzdirektion	29
+11	1134	Berlin Mitte/Tiergarten	Neue Jakobstr. 6-7	10179	Berlin	030 9024-22-0	030 9024-22-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	famitte.tiergarten@berlin.de	http://www.berlin.de/oberfinanzdirektion	30
+11	1135	Berlin Pankow/Weißensee	Berliner Straße 32	13089	Berlin	030/4704-0	030/47041777	13083			10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	pankow.weissensee@berlin.de	http://www.berlin.de/oberfinanzdirektion	31
+11	1136	Berlin Treptow/Köpenick	Seelenbinderstr. 99	12555	Berlin	030 9024-12-0	030 9024-12-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fatreptow.koepenick@berlin.de	http://www.berlin.de/oberfinanzdirektion	32
+11	1137	Berlin für Körperschaften II	Magdalenenstr. 25	10365	Berlin	030 9024-29-0	030 9024-29-900				10010010	691555100	POSTBANK BERLIN	10050000	6600046463	LBB GZ - BERLINER SPARKASSE	Mo und Fr 8:00 - 13:00, Do 11:00 - 18:00 Uhr und nach Vereinbarung	fakoeperschaften2@berlin.de	http://www.berlin.de/oberfinanzdirektion	33
+11	1138	Berlin für Fahndung und Strafsachen	Colditzstr. 41	12099	Berlin	030/70102-777	030/70102-700										Mo - Mi 10:00 - 14:00, Do 10:00 - 18:00, Fr 10:00 - 14:00 Uhr	fafahndung.strafsachen@berlin.de	http://www.berlin.de/oberfinanzdirektion	34
+1	2111	Bad Segeberg 	Theodor-Storm-Str. 4-10	23795	Bad Segeberg	04551 54-0	04551 54-303	23792			23000000	23001502	BBK LUEBECK	23051030	744	KR SPK SUEDHOLSTEIN BAD SEG	0830-1200 MO, DI, DO, FR, 1330-1630 DO			35
+1	2112	Eckernförde 	Bergstr. 50	24340	Eckernförde	04351 756-0	04351 83379		24331	1180	21000000	21001500	BBK KIEL	21092023	11511260	ECKERNFOERDER BANK VRB	0800-1200 MO-FR			36
+1	2113	Elmshorn 	Friedensallee 7-9	25335	Elmshorn	04121 481-0	04121 481-460	25333			22200000	22201502	BBK KIEL EH ITZEHOE				0800-1200 MO-FR			37
+1	2114	Eutin 	Robert-Schade-Str. 22	23701	Eutin	04521 704-0	04521 704-406		23691	160	23000000	23001505	BBK LUEBECK	21352240	4283	SPK OSTHOLSTEIN EUTIN	0830-1200 MO-FR, Nebenstelle Janusstr. 5 am Mo., Di, Do und Fr. 0830-1200, Do. 1330-1700			38
+1	2115	Flensburg 	Duburger Str. 58-64	24939	Flensburg	0461 813-0	0461 813-254		24905	1552	21500000	21501500	BBK FLENSBURG				0800-1200 MO-FR			39
+1	2116	Heide 	Ernst-Mohr-Str. 34	25746	Heide	0481 92-1	0481 92-690	25734			21500000	21701502	BBK FLENSBURG	22250020	60000123	SPK WESTHOLSTEIN	0800-1200 MO, DI, DO, FR, 1400-1700 DO			40
+1	2117	Husum 	Herzog-Adolf-Str. 18	25813	Husum	04841 8949-0	04841 8949-200		25802	1230	21500000	21701500	BBK FLENSBURG				0800-1200 MO-FR			41
+1	2118	Itzehoe 	Fehrsstr. 5	25524	Itzehoe	04821 66-0	04821 661-499		25503	1344	22200000	22201500	BBK KIEL EH ITZEHOE				0800-1200 MO, DI, DO, FR, 1400-1730 DO			42
+1	2119	Kiel-Nord 	Holtenauer Str. 183	24118	Kiel	0431 8819-0	0431 8819-1200	24094			21000000	21001501	BBK KIEL	21050000	52001500	HSH NORDBANK KIEL	0800-1200 MO-FR 1430-1600 DI			43
+1	2120	Kiel-Süd 	Hopfenstr. 2a	24114	Kiel	0431 602-0	0431 602-1009	24095			21000000	21001502	BBK KIEL	21050000	52001510	HSH NORDBANK KIEL	0800-1200 MO, DI, DO, FR, 1430-1730 DI			44
+1	2121	Leck 	Eesacker Str. 11 a	25917	Leck	04662 85-0	04662 85-266		25912	1240	21700000	21701501	BBK FLENSBURG EH HUSUM	21750000	80003569	NORD-OSTSEE SPK SCHLESWIG	0800-1200 MO-FR			45
+1	2122	Lübeck 	Possehlstr. 4	23560	Lübeck	0451 132-0	0451 132-501	23540			23000000	23001500	BBK LUEBECK	21050000	7052000200	HSH NORDBANK KIEL	0730-1300 MO+DI 0730-1700 Do 0730-1200 Fr			46
+1	2123	Meldorf 	Jungfernstieg 1	25704	Meldorf	04832 87-0	04832 87-2508		25697	850	21500000	21701503	BBK FLENSBURG	21851830	106747	VERB SPK MELDORF	0800-1200 MO, DI, DO, FR, 1400-1700 MO			47
+1	2124	Neumünster 	Bahnhofstr. 9	24534	Neumünster	04321 496 0	04321 496-189	24531			21000000	21001507	BBK KIEL				0800-1200 MO-MI, FR 1400-1700 DO			48
+1	2125	Oldenburg 	Lankenstr. 1	23758	Oldenburg	04361 497-0	04361 497-125		23751	1155	23000000	23001504	BBK LUEBECK	21352240	51000396	SPK OSTHOLSTEIN EUTIN	0900-1200 MO-FR 1400-1600 MI			49
+1	2126	Plön 	Fünf-Seen-Allee 1	24306	Plön	04522 506-0	04522 506-2149		24301	108	21000000	21001503	BBK KIEL	21051580	2600	SPK KREIS PLOEN	0800-1200 MO, Di, Do, Fr, 1400-1700 Di			50
+1	2127	Ratzeburg 	Bahnhofsallee 20	23909	Ratzeburg	04541 882-01	04541 882-200	23903			23000000	23001503	BBK LUEBECK	23052750	100188	KR SPK LAUENBURG RATZEBURG	0830-1230 MO, DI, DO, FR, 1430-1730 DO			51
+1	2128	Rendsburg 	Ritterstr. 10	24768	Rendsburg	04331 598-0	04331 598-2770		24752	640	21000000	21001504	BBK KIEL	21450000	1113	SPK MITTELHOLSTEIN RENDSBG	0730-1200 MO-FR			52
+1	2129	Schleswig 	Suadicanistr. 26-28	24837	Schleswig	04621 805-0	04621 805-290		24821	1180	21500000	21501501	BBK FLENSBURG	21690020	91111	VOLKSBANK RAIFFEISENBANK	0800-1200 MO, DI, DO, FR, 1430-1700 DO			53
+1	2130	Stormarn 	Berliner Ring 25	23843	Bad Oldesloe	04531 507-0	04531 507-399	23840			23000000	23001501	BBK LUEBECK	23051610	20503	SPK BAD OLDESLOE	0830-1200 MO-FR			54
+1	2131	Pinneberg 	Friedrich-Ebert-Str. 29	25421	Pinneberg	04101 5472-0	04101 5472-680		25404	1451	22200000	22201503	BBK KIEL EH ITZEHOE				0800-1200 MO-FR			55
+1	2132	Bad Segeberg / Außenst.Norderstedt	Europaallee 22	22850	Norderstedt	040 523068-0	040 523068-70				23000000	23001502	BBK LUEBECK	23051030	744	KR SPK SUEDHOLSTEIN BAD SEG	0830-1200 MO, DI, DO, FR, 1330-1630 DO			56
+2	2201	Hamburg Steuerkasse	Steinstraße 10	20095	Hamburg	040/42853-03	040/42853-2159		20041	106026	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerSteuererhebung@finanzamt.hamburg.de		57
+2	2210	Hamburg f.VerkSt.u.Grundbes-10	Gorch-Fock-Wall 11	20355	Hamburg	040/42843-60	040/42843-6199		20306	301721	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerVerkehrsteuern@finanzamt.hamburg.de		63
+2	2216	Hamburg f.VerkSt.u.Grundbes-16	Gorch-Fock-Wall 11	20355	Hamburg	040/42843-60	040/42843-6199		20306	301721	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerVerkehrsteuern@finanzamt.hamburg.de		65
+2	2217	Hamburg-Mitte-Altstadt 17 	Wendenstraße 35 b	20097	Hamburg	040/42853-06	040/42853-6671		20503	261338	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgMitteAltstadt@finanzamt.hamburg.de		66
+2	2220	Hamburg f.VerkSt.u.Grundbes-20	Gorch-Fock-Wall 11	20355	Hamburg	040/42843-60	040/42843-6599		20306	301721	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerVerkehrsteuern@finanzamt.hamburg.de		67
+2	2224	Hamburg-Mitte-Altstadt 	Wendenstr. 35 b	20097	Hamburg	040/42853-06	040/42853-6671		20503	261338	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgMitteAltstadt@finanzamt.hamburg.de		69
+2	2225	Hamburg-Neustadt-St.Pauli 	Steinstraße 10	20095	Hamburg	040/42853-02	040/42853-2106		20015	102246	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgNeustadt@finanzamt.hamburg.de		70
+2	2227	Hamburg für Großunternehmen	Amsinckstr. 40	20097	Hamburg	040/42853-05	040/42853-5559		20015	102205	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerGroßunternehmen@finanzamt.hamburg.de		72
+2	2228	Hamburg Neust.-St.Pauli-28	Steinstr. 10	20095	Hamburg	040/42853-3589	040/42853-2106		20015	102246	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgNeustadt@finanzamt.hamburg.de		73
+2	2230	Hamburg f.Verkehrst.u.Grundbes	Gorch-Fock-Wall 11	20355	Hamburg	040/42843-60	040/42843-6799		20306	301721	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerVerkehrsteuern@finanzamt.hamburg.de		74
+2	2235	Hamburg f.VerkSt.u.Grundbes-35	Gorch-Fock-Wall 11	20355	Hamburg	040/42843-60	040/42843-6199		20306	301721	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAfuerVerkehrsteuern@finanzamt.hamburg.de		75
+3	2311	Alfeld (Leine) 	Ravenstr.10	31061	Alfeld	05181/7050	05181/705240		31042	1244	25000000	25901505	BBK HANNOVER	25950130	10011102	KR SPK HILDESHEIM	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-alf.niedersachsen.de	www.ofd.niedersachsen.de	79
+3	2312	Bad Gandersheim 	Alte Gasse 24	37581	Bad Gandersheim	05382/760	(05382) 76-213 + 204		37575	1180	26000000	26001501	BBK GOETTINGEN	25050000	22801005	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-gan.niedersachsen.de	www.ofd.niedersachsen.de	80
+3	2313	Braunschweig-Altewiekring 	Altewiekring 20	38102	Braunschweig	0531/7050	0531/705309		38022	3229	27000000	27001501	BBK BRAUNSCHWEIG	25050000	2498020	NORD LB HANNOVER	Mo. - Fr. 8.00 - 12.00 Uhr, Mo. 14.00 - 17.00 Uhr	Poststelle@fa-bs-a.niedersachsen.de	www.ofd.niedersachsen.de	81
+3	2314	Braunschweig-Wilhelmstr. 	Wilhelmstr. 4	38100	Braunschweig	0531/4890	0531/489224		38022	3249	27000000	27001502	BBK BRAUNSCHWEIG	25050000	811422	NORD LB HANNOVER	Mo. - Fr. 8.00 - 12.00 Uhr, Mo. 14.00 - 17.00 Uhr	Poststelle@fa-bs-w.niedersachsen.de	www.ofd.niedersachsen.de	82
+3	2315	Buchholz in der Nordheide 	Bgm.-A.-Meyer-Str. 5	21244	Buchholz	04181/2030	(04181) 203-4444		21232	1262	20000000	20001520	BBK HAMBURG	20750000	3005063	SPK HARBURG-BUXTEHUDE	Mo. - Fr. 8.00 - 12.00 Uhr , Do. 14.00 - 17.00 Uhr	Poststelle@fa-buc.niedersachsen.de	www.ofd.niedersachsen.de	83
+3	2316	Burgdorf 	V.d.Hannov. Tor 30	31303	Burgdorf	05136/8060	05136/806144	31300			25000000	25001515	BBK HANNOVER	25050180	1040400010	SPARKASSE HANNOVER	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-bu.niedersachsen.de	www.ofd.niedersachsen.de	84
+3	2317	Celle 	Sägemühlenstr. 5	29221	Celle	(05141) 915-0	05141/915666		29201	1107	25000000	25701511	BBK HANNOVER	25750001	59	SPARKASSE CELLE	Mo. - Fr. 8.00 - 12.00 Uhr , Do. 14.00 - 17.00 Uhr	Poststelle@fa-ce.niedersachsen.de	www.ofd.niedersachsen.de	85
+3	2318	Cuxhaven 	Poststr. 81	27474	Cuxhaven	(04721) 563-0	04721/563313		27452	280	29000000	24101501	BBK BREMEN	24150001	100503	ST SPK CUXHAVEN	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-cux.niedersachsen.de	www.ofd.niedersachsen.de	86
+3	2319	Gifhorn 	Braunschw. Str. 6-8	38518	Gifhorn	05371/8000	05371/800241		38516	1249	27000000	27001503	BBK BRAUNSCHWEIG	26951311	11009958	SPK GIFHORN-WOLFSBURG	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00	Poststelle@fa-gf.niedersachsen.de	www.ofd.niedersachsen.de	87
+3	2320	Göttingen 	Godehardstr. 6	37073	Göttingen	0551/4070	0551/407449	37070			26000000	26001500	BBK GOETTINGEN	26050001	91	SPARKASSE GOETTINGEN	Servicecenter: Mo., Di., Mi. und Fr. 8.00 - 12.00 u. Do. 8.00 - 17.00 Uhr,	Poststelle@fa-goe.niedersachsen.de	www.ofd.niedersachsen.de	88
+3	2321	Goslar 	Wachtelpforte 40	38644	Goslar	05321/5590	05321/559200		38604	1440	27000000	27001505	BBK BRAUNSCHWEIG	26850001	2220	SPARKASSE GOSLAR/HARZ	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-gs.niedersachsen.de	www.ofd.niedersachsen.de	89
+3	2322	Hameln 	Süntelstraße 2	31785	Hameln	05151/2040	05151/204200		31763	101325	25000000	25401511	BBK HANNOVER	25450001	430	ST SPK HAMELN	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-hm.niedersachsen.de	www.ofd.niedersachsen.de	90
+3	2323	Hannover-Land I 	Göttinger Chaus. 83A	30459	Hannover	(0511) 419-1	0511/4192269		30423	910320	25000000	25001512	BBK HANNOVER	25050000	101342434	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-h-l1.niedersachsen.de	www.ofd.niedersachsen.de	91
+3	2324	Hannover-Mitte 	Lavesallee 10	30169	Hannover	0511/16750	0511/1675277		30001	143	25000000	25001516	BBK HANNOVER	25050000	101341816	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhrund nach Vereinbarung	Poststelle@fa-h-mi.niedersachsen.de	www.ofd.niedersachsen.de	92
+3	2325	Hannover-Nord 	Vahrenwalder Str.206	30165	Hannover	0511/67900	(0511) 6790-6090		30001	167	25000000	25001514	BBK HANNOVER	25050000	101342426	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-h-no.niedersachsen.de	www.ofd.niedersachsen.de	93
+3	2326	Hannover-Süd 	Göttinger Chaus. 83B	30459	Hannover	0511/4191	0511/4192575		30423	910355	25000000	25001517	BBK HANNOVER	25050000	101342400	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-h-su.niedersachsen.de	www.ofd.niedersachsen.de	94
+3	2327	Hannover-Land II 	Vahrenwalder Str.208	30165	Hannover	0511/67900	(0511) 6790-6633		30001	165	25000000	25001520	BBK HANNOVER	25050000	101342517	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-h-l2.niedersachsen.de	www.ofd.niedersachsen.de	95
+3	2328	Helmstedt 	Ernst-Koch-Str.3	38350	Helmstedt	05351/1220	(05351) 122-299		38333	1320	27000000	27101500	BBK BRAUNSCHWEIG	25050000	5801006	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-he.niedersachsen.de	www.ofd.niedersachsen.de	96
+3	2329	Herzberg am Harz 	Sieberstr. 1	37412	Herzberg	05521/8570	05521/857220		37401	1153	26000000	26001502	BBK GOETTINGEN	26351015	1229327	SPARKASSE IM KREIS OSTERODE	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-hz.niedersachsen.de	www.ofd.niedersachsen.de	97
+3	2330	Hildesheim 	Kaiserstrasse 47	31134	Hildesheim	05121/3020	05121/302480		31104	100455	25000000	25901500	BBK HANNOVER	25950130	5555	KR SPK HILDESHEIM	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-hi.niedersachsen.de	www.ofd.niedersachsen.de	98
+3	2331	Holzminden 	Ernst-August-Str.30	37603	Holzminden	05531/1220	05531/122100		37601	1251	25000000	25401512	BBK HANNOVER	25050000	27811140	NORD LB HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-hol.niedersachsen.de	www.ofd.niedersachsen.de	99
+3	2332	Lüchow 	Mittelstr.5	29439	Lüchow	(05841) 963-0	05841/963170		29431	1144	24000000	25801503	BBK LUENEBURG	25851335	2080000	KR SPK LUECHOW-DANNENBERG	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-luw.niedersachsen.de	www.ofd.niedersachsen.de	100
+3	2333	Lüneburg 	Am Alt. Eisenwerk 4a	21339	Lüneburg	04131/3050	04131/305915	21332			24000000	24001500	BBK LUENEBURG	24050110	18	SPK LUENEBURG	Mo. - Fr. 8.00-12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-lg.niedersachsen.de	www.ofd.niedersachsen.de	101
+3	2334	Nienburg/Weser 	Schloßplatz 10	31582	Nienburg	05021/8011	05021/801300		31580	2000	25000000	25601500	BBK HANNOVER	25650106	302224	SPARKASSE NIENBURG	Mo. - Fr. 7.30 - 12.00 Uhr und nach Vereinbarung, zusätzl. Arbeitnehmerbereich: Do. 14 -	Poststelle@fa-ni.niedersachsen.de	www.ofd.niedersachsen.de	102
+3	2335	Northeim 	Graf-Otto-Str. 31	37154	Northeim	05551/7040	05551/704221		37142	1261	26000000	26201500	BBK GOETTINGEN	26250001	208	KR SPK NORTHEIM	Mo. - Fr. 8.30 - 12.30 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-nom.niedersachsen.de	www.ofd.niedersachsen.de	103
+3	2336	Osterholz-Scharmbeck 	Pappstraße 2	27711	Osterholz-Scharmbeck	04791/3020	04791/302101		27701	1120	29000000	29001523	BBK BREMEN	29152300	202622	KR SPK OSTERHOLZ	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-ohz.niedersachsen.de	www.ofd.niedersachsen.de	104
+3	2338	Peine 	Duttenstedt.Str. 106	31224	Peine	05171/4070	05171/407199	31221			27000000	27001507	BBK BRAUNSCHWEIG	25250001	75003210	KR SPK PEINE	Mo. - Mi. Fr. 9.00 - 12.00, Do. 13.30 - 16.00 UhrDo. (Infothek) 13.30 -	Poststelle@fa-pe.niedersachsen.de	www.ofd.niedersachsen.de	105
+3	2340	Rotenburg (Wümme) 	Hoffeldstr. 5	27356	Rotenburg	04261/740	04261/74108		27342	1260	29000000	29001522	BBK BREMEN	24151235	26106377	SPK ROTENBURG-BREMERVOERDE	Mo. - Mi., Fr. 8.00 - 12.00 Uhr, Do. 8.00 - 17.30	Poststelle@fa-row.niedersachsen.de	www.ofd.niedersachsen.de	106
+3	2341	Soltau 	Rühberg 16 - 20	29614	Soltau	05191/8070	05191/807144		29602	1243	24000000	25801502	BBK LUENEBURG	25851660	100016	KR SPK SOLTAU	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-sol.niedersachsen.de	www.ofd.niedersachsen.de	107
+3	2342	Hannover-Land I Außenstelle Springe	Bahnhofstr. 28	31832	Springe	05041/7730	05041/77363		31814	100255	25000000	25001512	BBK HANNOVER	25050180	3001000037	SPARKASSE HANNOVER	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-ast-spr.niedersachsen.de	www.ofd.niedersachsen.de	108
+3	2343	Stade 	Harburger Str. 113	21680	Stade	(04141) 536-0	(04141) 536-499	21677			24000000	24001560	BBK LUENEBURG	24151005	42507	SPK STADE-ALTES LAND	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-std.niedersachsen.de	www.ofd.niedersachsen.de	109
+3	2344	Stadthagen 	Schloß	31655	Stadthagen	05721/7050	05721/705250	31653			49000000	49001502	BBK MINDEN, WESTF	25551480	470140401	SPARKASSE SCHAUMBURG	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-shg.niedersachsen.de	www.ofd.niedersachsen.de	110
+3	2345	Sulingen 	Hindenburgstr. 16	27232	Sulingen	04271/870	04271/87289		27226	1520	29000000	29001516	BBK BREMEN	25651325	30101430	KR SPK DIEPHOLZ	Mo., Mi., Do. und Fr. 8.00 - 12.00 Uhr, Di. 8.00 - 17.00 Uhr	Poststelle@fa-su.niedersachsen.de	www.ofd.niedersachsen.de	111
+3	2346	Syke 	Bürgerm.-Mävers-Str. 15	28857	Syke	04242/1620	04242/162423		28845	1164	29000000	29001515	BBK BREMEN	29151700	1110044557	KREISSPARKASSE SYKE	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-sy.niedersachsen.de	www.ofd.niedersachsen.de	112
+3	2347	Uelzen 	Am Königsberg 3	29525	Uelzen	0581/8030	0581/803404		29504	1462	24000000	25801501	BBK LUENEBURG	25850110	26	SPARKASSE UELZEN	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-ue.niedersachsen.de	www.ofd.niedersachsen.de	113
+3	2348	Verden (Aller) 	Bremer Straße 4	27283	Verden	04231/9190	04231/919310		27263	1340	29000000	29001517	BBK BREMEN	29152670	10000776	KR SPK VERDEN	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-ver.niedersachsen.de	www.ofd.niedersachsen.de	114
+3	2349	Wesermünde 	Borriesstr. 50	27570	Bremerhaven	0471/1830	0471/183119		27503	100369	29000000	29201501	BBK BREMEN	29250150	100103200	KR SPK WESERMUENDE-HADELN	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-wem.niedersachsen.de	www.ofd.niedersachsen.de	115
+3	2350	Winsen (Luhe) 	Von-Somnitz-Ring 6	21423	Winsen	04171/6560	(04171) 656-115		21413	1329	24000000	24001550	BBK LUENEBURG	20750000	7051519	SPK HARBURG-BUXTEHUDE	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 18.00 Uhr und nach Vereinbarung	Poststelle@fa-wl.niedersachsen.de	www.ofd.niedersachsen.de	116
+3	2351	Wolfenbüttel 	Jägerstr. 19	38304	Wolfenbüttel	05331/8030	(05331) 803-113/266 	38299			27000000	27001504	BBK BRAUNSCHWEIG	25050000	9801002	NORD LB HANNOVER	Mo. - Fr. 8.00 - 12.00 Uhr, Mi. 14.00 - 17.00 Uhr	Poststelle@fa-wf.niedersachsen.de	www.ofd.niedersachsen.de	117
+3	2352	Zeven 	Kastanienweg 1	27404	Zeven	04281/7530	04281/753290		27392	1259	29000000	29201503	BBK BREMEN	24151235	404350	SPK ROTENBURG-BREMERVOERDE	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-zev.niedersachsen.de	www.ofd.niedersachsen.de	118
+3	2353	Papenburg 	Große Straße 32	26871	Aschendorf	04962/5030	04962/503222		26883	2264	28000000	28501512	BBK OLDENBURG (OLDB)	26650001	1020007	SPK EMSLAND	Mo. - Fr. 9.00 - 12.00 Uhr, Mi. 14.00 - 17.00 Uhr	Poststelle@fa-pap.niedersachsen.de	www.ofd.niedersachsen.de	119
+3	2354	Aurich 	Hasseburger Str. 3	26603	Aurich	04941/1750	04941/175152		26582	1260	28000000	28501514	BBK OLDENBURG (OLDB)	28350000	90001	SPK AURICH-NORDEN	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-aur.niedersachsen.de	www.ofd.niedersachsen.de	120
+3	2355	Bad Bentheim 	Heinrich-Böll-Str. 2	48455	Bad Bentheim	05922/970-0	05922/970-2000		48443	1262	26500000	26601501	BBK OSNABRUECK	26750001	1000066	KR SPK NORDHORN	Mo. - Fr. 9.00 - 12.00 Uhr, Do 14.00 - 15.30 Uhr	Poststelle@fa-ben.niedersachsen.de	www.ofd.niedersachsen.de	121
+3	2356	Cloppenburg 	Bahnhofstr. 57	49661	Cloppenburg	04471/8870	04471/887477		49646	1680	28000000	28001501	BBK OLDENBURG (OLDB)	28050100	80402100	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-clp.niedersachsen.de	www.ofd.niedersachsen.de	122
+3	2357	Delmenhorst 	Fr.-Ebert-Allee 15	27749	Delmenhorst	04221/1530	04221/153126	27747			29000000	29001521	BBK BREMEN	28050100	30475669	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 9.00 - 12.00 Uhr, Di. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-del.niedersachsen.de	www.ofd.niedersachsen.de	123
+3	2358	Emden 	Ringstr. 5	26721	Emden	(04921) 934-0	(04921) 934-499		26695	1553	28000000	28401500	BBK OLDENBURG (OLDB)	28450000	26	SPARKASSE EMDEN	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-emd.niedersachsen.de	www.ofd.niedersachsen.de	124
+3	2360	Leer (Ostfriesland) 	Edzardstr. 12/16	26789	Leer	(0491) 9870-0	0491/9870209	26787			28000000	28501511	BBK OLDENBURG (OLDB)	28550000	849000	SPARKASSE LEER-WEENER	Mo. - Fr. 8.00 - 12.00 Uhr, nur Infothek: Mo., Do. 14.00 - 17.30 Uhr	Poststelle@fa-ler.niedersachsen.de	www.ofd.niedersachsen.de	125
+3	2361	Lingen (Ems) 	Mühlentorstr. 14	49808	Lingen	0591/91490	0591/9149468		49784	1440	26500000	26601500	BBK OSNABRUECK	26650001	2402	SPK EMSLAND	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr und nach Vereinbarung	Poststelle@fa-lin.niedersachsen.de	www.ofd.niedersachsen.de	126
+3	2362	Norden 	Mühlenweg 20	26506	Norden	04931/1880	04931/188196		26493	100360	28000000	28501515	BBK OLDENBURG (OLDB)	28350000	1115	SPK AURICH-NORDEN	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-nor.niedersachsen.de	www.ofd.niedersachsen.de	127
+3	2363	Nordenham 	Plaatweg 1	26954	Nordenham	04731/8700	04731/870100		26942	1264	28000000	28001504	BBK OLDENBURG (OLDB)	28050100	63417000	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 8.30 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-nhm.niedersachsen.de	www.ofd.niedersachsen.de	128
+3	2364	Oldenburg (Oldenburg) 	91er Straße 4	26121	Oldenburg	0441/2381	(0441) 238-201/2/3		26014	2445	28000000	28001500	BBK OLDENBURG (OLDB)	28050100	423301	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-ol.niedersachsen.de	www.ofd.niedersachsen.de	129
+3	2365	Osnabrück-Land 	Hannoversche Str. 12	49084	Osnabrück	0541/58420	0541/5842450		49002	1280	26500000	26501501	BBK OSNABRUECK	26552286	110007	KREISSPARKASSE MELLE	Mo., Mi., Do. u. Fr. 8.00 - 12.00 Uhr, Di. 12.00 - 17.00 Uhr	Poststelle@fa-os-l.niedersachsen.de	www.ofd.niedersachsen.de	130
+3	2366	Osnabrück-Stadt 	Süsterstr. 46/48	49074	Osnabrück	0541/3540	(0541) 354-312		49009	1920	26500000	26501500	BBK OSNABRUECK	26550105	19000	SPARKASSE OSNABRUECK	Mo. - Mi., Fr. 8.00 - 12.00 Uhr, nur Infothek: Do. 12.00 - 17.00 Uhr	Poststelle@fa-os-s.niedersachsen.de	www.ofd.niedersachsen.de	131
+3	2367	Quakenbrück 	Lange Straße 37	49610	Quakenbrück	05431/1840	05431/184101		49602	1261	26500000	26501503	BBK OSNABRUECK	26551540	18837179	KR SPK BERSENBRUECK	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-qua.niedersachsen.de	www.ofd.niedersachsen.de	132
+3	2368	Vechta 	Rombergstr. 49	49377	Vechta	04441/180	(04441) 18-100	49375			28000000	28001502	BBK OLDENBURG (OLDB)	28050100	70400049	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 8.30 - 12.00 Uhr, Mo. 14.00 - 16.00 Uhr,Mi. 14.00 - 17.00	Poststelle@fa-vec.niedersachsen.de	www.ofd.niedersachsen.de	133
+3	2369	Westerstede 	Ammerlandallee 14	26655	Westerstede	04488/5150	04488/515444	26653			28000000	28001503	BBK OLDENBURG (OLDB)	28050100	40465007	LANDESSPARKASSE OLDENBURG	Mo. - Fr. 9.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-wst.niedersachsen.de	www.ofd.niedersachsen.de	134
+3	2370	Wilhelmshaven 	Rathausplatz 3	26382	Wilhelmshaven	04421/1830	04421/183111		26354	1462	28000000	28201500	BBK OLDENBURG (OLDB)	28250110	2117000	SPARKASSE WILHELMSHAVEN	Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-whv.niedersachsen.de	www.ofd.niedersachsen.de	135
+3	2371	Wittmund 	Harpertshausen.Str.2	26409	Wittmund	04462/840	04462/84195		26398	1153	28000000	28201502	BBK OLDENBURG (OLDB)				Mo. - Fr. 8.00 - 12.00 Uhr, Do. 14.00 - 17.00 Uhr	Poststelle@fa-wtm.niedersachsen.de	www.ofd.niedersachsen.de	136
+3	2380	Braunschweig für Großbetriebsprüfung	Theodor-Heuss-Str.4a	38122	Braunschweig	0531/80970	(0531) 8097-333		38009	1937							nach Vereinbarung	Poststelle@fa-gbp-bs.niedersachsen.de	www.ofd.niedersachsen.de	137
+3	2381	Göttingen für Großbetriebsprüfung	Godehardstr. 6	37073	Göttingen	0551/4070	(0551) 407-448											Poststelle@fa-gbp-goe.niedersachsen.de	www.ofd.niedersachsen.de	138
+3	2382	Hannover I für Großbetriebsprüfung	Bischofsholer Damm 15	30173	Hannover	(0511) 8563-01	(0511) 8563-195											Poststelle@fa-gbp-h1.niedersachsen.de	www.ofd.niedersachsen.de	139
+3	2383	Hannover II für Großbetriebsprüfung	Bischofsholer Damm 15	30173	Hannover	(0511) 8563-02	(0511) 8563-250		30019	1927								Poststelle@fa-gbp-h2.niedersachsen.de	www.ofd.niedersachsen.de	140
+3	2384	Stade für Großbetriebsprüfung	Am Ärztehaus 12	21680	Stade	(04141) 602-0	(04141) 602-60											Poststelle@fa-gbp-std.niedersachsen.de	www.ofd.niedersachsen.de	141
+3	2385	Oldenburg für Großbetriebsprüfung	Georgstr. 36	26121	Oldenburg	0441/2381	(0441) 238-522		26014	2445								Poststelle@fa-gbp-ol.niedersachsen.de	www.ofd.niedersachsen.de	142
+3	2386	Osnabrück für Großbetriebsprüfung	Johann-Domann-Str. 6	49080	Osnabrück	(0541) 503 800	(0541) 503 888											Poststelle@fa-gbp-os.niedersachsen.de	www.ofd.niedersachsen.de	143
+3	2390	Braunschweig für Fahndung und Strafsachen	Rudolf-Steiner-Str. 1	38120	Braunschweig	0531/28510	(0531) 2851-150		38009	1931							nach Vereinbarung	Poststelle@fa-fust-bs.niedersachsen.de	www.ofd.niedersachsen.de	144
+3	2391	Hannover für Fahndung und Strafsachen	Göttinger Chaus. 83B	30459	Hannover	(0511) 419-1	(0511) 419-2988		30430	911007								Poststelle@fa-fust-h.niedersachsen.de	www.ofd.niedersachsen.de	145
+3	2392	Lüneburg für Fahndung und Strafsachen	Horst-Nickel-Str. 6	21337	Lüneburg	(04131) 8545-600	(04131) 8545-698		21305	1570								Poststelle@fa-fust-lg.niedersachsen.de	www.ofd.niedersachsen.de	146
+3	2393	Oldenburg für Fahndung und Strafsachen	Cloppenburger Str. 320	26133	Oldenburg	(0441) 9401-0	(0441) 9401-200		26014	2442								Poststelle@fa-fust-ol.niedersachsen.de	www.ofd.niedersachsen.de	147
+4	2457	Bremen-Mitte Bewertung 	Rudolf-Hilferding-Platz 1	28195	Bremen	0421 322-2725	0421 322-2878		28079	10 79 67	29050000	1070110002	BREMER LANDESBANK BREMEN	29050101	109 0901	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtMitte.bremen.de		148
+4	2471	Bremen-Mitte 	Rudolf-Hilferding-Platz 1	28195	Bremen	0421 322-2725	0421 322-2878	28187	28079	10 79 67	29000000	29001512	BBK BREMEN	29050101	1090646	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtMitte.bremen.de		149
+4	2472	Bremen-Ost 	Rudolf-Hilferding-Platz 1	28195	Bremen	0421 322-3005	0421 322-3178		28057	10 57 09	29000000	29001513	BBK BREMEN	29050101	1090612	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtOst.bremen.de		150
+4	2473	Bremen-West 	Rudolf-Hilferding-Platz 1	28195	Bremen	0421 322-3422	0421 322-3478		28057	10 57 29	29000000	29001514	BBK BREMEN	29050101	1090638	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtWest.bremen.de		151
+6	2618	Fulda 	Königstraße 2	36037	Fulda	0661/924-01	0661/924-1606		36003	1346	53000000	53001500	BBK KASSEL EH FULDA	53050180	49009	SPARKASSE FULDA	Mo-Mi 8:00-15:30, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Fulda.de	www.Finanzamt-Fulda.de	177
+4	2474	Bremen-Nord 	Gerhard-Rohlfs-Str. 32	28757	Bremen	0421 6607-1	0421 6607-300		28734	76 04 34	29000000	29001518	BBK BREMEN	29050101	5016001	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-14:00	office@FinanzamtNord.bremen.de		152
+4	2475	Bremerhaven 	Schifferstr. 2-8	27568	Bremerhaven	0471 486-1	0471 486-370		27516	12 02 42	29200000	29201500	BBK BREMEN EH BREMERHAVEN	29250000	1100068	STE SPK BREMERHAVEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtBremerhaven.bremen.de		153
+4	2476	Bremen-Mitte KraftfahrzeugSt 	Schillerstr. 22	28195	Bremen	0421 322-2725	0421 322-2878		28079	107967	29000000	29001512	BBK BREMEN	29050101	 109 0646	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtMitte.bremen.de		154
+4	2477	Bremerhaven Bewertung 	Schifferstr. 2 - 8	27568	Bremerhaven	0471 486-1	0471 486-370		27516	12 02 42	29200000	29201500	BBK BREMEN EH BREMERHAVEN	29250000	1100068	STE SPK BREMERHAVEN	Zentrale Informations- und Annahmestelle Mo+Do 08.00-18.00/Di+Mi 08.00-16.00/Fr 08.00-15.00	office@FinanzamtBremerhaven.bremen.de		155
+4	2478	Bremen für Großbetriebsprüfung	Schillerstr. 6-7	28195	Bremen	0421 322-4019	0421 322-4078		28057	10 57 69							nach Vereinbarung			156
+4	2482	Bremen-Ost Arbeitnehmerbereich 	Rudolf-Hilferding-Platz 1	28195	Bremen	0421 322-3005	0421 322-3178		28057	10 57 09	29000000	29001513	BBK BREMEN	29050101	1090612	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtOst.bremen.de		157
+4	2484	Bremen-Nord Arbeitnehmerbereic 	Gerhard-Rohlfs-Str. 32	28757	Bremen	0421 6607-1	0421 6607-300		28734	76 04 34	29000000	29001518	BBK BREMEN	29050101	5016001	SPK BREMEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-14:00	office@FinanzamtNord.bremen.de		158
+4	2485	Bremerhaven Arbeitnehmerbereic 	Schifferstr. 2-8	27568	Bremerhaven	0471 486-1	0471 486-370		27516	12 02 42	29200000	29201500	BBK BREMEN EH BREMERHAVEN	29250000	1100068	STE SPK BREMERHAVEN	Zentrale Informations- und Annahmestelle Mo+Do 08:00-18:00,Di+Mi 08:00-16:00,Fr 08:00-15:00	office@FinanzamtBremerhaven.bremen.de		159
+6	2601	Alsfeld-Lauterbach Verwaltungsstelle Alsfeld	In der Rambach 11	36304	Alsfeld	06631/790-0	06631/790-555		36292	1263	51300000	51301504	BBK GIESSEN	53051130	1022003	SPARKASSE VOGELSBERGKREIS	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Alsfeld-Lauterbach.de	www.Finanzamt-Alsfeld-Lauterbach.de	160
+6	2602	Hersfeld-Rotenburg Verwaltungsstelle Bad Hersfeld	Im Stift 7	36251	Bad Hersfeld	06621/933-0	06621/933-333		36224	1451	53200000	53201500	BBK KASSEL EH BAD HERSFELD	53250000	1000016	SPK BAD HERSFELD-ROTENBURG	Mo u. Do 8:00-12:00, Di 14:00-18:00 Uhr	poststelle@Finanzamt-Hersfeld-Rotenburg.de	www.Finanzamt-Hersfeld-Rotenburg.de	161
+6	2604	Rheingau-Taunus Verwaltungsst. Bad Schwalbach 	Emser Str.27a	65307	Bad Schwalbach	06124/705-0	06124/705-400		65301	1165	51000000	51001502	BBK WIESBADEN	51050015	393000643	NASS SPK WIESBADEN	Mo-Mi 8:00-15:30, Do 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Rheingau-Taunus.de	www.Finanzamt-Rheingau-Taunus.de	163
+6	2605	Bensheim 	Berliner Ring 35	64625	Bensheim	06251/15-0	06251/15-267		64603	1351	50800000	50801510	BBK DARMSTADT	50950068	1040005	SPARKASSE BENSHEIM	Mo-Mi 8:00-15:30, Do 13:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Bensheim.de	www.Finanzamt-Bensheim.de	164
+6	2606	Marburg-Biedenkopf Verwaltungsstelle Biedenkopf	Im Feldchen 2	35216	Biedenkopf	06421/698-0	06421/698-109				51300000	51301514	BBK GIESSEN	53350000	110027303	SPK MARBURG-BIEDENKOPF	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr Telefon Verwaltungsstelle: 06461/709-0	poststelle@Finanzamt-Marburg-Biedenkopf.de	www.Finanzamt-Marburg-Biedenkopf.de	165
+6	2607	Darmstadt 	Soderstraße 30	64283	Darmstadt	06151/102-0	06151/102-1262	64287	64219	110465	50800000	50801500	BBK DARMSTADT	50850049	5093005006	LD BK GZ DARMSTADT	Mo-Mi 8:00-15:30, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Darmstadt.de	www.Finanzamt-Darmstadt.de	166
+6	2608	Dieburg 	Marienstraße 19	64807	Dieburg	06071/2006-0	06071/2006-100		64802	1209	50800000	50801501	BBK DARMSTADT	50852651	33211004	SPARKASSE DIEBURG	Mo-Mi 7:30-15:30, Do 13:30-18:00, Fr 7:30-12:00 Uhr	poststelle@Finanzamt-Dieburg.de	www.Finanzamt-Dieburg.de	167
+6	2609	Dillenburg 	Wilhelmstraße 9	35683	Dillenburg	02771/908-0	02771/908-100		35663	1362	51300000	51301509	BBK GIESSEN	51650045	18	BEZ SPK DILLENBURG	Mo-Mi 8:00-15:30, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Dillenburg.de	www.Finanzamt-Dillenburg.de	168
+6	2610	Eschwege-Witzenhausen Verwaltungsstelle Eschwege	Schlesienstraße 2	37269	Eschwege	05651/926-5	05651/926-720	37267	37252	1280	52000000	52001510	BBK KASSEL	52250030	18	SPARKASSE WERRA-MEISSNER	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Eschwege-Witzenhausen.de	www.Finanzamt-Eschwege-Witzenhausen.de	169
+6	2611	Korbach-Frankenberg Verwaltungsstelle Frankenberg 	Geismarer Straße 16	35066	Frankenberg	05631/563-0	05631/563-888				51300000	51301513	BBK GIESSEN	52350005	5001557	SPK WALDECK-FRANKENBERG	Mo, Di u. Do 8:00-15:30, Mi 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Korbach-Frankenberg.de	www.Finanzamt-Korbach-Frankenberg.de	170
+6	2612	Frankfurt am Main II 	Gutleutstraße 122	60327	Frankfurt	069/2545-02	069/2545-2999		60305	110862	50000000	50001504	BBK FILIALE FRANKFURT MAIN	50050000	1600006	LD BK HESS-THUER GZ FFM	Mo-Mi 8:00-15:30, Do 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Frankfurt-2.de	www.Finanzamt-Frankfurt-am-Main.de	171
+6	2613	Frankfurt am Main I 	Gutleutstraße 124	60327	Frankfurt	069/2545-01	069/2545-1999		60305	110861	50000000	50001504	BBK FILIALE FRANKFURT MAIN	50050000	1600006	LD BK HESS-THUER GZ FFM	Mo-Mi 8:00-15:30, Do 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Frankfurt-1.de	www.Finanzamt-Frankfurt-am-Main.de	172
+6	2614	Frankfurt am Main IV 	Gutleutstraße 118	60327	Frankfurt	069/2545-04	069/2545-4999		60305	110864	50000000	50001504	BBK FILIALE FRANKFURT MAIN	50050000	1600006	LD BK HESS-THUER GZ FFM	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Frankfurt-4.de	www.Finanzamt-Frankfurt-am-Main.de	173
+6	2615	Frankfurt/M. V-Höchst Verwaltungsstelle Höchst	Hospitalstraße 16 a	65929	Frankfurt	069/2545-05	069/2545-5999				50000000	50001502	BBK FILIALE FRANKFURT MAIN	50050201	608604	FRANKFURTER SPK FRANKFURT	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr Telefon Verwaltungsstelle: 069/30830-0	poststelle@Finanzamt-Frankfurt-5-Hoechst.de	www.Finanzamt-Frankfurt-am-Main.de	174
+6	2616	Friedberg (Hessen) 	Leonhardstraße 10 - 12	61169	Friedberg	06031/49-1	06031/49-333		61143	100362	51300000	51301506	BBK GIESSEN	51850079	50000400	SPARKASSE WETTERAU	Di 8:00-12:00, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Friedberg.de	www.Finanzamt-Friedberg.de	175
+6	2617	Bensheim Außenstelle Fürth	Erbacher Straße 23	64658	Fürth	06253/206-0	06253/206-10		64654	1154	50800000	50801510	BBK DARMSTADT	50950068	1040005	SPARKASSE BENSHEIM		poststelle@Finanzamt-Bensheim.de	www.Finanzamt-Bensheim.de	176
+6	2619	Gelnhausen 	Frankfurter Straße 14	63571	Gelnhausen	06051/86-0	06051/86-299	63569	63552	1262	50600000	50601502	BBK FRANKFURT EH HANAU	50750094	2008	KREISSPARKASSE GELNHAUSEN	Mo u. Mi 8:00-12:00, Do 14:30-18:00 Uhr	poststelle@Finanzamt-Gelnhausen.de	www.Finanzamt-Gelnhausen.de	178
+6	2620	Gießen 	Schubertstraße 60	35392	Gießen	0641/4800-100	0641/4800-1590	35387	35349	110440				51300000	51301500	BBK GIESSEN	Mo-Mi 8:00-15:30,Do 14:00-18:00, Fr 8:00-12:00 Uhr	info@Finanzamt-Giessen.de	www.Finanzamt-Giessen.de	179
+6	2621	Groß-Gerau 	Europaring 11-13	64521	Groß-Gerau	06152/170-01	06152/170-601	64518	64502	1262	50800000	50801502	BBK DARMSTADT	50852553	1685	KR SPK GROSS-GERAU	Mo-Mi 8:00-15.30, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Gross-Gerau.de	www.Finanzamt-Gross-Gerau.de	180
+6	2622	Hanau 	Am Freiheitsplatz 2	63450	Hanau	06181/101-1	06181/101-501	63446	63404	1452	50600000	50601500	BBK FRANKFURT EH HANAU	50650023	50104	SPARKASSE HANAU	Mo u. Mi 7:30-12:00, Do 14:30-18:00 Uhr	poststelle@Finanzamt-Hanau.de	www.Finanzamt-Hanau.de	181
+6	2623	Kassel-Hofgeismar Verwaltungsstelle Hofgeismar	Altstädter Kirchplatz 10	34369	Hofgeismar	0561/7207-0	0561/7207-2500				52000000	52001501	BBK KASSEL	52050353	100009202	KASSELER SPARKASSE	Di, Mi u. Fr 8:00-12:00, Do 15:00-18:00 Uhr Telefon Verwaltungsstelle: 05671/8004-0	poststelle@Finanzamt-Kassel-Hofgeismar.de	www.Finanzamt-Kassel.de	182
+6	2624	Schwalm-Eder Verwaltungsstelle Fritzlar	Georgengasse 5	34560	Fritzlar	05622/805-0	05622/805-111		34551	1161	52000000	52001502	BBK KASSEL	52052154	110007507	KREISSPARKASSE SCHWALM-EDER	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr	poststelle@Finanzamt-Schwalm-Eder.de	www.Finanzamt-Schwalm-Eder.de	183
+6	2625	Kassel-Spohrstraße 	Spohrstraße 7	34117	Kassel	0561/7208-0	0561/7208-408	34111	34012	101249	52000000	52001500	BBK KASSEL	52050000	4091300006	LANDESKREDITKASSE KASSEL	Mo u. Fr 7:30-12:00, Mi 14:00-18:00 Uhr	poststelle@Finanzamt-Kassel-Spohrstrasse.de	www.Finanzamt-Kassel.de	184
+6	2626	Kassel-Hofgeismar Verwaltungsstelle Kassel	Goethestraße 43	34119	Kassel	0561/7207-0	0561/7207-2500	34111	34012	101229	52000000	52001500	BBK KASSEL	52050000	4091300006	LANDESKREDITKASSE KASSEL	Mo, Mi u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr	poststelle@Finanzamt-Kassel-Hofgeismar.de	www.Finanzamt-Kassel.de	185
+6	2627	Korbach-Frankenberg Verwaltungsstelle Korbach	Medebacher Landstraße 29	34497	Korbach	05631/563-0	05631/563-888	34495	34482	1240	52000000	52001509	BBK KASSEL	52350005	19588	SPK WALDECK-FRANKENBERG	Mo, Mi u. Fr 8:00-12:00, Do 15:30-18:00 Uhr	poststelle@Finanzamt-Korbach-Frankenberg.de	www.Finanzamt-Korbach-Frankenberg.de	186
+6	2628	Langen 	Zimmerstraße 27	63225	Langen	06103/591-01	06103/591-285	63222	63202	1280	50000000	50001511	BBK FILIALE FRANKFURT MAIN	50592200	31500	VB DREIEICH	Mo, Mi u. Do 8:00-15:30, Di 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Langen.de	www.Finanzamt-Langen.de	187
+6	2629	Alsfeld-Lauterbach Verwaltungsstelle Lauterbach	Bahnhofstraße 69	36341	Lauterbach	06631/790-0	06631/790-555	36339			53000000	53001501	BBK KASSEL EH FULDA	53051130	60100509	SPARKASSE VOGELSBERGKREIS	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr Telefon Verwaltungsstelle: 06641/188-0	poststelle@Finanzamt-Alsfeld-Lauterbach.de	www.Finanzamt-Alsfeld-Lauterbach.de	188
+6	2630	Limburg-Weilburg Verwaltungsstelle Limburg	Walderdorffstraße 11	65549	Limburg	06431/208-1	06431/208-294	65547	65534	1465	51000000	51001507	BBK WIESBADEN	51050015	535054800	NASS SPK WIESBADEN	Mo-Mi 8:00-15:30, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Limburg-Weilburg.de	www.Finanzamt-Limburg-Weilburg.de	189
+6	2631	Marburg-Biedenkopf Verwaltungsstelle Marburg	Robert-Koch-Straße 7	35037	Marburg	06421/698-0	06421/698-109	35034	35004	1469	51300000	51301512	BBK GIESSEN	53350000	11517	SPK MARBURG-BIEDENKOPF	Mo-Mi 8:00-15:30, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Marburg-Biedenkopf.de	www.Finanzamt-Marburg-Biedenkopf.de	190
+6	2632	Schwalm-Eder Verwaltungsstelle Melsungen	Kasseler Straße 31 (Schloß)	34212	Melsungen	05622/805-0	05622/805-111				52000000	52001503	BBK KASSEL	52052154	10060002	KREISSPARKASSE SCHWALM-EDER	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr Telefon Verwaltungsstelle: 05661/706-0	poststelle@Finanzamt-Schwalm-Eder.de	www.Finanzamt-Schwalm-Eder.de	191
+6	2633	Michelstadt 	Erbacher Straße 48	64720	Michelstadt	06061/78-0	06061/78-100		64712	3180	50800000	50801503	BBK DARMSTADT	50851952	40041451	SPK ODENWALDKREIS ERBACH	Mo, Di u. Do 8:00-15:30, Mi 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Michelstadt.de	www.Finanzamt-Michelstadt.de	192
+6	2634	Nidda 	Schillerstraße 38	63667	Nidda	06043/805-0	06043/805-159		63658	1180	50600000	50601501	BBK FRANKFURT EH HANAU	51850079	150003652	SPARKASSE WETTERAU	Mo, Di u. Do 7:30-16:00, Mi 13:30-18:00, Fr 7:00-12:00 Uhr	poststelle@Finanzamt-Nidda.de	www.Finanzamt-Nidda.de	193
+6	2635	Offenbach am Main-Stadt 	Bieberer Straße 59	63065	Offenbach	069/8091-1	069/8091-2400	63063	63005	100563	50000000	50001500	BBK FILIALE FRANKFURT MAIN	50550020	493	STE SPK OFFENBACH	Mo, Di u. Do 7:30-15:30, Mi 13:00-18:00, Fr 7:30-12:00 Uhr	poststelle@Finanzamt-Offenbach-Stadt.de	www.Finanzamt-Offenbach.de	194
+5	5383	Hagen f. Steuerfahndung und Steuerstrafsachen	Becheltestr. 32	58089	Hagen	02331/3089-0	0800 10092675383		58041	4143	45000000	145001500	BBK HAGEN	45050001	100001580	SPARKASSE HAGEN		Service@FA-5383.fin-nrw.de		195
+6	2636	Hersfeld-Rotenburg Verwaltungsstelle Rotenburg	Dickenrücker Straße 12	36199	Rotenburg	06621/933-0	06621/933-333				52000000	52001504	BBK KASSEL	53250000	50000012	SPK BAD HERSFELD-ROTENBURG	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr Telefon Verwaltungsstelle: 06623/816-0	poststelle@Finanzamt-Hersfeld-Rotenburg.de	www.Finanzamt-Hersfeld-Rotenburg.de	196
+6	2637	Rheingau-Taunus Verwaltungsstelle Rüdesheim	Hugo-Asbach-Straße 3 - 7	65385	Rüdesheim	06124/705-0	06124/705-400				51000000	51001501	BBK WIESBADEN	51050015	455022800	NASS SPK WIESBADEN	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr Telefon Verwaltungsstelle: 06722/405-0	poststelle@Finanzamt-Rheingau-Taunus.de	www.Finanzamt-Rheingau-Taunus.de	197
+6	2638	Limburg-Weilburg Verwaltungsstelle Weilburg	Kruppstraße 1	35781	Weilburg	06431/208-1	06431/208-294	35779			51000000	51001511	BBK WIESBADEN	51151919	100000843	KR SPK WEILBURG	Mo-Mi 8:00-16:00, Do 14:00-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Limburg-Weilburg.de	www.Finanzamt-Limburg-Weilburg.de	198
+6	2639	Wetzlar 	Frankfurter Straße 59	35578	Wetzlar	06441/202-0	06441/202-6810	35573	35525	1520	51300000	51301508	BBK GIESSEN	51550035	46003	SPARKASSE WETZLAR	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Wetzlar.de	www.Finanzamt-Wetzlar.de	199
+6	2640	Wiesbaden I 	Dostojewskistraße 8	65187	Wiesbaden	0611/813-0	0611/813-1000	65173	65014	2469	51000000	51001500	BBK WIESBADEN	51050015	100061600	NASS SPK WIESBADEN	Mo, Di u. Do 8:00-15:30, Mi 13:30-18:00, Fr 7:00-12:00 Uhr	poststelle@Finanzamt-Wiesbaden-1.de	www.Finanzamt-Wiesbaden.de	200
+6	2641	Eschwege-Witzenhausen Verwaltungsstelle Witzenhausen	Südbahnhofstraße 37	37213	Witzenhausen	05651/926-5	05651/926-720				52000000	52001505	BBK KASSEL	52250030	50000991	SPARKASSE WERRA-MEISSNER	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr Telefon Verwaltungsstelle: 05542/602-0	poststelle@Finanzamt-Eschwege-Witzenhausen.de	www.Finanzamt-Eschwege-Witzenhausen.de	201
+6	2642	Schwalm-Eder Verwaltungsstelle Schwalmstadt	Landgraf-Philipp-Straße 15	34613	Schwalmstadt	05622/805-0	05622/805-111				52000000	52001506	BBK KASSEL	52052154	200006641	KREISSPARKASSE SCHWALM-EDER	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr Telefon Verwaltungsstelle: 06691/738-0	poststelle@Finanzamt-Schwalm-Eder.de	www.Finanzamt-Schwalm-Eder.de	202
+6	2643	Wiesbaden II 	Dostojewskistraße 8	65187	Wiesbaden	0611/813-0	0611/813-2000	65173	65014	2469	51000000	51001500	BBK WIESBADEN	51050015	100061600	NASS SPK WIESBADEN	Mo, Di u. Do 8:00-15:30, Mi 13:30-18:00, Fr 7:00-12:00 Uhr	poststelle@Finanzamt-Wiesbaden-2.de	www.Finanzamt-Wiesbaden.de	203
+6	2644	Offenbach am Main-Land 	Bieberer Straße 59	63065	Offenbach	069/8091-1	069/8091-3400	63063	63005	100552	50000000	50001500	BBK FILIALE FRANKFURT MAIN	50550020	493	STE SPK OFFENBACH	Mo, Di u. Do 7:30-15:30, Mi 13:00-18:00, Fr 7:30-12:00 Uhr	poststelle@Finanzamt-Offenbach-Land.de	www.Finanzamt-Offenbach.de	204
+6	2645	Frankfurt am Main III 	Gutleutstraße 120	60327	Frankfurt	069/2545-03	069/2545-3999		60305	110863	50000000	50001504	BBK FILIALE FRANKFURT MAIN	50050000	1600006	LD BK HESS-THUER GZ FFM	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Frankfurt-3.de	wwww.Finanzamt-Frankfurt-am-Main.de	205
+6	2646	Hofheim am Taunus 	Nordring 4 - 10	65719	Hofheim	06192/960-0	06192/960-412	65717	65703	1380	50000000	50001503	BBK FILIALE FRANKFURT MAIN	51250000	2000008	TAUNUS-SPARKASSE BAD HOMBG	Mo-Mi 8:00-15:30, Do 13:30-18:00, Fr 8:00-12:00 Uhr	poststelle@Finanzamt-Hofheim-am-Taunus.de	www.Finanzamt-Hofheim-am-Taunus.de	206
+6	2647	Frankfurt/M. V-Höchst Verwaltungsstelle Frankfurt	Gutleutstraße 116	60327	Frankfurt	069/2545-05	069/2545-5999		60305	110865	50000000	50001504	BBK FILIALE FRANKFURT MAIN	50050000	1600006	LD BK HESS-THUER GZ FFM	Mo u. Mi 8:00-12:00, Do 14:00-18:00 Uhr	poststelle@Finanzamt-Frankfurt-5-Hoechst.de	www.Finanzamt-Frankfurt-am-Main.de	207
+7	2701	Bad Neuenahr-Ahrweiler 	Römerstr. 5	53474	Bad Neuenahr-Ahrweiler	02641/3820	02641/38212000		53457	1209	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-aw.fin-rlp.de		208
+7	2702	Altenkirchen-Hachenburg 	Frankfurter Str. 21	57610	Altenkirchen	02681/860	02681/8610090	57609	57602	1260	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ak.fin-rlp.de	www.finanzamt-altenkirchen-hachenburg.de	209
+7	2703	Bingen-Alzey Aussenstelle Alzey	Rochusallee 10	55411	Bingen	06721/7060	06721/70614080	55409	55382		55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06731/4000	Poststelle@fa-bi.fin-rlp.de	www.finanzamt-bingen-alzey.de	210
+7	2706	Bad Kreuznach 	Ringstr. 10	55543	Bad Kreuznach	0671/7000	0671/70011702	55541	55505	1552	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-kh.fin-rlp.de	www.finanzamt-bad-kreuznach.de	211
+7	2707	Bernkastel-Wittlich Aussenstelle Bernkastel-Kues	Unterer Sehlemet 15	54516	Wittlich	06571/95360	06571/953613400		54502	1240	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06531/5060	Poststelle@fa-wi.fin-rlp.de	www.finanzamt-bernkastel-wittlich.de	212
+7	2708	Bingen-Alzey 	Rochusallee 10	55411	Bingen	06721/7060	06721/70614080	55409	55382		55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-bi.fin-rlp.de	www.finanzamt-bingen-alzey.de	213
+7	2709	Idar-Oberstein 	Hauptstraße 199	55743	Idar-Oberstein	06781/680	06781/6818333		55708	11820	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-io.fin-rlp.de	www.finanzamt-idar-oberstein.de	214
+7	2710	Bitburg-Prüm 	Kölner Straße 20	54634	Bitburg	06561/6030	06561/60315090		54622	1252	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-bt.fin-rlp.de	www.finanzamt-bitburg-pruem.de	215
+7	2713	Daun 	Berliner Straße 1	54550	Daun	06592/95790	06592/957916175		54542	1160	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-da.fin-rlp.de	www.finanzamt-daun.de	216
+7	2714	Montabaur-Diez Aussenstelle Diez	Koblenzer Str. 15	56410	Montabaur	02602/1210	02602/12127099	56409	56404	1461	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06432/5040	Poststelle@fa-mt.fin-rlp.de	www.finanzamt-montabaur-diez.de	217
+7	2715	Frankenthal 	Friedrich-Ebert-Straße 6	67227	Frankenthal	06233/49030	06233/490317082	67225	67203	1324	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ft.fin-rlp.de	www.finanzamt-frankenthal.de	218
+7	2716	Speyer-Germersheim Aussenstelle Germersheim	Johannesstr. 9-12	67346	Speyer	06232/60170	06232/601733431	67343	67323	1309	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 07274/9500	Poststelle@fa-sp.fin-rlp.de	www.finanzamt-speyer-germersheim.de	219
+7	2718	Altenkirchen-Hachenburg Aussenstelle Hachenburg	Frankfurter Str. 21	57610	Altenkirchen	02681/860	02681/8610090	57609	57602	1260	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 02662/94520	Poststelle@fa-ak.fin-rlp.de	www.finanzamt-altenkirchen-hachenburg.de	220
+7	2719	Kaiserslautern 	Eisenbahnstr. 56	67655	Kaiserslautern	0631/36760	0631/367619500	67653	67621	3360	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-kl.fin-rlp.de	www.finanzamt-kaiserslautern.de	221
+7	2721	Worms-Kirchheimbolanden Aussenstelle Kirchheimbolanden	Karlsplatz 6	67549	Worms	06241/30460	06241/304635060	67545			55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06352/4070	Poststelle@fa-wo.fin-rlp.de	www.finanzamt-worms-kirchheimbolanden.de	222
+7	2722	Koblenz 	Ferdinand-Sauerbruch-Str. 19	56073	Koblenz	0261/49310	0261/493120090	56060	56007	709	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ko.fin-rlp.de	www.finanzamt-koblenz.de	223
+7	2723	Kusel-Landstuhl 	Trierer Str. 46	66869	Kusel	06381/99670	06381/996721060		66864	1251	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ku.fin-rlp.de	www.finanzamt-kusel-landstuhl.de	224
+7	2724	Landau 	Weißquartierstr. 13	76829	Landau	06341/9130	06341/91322100	76825	76807	1760u.1780	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ld.fin-rlp.de		225
+7	2725	Kusel-Landstuhl Aussenstelle Landstuhl	Trierer Str. 46	66869	Kusel	06381/99670	06381/996721060		66864	1251	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06371/61730	Poststelle@fa-ku.fin-rlp.de	www.finanzamt-kusel-landstuhl.de	226
+7	2726	Mainz-Mitte 	Schillerstr. 13	55116	Mainz	06131/2510	06131/25124090		55009	1980	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-mz.fin-rlp.de	www.finanzamt-mainz-mitte.de	227
+7	2727	Ludwigshafen 	Bayernstr. 39	67061	Ludwigshafen	0621/56140	0621/561423051		67005	210507	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-lu.fin-rlp.de	www.finanzamt-ludwigshafen.de	228
+7	2728	Mainz-Süd 	Emy-Roeder-Str. 3	55129	Mainz	06131/5520	06131/55225272		55071	421365	55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ms.fin-rlp.de	www.finanzamt-mainz-sued.de	229
+7	2729	Mayen 	Westbahnhofstr. 11	56727	Mayen	02651/70260	02651/702626090		56703	1363	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-my.fin-rlp.de	www.finanzamt-mayen.de	230
+7	2730	Montabaur-Diez 	Koblenzer Str. 15	56410	Montabaur	02602/1210	02602/12127099	56409	56404	1461	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-mt.fin-rlp.de	www.finanzamt-montabaur-diez.de	231
+7	2731	Neustadt 	Konrad-Adenauer-Str. 26	67433	Neustadt	06321/9300	06321/93028600	67429	67404	100 465	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-nw.fin-rlp.de		232
+7	2732	Neuwied 	Augustastr. 54	56564	Neuwied	02631/9100	02631/91029906	56562	56505	1561	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-nr.fin-rlp.de		233
+7	2735	Pirmasens-Zweibrücken 	Kaiserstr. 2	66955	Pirmasens	06331/7110	06331/71130950	66950	66925	1662	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-ps.fin-rlp.de	www.finanzamt-pirmasens-zweibruecken.de	234
+7	2736	Bitburg-Prüm Aussenstelle Prüm	Kölner Str. 20	54634	Bitburg	06561/6030	06561/60315093		54622	1252	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06551/9400	Poststelle@fa-bt.fin-rlp.de	www.finanzamt-bitburg-pruem.de	235
+7	2738	Sankt Goarshausen-Sankt Goar Aussenstelle Sankt Goar	Wellmicher Str. 79	56346	St. Goarshausen	06771/95900	06771/959031090		56342		55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06741/98100	Poststelle@fa-gh.fin-rlp.de	www.finanzamt-sankt-goarshausen-sankt-goar.de	236
+7	2739	Sankt Goarshausen-Sankt Goar 	Wellmicher Str. 79	56346	St. Goarshausen	06771/95900	06771/959031090		56342		55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-gh.fin-rlp.de	www.finanzamt-sankt-goarshausen-sankt-goar.de	237
+7	2740	Simmern-Zell 	Brühlstraße 3	55469	Simmern	06761/8550	06761/85532053		55464	440	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-si.fin-rlp.de		238
+7	2741	Speyer-Germersheim 	Johannesstr. 9-12	67346	Speyer	06232/60170	06232/601733431	67343	67323	1309	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-sp.fin-rlp.de	www.finanzamt-speyer-germersheim.de	239
+7	2742	Trier 	Hubert-Neuerburg-Str. 1	54290	Trier	0651/93600	0651/936034900		54207	1750u.1760	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-tr.fin-rlp.de	www.finanzamt-trier.de	240
+7	2743	Bernkastel-Wittlich 	Unterer Sehlemet 15	54516	Wittlich	06571/95360	06571/953613400		54502	1240	55050000	902	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-wi.fin-rlp.de	www.finanzamt-bernkastel-wittlich.de	241
+7	2744	Worms-Kirchheimbolanden 	Karlsplatz 6	67549	Worms	06241/30460	06241/304635060	67545			55050000	901	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR	Poststelle@fa-wo.fin-rlp.de	www.finanzamt-worms-kirchheimbolanden.de	242
+7	2745	Simmern-Zell Aussenstelle Zell	Brühlstr. 3	55469	Simmern	06761/8550	06761/85532053		55464	440	55050000	908	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06542/7090	Poststelle@fa-si.fin-rlp.de		243
+7	2746	Pirmasens-Zweibrücken Aussenstelle Zweibrücken	Kaiserstr. 2	66955	Pirmasens	06331/7110	06331/71130950	66950	66925	1662	55050000	910	LRP GZ MAINZ				8.00-17.00 MO-MI 8.00-18.00 DO 8.00-13.00 FR Telefon-Nr. Aussenstelle: 06332/80680	Poststelle@fa-ps.fin-rlp.de	www.finanzamt-pirmasens-zweibruecken.de	244
+8	2801	Achern 	Allerheiligenstr. 10	77855	Achern	07841/6940	07841/694136	77843	77843	1260	66000000	66001518	BBK KARLSRUHE	66450050	88013009	SPARKASSE OFFENBURG-ORTENAU	MO-DO 8-12.30+13.30-15.30,DO-17.30,FR 8-12 H	poststelle@fa-achern.fv.bwl.de		245
+8	2804	Donaueschingen 	Käferstr. 25	78166	Donaueschingen	0771/8080	0771/808359	78153	78153	1269	69400000	694 01501	BBK VILLINGEN-SCHWENNINGEN	69421020	6204700600	BW BANK DONAUESCHINGEN	MO-MI 8-16 UHR, DO 8-17.30 UHR, FR 8-12 UHR	poststelle@fa-donaueschingen.fv.bwl.de		246
+8	2805	Emmendingen 	Bahnhofstr. 3	79312	Emmendingen	07641/4500	07641/450350	79305	79305	1520	68000000	680 01507	BBK FREIBURG IM BREISGAU	68050101	20066684	SPK FREIBURG-NOERDL BREISGA	MO-MI 7:30-15:30,DO 7:30-17:00,FR 7:30-12:00	poststelle@fa-emmendingen.fv.bwl.de		247
+8	2806	Freiburg-Stadt 	Sautierstr. 24	79104	Freiburg	0761/2040	0761/2043295	79079			68000000	680 01501	BBK FREIBURG IM BREISGAU	68020020	4402818100	BW BANK FREIBURG BREISGAU	MO, DI, DO 7.30-16,MI 7.30-17.30, FR 7.30-12	poststelle@fa-freiburg-stadt.fv.bwl.de		248
+8	2807	Freiburg-Land 	Stefan-Meier-Str. 133	79104	Freiburg	0761/2040	0761/2043424	79095			68000000	680 015 00	BBK FREIBURG IM BREISGAU	68090000	12222300	VOLKSBANK FREIBURG	ZIA: MO,DI,DO 8-16, MI 8-17:30, FR 8-12 UHR	poststelle@fa-freiburg-land.fv.bwl.de		249
+8	2808	Kehl 	Ludwig-Trick-Str. 1	77694	Kehl	07851/8640	07851/864108	77676	77676	1640	66400000	664 01501	BBK FREIBURG EH OFFENBURG	66451862	-6008	SPK HANAUERLAND KEHL	MO,DI,MI 7.45-15.30, DO -17.30, FR -12.00UHR	poststelle@fa-kehl.fv.bwl.de		250
+8	2809	Konstanz 	Bahnhofplatz 12	78462	Konstanz	07531/2890	07531/289312	78459			69400000	69001500	BBK VILLINGEN-SCHWENNINGEN	69020020	6604947900	BW BANK KONSTANZ	MO,DI,DO 7.30-15.30,MI 7.30-17.00,FR 7.30-12	poststelle@fa-konstanz.fv.bwl.de		251
+8	2810	Lahr 	Gerichtstr. 5	77933	Lahr	07821/2830	07821/283100		77904	1466	66000000	66001527	BBK KARLSRUHE	66450050	76103333	SPARKASSE OFFENBURG-ORTENAU	MO,DI,DO 7:30-16:00, MI 7:30-17:30, FR 7:30-12:00	poststelle@fa-lahr.fv.bwl.de		252
+8	2811	Lörrach 	Luisenstr. 10 a	79539	Lörrach	07621/1730	07621/173245	79537			68000000	68301500	BBK FREIBURG IM BREISGAU	68320020	4602600100	BW BANK LOERRACH	MO-MI 7.00-15.30/DO 7.00-17.30/FR 7.00-12.00	poststelle@fa-loerrach.fv.bwl.de		253
+8	2812	Müllheim 	Goethestr. 11	79379	Müllheim	07631/18900	(07631)189-190	79374	79374	1461	68000000	680 01511	BBK FREIBURG IM BREISGAU	68351865	802 888 8	SPARKASSE MARKGRAEFLERLAND	MO-MI 7,30-15,30 DO 7,30-17,30 FR 7,30-12,00	poststelle@fa-muellheim.fv.bwl.de		254
+8	2813	Titisee-Neustadt 	Goethestr. 5	79812	Titisee-Neustadt	07651/2030	07651/203110		79812	12 69	68000000	680 015 10	BBK FREIBURG IM BREISGAU	68051004	4040408	SPK HOCHSCHWARZWALD T-NEUST	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.30	poststelle@fa-titisee-neustadt.fv.bwl.de		255
+8	2814	Offenburg 	Zeller Str. 1- 3	77654	Offenburg	0781/9330	0781/9332444	77604	77604	1440	68000000	664 01500	BBK FREIBURG IM BREISGAU	66420020	4500000700	BW BANK OFFENBURG	MO-DO 7.30-15.30 DURCHGEHEND,MI -18.00,FR-12	poststelle@fa-offenburg.fv.bwl.de		256
+8	2815	Oberndorf 	Brandeckerstr. 4	78727	Oberndorf	07423/8150	07423/815107	78721	78721	1240	69400000	694 01506	BBK VILLINGEN-SCHWENNINGEN	64250040	813 015	KR SPK ROTTWEIL	ZIA:MO,DI,DO 8-16,MI 8-17:30,FR 8-12 UHR	poststelle@fa-oberndorf.fv.bwl.de		257
+8	2816	Bad Säckingen 	Werderstr. 5	79713	Bad Säckingen	07761/5660	07761/566126	79702	79702	1148	68000000	683 015 02	BBK FREIBURG IM BREISGAU				MO,DI,DO 8-15.30, MI 8-17.30, FR 8-12 UHR	poststelle@fa-badsaeckingen.fv.bwl.de		258
+8	2818	Singen 	Alpenstr. 9	78224	Singen	07731/8230	07731/823650		78221	380	69000000	69001507	BBK VILL-SCHWEN EH KONSTANZ	69220020	6402000100	BW BANK SINGEN	MO-DO 7:30-15:30, MI bis 17:30, FR 7:30-12:00	poststelle@fa-singen.fv.bwl.de		259
+8	2819	Rottweil 	Körnerstr. 28	78628	Rottweil	0741/2430	0741/2432194	78612	78612	1252	69400000	69401505	BBK VILLINGEN-SCHWENNINGEN	64250040	136503	KR SPK ROTTWEIL	MO-MI 8-16, DO 8-18, FR 8-12 UHR	poststelle@fa-rottweil.fv.bwl.de		260
+8	2820	Waldshut-Tiengen 	Bahnhofstr. 11	79761	Waldshut-Tiengen	07741/6030	07741/603213	79753	79753	201360	68000000	68301501	BBK FREIBURG IM BREISGAU	68452290	14449	SPARKASSE HOCHRHEIN	MO-MI 8-15.30,DO 8-17.30,FR 8-12 UHR	poststelle@fa-waldshut-tiengen.fv.bwl.de		261
+8	2821	Tuttlingen 	Zeughausstr. 91	78532	Tuttlingen	07461/980	07461/98303		78502	180	69400000	69401502	BBK VILLINGEN-SCHWENNINGEN	64350070	251	KR SPK TUTTLINGEN	MO-MI8-15.30,DO8-17.30,FR8-12.00UHR	poststelle@fa-tuttlingen.fv.bwl.de		262
+8	2822	Villingen-Schwenningen 	Weiherstr. 7	78050	Villingen-Schwenningen	07721/923-0	07721/923-100	78045			69400000	69401500	BBK VILLINGEN-SCHWENNINGEN				MO-MI 8-16UHR,DO 8-17.30UHR,FR 8-12UHR	poststelle@fa-villingen-schwenningen.fv.bwl.de		263
+8	2823	Wolfach 	Hauptstr. 55	77709	Wolfach	07834/9770	07834/977-169	77705	77705	1160	66400000	664 01502	BBK FREIBURG EH OFFENBURG	66452776	-31956	SPK WOLFACH	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.00	poststelle@fa-wolfach.fv.bwl.de		264
+8	2830	Bruchsal 	Schönbornstr. 1-5	76646	Bruchsal	07251/740	07251/742111	76643	76643	3021	66000000	66001512	BBK KARLSRUHE	66350036	50	SPK KRAICHGAU	SERVICEZENTRUM:MO-MI8-15:30DO8-17:30FR8-1200	poststelle@fa-bruchsal.fv.bwl.de		265
+8	2831	Ettlingen 	Pforzheimer Str. 16	76275	Ettlingen	07243/5080	07243/508295	76257	76257	363	66000000	66001502	BBK KARLSRUHE	66051220	1043009	SPARKASSE ETTLINGEN	MO+DI 8-15.30,MI 7-15.30,DO 8-17.30,FR 8-12	poststelle@fa-ettlingen.fv.bwl.de		266
+8	2832	Heidelberg 	Kurfürsten-Anlage 15-17	69115	Heidelberg	06221/590	06221/592355	69111			67000000	67001510	BBK MANNHEIM	67220020	5302059000	BW BANK HEIDELBERG	ZIA:MO-DO 7.30-15.30, MI - 17.30, FR - 12.00	poststelle@fa-heidelberg.fv.bwl.de		267
+8	2833	Baden-Baden 	Stephanienstr. 13 + 15	76530	Baden-Baden	07221/3590	07221/359320	76520			66000000	66001516	BBK KARLSRUHE	66220020	4301111300	BW BANK BADEN-BADEN	MO,DI,DO 8-16 UHR,MI 8-17.30 UHR,FR 8-12 UHR	poststelle@fa-baden-baden.fv.bwl.de		268
+8	2834	Karlsruhe-Durlach 	Prinzessenstr. 2	76227	Karlsruhe	0721/9940	0721/9941235	76225	76203	410326	66000000	66001503	BBK KARLSRUHE				MO-DO 8-15.30,MI 8-17.30,FR 8-12	poststelle@fa-karlsruhe-durlach.fv.bwl.de		269
+8	2835	Karlsruhe-Stadt 	Schlossplatz 14	76131	Karlsruhe	0721/1560	(0721) 156-1000				66000000	66001501	BBK KARLSRUHE	66020020	4002020800	BW BANK KARLSRUHE	MO-DO 7.30-15.30 MI -17.30 FR 7.30-12.00	poststelle@fa-karlsruhe-stadt.fv.bwl.de		270
+8	2836	Bühl 	Alban-Stolz-Str. 8	77815	Bühl	07223/8030	07223/3625	77815			66000000	66001525	BBK KARLSRUHE	66220020	4301111300	BW BANK BADEN-BADEN	MO,DI,DO=8-16UHR, MI=8-17.30UHR,FR=8-12UHR	poststelle@fa-buehl.fv.bwl.de		271
+8	2837	Mannheim-Neckarstadt 	L3, 10	68161	Mannheim	0621/2920	0621/292-1010	68150			67000000	67001500	BBK MANNHEIM	67020020	5104719900	BW BANK MANNHEIM	MO,DI,DO7.30-15.30,MI7.30-17.30,FR7.30-12.00	poststelle@fa-mannheim-neckarstadt.fv.bwl.de		272
+8	2838	Mannheim-Stadt 	L3, 10	68161	Mannheim	0621/2920	2923640	68150			67000000	670 01500	BBK MANNHEIM	67020020	5104719900	BW BANK MANNHEIM	MO,DI,DO7.30-15.30,MI7.30.17.30,FR7.30-12.00	poststelle@fa-mannheim-stadt.fv.bwl.de		273
+8	2839	Rastatt 	An der Ludwigsfeste 3	76437	Rastatt	07222/9780	07222/978330	76404	76404	1465	66000000	66001519	BBK KARLSRUHE	66020020	4150199000	BW BANK KARLSRUHE	MO-MI 8-15:30 UHR,DO 8-17:30 UHR,FR 8-12 UHR	poststelle@fa-rastatt.fv.bwl.de		274
+8	2840	Mosbach 	Pfalzgraf-Otto-Str. 5	74821	Mosbach	06261/8070	06261/807200	74819			62000000	62001502	BBK HEILBRONN, NECKAR	62030050	5501964000	BW BANK HEILBRONN	MO-DO 08.00-16.00 UHR, DO-17.30,FR-12.00 UHR	poststelle@fa-mosbach.fv.bwl.de		275
+8	2841	Pforzheim 	Moltkestr. 8	75179	Pforzheim	07231/1830	(07231)183-1111	75090			66000000	66001520	BBK KARLSRUHE	66620020	4812000000	BW BANK PFORZHEIM	MO-DO 7:30-15:30, DO bis 17:30, FR 7:30-12:00	poststelle@fa-pforzheim.fv.bwl.de		276
+8	2842	Freudenstadt 	Musbacher Str. 33	72250	Freudenstadt	07441/560	07441/561011				66000000	66001510	BBK KARLSRUHE	64251060	19565	KR SPK FREUDENSTADT	MO-MI 8.00-16.00,DO 8.00-17.30,FR 8.00-12.00	poststelle@fa-freudenstadt.fv.bwl.de		277
+8	2843	Schwetzingen 	Schloss	68723	Schwetzingen	06202/810	(06202) 81298	68721			67000000	67001501	BBK MANNHEIM	67250020	25008111	SPK HEIDELBERG	ZIA:MO-DO 7.30-15.30,MI-17.30,FR.7.30-12.00	poststelle@fa-schwetzingen.fv.bwl.de		278
+8	2844	Sinsheim 	Bahnhofstr. 27	74889	Sinsheim	07261/6960	07261/696444	74887			67000000	67001511	BBK MANNHEIM				MO-DO 7:30-15:30, MI bis 17:30, FR 7:30-12 UHR	poststelle@fa-sinsheim.fv.bwl.de		279
+8	2845	Calw 	Klosterhof 1	75365	Calw	07051/5870	07051/587111	75363			66000000	66001521	BBK KARLSRUHE	60651070	1996	SPARKASSE PFORZHEIM CALW	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.00	poststelle@fa-calw.fv.bwl.de		280
+8	2846	Walldürn 	Albert-Schneider-Str. 1	74731	Walldürn	06282/7050	06282/705101	74723	74723	1162	62000000	62001509	BBK HEILBRONN, NECKAR	67450048	8102204	SPK NECKARTAL-ODENWALD	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.00	poststelle@fa-wallduern.fv.bwl.de		281
+8	2847	Weinheim 	Weschnitzstr. 2	69469	Weinheim	06201/6050	(06201) 605-220/299 	69443	69443	100353	67000000	67001502	BBK MANNHEIM	67050505	63034444	SPK RHEIN NECKAR NORD	MO-MI 7.30-15.30 DO 7.30-17.30 FR 7.30-12	poststelle@fa-weinheim.fv.bwl.de		282
+8	2848	Mühlacker 	Konrad-Adenauer-Platz 6	75417	Mühlacker	07041/8930	07041/893999		75415	1153	66000000	660 015 22	BBK KARLSRUHE	66650085	961 000	SPARKASSE PFORZHEIM CALW	ZIA:MO-DO 8-12:30 13:30-15:30 DO bis 17:30 FR 8-12	poststelle@fa-muehlacker.fv.bwl.de		283
+8	2849	Neuenbürg 	Wildbader Str. 107	75305	Neuenbürg	07082/7990	07082/799166	75301	75301	1165	66600000	66601503	BBK PFORZHEIM	66650085	998400	SPARKASSE PFORZHEIM CALW	MO-FR 7.30-12UHR,MO-MI 13-16UHR,DO 13-18UHR	poststelle@fa-neuenbuerg.fv.bwl.de		284
+8	2850	Aalen / Württemberg 	Bleichgartenstr. 17	73431	Aalen	(07361) 9578-0	(07361)9578-440	73428			63000000	614 01500	BBK ULM, DONAU	61450050	110036902	KREISSPARKASSE OSTALB	MO-MI 7.30-16.00,DO 7.30-18.00,FR 7.30-12.00	poststelle@fa-aalen.fv.bwl.de		285
+8	2851	Backnang 	Stiftshof 20	71522	Backnang	07191/120	07191/12221	71522			60000000	60201501	BBK STUTTGART	60250010	244	KR SPK WAIBLINGEN	MO,DI,DO7.30-16.00MI7.30-18.00FR7.30-12.00	poststelle@fa-backnang.fv.bwl.de		286
+8	2852	Bad Mergentheim 	Schloss 7	97980	Bad Mergentheim	07931/5300	07931/530228	97962	97962	1233	62000000	620 01508	BBK HEILBRONN, NECKAR	67352565	25866	SPK TAUBERFRANKEN	MO-DO 7.30-15.30,MI-17.30 UHR,FR 7.30-12 UHR	poststelle@fa-badmergentheim.fv.bwl.de		287
+8	2853	Balingen 	Jakob-Beutter-Str. 4	72336	Balingen	07433/970	07433/972099	72334			64000000	653 01500	BBK REUTLINGEN	65351260	24000110	SPK ZOLLERNALB	Mo-Mi 7:45-16:00,Do 7:45-17:30,Fr 7:45-12:30	poststelle@fa-balingen.fv.bwl.de		288
+8	2854	Biberach 	Bahnhofstr. 11	88400	Biberach	07351/590	07351/59202	88396			63000000	63001508	BBK ULM, DONAU	65450070	17	KR SPK BIBERACH	MO,DI,DO 8-15.30, MI 8-17.30, FR 8-12 UHR	poststelle@fa-biberach.fv.bwl.de		289
+8	2855	Bietigheim-Bissingen 	Kronenbergstr. 13	74321	Bietigheim-Bissingen	07142/5900	07142/590199	74319			60000000	604 01501	BBK STUTTGART	60490150	427500001	VOLKSBANK LUDWIGSBURG	MO-MI(DO)7.30-15.30(17.30),FR 7.30-12.00 UHR	poststelle@fa-bietigheim-bissingen.fv.bwl.de		290
+8	2856	Böblingen 	Talstr. 46	71034	Böblingen	(07031)13-01	07031/13-3200	71003	71003	1307	60300000	603 01500	BBK STUTTGART EH SINDELFING	60350130	220	KR SPK BOEBLINGEN	MO-MI 7.30-15.30,DO7.30-17.30,FR7.30-12.30	poststelle@fa-boeblingen.fv.bwl.de		291
+8	2857	Crailsheim 	Schillerstr. 1	74564	Crailsheim	07951/4010	07951/401220	74552	74552	1252	62000000	620 01506	BBK HEILBRONN, NECKAR	62250030	282	SPARKASSE SCHWAEBISCH HALL	MO-DO:7.45-16.00,MI:-17.30,FR:7.45-12.30	poststelle@fa-crailsheim.fv.bwl.de		292
+8	2858	Ehingen 	Hehlestr. 19	89584	Ehingen	07391/5080	07391/508260	89572	89572	1251	63000000	630 01502	BBK ULM, DONAU	63050000	9 300 691	SPARKASSE ULM	Mo-Mi 7.30-15.30,Do 7.30-17.30,Fr 7.30-12.00	poststelle@fa-ehingen.fv.bwl.de		293
+8	2859	Esslingen 	Entengrabenstr. 11	73728	Esslingen	0711/39721	0711/3972400	73726			61100000	61101500	BBK STUTTGART EH ESSLINGEN	61150020	902139	KR SPK ESSLINGEN-NUERTINGEN	Infothek Mo-Mi 7-15.30,Do-17.30, Fr 7-12 Uhr	poststelle@fa-esslingen.fv.bwl.de		294
+8	2861	Friedrichshafen 	Ehlersstr. 13	88046	Friedrichshafen	07541/7060	07541/706111	88041			63000000	65001504	BBK ULM, DONAU				MO-MI 8-15.30, DO 8-17.30, FR 8-12.30 Uhr	poststelle@fa-friedrichshafen.fv.bwl.de		295
+8	2862	Geislingen 	Schillerstr. 2	73312	Geislingen	07331/220	07331/22200	73302	73302	1253	60000000	61101504	BBK STUTTGART	61050000	6007203	KR SPK GOEPPINGEN	Mo-Mi 7-15:30, Do 7-17:30,Fr 7-12	poststelle@fa-geislingen.fv.bwl.de		296
+8	2863	Göppingen 	Gartenstr. 42	73033	Göppingen	07161/63-0	07161/632935		73004	420	60000000	61101503	BBK STUTTGART	61050000	1 023	KR SPK GOEPPINGEN	MO-MI.7-15.30 Uhr,DO.7-17.30 Uhr,FR.7-12 Uhr	poststelle@fa-goeppingen.fv.bwl.de		297
+8	2864	Heidenheim 	Marienstr. 15	89518	Heidenheim	07321/380	07321/381528	89503	89503	1320	63000000	61401505	BBK ULM, DONAU	63250030	880433	KR SPK HEIDENHEIM	Mo-Mi 7.30-15.30 Do 7.30-17.30 Fr 7.30-12.30	poststelle@fa-heidenheim.fv.bwl.de		298
+8	2865	Heilbronn 	Moltkestr. 91	74076	Heilbronn	07131/1041	07131/1043000	74064			62000000	620 01500	BBK HEILBRONN, NECKAR	62050000	123925	KR SPK HEILBRONN	Mo,Di,Do7:30-15:30,Mi7:30-17:30,Fr7:30-12:00	poststelle@fa-heilbronn.fv.bwl.de		299
+8	2869	Kirchheim 	Alleenstr. 120	73230	Kirchheim	07021/5750	575258	73220	73220	1241	61100000	61101501	BBK STUTTGART EH ESSLINGEN	61150020	48317054	KR SPK ESSLINGEN-NUERTINGEN	KUNDENCENTER MO-MI 8-15.30,DO 8-17.30,FR8-12	poststelle@fa-kirchheim.fv.bwl.de		300
+8	2871	Ludwigsburg 	Alt-Württ.-Allee 40 (Neubau)	71638	Ludwigsburg	07141/180	07141/182105	71631			60000000	604 01500	BBK STUTTGART	60450050	7 759	KREISSPARKASSE LUDWIGSBURG	MO-MI 8-15.30,DO 8-18.00,FR 8-12.00	poststelle@fa-ludwigsburg.fv.bwl.de		302
+8	2874	Nürtingen 	Sigmaringer Str. 15	72622	Nürtingen	07022/7090	07022/709-120	72603	72603	1309	60000000	61101502	BBK STUTTGART				MO-Mi 7.30-15.30 Do 7.30-17.30 Fr 7.30-12.00	poststelle@fa-nuertingen.fv.bwl.de		303
+8	2876	Öhringen 	Haagweg 39	74613	Öhringen	07941/6040	07941/604400	74611			62000000	62001501	BBK HEILBRONN, NECKAR	62251550	40008	SPARKASSE HOHENLOHEKREIS	MO-DO 7.30-16.00UhrFR 7.30-12.00 Uhr	poststelle@fa-oehringen.fv.bwl.de		304
+8	2877	Ravensburg 	Broner Platz 12	88250	Weingarten	0751/4030	403-303	88248			65000000	650 015 00	BBK ULM EH RAVENSBURG	65050110	86 500 500	KR SPK RAVENSBURG	Mo,Di,Do 8-15.30Uhr,ZIA Mi 8-17.30,Fr8-12Uhr	poststelle@fa-ravensburg.fv.bwl.de		305
+8	2878	Reutlingen 	Leonhardsplatz 1	72764	Reutlingen	07121/9400	07121/9401002	72705	72705	1543	64000000	64001500	BBK REUTLINGEN	64050000	64 905	KR SPK REUTLINGEN	Mo-Mi 7-15.30, Do 7-17.30, Fr 7-12.00 Uhr	poststelle@fa-reutlingen.fv.bwl.de		306
+8	2879	Riedlingen 	Kirchstr. 30	88499	Riedlingen	07371/1870	07371/1871000	88491	88491	1164	63000000	63001509	BBK ULM, DONAU	65450070	400 600	KR SPK BIBERACH	INFOST. MO-MI 7.30-15.30,DO-17.30,FR-12 UHR	poststelle@fa-riedlingen.fv.bwl.de		307
+8	2880	Tauberbischofsheim 	Dr.-Burger-Str. 1	97941	Tauberbischofsheim	09341/8040	09341/804244	97933	97933	1340	62000000	620 01507	BBK HEILBRONN, NECKAR	67332551	8282661100	BW BANK TAUBERBISCHOFSHEIM	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.00	poststelle@fa-tauberbischofsheim.fv.bwl.de		308
+8	2881	Bad Saulgau 	Schulstr. 5	88348	Bad Saulgau	07581/504-0	07581/504499	88341	88341	1255	65000000	650 01501	BBK ULM EH RAVENSBURG	65351050	210058	LD BK KR SPK SIGMARINGEN	MO,DO,FR 8-12,DO 13.30-15.30UHR	poststelle@fa-badsaulgau.fv.bwl.de		309
+8	2882	Schorndorf 	Johann-Philipp-Palm-Str. 28	73614	Schorndorf	07181/6010	07181/601499	73603	73603	1320	60000000	60201502	BBK STUTTGART	60250010	5014008	KR SPK WAIBLINGEN	MO,DI,DO 8-15.30,MI 8-17.30,FR 8-12.00	poststelle@fa-schorndorf.fv.bwl.de		310
+8	2883	Schwäbisch Gmünd 	Augustinerstr. 6	73525	Schwäbisch Gmünd	(07171) 602-0	07171/602266	73522			63000000	61401501	BBK ULM, DONAU	61450050	440066604	KREISSPARKASSE OSTALB	MO,DI,DO 8-15.30 MI 8-17.30 FR 8-12.00 UHR	poststelle@fa-schwaebischgmuend.fv.bwl.de		311
+8	2884	Schwäbisch Hall 	Bahnhofstr. 25	74523	Schwäbisch Hall	0791/752-0	0791/7521115	74502	74502	100260	62000000	62001503	BBK HEILBRONN, NECKAR	62250030	5070 011	SPARKASSE SCHWAEBISCH HALL	MO-MI 7.30-16.00 DO 7.30-17.30 FR 7.30-12.00	poststelle@fa-schwaebischhall.fv.bwl.de		312
+8	2885	Sigmaringen 	Karlstr. 31	72488	Sigmaringen	07571/1010	07571/101300	72481	72481	1250	65300000	653 01501	BBK REUTLINGEN EH ALBSTADT	65351050	808 408	LD BK KR SPK SIGMARINGEN	MO-MI 7.45-15.30,DO 7.45-17.30,FR 7.45-12.00	poststelle@fa-sigmaringen.fv.bwl.de		313
+8	2886	Tübingen 	Steinlachallee 6 - 8	72072	Tübingen	07071/7570	07071/7574500	72005	72005	1520	64000000	64001505	BBK REUTLINGEN				Mo-Do 7.30-15.30,Mi -17.30,Fr 7.30-13.00 Uhr	poststelle@fa-tuebingen.fv.bwl.de		314
+8	2887	Überlingen (Bodensee) 	Mühlenstr. 28	88662	Überlingen	07551/8360	07551/836299	88660			69400000	69001501	BBK VILLINGEN-SCHWENNINGEN	69220020	6426155500	BW BANK SINGEN	Mo-Mi 8.00-15.30,Do 8.00-17.30,Fr 8.00-12.00	poststelle@fa-ueberlingen.fv.bwl.de		315
+8	2888	Ulm 	Wagnerstr. 2	89077	Ulm	0731/1030	0731/103800		89008	1860	63000000	63001500	BBK ULM, DONAU	63050000	30001	SPARKASSE ULM	MO-MI 7.30-15.30,DO 7.30-17.30,FR 7.30-12.00	poststelle@fa-ulm.fv.bwl.de		316
+8	2889	Bad Urach 	Graf-Eberhard-Platz 7	72574	Bad Urach	07125/1580	(07125)158-300	72562	72562	1149	64000000	640 01501	BBK REUTLINGEN	64050000	300 346	KR SPK REUTLINGEN	MO-MI 7.30-15.30 DO 7.30-17.30 FR 7.30-12.00	poststelle@fa-badurach.fv.bwl.de		317
+8	2890	Waiblingen 	Fronackerstr. 77	71332	Waiblingen	07151/9550	07151/955200	71328			60000000	602 01500	BBK STUTTGART	60250010	200 398	KR SPK WAIBLINGEN	INFOTHEK MO-DO 7.30-15.30,MI-17.30,FR-12.00	poststelle@fa-waiblingen.fv.bwl.de		318
+8	2891	Wangen 	Lindauer Str.37	88239	Wangen	07522/710	07522(714000)	88228	88228	1262	63000000	650 01502	BBK ULM, DONAU	65050110	218 153	KR SPK RAVENSBURG	MO-MI 8-15.30, DO 8-17.30, FR 8-12 UHR	poststelle@fa-wangen.fv.bwl.de		319
+8	2892	Stuttgart IV 	Seidenstr.23	70174	Stuttgart	0711/66730	0711/66736060	70049	70049	106052	60000000	600 01503	BBK STUTTGART	60050101	2 065 854	LANDESBANK BADEN-WUERTT	MO,MI,FR 8-12,MI 13.30-16 UHR	poststelle@fa-stuttgart4.fv.bwl.de		320
+8	2893	Stuttgart I 	Rotebühlplatz 30	70173	Stuttgart	0711/66730	6673 - 5010	70049	70049	106055	60000000	600 01503	BBK STUTTGART	60050101	2 065 854	LANDESBANK BADEN-WUERTT	Mo,Die,Do: 8-15.30, Mi: 8-17.30, Fr: 8-12.00	poststelle@fa-stuttgart1.fv.bwl.de		321
+8	2895	Stuttgart II 	Rotebühlstr. 40	70178	Stuttgart	0711/66730	0711/66735610				60000000	60001503	BBK STUTTGART	60050101	2065854	LANDESBANK BADEN-WUERTT	MO-DO:8-15.30 FR:8-12 MI:15.30-17.30	poststelle@fa-stuttgart2.fv.bwl.de		322
+8	2896	Stuttgart Zentrales Konzernprüfungsamt	Hackstr. 86	70190	Stuttgart	0711/9251-6	0711/9251706											poststelle@zbp-stuttgart.fv.bwl.de		323
+8	2897	Stuttgart III 	Rotebühlplatz 30	70173	Stuttgart	0711/66730	0711/66735710		70049	106053	60000000	600 01503	BBK STUTTGART	60050101	2 065 854	LANDESBANK BADEN-WUERTT	Mo-Do:8-15.30 Mi:8-17.30 Fr:8-12.00 Uhr	poststelle@fa-stuttgart3.fv.bwl.de		324
+8	2899	Stuttgart-Körpersch. 	Paulinenstr. 44	70178	Stuttgart	0711/66730	0711/66736525	70049	70049	106051	60000000	600 01503	BBK STUTTGART	60050101	2 065 854	LANDESBANK BADEN-WUERTT	MO-FR 8:00-12:00, MO-DO 13:00-15:30 Uhr	poststelle@fa-stuttgart-koerperschaften.fv.bwl.de		325
+12	3046	Potsdam-Stadt 	Am Bürohochhaus 2	14478	Potsdam	0331 287-0	0331 287-1515		14429	80 03 22	16000000	16001501	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Potsdam-Stadt@fa.brandenburg.de		326
+12	3047	Potsdam-Land 	Steinstr. 104 - 106	14480	Potsdam	0331 6469-0	0331 6469-200		14437	90 01 45	16000000	16001502	BBK POTSDAM				täglich außer Mi: 08:00-12:30 Uhr, zusätzlich Di: 14:00-17:00 Uhr	poststelle.FA-Potsdam-Land@fa.brandenburg.de		327
+12	3048	Brandenburg 	Magdeburger Straße 46	14770	Brandenburg	03381 397-100	03381 397-200				16000000	16001503	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Brandenburg@fa.brandenburg.de		328
+12	3049	Königs Wusterhausen 	Weg am Kreisgericht 9	15711	Königs Wusterhausen	03375 275-0	03375 275-103				16000000	16001505	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Koenigs-Wusterhausen@fa.brandenburg.de		329
+12	3050	Luckenwalde 	Industriestraße 2	14943	Luckenwalde	03371 606-0	03371 606-200				16000000	16001504	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Luckenwalde@fa.brandenburg.de		330
+12	3051	Nauen 	Ketziner Straße 3	14641	Nauen	03321 412-0	03321 412-888		14631	11 61	16000000	16001509	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Nauen@fa.brandenburg.de		331
+12	3052	Kyritz 	Perleberger Straße 1 - 2	16866	Kyritz	033971 65-0	033971 65-200				16000000	16001507	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Kyritz@fa.brandenburg.de		332
+12	3053	Oranienburg 	Heinrich-Grüber-Platz 3	16515	Oranienburg	03301 857-0	03301 857-334				16000000	16001508	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Oranienburg@fa.brandenburg.de		333
+12	3054	Pritzwalk 	Freyensteiner Chaussee 10	16928	Pritzwalk	03395 757-0	03395 302110				16000000	16001506	BBK POTSDAM				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Pritzwalk@fa.brandenburg.de		334
+12	3056	Cottbus 	Vom-Stein-Straße 29	3050	Cottbus	0355 4991-4100	0355 4991-4150		3004	10 04 53	18000000	18001501	BBK COTTBUS				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Cottbus@fa.brandenburg.de		335
+12	3057	Calau 	Springteichallee 25	3205	Calau	03541 83-0	03541 83-100		3201	11 71	18000000	18001502	BBK COTTBUS				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Calau@fa.brandenburg.de		336
+12	3058	Finsterwalde 	Leipziger Straße 61 - 67	3238	Finsterwalde	03531 54-0	03531 54-180		3231	11 50	18000000	18001503	BBK COTTBUS				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Finsterwalde@fa.brandenburg.de		337
+12	3061	Frankfurt (Oder) 	Müllroser Chaussee 53	15236	Frankfurt (Oder)	0335 560-1399	0335 560-1202				17000000	17001502	BBK FRANKFURT (ODER)				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Frankfurt-Oder@fa.brandenburg.de		338
+12	3062	Angermünde 	Jahnstraße 49	16278	Angermünde	03331 267-0	03331 267-200				17000000	17001500	BBK FRANKFURT (ODER)				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Angermuende@fa.brandenburg.de		339
+12	3063	Fürstenwalde 	Beeskower Chaussee 12	15517	Fürstenwalde	03361 595-0	03361 2198				17000000	17001503	BBK FRANKFURT (ODER)				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Fuerstenwalde@fa.brandenburg.de		340
+12	3064	Strausberg 	Prötzeler Chaussee 12 A	15344	Strausberg	03341 342-0	03341 342-127				17000000	17001504	BBK FRANKFURT (ODER)				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Strausberg@fa.brandenburg.de		341
+12	3065	Eberswalde 	Tramper Chaussee 5	16225	Eberswalde	03334 66-2000	03334 66-2001				17000000	17001501	BBK FRANKFURT (ODER)				Mo, Mi, Do: 08:00-15:00 Uhr, Di: 08:00-17:00 Uhr, Fr: 08:00-13:30 Uhr	poststelle.FA-Eberswalde@fa.brandenburg.de		342
+15	3101	Magdeburg I 	Tessenowstraße 10	39114	Magdeburg	0391 885-29	0391 885-1400		39014	39 62	81000000	810 015 06	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-md1.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	343
+15	3102	Magdeburg II 	Tessenowstraße 6	39114	Magdeburg	0391 885-12	0391 885-1000		39006	16 63	81000000	810 015 07	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-md2.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	344
+15	3103	Genthin 	Berliner Chaussee 29 b	39307	Genthin	03933 908-0	03933 908-499		39302	13 41	81000000	810 015 08	BBK MAGDEBURG				Mo., Di., Do., Fr.: 09.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-gtn.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	345
+15	3104	Halberstadt 	R.-Wagner-Straße 51	38820	Halberstadt	03941 33-0	03941 33-199		38805	15 26	81000000	268 015 01	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-hbs.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	346
+15	3105	Haldensleben 	Jungfernstieg 37	39340	Haldensleben	03904 482-0	03904 482-200		39332	10 02 09	81000000	810 015 10	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-hdl.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	347
+15	3106	Salzwedel 	Buchenallee 2	29410	Salzwedel	03901 857-0	03901 857-100		29403	21 51	81000000	810 015 05	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-saw.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	348
+15	3107	Staßfurt 	Atzendorfer Straße 20	39418	Staßfurt	03925 980-0	03925 980-101		39404	13 55	81000000	810 015 12	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.30 - 18.00 Uhr	poststelle@fa-sft.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	349
+15	3108	Stendal 	Scharnhorststraße 87	39576	Stendal	03931 57-1000	03931 57-2000		39551	10 11 31	81000000	810 015 13	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-sdl.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	350
+15	3109	Wernigerode 	Gustav-Petri-Straße 14	38855	Wernigerode	03943 657-0	03943 657-150		38842	10 12 51	81000000	268 015 03	BBK MAGDEBURG				Mo., Di., Do., Fr.: 09.00 - 12.00 Uhr, Do.: 14.00 - 18.00 Uhr	poststelle@fa-wrg.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	351
+15	3110	Halle-Süd 	Blücherstraße 1	6122	Halle	0345 6923-5	0345 6923-600	6103			80000000	800 015 02	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr, Do.: 14.00	poststelle@fa-ha-s.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	352
+15	3111	Halle-Nord 	Blücherstraße 1	6122	Halle	0345 6924-0	0345 6924-400	6103			80000000	800 015 01	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr, Do.: 14.00	poststelle@fa-ha-n.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	353
+15	3112	Merseburg 	Bahnhofstraße 10	6217	Merseburg	03461 282-0	03461 282-199		6203	13 51	80000000	800 015 09	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-msb.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	354
+15	3113	Bitterfeld 	Röhrenstraße 33	6749	Bitterfeld	03493 347-0	03493 347-247		6732	12 64	80000000	805 015 05	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-btf.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	355
+15	3114	Dessau 	Kühnauer Straße 166	6846	Dessau	0340 6513-0	0340 6513-403		6815	18 25	80000000	805 015 26	BBK HALLE				Mo. - Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-des.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	356
+15	3115	Wittenberg 	Dresdener Straße 40	6886	Wittenberg	03491 430-0	03491 430-113		6872	10 02 54	80000000	805 015 07	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-wbg.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	357
+15	3116	Köthen 	Zeppelinstraße 15	6366	Köthen	03496 44-0	03496 44-2900		6354	14 52	80000000	805 015 06	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr	poststelle@fa-kot.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	358
+15	3117	Quedlinburg 	Adelheidstraße 2	6484	Quedlinburg	03946 976-0	03946 976-400		6472	14 20	81000000	268 015 02	BBK MAGDEBURG				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 17.30 Uhr	poststelle@fa-qlb.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	359
+15	3118	Eisleben 	Bahnhofsring 10 a	6295	Eisleben	03475 725-0	03475 725-109	6291			80000000	800 015 08	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-eil.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	360
+15	3119	Naumburg 	Oststraße 26/26 a	6618	Naumburg	03445 753-0	03445 753-999		6602	12 51	80000000	800 015 27	BBK HALLE				Mo., Di., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 13.00 - 18.00 Uhr	poststelle@fa-nbg.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	361
+15	3120	Zeitz 	Friedensstraße 80	6712	Zeitz	03441 864-0	03441 864-480		6692	12 08	80000000	800 015 04	BBK HALLE				Mo., Do., Fr.: 08.00 - 12.00 Uhr, Di.: 08.00 - 18.00 Uhr	poststelle@fa-ztz.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	362
+15	3121	Sangerhausen 	Alte Promenade 27	6526	Sangerhausen	03464 539-0	03464 539-539		6512	10 12 24	80000000	800 015 25	BBK HALLE				Di., Do., Fr.: 09.00 - 12.00 Uhr, Di.: 14.00 - 18.00 Uhr, Do.: 14.00 -	poststelle@fa-sgh.ofd.mf.lsa-net.de	http://www.finanzamt.sachsen-anhalt.de	363
+14	3201	Dresden I 	Lauensteiner Str. 37	1277	Dresden	0351 2567-0	0351 2567-111	1264			85000000	85001502	BBK DRESDEN				Mo 8:00-15:00, Di 8:00-18:00, Mi 8:00-15:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-dresden1.smf.sachsen.de	http://www.Finanzamt-Dresden-I.de	364
+14	3202	Dresden II 	Gutzkowstraße 10	1069	Dresden	0351 4655-0	0351 4655-269	1056			85000000	85001503	BBK DRESDEN				Mo - Fr 8:00-12:00 Uhr, Di 14:00-18:00, Do 14:00-18:00 Uhr	poststelle@fa-dresden2.smf.sachsen.de	http://www.Finanzamt-Dresden-II.de	365
+14	3203	Dresden III 	Rabenerstr.1	1069	Dresden	0351 4691-0	0351 4717 369		1007	120641	85000000	85001504	BBK DRESDEN				Mo 8:00-15:00, Di 8:00-18:00, Mi 8:00-15:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-dresden3.smf.sachsen.de	http://www.Finanzamt-Dresden-III.de	366
+14	3204	Bautzen 	Wendischer Graben 3	2625	Bautzen	03591 488-0	03591 488-888	2621			85000000	85001505	BBK DRESDEN				Mo 8:00-15:30, Di 8:00-17:00, Mi 8:00-15:30, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-bautzen.smf.sachsen.de	http://www.Finanzamt-Bautzen.de	367
+5	5384	Münster f. Steuerfahndung und Steuerstrafsachen	Hohenzollernring 80	48145	Münster	0251/9370-0	0800 10092675384				40000000	40001501	BBK MUENSTER, WESTF	40050150	95031001	SPK MUENSTERLAND OST		Service@FA-5384.fin-nrw.de		368
+14	3205	Bischofswerda 	Kirchstraße 25	1877	Bischofswerda	03594 754-0	03594 754-444		1871	1111	85000000	85001506	BBK DRESDEN				Mo 8:00-15:30, Di 8:00-17:00, Mi 8:00-15:30, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-bischofswerda.smf.sachsen.de	http://www.Finanzamt-Bischofswerda.de	369
+14	3206	Freital 	Coschützer Straße 8-10	1705	Freital	0351 6478-0	0351 6478-428		1691	1560	85000000	85001507	BBK DRESDEN				Mo 8:00-15:00, Di 8:00-18:00, Mi 8:00-15:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-freital.smf.sachsen.de	http://www.Finanzamt-Freital.de	370
+14	3207	Görlitz 	Sonnenstraße 7	2826	Görlitz	03581 875-0	03581 875-100		2807	300235	85000000	85001512	BBK DRESDEN				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00, Fr 8:00-12:00 Uhr	poststelle@fa-goerlitz.smf.sachsen.de	http://www.Finanzamt-Goerlitz.de	371
+14	3208	Löbau 	Georgewitzer Str.40	2708	Löbau	03585 455-0	03585 455-100		2701	1165	85000000	85001509	BBK DRESDEN				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00, Fr 8:00-12:00 Uhr	poststelle@fa-loebau.smf.sachsen.de	http://www.Finanzamt-Loebau.de	372
+14	3209	Meißen 	Hermann-Grafe-Str.30	1662	Meißen	03521 745-30	03521 745-450		1651	100151	85000000	85001508	BBK DRESDEN				Mo - Fr 8:00-12:00 Uhr Di 13:00-18:00, Do 13:00-17:00 Uhr	poststelle@fa-meissen.smf.sachsen.de	http://www.Finanzamt-Meissen.de	373
+14	3210	Pirna 	Emil-Schlegel-Str. 11	1796	Pirna	03501 551-0	03501 551-201		1781	100143	85000000	85001510	BBK DRESDEN				Mo - Fr 8:00-12:00 Uhr, Di 13:30-18:00, Do 13:30-17:00 Uhr	poststelle@fa-pirna.smf.sachsen.de	http://www.Finanzamt-Pirna.de	374
+14	3211	Riesa 	Stahlwerkerstr.3	1591	Riesa	03525 714-0	03525 714-133		1571	24	85000000	85001511	BBK DRESDEN				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00 , Fr 8:00-12:00 Uhr	poststelle@fa-riesa.smf.sachsen.de	http://www.Finanzamt-Riesa.de	375
+14	3213	Hoyerswerda 	Pforzheimer Platz 1	2977	Hoyerswerda	03571 460-0	03571 460-115		2961	1161/1162 	85000000	85001527	BBK DRESDEN				Mo 7:30-15:30, Di 7:30-17:00, Mi 7:30-13:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-hoyerswerda.smf.sachsen.de	http://www.Finanzamt-Hoyerswerda.de	376
+14	3214	Chemnitz-Süd 	Paul-Bertz-Str. 1	9120	Chemnitz	0371 279-0	0371 227065	9097			87000000	87001501	BBK CHEMNITZ				Mo 8:00-16:00, Di 8:00-18:00, Mi 8:00-13:00, Do 8:00-18:00, Fr 8:00-13:00 Uhr	poststelle@fa-chemnitz-sued.smf.sachsen.de	http://www.Finanzamt-Chemnitz-Sued.de	377
+14	3215	Chemnitz-Mitte 	August-Bebel-Str. 11/13	9113	Chemnitz	0371 467-0	0371 415830	9097			87000000	87001502	BBK CHEMNITZ				Mo 8:00-16:00, Di 8:00-18:00, Mi 8:00-14:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-chemnitz-mitte.smf.sachsen.de	http://www.Finanzamt-Chemnitz-Mitte.de	378
+14	3216	Chemnitz-Land 	Reichenhainer Str. 31-33	9126	Chemnitz	0371 5360-0	0371 5360-317	9097			87000000	87001503	BBK CHEMNITZ				täglich 8:00-12:00, Di 13:30-17.00, Do 13:30-18:00 Uhr	poststelle@fa-chemnitz-land.smf.sachsen.de	http://www.Finanzamt-Chemnitz-Land.de	379
+14	3217	Annaberg 	Magazingasse 16	9456	Annaberg-B.	03733 4270	03733 427-217		9453	100631	87000000	87001504	BBK CHEMNITZ				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00, Fr 8:00-12:00 Uhr	poststelle@fa-annaberg.smf.sachsen.de	http://www.Finanzamt-Annaberg.de	380
+14	3218	Schwarzenberg 	Karlsbader Str.23	8340	Schwarzenberg	03774 161-0	03774 161-100		8332	1209	87000000	87001505	BBK CHEMNITZ				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00, Fr 8:00-12:00 Uhr	poststelle@fa-schwarzenberg.smf.sachsen.de	http://www.Finanzamt-Schwarzenberg.de	381
+14	3219	Auerbach 	Schulstraße 3, Haus 1	8209	Auerbach	03744 824-0	03744 824-200		8202	10132	87000000	87001506	BBK CHEMNITZ				Mo 7:30-15:30, Di 7:30-18:00, Mi 7:30-12:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-aucherbach.smf.sachsen.de	http://www.Finanzamt-Auerbach.de	382
+14	3220	Freiberg 	Brückenstr.1	9599	Freiberg	03731 379-0	03731 379-999	9596			87000000	87001507	BBK CHEMNITZ				Mo - Fr 7:30-12:30, Mo 13:30-15:30, Di 13:00-18:00, Mi 13:30-15:30, Do 13:00-17:00 Uhr	poststelle@fa-freiberg.smf.sachsen.de	http://www.Finanzamt-Freiberg.de	383
+14	3221	Hohenstein-Ernstthal 	Schulstraße 34	9337	Hohenstein-E.	03723 745-0	03723 745-399		9332	1246	87000000	87001510	BBK CHEMNITZ				Mo - Fr 8:00-12:00, Mo 12:30-15:30, Di 12:30-18:00, Do 12:30-17:00	poststelle@fa-hohenstein-ernstthal.smf.sachsen.de	http://www.Finanzamt-Hohenstein-Ernstthal.de	384
+14	3222	Mittweida 	Robert-Koch-Str. 17	9648	Mittweida	03727 987-0	03727 987-333		9641	1157	87000000	87001509	BBK CHEMNITZ				Mo 7:30-15:00, Di 7:30-18:00, Mi 7:30-13:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-mittweida.smf.sachsen.de	http://www.Finanzamt-Mittweida.de	385
+14	3223	Plauen 	Europaratstraße 17	8523	Plauen	03741 10-0	03741 10-2000		8507	100384	87000000	87001512	BBK CHEMNITZ				Mo 7:30-14:00, Di 7:30-18:00, Mi 7:30-14:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-plauen.smf.sachsen.de	http://www.Finanzamt-Plauen.de	386
+14	3224	Stollberg 	HOHENSTEINER STRASSE 54	9366	Stollberg	037296 522-0	037296 522-199		9361	1107	87000000	87001508	BBK CHEMNITZ				Mo 7:30-15:30, Di 7:30-17:00, Mi 7:30-13:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-stollberg.smf.sachsen.de	http://www.Finanzamt-Stollberg.de	387
+14	3226	Zwickau-Stadt 	Dr.-Friedrichs-Ring 21	8056	Zwickau	0375 3529-0	0375 3529-444		8070	100452	87000000	87001513	BBK CHEMNITZ				Mo 7:30-15:30, Di 7:30-18:00, Mi 7:30-12:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-zwickau-stadt.smf.sachsen.de	http://www.Finanzamt-Zwickau-Stadt.de	388
+14	3227	Zwickau-Land 	Äußere Schneeberger Str. 62	8056	Zwickau	0375 4440-0	0375 4440-222		8067	100150	87000000	87001514	BBK CHEMNITZ				Mo 8:00-15:30, Di 8:00-18:00, Mi 8:00-15:30, Do 8:00-17:00, Fr 8:00-12:00 Uhr	poststelle@fa-zwickau-land.smf.sachsen.de	http://www.Finanzamt-Zwickau-Land.de	389
+14	3228	Zschopau 	August-Bebel-Str.17	9405	Zschopau	03725 293-0	03725 293-111		9402	58	87000000	87001515	BBK CHEMNITZ				Mo7:30-12:00/13:00-16:30,Di 7:30-12:00/13:00-18:00Mi u. Fr 7:30-13:00, Do 7:30-12:00/13:00-18:00 Uhr	poststelle@fa-zschopau.smf.sachsen.de	http://www.Finanzamt-Zschopau.de	390
+14	3230	Leipzig I 	Wilhelm-Liebknecht-Platz 3/4	4105	Leipzig	0341 559-0	0341 559-1540		4001	100105	86000000	86001501	BBK LEIPZIG				Mo 7:30-14:00, Di 7:30-18:00, Mi 7:30-14:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-leipzig1.smf.sachsen.de	http://www.Finanzamt-Leipzig-I.de	391
+14	3231	Leipzig II 	Erich-Weinert-Str. 20	4105	Leipzig	0341 559-0	0341 559-2505		4001	100145	86000000	86001502	BBK LEIPZIG				Mo 7:30-14:00, Di 7:30-18:00, Mi 7:30-14:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-leipzig2.smf.sachsen.de	http://www.Finanzamt-Leipzig-II.de	392
+14	3232	Leipzig III 	Wilhelm-Liebknecht-Platz 3/4	4105	Leipzig	0341 559-0	0341 559-3640		4002	100226	86000000	86001503	BBK LEIPZIG				Mo 7:30-14:00, Di 7:30-18:00, Mi 7:30-14:00, Do 7:30-18:00, Fr 7:30-12:00 Uhr	poststelle@fa-leipzig3.smf.sachsen.de	http://www.Finanzamt-Leipzig-III.de	393
+14	3235	Borna 	Brauhausstr.8	4552	Borna	03433 872-0	03433 872-255		4541	1325	86000000	86001509	BBK LEIPZIG				Mo 8:00-15:00, Di 8:00-18:00, Mi 8:00-15:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-borna.smf.sachsen.de	http://www.Finanzamt-Borna.de	394
+14	3236	Döbeln 	Burgstr.31	4720	Döbeln	03431 653-30	03431 653-444		4713	2346	86000000	86001507	BBK LEIPZIG				Mo 7:30-15:30, Di 7:30-18:00, Mi 7:30-13:00, Do 7:30-17:00, Fr 7:30-12:00 Uhr	poststelle@fa-doebeln.smf.sachsen.de	http://www.Finanzamt-Doebeln.de	395
+14	3237	Eilenburg 	Walther-Rathenau-Straße 8	4838	Eilenburg	03423 660-0	03423 660-460		4831	1133	86000000	86001506	BBK LEIPZIG				Mo 8:00-16:00, Di 8:00-18:00, Mi 8:00-14:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-eilenburg.smf.sachsen.de	http://www.Finanzamt-Eilenburg.de	396
+14	3238	Grimma 	Lausicker Straße 2	4668	Grimma	03437 940-0	03437 940-500		4661	1126	86000000	86001508	BBK LEIPZIG				Mo 7:30-15:00, Di 7:30-18:00, Mi 7:30-13:30, Do 7:30-17:00, Fr 7:30-12:00 Uhr	poststelle@fa-grimma.smf.sachsen.de	http://www.Finanzamt-Grimma.de	397
+14	3239	Oschatz 	Dresdener Str.77	4758	Oschatz	03435 978-0	03435 978-366		4752	1265	86000000	86001511	BBK LEIPZIG				Mo 8:00-16:00, Di 8:00-17:00, Mi 8:00-15:00, Do 8:00-18:00, Fr 8:00-12:00 Uhr	poststelle@fa-oschatz.smf.sachsen.de	http://www.Finanzamt-Oschatz.de	398
+13	4071	Malchin 	Schratweg 33	17139	Malchin	03994/6340	03994/634322		17131	1101	15000000	15001511	BBK NEUBRANDENBURG				Mo Di Fr 08-12 Uhr Di 13-17 Uhr und Do 13-16 UhrMittwoch geschlossen	poststelle@fa-mc.ofd-hro.de		399
+13	4072	Neubrandenburg 	Neustrelitzer Str. 120	17033	Neubrandenburg	0395/380 1000	0395/3801059		17041	110164	15000000	15001518	BBK NEUBRANDENBURG				Mo Di Do Fr 08-12 Uhr und Di 13.00-17.30 Uhr Mittwoch geschlossen	poststelle@fa-nb.ofd-hro.de		400
+13	4074	Pasewalk 	Torgelower Str. 32	17309	Pasewalk	(03973) 224-0	03973/2241199		17301	1102	15000000	15001512	BBK NEUBRANDENBURG				Mo bis Fr 09.00-12.00 Uhr Di 14.00-18.00 Uhr	poststelle@fa-pw.ofd-hro.de		401
+13	4075	Waren 	Einsteinstr. 15	17192	Waren (Müritz)	03991/1740	(03991)174499		17183	3154	15000000	15001515	BBK NEUBRANDENBURG				Mo-Mi 08.00-16.00 Uhr Do 08.00-18.00 Uhr Fr 08.-13.00 Uhr	poststelle@fa-wrn.ofd-hro.de		402
+13	4079	Rostock 	Möllner Str. 13	18109	Rostock	(0381)7000-0	(0381)7000444		18071	201062	13000000	13001508	BBK ROSTOCK				Mo Di Fr 8.30-12.00 Di 13.30-17.00 Do 13.30-16.00	poststelle@fa-hro.ofd-hro.de		403
+13	4080	Wismar 	Philosophenweg 1	23970	Wismar	03841444-0	03841/444222				14000000	14001516	BBK SCHWERIN				Mo Di Fr 08.00-12.00 Uhr Di Do 14.00-17.00 Uhr Mittwoch geschlossen	poststelle@fa-wis.ofd-hro.de		404
+13	4081	Ribnitz-Damgarten 	Sandhufe 3	18311	Ribnitz-Damgarten	(03821)884-0	(03821)884140		18301	1061	13000000	13001510	BBK ROSTOCK				MO Di Mi DO 08.30-12.00 UHR DI 13.00-17.00 UHR Freitag geschlossen	poststelle@fa-rdg.ofd-hro.de		405
+13	4082	Stralsund 	Lindenstraße 136	18435	Stralsund	03831/3660	(03831)366245 / 188 		18409	2241	13000000	13001513	BBK ROSTOCK				Mo Di Do Fr 08.00-12.00 Uhr Di 14.00 - 18.00 UhrMittwoch geschlossen	poststelle@fa-hst.ofd-hro.de		406
+13	4083	Bergen 	Wasserstr. 15 d	18528	Bergen (Rügen)	03838/4000	03838/22217	18522	18522	1242	13000000	13001512	BBK ROSTOCK				Mo Di Do Fr 8.30-12.00 Di 13.00-18.00 Mittwoch geschlossen	poststelle@fa-brg.ofd-hro.de		407
+13	4084	Greifswald 	Am Gorzberg Haus 11	17489	Greifswald	03834/5590	03834-559315/316	17462	17462	3254	15000000	15001528	BBK NEUBRANDENBURG				Mo Di Do Fr 8.30-12.00 Uhr Di 13.00-17.30 Uhr Mittwoch geschlossen	poststelle@fa-hgw.ofd-hro.de		408
+13	4085	Wolgast 	Pestalozzistr. 45	17438	Wolgast	03836/254-0	03836/254300 /254100		17431	1139	15000000	15001529	BBK NEUBRANDENBURG				Mo Di Mi Do Fr 08.00-12.00 Uhr	poststelle@fa-wlg.ofd-hro.de		409
+13	4086	Güstrow 	Klosterhof 1	18273	Güstrow	03843/2620	03843/262111	18271			13000000	13001501	BBK ROSTOCK				Mo-Do 09.00-12.00 Uhr Do 13.00-18.00 Uhr Freitag geschlossen	poststelle@fa-gue.ofd-hro.de		410
+13	4087	Hagenow 	Steegener Chaussee 8	19230	Hagenow	03883/6700	03883 670216 /670217		19222	1242	14000000	14001504	BBK SCHWERIN				Mo Di Do Fr 08.30-12.00 Di 13.00-17.30 Mittwoch geschlossen	poststelle@fa-hgn.ofd-hro.de		411
+13	4089	Parchim 	Ludwigsluster Chaussee 5	19370	Parchim	03871/4650	03871/443131		19363	1351	14000000	14001506	BBK SCHWERIN				Mo Di Mi 08.30-15.00 Uhr Do 08.30-18.00 Uhr Fr 08.30-13.00 Uhr	poststelle@fa-pch.ofd-hro.de		412
+13	4090	Schwerin 	Johannes-Stelling-Str.9-11	19053	Schwerin	0385/54000	0385/5400300		19091	160131	14000000	14001502	BBK SCHWERIN				 Di Do Fr 08.30 - 12.00 Uhr Mo 13.00 - 16.00 Uhr Do 14.00	poststelle@fa-sn.ofd-hro.de		413
+16	4151	Erfurt 	Mittelhäuser Str. 64f	99091	Erfurt	(0361)378-00	0361/3782800		99001	100121	82050000	3001111586	LD BK HESS-THUER GZ ERFURT				DI. 8- 12/ 13.30 -18 MI./FR. 8 - 12 UHR	poststelle@finanzamt-erfurt.thueringen.de		414
+16	4152	Sömmerda 	Uhlandstrasse 3	99610	Sömmerda	03634/363-0	03634/363200		99609	100	82050000	3001111628	LD BK HESS-THUER GZ ERFURT				MO/MI/DO 8-16 UHR DI 8-18,FR 8-12 UHR	poststelle@finanzamt-soemmerda.thueringen.de		415
+16	4153	Weimar 	Jenaer Str.2a	99425	Weimar	03643/5500	(03643)903811		99421	3676	82050000	3001111586	LD BK HESS-THUER GZ ERFURT				MO,MI,DO 8-15.30 UHR DI 8-18,FR 8-12 UHR	poststelle@finanzamt-weimar.thueringen.de		416
+16	4154	Ilmenau 	Wallgraben 1	98693	Ilmenau	(03677) 861-0	03677/861111		98686	100754	82050000	3001111685	LD BK HESS-THUER GZ ERFURT				MO,MI 8-15.30 UHR, DI 8-18 UHR DO 8-16 UHR, FR 8-12 UHR	poststelle@finanzamt-ilmenau.thueringen.de		417
+16	4155	Eisenach 	Ernst-Thaelmann-Str. 70	99817	Eisenach	03691/687-0	03691/687250		99804	101454	82050000	3001111586	LD BK HESS-THUER GZ ERFURT				MO-FR: 8-12 UHR, MO-MI: 13-16 UHR, DO: 13-18 UHR	poststelle@finanzamt-eisenach.thueringen.de		418
+16	4156	Gotha 	Reuterstr. 2a	99867	Gotha	(03621)33-0	03621/332000		99853	100301	82050000	3001111586	LD BK HESS-THUER GZ ERFURT				MO - MI 8-15.30 UHR DO 8-18,FR 8-12 UHR	poststelle@finanzamt-gotha.thueringen.de		419
+16	4157	Mühlhausen 	Martinistr. 22	99974	Mühlhausen	(03601)456-0	03601/456100		99961	1155	82050000	3001111628	LD BK HESS-THUER GZ ERFURT				MO/MI/DO 7.30-15 UHR DI.7.30-18,FR.7.30-12	poststelle@finanzamt-muehlhausen.thueringen.de		420
+16	4158	Nordhausen 	Gerhart-Hauptmann-Str. 3	99734	Nordhausen	03631/427-0	03631/427174		99729	1120	82050000	3001111628	LD BK HESS-THUER GZ ERFURT				MO,DI,MI 8-12, 13.30-16 UHR DO 8-12,14-18 FR 8-12 UHR	poststelle@finanzamt-nordhausen.thueringen.de		421
+16	4159	Sondershausen 	Schillerstraße 6	99706	Sondershausen	(03632)742-0	03632/742555		99702	1265	82050000	3001111628	LD BK HESS-THUER GZ ERFURT				MO/MI/DO 8-15.30 UHR DI 8-18, FR 8-12 UHR	poststelle@finanzamt-sondershausen.thueringen.de		422
+16	4160	Worbis 	Bahnhofstr. 18	37339	Worbis	036074/37-0	036074/37219		37334	173	82050000	3001111628	LD BK HESS-THUER GZ ERFURT				MO-MI 7.30-15 UHR DO 7.30-18,FR 7.30-12	poststelle@finanzamt-worbis.thueringen.de		423
+16	4161	Gera 	Hermann-Drechsler-Str.1	7548	Gera	0365/639-0	0365/6391491		7490	3044	82050000	3001111578	LD BK HESS-THUER GZ ERFURT				MO,MI 7.30-15 DI,DO 7.30- 18 UHR FR 7.30-12 UHR	poststelle@finanzamt-gera.thueringen.de		424
+16	4162	Jena 	Leutragraben 8	7743	Jena	(03641)378-0	03641/378653		7740	500	82050000	3001111602	LD BK HESS-THUER GZ ERFURT				MO-MI 8-15.30 DO 8-18 FR 8-12.00UHR	poststelle@finanzamt-jena.thueringen.de		425
+16	4163	Rudolstadt 	Mörlaer Str. 2	7407	Rudolstadt	(03672)443-0	(03672)443100		7391	100155	82050000	3001111578	LD BK HESS-THUER GZ ERFURT				MO-MI 7.30-12, 13-15 DO 7.30-12, 13-18 UHR FR 7.30-12 UHR	poststelle@finanzamt-rudolstadt.thueringen.de		426
+16	4164	Greiz 	Rosa-Luxemburg-Str. 23	7973	Greiz	03661/700-0	03661/700300		7962	1365	82050000	3001111578	LD BK HESS-THUER GZ ERFURT				MO/DI/MI 8-16UHR DO 8-18,FR 8-12UHR	poststelle@finanzamt-greiz.thueringen.de		427
+16	4165	Pößneck 	Gerberstr. 65	7381	Pößneck	(03647)446-0	(03647)446430		7372	1253	82050000	3001111578	LD BK HESS-THUER GZ ERFURT				MO-FR 8-12 MO,MI,DO 13-15 UHR DI 13-18 UHR	poststelle@finanzamt-poessneck.thueringen.de		428
+16	4166	Altenburg 	Wenzelstr. 45	4600	Altenburg	03447/593-0	03447/593200		4582	1251	82050000	3001111511	LD BK HESS-THUER GZ ERFURT				MO,MI,DO 7.30-15.30 DI 7.30-18 UHR FR 7.30-12 UHR	poststelle@finanzamt-altenburg.thueringen.de		429
+16	4168	Bad Salzungen 	August-Bebel-Str.2	36433	Bad Salzungen	(03695)668-0	03695/622496		36421	1153	82050000	3001111586	LD BK HESS-THUER GZ ERFURT				MO-MI 7.30-15 UHR DO 7.30-18,FR 7.30-12	poststelle@finanzamt-badsalzungen.thueringen.de		430
+16	4169	Meiningen 	Charlottenstr. 2	98617	Meiningen	03693/461-0	(03693)461322		98606	100661	82050000	3001111610	LD BK HESS-THUER GZ ERFURT				MO-MI 7.30-15 UHR DO 7.30-18,FR 7.30-12	poststelle@finanzamt-meiningen.thueringen.de		431
+16	4170	Sonneberg 	Köppelsdorfer Str.86	96515	Sonneberg	03675/884-0	03675/884254		96502	100241	82050000	3001111685	LD BK HESS-THUER GZ ERFURT				MO-MI 7.30-15.00 UHR DO 7.30-18 FR 7.30-12	poststelle@finanzamt-sonneberg.thueringen.de		432
+16	4171	Suhl 	Karl-Liebknecht-Str. 4	98527	Suhl	03681/73-0	03681/733512		98490	100153	82050000	3001111685	LD BK HESS-THUER GZ ERFURT				MO - MI 8-16 UHR, DO 8-13 u. 14-18 UHR , FR 8-12 UHR	poststelle@finanzamt-suhl.thueringen.de		433
+5	5101	Dinslaken 	Schillerstr. 71	46535	Dinslaken	02064/445-0	0800 10092675101		46522	100220	35000000	35201501	BBK DUISBURG	35251000	100123	SPK DINSLAKEN-VOERDE-HUENXE	Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5101.fin-nrw.de	www.finanzamt-Dinslaken.de	434
+5	5102	Viersen 	Eindhovener Str. 71	41751	Viersen	02162/955-0	0800 10092675102		41726	110263	31000000	31001503	BBK MOENCHENGLADBACH	32050000	59203406	SPARKASSE KREFELD	Mo-Fr 8:30 bis 12:00 Uhr,Di auch 13:30 bis 15:00 Uhr,und nach Vereinbarung	Service@FA-5102.fin-nrw.de	www.finanzamt-Viersen.de	435
+5	5103	Düsseldorf-Altstadt 	Kaiserstr. 52	40479	Düsseldorf	0211/4974-0	0800 10092675103		40001	101021	30000000	30001504	BBK DUESSELDORF	30050110	10124006	ST SPK DUESSELDORF	Mo-Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5103.fin-nrw.de	www.finanzamt-Duesseldorf-Altstadt.de	436
+5	5105	Düsseldorf-Nord 	Roßstr. 68	40476	Düsseldorf	0211/4496-0	0800 10092675105		40403	300314	30000000	30001501	BBK DUESSELDORF	30050110	10124501	ST SPK DUESSELDORF	Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5105.fin-nrw.de	www.finanzamt-Duesseldorf-Nord.de	437
+5	5106	Düsseldorf-Süd 	Kruppstr.110- 112	40227	Düsseldorf	0211/779-9	0800 10092675106		40001	101025	30000000	30001502	BBK DUESSELDORF	30050110	10125003	ST SPK DUESSELDORF	Mo-Fr 8.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5106.fin-nrw.de	www.finanzamt-Duesseldorf-Sued.de	438
+5	5107	Duisburg-Hamborn 	Hufstr. 25	47166	Duisburg	0203/5445-0	0800 10092675107		47142	110264	35000000	35001502	BBK DUISBURG				Mo-Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5107.fin-nrw.de	www.finanzamt-Duisburg-Hamborn.de	439
+5	5109	Duisburg-Süd 	Landfermannstr 25	47051	Duisburg	0203/3001-0	0800 10092675109		47015	101502	35000000	35001500	BBK DUISBURG	35050000	200403020	SPK DUISBURG	Mo-Fr 08:30 Uhr - 12:00 Uhr,Di auch 13:30 Uhr - 15:00 Uhr	Service@FA-5109.fin-nrw.de	www.finanzamt-Duisburg-Sued.de	440
+5	5110	Essen-Nord 	Altendorfer Str. 129	45143	Essen	0201/1894-0	0800 10092675110		45011	101155	36000000	36001500	BBK ESSEN	36050105	275008	SPARKASSE ESSEN	Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5110.fin-nrw.de	www.finanzamt-Essen-Nord.de	441
+5	5111	Essen-Ost 	Altendorfer Str. 129	45143	Essen	0201/1894-0	0800 10092675111	45116	45012	101262	36000000	36001501	BBK ESSEN	36050105	261800	SPARKASSE ESSEN	Mo-Fr,Di	Service@FA-5111.fin-nrw.de	www.finanzamt-Essen-Ost.de	442
+5	5112	Essen-Süd 	Altendorfer Str. 129	45143	Essen	0201/1894-0	0800 10092675112		45011	101145	36000000	36001502	BBK ESSEN	36050105	203000	SPARKASSE ESSEN	Mo-Fr 08.30-12.00 Uhr, Di auch 13.30-15.00 Uhr, und nach Vereinbarung	Service@FA-5112.fin-nrw.de	www.finanzamt-Essen-Sued.de	443
+5	5113	Geldern 	Gelderstr 32	47608	Geldern	02831/127-0	0800 10092675113		47591	1163	32000000	32001502	BBK MOENCHENGLADBACH EH KRE	32051370	112011	SPARKASSE GELDERN	Montag - Freitag 8:30 - 12:00,Uhr,Dienstag auch 13:00 - 15:00 U,hr und nach Vereinbarung	Service@FA-5113.fin-nrw.de	www.finanzamt-Geldern.de	444
+5	5114	Grevenbroich 	Erckensstr. 2	41515	Grevenbroich	02181/607-0	0800 10092675114		41486	100264	30000000	30001507	BBK DUESSELDORF	30550000	101683	SPARKASSE NEUSS	Mo-Fr 8:30-12:00 Uhr,Di auch 13:30-15:00 Uhr,und nach Vereinbarung	Service@FA-5114.fin-nrw.de	www.finanzamt-Grevenbroich.de	445
+5	5115	Kempen 	Arnoldstr 13	47906	Kempen	02152/919-0	0800 10092675115		47880	100329	31000000	32001501	BBK MOENCHENGLADBACH				MO.-DO. 8.30-12.00 UHR,FREITAGS GESCHLOSSEN	Service@FA-5115.fin-nrw.de	www.finanzamt-Kempen.de	446
+5	5116	Kleve 	Emmericher Str. 182	47533	Kleve	02821/803-1	0800 10092675116		47512	1251	35000000	32401501	BBK DUISBURG	32450000	5013628	SPARKASSE KLEVE	Mo - Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr	Service@FA-5116.fin-nrw.de	www.finanzamt-Kleve.de	447
+5	5117	Krefeld 	Grenzstr 100	47799	Krefeld	02151/854-0	0800 10092675117		47706	100665	31000000	32001500	BBK MOENCHENGLADBACH				Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5117.fin-nrw.de	www.finanzamt-Krefeld.de	448
+5	5119	Moers 	Unterwallstr 1	47441	Moers	02841/208-0	0800 10092675119	47439	47405	101520	35000000	35001505	BBK DUISBURG	35450000	1101000121	SPARKASSE MOERS	Montag-Freitag von 8.30-12.00,Dienstag von 13.30-15.00	Service@FA-5119.fin-nrw.de	www.finanzamt-Moers.de	449
+5	5120	Mülheim an der Ruhr 	Wilhelmstr 7	45468	Mülheim an der Ruhr	0208/3001-1	0800 10092675120		45405	100551	36000000	36201500	BBK ESSEN	36250000	300007007	SPK MUELHEIM AN DER RUHR	Mo-Fr,Di auch 13:30-15:00 Uhr,und nach Vereinbarung	Service@FA-5120.fin-nrw.de	www.finanzamt-Muelheim-Ruhr.de	450
+5	5121	Mönchengladbach-Mitte 	Kleiststr. 1	41061	Mönchengladbach	02161/189-0	0800 10092675121		41008	100813	31000000	31001500	BBK MOENCHENGLADBACH	31050000	8888	ST SPK MOENCHENGLADBACH	Mo - Fr,Di auch,und nach Vereinbarung	Service@FA-5121.fin-nrw.de	www.finanzamt-Moenchengladbach-Mitte.de	451
+5	5122	Neuss II 	Hammfelddamm 9	41460	Neuss	02131/6656-0	0800 10092675122		41405	100502	30000000	30001509	BBK DUESSELDORF	30550000	123000	SPARKASSE NEUSS	Mo,Di,Do,Fr von 8.30-12.00,Di von 13.30-15.00	Service@FA-5122.fin-nrw.de	www.finanzamt-Neuss2.de	452
+5	5206	Bonn-Außenstadt 	Bachstr. 36	53115	Bonn	0228/7268-0	0800 10092675206		53005	1580	38000000	38001501	BBK BONN	38050000	22004	SPARKASSE BONN	Mo-Do,Do auch 13:30 bis 17:30 Uhr,Freitags geschlossen	Service@FA-5206.fin-nrw.de	www.finanzamt-Bonn-Aussenstadt.de	453
+5	5123	Oberhausen-Nord 	Gymnasialstr. 16	46145	Oberhausen	0208/6499-0	0800 10092675123		46122	110220	36000000	36501501	BBK ESSEN	36550000	260125	ST SPK OBERHAUSEN	Mo-Fr 08:30-12:00 Uhr,Di auch 13:30-15:00 Uhr,und nach Vereinbarung	Service@FA-5123.fin-nrw.de	www.finanzamt-Oberhausen-Nord.de	454
+5	5124	Oberhausen-Süd 	Schwartzstr. 7-9	46045	Oberhausen	0208/8504-0	0800 10092675124		46004	100447	36000000	36501500	BBK ESSEN	36550000	138156	ST SPK OBERHAUSEN	Mo - Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5124.fin-nrw.de	www.finanzamt-Oberhausen-Sued.de	455
+5	5125	Neuss I 	Schillerstr 80	41464	Neuss	02131/943-0	0800 10092675125	41456	41405	100501	30000000	30001508	BBK DUESSELDORF	30550000	129999	SPARKASSE NEUSS	Mo-Fr 08.30-12.00 Uhr,Mo auch 13.30-15.00 Uhr	Service@FA-5125.fin-nrw.de	www.finanzamt-Neuss1.de	456
+5	5126	Remscheid 	Wupperstr 10	42897	Remscheid	02191/961-0	0800 10092675126		42862	110269	33000000	33001505	BBK WUPPERTAL	34050000	113001	ST SPK REMSCHEID	Mo-Fr 08.30-12.00Uhr,Di auch 13.30-15.00Uhr,und nach Vereinbarung	Service@FA-5126.fin-nrw.de	www.finanzamt-Remscheid.de	457
+5	5127	Mönchengladbach-Rheydt 	Wilhelm-Strauß-Str. 50	41236	Mönchengladbach	02166/450-0	0800 10092675127		41204	200442	31000000	31001502	BBK MOENCHENGLADBACH	31050000	295600	ST SPK MOENCHENGLADBACH	MO - FR 08.30 - 12.00 Uhr,DI auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5127.fin-nrw.de	www.finanzamt-Moenchengladbach-Rheydt.de	458
+5	5128	Solingen-Ost 	Goerdelerstr.24- 26	42651	Solingen	0212/282-1	0800 10092675128	42648	42609	100984	33000000	33001503	BBK WUPPERTAL	34250000	22707	ST SPK SOLINGEN	Mo.-Fr.,Mo. auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5128.fin-nrw.de	www.finanzamt-Solingen-Ost.de	459
+5	5129	Solingen-West 	Merscheider Busch 23	42699	Solingen	0212/2351-0	0800 10092675129		42663	110340	33000000	33001501	BBK WUPPERTAL	34250000	130005	ST SPK SOLINGEN	MO-FR 08.30 - 12.00 Uhr,und nach Vereinbarung	Service@FA-5129.fin-nrw.de	www.finanzamt-Solingen-West.de	460
+5	5130	Wesel 	Poppelbaumstr. 5-7	46483	Wesel	0281/105-0	0800 10092675130		46461	100136	35000000	35601500	BBK DUISBURG	35650000	208660	VERB SPK WESEL	Mo-Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5130.fin-nrw.de	www.finanzamt-Wesel.de	461
+5	5131	Wuppertal-Barmen 	Unterdörnen 96	42283	Wuppertal	0202/9543-0	0800 10092675131	42271	42208	200853	33000000	33001502	BBK WUPPERTAL				Mo - Fr,Do auch,und nach Vereinbarung	Service@FA-5131.fin-nrw.de	www.finanzamt-Wuppertal-Barmen.de	462
+5	5132	Wuppertal-Elberfeld 	Kasinostr. 12	42103	Wuppertal	0202/489-0	0800 10092675132		42002	100209	33000000	33001500	BBK WUPPERTAL				Mo-Fr 08.30-12.00 Uhr,Do auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5132.fin-nrw.de	www.finanzamt-Wuppertal-Elberfeld.de	463
+5	5133	Düsseldorf-Mitte 	Kruppstr. 110	40227	Düsseldorf	0211/779-9	0800 10092675133		40001	101024	30000000	30001505	BBK DUESSELDORF	30050110	10123008	ST SPK DUESSELDORF		Service@FA-5133.fin-nrw.de	www.finanzamt-Duesseldorf-Mitte.de	464
+5	5134	Duisburg-West 	Friedrich-Ebert-Str 133	47226	Duisburg	02065/307-0	0800 10092675134		47203	141355	35000000	35001503	BBK DUISBURG				Mo - Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5134.fin-nrw.de	www.finanzamt-Duisburg-West.de	465
+5	5135	Hilden 	Neustr. 60	40721	Hilden	02103/917-0	0800 10092675135		40710	101046	30000000	30001506	BBK DUESSELDORF				Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5135.fin-nrw.de	www.finanzamt-Hilden.de	466
+5	5139	Velbert 	Nedderstraße 38	42549	Velbert	02051/47-0	0800 10092675139		42513	101310	33000000	33001504	BBK WUPPERTAL	33450000	26205500	SPARKASSE HRV	Mo-Fr 08.30-12.00 Uhr,Mo auch 13.30-15.00 Uhr	Service@FA-5139.fin-nrw.de	www.finanzamt-Velbert.de	467
+5	5147	Düsseldorf-Mettmann 	Harkortstr. 2-4	40210	Düsseldorf	0211/3804-0	0800 10092675147		40001	101023	30000000	30001500	BBK DUESSELDORF	30050000	4051017	WESTLB DUESSELDORF	Montag bis Freitag,08.30 bis 12.00 Uhr,und nach Vereinbarung	Service@FA-5147.fin-nrw.de	www.finanzamt-Duesseldorf-Mettmann.de	468
+5	5149	Rechenzentrum d. FinVew NRW 	Roßstraße 131	40476	Düsseldorf	0211/4572-0	0211/4572-302		40408	300864								Service@FA-5149.fin-nrw.de		469
+5	5170	Düsseldorf I für Groß- und Konzernbetriebsprüfung	Werftstr. 16	40549	Düsseldorf	0211/56354-01	0800 10092675170		40525	270264								Service@FA-5170.fin-nrw.de		470
+5	5171	Düsseldorf II für Groß- und Konzernbetriebsprüfung	Werftstr. 16	40549	Düsseldorf	0211/56354-0	0800 10092675171		40525	270264								Service@FA-5171.fin-nrw.de		471
+5	5172	Essen für Groß- und Konzernbetriebsprüfung	In der Hagenbeck 64	45143	Essen	0201/6300-1	0800 10092675172		45011	101155								Service@FA-5172.fin-nrw.de		472
+5	5173	Krefeld für Groß- und Konzernbetriebsprüfung	Steinstr. 137	47798	Krefeld	02151/8418-0	0800 10092675173											Service@FA-5173.fin-nrw.de		473
+5	5174	Berg. Land für Groß- und Konzernbetriebsprüfung	Bendahler Str. 29	42285	Wuppertal	0202/2832-0	0800 10092675174	42271										Service@FA-5174.fin-nrw.de		474
+5	5176	Mönchengladbach für Groß- und  Konzernbetriebsprüfung	Aachener Str. 114	41061	Mönchengladbach	02161/3535-0	0800 10092675176		41017	101715								Service@FA-5176.fin-nrw.de		475
+5	5181	Düsseldorf f. Steuerfahndung und Steuerstrafsachen	Kruppstr.110 -112	40227	Düsseldorf	0211/779-9	0800 10092675181		40001	101024	30000000	30001502	BBK DUESSELDORF	30050110	10125003	ST SPK DUESSELDORF	Mo - Di 07.30 - 16.30 Uhr,Mi - Fr 07.30 - 16.00 Uhr	Service@FA-5181.fin-nrw.de		476
+5	5182	Essen f. Steuerfahndung und Steuerstrafsachen	In der Hagenbeck 64	45143	Essen	0201/6300-1	0800 10092675182		45011	101155	36000000	36001502	BBK ESSEN	36050105	203000	SPARKASSE ESSEN		Service@FA-5182.fin-nrw.de		477
+5	5183	Wuppertal f. Steuerfahndung und Steuerstrafsachen	Unterdörnen 96	42283	Wuppertal	0202/9543-0	0800 10092675183		42205	200553	33000000	33001502	BBK WUPPERTAL	33050000	135004	ST SPK WUPPERTAL		Service@FA-5183.fin-nrw.de		478
+5	5201	Aachen-Innenstadt 	Mozartstr 2-10	52064	Aachen	0241/469-0	0800 10092675201		52018	101833	39000000	39001501	BBK AACHEN	39050000	26	SPARKASSE AACHEN	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 -15.00 Uhr,und nach Vereinbarung	Service@FA-5201.fin-nrw.de	www.finanzamt-Aachen-Innenstadt.de	479
+5	5202	Aachen-Kreis 	Beverstr 17	52066	Aachen	0241/940-0	0800 10092675202		52018	101829	39000000	39001500	BBK AACHEN	39050000	311118	SPARKASSE AACHEN	Mo.-Fr. 08.30 - 12.00 Uhr,Mo.,und nach Vereinbarung	Service@FA-5202.fin-nrw.de	www.finanzamt-Aachen-Kreis.de	480
+5	5203	Bergheim 	Rathausstrasse 3	50126	Bergheim	02271/82-0	0800 10092675203		50101	1120	39500000	39501501	BBK AACHEN EH DUEREN				Mo-Fr 08:30-12:00 Uhr,Di 13:30-15:00 Uhr,und nach Vereinbarung	Service@FA-5203.fin-nrw.de	www.finanzamt-Bergheim.de	481
+5	5204	Bergisch Gladbach 	Refrather Weg 35	51469	Bergisch Gladbach	02202/9342-0	0800 10092675204		51433	200380	37000000	37001508	BBK KOELN				Mo.-Fr. 8.30-12.00 Uhr	Service@FA-5204.fin-nrw.de	www.finanzamt-Bergisch-Gladbach.de	482
+5	5205	Bonn-Innenstadt 	Welschnonnenstr. 15	53111	Bonn	0228/718-0	0800 10092675205		53031	180120	38000000	38001500	BBK BONN	38050000	17079	SPARKASSE BONN	Mo-Mi 08.30-12.00 Uhr,Do 07.00-17.00 Uhr,Freitag geschlossen	Service@FA-5205.fin-nrw.de	www.finanzamt-Bonn-Innenstadt.de	483
+5	5207	Düren 	Goethestrasse 7	52349	Düren	02421/947-0	0800 10092675207		52306	100646	39500000	39501500	BBK AACHEN EH DUEREN	39550110	188300	SPARKASSE DUEREN	Mo-Fr 08:30 - 12:00 Uhr,Di auch 13:30 - 15:00 Uhr,und nach Vereinbarung	Service@FA-5207.fin-nrw.de	www.finanzamt-Dueren.de	484
+5	5208	Erkelenz 	Südpromenade 37	41812	Erkelenz	02431/801-0	0800 10092675208		41806	1651	31000000	31001501	BBK MOENCHENGLADBACH	31251220	402800	KR SPK HEINSBERG ERKELENZ	Mo - Fr 8.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5208.fin-nrw.de	www.finanzamt-Erkelenz.de	485
+5	5209	Euskirchen 	Thomas-Mann-Str. 2	53879	Euskirchen	02251/982-0	0800 10092675209		53864	1487	38000000	38001505	BBK BONN	38250110	1000330	KREISSPARKASSE EUSKIRCHEN	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5209.fin-nrw.de	www.finanzamt-Euskirchen.de	486
+5	5210	Geilenkirchen 	H.-Wilh.-Str 45	52511	Geilenkirchen	02451/623-0	0800 10092675210		52501	1193	39000000	39001502	BBK AACHEN	31251220	5397	KR SPK HEINSBERG ERKELENZ	Mo.-Fr. 8.30 - 12.00 Uhr,nachmittags nur tel. von,13.30 - 15.00 Uhr	Service@FA-5210.fin-nrw.de	www.finanzamt-Geilenkirchen.de	487
+5	5211	Schleiden 	Kurhausstr. 7	53937	Schleiden	02444/85-0	0800 10092675211		53929	1140	38000000	38001506	BBK BONN	38250110	3200235	KREISSPARKASSE EUSKIRCHEN	Mo-Fr 08.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,sowie nach Vereinbarung	Service@FA-5211.fin-nrw.de	www.finanzamt-Schleiden.de	488
+5	5212	Gummersbach 	Mühlenbergweg 5	51645	Gummersbach	02261/86-0	0800 10092675212	51641			37000000	37001506	BBK KOELN				Mo - Fr 08.30-12.00 Uhr,Mo auch 13.30-15.00 Uhr	Service@FA-5212.fin-nrw.de	www.finanzamt-Gummersbach.de	489
+5	5213	Jülich 	Wilhelmstr 5	52428	Jülich	02461/685-0	0800 10092675213		52403	2180	39000000	39701500	BBK AACHEN	39550110	25023	SPARKASSE DUEREN	Mo.-Fr. 08.00-12.00 Uhr,Di. 13.30-15.00 Uhr	Service@FA-5213.fin-nrw.de	www.finanzamt-Juelich.de	490
+5	5214	Köln-Altstadt 	Am Weidenbach 2-4	50676	Köln	0221/2026-0	0800 10092675214		50517	250140	37000000	37001501	BBK KOELN	37050198	70052964	STADTSPARKASSE KOELN	Mo - Fr 8.30 - 12.00 Uhr,Di auch 13.00 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5214.fin-nrw.de	www.finanzamt-Koeln-Altstadt.de	491
+5	5215	Köln-Mitte 	Blaubach 7	50676	Köln	0221/92400-0	0800 10092675215		50524	290208	37000000	37001505	BBK KOELN	37050198	70062963	STADTSPARKASSE KOELN	MO-FR 08.30 - 12.00 UHR	Service@FA-5215.fin-nrw.de	www.finanzamt-Koeln-Mitte.de	492
+5	5216	Köln-Porz 	Klingerstr. 2-6	51143	Köln	02203/598-0	0800 10092675216		51114	900469	37000000	37001524	BBK KOELN				Mo-Fr08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5216.fin-nrw.de	www.finanzamt-Koeln-Porz.de	493
+5	5217	Köln-Nord 	Innere Kanalstr. 214	50670	Köln	0221/97344-0	0800 10092675217		50495	130164	37000000	37001502	BBK KOELN	37050198	70102967	STADTSPARKASSE KOELN	Mo - Fr 8.30 - 12.00 Uhr,und nach Vereinbarung	Service@FA-5217.fin-nrw.de	www.finanzamt-Koeln-Nord.de	494
+5	5218	Köln-Ost 	Siegesstrasse 1	50679	Köln	0221/9805-0	0800 10092675218		50529	210340	37000000	37001503	BBK KOELN	37050198	70082961	STADTSPARKASSE KOELN	Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5218.fin-nrw.de	www.finanzamt-Koeln-Ost.de	495
+5	5219	Köln-Süd 	Am Weidenbach 6	50676	Köln	0221/2026-0	0800 10092675219		50517	250160	37000000	37001504	BBK KOELN	37050198	70032966	STADTSPARKASSE KOELN	Mo-Fr,Di auch 13.00-15.00 Uhr	Service@FA-5219.fin-nrw.de	www.finanzamt-Koeln-Sued.de	496
+5	5220	Siegburg 	Mühlenstr 19	53721	Siegburg	02241/105-0	0800 10092675220		53703	1351	38000000	38001503	BBK BONN				Mo.-Fr. 08.30-12.00 Uhr,Mo. auch 13.30-17.00 Uhr,und nach Vereinbarung	Service@FA-5220.fin-nrw.de	www.finanzamt-Siegburg.de	497
+5	5221	Wipperfürth 	Am Stauweiher 3	51688	Wipperfürth	02267/870-0	0800 10092675221		51676	1240	37000000	37001513	BBK KOELN				Mo-Fr 08.30-12.00 Uhr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5221.fin-nrw.de	www.finanzamt-Wipperfuerth.de	498
+5	5222	Sankt Augustin 	Hubert-Minz-Str 10	53757	Sankt Augustin	02241/242-1	0800 10092675222		53730	1229	38000000	38001504	BBK BONN				Mo - Fr 8.30-12.00 Uhr,Di auch 13.30-15.00 Uhr	Service@FA-5222.fin-nrw.de	www.finanzamt-Sankt-Augustin.de	499
+5	5223	Köln-West 	Haselbergstr 20	50931	Köln	0221/5734-0	0800 10092675223		50864	410469	37000000	37001523	BBK KOELN	37050198	70022967	STADTSPARKASSE KOELN		Service@FA-5223.fin-nrw.de	www.finanzamt-Koeln-West.de	500
+5	5224	Brühl 	Kölnstr. 104	50321	Brühl	02232/703-0	0800 10092675224	50319			37000000	37001507	BBK KOELN				Mo-Fr 08.30 - 12.00,Die zusätzlich 13.30 - 15.00 ,und nach Vereinbarung	Service@FA-5224.fin-nrw.de	www.finanzamt-Bruehl.de	501
+5	5225	Aachen-Außenstadt 	Beverstraße	52066	Aachen	0241/940-0	0800 10092675225		52018	101825	39000000	39001503	BBK AACHEN	39050000	1099	SPARKASSE AACHEN	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5225.fin-nrw.de	www.finanzamt-Aachen-Aussenstadt.de	502
+5	5230	Leverkusen 	Haus-Vorster-Str 12	51379	Leverkusen	02171/407-0	0800 10092675230	51367			37000000	37001511	BBK KOELN	37551440	118318500	SPARKASSE LEVERKUSEN	Mo-Do 8.30 - 12.00 Uhr,Di.: 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5230.fin-nrw.de	www.finanzamt-Leverkusen.de	503
+5	5270	KonzBP Köln für Groß- und Konzernbetriebsprüfung	Riehler Platz 2	50668	Köln	0221/2021-0	0800 10092675270											Service@FA-5270.fin-nrw.de		504
+5	5271	Aachen für Groß- und Konzernbetriebsprüfung	Beverstr. 17	52066	Aachen	0241/940-0	0800 10092675271		52017	101744								Service@FA-5271.fin-nrw.de		505
+5	5272	Bonn für Groß- und Konzernbetriebsprüfung	Am Propsthof 17	53121	Bonn	0228/7223-0	0800 10092675272											Service@FA-5272.fin-nrw.de		506
+5	5281	Aachen f. Steuerfahndung und Steuerstrafsachen	Beverstr 17	52066	Aachen	0241/940-0	0800 10092675281		52017	101722	39000000	39001500	BBK AACHEN	39050000	311118	SPARKASSE AACHEN		Service@FA-5281.fin-nrw.de		507
+5	5282	Bonn f. Steuerfahndung und Steuerstrafsachen	Theaterstr. 1	53111	Bonn	0228/718-0	0800 10092675282				38000000	38001500	BBK BONN	38050000	17079	SPARKASSE BONN		Service@FA-5282.fin-nrw.de		508
+5	5283	Köln f. Steuerfahndung und Steuerstrafsachen	Am Gleisdreieck 7- 9	50823	Köln	0221/5772-0	0800 10092675283		50774	300451	37000000	37001502	BBK KOELN	37050198	70102967	STADTSPARKASSE KOELN		Service@FA-5283.fin-nrw.de		509
+5	5301	Ahaus 	Vredener Dyk 2	48683	Ahaus	02561/929-0	0800 10092675301		48662	1251	40000000	40001503	BBK MUENSTER, WESTF	40154530	51027902	SPARKASSE WESTMUENSTERLAND	Mo - Fr 08.30 - 12.00 Uhr,zudem Mo 13.30 - 15.00 Uhr,sowie Do 13.30 -	Service@FA-5301.fin-nrw.de	www.finanzamt-Ahaus.de	510
+5	5302	Altena 	Winkelsen 11	58762	Altena	02352/917-0	0800 10092675302		58742	1253	45000000	45001501	BBK HAGEN	45851020	80020001	VER SPK PLETTENBERG	Mo,Di-Do,und nach Vereinbarung	Service@FA-5302.fin-nrw.de	www.finanzamt-Altena.de	511
+5	5303	Arnsberg 	Rumbecker Straße 36	59821	Arnsberg	02931/875-0	0800 10092675303	59818	59802	5245	41000000	46401501	BBK HAMM, WESTF	46650005	1020007	SPK ARNSBERG-SUNDERN	Mo-Mi 08.30 - 12.00 Uhr,Fr,und nach Vereinbarung	Service@FA-5303.fin-nrw.de	www.finanzamt-Arnsberg.de	512
+5	5304	Beckum 	Elisabethstraße 19	59269	Beckum	02521/25-0	0800 10092675304	59267	59244	1452	41000000	41001501	BBK HAMM, WESTF	41250035	1000223	SPK BECKUM-WADERSLOH	MO-FR 08.30-12.00 UHR,MO AUCH 13.30-15.00 UHR,UND NACH VEREINBARUNG	Service@FA-5304.fin-nrw.de	www.finanzamt-Beckum.de	513
+5	5305	Bielefeld-Innenstadt 	Ravensberger Straße 90	33607	Bielefeld	0521/548-0	0800 10092675305		33503	100371	48000000	48001500	BBK BIELEFELD	48050161	109	SPK BIELEFELD	Mo - Fr 8.30 - 12.00 Uhr,Di auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5305.fin-nrw.de	www.finanzamt-Bielefeld-Innenstadt.de	514
+5	5306	Bochum-Mitte 	Castroper Str. 40 - 42	44791	Bochum	0234/514-0	0800 10092675306		44707	100729	43000000	43001500	BBK BOCHUM	43050001	1300011	SPARKASSE BOCHUM	Mo-Fr 08:30 - 12:00 Uhr,Di auch 13:30 - 15:00 Uhr,Individuelle Terminver-,einbarungen sind möglich	Service@FA-5306.fin-nrw.de	www.finanzamt-Bochum-Mitte.de	515
+5	5307	Borken 	Nordring 184	46325	Borken	02861/938-0	0800 10092675307	46322	46302	1240	40000000	40001514	BBK MUENSTER, WESTF	40154530	51021137	SPARKASSE WESTMUENSTERLAND	Mo-Fr 8.30 - 12.00 Uhr,Mo 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5307.fin-nrw.de	www.finanzamt-Borken.de	516
+5	5308	Bottrop 	Scharnhölzstraße 32	46236	Bottrop	02041/691-0	0800 10092675308		46205	100553	43000000	42401501	BBK BOCHUM	42451220	10009	SPK BOTTROP	Mo-Mi 08.00-12.00 Uhr,Do 07.30-12.00 u 13.30-15.00 ,Freitags geschlossen	Service@FA-5308.fin-nrw.de	www.finanzamt-Bottrop.de	517
+5	5309	Brilon 	Steinweg 30	59929	Brilon	02961/788-0	0800 10092675309		59915	1260	48000000	47201502	BBK BIELEFELD	41651770	17004	SPK HOCHSAUERLAND BRILON	Mo - Fr 08:30 - 12:00 Uhr,Di auch 13:30 - 15:00 Uhr,und nach Vereinbarung	Service@FA-5309.fin-nrw.de	www.finanzamt-Brilon.de	518
+5	5310	Bünde 	Lettow-Vorbeck-Str 2-10	32257	Bünde	05223/169-0	0800 10092675310		32216	1649	48000000	48001502	BBK BIELEFELD	49450120	210003000	SPARKASSE HERFORD		Service@FA-5310.fin-nrw.de	www.finanzamt-Buende.de	519
+5	5311	Steinfurt 	Ochtruper Straße 2	48565	Steinfurt	02551/17-0	0800 10092675311	48563	48542	1260	40000000	40301500	BBK MUENSTER, WESTF				Mo-Fr 08.00-12.00 Uhr,Mo auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5311.fin-nrw.de	www.finanzamt-Steinfurt.de	520
+5	5312	Coesfeld 	Friedrich-Ebert-Str. 8	48653	Coesfeld	02541/732-0	0800 10092675312		48633	1344	40000000	40001505	BBK MUENSTER, WESTF	40154530	59001644	SPARKASSE WESTMUENSTERLAND	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5312.fin-nrw.de	www.finanzamt-Coesfeld.de	521
+5	5313	Detmold 	Wotanstraße 8	32756	Detmold	05231/972-0	0800 10092675313	32754	32706	1664	48000000	48001504	BBK BIELEFELD	47650130	4002	SPK DETMOLD	Mo. bis Fr.,Montags,und nach Vereinbarung	Service@FA-5313.fin-nrw.de	www.finanzamt-Detmold.de	522
+5	5314	Dortmund-West 	Märkische Straße 124	44141	Dortmund	0231/9581-0	0800 10092675314		44047	105041	44000000	44001500	BBK DORTMUND	44050199	301001886	SPARKASSE DORTMUND	Montags geschlossen,Di - Fr 8.30 - 12.00,Do zusätzlich 13.30 - 15.00	Service@FA-5314.fin-nrw.de	www.finanzamt-Dortmund-West.de	523
+5	5315	Dortmund-Hörde 	Niederhofener Str 3	44263	Dortmund	0231/4103-0	0800 10092675315		44232	300255	44000000	44001503	BBK DORTMUND	44050199	21003468	SPARKASSE DORTMUND	Mo-Do 8.30-12.00 Uhr,und nach Vereinbarung	Service@FA-5315.fin-nrw.de	www.finanzamt-Dortmund-Hoerde.de	524
+5	5316	Dortmund-Unna 	Rennweg 1	44143	Dortmund	0231/5188-1	0800 10092675316		44047	105020	44000000	44001501	BBK DORTMUND	44050199	1060600	SPARKASSE DORTMUND	Mo-Fr 08.30-12.00 Uhr,und nach Vereinbarung	Service@FA-5316.fin-nrw.de	www.finanzamt-Dortmund-Unna.de	525
+5	5317	Dortmund-Ost 	Nußbaumweg 210	44143	Dortmund	0231/5188-1	0800 10092675317		44047	105039	44000000	44001502	BBK DORTMUND	44050199	301001827	SPARKASSE DORTMUND	Mo - Fr 8.30 - 12.00 Uhr,und nach Vereinbarung	Service@FA-5317.fin-nrw.de	www.finanzamt-Dortmund-Ost.de	526
+5	5318	Gelsenkirchen-Nord 	Rathausplatz 1	45894	Gelsenkirchen	0209/368-1	0800 10092675318		45838	200351	43000000	42001501	BBK BOCHUM	42050001	160012007	SPARKASSE GELSENKIRCHEN	Mo-Fr 08.30-12.00 Uhr,Mo auch 13.30-15.00Uhr	Service@FA-5318.fin-nrw.de	www.finanzamt-Gelsenkirchen-Nord.de	527
+5	5319	Gelsenkirchen-Süd 	Zeppelinallee 9-13	45879	Gelsenkirchen	0209/173-1	0800 10092675319		45807	100753	43000000	42001500	BBK BOCHUM	42050001	101050003	SPARKASSE GELSENKIRCHEN	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr	Service@FA-5319.fin-nrw.de	www.finanzamt-Gelsenkirchen-Sued.de	528
+5	5320	Gladbeck 	Jovyplatz 4	45964	Gladbeck	02043/270-1	0800 10092675320		45952	240	43000000	42401500	BBK BOCHUM	42450040	91	ST SPK GLADBECK	MO-FR 08.30-12.00 UHR,DO AUCH 13.30-15.00 UHR,UND NACH VEREINBARUNG	Service@FA-5320.fin-nrw.de	www.finanzamt-Gladbeck.de	529
+5	5321	Hagen 	Schürmannstraße 7	58097	Hagen	02331/180-0	0800 10092675321		58041	4145	45000000	45001500	BBK HAGEN	45050001	100001580	SPARKASSE HAGEN	Mo-Fr,Mo auch 13.30-15.00 Uhr	Service@FA-5321.fin-nrw.de	www.finanzamt-Hagen.de	530
+5	5322	Hamm 	Grünstraße 2	59065	Hamm	02381/918-0	0800 10092675322	59061	59004	1449	41000000	41001500	BBK HAMM, WESTF	41050095	90001	SPARKASSE HAMM	Mo-Do 8.30-12.00 Uhr,Mi auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5322.fin-nrw.de	www.finanzamt-Hamm.de	531
+5	5323	Hattingen 	Rathausplatz 19	45525	Hattingen	02324/208-0	0800 10092675323		45502	800257	43000000	43001501	BBK BOCHUM				Mo-Fr,Di auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5323.fin-nrw.de	www.finanzamt-Hattingen.de	532
+5	5324	Herford 	Wittekindstraße 5	32051	Herford	05221/188-0	0800 10092675324		32006	1642	48000000	48001503	BBK BIELEFELD	49450120	36004	SPARKASSE HERFORD	Mo,Di,Fr 7.30-12.00 Uhr,Do 7.30-17.00 Uhr,Mi geschlossen,und nach Vereinbarung	Service@FA-5324.fin-nrw.de	www.finanzamt-Herford.de	533
+5	5325	Herne-Ost 	Markgrafenstraße 12	44623	Herne	02323/598-0	0800 10092675325		44602	101220	43000000	43001502	BBK BOCHUM	43250030	1012004	HERNER SPARKASSE	Rückfragen bitte nur,telefonisch oder nach,vorheriger Rücksprache mit,dem Bearbeiter	Service@FA-5325.fin-nrw.de	www.finanzamt-Herne-Ost.de	534
+5	5326	Höxter 	Bismarckstraße 11	37671	Höxter	05271/969-0	0800 10092675326	37669	37652	100239	48000000	47201501	BBK BIELEFELD	47251550	3008521	SPK HOEXTER BRAKEL	Mo - Do,Do auch,und nach Vereinbarung	Service@FA-5326.fin-nrw.de	www.finanzamt-Hoexter.de	535
+5	5327	Ibbenbüren 	Uphof 10	49477	Ibbenbüren	05451/920-0	0800 10092675327		49462	1263	40000000	40301501	BBK MUENSTER, WESTF	40351060	2469	KR SPK STEINFURT	Mo - Fr,Di auch	Service@FA-5327.fin-nrw.de	www.finanzamt-Ibbenbueren.de	536
+5	5328	Iserlohn 	Zollernstraße 16	58636	Iserlohn	02371/969-0	0800 10092675328	58634	58585	1554	45000000	45001503	BBK HAGEN	44550045	44008	SPK DER STADT ISERLOHN	Mo - Do 08.30 - 12.00 Uhr,Do auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5328.fin-nrw.de	www.finanzamt-Iserlohn.de	537
+5	5329	Lemgo 	Engelb.-Kämpfer Str. 18	32657	Lemgo	05261/253-1	0800 10092675329		32632	240	48000000	48001505	BBK BIELEFELD	48250110	45005	SPARKASSE LEMGO	Mo - Fr,Do auch,und nach Vereinbarung	Service@FA-5329.fin-nrw.de	www.finanzamt-Lemgo.de	538
+5	5330	Lippstadt 	Im Grünen Winkel 3	59555	Lippstadt	02941/982-0	0800 10092675330		59525	1580	41000000	46401505	BBK HAMM, WESTF	41650001	15008	ST SPK LIPPSTADT	Mo - Fr 08.30 - 12.00,Do zusätzlich 13.30 - 15.00	Service@FA-5330.fin-nrw.de	www.finanzamt-Lippstadt.de	539
+5	5331	Lübbecke 	Bohlenstraße 102	32312	Lübbecke	05741/334-0	0800 10092675331		32292	1244	49000000	49001501	BBK MINDEN, WESTF	49050101	141	SPARKASSE MINDEN-LUEBBECKE	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5331.fin-nrw.de	www.finanzamt-Luebbecke.de	540
+5	5332	Lüdenscheid 	Bahnhofsallee 16	58507	Lüdenscheid	02351/155-0	0800 10092675332	58505	58465	1589	45000000	45001502	BBK HAGEN	45850005	18	SPK LUEDENSCHEID	Mo-Fr 08.30-12.00 Uhr,Do auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5332.fin-nrw.de	www.finanzamt-Luedenscheid.de	541
+5	5333	Lüdinghausen 	Bahnhofstraße 32	59348	Lüdinghausen	02591/930-0	0800 10092675333		59332	1243	40000000	40001506	BBK MUENSTER, WESTF	40154530	1008	SPARKASSE WESTMUENSTERLAND	vormittags: Mo.-Fr.8.30-12.00,nachmittags: Di. 13.30-15.00	Service@FA-5333.fin-nrw.de	www.finanzamt-Luedinghausen.de	542
+5	5334	Meschede 	Fritz-Honsel-Straße 4	59872	Meschede	0291/950-0	0800 10092675334		59852	1265	41000000	46401502	BBK HAMM, WESTF	46451012	13003	SPK MESCHEDE	Mo-Fr 08:30 - 12:00,und nach Vereinbarung	Service@FA-5334.fin-nrw.de	www.finanzamt-Meschede.de	543
+5	5335	Minden 	Heidestraße 10	32427	Minden	0571/804-1	0800 10092675335		32380	2340	49000000	49001500	BBK MINDEN, WESTF	49050101	40018145	SPARKASSE MINDEN-LUEBBECKE	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5335.fin-nrw.de	www.finanzamt-Minden.de	544
+5	5336	Münster-Außenstadt 	Friedrich-Ebert-Str. 46	48153	Münster	0251/9729-0	0800 10092675336		48136	6129	40000000	40001501	BBK MUENSTER, WESTF	40050150	95031001	SPK MUENSTERLAND OST	Mo-Fr 08.30-12.00 Uhr,Mo auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5336.fin-nrw.de	www.finanzamt-Muenster-Aussenstadt.de	545
+5	5337	Münster-Innenstadt 	Münzstr. 10	48143	Münster	0251/416-1	0800 10092675337		48136	6103	40000000	40001502	BBK MUENSTER, WESTF	40050150	300004	SPK MUENSTERLAND OST		Service@FA-5337.fin-nrw.de	www.finanzamt-Muenster-Innenstadt.de	546
+5	5338	Olpe 	Am Gallenberg 20	57462	Olpe	02761/963-0	0800 10092675338		57443	1320	45000000	46001501	BBK HAGEN				Mo-Do 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,Freitag keine Sprechzeit	Service@FA-5338.fin-nrw.de	www.finanzamt-Olpe.de	547
+5	5339	Paderborn 	Bahnhofstraße 28	33102	Paderborn	05251/100-0	0800 10092675339		33045	1520	48000000	47201500	BBK BIELEFELD	47250101	1001353	SPARKASSE PADERBORN		Service@FA-5339.fin-nrw.de	www.finanzamt-Paderborn.de	548
+5	5340	Recklinghausen 	Westerholter Weg 2	45657	Recklinghausen	02361/583-0	0800 10092675340		45605	100553	43000000	42601500	BBK BOCHUM	42650150	90034158	SPK RECKLINGHAUSEN	Mo - Fr 08:30 bis 12:00,Mi auch 13:30 bis 15:00,und nach Vereinbarung	Service@FA-5340.fin-nrw.de	www.finanzamt-Recklinghausen.de	549
+5	5341	Schwelm 	Bahnhofplatz 6	58332	Schwelm	02336/803-0	0800 10092675341		58316	340	45000000	45001520	BBK HAGEN	45451555	80002	ST SPK SCHWELM	Mo-Fr 8.30-12.00 Uhr,Mo,und nach Vereinbarung	Service@FA-5341.fin-nrw.de	www.finanzamt-Schwelm.de	550
+5	5342	Siegen 	Weidenauer Straße 207	57076	Siegen	0271/4890-0	0800 10092675342		57025	210148	45000000	46001500	BBK HAGEN	46050001	1100114	SPK SIEGEN	Mo-Fr,Do auch 13:30 - 17:00 Uhr,und nach Vereinbarung	Service@FA-5342.fin-nrw.de	www.finanzamt-Siegen.de	551
+5	5343	Soest 	Waisenhausstraße 11	59494	Soest	02921/351-0	0800 10092675343	59491	59473	1364	41000000	46401504	BBK HAMM, WESTF	41450075	208	SPARKASSE SOEST	Mo-Fr 0830-1200Uhr,und nach Vereinbarung	Service@FA-5343.fin-nrw.de	www.finanzamt-Soest.de	552
+5	5344	Herne-West 	Edmund-Weber-Str. 210	44651	Herne	02325/696-0	0800 10092675344		44632	200262	43000000	43001503	BBK BOCHUM	43250030	17004	HERNER SPARKASSE	Mo-Fr 08.30-12.00 Uhr,Mo 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5344.fin-nrw.de	www.finanzamt-Herne-West.de	553
+5	5345	Warburg 	Sternstraße 33	34414	Warburg	05641/771-0	0800 10092675345		34402	1226	48000000	47201503	BBK BIELEFELD	47251550	25005521	SPK HOEXTER BRAKEL		Service@FA-5345.fin-nrw.de	www.finanzamt-Warburg.de	554
+5	5346	Warendorf 	Düsternstraße 43	48231	Warendorf	02581/924-0	0800 10092675346		48205	110361	40000000	40001504	BBK MUENSTER, WESTF	40050150	182	SPK MUENSTERLAND OST	Mo-Fr 08.30-12.00 Uhr,Do auch 13.30-15.00 Uhr,und nach Vereinbarung	Service@FA-5346.fin-nrw.de	www.finanzamt-Warendorf.de	555
+5	5347	Wiedenbrück 	Hauptstraße 34	33378	Rheda-Wiedenbrück	05242/934-0	0800 10092675347	33372	33342	1429	48000000	47801500	BBK BIELEFELD	47853520	5231	KREISSPARKASSE WIEDENBRUECK	Mo - Fr 08.30 - 12.00 Uhr,Do auch 13.30 - 14.30 Uhr	Service@FA-5347.fin-nrw.de	www.finanzamt-Wiedenbrueck.de	556
+5	5348	Witten 	Ruhrstraße 43	58452	Witten	02302/921-0	0800 10092675348		58404	1420	43000000	43001505	BBK BOCHUM	45250035	6007	ST SPK WITTEN	Mo - Fr 08.30 - 12.00 Uhr,Mo auch 13.30 - 15.00 Uhr,und nach Vereinbarung	Service@FA-5348.fin-nrw.de	www.finanzamt-Witten.de	557
+5	5349	Bielefeld-Außenstadt 	Ravensberger Straße 125	33607	Bielefeld	0521/548-0	0800 10092675349		33503	100331	48000000	48001501	BBK BIELEFELD	48050161	180000	SPK BIELEFELD	Mo - Fr 08:30 - 12:00 Uhr,Do auch 13:30 - 15:00 Uhr,und nach Vereinbarung	Service@FA-5349.fin-nrw.de	www.finanzamt-Bielefeld-Aussenstadt.de	558
+5	5350	Bochum-Süd 	Königsallee 21	44789	Bochum	0234/3337-0	0800 10092675350		44707	100764	43000000	43001504	BBK BOCHUM	43050001	1307792	SPARKASSE BOCHUM	Mo-Fr 08:30-12:00 Uhr,Di auch 13:30-15:00 Uhr	Service@FA-5350.fin-nrw.de	www.finanzamt-Bochum-Sued.de	559
+5	5351	Gütersloh 	Neuenkirchener Str. 86	33332	Gütersloh	05241/3071-0	0800 10092675351		33245	1565	48000000	48001506	BBK BIELEFELD				Mo - Fr 08.30 - 12.00 Uhr,Do auch 13.30 - 15.00 Uhr	Service@FA-5351.fin-nrw.de	www.finanzamt-Guetersloh.de	560
+5	5359	Marl 	Brassertstraße 1	45768	Marl	02365/516-0	0800 10092675359	45765	45744	1420	43000000	42601501	BBK BOCHUM	42650150	40020000	SPK RECKLINGHAUSEN		Service@FA-5359.fin-nrw.de	www.finanzamt-Marl.de	561
+5	5371	Bielefeld für Groß- und Konzernbetriebsprüfung	Ravensberger Str. 90	33607	Bielefeld	0521/548-0	0800 10092675371		33511	101150								Service@FA-5371.fin-nrw.de		562
+5	5372	Herne für Groß- und Konzernbetriebsprüfung	Hauptstr. 123	44651	Herne	02325/693-0	0800 10092675372		44636	200620								Service@FA-5372.fin-nrw.de		563
+5	5373	Detmold für Groß- und Konzernbetriebsprüfung	Richthofenstrasse 94	32756	Detmold	05231/974-300	0800 10092675373		32706	1664								Service@FA-5373.fin-nrw.de		564
+5	5374	Dortmund für Groß- und Konzernbetriebsprüfung	Nußbaumweg 210	44143	Dortmund	0231/5188-8953	0800 10092675374		44047	105039								Service@FA-5374.fin-nrw.de		565
+5	5375	Hagen für Groß- und Konzernbetriebsprüfung	Hochstr. 43 - 45	58095	Hagen	02331/3760-0	0800 10092675375											Service@FA-5375.fin-nrw.de		566
+5	5376	Münster für Groß- und Konzernbetriebsprüfung	Andreas-Hofer-Straße 50	48145	Münster	0251/934-2115	0800 10092675376											Service@FA-5376.fin-nrw.de		567
+5	5381	Bielefeld f. Steuerfahndung und Steuerstrafsachen	Ravensberger Str. 90	33607	Bielefeld	0521/548-0	0800 10092675381		33511	101173	48000000	48001500	BBK BIELEFELD	48050161	109	SPK BIELEFELD		Service@FA-5381.fin-nrw.de		568
+5	5382	Bochum f. Steuerfahndung und Steuerstrafsachen	Uhlandstr. 37	44791	Bochum	0234/5878-0	0800 10092675382		44707	100768	43000000	43001500	BBK BOCHUM	43050001	1300011	SPARKASSE BOCHUM		Service@FA-5382.fin-nrw.de		569
+9	9101	Augsburg-Stadt Arbeitnehmerbereich	Prinzregentenpl. 2	86150	Augsburg	0821 506-01	0821 506-2222		86135	10 00 65	72000000	72001500	BBK AUGSBURG	72050000	24109	ST SPK AUGSBURG	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-17:30 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-a-s.bayern.de	www.finanzamt-augsburg-stadt.de	570
+9	9102	Augsburg-Land 	Peutingerstr. 25	86152	Augsburg	0821 506-02	0821 506-3270	86144	86031	11 06 69	72000000	72001501	BBK AUGSBURG	72050101	8003	KR SPK AUGSBURG	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-a-l.bayern.de	www.finanzamt-augsburg-land.de	571
+9	9103	Augsburg-Stadt 	Prinzregentenpl. 2	86150	Augsburg	0821 506-01	0821 506-2222		86135	10 00 65	72000000	72001500	BBK AUGSBURG	72050000	24109	ST SPK AUGSBURG	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-17:30 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-a-s.bayern.de	www.finanzamt-augsburg-stadt.de	572
+9	9104	Bad Tölz -Außenstelle des Finanzamts Wolfratshausen-	Prof.-Max-Lange-Platz 2	83646	Bad Tölz	08041 8005-0	08041 8005-185		83634	1420	70000000	70001505	BBK MUENCHEN	70054306	31054	SPK BAD TOELZ-WOLFRATSHAUSE	Servicezentrum: Mo 7:30-18:00 Uhr, Di-Do 7:30-13:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-toel.bayern.de	www.finanzamt-bad-toelz.de	573
+9	9105	Berchtesgaden 	Salzburger Str. 6	83471	Berchtesgaden	08652 960-0	08652 960-100		83461	1154	71000000	71001500	BBK MUENCHEN EH B REICHENHA	71050000	350009	SPK BERCHTESGADENER LAND	Servicezentrum: Mo-Do 7:30-13:30 Uhr (Nov-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-bgd.bayern.de	www.finanzamt-berchtesgaden.de	574
+9	9106	Burghausen 	Tittmoninger Str. 1	84489	Burghausen	08677 8706-0	08677 8706-100		84480	1257	71000000	71001501	BBK MUENCHEN EH B REICHENHA	71051010	250001	KR SPK ALTOETTING-BURGHAUSE	Servicezentrum: Mo-Mi 7:45-15:00 Uhr Do 7:45-17:00 Uhr, Fr 7:45-12:00 Uhr	poststelle@fa-burgh.bayern.de	www.finanzamt-burghausen.de	575
+9	9107	Dachau 	Bürgermeister-Zauner-Ring 2	85221	Dachau	08131 701-0	08131 701-111	85219	85202	1280	70000000	70001507	BBK MUENCHEN	70051540	908327	SPARKASSE DACHAU	Servicezentrum: Mo, Di, Do 7:30-15:00 Uhr (Nov-Mai Do 7:30-18:00 Uhr), Mi,Fr 7:30-12:00 Uhr	poststelle@fa-dah.bayern.de	www.finanzamt-dachau.de	576
+9	9108	Deggendorf 	Pfleggasse 18	94469	Deggendorf	0991 384-0	0991 384-150		94453	1355	75000000	75001506	BBK REGENSBURG	74150000	380019950	SPK DEGGENDORF	Servicezentrum: Mo, Di, Do 7:45-15:00 Uhr (Jan-Mai Do 7:45-18:00 Uhr), Mi, Fr 7:45-12:00 Uhr	poststelle@fa-deg.bayern.de	www.finanzamt-deggendorf.de	577
+9	9109	Dillingen 	Schloßstr. 3	89407	Dillingen	09071 507-0	09071 507-300	89401			72000000	72001503	BBK AUGSBURG	72251520	24066	KR U ST SPK DILLINGEN	Servicezentrum: Mo, Di, Mi, Fr 7:30-13:00 Uhr, Do 7:30-13:00 Uhr u. 14:00-18:00 Uhr	poststelle@fa-dlg.bayern.de	www.finanzamt-dillingen.de	578
+9	9110	Dingolfing 	Obere Stadt 44	84130	Dingolfing	08731 504-0	08731 504-190		84122	1156	74300000	74301501	BBK REGENSBURG EH LANDSHUT	74351310	100017805	SPK DINGOLFING-LANDAU	Servicezentrum: Mo-Di 7:30-15:00 Uhr, Mi, Fr 7:30-12:00 Uhr, Do 7:30-17:00 Uhr	poststelle@fa-dgf.bayern.de	www.finanzamt-dingolfing.de	579
+9	9111	Donauwörth -Außenstelle des Finanzamts Nördlingen-	Sallingerstr. 2	86609	Donauwörth	0906 77-0	0906 77-150	86607			72000000	72001502	BBK AUGSBURG	70010080	1632-809	POSTBANK -GIRO- MUENCHEN	Servicezentrum: Mo-Mi 7:30-13:30 Uhr, Do 7:30-18:00 Uhr, Fr 7:30 -13:00 Uhr	poststelle@fa-don.bayern.de	www.finanzamt-donauwoerth.de	580
+9	9112	Ebersberg 	Schloßplatz 1-3	85560	Ebersberg	08092 267-0	08092 267-102				70000000	70001508	BBK MUENCHEN	70051805	75	KR SPK EBERSBERG	Servicezentrum: Mo-Do 7:30-13:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-ebe.bayern.de	www.finanzamt-ebersberg.de	581
+9	9113	Eggenfelden 	Pfarrkirchner Str. 71	84307	Eggenfelden	08721 981-0	08721 981-200		84301	1160	74300000	74301502	BBK REGENSBURG EH LANDSHUT	74351430	5603	SPK ROTTAL-INN EGGENFELDEN	Servicezentrum: Mo, Di, Do 7:45-15:00 Uhr (Jan-Mai Do 7:45-17:00 Uhr), Mi, Fr 7:30-12:00 Uhr	poststelle@fa-eg.bayern.de	www.finanzamt-eggenfelden.de	582
+9	9114	Erding 	Münchener Str. 31	85435	Erding	08122 188-0	08122 188-150		85422	1262	70000000	70001509	BBK MUENCHEN	70051995	8003	SPK ERDING-DORFEN	Servicezentrum: Mo-Mi 7:30-14:00 Uhr Do 7:30-18:00 Uhr, Fr 7:30 -12:00 Uhr	poststelle@fa-ed.bayern.de	www.finanzamt-erding.de	583
+9	9115	Freising 	Prinz-Ludwig-Str. 26	85354	Freising	08161 493-0	08161 493-106	85350	85313	1343	70000000	70001510	BBK MUENCHEN	70021180	4001010	HYPOVEREINSBK FREISING	Servicezentrum: Mo-Di 7:30-15:00 Uhr, Mi, Fr 7:30-12:00 Uhr, Do 7:30-18:00 Uhr	poststelle@fa-fs.bayern.de	www.finanzamt-freising.de	584
+9	9117	Fürstenfeldbruck 	Münchner Str.36	82256	Fürstenfeldbruck	08141 60-0	08141 60-150		82242	1261	70000000	70001511	BBK MUENCHEN	70053070	8007221	SPK FUERSTENFELDBRUCK	Servicezentrum: Mo-Mi 7:30-14:30 Uhr, Do 7:30-17:30 Uhr, Fr 7:30 -12:30 Uhr	poststelle@fa-ffb.bayern.de	www.finanzamt-fuerstenfeldbruck.de	585
+9	9118	Füssen -Außenstelle des Finanzamts Kaufbeuren-	Rupprechtstr. 1	87629	Füssen	08362 5056-0	08362 5056-290		87620	1460	73300000	73301510	BBK AUGSBURG EH KEMPTEN	73350000	310500525	SPARKASSE ALLGAEU	Servicezentrum: Mo-Mi 8:00-15:00 Uhr, Do 8:00-18:00 Uhr, Fr 8:00-13:00 Uhr	poststelle@fa-fues.bayern.de	www.finanzamt-fuessen.de	586
+9	9119	Garmisch-Partenkirchen 	Von-Brug-Str. 5	82467	Garmisch-Partenkirchen	08821 700-0	08821 700-111		82453	1363	70000000	70001520	BBK MUENCHEN	70350000	505	KR SPK GARMISCH-PARTENKIRCH	Servicezentrum: Mo-Mi 7:30-14:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-gap.bayern.de	www.finanzamt-garmisch-partenkirchen.de	587
+9	9120	Bad Griesbach -Außenstelle des Finanzamts Passau-	Schloßhof 5-6	94086	Bad Griesbach	0851 504-0	0851 504-2222		94083	1222	74000000	74001500	BBK REGENSBURG EH PASSAU	74050000	16170	SPK PASSAU	Servicezentrum: Mo-Mi 7:30-14:00 Uhr, Do 7:30-17:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-griesb.bayern.de	www.finanzamt-bad-griesbach.de	588
+9	9121	Günzburg 	Schloßpl. 4	89312	Günzburg	08221 902-0	08221 902-209		89302	1241	72000000	72001505	BBK AUGSBURG	72051840	18	SPK GUENZBURG-KRUMBACH	Servicezentrum: Mo-Di 7:45-12:30 u. 13:30-15:30, Mi, Fr 7:45-12:30, Do 7:45-12:30 u. 13:30-18:00	poststelle@fa-gz.bayern.de	www.finanzamt-guenzburg.de	589
+9	9123	Immenstadt -Außenstelle des Finanzamts Kempten-	Rothenfelsstr. 18	87509	Immenstadt	08323 801-0	08323 801-235		87502	1251	73300000	73301520	BBK AUGSBURG EH KEMPTEN	73350000	113464	SPARKASSE ALLGAEU	Servicezentrum: Mo-Do 7:30-14:00 Uhr (Okt-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-immen.bayern.de	www.finanzamt-immenstadt.de	590
+9	9124	Ingolstadt 	Esplanade 38	85049	Ingolstadt	0841 311-0	0841 311-133		85019	210451	72100000	72101500	BBK MUENCHEN EH INGOLSTADT	72150000	25 080	SPARKASSE INGOLSTADT	Servicezentrum: Mo-Di 7:15-13:30, Mi 7:15-12:30, Do 7:15-17:30, Fr 7:15-12:00	poststelle@fa-in.bayern.de	www.finanzamt-ingolstadt.de	591
+9	9125	Kaufbeuren 	Remboldstr. 21	87600	Kaufbeuren	08341 802-0	08341 802-221		87572	1260	73300000	73401500	BBK AUGSBURG EH KEMPTEN	73450000	25700	KR U ST SPK KAUFBEUREN	Servicezentrum: Mo-Mi 7:30-14:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-kf.bayern.de	www.finanzamt-kaufbeuren.de	592
+9	9126	Kelheim 	Klosterstr. 1	93309	Kelheim	09441 201-0	09441 201-201		93302	1252	75000000	75001501	BBK REGENSBURG	75051565	190201301	KREISSPARKASSE KELHEIM	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-17:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-keh.bayern.de	www.finanzamt-kelheim.de	593
+9	9127	Kempten (Allgäu) 	Am Stadtpark 3	87435	Kempten	0831 256-0	0831 256-260		87405	1520	73300000	73301500	BBK AUGSBURG EH KEMPTEN	73350000	117	SPARKASSE ALLGAEU	Servicezentrum: Mo-Do 7:30-14:30 Uhr (Nov-Mai Do 7:20-17:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-ke.bayern.de	www.finanzamt-kempten.de	594
+9	9131	Landsberg 	Israel-Beker-Str. 20	86899	Landsberg	08191 332-0	08191 332-108	86896			72000000	72001504	BBK AUGSBURG	70052060	158	SPK LANDSBERG-DIESSEN	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-16:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-ll.bayern.de	www.finanzamt-landsberg.de	595
+9	9132	Landshut 	Maximilianstr. 21	84028	Landshut	0871 8529-000	0871 8529-360				74300000	74301500	BBK REGENSBURG EH LANDSHUT	74350000	10111	SPK LANDSHUT	Servicezentrum: Mo-Di 8:00-15:00 Uhr, Mi, Fr 8:00-12:00 Uhr, Do 8:00-18:00 Uhr	poststelle@fa-la.bayern.de	www.finanzamt-landshut.de	596
+9	9133	Laufen - Außenstelle des Finanzamts Berchtesgaden-	Rottmayrstr. 13	83410	Laufen	08682 918-0	08682 918-100		83406	1251	71000000	71001502	BBK MUENCHEN EH B REICHENHA	71050000	59998	SPK BERCHTESGADENER LAND	Servicezentrum: Mo-Do 7:30-13:30 Uhr (Nov-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-lauf.bayern.de	www.finanzamt-laufen.de	597
+9	9134	Lindau 	Brettermarkt 4	88131	Lindau	08382 916-0	08382 916-100		88103	1320	73300000	73501500	BBK AUGSBURG EH KEMPTEN	73150000	620018333	SPK MEMMINGEN-LINDAU-MINDEL	Servicezentrum: Mo-Do 7:30-14:00 Uhr (Nov-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-li.bayern.de	www.finanzamt-lindau.de	598
+9	9138	Memmingen 	Bodenseestr. 6	87700	Memmingen	08331 608-0	08331 608-165		87683	1345	73100000	73101500	BBK AUGSBURG EH MEMMINGEN	73150000	210005	SPK MEMMINGEN-LINDAU-MINDEL	Servicezentrum: Mo-Do 7:30-14:00 Uhr, (Nov-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-mm.bayern.de	www.finanzamt-memmingen.de	599
+9	9139	Miesbach 	Schlierseer Str. 5	83714	Miesbach	08025 709-0	08025 709-500		83711	302	70000000	70001512	BBK MUENCHEN	71152570	4002	KR SPK MIESBACH-TEGERNSEE	Servicezentrum: Mo, Di, Mi, Fr 7:30-14:00 Uhr, Do 7:30-18:00 Uhr	poststelle@fa-mb.bayern.de	www.finanzamt-miesbach.de	600
+9	9140	Mindelheim -Außenstelle des Finanzamts Memmingen-	Bahnhofstr. 16	87719	Mindelheim	08261 9912-0	08261 9912-300		87711	1165	73100000	73101502	BBK AUGSBURG EH MEMMINGEN	73150000	810004788	SPK MEMMINGEN-LINDAU-MINDEL	Servicezentrum: Mo-Mi 7:30-12:00 u. 13:30-15:30, Do 7:30-12:00 u. 13:30-17:30, Fr 7:30-12:00	poststelle@fa-mn.bayern.de	www.finanzamt-mindelheim.de	601
+9	9141	Mühldorf 	Katharinenplatz 16	84453	Mühldorf	08631 616-0	08631 616-100		84445	1369	71100000	71101501	BBK MUENCHEN EH ROSENHEIM	71151020	885	KR SPK MUEHLDORF	Servicezentrum: Mo-Mi 7:30-14:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-mue.bayern.de	www.finanzamt-muehldorf.de	602
+9	9142	München f. Körpersch. Bewertung des Grundbesitzes	Meiserstr. 4	80333	München	089 1252-0	089 1252-7777	80275	80008	20 09 26	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-koe.bayern.de	www.finanzamt-muenchen-koerperschaften.de	603
+9	9143	München f. Körpersch. Körperschaftsteuer	Meiserstr. 4	80333	München	089 1252-0	089 1252-7777	80275	80008	20 09 26	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-koe.bayern.de	www.finanzamt-muenchen-koerperschaften.de	604
+9	9144	München I 	Karlstr. 9-11	80333	München	089 1252-0	089 1252-1111	80276	80008	20 09 05	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	poststelle@fa-m1.bayern.de	www.finanzamt-muenchen-I.de	605
+9	9145	München III 	Deroystr. 18	80335	München	089 1252-0	089 1252-3333	80301			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	poststelle@fa-m3.bayern.de	www.finanzamt-muenchen-III.de	606
+9	9146	München IV 	Deroystr. 4 Aufgang I	80335	München	089 1252-0	089 1252-4000	80302			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	poststelle@fa-m4.bayern.de	www.finanzamt-muenchen-IV.de	607
+9	9147	München II 	Deroystr. 20	80335	München	089 1252-0	089 1252-2222	80269			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	poststelle@fa-m2.bayern.de	www.finanzamt-muenchen-II.de	608
+9	9148	München V 	Deroystr. 4 Aufgang II	80335	München	089 1252-0	089 1252-5281	80303			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	poststelle@fa-m5.bayern.de	www.finanzamt-muenchen-V.de	609
+9	9149	München-Zentral Erhebung, Vollstreckung	Winzererstr. 47a	80797	München	089 3065-0	089 3065-1900	80784			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-zfa.bayern.de	www.finanzamt-muenchen-zentral.de	610
+9	9150	Neuburg -Außenstelle des Finanzamts Schrobenhausen-	Fünfzehnerstr. 7	86633	Neuburg	08252 918-0	08252 918-222		86618	1320	72100000	72101505	BBK MUENCHEN EH INGOLSTADT	72151880	104000	ST SPK SCHROBENHAUSEN	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:30 Uhr	poststelle@fa-nd.bayern.de	www.finanzamt-neuburg.de	611
+9	9151	Neu-Ulm 	Nelsonallee 5	89231	Neu-Ulm	0731 7045-0	0731 7045-500	89229	89204	1460	63000000	63001501	BBK ULM, DONAU	73050000	430008425	SPK NEU-ULM ILLERTISSEN	Servicezentrum: Mo, Di, Mi, Fr 8:00-13:00 Uhr, Do 8:00-13:00 Uhr u. 14:00-18:00 Uhr	poststelle@fa-nu.bayern.de	www.finanzamt-neu-ulm.de	612
+9	9152	Nördlingen 	Tändelmarkt 1	86720	Nördlingen	09081 215-0	09081 215-100		86715	1521	72000000	72001506	BBK AUGSBURG	72250000	111500	SPARKASSE NOERDLINGEN	Servicezentrum: Mo, Di, Mi, Fr 7:30-13:00 Uhr, Do 7:30-13:00 Uhr u. 14:00-18:00 Uhr	poststelle@fa-noe.bayern.de	www.finanzamt-noerdlingen.de	613
+9	9153	Passau mit Außenstellen 	Innstr. 36	94032	Passau	0851 504-0	0851 504-1410		94030	1450	74000000	740 01500	BBK REGENSBURG EH PASSAU	74050000	16170	SPK PASSAU	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-17:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-pa.bayern.de	www.finanzamt-passau.de	614
+9	9154	Pfaffenhofen 	Schirmbeckstr. 5	85276	Pfaffenhofen a. d. Ilm	08441 77-0	08441 77-199		85265	1543	72100000	72101504	BBK MUENCHEN EH INGOLSTADT	72151650	7302	VER SPK PFAFFENHOFEN	Servicezentrum: Mo-Mi 7:30-14:30 Uhr, Do 7:30-17:30 Uhr, Fr 7:30-12:30 Uhr	poststelle@fa-paf.bayern.de	www.finanzamt-pfaffenhofen.de	615
+9	9156	Rosenheim m. ASt Wasserburg 	Wittelsbacherstr. 25	83022	Rosenheim	08031 201-0	08031 201-222		83002	100255	71100000	71101500	BBK MUENCHEN EH ROSENHEIM	71150000	34462	SPK ROSENHEIM	Servicezentrum: Mo-Do 7:30-14:00 Uhr, (Okt-Mai Do 7:30-17:00 Uhr), Fr 7:30-12.00 Uhr	poststelle@fa-ro.bayern.de	www.finanzamt-rosenheim.de	616
+9	9157	Grafenau 	Friedhofstr. 1	94481	Grafenau	08552 423-0	08552 423-170				75000000	75001507	BBK REGENSBURG	70010080	1621-806	POSTBANK -GIRO- MUENCHEN	Servicezentrum: Mo, Di 7:30-15:00 Uhr, Mi, Fr 7:30-12:00 Uhr, Do 7:30-18:00 Uhr	poststelle@fa-gra.bayern.de	www.finanzamt-grafenau.de	617
+9	9158	Schongau - Außenstelle des Finanzamts Weilheim-Schongau -	Rentamtstr. 1	86956	Schongau	0881 184-0	0881 184-373		86951	1147	70000000	70001521	BBK MUENCHEN	70351030	20149	VER SPK WEILHEIM	Servicezentrum: Mo-Do 7:30-14:00 Uhr (Okt-Jun Do 7:30-17:30 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-sog.bayern.de	www.finanzamt-schongau.de	618
+9	9159	Schrobenhausen m. ASt Neuburg  	Rot-Kreuz-Str. 2	86529	Schrobenhausen	08252 918-0	08252 918-430		86522	1269	72100000	72101505	BBK MUENCHEN EH INGOLSTADT	72151880	104000	ST SPK SCHROBENHAUSEN	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:30 Uhr	poststelle@fa-sob.bayern.de	www.finanzamt-schrobenhausen.de	619
+9	9161	Starnberg 	Schloßbergstr.	82319	Starnberg	08151 778-0	08151 778-250		82317	1251	70000000	70001513	BBK MUENCHEN	70250150	430064295	KR SPK MUENCHEN STARNBERG	Servicezentrum: Mo-Mi 7:30-15:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-13:00 Uhr	poststelle@fa-sta.bayern.de	www.finanzamt-starnberg.de	620
+9	9162	Straubing 	Fürstenstr. 9	94315	Straubing	09421 941-0	09421 941-272		94301	151	75000000	75001502	BBK REGENSBURG	74250000	240017707	SPK STRAUBING-BOGEN	Servicezentrum: Mo, Di, Mi, Fr 7:30-13:00 Uhr, Do 7:30-18:00 Uhr	poststelle@fa-sr.bayern.de	www.finanzamt-straubing.de	621
+9	9163	Traunstein 	Herzog-Otto-Str. 6	83278	Traunstein	0861 701-0	0861 701-338	83276	83263	1309	71000000	71001503	BBK MUENCHEN EH B REICHENHA	71052050	7070	KR SPK TRAUNSTEIN-TROSTBERG	Servicezentrum: Mo-Do 7:30-14:00 Uhr (Okt.-Mai Do 7:30-18:00 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-ts.bayern.de	www.finanzamt-traunstein.de	622
+9	9164	Viechtach -Außenstelle des Finanzamts Zwiesel-	Mönchshofstr. 27	94234	Viechtach	09922 507-0	09922 507-399		94228	1162	75000000	75001508	BBK REGENSBURG	74151450	240001008	SPARKASSE REGEN-VIECHTACH	Servicezentrum: Mo-Di 7:45-15:00 Uhr, Mi, Fr 7:45-12:00 Uhr, Do 7:45-18:00 Uhr	poststelle@fa-viech.bayern.de	www.finanzamt-viechtach.de	623
+9	9166	Vilshofen -Außenstelle des Finanzamts Passau-	Kapuzinerstr. 36	94474	Vilshofen	0851 504-0	0851 504-2465				74000000	74001500	BBK REGENSBURG EH PASSAU	74050000	16170	SPK PASSAU	Servicezentrum: Mo-Mi 7:30-14:00 Uhr, Do 7:30-17:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-vof.bayern.de	www.finanzamt-vilshofen.de	624
+9	9167	Wasserburg -Außenstelle des Finanzamts Rosenheim-	Rosenheimer Str. 16	83512	Wasserburg	08037 201-0	08037 201-150		83502	1280	71100000	71101500	BBK MUENCHEN EH ROSENHEIM	71150000	34462	SPK ROSENHEIM	Servicezentrum: Mo-Do 7:30-14:00 Uhr, (Okt-Mai Do 7:30-17:00 Uhr), Fr 7:30-12.00 Uhr	poststelle@fa-ws.bayern.de	www.finanzamt-wasserburg.de	625
+9	9168	Weilheim-Schongau 	Hofstr. 23	82362	Weilheim	0881 184-0	0881 184-500		82352	1264	70000000	70001521	BBK MUENCHEN	70351030	20149	VER SPK WEILHEIM	Servicezentrum: Mo-Do 7:30-14:00 Uhr (Okt-Jun Do 7:30-17:30 Uhr), Fr 7:30-12:00 Uhr	poststelle@fa-wm.bayern.de	www.finanzamt-weilheim.de	626
+9	9169	Wolfratshausen 	Heimgartenstr. 5	82515	Wolfratshausen	08171 25-0	08171 25-150		82504	1444	70000000	70001514	BBK MUENCHEN	70054306	505	SPK BAD TOELZ-WOLFRATSHAUSE	Servicezentrum: Mo-MI 7:30-14:00 Uhr, Do 7:30-17:00 Uhr, Fr 7:30-12:30 Uhr	poststelle@fa-wor.bayern.de	www.finanzamt-wolfratshausen.de	627
+9	9170	Zwiesel m. ASt Viechtach 	Stadtplatz 16	94227	Zwiesel	09922 507-0	09922 507-200		94221	1262	75000000	75001508	BBK REGENSBURG	74151450	240001008	SPARKASSE REGEN-VIECHTACH	Servicezentrum: Mo-Di 7:45-15:00 Uhr, Mi, Fr 7:45-12:00 Uhr, Do 7:45-18:00 Uhr	poststelle@fa-zwi.bayern.de	www.finanzamt-zwiesel.de	628
+9	9171	Eichstätt 	Residenzplatz 8	85072	Eichstätt	08421 6007-0	08421 6007-400	85071	85065	1163	72100000	72101501	BBK MUENCHEN EH INGOLSTADT	72151340	1214	SPARKASSE EICHSTAETT	Servicezentrum: Mo, Di, Mi 7:30-14:00 Uhr, Do 7:30-18:00 Uhr, Fr 7:30-12:00 Uhr	poststelle@fa-ei.bayern.de	www.finanzamt-eichstaett.de	629
+9	9180	München f. Körpersch. 	Meiserstr. 4	80333	München	089 1252-0	089 1252-7777	80275	80008	20 09 26	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-koe.bayern.de	www.finanzamt-muenchen-koerperschaften.de	630
+9	9181	München I Arbeitnehmerbereich	Karlstr. 9/11	80333	München	089 1252-0	089 1252-1111	80276	80008	20 09 05	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	Poststelle@fa-m1-BS.bayern.de	www.finanzamt-muenchen-I.de	631
+9	9182	München II Arbeitnehmerbereich	Deroystr. 20	80335	München	089 1252-0	089 1252-2888	80269			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	Poststelle@fa-m2-BS.bayern.de	www.finanzamt-muenchen-II.de	632
+9	9183	München III Arbeitnehmerbereich	Deroystr. 18	80335	München	089 1252-0	089 1252-3788	80301			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	Poststelle@fa-m3-BS.bayern.de	www.finanzamt-muenchen-III.de	633
+9	9184	München IV Arbeitnehmerbereich	Deroystr. 4 Aufgang I	80335	München	089 1252-0	089 1252-4820	80302			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	Poststelle@fa-m4-BS.bayern.de	www.finanzamt-muenchen-IV.de	634
+9	9185	München V Arbeitnehmerbereich	Deroystr. 4 Aufgang II	80335	München	089 1252-0	089 1252-5799	80303			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Servicezentrum Deroystr. 6: Mo-Mi 7:30-16:00, Do 7:30-18:00, Fr 7:30-12:30 (i. Ü. nach Vereinb.)	Poststelle@fa-m5-BS.bayern.de	www.finanzamt-muenchen-V.de	635
+9	9187	München f. Körpersch. 	Meiserstr. 4	80333	München	089 1252-0	089 1252-7777	80275	80008	20 09 26	70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-koe.bayern.de	www.finanzamt-muenchen-koerperschaften.de	636
+9	9189	München-Zentral Kraftfahrzeugsteuer	Winzererstr. 47a	80797	München	089 3065-0	089 3065-1900	80784			70050000	24962	BAYERNLB MUENCHEN	70000000	70001506	BBK MUENCHEN	Mo, Di, Do, Fr 8:00-12:00 Uhr, Mi geschlossen	poststelle@fa-m-zfa.bayern.de	www.finanzamt-muenchen-zentral.de	637
+9	9201	Amberg 	Kirchensteig 2	92224	Amberg	09621 36-0	09621 36-413		92204	1452	75300000	75301503	BBK REGENSBURG EH WEIDEN	75250000	190011122	SPARKASSE AMBERG-SULZBACH	Servicezentrum: Mo, Die, Mi, Fr: 07:30 - 12:00 UhrDo: 07:30 - 17:30 Uhr	poststelle@fa-am.bayern.de	www.finanzamt-amberg.de	638
+9	9202	Obernburg a. Main mit Außenstelle Amorbach	Schneeberger Str. 1	63916	Amorbach	09373 202-0	09373 202-100		63912	1160	79500000	79501502	BBK WUERZBURG EH ASCHAFFENB	79650000	620300111	SPK MILTENBERG-OBERNBURG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-amorb.bayern.de	www.finanzamt-amorbach.de	639
+9	9203	Ansbach mit Außenstellen	Mozartstr. 25	91522	Ansbach	0981 16-0	0981 16-333		91511	608	76500000	76501500	BBK NUERNBERG EH ANSBACH	76550000	215004	VER SPK ANSBACH	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-an.bayern.de	www.finanzamt-ansbach.de	640
+9	9204	Aschaffenburg 	Auhofstr. 13	63741	Aschaffenburg	06021 492-0	06021 492-1000	63736			79500000	79501500	BBK WUERZBURG EH ASCHAFFENB	79550000	8375	SPK ASCHAFFENBURG ALZENAU	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 8:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-ab.bayern.de	www.finanzamt-aschaffenburg.de	641
+9	9205	Bad Kissingen 	Bibrastr. 10	97688	Bad Kissingen	0971 8021-0	0971 8021-200		97663	1360	79300000	79301501	BBK WUERZBURG EH SCHWEINFUR	79351010	10009	SPK BAD KISSINGEN	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-kg.bayern.de	/www.finanzamt-bad-kissingen.de	642
+9	9206	Bad Neustadt a.d.S. 	Meininger Str. 39	97616	Bad Neustadt	09771 9104-0	09771 9104-444	97615			79300000	79301502	BBK WUERZBURG EH SCHWEINFUR	79353090	7005	SPK BAD NEUSTADT A D SAALE	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-nes.bayern.de	www.finanzamt-bad-neustadt.de	643
+9	9207	Bamberg 	Martin-Luther-Str. 1	96050	Bamberg	0951 84-0	0951 84-230	96045			77000000	77001500	BBK NUERNBERG EH BAMBERG	77050000	30700	SPK BAMBERG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-ba.bayern.de	www.finanzamt-bamberg.de	644
+9	9208	Bayreuth 	Maximilianstr. 12/14	95444	Bayreuth	0921 609-0	0921 609-254		95422	110361	77300000	773 01500	BBK BAYREUTH	77350110	9033333	SPARKASSE BAYREUTH	Servicezentrum: Mo - Mi: 07:30 - 14:00 Uhr, Do: 07:30 - 17:00 Uhr, Fr: 07:30	poststelle@fa-bt.bayern.de	www.finanzamt-bayreuth.de	645
+9	9211	Cham mit Außenstellen 	Reberstr. 2	93413	Cham	09971 488-0	09971 488-199		93402	1253	74221170	344 755 205	HYPOVEREINSBK CHAM, OBERPF	76010085	1735-858	POSTBANK NUERNBERG	Servicezentrum: Mo - Mi: 07:30 - 15:00 Uhr, Do: 07:30 - 18:00 Uhr, Fr: 07:30	poststelle@fa-cha.bayern.de	www.finanzamt-cham.de	646
+9	9212	Coburg 	Rodacher Straße 4	96450	Coburg	09561 646-0	09561 646-130		96406	1653	77000000	78301500	BBK NUERNBERG EH BAMBERG	78350000	7450	VER SPK COBURG	Servicezentrum: Mo - Fr: 08:00 - 13:00 Uhr, Do: 14:00 - 18:00 Uhr	poststelle@fa-co.bayern.de	www.finanzamt-coburg.de	647
+9	9213	Dinkelsbühl - Außenstelle des  Finanzamts Ansbach -	Föhrenberggasse 30	91550	Dinkelsbühl	0981 16-0	09851 5737-607				76500000	76501500	BBK NUERNBERG EH ANSBACH	76550000	215004	VER SPK ANSBACH	Servicezentrum: Mo - Mi: 08:00 - 14:00, Do: 08:00 - 18:00 Uhr, Fr: 08:00 -	poststelle@fa-dkb.bayern.de	www.finanzamt-dinkelsbuehl.de	648
+9	9214	Ebern - Außenstelle des Finanzamts Zeil -	Rittergasse 1	96104	Ebern	09524 824-0	09524 824-225				79300000	79301505	BBK WUERZBURG EH SCHWEINFUR	79351730	500900	SPK OSTUNTERFRANKEN	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-ebn.bayern.de	www.finanzamt-ebern.de	649
+9	9216	Erlangen 	Schubertstr 10	91052	Erlangen	09131 121-0	09131 121-369	91051			76000000	76001507	BBK NUERNBERG	76350000	2929	ST U KR SPK ERLANGEN	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-er.bayern.de	www.finanzamt-erlangen.de	650
+9	9217	Forchheim 	Dechant-Reuder-Str. 6	91301	Forchheim	09191 626-0	09191 626-200	91299			76000000	76001508	BBK NUERNBERG	76351040	91	SPARKASSE FORCHHEIM	Servicezentrum: Mo - Mi: 08:00 - 13:00 Uhr, Do: 08:00 - 17:30, Fr: 08:00 -	poststelle@fa-fo.bayern.de	www.finanzamt-forchheim.de	651
+9	9218	Fürth 	Herrnstraße 69	90763	Fürth	0911 7435-0	0911 7435-350	90744			76000000	76201500	BBK NUERNBERG	76250000	18200	SPK FUERTH	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-fue.bayern.de	www.finanzamt-fuerth.de	652
+9	9220	Gunzenhausen 	Hindenburgplatz 1	91710	Gunzenhausen	09831 8009-0	09831 8009-77	91709			76500000	76501502	BBK NUERNBERG EH ANSBACH	76551540	109785	VER SPK GUNZENHAUSEN	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-gun.bayern.de	www.finanzamt-gunzenhausen.de	653
+9	9221	Hersbruck 	Amberger Str. 76 (Haus B)	91217	Hersbruck	09151 731-0	09151 731-200		91211	273	76000000	76001505	BBK NUERNBERG	76050101	190016618	SPARKASSE NUERNBERG	Servicezentrum: Mo - Mi: 08:00 - 15:30 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-heb.bayern.de	www.finanzamt-hersbruck.de	654
+9	9222	Hilpoltstein 	Spitalwinkel 3	91161	Hilpoltstein	09174 469-0	09174 469-100		91155	1180	76000000	76401520	BBK NUERNBERG	76450000	240000026	SPK MITTELFRANKEN-SUED	Servicezentrum: Mo - Fr: 08:00 - 12:30 Uhr, Do: 14:00 - 18:00 Uhr	poststelle@fa-hip.bayern.de	www.finanzamt-hilpoltstein.de	655
+9	9223	Hof mit Außenstellen 	Ernst-Reuter-Str. 60	95030	Hof	09281 929-0	09281 929-1500		95012	1368	78000000	78001500	BBK BAYREUTH EH HOF	78050000	380020750	KR U ST SPK HOF	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-ho.bayern.de	www.finanzamt-hof.de	656
+9	9224	Hofheim - Außenstelle des Finanzamts Zeil -	Marktplatz 1	97457	Hofheim	09524 824-0	09524 824-250				79300000	79301505	BBK WUERZBURG EH SCHWEINFUR	79351730	500900	SPK OSTUNTERFRANKEN	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-hoh.bayern.de	www.finanzamt-hofheim.de	657
+9	9225	Karlstadt - Außenstelle des Finanzamts Lohr -	Gemündener Str. 3	97753	Karlstadt	09353 949-0	09353 949-2250				79000000	79001504	BBK WUERZBURG	79050000	2246	SPK MAINFRANKEN WUERZBURG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-kar.bayern.de	www.finanzamt-karlstadt.de	658
+9	9227	Kitzingen 	Moltkestr. 24	97318	Kitzingen	09321 703-0	09321 703-444		97308	660	79000000	79101500	BBK WUERZBURG	79050000	42070557	SPK MAINFRANKEN WUERZBURG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-kt.bayern.de	www.finanzamt-kitzingen.de	659
+9	9228	Kronach 	Amtsgerichtsstr. 13	96317	Kronach	09261 510-0	09261 510-199		96302	1262	77300000	77101501	BBK BAYREUTH	77151640	240006007	SPK KRONACH-LUDWIGSSTADT	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08.00 - 17:30 Uhr, Fr: 08:00	poststelle@fa-kc.bayern.de	www.finanzamt-kronach.de	660
+9	9229	Kulmbach 	Georg-Hagen-Str. 17	95326	Kulmbach	09221 650-0	09221 650-283		95304	1420	77300000	77101500	BBK BAYREUTH	77150000	105445	SPARKASSE KULMBACH	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08.00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-ku.bayern.de	www.finanzamt-kulmbach.de	661
+9	9230	Lichtenfels 	Kronacher Str. 39	96215	Lichtenfels	09571 764-0	09571 764-420		96206	1680	77000000	77001502	BBK NUERNBERG EH BAMBERG	77051860	2345	KR SPK LICHTENFELS	Servicezentrum: Mo - Fr: 08:00 - 13:00 Uhr, Do: 14:00 - 17:00 Uhr	poststelle@fa-lif.bayern.de	www.finanzamt-lichtenfels.de	662
+9	9231	Lohr a. Main mit Außenstellen  	Rexrothstr. 14	97816	Lohr	09352 850-0	09352 850-1300		97804	1465	79000000	79001504	BBK WUERZBURG	79050000	2246	SPK MAINFRANKEN WUERZBURG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-loh.bayern.de	www.finanzamt-lohr.de	663
+9	9232	Marktheidenfeld - Außenstelle  des Finanzamts Lohr -	Ringstr. 24/26	97828	Marktheidenfeld	09391 506-0	09391 506-3299				79000000	79001504	BBK WUERZBURG	79050000	2246	SPK MAINFRANKEN WUERZBURG	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-mar.bayern.de	www.finanzamt-marktheidenfeld.de	664
+9	9233	Münchberg - Außenstelle des Finanzamts Hof -	Hofer Str. 1	95213	Münchberg	09281 929-0	09281 929-3505				78000000	78001500	BBK BAYREUTH EH HOF	78050000	380020750	KR U ST SPK HOF	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-mueb.bayern.de	www.finanzamt-muenchberg.de	665
+9	9234	Naila - Außenstelle des Finanzamts Hof -	Carl-Seyffert-Str. 3	95119	Naila	09281 929-0	09281 929-2506				78000000	78001500	BBK BAYREUTH EH HOF	78050000	380020750	KR U ST SPK HOF	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-nai.bayern.de	www.finanzamt-naila.de	666
+9	9235	Neumarkt i.d.Opf. 	Ingolstädter Str. 3	92318	Neumarkt	09181 692-0	09181 692-1200				76000000	76001506	BBK NUERNBERG	76052080	6296	SPK NEUMARKT I D OPF-PARSBG	Servicezentrum: Mo - Do: 07:30 - 15:00 Uhr, Fr: 07:30 - 12:00 Uhr	poststelle@fa-nm.bayern.de	/www.finanzamt-neumarkt.de	667
+9	9236	Neunburg v. W. - Außenstelle des Finanzamts Schwandorf -	Krankenhausstr. 6	92431	Neunburg vorm Wald	09431 382-0	09431 382-539		92428	1000	75300000	75301502	BBK REGENSBURG EH WEIDEN	75051040	380019000	SPK IM LANDKREIS SCHWANDORF	Servicezentrum: Mo-Mi: 07:30-12:30 u. 13:30-15:30,Do: 07:30-12:30 u. 13:30-17:00, Fr: 07:30-12:30 h 	poststelle@fa-nen.bayern.de	www.finanzamt-neunburg.de	668
+9	9238	Nürnberg-Nord 	Kirchenweg 10	90419	Nürnberg	0911 3998-0	0911 3998-296	90340			76000000	76001502	BBK NUERNBERG	76050000	20161	BAYERNLB NUERNBERG	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-n-n.bayern.de	www.finanzamt-nuernberg-nord.de	669
+9	9240	Nürnberg-Süd 	Sandstr. 20	90443	Nürnberg	0911 248-0	0911 248-2299/2599	90339			76000000	76001503	BBK NUERNBERG	76050101	3648043	SPARKASSE NUERNBERG	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-n-s.bayern.de	www.finanzamt-nuernberg-sued.de	670
+9	9241	Nürnberg-Zentral 	Voigtländerstr. 7/9	90489	Nürnberg	0911 5393-0	0911 5393-2000				76000000	76001501	BBK NUERNBERG	76050101	1025008	SPARKASSE NUERNBERG	Servicezentrum: Mo - Do: 08:00 - 12:30 h, Di und Do: 13:30 - 15:00 h,	poststelle@fa-n-zfa.bayern.de	www.zentralfinanzamt-nuernberg.de	671
+9	9242	Ochsenfurt - Außenstelle des Finanzamts Würzburg -	Völkstr.1	97199	Ochsenfurt	09331 904-0	09331 904-200		97196	1263	79000000	79001500	BBK WUERZBURG	79020076	801283	HYPOVEREINSBK WUERZBURG	Servicezentrum: Mo - Mi: 07:30 - 13:00 Uhr, Do: 07:30 - 17:00 uhr, Fr: 07:30	poststelle@fa-och.bayern.de	www.finanzamt-ochsenfurt.de	672
+9	9244	Regensburg 	Landshuter Str. 4	93047	Regensburg	0941 5024-0	0941 5024-1199	93042			75000000	75001500	BBK REGENSBURG	75050000	111500	SPK REGENSBURG	Servicezentrum: Mo - Mi: 07:30 - 15:00 Uhr, Do: 07:30 - 17:00 Uhr, Fr: 07:30	poststelle@fa-r.bayern.de	www.finanzamt-regensburg.de	673
+9	9246	Rothenburg - Außenstelle des Finanzamts Ansbach -	Ludwig-Siebert-Str. 31	91541	Rothenburg o.d.T.	0981 16-0	09861 706-511				76500000	76501500	BBK NUERNBERG EH ANSBACH	76550000	215004	VER SPK ANSBACH	Servicezentrum: Mo - Mi: 08:00 - 14:00 Uhr, Do: 08:00 - 18:00 Uhr, Fr: 08:00	poststelle@fa-rot.bayern.de	www.finanzamt-rothenburg.de	674
+9	9247	Schwabach 	Theodor-Heuss-Str. 63	91126	Schwabach	09122 928-0	09122 928-100	91124			76000000	76401500	BBK NUERNBERG	76450000	55533	SPK MITTELFRANKEN-SUED	Servicezentrum: Mo - Mi: 08:00 - 13:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-sc.bayern.de	www.finanzamt-schwabach.de	675
+9	9248	Schwandorf mit Außenstelle Neunburg v. W.	Friedrich-Ebert-Str.59	92421	Schwandorf	09431 382-0	09431 382-111	92419			75300000	75301502	BBK REGENSBURG EH WEIDEN	75051040	380019000	SPK IM LANDKREIS SCHWANDORF	Servicezentrum: Mo-Mi: 07:30-12:30 u. 13:30-15:30,Do: 07:30-12:30 u. 13:30-17:00, Fr: 07:30-12:30 h 	poststelle@fa-sad.bayern.de	www.finanzamt-schwandorf.de	676
+9	9249	Schweinfurt 	Schrammstr. 3	97421	Schweinfurt	09721 2911-0	09721 2911-5070	97420			79300000	79301500	BBK WUERZBURG EH SCHWEINFUR	79350101	15800	KR SPK SCHWEINFURT	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-sw.bayern.de	www.finanzamt-schweinfurt.de	677
+9	9250	Selb - Außenstelle des Finanzamts Wunsiedel -	Wittelsbacher Str. 8	95100	Selb	09232 607-0	09232 607-300				78000000	78101512	BBK BAYREUTH EH HOF	78055050	620006254	SPK FICHTELGEBIRGE	Servicezentrum: Mo-Mi: 07:30-12:30 u. 13:30-15:00,Do: 07:30-12:30 und 13:30-17:00, Fr: 07:30-12:00 h	poststelle@fa-sel.bayern.de	www.finanzamt-selb.de	678
+9	9252	Uffenheim 	Schloßpl.	97215	Uffenheim	09842 200-0	09842 200-345		97211	1240	76500000	76501504	BBK NUERNBERG EH ANSBACH	76251020	620002006	SPK I LANDKREIS NEUSTADT	Servicezentrum: Mo-Mi: 08:00-12:00 u. 13:00-15:00,Do: 08:00-12:00 u. 13:00-17:00, Fr: 08:00-12:00 h 	poststelle@fa-uff.bayern.de	www.finanzamt-uffenheim.de	679
+9	9253	Waldmünchen - Außenstelle des  Finanzamts Cham -	Bahnhofstr. 10	93449	Waldmünchen	09971 488-0	09971 488-550				74221170	344 755 205	HYPOVEREINSBK CHAM, OBERPF	76010085	1735-858	POSTBANK NUERNBERG	Servicezentrum: Mo - Mi: 07:30 - 15:00 Uhr, Do: 07:30 - 17:00 Uhr, Fr: 07:30	poststelle@fa-wuem.bayern.de	www.finanzamt-waldmuenchen.de	680
+9	9254	Waldsassen 	Johannisplatz 13	95652	Waldsassen	09632 847-0	09632 847-199		95646	1329	75300000	75301511	BBK REGENSBURG EH WEIDEN	78151080	32367	SPK TIRSCHENREUTH	Servicezentrum: Mo - Fr: 07:30 - 12:30 Uhr, Mo - Mi: 13:30 - 15:30 Uhr,	poststelle@fa-wasa.bayern.de	www.finanzamt-waldsassen.de	681
+9	9255	Weiden i.d.Opf. 	Schlörpl. 2 u. 4	92637	Weiden	0961 301-0	0961 32600		92604	1460	75300000	75301500	BBK REGENSBURG EH WEIDEN	75350000	172700	ST SPK WEIDEN	Servicezentrum: Mo - Fr: 07:30 - 12:30 Uhr, Mo - Mi: 13:30 - 15:30 Uhr,	poststelle@fa-wen.bayern.de	www.finanzamt-weiden.de	682
+9	9257	Würzburg mit Außenstelle Ochsenfurt	Ludwigstr. 25	97070	Würzburg	0931 387-0	0931 387-4444	97064			79000000	79001500	BBK WUERZBURG	79020076	801283	HYPOVEREINSBK WUERZBURG	Servicezentrum: Mo - Mi: 07:30 - 15:00 Uhr, Do: 07:30 - 17:00 Uhr, Fr: 07:30	poststelle@fa-wue.bayern.de	www.finanzamt-wuerzburg.de	683
+9	9258	Wunsiedel mit Außenstelle Selb	Sonnenstr. 11	95632	Wunsiedel	09232 607-0	09232 607-200	95631			78000000	78101512	BBK BAYREUTH EH HOF	78055050	620006254	SPK FICHTELGEBIRGE	Servicezentrum: Mo-Mi: 07:30-12:30 u 13:30-15:00, Do: 07:30-12:30 und 13:30-17:00, Fr: 07:30-12:00 h	poststelle@fa-wun.bayern.de	www.finanzamt-wunsiedel.de	684
+9	9259	Zeil a. Main mit Außenstellen  	Obere Torstr. 9	97475	Zeil	09524 824-0	09524 824-100		97470	1160	79300000	79301505	BBK WUERZBURG EH SCHWEINFUR	79351730	500900	SPK OSTUNTERFRANKEN	Servicezentrum: Mo - Mi: 08:00 - 15:00 Uhr, Do: 08:00 - 17:00 Uhr, Fr: 08:00	poststelle@fa-zei.bayern.de	www.finanzamt-zeil.de	685
+9	9260	Kötzting - Außenstelle des Finanzamts Cham -	Bahnhofstr. 3	93444	Kötzting	09971 488-0	09971 488-450				74221170	344 755 205	HYPOVEREINSBK CHAM, OBERPF	76010085	1735-858	POSTBANK NUERNBERG	Servicezentrum: Mo - Mi: 07:30 - 15:00 Uhr, Do: 07:30 - 18:00 Uhr, Fr: 07:30	poststelle@fa-koez.bayern.de	www.finanzamt-koetzting.de	686
+2	2241	Hamburg-Altona 	Gr. Bergstr. 264/266	22767	Hamburg	040/42811-02	040/42811-2871		22704	500471	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgAltona@finanzamt.hamburg.de		58
+2	2242	Hamburg-Am Tierpark 	Hugh-Greene-Weg 6	22529	Hamburg				22520		20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgAmTierpark@finanzamt.hamburg.de		77
+2	2243	Hamburg-Barmbek-Uhlenhorst 	Lübecker Str. 101-109	22087	Hamburg	040/42860-0	040/42860-730		22053	760360	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FABarmbekUhlenhorst@finanzamt.hamburg.de		78
+2	2243	Hamburg-Barmbek-Uhlenhorst 15  	Lübecker Str. 101-109	22087	Hamburg	040/42860-0	040/42860-730		22053	760360	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgBarmbekUhlenhorst@finanzamt.hamburg.de		64
+2	2244	Hamburg-Bergedorf 	Ludwig-Rosenberg-Ring 41	21031	Hamburg	040/42891-0	040/42891-2243		21003	800360	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		FAHamburgBergedorf@finanzamt.hamburg.de		59
+2	2245	Hamburg-Eimsbüttel 	Stresemannstraße 23	22769	Hamburg	040/42807-0	040/42807-220		22770	570110	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgEimsbuettel@finanzamt.hamburg.de		76
+2	2246	Hamburg-Hansa 	Steinstraße 10	20095	Hamburg	040/42853-01	040/42853-2064		20015	102244	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		FAHamburgHansa@finanzamt.hamburg.de		68
+2	2247	Hamburg-Harburg 	Harburger Ring 40	21073	Hamburg	040/42871-0	040/42871-2215		21043	900352	20000000	200 015 30	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgHarburg@finanzamt.hamburg.de		60
+2	2249	Hamburg-Nord 	Borsteler Chaussee 45	22453	Hamburg	040/42806-0	040/42806-220		22207	600707	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		FAHamburgNord@finanzamt.hamburg.de		71
+2	2250	Hamburg-Oberalster 	Hachmannplatz 2	20099	Hamburg	040/42854-90	040/42854-4960		20015	102248	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgOberalster@finanzamt.hamburg.de		62
+2	2251	Hamburg-Wandsbek 	Schloßstr.107	22041	Hamburg	040/42881-0	040/42881-2888		22006	700660	20000000	20001530	BBK HAMBURG	21050000	101444000	HSH NORDBANK KIEL		 FAHamburgWandsbek@finanzamt.hamburg.de		61
+6	2603	Bad Homburg v.d. Höhe 	Kaiser-Friedr.-Promenade 8-10 	61348	Bad Homburg	06172/107-0	06172/107-317	61343	61284	1445	50050000	1000124	Landesbank Hessen-Thüringen	50000000	50001501	DT BBK Filiale Frankfurt am Main	Mo u. Fr 8:00-12:00, Mi 14:00-18:00 Uhr	poststelle@Finanzamt-Bad-Homburg.de	www.Finanzamt-Bad-Homburg.de	162
+8	2870	Leonberg 	Schlosshof 3	71229	Leonberg	(07152) 15-1	07152/15333	71226			60000000	60301501	DT BBK Filiale Stuttgart				MO-MI 7.30-12.00,DO 7.30-17.30,FR 7.30-12.30	poststelle-70@finanzamt.bwl.de	http://www.fa-leonberg.de/	301
+\.
+
+
+--
+-- Data for Name: follow_up_access; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.follow_up_access (who, what, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: follow_up_created_for_employees; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.follow_up_created_for_employees (id, follow_up_id, employee_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: follow_up_done; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.follow_up_done (id, follow_up_id, done_at, employee_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: follow_up_links; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.follow_up_links (id, follow_up_id, trans_id, trans_type, trans_info, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: follow_ups; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.follow_ups (id, follow_up_date, note_id, created_by, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: generic_translations; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.generic_translations (id, language_id, translation_type, translation_id, translation) FROM stdin;
+\.
+
+
+--
+-- Data for Name: gl; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.gl (id, reference, description, transdate, gldate, employee_id, notes, department_id, taxincluded, itime, mtime, type, ob_transaction, cb_transaction, storno, storno_id, deliverydate, imported, tax_point, transaction_description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: greetings; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.greetings (id, description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: history_erp; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.history_erp (id, trans_id, employee_id, addition, what_done, itime, snumbers) FROM stdin;
+\.
+
+
+--
+-- Data for Name: inventory; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.inventory (warehouse_id, parts_id, oe_id, delivery_order_items_stock_id, shippingdate, employee_id, itime, mtime, bin_id, qty, trans_id, trans_type_id, project_id, chargenumber, comment, bestbefore, id, invoice_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: invoice; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.invoice (id, trans_id, parts_id, description, qty, allocated, sellprice, fxsellprice, discount, assemblyitem, project_id, deliverydate, serialnumber, itime, mtime, pricegroup_id, ordnumber, transdate, cusordnumber, unit, base_qty, subtotal, longdescription, marge_total, marge_percent, lastcost, price_factor_id, price_factor, marge_price_factor, donumber, "position", active_price_source, active_discount_source, inventory_chart_id, expense_chart_id, tax_id, tax_chart_type) FROM stdin;
+\.
+
+
+--
+-- Data for Name: language; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.language (id, description, template_code, article_code, itime, mtime, output_numberformat, output_dateformat, output_longdates, obsolete) FROM stdin;
+\.
+
+
+--
+-- Data for Name: leads; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.leads (id, lead) FROM stdin;
+\.
+
+
+--
+-- Data for Name: letter; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.letter (id, customer_id, letternumber, subject, greeting, body, employee_id, salesman_id, itime, mtime, date, reference, intnotes, cp_id, vendor_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: letter_draft; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.letter_draft (id, customer_id, cp_id, letternumber, date, intnotes, reference, subject, greeting, body, employee_id, salesman_id, itime, mtime, vendor_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: makemodel; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.makemodel (parts_id, model, itime, mtime, lastcost, lastupdate, sortorder, make, id, part_description, part_longdescription) FROM stdin;
+\.
+
+
+--
+-- Data for Name: notes; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.notes (id, subject, body, created_by, trans_id, trans_module, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: oe; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.oe (id, ordnumber, transdate, vendor_id, customer_id, amount, netamount, reqdate, taxincluded, shippingpoint, notes, employee_id, closed, quonumber, cusordnumber, intnotes, department_id, itime, mtime, shipvia, cp_id, language_id, payment_id, delivery_customer_id, delivery_vendor_id, taxzone_id, proforma, shipto_id, order_probability, expected_billing_date, globalproject_id, delivered, salesman_id, marge_total, marge_percent, transaction_description, delivery_term_id, currency_id, exchangerate, tax_point, billing_address_id, order_status_id, record_type, vendor_confirmation_number) FROM stdin;
+\.
+
+
+--
+-- Data for Name: oe_version; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.oe_version (oe_id, version, final_version, email_journal_id, file_id, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: order_statuses; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.order_statuses (id, name, description, "position", obsolete, itime, mtime) FROM stdin;
+1	bestätigt	Auftrag von Kunde bestätigt	1	f	2026-04-24 23:21:55.955321	\N
+\.
+
+
+--
+-- Data for Name: orderitems; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.orderitems (trans_id, parts_id, description, qty, sellprice, discount, project_id, reqdate, ship, serialnumber, id, itime, mtime, pricegroup_id, ordnumber, transdate, cusordnumber, unit, base_qty, subtotal, longdescription, marge_total, marge_percent, lastcost, price_factor_id, price_factor, marge_price_factor, "position", active_price_source, active_discount_source, optional, recurring_billing_mode, recurring_billing_invoice_id, orderer_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: part_classifications; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.part_classifications (id, description, abbreviation, used_for_purchase, used_for_sale, report_separate) FROM stdin;
+0	-------	None (typeabbreviation)	t	t	f
+1	Purchase	Purchase (typeabbreviation)	t	f	f
+2	Sales	Sales (typeabbreviation)	f	t	f
+3	Merchandise	Merchandise (typeabbreviation)	t	t	f
+4	Production	Production (typeabbreviation)	f	t	f
+\.
+
+
+--
+-- Data for Name: part_customer_prices; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.part_customer_prices (id, parts_id, customer_id, customer_partnumber, price, sortorder, lastupdate, part_description, part_longdescription) FROM stdin;
+\.
+
+
+--
+-- Data for Name: parts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.parts (id, partnumber, description, listprice, sellprice, lastcost, priceupdate, weight, notes, makemodel, rop, shop, obsolete, bom, image, drawing, microfiche, partsgroup_id, ve, gv, itime, mtime, unit, formel, not_discountable, buchungsgruppen_id, payment_id, ean, price_factor_id, onhand, stockable, has_sernumber, warehouse_id, bin_id, classification_id, part_type, order_qty, order_locked, tariff_code) FROM stdin;
+\.
+
+
+--
+-- Data for Name: parts_price_history; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.parts_price_history (id, part_id, valid_from, lastcost, listprice, sellprice, price_factor) FROM stdin;
+\.
+
+
+--
+-- Data for Name: partsgroup; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.partsgroup (id, partsgroup, itime, mtime, obsolete, sortkey) FROM stdin;
+\.
+
+
+--
+-- Data for Name: payment_terms; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.payment_terms (id, description, description_long, terms_netto, terms_skonto, percent_skonto, itime, mtime, sortkey, auto_calculation, description_long_invoice, obsolete) FROM stdin;
+\.
+
+
+--
+-- Data for Name: periodic_invoices; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.periodic_invoices (id, config_id, ar_id, period_start_date, itime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: periodic_invoices_configs; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.periodic_invoices_configs (id, oe_id, periodicity, print, printer_id, copies, active, terminated, start_date, end_date, ar_chart_id, extend_automatically_by, first_billing_date, order_value_periodicity, direct_debit, send_email, email_recipient_contact_id, email_recipient_address, email_sender, email_subject, email_body) FROM stdin;
+\.
+
+
+--
+-- Data for Name: price_factors; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.price_factors (id, description, factor, sortkey) FROM stdin;
+876	pro 10	10.00000	1
+877	pro 100	100.00000	2
+878	pro 1.000	1000.00000	3
+\.
+
+
+--
+-- Data for Name: price_rule_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.price_rule_items (id, price_rules_id, type, op, custom_variable_configs_id, value_text, value_int, value_date, value_num, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: price_rules; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.price_rules (id, name, type, priority, price, reduction, obsolete, itime, mtime, discount) FROM stdin;
+\.
+
+
+--
+-- Data for Name: pricegroup; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.pricegroup (id, pricegroup, obsolete, sortkey) FROM stdin;
+\.
+
+
+--
+-- Data for Name: prices; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.prices (parts_id, pricegroup_id, price, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: printers; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.printers (id, printer_description, printer_command, template_code) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project (id, projectnumber, description, itime, mtime, active, customer_id, valid, project_type_id, start_date, end_date, billable_customer_id, budget_cost, order_value, budget_minutes, timeframe, project_status_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project_participants; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_participants (id, project_id, employee_id, project_role_id, minutes, cost_per_hour, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project_phase_participants; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_phase_participants (id, project_phase_id, employee_id, project_role_id, minutes, cost_per_hour, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project_phases; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_phases (id, project_id, start_date, end_date, name, description, budget_minutes, budget_cost, general_minutes, general_cost_per_hour, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project_roles; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_roles (id, name, description, "position", itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: project_statuses; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_statuses (id, name, description, "position", itime, mtime) FROM stdin;
+1	presales	Akquise	1	2018-11-30 19:56:01.493701	\N
+2	planning	In Planung	2	2018-11-30 19:56:01.493701	\N
+3	running	In Bearbeitung	3	2018-11-30 19:56:01.493701	\N
+4	done	Fertiggestellt	4	2018-11-30 19:56:01.493701	\N
+\.
+
+
+--
+-- Data for Name: project_types; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.project_types (id, "position", description, internal) FROM stdin;
+1	1	Standard	f
+2	2	Festpreis	f
+3	3	Support	f
+\.
+
+
+--
+-- Data for Name: purchase_basket_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.purchase_basket_items (id, part_id, orderer_id, qty, cleared, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: reclamation_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.reclamation_items (id, reclamation_id, reason_id, reason_description_ext, reason_description_int, "position", itime, mtime, project_id, parts_id, description, longdescription, serialnumber, base_qty, qty, unit, sellprice, lastcost, discount, pricegroup_id, price_factor_id, price_factor, active_price_source, active_discount_source, reqdate) FROM stdin;
+\.
+
+
+--
+-- Data for Name: reclamation_reasons; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.reclamation_reasons (id, name, description, "position", itime, mtime, valid_for_sales, valid_for_purchase) FROM stdin;
+\.
+
+
+--
+-- Data for Name: reclamations; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.reclamations (id, record_number, transdate, itime, mtime, delivered, closed, employee_id, globalproject_id, delivery_term_id, shipto_id, department_id, contact_id, shipvia, transaction_description, shippingpoint, cv_record_number, reqdate, amount, netamount, payment_id, currency_id, taxincluded, tax_point, exchangerate, taxzone_id, notes, intnotes, language_id, salesman_id, customer_id, vendor_id, billing_address_id, record_type) FROM stdin;
+\.
+
+
+--
+-- Data for Name: reconciliation_links; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.reconciliation_links (id, bank_transaction_id, acc_trans_id, rec_group) FROM stdin;
+\.
+
+
+--
+-- Data for Name: record_links; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.record_links (from_table, from_id, to_table, to_id, itime, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: record_template_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.record_template_items (id, record_template_id, chart_id, tax_id, project_id, amount1, amount2, source, memo) FROM stdin;
+\.
+
+
+--
+-- Data for Name: record_templates; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.record_templates (id, template_name, template_type, customer_id, vendor_id, currency_id, department_id, project_id, employee_id, taxincluded, direct_debit, ob_transaction, cb_transaction, reference, description, ordnumber, notes, ar_ap_chart_id, itime, mtime, show_details, payment_id, transaction_description) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_acceptance_statuses; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_acceptance_statuses (id, name, description, "position", itime, mtime) FROM stdin;
+1	accepted	Abgenommen	1	2018-11-30 19:55:58.422952	\N
+2	accepted_with_defects	Mit Mängeln abgenommen	2	2018-11-30 19:55:58.422952	\N
+3	accepted_with_defects_to_be_fixed	Mit noch zu behebenden Mängeln abgenommen	3	2018-11-30 19:55:58.422952	\N
+4	not_accepted	Nicht abgenommen	4	2018-11-30 19:55:58.422952	\N
+\.
+
+
+--
+-- Data for Name: requirement_spec_complexities; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_complexities (id, description, "position", itime, mtime) FROM stdin;
+1	nicht bewertet	1	2018-11-30 19:55:58.422952	\N
+2	nur Anforderung	2	2018-11-30 19:55:58.422952	\N
+3	gering	3	2018-11-30 19:55:58.422952	\N
+4	mittel	4	2018-11-30 19:55:58.422952	\N
+5	hoch	5	2018-11-30 19:55:58.422952	\N
+\.
+
+
+--
+-- Data for Name: requirement_spec_item_dependencies; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_item_dependencies (depending_item_id, depended_item_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_items (id, requirement_spec_id, item_type, parent_id, "position", fb_number, title, description, complexity_id, risk_id, time_estimation, is_flagged, acceptance_status_id, acceptance_text, itime, mtime, order_part_id, sellprice_factor) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_orders; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_orders (id, requirement_spec_id, order_id, version_id, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_parts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_parts (id, requirement_spec_id, part_id, unit_id, qty, description, "position") FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_pictures; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_pictures (id, requirement_spec_id, text_block_id, "position", number, description, picture_file_name, picture_content_type, picture_mtime, picture_content, picture_width, picture_height, thumbnail_content_type, thumbnail_content, thumbnail_width, thumbnail_height, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_predefined_texts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_predefined_texts (id, description, title, text, "position", itime, mtime, useable_for_text_blocks, useable_for_sections) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_risks; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_risks (id, description, "position", itime, mtime) FROM stdin;
+1	nicht bewertet	1	2018-11-30 19:55:58.422952	\N
+2	nur Anforderung	2	2018-11-30 19:55:58.422952	\N
+3	gering	3	2018-11-30 19:55:58.422952	\N
+4	mittel	4	2018-11-30 19:55:58.422952	\N
+5	hoch	5	2018-11-30 19:55:58.422952	\N
+\.
+
+
+--
+-- Data for Name: requirement_spec_statuses; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_statuses (id, name, description, "position", itime, mtime) FROM stdin;
+1	planning	In Planung	1	2018-11-30 19:55:58.422952	\N
+2	running	In Bearbeitung	2	2018-11-30 19:55:58.422952	\N
+3	done	Fertiggestellt	3	2018-11-30 19:55:58.422952	\N
+\.
+
+
+--
+-- Data for Name: requirement_spec_text_blocks; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_text_blocks (id, requirement_spec_id, title, text, "position", output_position, is_flagged, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_spec_types; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_types (id, description, "position", itime, mtime, section_number_format, function_block_number_format, template_file_name) FROM stdin;
+1	Pflichtenheft	1	2018-11-30 19:55:58.422952	2018-11-30 19:56:00.17203	A00	FB000	requirement_spec
+2	Konzept	2	2018-11-30 19:55:58.422952	2018-11-30 19:56:00.17203	A00	FB000	requirement_spec
+\.
+
+
+--
+-- Data for Name: requirement_spec_versions; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_spec_versions (id, version_number, description, comment, itime, mtime, requirement_spec_id, working_copy_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: requirement_specs; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.requirement_specs (id, type_id, status_id, customer_id, project_id, title, hourly_rate, working_copy_id, previous_section_number, previous_fb_number, is_template, itime, mtime, time_estimation, previous_picture_number) FROM stdin;
+\.
+
+
+--
+-- Data for Name: schema_info; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.schema_info (tag, login, itime) FROM stdin;
+SKR04-3804-addition	\N	2018-11-30 19:55:45.174964
+acc_trans_constraints	\N	2018-11-30 19:55:45.210558
+chart_category_to_sgn	\N	2018-11-30 19:55:45.218222
+chart_names	\N	2018-11-30 19:55:45.244082
+chart_names2	\N	2018-11-30 19:55:45.256024
+customer_vendor_ustid_length	\N	2018-11-30 19:55:45.261282
+language_output_formatting	\N	2018-11-30 19:55:45.322083
+remove_obsolete_trigger	\N	2018-11-30 19:55:45.332541
+rename_buchungsgruppen_accounts_16_19_percent	\N	2018-11-30 19:55:45.365412
+sales_quotation_order_probability_expected_billing_date	\N	2018-11-30 19:55:45.376983
+tax_id_if_taxkey_is_0	\N	2018-11-30 19:55:45.412791
+units_translations_and_singular_plural_distinction	\N	2018-11-30 19:55:45.446145
+tax_primary_key_taxkeys_foreign_keys	\N	2018-11-30 19:55:45.490042
+invalid_taxkesy	\N	2018-11-30 19:55:45.555725
+release_2_4_1	\N	2018-11-30 19:55:45.564486
+PgCommaAggregateFunction	\N	2018-11-30 19:55:45.567866
+ap_ar_orddate_quodate	\N	2018-11-30 19:55:45.597428
+buchungsgruppen_sortkey	\N	2018-11-30 19:55:45.605303
+customer_vendor_taxzone_id	\N	2018-11-30 19:55:45.622974
+drafts	\N	2018-11-30 19:55:45.634118
+employee_no_limits	\N	2018-11-30 19:55:45.680553
+globalprojectnumber_ap_ar_oe	\N	2018-11-30 19:55:45.803085
+oe_delivered	\N	2018-11-30 19:55:45.84173
+oe_is_salesman	\N	2018-11-30 19:55:45.873555
+parts_ean	\N	2018-11-30 19:55:45.887684
+payment_terms_sortkey	\N	2018-11-30 19:55:45.914306
+payment_terms_translation	\N	2018-11-30 19:55:45.960187
+project	\N	2018-11-30 19:55:45.995579
+status_history	\N	2018-11-30 19:55:46.045406
+units_sortkey	\N	2018-11-30 19:55:46.115783
+history_erp	\N	2018-11-30 19:55:46.152037
+marge_initial	\N	2018-11-30 19:55:46.197707
+ustva_setup_2007	\N	2018-11-30 19:55:46.26325
+history_erp_snumbers	\N	2018-11-30 19:55:46.275988
+tax_description_without_percentage_skr04	\N	2018-11-30 19:55:46.279507
+ustva_setup_2007_update_chart_taxkeys_tax	\N	2018-11-30 19:55:46.317645
+fix_taxdescription	\N	2018-11-30 19:55:46.577194
+ustva_setup_2007_update_chart_taxkeys_tax_add_missing_tax_accounts	\N	2018-11-30 19:55:46.638225
+tax_description_without_percentage	\N	2018-11-30 19:55:46.643882
+release_2_4_2	\N	2018-11-30 19:55:46.669579
+COA_Account_Settings001	\N	2018-11-30 19:55:46.692044
+COA_Account_Settings002	\N	2018-11-30 19:55:46.696469
+USTVA_abstraction	\N	2018-11-30 19:55:46.705048
+ap_storno	\N	2018-11-30 19:55:46.896405
+ar_storno	\N	2018-11-30 19:55:46.910344
+cb_ob_transaction	\N	2018-11-30 19:55:46.917141
+dunning_config_interest_rate	\N	2018-11-30 19:55:46.930598
+dunning_dunning_id	\N	2018-11-30 19:55:46.934877
+dunning_invoices_for_fees	\N	2018-11-30 19:55:46.969019
+gl_storno	\N	2018-11-30 19:55:47.008196
+invalid_taxkeys_2	\N	2018-11-30 19:55:47.059046
+transaction_description	\N	2018-11-30 19:55:47.063822
+USTVA_at	\N	2018-11-30 19:55:47.098808
+ar_ap_storno_id	\N	2018-11-30 19:55:47.12736
+dunning_invoices_per_dunning_level	\N	2018-11-30 19:55:47.133384
+tax_report_table_name	\N	2018-11-30 19:55:47.166219
+release_2_4_3	\N	2018-11-30 19:55:47.171269
+acc_trans_without_oid	\N	2018-11-30 19:55:47.202126
+bank_accounts	\N	2018-11-30 19:55:47.273663
+change_makemodel_vendor_id	\N	2018-11-30 19:55:47.313558
+custom_variables	\N	2018-11-30 19:55:47.323778
+direct_debit	\N	2018-11-30 19:55:47.434728
+follow_ups	\N	2018-11-30 19:55:47.44274
+oe_employee_id_foreignkey	\N	2018-11-30 19:55:47.551783
+price_factors	\N	2018-11-30 19:55:47.562934
+sic_code	\N	2018-11-30 19:55:47.63685
+todo_config	\N	2018-11-30 19:55:47.653254
+trigger_assembly_update_lastcost	\N	2018-11-30 19:55:47.663649
+units_no_type_distinction	\N	2018-11-30 19:55:47.680328
+warehouse	\N	2018-11-30 19:55:47.68458
+delivery_orders	\N	2018-11-30 19:55:47.84525
+transfer_type_shipped	\N	2018-11-30 19:55:48.001091
+warehouse2	\N	2018-11-30 19:55:48.006661
+ar_add_donumber	\N	2018-11-30 19:55:48.033706
+ar_add_invnumber_for_credit_note	\N	2018-11-30 19:55:48.037974
+check_bin_belongs_to_wh_trigger	\N	2018-11-30 19:55:48.042363
+record_links	\N	2018-11-30 19:55:48.077381
+transaction_description_not_null	\N	2018-11-30 19:55:48.126988
+release_2_6_0	\N	2018-11-30 19:55:48.152161
+auth_enable_sales_all_edit	\N	2018-11-30 19:55:48.157499
+custom_variables_parts_services_assemblies	\N	2018-11-30 19:55:48.16081
+custom_variables_valid	\N	2018-11-30 19:55:48.17155
+delivery_orders_fields_for_invoices	\N	2018-11-30 19:55:48.18514
+fix_acc_trans_ap_taxkey_bug	\N	2018-11-30 19:55:48.230767
+fix_datepaid	\N	2018-11-30 19:55:48.244741
+generic_translations	\N	2018-11-30 19:55:48.273009
+has_sernumber	\N	2018-11-30 19:55:48.346679
+rundungsfehler_korrigieren_BUG1328-2	\N	2018-11-30 19:55:48.354608
+sepa	\N	2018-11-30 19:55:48.361252
+update_date_paid	\N	2018-11-30 19:55:48.529305
+warehouse3	\N	2018-11-30 19:55:48.547206
+warehouse_add_bestbefore	\N	2018-11-30 19:55:48.554949
+add_depositor_for_customer_vendor	\N	2018-11-30 19:55:48.559391
+add_more_constraints_fibu_projekt_xplace3	\N	2018-11-30 19:55:48.619172
+cp_greeting_migration	\N	2018-11-30 19:55:48.634177
+release_2_6_1	\N	2018-11-30 19:55:48.663547
+acc_trans_id_uniqueness	\N	2018-11-30 19:55:48.667941
+add_ar_paid_defaults	\N	2018-11-30 19:55:48.693201
+add_makemodel_prices	\N	2018-11-30 19:55:48.701451
+csv_import_profiles	\N	2018-11-30 19:55:48.726212
+customer_long_entries	\N	2018-11-30 19:55:48.818856
+drop_yearend	\N	2018-11-30 19:55:48.856194
+emmvee_background_jobs	\N	2018-11-30 19:55:48.862558
+invalid_entries_in_custom_variables_validity	\N	2018-11-30 19:55:48.963036
+payment_terms_translation2	\N	2018-11-30 19:55:48.970092
+periodic_invoices	\N	2018-11-30 19:55:48.97695
+schema_normalization_1	\N	2018-11-30 19:55:49.029455
+sepa_in	\N	2018-11-30 19:55:49.123844
+shipto_add_cp_gender	\N	2018-11-30 19:55:49.205218
+skr03_04_bwa_zuordnung_konten_4250_4610	\N	2018-11-30 19:55:49.209728
+skr04_fix_category_3151_3160_3170	\N	2018-11-30 19:55:49.243863
+ustva_2010	\N	2018-11-30 19:55:49.248199
+csv_import_profiles_2	\N	2018-11-30 19:55:49.262001
+delete_translations_on_payment_term_delete	\N	2018-11-30 19:55:49.266837
+emmvee_background_jobs_2	\N	2018-11-30 19:55:49.890031
+periodic_invoices_background_job	\N	2018-11-30 19:55:51.402839
+periodic_invoices_first_billing_date	\N	2018-11-30 19:55:51.406167
+schema_normalization_2	\N	2018-11-30 19:55:51.412898
+background_jobs_3	\N	2018-11-30 19:55:52.438576
+csv_import_report_cache	\N	2018-11-30 19:55:52.441912
+schema_normalization_3	\N	2018-11-30 19:55:52.545456
+csv_import_reports_add_numheaders	\N	2018-11-30 19:55:52.587012
+release_2_6_2	\N	2018-11-30 19:55:52.616262
+chart_taxkey_id_from_taxkeys	\N	2018-11-30 19:55:52.619914
+custom_variables_indices	\N	2018-11-30 19:55:52.800664
+custom_variables_indices_2	\N	2018-11-30 19:55:52.836623
+units_id	\N	2018-11-30 19:55:52.869217
+release_2_6_3	\N	2018-11-30 19:55:52.908529
+auth_enable_ct_all_edit	\N	2018-11-30 19:55:52.912995
+auth_enable_edit_prices	\N	2018-11-30 19:55:52.917117
+customer_add_constraints	\N	2018-11-30 19:55:52.920242
+customer_vendor_add_currency	\N	2018-11-30 19:55:52.950447
+defaults_add_language_id	\N	2018-11-30 19:55:52.955503
+delivery_order_items_add_pricegroup_id	\N	2018-11-30 19:55:52.963557
+department_drop_role	\N	2018-11-30 19:55:52.972121
+drop_datevexport	\N	2018-11-30 19:55:53.013368
+employee_deleted	\N	2018-11-30 19:55:53.023429
+license_invoice_drop	\N	2018-11-30 19:55:53.130064
+oe_customer_vendor_fkeys	\N	2018-11-30 19:55:53.165439
+parts_add_unit_foreign_key	\N	2018-11-30 19:55:53.204733
+umstellung_eur	\N	2018-11-30 19:55:53.234867
+ustva_2010_fixes	\N	2018-11-30 19:55:53.239459
+vendor_add_constraints	\N	2018-11-30 19:55:53.243604
+warehouse_alter_chargenumber	\N	2018-11-30 19:55:53.286666
+release_2_7_0	\N	2018-11-30 19:55:53.32324
+chart_type_skonto	\N	2018-11-30 19:55:53.33005
+contacts_add_street_and_zipcode_and_city	\N	2018-11-30 19:55:53.360981
+contacts_convert_cp_birthday_to_date	\N	2018-11-30 19:55:53.374281
+convert_curr_to_text	\N	2018-11-30 19:55:53.387468
+custom_variables_sub_module_not_null	\N	2018-11-30 19:55:54.240094
+customer_add_taxincluded_checked	\N	2018-11-30 19:55:54.260719
+customer_vendor_phone_no_limits	\N	2018-11-30 19:55:54.412641
+defaults_datev_check	\N	2018-11-30 19:55:54.431168
+defaults_posting_config	\N	2018-11-30 19:55:54.821303
+defaults_posting_records_config	\N	2018-11-30 19:55:54.967149
+defaults_show_bestbefore	\N	2018-11-30 19:55:55.492255
+defaults_show_delete_on_orders	\N	2018-11-30 19:55:55.615344
+defaults_show_mark_as_paid_config	\N	2018-11-30 19:55:55.88072
+finanzamt_update_fa_bufa_nr_hamburg	\N	2018-11-30 19:55:56.06931
+record_links_post_delete_triggers	\N	2018-11-30 19:55:56.091963
+rename_buchungsgruppe_16_19_to_19	\N	2018-11-30 19:55:56.186938
+self_test_background_job	\N	2018-11-30 19:55:56.663123
+ustva_setup_2007_update_chart_taxkeys_tax_skr04	\N	2018-11-30 19:55:56.668566
+customer_add_taxincluded_checked_2	\N	2018-11-30 19:55:56.712326
+record_links_post_delete_triggers2	\N	2018-11-30 19:55:56.718717
+release_3_0_0	\N	2018-11-30 19:55:56.751464
+acc_trans_booleans_not_null	\N	2018-11-30 19:55:56.754674
+accounts_tax_office_bad_homburg	\N	2018-11-30 19:55:56.797126
+add_chart_link_to_acc_trans	\N	2018-11-30 19:55:56.824237
+add_customer_mandator_id	\N	2018-11-30 19:55:56.83626
+add_fk_to_gl	\N	2018-11-30 19:55:56.860613
+add_warehouse_defaults	\N	2018-11-30 19:55:56.870774
+ap_add_direct_debit	\N	2018-11-30 19:55:56.898818
+ap_deliverydate	\N	2018-11-30 19:55:56.904262
+ar_add_direct_debit	\N	2018-11-30 19:55:56.908048
+ar_ap_foreign_keys	\N	2018-11-30 19:55:56.915304
+ar_ap_gl_delete_triggers_deletion_from_acc_trans	\N	2018-11-30 19:55:57.017982
+background_job_change_create_periodic_invoices_to_daily	\N	2018-11-30 19:55:57.057265
+charts_without_taxkey	\N	2018-11-30 19:55:57.062694
+cleanup_after_customer_vendor_deletion	\N	2018-11-30 19:55:57.06846
+clients	\N	2018-11-30 19:55:57.090444
+contacts_add_cp_position	\N	2018-11-30 19:55:57.134133
+custom_variable_configs_column_type_text	\N	2018-11-30 19:55:57.138664
+custom_variables_validity_index	\N	2018-11-30 19:55:57.205951
+defaults_add_max_future_booking_intervall	\N	2018-11-30 19:55:57.221416
+defaults_add_precision	\N	2018-11-30 19:55:57.303136
+defaults_feature	\N	2018-11-30 19:55:57.353376
+defaults_feature2	\N	2018-11-30 19:55:57.725789
+del_exchangerate	\N	2018-11-30 19:55:57.795674
+delete_close_follow_ups_when_order_is_deleted_closed_fkey_deletion	\N	2018-11-30 19:55:57.80842
+delete_customertax_vendortax_partstax	\N	2018-11-30 19:55:57.819414
+delete_translations_on_tax_delete	\N	2018-11-30 19:55:57.851555
+delivery_terms	\N	2018-11-30 19:55:57.85984
+drop_audittrail	\N	2018-11-30 19:55:57.921336
+drop_dpt_trans	\N	2018-11-30 19:55:57.938584
+drop_gifi	\N	2018-11-30 19:55:57.976808
+drop_rma	\N	2018-11-30 19:55:58.008264
+employee_drop_columns	\N	2018-11-30 19:55:58.036212
+erzeugnisnummern	\N	2018-11-30 19:55:58.061156
+first_aggregator	\N	2018-11-30 19:55:58.077335
+fix_datepaid_for_sepa_transfers	\N	2018-11-30 19:55:58.09061
+gewichte	\N	2018-11-30 19:55:58.095963
+gl_add_employee_foreign_key	\N	2018-11-30 19:55:58.160346
+invoice_add_donumber	\N	2018-11-30 19:55:58.166968
+oe_delivery_orders_foreign_keys	\N	2018-11-30 19:55:58.171402
+orderitems_delivery_order_items_invoice_foreign_keys	\N	2018-11-30 19:55:58.263485
+parts_translation_foreign_keys	\N	2018-11-30 19:55:58.297551
+project_customer_type_valid	\N	2018-11-30 19:55:58.340146
+project_types	\N	2018-11-30 19:55:58.353524
+requirement_specs	\N	2018-11-30 19:55:58.422952
+rm_whitespaces	\N	2018-11-30 19:55:59.021297
+add_tax_id_to_acc_trans	\N	2018-11-30 19:55:59.032428
+add_warehouse_client_config_default	\N	2018-11-30 19:55:59.045832
+balance_startdate_method	\N	2018-11-30 19:55:59.255326
+currencies	\N	2018-11-30 19:55:59.262932
+custom_variables_delete_via_trigger	\N	2018-11-30 19:55:59.380564
+default_bin_parts	\N	2018-11-30 19:55:59.386089
+defaults_customer_hourly_rate	\N	2018-11-30 19:55:59.392549
+defaults_signature	\N	2018-11-30 19:55:59.404603
+delete_close_follow_ups_when_order_is_deleted_closed	\N	2018-11-30 19:55:59.408479
+delete_cust_vend_tax	\N	2018-11-30 19:55:59.45219
+delete_translations_on_delivery_term_delete	\N	2018-11-30 19:55:59.480771
+drop_gifi_2	\N	2018-11-30 19:55:59.51466
+oe_do_delete_via_trigger	\N	2018-11-30 19:55:59.520499
+project_bob_attributes	\N	2018-11-30 19:55:59.646932
+remove_role_from_employee	\N	2018-11-30 19:55:59.992561
+requirement_spec_items_item_type_index	\N	2018-11-30 19:55:59.998481
+requirement_spec_items_update_trigger_fix	\N	2018-11-30 19:56:00.014323
+requirement_spec_pictures	\N	2018-11-30 19:56:00.053884
+requirement_spec_predefined_texts_for_sections	\N	2018-11-30 19:56:00.098069
+requirement_spec_types_number_formats	\N	2018-11-30 19:56:00.137145
+requirement_spec_types_template_file_name	\N	2018-11-30 19:56:00.17203
+requirement_specs_print_templates	\N	2018-11-30 19:56:00.241945
+requirement_specs_section_templates	\N	2018-11-30 19:56:00.24846
+tax_constraints	\N	2018-11-30 19:56:00.259202
+add_fkey_tax_id_to_acc_trans	\N	2018-11-30 19:56:00.415812
+custom_variables_delete_via_trigger_2	\N	2018-11-30 19:56:00.435628
+custom_variables_delete_via_trigger_requirement_specs	\N	2018-11-30 19:56:00.442452
+project_bob_attributes_itime_default_fix	\N	2018-11-30 19:56:00.449332
+requirement_spec_delete_trigger_fix	\N	2018-11-30 19:56:00.46838
+requirement_spec_type_for_template_fix	\N	2018-11-30 19:56:00.487709
+requirement_specs_orders	\N	2018-11-30 19:56:00.497071
+steuerfilterung	\N	2018-11-30 19:56:00.564361
+unit_foreign_key_for_line_items	\N	2018-11-30 19:56:00.608361
+project_bob_attributes_fix_project_status_table_name	\N	2018-11-30 19:56:00.621462
+release_3_1_0	\N	2018-11-30 19:56:00.625093
+requirement_spec_delete_trigger_fix2	\N	2018-11-30 19:56:00.634053
+requirement_spec_items_update_trigger_fix2	\N	2018-11-30 19:56:00.714148
+add_warehouse_client_config_default2	\N	2018-11-30 19:56:00.733746
+background_jobs_clean_auth_sessions	\N	2018-11-30 19:56:00.847779
+bank_accounts_add_name	\N	2018-11-30 19:56:00.851389
+column_type_text_instead_of_varchar	\N	2018-11-30 19:56:00.855235
+custom_variable_partsgroups	\N	2018-11-30 19:56:00.878701
+defaults_add_delivery_plan_config	\N	2018-11-30 19:56:00.905864
+defaults_add_rnd_accno_ids	\N	2018-11-30 19:56:01.027447
+defaults_global_bcc	\N	2018-11-30 19:56:01.038855
+defaults_only_customer_projects_in_sales	\N	2018-11-30 19:56:01.091037
+defaults_reqdate_interval	\N	2018-11-30 19:56:01.100144
+defaults_require_transaction_description	\N	2018-11-30 19:56:01.153359
+defaults_sales_purchase_order_show_ship_missing_column	\N	2018-11-30 19:56:01.182996
+defaults_sales_purchase_process_limitations	\N	2018-11-30 19:56:01.194119
+defaults_transport_cost_reminder	\N	2018-11-30 19:56:01.22542
+delete_cvars_on_trans_deletion	\N	2018-11-30 19:56:01.233129
+invoice_positions	\N	2018-11-30 19:56:01.33658
+orderitems_delivery_order_items_positions	\N	2018-11-30 19:56:01.342234
+periodic_invoices_order_value_periodicity	\N	2018-11-30 19:56:01.376289
+price_rules	\N	2018-11-30 19:56:01.418433
+price_source_client_config	\N	2018-11-30 19:56:01.468635
+project_status_default_entries	\N	2018-11-30 19:56:01.493701
+record_links_orderitems_delete_triggers	\N	2018-11-30 19:56:01.501871
+recorditem_active_price_source	\N	2018-11-30 19:56:01.538923
+remove_redundant_customer_vendor_delete_triggers	\N	2018-11-30 19:56:01.696117
+requirement_spec_edit_html	\N	2018-11-30 19:56:01.703192
+requirement_spec_parts	\N	2018-11-30 19:56:01.741876
+taxzone_charts	\N	2018-11-30 19:56:01.814132
+vendor_long_entries	\N	2018-11-30 19:56:01.854945
+warehouse_add_delivery_order_items_stock_id	\N	2018-11-30 19:56:01.868471
+column_type_text_instead_of_varchar2	\N	2018-11-30 19:56:01.90471
+convert_taxzone	\N	2018-11-30 19:56:01.945692
+defaults_drop_delivery_plan_calculate_transferred_do	\N	2018-11-30 19:56:01.995423
+defaults_transport_cost_reminder_id	\N	2018-11-30 19:56:02.018688
+delete_cvars_on_trans_deletion_fix1	\N	2018-11-30 19:56:02.02745
+oe_ar_ap_delivery_orders_edit_notes_as_html	\N	2018-11-30 19:56:02.055665
+price_rules_cascade_delete	\N	2018-11-30 19:56:02.062784
+recorditem_active_record_source	\N	2018-11-30 19:56:02.097336
+remove_redundant_cvar_delete_triggers	\N	2018-11-30 19:56:02.255687
+requirement_spec_parts_foreign_key_cascade	\N	2018-11-30 19:56:02.277195
+taxzone_sortkey	\N	2018-11-30 19:56:02.283896
+transfer_out_sales_invoice	\N	2018-11-30 19:56:02.296391
+ar_ap_fix_notes_as_html_for_non_invoices	\N	2018-11-30 19:56:02.347814
+column_type_text_instead_of_varchar3	\N	2018-11-30 19:56:02.376546
+delete_cvars_on_trans_deletion_fix2	\N	2018-11-30 19:56:02.380593
+price_rules_discount	\N	2018-11-30 19:56:02.384504
+taxzone_default_id	\N	2018-11-30 19:56:02.38971
+change_taxzone_id_0	\N	2018-11-30 19:56:02.396636
+tax_zones_obsolete	\N	2018-11-30 19:56:02.42588
+taxzone_id_in_oe_delivery_orders	\N	2018-11-30 19:56:02.467415
+release_3_2_0	\N	2018-11-30 19:56:02.502253
+ar_ap_default	\N	2018-11-30 19:56:02.506427
+bank_accounts_unique_chart_constraint	\N	2018-11-30 19:56:02.522983
+bank_transactions	\N	2018-11-30 19:56:02.539866
+bankaccounts_reconciliation	\N	2018-11-30 19:56:02.580931
+bankaccounts_sortkey_and_obsolete	\N	2018-11-30 19:56:02.589744
+defaults_drop_delivery_plan_config	\N	2018-11-30 19:56:02.653749
+delete_invalidated_custom_variables_for_parts	\N	2018-11-30 19:56:02.659977
+invoices_amount_paid_not_null	\N	2018-11-30 19:56:02.665446
+letter	\N	2018-11-30 19:56:02.700442
+payment_terms_automatic_calculation	\N	2018-11-30 19:56:02.730977
+remove_terms_add_payment_id	\N	2018-11-30 19:56:02.740121
+sepa_items_payment_type	\N	2018-11-30 19:56:02.760265
+tax_skonto_automatic	\N	2018-11-30 19:56:02.766946
+automatic_reconciliation	\N	2018-11-30 19:56:02.831818
+letter_country_page	\N	2018-11-30 19:56:02.875924
+letter_date_type	\N	2018-11-30 19:56:02.880335
+letter_draft	\N	2018-11-30 19:56:02.912831
+letter_reference	\N	2018-11-30 19:56:02.955158
+letter_emplyee_salesman	\N	2018-11-30 19:56:02.988352
+use_html_in_letter	\N	2018-11-30 19:56:02.996959
+letter_notes_internal	\N	2018-11-30 19:56:03.003208
+letter_cp_id	\N	2018-11-30 19:56:03.039006
+release_3_3_0	\N	2018-11-30 19:56:03.067277
+add_project_defaults	\N	2018-11-30 19:56:03.070344
+buchungsgruppen_forein_keys	\N	2018-11-30 19:56:03.155929
+chart_pos_er	\N	2018-11-30 19:56:03.190929
+customer_vendor_shipto_add_gln	\N	2018-11-30 19:56:04.106585
+defaults_add_features	\N	2018-11-30 19:56:04.115246
+defaults_order_warn_duplicate_parts	\N	2018-11-30 19:56:04.419568
+defaults_show_longdescription_select_item	\N	2018-11-30 19:56:04.524557
+email_journal	\N	2018-11-30 19:56:04.603919
+periodic_invoices_direct_debit_flag	\N	2018-11-30 19:56:04.718257
+project_mtime_trigger	\N	2018-11-30 19:56:04.761914
+remove_index	\N	2018-11-30 19:56:04.767183
+sepa_contained_in_message_ids	\N	2018-11-30 19:56:04.939482
+defaults_enable_email_journal	\N	2018-11-30 19:56:05.014202
+release_3_4_0	\N	2018-11-30 19:56:05.072335
+add_parts_price_history	\N	2018-11-30 19:56:05.084919
+defaults_add_quick_search_modules	\N	2018-11-30 19:56:05.139561
+delete_from_generic_translations_on_language_deletion	\N	2018-11-30 19:56:05.1508
+letter_cleanup	\N	2018-11-30 19:56:05.183375
+payment_terms_for_invoices	\N	2018-11-30 19:56:05.216678
+periodic_invoices_send_email	\N	2018-11-30 19:56:05.232662
+transfer_type_assembled	\N	2018-11-30 19:56:05.265398
+add_parts_price_history2	\N	2018-11-30 19:56:05.290026
+inventory_fix_shippingdate_assemblies	\N	2018-11-30 19:56:05.295348
+release_3_4_1	\N	2018-11-30 19:56:05.300693
+add_stocktaking_preselects_client_config_default	michael	2021-01-16 23:40:30.58469
+transfer_type_stocktaking	michael	2021-01-16 23:40:31.412921
+add_stocktaking_qty_threshold_client_config_default	michael	2021-01-16 23:40:31.625275
+auto_delete_sepa_export_items_on_ap_ar_deletion	michael	2021-01-16 23:40:32.228015
+csv_mt940_add_profile	michael	2021-01-16 23:40:32.518712
+re_add_sepa_export_items_foreign_keys	michael	2021-01-16 23:40:32.564432
+requirement_spec_items_price_factor	michael	2021-01-16 23:40:32.642578
+defaults_bcc_to_login	michael	2021-01-16 23:40:32.696085
+delete_cvars_on_trans_deletion_add_shipto	michael	2021-01-16 23:40:32.738113
+create_part_if_not_found	michael	2021-01-16 23:40:32.961663
+bank_transactions_type	michael	2021-01-16 23:40:33.031552
+auto_delete_reconciliation_links_on_acc_trans_deletion	michael	2021-01-16 23:40:33.060787
+bank_transactions_type2	michael	2021-01-16 23:40:33.151907
+inventory_shippingdate_not_null	michael	2021-01-16 23:40:33.160807
+add_test_mode_to_csv_import_report	michael	2021-01-16 23:40:33.173339
+add_warehouse_for_assembly	michael	2021-01-16 23:40:33.212551
+assembly_parts_foreign_key	michael	2021-01-16 23:40:33.247233
+assembly_position	michael	2021-01-16 23:40:33.335202
+create_record_template_tables	michael	2021-01-16 23:40:33.341782
+customer_klass_rename_to_pricegroup_id_and_foreign_key	michael	2021-01-16 23:40:33.544404
+defaults_add_feature_experimental	michael	2021-01-16 23:40:33.590079
+defaults_add_finanzamt_data	michael	2021-01-16 23:40:33.645565
+eur_bwa_category_views	michael	2021-01-16 23:40:33.665107
+filemanagement_feature	michael	2021-01-16 23:40:33.734956
+files	michael	2021-01-16 23:40:34.100462
+get_shipped_qty_config	michael	2021-01-16 23:40:34.139709
+letter_vendorletter	michael	2021-01-16 23:40:34.2561
+makemodel_add_vendor_foreign_key	michael	2021-01-16 23:40:34.29576
+part_classifications	michael	2021-01-16 23:40:34.35685
+part_type_enum	michael	2021-01-16 23:40:34.511701
+partsgroup_sortkey_obsolete	michael	2021-01-16 23:40:34.561047
+payment_terms_obsolete	michael	2021-01-16 23:40:34.607337
+periodic_invoices_order_value_periodicity2	michael	2021-01-16 23:40:34.647167
+pricegroup_sortkey_obsolete	michael	2021-01-16 23:40:34.658253
+prices_delete_cascade	michael	2021-01-16 23:40:34.722808
+prices_unique	michael	2021-01-16 23:40:34.777376
+remove_alternate_from_parts	michael	2021-01-16 23:40:34.800397
+sepa_export_items	michael	2021-01-16 23:40:34.808154
+sepa_reference_add_vc_vc_id	michael	2021-01-16 23:40:34.8179
+user_preferences	michael	2021-01-16 23:40:34.855644
+assembly_parts_foreign_key2	michael	2021-01-16 23:40:34.893172
+assortment_items	michael	2021-01-16 23:40:34.912997
+convert_drafts_to_record_templates	michael	2021-01-16 23:40:34.958573
+defaults_add_feature_experimental2	michael	2021-01-16 23:40:35.024917
+defaults_filemanagement_remove_doc_database	michael	2021-01-16 23:40:35.092305
+displayable_name_prefs_defaults	michael	2021-01-16 23:40:35.101786
+email_journal_attachments_add_fileid	michael	2021-01-16 23:40:35.113991
+part_classification_report_separate	michael	2021-01-16 23:40:35.147792
+part_remove_unneeded_fields	michael	2021-01-16 23:40:35.190285
+assortment_charge	michael	2021-01-16 23:40:35.203611
+release_3_5_0	michael	2021-01-16 23:40:35.22207
+alter_record_template_tables	michael	2021-01-16 23:40:35.229772
+custom_data_export	michael	2021-01-16 23:40:35.265952
+shops	michael	2021-01-16 23:40:35.347702
+trigram_extension	michael	2021-01-16 23:40:35.372111
+custom_data_export_default_values_for_parameters	michael	2021-01-16 23:40:35.729949
+customer_orderlock	michael	2021-01-16 23:40:35.749169
+shop_1	michael	2021-01-16 23:40:35.830864
+shop_2	michael	2021-01-16 23:40:35.894373
+shop_3	michael	2021-01-16 23:40:35.904605
+shop_orders	michael	2021-01-16 23:40:35.964169
+shop_parts	michael	2021-01-16 23:40:36.014721
+trigram_indices	michael	2021-01-16 23:40:36.058484
+trigram_indices_webshop	michael	2021-01-16 23:40:36.147532
+shop_orders_add_active_price_source	michael	2021-01-16 23:40:36.157795
+shopimages	michael	2021-01-16 23:40:36.166391
+shop_orders_update_1	michael	2021-01-16 23:40:36.24673
+shopimages_2	michael	2021-01-16 23:40:36.275103
+shopimages_3	michael	2021-01-16 23:40:36.284092
+shop_orders_update_2	michael	2021-01-16 23:40:36.29175
+shop_orders_update_3	michael	2021-01-16 23:40:36.309621
+release_3_5_1	michael	2021-01-16 23:40:36.318018
+create_part_customerprices	michael	2021-01-16 23:40:36.323446
+datev_export_format	michael	2021-01-16 23:40:36.363188
+stocktakings	michael	2021-01-16 23:40:36.414757
+release_3_5_2	michael	2021-01-16 23:40:36.44582
+accounts_tax_office_leonberg	michael	2021-01-16 23:40:36.454251
+defaults_order_warn_no_deliverydate	michael	2021-01-16 23:40:36.533032
+sepa_recommended_execution_date	michael	2021-01-16 23:40:36.576618
+release_3_5_3	michael	2021-01-16 23:40:36.679454
+add_emloyee_project_assignment_for_viewing_invoices	michael	2021-01-16 23:40:36.686634
+bank_transactions_check_constraint_invoice_amount	michael	2021-01-16 23:40:36.704924
+contacts_add_main_contact	michael	2021-01-16 23:40:36.715044
+customer_add_commercial_court	michael	2021-01-16 23:40:36.759885
+customer_add_fields	michael	2021-01-16 23:40:36.76751
+customer_add_generic_mail_delivery	michael	2021-01-16 23:40:36.777481
+defaults_delivery_date_interval	michael	2021-01-16 23:40:36.785329
+defaults_doc_email_attachment	michael	2021-01-16 23:40:36.840007
+defaults_invoice_mail_priority	michael	2021-01-16 23:40:36.993982
+defaults_set_dunning_creator	michael	2021-01-16 23:40:37.036143
+drop_payment_terms_ranking	michael	2021-01-16 23:40:37.076804
+dunning_foreign_key_for_trans_id	michael	2021-01-16 23:40:37.088044
+record_links_bt_acc_trans	michael	2021-01-16 23:40:37.12479
+record_links_post_delete_triggers_gl2	michael	2021-01-16 23:40:37.156066
+remove_comma_aggregate_functions	michael	2021-01-16 23:40:37.239148
+release_3_5_4	michael	2021-01-16 23:40:37.254006
+add_node_id_to_background_jobs	michael	2021-01-16 23:40:37.258937
+bank_transaction_acc_trans_remove_wrong_primary_key	michael	2021-01-16 23:40:37.266506
+bank_transactions_nuke_trailing_spaces_in_purpose	michael	2021-01-16 23:40:37.274411
+defaults_split_address	michael	2021-01-16 23:40:37.283971
+defaults_workflow_po_ap_chart_id	michael	2021-01-16 23:40:37.316713
+defaults_year_end_charts	michael	2021-01-16 23:40:37.325699
+inventory_itime_parts_id_index	michael	2021-01-16 23:40:37.343525
+inventory_parts_id_index	michael	2021-01-16 23:40:37.363435
+tax_removed_taxnumber	michael	2021-01-16 23:40:37.37719
+release_3_5_5	michael	2021-01-16 23:40:37.411376
+bank_account_flag_for_zugferd_usage	michael	2021-01-16 23:40:37.418934
+contact_departments_own_table	michael	2021-01-16 23:40:37.43411
+contact_titles_own_table	michael	2021-01-16 23:40:37.465453
+customer_create_zugferd_invoices	michael	2021-01-16 23:40:37.501408
+customer_vendor_add_natural_person	michael	2021-01-16 23:40:37.54232
+defaults_contact_departments_use_textfield	michael	2021-01-16 23:40:37.638688
+defaults_contact_titles_use_textfield	michael	2021-01-16 23:40:37.648428
+defaults_create_zugferd_data	michael	2021-01-16 23:40:37.657516
+defaults_vc_greetings_use_textfield	michael	2021-01-16 23:40:37.670689
+dunning_config_print_original_invoice	michael	2021-01-16 23:40:37.67969
+exchangerate_in_oe	michael	2021-01-16 23:40:37.688851
+gl_add_deliverydate	michael	2021-01-16 23:40:37.720975
+greetings_own_table	michael	2021-01-16 23:40:37.730298
+konjunkturpaket_2020_SKR03	michael	2021-01-16 23:40:37.788147
+remove_double_tax_entries_skr04	michael	2021-01-16 23:40:37.942349
+remove_taxkey_15_17_skr04	michael	2021-01-16 23:40:37.952378
+defaults_zugferd_test_mode	michael	2021-01-16 23:40:37.964377
+konjunkturpaket_2020_SKR04	michael	2021-01-16 23:40:38.016065
+konjunkturpaket_2020	michael	2021-01-16 23:40:38.053275
+konjunkturpaket_2020_SKR04-korrekturen	michael	2021-01-16 23:40:38.132741
+konjunkturpaket_2020_SKR03-korrekturen	michael	2021-01-16 23:40:38.150544
+release_3_5_6	michael	2021-01-16 23:40:38.164561
+alter_default_shipped_qty_config	michael	2021-01-16 23:40:38.172842
+ap_set_payment_term_from_vendor	michael	2021-01-16 23:40:38.183237
+transfer_out_serial_charge_number	michael	2021-01-16 23:40:38.190564
+release_3_5_6_1	michael	2021-01-16 23:40:38.235462
+link_requirement_spec_to_orders_created_from_quotations_created_from_requirement_spec	michael	2023-12-16 23:40:34.587493
+cvars_remove_duplicate_entries	michael	2023-12-16 23:40:34.609593
+ap_gl	michael	2023-12-16 23:40:34.621889
+shop_4	michael	2023-12-16 23:40:34.639841
+shops_5	michael	2023-12-16 23:40:34.650623
+file_storage_type_letter	michael	2023-12-16 23:40:34.65891
+shop_add_proxy	michael	2023-12-16 23:40:34.671228
+file_storage_type_dunning_orig_invoice	michael	2023-12-16 23:40:34.679351
+file_storage_dunning_invoice	michael	2023-12-16 23:40:34.693469
+file_storage_dunning_documents	michael	2023-12-16 23:40:34.707669
+file_storage_project	michael	2023-12-16 23:40:34.718796
+shop_orders_update_4	michael	2023-12-16 23:40:34.730785
+file_storage_partial_invoices	michael	2023-12-16 23:40:34.801845
+add_gl_imported	michael	2023-12-16 23:40:34.814718
+customer_vendor_routing_id	michael	2023-12-16 23:40:34.822975
+add_transfer_doc_interval	michael	2023-12-16 23:40:34.832677
+bank_account_information_for_swiss_qrbill	michael	2023-12-16 23:40:34.842275
+custom_variables_add_edit_position	michael	2023-12-16 23:40:34.855099
+customer_vendor_add_postal_invoice	michael	2023-12-16 23:40:34.869355
+defaults_create_qrbill_data	michael	2023-12-16 23:40:34.878136
+defaults_customer_vendor_ustid_taxnummer_unique	michael	2023-12-16 23:40:34.897812
+defaults_delivery_orders_check_stocked	michael	2023-12-16 23:40:34.911498
+defaults_posting_records_add	michael	2023-12-16 23:40:34.922328
+defaults_req_delivery_date	michael	2023-12-16 23:40:34.940033
+defaults_transfer_settings	michael	2023-12-16 23:40:34.950923
+dunning_original_invoice_printed	michael	2023-12-16 23:40:34.966584
+orderitems_optional	michael	2023-12-16 23:40:35.00464
+record_links_dunning_post_delete_trigger	michael	2023-12-16 23:40:35.021152
+record_template_payment_id	michael	2023-12-16 23:40:35.051842
+tax_point	michael	2023-12-16 23:40:35.060696
+time_recordings	michael	2023-12-16 23:40:35.074962
+defaults_posting_records_default_false	michael	2023-12-16 23:40:35.124259
+defaults_qrbill_variants	michael	2023-12-16 23:40:35.146036
+tax_point2	michael	2023-12-16 23:40:35.18613
+time_recordings2	michael	2023-12-16 23:40:35.196949
+time_recordings_articles	michael	2023-12-16 23:40:35.206823
+time_recordings_date_duration	michael	2023-12-16 23:40:35.232489
+time_recordings_remove_type	michael	2023-12-16 23:40:35.252591
+time_recordings_add_order	michael	2023-12-16 23:40:35.300994
+release_3_5_7	michael	2023-12-16 23:40:35.309827
+change_warehouse_client_config_default	michael	2023-12-16 23:40:35.318396
+defaults_produce_assembly_transfer_service	michael	2023-12-16 23:40:35.326954
+delete_warehouse_for_assembly	michael	2023-12-16 23:40:35.336827
+drop_shipped_qty_config	michael	2023-12-16 23:40:35.346106
+release_3_5_8	michael	2023-12-16 23:40:35.357944
+add_gl_transaction_description	michael	2023-12-16 23:40:35.364501
+add_record_templates_transaction_description	michael	2023-12-16 23:40:35.37189
+ar_add_qrbill_without_amount	michael	2023-12-16 23:40:35.379889
+convert_columns_to_html_for_sending_html_emails	michael	2023-12-16 23:40:35.395529
+custom_variables_convert_width_height_to_pixels	michael	2023-12-16 23:40:35.411334
+customer_additional_billing_addresses	michael	2023-12-16 23:40:35.42111
+defaults_invoice_warn_no_delivery_order	michael	2023-12-16 23:40:35.466469
+defaults_order_controller	michael	2023-12-16 23:40:35.474294
+defaults_order_warn_no_cusordnumber	michael	2023-12-16 23:40:35.483332
+defaults_partsgroup_required	michael	2023-12-16 23:40:35.492686
+defaults_print_interpolate_variables_in_positions	michael	2023-12-16 23:40:35.50251
+defaults_sales_purchase_record_numbers_changeable	michael	2023-12-16 23:40:35.550433
+defaults_view_record_links	michael	2023-12-16 23:40:35.559225
+deliveryorder_transnumbers	michael	2023-12-16 23:40:35.569624
+deliveryorder_type	michael	2023-12-16 23:40:35.581251
+files_add_variant	michael	2023-12-16 23:40:35.592775
+new_chart_1593_1495	michael	2023-12-16 23:40:35.603336
+new_chart_3260_1711	michael	2023-12-16 23:40:35.617575
+new_chart_3272_1718	michael	2023-12-16 23:40:35.628546
+convert_columns_to_html_for_sending_html_emails2	michael	2023-12-16 23:40:35.645818
+customer_remove_empty_additional_billing_addresses	michael	2023-12-16 23:40:35.654736
+defaults_advance_payment_clearing_chart_id	michael	2023-12-16 23:40:35.663407
+defaults_advance_payment_transfer_charts	michael	2023-12-16 23:40:35.67778
+release_3_6_0	michael	2023-12-16 23:40:35.699868
+convert_real_qty	michael	2023-12-16 23:40:35.707491
+defaults_invoice_prevent_browser_back	michael	2023-12-16 23:40:35.79653
+delete_wrong_charts_for_taxkeys	michael	2023-12-16 23:40:35.812153
+delete_wrong_charts_for_taxkeys_04	michael	2023-12-16 23:40:35.838207
+file_full_texts	michael	2023-12-16 23:40:35.845515
+full_texts_background_job	michael	2023-12-16 23:40:35.875381
+language_obsolete	michael	2023-12-16 23:40:35.884557
+record_links_remove_to_quotation	michael	2023-12-16 23:40:35.895709
+remove_oids	michael	2023-12-16 23:40:35.905782
+tax_reverse_charge	michael	2023-12-16 23:40:35.919304
+clean_tax_18_19	michael	2023-12-16 23:40:35.945126
+tax_reverse_charge_key_18	michael	2023-12-16 23:40:35.975985
+tax_reverse_charge_key_19	michael	2023-12-16 23:40:35.99041
+release_3_6_1	michael	2023-12-16 23:40:36.008628
+follow_up_created_for_employees	michael	2026-04-24 23:21:53.40056
+follow_up_done	michael	2026-04-24 23:21:54.378785
+follow_up_done_close_follow_ups_when_order_is_closed	michael	2026-04-24 23:21:54.484131
+parts_price_history_add_price_factor	michael	2026-04-24 23:21:54.64706
+shop_order_items_discount	michael	2026-04-24 23:21:54.729723
+file_storage_supplier_delivery_order	michael	2026-04-24 23:21:54.746965
+part_customer_prices_add_description	michael	2026-04-24 23:21:54.774539
+file_storage_reclamation	michael	2026-04-24 23:21:54.804989
+file_storage_rma_delivery_order	michael	2026-04-24 23:21:54.818872
+file_storage_sales_order_intake	michael	2026-04-24 23:21:54.831454
+file_storage_purchase_quotation_intake	michael	2026-04-24 23:21:54.844045
+file_storage_purchase_order_confirmation	michael	2026-04-24 23:21:54.890127
+file_object_type_as_enum	michael	2026-04-24 23:21:54.902532
+clean_up_record_links_before_delete_trigger	michael	2026-04-24 23:21:54.976912
+reclamations	michael	2026-04-24 23:21:54.999469
+defaults_add_reclamations	michael	2026-04-24 23:21:55.450948
+delete_cvars_on_trans_deletion_add_reclamation_items	michael	2026-04-24 23:21:55.501336
+record_links_delete_triggers__reclamations__reclamation_items	michael	2026-04-24 23:21:55.51319
+deliveryorder_type_to_record_type	michael	2026-04-24 23:21:55.520561
+reclamation_add_additional_billing_addresses	michael	2026-04-24 23:21:55.572093
+change_file_backend_to_enum	michael	2026-04-24 23:21:55.655699
+customer_add_dunning_mail	michael	2026-04-24 23:21:55.671126
+oe_sales_order_intake_type	michael	2026-04-24 23:21:55.680038
+oe_version	michael	2026-04-24 23:21:55.695022
+sales_orders_recurring_billing_mode	michael	2026-04-24 23:21:55.72664
+update_employee_base_data	michael	2026-04-24 23:21:55.809799
+defaults_remove_invoice_prevent_browser_back	michael	2026-04-24 23:21:55.859321
+oe_purchase_quotation_intake	michael	2026-04-24 23:21:55.87048
+oe_version_create_first_	michael	2026-04-24 23:21:55.878541
+on_delete_oe_version_trigger	michael	2026-04-24 23:21:55.894453
+ar_add_qr_reference	michael	2026-04-24 23:21:55.904679
+bank_transactions_add_qr_reference	michael	2026-04-24 23:21:55.91363
+defaults_oe_subversion	michael	2026-04-24 23:21:55.92292
+delivery_order_remove_is_sales_in_db	michael	2026-04-24 23:21:55.936611
+exchangerate_in_arap	michael	2026-04-24 23:21:55.943457
+order_statuses	michael	2026-04-24 23:21:55.955321
+phone_notes_convert_to_html	michael	2026-04-24 23:21:56.012378
+validity_tokens	michael	2026-04-24 23:21:56.049298
+oe_add_order_status	michael	2026-04-24 23:21:56.083342
+release_3_7_0	michael	2026-04-24 23:21:56.093017
+add_charts_and_tax_to_invoice_items	michael	2026-04-24 23:21:56.098863
+add_customer_dunning_lock	michael	2026-04-24 23:21:56.174742
+add_tax_chart_type_to_invoice_items	michael	2026-04-24 23:21:56.184232
+ap_add_qrbill_data	michael	2026-04-24 23:21:56.193302
+ap_is_sepa_blocked	michael	2026-04-24 23:21:56.20097
+ar_add_qr_unstructured_message	michael	2026-04-24 23:21:56.208717
+booking_group_obsolete	michael	2026-04-24 23:21:56.215349
+defaults_qrbill_copy_invnumber_to_message	michael	2026-04-24 23:21:56.239197
+defaults_record_sender_emails	michael	2026-04-24 23:21:56.250575
+defaults_set_invoice_creation_mode_for_dunning_attachment	michael	2026-04-24 23:21:56.29708
+defaults_view_record_links_options	michael	2026-04-24 23:21:56.308024
+delivery_terms_markable_as_obsolete	michael	2026-04-24 23:21:56.322935
+makemodel_add_part_description	michael	2026-04-24 23:21:56.330448
+order_type	michael	2026-04-24 23:21:56.337134
+reclamation_type	michael	2026-04-24 23:21:56.360248
+undo_delete_wrong_charts_for_taxkeys	michael	2026-04-24 23:21:56.373061
+index_for_record_types	michael	2026-04-24 23:21:56.412106
+oe_purchase_order_confirmation_order_types	michael	2026-04-24 23:21:56.459773
+release_3_8_0	michael	2026-04-24 23:21:56.46727
+add_business_models	michael	2026-04-24 23:21:56.474163
+add_link_for_fx_gain_loss_charts	michael	2026-04-24 23:21:56.503662
+add_orderer	michael	2026-04-24 23:21:56.55068
+add_parts_order_qty	michael	2026-04-24 23:21:56.58561
+bank_accounts_flag_for_use_with_bank_import	michael	2026-04-24 23:21:56.597855
+defaults_add_layout_style	michael	2026-04-24 23:21:56.604372
+defaults_allowed_documents_with_no_positions	michael	2026-04-24 23:21:56.612585
+defaults_fuzzy_skonto	michael	2026-04-24 23:21:56.620778
+defaults_transit_items_account	michael	2026-04-24 23:21:56.634321
+defaults_webdav	michael	2026-04-24 23:21:56.644806
+defaults_yearend_method	michael	2026-04-24 23:21:56.657749
+email_import	michael	2026-04-24 23:21:56.670092
+email_journal_add_obsolete	michael	2026-04-24 23:21:56.723201
+email_journal_add_uidvalidity	michael	2026-04-24 23:21:56.732119
+file_version	michael	2026-04-24 23:21:56.738739
+files_add_uid	michael	2026-04-24 23:21:56.762346
+invalid_chart	michael	2026-04-24 23:21:56.770148
+makemodel_add_longdescription	michael	2026-04-24 23:21:56.780773
+oe_delivery_orders_add_vendor_confirmation_number	michael	2026-04-24 23:21:56.78808
+oe_purchase_order_confirmation	michael	2026-04-24 23:21:56.800007
+parts_add_order_locked	michael	2026-04-24 23:21:56.808966
+parts_delete_trigger_priceupdate	michael	2026-04-24 23:21:56.817325
+parts_zolltarifnr	michael	2026-04-24 23:21:56.830203
+purchase_basket_items	michael	2026-04-24 23:21:56.838299
+add_business_models_position	michael	2026-04-24 23:21:56.863647
+add_file_version	michael	2026-04-24 23:21:56.885502
+email_journal_extend_status	michael	2026-04-24 23:21:56.937775
+file_versions_guid_as_primary_key	michael	2026-04-24 23:21:56.946516
+email_journal_record_import_types	michael	2026-04-24 23:21:56.967695
+email_journal_record_types_add_purchase_order_confirmation	michael	2026-04-24 23:21:57.024413
+email_journal_record_types_add_catch_all	michael	2026-04-24 23:21:57.031845
+release_3_9_0	michael	2026-04-24 23:21:57.038658
+add_description_to_backgroundjob_and_backgroundjobhistory	michael	2026-04-24 23:21:57.047329
+bank_accounts_add_qr_iban	michael	2026-04-24 23:21:57.056235
+bank_transactions_add_end_to_end_id	michael	2026-04-24 23:21:57.064497
+defaults_bank_config	michael	2026-04-24 23:21:57.071605
+defaults_endtoend	michael	2026-04-24 23:21:57.08641
+defaults_set_ARAP	michael	2026-04-24 23:21:57.095681
+defaults_show_invoice_for_advance_payment	michael	2026-04-24 23:21:57.115418
+defaults_show_new_docs	michael	2026-04-24 23:21:57.125097
+remove_trigger_assembly_purchase_price	michael	2026-04-24 23:21:57.144858
+shop_images_dont_skip_position	michael	2026-04-24 23:21:57.167516
+release_3_9_1	michael	2026-04-24 23:21:57.21683
+defaults_drop_feature_experimental_assortment	michael	2026-04-24 23:21:57.222292
+defaults_drop_feature_experimental_order	michael	2026-04-24 23:21:57.230601
+defaults_email_subject_transaction_description	michael	2026-04-24 23:21:57.239141
+defaults_order_item_input_position	michael	2026-04-24 23:21:57.249471
+release_3_9_2	michael	2026-04-24 23:21:57.26071
+\.
+
+
+--
+-- Data for Name: sepa_export; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.sepa_export (id, employee_id, executed, closed, itime, vc) FROM stdin;
+\.
+
+
+--
+-- Data for Name: sepa_export_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.sepa_export_items (id, sepa_export_id, ap_id, chart_id, amount, reference, requested_execution_date, executed, execution_date, our_iban, our_bic, vc_iban, vc_bic, end_to_end_id, our_depositor, vc_depositor, ar_id, vc_mandator_id, vc_mandate_date_of_signature, payment_type, skonto_amount) FROM stdin;
+\.
+
+
+--
+-- Data for Name: sepa_export_message_ids; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.sepa_export_message_ids (id, sepa_export_id, message_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shipto; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, shiptostreet, shiptozipcode, shiptocity, shiptocountry, shiptocontact, shiptophone, shiptofax, shiptoemail, itime, mtime, module, shipto_id, shiptocp_gender, shiptogln) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shop_images; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shop_images (id, file_id, "position", thumbnail_content, org_file_width, org_file_height, thumbnail_content_type, itime, mtime, object_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shop_order_items; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shop_order_items (id, shop_trans_id, shop_order_id, description, partnumber, "position", tax_rate, quantity, price, active_price_source, discount, discount_code, identifier) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shop_orders; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shop_orders (id, shop_trans_id, shop_ordernumber, shop_customer_comment, amount, netamount, order_date, shipping_costs, shipping_costs_net, shipping_costs_id, tax_included, payment_id, payment_description, shop_id, host, remote_ip, transferred, transfer_date, kivi_customer_id, shop_customer_id, shop_customer_number, customer_lastname, customer_firstname, customer_company, customer_street, customer_zipcode, customer_city, customer_country, customer_greeting, customer_department, customer_vat, customer_phone, customer_fax, customer_email, customer_newsletter, shop_c_billing_id, shop_c_billing_number, billing_lastname, billing_firstname, billing_company, billing_street, billing_zipcode, billing_city, billing_country, billing_greeting, billing_department, billing_vat, billing_phone, billing_fax, billing_email, sepa_account_holder, sepa_iban, sepa_bic, shop_c_delivery_id, shop_c_delivery_number, delivery_lastname, delivery_firstname, delivery_company, delivery_street, delivery_zipcode, delivery_city, delivery_country, delivery_greeting, delivery_department, delivery_vat, delivery_phone, delivery_fax, delivery_email, obsolete, positions, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shop_parts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shop_parts (id, shop_id, part_id, shop_description, itime, mtime, last_update, show_date, sortorder, front_page, active, shop_category, active_price_source, metatag_keywords, metatag_description, metatag_title) FROM stdin;
+\.
+
+
+--
+-- Data for Name: shops; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.shops (id, description, obsolete, sortkey, connector, pricetype, price_source, taxzone_id, last_order_number, orders_to_fetch, server, port, login, password, protocol, path, realm, transaction_description, itime, mtime, shipping_costs_parts_id, use_part_longdescription, proxy) FROM stdin;
+\.
+
+
+--
+-- Data for Name: status; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.status (trans_id, formname, printed, emailed, spoolfile, chart_id, itime, mtime, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: stocktakings; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.stocktakings (id, inventory_id, warehouse_id, bin_id, parts_id, employee_id, qty, comment, chargenumber, bestbefore, cutoff_date, itime, mtime) FROM stdin;
+\.
+
+
+--
+-- Data for Name: tax; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.tax (chart_id, rate, taxkey, taxdescription, itime, mtime, id, chart_categories, skonto_sales_chart_id, skonto_purchase_chart_id, reverse_charge_chart_id) FROM stdin;
+776	0.19000	9	Vorsteuer	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	778	E	\N	43	\N
+259	0.07000	8	Vorsteuer	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	380	E	\N	42	\N
+194	0.07000	2	Umsatzsteuer	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	378	I	161	\N	\N
+775	0.19000	3	Umsatzsteuer	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	777	I	162	\N	\N
+\N	0.00000	0	Keine Steuer	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	0	ALQCIE	\N	\N	\N
+\N	0.00000	1	USt-frei	2018-11-30 19:55:43.8645	2018-11-30 19:56:02.766946	377	ALQCIE	\N	\N	\N
+263	0.05000	2	Umsatzsteuer	2021-01-16 23:40:37.788147	\N	899	I	893	\N	\N
+897	0.05000	8	Vorsteuer	2021-01-16 23:40:37.788147	\N	900	E	\N	894	\N
+195	0.16000	3	Umsatzsteuer	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	379	I	895	\N	\N
+261	0.16000	9	Vorsteuer	2018-11-30 19:55:43.8645	2021-01-16 23:40:37.788147	381	E	\N	896	\N
+196	0.00000	10	Im anderen EU-Staat steuerpflichtige Lieferung	2018-11-30 19:55:43.8645	2018-11-30 19:56:00.564361	382	I	\N	\N	\N
+\N	0.00000	11	Steuerfreie innergem. Lieferung an Abnehmer mit Id.-Nr.	2018-11-30 19:55:43.8645	2018-11-30 19:56:00.564361	383	I	\N	\N	\N
+262	0.07000	12	Steuerpflichtige EG-Lieferung zum ermäßigten Steuersatz	2018-11-30 19:55:43.8645	2018-11-30 19:56:00.564361	384	I	\N	\N	\N
+864	0.19000	13	Steuerpflichtige EG-Lieferung zum vollen Steuersatz	2018-11-30 19:55:46.317645	2018-11-30 19:56:00.564361	865	I	\N	\N	\N
+\N	0.16000	13	Steuerpflichtige EG-Lieferung zum vollen Steuersatz	2018-11-30 19:55:43.8645	2023-12-16 23:40:35.812153	385	I	\N	\N	\N
+258	0.07000	18	Stpf. innergemeinschaftlicher Erwerb zum verminderten Vor- und Ust.-satz	2023-12-16 23:40:35.975985	\N	1117	EI	\N	\N	262
+284	0.19000	94	19% Vorsteuer und 19% Umsatzsteuer	2023-12-16 23:40:35.919304	2023-12-16 23:40:35.99041	1115	EI	\N	\N	1114
+863	0.19000	19	Stpf. innergemeinschaftlicher Erwerb zum vollem Vor- und Ust.-satz	2023-12-16 23:40:35.99041	\N	1118	EI	\N	\N	864
+\.
+
+
+--
+-- Data for Name: tax_zones; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.tax_zones (id, description, sortkey, obsolete) FROM stdin;
+1	EU mit USt-ID Nummer	2	f
+2	EU ohne USt-ID Nummer	3	f
+3	Außerhalb EU	4	f
+4	Inland	1	f
+\.
+
+
+--
+-- Data for Name: taxkeys; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.taxkeys (id, chart_id, tax_id, taxkey_id, pos_ustva, startdate) FROM stdin;
+898	897	0	0	66	1970-01-01
+901	893	899	2	861	2020-07-01
+902	894	900	8	861	2020-07-01
+904	896	381	9	66	2020-07-01
+905	1	381	9	\N	2020-07-01
+906	1	778	9	\N	2021-01-01
+907	2	381	9	\N	2020-07-01
+908	2	778	9	\N	2021-01-01
+909	3	381	9	\N	2020-07-01
+910	3	778	9	\N	2021-01-01
+911	4	381	9	\N	2020-07-01
+912	4	778	9	\N	2021-01-01
+913	5	381	9	\N	2020-07-01
+914	5	778	9	\N	2021-01-01
+915	6	381	9	\N	2020-07-01
+916	6	778	9	\N	2021-01-01
+917	7	381	9	\N	2020-07-01
+918	7	778	9	\N	2021-01-01
+919	8	381	9	\N	2020-07-01
+920	8	778	9	\N	2021-01-01
+921	9	381	9	\N	2020-07-01
+922	9	778	9	\N	2021-01-01
+923	10	381	9	\N	2020-07-01
+924	10	778	9	\N	2021-01-01
+925	11	381	9	\N	2020-07-01
+926	11	778	9	\N	2021-01-01
+927	776	381	9	66	2020-07-01
+928	776	778	9	66	2021-01-01
+931	335	381	9	\N	2020-07-01
+932	335	778	9	\N	2021-01-01
+934	319	378	2	86	2021-01-01
+936	320	777	3	81	2021-01-01
+938	353	777	3	81	2021-01-01
+940	362	777	3	81	2021-01-01
+941	35	381	9	\N	2020-07-01
+942	35	778	9	\N	2021-01-01
+943	281	381	9	0	2020-07-01
+944	281	778	9	0	2021-01-01
+945	292	381	9	\N	2020-07-01
+946	292	778	9	\N	2021-01-01
+947	293	900	8	\N	2020-07-01
+948	293	380	8	\N	2021-01-01
+949	294	381	9	\N	2020-07-01
+950	294	778	9	\N	2021-01-01
+951	36	900	8	\N	2020-07-01
+952	36	380	8	\N	2021-01-01
+953	37	381	9	\N	2020-07-01
+954	37	778	9	\N	2021-01-01
+955	42	900	8	\N	2020-07-01
+956	42	380	8	\N	2021-01-01
+957	43	381	9	\N	2020-07-01
+958	43	778	9	\N	2021-01-01
+959	44	900	8	\N	2020-07-01
+960	44	380	8	\N	2021-01-01
+961	45	381	9	\N	2020-07-01
+962	45	778	9	\N	2021-01-01
+963	46	900	8	\N	2020-07-01
+964	46	380	8	\N	2021-01-01
+965	47	381	9	\N	2020-07-01
+966	47	778	9	\N	2021-01-01
+967	68	381	9	\N	2020-07-01
+968	68	778	9	\N	2021-01-01
+969	69	381	9	\N	2020-07-01
+970	69	778	9	\N	2021-01-01
+971	71	381	9	\N	2020-07-01
+972	71	778	9	\N	2021-01-01
+973	72	381	9	\N	2020-07-01
+974	72	778	9	\N	2021-01-01
+975	73	381	9	\N	2020-07-01
+976	73	778	9	\N	2021-01-01
+977	74	381	9	\N	2020-07-01
+978	74	778	9	\N	2021-01-01
+979	75	381	9	\N	2020-07-01
+980	75	778	9	\N	2021-01-01
+981	85	381	9	\N	2020-07-01
+982	85	778	9	\N	2021-01-01
+983	89	381	9	\N	2020-07-01
+984	89	778	9	\N	2021-01-01
+985	92	381	9	\N	2020-07-01
+986	92	778	9	\N	2021-01-01
+987	93	381	9	\N	2020-07-01
+988	93	778	9	\N	2021-01-01
+989	94	381	9	\N	2020-07-01
+990	94	778	9	\N	2021-01-01
+991	95	381	9	\N	2020-07-01
+992	95	778	9	\N	2021-01-01
+993	96	381	9	\N	2020-07-01
+994	96	778	9	\N	2021-01-01
+995	97	381	9	\N	2020-07-01
+996	97	778	9	\N	2021-01-01
+997	98	381	9	\N	2020-07-01
+998	98	778	9	\N	2021-01-01
+999	269	381	9	\N	2020-07-01
+1000	269	778	9	\N	2021-01-01
+1001	100	381	9	\N	2020-07-01
+1002	100	778	9	\N	2021-01-01
+1003	101	900	8	\N	2020-07-01
+1004	101	380	8	\N	2021-01-01
+1005	105	381	9	\N	2020-07-01
+1006	105	778	9	\N	2021-01-01
+1007	106	900	8	\N	2020-07-01
+1008	106	380	8	\N	2021-01-01
+1009	116	381	9	\N	2020-07-01
+1010	116	778	9	\N	2021-01-01
+1011	270	381	9	\N	2020-07-01
+1012	270	778	9	\N	2021-01-01
+1013	117	381	9	\N	2020-07-01
+1014	117	778	9	\N	2021-01-01
+1015	118	381	9	\N	2020-07-01
+1016	118	778	9	\N	2021-01-01
+1017	126	381	9	\N	2020-07-01
+1018	126	778	9	\N	2021-01-01
+1019	127	381	9	\N	2020-07-01
+1020	127	778	9	\N	2021-01-01
+1021	130	381	9	\N	2020-07-01
+1022	130	778	9	\N	2021-01-01
+1023	131	381	9	\N	2020-07-01
+1024	131	778	9	\N	2021-01-01
+1025	132	381	9	\N	2020-07-01
+1026	132	778	9	\N	2021-01-01
+1027	133	900	8	\N	2020-07-01
+1028	133	380	8	\N	2021-01-01
+1029	134	381	9	\N	2020-07-01
+1030	134	778	9	\N	2021-01-01
+1031	136	381	9	\N	2020-07-01
+1032	136	778	9	\N	2021-01-01
+1033	137	381	9	\N	2020-07-01
+1034	137	778	9	\N	2021-01-01
+1035	138	381	9	\N	2020-07-01
+1036	138	778	9	\N	2021-01-01
+1037	139	381	9	\N	2020-07-01
+1038	139	778	9	\N	2021-01-01
+1039	247	381	9	\N	2020-07-01
+1040	247	778	9	\N	2021-01-01
+1041	140	381	9	\N	2020-07-01
+1042	140	778	9	\N	2021-01-01
+1043	142	381	9	\N	2020-07-01
+1044	142	778	9	\N	2021-01-01
+1045	143	381	9	\N	2020-07-01
+1046	143	778	9	\N	2021-01-01
+1048	88	378	2	86	2021-01-01
+1050	184	777	3	81	2021-01-01
+1052	153	777	3	81	2021-01-01
+1054	154	378	2	86	2021-01-01
+1056	155	777	3	81	2021-01-01
+1057	156	379	3	\N	2020-07-01
+1058	156	777	3	\N	2021-01-01
+1060	157	777	3	81	2021-01-01
+1062	158	378	2	86	2021-01-01
+1064	159	777	3	81	2021-01-01
+1066	160	777	3	81	2021-01-01
+1068	343	378	2	86	2021-01-01
+1070	344	777	3	81	2021-01-01
+1072	161	378	2	86	2021-01-01
+1074	162	777	3	81	2021-01-01
+1076	163	378	2	86	2021-01-01
+1078	164	777	3	81	2021-01-01
+1080	165	378	2	86	2021-01-01
+1082	166	777	3	81	2021-01-01
+1084	185	777	3	81	2021-01-01
+1086	276	777	3	81	2021-01-01
+1088	167	777	3	81	2021-01-01
+1089	168	379	3	\N	2020-07-01
+1090	168	777	3	\N	2021-01-01
+1092	171	777	3	81	2021-01-01
+1094	172	378	2	86	2021-01-01
+1096	300	777	3	81	2021-01-01
+1098	175	777	3	81	2021-01-01
+1100	176	378	2	86	2021-01-01
+1102	177	777	3	81	2021-01-01
+1104	302	777	3	81	2021-01-01
+1106	303	378	2	86	2021-01-01
+929	194	0	0	861	2020-07-01
+930	194	0	0	861	2021-01-01
+933	319	899	2	35	2020-07-01
+1047	88	899	2	35	2020-07-01
+1053	154	899	2	35	2020-07-01
+1061	158	899	2	35	2020-07-01
+1067	343	899	2	35	2020-07-01
+1071	161	899	2	35	2020-07-01
+1075	163	899	2	35	2020-07-01
+1079	165	899	2	35	2020-07-01
+1093	172	899	2	35	2020-07-01
+1099	176	899	2	35	2020-07-01
+1105	303	899	2	35	2020-07-01
+903	895	379	3	35	2020-07-01
+935	320	379	3	35	2020-07-01
+937	353	379	3	35	2020-07-01
+939	362	379	3	35	2020-07-01
+1049	184	379	3	35	2020-07-01
+1051	153	379	3	35	2020-07-01
+1055	155	379	3	35	2020-07-01
+1059	157	379	3	35	2020-07-01
+1063	159	379	3	35	2020-07-01
+1065	160	379	3	35	2020-07-01
+1069	344	379	3	35	2020-07-01
+1073	162	379	3	35	2020-07-01
+1077	164	379	3	35	2020-07-01
+1081	166	379	3	35	2020-07-01
+1083	185	379	3	35	2020-07-01
+1085	276	379	3	35	2020-07-01
+1087	167	379	3	35	2020-07-01
+1091	171	379	3	35	2020-07-01
+1095	300	379	3	35	2020-07-01
+1097	175	379	3	35	2020-07-01
+1101	177	379	3	35	2020-07-01
+1103	302	379	3	35	2020-07-01
+657	343	378	2	86	1970-01-01
+658	319	378	2	86	1970-01-01
+659	303	378	2	86	1970-01-01
+660	176	378	2	86	1970-01-01
+661	172	378	2	86	1970-01-01
+662	165	378	2	86	1970-01-01
+663	163	378	2	86	1970-01-01
+664	161	378	2	86	1970-01-01
+665	158	378	2	86	1970-01-01
+666	154	378	2	86	1970-01-01
+667	88	378	2	86	1970-01-01
+668	362	379	3	51	1970-01-01
+669	353	379	3	51	1970-01-01
+670	344	379	3	51	1970-01-01
+671	320	379	3	51	1970-01-01
+672	302	379	3	51	1970-01-01
+673	300	379	3	51	1970-01-01
+674	276	379	3	51	1970-01-01
+675	185	379	3	51	1970-01-01
+676	184	379	3	51	1970-01-01
+677	177	379	3	51	1970-01-01
+678	175	379	3	51	1970-01-01
+679	171	379	3	51	1970-01-01
+680	168	379	3	\N	1970-01-01
+681	167	379	3	51	1970-01-01
+682	166	379	3	51	1970-01-01
+683	164	379	3	51	1970-01-01
+684	162	379	3	51	1970-01-01
+685	160	379	3	51	1970-01-01
+686	159	379	3	51	1970-01-01
+687	157	379	3	51	1970-01-01
+689	155	379	3	51	1970-01-01
+690	153	379	3	51	1970-01-01
+691	293	380	8	\N	1970-01-01
+692	133	380	8	\N	1970-01-01
+693	106	380	8	\N	1970-01-01
+694	101	380	8	\N	1970-01-01
+695	46	380	8	\N	1970-01-01
+696	44	380	8	\N	1970-01-01
+697	42	380	8	\N	1970-01-01
+698	36	380	8	\N	1970-01-01
+699	335	381	9	\N	1970-01-01
+700	294	381	9	\N	1970-01-01
+701	292	381	9	\N	1970-01-01
+702	281	381	9	0	1970-01-01
+703	270	381	9	\N	1970-01-01
+704	269	381	9	\N	1970-01-01
+705	247	381	9	\N	1970-01-01
+706	143	381	9	\N	1970-01-01
+707	142	381	9	\N	1970-01-01
+708	140	381	9	\N	1970-01-01
+709	139	381	9	\N	1970-01-01
+710	138	381	9	\N	1970-01-01
+711	137	381	9	\N	1970-01-01
+712	136	381	9	\N	1970-01-01
+713	134	381	9	\N	1970-01-01
+714	132	381	9	\N	1970-01-01
+715	131	381	9	\N	1970-01-01
+716	130	381	9	\N	1970-01-01
+717	127	381	9	\N	1970-01-01
+718	126	381	9	\N	1970-01-01
+719	118	381	9	\N	1970-01-01
+720	117	381	9	\N	1970-01-01
+721	116	381	9	\N	1970-01-01
+688	156	379	3	51	1970-01-01
+722	105	381	9	\N	1970-01-01
+723	100	381	9	\N	1970-01-01
+724	98	381	9	\N	1970-01-01
+725	97	381	9	\N	1970-01-01
+726	96	381	9	\N	1970-01-01
+727	95	381	9	\N	1970-01-01
+728	94	381	9	\N	1970-01-01
+729	93	381	9	\N	1970-01-01
+730	92	381	9	\N	1970-01-01
+731	89	381	9	\N	1970-01-01
+732	85	381	9	\N	1970-01-01
+733	75	381	9	\N	1970-01-01
+734	74	381	9	\N	1970-01-01
+735	73	381	9	\N	1970-01-01
+736	72	381	9	\N	1970-01-01
+737	71	381	9	\N	1970-01-01
+738	69	381	9	\N	1970-01-01
+739	68	381	9	\N	1970-01-01
+740	47	381	9	\N	1970-01-01
+741	45	381	9	\N	1970-01-01
+742	43	381	9	\N	1970-01-01
+743	37	381	9	\N	1970-01-01
+744	35	381	9	\N	1970-01-01
+745	11	381	9	\N	1970-01-01
+746	10	381	9	\N	1970-01-01
+747	9	381	9	\N	1970-01-01
+748	8	381	9	\N	1970-01-01
+749	7	381	9	\N	1970-01-01
+750	6	381	9	\N	1970-01-01
+751	5	381	9	\N	1970-01-01
+752	4	381	9	\N	1970-01-01
+753	3	381	9	\N	1970-01-01
+754	2	381	9	\N	1970-01-01
+755	1	381	9	\N	1970-01-01
+756	196	382	10	\N	1970-01-01
+757	152	382	10	\N	1970-01-01
+758	345	384	12	86	1970-01-01
+759	150	384	12	86	1970-01-01
+760	346	385	13	51	1970-01-01
+761	151	385	13	51	1970-01-01
+781	156	777	3	\N	2007-01-01
+789	168	777	3	\N	2007-01-01
+802	1	778	9	\N	2007-01-01
+803	2	778	9	\N	2007-01-01
+804	3	778	9	\N	2007-01-01
+805	4	778	9	\N	2007-01-01
+806	5	778	9	\N	2007-01-01
+807	6	778	9	\N	2007-01-01
+808	7	778	9	\N	2007-01-01
+809	8	778	9	\N	2007-01-01
+810	9	778	9	\N	2007-01-01
+811	10	778	9	\N	2007-01-01
+812	11	778	9	\N	2007-01-01
+813	35	778	9	\N	2007-01-01
+814	37	778	9	\N	2007-01-01
+815	43	778	9	\N	2007-01-01
+816	45	778	9	\N	2007-01-01
+817	47	778	9	\N	2007-01-01
+818	68	778	9	\N	2007-01-01
+819	69	778	9	\N	2007-01-01
+820	71	778	9	\N	2007-01-01
+821	72	778	9	\N	2007-01-01
+822	73	778	9	\N	2007-01-01
+823	74	778	9	\N	2007-01-01
+824	75	778	9	\N	2007-01-01
+825	85	778	9	\N	2007-01-01
+826	89	778	9	\N	2007-01-01
+827	92	778	9	\N	2007-01-01
+828	93	778	9	\N	2007-01-01
+829	94	778	9	\N	2007-01-01
+830	95	778	9	\N	2007-01-01
+831	96	778	9	\N	2007-01-01
+832	97	778	9	\N	2007-01-01
+833	98	778	9	\N	2007-01-01
+834	100	778	9	\N	2007-01-01
+835	105	778	9	\N	2007-01-01
+836	116	778	9	\N	2007-01-01
+837	117	778	9	\N	2007-01-01
+838	118	778	9	\N	2007-01-01
+839	126	778	9	\N	2007-01-01
+840	127	778	9	\N	2007-01-01
+841	130	778	9	\N	2007-01-01
+842	131	778	9	\N	2007-01-01
+843	132	778	9	\N	2007-01-01
+844	134	778	9	\N	2007-01-01
+845	136	778	9	\N	2007-01-01
+846	137	778	9	\N	2007-01-01
+847	138	778	9	\N	2007-01-01
+848	139	778	9	\N	2007-01-01
+849	140	778	9	\N	2007-01-01
+850	142	778	9	\N	2007-01-01
+851	143	778	9	\N	2007-01-01
+852	247	778	9	\N	2007-01-01
+853	269	778	9	\N	2007-01-01
+854	270	778	9	\N	2007-01-01
+855	281	778	9	0	2007-01-01
+856	292	778	9	\N	2007-01-01
+857	294	778	9	\N	2007-01-01
+858	335	778	9	\N	2007-01-01
+388	375	0	0	\N	1970-01-01
+779	153	777	3	81	2007-01-01
+780	155	777	3	81	2007-01-01
+782	157	777	3	81	2007-01-01
+783	159	777	3	81	2007-01-01
+784	160	777	3	81	2007-01-01
+785	162	777	3	81	2007-01-01
+786	164	777	3	81	2007-01-01
+787	166	777	3	81	2007-01-01
+788	167	777	3	81	2007-01-01
+790	171	777	3	81	2007-01-01
+791	175	777	3	81	2007-01-01
+792	177	777	3	81	2007-01-01
+793	184	777	3	81	2007-01-01
+794	185	777	3	81	2007-01-01
+795	276	777	3	81	2007-01-01
+796	300	777	3	81	2007-01-01
+797	302	777	3	81	2007-01-01
+798	320	777	3	81	2007-01-01
+799	344	777	3	81	2007-01-01
+800	353	777	3	81	2007-01-01
+801	362	777	3	81	2007-01-01
+482	262	0	0	\N	1970-01-01
+481	263	0	0	36	1970-01-01
+389	374	0	0	\N	1970-01-01
+390	373	0	0	\N	1970-01-01
+391	372	0	0	\N	1970-01-01
+392	371	0	0	\N	1970-01-01
+393	370	0	0	\N	1970-01-01
+394	369	0	0	\N	1970-01-01
+395	368	0	0	\N	1970-01-01
+396	367	0	0	\N	1970-01-01
+397	366	0	0	\N	1970-01-01
+398	365	0	0	\N	1970-01-01
+399	364	0	0	\N	1970-01-01
+400	363	0	0	\N	1970-01-01
+401	361	0	0	\N	1970-01-01
+402	360	0	0	\N	1970-01-01
+403	359	0	0	\N	1970-01-01
+404	358	0	0	\N	1970-01-01
+405	357	0	0	\N	1970-01-01
+406	356	0	0	\N	1970-01-01
+407	355	0	0	\N	1970-01-01
+408	354	0	0	\N	1970-01-01
+409	352	0	0	\N	1970-01-01
+410	351	0	0	\N	1970-01-01
+411	350	0	0	\N	1970-01-01
+412	349	0	0	\N	1970-01-01
+413	348	0	0	\N	1970-01-01
+414	347	0	0	\N	1970-01-01
+415	342	0	0	\N	1970-01-01
+416	341	0	0	\N	1970-01-01
+417	340	0	0	\N	1970-01-01
+418	339	0	0	\N	1970-01-01
+419	338	0	0	\N	1970-01-01
+420	337	0	0	\N	1970-01-01
+421	336	0	0	\N	1970-01-01
+422	334	0	0	\N	1970-01-01
+423	333	0	0	\N	1970-01-01
+424	332	0	0	\N	1970-01-01
+425	331	0	0	\N	1970-01-01
+426	330	0	0	\N	1970-01-01
+427	329	0	0	\N	1970-01-01
+428	328	0	0	\N	1970-01-01
+429	327	0	0	\N	1970-01-01
+430	326	0	0	\N	1970-01-01
+431	325	0	0	\N	1970-01-01
+432	324	0	0	\N	1970-01-01
+433	323	0	0	\N	1970-01-01
+434	322	0	0	\N	1970-01-01
+435	321	0	0	\N	1970-01-01
+436	318	0	0	\N	1970-01-01
+437	317	0	0	\N	1970-01-01
+438	316	0	0	\N	1970-01-01
+439	315	0	0	\N	1970-01-01
+440	314	0	0	\N	1970-01-01
+441	313	0	0	\N	1970-01-01
+442	312	0	0	\N	1970-01-01
+443	311	0	0	\N	1970-01-01
+444	310	0	0	\N	1970-01-01
+445	309	0	0	\N	1970-01-01
+446	308	0	0	\N	1970-01-01
+447	307	0	0	\N	1970-01-01
+448	306	0	0	\N	1970-01-01
+449	305	0	0	\N	1970-01-01
+450	304	0	0	\N	1970-01-01
+451	301	0	0	\N	1970-01-01
+452	299	0	0	0	1970-01-01
+453	298	0	0	\N	1970-01-01
+454	297	0	0	\N	1970-01-01
+455	296	0	0	\N	1970-01-01
+456	295	0	0	\N	1970-01-01
+457	291	0	0	\N	1970-01-01
+458	290	0	0	62	1970-01-01
+459	289	0	0	\N	1970-01-01
+460	288	0	0	\N	1970-01-01
+461	287	0	0	\N	1970-01-01
+462	286	0	0	\N	1970-01-01
+465	283	0	0	\N	1970-01-01
+466	282	0	0	\N	1970-01-01
+467	280	0	0	0	1970-01-01
+468	279	0	0	0	1970-01-01
+469	278	0	0	0	1970-01-01
+470	277	0	0	0	1970-01-01
+471	275	0	0	\N	1970-01-01
+472	274	0	0	\N	1970-01-01
+473	273	0	0	\N	1970-01-01
+474	272	0	0	\N	1970-01-01
+475	271	0	0	\N	1970-01-01
+476	268	0	0	\N	1970-01-01
+477	267	0	0	\N	1970-01-01
+478	266	0	0	0	1970-01-01
+479	265	0	0	\N	1970-01-01
+480	264	0	0	\N	1970-01-01
+483	261	0	0	66	1970-01-01
+484	260	0	0	61	1970-01-01
+485	259	0	0	66	1970-01-01
+486	258	0	0	61	1970-01-01
+487	257	0	0	\N	1970-01-01
+488	256	0	0	0	1970-01-01
+464	284	0	0	63	1970-01-01
+463	285	0	0	67	1970-01-01
+489	255	0	0	0	1970-01-01
+490	254	0	0	\N	1970-01-01
+491	253	0	0	\N	1970-01-01
+492	252	0	0	\N	1970-01-01
+493	251	0	0	0	1970-01-01
+494	250	0	0	0	1970-01-01
+495	249	0	0	0	1970-01-01
+496	248	0	0	\N	1970-01-01
+497	246	0	0	\N	1970-01-01
+498	245	0	0	\N	1970-01-01
+499	244	0	0	\N	1970-01-01
+500	243	0	0	\N	1970-01-01
+501	242	0	0	\N	1970-01-01
+502	241	0	0	\N	1970-01-01
+503	240	0	0	\N	1970-01-01
+504	239	0	0	\N	1970-01-01
+505	238	0	0	\N	1970-01-01
+506	237	0	0	\N	1970-01-01
+507	236	0	0	\N	1970-01-01
+508	235	0	0	\N	1970-01-01
+509	234	0	0	\N	1970-01-01
+510	233	0	0	\N	1970-01-01
+511	232	0	0	0	1970-01-01
+512	231	0	0	\N	1970-01-01
+513	230	0	0	\N	1970-01-01
+514	229	0	0	\N	1970-01-01
+515	228	0	0	\N	1970-01-01
+516	227	0	0	\N	1970-01-01
+517	226	0	0	\N	1970-01-01
+518	225	0	0	\N	1970-01-01
+519	224	0	0	0	1970-01-01
+520	223	0	0	\N	1970-01-01
+521	222	0	0	\N	1970-01-01
+522	221	0	0	\N	1970-01-01
+523	220	0	0	\N	1970-01-01
+524	218	0	0	0	1970-01-01
+525	217	0	0	0	1970-01-01
+526	216	0	0	91	1970-01-01
+527	215	0	0	\N	1970-01-01
+528	214	0	0	\N	1970-01-01
+529	213	0	0	\N	1970-01-01
+530	212	0	0	\N	1970-01-01
+531	211	0	0	\N	1970-01-01
+532	210	0	0	\N	1970-01-01
+533	209	0	0	\N	1970-01-01
+534	208	0	0	\N	1970-01-01
+535	207	0	0	\N	1970-01-01
+536	206	0	0	\N	1970-01-01
+537	205	0	0	\N	1970-01-01
+538	204	0	0	\N	1970-01-01
+539	203	0	0	\N	1970-01-01
+540	202	0	0	\N	1970-01-01
+541	201	0	0	\N	1970-01-01
+542	200	0	0	\N	1970-01-01
+543	199	0	0	\N	1970-01-01
+544	198	0	0	\N	1970-01-01
+545	197	0	0	\N	1970-01-01
+547	194	0	0	861	1970-01-01
+548	193	0	0	\N	1970-01-01
+549	192	0	0	\N	1970-01-01
+550	191	0	0	\N	1970-01-01
+551	190	0	0	\N	1970-01-01
+552	189	0	0	\N	1970-01-01
+553	188	0	0	\N	1970-01-01
+554	187	0	0	\N	1970-01-01
+555	186	0	0	\N	1970-01-01
+556	183	0	0	\N	1970-01-01
+557	182	0	0	\N	1970-01-01
+558	181	0	0	\N	1970-01-01
+559	180	0	0	\N	1970-01-01
+560	179	0	0	\N	1970-01-01
+561	178	0	0	\N	1970-01-01
+562	174	0	0	\N	1970-01-01
+563	173	0	0	\N	1970-01-01
+564	170	0	0	\N	1970-01-01
+565	169	0	0	\N	1970-01-01
+566	219	0	0	0	1970-01-01
+567	149	0	0	\N	1970-01-01
+568	148	0	0	\N	1970-01-01
+569	147	0	0	\N	1970-01-01
+570	146	0	0	\N	1970-01-01
+571	145	0	0	41	1970-01-01
+572	144	0	0	48	1970-01-01
+573	141	0	0	\N	1970-01-01
+574	135	0	0	\N	1970-01-01
+575	129	0	0	\N	1970-01-01
+576	128	0	0	\N	1970-01-01
+577	125	0	0	\N	1970-01-01
+578	124	0	0	\N	1970-01-01
+579	123	0	0	\N	1970-01-01
+580	122	0	0	\N	1970-01-01
+581	121	0	0	\N	1970-01-01
+582	120	0	0	\N	1970-01-01
+583	119	0	0	\N	1970-01-01
+584	115	0	0	\N	1970-01-01
+585	114	0	0	\N	1970-01-01
+586	113	0	0	\N	1970-01-01
+587	112	0	0	\N	1970-01-01
+588	111	0	0	\N	1970-01-01
+589	110	0	0	\N	1970-01-01
+590	109	0	0	\N	1970-01-01
+591	108	0	0	\N	1970-01-01
+592	107	0	0	\N	1970-01-01
+593	104	0	0	\N	1970-01-01
+594	103	0	0	\N	1970-01-01
+595	102	0	0	\N	1970-01-01
+596	99	0	0	\N	1970-01-01
+597	91	0	0	\N	1970-01-01
+598	90	0	0	\N	1970-01-01
+599	87	0	0	\N	1970-01-01
+600	86	0	0	0	1970-01-01
+601	84	0	0	\N	1970-01-01
+602	83	0	0	\N	1970-01-01
+603	82	0	0	\N	1970-01-01
+604	81	0	0	\N	1970-01-01
+605	80	0	0	\N	1970-01-01
+606	79	0	0	\N	1970-01-01
+607	78	0	0	\N	1970-01-01
+608	77	0	0	\N	1970-01-01
+609	76	0	0	\N	1970-01-01
+610	70	0	0	\N	1970-01-01
+611	67	0	0	\N	1970-01-01
+612	66	0	0	\N	1970-01-01
+613	65	0	0	\N	1970-01-01
+614	64	0	0	\N	1970-01-01
+615	63	0	0	\N	1970-01-01
+616	62	0	0	\N	1970-01-01
+617	61	0	0	\N	1970-01-01
+618	60	0	0	\N	1970-01-01
+619	59	0	0	\N	1970-01-01
+620	58	0	0	\N	1970-01-01
+621	57	0	0	\N	1970-01-01
+622	56	0	0	\N	1970-01-01
+623	55	0	0	\N	1970-01-01
+624	54	0	0	\N	1970-01-01
+625	53	0	0	\N	1970-01-01
+626	52	0	0	\N	1970-01-01
+627	51	0	0	\N	1970-01-01
+628	50	0	0	\N	1970-01-01
+629	49	0	0	\N	1970-01-01
+630	48	0	0	\N	1970-01-01
+631	41	0	0	91	1970-01-01
+632	39	0	0	97	1970-01-01
+633	38	0	0	93	1970-01-01
+634	34	0	0	\N	1970-01-01
+635	33	0	0	\N	1970-01-01
+636	32	0	0	\N	1970-01-01
+637	31	0	0	\N	1970-01-01
+638	30	0	0	\N	1970-01-01
+639	29	0	0	\N	1970-01-01
+640	28	0	0	\N	1970-01-01
+641	27	0	0	\N	1970-01-01
+642	26	0	0	\N	1970-01-01
+643	25	0	0	\N	1970-01-01
+644	24	0	0	\N	1970-01-01
+645	23	0	0	\N	1970-01-01
+646	22	0	0	\N	1970-01-01
+647	21	0	0	\N	1970-01-01
+648	20	0	0	\N	1970-01-01
+649	19	0	0	\N	1970-01-01
+650	18	0	0	\N	1970-01-01
+651	17	0	0	\N	1970-01-01
+652	16	0	0	\N	1970-01-01
+653	15	0	0	\N	1970-01-01
+654	14	0	0	\N	1970-01-01
+655	13	0	0	\N	1970-01-01
+656	12	0	0	\N	1970-01-01
+867	776	778	9	66	1970-01-01
+871	862	0	0	66	1970-01-01
+546	195	0	0	511	1970-01-01
+861	775	0	0	811	2007-01-01
+869	864	0	0	891	2007-01-01
+872	775	0	0	36	1970-01-01
+873	195	0	0	36	2007-01-01
+1109	1108	0	0	\N	1970-01-01
+1111	1110	0	0	\N	1970-01-01
+1113	1112	0	0	\N	1970-01-01
+1116	1114	0	0	\N	1970-01-01
+1119	863	0	0	\N	1970-01-01
+\.
+
+
+--
+-- Data for Name: taxzone_charts; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.taxzone_charts (id, taxzone_id, buchungsgruppen_id, income_accno_id, expense_accno_id, itime) FROM stdin;
+3	1	860	145	41	2018-11-30 19:56:01.945692
+4	1	859	152	41	2018-11-30 19:56:01.945692
+5	2	860	150	38	2018-11-30 19:56:01.945692
+6	2	859	151	39	2018-11-30 19:56:01.945692
+7	3	860	144	216	2018-11-30 19:56:01.945692
+8	3	859	144	216	2018-11-30 19:56:01.945692
+1	4	860	88	36	2018-11-30 19:56:01.945692
+2	4	859	184	37	2018-11-30 19:56:01.945692
+\.
+
+
+--
+-- Data for Name: time_recording_articles; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.time_recording_articles (id, part_id, "position") FROM stdin;
+\.
+
+
+--
+-- Data for Name: time_recordings; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.time_recordings (id, customer_id, project_id, start_time, end_time, description, staff_member_id, employee_id, itime, mtime, booked, payroll, part_id, date, duration, order_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: todo_user_config; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.todo_user_config (employee_id, show_after_login, show_follow_ups, show_follow_ups_login, show_overdue_sales_quotations, show_overdue_sales_quotations_login, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: transfer_type; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.transfer_type (id, direction, description, sortkey, itime, mtime) FROM stdin;
+879	in	stock	1	2018-11-30 19:55:47.68458	\N
+880	in	found	2	2018-11-30 19:55:47.68458	\N
+881	in	correction	3	2018-11-30 19:55:47.68458	\N
+882	out	used	4	2018-11-30 19:55:47.68458	\N
+883	out	disposed	5	2018-11-30 19:55:47.68458	\N
+884	out	back	6	2018-11-30 19:55:47.68458	\N
+885	out	missing	7	2018-11-30 19:55:47.68458	\N
+886	out	correction	9	2018-11-30 19:55:47.68458	\N
+887	transfer	transfer	10	2018-11-30 19:55:47.68458	\N
+888	transfer	correction	11	2018-11-30 19:55:47.68458	\N
+889	out	shipped	12	2018-11-30 19:55:48.001091	\N
+890	in	assembled	13	2018-11-30 19:56:05.265398	\N
+891	in	stocktaking	14	2021-01-16 23:40:31.412921	\N
+892	out	stocktaking	15	2021-01-16 23:40:31.412921	\N
+\.
+
+
+--
+-- Data for Name: translation; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.translation (parts_id, language_id, translation, itime, mtime, longdescription, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: trigger_information; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.trigger_information (id, key, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: units; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.units (name, base_unit, factor, type, sortkey, id) FROM stdin;
+Stck	\N	\N	dimension	1	1
+psch	\N	0.00000	service	2	2
+Tag	Std	8.00000	service	3	3
+Std	min	60.00000	service	4	4
+min	\N	0.00000	service	5	5
+t	kg	1000.00000	dimension	6	6
+kg	g	1000.00000	dimension	7	7
+g	mg	1000.00000	dimension	8	8
+mg	\N	\N	dimension	9	9
+L	ml	1000.00000	dimension	10	10
+ml	\N	\N	dimension	11	11
+\.
+
+
+--
+-- Data for Name: units_language; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.units_language (unit, language_id, localized, localized_plural, id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_preferences; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.user_preferences (id, login, namespace, version, key, value) FROM stdin;
+1	#default#	DisplayableName	0.00000	SL::DB::Customer	<%customernumber%> <%name%>
+2	#default#	DisplayableName	0.00000	SL::DB::Vendor	<%vendornumber%> <%name%>
+3	#default#	DisplayableName	0.00000	SL::DB::Part	<%partnumber%> <%description%>
+\.
+
+
+--
+-- Data for Name: validity_tokens; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.validity_tokens (id, scope, token, itime, valid_until) FROM stdin;
+\.
+
+
+--
+-- Data for Name: vendor; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.vendor (id, name, department_1, department_2, street, zipcode, city, country, contact, phone, fax, homepage, email, notes, taxincluded, vendornumber, cc, bcc, business_id, taxnumber, discount, creditlimit, account_number, bank_code, bank, language, itime, mtime, obsolete, username, user_password, salesman_id, v_customer_id, language_id, payment_id, taxzone_id, greeting, ustid, iban, bic, direct_debit, depositor, delivery_term_id, currency_id, gln, natural_person) FROM stdin;
+\.
+
+
+--
+-- Data for Name: warehouse; Type: TABLE DATA; Schema: public; Owner: kivitendo
+--
+
+COPY public.warehouse (id, description, itime, mtime, sortkey, invalid) FROM stdin;
+\.
+
+
+--
+-- Data for Name: report_categories; Type: TABLE DATA; Schema: tax; Owner: kivitendo
+--
+
+COPY tax.report_categories (id, description, subdescription) FROM stdin;
+0		
+1	Lieferungen und sonstige Leistungen	(einschließlich unentgeltlicher Wertabgaben)
+2	Innergemeinschaftliche Erwerbe	
+3	Ergänzende Angaben zu Umsätzen	
+99	Summe	
+\.
+
+
+--
+-- Data for Name: report_headings; Type: TABLE DATA; Schema: tax; Owner: kivitendo
+--
+
+COPY tax.report_headings (id, category_id, type, description, subdescription) FROM stdin;
+0	0			
+1	1	received	Steuerfreie Umsätze mit Vorsteuerabzug	
+2	1	recieved	Steuerfreie Umsätze ohne Vorsteuerabzug	
+3	1	recieved	Steuerpflichtige Umsätze	(Lieferungen und sonstige Leistungen einschl. unentgeltlicher Wertabgaben)
+4	2	recieved	Steuerfreie innergemeinschaftliche Erwerbe	
+5	2	recieved	Steuerpflichtige innergemeinschaftliche Erwerbe	
+6	3	recieved	Umsätze, für die als Leistungsempfänger die Steuer nach § 13b Abs. 2 UStG geschuldet wird	
+66	3	recieved		
+7	3	paied	Abziehbare Vorsteuerbeträge	
+8	3	paied	Andere Steuerbeträge	
+99	99		Summe	
+\.
+
+
+--
+-- Data for Name: report_variables; Type: TABLE DATA; Schema: tax; Owner: kivitendo
+--
+
+COPY tax.report_variables (id, "position", heading_id, description, taxbase, dec_places, valid_from) FROM stdin;
+0	keine	0	< < < keine UStVa Position > > >			1970-01-01
+1	41	1	Innergemeinschaftliche Lieferungen (§ 4 Nr. 1 Buchst. b UStG) an Abnehmer mit USt-IdNr.	0	0	1970-01-01
+2	44	1	neuer Fahrzeuge an Abnehmer ohne USt-IdNr.	0	0	1970-01-01
+3	49	1	neuer Fahrzeuge außerhalb eines Unternehmens (§ 2a UStG)	0	0	1970-01-01
+4	43	1	Weitere steuerfreie Umsätze mit Vorsteuerabzug	0	0	1970-01-01
+5	48	2	Umsätze nach § 4 Nr. 8 bis 28 UStG	0	0	1970-01-01
+6	51	3	zum Steuersatz von 16 %	0	0	1970-01-01
+7	511	3		6	2	1970-01-01
+8	81	3	zum Steuersatz von 19 %	0	0	1970-01-01
+9	811	3		8	2	1970-01-01
+10	86	3	zum Steuersatz von 7 %	0	0	1970-01-01
+11	861	3		10	2	1970-01-01
+12	35	3	Umsätze, die anderen Steuersätzen unterliegen	0	0	1970-01-01
+13	36	3		12	2	1970-01-01
+14	77	3	Lieferungen in das übrige Gemeinschaftsgebiet an Abnehmer mit USt-IdNr.	0	0	1970-01-01
+15	76	3	Umsätze, für die eine Steuer nach § 24 UStG zu entrichten ist	0	0	1970-01-01
+16	80	3		15	2	1970-01-01
+17	91	4	Erwerbe nach § 4b UStG	0	0	1970-01-01
+18	97	5	zum Steuersatz von 16 %	0	0	1970-01-01
+19	971	5		18	2	1970-01-01
+20	89	5	zum Steuersatz von 19 %	0	0	1970-01-01
+21	891	5		20	2	1970-01-01
+22	93	5	zum Steuersatz von 7 %	0	0	1970-01-01
+23	931	5		22	2	1970-01-01
+24	95	5	zu anderen Steuersätzen	0	0	1970-01-01
+25	98	5		24	2	1970-01-01
+26	94	5	neuer Fahrzeuge von Lieferern ohne USt-IdNr. zum allgemeinen Steuersatz	0	0	1970-01-01
+27	96	5		26	2	1970-01-01
+28	42	66	Lieferungen des ersten Abnehmers bei innergemeinschaftlichen Dreiecksgeschäften (§ 25b Abs. 2 UStG)	0	0	1970-01-01
+29	60	66	Steuerpflichtige Umsätze im Sinne des § 13b Abs. 1 Satz 1 Nr. 1 bis 5 UStG, für die der Leistungsempfänger die Steuer schuldet	0	0	1970-01-01
+30	45	66	Nicht steuerbare Umsätze (Leistungsort nicht im Inland)	0	0	1970-01-01
+31	52	6	Leistungen eines im Ausland ansässigen Unternehmers (§ 13b Abs. 1 Satz 1 Nr. 1 und 5 UStG)	0	0	1970-01-01
+32	53	6		31	2	1970-01-01
+33	73	6	Lieferungen sicherungsübereigneter Gegenstände und Umsätze, die unter das GrEStG fallen (§ 13b Abs. 1 Satz 1 Nr. 2 und 3 UStG)	0	0	1970-01-01
+34	74	6		33	2	1970-01-01
+35	84	6	Bauleistungen eines im Inland ansässigen Unternehmers (§ 13b Abs. 1 Satz 1 Nr. 4 UStG)	0	0	1970-01-01
+36	85	6		35	2	1970-01-01
+37	65	6	Steuer infolge Wechsels der Besteuerungsform sowie Nachsteuer auf versteuerte Anzahlungen u. ä. wegen Steuersatzänderung		2	1970-01-01
+38	66	7	Vorsteuerbeträge aus Rechnungen von anderen Unternehmern (§ 15 Abs. 1 Satz 1 Nr. 1 UStG), aus Leistungen im Sinne des § 13a Abs. 1 Nr. 6 UStG (§ 15 Abs. 1 Satz 1 Nr. 5 UStG) und aus innergemeinschaftlichen Dreiecksgeschäften (§ 25b Abs. 5 UStG)		2	1970-01-01
+39	61	7	Vorsteuerbeträge aus dem innergemeinschaftlichen Erwerb von Gegenständen (§ 15 Abs. 1 Satz 1 Nr. 3 UStG)		2	1970-01-01
+40	62	7	Entrichtete Einfuhrumsatzsteuer (§ 15 Abs. 1 Satz 1 Nr. 2 UStG)		2	1970-01-01
+41	67	7	Vorsteuerbeträge aus Leistungen im Sinne des § 13b Abs. 1 UStG (§ 15 Abs. 1 Satz 1 Nr. 4 UStG)		2	1970-01-01
+42	63	7	Vorsteuerbeträge, die nach allgemeinen Durchschnittssätzen berechnet sind (§§ 23 und 23a UStG)		2	1970-01-01
+43	64	7	Berichtigung des Vorsteuerabzugs (§ 15a UStG)		2	1970-01-01
+44	59	7	Vorsteuerabzug für innergemeinschaftliche Lieferungen neuer Fahrzeuge außerhalb eines Unternehmens (§ 2a UStG) sowie von Kleinunternehmern im Sinne des § 19 Abs. 1 UStG (§ 15 Abs. 4a UStG)		2	1970-01-01
+45	69	8	in Rechnungen unrichtig oder unberechtigt ausgewiesene Steuerbeträge (§ 14c UStG) sowie Steuerbeträge, die nach § 4 Nr. 4a Satz 1 Buchst. a Satz 2, § 6a Abs. 4 Satz 2, § 17 Abs. 1 Satz 6 oder § 25b Abs. 2 UStG geschuldet werden		2	1970-01-01
+46	39	8	Anrechnung (Abzug) der festgesetzten Sondervorauszahlung für Dauerfristverlängerung (nur auszufüllen in der letzten Voranmeldung des Besteuerungszeitraums, in der Regel Dezember)		2	1970-01-01
+47	21	66	Nicht steuerbare sonstige Leistungen gem. § 18b Satz 1 Nr. 2 UStG	0	0	2010-01-01
+48	46	6	Im Inland steuerpflichtige sonstige Leistungen von im übrigen Gemeinschaftsgebiet ansässigen Unternehmen (§13b Abs. 1 UStG)	0	0	2010-01-01
+49	47	6		49	2	2010-01-01
+50	83	8	Verbleibender Überschuss - bitte dem Betrag ein Minuszeichen voranstellen -	0	2	2010-01-01
+\.
+
+
+--
+-- Name: acc_trans_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.acc_trans_id_seq', 1, true);
+
+
+--
+-- Name: additional_billing_addresses_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.additional_billing_addresses_id_seq', 1, false);
+
+
+--
+-- Name: assembly_assembly_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.assembly_assembly_id_seq', 1, false);
+
+
+--
+-- Name: background_job_histories_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.background_job_histories_id_seq', 1, false);
+
+
+--
+-- Name: background_jobs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.background_jobs_id_seq', 8, true);
+
+
+--
+-- Name: bank_transaction_acc_trans_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.bank_transaction_acc_trans_id_seq', 1, false);
+
+
+--
+-- Name: bank_transactions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.bank_transactions_id_seq', 1, false);
+
+
+--
+-- Name: contact_departments_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.contact_departments_id_seq', 1, false);
+
+
+--
+-- Name: contact_titles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.contact_titles_id_seq', 1, false);
+
+
+--
+-- Name: csv_import_profile_settings_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.csv_import_profile_settings_id_seq', 10, true);
+
+
+--
+-- Name: csv_import_profiles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.csv_import_profiles_id_seq', 1, true);
+
+
+--
+-- Name: csv_import_report_rows_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.csv_import_report_rows_id_seq', 1, false);
+
+
+--
+-- Name: csv_import_report_status_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.csv_import_report_status_id_seq', 1, false);
+
+
+--
+-- Name: csv_import_reports_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.csv_import_reports_id_seq', 1, false);
+
+
+--
+-- Name: currencies_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.currencies_id_seq', 2, true);
+
+
+--
+-- Name: custom_data_export_queries_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.custom_data_export_queries_id_seq', 1, false);
+
+
+--
+-- Name: custom_data_export_query_parameters_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.custom_data_export_query_parameters_id_seq', 1, false);
+
+
+--
+-- Name: custom_variable_configs_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.custom_variable_configs_id', 1, false);
+
+
+--
+-- Name: custom_variables_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.custom_variables_id', 1, false);
+
+
+--
+-- Name: datev_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.datev_id_seq', 1, false);
+
+
+--
+-- Name: defaults_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.defaults_id_seq', 1, true);
+
+
+--
+-- Name: delivery_order_items_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.delivery_order_items_id', 1, false);
+
+
+--
+-- Name: email_imports_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.email_imports_id_seq', 1, false);
+
+
+--
+-- Name: email_journal_attachments_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.email_journal_attachments_id_seq', 1, false);
+
+
+--
+-- Name: email_journal_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.email_journal_id_seq', 1, false);
+
+
+--
+-- Name: exchangerate_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.exchangerate_id_seq', 1, false);
+
+
+--
+-- Name: file_full_texts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.file_full_texts_id_seq', 1, false);
+
+
+--
+-- Name: files_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.files_id_seq', 1, false);
+
+
+--
+-- Name: finanzamt_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.finanzamt_id_seq', 686, true);
+
+
+--
+-- Name: follow_up_access_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.follow_up_access_id_seq', 1, false);
+
+
+--
+-- Name: follow_up_created_for_employees_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.follow_up_created_for_employees_id_seq', 1, false);
+
+
+--
+-- Name: follow_up_done_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.follow_up_done_id_seq', 1, false);
+
+
+--
+-- Name: follow_up_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.follow_up_id', 1, false);
+
+
+--
+-- Name: follow_up_link_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.follow_up_link_id', 1, false);
+
+
+--
+-- Name: generic_translations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.generic_translations_id_seq', 1, false);
+
+
+--
+-- Name: glid; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.glid', 1, false);
+
+
+--
+-- Name: greetings_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.greetings_id_seq', 1, false);
+
+
+--
+-- Name: id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.id', 1119, true);
+
+
+--
+-- Name: inventory_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.inventory_id_seq', 1, false);
+
+
+--
+-- Name: invoiceid; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.invoiceid', 1, false);
+
+
+--
+-- Name: makemodel_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.makemodel_id_seq', 1, false);
+
+
+--
+-- Name: note_id; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.note_id', 1, false);
+
+
+--
+-- Name: order_statuses_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.order_statuses_id_seq', 1, true);
+
+
+--
+-- Name: orderitemsid; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.orderitemsid', 1, false);
+
+
+--
+-- Name: part_classifications_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.part_classifications_id_seq', 4, true);
+
+
+--
+-- Name: part_customer_prices_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.part_customer_prices_id_seq', 1, false);
+
+
+--
+-- Name: parts_price_history_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.parts_price_history_id_seq', 1, false);
+
+
+--
+-- Name: price_rule_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.price_rule_items_id_seq', 1, false);
+
+
+--
+-- Name: price_rules_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.price_rules_id_seq', 1, false);
+
+
+--
+-- Name: prices_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.prices_id_seq', 1, false);
+
+
+--
+-- Name: project_participants_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_participants_id_seq', 1, false);
+
+
+--
+-- Name: project_phase_participants_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_phase_participants_id_seq', 1, false);
+
+
+--
+-- Name: project_phases_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_phases_id_seq', 1, false);
+
+
+--
+-- Name: project_roles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_roles_id_seq', 1, false);
+
+
+--
+-- Name: project_status_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_status_id_seq', 4, true);
+
+
+--
+-- Name: project_types_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.project_types_id_seq', 3, true);
+
+
+--
+-- Name: purchase_basket_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.purchase_basket_items_id_seq', 1, false);
+
+
+--
+-- Name: reclamation_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.reclamation_items_id_seq', 1, false);
+
+
+--
+-- Name: reclamation_reasons_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.reclamation_reasons_id_seq', 1, false);
+
+
+--
+-- Name: record_links_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.record_links_id_seq', 1, false);
+
+
+--
+-- Name: record_template_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.record_template_items_id_seq', 1, false);
+
+
+--
+-- Name: record_templates_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.record_templates_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_acceptance_statuses_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_acceptance_statuses_id_seq', 4, true);
+
+
+--
+-- Name: requirement_spec_complexities_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_complexities_id_seq', 5, true);
+
+
+--
+-- Name: requirement_spec_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_items_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_orders_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_orders_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_parts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_parts_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_pictures_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_pictures_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_predefined_texts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_predefined_texts_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_risks_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_risks_id_seq', 5, true);
+
+
+--
+-- Name: requirement_spec_statuses_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_statuses_id_seq', 3, true);
+
+
+--
+-- Name: requirement_spec_text_blocks_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_text_blocks_id_seq', 1, false);
+
+
+--
+-- Name: requirement_spec_types_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_types_id_seq', 2, true);
+
+
+--
+-- Name: requirement_spec_versions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_spec_versions_id_seq', 1, false);
+
+
+--
+-- Name: requirement_specs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.requirement_specs_id_seq', 1, false);
+
+
+--
+-- Name: sepa_export_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.sepa_export_id_seq', 1, false);
+
+
+--
+-- Name: sepa_export_message_ids_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.sepa_export_message_ids_id_seq', 1, false);
+
+
+--
+-- Name: shop_images_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.shop_images_id_seq', 1, false);
+
+
+--
+-- Name: shop_order_items_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.shop_order_items_id_seq', 1, false);
+
+
+--
+-- Name: shop_orders_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.shop_orders_id_seq', 1, false);
+
+
+--
+-- Name: shop_parts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.shop_parts_id_seq', 1, false);
+
+
+--
+-- Name: shops_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.shops_id_seq', 1, false);
+
+
+--
+-- Name: status_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.status_id_seq', 1, false);
+
+
+--
+-- Name: taxzone_charts_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.taxzone_charts_id_seq', 8, true);
+
+
+--
+-- Name: time_recording_articles_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.time_recording_articles_id_seq', 1, false);
+
+
+--
+-- Name: time_recordings_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.time_recordings_id_seq', 1, false);
+
+
+--
+-- Name: todo_user_config_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.todo_user_config_id_seq', 1, false);
+
+
+--
+-- Name: translation_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.translation_id_seq', 1, false);
+
+
+--
+-- Name: trigger_information_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.trigger_information_id_seq', 1, false);
+
+
+--
+-- Name: units_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.units_id_seq', 11, true);
+
+
+--
+-- Name: units_language_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.units_language_id_seq', 1, false);
+
+
+--
+-- Name: user_preferences_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.user_preferences_id_seq', 3, true);
+
+
+--
+-- Name: validity_tokens_id_seq; Type: SEQUENCE SET; Schema: public; Owner: kivitendo
+--
+
+SELECT pg_catalog.setval('public.validity_tokens_id_seq', 1, false);
+
+
+--
+-- Name: acc_trans acc_trans_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.acc_trans
+    ADD CONSTRAINT acc_trans_pkey PRIMARY KEY (acc_trans_id);
+
+
+--
+-- Name: additional_billing_addresses additional_billing_addresses_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.additional_billing_addresses
+    ADD CONSTRAINT additional_billing_addresses_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: ap_gl ap_gl_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap_gl
+    ADD CONSTRAINT ap_gl_pkey PRIMARY KEY (ap_id, gl_id);
+
+
+--
+-- Name: ap ap_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: ar ar_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: assembly assembly_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assembly
+    ADD CONSTRAINT assembly_pkey PRIMARY KEY (assembly_id);
+
+
+--
+-- Name: assortment_items assortment_part_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assortment_items
+    ADD CONSTRAINT assortment_part_pkey PRIMARY KEY (assortment_id, parts_id);
+
+
+--
+-- Name: background_job_histories background_job_histories_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.background_job_histories
+    ADD CONSTRAINT background_job_histories_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: background_jobs background_jobs_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.background_jobs
+    ADD CONSTRAINT background_jobs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bank_accounts bank_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_accounts
+    ADD CONSTRAINT bank_accounts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_pkey PRIMARY KEY (bank_transaction_id, acc_trans_id);
+
+
+--
+-- Name: bank_transactions bank_transactions_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transactions
+    ADD CONSTRAINT bank_transactions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bin bin_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bin
+    ADD CONSTRAINT bin_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: buchungsgruppen buchungsgruppen_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.buchungsgruppen
+    ADD CONSTRAINT buchungsgruppen_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: business_models business_models_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.business_models
+    ADD CONSTRAINT business_models_pkey PRIMARY KEY (parts_id, business_id);
+
+
+--
+-- Name: business business_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.business
+    ADD CONSTRAINT business_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bank_accounts chart_id_unique; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_accounts
+    ADD CONSTRAINT chart_id_unique UNIQUE (chart_id);
+
+
+--
+-- Name: chart chart_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.chart
+    ADD CONSTRAINT chart_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contact_departments contact_departments_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_departments
+    ADD CONSTRAINT contact_departments_description_key UNIQUE (description);
+
+
+--
+-- Name: contact_departments contact_departments_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_departments
+    ADD CONSTRAINT contact_departments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contact_titles contact_titles_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_titles
+    ADD CONSTRAINT contact_titles_description_key UNIQUE (description);
+
+
+--
+-- Name: contact_titles contact_titles_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contact_titles
+    ADD CONSTRAINT contact_titles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: contacts contacts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.contacts
+    ADD CONSTRAINT contacts_pkey PRIMARY KEY (cp_id);
+
+
+--
+-- Name: csv_import_profile_settings csv_import_profile_settings_csv_import_profile_id_key_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profile_settings
+    ADD CONSTRAINT csv_import_profile_settings_csv_import_profile_id_key_key UNIQUE (csv_import_profile_id, key);
+
+
+--
+-- Name: csv_import_profile_settings csv_import_profile_settings_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profile_settings
+    ADD CONSTRAINT csv_import_profile_settings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: csv_import_profiles csv_import_profiles_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profiles
+    ADD CONSTRAINT csv_import_profiles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: csv_import_report_rows csv_import_report_rows_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_rows
+    ADD CONSTRAINT csv_import_report_rows_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: csv_import_report_status csv_import_report_status_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_status
+    ADD CONSTRAINT csv_import_report_status_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: csv_import_reports csv_import_reports_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_reports
+    ADD CONSTRAINT csv_import_reports_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: currencies currencies_name_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.currencies
+    ADD CONSTRAINT currencies_name_key UNIQUE (name);
+
+
+--
+-- Name: currencies currencies_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.currencies
+    ADD CONSTRAINT currencies_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: custom_data_export_queries custom_data_export_queries_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_data_export_queries
+    ADD CONSTRAINT custom_data_export_queries_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: custom_data_export_query_parameters custom_data_export_query_parameters_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_data_export_query_parameters
+    ADD CONSTRAINT custom_data_export_query_parameters_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: custom_variable_config_partsgroups custom_variable_config_partsgroups_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variable_config_partsgroups
+    ADD CONSTRAINT custom_variable_config_partsgroups_pkey PRIMARY KEY (custom_variable_config_id, partsgroup_id);
+
+
+--
+-- Name: custom_variable_configs custom_variable_configs_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variable_configs
+    ADD CONSTRAINT custom_variable_configs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: custom_variables custom_variables_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variables
+    ADD CONSTRAINT custom_variables_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: custom_variables_validity custom_variables_validity_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variables_validity
+    ADD CONSTRAINT custom_variables_validity_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: customer customer_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: datev datev_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.datev
+    ADD CONSTRAINT datev_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: defaults defaults_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: delivery_order_items delivery_order_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: delivery_order_items_stock delivery_order_items_stock_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items_stock
+    ADD CONSTRAINT delivery_order_items_stock_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: delivery_orders delivery_orders_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: delivery_terms delivery_terms_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_terms
+    ADD CONSTRAINT delivery_terms_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: department department_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.department
+    ADD CONSTRAINT department_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: drafts drafts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.drafts
+    ADD CONSTRAINT drafts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: dunning_config dunning_config_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.dunning_config
+    ADD CONSTRAINT dunning_config_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: dunning dunning_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.dunning
+    ADD CONSTRAINT dunning_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: email_imports email_imports_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_imports
+    ADD CONSTRAINT email_imports_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: email_journal_attachments email_journal_attachments_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal_attachments
+    ADD CONSTRAINT email_journal_attachments_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: email_journal email_journal_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal
+    ADD CONSTRAINT email_journal_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: employee employee_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.employee
+    ADD CONSTRAINT employee_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: employee_project_invoices employee_project_invoices_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.employee_project_invoices
+    ADD CONSTRAINT employee_project_invoices_pkey PRIMARY KEY (employee_id, project_id);
+
+
+--
+-- Name: exchangerate exchangerate_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.exchangerate
+    ADD CONSTRAINT exchangerate_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: file_full_texts file_full_texts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_full_texts
+    ADD CONSTRAINT file_full_texts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: file_versions file_versions_guid_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_versions
+    ADD CONSTRAINT file_versions_guid_key UNIQUE (guid);
+
+
+--
+-- Name: file_versions file_versions_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_versions
+    ADD CONSTRAINT file_versions_pkey PRIMARY KEY (guid);
+
+
+--
+-- Name: files files_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.files
+    ADD CONSTRAINT files_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: finanzamt finanzamt_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.finanzamt
+    ADD CONSTRAINT finanzamt_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: follow_up_access follow_up_access_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_access
+    ADD CONSTRAINT follow_up_access_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: follow_up_created_for_employees follow_up_created_for_employees_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_created_for_employees
+    ADD CONSTRAINT follow_up_created_for_employees_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: follow_up_done follow_up_done_follow_up_id_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_done
+    ADD CONSTRAINT follow_up_done_follow_up_id_key UNIQUE (follow_up_id);
+
+
+--
+-- Name: follow_up_done follow_up_done_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_done
+    ADD CONSTRAINT follow_up_done_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: follow_up_links follow_up_links_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_links
+    ADD CONSTRAINT follow_up_links_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: follow_ups follow_ups_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_ups
+    ADD CONSTRAINT follow_ups_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: generic_translations generic_translations_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.generic_translations
+    ADD CONSTRAINT generic_translations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: gl gl_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.gl
+    ADD CONSTRAINT gl_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: greetings greetings_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.greetings
+    ADD CONSTRAINT greetings_description_key UNIQUE (description);
+
+
+--
+-- Name: greetings greetings_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.greetings
+    ADD CONSTRAINT greetings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: history_erp history_erp_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.history_erp
+    ADD CONSTRAINT history_erp_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: inventory inventory_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: invoice invoice_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: language language_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.language
+    ADD CONSTRAINT language_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: letter_draft letter_draft_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: letter letter_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: makemodel makemodel_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.makemodel
+    ADD CONSTRAINT makemodel_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: notes notes_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.notes
+    ADD CONSTRAINT notes_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: oe oe_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: oe_version oe_version_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe_version
+    ADD CONSTRAINT oe_version_pkey PRIMARY KEY (oe_id, version);
+
+
+--
+-- Name: order_statuses order_statuses_name_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.order_statuses
+    ADD CONSTRAINT order_statuses_name_key UNIQUE (name);
+
+
+--
+-- Name: order_statuses order_statuses_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.order_statuses
+    ADD CONSTRAINT order_statuses_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: orderitems orderitems_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: part_classifications part_classifications_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_classifications
+    ADD CONSTRAINT part_classifications_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: part_customer_prices part_customer_prices_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_customer_prices
+    ADD CONSTRAINT part_customer_prices_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: prices parts_id_pricegroup_id_unique; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.prices
+    ADD CONSTRAINT parts_id_pricegroup_id_unique UNIQUE (parts_id, pricegroup_id);
+
+
+--
+-- Name: parts parts_partnumber_key1; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_partnumber_key1 UNIQUE (partnumber);
+
+
+--
+-- Name: parts parts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: parts_price_history parts_price_history_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts_price_history
+    ADD CONSTRAINT parts_price_history_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: partsgroup partsgroup_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.partsgroup
+    ADD CONSTRAINT partsgroup_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: payment_terms payment_terms_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.payment_terms
+    ADD CONSTRAINT payment_terms_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: periodic_invoices_configs periodic_invoices_configs_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices_configs
+    ADD CONSTRAINT periodic_invoices_configs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: periodic_invoices periodic_invoices_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices
+    ADD CONSTRAINT periodic_invoices_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: price_factors price_factors_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_factors
+    ADD CONSTRAINT price_factors_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: price_rule_items price_rule_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rule_items
+    ADD CONSTRAINT price_rule_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: price_rules price_rules_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rules
+    ADD CONSTRAINT price_rules_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: pricegroup pricegroup_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.pricegroup
+    ADD CONSTRAINT pricegroup_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: prices prices_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.prices
+    ADD CONSTRAINT prices_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: printers printers_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.printers
+    ADD CONSTRAINT printers_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project_participants project_participants_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_participants
+    ADD CONSTRAINT project_participants_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project_phase_participants project_phase_participants_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phase_participants
+    ADD CONSTRAINT project_phase_participants_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project_phases project_phases_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phases
+    ADD CONSTRAINT project_phases_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project project_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project project_projectnumber_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_projectnumber_key UNIQUE (projectnumber);
+
+
+--
+-- Name: project_roles project_roles_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_roles
+    ADD CONSTRAINT project_roles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project_statuses project_status_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_statuses
+    ADD CONSTRAINT project_status_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: project_types project_types_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_types
+    ADD CONSTRAINT project_types_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: purchase_basket_items purchase_basket_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.purchase_basket_items
+    ADD CONSTRAINT purchase_basket_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: reclamation_items reclamation_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: reclamation_reasons reclamation_reasons_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_reasons
+    ADD CONSTRAINT reclamation_reasons_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: reclamations reclamations_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: reconciliation_links reconciliation_links_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reconciliation_links
+    ADD CONSTRAINT reconciliation_links_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: record_links record_links_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_links
+    ADD CONSTRAINT record_links_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: record_template_items record_template_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items
+    ADD CONSTRAINT record_template_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: record_templates record_templates_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_acceptance_statuses requirement_spec_acceptance_statuses_name_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_acceptance_statuses
+    ADD CONSTRAINT requirement_spec_acceptance_statuses_name_description_key UNIQUE (name, description);
+
+
+--
+-- Name: requirement_spec_acceptance_statuses requirement_spec_acceptance_statuses_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_acceptance_statuses
+    ADD CONSTRAINT requirement_spec_acceptance_statuses_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_complexities requirement_spec_complexities_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_complexities
+    ADD CONSTRAINT requirement_spec_complexities_description_key UNIQUE (description);
+
+
+--
+-- Name: requirement_spec_complexities requirement_spec_complexities_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_complexities
+    ADD CONSTRAINT requirement_spec_complexities_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_orders requirement_spec_id_order_id_unique; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders
+    ADD CONSTRAINT requirement_spec_id_order_id_unique UNIQUE (requirement_spec_id, order_id);
+
+
+--
+-- Name: requirement_spec_item_dependencies requirement_spec_item_dependencies_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_item_dependencies
+    ADD CONSTRAINT requirement_spec_item_dependencies_pkey PRIMARY KEY (depending_item_id, depended_item_id);
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_orders requirement_spec_orders_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders
+    ADD CONSTRAINT requirement_spec_orders_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_parts requirement_spec_parts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_parts
+    ADD CONSTRAINT requirement_spec_parts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_pictures requirement_spec_pictures_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_pictures
+    ADD CONSTRAINT requirement_spec_pictures_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_predefined_texts requirement_spec_predefined_texts_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_predefined_texts
+    ADD CONSTRAINT requirement_spec_predefined_texts_description_key UNIQUE (description);
+
+
+--
+-- Name: requirement_spec_predefined_texts requirement_spec_predefined_texts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_predefined_texts
+    ADD CONSTRAINT requirement_spec_predefined_texts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_risks requirement_spec_risks_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_risks
+    ADD CONSTRAINT requirement_spec_risks_description_key UNIQUE (description);
+
+
+--
+-- Name: requirement_spec_risks requirement_spec_risks_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_risks
+    ADD CONSTRAINT requirement_spec_risks_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_statuses requirement_spec_statuses_name_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_statuses
+    ADD CONSTRAINT requirement_spec_statuses_name_description_key UNIQUE (name, description);
+
+
+--
+-- Name: requirement_spec_statuses requirement_spec_statuses_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_statuses
+    ADD CONSTRAINT requirement_spec_statuses_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_text_blocks requirement_spec_text_blocks_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_text_blocks
+    ADD CONSTRAINT requirement_spec_text_blocks_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_types requirement_spec_types_description_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_types
+    ADD CONSTRAINT requirement_spec_types_description_key UNIQUE (description);
+
+
+--
+-- Name: requirement_spec_types requirement_spec_types_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_types
+    ADD CONSTRAINT requirement_spec_types_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_spec_versions requirement_spec_versions_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_versions
+    ADD CONSTRAINT requirement_spec_versions_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: requirement_specs requirement_specs_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: schema_info schema_info_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.schema_info
+    ADD CONSTRAINT schema_info_pkey PRIMARY KEY (tag);
+
+
+--
+-- Name: sepa_export_items sepa_export_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_items
+    ADD CONSTRAINT sepa_export_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: sepa_export_message_ids sepa_export_message_ids_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_message_ids
+    ADD CONSTRAINT sepa_export_message_ids_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: sepa_export sepa_export_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export
+    ADD CONSTRAINT sepa_export_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: shipto shipto_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shipto
+    ADD CONSTRAINT shipto_pkey PRIMARY KEY (shipto_id);
+
+
+--
+-- Name: shop_images shop_images_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_images
+    ADD CONSTRAINT shop_images_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: shop_order_items shop_order_items_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_order_items
+    ADD CONSTRAINT shop_order_items_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: shop_orders shop_orders_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_orders
+    ADD CONSTRAINT shop_orders_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: shop_parts shop_parts_part_id_shop_id_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_parts
+    ADD CONSTRAINT shop_parts_part_id_shop_id_key UNIQUE (part_id, shop_id);
+
+
+--
+-- Name: shop_parts shop_parts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_parts
+    ADD CONSTRAINT shop_parts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: shops shops_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shops
+    ADD CONSTRAINT shops_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: status status_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.status
+    ADD CONSTRAINT status_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: stocktakings stocktakings_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: tax tax_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.tax
+    ADD CONSTRAINT tax_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: tax_zones tax_zones_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.tax_zones
+    ADD CONSTRAINT tax_zones_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: taxkeys taxkeys_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxkeys
+    ADD CONSTRAINT taxkeys_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: taxzone_charts taxzone_charts_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts
+    ADD CONSTRAINT taxzone_charts_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: time_recording_articles time_recording_articles_part_id_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recording_articles
+    ADD CONSTRAINT time_recording_articles_part_id_key UNIQUE (part_id);
+
+
+--
+-- Name: time_recording_articles time_recording_articles_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recording_articles
+    ADD CONSTRAINT time_recording_articles_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: time_recordings time_recordings_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: todo_user_config todo_user_config_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.todo_user_config
+    ADD CONSTRAINT todo_user_config_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: transfer_type transfer_type_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.transfer_type
+    ADD CONSTRAINT transfer_type_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: translation translation_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.translation
+    ADD CONSTRAINT translation_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: trigger_information trigger_information_key_value_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.trigger_information
+    ADD CONSTRAINT trigger_information_key_value_key UNIQUE (key, value);
+
+
+--
+-- Name: trigger_information trigger_information_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.trigger_information
+    ADD CONSTRAINT trigger_information_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: units units_id_unique; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units
+    ADD CONSTRAINT units_id_unique UNIQUE (id);
+
+
+--
+-- Name: units_language units_language_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units_language
+    ADD CONSTRAINT units_language_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: units units_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units
+    ADD CONSTRAINT units_pkey PRIMARY KEY (name);
+
+
+--
+-- Name: user_preferences user_preferences_login_namespace_version_key_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.user_preferences
+    ADD CONSTRAINT user_preferences_login_namespace_version_key_key UNIQUE (login, namespace, version, key);
+
+
+--
+-- Name: user_preferences user_preferences_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.user_preferences
+    ADD CONSTRAINT user_preferences_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: validity_tokens validity_tokens_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.validity_tokens
+    ADD CONSTRAINT validity_tokens_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: validity_tokens validity_tokens_scope_token_key; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.validity_tokens
+    ADD CONSTRAINT validity_tokens_scope_token_key UNIQUE (scope, token);
+
+
+--
+-- Name: vendor vendor_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: warehouse warehouse_pkey; Type: CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.warehouse
+    ADD CONSTRAINT warehouse_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: report_categories report_categorys_pkey; Type: CONSTRAINT; Schema: tax; Owner: kivitendo
+--
+
+ALTER TABLE ONLY tax.report_categories
+    ADD CONSTRAINT report_categorys_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: report_headings report_headings_pkey; Type: CONSTRAINT; Schema: tax; Owner: kivitendo
+--
+
+ALTER TABLE ONLY tax.report_headings
+    ADD CONSTRAINT report_headings_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: report_variables report_variables_pkey; Type: CONSTRAINT; Schema: tax; Owner: kivitendo
+--
+
+ALTER TABLE ONLY tax.report_variables
+    ADD CONSTRAINT report_variables_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: acc_trans_chart_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX acc_trans_chart_id_key ON public.acc_trans USING btree (chart_id);
+
+
+--
+-- Name: acc_trans_source_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX acc_trans_source_key ON public.acc_trans USING btree (lower(source));
+
+
+--
+-- Name: acc_trans_trans_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX acc_trans_trans_id_key ON public.acc_trans USING btree (trans_id);
+
+
+--
+-- Name: acc_trans_transdate_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX acc_trans_transdate_key ON public.acc_trans USING btree (transdate);
+
+
+--
+-- Name: ap_employee_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_employee_id_key ON public.ap USING btree (employee_id);
+
+
+--
+-- Name: ap_invnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_invnumber_gin_trgm_idx ON public.ap USING gin (invnumber public.gin_trgm_ops);
+
+
+--
+-- Name: ap_invnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_invnumber_key ON public.ap USING btree (lower(invnumber));
+
+
+--
+-- Name: ap_ordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_ordnumber_gin_trgm_idx ON public.ap USING gin (ordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: ap_ordnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_ordnumber_key ON public.ap USING btree (lower(ordnumber));
+
+
+--
+-- Name: ap_quonumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_quonumber_gin_trgm_idx ON public.ap USING gin (quonumber public.gin_trgm_ops);
+
+
+--
+-- Name: ap_quonumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_quonumber_key ON public.ap USING btree (lower(quonumber));
+
+
+--
+-- Name: ap_transaction_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_transaction_description_gin_trgm_idx ON public.ap USING gin (transaction_description public.gin_trgm_ops);
+
+
+--
+-- Name: ap_transdate_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_transdate_key ON public.ap USING btree (transdate);
+
+
+--
+-- Name: ap_vendor_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ap_vendor_id_key ON public.ap USING btree (vendor_id);
+
+
+--
+-- Name: ar_cusordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_cusordnumber_gin_trgm_idx ON public.ar USING gin (cusordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: ar_customer_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_customer_id_key ON public.ar USING btree (customer_id);
+
+
+--
+-- Name: ar_employee_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_employee_id_key ON public.ar USING btree (employee_id);
+
+
+--
+-- Name: ar_invnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_invnumber_gin_trgm_idx ON public.ar USING gin (invnumber public.gin_trgm_ops);
+
+
+--
+-- Name: ar_invnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_invnumber_key ON public.ar USING btree (lower(invnumber));
+
+
+--
+-- Name: ar_ordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_ordnumber_gin_trgm_idx ON public.ar USING gin (ordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: ar_ordnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_ordnumber_key ON public.ar USING btree (lower(ordnumber));
+
+
+--
+-- Name: ar_quonumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_quonumber_gin_trgm_idx ON public.ar USING gin (quonumber public.gin_trgm_ops);
+
+
+--
+-- Name: ar_quonumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_quonumber_key ON public.ar USING btree (lower(quonumber));
+
+
+--
+-- Name: ar_transaction_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_transaction_description_gin_trgm_idx ON public.ar USING gin (transaction_description public.gin_trgm_ops);
+
+
+--
+-- Name: ar_transdate_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX ar_transdate_key ON public.ar USING btree (transdate);
+
+
+--
+-- Name: assembly_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX assembly_id_key ON public.assembly USING btree (id);
+
+
+--
+-- Name: chart_accno_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE UNIQUE INDEX chart_accno_key ON public.chart USING btree (accno);
+
+
+--
+-- Name: chart_category_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX chart_category_key ON public.chart USING btree (category);
+
+
+--
+-- Name: chart_link_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX chart_link_key ON public.chart USING btree (link);
+
+
+--
+-- Name: csv_import_report_rows_index_row; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX csv_import_report_rows_index_row ON public.csv_import_report_rows USING btree ("row");
+
+
+--
+-- Name: custom_variables_config_id_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX custom_variables_config_id_idx ON public.custom_variables USING btree (config_id);
+
+
+--
+-- Name: custom_variables_sub_module_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX custom_variables_sub_module_idx ON public.custom_variables USING btree (sub_module);
+
+
+--
+-- Name: custom_variables_trans_config_module_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX custom_variables_trans_config_module_idx ON public.custom_variables USING btree (config_id, trans_id, sub_module);
+
+
+--
+-- Name: customer_contact_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_contact_key ON public.customer USING btree (contact);
+
+
+--
+-- Name: customer_customernumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_customernumber_gin_trgm_idx ON public.customer USING gin (customernumber public.gin_trgm_ops);
+
+
+--
+-- Name: customer_customernumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_customernumber_key ON public.customer USING btree (customernumber);
+
+
+--
+-- Name: customer_name_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_name_gin_trgm_idx ON public.customer USING gin (name public.gin_trgm_ops);
+
+
+--
+-- Name: customer_name_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_name_key ON public.customer USING btree (name);
+
+
+--
+-- Name: customer_street_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX customer_street_gin_trgm_idx ON public.customer USING gin (street public.gin_trgm_ops);
+
+
+--
+-- Name: delivery_orders_record_type_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX delivery_orders_record_type_key ON public.delivery_orders USING btree (record_type);
+
+
+--
+-- Name: do_cusordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX do_cusordnumber_gin_trgm_idx ON public.delivery_orders USING gin (cusordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: do_donumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX do_donumber_gin_trgm_idx ON public.delivery_orders USING gin (donumber public.gin_trgm_ops);
+
+
+--
+-- Name: do_ordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX do_ordnumber_gin_trgm_idx ON public.delivery_orders USING gin (ordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: do_transaction_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX do_transaction_description_gin_trgm_idx ON public.delivery_orders USING gin (transaction_description public.gin_trgm_ops);
+
+
+--
+-- Name: doi_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX doi_description_gin_trgm_idx ON public.delivery_order_items USING gin (description public.gin_trgm_ops);
+
+
+--
+-- Name: email_journal_folder_uid_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX email_journal_folder_uid_idx ON public.email_journal USING btree (folder, uid);
+
+
+--
+-- Name: employee_login_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE UNIQUE INDEX employee_login_key ON public.employee USING btree (login);
+
+
+--
+-- Name: employee_name_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX employee_name_key ON public.employee USING btree (name);
+
+
+--
+-- Name: generic_translations_type_id_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX generic_translations_type_id_idx ON public.generic_translations USING btree (language_id, translation_type, translation_id);
+
+
+--
+-- Name: gl_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_description_gin_trgm_idx ON public.gl USING gin (description public.gin_trgm_ops);
+
+
+--
+-- Name: gl_description_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_description_key ON public.gl USING btree (lower(description));
+
+
+--
+-- Name: gl_employee_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_employee_id_key ON public.gl USING btree (employee_id);
+
+
+--
+-- Name: gl_reference_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_reference_gin_trgm_idx ON public.gl USING gin (reference public.gin_trgm_ops);
+
+
+--
+-- Name: gl_reference_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_reference_key ON public.gl USING btree (lower(reference));
+
+
+--
+-- Name: gl_transdate_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX gl_transdate_key ON public.gl USING btree (transdate);
+
+
+--
+-- Name: idx_custom_variables_validity_config_id_trans_id; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_custom_variables_validity_config_id_trans_id ON public.custom_variables_validity USING btree (config_id, trans_id);
+
+
+--
+-- Name: idx_custom_variables_validity_trans_id; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_custom_variables_validity_trans_id ON public.custom_variables_validity USING btree (trans_id);
+
+
+--
+-- Name: idx_record_links_from_id; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_record_links_from_id ON public.record_links USING btree (from_id);
+
+
+--
+-- Name: idx_record_links_from_table; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_record_links_from_table ON public.record_links USING btree (from_table);
+
+
+--
+-- Name: idx_record_links_to_id; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_record_links_to_id ON public.record_links USING btree (to_id);
+
+
+--
+-- Name: idx_record_links_to_table; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX idx_record_links_to_table ON public.record_links USING btree (to_table);
+
+
+--
+-- Name: inventory_itime_parts_id_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX inventory_itime_parts_id_idx ON public.inventory USING btree (itime, parts_id);
+
+
+--
+-- Name: inventory_parts_id_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX inventory_parts_id_idx ON public.inventory USING btree (parts_id);
+
+
+--
+-- Name: invoice_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX invoice_description_gin_trgm_idx ON public.invoice USING gin (description public.gin_trgm_ops);
+
+
+--
+-- Name: invoice_trans_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX invoice_trans_id_key ON public.invoice USING btree (trans_id);
+
+
+--
+-- Name: makemodel_model_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX makemodel_model_key ON public.makemodel USING btree (lower(model));
+
+
+--
+-- Name: makemodel_parts_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX makemodel_parts_id_key ON public.makemodel USING btree (parts_id);
+
+
+--
+-- Name: oe_cusordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_cusordnumber_gin_trgm_idx ON public.oe USING gin (cusordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: oe_employee_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_employee_id_key ON public.oe USING btree (employee_id);
+
+
+--
+-- Name: oe_ordnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_ordnumber_gin_trgm_idx ON public.oe USING gin (ordnumber public.gin_trgm_ops);
+
+
+--
+-- Name: oe_ordnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_ordnumber_key ON public.oe USING btree (lower(ordnumber));
+
+
+--
+-- Name: oe_quonumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_quonumber_gin_trgm_idx ON public.oe USING gin (quonumber public.gin_trgm_ops);
+
+
+--
+-- Name: oe_record_type_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_record_type_key ON public.oe USING btree (record_type);
+
+
+--
+-- Name: oe_transaction_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_transaction_description_gin_trgm_idx ON public.oe USING gin (transaction_description public.gin_trgm_ops);
+
+
+--
+-- Name: oe_transdate_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX oe_transdate_key ON public.oe USING btree (transdate);
+
+
+--
+-- Name: orderitems_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX orderitems_description_gin_trgm_idx ON public.orderitems USING gin (description public.gin_trgm_ops);
+
+
+--
+-- Name: orderitems_trans_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX orderitems_trans_id_key ON public.orderitems USING btree (trans_id);
+
+
+--
+-- Name: part_customer_prices_customer_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX part_customer_prices_customer_id_key ON public.part_customer_prices USING btree (customer_id);
+
+
+--
+-- Name: part_customer_prices_parts_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX part_customer_prices_parts_id_key ON public.part_customer_prices USING btree (parts_id);
+
+
+--
+-- Name: parts_description_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX parts_description_gin_trgm_idx ON public.parts USING gin (description public.gin_trgm_ops);
+
+
+--
+-- Name: parts_description_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX parts_description_key ON public.parts USING btree (lower(description));
+
+
+--
+-- Name: parts_partnumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX parts_partnumber_gin_trgm_idx ON public.parts USING gin (partnumber public.gin_trgm_ops);
+
+
+--
+-- Name: parts_partnumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX parts_partnumber_key ON public.parts USING btree (lower(partnumber));
+
+
+--
+-- Name: reclamations_customer_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX reclamations_customer_id_key ON public.reclamations USING btree (customer_id);
+
+
+--
+-- Name: reclamations_record_number_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX reclamations_record_number_key ON public.reclamations USING btree (record_number);
+
+
+--
+-- Name: reclamations_record_type_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX reclamations_record_type_key ON public.reclamations USING btree (record_type);
+
+
+--
+-- Name: reclamations_vendor_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX reclamations_vendor_id_key ON public.reclamations USING btree (vendor_id);
+
+
+--
+-- Name: requirement_spec_items_item_type_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX requirement_spec_items_item_type_key ON public.requirement_spec_items USING btree (item_type);
+
+
+--
+-- Name: shipto_trans_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX shipto_trans_id_key ON public.shipto USING btree (trans_id);
+
+
+--
+-- Name: status_trans_id_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX status_trans_id_key ON public.status USING btree (trans_id);
+
+
+--
+-- Name: taxkeys_chartid_startdate; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE UNIQUE INDEX taxkeys_chartid_startdate ON public.taxkeys USING btree (chart_id, startdate);
+
+
+--
+-- Name: units_language_unit_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX units_language_unit_idx ON public.units_language USING btree (unit);
+
+
+--
+-- Name: vendor_contact_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX vendor_contact_key ON public.vendor USING btree (contact);
+
+
+--
+-- Name: vendor_name_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX vendor_name_gin_trgm_idx ON public.vendor USING gin (name public.gin_trgm_ops);
+
+
+--
+-- Name: vendor_name_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX vendor_name_key ON public.vendor USING btree (name);
+
+
+--
+-- Name: vendor_vendornumber_gin_trgm_idx; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX vendor_vendornumber_gin_trgm_idx ON public.vendor USING gin (vendornumber public.gin_trgm_ops);
+
+
+--
+-- Name: vendor_vendornumber_key; Type: INDEX; Schema: public; Owner: kivitendo
+--
+
+CREATE INDEX vendor_vendornumber_key ON public.vendor USING btree (vendornumber);
+
+
+--
+-- Name: parts add_parts_price_history_entry_after_changes_on_parts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER add_parts_price_history_entry_after_changes_on_parts AFTER INSERT OR UPDATE ON public.parts FOR EACH ROW EXECUTE FUNCTION public.add_parts_price_history_entry();
+
+
+--
+-- Name: ap after_delete_ap_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_ap_trigger AFTER DELETE ON public.ap FOR EACH ROW EXECUTE FUNCTION public.clean_up_acc_trans_after_ar_ap_gl_delete();
+
+
+--
+-- Name: ar after_delete_ar_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_ar_trigger AFTER DELETE ON public.ar FOR EACH ROW EXECUTE FUNCTION public.clean_up_acc_trans_after_ar_ap_gl_delete();
+
+
+--
+-- Name: customer after_delete_customer_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_customer_trigger AFTER DELETE ON public.customer FOR EACH ROW EXECUTE FUNCTION public.clean_up_after_customer_vendor_delete();
+
+
+--
+-- Name: delivery_terms after_delete_delivery_term_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_delivery_term_trigger AFTER DELETE ON public.delivery_terms FOR EACH ROW EXECUTE FUNCTION public.generic_translations_delete_on_delivery_terms_delete_trigger();
+
+
+--
+-- Name: gl after_delete_gl_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_gl_trigger AFTER DELETE ON public.gl FOR EACH ROW EXECUTE FUNCTION public.clean_up_acc_trans_after_ar_ap_gl_delete();
+
+
+--
+-- Name: payment_terms after_delete_payment_term_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_payment_term_trigger AFTER DELETE ON public.payment_terms FOR EACH ROW EXECUTE FUNCTION public.generic_translations_delete_on_payment_terms_delete_trigger();
+
+
+--
+-- Name: requirement_specs after_delete_requirement_spec_dependencies; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_requirement_spec_dependencies AFTER DELETE ON public.requirement_specs FOR EACH ROW EXECUTE FUNCTION public.requirement_spec_delete_trigger();
+
+
+--
+-- Name: shop_images after_delete_shop_images_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_shop_images_trigger AFTER DELETE ON public.shop_images FOR EACH ROW EXECUTE FUNCTION public.shop_images_reorder_position();
+
+
+--
+-- Name: tax after_delete_tax_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_tax_trigger AFTER DELETE ON public.tax FOR EACH ROW EXECUTE FUNCTION public.generic_translations_delete_on_tax_delete_trigger();
+
+
+--
+-- Name: vendor after_delete_vendor_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER after_delete_vendor_trigger AFTER DELETE ON public.vendor FOR EACH ROW EXECUTE FUNCTION public.clean_up_after_customer_vendor_delete();
+
+
+--
+-- Name: ap before_delete_ap_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_ap_trigger BEFORE DELETE ON public.ap FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_ap_delete();
+
+
+--
+-- Name: ar before_delete_ar_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_ar_trigger BEFORE DELETE ON public.ar FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_ar_delete();
+
+
+--
+-- Name: delivery_order_items before_delete_delivery_order_items_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_delivery_order_items_trigger BEFORE DELETE ON public.delivery_order_items FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_delivery_order_items_delete();
+
+
+--
+-- Name: delivery_orders before_delete_delivery_orders_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_delivery_orders_trigger BEFORE DELETE ON public.delivery_orders FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_delivery_orders_delete();
+
+
+--
+-- Name: dunning before_delete_dunning_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_dunning_trigger BEFORE DELETE ON public.dunning FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_dunning_delete();
+
+
+--
+-- Name: gl before_delete_gl_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_gl_trigger BEFORE DELETE ON public.gl FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_gl_delete();
+
+
+--
+-- Name: invoice before_delete_invoice_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_invoice_trigger BEFORE DELETE ON public.invoice FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_invoice_delete();
+
+
+--
+-- Name: letter before_delete_letter_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_letter_trigger BEFORE DELETE ON public.letter FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_letter_delete();
+
+
+--
+-- Name: oe before_delete_oe_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_oe_trigger BEFORE DELETE ON public.oe FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_oe_delete();
+
+
+--
+-- Name: orderitems before_delete_orderitems_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_orderitems_trigger BEFORE DELETE ON public.orderitems FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_orderitems_delete();
+
+
+--
+-- Name: reclamation_items before_delete_reclamation_items_clean_up_record_linkes_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_reclamation_items_clean_up_record_linkes_trigger BEFORE DELETE ON public.reclamation_items FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_delete();
+
+
+--
+-- Name: reclamations before_delete_reclamations_clean_up_record_linkes_trigger; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER before_delete_reclamations_clean_up_record_linkes_trigger BEFORE DELETE ON public.reclamations FOR EACH ROW EXECUTE FUNCTION public.clean_up_record_links_before_delete();
+
+
+--
+-- Name: delivery_order_items_stock check_bin_wh_delivery_order_items_stock; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER check_bin_wh_delivery_order_items_stock BEFORE INSERT OR UPDATE ON public.delivery_order_items_stock FOR EACH ROW EXECUTE FUNCTION public.check_bin_belongs_to_wh();
+
+
+--
+-- Name: inventory check_bin_wh_inventory; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER check_bin_wh_inventory BEFORE INSERT OR UPDATE ON public.inventory FOR EACH ROW EXECUTE FUNCTION public.check_bin_belongs_to_wh();
+
+
+--
+-- Name: parts check_bin_wh_parts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER check_bin_wh_parts BEFORE INSERT OR UPDATE ON public.parts FOR EACH ROW EXECUTE FUNCTION public.check_bin_belongs_to_wh();
+
+
+--
+-- Name: contacts contacts_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER contacts_delete_custom_variables_after_deletion AFTER DELETE ON public.contacts FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: customer customer_before_delete_clear_follow_ups; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER customer_before_delete_clear_follow_ups AFTER DELETE ON public.customer FOR EACH ROW EXECUTE FUNCTION public.follow_up_delete_when_customer_vendor_is_deleted_trigger();
+
+
+--
+-- Name: customer customer_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER customer_delete_custom_variables_after_deletion AFTER DELETE ON public.customer FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: delivery_orders delete_delivery_orders_dependencies; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delete_delivery_orders_dependencies BEFORE DELETE ON public.delivery_orders FOR EACH ROW EXECUTE FUNCTION public.delivery_orders_before_delete_trigger();
+
+
+--
+-- Name: oe delete_oe_dependencies; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delete_oe_dependencies BEFORE DELETE ON public.oe FOR EACH ROW EXECUTE FUNCTION public.oe_before_delete_trigger();
+
+
+--
+-- Name: requirement_specs delete_requirement_spec_custom_variables; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delete_requirement_spec_custom_variables BEFORE DELETE ON public.requirement_specs FOR EACH ROW EXECUTE FUNCTION public.delete_requirement_spec_custom_variables_trigger();
+
+
+--
+-- Name: requirement_specs delete_requirement_spec_dependencies; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delete_requirement_spec_dependencies BEFORE DELETE ON public.requirement_specs FOR EACH ROW EXECUTE FUNCTION public.requirement_spec_delete_trigger();
+
+
+--
+-- Name: requirement_spec_items delete_requirement_spec_item_dependencies; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delete_requirement_spec_item_dependencies BEFORE DELETE ON public.requirement_spec_items FOR EACH ROW EXECUTE FUNCTION public.requirement_spec_item_before_delete_trigger();
+
+
+--
+-- Name: delivery_order_items delivery_order_items_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delivery_order_items_delete_custom_variables_after_deletion AFTER DELETE ON public.delivery_order_items FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: delivery_orders delivery_orders_on_update_close_follow_up; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER delivery_orders_on_update_close_follow_up AFTER UPDATE ON public.delivery_orders FOR EACH ROW EXECUTE FUNCTION public.follow_up_close_when_oe_closed_trigger();
+
+
+--
+-- Name: follow_ups follow_up_delete_notes; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER follow_up_delete_notes AFTER DELETE ON public.follow_ups FOR EACH ROW EXECUTE FUNCTION public.follow_up_delete_notes_trigger();
+
+
+--
+-- Name: invoice invoice_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER invoice_delete_custom_variables_after_deletion AFTER DELETE ON public.invoice FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: acc_trans mtime_acc_trans; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_acc_trans BEFORE UPDATE ON public.acc_trans FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: additional_billing_addresses mtime_additional_billing_addresses; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_additional_billing_addresses BEFORE UPDATE ON public.additional_billing_addresses FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: ap mtime_ap; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_ap BEFORE UPDATE ON public.ap FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: ar mtime_ar; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_ar BEFORE UPDATE ON public.ar FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: bin mtime_bin; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_bin BEFORE UPDATE ON public.bin FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: business_models mtime_business_models; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_business_models BEFORE UPDATE ON public.business_models FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: chart mtime_chart; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_chart BEFORE UPDATE ON public.chart FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: contacts mtime_contacts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_contacts BEFORE UPDATE ON public.contacts FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: custom_data_export_queries mtime_custom_data_export_queries; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_custom_data_export_queries BEFORE UPDATE ON public.custom_data_export_queries FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: custom_data_export_query_parameters mtime_custom_data_export_query_parameters; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_custom_data_export_query_parameters BEFORE UPDATE ON public.custom_data_export_query_parameters FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: custom_variable_config_partsgroups mtime_custom_variable_config_partsgroups; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_custom_variable_config_partsgroups BEFORE UPDATE ON public.custom_variable_config_partsgroups FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: custom_variable_configs mtime_custom_variable_configs; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_custom_variable_configs BEFORE UPDATE ON public.custom_variable_configs FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: custom_variables mtime_custom_variables; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_custom_variables BEFORE UPDATE ON public.custom_variables FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: customer mtime_customer; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_customer BEFORE UPDATE ON public.customer FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: delivery_order_items mtime_delivery_order_items_id; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_delivery_order_items_id BEFORE UPDATE ON public.delivery_order_items FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: delivery_order_items_stock mtime_delivery_order_items_stock; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_delivery_order_items_stock BEFORE UPDATE ON public.delivery_order_items_stock FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: delivery_orders mtime_delivery_orders; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_delivery_orders BEFORE UPDATE ON public.delivery_orders FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: delivery_terms mtime_delivery_terms; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_delivery_terms BEFORE UPDATE ON public.delivery_terms FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: department mtime_department; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_department BEFORE UPDATE ON public.department FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: dunning mtime_dunning; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_dunning BEFORE UPDATE ON public.dunning FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: email_journal mtime_email_journal; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_email_journal BEFORE UPDATE ON public.email_journal FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: email_journal_attachments mtime_email_journal_attachments; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_email_journal_attachments BEFORE UPDATE ON public.email_journal_attachments FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: file_full_texts mtime_file_full_texts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_file_full_texts BEFORE UPDATE ON public.file_full_texts FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: file_versions mtime_file_version; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_file_version BEFORE UPDATE ON public.file_versions FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: follow_up_links mtime_follow_up_links; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_follow_up_links BEFORE UPDATE ON public.follow_up_links FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: follow_ups mtime_follow_ups; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_follow_ups BEFORE UPDATE ON public.follow_ups FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: gl mtime_gl; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_gl BEFORE UPDATE ON public.gl FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: inventory mtime_inventory; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_inventory BEFORE UPDATE ON public.inventory FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: invoice mtime_invoice; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_invoice BEFORE UPDATE ON public.invoice FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: notes mtime_notes; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_notes BEFORE UPDATE ON public.notes FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: oe mtime_oe; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_oe BEFORE UPDATE ON public.oe FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: oe_version mtime_oe_version; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_oe_version BEFORE UPDATE ON public.oe_version FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: order_statuses mtime_order_statuses; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_order_statuses BEFORE UPDATE ON public.order_statuses FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: orderitems mtime_orderitems; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_orderitems BEFORE UPDATE ON public.orderitems FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: parts mtime_parts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_parts BEFORE UPDATE ON public.parts FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: partsgroup mtime_partsgroup; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_partsgroup BEFORE UPDATE ON public.partsgroup FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: price_rule_items mtime_price_rule_items; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_price_rule_items BEFORE UPDATE ON public.price_rule_items FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: price_rules mtime_price_rules; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_price_rules BEFORE UPDATE ON public.price_rules FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project mtime_project; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project BEFORE UPDATE ON public.project FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project_participants mtime_project_participants; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project_participants BEFORE UPDATE ON public.project_participants FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project_phase_participants mtime_project_phase_paticipants; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project_phase_paticipants BEFORE UPDATE ON public.project_phase_participants FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project_phases mtime_project_phases; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project_phases BEFORE UPDATE ON public.project_phases FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project_roles mtime_project_roles; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project_roles BEFORE UPDATE ON public.project_roles FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: project_statuses mtime_project_status; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_project_status BEFORE UPDATE ON public.project_statuses FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: purchase_basket_items mtime_purchase_basket_items; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_purchase_basket_items BEFORE UPDATE ON public.purchase_basket_items FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: reclamation_items mtime_reclamation_items; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_reclamation_items BEFORE UPDATE ON public.reclamation_items FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: reclamation_reasons mtime_reclamation_reasons; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_reclamation_reasons BEFORE UPDATE ON public.reclamation_reasons FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: reclamations mtime_reclamations; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_reclamations BEFORE UPDATE ON public.reclamations FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: record_templates mtime_record_templates; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_record_templates BEFORE UPDATE ON public.record_templates FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_acceptance_statuses mtime_requirement_spec_acceptance_statuses; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_acceptance_statuses BEFORE UPDATE ON public.requirement_spec_acceptance_statuses FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_complexities mtime_requirement_spec_complexities; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_complexities BEFORE UPDATE ON public.requirement_spec_complexities FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_items mtime_requirement_spec_items; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_items BEFORE UPDATE ON public.requirement_spec_items FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_orders mtime_requirement_spec_orders; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_orders BEFORE UPDATE ON public.requirement_spec_orders FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_pictures mtime_requirement_spec_pictures; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_pictures BEFORE UPDATE ON public.requirement_spec_pictures FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_predefined_texts mtime_requirement_spec_predefined_texts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_predefined_texts BEFORE UPDATE ON public.requirement_spec_predefined_texts FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_risks mtime_requirement_spec_risks; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_risks BEFORE UPDATE ON public.requirement_spec_risks FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_statuses mtime_requirement_spec_statuses; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_statuses BEFORE UPDATE ON public.requirement_spec_statuses FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_text_blocks mtime_requirement_spec_text_blocks; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_text_blocks BEFORE UPDATE ON public.requirement_spec_text_blocks FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_types mtime_requirement_spec_types; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_types BEFORE UPDATE ON public.requirement_spec_types FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_spec_versions mtime_requirement_spec_versions; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_spec_versions BEFORE UPDATE ON public.requirement_spec_versions FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: requirement_specs mtime_requirement_specs; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_requirement_specs BEFORE UPDATE ON public.requirement_specs FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: shop_images mtime_shop_images; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_shop_images BEFORE UPDATE ON public.shop_images FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: shop_parts mtime_shop_parts; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_shop_parts BEFORE UPDATE ON public.shop_parts FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: shops mtime_shops; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_shops BEFORE UPDATE ON public.shops FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: status mtime_status; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_status BEFORE UPDATE ON public.status FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: stocktakings mtime_stocktakings; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_stocktakings BEFORE UPDATE ON public.stocktakings FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: tax mtime_tax; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_tax BEFORE UPDATE ON public.tax FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: time_recordings mtime_time_recordings; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_time_recordings BEFORE UPDATE ON public.time_recordings FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: transfer_type mtime_transfer_type; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_transfer_type BEFORE UPDATE ON public.transfer_type FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: vendor mtime_vendor; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_vendor BEFORE UPDATE ON public.vendor FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: warehouse mtime_warehouse; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER mtime_warehouse BEFORE UPDATE ON public.warehouse FOR EACH ROW EXECUTE FUNCTION public.set_mtime();
+
+
+--
+-- Name: oe oe_before_delete_clear_follow_ups; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER oe_before_delete_clear_follow_ups BEFORE DELETE ON public.oe FOR EACH ROW EXECUTE FUNCTION public.follow_up_delete_when_oe_is_deleted_trigger();
+
+
+--
+-- Name: oe oe_on_update_close_follow_up; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER oe_on_update_close_follow_up AFTER UPDATE ON public.oe FOR EACH ROW EXECUTE FUNCTION public.follow_up_close_when_oe_closed_trigger();
+
+
+--
+-- Name: orderitems orderitems_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER orderitems_delete_custom_variables_after_deletion AFTER DELETE ON public.orderitems FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: parts parts_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER parts_delete_custom_variables_after_deletion AFTER DELETE ON public.parts FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: project project_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER project_delete_custom_variables_after_deletion AFTER DELETE ON public.project FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: reclamation_items reclamation_items_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER reclamation_items_delete_custom_variables_after_deletion AFTER DELETE ON public.reclamation_items FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: shipto shipto_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER shipto_delete_custom_variables_after_deletion AFTER DELETE ON public.shipto FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: time_recordings time_recordings_set_date; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER time_recordings_set_date BEFORE INSERT OR UPDATE ON public.time_recordings FOR EACH ROW EXECUTE FUNCTION public.time_recordings_set_date_trigger();
+
+
+--
+-- Name: time_recordings time_recordings_set_duration; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER time_recordings_set_duration BEFORE INSERT OR UPDATE ON public.time_recordings FOR EACH ROW EXECUTE FUNCTION public.time_recordings_set_duration_trigger();
+
+
+--
+-- Name: inventory trig_update_onhand; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER trig_update_onhand AFTER INSERT OR DELETE OR UPDATE ON public.inventory FOR EACH ROW EXECUTE FUNCTION public.update_onhand();
+
+
+--
+-- Name: requirement_spec_items update_requirement_spec_item_time_estimation; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER update_requirement_spec_item_time_estimation AFTER INSERT OR DELETE OR UPDATE ON public.requirement_spec_items FOR EACH ROW EXECUTE FUNCTION public.requirement_spec_item_time_estimation_updater_trigger();
+
+
+--
+-- Name: vendor vendor_before_delete_clear_follow_ups; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER vendor_before_delete_clear_follow_ups AFTER DELETE ON public.vendor FOR EACH ROW EXECUTE FUNCTION public.follow_up_delete_when_customer_vendor_is_deleted_trigger();
+
+
+--
+-- Name: vendor vendor_delete_custom_variables_after_deletion; Type: TRIGGER; Schema: public; Owner: kivitendo
+--
+
+CREATE TRIGGER vendor_delete_custom_variables_after_deletion AFTER DELETE ON public.vendor FOR EACH ROW EXECUTE FUNCTION public.delete_custom_variables_trigger();
+
+
+--
+-- Name: acc_trans $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.acc_trans
+    ADD CONSTRAINT "$1" FOREIGN KEY (chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: ap $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT "$1" FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: ar $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT "$1" FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: invoice $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT "$1" FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: parts $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT "$1" FOREIGN KEY (buchungsgruppen_id) REFERENCES public.buchungsgruppen(id);
+
+
+--
+-- Name: units $1; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units
+    ADD CONSTRAINT "$1" FOREIGN KEY (base_unit) REFERENCES public.units(name);
+
+
+--
+-- Name: acc_trans acc_trans_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.acc_trans
+    ADD CONSTRAINT acc_trans_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: acc_trans acc_trans_tax_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.acc_trans
+    ADD CONSTRAINT acc_trans_tax_id_fkey FOREIGN KEY (tax_id) REFERENCES public.tax(id);
+
+
+--
+-- Name: additional_billing_addresses additional_billing_addresses_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.additional_billing_addresses
+    ADD CONSTRAINT additional_billing_addresses_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: ap ap_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: ap ap_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: ap ap_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: ap ap_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: ap ap_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: ap_gl ap_gl_ap_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap_gl
+    ADD CONSTRAINT ap_gl_ap_id_fkey FOREIGN KEY (ap_id) REFERENCES public.ap(id);
+
+
+--
+-- Name: ap_gl ap_gl_gl_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap_gl
+    ADD CONSTRAINT ap_gl_gl_id_fkey FOREIGN KEY (gl_id) REFERENCES public.gl(id) ON DELETE CASCADE;
+
+
+--
+-- Name: ap ap_globalproject_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_globalproject_id_fkey FOREIGN KEY (globalproject_id) REFERENCES public.project(id);
+
+
+--
+-- Name: ap ap_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: ap ap_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: ap ap_storno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_storno_id_fkey FOREIGN KEY (storno_id) REFERENCES public.ap(id);
+
+
+--
+-- Name: ap ap_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ap
+    ADD CONSTRAINT ap_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: ar ar_billing_address_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_billing_address_id_fkey FOREIGN KEY (billing_address_id) REFERENCES public.additional_billing_addresses(id);
+
+
+--
+-- Name: ar ar_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: ar ar_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: ar ar_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: ar ar_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: ar ar_dunning_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_dunning_config_id_fkey FOREIGN KEY (dunning_config_id) REFERENCES public.dunning_config(id);
+
+
+--
+-- Name: ar ar_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: ar ar_globalproject_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_globalproject_id_fkey FOREIGN KEY (globalproject_id) REFERENCES public.project(id);
+
+
+--
+-- Name: ar ar_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: ar ar_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: ar ar_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: ar ar_shipto_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_shipto_id_fkey FOREIGN KEY (shipto_id) REFERENCES public.shipto(shipto_id);
+
+
+--
+-- Name: ar ar_storno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_storno_id_fkey FOREIGN KEY (storno_id) REFERENCES public.ar(id);
+
+
+--
+-- Name: ar ar_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.ar
+    ADD CONSTRAINT ar_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: assembly assembly_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assembly
+    ADD CONSTRAINT assembly_id_fkey FOREIGN KEY (id) REFERENCES public.parts(id);
+
+
+--
+-- Name: assembly assembly_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assembly
+    ADD CONSTRAINT assembly_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: assortment_items assortment_items_assortment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assortment_items
+    ADD CONSTRAINT assortment_items_assortment_id_fkey FOREIGN KEY (assortment_id) REFERENCES public.parts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: assortment_items assortment_items_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assortment_items
+    ADD CONSTRAINT assortment_items_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: assortment_items assortment_items_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.assortment_items
+    ADD CONSTRAINT assortment_items_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: bank_accounts bank_accounts_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_accounts
+    ADD CONSTRAINT bank_accounts_chart_id_fkey FOREIGN KEY (chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_acc_trans_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_acc_trans_id_fkey FOREIGN KEY (acc_trans_id) REFERENCES public.acc_trans(acc_trans_id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_ap_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_ap_id_fkey FOREIGN KEY (ap_id) REFERENCES public.ap(id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_ar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_ar_id_fkey FOREIGN KEY (ar_id) REFERENCES public.ar(id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_bank_transaction_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_bank_transaction_id_fkey FOREIGN KEY (bank_transaction_id) REFERENCES public.bank_transactions(id);
+
+
+--
+-- Name: bank_transaction_acc_trans bank_transaction_acc_trans_gl_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transaction_acc_trans
+    ADD CONSTRAINT bank_transaction_acc_trans_gl_id_fkey FOREIGN KEY (gl_id) REFERENCES public.gl(id);
+
+
+--
+-- Name: bank_transactions bank_transactions_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transactions
+    ADD CONSTRAINT bank_transactions_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: bank_transactions bank_transactions_local_bank_account_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bank_transactions
+    ADD CONSTRAINT bank_transactions_local_bank_account_id_fkey FOREIGN KEY (local_bank_account_id) REFERENCES public.bank_accounts(id);
+
+
+--
+-- Name: bin bin_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.bin
+    ADD CONSTRAINT bin_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: buchungsgruppen buchungsgruppen_inventory_accno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.buchungsgruppen
+    ADD CONSTRAINT buchungsgruppen_inventory_accno_id_fkey FOREIGN KEY (inventory_accno_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: business_models business_models_business_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.business_models
+    ADD CONSTRAINT business_models_business_id_fkey FOREIGN KEY (business_id) REFERENCES public.business(id);
+
+
+--
+-- Name: business_models business_models_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.business_models
+    ADD CONSTRAINT business_models_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: csv_import_profile_settings csv_import_profile_settings_csv_import_profile_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_profile_settings
+    ADD CONSTRAINT csv_import_profile_settings_csv_import_profile_id_fkey FOREIGN KEY (csv_import_profile_id) REFERENCES public.csv_import_profiles(id);
+
+
+--
+-- Name: csv_import_report_rows csv_import_report_rows_csv_import_report_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_rows
+    ADD CONSTRAINT csv_import_report_rows_csv_import_report_id_fkey FOREIGN KEY (csv_import_report_id) REFERENCES public.csv_import_reports(id);
+
+
+--
+-- Name: csv_import_report_status csv_import_report_status_csv_import_report_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_report_status
+    ADD CONSTRAINT csv_import_report_status_csv_import_report_id_fkey FOREIGN KEY (csv_import_report_id) REFERENCES public.csv_import_reports(id);
+
+
+--
+-- Name: csv_import_reports csv_import_reports_profile_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.csv_import_reports
+    ADD CONSTRAINT csv_import_reports_profile_id_fkey FOREIGN KEY (profile_id) REFERENCES public.csv_import_profiles(id);
+
+
+--
+-- Name: custom_data_export_query_parameters custom_data_export_query_parameters_query_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_data_export_query_parameters
+    ADD CONSTRAINT custom_data_export_query_parameters_query_id_fkey FOREIGN KEY (query_id) REFERENCES public.custom_data_export_queries(id) ON DELETE CASCADE;
+
+
+--
+-- Name: custom_variable_config_partsgroups custom_variable_config_partsgrou_custom_variable_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variable_config_partsgroups
+    ADD CONSTRAINT custom_variable_config_partsgrou_custom_variable_config_id_fkey FOREIGN KEY (custom_variable_config_id) REFERENCES public.custom_variable_configs(id);
+
+
+--
+-- Name: custom_variable_config_partsgroups custom_variable_config_partsgroups_partsgroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variable_config_partsgroups
+    ADD CONSTRAINT custom_variable_config_partsgroups_partsgroup_id_fkey FOREIGN KEY (partsgroup_id) REFERENCES public.partsgroup(id);
+
+
+--
+-- Name: custom_variables custom_variables_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variables
+    ADD CONSTRAINT custom_variables_config_id_fkey FOREIGN KEY (config_id) REFERENCES public.custom_variable_configs(id);
+
+
+--
+-- Name: custom_variables_validity custom_variables_validity_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.custom_variables_validity
+    ADD CONSTRAINT custom_variables_validity_config_id_fkey FOREIGN KEY (config_id) REFERENCES public.custom_variable_configs(id);
+
+
+--
+-- Name: customer customer_business_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_business_id_fkey FOREIGN KEY (business_id) REFERENCES public.business(id);
+
+
+--
+-- Name: customer customer_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: customer customer_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: customer customer_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: customer customer_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: customer customer_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id);
+
+
+--
+-- Name: customer customer_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.customer
+    ADD CONSTRAINT customer_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: defaults defaults_ap_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_ap_chart_id_fkey FOREIGN KEY (ap_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: defaults defaults_ar_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_ar_chart_id_fkey FOREIGN KEY (ar_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: defaults defaults_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_bin_id_fkey FOREIGN KEY (bin_id) REFERENCES public.bin(id);
+
+
+--
+-- Name: defaults defaults_bin_id_ignore_onhand_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_bin_id_ignore_onhand_fkey FOREIGN KEY (bin_id_ignore_onhand) REFERENCES public.bin(id);
+
+
+--
+-- Name: defaults defaults_carry_over_account_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_carry_over_account_chart_id_fkey FOREIGN KEY (carry_over_account_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: defaults defaults_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: defaults defaults_loss_carried_forward_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_loss_carried_forward_chart_id_fkey FOREIGN KEY (loss_carried_forward_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: defaults defaults_profit_carried_forward_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_profit_carried_forward_chart_id_fkey FOREIGN KEY (profit_carried_forward_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: defaults defaults_project_status_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_project_status_id_fkey FOREIGN KEY (project_status_id) REFERENCES public.project_statuses(id);
+
+
+--
+-- Name: defaults defaults_project_type_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_project_type_id_fkey FOREIGN KEY (project_type_id) REFERENCES public.project_types(id);
+
+
+--
+-- Name: defaults defaults_requirement_spec_section_order_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_requirement_spec_section_order_part_id_fkey FOREIGN KEY (requirement_spec_section_order_part_id) REFERENCES public.parts(id) ON DELETE SET NULL;
+
+
+--
+-- Name: defaults defaults_stocktaking_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_stocktaking_bin_id_fkey FOREIGN KEY (stocktaking_bin_id) REFERENCES public.bin(id);
+
+
+--
+-- Name: defaults defaults_stocktaking_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_stocktaking_warehouse_id_fkey FOREIGN KEY (stocktaking_warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: defaults defaults_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: defaults defaults_warehouse_id_ignore_onhand_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.defaults
+    ADD CONSTRAINT defaults_warehouse_id_ignore_onhand_fkey FOREIGN KEY (warehouse_id_ignore_onhand) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: delivery_order_items delivery_order_items_delivery_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_delivery_order_id_fkey FOREIGN KEY (delivery_order_id) REFERENCES public.delivery_orders(id) ON DELETE CASCADE;
+
+
+--
+-- Name: delivery_order_items delivery_order_items_orderer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_orderer_id_fkey FOREIGN KEY (orderer_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: delivery_order_items delivery_order_items_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: delivery_order_items delivery_order_items_price_factor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_price_factor_id_fkey FOREIGN KEY (price_factor_id) REFERENCES public.price_factors(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: delivery_order_items delivery_order_items_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: delivery_order_items delivery_order_items_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE SET NULL;
+
+
+--
+-- Name: delivery_order_items_stock delivery_order_items_stock_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items_stock
+    ADD CONSTRAINT delivery_order_items_stock_bin_id_fkey FOREIGN KEY (bin_id) REFERENCES public.bin(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: delivery_order_items_stock delivery_order_items_stock_delivery_order_item_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items_stock
+    ADD CONSTRAINT delivery_order_items_stock_delivery_order_item_id_fkey FOREIGN KEY (delivery_order_item_id) REFERENCES public.delivery_order_items(id) ON DELETE CASCADE;
+
+
+--
+-- Name: inventory delivery_order_items_stock_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT delivery_order_items_stock_id_fkey FOREIGN KEY (delivery_order_items_stock_id) REFERENCES public.delivery_order_items_stock(id);
+
+
+--
+-- Name: delivery_order_items_stock delivery_order_items_stock_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items_stock
+    ADD CONSTRAINT delivery_order_items_stock_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: delivery_order_items delivery_order_items_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_order_items
+    ADD CONSTRAINT delivery_order_items_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: delivery_orders delivery_orders_billing_address_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_billing_address_id_fkey FOREIGN KEY (billing_address_id) REFERENCES public.additional_billing_addresses(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: delivery_orders delivery_orders_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_globalproject_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_globalproject_id_fkey FOREIGN KEY (globalproject_id) REFERENCES public.project(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_shipto_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_shipto_id_fkey FOREIGN KEY (shipto_id) REFERENCES public.shipto(shipto_id);
+
+
+--
+-- Name: delivery_orders delivery_orders_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: delivery_orders delivery_orders_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.delivery_orders
+    ADD CONSTRAINT delivery_orders_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: drafts drafts_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.drafts
+    ADD CONSTRAINT drafts_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: dunning dunning_dunning_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.dunning
+    ADD CONSTRAINT dunning_dunning_config_id_fkey FOREIGN KEY (dunning_config_id) REFERENCES public.dunning_config(id);
+
+
+--
+-- Name: dunning dunning_fee_interest_ar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.dunning
+    ADD CONSTRAINT dunning_fee_interest_ar_id_fkey FOREIGN KEY (fee_interest_ar_id) REFERENCES public.ar(id);
+
+
+--
+-- Name: dunning dunning_trans_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.dunning
+    ADD CONSTRAINT dunning_trans_id_fkey FOREIGN KEY (trans_id) REFERENCES public.ar(id) ON DELETE CASCADE;
+
+
+--
+-- Name: email_journal_attachments email_journal_attachments_email_journal_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal_attachments
+    ADD CONSTRAINT email_journal_attachments_email_journal_id_fkey FOREIGN KEY (email_journal_id) REFERENCES public.email_journal(id) ON DELETE CASCADE;
+
+
+--
+-- Name: email_journal email_journal_email_import_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal
+    ADD CONSTRAINT email_journal_email_import_id_fkey FOREIGN KEY (email_import_id) REFERENCES public.email_imports(id);
+
+
+--
+-- Name: email_journal email_journal_sender_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.email_journal
+    ADD CONSTRAINT email_journal_sender_id_fkey FOREIGN KEY (sender_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: employee_project_invoices employee_project_invoices_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.employee_project_invoices
+    ADD CONSTRAINT employee_project_invoices_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id) ON DELETE CASCADE;
+
+
+--
+-- Name: employee_project_invoices employee_project_invoices_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.employee_project_invoices
+    ADD CONSTRAINT employee_project_invoices_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE CASCADE;
+
+
+--
+-- Name: exchangerate exchangerate_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.exchangerate
+    ADD CONSTRAINT exchangerate_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: file_full_texts file_full_texts_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_full_texts
+    ADD CONSTRAINT file_full_texts_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.files(id) ON DELETE CASCADE;
+
+
+--
+-- Name: file_versions file_versions_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.file_versions
+    ADD CONSTRAINT file_versions_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.files(id) ON DELETE CASCADE;
+
+
+--
+-- Name: follow_up_access follow_up_access_what_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_access
+    ADD CONSTRAINT follow_up_access_what_fkey FOREIGN KEY (what) REFERENCES public.employee(id);
+
+
+--
+-- Name: follow_up_access follow_up_access_who_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_access
+    ADD CONSTRAINT follow_up_access_who_fkey FOREIGN KEY (who) REFERENCES public.employee(id);
+
+
+--
+-- Name: follow_up_created_for_employees follow_up_created_for_employees_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_created_for_employees
+    ADD CONSTRAINT follow_up_created_for_employees_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: follow_up_created_for_employees follow_up_created_for_employees_follow_up_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_created_for_employees
+    ADD CONSTRAINT follow_up_created_for_employees_follow_up_id_fkey FOREIGN KEY (follow_up_id) REFERENCES public.follow_ups(id) ON DELETE CASCADE;
+
+
+--
+-- Name: follow_up_done follow_up_done_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_done
+    ADD CONSTRAINT follow_up_done_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: follow_up_done follow_up_done_follow_up_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_done
+    ADD CONSTRAINT follow_up_done_follow_up_id_fkey FOREIGN KEY (follow_up_id) REFERENCES public.follow_ups(id) ON DELETE CASCADE;
+
+
+--
+-- Name: follow_up_links follow_up_links_follow_up_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_up_links
+    ADD CONSTRAINT follow_up_links_follow_up_id_fkey FOREIGN KEY (follow_up_id) REFERENCES public.follow_ups(id) ON DELETE CASCADE;
+
+
+--
+-- Name: follow_ups follow_ups_created_by_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_ups
+    ADD CONSTRAINT follow_ups_created_by_fkey FOREIGN KEY (created_by) REFERENCES public.employee(id);
+
+
+--
+-- Name: follow_ups follow_ups_note_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.follow_ups
+    ADD CONSTRAINT follow_ups_note_id_fkey FOREIGN KEY (note_id) REFERENCES public.notes(id);
+
+
+--
+-- Name: generic_translations generic_translations_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.generic_translations
+    ADD CONSTRAINT generic_translations_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id) ON DELETE CASCADE;
+
+
+--
+-- Name: gl gl_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.gl
+    ADD CONSTRAINT gl_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: gl gl_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.gl
+    ADD CONSTRAINT gl_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: gl gl_storno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.gl
+    ADD CONSTRAINT gl_storno_id_fkey FOREIGN KEY (storno_id) REFERENCES public.gl(id);
+
+
+--
+-- Name: history_erp history_erp_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.history_erp
+    ADD CONSTRAINT history_erp_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: inventory inventory_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_bin_id_fkey FOREIGN KEY (bin_id) REFERENCES public.bin(id);
+
+
+--
+-- Name: inventory inventory_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: inventory inventory_invoice_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_invoice_id_fkey FOREIGN KEY (invoice_id) REFERENCES public.invoice(id);
+
+
+--
+-- Name: inventory inventory_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: inventory inventory_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: inventory inventory_trans_type_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_trans_type_id_fkey FOREIGN KEY (trans_type_id) REFERENCES public.transfer_type(id);
+
+
+--
+-- Name: inventory inventory_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT inventory_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: invoice invoice_expense_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_expense_chart_id_fkey FOREIGN KEY (expense_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: invoice invoice_inventory_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_inventory_chart_id_fkey FOREIGN KEY (inventory_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: invoice invoice_price_factor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_price_factor_id_fkey FOREIGN KEY (price_factor_id) REFERENCES public.price_factors(id);
+
+
+--
+-- Name: invoice invoice_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id);
+
+
+--
+-- Name: invoice invoice_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: invoice invoice_tax_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_tax_id_fkey FOREIGN KEY (tax_id) REFERENCES public.tax(id);
+
+
+--
+-- Name: invoice invoice_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.invoice
+    ADD CONSTRAINT invoice_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: letter letter_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: letter letter_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: letter_draft letter_draft_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: letter_draft letter_draft_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: letter_draft letter_draft_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: letter_draft letter_draft_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: letter_draft letter_draft_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter_draft
+    ADD CONSTRAINT letter_draft_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: letter letter_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: letter letter_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: letter letter_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.letter
+    ADD CONSTRAINT letter_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: makemodel makemodel_make_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.makemodel
+    ADD CONSTRAINT makemodel_make_fkey FOREIGN KEY (make) REFERENCES public.vendor(id);
+
+
+--
+-- Name: notes notes_created_by_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.notes
+    ADD CONSTRAINT notes_created_by_fkey FOREIGN KEY (created_by) REFERENCES public.employee(id);
+
+
+--
+-- Name: oe oe_billing_address_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_billing_address_id_fkey FOREIGN KEY (billing_address_id) REFERENCES public.additional_billing_addresses(id);
+
+
+--
+-- Name: oe oe_cp_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_cp_id_fkey FOREIGN KEY (cp_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: oe oe_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: oe oe_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: oe oe_delivery_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_delivery_customer_id_fkey FOREIGN KEY (delivery_customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: oe oe_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: oe oe_delivery_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_delivery_vendor_id_fkey FOREIGN KEY (delivery_vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: oe oe_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: oe oe_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: oe oe_globalproject_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_globalproject_id_fkey FOREIGN KEY (globalproject_id) REFERENCES public.project(id);
+
+
+--
+-- Name: inventory oe_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.inventory
+    ADD CONSTRAINT oe_id_fkey FOREIGN KEY (oe_id) REFERENCES public.delivery_orders(id);
+
+
+--
+-- Name: oe oe_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: oe oe_order_status_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_order_status_id_fkey FOREIGN KEY (order_status_id) REFERENCES public.order_statuses(id);
+
+
+--
+-- Name: oe oe_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: oe oe_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: oe oe_shipto_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_shipto_id_fkey FOREIGN KEY (shipto_id) REFERENCES public.shipto(shipto_id);
+
+
+--
+-- Name: oe oe_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: oe oe_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe
+    ADD CONSTRAINT oe_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: oe_version oe_version_email_journal_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe_version
+    ADD CONSTRAINT oe_version_email_journal_id_fkey FOREIGN KEY (email_journal_id) REFERENCES public.email_journal(id);
+
+
+--
+-- Name: oe_version oe_version_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe_version
+    ADD CONSTRAINT oe_version_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.files(id);
+
+
+--
+-- Name: oe_version oe_version_oe_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.oe_version
+    ADD CONSTRAINT oe_version_oe_id_fkey FOREIGN KEY (oe_id) REFERENCES public.oe(id) ON DELETE CASCADE;
+
+
+--
+-- Name: orderitems orderitems_orderer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_orderer_id_fkey FOREIGN KEY (orderer_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: orderitems orderitems_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: orderitems orderitems_price_factor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_price_factor_id_fkey FOREIGN KEY (price_factor_id) REFERENCES public.price_factors(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: orderitems orderitems_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: orderitems orderitems_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE SET NULL;
+
+
+--
+-- Name: orderitems orderitems_recurring_billing_invoice_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_recurring_billing_invoice_id_fkey FOREIGN KEY (recurring_billing_invoice_id) REFERENCES public.ar(id) ON DELETE SET NULL;
+
+
+--
+-- Name: orderitems orderitems_trans_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_trans_id_fkey FOREIGN KEY (trans_id) REFERENCES public.oe(id) ON DELETE CASCADE;
+
+
+--
+-- Name: orderitems orderitems_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.orderitems
+    ADD CONSTRAINT orderitems_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: parts part_classification_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT part_classification_id_fkey FOREIGN KEY (classification_id) REFERENCES public.part_classifications(id);
+
+
+--
+-- Name: part_customer_prices part_customer_prices_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_customer_prices
+    ADD CONSTRAINT part_customer_prices_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: part_customer_prices part_customer_prices_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.part_customer_prices
+    ADD CONSTRAINT part_customer_prices_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: parts parts_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_bin_id_fkey FOREIGN KEY (bin_id) REFERENCES public.bin(id);
+
+
+--
+-- Name: parts parts_partsgroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_partsgroup_id_fkey FOREIGN KEY (partsgroup_id) REFERENCES public.partsgroup(id);
+
+
+--
+-- Name: parts parts_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: parts parts_price_factor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_price_factor_id_fkey FOREIGN KEY (price_factor_id) REFERENCES public.price_factors(id);
+
+
+--
+-- Name: parts_price_history parts_price_history_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts_price_history
+    ADD CONSTRAINT parts_price_history_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: parts parts_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: parts parts_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.parts
+    ADD CONSTRAINT parts_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: periodic_invoices periodic_invoices_ar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices
+    ADD CONSTRAINT periodic_invoices_ar_id_fkey FOREIGN KEY (ar_id) REFERENCES public.ar(id) ON DELETE CASCADE;
+
+
+--
+-- Name: periodic_invoices periodic_invoices_config_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices
+    ADD CONSTRAINT periodic_invoices_config_id_fkey FOREIGN KEY (config_id) REFERENCES public.periodic_invoices_configs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: periodic_invoices_configs periodic_invoices_configs_ar_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices_configs
+    ADD CONSTRAINT periodic_invoices_configs_ar_chart_id_fkey FOREIGN KEY (ar_chart_id) REFERENCES public.chart(id) ON DELETE RESTRICT;
+
+
+--
+-- Name: periodic_invoices_configs periodic_invoices_configs_email_recipient_contact_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices_configs
+    ADD CONSTRAINT periodic_invoices_configs_email_recipient_contact_id_fkey FOREIGN KEY (email_recipient_contact_id) REFERENCES public.contacts(cp_id) ON DELETE SET NULL;
+
+
+--
+-- Name: periodic_invoices_configs periodic_invoices_configs_oe_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices_configs
+    ADD CONSTRAINT periodic_invoices_configs_oe_id_fkey FOREIGN KEY (oe_id) REFERENCES public.oe(id) ON DELETE CASCADE;
+
+
+--
+-- Name: periodic_invoices_configs periodic_invoices_configs_printer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.periodic_invoices_configs
+    ADD CONSTRAINT periodic_invoices_configs_printer_id_fkey FOREIGN KEY (printer_id) REFERENCES public.printers(id) ON DELETE SET NULL;
+
+
+--
+-- Name: price_rule_items price_rule_items_custom_variable_configs_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rule_items
+    ADD CONSTRAINT price_rule_items_custom_variable_configs_id_fkey FOREIGN KEY (custom_variable_configs_id) REFERENCES public.custom_variable_configs(id);
+
+
+--
+-- Name: price_rule_items price_rule_items_price_rules_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.price_rule_items
+    ADD CONSTRAINT price_rule_items_price_rules_id_fkey FOREIGN KEY (price_rules_id) REFERENCES public.price_rules(id) ON DELETE CASCADE;
+
+
+--
+-- Name: prices prices_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.prices
+    ADD CONSTRAINT prices_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id) ON DELETE CASCADE;
+
+
+--
+-- Name: prices prices_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.prices
+    ADD CONSTRAINT prices_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id) ON DELETE CASCADE;
+
+
+--
+-- Name: project project_billable_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_billable_customer_id_fkey FOREIGN KEY (billable_customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: project project_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: project_participants project_participants_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_participants
+    ADD CONSTRAINT project_participants_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: project_participants project_participants_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_participants
+    ADD CONSTRAINT project_participants_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: project_participants project_participants_project_role_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_participants
+    ADD CONSTRAINT project_participants_project_role_id_fkey FOREIGN KEY (project_role_id) REFERENCES public.project_roles(id);
+
+
+--
+-- Name: project_phase_participants project_phase_participants_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phase_participants
+    ADD CONSTRAINT project_phase_participants_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: project_phase_participants project_phase_participants_project_phase_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phase_participants
+    ADD CONSTRAINT project_phase_participants_project_phase_id_fkey FOREIGN KEY (project_phase_id) REFERENCES public.project_phases(id);
+
+
+--
+-- Name: project_phase_participants project_phase_participants_project_role_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phase_participants
+    ADD CONSTRAINT project_phase_participants_project_role_id_fkey FOREIGN KEY (project_role_id) REFERENCES public.project_roles(id);
+
+
+--
+-- Name: project_phases project_phases_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project_phases
+    ADD CONSTRAINT project_phases_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: project project_project_status_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_project_status_id_fkey FOREIGN KEY (project_status_id) REFERENCES public.project_statuses(id);
+
+
+--
+-- Name: project project_project_type_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.project
+    ADD CONSTRAINT project_project_type_id_fkey FOREIGN KEY (project_type_id) REFERENCES public.project_types(id);
+
+
+--
+-- Name: purchase_basket_items purchase_basket_items_orderer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.purchase_basket_items
+    ADD CONSTRAINT purchase_basket_items_orderer_id_fkey FOREIGN KEY (orderer_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: purchase_basket_items purchase_basket_items_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.purchase_basket_items
+    ADD CONSTRAINT purchase_basket_items_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: reclamation_items reclamation_items_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: reclamation_items reclamation_items_price_factor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_price_factor_id_fkey FOREIGN KEY (price_factor_id) REFERENCES public.price_factors(id);
+
+
+--
+-- Name: reclamation_items reclamation_items_pricegroup_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_pricegroup_id_fkey FOREIGN KEY (pricegroup_id) REFERENCES public.pricegroup(id);
+
+
+--
+-- Name: reclamation_items reclamation_items_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE SET NULL;
+
+
+--
+-- Name: reclamation_items reclamation_items_reason_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_reason_id_fkey FOREIGN KEY (reason_id) REFERENCES public.reclamation_reasons(id);
+
+
+--
+-- Name: reclamation_items reclamation_items_reclamation_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_reclamation_id_fkey FOREIGN KEY (reclamation_id) REFERENCES public.reclamations(id) ON DELETE CASCADE;
+
+
+--
+-- Name: reclamation_items reclamation_items_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamation_items
+    ADD CONSTRAINT reclamation_items_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: reclamations reclamations_billing_address_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_billing_address_id_fkey FOREIGN KEY (billing_address_id) REFERENCES public.additional_billing_addresses(id);
+
+
+--
+-- Name: reclamations reclamations_contact_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_contact_id_fkey FOREIGN KEY (contact_id) REFERENCES public.contacts(cp_id);
+
+
+--
+-- Name: reclamations reclamations_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: reclamations reclamations_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: reclamations reclamations_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: reclamations reclamations_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id);
+
+
+--
+-- Name: reclamations reclamations_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: reclamations reclamations_globalproject_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_globalproject_id_fkey FOREIGN KEY (globalproject_id) REFERENCES public.project(id);
+
+
+--
+-- Name: reclamations reclamations_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: reclamations reclamations_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: reclamations reclamations_salesman_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_salesman_id_fkey FOREIGN KEY (salesman_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: reclamations reclamations_shipto_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_shipto_id_fkey FOREIGN KEY (shipto_id) REFERENCES public.shipto(shipto_id);
+
+
+--
+-- Name: reclamations reclamations_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: reclamations reclamations_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reclamations
+    ADD CONSTRAINT reclamations_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id);
+
+
+--
+-- Name: reconciliation_links reconciliation_links_acc_trans_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reconciliation_links
+    ADD CONSTRAINT reconciliation_links_acc_trans_id_fkey FOREIGN KEY (acc_trans_id) REFERENCES public.acc_trans(acc_trans_id) ON DELETE CASCADE;
+
+
+--
+-- Name: reconciliation_links reconciliation_links_bank_transaction_id; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.reconciliation_links
+    ADD CONSTRAINT reconciliation_links_bank_transaction_id FOREIGN KEY (bank_transaction_id) REFERENCES public.bank_transactions(id) ON DELETE CASCADE;
+
+
+--
+-- Name: record_template_items record_template_items_chart_id; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items
+    ADD CONSTRAINT record_template_items_chart_id FOREIGN KEY (chart_id) REFERENCES public.chart(id) ON DELETE CASCADE;
+
+
+--
+-- Name: record_template_items record_template_items_project_id; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items
+    ADD CONSTRAINT record_template_items_project_id FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_template_items record_template_items_record_template_id; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items
+    ADD CONSTRAINT record_template_items_record_template_id FOREIGN KEY (record_template_id) REFERENCES public.record_templates(id) ON DELETE CASCADE;
+
+
+--
+-- Name: record_template_items record_template_items_tax_id; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_template_items
+    ADD CONSTRAINT record_template_items_tax_id FOREIGN KEY (tax_id) REFERENCES public.tax(id) ON DELETE CASCADE;
+
+
+--
+-- Name: record_templates record_templates_ar_ap_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_ar_ap_chart_id_fkey FOREIGN KEY (ar_ap_chart_id) REFERENCES public.chart(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_templates record_templates_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id) ON DELETE CASCADE;
+
+
+--
+-- Name: record_templates record_templates_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_templates record_templates_department_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_department_id_fkey FOREIGN KEY (department_id) REFERENCES public.department(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_templates record_templates_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_templates record_templates_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: record_templates record_templates_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id) ON DELETE SET NULL;
+
+
+--
+-- Name: record_templates record_templates_vendor_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.record_templates
+    ADD CONSTRAINT record_templates_vendor_id_fkey FOREIGN KEY (vendor_id) REFERENCES public.vendor(id) ON DELETE SET NULL;
+
+
+--
+-- Name: requirement_spec_item_dependencies requirement_spec_item_dependencies_depended_item_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_item_dependencies
+    ADD CONSTRAINT requirement_spec_item_dependencies_depended_item_id_fkey FOREIGN KEY (depended_item_id) REFERENCES public.requirement_spec_items(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_item_dependencies requirement_spec_item_dependencies_depending_item_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_item_dependencies
+    ADD CONSTRAINT requirement_spec_item_dependencies_depending_item_id_fkey FOREIGN KEY (depending_item_id) REFERENCES public.requirement_spec_items(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_acceptance_status_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_acceptance_status_id_fkey FOREIGN KEY (acceptance_status_id) REFERENCES public.requirement_spec_acceptance_statuses(id);
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_complexity_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_complexity_id_fkey FOREIGN KEY (complexity_id) REFERENCES public.requirement_spec_complexities(id);
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_order_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_order_part_id_fkey FOREIGN KEY (order_part_id) REFERENCES public.parts(id) ON DELETE SET NULL;
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_parent_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_parent_id_fkey FOREIGN KEY (parent_id) REFERENCES public.requirement_spec_items(id);
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_items requirement_spec_items_risk_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_items
+    ADD CONSTRAINT requirement_spec_items_risk_id_fkey FOREIGN KEY (risk_id) REFERENCES public.requirement_spec_risks(id);
+
+
+--
+-- Name: requirement_spec_orders requirement_spec_orders_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders
+    ADD CONSTRAINT requirement_spec_orders_order_id_fkey FOREIGN KEY (order_id) REFERENCES public.oe(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_orders requirement_spec_orders_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders
+    ADD CONSTRAINT requirement_spec_orders_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_orders requirement_spec_orders_version_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_orders
+    ADD CONSTRAINT requirement_spec_orders_version_id_fkey FOREIGN KEY (version_id) REFERENCES public.requirement_spec_versions(id) ON DELETE SET NULL;
+
+
+--
+-- Name: requirement_spec_parts requirement_spec_parts_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_parts
+    ADD CONSTRAINT requirement_spec_parts_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: requirement_spec_parts requirement_spec_parts_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_parts
+    ADD CONSTRAINT requirement_spec_parts_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_parts requirement_spec_parts_unit_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_parts
+    ADD CONSTRAINT requirement_spec_parts_unit_id_fkey FOREIGN KEY (unit_id) REFERENCES public.units(id);
+
+
+--
+-- Name: requirement_spec_pictures requirement_spec_pictures_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_pictures
+    ADD CONSTRAINT requirement_spec_pictures_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_pictures requirement_spec_pictures_text_block_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_pictures
+    ADD CONSTRAINT requirement_spec_pictures_text_block_id_fkey FOREIGN KEY (text_block_id) REFERENCES public.requirement_spec_text_blocks(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_text_blocks requirement_spec_text_blocks_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_text_blocks
+    ADD CONSTRAINT requirement_spec_text_blocks_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_versions requirement_spec_versions_requirement_spec_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_versions
+    ADD CONSTRAINT requirement_spec_versions_requirement_spec_id_fkey FOREIGN KEY (requirement_spec_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_spec_versions requirement_spec_versions_working_copy_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_spec_versions
+    ADD CONSTRAINT requirement_spec_versions_working_copy_id_fkey FOREIGN KEY (working_copy_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: requirement_specs requirement_specs_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: requirement_specs requirement_specs_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: requirement_specs requirement_specs_status_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_status_id_fkey FOREIGN KEY (status_id) REFERENCES public.requirement_spec_statuses(id);
+
+
+--
+-- Name: requirement_specs requirement_specs_type_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_type_id_fkey FOREIGN KEY (type_id) REFERENCES public.requirement_spec_types(id);
+
+
+--
+-- Name: requirement_specs requirement_specs_working_copy_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.requirement_specs
+    ADD CONSTRAINT requirement_specs_working_copy_id_fkey FOREIGN KEY (working_copy_id) REFERENCES public.requirement_specs(id) ON DELETE CASCADE;
+
+
+--
+-- Name: sepa_export sepa_export_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export
+    ADD CONSTRAINT sepa_export_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: sepa_export_items sepa_export_items_ap_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_items
+    ADD CONSTRAINT sepa_export_items_ap_id_fkey FOREIGN KEY (ap_id) REFERENCES public.ap(id) ON DELETE CASCADE;
+
+
+--
+-- Name: sepa_export_items sepa_export_items_ar_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_items
+    ADD CONSTRAINT sepa_export_items_ar_id_fkey FOREIGN KEY (ar_id) REFERENCES public.ar(id) ON DELETE CASCADE;
+
+
+--
+-- Name: sepa_export_items sepa_export_items_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_items
+    ADD CONSTRAINT sepa_export_items_chart_id_fkey FOREIGN KEY (chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: sepa_export_items sepa_export_items_sepa_export_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_items
+    ADD CONSTRAINT sepa_export_items_sepa_export_id_fkey FOREIGN KEY (sepa_export_id) REFERENCES public.sepa_export(id) ON DELETE CASCADE;
+
+
+--
+-- Name: sepa_export_message_ids sepa_export_message_ids_sepa_export_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.sepa_export_message_ids
+    ADD CONSTRAINT sepa_export_message_ids_sepa_export_id_fkey FOREIGN KEY (sepa_export_id) REFERENCES public.sepa_export(id) ON DELETE CASCADE;
+
+
+--
+-- Name: shop_images shop_images_file_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_images
+    ADD CONSTRAINT shop_images_file_id_fkey FOREIGN KEY (file_id) REFERENCES public.files(id) ON DELETE CASCADE;
+
+
+--
+-- Name: shop_order_items shop_order_items_shop_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_order_items
+    ADD CONSTRAINT shop_order_items_shop_order_id_fkey FOREIGN KEY (shop_order_id) REFERENCES public.shop_orders(id) ON DELETE CASCADE;
+
+
+--
+-- Name: shop_orders shop_orders_kivi_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_orders
+    ADD CONSTRAINT shop_orders_kivi_customer_id_fkey FOREIGN KEY (kivi_customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: shop_orders shop_orders_shop_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_orders
+    ADD CONSTRAINT shop_orders_shop_id_fkey FOREIGN KEY (shop_id) REFERENCES public.shops(id);
+
+
+--
+-- Name: shop_parts shop_parts_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_parts
+    ADD CONSTRAINT shop_parts_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: shop_parts shop_parts_shop_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.shop_parts
+    ADD CONSTRAINT shop_parts_shop_id_fkey FOREIGN KEY (shop_id) REFERENCES public.shops(id);
+
+
+--
+-- Name: stocktakings stocktakings_bin_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_bin_id_fkey FOREIGN KEY (bin_id) REFERENCES public.bin(id);
+
+
+--
+-- Name: stocktakings stocktakings_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: stocktakings stocktakings_inventory_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_inventory_id_fkey FOREIGN KEY (inventory_id) REFERENCES public.inventory(id);
+
+
+--
+-- Name: stocktakings stocktakings_parts_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_parts_id_fkey FOREIGN KEY (parts_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: stocktakings stocktakings_warehouse_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.stocktakings
+    ADD CONSTRAINT stocktakings_warehouse_id_fkey FOREIGN KEY (warehouse_id) REFERENCES public.warehouse(id);
+
+
+--
+-- Name: tax tax_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.tax
+    ADD CONSTRAINT tax_chart_id_fkey FOREIGN KEY (chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: tax tax_skonto_purchase_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.tax
+    ADD CONSTRAINT tax_skonto_purchase_chart_id_fkey FOREIGN KEY (skonto_purchase_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: tax tax_skonto_sales_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.tax
+    ADD CONSTRAINT tax_skonto_sales_chart_id_fkey FOREIGN KEY (skonto_sales_chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: taxkeys taxkeys_chart_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxkeys
+    ADD CONSTRAINT taxkeys_chart_id_fkey FOREIGN KEY (chart_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: taxkeys taxkeys_tax_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxkeys
+    ADD CONSTRAINT taxkeys_tax_id_fkey FOREIGN KEY (tax_id) REFERENCES public.tax(id);
+
+
+--
+-- Name: taxzone_charts taxzone_charts_buchungsgruppen_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts
+    ADD CONSTRAINT taxzone_charts_buchungsgruppen_id_fkey FOREIGN KEY (buchungsgruppen_id) REFERENCES public.buchungsgruppen(id);
+
+
+--
+-- Name: taxzone_charts taxzone_charts_expense_accno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts
+    ADD CONSTRAINT taxzone_charts_expense_accno_id_fkey FOREIGN KEY (expense_accno_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: taxzone_charts taxzone_charts_income_accno_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts
+    ADD CONSTRAINT taxzone_charts_income_accno_id_fkey FOREIGN KEY (income_accno_id) REFERENCES public.chart(id);
+
+
+--
+-- Name: taxzone_charts taxzone_charts_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.taxzone_charts
+    ADD CONSTRAINT taxzone_charts_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: time_recording_articles time_recording_articles_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recording_articles
+    ADD CONSTRAINT time_recording_articles_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: time_recordings time_recordings_customer_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_customer_id_fkey FOREIGN KEY (customer_id) REFERENCES public.customer(id);
+
+
+--
+-- Name: time_recordings time_recordings_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: time_recordings time_recordings_order_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_order_id_fkey FOREIGN KEY (order_id) REFERENCES public.oe(id);
+
+
+--
+-- Name: time_recordings time_recordings_part_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_part_id_fkey FOREIGN KEY (part_id) REFERENCES public.parts(id);
+
+
+--
+-- Name: time_recordings time_recordings_project_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_project_id_fkey FOREIGN KEY (project_id) REFERENCES public.project(id);
+
+
+--
+-- Name: time_recordings time_recordings_staff_member_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.time_recordings
+    ADD CONSTRAINT time_recordings_staff_member_id_fkey FOREIGN KEY (staff_member_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: todo_user_config todo_user_config_employee_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.todo_user_config
+    ADD CONSTRAINT todo_user_config_employee_id_fkey FOREIGN KEY (employee_id) REFERENCES public.employee(id);
+
+
+--
+-- Name: translation translation_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.translation
+    ADD CONSTRAINT translation_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: units_language units_language_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units_language
+    ADD CONSTRAINT units_language_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: units_language units_language_unit_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.units_language
+    ADD CONSTRAINT units_language_unit_fkey FOREIGN KEY (unit) REFERENCES public.units(name);
+
+
+--
+-- Name: vendor vendor_business_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_business_id_fkey FOREIGN KEY (business_id) REFERENCES public.business(id);
+
+
+--
+-- Name: vendor vendor_currency_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_currency_id_fkey FOREIGN KEY (currency_id) REFERENCES public.currencies(id);
+
+
+--
+-- Name: vendor vendor_delivery_term_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_delivery_term_id_fkey FOREIGN KEY (delivery_term_id) REFERENCES public.delivery_terms(id);
+
+
+--
+-- Name: vendor vendor_language_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_language_id_fkey FOREIGN KEY (language_id) REFERENCES public.language(id);
+
+
+--
+-- Name: vendor vendor_payment_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_payment_id_fkey FOREIGN KEY (payment_id) REFERENCES public.payment_terms(id);
+
+
+--
+-- Name: vendor vendor_taxzone_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: kivitendo
+--
+
+ALTER TABLE ONLY public.vendor
+    ADD CONSTRAINT vendor_taxzone_id_fkey FOREIGN KEY (taxzone_id) REFERENCES public.tax_zones(id);
+
+
+--
+-- Name: report_headings report_headings_category_id_fkey; Type: FK CONSTRAINT; Schema: tax; Owner: kivitendo
+--
+
+ALTER TABLE ONLY tax.report_headings
+    ADD CONSTRAINT report_headings_category_id_fkey FOREIGN KEY (category_id) REFERENCES tax.report_categories(id);
+
+
+--
+-- Name: report_variables report_variables_heading_id_fkey; Type: FK CONSTRAINT; Schema: tax; Owner: kivitendo
+--
+
+ALTER TABLE ONLY tax.report_variables
+    ADD CONSTRAINT report_variables_heading_id_fkey FOREIGN KEY (heading_id) REFERENCES tax.report_headings(id);
+
+
+--
+-- PostgreSQL database dump complete
+--
+
+\unrestrict udx77cffGFXywKFftV0c2RVJe11A5uBWmVHFObbmFi2ktDIoGnYu7nKcwi6FgOa
+
diff --git a/VERSION b/VERSION
index 9575d51ba..2009c7dfa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.1
+3.9.2
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 541ababea..87bad7099 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -582,8 +582,7 @@ sub config {
 
   my @formats = ();
   if ($::lx_office_conf{print_templates}->{opendocument}
-      && $::lx_office_conf{applications}->{openofficeorg_writer} && (-x $::lx_office_conf{applications}->{openofficeorg_writer})
-      && $::lx_office_conf{applications}->{xvfb}                 && (-x $::lx_office_conf{applications}->{xvfb})) {
+      && $::lx_office_conf{applications}->{openofficeorg_writer} && (-x $::lx_office_conf{applications}->{openofficeorg_writer})) {
     push(@formats, { "name" => $locale->text("PDF (OpenDocument/OASIS)"),
                      "value" => "opendocument_pdf" });
   }
@@ -637,7 +636,7 @@ sub config {
   }
 
   $form->{STYLESHEETS} = [];
-  foreach my $item (qw(lx-office-erp.css kivitendo.css)) {
+  foreach my $item (qw(lx-office-erp.css kivitendo.css design40.css)) {
     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,
@@ -666,13 +665,17 @@ sub config {
   $form->{positions_show_update_button}           = AM->positions_show_update_button();
   $form->{time_recording_use_duration}            = AM->time_recording_use_duration();
   $form->{longdescription_dialog_size_percentage} = AM->longdescription_dialog_size_percentage();
+  $form->{layout_style}                           = AM->layout_style();
+  $form->{part_picker_search_all_as_list_default} = AM->part_picker_search_all_as_list_default();
+  $form->{order_item_input_position}              = AM->order_item_input_position();
 
   $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
   $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
   $form->{todo_cfg}            = { TODO->get_user_config('login' => $::myconfig{login}) };
   $form->{title}               = $locale->text('Edit Preferences for #1', $::myconfig{login});
+  $form->{follow_up_notify_by_email} = $myconfig{follow_up_notify_by_email};
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(jquery.multiselect2side ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->{layout}->use_javascript("${_}.js") for qw(jquery.multiselect2side ckeditor5/ckeditor ckeditor5/translations/de);
 
   setup_am_config_action_bar();
   $form->header();
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 0e3048ab6..181990545 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -47,12 +47,17 @@ use SL::DB::BankTransactionAccTrans;
 use SL::DB::Chart;
 use SL::DB::Currency;
 use SL::DB::Default;
+use SL::DB::InvoiceItem;
 use SL::DB::Order;
 use SL::DB::PaymentTerm;
 use SL::DB::PurchaseInvoice;
 use SL::DB::RecordTemplate;
 use SL::DB::Tax;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
+use SL::Presenter::ItemsList;
 use SL::Webdav;
+use SL::ZUGFeRD;
 use SL::Locale::String qw(t8);
 
 require "bin/mozilla/common.pl";
@@ -106,6 +111,50 @@ sub _assert_access {
   $::form->show_generic_error($::locale->text("You do not have the permissions to access this function.")) if !       $cache->{_may_view_or_edit_this_invoice};
 }
 
+sub load_zugferd {
+  $::auth->assert('ap_transactions');
+
+  my $file_name = $::form->{form_defaults}->{zugferd_session_file};
+  if ($file_name) {
+    flash('info', $::locale->text(
+        "The ZUGFeRD/Factur-X invoice '#1' has been loaded.", $file_name));
+  }
+
+  my $template_ap;
+  $template_ap ||= SL::DB::RecordTemplate->new(id => $::form->{record_template_id})->load()
+    if $::form->{record_template_id};
+  $template_ap ||= SL::DB::Manager::RecordTemplate->get_first(where => [vendor_id => $::form->{form_defaults}->{vendor_id}])
+    if $::form->{form_defaults}->{vendor_id};
+  if ($template_ap) {
+    $::form->{id} = $template_ap->id;
+    # set default values for items
+    my $template_item = $template_ap->items->[0];
+    my $chart = SL::DB::Chart->new(id => $template_item->chart_id)->load();
+    my $tax = SL::DB::Tax->new(id => $template_item->tax_id)->load();
+    foreach my $pos (1 .. $::form->{form_defaults}->{rowcount}) {
+      $::form->{form_defaults}->{"AP_amount_chart_id_$pos"}          = $chart->id;
+      $::form->{form_defaults}->{"previous_AP_amount_chart_id_$pos"} = $chart->id;
+      $::form->{form_defaults}->{"taxchart_$pos"}   = $tax->id . '--' . $tax->rate;
+      $::form->{form_defaults}->{"project_id_$pos"} = $template_item->project_id;
+
+    }
+    $::form->{form_defaults}->{FLASH} = $::form->{FLASH}; # store flash, form gets cleared
+    return load_record_template();
+  } else {
+    flash('warning', $::locale->text(
+        "No AP Record Template for vendor '#1' found.", $::form->{form_defaults}->{vendor}));
+  }
+
+  my $form_defaults = delete $::form->{form_defaults};
+  $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
+  $::form->{title} ||= "Add";
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+  update(
+    keep_rows_without_amount => 1,
+    dont_add_new_row         => 1,
+  );
+}
+
 sub load_record_template {
   $::auth->assert('ap_transactions');
 
@@ -180,6 +229,8 @@ sub load_record_template {
                                   $form_defaults->{AP_paid_1_suggestion},
                                 )) if $::form->{no_payment_bookings};
 
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
   update(
     keep_rows_without_amount => 1,
     dont_add_new_row         => 1,
@@ -252,8 +303,10 @@ sub add {
 
   AP->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};
+  $form->{initial_vendor_id} = $form->{vendor_id};
   create_links(dont_save => 1);
   $form->{transdate} = $form->{initial_transdate};
+  $form->{vendor_id} = $form->{initial_vendor_id} if $form->{initial_vendor_id};
 
   if ($form->{vendor_id}) {
     my $vendor = SL::DB::Vendor->load_cached($form->{vendor_id});
@@ -265,6 +318,10 @@ sub add {
     $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart;
   }
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+  }
+
   &display_form;
 
   $main::lxdebug->leave_sub();
@@ -333,6 +390,7 @@ sub create_links {
     $saved{duedate} = $form->{duedate} if $form->{duedate};
     $saved{currency} = $form->{currency} if $form->{currency};
     $saved{taxincluded} = $form->{taxincluded} if $form->{taxincluded};
+    $saved{intnotes} = $form->{intnotes} if $form->{intnotes};
   }
 
   IR->get_vendor(\%myconfig, \%$form);
@@ -344,9 +402,6 @@ sub create_links {
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
 
-  # currencies
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
-
   $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
@@ -395,22 +450,16 @@ sub form_header {
   # type=submit $locale->text('Add Accounts Payables Transaction')
   # type=submit $locale->text('Edit Accounts Payables Transaction')
 
-  my $readonly = $form->{id} ? "readonly" : "";
-
-  $form->{radier} = ($::instance_conf->get_ap_changeable == 2)
-                      ? ($form->current_date(\%myconfig) eq $form->{gldate})
-                      : ($::instance_conf->get_ap_changeable == 1);
-  $readonly       = $form->{radier} ? "" : $readonly;
-
-  $form->{readonly} = $readonly;
-
-  $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
-  if ( $form->{forex} ) {
-    $form->{exchangerate} = $form->{forex};
+  # currencies
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  if ($form->{currency} ne $form->{defaultcurrency} && !$form->{exchangerate}) {
+    my $transdate    = $form->{transdate}  ? DateTime->from_kivitendo($form->{transdate}) : DateTime->today_local;
+    ($form->{exchangerate}, $form->{record_forex}) = $form->{id}
+                                                  ?  $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, "sell", $form->{id}, 'ap')
+                                                  :  $form->check_exchangerate(\%myconfig, $form->{currency}, $transdate, "sell");
   }
 
   # format amounts
-  $form->{exchangerate}    = $form->{exchangerate} ? $form->format_amount(\%myconfig, $form->{exchangerate}) : '';
   $form->{creditlimit}     = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0");
   $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0");
 
@@ -435,14 +484,24 @@ sub form_header {
 
   my %project_labels = map { $_->id => $_->projectnumber }  @{ SL::DB::Manager::Project->get_all };
 
-  my %charts;
+  my (%charts, %bank_accounts);
   my $default_ap_amount_chart_id;
+  # don't add manual bookings for charts which are assigned to real bank accounts
+  # and are flagged for use with bank import
+  my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
+  foreach my $bank (@{ $bank_accounts }) {
+    if ($bank->use_with_bank_import) {
+      my $accno_paid_bank = $bank->chart->accno;
+      $bank_accounts{$accno_paid_bank} = 1;
+    }
+  }
 
   foreach my $item (@{ $form->{ALL_CHARTS} }) {
     if ( grep({ $_ eq 'AP_amount' } @{ $item->{link_split} }) ) {
       $default_ap_amount_chart_id //= $item->{id};
 
     } elsif ( grep({ $_ eq 'AP_paid' } @{ $item->{link_split} }) ) {
+      next if $bank_accounts{$item->{accno}};
       push(@{ $form->{ALL_CHARTS_AP_paid} }, $item);
     }
 
@@ -452,7 +511,7 @@ sub form_header {
   my $follow_up_vc         = $form->{vendor_id} ? SL::DB::Vendor->load_cached($form->{vendor_id})->name : '';
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
 
-  $::request->layout->add_javascripts("autocomplete_chart.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.SalesPurchase.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js", "kivi.CustomerVendor.js", "kivi.Validator.js", "autocomplete_project.js");
+  $::request->layout->add_javascripts("autocomplete_chart.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.SalesPurchase.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js", "kivi.CustomerVendor.js", "kivi.Validator.js", "autocomplete_project.js");
   # $form->{totalpaid} is used by the action bar setup to determine
   # whether or not canceling is allowed. Therefore it must be
   # calculated prior to the action bar setup.
@@ -535,7 +594,29 @@ sub form_header {
   # default account for current assets (i.e. 1801 - SKR04)
   $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
 
+  # reset form value of defaultcurrency_totalpaid, as it is currently a hidden and otherwise it gets accumulated after each update
+  # is only used if there are exchange rates
+  $form->{"defaultcurrency_totalpaid"} = 0;
+
   for my $i (1 .. $form->{paidaccounts}) {
+    # hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
+    if ($form->{"exchangerate_$i"} && $form->{"acc_trans_id_$i"}) {
+      my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
+      if ($bt_acc_trans) {
+        if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
+          $form->{"exchangerate_$i"} = $bt_acc_trans->bank_transaction->exchangerate;
+          $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
+          $form->{"record_forex_$i"} = 1;
+        }
+      }
+      if (!$form->{"fx_transaction_$i"}) {
+        # this is a banktransaction that was paid in internal currency. revert paid/defaultcurrency_paid
+        $form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"};
+        $form->{"paid_$i"} /= $form->{"exchangerate_$i"};
+      }
+      $form->{"defaultcurrency_paid_$i"} //= $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+      $form->{"defaultcurrency_totalpaid"} +=  $form->{"defaultcurrency_paid_$i"};
+    } # end hook defaultcurrency_paid
     # format amounts
     if ($form->{"paid_$i"}) {
       $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
@@ -570,8 +651,9 @@ sub form_header {
        $form->{'AP_paid_' . $i} . " " . SL::DB::Manager::Chart->find_by(accno => $form->{'AP_paid_' . $i})->description
      : '';
   }
-
-  $form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid};
+  $form->{paid_missing} =  $::form->{is_linked_bank_transaction} && $form->{invoice_obj}->forex ?
+                           $form->{invoice_obj}->open_amount
+                        :  $form->{invtotal_unformatted} - $form->{totalpaid};
 
   $form->{payment_id} = $form->{invoice_obj}->{payment_id} // $form->{payment_id};
   print $form->parse_html_template('ap/form_header', {
@@ -624,9 +706,20 @@ sub mark_as_paid {
   $::form->redirect($::locale->text("Marked as paid"));
 }
 
+sub block_or_unblock_sepa_transfer {
+  $::auth->assert('ap_transactions');
+
+  my $invoice = SL::DB::PurchaseInvoice->new(id => $::form->{id})->load;
+  $invoice->update_attributes(is_sepa_blocked => 0) if  $::form->{unblock_sepa} &&  $invoice->is_sepa_blocked;
+  $invoice->update_attributes(is_sepa_blocked => 1) if !$::form->{unblock_sepa} && !$invoice->is_sepa_blocked;
+
+  $::form->redirect($::form->{unblock_sepa} ? t8('Bank transfer via SEPA is unblocked') : t8('Bank transfer via SEPA is blocked'));
+}
+
 sub show_draft {
   $::form->{transdate} = DateTime->today_local->to_kivitendo if !$::form->{transdate};
   $::form->{gldate}    = $::form->{transdate} if !$::form->{gldate};
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
   update();
 }
 
@@ -662,7 +755,10 @@ sub update {
       # calculate tax exactly the same way as AP in post_transaction via form->calculate_tax
       my $tmpnetamount;
       ($tmpnetamount,$form->{"tax_$i"}) = $form->calculate_tax($form->{"amount_$i"},$rate,$form->{taxincluded},2);
-      $totaltax += $form->{"tax_$i"};
+
+      my $tax = SL::DB::Manager::Tax->find_by(id => $taxkey);
+      $totaltax += ($tax->reverse_charge_chart_id) ? 0 : $form->{"tax_$i"};
+
       map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
       $count++;
     }
@@ -671,9 +767,6 @@ sub update {
 
   map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount});
 
-  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'sell');
-  $form->{exchangerate} = $form->{forex} if $form->{forex};
-
   $form->{invdate} = $form->{transdate};
 
   if (($form->{previous_vendor_id} || $form->{vendor_id}) != $form->{vendor_id}) {
@@ -814,8 +907,10 @@ sub post {
     # no taxincluded for reverse charge
     my ($used_tax_id) = split(/--/, $form->{"taxchart_$i"});
     my $tax = SL::DB::Manager::Tax->find_by(id => $used_tax_id);
-    if ($tax->reverse_charge_chart_id && $form->{taxincluded}) {
-      $form->error($locale->text('Cannot Post AP transaction with tax included!'));
+    # mark entry
+    if ($tax->reverse_charge_chart_id) {
+      $form->error($locale->text('Cannot Post AP transaction with tax included!')) if $form->{taxincluded};
+      $form->{"reverse_charge_$i"} = 1;
     }
 
     if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) {
@@ -825,8 +920,12 @@ sub post {
 
   $form->error($locale->text('Zero amount posting!')) if $zero_amount_posting;
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency}));
+  if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
+    $form->isblank("exchangerate", $locale->text('Exchangerate missing!'));
+    $form->error($locale->text('Cannot post invoice with negative exchange rate'))
+      unless ($form->parse_amount(\%myconfig, $form->{"exchangerate"}) > 0);
+  }
+
   delete($form->{AP});
 
   for my $i (1 .. $form->{paidaccounts}) {
@@ -860,8 +959,6 @@ sub post {
   }
   $form->{storno}       = 0;
 
-  $form->{id} = 0 if $form->{postasnew};
-
   if (AP->post_transaction(\%myconfig, \%$form)) {
     # create webdav folder
     if ($::instance_conf->get_webdav) {
@@ -876,6 +973,62 @@ sub post {
       $form->{what_done} = "invoice";
       $form->save_history;
     }
+    # save zugferd file
+    my $file_name = delete $form->{zugferd_session_file};
+    if ($file_name) {
+      my $file = SL::SessionFile->new($file_name, mode => '<');
+      if (!$file->fh) {
+        SL::Helper::Flash::flash_later('error',
+          t8('Could not open ZUGFeRD file for reading: #1', $@));
+      } else {
+
+        # copy file to webdav folder
+        if ($form->{invnumber} && $::instance_conf->get_webdav_documents) {
+          my $webdav = SL::Webdav->new(
+            type     => 'accounts_payable',
+            number   => $form->{invnumber},
+          );
+          my $webdav_file = SL::Webdav::File->new(
+            webdav => $webdav,
+            filename => $file_name,
+          );
+          eval {
+            $webdav_file->store(file => $file->file_name());
+            1;
+          } or do {
+            $form->{zugferd_session_file} = $file_name;
+            SL::Helper::Flash::flash_later('error',
+              t8('Storing the ZUGFeRD file to the WebDAV folder failed: #1', $@));
+          };
+        }
+        if ($form->{id} && $::instance_conf->get_doc_storage) {
+          eval {
+            SL::File->save(
+              object_id     => $form->{id},
+              object_type   => 'purchase_invoice',
+              mime_type     => 'application/pdf',
+              source        => 'uploaded',
+              file_type     => 'document',
+              file_name     => $file_name,
+              file_path     => $file->file_name(),
+            );
+            1;
+          } or do {
+            $form->{zugferd_session_file} = $file_name;
+            SL::Helper::Flash::flash_later('error',
+              t8('Storing the ZUGFeRD file in the storage backend failed: #1', $@));
+          };
+        }
+      }
+    }
+
+    if ($form->{email_journal_id}) {
+      my $ap_transaction = SL::DB::PurchaseInvoice->new(id => $form->{id})->load;
+      my $email_journal = SL::DB::EmailJournal->new(
+        id => delete $form->{email_journal_id}
+      )->load;
+      $email_journal->link_to_record_with_attachment($ap_transaction, delete $::form->{email_attachment_id});
+    }
 
     if (!$inline) {
       my $msg = $locale->text("AP transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id});
@@ -885,7 +1038,15 @@ sub post {
         SL::Helper::Flash::flash_later('info', $msg);
         print $form->redirect_header($form->{callback});
         $::dispatcher->end_request;
-
+      } elsif ($form->{callback} =~ /ScanQRCode/) {
+        # callback/redirect when coming from mobile view (swiss qr bill scan)
+        print $form->redirect_header(build_std_url(
+          "script=controller.pl",
+          'action=ScanQRBill/scan_view',
+          'transaction_success=1',
+          'invnumber=' . E($form->{invnumber})
+        ));
+        $::dispatcher->end_request;
       } elsif ('doc-tab' eq $form->{after_action}) {
         # Redirect with callback containing a fragment does not work (by now)
         # because the callback info is stored in the session an parsing the
@@ -895,7 +1056,12 @@ sub post {
         SL::Helper::Flash::flash_later('info', $msg);
         print $form->redirect_header($add_doc_url);
         $::dispatcher->end_request;
-
+      } elsif ('callback' eq $form->{after_action}) {
+        my $callback = $form->{callback}
+          || "controller.pl?action=LoginScreen/user_login";
+        SL::Helper::Flash::flash_later('info', $msg);
+        print $form->redirect_header($callback);
+        $::dispatcher->end_request;
       } else {
         $form->redirect($msg);
       }
@@ -908,31 +1074,6 @@ sub post {
   $main::lxdebug->leave_sub();
 }
 
-sub post_as_new {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $main::auth->assert('ap_transactions');
-
-  $form->{postasnew} = 1;
-  # saving the history
-  if(!exists $form->{addition} && $form->{id} ne "") {
-    # does this work? post_as_new for ap doesn't immediately save the
-    # invoice, because the invnumber has to be entered by hand.
-    # And the value of $form->{postasnew} isn't checked when calling post
-    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
-    $form->{addition}  = "POSTED AS NEW";
-    $form->{what_done} = "invoice";
-    $form->save_history;
-  }
-  # /saving the history
-  &post;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub use_as_new {
   $main::lxdebug->enter_sub();
 
@@ -941,6 +1082,10 @@ sub use_as_new {
 
   $main::auth->assert('ap_transactions');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
   map { delete $form->{$_} } qw(printed emailed queued invnumber deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno convert_from_oe_id);
   $form->{paidaccounts} = 1;
   $form->{rowcount}--;
@@ -954,6 +1099,8 @@ sub use_as_new {
     $form->{duedate}  = $payment_terms->calc_date(reference_date => $today)->to_kivitendo if $payment_terms;
   }
 
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
   &update;
 
   $main::lxdebug->leave_sub();
@@ -989,8 +1136,9 @@ sub search {
 
   $form->{title} = $locale->text('Vendor Invoices & AP Transactions');
 
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
-  $::form->{ALL_TAXZONES}    = SL::DB::Manager::TaxZone   ->get_all_sorted;
+  $::form->{ALL_DEPARTMENTS}   = SL::DB::Manager::Department ->get_all_sorted;
+  $::form->{ALL_TAXZONES}      = SL::DB::Manager::TaxZone    ->get_all_sorted;
+  $::form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted;
 
   # constants and subs for template
   $form->{vc_keys}   = sub { "$_[0]->{name}--$_[0]->{id}" };
@@ -1043,13 +1191,15 @@ sub ap_transactions {
 
   my @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
-       due duedate transaction_description notes employee globalprojectnumber department
+       due duedate transaction_description notes intnotes employee globalprojectnumber department
        vendornumber country ustid taxzone payment_terms charts debit_chart direct_debit
-       insertdate);
+       insertdate items);
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto
-                                           parts_partnumber parts_description department_id taxzone_id);
+  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes intnotes project_id
+                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
+                                           parts_partnumber parts_description department_id taxzone_id payment_id
+                                           fulltext insertdatefrom insertdateto);
 
   my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
 
@@ -1069,6 +1219,7 @@ sub ap_transactions {
     'duedate'                 => { 'text' => $locale->text('Due Date'), },
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },
     'notes'                   => { 'text' => $locale->text('Notes'), },
+    'intnotes'                => { 'text' => $locale->text('Internal Notes'), },
     'employee'                => { 'text' => $locale->text('Employee'), },
     'globalprojectnumber'     => { 'text' => $locale->text('Document Project Number'), },
     'department'              => { 'text' => $locale->text('Department'), },
@@ -1081,9 +1232,10 @@ sub ap_transactions {
     'debit_chart'             => { 'text' => $locale->text('Debit Account'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },
     'insertdate'              => { 'text' => $locale->text('Insert Date'), },
+    'items'                   => { 'text' => $locale->text('Positions'), },
   );
 
-  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) {
+foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shipvia transaction_description direct_debit department taxzone insertdate intnotes)) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
@@ -1113,13 +1265,25 @@ sub ap_transactions {
   push @options, $locale->text('Invoice Number')          . " : $form->{invnumber}"                      if ($form->{invnumber});
   push @options, $locale->text('Order Number')            . " : $form->{ordnumber}"                      if ($form->{ordnumber});
   push @options, $locale->text('Notes')                   . " : $form->{notes}"                          if ($form->{notes});
+  push @options, $locale->text('Internal Notes')          . " : $form->{intnotes}"                       if $form->{intnotes};
   push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"        if ($form->{transaction_description});
   push @options, $locale->text('Part Description')        . " : $form->{parts_description}"              if $form->{parts_description};
   push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"               if $form->{parts_partnumber};
-  push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)      if ($form->{transdatefrom});
-  push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{transdateto},   1)      if ($form->{transdateto});
+  push @options, $locale->text('Full Text')               . " : $form->{fulltext}"                       if ($form->{fulltext});
+  push @options, $locale->text('From')                                      . " " . $locale->date(\%myconfig, $form->{transdatefrom},  1) if ($form->{transdatefrom});
+  push @options, $locale->text('Bis')                                       . " " . $locale->date(\%myconfig, $form->{transdateto},    1) if ($form->{transdateto});
+  push @options, $locale->text('Due Date')    . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{duedatefrom},    1) if ($form->{duedatefrom});
+  push @options, $locale->text('Due Date')    . " " . $locale->text('to')   . " " . $locale->date(\%myconfig, $form->{duedateto},      1) if ($form->{duedateto});
+  push @options, $locale->text('Date Paid')   . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{datepaidfrom},   1) if ($form->{datepaidfrom});
+  push @options, $locale->text('Date Paid')   . " " . $locale->text('to')   . " " . $locale->date(\%myconfig, $form->{datepaidto},     1) if ($form->{datepaidto});
+  push @options, $locale->text('Insert Date') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if ($form->{insertdatefrom});
+  push @options, $locale->text('Insert Date') . " " . $locale->text('to')   . " " . $locale->date(\%myconfig, $form->{insertdateto},   1) if ($form->{insertdateto});
   push @options, $locale->text('Open')                                                                   if ($form->{open});
   push @options, $locale->text('Closed')                                                                 if ($form->{closed});
+  if ($form->{payment_id}) {
+    my $payment_term = SL::DB::Manager::PaymentTerm->find_by( id => $form->{payment_id} );
+    push @options, $locale->text('Payment Term') . " : " . $payment_term->description;
+  }
 
   $report->set_options('top_info_text'        => join("\n", @options),
                        'output_format'        => 'HTML',
@@ -1171,6 +1335,8 @@ sub ap_transactions {
     my $row = { };
 
     foreach my $column (@columns) {
+      next if ($column eq 'items');
+
       $row->{$column} = {
         'data'  => $ap->{$column},
         'align' => $column_alignment{$column},
@@ -1180,6 +1346,12 @@ sub ap_transactions {
     $row->{invnumber}->{link} = build_std_url("script=" . ($ap->{invoice} ? 'ir.pl' : 'ap.pl'), 'action=edit')
       . "&id=" . E($ap->{id}) . "&callback=${callback}";
 
+    if ($form->{l_items}) {
+      my $items = SL::DB::Manager::InvoiceItem->get_all_sorted(where => [id => $ap->{item_ids}]);
+      $row->{items}->{raw_data}  = SL::Presenter::ItemsList::items_list($items)               if lc($report->{options}->{output_format}) eq 'html';
+      $row->{items}->{data}      = SL::Presenter::ItemsList::items_list($items, as_text => 1) if lc($report->{options}->{output_format}) ne 'html';
+    }
+
     my $row_set = [ $row ];
 
     if (($form->{l_subtotal} eq 'Y')
@@ -1298,12 +1470,34 @@ sub add_from_purchase_order {
   $::form->{"AP_amount_chart_id_$row"} = $last_used_ap_chart->id if $last_used_ap_chart;
   $::form->{rowcount}                  = $row;
 
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
   update(
     keep_rows_without_amount => 1,
     dont_add_new_row         => 1,
   );
 }
 
+sub add_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &add;
+}
+
+sub load_record_template_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &load_record_template;
+}
+
+sub edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  &edit;
+}
+
 sub setup_ap_search_action_bar {
   my %params = @_;
 
@@ -1358,14 +1552,15 @@ sub setup_ap_display_form_action_bar {
   my $may_edit_create         = $::auth->assert('ap_transactions', 1);
 
   my $has_sepa_exports;
+  my $is_sepa_blocked;
   if ($::form->{id}) {
     my $invoice = SL::DB::Manager::PurchaseInvoice->find_by(id => $::form->{id});
     $has_sepa_exports = 1 if ($invoice->find_sepa_export_items()->[0]);
+    $is_sepa_blocked  = !!$invoice->is_sepa_blocked;
   }
 
   my $is_linked_bank_transaction;
   if ($::form->{id}
-      && SL::DB::Default->get->payments_changeable != 0
       && SL::DB::Manager::BankTransactionAccTrans->find_by(ap_id => $::form->{id})) {
 
     $is_linked_bank_transaction = 1;
@@ -1374,11 +1569,24 @@ sub setup_ap_display_form_action_bar {
   if ($::form->{id} && SL::DB::Manager::ApGl->find_by(ap_id => $::form->{id})) {
     $is_linked_gl_transaction = 1;
   }
+  # add readonly state in $::form
+  $::form->{readonly} = !$may_edit_create                           ? 1
+                      : $is_closed                                  ? 1
+                      : $is_storno                                  ? 1
+                      : $has_storno                                 ? 1
+                      : ($::form->{id} && $change_never)            ? 1
+                      : ($::form->{id} && $change_on_same_day_only) ? 1
+                      : $is_linked_bank_transaction                 ? 1
+                      : $has_sepa_exports                           ? 1
+                      : 0;
+  # and is_linked_bank_transaction
+  $::form->{is_linked_bank_transaction} = $is_linked_bank_transaction;
 
   my $create_post_action = sub {
     # $_[0]: description
     # $_[1]: after_action
     action => [
+
       $_[0],
       submit   => [ '#form', { action => "post", after_action => $_[1] } ],
       checks   => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ],
@@ -1402,6 +1610,7 @@ sub setup_ap_display_form_action_bar {
   } else {
     @post_entries = ( $create_post_action->(t8('Post')) );
   }
+  push @post_entries, $create_post_action->(t8('Post and Close'), 'callback');
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
@@ -1424,6 +1633,12 @@ sub setup_ap_display_form_action_bar {
                     : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                     :                               undef,
         ],
+        action => [ $is_sepa_blocked ? t8('Unblock Bank transfer via SEPA') : t8('Block Bank transfer via SEPA'),
+          submit   => [ '#form', { action => "block_or_unblock_sepa_transfer", unblock_sepa => !!$is_sepa_blocked } ],
+          disabled => !$may_edit_create ? t8('You must not change this AP transaction.')
+                    : !$::form->{id}    ? t8('This invoice has not been posted yet.')
+                    :                     undef,
+        ],
         action => [ t8('Mark as paid'),
           submit   => [ '#form', { action => "mark_as_paid" } ],
           confirm  => t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?'),
@@ -1445,7 +1660,8 @@ sub setup_ap_display_form_action_bar {
                     : $is_storno           ? t8('Reversal invoices cannot be canceled.')
                     : $::form->{totalpaid} ? t8('Invoices with payments cannot be canceled.')
                     : $has_sepa_exports    ? t8('This invoice has been linked with a sepa export, undo this first.')
-                    : $is_linked_gl_transaction ? t8('This transaction is linked with a gl transaction. Please delete the ap transaction booking if needed.')
+                    : $is_linked_gl_transaction   ? t8('This transaction is linked with a gl transaction. Please delete the ap transaction booking if needed.')
+                    : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                     :                        undef,
         ],
         action => [ t8('Delete'),
@@ -1456,7 +1672,7 @@ sub setup_ap_display_form_action_bar {
                     : $is_closed                  ? t8('The billing period has already been locked.')
                     : $has_sepa_exports           ? t8('This invoice has been linked with a sepa export, undo this first.')
                     : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
-                    : $is_linked_gl_transaction   ? undef # linked transactions can be deleted, if period is not closed
+                    # : $is_linked_gl_transaction   ? undef # linked transactions can be deleted, if period is not closed
                     : $change_never               ? t8('Changing invoices has been disabled in the configuration.')
                     : $change_on_same_day_only    ? t8('Invoices can only be changed on the day they are posted.')
                     : $has_storno                 ? t8('This invoice has been canceled already.')
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index cf0555f90..cc8c185be 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -47,13 +47,17 @@ use SL::DB::Chart;
 use SL::DB::Currency;
 use SL::DB::Default;
 use SL::DB::Employee;
-use SL::DB::Invoice;
+use SL::DB::Manager::Invoice;
+use SL::DB::InvoiceItem;
 use SL::DB::RecordTemplate;
 use SL::DB::Tax;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
 use SL::Helper::Flash qw(flash flash_later);
 use SL::Locale::String qw(t8);
 use SL::Presenter::Tag;
 use SL::Presenter::Chart;
+use SL::Presenter::ItemsList;
 use SL::ReportGenerator;
 
 require "bin/mozilla/common.pl";
@@ -172,6 +176,8 @@ sub load_record_template {
 
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+
   update(
     keep_rows_without_amount => 1,
     dont_add_new_row         => 1,
@@ -251,18 +257,44 @@ sub add {
 
   AR->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};
+  $form->{initial_customer_id} = $form->{customer_id};
   create_links(dont_save => 1);
   $form->{transdate} = $form->{initial_transdate};
+  $form->{customer_id} = $form->{initial_customer_id} if $form->{initial_customer_id};
 
   if ($form->{customer_id}) {
     my $last_used_ar_chart = SL::DB::Customer->load_cached($form->{customer_id})->last_used_ar_chart;
     $form->{"AR_amount_chart_id_1"} = $last_used_ar_chart->id if $last_used_ar_chart;
   }
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+  }
+
   &display_form;
   $main::lxdebug->leave_sub();
 }
 
+sub add_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &add;
+}
+
+sub load_record_template_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &load_record_template;
+}
+
+sub edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  &edit;
+}
+
 sub edit {
   $main::lxdebug->enter_sub();
 
@@ -370,15 +402,11 @@ sub form_header {
   # $locale->text('Edit Accounts Receivables Transaction')
   $form->{title} = $locale->text("$title Accounts Receivables Transaction");
 
-  $readonly = ($form->{id}) ? "readonly" : "";
-
-  $form->{radier} = ($::instance_conf->get_ar_changeable == 2)
-                      ? ($form->current_date(\%myconfig) eq $form->{gldate})
-                      : ($::instance_conf->get_ar_changeable == 1);
-  $readonly = ($form->{radier}) ? "" : $readonly;
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  if ($form->{currency} ne $form->{defaultcurrency}) {
+    ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, "buy", $form->{id}, 'ar');
+  }
 
-  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy');
-  $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $rows = max 2, $form->numtextrows($form->{notes}, 50);
 
@@ -397,14 +425,23 @@ sub form_header {
 
   my %project_labels = map { $_->{id} => $_->{projectnumber} } @{ $form->{"ALL_PROJECTS"} };
 
-  my (@AR_paid_values, %AR_paid_labels);
+  my (@AR_paid_values, %AR_paid_labels, %bank_accounts);
   my $default_ar_amount_chart_id;
-
+  # don't add manual bookings for charts which are assigned to real bank accounts
+  # and are flagged for use with bank import
+  my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
+  foreach my $bank (@{ $bank_accounts }) {
+    if ($bank->use_with_bank_import) {
+      my $accno_paid_bank = $bank->chart->accno;
+      $bank_accounts{$accno_paid_bank} = 1;
+    }
+  }
   foreach my $item (@{ $form->{ALL_CHARTS} }) {
     if ($item->{link_split}{AR_amount}) {
       $default_ar_amount_chart_id //= $item->{id};
 
     } elsif ($item->{link_split}{AR_paid}) {
+      next if $bank_accounts{$item->{accno}};
       push(@AR_paid_values, $item->{accno});
       $AR_paid_labels{$item->{accno}} = "$item->{accno}--$item->{description}";
     }
@@ -413,7 +450,7 @@ sub form_header {
   my $follow_up_vc         = $form->{customer_id} ? SL::DB::Customer->load_cached($form->{customer_id})->name : '';
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
 
-  $::request->layout->add_javascripts("autocomplete_chart.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.File.js", "kivi.RecordTemplate.js", "kivi.AR.js", "kivi.CustomerVendor.js", "kivi.Validator.js");
+  $::request->layout->add_javascripts("autocomplete_chart.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.File.js", "kivi.RecordTemplate.js", "kivi.AR.js", "kivi.CustomerVendor.js", "kivi.Validator.js", "autocomplete_project.js");
   # get the correct date for tax
   my $transdate    = $::form->{transdate}    ? DateTime->from_kivitendo($::form->{transdate})    : DateTime->today_local;
   my $deliverydate = $::form->{deliverydate} ? DateTime->from_kivitendo($::form->{deliverydate}) : undef;
@@ -471,7 +508,32 @@ sub form_header {
   my $now = $form->current_date(\%myconfig);
 
   my @payments;
+
+  # reset form value of defaultcurrency_totalpaid, as it is currently a hidden and otherwise it gets accumulated after each update
+  # is only used if there are exchange rates
+  $form->{"defaultcurrency_totalpaid"} = 0;
+
   for my $i (1 .. $form->{paidaccounts}) {
+    # hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
+    if ($form->{"exchangerate_$i"} && $form->{"acc_trans_id_$i"}) {
+      # only check for bank transactions for payments that have already been saved
+      my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
+      if ($bt_acc_trans) {
+        if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
+          $form->{"exchangerate_$i"} = $bt_acc_trans->bank_transaction->exchangerate;
+          $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
+          $form->{"record_forex_$i"} = 1;
+        }
+      }
+      if (!$form->{"fx_transaction_$i"}) {
+        # this is a banktransaction that was paid in internal currency. revert paid/defaultcurrency_paid
+        $form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"};
+        $form->{"paid_$i"} /= $form->{"exchangerate_$i"};
+      }
+      $form->{"defaultcurrency_paid_$i"} //= $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+      $form->{"defaultcurrency_totalpaid"} += $form->{"defaultcurrency_paid_$i"};
+    } # end hook defaultcurrency_paid
+
     my $payment = {
       paid             => $form->{"paid_$i"},
       exchangerate     => $form->{"exchangerate_$i"} || '',
@@ -481,9 +543,13 @@ sub form_header {
       memo             => $form->{"memo_$i"},
       AR_paid          => $form->{"AR_paid_$i"},
       forex            => $form->{"forex_$i"},
+      record_forex     => $form->{"record_forex_$i"},
       datepaid         => $form->{"datepaid_$i"},
       paid_project_id  => $form->{"paid_project_id_$i"},
       gldate           => $form->{"gldate_$i"},
+      # only used if we have an fx currency
+      defaultcurrency_paid      => $form->{"defaultcurrency_paid_$i"},
+      defaultcurrency_totalpaid => $form->{"defaultcurrency_totalpaid_$i"},
     };
 
     # default account for current assets (i.e. 1801 - SKR04) if no account is selected
@@ -530,10 +596,13 @@ sub form_header {
   );
 
   setup_ar_form_header_action_bar();
+  $::form->{paid_missing} =  $form->{is_linked_bank_transaction} && $form->{invoice_obj}->forex ?
+                           $form->{invoice_obj}->open_amount
+                        :  $::form->{invtotal} - $::form->{totalpaid};
 
   $form->header;
   print $::form->parse_html_template('ar/form_header', {
-    paid_missing         => $::form->{invtotal} - $::form->{totalpaid},
+    paid_missing         => $::form->{paidmissing},
     show_exch            => ($::form->{defaultcurrency} && ($::form->{currency} ne $::form->{defaultcurrency})),
     payments             => \@payments,
     transactions         => \@transactions,
@@ -583,6 +652,7 @@ sub mark_as_paid {
 sub show_draft {
   $::form->{transdate} = DateTime->today_local->to_kivitendo if !$::form->{transdate};
   $::form->{gldate}    = $::form->{transdate} if !$::form->{gldate};
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
   update();
 }
 
@@ -772,8 +842,11 @@ sub post {
   $form->error($locale->text('Zero amount posting!'))
     unless grep $_*1, map $form->parse_amount(\%myconfig, $form->{"amount_$_"}), 1..$form->{rowcount};
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency}));
+  if ($form->{defaultcurrency} && ($form->{currency} ne $form->{defaultcurrency})) {
+    $form->isblank("exchangerate", $locale->text('Exchangerate missing!'));
+    $form->error($locale->text('Cannot post invoice with negative exchange rate'))
+      unless ($form->parse_amount(\%myconfig, $form->{"exchangerate"}) > 0);
+  }
 
   delete($form->{AR});
 
@@ -807,7 +880,6 @@ sub post {
   $form->{AR}{receivables} = $form->{ARselected};
   $form->{storno}          = 0;
 
-  $form->{id} = 0 if $form->{postasnew};
   $form->error($locale->text('Cannot post transaction!')) unless AR->post_transaction(\%myconfig, \%$form);
 
   # saving the history
@@ -819,6 +891,14 @@ sub post {
   }
   # /saving the history
 
+  if ($form->{email_journal_id} && $form->{id} ne "") {
+    my $ar_transaction = SL::DB::Invoice->new(id => $form->{id})->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment($ar_transaction, delete $::form->{email_attachment_id});
+  }
+
   if (!$inline) {
     my $msg = $locale->text("AR transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id});
     if ($::instance_conf->get_ar_add_doc && $::instance_conf->get_doc_storage) {
@@ -835,24 +915,21 @@ sub post {
   $main::lxdebug->leave_sub();
 }
 
-sub post_as_new {
+sub post_and_close {
   $main::lxdebug->enter_sub();
-
   $main::auth->assert('ar_transactions');
+  my $locale = $main::locale;
+  my $form   = $::form;
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+  # inline post
+  post(1);
 
-  $form->{postasnew} = 1;
-  # saving the history
-  if(!exists $form->{addition} && $form->{id} ne "") {
-    $form->{snumbers}  = qq|invnumber_| . $form->{invnumber};
-    $form->{what_done} = "invoice";
-    $form->{addition}  = "POSTED AS NEW";
-    $form->save_history;
-  }
-  # /saving the history
-  &post;
+  my $callback = $form->{callback}
+    || "controller.pl?action=LoginScreen/user_login";
+    my $msg = $locale->text("AR transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id});
+  SL::Helper::Flash::flash_later('info', $msg);
+  print $form->redirect_header($callback);
+  $::dispatcher->end_request;
 
   $main::lxdebug->leave_sub();
 }
@@ -865,6 +942,10 @@ sub use_as_new {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
   map { delete $form->{$_} } qw(printed emailed queued invnumber deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
   $form->{paidaccounts} = 1;
   $form->{rowcount}--;
@@ -878,6 +959,8 @@ sub use_as_new {
     $form->{duedate}  = $payment_terms->calc_date(reference_date => $today)->to_kivitendo if $payment_terms;
   }
 
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+
   &update;
 
   $main::lxdebug->leave_sub();
@@ -924,6 +1007,10 @@ sub setup_ar_transactions_action_bar {
   my %params          = @_;
   my $may_edit_create = $::auth->assert('invoice_edit', 1);
 
+  my $webdav_enabled = SL::DB::Default->get->webdav
+                       && SL::DB::Default->get->webdav_documents;
+  my $files_enabled  = SL::DB::Default->get->doc_storage;
+
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
@@ -933,7 +1020,23 @@ sub setup_ar_transactions_action_bar {
                   : !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.')
                   :                      undef,
       ],
-
+      combobox => [
+        action => [ $::locale->text('PDF-Export') ],
+        action => [
+          t8('WebDAV'),
+          submit   => [ '#report_form', { action => 'Invoice/webdav_pdf_export' } ],
+          checks   => [ ['kivi.check_if_entries_selected', '[name="id[]"]'] ],
+          disabled => !$webdav_enabled ? t8('WebDAV is not enabled.')
+                                       : undef,
+        ],
+        action => [
+          t8('Documents'),
+          submit   => [ '#report_form', { action => 'Invoice/files_pdf_export' } ],
+          checks   => [ ['kivi.check_if_entries_selected', '[name="id[]"]'] ],
+          disabled => !$files_enabled ? t8('No File Management enabled.')
+                                      : undef,
+        ],
+      ],
       combobox => [
         action => [ $::locale->text('Create new') ],
         action => [
@@ -961,10 +1064,11 @@ sub search {
 
   $form->{title} = $locale->text('Invoices, Credit Notes & AR Transactions');
 
-  $form->{ALL_EMPLOYEES}      = SL::DB::Manager::Employee  ->get_all_sorted(query => [ deleted => 0 ]);
-  $form->{ALL_DEPARTMENTS}    = SL::DB::Manager::Department->get_all_sorted;
-  $form->{ALL_BUSINESS_TYPES} = SL::DB::Manager::Business  ->get_all_sorted;
-  $form->{ALL_TAXZONES}       = SL::DB::Manager::TaxZone   ->get_all_sorted;
+  $form->{ALL_EMPLOYEES}      = SL::DB::Manager::Employee   ->get_all_sorted(query => [ deleted => 0 ]);
+  $form->{ALL_DEPARTMENTS}    = SL::DB::Manager::Department ->get_all_sorted;
+  $form->{ALL_BUSINESS_TYPES} = SL::DB::Manager::Business   ->get_all_sorted;
+  $form->{ALL_TAXZONES}       = SL::DB::Manager::TaxZone    ->get_all_sorted;
+  $form->{ALL_PAYMENT_TERMS}  = SL::DB::Manager::PaymentTerm->get_all_sorted;
 
   $form->{CT_CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
   ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE},
@@ -1024,11 +1128,16 @@ sub ar_transactions {
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  @columns =
-    qw(ids transdate id type invnumber ordnumber cusordnumber donumber deliverydate name netamount tax amount paid
-       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
-       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
-       payment_terms charts customertype direct_debit dunning_description department attachments);
+  @columns = qw(
+    ids transdate id type invnumber ordnumber cusordnumber donumber
+    deliverydate name netamount tax amount paid datepaid due duedate
+    transaction_description notes salesman employee shippingpoint shipvia
+    marge_total marge_percent globalprojectnumber customernumber country
+    ustid taxzone payment_terms charts customertype direct_debit
+    dunning_description department attachments items customer_dunning_lock
+    shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
+    shiptozipcode shiptocity shiptocountry
+  );
 
   my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
   my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
@@ -1038,9 +1147,15 @@ sub ar_transactions {
   push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto
-                                           employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed
-                                           shippingpoint shipvia taxzone_id);
+  push @hidden_variables, "l_subtotal", qw(
+    open closed customer invnumber ordnumber cusordnumber
+    transaction_description notes project_id transdatefrom transdateto
+    duedatefrom duedateto datepaidfrom datepaidto employee_id salesman_id
+    business_id parts_partnumber parts_description department_id
+    show_marked_as_closed show_not_mailed shippingpoint shipvia taxzone_id
+    payment_id shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
+    shiptozipcode shiptocity shiptocountry
+  );
   push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
 
   $href =  $params{want_binary_pdf} ? '' : build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
@@ -1083,6 +1198,15 @@ sub ar_transactions {
     'department'              => { 'text' => $locale->text('Department'), },
     dunning_description       => { 'text' => $locale->text('Dunning level'), },
     attachments               => { 'text' => $locale->text('Attachments'), },
+    items                     => { 'text' => $locale->text('Positions'), },
+    customer_dunning_lock     => { 'text' => $locale->text('Dunning lock'), },
+    shiptoname                => { 'text' => $locale->text('Name (Shipping)'), },
+    shiptodepartment_1        => { 'text' => $locale->text('Department 1 (Shipping)'), },
+    shiptodepartment_2        => { 'text' => $locale->text('Department 2 (Shipping)'), },
+    shiptostreet              => { 'text' => $locale->text('Street (Shipping)'), },
+    shiptozipcode             => { 'text' => $locale->text('Zipcode (Shipping)'), },
+    shiptocity                => { 'text' => $locale->text('City (Shipping)'), },
+    shiptocountry             => { 'text' => $locale->text('Country (Shipping)'), },
     %column_defs_cvars,
   );
 
@@ -1138,6 +1262,10 @@ sub ar_transactions {
   if ($form->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }
+  if ($form->{payment_id}) {
+    my $payment_term = SL::DB::Manager::PaymentTerm->find_by( id => $form->{payment_id} );
+    push @options, $locale->text('Payment Term') . " : " . $payment_term->description;
+  }
   if ($form->{parts_partnumber}) {
     push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
   }
@@ -1150,6 +1278,18 @@ sub ar_transactions {
   if ($form->{transdateto}) {
     push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
   }
+  if ($form->{duedatefrom}) {
+    push @options, $locale->text('Due Date') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{duedatefrom}, 1);
+  }
+  if ($form->{duedateto}) {
+    push @options, $locale->text('Due Date') . " " . $locale->text('to') . " " . $locale->date(\%myconfig, $form->{duedateto}, 1);
+  }
+  if ($form->{datepaidfrom}) {
+    push @options, $locale->text('Date Paid') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{datepaidfrom}, 1);
+  }
+  if ($form->{datepaidto}) {
+    push @options, $locale->text('Date Paid') . " " . $locale->text('to') . " " . $locale->date(\%myconfig, $form->{datepaidto}, 1);
+  }
   if ($form->{open}) {
     push @options, $locale->text('Open');
   }
@@ -1170,7 +1310,27 @@ sub ar_transactions {
   if ($form->{shippingpoint}) {
     push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}";
   }
-
+  if ($form->{shiptoname}) {
+    push @options, $locale->text('Name (Shipping)') . " : $form->{shiptoname}";
+  }
+  if ($form->{shiptodepartment_1}) {
+    push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}";
+  }
+  if ($form->{shiptodepartment_2}) {
+    push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}";
+  }
+  if ($form->{shiptostreet}) {
+    push @options, $locale->text('Street (Shipping)') . " : $form->{shiptostreet}";
+  }
+  if ($form->{shiptozipcode}) {
+    push @options, $locale->text('Zipcode (Shipping)') . " : $form->{shiptozipcode}";
+  }
+  if ($form->{shiptocity}) {
+    push @options, $locale->text('City (Shipping)') . " : $form->{shiptocity}";
+  }
+  if ($form->{shiptocountry}) {
+    push @options, $locale->text('Country (Shipping)') . " : $form->{shiptocountry}";
+  }
 
   $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
 
@@ -1239,6 +1399,8 @@ sub ar_transactions {
     my $row = { };
 
     foreach my $column (@columns) {
+      next if ($column eq 'items');
+
       $row->{$column} = {
         'data'  => $ar->{$column},
         'align' => $column_alignment{$column},
@@ -1268,6 +1430,12 @@ sub ar_transactions {
 
     }
 
+    if ($form->{l_items}) {
+      my $items = SL::DB::Manager::InvoiceItem->get_all_sorted(where => [id => $ar->{item_ids}]);
+      $row->{items}->{raw_data}  = SL::Presenter::ItemsList::items_list($items)               if lc($report->{options}->{output_format}) eq 'html';
+      $row->{items}->{data}      = SL::Presenter::ItemsList::items_list($items, as_text => 1) if lc($report->{options}->{output_format}) ne 'html';
+    }
+
     my $row_set = [ $row ];
 
     if (($form->{l_subtotal} eq 'Y')
@@ -1342,11 +1510,21 @@ sub setup_ar_form_header_action_bar {
 
   my $is_linked_bank_transaction;
   if ($::form->{id}
-      && SL::DB::Default->get->payments_changeable != 0
       && SL::DB::Manager::BankTransactionAccTrans->find_by(ar_id => $::form->{id})) {
 
     $is_linked_bank_transaction = 1;
   }
+  # add readonly state in $::form
+  $::form->{readonly} = !$may_edit_create                           ? 1
+                      : $is_closed                                  ? 1
+                      : $is_storno                                  ? 1
+                      : $has_storno                                 ? 1
+                      : ($::form->{id} && $change_never)            ? 1
+                      : ($::form->{id} && $change_on_same_day_only) ? 1
+                      : $is_linked_bank_transaction                 ? 1
+                      : 0;
+  # and is_linked_bank_transaction
+  $::form->{is_linked_bank_transaction} = $is_linked_bank_transaction;
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
@@ -1371,6 +1549,18 @@ sub setup_ar_form_header_action_bar {
                     : $is_linked_bank_transaction                 ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                     :                                               undef,
         ],
+        action => [
+          t8('Post and Close'),
+          submit   => [ '#form', { action => "post_and_close" } ],
+          checks   => [ 'kivi.validate_form', 'kivi.AR.check_fields_before_posting' ],
+          disabled => !$may_edit_create                           ? t8('You must not change this AR transaction.')
+                    : $is_closed                                  ? t8('The billing period has already been locked.')
+                    : $is_storno                                  ? t8('A canceled invoice cannot be posted.')
+                    : ($::form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
+                    : ($::form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+                    : $is_linked_bank_transaction                 ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+                    :                                               undef,
+        ],
         action => [
           t8('Post Payment'),
           submit   => [ '#form', { action => "post_payment" } ],
diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 9b77e5766..598eeeafc 100644
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -129,6 +129,7 @@ sub form_header {
 
   setup_cp_form_action_bar(can_post => !!$form->{rowcount});
 
+  $form->{title} = t8('Receipt');
   $form->header;
 
   $arap = lc $form->{ARAP};
@@ -235,7 +236,8 @@ sub update {
   if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
     $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
   }
-  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell);
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{datepaid}, $buysell)
+    if $form->{defaultcurrency} ne $form->{currency} && $form->{datepaid};
   $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $amount = $form->{amount} = $form->parse_amount(\%myconfig, $form->{amount});
diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 0a62ab538..92ab4f5cc 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -55,6 +55,8 @@ use SL::Request qw(flatten);
 use SL::DB::Business;
 use SL::DB::Default;
 use SL::DB::DeliveryTerm;
+use SL::DB::Manager::PaymentTerm;
+use SL::DB::Manager::TaxZone;
 use SL::ReportGenerator;
 use SL::Locale::String qw(t8);
 use SL::MoreCommon qw(uri_encode);
@@ -81,8 +83,13 @@ sub search {
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
+  $::auth->assert('customer_report_view') if  $form->{IS_CUSTOMER};
+  $::auth->assert('vendor_report_view')   if !$form->{IS_CUSTOMER};
+
   $form->get_lists("business_types" => "ALL_BUSINESS_TYPES",
                    "salesmen"       => "ALL_SALESMEN");
+  $form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted;
+  $form->{ALL_TAXZONES}      = SL::DB::Manager::TaxZone    ->get_all_sorted;
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
@@ -106,6 +113,8 @@ sub search {
 sub search_contact {
   $::lxdebug->enter_sub;
 
+  $::auth->assert('contact_person_report_view');
+
   $::form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'Contacts');
   ($::form->{CUSTOM_VARIABLES_FILTER_CODE},
    $::form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables'    => $::form->{CUSTOM_VARIABLES},
@@ -148,6 +157,8 @@ sub list_names {
   my $zugferd_filter        = $form->{create_zugferd_invoices} eq '' ? undef : $zugferd_settings_list[$form->{create_zugferd_invoices} + 1]->[1];
 
   push @options, $locale->text('Name')                               . " : $form->{name}"                  if $form->{name};
+  push @options, $locale->text('Department') . ' 1'                  . " : $form->{department_1}"          if $form->{department_1};
+  push @options, $locale->text('Department') . ' 2'                  . " : $form->{department_2}"          if $form->{department_2};
   push @options, $locale->text('Contact')                            . " : $form->{contact}"               if $form->{contact};
   push @options, $locale->text('Number')                           . qq| : $form->{"$form->{db}number"}|   if $form->{"$form->{db}number"};
   push @options, $locale->text('E-mail')                             . " : $form->{email}"                 if $form->{email};
@@ -160,6 +171,7 @@ sub list_names {
   push @options, $locale->text('Billing/shipping address (GLN)')     . " : $form->{addr_gln}"              if $form->{addr_gln};
   push @options, $locale->text('Quick Search')                       . " : $form->{all}"                   if $form->{all};
   push @options, $locale->text('Factur-X/ZUGFeRD settings')          . " : $zugferd_filter"                if $zugferd_filter;
+  push @options, $locale->text('Dunning lock')                       . " : $form->{dunning_lock}"          if $form->{dunning_lock} ne '';
 
   if ($form->{business_id}) {
     my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id});
@@ -175,6 +187,20 @@ sub list_names {
     }
   }
 
+  if ($form->{payment_id}) {
+    my $payment = SL::DB::Manager::PaymentTerm->find_by(id => $form->{payment_id});
+    if ($payment) {
+      push @options, $locale->text('Payment Term') . " : " . $payment->description;
+    }
+  }
+
+  if ($form->{taxzone_id}) {
+    my $tax_zone = SL::DB::Manager::TaxZone->find_by(id => $form->{taxzone_id});
+    if ($tax_zone) {
+      push @options, $locale->text('Tax rate') . " : " . $tax_zone->description;
+    }
+  }
+
   if ( $form->{insertdatefrom} or $form->{insertdateto} ) {
     push @options, $locale->text('Insert Date');
     push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if $form->{insertdatefrom};
@@ -185,9 +211,9 @@ sub list_names {
     'id',        'name',    "$form->{db}number",   'contact', 'main_contact_person',
     'department_1',         'department_2',        'phone',   'discount',
     'fax',       'email',   'taxnumber',           'street',    'zipcode' , 'city',
-    'business',  'payment', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
+    'business',  'payment', 'taxzone', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
     'country',   'gln',     'insertdate',           'pricegroup', 'contact_origin', 'invoice_mail',
-    'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail'
+    'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail', 'dunning_lock'
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -221,6 +247,7 @@ sub list_names {
     'salesman'          => { 'text' => $locale->text('Salesman'), },
     'discount'          => { 'text' => $locale->text('Discount'), },
     'payment'           => { 'text' => $locale->text('Payment Terms'), },
+    'taxzone'           => { 'text' => $locale->text('Tax rate'), },
     'insertdate'        => { 'text' => $locale->text('Insert Date'), },
     'pricegroup'        => { 'text' => $locale->text('Pricegroup'), },
     'invoice_mail'      => { 'text' => $locale->text('Email of the invoice recipient'), },
@@ -230,6 +257,7 @@ sub list_names {
     'ustid'             => { 'text' => $locale->text('VAT ID'), },
     'commercial_court'  => { 'text' => $locale->text('Commercial court'), },
     create_zugferd_invoices => { text => $locale->text('Factur-X/ZUGFeRD settings'), },
+    'dunning_lock'      => { 'text' => $locale->text('Dunning lock'), },
     %column_defs_cvars,
   );
 
@@ -238,7 +266,7 @@ sub list_names {
   my @hidden_variables  = ( qw(
       db status obsolete name contact email cp_name addr_street addr_zipcode
       addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all
-      all_phonenumbers
+      all_phonenumbers dunning_lock department_1 department_2 payment_id taxzone_id
     ), "$form->{db}number",
     map({ "cvar_$_->{name}" } @searchable_custom_variables),
     map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
@@ -309,12 +337,7 @@ sub list_names {
       $row->{email}->{link} = 'mailto:' . E($ref->{email});
     }
 
-    my $base_url              = build_std_url("script=$ref->{module}.pl", 'action=edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault);
-    if ($::instance_conf->get_feature_experimental_order) {
-      if ('oe' eq $ref->{module}) {
-        $base_url             = build_std_url("script=controller.pl", 'action=Order/edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault);
-      }
-    }
+    my $base_url              = build_std_url("script=controller.pl", 'action=Order/edit', 'id=' . E($ref->{invid}), 'callback', @hidden_nondefault);
 
     $row->{invnumber}->{link} = $base_url;
     $row->{ordnumber}->{link} = $base_url . "&type=${ordertype}";
diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 79097022e..4975eb1ef 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -51,7 +51,7 @@ sub export {
   my $stamm = SL::DATEV->new->get_datev_stamm;
 
   setup_datev_export_action_bar();
-
+  $::form->{title} = t8('DATEV - Export Assistent');
   $::form->header;
   print $::form->parse_html_template('datev/export', $stamm);
 
@@ -74,8 +74,9 @@ sub export_bewegungsdaten {
   setup_datev_export2_action_bar();
 
   $::form->header;
-  $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
-  $::form->{show_pk_option}  = SL::DATEV->new->check_vcnumbers_are_valid_pk_numbers;
+  $::form->{ALL_DEPARTMENTS}        = SL::DB::Manager::Department->get_all_sorted;
+  $::form->{show_pk_option}         = SL::DATEV->new->check_vcnumbers_are_valid_pk_numbers;
+  $::form->{show_documents_option}  = SL::DATEV->new->check_document_export;
 
   # check if we have mismatching number length domains
   SL::DATEV->new->check_valid_length_of_accounts;
@@ -98,10 +99,14 @@ sub export3 {
     $::form->{zeitraum}, $::form->{monat}, $::form->{quartal},
     $::form->{transdatefrom}, $::form->{transdateto},
   );
-  $data{use_pk} = $::form->{use_pk};
-  $data{locked} = $::form->{locked};
-  $data{imported} = $::form->{imported};
+  $data{use_pk}    = $::form->{use_pk};
+  $data{locked}    = $::form->{locked};
+  $data{imported}  = $::form->{imported};
+  $data{documents} = $::form->{documents};
 
+  if ($data{documents} && !SL::DATEV->new->check_all_bookings_have_documents(from => $data{from}, to => $data{to})) {
+    $::form->error(t8("Cannot export with documents because some transactions don't have a PDF document attached."));
+  }
   my $datev = SL::DATEV->new(%data);
 
   $datev->clean_temporary_directories;
diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 419b4f4bd..1db9196cb 100644
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -41,6 +41,7 @@ use SL::IS;
 use SL::DN;
 use SL::DB::Department;
 use SL::DB::Dunning;
+use SL::DB::Manager::PaymentTerm;
 use SL::File;
 use SL::Helper::Flash qw(flash);
 use SL::Locale::String qw(t8);
@@ -111,6 +112,7 @@ sub add {
   DN->get_config(\%myconfig, \%$form);
 
   $form->get_lists("departments" => "ALL_DEPARTMENTS");
+  $::form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted;
 
   $form->{SHOW_DUNNING_LEVEL_SELECTION} = $form->{DUNNING}         && scalar @{ $form->{DUNNING} };
   $form->{SHOW_DEPARTMENT_SELECTION}    = $form->{ALL_DEPARTMENTS} && scalar @{ $form->{ALL_DEPARTMENTS} || [] };
@@ -319,7 +321,7 @@ sub set_email {
   $form->{"title"} = $locale->text("Set eMail text");
   $form->header(
     no_layout       => 1,
-    use_javascripts => [ qw(ckeditor/ckeditor ckeditor/adapters/jquery) ],
+    use_javascripts => [ qw(ckeditor5/ckeditor ckeditor5/translations/de) ],
   );
   print($form->parse_html_template("dunning/set_email"));
 
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index e0b4dbc54..8c7578fb9 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -38,12 +38,15 @@ use POSIX qw(strftime);
 
 use SL::Controller::DeliveryOrder;
 use SL::DB::DeliveryOrder;
+use SL::DB::DeliveryOrderItem;
 use SL::DB::DeliveryOrder::TypeData qw(:types validate_type);
+use SL::DB::ValidityToken;
 use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::DO;
 use SL::IR;
 use SL::IS;
 use SL::MoreCommon qw(ary_diff restore_form save_form);
+use SL::Presenter::ItemsList;
 use SL::ReportGenerator;
 use SL::WH;
 use SL::YAML;
@@ -52,6 +55,8 @@ require "bin/mozilla/common.pl";
 require "bin/mozilla/io.pl";
 require "bin/mozilla/reportgenerator.pl";
 
+use SL::Helper::Flash qw(flash flash_later render_flash);
+
 use strict;
 
 1;
@@ -111,6 +116,10 @@ sub add {
   $form->{show_details} = $::myconfig{show_form_details};
   $form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE())->token;
+  }
+
   order_links(is_new => 1);
   prepare_order();
   display_form();
@@ -118,6 +127,20 @@ sub add {
   $main::lxdebug->leave_sub();
 }
 
+sub add_from_reclamation {
+
+  require SL::DB::Reclamation;
+  my $reclamation = SL::DB::Reclamation->new(id => $::form->{from_id})->load;
+  my ($delivery_order, $error) = $reclamation->convert_to_delivery_order();
+  if($error) {
+    croak("Error while converting: " . $error);
+  }
+
+  # edit new saved delivery order
+  $::form->{id} = $delivery_order->id;
+  edit();
+}
+
 sub edit {
   $main::lxdebug->enter_sub();
 
@@ -366,14 +389,22 @@ sub setup_do_action_bar {
 
       'separator',
 
-      action => [
-        t8('Invoice'),
-        submit => [ '#form', { action => "invoice" } ],
-        disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
-        confirm  => $::form->{delivered}                                                                         ? undef
-                  : ($::form->{vc} eq 'customer' && $::instance_conf->get_sales_delivery_order_check_stocked)    ? t8('This record has not been stocked out. Proceed?')
-                  : ($::form->{vc} eq 'vendor'   && $::instance_conf->get_purchase_delivery_order_check_stocked) ? t8('This record has not been stocked in. Proceed?')
-                  :                                                                                                undef,
+      combobox => [
+        action => [ t8('Workflow') ],
+        action => [
+          t8('Invoice'),
+          submit => [ '#form', { action => "invoice" } ],
+          disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+          confirm  => $::form->{delivered}                                                                         ? undef
+                    : ($::form->{vc} eq 'customer' && $::instance_conf->get_sales_delivery_order_check_stocked)    ? t8('This record has not been stocked out. Proceed?')
+                    : ($::form->{vc} eq 'vendor'   && $::instance_conf->get_purchase_delivery_order_check_stocked) ? t8('This record has not been stocked in. Proceed?')
+                    :                                                                                                undef,
+        ],
+        action => [
+          t8('Save and Reclamation'),
+          submit => [ '#form', { action => "save_and_reclamation" } ],
+          disabled => !$::form->{id} ? t8('This record has not been saved yet.') : undef,
+        ],
       ],
 
       combobox => [
@@ -491,10 +522,11 @@ sub form_header {
     ]);
 
   $::form->{ALL_PROJECTS}          = SL::DB::Manager::Project->get_all_sorted(query => \@conditions);
+  $::form->{ALL_DELIVERY_TERMS}    = SL::DB::Manager::DeliveryTerm->get_valid($::form->{delivery_term_id});
   $::form->{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
   $::form->{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
   $::form->{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all_sorted(query => [
-    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+    or => [ and => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, module => 'CT' ], and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
   ]);
   $::form->{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all_sorted(query => [
     or => [
@@ -520,7 +552,7 @@ sub form_header {
   $form->{follow_up_trans_info} = $form->{donumber} .'('. $form->{VC_OBJ}->name .')' if $form->{VC_OBJ};
   $form->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
 
-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.File kivi.MassDeliveryOrderPrint kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor/ckeditor ckeditor/adapters/jquery kivi.io));
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.File kivi.MassDeliveryOrderPrint kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor5/ckeditor ckeditor5/translations/de kivi.io));
 
   setup_do_action_bar();
 
@@ -550,7 +582,6 @@ sub form_footer {
   my $form     = $main::form;
 
   $form->{PRINT_OPTIONS}      = setup_sales_purchase_print_options();
-  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
   my $shipto_cvars       = SL::DB::Shipto->new->cvars_by_config;
   foreach my $var (@{ $shipto_cvars }) {
@@ -747,12 +778,14 @@ sub orders {
   my @columns = qw(
     ids                     transdate               reqdate
     id                      donumber
-    ordnumber               customernumber          cusordnumber
+    ordnumber               order_confirmation_number
+    customernumber          vendor_confirmation_number
+    cusordnumber
     name                    employee  salesman
     shipvia                 globalprojectnumber
     transaction_description department
     open                    delivered
-    insertdate
+    insertdate              items
   );
 
   $form->{l_open}      = $form->{l_closed} = "Y" if ($form->{open}      && $form->{closed});
@@ -760,7 +793,7 @@ sub orders {
 
   $form->{title}       = $locale->text('Delivery Orders');
 
-  my $attachment_basename = $form->{vc} eq 'vendor' ? $locale->text('purchase_delivery_order_list') : $locale->text('sales_delivery_order_list');
+  my $attachment_basename = SL::DB::DeliveryOrder::TypeData::get3($form->{type}, "text", "attachment");
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
@@ -768,7 +801,8 @@ sub orders {
   push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
                                           transaction_description transdatefrom transdateto reqdatefrom reqdateto
                                           type vc employee_id salesman_id project_id parts_partnumber parts_description
-                                          insertdatefrom insertdateto business_id all department_id);
+                                          insertdatefrom insertdateto business_id all department_id chargenumber full_text
+                                          vendor_confirmation_number order_confirmation_number ids top_info_text);
 
   my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
 
@@ -791,9 +825,12 @@ sub orders {
     'delivered'               => { 'text' => $locale->text('Delivered'), },
     'department'              => { 'text' => $locale->text('Department'), },
     'insertdate'              => { 'text' => $locale->text('Insert Date'), },
+    'items'                   => { 'text' => $locale->text('Positions'), },
+    'vendor_confirmation_number' => { 'text' => $locale->text('Vendor Confirmation Number'), },
+    'order_confirmation_number'  => { 'text' => $locale->text('Order Confirmation Number'), },
   );
 
-  foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department insertdate)) {
+  foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department insertdate vendor_confirmation_number)) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
@@ -829,6 +866,12 @@ sub orders {
   if ($form->{ordnumber}) {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }
+  if ($form->{order_confirmation_number}) {
+    push @options, $locale->text('Order Confirmation Number') . " : $form->{order_confirmation_number}";
+  }
+  if ($form->{vendor_confirmation_number}) {
+    push @options, $locale->text('Vendor Confirmation Number') . " : $form->{vendor_confirmation_number}";
+  }
   push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};
   if ($form->{business_id}) {
     my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');
@@ -837,12 +880,18 @@ sub orders {
   if ($form->{transaction_description}) {
     push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
   }
+  if ($form->{fulltext}) {
+    push @options, $locale->text('Full Text') . " : $form->{fulltext}";
+  }
   if ($form->{parts_description}) {
     push @options, $locale->text('Part Description') . " : $form->{parts_description}";
   }
   if ($form->{parts_partnumber}) {
     push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}";
   }
+  if ($form->{chargenumber}) {
+    push @options, $locale->text('Charge Number') . " : $form->{chargenumber}";
+  }
   if ( $form->{transdatefrom} or $form->{transdateto} ) {
     push @options, $locale->text('Delivery Order Date');
     push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)     if $form->{transdatefrom};
@@ -886,7 +935,7 @@ sub orders {
     },
   );
 
-  $report->set_options('top_info_text'        => join("\n", @options),
+  $report->set_options('top_info_text'        => $::form->{top_info_text} || join("\n", @options),
                        'raw_top_info_text'    => $form->parse_html_template('do/orders_top'),
                        'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom', { print_options => $print_options }),
                        'output_format'        => 'HTML',
@@ -899,13 +948,15 @@ sub orders {
   # add sort and escape callback, this one we use for the add sub
   $form->{callback} = $href .= "&sort=$form->{sort}";
 
+  # hide links to oe if no right
+  $form->{hide_oe_links} = !(   ($form->{vc} eq 'customer' && $::auth->assert('sales_order_reports_amounts',    1))
+                             || ($form->{vc} eq 'vendor'   && $::auth->assert('purchase_order_reports_amounts', 1)) );
+
   # escape callback for href
   my $callback = $form->escape($href);
 
   my $edit_url       = build_std_url('action=edit', 'type', 'vc');
-  my $edit_order_url = ($::instance_conf->get_feature_experimental_order)
-                     ? build_std_url('script=controller.pl', 'action=Order/edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'))
-                     : build_std_url('script=oe.pl',         'action=edit',       'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'));
+  my $edit_order_url = build_std_url('script=controller.pl', 'action=Order/edit', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'));
 
   my $idx            = 1;
 
@@ -913,7 +964,7 @@ sub orders {
     $dord->{open}      = $dord->{closed}    ? $locale->text('No')  : $locale->text('Yes');
     $dord->{delivered} = $dord->{delivered} ? $locale->text('Yes') : $locale->text('No');
 
-    my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns };
+    my $row = { map { $_ => { 'data' => $dord->{$_} } } grep {$_ ne 'items' || $_ ne 'order_confirmation_numbers'} @columns };
 
     my $ord_id = $dord->{id};
     $row->{ids}  = {
@@ -922,11 +973,27 @@ sub orders {
       'valign'   => 'center',
       'align'    => 'center',
     };
+    $row->{donumber}->{link}  = SL::Controller::DeliveryOrder->url_for(action => "edit", id => $dord->{id}, type => $dord->{record_type}, callback => $form->{callback});
+
+    if (!$form->{hide_oe_links}) {
+      $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}" if $dord->{oe_id};
+    }
+
+    foreach my $order_confirmation (@{ $dord->{order_confirmation_numbers} }) {
+      if (lc($report->{options}->{output_format}) eq 'html') {
+        $row->{order_confirmation_number}->{raw_data} .= SL::Presenter::Tag::link_tag(build_std_url('script=controller.pl', 'action=Order/edit', 'id=' . $order_confirmation->{id}, 'type=' . 'purchase_order_confirmation'), $order_confirmation->{number} . '<br>');
+      } elsif (lc($report->{options}->{output_format}) ne 'html') {
+        my $sep = $row->{order_confirmation_number}->{data} ? ' ' : '';
+        $row->{order_confirmation_number}->{data}     .= $sep . $order_confirmation->{number};
+      }
+    }
+
+    if ($form->{l_items}) {
+      my $items = SL::DB::Manager::DeliveryOrderItem->get_all_sorted(where => [id => $dord->{item_ids}]);
+      $row->{items}->{raw_data}  = SL::Presenter::ItemsList::items_list($items)               if lc($report->{options}->{output_format}) eq 'html';
+      $row->{items}->{data}      = SL::Presenter::ItemsList::items_list($items, as_text => 1) if lc($report->{options}->{output_format}) ne 'html';
+    }
 
-    $row->{donumber}->{link}  = SL::DB::DeliveryOrder::TypeData::get3($dord->{order_type}, "show_menu", "new_controller")
-                              ? SL::Controller::DeliveryOrder->url_for(action => "edit", id => $dord->{id}, type => $dord->{order_type})
-                              : $edit_url  . "&id=" . E($dord->{id})      . "&callback=${callback}";
-    $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}" if $dord->{oe_id};
     $report->add_data($row);
 
     $idx++;
@@ -969,11 +1036,19 @@ sub save {
   validate_items();
 
   # check for serial number if part needs one
+  my $missing_serialnr = '';
   for my $i (1 .. $form->{rowcount} - 1) {
-    next unless $form->{"has_sernumber_$i"};
-    $form->isblank("serialnumber_$i",
-                   $locale->text('Serial Number missing in Row') . " $i");
+    next if !$form->{"has_sernumber_$i"} || $form->{"serialnumber_$i"} ne '';
+    $missing_serialnr .= $missing_serialnr ? ", $i" : " $i";
   }
+  if ($missing_serialnr ne '') {
+    flash('error', $locale->text('Serial Number missing in Row') . $missing_serialnr);
+    render_flash();
+    &update;
+    $::dispatcher->end_request;
+    return;
+  }
+
   # if the name changed get new values
   my $vc = $form->{vc};
   if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
@@ -990,7 +1065,11 @@ sub save {
     $::dispatcher->end_request;
   }
 
-  $form->{id} = 0 if $form->{saveasnew};
+  if ($form->{saveasnew}) {
+    $form->{id}                  = 0;
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_DELIVERY_ORDER_SAVE())->token;
+  }
+
   # we rely on converted_from_orderitems, if the workflow is used
   # be sure that at least one position is linked to the original orderitem
   if ($form->{convert_from_oe_ids}) {
@@ -1006,6 +1085,7 @@ sub save {
     }
   }
   DO->save();
+
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|donumber_| . $form->{donumber};
@@ -1081,6 +1161,20 @@ sub delete_transfers {
   $main::lxdebug->leave_sub();
 }
 
+sub invoice_from_delivery_order_controller {
+  $main::lxdebug->enter_sub();
+  my $form     = $main::form;
+
+  my $from_id = delete $form->{from_id};
+  my $delivery_order = SL::DB::DeliveryOrder->new(id => $from_id)->load;
+
+  $delivery_order->flatten_to_form($form, format_amounts => 1);
+  $form->{rowcount}++;
+
+  &invoice;
+  $main::lxdebug->leave_sub();
+}
+
 sub invoice {
   $main::lxdebug->enter_sub();
 
@@ -1113,12 +1207,14 @@ sub invoice {
     $form->{script} = 'ir.pl';
     $script         = "ir";
     $buysell        = 'sell';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
 
   } else {
     $form->{title}  = $locale->text('Add Sales Invoice');
     $form->{script} = 'is.pl';
     $script         = "is";
     $buysell        = 'buy';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
   }
 
   for my $i (1 .. $form->{rowcount}) {
@@ -1247,12 +1343,14 @@ sub invoice_multi {
     $form->{script} = 'ir.pl';
     $script         = "ir";
     $buysell        = 'sell';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
 
   } else {
     $form->{title}  = $locale->text('Add Sales Invoice');
     $form->{script} = 'is.pl';
     $script         = "is";
     $buysell        = 'buy';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
   }
 
   map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
@@ -1303,6 +1401,26 @@ sub invoice_multi {
   $main::lxdebug->leave_sub();
 }
 
+sub save_and_reclamation {
+  my $form     = $main::form;
+  my $id       = $form->{id};
+  my $type     = $form->{type};
+
+  # save the delivery order
+  save(no_redirect => 1);
+
+  my $to_reclamation_type =
+    $type eq 'sales_delivery_order' ? 'sales_reclamation'
+                                    : 'purchase_reclamation';
+  $form->{callback} =
+    'controller.pl?action=Reclamation/add_from_record'
+    . '&type='      . $to_reclamation_type
+    . '&from_id='   . $form->escape($id)
+    . '&from_type=' . $form->escape($type)
+    ;
+  $form->redirect;
+}
+
 sub save_as_new {
   $main::lxdebug->enter_sub();
 
diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl
index b987d1fd7..ddfebf52b 100644
--- a/bin/mozilla/fu.pl
+++ b/bin/mozilla/fu.pl
@@ -3,6 +3,8 @@ use POSIX qw(strftime);
 use SL::FU;
 use SL::Locale::String qw(t8);
 use SL::ReportGenerator;
+use SL::DB::AuthGroup;
+use SL::DB::Employee;
 
 require "bin/mozilla/reportgenerator.pl";
 
@@ -40,7 +42,8 @@ sub add {
   _collect_links($form);
 
   $form->get_employee($form->get_standard_dbh(\%myconfig));
-  $form->{created_for_user} = $form->{employee_id};
+
+  push @{$form->{created_for_employees}}, SL::DB::Manager::Employee->current;
 
   $form->{subject} = $form->{trans_subject_1} if $form->{trans_subject_1};
 
@@ -83,6 +86,8 @@ sub edit {
     $form->{title} = $locale->text('Edit Follow-Up');
   }
 
+  $form->{created_for_employees} = SL::DB::FollowUp->new(id => $form->{id})->load->created_for_employees;
+
   display_form();
 
   $main::lxdebug->leave_sub();
@@ -95,7 +100,8 @@ sub display_form {
 
   my $form     = $main::form;
 
-  $form->get_lists("employees" => "EMPLOYEES");
+  $form->{all_employees}   = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+  $form->{all_auth_groups} = SL::DB::Manager::AuthGroup->get_all_sorted;
 
   my %params;
   $params{not_id}     = $form->{id} if ($form->{id});
@@ -107,7 +113,9 @@ sub display_form {
 
   setup_fu_display_form_action_bar() unless $::form->{POPUP_MODE};
 
-  $form->header(no_layout => $::form->{POPUP_MODE});
+  $form->header(no_layout       => $::form->{POPUP_MODE},
+                use_javascripts => [ qw(follow_up) ],
+  );
   print $form->parse_html_template('fu/add_edit');
 
   $main::lxdebug->leave_sub();
@@ -121,11 +129,11 @@ sub save_follow_up {
   my $form     = $main::form;
   my $locale   = $main::locale;
 
-  $form->isblank('created_for_user', $locale->text('You must chose a user.'));
+  $form->error(                      $locale->text('You must chose a user.'))          if !$form->{created_for_employees};
   $form->isblank('follow_up_date',   $locale->text('The follow-up date is missing.'));
   $form->isblank('subject',          $locale->text('The subject is missing.'));
 
-  my %params = (map({ $_ => $form->{$_} } qw(id subject body note_id created_for_user follow_up_date)), 'done' => 0);
+  my %params = (map({ $_ => $form->{$_} } qw(id subject body note_id created_for_employees follow_up_date)), 'done' => 0);
 
   _collect_links(\%params);
 
@@ -143,7 +151,7 @@ sub save_follow_up {
     $form->redirect();
   }
 
-  delete @{$form}{qw(id subject body created_for_user follow_up_date)};
+  delete @{$form}{qw(id subject body created_for_employees follow_up_date)};
 
   map { $form->{$_} = 1 } qw(due_only all_users not_done);
 
diff --git a/bin/mozilla/generictranslations.pl b/bin/mozilla/generictranslations.pl
index de7d924bd..7d2545a73 100644
--- a/bin/mozilla/generictranslations.pl
+++ b/bin/mozilla/generictranslations.pl
@@ -15,12 +15,18 @@ my %mail_strings = (
   salutation_general                          => t8('Salutation general'),
   salutation_punctuation_mark                 => t8('Salutation punctuation mark'),
   preset_text_sales_quotation                 => t8('Preset email text for sales quotations'),
+  preset_text_sales_order_intake              => t8('Preset email text for sales order intakes'),
   preset_text_sales_order                     => t8('Preset email text for sales orders'),
   preset_text_sales_delivery_order            => t8('Preset email text for sales delivery orders'),
   preset_text_invoice                         => t8('Preset email text for sales invoices'),
   preset_text_invoice_direct_debit            => t8('Preset email text for sales invoices with direct debit'),
+  preset_text_sales_reclamation               => t8('Preset email text for sales reclamations'),
+  preset_text_credit_note                     => t8('Preset email text for credit notes'),
   preset_text_request_quotation               => t8('Preset email text for requests (rfq)'),
+  preset_text_purchase_quotation_intake       => t8('Preset email text for purchase quotation intakes'),
   preset_text_purchase_order                  => t8('Preset email text for purchase orders'),
+  preset_text_purchase_order_confirmation     => t8('Preset email text for purchase orders confirmations'),
+  preset_text_purchase_reclamation            => t8('Preset email text for purchase reclamations'),
   preset_text_periodic_invoices_email_body    => t8('Preset email body for periodic invoices'),
   preset_text_periodic_invoices_email_subject => t8('Preset email subject for periodic invoices'),
 );
@@ -178,7 +184,7 @@ sub edit_email_strings {
   setup_generictranslations_edit_email_strings_action_bar();
 
   $form->{title} = $locale->text('Edit preset email strings');
-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(ckeditor/ckeditor ckeditor/adapters/jquery));
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(ckeditor5/ckeditor ckeditor5/translations/de));
   $form->header();
   print $form->parse_html_template('generictranslations/edit_email_strings',{ 'MAIL_STRINGS' => \%mail_strings });
 
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index faca8ce0d..2d4cbbb76 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -43,6 +43,8 @@ use SL::DB::RecordTemplate;
 use SL::DB::ReconciliationLink;
 use SL::DB::BankTransactionAccTrans;
 use SL::DB::Tax;
+use SL::DB::ValidityToken;
+use SL::DB::GLTransaction;
 use SL::FU;
 use SL::GL;
 use SL::Helper::Flash qw(flash flash_later);
@@ -148,6 +150,8 @@ sub load_record_template {
 
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_GL_TRANSACTION_POST())->token;
+
   update(
     keep_rows_without_amount => 1,
     dont_add_new_row         => 1,
@@ -240,11 +244,35 @@ sub add {
 
   $form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_GL_TRANSACTION_POST())->token;
+  }
+
   &display_form(1);
   $main::lxdebug->leave_sub();
 
 }
 
+sub add_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &add;
+}
+
+sub load_record_template_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &load_record_template;
+}
+
+sub edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  &edit;
+}
+
 sub prepare_transaction {
   $main::lxdebug->enter_sub();
 
@@ -352,6 +380,7 @@ sub search {
 
   setup_gl_search_action_bar();
 
+  $::form->{title} = t8('Journal');
   $::form->header;
   print $::form->parse_html_template('gl/search', {
     employee_label => sub { "$_[0]{id}--$_[0]{name}" },
@@ -659,6 +688,7 @@ sub generate_report {
 sub show_draft {
   $::form->{transdate} = DateTime->today_local->to_kivitendo if !$::form->{transdate};
   $::form->{gldate}    = $::form->{transdate} if !$::form->{gldate};
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_GL_TRANSACTION_POST())->token;
   update();
 }
 
@@ -1017,6 +1047,7 @@ sub setup_gl_action_bar {
   } else {
     %post_entry = $create_post_action->(t8('Post'));
   }
+  push @{$post_entry{combobox}}, $create_post_action->(t8('Post and Close'), 'callback');
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
@@ -1053,6 +1084,17 @@ sub setup_gl_action_bar {
         ],
       ], # end of combobox "Storno"
 
+      combobox => [
+        action => [ t8('Workflow') ],
+        action => [
+          t8('Use As New'),
+          submit   => [ '#form', { action => "use_as_new" } ],
+          checks   => [ 'kivi.validate_form' ],
+          disabled => !$form->{id} ? t8('This general ledger transaction has not been posted yet.')
+                    : undef,
+        ],
+      ], # end of combobox "Workflow"
+
       combobox => [
         action => [ t8('more') ],
         action => [
@@ -1456,16 +1498,25 @@ sub post {
   $form->{storno} = 0;
 
   post_transaction();
+
   if ($::instance_conf->get_webdav) {
     SL::Webdav->new(type     => 'general_ledger',
                     number   => $form->{id},
                    )->webdav_path;
   }
 
+  if ($form->{email_journal_id} && $form->{id} ne "") {
+    my $ar_transaction = SL::DB::GLTransaction->new(id => $form->{id})->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment($ar_transaction, delete $::form->{email_attachment_id});
+  }
+
   my $msg = $::locale->text("General ledger transaction '#1' posted (ID: #2)", $form->{reference}, $form->{id});
   if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
-    $form->redirect($msg);
-
+    SL::Helper::Flash::flash_later('info', $msg) if $msg;
+    print $::form->redirect_header($form->{callback});
   } elsif ('doc-tab' eq $form->{after_action}) {
     # Redirect with callback containing a fragment does not work (by now)
     # because the callback info is stored in the session an parsing the
@@ -1475,7 +1526,12 @@ sub post {
     SL::Helper::Flash::flash_later('info', $msg);
     print $form->redirect_header($add_doc_url);
     $::dispatcher->end_request;
-
+  } elsif ('callback' eq $form->{after_action}) {
+    my $callback = $form->{callback}
+      || "controller.pl?action=LoginScreen/user_login";
+    SL::Helper::Flash::flash_later('info', $msg);
+    print $form->redirect_header($callback);
+    $::dispatcher->end_request;
   } else {
     $form->{callback} = build_std_url("action=add", "show_details");
     $form->redirect($msg);
@@ -1484,19 +1540,6 @@ sub post {
   $main::lxdebug->leave_sub();
 }
 
-sub post_as_new {
-  $main::lxdebug->enter_sub();
-
-  $main::auth->assert('gl_transactions');
-
-  my $form     = $main::form;
-
-  $form->{id} = 0;
-  &add;
-  $main::lxdebug->leave_sub();
-
-}
-
 sub storno {
   $main::lxdebug->enter_sub();
 
@@ -1528,6 +1571,23 @@ sub storno {
   $main::lxdebug->leave_sub();
 }
 
+sub use_as_new {
+  $::auth->assert('gl_transactions');
+
+  $::form->{email_journal_id}    = delete $::form->{workflow_email_journal_id};
+  $::form->{email_attachment_id} = delete $::form->{workflow_email_attachment_id};
+  $::form->{callback}            = delete $::form->{workflow_email_callback};
+
+  delete $::form->{$_} for qw(id gldate tax_point deliverydate storno);
+
+  $::form->{title}     = "Add";
+  $::form->{transdate} = DateTime->today_local->to_kivitendo;
+
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_GL_TRANSACTION_POST())->token;
+
+  update();
+}
+
 sub continue {
   call_sub($main::form->{nextsub});
 }
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index f3e7fe5d4..d7bbe9dbc 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -144,7 +144,7 @@ sub top100 {
 # transdatefrom transdateto
 #
 # radio:
-#  itemstatus = active | onhand | short | obsolete | orphaned
+#  itemstatus = active | onhand | short | order_locked | obsolete | orphaned
 #  action     = continue | top100
 #
 # checkboxes:
@@ -207,6 +207,7 @@ sub generate_report {
     'bin'                => { 'text' => $locale->text('Default Bin'), },
     'make'               => { 'text' => $locale->text('Make'), },
     'model'              => { 'text' => $locale->text('Model'), },
+    'price_factor_description' => { 'text' => $locale->text('Price Factor'), },
   );
 
   $revers     = $form->{revers};
@@ -267,6 +268,7 @@ sub generate_report {
   my %optiontexts = (
     active        => $locale->text('Active'),
     obsolete      => $locale->text('Obsolete'),
+    order_locked  => $locale->text('Do not order anymore'),
     orphaned      => $locale->text('Orphaned'),
     onhand        => $locale->text('On Hand'),
     assembly_qty  => $locale->text('Assembly Item Qty'),
@@ -299,7 +301,7 @@ sub generate_report {
     l_part        => $locale->text('Parts'),
   );
 
-  my @itemstatus_keys = qw(active obsolete orphaned onhand short);
+  my @itemstatus_keys = qw(active order_locked obsolete orphaned onhand short);
   my @callback_keys   = qw(onorder ordered rfq quoted bought sold partnumber partsgroup partsgroup_id serialnumber description make model
                            drawing microfiche l_soldtotal l_deliverydate transdatefrom transdateto insertdatefrom insertdateto ean shop all
                            l_service l_assembly l_part);
@@ -391,7 +393,7 @@ sub generate_report {
 
   my @columns = qw(
     partnumber type_and_classific description notes partsgroup warehouse bin
-    make model assembly_qty onhand rop soldtotal unit listprice
+    make model assembly_qty onhand rop soldtotal unit price_factor_description listprice
     linetotallistprice sellprice linetotalsellprice lastcost assembly_lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
     transdate name serialnumber deliverydate ean projectnumber projectdescription
@@ -420,7 +422,7 @@ sub generate_report {
 
   %column_defs = (%column_defs, %column_defs_cvars, %column_defs_pricegroups);
   map { $column_defs{$_}->{visible} ||= $form->{"l_$_"} ? 1 : 0 } @columns;
-  map { $column_defs{$_}->{align}   = 'right' } qw(assembly_qty onhand sellprice listprice lastcost assembly_lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal shop), @pricegroup_columns;
+  map { $column_defs{$_}->{align}   = 'right' } qw(assembly_qty onhand sellprice listprice lastcost assembly_lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal shop price_factor_description), @pricegroup_columns;
 
   my @hidden_variables = (
     qw(l_subtotal l_linetotal searchitems itemstatus bom l_pricegroups insertdatefrom insertdateto),
@@ -436,7 +438,7 @@ sub generate_report {
 
   my $callback         = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
 
-  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate insertdate shop);
+  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate insertdate shop price_factor_description);
   my @sort_no_revers   = qw(partsgroup invnumber ordnumber quonumber name image drawing serialnumber);
 
   foreach my $col (@sort_full) {
@@ -554,16 +556,10 @@ sub generate_report {
       # | ist bestellt  | Von Kunden bestellt |  -> edit_oe_ord_link
       # | Anfrage       | Angebot             |  -> edit_oe_quo_link
 
-      my $edit_oe_ord_link = ($::instance_conf->get_feature_experimental_order)
-                           ? build_std_url("script=controller.pl", 'action=Order/edit',
-                                           'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'),        'id=' . E($ref->{trans_id}), 'callback')
-                           : build_std_url("script=oe.pl",         'action=edit',
+      my $edit_oe_ord_link = build_std_url("script=controller.pl", 'action=Order/edit',
                                            'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'),        'id=' . E($ref->{trans_id}), 'callback');
 
-      my $edit_oe_quo_link = ($::instance_conf->get_feature_experimental_order)
-                           ? build_std_url("script=controller.pl", 'action=Order/edit',
-                                           'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback')
-                           : build_std_url("script=oe.pl",         'action=edit',
+      my $edit_oe_quo_link = build_std_url("script=controller.pl", 'action=Order/edit',
                                            'type=' . E($ref->{cv} eq 'vendor' ? 'request_quotation' : 'sales_quotation'), 'id=' . E($ref->{trans_id}), 'callback');
 
       $row->{ordnumber}{link} = $edit_oe_ord_link;
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 793099ff0..355b7520b 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -54,6 +54,8 @@ use SL::IO;
 use SL::File;
 use SL::PriceSource;
 use SL::Presenter::Part;
+use SL::Presenter::Chart;
+use SL::Presenter::Tag;
 use SL::Util qw(trim);
 
 use SL::DB::AuthUser;
@@ -166,16 +168,18 @@ sub display_row {
 
   # column_index
   my @header_sort = qw(
-    runningnumber partnumber type_and_classific description ship ship_missing qty price_factor
+    runningnumber partnumber vendor_partnumber type_and_classific description ship ship_missing qty price_factor
     unit weight price_source sellprice discount linetotal
     bin stock_in_out
   );
+  # position of serialnr is used below!
   my @row2_sort   = qw(
-    serialnr projectnr reqdate subtotal marge listprice lastcost onhand
+    tax_chart tax serialnr projectnr reqdate subtotal recurring_billing_mode marge listprice lastcost onhand
+    orderer
   );
   # serialnr is important for delivery_orders
   if ($form->{type} eq 'sales_delivery_order') {
-    splice @row2_sort, 0, 1;
+    splice @row2_sort, 0, 3;
     splice @header_sort, 4, 0, "serialnr";
   }
 
@@ -201,10 +205,15 @@ sub display_row {
     stock_in_out  => { width => 10,    value => $stock_in_out_title,                   display => $is_delivery_order, },
     reqdate       => {                 value => $locale->text('Reqdate'),              display => $is_s_p_order || $is_delivery_order || $is_invoice, },
     subtotal      => {                 value => $locale->text('Subtotal'),             display => 1, },
+    recurring_billing_mode => {        value => $locale->text('Recurring billing'),    display => $form->{type} eq 'sales_order', },
     marge         => {                 value => $locale->text('Ertrag'),               display => $show_marge, },
     listprice     => {                 value => $locale->text('LP'),                   display => $show_marge, },
     lastcost      => {                 value => $locale->text('EK'),                   display => $show_marge, },
     onhand        => {                 value => $locale->text('On Hand'),              display => 1, },
+    vendor_partnumber => { width => 8, value => $locale->text('Vendor Part Number'),   display => $is_delivery_order && $is_purchase, },
+    tax_chart     => {                 value => "",                                    display => $is_purchase && $is_invoice },
+    tax           => {                 value => $locale->text('Tax'),                  display => $is_purchase && $is_invoice },
+    orderer       => { width => 10,    value => $locale->text('Orderer'),              display => 1, },
   );
   my @HEADER = map { $column_def{$_} } @header_sort;
 
@@ -311,11 +320,12 @@ sub display_row {
 
     # quick delete single row
     $column_data{runningnumber}  = q|<a onclick= "$('#partnumber_| . $i . q|').val(''); $('#update_button').click();">| .
-                                   q|<img height="10px" width="10px" src="image/cross.png" alt="| . $locale->text('Remove') . q|"></a> |;
+                                   q|<img class="icon-delete" alt="| . $locale->text('Remove') . q|"></a> |;
     $column_data{runningnumber} .= $cgi->textfield(-name => "runningnumber_$i", -id => "runningnumber_$i", -size => 5,  -value => $i);    # HuT
 
 
     $column_data{partnumber}    = $cgi->textfield(-name => "partnumber_$i",    -id => "partnumber_$i",    -size => 12, -value => $form->{"partnumber_$i"});
+    $column_data{vendor_partnumber} = $form->{"vendor_partnumber_$i"};
     $column_data{type_and_classific} = SL::Presenter::Part::type_abbreviation($form->{"part_type_$i"}).
                                        SL::Presenter::Part::classification_abbreviation($form->{"classification_id_$i"}) if $form->{"id_$i"};
     $column_data{description} = (($rows > 1) # if description is too large, use a textbox instead
@@ -395,7 +405,86 @@ sub display_row {
       $column_data{stock_in_out} =  calculate_stock_in_out($i);
     }
 
-    $column_data{serialnr}  = qq|<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">|;
+    # tax_chart and tax
+    if ($is_purchase && $is_invoice) { #only calc if used
+      my ($tax_chart_id, $chart_title, $chart_picker);
+      if ($record_item && $record_item->part && ($record_item->part->type eq 'part')) {
+        my $tax_chart_type = $form->{"tax_chart_type_$i"};
+        $tax_chart_type ||=
+          $::instance_conf->get_inventory_system eq 'periodic' ? 'expense'
+                                                               : 'inventory';
+        $tax_chart_id = $form->{"${tax_chart_type}_chart_id_$i"};
+
+        $chart_title = SL::Presenter::Tag::select_tag("tax_chart_type_$i", [
+            {value => 'expense',   title => $locale->text('Expense Account')},
+            {value => 'inventory', title => $locale->text('Inventory Account')},
+          ],
+          value_key => 'value', title_key => 'title',
+          default  => $tax_chart_type,
+          onchange => "kivi.io.update_tax_chart_picker(this.value, $i)",
+        );
+
+        $chart_picker =
+          SL::Presenter::Tag::html_tag('span',
+            SL::Presenter::Chart::chart_picker(
+              "expense_chart_id_$i", $form->{"expense_chart_id_$i"},
+              type => "AP_amount", style => "width: 150px"),
+            id => "expense_chart_span_$i",
+            style => $tax_chart_type eq 'expense' ? '' : 'display:none',
+          )
+          .
+          SL::Presenter::Tag::html_tag('span',
+            SL::Presenter::Chart::chart_picker(
+              "inventory_chart_id_$i", $form->{"inventory_chart_id_$i"},
+              type => "IC", style => "width: 150px"),
+            id => "inventory_chart_span_$i",
+            style => $tax_chart_type eq 'inventory' ? '' : 'display:none',
+          );
+      } else {
+        $tax_chart_id = $form->{"expense_chart_id_$i"};
+        $chart_title = $locale->text('Expense Account');
+        $chart_picker = SL::Presenter::Chart::chart_picker(
+          "expense_chart_id_$i", $form->{"expense_chart_id_$i"},
+          type => "AP_amount", style => "width: 150px");
+      }
+      # change tax dropdown after change
+      my $js_set_on_select_item = '<script type="text/javascript">
+        <!--
+        $(document).ready(function() {
+          $("#expense_chart_id_' . $i . '").on("set_item:ChartPicker", function(e, item) {
+            kivi.io.update_tax_ids(this);
+          });
+          $("#inventory_chart_id_' . $i . '").on("set_item:ChartPicker", function(e, item) {
+            kivi.io.update_tax_ids(this);
+          });
+        });
+        -->
+        </script>
+        ';
+      $column_data{tax_chart} = SL::Presenter::Tag::html_tag('span',
+        $chart_title . $chart_picker . $js_set_on_select_item);
+
+      my $tax_value_title_sub = sub {
+        my $item = shift;
+        return [
+          $item->{id},
+          $item->{taxkey} . ' - ' . $item->{taxdescription} .' '. ($item->{rate} * 100) .' %',
+        ];
+      };
+
+      my @taxes = ();
+      if ($form->{"expense_chart_id_$i"}) {
+        @taxes = IO->get_active_taxes_for_chart($tax_chart_id,
+          $form->{"reqdate_$i"} // $form->{deliverydate} // $form->{transdate});
+      }
+      # tax_id_ is used in io.js->update_tax_ids
+      $column_data{tax} = SL::Presenter::Tag::select_tag(
+        "tax_id_$i", \@taxes, default => $form->{"tax_id_$i"},
+        value_title_sub => $tax_value_title_sub,
+        style => "width: 100px");
+    }
+
+    $column_data{serialnr}  = qq|<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}" data-validate="trimmed_whitespaces">|;
     $column_data{projectnr} = NTI($cgi->popup_menu(
       '-name' => "project_id_$i",
       '-values' => \@projectnumber_values,
@@ -404,8 +493,16 @@ sub display_row {
     ));
     $column_data{reqdate}   = qq|<input name="reqdate_$i" size="11" data-validate="date" value="$form->{"reqdate_$i"}">|;
     $column_data{subtotal}  = sprintf qq|<input type="checkbox" name="subtotal_$i" value="1" %s>|, $form->{"subtotal_$i"} ? 'checked' : '';
+    $column_data{recurring_billing_mode} = SL::Presenter::Tag::select_tag(
+      "recurring_billing_mode_$i",
+      [[ 'always', $::locale->text('always') ], [ 'once',   $::locale->text('once')   ], [ 'never',  $::locale->text('never')  ]],
+      default => $::form->{"recurring_billing_mode_$i"} || 'always',
+    );
 
-# begin marge calculations
+    # Orderer
+    $column_data{orderer}   = qq|: $form->{"orderer_$i"}|;
+
+    # begin marge calculations
     $form->{"lastcost_$i"}     *= 1;
     $form->{"marge_percent_$i"} = 0;
 
@@ -423,7 +520,7 @@ sub display_row {
     } else {
       $real_sellprice            = $linetotal;
     };
-    my $real_lastcost            = $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / $price_factor, 2);
+    my $real_lastcost            = $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"}, 2);
     my $marge_percent_warn       = $myconfig{marge_percent_warn} * 1 || 15;
     my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
 
@@ -474,7 +571,7 @@ sub display_row {
       push @hidden_vars, qw(invoice_id converted_from_orderitems_id converted_from_delivery_order_items_id converted_from_invoice_id);
     }
     if ($::form->{type} =~ /credit_note/) {
-      push @hidden_vars, qw(invoice_id converted_from_invoice_id);
+      push @hidden_vars, qw(invoice_id converted_from_invoice_id converted_from_reclamation_items_id);
     }
    if ($is_delivery_order) {
       map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
@@ -488,6 +585,7 @@ sub display_row {
           $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
           map { ($cgi->hidden("-name" => $_, "-id" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
             (qw(bo price_old id inventory_accno bin partsgroup partnotes active_price_source active_discount_source
+                orderer_id
                 income_accno expense_accno listprice part_type taxaccounts ordnumber donumber transdate cusordnumber
                 longdescription basefactor marge_absolut marge_percent marge_price_factor weight), @hidden_vars)
     );
@@ -831,7 +929,10 @@ sub remove_emptied_rows {
                 stock_out stock_in has_sernumber reqdate orderitems_id
                 active_price_source active_discount_source delivery_order_items_id
                 invoice_id converted_from_orderitems_id
-                converted_from_delivery_order_items_id converted_from_invoice_id);
+                converted_from_delivery_order_items_id converted_from_invoice_id
+                converted_from_reclamation_items_id recurring_billing_mode
+                expense_chart_id inventory_chart_id tax_id tax_chart_type subtotal
+              );
 
   my $ic_cvar_configs = CVar->get_configs(module => 'IC');
   push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs };
@@ -917,52 +1018,49 @@ sub validate_items {
 sub order {
   $main::lxdebug->enter_sub();
 
-  _order();
-
-  if ($::instance_conf->get_feature_experimental_order) {
+  $::form->{email_journal_id}    = delete $::form->{workflow_email_journal_id};
+  $::form->{email_attachment_id} = delete $::form->{workflow_email_attachment_id};
+  $::form->{callback}            = delete $::form->{workflow_email_callback};
 
-    # At this point, the record is saved and the exchangerate contains
-    # an unformatted value. _make_record uses RDBO attributes (i.e. _as_number)
-    # to assign values and thus expects an formatted value.
-    $::form->{exchangerate} = $::form->format_amount(\%::myconfig, $::form->{exchangerate});
+  _order();
 
-    my $order = _make_record();
+  # At this point, the record is saved and the exchangerate contains
+  # an unformatted value. _make_record uses RDBO attributes (i.e. _as_number)
+  # to assign values and thus expects an formatted value.
+  $::form->{exchangerate} = $::form->format_amount(\%::myconfig, $::form->{exchangerate});
 
-    $order->currency(SL::DB::Currency->new(name => $::form->{currency})->load) if $::form->{currency};
-    $order->globalproject_id(undef)                                            if !$order->globalproject_id;
-    $order->payment_id(undef)                                                  if !$order->payment_id;
+  my $order = _make_record();
 
-    my $row = 1;
-    foreach my $item (@{$order->items_sorted}) {
-      $item->custom_variables([]);
+  $order->currency(SL::DB::Currency->new(name => $::form->{currency})->load) if $::form->{currency};
+  $order->globalproject_id(undef)                                            if !$order->globalproject_id;
+  $order->payment_id(undef)                                                  if !$order->payment_id;
 
-      $item->price_factor_id(undef) if !$item->price_factor_id;
-      $item->project_id(undef)      if !$item->project_id;
+  my $row = 1;
+  foreach my $item (@{$order->items_sorted}) {
+    $item->custom_variables([]);
 
-      # autovivify all cvars that are not in the form (cvars_by_config can do it).
-      # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
-       foreach my $var (@{ $item->cvars_by_config }) {
-        my $key = 'ic_cvar_' . $var->config->name . '_' . $row;
-        $var->unparsed_value($::form->{$key});
-        $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
-      }
-      $item->parse_custom_variable_values;
+    $item->price_factor_id(undef) if !$item->price_factor_id;
+    $item->project_id(undef)      if !$item->project_id;
 
-      $row++;
+    # autovivify all cvars that are not in the form (cvars_by_config can do it).
+    # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
+     foreach my $var (@{ $item->cvars_by_config }) {
+      my $key = 'ic_cvar_' . $var->config->name . '_' . $row;
+      $var->unparsed_value($::form->{$key});
+      $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
     }
+    $item->parse_custom_variable_values;
 
-    require SL::Controller::Order;
-    my $c = SL::Controller::Order->new(order => $order);
-    $c->setup_custom_shipto_from_form($order, $::form);
-    $c->action_edit();
-
-    $main::lxdebug->leave_sub();
-    $::dispatcher->end_request;
+    $row++;
   }
 
-  &display_form;
+  require SL::Controller::Order;
+  my $c = SL::Controller::Order->new(order => $order);
+  $c->reinit_after_new_order();
+  $c->action_add();
 
   $main::lxdebug->leave_sub();
+  $::dispatcher->end_request;
 }
 
 sub _order {
@@ -1109,6 +1207,42 @@ sub request_for_quotation {
   quotation();
 }
 
+sub sales_reclamation {
+  my $id = $::form->{id};
+  my $type = $::form->{type};
+
+  require SL::Controller::Reclamation;
+  my $c = SL::Controller::Reclamation->new();
+  $c->redirect_to(
+    controller => 'Reclamation',
+    action     => 'add_from_record',
+    type       => 'sales_reclamation',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+    from_id    => $id,
+    from_type  => $type,
+  );
+}
+
+sub purchase_reclamation {
+  my $id = $::form->{id};
+  my $type = $::form->{type};
+
+  require SL::Controller::Reclamation;
+  my $c = SL::Controller::Reclamation->new();
+  $c->redirect_to(
+    controller => 'Reclamation',
+    action     => 'add_from_record',
+    type       => 'purchase_reclamation',
+    email_journal_id    => $::form->{workflow_email_journal_id},
+    email_attachment_id => $::form->{workflow_email_attachment_id},
+    callback            => $::form->{workflow_email_callback},
+    from_id    => $id,
+    from_type  => $type,
+  );
+}
+
 sub print_options {
   $::lxdebug->enter_sub();
 
@@ -1671,21 +1805,6 @@ sub vendor_details {
   $main::lxdebug->leave_sub();
 }
 
-sub post_as_new {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  _check_io_auth();
-
-  $form->{postasnew} = 1;
-  map { delete $form->{$_} } qw(printed emailed queued);
-
-  &post;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub relink_accounts {
   $main::lxdebug->enter_sub();
 
@@ -2020,8 +2139,12 @@ sub _make_record {
 
   $obj->items(@items) if @items;
 
-  if ($class eq 'SL::DB::DeliveryOrder' && !$obj->order_type) {
-    $obj->order_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type}));
+  if ($class eq 'SL::DB::DeliveryOrder' && !$obj->record_type) {
+    $obj->record_type(SL::DB::DeliveryOrder::TypeData::validate_type($::form->{type}));
+  }
+
+  if ($class eq 'SL::DB::Order' && !$obj->record_type) {
+    $obj->record_type(SL::DB::Order::TypeData::validate_type($::form->{type}));
   }
 
   if ($class eq 'SL::DB::Invoice') {
@@ -2040,7 +2163,7 @@ sub setup_sales_purchase_print_options {
   my $print_form = Form->new('');
   $print_form->{printers}  = SL::DB::Manager::Printer->get_all_sorted;
 
-  $print_form->{$_} = $::form->{$_} for qw(type media printer_id storno formname groupitems);
+  $print_form->{$_} = $::form->{$_} for qw(type media printer_id storno storno_id formname groupitems);
 
   return SL::Helper::PrintOptions->get_print_options(
     form    => $print_form,
@@ -2089,12 +2212,15 @@ sub show_sales_purchase_email_dialog {
   my $email = '';
   my $email_cc = '';
   my $record_email;
+
+  my $is_invoice_mail = $::form->{type} =~ m{final_invoice|credit_note|invoice_for_advance_payment|invoice};
+
   if ($::form->{cp_id}) {
     $email = SL::DB::Contact->load_cached($::form->{cp_id})->cp_email;
   }
   # write a dispatch table if a third type enters
   # check record mail for sales_invoice
-  if ($::form->{type} eq 'invoice' && (!$email || $::instance_conf->get_invoice_mail_settings ne 'cp')) {
+  if ($is_invoice_mail && (!$email || $::instance_conf->get_invoice_mail_settings ne 'cp')) {
     # check for invoice_mail if defined (vc.invoice_email)
     $record_email = SL::DB::Customer->load_cached($::form->{vc_id})->invoice_mail;
     if ($record_email) {
@@ -2155,7 +2281,7 @@ sub show_sales_purchase_email_dialog {
     show_bcc        => $::auth->assert('email_bcc', 'may fail'),
     FILES           => \%files,
     is_customer     => $::form->{vc} eq 'customer',
-    is_invoice_mail => ($record_email && $::form->{type} eq 'invoice'),
+    is_invoice_mail => ($record_email && $is_invoice_mail),
     ALL_EMPLOYEES   => \@employees_with_email,
     ALL_PARTNER_EMAIL_ADDRESSES => $all_partner_email_addresses,
   });
@@ -2199,7 +2325,7 @@ sub send_sales_purchase_email {
 
   } else {
     print_form("return");
-    Common->save_email_status(\%::myconfig, $::form);
+    Common->save_email_status(\%::myconfig, $::form) unless ($::instance_conf->get_email_journal);
   }
 
   flash_later('info', $::locale->text('The email has been sent.'));
@@ -2258,7 +2384,7 @@ sub download_factur_x_xml {
     $::form->error($e->message);
   }
 
-  my $attachment_filename = $::form->generate_attachment_filename;
+  my $attachment_filename = "factur-x_" . $::form->generate_attachment_filename;
   $attachment_filename    =~ s{\.[^.]+$}{.xml};
   my %headers             = (
     '-type'           => 'application/xml',
@@ -2271,3 +2397,17 @@ sub download_factur_x_xml {
 
   $::locale->with_raw_io(\*STDOUT, sub { print $xml_content });
 }
+
+sub get_taxes_dropdown {
+  my $transdate         = $::form->{transdate}    ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
+  my $deliverydate      = $::form->{deliverydate} ? DateTime->from_kivitendo($::form->{deliverydate}) : undef;
+  my $item_deliverydate = $::form->{item_deliverydate} ? DateTime->from_kivitendo($::form->{item_deliverydate}) : undef;
+
+  my @taxes = IO->get_active_taxes_for_chart($::form->{chart_id},
+    $item_deliverydate // $deliverydate // $transdate);
+  my $html  = $::form->parse_html_template("ir/update_taxes", { TAXES => \@taxes });
+
+  print $::form->ajax_response_header, $html;
+}
+
+1;
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index b0df30c44..e672a5987 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -38,11 +38,16 @@ use SL::Helper::UserPreferences::DisplayPreferences;
 use SL::IR;
 use SL::IS;
 use SL::DB::BankTransactionAccTrans;
+use SL::DB::Chart;
 use SL::DB::Default;
 use SL::DB::Department;
 use SL::DB::Project;
 use SL::DB::PurchaseInvoice;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
 use SL::DB::Vendor;
+use SL::DB::Tax;
+use SL::DB::Chart;
 use List::MoreUtils qw(uniq);
 use List::Util qw(max sum);
 use List::UtilsBy qw(sort_by);
@@ -87,6 +92,10 @@ sub add {
 
   $form->{title} = $locale->text('Record Vendor Invoice');
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+  }
+
   &invoice_links;
   &prepare_invoice;
   &display_form;
@@ -94,6 +103,21 @@ sub add {
   $main::lxdebug->leave_sub();
 }
 
+sub add_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &add;
+}
+
+sub edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  &edit;
+}
+
 sub edit {
   $main::lxdebug->enter_sub();
 
@@ -174,8 +198,28 @@ sub invoice_links {
           $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
         $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
         $form->{"memo_$i"}   = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+        $form->{"defaultcurrency_paid_$i"}   = $form->{acc_trans}{$key}->[$i - 1]->{defaultcurrency_paid};
+        $form->{"fx_transaction_$i"}   = $form->{acc_trans}{$key}->[$i - 1]->{fx_transaction};
 
         $form->{paidaccounts} = $i;
+        # hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
+        if ($form->{"exchangerate_$i"} && $form->{"acc_trans_id_$i"}) {
+          my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
+          if ($bt_acc_trans) {
+            if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
+              $form->{"exchangerate_$i"} = $bt_acc_trans->bank_transaction->exchangerate;
+              $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
+              $form->{"record_forex_$i"} = 1;
+            }
+          }
+          if (!$form->{"fx_transaction_$i"}) {
+            # this is a banktransaction that was paid in internal currency. revert paid/defaultcurrency_paid
+            $form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"};
+            $form->{"paid_$i"} /= $form->{"exchangerate_$i"};
+          }
+          $form->{"defaultcurrency_paid_$i"} //= $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+          $form->{"defaultcurrency_totalpaid"} +=  $form->{"defaultcurrency_paid_$i"};
+        } # end hook defaultcurrency_paid
       }
     } else {
       $form->{$key} =
@@ -186,7 +230,15 @@ sub invoice_links {
 
   $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
 
+  foreach my $ref (@{ $form->{AP_links}{AP} } ) {
+    if ( $ref->{chart_id} == $::instance_conf->get_ap_chart_id ) {
+      $form->{AP_1} = "$ref->{accno}--$ref->{description}";
+    }
+  }
   $form->{AP} = $form->{AP_1} unless $form->{id};
+  my ($chart_accno) = split /--/, $form->{AP}; # is empty if total is 0
+  $form->{AP_chart_id} = $form->{id} && $chart_accno ? SL::DB::Manager::Chart->find_by(accno => $chart_accno)->id
+                                                     : $::instance_conf->get_ap_chart_id || $form->{AP_links}->{AP}->[0]->{chart_id};
 
   $form->{locked} =
     ($form->datetonum($form->{invdate}, \%myconfig) <=
@@ -242,6 +294,7 @@ sub prepare_invoice {
 }
 
 sub setup_ir_action_bar {
+  my ($tmpl_var)              = @_;
   my $form                    = $::form;
   my $change_never            = $::instance_conf->get_ir_changeable == 0;
   my $change_on_same_day_only = $::instance_conf->get_ir_changeable == 2 && ($form->current_date(\%::myconfig) ne $form->{gldate});
@@ -250,9 +303,11 @@ sub setup_ir_action_bar {
   my $may_edit_create         = $::auth->assert('vendor_invoice_edit', 1);
 
   my $has_sepa_exports;
+  my $is_sepa_blocked;
   if ($form->{id}) {
     my $invoice = SL::DB::Manager::PurchaseInvoice->find_by(id => $form->{id});
     $has_sepa_exports = 1 if ($invoice->find_sepa_export_items()->[0]);
+    $is_sepa_blocked  = !!$invoice->is_sepa_blocked;
   }
 
   my $is_linked_bank_transaction;
@@ -262,6 +317,15 @@ sub setup_ir_action_bar {
 
     $is_linked_bank_transaction = 1;
   }
+  # add readonly state in tmpl_vars
+  $tmpl_var->{readonly} = !$may_edit_create                     ? 1
+                    : $form->{locked}                           ? 1
+                    : $form->{storno}                           ? 1
+                    : ($form->{id} && $change_never)            ? 1
+                    : ($form->{id} && $change_on_same_day_only) ? 1
+                    : $is_linked_bank_transaction               ? 1
+                    : $has_sepa_exports                         ? 1
+                    : 0;
 
   my $create_post_action = sub {
     # $_[0]: description
@@ -276,6 +340,7 @@ sub setup_ir_action_bar {
                 : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
                 : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
                 : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+                : $has_sepa_exports                         ? t8('This invoice has been linked with a sepa export, undo this first.')
                 : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                 :                                             undef,
     ],
@@ -290,6 +355,7 @@ sub setup_ir_action_bar {
   } else {
     @post_entries = ( $create_post_action->(t8('Post')) );
   }
+  push @post_entries, $create_post_action->(t8('Post and Close'), 'callback');
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
@@ -311,6 +377,12 @@ sub setup_ir_action_bar {
                     : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                     :                               undef,
         ],
+        action => [ $is_sepa_blocked ? t8('Unblock Bank transfer via SEPA') : t8('Block Bank transfer via SEPA'),
+          submit   => [ '#form', { action => "block_or_unblock_sepa_transfer", unblock_sepa => !!$is_sepa_blocked } ],
+          disabled => !$may_edit_create ? t8('You must not change this AP transaction.')
+                    : !$::form->{id}    ? t8('This invoice has not been posted yet.')
+                    :                     undef,
+        ],
         action => [
           t8('Mark as paid'),
           submit   => [ '#form', { action => "mark_as_paid" } ],
@@ -362,6 +434,12 @@ sub setup_ir_action_bar {
                     : !$form->{id}      ? t8('This invoice has not been posted yet.')
                     :                     undef,
         ],
+        action => [
+          t8('Reclamation'),
+          submit   => ['#form', { action => "purchase_reclamation" }], # can't call Reclamation directly
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+          only_if  => ($::instance_conf->get_show_purchase_reclamation && $::form->{type} eq 'purchase_invoice')
+        ],
        ], # end of combobox "Workflow"
 
       combobox => [
@@ -401,11 +479,11 @@ sub form_header {
   my $locale   = $main::locale;
   my $cgi      = $::request->{cgi};
 
-  my %TMPL_VAR = ();
+  my $TMPL_VAR = $::request->cache('tmpl_var', {});
   my @custom_hiddens;
 
-  $TMPL_VAR{invoice_obj} = SL::DB::PurchaseInvoice->load_cached($form->{id}) if $form->{id};
-  $TMPL_VAR{vendor_obj}  = SL::DB::Vendor->load_cached($form->{vendor_id})   if $form->{vendor_id};
+  $TMPL_VAR->{invoice_obj} = SL::DB::PurchaseInvoice->load_cached($form->{id}) if $form->{id};
+  $TMPL_VAR->{vendor_obj}  = SL::DB::Vendor->load_cached($form->{vendor_id})   if $form->{vendor_id};
   my $current_employee   = SL::DB::Manager::Employee->current;
   $form->{employee_id}   = $form->{old_employee_id} if $form->{old_employee_id};
   $form->{salesman_id}   = $form->{old_salesman_id} if $form->{old_salesman_id};
@@ -416,16 +494,17 @@ sub form_header {
 
   my @old_project_ids     = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
   my @conditions          = @old_project_ids ? (id => \@old_project_ids) : ();
-  $TMPL_VAR{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]);
-  $form->{ALL_PROJECTS}   = $TMPL_VAR{ALL_PROJECTS}; # make projects available for second row drop-down in io.pl
+  $TMPL_VAR->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]);
+  $form->{ALL_PROJECTS}   = $TMPL_VAR->{ALL_PROJECTS}; # make projects available for second row drop-down in io.pl
 
   $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
                    "currencies"    => "ALL_CURRENCIES",
                    "price_factors" => "ALL_PRICE_FACTORS");
 
-  $TMPL_VAR{ALL_DEPARTMENTS}       = SL::DB::Manager::Department->get_all_sorted;
-  $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
-  $TMPL_VAR{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all_sorted(query => [
+  $TMPL_VAR->{ALL_DEPARTMENTS}       = SL::DB::Manager::Department->get_all_sorted;
+  $TMPL_VAR->{ALL_DELIVERY_TERMS}    = SL::DB::Manager::DeliveryTerm->get_valid($::form->{delivery_term_id});
+  $TMPL_VAR->{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
+  $TMPL_VAR->{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all_sorted(query => [
     or => [
       cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
       and      => [
@@ -441,15 +520,15 @@ sub form_header {
   $form->{currency}            = $form->{defaultcurrency} unless $form->{currency};
   # show_exchangerate is also later needed in another template
   $form->{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
-  $TMPL_VAR{currencies}        = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+  $TMPL_VAR->{currencies}        = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
                                                       '-values' => \@values, '-labels' => \%labels,
                                                       '-onchange' => "document.getElementById('update_button').click();"
                                      )) if scalar @values;
   push @custom_hiddens, "forex";
   push @custom_hiddens, "exchangerate" if $form->{forex};
 
-  $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
-  $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
+  $TMPL_VAR->{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
+  $TMPL_VAR->{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
 
 # set option selected
   foreach my $item (qw(AP)) {
@@ -457,13 +536,13 @@ sub form_header {
     $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
   }
 
-  $TMPL_VAR{is_format_html}                         = $form->{format} eq 'html';
-  $TMPL_VAR{dateformat}                             = $myconfig{dateformat};
-  $TMPL_VAR{numberformat}                           = $myconfig{numberformat};
-  $TMPL_VAR{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
+  $TMPL_VAR->{is_format_html}                         = $form->{format} eq 'html';
+  $TMPL_VAR->{dateformat}                             = $myconfig{dateformat};
+  $TMPL_VAR->{numberformat}                           = $myconfig{numberformat};
+  $TMPL_VAR->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
 
   # hiddens
-  $TMPL_VAR{HIDDENS} = [qw(
+  $TMPL_VAR->{HIDDENS} = [qw(
     id type queued printed emailed title vc discount
     title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
     max_dunning_level dunning_amount
@@ -473,16 +552,16 @@ sub form_header {
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } split / /, $form->{taxaccounts}];
 
-  $TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice();
-  $form->{duedate}             = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
+  $TMPL_VAR->{payment_terms_obj} = get_payment_terms_for_invoice();
+  $form->{duedate}             = $TMPL_VAR->{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR->{payment_terms_obj};
 
-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.Draft kivi.File kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_project client_js));
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.Draft kivi.File kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor5/ckeditor ckeditor5/translations/de kivi.io autocomplete_project client_js autocomplete_chart));
 
-  setup_ir_action_bar();
+  setup_ir_action_bar($TMPL_VAR);
 
   $form->header();
 
-  print $form->parse_html_template("ir/form_header", \%TMPL_VAR);
+  print $form->parse_html_template("ir/form_header", {%$TMPL_VAR});
 
   $main::lxdebug->leave_sub();
 }
@@ -518,6 +597,8 @@ sub form_footer {
   $form->{invtotal}    = $form->{invsubtotal};
   $form->{oldinvtotal} = $form->{invtotal};
 
+  my $TMPL_VAR = $::request->cache('tmpl_var', {});
+
   # tax, total and subtotal calculations
   my ($tax, $subtotal);
   $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
@@ -569,7 +650,15 @@ sub form_footer {
     if ($form->date_closed($form->{"gldate_$i"})) {
       $form->{"changeable_$i"} = 0;
     }
-
+    # don't add manual bookings for charts which are assigned to real bank accounts
+    # and are flagged for use with bank import
+    my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
+    foreach my $bank (@{ $bank_accounts }) {
+      if ($bank->use_with_bank_import) {
+        my $accno_paid_bank = $bank->chart->accno;
+        $form->{selectAP_paid} =~ s/<option>$accno_paid_bank--(.*?)<\/option>//;
+      }
+    }
     $form->{"selectAP_paid_$i"} = $form->{selectAP_paid};
     if (!$form->{"AP_paid_$i"}) {
       $form->{"selectAP_paid_$i"} =~ s/option>$accno_arap--(.*?)>/option selected>$accno_arap--$1>/;
@@ -580,9 +669,8 @@ sub form_footer {
     $totalpaid += $form->{"paid_$i"};
   }
 
-  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
-
   print $form->parse_html_template('ir/form_footer', {
+    %$TMPL_VAR,
     totalpaid           => $totalpaid,
     paid_missing        => $form->{invtotal} - $totalpaid,
     show_storno         => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && !$totalpaid,
@@ -605,7 +693,18 @@ sub mark_as_paid {
   $::form->redirect($::locale->text("Marked as paid"));
 }
 
+sub block_or_unblock_sepa_transfer {
+  $::auth->assert('ap_transactions');
+
+  my $invoice = SL::DB::PurchaseInvoice->new(id => $::form->{id})->load;
+  $invoice->update_attributes(is_sepa_blocked => 0) if  $::form->{unblock_sepa} &&  $invoice->is_sepa_blocked;
+  $invoice->update_attributes(is_sepa_blocked => 1) if !$::form->{unblock_sepa} && !$invoice->is_sepa_blocked;
+
+  $::form->redirect($::form->{unblock_sepa} ? t8('Bank transfer via SEPA is unblocked') : t8('Bank transfer via SEPA is blocked'));
+}
+
 sub show_draft {
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
   update();
 }
 
@@ -620,17 +719,24 @@ sub update {
   if (($form->{previous_vendor_id} || $form->{vendor_id}) != $form->{vendor_id}) {
     IR->get_vendor(\%myconfig, $form);
   }
-
-  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
-    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
+  #
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  if ($form->{defaultcurrency} ne $form->{currency}) {
+    if ($form->{exchangerate}) { # user input OR first default ->  leave this value
+      $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate});
+      # does this differ from daily default?
+      my $current_daily_rate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
+      $form->{record_forex}  = $current_daily_rate > 0 && $current_daily_rate != $form->{exchangerate}
+                           ?   1 : 0;
+    } else {                     # no value, but get defaults -> maybe user changes invdate as well ...
+      ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate(\%myconfig, $form->{currency},
+                                                                                 $form->{invdate}, 'sell', $form->{id}, 'ap');
+    }
   }
-  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
-  $form->{exchangerate} = $form->{forex} if $form->{forex};
-
   for my $i (1 .. $form->{paidaccounts}) {
     next unless $form->{"paid_$i"};
     map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
-    $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+    $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell') unless $form->{"record_forex_$i"};
     $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
   }
 
@@ -737,6 +843,11 @@ sub storno {
 
   $main::auth->assert('vendor_invoice_edit');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}          ||= delete $form->{workflow_email_callback};
+  $form->{after_action} = 'callback' if $form->{callback};
+
   if ($form->{storno}) {
     $form->error($locale->text('Cannot storno storno invoice!'));
   }
@@ -752,6 +863,7 @@ sub storno {
   invoice_links();
   prepare_invoice();
   relink_accounts();
+  set_taxaccounts_and_accnos();
 
   # Payments must not be recorded for the new storno invoice.
   $form->{paidaccounts} = 0;
@@ -777,6 +889,10 @@ sub storno {
   $form->{invnumber} = "Storno zu " . $form->{invnumber};
   $form->{rowcount}++;
   $form->{employee_id} = $employee_id;
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
+  # post expects the field as user input
+  $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
   post();
   $main::lxdebug->leave_sub();
 
@@ -790,13 +906,20 @@ sub use_as_new {
 
   $main::auth->assert('vendor_invoice_edit');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
   map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
   $form->{paidaccounts} = 1;
   $form->{rowcount}--;
   $form->{invdate} = $form->current_date(\%myconfig);
 
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
+
   $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
 
+  $form->{exchangerate} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
   $form->{useasnew} = 1;
   &display_form;
 
@@ -835,7 +958,7 @@ sub post_payment {
     }
   }
 
-  ($form->{AP})      = split /--/, $form->{AP};
+  $form->{AP}      = SL::DB::Manager::Chart->find_by( id => $form->{AP_chart_id} )->accno;
   ($form->{AP_paid}) = split /--/, $form->{AP_paid};
   if (IR->post_payment(\%myconfig, \%$form)){
     if (!exists $form->{addition} && $form->{id} ne "") {
@@ -878,6 +1001,7 @@ sub post {
   $main::auth->assert('vendor_invoice_edit');
 
   $form->mtime_ischanged('ap');
+
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
   $form->isblank("invdate",   $locale->text('Invoice Date missing!'));
@@ -911,9 +1035,11 @@ sub post {
   $form->error($locale->text('Cannot post invoice for a closed period!'))
     if ($invdate <= $closedto);
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{currency} ne $form->{defaultcurrency});
-
+  if ($form->{currency} ne $form->{defaultcurrency}) {
+    $form->isblank("exchangerate", $locale->text('Exchangerate missing!'));
+    $form->error($locale->text('Cannot post invoice with negative exchange rate'))
+      unless ($form->parse_amount(\%myconfig, $form->{"exchangerate"}) > 0);
+  }
   my $i;
   for $i (1 .. $form->{paidaccounts}) {
     if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
@@ -938,14 +1064,12 @@ sub post {
     }
   }
 
-  ($form->{AP})      = split /--/, $form->{AP};
+  $form->{AP}      = SL::DB::Manager::Chart->find_by( id => $form->{AP_chart_id} )->accno;
   ($form->{AP_paid}) = split /--/, $form->{AP_paid};
   $form->{storno}  ||= 0;
 
-  $form->{id} = 0 if $form->{postasnew};
-
-
   relink_accounts();
+  set_taxaccounts_and_accnos();
   if (IR->post_invoice(\%myconfig, \%$form)){
     # saving the history
     if(!exists $form->{addition} && $form->{id} ne "") {
@@ -956,9 +1080,20 @@ sub post {
     }
     # /saving the history
 
+    if ($form->{email_journal_id}) {
+      my $purchase_invoice = SL::DB::PurchaseInvoice->new(id => $form->{id})->load;
+      my $email_journal = SL::DB::EmailJournal->new(
+        id => delete $form->{email_journal_id}
+      )->load;
+      $email_journal->link_to_record_with_attachment($purchase_invoice, delete $::form->{email_attachment_id});
+    }
+
     my $redirect_url;
     if ('doc-tab' eq $form->{after_action}) {
       $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
+    } elsif ('callback' eq $form->{after_action}) {
+      $redirect_url = $form->{callback}
+        || "controller.pl?action=LoginScreen/user_login";
     } else {
       $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id}));
     }
@@ -1019,6 +1154,7 @@ sub display_form {
   _assert_access();
 
   relink_accounts();
+  set_taxaccounts_and_accnos();
 
   my $new_rowcount = $::form->{"rowcount"} * 1 + 1;
   $::form->{"project_id_${new_rowcount}"} = $::form->{"globalproject_id"};
@@ -1070,3 +1206,67 @@ sub get_duedate_vendor {
   print $::form->ajax_response_header, $result;
   $::lxdebug->leave_sub;
 }
+
+# set values form relink_accounts as default
+# otherwise override with user selected values
+# recalc taxaccounts string
+sub set_taxaccounts_and_accnos {
+  $main::lxdebug->enter_sub;
+
+  for my $i (1 .. $::form->{rowcount}) {
+
+    # fill with default, ids can be 0
+    if ('' eq $::form->{"expense_chart_id_$i"}) {
+      $::form->{"expense_chart_id_$i"} = $::form->{"expense_accno_id_$i"};
+    }
+    if ('' eq $::form->{"tax_id_$i"}) {
+      $::form->{"tax_id_$i"} = $::form->{"expense_accno_tax_id_$i"};
+    }
+    if ('' eq $::form->{"inventory_chart_id_$i"}) {
+      $::form->{"inventory_chart_id_$i"} = $::form->{"inventory_accno_id_$i"};
+    }
+
+    # if changed override with user values
+    if ($::form->{"expense_chart_id_$i"} ne $::form->{"expense_accno_id_$i"}) {
+      $::form->{"expense_accno_id_$i"} = $::form->{"expense_chart_id_$i"};
+      my $chart = SL::DB::Chart->new(id => $::form->{"expense_chart_id_$i"})->load;
+      $::form->{"expense_accno_$i"}    = $chart->accno;
+    }
+    if ($::form->{"tax_id_$i"} ne $::form->{"expense_accno_tax_id_$i"}) {
+      $::form->{"expense_accno_tax_id_$i"} = $::form->{"tax_id_$i"};
+      my $tax = SL::DB::Tax->new(id => $::form->{"tax_id_$i"})->load;
+      my $tax_accno;
+      if (defined $tax->chart_id) {
+        my $chart  = SL::DB::Chart->new(id => $tax->chart_id)->load;
+        $tax_accno = $chart->accno;
+      } else {
+        $tax_accno = "NO_ACCNO_" . $tax->id;
+      }
+      $::form->{"taxaccounts_$i"} = $tax_accno;
+      if (!($::form->{taxaccounts} =~ /\Q$tax_accno\E/)) {
+        # add tax info if missing
+        $::form->{"${tax_accno}_rate"}        = $tax->rate;
+        $::form->{"${tax_accno}_description"} = $tax->taxdescription;
+        $::form->{"${tax_accno}_tax_id"}      = $tax->id;
+        $::form->{"${tax_accno}_taxnumber"}   = $::form->{"expense_accno_$i"};
+      }
+    }
+    if ($::form->{"inventory_chart_id_$i"} ne $::form->{"inventory_accno_id_$i"}) {
+      $::form->{"inventory_accno_id_$i"} = $::form->{"inventory_chart_id_$i"};
+      my $chart = SL::DB::Chart->new(id => $::form->{"inventory_chart_id_$i"})->load;
+      $::form->{"inventory_accno_$i"}    = $chart->accno;
+    }
+
+  }
+
+  # recalc taxaccounts string
+  $::form->{taxaccounts} = "";
+  for my $i (1 .. $::form->{rowcount}) {
+    my $taxaccounts_i = $::form->{"taxaccounts_$i"};
+    if (!($::form->{taxaccounts} =~ /\Q$taxaccounts_i\E/)) {
+      $::form->{taxaccounts} .= "$taxaccounts_i ";
+    }
+  }
+
+  $::lxdebug->leave_sub;
+}
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d0e25062a..f657b33e5 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -48,10 +48,15 @@ use English qw(-no_match_vars);
 
 use SL::DB::BankTransactionAccTrans;
 use SL::DB::Default;
+use SL::DB::Chart;
 use SL::DB::Customer;
 use SL::DB::Department;
 use SL::DB::Invoice;
 use SL::DB::PaymentTerm;
+use SL::DB::Reclamation;
+use SL::DB::EmailJournal;
+use SL::DB::ValidityToken;
+use SL::Helper::QrBillFunctions qw(get_ref_number_formatted);
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/io.pl";
@@ -105,6 +110,9 @@ sub add {
 
   }
 
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+  }
 
   $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
 
@@ -115,6 +123,21 @@ sub add {
   $main::lxdebug->leave_sub();
 }
 
+sub add_from_email_journal {
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  &add;
+}
+
+sub edit_with_email_journal_workflow {
+  my ($self) = @_;
+  die "No 'email_journal_id' was given." unless ($::form->{email_journal_id});
+  $::form->{workflow_email_journal_id}    = delete $::form->{email_journal_id};
+  $::form->{workflow_email_attachment_id} = delete $::form->{email_attachment_id};
+  $::form->{workflow_email_callback}      = delete $::form->{callback};
+
+  &edit;
+}
+
 sub edit {
   $main::lxdebug->enter_sub();
 
@@ -182,6 +205,12 @@ sub invoice_links {
   # create links
   $form->create_links("AR", \%myconfig, "customer");
 
+  my $transfer_chart_id = $::instance_conf->get_advance_payment_clearing_chart_id;
+  if ($transfer_chart_id) {
+    # remove transfer chart for select box AR
+    @{ $form->{AR_links}{AR} } =  grep { $_->{chart_id} != $transfer_chart_id } @{ $form->{AR_links}{AR} };
+  }
+
   _assert_access();
 
   my $editing = $form->{id};
@@ -227,8 +256,30 @@ sub invoice_links {
         $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
         $form->{"source_$i"}       = $form->{acc_trans}{$key}->[$i - 1]->{source};
         $form->{"memo_$i"}         = $form->{acc_trans}{$key}->[$i - 1]->{memo};
+        $form->{"defaultcurrency_paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{defaultcurrency_paid};
+        $form->{"fx_transaction_$i"}  = $form->{acc_trans}{$key}->[$i - 1]->{fx_transaction};
+
 
         $form->{paidaccounts} = $i;
+        # hook for calc of of defaultcurrency_paid and check if banktransaction has a record exchangerate
+        if ($form->{"exchangerate_$i"} && $form->{"acc_trans_id_$i"}) {
+          my $bt_acc_trans = SL::DB::Manager::BankTransactionAccTrans->find_by(acc_trans_id => $form->{"acc_trans_id_$i"});
+          if ($bt_acc_trans) {
+            if ($bt_acc_trans->bank_transaction->exchangerate > 0) {
+              $form->{"exchangerate_$i"} = $bt_acc_trans->bank_transaction->exchangerate;
+              $form->{"forex_$i"}        = $form->{"exchangerate_$i"};
+              $form->{"record_forex_$i"} = 1;
+            }
+          }
+          if (!$form->{"fx_transaction_$i"}) {
+            # this is a banktransaction that was paid in internal currency. revert paid/defaultcurrency_paid
+            $form->{"defaultcurrency_paid_$i"} = $form->{"paid_$i"};
+            $form->{"paid_$i"} /= $form->{"exchangerate_$i"};
+          }
+          $form->{"defaultcurrency_paid_$i"} //= $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+          $form->{"defaultcurrency_totalpaid"} +=  $form->{"defaultcurrency_paid_$i"};
+        } # end hook defaultcurrency_paid
+
       }
     } else {
       $form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}";
@@ -237,7 +288,10 @@ sub invoice_links {
 
   $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts});
 
-  $form->{AR} = $form->{AR_1} unless $form->{id};
+  my ($chart_accno) = split /--/, $form->{AR}; # is empty if total is 0
+  $form->{AR_chart_id} = $form->{id} && $chart_accno ? SL::DB::Manager::Chart->find_by(accno => $chart_accno)->id
+                       : $form->{AR_chart_id}        ? $form->{AR_chart_id}
+                       : $::instance_conf->get_ar_chart_id;
 
   $form->{locked} = ($form->datetonum($form->{invdate},  \%myconfig)
                   <= $form->datetonum($form->{closedto}, \%myconfig));
@@ -344,6 +398,14 @@ sub setup_is_action_bar {
     my $lr          = $invoice_obj->linked_records(direction => 'from', from => ['Order']);
     $is_invoice_for_advance_payment_from_order = scalar @$lr >= 1;
   }
+  # add readonly state in tmpl_vars
+  $tmpl_var->{readonly} = !$may_edit_create                     ? 1
+                    : $form->{locked}                           ? 1
+                    : $form->{storno}                           ? 1
+                    : ($form->{id} && $change_never)            ? 1
+                    : ($form->{id} && $change_on_same_day_only) ? 1
+                    : $is_linked_bank_transaction               ? 1
+                    : 0;
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
@@ -371,6 +433,19 @@ sub setup_is_action_bar {
                     : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
                     :                                             undef,
         ],
+        action => [
+          t8('Post and Close'),
+          submit   => [ '#form', { action => "post_and_close" } ],
+          checks   => [ 'kivi.validate_form' ],
+          confirm  => t8('The invoice is not linked with a sales delivery order. Post anyway?') x !!$warn_unlinked_delivery_order,
+          disabled => !$may_edit_create                         ? t8('You must not change this invoice.')
+                    : $form->{locked}                           ? t8('The billing period has already been locked.')
+                    : $form->{storno}                           ? t8('A canceled invoice cannot be posted.')
+                    : ($form->{id} && $change_never)            ? t8('Changing invoices has been disabled in the configuration.')
+                    : ($form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.')
+                    : $is_linked_bank_transaction               ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+                    :                                             undef,
+        ],
         action => [
           t8('Post Payment'),
           submit   => [ '#form', { action => "post_payment" } ],
@@ -439,7 +514,7 @@ sub setup_is_action_bar {
                     : $has_final_invoice                         ? t8('This invoice has already a final invoice.')
                     : $is_invoice_for_advance_payment_from_order ? t8('This invoice was added from an order. See there.')
                     :                                              undef,
-          only_if  => $form->{type} eq "invoice_for_advance_payment",
+          only_if  => ($form->{type} eq "invoice_for_advance_payment" && $::instance_conf->get_show_invoice_for_advance_payment),
         ],
         action => [
           t8('Final Invoice'),
@@ -451,7 +526,7 @@ sub setup_is_action_bar {
                     : $has_final_invoice                         ? t8('This invoice has already a final invoice.')
                     : $is_invoice_for_advance_payment_from_order ? t8('This invoice was added from an order. See there.')
                     :                                              undef,
-          only_if  => $form->{type} eq "invoice_for_advance_payment",
+          only_if  => ($form->{type} eq "invoice_for_advance_payment" && $::instance_conf->get_show_invoice_for_advance_payment),
         ],
         action => [
           t8('Credit Note'),
@@ -469,6 +544,12 @@ sub setup_is_action_bar {
           checks   => [ 'kivi.validate_form' ],
           disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
         ],
+        action => [
+          t8('Reclamation'),
+          submit   => ['#form', { action => "sales_reclamation" }], # can't call Reclamation directly
+          disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef,
+          only_if  => ($::instance_conf->get_show_sales_reclamation && $::form->{type} eq 'invoice' && !$::form->{storno}),
+        ],
       ], # end of combobox "Workflow"
 
       combobox => [
@@ -564,12 +645,19 @@ sub form_header {
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
+  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+    my $customer = SL::DB::Customer->load_cached($form->{customer_id});
+    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
+  }
+  $TMPL_VAR{taxincluded} = $form->{taxincluded};
+
   $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
                    "currencies"    => "ALL_CURRENCIES",
                    "price_factors" => "ALL_PRICE_FACTORS");
 
   $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
   $form->{ALL_LANGUAGES}   = SL::DB::Manager::Language->get_all_sorted;
+  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_valid($form->{delivery_term_id});
 
   # Projects
   my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
@@ -593,7 +681,7 @@ sub form_header {
   $TMPL_VAR{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id},  deleted => 0 ] ]);
   $TMPL_VAR{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{salesman_id},  deleted => 0 ] ]);
   $TMPL_VAR{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all_sorted(query => [
-    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+    or => [ and => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, module => 'CT' ], and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
   ]);
   $TMPL_VAR{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all_sorted(query => [
     or => [
@@ -620,7 +708,16 @@ sub form_header {
   $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
   $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
 
-# set option selected
+  # qr reference
+  my $has_qr_reference = $::instance_conf->get_create_qrbill_invoices == 1 &&
+                         $form->{formname} eq 'invoice' ? 1 : 0;
+  $TMPL_VAR{has_qr_reference} = $has_qr_reference;
+
+  if ($has_qr_reference && defined $form->{qr_reference}) {
+    $TMPL_VAR{qr_reference_formatted} = get_ref_number_formatted($form->{qr_reference});
+  }
+
+  # set option selected
   foreach my $item (qw(AR)) {
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
@@ -639,13 +736,13 @@ sub form_header {
     title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
     max_dunning_level dunning_amount dunning_description
     taxaccounts cursor_fokus
-    convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew
+    convert_from_reclamations_ids convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew
     invoice_id
     show_details
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } split / /, $form->{taxaccounts}];
 
-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.Draft kivi.File kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor/ckeditor ckeditor/adapters/jquery kivi.io client_js));
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.Draft kivi.File kivi.SalesPurchase kivi.Part kivi.CustomerVendor kivi.Validator ckeditor5/ckeditor ckeditor5/translations/de kivi.io client_js autocomplete_chart));
 
   $TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice();
   $form->{duedate}             = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
@@ -693,11 +790,6 @@ sub form_footer {
   my ($tax, $subtotal);
   $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
 
-  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
-    my $customer = SL::DB::Customer->load_cached($form->{customer_id});
-    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
-  }
-
   foreach my $item (@{ $form->{taxaccounts_array} }) {
     if ($form->{"${item}_base"}) {
       if ($form->{taxincluded}) {
@@ -749,6 +841,15 @@ sub form_footer {
     if ($form->date_closed($form->{"gldate_$i"})) {
       $form->{"changeable_$i"} = 0;
     }
+    # don't add manual bookings for charts which are assigned to real bank accounts
+    # and are flagged for use with bank import
+    my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
+    foreach my $bank (@{ $bank_accounts }) {
+      if ($bank->use_with_bank_import) {
+        my $accno_paid_bank = $bank->chart->accno;
+        $form->{selectAR_paid} =~ s/<option>$accno_paid_bank--(.*?)<\/option>//;
+      }
+    }
 
     $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
     if (!$form->{"AR_paid_$i"}) {
@@ -762,8 +863,6 @@ sub form_footer {
 
   $form->{oldinvtotal} = $form->{invtotal};
 
-  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
-
   my $shipto_cvars       = SL::DB::Shipto->new->cvars_by_config;
   foreach my $var (@{ $shipto_cvars }) {
     my $name = "shiptocvar_" . $var->config->name;
@@ -802,6 +901,7 @@ sub show_draft {
   # unless no lazy implementation of save draft without invdate
   # set the current date like in version <= 3.4.1
   $::form->{invdate}   = DateTime->today->to_lxoffice;
+  $::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
   update();
 }
 
@@ -816,7 +916,6 @@ sub update {
   my ($recursive_call) = @_;
 
   $form->{print_and_post} = 0         if $form->{second_run};
-  my $taxincluded         = $form->{taxincluded} ? "checked" : '';
   $form->{update} = 1;
 
   if (($form->{previous_customer_id} || $form->{customer_id}) != $form->{customer_id}) {
@@ -826,14 +925,19 @@ sub update {
     $::form->{billing_address_id} = $::form->{default_billing_address_id};
   }
 
-  $form->{taxincluded} ||= $taxincluded;
-
-  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
-    $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate}) unless $recursive_call;
+  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  if ($form->{defaultcurrency} ne $form->{currency}) {
+    if ($form->{exchangerate}) { # user input OR first default ->  leave this value
+      $form->{exchangerate} = $form->parse_amount(\%myconfig, $form->{exchangerate}) unless $recursive_call;
+      # does this differ from daily default?
+      my $current_daily_rate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+      $form->{record_forex}  = $current_daily_rate > 0 && $current_daily_rate != $form->{exchangerate}
+                           ?   1 : 0;
+    } else {                     # no value, but get defaults -> maybe user changes invdate as well ...
+      ($form->{exchangerate}, $form->{record_forex}) = $form->check_exchangerate(\%myconfig, $form->{currency},
+                                                                                 $form->{invdate}, 'buy', $form->{id}, 'ar');
+    }
   }
-  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
-  $form->{exchangerate} = $form->{forex} if $form->{forex};
-
   for my $i (1 .. $form->{paidaccounts}) {
     next unless $form->{"paid_$i"};
     map { $form->{"${_}_$i"}   = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
@@ -982,7 +1086,8 @@ sub post_payment {
     }
   }
 
-  ($form->{AR})      = split /--/, $form->{AR};
+  #($form->{AR})      = split /--/, $form->{AR};
+  $form->{AR}      = SL::DB::Manager::Chart->find_by( id => $form->{AR_chart_id} )->accno;
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
   relink_accounts();
   if ( IS->post_payment(\%myconfig, \%$form) ) {
@@ -1044,8 +1149,12 @@ sub post {
   $form->error($locale->text('Cannot post invoice for a closed period!'))
     if ($invdate <= $closedto);
 
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{currency} ne $form->{defaultcurrency});
+  if ($form->{currency} ne $form->{defaultcurrency}) {
+    $form->isblank("exchangerate", $locale->text('Exchangerate missing!'));
+    $form->error($locale->text('Cannot post invoice with negative exchange rate'))
+      unless ($form->parse_amount(\%myconfig, $form->{"exchangerate"}) > 0);
+  }
+
   # advance payment allows only one tax
   if ($form->{type} eq 'invoice_for_advance_payment') {
     my @current_taxaccounts = (split(/ /, $form->{taxaccounts}));
@@ -1078,23 +1187,13 @@ sub post {
     }
   }
 
-  ($form->{AR})        = split /--/, $form->{AR};
+  #($form->{AR})        = split /--/, $form->{AR};
+  $form->{AR}      = SL::DB::Manager::Chart->find_by( id => $form->{AR_chart_id} )->accno;
   ($form->{AR_paid})   = split /--/, $form->{AR_paid};
   $form->{storno}    ||= 0;
 
   $form->{label} = $form->{type} eq 'credit_note' ? $locale->text('Credit Note') : $locale->text('Invoice');
 
-  $form->{id} = 0 if $form->{postasnew};
-
-  # get new invnumber in sequence if no invnumber is given or if posasnew was requested
-  if ($form->{postasnew}) {
-    if ($form->{type} eq "credit_note") {
-      undef($form->{cnnumber});
-    } else {
-      undef($form->{invnumber});
-    }
-  }
-
   relink_accounts();
 
   my $terms        = get_payment_terms_for_invoice();
@@ -1145,6 +1244,14 @@ sub post {
     $form->save_history;
   }
 
+  if ($form->{email_journal_id} && $form->{id} ne "") {
+    my $invoice = SL::DB::Invoice->new(id => $form->{id})->load;
+    my $email_journal = SL::DB::EmailJournal->new(
+      id => delete $form->{email_journal_id}
+    )->load;
+    $email_journal->link_to_record_with_attachment($invoice, delete $::form->{email_attachment_id});
+  }
+
   if (!$form->{no_redirect_after_post}) {
     $form->{action} = 'edit';
     $form->{script} = 'is.pl';
@@ -1155,6 +1262,24 @@ sub post {
   $main::lxdebug->leave_sub();
 }
 
+sub post_and_close {
+  $main::lxdebug->enter_sub();
+  my $locale   = $main::locale;
+  my $form = $::form;
+
+  $form->{no_redirect_after_post} = 1;
+  &post();
+
+  my $callback = $form->{callback}
+    || "controller.pl?action=LoginScreen/user_login";
+  my $msg = $form->{label} . " $form->{invnumber} " . $locale->text('posted!');
+  SL::Helper::Flash::flash_later('info', $msg);
+  print $form->redirect_header($callback);
+  $::dispatcher->end_request;
+
+  $main::lxdebug->leave_sub();
+}
+
 sub print_and_post {
   $main::lxdebug->enter_sub();
 
@@ -1180,7 +1305,11 @@ sub use_as_new {
 
   $main::auth->assert('invoice_edit');
 
-  delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)};
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
+  delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked qr_unstructured_message)};
   $form->{rowcount}--;
   $form->{paidaccounts} = 1;
   $form->{invdate}      = $form->current_date(\%myconfig);
@@ -1189,6 +1318,7 @@ sub use_as_new {
   $form->{employee_id}  = SL::DB::Manager::Employee->current->id;
   $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
   $form->{exchangerate} = $form->{forex} if $form->{forex};
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
 
   $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
 
@@ -1204,6 +1334,10 @@ sub further_invoice_for_advance_payment {
 
   $main::auth->assert('invoice_edit');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
   delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)};
   $form->{convert_from_ar_ids} = $form->{id};
   $form->{id}                  = '';
@@ -1215,6 +1349,7 @@ sub further_invoice_for_advance_payment {
   $form->{employee_id}         = SL::DB::Manager::Employee->current->id;
   $form->{forex}               = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
   $form->{exchangerate}        = $form->{forex} if $form->{forex};
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
 
   $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
 
@@ -1227,6 +1362,10 @@ sub final_invoice {
 
   $main::auth->assert('invoice_edit');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
   my $related_invoices = IS->_get_invoices_for_advance_payment($form->{id});
 
   delete @{ $form }{qw(printed emailed queued invnumber invdate exchangerate forex deliverydate datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)};
@@ -1242,6 +1381,7 @@ sub final_invoice {
   $form->{employee_id}         = SL::DB::Manager::Employee->current->id;
   $form->{forex}               = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
   $form->{exchangerate}        = $form->{forex} if $form->{forex};
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
 
   foreach my $i (1 .. $form->{"rowcount"}) {
     delete $form->{"id_$i"};
@@ -1298,8 +1438,15 @@ sub storno {
   $form->{addition}  = "STORNO";
   $form->save_history;
 
+  my $email_journal_id    = delete $form->{workflow_email_journal_id};
+  my $email_attachment_id = delete $form->{workflow_email_attachment_id};
+  my $callback            = delete $form->{workflow_email_callback};
   map({ my $key = $_; delete($form->{$key}) unless (grep({ $key eq $_ } qw(id login password type))); } keys(%{ $form }));
 
+  $form->{email_journal_id}    = $email_journal_id;
+  $form->{email_attachment_id} = $email_attachment_id;
+  $form->{callback}            = $callback;
+
   invoice_links();
   prepare_invoice();
   relink_accounts();
@@ -1320,7 +1467,15 @@ sub storno {
   # set new persistent ids for storno invoice items
   $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
 
-  post();
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+  # post expects the field as user input
+  $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate});
+  $form->{script}       = 'is.pl';
+  if ($form->{callback}) {
+    post_and_close();
+  } else {
+    post();
+  }
   $main::lxdebug->leave_sub();
 }
 
@@ -1349,6 +1504,12 @@ sub credit_note {
 
   $main::auth->assert('invoice_edit');
 
+  $form->{email_journal_id}    = delete $form->{workflow_email_journal_id};
+  $form->{email_attachment_id} = delete $form->{workflow_email_attachment_id};
+  $form->{callback}            = delete $form->{workflow_email_callback};
+
+  $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+
   $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
   $form->{duedate} =
     $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
@@ -1406,6 +1567,59 @@ sub credit_note {
   $main::lxdebug->leave_sub();
 }
 
+sub credit_note_from_reclamation {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('invoice_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  if (!$form->{form_validity_token}) {
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
+  }
+
+  my $from_id = delete $form->{from_id};
+  my $reclamation = SL::DB::Reclamation->new(id => $from_id)->load;
+
+  $reclamation->flatten_to_form($form, format_amounts => 1);
+
+  # set new persistent ids for credit note and link previous reclamation id
+  $form->{convert_from_reclamations_ids} = $form->{id};
+  $form->{id}     = '';
+
+  $form->{"converted_from_reclamation_items_id_$_"} = delete $form->{"reclamation_items_id_$_"} for 1 .. $form->{"rowcount"};
+
+  $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
+  $form->{duedate} =
+    $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+
+  $form->{title}  = $locale->text('Add Credit Note');
+  $form->{script} = 'is.pl';
+
+  # bo creates the id, reset it
+  map { delete $form->{$_} }
+    qw(id invnumber subject message cc bcc printed emailed queued);
+  $form->{ $form->{vc} } =~ s/--.*//g;
+
+  $form->{type} = "credit_note";
+
+  my $currency = $form->{currency};
+  &invoice_links;
+  $form->{currency}     = $currency;
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, 'buy');
+  $form->{exchangerate} = $form->{forex} || '';
+
+  $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
+
+  &prepare_invoice;
+
+  &display_form;
+
+  $main::lxdebug->leave_sub();
+}
+
 sub display_form {
   $::lxdebug->enter_sub;
 
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index d8593351b..797f7182e 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -35,15 +35,20 @@
 
 use Carp;
 use POSIX qw(strftime);
+use Try::Tiny;
 
 use SL::DB::Order;
+use SL::DB::OrderItem;
 use SL::DO;
 use SL::FU;
 use SL::OE;
 use SL::IR;
 use SL::IS;
+use SL::Helper::Flash qw(flash_later);
 use SL::Helper::UserPreferences::DisplayPreferences;
+use SL::Helper::ShippedQty;
 use SL::MoreCommon qw(ary_diff restore_form save_form);
+use SL::Presenter::ItemsList;
 use SL::ReportGenerator;
 use SL::YAML;
 use List::MoreUtils qw(uniq any none);
@@ -54,6 +59,7 @@ use SL::Controller::Order;
 use SL::DB::Customer;
 use SL::DB::TaxZone;
 use SL::DB::PaymentTerm;
+use SL::DB::ValidityToken;
 use SL::DB::Vendor;
 
 require "bin/mozilla/common.pl";
@@ -78,17 +84,23 @@ use strict;
 # $locale->text('Workflow sales_quotation');
 
 my $oe_access_map = {
-  'sales_order'       => 'sales_order_edit',
-  'purchase_order'    => 'purchase_order_edit',
-  'request_quotation' => 'request_quotation_edit',
-  'sales_quotation'   => 'sales_quotation_edit',
+  'sales_order_intake'          => 'sales_order_edit',
+  'sales_order'                 => 'sales_order_edit',
+  'purchase_order'              => 'purchase_order_edit',
+  'purchase_order_confirmation' => 'purchase_order_edit',
+  'request_quotation'           => 'request_quotation_edit',
+  'sales_quotation'             => 'sales_quotation_edit',
+  'purchase_quotation_intake'   => 'request_quotation_edit',
 };
 
 my $oe_view_access_map = {
-  'sales_order'       => 'sales_order_edit       | sales_order_view',
-  'purchase_order'    => 'purchase_order_edit    | purchase_order_view',
-  'request_quotation' => 'request_quotation_edit | request_quotation_view',
-  'sales_quotation'   => 'sales_quotation_edit   | sales_quotation_view',
+  'sales_order_intake'          => 'sales_order_edit       | sales_order_view',
+  'sales_order'                 => 'sales_order_edit       | sales_order_view',
+  'purchase_order'              => 'purchase_order_edit    | purchase_order_view',
+  'purchase_order_confirmation' => 'purchase_order_edit  | purchase_order_view',
+  'request_quotation'           => 'request_quotation_edit | request_quotation_view',
+  'sales_quotation'             => 'sales_quotation_edit   | sales_quotation_view',
+  'purchase_quotation_intake'   => 'request_quotation_edit | request_quotation_view',
 };
 
 sub check_oe_access {
@@ -111,143 +123,61 @@ sub check_oe_conversion_to_sales_invoice_allowed {
   return 0;
 }
 
-sub set_headings {
+sub new_sales_order {
   $main::lxdebug->enter_sub();
 
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
   check_oe_access();
 
-  my ($action) = @_;
-
-  if ($form->{type} eq 'purchase_order') {
-    $form->{title}   = $action eq "edit" ?
-      $locale->text('Edit Purchase Order') :
-      $locale->text('Add Purchase Order');
-    $form->{heading} = $locale->text('Purchase Order');
-    $form->{vc}      = 'vendor';
-  }
-  if ($form->{type} eq 'sales_order') {
-    $form->{title}   = $action eq "edit" ?
-      $locale->text('Edit Sales Order') :
-      $locale->text('Add Sales Order');
-    $form->{heading} = $locale->text('Sales Order');
-    $form->{vc}      = 'customer';
-  }
-  if ($form->{type} eq 'request_quotation') {
-    $form->{title}   = $action eq "edit" ?
-      $locale->text('Edit Request for Quotation') :
-      $locale->text('Add Request for Quotation');
-    $form->{heading} = $locale->text('Request for Quotation');
-    $form->{vc}      = 'vendor';
-  }
-  if ($form->{type} eq 'sales_quotation') {
-    $form->{title}   = $action eq "edit" ?
-      $locale->text('Edit Quotation') :
-      $locale->text('Add Quotation');
-    $form->{heading} = $locale->text('Quotation');
-    $form->{vc}      = 'customer';
-  }
-
-  $main::lxdebug->leave_sub();
-}
-
-sub add {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  set_headings("add");
-
-  $form->{callback} =
-    "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}"
-    unless $form->{callback};
-
-  $form->{show_details} = $::myconfig{show_form_details};
-
-  order_links(is_new => 1);
-  &prepare_order;
-  &display_form;
+  my $c = SL::Controller::Order->new;
+  $c->action_edit_collective();
 
   $main::lxdebug->leave_sub();
+  $::dispatcher->end_request;
 }
 
-sub edit {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  $form->{show_details}                = $::myconfig{show_form_details};
-  $form->{taxincluded_changed_by_user} = 1;
-
-  # show history button
-  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
-  #/show hhistory button
-
-  $form->{simple_save} = 0;
-
-  set_headings("edit");
-
-  # editing without stuff to edit? try adding it first
-  if ($form->{rowcount} && !$form->{print_and_save}) {
-    if ($::instance_conf->get_feature_experimental_order) {
-      my $c = SL::Controller::Order->new;
-      $c->action_edit_collective();
-
-      $main::lxdebug->leave_sub();
-      $::dispatcher->end_request;
-    }
-
-    my $id;
-    map { $id++ if $form->{"multi_id_$_"} } (1 .. $form->{rowcount});
-    if (!$id) {
-
-      # reset rowcount
-      undef $form->{rowcount};
-      &add;
-      $main::lxdebug->leave_sub();
-      return;
-    }
-  } elsif (!$form->{id}) {
-    &add;
-    $main::lxdebug->leave_sub();
-    return;
-  }
-
-  my ($language_id, $printer_id);
-  if ($form->{print_and_save}) {
-    $form->{action}   = "dispatcher";
-    $form->{action_print}   = "1";
-    $form->{resubmit} = 1;
-    $language_id = $form->{language_id};
-    $printer_id = $form->{printer_id};
-  }
-
-  set_headings("edit");
-
-  &order_links;
-
-  $form->{rowcount} = 0;
-  foreach my $ref (@{ $form->{form_details} }) {
-    $form->{rowcount}++;
-    map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{$ref};
+sub convert_to_delivery_orders {
+  # collect order ids
+  my @multi_ids = map {
+    $_ =~ m{^multi_id_(\d+)$} && $::form->{'multi_id_' . $1} && $::form->{'trans_id_' . $1}
+  } grep { $_ =~ m{^multi_id_\d+$} } keys %$::form;
+
+  # make new delivery orders from given orders
+  my @orders = map { SL::DB::Order->new(id => $_)->load } @multi_ids;
+  my @do_ids;
+  my @failed;
+  foreach my $order (@orders) {
+    # Only consider not delivered quantities.
+    SL::Helper::ShippedQty->new->calculate($order)->write_to(\@{$order->items});
+
+    my @items_with_not_delivered_qty =
+      grep {$_->qty > 0}
+      map  {$_->qty($_->qty - $_->shipped_qty); $_}
+      @{$order->items_sorted};
+
+    my $delivery_order;
+    try {
+      die t8('no undelivered items') if !@items_with_not_delivered_qty;
+      $delivery_order = $order->convert_to_delivery_order(items => \@items_with_not_delivered_qty);
+    } catch {
+      push @failed, {ordnumber => $order->ordnumber, error => $_};
+    };
+    push @do_ids, $delivery_order->id if $delivery_order;
   }
 
-  &prepare_order;
+  require "bin/mozilla/do.pl";
+  $::form->{script}        = 'do.pl';
+  $::form->{type}          = 'sales_delivery_order';
+  $::form->{ids}           = \@do_ids;
+  $::form->{"l_$_"}        = 'Y' for qw(donumber ordnumber cusordnumber transdate reqdate name employee);
+  $::form->{top_info_text} = $::locale->text('Converted delivery orders');
 
-  if ($form->{print_and_save}) {
-    $form->{language_id} = $language_id;
-    $form->{printer_id} = $printer_id;
+  flash('info', t8('#1 salses orders were converted to #2 delivery orders', scalar @orders, scalar @do_ids));
+  if (@failed) {
+    flash('error', t8('The following orders could not be converted to delivery orders:'));
+    flash('error', $_->{ordnumber} . ': ' . $_->{error}) for @failed;
   }
 
-  &display_form;
-
-  $main::lxdebug->leave_sub();
+  orders();
 }
 
 sub order_links {
@@ -317,152 +247,6 @@ sub prepare_order {
   $main::lxdebug->leave_sub();
 }
 
-sub setup_oe_action_bar {
-  my %params = @_;
-  my $form   = $::form;
-
-  my $has_active_periodic_invoice;
-  if ($params{oe_obj}) {
-    $has_active_periodic_invoice =
-         $params{oe_obj}->is_type('sales_order')
-      && $params{oe_obj}->periodic_invoices_config
-      && $params{oe_obj}->periodic_invoices_config->active
-      && (   !$params{oe_obj}->periodic_invoices_config->end_date
-          || ($params{oe_obj}->periodic_invoices_config->end_date > DateTime->today_local))
-      && $params{oe_obj}->periodic_invoices_config->get_previous_billed_period_start_date;
-  }
-
-  my $allow_invoice      = $params{is_req_quo}
-                        || $params{is_pur_ord}
-                        || ($params{is_sales_quo} && $::instance_conf->get_allow_sales_invoice_from_sales_quotation)
-                        || ($params{is_sales_ord} && $::instance_conf->get_allow_sales_invoice_from_sales_order);
-  my @req_trans_cost_art = qw(kivi.SalesPurchase.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
-  my @warn_p_invoice     = qw(kivi.SalesPurchase.oe_warn_save_active_periodic_invoice)  x!!$has_active_periodic_invoice;
-
-  for my $bar ($::request->layout->get('actionbar')) {
-    $bar->add(
-      action => [
-        t8('Update'),
-        submit    => [ '#form', { action => "update" } ],
-        id        => 'update_button',
-        accesskey => 'enter',
-      ],
-
-      combobox => [
-        action => [
-          t8('Save'),
-          submit  => [ '#form', { action => "save" } ],
-          checks  => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
-        ],
-        action => [
-          t8('Save as new'),
-          submit   => [ '#form', { action => "save_as_new" } ],
-          checks   => [ 'kivi.validate_form', @req_trans_cost_art ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-        ],
-        action => [
-          t8('Save and Close'),
-          submit  => [ '#form', { action => "save_and_close" } ],
-          checks  => [ 'kivi.validate_form', @req_trans_cost_art, @warn_p_invoice ],
-        ],
-        action => [
-          t8('Delete'),
-          submit   => [ '#form', { action => "delete" } ],
-          confirm  => t8('Do you really want to delete this object?'),
-          disabled => !$form->{id}                                                                      ? t8('This record has not been saved yet.')
-                    : (   ($params{is_sales_ord} && !$::instance_conf->get_sales_order_show_delete)
-                       || ($params{is_pur_ord}   && !$::instance_conf->get_purchase_order_show_delete)) ? t8('Deleting this type of record has been disabled in the configuration.')
-                    :                                                                                     undef,
-        ],
-      ], # end of combobox "Save"
-
-      'separator',
-
-      combobox => [
-        action => [ t8('Workflow') ],
-        action => [
-          t8('Sales Order'),
-          submit   => [ '#form', { action => "sales_order" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $params{is_sales_quo} || $params{is_pur_ord},
-        ],
-        action => [
-          t8('Purchase Order'),
-          submit   => [ '#form', { action => "purchase_order" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $params{is_sales_ord} || $params{is_req_quo},
-        ],
-        action => [
-          t8('Delivery Order'),
-          submit   => [ '#form', { action => "delivery_order" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $params{is_sales_ord} || $params{is_pur_ord},
-        ],
-        action => [
-          t8('Invoice'),
-          submit   => [ '#form', { action => "invoice" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $allow_invoice,
-        ],
-        action => [
-          t8('Quotation'),
-          submit   => [ '#form', { action => "quotation" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $params{is_sales_ord},
-        ],
-        action => [
-          t8('Request for Quotation'),
-          submit   => [ '#form', { action => "request_for_quotation" } ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          checks   => [ 'kivi.validate_form' ],
-          only_if  => $params{is_pur_ord},
-        ],
-      ], # end of combobox "Workflow"
-
-      combobox => [
-        action => [ t8('Export') ],
-        action => [
-          t8('Print'),
-          call   => [ 'kivi.SalesPurchase.show_print_dialog' ],
-          checks => [ 'kivi.validate_form' ],
-        ],
-        action => [
-          t8('E Mail'),
-          call     => [ 'kivi.SalesPurchase.show_email_dialog' ],
-          checks   => [ 'kivi.validate_form' ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-        ],
-        action => [
-          t8('Download attachments of all parts'),
-          call     => [ 'kivi.File.downloadOrderitemsFiles', $::form->{type}, $::form->{id} ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-          only_if  => $::instance_conf->get_doc_storage,
-        ],
-      ], #end of combobox "Export"
-
-      combobox => [
-        action => [ t8('more') ],
-        action => [
-          t8('History'),
-          call     => [ 'set_history_window', $form->{id} * 1, 'id' ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-        ],
-        action => [
-          t8('Follow-Up'),
-          call     => [ 'follow_up_window' ],
-          disabled => !$form->{id} ? t8('This record has not been saved yet.') : undef,
-        ],
-      ], # end of combobox "more"
-    );
-  }
-  $::request->layout->add_javascripts('kivi.Validator.js');
-}
-
 sub setup_oe_search_action_bar {
   my %params = @_;
 
@@ -486,448 +270,25 @@ sub setup_oe_orders_action_bar {
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
-      action => [
-        t8('New sales order'),
-        submit    => [ '#form', { action => 'edit' } ],
-        checks    => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ],
-        accesskey => 'enter',
+      combobox => [
+        action => [
+          t8('Actions'),
+        ],
+        action => [
+          t8('New sales order'),
+          submit    => [ '#form', { action => 'new_sales_order' } ],
+          checks    => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ],
+        ],
+        action => [
+          t8('Convert to delivery orders'),
+          submit => [ '#form', { action => 'convert_to_delivery_orders' } ],
+          checks => [ [ 'kivi.check_if_entries_selected', '[name^=multi_id_]' ] ],
+        ],
       ],
     );
   }
 }
 
-sub form_header {
-  $main::lxdebug->enter_sub();
-  my @custom_hiddens;
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-  my $cgi      = $::request->{cgi};
-
-  check_oe_access();
-
-  # Container for template variables. Unfortunately this has to be
-  # visible in form_footer too, so package local level and not my here.
-  my $TMPL_VAR = $::request->cache('tmpl_var', {});
-  if ($form->{id}) {
-    $TMPL_VAR->{oe_obj} = SL::DB::Order->new(id => $form->{id})->load;
-  }
-  $TMPL_VAR->{vc_obj} = SL::DB::Customer->new(id => $form->{customer_id})->load if $form->{customer_id};
-  $TMPL_VAR->{vc_obj} = SL::DB::Vendor->new(id => $form->{vendor_id})->load     if $form->{vendor_id};
-
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
-
-  my $current_employee   = SL::DB::Manager::Employee->current;
-  $form->{employee_id}   = $form->{old_employee_id} if $form->{old_employee_id};
-  $form->{salesman_id}   = $form->{old_salesman_id} if $form->{old_salesman_id};
-  $form->{employee_id} ||= $current_employee->id;
-  $form->{salesman_id} ||= $current_employee->id;
-
-  # openclosed checkboxes
-  my @tmp;
-  push @tmp, sprintf qq|<input name="delivered" id="delivered" type="checkbox" class="checkbox" value="1" %s><label for="delivered">%s</label>|,
-                        $form->{"delivered"} ? "checked" : "",  $locale->text('Delivery Order(s) for full qty created') if $form->{"type"} =~ /_order$/;
-  push @tmp, sprintf qq|<input name="closed" id="closed" type="checkbox" class="checkbox" value="1" %s><label for="closed">%s</label>|,
-                        $form->{"closed"}    ? "checked" : "",  $locale->text('Closed')    if $form->{id};
-  $TMPL_VAR->{openclosed} = sprintf qq|<tr><td colspan=%d align=center>%s</td></tr>\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp;
-
-  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
-
-  $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
-                   "currencies"    => "ALL_CURRENCIES",
-                   "price_factors" => "ALL_PRICE_FACTORS");
-  $form->{ALL_PAYMENTS} = SL::DB::Manager::PaymentTerm->get_all( where => [ or => [ obsolete => 0, id => $form->{payment_id} || undef ] ]);
-
-  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
-  $form->{ALL_LANGUAGES}   = SL::DB::Manager::Language->get_all_sorted;
-
-  # Projects
-  my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
-  my @old_ids_cond    = @old_project_ids ? (id => \@old_project_ids) : ();
-  my @customer_cond;
-  if (($vc eq 'customers') && $::instance_conf->get_customer_projects_only_in_sales) {
-    @customer_cond = (
-      or => [
-        customer_id          => $::form->{customer_id},
-        billable_customer_id => $::form->{customer_id},
-      ]);
-  }
-  my @conditions = (
-    or => [
-      and => [ active => 1, @customer_cond ],
-      @old_ids_cond,
-    ]);
-
-  $TMPL_VAR->{ALL_PROJECTS}          = SL::DB::Manager::Project->get_all_sorted(query => \@conditions);
-  $form->{ALL_PROJECTS}            = $TMPL_VAR->{ALL_PROJECTS}; # make projects available for second row drop-down in io.pl
-
-  # label subs
-  my $employee_list_query_gen      = sub { $::form->{$_[0]} ? [ or => [ id => $::form->{$_[0]}, deleted => 0 ] ] : [ deleted => 0 ] };
-  $TMPL_VAR->{ALL_EMPLOYEES}         = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('employee_id'));
-  $TMPL_VAR->{ALL_SALESMEN}          = SL::DB::Manager::Employee->get_all_sorted(query => $employee_list_query_gen->('salesman_id'));
-  $TMPL_VAR->{ALL_SHIPTO}            = SL::DB::Manager::Shipto->get_all_sorted(query => [
-    or => [ trans_id  => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
-  ]);
-  $TMPL_VAR->{ALL_CONTACTS}          = SL::DB::Manager::Contact->get_all_sorted(query => [
-    or => [
-      cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
-      and      => [
-        cp_cv_id => undef,
-        cp_id    => $::form->{cp_id} * 1
-      ]
-    ]
-  ]);
-  $TMPL_VAR->{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
-
-  # currencies and exchangerate
-  $form->{currency}            = $form->{defaultcurrency} unless $form->{currency};
-  $TMPL_VAR->{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
-  push @custom_hiddens, "forex";
-  push @custom_hiddens, "exchangerate" if $form->{forex};
-
-  # credit remaining
-  my $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0;
-  $TMPL_VAR->{is_credit_remaining_negativ} = ($form->{creditremaining} =~ /-/) ? "0" : "1";
-
-  # business
-  $TMPL_VAR->{business_label} = ($form->{vc} eq "customer" ? $locale->text('Customer type') : $locale->text('Vendor type'));
-
-  push @custom_hiddens, "customer_pricegroup_id" if $form->{vc} eq 'customer';
-
-  my $credittext = $locale->text('Credit Limit exceeded!!!');
-
-  my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
-  $follow_up_vc                   =~ s/--\d*\s*$//;
-  $TMPL_VAR->{follow_up_trans_info} =  ($form->{type} =~ /_quotation$/ ? $form->{quonumber} : $form->{ordnumber}) . " ($follow_up_vc)";
-
-  if ($form->{id}) {
-    my $follow_ups = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1);
-
-    if (scalar @{ $follow_ups }) {
-      $TMPL_VAR->{num_follow_ups}     = scalar                    @{ $follow_ups };
-      $TMPL_VAR->{num_due_follow_ups} = sum map { $_->{due} * 1 } @{ $follow_ups };
-    }
-  }
-
-  my $dispatch_to_popup = '';
-  if ($form->{resubmit} && ($form->{format} eq "html")) {
-      $dispatch_to_popup  = "window.open('about:blank','Beleg'); document.oe.target = 'Beleg';";
-      $dispatch_to_popup .= "document.do.submit();";
-  } elsif ($form->{resubmit}  && $form->{action_print}) {
-    # emulate click for resubmitting actions
-    $dispatch_to_popup  = "kivi.SalesPurchase.show_print_dialog(); kivi.SalesPurchase.print_record();";
-  } elsif ($creditwarning) {
-    $::request->{layout}->add_javascripts_inline("alert('$credittext');");
-  }
-
-  $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
-  $TMPL_VAR->{dateformat}                             = $myconfig{dateformat};
-  $TMPL_VAR->{numberformat}                           = $myconfig{numberformat};
-  $TMPL_VAR->{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage();
-
-  if ($form->{type} eq 'sales_order') {
-    if (!$form->{periodic_invoices_config}) {
-      $form->{periodic_invoices_status} = $locale->text('not configured');
-
-    } else {
-      my $config                        = SL::YAML::Load($form->{periodic_invoices_config});
-      $form->{periodic_invoices_status} = $config->{active} ? $locale->text('active') : $locale->text('inactive');
-    }
-  }
-
-  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase kivi.File kivi.Part kivi.CustomerVendor kivi.Validator show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io));
-
-
-  # original snippets:
-  my %type_check_vars = (
-    is_sales     => scalar($form->{type} =~ /^sales_/),
-    is_order     => scalar($form->{type} =~ /_order$/),
-    is_sales_quo => scalar($form->{type} =~ /sales_quotation$/),
-    is_req_quo   => scalar($form->{type} =~ /request_quotation$/),
-    is_sales_ord => scalar($form->{type} =~ /sales_order$/),
-    is_pur_ord   => scalar($form->{type} =~ /purchase_order$/),
-  );
-
-  setup_oe_action_bar(
-    %type_check_vars,
-    oe_obj => $TMPL_VAR->{oe_obj},
-    vc_obj => $TMPL_VAR->{vc_obj},
-  );
-
-  $form->header;
-  if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) {
-      $form->{shipto_id} = $form->{CFDD_shipto_id};
-  }
-
-  $TMPL_VAR->{HIDDENS} = [ map { name => $_, value => $form->{$_} },
-     qw(id type vc proforma queued printed emailed
-        title creditlimit creditremaining tradediscount business
-        max_dunning_level dunning_amount
-        CFDD_shipto CFDD_shipto_id
-        taxpart taxservice taxaccounts cursor_fokus
-        show_details useasnew),
-        @custom_hiddens,
-        map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } split / /, $form->{taxaccounts} ];  # deleted: discount
-
-  $TMPL_VAR->{$_} = $type_check_vars{$_} for keys %type_check_vars;
-
-  $TMPL_VAR->{ORDER_PROBABILITIES} = [ map { { title => ($_ * 10) . '%', id => $_ * 10 } } (0..10) ];
-
-  if ($type_check_vars{is_sales} && $::instance_conf->get_transport_cost_reminder_article_number_id) {
-    $TMPL_VAR->{transport_cost_reminder_article} = SL::DB::Part->new(id => $::instance_conf->get_transport_cost_reminder_article_number_id)->load;
-  }
-
-  print $form->parse_html_template("oe/form_header", {
-    %$TMPL_VAR,
-    %type_check_vars,
-  });
-
-  $main::lxdebug->leave_sub();
-}
-
-sub form_footer {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  check_oe_access();
-
-  $form->{invtotal} = $form->{invsubtotal};
-
-  my $TMPL_VAR = $::request->cache('tmpl_var', {});
-
-  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
-    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
-    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
-  }
-
-  if (!$form->{taxincluded}) {
-
-    foreach my $item (split / /, $form->{taxaccounts}) {
-      if ($form->{"${item}_base"}) {
-        $form->{invtotal} += $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
-        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-
-        $TMPL_VAR->{tax} .= qq|
-              <tr>
-                <th align=right>$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
-                <td align=right>$form->{"${item}_total"}</td>
-              </tr> |;
-      }
-    }
-  } else {
-    foreach my $item (split / /, $form->{taxaccounts}) {
-      if ($form->{"${item}_base"}) {
-        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);
-        $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
-        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
-        $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
-
-        $TMPL_VAR->{tax} .= qq|
-              <tr>
-                <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
-                <td align=right>$form->{"${item}_total"}</td>
-              </tr>
-              <tr>
-                <th align=right>Nettobetrag</th>
-                <td align=right>$form->{"${item}_netto"}</td>
-              </tr> |;
-      }
-    }
-  }
-
-  my $grossamount = $form->{invtotal};
-  $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1);
-  $form->{rounding} = $form->round_amount(
-    $form->{invtotal} - $form->round_amount($grossamount, 2),
-    2
-  );
-  $form->{oldinvtotal} = $form->{invtotal};
-
-  $TMPL_VAR->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
-
-  my $print_options_html = setup_sales_purchase_print_options();
-
-  my $shipto_cvars       = SL::DB::Shipto->new->cvars_by_config;
-  foreach my $var (@{ $shipto_cvars }) {
-    my $name = "shiptocvar_" . $var->config->name;
-    $var->value($form->{$name}) if exists $form->{$name};
-  }
-
-  print $form->parse_html_template("oe/form_footer", {
-     %$TMPL_VAR,
-     print_options   => $print_options_html,
-     is_sales        => scalar ($form->{type} =~ /^sales_/),              # these vars are exported, so that the template
-     is_order        => scalar ($form->{type} =~ /_order$/),              # may determine what to show
-     is_sales_quo    => scalar ($form->{type} =~ /sales_quotation$/),
-     is_req_quo      => scalar ($form->{type} =~ /request_quotation$/),
-     is_sales_ord    => scalar ($form->{type} =~ /sales_order$/),
-     is_pur_ord      => scalar ($form->{type} =~ /purchase_order$/),
-     shipto_cvars    => $shipto_cvars,
-  });
-
-  $main::lxdebug->leave_sub();
-}
-
-sub update {
-  $main::lxdebug->enter_sub();
-
-  my ($recursive_call) = @_;
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  check_oe_access();
-
-  set_headings($form->{"id"} ? "edit" : "add");
-
-  $form->{update} = 1;
-
-  my $vc = $form->{vc};
-  if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
-    $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
-
-    if ($vc eq 'customer') {
-      IS->get_customer(\%myconfig, $form);
-      $::form->{billing_address_id} = $::form->{default_billing_address_id};
-    } else {
-      IR->get_vendor(\%myconfig, $form);
-    }
-  }
-
-  if (!$form->{forex}) {        # read exchangerate from input field (not hidden)
-    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate) unless $recursive_call;
-  }
-  my $buysell           = 'buy';
-  $buysell              = 'sell' if ($form->{vc} eq 'vendor');
-  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{transdate}, $buysell);
-  $form->{exchangerate} = $form->{forex} if $form->{forex};
-
-  my $exchangerate = $form->{exchangerate} || 1;
-
-##################### process items ######################################
-  # for pricegroups
-  my $i = $form->{rowcount};
-  if (   ($form->{"partnumber_$i"} eq "")
-      && ($form->{"description_$i"} eq "")
-      && ($form->{"partsgroup_$i"}  eq "")) {
-
-    $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid});
-
-    &check_form;
-  } else {
-
-    my $mode;
-    if ($form->{type} =~ /^sales/) {
-      IS->retrieve_item(\%myconfig, \%$form);
-      $mode = 'IS';
-    } else {
-      IR->retrieve_item(\%myconfig, \%$form);
-      $mode = 'IR';
-    }
-
-    my $rows = scalar @{ $form->{item_list} };
-
-    $form->{"discount_$i"}   = $form->parse_amount(\%myconfig, $form->{"discount_$i"}) / 100.0;
-    $form->{"discount_$i"} ||= $form->{"$form->{vc}_discount"};
-
-    $form->{"lastcost_$i"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$i"});
-
-    if ($rows) {
-
-      $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
-      if( !$form->{"qty_$i"} ) {
-        $form->{"qty_$i"} = 1;
-      }
-
-      if ($rows > 1) {
-
-        select_item(mode => $mode, pre_entered_qty => $form->{"qty_$i"});
-        $::dispatcher->end_request;
-
-      } else {
-
-        my $sellprice             = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
-        # hier werden parts (Artikeleigenschaften) aus item_list (retrieve_item aus IS.pm)
-        # (item wahrscheinlich synonym für parts) entsprechend in die form geschrieben ...
-
-        # Wäre dieses Mapping nicht besser in retrieve_items aufgehoben?
-        #(Eine Funktion bekommt Daten -> ARBEIT -> Rückgabe DATEN)
-        #  Das quot sieht doch auch nach Überarbeitung aus ... (hmm retrieve_items gibt es in IS und IR)
-        map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g }    qw(partnumber description unit);
-        map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
-
-        # ... deswegen muss die prüfung, ob es sich um einen nicht rabattierfähigen artikel handelt später erfolgen (Bug 1136)
-        $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"};
-        $form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
-
-        $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
-
-        ($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/;
-        my $dec_qty       = length $1;
-        my $decimalplaces = max 2, $dec_qty;
-
-        if ($sellprice) {
-          $form->{"sellprice_$i"} = $sellprice;
-        } else {
-          my $record        = _make_record();
-          my $price_source  = SL::PriceSource->new(record_item => $record->items->[$i-1], record => $record);
-          my $best_price    = $price_source->best_price;
-          my $best_discount = $price_source->best_discount;
-
-          if ($best_price) {
-            $::form->{"sellprice_$i"}           = $best_price->price;
-            $::form->{"active_price_source_$i"} = $best_price->source;
-          }
-          if ($best_discount) {
-            $::form->{"discount_$i"}               = $best_discount->discount;
-            $::form->{"active_discount_source_$i"} = $best_discount->source;
-          }
-
-          $form->{"sellprice_$i"} /= $exchangerate;   # if there is an exchange rate adjust sellprice
-        }
-
-        my $amount = $form->{"sellprice_$i"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"});
-        map { $form->{"${_}_base"} = 0 }                                 split / /, $form->{taxaccounts};
-        map { $form->{"${_}_base"} += $amount }                          split / /, $form->{"taxaccounts_$i"};
-        map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{taxaccounts} if !$form->{taxincluded};
-
-        $form->{creditremaining} -= $amount;
-
-        $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
-        $form->{"lastcost_$i"}  = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
-        $form->{"qty_$i"}       = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-        $form->{"discount_$i"}  = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100.0);
-      }
-
-      display_form();
-    } else {
-
-      # ok, so this is a new part
-      # ask if it is a part or service item
-
-      if (   $form->{"partsgroup_$i"}
-          && ($form->{"partsnumber_$i"} eq "")
-          && ($form->{"description_$i"} eq "")) {
-        $form->{rowcount}--;
-        $form->{"discount_$i"} = "";
-
-        display_form();
-      } else {
-        $form->{"id_$i"}   = 0;
-        new_item();
-      }
-    }
-  }
-##################### process items ######################################
-
-
-  $main::lxdebug->leave_sub();
-}
-
 sub search {
   $main::lxdebug->enter_sub();
 
@@ -943,16 +304,34 @@ sub search {
     $form->{title}     = $locale->text('Purchase Orders');
     $form->{ordlabel}  = $locale->text('Order Number');
 
+  } elsif ($form->{type} eq 'purchase_order_confirmation') {
+    $form->{vc}        = 'vendor';
+    $form->{ordnrname} = 'ordnumber';
+    $form->{title}     = $locale->text('Purchase Order Confirmations');
+    $form->{ordlabel}  = $locale->text('Order Confirmation Number');
+
   } elsif ($form->{type} eq 'request_quotation') {
     $form->{vc}        = 'vendor';
     $form->{ordnrname} = 'quonumber';
     $form->{title}     = $locale->text('Request for Quotations');
     $form->{ordlabel}  = $locale->text('RFQ Number');
 
+  } elsif ($form->{type} eq 'purchase_quotation_intake') {
+    $form->{vc}        = 'vendor';
+    $form->{ordnrname} = 'quonumber';
+    $form->{title}     = $locale->text('Purchase Quotation Intakes');
+    $form->{ordlabel}  = $locale->text('Quotation Number');
+
+  } elsif ($form->{type} eq 'sales_order_intake') {
+    $form->{vc}        = 'customer';
+    $form->{ordnrname} = 'ordnumber';
+    $form->{title}     = $locale->text('Sales Order Intakes');
+    $form->{ordlabel}  = $locale->text('Order Number');
+
   } elsif ($form->{type} eq 'sales_order') {
     $form->{vc}        = 'customer';
     $form->{ordnrname} = 'ordnumber';
-    $form->{title}     = $locale->text('Sales Orders');
+    $form->{title}     = $locale->text('Sales Order Confirmations');
     $form->{ordlabel}  = $locale->text('Order Number');
 
   } elsif ($form->{type} eq 'sales_quotation') {
@@ -969,8 +348,9 @@ sub search {
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },
                    "taxzones"     => "ALL_TAXZONES",
                    "business_types" => "ALL_BUSINESS_TYPES",);
-  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
-  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+  $form->{ALL_EMPLOYEES}      = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+  $form->{ALL_DEPARTMENTS}    = SL::DB::Manager::Department->get_all;
+  $form->{ALL_ORDER_STATUSES} = SL::DB::Manager::OrderStatus->get_all_sorted;
 
   $form->{CT_CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
   ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE},
@@ -1028,7 +408,7 @@ sub orders {
   my %params   = @_;
   check_oe_access(with_view => 1);
 
-  my $ordnumber = ($form->{type} =~ /_order$/) ? "ordnumber" : "quonumber";
+  my $ordnumber = ($form->{type} =~ /_order_intake$|_order$|purchase_order_confirmation/) ? "ordnumber" : "quonumber";
 
   ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
   report_generator_set_default_sort('transdate', 1);
@@ -1039,7 +419,8 @@ sub orders {
   my @columns = (
     "transdate",               "reqdate",
     "id",                      $ordnumber,
-    "cusordnumber",            "customernumber",
+    "cusordnumber",            "vendor_confirmation_number",
+    "customernumber",
     "name",                    "netamount",
     "tax",                     "amount",
     "remaining_netamount",     "remaining_amount",
@@ -1053,7 +434,10 @@ sub orders {
     "country",                 "shippingpoint",
     "taxzone",                 "insertdate",
     "order_probability",       "expected_billing_date", "expected_netamount",
-    "payment_terms",           "intnotes",
+    "payment_terms",           "intnotes",              "order_status",
+    "items",
+    "shiptoname", "shiptodepartment_1", "shiptodepartment_2", "shiptostreet",
+    "shiptozipcode", "shiptocity", "shiptocountry",
   );
 
   # only show checkboxes if gotten here via sales_order form.
@@ -1072,13 +456,22 @@ sub orders {
     if ($form->{type} eq 'purchase_order') {
       $form->{title}       = $locale->text('Purchase Orders');
       $attachment_basename = $locale->text('purchase_order_list');
+    } elsif ($form->{type} eq 'purchase_order_confirmation') {
+      $form->{title}       = $locale->text('Purchase Order Confirmations');
+      $attachment_basename = $locale->text('purchase_order_confirmation_list');
+    } elsif ($form->{type} eq 'purchase_quotation_intake') {
+      $form->{title}       = $locale->text('Purchase Quotation Intakes');
+      $attachment_basename = $locale->text('purchase_quotation_intake_list');
     } else {
       $form->{title}       = $locale->text('Request for Quotations');
       $attachment_basename = $locale->text('rfq_list');
     }
 
   } else {
-    if ($form->{type} eq 'sales_order') {
+    if ($form->{type} eq 'sales_order_intake') {
+      $form->{title}       = $locale->text('Sales Order Intakes');
+      $attachment_basename = $locale->text('sales_order_intake_list');
+    } elsif ($form->{type} eq 'sales_order') {
       $form->{title}       = $locale->text('Sales Orders');
       $attachment_basename = $locale->text('sales_order_list');
     } else {
@@ -1097,12 +490,19 @@ sub orders {
   push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
-                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id
-                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
-                                                        business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
-                                                        order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
-                                                        parts_partnumber parts_description all department_id intnotes phone_notes fulltext);
+  push @hidden_variables, "l_subtotal", $form->{vc}, qw(
+    l_closed l_notdelivered open closed delivered notdelivered ordnumber
+    quonumber cusordnumber transaction_description transdatefrom transdateto
+    type vc employee_id salesman_id reqdatefrom reqdateto projectnumber
+    project_id periodic_invoices_active periodic_invoices_inactive
+    business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom
+    insertdateto order_probability_op order_probability_value
+    expected_billing_date_from expected_billing_date_to parts_partnumber
+    parts_description all department_id intnotes phone_notes fulltext
+    order_status_id shiptoname shiptodepartment_1 shiptodepartment_2
+    shiptostreet shiptozipcode shiptocity shiptocountry
+    vendor_confirmation_number
+  );
   push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
 
   my   @keys_for_url = grep { $form->{$_} } @hidden_variables;
@@ -1111,11 +511,11 @@ sub orders {
   my $href = $params{want_binary_pdf} ? '' : build_std_url('action=orders', @keys_for_url);
 
   my %column_defs = (
-    'ids'                     => { 'text' => '', },
+    'ids'                     => { raw_header_data => SL::Presenter::Tag::checkbox_tag("", id => "multi_all", checkall => "[data-checkall=1]"), align => 'center' },
     'transdate'               => { 'text' => $locale->text('Date'), },
     'reqdate'                 => { 'text' => $form->{type} =~ /_order/ ? $locale->text('Required by') : $locale->text('Valid until') },
     'id'                      => { 'text' => $locale->text('ID'), },
-    'ordnumber'               => { 'text' => $locale->text('Order'), },
+    'ordnumber'               => { 'text' => $form->{type} eq "purchase_order_confirmation" ? $locale->text('Confirmation'): $locale->text('Order'), },
     'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
     'cusordnumber'            => { 'text' => $locale->text('Customer Order Number'), },
     'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
@@ -1148,17 +548,35 @@ sub orders {
     'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'intnotes'                => { 'text' => $locale->text('Internal Notes'), },
+    'order_status'            => { 'text' => $locale->text('Status'), },
+    'items'                   => { 'text' => $locale->text('Positions'), },
+    shiptoname                => { 'text' => $locale->text('Name (Shipping)'), },
+    shiptodepartment_1        => { 'text' => $locale->text('Department 1 (Shipping)'), },
+    shiptodepartment_2        => { 'text' => $locale->text('Department 2 (Shipping)'), },
+    shiptostreet              => { 'text' => $locale->text('Street (Shipping)'), },
+    shiptozipcode             => { 'text' => $locale->text('Zipcode (Shipping)'), },
+    shiptocity                => { 'text' => $locale->text('City (Shipping)'), },
+    shiptocountry             => { 'text' => $locale->text('Country (Shipping)'), },
+    vendor_confirmation_number => { 'text' => $locale->text('Vendor Confirmation Number'), },
     %column_defs_cvars,
   );
 
-  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) {
+  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber
+                       name employee salesman shipvia transaction_description
+                       shippingpoint taxzone insertdate payment_terms department
+                       intnotes order_status vendor_confirmation_number)) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
 
-  my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr remaining_amount remaining_netamount order_probability expected_billing_date expected_netamount);
+  my %column_alignment =
+    map { $_ => 'right' } qw(netamount tax amount curr
+                             remaining_amount remaining_netamount
+                             order_probability expected_billing_date
+                             expected_netamount);
 
   $form->{"l_type"} = "Y";
+
   map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
   $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0;
 
@@ -1180,12 +598,27 @@ sub orders {
   push @options, $locale->text('Contact Person')          . " : $form->{cp_name}"                         if $form->{cp_name};
   push @options, $locale->text('Department')              . " : $form->{department}"                      if $form->{department};
   push @options, $locale->text('Order Number')            . " : $form->{ordnumber}"                       if $form->{ordnumber};
+  push @options, $locale->text('Vendor Confirmation Number') . " : $form->{vendor_confirmation_number}"   if $form->{vendor_confirmation_number};
   push @options, $locale->text('Customer Order Number')   . " : $form->{cusordnumber}"                    if $form->{cusordnumber};
   push @options, $locale->text('Notes')                   . " : $form->{notes}"                           if $form->{notes};
   push @options, $locale->text('Internal Notes')          . " : $form->{intnotes}"                        if $form->{intnotes};
   push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};
   push @options, $locale->text('Quick Search')            . " : $form->{all}"                             if $form->{all};
   push @options, $locale->text('Shipping Point')          . " : $form->{shippingpoint}"                   if $form->{shippingpoint};
+  push @options, $locale->text('Name (Shipping)')         . " : $form->{shiptoname}"
+                  if $form->{shiptoname};
+  push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}"
+                  if $form->{shiptodepartment_1};
+  push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}"
+                  if $form->{shiptodepartment_2};
+  push @options, $locale->text('Street (Shipping)')       . " : $form->{shiptostreet}"
+                  if $form->{shiptostreet};
+  push @options, $locale->text('Zipcode (Shipping)')      . " : $form->{shiptozipcode}"
+                  if $form->{shiptozipcode};
+  push @options, $locale->text('City (Shipping)')         . " : $form->{shiptocity}"
+                  if $form->{shiptocity};
+  push @options, $locale->text('Country (Shipping)')      . " : $form->{shiptocountry}"
+                  if $form->{shiptocountry};
   push @options, $locale->text('Part Description')        . " : $form->{parts_description}"               if $form->{parts_description};
   push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"                if $form->{parts_partnumber};
   push @options, $locale->text('Phone Notes')             . " : $form->{phone_notes}"                     if $form->{phone_notes};
@@ -1234,6 +667,10 @@ sub orders {
     push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{expected_billing_date_to},   1) if $form->{expected_billing_date_to};
   }
 
+  if ($form->{order_status_id}) {
+    push @options, $locale->text('Status') . " : " . SL::DB::OrderStatus->new(id => $form->{order_status_id})->load->name;
+  }
+
   $report->set_options('top_info_text'        => join("\n", @options),
                        'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),
                        'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'),
@@ -1260,9 +697,7 @@ sub orders {
 
   my $edit_url = $params{want_binary_pdf}
                ? ''
-               : ($::instance_conf->get_feature_experimental_order)
-               ? build_std_url('script=controller.pl', 'action=Order/edit', 'type')
-               : build_std_url('action=edit', 'type', 'vc');
+               : build_std_url('script=controller.pl', 'action=Order/edit', 'type');
   foreach my $oe (@{ $form->{OE} }) {
     map { $oe->{$_} *= $oe->{exchangerate} } @subtotal_columns;
 
@@ -1285,6 +720,7 @@ sub orders {
 
     foreach my $column (@columns) {
       next if ($column eq 'ids');
+      next if ($column eq 'items');
       $row->{$column} = {
         'data'  => $oe->{$column},
         'align' => $column_alignment{$column},
@@ -1293,327 +729,42 @@ sub orders {
 
     $row->{ids} = {
       'raw_data' =>   $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $oe->{id})
-                    . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''),
+                    . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, 'data-checkall' => 1, '-label' => ''),
       'valign'   => 'center',
       'align'    => 'center',
     };
 
-    $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}" unless $params{want_binary_pdf};
-
-    my $row_set = [ $row ];
-
-    if (($form->{l_subtotal} eq 'Y')
-        && (($idx == (scalar @{ $form->{OE} }))
-            || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx]->{ $form->{sort} }))) {
-      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
-    }
-
-    $report->add_data($row_set);
-
-    $idx++;
-  }
-
-  $report->add_separator();
-  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
-  if ($params{want_binary_pdf}) {
-    $report->generate_with_headers();
-    return $report->generate_pdf_content(want_binary_pdf => 1);
-  }
-  setup_oe_orders_action_bar();
-  $report->generate_with_headers();
-
-  $main::lxdebug->leave_sub();
-}
-
-sub check_delivered_flag {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  check_oe_access();
-
-  if (($form->{type} ne 'sales_order') && ($form->{type} ne 'purchase_order')) {
-    return $main::lxdebug->leave_sub();
-  }
-
-  my $all_delivered = 0;
-
-  foreach my $i (1 .. $form->{rowcount}) {
-    next if (!$form->{"id_$i"});
-
-    $form->{"ship_$i"} = 0 if $form->{saveasnew};
-
-    if ($form->parse_amount(\%myconfig, $form->{"qty_$i"}) == $form->parse_amount(\%myconfig, $form->{"ship_$i"})) {
-      $all_delivered = 1;
-      next;
-    }
-
-    $all_delivered = 0;
-    last;
-  }
-
-  $form->{delivered} = 1 if $all_delivered;
-  $form->{delivered} = 0 if $form->{saveasnew};
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_and_close {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  check_oe_access();
-  $form->mtime_ischanged('oe');
-
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
-
-  if ($form->{type} =~ /_order$/) {
-    $form->isblank("transdate", $locale->text('Order Date missing!'));
-  } else {
-    $form->isblank("transdate", $locale->text('Quotation Date missing!'));
-  }
-
-  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
-  $form->{$idx} =~ s/^\s*//g;
-  $form->{$idx} =~ s/\s*$//g;
-
-  my $msg = ucfirst $form->{vc};
-  $form->isblank($form->{vc} . '_id', $locale->text($msg . " missing!"));
-
-  # $locale->text('Customer missing!');
-  # $locale->text('Vendor missing!');
-
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{currency} ne $form->{defaultcurrency});
-
-  &validate_items;
-
-  my $vc = $form->{vc};
-  if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
-    $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
-
-    IS->get_customer(\%myconfig, $form) if $vc eq 'customer';
-    IR->get_vendor(\%myconfig, $form)   if $vc eq 'vendor';
-
-    $::form->{billing_address_id} = $::form->{default_billing_address_id};
-
-    update();
-    $::dispatcher->end_request;
-  }
-
-  $form->{id} = 0 if $form->{saveasnew};
-
-  my ($numberfld, $ordnumber, $err);
-  # this is for the internal notes section for the [email] Subject
-  if ($form->{type} =~ /_order$/) {
-    if ($form->{type} eq 'sales_order') {
-      $form->{label} = $locale->text('Sales Order');
-
-      $numberfld = "sonumber";
-      $ordnumber = "ordnumber";
-    } else {
-      $form->{label} = $locale->text('Purchase Order');
-
-      $numberfld = "ponumber";
-      $ordnumber = "ordnumber";
-    }
-
-    $err = $locale->text('Cannot save order!');
-
-    check_delivered_flag();
-
-  } else {
-    if ($form->{type} eq 'sales_quotation') {
-      $form->{label} = $locale->text('Quotation');
-
-      $numberfld = "sqnumber";
-      $ordnumber = "quonumber";
-    } else {
-      $form->{label} = $locale->text('Request for Quotation');
-
-      $numberfld = "rfqnumber";
-      $ordnumber = "quonumber";
-    }
-
-    $err = $locale->text('Cannot save quotation!');
-
-  }
-
-  # get new number in sequence if saveasnew was requested
-  delete $form->{$ordnumber} if $form->{saveasnew};
-
-  relink_accounts();
-
-  $form->error($err) if (!OE->save(\%myconfig, \%$form));
-
-  # saving the history
-  if(!exists $form->{addition}) {
-    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-    $form->{addition} = "SAVED";
-    $form->save_history;
-  }
-  # /saving the history
-
-  $form->redirect($form->{label} . " $form->{$ordnumber} " .
-                  $locale->text('saved!'));
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  check_oe_access();
-
-  $form->mtime_ischanged('oe');
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
-
-
-  if ($form->{type} =~ /_order$/) {
-    $form->isblank("transdate", $locale->text('Order Date missing!'));
-  } else {
-    $form->isblank("transdate", $locale->text('Quotation Date missing!'));
-  }
-
-  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
-  $form->{$idx} =~ s/^\s*//g;
-  $form->{$idx} =~ s/\s*$//g;
-
-  my $msg = ucfirst $form->{vc};
-  $form->isblank($form->{vc} . '_id', $locale->text($msg . " missing!"));
-
-  # $locale->text('Customer missing!');
-  # $locale->text('Vendor missing!');
-
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'))
-    if ($form->{currency} ne $form->{defaultcurrency});
-
-  remove_emptied_rows();
-  &validate_items;
-
-  my $vc = $form->{vc};
-  if (($form->{"previous_${vc}_id"} || $form->{"${vc}_id"}) != $form->{"${vc}_id"}) {
-    $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
-
-    if ($vc eq 'customer') {
-      IS->get_customer(\%myconfig, $form);
-      $::form->{billing_address_id} = $::form->{default_billing_address_id};
-
-    } else {
-      IR->get_vendor(\%myconfig, $form);
-    }
-
-    update();
-    $::dispatcher->end_request;
-  }
-
-  $form->{id} = 0 if $form->{saveasnew};
-
-  my ($numberfld, $ordnumber, $err);
-
-  # this is for the internal notes section for the [email] Subject
-  if ($form->{type} =~ /_order$/) {
-    if ($form->{type} eq 'sales_order') {
-      $form->{label} = $locale->text('Sales Order');
-
-      $numberfld = "sonumber";
-      $ordnumber = "ordnumber";
-    } else {
-      $form->{label} = $locale->text('Purchase Order');
-
-      $numberfld = "ponumber";
-      $ordnumber = "ordnumber";
-    }
-
-    $err = $locale->text('Cannot save order!');
-
-    check_delivered_flag();
-
-  } else {
-    if ($form->{type} eq 'sales_quotation') {
-      $form->{label} = $locale->text('Quotation');
-
-      $numberfld = "sqnumber";
-      $ordnumber = "quonumber";
-    } else {
-      $form->{label} = $locale->text('Request for Quotation');
-
-      $numberfld = "rfqnumber";
-      $ordnumber = "quonumber";
-    }
-
-    $err = $locale->text('Cannot save quotation!');
-
-  }
-
-  relink_accounts();
-
-  OE->save(\%myconfig, \%$form);
-
-  # saving the history
-  if(!exists $form->{addition}) {
-    if ( $form->{formname} eq 'sales_quotation' or  $form->{formname} eq 'request_quotation' ) {
-        $form->{snumbers} = qq|quonumber_| . $form->{quonumber};
-    } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') {
-        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-    };
-    $form->{what_done} = $form->{formname};
-    $form->{addition} = "SAVED";
-    $form->save_history;
-  }
-  # /saving the history
-
-  $form->{simple_save} = 1;
-  if(!$form->{print_and_save}) {
-    delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
-    edit();
-    $::dispatcher->end_request;
-  }
-  $main::lxdebug->leave_sub();
-}
-
-sub delete {
-  $main::lxdebug->enter_sub();
+    if (!$form->{hide_links} || $oe->{is_own}) {
+      $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}" unless $params{want_binary_pdf};
+    }
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
+    if ($form->{l_items}) {
+      my $items = SL::DB::Manager::OrderItem->get_all_sorted(where => [id => $oe->{item_ids}]);
+      $row->{items}->{raw_data}  = SL::Presenter::ItemsList::items_list($items)               if lc($report->{options}->{output_format}) eq 'html';
+      $row->{items}->{data}      = SL::Presenter::ItemsList::items_list($items, as_text => 1) if lc($report->{options}->{output_format}) ne 'html';
+    }
 
-  check_oe_access();
+    my $row_set = [ $row ];
 
-  my ($msg, $err);
-  if ($form->{type} =~ /_order$/) {
-    $msg = $locale->text('Order deleted!');
-    $err = $locale->text('Cannot delete order!');
-  } else {
-    $msg = $locale->text('Quotation deleted!');
-    $err = $locale->text('Cannot delete quotation!');
-  }
-  if (OE->delete(\%myconfig, \%$form)){
-    # saving the history
-    if(!exists $form->{addition}) {
-      if ( $form->{formname} eq 'sales_quotation' or  $form->{formname} eq 'request_quotation' ) {
-          $form->{snumbers} = qq|quonumber_| . $form->{quonumber};
-      } elsif ( $form->{formname} eq 'sales_order' or $form->{formname} eq 'purchase_order') {
-          $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-      };
-        $form->{what_done} = $form->{formname};
-        $form->{addition} = "DELETED";
-        $form->save_history;
+    if (($form->{l_subtotal} eq 'Y')
+        && (($idx == (scalar @{ $form->{OE} }))
+            || ($oe->{ $form->{sort} } ne $form->{OE}->[$idx]->{ $form->{sort} }))) {
+      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, \@subtotal_columns, 'listsubtotal');
     }
-    # /saving the history
-    $form->info($msg);
-    $::dispatcher->end_request;
+
+    $report->add_data($row_set);
+
+    $idx++;
+  }
+
+  $report->add_separator();
+  $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+  if ($params{want_binary_pdf}) {
+    $report->generate_with_headers();
+    return $report->generate_pdf_content(want_binary_pdf => 1);
   }
-  $form->error($err);
+  setup_oe_orders_action_bar();
+  $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();
 }
@@ -1635,7 +786,7 @@ sub invoice {
   $form->get_employee();
 
 
-  if ($form->{type} =~ /_order$/) {
+  if ($form->{type} =~ /_order$|purchase_order_confirmation/) {
 
     # these checks only apply if the items don't bring their own ordnumbers/transdates.
     # The if clause ensures that by searching for empty ordnumber_#/transdate_# fields.
@@ -1701,11 +852,13 @@ sub invoice {
 
   my ($script);
   if (   $form->{type} eq 'purchase_order'
+      || $form->{type} eq 'purchase_order_confirmation'
       || $form->{type} eq 'request_quotation') {
     $form->{title}  = $locale->text('Add Vendor Invoice');
     $form->{script} = 'ir.pl';
     $script         = "ir";
     $buysell        = 'sell';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_PURCHASE_INVOICE_POST())->token;
   }
 
   if (   $form->{type} eq 'sales_order'
@@ -1716,6 +869,7 @@ sub invoice {
     $form->{script} = 'is.pl';
     $script         = "is";
     $buysell        = 'buy';
+    $form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_SALES_INVOICE_POST())->token;
   }
 
   # bo creates the id, reset it
@@ -1768,332 +922,18 @@ sub invoice {
   $main::lxdebug->leave_sub();
 }
 
-sub save_exchangerate {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->isblank("exchangerate", $locale->text('Exchangerate missing!'));
-  $form->{exchangerate} =
-    $form->parse_amount(\%myconfig, $form->{exchangerate});
-  $form->save_exchangerate(\%myconfig, $form->{currency},
-                           $form->{exchangeratedate},
-                           $form->{exchangerate}, $form->{buysell});
-
-  &invoice;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_as_new {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  $form->{saveasnew} = 1;
-  map { delete $form->{$_} } qw(printed emailed queued delivered closed);
-  $form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
-
-  # Let kivitendo assign a new order number if the user hasn't changed the
-  # previous one. If it has been changed manually then use it as-is.
-  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
-  $form->{$idx} =~ s/^\s*//g;
-  $form->{$idx} =~ s/\s*$//g;
-  if ($form->{saved_xyznumber} &&
-      ($form->{saved_xyznumber} eq $form->{$idx})) {
-    delete($form->{$idx});
-  }
-
-  # clear reqdate and transdate unless changed
-  if ( $form->{reqdate} && $form->{id} ) {
-    my $saved_order = OE->retrieve_simple(id => $form->{id});
-    if ( $saved_order && $saved_order->{reqdate} eq $form->{reqdate} && $saved_order->{transdate} eq $form->{transdate} ) {
-      my $extra_days = $form->{type} eq 'sales_quotation' ? $::instance_conf->get_reqdate_interval       :
-                       $form->{type} eq 'sales_order'     ? $::instance_conf->get_delivery_date_interval : 1;
-
-    if (   ($form->{type} eq 'sales_order'     &&  !$::instance_conf->get_deliverydate_on)
-        || ($form->{type} eq 'sales_quotation' &&  !$::instance_conf->get_reqdate_on)) {
-      $form->{reqdate}   = '';
-    } else {
-      $form->{reqdate}   = DateTime->today_local->next_workday(extra_days => $extra_days)->to_kivitendo;
-    }
-      $form->{transdate} = DateTime->today_local->to_kivitendo;
-    }
-  }
-  # update employee
-  $form->get_employee();
-
-  &save;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub check_for_direct_delivery_yes {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  $form->{direct_delivery_checked} = 1;
-  delete @{$form}{grep /^shipto/, keys %{ $form }};
-  map { s/^CFDD_//; $form->{$_} = $form->{"CFDD_${_}"} } grep /^CFDD_/, keys %{ $form };
-  $form->{CFDD_shipto} = 1;
-  purchase_order();
-  $main::lxdebug->leave_sub();
-}
-
-sub check_for_direct_delivery_no {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-
-  check_oe_access();
-
-  $form->{direct_delivery_checked} = 1;
-  delete @{$form}{grep /^shipto/, keys %{ $form }};
-  $form->{CFDD_shipto} = 0;
-  purchase_order();
-
-  $main::lxdebug->leave_sub();
-}
-
-sub check_for_direct_delivery {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  check_oe_access();
-
-  if ($form->{direct_delivery_checked}
-      || (!$form->{shiptoname} && !$form->{shiptostreet} && !$form->{shipto_id})) {
-    $main::lxdebug->leave_sub();
-    return;
-  }
-
-  my $cvars = SL::DB::Shipto->new->cvars_by_config;
-
-  if ($form->{shipto_id}) {
-    Common->get_shipto_by_id(\%myconfig, $form, $form->{shipto_id}, "CFDD_");
-
-  } else {
-    map { $form->{"CFDD_${_}"} = $form->{$_ } } grep /^shipto/, keys %{ $form };
-  }
-
-  $_->value($::form->{"CFDD_shiptocvar_" . $_->config->name}) for @{ $cvars };
-
-  delete $form->{action};
-  $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ($_ ne 'login') && ($_ ne 'password') && (ref $_ eq "") } keys %{ $form } ];
-
-  $form->header();
-  print $form->parse_html_template("oe/check_for_direct_delivery", { cvars => $cvars });
-
-  $main::lxdebug->leave_sub();
-
-  $::dispatcher->end_request;
-}
-
-sub purchase_order {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  check_oe_access();
-  $form->mtime_ischanged('oe');
-
-  $main::auth->assert('purchase_order_edit');
-
-  $form->{sales_order_to_purchase_order} = 0;
-  if ($form->{type} eq 'sales_order') {
-    $form->{sales_order_to_purchase_order} = 1;
-    check_for_direct_delivery();
-  }
-
-  if ($form->{type} =~ /^sales_/) {
-    delete($form->{ordnumber});
-    delete($form->{payment_id});
-    delete($form->{delivery_term_id});
-  }
-
-  $form->{cp_id} *= 1;
-
-  my $source_type = $form->{type};
-  $form->{title} = $locale->text('Add Purchase Order');
-  $form->{vc}    = "vendor";
-  $form->{type}  = "purchase_order";
-
-  $form->get_employee();
-
-  poso(source_type => $form->{type});
-
-  delete $form->{sales_order_to_purchase_order};
-
-  $main::lxdebug->leave_sub();
-}
-
-sub sales_order {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  check_oe_access();
-  $main::auth->assert('sales_order_edit');
-  $form->mtime_ischanged('oe');
-
-  if ($form->{type} eq "purchase_order") {
-    delete($form->{ordnumber});
-    $form->{"lastcost_$_"} = $form->{"sellprice_$_"} for (1..$form->{rowcount});
-  }
-
-  $form->{cp_id} *= 1;
-
-  my $source_type = $form->{type};
-  $form->{title}  = $locale->text('Add Sales Order');
-  $form->{vc}     = "customer";
-  $form->{type}   = "sales_order";
-
-  $form->get_employee();
-
-  poso(source_type => $source_type);
-
-  $main::lxdebug->leave_sub();
-}
-
-sub poso {
-  $main::lxdebug->enter_sub();
-
-  my %param    = @_;
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  check_oe_access();
-  $main::auth->assert('purchase_order_edit | sales_order_edit');
-
-  $form->{transdate} = $form->current_date(\%myconfig);
-  delete $form->{duedate};
-
-  # "reqdate" is the validity date for a quotation and the delivery
-  # date for an order. Therefore it makes no sense to keep the value
-  # when converting from one into the other.
-  delete $form->{reqdate} if ($param{source_type} =~ /_quotation$/) == ($form->{type} =~ /_quotation$/);
-
-  $form->{convert_from_oe_ids} = $form->{id};
-  $form->{closed}              = 0;
-
-  $form->{old_employee_id}     = $form->{employee_id};
-  $form->{old_salesman_id}     = $form->{salesman_id};
-
-  # reset
-  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber
-                                taxzone_id currency);
-  # this converted variable is also used for sales_order to purchase order and vice versa
-  $form->{"converted_from_orderitems_id_$_"} = delete $form->{"orderitems_id_$_"} for 1 .. $form->{"rowcount"};
-
-  # if purchase_order was generated from sales_order, use  lastcost_$i as sellprice_$i
-  # also reset discounts
-  if ( $form->{sales_order_to_purchase_order} ) {
-    for my $i (1 .. $form->{rowcount}) {
-      $form->{"sellprice_${i}"} = $form->{"lastcost_${i}"};
-      $form->{"discount_${i}"}  = 0;
-    };
-  };
-
-  for my $i (1 .. $form->{rowcount}) {
-    map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice basefactor discount lastcost);
-  }
-
-  my %saved_vars = map { $_ => $form->{$_} } grep { $form->{$_} } qw(currency);
-
-  &order_links;
-
-  map { $form->{$_} = $saved_vars{$_} } keys %saved_vars;
-
-  # prepare_order assumes that the discount is in db-notation (0.05) and not user-notation (5)
-  # and therefore multiplies the values by 100 in the case of reading from db or making an order
-  # from several quotation, so we convert this back into percent-notation for the user interface by multiplying with 0.01
-  # ergänzung 03.10.2010 muss vor prepare_order passieren (s.a. Svens Kommentar zu Bug 1017)
-  # das parse_amount wird oben schon ausgeführt, deswegen an dieser stelle raus (wichtig: kommawerte bei discount testen)
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"discount_$i"} /=100;
-  };
-
-  &prepare_order;
-  &update;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delivery_order {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  $form->mtime_ischanged('oe');
-
-  if ($form->{type} =~ /^sales/) {
-    $main::auth->assert('sales_delivery_order_edit');
-
-    $form->{vc}    = 'customer';
-    $form->{type}  = 'sales_delivery_order';
-
-  } else {
-    $main::auth->assert('purchase_delivery_order_edit');
-
-    $form->{vc}    = 'vendor';
-    $form->{type}  = 'purchase_delivery_order';
-  }
-
-  $form->get_employee();
-
-  require "bin/mozilla/do.pl";
-
-  $form->{script}               = 'do.pl';
-  $form->{cp_id}               *= 1;
-  $form->{convert_from_oe_ids}  = $form->{id};
-  $form->{transdate}            = $form->current_date(\%myconfig);
-  delete $form->{duedate};
-
-  $form->{old_employee_id}  = $form->{employee_id};
-  $form->{old_salesman_id}  = $form->{salesman_id};
-
-  _oe_remove_delivered_or_billed_rows(id => $form->{id}, type => 'delivered');
-
-  # reset
-  delete @{$form}{qw(id subject message cc bcc printed emailed queued creditlimit creditremaining discount tradediscount oldinvtotal closed delivered)};
-
-  for my $i (1 .. $form->{rowcount}) {
-    map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice lastcost basefactor discount);
-    $form->{"converted_from_orderitems_id_$i"} = delete $form->{"orderitems_id_$i"};
-  }
-
-  my %old_values = map { $_ => $form->{$_} } qw(customer_id oldcustomer customer vendor_id oldvendor vendor shipto_id);
-
-  order_links();
-
-  prepare_order();
-
-  map { $form->{$_} = $old_values{$_} if ($old_values{$_}) } keys %old_values;
-
-  for my $i (1 .. $form->{rowcount}) {
-    (my $dummy, $form->{"pricegroup_id_$i"}) = split /--/, $form->{"sellprice_pg_$i"};
-  }
-  update();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub oe_prepare_xyz_from_order {
   return if !$::form->{id};
 
   my $order = SL::DB::Order->new(id => $::form->{id})->load;
+
+  if (exists $::form->{only_items}) {
+    my @wanted_indexes = sort { $a <=> $b } map { $_ - 1 } split(",", $::form->{only_items} // "");
+    my @items          = @{ $order->items_sorted };
+    @items             = @items[@wanted_indexes];
+    $order->items(\@items);
+  }
+
   $order->flatten_to_form($::form, format_amounts => 1);
   $::form->{taxincluded_changed_by_user} = 1;
 
@@ -2110,78 +950,28 @@ sub oe_prepare_xyz_from_order {
   _update_ship();
 }
 
-sub oe_delivery_order_from_order {
-  oe_prepare_xyz_from_order();
-  delivery_order();
-}
-
 sub oe_invoice_from_order {
   oe_prepare_xyz_from_order();
   invoice();
 }
 
-sub yes {
-  call_sub($main::form->{yes_nextsub});
-}
-
-sub no {
-  call_sub($main::form->{no_nextsub});
-}
-
-######################################################################################################
-# IO ENTKOPPLUNG
-# ###############################################################################################
-sub display_form {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-
-  check_oe_access();
-
-  retrieve_partunits() if ($form->{type} =~ /_delivery_order$/);
-
-  $form->{"taxaccounts"} =~ s/\s*$//;
-  $form->{"taxaccounts"} =~ s/^\s*//;
-  foreach my $accno (split(/\s*/, $form->{"taxaccounts"})) {
-    map({ delete($form->{"${accno}_${_}"}); } qw(rate description taxnumber));
-  }
-  $form->{"taxaccounts"} = "";
-
-  IC->retrieve_accounts(\%myconfig, $form, map { $_ => $form->{"id_$_"} } 1 .. $form->{rowcount});
-
-  $form->{rowcount}++;
-  $form->{"project_id_$form->{rowcount}"} = $form->{globalproject_id};
-
-  $form->language_payment(\%myconfig);
-
-  Common::webdav_folder($form);
-
-  &form_header;
-
-  # create rows
-  display_row($form->{rowcount}) if $form->{rowcount};
-
-  &form_footer;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub report_for_todo_list {
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
 
-  my $quotations = OE->transactions_for_todo_list();
+  my $is_for_sales    = $::auth->assert($oe_view_access_map->{'sales_quotation'},   'may fail');
+  my $is_for_purchase = $::auth->assert($oe_view_access_map->{'request_quotation'}, 'may fail');
+  my $quotations      = OE->transactions_for_todo_list(sales => $is_for_sales, purchase => $is_for_purchase);
   my $content;
 
   if (@{ $quotations }) {
-    my $edit_url = ($::instance_conf->get_feature_experimental_order)
-                 ? build_std_url('script=controller.pl', 'action=Order/edit')
-                 : build_std_url('script=oe.pl', 'action=edit');
+    my $callback = build_std_url('action');
+    my $edit_url = build_std_url('script=controller.pl', 'action=Order/edit', 'callback=' . E($callback));
 
     $content     = $form->parse_html_template('oe/report_for_todo_list', { 'QUOTATIONS' => $quotations,
-                                                                           'edit_url'   => $edit_url });
+                                                                           'edit_url'   => $edit_url,
+                                                                           'callback'   => $callback });
   }
 
   $main::lxdebug->leave_sub();
@@ -2189,92 +979,6 @@ sub report_for_todo_list {
   return $content;
 }
 
-sub edit_periodic_invoices_config {
-  $::lxdebug->enter_sub();
-
-  $::form->{type} = 'sales_order';
-
-  check_oe_access();
-
-  my $config;
-  $config = SL::YAML::Load($::form->{periodic_invoices_config}) if $::form->{periodic_invoices_config};
-
-  if ('HASH' ne ref $config) {
-    $config =  { periodicity             => 'm',
-                 order_value_periodicity => 'p', # = same as periodicity
-                 start_date_as_date      => $::form->{transdate} || $::form->current_date,
-                 extend_automatically_by => 12,
-                 active                  => 1,
-               };
-  }
-  # for older configs, replace email preset text if not yet set.
-  $config->{email_subject} ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_subject");
-  $config->{email_body}    ||= GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_general")
-                             . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "salutation_punctuation_mark")
-                             . "\n\n"
-                             . GenericTranslations->get(language_id => $::form->{lanuage_id}, translation_type => "preset_text_periodic_invoices_email_body");
-  $config->{email_body}      =~ s{\A[ \n\r]+|[ \n\r]+\Z}{}g;
-
-  $config->{periodicity}             = 'm' if none { $_ eq $config->{periodicity}             }       @SL::DB::PeriodicInvoicesConfig::PERIODICITIES;
-  $config->{order_value_periodicity} = 'p' if none { $_ eq $config->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES);
-
-  $::form->get_lists(printers => "ALL_PRINTERS",
-                     charts   => { key       => 'ALL_CHARTS',
-                                   transdate => 'current_date' });
-
-  $::form->{AR}    = [ grep { $_->{link} =~ m/(?:^|:)AR(?::|$)/ } @{ $::form->{ALL_CHARTS} } ];
-  $::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
-
-  if ($::form->{customer_id}) {
-    $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(where => [ cp_cv_id => $::form->{customer_id} ]);
-    $::form->{email_recipient_invoice_address} = SL::DB::Manager::Customer->find_by(id => $::form->{customer_id})->invoice_mail;
-  }
-
-  $::form->header(no_layout => 1);
-  print $::form->parse_html_template('oe/edit_periodic_invoices_config', {config => $config});
-
-  $::lxdebug->leave_sub();
-}
-
-sub save_periodic_invoices_config {
-  $::lxdebug->enter_sub();
-
-  $::form->{type} = 'sales_order';
-
-  check_oe_access();
-
-  $::form->isblank('start_date_as_date', $::locale->text('The start date is missing.'));
-
-  my $config = { active                  => $::form->{active}     ? 1 : 0,
-                 terminated              => $::form->{terminated} ? 1 : 0,
-                 direct_debit            => $::form->{direct_debit} ? 1 : 0,
-                 periodicity             => (any { $_ eq $::form->{periodicity}             }       @SL::DB::PeriodicInvoicesConfig::PERIODICITIES)              ? $::form->{periodicity}             : 'm',
-                 order_value_periodicity => (any { $_ eq $::form->{order_value_periodicity} } ('p', @SL::DB::PeriodicInvoicesConfig::ORDER_VALUE_PERIODICITIES)) ? $::form->{order_value_periodicity} : 'p',
-                 start_date_as_date      => $::form->{start_date_as_date},
-                 end_date_as_date        => $::form->{end_date_as_date},
-                 first_billing_date_as_date => $::form->{first_billing_date_as_date},
-                 print                   => $::form->{print} ? 1 : 0,
-                 printer_id              => $::form->{print} ? $::form->{printer_id} * 1 : undef,
-                 copies                  => $::form->{copies} * 1 ? $::form->{copies} : 1,
-                 extend_automatically_by => $::form->{extend_automatically_by} * 1 || undef,
-                 ar_chart_id             => $::form->{ar_chart_id} * 1,
-                 send_email                 => $::form->{send_email} ? 1 : 0,
-                 email_recipient_contact_id => $::form->{email_recipient_contact_id} * 1 || undef,
-                 email_recipient_address    => $::form->{email_recipient_address},
-                 email_sender               => $::form->{email_sender},
-                 email_subject              => $::form->{email_subject},
-                 email_body                 => $::form->{email_body},
-               };
-
-  $::form->{periodic_invoices_config} = SL::YAML::Dump($config);
-
-  $::form->{title} = $::locale->text('Edit the configuration for periodic invoices');
-  $::form->header;
-  print $::form->parse_html_template('oe/save_periodic_invoices_config', $config);
-
-  $::lxdebug->leave_sub();
-}
-
 sub _remove_full_delivered_rows {
 
   my @fields = map { s/_1$//; $_ } grep { m/_1$/ } keys %{ $::form };
@@ -2343,15 +1047,3 @@ sub _oe_remove_delivered_or_billed_rows {
 
   _remove_billed_or_delivered_rows(quantities => \%handled_base_qtys);
 }
-
-sub dispatcher {
-  foreach my $action (qw(delete delivery_order invoice print purchase_order quotation
-                         request_for_quotation sales_order save save_and_close save_as_new ship_to update)) {
-    if ($::form->{"action_${action}"}) {
-      call_sub($action);
-      return;
-    }
-  }
-
-  $::form->error($::locale->text('No action defined.'));
-}
diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl
index f0ef98e73..2c36ac1ac 100644
--- a/bin/mozilla/rc.pl
+++ b/bin/mozilla/rc.pl
@@ -51,6 +51,7 @@ sub reconciliation {
 
   setup_rc_reconciliation_action_bar();
 
+  $::form->{title} = t8('Reconciliation');
   $::form->header;
   print $::form->parse_html_template('rc/step1', {
     selection_sub => sub { ("$_[0]{accno}--$_[0]{description}")x2 },
diff --git a/bin/mozilla/reportgenerator.pl b/bin/mozilla/reportgenerator.pl
index f2eb1ef1d..caa845993 100644
--- a/bin/mozilla/reportgenerator.pl
+++ b/bin/mozilla/reportgenerator.pl
@@ -41,7 +41,7 @@ sub report_generator_setup_action_bar {
     $bar->add(
       combobox => [
         action => [
-          $type eq 'pdf' ? $::locale->text('PDF export') : $::locale->text('CSV export'),
+          $type eq 'pdf' ? $::locale->text('PDF export') : $type eq 'csv' ? $::locale->text('CSV export') : $::locale->text('Chart export'),
           submit => [ '#report_generator_form', { 'report_generator_dispatch_to' => "report_generator_export_as_${type}" } ],
         ],
         action => [
@@ -126,6 +126,31 @@ sub report_generator_export_as_csv {
   $main::lxdebug->leave_sub();
 }
 
+sub report_generator_export_as_chart {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  if ($form->{report_generator_chart_options_set}) {
+    report_generator_do('Chart');
+    $main::lxdebug->leave_sub();
+    return;
+  }
+
+  my $fields      = delete $form->{report_generator_chart_fields};
+  my @form_values = $form->flatten_variables(grep { ($_ ne 'login') && ($_ ne 'password') } keys %{ $form });
+
+  $form->{title} = $locale->text('Chart export -- options');
+
+  report_generator_setup_action_bar('chart');
+
+  $form->header();
+  print $form->parse_html_template('report_generator/chart_export_options', { 'HIDDEN' => \@form_values, fields => $fields });
+
+  $main::lxdebug->leave_sub();
+}
+
 sub report_generator_back {
   $main::lxdebug->enter_sub();
 
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 630a2b5bd..7ebce1ce8 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -631,7 +631,7 @@ sub generate_trial_balance {
   my $attachment_basename = $locale->text('trial_balance');
   my $report              = SL::ReportGenerator->new(\%myconfig, $form);
 
-  my @hidden_variables    = qw(fromdate todate year method department_id all_accounts);
+  my @hidden_variables    = qw(fromdate todate year method department project_id all_accounts);
 
   my $href                = build_std_url('action=generate_trial_balance', grep { $form->{$_} } @hidden_variables);
 
@@ -1005,6 +1005,8 @@ sub aging {
   my $locale   = $main::locale;
   my $cgi      = $::request->{cgi};
 
+  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor5/ckeditor ckeditor5/translations/de);
+
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @columns = qw(statement ct invnumber transdate duedate amount open datepaid current_open type);
diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl
index ca4ad0aa1..03cc29927 100755
--- a/bin/mozilla/sepa.pl
+++ b/bin/mozilla/sepa.pl
@@ -111,7 +111,7 @@ sub bank_transfer_create {
   my %invoices_map   = map { $_->{id} => $_ } @{ $invoices };
   my @bank_transfers =
     map  +{ %{ $invoices_map{ $_->{$arap_id} } }, %{ $_ } },
-    grep  { ($_->{selected} || $selected_ids{$_->{$arap_id}}) && (0 < $_->{amount}) && $invoices_map{ $_->{$arap_id} } }
+    grep  { ($_->{selected} || $selected_ids{$_->{$arap_id}}) && (0 < $_->{amount}) && $invoices_map{ $_->{$arap_id} } && !($invoices_map{ $_->{$arap_id} }->{is_sepa_blocked}) }
     map   { $_->{amount} = $form->parse_amount($myconfig, $_->{amount}); $_ }
           @{ $form->{bank_transfers} || [] };
 
@@ -198,7 +198,8 @@ sub bank_transfer_create {
                                      'vc'             => $vc);
 
     $form->header();
-    print $form->parse_html_template('sepa/bank_transfer_created', { 'id' => $id, 'vc' => $vc });
+    my %sepa_versions = SL::SEPA::XML->get_supported_versions;
+    print $form->parse_html_template('sepa/bank_transfer_created', { 'id' => $id, 'vc' => $vc, sepa_versions => \%sepa_versions });
   }
 
   $main::lxdebug->leave_sub();
@@ -296,8 +297,10 @@ sub bank_transfer_list {
   push @options, $form->{l_executed} ? $locale->text('executed') : $locale->text('not yet executed')               if ($form->{l_executed} != $form->{l_not_executed});
   push @options, $form->{l_closed}   ? $locale->text('closed')   : $locale->text('open')                           if ($form->{l_open}     != $form->{l_closed});
 
+  my %sepa_versions = SL::SEPA::XML->get_supported_versions;
+
   $report->set_options('top_info_text'         => join("\n", @options),
-                       'raw_top_info_text'     => $form->parse_html_template('sepa/bank_transfer_list_top'),
+                       'raw_top_info_text'     => $form->parse_html_template('sepa/bank_transfer_list_top',    { 'show_buttons' => $open_available, sepa_versions => \%sepa_versions, }),
                        'raw_bottom_info_text'  => $form->parse_html_template('sepa/bank_transfer_list_bottom', { 'show_buttons' => $open_available, vc => $vc }),
                        'std_column_visibility' => 1,
                        'output_format'         => 'HTML',
@@ -358,7 +361,7 @@ sub bank_transfer_edit {
   my $export;
 
   foreach my $id (@ids) {
-    my $curr_export = SL::SEPA->retrieve_export('id' => $id, 'details' => 1, 'vc' => $vc);
+    my $curr_export = SL::SEPA->retrieve_export(id => $id, details => 1, vc => $vc);
 
     foreach my $item (@{ $curr_export->{items} }) {
       map { $item->{"export_${_}"} = $curr_export->{$_} } grep { !ref $curr_export->{$_} } keys %{ $curr_export };
@@ -553,6 +556,7 @@ sub bank_transfer_download_sepa_xml {
                                       'message_id'  => $message_id,
                                       'grouped'     => 1,
                                       'collection'  => $vc eq 'customer',
+                                      'version'     => $form->{sepa_xml_version},
     );
 
   foreach my $item (@items) {
@@ -599,13 +603,82 @@ sub bank_transfer_download_sepa_xml {
 
   my $xml = $sepa_xml->to_xml();
 
+  my $file_extension   =  $::instance_conf->get_sepa_export_xml ? '.xml'
+                        : $vc eq 'customer'                     ? '.cdd'
+                        : $vc eq 'vendor'                       ? '.cct'
+                        : undef;
+
+  die "invalid state for vendor/customer suffix" unless $file_extension;
+
   print $cgi->header('-type'                => 'application/octet-stream',
-                     '-content-disposition' => 'attachment; filename="SEPA_' . $message_id . ($vc eq 'customer' ? '.cdd' : '.cct') . '"',
+                     '-content-disposition' => 'attachment; filename="SEPA_' . $message_id . $file_extension . '"',
                      '-content-length'      => length $xml);
   print $xml;
 
   $main::lxdebug->leave_sub();
 }
+sub bank_transfer_download_sepa_docs {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $defaults = SL::DB::Default->get;
+  my $locale   = $main::locale;
+  my $vc       = $form->{vc} eq 'customer' ? 'customer' : 'vendor';
+
+  if (!$defaults->doc_storage) {
+    $form->show_generic_error($locale->text('Doc Storage is not enabled'));
+  }
+
+  my @ids;
+  if ($form->{mode} && ($form->{mode} eq 'multi')) {
+     @ids = @{ $form->{ids} || [] };
+  } else {
+    @ids = ($form->{id});
+  }
+
+  if (!@ids) {
+    $form->show_generic_error($locale->text('You have not selected any export.'));
+  }
+
+  my @items = ();
+
+  foreach my $id (@ids) {
+    my $export = SL::SEPA->retrieve_export('id' => $id, 'details' => 1, vc => $vc);
+    push @items, @{ $export->{items} } if ($export);
+  }
+  my @files;
+  foreach my $item (@items) {
+
+    # check if there is already a file for the invoice
+    # File::get_all and converting to scalar is a tiny bit stupid, see Form.pm,
+    # but there is no get_latest_version (but sorts objects by itime!)
+    # check if already resynced
+    my ( $file_object ) = SL::File->get_all(object_id   => $item->{ap_id} ? $item->{ap_id} : $item->{ar_id},
+                                            object_type => $item->{ap_id} ? 'purchase_invoice' : 'invoice',
+                                            file_type   => 'document',
+                                           );
+    next if     (ref $file_object ne 'SL::File::Object');
+    next unless $file_object->mime_type eq 'application/pdf';
+
+    my $file = $file_object->get_file;
+    die "No file" unless -e $file;
+    push @files, $file;
+  }
+  my $inputfiles  = join " ", @files;
+  my $downloadname = $locale->text('SEPA XML Docs for Exports ') . (join " ", @ids) . ".pdf";
+  my $in = IO::File->new($::lx_office_conf{applications}->{ghostscript} . " -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |");
+
+  $form->error($main::locale->text('Could not spawn ghostscript.')) unless $in;
+
+  print $::form->create_http_response(content_type        => 'Application/PDF',
+                                      content_disposition => 'attachment; filename="'. $downloadname . '"');
+
+  $::locale->with_raw_io(\*STDOUT, sub { print while <$in> });
+  $in->close;
+
+  $main::lxdebug->leave_sub();
+}
+
 
 sub bank_transfer_mark_as_closed {
   $main::lxdebug->enter_sub();
@@ -643,7 +716,8 @@ sub dispatcher {
   foreach my $action (qw(bank_transfer_create bank_transfer_edit bank_transfer_list
                          bank_transfer_post_payments bank_transfer_download_sepa_xml
                          bank_transfer_mark_as_closed_step1 bank_transfer_mark_as_closed_step2
-                         bank_transfer_payment_list_as_pdf bank_transfer_undo_sepa_xml)) {
+                         bank_transfer_payment_list_as_pdf bank_transfer_undo_sepa_xml
+                         bank_transfer_download_sepa_docs)) {
     if ($form->{"action_${action}"}) {
       call_sub($action);
       return;
diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl
index 8a0dc463a..187ed318b 100644
--- a/bin/mozilla/vk.pl
+++ b/bin/mozilla/vk.pl
@@ -49,7 +49,7 @@ use strict;
 
 sub search_invoice {
   $main::lxdebug->enter_sub();
-  $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');
+  $main::auth->assert('sales_report');
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
@@ -88,7 +88,7 @@ sub search_invoice {
 sub invoice_transactions {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('ar_transactions | ap_transactions | invoice_edit');
+  $main::auth->assert('sales_report');
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 3cb1243ca..fe37063f4 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -32,8 +32,10 @@
 #
 #######################################################################
 
-use List::Util qw(min max first);
+use Carp;
+use List::Util qw(any first none);
 use POSIX qw(strftime);
+use Scalar::Util qw(blessed);
 
 use SL::Form;
 use SL::User;
@@ -41,11 +43,12 @@ use SL::User;
 use SL::AM;
 use SL::CVar;
 use SL::CT;
-use SL::Helper::Flash qw(flash_later);
+use SL::Helper::Flash qw(flash flash_later);
 use SL::IC;
 use SL::WH;
 use SL::OE;
-use SL::Helper::Inventory qw(produce_assembly);
+use SL::Helper::Inventory qw(get_stock produce_assembly allocate_for_assembly check_allocations_for_assembly);
+use SL::Helper::Inventory::Allocation;
 use SL::Locale::String qw(t8);
 use SL::ReportGenerator;
 use SL::Presenter::Tag qw(checkbox_tag);
@@ -181,7 +184,7 @@ sub transfer_or_removal_prepare_contents {
 
   $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 
-  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit ean);
+  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit ean);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
@@ -237,7 +240,7 @@ sub transfer_parts {
 
   $form->show_generic_error($locale->text("The source warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 
-  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit);
+  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
@@ -396,15 +399,118 @@ sub create_assembly {
     $form->{bestbefore} = '';
   }
 
-  produce_assembly(
+  # Check if there are more than one chargenumber for one part of an assembly.
+  # In this case let the user select the wanted chargenumbers.
+  my $stocked_wh_id = $::instance_conf->get_produce_assembly_same_warehouse ? $form->{warehouse_id} : undef;
+  my @stocked_by    = qw(part warehouse bin chargenumber); # Or 'for_allocate'? That would include 'bestbefore'.
+  my $stocked_parts = get_stock(part         => [ map { $_->part } @{$assembly->assemblies} ],
+                                warehouse    => $stocked_wh_id,
+                                by           => \@stocked_by,
+                                with_objects => [qw(part warehouse bin)]);
+
+  # Remove entries with no stock.
+  $stocked_parts = [ grep { $_->{qty} != 0 } @$stocked_parts];
+
+  my %stocked_by_parts_id = map { my $p_id = $_->{parts_id }; $p_id => [grep { $_->{parts_id} == $p_id } @$stocked_parts] } @$stocked_parts;
+
+  my $is_stock_ambiguous = any { scalar(@{$_ || []}) > 1 } values %stocked_by_parts_id;
+  my $allocation_check_failed;
+  my $stock_check_failed;
+
+  my @allocations;
+  if ($is_stock_ambiguous) {
+    if (!scalar @{$form->{allocations} || []}) {
+      # User has not selected something / first_time.
+      # Pre-fill allocations for selection form.
+      eval {
+        @allocations = allocate_for_assembly(part             => $assembly,
+                                             qty              => $form->{qty},
+                                             warehouse        => ($form->{warehouse_id} ? SL::DB::Warehouse->new(id => $form->{warehouse_id})->load : undef),
+                                             chargenumber     => $form->{chargenumber},);
+        1;
+      } or do  {
+        my $ex = $@;
+        die $ex unless blessed($ex) && $ex->isa('SL::X::Inventory::Allocation::Multi');
+
+        render_produce_assembly_error(title  => $locale->text('Allocate for Assembly'),
+                                      errors => $ex->errors);
+        return $::lxdebug->leave_sub();
+      };
+
+    } else {
+      # User has selected something / selection form was sent.
+      # Check allocations.
+
+      # Create allocation helper objects from form.
+      @allocations = map {
+        SL::Helper::Inventory::Allocation->new(
+          parts_id      => $_->{parts_id},
+          qty           => $form->parse_amount(\%myconfig, $_->{qty}),
+          bin_id        => $_->{bin_id},
+          warehouse_id  => $_->{warehouse_id},
+          chargenumber  => $_->{chargenumber},
+          bestbefore    => $_->{bestbefore},
+          comment       => $_->{comment},
+          for_object_id => undef,
+        )
+      } grep { $form->parse_amount(\%myconfig, $_->{qty}) != 0 } @{$form->{allocations}};
+
+      $allocation_check_failed = !check_allocations_for_assembly(part                 => $assembly,
+                                                                 qty                  => $form->{qty},
+                                                                 allocations          => \@allocations,
+                                                                 check_overfulfilment => 1);
+
+      if (!$allocation_check_failed) {
+        # Check, if all allocations are stocked.
+        foreach my $allocation (@allocations) {
+          $stock_check_failed = none {
+            $_->{parts_id}     == $allocation->parts_id     &&
+            $_->{warehouse_id} == $allocation->warehouse_id &&
+            $_->{bin_id}       == $allocation->bin_id       &&
+            $_->{chargenumber} eq $allocation->chargenumber &&
+            $_->{qty}          >= $allocation->qty
+          } @$stocked_parts;
+
+          last if $stock_check_failed;
+        }
+      }
+    }
+
+    # Show selection form if requested or check was not ok. Continue to production otherwise.
+    if ($form->{show_allocations} || $allocation_check_failed || $stock_check_failed) {
+      flash('warning', t8("Allocations are not sufficient or overfulfilled")) if ($allocation_check_failed);
+      flash('warning', t8("Not enough on stock for one or more allocations")) if ($stock_check_failed);
+
+      my %allocations_by_parts_id = map { my $p_id = $_->{parts_id}; $p_id => [grep { $_->{parts_id} == $p_id } @allocations] } @allocations;
+
+      my %needed_by_parts_id = map { $_->{parts_id} => $_->qty * $form->{qty} } @{$assembly->assemblies};
+      create_assembly_chargenumbers($form, \%stocked_by_parts_id, \%needed_by_parts_id, \%allocations_by_parts_id);
+      return $::lxdebug->leave_sub();
+    }
+
+  }
+
+  eval {
+    produce_assembly(
               part           => $assembly,               # target assembly
               qty            => $form->{qty},            # qty
-              auto_allocate  => 1,
+              allocations    => ($is_stock_ambiguous ? \@allocations : undef),
+              auto_allocate  => !$is_stock_ambiguous,
               bin            => $bin,                    # needed unless a global standard target is configured
               chargenumber   => $form->{chargenumber},   # optional
               bestbefore     => $form->{bestbefore},
               comment        => $form->{comment},        # optional
-  );
+    );
+    1;
+
+  } or do {
+    my $ex = $@;
+    die $ex unless blessed($ex) && $ex->isa('SL::X::Inventory::Allocation::Multi');
+
+    render_produce_assembly_error(title  => $locale->text('Produce Assembly'),
+                                  errors => $ex->errors);
+    return $::lxdebug->leave_sub();
+  };
 
   delete @{$form}{qw(parts_id partnumber description qty unit chargenumber bestbefore comment)};
 
@@ -416,6 +522,42 @@ sub create_assembly {
   $main::lxdebug->leave_sub();
 }
 
+sub render_produce_assembly_error {
+  my (%params) = @_;
+
+  my @errors       = @{$params{errors} || []};
+  $::form->{title} = $params{title};
+
+  $::form->header;
+  print $::form->parse_html_template(
+    'wh/produce_assembly_error',
+    {
+      missing_qty_exceptions => [ grep {  $_->isa('SL::X::Inventory::Allocation::MissingQty') } @errors ],
+      other_exceptions       => [ grep { !$_->isa('SL::X::Inventory::Allocation::MissingQty') } @errors ],
+    });
+}
+
+sub create_assembly_chargenumbers {
+  my ($form, $stocked_by_parts_id, $needed_by_parts_id, $allocated_by_parts_id) = @_;
+
+  setup_wh_create_assembly_chargenumbers_action_bar();
+
+  my $hidden_vars = { map { $_ => $form->{$_} } qw(parts_id warehouse_id bin_id chargenumber qty unit comment) };
+
+  $form->{title} = $::locale->text('Select Chargenumbers');
+  $form->header;
+
+  print $form->parse_html_template(
+    'wh/create_assembly_chargenumbers',
+    {
+      hidden_vars           => $hidden_vars,
+      stocked_by_parts_id   => $stocked_by_parts_id,
+      needed_by_parts_id    => $needed_by_parts_id,
+      allocated_by_parts_id => $allocated_by_parts_id,
+    }
+  );
+}
+
 # --------------------------------------------------------------------
 # Transfer: removal
 # --------------------------------------------------------------------
@@ -459,7 +601,7 @@ sub remove_parts {
 
   $form->show_generic_error($locale->text("The warehouse does not contain any bins.")) if (0 == scalar @{ $warehouse->{BINS} });
 
-  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bindescription chargenumber bestbefore partunit);
+  map { $form->{"l_$_"} = 'Y' } qw(parts_id qty warehouseid binid partnumber partdescription bin chargenumber bestbefore partunit);
 
   $form->{sort} = 'bindescription';
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id});
@@ -728,14 +870,16 @@ sub generate_journal {
                                        'data'           => \@contents);
 
 
-  my %doc_types = ( 'sales_quotation'         => { script => 'oe', title => $locale->text('Sales quotation') },
-                    'sales_order'             => { script => 'oe', title => $locale->text('Sales Order') },
-                    'request_quotation'       => { script => 'oe', title => $locale->text('Request quotation') },
-                    'purchase_order'          => { script => 'oe', title => $locale->text('Purchase Order') },
-                    'sales_delivery_order'    => { script => 'do', title => $locale->text('Sales delivery order') },
-                    'purchase_delivery_order' => { script => 'do', title => $locale->text('Purchase delivery order') },
-                    'sales_invoice'           => { script => 'is', title => $locale->text('Sales Invoice') },
-                    'purchase_invoice'        => { script => 'ir', title => $locale->text('Purchase Invoice') },
+  my %doc_types = ( 'sales_quotation'         => { action => 'Order/edit', script => 'controller', title => $locale->text('Sales quotation') },
+                    'sales_order'             => { action => 'Order/edit', script => 'controller', title => $locale->text('Sales Order') },
+                    'request_quotation'       => { action => 'Order/edit', script => 'controller', title => $locale->text('Request quotation') },
+                    'purchase_order'          => { action => 'Order/edit', script => 'controller', title => $locale->text('Purchase Order') },
+                    'sales_delivery_order'    => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('Sales delivery order') },
+                    'purchase_delivery_order' => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('Purchase delivery order') },
+                    'supplier_delivery_order' => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('Supplier delivery order') },
+                    'rma_delivery_order'      => { action => 'DeliveryOrder/edit', script => 'controller', title => $locale->text('RMA delivery order') },
+                    'sales_invoice'           => { action => 'edit', script => 'is', title => $locale->text('Sales Invoice') },
+                    'purchase_invoice'        => { action => 'edit', script => 'ir', title => $locale->text('Purchase Invoice') },
                   );
 
   my $idx       = 0;
@@ -768,7 +912,7 @@ sub generate_journal {
 
       if ($info && $info->{id} && $info->{type} && $doc_types{$info->{type}}) {
         $row->{oe_id} = { data => $doc_types{ $info->{type} }->{title} . ' ' . $info->{number},
-                          link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=edit', 'id=' . $info->{id}, 'type=' . $info->{type}) };
+                          link => build_std_url('script=' . $doc_types{ $info->{type} }->{script} . '.pl', 'action=' . $doc_types{ $info->{type} }->{action}, 'id=' . $info->{id}, 'type=' . $info->{type}) };
       }
     }
 
@@ -849,7 +993,7 @@ sub generate_report {
   my $sort_col     = $form->{sort};
 
   my %filter;
-  my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price stock_value);
+  my @columns = qw(warehouse bin partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price price_factor stock_value);
 
   # filter stuff
   map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description partsgroup_id chargenumber bestbefore date include_invalid_warehouses);
@@ -927,7 +1071,7 @@ sub generate_report {
   push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehousedescription l_bindescription);
+  push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehouse l_bin);
   push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses date);
   push @hidden_variables, qw(classification_id stock_value_basis allrows);
   push @hidden_variables, map({'cvar_'. $_->{name}}                                         @searchable_custom_variables);
@@ -936,8 +1080,8 @@ sub generate_report {
   push @hidden_variables, map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables));
 
   my %column_defs = (
-    'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
-    'bindescription'       => { 'text' => $locale->text('Bin'), },
+    'warehouse'            => { 'text' => $locale->text('Warehouse'), },
+    'bin'                  => { 'text' => $locale->text('Bin'), },
     'partnumber'           => { 'text' => $locale->text('Part Number'), },
     'type_and_classific'   => { 'text' => $locale->text('Type'), },
     'partdescription'      => { 'text' => $locale->text('Part Description'), },
@@ -948,6 +1092,7 @@ sub generate_report {
     'stock_value'          => { 'text' => $locale->text('Stock value'), },
     'purchase_price'       => { 'text' => $locale->text('Purchase price'), },
     'list_price'           => { 'text' => $locale->text('List Price'), },
+    'price_factor'         => { 'text' => $locale->text('Price Factor'), },
   );
 
   my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
@@ -956,9 +1101,16 @@ sub generate_report {
   my $href = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
   $href .= "&maxrows=".$form->{maxrows};
 
-  map { $column_defs{$_}->{link} = $href . "&page=".$page."&sort=${_}&order=" . Q($_ eq $sort_col ? 1 - $form->{order} : $form->{order}) } grep {!/^cvar_/} @columns;
+  my %cvar_is_text = ();
+  $cvar_is_text{"cvar_$_->{name}"} = 1 for
+    grep {$_->{type} =~ m/text|textfield|htmlfield/}
+    @$cvar_configs;
 
-  my %column_alignment = map { $_ => 'right' } qw(qty list_price purchase_price stock_value);
+  map { $column_defs{$_}->{link} = $href . "&page=".$page."&sort=${_}&order=" . Q($_ eq $sort_col ? 1 - $form->{order} : $form->{order}) }
+    grep {!/^cvar_/ or $cvar_is_text{$_}}
+    @columns;
+
+  my %column_alignment = map { $_ => 'right' } qw(qty list_price purchase_price price_factor stock_value);
 
   map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
 
@@ -1170,6 +1322,25 @@ sub setup_wh_transfer_warehouse_selection_assembly_action_bar {
         submit    => [ '#form', { action => 'transfer_assembly_update_part' } ],
         accesskey => 'enter',
       ],
+      action => [
+        t8('Produce'),
+        submit   => [ '#form', { action => 'create_assembly', show_allocations => 1 } ],
+        disabled => $::form->{parts_id} ? undef : $::locale->text('No assembly has been selected yet.'),
+      ],
+    );
+  }
+}
+
+sub setup_wh_create_assembly_chargenumbers_action_bar {
+  my ($action) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Update'),
+        submit    => [ '#form', { action => 'create_assembly', show_allocations => 1 } ],
+        accesskey => 'enter',
+      ],
       action => [
         t8('Produce'),
         submit   => [ '#form', { action => 'create_assembly' } ],
diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 07ae59d56..790a59059 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -4,8 +4,8 @@
 # interface.
 admin_password = admin123
 
-# Which modules to use for authentication. Valid values are 'DB' and
-# 'LDAP'. You can use multiple modules separated by spaces.
+# Which modules to use for authentication. Valid values are 'DB',
+# 'LDAP', 'HTTPHeaders'. You can use multiple modules separated by spaces.
 #
 # Multiple LDAP modules with different configurations can be used by
 # postfixing 'LDAP' with the name of the configuration section to use:
@@ -77,10 +77,29 @@ bind_password =
 timeout       = 10
 verify        = require
 
+# For use with module 'HTTPHeaders':
+[authentication/http_basic]
+enabled = 1
+
+# For use with module 'HTTPHeaders':
+[authentication/http_headers]
+enabled = 0
+client_id_header = X-Kivitendo-Client-ID
+user_header = Auth-User
+secret_header = X-Kivitendo-App-Secret
+secret = ...
+
 [system]
 # Set language for login and admin forms. Currently "de" (German)
 # and "en" (English, not perfect) are available.
 language = de
+
+# Set stylesheet for login and admin forms. Supported:
+#  lx-office-erp
+#  kivitendo - was the default until version 3.9.2; will be dropped in version 4.0
+#  design40 - default
+stylesheet = design40
+
 # MassPrint Timeout
 # must be less than cgi timeout
 #
@@ -155,22 +174,48 @@ security = none
 login =
 password =
 
+[imap_client]
+enabled = 0
+hostname = localhost
+username =
+password =
+# This folder can be managed with kivitendo through the background jobs
+# CleanUpEmailSubfolders and SyncEmailFolder. Create no subfolder in the
+# base folder by hand. Use / for subfolders.
+base_folder = INBOX
+# Port only needs to be changed if it is not the default port.
+# port = 993
+# If SSL is to be used, then set port to 993 or leave empty
+ssl = 1
+
+# Define a server for a specific email (e.g. info@test.de) with
+# '[sent_emails_in_imap/email/info@test.de]'
+[sent_emails_in_imap]
+enabled = 0
+hostname = localhost
+username =
+password =
+# This folder must exist. Use / for subfolders.
+folder = Sent/Kivitendo
+# Port only needs to be changed if it is not the default port.
+# port = 143
+# If SSL is used, default port is 993
+ssl = 1
+
 [applications]
-# Location of OpenOffice.org writer
-openofficeorg_writer = oowriter
-# Location of the X virtual frame buffer used for OpenOffice
-xvfb = Xvfb
+# Location of OpenOffice.org/LibreOffice writer
+openofficeorg_writer = lowriter
 # Location of the html2ps binary
 html2ps = html2ps
 # Location of the Ghostscript binary
 ghostscript = gs
-# Location of the pdflatex (or compatible, e.g. xetex) binary
-latex = pdflatex
+# Location of the program to create PDFs from TeX documents
+latex = latexmk --pdflatex
 # Location of the Python interpreter to use when converting from
 # OpenDocument to PDF. Some distributions compile UNO support only
 # into binaries located in different locations than the main Python
 # binary.
-python_uno = python
+python_uno = python3
 
 [environment]
 # Add the following paths to the PATH environment variable.
@@ -190,15 +235,15 @@ latex = 1
 excel = 0
 # Enable or disable support for OpenDocument print templates
 opendocument = 1
-# Chose whether or not OpenOffice should remain running after a
+# Chose whether or not OpenOffice/LibreOffice should remain running after a
 # conversion. If yes then the conversion of subsequent documents will
-# be a lot faster. You need to have Python and the Python UNO bindings
-# (part of OpenOffice) installed.
-openofficeorg_daemon = 1
+# be a bit faster. You need to have Python and the Python UNO bindings
+# (part of OpenOffice/LibreOffice) installed.
+openofficeorg_daemon = 0
 openofficeorg_daemon_port = 2002
 
 [task_server]
-# Set to 1 for debug messages in /tmp/kivitendo-debug.log
+# Set to 1 for debug messages in users/kivitendo-debug.log
 debug = 0
 # Chose a system user the daemon should run under when started as root.
 run_as =
@@ -256,6 +301,33 @@ email_subject  = kivitendo self test report
 # template. currently txt and html templates are recognized and correctly mime send.
 email_template = templates/mail/self_test/status_mail.txt
 
+[check_below_minimum_stock]
+# The user name or email address a report about the under stock parts is sent
+# to.
+send_email_to  =
+# The "From:" header for said email.
+email_from     = kivitendo Daemon <root@localhost>
+# The subject for said email.
+email_subject  = Benachrichtigung: Artikel unter Mindestbestand
+# The template file used for the email's body.
+email_template = templates/mail/below_minimum_stock/error_email.html
+
+[follow_up_reminder]
+# Email notifications for due follow ups.
+# The "From:" header for said email.
+email_from     = kivitendo Daemon <root@localhost>
+# The subject for said email.
+email_subject  = kivitendo: fällige Wiedervorlagen
+# The template file used for the email's body.
+# If empty fu/follow_up_reminder_mail.html will be used.
+email_template =
+
+[follow_up_notify]
+# Email notification for new follow ups.
+email_from     = kivitendo Daemon <root@localhost>
+email_subject  = kivitendo: neue Wiedervorlagen für Sie von <%creator_name%>
+email_template = templates/mail/follow_up_notify/email_body.txt
+
 [console]
 # Automatic login will only work if both "client" and "login" are
 # given.  "client" can be a client's database ID or its name. "login"
@@ -273,9 +345,9 @@ login =
 # location of history file for permanent history
 history_file = users/console_history
 
-# location of a separate log file for the console. everything normally written
-# to the kivitendo log will be put here if triggered from the console
-log_file = /tmp/kivitendo_console_debug.log
+# Location of a separate log file for the console. Everything normally written
+# to the kivitendo log will be put here if triggered from the console.
+log_file = users/kivitendo_console_debug.log
 
 [testing]
 
@@ -362,7 +434,7 @@ keep_temp_files = 0
 restart_fcgi_process_on_changes = 0
 
 # The file name where the debug messages are written to.
-file_name = /tmp/kivitendo-debug.log
+file_name = users/kivitendo-debug.log
 
 # If set to 1 then the installation will be kept unlocked even if a
 # database upgrade fails.
@@ -374,11 +446,6 @@ keep_installation_unlocked = 0
 # the web browser to always reload the resources.
 auto_reload_resources = 0
 
-# Alternative to auto_reload_resources. If the installation dir is under git
-# version control, this will use the HEAD commit sha1 as the random GET
-# parameter, so that resources are reloaded if the installed version charnges.
-git_commit_reload_recources = 0
-
 # If set to 1 each exception will include a full stack backtrace.
 backtrace_on_die = 0
 
diff --git a/css/common.css b/css/common.css
index dd295006f..b4b1b78f8 100644
--- a/css/common.css
+++ b/css/common.css
@@ -237,3 +237,7 @@ span.upload_drop_zone {
 .thumbnail {
   cursor: pointer;
 }
+
+.fu_finished {
+  background-color: #ADFFB6;
+}
diff --git a/css/design40/README.stylesheets b/css/design40/README.stylesheets
new file mode 100644
index 000000000..5478cea71
--- /dev/null
+++ b/css/design40/README.stylesheets
@@ -0,0 +1,33 @@
+Some notes about stylesheets:
+
+* NOT every directory in css/ is considered a style to be chosen. The available
+  stylesheets are hardcoded in at least 3 places:
+  - SL/Auth.pm:read_user
+  - SL/Controller/Admin.pm:init_stylesheets
+  - bin/mozilla/am.pl:config
+  yes it sucks. change it, if you like.
+
+* If a stylesheet is requests from controller code, it is searched in this order:
+  - css/<stylesheet_of_current_user>/<path>
+  - css/<path>
+  - <path>
+
+  so common libraries can be put higher here, to be included by any stylesheet
+
+* 'kivitendo' is used as the fallback style if no style was found or the style
+  chosen was invalid.
+
+* Pay attention to the position of relative image urls. Most should not be
+  included in css anyway but should use the generated icon maps. For the rest,
+  a couple of ../ may be needed to get the right path.
+
+* If you edit another styles, these are things that are known to get broken.
+  Be sure to test them thoroughly:
+  - tabs
+  - calendars
+  - all menus
+  - autocompletion (parts/customers)
+  - charts of accounts
+  - multiselect
+  - ckeeditor
+  - jquery-ui widgets (i hate those things)
diff --git a/css/design40/admin.css b/css/design40/admin.css
new file mode 100644
index 000000000..ca0b4d240
--- /dev/null
+++ b/css/design40/admin.css
@@ -0,0 +1,38 @@
+a.no-underlined-links,
+a.no-underlined-links:visited,
+a.no-underlined-links:hover {
+  text-decoration: none !important;
+  background-color: transparent !important;
+  border: none;
+}
+a.no-underlined-links:hover {
+  background: none;
+}
+body div.admin {
+  margin: 0 ;
+}
+body div.admin h1 {
+  background-color: #fe5f14 !important;
+  color: #ffffff;
+  top: 0px ;
+  position: fixed;
+  width: 100% ;
+  padding: 0.1em 0.5em 0.3em 0.6em ;
+}
+body div.admin .tabwidget {
+  top: 35px ;
+  padding: 1.8em 0 0 0 !important;
+}
+body div.admin .tabwidget .ui-tabs-panel {
+  padding: 2.0em 1.0em 1.0em 1.0em ;
+}
+body div.admin form {
+  display: block ;
+  margin-top: 1px ;
+}
+body div.admin > form {
+  padding-top: 3.8em ;
+}
+body div.admin .wrapper {
+  margin-top: 4.0em ;
+}
diff --git a/css/design40/background_jobs.css b/css/design40/background_jobs.css
new file mode 100644
index 000000000..e390bb5a4
--- /dev/null
+++ b/css/design40/background_jobs.css
@@ -0,0 +1,14 @@
+/* Jobverwaltung */
+.background_job_list    tbody pre,
+.background_job_details tbody pre {
+  margin: 0px;
+}
+
+.background_job_details tbody th {
+  text-align: right;
+  vertical-align: top;
+}
+
+.background_job_details tbody td {
+  vertical-align: top;
+}
diff --git a/css/design40/bwa.css b/css/design40/bwa.css
new file mode 100644
index 000000000..e9b4d6b07
--- /dev/null
+++ b/css/design40/bwa.css
@@ -0,0 +1,63 @@
+/* Allgemeine Schriftdefinition */
+th,td {
+	font-size:small;
+}
+
+@page {
+	size: landscape;
+	margin: 0.5cm;
+}
+
+/* Definition Tabellenueberschrift */
+
+.left	{ text-align:left; }
+.center	{ text-align:center; }
+.right	{ text-align:right; }
+
+tr.headline    { border:0; }
+tr.headline td { border:0; }
+h3 { font-size:120%; }
+h3 { font-size:100%; }
+
+/* Tabellenkopf */
+th {
+	font-weight: bold;
+	border-bottom: solid thin black;
+	padding:0 10px;
+	text-align:right;
+}
+
+th.left  { border-left:  solid thin black; }
+th.right { border-right: solid thin black; }
+
+.querkopf th.right { text-align:center; }
+.querkopf th {
+	border-top: solid thin black;
+	border-bottom:0;
+}
+
+/* Tabelleninhalt */
+td {
+	text-align:right;
+	padding:0 0.5em;
+}
+td.left  { border-left:  solid thin black; }
+td.right { border-right: solid thin black; }
+
+
+/* jede zweite Zeile grau hinterlegen */
+tr.grey {
+	background:#f0f0f0;
+}
+
+/* letzte Zeile in der Tabelle */
+#last td{ border-bottom: solid thin black; }
+
+/* Zwischensumme/-ueberschriften */
+tr.subtotal td { font-weight: bold; }
+
+/* Fusszeile unter der Tabelle */
+td.footer {
+	text-align:right;
+	font-size:smaller;
+}
diff --git a/css/design40/csshover.htc b/css/design40/csshover.htc
new file mode 100644
index 000000000..e2dcced3e
--- /dev/null
+++ b/css/design40/csshover.htc
@@ -0,0 +1,121 @@
+<attach event="ondocumentready" handler="parseStylesheets" />
+<script>
+/**
+ *	Whatever:hover - V2.02.060206 - hover, active & focus
+ *	------------------------------------------------------------
+ *	(c) 2005 - Peter Nederlof
+ *	Peterned - http://www.xs4all.nl/~peterned/
+ *	License  - http://creativecommons.org/licenses/LGPL/2.1/
+ *
+ *	Whatever:hover is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
+ *
+ *	Whatever:hover 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
+ *	Lesser General Public License for more details.
+ *
+ *	Credits and thanks to:
+ *	Arnoud Berendsen, Martin Reurings, Robert Hanson
+ *
+ *	howto: body { behavior:url("csshover.htc"); }
+ *	------------------------------------------------------------
+ */
+
+var csshoverReg = /(^|\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active))|((a|input|textarea)([#.][^ ]+)?:unknown)/i,
+currentSheet, doc = window.document, hoverEvents = [], activators = {
+	onhover:{on:'onmouseover', off:'onmouseout'},
+	onactive:{on:'onmousedown', off:'onmouseup'},
+	onunknown:{on:'onfocus', off:'onblur'}
+}
+
+function parseStylesheets() {
+	if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
+	window.attachEvent('onunload', unhookHoverEvents);
+	var sheets = doc.styleSheets, l = sheets.length;
+	for(var i=0; i<l; i++) 
+		parseStylesheet(sheets[i]);
+}
+	function parseStylesheet(sheet) {
+		if(sheet.imports) {
+			try {
+				var imports = sheet.imports, l = imports.length;
+				for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
+			} catch(securityException){}
+		}
+
+		try {
+			var rules = (currentSheet = sheet).rules, l = rules.length;
+			for(var j=0; j<l; j++) parseCSSRule(rules[j]);
+		} catch(securityException){}
+	}
+
+	function parseCSSRule(rule) {
+		var select = rule.selectorText, style = rule.style.cssText;
+		if(!csshoverReg.test(select) || !style) return;
+		
+		var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
+		var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
+		var className = (/\.([a-z0-9_-]*on(hover|active|unknown))/i).exec(newSelect)[1];
+		var affected = select.replace(/:(hover|active|unknown).*$/, '');
+		var elements = getElementsBySelect(affected);
+		if(elements.length == 0) return;
+
+		currentSheet.addRule(newSelect, style);
+		for(var i=0; i<elements.length; i++)
+			new HoverElement(elements[i], className, activators[pseudo]);
+	}
+
+function HoverElement(node, className, events) {
+	if(!node.hovers) node.hovers = {};
+	if(node.hovers[className]) return;
+	node.hovers[className] = true;
+	hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
+	hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
+}
+	function hookHoverEvent(node, type, handler) {
+		node.attachEvent(type, handler);
+		hoverEvents[hoverEvents.length] = { 
+			node:node, type:type, handler:handler 
+		};
+	}
+
+	function unhookHoverEvents() {
+		for(var e,i=0; i<hoverEvents.length; i++) {
+			e = hoverEvents[i]; 
+			e.node.detachEvent(e.type, e.handler);
+		}
+	}
+
+function getElementsBySelect(rule) {
+	var parts, nodes = [doc];
+	parts = rule.split(' ');
+	for(var i=0; i<parts.length; i++) {
+		nodes = getSelectedNodes(parts[i], nodes);
+	}	return nodes;
+}
+	function getSelectedNodes(select, elements) {
+		var result, node, nodes = [];
+		var identify = (/\#([a-z0-9_-]+)/i).exec(select);
+		if(identify) {
+			var element = doc.getElementById(identify[1]);
+			return element? [element]:nodes;
+		}
+		
+		var classname = (/\.([a-z0-9_-]+)/i).exec(select);
+		var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
+		var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
+		for(var i=0; i<elements.length; i++) {
+			result = tagName? elements[i].all.tags(tagName):elements[i].all; 
+			for(var j=0; j<result.length; j++) {
+				node = result[j];
+				if(classReg && !classReg.test(node.className)) continue;
+				nodes[nodes.length] = node;
+			}
+		}	
+		
+		return nodes;
+	}
+</script>
\ No newline at end of file
diff --git a/css/design40/development/index.html b/css/design40/development/index.html
new file mode 100644
index 000000000..015982047
--- /dev/null
+++ b/css/design40/development/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Test und Entwicklung des Kivitendo-CSS</title>
+</head>
+<body class="developing">
+<div class="wrapper">
+<header>
+  <h1>Entwicklung &amp; Dokumentation des Kivitendo-CSS</h1>
+  <nav></nav>
+</header>
+
+<p>Diese Mini-Site dient zur Entwicklung und Dokumentation des neuen Designs von Kivitendo. Das bedeutet auch, dass die neuen, aktuellen Kivitendo-Stylesheets hier ebenfalls angewendet werden.</p>
+<ul>
+  <li><a href="form-elements.html" title="Formular-Elemente">Formular-Elemente</a></li>
+  <li><a href="form-elements-special.html" title="Formular-Elemente">Spezielle Formular-Elemente</a></li>
+  <li><a href="tables.html" title="Tabellen in Kivitendo">Tabellen</a></li>
+  <li><a href="table-dimensions.html" title="Tabellen-Abmessungen in Kivitendo">Tabellen-Abmessungen</a></li>
+  <li><a href="farben.html" title="Details zum Einsatz von Farben in Kivitendo">Einsatz von Farben</a></li>
+  <li><a href="farben-demo.html" title="Anzeige aller Farben in Kivitendo">Alle Farben in Kivitendo</a></li>
+  <li><a href="anleitung.html" title="Anzeige aller Farben in Kivitendo">Anleitung & Grundregeln</a></li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/css/design40/development/kivi-colors.html b/css/design40/development/kivi-colors.html
new file mode 100644
index 000000000..0f21d78cf
--- /dev/null
+++ b/css/design40/development/kivi-colors.html
@@ -0,0 +1,323 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <title>Kivitendo: Entwicklung von Farben</title>
+  <link type="text/css" href="style.css" rel="stylesheet">
+  <style type="text/css">
+  
+  
+    h2 {
+      clear: both;
+      margin: 2.0em 0 0 0;
+      display: block;
+    }
+    
+    h3 {
+      clear: both;
+      padding: 2.0em 0 0 0;
+      margin: 0;
+      display: block;
+    }
+
+
+  
+    /* ----------------------- */
+    /* ELEMENTS WITH GREY COLORS */
+    /* ----------------------- */
+    div.gray-superdark { background-color: var( --gray-superdark ); }/* Black */
+    div.gray-verydark { background-color: var( --gray-verydark ); }
+    div.gray-darker { background-color: var( --gray-darker ); }
+    div.gray-dark { background-color: var( --gray-dark ); }
+    div.gray-standard { background-color: var( --gray-standard ); }
+    div.gray-light { background-color: var( --gray-light ); }
+    div.gray-lighter { background-color: var( --gray-lighter ); }
+    div.gray-verylight { background-color: var( --gray-verylight ); }
+    div.gray-superlight { background-color: var( --gray-superlight ); }/* White */
+
+    p.gray-superdark { color: var( --gray-superdark ); } /* Black */
+    p.gray-verydark { color: var( --gray-verydark ); }
+    p.gray-darker { color: var( --gray-darker ); }
+    p.gray-dark { color: var( --gray-dark ); }
+    p.gray-standard { color: var( --gray-standard ); }
+    p.gray-light { color: var( --gray-light ); }
+    p.gray-lighter { color: var( --gray-lighter ); }
+    p.gray-verylight { color: var( --gray-verylight ); }
+    p.gray-superlight { color: var( --gray-superlight ); } /* White   */  
+  
+    /* ----------------------- */
+    /* ELEMENTS WITH BRAND COLORS */
+    /* ----------------------- */
+    div.brand-superdark { background-color: var( --color-superdark ); }/* Black */
+    div.brand-verydark { background-color: var( --color-verydark ); }
+    div.brand-darker { background-color: var( --color-darker ); }
+    div.brand-dark { background-color: var( --color-dark ); }
+    div.brand-standard { background-color: var( --color-standard ); }
+    div.brand-light { background-color: var( --color-light ); }
+    div.brand-lighter { background-color: var( --color-lighter ); }
+    div.brand-verylight { background-color: var( --color-verylight ); }
+    div.brand-superlight { background-color: var( --color-superlight ); }/* White */
+
+
+    /* ----------------------- */
+    /* MAIN ELEMENTS WITH BORDERS */
+    /* ----------------------- */
+
+    div.gray-superdark,
+    div.gray-verydark,
+    div.gray-darker,
+    div.gray-dark,
+    div.gray-standard,
+    div.gray-light,
+    div.gray-lighter,
+    div.gray-verylight,
+    div.brand-superdark,
+    div.brand-verydark,
+    div.brand-darker,
+    div.brand-dark,
+    div.brand-standard,
+    div.brand-light,
+    div.brand-lighter,
+    div.brand-verylight {
+      border: 1px transparent solid ;
+    }
+    div.brand-superlight,
+    div.gray-superlight {
+      border: 1px #dcdcdc solid;
+    }
+
+    p.brand-superdark { color: var( --color-superdark ); } /* Black */
+    p.brand-verydark { color: var( --color-verydark ); }
+    p.brand-darker { color: var( --color-darker ); }
+    p.brand-dark { color: var( --color-dark ); }
+    p.brand-standard { color: var( --color-standard ); }
+    p.brand-light { color: var( --color-light ); }
+    p.brand-lighter { color: var( --color-lighter ); }
+    p.brand-verylight { color: var( --color-verylight ); }
+    p.brand-superlight { color: var( --color-superlight ); } /* White   */
+  
+    div.tiny-box
+    {
+      width: 10%;
+      height: 16em;
+      float: left;
+      display: inline-block;
+      overflow: hidden;
+      vertical-align: middle;
+      text-align: center;
+      font-size: 70%;
+      padding: 0;
+      margin: 0;
+    }
+    div.box{
+      padding: 1.2em;
+      vertical-align: middle;
+    }
+    
+    div.inner
+    {
+      display: table-cell;
+      text-align: center;
+      vertical-align: middle;
+      height: 16em;
+    }
+    
+    div.tiny-box p { vertical-align: middle; font-size: 120%; }
+    div.tiny-box p b { font-size: 120%; }
+
+    div.main-box{ overflow: hidden; padding: 1.0em ;s}
+    div.main-box .wrapper{ clear: left ; margin-bottom: 1.0em ; overflow: hidden ; }
+    
+    .wrapper.lighter  { color: var(--color-dark) ;}
+    .wrapper.light    { color: var(--color-darker) ;}
+    .wrapper.standard  { color: var(--color-verydark) ;}
+    .wrapper.dark      { color: var(--color-verylight) ;}
+    .wrapper.darker    { color: var(--color-lighter) ;}
+    .wrapper.verydark  { color: var(--color-light) ;}
+
+    div.mbox
+    {
+      border-width: 3px;
+      border-style: solid;
+      padding: 1.0em;
+      width: 20% ;
+      margin: 0 1.0em 0.3em 0 ;
+      float: left;
+    }
+
+    div.msg,
+    div.spin,
+    div.msg_color
+    {
+      border-width: 1px;
+      border-style: solid;
+      padding: 1.0em;
+      width: 20% ;
+      margin: 0 1.0em 0.3em 0 ;
+      float: left;
+      border-radius: 6px ;
+    }
+    div.msg.ok{        background-color: var(--msg-ok-light);       color: var(--msg-ok-strong) ;  }
+    div.msg.hint{      background-color: var(--msg-hint-light);     color: var(--msg-hint-strong) ;  }
+    div.msg.warning{  background-color: var(--msg-warning-light); color: var(--msg-warning-strong) ;  }
+    div.msg.error{    background-color: var(--msg-error-light);   color: var(--msg-error-strong) ;  }
+
+/* 
+    div.msg_color.ok{        background-color: var(--color-green-light);       color: var(--color-green-strong) ;  }
+    div.msg_color.hint{      background-color: var(--color-blue-light);     color: var(--color-blue-strong) ;  }
+    div.msg_color.warning{  background-color: var(--color-orange-light); color: var(--color-orange-strong) ;  }
+    div.msg_color.error{    background-color: var(--color-red-light);   color: var(--color-red-strong) ;  }
+ */
+
+    div.spin.spin_60{        background-color: var(--spin_60);   color: var(--msg-ok-strong) ;  }
+    div.spin.spin_120{      background-color: var(--spin_120);   color: var(--msg-hint-strong) ;  }
+    div.spin.spin_180{      background-color: var(--spin_180);   color: var(--msg-warning-strong) ;  }
+    div.spin.spin_240{      background-color: var(--spin_240);   color: var(--msg-error-strong) ;  }
+
+
+
+
+
+
+
+  
+  </style>
+  
+</head>
+<body>
+<h1>Color Style </h1>
+<h2>GREY COLORS</H2>
+
+<div class="gray-superdark tiny-box"><div class="inner"><p class="gray-verylight">Class <b>.gray-superdark</b><br>with .gray-verylight as text</p></div></div> 
+<div class="gray-verydark tiny-box"><div class="inner"><p class="gray-standard">Class <b>.gray-verydark</b><br>with .gray-standard as text</p></div></div> 
+<div class="gray-darker tiny-box"><div class="inner"><p class="gray-standard">Class <b>.gray-darker</b><br>with .gray-standard as text</p></div></div> 
+<div class="gray-dark tiny-box"><div class="inner"><p class="gray-XXX">Class <b>.gray-dark</b><br>with .gray-XXXX as text</p></div></div> 
+
+<div class="gray-standard tiny-box"><div class="inner"><p class="gray-superdark">Class <b>.gray-standard</b><br>with .gray-superdark as text</p></div></div> 
+
+<div class="gray-light tiny-box"><div class="inner"><p class="gray-XXX">Class <b>.gray-light</b><br>with .gray-XXXX as text</p></div></div> 
+<div class="gray-lighter tiny-box"><div class="inner"><p class="gray-standard">Class <b>.gray-lighter</b><br>with .gray-standard as text</p></div></div> 
+<div class="gray-verylight tiny-box"><div class="inner"><p class="gray-standard">Class <b>.gray-verylight</b><br>with .gray-standard as text</p></div></div> 
+<div class="gray-superlight tiny-box"><div class="inner"><p class="gray-verydark">Class <b>.gray-superlight</b><br>with .gray-verydark as text</p></div></div>  
+
+
+<h2>BRAND COLORS</H2>
+
+<div class="brand-superdark tiny-box"><div class="inner"><p class="brand-verylight">Class <b>.brand-superdark</b><br>with .brand-verylight as text</p></div></div> 
+<div class="brand-verydark tiny-box"><div class="inner"><p class="brand-standard">Class <b>.brand-verydark</b><br>with .brand-standard as text</p></div></div> 
+<div class="brand-darker tiny-box"><div class="inner"><p class="brand-standard">Class <b>.brand-darker</b><br>with .brand-standard as text</p></div></div> 
+<div class="brand-dark tiny-box"><div class="inner"><p class="brand-XXX">Class <b>.brand-dark</b><br>with .brand-XXXX as text</p></div></div> 
+
+<div class="brand-standard tiny-box"><div class="inner"><p class="brand-superdark">Class <b>.brand-standard</b><br>with .brand-superdark as text</p></div></div> 
+
+<div class="brand-light tiny-box"><div class="inner"><p class="brand-XXX">Class <b>.brand-light</b><br>with .brand-XXXX as text</p></div></div> 
+<div class="brand-lighter tiny-box"><div class="inner"><p class="brand-standard">Class <b>.brand-lighter</b><br>with .brand-standard as text</p></div></div> 
+<div class="brand-verylight tiny-box"><div class="inner"><p class="brand-standard">Class <b>.brand-verylight</b><br>with .brand-standard as text</p></div></div> 
+<div class="brand-superlight tiny-box"><div class="inner"><p class="brand-verydark">Class <b>.brand-superlight</b><br>with .brand-verydark as text</p></div></div>  
+
+<h2>LAYOUTS</h2>
+
+<div class="brand-lighter main-box">
+  <p class="brand-standard">Class <b>.brand-verylight</b><br>with .brand-standard as text</p>
+  <div class="wrapper lighter">
+    <div class="mbox" style="background-color:var(--color-lighter);border-color:var(--color-standard);">BG: LIGHTER<br>Border: STANDARD<br>Text: DARK</div>
+    <div class="mbox" style="background-color:var(--color-lighter);border-color:var(--color-dark);">BG: LIGHTER<br>Border: DARK<br>Text: DARK</div>
+    <div class="mbox" style="background-color:var(--color-lighter);border-color:var(--color-darker);">BG: LIGHTER<br>Border: DARKER<br>Text: DARK</div>
+    <div class="mbox" style="background-color:var(--color-lighter);border-color:var(--color-verydark);">BG: LIGHTER<br>Border: VERYDARK<br>Text: DARK</div>
+  </div>
+  <div class="wrapper light">
+    <div class="mbox" style="background-color:var(--color-light);border-color:var(--color-standard);">BG: LIGHT<br>Border: STANDARD<br>Text: DARKER</div>
+    <div class="mbox" style="background-color:var(--color-light);border-color:var(--color-dark);">BG: LIGHT<br>Border: DARK<br>Text: DARKER</div>
+    <div class="mbox" style="background-color:var(--color-light);border-color:var(--color-darker);">BG: LIGHT<br>Border: DARKER<br>Text: DARKER</div>
+    <div class="mbox" style="background-color:var(--color-light);border-color:var(--color-verydark);">BG: LIGHT<br>Border: VERYDARK<br>Text: DARKER</div>
+  </div>
+  <div class="wrapper standard">
+    <div class="mbox" style="background-color:var(--color-standard);border-color:var(--color-standard);">BG: STANDARD<br>Border: STANDARD<br>Text: VERYDARK</div>
+    <div class="mbox" style="background-color:var(--color-standard);border-color:var(--color-dark);">BG: STANDARD<br>Border: DARK<br>Text: VERYDARK</div>
+    <div class="mbox" style="background-color:var(--color-standard);border-color:var(--color-darker);">BG: STANDARD<br>Border: DARKER<br>Text: VERYDARK</div>
+    <div class="mbox" style="background-color:var(--color-standard);border-color:var(--color-verydark);">BG: STANDARD<br>Border: VERYDARK<br>Text: VERYDARK</div>
+  </div>
+  <div class="wrapper dark">
+    <div class="mbox" style="background-color:var(--color-dark);border-color:var(--color-standard);">BG: DARK<br>Border: STANDARD<br>Text: VERYLIGHT</div>
+    <div class="mbox" style="background-color:var(--color-dark);border-color:var(--color-dark);">BG: DARK<br>Border: DARK<br>Text: VERYLIGHT</div>
+    <div class="mbox" style="background-color:var(--color-dark);border-color:var(--color-darker);">BG: DARK<br>Border: DARKER<br>Text: VERYLIGHT</div>
+    <div class="mbox" style="background-color:var(--color-dark);border-color:var(--color-verydark);">BG: DARK<br>Border: VERYDARK<br>Text: VERYLIGHT</div>
+  </div>
+  <div class="wrapper darker">
+    <div class="mbox" style="background-color:var(--color-darker);border-color:var(--color-standard);">BG: DARKER<br>Border: STANDARD<br>Text: LIGHTER</div>
+    <div class="mbox" style="background-color:var(--color-darker);border-color:var(--color-dark);">BG: DARKER<br>Border: DARK<br>Text: LIGHTER</div>
+    <div class="mbox" style="background-color:var(--color-darker);border-color:var(--color-darker);">BG: DARKER<br>Border: DARKER<br>Text: LIGHTER</div>
+    <div class="mbox" style="background-color:var(--color-darker);border-color:var(--color-verydark);">BG: DARKER<br>Border: VERYDARK<br>Text: LIGHTER</div>
+  </div>
+  <div class="wrapper verydark">
+    <div class="mbox" style="background-color:var(--color-verydark);border-color:var(--color-standard);">BG: VERYDARK<br>Border: STANDARD<br>Text: LIGHT</div>
+    <div class="mbox" style="background-color:var(--color-verydark);border-color:var(--color-dark);">BG: VERYDARK<br>Border: DARK<br>Text: LIGHT</div>
+    <div class="mbox" style="background-color:var(--color-verydark);border-color:var(--color-darker);">BG: VERYDARK<br>Border: DARKER<br>Text: LIGHT</div>
+    <div class="mbox" style="background-color:var(--color-verydark);border-color:var(--color-verydark);">BG: VERYDARK<br>Border: VERYDARK<br>Text: LIGHT</div>
+  </div>
+<h3>Messages (Colors mixed with Color Style)</h3>
+  <div class="wrapper verydark">
+    <div class="msg msg-ok">This is a OK message</div>
+    <div class="msg msg-hint">This is a HINT message</div>
+    <div class="msg msg-warning">This is a WARNING message</div>
+    <div class="msg msg-error">This is a ERROR message</div>
+  </div>
+  <h3>Original Message Colors</h3>
+  <div class="wrapper verydark">
+    <div class="msg color-ok">This is a OK message</div>
+    <div class="msg color-hint">This is a HINT message</div>
+    <div class="msg color-warning">This is a WARNING message</div>
+    <div class="msg color-error">This is a ERROR message</div>
+  </div>
+<!-- 
+<h3>Spins (Just Research)</h3>
+  <div class="wrapper verydark">
+    <div class="spin spin_60"> This is Spin  60</div>
+    <div class="spin spin_120">This is Spin 120</div>
+    <div class="spin spin_180">This is Spin 180</div>
+    <div class="spin spin_240">This is Spin 240</div>
+  </div>
+ -->
+
+
+</div> 
+
+
+<h2>COLOR STYLES</h2>
+<div class="main-box">
+  <div class="mbox style-ocean"><p><b>ocean</b></p></div> 
+  <div class="mbox style-light_blue"><p><b>light_blue</b></p></div> 
+  <div class="mbox style-aqua"><p><b>aqua</b></p></div> 
+  <h3>Green</h3>
+  <div class="mbox style-turquoise"><p><b>turquoise</b></p></div> 
+  <div class="mbox style-pine"><p><b>pine</b></p></div> 
+  <div class="mbox style-asparagus"><p><b>asparagus</b></p></div> 
+  <div class="mbox style-petrol"><p><b>petrol</b></p></div> 
+  <h3>Red</h3>
+  <div class="mbox style-salmona"><p><b>salmona</b></p></div>   
+  <div class="mbox style-salmon"><p><b>salmon</b></p></div>  
+  <div class="mbox style-tangerine"><p><b>tangerine</b></p></div>  
+  <div class="mbox style-marascino"><p><b>marascino</b></p></div> 
+  <div class="mbox style-maroon"><p><b>maroon</b></p></div> 
+  <div class="mbox style-strawberry"><p><b>strawberry</b></p></div> 
+  <div class="mbox style-pure_red"><p><b>pure_red</b></p></div> 
+  <h3>Yellow</h3>
+  <div class="mbox style-old_lemon"><p><b>old_lemon</b></p></div>  
+  <div class="mbox style-yellow_to_green"><p><b>yellow_to_green</b></p></div> 
+  <h3>Violets & Purple</h3>
+  <div class="mbox style-eggplant"><p><b>eggplant</b></p></div> 
+  <div class="mbox style-plum"><p><b>plum</b></p></div> 
+  <div class="mbox style-grape"><p><b>grape</b></p></div> 
+  <div class="mbox style-magenta"><p><b>magenta</b></p></div> 
+  <div class="mbox style-lavender"><p><b>lavender</b></p></div> 
+  <h3>Browns</h3>
+  <div class="mbox style-cayenne"><p><b>cayenne</b></p></div> 
+  <div class="mbox style-mocha"><p><b>mocha</b></p></div> 
+  <div class="mbox style-cantaloupe"><p><b>cantaloupe</b></p></div>  
+  <div class="mbox style-dark_brown"><p><b>dark_brown</b></p></div> 
+  <div class="mbox style-orange_brown"><p><b>orange_brown</b></p></div> 
+  <div class="mbox style-smack_brown"><p><b>smack_brown</b></p></div> 
+  <div class="mbox style-green_brown"><p><b>green_brown</b></p></div>  
+</div>
+</body>
+</html>
diff --git a/css/design40/development/kivi-colors.html.zip b/css/design40/development/kivi-colors.html.zip
new file mode 100644
index 000000000..d35599d26
Binary files /dev/null and b/css/design40/development/kivi-colors.html.zip differ
diff --git a/css/design40/development/style.css b/css/design40/development/style.css
new file mode 100644
index 000000000..f17380f0a
--- /dev/null
+++ b/css/design40/development/style.css
@@ -0,0 +1,258 @@
+/* ------------------------------------------------------------- */
+/* VARIABLES COLOR (variables_color_gray_standard.less) Standard Grey */
+/* ------------------------------------------------------------- */
+.bg-body {
+  background-color: #b0d5bf;
+}
+.bg-content {
+  background-image: linear-gradient(to bottom, #eff7f2, #b0d5bf);
+}
+h1::after {
+  content: " pine";
+}
+:root {
+  --gray-standard: #888888;
+  --gray-superdark: #000000;
+  --gray-verydark: #222222;
+  --gray-darker: #444444;
+  --gray-dark: #666666;
+  --gray-light: #aaaaaa;
+  --gray-lighter: #cccccc;
+  --gray-verylight: #eeeeee;
+  --gray-superlight: #ffffff;
+  --color-standard: #118040;
+  --color-superlight: #ffffff;
+  --color-verylight: #eff7f2;
+  --color-lighter: #cfe6d9;
+  --color-light: #b0d5bf;
+  --color-dark: #07331a;
+  --color-darker: #052211;
+  --color-verydark: #021109;
+  --color-superdark: #000000;
+  --msg-ok-strong: #013717;
+  --msg-ok-light: #a7fac9;
+  --msg-error-strong: #8c0713;
+  --msg-error-light: #f5dadb;
+  --msg-hint-strong: #1b85a3;
+  --msg-hint-light: #ecf7fa;
+  --msg-warning-strong: #725c03;
+  --msg-warning-light: #e7e4b3;
+  --color-green-strong: #003c18;
+  --color-green-light: #3cff8a;
+  --color-red-strong: #ae0014;
+  --color-red-light: #ffaeb7;
+  --color-blue-strong: #209ec8;
+  --color-blue-light: #ebf8fc;
+  --color-orange-strong: #8d6a00;
+  --color-orange-light: #ffe38d;
+  --spin_60: #115180;
+  --spin_120: #401180;
+  --spin_180: #801151;
+  --spin_240: #804011;
+  --style-ocean: #2e6ffd;
+  --style-light_blue: #336699;
+  --style-aqua: #0f80ff;
+  --style-turquoise: #21ffff;
+  --style-pine: #118040;
+  --style-asparagus: #808004;
+  --style-petrol: #108080;
+  --style-salmona: #990033;
+  --style-salmon: #fc6666;
+  --style-tangerine: #fd8008;
+  --style-marascino: #fb0207;
+  --style-maroon: #800040;
+  --style-strawberry: #fb0280;
+  --style-pure_red: #fc7d86;
+  --style-old_lemon: #e0e00a;
+  --style-yellow_to_green: #cad008;
+  --style-eggplant: #400080;
+  --style-plum: #800080;
+  --style-grape: #8000ff;
+  --style-magenta: #fb02ff;
+  --style-lavender: #cc66ff;
+  --style-cayenne: #800002;
+  --style-mocha: #804003;
+  --style-cantaloupe: #fecc66;
+  --style-dark_brown: #6d3702;
+  --style-orange_brown: #cc6600;
+  --style-smack_brown: #996600;
+  --style-green_brown: #666633;
+}
+.color-standard {
+  color: var(--color-standard);
+}
+.color-superlight {
+  color: var(--color-superlight);
+}
+.color-verylight {
+  color: var(--color-verylight);
+}
+.color-lighter {
+  color: var(--color-lighter);
+}
+.color-light {
+  color: var(--color-light);
+}
+.color-dark {
+  color: var(--color-dark);
+}
+.color-darker {
+  color: var(--color-darker);
+}
+.color-verydark {
+  color: var(--color-verydark);
+}
+.color-superdark {
+  color: var(--color-superdark);
+}
+.bg-standard {
+  background-color: var(--color-standard);
+}
+.bg-superlight {
+  background-color: var(--color-superlight);
+}
+.bg-verylight {
+  background-color: var(--color-verylight);
+}
+.bg-lighter {
+  background-color: var(--color-lighter);
+}
+.bg-light {
+  background-color: var(--color-light);
+}
+.bg-dark {
+  background-color: var(--color-dark);
+}
+.bg-darker {
+  background-color: var(--color-darker);
+}
+.bg-verydark {
+  background-color: var(--color-verydark);
+}
+.bg-superdark {
+  background-color: var(--color-superdark);
+}
+.msg-ok {
+  background-color: var(--msg-ok-light);
+  color: var(--msg-ok-strong);
+  border-color: var(--msg-ok-strong);
+}
+.msg-error {
+  background-color: var(--msg-error-light);
+  color: var(--msg-error-strong);
+  border-color: var(--msg-error-strong);
+}
+.msg-hint {
+  background-color: var(--msg-hint-light);
+  color: var(--msg-hint-strong);
+  border-color: var(--msg-hint-strong);
+}
+.msg-warning {
+  background-color: var(--msg-warning-light);
+  color: var(--msg-warning-strong);
+  border-color: var(--msg-warning-strong);
+}
+.color-ok {
+  background-color: var(--color-green-light);
+  color: var(--color-green-strong);
+  border-color: var(--color-green-strong);
+}
+.color-error {
+  background-color: var(--color-red-light);
+  color: var(--color-red-strong);
+  border-color: var(--color-red-strong);
+}
+.color-hint {
+  background-color: var(--color-blue-light);
+  color: var(--color-blue-strong);
+  border-color: var(--color-blue-strong);
+}
+.color-warning {
+  background-color: var(--color-orange-light);
+  color: var(--color-orange-strong);
+  border-color: var(--color-orange-strong);
+}
+.style-ocean {
+  background-color: var(--style-ocean);
+}
+.style-light_blue {
+  background-color: var(--style-light_blue);
+}
+.style-aqua {
+  background-color: var(--style-aqua);
+}
+.style-turquoise {
+  background-color: var(--style-turquoise);
+}
+.style-pine {
+  background-color: var(--style-pine);
+}
+.style-asparagus {
+  background-color: var(--style-asparagus);
+}
+.style-petrol {
+  background-color: var(--style-petrol);
+}
+.style-salmona {
+  background-color: var(--style-salmona);
+}
+.style-salmon {
+  background-color: var(--style-salmon);
+}
+.style-tangerine {
+  background-color: var(--style-tangerine);
+}
+.style-marascino {
+  background-color: var(--style-marascino);
+}
+.style-maroon {
+  background-color: var(--style-maroon);
+}
+.style-strawberry {
+  background-color: var(--style-strawberry);
+}
+.style-pure_red {
+  background-color: var(--style-pure_red);
+}
+.style-old_lemon {
+  background-color: var(--style-old_lemon);
+}
+.style-yellow_to_green {
+  background-color: var(--style-yellow_to_green);
+}
+.style-eggplant {
+  background-color: var(--style-eggplant);
+}
+.style-plum {
+  background-color: var(--style-plum);
+}
+.style-grape {
+  background-color: var(--style-grape);
+}
+.style-magenta {
+  background-color: var(--style-magenta);
+}
+.style-lavender {
+  background-color: var(--style-lavender);
+}
+.style-cayenne {
+  background-color: var(--style-cayenne);
+}
+.style-mocha {
+  background-color: var(--style-mocha);
+}
+.style-cantaloupe {
+  background-color: var(--style-cantaloupe);
+}
+.style-dark_brown {
+  background-color: var(--style-dark_brown);
+}
+.style-orange_brown {
+  background-color: var(--style-orange_brown);
+}
+.style-smack_brown {
+  background-color: var(--style-smack_brown);
+}
+.style-green_brown {
+  background-color: var(--style-green_brown);
+}
diff --git a/css/design40/dhtmlsuite/menu-bar.css b/css/design40/dhtmlsuite/menu-bar.css
new file mode 100644
index 000000000..9ae0fc3d6
--- /dev/null
+++ b/css/design40/dhtmlsuite/menu-bar.css
@@ -0,0 +1,32 @@
+/************************************************************************************************************
+
+	DHTML Suite for Applications
+	(C) www.dhtmlgoodies.com, August 2006
+
+	CSS for the DHTMLsuite_tableWidget class.
+
+	Terms of use:
+	Look at the terms of use at http://www.dhtmlgoodies.com/index.html?page=termsOfUse
+
+	Thank you!
+
+	www.dhtmlgoodies.com
+	Alf Magne Kalleland
+
+************************************************************************************************************/
+
+.DHTMLSuite_menuBar_top{	/* The bar that is parent of the menu strip */
+  position: fixed;
+  height: 26px;
+  width: 100%;
+  z-index: 100;
+  padding-left: 10px;
+  background-color: white;
+}
+
+.DHTMLSuite_menuBar_sub{
+  position: fixed;
+  background-color: #FFF;
+  border: 1px solid #000;
+  display: inline;
+}
diff --git a/css/design40/dhtmlsuite/menu-item.css b/css/design40/dhtmlsuite/menu-item.css
new file mode 100644
index 000000000..8bfe131f9
--- /dev/null
+++ b/css/design40/dhtmlsuite/menu-item.css
@@ -0,0 +1,163 @@
+/* CSS FOR MENU ITEM OF TYPE "top" */
+
+.DHTMLSuite_menuItem_top_regular,.DHTMLSuite_menuItem_top_over,.DHTMLSuite_menuItem_top_click,.DHTMLSuite_menuItem_top_disabled,.DHTMLSuite_menuItem_top_active{
+	height:19px;
+	line-height:16px;
+	margin-right:2px;
+	margin-top:1px;
+	padding-left:4px;
+	padding-right:4px;
+	padding-top:2px;
+	padding-bottom:2px;
+}
+.DHTMLSuite_menuItem_top_regular div,.DHTMLSuite_menuItem_top_over div,.DHTMLSuite_menuItem_top_click div,.DHTMLSuite_menuItem_top_disabled div,.DHTMLSuite_menuItem_top_active div{
+	padding-top:2px;
+	padding-bottom:2px;
+}
+.DHTMLSuite_menuItem_top_regular{	/* Top level menu item - Regular state */
+	cursor:pointer;
+}
+
+.DHTMLSuite_menuItem_top_over{ /* Top level menu item - Mouse over state */
+	color:#FE5F14;
+	background-color:whitesmoke;
+	cursor:pointer;
+}
+
+.DHTMLSuite_menuItem_top_active{	/* Top level menu item - Active state - this is typical the state for menu item 1 when a sub group is expanded and the mouse is located over one of the sub menu items */
+	cursor:pointer;
+}
+
+.DHTMLSuite_menuItem_top_click{	/* Top level menu item - Mouse click state */
+	color:#FE5F14;
+	background-color:whitesmoke;
+	cursor:pointer;
+	z-index:20000;
+}
+
+.DHTMLSuite_menuItem_top_disabled{	/* Disabled menu item */
+	cursor:default;
+}
+
+.DHTMLSuite_menuItem_top_disabled img,.DHTMLSuite_menuItem_top_disabled div{	/* Sub divs of disabled top level items. A menu item is a div with some subdivs(one for the icon, one for text etc.). this is the css for these sub divs */
+	filter:alpha(opacity=40);	/* Transparency */
+	opacity:0.4;	/* Transparency */
+	-moz-opacity:0.4;	/* Transparency */
+	-khtml-opacity:.4;	/* Transparency */
+}
+
+.DHTMLSuite_menuItem_top_disabled div,.DHTMLSuite_menuItem_top_active div, .DHTMLSuite_menuItem_top_click div, .DHTMLSuite_menuItem_top_regular div,.DHTMLSuite_menuItem_top_over div{	/* divs for the text,icon and arrow of a menu item */
+	float:left;
+	padding-left:1px;
+	padding-right:1px;
+}
+
+/* CSS FOR THE SMALL ARROW DIV - WHEN YOU CLICK ON THIS DIV, SUB ELEMENTS WILL SHOW */
+.DHTMLSuite_menuItem_top_arrowShowSub{	/* This is the arrow for top level elements */
+	width:12px;	/* Width of item */
+	background-repeat:no-repeat;	/* No background repeat for the arrow */
+	background-position:center center;	/* Position of the arrow. at the center of this div */
+	background-image: url('../../../image/dhtmlsuite/menu_strip_down_arrow.png');	/* Relative path to the arrow */
+	margin:0px;
+	margin-right:-1px;	/* -1 pixel is added to get the arrow a little bit more to the right. this is because of the right padding of top level items */
+	padding:0px;
+	height:16px;
+	margin-left:2px;
+	float:right;
+}
+
+.DHTMLSuite_menuItem_top_over .DHTMLSuite_menuItem_top_arrowShowSub,
+.DHTMLSuite_menuItem_top_click .DHTMLSuite_menuItem_top_arrowShowSub
+{	/* Sub menu arrows */
+	margin-left:1px;
+	border-left:1px solid #000;
+}
+
+/* CSS FOR SEPARATOR */
+
+.DHTMLSuite_menuItem_separator_top{	/* Separator of type "top" */
+	height:20px;
+	margin-top:3px;
+	margin-bottom:3px;
+	width:4px;
+	padding-left:3px;
+	padding-right:3px;
+	background-repeat:repeat-y;
+	background-image:url('../../../image/dhtmlsuite/menu_strip_separator.gif');
+
+}
+
+
+/* CSS FOR MENU ITEM OF TYPE "sub" */
+
+.DHTMLSuite_menuItem_sub_regular, .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_click,.DHTMLSuite_menuItem_sub_disabled,.DHTMLSuite_menuItem_sub_active{	/* Commom css for regular, mouse over and mouse click items */
+	clear:both;
+	line-height:18px;	/* Height of menu item */
+	height:18px;		/* Height of menu item */
+	padding-left:25px;	/* Space inside the menu item - the 25 pixels are used in order to avoid text overlapping menu item icon */
+	padding-right:4px;	/* Space inside the menu item */
+	padding-top:2px;	/* Space inside the menu item */
+	padding-bottom:2px;	 /* Space inside the menu item */
+	cursor:pointer;		/* Mouse cursor set to a "hand" */
+	margin:1px;	/* A little space around the item */
+	background-repeat:no-repeat;	/* No background repeat */
+}
+.DHTMLSuite_menuItem_sub_disabled{	/* Disabled sub menu item */
+	cursor:default;	/* Arrow as cursor instead of hand */
+}
+.DHTMLSuite_menuItem_sub_disabled div,.DHTMLSuite_menuItem_sub_disabled{	/* Disabled sub menu item - Here, we apply the rules on the divs inside the element, i.e. the div for the icon, text and arrow */
+	filter:alpha(opacity=40);	/* Transparency */
+	opacity:0.4;	/* Transparency */
+	-moz-opacity:0.4;	/* Transparency */
+	-khtml-opacity:.4;	/* Transparency */
+}
+.DHTMLSuite_menuItem_sub_regular,.DHTMLSuite_menuItem_sub_disabled{	/* Regular menu item */
+}
+
+.DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_click,.DHTMLSuite_menuItem_sub_active{
+}
+
+.DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuItem_sub_active{	/* Mouse over effect */
+	color:#FE5F14;
+	background-color:whitesmoke;
+}
+
+.DHTMLSuite_menuItem_sub_click{	/* Mouse click effect */
+	color:#FE5F14;
+	background-color:whitesmoke;
+}
+
+.DHTMLSuite_menuItem_sub_click div, .DHTMLSuite_menuItem_sub_regular div,.DHTMLSuite_menuItem_sub_over div,.DHTMLSuite_menuItem_sub_active div,.DHTMLSuite_menuItem_sub_disabled div{	/* divs for the text,icon and arrow of a menu item */
+	float:left;		/* To get the icons and text of sub elements side by side */
+	padding-left:1px;
+	padding-right:1px;
+
+}
+.DHTMLSuite_menuItem_sub_arrowShowSub{	/* Arrow div for sub elements (Right pointing arrow ) */
+	position:absolute;	/* Never change this one */
+	background-image:url('../../../image/dhtmlsuite/menu-bar-right-arrow.png');	/* Path relative to the css file */
+	width:18px;
+	height:18px;
+	text-align:right;
+	right:0px;
+	background-repeat:no-repeat;	/* No background repeat */
+	background-position: center right;	/* Position of arrow */
+}
+
+
+.DHTMLSuite_menuItem_separator_sub{	/* Separator of type "sub" */
+	height:1px;	/* Height of separator */
+	margin-top:1px;	/* Space above the separator */
+	margin-bottom:1px;	/* Space below the separator */
+	margin-left:24px;	/* left margin because we don't want the separator to cover the gradient */
+	padding-right:3px;	/* space at the right of the separator */
+	color:#FE5F14;
+	background-color:whitesmoke;
+}
+
+.DHTMLSuite_menuItem_textContent
+{
+  border-bottom-style: none !important;
+  background-color: inherit !important;
+  color: inherit !important;
+}
diff --git a/css/design40/images/animated-overlay.gif b/css/design40/images/animated-overlay.gif
new file mode 100644
index 000000000..d441f75eb
Binary files /dev/null and b/css/design40/images/animated-overlay.gif differ
diff --git a/css/design40/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/css/design40/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 000000000..f37c5a94e
Binary files /dev/null and b/css/design40/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/css/design40/images/ui-bg_diagonals-thick_20_666666_40x40.png b/css/design40/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 000000000..c0ed187f8
Binary files /dev/null and b/css/design40/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/css/design40/images/ui-bg_flat_10_000000_40x100.png b/css/design40/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 000000000..7a9469aaa
Binary files /dev/null and b/css/design40/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/css/design40/images/ui-bg_glass_100_f6f6f6_1x400.png b/css/design40/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 000000000..bbfe0de66
Binary files /dev/null and b/css/design40/images/ui-bg_glass_100_f6f6f6_1x400.png differ
diff --git a/css/design40/images/ui-bg_glass_100_fdf5ce_1x400.png b/css/design40/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 000000000..3be28b709
Binary files /dev/null and b/css/design40/images/ui-bg_glass_100_fdf5ce_1x400.png differ
diff --git a/css/design40/images/ui-bg_glass_65_ffffff_1x400.png b/css/design40/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 000000000..1b6b2285d
Binary files /dev/null and b/css/design40/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/css/design40/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/css/design40/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 000000000..2dc5f3a22
Binary files /dev/null and b/css/design40/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ
diff --git a/css/design40/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/css/design40/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 000000000..8faa20ff2
Binary files /dev/null and b/css/design40/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ
diff --git a/css/design40/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/css/design40/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 000000000..ffed194ee
Binary files /dev/null and b/css/design40/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ
diff --git a/css/design40/images/ui-icons_222222_256x240.png b/css/design40/images/ui-icons_222222_256x240.png
new file mode 100644
index 000000000..c1cb1170c
Binary files /dev/null and b/css/design40/images/ui-icons_222222_256x240.png differ
diff --git a/css/design40/images/ui-icons_228ef1_256x240.png b/css/design40/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 000000000..3a0140cff
Binary files /dev/null and b/css/design40/images/ui-icons_228ef1_256x240.png differ
diff --git a/css/design40/images/ui-icons_777777_256x240.png b/css/design40/images/ui-icons_777777_256x240.png
new file mode 100644
index 000000000..9a1fc8392
Binary files /dev/null and b/css/design40/images/ui-icons_777777_256x240.png differ
diff --git a/css/design40/images/ui-icons_ef8c08_256x240.png b/css/design40/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 000000000..036ee072d
Binary files /dev/null and b/css/design40/images/ui-icons_ef8c08_256x240.png differ
diff --git a/css/design40/images/ui-icons_ffd27a_256x240.png b/css/design40/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 000000000..8b6c05868
Binary files /dev/null and b/css/design40/images/ui-icons_ffd27a_256x240.png differ
diff --git a/css/design40/images/ui-icons_ffffff_256x240.png b/css/design40/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 000000000..4f624bb2b
Binary files /dev/null and b/css/design40/images/ui-icons_ffffff_256x240.png differ
diff --git a/css/design40/less/OBSOLETE.less b/css/design40/less/OBSOLETE.less
new file mode 100644
index 000000000..8b4b7f3a4
--- /dev/null
+++ b/css/design40/less/OBSOLETE.less
@@ -0,0 +1,87 @@
+// This file is not effacious. It is intended to delete it in the end.
+// Nicht gefundene CSS-Klassen und IDs
+
+
+
+// --------------------------------------
+// FORMER MAIN.LESS
+// --------------------------------------
+
+
+// OBSOLETE: gibt es nicht
+body.admin > h1{
+  top: 21px;
+}
+
+//  PENDENT: obsolete?
+body.menu {
+  color: #000000;
+}
+
+
+
+//  PENDENT: welche Selektoren???
+.accountlistheading {
+  padding: 0.3em;
+  color: #006400;
+  font-weight: bold;
+  text-align: left;
+  background-color: #EBEBEB;
+}
+
+
+.link_separator {
+  margin-left: 6px;
+  margin-right: 6px;
+}
+
+span.toggle_selected {
+  font-weight: bold;
+}
+
+
+//  Infos ueber Suchergebnissen
+div.info{
+    padding: 1.0em;
+    span.info-detail{
+        margin: 0 5.0em 0 0;
+    }
+}
+
+
+
+// --------------------------------------
+// FORMER COMMON.CSS
+// --------------------------------------
+// This file is not effacious. It is intended to delete it in the end.
+
+
+
+input.grow_on_focus {
+    width: 20px;
+    transition:         width 0.1s;
+    -moz-transition:    width 0.1s;
+    -webkit-transition: width 0.1s;
+    -o-transition:      width 0.1s;
+
+    &:focus { width: 150px }
+
+}
+
+/* quirk to force certain constructs to block context  */
+.block-context { overflow: hidden }
+
+
+/* various oneshot decoration for legacy purpose. dont use  */
+.small-text { font-size: @font-size-small; }
+.bold       { font-weight: bold ;}
+
+.float-left  { float: left;  }
+.float-right { float: right; }
+
+
+/* position  */
+.position-relative { position: relative; }
+.position-absolute { position: absolute; }
+
+
diff --git a/css/design40/less/READ_ME.md b/css/design40/less/READ_ME.md
new file mode 100644
index 000000000..3cb2c57e2
--- /dev/null
+++ b/css/design40/less/READ_ME.md
@@ -0,0 +1,58 @@
+# About this less stuff
+
+## What is LESS?
+Read this excellent short german overview: http://www.lesscss.de<br>
+It is recommended to install lessc/node-less server-side.
+LESS contains mainly CSS/LESS statements, and yes!, also pure and
+valid CSS-Code is also accepted and compiled. The compiler (lessc) creates
+pure and valid css code with your LESS and CSS code.
+
+## How to create a style.css for kivitendo
+First set the cursor of your terminal to <code>/css/less/</code> (<code>cd /css/less</code>)<br>
+Use following command: <code>lessc style.less ../style.css</code><br>
+For minifiying the output css:  <code>lessc -x style.less ../style.css</code><br>
+Then a new <code>/css/style.css</code> is created except if errors occur.
+
+## Developing kivitendo CSS (not customizing)
+Read style.less.<br>
+This is the control center for the whole less stuff.<br>
+Variables can be set or changed in variables.less.<br>
+Variables are efficacious in the other less files.
+
+## Overriding original stuff
+There are several overriding LESS files. Some of the files are for
+customizing the original kivitendo LESS stuff.
+
+ * <b>jquery-ui-overrides.less</b> (overrides original jquery css in jquery.less)
+ * <b>main-overrides</b> (overrides a lot of kivitendo less/css stuff)
+ * <b>custom-variables.less</b> (overrides variables in variable.less)
+ * <b>custom.less</b> (overrides all the original kivitendo LESS stuff)
+
+Overriding is useful for occurences of standard elements in a special
+context. For example: a standard table occurs in a toggle panel or in other
+control panels.
+
+## jQuery and overriding jQuery-CSS
+The jQuery LESS stuff contains the original jQuery CSS stuff (pure CSS).
+Overriding the jQuery stuff (you can call it customizing for kivitendo) is
+the best way to preserve full functionality of the jQuery JS. It is intended
+just to change colors, font-sizes & -families etc. with the override-file
+(jquery-overrides.less).
+
+If there's a new jQuery-Version just paste the whole CSS code into the
+corresponding LESS file. That's (almost) all, folks.
+
+## Customizing kivitendo CSS (not developing)
+For customisation do not touch the original (developers) LESS files.<br>
+Therefore it is recommended to edit only these two files:
+
+ * <b>custom-variables.less</b> (overrides variables in variable.less)
+ * <b>custom.less</b> (overrides in the end all the original kivitendo LESS stuff)
+
+These files can be empty if you do not want to customize the kivitendo CSS
+stuff. The original custom files contains only comments and deactivated example
+code.
+
+Customization only with these two files gives you comfort in your GIT
+habit.
+
diff --git a/css/design40/less/_developing_styles.less b/css/design40/less/_developing_styles.less
new file mode 100644
index 000000000..b3b36a726
--- /dev/null
+++ b/css/design40/less/_developing_styles.less
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+@import 'variables_color_style';
+
+
+
+
+// --------------------------------------
+// CLASSES FOR DESIGNERS
+// --------------------------------------
+
+// Output in designer/developer CSS File (just for developer)
+// don't hesitage to deactivate the following code
+// these classed are not used in kivitendo
+
+h1::after { content: " @{colorstyle}"; } // display style name 
+
+
+:root {
+
+
+  --gray-standard:      @gray-standard;
+  --gray-superdark:     @gray-superdark; // Black
+  --gray-verydark:      @gray-verydark;
+  --gray-darker:        @gray-darker;
+  --gray-dark:          @gray-dark;
+  --gray-light:         @gray-light;
+  --gray-lighter:       @gray-lighter;
+  --gray-verylight:     @gray-verylight;
+  --gray-superlight:    @gray-superlight; // White
+
+  --color-standard:     @base-standard;
+  --color-superlight:   @base-superlight;
+  --color-verylight:    @base-verylight;
+  --color-lighter:      @base-lighter;
+  --color-light:        @base-light;
+  --color-dark:         @base-dark;
+  --color-darker:       @base-darker;
+  --color-verydark:     @base-verydark;
+  --color-superdark:    @base-superdark;
+
+//  --msg-ok-strong:        @color-green-strong; 
+//  --msg-ok-light:         @color-green-light; 
+//  --msg-error-strong:     @color-red-strong; 
+//  --msg-error-light:      @color-red-light; 
+//  --msg-hint-strong:      @color-blue-strong; 
+//  --msg-hint-light:       @color-blue-light; 
+//  --msg-warning-strong:   @color-orange-strong; 
+//  --msg-warning-light:    @color-orange-light; 
+  --msg-ok-strong:        @msg-green-strong; 
+  --msg-ok-light:         @msg-green-light; 
+  --msg-error-strong:     @msg-red-strong; 
+  --msg-error-light:      @msg-red-light; 
+  --msg-hint-strong:      @msg-blue-strong; 
+  --msg-hint-light:       @msg-blue-light; 
+  --msg-warning-strong:   @msg-orange-strong; 
+  --msg-warning-light:    @msg-orange-light; 
+  
+  --color-green-strong:   @color-green-strong;
+  --color-green-light:    @color-green-light;
+  --color-red-strong:     @color-red-strong;
+  --color-red-light:      @color-red-light;
+  --color-blue-strong:    @color-blue-strong;
+  --color-blue-light:     @color-blue-light;
+  --color-orange-strong:  @color-orange-strong;
+  --color-orange-light:   @color-orange-light;  
+  
+  
+  
+  --spin_60 : spin(@base-standard,  60);
+  --spin_120: spin(@base-standard, 120);
+  --spin_180: spin(@base-standard, 180);
+  --spin_240: spin(@base-standard, 240);
+  
+  --style-ocean:            @style_ocean;
+  --style-light_blue:       @style_light_blue;
+  --style-aqua:             @style_aqua;
+  --style-turquoise:        @style_turquoise;
+  --style-pine:             @style_pine;
+  --style-asparagus:        @style_asparagus;
+  --style-petrol:           @style_petrol;
+  --style-salmona:          @style_salmona;  
+  --style-salmon:           @style_salmon; 
+  --style-tangerine:        @style_tangerine; 
+  --style-marascino:        @style_marascino;
+  --style-maroon:           @style_maroon;
+  --style-strawberry:       @style_strawberry;
+  --style-pure_red:         @style_pure_red;
+  --style-old_lemon:        @style_old_lemon; 
+  --style-yellow_to_green:  @style_yellow_to_green;
+  --style-eggplant:         @style_eggplant;
+  --style-plum:             @style_plum;
+  --style-grape:            @style_grape;
+  --style-magenta:          @style_magenta;
+  --style-lavender:         @style_lavender;
+  --style-cayenne:          @style_cayenne;
+  --style-mocha:            @style_mocha;
+  --style-cantaloupe:       @style_cantaloupe; 
+  --style-dark_brown:       @style_dark_brown;
+  --style-orange_brown:     @style_orange_brown;
+  --style-smack_brown:      @style_smack_brown;
+  --style-green_brown:      @style_green_brown; 
+
+
+}
+
+.color-standard   { color: var(--color-standard); }
+.color-superlight { color: var(--color-superlight); }
+.color-verylight  { color: var(--color-verylight); }
+.color-lighter    { color: var(--color-lighter); }
+.color-light      { color: var(--color-light); }
+.color-dark       { color: var(--color-dark); }
+.color-darker     { color: var(--color-darker); }
+.color-verydark   { color: var(--color-verydark); }
+.color-superdark  { color: var(--color-superdark); }
+
+.bg-standard      { background-color: var(--color-standard); }
+.bg-superlight    { background-color: var(--color-superlight); }
+.bg-verylight     { background-color: var(--color-verylight); }
+.bg-lighter       { background-color: var(--color-lighter); }
+.bg-light         { background-color: var(--color-light); }
+.bg-dark          { background-color: var(--color-dark); }
+.bg-darker        { background-color: var(--color-darker); }
+.bg-verydark      { background-color: var(--color-verydark); }
+.bg-superdark     { background-color: var(--color-superdark); }
+
+
+// Messages
+.msg-ok                 { background-color: var(--msg-ok-light);       color: var(--msg-ok-strong);       border-color: var(--msg-ok-strong); }
+.msg-error              { background-color: var(--msg-error-light);    color: var(--msg-error-strong);    border-color: var(--msg-error-strong); }
+.msg-hint               { background-color: var(--msg-hint-light);     color: var(--msg-hint-strong);     border-color: var(--msg-hint-strong); }
+.msg-warning            { background-color: var(--msg-warning-light);  color: var(--msg-warning-strong);  border-color: var(--msg-warning-strong); }
+// Message Original Colors
+.color-ok               { background-color: var(--color-green-light);  color: var(--color-green-strong);  border-color: var(--color-green-strong); }
+.color-error            { background-color: var(--color-red-light);    color: var(--color-red-strong);    border-color: var(--color-red-strong); }
+.color-hint             { background-color: var(--color-blue-light);   color: var(--color-blue-strong);   border-color: var(--color-blue-strong); }
+.color-warning          { background-color: var(--color-orange-light); color: var(--color-orange-strong); border-color: var(--color-orange-strong); }
+
+.style-ocean            { background-color: var( --style-ocean ); } 
+.style-light_blue       { background-color: var( --style-light_blue ); } 
+.style-aqua             { background-color: var( --style-aqua ); } 
+.style-turquoise        { background-color: var( --style-turquoise ); } 
+.style-pine             { background-color: var( --style-pine ); } 
+.style-asparagus        { background-color: var( --style-asparagus ); } 
+.style-petrol           { background-color: var( --style-petrol ); } 
+.style-salmona          { background-color: var( --style-salmona ); }   
+.style-salmon           { background-color: var( --style-salmon ); }  
+.style-tangerine        { background-color: var( --style-tangerine ); }  
+.style-marascino        { background-color: var( --style-marascino ); } 
+.style-maroon           { background-color: var( --style-maroon ); } 
+.style-strawberry       { background-color: var( --style-strawberry ); } 
+.style-pure_red         { background-color: var( --style-pure_red ); } 
+.style-old_lemon        { background-color: var( --style-old_lemon ); }  
+.style-yellow_to_green  { background-color: var( --style-yellow_to_green ); } 
+.style-eggplant         { background-color: var( --style-eggplant ); } 
+.style-plum             { background-color: var( --style-plum ); } 
+.style-grape            { background-color: var( --style-grape ); } 
+.style-magenta          { background-color: var( --style-magenta ); } 
+.style-lavender         { background-color: var( --style-lavender ); } 
+.style-cayenne          { background-color: var( --style-cayenne ); } 
+.style-mocha            { background-color: var( --style-mocha ); } 
+.style-cantaloupe       { background-color: var( --style-cantaloupe ); }  
+.style-dark_brown       { background-color: var( --style-dark_brown ); } 
+.style-orange_brown     { background-color: var( --style-orange_brown ); } 
+.style-smack_brown      { background-color: var( --style-smack_brown ); } 
+.style-green_brown      { background-color: var( --style-green_brown ); }  
\ No newline at end of file
diff --git a/css/design40/less/admin.less b/css/design40/less/admin.less
new file mode 100644
index 000000000..1bbca6a8a
--- /dev/null
+++ b/css/design40/less/admin.less
@@ -0,0 +1,117 @@
+// ----------------------------------------------------------------------------
+//
+// ADMIN-Section
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+//
+//
+// CONTENTS:
+// -
+// -
+// -
+// -
+// ----------------------------------------------------------------------------
+
+
+// login and admin
+// PENDENT: entfernen?!?!?!
+a.no-underlined-links,
+a.no-underlined-links:visited,
+a.no-underlined-links:hover {
+  text-decoration: none !important;
+  background-color:transparent !important;
+  border:none;
+}
+a.no-underlined-links:hover {
+  background: none;
+}
+
+
+
+
+// Admin section: the menu itself doesn't occupy space. So make room
+// at the top of the div covering the whole admin area.
+body {
+
+  & + #menuv3 {
+    top: 0 important;
+  }
+
+  div.admin {
+    padding: 60px 0 0 0 ;
+    .bg-content ;
+
+    h1 {
+      background-color: #fe5f14 !important;
+      color:             #ffffff;
+      top:               30px ;
+      position:         fixed;
+      width:             100% ;
+      padding:           0.6em 0.5em 0.5em 0.6em;
+      z-index:           1000;
+
+      & + .wrapper {
+        padding-top: 1.2em;
+      }
+    }
+
+    // Login-Form with big logo
+
+    .logo {
+      width:     auto;
+      clear:     both;
+      margin:   3.0em auto 1.0em auto;
+      padding:   2.0em 0 0 0;    
+    }
+    
+    .separate-form{
+      background-color: #ddd ;
+      border: 1px @gray-standard solid;
+      border-radius: @controlpanel-radius ;
+      display: block ;
+      width: 24.0em;
+      margin: 0 auto ;
+      padding: 0.7em 0.6em 1.0em 0.6em ;
+    }
+
+    .tabwidget {
+      padding:         2.4em 0 0 0 !important;
+      .ui-tabs-nav{
+        top:           66px;
+      }
+      .ui-tabs-panel {
+        padding:       2.0em 1.0em 1.0em 1.0em ;
+        overflow:     hidden;
+        height:       auto;
+        min-height:   300px ;
+      }
+    }
+
+    & > form{
+      display: block ;
+      margin-top: 1px ;
+      padding-top: 1.2em ;
+    }
+
+    .message{
+      &_error,
+      &_hint,
+      &_info,
+      &_warning,
+      &_ok{
+        //margin-top: 70px ;
+      }
+    }
+    
+  } // /div.admin
+} // /body
+
+
+
+
+
+
+
+
diff --git a/css/design40/less/buttons.less b/css/design40/less/buttons.less
new file mode 100644
index 000000000..ad0882a02
--- /dev/null
+++ b/css/design40/less/buttons.less
@@ -0,0 +1,332 @@
+/* ------------------------------------------------------------- */
+/* BUTTONS (buttons.less)                                        */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// BUTTONS (FORM BUTTONS & LINKS AS BUTTONS)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: all kind of buttons
+//
+// CONTENTS:
+// - FORM BUTTONS
+//   - input, button
+//     - .clear
+//     - Dimensions
+//   - button.icon
+//   - Action STRONG (submission to server page)
+//   - Action SOFT/NEUTRAL (no submission to server page)
+//   - button
+//     - .below
+// - LINK AND LABELS DESIGNED AS BUTTONS
+// - BUTTONS CONTAINER
+// - IMAGE-BUTTONS
+// ----------------------------------------------------------------------------
+
+
+
+// --------------------------------------
+// FORM BUTTONS
+// --------------------------------------
+// At first we tried to nest the buttons within the form element,
+// but it is not possible because some forms do not have a form element
+// (e.g. print dialog)
+
+// A lot of buttons are outside of a form, so let be this tag deactivated
+//form {
+
+  // General
+  input[type="button"],
+  input[type="submit"],
+  input[type="reset"],
+  button {
+
+    .mx-button ; // Mixin
+
+    &.clear { clear: left; }
+
+    // DIMENSIONS
+    &.wi-verysmall   { min-width: @input-wi-verysmall   ; }
+    &.wi-small       { min-width: @input-wi-small       ; }
+    &.wi-mediumsmall { min-width: @input-wi-mediumsmall ; }
+    &.wi-normal      { min-width: @input-wi-normal      ; }
+    &.wi-lightwide   { width:     @input-wi-lightwide   ; }
+    &.wi-wide        { width:     @input-wi-wide        ; }
+    &.wi-wider       { width:     @input-wi-wider       ; }
+    &.wi-verywide    { width:     @input-wi-verywide    ; }
+    &.wi-tiny {
+      width:        auto ;
+      padding:      0.16em 0.2em 0.1em 0.2em;
+      margin:      -0.3em 0 0 0.2em;
+      //float:      right;
+      display:      inline-block;
+      font-size:    84% ;
+      min-height:   23px;
+      max-height:   23px;
+    }
+    &.wi-verytiny{
+      font-size:    8pt !important;
+      padding:      0.0em 0.3em 0.1em 0.3em;
+      display:      inline-block;
+      min-height:   17px;
+      max-height:   17px;
+    }
+
+  } // /input[type="button etc."]
+
+  button.icon{
+    padding:      0 ;
+    margin:       0 ;
+    background:   none !important;
+    border:       0 !important;
+    display:      inline-block;
+    img { vertical-align: middle ; }
+  }
+
+  // -------------------
+  // Action STRONG (submission to server page)
+  input[type="submit"],
+  input[type="button"],
+  input[type="button"].button,
+  button[type="submit"],
+  button[type="button"] {
+    color:                  @button-strong-color ;
+    background-color:       @button-strong-bg;
+    border:                 @button-strong-border ;
+    &:hover{
+      color:                @button-strong-hover-color ;
+      background-color:     @button-strong-hover-bg;
+      border:               @button-strong-hover-border ;
+    }
+    &:active,
+    &:focus{
+      color:                @button-strong-active-color ;
+      background-color:     @button-strong-active-bg;
+      border:               @button-strong-active-border ;
+    }
+  }
+
+  // -------------------
+  // Action SOFT/NEUTRAL (no submission to server page)
+  input[type="button"].neutral,
+  input[type="submit"].neutral,
+  input[type="reset"],
+  input[type="reset"].neutral,
+  button.neutral,
+  button[type="reset"] {
+    color:              @button-neutral-color ;
+    background-color:   @button-neutral-bg;
+    border:             @button-neutral-border ;
+    &:hover {
+      color:            @button-neutral-hover-color ;
+      background-color: @button-neutral-hover-bg;
+      border:           @button-neutral-hover-border ;
+    }
+    &:active,
+    &:focus {
+      color:            @button-neutral-active-color;
+      background-color: @button-neutral-active-bg;
+      border:           @button-neutral-active-border ;
+    }
+
+    // Toggle-Button (e.g. for position details in tables)
+    &.positions {
+      padding-right:    1.2em ;
+      // ::after does not work in buttons
+//       input#cb_show_details {
+//         &::after {
+//           content:      "▸" !important ;
+//         }
+//       }
+//       input#cb_hide_details::after {
+//         content:        "▾" !important ;
+//       }
+    } // /.positions
+
+  } // /input[type="*"].neutral
+
+  // PENDENT: Neu
+  input[type="button"]{
+    &.below{
+      clear: both !important;
+      float: none;
+      //margin-top: 0.3em;
+      overflow: hidden ;
+    }
+  }
+//} // /form
+
+
+
+
+
+
+
+// --------------------------------------
+// LINKS DESIGNED AS BUTTONS
+// They may be placed inside or outside a form
+// --------------------------------------
+a {
+  &.button {
+
+    .mx-button ;
+
+    &.below { clear: both !important; }
+
+    // STANDARD colors
+    .mx-button-standard ;
+    .mx-button-standard-hover-focus ;
+
+    // NEUTRAL (no Submission)
+    &.neutral {
+      &:link,
+      &:visited{
+        .mx-button-neutral ; // Mixin
+      }
+      .mx-button-neutral-hover-focus ; // Mixin
+    } // /.neutral
+
+    &.wi-smallest     { width:     @input-wi-smallest    ; }
+    &.wi-verysmall    { width:     @input-wi-verysmall   ; }
+    &.wi-small        { width:     @input-wi-small       ; }
+    &.wi-mediumsmall  { width:     @input-wi-mediumsmall ; }
+    &.wi-normal       { width:     @input-wi-normal      ; }
+    &.wi-lightwide    { width:     @input-wi-lightwide   ; }
+    &.wi-wide         { width:     @input-wi-wide        ; }
+    &.wi-wider        { min-width: @input-wi-wider       ; }
+    &.wi-verywide     { min-width: @input-wi-verywide    ; }
+    // Tiny button (one letter button)
+    &.wi-tiny {
+      display:    inline-block;
+      width:      auto ;
+      padding:    0.16em 0.2em 0.1em 0.2em;
+      margin:     -0.3em 0 0 0.2em;
+      font-size:  84% ;
+    }
+
+    // Toggle (for filters e.g.)
+    &.toggle {
+      background-color: @controlpanel-bg-color !important ;
+
+      &.off::after{
+        content:                    " ▸";
+        padding-right:              1.0em;
+      }
+      &.on::after {
+        content:                    " ▾";
+        padding-right:              1.0em;
+      }
+      &.with-panel{
+        margin-bottom:              0 ;
+        border-bottom: none;
+        border-bottom-left-radius:  0px ;
+        border-bottom-right-radius: 0px ;
+        &:hover {
+          border-top:               @controlpanel-border !important ;
+          border-right:             @controlpanel-border !important ;
+          border-bottom:            0 !important;
+          border-left:              @controlpanel-border !important ;
+        }
+      }
+      &:hover{
+        background-color:           @button-neutral-bg !important;
+        border:                     @controlpanel-border !important ;
+        color:                      @button-neutral-color;
+        text-decoration:            none;
+      }
+    } // /.toggle
+  } // /.button
+}// /a
+
+
+
+// --------------------------------------
+// LABELS DESIGNED AS BUTTONS
+// They may be placed inside or outside a form
+// --------------------------------------
+#content label.button {
+
+  .mx-button ; // Mixin
+
+  // STANDARD colors
+  .mx-button-standard ; // Mixin
+
+  .mx-button-standard-hover-focus ; // Mixin
+
+  // NEUTRAL (no Submission)
+  &.neutral {
+    .mx-button-neutral ; // Mixin
+    .mx-button-neutral-hover-focus ; // Mixin
+  } // /.neutral
+
+} // /.button
+
+
+
+// --------------------------------------
+// BUTTONS CONTAINER
+// --------------------------------------
+// Container fuer Buttons
+div.buttons {
+  padding:            1.0em ;
+  clear:              left ;
+  display:            block;
+  // PENDENT: anschauen, steht fuer Anzeige von Positionsdetails in Listen-Tabellen
+  &.positions {
+    margin:           0 0 -1.7em 26.0em;
+    padding:          0em;
+    label.button.neutral,
+    input.positions {
+      border-bottom-left-radius: 0 !important;
+      border-bottom-right-radius: 0 !important;
+      padding-bottom: 0.6em !important;
+      margin-bottom: -0.8em !important;
+      background: none !important;
+      border-bottom: none !important;
+    }
+    input.positions{
+
+    }
+  }
+  &.below {
+    padding:          0 ;
+    margin:           0 ;
+  }
+}
+.col > .buttons,
+.wrapper * .buttons {
+  padding:            1.0em 1.0em 1.0em 0 !important;
+}
+
+
+
+// --------------------------------------
+// IMAGE BUTTONS ()
+// --------------------------------------
+.button-image {
+  display: inline-block ;
+  // Info or details button
+  &.info {  }
+  // Delete (cross) button
+  &.delete {  }
+  // Edit (pencil) button
+  &.edit {  }
+  // Map (globus / planet earth) button
+  &.map { }
+}
+td,
+th {
+  .button-image { vertical-align: middle; }
+}
+input[type="button"].button-image{
+  &.delete {
+    background-image:     url("image/cross2.png");
+    background-repeat:     no-repeat;
+    background-position:   0 0;
+    color:                 #fff;
+    background-color:      transparent;
+    border-color:         none;
+    border-width:         0;
+  }
+}
diff --git a/css/design40/less/common.less b/css/design40/less/common.less
new file mode 100755
index 000000000..048cdb80a
--- /dev/null
+++ b/css/design40/less/common.less
@@ -0,0 +1,189 @@
+/* ------------------------------------------------------------- */
+/* COMMON PROPERTIES (common.less)                               */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// COMMON PROPERTIES
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+//
+//
+// CONTENTS:
+// - HTML
+// - BODY
+// - DIVs & BOX-SIZING
+// - CLEARFIX
+// - MEDIA
+// - CTI
+// - INTERACT
+// - CURSOR
+// - CKEDITOR
+// - PENDENT: bereinigen, bitte!
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// HTML
+// --------------------------------------
+
+html {
+  // show scrollbar every time
+  overflow-y: scroll;
+}
+
+
+
+
+// --------------------------------------
+// BODY
+// --------------------------------------
+
+body {
+  // don't use this IE stuff anymore!!!
+  //behavior:url("csshover.htc") ;
+  padding: 0;
+  margin: 0 ;
+  font-size: @font-size-smaller ;
+}
+
+
+
+
+// --------------------------------------
+// DIVS & BOX-SIZING
+// --------------------------------------
+
+div, 
+p,
+span, 
+table, 
+th,
+td,
+input, 
+textarea,
+select, 
+button,
+a.button
+{
+  box-sizing: border-box;
+}
+
+
+
+
+
+
+
+
+
+
+// --------------------------------------
+// CLEARFIX
+// --------------------------------------
+
+// class to fix container around floats
+.clearfix:after {
+  clear:both;
+  content:".";
+  display:block;
+  height:0;
+  visibility:hidden;
+}
+
+
+
+
+// --------------------------------------
+// MEDIA
+// --------------------------------------
+
+@media screen   { .noscreen { display: none; } }
+@media print    { .noprint  { display: none ;} }
+@media handheld { .nomobile { display: none; } }
+
+
+
+
+// --------------------------------------
+// CTI
+// --------------------------------------
+
+a.cti_call_action {
+  //display: inline-block;
+  display: block;
+  padding-left: 18px;
+  top: 2px;
+  vertical-align: middle;
+  background-image: url(../../image/icons/16x16/phone.png);
+  background-repeat: no-repeat;
+}
+
+
+
+
+// --------------------------------------
+// INTERACT
+// --------------------------------------
+
+// clickable text anchors, usually with attached javascript handlers
+.interact { color: gray }
+.interact:hover { color: black; }
+
+
+
+
+// --------------------------------------
+// CURSOR
+// --------------------------------------
+
+.cursor-default { cursor: default }
+.cursor-pointer { cursor: pointer }
+.cursor-help    { cursor: help }
+
+
+
+
+
+// --------------------------------------
+// CKEditor
+// --------------------------------------
+
+// PENDENT: schauen, wie man das am besten hinkriegt,
+// ggf. in CKEditor-JS-Dateien anpassen, was aber nicht nachhaltig ist
+// CKEditor: Padding reduziert
+.cke_contents iframe html body.cke_editable{
+  padding: 0;
+  margin: 0;
+}
+
+
+
+
+
+// --------------------------------------
+// PENDENT
+// --------------------------------------
+
+
+
+// PENDENT: OBSOLET diese Klassen entfernen
+ //  Internals (waren im HTML-Code eingebaut)
+ //  ersetzen bzw. Verlagern in Tabellen ggf. Paragrafen oder DIVs
+.top_border {
+  border-top: solid black;
+  border-width: 4px;
+}
+ //  Internals (waren im HTML-Code eingebaut)
+ //  ersetzen bzw. Verlagern in Tabellen ggf. Paragrafen oder DIVs
+.bottom_border {
+  border-bottom: solid black;
+  border-width: 1px;
+}
+
+
+
diff --git a/css/design40/less/control_panels.less b/css/design40/less/control_panels.less
new file mode 100644
index 000000000..2c33fb474
--- /dev/null
+++ b/css/design40/less/control_panels.less
@@ -0,0 +1,380 @@
+/* ------------------------------------------------------------- */
+/* CONTROL PANELS (control_panels.less)                          */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// CONTROL PANELS
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: all kind boxes/tools for selecting, including and entering data
+//
+// CONTENTS:
+// - FORM-ADDITION
+// - SELECT ITEM
+// - FILTER-TOGGLE-PANEL
+// - INPUT-PANEL
+// - PAGINATE
+// - JUMP-TO
+// ----------------------------------------------------------------------------
+
+
+
+// --------------------------------------
+// CONTROL-PANEL
+// --------------------------------------
+// General Class for all control panels
+.control-panel {
+  border:           @controlpanel-border !important;
+  background-color: @controlpanel-bg-color;
+  background:        @controlpanel-bg-style ;
+  border-radius:    @controlpanel-radius;
+  //color:            red ;
+  overflow:         hidden ;
+
+  span.label{
+    padding-right: 0.6em ;
+  }
+}
+
+
+
+
+// --------------------------------------
+// FORM-ADDITION
+// --------------------------------------
+// Settings for including fields in a report
+.form-addition{
+  padding:          @controlpanel-padding-bold !important ;
+  margin:           @controlpanel-margin !important ;
+  width:            auto !important ;
+  display:          inline-block ;
+
+  h3{
+//    color:          @controlpanel-h3-color  !important;
+//    font-size:      @controlpanel-h3-size   !important;
+//    font-weight:    @controlpanel-h3-weight !important;
+    margin:         0.3em 0 0.1em 0 !important;
+    padding:         0 ;
+  }
+  h4{
+   color:          @controlpanel-h4-color !important;;
+   font-size:      @controlpanel-h4-size;
+   font-weight:    @controlpanel-h4-weight;
+   font-style:     @controlpanel-h4-style;
+  }
+
+  div.list{
+    margin-top: 0.2em !important ;
+    &.col{
+//       min-width: 130px ;
+//       max-width: 240px ;
+    }
+  }
+} // /.form-addition
+
+
+
+// --------------------------------------
+// SELECT ITEM
+// --------------------------------------
+// Panel for selecting a hidden Record (e.g. Contacts, Delivery Address etc.)
+.select-item{
+  display:          inline-block ;
+  width:            auto ;
+  height:           auto;
+  padding:          @controlpanel-select-item-padding ;
+  margin:           @controlpanel-margin ;
+  color:            @controlpanel-color ;
+  font-size:        @font-size-smaller ;
+  border:           @controlpanel-border ;
+  border-radius:    @controlpanel-radius ;
+  background-color: @controlpanel-bg-color ;
+  background:        @_bg_style_button ; // PENDENT:
+
+  input,
+  select{
+    margin-left:    0.6em ;
+  }
+  span.label{
+    float:          left ;
+    color:          @controlpanel-color ;
+  }
+  table{
+    margin: 0 ;
+    td, th{ color:  @controlpanel-color ; }
+  }
+
+  // see /controller.pl?action=FinancialOverview
+  // PENDENT: anders loesen oder einfacher benennen
+  .floating-boxes {
+    display: table ;
+    margin: 0.4em 0 0.8em 0 ;
+
+    .floating-box {
+      display: table-cell ;
+      float: left ;
+      font-size: @font-size-smaller ;
+      height: 1.9em ;
+      vertical-align: middle;
+      padding: 0 2.0em 0 0 ;
+      .button, button{
+        margin: 0 ;
+      }
+      label,
+      span.label{
+        width: auto;
+        display: inline-block;
+        height: 160%;
+      }
+      input[type="checkbox"]{ margin: 0 0.4em 0 0 ; }
+      select { margin: -0.3em 0 0 0; }
+    }
+  }
+
+} // /.select-item
+
+// Select function within standard wrapper
+.ui-tabs-panel > .select-item {
+  margin:         @contentbox-margin;
+  vertical-align: top ;
+
+}
+.wrapper > .select-item {
+  margin:     0.8em 0 1.0em 0 ;
+}
+
+// selects with text filters
+div.filtered_select input, div.filtered_select select {
+  display: block;
+}
+
+div.filtered_select input {
+  background-image: url(../../../image/glass14x14.png);
+  background-repeat: no-repeat;
+  background-position: 2px 2px;
+  border-radius: 0px;
+  border: solid #a0a0a0 1px;
+  border-bottom: none;
+  padding: 0px;
+  padding-left: 20px;
+  margin: 0;
+  width: 500px;
+}
+
+div.filtered_select select {
+  width: 522px;
+}
+
+
+
+
+// --------------------------------------
+// FILTER-TOGGLE-PANEL
+// --------------------------------------
+// for togglin a filter panel
+// see inlcude file /templates/webpages/common/filter-toggle.html
+.toggle_panel.control-panel{
+  border:         none !important;
+  background:     none !important;
+  border-radius:   0 !important;
+  overflow:       visible !important;
+}
+.toggle_panel{
+  & > a.button.toggle {
+    padding:   0.2em 0 0.2em 1.4em;
+    &:hover {
+      background-color: @controlpanel-bg-color !important;
+      text-decoration:   underline ;
+    }
+  }
+  span.summary {
+    font-size:     @font-size-small;
+    padding-left: 2.0em;
+    color:         @controlpanel-color;
+  }
+  .toggle_panel_block {
+    display:          block;
+    overflow:         hidden;
+    padding:          @controlpanel-padding ;
+    margin:            2em 1em 0em 0; ;
+    background-color: @controlpanel-bg-color;
+
+    border:                     @controlpanel-border ;
+    border-bottom-left-radius:  @controlpanel-radius ;
+    border-bottom-right-radius: @controlpanel-radius ;
+    border-top-right-radius:    @controlpanel-radius ;
+    margin-top: -1px ;
+
+    .buttons{
+      clear:     left ;
+      padding:   0 !important;
+      margin:   0;
+    }
+  }
+
+  // PENDENT: ggf. anpassen an Controlpanel-Farbtoene
+  .tbl-horizontal {
+    //th{ color: @base-superdark ; }
+    margin-right: 1.6em;
+  }
+
+}
+
+
+
+
+// --------------------------------------
+// INPUT-PANEL
+// --------------------------------------
+// Panel for entering data via jQuery-Scripts etc.
+#content .input-panel {
+  display:                    inline-block;
+  overflow:                   hidden ;
+  padding:                    @controlpanel-padding-narrow ;
+  margin:                     @margin-from-wrapper ;
+  background-color:           @controlpanel-bg-color;
+  border:                     @controlpanel-border ;
+  border-radius:              @controlpanel-radius ;
+//  border-bottom-left-radius:  @controlpanel-radius ;
+//  border-bottom-right-radius: @controlpanel-radius ;
+//  border-top-right-radius:    @controlpanel-radius ;
+//  border-top-left-radius:     @controlpanel-radius ;
+  width:                       auto ;
+  min-width:                   30% ;
+  //max-width: 70% ;
+
+  & > h3 {
+    margin-top: 0 ;
+  }
+  p      {
+    font-size:   @font-size-smaller ;
+    margin:     0 0 0.4em 0 ;
+  }
+  table.condensed {
+    margin-bottom: 0.1em;
+    caption { padding-top: 0.1em ; }
+    td span.label {
+      padding-right: 0.6em ;
+      &.above{ margin-bottom: 0em ; }
+    }
+  }
+}
+#content .ui-tabs-panel > .input-panel { margin-left: @margin-left-from-content }
+#content .input-panel.short { min-width: @wi-mediumsmall; }
+
+// --------------------------------------
+// PAGINATE
+// --------------------------------------
+.paginate {
+  display:          inline-block ;
+  width:            auto ;
+  height:           auto ;
+  padding:          0 ;
+  margin:           @controlpanel-margin ;
+  border:           @controlpanel-border ;
+  border-radius:    @controlpanel-radius ;
+  background-color: @controlpanel-bg-color ;
+  color:            @controlpanel-color ;
+
+  & > a,
+  & > span {
+    padding: 0.4em 0.6em !important ;
+    margin-top: -1px ;
+  }
+
+  .paginate-prev {
+    display:          inline-block ;
+    &::before{ content: "◄" ; }
+    &:hover{
+      border-bottom-left-radius: @controlpanel-radius ;
+      border-top-left-radius:    @controlpanel-radius ;
+    }
+  }
+  .paginate-next {
+    display:          inline-block ;
+    &::after{ content: "►"; }
+    &:hover{
+      border-bottom-right-radius: @controlpanel-radius ;
+      border-top-right-radius:    @controlpanel-radius ;
+    }
+  }
+  .paginate-page {
+    display:          inline-block ;
+    padding: 0 ;
+  }
+  span.paginate-page {
+    background-color: @controlpanel-active-bg;
+    color:            @controlpanel-active-text;
+  }
+  a:link, a:visited{  }
+  a:hover,
+  a:active{
+    background-color: @controlpanel-bg-hover;
+    color:            @controlpanel-bg-hover-text;
+    text-decoration: none;
+  }
+}
+
+
+
+// --------------------------------------
+// JUMP-TO
+// --------------------------------------
+// for jumping e.g. to a address within a browser window
+// PENDENT: anders und allgemein loesen
+table.jump-to {
+  &.right { float: right; }
+
+  border: @controlpanel-border;
+  border-radius: @controlpanel-radius ;
+  background-color: @controlpanel-bg-color;
+  margin: 0.8em 2.0em 0 1.2em !important;
+}
+
+
+
+// -------------------
+// FLOAT-CELLS TABLE
+// Table with left-floating cell
+div.float-cells-table{
+  display: block ;
+  width: 100% ;
+  overflow: hidden;
+  font-size: 80% ;
+
+  div.caption{
+    float: left;
+    display: block;
+    width: auto;
+    padding: 0 2.0em 0 0;
+    margin: 0;
+
+  }
+  div.cells{
+    float: left;
+    display: block;
+    overflow: hidden;
+    width: 100%;
+     background-color: #F66;
+
+    div.cell{
+      float: left;
+      padding: 0 2.0em 0 0;
+      border-right: 1px #fff solid;
+      background-color: #FC6;
+    }
+  }
+}
+
+
+
+
+
+// --------------------------------------
+// DEZIDIERTE ELEMENTE
+// --------------------------------------
+
+.control-panel select#contact_cp_id {
+
+}
diff --git a/css/design40/less/custom.less b/css/design40/less/custom.less
new file mode 100644
index 000000000..a98a6d318
--- /dev/null
+++ b/css/design40/less/custom.less
@@ -0,0 +1,175 @@
+/* ------------------------------------------------------------- */
+/* CUSTOM LESS STUFF (custom.less)                               */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// CUSTOM LESS STUFF (ONLY FOR OVERRIDES OF THE STANDARD-KIVITENDO-STUFF)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: Place your custom less/css stuff here
+// Override the Kivitendo-Less-Stuff only in custom.less
+//
+//
+//
+// CONTENTS:
+// - SUBJECT
+// - - My special class
+// - - My overridden class // PENDENT: bessere Beschreibung
+// ----------------------------------------------------------------------------
+
+
+//
+// **********************************
+// MY SPECIAL CLASS
+// **********************************
+
+//.my-class-padding: 0.2em ; // just an example
+
+//
+// **********************************
+// MY OVERRIDDEN CLASSES // PENDENT: bessere Beschreibung
+// **********************************
+
+// You can delete or disable/enable the following CSS code
+// This is just an exemple
+// Do run "lessc style.less ../style.css" in your terminal session with cursor on the folder /css/less
+
+// Custom overrides 
+
+
+// --------------------------------------
+// DISABLE CAPTIONS IN HORIZONTAL TABLES
+// --------------------------------------
+// Captions are good. It is a nice guidance thru Kivitendo and captions also force 
+// programmers 
+
+
+
+//table.tbl-horizontal {
+//  caption,
+//  th.caption,
+//  td.caption{
+//    display: none ; // instead of: table-caption  
+//  }
+//}
+//
+//div.wrapper.bordered {
+//  padding: 0.6em 0 0.2em 0.4em;
+//
+//  &::before{ 
+//    content: "Detail Information"; //instead of caption in toggled wrapper
+//    z-index: 9000 ;   
+//  }
+//  .tbl-horizontal{ display: none ; }
+//  .toggles { margin-top: -3px; }
+//  .toggles.max {
+//    width: 100%;
+//    z-index: 9001 ; 
+//    margin-top: -17px;
+//    text-align: right;
+//    display: block;
+//    margin-right: 10px;
+//    a.toggle.max{
+//      width: 100%;
+//      background-position: right center;
+//    }
+//  }
+//}
+// /DISABLE CAPTIONS IN HORIZONTAL TABLES
+
+
+
+
+//table.tbl-horizontal {
+//  display: table ;
+//  background-color: #ccc;
+//  border-bottom: 12px #ccc solid ;
+//  border-top-left-radius:   0 ;
+//  border-top-right-radius:  0 ;
+//  border-bottom-left-radius:   @controlpanel-radius ;
+//  border-bottom-right-radius:  @controlpanel-radius ;
+//
+//  & > caption{
+//    color:                   #ffffff !important;
+//    background-color:        @gray-dark;
+//    padding-left:            0.8em;
+//    border-top-left-radius:  @controlpanel-radius ;
+//    border-top-right-radius: @controlpanel-radius ;
+//    //margin: -24px -12px 0.6em -12px ;
+//    & > a, & > a:link, & > a:visited { decoration: none; color: #fff !important; }
+//  }
+//  th{ padding-left: 0.3em; }
+//  td{ padding-right: 0.3em; }
+//  tbody { border-top: 8px #ccc solid; }
+//  &.checkered {
+//     tbody { border-top: none ; }
+//     border-bottom: none;
+//  }
+//  tbody > tr > td:first-child,
+//  tbody > tr > th:first-child,
+//  thead > tr > th:first-child{
+//    padding-left: 1.0em ;
+//  }
+//  tbody > tr:first-child {
+//    & > th { padding-top: 0.5em ; }
+//    & > td { padding-top: 0.5em ; }
+//  }
+//  th.caption{
+//    color:              #fff !important;
+//    background-color:   @gray-dark;
+//    padding:            0.4em 0 0.3em 0.8em;
+//    border-top:         6px solid #ccc;
+//    border-bottom:      8px solid #ccc;
+//    margin-bottom: 0.6em ;
+//    //margin: -24px -12px 0.6em -18px ;
+//  }
+//}
+//
+//.col{
+//  padding-bottom: 0.4em ;
+//
+//  & > table.tbl-horizontal {
+//    margin-right: 0 !important;
+//    //border-top-left-radius:  0 ;
+//    //border-top-right-radius: 0 ;
+//    border-radius: 0 ;
+//    padding-bottom: 0 ;
+//
+//    caption{
+//      border-top-left-radius:  0 ;
+//      border-top-right-radius: 0 ;
+//    }
+//  }
+//  & > table.tbl-horizontal:first-child{
+//    border-top-left-radius:     0 ;
+//    border-top-right-radius:    0 ;
+//    border-bottom-left-radius:  0 ;
+//    border-bottom-right-radius: 0 ;
+//    margin-bottom: 0 ;
+//    caption{
+//      border-top-left-radius:  @controlpanel-radius ;
+//      border-top-right-radius: @controlpanel-radius ;
+//    }
+//  }
+//  & > table.tbl-horizontal:last-child{
+//    border-bottom-left-radius:  @controlpanel-radius  ;
+//    border-bottom-right-radius: @controlpanel-radius ;
+//    margin-bottom: 0 ;
+//  }
+//}
+//
+//.cke_editable{
+//  margin-left: 0.0em !important;
+//}
+
+
+
+// --------------------------------------
+// Centered Aligned Tables
+// --------------------------------------
+// Do everybody a favor: do not activate it
+
+//table.tbl-list{
+//  margin: 0 auto 1.0em auto;
+//}
diff --git a/css/design40/less/custom_less_variables.less b/css/design40/less/custom_less_variables.less
new file mode 100644
index 000000000..8cee5f324
--- /dev/null
+++ b/css/design40/less/custom_less_variables.less
@@ -0,0 +1,43 @@
+/* ------------------------------------------------------------- */
+/* CUSTOM VARIABLES (custom_variables.less)                      */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// CUSTOM VARIABLES (ONLY FOR OVERRIDES IN CUSTOM.LESS)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: Place your custom variables here
+// For more information about variables see variables.less
+// Copy variables from variable.less into this files here
+// Do not change variables and less stuff in the original source files
+// then you will be happy with your git work
+//
+// CONTENTS:
+// - SUBJECT
+// - - My override variables
+// - - My own variables
+// ----------------------------------------------------------------------------
+
+
+//
+// **********************************
+// MY OVERRIDE VARIABLES
+// **********************************
+
+
+// -----------------------
+// BORDER-COLORS
+// -----------------------
+// Change (or darken!) the borders colors if they are looking to fancy
+
+
+
+
+//
+// **********************************
+// MY SPECIAL VARIABLES
+// **********************************
+
+//@my-class-padding: 0.2em ; // just an example
diff --git a/css/design40/less/developing.less b/css/design40/less/developing.less
new file mode 100644
index 000000000..a726196bd
--- /dev/null
+++ b/css/design40/less/developing.less
@@ -0,0 +1,197 @@
+/* ------------------------------------------------------------- */
+/* DEVELOPING (developing.less)                                  */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// Developing-Section
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// This LESS-file is just for us developers.
+// Don't be ashamed to disable the rendering of the following LESS/CSS-Code
+// in the file style.less.
+//
+//
+// CONTENTS:
+// -
+// -
+// -
+// -
+// ----------------------------------------------------------------------------
+
+
+body.developing{
+
+  &>header{
+     background-color: @base-h1-bg;
+     display: block;
+     overflow: hidden;
+    h1{
+      float: left;
+      color: @base-h1-color ;
+      padding: 1.0em;
+    }
+    nav{
+      float: right;
+      padding: 1.0em;
+      a:link,
+      a:visited {
+        color: white ;
+      }
+    }
+  }
+  .wrapper{
+    p,
+    ul,
+    ol,
+    li,
+    h2,
+    h3,
+    h4{
+      clear: both;
+      width: 60.0em;
+      max-width: 60em;
+    }
+  }
+  & > p,
+  & > h2,
+  & > h3,
+  & > h4 {
+    margin-left: 0.8em ;
+  }
+  h2, h3, h4 { font-weight: bold ; color: #000 !important; clear: left; padding-left: 0 !important; }
+  h2{ font-size: 130%;  }
+  h3{ font-size: 120%;  }
+  h4{ font-size: 110%;  }
+  pre {
+    margin: 0 0 1.0em 0 ;
+    padding: 0.6em ;
+    border: 1px #000 solid ;
+    background-color: #ddd ;
+    display: inline-block;
+    clear: both;
+    code{ padding: 0 ; }
+  }
+  div.code-highlighted{
+    margin: 0 0 1.0em 0 ;
+    padding: 0.6em ;
+    border: 1px #000 solid ;
+    background-color: #ddd ;
+    display: inline-block;
+  }
+
+  p.picture{
+    background-color: #fff;
+    padding: 0.8em;
+    border: 1px @gray-standard solid;
+    display: inline-block;
+    width: auto;
+  }
+  .wrapper{
+
+    .tbl-horizontal{
+      border: 1px black solid !important;
+      border-collapse: collapse;
+      tbody {
+        border-top: none;
+      }
+      caption,th { padding-left: 0.6em ; }
+
+      th.caption {
+        border-top: none;
+        border-bottom: none;
+
+      }
+
+
+      &.test,
+      &.test-plain{
+        th{
+          //border: 1px black solid !important;
+          padding-left: 0.3em;
+        }
+        td{
+          //border: 1px black solid ;
+          display: block;
+          overflow: visible;
+          border-bottom: 1px @gray-dark solid ;
+        }
+        tr:last-child td { border: none ;}
+
+      }
+    }
+
+    &.clear{
+      .tbl-horizontal{
+        clear: both ;
+      }
+    }
+
+    table.tbl-list > thead > tr th:first-child, table.tbl-list > tbody > tr td:first-child {
+        padding-left: 0 !important;
+    }
+
+    div.test-box{
+      font-size: 80% ;
+      overflow: visible;
+      padding: 0.3em 0.5em ;
+      background-color: #9D9E9D;
+      float: left;
+      border: 1px #000 dotted ;
+    }
+
+  } // /.wrapper
+
+  // Buttons
+  // Action SOFT/NEUTRAL (no submission to server page)
+  input[type="submit"], 
+  input[type="button"], 
+  input[type="button"].button, 
+  button[type="submit"], 
+  button[type="button"],
+  a.button {
+    color: @button-strong-color;
+    background-color: @button-strong-bg;
+    border: @button-strong-border;
+
+    &.hover{
+      color: @button-strong-hover-color;
+      background-color: @button-strong-hover-bg;
+      border: @button-strong-hover-border;  
+    }
+    &.active{
+      color: @button-strong-active-color;
+      background-color: @button-strong-active-bg;
+      border: @button-strong-active-border;  
+    }  
+  }
+  // Action SOFT/NEUTRAL (no submission to server page)
+  input[type="button"].neutral,
+  input[type="submit"].neutral,
+  input[type="reset"],
+  input[type="reset"].neutral,
+  button.neutral,
+  button[type="reset"] {
+    color:              @button-neutral-color ;
+    background-color:   @button-neutral-bg;
+    border:             @button-neutral-border ;
+    &.neutral-hover {
+      color:            @button-neutral-hover-color ;
+      background-color: @button-neutral-hover-bg;
+      border:           @button-neutral-hover-border ;
+    }
+    &.neutral-active,
+    &.neutral-focus {
+      color:            @button-neutral-active-color;
+      background-color: @button-neutral-active-bg;
+      border:           @button-neutral-active-border ;
+    }
+  }
+
+
+
+
+
+
+} // /body.developing
diff --git a/css/design40/less/developing_demo.less b/css/design40/less/developing_demo.less
new file mode 100644
index 000000000..4f4634360
--- /dev/null
+++ b/css/design40/less/developing_demo.less
@@ -0,0 +1,226 @@
+/* ------------------------------------------------------------- */
+/* DEVELOPING DEMO (developing_demo.less)                        */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// DEVELOPERS DEMO
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: All colors for the demo color page in /css/developing/farben-demo.html
+// use following statement for creating the demo-css-file:
+//   lessc developing-demo.less ../css/developement/farben-demo.css
+//
+// For creating the HTML demo blocks from variables.less use following grep patterns
+//   @([a-z-]+)[ ]*:[ ]*[@][0-9a-z-]+[ ]*;         replace with:
+//   .\1 { background-color: @\1 } or .$1 { background-color: @$1 }
+// ----------------------------------------------------------------------------
+
+
+@import 'variables.less';
+
+// --------------
+// Grey shades
+.gray-darker     { background-color: @gray-darker }
+.gray-verydark   { background-color: @gray-verydark }
+.gray-dark       { background-color: @gray-dark }
+.gray-standard   { background-color: @gray-standard }
+.gray-light     { background-color: @gray-light }
+.gray-lighter   { background-color: @gray-lighter }
+.gray-verylight { background-color: @gray-verylight }
+.gray-superlight{ background-color: @gray-superlight }
+// --------------
+// Divers Color Specications
+// for message and other coloured stuff
+// error
+.color-red-strong { background-color: @color-red-strong }
+.color-red-light { background-color: @color-red-light }
+// ok
+.color-green-strong { background-color: @color-green-strong }
+.color-green-light { background-color: @color-green-light }
+// info/hint
+.color-blue-strong { background-color: @color-blue-strong }
+.color-blue-light { background-color: @color-blue-light }
+// warning
+.color-orange-strong { background-color: @color-orange-strong } // more brown
+.color-orange-light { background-color: @color-orange-light }
+// divers
+.rainbow-green { background-color: @rainbow-green }
+.rainbow-blue { background-color: @rainbow-blue }
+.rainbow-red { background-color: @rainbow-red }
+.rainbow-yellow { background-color: @rainbow-yellow }
+
+// --------------
+// Base colors
+
+// Text (Label & data)
+.base-primary { background-color: @base-primary }
+.base-label { background-color: @base-label }
+.base-label-bg { background-color: @base-label-bg }
+
+// Messages & info types
+.base-info { background-color: @base-info }
+.base-info-bg { background-color: @base-info-bg }
+
+.base-ok { background-color: @base-ok }
+.base-ok-bg { background-color: @base-ok-bg }
+
+.base-warning { background-color: @base-warning }
+.base-warning-bg { background-color: @base-warning-bg }
+
+.base-error { background-color: @base-error }
+.base-error-bg { background-color: @base-error-bg }
+
+// Positive & negative colors
+.base-positive { background-color: @base-positive }
+.base-positive-bg { background-color: @base-positive-bg }
+.base-negative { background-color: @base-negative }
+.base-negative-bg { background-color: @base-negative-bg }
+
+
+// Buttons
+// Button with manipulation (submit etc.)
+.button-strong { background-color: @button-strong }
+.button-strong-bg { background-color: @button-strong-bg }
+.button-strong-border { background-color: @button-strong-border }
+.button-strong-hover { background-color: @button-strong-hover }
+.button-strong-hover-bg { background-color: @button-strong-hover-bg }
+.button-strong-hover-border { background-color: @button-strong-hover-border }
+.button-strong-active { background-color: @button-strong-active }
+.button-strong-active-bg { background-color: @button-strong-active-bg }
+.button-strong-active-border { background-color: @button-strong-active-border }
+// button withoud data manipulation (reset, cancel, open, show etc.)
+.button-soft { background-color: @button-soft }
+.button-soft-bg { background-color: @button-soft-bg }
+.button-soft-border { background-color: @button-soft-border }
+.button-soft-hover { background-color: @button-soft-hover }
+.button-soft-hover-bg { background-color: @button-soft-hover-bg }
+.button-soft-hover-border { background-color: @button-soft-hover-border }
+.button-soft-active { background-color: @button-soft-active }
+.button-soft-active-bg { background-color: @button-soft-active-bg }
+.button-soft-active-border { background-color: @button-soft-active-border }
+
+
+// --------------------------------------
+// SCAFFOLDING
+// --------------------------------------
+.body-bg { background-color: @body-bg } // general PENDENT: obsolete
+.content-bg { background-color: @content-bg } // background first tabs
+.tabs-bg { background-color: @tabs-bg } // background tabs panel (data/content)
+.heading-bg { background-color: @heading-bg } // controlpanels & other stuff
+.controlpanel-bg { background-color: @controlpanel-bg-color } // controlpanels
+
+.text-color { background-color: @text-color }
+.heading-color { background-color: @heading-color } // labels & table headings
+.caption-color { background-color: @caption-color } // caption
+
+#demo{
+  h1,
+  h2{
+    clear: both;
+    color: @gray-standard !important;
+    padding: 0 ;
+    margin:  0 ;
+  }
+  h1 { font-size: 14pt; padding-top: 1.0em ; }
+  h2 { font-size: 12pt; margin-top: 0.2em ; }
+  div.selector{
+    display: block ;
+    width: 8.0em ;
+    float: left ;
+    margin: 0 1.0em 0 0 ;
+    overflow: hidden ;
+    padding: 0 ;
+
+    h3{
+      color: @gray-standard !important;
+      font-size: 9pt;
+      font-weight: normal;
+      height: 2.8em ;
+      display: table-cell;
+      vertical-align: bottom ;
+    }
+    div.color{
+      width: 8.0em ;
+      height: 8.0em ;
+      display: block;
+      overflow: hidden ;
+      padding: 0 ;
+      margin: 0;
+      border: 1px #000 solid ;
+    }
+  }
+  .group {
+    display: inline-block;
+    float: left;
+    overflow: hidden ;
+  }
+}
+
+
+
+
+/* -------------------------------------- */
+/* Colors for Developers Color Demo       */
+/* -------------------------------------- */
+
+
+// -----------------------
+// GREY SHADES
+// -----------------------
+.gray-superdark:    #000000 ; // Black
+.gray-verydark:      #222222 ;
+.gray-darker:        #555555 ;
+.gray-dark:          #888888 ;
+
+.gray-standard:      #aaaaaa ;
+
+.gray-light:        #cfcfcf ;
+.gray-lighter:      #dedede ;
+.gray-verylight:    #ececec ;
+.gray-superlight:    #ffffff ; // White
+
+
+// -----------------------
+// BASE COLORS
+// -----------------------
+.base-superdark:    @gray-superdark ; // Black
+.base-verydark:    @gray-verydark ;
+.base-darker:      @gray-darker ;
+.base-dark:        @gray-dark ;
+
+.base-standard:    @gray-standard ;
+
+.base-light:        @gray-light ;
+.base-lighter:      @gray-lighter ;
+.base-verylight:    @gray-verylight ;
+.base-superlight:  @gray-superlight ; // White
+
+
+
+// -----------------------
+// Special Color Specifications for messages
+// -----------------------
+
+// OK (Green)
+.color-green-strong:    #003c18;
+.color-green-light:     #9ccb21;
+
+// Error (Red)
+.color-red-strong:      #ae0014;
+.color-red-light:       #ffd6d6;
+
+// Info/Hint (Blue)
+.color-blue-strong:     #209ec8;
+.color-blue-light:      #b6e6e5;
+
+// Warning (Orange)
+.color-orange-strong:   #8D6A00; // more brown
+.color-orange-light:    #f6d972;
+
+// Divers
+.rainbow-green:         #408000;
+.rainbow-blue:          #0080FF;
+.rainbow-red:           #FF0000;
+.rainbow-yellow:        #FFFF00;
+
diff --git a/css/design40/less/forms.less b/css/design40/less/forms.less
new file mode 100755
index 000000000..34bbfbf14
--- /dev/null
+++ b/css/design40/less/forms.less
@@ -0,0 +1,807 @@
+/* ------------------------------------------------------------- */
+/* FORM ELEMENTS (forms.less)                                    */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// FORMS & FORM-ELEMENTS
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// The properties of every form and form element should be specified here
+//
+//
+// CONTENTS:
+// - FORM
+// -- .box
+// - FORM ELEMENTS
+// -- input, textarea, select
+// -- focused elements
+// - BUTTONS
+// - LABELS
+// - FIELDSET
+// - DIMENSIONS:
+//   - Single line input fields
+//   - Select elements
+// - DATA FORMAT
+// - SPECIALS:
+//   - Date picker (JQuery-UI)
+// - MIXED FORM-TABLES
+// - PLACEHOLDER-TEXT
+// - JQUERY-CONTAINERS FOR FIELDS (Picker etc.)
+// ----------------------------------------------------------------------------
+
+
+/* forms.less */
+
+// --------------------------------------
+// FORM
+// --------------------------------------
+// At first we tried to nest all form elements within the form tag
+// but it is not possible because some forms (print dialog etc.) do not have
+// a surrounding form element
+form {
+  display:     table;
+  width:       100%;
+  text-align: left;
+  margin:     0 auto 0 auto;
+
+
+  // If Form must be a block container
+  // PENDENT: anschauen
+  &.box {
+    display:   block;
+    overflow: hidden ;
+    padding:   0 0 1.6em 0 ;
+  }
+
+}
+// /form
+
+
+  // --------------------------------------
+  // FORM-ELEMENTS
+  // --------------------------------------
+  //
+  input,
+  textarea,
+  select {
+    font-family:       @font-family-sans-serif ;
+    //font-size:         @font-size-smaller ;
+    padding:           0.2em 0.2em 0.2em @padding-databoxes-left ;
+    border:           1px;
+    border-color:     darkgray lightgray lightgray;
+    border-style:     solid;
+    outline:           none;
+    background-color: #fff ;
+
+    &[type="text"],
+    &[type="password"] {
+
+    }
+    // PENDENT: data type
+    &[type="text"] {
+      &.accent{
+        font-weight:   bold ;
+        font-size:     130% !important ;
+        padding:       0.6em auto !important ;
+      }
+    }
+  }
+  // /input, textarea, select
+
+
+  textarea {
+    resize: vertical;
+  }
+
+  // set default height for internal notes in record views
+  textarea#intnotes,
+  textarea#order_intnotes,
+  textarea#reclamation_intnotes {
+    height: 150px;
+  }
+
+
+
+
+  // --------------
+  // Focused Elements
+  input[type="text"],
+  input[type="password"],
+  textarea,
+  select {
+    &:focus,
+    &:active {
+      background-color: @formelement-focus-bg ;
+      border:           @formelement-focus-border ;
+      color:             @formelement-focus-text ;
+    }
+  }
+
+
+
+  // --------------
+  // Forced Padding for Pop-Down-Symbol
+  // PENDENT: Pop-Down-Symbol wo definiert?
+
+  select {
+    // background: white url('../../image/select-down.png') no-repeat scroll right center;
+    //padding-right:         1.0em;
+    //padding-left:          0.6em ;
+    &.helper {
+       background-color:   @gray-superlight;
+    }
+    & > option {
+      padding-left:          0.6em ;
+    }
+  }
+
+
+
+
+
+
+
+  // --------------------------------------
+  // SPECIAL INPUT TYPES
+  // --------------------------------------
+
+  input {
+    &[type="file"]{
+      padding:             0.8em;
+      background-color:   @gray-lighter;
+      color:               @gray-dark ;
+      border:             1px @gray-dark solid ;
+      // PENDENT: geht wahrscheinlich nicht, oder muss anders geloest werden
+      // Hier handelt es sich um den "Select File"-Button
+      button,
+      input[type="button"] {
+        background-color: #A3FFA8;
+      }
+    }
+  }
+
+
+
+
+  // --------------------------------------
+  // LABELS
+  // --------------------------------------
+
+  label {
+    cursor:             pointer;
+    vertical-align:     top;
+    display:             inline-block;
+    width:               88% ;
+    color:               @base-data-label-color ;
+
+    &:link,
+    &:visited {
+      text-decoration: none ;
+    }
+    &:hover {
+      //color:             #000 ;
+      text-decoration:   underline ;
+    }
+  }
+
+
+
+
+  // --------------------------------------
+  // FIELDSET
+  // --------------------------------------
+
+  fieldset {
+    margin-top:       15px;
+    color:             black;
+    font-weight:       normal;
+    font-size:         @font-size-large;
+    text-transform:   uppercase;
+    border-color:     grey;
+    border-width:     1px ;
+    margin:           0.4em 0.6em 1.4em 0.6em;
+
+    // Heading within FIELDSET */
+    h4 {
+      font-weight: normal ;
+      font-size:   @h4-size ;
+      margin:      0;
+      padding:     0 0 0.2em 0;
+    }
+  }
+
+
+
+
+  // --------------------------------------
+  // DIMENSIONS
+  // --------------------------------------
+  input{
+
+    // 1 Lined input field
+    // PENDENT: bei Verwendung von weiteren HTML5-Typen Typ-Deklaration erweitern
+    &[type="text"],
+    &[type="password"]{
+      &.wi-smallest     { width:     @input-wi-smallest    ; } //   2.0em
+      &.wi-verysmall    { width:     @input-wi-verysmall   ; } //   4.0em
+      &.wi-small        { width:     @input-wi-small       ; } //   8.8em
+      &.wi-mediumsmall  { width:     @input-wi-mediumsmall ; } //   8.8em
+      &.wi-normal       { width:     @input-wi-normal      ; } //  12.0em
+      &.wi-lightwide    { width:     @input-wi-lightwide   ; } //  12.0em
+      &.wi-wide         { width:     @input-wi-wide        ; } //  18.0em
+      &.wi-wider        { min-width: @input-wi-wider       ; } //  24.0em
+      &.wi-verywide     { min-width: @input-wi-verywide    ; } //  36.0em
+
+      // data types
+      &.wi-date         { width: @input-wi-small       ; } //
+      &.wi-number       { width: @input-wi-small       ; } //
+      &.wi-tinynumber   { width: @input-wi-verysmall   ; } //
+      &.wi-largenumber  { width: @input-wi-mediumsmall ; } //
+
+      // combined minus dimensions (take care of the double hyphen -- )
+      &.wi-lightwide--verysmall { width: @input-wi-lightwide--verysmall; }
+      &.wi-wide--verysmall      { width: @input-wi-wide--verysmall !important; }
+      //&.wi-wide--verysmall      { width: 203px; }
+
+    }
+    // Password (Standard size) // PENDENT: Standardgroesse ??
+     &[type="password"]{
+      //min-width: @input-wi-normal ;
+    }
+
+    // OBSOLETE // PENDENT: ggf. entfernen
+    .fixed_width {
+      width: 250px;
+    }
+  } // /DIMENSION input
+
+
+  // -------------------
+  // Select-Element
+  //
+
+  select {
+    &.wi-smallest     { width:     @select-wi-smallest    ; } //   2.0em
+    &.wi-verysmall    { width:     @select-wi-verysmall   ; }
+    &.wi-small        { width:     @select-wi-small       ; } // Datum (PENDENT: ca. 8.6em)
+    &.wi-mediumsmall  { width:     @select-wi-mediumsmall ; }
+    &.wi-normal       { width:     @select-wi-normal      ; }
+    &.wi-lightwide    { width:     @select-wi-lightwide   ; }
+    &.wi-wide         { width:     @select-wi-wide        ; }
+    &.wi-wider        { min-width: @select-wi-wider       ; }
+    &.wi-verywide     { min-width: @select-wi-verywide    ; }
+    &.wi-full         { width:     100%                   ; }
+
+    &.wi-small-normal             { width: @select-wi-small-normal } ;
+    &.wi-small-lightwide          { width: @select-wi-small-lightwide } ;
+    &.wi-small-wide               { width: @select-wi-small-wide } ;
+    &.wi-small-wider              { width: @select-wi-small-wider } ;
+    &.wi-small-verywide           { width: @select-wi-small-verywide } ;
+    &.wi-mediumsmall-normal       { width: @select-wi-mediumsmall-normal } ;
+    &.wi-mediumsmall-lightwide    { width: @select-wi-mediumsmall-lightwide } ;
+    &.wi-mediumsmall-wide         { width: @select-wi-mediumsmall-wide } ;
+    &.wi-mediumsmall-wider        { width: @select-wi-mediumsmall-wider } ;
+    &.wi-mediumsmall-verywide     { width: @select-wi-mediumsmall-verywide } ;
+    &.wi-normal-normal            { width: @select-wi-normal-normal } ;
+    &.wi-normal-lightwide         { width: @select-wi-normal-lightwide } ;
+    &.wi-normal-wide              { width: @select-wi-normal-wide } ;
+    &.wi-normal-wider             { width: @select-wi-normal-wider } ;
+    &.wi-normal-verywide          { width: @select-wi-normal-verywide } ;
+    &.wi-lightwide-normal         { width: @select-wi-lightwide-normal } ;
+    &.wi-lightwide-lightwide      { width: @select-wi-lightwide-lightwide } ;
+    &.wi-lightwide-wide           { width: @select-wi-lightwide-wide } ;
+    &.wi-lightwide-wider          { width: @select-wi-lightwide-wider } ;
+    &.wi-lightwide-verywide       { width: @select-wi-lightwide-verywide } ;
+    &.wi-wide-normal              { width: @select-wi-wide-normal } ;
+    &.wi-wide-lightwide           { width: @select-wi-wide-lightwide } ;
+    &.wi-wide-wide                { width: @select-wi-wide-wide } ;
+    &.wi-wide-wider               { width: @select-wi-wide-wider } ;
+    &.wi-wide-verywide            { width: @select-wi-wide-verywide } ;
+
+
+
+
+
+  } // /DIMENSION select
+
+
+  // -------------------
+  // Textarea-Element
+  //
+
+  textarea {
+
+    // Standard-Dimensions
+    &.wi-smallest     { width:     @textarea-wi-normal      ; } // no smallest, just normal
+    &.wi-verysmall    { width:     @textarea-wi-normal      ; } // no verysmall, just normal
+    &.wi-small        { width:     @textarea-wi-normal      ; } // no small, just normal
+    &.wi-mediumsmall  { width:     @textarea-wi-normal      ; } // no mediumsmall, just normal
+    &.wi-normal       { width:     @textarea-wi-normal      ; }
+    &.wi-lightwide    { min-width: @textarea-wi-lightwide   ; }
+    &.wi-wide         { min-width: @textarea-wi-wide        ; }
+    &.wi-wide.strict  { max-width: @textarea-wi-wide !important  ; }
+    &.wi-wider        { min-width: @textarea-wi-wider       ; }
+    &.wi-verywide     { min-width: @textarea-wi-verywide    ; }
+    &.wi-full         { width:     100%                  ; }
+
+
+    &.wi-small-small       { width: @textarea-wi-small-small ; }
+    &.wi-small-mediumsmall { width: @textarea-wi-small-mediumsmall ; margin: 0 30px 0 0 ; }
+    &.wi-small-normal      { width: @textarea-wi-small-normal ; }
+    &.wi-small-lightwide   { width: @textarea-wi-small-lightwide ; }
+    &.wi-small-wide        { width: @textarea-wi-small-wide ; }
+    &.wi-small-wider       { width: @textarea-wi-small-wider ; }
+    &.wi-small-verywide    { width: @textarea-wi-small-verywide ; }
+
+    &.wi-mediumsmall-small       { width: @textarea-wi-mediumsmall-small ; }
+    &.wi-mediumsmall-mediumsmall { width: @textarea-wi-mediumsmall-mediumsmall ; }
+    &.wi-mediumsmall-normal      { width: @textarea-wi-mediumsmall-normal ; }
+    &.wi-mediumsmall-lightwide   { width: @textarea-wi-mediumsmall-lightwide ; }
+    &.wi-mediumsmall-wide        { width: @textarea-wi-mediumsmall-wide ; }
+    &.wi-mediumsmall-wider       { width: @textarea-wi-mediumsmall-wider ; }
+    &.wi-mediumsmall-verywide    { width: @textarea-wi-mediumsmall-verywide ; }
+
+    &.wi-normal-small       { width: @textarea-wi-normal-small ; }
+    &.wi-normal-mediumsmall { width: @textarea-wi-normal-mediumsmall ; }
+    &.wi-normal-normal      { width: @textarea-wi-normal-normal ; }
+    &.wi-normal-lightwide   { width: @textarea-wi-normal-lightwide ; }
+    &.wi-normal-wide        { width: @textarea-wi-normal-wide ; }
+    &.wi-normal-wider       { width: @textarea-wi-normal-wider ; }
+    &.wi-normal-verywide    { width: @textarea-wi-normal-verywide ; }
+
+    &.wi-lightwide-small       { width: @textarea-wi-lightwide-small ; }
+    &.wi-lightwide-mediumsmall { width: @textarea-wi-lightwide-mediumsmall ; }
+    &.wi-lightwide-normal      { width: @textarea-wi-lightwide-normal ; }
+    &.wi-lightwide-lightwide   { width: @textarea-wi-lightwide-lightwide ; }
+    &.wi-lightwide-wide        { width: @textarea-wi-lightwide-wide ; }
+    &.wi-lightwide-wider       { width: @textarea-wi-lightwide-wider ; }
+    &.wi-lightwide-verywide    { width: @textarea-wi-lightwide-verywide ; }
+
+    &.wi-wide-small       { width: @textarea-wi-wide-small ; }
+    &.wi-wide-mediumsmall { width: @textarea-wi-wide-mediumsmall ; }
+    &.wi-wide-normal      { width: @textarea-wi-wide-normal ; }
+    &.wi-wide-lightwide   { width: @textarea-wi-wide-wide ; }
+    &.wi-wide-wide        { width: @textarea-wi-wide-wide ; }
+    &.wi-wide-wider       { width: @textarea-wi-wide-wider ; }
+    &.wi-wide-verywide    { width: @textarea-wi-wide-verywide ; }
+
+  } // /DIMENSION textarea
+
+  // textarea sizes for JS generated elements
+  // make sure not to use it as a standard
+  td, th { &.wi-date            > input[type="text"] { width: @input-wi-small             ; } }
+  td, th { &.wi-lightwide       > textarea { width: @textarea-wi-wide           ; } }
+  td, th { &.wi-wide            > textarea { width: @textarea-wi-wide           ; } }
+  td, th { &.wi-small-verywide  > textarea { width: @textarea-wi-small-verywide ; } }
+
+  th,
+  td {
+    &.wi-lightwide { textarea, input[type="text"], div.ck-editor, input#order_vendor_id_name { width: @textarea-wi-lightwide; } }
+    &.wi-wide      { textarea, input[type="text"], div.ck-editor, input#order_vendor_id_name { width: @textarea-wi-wide;      } }
+
+  }
+
+
+  span {
+
+    // Standard-Dimensions
+    &.wi-smallest                { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal      ; } } // no smallest, just normal
+    &.wi-verysmall               { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal      ; } } // no verysmall, just normal
+    &.wi-small                   { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal      ; } } // no small, just normal
+    &.wi-mediumsmall             { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal      ; } } // no mediumsmall, just normal
+    &.wi-normal                  { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal      ; } }
+    &.wi-lightwide               { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide   ; } }
+    &.wi-wide                    { padding: 0 ; textarea, & > div.ck-editor { width:     @textarea-wi-wide  !important        ; } }
+    &.wi-wide.strict             {                              max-width: @textarea-wi-wide !important  ; }
+    &.wi-wider                   { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wider       ; } }
+    &.wi-verywide                { padding: 0 ; textarea, div.ck-editor { min-width: @textarea-wi-verywide    ; } }
+    &.wi-full                    { padding: 0 ; textarea, div.ck-editor { width:     100%                     ; } }
+
+
+    &.wi-small-small             { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-small       ; } }
+    &.wi-small-mediumsmall       { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-mediumsmall ; margin: 0 30px 0 0 ; } }
+    &.wi-small-normal            { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-normal      ; } }
+    &.wi-small-lightwide         { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-lightwide   ; } }
+    &.wi-small-wide              { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-wide        ; } }
+    &.wi-small-wider             { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-wider       ; } }
+    &.wi-small-verywide          { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-small-verywide    ; } }
+
+    &.wi-mediumsmall-small       { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-small       ; } }
+    &.wi-mediumsmall-mediumsmall { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-mediumsmall ; } }
+    &.wi-mediumsmall-normal      { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-normal      ; } }
+    &.wi-mediumsmall-lightwide   { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-lightwide   ; } }
+    &.wi-mediumsmall-wide        { padding: 0 ; textarea, &.wi-mediumsmall-wide > div.ck-editor { width: @textarea-wi-mediumsmall-wide !important ; } }
+    &.wi-mediumsmall-wider       { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-wider       ; } }
+    &.wi-mediumsmall-verywide    { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-mediumsmall-verywide    ; } }
+
+    &.wi-normal-small            { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-small       ; } }
+    &.wi-normal-mediumsmall      { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-mediumsmall ; } }
+    &.wi-normal-normal           { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-normal      ; } }
+    &.wi-normal-lightwide        { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-lightwide   ; } }
+    &.wi-normal-wide             { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-wide        ; } }
+    &.wi-normal-wider            { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-wider       ; } }
+    &.wi-normal-verywide         { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-normal-verywide    ; } }
+
+    &.wi-lightwide-small         { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-small       ; } }
+    &.wi-lightwide-mediumsmall   { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-mediumsmall ; } }
+    &.wi-lightwide-normal        { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-normal      ; } }
+    &.wi-lightwide-lightwide     { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-lightwide   ; } }
+    &.wi-lightwide-wide          { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-wide        ; } }
+    &.wi-lightwide-wider         { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-wider       ; } }
+    &.wi-lightwide-verywide      { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-lightwide-verywide    ; } }
+
+    &.wi-wide-small              { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-small       ; } }
+    &.wi-wide-mediumsmall        { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-mediumsmall ; } }
+    &.wi-wide-normal             { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-normal      ; } }
+    &.wi-wide-lightwide          { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-wide        ; } }
+    &.wi-wide-wide               { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-wide        ; } }
+    &.wi-wide-wider              { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-wider       ; } }
+    &.wi-wide-verywide           { padding: 0 ; textarea, div.ck-editor { width:     @textarea-wi-wide-verywide    ; } }
+
+  } // /DIMENSION textarea
+
+
+// -------------------
+// Input, Select & Textarea-Elements within TD & TH elements
+//
+// PENDENT: Dieses Konstrukt sollte nicht noetig sein und behoben werden, vor allem die Funktion L.button_tag()
+th,
+td {
+  &.wi-smallest      { input[type="text"], select           { width:     @input-wi-smallest         ; } }
+  &.wi-verysmall     { input[type="text"], select           { width:     @input-wi-verysmall        ; } }
+  &.wi-small         { input[type="text"], select           { width:     @input-wi-small            ; } }
+  &.wi-mediumsmall   { input[type="text"], select           { width:     @input-wi-mediumsmall      ; } }
+  &.wi-normal        { input[type="text"], select, textarea, div.ck-editor { width:     @input-wi-normal           ; } }
+  &.wi-lightwide     { input[type="text"], select, textarea, div.ck-editor { width:     @input-wi-lightwide        ; } }
+  &.wi-wide          { input[type="text"], select, textarea, div.ck-editor { width:     @input-wi-wide !important  ; } }
+  &.wi-wide.strict   { input[type="text"], select, textarea, div.ck-editor { max-width: @input-wi-wide !important  ; } }
+  &.wi-wider         { input[type="text"], select, textarea, div.ck-editor { width:     @input-wi-wider !important ; } }
+  &.wi-verywide      { input[type="text"], select, textarea, div.ck-editor { min-width: @input-wi-verywide         ; } }
+  &.wi-full          { input[type="text"], select, textarea, div.ck-editor { width:     100% ; } }
+  // Combinations
+  &.wi-mediumsmall-wide       { input[type="text"], select, textarea, div.ck-editor { width: @textarea-wi-mediumsmall-wide  ; } }
+  &.wi-small-mediumsmall      { input[type="text"], select, textarea, div.ck-editor { width: @textarea-wi-small-mediumsmall ; } }
+  &.wi-mediumsmall-lightwide  { input[type="text"], select, textarea, div.ck-editor { width: @textarea-wi-mediumsmall-lightwide ; } }
+
+  &.below       { input[type="text"], select, textarea, div.ck-editor { clear: both; margin-top: 0.4em  ; } }
+
+}
+// TEMPORAER: PENDENT: sollte behoben sein, weshalb dieses Konstrukt nicht mehr noetig sein sollte
+td.wi-lightwide > span.customer_vendor_picker > input { width:     @input-wi-lightwide        ; }
+td.wi-wide      > span.customer_vendor_picker > input { width:     @input-wi-wide             ; }
+td.wi-wider     > span.customer_vendor_picker > input { width:     @input-wi-wider            ; }
+
+
+
+  // --------------------------------------
+  // DATA-FORMAT
+  // --------------------------------------
+
+  input,
+  select {
+    &.number  { text-align: right ; }
+    &.numeric { text-align: right ; }
+    &.right   { text-align: right ; }
+  }
+
+
+  input[type=text].emphasized {
+    word-wrap:     break-word;
+    word-break:   break-all;
+    height:       auto;
+    overflow:     hidden ;
+  }
+
+
+
+
+  // --------------------------------------
+  // SPECIALS
+  // --------------------------------------
+
+  // -------------------
+  // Date picker Symbol (Jquery-UI)
+  // normally placed after a input field within a table cell
+
+  td img.ui-datepicker-trigger{
+    vertical-align: middle ;
+    padding: 0 0.2em ;
+  }
+
+
+  td {
+    div.rowspan-table{
+      display:           table-row ;
+      float:             left;
+      margin:             0.8em 2.8em 0.8em 0 ;
+      div.label-n-value{
+        display:         table-cell ;
+        vertical-align: middle;
+        height:         1.6em !important ; // the cell have not the same height if they are made with DIVs
+
+        float: left;
+        padding:         0 2.0em 0 0 ;
+        //overflow: hidden ;
+        b{
+          font-weight:   normal;
+          padding:       0 0 0 0 ;
+        }
+      }
+    }
+  }
+
+
+  // --------------------------------------
+  // MIXED FORM-TABLES
+  // --------------------------------------
+  // Tables with either Form Elements or Text in Cells
+  // PENDENT: .data mit anderen Formular-Elementen zusammenfassen
+  table td > span.data {
+    display:      block;
+    overflow:     hidden ;
+    min-height:   (@font-size-smaller * 1.7); // 1.6em
+    font-size:     @font-size-smaller ;
+    color:         @t-cell-databox-text-color ;
+    border:       1px @t-cell-databox-border-color solid;
+    margin:       0 ;
+    line-height:  120%;
+    padding:      0.2em 0.28em 0.2em @padding-databoxes-left !important;
+
+    &::before{
+      //content: "" ;
+    }
+    &.below{
+      margin-top: 0.2em;
+    }
+    &.numeric,
+    &.right{
+      text-align: right;
+    }
+
+    // Dimensions
+    &.wi-smallest    { width: @input-wi-smallest    ; }
+    &.wi-verysmall   { width: @input-wi-verysmall   ; }
+    &.wi-small       { width: @input-wi-small       ; }
+    &.wi-mediumsmall { width: @input-wi-mediumsmall ; }
+    &.wi-normal      { width: @input-wi-normal      ; }
+    &.wi-lightwide   { width: @input-wi-lightwide   ; }
+    &.wi-wide        { width: @input-wi-wide        ; }
+
+    // Data Types
+    &.numeric { text-align: right ; }
+    &.right   { text-align: right ; }
+
+  }
+
+
+
+  // -------------------
+  // Boxes
+  //
+
+  div.boxes{
+    margin: 0 0 0.9em 0 ;
+    overflow: hidden ;
+    max-width: 800px ;
+
+    // Additional
+    // There are also some Checkboxes for "Select All"
+    h3 {
+      padding: 0.2em 0 0.2em 0.0em;
+
+      label{
+        //float: right;
+        float: left;
+        width: 88% ;
+        font-size: @h3-size ;
+        padding: 0 0 0.6em 0.2em ;
+        line-height: 1.2em ;
+      }
+    }
+
+
+    &>div{
+      clear:       both;
+      margin:     0 0 0.6em 0 ;
+      padding:     0;
+      display:     block ;
+      overflow:   hidden ;
+      label{
+        float:     left;
+        width:     88% ;
+      }
+      input[type="checkbox"],
+      input[type="radio"]{
+        float:           left;
+        margin-right:   0.6em ;
+      }
+    }
+  }
+
+  // -------------------
+  // Boxes horizontal
+  //
+
+  td.horizontal {
+    input[type="radio"],
+    input[type="checkbox"]{
+      float:     left !important;
+      clear:     none !important;
+      width:     auto;
+    }
+    label{
+      width:           auto !important;
+      margin-right:   2.0em ;
+      float:           left !important;
+      clear:           none !important;
+    }
+  }
+
+
+
+
+
+
+
+// --------------------------------------
+// CHECKBOXES & LABELS WITHIN DIVS
+// --------------------------------------
+
+table.tbl-horizontal,
+table.tbl-list,
+table.tbl-plain {
+  th {
+    label{
+      display: inline-block;
+
+//      &:link,
+//      &:visited {
+//        color: @gray-standard ;
+//        text-decoration: none ;
+//      }
+//      &:hover{
+//        color: #777 ;
+//        text-decoration: underline;
+//      }
+    }
+  }
+  td{
+    input[type="radio"],
+    input[type="checkbox"]{
+      float: left;
+      clear: left;
+      &~label{
+        float: left;
+        width: auto;
+        margin-left: 0.2em ;
+        line-height: 1.4em ;
+        //clear: left;
+      }
+    }
+    // Date-Field generated by the function L.Date_Tag
+    span.wi-date {
+      padding: 0 ;
+      input[type="text"],
+      input[type="date"]{
+        width: @input-wi-small ;
+      }
+    }
+  }
+  td.clear{
+    input[type="radio"],
+    input[type="checkbox"]{
+      float: none;
+      &~label{
+        float: none;
+      }
+    }
+  }
+}
+
+
+// --------------------------------------
+// FAKE-ELEMENTS
+// --------------------------------------
+// Yes, there exists some foolery
+// Substitution for Elements as readonly containers
+div.fake-textarea {
+  width: @textarea-wi-lightwide;
+  height: 150px;
+  background-color: white;
+  overflow: auto;
+  border: 1px #999999 solid;
+
+  &.fake-wi-wide { width: @textarea-wi-wide ; }
+}
+
+
+
+
+// especially in the admin section
+
+div.admin{
+  form{
+    font-size: @font-size-small ;
+    input[type="checkbox"] {
+      margin: 0.2em 0.6em 0.3em 0 ;
+      float: left;
+    }
+    h3{
+      margin: 1.2em 0 0.6em 0 ;
+      display: block;
+    }
+  }
+}
+
+// --------------------------------------
+// jQuery-Plugins for forms
+// --------------------------------------
+
+// MultiSelect2Side
+.ms2side {
+  display: block;
+  overflow: hidden;
+
+  p {
+    margin: 0 0 0.4em 0 ;
+  }
+
+  .ms2side__div {
+
+    .ms2side__header {
+      width: 12.0em ;
+      height: 2.2em ;
+      display: table-cell;
+      vertical-align: bottom;
+    }
+
+    .ms2side__options > p.ms2side__hide,
+    .ms2side__updown  > p.ms2side__hide {
+      cursor: default;
+      color: #9e9e9e;
+      border: 1px solid grey;
+      background-color: #D4D4D4 !important;
+    }
+
+  }
+
+}
+
+// --------------------------------------
+// PLACEHOLDER-TEXT
+// --------------------------------------
+
+.frame-header-quicksearch input::placeholder {
+  color: @gray-darker ; // improved contrast
+}
+
+#content input::placeholder {
+  color: @gray-darker ;  // improved contrast
+}
+
+
+
+// --------------------------------------
+// JQUERY-CONTAINERS FOR FIELDS
+// --------------------------------------
+// PENDENT: gehoert in Tables
+span.customer_vendor_picker {
+  padding: 0 ;
+}
+input#vendor_id_name.ui-autocomplete-input,
+input#customer_id_name.ui-autocomplete-input {
+  margin: 0 ;
+  &.wi-wide{
+    width: @input-wi-wide  ;
+  }
+}
+
+// --------------------------------------
+// DIVERS JQUERY-/AJAX-STUFF
+// --------------------------------------
+
+table td span.project_picker {
+  padding: 0 !important;
+}
diff --git a/css/design40/less/icons16.less b/css/design40/less/icons16.less
new file mode 100755
index 000000000..8f2be82d6
--- /dev/null
+++ b/css/design40/less/icons16.less
@@ -0,0 +1,102 @@
+/* ------------------------------------------------------------- */
+/* ICONS 16 (icons16.less)                                    */
+/* ------------------------------------------------------------- */
+
+
+.icon16 { background: url(../../image/maps/icons16.png) 16px 0px no-repeat; padding: 0; width: 16px; height: 16px; }
+.icon16.admin { background-position: -0px 0px; }
+.icon16.ap { background-position: -16px 0px; }
+.icon16.ap_aging { background-position: -32px 0px; }
+.icon16.ap_report { background-position: -48px 0px; }
+.icon16.ap_transaction_add { background-position: -64px 0px; }
+.icon16.appointment { background-position: -80px 0px; }
+.icon16.ar { background-position: -96px 0px; }
+.icon16.ar_aging { background-position: -112px 0px; }
+.icon16.ar_report { background-position: -128px 0px; }
+.icon16.ar_transaction_add { background-position: -144px 0px; }
+.icon16.assembly_add { background-position: -160px 0px; }
+.icon16.assembly_produce { background-position: -176px 0px; }
+.icon16.assembly_report { background-position: -192px 0px; }
+.icon16.balance_sheet { background-position: -208px 0px; }
+.icon16.cash { background-position: -224px 0px; }
+.icon16.cash_report { background-position: -240px 0px; }
+.icon16.chart_of_accounts { background-position: -256px 0px; }
+.icon16.contact { background-position: -272px 0px; }
+.icon16.credit_note_add { background-position: -288px 0px; }
+.icon16.crm { background-position: -304px 0px; }
+.icon16.customer { background-position: -320px 0px; }
+.icon16.customer_add { background-position: -336px 0px; }
+.icon16.customer_report { background-position: -352px 0px; }
+.icon16.datev { background-position: -368px 0px; }
+.icon16.delivery_order_add { background-position: -384px 0px; }
+.icon16.delivery_order_report { background-position: -400px 0px; }
+.icon16.document_template { background-position: -416px 0px; }
+.icon16.dunning_add { background-position: -432px 0px; }
+.icon16.dunnings_report { background-position: -448px 0px; }
+.icon16.email { background-position: -464px 0px; }
+.icon16.follow_up { background-position: -480px 0px; }
+.icon16.gl { background-position: -496px 0px; }
+.icon16.gl_report { background-position: -512px 0px; }
+.icon16.help { background-position: -528px 0px; }
+.icon16.income_statement { background-position: -544px 0px; }
+.icon16.invoices_report { background-position: -560px 0px; }
+.icon16.journal { background-position: -576px 0px; }
+.icon16.knowledge { background-position: -592px 0px; }
+.icon16.label { background-position: -608px 0px; }
+.icon16.license_add { background-position: -624px 0px; }
+.icon16.license_report { background-position: -640px 0px; }
+.icon16.logout { background-position: -656px 0px; }
+.icon16.master_data { background-position: -672px 0px; }
+.icon16.master_data_report { background-position: -688px 0px; }
+.icon16.mdi_text_editor { background-position: -704px 0px; }
+.icon16.memo { background-position: -720px 0px; }
+.icon16.message { background-position: -736px 0px; }
+.icon16.opportunity { background-position: -752px 0px; }
+.icon16.package_lists { background-position: -768px 0px; }
+.icon16.part_add { background-position: -784px 0px; }
+.icon16.part_report { background-position: -800px 0px; }
+.icon16.payment { background-position: -816px 0px; }
+.icon16.payment_report { background-position: -832px 0px; }
+.icon16.phone { background-position: -848px 0px; }
+.icon16.preferences { background-position: -864px 0px; }
+.icon16.prices_update { background-position: -880px 0px; }
+.icon16.printing { background-position: -896px 0px; }
+.icon16.program { background-position: -912px 0px; }
+.icon16.project_add { background-position: -928px 0px; }
+.icon16.project_report { background-position: -944px 0px; }
+.icon16.project_transaction_report { background-position: -960px 0px; }
+.icon16.purchase_order_add { background-position: -976px 0px; }
+.icon16.purchase_order_printing { background-position: -992px 0px; }
+.icon16.purchase_order_report { background-position: -1008px 0px; }
+.icon16.quotation_add { background-position: -1024px 0px; }
+.icon16.quotation_printing { background-position: -1040px 0px; }
+.icon16.receipt { background-position: -1056px 0px; }
+.icon16.receipt_printing { background-position: -1072px 0px; }
+.icon16.receipt_report { background-position: -1088px 0px; }
+.icon16.reconcilliation { background-position: -1104px 0px; }
+.icon16.report { background-position: -1120px 0px; }
+.icon16.report_quotations { background-position: -1136px 0px; }
+.icon16.report_sales_orders { background-position: -1152px 0px; }
+.icon16.rfq_add { background-position: -1168px 0px; }
+.icon16.rfq_printing { background-position: -1184px 0px; }
+.icon16.rfq_report { background-position: -1200px 0px; }
+.icon16.sales_invoice_add { background-position: -1216px 0px; }
+.icon16.sales_invoice_printing { background-position: -1232px 0px; }
+.icon16.sales_order_add { background-position: -1248px 0px; }
+.icon16.sales_order_printing { background-position: -1264px 0px; }
+.icon16.search { background-position: -1280px 0px; }
+.icon16.service { background-position: -1296px 0px; }
+.icon16.service_add { background-position: -1312px 0px; }
+.icon16.service_report { background-position: -1328px 0px; }
+.icon16.status { background-position: -1344px 0px; }
+.icon16.system { background-position: -1360px 0px; }
+.icon16.transaction_add { background-position: -1376px 0px; }
+.icon16.user { background-position: -1392px 0px; }
+.icon16.user_group { background-position: -1408px 0px; }
+.icon16.ustva { background-position: -1424px 0px; }
+.icon16.vendor { background-position: -1440px 0px; }
+.icon16.vendor_add { background-position: -1456px 0px; }
+.icon16.vendor_report { background-position: -1472px 0px; }
+.icon16.version { background-position: -1488px 0px; }
+.icon16.warehouse { background-position: -1504px 0px; }
+.icon16.window_new { background-position: -1520px 0px; }
diff --git a/css/design40/less/jquery-ui.less b/css/design40/less/jquery-ui.less
new file mode 100755
index 000000000..d69ef4253
--- /dev/null
+++ b/css/design40/less/jquery-ui.less
@@ -0,0 +1,1807 @@
+/* ------------------------------------------------------------- */
+/* JQUERY UI (jquery-ui.less)                                    */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// jQuery UI (Version 1.10.3 / 2014-01-14 / http://jqueryui.com)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Includes...
+// - jquery.ui.core.css
+// - jquery.ui.resizable.css
+// - jquery.ui.selectable.css
+// - jquery.ui.accordion.css
+// - jquery.ui.autocomplete.css
+// - jquery.ui.button.css
+// - jquery.ui.datepicker.css
+// - jquery.ui.dialog.css
+// - jquery.ui.menu.css
+// - jquery.ui.progressbar.css
+// - jquery.ui.slider.css
+// - jquery.ui.spinner.css
+// - jquery.ui.tabs.css
+// - jquery.ui.tooltip.css
+// - jquery.ui.theme.css
+//
+// To view and modify this theme, visit:
+// http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+//
+// Copyright 2014 jQuery Foundation and other contributors; Licensed MIT
+//
+//
+// CONTENTS:
+// - LAYOUT HELPERS
+// - INTERACTION CUES (Addition?)
+// - ICONS
+// - MISC VISUALS
+// - RESIZABLE
+// - ACCORDION
+// - AUTOCOMPLETE
+// - UI-BUTTON
+// - DATEPICKER
+// - UI-DIALOG
+// - UI-MENU
+// - PROGRESSBAR
+// - SLIDER
+// - UI-SPINNER
+// - UI-TABS
+// - UI-TOOLTIP
+// - COMPONENT CONTAINERS (UI-WIDGET)
+// - INTERACTION STATES (UI-STATE)
+// - INTERACTION CUES (UI-STATE)
+// - ICONS
+//   - STATES AND IMAGES
+//   - POSITIONING
+// - MISC VISUALS
+//   - CORNER RADIUS (UI-CORNER)
+//   - OVERLAYS (UI-Widget-Overlay/-Shadow)
+// ----------------------------------------------------------------------------
+
+
+// --------------------------------------
+// LAYOUT HELPERS
+// --------------------------------------
+
+.ui-helper-hidden {
+  display: none;
+}
+.ui-helper-hidden-accessible {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+.ui-helper-reset {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  line-height: 1.3;
+  text-decoration: none;
+  font-size: @font-size-base;
+  list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+  content: "";
+  display: table;
+  border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+  clear: both;
+}
+.ui-helper-clearfix {
+  min-height: 0; //  support: IE7
+}
+.ui-helper-zfix {
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  opacity: 0;
+  //filter:Alpha(Opacity=0); // PENDENT: abklaeren
+}
+
+.ui-front {
+  z-index: 100;
+}
+
+
+
+// --------------------------------------
+// INTERACTION CUES
+// --------------------------------------
+
+.ui-state-disabled {
+  cursor: default !important;
+}
+
+
+
+// --------------------------------------
+// ICONS
+// --------------------------------------
+// states and images
+
+.ui-icon {
+  display: block;
+  text-indent: -99999px;
+  overflow: hidden;
+  background-repeat: no-repeat;
+}
+
+
+
+// ----------------------------------
+// MISC VISUALS
+// ----------------------------------
+//  Overlays
+.ui-widget-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+
+
+// --------------------------------------
+// RESIZABLE
+// --------------------------------------
+
+.ui-resizable {
+  position: relative;
+}
+.ui-resizable-handle {
+  position: absolute;
+  font-size: 0.1px;
+  display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+  display: none;
+}
+.ui-resizable-n {
+  cursor: n-resize;
+  height: 7px;
+  width: 100%;
+  top: -5px;
+  left: 0;
+}
+.ui-resizable-s {
+  cursor: s-resize;
+  height: 7px;
+  width: 100%;
+  bottom: -5px;
+  left: 0;
+}
+.ui-resizable-e {
+  cursor: e-resize;
+  width: 7px;
+  right: -5px;
+  top: 0;
+  height: 100%;
+}
+.ui-resizable-w {
+  cursor: w-resize;
+  width: 7px;
+  left: -5px;
+  top: 0;
+  height: 100%;
+}
+.ui-resizable-se {
+  cursor: se-resize;
+  width: 12px;
+  height: 12px;
+  right: 1px;
+  bottom: 1px;
+}
+.ui-resizable-sw {
+  cursor: sw-resize;
+  width: 9px;
+  height: 9px;
+  left: -5px;
+  bottom: -5px;
+}
+.ui-resizable-nw {
+  cursor: nw-resize;
+  width: 9px;
+  height: 9px;
+  left: -5px;
+  top: -5px;
+}
+.ui-resizable-ne {
+  cursor: ne-resize;
+  width: 9px;
+  height: 9px;
+  right: -5px;
+  top: -5px;
+}
+.ui-selectable-helper {
+  position: absolute;
+  z-index: 100;
+  border: 1px dotted black;
+}
+
+
+
+// --------------------------------------
+// ACCORDION
+// --------------------------------------
+
+.ui-accordion {
+
+  .ui-accordion-header {
+    display: block;
+    cursor: pointer;
+    position: relative;
+    margin-top: 2px;
+    padding: .5em .5em .5em .7em;
+    min-height: 0; //  support: IE7
+
+    .ui-accordion-header-icon {
+      position: absolute;
+      left: .5em;
+      top: 50%;
+      margin-top: -8px;
+    }
+  } // /.ui-accordion-header
+
+  .ui-accordion-content {
+    padding: 1em 2.2em;
+    border-top: 0;
+    overflow: auto;
+  }
+
+  .ui-accordion-icons {
+    padding-left: 2.2em;
+    .ui-accordion-icons { padding-left: 2.2em; }
+  }
+  .ui-accordion-noicons { padding-left: .7em; }
+
+} // /.ui-accordion
+
+
+
+
+// --------------------------------------
+// AUTOCOMPLETE
+// --------------------------------------
+
+.ui-autocomplete {
+  position: absolute;
+  top: 0;
+  left: 0;
+  cursor: default;
+  z-index: 9000 ;
+
+  .ui-menu-item {
+    a {
+      &:hover{
+         background-color: @base-dark;
+         color: #fff ;
+      }
+    }
+  }
+  li{
+    a{
+      display: block ;
+      font-size: 80% ;
+      padding-top: 0.4em !important;
+      padding-bottom: 0.4em !important;
+      &:hover{
+        background-color: #C9C9C9;
+        border: none ;
+        color: #000 ;
+      }
+    }
+  }
+}
+
+
+
+
+
+
+// --------------------------------------
+// UI-BUTTON
+// --------------------------------------
+
+.ui-button {
+  display: inline-block;
+  position: relative;
+  padding: 0;
+  line-height: normal;
+  margin-right: .1em;
+  cursor: pointer;
+  vertical-align: middle;
+  text-align: center;
+  overflow: visible; //  removes extra width in IE
+
+  &:link,
+  &:visited,
+  &:hover,
+  &:active {
+    text-decoration: none;
+  }
+}
+
+//  to make room for the icon, a width needs to be set here
+.ui-button-icon-only {
+  width: 2.2em;
+}
+//  button elements seem to need a little more width
+button.ui-button-icon-only {
+  width: 2.4em;
+}
+.ui-button-icons-only {
+  width: 3.4em;
+}
+button.ui-button-icons-only {
+  width: 3.7em;
+}
+//  button text element
+.ui-button .ui-button-text {
+  display: block;
+  line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+  padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+  padding: .4em;
+  text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+  padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+  padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+  padding-left: 2.1em;
+  padding-right: 2.1em;
+}
+//  no icon support for input elements, provide padding by default
+input.ui-button {
+  padding: .4em 1em;
+}
+
+//  button icon element(s)
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+  position: absolute;
+  top: 50%;
+  margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+  left: 50%;
+  margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+  left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+  right: .5em;
+}
+
+//  button sets
+.ui-buttonset {
+  margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+  margin-left: 0;
+  margin-right: -.3em;
+}
+
+//  workarounds
+//  reset extra padding in Firefox, see h5bp.com/l
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+
+
+
+// --------------------------------------
+// DATEPICKER
+// --------------------------------------
+
+.ui-datepicker {
+  width:             17em;
+  padding:           .2em .2em 0;
+  display:           none;
+  &.ui-widget-content{
+    background-color: @jquery_datepicker-bg-color;
+    border: @controlpanel-border ;
+  }
+
+
+  // -----------------------
+  // Header with Select-Elements
+  // -----------------------
+  .ui-datepicker-header {
+    position:       relative;
+    padding:         0.2em 0;
+
+    &.ui-datepicker-prev,
+    &.ui-datepicker-next {
+      position:     absolute;
+      top:           2px;
+      width:         1.8em;
+      height:       1.8em;
+
+      &-hover { top: 1px; }
+
+      span {
+        display:       block;
+        position:     absolute;
+        left:         50%;
+        margin-left: -8px;
+        top:           50%;
+        margin-top:  -8px;
+      }
+    }
+    .ui-datepicker-prev {
+      float:           left;
+      left:           2px;
+      &-hover { left: 1px; background-position: 25% 25% ; }
+    }
+    .ui-datepicker-next {
+      float:           right ;
+      right:           2px;
+      &-hover { right: 1px; background-position: 25% 25% ; }
+    }
+
+    .ui-datepicker-title {
+      margin:       0 2.3em;
+      line-height:   1.8em;
+      text-align:   center;
+
+      select {
+        margin:     1px 0;
+        &.ui-datepicker-month{ margin-right: 0.2em ; }
+      }
+    }
+
+    select.ui-datepicker-month-year {
+      width: 100%;
+    }
+    select.ui-datepicker-month,
+    select.ui-datepicker-year {
+      width: 49%;
+    }
+
+    &.ui-corner-all{
+      cursor: pointer ;
+      &.ui-state-hover {
+        border: none !important ;
+        curser: pointer ;
+      }
+    }
+
+    &.ui-widget-header {
+      .ui-icon {
+        background-image: url(ui-lightne../../images/ui-icons_222222_256x240.png);
+      }
+      .ui-state-hover{
+        .ui-icon{
+          background-image: url(ui-lightne../../images/ui-icons_ef8c08_256x240.png);
+          //background: #ffffff;
+        }
+      }
+    }
+  } // /.ui-datepicker-header
+
+
+  // -----------------------
+  // Table with Calendar
+  // -----------------------
+  table {
+    width:             100%;
+    font-size:         @font-size-smaller;
+    border-collapse:   collapse;
+    margin:           0 0 0.4em;
+
+    th {
+      padding:         0.7em 0.3em;
+      text-align:     center;
+      font-weight:     bold;
+      border:         0;
+    }
+    td {
+      border:         0;
+      padding:         1px;
+
+      span,
+      a {
+        display:           block;
+        padding:           0.2em;
+        text-align:       right;
+        text-decoration:   none;
+      }
+      a.ui-state-hover{
+        color: #ffffff ;
+        background-color: @base-darker;
+      }
+    }
+
+    &.ui-datepicker-calendar {
+      // current date
+      .ui-state-highlight{
+        color: #ffffff ;
+        background-color: @base-darker;
+        border: 1px @gray-standard solid
+      }
+      // Days
+      td a {
+        &.ui-state-default { color: @base-dark; }
+        &.ui-state-hover {
+          color: #ffffff ;
+          background-color: #000000;
+          border: #000000 ;
+        }
+        &.ui-state-active {
+          border: 1px solid @base-dark;
+          background-color: @base-dark;
+          color: @base-verylight;
+        }
+      } // /td
+    }    // /.ui-datepicker-calendar
+  }  // /table
+
+  .ui-datepicker-buttonpane {
+    background-image:   none;
+    margin:             0.7em 0 0 0;
+    padding:             0 0.2em;
+    border-left:         0;
+    border-right:       0;
+    border-bottom:       0;
+
+    button {
+      float:       right;
+      margin:     .5em .2em .4em;
+      cursor:     pointer;
+      padding:     .2em .6em .3em .6em;
+      width:       auto;
+      overflow:   visible;
+
+      &.ui-datepicker-current {
+        float:     left;
+      }
+      &.ui-datepicker-current,
+      &.ui-datepicker-close {
+        .mx-button-neutral ;
+        font-weight: normal ;
+      }
+
+
+
+    }
+  }  // /.ui-datepicker-buttonpane
+
+
+  // -----------------------
+  // Multiple Calendars
+  // -----------------------
+  //  with multiple calendars
+  &.ui-datepicker-multi {
+    width: auto;
+    .ui-datepicker-group {
+      float: left;
+      table {
+        width:   95%;
+        margin: 0 auto .4em;
+      }
+    }
+    .ui-datepicker-group-last,
+    .ui-datepicker-group-middle {
+       .ui-datepicker-header{ border-left-width: 0; }
+    }
+    .ui-datepicker-buttonpane { clear: left; }
+  }  // .&.ui-datepicker-multi
+
+} // /.ui-datepicker
+
+//  Date picker with multiple calendars
+.ui-datepicker-multi-2 .ui-datepicker-group { width: 50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width: 33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width: 25%; }
+//
+.ui-datepicker-row-break {
+  clear: both;
+  width: 100%;
+  font-size: 0;
+}
+
+// -----------------------
+// Calendar symbol
+// -----------------------
+img.ui-datepicker-trigger{
+  vertical-align: middle;
+  margin-left: 0.2em ;
+}
+
+
+
+//  RTL support properties removed
+
+
+
+
+
+
+// --------------------------------------
+// UI-DIALOG
+// --------------------------------------
+
+.ui-dialog {
+  z-index:         8001 ;
+  position:       absolute;
+  top:             0;
+  left:           0;
+  outline:         0;
+  border:         @controlpanel-border ; // Custom
+  border-radius:   @controlpanel-radius;
+  //color:           #333333;
+
+  .ui-dialog-titlebar {
+    padding:          0.4em 1.0em;
+    border:           none;
+    background-color: @base-h1-bg !important;
+    color:            @base-h1-color !important;
+    font-weight:      normal;
+    position:         relative;
+    text-align:       left;
+    font-size:        @h3-size;
+
+    .ui-dialog-title {
+      float:          left;
+      white-space:    nowrap;
+      overflow:       hidden;
+      text-overflow:  ellipsis;
+      display:        block;
+    }
+
+    .ui-dialog-titlebar-close {
+      position:     absolute;
+      right:        0.3em;
+      //top:        50%;
+      top:           0;
+      width:        21px;
+      //margin:     10px 0 0 0;
+      margin:       5px 0 0 0;
+      padding:      1px;
+      height:       20px;
+//      background: #bbb !important;
+    }
+  } // /.ui-dialog-titlebar
+
+  .ui-dialog-content {
+    position:         relative;
+    border:           0;
+    padding:           0.5em 1em;
+    background-color: @jquery_ui_dialog-bg-color !important;
+    background:       @jquery_ui_dialog-bg-style !important;
+    overflow:         auto;
+  }
+  .wrapper {
+    margin: 0 ;
+  }
+
+  .ui-dialog-buttonpane {
+    text-align:       left;
+    border-width:     1px 0 0 0;
+    background-image: none;
+    margin-top:       0.5em;
+    padding:           0.3em 1em 0.5em 0.4em;
+
+    .ui-dialog-buttonset {
+      float:           right;
+    }
+
+    button {
+      margin: .5em .4em .5em 0;
+      cursor: pointer;
+    }
+  }
+  // /.ui-dialog-buttonpane
+
+  .ui-resizable-se {
+    width: 12px;
+    height: 12px;
+    right: -5px;
+    bottom: -5px;
+    background-position: 16px 16px;
+  }
+
+//  .ui-widget-header {
+//    button.ui-dialog-titlebar-close {
+//      right: 0.3em;
+//      top: 0;
+//      width: 21px;
+//      margin: 5px 0 0 0;
+//    }
+//  }
+
+  &.ui-draggable .ui-dialog-titlebar {
+    cursor: move;
+  }
+
+} // /.ui-dialog
+
+
+
+
+// --------------------------------------
+// UI-MENU
+// --------------------------------------
+
+.ui-menu {
+  list-style: none;
+  padding: 2px;
+  margin: 0;
+  display: block;
+  outline: none;
+  display: inline-table ;
+  border-collapse: collapse ;
+
+  &.ui-widget-content {
+    border: 1px @_menu_border_color solid ;
+  }
+
+  .ui-menu-item {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    background-color: @base-lighter;
+    color: @base-darker;  // improved contrast
+    border-bottom: 1px @_menu_border_color solid ;
+
+    a {
+      text-decoration: none;
+      display: block;
+      padding: 2px .4em;
+      line-height: 1.5;
+      min-height: 0; //  support: IE7
+      font-weight: normal;
+      border: 0 ;
+      background: none ;
+      border: 0 ;
+
+      &.ui-state-focus,
+      &.ui-state-active {
+        font-weight: normal;
+        margin: -1px;
+      }
+    }
+  } // /.ui-menu-item
+
+  .ui-menu-divider {
+    margin: 5px -2px 5px -2px;
+    height: 0;
+    font-size: 0;
+    line-height: 0;
+    border-width: 1px 0 0 0;
+  }
+
+  .ui-state-disabled {
+    font-weight: normal;
+    margin: .4em 0 .2em;
+    line-height: 1.5;
+    a { cursor: default; }
+  }
+
+  // ui-menu within a ui-menu
+  .ui-menu {
+    margin-top: -3px;
+    position: absolute;
+  }
+
+  //  icon support
+  &.ui-menu-icons {
+    position: relative;
+
+    .ui-menu-item a {
+      position: relative;
+      padding-left: 2em;
+    }
+  }
+
+  //  left-aligned
+  .ui-icon {
+    position: absolute;
+    top: .2em;
+    left: .2em;
+  }
+  //  right-aligned
+  .ui-menu-icon {
+    position: static;
+    float: right;
+  }
+
+} // /.ui-menu
+
+
+
+// --------------------------------------
+// CONTEXT MENU
+// --------------------------------------
+
+// -----------------------
+// Context Menu List
+// -----------------------
+ul.context-menu-list{
+  margin:             0;
+  padding:            0;
+  min-width:          120px;
+  max-width:          250px;
+  display:            inline-block;
+  position:           absolute;
+  list-style-type:    none;
+  border:             1px solid #DDD;
+  background:         #EEE;
+
+  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+     -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+      -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+       -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+          box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
+
+  //font-family: Verdana, Arial, Helvetica, sans-serif;
+  //font-size: 11px;
+
+  &.context-menu-root {}
+
+
+	// -----------------------
+	// Context Menu Item
+	// -----------------------
+  li.context-menu-item {
+    padding:              2px 2px 2px 24px;
+    background-color:     #EEE;
+    position:             relative;
+    -webkit-user-select:  none;
+       -moz-user-select:  -moz-none;
+        -ms-user-select:  none;
+            user-select:  none;
+
+    // Header within the menu
+    &.context-menu-heading {
+      text-decoration: underline;
+      font-weight: bold;
+    }
+
+    // States
+    &.hover {
+      cursor: pointer;
+      background-color: #39F;
+
+      & > .context-menu-list {
+        display: block ;
+      }
+    }
+    &.disabled { color: #666; }
+    &.hover,
+    &.disabled.hover {
+        cursor: default ;
+        background-color: #EEE ;
+    }
+
+
+
+    // -----------------------
+    // Icons in Menu Item
+    // -----------------------
+    .icon {
+      // Original code
+      min-height:           18px;
+      background-repeat:    no-repeat;
+      background-position:  4px 2px;
+
+      // Original Code (but now disabled)
+      // &.icon-edit   { background-image: url(../../image/jquery.contextMenu/page_white_edit.png)  ; }
+      // &.icon-cut    { background-image: url(../../image/jquery.contextMenu/cut.png)              ; }
+      // &.icon-copy   { background-image: url(../../image/jquery.contextMenu/page_white_copy.png)  ; }
+      // &.icon-paste  { background-image: url(../../image/jquery.contextMenu/page_white_paste.png) ; }
+      // &.icon-delete { background-image: url(../../image/jquery.contextMenu/page_white_delete.png); }
+      // &.icon-add    { background-image: url(../../image/jquery.contextMenu/page_white_add.png)   ; }
+      // &.icon-quit   { background-image: url(../../image/jquery.contextMenu/door.png)             ; }
+
+      // All Icons are listed here
+      &.icon-add      {  }
+      &.icon-edit     {  }
+      &.icon-delete   {  }
+      &.icon-flag     {  }
+      &.icon-copy     {  }
+      &.icon-paste    {  }
+      &.icon-pdf      {  }
+      &.icon-new      {  }
+      &.icon-renumber {  }
+    }
+
+    span {}
+
+    &.context-menu-separator {
+      padding-bottom:0;
+      border-bottom: 1px solid #DDD;
+
+      &.not-selectable {}
+    }
+
+    // Item has submenu
+    &.context-menu-submenu:after {
+      content: ">";
+      color: #666;
+      position: absolute;
+      top: 0;
+      right: 3px;
+      z-index: 1;
+    }
+
+    // Submenu-List
+    & > .context-menu-list {
+      display: none;
+      /* re-positioned by js */
+      right: -5px;
+      top: 5px;
+    }
+
+    .context-menu-accesskey {
+        text-decoration: underline;
+    }
+
+
+    & > label > input,
+    & > label > textarea {
+      -webkit-user-select: text;
+         -moz-user-select: text;
+          -ms-user-select: text;
+              user-select: text;
+    }
+
+
+  } // /li.context-menu-item
+
+
+
+	// -----------------------
+	// Context Menu Input
+	// -----------------------
+
+  .context-menu-input {
+    /* vertically align inside labels */
+    & > label > * { vertical-align: top; }
+
+    /* position checkboxes and radios as icons */
+    & > label > input[type="checkbox"],
+    & > label > input[type="radio"] {  margin-left: -17px; }
+    & > label,
+    & > label > input[type="text"],
+    & > label > textarea,
+    & > label > select {
+      display: block;
+      width: 100%;
+      -webkit-box-sizing: border-box;
+         -moz-box-sizing: border-box;
+          -ms-box-sizing: border-box;
+           -o-box-sizing: border-box;
+              box-sizing: border-box;
+    }
+
+    & > label > span {  margin-left: 5px ; }
+    & > label > textarea { height: 100px; }
+
+  } // /.context-menu-input
+
+
+} // /ul.context-menu-list
+
+
+
+
+
+// --------------------------------------
+// PROGRESSBAR
+// --------------------------------------
+
+.ui-progressbar {
+  height: 2em;
+  text-align: left;
+  overflow: hidden;
+
+  .ui-progressbar-value {
+    margin: -1px;
+    height: 100%;
+  }
+  .ui-progressbar-overlay {
+    background: url("ui-lightne../../images/animated-overlay.gif");
+    height: 100%;
+    filter: alpha(opacity=25);
+    opacity: 0.25;
+  }
+  .ui-progressbar-indeterminate .ui-progressbar-value {
+    background-image: none;
+  }
+} // /.ui-progressbar
+
+
+
+
+
+// --------------------------------------
+// SLIDER
+// --------------------------------------
+
+.ui-slider {
+  position: relative;
+  text-align: left;
+
+  .ui-slider-handle {
+    position: absolute;
+    z-index: 2;
+    width: 1.2em;
+    height: 1.2em;
+    cursor: default;
+  }
+
+  .ui-slider-range {
+    position: absolute;
+    z-index: 1;
+    //font-size: @font-size-smaller;
+    display: block;
+    border: 0;
+    background-position: 0 0;
+  }
+
+  //  For IE8 - See #6727
+  &.ui-state-disabled .ui-slider-handle,
+  &.ui-state-disabled .ui-slider-range {
+    filter: inherit;
+  }
+} // /.ui-slider
+
+.ui-slider-horizontal {
+  height: .8em;
+
+  .ui-slider-handle {
+    top: -.3em;
+    margin-left: -.6em;
+  }
+  .ui-slider-range {
+    top: 0;
+    height: 100%;
+  }
+  .ui-slider-range-min { left: 0;  }
+  .ui-slider-range-max { right: 0; }
+}// /.ui-slider-horizontal
+
+.ui-slider-vertical {
+  width: .8em;
+  height: 100px;
+
+  .ui-slider-handle {
+    left: -.3em;
+    margin-left: 0;
+    margin-bottom: -.6em;
+  }
+  .ui-slider-range {
+    left: 0;
+    width: 100%;
+  }
+  .ui-slider-range-min {
+    bottom: 0;
+  }
+  .ui-slider-range-max {
+    top: 0;
+  }
+
+
+} // /.ui-slider-vertical
+
+
+
+
+// --------------------------------------
+// UI-SPINNER
+// --------------------------------------
+
+.ui-spinner {
+  position: relative;
+  display: inline-block;
+  overflow: hidden;
+  padding: 0;
+  vertical-align: middle;
+
+  .ui-spinner-input {
+    border: none;
+    background: none;
+    color: inherit;
+    padding: 0;
+    margin: .2em 0;
+    vertical-align: middle;
+    margin-left: .4em;
+    margin-right: 22px;
+  }
+  .ui-spinner-button {
+    width: 16px;
+    height: 50%;
+    //font-size: @font-size-smaller;
+    padding: 0;
+    margin: 0;
+    text-align: center;
+    position: absolute;
+    cursor: default;
+    display: block;
+    overflow: hidden;
+    right: 0;
+  }
+  //  more specificity required here to overide default borders
+  a.ui-spinner-button {
+    border-top: none;
+    border-bottom: none;
+    border-right: none;
+  }
+  //  vertical centre icon
+  .ui-icon {
+    position: absolute;
+    margin-top: -8px;
+    top: 50%;
+    left: 0;
+  }
+  .ui-spinner-up   { top: 0; }
+  .ui-spinner-down { bottom: 0; }
+
+  //  TR overrides
+  .ui-spinner .ui-icon-triangle-1-s {
+    //  need to fix icons sprite
+    background-position: -65px -16px;
+  }
+} // /.ui-spinner
+
+
+
+
+// --------------------------------------
+// UI-TABS
+// --------------------------------------
+
+.ui-tabs {
+  // position: relative prevents IE scroll bug
+  // (element with position: relative inside container with overflow:
+  // auto appear as "fixed")
+  position: relative;
+  padding: .2em;
+
+  .ui-tabs-nav {
+    margin: 0;
+    padding: .2em .2em 0;
+
+    li {
+      list-style: none;
+      float: left;
+      position: relative;
+      top: 0;
+      margin: 1px .2em 0 0;
+      border-bottom-width: 0;
+      padding: 0;
+      white-space: nowrap;
+
+      a {
+        float: left;
+        padding: .5em 1em;
+        text-decoration: none;
+        cursor: pointer;
+      }
+
+      .ui-tabs-active {
+        margin-bottom: -1px;
+        padding-bottom: 1px;
+      }
+      .ui-tabs-active,
+      .ui-state-disabled,
+      .ui-tabs-loading {
+        a {
+          cursor: text;
+          outline: 0 ; // hps: gepunketen Rahmen nach Klick ausblenden
+        }
+      }
+
+    } // /li
+  } // /.ui-tabs-nav
+
+  .ui-tabs-panel {
+    display: block;
+    border-width: 0;
+    padding: 0.4em 0 1.0em 0;
+    //background: none;
+  }
+
+} // /.ui-tabs
+
+
+// first selector in group seems obsolete,
+// but required to overcome bug in Opera applying cursor:
+// text overall if defined elsewhere...
+.ui-tabs .ui-tabs-nav li a,
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
+  cursor: pointer;
+}
+
+
+
+
+// --------------------------------------
+// UI-TOOLTIP
+// --------------------------------------
+
+.ui-tooltip {
+  position:           absolute;
+  z-index:            9999;
+  max-width:          300px;
+  padding:            8px;
+  -webkit-box-shadow: 0 0 5px #aaa ;
+  box-shadow:         0 0 5px #aaa;
+  background-color:   @jquery_ui_tooltipster-bg-color !important ;
+
+  .ui-tooltip-content{
+    color:            #ffffff ;
+  }
+}
+body .ui-tooltip {
+  border-width: 2px ;
+}
+
+
+
+
+
+// ----------------------------------
+// Component containers (UI-WIDGET)
+// ----------------------------------
+.ui-widget {
+  //font-size: @font-size-smaller;
+
+  .ui-widget-header {
+    background: none;
+    color: #ffffff;
+    font-weight: bold;
+
+    a { color: #ffffff; }
+  }
+
+  .ui-widget-content {
+    //border: 1px solid #dddddd;
+    border: none;
+    background: none ;
+    //background-color: #ffffff ; // or Transparent
+    //color: #333333;
+
+    a {
+      //color: #333333;
+    }
+  } // .ui-widget-content
+
+  .ui-widget { font-size: @font-size-small; }
+
+  input,
+  select,
+  textarea,
+  button {
+    //font-size: @font-size-smaller ;
+  }
+
+} // /.ui-widget
+
+
+
+
+
+// --------------------------------------
+// CKEditor
+// --------------------------------------
+.cke_editable {
+  background-color: white;
+  padding: 6px;
+  //margin-left: -0.3em ;
+  border-top: 1px #999 solid;
+  border-right: 1px #ddd solid;
+  border-left: 1px #ddd solid;
+  overflow: auto ;
+  font-size: 11pt ;
+  min-width: @textarea-wi-lightwide ;
+  min-height: 4.0em ;
+  &:focus {
+    outline: none ;
+    background-color: @formelement-focus-bg ;
+    border: @formelement-focus-border ;
+  }
+
+  p {
+    font-size: 10pt !important;
+    padding: 0  ;
+    margin: 0 0 0.4em 0 ;
+    font-weight: normal;
+  }
+}
+div.cke_editable.wi-small-wide{
+  margin-right: 24px !important ;
+}
+body > .ui-dialog > .ui-dialog-content > p > .cke_editable {
+  border: 1px #dcdcdc solid !important;
+  padding: 0.4em;
+  margin: 0;
+  font-size: 100%;
+  width: 100% !important;
+}
+
+
+
+
+
+// ----------------------------------
+// Interaction states
+// ----------------------------------
+
+.ui-state-default,
+.ui-state-hover,
+.ui-state-focus,
+.ui-state-active {
+  .ui-icon {
+    background-image: url(ui-lightne../../images/ui-icons_777777_256x240.png) !important;
+  }
+}
+
+.ui-state-default {
+  border: 1px solid #cccccc;
+  //background: #f6f6f6 url(ui-lightne../../images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x;
+  background: none ;
+  font-weight: bold;
+  color: @base-darker;
+  a,
+  a:link,
+  a:visited {
+    color: #1c94c4;
+    text-decoration: none;
+  }
+} // /.ui-state-default
+
+.ui-state-hover,
+.ui-state-focus {
+  //border: 1px solid #fbcb09;
+  //background: #fdf5ce url(ui-lightne../../images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
+  background: none ;
+  font-weight: bold;
+  color: #c77405;
+  a,
+  a:hover,
+  a:link,
+  a:visited {
+    color: #000;
+    text-decoration: underline;
+  }
+} // .ui-state-hover, .ui-state-focus
+
+.ui-state-active {
+  border: 1px solid #fbd850;
+  //background: #ffffff url(ui-lightne../../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+  background: none ;
+  font-weight: bold;
+  color: #eb8f00;
+  a,
+  a:link,
+  a:visited {
+    color: #eb8f00;
+    text-decoration: none;
+  }
+} // .ui-state-active
+
+
+
+// ----------------------------------
+// Interaction Cues
+// ----------------------------------
+.ui-state-highlight {
+  border: 1px solid #fed22f;
+  //background: #ffe45c url(ui-lightne../../images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x;
+  background: none ;
+  color: #363636;
+  a { color: #363636; }
+}
+
+.ui-state-error {
+  border: 1px solid #cd0a0a;
+  //background: #b81900 url(ui-lightne../../images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat;
+  background: none ;
+  color: #ffffff;
+  a { color: #ffffff; }
+}
+
+.ui-state-error-text {
+  color: #ffffff;
+}
+
+.ui-priority-primary {
+  font-weight: bold;
+}
+.ui-priority-secondary {
+  opacity: .7;
+  filter:Alpha(Opacity=70);
+  font-weight: normal;
+}
+
+.ui-state-disabled {
+  opacity: .35;
+  filter:Alpha(Opacity=35);
+  background-image: none;
+  .ui-icon { filter:Alpha(Opacity=35); } //  For IE8 - See #6059
+}
+
+// Overrides
+
+
+
+
+
+
+
+
+// ----------------------------------
+// Icons
+// ----------------------------------
+//  states and images
+.ui-icon {
+  width: 16px;
+  height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_ffffff_256x240.png);
+}
+.ui-state-default .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-active .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_228ef1_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+  background-image: url(ui-lightne../../images/ui-icons_ffd27a_256x240.png);
+}
+
+//  positioning
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+//  ui-icon-seek-first is deprecated, use ui-icon-seek-start instead
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+
+// ----------------------------------
+// Misc visuals
+// ----------------------------------
+
+// Corner radius
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+  //border-top-left-radius: @tabs-border-radius;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+  //border-top-right-radius: @tabs-border-radius;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+  //border-bottom-left-radius: @tabs-border-radius;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+  //border-bottom-right-radius: @tabs-border-radius;
+}
+
+// Overlays */
+.ui-widget-overlay {
+  //background: #666666 url(ui-lightne../../images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
+  background: #666666 ;
+  opacity: .5;
+  filter: Alpha(Opacity=50);
+}
+.ui-widget-shadow {
+  margin: -5px 0 0 -5px;
+  padding: 5px;
+  //background: #000000 url(ui-lightne../../images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
+  background: #000000 ;
+  opacity: .2;
+  filter: Alpha(Opacity=20);
+  border-radius: @controlpanel-radius;
+}
+
+
+
+// --------------------------------------
+// KIVITENDO STUFF
+// --------------------------------------
+
+
+// -----------------------
+// Part, Chart & Customer Vendor Picker
+// -----------------------
+
+//  Chart-Picker
+//  Entnommen aus main.less, gehoert vielleicht zu Autocomplete
+
+.chart_picker,
+.project_picker,
+.part_picker {
+  display: inline-block;
+
+  &:before{
+    display: inline-block;
+    vertical-align: middle;
+    height: 100%;
+  }
+}
+
+span.chart_picker,
+span.project_picker,
+span.part_picker {
+  white-space: nowrap ;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+  input {
+    //  padding-right: 20px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+  }
+}
+
+div.part_picker_part,
+div.project_picker_project,
+div.chart_picker_chart {
+  padding: 5px;
+  margin: 5px;
+  border: 1px;
+  border-color: darkgray;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  background-color: white;
+  cursor: pointer;
+
+  &:hover {
+    color: #000;
+    text-decoration: underline;
+  }
+}
+
+
+
+
+// Part_Picker
+// Select Customer in input-fields
+// PENDENT: Ausrichtung vertikal in Zelle
+span.customer_vendor_picker{
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+.customer-vendor-picker-undefined,
+.chartpicker-undefined,
+.projectpicker-undefined,
+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}
diff --git a/css/design40/less/jquery-ui_overrides.less b/css/design40/less/jquery-ui_overrides.less
new file mode 100755
index 000000000..3622289d8
--- /dev/null
+++ b/css/design40/less/jquery-ui_overrides.less
@@ -0,0 +1,425 @@
+/* ------------------------------------------------------------- */
+/* JQUERY-UI OVERRIDES (jquery-ui_overrides.less)                */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// jQuery UI CUSTOM
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Overrides of jQuery UI LESS or CSS stuff
+//
+// Contents:
+// - UI WIDGETS IN GENERAL
+// - TAB WIDGET
+//   - DIV-Container with Tabs & Panels
+//     - LIST WITH TABS (UL)
+//       - SINGLE TAB (LI)
+//         - LINKS
+//         - STATES (Active, Default, Hover)
+//     - UI-TABS-NAV (Class)
+//     - UI-TABS-COLLAPSIBLE
+//     - DIV (UI-TABS-PANEL)
+//       - UI-TABS-PANEL (CLASS)
+// UI-AUTOCOMPLETE
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// UI WIDGETS IN GENERAL
+// --------------------------------------
+
+
+
+
+
+
+// --------------------------------------
+// TAB WIDGET
+// --------------------------------------
+// Container with Tabs & Panels (DIV)
+
+.tabwidget {
+  width:       100%;
+  overflow:   hidden;
+  position:   relative;
+  zoom:       1;
+  padding:     0 !important;
+  border:     0;
+
+  color:       @tabs-default-color;
+  //background: @tabs-bg;
+  background: transparent;
+
+
+
+  // -----------------------
+  // LIST WITH TABS (UL)
+  // -----------------------
+  > ul {
+    display:           block;
+    list-style:       none;
+    outline:           0;
+    margin:           0;
+    padding:           0.2em 0.2em 0 0;
+    margin:           0;
+
+    font-size:         @font-size-base; // hps
+    font-weight:       bold;
+    line-height:       1.3;
+    text-decoration:  none;
+
+    // -----------------------
+    // SINGLE TAB (LI)
+    // -----------------------
+    li {
+      position:   relative;
+      top:        1px;
+      float:      left;
+      list-style: none;
+
+      margin:      1px 0.2em 0 0;
+      padding:     0;
+      white-space: nowrap;
+
+      border-bottom:           0 !important;
+      border-top-right-radius: @tabs-border-radius;
+      border-top-left-radius:  @tabs-border-radius;
+      border:                  1px solid #cccccc;
+
+      background-color:    @tabs-default-bg ;
+      color:               @tabs-default-color;
+      font-size:           @font-size-smaller ;
+      font-weight:         bold;
+
+      &.ui-tabs-selected {
+        margin-bottom:    0;
+        padding-bottom:   1px;
+
+        a { cursor:       pointer; }
+      }
+
+      // -----------------------
+      // LINKS
+      // -----------------------
+      a {
+        float:           left;
+        padding:         0.2em 0.7em;
+        text-decoration: none;
+        cursor:          pointer;
+      }
+
+      // -----------------------
+      // STATES (Active, Default, Hover)
+      // -----------------------
+      // Outline: 0 ; in anchor to avoid dotted frame after click
+
+      &.ui-state-default{
+        margin:       0 0 0 0.6em;
+        background:   @tabs-default-bg;
+        color:         @tabs-default-color;
+        border:       1px @tabs-border-color solid;
+        font-weight:   normal;
+
+        a,
+        a:link {
+          color:       @tabs-default-color;
+          font-weight: normal;
+        }
+      }
+
+      &.ui-state-hover{
+        color:             @tabs-default-hover-color;
+        background-color: @tabs-default-hover-bg;
+        a,
+        a:hover {}
+      }
+
+      &.ui-state-active {
+        color:               @tabs-active-color;
+        background-color:   @tabs-active-bg;
+
+        a,
+        a:link,
+        a:visited {
+          color:             @tabs-active-color;
+          outline:           0 ;
+        }
+
+        &.ui-state-hover {
+          color: @tabs-active-hover-color;
+          a,
+          a:hover {}
+        }
+      } // /&.ui-state-active
+
+      &.ui-state-disabled a {
+        cursor:   text;
+        outline:   0 ;
+      }
+      &.ui-state-processing a { cursor: text; }
+      &.ui-state-loading    a { outline: 0 ;  }
+
+    }
+    // /li
+
+    // UL
+    &.ui-widget-header {
+      //background: transparent;
+      //border: 0px;
+      //color: #fe5f14;
+    }
+
+
+
+    // -----------------------
+    // UI-TABS-NAV (Class)
+    // -----------------------
+    // UL
+    &.ui-tabs-nav {
+      position: fixed;
+      top: 100px;
+      width: 100%;
+      z-index: 1029;
+
+      margin: 0 0.4em 0.6em 0;
+      padding: 0.4em 0.2em 0 0.7em;
+
+      background-color: @tabs-bg;
+      border-bottom: 1px @tabs-border-color solid !important;
+
+      li {
+        margin: 1px 0.2em 0 0;
+
+        a { padding: 0.2em 0.7em; }
+
+        &.ui-tabs-active {
+          border-bottom: 1px @tabs-active-bg solid !important ;
+          margin-bottom: -1px;
+          padding-bottom: 0;
+        }
+      }
+    } // /.ui-tabs-nav
+
+  }
+  // /ul
+
+
+  // -----------------------
+  // UI-TABS-COLLAPSIBLE
+  // -----------------------
+  &.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
+     cursor: pointer;
+  }
+
+
+
+
+
+  // -----------------------
+  // DIV (UI-Tabs-Panel)
+  // -----------------------
+  // Single Panel, selected via Tabs
+  // Some of the Panels do not have a class PENDENT: loesen!!!
+
+  //--------------------------
+  // UI-Tabs-Panel (DIV WITHOUT CLASS)
+  // --------------------------
+  & > div {
+    display: none;
+    //border-top: 1px solid #999 !important;
+    //border-left: 1px solid #999 !important;
+    //border-right: 1px solid #999 !important;
+    padding-top: 3.5em !important;
+    border-bottom: none;
+    width: 100%;
+    height: 100%;
+    min-height: 400px;
+    overflow: hidden ;
+
+    //--------------------------
+    // UI-Tabs-Panel (DIV WITH CLASS)
+    // --------------------------
+    &.ui-tabs-panel{
+      width: 100%;
+      overflow: hidden;
+      //background-color: @tabs-panel-bg;
+      //background-color: transparent;
+      display: block;
+
+      // further tabwidget within a tabwidget (documents tab etc.)
+      & > .tabwidget{
+        position: relative ;
+
+        & > .ui-tabs-nav{
+          position: relative ;
+          top: auto;
+          //background: none;
+          //background-color: @tabs-bg;
+          background-color: transparent;
+        }
+
+        & > .ui-tabs-panel {
+          background-color: @tabs-bg ;
+          background-color: transparent ;
+          position: relative ;
+          top: auto;
+          padding-top: 0 !important ;
+        }
+        //.ui-tabs-nav{  }
+      }
+
+      &.ui-widget-content { border: 0 ;}
+
+    } //  .ui-tabs-panel
+  } // /div (.ui-tabs-panel)
+} //  /.tabwidget
+
+
+
+
+
+// --------------------------------------
+// UI-DIALOG
+// --------------------------------------
+
+//.ui-dialog {
+//  border: 1px solid #333333;
+//  color: #333333;
+//  border-radius: @controlpanel-radius;
+//
+//  .ui-dialog-titlebar {
+//    button.ui-dialog-titlebar-close {
+//      background: #bbb !important;
+//    }
+//  }
+//  .ui-widget-header {
+//    button.ui-dialog-titlebar-close {
+//      right: 0.3em;
+//      top: 0;
+//      width: 21px;
+//      margin: 5px 0 0 0;
+//    }
+//  }
+//}
+
+
+
+
+
+// --------------------------------------
+// AUTOCOMPLETE
+// --------------------------------------
+
+//.ui-autocomplete {
+//  z-index: 9000 ;
+//
+//  li{
+//    a{
+//      display: block ;
+//      font-size: 80% ;
+//      padding-top: 0.4em !important;
+//      padding-bottom: 0.4em !important;
+//      &:hover{
+//        background-color: #C9C9C9;
+//        border: none ;
+//        color: #000 ;
+//      }
+//    }
+//  }
+//}
+
+
+
+
+// -------------------
+// Date_Picker
+// Select Date in Popover
+// PENDENT: Ausrichtung vertikal in Zelle & wo eingesetzt
+//input.datepicker{
+  //margin: -0.3em 0 0 0 !important;
+  //padding: 0 !important;
+//}
+
+
+
+// --------------------------------------
+// DATEPICKER
+// --------------------------------------
+
+// Forward / Backward Arrows
+//.ui-widget-header {
+//  .ui-icon {
+//    background-image: url(ui-lightne../../images/ui-icons_222222_256x240.png);
+//  }
+//  .ui-state-hover{
+//    .ui-icon{
+//      background-image: url(ui-lightne../../images/ui-icons_ef8c08_256x240.png);
+//      background: #ffffff;
+//    }
+//  }
+////  select.ui-datepicker-month,
+////  select.ui-datepicker-year {
+////    width: 48%;
+////  }
+//}
+
+
+
+
+// Calendar symbol
+//img.ui-datepicker-trigger{
+//  vertical-align: middle;
+//  margin-left: 0.2em ;
+//}
+// Calender (Table)
+/*
+.ui-datepicker-calendar  {
+  .ui-state-highlight{
+    color: #ffffff ;
+    background-color: @gray-standard;
+    border: 1px @gray-standard solid
+  }
+  // Days
+  td a {
+    &.ui-state-default {
+      color: @base-dark;
+    }
+    &.ui-state-hover {
+      color: #ffffff ;
+      background-color: #000000;
+      border: #000000 ;
+    }
+    &.ui-state-active {
+      border: 1px solid @base-dark;
+      background-color: @base-dark;
+      color: @base-verylight;
+    }
+
+  }
+
+} // /.ui-datepicker-calendar
+*/
+//.ui-state-hover,
+//.ui-widget-content .ui-state-hover,
+//.ui-widget-header .ui-state-hover,
+//.ui-state-focus,
+//.ui-widget-content .ui-state-focus,
+//.ui-widget-header .ui-state-focus {
+//  border: 1px solid #000000;
+//  background: #ffffff;
+//  color: #000000;
+//}
+//
+//.ui-state-default,
+//.ui-state-hover,
+//.ui-state-focus,
+//.ui-state-active {
+//  .ui-icon {
+//    background-image: url(ui-lightne../../images/ui-icons_777777_256x240.png) !important;
+//  }
+//}
diff --git a/css/design40/less/jquery.autocomplete.less b/css/design40/less/jquery.autocomplete.less
new file mode 100755
index 000000000..4fa2b611b
--- /dev/null
+++ b/css/design40/less/jquery.autocomplete.less
@@ -0,0 +1,51 @@
+/* ------------------------------------------------------------- */
+/* Jquery-Autocomplete (jquery.autocomplete.less)                */
+/* ------------------------------------------------------------- */
+
+
+.ac_results {
+  padding: 0px;
+  border: 1px solid black;
+  background-color: white;
+  overflow: hidden;
+  z-index: 99999;
+}
+
+.ac_results ul {
+  width: 100%;
+  list-style-position: outside;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.ac_results li {
+  margin: 0px;
+  padding: 2px 5px;
+  cursor: default;
+  display: block;
+  //  if width will be 100% horizontal scrollbar will apear when scroll mode will be used
+  // width: 100%;
+  font: menu;
+  font-size: @font-size-base; /*hps: vorher 12px */
+  //   it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox
+  line-height: 16px;
+  overflow: hidden;
+}
+
+.ac_loading {
+  // PENDENT: Datei nicht gefunden, auch nicht auf jquery-ui.com
+  //background: white url('indicator.gif') right center no-repeat;
+}
+
+.ac_odd {
+  background-color: #eee;
+}
+
+.ac_over {
+  background-color: #0A246A;
+  color: white;
+}
+
+
+
diff --git a/css/design40/less/jquery.chartpicker.less b/css/design40/less/jquery.chartpicker.less
new file mode 100755
index 000000000..3b2509568
--- /dev/null
+++ b/css/design40/less/jquery.chartpicker.less
@@ -0,0 +1,113 @@
+/* ------------------------------------------------------------- */
+/* JQUERY CHART-PICKER (jquery.chartpicker.less)                 */
+/* ------------------------------------------------------------- */
+
+
+
+
+
+
+
+//  ------------------------------------------- 
+//  Bloecke                                     
+//  ------------------------------------------- 
+
+div.cpc_block,
+div.ppp_block {
+  overflow:hidden;
+  float:left;
+  width: 350px;
+}
+
+
+//  --------------------- 
+//  PPP-Block             
+//  --------------------- 
+div.ppp_block {
+
+  span.ppp_block_number { float: left; }
+
+  span.ppp_block_description {
+    float:        right;
+    margin-left:  1em;
+    font-weight:  bold;
+  }
+}
+
+
+//  --------------------- 
+//  CPC-Block             
+//  --------------------- 
+
+div.cpc_block {
+
+  span.cpc_block_number { float: left; }
+
+  span.cpc_block_description {
+    float:left;
+    margin-left:1em;
+    font-weight:bold;
+  }
+  span.cpc_block_balance    { float:   right; }
+  span.cpc_line_balance     { display: none; }
+  span.cpc_block_second_row {}
+}
+
+
+
+
+//  ------------------------------------------- 
+//  Linien                                      
+//  ------------------------------------------- 
+
+//  --------------------- 
+//  PPP-Linie             
+//  --------------------- 
+div.ppp_line{
+
+  span.ppp_block_description  {
+    margin-left:1em;
+    font-weight:bold;
+  }
+}
+
+//  --------------------- 
+//  CPC-Linie             
+//  --------------------- 
+div.cpc_line {
+
+  span.cpc_block_description  {
+    margin-left:1em;
+    font-weight:bold;
+  }
+  span.cpc_block_second_row { display: none; }
+
+}
+
+
+//  ------------------------------------------------------------- 
+//  Diverses                                                      
+//  ------------------------------------------------------------- 
+
+.customer-vendor-picker-undefined,
+.chartpicker-undefined,
+.projectpicker-undefined,
+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}
+
+span.cpc_popup_button,
+span.ppp_popup_button {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: -24px;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background: url("../../image/search.svg") no-repeat center right;
+  background-size: contain;
+}
+
+
+
diff --git a/css/design40/less/jquery.multiselect2side.less b/css/design40/less/jquery.multiselect2side.less
new file mode 100755
index 000000000..5d5e46e9f
--- /dev/null
+++ b/css/design40/less/jquery.multiselect2side.less
@@ -0,0 +1,77 @@
+/* ------------------------------------------------------------- */
+/* JQUERY MULTISELECT2SIDE (jquery.multiselect2side.less)        */
+/* ------------------------------------------------------------- */
+
+
+//  multiselect2side plugin
+.ms2side__div {
+  clear:         left;
+  width:         100%;
+  padding:       1px;
+  float:         left;
+  background :   url('') repeat-x; //  HACK FOR CHROME
+}
+
+.ms2side__select {
+  float:         left;
+}
+/* siehe H3 */
+.ms2side__header {
+  color:         #666; /* hps */
+  font-size:     @font-size-smaller ;
+  line-height:   1.0em;
+  padding:       0 0 0.3em 0;
+  display:       block;
+}
+
+.ms2side__options,
+.ms2side__updown {
+  float:         left;
+  font-size:     @font-size-small ;
+  margin:       0;
+  padding:       0 8px;
+  width:         40px;
+  color:         black;
+  text-align:   center;
+  overflow:     hidden;
+}
+.ms2side__options{
+  padding-top:   1.0em !important;
+}
+.ms2side__updown {
+  font-size:     @font-size-small;
+}
+
+.ms2side__options p,
+.ms2side__updown p {
+  margin:           2px 0;
+  padding:           0;
+  cursor:           pointer;
+  border:           1px solid black;
+  width:             auto !important; /* hps */
+  background-color: @button-neutral-bg;  /* hps */
+  color:             @button-neutral-color ; /* hps */
+  border-color:     @button-neutral-border ; /* hps */
+  border-radius:     3px; /* hps */
+}
+
+.ms2side__options p.ms2side_hover,
+.ms2side__updown p.ms2side_hover {
+  background-color: #3C3C3B; /* hps */
+  border-color:     #000000;
+  color:             #ffffff ;
+  cursor:           pointer;
+}
+
+.ms2side__options > p.ms2side__hide,
+.ms2side__updown > p.ms2side__hide {
+  cursor:           default;
+  color:             #9e9e9e;
+  border:           1px solid grey;
+  background-color: #D4D4D4 !important;
+}
+
+.ms2side__div select {
+  width:             12.0em; /*hps:400px*/
+  float:             left;
+}
diff --git a/css/design40/less/jquery.tooltipster.less b/css/design40/less/jquery.tooltipster.less
new file mode 100755
index 000000000..8de3be147
--- /dev/null
+++ b/css/design40/less/jquery.tooltipster.less
@@ -0,0 +1,355 @@
+/* ------------------------------------------------------------- */
+/* JQUERY TOOLTIPSTER (jquery.tooltipster.less)                  */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// Tooltipster
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Contains:
+// - tooltipster
+// - tooltipster-light
+//
+//
+// CONTENTS:
+// - Tooltipster
+// - Tooltipster Light
+// -
+// -
+// ----------------------------------------------------------------------------
+
+
+
+
+// ----------------------------------------------------------------------------
+//
+// Tooltipster
+//
+// ----------------------------------------------------------------------------
+//
+
+
+/* This is the default Tooltipster theme */
+/* (feel free to modify or duplicate and create multiple themes!): */
+.tooltipster-default {
+  border-radius: @controlpanel-radius;
+  border: 2px solid #000;
+  background-color: @jquery_ui_tooltipster-bg-color;  
+  color: #fff;
+  max-width: 400px ;
+  
+  /* Use this next selector to style things like font-size and line-height: */
+  .tooltipster-content {
+    font-size: @font-size-small;
+    line-height: 16px;
+    padding: 1.2em 1.0em 1.2em 1.4em;
+    overflow: hidden;
+    background-color: @jquery_ui_tooltipster-bg-color;  
+  }
+
+  /* These next classes handle the styles for the little arrow attached to the tooltip. */
+  /* By default, the arrow will inherit the same colors and border as what is set on the main tooltip itself. */
+  .tooltipster-arrow {
+    display: block;
+    text-align: center;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: -1;
+  
+    /* This next selector defines the color of the border on the outside of the arrow. */
+    /* This will automatically match the color and size of the border set on the main tooltip styles. */
+    /* Set display: none; if you would like a border around the tooltip but no border around the arrow */
+    .tooltipster-arrow-border { }
+  }
+  
+} // /.tooltipster-default
+
+
+
+/* If you're using the icon option, use this next selector to style them */
+.tooltipster-icon {
+  cursor: help;
+  margin-left: 4px;
+}
+
+/* This is the base styling required to make all Tooltipsters work */
+.tooltipster-base {
+  padding: 0;
+  font-size: 0;
+  line-height: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 9999999;
+  pointer-events: none;
+  width: auto;
+  max-width: 400px ;
+  overflow: visible;
+  
+  .tooltipster-content {
+    overflow: hidden;
+  }  
+}
+
+
+
+
+.tooltipster-arrow span,
+.tooltipster-arrow-border {
+  display: block;
+  width: 0;
+  height: 0;
+  position: absolute;
+}
+.tooltipster-arrow-top span,
+.tooltipster-arrow-top-right span,
+.tooltipster-arrow-top-left span {
+  border-left: 8px solid transparent !important;
+  border-right: 8px solid transparent !important;
+  border-top: 8px solid;
+  bottom: -7px;
+}
+.tooltipster-arrow-top .tooltipster-arrow-border,
+.tooltipster-arrow-top-right .tooltipster-arrow-border,
+.tooltipster-arrow-top-left .tooltipster-arrow-border {
+  border-left: 9px solid transparent !important;
+  border-right: 9px solid transparent !important;
+  border-top: 9px solid;
+  bottom: -7px;
+}
+
+.tooltipster-arrow-bottom span,
+.tooltipster-arrow-bottom-right span,
+.tooltipster-arrow-bottom-left span {
+  border-left: 8px solid transparent !important;
+  border-right: 8px solid transparent !important;
+  border-bottom: 8px solid;
+  top: -7px;
+}
+.tooltipster-arrow-bottom .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-right .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-left .tooltipster-arrow-border {
+  border-left: 9px solid transparent !important;
+  border-right: 9px solid transparent !important;
+  border-bottom: 9px solid;
+  top: -7px;
+}
+.tooltipster-arrow-top span,
+.tooltipster-arrow-top .tooltipster-arrow-border,
+.tooltipster-arrow-bottom span,
+.tooltipster-arrow-bottom .tooltipster-arrow-border {
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+}
+.tooltipster-arrow-top-left span,
+.tooltipster-arrow-bottom-left span {
+  left: 6px;
+}
+.tooltipster-arrow-top-left .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-left .tooltipster-arrow-border {
+  left: 5px;
+}
+.tooltipster-arrow-top-right span,
+ .tooltipster-arrow-bottom-right span {
+  right: 6px;
+}
+.tooltipster-arrow-top-right .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-right .tooltipster-arrow-border {
+  right: 5px;
+}
+.tooltipster-arrow-left span,
+.tooltipster-arrow-left .tooltipster-arrow-border {
+  border-top: 8px solid transparent !important;
+  border-bottom: 8px solid transparent !important;
+  border-left: 8px solid;
+  top: 50%;
+  margin-top: -7px;
+  right: -7px;
+}
+.tooltipster-arrow-left .tooltipster-arrow-border {
+  border-top: 9px solid transparent !important;
+  border-bottom: 9px solid transparent !important;
+  border-left: 9px solid;
+  margin-top: -8px;
+}
+.tooltipster-arrow-right span,
+.tooltipster-arrow-right .tooltipster-arrow-border {
+  border-top: 8px solid transparent !important;
+  border-bottom: 8px solid transparent !important;
+  border-right: 8px solid;
+  top: 50%;
+  margin-top: -7px;
+  left: -7px;
+}
+.tooltipster-arrow-right .tooltipster-arrow-border {
+  border-top: 9px solid transparent !important;
+  border-bottom: 9px solid transparent !important;
+  border-right: 9px solid;
+  margin-top: -8px;
+}
+
+
+/* Some CSS magic for the awesome animations - feel free to make your own custom animations and reference it in your Tooltipster settings! */
+
+.tooltipster-fade {
+  opacity: 0;
+  -webkit-transition-property: opacity;
+  -moz-transition-property: opacity;
+  -o-transition-property: opacity;
+  -ms-transition-property: opacity;
+  transition-property: opacity;
+}
+.tooltipster-fade-show {
+  opacity: 1;
+}
+
+.tooltipster-grow {
+  -webkit-transform: scale(0,0);
+  -moz-transform: scale(0,0);
+  -o-transform: scale(0,0);
+  -ms-transform: scale(0,0);
+  transform: scale(0,0);
+  -webkit-transition-property: -webkit-transform;
+  -moz-transition-property: -moz-transform;
+  -o-transition-property: -o-transform;
+  -ms-transition-property: -ms-transform;
+  transition-property: transform;
+  -webkit-backface-visibility: hidden;
+}
+.tooltipster-grow-show {
+  -webkit-transform: scale(1,1);
+  -moz-transform: scale(1,1);
+  -o-transform: scale(1,1);
+  -ms-transform: scale(1,1);
+  transform: scale(1,1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+
+.tooltipster-swing {
+  opacity: 0;
+  -webkit-transform: rotateZ(4deg);
+  -moz-transform: rotateZ(4deg);
+  -o-transform: rotateZ(4deg);
+  -ms-transform: rotateZ(4deg);
+  transform: rotateZ(4deg);
+  -webkit-transition-property: -webkit-transform, opacity;
+  -moz-transition-property: -moz-transform;
+  -o-transition-property: -o-transform;
+  -ms-transition-property: -ms-transform;
+  transition-property: transform;
+}
+.tooltipster-swing-show {
+  opacity: 1;
+  -webkit-transform: rotateZ(0deg);
+  -moz-transform: rotateZ(0deg);
+  -o-transform: rotateZ(0deg);
+  -ms-transform: rotateZ(0deg);
+  transform: rotateZ(0deg);
+  -webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+  -moz-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+  -ms-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+  -o-transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+  transition-timing-function: cubic-bezier(0.230, 0.635, 0.495, 2.4);
+}
+
+.tooltipster-fall {
+  top: 0;
+  -webkit-transition-property: top;
+  -moz-transition-property: top;
+  -o-transition-property: top;
+  -ms-transition-property: top;
+  transition-property: top;
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+.tooltipster-fall-show {
+}
+.tooltipster-fall.tooltipster-dying {
+  -webkit-transition-property: all;
+  -moz-transition-property: all;
+  -o-transition-property: all;
+  -ms-transition-property: all;
+  transition-property: all;
+  top: 0px !important;
+  opacity: 0;
+}
+
+.tooltipster-slide {
+  left: -40px;
+  -webkit-transition-property: left;
+  -moz-transition-property: left;
+  -o-transition-property: left;
+  -ms-transition-property: left;
+  transition-property: left;
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.15);
+}
+.tooltipster-slide.tooltipster-slide-show {
+}
+.tooltipster-slide.tooltipster-dying {
+  -webkit-transition-property: all;
+  -moz-transition-property: all;
+  -o-transition-property: all;
+  -ms-transition-property: all;
+  transition-property: all;
+  left: 0px !important;
+  opacity: 0;
+}
+
+
+/* CSS transition for when contenting is changing in a tooltip that is still open. */
+/* The only properties that will NOT transition are: width, height, top, and left */
+.tooltipster-content-changing {
+  opacity: 0.5;
+  -webkit-transform: scale(1.1, 1.1);
+  -moz-transform: scale(1.1, 1.1);
+  -o-transform: scale(1.1, 1.1);
+  -ms-transform: scale(1.1, 1.1);
+  transform: scale(1.1, 1.1);
+}
+
+
+
+
+// ----------------------------------------------------------------------------
+//
+// Tooltipster Light
+//
+// ----------------------------------------------------------------------------
+//
+
+
+.tooltipster-light {
+  border-radius:     @controlpanel-radius;
+  border:           1px solid @jquery_ui_tooltipster-border-color;
+  background-color: @jquery_ui_tooltipster-bg-color;  
+  color:             @jquery_ui_tooltipster-color;
+  
+  .tooltipster-content {
+    font-size:     @font-size-smaller;
+    line-height:   16px;
+    background-color: @jquery_ui_tooltipster-bg-color;  
+    padding:      1.0em 1.4em;
+  }
+}
+
diff --git a/css/design40/less/lists.less b/css/design40/less/lists.less
new file mode 100644
index 000000000..1172e1853
--- /dev/null
+++ b/css/design40/less/lists.less
@@ -0,0 +1,204 @@
+/* ------------------------------------------------------------- */
+/* LISTS (lists.less)                                            */
+/* ------------------------------------------------------------- */
+
+
+
+// ----------------------------------------------------------------------------
+//
+// Lists
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: UL or OL lists and some fake tables with DIVs
+//
+// CONTENTS:
+// - UNORDERED LISTS (UL)
+// - TABLES build with DIVS
+// - TABLES with PARAGRAPHS or DIVs for Checkboxes
+// ----------------------------------------------------------------------------
+
+
+// --------------------------------------
+// UNORDERED LISTS
+// --------------------------------------
+ul {
+  list-style-type:       disc;
+  list-style-position:   outside;
+  list-style-image:     none;
+  padding:               0 0 0 1.4em;
+  margin:               0.4em 0 0.4em 0;
+
+  // with SUP-items for footnotes
+  &.footnotes {
+    list-style-type:       none !important ;
+    list-style-position:   outside ;
+    margin:               0 0 0 1.8em !important ;
+    li {
+      sup {
+        display:   inline-block;
+        margin:   0 0.6em 0 -2.6em;
+        padding:   0;
+      }
+      & > ul {
+        position:             relative;
+        list-style-type:       circle ;
+        list-style-position:   outside ;
+        margin:               0.3em 0 0.3em 1.4em !important ;
+      }
+    }
+
+  } // /.footnotes
+
+  // List inside a list item
+  li {
+    ul {
+      list-style-type:       circle ;
+      list-style-position:   outside ;
+      li { }
+    }
+  }
+}
+
+
+
+//  --------------------------------------
+//  TABLES build with DIVS
+//  --------------------------------------
+
+div.table {
+  margin-bottom:   1.0em ;
+  &.col {
+    float:         left ;
+    margin-right: 1.6em ;
+  }
+  div.caption {
+    clear:         left ;
+    display:       block ;
+    font-weight:   bold ;
+    color:         @table-caption-color ;
+  }
+  div.field {
+    clear:         left ;
+    display:       block ;
+    overflow:     hidden ;
+    margin-right:  2.0em ;
+    // PENDENT: ueberpruefen wegen cke-Editor-Konflikte
+    span.label {
+      display:     inline-block ;
+      float:       left ;
+      min-width:   12em;
+      width:       auto;
+    }
+    span.value {
+      display:     inline-block ;
+      float:       left ;
+      min-width:   12em;
+      width:       auto;
+    }
+  }
+}
+
+
+//  --------------------------------------
+//  TABLES with PARAGRAPHS or DIVs for Checkboxes
+//  --------------------------------------
+// PENDENT: siehe auch form-additions
+div.list {
+  font-size:   @font-size-small ;
+  color:       @t-cell-text-color ;
+
+  // A column with a list
+  &.col {
+    float: left ;
+    margin-right:  2.6em !important ;
+    width:         auto ;
+    min-width:     110px ;
+  }
+  // List Title
+  h4 {
+    padding:       0.6em 0 0.2em 0.0em !important ;
+    margin:       0.2em 0 0 0 ;
+    font-weight:   normal;
+    font-size:     @font-size-medium;
+    font-family:   "Helvetica Neue", Helvetica, Arial; // PENDENT: in Variablen verlegen
+    color:         @base-dark ;
+  }
+  // List Elements
+  & > p,
+  & > div {
+    padding:       0.2em 0 0.2em 0 !important ;
+    margin:       0 !important ;
+    white-space:   normal ;
+
+    &>input[type="checkbox"],
+    &>input[type="radio"] {
+      padding:     0 ;
+      margin:     0 0.3em 0.3em 0 ;
+      float:       left ;
+    }
+    label {
+      width:       auto ;
+      float:       left ;
+    }
+  }
+  &>p {
+    //margin:     0 0 1.2em 0 !important ;
+    overflow:     hidden ;
+  }
+  // Special Element but same like above (see Custom Vars)
+  &>input[type="checkbox"] {
+    clear:           both;
+    float:           left;
+    margin-right:   0.4em ;
+  }
+  &>label { width:   82% ; }
+
+  div { clear:       left }
+
+  & > div.no-rows {
+    &>input[type="checkbox"],
+    &>input[type="radio"] {
+      padding:   0 ;
+      margin:    0.3em 0.3em 0 0 ;
+      clear:     left ;
+    }
+    label {
+      width: 82% ;
+      float: left ;
+    }
+  }
+
+} // /div.list
+
+
+
+
+// PENDENT: wo eingesetzt?
+div.list-table-with-separate-total-table {
+
+  div.full-width {
+    padding-bottom:  0 ;
+    margin-bottom:   0 ;
+
+    .tbl-list {
+      margin-bottom: 0 ;
+    }
+
+  }
+
+  // Total-Tabelle
+  // Separater Block mit Table ohne Body, nur Footer für Totals
+  div.list-total {
+    width:    100% ;
+    margin:   0 ;
+    padding:  0 ;
+    overflow: hidden ;
+
+    table.footer-only {
+      margin:  0 ;
+      padding: 0 ;
+      &.right { float: right ; }
+    }
+    div.after-item {  }
+  }
+}
diff --git a/css/design40/less/main.less b/css/design40/less/main.less
new file mode 100755
index 000000000..25375b87d
--- /dev/null
+++ b/css/design40/less/main.less
@@ -0,0 +1,698 @@
+/* ------------------------------------------------------------- */
+/* MAIN PROPERTIES (main.less)                                   */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// MAIN (MAIN PROPERTIES)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+// CONTENTS:
+// - GENERAL FONT SIZES
+// - HEADINGS (H1-H3)
+//   - H1
+//   - H2
+//   - H3 & Caption
+// - LINKS
+// - OTHER STANDARD HTML-ELEMENTS (SELECTORS)
+//   - Lists (UL & OL)
+//   - Horizontal Rule
+// - COMPONENTS
+//   - Dimensions for DIVs & SPANs
+//   - Long Description
+//   - Info-Container (description & instructions)
+//   - Labels & Values (SPAN)
+//   - Centered Elements
+//   - Accent
+//   - File Content
+//   - Expanded
+//   - Hidden Elements
+//   - Wrapping & text flow
+//   - Visibility, Height utility classes
+// - WRAPPER
+//   - Toggled Wrapper
+//   - Toggle buttons
+//   - Columns
+//   - Paragraph within Wrapper
+//   - Horizontal Scroll
+// - CATEGORIES
+//   - Plus & Minus / Positive & Negative
+//   - Styled Text
+// - SPECIALIZED PROPERTIES (REDUNANT)
+//   - Dunned Invoices
+//   - Bank transactions
+//   - Diverse Elements
+// - DEPRACETED STUFF
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// GENERAL FONT SIZES
+// --------------------------------------
+
+#content {
+
+  & > p,
+  & > div,
+  & > td,
+  & > th {
+    font-size: @font-size-smaller ;
+  }
+  input,
+  select, option,
+  textarea {
+    font-size: @font-size-smaller ;
+  }
+
+}
+
+
+
+
+// --------------------------------------
+// Headings (H1 - H3)
+// --------------------------------------
+
+// -----------------------
+// H1
+// -----------------------
+h1 {
+  display:       block;
+  text-align:    left;
+  margin:        0;
+  font-weight:   normal;
+  font-size:     @h1-size;
+  line-height:   1.2em ;
+}
+// PENDENT: SIEHE AUCH .LISTTOP
+#content > h1 {
+  position:           fixed;
+  z-index:            @zindex-h1; //hps:12
+  top:                60px;
+  width:              100%;
+  color:              @base-h1-color ;
+  background-color:   @base-h1-bg;
+  padding:            @h1-padding;
+  border-top:         @base-h1-border-top;
+}
+#content .wrapper h1{
+  color:              @headings-color;
+  font-size:          @h2-size;
+  margin:             @margin-from-wrapper ;
+}
+body > h1{
+  color:              @base-h1-color ;
+  background-color:   @base-h1-bg ;
+  padding:            @h1-padding;
+}
+
+
+// -----------------------
+// H2
+// -----------------------
+h2 {
+  color:            @headings-color;
+  font-size:        @h2-size ;
+  border-style:     none;
+  letter-spacing:   0.14em;
+}
+
+#content,
+.admin {
+  & > h2 {
+    padding:        0.6em 0.2em ;
+    margin:         0.6em 0 0 0 ;
+  }
+  ui-tabs-panel {
+    .wrapper > h2 {
+      padding: 0 0.2em 0.6em 0.2em ;
+      margin:  @margin-from-wrapper ;
+    }
+  }
+  .wrapper > h2 {
+    padding:      2.0em 0.2em 0.6em 0.2em ;
+    margin:       0 ;
+    font-weight:  normal;
+    clear:        both;
+    &:first-child{ padding-top: 0 ; }
+  }
+} // /#content /.admin
+
+h2.confirm { color: @headings-color-confirm ; }
+h2.error   { color: @headings-color-error ; }
+
+
+// -----------------------
+// H2 Record-Title
+// -----------------------
+// (e.g. Customer Name, Article Name)
+// PENDENT: in verschiedenen Templates einfuegen
+h2.record-title {
+  padding:          0.6em 0 0 0 !important;
+  font-size:        @h2-size ;
+  color:            @headings-color-accent ;
+  small{
+    color:          @headings-color ;
+    letter-spacing: 0 ;
+  }
+}
+.wrapper > h2.record-title{
+  margin:   0em 1em 1em 0.2em !important;
+}
+.ui-tabs-panel > h2.record-title{
+  margin:   1em 1em 0.2em @margin-left-from-content !important;
+  padding:  0.8em 0 0 0.1em !important;
+}
+
+
+// -----------------------
+// H3
+// -----------------------
+// see also mixin .mx-h3-caption and caption in table.less
+h3 {
+  .mx-h3-caption ; // Mixin
+  &.caption{
+    margin: 0.6em 0 0.4em 0 !important;
+  }
+}
+#content h3{
+  color:        @headings-color ;
+  padding-left: 0 ;
+  margin:       0.8em 0 0.4em 0 ;
+}
+#content .wrapper h3 {
+  margin-top:   1.0em ;
+  &:first-child { margin-top: 0 ; }
+}
+#content table.tbl-horizontal > tbody > tr > th > h3,
+#content table.tbl-horizontal > tbody > tr > td > h3 { margin-top: 0.2em !important; }
+
+// PENDENT: H4
+
+
+
+
+// --------------------------------------
+// LINKS
+// --------------------------------------
+
+a {
+  text-decoration: @link-decoration;
+  font-weight:     @link-weight;
+  &:link,
+  &:visited,
+  &:active {
+    color: @link-color;
+  }
+  &:hover {
+    color: @link-hover-color;
+    text-decoration: @link-hover-decoration;
+  }
+
+  // Special classes
+  // PENDENT: some of them obsolete
+  &.selected:hover {
+    color:#EBEBEB;
+  }
+  &.nomobile {
+    background-color:transparent;
+    border:none;
+  }
+  &.green {
+    background-color: DarkGreen;
+    color: white !important;
+    border:none;
+  }
+  &.orange {
+    background-color:#FF8000;
+    border:none;
+  }
+  &.red {
+    background-color:#FF0000;
+    border:none;
+  }
+
+
+  // -------------------
+  // BUTTONS (.button)
+  // see file buttons.less
+
+} // /a (Links)
+
+
+
+
+
+// --------------------------------------
+// OTHER STANDARD HTML-ELEMENTS (SELECTORS)
+// --------------------------------------
+
+// -----------------------
+// Lists (UL & OL)
+// -----------------------
+ul,
+ol {
+  font-size: @font-size-base ;
+
+  li {
+    font-size: @font-size-small ;
+  }
+}
+.wrapper .col{
+  ul {
+    list-style: circle outside;
+    padding: 0 ;
+    margin: 0 ;
+    li{
+      padding: 0 0 0 -0.6em ;
+      margin: 0 0 0 0 ;
+    }
+  }
+}
+
+// -----------------------
+// Horizontal Rule
+// -----------------------
+hr {
+    background-color: @base-standard; // same as table border
+    border: none;
+    height: 2px; // same as table border
+}
+
+
+
+
+
+
+// --------------------------------------
+// COMPONENTS
+// --------------------------------------
+
+// -----------------------
+// Dimensions for DIVs & SPANs
+// -----------------------
+div,
+span,
+div.list {
+  &.wi-smallest     { width:     @div-wi-smallest    ; } //   2.0em
+  &.wi-verysmall    { width:     @div-wi-verysmall   ; } //   4.0em
+  &.wi-small        { width:     @div-wi-small       ; } //   8.8em
+  &.wi-mediumsmall  { width:     @div-wi-mediumsmall ; } //   8.8em
+  &.wi-normal       { width:     @div-wi-normal      ; } //  12.0em
+  &.wi-lightwide    { width:     @div-wi-lightwide   ; } //  12.0em
+  &.wi-wide         { width:     @div-wi-wide        ; } //  18.0em
+  &.wi-wider        { width:     @div-wi-wider       ; } //  24.0em
+  &.wi-verywide     { width:     @div-wi-verywide    ; } //  36.0em
+}
+
+// -----------------------
+// Long Description
+// -----------------------
+// (see also TD.longdesc etc.)
+div.long-description,
+div.long-desc,
+div.longdescription,
+div.longdesc {
+  font-size: @font-size-smaller ;
+
+  &.small {
+    font-size: @font-size-smaller ;
+  }
+  p {
+    margin: 0 0 0.6em 0;
+  }
+  ul,
+  ol {
+    margin-top: 0 ;
+    li { font-size: @font-size-smaller ; }
+  }
+}
+
+// -----------------------
+// Info-Container (description & instructions)
+// -----------------------
+// Description
+// Small info-boxes for the user
+div.description{
+  display: block;
+  float: left ;
+  padding: 0 0 0.6em 0 ;
+
+  // Dimensions
+  &.wi-verysmall    { width: @div-wi-verysmall   ; }
+  &.wi-small        { width: @div-wi-small       ; }
+  &.wi-mediumsmall  { width: @div-wi-mediumsmall ; }
+  &.wi-normal       { width: @div-wi-normal      ; }
+  &.wi-wide         { width: @div-wi-wide        ; }
+  &.wi-lightwide    { width: @div-wi-lightwide   ; }
+  &.wi-wider        { width: @div-wi-wider       ; }
+  &.wi-verywide     { width: @div-wi-verywide    ; }
+
+}
+
+// Instructions
+// Big info boxes for the user, same as cols
+// PENDENT: Mixin fuer Padding, Margin etc. anlegen
+div.instructions {
+  background-color: @instructionbox-bg;
+  border:           @instructionbox-border;
+  border-radius:    @contentbox-radius ;
+  max-width: 70% ;
+  .mx-contentbox-properties ;
+  color: #4C4C4C;
+  font-size: 80%;
+
+  p { width: 30.0em }
+}
+
+// -----------------------
+// Labels & Values (SPAN)
+// -----------------------
+span.label{
+  //color: @base-data-label-color ;
+  font-size: @font-size-smaller ;
+  font-style: normal ;
+  //margin: 0 0.3em 0 0 ; // PENDENT: gehoert nicht hierher
+}
+span.value{
+  color: #000 ;
+  //margin: 0 2.6em 0 0 ; // PENDENT: anschauen, margin-top seltsam
+}
+
+// -----------------------
+// Centered Elements
+// -----------------------
+// Centered blocks
+.center {
+  margin: 0 auto;
+  width: auto;
+}
+
+// -----------------------
+// Accent
+// -----------------------
+// PENDENT: Neue Loesung
+.accent{
+  div.label{
+    float: left ;
+    //color: @base-data-label-color ;
+    font-size: 80% ;
+    //&.wi-mediumsmall{ width: 13.6em; } // PENDENT!
+    padding-top: 0.8em ;
+  }
+  div.data{
+    float: left ;
+    input[type="text"]{
+      width: 20em !important ;
+    }
+  }
+} // /.accent
+
+// -----------------------
+// File Content
+// -----------------------
+// PENDENT: wozu? genügt nicht PRE?
+// /templates/webpages/am/edit_templates.html
+pre.filecontent {
+  border: 1px solid blue;
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
+// -----------------------
+// Hidden Elements
+// -----------------------
+.hidden {
+  display: none ;
+}
+
+// -----------------------
+// Wrapping & text flow
+// -----------------------
+
+// can be used to wrap text in a pre element
+.pre-wrap {
+  white-space: pre-wrap;
+}
+
+// -----------------------
+// Visibility, Height utility classes
+// -----------------------
+.overflow-visible {
+  overflow: visible;
+}
+
+.height-auto {
+  height: auto;
+}
+
+
+// --------------------------------------
+// Wrapper
+// --------------------------------------
+
+// Wrapper for columns & horizontal tables
+.wrapper {
+  overflow:  hidden ;
+  margin:    @contentbox-margin ;
+  padding:   0 0 1.0em 0 ;
+  clear:     both ;
+  display:   block ;
+  border:    1px transparent solid ; // for nice alignment with folded/toggled wrapper
+  width:     98.6%;
+
+  .wrapper { margin-left: 0 !important ; }
+
+  &.test {   background-color: #FFE67C ; }
+
+  .tbl-horizontal,
+  .tbl-plain { float: left ; }
+
+  & > table.tbl-horizontal:last-child{
+    margin-right: 0 ;
+  }
+
+
+  // -----------------------
+  // Toggled Wrapper
+  // -----------------------
+  &.toggled  {
+    display: inline-block !important ;
+    width: 98.6% ;
+    & > table.tbl-horizontal,
+    & > div.col {
+      margin-top: -1.8em ;
+    }
+
+    // -----------------------
+    // Toggle buttons
+    // -----------------------
+    // must be placed on the first position in .wrapper
+    // PENDENT: Plazierung
+    & > .toggles {
+      display:      block ;
+      float:        right        ;
+      position:     relative     ;
+      top:          0            ;
+      margin-top:   4px          ;
+      float:        right        ;
+      width:        100% ;
+
+      a.toggle {
+        //display:    inline-block;
+        display:      block;
+        //width:      18px ;
+        width:      100% ;
+        height:     18px ;
+        background-repeat:        no-repeat;
+        background-position:      50% 50%;
+        &.min,
+        &.max { background-position-x: 99% ; }
+        &.min { background-image: url(../../image/toggle-down.png); }
+        &.max { background-image: url(../../image/toggle-left.png); }
+      }
+    } // /.toggles
+
+
+
+  }
+
+  &.bordered {
+    border:        @controlpanel-border ;
+    border-radius: 4px ;
+  }
+
+
+  // -----------------------
+  // Columns
+  // -----------------------
+  // DIV or TABLE
+  .col {
+    float: left ;
+    &.test {
+      background-color: #FFD7BA;
+      border: 1px #6CF solid;
+    }
+    &.wi-small       { width: @div-wi-small      ; }
+    &.wi-mediumsmall { width: @div-wi-mediumsmall; }
+    &.wi-normal      { width: @div-wi-normal     ; }
+    &.wi-wide        { width: @div-wi-wide       ; }
+    &.wi-lightwide   { width: @div-wi-lightwide  ; }
+    &.wi-wider       { width: @div-wi-wider      ; }
+    &.wi-verywide    { width: @div-wi-verywide   ; }
+
+    .tbl-horizontal,
+    .tbl-plain {
+      float: none ;
+      clear: left ;
+    }
+  } // /.col
+
+  // -----------------------
+  // Paragraph within Wrapper
+  // -----------------------
+  & > p {
+    max-width:       36.0em ;
+    overflow:        hidden ;
+    font-size:       @font-size-smaller ;
+    line-height:     140%;
+    //color:           @gray-darker ;
+    padding-bottom:  1.0em ;
+  }
+
+} // /.wrapper
+
+// --------------------------------------
+// wrapper / classes to override scroll
+// behaviour
+// E.g. used for tables / image preview
+// --------------------------------------
+
+.horizontal-scroll-wrapper {
+  overflow-x: auto !important;
+}
+
+.scroll {
+  overflow: scroll !important;;
+}
+
+// --------------------------------------
+// wrapper to align input-/control-panels
+// next to each other, so that they are
+// using the same height
+// --------------------------------------
+
+.panel-wrapper {
+  display: flex !important;
+  flex-wrap: wrap;
+  gap: 5px;
+}
+
+// --------------------------------------
+// CATEGORIES
+// --------------------------------------
+
+// -----------------------
+// Plus & Minus / Positive & negative
+// -----------------------
+// Inline-Elements
+.plus,
+.minus,
+.plus0,
+.plus1 {
+  clear: none;
+}
+// Negative Values
+.minus,
+.plus0 { color:      @base-negative !important; }
+// Positive Values
+.plus,
+.plus1 { color:     @base-positive !important; }
+
+// unbalanced Ledger
+// PENDENT: wo eingesetzt?
+span.unbalanced_ledger {
+  background-color: @base-warning-bg;
+}
+
+
+// -----------------------
+// Styled Text
+// -----------------------
+// Dimmed Text
+// /templates/webpages/requirement_spec_text_block/_text_block.html
+// /templates/webpages/requirement_spec_item/_section_header.html
+div.dimmed-text,
+span.dimmed-text {
+  color:        @gray-standard;
+  font-style:   italic;
+}
+
+
+
+
+
+// --------------------------------------
+// SPECIALIZED PROPERTIES (REDUNANT)
+// --------------------------------------
+
+// -----------------------
+// Dunned Invoices
+// -----------------------
+//  /templates/webpages/is/form_header.html
+//  /templates/webpages/ar/form_header.html
+.dunned_invoice {
+  font-weight: bold;
+  color: #f00;
+}
+//  /templates/webpages/is/form_header.html
+//  /templates/webpages/ar/form_header.html
+.customer_dunning_level {
+  font-weight: bold;
+  height: auto !important; // override: table td > span.data (forms.less)
+}
+// dunning invoice list
+// /templates/webpages/dunning/show_invoices.html
+#dunning_invoice_list .direct_debit td,
+#dunning_invoice_list .direct_debit a {
+  color: @gray-standard;
+}
+
+// -----------------------
+// Bank transactions
+// -----------------------
+// /templates/webpages/bank_transactions/tabs/automatic.html
+#bank_transactions_proposals .invoice_number_highlight a,
+#bank_transactions_proposals span.invoice_number_highlight {
+  background-color: @color-green-strong;
+  color: #FFFFFF;
+}
+
+// --------------------------------------
+// Diverse Elements
+// --------------------------------------
+// make vertical Space between to elements
+.spacer{
+  clear: both;
+}
+
+
+
+
+
+// --------------------------------------
+// DEPRACETED STUFF (BUT WILL IT BE AVAILABLE FOR A LONGER TIME?)
+// --------------------------------------
+
+// PENDENT: Programmmaesig loesen, vor allem primitive Ueberschriften und "Not records Found"-Meldungen wandeln
+#content {
+  &>p { margin: 0.6em 2.0em 1.0em 0.7em }
+  &>p.message_hint {
+    margin: 0.6em 2.0em 1.0em 1.0em
+  }
+}
diff --git a/css/design40/less/main_login.less b/css/design40/less/main_login.less
new file mode 100755
index 000000000..0a8d46ddb
--- /dev/null
+++ b/css/design40/less/main_login.less
@@ -0,0 +1,138 @@
+/* ------------------------------------------------------------- */
+/* MAIN LOGIN (main_login.less)                                  */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// LOGIN and LOGGED IN PAGE
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Properties for the Login and the Logged In page
+//
+// CONTENTS:
+// - LOGIN
+// - LOGGED IN
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// LOGIN
+// --------------------------------------
+
+div#login,
+div.login {
+  margin: 0 auto; // centered
+  width: 100%;
+  padding: 0 ;
+  text-align: center ;
+
+  h1 {
+    text-align: center;
+    font-size: 150%;
+    top: 0 ;
+    width: 100% ;
+    display: block ;
+    vertical-align: middle;
+    background-color: green ;
+    color: white ;
+    padding: 0.8em 0 ;
+    z-index: 10 ;
+  }
+
+  #login-elements {
+    width: 34.0em ;
+    margin: 0 auto ;
+    text-align: center ;
+    display: block ;
+
+    h3 {
+      text-align: left;
+    }
+
+    >div {
+      text-align: center ;
+      p { text-align: center; }
+    }
+
+    div.logo{
+      width: auto;
+      clear: both;
+      margin: 3.0em auto 1.0em auto ;
+      padding: 2.0em 0 0 0 ;
+    }
+    form{
+      margin: 0 auto ;
+      width: 100% ;
+    }
+
+    div.separate-form{
+      background-color: #ddd ;
+      border: 1px @gray-standard solid;
+      border-radius: @controlpanel-radius ;
+      display: block ;
+      margin: 0 auto ;
+      width: 100% ;
+      padding: 0 0.6em 1.0em 0.6em ;
+    }
+
+    table.login{
+      width: auto ;
+      float: none ;
+      clear: both ;
+      input[type="submit"] {
+        margin-top: 0.2em ;
+      }
+      caption {
+        margin: 0.7em 0 0.4em 0 ;
+      }
+      td select {
+        width: @select-wi-lightwide !important ;
+      }
+    }
+
+    .message {
+      width: 100% ;
+      word-wrap: normal ;
+      min-width: 0;
+      //min-width: auto ;
+      //max-width: inherit ;
+    }
+  } // /.login-elements
+} // /.login
+
+
+
+
+// --------------------------------------
+// LOGGED IN
+// --------------------------------------
+
+div.logged-in {
+  margin: 0 auto ;
+  padding: 1.0em 0.5em 2.0em 0.5em ;
+  width: 60.0em;
+  min-width: 60.0em;
+  overflow: hidden;
+
+  .col {
+    width: 48%;
+    display: inline-block;
+    float: left;
+
+    p {
+      font-size: 10pt ;
+    }
+  }
+  .message{
+    width: 100% ;
+    min-width: 100% ;
+    max-width: 100% ;
+  }
+}
+
+
+
diff --git a/css/design40/less/main_overrides.less b/css/design40/less/main_overrides.less
new file mode 100644
index 000000000..5e56bc890
--- /dev/null
+++ b/css/design40/less/main_overrides.less
@@ -0,0 +1,104 @@
+/* ------------------------------------------------------------- */
+/* MAIN OVERRIDES (main_overrides.less)                          */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// MAIN-OVERRIDE
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Overrides some properties of some selectors
+// This can be useful if some selectors are placed in special containers
+//
+//
+//
+// CONTENTS:
+// - Overrides withing .wrapper
+// -
+// ----------------------------------------------------------------------------
+
+
+// --------------------------------------
+// WRAPPER
+// --------------------------------------
+// Elements within .wrapper
+.wrapper {
+  &>.buttons {
+    padding-left:  0 !important;
+  }
+  .select-item,
+  .form-addition,
+  .input-panel{
+    // PENDENT: noch austesten, falls im .wrapper oder nicht, sonst Ausrichtung noch in anderen containern festlegen
+    margin-left:  0 !important;
+  }
+  & > .col {
+    margin-right: 1.6em ;
+    & > .tbl-horizontal {
+      margin-right: 0 !important ;
+    }
+  }
+  & > .tbl-horizontal {
+//    float: left;
+//    margin-right: 1.6em ;
+  }
+  .tbl-list {
+    //margin-left: 0.2em;
+    caption { padding-left: 0 ; }
+  }
+} // /.wrapper
+
+
+
+
+
+// --------------------------------------
+// TABS
+// --------------------------------------
+#content .ui-tabs-panel div.wrapper:first-child { margin-top: 1.5em ; }
+
+
+.ui-tabs-panel{
+  & > div.select-item {
+    margin: 1.8em 2.0em 0.8em @margin-from-panel-left !important;
+  }
+  & > div.form-addition {
+    margin-left: 0 !important ;
+  }
+} // /.ui-tabs-panel
+
+
+
+
+// --------------------------------------
+// UI-DIALOG
+// --------------------------------------
+.ui-dialog-content { background: #ffffff; }
+.ui-widget-content {background: transparent;}
+
+
+.ui-dialog-content,
+.ui-widget-content {
+  .select-item{
+    margin: 1em 1em 1.0em 0;
+  }
+  .buttons{
+    padding: 1.0em 1.0em 1.0em 0;
+  }
+}
+
+
+
+
+// --------------------------------------
+// CK-EDITOR
+// --------------------------------------
+// revert to default styles for ck-editor
+.ck.ck-editor__editable_inline {
+  ul {
+    padding: revert;
+    list-style: revert;
+  }
+}
diff --git a/css/design40/less/menu.less b/css/design40/less/menu.less
new file mode 100755
index 000000000..c70ce1d2d
--- /dev/null
+++ b/css/design40/less/menu.less
@@ -0,0 +1,600 @@
+/* ------------------------------------------------------------- */
+/* MENU (V3) and HTML MENU (menu.less)                          */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// MENU (V3) and HTML MENU
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+//
+//
+// CONTENTS:
+// - MENUV3
+//   - List-Element general
+//     - Links & Inbound Pseudo Link (DIV)
+//   - Items with Sub Items
+//   - List 1st Level (horizontal)
+//     - List 2nd and 3rd Level (Vertical)
+//     - List 2nd Level (Vertical)
+//     - List 3rd Level (Vertical)
+//
+// - HTML-MENU (LEFT)
+//   - Layout Web Page (LEFT & RIGHT AREA)
+//   - HTML-JS-MENU
+//     - Menue Items
+//     - Top Menu Item (1st Level)
+//     - Sub Menu Item (2nd Level)
+//     - Sub Sub Menu Item (3rd & last Level)
+//
+// - DHTML-MENU (TOP WITH ICONS, JUST OVERRIDES)
+//   - Menu Bar on Top
+//   - Menu-Container Sub (Sub Menu 2nd Level)
+//   - Menu-Item Sub (2nd Level)
+//   - Non-Generic Overrides (With Group Ids
+
+// ----------------------------------------------------------------------------
+
+
+
+
+
+// --------------------------------------
+// MENUV3
+// --------------------------------------
+
+#menuv3 {
+  // Main-Properties of this element in File SCAFFOLDING.LESS
+  background-color: @menu_bg ;
+
+
+
+  // --------------
+  // List-Element general
+  // --------------
+  li {
+    display:       block;
+    position:      relative;
+    float:         none;
+    font-weight:   normal !important ;
+    font-size:     @font-size-smaller;
+    line-height:   96%;
+    white-space:   nowrap;
+    border:        0;
+    padding:       0;
+    margin:        0;
+
+    &:hover {
+      cursor:    pointer;
+    }
+
+    // --------------
+    // Links & Inbound Pseudo Link (DIV)
+    // --------------
+    a,
+    a:visited,
+    div.x,
+    div.x:visited {
+      display:         block;
+      color:           @menu_link;
+      text-decoration: none;
+      padding:         0.45em 0.6em 0.58em 1.3em ;
+      font-weight:     normal;
+      //padding-right: 0.6em;
+    }
+
+  } //  /li (List-Element general)
+
+
+  // --------------
+  // List 1st Level (horizontal)
+  // --------------
+  & > ul {
+    list-style: none;
+    margin:     0;
+    padding:    0;
+    float:      left;
+
+    & > li{
+      display:          block;
+      height:           17px;
+      padding:          9px 0.9em 6px 0.9em;
+      background-color: @menu_bg ;
+      color:            @menu_link ;
+      vertical-align:   middle;
+
+      &:hover {
+        background-color: @menu_link_bg_level1_hover;
+
+        // Display Menu 2nd level
+        > ul {
+          display:  block;
+          position: absolute;
+        }
+      }
+
+
+      // --------------
+      // List 2nd and 3rd Level (vertical)
+      // --------------
+      ul {
+        position: relative;
+        display:  none;
+        padding:  0 2em 2em 2em;
+        margin:   0 -2em -2em -2.8em;
+
+        li{
+          border-bottom: 1px @menu_border_color solid ;
+        }
+      } // /ul (2nd and 3rd Level)
+
+
+      // --------------
+      /* List 2nd Level (Vertical) */
+      // --------------
+      & > ul {
+        top: 32px;
+        z-index: 1000;
+
+        & > li {
+          background-color: @menu_link_bg_level2 ;
+          margin-left:       1px;
+
+          // Items with Sub Items
+          div.x {
+            background:    no-repeat right url("../../image/menu-arrow-to-right-5.png");
+            padding-right: 2.0em ;
+
+            // does not work because text has to be a block
+//            &::after {
+//              content:     "▷" ;
+//              color:       @gray-dark ;
+//              font-size:   120% ;
+//              padding:     0 0 0 1.0em ;
+//              text-align: right ;
+//              display:    inline-box ;
+//            }
+          }
+
+          // List-Item Hover
+          &:hover {
+            color:            @menu_link_hover;
+            background-color: @menu_link_bg_level2_hover;
+
+            // Display Menu 3rd level
+            > ul {
+              display:  block;
+              position: absolute;
+            }
+          }
+
+          // --------------
+          // List 3rd Level (Vertical)
+          // --------------
+          > ul {
+            top:              0;
+            left:             99%;
+            padding:          2em;
+            //margin:       -2em;
+            margin-top:       -2.06em;
+            margin-right:     -2em;
+            margin-bottom:    -2em;
+            margin-left:      -2em;
+            list-style:       none;
+
+            > li {
+              background-color:   @menu_link_bg_level3 ;
+              //border-left:      0.2em solid @menu_border_color;
+
+              &:hover {
+                background-color: @menu_link_bg_level3_hover }
+
+              &:first-child { border-top: 1px #800040 solid ; }
+             }
+
+          } // /ul (3rd level)
+
+        } // />li (2nd level)
+
+      } // /ul List 2nd Level (Vertical)
+
+    } //  />li (1st level)
+
+  } //  /ul (1st level)
+
+} //  /#menuv3
+
+
+//  PENDENT: ??? (ggf. entfernen)
+li.sub {
+  position:         relative;
+  left:             0.2em;
+  top:               0px;
+  background-color: #FFFFFF;
+}
+
+
+
+
+
+// --------------------------------------
+// HTML-MENU (LEFT)
+// --------------------------------------
+
+// --------------------
+// Layout Web Page (LEFT & RIGHT AREA)
+// --------------------
+
+// LEFT (Menu) area/column
+body > div.layout-split-left {
+  display: block;
+  position:         fixed !important;
+  top:               0 ;
+  left:             0 ;
+  width:             200px;
+  height:           100%;
+  z-index:           1;
+  overflow:         hidden   ;
+  border-right:     1px @gray-standard solid;
+  background-color: @gray-dark;
+
+
+}
+
+// RIGHT (Content) area/column
+body > div.layout-split-right {
+  margin-left:   200px;
+  //margin-top:   70px;
+  padding-top: 28px;
+  display:       block;
+  z-index:       1;
+  overflow:     hidden;
+  // PENDENT: das muss dringend geloest werden,
+  // siehe z.B. /am.pl?action=edit_account&callback=am.pl%3faction%3dlist_account&id=6130
+  // Bearbeitung von Konto (wird unten abgeschnitten, falls nicht mit prov. Behelf wie unten)
+  min-height:   800px;
+  height:       auto;
+
+  .layout-actionbar { top: 36px; }
+
+  & > #content {
+    top: 68px;
+    padding-top: 40px;
+
+    h1 { top: 28px !important; }
+
+    & > .wrapper{
+      padding-top: 2em ;
+    }
+    & + div.wrapper {
+      padding-top: 4em ; // funzt nicht
+    }
+
+    & > form {
+      margin-top: 0.6em ;
+
+      & + div.wrapper {
+        padding-top: 4em ;
+      }
+
+
+      & > .tabwidget {
+        & > ui-tabs-panel {
+          //padding-top: 6.0em ;
+          .wrapper{ margin-top: 2em; }
+          .tabwidget ul.ui-tabs-nav{ position: relative; }
+        }
+        & > ul.ui-tabs-nav{
+          top: 69px;
+          width: ~"calc(100% - 200px)";
+        }
+
+      } // / > .tabwidget
+    } // / > form
+    & > #requirement_spec_tabs.tabwidget {
+      & > ul.ui-tabs-nav{ top: 69px !important ; }
+    }
+  }
+
+  // PENDENT: war für Klasse .layout-split-right eingesetzt, wo gebraucht im alten Kivi ?? ggf. entfernen
+  &.folded {
+    margin-left: 40px
+  }
+
+
+
+}
+
+// PENDENT: wo als Klasse gebraucht im alten Kivi ?? ggf. entfernen
+div.layout-split-right.folded {
+  margin-left: 40px
+}
+
+// --------------------
+// HTML-JS-MENU
+// --------------------
+
+div.layout-split-left #html-menu {
+  display:            block;
+  overflow-y:         scroll;
+  overflow-x:         hidden;
+  width:              100%;
+  height:             100%;
+  margin:             27px 0 0 0;
+  padding:            0 0 150px 0;
+  background-color:   @menu_left_bg ;
+  font-size:          @font-size-small;
+  border-bottom:      20px @menu_border_color solid ; // PENDENT: Rand unten sollte vorhanden sein
+
+  // menu item icons (mii) ausblenden
+  .mii {
+    display: none;
+  }
+
+  // scrollbars can be invisible only on Webkit-Browsers
+  &::-webkit-scrollbar {
+    display: none;
+  }
+
+  & > div:last-of-type {
+    border-bottom: @menu_border ; // PENDENT: Rand unten sollte vorhanden sein
+  }
+
+  // -----------------------
+  // Menue-Items
+  // -----------------------
+  .mi {
+    display:       block ;
+    a {
+      display:     block;
+      word-wrap:   break-word;
+      text-decoration: none;
+      font-weight: normal;
+    }
+    &:first-child {
+      border-top: 2px @menu_border_color solid ; // PENDENT: 2px ??? sonst @menu_border verwenden
+    }
+    &:last-child {
+      border-bottom: @menu_border ; // PENDENT: 2px ??? sonst @menu_border verwenden
+    }
+  }
+
+
+  // -----------------------
+  // Top Menu Item (1st Level)
+  // -----------------------
+  .s0 {
+    padding: 0 ;
+    background-color: @menu_left_level_1_bg ;
+    color:             @menu_left_level_1_color;
+    border-top:       @menu_border ;
+    font-size:         90% ;
+    text-transform:   uppercase;
+
+    a {
+      padding:   5px 0 6px 8px ;
+      cursor:   pointer ;
+
+      &:hover,
+      &:active{
+        background-color: @menu_left_level_1_hover_bg ;
+        color:             @menu_left_level_1_hover_color ;
+        //color:             white ;
+        text-decoration:   none;
+      }
+      &:link,
+      &:visited { color: @menu_left_level_1_color ; }
+    }
+
+    &.menu-open{
+      font-weight:       normal;
+      background-color: @menu_open_bg ;
+      color:             @menu_open_color ;
+      border-bottom:     0 ;
+
+      a {
+        padding:         5px 0 6px 8px ;
+        cursor:         auto ;
+
+        &:hover,
+        &:active{
+          background-color: @menu_open_bg ;
+          color:             @menu_open_color ;
+          text-decoration:   none;
+        }
+        &:link,
+        &:visited { color:   @menu_open_color ; }
+      }
+    }
+  } // /.s0
+
+  // -----------------------
+  // Sub Menu Item (2nd Level)
+  // -----------------------
+  .s1{
+    font-size: 80% ;
+    padding: 0 ;
+    background-color: @menu_left_level_2_bg ;
+    border-top:       @menu_border ;
+
+    a {
+      padding:         4px 0 3px 8px ;
+
+      &:hover,
+      &:active{
+        background-color: @menu_left_level_2_hover_bg ;
+        color:             @menu_left_level_2_hover_color ;
+        text-decoration:   none;
+      }
+      &:link,
+      &:visited { color:   @menu_left_level_2_color ; }
+    }
+
+    // has submenu (has 3rd-Level menu)
+    &.sm{
+      &:after{
+        content:     "▼" ;
+        color:       @gray-standard ;
+        font-size:   80% ;
+      }
+      a {
+        display:   inline-block ;
+        width:     162px; // with scrollbar{ display:none; } 174px is possible, works only with ::-webkit-scrollbar
+        color:     @menu_left_level_2_color ;
+
+        &:hover,
+        &:active{
+          background-color:   @menu_left_level_2_bg ;
+          color:               @menu_left_level_2_color ;
+          text-decoration:     none ;
+        }
+        &:link,
+        &:visited { color:     @menu_left_level_2_color ; }
+
+        &.ml:link,
+        &.ml:visited{ color:   @menu_left_level_2_color ; }
+      }
+    }
+    & > .s2:last-child {       border-bottom: @menu_border ; }
+
+  } // /.s1
+
+  // -----------------------
+  // Sub Sub Menu Item (3rd & last Level)
+  // -----------------------
+  .s2{
+    padding:           0 ;
+    font-size:         80% ;
+    background-color: @menu_left_level_3_bg ;
+
+    a {
+      padding:         2px 0 3px 20px ;
+
+      &:hover,
+      &:active{
+        background-color:   @menu_left_level_3_hover_bg ;
+        color:               @menu_left_level_3_hover_color ;
+        text-decoration:     none;
+      }
+      &:link,
+      &:visited { color:     @menu_left_level_3_color ; }
+    }
+
+  } // /.s2
+} // /#html-menu
+
+
+
+
+
+// --------------------------------------
+// DHTML-MENU (TOP WITH ICONS, JUST OVERRIDES)
+// --------------------------------------
+
+#main_menu_div {
+
+  // -----------------------
+  // Menu Bar on Top
+  // -----------------------
+
+  .DHTMLSuite_menuBar_top {
+    top:         28px;
+    height:     31px !important;
+    padding:     0;
+    margin:     0 ;
+
+    // -----------------------
+    // Menu Item on Top
+    // -----------------------
+    // Menu Item on Top, generic
+    // same as .DHTMLSuite_menuItem_top_* below
+    & > div {
+      padding: 5px 5px 0 3px ;
+
+      // Container with useless icon
+      div:first-child { }
+      // Text Menu Item top
+      .DHTMLSuite_menuItem_textContent {
+        font-size:   90% ;
+        padding:     0.1em 0.2em 0.2em 0.2em ;
+      }
+      // Arrow down Top
+      .DHTMLSuite_menuItem_top_arrowShowSub {
+          margin:   0 0.2em 0.2em 0.2em ;
+      }
+    } // / > div (Menu Item on Top, generic)
+
+    // Menu Item on Top with funny classes
+
+    .DHTMLSuite_menuItem_top_regular,
+    .DHTMLSuite_menuItem_top_over,
+    .DHTMLSuite_menuItem_top_click,
+    .DHTMLSuite_menuItem_top_disabled,
+    .DHTMLSuite_menuItem_top_active {
+      height: 19px;
+    }
+    .DHTMLSuite_menuItem_top_regular { }
+    // Hover
+    .DHTMLSuite_menuItem_top_over,
+    .DHTMLSuite_menuItem_top_click {
+      color:             @color-red-strong ;
+      background-color: @base-superlight ;
+      .DHTMLSuite_menuItem_top_arrowShowSub{
+        border:         none !important ;
+      }
+    }
+    // Clicked with Submenu
+    .DHTMLSuite_menuItem_top_click { }
+
+  } // /.DHTMLSuite_menuBar_top
+
+} // /#main_menu_div
+
+
+// -----------------------
+// Menu-Container Sub (Sub Menu 2nd Level)
+// -----------------------
+.DHTMLSuite_menuBar_sub {
+  width:           auto !important;
+  padding:         0.1em 0 0.4em 0.4em !important;
+  margin:         11px 0 0 0;
+  border-top:     none;
+  border-right:   1px solid @base-lighter;
+  border-bottom:   1px solid @base-lighter;
+  border-left:     1px solid @base-lighter;
+
+  // -----------------------
+  // Menu-Item Sub (2nd Level)
+  // -----------------------
+  .DHTMLSuite_menuItem_sub_regular,
+  .DHTMLSuite_menuItem_sub_over,
+  .DHTMLSuite_menuItem_sub_click,
+  .DHTMLSuite_menuItem_sub_disabled,
+  .DHTMLSuite_menuItem_sub_active {
+    clear:               both;
+    padding-left:       25px;
+    padding-right:       0.7em;
+    padding-top:         0.2em;
+    padding-bottom:     0.2em;
+    cursor:             pointer;
+    background-repeat:   no-repeat;
+    font-size:           90%;
+
+    .DHTMLSuite_menuItem_sub_arrowShowSub {
+      right:             3px !important;
+    }
+  }
+  // Regular
+  .DHTMLSuite_menuItem_sub_regular{
+    a.DHTMLSuite_menuItem_textContent{  }
+  }
+  // Hover & Active
+  .DHTMLSuite_menuItem_sub_over,
+  .DHTMLSuite_menuItem_sub_active {
+    color: @color-orange-strong ;
+    background-color: @base-superlight;
+  }
+
+} // /.DHTMLSuite_menuBar_sub
diff --git a/css/design40/less/menu_actionbar.less b/css/design40/less/menu_actionbar.less
new file mode 100755
index 000000000..6beb3b26b
--- /dev/null
+++ b/css/design40/less/menu_actionbar.less
@@ -0,0 +1,212 @@
+/* ------------------------------------------------------------- */
+/* Menu Actionbar (menu_actionbar.less)                          */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// ACTIONBAR
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Contextual Menu and Buttons for Kivitendo
+// Save, Update, Post and Workflow Buttons etc.
+//
+//
+// CONTENTS:
+// - layout-actionbar
+//   - layout-actionbar-separator
+//   - layout-actionbar-action
+//   - layout-actionbar-link
+//   - layout-actionbar-combobox
+//     - layout-actionbar-combobox-head
+//     - layout-actionbar-combobox-list
+// ----------------------------------------------------------------------------
+
+
+
+// --------------------------------------
+// Main-Container for Actionbar
+// --------------------------------------
+//
+// for main properties of this container see scaffolding.less
+.layout-actionbar {
+
+  div.layout-actionbar-separator {
+    display: block;
+    width: 0.6em;
+    height: 0.6em;
+    float: left;
+    content: "&nbsp;";
+    position: relative;
+    border: none;
+  }
+
+  div.layout-actionbar-action {
+    -webkit-touch-callout: none;
+    -webkit-user-select:   none;
+    -khtml-user-select:    none;
+    -moz-user-select:      none;
+    -ms-user-select:       none;
+    user-select:           none;
+    height: 25px;
+    font-size: @font-size-smaller ;
+    
+    &.layout-actionbar-action-disabled{
+      color: @actionbar-font-color-disabled !important;
+      &:hover{ text-decoration: none !important; }
+    }
+  }
+
+  & > div.layout-actionbar-action{
+    border-radius: @actionbar-border-radius ;
+    border: 1px @actionbar-border-color solid;
+    background-color: @actionbar-bg ;
+    float: left;
+    color: @actionbar-font-color;
+    z-index: @zindex-actionbar-action ;
+  }
+
+  div.layout-actionbar-action-disabled,
+  div.layout-actionbar-action-disabled:hover{  }
+
+
+
+  div.layout-actionbar-link,
+  div.layout-actionbar-submit,
+  div.layout-actionbar-scriptbutton {
+    display: block;
+    min-width: 90px;
+    width: auto;
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
+    text-align: center;
+    padding: 4px 10px;
+    cursor: default;
+    &:focus{
+      border-color: darkgray; // PENDENT: Button Border
+      background-color: @actionbar-bg-active;
+    }
+    &:hover {
+      border-width: 1px;
+      border-style: solid;
+    }
+  }
+
+  .layout-actionbar-default-action {
+    font-weight: normal;
+  }
+
+  div.layout-actionbar-combobox {
+    position: relative;
+    display: block;
+    float: left;
+    //width: 5.8em;
+    width: 110px;
+    z-index: @zindex-actionbar-combobox ;
+
+    div.layout-actionbar-combobox-head {
+      padding-right: 20px;
+      white-space: nowrap;
+      display: block;
+      margin-bottom: -1px;
+      float: right;
+      z-index: @zindex-actionbar-combobox-head ;
+      position: relative;
+
+      >div {
+        //width: 5.4em;
+        min-width: 90px;
+        height: 25px;
+        border-top-left-radius: @actionbar-border-radius ;
+        border-bottom-left-radius: @actionbar-border-radius ;
+        border: 1px @actionbar-border-color solid;
+        background-color: @actionbar-bg;
+        color: @actionbar-font-color;
+        position: relative;
+      }
+
+      > span {
+        display: block;
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 24px !important;
+        height: 25px !important;
+        border: 1px @actionbar-border-color solid;
+        border-left: none;
+        border-top-right-radius: @actionbar-border-radius ;
+        border-bottom-right-radius: @actionbar-border-radius ;
+        padding: 4px;
+        background-color: @actionbar-bg ;
+        //background-image: url("../../image/select-down.png") no-repeat;
+        background-image: url("../../image/select-down.png") ;
+        background-repeat: no-repeat;
+        background-position: 5px 5px;
+      }
+    } // /.layout-actionbar-combobox-head
+
+    div.layout-actionbar-combobox-list {
+      position: relative;
+      display: none;
+      min-width: 140px;
+      float: right;
+      overflow: hidden;
+      border: 1px solid @actionbar-border-color ;
+      border-top-left-radius: @actionbar-border-radius;
+      border-bottom-left-radius: @actionbar-border-radius;
+      border-bottom-right-radius: @actionbar-border-radius;
+      z-index: @zindex-actionbar-combobox-list ;
+      top: 1px;
+      //padding-bottom: 0.6em;
+      background-color: @actionbar-bg ;
+
+      div.layout-actionbar-action {
+        white-space: nowrap;
+        display: block;
+        position: relative;
+        width: 100%;
+        text-align: left;
+        padding: 0.6em 0.6em 0.6em 1.0em;
+        border-bottom: none !important;
+        background-color: @actionbar-bg ;
+        color: @actionbar-font-color;
+
+        // PENDENT: *-active ersetzen durch -hover
+        &:hover {
+          color: @actionbar-font-color-active;
+          text-decoration: underline;
+          background-color: @actionbar-bg-active;
+        }
+      }
+    } // /.layout-actionbar-combobox-list
+
+    // Combobox active
+    &.active {
+      div.layout-actionbar-combobox-head{
+        height: 29px;
+        border-bottom: none !important ;
+
+        div {
+          //background-color: @actionbar-bg-active !important ;
+          border-bottom-left-radius: 0 !important;
+          border-bottom: none;
+          height: 30px ;
+        }
+        span {
+          //background-color: @actionbar-bg-active !important ;
+          border-bottom-right-radius: 0 !important;
+          border-bottom: none;
+          height: 30px !important ;
+        }
+      } // /div.layout-actionbar-combobox-head
+      div.layout-actionbar-combobox-list {
+        display: inline-table; // IMPORTANT
+        border-top-right-radius: 0 !important;
+        div.layout-actionbar-action{
+          border: none !important;
+        }
+      }
+    } // /.active
+  } // /.layout-actionbar-combobox
+}
diff --git a/css/design40/less/menu_frame_header.less b/css/design40/less/menu_frame_header.less
new file mode 100755
index 000000000..db39872b4
--- /dev/null
+++ b/css/design40/less/menu_frame_header.less
@@ -0,0 +1,146 @@
+/* ------------------------------------------------------------- */
+/* MENU FRAME HEADER (menu_frame_header.less)                    */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// FRAME-HEADER (DASHBOARD)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// The Frame-Header is always on top of every Kivitendo-Page visible
+// and offers Quick Search functions, a Log Out-Link and more
+//
+// CONTENTS:
+// - FRAME-HEADER
+// - FRAME-HEADER-ELEMENTS (Links left & right)
+// - AJAX-SPINNER (Beach Ball)
+// - QUICK-SEARCH
+// ----------------------------------------------------------------------------
+
+
+#frame-header {
+
+    text-align: left;
+    margin: 0;
+    padding: 0.2em 0.6em;
+    border: 0;
+    overflow: hidden;
+    height: 28px;
+    width: 100%;
+    display: table-cell;
+    vertical-align: middle;
+    border-spacing: 0;
+
+    background-color: @dashbrd_bg;
+    line-height: 100%;
+    font-size: @font-size-smaller ;
+
+    + div {
+        // see main.less
+    }
+
+
+    // --------------------------------------
+    // FRAME-HEADER-ELEMENTS (Left & Right)
+    // --------------------------------------
+
+    span.frame-header-element {
+        color: @dashbrd_text ;
+        padding-top: 0.2em;
+
+        a:link,
+        a:visited,
+        a:hover,
+        a:active {
+            text-decoration: none;
+            border-bottom: none;
+            color: @dashbrd_link ;
+        }
+
+        a:hover{
+            color: @dashbrd_link_hover ;
+            text-decoration: @dashbrd_link_deco; /*underline*/
+        }
+        span.client{
+          text-transform: uppercase ;
+          font-size: 130% ;
+        }
+    } // /span.frame-header-element
+
+
+    span.frame-header-left,
+    span.frame-header-center,
+    span.frame-header-right    {
+        border-spacing: 0;
+        padding: 0;
+        vertical-align: middle;
+        height: 100%;
+        display: table-row;
+
+        & > span {
+          height: 24px;
+          margin: 0 10px;
+          display: table-cell ;
+          vertical-align: middle;
+        }
+    }
+
+    span.frame-header-left {
+        float: left;
+        padding: 0 1.0em 0 0.2em ;
+        margin-right: 1.0em ;
+        & > span { padding-right: 1.0em ; }
+    }
+    span.frame-header-right {
+        float: right;
+        vertical-align: middle;
+        padding: 0 1.2em 0 1.0em ;
+        margin-left: 1.0em;
+        & > span { padding-left: 1.0em ; }
+    }
+
+
+
+    // --------------------------------------
+    // AJAX-SPINNER (Beach Ball)
+    // --------------------------------------
+
+    #ajax-spinner {
+      display: none;
+    }
+
+
+
+    // --------------------------------------
+    // QUICK-SEARCH
+    // --------------------------------------
+
+    div.frame-header-quicksearch{
+      display: block;
+      overflow: hidden;
+      margin: 0.1em auto 0 auto;
+      text-align: center;
+      width: auto;
+
+      span.frame-header-quicksearch input {
+        font-size: @font-size-smaller;
+        //font-family: @font-family-sans-serif ;
+        margin-top: 0.1em;
+        background-color: @dashbrd_input_bg ;
+        width: auto !important;
+        min-width: 5em;
+        max-width: 7em;
+        padding: 0 0.2em ;
+        border-width: 1px ;
+        //border-color: #bcbcbc;
+        border-style: solid;
+        border-top-color: #949494;
+        border-right-color: #BCBCBC;
+        border-bottom-color: #BCBCBC;
+        border-left-color: #949494;
+      }
+    } // /div.frame-header-quicksearch
+
+} /* /#frame-header  */
diff --git a/css/design40/less/messages.less b/css/design40/less/messages.less
new file mode 100644
index 000000000..4ea85054c
--- /dev/null
+++ b/css/design40/less/messages.less
@@ -0,0 +1,465 @@
+/* ------------------------------------------------------------- */
+/* MESSAGES (messages.less)                                      */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// MESSAGES
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: all kind of messages
+//
+//
+// CONTENTS:
+// - MESSAGES & WARNINGS
+//   - Messages (Depraceted)
+//   - Flash Messages
+// ----------------------------------------------------------------------------
+
+
+
+
+
+// --------------------------------------
+// MESSAGE MIXIN
+// --------------------------------------
+
+.mx-message {
+  display:       block;
+  overflow:      hidden;
+  overflow-x:     auto;
+  clear:         both ;
+
+  width:         auto;
+  min-width:     @messages-min-width ;
+  max-width:     @messages-max-width ;
+
+  padding:       0.6em 0.8em ;
+
+  border-radius: @controlpanel-radius;
+  border-style:  solid;
+  border-width:  1px;
+
+  font-size:     @font-size-smaller ;
+  font-weight:   normal;
+  line-height:   110% ;
+  text-align:    left;
+  white-space:   normal;
+}
+
+
+
+
+
+
+// --------------------------------------
+// MESSAGES & FLASH MESSAGES
+// --------------------------------------
+.flash_message,
+.message {
+  &,
+  &_error,
+  &_ok,
+  &_hint,
+  &_warning,
+  &_info{
+    .mx-message ;
+  }
+} // /.flash_message
+
+
+
+
+// --------------------------------------
+// MESSAGES (SIMPLE STYLE)
+// --------------------------------------
+
+.message {
+
+  // -----------------------
+  // ERROR
+  // -----------------------
+  &_error {
+    color:            @message_error_text;
+    background-color: @message_error_bg;
+    border-color:     @message_error_border;
+    h4{ color:        @message_error_text; }
+    p { color:        @message_error_text; }
+  }
+  // -----------------------
+  // Warning
+  // -----------------------
+  &_warning {
+    color:            @message_warning_text;
+    background-color: @message_warning_bg;
+    border-color:     @message_warning_border;
+    h4{ color:        @message_warning_text; }
+    p { color:        @message_warning_text; }
+  }
+  // -----------------------
+  // INFO / HINT
+  // -----------------------
+  &_hint,
+  &_info {
+    color:            @message_hint_text;
+    background-color: @message_hint_bg;
+    border-color:     @message_hint_border;
+    h4 { color:       @message_hint_text ; }
+    p  { color:       @message_hint_text ; }
+  }
+  // -----------------------
+  // OK
+  // -----------------------
+  &_ok {
+    color:            @message_ok_text;
+    background-color: @message_ok_bg;
+    border-color:     @message_ok_border;
+    h4{ color:        @message_ok_text; }
+    p { color:        @message_ok_text; }
+  }
+  // -----------------------
+  // ATTENTION (PENDING)
+  // -----------------------
+  // PENDENT: noch aktuell? ggf. durch Hint ersetzen
+  &.attention{
+    color:            @message_hint_text;
+    background-color: @message_hint_bg;
+    border-color:     @message_hint_border;
+    h4 { color:       @message_hint_text ; }
+    p  { color:       @message_hint_text ; }
+  }
+  // -----------------------
+  // TYPOGRAPHY
+  // -----------------------
+  h4{
+    font-weight: bold;
+    font-size: 110%;
+    margin: 0.4em 1.0em 0.2em 0 ;
+    padding: 0;
+  }
+  p{
+    margin: 0 1.0em 0.6em 0 ;
+    padding: 0;
+  }
+
+  // PENDENT: GGF. entfernen
+  &_error,
+  &_warning,
+  &_hint,
+  &_info,
+  &_ok {
+    // PENDENT: wieso wird in einem DIV-Container nochmals ein Paragraf mit der gleichen Klasse ausgegeben?
+    // ggf. entfernen
+    & > .message {
+      &_error,
+      &_warning,
+      &_hint,
+      &_info,
+      &_ok{
+        display: none;
+      }
+    }
+  } // /_TYPE of messages
+} // /.message
+p.message{ padding: 0.6em !important ; }
+
+
+// -----------------------
+// Message blocks in different levels in the #content
+// -----------------------
+#content {
+  & > form {
+
+	// -----------------------
+	// Message Immediately In Form
+	// -----------------------
+    & > .message,
+    & > .ui-tabs > .ui-tabs-panel > .message {
+      margin-top:     @margin-left-from-content;
+      margin-right:   0;
+      margin-bottom:  @margin-left-from-content;
+      margin-left:    @margin-left-from-content;
+
+      &.message_ok,
+      &.message_info,
+      &.message_hint,
+      &.message_error,
+      &.message_warning{
+        margin-left: @margin-left-from-content ;
+      }
+    } // .message
+
+
+    & > .message_ok,
+    & > .message_info,
+    & > .message_hint,
+    & > .message_error,
+    & > .message_warning{
+      margin-top:     @margin-left-from-content;
+      margin-right:   0;
+      margin-bottom:  @margin-left-from-content;
+      margin-left:    @margin-left-from-content;
+    }
+
+    // -----------------------
+    // Message Immediately In Wrapper
+    // -----------------------
+    .wrapper{
+      & > .message,
+      & > .message_ok,
+      & > .message_info,
+      & > .message_hint,
+      & > .message_error,
+      & > .message_warning{
+        margin: @margin-from-wrapper ;
+      }
+    }
+
+  } // /form
+} // /#content
+
+// -----------------------
+// Message on the welcome screen
+// -----------------------
+body > div.login .message{
+  width: 100% ;
+  text-align: center ;
+  margin: 0 auto 1.0em auto ;
+}
+
+
+
+
+
+
+
+// --------------------------------------
+// FLASH MESSAGES
+// --------------------------------------
+
+.flash_message {
+
+  // General (apears two times within a .flash_message)
+
+  // -----------------------
+  // Error
+  // -----------------------
+  &.flash_message_error {
+    background-color: @message_error_bg;
+    border-color: @message_error_border;
+    color: @message_error_text;
+    a.button.wi-tiny,
+    a.icon-close {
+      border: @message_error_border !important;
+      color: @message_error_text;
+    }
+  }
+  // -----------------------
+  // OK
+  // -----------------------
+  &.flash_message_ok {
+    background-color: @message_ok_bg;
+    border: @message_ok_border;
+    color: @message_ok_text;
+    a.button.wi-tiny,
+    a.icon-close {
+      border: @message_ok_border;
+      color: @message_ok_text;
+    }
+  }
+  // -----------------------
+  // Warning
+  // -----------------------
+  &.flash_message_warning {
+    background-color: @message_warning_bg;
+    border-color: @message_warning_border;
+    color: @message_warning_text;
+    a.button.wi-tiny,
+    a.icon-close {
+      border: @message_warning_border;
+      color: @message_warning_text;
+    }
+  }
+  // -----------------------
+  // Info / Hint
+  // -----------------------
+
+  &.flash_message_info {
+    background-color: @message_info_bg;
+    border: @message_info_border;
+    color: @message_info_text;
+    a.button.wi-tiny,
+    a.icon-close {
+      border: @message_info_border;
+      color: @message_info_text;
+    }
+  }
+
+
+
+	// -----------------------
+	// Elements in .flash_message
+	// -----------------------
+
+  .flash_title {
+    font-weight: bold;
+    float: left;
+    display: block ;
+    padding-right: 1.0em ;
+  }
+  .flash_notification{
+    float: left;
+    display: block ;
+  }
+
+  // Buttons (Details & Close)
+  a.button.wi-tiny {
+    font-size: 76% ;
+    padding: 0 0.2em 0 0.2em ;
+    margin: 0 0.4em 0 0.4em  ;
+    width: auto ;
+    background-color: transparent;
+  }
+  a.icon-close {
+    //display: block ;
+  }
+
+  div.button-container,
+  div.icon-container  {
+    overflow: hidden ;
+    width: 12% ;
+    float: right ;
+
+    a.icon-close {
+      font-size: 76% ;
+      float: right ;
+      border-width: 1px ;
+      border-style: solid ;
+      padding: 0 3px ;
+      border-radius: 3px;
+    }
+    span.display {
+      float: right !important;
+      display: block;
+      width: auto ;
+      text-align: right ;
+      margin: 0 ;
+      padding: 0;
+      a.button { }
+    }
+  } // /div.icon-container
+
+  div.message-container {
+    overflow: hidden ;
+    width: 86% ;
+    float: left ;
+
+    &>span.flash_title {
+      display: block;
+      float: left ;
+      width: auto ;
+    }
+    & > div.flash_notification {
+      display: block;
+      float: left ;
+      max-width: 80% ;
+      width: auto ;
+
+      span.content {
+        float: left ;
+        display: block;
+        width: 100% ;
+      }
+      div.detail {
+        display: block;
+        clear: both ;
+        padding-top: 0.9em ;
+
+        span {
+          display: block;
+          width: 94%;
+          float: right;
+        }
+        a.button.wi-tiny{
+          display: block ;
+          float: left ;
+          margin-left: 0 ;
+        }
+      }
+    } // /.div.flash_notification
+  } // /div.message-container
+} // /.flash_message
+
+
+
+// -----------------------
+// Flash Message blocks in different levels in #content
+// -----------------------
+
+#content {
+
+  & > form {
+
+    // Flash message immediately in form
+    & > .flash_message {
+      &_error,
+      &_ok,
+      &_warning,
+      &_info{
+        margin: 48px 0 0 @margin-left-from-content ;
+      }
+    } // /.flash_message
+
+
+    // Flash message in .ui-tabs
+    .ui-tabs-panel{
+      & > .flash_message {
+        &_error,
+        &_ok,
+        &_warning,
+        &_info{
+          margin: 48px 0 0 @margin-left-from-content ;
+        }
+      } // /.flash_message
+    } // /.ui-tabs
+
+
+    // Flash message within .wrapper
+    .wrapper {
+      .flash_message {
+        margin: @margin-from-wrapper ;
+        &_error,
+        &_ok,
+        &_warning,
+        &_info{
+          margin: @margin-from-wrapper ;
+        }
+      } // /.flash_message
+    } // /.wrapper
+
+  } // /form
+
+  // Flash message immediately in #content
+  & > .flash_message {
+    &_error,
+    &_ok,
+    &_warning,
+    &_info{
+      margin: 24px 0 0 @margin-left-from-content ;
+    }
+  }
+
+} // /#content
+
+
+
+// -----------------------
+// Flash Messages in the admin area
+// -----------------------
+
+#admin {
+  .flash_message {
+    margin: 48px 0 0 @margin-left-from-content ;
+  }
+}
diff --git a/css/design40/less/mixins.less b/css/design40/less/mixins.less
new file mode 100644
index 000000000..c57de97c6
--- /dev/null
+++ b/css/design40/less/mixins.less
@@ -0,0 +1,135 @@
+/* ------------------------------------------------------------- */
+/* MIXINS (mixins.less)                                          */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// MIXINS (general sitewide properties)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Mixins can be used like variables and be written like a CSS-class
+// Do not apply these classes onto selectors but apply besides other properties
+// within a selector
+//
+// CONTENTS:
+// - H3 & CAPTION
+// - CONTENT-BLOCKS (Content-Boxes)
+// - -
+// -
+// -
+// -
+//
+// ----------------------------------------------------------------------------
+
+
+
+// --------------
+// H3
+//
+// Mixin, no class to apply in selectors
+// see H3 in main.less
+// see also Caption in tables.less
+.mx-h3-caption {
+  font-size :  @table-caption-size ;
+  //font-style:  @h3-style;
+  font-weight: @h3-weight;
+  color:       @table-caption-color !important ;
+  padding:     0.2em 0 0.2em 0.2em;
+	margin: 0.1em 0 0.4em 0 ;
+  //margin:      0;
+  text-align:  left;
+  letter-spacing: 0.12em;
+}
+
+// -------------------
+// Content-BLOCKS (Content-Boxes)
+//
+.mx-contentbox-properties {
+  margin:  @contentbox-margin ;
+  padding: @contentbox-padding;
+}
+
+
+//  --------------------------------------
+//  Tables
+//  --------------------------------------
+.mx-thead-th {
+  color:            @t-cell-head-text ;
+  background-color: @t-cell-head-bg ;
+  border-top:       1px solid @table-border-color;
+  border-bottom:    1px solid @table-border-color;
+  text-align:       left ;
+  vertical-align:   middle ;
+}
+//  --------------------------------------
+//  Buttons
+//  --------------------------------------
+.mx-button {
+  display:       inline-block ;
+  cursor:        pointer ;
+  width:         auto ;
+  padding:       0.2em 0.6em;
+  font-size:     @font-size-smaller ;
+  font-weight:   normal;
+  font-style:    normal;
+  text-align:    center;
+  border-style:  solid;
+  border-width:  1px;
+  border-radius: @button-border-radius;
+}
+// -------------------
+// STRONG
+//
+// for links, labels, buttons (no :link pseudo class)
+.mx-button-standard{
+  border:     			@button-strong-border ;
+  background-color: @button-strong-bg ;
+  color:            @button-strong-color ;
+  text-decoration:  none;
+}
+// for hover, focus, active pseudo classes
+.mx-button-standard-hover-focus{
+  &:hover{
+    border:     			@button-strong-hover-border ;
+    background-color: @button-strong-hover-bg;
+    color:            @button-strong-hover-color;
+    text-decoration:  none;
+  }
+  &:active,
+  &:focus{
+    border			:     @button-strong-active-border ;
+    background-color: @button-strong-active-bg;
+    color:            @button-strong-active-color;
+    text-decoration:  none;
+  }
+}
+// -------------------
+// NEUTRAL
+//
+// for links, labels, buttons (no :link pseudo class)
+.mx-button-neutral {
+  border:     			@button-neutral-border ;
+  background-color: @button-neutral-bg;
+  color:            @button-neutral-color;
+}
+// for hover, focus, active pseudo classes
+.mx-button-neutral-hover-focus {
+  &:hover{
+    border:    				 	@button-neutral-hover-border ;
+    background-color: 	@button-neutral-hover-bg;
+    color:            	@button-neutral-hover-color;
+    text-decoration:  	none;
+  }
+  &:active,
+  &:focus{
+    border:     			@button-neutral-active-border ;
+    background-color: @button-neutral-active-bg;
+    color:            @button-neutral-active-color;
+    text-decoration:  none;
+  }
+}
+
+
+
+
diff --git a/css/design40/less/print.less b/css/design40/less/print.less
new file mode 100644
index 000000000..082c6c83d
--- /dev/null
+++ b/css/design40/less/print.less
@@ -0,0 +1,251 @@
+/* ------------------------------------------------------------- */
+/* PRINT (print.less)                                            */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// PRINT
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION: Statements for print issues
+//
+// CONTENTS:
+//
+// ----------------------------------------------------------------------------
+
+
+// --------------------------------------
+// MEDIA: Print
+// --------------------------------------
+
+// PENDENT: Druckversion erstellen, noch erweitern
+
+@print-size: 0.8 ;
+@width-size: 0.6 ;
+
+@media print {
+
+  body{ margin-left: 1.4em ; }
+
+  // Do not print following areas
+  #menuv3,
+  #html-menu,
+  #frame-header,
+  #main_menu_div,
+  #js-header,
+  body>div.layout-split-left,
+  #tree-column,
+  ul.ui-tabs-nav,
+  div.layout-actionbar,
+  .control-panel,
+  .input-panel,
+  .toggles {
+    display: none !important;
+  }
+
+  // Layout adjustments
+  body>div.layout-split-right{
+    margin-left: 0 !important;
+  }
+  //#content.html-menu { margin-left: 0; }
+
+
+  .wrapper.toggled > table.tbl-horizontal,
+  .wrapper.toggled > div.col {
+    margin-top: 0 !important ;
+  }
+  div.buttons.positions{
+    display: none;
+    margin: 0 0 0 0 !important;
+  }
+
+
+  #content {
+
+    // Typography
+    td, p, div, span, input, textarea, select, option {
+      //font-size: round( ( @font-size-smaller * @print-size ) ) !important ;
+      font-size: round( ( 9pt * @print-size ) , 0 ) !important ;
+    }
+
+//    font-size: 80% !important ;
+    padding:  1.0em 0 0 0 !important ;
+    margin:   0 ;
+
+    & > h1 {
+        color:    @gray-verydark ;
+        padding:  0 0 0 0 ;
+        top:      0 ;
+        position: absolute ;
+    }
+
+    wrapper{
+      margin:   0.4em 1em 1em 1.2em;
+      padding:  0 0 0.4em 0;
+    }
+
+    caption,
+    th.caption,
+    td.caption{
+
+      font-size :   round( (@table-caption-size * @print-size) , 0 ) ;
+      font-weight:  bold;
+      padding:      0.1em 0 0.1em 0.2em;
+      margin:       0.1em 0 0.1em 0 ;
+      display:      table-cell ;
+
+    }
+
+    .tbl-horizontal {
+      tbody {
+        tr {
+          //background-color: @table-bg-accent ;
+          //th { background-color: #fff ; }
+          td, th {
+            border-color:   @table-border-color ;
+            border-width:   0.3pt !important;
+            border-style:   solid ;
+            padding:        0.3em 0.6em ;
+          }
+        th, span.label { font-size: round( ( @font-size-verysmall * @print-size ) )!important }
+        }
+      } // /tbody
+    }
+
+
+    .tbl-list {
+      margin-top: 1.2em ;
+      width: 96% !important ;
+      caption{
+        margin: 0 !important ;
+        padding: 0 !important ;
+      }
+      thead  {
+        //display:  table-header-group ;
+        overflow: hidden ;
+        tr th{
+          font-size: 70% ;
+        }
+      }
+      tbody tr {
+        &:nth-child(odd)  { background-color: none; }
+        &:nth-child(even) { background-color: none; }
+        border-bottom: 1px #000 solid !important;
+        td {
+          border-bottom:  1px #000 solid !important;
+          vertical-align: top !important ;
+        }
+      }
+    }
+
+      // -----------------------
+      //  width of columns (dimensions)
+      // -----------------------
+      col {
+        &.wi-smallest    { width: round( (@tcol-wi-smallest * @width-size ) , 0     )!important ; }
+        &.wi-verysmall   { width: round( (@tcol-wi-verysmall * @width-size ) , 0    )!important ; }
+        &.wi-small       { width: round( (@tcol-wi-small * @width-size ) , 0        )!important ; }
+        &.wi-mediumsmall { width: round( (@tcol-wi-mediumsmall * @width-size ) , 0  )!important ; }
+        &.wi-normal      { width: round( (@tcol-wi-normal * @width-size ) , 0       )!important ; }
+        &.wi-lightwide   { width: round( (@tcol-wi-lightwide * @width-size ) , 0    )!important ; }
+        &.wi-wide        { width: round( (@tcol-wi-wide * @width-size ) , 0         )!important ; }
+        &.wi-wider       { width: round( (@tcol-wi-wider * @width-size ) , 0        )!important ; }
+        &.wi-verywide    { width: round( (@tcol-wi-verywide * @width-size ) , 0     )!important ; }
+      }
+
+
+
+
+
+
+
+
+    input[type="text"],
+    input[type="customer"],
+    input.numeric,
+    textarea,
+    select,
+    span.data,
+    select,
+    textarea {
+      width: auto         !important;
+      appearance:         none !important;
+      -webkit-appearance: none !important;
+      -moz-appearance:    none !important;
+      border:             none;
+      color:              #000 !important ;
+      background-color:   none !important;
+      background:         none !important;
+      /* rest needed for Firefox: */
+      overflow:visible    !important;
+      //width: 120%;/* needed for Firefox???: */
+    }
+
+//    input[type="text"]{
+//      appearance:         none;
+//      -webkit-appearance: none;
+//      -moz-appearance:    none;
+//      border:             none;
+//    }
+
+    textarea{
+      display:      block ;
+      height:       auto !important ;
+      //min-height:   3.6em ;
+      overflow-y:   visible !important;
+      min-width:    16em ;
+      width:        100% !important;
+      padding:      0 ;
+      resize:       vertical;
+    }
+    table.tbl-list td {
+      textarea  { min-height:   4.2em !important; }
+      input     { padding-left: 0 !important; }
+    }
+    span.data{
+      width:  auto;
+      border: none ;
+    }
+    input.wi-date{
+      align: left !important;
+      padding: 0 !important;
+    }
+    select{
+      padding: 0 0 0.4em 0.2em !important;
+    }
+
+    div.cke_editable{
+      min-height: 1.8em  !important;
+      height:     auto !important;
+      border:     none;
+      overflow:   hidden !important;
+    }
+
+
+    a.button-image,
+    a.button,
+    input[type="button"],
+    input.neutral,
+    td img {
+      display: none ;
+    }
+
+    input, select{
+      &.wi-smallest     { width: ( round( ( @input-wi-smallest * @width-size    ) , 0 ) )!important ; } ;
+      &.wi-verysmall    { width: ( round( ( @input-wi-verysmall * @width-size   ) , 0 ) )!important ; } ;
+      &.wi-small        { width: ( round( ( @input-wi-small * @width-size       ) , 0 ) )!important ; } ;
+      &.wi-mediumsmall  { width: ( round( ( @input-wi-mediumsmall * @width-size ) , 0 ) )!important ; } ;
+      &.wi-normal       { width: ( round( ( @input-wi-normal * @width-size      ) , 0 ) )!important ; } ;
+      &.wi-lightwide    { width: ( round( ( @input-wi-lightwide * @width-size   ) , 0 ) )!important ; } ;
+      &.wi-wide         { width: ( round( ( @input-wi-wide * @width-size        ) , 0 ) )!important ; } ; // min-width
+      &.wi-wider        { width: ( round( ( @input-wi-wider * @width-size       ) , 0 ) )!important ; } ; // min-width
+      &.wi-verywide     { width: ( round( ( @input-wi-verywide * @width-size    ) , 0 ) )!important ; } ; // min-width
+    }
+
+
+
+
+  } // /#content
+} // /@media print
+
diff --git a/css/design40/less/requirement_spec.less b/css/design40/less/requirement_spec.less
new file mode 100644
index 000000000..ae12142ee
--- /dev/null
+++ b/css/design40/less/requirement_spec.less
@@ -0,0 +1,510 @@
+/* ------------------------------------------------------------- */
+/* REQUIREMENT SPEC (requirement_spec.less)                      */
+/* ------------------------------------------------------------- */
+
+
+
+//  ------------------------------------------------------------
+//  General page layout
+//  ------------------------------------------------------------
+
+
+
+
+// -----------------------
+// Requirement Spec Version (Title)
+// -----------------------
+
+#requirement_spec_version{
+  padding:           @contentbox-padding;
+  letter-spacing:   0.16em ;
+  font-size:         110% ;
+}
+
+
+
+// --------------------------------------
+// COLUMN-CONTAINER
+// --------------------------------------
+
+
+#column-container {
+  //width: 100%;
+  padding-left:   0;
+  padding-right:   0;
+  margin-left:     0;
+  margin-top:     0.2em ;
+  margin-right:   0;
+  overflow:       hidden ;
+
+
+
+  // --------------------------------------
+  // TREE COLUMN (LEFT, JS-TREE)
+  // --------------------------------------
+
+  #tree-column {
+    float:                 left;
+    width:                 30em;
+    padding:               0.3em 1.2em 2.0em 0.8em;
+    border-right:         1px #000 solid;
+    //background-color:   @gray-superlight;
+    background-color:     none;
+
+    .jstree {
+        & > ul {
+          width: 342px;
+          overflow-x: hidden;
+        }
+
+      ul li {
+        line-height:       1.8em;
+        padding:           0 ;
+
+        font-size:         10pt;
+        a {
+          border-bottom:   none;
+          width:           98% ;
+        }
+
+      }
+    } // /.jstree
+
+    //  Special things that apply to the tree
+    #tree li.flagged > a > ins {
+      background-image:     url("../../image/flag-red.png") !important;
+      background-position:   0;
+    }
+
+  } // /#tree-column
+
+
+
+  // --------------------------------------
+  // CONTENT COLUMN (RIGHT, EDITING)
+  // --------------------------------------
+
+  #content-column {
+    float:               left;
+    width:               58em;
+    padding-left:       3.0em;
+    //background-color: @gray-superlight;
+    background-color:   none;
+
+    // just nice to have this helpful container :-)
+    #column-content {
+
+
+
+      // --------------------------------------
+      // SECTIONS
+      // --------------------------------------
+
+      .section {
+        border-left:       0;
+        margin-left:       0;
+
+        .section-header{
+          display:         block ;
+          overflow:       hidden;
+          width:           90% ;
+
+          h3 {
+            font-size:         140%;
+            letter-spacing:   0.16em;
+            span.label {
+              font-size:       90% ;
+              font-weight:     bold;
+              letter-spacing: 0.1em;
+              color:           @base-dark;
+            }
+          } // /h3
+
+          .section-description {
+            margin-bottom:   15px;
+            margin-left:     0;
+
+            div{
+              padding:       0.3em 0 0.4em 0;
+
+              .section-description-heading {
+                font-weight:     normal;
+                font-size:       100% ;
+                /* margin:       0 0 1.2em 0; */
+                padding:         0 0 0.0em 0;
+                display:         block;
+
+              }
+              span.label{
+                font-size:       90%;
+              }
+              p {
+                color:           #000;
+                font-size:       106%;
+                line-height:     1.5em;
+                margin:         0 0 0.3em 0;
+              }
+
+            } // /div
+
+          } // /.section-description
+
+          .section-context-menu {
+            h3{
+              background-color: #000;
+              color:             #000 !important ;
+              span.label { font-weight: normal;}
+            }
+            div.section-description {
+              div{
+                span.label section-description-heading {}
+              }
+            }
+            span.label { }
+          }
+
+          #section-list-empty{
+            border:           1px #0C42FF solid ;
+            background-color: #BBCDFF ;
+            padding:           0.6em ;
+          }
+
+        }
+        // /.section-header
+
+      } // /.section
+
+
+
+      // --------------------------------------
+      // FUNCTION BLOCKS
+      // --------------------------------------
+
+      .function-block {
+        border-top:   1px solid #bbb;
+        margin:       0 ;
+        padding:       0.8em 0 1.8em 0 ;
+        overflow:     hidden;
+        display:       block;
+        clear:         both;
+        float:         none;
+        width:         48em;
+
+        .function-block-content{
+          overflow:   hidden ;
+          padding:     0 0 0 0.6em;
+
+          .function-block-header {
+            clear:     both;
+            overflow: hidden;
+
+            .function-block-number {
+              font-weight:   normal;
+              width:         5.0em ;
+              display:       block;
+              float:         left;
+            }
+
+            .function-block-desc {
+              display:         inline-block;
+              overflow:       hidden;
+              float:           left;
+              width:           80%;
+              padding-bottom: 1.0em ;
+              //font-size:       90% ;
+              font-weight:     normal;
+
+              p {
+                margin: 0 0 0.6em 0;
+                padding: 0 ;
+              }
+              p:first-child {
+                font-weight: bold ;
+              }
+            }
+          } // /.function-block-header
+
+          .function-block-properties {
+            display: block ;
+            margin: 0 0 0 5.0em;
+            padding: 0 ;
+            overflow: hidden;
+            clear: both;
+            font-size: 9pt;
+            span.label,
+            span.value {
+              float: left;
+            }
+             //vertical adjustment
+            span.label { width: 110px ;}
+            span.value {
+              width: 200px;
+              padding: 0 30px 0 0;
+              margin: 0;
+            }
+            // horizontal adjustment
+//            &.list > div {
+//              width: 300px ;
+//              float: left;
+//              display: inline-block ;
+//              span.label { }
+//              span.value {
+//                padding: 0 30px 0 0;
+//                margin: 0;
+//              }
+//            }
+
+          } // /.function-block-properties
+
+        } // /.function-block-content
+
+
+
+        // --------------------------------------
+        // FUNCTION BLOCKS
+        // --------------------------------------
+
+        .sub-function-block-container {
+          margin: 1.8em 0 0 5.1em;
+          display: block;
+
+          .sub-function-block-header{
+            border-top: 1px solid #ccc;
+            padding: 0.4em 0 0.4em 0.6em ;
+            font-size: 86% ;
+            letter-spacing: 0.2em;
+          }
+
+          .sub-function-block {
+            border-top: 1px solid #ccc;
+            margin: 0.2em 0 0.2em 0;
+            padding: 0.2em 0 0.4em 0 ;
+
+            .sub-function-block-content {
+              margin: 0.2em 0 0.2em 0;
+              padding: 0.2em 0.6em 0.4em 0.6em;
+
+              .sub-function-block-header {
+                font-weight: normal;
+                font-size: 120% ;
+                color: @gray-dark;
+                margin-top: 1.0em ;
+              }
+            }
+          }// /.sub-function-block
+
+        } // /.sub-function-block-container
+
+      } // /.function-block
+
+
+
+      // --------------------------------------
+      // FUNCTION BLOCK FORM
+      // --------------------------------------
+
+      // Form for creating or editing function blocks
+      .function-block-form {
+        &> div { padding: 0.4em; }
+
+        input.rs_input_field,
+        select.rs_input_field,
+        table.rs_input_field input[type=text],
+        table.rs_input_field input[type=password],
+        table.rs_input_field select { }
+
+      } // /.function-block-form
+
+
+
+      // --------------------------------------
+      // FLAGGED SECTIONS & BLOCKS
+      // --------------------------------------
+
+      //  Flagged sections, function blocks, text blocks
+      .section.flagged .section-description,
+      .function-block.flagged,
+      .sub-function-block.flagged {
+        background-color: @color-blue-light;
+      }
+      // Flagged headings or numbers
+      .section.flagged .section-description > .section-description-heading,
+      .function-block.flagged > .function-block-content > div > .function-block-number,
+      .sub-function-block.flagged > .sub-function-block-content > div > .function-block-number {
+        //background-color: #fe5f14;
+        color: @color-blue-strong;
+      }
+
+
+
+      // --------------------------------------
+      // SELECTION
+      // --------------------------------------
+
+      //  Selected sections, function blocks, text blocks
+      .section.selected,
+      .function-block.selected,
+      .sub-function-block.selected {
+        margin-left: -3px;
+        border-left: 3px solid #24D115; //   PENDENT: GREEN STRONG
+      }
+
+    } // /#column-content
+
+  } // /#content-column
+
+} // /#column-container
+
+
+.section-empty-description { color: #bbb; }
+
+
+
+// --------------------------------------
+//  CONTEXT MENU
+// --------------------------------------
+
+// Have a look on jquery-ui.less
+//.context-menu-item.icon-flag        { background-image: url("../../image/flag-red.png"); }
+//.context-menu-item.icon-close       { background-image: url("../../image/document-close.png"); }
+//.context-menu-item.icon-save        { background-image: url("../../image/document-save.png"); }
+//.context-menu-item.icon-revert      { background-image: url("../../image/edit-undo.png"); }
+//.context-menu-item.icon-pdf         { background-image: url("../../image/application-pdf.png"); }
+//.context-menu-item.icon-html        { background-image: url("../../image/text-html.png"); }
+//.context-menu-item.icon-add-picture { background-image: url("../../image/add-picture.png"); }
+//.context-menu-item.icon-download    { background-image: url("../../image/download.png"); }
+//.context-menu-item.icon-renumber    { background-image: url("../../image/format-list-ordered.png"); }
+
+
+
+// --------------------------------------
+// TABWIDGET (Tabs)
+// --------------------------------------
+
+#requirement_spec_tabs{
+  #function-blocks-tab{
+    margin-top: 1.4em ;
+  }
+}
+
+
+
+
+
+
+
+
+
+
+// --------------------------------------
+//  Text blocks
+// --------------------------------------
+
+.requirement-spec-text-block {
+  border-left: 0;
+  margin-left: 3px;
+  margin-top: 10px;
+
+  & > h2 { margin-top: 0px; }
+
+  &.flagged {
+    //background-color: #feece3;
+    //  border: 1px solid #fe5f14;
+    &> h2 {
+      //background-color: #fe5f14;
+      color: #fff;
+    }
+  } // /.flagged
+
+  &.selected {
+    border-left: 3px solid #cbb120;
+    margin-left: 0;
+  }
+
+}
+
+.requirement-spec-text-block-picture-thumbnail {
+  border-radius: 5px;
+  border:        2px solid #ebebeb;
+  float:         left;
+  margin-right:  20px;
+  padding:       5px;
+  text-align:    center;
+  width:         130px;
+}
+.requirement-spec-text-block-picture-thumbnail-img-container {
+  height:  64px;
+  margin:  auto;
+  padding: 0;
+  width:   64px;
+}
+.requirement-spec-text-block-picture-thumbnail.selected {
+  border: 2px solid #cbb120;
+}
+
+
+
+
+// ------------------------------------------------------------
+// TIME/COST ESTIMATION (TABLE)
+// ------------------------------------------------------------
+
+#time_cost_estimate  {
+  p {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  table tbody tr  {
+    td {
+      vertical-align: top ;
+    }
+    td:first-child { width: 66% ; }
+
+    // special rows
+    &.section th {
+      line-height: 2.2em ;
+      //background-color: @base-standard;
+      color: @base-superdark ;
+      b {
+        font-size: 116% ;
+      }
+    }
+    &.subtotal {
+      td, th {
+        font-weight:      bold ;
+        background-color: @gray-standard; // PENDENT: ZEBRA
+        border-top:       1px @base-superdark solid ;
+        border-bottom:    1px @base-superdark solid ;
+        text-align:       right;
+      }
+    }
+  }
+}
+
+
+
+
+
+
+
+
+
+
+//  --------------------------------------
+//  TABLES in Requirement Specs
+//  --------------------------------------
+
+div.function-block * table.tbl-horizontal td {
+  font-size: 66% !important ;
+}
+
+
+
+// --------------------------------------
+// OVERRIDES
+// --------------------------------------
+.jstree-requirement-spec .jstree-clicked {
+  background: @gray-lighter !important;
+  border: 0 !important;
+}
+
diff --git a/css/design40/less/responsive.less b/css/design40/less/responsive.less
new file mode 100644
index 000000000..0d9e473a5
--- /dev/null
+++ b/css/design40/less/responsive.less
@@ -0,0 +1,119 @@
+/* ------------------------------------------------------------- */
+/* RESPONSIVE (responsive.less)                          */
+/* ------------------------------------------------------------- */
+
+//  --------------------------------------
+//  Medienabfragen und Beruecksichtigungen Plattformen
+//  --------------------------------------
+//  Handheld Hochformat width: 320px
+@media screen and (max-device-width: 479px) {
+
+}
+
+
+
+//  Handheld Querformat width: 480px
+@media screen and (min-device-width: 480px) and (max-device-width: 767px) {
+
+  body #content .tbl-horizontal th {
+
+    .colgroup col { width: @tcol-wi-lightwide ; }
+
+    width: @tcol-wi-normal ;
+    background-color: #D6EEBF;
+
+    //  --------------
+    //  Width of Columns (Dimensions)
+    //
+    &.wi-smallest    { width:  @tcol-wi-normal        ; }
+    &.wi-verysmall   { width:  @tcol-wi-normal        ; }
+    &.wi-small       { width:  @tcol-wi-normal        ; }
+    &.wi-mediumsmall { width:  @tcol-wi-normal        ; }
+    &.wi-normal      { width:  @tcol-wi-normal        ; }
+    &.wi-lightwide   { width:  @tcol-wi-normal        ; }
+    &.wi-wide        { width:  @tcol-wi-normal        ; }
+    &.wi-wider       { width:  @tcol-wi-normal        ; }
+    &.wi-verywide    { width:  @tcol-wi-normal        ; }
+  }
+}
+
+
+
+//  < Tablet Querformat
+@media screen and (max-device-width: 1024px) {
+  body #content .tbl-horizontal th{
+
+    width: @tcol-wi-lightwide ;
+    //background-color: #EEBBB7 !important; // TEST
+
+    //  --------------
+    //  Width of Columns (Dimensions)
+    //
+    &.wi-smallest    { width:  @tcol-wi-normal        ; }
+    &.wi-verysmall   { width:  @tcol-wi-normal        ; }
+    &.wi-small       { width:  @tcol-wi-normal        ; }
+    &.wi-mediumsmall { width:  @tcol-wi-normal        ; }
+    &.wi-normal      { width:  @tcol-wi-normal        ; }
+    &.wi-lightwide   { width:  @tcol-wi-normal        ; }
+    &.wi-wide        { width:  @tcol-wi-normal        ; }
+    &.wi-wider       { width:  @tcol-wi-normal        ; }
+    &.wi-verywide    { width:  @tcol-wi-normal        ; }
+  }
+}
+
+
+//  Tablet Hochformat
+@media screen and (min-device-width: 768px) and (max-device-width: 1023px) {
+
+  #content h1{
+    // background-color: red ; // TEST
+  }
+
+  //colgroup col:first-child,
+  .tbl-horizontal th{
+
+    width: @tcol-wi-normal ;
+
+
+    //  --------------
+    //  Width of Columns (Dimensions)
+    //
+    &.wi-smallest    { width:  @tcol-wi-normal        ; }
+    &.wi-verysmall   { width:  @tcol-wi-normal        ; }
+    &.wi-small       { width:  @tcol-wi-normal        ; }
+    &.wi-mediumsmall { width:  @tcol-wi-normal        ; }
+    &.wi-normal      { width:  @tcol-wi-normal        ; }
+    &.wi-lightwide   { width:  @tcol-wi-normal        ; }
+    &.wi-wide        { width:  @tcol-wi-normal        ; }
+    &.wi-wider       { width:  @tcol-wi-normal        ; }
+    &.wi-verywide    { width:  @tcol-wi-normal        ; }
+  }
+}
+
+//  < Tablet Querformat
+@media screen and (max-device-width: 1024px) {
+  .tbl-horizontal th{
+
+    width: @tcol-wi-normal ;
+
+    //  --------------
+    //  Width of Columns (Dimensions)
+    //
+    &.wi-smallest    { width:  @tcol-wi-normal        ; }
+    &.wi-verysmall   { width:  @tcol-wi-normal        ; }
+    &.wi-small       { width:  @tcol-wi-normal        ; }
+    &.wi-mediumsmall { width:  @tcol-wi-normal        ; }
+    &.wi-normal      { width:  @tcol-wi-normal        ; }
+    &.wi-lightwide   { width:  @tcol-wi-normal        ; }
+    &.wi-wide        { width:  @tcol-wi-normal        ; }
+    &.wi-wider       { width:  @tcol-wi-normal        ; }
+    &.wi-verywide    { width:  @tcol-wi-normal        ; }
+  }
+}
+
+
+//  Normale Bildschirme
+//@media screen and (min-device-width: 1260px)  {
+@media screen and (min-device-width: 1110px)  {
+
+}
diff --git a/css/design40/less/scaffolding.less b/css/design40/less/scaffolding.less
new file mode 100755
index 000000000..8f71d7b03
--- /dev/null
+++ b/css/design40/less/scaffolding.less
@@ -0,0 +1,219 @@
+/* ------------------------------------------------------------- */
+/* SCAFFOLDING (scaffolding.less)                                */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// SCAFFOLDING (PAGE & PAGE COMPONENTS)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// All main components of a Kivitendo page are defined here
+// but not in all details. See therefore in the mentioned specialized
+// LESS-files
+//
+//
+// CONTENTS:
+// - BODY
+// - FRAME-HEADER
+// - MENUV3
+// - LAYOUT-ACTIONBAR
+// - CONTENT
+// - COLUMNS
+//   - SINGLE COLUMN
+// - WRAPPER POSITIONS-TABLE (FULL-WIDTH)
+// - DIVERS COMPONENTS (General Wrapper)
+// - MEDIA: Print
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// BODY
+// --------------------------------------
+
+body {
+  margin:           0 ;
+  color:            @base-primary ;
+  font-family:      @font-family-sans-serif;
+  font-size:        @font-size-smaller ;
+
+//  background-color: @body-bg;
+  .bg-body ;
+
+
+  // --------------------------------------
+  // Frame-Header
+  // --------------------------------------
+  // Quicksearch, User, Client, Logout
+  // see also frame-header.less
+  #frame-header{
+    position: fixed;
+    top: 0;
+    z-index: @zindex-dashboard;
+  }
+
+
+
+  // --------------------------------------
+  // MENUV3
+  // --------------------------------------
+
+  // admin section &
+  & #menuv3:first-child{
+    top: 0 !important;
+  }
+  // see also menu.less
+  #menuv3  {
+    position:  fixed;
+    z-index:   @zindex-navbar;
+    top:       28px ;
+    width:     100%;
+    height:    32px;
+  }
+
+
+
+  // --------------------------------------
+  // LAYOUT-ACTIONBAR
+  // --------------------------------------
+
+  // see also menu_actionbar.less
+  .layout-actionbar  {
+    display: block;
+    z-index: @zindex-actionbar;
+    position: fixed;
+    //float: left !important;
+    float: right !important;
+    width: auto;
+    top: 68px ;
+    //left: 656px ;
+    right: 0.2em ;
+    margin: 0 0.4em 0 0;
+    padding: 0;
+    background: none;
+
+    & ~ div:first {
+      padding-top: 25px;
+    }
+
+    & > div + div {
+      margin-left: 2px;
+    }
+
+  }
+
+
+
+
+  // --------------------------------------
+  // CONTENT
+  // --------------------------------------
+  //& > #content {
+  & #content {
+    overflow:         hidden;
+    display:          block;
+    padding:          @content-padding;
+    margin:           @content-margin;
+
+    .bg-content ;
+
+
+    // --------------------------------------
+    // UI-TABS-PANEL
+    // --------------------------------------
+    .ui-tabs-panel {
+       //background-color: @tabs-bg;
+    }
+
+
+
+    // --------------------------------------
+    // Wrapper & Columns
+    // --------------------------------------
+    // PENDENT: .cols-no-padding???
+    .wrapper{
+      clear:       both;
+      display:     block;
+      overflow:    hidden;
+      width:       97.2%;
+      height:      auto;
+
+
+      // -----------------------
+      // Colums (.col)
+      // -----------------------
+      // Single Column (DIV or HORIZONTAL TABLE .tbl-horizontal)
+      & > .col {
+        display: block;
+        overflow: hidden;
+        float: left;
+        margin-right: 1.6em;
+        div > label {
+          font-size: 10pt;
+          line-height: 12.6pt;
+        }
+        p { font-size: @font-size-small }
+      } // /.col
+
+      & > .col,
+      & > .tbl-horizontal{
+        float: left;
+        margin-right: 1.6em;
+        padding-bottom: 20px ; // required to avoid crops of buttons
+      }
+//      & > .tbl-horizontal:last-child{
+//        margin-right: 0 !important ;
+//      }
+
+
+
+      // Centered Column
+      &.center{
+        margin: 0 auto;
+        display: table;
+        width: auto;
+      }
+      // PENDENT: anschauen
+      &.width-moderate{
+        width: auto;
+      }
+
+      & > table.tbl-horizontal:last-child{
+        margin-right: 0 !important ;
+      }
+
+    } // /.wrapper
+
+  } // /#content
+
+
+
+  // --------------------------------------
+  // WRAPPER POSITIONS-TABLE (FULL-WIDTH)
+  // --------------------------------------
+  // Special Container with Full-Width-Table (Positions) and Show/Hide-Buttons
+  // PENDENT: woanders plazieren
+  .full-width {
+    width:   100% ;
+    padding: 0 0 1.0em 0 ;
+    margin:  0 0 0 0;
+
+    // Use this Selector on the same Level for Show/Hide Details-Buttons
+    // Edit these Buttons in tables.less
+    // PENDENT: vielleicht anders loesen
+    &.positions{ }
+  }
+
+  // zentrierte Elemente
+  // PENDENT: braucht es das?
+  div.center{
+      margin: 0 auto;
+      display: table;
+      width: auto;
+  }
+
+
+}
+// /body
diff --git a/css/design40/less/specials.less b/css/design40/less/specials.less
new file mode 100644
index 000000000..b5d14de41
--- /dev/null
+++ b/css/design40/less/specials.less
@@ -0,0 +1,211 @@
+/* ------------------------------------------------------------- */
+/* SPECIALS (specials.less)                                      */
+/* ------------------------------------------------------------- */
+
+
+// ----------------------------------------------------------------------------
+//
+// SPECIALS
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Styles for special purposes
+//
+//
+// CONTENTS:
+// - ACCOUNT LIST
+// - ROW POSITON DETAILS (E.G. SALES ORDER)
+// - TABLE #DISPLAY ROW
+// - HORIZONTAL SCROLLBAR DISPLAY
+// ----------------------------------------------------------------------------
+
+
+
+// --------------------------------------
+// ACCOUNT LIST
+// --------------------------------------
+// PENDENT: ansehen
+#tbl-accounts{
+  border-width: 0;
+  thead{
+    th{
+      //background-color: #E3E3E3 ;
+    }
+
+  }
+  tbody{
+
+    tr.heading{
+
+      &.heading th {
+        border-top: 1px #999 solid;
+          &.numeric{
+            padding-right: 20px;
+            padding-left: 10px;
+          }
+      }
+
+      &.th1{
+        font-size: @font-size-large  ;
+        th{ padding: 1.0em 0 0.4em 0 ; }
+      }
+      &.th2{
+        font-size: @font-size-medium ;
+        th{ padding: 1.0em 0 0.4em 0 ; }
+      }
+      &.th3{
+        font-size: @font-size-small   ;
+        th{ padding: 1.0em 0 0.4em 0 ; }
+      }
+   } // /tr.heading
+
+    td:first-child {
+      text-align: right !important;
+    }
+
+    tr.ajax-account-details td{
+      padding: 0.8em 0 1.0em 4.0em ;
+    }
+
+
+  }
+}
+
+
+
+// --------------------------------------
+// ROW POSITON DETAILS (E.G. SALES ORDER)
+// --------------------------------------
+
+td.row-position-detail{
+  padding: 0 0 0.2em 0.4em !important;
+
+  div.table{
+    display:             table;
+    div.field{
+      display:           table-row;
+      padding:           0.1em 0 ;
+      height:           2.0em !important; ;
+
+      span.label{
+        width:           10.0em;
+        height:         2.0em !important;
+        vertical-align: middle;
+        display:         table-cell ;
+        padding:         0.3em 0 0 0;
+      }
+
+      span.value{
+        height:         2.0em ;
+        span.data{
+          padding:       0.3em 0 0.2em 0.5em !important;
+          display:       block;
+        }
+      }
+
+    } //div.field
+  } // /div.table
+
+} // /td.row-position-detail
+
+
+
+// --------------------------------------
+// TABLE #DISPLAY ROW
+// --------------------------------------
+
+table#display_row{
+  tbody{
+    tr{
+      td{
+        a.row-position{
+          float: left;
+          padding: 0.6em 0.2em 0 0 ;
+        }
+        input.row-position{
+          float: left;
+        }
+      }
+    }
+  }
+
+}
+
+
+
+// --------------------------------------
+// HORIZONTAL SCROLLBAR DISPLAY
+// --------------------------------------
+
+// csv import preview/results table
+#results {
+  // show below others and limit width so that scrollbar is displayed
+  clear: left;
+  width: 95vw;
+}
+// for the menu left we need to make the width smaller
+.layout-split-right #results {
+  width: 80vw;
+}
+
+// orders positions table
+#row_table_scroll_id {
+  max-width: 96vw !important;
+}
+
+
+// icons that change between stylesheets
+img {
+  &.icon-sort-up {
+    content:url("../../image/up-small.png");
+  }
+  &.icon-sort-down {
+    content:url("../../image/down.png");
+  }
+  &.icon-dragdrop {
+    content:url("../../image/updown2.png");
+  }
+  &.icon-delete {
+    content:url("../../image/cross2.png");
+  }
+  &.icon-map {
+    content:url("../../image/map-earth.png");
+  }
+}
+
+
+/* styling for input to textarea switch */
+span.area-input {
+  span.switch-to-textarea {
+    &:after {
+      content: url("../../image/pencil.png");
+      vertical-align: top;
+    }
+  }
+}
+
+/* styling for upload drag-drop zone */
+span.upload_drop_zone {
+  padding:            10px;
+  color:              @button-neutral-color;
+  background-color:   @button-neutral-bg;
+  border:             @button-neutral-border;
+  border-radius:      @button-border-radius;
+}
+
+/* styling for thumbnails und preview for files */
+.overlay_div {
+  position: relative;
+}
+
+.overlay_img {
+  position: absolute;
+  top: -100px;
+  left: -100px;
+  z-index: 2;
+  cursor: pointer;
+}
+
+.thumbnail {
+  cursor: pointer;
+}
diff --git a/css/design40/less/style.less b/css/design40/less/style.less
new file mode 100755
index 000000000..c23ea1d6e
--- /dev/null
+++ b/css/design40/less/style.less
@@ -0,0 +1,175 @@
+// ----------------------------------------------------------------------------
+//
+// MAIN-LESS-FILE
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+// Use this file for rendering the file ../style.css
+// with the following command:
+// lessc style.less ../style.css
+// the cursor in your shell should be on /css/less/
+//
+// CONTENTS:
+// - Variables
+// - LOGGED IN
+// ----------------------------------------------------------------------------
+
+
+
+// --------------------------------------
+// VARIABLES WITH COLOR SCHEMES
+// --------------------------------------
+// fuer die Anpassung des Erscheinungsbildes
+// in dieser Datei koennen z.b. Farbvarianten eines Themes einfach erstellt werden
+// Color Schemes
+@import 'variables_color_style.less' ;  // Standard color scheme
+
+
+
+// Standard-Variables
+@import 'variables.less';
+
+
+// -----------------------
+// Custom LESS variables
+// -----------------------
+// Your custom LESS variables
+// (new or overrides of the previous LESS variable stuff)
+@import 'custom_less_variables.less';
+
+
+
+// --------------------------------------
+// MIXINS
+// --------------------------------------
+// Mixins are unique CSS-templates in shape of CSS-classes
+// Mixins are general & sitewide properties
+@import 'mixins.less' ;
+
+
+
+// --------------------------------------
+// BASIC SETTINGS & MIXINS
+// --------------------------------------
+@import 'common.less';
+
+
+
+// --------------------------------------
+// SCAFFOLDING (IN GERMAN GERUEST)
+// --------------------------------------
+// Main areas and main boxes of the Kivitendo Webpage
+// In general Layout of the page
+@import 'scaffolding.less';
+
+
+
+
+// FORMER POSITION OF STANDARD HTML-ELEMENTS IN KIVITENDO (SEE BELOW)
+
+
+
+
+// --------------------------------------
+// MENUS
+// --------------------------------------
+@import 'menu_frame_header.less'; // Quick_Search, User/Mandatory, Logout
+@import 'menu.less'; // All kind of menus
+@import 'menu_actionbar.less';
+
+
+
+// --------------------------------------
+// CONTENT
+// --------------------------------------
+// Every HTML Stuff within the Element #content
+@import 'forms.less';
+@import 'messages.less';
+@import 'tables.less';
+@import 'lists.less';
+@import 'buttons.less';
+@import 'control_panels.less';
+
+
+
+// --------------------------------------
+// STANDARD HTML-ELEMENTS IN KIVITENDO
+// --------------------------------------
+@import 'main.less';
+@import 'main_login.less';
+
+
+
+
+// -----------------------
+// NON GENERIC STUFF
+// -----------------------
+@import 'requirement_spec.less'; //
+@import 'specials.less';
+
+
+
+
+// --------------------------------------
+// JQUERY STUFF
+// --------------------------------------
+@import 'jquery-ui.less'; // jQuery-UI
+// Original Standard jQuery Stuff (no overrides, )
+@import 'jquery.autocomplete.less';
+@import 'jquery.multiselect2side.less';
+@import 'jquery.tooltipster.less';
+//@import 'jquery.tooltipster-light.less';
+// Special jQuery Stuff
+@import 'jquery.chartpicker.less';
+
+
+
+
+// --------------------------------------
+// OVERRIDES
+// --------------------------------------
+// General overrides from the settings above
+@import 'main_overrides.less';
+// Overrides of all jquery stuff above
+@import 'jquery-ui_overrides.less';
+
+// -----------------------
+// Admin (Overrides)
+// -----------------------
+@import 'admin.less';
+
+
+
+
+// --------------------------------------
+// Responsive & Print
+// --------------------------------------
+// Responsive & Print Stuff
+@import 'responsive.less';
+@import 'print.less';
+
+
+
+// --------------------------------------
+// CUSTOM LESS STUFF
+// --------------------------------------
+// Place in this file your own LESS or CSS stuff
+// This will override all the stuff above
+@import 'custom.less';
+
+
+
+// --------------------------------------
+// DEVELOPER STUFF
+// --------------------------------------
+// (don't hesitate to disable this')
+@import 'developing.less';
+
+
+
+
+// --------------------------------------
+// DEPRACATED STUFF
+// --------------------------------------
+// PENDENT: (necessary???)
+@import 'icons16.less';
diff --git a/css/design40/less/tables.less b/css/design40/less/tables.less
new file mode 100755
index 000000000..3c380e680
--- /dev/null
+++ b/css/design40/less/tables.less
@@ -0,0 +1,1209 @@
+/* ------------------------------------------------------------- */
+/* tables (tables.less)                                          */
+/* ------------------------------------------------------------- */
+
+//----------------------------------------------------------------------------
+//
+//  tables
+//
+//----------------------------------------------------------------------------
+//  description: for all kind of tables in #content
+//
+//  contents:
+//  - TABLE
+//  - CELLS (TD & TH)
+//    - Data format
+//    - Headings (within TD & TH)
+//    - Links (within TD & TH)
+//    - Images within cells
+//    - Description & labels within cells
+//    - TD
+//    - TH
+//    - TR (Table row)
+//  - thead
+//  - tbody
+//  - tfoot
+//  - caption
+//  - headings (print style)
+//  - colgroup & cols
+//    - dimensions for table colums (col)
+//  - table list
+//  - table plain
+//  - table horizontal
+//  - table dialog
+//  - table class test
+//  - dimensions (classes) for tables
+//  - links
+//  - headings
+//  - subtotals
+//
+//  - tables in requirement specs
+//  - tables with divs
+//  - list with paragraphs
+//----------------------------------------------------------------------------
+
+
+
+// ----------------------------------------------------------------------------
+//
+// TABLE
+//
+// ----------------------------------------------------------------------------
+//
+table {
+  //font-size: @font-size-base ;
+  table-layout: auto ;
+  border-spacing: 1px ;
+
+
+  //--------------------------------------
+  //  CELLS (TD & TH)
+  //--------------------------------------
+  td,
+  th {
+    text-align: left ;
+    vertical-align: top ;
+    //font-size: @font-size-smaller ;
+    font-weight: normal ;
+
+
+    // -----------------------
+    //  Data Format
+    // -----------------------
+    &.right             { text-align:      right  !important ; }
+    &.center            { text-align:      center !important ;
+      input             { float:           none   !important ; }
+    }
+    &.numeric           { text-align:      right  !important ; }
+    &.numeric-centered  { text-align:      center !important ; }
+    &.date              { text-align:      right  !important ; }
+    // PENDENT: wo eingesetzt
+    &.button            { text-align:      center !important ; }
+    &.img               { text-align:      center !important ; }
+    &.top               { vertical-align:  top    !important ; }
+    // see also div.longdesc in main.css
+    // PENDENT: mixin und variablen erstellen
+    &.long-desc,
+    &.long-description,
+    &.longdesc,
+    &.longdescription,
+    div.description {
+      font-size: 80% ;
+      color: @t-cell-label-text ;
+    }
+    &.highlight { background-color: @t-row-zebra-bg-highlight ; }
+    div.numeric           { text-align:      right  !important ; }
+
+    // -----------------------
+    //  Headings (within TD & TH)
+    // -----------------------
+    // PENDENT: ueberpruefen
+    h3,
+    h4 {
+      margin: 0 !important ;
+      padding: 0.8em 0 0.2em 0 !important ;
+    }
+
+    // -----------------------
+    //  Links (within TD & TH)
+    // -----------------------
+    &> a { display: block ; }
+
+    // -----------------------
+    //  Images Within Cells
+    // -----------------------
+    img {
+      display:        inline ;
+      vertical-align: top    ;
+    }
+    &+a img,
+    &+img { float:    left   ; }
+    &~a img,
+    &~img { float:    right  ; }
+
+    img.row-icon {
+      cursor: pointer;
+      display: block;
+      max-width: 16px;
+      max-height: 16px;
+    }
+
+    // -----------------------
+    //  Description & Labels Within Cells
+    // -----------------------
+    div.description {
+      float:     none ;
+      clear:     both ;
+    }
+    & > input,
+    & > select {
+      & + div.description { margin-top: 0.4em ; }
+    }
+
+    span {
+      // simulates th in horizontal tables
+      &.label {
+        display:              block ;
+        padding:              0 0 0.5em 0 ;
+        color:                @t-cell-th-text-color ;
+      }
+      &.below {
+        //clear: both ;
+        overflow:             hidden ;
+        display:              block ;
+        input {
+          margin:             0.6em 0 0 0 !important ;
+          &[type="checkbox"]{ padding: 0.6em 0.6em 0 0 ;}
+        }
+      }
+      &.above {
+        //clear: both ;
+        overflow: hidden ;
+        display: block ;
+        margin-bottom: 0.4em ;
+        padding: 0.3em 0.3em 0 0 !important ;
+      }
+    }
+
+    // -----------------------
+    //  Form Element Within Cells
+    // -----------------------
+
+    // if a .below class follows directly after a td/th
+    & + input.below {
+      margin: 0 !important;
+    }
+
+    input,
+    select {
+      //float: left ;
+      &.below {
+        display: block ;
+        clear: left ;
+        float: none ;
+        overflow: hidden ;
+        // PENDENT: anschauen! vor allem button customer information -> Lieferadresse
+        margin: 0.3em 0 0 0 ;
+      }
+    }
+
+    textarea {
+      margin: -0.14em -0.0em ;
+    }
+
+  }
+  //  /th, td
+
+
+  //--------------------------------------
+  //  TH (TABLE HEADER CELLS)
+  //--------------------------------------
+  th {
+    white-space: normal !important ;
+    // Header text vertically centered
+    &.vmiddle {
+      vertical-align: middle;
+    }
+  }
+
+  //--------------------------------------
+  //  TD (TABLE DATA)
+  //--------------------------------------
+  td {
+    color: @t-cell-text-color;
+  }
+
+
+  //--------------------------------------
+  //  TR (TABLE ROW)
+  //--------------------------------------
+  tr {
+    //  if header-cell is in the same row as a caption-header-cell (th.caption)
+    &.header-caption th {
+      vertical-align: bottom ;
+    }
+    &.separator {
+      // standard separator is below
+      th, td {
+        padding-bottom: 3.0em ;
+      }
+      &.below {
+        th, td {
+          padding-bottom: 3.0em ;
+        }
+      }
+      &.above {
+        th, td {
+          padding-top   : 3.0em ;
+          padding-bottom: 0   ; // override .separator
+        }
+      }
+    }
+
+    // -----------------------
+    //  SUB-TOTALS
+    // -----------------------
+    //  PENDENT: ggf. obsolete
+    &.total-sub {
+      height: 2.0em ;
+
+      td {
+        border-top: 1px solid @table-border-color ;
+        border-bottom: 2px solid @table-border-color ;
+        font-weight: bold ;
+        color: @t-cell-text-color ;
+      }
+    }
+    td.listsubtotal {
+      height: 2.0em ;
+      border-top: 1px solid @table-border-color ;
+      border-bottom: 2px solid @table-border-color ;
+      font-weight: bold ;
+      color: @t-cell-text-color ;
+    }
+    td.listtotal {
+      height: 2.0em ;
+      border-top: 1px solid @table-border-color ;
+      border-bottom: 2px solid @table-border-color ;
+      font-weight: bold ;
+      color: @t-cell-text-color ;
+    }
+
+    // -----------------------
+    //  HEADINGS (alternativ version [print style])
+    // -----------------------
+    // PENDENT: ueberpruefen
+    &.heading th {
+      font-size: 120% ;
+      border-top: 1px @table-border-color solid ;
+    }
+
+
+  } // /tr
+
+
+
+  //--------------------------------------
+  //  CAPTION
+  //--------------------------------------
+
+  //  this must be placed here
+  //  otherwise th.caption will be overridden if placed above
+  caption,
+  th.caption {
+    .mx-h3-caption ; //   mixin
+    white-space:       nowrap ;
+    //  addition with smaller font-size
+    small { font-size : @font-size-small ; }
+  }
+
+
+
+  //--------------------------------------
+  //  THEAD
+  //--------------------------------------
+  thead {
+    th {
+      .mx-thead-th ; //  mixin
+
+      a {
+        img {
+          vertical-align: middle ;
+          padding: 0 ;
+          margin: 0 ;
+        }
+      }
+    }
+  }
+
+
+  //--------------------------------------
+  //  TBODY
+  //--------------------------------------
+
+  tbody {
+    tr {
+      //  common cells within tbody
+      td {  }
+      th {  }
+    }
+  }
+
+
+  //--------------------------------------
+  //  TFOOT
+  //--------------------------------------
+  tfoot {
+    tr {
+      th,
+      td {
+        vertical-align: middle ;
+        border-bottom: @table-border-color 2px solid ;
+        height: 1.8em ;
+        padding-top: 0.6em !important;
+        padding-bottom: 0.6em !important;
+      }
+      td {
+        font-weight: bold ;
+        color: @t-cell-foot-text ;
+      }
+      th {
+        font-weight: normal ;
+        color: @t-cell-foot-text ;
+       }
+      //  if more than one row in tfoot first row has other properties
+      &:first {
+        td,
+        th { border-top: @table-border-color 2px solid ; }
+      }
+      // sometimes last row of a table with some links or buttons under a designated row
+      &.blank {
+          border: none !important ;
+        th,
+        td {
+          border: none !important ;
+        }
+      }
+    } //  /tr
+    // this is just for expecption (eg. form in price-rules)
+    // tfoot.blank
+    &.blank {
+      tr {
+          border: none !important ;
+          &:first-child {
+            th, td { border-top: 1px solid @table-border-color !important ; }
+          }
+        th,
+        td {
+          border: none !important ;
+        }
+      }
+    } // /tfoot.blank
+  } //  /tfoot
+
+
+
+  //--------------------------------------
+  //  COLGROUP & COLS
+  //--------------------------------------
+
+  colgroup {
+
+    //  table columns
+    //  only for background-color and width
+    //  PENDENT: funktioniert text-ausrichtung?
+    col {
+      &.right     { text-align: right  ; }
+      &.center    { text-align: center ; }
+      &.long-desc { font-size:  70%    ; }
+
+      // -----------------------
+      //  width of columns (dimensions)
+      // -----------------------
+      &.wi-smallest    { width: (@tcol-wi-smallest    ) ; }
+      &.wi-verysmall   { width: (@tcol-wi-verysmall   ) ; }
+      &.wi-small       { width: (@tcol-wi-small       ) ; }
+      &.wi-mediumsmall { width: (@tcol-wi-mediumsmall ) ; }
+      &.wi-normal      { width: (@tcol-wi-normal      ) ; }
+      &.wi-lightwide   { width: (@tcol-wi-lightwide   ) ; }
+      &.wi-wide        { width: (@tcol-wi-wide        ) ; }
+      &.wi-wider       { width: (@tcol-wi-wider       ) ; }
+      &.wi-verywide    { width: (@tcol-wi-verywide    ) ; }
+    }
+
+
+  }
+
+
+
+
+  //--------------------------------------
+  //  STANDARD KIVITENDO TABLES
+  //--------------------------------------
+
+  &.tbl-horizontal,
+  &.tbl-plain,
+  &.tbl-list,
+  &.tbl-list-plain {
+    margin-bottom: 0.6em ;
+    border-collapse: collapse ;
+    border: none ;
+
+    tr td {
+      &>span {
+        //padding: 0.3em 0.3em 0.6em 0.3em ;
+        padding: 0.3em 0.3em 0.6em 0 ;
+      }
+    }
+  }
+
+
+
+
+
+  //--------------------------------------
+  //  TABLE HORIZONTAL
+  //--------------------------------------
+
+  &.tbl-horizontal {
+
+    th,
+    td {
+      background: none ;
+      padding-top: 0.3em ;
+      padding-right: 0.2em ;
+      padding-bottom: 0.2em ;
+      padding-left: 0.3em ;
+
+      // adjust form elements in this table type
+      &>input[type="checkbox"],
+      &>input[type="radio"] {
+        margin: 0 0.3em 0.2em 0 !important ;
+      }
+      &>input,
+      &>select {
+        margin: -0.3em 1px 0 0 ;
+        // if there are further form elements within a table cell separated with a linebreak br
+        &.addition { margin-top: 0.3em !important ; }
+      }
+
+      // in some cases labels can be placed within the same cell as the form element
+      // best is to have it above the element
+      // PENDENT: plazierung in less-dateien, ggf. ueberfluessig
+      .label-above {
+        display: block ;
+        clear: both ;
+        overflow: hidden ;
+        margin-top: -0.5em ; // pendent: ansehen
+        //height: 1.8em ; // pendent: besser loesen, gefaellt mir nicht
+      }
+      &.single-col {
+        padding-top: 0 ;
+        padding-bottom: 0 ;
+      }
+
+      // form labels within table cells
+      //label {
+        //color: @t-cell-th-text-color ;
+        //cursor: pointer ;
+        //padding-top: 0.3em;
+      //}
+
+    } // /td /th
+
+    th {
+      color: @t-cell-th-text-color ;
+      //vertical-align: top ;
+      h4{
+        margin: 0 ;
+        padding: 0 ;
+      }
+    } // /th
+
+    td {
+      // 2nd to x column with plain data
+      // no form elements inside the cell
+      //color: @t-cell-data-text;
+      &.data {
+        //padding: 0.4363em 0.3em 0.4363em @padding-databoxes-left ;
+      }
+
+      & > span {
+        padding: 0 ;
+        margin:  0 ;
+        &.wi-smallest    { width: (@input-wi-smallest    ) ; }
+        &.wi-verysmall   { width: (@input-wi-verysmall   ) ; }
+        &.wi-small       { width: (@input-wi-small       ) ; }
+        &.wi-mediumsmall { width: (@input-wi-mediumsmall ) ; }
+        &.wi-normal      { width: (@input-wi-normal      ) ; }
+        &.wi-lightwide   { width: (@input-wi-lightwide   ) ; }
+        &.wi-wide        { width: (@input-wi-wide        ) ; }
+        &.wi-wider       { width: (@input-wi-wider       ) !important ; }
+        &.wi-verywide    { width: (@input-wi-verywide    ) ; }
+
+        &.data,
+        &.plain-data {
+          //padding:        0.1em 0.3em 0.1em @padding-databoxes-left ;
+          margin-top:    -0.2em ;
+          display:        block ;
+        }
+        &.label {
+          color:          @t-cell-th-text-color ;
+          padding:        0 0.3em 0.5em 0 !important ;
+          //display:        block ;
+        }
+        &.button-inline {
+          margin:         0 !important ;
+          padding:        0.3em 0 0 0 ;
+          clear:          both ;
+          display:        inline-block ;
+          vertical-align: middle ;
+
+          input.button,
+          input[type="button"],
+          button,
+          a.button {
+            float:        left ;
+            margin:       0 0.3em 0 0 !important ;
+          }
+        }
+
+        // special select-element
+        &.customer_vendor_picker {
+          padding:         0 !important ;
+          margin:          0 !important ;
+          display:        inline-block ;
+        }
+        &.project_picker {
+          margin:        -0.3em 0 0 0 ;
+        }
+        // area input element
+        &.area-input {
+          padding:        0 !important ;
+          margin:        -0.3em 1px 0 0 !important ;
+        }
+      } // / > span
+
+      &>div.data { padding: 0.1363em 0 ; }
+      // pendent: braucht es das?
+      // pendent: span nicht td
+      .plus1 {
+        display: inline-block ;
+        padding: 0 ;
+      }
+      & > .condensed {
+        padding: 0 !important ;
+        margin: 0 ;
+        input, select {
+          margin-top: 0.2em ;
+        }
+      }
+
+      &>span.wi-small-wide { margin: 0 24px 0 0 ; display: block ; }
+    }
+
+    // exception: thead in horizontal table
+    // Caption!
+    thead th {
+//      padding: 0.5em 0.4em 0.5em 0.3em ;
+//      font-weight: normal ;
+//      font-size: @h3-size ;
+//      color: @base-heading-color ;
+      .mx-h3-caption ;
+      border: none ;
+    }
+
+
+    // zebra effect
+    // pendent: klasse .zebra hier wahrscheinlich kaum eingsetzt
+    &.zebra {
+      tbody {
+        tr:nth-child(odd){
+          background-color: @t-row-zebra-bg-odd ;
+          th { background-color: @t-row-zebra-bg-odd  ; }
+        }
+        tr:nth-child(even){
+          background-color: @t-row-zebra-bg-even ;
+          th { background-color: @t-row-zebra-bg-even ; }
+        }
+      }
+    } // /.zebra
+
+    // checkered (bordered) table
+    &.checkered {
+      border-collapse: collapse ;
+      tbody {
+        tr {
+          background-color: @table-bg-accent ;
+          //th { background-color: #fff ; }
+          td, th {
+            border-color:   @table-border-color ;
+            border-width:   1px ;
+            border-style:   solid ;
+            padding:         0.3em 0.6em ;
+          }
+        }
+      } // /tbody
+    } // /.checkered
+
+    //PENDENT: ueberpruefen
+    &.expanded {
+      th.caption { padding-top: 1.2em ; padding-bottom: 0.6em ; }
+    }
+
+  } // /.tbl-horizontal
+
+
+
+
+
+  //--------------------------------------
+  //  LIST TABLES
+  //--------------------------------------
+
+  &.tbl-plain,
+  &.tbl-list,
+  &.tbl-list-plain {
+    tbody td a {
+      display: inline-block !important ;
+    }
+  }
+
+
+
+
+
+  //--------------------------------------
+  //  TABLE LIST (VERTICAL)
+  //--------------------------------------
+  //  table with zebra effect
+  //  this table has at least a thead and a tbody
+  //  optional a tfoot for totals
+  &.tbl-list {
+    border-spacing:       1px ;
+    border-collapse:      collapse ;
+    margin:               0 0 1.0em 0 ;
+
+    & > caption { margin: 0.1em 0 0.0em 0 ; }
+    td,
+    th {
+      padding:            0.2em 0.4em ;
+      white-space:        normal ;
+      vertical-align:     middle ;
+    }
+    th {  }
+    td {  }
+
+    // space left from window border
+    & > thead > tr th:first-child,
+    & > tbody > tr th:first-child,
+    & > tfoot > tr td:first-child {
+        padding-left:     0.8em !important ;
+    }
+
+    thead {
+      display: table-header-group;
+
+      tr {
+        height:  2.2em ;
+        th {
+          .mx-thead-th ; // mixin
+          &.nowrap { white-space: nowrap !important ; }
+
+          & > a {
+            display: block ;
+            &:link,
+            &:visited {
+              color:              @t-cell-head-text-accent ;
+              text-decoration:    underline ;
+            }
+            &:hover {
+              color:              @t-cell-head-text-accent ;
+              text-decoration:    underline ;
+            }
+            &:active,
+            &:focus {
+              color:              @t-cell-head-text-accent ;
+              text-decoration:    underline ;
+            }
+          } // /a
+          label {
+              color:              @t-cell-head-text-accent ;
+              //text-decoration:  none ;
+              &:hover {
+                //color:          @t-cell-head-text-accent ;
+                text-decoration:  underline ;
+              }
+          }
+        } // /th
+      } // tr
+      &.links-condensed {
+        tr th a { display: inline ; }
+      }
+    } // /thead
+
+    tbody {
+      border-bottom:        @table-border-color 1px solid ;
+      display:              table-row-group;
+
+      // zebra effect
+      tr:nth-child(odd)                  { background-color:   @t-row-zebra-bg-odd      ; }
+      tr:nth-child(even)                 { background-color:   @t-row-zebra-bg-even     ; }
+
+      tr:nth-child(odd).listrow_ok       { background-color:   @base-ok-bg              ; }
+      tr:nth-child(even).listrow_ok      { background-color:   @base-ok-bg-lighter      ; }
+
+      tr:nth-child(odd).listrow_error    { background-color:   @base-error-bg           ; }
+      tr:nth-child(even).listrow_error   { background-color:   @base-error-bg-lighter   ; }
+
+      // using a darker color variant here because the light one is almost invisible
+      tr:nth-child(odd).listrow_info     { background-color:   @base-info-bg-darker     ; }
+      tr:nth-child(even).listrow_info    { background-color:   @base-info-bg-dark       ; }
+
+      tr:nth-child(odd).listrow_warning  { background-color:   @base-warning-bg         ; }
+      tr:nth-child(even).listrow_warning { background-color:   @base-warning-bg-lighter ; }
+
+      // pendent: funktioniert nicht
+      & > tr:last-child > td {
+        border-bottom:      1px @table-border-color solid !important ;
+        //padding-left:     0.8em !important;
+      }
+      tr:hover {            background-color:   @t-row-zebra-bg-hover ; }
+
+      // zebra effect using manually set classes (overrides automatic from above)
+      tr.listrow0         { background-color:   @t-row-zebra-bg-odd      !important ; }
+      tr.listrow1         { background-color:   @t-row-zebra-bg-even     !important ; }
+      tr.listrow_ok0      { background-color:   @base-ok-bg              !important ; }
+      tr.listrow_ok1      { background-color:   @base-ok-bg-lighter      !important ; }
+      tr.listrow_error0   { background-color:   @base-error-bg           !important ; }
+      tr.listrow_error1   { background-color:   @base-error-bg-lighter   !important ; }
+      // using a darker color variant here because the light one is almost invisible
+      tr.listrow_info0    { background-color:   @base-info-bg-darker     !important ; }
+      tr.listrow_info1    { background-color:   @base-info-bg-dark       !important ; }
+      tr.listrow_warning0 { background-color:   @base-warning-bg         !important ; }
+      tr.listrow_warning1 { background-color:   @base-warning-bg-lighter !important ; }
+
+      td, th {
+        color:              @table-list-zebra-text-color ;
+      }
+    } // /tbody
+
+    tfoot {
+      display: table-footer-group;
+
+      tr {
+        th,
+        td { }
+      }
+    } // /tfoot
+
+  } // /.tbl-list
+
+
+
+
+
+  //--------------------------------------
+  //  TABLE PLAIN
+  //--------------------------------------
+  //  simple table without zebra effect
+
+  &.tbl-list-plain,
+  &.tbl-plain {
+    caption,
+    th.caption {
+      font-size:  120% !important ;
+      margin:     0;
+      padding:    0.6em 0 0.2em 0;
+    }
+
+    thead,
+    tbody {
+      th,
+      td { padding: 3px 0.3em 4px 0.3em !important ; }
+    }
+    thead {
+      th {
+        .mx-thead-th ; // mixin
+      }
+    }
+
+    tr {
+      th,
+      td { padding: 0.3em inherit 0.3em 0.3em ; }
+      td { }
+      th { }
+    }
+    // kompakt
+    &.condensed {
+      caption { padding-left: 0 ; }
+      td, th {
+        padding: 0.1em 7px 0.1em 1px ;
+      }
+    }
+    // liniert
+    &.lined {
+      tr {
+        border-bottom: 1px @table-border-color solid ;
+        & > th,
+        & > th {
+          vertical-align: middle !important ;
+        }
+      }
+    }
+
+  } // /.tbl-plain
+
+
+  &.tbl-list-plain {
+    thead th {
+      border-top:    1px @table-border-color solid !important ;
+      border-bottom: 1px @table-border-color solid ;
+      font-weight:   bold ;
+    }
+    tbody {
+      td,
+      th { border-bottom: 1px @table-border-color solid ; }
+    }
+  }// /.tbl-list-plain
+
+
+
+
+
+  //--------------------------------------
+  //  TABLE DIALOG
+  //--------------------------------------
+
+  //  table within div-dialogs
+  &.tbl-dialog {
+    th,
+    td {
+      background-color: @gray-verylight ;
+    }
+    th {
+      color: @t-cell-head-text ;
+      font-size: @font-size-base ;
+      vertical-align: top ;
+    }
+  }
+
+
+  //--------------------------------------
+  //  CLEAR-TABLE WITH NO FLOATING
+  //--------------------------------------
+  &.clear {
+    float: none ;
+    clear: both ;
+  }
+
+
+
+  //--------------------------------------
+  //  TABLE CLASS TEST
+  //--------------------------------------
+  //  use this class for reviewing your table html
+
+  &.test,
+  &.test-plain {
+
+    th {
+      background-color: #b3b3b3 ;
+      color: @t-cell-text-color ;
+      font-weight: normal ;
+
+      &.caption {
+        background-color: #b3b3b3 ;
+      }
+    }
+    td {
+      background-color: #cfcdd2 ;
+
+      &.longdesc,
+      &.longdescription,
+      &.long-desc,
+      &.long-description {
+        border: 1px solid green !important ;
+      }
+    }
+
+    table {
+      border: 1px #0000ff solid ;
+      border-collapse: collapse ;
+
+      td, th {
+        border: 1px #c20d18 dotted !important ;
+      }
+    }
+
+  } // /.test
+
+  &.test {
+    //border: 1px @table-border-color solid ;
+    //background-color: #bfd2ad ;
+
+    th {
+      border: 1px @gray-dark solid !important ;
+      background-color: #b3b3b3 ;
+      color: #000 ;
+      font-weight: normal ;
+
+      &.caption {
+        background-color: @table-caption-bg ;
+        //border: 1px solid red !important ;
+      }
+    }
+    td {
+      border: 1px #000 solid ;
+      background-color: #cfcdd2 ;
+
+      &.longdesc,
+      &.longdescription,
+      &.long-desc,
+      &.long-description {
+        border: 1px solid green !important ;
+      }
+    }
+
+    table {
+      border: 2px #0000ff solid ;
+      border-collapse: collapse ;
+
+      td, th {
+        border: 1px #c20d18 dotted !important ;
+      }
+    }
+
+  } // /.test
+
+
+}
+//  /table
+
+
+
+//--------------------------------------
+// TABLE & COLS DIMENSIONS
+//--------------------------------------
+
+table,
+table colgroup col {
+
+  &.wi-smallest    { width: @tcol-wi-smallest     ; }
+  &.wi-verysmall   { width: @tcol-wi-verysmall    ; }
+  &.wi-small       { width: @tcol-wi-small        ; }
+  &.wi-mediumsmall { width: @tcol-wi-mediumsmall  ; }
+  &.wi-normal      { width: @tcol-wi-normal       ; }
+  &.wi-lightwide   { width: @tcol-wi-lightwide    ; }
+  &.wi-wide        { width: @tcol-wi-wide         ; }
+  &.wi-wider       { width: @tcol-wi-wider        ; }
+  &.wi-verywide    { width: @tcol-wi-verywide     ; }
+
+  &.wi-small-small           { width: @tcol-wi-small + @tcol-wi-small ; }
+  &.wi-small-mediumsmall     { width: @tcol-wi-small + @tcol-wi-mediumsmall ; }
+  &.wi-small-normal          { width: @tcol-wi-small + @tcol-wi-normal ; }
+  &.wi-small-lightwide       { width: @tcol-wi-small + @tcol-wi-lightwide ; }
+  // pendent: noch genauer anschauen, sollte eigentlich nur für horizontale tabellen vorgesehen sein
+  &.wi-small-wide            { width: @tcol-wi-small + @tcol-wi-wide + ( @diff-input-select )  ; }
+  //&.wi-small-wide            { width: 460px ; }
+  &.wi-small-wider           { width: @tcol-wi-small + @tcol-wi-wider ; }
+  &.wi-small-verywide        { width: @tcol-wi-small + @tcol-wi-verywide ; }
+
+  &.wi-mediumsmall-small       { width: @tcol-wi-mediumsmall + @tcol-wi-lightwide ; }
+  &.wi-mediumsmall-mediumsmall { width: @tcol-wi-mediumsmall + @tcol-wi-mediumsmall ; }
+  &.wi-mediumsmall-normal      { width: @tcol-wi-mediumsmall + @tcol-wi-normal ; }
+  &.wi-mediumsmall-lightwide   { width: @tcol-wi-mediumsmall + @tcol-wi-lightwide ; }
+  &.wi-mediumsmall-wide        { width: @tcol-wi-mediumsmall + @tcol-wi-wide ; }
+  &.wi-mediumsmall-wider       { width: @tcol-wi-mediumsmall + @tcol-wi-wider ; }
+  &.wi-mediumsmall-verywide    { width: @tcol-wi-mediumsmall + @tcol-wi-verywide ; }
+
+  &.wi-normal-small       { width: @tcol-wi-normal + @tcol-wi-small ; }
+  &.wi-normal-mediumsmall { width: @tcol-wi-normal + @tcol-wi-mediumsmall ; }
+  &.wi-normal-normal      { width: @tcol-wi-normal + @tcol-wi-normal ; }
+  &.wi-normal-lightwide   { width: @tcol-wi-normal + @tcol-wi-lightwide ; }
+  &.wi-normal-wide        { width: @tcol-wi-normal + @tcol-wi-wide ; }
+  &.wi-normal-wider       { width: @tcol-wi-normal + @tcol-wi-wider ; }
+  &.wi-normal-verywide    { width: @tcol-wi-normal + @tcol-wi-verywide ; }
+
+  &.wi-lightwide-small       { width: @tcol-wi-lightwide + @tcol-wi-small ; }
+  &.wi-lightwide-mediumsmall { width: @tcol-wi-lightwide + @tcol-wi-mediumsmall ; }
+  &.wi-lightwide-normal      { width: @tcol-wi-lightwide + @tcol-wi-normal ; }
+  &.wi-lightwide-lightwide   { width: @tcol-wi-lightwide + @tcol-wi-lightwide ; }
+  &.wi-lightwide-wide        { width: @tcol-wi-lightwide + @tcol-wi-wide ; }
+  &.wi-lightwide-wider       { width: @tcol-wi-lightwide + @tcol-wi-wider ; }
+  &.wi-lightwide-verywide    { width: @tcol-wi-lightwide + @tcol-wi-verywide ; }
+
+}
+
+table {
+  &.width-full,
+  &.full-width,
+  &.wi-full { width: 100% ; }
+
+  //  moderate width with padding on the right side
+  &.width-moderate,
+  &.moderate-width,
+  &.wi-moderate {
+    width: auto ;
+    td,
+    th {
+      // PENDENT: vielleicht in pixeln angeben, statt in ems (siehe tbl-plain)
+      padding-left: 0.6em ;
+      padding-right: 1.2em ;
+    }
+  }
+}
+
+
+
+//--------------------------------------
+//  LIST-TABLES IN WRAPPERS
+//--------------------------------------
+// creates a border on the left & right side of the table
+div.wrapper,
+div.cols {
+  table.tbl-list tr {
+    border-left: 1px solid @table-border-color ;
+    border-right: 1px solid @table-border-color ;
+  }
+}
+
+//--------------------------------------
+//  LIST-TABLES NOT IN WRAPPERS
+//--------------------------------------
+#content .ui-tabs-panel > table.tbl-list caption {
+  //margin-left: @margin-from-panel-left - 0.2em ;
+  margin-left: 0.3em ;
+}
+#content {
+  .ui-tabs-panel > table.tbl-list caption {
+    //margin-left: @margin-from-panel-left - 0.2em ;
+    margin-left: 0.3em ;
+  }
+
+  & > table.tbl-plain,
+  & > table.tbl-list-plain {
+    margin-top: 1.0em ;
+  }
+}
+
+
+// --------------------------------------
+// SORT SYMBOLS
+// --------------------------------------
+
+span.sort {
+  display: inline-block ;
+  height: 100% ;
+  vertical-align: top;
+  padding-top: 6px;
+}
+span.sort_symbol {
+  display: inline-block ;
+  width: 10px ;
+  padding: 0 ;
+  margin: 0 10px 0 0 ;
+  a {
+    display: block ;
+    width: 8px ;
+    height: 8px ;
+    font-size: 7pt ;
+    padding: 0 0 3px 0 ;
+    margin: 0 ;
+    text-align: center ;
+    clear: both ;
+    float: none ;
+    vertical-align: top ;
+    &.ascending {
+      border-top:    1px @table-border-color solid ;
+      border-right:  1px @table-border-color solid ;
+      border-left:   1px @table-border-color solid ;
+    }
+    &.descending {
+      border-right:  1px @table-border-color solid ;
+      border-bottom: 1px @table-border-color solid ;
+      border-left:   1px @table-border-color solid ;
+    }
+    &.active {
+       //background-color: #000000 ;
+       color: #ffffff ;
+    }
+    &:link,
+    &:visited{
+      color: @base-light ;
+    }
+  }
+}
+
+
+
+
+
+//--------------------------------------
+// SPECIFIX TABLES (#REPORT_TABLE)
+//--------------------------------------
+// Ueberpruefen
+table#report_table_id.tbl-list {
+  & > tbody > tr > td { vertical-align: top ; }
+}
+
+
+
+//  Benutzerdefinierte Tabellen-Angaben
+//  Diese uebersteuern alle Anweisungen aus tables.less
+//  Es dürfen nur Tabellen mit Zusatzklassen oder mit IDs uebersteuert werden.
+//  Uebersteuern Sie nur wenige, bestehende Elemente, um ein einheitliches
+//  Design zu gewaehrleisten
+//  Diese Datei wird am Schluss von tables.less includiert.
+
+table{
+
+    //  Zusatzklasse zur Tabelle (Beispiel)
+    //  Betreff: xyz
+    //  Autor: hanspeter.schlaepfer@revamp-it.ch
+    &.meine-tabellen-klasse {
+
+    }
+
+    //  Tabelle mit spezieller ID (Beispiel)
+    //  Betreff: xyz
+    //  Autor: hanspeter.schlaepfer@revamp-it.ch
+    &#meine-spezielle-tabelle {
+
+    }
+
+
+    //  Tabelle mit Konten-Uebersicht (Kontoplan)
+    //  Betreff: Kontoplan
+    //  Autor: hanspeter.schlaepfer@revamp-it.ch
+    &#konten-plan {
+        tbody tr{
+            td:first-child {
+                text-align: right !important;
+            }
+            &.heading td {
+                font-size: @font-size-large;
+                border-top: 1px #999 solid;
+            }
+        }
+        tr:first-child {
+             &.heading td {
+                border: none;
+            }
+        }
+    }
+
+
+// PENDENT: genauer anschauen
+
+  &#eurtable {
+    border-collapse: collapse;
+    width: 100%;
+  }
+
+  tr.category {
+    //  background set via jquery
+  }
+
+  tr.chart {
+    border: 0;
+  }
+
+  td.chartname {
+    padding-left: 50px;
+  }
+
+  tr.chartrow {
+    font-size: 75%;
+  }
+
+  .guv_row_background {
+    background:#f0f0f0;
+  }
+
+  .tr_error {
+    background-color: #ffc9c9;
+  }
+
+
+}
diff --git a/css/design40/less/tables_legacy.less b/css/design40/less/tables_legacy.less
new file mode 100644
index 000000000..5bcdaf6de
--- /dev/null
+++ b/css/design40/less/tables_legacy.less
@@ -0,0 +1,314 @@
+// PENDENT: wird vorlaeufig noch nicht gerendert
+// PENDENT: Klassen ggf. entfernen oder ersetzen, falls nicht mehr gebraucht
+tr {
+
+  tr{
+
+    /* Subtotal innerhalb laengerer Tabelle (tbl-list) */
+    /* ggf. OBSOLETE */
+    &.total-sub{
+      height: 2.0em;
+      td{
+        border-top: 1px solid #ccc ;
+        border-bottom: 2px solid #999 ;
+        font-weight: bold;
+        color: @gray-mediumdark ;
+      }
+      &:after td{
+        padding-top: 0.2em;
+      }
+    }
+
+
+    /* ??? */
+    &.rule-before th,
+    &.rule-before td {
+      padding-top: 2px;
+      border-top: 2px solid #EBEBEB;
+    }
+
+    /* -------------------- */
+    /* Kopfzeile OBSOLETE */
+    /* -------------------- */
+    &.listheading th {
+      padding: 0.6em 0.2em;
+      background-color: #bcbcbc;
+      color: @gray-mediumdark;
+      font-size: @font-size-base ;
+
+      text-align: left;
+      border-style: none;
+
+
+      a{
+        &:link,
+        &:visited,
+        &:active,
+        &:hover {
+          color: #000;
+        }
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    } /* /.listheading th */
+
+
+
+    /* -------------------- */
+    /* Zebra-Effekt (OBSOLETE)*/
+    /* -------------------- */
+
+    &.listrow1 td,
+    &.listrow:nth-child(even) td {
+      background-color: #FFFFFF;
+      color: black;
+      vertical-align: middle;
+
+    }
+    &.listrow0 td,
+    &.listrow:nth-child(odd) td {
+      background-color: @gray-lighter;
+      color: black;
+      vertical-align: middle;
+    }
+
+    /* OBSOLETE: nicht mehr noetig */
+    &.listrow0,
+    &.listrow1{
+      td { }
+    }
+
+    /* -------------------- */
+    /* Total-Zeile (OBSOLETE) */
+    /* -------------------- */
+    /* hps: sollte in tfoot verlagert werden */
+    /* vor .listrow* verschoben */
+    &.listtotal td {
+      background-color: #ffffff;
+      color: black;
+      font-weight: bold;
+      padding: 1.0em 0.2em !important;
+      border-bottom: 3px solid black;
+    }
+
+
+  } /* /tr */
+
+
+
+/* ------------------------------------------- */
+/* Abmessungen                 */
+/*                       */
+/* aufgrund übergeordnetem Selektor      */
+/* ------------------------------------------- */
+
+.cols-3 {
+  &.th-small    > table.tbl-horizontal > tbody > tr > th { width: @tt-small+1.0em ; }
+  &.th-mediumsmall > table.tbl-horizontal > tbody > tr > th { width: @tt-mediumsmall+1.6em !important; }
+  &.th-mediumsmall > table.tbl-horizontal > tbody > tr > th { width: 140px !important; }
+  &.th-normal      > table.tbl-horizontal > tbody > tr > th { width: @tt-normal+1.0em ; }
+  &.th-wide        > table.tbl-horizontal > tbody > tr > th { width: @tt-wide+1.0em ; }
+  &.th-wider       > table.tbl-horizontal > tbody > tr > th { width: @tt-wider+1.0em ; }
+  &.th-verywide    > table.tbl-horizontal > tbody > tr > th { width: @tt-verywide+1.0em ; }
+
+  &.td-small       > table.tbl-horizontal > tbody > tr > td { width: @tt-small+1.0em ; }
+  &.td-mediumsmall > table.tbl-horizontal > tbody > tr > td { width: @tt-mediumsmall+1.0em ; }
+  &.td-normal      > table.tbl-horizontal > tbody > tr > td { width: @tt-normal+3.0em !important ; }
+  &.td-wide        > table.tbl-horizontal > tbody > tr > td { width: @tt-wide+1.0em ; }
+  &.td-wider       > table.tbl-horizontal > tbody > tr > td { width: @tt-wider+1.0em ; }
+  &.td-verywide    > table.tbl-horizontal > tbody > tr > td { width: @tt-verywide+1.0em ; }
+
+  > table.tbl-horizontal.col {
+  min-width: 30% ;
+  }
+
+
+}
+
+
+
+/* -------------------------- */
+/* Daten innerhalb UI-Tabs */
+/* -------------------------- */
+/* PENDENT: OBSOLETE */
+.ui-tabs-panel{
+
+  table{
+    tr{
+      /* Zebra-Effekt */
+      &:nth-child(odd){ }
+      &:nth-child(even){ }
+
+      td,
+      th{ }
+      th{}
+    }
+  }
+  /* /table */
+}
+/* .ui-tabs-panel */
+
+
+
+
+
+
+
+/* ggf. Tabellen */
+/* OBSOLETE */
+.subsubheading {
+  color: #000000;
+  font-weight: bolder;
+  text-decoration: underline;
+}
+/* OBSOLETE */
+.optionen {
+  border: dashed;
+  border-width: 1px;
+  background: #FFFFE0;
+}
+
+
+
+/* ./templates/webpages/oe/sales_order.html:20 */
+/* ./js/common.js:213 */
+/* PENDENT: genauer anschauen */
+table#display_row{
+
+
+  listrow0 td,
+  listrow1 td,
+  listheading td{
+
+  }
+
+  td{
+    width: auto;
+    padding: 0.4em 0.2em 0.2em 0.12em !important;
+
+    &[colspan="11"] {
+      padding-top: -0.0em !important;
+      padding-bottom: 0.6em !important;
+      border-bottom: 1px @gray-mediumdark solid;
+      color: @gray-mediumdark;
+
+      b{
+        font-weight: normal;
+      }
+
+      input,
+      font{
+        padding: 0 2.6em 0 0;
+      }
+    }
+  }
+
+
+} /* /table#display_row */
+
+
+/* Bezeichnungen aendern */
+/*/templates/webpages/reconciliation/_linked_transactions.html:54*/
+.listrow_error1,
+.listrow_error:nth-child(even) {
+  background-color: #F6CECE;
+  color: black;
+  vertical-align: top;
+}
+.listrow_error0,
+.listrow_error:nth-child(odd) {
+  background-color: #F5A9A9;
+  color: black;
+  vertical-align: top;
+}
+/* Bezeichnungen aendern */
+/* ./bin/mozilla/vk.pl:259 */
+.listrowempty {
+  background-color: #FFFFFF;
+  color: black;
+  vertical-align: top;
+}
+/* PENDENT: Anschauen! Sollte in TR sein und nicht im TBODY */
+
+/* linked_transactions.html */
+tbody listrow_error{
+
+}
+
+
+/* Bezeichnungen aendern */
+/* bin/mozilla/wh.pl:935 */
+/* bin/mozilla/wh.pl:957 */
+/* bin/mozilla/ar.pl:1193 */
+/* bin/mozilla/ca.pl:489 */
+/* bin/mozilla/gl.pl:588 */
+/* bin/mozilla/ap.pl:1108 */
+/* bin/mozilla/vk.pl:438 */
+/* bin/mozilla/vk.pl:451 */
+/* bin/mozilla/rp.pl:916 */
+/* bin/mozilla/rp.pl:1075 */
+/* bin/mozilla/rp.pl:1110 */
+/* bin/mozilla/rp.pl:1583 */
+/* bin/mozilla/rp.pl:1587 */
+/* bin/mozilla/oe.pl:1263 */
+/* bin/mozilla/ic.pl:564 */
+/* SL/Controller/FinancialOverview.pm:248 */
+/* templates/webpages/rp/tax_report.html:38 */
+.listsubtotal {
+  background-color: rgb(236,233,216);
+  color: black;
+  font-weight: bolder;
+}
+
+/* Verkaufsbericht */
+/* ./bin/mozilla/vk.pl:343 & 350 */
+.listmainsortheader {
+  background-color: rgb(236,233,216);
+  color: red;
+  font-weight: bolder;
+  padding-left: 10px;
+  padding-top: 0px;
+}
+/* OBSOLETE */
+.listmainsortsubtotal {
+  background-color: rgb(236,233,216);
+  color: red;
+  font-weight: bolder;
+  padding-left: 10px;
+}
+/* ./bin/mozilla/vk.pl:366 */
+.listsubsortheader {
+  background-color: rgb(236,233,216);
+  color: green;
+  font-weight: bolder;
+  padding-left: 20px
+}
+/* OBSOLETE */
+.listsubsortsubtotal {
+  background-color: rgb(236,233,216);
+  color: green;
+  font-weight: bolder;
+  padding-left: 20px
+}
+/* OBSOLETE */
+.listsortdescription {
+  background-color: rgb(236,233,216);
+  color: black;
+  font-weight: normal;
+  padding-left: 30px
+}
+
+/* the cvars table in the 2. row */
+/* /templates/webpages/oe/sales_order.html:52 */
+.row2-cvars-table {
+  tr { vertical-align: top }
+  th {
+    text-align: right;
+    padding-left: 15px;
+    padding-right: 0 ;
+  }
+  td,
+  th { padding-top: 10px }
+}
+
diff --git a/css/design40/less/variables.less b/css/design40/less/variables.less
new file mode 100755
index 000000000..b3aba6c4c
--- /dev/null
+++ b/css/design40/less/variables.less
@@ -0,0 +1,962 @@
+/* ------------------------------------------------------------- */
+/* VARIABLES (variables.less)                                    */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// VARIABLES (Less-Style) for general use (most of it is Bootstrap-Stuff)
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+// CONTENTS:
+// - COLORS
+//   - Greys
+//   - Base
+//   - Divers Color Specifications
+// - SCAFFOLDING
+//   - Body/Content Background color, Text color
+//   - Content Boxes (Wrapper & Columns Container)
+// - LINKS
+// - TYPOGRAPHY
+//   - Font family
+//   - Font size
+//   - Line height
+//   - Heading 1 - 4
+//   - Heading 1 (H1)
+//   - Heading Controlpanels
+//   - Data Types
+// - ICONOGRAPHY (ggf. OBSOLETE)
+// - PAGE COMPONENTS
+//   - Z-Index
+//   - Dashboard (frame-header)
+//   - Menu Top (CSS)
+//   - Menu Left (JS)
+//   - Context Menu (layout-actionbar) -> missing
+//   - Component properties
+//   - Tabs
+// - TABLES
+//   - Table & Caption
+//   - Table Cells
+//   - Zebra effect in list tables
+//   - Dimensions (Table Cells Only) (OBSOLETE)
+// - BUTTONS
+//   - STANDARD-Button Strong (with Submission / data manipulation)
+//   - NEUTRAL-Button (NO Submission)
+//   - Diverse Button states
+// - DROPDOWNS (OBSOLETE)
+// - FORMS
+//   - Input elements
+//   - Legend, Labels, Fieldsets
+//   - Highlighting (Focus and so on)
+//   - Dimensions (input, select) (OBSOLETE)
+// - MESSAGES
+// - DIMENSIONS
+//   - Standard Dimensions (even for TABLE CELLS)
+//   - Dimensions for for DIVs
+//   - Dimensions for Table Colums (TH, TD & Col)
+//   - Dimensions for combined rows with combination Table column widths
+//   - Dimensions for Form input elements
+//   - Dimensions for Form Select elements
+//   - Dimensions for Textarea elements with standard dimensions
+//   -
+//   -
+// ----------------------------------------------------------------------------
+
+
+
+
+// --------------------------------------
+// COLORS (GREYs, BASE COLORS & OTHERS)
+// --------------------------------------
+// Base Colors see variables_color[*-9].less
+// Include the preferred color scheme in style.less before including this less file
+
+// -----------------------
+// General text color (label & data)
+// -----------------------
+// Standard text
+@base-primary:         @base-text-color;
+@base-label:           @base-data-label-color;
+@base-label-bg:        @base-lighter;
+
+// -----------------------
+// MESSAGES & INFO TYPES
+// -----------------------
+// color definitions in variables_color_[*-9].less
+@base-ok:              @color-green-strong;
+@base-ok-bg:           @color-green-light;
+@base-ok-bg-lighter:   @color-green-lighter;
+
+@base-error:               @color-red-strong;
+@base-error-bg:            @color-red-light;
+@base-error-bg-lighter:    @color-red-lighter;
+
+@base-info:                @color-blue-strong;
+@base-info-bg:             @color-blue-light;
+// darker variant for table row alternation
+@base-info-bg-dark:        @color-blue-dark;
+@base-info-bg-darker:      @color-blue-darker;
+
+@base-warning:             @color-orange-strong;
+@base-warning-bg:          @color-orange-light;
+@base-warning-bg-lighter:  @color-orange-lighter;
+
+// Positive & negative colors
+@base-positive:        @color-green-strong;
+@base-positive-bg:     @color-green-light;
+@base-negative:        @color-red-strong;
+@base-negative-bg:     @color-red-light;
+
+
+
+
+
+// --------------------------------------
+// CONTENT CONTAINER
+// --------------------------------------
+
+@text-min-width:            400px ;
+@text-max-width:            600px ;
+
+// like Wrappers, Colums Containers, Flash-Messages and Record Selection
+//@content-padding:           0 0 0 0; // 0 is OK otherwise there will be a border after the ui-tabs-panels
+//@content-margin:            101px 0 1.0em 0; // PENDENT: ueberpruefen
+// working alternative
+@content-padding:           101px 0 0 0; // 0 is OK otherwise there will be a border after the ui-tabs-panels
+@content-margin:            0 0 1.0em 0; // PENDENT: ueberpruefen
+
+
+
+@margin-left-from-content:  1.2em ; // directly inside #content
+@margin-left-from-wrapper:  0   ;       // directly inside .wrapper
+
+@margin-from-content:       1em   1em 1em   @margin-left-from-content ; // directly inside #content
+@margin-from-wrapper:       1.6em 0   0.4em @margin-left-from-wrapper ; // directly inside .wrapper
+
+// Paragraphs, messages
+@text-container-width:      auto ;
+@text-container-min-width:  @text-min-width ;
+@text-container-max-width:  @text-max-width ;
+
+@messages_width:            60.0em;
+@messages-min-width:        60.0em;
+@messages-max-width:        40.0em;
+
+@contentbox-margin:         1.0em 1.0em 1.0em @margin-from-panel-left ;
+@contentbox-padding:        0.6em 1.0em 1.2em 1.8em ;
+@contentbox-radius:         0.6em ;
+
+// -----------------------
+// Component properties
+// -----------------------
+// Based on 14px font-size and 1.428 line-height (~20px to start)
+// PENDENT: UI-Tabs und so weiter
+// PENDENT: genauer anschauen, ggf. obsolete da nicht verwendet
+
+@padding-base-vertical:         6px;
+@padding-base-horizontal:       12px;
+
+@padding-large-vertical:        10px;
+@padding-large-horizontal:      16px;
+
+@padding-small-vertical:        5px;
+@padding-small-horizontal:      10px;
+
+@line-height-large:             1.33;
+@line-height-small:             1.5;
+
+@border-radius-base:            4px;
+@border-radius-large:           6px;
+@border-radius-small:           3px;
+
+@component-active-color:        @base-superlight;
+@component-active-bg:           @base-primary; // PENDENT: Variable nicht vorgesehen dafuer
+
+@caret-width-base:              4px;
+@caret-width-large:             5px;
+
+@margin-from-panel-left:        1.2em; // for panels and wrappers
+
+@padding-databoxes-left:        0.6em ; // for input, span.data in data tables
+
+
+
+
+
+
+
+
+// --------------------------------------
+// LINKS
+// --------------------------------------
+@link-color:            @base-link-color;
+@link-hover-color:      lighten(@base-link-color, 10%);
+@link-decoration:       underline;
+@link-hover-decoration: underline;
+@link-weight:           bold;
+
+
+
+
+
+// --------------------------------------
+// TYPOGRAPHY
+// --------------------------------------
+
+// -----------------------
+// Font family
+// -----------------------
+@font-family-sans-serif:  Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif ;
+@font-family-serif:       Georgia, "Times New Roman", Times, serif ;
+@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+
+@font-family-base:        @font-family-sans-serif;
+
+// -----------------------
+// Font size
+// -----------------------
+@font-size-base:          11pt; // vorh.14px
+@font-size-large:         ceil(@font-size-base * 1.25); //  ~18px
+@font-size-medium:        ceil(@font-size-base * 1.0 ); //  ~18px
+@font-size-small:         ceil(@font-size-base * 0.85); //  ~11px
+@font-size-smaller:       ceil(@font-size-base * 0.76); //  ~12px
+@font-size-verysmall:     ceil(@font-size-base * 0.6); //   ~12px
+
+// -----------------------
+// Line height
+// -----------------------
+@line-height-base:        1.428571429; //  20/14
+@line-height-computed:    floor(@font-size-base * @line-height-base); //  ~20px
+
+// -----------------------
+// Heading 1-4
+// -----------------------
+@headings-font-family:    @font-family-base;
+@headings-weight:         500;
+@headings-line-height:    1.3em;
+@headings-color:          @base-heading-color;
+@headings-color-accent:   #000;
+
+@headings-color-error:    @base-error;
+@headings-color-confirm:  @base-ok;
+
+@h1-size:            floor(@font-size-base * 1.1); //  ~**px
+@h2-size:            floor(@font-size-base * 1.2); //  ~**px
+@h3-size:            ceil(@font-size-base * 1.1); //  ~**px
+@h4-size:            ceil(@font-size-base * 1.0); //  ~**px
+@h5-size:            @font-size-base;
+@h6-size:            ceil(@font-size-base * 0.85); //  ~**px
+
+@h1-style:           normal;
+@h2-style:           normal;
+@h3-style:           normal;
+@h4-style:           normal;
+
+@h1-weight:          bold;
+@h2-weight:          bold;
+@h3-weight:          normal;
+@h4-weight:          normal;
+
+// -----------------------
+// Heading 1 (H1)
+// -----------------------
+// Fixed on top of every page together with the action bar
+@base-h1-color:        @_base-h1-color;
+@base-h1-bg:           @_base-h1-bg;
+@h1-padding:            0.7em 0.5em 0.7em 1.3em;
+@h1-margin:             0;
+@base-h1-border-top:  @_base-h1-border-top;
+// -----------------------
+// Heading Controlpanels
+// -----------------------
+@h3-controlpanel-size:    @h3-size;
+@h4-controlpanel-size:    @h4-size;
+
+@h3-controlpanel-style:   bold;
+@h4-controlpanel-style:   bold;
+
+@h3-controlpanel-weight:  normal;
+@h4-controlpanel-weight:  bold;
+
+// -----------------------
+// Data types
+// -----------------------
+@heading-and-label-color:   @base-data-label-color  ;
+@heading-and-label-bg:      @base-data-label-color  ;
+@data-color:                @base-data-color ;
+
+@long-desc-size:            @font-size-verysmall ;
+@long-desc-color:           @base-text-color ;
+
+
+
+// --------------------------------------
+// Iconography (ggf. OBSOLETE)
+// --------------------------------------
+//@icon-font-path:          "../bootstrap/fonts/";
+//@icon-font-name:          "glyphicons-halflings-regular";
+
+
+
+
+
+// --------------------------------------
+// PAGE COMPONENTS
+// --------------------------------------
+
+// -----------------------
+// Z-index
+// -----------------------
+// Stack-/Layer Positions of components
+// only for specialists
+
+// General
+@zindex-dropdown:          1000;
+@zindex-popover:           1010;
+@zindex-tooltip:           1030;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+// Components
+@zindex-dashboard:         1040; // frame-header
+@zindex-navbar:            1999; // menuv3 must be on top
+@zindex-h1:                1020; // h1 inside content
+
+@zindex-actionbar:               1030; // action-bar (Workflow)
+@zindex-actionbar-action:        1031;
+@zindex-actionbar-combobox:      1031;
+@zindex-actionbar-combobox-head: 1033;
+@zindex-actionbar-combobox-list: 1032;
+
+// -----------------------
+// DASHBOARD (FRAME HEADER)
+// -----------------------
+@dashbrd_bg:            @_dashbrd_bg ;
+@dashbrd_text:          @_dashbrd_text ;
+@dashbrd_link:          @_dashbrd_link ;
+@dashbrd_link_hover:    @_dashbrd_link_hover ;
+@dashbrd_link_deco:     underline ;
+@dashbrd_input_bg:      @_dashbrd_input_bg;
+@dashbrd_input_text:    @_dashbrd_input_text ;
+
+// -----------------------
+// Menue (menuv3)
+// -----------------------
+@menu_bg:               @_menu_bg ;
+@menu_link:             @_menu_link ;
+
+@menu_link_bg:          @_menu_link_bg ; // display:block
+@menu_link_hover:       @_menu_link_hover ;
+@menu_link_hover_bg:    @_menu_link_hover_bg ;
+@menu_link_hover_deco:  underline ;
+@menu_border_color:     @_menu_border_color ;
+@menu_border:           1px @menu_border_color solid ;
+
+@menu_link_bg_level1:         @_menu_link_bg_level1 ;
+@menu_link_bg_level1_hover:   @_menu_link_bg_level1_hover ;
+@menu_link_bg_level2:         @_menu_link_bg_level2 ;
+@menu_link_bg_level2_hover:   @_menu_link_bg_level2_hover ;
+@menu_link_bg_level3:         @_menu_link_bg_level3 ;
+@menu_link_bg_level3_hover:   @_menu_link_bg_level3_hover ;
+
+
+// -----------------------
+// Menu Left (JS & HTML)
+// -----------------------
+@menu_left_bg:                    @_menu_left_bg ;
+@menu_left_level_1_color:         @_menu_left_level_1_color ;
+@menu_left_level_1_bg:            @_menu_left_level_1_bg ;
+@menu_left_level_1_hover_color:   @_menu_left_level_1_hover_color ;
+@menu_left_level_1_hover_bg:      @_menu_left_level_1_hover_bg ;
+@menu_left_level_2_color:         @_menu_left_level_2_color ;
+@menu_left_level_2_bg:            @_menu_left_level_2_bg ;
+@menu_left_level_2_hover_color:   @_menu_left_level_2_hover_color ;
+@menu_left_level_2_hover_bg:      @_menu_left_level_2_hover_bg ;
+@menu_left_level_3_color:         @_menu_left_level_3_color ;
+@menu_left_level_3_bg:            @_menu_left_level_3_bg ;
+@menu_left_level_3_hover_color:   @_menu_left_level_3_hover_color ;
+@menu_left_level_3_hover_bg:      @_menu_left_level_3_hover_bg ;
+
+// Additional Variables for Menu Left (JS)
+@menu_open_color: @_menu_open_color;
+@menu_open_bg:    @_menu_open_bg;
+
+// -----------------------
+// CONTEXT-MENU (LAYOUT-ACTIONBAR)
+// -----------------------
+@actionbar-bg:                  @_actionbar-bg;
+@actionbar-bg-active:           @_actionbar-bg-active;
+//@actionbar-bg-hover:          @_actionbar-bg-hover;
+@actionbar-font-color:          @_actionbar-font-color;
+@actionbar-font-color-active:   @_actionbar-font-color-active;
+@actionbar-border-color:        @_actionbar-border-color;
+@actionbar-border-color-active: @_actionbar-border-color-active;
+@actionbar-hover-bg:            @_actionbar-hover-bg;
+@actionbar-hover-color:         @_actionbar-hover-color;
+@actionbar-border-radius:       4px ;
+@actionbar-font-color-disabled: @_actionbar-font-color-disabled;
+
+// -----------------------
+// Tabs
+// -----------------------
+// background tabs panel (data/content)
+
+@tabs-bg:                   @_tabs-bg ;
+@tabs-panel-bg:             @_tabs-panel-bg ;
+@tabs-border-color:         @_tabs-border-color ;
+@tabs-border-radius:        4px ;
+
+@tabs-default-bg:           @_tabs-default-bg;
+@tabs-default-color:        @_tabs-default-color;
+@tabs-default-hover-bg:     @_tabs-default-hover-bg;
+@tabs-default-hover-color:  @_tabs-default-hover-color;
+
+@tabs-active-bg:            @_tabs-active-bg;
+@tabs-active-color:         @_tabs-active-color;
+@tabs-active-hover-bg:      @_tabs-active-hover-bg;
+@tabs-active-hover-color:   @_tabs-active-hover-color;
+
+
+
+
+
+// --------------------------------------
+// Dropdowns (OBSOLETE?)
+// --------------------------------------
+
+@dropdown-bg:                    #fff;
+@dropdown-border:                rgba(0,0,0,.15);
+@dropdown-fallback-border:       #ccc;
+@dropdown-divider-bg:            #e5e5e5;
+
+@dropdown-link-color:            @gray-dark;
+@dropdown-link-hover-color:      darken(@gray-dark, 5%);
+@dropdown-link-hover-bg:         #f5f5f5;
+
+@dropdown-link-active-color:     @component-active-color;
+@dropdown-link-active-bg:        @component-active-bg;
+
+@dropdown-link-disabled-color:   @gray-light;
+
+@dropdown-header-color:          @gray-light;
+
+@dropdown-caret-color:           #000;
+
+
+
+
+
+// --------------------------------------
+// FORMS
+// --------------------------------------
+
+// -------------------
+// Input elements
+// -------------------
+@input-bg:                       #fff;
+@input-bg-disabled:              @gray-lighter;
+
+@input-color:                    @gray-standard;
+@input-border:                   #ccc;
+@input-border-radius:            @border-radius-base;
+@input-border-focus:             #66afe9;
+
+@input-color-placeholder:        @gray-light;
+
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+@input-height-large:             (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+@input-group-addon-bg:           @gray-lighter;
+@input-group-addon-border-color: @input-border;
+
+// -------------------
+// Legend, Labels, Fieldsets
+// -------------------
+@legend-color:                   @gray-dark;
+@legend-border-color:            #e5e5e5;
+
+// -------------------
+//  Highlighting (Focused, Activated)
+// -------------------
+@formelement-focus-bg:             @_formelement-focus-bg ;
+@formelement-focus-text:           @_formelement-focus-text ;
+@formelement-focus-border:         @_formelement-focus-border ;
+
+
+
+
+
+// --------------------------------------
+// BUTTONS
+// --------------------------------------
+@button-font-weight:                normal;
+@button-border-radius:              6px ;
+// -------------------
+// STANDARD-Button Strong (with Submission / data manipulation)
+// -------------------
+// Standard
+@button-strong-color:               @_button-strong-color;
+@button-strong-bg:                  @_button-strong-bg;
+@button-strong-border:              1px @_button-strong-border-color solid;
+
+// Hover
+@button-strong-hover-color:         @_button-strong-hover-color;
+@button-strong-hover-bg:            @_button-strong-hover-bg;
+@button-strong-hover-border:        1px @_button-strong-hover-border-color solid;
+
+// Active
+@button-strong-active-color:        @_button-strong-active-color;
+@button-strong-active-bg:           @_button-strong-active-bg;
+@button-strong-active-border:       1px @_button-strong-active-border-color solid;
+
+// -------------------
+// NEUTRAL-Button (NO Submission)
+// -------------------
+// Standard
+@button-neutral-color:               @_button-neutral-color;
+@button-neutral-bg:                  @_button-neutral-bg;
+@button-neutral-border:              1px @_button-neutral-border-color solid;
+
+// Hover
+@button-neutral-hover-color:         @_button-neutral-hover-color;
+@button-neutral-hover-bg:            @_button-neutral-hover-bg;
+@button-neutral-hover-border:        1px @_button-neutral-hover-border-color solid;
+
+// Active
+@button-neutral-active-color:        @_button-neutral-active-color;
+@button-neutral-active-bg:           @_button-neutral-active-bg;
+@button-neutral-active-border:       1px @_button-neutral-active-border-color solid;
+
+// -------------------
+// Diverse Button states
+// -------------------
+//@button-primary-color:              @_button-primary-color;
+//@button-primary-bg:                 @_button-primary-bg;
+//@button-primary-border:             1px darken(@button-primary-bg, 5%) solid;
+
+@button-success-color:              @_button-success-color;
+@button-success-bg:                 @_button-success-bg;
+@button-success-border:             1px darken(@color-green-light, 5%) solid;
+
+@button-warning-color:              @_button-warning-color;
+@button-warning-bg:                 @_button-warning-bg;
+@button-warning-border:             1px darken(@button-warning-bg, 5%) solid;
+
+@button-info-color:                 @_button-info-color;
+@button-info-bg:                    @_button-info-bg;
+@button-info-border:                1px darken(@button-info-bg, 5%) solid;
+
+@button-link-disabled-color:        @_button-link-disabled-color;
+
+
+
+
+
+// --------------------------------------
+// CONTROL PANELS
+// --------------------------------------
+
+@controlpanel-margin:         @contentbox-margin      ;
+@controlpanel-padding:        1.2em 1.0em 0.8em 0.9em ;
+@controlpanel-padding-narrow: 0.4em 1.0em 0.6em 0.9em ; // e.g. for input-panels
+@controlpanel-padding-bold:   0.8em 1.0em 1.4em 1.2em ; // PENDENT: wozu?
+@controlpanel-bg-color:       @_controlpanel-bg-color ;
+@controlpanel-bg-style:        @_bg_style_controlpanel ;
+@controlpanel-color:          @_controlpanel-color    ;
+@controlpanel-border:         1px @_controlpanel-border-color solid  ;
+@controlpanel-radius:         @contentbox-radius      ;
+
+// PENDENT: noetig?
+@controlpanel-bg-hover:       @base-superdark        ;
+@controlpanel-bg-hover-text:  @base-light            ;
+@controlpanel-active-bg:      @base-darker            ;
+@controlpanel-active-text:    @base-lighter          ;
+
+@controlpanel-h3-color:       @h3-size ;
+@controlpanel-h3-size:        110%    ;
+@controlpanel-h3-style:       normal  ;
+@controlpanel-h3-weight:      normal  ;
+
+@controlpanel-h4-color:       @_controlpanel-header-color ;
+@controlpanel-h4-size:        @h4-size    ;
+@controlpanel-h4-weight:      normal ;
+@controlpanel-h4-style:       normal  ;
+
+// select item control panel
+@controlpanel-select-item-padding:   0.6em 1.0em 0.6em 0.8em ;
+
+@instructionbox-bg:           @controlpanel-bg-color ;
+@instructionbox-border:       1px @_controlpanel-border-color solid ;
+
+
+
+
+
+// --------------------------------------
+// TABLES
+// --------------------------------------
+
+@table-border-color:             @_table-border-color; //  table and cell border
+
+@table-bg:                       @_table-bg; // overall background-color
+@table-bg-accent:                @_table-bg-accent; // for striping
+@table-bg-hover:                 @_table-bg-hover;
+@table-bg-active:                @_table-bg-active;
+
+@table-caption-bg:               @_table-caption-bg;
+@table-caption-color:            @_table-caption-color;
+@table-caption-size:             @h3-size - 2pt ;
+@table-caption-style:            @h3-style ;
+@table-caption-weight:           @h3-weight ;
+
+
+// --------------
+// Table Cells
+// --------------
+@t-cell-text-color:              @_t-cell-text-color;
+@t-cell-th-text-color:           @_t-cell-th-text-color; // even for label/.label in tables
+
+@t-cell-head-bg:                 @_t-cell-head-bg;
+@t-cell-head-bg-accent:          @_t-cell-head-bg-accent;
+@t-cell-head-text:               @_t-cell-head-text;
+@t-cell-head-text-accent:        @_t-cell-head-text-accent;
+
+@t-cell-label-text:              @_t-cell-label-text;
+@t-cell-label-text-accent:       @_t-cell-label-text-accent;
+@t-cell-data-text:               @_t-cell-data-text;
+@t-cell-data-text-accent:        @_t-cell-data-text-accent;
+
+@t-cell-databox-text-color:       @_t-cell-databox-text-color ;
+@t-cell-databox-border-color:     @_t-cell-databox-border-color ;
+
+
+@t-cell-foot-text:               @_t-cell-foot-text;
+
+// -----------------------
+// Zebra effect in list tables
+// -----------------------
+@t-row-zebra-bg-odd:             @_t-row-zebra-bg-odd;
+@t-row-zebra-bg-even:            @_t-row-zebra-bg-even;
+
+@t-row-zebra-bg-hover:           @_t-row-zebra-bg-hover;
+
+@table-list-zebra-text-color:     @_table-list-zebra-text-color ;
+@table-list-zebra-link-color:     @_table-list-zebra-link-color ;
+
+@t-row-zebra-bg-special:         #FEF2C5; // PENDENT: ANSCHAUEN
+@t-row-zebra-bg-highlight:       #B4F4FE; // PENDENT: ANSCHAUEN
+
+
+// PENDENT: Footer
+
+
+
+// --------------------------------------
+// MESSAGES
+// --------------------------------------
+
+@message-margin:         3.6em 2.0em 0.6em 1.0em ;
+@message-padding:        0.6em 0.6em 0.5em 0.6em ;
+
+// Error
+@message_error_bg:       @base-error-bg ;
+@message_error_border:   1px solid @base-error ;
+@message_error_text:     @base-error ;
+// OK
+@message_ok_bg:          @base-ok-bg ;
+@message_ok_border:      1px solid @base-ok ;
+@message_ok_text:        @base-ok ;
+// Info & Hint
+@message_info_bg:        @base-info-bg ;
+@message_info_border:    1px solid @base-info ;
+@message_info_text:      @base-info ;
+// Warning
+@message_warning_bg:     @base-warning-bg ;
+@message_warning_border: 1px solid @base-warning ;
+@message_warning_text:   @base-warning ;
+// Hint (like Info above, just to make it sure working)
+@message_hint_bg:        @message_info_bg ;
+@message_hint_border:    @message_info_border ;
+@message_hint_text:      @message_info_text ;
+
+
+
+
+
+// --------------------------------------
+// JQUERY-UI STUFF
+// --------------------------------------
+
+
+// -----------------------
+// Date picker
+// -----------------------
+@jquery_datepicker-bg-color: @base-superlight ;
+
+// -----------------------
+// UI-Dialog
+// -----------------------
+@jquery_ui_dialog-bg-color:   @base-verylight ;
+@jquery_ui_dialog-bg-style:   @_bg_style_body ;
+
+// -----------------------
+// TOOLTIPSTER
+// -----------------------
+@jquery_ui_tooltipster-bg-color:       @base-standard ;
+@jquery_ui_tooltipster-border-color:   @base-lighter ;
+@jquery_ui_tooltipster-color:         @base-verylight ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// --------------------------------------
+// DIMENSIONS (width)
+// --------------------------------------
+// Only for Containers like DIV, TABLE, TH, TD, COL, P
+
+// -----------------------
+// Standard Dimensions (even for table cells)
+// -----------------------
+// Table cells:   COL, TD, TH, DIV
+@wi-smallest:       42px ;  //   2.6em ; // one or two ciphers
+@wi-verysmall:      80px ;  //   5.0em ;
+@wi-small:         128px ;   //   8.0em ; // also date e.g. 2018/06/06
+@wi-mediumsmall:   160px ;   //  10.0em ;
+@wi-normal:        208px ;   //  13.0em ;
+@wi-lightwide:     256px ;   //  16.0em ;
+@wi-wide:          320px ;   //  20.0em ;
+@wi-wider:         384px ;   //  24.0em ;
+@wi-verywide:      576px ;   //  36.0em ;
+
+// -----------------------
+// Standard Dimensions for for DIVs
+// -----------------------
+@div-wi-smallest:     (@wi-smallest    ) ;
+@div-wi-verysmall:    (@wi-verysmall   ) ;
+@div-wi-small:        (@wi-small       ) ;
+@div-wi-mediumsmall:  (@wi-mediumsmall ) ;
+@div-wi-normal:       (@wi-normal      ) ;
+@div-wi-lightwide:    (@wi-lightwide   ) ;
+@div-wi-wide:         (@wi-wide        ) ; // min-width
+@div-wi-wider:        (@wi-wider       ) ; // min-width
+@div-wi-verywide:     (@wi-verywide    ) ; // min-width
+
+// -----------------------
+// Dimensions for Table Colums (TH, TD & Col)
+// -----------------------
+@tcol-wi-smallest:     (@wi-smallest    ) ;
+@tcol-wi-verysmall:    (@wi-verysmall   ) ;
+@tcol-wi-small:        (@wi-small       ) ;
+@tcol-wi-mediumsmall:  (@wi-mediumsmall ) ;
+@tcol-wi-normal:       (@wi-normal      ) ;
+@tcol-wi-lightwide:    (@wi-lightwide   ) ;
+@tcol-wi-wide:         (@wi-wide        ) ; // min-width
+@tcol-wi-wider:        (@wi-wider       ) ; // min-width
+@tcol-wi-verywide:     (@wi-verywide    ) ; // min-width
+
+// -----------------------
+// Dimensions for combined rows with combination Table column widths
+// -----------------------
+@tcol-wi-small-small:            (@tcol-wi-small       + @tcol-wi-small        ) ;
+@tcol-wi-small-mediumsmall:      (@tcol-wi-small       + @tcol-wi-mediumsmall  ) ;
+@tcol-wi-small-normal:           (@tcol-wi-small       + @tcol-wi-normal       ) ;
+@tcol-wi-small-lightwide:        (@tcol-wi-small       + @tcol-wi-lightwide    ) ;
+@tcol-wi-small-wide:             (@tcol-wi-small       + @tcol-wi-wide         ) ;
+@tcol-wi-small-wider:            (@tcol-wi-small       + @tcol-wi-wider        ) ;
+@tcol-wi-small-verywide:         (@tcol-wi-small       + @tcol-wi-verywide     ) ;
+
+@tcol-wi-mediumsmall-small:      (@tcol-wi-mediumsmall + @tcol-wi-small        ) ;
+@tcol-wi-mediumsmall-mediumsmall:(@tcol-wi-mediumsmall + @tcol-wi-mediumsmall  ) ;
+@tcol-wi-mediumsmall-normal:     (@tcol-wi-mediumsmall + @tcol-wi-normal       ) ;
+@tcol-wi-mediumsmall-lightwide:  (@tcol-wi-mediumsmall + @tcol-wi-lightwide    ) ;
+@tcol-wi-mediumsmall-wide:       (@tcol-wi-mediumsmall + @tcol-wi-wide         ) ;
+@tcol-wi-mediumsmall-wider:      (@tcol-wi-mediumsmall + @tcol-wi-wider        ) ;
+@tcol-wi-mediumsmall-verywide:   (@tcol-wi-mediumsmall + @tcol-wi-verywide     ) ;
+
+@tcol-wi-normal-small:           (@tcol-wi-normal      + @tcol-wi-small        ) ;
+@tcol-wi-normal-mediumsmall:     (@tcol-wi-normal      + @tcol-wi-mediumsmall  ) ;
+@tcol-wi-normal-normal:          (@tcol-wi-normal      + @tcol-wi-normal       ) ;
+@tcol-wi-normal-lightwide:       (@tcol-wi-normal      + @tcol-wi-lightwide    ) ;
+@tcol-wi-normal-wide:            (@tcol-wi-normal      + @tcol-wi-wide         ) ;
+@tcol-wi-normal-wider:           (@tcol-wi-normal      + @tcol-wi-wider        ) ;
+@tcol-wi-normal-verywide:        (@tcol-wi-normal      + @tcol-wi-verywide     ) ;
+
+@tcol-wi-lightwide-small:        (@tcol-wi-lightwide   + @tcol-wi-small        ) ;
+@tcol-wi-lightwide-mediumsmall:  (@tcol-wi-lightwide   + @tcol-wi-mediumsmall  ) ;
+@tcol-wi-lightwide-normal:       (@tcol-wi-lightwide   + @tcol-wi-normal       ) ;
+@tcol-wi-lightwide-lightwide:    (@tcol-wi-lightwide   + @tcol-wi-lightwide    ) ;
+@tcol-wi-lightwide-wide:         (@tcol-wi-lightwide   + @tcol-wi-wide         ) ;
+@tcol-wi-lightwide-wider:        (@tcol-wi-lightwide   + @tcol-wi-wider        ) ;
+@tcol-wi-lightwide-verywide:     (@tcol-wi-lightwide   + @tcol-wi-verywide     ) ;
+
+// -----------------------
+// Dimensions for Form input elements
+// -----------------------
+@diff-input-select: 36px ; //1.6em ;
+
+// Input elements
+@form-element-margin-right: 5px ;
+
+@input-wi-smallest:     (@wi-smallest  ) ;
+@input-wi-verysmall:    (@wi-verysmall ) ;
+@input-wi-small:        (@wi-small       - @diff-input-select) ;
+@input-wi-mediumsmall:  (@wi-mediumsmall - @diff-input-select) ;
+@input-wi-normal:       (@wi-normal      - @diff-input-select) ;
+@input-wi-lightwide:    (@wi-lightwide   - @diff-input-select) ;
+@input-wi-wide:         (@wi-wide)       - @diff-input-select ; // min-width
+@input-wi-wider:        (@wi-wider)      - @diff-input-select ; // min-width
+@input-wi-verywide:     (@wi-verywide)   - @diff-input-select ; // min-width
+
+// Input elements with combined dimensions
+
+// Minus size combinations (take care of the double hyphen --)
+@input-wi-lightwide--verysmall: ( @input-wi-lightwide - @input-wi-verysmall ) - 1 ;
+@input-wi-wide--verysmall:      ( @input-wi-wide      - @input-wi-verysmall ) - ( @form-element-margin-right  ) + 4px ;
+
+// -----------------------
+// Dimensions for Form Select elements
+// -----------------------
+@select-wi-smallest:    (@wi-smallest    ) ;
+@select-wi-verysmall:   (@wi-verysmall   ) ;
+@select-wi-small:       (@wi-small       - @diff-input-select ) ;
+@select-wi-mediumsmall: (@wi-mediumsmall - @diff-input-select ) ;
+@select-wi-normal:      (@wi-normal      - @diff-input-select ) ;
+@select-wi-lightwide:   (@wi-lightwide   - @diff-input-select ) ;
+@select-wi-wide:        (@wi-wide        - @diff-input-select ) ; // min-width
+@select-wi-wider:       (@wi-wider       - @diff-input-select ) ; // min-width
+@select-wi-verywide:    (@wi-verywide    - @diff-input-select ) ; // min-width
+
+// Select elements with combined dimensions
+@diff-select-combined:  0 ;
+
+@select-wi-small-normal:          ((@wi-small + (@wi-normal - @diff-input-select))     - @diff-select-combined ) ;
+@select-wi-small-lightwide:       ((@wi-small + (@wi-lightwide - @diff-input-select))  - @diff-select-combined ) ;
+@select-wi-small-wide:            ((@wi-small + (@wi-wide - @diff-input-select))       - @diff-select-combined ) ;
+@select-wi-small-wider:           ((@wi-small + (@wi-wider - @diff-input-select))      - @diff-select-combined ) ;
+@select-wi-small-verywide:        ((@wi-small + (@wi-verywide - @diff-input-select))   - @diff-select-combined ) ;
+@select-wi-mediumsmall-normal:    ((@wi-mediumsmall + (@wi-normal - @diff-input-select))     - @diff-select-combined ) ;
+@select-wi-mediumsmall-lightwide: ((@wi-mediumsmall + (@wi-lightwide - @diff-input-select))  - @diff-select-combined ) ;
+@select-wi-mediumsmall-wide:      ((@wi-mediumsmall + (@wi-wide - @diff-input-select))       - @diff-select-combined ) ;
+@select-wi-mediumsmall-wider:     ((@wi-mediumsmall + (@wi-wider - @diff-input-select))      - @diff-select-combined ) ;
+@select-wi-mediumsmall-verywide:  ((@wi-mediumsmall + (@wi-verywide - @diff-input-select))   - @diff-select-combined ) ;
+@select-wi-normal-normal:         ((@wi-normal + (@wi-normal - @diff-input-select))     - @diff-select-combined ) ;
+@select-wi-normal-lightwide:      ((@wi-normal + (@wi-lightwide - @diff-input-select))  - @diff-select-combined ) ;
+@select-wi-normal-wide:           ((@wi-normal + (@wi-wide - @diff-input-select))       - @diff-select-combined ) ;
+@select-wi-normal-wider:          ((@wi-normal + (@wi-wider - @diff-input-select))      - @diff-select-combined ) ;
+@select-wi-normal-verywide:       ((@wi-normal + (@wi-verywide - @diff-input-select))   - @diff-select-combined ) ;
+@select-wi-lightwide-normal:      ((@wi-lightwide + (@wi-normal - @diff-input-select))     - @diff-select-combined ) ;
+@select-wi-lightwide-lightwide:   ((@wi-lightwide + (@wi-lightwide - @diff-input-select))  - @diff-select-combined ) ;
+@select-wi-lightwide-wide:        ((@wi-lightwide + (@wi-wide - @diff-input-select))       - @diff-select-combined ) ;
+@select-wi-lightwide-wider:       ((@wi-lightwide + (@wi-wider - @diff-input-select))      - @diff-select-combined ) ;
+@select-wi-lightwide-verywide:    ((@wi-lightwide + (@wi-verywide - @diff-input-select))   - @diff-select-combined ) ;
+@select-wi-wide-normal:           ((@wi-wide + (@wi-normal - @diff-input-select))     - @diff-select-combined ) ;
+@select-wi-wide-lightwide:        ((@wi-wide + (@wi-lightwide - @diff-input-select))  - @diff-select-combined ) ;
+@select-wi-wide-wide:             ((@wi-wide + (@wi-wide - @diff-input-select))       - @diff-select-combined ) ;
+@select-wi-wide-wider:            ((@wi-wide + (@wi-wider - @diff-input-select))      - @diff-select-combined ) ;
+@select-wi-wide-verywide:         ((@wi-wide + (@wi-verywide - @diff-input-select))   - @diff-select-combined ) ;
+
+// -----------------------
+// Dimensions for Textarea elements with standard dimensions
+// -----------------------
+
+@textarea-wi-normal:      (@wi-normal      - @diff-input-select ) ;
+@textarea-wi-lightwide:   (@wi-lightwide   - @diff-input-select ) ;
+@textarea-wi-wide:        (@wi-wide        - @diff-input-select ) ; // min-width
+@textarea-wi-wider:       (@wi-wider       - @diff-input-select ) ; // min-width
+@textarea-wi-verywide:    (@wi-verywide    - @diff-input-select ) ; // min-width
+
+// Textarea elements with combined dimensions
+@diff-input-textarea-combined: 0px ; //1.6em ;
+//@textarea-margin-combined: 24px ;
+
+@textarea-wi-small-small:       ((@tcol-wi-small + @input-wi-small)        - @diff-input-textarea-combined) ;
+@textarea-wi-small-mediumsmall: ((@tcol-wi-small + @input-wi-mediumsmall)  - @diff-input-textarea-combined) ;
+@textarea-wi-small-normal:      ((@tcol-wi-small + @input-wi-normal)       - @diff-input-textarea-combined) ;
+@textarea-wi-small-lightwide:   ((@tcol-wi-small + @input-wi-lightwide)    - @diff-input-textarea-combined) ;
+@textarea-wi-small-wide:        ((@tcol-wi-small + @input-wi-wide)         - @diff-input-textarea-combined) ;
+@textarea-wi-small-wider:       ((@tcol-wi-small + @input-wi-wider)        - @diff-input-textarea-combined) ;
+@textarea-wi-small-verywide:    ((@tcol-wi-small + @input-wi-verywide)     - @diff-input-textarea-combined) ;
+
+@textarea-wi-mediumsmall-small:        ((@tcol-wi-mediumsmall + @input-wi-small)         - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-mediumsmall:  ((@tcol-wi-mediumsmall + @input-wi-mediumsmall)   - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-normal:       ((@tcol-wi-mediumsmall + @input-wi-normal)        - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-lightwide:    ((@tcol-wi-mediumsmall + @input-wi-lightwide)     - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-wide:         ((@tcol-wi-mediumsmall + @input-wi-wide)          - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-wider:        ((@tcol-wi-mediumsmall + @input-wi-wider)         - @diff-input-textarea-combined) ;
+@textarea-wi-mediumsmall-verywide:     ((@tcol-wi-mediumsmall + @input-wi-verywide)      - @diff-input-textarea-combined) ;
+
+@textarea-wi-normal-small:        ((@tcol-wi-normal + @input-wi-small)         - @diff-input-textarea-combined) ;
+@textarea-wi-normal-mediumsmall:  ((@tcol-wi-normal + @input-wi-mediumsmall)   - @diff-input-textarea-combined) ;
+@textarea-wi-normal-normal:       ((@tcol-wi-normal + @input-wi-normal)        - @diff-input-textarea-combined) ;
+@textarea-wi-normal-lightwide:    ((@tcol-wi-normal + @input-wi-lightwide)     - @diff-input-textarea-combined) ;
+@textarea-wi-normal-wide:         ((@tcol-wi-normal + @input-wi-wide)          - @diff-input-textarea-combined) ;
+@textarea-wi-normal-wider:        ((@tcol-wi-normal + @input-wi-wider)         - @diff-input-textarea-combined) ;
+@textarea-wi-normal-verywide:     ((@tcol-wi-normal + @input-wi-verywide)      - @diff-input-textarea-combined) ;
+
+@textarea-wi-lightwide-small:       ((@tcol-wi-lightwide + @input-wi-small)         - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-mediumsmall: ((@tcol-wi-lightwide + @input-wi-mediumsmall)   - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-normal:      ((@tcol-wi-lightwide + @input-wi-normal)        - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-lightwide:   ((@tcol-wi-lightwide + @input-wi-lightwide)     - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-wide:        ((@tcol-wi-lightwide + @input-wi-wide)          - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-wider:       ((@tcol-wi-lightwide + @input-wi-wider)         - @diff-input-textarea-combined) ;
+@textarea-wi-lightwide-verywide:    ((@tcol-wi-lightwide + @input-wi-verywide)      - @diff-input-textarea-combined) ;
+
+@textarea-wi-wide-small:        ((@tcol-wi-wide + @input-wi-small)         - @diff-input-textarea-combined) ;
+@textarea-wi-wide-mediumsmall:  ((@tcol-wi-wide + @input-wi-mediumsmall)   - @diff-input-textarea-combined) ;
+@textarea-wi-wide-normal:       ((@tcol-wi-wide + @input-wi-normal)        - @diff-input-textarea-combined) ;
+@textarea-wi-wide-lightwide:    ((@tcol-wi-wide + @input-wi-lightwide)     - @diff-input-textarea-combined) ;
+@textarea-wi-wide-wide:         ((@tcol-wi-wide + @input-wi-wide)          - @diff-input-textarea-combined) ;
+@textarea-wi-wide-wider:        ((@tcol-wi-wide + @input-wi-wider)         - @diff-input-textarea-combined) ;
+@textarea-wi-wide-verywide:     ((@tcol-wi-wide + @input-wi-verywide)      - @diff-input-textarea-combined) ;
+
+
+/* ------------------------------------------------------------- */
+/* This CSS-Vars are just for testing                            */
+/* ------------------------------------------------------------- */
+
+:root {
+  --gray-standard:      @gray-standard;
+  --gray-superdark:     @gray-superdark; // Black
+  --gray-verydark:      @gray-verydark;
+  --gray-darker:        @gray-darker;
+  --gray-dark:          @gray-dark;
+  --gray-light:         @gray-light;
+  --gray-lighter:       @gray-lighter;
+  --gray-verylight:     @gray-verylight;
+  --gray-superlight:    @gray-superlight; // White
+
+  --color-standard:     @base-standard;
+  --color-superlight:   @base-superlight;
+  --color-verylight:    @base-verylight;
+  --color-lighter:      @base-lighter;
+  --color-light:        @base-light;
+  --color-dark:         @base-dark;
+  --color-darker:       @base-darker;
+  --color-verydark:     @base-verydark;
+  --color-superdark:    @base-superdark;
+
+  --msg-ok-strong:        @msg-green-strong;
+  --msg-ok-light:         @msg-green-light;
+  --msg-error-strong:     @msg-red-strong;
+  --msg-error-light:      @msg-red-light;
+  --msg-hint-strong:      @msg-blue-strong;
+  --msg-hint-light:       @msg-blue-light;
+  --msg-warning-strong:   @msg-orange-strong;
+  --msg-warning-light:    @msg-orange-light;
+
+}
diff --git a/css/design40/less/variables_color_style.less b/css/design40/less/variables_color_style.less
new file mode 100644
index 000000000..57b7300c7
--- /dev/null
+++ b/css/design40/less/variables_color_style.less
@@ -0,0 +1,631 @@
+/* ------------------------------------------------------------- */
+/* VARIABLES COLOR (variables_color_gray_standard.less) Standard Grey */
+/* ------------------------------------------------------------- */
+
+// ----------------------------------------------------------------------------
+//
+// VARIABLES COLOR STANDARD
+// Standard is GREY
+//
+// ----------------------------------------------------------------------------
+// DESCRIPTION:
+//
+// CONTENTS:
+// - BRAND COLORS
+// - BASE COLORS
+//   - Grey Shades
+//   - BASE COLORS
+// - COLOR SPECIFICATIONS FOR LINKS
+// - COLOR SPECIFICATIONS FOR MESSAGES
+// - MAIN PROPERTIES (STANDARD TEXT COLORS)
+// - SCAFFOLDING (PAGE)
+// - FRAME HEADER
+// - MENU TOP (CSS)
+// - MENU LEFT (HTML & JS)
+// - HEADER H1
+// - ACTIONBAR
+// - TABS
+// - TABLES
+//    - Table Cells
+//   - Zebra effect in list tables
+// - CONTROL PANELS
+// - MESSAGES
+// - BUTTONS
+//   - With Manipulation
+//   - NEUTRAL
+//   - Diverse Button states
+
+// ----------------------------------------------------------------------------
+
+// --------------------------------------
+// BRAND COLORS
+// --------------------------------------
+// used for h1 headers and buttons
+//
+// grey-brown-green: #406449;
+
+@brand-color:       #406449;
+@on-brand-color:    #fff;
+
+@brand-color-light: lighten(@brand-color, 10%);
+
+// --------------------------------------
+// YOUR CUSTOM COLOR STYLE
+// --------------------------------------
+// CUSTOMIZE: Define your style here (get names from the following «list»)
+
+
+
+
+// --------------------------------------
+// BASE COLORS
+// --------------------------------------
+
+// -----------------------
+// COLORS STYLES
+// -----------------------
+// CUSTOMIZE: Do not change, just add a new style
+// Use for colorstyle above just the part of variable name after the prefix «style_»
+// Use a strong color, not a light one
+
+// BLUE Standard Colors
+@style_ocean:         #2E6FFD ;
+@style_light_blue:    #336699 ;
+@style_aqua:          #0F80FF ;
+@style_turquoise:     #21FFFF ;
+
+// GREEN Standard Colors
+@style_pine:          #118040 ;
+@style_asparagus:     #808004 ;
+@style_petrol:        #108080 ;
+@style_spring:        #21FF06 ; // New
+
+// RED Standard Colors
+@style_salmona:       #990033 ;
+@style_salmon:        #FC6666 ;
+@style_tangerine:     #FD8008 ;
+@style_marascino:     #FB0207 ;
+@style_maroon:        #800040 ;
+@style_strawberry:    #FB0280 ;
+@style_pure_red:      #FC7D86 ;
+
+// YELLOW Standard Colors
+@style_old_lemon:       #E0E00A ;
+@style_yellow_to_green: #CAD008 ;
+
+// PURPLE & VIOLETS
+@style_eggplant:      #400080 ;
+@style_plum:          #800080 ;
+@style_grape:         #8000FF ;
+@style_magenta:       #FB02FF ;
+@style_lavender:      #CC66FF ;
+
+// BROWN & ORANGE
+@style_cayenne:       #800002 ;
+@style_mocha:         #804003 ;
+@style_cantaloupe:    #FECC66 ;
+@style_dark_brown:    #6D3702 ;
+@style_orange_brown:  #CC6600 ;
+@style_brown:         #996600 ;
+@style_green_brown:   #666633 ;
+
+
+// -----------------------
+// GREY SHADES
+// -----------------------
+// CUSTOMIZE: If necessary change graduation of the Greys with grey colors
+
+@gray-superdark:      #000000 ; // Black
+@gray-verydark:       #222222 ;
+@gray-darker:         #444444 ;
+@gray-dark:           #666666 ;
+
+@gray-standard:       #888888 ;
+
+@gray-light:          #aaaaaa ;
+@gray-lighter:        #cccccc ;
+@gray-verylight:      #eeeeee ;
+@gray-superlight:     #ffffff ; // White
+
+
+// -----------------------
+// MESSAGE TYPE COLORS
+// -----------------------
+// for messages and other coloured stuff
+// CUSTOMIZE: If necessary change the colors, but only if necessary
+// for backgrounds see
+
+// Error (Red)
+@color-red-strong:      #ae0014;
+// OK (Green)
+@color-green-strong:    #003c18;
+// Info/Hint (Blue)
+@color-blue-strong:     #209ec8;
+// Warning (Orange)
+@color-orange-strong:   #8D6A00; // brown, orange calculated as background below
+
+// light background colors (calculated)
+@color-red-light:       lighten( @color-red-strong ,    50%  );
+@color-red-lighter:     lighten( @color-red-strong ,    55%  );
+@color-green-light:     lighten( @color-green-strong ,  50%  );
+@color-green-lighter:   lighten( @color-green-strong ,  70%  );
+@color-blue-light:      lighten( @color-blue-strong ,   50%  );
+@color-blue-lighter:    lighten( @color-blue-strong ,   70%  );
+@color-blue-dark:       lighten( @color-blue-strong ,   40%  );
+@color-blue-darker:     lighten( @color-blue-strong ,   30%  );
+@color-orange-light:    lighten( @color-orange-strong , 50%  );
+@color-orange-lighter:  lighten( @color-orange-strong , 60%  );
+
+
+// -----------------------
+// DIVERSE COLOR (NOT USED AT THIS TIME)
+// -----------------------
+// Divers
+@rainbow-green:         #408000;
+@rainbow-blue:          #0080FF;
+@rainbow-red:           #FF0000;
+@rainbow-yellow:        #FFFF00;
+
+
+
+
+
+
+
+// --------------------------------------
+// BASE COLORS (CALCULATED)
+// --------------------------------------
+// Calculation of the variations of the base colors
+// It is generally not necessary to touch the following code,
+// change therefore the gray colors above
+
+@colorstyle: "green_brown" ; // not style_*, only * like "plum"
+@basestyle: "style_@{colorstyle}" ; // DO NOT TOUCH
+
+
+@base-standard:    @@basestyle ; // DO NOT TOUCH
+
+@base-superdark:   multiply( @base-standard , @gray-superdark) ; //  almost Black
+@base-verydark:    multiply( @base-standard , @gray-verydark) ;
+@base-darker:      multiply( @base-standard , @gray-darker) ;
+@base-dark:        multiply( @base-standard , @gray-dark) ;
+
+@base-light:       screen( @base-standard , @gray-light) ;
+@base-lighter:     screen( @base-standard , @gray-lighter) ;
+@base-verylight:   screen( @base-standard , @gray-verylight) ;
+@base-superlight:  @gray-superlight ; // White
+
+
+
+// --------------------------------------
+// Backgrounds with Gradient function
+// --------------------------------------
+
+// -----------------------
+// Background specifications
+// -----------------------
+
+// Body
+@_bg_style_body:            linear-gradient(to bottom,  @base-verylight, @base-light);
+// Control panels
+@_bg_style_controlpanel:    linear-gradient(to top,     @base-light,     @base-verylight);
+// Buttons
+@_bg_style_button:          linear-gradient(to top,     @base-light,     @base-verylight);
+@_bg_style_button_neutral:  linear-gradient(to top,     @gray-light,      @gray-verylight);
+
+
+// -----------------------
+// Body Background
+// -----------------------
+// a mixin for the body background
+// CUSTOMIZE:
+.bg-body {
+  //background-image:     linear-gradient(to bottom, @base-verylight, @base-light); // GRADIENT
+  background-color:     @base-light ;  // same as bottom stop-color bottom in background-image below
+  // background-image:  none; // NO GRADIENT
+}
+.bg-content {
+  background-image:     linear-gradient(to bottom, @base-verylight, @base-light); // GRADIENT
+  //background-color:     @base-light ;  // same as bottom stop-color bottom in background-image below
+  // background-image:  none; // NO GRADIENT
+}
+
+
+
+// --------------------------------------
+// COLOR SPECIFICATIONS FOR LINKS
+// --------------------------------------
+// should have a high contrast on background
+@links-color:           #2962ce;
+
+
+
+// --------------------------------------
+// COLOR SPECIFICATIONS FOR MESSAGES
+// --------------------------------------
+// strong is for text and borders
+// light  is for background-colors
+
+// Error (Red)
+@msg-red-strong:      mix(@base-darker,     @color-red-strong, 20);
+@msg-red-light:       mix(@base-verylight,  @color-red-light,  60);
+// OK (Green)
+@msg-green-strong:    mix(@base-darker,     @color-green-strong, 20);
+@msg-green-light:     mix(@base-verylight,  @color-green-light,  60);
+// Info/Hint (Blue)
+@msg-blue-strong:     mix(@base-darker,     @color-blue-strong, 20);
+@msg-blue-light:      mix(@base-verylight,  @color-blue-light,  20);
+// Warning (Orange)
+@msg-orange-strong:   mix(@base-darker,     @color-orange-strong, 20); // more brown
+@msg-orange-light:    mix(@base-lighter,    @color-orange-light,  50);
+@msg-orange-strong:   multiply(@base-darker,     @color-orange-strong); // more brown
+@msg-orange-light:    multiply(@base-lighter,    @color-orange-light);
+
+//@msg-red-light:       screen( @msg-red-strong , @gray-verylight) ;
+//@msg-red-light:       screen( @msg-red-strong , @base-light) ;
+//@msg-green-light:     screen( @msg-green-strong , @gray-verylight) ;
+//@msg-green-light:     screen( @msg-green-strong , @base-light) ;
+//@msg-blue-light:      screen( @msg-blue-strong , @gray-verylight) ;
+//@msg-orange-light:    screen( @msg-orange-strong , @gray-verylight) ;
+
+
+
+
+
+
+// --------------------------------------
+// MAIN PROPERTIES (STANDARD TEXT COLORS)
+// --------------------------------------
+// PENDENT: genauer anschauen
+@base-text-color:          @gray-dark ; //
+@base-text-color-accent:   @base-standard ; //
+
+@base-link-color:          @links-color; //
+@base-link-color-hover:    @links-color; //
+
+@base-table-text-color:    @base-superdark ; //
+
+@base-heading-color:       @base-superdark ; // Standard heading color
+@base-heading-bg:          @base-dark ; //
+
+@base-data-color:          @base-standard ; //
+@base-data-label-color:    @base-darker ; // Standard-Label color
+
+// Text (Label & data)
+@base-primary:         @base-text-color;
+@base-label:           @base-data-label-color; // PENDENT: wozu?
+@base-label-bg:        @base-lighter; // PENDENT: wozu?
+
+
+
+
+
+// --------------------------------------
+// SCAFFOLDING (PAGE)
+// --------------------------------------
+
+@body-bg:               @base-verylight; // general OBSOLETE
+@content-bg:            @base-superlight; // background first tabs PENDENT: obsolete!
+@heading-bg:            @base-lighter ; // controlpanels & other stuff PENDENT: obsolete!
+
+@text-color:            @base-primary; // PENDENT: obsolete!
+@heading-color:         @base-heading-color ; // labels & table headings // PENDENT: obsolete!
+@caption-color:         @base-heading-color ; // caption // PENDENT: obsolete!
+
+
+
+// --------------------------------------
+// FRAME HEADER (DASHBOARD)
+// --------------------------------------
+
+@_dashbrd_bg:            @base-darker ;
+@_dashbrd_text:          @base-verylight ;
+@_dashbrd_link:          @base-light ;
+@_dashbrd_link_hover:    @base-superlight ;
+@_dashbrd_input_bg:      @base-light;
+@_dashbrd_input_text:    @base-superdark ;
+
+
+
+
+// --------------------------------------
+// MENU TOP (CSS)
+// --------------------------------------
+
+@_menu_bg:               @base-lighter ;
+@_menu_border_color:     @base-standard ;
+
+
+@_menu_link:             @base-darker ;
+@_menu_link_bg:          @base-lighter ;
+@_menu_link_hover:       @base-verydark ;
+@_menu_link_hover_bg:    @base-light ;
+
+@_menu_link_bg_level1:         @base-light ;
+@_menu_link_bg_level1_hover:   @base-light ;
+@_menu_link_bg_level2:         @base-light ;
+@_menu_link_bg_level2_hover:   @base-lighter ;
+@_menu_link_bg_level3:         @base-lighter ;
+@_menu_link_bg_level3_hover:   @base-light ;
+
+
+
+
+// --------------------------------------
+// MENU LEFT (JS)
+// --------------------------------------
+@_menu_left_bg:                   @base-lighter ;
+
+@_menu_left_level_1_color:        @base-darker ;
+@_menu_left_level_1_bg:           @base-light ;
+@_menu_left_level_1_hover_color:  @on-brand-color ;
+@_menu_left_level_1_hover_bg:     @brand-color-light ;
+
+@_menu_left_level_2_color:        @base-darker ;
+@_menu_left_level_2_bg:           @base-lighter ;
+@_menu_left_level_2_hover_color:  @base-superdark ;
+@_menu_left_level_2_hover_bg:     @base-light ;
+
+@_menu_left_level_3_color:        @base-darker ;
+@_menu_left_level_3_bg:           @base-lighter ;
+@_menu_left_level_3_hover_color:  @base-superdark ;
+@_menu_left_level_3_hover_bg:     @base-light ;
+
+
+// Just additional stuff
+@_menu_open_color: @on-brand-color ;
+@_menu_open_bg:    @brand-color ;
+
+
+
+
+
+
+// --------------------------------------
+// HEADER H1
+// --------------------------------------
+// Header right on top of #content (h1 only once per page)
+@_base-h1-color:       @on-brand-color;
+@_base-h1-bg:          @brand-color;
+@_base-h1-border-top:  1px @base-standard solid ;
+
+
+
+
+
+// --------------------------------------
+// ACTIONBAR
+// --------------------------------------
+// PENDENT: Button-Parameter anwenden
+@_actionbar-bg:                   @base-light;
+@_actionbar-bg-active:            @base-lighter;
+
+@_actionbar-font-color:           @base-dark;
+@_actionbar-font-color-active:    @base-dark;
+
+@_actionbar-border-color:         @base-dark;
+@_actionbar-border-color-active:  @base-dark ;
+
+@_actionbar-hover-bg:             @base-lighter;
+@_actionbar-hover-color:          @base-verydark;
+
+@_actionbar-font-color-disabled:  @base-standard;
+
+
+
+// --------------------------------------
+// TABS
+// --------------------------------------
+// background tabs panel (data/content)
+@_tabs-bg:                    @base-superlight ;
+@_tabs-panel-bg:              @base-verylight ; // like active
+@_tabs-border-color:          @base-standard ;
+
+@_tabs-default-bg:            @base-superlight;
+@_tabs-default-color:         @base-darker;
+@_tabs-default-hover-bg:      @base-lighter;
+@_tabs-default-hover-color:   @base-darker;
+
+@_tabs-active-bg:             darken( @base-verylight, 3% );
+@_tabs-active-color:          @base-darker;
+@_tabs-active-hover-bg:       @base-verylight;
+@_tabs-active-hover-color:    @base-darker;
+
+
+
+
+
+// --------------------------------------
+// MESSAGES
+// --------------------------------------
+// OK (green)
+@msg-ok-strong:       @msg-green-strong;
+@msg-ok-light:        @msg-green-light;
+
+// Error (Red)
+@msg-error-strong:    @msg-red-strong;
+@msg-error-light:     @msg-red-light;
+
+// Info/Hint (Blue)
+@msg-hint-strong:     @msg-blue-strong;
+@msg-hint-light:      @msg-blue-light;
+
+// Warning (Orange)
+@msg-warning-strong:  @msg-orange-strong; // more brown
+@msg-warning-light:   @msg-orange-light;
+
+
+
+
+
+// --------------------------------------
+// TABLES
+// --------------------------------------
+
+@_table-border-color:             @base-standard; //  table and cell border
+
+@_table-bg:                       transparent; //  overall background-color
+@_table-bg-accent:                @base-lighter; //  for striping
+@_table-bg-hover:                 @base-superlight;
+@_table-bg-active:                @_table-bg-hover;
+
+@_table-caption-bg:               transparent ;
+@_table-caption-color:            @base-dark;
+
+// --------------
+// Table Cells
+// --------------
+@_t-cell-text-color:              @base-verydark;
+@_t-cell-th-text-color:            @base-dark; // even for label/.label in tables
+
+@_t-cell-head-bg:                 @base-dark;
+@_t-cell-head-bg-accent:          @gray-light; // PENDENT: wo eingesetzt
+@_t-cell-head-text:               @base-superlight;
+@_t-cell-head-text-accent:        @base-lighter; // Links
+
+@_t-cell-label-text:              @base-darker;
+@_t-cell-label-text-accent:       @base-superdark;
+@_t-cell-data-text:               @base-verydark;
+@_t-cell-data-text-accent:        @base-superdark;
+
+@_t-cell-databox-text-color:      @base-darker ;
+@_t-cell-databox-border-color:    @base-light ;
+
+@_t-cell-foot-text:               @base-superdark;
+
+// -----------------------
+// Zebra effect in list tables
+// -----------------------
+@_t-row-zebra-bg-odd:             @base-verylight;
+@_t-row-zebra-bg-even:            @base-lighter;
+
+@_table-list-zebra-text-color:    @base-dark ;
+@_table-list-zebra-link-color:    @base-standard ;
+
+@_t-row-zebra-bg-hover:           @base-superlight;
+
+
+
+
+
+
+// --------------------------------------
+// TABLE HORIZONTAL (tbl.horizontal)
+// --------------------------------------
+//@_table-horiz-th-color:  @base-darker ;
+//@_table-horiz-td-color:  @base-verydark ;
+
+// -----------------------
+// CAPTION (caption & th.caption)
+// -----------------------
+//@_table-horiz-caption-color:  @base-darker ;
+//@_table-horiz-caption-bg:     @base-verylight ;
+
+// -----------------------
+// SPAN DATA
+// -----------------------
+
+
+
+
+
+// --------------------------------------
+// TABLE LIST (tbl.list)
+// --------------------------------------
+// Table list with zebra effect, header and footer
+// Zebra effect in list tables
+
+// -----------------------
+// HEADER (thead)
+// -----------------------
+
+// -----------------------
+// FOOTER (tfoot)
+// -----------------------
+
+
+
+
+
+// --------------------------------------
+// CONTROL PANELS
+// --------------------------------------
+
+@_controlpanel-bg-color:      @base-verylight ;
+@_controlpanel-bg:            @_bg_style_controlpanel ;
+@_controlpanel-color:         @base-dark  ;
+@_controlpanel-header-color:  @base-dark  ;
+@_controlpanel-border-color:  @base-standard  ;
+
+
+
+
+
+// --------------------------------------
+// FORM ELEMENTS
+// --------------------------------------
+@_formelement-focus-bg:     @base-light ;
+@_formelement-focus-text:   @base-darker ;
+@_formelement-focus-border: 1px @base-verydark solid ;
+
+
+
+
+
+// --------------------------------------
+// BUTTONS
+// --------------------------------------
+
+// -----------------------
+// With Manipulation
+// -----------------------
+// Button with manipulation (submit etc.)
+@_button-strong-color:                @on-brand-color;
+@_button-strong-bg:                   @brand-color;
+@_button-strong-border-color:         @brand-color;
+
+@_button-strong-hover-color:          @on-brand-color;
+@_button-strong-hover-bg:             @brand-color-light;
+@_button-strong-hover-border-color:   @brand-color-light;
+
+@_button-strong-active-color:         @on-brand-color;
+@_button-strong-active-bg:            @brand-color-light;
+@_button-strong-active-border-color:  @brand-color-light;
+
+// -----------------------
+// NEUTRAL
+// -----------------------
+// Button without data manipulation (reset, cancel, open, show etc.)
+@_button-neutral-color:                 @base-darker;
+@_button-neutral-bg:                    @base-lighter;
+@_button-neutral-border-color:          @base-dark;
+
+@_button-neutral-hover-color:           @base-darker;
+@_button-neutral-hover-bg:              @base-verylight;
+@_button-neutral-hover-border-color:    @base-dark;
+
+@_button-neutral-active-color:          @base-superdark;
+@_button-neutral-active-bg:             @base-standard;
+@_button-neutral-active-border-color:   @base-verydark;
+
+
+// -------------------
+// Diverse Button states
+// -------------------
+//@_button-primary-color:               @button-primary-color;
+//@_button-primary-bg:                  @button-primary-bg;
+//@_button-primary-border-color:        darken(@button-primary-bg, 5%) ;
+
+@_button-success-color:                 @color-green-strong;
+@_button-success-bg:                    @color-green-light;
+@_button-success-border-color:          darken(@color-green-strong, 5%) ;
+
+@_button-warning-color:                 @color-orange-strong;
+@_button-warning-bg:                    @color-orange-light;
+@_button-warning-border-color:          darken(@color-orange-strong, 5%) ;
+
+@_button-info-color:                    @color-blue-strong;
+@_button-info-bg:                       @color-blue-light;
+@_button-info-border-color:             darken(@color-blue-strong, 5%) ;
+
+@_button-link-disabled-color:           @base-light ;
diff --git a/css/design40/main.css b/css/design40/main.css
new file mode 120000
index 000000000..f6b71cce6
--- /dev/null
+++ b/css/design40/main.css
@@ -0,0 +1 @@
+style.css
\ No newline at end of file
diff --git a/css/design40/manual/anleitung.html b/css/design40/manual/anleitung.html
new file mode 100644
index 000000000..7a8124db9
--- /dev/null
+++ b/css/design40/manual/anleitung.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Kivitendo-Design: Anleitung &amp; Grundsätze</title>
+</head>
+<body class="developing">
+<header>
+  <h1>Anleitung und Grunsätze</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<div class="wrapper">
+  <h2>Grundregeln</h2>
+
+<h3>INPUT-Tag:</h3>
+  <p>Da das INPUT-Element sehr vielseitig ist und via CSS das TYPE-Attribut abgefangen werden kann, muss dieses <b>TYPE-Attribut zwingend</b> mit den reservierten Begriffen gesetzt sein, da Webbrowser mitsamt ihrer CSS-Fähigkeiten das Fehlen missinterpretieren können. Standard ist TEXT, im weiteren dürfen vorerst SUBMIT, RESET, CHECKBOX und RADIO verwendet werden. Fehlt dieses Attribut oder wird ein ungehöriges gesetzt, wird das Feld vom Browser nicht korrekt dargestellt.</p>
+  <p>Korrekt: <code>&lt;input type="text" name="name" id="name"&gt;</code><br>Falsch:&nbsp; <code>&lt;input name="name" id="name"&gt;</code> (häufig aufgetreten)<p>
+  <h3>H1 (Header 1):</h3><p>Dieses Element sollte nur <b>einmal pro Seite</b> eingesetzt werden, und zwar einzig für den Seitentitel. Zudem sollte dieses Attribut <b>gleich zu Beginn der Template-Datei</b> gesetzt werden, und nicht innerhalb eines Formular- oder Wrapper-Elements. Das unkorrekte Setzen dieses Elements ist zwar durch den CSS-Code abgefangen, die Darstellung könnte aber in solchen Fällen nicht den Vorstellungen entsprechen.</p>
+
+<h3>Form- &amp; Form-Elemente-Tags korrekt in Tabellen setzen</h3>
+<p>
+Formular-Tags sollten nicht innerhalb einer Tabelle stehen sondern um sie herum. Die Elemente dürfen aber in einer Tabellenzelle stehen. Hidden-Elemente auch, denn diese sollten nicht zwischen TR-, TH- oder TD-Tags stehen sondern entweder ausserhalb der Tabelle, falls möglich, und sonst innerhalb eines TH- oder TD-Tags
+</p>
+
+<h3>Keine verschachtelten Tabellen</h3>
+<p>Tabellen in Tabellen-Zellen sind grundsätzlich verboten</p>
+</div>
+</body>
+</html>
diff --git a/css/design40/manual/farben-demo.css b/css/design40/manual/farben-demo.css
new file mode 100644
index 000000000..eb2cafb77
--- /dev/null
+++ b/css/design40/manual/farben-demo.css
@@ -0,0 +1,234 @@
+.gray-darker {
+  background-color: #222222;
+}
+.gray-dark {
+  background-color: #555555;
+}
+.gray-mediumdark {
+  background-color: #666666;
+}
+.gray {
+  background-color: #888888;
+}
+.gray-medium {
+  background-color: #aaaaaa;
+}
+.gray-light {
+  background-color: #cfcfcf;
+}
+.gray-lighter {
+  background-color: #dedede;
+}
+.gray-morelighter {
+  background-color: #e0e0e0;
+}
+.gray-verylight {
+  background-color: #ececec;
+}
+.gray-superlight {
+  background-color: #efefef;
+}
+.color-red-strong {
+  background-color: #ae0014;
+}
+.color-red-light {
+  background-color: #ffd6d6;
+}
+.color-green-strong {
+  background-color: #088604;
+}
+.color-green-light {
+  background-color: #c9ee8e;
+}
+.color-blue-strong {
+  background-color: #209ec8;
+}
+.color-blue-light {
+  background-color: #b6e6e5;
+}
+.color-orange-strong {
+  background-color: #6d613e;
+}
+.color-orange-light {
+  background-color: #f6d972;
+}
+.rainbow-green {
+  background-color: #408000;
+}
+.rainbow-blue {
+  background-color: #0080ff;
+}
+.rainbow-red {
+  background-color: #ff0000;
+}
+.rainbow-yellow {
+  background-color: #ffff00;
+}
+.brand-primary {
+  background-color: #000000;
+}
+.brand-label {
+  background-color: #888888;
+}
+.brand-label-bg {
+  background-color: #dedede;
+}
+.brand-info {
+  background-color: #209ec8;
+}
+.brand-info-bg {
+  background-color: #b6e6e5;
+}
+.brand-ok {
+  background-color: #088604;
+}
+.brand-ok-bg {
+  background-color: #c9ee8e;
+}
+.brand-warning {
+  background-color: #6d613e;
+}
+.brand-warning-bg {
+  background-color: #f6d972;
+}
+.brand-error {
+  background-color: #ae0014;
+}
+.brand-error-bg {
+  background-color: #ffd6d6;
+}
+.brand-positive {
+  background-color: #088604;
+}
+.brand-positive-bg {
+  background-color: #c9ee8e;
+}
+.brand-negative {
+  background-color: #ae0014;
+}
+.brand-negative-bg {
+  background-color: #ffd6d6;
+}
+.button-strong {
+  background-color: #000000;
+}
+.button-strong-bg {
+  background-color: #cfcfcf;
+}
+.button-strong-border {
+  background-color: #cfcfcf;
+}
+.button-strong-hover {
+  background-color: #000000;
+}
+.button-strong-hover-bg {
+  background-color: #cfcfcf;
+}
+.button-strong-hover-border {
+  background-color: #cfcfcf;
+}
+.button-strong-active {
+  background-color: #000000;
+}
+.button-strong-active-bg {
+  background-color: #cfcfcf;
+}
+.button-strong-active-border {
+  background-color: #cfcfcf;
+}
+.button-soft {
+  background-color: #555555;
+}
+.button-soft-bg {
+  background-color: #ececec;
+}
+.button-soft-border {
+  background-color: #ececec;
+}
+.button-soft-hover {
+  background-color: #555555;
+}
+.button-soft-hover-bg {
+  background-color: #ececec;
+}
+.button-soft-hover-border {
+  background-color: #ececec;
+}
+.button-soft-active {
+  background-color: #555555;
+}
+.button-soft-active-bg {
+  background-color: #ececec;
+}
+.button-soft-active-border {
+  background-color: #ececec;
+}
+.body-bg {
+  background-color: #efefef;
+}
+.content-bg {
+  background-color: #ffffff;
+}
+.tabs-bg {
+  background-color: #efefef;
+}
+.heading-bg {
+  background-color: #cfcfcf;
+}
+.controlpanel-bg {
+  background-color: #e0e0e0;
+}
+.text-color {
+  background-color: #000000;
+}
+.heading-color {
+  background-color: #888888;
+}
+.caption-color {
+  background-color: #888888;
+}
+#demo h1,
+#demo h2 {
+  clear: both;
+  color: #888888 !important;
+  padding: 0 ;
+  margin: 20px 0 0 0 ;
+}
+#demo h1 {
+  font-size: 14pt;
+  padding-top: 1.0em ;
+}
+#demo h2 {
+  font-size: 12pt;
+  margin-top: 0.2em ;
+}
+#demo div.selector {
+  display: block ;
+  width: 8.0em ;
+  float: left ;
+  margin: 0 1.0em 0 0 ;
+  overflow: hidden ;
+  padding: 0 ;
+}
+#demo div.selector h3 {
+  color: #888888 !important;
+  font-size: 8pt;
+  font-weight: normal;
+  height: 3.6em ;
+  display: table-cell;
+  vertical-align: bottom ;
+}
+#demo div.selector div.color {
+  width: 8.0em ;
+  height: 8.0em ;
+  display: block;
+  overflow: hidden ;
+  padding: 0 ;
+  margin: 0;
+  border: 1px #000 solid ;
+}
+#demo .group {
+  display: inline-block;
+  float: left;
+  overflow: hidden ;
+}
diff --git a/css/design40/manual/farben-demo.html b/css/design40/manual/farben-demo.html
new file mode 100644
index 000000000..65619f731
--- /dev/null
+++ b/css/design40/manual/farben-demo.html
@@ -0,0 +1,153 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <link href="farben-demo.css" rel="stylesheet">
+  <title>Kommunikation mit Farben in Kivitendo</title>
+
+  <script type="text/javascript" src="../../js/jquery.js"></script>
+  <script type="text/javascript" src="../../js/common.js"></script>
+  <script type="text/javascript" src="../../js/namespace.js"></script>
+  <script type="text/javascript" src="../../js/kivi.js"></script>
+  <script type="text/javascript" src="../../js/locale/de.js"></script>
+  <script type="text/javascript" src="../../js/jquery-ui.js"></script>
+  <script type="text/javascript" src="../../js/kivi.QuickSearch.js"></script>
+  <script type="text/javascript" src="../../js/kivi.ActionBar.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Draft.js"></script>
+  <script type="text/javascript" src="../../js/kivi.File.js"></script>
+  <script type="text/javascript" src="../../js/kivi.SalesPurchase.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Part.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/ckeditor.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/adapters/jquery.js"></script>
+  <script type="text/javascript" src="../../js/kivi.io.js"></script>
+  <script type="text/javascript" src="../../js/client_js.js"></script>
+  <script type="text/javascript" src="../../js/jquery.cookie.js"></script>
+  <script type="text/javascript" src="../../js/jquery.checkall.js"></script>
+  <script type="text/javascript" src="../../js/jquery.download.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.form.js"></script>
+  <script type="text/javascript" src="../../js/jquery/fixes.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.tooltipster.min.js"></script>
+  <script type="text/javascript" src="../../js/jquery/ui/i18n/jquery.ui.datepicker-de.js"></script>
+</head>
+<body class="developing">
+<header>
+	<h1>Anzeige aller Farben in Kivitendo</h1>
+	<nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<div class="wrapper" id="demo">
+<!--
+For creating the blocks from the less-code use following grep:
+\.([a-z-]+)[ ]*\{[^\n]+      replace with
+<div class="selector"><h3>\1</h3><div class="color \1"></div></div>     or
+<div class="selector"><h3>$1</h3><div class="color $1"></div></div>
+-->
+
+<h1>more brown</h1>
+<div class="selector"><h3>.gray-darker</h3><div class="color gray-darker"></div></div>
+<div class="selector"><h3>.gray-dark</h3><div class="color gray-dark"></div></div>
+<div class="selector"><h3>.gray-mediumdark</h3><div class="color gray-mediumdark"></div></div>
+<div class="selector"><h3>.gray</h3><div class="color gray"></div></div>
+<div class="selector"><h3>.gray-medium</h3><div class="color gray-medium"></div></div>
+<div class="selector"><h3>.gray-light</h3><div class="color gray-light"></div></div>
+<div class="selector"><h3>.gray-lighter</h3><div class="color gray-lighter"></div></div>
+<div class="selector"><h3>.gray-morelighter</h3><div class="color gray-morelighter"></div></div>
+<div class="selector"><h3>.gray-verylight</h3><div class="color gray-verylight"></div></div>
+<div class="selector"><h3>.gray-superlight</h3><div class="color gray-superlight"></div></div>
+
+<h1>Divers Color Specications</h1>
+<div class="group">
+<h2>ok</h2>
+<div class="selector"><h3>.color-green-strong</h3><div class="color color-green-strong"></div></div>
+<div class="selector"><h3>.color-green-light</h3><div class="color color-green-light"></div></div>
+</div>
+<div class="group">
+<h2>error</h2>
+<div class="selector"><h3>.color-red-strong</h3><div class="color color-red-strong"></div></div>
+<div class="selector"><h3>.color-red-light</h3><div class="color color-red-light"></div></div>
+</div>
+<div class="group">
+<h2>info/hint</h2>
+<div class="selector"><h3>.color-blue-strong</h3><div class="color color-blue-strong"></div></div>
+<div class="selector"><h3>.color-blue-light</h3><div class="color color-blue-light"></div></div>
+</div>
+<div class="group">
+<h2>warning</h2>
+<div class="selector"><h3>.color-orange-strong</h3><div class="color color-orange-strong"></div></div>
+<div class="selector"><h3>.color-orange-light</h3><div class="color color-orange-light"></div></div>
+</div>
+
+
+<h2>divers</h2>
+<div class="selector"><h3>.rainbow-green</h3><div class="color rainbow-green"></div></div>
+<div class="selector"><h3>.rainbow-blue</h3><div class="color rainbow-blue"></div></div>
+<div class="selector"><h3>.rainbow-red</h3><div class="color rainbow-red"></div></div>
+<div class="selector"><h3>.rainbow-yellow</h3><div class="color rainbow-yellow"></div></div>
+
+<h1>Brand colors</h1>
+
+<h2>Text (Label & data)</h2>
+<div class="selector"><h3>.brand-primary</h3><div class="color brand-primary"></div></div>
+<div class="selector"><h3>.brand-label</h3><div class="color brand-label"></div></div>
+<div class="selector"><h3>.brand-label-bg</h3><div class="color brand-label-bg"></div></div>
+
+<h1>Messages & info types</h1>
+<div class="selector"><h3>.brand-ok</h3><div class="color brand-ok"></div></div>
+<div class="selector"><h3>.brand-ok-bg</h3><div class="color brand-ok-bg"></div></div>
+
+<div class="selector"><h3>.brand-error</h3><div class="color brand-error"></div></div>
+<div class="selector"><h3>.brand-error-bg</h3><div class="color brand-error-bg"></div></div>
+
+<div class="selector"><h3>.brand-info</h3><div class="color brand-info"></div></div>
+<div class="selector"><h3>.brand-info-bg</h3><div class="color brand-info-bg"></div></div>
+
+<div class="selector"><h3>.brand-warning</h3><div class="color brand-warning"></div></div>
+<div class="selector"><h3>.brand-warning-bg</h3><div class="color brand-warning-bg"></div></div>
+
+<h1>Positive & negative colors</h1>
+<div class="selector"><h3>.brand-positive</h3><div class="color brand-positive"></div></div>
+<div class="selector"><h3>.brand-positive-bg</h3><div class="color brand-positive-bg"></div></div>
+<div class="selector"><h3>.brand-negative</h3><div class="color brand-negative"></div></div>
+<div class="selector"><h3>.brand-negative-bg</h3><div class="color brand-negative-bg"></div></div>
+
+
+<h1>Buttons</h1>
+<h2>Button with manipulation (submit etc.)</h2>
+<div class="selector"><h3>.button-strong</h3><div class="color button-strong"></div></div>
+<div class="selector"><h3>.button-strong-bg</h3><div class="color button-strong-bg"></div></div>
+<div class="selector"><h3>.button-strong-border</h3><div class="color button-strong-border"></div></div>
+<div class="selector"><h3>.button-strong-hover</h3><div class="color button-strong-hover"></div></div>
+<div class="selector"><h3>.button-strong-hover-bg</h3><div class="color button-strong-hover-bg"></div></div>
+<div class="selector"><h3>.button-strong-hover-border</h3><div class="color button-strong-hover-border"></div></div>
+<div class="selector"><h3>.button-strong-active</h3><div class="color button-strong-active"></div></div>
+<div class="selector"><h3>.button-strong-active-bg</h3><div class="color button-strong-active-bg"></div></div>
+<div class="selector"><h3>.button-strong-active-border</h3><div class="color button-strong-active-border"></div></div>
+<h2>button withoud data manipulation (reset, cancel, open, show etc.)</h2>
+<div class="selector"><h3>.button-soft</h3><div class="color button-soft"></div></div>
+<div class="selector"><h3>.button-soft-bg</h3><div class="color button-soft-bg"></div></div>
+<div class="selector"><h3>.button-soft-border</h3><div class="color button-soft-border"></div></div>
+<div class="selector"><h3>.button-soft-hover</h3><div class="color button-soft-hover"></div></div>
+<div class="selector"><h3>.button-soft-hover-bg</h3><div class="color button-soft-hover-bg"></div></div>
+<div class="selector"><h3>.button-soft-hover-border</h3><div class="color button-soft-hover-border"></div></div>
+<div class="selector"><h3>.button-soft-active</h3><div class="color button-soft-active"></div></div>
+<div class="selector"><h3>.button-soft-active-bg</h3><div class="color button-soft-active-bg"></div></div>
+<div class="selector"><h3>.button-soft-active-border</h3><div class="color button-soft-active-border"></div></div>
+
+
+<h1>SCAFFOLDING</h1>
+<div class="selector"><h3>.body-bg</h3><div class="color body-bg"></div></div>
+<div class="selector"><h3>.content-bg</h3><div class="color content-bg"></div></div>
+<div class="selector"><h3>.tabs-bg</h3><div class="color tabs-bg"></div></div>
+<div class="selector"><h3>.heading-bg</h3><div class="color heading-bg"></div></div>
+<div class="selector"><h3>.controlpanel-bg</h3><div class="color controlpanel-bg"></div></div>
+
+<div class="selector"><h3>.text-color</h3><div class="color text-color"></div></div>
+<div class="selector"><h3>.heading-color</h3><div class="color heading-color"></div></div>
+<div class="selector"><h3>.caption-color</h3><div class="color caption-color"></div></div>
+
+
+
+
+</div>
+</body>
+</html>
diff --git a/css/design40/manual/farben.html b/css/design40/manual/farben.html
new file mode 100644
index 000000000..a0848639a
--- /dev/null
+++ b/css/design40/manual/farben.html
@@ -0,0 +1,237 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Kommunikation mit Farben in Kivitendo</title>
+
+  <script type="text/javascript" src="../../js/jquery.js"></script>
+  <script type="text/javascript" src="../../js/common.js"></script>
+  <script type="text/javascript" src="../../js/namespace.js"></script>
+  <script type="text/javascript" src="../../js/kivi.js"></script>
+  <script type="text/javascript" src="../../js/locale/de.js"></script>
+  <script type="text/javascript" src="../../js/jquery-ui.js"></script>
+  <script type="text/javascript" src="../../js/kivi.QuickSearch.js"></script>
+  <script type="text/javascript" src="../../js/kivi.ActionBar.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Draft.js"></script>
+  <script type="text/javascript" src="../../js/kivi.File.js"></script>
+  <script type="text/javascript" src="../../js/kivi.SalesPurchase.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Part.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/ckeditor.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/adapters/jquery.js"></script>
+  <script type="text/javascript" src="../../js/kivi.io.js"></script>
+  <script type="text/javascript" src="../../js/autocomplete_customer.js"></script>
+  <script type="text/javascript" src="../../js/client_js.js"></script>
+  <script type="text/javascript" src="../../js/jquery.cookie.js"></script>
+  <script type="text/javascript" src="../../js/jquery.checkall.js"></script>
+  <script type="text/javascript" src="../../js/jquery.download.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.form.js"></script>
+  <script type="text/javascript" src="../../js/jquery/fixes.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.tooltipster.min.js"></script>
+  <script type="text/javascript" src="../../js/jquery/ui/i18n/jquery.ui.datepicker-de.js"></script>
+
+</head>
+<body class="developing">
+<header>
+  <h1>Bedeutung &amp; Anwendung von Farben in Kivitendo</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<div class="wrapper">
+<h2>Buttons</h2>
+<form action="#">
+<h3>Formular absenden (Datenmanipulation, unwiderrufbar)</h3>
+<p>Diese Buttons starten den Versand der Formulardaten an den Server (Submit). Aus diesem Grunde sind diese entsprechend prominent eingefärbt.</p>
+<div class="buttons">
+<table>
+  <tbody>
+    <tr>
+      <td>normal</td>
+      <td>hover</td>
+      <td>active</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td><input type="submit" value="Absenden" class="wi-small"></td>
+      <td><input type="submit" value="Absenden" class="hover wi-small"></td>
+      <td><input type="submit" value="Absenden" class="active wi-small"></td>
+      <td>(INPUT[type=submit])</td>
+    </tr>
+    <tr>
+      <td><input type="button" value="Absenden" class="wi-small"></td>
+      <td><input type="button" value="Absenden" class="hover wi-small"></td>
+      <td><input type="button" value="Absenden" class="active wi-small"></td>
+      <td>(INPUT[type=button])</td>
+    </tr>
+    <tr>
+      <td><button type="button" class=" wi-small">Speichern</button></td>
+      <td><button type="button" class="hover wi-small">Speichern</button></td>
+      <td><button type="button" class="active wi-small">Speichern</button></td>
+      <td>(BUTTON)</td>
+    </tr>
+    <tr>
+      <td><a href="#" class="button wi-small">Absenden</a></td>
+      <td><a href="#" class="button hover wi-small">Absenden</a></td>
+      <td><a href="#" class="button active wi-small">Absenden</a></td>
+      <td>(A.button-Tag)</td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+
+</div><!-- ./buttons -->
+
+<h3>Navigation &amp; User Interface</h3>
+<p>Diese Buttons dienen zur Bedienung der grafischen Benutzer-Schnittstelle im Client und verursachen KEINE unwiderrufliche Datenmanipulationen auf Seiten des Servers.<br>Aus diesem Grunde wird die Klasse <b>«.neutral»</b> bereitgestellt.</p>
+<div class="buttons">
+<table>
+  <tbody>
+    <tr>
+      <td>normal</td>
+      <td>hover</td>
+      <td>active</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td><input type="reset" value="Zurücksetzen" class="neutral wi-normal"></td>
+      <td><input type="reset" value="Zurücksetzen" class="neutral-hover wi-normal"></td>
+      <td><input type="reset" value="Zurücksetzen" class="neutral-active wi-normal"></td>
+      <td>(INPUT[submit].neutral-Tag)</td>
+    </tr>
+    <tr>
+      <td><button class="neutral wi-normal">Details anzeigen</button></td>
+      <td><button class="neutral neutral-hover wi-normal">Details anzeigen</button></td>
+      <td><button class="neutral neutral-active wi-normal">Details anzeigen</button></td>
+      <td>(BUTTON.neutral-Tag)</td>
+    </tr>
+    <tr>
+      <td><a href="#" class="button neutral wi-normal">Filter anzeigen</a></td>
+      <td><a href="#" class="button neutral neutral-hover wi-normal">Filter anzeigen</a></td>
+      <td><a href="#" class="button neutral neutral-active wi-normal">Filter anzeigen</a></td>
+      <td>(A.button.neutral-Tag)</td>
+    </tr>
+  </tbody>
+</table>
+</div><!-- ./buttons -->
+</form>
+
+<h2>Nachrichten (Messages)</h2>
+<p>Es gibt zwei ggf. sogar drei Message-<b>Container-Varianten</b> in Kivitendo:</p>
+<ul>
+  <li>Flash_Messages</li>
+  <li>Old_Style</li>
+</ul>
+<p>Dann gibt es mind. 4 <b>Message-Arten</b>:</p>
+<ul>
+  <li>Error</li>
+  <li>Warning</li>
+  <li>Info oder Hint</li>
+  <li>OK</li>
+</ul>
+<p>Nachfolgend werden jeweils zuerst die komplexen Flash-Messages, dann die einfachen Old Style-Messages in P- & DIV-Containern aufgeführt.</p>
+
+
+<h3>Error</h3>
+
+<p>Fehlermeldung, die ein Grund zur Sorge sein sollten. Diese Nachrichten-Art nur in schwerwiegenden Fällen einsetzen, damit der Benutzer sofort erkennt, dass was schiefgelaufen ist.</p>
+<div id="flash_error" class="flash_message flash_message_error">
+<div class="button-container">
+  <a href="#flash_error" style="float:right" class="icon-close button wi-tiny">✕</a>
+  <span id="flash_error_disp" class="display" style="float:left;">
+    <a href="#flash_error" style="float:left;" onclick="$('#flash_detail_error').toggle();" class="button wi-tiny">Details</a>
+  </span>
+</div>
+<div class="message-container">
+  <span class="flash_title" style="float:left;">Fehler:</span>
+  <div class="flash_notification" style="float:left;">
+    <span id="flash_error_content" class="content">Es ist ein schwerwiegender Fehler aufgetreten!</span>
+    <div id="flash_detail_error" class="detail" style="display:none;">
+      <span id="flash_error_detail">Details zum aufgetretenen, schwerwiegenden Fehler. Hierbei handelt es sich aber nicht um einen Rechtschreibefehler.</span>
+      <a href="#flash_error" style="float:left" onclick="$('#flash_detail_error').hide()" class="icon-close button wi-tiny">✕</a>
+    </div>
+  </div>
+</div>
+</div>
+<p class="message message_error">Es ist ein Fehler aufgetreten! (P.message_error)</p>
+<div class="message message_error">Es ist ein Fehler aufgetreten! (DIV.message_error)</div>
+
+
+<h3>Warning</h3>
+
+<p>Wichtige Mitteilung, die aber kein Grund zur Sorge geben sollte. Diese Nachricht unterstützt den Benutzer bei kritischen Prozessen, sollte ihn aber bei täglichem Einsatz nicht von der Arbeit abhalten.</p>
+<div id="flash_warning" class="flash_message flash_message_warning">
+<div class="button-container">
+  <a href="#flash_warning" style="float:right" class="icon-close button wi-tiny">✕</a>
+  <span id="flash_warning_disp" class="display" style="float:left;">
+    <a href="#flash_warning" style="float:left;" onclick="$('#flash_detail_warning').toggle();" class="button wi-tiny">Details</a>
+  </span>
+</div>
+<div class="message-container">
+  <span class="flash_title" style="float:left;">Warnung:</span>
+  <div class="flash_notification" style="float:left;">
+    <span id="flash_warning_content" class="content">Diesen Hinweis sollten Sie ernst nehmen, aber es besteht beim Lesen noch kein Grund zur Beunruhigung.</span>
+    <div id="flash_detail_warning" class="detail" style="display:none;">
+      <span id="flash_warning_detail">Sie sollten diesen Hinweis ernst nehmen, und vielleicht kommt er Ihnen auch hinlänglich bekannt vor, sodass Sie wissen, wie Sie damit umzugehen haben. Sie sollten sich darüber im Klaren sein, was diese Warnung bedeutet.</span>
+      <a href="#flash_warning" style="float:left" onclick="$('#flash_detail_warning').hide()" class="icon-close button wi-tiny">✕</a>
+    </div>
+  </div>
+</div>
+</div>
+<p class="message message_warning">Achtung, wichtiger Hinweis! (P.message_warning)</p>
+<div class="message message_warning">Achtung, wichtiger Hinweis! (DIV.message_warning)</div>
+
+
+<h3>Info / Hint</h3>
+
+<p>Hier handelt es sich eher um neutrale, ggf. zu ignorierende Routine-Nachrichten, die den Benutzer auch eine gewisse Sicherheit geben sollten. Nicht im Übermass einsetzen, da die Benutzer das Kivitendo-System u.U. täglich bedienen müssen.</p>
+<div id="flash_info" class="flash_message flash_message_info">
+<div class="button-container">
+  <a href="#flash_info" style="float:right" class="icon-close button wi-tiny">✕</a>
+  <span id="flash_info_disp" class="display" style="float:left;">
+    <a href="#flash_info" style="float:left;" onclick="$('#flash_detail_info').toggle();" class="button wi-tiny"> Details </a>
+  </span>
+</div>
+<div class="message-container">
+  <span class="flash_title" style="float:left;">Information:</span>
+  <div class="flash_notification" style="float:left;">
+    <span id="flash_info_content" class="content">Absolut kein Grund zur Beunruhigung, aber lesen sollten Sie die Nachricht vielleicht einmal in Ihrem Leben.</span>
+    <div id="flash_detail_info" class="detail" style="display:none;">
+      <span id="flash_info_detail">Manchmal ist es einfacher, solche Nachrichten zu lesen als gleich das Manual durchrackern zu müssen, was sowieso nur wenige Prozent der Kivitendo-Nutzer machen, ausser eben die karrierebewussten Anwender oder die innerbetrieblich Verantwortlichen.</span>
+      <a href="#flash_info" style="float:left" onclick="$('#flash_detail_info').hide()" class="icon-close button wi-tiny">✕</a>
+    </div>
+  </div>
+</div>
+</div>
+<p class="message message_hint">Es wurden keine Dokumente gefunden, was durchaus korrekt sein kann! (P.message_<b>hint</b>)</p>
+<div class="message message_hint">Die Buchungen sind noch nicht abgespeichert worden! (DIV.message_<b>hint</b>)</div>
+
+
+<h3>OK</h3>
+
+<p>Reine Info, die man getrost ignorieren könnte oder dürfte, aber dem Benutzer die Gewissheit gibt, dass der ausgeführte Prozess erfolgreich abgelaufen ist.</p>
+<div id="flash_ok" class="flash_message flash_message_ok">
+<div class="button-container">
+  <a href="#flash_ok" style="float:right" class="icon-close button wi-tiny">✕</a>
+  <span id="flash_ok_disp" class="display" style="float:left;">
+    <a href="#flash_ok" style="float:left;" onclick="$('#flash_detail_ok').toggle();" class="button wi-tiny">Details</a>
+  </span>
+</div>
+<div class="message-container">
+  <span class="flash_title" style="float:left;">OK:</span>
+  <div class="flash_notification" style="float:left;">
+    <span id="flash_ok_content" class="content">Sie haben erfolgreich einen Prozess ausführen lassen, gratuliere.</span>
+    <div id="flash_detail_ok" class="detail" style="display:none;">
+      <span id="flash_ok_detail">Das ist aber noch kein Grund zur Freude. Lesen Sie doch bitte hier, was es im weiteren zu beachten gibt.</span>
+      <a href="#flash_ok" style="float:left" onclick="$('#flash_detail_ok').hide()" class="icon-close button wi-tiny">✕</a>
+    </div>
+  </div>
+</div>
+</div>
+<p class="message message_ok">Achtung, wichtiger Hinweis! (P.message_ok)</p>
+<div class="message message_ok">Achtung, wichtiger Hinweis! (DIV.message_ok)</div>
+
+
+</div>
+</body>
+</html>
diff --git a/css/design40/manual/form-elements-special.html b/css/design40/manual/form-elements-special.html
new file mode 100644
index 000000000..70b9fd8e9
--- /dev/null
+++ b/css/design40/manual/form-elements-special.html
@@ -0,0 +1,406 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+
+  <script type="text/javascript" src="../../js/jquery.js"></script>
+  <script type="text/javascript" src="../../js/common.js"></script>
+  <script type="text/javascript" src="../../js/namespace.js"></script>
+  <script type="text/javascript" src="../../js/kivi.js"></script>
+  <script type="text/javascript" src="../../js/locale/de.js"></script>
+  <script type="text/javascript" src="../../js/jquery-ui.js"></script>
+  <script type="text/javascript" src="../../js/kivi.QuickSearch.js"></script>
+  <script type="text/javascript" src="../../js/kivi.ActionBar.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Draft.js"></script>
+  <script type="text/javascript" src="../../js/kivi.File.js"></script>
+  <script type="text/javascript" src="../../js/kivi.SalesPurchase.js"></script>
+  <script type="text/javascript" src="../../js/kivi.Part.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/ckeditor.js"></script>
+  <script type="text/javascript" src="../../js/ckeditor/adapters/jquery.js"></script>
+  <script type="text/javascript" src="../../js/kivi.io.js"></script>
+  <script type="text/javascript" src="../../js/autocomplete_customer.js"></script>
+  <script type="text/javascript" src="../../js/client_js.js"></script>
+  <script type="text/javascript" src="../../js/jquery.cookie.js"></script>
+  <script type="text/javascript" src="../../js/jquery.checkall.js"></script>
+  <script type="text/javascript" src="../../js/jquery.download.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.form.js"></script>
+  <script type="text/javascript" src="../../js/jquery/fixes.js"></script>
+  <script type="text/javascript" src="../../js/jquery/jquery.tooltipster.min.js"></script>
+  <script type="text/javascript" src="../../js/jquery/ui/i18n/jquery.ui.datepicker-de.js"></script>
+  <script type="text/javascript" src="../../js/jquery.multiselect2side.js"></script>
+  <script type="text/javascript" src="../../js/jquery.selectboxes.js"></script>
+ 
+  <title>Spezielle Formular-Elemente</title>
+</head>
+<body class="developing">
+<header>
+  <h1>Spezielle Formular-Elemente</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<form action="#">
+
+<div class="wrapper">
+
+
+<div class="col">
+<h2>ms2side (.ms2side / MultiSelect2Side)</h2>
+
+<div class="ms2side">
+  <p>Folgende Elemente können einer Gruppe zugeordnet werden:</p>
+  <!-- vormals:.clearfix -->
+  <select name="group_usersms2side__orig" multiple="" id="group_users" style="display: none;">
+    <option value="2">Element 2</option>
+    <option value="1">Element 1</option>
+  </select>
+  <script type="text/javascript">
+    $().ready(function() {
+      $('#group_users').multiselect2side({ moveOptions: false, labeldx: "Gruppenmitglieder", labelsx: "Alle BenutzerInnen" });
+    });
+  </script>
+  <div class="ms2side__div">
+    <div class="ms2side__select">
+      <div class="ms2side__header">
+        Alle verfügbaren Elemente
+      </div>
+      <select title="Alle BenutzerInnen" name="group_usersms2side__sx" id="group_usersms2side__sx" size="undefined" multiple="multiple">
+        <option value="2">Element 2</option>
+        <option value="1">Element 1</option>
+      </select>
+    </div>
+    <div class="ms2side__options" style="padding-top: 7.333333492279053px;">
+      <p class="AddOne ms2side__hide" title="Add Selected">›</p>
+      <p class="AddAll" title="Add All">»</p>
+      <p class="RemoveOne ms2side__hide" title="Remove Selected">‹</p>
+      <p class="RemoveAll ms2side__hide" title="Remove All">«</p>
+    </div>
+    <div class="ms2side__select">
+      <div class="ms2side__header">
+        Zugeordnete Elemente
+      </div>
+      <select title="Gruppenmitglieder" name="group_usersms2side__dx" id="group_usersms2side__dx" size="undefined" multiple="multiple">
+      </select>
+    </div>
+    <span id="group_usersms2side_hidden" style="display: none;"></span>
+  </div>
+  <script type="text/javascript">
+    $().ready(function() {
+      $('#group_clients').multiselect2side({ moveOptions: false, labeldx: "Mandanten, für die diese Gruppe gültig ist", labelsx: "Alle Mandanten" });
+    });
+  </script>
+
+</div>
+
+<div class="buttons">
+  <a class="button neutral" href="#">Zurück</a>
+  <input value="Speichern" type="button">
+</div>
+
+</div>
+
+
+
+<div class="col wi-wide">
+<h2>Boxes (.boxes)</h2>
+<div class="boxes">
+  <h3 title="Select/Deselect all"><input title="Select/Deselect" value="1" name="dummy1" type="checkbox" id="dummy1">
+    <label for="dummy1">Überschrift (Select all)</label>
+    <script type="text/javascript">$('#dummy1').checkall('.checkallgroup1');</script>
+  </h3>
+  <div>
+    <input value="1" class="checkallgroup1" id="group_rights_map_customer_vendor_edit" name="group.rights_map.customer_vendor_edit" type="checkbox">
+    <label for="group_rights_map_customer_vendor_edit">Option 1</label>
+  </div>
+  <div>
+    <input value="1" id="group_rights_map_customer_vendor_all_edit" class="checkallgroup1" name="group.rights_map.customer_vendor_all_edit" type="checkbox">
+    <label for="group_rights_map_customer_vendor_all_edit">Option 2</label>
+  </div>
+  <div>
+    <input value="1" name="group.rights_map.part_service_assembly_edit" id="group_rights_map_part_service_assembly_edit" type="checkbox" class="checkallgroup1">
+    <label for="group_rights_map_part_service_assembly_edit">Option 3</label>
+  </div>
+  <div>
+    <input value="1" name="group.rights_map.part_service_assembly_details" id="group_rights_map_part_service_assembly_details" class="checkallgroup1" type="checkbox">
+    <label for="group_rights_map_part_service_assembly_details">Option 4</label>
+  </div>
+  <div>
+    <input value="1" id="group_rights_map_project_edit" type="checkbox" name="group.rights_map.project_edit" class="checkallgroup1">
+    <label for="group_rights_map_project_edit">Option 4</label>
+  </div>
+</div>
+</div>
+
+
+</div><!-- /.wrapper -->
+
+
+
+<div class="form-addition">
+  <h3 class="h4">In Bericht aufnehmen</h3>
+  <div class="list col">
+    <h4> Numbers &amp; IDs </h4>
+    <div>
+      <input name="l_id" id="l_id" type="checkbox" value="Y">
+      <label for="l_id"> Buchungsnummer </label>
+    </div>
+    <div>
+      <input name="l_customernumber" id="l_customernumber" type="checkbox" value="Y" checked="">
+      <label for="l_customernumber"> Kundennummer </label>
+    </div>
+    <div>
+      <input name="l_taxnumber" id="l_taxnumber" type="checkbox" value="Y">
+      <label for="l_taxnumber"> Steuernummer </label>
+    </div>
+    <div>
+      <input name="l_invnumber" id="l_invnumber" type="checkbox" value="Y">
+      <label for="l_invnumber"> Rechnungen </label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4> Kunde </h4>
+    <div>
+      <input name="l_name" id="l_name" type="checkbox" value="Y" checked="">
+      <label for="l_name"> Kundenname </label>
+    </div>
+    <div>
+      <input name="l_contact" id="l_contact" type="checkbox" value="Y" checked="">
+      <label for="l_contact"> Kontakt </label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4> Adresse </h4>
+    <div>
+      <input name="l_street" id="l_street" type="checkbox" value="Y" checked="">
+      <label for="l_street"> Straße </label>
+    </div>
+    <div>
+      <input name="l_zipcode" id="l_zipcode" type="checkbox" value="Y" checked="">
+      <label for="l_zipcode"> PLZ </label>
+    </div>
+    <div>
+      <input name="l_city" id="l_city" type="checkbox" value="Y" checked="">
+      <label for="l_city"> Stadt </label>
+    </div>
+    <div>
+      <input name="l_country" id="l_country" type="checkbox" value="Y" checked="">
+      <label for="l_country"> Land </label>
+    </div>
+    <div>
+      <input name="l_gln" id="l_gln" type="checkbox" value="Y" checked="">
+      <label for="l_gln"> GLN </label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4> Benutzerdefinierte Variablen </h4>
+<!-- PENDENT: bessere Loesung suchen -->
+    <input type="checkbox" name="l_cvar_Geburtsdatum" id="l_cvar_Geburtsdatum" value="Y">
+    <label for="l_cvar_Geburtsdatum">Geburtsdatum</label>
+  </div>
+</div>
+
+
+<div class="wrapper">
+  <div class="filter_toggle" style="display: block;">
+    <a href="#" onclick="javascript:$('.filter_toggle').toggle()" class="button toggle off neutral">Filter zeigen</a> 
+  </div>
+  <div class="filter_toggle" style="display: none;">
+    <a href="#" onclick="javascript:$('.filter_toggle').toggle()" class="button toggle on neutral with-panel">Filter verbergen</a> 
+<!-- PENDENT: Panel einbauen -->
+    <div class="filter-toggle-panel">
+      <table id="filter_table" class="tbl-horizontal">
+        <caption>Ware</caption>
+        <tbody>
+          <tr>
+            <th>Beschreibung</th>
+            <td><input value="" name="filter.name:substr::ilike" type="text" id="filter_name_substr_ilike" class="wi-normal" size="20">
+            </td>
+          </tr>
+          <tr>
+            <th>Typ</th>
+            <td>
+            <select name="filter.type" id="price_rule_filter_type" class="wi-normal">
+              <option value=""></option>
+              <option value="customer">Preisregeln (Verkauf)</option>
+              <option value="vendor">Preisregeln (Einkauf)</option>
+            </select>
+            </td>
+          </tr>
+          <tr>
+            <th>Ware</th>
+            <td><span class="part_picker"><input data-part-picker-data="{'class':'wi-normal'}" value="" name="filter.item_type_matches[].part" id="filter_item_type_matches5719277_part" type="hidden" class="wi-normal part_autocomplete">
+            <span role="status" aria-live="polite" class="ui-helper-hidden-accessible"></span><input value="" name="" type="text" class="wi-normal ui-autocomplete-input" id="filter_item_type_matches5719277_part_name" autocomplete="off">
+            <span class="ppp_popup_button"></span></span></td>
+          </tr>
+          <tr>
+            <th>Warengruppe</th>
+            <td>
+            <select name="filter.item_type_matches[].partsgroup" id="filter_item_type_matches5719278_partsgroup" class="wi-normal">
+              <option value=""></option>
+              <option value="447">Computer Occasion</option>
+              <option value="448">Hardwareteile Occasion</option>
+              <option value="449">Computer neu</option>
+              <option value="450">Hardwareteile neu</option>
+              <option value="451">Peripheriegeräte neu</option>
+              <option value="452">Peripheriegeräte Occasion</option>
+              <option value="528">Dienstleistung</option>
+              <option value="594">Lizenzgebühren</option>
+              <option value="635">Zubehör</option>
+              <option value="681">Verbrauchsmaterial</option>
+              <option value="920">Geldbetraege</option>
+              <option value="13376">0Kundengerät</option>
+              <option value="27265">Dienstleistung (Stunden)</option>
+            </select>
+            </td>
+          </tr>
+          <tr>
+            <th>Menge</th>
+            <td><input value="" name="filter.item_type_matches[].qty" type="text" id="filter_item_type_matches5719279_qty" class="wi-normal">
+            </td>
+          </tr>
+          <tr id="price_rule_filter_customer_tr" style="display:none">
+            <th>Kunde</th>
+            <td><span class="customer_vendor_picker"><input value="" name="filter.item_type_matches[].customer" id="price_rule_filter_customer" type="hidden" class="wi-normal customer_vendor_autocomplete" data-customer-vendor-picker-data="{'type':'customer','class':'wi-normal'}">
+            <span role="status" aria-live="polite" class="ui-helper-hidden-accessible"></span><input value="" name="" class="wi-normal ui-autocomplete-input" type="customer" id="price_rule_filter_customer_name" autocomplete="off">
+            </span></td>
+          </tr>
+          <tr id="price_rule_filter_vendor_tr" style="display:none">
+<!-- PENDENT: Korrekt mit customer? -->
+            <th>Lieferant</th>
+            <td><span class="customer_vendor_picker"><input value="" name="filter.item_type_matches[].vendor" id="price_rule_filter_vendor" type="hidden" class="wi-normal customer_vendor_autocomplete" data-customer-vendor-picker-data="{'type':'vendor','class':'wi-normal'}">
+            <span role="status" aria-live="polite" class="ui-helper-hidden-accessible"></span><input value="" name="" class="wi-normal ui-autocomplete-input" type="vendor" id="price_rule_filter_vendor_name" autocomplete="off">
+            </span></td>
+          </tr>
+          <tr>
+            <th>Kunden-/Lieferantentyp</th>
+            <td>
+            <select name="filter.item_type_matches[].business" id="filter_item_type_matches5719280_business" class="wi-normal">
+              <option value=""></option>
+              <option value="23353">LehrerInnen</option>
+              <option value="23347">IT-Firma</option>
+              <option value="41723">Behörde</option>
+              <option value="158">Firma</option>
+              <option value="157">Privatperson</option>
+            </select>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <table id="filter_table" class="tbl-horizontal">
+        <caption>Dates</caption>
+        <tbody>
+          <tr>
+            <th>Liefertermin</th>
+            <td><input value="" name="filter.item_type_matches[].reqdate" type="text" class="datepicker wi-date hasDatepicker" id="filter_item_type_matches5719281_reqdate" data-validate="date" size="11">
+            <img class="ui-datepicker-trigger" src="image/calendar.png" alt="..." title="..."></td>
+          </tr>
+          <tr>
+            <th>Buchungsdatum Beleg</th>
+            <td><input value="" name="filter.item_type_matches[].transdate" type="text" class="datepicker wi-date hasDatepicker" id="filter_item_type_matches5719282_transdate" data-validate="date" size="11">
+            <img class="ui-datepicker-trigger" src="image/calendar.png" alt="..." title="..."></td>
+          </tr>
+          <tr>
+            <th class="caption" colspan="2">Prices &amp; Discounts</th>
+          </tr>
+          <tr>
+            <th>Preisgruppe</th>
+            <td>
+            <select name="filter.item_type_matches[].pricegroup" id="filter_item_type_matches5719283_pricegroup" class="wi-normal">
+              <option value=""></option>
+              <option value="0">keine Preisgruppe</option>
+              <option value="27267">50 CHF pro Stunde</option>
+              <option value="27268">100 CHF pro Stunde</option>
+            </select>
+            <br>
+            </td>
+          </tr>
+          <tr>
+            <th>Preis</th>
+            <td><input value="" name="filter.price:number" type="text" id="filter_price_number" class="wi-normal" size="20">
+            </td>
+          </tr>
+          <tr>
+            <th>Abschlag</th>
+            <td><input value="" name="filter.reduction:number" type="text" id="filter_reduction_number" class="wi-normal" size="20">
+            </td>
+          </tr>
+          <tr>
+            <th>Rabatt</th>
+            <td><input value="" name="filter.discount:number" type="text" id="filter_discount_number" class="wi-normal" size="20">
+            </td>
+          </tr>
+          <tr>
+            <th class="caption" colspan="2">Status</th>
+          </tr>
+          <tr>
+            <th>Priorität</th>
+            <td>
+            <select name="filter.priority" id="filter_priority" class="wi-normal">
+              <option value="" selected="">Alle</option>
+              <option value="3">Normal</option>
+              <option value="4">Override</option>
+            </select>
+            </td>
+          </tr>
+          <tr>
+            <th>Ungültig</th>
+            <td>
+            <select name="filter.obsolete" id="filter_obsolete" class="wi-normal">
+              <option value="">Beide</option>
+              <option value="0" selected="">Gültig</option>
+              <option value="1">Ungültig</option>
+            </select>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="col list">
+        <h3 class="caption">Hat Regeltypen</h3>
+        <div>
+          <input value="part" name="filter.has_item_type[]" id="filter_has_item_type5719284" type="checkbox">
+          <label for="filter_has_item_type5719284">Ware</label>
+          <br>
+          <input value="customer" name="filter.has_item_type[]" id="filter_has_item_type5719285" type="checkbox">
+          <label for="filter_has_item_type5719285">Kunde</label>
+          <br>
+          <input value="vendor" name="filter.has_item_type[]" id="filter_has_item_type5719286" type="checkbox">
+          <label for="filter_has_item_type5719286">Lieferant</label>
+          <br>
+          <input value="business" name="filter.has_item_type[]" id="filter_has_item_type5719287" type="checkbox">
+          <label for="filter_has_item_type5719287">Kunden-/Lieferantentyp</label>
+          <br>
+          <input value="partsgroup" name="filter.has_item_type[]" id="filter_has_item_type5719288" type="checkbox">
+          <label for="filter_has_item_type5719288">Warengruppe</label>
+          <br>
+          <input value="qty" name="filter.has_item_type[]" id="filter_has_item_type5719289" type="checkbox">
+          <label for="filter_has_item_type5719289">Menge</label>
+          <br>
+          <input value="reqdate" name="filter.has_item_type[]" id="filter_has_item_type5719290" type="checkbox">
+          <label for="filter_has_item_type5719290">Liefertermin</label>
+          <br>
+          <input value="transdate" name="filter.has_item_type[]" id="filter_has_item_type5719291" type="checkbox">
+          <label for="filter_has_item_type5719291">Buchungsdatum</label>
+          <br>
+          <input value="pricegroup" name="filter.has_item_type[]" id="filter_has_item_type5719292" type="checkbox">
+          <label for="filter_has_item_type5719292">Preisgruppe</label>
+          <br>
+        </div>
+      </div>
+      <input value="name" name="sort_by" id="sort_by" type="hidden">
+      <input value="0" name="sort_dir" id="sort_dir" type="hidden">
+      <input value="1" name="page" id="page" type="hidden">
+      <div class="buttons">
+        <input value="Reset Filter" class="neutral" type="reset" onclick="$('#search_form').resetForm()">
+      </div>
+    </div>
+<!-- /.filter-toggle-panel -->
+  </div>
+<!-- /.filter_toggle -->
+</div>
+
+
+
+
+
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/css/design40/manual/form-elements.html b/css/design40/manual/form-elements.html
new file mode 100644
index 000000000..ad72a8770
--- /dev/null
+++ b/css/design40/manual/form-elements.html
@@ -0,0 +1,699 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Test und Entwicklung des Kivitendo-CSS</title>
+</head>
+<body class="developing">
+<header>
+  <h1>Kivitendo-Formular-Elemente</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+
+<form action="#">
+
+
+
+
+<div class="wrapper">
+
+
+<h2>Formular-Elemente mit Standard-Einstellungen</h2>
+
+
+<table class="tbl-horizontal">
+  <caption>Klassische Input-Elemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-mediumsmall"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password"></td>
+    </tr>
+    <tr>
+      <th>Checkbox</th>
+      <td>
+        <input type="checkbox" name="input-type-checkbox" value="cb1" id="cb1-1"><label for="cb1-1">1</label> &nbsp; 
+        <input type="checkbox" name="input-type-checkbox" value="cb2" id="cb1-2"><label for="cb1-2">2</label>
+      </td>
+    </tr>
+    <tr>
+      <th>Radio</th>
+      <td>
+        <input type="radio" name="input-type-radio" value="Yes" id="rd1-1"><label for="rd1-1">Yes</label> &nbsp; 
+        <input type="radio" name="input-type-radio" value="No" id="rd1-2"><label for="rd1-2">No</label>      
+      </td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt1"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst1"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn1" value="Anzeigen"></td>
+    </tr>
+    <tr>
+      <th>Image</th>
+      <td><input type="image" name="input-type-image"></td>
+    </tr>
+    <tr>
+      <th>File</th>
+      <td><input type="file" name="input-type-file"></td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>Andere Formular-Elemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct1">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea1">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td>
+        <button name="bttn1-1" type="button">Type Button</button><br>
+        <button name="bttn1-2" type="submit">Type Submit</button><br>
+        <button name="bttn1-3" type="reset">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>Neue Input-Elemente in HTML5</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Search</th>
+      <td><input type="search" name="input-type-search"></td>
+    </tr>
+    <tr>
+      <th>Tel</th>
+      <td><input type="tel" name="input-type-tel"></td>
+    </tr>
+    <tr>
+      <th>URL</th>
+      <td><input type="url" name="input-type-url"></td>
+    </tr>
+    <tr>
+      <th>Email</th>
+      <td><input type="email" name="input-type-email"></td>
+    </tr>
+    <tr>
+      <th>Datetime</th>
+      <td><input type="datetime" name="input-type-datetime"></td>
+    </tr>
+    <tr>
+      <th>Date</th>
+      <td><input type="date" name="input-type-date"></td>
+    </tr>
+    <tr>
+      <th>Time</th>
+      <td><input type="time" name="input-type-time"></td>
+    </tr>
+    <tr>
+      <th>Month</th>
+      <td><input type="month" name="input-type-month"></td>
+    </tr>
+    <tr>
+      <th>Week</th>
+      <td><input type="week" name="input-type-week"></td>
+    </tr>
+    <tr>
+      <th>Datetime-Local</th>
+      <td><input type="datetime-local" name="input-type-datetime-local"></td>
+    </tr>
+    <tr>
+      <th>Number</th>
+      <td><input type="number" name="input-type-number"></td>
+    </tr>
+    <tr>
+      <th>Range</th>
+      <td><input type="range" name="input-type-range"></td>
+    </tr>
+    <tr>
+      <th>Color</th>
+      <td><input type="color" name="input-type-color"></td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>Abmessungen (Beispiel Input[type=text])</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-verysmall"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>wi-smallest</th>
+      <th>44px</th>
+      <td><input type="text" name="input-type-text" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>wi-verysmall</th>
+      <th>63px</th>
+      <td><input type="text" name="input-type-text" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>wi-small</th>
+      <th>95px</th>
+      <td><input type="text" name="input-type-text" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>wi-mediumsmall</th>
+      <th>121px</th>
+      <td><input type="text" name="input-type-text" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>wi-normal</th>
+      <th>161px</th>
+      <td><input type="text" name="input-type-text" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>wi-lightwide</th>
+      <th>188px</th>
+      <td><input type="text" name="input-type-text" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>wi-wide</th>
+      <th>249px</th>
+      <td><input type="text" name="input-type-text" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>wi-wider</th>
+      <th>329px</th>
+      <td><input type="text" name="input-type-text" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>wi-verywide</th>
+      <th>489px</th>
+      <td><input type="text" name="input-type-text" class="wi-verywide"></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+
+<div class="wrapper">
+
+
+<h2>Abmessungen mit assoziativen Klassennamen</h2>
+
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-normal</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-normal">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-normal">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-normal">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-normal">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-normal">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-smallest</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-smallest"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-smallest">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-smallest">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-smallest">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-smallest">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-smallest">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-verysmall</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-verysmall"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-verysmall">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-verysmall">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-verysmall">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-verysmall">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-verysmall">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-small</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-small">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-small">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-small">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-small">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-small">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-mediumsmall</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-mediumsmall"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-mediumsmall">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-mediumsmall">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-mediumsmall">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-mediumsmall">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-mediumsmall">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-lightwide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-lightwide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-lightwide">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-lightwide">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-lightwide">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-lightwide">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-wide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-wide"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-wide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-wide">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-wide">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-wide">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-wide">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-wider</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-wider"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-wider">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-wider">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-wider">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-wider">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-wider">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>Klasse wi-verywide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Text</th>
+      <td><input type="text" name="input-type-text-2" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>Password</th>
+      <td><input type="password" name="input-type-password-2" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>Submit</th>
+      <td><input type="submit" name="sbmt2" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>Reset</th>
+      <td><input type="reset" name="rst2" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>Button</th>
+      <td><input type="button" name="btn2" value="Anzeigen" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct1" name="slct2" class="wi-verywide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td><textarea name="txtarea2" class="wi-verywide">Dies ist ein ganz normaler Text in einem Mehrzeilen-Feld!</textarea></td>
+    </tr>
+    <tr>
+      <th>Button (Tag)</th>
+      <td>
+        <button name="bttn1-1" type="button" class="wi-verywide">Type Button</button><br>
+        <button name="bttn1-2" type="submit" class="wi-verywide">Type Submit</button><br>
+        <button name="bttn1-3" type="reset" class="wi-verywide">Type Reset</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+
+
+</div>
+
+
+
+
+
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.png b/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.png
new file mode 100644
index 000000000..a322f5ff3
Binary files /dev/null and b/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.png differ
diff --git a/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.svg b/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.svg
new file mode 100644
index 000000000..482204f53
--- /dev/null
+++ b/css/design40/manual/images/Tabelle_Horizontal_mit_Elementen.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1280 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect id="ArtBoard2" x="0" y="0" width="1280" height="800" style="fill:none;"/><rect x="177.358" y="278.872" width="604.6" height="363.666" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="177.358" y="229.138" width="604.6" height="35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="177.358" y="642.538" width="604.6" height="35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="177.358" y="166.404" width="178.355" height="42.678" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="177.358" y="113.003" width="601.004" height="42.678" style="fill:#ccc;stroke:#000;stroke-width:1px;"/><rect x="359.965" y="166.404" width="421.993" height="42.678" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M357.341,278.872l0,166.862" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M357.341,229.318l0,35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M361.341,642.538l0,35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="19.296px" y="197.27px" style="font-family:'Monaco';font-size:24px;">colgroup</text><text x="19.296px" y="144.004px" style="font-family:'Monaco';font-size:24px;">caption</text><text x="179.975px" y="197.27px" style="font-family:'Monaco';font-size:24px;">col.wi-small</text><text x="179.975px" y="100.695px" style="font-family:'Monaco';font-size:24px;">table.tbl-horizontal</text><text x="370.063px" y="197.27px" style="font-family:'Monaco';font-size:24px;">col.wi-wide</text><text x="431.249px" y="318.757px" style="font-family:'Monaco';font-size:24px;">input.wi-wide</text><text x="369.05px" y="318.757px" style="font-family:'Monaco';font-size:24px;">td</text><g transform="matrix(1,0,0,0.901023,144.122,-629.664)"><text x="36.526px" y="1050.26px" style="font-family:'Monaco';font-size:26.636px;">th</text><g transform="matrix(0.901023,0,0,1,8.36148,0)"><text x="84.479px" y="1050.26px" style="font-family:'Monaco';font-size:26.636px;">(label)</text></g></g><text x="180.771px" y="254.497px" style="font-family:'Monaco';font-size:24px;">th</text><text x="368.09px" y="256.314px" style="font-family:'Monaco';font-size:24px;">th</text><text x="369.05px" y="377.757px" style="font-family:'Monaco';font-size:24px;">td</text><text x="737.061px" y="377.757px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:29.791px;">kg</text><text x="180.771px" y="377.757px" style="font-family:'Monaco';font-size:24px;">th</text><text x="369.05px" y="429.757px" style="font-family:'Monaco';font-size:24px;">td</text><text x="180.771px" y="429.757px" style="font-family:'Monaco';font-size:24px;">th</text><text x="369.05px" y="670.269px" style="font-family:'Monaco';font-size:24px;">td</text><text x="180.771px" y="479.757px" style="font-family:'Monaco';font-size:24px;">th colspan=2</text><text x="200.612px" y="514.757px" style="font-family:'Monaco';font-size:24px;">span.label.above</text><text x="180.771px" y="670.269px" style="font-family:'Monaco';font-size:24px;">th</text><text x="431.249px" y="376.17px" style="font-family:'Monaco';font-size:24px;">input.wi-wide</text><text x="201.005px" y="549.325px" style="font-family:'Monaco';font-size:24px;">textarea.wi-small-wide</text><text x="431.249px" y="428.992px" style="font-family:'Monaco';font-size:24px;">select.wi-wide</text><text x="19.936px" y="256.308px" style="font-family:'Monaco';font-size:24px;">thead</text><text x="19.936px" y="314.02px" style="font-family:'Monaco';font-size:24px;">tbody</text><text x="19.936px" y="668.734px" style="font-family:'Monaco';font-size:24px;">tfoot</text><rect x="422.469" y="292.493" width="304.914" height="33.685" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="422.469" y="349.906" width="304.914" height="33.685" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="194.529" y="523.549" width="532.855" height="109.878" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M727.383,411.149c0,-4.648 -3.773,-8.421 -8.421,-8.421l-288.072,0c-4.647,0 -8.421,3.773 -8.421,8.421l0,16.842c0,4.648 3.774,8.422 8.421,8.422l288.072,0c4.648,0 8.421,-3.774 8.421,-8.422l0,-16.842Z" style="fill:none;stroke:#000;stroke-width:1px;"/><path id="New" d="M736.65,298.411l21.921,0l-1.461,1.462l-18.998,0l0,24.843l24.843,0l0,-18.998l1.461,-1.461l0,21.92l-27.766,0l0,-27.766Zm28.059,-1.9l-14.176,14.249l1.535,1.534l14.175,-14.248l1.096,1.023l-14.467,14.467l-4.823,1.169l1.169,-4.749l14.468,-14.468l1.023,1.023Zm5.407,-1.242l-2.558,-2.557c-0.292,-0.292 -0.73,-0.292 -1.023,0l-1.68,1.68l3.58,3.581l1.681,-1.681c0.219,-0.292 0.219,-0.731 0,-1.023Z"/><path d="M781.958,340.287l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M781.958,393.864l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M781.958,444.61l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M709.844,431.465l-12.133,-8.712l24.265,0l-12.132,8.712Z" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M709.844,407.753l12.132,8.712l-24.265,0l12.133,-8.712Z" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="819.651px" y="426.445px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">P<tspan x="834.456px 839.387px 851.732px 857.899px 868.998px 875.165px 881.332px 893.677px 901.069px 907.236px 913.403px 924.501px 936.846px 949.191px 960.29px 966.457px 981.262px 987.429px 1002.23px 1014.58px 1021.97px 1033.07px 1045.41px 1056.51px 1062.68px 1068.85px 1081.19px 1092.29px " y="426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px 426.445px ">latz für Icons &amp; Kürzesttext</tspan></text><text x="819.651px" y="197.27px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">B<tspan x="834.456px 841.848px 854.193px 859.124px 865.291px 877.636px 889.981px 902.326px 914.671px 927.016px 939.361px 951.706px 964.05px 976.395px 982.562px 988.729px 1001.07px 1008.47px 1014.63px 1029.44px 1041.78px 1054.13px 1059.06px 1065.23px 1077.57px " y="197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px 197.27px ">reitenangaben für Spalten</tspan></text><g transform="matrix(1,0,0,1,-22.9286,-995.21)"><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1238.41px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Spalten-Überschriften</text></g><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1259.07px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">(seltene <tspan x="918.294px 931.634px " y="1259.07px 1259.07px ">Au</tspan>snahme)</text></g></g><text x="819.651px" y="667.418px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">S<tspan x="834.456px 846.801px 865.291px 883.781px 896.126px 908.471px 914.638px 922.03px 934.375px 939.306px 951.651px 959.043px 964.107px 978.912px 991.257px 1002.36px 1014.7px 1027.05px 1039.39px 1057.88px 1070.22px " y="667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px 667.418px ">ummen (hier Ausnahme)</tspan></text><text x="819.651px" y="143.414px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Ü<tspan x="835.681px 848.026px 860.371px 867.762px 878.861px 889.959px 902.304px 909.696px 914.627px 920.794px 926.962px 933.129px 945.473px 957.818px 965.21px 971.016px 982.358px 994.703px 1007.05px 1019.39px 1024.32px 1029.26px 1041.6px 1047.77px 1055.16px 1067.5px 1079.85px " y="143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px 143.414px ">berschrift der Tabelle (h3)</tspan></text><g transform="matrix(1,0,0,1,-23.8305,-689.091)"><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1238.41px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Kombinierte Breitenangabe für</text></g><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1259.07px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">rechtsbündige <tspan x="972.786px 986.126px " y="1259.07px 1259.07px ">Au</tspan>srichtung</text></g></g><path d="M802.645,419.465l-48.47,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M812.223,542.153l-256.03,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M812.223,508.789l-346.362,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><rect x="163.002" y="73.72" width="631.009" height="617.19" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="368.075px" y="732.995px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Datenspalte(n)</text><g transform="matrix(1,0,0,1,-184.427,-829.442)"><text x="372.075px" y="1562.44px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Feldbeschriftungen</text><text x="372.075px" y="1583.09px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">(Label)</text></g><g transform="matrix(1,0,0,1,-52.1965,-1027.53)"><text x="870.902px" y="1522.05px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Feldbeschriftung (Block) oberhalb für</text><text x="870.902px" y="1542.7px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">kombinierte <tspan x="978.734px 992.074px " y="1542.7px 1542.7px ">An</tspan>lage in einem Feld</text></g><text x="17.823px" y="51.016px" style="font-family:'Arial-BoldMT', 'Arial', sans-serif;font-weight:700;font-size:30px;">Horizontale T<tspan x="205.601px 222.286px " y="51.016px 51.016px ">ab</tspan>elle mit <tspan x="351.207px 372.872px " y="51.016px 51.016px ">Ab</tspan>messungen und Formular-Elementen</text><path d="M272.619,710.829l0,-32.491" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M430.023,710.829l0,-32.491" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M812.223,542.153l-256.03,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/></svg>
\ No newline at end of file
diff --git a/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.png b/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.png
new file mode 100644
index 000000000..6fa3a3756
Binary files /dev/null and b/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.png differ
diff --git a/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.svg b/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.svg
new file mode 100644
index 000000000..51429d11e
--- /dev/null
+++ b/css/design40/manual/images/Tabellen_in_Wrapper-Bloecken.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1127 729" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;"><rect id="ArtBoard2" x="-20.02" y="-29.541" width="1280" height="800" style="fill:none;"/><rect x="157.338" y="249.331" width="604.6" height="363.666" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="157.338" y="199.597" width="604.6" height="35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="157.338" y="612.997" width="604.6" height="35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="157.338" y="136.863" width="178.355" height="42.678" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="157.338" y="83.462" width="601.004" height="42.678" style="fill:#ccc;stroke:#000;stroke-width:1px;"/><rect x="339.945" y="136.863" width="421.993" height="42.678" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M337.321,249.331l0,166.862" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M337.321,199.777l0,35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M341.321,612.997l0,35.8" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="-0.724px" y="167.729px" style="font-family:'Monaco';font-size:24px;">colgroup</text><text x="-0.724px" y="114.463px" style="font-family:'Monaco';font-size:24px;">caption</text><text x="159.954px" y="167.729px" style="font-family:'Monaco';font-size:24px;">col.wi-small</text><text x="159.954px" y="71.154px" style="font-family:'Monaco';font-size:24px;">table.tbl-horizontal</text><text x="350.043px" y="167.729px" style="font-family:'Monaco';font-size:24px;">col.wi-wide</text><text x="411.228px" y="289.216px" style="font-family:'Monaco';font-size:24px;">input.wi-wide</text><text x="349.03px" y="289.216px" style="font-family:'Monaco';font-size:24px;">td</text><g transform="matrix(1,0,0,0.901023,124.102,-659.206)"><text x="36.526px" y="1050.26px" style="font-family:'Monaco';font-size:26.636px;">th</text><g transform="matrix(0.901023,0,0,1,8.36148,0)"><text x="84.479px" y="1050.26px" style="font-family:'Monaco';font-size:26.636px;">(label)</text></g></g><text x="160.751px" y="224.956px" style="font-family:'Monaco';font-size:24px;">th</text><text x="348.07px" y="226.773px" style="font-family:'Monaco';font-size:24px;">th</text><text x="349.03px" y="348.216px" style="font-family:'Monaco';font-size:24px;">td</text><text x="717.04px" y="348.216px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:29.791px;">kg</text><text x="160.751px" y="348.216px" style="font-family:'Monaco';font-size:24px;">th</text><text x="349.03px" y="400.216px" style="font-family:'Monaco';font-size:24px;">td</text><text x="160.751px" y="400.216px" style="font-family:'Monaco';font-size:24px;">th</text><text x="349.03px" y="640.728px" style="font-family:'Monaco';font-size:24px;">td</text><text x="160.751px" y="450.216px" style="font-family:'Monaco';font-size:24px;">th colspan=2</text><text x="180.592px" y="485.216px" style="font-family:'Monaco';font-size:24px;">span.label.above</text><text x="160.751px" y="640.728px" style="font-family:'Monaco';font-size:24px;">th</text><text x="411.228px" y="346.629px" style="font-family:'Monaco';font-size:24px;">input.wi-wide</text><text x="180.985px" y="519.784px" style="font-family:'Monaco';font-size:24px;">textarea.wi-small-wide</text><text x="411.228px" y="399.451px" style="font-family:'Monaco';font-size:24px;">select.wi-wide</text><text x="-0.084px" y="226.767px" style="font-family:'Monaco';font-size:24px;">thead</text><text x="-0.084px" y="284.479px" style="font-family:'Monaco';font-size:24px;">tbody</text><text x="-0.084px" y="639.193px" style="font-family:'Monaco';font-size:24px;">tfoot</text><rect x="402.449" y="262.952" width="304.914" height="33.685" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="402.449" y="320.365" width="304.914" height="33.685" style="fill:none;stroke:#000;stroke-width:1px;"/><rect x="174.508" y="494.008" width="532.855" height="109.878" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M707.363,381.608c0,-4.648 -3.774,-8.421 -8.421,-8.421l-288.072,0c-4.648,0 -8.421,3.773 -8.421,8.421l0,16.842c0,4.648 3.773,8.422 8.421,8.422l288.072,0c4.647,0 8.421,-3.774 8.421,-8.422l0,-16.842Z" style="fill:none;stroke:#000;stroke-width:1px;"/><path id="New" d="M716.63,268.87l21.921,0l-1.462,1.462l-18.998,0l0,24.843l24.844,0l0,-18.998l1.461,-1.461l0,21.92l-27.766,0l0,-27.766Zm28.058,-1.9l-14.175,14.249l1.535,1.534l14.175,-14.248l1.096,1.023l-14.468,14.467l-4.822,1.169l1.169,-4.749l14.467,-14.468l1.023,1.023Zm5.407,-1.242l-2.557,-2.557c-0.292,-0.292 -0.731,-0.292 -1.023,0l-1.68,1.68l3.58,3.581l1.68,-1.681c0.22,-0.292 0.22,-0.731 0,-1.023Z"/><path d="M761.938,310.746l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M761.938,364.323l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M761.938,415.069l-604.6,0" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M689.823,401.924l-12.133,-8.712l24.266,0l-12.133,8.712Z" style="fill:none;stroke:#000;stroke-width:1px;"/><path d="M689.823,378.212l12.133,8.712l-24.266,0l12.133,-8.712Z" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="799.631px" y="396.904px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">P<tspan x="814.436px 819.367px 831.712px 837.879px 848.978px 855.145px 861.312px 873.657px 881.048px 887.215px 893.383px 904.481px 916.826px 929.171px 940.269px 946.436px 961.242px 967.409px 982.214px 994.559px 1001.95px 1013.05px 1025.39px 1036.49px 1042.66px 1048.83px 1061.17px 1072.27px " y="396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px 396.904px ">latz für Icons &amp; Kürzesttext</tspan></text><text x="799.631px" y="167.729px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">B<tspan x="814.436px 821.828px 834.172px 839.104px 845.271px 857.616px 869.961px 882.306px 894.651px 906.995px 919.34px 931.685px 944.03px 956.375px 962.542px 968.709px 981.054px 988.446px 994.613px 1009.42px 1021.76px 1034.11px 1039.04px 1045.21px 1057.55px " y="167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px 167.729px ">reitenangaben für Spalten</tspan></text><g transform="matrix(1,0,0,1,-42.9489,-1024.75)"><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1238.41px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Spalten-Überschriften</text></g><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1259.07px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">(seltene <tspan x="918.294px 931.634px " y="1259.07px 1259.07px ">Au</tspan>snahme)</text></g></g><text x="799.631px" y="637.877px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">S<tspan x="814.436px 826.781px 845.271px 863.761px 876.106px 888.451px 894.618px 902.01px 914.355px 919.286px 931.631px 939.023px 944.086px 958.892px 971.237px 982.335px 994.68px 1007.02px 1019.37px 1037.86px 1050.2px " y="637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px 637.877px ">ummen (hier Ausnahme)</tspan></text><text x="799.631px" y="113.873px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Ü<tspan x="815.661px 828.005px 840.35px 847.742px 858.841px 869.939px 882.284px 889.676px 894.607px 900.774px 906.941px 913.108px 925.453px 937.798px 945.19px 950.996px 962.338px 974.683px 987.027px 999.372px 1004.3px 1009.24px 1021.58px 1027.75px 1035.14px 1047.48px 1059.83px " y="113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px 113.873px ">berschrift der Tabelle (h3)</tspan></text><g transform="matrix(1,0,0,1,-43.8507,-718.632)"><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1238.41px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Kombinierte Breitenangabe für</text></g><g transform="matrix(1.10985,0,0,1,-92.5568,0)"><text x="842.579px" y="1259.07px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">rechtsbündige <tspan x="972.786px 986.126px " y="1259.07px 1259.07px ">Au</tspan>srichtung</text></g></g><path d="M782.625,389.924l-48.47,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M792.203,512.612l-256.03,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M792.203,479.248l-346.362,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><rect x="142.982" y="44.179" width="631.009" height="617.19" style="fill:none;stroke:#000;stroke-width:1px;"/><text x="348.055px" y="703.454px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Datenspalte(n)</text><g transform="matrix(1,0,0,1,-204.447,-858.983)"><text x="372.075px" y="1562.44px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Feldbeschriftungen</text><text x="372.075px" y="1583.09px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">(Label)</text></g><g transform="matrix(1,0,0,1,-72.2167,-1057.07)"><text x="870.902px" y="1522.05px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">Feldbeschriftung (Block) oberhalb für</text><text x="870.902px" y="1542.7px" style="font-family:'ArialMT', 'Arial', sans-serif;font-size:20px;">kombinierte <tspan x="978.734px 992.074px " y="1542.7px 1542.7px ">An</tspan>lage in einem Feld</text></g><text x="-2.197px" y="21.475px" style="font-family:'Arial-BoldMT', 'Arial', sans-serif;font-weight:700;font-size:30px;">Horizontale T<tspan x="185.581px 202.266px " y="21.475px 21.475px ">ab</tspan>elle mit <tspan x="331.187px 352.852px " y="21.475px 21.475px ">Ab</tspan>messungen und Formular-Elementen</text><path d="M252.599,681.288l0,-32.491" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M410.002,681.288l0,-32.491" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/><path d="M792.203,512.612l-256.03,0" style="fill:none;stroke:#000;stroke-width:3px;stroke-dasharray:3,3;"/></svg>
\ No newline at end of file
diff --git a/css/design40/manual/index.html b/css/design40/manual/index.html
new file mode 100644
index 000000000..b6610f897
--- /dev/null
+++ b/css/design40/manual/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Test und Entwicklung des Kivitendo-CSS</title>
+</head>
+<body class="developing">
+<div class="wrapper">
+<header>
+  <h1>Entwicklung &amp; Dokumentation des Kivitendo-CSS</h1>
+  <nav></nav>
+</header>
+
+<p>Diese Mini-Site dient zur Entwicklung und Dokumentation des neuen Designs von Kivitendo. Das bedeutet auch, dass die neuen, aktuellen Kivitendo-Stylesheets hier ebenfalls angewendet werden.</p>
+<ul>
+  <li><a href="form-elements.html" title="Formular-Elemente">Formular-Elemente</a></li>
+  <li><a href="form-elements-special.html" title="Formular-Elemente">Spezielle Formular-Elemente</a></li>
+  <li><a href="tables.html" title="Tabellen in Kivitendo">Tabellen</a></li>
+  <li><a href="table-dimensions.html" title="Tabellen-Abmessungen in Kivitendo">Tabellen-Abmessungen</a></li>
+  <li><a href="farben.html" title="Details zum Einsatz von Farben in Kivitendo">Einsatz von Farben</a></li>
+  <li><a href="farben-demo.html" title="Anzeige aller Farben in Kivitendo">Alle Farben in Kivitendo</a></li>
+  <li><a href="anleitung.html" title="Anzeige aller Farben in Kivitendo">Anleitung & Grundregeln</a></li>
+</ul>
+
+<p><strong>Hinweis:</strong> Zur Erstellung/Aktualisierung der CSS/LESS Dateien, sowie zur Erstellung von
+benutzerdefinierten Styles, siehe die README Datei unter: <code>css/design40/less/READ_ME.md</code> (englisch).</p>
+
+</div>
+</body>
+</html>
diff --git a/css/design40/manual/table-dimensions.html b/css/design40/manual/table-dimensions.html
new file mode 100644
index 000000000..a062dbe10
--- /dev/null
+++ b/css/design40/manual/table-dimensions.html
@@ -0,0 +1,699 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Tabellen in Kivitendo</title>
+  
+  <script type="text/javascript" src="/js/jquery.js"></script>
+  <script type="text/javascript" src="/js/common.js"></script>
+  <script type="text/javascript" src="/js/namespace.js"></script>
+  <script type="text/javascript" src="/js/kivi.js"></script>
+  <script type="text/javascript" src="/js/locale/de.js"></script>
+  <script type="text/javascript" src="/js/jquery-ui.js"></script>
+  <script type="text/javascript" src="/js/kivi.QuickSearch.js"></script>
+  <script type="text/javascript" src="/js/kivi.ActionBar.js"></script>
+  <script type="text/javascript" src="/js/kivi.Draft.js"></script>
+  <script type="text/javascript" src="/js/kivi.File.js"></script>
+  <script type="text/javascript" src="/js/kivi.SalesPurchase.js"></script>
+  <script type="text/javascript" src="/js/kivi.Part.js"></script>
+  <script type="text/javascript" src="/js/ckeditor/ckeditor.js"></script>
+  <script type="text/javascript" src="/js/ckeditor/adapters/jquery.js"></script>
+  <script type="text/javascript" src="/js/kivi.io.js"></script>
+  <script type="text/javascript" src="/js/autocomplete_customer.js"></script>
+  <script type="text/javascript" src="/js/client_js.js"></script>
+  <script type="text/javascript" src="/js/jquery.cookie.js"></script>
+  <script type="text/javascript" src="/js/jquery.checkall.js"></script>
+  <script type="text/javascript" src="/js/jquery.download.js"></script>
+  <script type="text/javascript" src="/js/jquery/jquery.form.js"></script>
+  <script type="text/javascript" src="/js/jquery/fixes.js"></script>
+  <script type="text/javascript" src="/js/jquery/jquery.tooltipster.min.js"></script>
+  <script type="text/javascript" src="/js/jquery/ui/i18n/jquery.ui.datepicker-de.js"></script>
+  
+</head>
+<body class="developing">
+<header>
+  <h1>Abmessungen der horizontalen Tabellen in Kivitendo</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+
+<form action="#">
+
+<div class="wrapper">
+
+<p></p>
+</div><!-- /.wrapper -->
+
+
+
+<div class="wrapper clear">
+<div class="col">
+
+
+<h2>Small</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Small</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-small test-plain">
+  <caption>Table Small-Small</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Small Formelemente</caption>
+  <colgroup><col class="wi-small"><col class="wi-small"></colgroup>
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td><input type="text" name="input-type-text-small-small-1-1" class="wi-small"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button></td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td><input type="text" name="input-type-text-small-small-1-2" class="wi-small">mm</td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+      <select id="slct-small-1" name="slct-small-1" class="wi-small">
+        <option value=""></option>
+        <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+        <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+        <option value="Timothy Leary">Timothy Leary</option>
+        <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+      </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-small">
+  <caption>Small-Small Textarea</caption>
+  <colgroup> <col class="wi-small-small"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>KEIN Texteditor</th>
+    </tr>
+    <tr>
+      <td><span class="label">Nur Textarea</span>
+        <textarea name="texteditor-small-small" id="texteditor-small-small" class="wi-small-small">Diese Abmessung sollte nicht für den CKEditor verwendet werden.</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-small">Div .small</div>
+
+
+
+</div><!-- /.col -->
+<div class="col">
+
+
+<h2>Mediumsmall</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Mediumsmall</caption>
+  <colgroup> <col class="wi-small"><col class="wi-mediumsmall"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-mediumsmall test-plain">
+  <caption>Table Small-Mediumsmall</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+
+</table>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Mediumsmall Formelemente</caption>
+  <colgroup><col class="wi-small"><col class="wi-mediumsmall"></colgroup>
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td><input type="text" name="input-type-text-small-mediumsmall-2-1" class="wi-mediumsmall"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button></td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td><input type="text" name="input-type-text-small-mediumsmall-2-2" class="wi-mediumsmall">mm</td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+      <select id="slct-small-mediumsmall" name="slct-small-mediumsmall" class="wi-mediumsmall">
+        <option value=""></option>
+        <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+        <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+        <option value="Timothy Leary">Timothy Leary</option>
+        <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+      </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-mediumsmall">
+  <caption>Small-Mediumsmall Textarea</caption>
+  <colgroup> <col class="wi-small-mediumsmall"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>KEIN Texteditor</th>
+    </tr>
+    <tr>
+      <td>
+        <span class="label">Nur Textarea</span>
+        <textarea name="texteditor-small-mediumsmall" id="texteditor-small-mediumsmall" class="wi-small-mediumsmall">Diese Abmessung sollte nicht für den CKEditor verwendet werden.</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-mediumsmall">Div .mediumsmall</div>
+
+
+</div><!-- /.col -->
+<div class="col">
+
+
+<h2>Normal</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Normal</caption>
+  <colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-normal test-plain">
+  <caption>Table Small-Normal</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+
+</table>
+
+
+<table class="tbl-horizontal test-plain">
+  <caption>Normal Formelemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-5" class="wi-normal"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-5" class="wi-normal">mm
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td>
+        <textarea name="txtarea1" class="wi-normal">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct-5" name="slct-5" class="wi-normal">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-normal">
+  <caption>Small-Normal Textarea</caption>
+  <colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Texteditor</th>
+    </tr>
+    <tr>
+      <td>
+        <textarea name="texteditor-1" id="texteditor-1" class="texteditor wi-small-normal">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-normal">Div .normal</div>
+
+
+
+</div><!-- /.col -->
+</div><!-- /.wrapper -->
+<div class="wrapper clear">
+<div class="col">
+
+
+
+<h2>Lightwide</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Lightwide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-lightwide test-plain">
+  <caption>Table Small-Lightwide</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+
+</table>
+
+
+<table class="tbl-horizontal test-plain">
+  <caption>Lightwide Formelemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-1" class="wi-lightwide"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-1" class="wi-lightwide">mm
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td>
+        <textarea name="txtarea1" class="wi-lightwide">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct-1" name="slct-1" class="wi-lightwide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-lightwide">
+  <caption>Small-Lightwide Textarea</caption>
+  <colgroup> <col class="wi-small-lightwide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Texteditor</th>
+    </tr>
+    <tr>
+      <td><textarea name="texteditor-1" id="texteditor-1" class="texteditor wi-small-lightwide">Dies ist ein ganz langer text</textarea></td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-lightwide">Div .lightwide</div>
+
+
+</div><!-- /.col -->
+<div class="col">
+
+
+
+<h2>Wide</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Wide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-wide test-plain">
+  <caption>Table Small-Wide</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+
+</table>
+
+
+<table class="tbl-horizontal test-plain">
+  <caption>Wide Formelemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-9" class="wi-wide"><button name="bttn9" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-9" class="wi-wide">mm
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td>
+        <textarea name="txtarea1" class="wi-wide">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct9" name="slct-9" class="wi-wide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-wide">
+  <caption>Small-Wide Textarea</caption>
+  <colgroup> <col class="wi-small-wide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Texteditor</th>
+    </tr>
+    <tr>
+      <td>
+        <textarea name="texteditor-1" id="texteditor-1" class="texteditor wi-small-wide">Dies ist ein ganz langer text</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-wide">Div .wide</div>
+
+
+
+</div><!-- /.col -->
+<div class="col">
+
+
+
+<h2>Wider</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Wider</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wider"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-wider test-plain">
+  <caption>Table Small-Wider</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+
+</table>
+
+
+<table class="tbl-horizontal test-plain">
+  <caption>Wider Formelemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wider"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-3" class="wi-wider"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-3" class="wi-wider">mm
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td>
+        <textarea name="txtarea1" class="wi-wider">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct-3" name="slct-3" class="wi-wider">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-wider">
+  <caption>Small-Wider Textarea</caption>
+  <colgroup> <col class="wi-small-wider"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Texteditor</th>
+    </tr>
+    <tr>
+      <td>
+        <textarea name="texteditor-1" id="texteditor-1" class="texteditor wi-small-wider">Dies ist ein ganz langer text</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-wider">Div .wider</div>
+
+
+
+</div><!-- /.col -->
+<div class="col">
+
+
+
+<h2>Verywide</h2>
+
+<table class="tbl-horizontal test-plain">
+  <caption>Colums Small &amp; Verywide</caption>
+  <colgroup> <col class="wi-small"><col class="wi-verywide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Label</th>
+      <td><div class="data">div.data</div></td>
+    </tr>
+    <tr>
+      <th>Label</th>
+      <td class="data">td.data</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal wi-small-verywide test-plain">
+  <caption>Table Small-Verywide</caption>
+  <tbody>
+    <tr>
+      <td><div class="data">Value 2</div></td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal test-plain">
+  <caption>Verywide Formelemente</caption>
+  <colgroup> <col class="wi-small"><col class="wi-verywide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-4" class="wi-verywide"><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+    <tr>
+      <th>Textfeld</th>
+      <td>
+        <input type="text" name="input-type-text-4" class="wi-verywide">mm
+      </td>
+    </tr>
+    <tr>
+      <th>Textarea</th>
+      <td>
+        <textarea name="txtarea1" class="wi-verywide">Dies ist ein ganz langer Text</textarea>
+      </td>
+    </tr>
+    <tr>
+      <th>Select</th>
+      <td>
+        <select id="slct-4" name="slct-4" class="wi-verywide">
+          <option value=""></option>
+          <option value="Hans Magnus Enzensberger">Hans Magnus Enzensberger</option>
+          <option value="Douglas Rushkow" selected>Douglas Rushkow</option>
+          <option value="Timothy Leary">Timothy Leary</option>
+          <option value="Joseph Weizenbaum">Joseph Weizenbaum</option>
+        </select><button name="bttn1" type="button" value="D" title="Details ansehen" class="wi-tiny">W</button>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal test-plain wi-small-verywide">
+  <caption>Small-Verywide Textarea</caption>
+  <colgroup> <col class="wi-small-verywide"> </colgroup> 
+  <tbody>
+    <tr>
+      <th>Texteditor</th>
+    </tr>
+    <tr>
+      <td>
+        <textarea name="texteditor-1" id="texteditor-1" class="texteditor wi-small-verywide">Dies ist ein ganz langer text</textarea>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-verywide">Div .verywide</div>
+
+
+
+</div><!-- /.col -->
+<div class="col">
+
+<h2>Verysmall &amp; Smallest (nur DIVs)</h2>
+
+<div style="clear:left;margin:0 0 1.0em 0;overflow:hidden;">
+<h3 class="caption">Div Verysmall</h3>
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-verysmall">Div .verysmall</div>
+</div>
+<div style="clear:left;margin-bottom:1.0em">
+<h3 class="caption">Div Verysmall</h3>
+<div class="test-box wi-small">Div .small</div>
+<div class="test-box wi-smallest">Div .smallest</div>
+</div>
+</div>
+
+
+
+
+
+
+</div><!-- /.wrapper -->
+
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/css/design40/manual/tables.html b/css/design40/manual/tables.html
new file mode 100644
index 000000000..aae85befb
--- /dev/null
+++ b/css/design40/manual/tables.html
@@ -0,0 +1,760 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Tabellen in Kivitendo</title>
+  <style type="text/css">
+    p.p1 {padding:0;margin: 0.0px 0.0px 0.0px 0.0px; font: 19.0px monospace; color: #d02226; -webkit-text-stroke: #d02226;font-family: monospace;}
+    p.p2 {padding:0;margin: 0.0px 0.0px 0.0px 0.0px; font: 19.0px Times; color: #374ef5; -webkit-text-stroke: #374ef5;font-family: monospace;}
+    p.p3 {padding:0;margin: 0.0px 0.0px 0.0px 0.0px; font: 19.0px Times; color: #141414; -webkit-text-stroke: #141414;font-family: monospace;}
+    p.p4 {padding:0;margin: 0.0px 0.0px 0.0px 0.0px; font: 19.0px Times; color: #c83a82; -webkit-text-stroke: #c83a82;font-family: monospace;}
+    p.p5 {padding:0;margin: 0.0px 0.0px 12.0px 0.0px; font: 19.0px Times; color: #374ef5; -webkit-text-stroke: #374ef5;font-family: monospace;}
+    span.s1 {font-kerning: none}
+    span.s2 {font-kerning: none; color: #000000; -webkit-text-stroke: 0px #000000}
+    span.s3 {font-kerning: none; color: #bb5f0a; -webkit-text-stroke: 0px #bb5f0a}
+    span.s4 {font-kerning: none; color: #c83a82; -webkit-text-stroke: 0px #c83a82}
+    span.s5 {font-kerning: none; color: #374ef5; -webkit-text-stroke: 0px #374ef5}
+    span.s6 {font-kerning: none; color: #141414; -webkit-text-stroke: 0px #141414}
+    p.p1 , p.p2 , p.p3 , p.p4 , p.p5 , span.s1 , span.s2 , span.s3 , span.s4 , span.s5 , span.s6 {font-size: 90% ;}
+    .picture{ background-color: #fff; padding: 0.8em ; border: 1px #aaa solid ; }
+  </style>
+
+
+</head>
+<body class="developing">
+<header>
+  <h1>Tabellen in Kivitendo</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<div class="wrapper">
+<h2>Horizontale Tabelle (Klasse «tbl-horizontal»)</h2>
+<h3>Einleitung & grundlegender Code</h3>
+<p>
+Die horizontalen Tabellen dienen als Standard-Container für die Plazierung und Anzeige von Daten und Eingabe-Elementen. Die Struktur dieser Tabellen-Klasse ist ziemlich starr, was darin begründet wird, dass diese dynamisch rechts umfliesst, Gruppierung ermöglicht und sich einfach erweitern lässt, indem man eine einfache Zeile einfügt. Die erste Spalte enthält ausschliesslich Titel-Tabellen-Zellen (TH), die weiteren bestehen aus Daten-Tabellen-Zellen (TD). Weitere Klassen und Style in den enthaltenen Elementen sind nur in Ausnahmefällen nötig. Die grundlegende Aufbau dieser Tabellenklasse sieht wie folgt aus.
+</p>
+<pre><code>&lt;table class="tbl-horizontal"&gt;
+  &lt;caption&gt;Tabllentitel (Caption)&lt;/caption&gt;
+  &lt;colgroup&gt;
+    &lt;col class="wi-small"&gt;
+    &lt;col class="wi-lightwide"&gt;
+  &lt;/colgroup&gt;
+  &lt;tbody&gt;
+    &lt;tr&gt;
+      &lt;th&gt;Feldbezeichnung&lt;/th&gt;
+      &lt;td&gt;Wert oder Formular-Element&lt;/td&gt;
+    &lt;/tr&gt;
+  &lt;/tbody&gt;
+&lt;/table&gt;
+</code></pre>
+
+<table class="tbl-horizontal" style="float: none;">
+  <caption>Elemente Horizontale Tabelle</caption>
+  <colgroup>
+    <col class="wi-normal">
+    <col class="wi-verywide">
+  </colgroup>
+  <tbody>
+    <tr>
+      <th>CAPTION</th>
+      <td>Überschrift der Tabelle, die in die Tabelle selber eingekapselt wird. Das erleichtert nicht nur das Verschieben der Tabelle.</td>
+    </tr>
+    <tr>
+      <th>COLGROUP &gt; COL</th>
+      <td>Spaltendefinitionen mit begrenzter Funktionalität, wobei hier im wesentlichen Spaltenbreiten-Angaben zur Geltung kommen, leider keine Ausrichtung also kein rechtsbündiges Ausrichten. Beachten Sie, dass COL ein leeres Element ist, das kein abschliessendes Tag benötigt. Zudem muss es in der COLGROUP untergebracht sein.</td>
+    </tr>
+    <tr>
+      <th>TBODY</th>
+      <td>Datenkörper der Tabelle, zwingend anzuwenden, auch wenn optional einsetzbar. Ermöglicht auch ein effizientes Code-Falten der Tabelle, sodass der Titel (Caption) im Text-Editor sichtbar bleibt.</td>
+    </tr>
+    <tr>
+      <th>TH</th>
+      <td>Label bzw. Feldbezeichnung</td>
+    </tr>
+    <tr>
+      <th>TD</th>
+      <td>Feldwerte oder Eingabe-Felder aller Art inkl. nebenstehendem Icon oder Kurztext.</td>
+    </tr>
+    <tr>
+      <th>Feldbezeichnung</th>
+      <td>Wert</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<h3>Plazierung horizontaler Tabellen in einem .WRAPPER-Block</h3>
+<p>Befinden sich Horizontale Tabellen in einem <b>.WRAPPER-Block</b>, werden diese links ausgerichtet (float:left;) bzw. rechts angefügt. Soll zwingend ein Zeilen-Umbruch (clear) stattfinden, nächste Tabelle einfach in eine weitere, anschliessende .WRAPPER-Box setzen. Der Wrapper erzeugt einen Abstand zum Fensterrand und einen abschliessenden Zeilenumbruch. Standardmässig sind maximal drei Tabellen in einer .WRAPPER-Zeile vorgesehen (Standard-Bildschirmauflösung)</p>
+</div><!-- /.wrapper -->
+<p class="picture"><img src="images/Tabellen_in_Wrapper-Bloecken.png" width="800" height="556" alt="Tabellen_in_Wrapper-Bloecken"></p>
+<h4>Beispiel:</h4>
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>Caption horizontale Tabelle</caption>
+  <colgroup> <col class="wi-verysmall"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>Label 1</th>
+      <td>Wert 1</td>
+    </tr>
+    <tr>
+      <th>Label 2</th>
+      <td>Wert 2</td>
+    </tr>
+    <tr>
+      <th>Label 3</th>
+      <td>Wert 3</td>
+    </tr>
+    <tr>
+      <th>Label 4</th>
+      <td>Wert 4</td>
+    </tr>
+    <tr>
+      <th>Label 5</th>
+      <td>Wert 6</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>Tabelle mit COL .wi-verysmall & .wi-wide</caption>
+  <colgroup> <col class="wi-verysmall"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>Label 1</th>
+      <td>Wert 1</td>
+    </tr>
+    <tr>
+      <th>Label 2</th>
+      <td>Wert 2</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">Caption Zeile</th>
+    </tr>
+    <tr>
+      <th>Label 3</th>
+      <td>Wert 3</td>
+    </tr>
+    <tr>
+      <th>Label 4</th>
+      <td>Wert 4</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="col" style="background-color:#FFC0D6;padding: 0 0.2em 1.2em 0.2em">
+  <table class="tbl-horizontal">
+    <caption>Tabelle 1 IN SPALTE</caption>
+    <colgroup> <col class="wi-verysmall"><col class="wi-normal"> </colgroup>
+    <tbody>
+      <tr>
+        <th>Label 1</th>
+        <td>Wert 1</td>
+      </tr>
+      <tr>
+        <th>Label 2</th>
+        <td>Wert 2</td>
+      </tr>
+    </tbody>
+  </table>
+  <table class="tbl-horizontal">
+    <caption>Tabelle 2 IN SPALTE</caption>
+    <colgroup> <col class="wi-verysmall"><col class="wi-normal"> </colgroup>
+    <tbody>
+      <tr>
+        <th>Label 1</th>
+        <td>Wert 1</td>
+      </tr>
+      <tr>
+        <th>Label 2</th>
+        <td>Wert 2</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+</div><!-- /.wrapper -->
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>Caption horizontale Tabelle</caption>
+  <colgroup>
+    <col class="wi-verysmall"><col class="wi-normal">
+  </colgroup>
+  <tbody>
+    <tr>
+      <th>Label 1</th>
+      <td>Wert 1</td>
+    </tr>
+    <tr>
+      <th>Label 2</th>
+      <td>Wert 2</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">Caption Zeile</th>
+    </tr>
+    <tr>
+      <th>Label 3</th>
+      <td>Wert 3</td>
+    </tr>
+    <tr>
+      <th>Label 4</th>
+      <td>Wert 4</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>Tabelle mit COL .wi-verysmall & .wi-wide</caption>
+  <colgroup>
+    <col class="wi-verysmall"><col class="wi-wide">
+  </colgroup>
+  <tbody>
+    <tr>
+      <th>Label 1</th>
+      <td>Wert 1</td>
+    </tr>
+    <tr>
+      <th>Label 2</th>
+      <td>Wert 2</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">Caption Zeile</th>
+    </tr>
+    <tr>
+      <th>Label 3</th>
+      <td>Wert 3</td>
+    </tr>
+    <tr>
+      <th>Label 4</th>
+      <td>Wert 4</td>
+    </tr>
+  </tbody>
+</table>
+
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+<p><b>Mehrere horizontale Tabellen</b> können in einem Spalten-Block (<code>DIV.COL</code>) untergebracht werden (siehe Beispiel oben <span style="background-color:#FFC0D6;">Block mit roter Hintergrundfarbe</span>). Das könnte vor allem bei kleinen Tabellen Sinn machen.<br>Ein <b>Caption</b> kann auch <b>innerhalb eines TBODY</b> angebracht werden<br>&LT;TR&GT;&LT;TH.CAPTION COLSPAN="2"&GT;caption&lt;CAPTION&GT;&LT;TR&GT;<br>Siehe letzte Tabelle im vorherigen Beispiel.</p>
+
+<h3>Ausrichtung und Breite der Spalten</h3>
+<p>Um ein ausgewogenes, ruhiges Erscheinungsbild der Benutzeroberfläche zu erhalten, ist es nicht unwichtig, dass die Tabellen-Spalten und Formular-Elemente vertikal bündig ausgerichtet sind. Auch wenn es manche Programmierer nicht als nötig erachten, muss doch der tägliche Einsatz durch den einfachen Benutzer dabei im Vordergrund stehen. Aber diese Angelegenheit ist einfacher zu bewältigen, als es zuerst klingt, denn es gibt da den bereits erwähnte Zauber-Code COLGROUP > COL und die zur Verfügung gestellten assoziativen Abmessungsklassen.</p>
+<p class="picture"><img src="images/Tabelle_Horizontal_mit_Elementen.svg" width="800" height="532" alt="Tabelle_Horizontal_mit_Elementen"></p>
+<h4>Beispiel:</h4>
+<form action="#">
+  <table class="tbl-horizontal">
+    <caption>Tabelle mit Elementen</caption>
+    <colgroup>
+      <col class="wi-small">
+      <col class="wi-lightwide">
+    </colgroup>
+    <tbody>
+      <tr>
+        <th>Feldbezeichnung</th>
+        <td><input type="text" value="" size="10" class="wi-lightwide" name="npt1"></td>
+      </tr>
+      <tr>
+        <th>Feldbezeichnung</th>
+        <td><input type="text" value="" size="10" class="wi-lightwide" name="npt2">kg</td>
+      </tr>
+      <tr>
+        <th>Feldbezeichnung</th>
+        <td><select id="slct1" name="slct1" class="wi-lightwide"><option value="Halli">Halli</option><option value="Hallo">Hallo</option></select></td>
+      </tr>
+      <tr>
+        <th colspan="2"><span class="label above">Feldbezeichnung</span><textarea name="txtarea1" class="wi-small-lightwide" cols="10" rows="4"></textarea></th>
+      </tr>
+    </tbody>
+  </table>
+</form>
+
+
+
+
+
+
+
+
+
+<h2>Listen-Tabelle mit Kopfzeile (tbl-list)</h2>
+<p>Diese komplexen Tabellen benötigen ein zwingend korrektes Konstrukt, um eine optimale Darstellungsqualität zu erreichen, die genug Freiraum für nachträgliche Gestaltung via CSS erlaubt. THEAD- und TBODY-Container müssen zwingend gesetzt sein, optional auch der TFOOT-Container für Summenangaben. Listen-Tabellen, die sich über die ganze Seite erstrecken, müssen nicht zwingend in einem .WRAPPER-Block liegen. Schmale Listen-Tabellen in einem .WRAPPER-Block erhalten automatisch links und rechts einen abschliessenden Rand. Grundlegendes Code-Beispiel:</p>
+
+<!--
+<pre><code>&lt;table class="tbl-list"&gt;
+  &lt;caption&gt;Caption der Listen-Tabelle&lt;/caption&gt;
+  &lt;colgroup&gt;
+    &lt;col class="wi-mediumsmall"&gt;&lt;col class="wi-small"&gt;&lt;col class="wi-small"&gt;
+  &lt;/colgroup&gt;
+  &lt;thead&gt;
+  &lt;tr&gt;
+    &lt;th&gt;Column Header 1&lt;/th&gt;
+    &lt;th&gt;Column Header 2&lt;/th&gt;
+    &lt;th class="right"&gt;Total Header 3&lt;/th&gt;
+  &lt;/tr&gt;
+  &lt;/thead&gt;
+  &lt;tbody&gt;
+  &lt;tr&gt;
+    &lt;th&gt;R1C1&lt;/th&gt;
+    &lt;td&gt;R1C2&lt;/td&gt;
+    &lt;td class="numeric"&gt;100&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;tr&gt;
+    &lt;td&gt;R2C1&lt;/td&gt;
+    &lt;td&gt;R2C2&lt;/td&gt;
+    &lt;td class="numeric"&gt;200&lt;/td&gt;
+  &lt;/tr&gt;
+  &lt;/tbody&gt;
+  &lt;tfoot&gt;
+    &lt;th colspan="2"&gt;Summe&lt;/th&gt;
+    &lt;th class="numeric"&gt;300&lt;/th&gt;
+  &lt;/tfoot&gt;
+&lt;/table&gt;
+</code></pre>
+ -->
+
+<div class="code-highlighted">
+<p class="p4"><span class="s5"><span class="indent"> &nbsp;&nbsp; </span>&lt;table </span><span class="s3"> class=</span><span class="s1">"tbl-list"</span><span class="s5">&gt;</span></p><p class="p3"><span class="s5"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;caption&gt;</span><span class="s1">Caption der Listen-Tabelle</span><span class="s5">&lt;/caption&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;colgroup&gt;</span></p><p class="p4"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;col </span><span class="s3"> class=</span><span class="s1">"wi-mediumsmall"</span><span class="s5">&gt;</span></p><p class="p4"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;col </span><span class="s3"> class=</span><span class="s1">"wi-mediumsmall"</span><span class="s5">&gt;</span></p><p class="p4"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;col </span><span class="s3"> class=</span><span class="s1">"wi-small"</span><span class="s5">&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/colgroup&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;thead&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;tr&gt;</span></p><p class="p3"><span class="s5"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th&gt;</span><span class="s1">Column Header 1</span><span class="s5">&lt;/th&gt;</span></p><p class="p3"><span class="s5"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th&gt;</span><span class="s1">Column Header 2</span><span class="s5">&lt;/th&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th </span><span class="s3"> class=</span><span class="s4">"right"</span><span class="s1">&gt;</span><span class="s6">Total Header 3</span><span class="s1">&lt;/th&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/tr&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/thead&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;tbody&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;tr&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th&gt;</span><span class="s6">R1C1</span><span class="s1">&lt;/th&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;td&gt;</span><span class="s6">R1C2</span><span class="s1">&lt;/td&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;td </span><span class="s3"> class=</span><span class="s4">"numeric"</span><span class="s1">&gt;</span><span class="s6">100</span><span class="s1">&lt;/td&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/tr&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;tr&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;td&gt;</span><span class="s6">R2C1</span><span class="s1">&lt;/td&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;td&gt;</span><span class="s6">R2C2</span><span class="s1">&lt;/td&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;td </span><span class="s3"> class=</span><span class="s4">"numeric"</span><span class="s1">&gt;</span><span class="s6">200</span><span class="s1">&lt;/td&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/tr&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/tbody&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;tfoot&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th </span><span class="s3"> colspan=</span><span class="s4">"2"</span><span class="s1">&gt;</span><span class="s6">Summe</span><span class="s1">&lt;/th&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;th </span><span class="s3"> class=</span><span class="s4">"numeric"</span><span class="s1">&gt;</span><span class="s6">300</span><span class="s1">&lt;/th&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp;&nbsp;&nbsp; </span>&lt;/tfoot&gt;</span></p><p class="p2"><span class="s1"><span class="indent"> &nbsp;&nbsp; </span>&lt;/table&gt;</span></p></div>
+
+
+<table class="tbl-list">
+  <caption>Caption der Listen-Tabelle</caption>
+  <colgroup>
+    <col class="wi-mediumsmall"><col class="wi-small"><col class="wi-small">
+  </colgroup>
+  <thead>
+  <tr>
+    <th>Column Header 1</th>
+    <th>Column Header 2</th>
+    <th class="right">Total Header 3</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <th>R1C1</th>
+    <td>R1C2</td>
+    <td class="numeric">100</td>
+  </tr>
+  <tr>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td class="numeric">200</td>
+  </tr>
+  </tbody>
+  <tfoot>
+    <th colspan="2">Summe</th>
+    <th class="numeric">300</th>
+  </tfoot>
+</table>
+
+<p>
+Die durchaus optionalen «<code>COLGROUP > COL</code>»-Angaben können nur in Bezug auf Spaltenbreiten angewendet werden, nicht aber auf Ausrichtung oder Schriftgrösse innerhalb der Zellen der Spalte. Vielleicht ändert sich das mit zukünftigen Browser-Versionen.
+</p>
+<p>
+<b>Empfehlung:</b> Vermeiden Sie bitte bei Tabellen mit begrenzter Kardinalität die Stil-Anweisung <b><code>WIDTH="100%"</code></b>. Bei breiten Bildschirmen erschwert diese Ausbreitung die Übersicht über die Daten in den Zeilen. Mit der Klasse <code>.WI-MODERATE</code> werden niedrig-kardinale Tabellen ein wenig verbreitert.
+</p>
+
+</div>
+
+<table class="tbl-list">
+  <caption>Listen-Tabelle nicht im .WRAPPER-Block und mit 100% Breite</caption>
+  <colgroup>
+    <col class="wi-normal"><col class="wi-normal"><col class="wi-normal"><col class="wi-normal"><col class="wi-normal">
+    <col class="wi-wide"><col class="wi-normal"><col class="wi-normal"><col class="wi-normal"><col class="wi-normal right">
+  </colgroup>
+  <thead>
+  <tr>
+    <th></th>
+    <th>Column 1</th>
+    <th>Column 2</th>
+    <th>Column 3</th>
+    <th>Column 4</th>
+    <th>Column 5</th>
+    <th>Column 6</th>
+    <th class="right">Column 7</th>
+    <th class="right">Column 8</th>
+    <th class="right">Column 9</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <th>Row 1</th>
+    <td>R1C1</td>
+    <td>R1C2R1C2R1C2R1C2</td>
+    <td>R1C3</td>
+    <td>R1C4</td>
+    <td>R1C5</td>
+    <td>R1C6</td>
+    <td class="right">R1C7</td>
+    <td class="right">R1C8</td>
+    <td class="right">R1C9</td>
+  </tr>
+  <tr>
+    <th>Row 2</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+    <td>R2C5</td>
+    <td>R2C6</td>
+    <td class="right">R2C7</td>
+    <td class="right">R2C8</td>
+    <td class="right">R2C9</td>
+  </tr>
+  <tr>
+    <th>Row 3</th>
+    <td>R3C1</td>
+    <td>R3C2</td>
+    <td>R3C3</td>
+    <td>R3C4</td>
+    <td>R3C5R3C5R3</td>
+    <td>R3C6</td>
+    <td class="right">R3C7</td>
+    <td class="right">R3C8</td>
+    <td class="right">R3C9</td>
+  </tr>
+  <tr>
+    <th>Row 4</th>
+    <td>R4C1</td>
+    <td>R4C2</td>
+    <td>R4C3</td>
+    <td>R4C4</td>
+    <td>R4C5</td>
+    <td>R4C6</td>
+    <td class="right">R4C7</td>
+    <td class="right">R4C8</td>
+    <td class="right">R4C9</td>
+  </tr>
+  </tbody>
+  <tfoot>
+    <th colspan="7">Summen</th>
+    <th class="numeric">Summe C7</th>
+    <th class="numeric">Summe C8</th>
+    <th class="numeric">Summe C9</th>
+  </tfoot>
+</table>
+
+<div class="wrapper">
+
+<h3>Listen-Tabelle mit farblicher Hervorhebung</h3>
+
+<p>Zur farblichen Hervorhebung von Zeilen können folgende Klassen verwendet werden:</p>
+
+<pre><code>.listrow_ok
+.listrow_error
+.listrow_info
+.listrow_warning
+</code></pre>
+
+<p>Die Farben entsprechen dabei den standard Farben, welche auch z.B. bei den Flash Messages verwendet werden.
+Siehe dazu auch: <a href="farben.html" title="Details zum Einsatz von Farben in Kivitendo">Einsatz von Farben</a></p>
+
+<p>Die Reihen werden dabei automatisch alterniert (hell/dunkel).</p>
+
+<table class="tbl-list">
+  <caption>Listen-Tabelle mit Farben automatisch alterniert</caption>
+  <colgroup>
+    <col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small">
+  </colgroup>
+  <thead>
+  <tr>
+    <th></th>
+    <th>Column 1</th>
+    <th>Column 2</th>
+    <th>Column 3</th>
+    <th>Column 4</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="listrow_ok">
+    <th>.listrow_ok</th>
+    <td>R1C1</td>
+    <td>R1C2R1C2R1C2R1C2</td>
+    <td>R1C3</td>
+    <td>R1C4</td>
+  </tr>
+  <tr class="listrow_ok">
+    <th>.listrow_ok</th>
+    <td>R1C1</td>
+    <td>R1C2R1C2R1C2R1C2</td>
+    <td>R1C3</td>
+    <td>R1C4</td>
+  </tr>
+  <tr class="listrow_ok">
+    <th>.listrow_ok</th>
+    <td>R1C1</td>
+    <td>R1C2R1C2R1C2R1C2</td>
+    <td>R1C3</td>
+    <td>R1C4</td>
+  </tr>
+  <tr class="listrow_ok">
+    <th>.listrow_ok</th>
+    <td>R1C1</td>
+    <td>R1C2R1C2R1C2R1C2</td>
+    <td>R1C3</td>
+    <td>R1C4</td>
+  </tr>
+  <tr class="listrow_error">
+    <th>.listrow_error</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error">
+    <th>.listrow_error</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error">
+    <th>.listrow_error</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error">
+    <th>.listrow_error</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_info">
+    <th>.listrow_info</th>
+    <td>R3C1</td>
+    <td>R3C2</td>
+    <td>R3C3</td>
+    <td>R3C4</td>
+  </tr>
+  <tr class="listrow_info">
+    <th>.listrow_info</th>
+    <td>R3C1</td>
+    <td>R3C2</td>
+    <td>R3C3</td>
+    <td>R3C4</td>
+  </tr>
+  <tr class="listrow_info">
+    <th>.listrow_info</th>
+    <td>R3C1</td>
+    <td>R3C2</td>
+    <td>R3C3</td>
+    <td>R3C4</td>
+  </tr>
+  <tr class="listrow_info">
+    <th>.listrow_info</th>
+    <td>R3C1</td>
+    <td>R3C2</td>
+    <td>R3C3</td>
+    <td>R3C4</td>
+  </tr>
+  <tr class="listrow_warning">
+    <th>.listrow_warning</th>
+    <td>R4C1</td>
+    <td>R4C2</td>
+    <td>R4C3</td>
+    <td>R4C4</td>
+  </tr>
+  <tr class="listrow_warning">
+    <th>.listrow_warning</th>
+    <td>R4C1</td>
+    <td>R4C2</td>
+    <td>R4C3</td>
+    <td>R4C4</td>
+  </tr>
+  <tr class="listrow_warning">
+    <th>.listrow_warning</th>
+    <td>R4C1</td>
+    <td>R4C2</td>
+    <td>R4C3</td>
+    <td>R4C4</td>
+  </tr>
+  <tr class="listrow_warning">
+    <th>.listrow_warning</th>
+    <td>R4C1</td>
+    <td>R4C2</td>
+    <td>R4C3</td>
+    <td>R4C4</td>
+  </tr>
+  </tbody>
+</table>
+
+<p>Falls die Alternierung manuell gesetzt werden soll, kann dies mit den folgenden Klassen gemacht werden:</p>
+
+<pre><code>.listrow0
+.listrow1
+.listrow_ok0
+.listrow_ok1
+.listrow_error0
+.listrow_error1
+.listrow_info0
+.listrow_info1
+.listrow_warning0
+.listrow_warning1
+</code></pre>
+
+<table class="tbl-list">
+  <caption>Listen-Tabelle mit Farben manuell alterniert</caption>
+  <colgroup>
+    <col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small">
+  </colgroup>
+  <thead>
+  <tr>
+    <th></th>
+    <th>Column 1</th>
+    <th>Column 2</th>
+    <th>Column 3</th>
+    <th>Column 4</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="listrow0">
+    <th>.listrow0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow0">
+    <th>.listrow0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow1">
+    <th>.listrow1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow1">
+    <th>.listrow1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_ok0">
+    <th>.listrow_ok0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_ok0">
+    <th>.listrow_ok0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_ok1">
+    <th>.listrow_ok1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_ok1">
+    <th>.listrow_ok1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error0">
+    <th>.listrow_error0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error0">
+    <th>.listrow_error0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error1">
+    <th>.listrow_error1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_error1">
+    <th>.listrow_error1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_info0">
+    <th>.listrow_info0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_info0">
+    <th>.listrow_info0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_info1">
+    <th>.listrow_info1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_info1">
+    <th>.listrow_info1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_warning0">
+    <th>.listrow_warning0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_warning0">
+    <th>.listrow_warning0</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_warning1">
+    <th>.listrow_warning1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  <tr class="listrow_warning1">
+    <th>.listrow_warning1</th>
+    <td>R2C1</td>
+    <td>R2C2</td>
+    <td>R2C3</td>
+    <td>R2C4R2C4R2C4R2C4R2C4</td>
+  </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</body>
+</html>
diff --git a/css/design40/manual/todo.html b/css/design40/manual/todo.html
new file mode 100644
index 000000000..cd1d80262
--- /dev/null
+++ b/css/design40/manual/todo.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+  <meta charset="utf-8" />
+  <link href="../style.css" rel="stylesheet">
+  <title>Kivitendo-Design: To Do's 2018</title>
+</head>
+<body class="developing">
+<header>
+  <h1>Pendenzen betreffend Kivitendo-Design 4.0</h1>
+  <nav><a href="index.html" title="Zur Übersicht bzw. Inhaltsverzeichnis">Zum Index</a></nav>
+</header>
+<div class="wrapper">
+  <h2>Feldbeschriftungen kürzen</h2>
+  <p>Um eine ruhige, gleichmässige horizontale Tabelle mit Feldbezeichnungsspalte und Datenspalte zu erhalten, ist es notwenig, speziell für die Standard-Bildschirmauflösung bestimmte Feldbezeichnungen zu kürzen. Somit kann die Bezeichnungspalte relativ schmal gehalten werden. Manchmal reicht es, wenn nur drei Buchstaben eingespart werden können.</p>
+  <ul>
+    <li>Einzelbegriffe mit Abschluss «…nummer» kürzen, Beispiel: Bestellnummer ➔ <i>Bestellnr.</i></li>
+    <li>Datum <b>«Von» … «bis»</b> ➔ <i>Generell Begriff <b>«Von»</b> entfernen, sofern unnötig</i></li>
+    <li>Bestellnummer des Kunden ➔ <i>Bestellnr.d.Kunden</i></li>
+    <li>Bestellnummer beim Lieferanten ➔ <i>Bestellnr.b.Lieferantne</i></li>
+    <li>Vorgangsbezeichnung ➔ <i>Vorgangsbezeichn.</i></li>
+  </ul>
+<h2>Tag-Funktionen verbessern oder erweitern</h2>
+<p>Einige Funktionen könnten wirklich mal verbessert werden, indem z.B. die Übergabe einer Klasse möglich wird. Damit lassen sich Elemente deutlich besser mit CSS designen.</p>
+<ul>
+  <li><b>L.date_tag:</b> Übergabe einer Klasse, die dann wirksam als Attribut-/Werte-Paar angezeigt wird, z.B. class="wi-date".<br>Alternativ könnte </li>
+  <li><b>L.input_tag:</b> Standardgrösse anwenden, falls Attribut SIZE nicht übergeben wurde. Beim Übermitteln von Formulardaten gab es häufig Probleme, wenn das Attribut nicht gesetzt werden. Als Standard schlage ich <i>«size=10»</i> vor</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/css/design40/style.css b/css/design40/style.css
new file mode 100644
index 000000000..c5bbe229c
--- /dev/null
+++ b/css/design40/style.css
@@ -0,0 +1 @@
+.bg-body{background-color:#ccb}.bg-content{background-image:linear-gradient(to bottom, #f5f5f1, #ccb)}:root{--gray-standard:#888888;--gray-superdark:#000000;--gray-verydark:#222222;--gray-darker:#444444;--gray-dark:#666666;--gray-light:#aaaaaa;--gray-lighter:#cccccc;--gray-verylight:#eeeeee;--gray-superlight:#ffffff;--color-standard:#666633;--color-superlight:#ffffff;--color-verylight:#f5f5f1;--color-lighter:#e0e0d6;--color-light:#ccb;--color-dark:#292914;--color-darker:#1b1b0e;--color-verydark:#0e0e07;--color-superdark:#000;--msg-ok-strong:#053516;--msg-ok-light:#abf9c8;--msg-error-strong:#910513;--msg-error-light:#f9d8da;--msg-hint-strong:#1f84a3;--msg-hint-light:#edf7fa;--msg-warning-strong:#0f0b00;--msg-warning-light:#e0c776}.mx-h3-caption{font-size:11pt;font-weight:normal;color:#292914 !important;padding:.2em 0 .2em .2em;margin:.1em 0 .4em 0;text-align:left;letter-spacing:.12em}.mx-contentbox-properties{margin:1em 1em 1em 1.2em;padding:.6em 1em 1.2em 1.8em}.mx-thead-th{color:#ffffff;background-color:#292914;border-top:1px solid #666633;border-bottom:1px solid #666633;text-align:left ;vertical-align:middle }.mx-button{display:inline-block;cursor:pointer ;width:auto ;padding:.2em .6em;font-size:9pt;font-weight:normal;font-style:normal;text-align:center;border-style:solid;border-width:1px;border-radius:6px}.mx-button-standard{border:1px #406449 solid;background-color:#406449;color:#fff;text-decoration:none}.mx-button-standard-hover-focus:hover{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}.mx-button-standard-hover-focus:active,.mx-button-standard-hover-focus:focus{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}.mx-button-neutral{border:1px #292914 solid;background-color:#e0e0d6;color:#1b1b0e}.mx-button-neutral-hover-focus:hover{border:1px #292914 solid;background-color:#f5f5f1;color:#1b1b0e;text-decoration:none}.mx-button-neutral-hover-focus:active,.mx-button-neutral-hover-focus:focus{border:1px #0e0e07 solid;background-color:#666633;color:#000;text-decoration:none}html{overflow-y:scroll}body{padding:0;margin:0 ;font-size:9pt}div,p,span,table,th,td,input,textarea,select,button,a.button{box-sizing:border-box}.clearfix:after{clear:both;content:".";display:block;height:0;visibility:hidden}@media screen{.noscreen{display:none}}@media print{.noprint{display:none }}@media handheld{.nomobile{display:none}}a.cti_call_action{display:block;padding-left:18px;top:2px;vertical-align:middle;background-image:url(../../image/icons/16x16/phone.png);background-repeat:no-repeat}.interact{color:gray}.interact:hover{color:black}.cursor-default{cursor:default}.cursor-pointer{cursor:pointer}.cursor-help{cursor:help}.cke_contents iframe html body.cke_editable{padding:0;margin:0}.top_border{border-top:solid black;border-width:4px}.bottom_border{border-bottom:solid black;border-width:1px}body{margin:0 ;color:#666666;font-family:Verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:9pt;background-color:#ccb}body #frame-header{position:fixed;top:0;z-index:1040}body #menuv3:first-child{top:0 !important}body #menuv3{position:fixed;z-index:1999;top:28px ;width:100%;height:32px}body .layout-actionbar{display:block;z-index:1030;position:fixed;float:right !important;width:auto;top:68px ;right:.2em;margin:0 .4em 0 0;padding:0;background:none}body .layout-actionbar~div:first{padding-top:25px}body .layout-actionbar>div+div{margin-left:2px}body #content{overflow:hidden;display:block;padding:101px 0 0 0;margin:0 0 1em 0;background-image:linear-gradient(to bottom, #f5f5f1, #ccb)}body #content .wrapper{clear:both;display:block;overflow:hidden;width:97.2%;height:auto}body #content .wrapper>.col{display:block;overflow:hidden;float:left;margin-right:1.6em}body #content .wrapper>.col div>label{font-size:10pt;line-height:12.6pt}body #content .wrapper>.col p{font-size:10pt}body #content .wrapper>.col,body #content .wrapper>.tbl-horizontal{float:left;margin-right:1.6em;padding-bottom:20px }body #content .wrapper.center{margin:0 auto;display:table;width:auto}body #content .wrapper.width-moderate{width:auto}body #content .wrapper>table.tbl-horizontal:last-child{margin-right:0 !important }body .full-width{width:100% ;padding:0 0 1em 0;margin:0 0 0 0}body div.center{margin:0 auto;display:table;width:auto}#frame-header{text-align:left;margin:0;padding:.2em .6em;border:0;overflow:hidden;height:28px;width:100%;display:table-cell;vertical-align:middle;border-spacing:0;background-color:#1b1b0e;line-height:100%;font-size:9pt}#frame-header span.frame-header-element{color:#f5f5f1;padding-top:.2em}#frame-header span.frame-header-element a:link,#frame-header span.frame-header-element a:visited,#frame-header span.frame-header-element a:hover,#frame-header span.frame-header-element a:active{text-decoration:none;border-bottom:none;color:#ccb}#frame-header span.frame-header-element a:hover{color:#ffffff;text-decoration:underline}#frame-header span.frame-header-element span.client{text-transform:uppercase ;font-size:130% }#frame-header span.frame-header-left,#frame-header span.frame-header-center,#frame-header span.frame-header-right{border-spacing:0;padding:0;vertical-align:middle;height:100%;display:table-row}#frame-header span.frame-header-left>span,#frame-header span.frame-header-center>span,#frame-header span.frame-header-right>span{height:24px;margin:0 10px;display:table-cell;vertical-align:middle}#frame-header span.frame-header-left{float:left;padding:0 1em 0 .2em;margin-right:1em}#frame-header span.frame-header-left>span{padding-right:1em}#frame-header span.frame-header-right{float:right;vertical-align:middle;padding:0 1.2em 0 1em;margin-left:1em}#frame-header span.frame-header-right>span{padding-left:1em}#frame-header #ajax-spinner{display:none}#frame-header div.frame-header-quicksearch{display:block;overflow:hidden;margin:.1em auto 0 auto;text-align:center;width:auto}#frame-header div.frame-header-quicksearch span.frame-header-quicksearch input{font-size:9pt;margin-top:.1em;background-color:#ccb;width:auto !important;min-width:5em;max-width:7em;padding:0 .2em;border-width:1px ;border-style:solid;border-top-color:#949494;border-right-color:#BCBCBC;border-bottom-color:#BCBCBC;border-left-color:#949494}#menuv3{background-color:#e0e0d6}#menuv3 li{display:block;position:relative;float:none;font-weight:normal !important ;font-size:9pt;line-height:96%;white-space:nowrap;border:0;padding:0;margin:0}#menuv3 li:hover{cursor:pointer}#menuv3 li a,#menuv3 li a:visited,#menuv3 li div.x,#menuv3 li div.x:visited{display:block;color:#1b1b0e;text-decoration:none;padding:.45em .6em .58em 1.3em;font-weight:normal}#menuv3>ul{list-style:none;margin:0;padding:0;float:left}#menuv3>ul>li{display:block;height:17px;padding:9px .9em 6px .9em;background-color:#e0e0d6;color:#1b1b0e;vertical-align:middle}#menuv3>ul>li:hover{background-color:#ccb}#menuv3>ul>li:hover>ul{display:block;position:absolute}#menuv3>ul>li ul{position:relative;display:none;padding:0 2em 2em 2em;margin:0 -2em -2em -2.8em}#menuv3>ul>li ul li{border-bottom:1px #666633 solid}#menuv3>ul>li>ul{top:32px;z-index:1000}#menuv3>ul>li>ul>li{background-color:#ccb;margin-left:1px}#menuv3>ul>li>ul>li div.x{background:no-repeat right url("../../image/menu-arrow-to-right-5.png");padding-right:2em}#menuv3>ul>li>ul>li:hover{color:#0e0e07;background-color:#e0e0d6}#menuv3>ul>li>ul>li:hover>ul{display:block;position:absolute}#menuv3>ul>li>ul>li>ul{top:0;left:99%;padding:2em;margin-top:-2.06em;margin-right:-2em;margin-bottom:-2em;margin-left:-2em;list-style:none}#menuv3>ul>li>ul>li>ul>li{background-color:#e0e0d6}#menuv3>ul>li>ul>li>ul>li:hover{background-color:#ccb}#menuv3>ul>li>ul>li>ul>li:first-child{border-top:1px #800040 solid}li.sub{position:relative;left:.2em;top:0px;background-color:#FFFFFF}body>div.layout-split-left{display:block;position:fixed !important;top:0 ;left:0 ;width:200px;height:100%;z-index:1;overflow:hidden   ;border-right:1px #888888 solid;background-color:#666666}body>div.layout-split-right{margin-left:200px;padding-top:28px;display:block;z-index:1;overflow:hidden;min-height:800px;height:auto}body>div.layout-split-right .layout-actionbar{top:36px}body>div.layout-split-right>#content{top:68px;padding-top:40px}body>div.layout-split-right>#content h1{top:28px !important}body>div.layout-split-right>#content>.wrapper{padding-top:2em }body>div.layout-split-right>#content+div.wrapper{padding-top:4em }body>div.layout-split-right>#content>form{margin-top:.6em}body>div.layout-split-right>#content>form+div.wrapper{padding-top:4em }body>div.layout-split-right>#content>form>.tabwidget>ui-tabs-panel .wrapper{margin-top:2em}body>div.layout-split-right>#content>form>.tabwidget>ui-tabs-panel .tabwidget ul.ui-tabs-nav{position:relative}body>div.layout-split-right>#content>form>.tabwidget>ul.ui-tabs-nav{top:69px;width:calc(100% - 200px)}body>div.layout-split-right>#content>#requirement_spec_tabs.tabwidget>ul.ui-tabs-nav{top:69px !important }body>div.layout-split-right.folded{margin-left:40px}div.layout-split-right.folded{margin-left:40px}div.layout-split-left #html-menu{display:block;overflow-y:scroll;overflow-x:hidden;width:100%;height:100%;margin:27px 0 0 0;padding:0 0 150px 0;background-color:#e0e0d6;font-size:10pt;border-bottom:20px #666633 solid}div.layout-split-left #html-menu .mii{display:none}div.layout-split-left #html-menu::-webkit-scrollbar{display:none}div.layout-split-left #html-menu>div:last-of-type{border-bottom:1px #666633 solid}div.layout-split-left #html-menu .mi{display:block }div.layout-split-left #html-menu .mi a{display:block;word-wrap:break-word;text-decoration:none;font-weight:normal}div.layout-split-left #html-menu .mi:first-child{border-top:2px #666633 solid}div.layout-split-left #html-menu .mi:last-child{border-bottom:1px #666633 solid}div.layout-split-left #html-menu .s0{padding:0 ;background-color:#ccb;color:#1b1b0e;border-top:1px #666633 solid;font-size:90% ;text-transform:uppercase}div.layout-split-left #html-menu .s0 a{padding:5px 0 6px 8px ;cursor:pointer }div.layout-split-left #html-menu .s0 a:hover,div.layout-split-left #html-menu .s0 a:active{background-color:#548360;color:#fff;text-decoration:none}div.layout-split-left #html-menu .s0 a:link,div.layout-split-left #html-menu .s0 a:visited{color:#1b1b0e}div.layout-split-left #html-menu .s0.menu-open{font-weight:normal;background-color:#406449;color:#fff;border-bottom:0 }div.layout-split-left #html-menu .s0.menu-open a{padding:5px 0 6px 8px ;cursor:auto }div.layout-split-left #html-menu .s0.menu-open a:hover,div.layout-split-left #html-menu .s0.menu-open a:active{background-color:#406449;color:#fff;text-decoration:none}div.layout-split-left #html-menu .s0.menu-open a:link,div.layout-split-left #html-menu .s0.menu-open a:visited{color:#fff}div.layout-split-left #html-menu .s1{font-size:80% ;padding:0 ;background-color:#e0e0d6;border-top:1px #666633 solid}div.layout-split-left #html-menu .s1 a{padding:4px 0 3px 8px }div.layout-split-left #html-menu .s1 a:hover,div.layout-split-left #html-menu .s1 a:active{background-color:#ccb;color:#000;text-decoration:none}div.layout-split-left #html-menu .s1 a:link,div.layout-split-left #html-menu .s1 a:visited{color:#1b1b0e}div.layout-split-left #html-menu .s1.sm:after{content:"▼";color:#888888;font-size:80% }div.layout-split-left #html-menu .s1.sm a{display:inline-block;width:162px;color:#1b1b0e}div.layout-split-left #html-menu .s1.sm a:hover,div.layout-split-left #html-menu .s1.sm a:active{background-color:#e0e0d6;color:#1b1b0e;text-decoration:none }div.layout-split-left #html-menu .s1.sm a:link,div.layout-split-left #html-menu .s1.sm a:visited{color:#1b1b0e}div.layout-split-left #html-menu .s1.sm a.ml:link,div.layout-split-left #html-menu .s1.sm a.ml:visited{color:#1b1b0e}div.layout-split-left #html-menu .s1>.s2:last-child{border-bottom:1px #666633 solid}div.layout-split-left #html-menu .s2{padding:0 ;font-size:80% ;background-color:#e0e0d6}div.layout-split-left #html-menu .s2 a{padding:2px 0 3px 20px }div.layout-split-left #html-menu .s2 a:hover,div.layout-split-left #html-menu .s2 a:active{background-color:#ccb;color:#000;text-decoration:none}div.layout-split-left #html-menu .s2 a:link,div.layout-split-left #html-menu .s2 a:visited{color:#1b1b0e}#main_menu_div .DHTMLSuite_menuBar_top{top:28px;height:31px !important;padding:0;margin:0 }#main_menu_div .DHTMLSuite_menuBar_top>div{padding:5px 5px 0 3px }#main_menu_div .DHTMLSuite_menuBar_top>div .DHTMLSuite_menuItem_textContent{font-size:90% ;padding:.1em .2em .2em .2em}#main_menu_div .DHTMLSuite_menuBar_top>div .DHTMLSuite_menuItem_top_arrowShowSub{margin:0 .2em .2em .2em}#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_regular,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_over,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_click,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_disabled,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_active{height:19px}#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_over,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_click{color:#ae0014;background-color:#ffffff}#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_over .DHTMLSuite_menuItem_top_arrowShowSub,#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_click .DHTMLSuite_menuItem_top_arrowShowSub{border:none !important }.DHTMLSuite_menuBar_sub{width:auto !important;padding:.1em 0 .4em .4em !important;margin:11px 0 0 0;border-top:none;border-right:1px solid #e0e0d6;border-bottom:1px solid #e0e0d6;border-left:1px solid #e0e0d6}.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_regular,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_click,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_disabled,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active{clear:both;padding-left:25px;padding-right:.7em;padding-top:.2em;padding-bottom:.2em;cursor:pointer;background-repeat:no-repeat;font-size:90%}.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_regular .DHTMLSuite_menuItem_sub_arrowShowSub,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over .DHTMLSuite_menuItem_sub_arrowShowSub,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_click .DHTMLSuite_menuItem_sub_arrowShowSub,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_disabled .DHTMLSuite_menuItem_sub_arrowShowSub,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active .DHTMLSuite_menuItem_sub_arrowShowSub{right:3px !important}.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over,.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active{color:#8D6A00;background-color:#ffffff}.layout-actionbar div.layout-actionbar-separator{display:block;width:.6em;height:.6em;float:left;content:"&nbsp;";position:relative;border:none}.layout-actionbar div.layout-actionbar-action{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;height:25px;font-size:9pt}.layout-actionbar div.layout-actionbar-action.layout-actionbar-action-disabled{color:#666633 !important}.layout-actionbar div.layout-actionbar-action.layout-actionbar-action-disabled:hover{text-decoration:none !important}.layout-actionbar>div.layout-actionbar-action{border-radius:4px;border:1px #292914 solid;background-color:#ccb;float:left;color:#292914;z-index:1031}.layout-actionbar div.layout-actionbar-link,.layout-actionbar div.layout-actionbar-submit,.layout-actionbar div.layout-actionbar-scriptbutton{display:block;min-width:90px;width:auto;box-sizing:border-box;border-width:1px;border-style:solid;text-align:center;padding:4px 10px;cursor:default}.layout-actionbar div.layout-actionbar-link:focus,.layout-actionbar div.layout-actionbar-submit:focus,.layout-actionbar div.layout-actionbar-scriptbutton:focus{border-color:darkgray;background-color:#e0e0d6}.layout-actionbar div.layout-actionbar-link:hover,.layout-actionbar div.layout-actionbar-submit:hover,.layout-actionbar div.layout-actionbar-scriptbutton:hover{border-width:1px;border-style:solid}.layout-actionbar .layout-actionbar-default-action{font-weight:normal}.layout-actionbar div.layout-actionbar-combobox{position:relative;display:block;float:left;width:110px;z-index:1031}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head{padding-right:20px;white-space:nowrap;display:block;margin-bottom:-1px;float:right;z-index:1033;position:relative}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head>div{min-width:90px;height:25px;border-top-left-radius:4px;border-bottom-left-radius:4px;border:1px #292914 solid;background-color:#ccb;color:#292914;position:relative}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head>span{display:block;position:absolute;top:0;right:0;width:24px !important;height:25px !important;border:1px #292914 solid;border-left:none;border-top-right-radius:4px;border-bottom-right-radius:4px;padding:4px;background-color:#ccb;background-image:url("../../image/select-down.png");background-repeat:no-repeat;background-position:5px 5px}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list{position:relative;display:none;min-width:140px;float:right;overflow:hidden;border:1px solid #292914;border-top-left-radius:4px;border-bottom-left-radius:4px;border-bottom-right-radius:4px;z-index:1032;top:1px;background-color:#ccb}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list div.layout-actionbar-action{white-space:nowrap;display:block;position:relative;width:100%;text-align:left;padding:.6em .6em .6em 1em;border-bottom:none !important;background-color:#ccb;color:#292914}.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list div.layout-actionbar-action:hover{color:#292914;text-decoration:underline;background-color:#e0e0d6}.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head{height:29px;border-bottom:none !important }.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head div{border-bottom-left-radius:0 !important;border-bottom:none;height:30px }.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head span{border-bottom-right-radius:0 !important;border-bottom:none;height:30px !important }.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list{display:inline-table;border-top-right-radius:0 !important}.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list div.layout-actionbar-action{border:none !important}form{display:table;width:100%;text-align:left;margin:0 auto 0 auto}form.box{display:block;overflow:hidden ;padding:0 0 1.6em 0}input,textarea,select{font-family:Verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;padding:.2em .2em .2em .6em;border:1px;border-color:darkgray lightgray lightgray;border-style:solid;outline:none;background-color:#fff}input[type="text"].accent,textarea[type="text"].accent,select[type="text"].accent{font-weight:bold ;font-size:130% !important ;padding:.6em auto !important}textarea{resize:vertical}textarea#intnotes,textarea#order_intnotes,textarea#reclamation_intnotes{height:150px}input[type="text"]:focus,input[type="password"]:focus,textarea:focus,select:focus,input[type="text"]:active,input[type="password"]:active,textarea:active,select:active{background-color:#ccb;border:1px #0e0e07 solid;color:#1b1b0e}select.helper{background-color:#ffffff}select>option{padding-left:.6em}input[type="file"]{padding:.8em;background-color:#cccccc;color:#666666;border:1px #666666 solid}input[type="file"] button,input[type="file"] input[type="button"]{background-color:#A3FFA8}label{cursor:pointer;vertical-align:top;display:inline-block;width:88% ;color:#1b1b0e}label:link,label:visited{text-decoration:none }label:hover{text-decoration:underline }fieldset{margin-top:15px;color:black;font-weight:normal;font-size:14pt;text-transform:uppercase;border-color:grey;border-width:1px ;margin:.4em .6em 1.4em .6em}fieldset h4{font-weight:normal ;font-size:11pt;margin:0;padding:0 0 .2em 0}input[type="text"].wi-smallest,input[type="password"].wi-smallest{width:42px}input[type="text"].wi-verysmall,input[type="password"].wi-verysmall{width:80px}input[type="text"].wi-small,input[type="password"].wi-small{width:92px}input[type="text"].wi-mediumsmall,input[type="password"].wi-mediumsmall{width:124px}input[type="text"].wi-normal,input[type="password"].wi-normal{width:172px}input[type="text"].wi-lightwide,input[type="password"].wi-lightwide{width:220px}input[type="text"].wi-wide,input[type="password"].wi-wide{width:284px}input[type="text"].wi-wider,input[type="password"].wi-wider{min-width:348px}input[type="text"].wi-verywide,input[type="password"].wi-verywide{min-width:540px}input[type="text"].wi-date,input[type="password"].wi-date{width:92px}input[type="text"].wi-number,input[type="password"].wi-number{width:92px}input[type="text"].wi-tinynumber,input[type="password"].wi-tinynumber{width:80px}input[type="text"].wi-largenumber,input[type="password"].wi-largenumber{width:124px}input[type="text"].wi-lightwide--verysmall,input[type="password"].wi-lightwide--verysmall{width:139px}input[type="text"].wi-wide--verysmall,input[type="password"].wi-wide--verysmall{width:203px !important}input .fixed_width{width:250px}select.wi-smallest{width:42px}select.wi-verysmall{width:80px}select.wi-small{width:92px}select.wi-mediumsmall{width:124px}select.wi-normal{width:172px}select.wi-lightwide{width:220px}select.wi-wide{width:284px}select.wi-wider{min-width:348px}select.wi-verywide{min-width:540px}select.wi-full{width:100%                   }select.wi-small-normal{width:300px}select.wi-small-lightwide{width:348px}select.wi-small-wide{width:412px}select.wi-small-wider{width:476px}select.wi-small-verywide{width:668px}select.wi-mediumsmall-normal{width:332px}select.wi-mediumsmall-lightwide{width:380px}select.wi-mediumsmall-wide{width:444px}select.wi-mediumsmall-wider{width:508px}select.wi-mediumsmall-verywide{width:700px}select.wi-normal-normal{width:380px}select.wi-normal-lightwide{width:428px}select.wi-normal-wide{width:492px}select.wi-normal-wider{width:556px}select.wi-normal-verywide{width:748px}select.wi-lightwide-normal{width:428px}select.wi-lightwide-lightwide{width:476px}select.wi-lightwide-wide{width:540px}select.wi-lightwide-wider{width:604px}select.wi-lightwide-verywide{width:796px}select.wi-wide-normal{width:492px}select.wi-wide-lightwide{width:540px}select.wi-wide-wide{width:604px}select.wi-wide-wider{width:668px}select.wi-wide-verywide{width:860px}textarea.wi-smallest{width:172px}textarea.wi-verysmall{width:172px}textarea.wi-small{width:172px}textarea.wi-mediumsmall{width:172px}textarea.wi-normal{width:172px}textarea.wi-lightwide{min-width:220px}textarea.wi-wide{min-width:284px}textarea.wi-wide.strict{max-width:284px !important}textarea.wi-wider{min-width:348px}textarea.wi-verywide{min-width:540px}textarea.wi-full{width:100%                  }textarea.wi-small-small{width:220px}textarea.wi-small-mediumsmall{width:252px;margin:0 30px 0 0 }textarea.wi-small-normal{width:300px}textarea.wi-small-lightwide{width:348px}textarea.wi-small-wide{width:412px}textarea.wi-small-wider{width:476px}textarea.wi-small-verywide{width:668px}textarea.wi-mediumsmall-small{width:252px}textarea.wi-mediumsmall-mediumsmall{width:284px}textarea.wi-mediumsmall-normal{width:332px}textarea.wi-mediumsmall-lightwide{width:380px}textarea.wi-mediumsmall-wide{width:444px}textarea.wi-mediumsmall-wider{width:508px}textarea.wi-mediumsmall-verywide{width:700px}textarea.wi-normal-small{width:300px}textarea.wi-normal-mediumsmall{width:332px}textarea.wi-normal-normal{width:380px}textarea.wi-normal-lightwide{width:428px}textarea.wi-normal-wide{width:492px}textarea.wi-normal-wider{width:556px}textarea.wi-normal-verywide{width:748px}textarea.wi-lightwide-small{width:348px}textarea.wi-lightwide-mediumsmall{width:380px}textarea.wi-lightwide-normal{width:428px}textarea.wi-lightwide-lightwide{width:476px}textarea.wi-lightwide-wide{width:540px}textarea.wi-lightwide-wider{width:604px}textarea.wi-lightwide-verywide{width:796px}textarea.wi-wide-small{width:412px}textarea.wi-wide-mediumsmall{width:444px}textarea.wi-wide-normal{width:492px}textarea.wi-wide-lightwide{width:604px}textarea.wi-wide-wide{width:604px}textarea.wi-wide-wider{width:668px}textarea.wi-wide-verywide{width:860px}td.wi-date>input[type="text"],th.wi-date>input[type="text"]{width:92px}td.wi-lightwide>textarea,th.wi-lightwide>textarea{width:284px}td.wi-wide>textarea,th.wi-wide>textarea{width:284px}td.wi-small-verywide>textarea,th.wi-small-verywide>textarea{width:668px}th.wi-lightwide textarea,td.wi-lightwide textarea,th.wi-lightwide input[type="text"],td.wi-lightwide input[type="text"],th.wi-lightwide div.ck-editor,td.wi-lightwide div.ck-editor,th.wi-lightwide input#order_vendor_id_name,td.wi-lightwide input#order_vendor_id_name{width:220px}th.wi-wide textarea,td.wi-wide textarea,th.wi-wide input[type="text"],td.wi-wide input[type="text"],th.wi-wide div.ck-editor,td.wi-wide div.ck-editor,th.wi-wide input#order_vendor_id_name,td.wi-wide input#order_vendor_id_name{width:284px}span.wi-smallest{padding:0 }span.wi-smallest textarea,span.wi-smallest div.ck-editor{width:172px}span.wi-verysmall{padding:0 }span.wi-verysmall textarea,span.wi-verysmall div.ck-editor{width:172px}span.wi-small{padding:0 }span.wi-small textarea,span.wi-small div.ck-editor{width:172px}span.wi-mediumsmall{padding:0 }span.wi-mediumsmall textarea,span.wi-mediumsmall div.ck-editor{width:172px}span.wi-normal{padding:0 }span.wi-normal textarea,span.wi-normal div.ck-editor{width:172px}span.wi-lightwide{padding:0 }span.wi-lightwide textarea,span.wi-lightwide div.ck-editor{width:220px}span.wi-wide{padding:0 }span.wi-wide textarea,span.wi-wide>div.ck-editor{width:284px !important}span.wi-wide.strict{max-width:284px !important}span.wi-wider{padding:0 }span.wi-wider textarea,span.wi-wider div.ck-editor{width:348px}span.wi-verywide{padding:0 }span.wi-verywide textarea,span.wi-verywide div.ck-editor{min-width:540px}span.wi-full{padding:0 }span.wi-full textarea,span.wi-full div.ck-editor{width:100%                     }span.wi-small-small{padding:0 }span.wi-small-small textarea,span.wi-small-small div.ck-editor{width:220px}span.wi-small-mediumsmall{padding:0 }span.wi-small-mediumsmall textarea,span.wi-small-mediumsmall div.ck-editor{width:252px;margin:0 30px 0 0 }span.wi-small-normal{padding:0 }span.wi-small-normal textarea,span.wi-small-normal div.ck-editor{width:300px}span.wi-small-lightwide{padding:0 }span.wi-small-lightwide textarea,span.wi-small-lightwide div.ck-editor{width:348px}span.wi-small-wide{padding:0 }span.wi-small-wide textarea,span.wi-small-wide div.ck-editor{width:412px}span.wi-small-wider{padding:0 }span.wi-small-wider textarea,span.wi-small-wider div.ck-editor{width:476px}span.wi-small-verywide{padding:0 }span.wi-small-verywide textarea,span.wi-small-verywide div.ck-editor{width:668px}span.wi-mediumsmall-small{padding:0 }span.wi-mediumsmall-small textarea,span.wi-mediumsmall-small div.ck-editor{width:252px}span.wi-mediumsmall-mediumsmall{padding:0 }span.wi-mediumsmall-mediumsmall textarea,span.wi-mediumsmall-mediumsmall div.ck-editor{width:284px}span.wi-mediumsmall-normal{padding:0 }span.wi-mediumsmall-normal textarea,span.wi-mediumsmall-normal div.ck-editor{width:332px}span.wi-mediumsmall-lightwide{padding:0 }span.wi-mediumsmall-lightwide textarea,span.wi-mediumsmall-lightwide div.ck-editor{width:380px}span.wi-mediumsmall-wide{padding:0 }span.wi-mediumsmall-wide textarea,span.wi-mediumsmall-wide.wi-mediumsmall-wide>div.ck-editor{width:444px !important}span.wi-mediumsmall-wider{padding:0 }span.wi-mediumsmall-wider textarea,span.wi-mediumsmall-wider div.ck-editor{width:508px}span.wi-mediumsmall-verywide{padding:0 }span.wi-mediumsmall-verywide textarea,span.wi-mediumsmall-verywide div.ck-editor{width:700px}span.wi-normal-small{padding:0 }span.wi-normal-small textarea,span.wi-normal-small div.ck-editor{width:300px}span.wi-normal-mediumsmall{padding:0 }span.wi-normal-mediumsmall textarea,span.wi-normal-mediumsmall div.ck-editor{width:332px}span.wi-normal-normal{padding:0 }span.wi-normal-normal textarea,span.wi-normal-normal div.ck-editor{width:380px}span.wi-normal-lightwide{padding:0 }span.wi-normal-lightwide textarea,span.wi-normal-lightwide div.ck-editor{width:428px}span.wi-normal-wide{padding:0 }span.wi-normal-wide textarea,span.wi-normal-wide div.ck-editor{width:492px}span.wi-normal-wider{padding:0 }span.wi-normal-wider textarea,span.wi-normal-wider div.ck-editor{width:556px}span.wi-normal-verywide{padding:0 }span.wi-normal-verywide textarea,span.wi-normal-verywide div.ck-editor{width:748px}span.wi-lightwide-small{padding:0 }span.wi-lightwide-small textarea,span.wi-lightwide-small div.ck-editor{width:348px}span.wi-lightwide-mediumsmall{padding:0 }span.wi-lightwide-mediumsmall textarea,span.wi-lightwide-mediumsmall div.ck-editor{width:380px}span.wi-lightwide-normal{padding:0 }span.wi-lightwide-normal textarea,span.wi-lightwide-normal div.ck-editor{width:428px}span.wi-lightwide-lightwide{padding:0 }span.wi-lightwide-lightwide textarea,span.wi-lightwide-lightwide div.ck-editor{width:476px}span.wi-lightwide-wide{padding:0 }span.wi-lightwide-wide textarea,span.wi-lightwide-wide div.ck-editor{width:540px}span.wi-lightwide-wider{padding:0 }span.wi-lightwide-wider textarea,span.wi-lightwide-wider div.ck-editor{width:604px}span.wi-lightwide-verywide{padding:0 }span.wi-lightwide-verywide textarea,span.wi-lightwide-verywide div.ck-editor{width:796px}span.wi-wide-small{padding:0 }span.wi-wide-small textarea,span.wi-wide-small div.ck-editor{width:412px}span.wi-wide-mediumsmall{padding:0 }span.wi-wide-mediumsmall textarea,span.wi-wide-mediumsmall div.ck-editor{width:444px}span.wi-wide-normal{padding:0 }span.wi-wide-normal textarea,span.wi-wide-normal div.ck-editor{width:492px}span.wi-wide-lightwide{padding:0 }span.wi-wide-lightwide textarea,span.wi-wide-lightwide div.ck-editor{width:604px}span.wi-wide-wide{padding:0 }span.wi-wide-wide textarea,span.wi-wide-wide div.ck-editor{width:604px}span.wi-wide-wider{padding:0 }span.wi-wide-wider textarea,span.wi-wide-wider div.ck-editor{width:668px}span.wi-wide-verywide{padding:0 }span.wi-wide-verywide textarea,span.wi-wide-verywide div.ck-editor{width:860px}th.wi-smallest input[type="text"],td.wi-smallest input[type="text"],th.wi-smallest select,td.wi-smallest select{width:42px}th.wi-verysmall input[type="text"],td.wi-verysmall input[type="text"],th.wi-verysmall select,td.wi-verysmall select{width:80px}th.wi-small input[type="text"],td.wi-small input[type="text"],th.wi-small select,td.wi-small select{width:92px}th.wi-mediumsmall input[type="text"],td.wi-mediumsmall input[type="text"],th.wi-mediumsmall select,td.wi-mediumsmall select{width:124px}th.wi-normal input[type="text"],td.wi-normal input[type="text"],th.wi-normal select,td.wi-normal select,th.wi-normal textarea,td.wi-normal textarea,th.wi-normal div.ck-editor,td.wi-normal div.ck-editor{width:172px}th.wi-lightwide input[type="text"],td.wi-lightwide input[type="text"],th.wi-lightwide select,td.wi-lightwide select,th.wi-lightwide textarea,td.wi-lightwide textarea,th.wi-lightwide div.ck-editor,td.wi-lightwide div.ck-editor{width:220px}th.wi-wide input[type="text"],td.wi-wide input[type="text"],th.wi-wide select,td.wi-wide select,th.wi-wide textarea,td.wi-wide textarea,th.wi-wide div.ck-editor,td.wi-wide div.ck-editor{width:284px !important}th.wi-wide.strict input[type="text"],td.wi-wide.strict input[type="text"],th.wi-wide.strict select,td.wi-wide.strict select,th.wi-wide.strict textarea,td.wi-wide.strict textarea,th.wi-wide.strict div.ck-editor,td.wi-wide.strict div.ck-editor{max-width:284px !important}th.wi-wider input[type="text"],td.wi-wider input[type="text"],th.wi-wider select,td.wi-wider select,th.wi-wider textarea,td.wi-wider textarea,th.wi-wider div.ck-editor,td.wi-wider div.ck-editor{width:348px !important}th.wi-verywide input[type="text"],td.wi-verywide input[type="text"],th.wi-verywide select,td.wi-verywide select,th.wi-verywide textarea,td.wi-verywide textarea,th.wi-verywide div.ck-editor,td.wi-verywide div.ck-editor{min-width:540px}th.wi-full input[type="text"],td.wi-full input[type="text"],th.wi-full select,td.wi-full select,th.wi-full textarea,td.wi-full textarea,th.wi-full div.ck-editor,td.wi-full div.ck-editor{width:100% }th.wi-mediumsmall-wide input[type="text"],td.wi-mediumsmall-wide input[type="text"],th.wi-mediumsmall-wide select,td.wi-mediumsmall-wide select,th.wi-mediumsmall-wide textarea,td.wi-mediumsmall-wide textarea,th.wi-mediumsmall-wide div.ck-editor,td.wi-mediumsmall-wide div.ck-editor{width:444px}th.wi-small-mediumsmall input[type="text"],td.wi-small-mediumsmall input[type="text"],th.wi-small-mediumsmall select,td.wi-small-mediumsmall select,th.wi-small-mediumsmall textarea,td.wi-small-mediumsmall textarea,th.wi-small-mediumsmall div.ck-editor,td.wi-small-mediumsmall div.ck-editor{width:252px}th.wi-mediumsmall-lightwide input[type="text"],td.wi-mediumsmall-lightwide input[type="text"],th.wi-mediumsmall-lightwide select,td.wi-mediumsmall-lightwide select,th.wi-mediumsmall-lightwide textarea,td.wi-mediumsmall-lightwide textarea,th.wi-mediumsmall-lightwide div.ck-editor,td.wi-mediumsmall-lightwide div.ck-editor{width:380px}th.below input[type="text"],td.below input[type="text"],th.below select,td.below select,th.below textarea,td.below textarea,th.below div.ck-editor,td.below div.ck-editor{clear:both;margin-top:.4em}td.wi-lightwide>span.customer_vendor_picker>input{width:220px}td.wi-wide>span.customer_vendor_picker>input{width:284px}td.wi-wider>span.customer_vendor_picker>input{width:348px}input.number,select.number{text-align:right }input.numeric,select.numeric{text-align:right }input.right,select.right{text-align:right }input[type=text].emphasized{word-wrap:break-word;word-break:break-all;height:auto;overflow:hidden }td img.ui-datepicker-trigger{vertical-align:middle ;padding:0 .2em}td div.rowspan-table{display:table-row;float:left;margin:.8em 2.8em .8em 0}td div.rowspan-table div.label-n-value{display:table-cell;vertical-align:middle;height:1.6em !important;float:left;padding:0 2em 0 0}td div.rowspan-table div.label-n-value b{font-weight:normal;padding:0 0 0 0 }table td>span.data{display:block;overflow:hidden ;min-height:15.3pt;font-size:9pt;color:#1b1b0e;border:1px #ccb solid;margin:0 ;line-height:120%;padding:.2em .28em .2em .6em !important}table td>span.data.below{margin-top:.2em}table td>span.data.numeric,table td>span.data.right{text-align:right}table td>span.data.wi-smallest{width:42px}table td>span.data.wi-verysmall{width:80px}table td>span.data.wi-small{width:92px}table td>span.data.wi-mediumsmall{width:124px}table td>span.data.wi-normal{width:172px}table td>span.data.wi-lightwide{width:220px}table td>span.data.wi-wide{width:284px}table td>span.data.numeric{text-align:right }table td>span.data.right{text-align:right }div.boxes{margin:0 0 .9em 0;overflow:hidden ;max-width:800px }div.boxes h3{padding:.2em 0 .2em 0}div.boxes h3 label{float:left;width:88% ;font-size:13pt;padding:0 0 .6em .2em;line-height:1.2em}div.boxes>div{clear:both;margin:0 0 .6em 0;padding:0;display:block ;overflow:hidden }div.boxes>div label{float:left;width:88% }div.boxes>div input[type="checkbox"],div.boxes>div input[type="radio"]{float:left;margin-right:.6em}td.horizontal input[type="radio"],td.horizontal input[type="checkbox"]{float:left !important;clear:none !important;width:auto}td.horizontal label{width:auto !important;margin-right:2em;float:left !important;clear:none !important}table.tbl-horizontal th label,table.tbl-list th label,table.tbl-plain th label{display:inline-block}table.tbl-horizontal td input[type="radio"],table.tbl-list td input[type="radio"],table.tbl-plain td input[type="radio"],table.tbl-horizontal td input[type="checkbox"],table.tbl-list td input[type="checkbox"],table.tbl-plain td input[type="checkbox"]{float:left;clear:left}table.tbl-horizontal td input[type="radio"]~label,table.tbl-list td input[type="radio"]~label,table.tbl-plain td input[type="radio"]~label,table.tbl-horizontal td input[type="checkbox"]~label,table.tbl-list td input[type="checkbox"]~label,table.tbl-plain td input[type="checkbox"]~label{float:left;width:auto;margin-left:.2em;line-height:1.4em}table.tbl-horizontal td span.wi-date,table.tbl-list td span.wi-date,table.tbl-plain td span.wi-date{padding:0 }table.tbl-horizontal td span.wi-date input[type="text"],table.tbl-list td span.wi-date input[type="text"],table.tbl-plain td span.wi-date input[type="text"],table.tbl-horizontal td span.wi-date input[type="date"],table.tbl-list td span.wi-date input[type="date"],table.tbl-plain td span.wi-date input[type="date"]{width:92px}table.tbl-horizontal td.clear input[type="radio"],table.tbl-list td.clear input[type="radio"],table.tbl-plain td.clear input[type="radio"],table.tbl-horizontal td.clear input[type="checkbox"],table.tbl-list td.clear input[type="checkbox"],table.tbl-plain td.clear input[type="checkbox"]{float:none}table.tbl-horizontal td.clear input[type="radio"]~label,table.tbl-list td.clear input[type="radio"]~label,table.tbl-plain td.clear input[type="radio"]~label,table.tbl-horizontal td.clear input[type="checkbox"]~label,table.tbl-list td.clear input[type="checkbox"]~label,table.tbl-plain td.clear input[type="checkbox"]~label{float:none}div.fake-textarea{width:220px;height:150px;background-color:white;overflow:auto;border:1px #999999 solid}div.fake-textarea.fake-wi-wide{width:284px}div.admin form{font-size:10pt}div.admin form input[type="checkbox"]{margin:.2em .6em .3em 0;float:left}div.admin form h3{margin:1.2em 0 .6em 0;display:block}.ms2side{display:block;overflow:hidden}.ms2side p{margin:0 0 .4em 0}.ms2side .ms2side__div .ms2side__header{width:12em;height:2.2em;display:table-cell;vertical-align:bottom}.ms2side .ms2side__div .ms2side__options>p.ms2side__hide,.ms2side .ms2side__div .ms2side__updown>p.ms2side__hide{cursor:default;color:#9e9e9e;border:1px solid grey;background-color:#D4D4D4 !important}.frame-header-quicksearch input::placeholder{color:#444444}#content input::placeholder{color:#444444}span.customer_vendor_picker{padding:0 }input#vendor_id_name.ui-autocomplete-input,input#customer_id_name.ui-autocomplete-input{margin:0 }input#vendor_id_name.ui-autocomplete-input.wi-wide,input#customer_id_name.ui-autocomplete-input.wi-wide{width:284px}table td span.project_picker{padding:0 !important}.mx-message{display:block;overflow:hidden;overflow-x:auto;clear:both ;width:auto;min-width:60em;max-width:40em;padding:.6em .8em;border-radius:.6em;border-style:solid;border-width:1px;font-size:9pt;font-weight:normal;line-height:110% ;text-align:left;white-space:normal}.flash_message,.message,.flash_message_error,.message_error,.flash_message_ok,.message_ok,.flash_message_hint,.message_hint,.flash_message_warning,.message_warning,.flash_message_info,.message_info{display:block;overflow:hidden;overflow-x:auto;clear:both ;width:auto;min-width:60em;max-width:40em;padding:.6em .8em;border-radius:.6em;border-style:solid;border-width:1px;font-size:9pt;font-weight:normal;line-height:110% ;text-align:left;white-space:normal}.message_error{color:#ae0014;background-color:#ffaeb7;border-color:1px solid #ae0014}.message_error h4{color:#ae0014}.message_error p{color:#ae0014}.message_warning{color:#8D6A00;background-color:#ffe38d;border-color:1px solid #8D6A00}.message_warning h4{color:#8D6A00}.message_warning p{color:#8D6A00}.message_hint,.message_info{color:#209ec8;background-color:#ebf8fc;border-color:1px solid #209ec8}.message_hint h4,.message_info h4{color:#209ec8}.message_hint p,.message_info p{color:#209ec8}.message_ok{color:#003c18;background-color:#3cff8a;border-color:1px solid #003c18}.message_ok h4{color:#003c18}.message_ok p{color:#003c18}.message.attention{color:#209ec8;background-color:#ebf8fc;border-color:1px solid #209ec8}.message.attention h4{color:#209ec8}.message.attention p{color:#209ec8}.message h4{font-weight:bold;font-size:110%;margin:.4em 1em .2em 0;padding:0}.message p{margin:0 1em .6em 0;padding:0}.message_error>.message_error,.message_warning>.message_error,.message_hint>.message_error,.message_info>.message_error,.message_ok>.message_error,.message_error>.message_warning,.message_warning>.message_warning,.message_hint>.message_warning,.message_info>.message_warning,.message_ok>.message_warning,.message_error>.message_hint,.message_warning>.message_hint,.message_hint>.message_hint,.message_info>.message_hint,.message_ok>.message_hint,.message_error>.message_info,.message_warning>.message_info,.message_hint>.message_info,.message_info>.message_info,.message_ok>.message_info,.message_error>.message_ok,.message_warning>.message_ok,.message_hint>.message_ok,.message_info>.message_ok,.message_ok>.message_ok{display:none}p.message{padding:.6em !important}#content>form>.message,#content>form>.ui-tabs>.ui-tabs-panel>.message{margin-top:1.2em;margin-right:0;margin-bottom:1.2em;margin-left:1.2em}#content>form>.message.message_ok,#content>form>.ui-tabs>.ui-tabs-panel>.message.message_ok,#content>form>.message.message_info,#content>form>.ui-tabs>.ui-tabs-panel>.message.message_info,#content>form>.message.message_hint,#content>form>.ui-tabs>.ui-tabs-panel>.message.message_hint,#content>form>.message.message_error,#content>form>.ui-tabs>.ui-tabs-panel>.message.message_error,#content>form>.message.message_warning,#content>form>.ui-tabs>.ui-tabs-panel>.message.message_warning{margin-left:1.2em}#content>form>.message_ok,#content>form>.message_info,#content>form>.message_hint,#content>form>.message_error,#content>form>.message_warning{margin-top:1.2em;margin-right:0;margin-bottom:1.2em;margin-left:1.2em}#content>form .wrapper>.message,#content>form .wrapper>.message_ok,#content>form .wrapper>.message_info,#content>form .wrapper>.message_hint,#content>form .wrapper>.message_error,#content>form .wrapper>.message_warning{margin:1.6em 0 .4em 0}body>div.login .message{width:100% ;text-align:center ;margin:0 auto 1em auto}.flash_message.flash_message_error{background-color:#ffaeb7;border-color:1px solid #ae0014;color:#ae0014}.flash_message.flash_message_error a.button.wi-tiny,.flash_message.flash_message_error a.icon-close{border:1px solid #ae0014 !important;color:#ae0014}.flash_message.flash_message_ok{background-color:#3cff8a;border:1px solid #003c18;color:#003c18}.flash_message.flash_message_ok a.button.wi-tiny,.flash_message.flash_message_ok a.icon-close{border:1px solid #003c18;color:#003c18}.flash_message.flash_message_warning{background-color:#ffe38d;border-color:1px solid #8D6A00;color:#8D6A00}.flash_message.flash_message_warning a.button.wi-tiny,.flash_message.flash_message_warning a.icon-close{border:1px solid #8D6A00;color:#8D6A00}.flash_message.flash_message_info{background-color:#ebf8fc;border:1px solid #209ec8;color:#209ec8}.flash_message.flash_message_info a.button.wi-tiny,.flash_message.flash_message_info a.icon-close{border:1px solid #209ec8;color:#209ec8}.flash_message .flash_title{font-weight:bold;float:left;display:block ;padding-right:1em}.flash_message .flash_notification{float:left;display:block }.flash_message a.button.wi-tiny{font-size:76% ;padding:0 .2em 0 .2em;margin:0 .4em 0 .4em;width:auto ;background-color:transparent}.flash_message div.button-container,.flash_message div.icon-container{overflow:hidden ;width:12% ;float:right }.flash_message div.button-container a.icon-close,.flash_message div.icon-container a.icon-close{font-size:76% ;float:right ;border-width:1px ;border-style:solid ;padding:0 3px ;border-radius:3px}.flash_message div.button-container span.display,.flash_message div.icon-container span.display{float:right !important;display:block;width:auto ;text-align:right ;margin:0 ;padding:0}.flash_message div.message-container{overflow:hidden ;width:86% ;float:left }.flash_message div.message-container>span.flash_title{display:block;float:left ;width:auto }.flash_message div.message-container>div.flash_notification{display:block;float:left ;max-width:80% ;width:auto }.flash_message div.message-container>div.flash_notification span.content{float:left ;display:block;width:100% }.flash_message div.message-container>div.flash_notification div.detail{display:block;clear:both ;padding-top:.9em}.flash_message div.message-container>div.flash_notification div.detail span{display:block;width:94%;float:right}.flash_message div.message-container>div.flash_notification div.detail a.button.wi-tiny{display:block ;float:left ;margin-left:0 }#content>form>.flash_message_error,#content>form>.flash_message_ok,#content>form>.flash_message_warning,#content>form>.flash_message_info{margin:48px 0 0 1.2em}#content>form .ui-tabs-panel>.flash_message_error,#content>form .ui-tabs-panel>.flash_message_ok,#content>form .ui-tabs-panel>.flash_message_warning,#content>form .ui-tabs-panel>.flash_message_info{margin:48px 0 0 1.2em}#content>form .wrapper .flash_message{margin:1.6em 0 .4em 0}#content>form .wrapper .flash_message_error,#content>form .wrapper .flash_message_ok,#content>form .wrapper .flash_message_warning,#content>form .wrapper .flash_message_info{margin:1.6em 0 .4em 0}#content>.flash_message_error,#content>.flash_message_ok,#content>.flash_message_warning,#content>.flash_message_info{margin:24px 0 0 1.2em}#admin .flash_message{margin:48px 0 0 1.2em}table{table-layout:auto ;border-spacing:1px }table td,table th{text-align:left ;vertical-align:top ;font-weight:normal }table td.right,table th.right{text-align:right  !important }table td.center,table th.center{text-align:center !important }table td.center input,table th.center input{float:none   !important }table td.numeric,table th.numeric{text-align:right  !important }table td.numeric-centered,table th.numeric-centered{text-align:center !important }table td.date,table th.date{text-align:right  !important }table td.button,table th.button{text-align:center !important }table td.img,table th.img{text-align:center !important }table td.top,table th.top{vertical-align:top    !important }table td.long-desc,table th.long-desc,table td.long-description,table th.long-description,table td.longdesc,table th.longdesc,table td.longdescription,table th.longdescription,table td div.description,table th div.description{font-size:80% ;color:#1b1b0e}table td.highlight,table th.highlight{background-color:#B4F4FE}table td div.numeric,table th div.numeric{text-align:right  !important }table td h3,table th h3,table td h4,table th h4{margin:0 !important ;padding:.8em 0 .2em 0 !important}table td>a,table th>a{display:block }table td img,table th img{display:inline ;vertical-align:top    }table td+a img,table th+a img,table td+img,table th+img{float:left   }table td~a img,table th~a img,table td~img,table th~img{float:right  }table td img.row-icon,table th img.row-icon{cursor:pointer;display:block;max-width:16px;max-height:16px}table td div.description,table th div.description{float:none ;clear:both }table td>input+div.description,table th>input+div.description,table td>select+div.description,table th>select+div.description{margin-top:.4em}table td span.label,table th span.label{display:block ;padding:0 0 .5em 0;color:#292914}table td span.below,table th span.below{overflow:hidden ;display:block }table td span.below input,table th span.below input{margin:.6em 0 0 0 !important}table td span.below input[type="checkbox"],table th span.below input[type="checkbox"]{padding:.6em .6em 0 0}table td span.above,table th span.above{overflow:hidden ;display:block ;margin-bottom:.4em;padding:.3em .3em 0 0 !important}table td+input.below,table th+input.below{margin:0 !important}table td input.below,table th input.below,table td select.below,table th select.below{display:block ;clear:left ;float:none ;overflow:hidden ;margin:.3em 0 0 0}table td textarea,table th textarea{margin:-0.14em 0}table th{white-space:normal !important }table th.vmiddle{vertical-align:middle}table td{color:#0e0e07}table tr.header-caption th{vertical-align:bottom }table tr.separator th,table tr.separator td{padding-bottom:3em}table tr.separator.below th,table tr.separator.below td{padding-bottom:3em}table tr.separator.above th,table tr.separator.above td{padding-top:3em;padding-bottom:0   }table tr.total-sub{height:2em}table tr.total-sub td{border-top:1px solid #666633;border-bottom:2px solid #666633;font-weight:bold ;color:#0e0e07}table tr td.listsubtotal{height:2em;border-top:1px solid #666633;border-bottom:2px solid #666633;font-weight:bold ;color:#0e0e07}table tr td.listtotal{height:2em;border-top:1px solid #666633;border-bottom:2px solid #666633;font-weight:bold ;color:#0e0e07}table tr.heading th{font-size:120% ;border-top:1px #666633 solid}table caption,table th.caption{font-size:11pt;font-weight:normal;color:#292914 !important;padding:.2em 0 .2em .2em;margin:.1em 0 .4em 0;text-align:left;letter-spacing:.12em;white-space:nowrap }table caption small,table th.caption small{font-size:10pt}table thead th{color:#ffffff;background-color:#292914;border-top:1px solid #666633;border-bottom:1px solid #666633;text-align:left ;vertical-align:middle }table thead th a img{vertical-align:middle ;padding:0 ;margin:0 }table tfoot tr th,table tfoot tr td{vertical-align:middle ;border-bottom:#666633 2px solid;height:1.8em;padding-top:.6em !important;padding-bottom:.6em !important}table tfoot tr td{font-weight:bold ;color:#000}table tfoot tr th{font-weight:normal ;color:#000}table tfoot tr:first td,table tfoot tr:first th{border-top:#666633 2px solid}table tfoot tr.blank{border:none !important }table tfoot tr.blank th,table tfoot tr.blank td{border:none !important }table tfoot.blank tr{border:none !important }table tfoot.blank tr:first-child th,table tfoot.blank tr:first-child td{border-top:1px solid #666633 !important}table tfoot.blank tr th,table tfoot.blank tr td{border:none !important }table colgroup col.right{text-align:right  }table colgroup col.center{text-align:center }table colgroup col.long-desc{font-size:70%    }table colgroup col.wi-smallest{width:42px}table colgroup col.wi-verysmall{width:80px}table colgroup col.wi-small{width:128px}table colgroup col.wi-mediumsmall{width:160px}table colgroup col.wi-normal{width:208px}table colgroup col.wi-lightwide{width:256px}table colgroup col.wi-wide{width:320px}table colgroup col.wi-wider{width:384px}table colgroup col.wi-verywide{width:576px}table.tbl-horizontal,table.tbl-plain,table.tbl-list,table.tbl-list-plain{margin-bottom:.6em;border-collapse:collapse ;border:none }table.tbl-horizontal tr td>span,table.tbl-plain tr td>span,table.tbl-list tr td>span,table.tbl-list-plain tr td>span{padding:.3em .3em .6em 0}table.tbl-horizontal th,table.tbl-horizontal td{background:none ;padding-top:.3em;padding-right:.2em;padding-bottom:.2em;padding-left:.3em}table.tbl-horizontal th>input[type="checkbox"],table.tbl-horizontal td>input[type="checkbox"],table.tbl-horizontal th>input[type="radio"],table.tbl-horizontal td>input[type="radio"]{margin:0 .3em .2em 0 !important}table.tbl-horizontal th>input,table.tbl-horizontal td>input,table.tbl-horizontal th>select,table.tbl-horizontal td>select{margin:-0.3em 1px 0 0}table.tbl-horizontal th>input.addition,table.tbl-horizontal td>input.addition,table.tbl-horizontal th>select.addition,table.tbl-horizontal td>select.addition{margin-top:.3em !important}table.tbl-horizontal th .label-above,table.tbl-horizontal td .label-above{display:block ;clear:both ;overflow:hidden ;margin-top:-0.5em}table.tbl-horizontal th.single-col,table.tbl-horizontal td.single-col{padding-top:0 ;padding-bottom:0 }table.tbl-horizontal th{color:#292914}table.tbl-horizontal th h4{margin:0 ;padding:0 }table.tbl-horizontal td>span{padding:0 ;margin:0 }table.tbl-horizontal td>span.wi-smallest{width:42px}table.tbl-horizontal td>span.wi-verysmall{width:80px}table.tbl-horizontal td>span.wi-small{width:92px}table.tbl-horizontal td>span.wi-mediumsmall{width:124px}table.tbl-horizontal td>span.wi-normal{width:172px}table.tbl-horizontal td>span.wi-lightwide{width:220px}table.tbl-horizontal td>span.wi-wide{width:284px}table.tbl-horizontal td>span.wi-wider{width:348px !important}table.tbl-horizontal td>span.wi-verywide{width:540px}table.tbl-horizontal td>span.data,table.tbl-horizontal td>span.plain-data{margin-top:-0.2em;display:block }table.tbl-horizontal td>span.label{color:#292914;padding:0 .3em .5em 0 !important}table.tbl-horizontal td>span.button-inline{margin:0 !important ;padding:.3em 0 0 0;clear:both ;display:inline-block;vertical-align:middle }table.tbl-horizontal td>span.button-inline input.button,table.tbl-horizontal td>span.button-inline input[type="button"],table.tbl-horizontal td>span.button-inline button,table.tbl-horizontal td>span.button-inline a.button{float:left ;margin:0 .3em 0 0 !important}table.tbl-horizontal td>span.customer_vendor_picker{padding:0 !important ;margin:0 !important ;display:inline-block}table.tbl-horizontal td>span.project_picker{margin:-0.3em 0 0 0}table.tbl-horizontal td>span.area-input{padding:0 !important ;margin:-0.3em 1px 0 0 !important}table.tbl-horizontal td>div.data{padding:.1363em 0}table.tbl-horizontal td .plus1{display:inline-block;padding:0 }table.tbl-horizontal td>.condensed{padding:0 !important ;margin:0 }table.tbl-horizontal td>.condensed input,table.tbl-horizontal td>.condensed select{margin-top:.2em}table.tbl-horizontal td>span.wi-small-wide{margin:0 24px 0 0 ;display:block }table.tbl-horizontal thead th{font-size:11pt;font-weight:normal;color:#292914 !important;padding:.2em 0 .2em .2em;margin:.1em 0 .4em 0;text-align:left;letter-spacing:.12em;border:none }table.tbl-horizontal.zebra tbody tr:nth-child(odd){background-color:#f5f5f1}table.tbl-horizontal.zebra tbody tr:nth-child(odd) th{background-color:#f5f5f1}table.tbl-horizontal.zebra tbody tr:nth-child(even){background-color:#e0e0d6}table.tbl-horizontal.zebra tbody tr:nth-child(even) th{background-color:#e0e0d6}table.tbl-horizontal.checkered{border-collapse:collapse }table.tbl-horizontal.checkered tbody tr{background-color:#e0e0d6}table.tbl-horizontal.checkered tbody tr td,table.tbl-horizontal.checkered tbody tr th{border-color:#666633;border-width:1px ;border-style:solid ;padding:.3em .6em}table.tbl-horizontal.expanded th.caption{padding-top:1.2em;padding-bottom:.6em}table.tbl-plain tbody td a,table.tbl-list tbody td a,table.tbl-list-plain tbody td a{display:inline-block !important}table.tbl-list{border-spacing:1px ;border-collapse:collapse ;margin:0 0 1em 0}table.tbl-list>caption{margin:.1em 0 0 0}table.tbl-list td,table.tbl-list th{padding:.2em .4em;white-space:normal ;vertical-align:middle }table.tbl-list>thead>tr th:first-child,table.tbl-list>tbody>tr th:first-child,table.tbl-list>tfoot>tr td:first-child{padding-left:.8em !important}table.tbl-list thead{display:table-header-group}table.tbl-list thead tr{height:2.2em}table.tbl-list thead tr th{color:#ffffff;background-color:#292914;border-top:1px solid #666633;border-bottom:1px solid #666633;text-align:left ;vertical-align:middle }table.tbl-list thead tr th.nowrap{white-space:nowrap !important }table.tbl-list thead tr th>a{display:block }table.tbl-list thead tr th>a:link,table.tbl-list thead tr th>a:visited{color:#e0e0d6;text-decoration:underline }table.tbl-list thead tr th>a:hover{color:#e0e0d6;text-decoration:underline }table.tbl-list thead tr th>a:active,table.tbl-list thead tr th>a:focus{color:#e0e0d6;text-decoration:underline }table.tbl-list thead tr th label{color:#e0e0d6}table.tbl-list thead tr th label:hover{text-decoration:underline }table.tbl-list thead.links-condensed tr th a{display:inline }table.tbl-list tbody{border-bottom:#666633 1px solid;display:table-row-group}table.tbl-list tbody tr:nth-child(odd){background-color:#f5f5f1}table.tbl-list tbody tr:nth-child(even){background-color:#e0e0d6}table.tbl-list tbody tr:nth-child(odd).listrow_ok{background-color:#3cff8a}table.tbl-list tbody tr:nth-child(even).listrow_ok{background-color:#a2ffc7}table.tbl-list tbody tr:nth-child(odd).listrow_error{background-color:#ffaeb7}table.tbl-list tbody tr:nth-child(even).listrow_error{background-color:#ffc8ce}table.tbl-list tbody tr:nth-child(odd).listrow_info{background-color:#93d7ee}table.tbl-list tbody tr:nth-child(even).listrow_info{background-color:#bfe7f5}table.tbl-list tbody tr:nth-child(odd).listrow_warning{background-color:#ffe38d}table.tbl-list tbody tr:nth-child(even).listrow_warning{background-color:#ffefc0}table.tbl-list tbody>tr:last-child>td{border-bottom:1px #666633 solid !important}table.tbl-list tbody tr:hover{background-color:#ffffff}table.tbl-list tbody tr.listrow0{background-color:#f5f5f1 !important}table.tbl-list tbody tr.listrow1{background-color:#e0e0d6 !important}table.tbl-list tbody tr.listrow_ok0{background-color:#3cff8a !important}table.tbl-list tbody tr.listrow_ok1{background-color:#a2ffc7 !important}table.tbl-list tbody tr.listrow_error0{background-color:#ffaeb7 !important}table.tbl-list tbody tr.listrow_error1{background-color:#ffc8ce !important}table.tbl-list tbody tr.listrow_info0{background-color:#93d7ee !important}table.tbl-list tbody tr.listrow_info1{background-color:#bfe7f5 !important}table.tbl-list tbody tr.listrow_warning0{background-color:#ffe38d !important}table.tbl-list tbody tr.listrow_warning1{background-color:#ffefc0 !important}table.tbl-list tbody td,table.tbl-list tbody th{color:#292914}table.tbl-list tfoot{display:table-footer-group}table.tbl-list-plain caption,table.tbl-plain caption,table.tbl-list-plain th.caption,table.tbl-plain th.caption{font-size:120% !important ;margin:0;padding:.6em 0 .2em 0}table.tbl-list-plain thead th,table.tbl-plain thead th,table.tbl-list-plain tbody th,table.tbl-plain tbody th,table.tbl-list-plain thead td,table.tbl-plain thead td,table.tbl-list-plain tbody td,table.tbl-plain tbody td{padding:3px .3em 4px .3em !important}table.tbl-list-plain thead th,table.tbl-plain thead th{color:#ffffff;background-color:#292914;border-top:1px solid #666633;border-bottom:1px solid #666633;text-align:left ;vertical-align:middle }table.tbl-list-plain tr th,table.tbl-plain tr th,table.tbl-list-plain tr td,table.tbl-plain tr td{padding:.3em inherit .3em .3em}table.tbl-list-plain.condensed caption,table.tbl-plain.condensed caption{padding-left:0 }table.tbl-list-plain.condensed td,table.tbl-plain.condensed td,table.tbl-list-plain.condensed th,table.tbl-plain.condensed th{padding:.1em 7px .1em 1px}table.tbl-list-plain.lined tr,table.tbl-plain.lined tr{border-bottom:1px #666633 solid}table.tbl-list-plain.lined tr>th,table.tbl-plain.lined tr>th,table.tbl-list-plain.lined tr>th,table.tbl-plain.lined tr>th{vertical-align:middle !important }table.tbl-list-plain thead th{border-top:1px #666633 solid !important;border-bottom:1px #666633 solid;font-weight:bold }table.tbl-list-plain tbody td,table.tbl-list-plain tbody th{border-bottom:1px #666633 solid}table.tbl-dialog th,table.tbl-dialog td{background-color:#eeeeee}table.tbl-dialog th{color:#ffffff;font-size:11pt;vertical-align:top }table.clear{float:none ;clear:both }table.test th,table.test-plain th{background-color:#b3b3b3;color:#0e0e07;font-weight:normal }table.test th.caption,table.test-plain th.caption{background-color:#b3b3b3}table.test td,table.test-plain td{background-color:#cfcdd2}table.test td.longdesc,table.test-plain td.longdesc,table.test td.longdescription,table.test-plain td.longdescription,table.test td.long-desc,table.test-plain td.long-desc,table.test td.long-description,table.test-plain td.long-description{border:1px solid green !important }table.test table,table.test-plain table{border:1px #0000ff solid;border-collapse:collapse }table.test table td,table.test-plain table td,table.test table th,table.test-plain table th{border:1px #c20d18 dotted !important}table.test th{border:1px #666666 solid !important;background-color:#b3b3b3;color:#000;font-weight:normal }table.test th.caption{background-color:transparent}table.test td{border:1px #000 solid;background-color:#cfcdd2}table.test td.longdesc,table.test td.longdescription,table.test td.long-desc,table.test td.long-description{border:1px solid green !important }table.test table{border:2px #0000ff solid;border-collapse:collapse }table.test table td,table.test table th{border:1px #c20d18 dotted !important}table.wi-smallest,table colgroup col.wi-smallest{width:42px}table.wi-verysmall,table colgroup col.wi-verysmall{width:80px}table.wi-small,table colgroup col.wi-small{width:128px}table.wi-mediumsmall,table colgroup col.wi-mediumsmall{width:160px}table.wi-normal,table colgroup col.wi-normal{width:208px}table.wi-lightwide,table colgroup col.wi-lightwide{width:256px}table.wi-wide,table colgroup col.wi-wide{width:320px}table.wi-wider,table colgroup col.wi-wider{width:384px}table.wi-verywide,table colgroup col.wi-verywide{width:576px}table.wi-small-small,table colgroup col.wi-small-small{width:256px}table.wi-small-mediumsmall,table colgroup col.wi-small-mediumsmall{width:288px}table.wi-small-normal,table colgroup col.wi-small-normal{width:336px}table.wi-small-lightwide,table colgroup col.wi-small-lightwide{width:384px}table.wi-small-wide,table colgroup col.wi-small-wide{width:484px}table.wi-small-wider,table colgroup col.wi-small-wider{width:512px}table.wi-small-verywide,table colgroup col.wi-small-verywide{width:704px}table.wi-mediumsmall-small,table colgroup col.wi-mediumsmall-small{width:416px}table.wi-mediumsmall-mediumsmall,table colgroup col.wi-mediumsmall-mediumsmall{width:320px}table.wi-mediumsmall-normal,table colgroup col.wi-mediumsmall-normal{width:368px}table.wi-mediumsmall-lightwide,table colgroup col.wi-mediumsmall-lightwide{width:416px}table.wi-mediumsmall-wide,table colgroup col.wi-mediumsmall-wide{width:480px}table.wi-mediumsmall-wider,table colgroup col.wi-mediumsmall-wider{width:544px}table.wi-mediumsmall-verywide,table colgroup col.wi-mediumsmall-verywide{width:736px}table.wi-normal-small,table colgroup col.wi-normal-small{width:336px}table.wi-normal-mediumsmall,table colgroup col.wi-normal-mediumsmall{width:368px}table.wi-normal-normal,table colgroup col.wi-normal-normal{width:416px}table.wi-normal-lightwide,table colgroup col.wi-normal-lightwide{width:464px}table.wi-normal-wide,table colgroup col.wi-normal-wide{width:528px}table.wi-normal-wider,table colgroup col.wi-normal-wider{width:592px}table.wi-normal-verywide,table colgroup col.wi-normal-verywide{width:784px}table.wi-lightwide-small,table colgroup col.wi-lightwide-small{width:384px}table.wi-lightwide-mediumsmall,table colgroup col.wi-lightwide-mediumsmall{width:416px}table.wi-lightwide-normal,table colgroup col.wi-lightwide-normal{width:464px}table.wi-lightwide-lightwide,table colgroup col.wi-lightwide-lightwide{width:512px}table.wi-lightwide-wide,table colgroup col.wi-lightwide-wide{width:576px}table.wi-lightwide-wider,table colgroup col.wi-lightwide-wider{width:640px}table.wi-lightwide-verywide,table colgroup col.wi-lightwide-verywide{width:832px}table.width-full,table.full-width,table.wi-full{width:100% }table.width-moderate,table.moderate-width,table.wi-moderate{width:auto }table.width-moderate td,table.moderate-width td,table.wi-moderate td,table.width-moderate th,table.moderate-width th,table.wi-moderate th{padding-left:.6em;padding-right:1.2em}div.wrapper table.tbl-list tr,div.cols table.tbl-list tr{border-left:1px solid #666633;border-right:1px solid #666633}#content .ui-tabs-panel>table.tbl-list caption{margin-left:.3em}#content .ui-tabs-panel>table.tbl-list caption{margin-left:.3em}#content>table.tbl-plain,#content>table.tbl-list-plain{margin-top:1em}span.sort{display:inline-block;height:100% ;vertical-align:top;padding-top:6px}span.sort_symbol{display:inline-block;width:10px ;padding:0 ;margin:0 10px 0 0 }span.sort_symbol a{display:block ;width:8px ;height:8px ;font-size:7pt ;padding:0 0 3px 0 ;margin:0 ;text-align:center ;clear:both ;float:none ;vertical-align:top }span.sort_symbol a.ascending{border-top:1px #666633 solid;border-right:1px #666633 solid;border-left:1px #666633 solid}span.sort_symbol a.descending{border-right:1px #666633 solid;border-bottom:1px #666633 solid;border-left:1px #666633 solid}span.sort_symbol a.active{color:#ffffff}span.sort_symbol a:link,span.sort_symbol a:visited{color:#ccb}table#report_table_id.tbl-list>tbody>tr>td{vertical-align:top }table#konten-plan tbody tr td:first-child{text-align:right !important}table#konten-plan tbody tr.heading td{font-size:14pt;border-top:1px #999 solid}table#konten-plan tr:first-child.heading td{border:none}table#eurtable{border-collapse:collapse;width:100%}table tr.chart{border:0}table td.chartname{padding-left:50px}table tr.chartrow{font-size:75%}table .guv_row_background{background:#f0f0f0}table .tr_error{background-color:#ffc9c9}ul{list-style-type:disc;list-style-position:outside;list-style-image:none;padding:0 0 0 1.4em;margin:.4em 0 .4em 0}ul.footnotes{list-style-type:none !important ;list-style-position:outside ;margin:0 0 0 1.8em !important}ul.footnotes li sup{display:inline-block;margin:0 .6em 0 -2.6em;padding:0}ul.footnotes li>ul{position:relative;list-style-type:circle ;list-style-position:outside ;margin:.3em 0 .3em 1.4em !important}ul li ul{list-style-type:circle ;list-style-position:outside }div.table{margin-bottom:1em}div.table.col{float:left ;margin-right:1.6em}div.table div.caption{clear:left ;display:block ;font-weight:bold ;color:#292914}div.table div.field{clear:left ;display:block ;overflow:hidden ;margin-right:2em}div.table div.field span.label{display:inline-block;float:left ;min-width:12em;width:auto}div.table div.field span.value{display:inline-block;float:left ;min-width:12em;width:auto}div.list{font-size:10pt;color:#0e0e07}div.list.col{float:left ;margin-right:2.6em !important;width:auto ;min-width:110px }div.list h4{padding:.6em 0 .2em 0 !important;margin:.2em 0 0 0;font-weight:normal;font-size:11pt;font-family:"Helvetica Neue",Helvetica,Arial;color:#292914}div.list>p,div.list>div{padding:.2em 0 .2em 0 !important;margin:0 !important ;white-space:normal }div.list>p>input[type="checkbox"],div.list>div>input[type="checkbox"],div.list>p>input[type="radio"],div.list>div>input[type="radio"]{padding:0 ;margin:0 .3em .3em 0;float:left }div.list>p label,div.list>div label{width:auto ;float:left }div.list>p{overflow:hidden }div.list>input[type="checkbox"]{clear:both;float:left;margin-right:.4em}div.list>label{width:82% }div.list div{clear:left}div.list>div.no-rows>input[type="checkbox"],div.list>div.no-rows>input[type="radio"]{padding:0 ;margin:.3em .3em 0 0;clear:left }div.list>div.no-rows label{width:82% ;float:left }div.list-table-with-separate-total-table div.full-width{padding-bottom:0 ;margin-bottom:0 }div.list-table-with-separate-total-table div.full-width .tbl-list{margin-bottom:0 }div.list-table-with-separate-total-table div.list-total{width:100% ;margin:0 ;padding:0 ;overflow:hidden }div.list-table-with-separate-total-table div.list-total table.footer-only{margin:0 ;padding:0 }div.list-table-with-separate-total-table div.list-total table.footer-only.right{float:right }input[type="button"],input[type="submit"],input[type="reset"],button{display:inline-block;cursor:pointer ;width:auto ;padding:.2em .6em;font-size:9pt;font-weight:normal;font-style:normal;text-align:center;border-style:solid;border-width:1px;border-radius:6px}input[type="button"].clear,input[type="submit"].clear,input[type="reset"].clear,button.clear{clear:left}input[type="button"].wi-verysmall,input[type="submit"].wi-verysmall,input[type="reset"].wi-verysmall,button.wi-verysmall{min-width:80px}input[type="button"].wi-small,input[type="submit"].wi-small,input[type="reset"].wi-small,button.wi-small{min-width:92px}input[type="button"].wi-mediumsmall,input[type="submit"].wi-mediumsmall,input[type="reset"].wi-mediumsmall,button.wi-mediumsmall{min-width:124px}input[type="button"].wi-normal,input[type="submit"].wi-normal,input[type="reset"].wi-normal,button.wi-normal{min-width:172px}input[type="button"].wi-lightwide,input[type="submit"].wi-lightwide,input[type="reset"].wi-lightwide,button.wi-lightwide{width:220px}input[type="button"].wi-wide,input[type="submit"].wi-wide,input[type="reset"].wi-wide,button.wi-wide{width:284px}input[type="button"].wi-wider,input[type="submit"].wi-wider,input[type="reset"].wi-wider,button.wi-wider{width:348px}input[type="button"].wi-verywide,input[type="submit"].wi-verywide,input[type="reset"].wi-verywide,button.wi-verywide{width:540px}input[type="button"].wi-tiny,input[type="submit"].wi-tiny,input[type="reset"].wi-tiny,button.wi-tiny{width:auto ;padding:.16em .2em .1em .2em;margin:-0.3em 0 0 .2em;display:inline-block;font-size:84% ;min-height:23px;max-height:23px}input[type="button"].wi-verytiny,input[type="submit"].wi-verytiny,input[type="reset"].wi-verytiny,button.wi-verytiny{font-size:8pt !important;padding:0 .3em .1em .3em;display:inline-block;min-height:17px;max-height:17px}button.icon{padding:0 ;margin:0 ;background:none !important;border:0 !important;display:inline-block}button.icon img{vertical-align:middle }input[type="submit"],input[type="button"],input[type="button"].button,button[type="submit"],button[type="button"]{color:#fff;background-color:#406449;border:1px #406449 solid}input[type="submit"]:hover,input[type="button"]:hover,input[type="button"].button:hover,button[type="submit"]:hover,button[type="button"]:hover{color:#fff;background-color:#548360;border:1px #548360 solid}input[type="submit"]:active,input[type="button"]:active,input[type="button"].button:active,button[type="submit"]:active,button[type="button"]:active,input[type="submit"]:focus,input[type="button"]:focus,input[type="button"].button:focus,button[type="submit"]:focus,button[type="button"]:focus{color:#fff;background-color:#548360;border:1px #548360 solid}input[type="button"].neutral,input[type="submit"].neutral,input[type="reset"],input[type="reset"].neutral,button.neutral,button[type="reset"]{color:#1b1b0e;background-color:#e0e0d6;border:1px #292914 solid}input[type="button"].neutral:hover,input[type="submit"].neutral:hover,input[type="reset"]:hover,input[type="reset"].neutral:hover,button.neutral:hover,button[type="reset"]:hover{color:#1b1b0e;background-color:#f5f5f1;border:1px #292914 solid}input[type="button"].neutral:active,input[type="submit"].neutral:active,input[type="reset"]:active,input[type="reset"].neutral:active,button.neutral:active,button[type="reset"]:active,input[type="button"].neutral:focus,input[type="submit"].neutral:focus,input[type="reset"]:focus,input[type="reset"].neutral:focus,button.neutral:focus,button[type="reset"]:focus{color:#000;background-color:#666633;border:1px #0e0e07 solid}input[type="button"].neutral.positions,input[type="submit"].neutral.positions,input[type="reset"].positions,input[type="reset"].neutral.positions,button.neutral.positions,button[type="reset"].positions{padding-right:1.2em}input[type="button"].below{clear:both !important;float:none;overflow:hidden }a.button{display:inline-block;cursor:pointer ;width:auto ;padding:.2em .6em;font-size:9pt;font-weight:normal;font-style:normal;text-align:center;border-style:solid;border-width:1px;border-radius:6px;border:1px #406449 solid;background-color:#406449;color:#fff;text-decoration:none}a.button.below{clear:both !important}a.button:hover{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}a.button:active,a.button:focus{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}a.button.neutral:link,a.button.neutral:visited{border:1px #292914 solid;background-color:#e0e0d6;color:#1b1b0e}a.button.neutral:hover{border:1px #292914 solid;background-color:#f5f5f1;color:#1b1b0e;text-decoration:none}a.button.neutral:active,a.button.neutral:focus{border:1px #0e0e07 solid;background-color:#666633;color:#000;text-decoration:none}a.button.wi-smallest{width:42px}a.button.wi-verysmall{width:80px}a.button.wi-small{width:92px}a.button.wi-mediumsmall{width:124px}a.button.wi-normal{width:172px}a.button.wi-lightwide{width:220px}a.button.wi-wide{width:284px}a.button.wi-wider{min-width:348px}a.button.wi-verywide{min-width:540px}a.button.wi-tiny{display:inline-block;width:auto ;padding:.16em .2em .1em .2em;margin:-0.3em 0 0 .2em;font-size:84% }a.button.toggle{background-color:#f5f5f1 !important}a.button.toggle.off::after{content:" ▸";padding-right:1em}a.button.toggle.on::after{content:" ▾";padding-right:1em}a.button.toggle.with-panel{margin-bottom:0 ;border-bottom:none;border-bottom-left-radius:0px ;border-bottom-right-radius:0px }a.button.toggle.with-panel:hover{border-top:1px #666633 solid !important;border-right:1px #666633 solid !important;border-bottom:0 !important;border-left:1px #666633 solid !important}a.button.toggle:hover{background-color:#e0e0d6 !important;border:1px #666633 solid !important;color:#1b1b0e;text-decoration:none}#content label.button{display:inline-block;cursor:pointer ;width:auto ;padding:.2em .6em;font-size:9pt;font-weight:normal;font-style:normal;text-align:center;border-style:solid;border-width:1px;border-radius:6px;border:1px #406449 solid;background-color:#406449;color:#fff;text-decoration:none}#content label.button:hover{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}#content label.button:active,#content label.button:focus{border:1px #548360 solid;background-color:#548360;color:#fff;text-decoration:none}#content label.button.neutral{border:1px #292914 solid;background-color:#e0e0d6;color:#1b1b0e}#content label.button.neutral:hover{border:1px #292914 solid;background-color:#f5f5f1;color:#1b1b0e;text-decoration:none}#content label.button.neutral:active,#content label.button.neutral:focus{border:1px #0e0e07 solid;background-color:#666633;color:#000;text-decoration:none}div.buttons{padding:1em;clear:left ;display:block}div.buttons.positions{margin:0 0 -1.7em 26em;padding:0em}div.buttons.positions label.button.neutral,div.buttons.positions input.positions{border-bottom-left-radius:0 !important;border-bottom-right-radius:0 !important;padding-bottom:.6em !important;margin-bottom:-0.8em !important;background:none !important;border-bottom:none !important}div.buttons.below{padding:0 ;margin:0 }.col>.buttons,.wrapper * .buttons{padding:1em 1em 1em 0 !important}.button-image{display:inline-block}td .button-image,th .button-image{vertical-align:middle}input[type="button"].button-image.delete{background-image:url("image/cross2.png");background-repeat:no-repeat;background-position:0 0;color:#fff;background-color:transparent;border-color:none;border-width:0}.control-panel{border:1px #666633 solid !important;background-color:#f5f5f1;background:linear-gradient(to top, #ccb, #f5f5f1);border-radius:.6em;overflow:hidden }.control-panel span.label{padding-right:.6em}.form-addition{padding:.8em 1em 1.4em 1.2em !important;margin:1em 1em 1em 1.2em !important;width:auto !important ;display:inline-block}.form-addition h3{margin:.3em 0 .1em 0 !important;padding:0 }.form-addition h4{color:#292914 !important;font-size:11pt;font-weight:normal;font-style:normal}.form-addition div.list{margin-top:.2em !important}.select-item{display:inline-block;width:auto ;height:auto;padding:.6em 1em .6em .8em;margin:1em 1em 1em 1.2em;color:#292914;font-size:9pt;border:1px #666633 solid;border-radius:.6em;background-color:#f5f5f1;background:linear-gradient(to top, #ccb, #f5f5f1)}.select-item input,.select-item select{margin-left:.6em}.select-item span.label{float:left ;color:#292914}.select-item table{margin:0 }.select-item table td,.select-item table th{color:#292914}.select-item .floating-boxes{display:table ;margin:.4em 0 .8em 0}.select-item .floating-boxes .floating-box{display:table-cell;float:left ;font-size:9pt;height:1.9em;vertical-align:middle;padding:0 2em 0 0}.select-item .floating-boxes .floating-box .button,.select-item .floating-boxes .floating-box button{margin:0 }.select-item .floating-boxes .floating-box label,.select-item .floating-boxes .floating-box span.label{width:auto;display:inline-block;height:160%}.select-item .floating-boxes .floating-box input[type="checkbox"]{margin:0 .4em 0 0}.select-item .floating-boxes .floating-box select{margin:-0.3em 0 0 0}.ui-tabs-panel>.select-item{margin:1em 1em 1em 1.2em;vertical-align:top }.wrapper>.select-item{margin:.8em 0 1em 0}div.filtered_select input,div.filtered_select select{display:block}div.filtered_select input{background-image:url(../../../image/glass14x14.png);background-repeat:no-repeat;background-position:2px 2px;border-radius:0px;border:solid #a0a0a0 1px;border-bottom:none;padding:0px;padding-left:20px;margin:0;width:500px}div.filtered_select select{width:522px}.toggle_panel.control-panel{border:none !important;background:none !important;border-radius:0 !important;overflow:visible !important}.toggle_panel>a.button.toggle{padding:.2em 0 .2em 1.4em}.toggle_panel>a.button.toggle:hover{background-color:#f5f5f1 !important;text-decoration:underline }.toggle_panel span.summary{font-size:10pt;padding-left:2em;color:#292914}.toggle_panel .toggle_panel_block{display:block;overflow:hidden;padding:1.2em 1em .8em .9em;margin:2em 1em 0em 0;background-color:#f5f5f1;border:1px #666633 solid;border-bottom-left-radius:.6em;border-bottom-right-radius:.6em;border-top-right-radius:.6em;margin-top:-1px}.toggle_panel .toggle_panel_block .buttons{clear:left ;padding:0 !important;margin:0}.toggle_panel .tbl-horizontal{margin-right:1.6em}#content .input-panel{display:inline-block;overflow:hidden ;padding:.4em 1em .6em .9em;margin:1.6em 0 .4em 0;background-color:#f5f5f1;border:1px #666633 solid;border-radius:.6em;width:auto ;min-width:30% }#content .input-panel>h3{margin-top:0 }#content .input-panel p{font-size:9pt;margin:0 0 .4em 0}#content .input-panel table.condensed{margin-bottom:.1em}#content .input-panel table.condensed caption{padding-top:.1em}#content .input-panel table.condensed td span.label{padding-right:.6em}#content .input-panel table.condensed td span.label.above{margin-bottom:0em }#content .ui-tabs-panel>.input-panel{margin-left:1.2em}#content .input-panel.short{min-width:160px}.paginate{display:inline-block;width:auto ;height:auto ;padding:0 ;margin:1em 1em 1em 1.2em;border:1px #666633 solid;border-radius:.6em;background-color:#f5f5f1;color:#292914}.paginate>a,.paginate>span{padding:.4em .6em !important;margin-top:-1px}.paginate .paginate-prev{display:inline-block}.paginate .paginate-prev::before{content:"◄"}.paginate .paginate-prev:hover{border-bottom-left-radius:.6em;border-top-left-radius:.6em}.paginate .paginate-next{display:inline-block}.paginate .paginate-next::after{content:"►"}.paginate .paginate-next:hover{border-bottom-right-radius:.6em;border-top-right-radius:.6em}.paginate .paginate-page{display:inline-block;padding:0 }.paginate span.paginate-page{background-color:#1b1b0e;color:#e0e0d6}.paginate a:hover,.paginate a:active{background-color:#000;color:#ccb;text-decoration:none}table.jump-to{border:1px #666633 solid;border-radius:.6em;background-color:#f5f5f1;margin:.8em 2em 0 1.2em !important}table.jump-to.right{float:right}div.float-cells-table{display:block ;width:100% ;overflow:hidden;font-size:80% }div.float-cells-table div.caption{float:left;display:block;width:auto;padding:0 2em 0 0;margin:0}div.float-cells-table div.cells{float:left;display:block;overflow:hidden;width:100%;background-color:#F66}div.float-cells-table div.cells div.cell{float:left;padding:0 2em 0 0;border-right:1px #fff solid;background-color:#FC6}#content>p,#content>div,#content>td,#content>th{font-size:9pt}#content input,#content select,#content option,#content textarea{font-size:9pt}h1{display:block;text-align:left;margin:0;font-weight:normal;font-size:12pt;line-height:1.2em}#content>h1{position:fixed;z-index:1020;top:60px;width:100%;color:#fff;background-color:#406449;padding:.7em .5em .7em 1.3em;border-top:1px #666633 solid}#content .wrapper h1{color:#000;font-size:13pt;margin:1.6em 0 .4em 0}body>h1{color:#fff;background-color:#406449;padding:.7em .5em .7em 1.3em}h2{color:#000;font-size:13pt;border-style:none;letter-spacing:.14em}#content>h2,.admin>h2{padding:.6em .2em;margin:.6em 0 0 0}#content ui-tabs-panel .wrapper>h2,.admin ui-tabs-panel .wrapper>h2{padding:0 .2em .6em .2em;margin:1.6em 0 .4em 0}#content .wrapper>h2,.admin .wrapper>h2{padding:2em .2em .6em .2em;margin:0 ;font-weight:normal;clear:both}#content .wrapper>h2:first-child,.admin .wrapper>h2:first-child{padding-top:0 }h2.confirm{color:#003c18}h2.error{color:#ae0014}h2.record-title{padding:.6em 0 0 0 !important;font-size:13pt;color:#000}h2.record-title small{color:#000;letter-spacing:0 }.wrapper>h2.record-title{margin:0 1em 1em .2em !important}.ui-tabs-panel>h2.record-title{margin:1em 1em .2em 1.2em !important;padding:.8em 0 0 .1em !important}h3{font-size:11pt;font-weight:normal;color:#292914 !important;padding:.2em 0 .2em .2em;margin:.1em 0 .4em 0;text-align:left;letter-spacing:.12em}h3.caption{margin:.6em 0 .4em 0 !important}#content h3{color:#000;padding-left:0 ;margin:.8em 0 .4em 0}#content .wrapper h3{margin-top:1em}#content .wrapper h3:first-child{margin-top:0 }#content table.tbl-horizontal>tbody>tr>th>h3,#content table.tbl-horizontal>tbody>tr>td>h3{margin-top:.2em !important}a{text-decoration:underline;font-weight:bold}a:link,a:visited,a:active{color:#2962ce}a:hover{color:#4e7fdc;text-decoration:underline}a.selected:hover{color:#EBEBEB}a.nomobile{background-color:transparent;border:none}a.green{background-color:DarkGreen;color:white !important;border:none}a.orange{background-color:#FF8000;border:none}a.red{background-color:#FF0000;border:none}ul,ol{font-size:11pt}ul li,ol li{font-size:10pt}.wrapper .col ul{list-style:circle outside;padding:0 ;margin:0 }.wrapper .col ul li{padding:0 0 0 -0.6em;margin:0 0 0 0 }hr{background-color:#666633;border:none;height:2px}div.wi-smallest,span.wi-smallest,div.list.wi-smallest{width:42px}div.wi-verysmall,span.wi-verysmall,div.list.wi-verysmall{width:80px}div.wi-small,span.wi-small,div.list.wi-small{width:128px}div.wi-mediumsmall,span.wi-mediumsmall,div.list.wi-mediumsmall{width:160px}div.wi-normal,span.wi-normal,div.list.wi-normal{width:208px}div.wi-lightwide,span.wi-lightwide,div.list.wi-lightwide{width:256px}div.wi-wide,span.wi-wide,div.list.wi-wide{width:320px}div.wi-wider,span.wi-wider,div.list.wi-wider{width:384px}div.wi-verywide,span.wi-verywide,div.list.wi-verywide{width:576px}div.long-description,div.long-desc,div.longdescription,div.longdesc{font-size:9pt}div.long-description.small,div.long-desc.small,div.longdescription.small,div.longdesc.small{font-size:9pt}div.long-description p,div.long-desc p,div.longdescription p,div.longdesc p{margin:0 0 .6em 0}div.long-description ul,div.long-desc ul,div.longdescription ul,div.longdesc ul,div.long-description ol,div.long-desc ol,div.longdescription ol,div.longdesc ol{margin-top:0 }div.long-description ul li,div.long-desc ul li,div.longdescription ul li,div.longdesc ul li,div.long-description ol li,div.long-desc ol li,div.longdescription ol li,div.longdesc ol li{font-size:9pt}div.description{display:block;float:left ;padding:0 0 .6em 0}div.description.wi-verysmall{width:80px}div.description.wi-small{width:128px}div.description.wi-mediumsmall{width:160px}div.description.wi-normal{width:208px}div.description.wi-wide{width:320px}div.description.wi-lightwide{width:256px}div.description.wi-wider{width:384px}div.description.wi-verywide{width:576px}div.instructions{background-color:#f5f5f1;border:1px #666633 solid;border-radius:.6em;max-width:70% ;margin:1em 1em 1em 1.2em;padding:.6em 1em 1.2em 1.8em;color:#4C4C4C;font-size:80%}div.instructions p{width:30em}span.label{font-size:9pt;font-style:normal }span.value{color:#000}.center{margin:0 auto;width:auto}.accent div.label{float:left ;font-size:80% ;padding-top:.8em}.accent div.data{float:left }.accent div.data input[type="text"]{width:20em !important }pre.filecontent{border:1px solid blue;padding-left:2px;padding-right:2px}.hidden{display:none }.pre-wrap{white-space:pre-wrap}.overflow-visible{overflow:visible}.height-auto{height:auto}.wrapper{overflow:hidden ;margin:1em 1em 1em 1.2em;padding:0 0 1em 0;clear:both ;display:block ;border:1px transparent solid ;width:98.6%}.wrapper .wrapper{margin-left:0 !important }.wrapper.test{background-color:#FFE67C}.wrapper .tbl-horizontal,.wrapper .tbl-plain{float:left }.wrapper>table.tbl-horizontal:last-child{margin-right:0 }.wrapper.toggled{display:inline-block !important;width:98.6%}.wrapper.toggled>table.tbl-horizontal,.wrapper.toggled>div.col{margin-top:-1.8em}.wrapper.toggled>.toggles{display:block ;position:relative     ;top:0            ;margin-top:4px          ;float:right        ;width:100% }.wrapper.toggled>.toggles a.toggle{display:block;width:100% ;height:18px ;background-repeat:no-repeat;background-position:50% 50%}.wrapper.toggled>.toggles a.toggle.min,.wrapper.toggled>.toggles a.toggle.max{background-position-x:99% }.wrapper.toggled>.toggles a.toggle.min{background-image:url(../../image/toggle-down.png)}.wrapper.toggled>.toggles a.toggle.max{background-image:url(../../image/toggle-left.png)}.wrapper.bordered{border:1px #666633 solid;border-radius:4px }.wrapper .col{float:left }.wrapper .col.test{background-color:#FFD7BA;border:1px #6CF solid}.wrapper .col.wi-small{width:128px}.wrapper .col.wi-mediumsmall{width:160px}.wrapper .col.wi-normal{width:208px}.wrapper .col.wi-wide{width:320px}.wrapper .col.wi-lightwide{width:256px}.wrapper .col.wi-wider{width:384px}.wrapper .col.wi-verywide{width:576px}.wrapper .col .tbl-horizontal,.wrapper .col .tbl-plain{float:none ;clear:left }.wrapper>p{max-width:36em;overflow:hidden ;font-size:9pt;line-height:140%;padding-bottom:1em}.horizontal-scroll-wrapper{overflow-x:auto !important}.scroll{overflow:scroll !important}.panel-wrapper{display:flex !important;flex-wrap:wrap;gap:5px}.plus,.minus,.plus0,.plus1{clear:none}.minus,.plus0{color:#ae0014 !important}.plus,.plus1{color:#003c18 !important}span.unbalanced_ledger{background-color:#ffe38d}div.dimmed-text,span.dimmed-text{color:#888888;font-style:italic}.dunned_invoice{font-weight:bold;color:#f00}.customer_dunning_level{font-weight:bold;height:auto !important}#dunning_invoice_list .direct_debit td,#dunning_invoice_list .direct_debit a{color:#888888}#bank_transactions_proposals .invoice_number_highlight a,#bank_transactions_proposals span.invoice_number_highlight{background-color:#003c18;color:#FFFFFF}.spacer{clear:both}#content>p{margin:.6em 2em 1em .7em}#content>p.message_hint{margin:.6em 2em 1em 1em}div#login,div.login{margin:0 auto;width:100%;padding:0 ;text-align:center }div#login h1,div.login h1{text-align:center;font-size:150%;top:0 ;width:100% ;display:block ;vertical-align:middle;background-color:green ;color:white ;padding:.8em 0;z-index:10 }div#login #login-elements,div.login #login-elements{width:34em;margin:0 auto ;text-align:center ;display:block }div#login #login-elements h3,div.login #login-elements h3{text-align:left}div#login #login-elements>div,div.login #login-elements>div{text-align:center }div#login #login-elements>div p,div.login #login-elements>div p{text-align:center}div#login #login-elements div.logo,div.login #login-elements div.logo{width:auto;clear:both;margin:3em auto 1em auto;padding:2em 0 0 0}div#login #login-elements form,div.login #login-elements form{margin:0 auto ;width:100% }div#login #login-elements div.separate-form,div.login #login-elements div.separate-form{background-color:#ddd;border:1px #888888 solid;border-radius:.6em;display:block ;margin:0 auto ;width:100% ;padding:0 .6em 1em .6em}div#login #login-elements table.login,div.login #login-elements table.login{width:auto ;float:none ;clear:both }div#login #login-elements table.login input[type="submit"],div.login #login-elements table.login input[type="submit"]{margin-top:.2em}div#login #login-elements table.login caption,div.login #login-elements table.login caption{margin:.7em 0 .4em 0}div#login #login-elements table.login td select,div.login #login-elements table.login td select{width:220px !important}div#login #login-elements .message,div.login #login-elements .message{width:100% ;word-wrap:normal ;min-width:0}div.logged-in{margin:0 auto ;padding:1em .5em 2em .5em;width:60em;min-width:60em;overflow:hidden}div.logged-in .col{width:48%;display:inline-block;float:left}div.logged-in .col p{font-size:10pt }div.logged-in .message{width:100% ;min-width:100% ;max-width:100% }#requirement_spec_version{padding:.6em 1em 1.2em 1.8em;letter-spacing:.16em;font-size:110% }#column-container{padding-left:0;padding-right:0;margin-left:0;margin-top:.2em;margin-right:0;overflow:hidden }#column-container #tree-column{float:left;width:30em;padding:.3em 1.2em 2em .8em;border-right:1px #000 solid;background-color:none}#column-container #tree-column .jstree>ul{width:342px;overflow-x:hidden}#column-container #tree-column .jstree ul li{line-height:1.8em;padding:0 ;font-size:10pt}#column-container #tree-column .jstree ul li a{border-bottom:none;width:98% }#column-container #tree-column #tree li.flagged>a>ins{background-image:url("../../image/flag-red.png") !important;background-position:0}#column-container #content-column{float:left;width:58em;padding-left:3em;background-color:none}#column-container #content-column #column-content .section{border-left:0;margin-left:0}#column-container #content-column #column-content .section .section-header{display:block ;overflow:hidden;width:90% }#column-container #content-column #column-content .section .section-header h3{font-size:140%;letter-spacing:.16em}#column-container #content-column #column-content .section .section-header h3 span.label{font-size:90% ;font-weight:bold;letter-spacing:.1em;color:#292914}#column-container #content-column #column-content .section .section-header .section-description{margin-bottom:15px;margin-left:0}#column-container #content-column #column-content .section .section-header .section-description div{padding:.3em 0 .4em 0}#column-container #content-column #column-content .section .section-header .section-description div .section-description-heading{font-weight:normal;font-size:100% ;padding:0 0 0 0;display:block}#column-container #content-column #column-content .section .section-header .section-description div span.label{font-size:90%}#column-container #content-column #column-content .section .section-header .section-description div p{color:#000;font-size:106%;line-height:1.5em;margin:0 0 .3em 0}#column-container #content-column #column-content .section .section-header .section-context-menu h3{background-color:#000;color:#000 !important}#column-container #content-column #column-content .section .section-header .section-context-menu h3 span.label{font-weight:normal}#column-container #content-column #column-content .section .section-header #section-list-empty{border:1px #0C42FF solid;background-color:#BBCDFF;padding:.6em}#column-container #content-column #column-content .function-block{border-top:1px solid #bbb;margin:0 ;padding:.8em 0 1.8em 0;overflow:hidden;display:block;clear:both;float:none;width:48em}#column-container #content-column #column-content .function-block .function-block-content{overflow:hidden ;padding:0 0 0 .6em}#column-container #content-column #column-content .function-block .function-block-content .function-block-header{clear:both;overflow:hidden}#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-number{font-weight:normal;width:5em;display:block;float:left}#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc{display:inline-block;overflow:hidden;float:left;width:80%;padding-bottom:1em;font-weight:normal}#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc p{margin:0 0 .6em 0;padding:0 }#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc p:first-child{font-weight:bold }#column-container #content-column #column-content .function-block .function-block-content .function-block-properties{display:block ;margin:0 0 0 5em;padding:0 ;overflow:hidden;clear:both;font-size:9pt}#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.label,#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.value{float:left}#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.label{width:110px }#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.value{width:200px;padding:0 30px 0 0;margin:0}#column-container #content-column #column-content .function-block .sub-function-block-container{margin:1.8em 0 0 5.1em;display:block}#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block-header{border-top:1px solid #ccc;padding:.4em 0 .4em .6em;font-size:86% ;letter-spacing:.2em}#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block{border-top:1px solid #ccc;margin:.2em 0 .2em 0;padding:.2em 0 .4em 0}#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block .sub-function-block-content{margin:.2em 0 .2em 0;padding:.2em .6em .4em .6em}#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block .sub-function-block-content .sub-function-block-header{font-weight:normal;font-size:120% ;color:#666666;margin-top:1em}#column-container #content-column #column-content .function-block-form>div{padding:.4em}#column-container #content-column #column-content .section.flagged .section-description,#column-container #content-column #column-content .function-block.flagged,#column-container #content-column #column-content .sub-function-block.flagged{background-color:#ebf8fc}#column-container #content-column #column-content .section.flagged .section-description>.section-description-heading,#column-container #content-column #column-content .function-block.flagged>.function-block-content>div>.function-block-number,#column-container #content-column #column-content .sub-function-block.flagged>.sub-function-block-content>div>.function-block-number{color:#209ec8}#column-container #content-column #column-content .section.selected,#column-container #content-column #column-content .function-block.selected,#column-container #content-column #column-content .sub-function-block.selected{margin-left:-3px;border-left:3px solid #24D115}.section-empty-description{color:#bbb}#requirement_spec_tabs #function-blocks-tab{margin-top:1.4em}.requirement-spec-text-block{border-left:0;margin-left:3px;margin-top:10px}.requirement-spec-text-block>h2{margin-top:0px}.requirement-spec-text-block.flagged>h2{color:#fff}.requirement-spec-text-block.selected{border-left:3px solid #cbb120;margin-left:0}.requirement-spec-text-block-picture-thumbnail{border-radius:5px;border:2px solid #ebebeb;float:left;margin-right:20px;padding:5px;text-align:center;width:130px}.requirement-spec-text-block-picture-thumbnail-img-container{height:64px;margin:auto;padding:0;width:64px}.requirement-spec-text-block-picture-thumbnail.selected{border:2px solid #cbb120}#time_cost_estimate p{margin-top:0;margin-bottom:0}#time_cost_estimate table tbody tr td{vertical-align:top }#time_cost_estimate table tbody tr td:first-child{width:66% }#time_cost_estimate table tbody tr.section th{line-height:2.2em;color:#000}#time_cost_estimate table tbody tr.section th b{font-size:116% }#time_cost_estimate table tbody tr.subtotal td,#time_cost_estimate table tbody tr.subtotal th{font-weight:bold ;background-color:#888888;border-top:1px #000 solid;border-bottom:1px #000 solid;text-align:right}div.function-block * table.tbl-horizontal td{font-size:66% !important }.jstree-requirement-spec .jstree-clicked{background:#cccccc !important;border:0 !important}#tbl-accounts{border-width:0}#tbl-accounts tbody tr.heading.heading th{border-top:1px #999 solid}#tbl-accounts tbody tr.heading.heading th.numeric{padding-right:20px;padding-left:10px}#tbl-accounts tbody tr.heading.th1{font-size:14pt}#tbl-accounts tbody tr.heading.th1 th{padding:1em 0 .4em 0}#tbl-accounts tbody tr.heading.th2{font-size:11pt}#tbl-accounts tbody tr.heading.th2 th{padding:1em 0 .4em 0}#tbl-accounts tbody tr.heading.th3{font-size:10pt}#tbl-accounts tbody tr.heading.th3 th{padding:1em 0 .4em 0}#tbl-accounts tbody td:first-child{text-align:right !important}#tbl-accounts tbody tr.ajax-account-details td{padding:.8em 0 1em 4em}td.row-position-detail{padding:0 0 .2em .4em !important}td.row-position-detail div.table{display:table}td.row-position-detail div.table div.field{display:table-row;padding:.1em 0;height:2em !important}td.row-position-detail div.table div.field span.label{width:10em;height:2em !important;vertical-align:middle;display:table-cell;padding:.3em 0 0 0}td.row-position-detail div.table div.field span.value{height:2em}td.row-position-detail div.table div.field span.value span.data{padding:.3em 0 .2em .5em !important;display:block}table#display_row tbody tr td a.row-position{float:left;padding:.6em .2em 0 0}table#display_row tbody tr td input.row-position{float:left}#results{clear:left;width:95vw}.layout-split-right #results{width:80vw}#row_table_scroll_id{max-width:96vw !important}img.icon-sort-up{content:url("../../image/up-small.png")}img.icon-sort-down{content:url("../../image/down.png")}img.icon-dragdrop{content:url("../../image/updown2.png")}img.icon-delete{content:url("../../image/cross2.png")}img.icon-map{content:url("../../image/map-earth.png")}span.area-input span.switch-to-textarea:after{content:url("../../image/pencil.png");vertical-align:top}span.upload_drop_zone{padding:10px;color:#1b1b0e;background-color:#e0e0d6;border:1px #292914 solid;border-radius:6px}.overlay_div{position:relative}.overlay_img{position:absolute;top:-100px;left:-100px;z-index:2;cursor:pointer}.thumbnail{cursor:pointer}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:11pt;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0}.ui-front{z-index:100}.ui-state-disabled{cursor:default !important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default;z-index:9000 }.ui-autocomplete .ui-menu-item a:hover{background-color:#292914;color:#fff}.ui-autocomplete li a{display:block ;font-size:80% ;padding-top:.4em !important;padding-bottom:.4em !important}.ui-autocomplete li a:hover{background-color:#C9C9C9;border:none ;color:#000}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-0.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker.ui-widget-content{background-color:#ffffff;border:1px #666633 solid}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-header.ui-datepicker-prev,.ui-datepicker .ui-datepicker-header.ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-header.ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-header.ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-header.ui-datepicker-prev span,.ui-datepicker .ui-datepicker-header.ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-header .ui-datepicker-prev{float:left;left:2px}.ui-datepicker .ui-datepicker-header .ui-datepicker-prev-hover{left:1px;background-position:25% 25% }.ui-datepicker .ui-datepicker-header .ui-datepicker-next{float:right ;right:2px}.ui-datepicker .ui-datepicker-header .ui-datepicker-next-hover{right:1px;background-position:25% 25% }.ui-datepicker .ui-datepicker-header .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-header .ui-datepicker-title select{margin:1px 0}.ui-datepicker .ui-datepicker-header .ui-datepicker-title select.ui-datepicker-month{margin-right:.2em}.ui-datepicker .ui-datepicker-header select.ui-datepicker-month-year{width:100%}.ui-datepicker .ui-datepicker-header select.ui-datepicker-month,.ui-datepicker .ui-datepicker-header select.ui-datepicker-year{width:49%}.ui-datepicker .ui-datepicker-header.ui-corner-all{cursor:pointer }.ui-datepicker .ui-datepicker-header.ui-corner-all.ui-state-hover{border:none !important ;curser:pointer }.ui-datepicker .ui-datepicker-header.ui-widget-header .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-datepicker .ui-datepicker-header.ui-widget-header .ui-state-hover .ui-icon{background-image:url(images/ui-icons_ef8c08_256x240.png)}.ui-datepicker table{width:100%;font-size:9pt;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker table th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker table td{border:0;padding:1px}.ui-datepicker table td span,.ui-datepicker table td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker table td a.ui-state-hover{color:#ffffff;background-color:#1b1b0e}.ui-datepicker table.ui-datepicker-calendar .ui-state-highlight{color:#ffffff;background-color:#1b1b0e;border:1px #888888 solid}.ui-datepicker table.ui-datepicker-calendar td a.ui-state-default{color:#292914}.ui-datepicker table.ui-datepicker-calendar td a.ui-state-hover{color:#ffffff;background-color:#000000;border:#000000}.ui-datepicker table.ui-datepicker-calendar td a.ui-state-active{border:1px solid #292914;background-color:#292914;color:#f5f5f1}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close{border:1px #292914 solid;background-color:#e0e0d6;color:#1b1b0e;font-weight:normal }.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}img.ui-datepicker-trigger{vertical-align:middle;margin-left:.2em}.ui-dialog{z-index:8001 ;position:absolute;top:0;left:0;outline:0;border:1px #666633 solid;border-radius:.6em}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;border:none;background-color:#406449 !important;color:#fff !important;font-weight:normal;position:relative;text-align:left;font-size:13pt}.ui-dialog .ui-dialog-titlebar .ui-dialog-title{float:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}.ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close{position:absolute;right:.3em;top:0;width:21px;margin:5px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background-color:#f5f5f1 !important;background:linear-gradient(to bottom, #f5f5f1, #ccb) !important;overflow:auto}.ui-dialog .wrapper{margin:0 }.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-dialog.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none;display:inline-table;border-collapse:collapse }.ui-menu.ui-widget-content{border:1px #666633 solid}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;background-color:#e0e0d6;color:#1b1b0e;border-bottom:1px #666633 solid}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal;background:none ;border:0 }.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu.ui-menu-icons{position:relative}.ui-menu.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}ul.context-menu-list{margin:0;padding:0;min-width:120px;max-width:250px;display:inline-block;position:absolute;list-style-type:none;border:1px solid #DDD;background:#EEE;-webkit-box-shadow:0 2px 5px rgba(0,0,0,0.5);-moz-box-shadow:0 2px 5px rgba(0,0,0,0.5);-ms-box-shadow:0 2px 5px rgba(0,0,0,0.5);-o-box-shadow:0 2px 5px rgba(0,0,0,0.5);box-shadow:0 2px 5px rgba(0,0,0,0.5)}ul.context-menu-list li.context-menu-item{padding:2px 2px 2px 24px;background-color:#EEE;position:relative;-webkit-user-select:none;-moz-user-select:-moz-none;-ms-user-select:none;user-select:none}ul.context-menu-list li.context-menu-item.context-menu-heading{text-decoration:underline;font-weight:bold}ul.context-menu-list li.context-menu-item.hover{cursor:pointer;background-color:#39F}ul.context-menu-list li.context-menu-item.hover>.context-menu-list{display:block }ul.context-menu-list li.context-menu-item.disabled{color:#666}ul.context-menu-list li.context-menu-item.hover,ul.context-menu-list li.context-menu-item.disabled.hover{cursor:default ;background-color:#EEE}ul.context-menu-list li.context-menu-item .icon{min-height:18px;background-repeat:no-repeat;background-position:4px 2px}ul.context-menu-list li.context-menu-item.context-menu-separator{padding-bottom:0;border-bottom:1px solid #DDD}ul.context-menu-list li.context-menu-item.context-menu-submenu:after{content:">";color:#666;position:absolute;top:0;right:3px;z-index:1}ul.context-menu-list li.context-menu-item>.context-menu-list{display:none;right:-5px;top:5px}ul.context-menu-list li.context-menu-item .context-menu-accesskey{text-decoration:underline}ul.context-menu-list li.context-menu-item>label>input,ul.context-menu-list li.context-menu-item>label>textarea{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}ul.context-menu-list .context-menu-input>label>*{vertical-align:top}ul.context-menu-list .context-menu-input>label>input[type="checkbox"],ul.context-menu-list .context-menu-input>label>input[type="radio"]{margin-left:-17px}ul.context-menu-list .context-menu-input>label,ul.context-menu-list .context-menu-input>label>input[type="text"],ul.context-menu-list .context-menu-input>label>textarea,ul.context-menu-list .context-menu-input>label>select{display:block;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box}ul.context-menu-list .context-menu-input>label>span{margin-left:5px }ul.context-menu-list .context-menu-input>label>textarea{height:100px}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("images/animated-overlay.gif");height:100%;filter:alpha(opacity=25);opacity:.25}.ui-progressbar .ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-0.3em;margin-left:-0.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-0.3em;margin-left:0;margin-bottom:-0.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner .ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner .ui-spinner-button{width:16px;height:50%;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner .ui-spinner-up{top:0}.ui-spinner .ui-spinner-down{bottom:0}.ui-spinner .ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav li a{float:left;padding:.5em 1em;text-decoration:none;cursor:pointer}.ui-tabs .ui-tabs-nav li .ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li .ui-tabs-active a,.ui-tabs .ui-tabs-nav li .ui-state-disabled a,.ui-tabs .ui-tabs-nav li .ui-tabs-loading a{cursor:text;outline:0 }.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:.4em 0 1em 0}.ui-tabs .ui-tabs-nav li a,.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a{cursor:pointer}.ui-tooltip{position:absolute;z-index:9999;max-width:300px;padding:8px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa;background-color:#666633 !important}.ui-tooltip .ui-tooltip-content{color:#ffffff}body .ui-tooltip{border-width:2px }.ui-widget .ui-widget-header{background:none;color:#ffffff;font-weight:bold}.ui-widget .ui-widget-header a{color:#ffffff}.ui-widget .ui-widget-content{border:none;background:none }.ui-widget .ui-widget{font-size:10pt}.cke_editable{background-color:white;padding:6px;border-top:1px #999 solid;border-right:1px #ddd solid;border-left:1px #ddd solid;overflow:auto ;font-size:11pt ;min-width:220px;min-height:4em}.cke_editable:focus{outline:none ;background-color:#ccb;border:1px #0e0e07 solid}.cke_editable p{font-size:10pt !important;padding:0  ;margin:0 0 .4em 0;font-weight:normal}div.cke_editable.wi-small-wide{margin-right:24px !important }body>.ui-dialog>.ui-dialog-content>p>.cke_editable{border:1px #dcdcdc solid !important;padding:.4em;margin:0;font-size:100%;width:100% !important}.ui-state-default .ui-icon,.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-state-active .ui-icon{background-image:url(images/ui-icons_777777_256x240.png) !important}.ui-state-default{border:1px solid #cccccc;background:none ;font-weight:bold;color:#1b1b0e}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-state-focus{background:none ;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-focus a,.ui-state-hover a:hover,.ui-state-focus a:hover,.ui-state-hover a:link,.ui-state-focus a:link,.ui-state-hover a:visited,.ui-state-focus a:visited{color:#000;text-decoration:underline}.ui-state-active{border:1px solid #fbd850;background:none ;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight{border:1px solid #fed22f;background:none ;color:#363636}.ui-state-highlight a{color:#363636}.ui-state-error{border:1px solid #cd0a0a;background:none ;color:#ffffff}.ui-state-error a{color:#ffffff}.ui-state-error-text{color:#ffffff}.ui-priority-primary{font-weight:bold}.ui-priority-secondary{opacity:.7;filter:alpha(opacity=70);font-weight:normal}.ui-state-disabled{opacity:.35;filter:alpha(opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:alpha(opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_ffffff_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_ef8c08_256x240.png)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(images/ui-icons_ef8c08_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_ef8c08_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_228ef1_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_ffd27a_256x240.png)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-widget-overlay{background:#666666;opacity:.5;filter:alpha(opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000000;opacity:.2;filter:alpha(opacity=20);border-radius:.6em}.chart_picker,.project_picker,.part_picker{display:inline-block}.chart_picker:before,.project_picker:before,.part_picker:before{display:inline-block;vertical-align:middle;height:100%}span.chart_picker,span.project_picker,span.part_picker{white-space:nowrap ;padding-top:0 !important;padding-bottom:0 !important}span.chart_picker input,span.project_picker input,span.part_picker input{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}div.part_picker_part,div.project_picker_project,div.chart_picker_chart{padding:5px;margin:5px;border:1px;border-color:darkgray;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:white;cursor:pointer}div.part_picker_part:hover,div.project_picker_project:hover,div.chart_picker_chart:hover{color:#000;text-decoration:underline}span.customer_vendor_picker{margin:0 !important;padding:0 !important}.customer-vendor-picker-undefined,.chartpicker-undefined,.projectpicker-undefined,.partpicker-undefined{color:red;font-style:italic}.ac_results{padding:0px;border:1px solid black;background-color:white;overflow:hidden;z-index:99999}.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0}.ac_results li{margin:0px;padding:2px 5px;cursor:default;display:block;font:menu;font-size:11pt;line-height:16px;overflow:hidden}.ac_odd{background-color:#eee}.ac_over{background-color:#0A246A;color:white}.ms2side__div{clear:left;width:100%;padding:1px;float:left;background:url('') repeat-x}.ms2side__select{float:left}.ms2side__header{color:#666;font-size:9pt;line-height:1em;padding:0 0 .3em 0;display:block}.ms2side__options,.ms2side__updown{float:left;font-size:10pt;margin:0;padding:0 8px;width:40px;color:black;text-align:center;overflow:hidden}.ms2side__options{padding-top:1em !important}.ms2side__updown{font-size:10pt}.ms2side__options p,.ms2side__updown p{margin:2px 0;padding:0;cursor:pointer;border:1px solid black;width:auto !important;background-color:#e0e0d6;color:#1b1b0e;border-color:1px #292914 solid;border-radius:3px}.ms2side__options p.ms2side_hover,.ms2side__updown p.ms2side_hover{background-color:#3C3C3B;border-color:#000000;color:#ffffff;cursor:pointer}.ms2side__options>p.ms2side__hide,.ms2side__updown>p.ms2side__hide{cursor:default;color:#9e9e9e;border:1px solid grey;background-color:#D4D4D4 !important}.ms2side__div select{width:12em;float:left}.tooltipster-default{border-radius:.6em;border:2px solid #000;background-color:#666633;color:#fff;max-width:400px }.tooltipster-default .tooltipster-content{font-size:10pt;line-height:16px;padding:1.2em 1em 1.2em 1.4em;overflow:hidden;background-color:#666633}.tooltipster-default .tooltipster-arrow{display:block;text-align:center;width:100%;height:100%;position:absolute;top:0;left:0;z-index:-1}.tooltipster-icon{cursor:help;margin-left:4px}.tooltipster-base{padding:0;font-size:0;line-height:0;position:absolute;left:0;top:0;z-index:9999999;pointer-events:none;width:auto;max-width:400px ;overflow:visible}.tooltipster-base .tooltipster-content{overflow:hidden}.tooltipster-arrow span,.tooltipster-arrow-border{display:block;width:0;height:0;position:absolute}.tooltipster-arrow-top span,.tooltipster-arrow-top-right span,.tooltipster-arrow-top-left span{border-left:8px solid transparent !important;border-right:8px solid transparent !important;border-top:8px solid;bottom:-7px}.tooltipster-arrow-top .tooltipster-arrow-border,.tooltipster-arrow-top-right .tooltipster-arrow-border,.tooltipster-arrow-top-left .tooltipster-arrow-border{border-left:9px solid transparent !important;border-right:9px solid transparent !important;border-top:9px solid;bottom:-7px}.tooltipster-arrow-bottom span,.tooltipster-arrow-bottom-right span,.tooltipster-arrow-bottom-left span{border-left:8px solid transparent !important;border-right:8px solid transparent !important;border-bottom:8px solid;top:-7px}.tooltipster-arrow-bottom .tooltipster-arrow-border,.tooltipster-arrow-bottom-right .tooltipster-arrow-border,.tooltipster-arrow-bottom-left .tooltipster-arrow-border{border-left:9px solid transparent !important;border-right:9px solid transparent !important;border-bottom:9px solid;top:-7px}.tooltipster-arrow-top span,.tooltipster-arrow-top .tooltipster-arrow-border,.tooltipster-arrow-bottom span,.tooltipster-arrow-bottom .tooltipster-arrow-border{left:0;right:0;margin:0 auto}.tooltipster-arrow-top-left span,.tooltipster-arrow-bottom-left span{left:6px}.tooltipster-arrow-top-left .tooltipster-arrow-border,.tooltipster-arrow-bottom-left .tooltipster-arrow-border{left:5px}.tooltipster-arrow-top-right span,.tooltipster-arrow-bottom-right span{right:6px}.tooltipster-arrow-top-right .tooltipster-arrow-border,.tooltipster-arrow-bottom-right .tooltipster-arrow-border{right:5px}.tooltipster-arrow-left span,.tooltipster-arrow-left .tooltipster-arrow-border{border-top:8px solid transparent !important;border-bottom:8px solid transparent !important;border-left:8px solid;top:50%;margin-top:-7px;right:-7px}.tooltipster-arrow-left .tooltipster-arrow-border{border-top:9px solid transparent !important;border-bottom:9px solid transparent !important;border-left:9px solid;margin-top:-8px}.tooltipster-arrow-right span,.tooltipster-arrow-right .tooltipster-arrow-border{border-top:8px solid transparent !important;border-bottom:8px solid transparent !important;border-right:8px solid;top:50%;margin-top:-7px;left:-7px}.tooltipster-arrow-right .tooltipster-arrow-border{border-top:9px solid transparent !important;border-bottom:9px solid transparent !important;border-right:9px solid;margin-top:-8px}.tooltipster-fade{opacity:0;-webkit-transition-property:opacity;-moz-transition-property:opacity;-o-transition-property:opacity;-ms-transition-property:opacity;transition-property:opacity}.tooltipster-fade-show{opacity:1}.tooltipster-grow{-webkit-transform:scale(0, 0);-moz-transform:scale(0, 0);-o-transform:scale(0, 0);-ms-transform:scale(0, 0);transform:scale(0, 0);-webkit-transition-property:-webkit-transform;-moz-transition-property:-moz-transform;-o-transition-property:-o-transform;-ms-transition-property:-ms-transform;transition-property:transform;-webkit-backface-visibility:hidden}.tooltipster-grow-show{-webkit-transform:scale(1, 1);-moz-transform:scale(1, 1);-o-transform:scale(1, 1);-ms-transform:scale(1, 1);transform:scale(1, 1);-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1);-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-moz-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-ms-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-o-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);transition-timing-function:cubic-bezier(.175, .885, .32, 1.15)}.tooltipster-swing{opacity:0;-webkit-transform:rotateZ(4deg);-moz-transform:rotateZ(4deg);-o-transform:rotateZ(4deg);-ms-transform:rotateZ(4deg);transform:rotateZ(4deg);-webkit-transition-property:-webkit-transform,opacity;-moz-transition-property:-moz-transform;-o-transition-property:-o-transform;-ms-transition-property:-ms-transform;transition-property:transform}.tooltipster-swing-show{opacity:1;-webkit-transform:rotateZ(0deg);-moz-transform:rotateZ(0deg);-o-transform:rotateZ(0deg);-ms-transform:rotateZ(0deg);transform:rotateZ(0deg);-webkit-transition-timing-function:cubic-bezier(.23, .635, .495, 1);-webkit-transition-timing-function:cubic-bezier(.23, .635, .495, 2.4);-moz-transition-timing-function:cubic-bezier(.23, .635, .495, 2.4);-ms-transition-timing-function:cubic-bezier(.23, .635, .495, 2.4);-o-transition-timing-function:cubic-bezier(.23, .635, .495, 2.4);transition-timing-function:cubic-bezier(.23, .635, .495, 2.4)}.tooltipster-fall{top:0;-webkit-transition-property:top;-moz-transition-property:top;-o-transition-property:top;-ms-transition-property:top;transition-property:top;-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1);-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-moz-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-ms-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-o-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);transition-timing-function:cubic-bezier(.175, .885, .32, 1.15)}.tooltipster-fall.tooltipster-dying{-webkit-transition-property:all;-moz-transition-property:all;-o-transition-property:all;-ms-transition-property:all;transition-property:all;top:0px !important;opacity:0}.tooltipster-slide{left:-40px;-webkit-transition-property:left;-moz-transition-property:left;-o-transition-property:left;-ms-transition-property:left;transition-property:left;-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1);-webkit-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-moz-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-ms-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);-o-transition-timing-function:cubic-bezier(.175, .885, .32, 1.15);transition-timing-function:cubic-bezier(.175, .885, .32, 1.15)}.tooltipster-slide.tooltipster-dying{-webkit-transition-property:all;-moz-transition-property:all;-o-transition-property:all;-ms-transition-property:all;transition-property:all;left:0px !important;opacity:0}.tooltipster-content-changing{opacity:.5;-webkit-transform:scale(1.1, 1.1);-moz-transform:scale(1.1, 1.1);-o-transform:scale(1.1, 1.1);-ms-transform:scale(1.1, 1.1);transform:scale(1.1, 1.1)}.tooltipster-light{border-radius:.6em;border:1px solid #e0e0d6;background-color:#666633;color:#f5f5f1}.tooltipster-light .tooltipster-content{font-size:9pt;line-height:16px;background-color:#666633;padding:1em 1.4em}div.cpc_block,div.ppp_block{overflow:hidden;float:left;width:350px}div.ppp_block span.ppp_block_number{float:left}div.ppp_block span.ppp_block_description{float:right;margin-left:1em;font-weight:bold}div.cpc_block span.cpc_block_number{float:left}div.cpc_block span.cpc_block_description{float:left;margin-left:1em;font-weight:bold}div.cpc_block span.cpc_block_balance{float:right}div.cpc_block span.cpc_line_balance{display:none}div.ppp_line span.ppp_block_description{margin-left:1em;font-weight:bold}div.cpc_line span.cpc_block_description{margin-left:1em;font-weight:bold}div.cpc_line span.cpc_block_second_row{display:none}.customer-vendor-picker-undefined,.chartpicker-undefined,.projectpicker-undefined,.partpicker-undefined{color:red;font-style:italic}span.cpc_popup_button,span.ppp_popup_button{display:inline-block;vertical-align:middle;margin-left:-24px;height:20px;width:20px;cursor:pointer;background:url("../../image/search.svg") no-repeat center right;background-size:contain}.wrapper>.buttons{padding-left:0 !important}.wrapper .select-item,.wrapper .form-addition,.wrapper .input-panel{margin-left:0 !important}.wrapper>.col{margin-right:1.6em}.wrapper>.col>.tbl-horizontal{margin-right:0 !important }.wrapper .tbl-list caption{padding-left:0 }#content .ui-tabs-panel div.wrapper:first-child{margin-top:1.5em}.ui-tabs-panel>div.select-item{margin:1.8em 2em .8em 1.2em !important}.ui-tabs-panel>div.form-addition{margin-left:0 !important }.ui-dialog-content{background:#ffffff}.ui-widget-content{background:transparent}.ui-dialog-content .select-item,.ui-widget-content .select-item{margin:1em 1em 1em 0}.ui-dialog-content .buttons,.ui-widget-content .buttons{padding:1em 1em 1em 0}.ck.ck-editor__editable_inline ul{padding:revert;list-style:revert}.tabwidget{width:100%;overflow:hidden;position:relative;zoom:1;padding:0 !important;border:0;color:#1b1b0e;background:transparent}.tabwidget>ul{display:block;list-style:none;outline:0;padding:.2em .2em 0 0;margin:0;font-size:11pt;font-weight:bold;line-height:1.3;text-decoration:none}.tabwidget>ul li{position:relative;top:1px;float:left;list-style:none;margin:1px .2em 0 0;padding:0;white-space:nowrap;border-bottom:0 !important;border-top-right-radius:4px;border-top-left-radius:4px;border:1px solid #cccccc;background-color:#ffffff;color:#1b1b0e;font-size:9pt;font-weight:bold}.tabwidget>ul li.ui-tabs-selected{margin-bottom:0;padding-bottom:1px}.tabwidget>ul li.ui-tabs-selected a{cursor:pointer}.tabwidget>ul li a{float:left;padding:.2em .7em;text-decoration:none;cursor:pointer}.tabwidget>ul li.ui-state-default{margin:0 0 0 .6em;background:#ffffff;color:#1b1b0e;border:1px #666633 solid;font-weight:normal}.tabwidget>ul li.ui-state-default a,.tabwidget>ul li.ui-state-default a:link{color:#1b1b0e;font-weight:normal}.tabwidget>ul li.ui-state-hover{color:#1b1b0e;background-color:#e0e0d6}.tabwidget>ul li.ui-state-active{color:#1b1b0e;background-color:#eeeee9}.tabwidget>ul li.ui-state-active a,.tabwidget>ul li.ui-state-active a:link,.tabwidget>ul li.ui-state-active a:visited{color:#1b1b0e;outline:0 }.tabwidget>ul li.ui-state-active.ui-state-hover{color:#1b1b0e}.tabwidget>ul li.ui-state-disabled a{cursor:text;outline:0 }.tabwidget>ul li.ui-state-processing a{cursor:text}.tabwidget>ul li.ui-state-loading a{outline:0 }.tabwidget>ul.ui-tabs-nav{position:fixed;top:100px;width:100%;z-index:1029;margin:0 .4em .6em 0;padding:.4em .2em 0 .7em;background-color:#ffffff;border-bottom:1px #666633 solid !important}.tabwidget>ul.ui-tabs-nav li{margin:1px .2em 0 0}.tabwidget>ul.ui-tabs-nav li a{padding:.2em .7em}.tabwidget>ul.ui-tabs-nav li.ui-tabs-active{border-bottom:1px #eeeee9 solid !important;margin-bottom:-1px;padding-bottom:0}.tabwidget.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a{cursor:pointer}.tabwidget>div{display:none;padding-top:3.5em !important;border-bottom:none;width:100%;height:100%;min-height:400px;overflow:hidden }.tabwidget>div.ui-tabs-panel{width:100%;overflow:hidden;display:block}.tabwidget>div.ui-tabs-panel>.tabwidget{position:relative }.tabwidget>div.ui-tabs-panel>.tabwidget>.ui-tabs-nav{position:relative ;top:auto;background-color:transparent}.tabwidget>div.ui-tabs-panel>.tabwidget>.ui-tabs-panel{background-color:#ffffff;background-color:transparent ;position:relative ;top:auto;padding-top:0 !important }.tabwidget>div.ui-tabs-panel.ui-widget-content{border:0 }a.no-underlined-links,a.no-underlined-links:visited,a.no-underlined-links:hover{text-decoration:none !important;background-color:transparent !important;border:none}a.no-underlined-links:hover{background:none}body+#menuv3{top:0 important}body div.admin{padding:60px 0 0 0 ;background-image:linear-gradient(to bottom, #f5f5f1, #ccb)}body div.admin h1{background-color:#fe5f14 !important;color:#ffffff;top:30px ;position:fixed;width:100% ;padding:.6em .5em .5em .6em;z-index:1000}body div.admin h1+.wrapper{padding-top:1.2em}body div.admin .logo{width:auto;clear:both;margin:3em auto 1em auto;padding:2em 0 0 0}body div.admin .separate-form{background-color:#ddd;border:1px #888888 solid;border-radius:.6em;display:block ;width:24em;margin:0 auto ;padding:.7em .6em 1em .6em}body div.admin .tabwidget{padding:2.4em 0 0 0 !important}body div.admin .tabwidget .ui-tabs-nav{top:66px}body div.admin .tabwidget .ui-tabs-panel{padding:2em 1em 1em 1em;overflow:hidden;height:auto;min-height:300px }body div.admin>form{display:block ;margin-top:1px ;padding-top:1.2em}@media screen and (min-device-width:480px) and (max-device-width:767px){body #content .tbl-horizontal th{width:208px;background-color:#D6EEBF}body #content .tbl-horizontal th .colgroup col{width:256px}body #content .tbl-horizontal th.wi-smallest{width:208px}body #content .tbl-horizontal th.wi-verysmall{width:208px}body #content .tbl-horizontal th.wi-small{width:208px}body #content .tbl-horizontal th.wi-mediumsmall{width:208px}body #content .tbl-horizontal th.wi-normal{width:208px}body #content .tbl-horizontal th.wi-lightwide{width:208px}body #content .tbl-horizontal th.wi-wide{width:208px}body #content .tbl-horizontal th.wi-wider{width:208px}body #content .tbl-horizontal th.wi-verywide{width:208px}}@media screen and (max-device-width:1024px){body #content .tbl-horizontal th{width:256px}body #content .tbl-horizontal th.wi-smallest{width:208px}body #content .tbl-horizontal th.wi-verysmall{width:208px}body #content .tbl-horizontal th.wi-small{width:208px}body #content .tbl-horizontal th.wi-mediumsmall{width:208px}body #content .tbl-horizontal th.wi-normal{width:208px}body #content .tbl-horizontal th.wi-lightwide{width:208px}body #content .tbl-horizontal th.wi-wide{width:208px}body #content .tbl-horizontal th.wi-wider{width:208px}body #content .tbl-horizontal th.wi-verywide{width:208px}}@media screen and (min-device-width:768px) and (max-device-width:1023px){.tbl-horizontal th{width:208px}.tbl-horizontal th.wi-smallest{width:208px}.tbl-horizontal th.wi-verysmall{width:208px}.tbl-horizontal th.wi-small{width:208px}.tbl-horizontal th.wi-mediumsmall{width:208px}.tbl-horizontal th.wi-normal{width:208px}.tbl-horizontal th.wi-lightwide{width:208px}.tbl-horizontal th.wi-wide{width:208px}.tbl-horizontal th.wi-wider{width:208px}.tbl-horizontal th.wi-verywide{width:208px}}@media screen and (max-device-width:1024px){.tbl-horizontal th{width:208px}.tbl-horizontal th.wi-smallest{width:208px}.tbl-horizontal th.wi-verysmall{width:208px}.tbl-horizontal th.wi-small{width:208px}.tbl-horizontal th.wi-mediumsmall{width:208px}.tbl-horizontal th.wi-normal{width:208px}.tbl-horizontal th.wi-lightwide{width:208px}.tbl-horizontal th.wi-wide{width:208px}.tbl-horizontal th.wi-wider{width:208px}.tbl-horizontal th.wi-verywide{width:208px}}@media print{body{margin-left:1.4em}#menuv3,#html-menu,#frame-header,#main_menu_div,#js-header,body>div.layout-split-left,#tree-column,ul.ui-tabs-nav,div.layout-actionbar,.control-panel,.input-panel,.toggles{display:none !important}body>div.layout-split-right{margin-left:0 !important}.wrapper.toggled>table.tbl-horizontal,.wrapper.toggled>div.col{margin-top:0 !important }div.buttons.positions{display:none;margin:0 0 0 0 !important}#content{padding:1em 0 0 0 !important;margin:0 }#content td,#content p,#content div,#content span,#content input,#content textarea,#content select,#content option{font-size:7pt !important}#content>h1{color:#222222;padding:0 0 0 0 ;top:0 ;position:absolute }#content wrapper{margin:.4em 1em 1em 1.2em;padding:0 0 .4em 0}#content caption,#content th.caption,#content td.caption{font-size:9pt;font-weight:bold;padding:.1em 0 .1em .2em;margin:.1em 0 .1em 0;display:table-cell}#content .tbl-horizontal tbody tr td,#content .tbl-horizontal tbody tr th{border-color:#666633;border-width:.3pt !important;border-style:solid ;padding:.3em .6em}#content .tbl-horizontal tbody tr th,#content .tbl-horizontal tbody tr span.label{font-size:6pt !important}#content .tbl-list{margin-top:1.2em;width:96% !important }#content .tbl-list caption{margin:0 !important ;padding:0 !important }#content .tbl-list thead{overflow:hidden }#content .tbl-list thead tr th{font-size:70% }#content .tbl-list tbody tr{border-bottom:1px #000 solid !important}#content .tbl-list tbody tr:nth-child(odd){background-color:none}#content .tbl-list tbody tr:nth-child(even){background-color:none}#content .tbl-list tbody tr td{border-bottom:1px #000 solid !important;vertical-align:top !important }#content col.wi-smallest{width:25px !important}#content col.wi-verysmall{width:48px !important}#content col.wi-small{width:77px !important}#content col.wi-mediumsmall{width:96px !important}#content col.wi-normal{width:125px !important}#content col.wi-lightwide{width:154px !important}#content col.wi-wide{width:192px !important}#content col.wi-wider{width:230px !important}#content col.wi-verywide{width:346px !important}#content input[type="text"],#content input[type="customer"],#content input.numeric,#content textarea,#content select,#content span.data,#content select,#content textarea{width:auto         !important;appearance:none !important;-webkit-appearance:none !important;-moz-appearance:none !important;border:none;color:#000 !important;background-color:none !important;background:none !important;overflow:visible    !important}#content textarea{display:block ;height:auto !important ;overflow-y:visible !important;min-width:16em ;width:100% !important;padding:0 ;resize:vertical}#content table.tbl-list td textarea{min-height:4.2em !important}#content table.tbl-list td input{padding-left:0 !important}#content span.data{width:auto;border:none }#content input.wi-date{align:left !important;padding:0 !important}#content select{padding:0 0 .4em .2em !important}#content div.cke_editable{min-height:1.8em !important;height:auto !important;border:none;overflow:hidden !important}#content a.button-image,#content a.button,#content input[type="button"],#content input.neutral,#content td img{display:none }#content input.wi-smallest,#content select.wi-smallest{width:25px !important}#content input.wi-verysmall,#content select.wi-verysmall{width:48px !important}#content input.wi-small,#content select.wi-small{width:55px !important}#content input.wi-mediumsmall,#content select.wi-mediumsmall{width:74px !important}#content input.wi-normal,#content select.wi-normal{width:103px !important}#content input.wi-lightwide,#content select.wi-lightwide{width:132px !important}#content input.wi-wide,#content select.wi-wide{width:170px !important}#content input.wi-wider,#content select.wi-wider{width:209px !important}#content input.wi-verywide,#content select.wi-verywide{width:324px !important}}body.developing>header{background-color:#406449;display:block;overflow:hidden}body.developing>header h1{float:left;color:#fff;padding:1em}body.developing>header nav{float:right;padding:1em}body.developing>header nav a:link,body.developing>header nav a:visited{color:white }body.developing .wrapper p,body.developing .wrapper ul,body.developing .wrapper ol,body.developing .wrapper li,body.developing .wrapper h2,body.developing .wrapper h3,body.developing .wrapper h4{clear:both;width:60em;max-width:60em}body.developing>p,body.developing>h2,body.developing>h3,body.developing>h4{margin-left:.8em}body.developing h2,body.developing h3,body.developing h4{font-weight:bold ;color:#000 !important;clear:left;padding-left:0 !important}body.developing h2{font-size:130%}body.developing h3{font-size:120%}body.developing h4{font-size:110%}body.developing pre{margin:0 0 1em 0;padding:.6em;border:1px #000 solid;background-color:#ddd;display:inline-block;clear:both}body.developing pre code{padding:0 }body.developing div.code-highlighted{margin:0 0 1em 0;padding:.6em;border:1px #000 solid;background-color:#ddd;display:inline-block}body.developing p.picture{background-color:#fff;padding:.8em;border:1px #888888 solid;display:inline-block;width:auto}body.developing .wrapper .tbl-horizontal{border:1px black solid !important;border-collapse:collapse}body.developing .wrapper .tbl-horizontal tbody{border-top:none}body.developing .wrapper .tbl-horizontal caption,body.developing .wrapper .tbl-horizontal th{padding-left:.6em}body.developing .wrapper .tbl-horizontal th.caption{border-top:none;border-bottom:none}body.developing .wrapper .tbl-horizontal.test th,body.developing .wrapper .tbl-horizontal.test-plain th{padding-left:.3em}body.developing .wrapper .tbl-horizontal.test td,body.developing .wrapper .tbl-horizontal.test-plain td{display:block;overflow:visible;border-bottom:1px #666666 solid}body.developing .wrapper .tbl-horizontal.test tr:last-child td,body.developing .wrapper .tbl-horizontal.test-plain tr:last-child td{border:none }body.developing .wrapper.clear .tbl-horizontal{clear:both }body.developing .wrapper table.tbl-list>thead>tr th:first-child,body.developing .wrapper table.tbl-list>tbody>tr td:first-child{padding-left:0 !important}body.developing .wrapper div.test-box{font-size:80% ;overflow:visible;padding:.3em .5em;background-color:#9D9E9D;float:left;border:1px #000 dotted}body.developing input[type="submit"],body.developing input[type="button"],body.developing input[type="button"].button,body.developing button[type="submit"],body.developing button[type="button"],body.developing a.button{color:#fff;background-color:#406449;border:1px #406449 solid}body.developing input[type="submit"].hover,body.developing input[type="button"].hover,body.developing input[type="button"].button.hover,body.developing button[type="submit"].hover,body.developing button[type="button"].hover,body.developing a.button.hover{color:#fff;background-color:#548360;border:1px #548360 solid}body.developing input[type="submit"].active,body.developing input[type="button"].active,body.developing input[type="button"].button.active,body.developing button[type="submit"].active,body.developing button[type="button"].active,body.developing a.button.active{color:#fff;background-color:#548360;border:1px #548360 solid}body.developing input[type="button"].neutral,body.developing input[type="submit"].neutral,body.developing input[type="reset"],body.developing input[type="reset"].neutral,body.developing button.neutral,body.developing button[type="reset"]{color:#1b1b0e;background-color:#e0e0d6;border:1px #292914 solid}body.developing input[type="button"].neutral.neutral-hover,body.developing input[type="submit"].neutral.neutral-hover,body.developing input[type="reset"].neutral-hover,body.developing input[type="reset"].neutral.neutral-hover,body.developing button.neutral.neutral-hover,body.developing button[type="reset"].neutral-hover{color:#1b1b0e;background-color:#f5f5f1;border:1px #292914 solid}body.developing input[type="button"].neutral.neutral-active,body.developing input[type="submit"].neutral.neutral-active,body.developing input[type="reset"].neutral-active,body.developing input[type="reset"].neutral.neutral-active,body.developing button.neutral.neutral-active,body.developing button[type="reset"].neutral-active,body.developing input[type="button"].neutral.neutral-focus,body.developing input[type="submit"].neutral.neutral-focus,body.developing input[type="reset"].neutral-focus,body.developing input[type="reset"].neutral.neutral-focus,body.developing button.neutral.neutral-focus,body.developing button[type="reset"].neutral-focus{color:#000;background-color:#666633;border:1px #0e0e07 solid}.icon16{background:url(../../image/maps/icons16.png) 16px 0 no-repeat;padding:0;width:16px;height:16px}.icon16.admin{background-position:0 0}.icon16.ap{background-position:-16px 0}.icon16.ap_aging{background-position:-32px 0}.icon16.ap_report{background-position:-48px 0}.icon16.ap_transaction_add{background-position:-64px 0}.icon16.appointment{background-position:-80px 0}.icon16.ar{background-position:-96px 0}.icon16.ar_aging{background-position:-112px 0}.icon16.ar_report{background-position:-128px 0}.icon16.ar_transaction_add{background-position:-144px 0}.icon16.assembly_add{background-position:-160px 0}.icon16.assembly_produce{background-position:-176px 0}.icon16.assembly_report{background-position:-192px 0}.icon16.balance_sheet{background-position:-208px 0}.icon16.cash{background-position:-224px 0}.icon16.cash_report{background-position:-240px 0}.icon16.chart_of_accounts{background-position:-256px 0}.icon16.contact{background-position:-272px 0}.icon16.credit_note_add{background-position:-288px 0}.icon16.crm{background-position:-304px 0}.icon16.customer{background-position:-320px 0}.icon16.customer_add{background-position:-336px 0}.icon16.customer_report{background-position:-352px 0}.icon16.datev{background-position:-368px 0}.icon16.delivery_order_add{background-position:-384px 0}.icon16.delivery_order_report{background-position:-400px 0}.icon16.document_template{background-position:-416px 0}.icon16.dunning_add{background-position:-432px 0}.icon16.dunnings_report{background-position:-448px 0}.icon16.email{background-position:-464px 0}.icon16.follow_up{background-position:-480px 0}.icon16.gl{background-position:-496px 0}.icon16.gl_report{background-position:-512px 0}.icon16.help{background-position:-528px 0}.icon16.income_statement{background-position:-544px 0}.icon16.invoices_report{background-position:-560px 0}.icon16.journal{background-position:-576px 0}.icon16.knowledge{background-position:-592px 0}.icon16.label{background-position:-608px 0}.icon16.license_add{background-position:-624px 0}.icon16.license_report{background-position:-640px 0}.icon16.logout{background-position:-656px 0}.icon16.master_data{background-position:-672px 0}.icon16.master_data_report{background-position:-688px 0}.icon16.mdi_text_editor{background-position:-704px 0}.icon16.memo{background-position:-720px 0}.icon16.message{background-position:-736px 0}.icon16.opportunity{background-position:-752px 0}.icon16.package_lists{background-position:-768px 0}.icon16.part_add{background-position:-784px 0}.icon16.part_report{background-position:-800px 0}.icon16.payment{background-position:-816px 0}.icon16.payment_report{background-position:-832px 0}.icon16.phone{background-position:-848px 0}.icon16.preferences{background-position:-864px 0}.icon16.prices_update{background-position:-880px 0}.icon16.printing{background-position:-896px 0}.icon16.program{background-position:-912px 0}.icon16.project_add{background-position:-928px 0}.icon16.project_report{background-position:-944px 0}.icon16.project_transaction_report{background-position:-960px 0}.icon16.purchase_order_add{background-position:-976px 0}.icon16.purchase_order_printing{background-position:-992px 0}.icon16.purchase_order_report{background-position:-1008px 0}.icon16.quotation_add{background-position:-1024px 0}.icon16.quotation_printing{background-position:-1040px 0}.icon16.receipt{background-position:-1056px 0}.icon16.receipt_printing{background-position:-1072px 0}.icon16.receipt_report{background-position:-1088px 0}.icon16.reconcilliation{background-position:-1104px 0}.icon16.report{background-position:-1120px 0}.icon16.report_quotations{background-position:-1136px 0}.icon16.report_sales_orders{background-position:-1152px 0}.icon16.rfq_add{background-position:-1168px 0}.icon16.rfq_printing{background-position:-1184px 0}.icon16.rfq_report{background-position:-1200px 0}.icon16.sales_invoice_add{background-position:-1216px 0}.icon16.sales_invoice_printing{background-position:-1232px 0}.icon16.sales_order_add{background-position:-1248px 0}.icon16.sales_order_printing{background-position:-1264px 0}.icon16.search{background-position:-1280px 0}.icon16.service{background-position:-1296px 0}.icon16.service_add{background-position:-1312px 0}.icon16.service_report{background-position:-1328px 0}.icon16.status{background-position:-1344px 0}.icon16.system{background-position:-1360px 0}.icon16.transaction_add{background-position:-1376px 0}.icon16.user{background-position:-1392px 0}.icon16.user_group{background-position:-1408px 0}.icon16.ustva{background-position:-1424px 0}.icon16.vendor{background-position:-1440px 0}.icon16.vendor_add{background-position:-1456px 0}.icon16.vendor_report{background-position:-1472px 0}.icon16.version{background-position:-1488px 0}.icon16.warehouse{background-position:-1504px 0}.icon16.window_new{background-position:-1520px 0}
\ No newline at end of file
diff --git a/css/design40/style_maroon.css b/css/design40/style_maroon.css
new file mode 100644
index 000000000..b86aa2101
--- /dev/null
+++ b/css/design40/style_maroon.css
@@ -0,0 +1,8160 @@
+/* ------------------------------------------------------------- */
+/* VARIABLES COLOR (variables_color_gray_standard.less) Standard Grey */
+/* ------------------------------------------------------------- */
+.bg-body {
+  background-color: #d5aabf;
+}
+.bg-content {
+  background-image: linear-gradient(to bottom, #f7eef2, #d5aabf);
+}
+/* ------------------------------------------------------------- */
+/* VARIABLES (variables.less)                                    */
+/* ------------------------------------------------------------- */
+/* ------------------------------------------------------------- */
+/* This CSS-Vars are just for testing                            */
+/* ------------------------------------------------------------- */
+:root {
+  --gray-standard: #888888;
+  --gray-superdark: #000000;
+  --gray-verydark: #222222;
+  --gray-darker: #444444;
+  --gray-dark: #666666;
+  --gray-light: #aaaaaa;
+  --gray-lighter: #cccccc;
+  --gray-verylight: #eeeeee;
+  --gray-superlight: #ffffff;
+  --color-standard: #800040;
+  --color-superlight: #ffffff;
+  --color-verylight: #f7eef2;
+  --color-lighter: #e6ccd9;
+  --color-light: #d5aabf;
+  --color-dark: #33001a;
+  --color-darker: #220011;
+  --color-verydark: #110009;
+  --color-superdark: #000000;
+  --msg-ok-strong: #073017;
+  --msg-ok-light: #acf5c9;
+  --msg-error-strong: #920013;
+  --msg-error-light: #fad4db;
+  --msg-hint-strong: #207ea3;
+  --msg-hint-light: #edf6fa;
+  --msg-warning-strong: #130000;
+  --msg-warning-light: #e6b578;
+}
+/* ------------------------------------------------------------- */
+/* CUSTOM VARIABLES (custom_variables.less)                      */
+/* ------------------------------------------------------------- */
+/* ------------------------------------------------------------- */
+/* MIXINS (mixins.less)                                          */
+/* ------------------------------------------------------------- */
+.mx-h3-caption {
+  font-size: 11pt;
+  font-weight: normal;
+  color: #33001a !important;
+  padding: 0.2em 0 0.2em 0.2em;
+  margin: 0.1em 0 0.4em 0 ;
+  text-align: left;
+  letter-spacing: 0.12em;
+}
+.mx-contentbox-properties {
+  margin: 1em 1em 1em 1.2em;
+  padding: 0.6em 1em 1.2em 1.8em;
+}
+.mx-thead-th {
+  color: #ffffff;
+  background-color: #33001a;
+  border-top: 1px solid #33001a;
+  border-bottom: 1px solid #33001a;
+  text-align: left ;
+  vertical-align: top ;
+}
+.mx-button {
+  display: inline-block;
+  cursor: pointer ;
+  width: auto ;
+  padding: 0.2em 0.6em;
+  font-size: 9pt;
+  font-weight: normal;
+  font-style: normal;
+  text-align: center;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 6px;
+}
+.mx-button-standard {
+  border: 1px #220011 solid;
+  background-color: #33001a;
+  color: #f7eef2;
+  text-decoration: none;
+}
+.mx-button-standard-hover-focus:hover {
+  border: 1px #000000 solid;
+  background-color: #220011;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+.mx-button-standard-hover-focus:active,
+.mx-button-standard-hover-focus:focus {
+  border: 1px #000000 solid;
+  background-color: #000000;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+.mx-button-neutral {
+  border: 1px #800040 solid;
+  background-color: #e6ccd9;
+  color: #220011;
+}
+.mx-button-neutral-hover-focus:hover {
+  border: 1px #800040 solid;
+  background-color: #f7eef2;
+  color: #220011;
+  text-decoration: none;
+}
+.mx-button-neutral-hover-focus:active,
+.mx-button-neutral-hover-focus:focus {
+  border: 1px #110009 solid;
+  background-color: #800040;
+  color: #000000;
+  text-decoration: none;
+}
+/* ------------------------------------------------------------- */
+/* COMMON PROPERTIES (common.less)                               */
+/* ------------------------------------------------------------- */
+html {
+  overflow-y: scroll;
+}
+body {
+  padding: 0;
+  margin: 0 ;
+  font-size: 9pt;
+}
+div,
+p,
+span,
+table,
+th,
+td,
+input,
+textarea,
+select,
+button,
+a.button {
+  box-sizing: border-box;
+}
+.clearfix:after {
+  clear: both;
+  content: ".";
+  display: block;
+  height: 0;
+  visibility: hidden;
+}
+@media screen {
+  .noscreen {
+    display: none;
+  }
+}
+@media print {
+  .noprint {
+    display: none ;
+  }
+}
+@media handheld {
+  .nomobile {
+    display: none;
+  }
+}
+a.cti_call_action {
+  display: block;
+  padding-left: 18px;
+  top: 2px;
+  vertical-align: middle;
+  background-image: url(../image/icons/16x16/phone.png);
+  background-repeat: no-repeat;
+}
+.interact {
+  color: #808080;
+}
+.interact:hover {
+  color: black;
+}
+.cursor-default {
+  cursor: default;
+}
+.cursor-pointer {
+  cursor: pointer;
+}
+.cursor-help {
+  cursor: help;
+}
+.cke_contents iframe html body.cke_editable {
+  padding: 0;
+  margin: 0;
+}
+.top_border {
+  border-top: solid black;
+  border-width: 4px;
+}
+.bottom_border {
+  border-bottom: solid black;
+  border-width: 1px;
+}
+/* ------------------------------------------------------------- */
+/* SCAFFOLDING (scaffolding.less)                                */
+/* ------------------------------------------------------------- */
+body {
+  margin: 0 ;
+  color: #666666;
+  font-family: Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 9pt;
+  background-color: #d5aabf;
+}
+body #frame-header {
+  position: fixed;
+  top: 0;
+  z-index: 1040;
+}
+body #menuv3:first-child {
+  top: 0 !important;
+}
+body #menuv3 {
+  position: fixed;
+  z-index: 1999;
+  top: 28px ;
+  width: 100%;
+  height: 32px;
+}
+body .layout-actionbar {
+  display: block;
+  z-index: 1030;
+  position: fixed;
+  float: right !important;
+  width: auto;
+  top: 68px ;
+  right: 0.2em ;
+  margin: 0 0.4em 0 0;
+  padding: 0;
+  background: none;
+}
+body .layout-actionbar ~ div:first {
+  padding-top: 25px;
+}
+body .layout-actionbar > div + div {
+  margin-left: 2px;
+}
+body #content {
+  overflow: hidden;
+  display: block;
+  padding: 101px 0 0 0;
+  margin: 0 0 1em 0;
+  background-image: linear-gradient(to bottom, #f7eef2, #d5aabf);
+}
+body #content .wrapper {
+  clear: both;
+  display: block;
+  overflow: hidden;
+  width: 99%;
+  height: auto;
+}
+body #content .wrapper > .col {
+  display: block;
+  overflow: hidden;
+  float: left;
+  margin-right: 1.6em;
+}
+body #content .wrapper > .col div label {
+  font-size: 10pt;
+  line-height: 12.6pt;
+}
+body #content .wrapper > .col p {
+  font-size: 10pt;
+}
+body #content .wrapper > .col,
+body #content .wrapper > .tbl-horizontal {
+  float: left;
+  margin-right: 1.6em;
+  padding-bottom: 2px ;
+}
+body #content .wrapper.center {
+  margin: 0 auto;
+  display: table;
+  width: auto;
+}
+body #content .wrapper.width-moderate {
+  width: auto;
+}
+body #content .wrapper > table.tbl-horizontal:last-child {
+  margin-right: 0 !important ;
+}
+body .full-width {
+  width: 100% ;
+  padding: 0 0 1.0em 0 ;
+  margin: 0 0 0 0;
+}
+body div.center {
+  margin: 0 auto;
+  display: table;
+  width: auto;
+}
+/* ------------------------------------------------------------- */
+/* MAIN PROPERTIES (main.less)                                   */
+/* ------------------------------------------------------------- */
+#content > p,
+#content > div,
+#content > td,
+#content > th {
+  font-size: 9pt;
+}
+#content input,
+#content select,
+#content option,
+#content textarea {
+  font-size: 9pt;
+}
+h1 {
+  display: block;
+  text-align: left;
+  margin: 0;
+  font-weight: normal;
+  font-size: 12pt;
+  line-height: 1.2em ;
+}
+#content > h1 {
+  position: fixed;
+  z-index: 1020;
+  top: 60px;
+  width: 100%;
+  color: #e6ccd9;
+  background-color: #33001a;
+  padding: 0.7em 0.5em 0.7em 1.3em;
+}
+#content .wrapper h1 {
+  color: #000000;
+  font-size: 13pt;
+  margin: 0 0 0.4em 0;
+}
+body > h1 {
+  color: #e6ccd9;
+  background-color: #33001a;
+  padding: 0.7em 0.5em 0.7em 1.3em;
+}
+h2 {
+  color: #000000;
+  font-size: 13pt;
+  border-style: none;
+  letter-spacing: 0.14em;
+}
+#content > h2,
+.admin > h2 {
+  padding: 0.6em 0.2em ;
+  margin: 0.6em 0 0 0 ;
+}
+#content ui-tabs-panel .wrapper > h2,
+.admin ui-tabs-panel .wrapper > h2 {
+  padding: 0 0.2em 0.6em 0.2em ;
+  margin: 0 0 0.4em 0;
+}
+#content .wrapper > h2,
+.admin .wrapper > h2 {
+  padding: 2.0em 0.2em 0.6em 0.2em ;
+  margin: 0 ;
+  font-weight: normal;
+  clear: both;
+}
+#content .wrapper > h2:first-child,
+.admin .wrapper > h2:first-child {
+  padding-top: 0 ;
+}
+h2.confirm {
+  color: #003c18;
+}
+h2.error {
+  color: #ae0014;
+}
+h2.record-title {
+  padding: 0.6em 0 0 0 !important;
+  font-size: 13pt;
+  color: #000000;
+}
+h2.record-title small {
+  color: #000000;
+  letter-spacing: 0 ;
+}
+.wrapper > h2.record-title {
+  margin: 0em 1em 1em 0.2em !important;
+}
+.ui-tabs-panel > h2.record-title {
+  margin: 1em 1em 0.2em 1.2em !important;
+  padding: 0.8em 0 0 0.1em !important;
+}
+h3 {
+  font-size: 11pt;
+  font-weight: normal;
+  color: #33001a !important;
+  padding: 0.2em 0 0.2em 0.2em;
+  margin: 0.1em 0 0.4em 0 ;
+  text-align: left;
+  letter-spacing: 0.12em;
+}
+h3.caption {
+  margin: 0.6em 0 0.4em 0 !important;
+}
+#content h3 {
+  color: #000000;
+  padding-left: 0 ;
+  margin: 0.8em 0 0.4em 0 ;
+}
+#content .wrapper h3 {
+  margin-top: 1.0em ;
+}
+#content .wrapper h3:first-child {
+  margin-top: 0 ;
+}
+#content table.tbl-horizontal > tbody > tr > th > h3,
+#content table.tbl-horizontal > tbody > tr > td > h3 {
+  margin-top: 0.2em !important;
+}
+a {
+  text-decoration: none;
+}
+a:link,
+a:visited,
+a:active {
+  color: #33001a;
+}
+a:hover {
+  color: #000000;
+  text-decoration: underline;
+}
+a.selected:hover {
+  color: #EBEBEB;
+}
+a.nomobile {
+  background-color: transparent;
+  border: none;
+}
+a.green {
+  background-color: DarkGreen;
+  color: white !important;
+  border: none;
+}
+a.orange {
+  background-color: #FF8000;
+  border: none;
+}
+a.red {
+  background-color: #FF0000;
+  border: none;
+}
+ul,
+ol {
+  font-size: 11pt;
+}
+ul li,
+ol li {
+  font-size: 10pt;
+}
+.wrapper .col ul {
+  list-style: circle outside;
+  padding: 0 ;
+  margin: 0 ;
+}
+.wrapper .col ul li {
+  padding: 0 0 0 -0.6em;
+  margin: 0 0 0 0 ;
+}
+hr {
+  background-color: #3cff8a;
+  border: none;
+  height: 1px;
+}
+div.wi-smallest,
+span.wi-smallest,
+div.list.wi-smallest {
+  width: 42px;
+}
+div.wi-verysmall,
+span.wi-verysmall,
+div.list.wi-verysmall {
+  width: 80px;
+}
+div.wi-small,
+span.wi-small,
+div.list.wi-small {
+  width: 128px;
+}
+div.wi-mediumsmall,
+span.wi-mediumsmall,
+div.list.wi-mediumsmall {
+  width: 160px;
+}
+div.wi-normal,
+span.wi-normal,
+div.list.wi-normal {
+  width: 208px;
+}
+div.wi-lightwide,
+span.wi-lightwide,
+div.list.wi-lightwide {
+  width: 256px;
+}
+div.wi-wide,
+span.wi-wide,
+div.list.wi-wide {
+  width: 320px;
+}
+div.wi-wider,
+span.wi-wider,
+div.list.wi-wider {
+  width: 384px;
+}
+div.wi-verywide,
+span.wi-verywide,
+div.list.wi-verywide {
+  width: 576px;
+}
+div.long-description,
+div.long-desc,
+div.longdescription,
+div.longdesc {
+  font-size: 9pt;
+}
+div.long-description.small,
+div.long-desc.small,
+div.longdescription.small,
+div.longdesc.small {
+  font-size: 9pt;
+}
+div.long-description p,
+div.long-desc p,
+div.longdescription p,
+div.longdesc p {
+  margin: 0 0 0.6em 0;
+}
+div.long-description ul,
+div.long-desc ul,
+div.longdescription ul,
+div.longdesc ul,
+div.long-description ol,
+div.long-desc ol,
+div.longdescription ol,
+div.longdesc ol {
+  margin-top: 0 ;
+}
+div.long-description ul li,
+div.long-desc ul li,
+div.longdescription ul li,
+div.longdesc ul li,
+div.long-description ol li,
+div.long-desc ol li,
+div.longdescription ol li,
+div.longdesc ol li {
+  font-size: 9pt;
+}
+div.description {
+  display: block;
+  float: left ;
+  padding: 0 0 0.6em 0 ;
+}
+div.description.wi-verysmall {
+  width: 80px;
+}
+div.description.wi-small {
+  width: 128px;
+}
+div.description.wi-mediumsmall {
+  width: 160px;
+}
+div.description.wi-normal {
+  width: 208px;
+}
+div.description.wi-wide {
+  width: 320px;
+}
+div.description.wi-lightwide {
+  width: 256px;
+}
+div.description.wi-wider {
+  width: 384px;
+}
+div.description.wi-verywide {
+  width: 576px;
+}
+div.instructions {
+  background-color: #f7eef2;
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+  max-width: 70% ;
+  margin: 1em 1em 1em 1.2em;
+  padding: 0.6em 1em 1.2em 1.8em;
+  color: #4C4C4C;
+  font-size: 80%;
+}
+div.instructions p {
+  width: 30em;
+}
+span.label {
+  font-size: 9pt;
+  font-style: normal ;
+}
+span.value {
+  color: #000 ;
+}
+.center {
+  margin: 0 auto;
+  width: auto;
+}
+.accent div.label {
+  float: left ;
+  font-size: 80% ;
+  padding-top: 0.8em ;
+}
+.accent div.data {
+  float: left ;
+}
+.accent div.data input[type="text"] {
+  width: 20em !important ;
+}
+pre.filecontent {
+  border: 1px solid blue;
+  padding-left: 2px;
+  padding-right: 2px;
+}
+#expand_all,
+.expand {
+  cursor: pointer;
+  display: block;
+  max-width: 16px;
+  max-height: 16px;
+}
+.hidden {
+  display: none ;
+}
+.wrapper {
+  overflow: hidden ;
+  margin: 1em 1em 1em 1.2em;
+  padding: 0 0 1.0em 0 ;
+  clear: both ;
+  display: block ;
+  border: 1px transparent solid ;
+  width: 98.6%;
+}
+.wrapper .wrapper {
+  margin-left: 0 !important ;
+}
+.wrapper.test {
+  background-color: #FFE67C ;
+}
+.wrapper .tbl-horizontal,
+.wrapper .tbl-plain {
+  float: left ;
+}
+.wrapper > table.tbl-horizontal:last-child {
+  margin-right: 0 ;
+}
+.wrapper.toggled {
+  display: inline-block !important;
+  width: 98.6% ;
+}
+.wrapper.toggled table.tbl-horizontal {
+  margin-top: -1.8em;
+}
+.wrapper.toggled > .toggles {
+  display: block ;
+  position: relative     ;
+  top: 0            ;
+  margin-top: 4px          ;
+  float: right        ;
+  width: 100% ;
+}
+.wrapper.toggled > .toggles a.toggle {
+  display: block;
+  width: 100% ;
+  height: 18px ;
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+.wrapper.toggled > .toggles a.toggle.min,
+.wrapper.toggled > .toggles a.toggle.max {
+  background-position-x: 99% ;
+}
+.wrapper.toggled > .toggles a.toggle.min {
+  background-image: url(../image/toggle-down.png);
+}
+.wrapper.toggled > .toggles a.toggle.max {
+  background-image: url(../image/toggle-left.png);
+}
+.wrapper.bordered {
+  border: 1px #800040 solid;
+  border-radius: 4px ;
+}
+.wrapper .col {
+  float: left ;
+}
+.wrapper .col.test {
+  background-color: #FFD7BA;
+  border: 1px #6CF solid;
+}
+.wrapper .col.wi-small {
+  width: 128px;
+}
+.wrapper .col.wi-mediumsmall {
+  width: 160px;
+}
+.wrapper .col.wi-normal {
+  width: 208px;
+}
+.wrapper .col.wi-wide {
+  width: 320px;
+}
+.wrapper .col.wi-lightwide {
+  width: 256px;
+}
+.wrapper .col.wi-wider {
+  width: 384px;
+}
+.wrapper .col.wi-verywide {
+  width: 576px;
+}
+.wrapper .col .tbl-horizontal,
+.wrapper .col .tbl-plain {
+  float: none ;
+  clear: left ;
+}
+.wrapper > p {
+  max-width: 36.0em ;
+  overflow: hidden ;
+  font-size: 9pt;
+  line-height: 140%;
+  padding-bottom: 1.0em ;
+}
+.plus,
+.minus,
+.plus0,
+.plus1 {
+  display: inline !important;
+  clear: none;
+}
+.minus,
+plus0 {
+  color: #ae0014;
+}
+.plus,
+.plus1 {
+  color: #003c18;
+}
+span.unbalanced_ledger {
+  background-color: #ffe38d;
+}
+div.dimmed-text,
+span.dimmed-text {
+  color: #888888;
+  font-style: italic;
+}
+.dunned_invoice {
+  font-weight: bold;
+  color: #f00;
+}
+.customer_dunning_level {
+  font-weight: bold;
+}
+#dunning_invoice_list .direct_debit td,
+#dunning_invoice_list .direct_debit a {
+  color: #888888;
+}
+#bank_transactions_proposals .invoice_number_highlight a,
+#bank_transactions_proposals span.invoice_number_highlight {
+  background-color: #003c18;
+  color: #FFFFFF;
+}
+.spacer {
+  clear: both;
+}
+#content > p {
+  margin: 0.6em 2em 1em 0.7em;
+}
+#content > p.message_hint {
+  margin: 0.6em 2em 1em 1em;
+}
+/* ------------------------------------------------------------- */
+/* MAIN LOGIN (main_login.less)                                  */
+/* ------------------------------------------------------------- */
+div#login,
+div.login {
+  margin: 0 auto;
+  width: 100%;
+  padding: 0 ;
+  text-align: center ;
+}
+div#login h1,
+div.login h1 {
+  text-align: center;
+  font-size: 150%;
+  top: 0 ;
+  width: 100% ;
+  display: block ;
+  vertical-align: middle;
+  background-color: green ;
+  color: white ;
+  padding: 0.8em 0 ;
+  z-index: 10 ;
+}
+div#login #login-elements,
+div.login #login-elements {
+  width: 24.0em ;
+  margin: 0 auto ;
+  text-align: center ;
+  display: block ;
+}
+div#login #login-elements h3,
+div.login #login-elements h3 {
+  text-align: left;
+}
+div#login #login-elements > div,
+div.login #login-elements > div {
+  text-align: center ;
+}
+div#login #login-elements > div p,
+div.login #login-elements > div p {
+  text-align: center;
+}
+div#login #login-elements div.logo,
+div.login #login-elements div.logo {
+  width: auto;
+  clear: both;
+  margin: 3.0em auto 1.0em auto;
+  padding: 2.0em 0 0 0;
+}
+div#login #login-elements form,
+div.login #login-elements form {
+  margin: 0 auto ;
+  width: 100% ;
+}
+div#login #login-elements div.separate-form,
+div.login #login-elements div.separate-form {
+  background-color: #ddd ;
+  border: 1px #888888 solid;
+  border-radius: 0.6em;
+  display: block ;
+  margin: 0 auto ;
+  width: 100% ;
+  padding: 0 0.6em 1.0em 0.6em ;
+}
+div#login #login-elements table.login,
+div.login #login-elements table.login {
+  width: auto;
+  float: none;
+  clear: both;
+}
+div#login #login-elements table.login input[type="submit"],
+div.login #login-elements table.login input[type="submit"] {
+  margin-top: 0.2em ;
+}
+div#login #login-elements table.login caption,
+div.login #login-elements table.login caption {
+  margin: 0.7em 0 0.4em 0;
+}
+div#login #login-elements .message,
+div.login #login-elements .message {
+  width: 100% ;
+  word-wrap: normal;
+  min-width: 0;
+}
+div.logged-in {
+  margin: 0 auto ;
+  padding: 1.0em 0.5em 2.0em 0.5em ;
+  width: 60.0em;
+  min-width: 60.0em;
+  overflow: hidden;
+}
+div.logged-in .col {
+  width: 48%;
+  display: inline-block;
+  float: left;
+}
+div.logged-in .col p {
+  font-size: 10pt ;
+}
+div.logged-in .message {
+  width: 100% ;
+  min-width: 100% ;
+  max-width: 100% ;
+}
+/* ------------------------------------------------------------- */
+/* MENU FRAME HEADER (menu_frame_header.less)                    */
+/* ------------------------------------------------------------- */
+#frame-header {
+  text-align: left;
+  margin: 0;
+  padding: 0.2em 0.6em;
+  border: 0;
+  overflow: hidden;
+  height: 28px;
+  width: 100%;
+  display: table-cell;
+  vertical-align: middle;
+  border-spacing: 0;
+  background-color: #220011;
+  line-height: 100%;
+  font-size: 9pt;
+}
+#frame-header span.frame-header-element {
+  color: #f7eef2;
+  padding-top: 0.2em;
+}
+#frame-header span.frame-header-element a:link,
+#frame-header span.frame-header-element a:visited,
+#frame-header span.frame-header-element a:hover,
+#frame-header span.frame-header-element a:active {
+  text-decoration: none;
+  border-bottom: none;
+  color: #d5aabf;
+}
+#frame-header span.frame-header-element a:hover {
+  color: #ffffff;
+  text-decoration: underline;
+  /*underline*/
+
+}
+#frame-header span.frame-header-element span.mandate {
+  text-transform: uppercase ;
+  font-size: 130% ;
+}
+#frame-header span.frame-header-left,
+#frame-header span.frame-header-center,
+#frame-header span.frame-header-right {
+  border-spacing: 0;
+  padding: 0;
+  vertical-align: middle;
+  height: 100%;
+  display: table-row;
+}
+#frame-header span.frame-header-left > span,
+#frame-header span.frame-header-center > span,
+#frame-header span.frame-header-right > span {
+  height: 24px;
+  margin: 0 10px;
+  display: table-cell;
+  vertical-align: middle;
+}
+#frame-header span.frame-header-left {
+  float: left;
+  padding: 0 1.0em 0 0.2em ;
+  margin-right: 1.0em ;
+}
+#frame-header span.frame-header-left > span {
+  padding-right: 1.0em ;
+}
+#frame-header span.frame-header-right {
+  float: right;
+  vertical-align: middle;
+  padding: 0 1.2em 0 1.0em ;
+  margin-left: 1.0em;
+}
+#frame-header span.frame-header-right > span {
+  padding-left: 1.0em ;
+}
+#frame-header #ajax-spinner {
+  display: none;
+}
+#frame-header div.frame-header-quicksearch {
+  display: block;
+  overflow: hidden;
+  margin: 0 auto;
+  text-align: center;
+  width: 52%;
+}
+#frame-header div.frame-header-quicksearch span.frame-header-quicksearch input {
+  font-size: 9pt;
+  margin-top: 0.1em;
+  background-color: #d5aabf;
+  width: auto !important;
+  min-width: 6em;
+  max-width: 8em;
+  padding: 0 0.2em ;
+  border-width: 1px ;
+  border-style: solid;
+  border-top-color: #949494;
+  border-right-color: #BCBCBC;
+  border-bottom-color: #BCBCBC;
+  border-left-color: #949494;
+}
+/* /#frame-header  */
+/* ------------------------------------------------------------- */
+/* MENU (V3) and HTML MENU (menu.less)                          */
+/* ------------------------------------------------------------- */
+#menuv3 {
+  background-color: #e6ccd9;
+}
+#menuv3 li {
+  display: block;
+  position: relative;
+  float: none;
+  font-weight: normal !important ;
+  font-size: 9pt;
+  line-height: 96%;
+  white-space: nowrap;
+  border: 0;
+  padding: 0;
+  margin: 0;
+}
+#menuv3 li:hover {
+  cursor: pointer;
+}
+#menuv3 li a,
+#menuv3 li a:visited,
+#menuv3 li div.x,
+#menuv3 li div.x:visited {
+  display: block;
+  color: #220011;
+  text-decoration: none;
+}
+#menuv3 > ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  float: left;
+}
+#menuv3 > ul > li {
+  display: block;
+  height: 17px;
+  padding: 9px 0.9em 6px 0.9em;
+  background-color: #e6ccd9;
+  color: #220011;
+  vertical-align: middle;
+  /* List 2nd Level (Vertical) */
+
+}
+#menuv3 > ul > li:hover {
+  background-color: #d5aabf;
+}
+#menuv3 > ul > li:hover > ul {
+  display: block;
+  position: absolute;
+}
+#menuv3 > ul > li ul {
+  position: relative;
+  display: none;
+  padding: 0 2em 2em 2em;
+  margin: 0 -2em -2em -2.8em;
+}
+#menuv3 > ul > li ul li {
+  border-bottom: 1px #800040 solid;
+  padding: 0.45em 0.6em 0.58em 0.8em ;
+}
+#menuv3 > ul > li > ul {
+  top: 32px;
+}
+#menuv3 > ul > li > ul > li {
+  background-color: #d5aabf;
+  padding-left: 12px ;
+  margin-left: 1px;
+}
+#menuv3 > ul > li > ul > li div.x {
+  background: no-repeat right url("../image/menu-arrow-to-right-5.png");
+  padding-right: 2.0em ;
+}
+#menuv3 > ul > li > ul > li:hover {
+  color: #110009;
+  background-color: #e6ccd9;
+}
+#menuv3 > ul > li > ul > li:hover > ul {
+  display: block;
+  position: absolute;
+}
+#menuv3 > ul > li > ul > li > ul {
+  top: 0;
+  left: 99%;
+  padding: 2em;
+  margin-top: -2.06em;
+  margin-right: -2em;
+  margin-bottom: -2em;
+  margin-left: -2em;
+  list-style: none;
+}
+#menuv3 > ul > li > ul > li > ul > li {
+  background-color: #e6ccd9;
+}
+#menuv3 > ul > li > ul > li > ul > li:hover {
+  background-color: #d5aabf;
+}
+#menuv3 > ul > li > ul > li > ul > li:first-child {
+  border-top: 1px #800040 solid ;
+}
+li.sub {
+  position: relative;
+  left: 0.2em;
+  top: 0px;
+  background-color: #FFFFFF;
+}
+body > #layout-split-left {
+  display: block;
+  position: fixed !important;
+  top: 0 ;
+  left: 0 ;
+  width: 200px;
+  height: 100%;
+  z-index: 1;
+  overflow: hidden   ;
+  border-right: 1px #888888 solid;
+  background-color: #666666;
+}
+div#layout-split-right {
+  margin-left: 200px;
+  padding-top: 28px;
+  display: block;
+  z-index: 1;
+  overflow: hidden;
+  min-height: 800px;
+  height: auto;
+}
+div#layout-split-right .layout-actionbar {
+  top: 36px;
+}
+div#layout-split-right > #content {
+  top: 68px;
+  padding-top: 30px;
+}
+div#layout-split-right > #content > .wrapper {
+  padding-top: 2em ;
+}
+div#layout-split-right > #content h1 {
+  top: 28px !important;
+}
+div#layout-split-right > #content > form > .tabwidget > ui-tabs-panel .wrapper {
+  margin-top: 2em;
+}
+div#layout-split-right > #content > form > .tabwidget > ui-tabs-panel .tabwidget ul.ui-tabs-nav {
+  position: relative;
+}
+div#layout-split-right > #content > form > .tabwidget > ul.ui-tabs-nav {
+  top: 69px;
+}
+div#layout-split-right > #content > #requirement_spec_tabs.tabwidget > ul.ui-tabs-nav {
+  top: 69px !important ;
+}
+div#layout-split-right.folded {
+  margin-left: 40px;
+}
+div.layout-split-right.folded {
+  margin-left: 40px;
+}
+#layout-split-left #html-menu {
+  display: block;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 27px 0 0 0;
+  padding: 0 0 150px 0;
+  background-color: #e6ccd9;
+  font-size: 10pt;
+  border-bottom: 20px #800040 solid;
+}
+#layout-split-left #html-menu::-webkit-scrollbar {
+  display: none;
+}
+#layout-split-left #html-menu > div:last-of-type {
+  border-bottom: 1px #800040 solid;
+}
+#layout-split-left #html-menu .mi {
+  display: block ;
+}
+#layout-split-left #html-menu .mi a {
+  display: block;
+  word-wrap: break-word;
+}
+#layout-split-left #html-menu .mi:first-child {
+  border-top: 2px #800040 solid;
+}
+#layout-split-left #html-menu .mi:last-child {
+  border-bottom: 1px #800040 solid;
+}
+#layout-split-left #html-menu .s0 {
+  padding: 0 ;
+  background-color: #d5aabf;
+  color: #220011;
+  border-top: 1px #800040 solid;
+  font-size: 90% ;
+  text-transform: uppercase;
+}
+#layout-split-left #html-menu .s0 a {
+  padding: 5px 0 6px 8px ;
+  cursor: pointer ;
+}
+#layout-split-left #html-menu .s0 a:hover,
+#layout-split-left #html-menu .s0 a:active {
+  background-color: #33001a;
+  color: #f7eef2;
+  text-decoration: none;
+}
+#layout-split-left #html-menu .s0 a:link,
+#layout-split-left #html-menu .s0 a:visited {
+  color: #220011;
+}
+#layout-split-left #html-menu .s0.menu-open {
+  font-weight: normal;
+  background-color: #220011;
+  color: #e6ccd9;
+  border-bottom: 0 ;
+}
+#layout-split-left #html-menu .s0.menu-open a {
+  padding: 5px 0 6px 8px ;
+  cursor: auto ;
+}
+#layout-split-left #html-menu .s0.menu-open a:hover,
+#layout-split-left #html-menu .s0.menu-open a:active {
+  background-color: #220011;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+#layout-split-left #html-menu .s0.menu-open a:link,
+#layout-split-left #html-menu .s0.menu-open a:visited {
+  color: #e6ccd9;
+}
+#layout-split-left #html-menu .s1 {
+  font-size: 80% ;
+  padding: 0 ;
+  background-color: #e6ccd9;
+  border-top: 1px #800040 solid;
+}
+#layout-split-left #html-menu .s1 a {
+  padding: 4px 0 3px 8px ;
+}
+#layout-split-left #html-menu .s1 a:hover,
+#layout-split-left #html-menu .s1 a:active {
+  background-color: #d5aabf;
+  color: #000000;
+  text-decoration: none;
+}
+#layout-split-left #html-menu .s1 a:link,
+#layout-split-left #html-menu .s1 a:visited {
+  color: #220011;
+}
+#layout-split-left #html-menu .s1.sm:after {
+  content: "▼";
+  color: #888888;
+  font-size: 80% ;
+}
+#layout-split-left #html-menu .s1.sm a {
+  display: inline-block;
+  width: 162px;
+  color: #220011;
+}
+#layout-split-left #html-menu .s1.sm a:hover,
+#layout-split-left #html-menu .s1.sm a:active {
+  background-color: #e6ccd9;
+  color: #220011;
+  text-decoration: none ;
+}
+#layout-split-left #html-menu .s1.sm a:link,
+#layout-split-left #html-menu .s1.sm a:visited {
+  color: #220011;
+}
+#layout-split-left #html-menu .s1.sm a.ml:link,
+#layout-split-left #html-menu .s1.sm a.ml:visited {
+  color: #220011;
+}
+#layout-split-left #html-menu .s1 > .s2:last-child {
+  border-bottom: 1px #800040 solid;
+}
+#layout-split-left #html-menu .s2 {
+  padding: 0 ;
+  font-size: 80% ;
+  background-color: #e6ccd9;
+}
+#layout-split-left #html-menu .s2 a {
+  padding: 2px 0 3px 20px ;
+}
+#layout-split-left #html-menu .s2 a:hover,
+#layout-split-left #html-menu .s2 a:active {
+  background-color: #d5aabf;
+  color: #000000;
+  text-decoration: none;
+}
+#layout-split-left #html-menu .s2 a:link,
+#layout-split-left #html-menu .s2 a:visited {
+  color: #220011;
+}
+#main_menu_div .DHTMLSuite_menuBar_top {
+  top: 28px;
+  height: 31px !important;
+  padding: 0;
+  margin: 0 ;
+}
+#main_menu_div .DHTMLSuite_menuBar_top > div {
+  padding: 0.3em 0 0 0 ;
+}
+#main_menu_div .DHTMLSuite_menuBar_top > div .DHTMLSuite_menuItem_textContent {
+  font-size: 90% ;
+  padding: 0.1em 0.2em 0.2em 0.2em ;
+}
+#main_menu_div .DHTMLSuite_menuBar_top > div .DHTMLSuite_menuItem_top_arrowShowSub {
+  margin: 0 0.2em 0.2em 0.2em ;
+}
+#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_over,
+#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_click {
+  color: #ae0014;
+  background-color: #ffffff;
+}
+#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_over .DHTMLSuite_menuItem_top_arrowShowSub,
+#main_menu_div .DHTMLSuite_menuBar_top .DHTMLSuite_menuItem_top_click .DHTMLSuite_menuItem_top_arrowShowSub {
+  border: none !important ;
+}
+.DHTMLSuite_menuBar_sub {
+  width: auto !important;
+  padding: 0.1em 0 0.4em 0.4em !important;
+  margin: 11px 0 0 0;
+  border-top: none;
+  border-right: 1px solid #e6ccd9;
+  border-bottom: 1px solid #e6ccd9;
+  border-left: 1px solid #e6ccd9;
+}
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_regular,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_click,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_disabled,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active {
+  clear: both;
+  padding-left: 25px;
+  padding-right: 0.7em;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  cursor: pointer;
+  background-repeat: no-repeat;
+  font-size: 90%;
+}
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_regular .DHTMLSuite_menuItem_sub_arrowShowSub,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over .DHTMLSuite_menuItem_sub_arrowShowSub,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_click .DHTMLSuite_menuItem_sub_arrowShowSub,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_disabled .DHTMLSuite_menuItem_sub_arrowShowSub,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active .DHTMLSuite_menuItem_sub_arrowShowSub {
+  right: 3px !important;
+}
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_over,
+.DHTMLSuite_menuBar_sub .DHTMLSuite_menuItem_sub_active {
+  color: #8d6a00;
+  background-color: #ffffff;
+}
+/* ------------------------------------------------------------- */
+/* Menu Actionbar (menu_actionbar.less)                          */
+/* ------------------------------------------------------------- */
+.layout-actionbar div.layout-actionbar-separator {
+  display: block;
+  width: 0.6em;
+  height: 0.6em;
+  float: left;
+  content: "&nbsp;";
+  position: relative;
+  border: none;
+}
+.layout-actionbar div.layout-actionbar-action {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  height: 25px;
+  font-size: 9pt;
+}
+.layout-actionbar div.layout-actionbar-action.layout-actionbar-action-disabled {
+  color: #800040 !important;
+}
+.layout-actionbar div.layout-actionbar-action.layout-actionbar-action-disabled:hover {
+  text-decoration: none !important;
+}
+.layout-actionbar > div.layout-actionbar-action {
+  border-radius: 4px;
+  border: 1px #33001a solid;
+  background-color: #d5aabf;
+  float: left;
+  color: #33001a;
+  z-index: 1031;
+}
+.layout-actionbar div.layout-actionbar-link,
+.layout-actionbar div.layout-actionbar-submit,
+.layout-actionbar div.layout-actionbar-scriptbutton {
+  display: block;
+  min-width: 90px;
+  width: auto;
+  box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  text-align: center;
+  padding: 4px 10px;
+  cursor: default;
+}
+.layout-actionbar div.layout-actionbar-link:focus,
+.layout-actionbar div.layout-actionbar-submit:focus,
+.layout-actionbar div.layout-actionbar-scriptbutton:focus {
+  border-color: darkgray;
+  background-color: #e6ccd9;
+}
+.layout-actionbar div.layout-actionbar-link:hover,
+.layout-actionbar div.layout-actionbar-submit:hover,
+.layout-actionbar div.layout-actionbar-scriptbutton:hover {
+  border-width: 1px;
+  border-style: solid;
+}
+.layout-actionbar .layout-actionbar-default-action {
+  font-weight: normal;
+}
+.layout-actionbar div.layout-actionbar-combobox {
+  position: relative;
+  display: block;
+  float: left;
+  width: 110px;
+  z-index: 1031;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head {
+  padding-right: 20px;
+  white-space: nowrap;
+  display: block;
+  margin-bottom: -1px;
+  float: right;
+  z-index: 1033;
+  position: relative;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head > div {
+  min-width: 90px;
+  height: 25px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border: 1px #33001a solid;
+  background-color: #d5aabf;
+  color: #33001a;
+  position: relative;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-head > span {
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 24px !important;
+  height: 25px !important;
+  border: 1px #33001a solid;
+  border-left: none;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  padding: 4px;
+  background-color: #d5aabf;
+  background-image: url("../image/select-down.png");
+  background-repeat: no-repeat;
+  background-position: 5px 5px;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list {
+  position: relative;
+  display: none;
+  min-width: 140px;
+  float: right;
+  overflow: hidden;
+  border: 1px solid #33001a;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  z-index: 1032;
+  top: 1px;
+  background-color: #d5aabf;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list div.layout-actionbar-action {
+  white-space: nowrap;
+  display: block;
+  position: relative;
+  width: 100%;
+  text-align: left;
+  padding: 0.6em 0.6em 0.6em 1.0em;
+  border-bottom: none !important;
+  background-color: #d5aabf;
+  color: #33001a;
+}
+.layout-actionbar div.layout-actionbar-combobox div.layout-actionbar-combobox-list div.layout-actionbar-action:hover {
+  color: #33001a;
+  text-decoration: underline;
+  background-color: #e6ccd9;
+}
+.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head {
+  height: 29px;
+  border-bottom: none !important ;
+}
+.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head div {
+  border-bottom-left-radius: 0 !important;
+  border-bottom: none;
+  height: 30px ;
+}
+.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head span {
+  border-bottom-right-radius: 0 !important;
+  border-bottom: none;
+  height: 30px !important ;
+}
+.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list {
+  display: inline-table;
+  border-top-right-radius: 0 !important;
+}
+.layout-actionbar div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list div.layout-actionbar-action {
+  border: none !important;
+}
+/* ------------------------------------------------------------- */
+/* MESSAGES (messages.less)                                      */
+/* ------------------------------------------------------------- */
+.mx-message {
+  display: block;
+  overflow: hidden;
+  overflow-x: auto;
+  clear: both ;
+  width: auto;
+  min-width: 60em;
+  max-width: 40em;
+  padding: 0.6em 0.8em ;
+  font-size: 9pt;
+  font-weight: normal;
+  line-height: 110% ;
+  text-align: left;
+  white-space: normal;
+  border-radius: 0.6em;
+  border-style: solid;
+  border-width: 1px;
+}
+.flash_message,
+.message,
+.flash_message_error,
+.message_error,
+.flash_message_ok,
+.message_ok,
+.flash_message_hint,
+.message_hint,
+.flash_message_warning,
+.message_warning,
+.flash_message_info,
+.message_info {
+  display: block;
+  overflow: hidden;
+  overflow-x: auto;
+  clear: both ;
+  width: auto;
+  min-width: 60em;
+  max-width: 40em;
+  padding: 0.6em 0.8em ;
+  font-size: 9pt;
+  font-weight: normal;
+  line-height: 110% ;
+  text-align: left;
+  white-space: normal;
+  border-radius: 0.6em;
+  border-style: solid;
+  border-width: 1px;
+}
+.message_error > .message_error,
+.message_warning > .message_error,
+.message_hint > .message_error,
+.message_info > .message_error,
+.message_ok > .message_error,
+.message_error > .message_warning,
+.message_warning > .message_warning,
+.message_hint > .message_warning,
+.message_info > .message_warning,
+.message_ok > .message_warning,
+.message_error > .message_hint,
+.message_warning > .message_hint,
+.message_hint > .message_hint,
+.message_info > .message_hint,
+.message_ok > .message_hint,
+.message_error > .message_info,
+.message_warning > .message_info,
+.message_hint > .message_info,
+.message_info > .message_info,
+.message_ok > .message_info,
+.message_error > .message_ok,
+.message_warning > .message_ok,
+.message_hint > .message_ok,
+.message_info > .message_ok,
+.message_ok > .message_ok {
+  display: none;
+}
+.message_error {
+  color: #ae0014;
+  background-color: #ffaeb7;
+  border-color: 1px solid #ae0014;
+}
+.message_error h4 {
+  color: #ae0014;
+}
+.message_error p {
+  color: #ae0014;
+}
+.message_warning {
+  color: #8d6a00;
+  background-color: #ffe38d;
+  border-color: 1px solid #8d6a00;
+}
+.message_hint,
+.message_info {
+  color: #209ec8;
+  background-color: #ebf8fc;
+  border-color: 1px solid #209ec8;
+}
+.message_hint h4,
+.message_info h4 {
+  color: #209ec8;
+}
+.message_hint p,
+.message_info p {
+  color: #209ec8;
+}
+.message_ok {
+  color: #003c18;
+  background-color: #3cff8a;
+  border-color: 1px solid #003c18;
+}
+.message.attention {
+  font-size: 9pt;
+  border-color: 1px solid #8d6a00;
+  background-color: #ffe38d;
+}
+.message.attention h4 {
+  color: #8d6a00;
+}
+.message.attention p {
+  color: #8d6a00;
+}
+.message h4 {
+  font-weight: bold;
+  font-size: 110%;
+  margin: 0.4em 1.0em 0.2em 0 ;
+  padding: 0;
+}
+.message p {
+  margin: 0 1.0em 0.6em 0 ;
+  padding: 0;
+}
+#content > form > .message,
+#content > form > .ui-tabs > .ui-tabs-panel > .message {
+  margin: 1.2em 0 1.2em 1.2em;
+}
+#content > form > .message.message_ok,
+#content > form > .ui-tabs > .ui-tabs-panel > .message.message_ok,
+#content > form > .message.message_info,
+#content > form > .ui-tabs > .ui-tabs-panel > .message.message_info,
+#content > form > .message.message_hint,
+#content > form > .ui-tabs > .ui-tabs-panel > .message.message_hint,
+#content > form > .message.message_error,
+#content > form > .ui-tabs > .ui-tabs-panel > .message.message_error,
+#content > form > .message.message_warning,
+#content > form > .ui-tabs > .ui-tabs-panel > .message.message_warning {
+  margin-left: 1.2em;
+}
+#content > p.message_ok,
+#content > p.message_info,
+#content > p.message_hint,
+#content > p.message_error,
+#content > p.message_warning {
+  margin-left: 1.2em;
+}
+#content > .message_ok,
+#content > .message_info,
+#content > .message_hint,
+#content > .message_error,
+#content > .message_warning {
+  margin: 1.2em 0 1.2em 1.2em;
+}
+.wrapper > .message,
+.wrapper > .message_ok,
+.wrapper > .message_info,
+.wrapper > .message_hint,
+.wrapper > .message_error,
+.wrapper > .message_warning {
+  margin: 0 0 0.4em 0;
+}
+p.message,
+p.message_error,
+p.message_warning,
+p.message_hint,
+p.message_info,
+p.message_ok {
+  padding-bottom: 0.4em ;
+}
+body > div.login .message {
+  width: 100% ;
+  text-align: center ;
+  margin: 0 auto 1.0em auto ;
+}
+.flash_message.flash_message_error {
+  background-color: #ffaeb7;
+  border-color: 1px solid #ae0014;
+  color: #ae0014;
+}
+.flash_message.flash_message_error a.button.wi-tiny,
+.flash_message.flash_message_error a.icon-close {
+  border: 1px solid #ae0014 !important;
+  color: #ae0014;
+}
+.flash_message.flash_message_ok {
+  background-color: #3cff8a;
+  border: 1px solid #003c18;
+  color: #003c18;
+}
+.flash_message.flash_message_ok a.button.wi-tiny,
+.flash_message.flash_message_ok a.icon-close {
+  border: 1px solid #003c18;
+  color: #003c18;
+}
+.flash_message.flash_message_warning {
+  background-color: #ffe38d;
+  border-color: 1px solid #8d6a00;
+  color: #8d6a00;
+}
+.flash_message.flash_message_warning a.button.wi-tiny,
+.flash_message.flash_message_warning a.icon-close {
+  border: 1px solid #8d6a00;
+  color: #8d6a00;
+}
+.flash_message.flash_message_info {
+  background-color: #ebf8fc;
+  border: 1px solid #209ec8;
+  color: #209ec8;
+}
+.flash_message.flash_message_info a.button.wi-tiny,
+.flash_message.flash_message_info a.icon-close {
+  border: 1px solid #209ec8;
+  color: #209ec8;
+}
+.flash_message .flash_title {
+  font-weight: bold;
+  float: left;
+  display: block ;
+  padding-right: 1.0em ;
+}
+.flash_message .flash_notification {
+  float: left;
+  display: block ;
+}
+.flash_message a.button.wi-tiny {
+  font-size: 76% ;
+  padding: 0 0.2em 0 0.2em ;
+  margin: 0 0.4em 0 0.4em  ;
+  width: auto ;
+  background-color: transparent;
+}
+.flash_message div.button-container,
+.flash_message div.icon-container {
+  overflow: hidden ;
+  width: 12% ;
+  float: right ;
+}
+.flash_message div.button-container a.icon-close,
+.flash_message div.icon-container a.icon-close {
+  font-size: 76% ;
+  float: right ;
+  border-width: 1px ;
+  border-style: solid ;
+  padding: 0 3px ;
+  border-radius: 3px;
+}
+.flash_message div.button-container span.display,
+.flash_message div.icon-container span.display {
+  float: right !important;
+  display: block;
+  width: auto ;
+  text-align: right ;
+  margin: 0 ;
+  padding: 0;
+}
+.flash_message div.message-container {
+  overflow: hidden ;
+  width: 86% ;
+  float: left ;
+}
+.flash_message div.message-container > span.flash_title {
+  display: block;
+  float: left ;
+  width: auto ;
+}
+.flash_message div.message-container > div.flash_notification {
+  display: block;
+  float: left ;
+  max-width: 80% ;
+  width: auto ;
+}
+.flash_message div.message-container > div.flash_notification span.content {
+  float: left ;
+  display: block;
+  width: 100% ;
+}
+.flash_message div.message-container > div.flash_notification div.detail {
+  display: block;
+  clear: both ;
+  padding-top: 0.9em ;
+}
+.flash_message div.message-container > div.flash_notification div.detail span {
+  display: block;
+  width: 94%;
+  float: right;
+}
+.flash_message div.message-container > div.flash_notification div.detail a.button.wi-tiny {
+  display: block ;
+  float: left ;
+  margin-left: 0 ;
+}
+.wrapper .flash_message {
+  margin: 0 0 0.4em 0;
+}
+.wrapper .flash_message_error,
+.wrapper .flash_message_ok,
+.wrapper .flash_message_warning,
+.wrapper .flash_message_info {
+  margin: 0 0 0.4em 0;
+}
+#content > form > .flash_message,
+#content > form > .flash_message_error,
+#content > form > .flash_message_ok,
+#content > form > .flash_message_warning,
+#content > form > .flash_message_info {
+  margin: 48px 0 0 1.2em;
+}
+#content > .flash_message,
+#content > .flash_message_error,
+#content > .flash_message_ok,
+#content > .flash_message_warning,
+#content > .flash_message_info {
+  margin: 24px 0 0 1.2em;
+}
+/* ------------------------------------------------------------- */
+/* tables (tables.less)                                          */
+/* ------------------------------------------------------------- */
+table {
+  table-layout: auto ;
+  border-spacing: 1px ;
+}
+table td,
+table th {
+  text-align: left ;
+  vertical-align: top ;
+  font-weight: normal ;
+}
+table td.right,
+table th.right {
+  text-align: right  !important ;
+}
+table td.center,
+table th.center {
+  text-align: center !important ;
+}
+table td.center input,
+table th.center input {
+  float: none   !important ;
+}
+table td.numeric,
+table th.numeric {
+  text-align: right  !important ;
+}
+table td.numeric-centered,
+table th.numeric-centered {
+  text-align: center !important ;
+}
+table td.date,
+table th.date {
+  text-align: right  !important ;
+}
+table td.button,
+table th.button {
+  text-align: center !important ;
+}
+table td.img,
+table th.img {
+  text-align: center !important ;
+}
+table td.top,
+table th.top {
+  vertical-align: top    !important ;
+}
+table td.long-desc,
+table th.long-desc,
+table td.long-description,
+table th.long-description,
+table td.longdesc,
+table th.longdesc,
+table td.longdescription,
+table th.longdescription,
+table td div.description,
+table th div.description {
+  font-size: 80% ;
+  color: #220011;
+}
+table td.highlight,
+table th.highlight {
+  background-color: #b4f4fe;
+}
+table td h3,
+table th h3,
+table td h4,
+table th h4 {
+  margin: 0 !important ;
+  padding: 0.8em 0 0.2em 0 !important ;
+}
+table td > a,
+table th > a {
+  display: block ;
+}
+table td img,
+table th img {
+  display: inline ;
+  vertical-align: top    ;
+}
+table td + a img,
+table th + a img,
+table td + img,
+table th + img {
+  float: left   ;
+}
+table td ~ a img,
+table th ~ a img,
+table td ~ img,
+table th ~ img {
+  float: right  ;
+}
+table td div.description,
+table th div.description {
+  float: none ;
+  clear: both ;
+}
+table td > input + div.description,
+table th > input + div.description,
+table td > select + div.description,
+table th > select + div.description {
+  margin-top: 0.4em ;
+}
+table td span.label,
+table th span.label {
+  display: block ;
+  padding: 0 0 0.5em 0 ;
+  color: #33001a;
+}
+table td span.below,
+table th span.below {
+  overflow: hidden ;
+  display: block ;
+}
+table td span.below input,
+table th span.below input {
+  margin: 0.6em 0 0 0 !important ;
+}
+table td span.below input[type="checkbox"],
+table th span.below input[type="checkbox"] {
+  padding: 0.6em 0.6em 0 0 ;
+}
+table td span.above,
+table th span.above {
+  overflow: hidden ;
+  display: block ;
+  margin-bottom: 0.4em ;
+  padding: 0.3em 0.3em 0 0 !important ;
+}
+table td + input.below,
+table th + input.below {
+  margin: 0 !important;
+}
+table td input.below,
+table th input.below,
+table td select.below,
+table th select.below {
+  display: block ;
+  clear: left ;
+  float: none ;
+  overflow: hidden ;
+  margin: 0.3em 0 0 0 ;
+}
+table td textarea,
+table th textarea {
+  margin: -0.14em 0em;
+}
+table th {
+  white-space: normal !important ;
+}
+table td {
+  color: #110009;
+}
+table tr.header-caption th {
+  vertical-align: bottom ;
+}
+table tr.separator th,
+table tr.separator td {
+  padding-bottom: 3.0em ;
+}
+table tr.separator.below th,
+table tr.separator.below td {
+  padding-bottom: 3.0em ;
+}
+table tr.separator.above th,
+table tr.separator.above td {
+  padding-top: 3.0em ;
+  padding-bottom: 0   ;
+}
+table tr.total-sub {
+  height: 2.0em ;
+}
+table tr.total-sub td {
+  border-top: 1px solid #33001a;
+  border-bottom: 2px solid #33001a;
+  font-weight: bold ;
+  color: #110009;
+}
+table tr.heading th {
+  font-size: 120% ;
+  border-top: 1px #33001a solid;
+}
+table caption,
+table th.caption {
+  font-size: 11pt;
+  font-weight: normal;
+  color: #33001a !important;
+  padding: 0.2em 0 0.2em 0.2em;
+  margin: 0.1em 0 0.4em 0 ;
+  text-align: left;
+  letter-spacing: 0.12em;
+  white-space: nowrap ;
+}
+table caption small,
+table th.caption small {
+  font-size: 10pt;
+}
+table thead th {
+  color: #ffffff;
+  background-color: #33001a;
+  border-top: 1px solid #33001a;
+  border-bottom: 1px solid #33001a;
+  text-align: left ;
+  vertical-align: top ;
+}
+table thead th a img {
+  vertical-align: middle ;
+  padding: 0 ;
+  margin: 0 ;
+}
+table tfoot tr th,
+table tfoot tr td {
+  vertical-align: middle ;
+  border-bottom: #33001a 2px solid;
+  height: 1.8em ;
+}
+table tfoot tr td {
+  font-weight: bold ;
+  color: #000000;
+}
+table tfoot tr th {
+  font-weight: normal ;
+  color: #000000;
+}
+table tfoot tr:first td,
+table tfoot tr:first th {
+  border-top: #33001a 2px solid;
+}
+table tfoot tr.blank {
+  border: none !important ;
+}
+table tfoot tr.blank th,
+table tfoot tr.blank td {
+  border: none !important ;
+}
+table tfoot.blank tr {
+  border: none !important ;
+}
+table tfoot.blank tr:first-child th,
+table tfoot.blank tr:first-child td {
+  border-top: 1px solid #33001a !important;
+}
+table tfoot.blank tr th,
+table tfoot.blank tr td {
+  border: none !important ;
+}
+table colgroup col.right {
+  text-align: right  ;
+}
+table colgroup col.center {
+  text-align: center ;
+}
+table colgroup col.long-desc {
+  font-size: 70%    ;
+}
+table colgroup col.wi-smallest {
+  width: 42px;
+}
+table colgroup col.wi-verysmall {
+  width: 80px;
+}
+table colgroup col.wi-small {
+  width: 128px;
+}
+table colgroup col.wi-mediumsmall {
+  width: 160px;
+}
+table colgroup col.wi-normal {
+  width: 208px;
+}
+table colgroup col.wi-lightwide {
+  width: 256px;
+}
+table colgroup col.wi-wide {
+  width: 320px;
+}
+table colgroup col.wi-wider {
+  width: 384px;
+}
+table colgroup col.wi-verywide {
+  width: 576px;
+}
+table.tbl-horizontal,
+table.tbl-plain,
+table.tbl-list,
+table.tbl-list-plain {
+  margin-bottom: 0.6em ;
+  border-collapse: collapse ;
+  border: none ;
+}
+table.tbl-horizontal tr td > span,
+table.tbl-plain tr td > span,
+table.tbl-list tr td > span,
+table.tbl-list-plain tr td > span {
+  padding: 0.3em 0.3em 0.6em 0.3em ;
+}
+table.tbl-plain tbody td a,
+table.tbl-list tbody td a,
+table.tbl-list-plain tbody td a {
+  display: inline-block !important;
+}
+table.tbl-list {
+  border-spacing: 1px ;
+  border-collapse: collapse ;
+  margin: 0 0 1.0em 0 ;
+}
+table.tbl-list > caption {
+  margin: 0.1em 0 0.0em 0 ;
+}
+table.tbl-list td,
+table.tbl-list th {
+  padding: 0.2em 0.4em ;
+  white-space: normal ;
+  vertical-align: middle ;
+}
+table.tbl-list > thead > tr th:first-child,
+table.tbl-list > tbody > tr th:first-child,
+table.tbl-list > tfoot > tr td:first-child {
+  padding-left: 0.8em !important ;
+}
+table.tbl-list thead {
+  display: table-header-group;
+}
+table.tbl-list thead tr {
+  height: 2.2em ;
+}
+table.tbl-list thead tr th {
+  color: #ffffff;
+  background-color: #33001a;
+  border-top: 1px solid #33001a;
+  border-bottom: 1px solid #33001a;
+  text-align: left ;
+  vertical-align: top ;
+}
+table.tbl-list thead tr th.nowrap {
+  white-space: nowrap !important ;
+}
+table.tbl-list thead tr th > a {
+  display: block ;
+}
+table.tbl-list thead tr th > a:link,
+table.tbl-list thead tr th > a:visited {
+  color: #e6ccd9;
+  text-decoration: none ;
+}
+table.tbl-list thead tr th > a:hover {
+  color: #e6ccd9;
+  text-decoration: underline ;
+}
+table.tbl-list thead tr th > a:active,
+table.tbl-list thead tr th > a:focus {
+  color: #e6ccd9;
+  text-decoration: underline ;
+}
+table.tbl-list thead tr th label {
+  color: #e6ccd9;
+}
+table.tbl-list thead tr th label:hover {
+  text-decoration: underline ;
+}
+table.tbl-list thead.links-condensed tr th a {
+  display: inline ;
+}
+table.tbl-list tbody {
+  border-bottom: #33001a 1px solid;
+  display: table-row-group;
+}
+table.tbl-list tbody tr:nth-child(odd) {
+  background-color: #f7eef2;
+}
+table.tbl-list tbody tr:nth-child(even) {
+  background-color: #e6ccd9;
+}
+table.tbl-list tbody > tr:last-child > td {
+  border-bottom: 1px #33001a solid !important;
+}
+table.tbl-list tbody tr:hover {
+  background-color: #ffffff;
+}
+table.tbl-list tbody tr.listrow_error {
+  background-color: #ffaeb7 !important;
+}
+table.tbl-list tbody td,
+table.tbl-list tbody th {
+  color: #33001a;
+}
+table.tbl-list tbody td a,
+table.tbl-list tbody th a,
+table.tbl-list tbody td a:link,
+table.tbl-list tbody th a:link,
+table.tbl-list tbody td a:visited,
+table.tbl-list tbody th a:visited {
+  color: #800040;
+}
+table.tbl-list tfoot {
+  display: table-footer-group;
+}
+table.tbl-horizontal th,
+table.tbl-horizontal td {
+  background: none ;
+  padding-top: 0.3em ;
+  padding-right: 0.2em ;
+  padding-bottom: 0.2em ;
+  padding-left: 0.3em ;
+}
+table.tbl-horizontal th > input[type="checkbox"],
+table.tbl-horizontal td > input[type="checkbox"],
+table.tbl-horizontal th > input[type="radio"],
+table.tbl-horizontal td > input[type="radio"] {
+  margin: 0.2em 0.3em 0 0 !important ;
+}
+table.tbl-horizontal th > input,
+table.tbl-horizontal td > input,
+table.tbl-horizontal th > select,
+table.tbl-horizontal td > select {
+  margin: -0.3em 1px 0 0;
+}
+table.tbl-horizontal th > input.addition,
+table.tbl-horizontal td > input.addition,
+table.tbl-horizontal th > select.addition,
+table.tbl-horizontal td > select.addition {
+  margin-top: 0.3em !important ;
+}
+table.tbl-horizontal th .label-above,
+table.tbl-horizontal td .label-above {
+  display: block ;
+  clear: both ;
+  overflow: hidden ;
+  margin-top: -0.5em;
+}
+table.tbl-horizontal th.single-col,
+table.tbl-horizontal td.single-col {
+  padding-top: 0 ;
+  padding-bottom: 0 ;
+}
+table.tbl-horizontal th {
+  color: #33001a;
+}
+table.tbl-horizontal th > a:link,
+table.tbl-horizontal th > a:visited {
+  text-decoration: none ;
+  color: #000000;
+}
+table.tbl-horizontal th > a:hover,
+table.tbl-horizontal th > a:active {
+  text-decoration: underline ;
+}
+table.tbl-horizontal th h4 {
+  margin: 0 ;
+  padding: 0 ;
+}
+table.tbl-horizontal td > span {
+  padding: 0 ;
+  margin: 0 ;
+}
+table.tbl-horizontal td > span.wi-smallest {
+  width: 42px;
+}
+table.tbl-horizontal td > span.wi-verysmall {
+  width: 80px;
+}
+table.tbl-horizontal td > span.wi-small {
+  width: 92px;
+}
+table.tbl-horizontal td > span.wi-mediumsmall {
+  width: 124px;
+}
+table.tbl-horizontal td > span.wi-normal {
+  width: 172px;
+}
+table.tbl-horizontal td > span.wi-lightwide {
+  width: 220px;
+}
+table.tbl-horizontal td > span.wi-wide {
+  width: 284px;
+}
+table.tbl-horizontal td > span.wi-wider {
+  width: 348px !important;
+}
+table.tbl-horizontal td > span.wi-verywide {
+  width: 540px;
+}
+table.tbl-horizontal td > span.data,
+table.tbl-horizontal td > span.plain-data {
+  margin-top: -0.2em;
+  display: block ;
+}
+table.tbl-horizontal td > span.label {
+  color: #33001a;
+  padding: 0 0.3em 0.5em 0 !important ;
+}
+table.tbl-horizontal td > span.button-inline {
+  margin: 0 !important ;
+  padding: 0.3em 0 0 0 ;
+  clear: both ;
+  display: inline-block;
+  vertical-align: middle ;
+}
+table.tbl-horizontal td > span.button-inline input.button,
+table.tbl-horizontal td > span.button-inline input[type="button"],
+table.tbl-horizontal td > span.button-inline button,
+table.tbl-horizontal td > span.button-inline a.button {
+  float: left ;
+  margin: 0 0.3em 0 0 !important ;
+}
+table.tbl-horizontal td > span.customer_vendor_picker {
+  padding: 0 !important ;
+  margin: 0 !important ;
+  display: inline-block;
+}
+table.tbl-horizontal td > span.project_picker {
+  margin: -0.3em 0 0 0;
+}
+table.tbl-horizontal td > span.switch-form-element {
+  padding: 0 !important ;
+  margin: -0.3em 1px 0 0 !important;
+}
+table.tbl-horizontal td > div.data {
+  padding: 0.1363em 0 ;
+}
+table.tbl-horizontal td .plus1 {
+  display: inline-block;
+  padding: 0 ;
+}
+table.tbl-horizontal td > .condensed {
+  padding: 0 !important ;
+  margin: 0 ;
+}
+table.tbl-horizontal td > .condensed input,
+table.tbl-horizontal td > .condensed select {
+  margin-top: 0.2em ;
+}
+table.tbl-horizontal td > span.wi-small-wide {
+  margin: 0 24px 0 0 ;
+  display: block ;
+}
+table.tbl-horizontal thead th {
+  font-size: 11pt;
+  font-weight: normal;
+  color: #33001a !important;
+  padding: 0.2em 0 0.2em 0.2em;
+  margin: 0.1em 0 0.4em 0 ;
+  text-align: left;
+  letter-spacing: 0.12em;
+  border: none ;
+}
+table.tbl-horizontal.zebra tbody tr:nth-child(odd) {
+  background-color: #f7eef2;
+}
+table.tbl-horizontal.zebra tbody tr:nth-child(odd) th {
+  background-color: #f7eef2;
+}
+table.tbl-horizontal.zebra tbody tr:nth-child(even) {
+  background-color: #e6ccd9;
+}
+table.tbl-horizontal.zebra tbody tr:nth-child(even) th {
+  background-color: #e6ccd9;
+}
+table.tbl-horizontal.checkered {
+  border-collapse: collapse ;
+}
+table.tbl-horizontal.checkered tbody tr {
+  background-color: #e6ccd9;
+}
+table.tbl-horizontal.checkered tbody tr td,
+table.tbl-horizontal.checkered tbody tr th {
+  border-color: #33001a;
+  border-width: 1px ;
+  border-style: solid ;
+  padding: 0.3em 0.6em ;
+}
+table.tbl-horizontal.expanded th.caption {
+  padding-top: 1.2em ;
+  padding-bottom: 0.6em ;
+}
+table.tbl-list-plain caption,
+table.tbl-plain caption,
+table.tbl-list-plain th.caption,
+table.tbl-plain th.caption {
+  font-size: 120% !important ;
+  margin: 0;
+  padding: 0.6em 0 0.2em 0;
+}
+table.tbl-list-plain thead th,
+table.tbl-plain thead th,
+table.tbl-list-plain tbody th,
+table.tbl-plain tbody th,
+table.tbl-list-plain thead td,
+table.tbl-plain thead td,
+table.tbl-list-plain tbody td,
+table.tbl-plain tbody td {
+  padding: 3px 0.3em 4px 0.3em !important ;
+}
+table.tbl-list-plain thead th,
+table.tbl-plain thead th {
+  color: #ffffff;
+  background-color: #33001a;
+  border-top: 1px solid #33001a;
+  border-bottom: 1px solid #33001a;
+  text-align: left ;
+  vertical-align: top ;
+}
+table.tbl-list-plain tr th,
+table.tbl-plain tr th,
+table.tbl-list-plain tr td,
+table.tbl-plain tr td {
+  padding: 0.3em inherit 0.3em 0.3em ;
+}
+table.tbl-list-plain.condensed caption,
+table.tbl-plain.condensed caption {
+  padding-left: 0 ;
+}
+table.tbl-list-plain.condensed td,
+table.tbl-plain.condensed td,
+table.tbl-list-plain.condensed th,
+table.tbl-plain.condensed th {
+  padding-right: 7px ;
+  padding-left: 1px ;
+}
+table.tbl-list-plain.lined tr,
+table.tbl-plain.lined tr {
+  border-bottom: 1px #33001a solid;
+}
+table.tbl-list-plain.lined tr > th,
+table.tbl-plain.lined tr > th,
+table.tbl-list-plain.lined tr > th,
+table.tbl-plain.lined tr > th {
+  vertical-align: middle !important ;
+}
+table.tbl-list-plain thead th {
+  border-top: 1px #33001a solid !important;
+  border-bottom: 1px #33001a solid;
+  font-weight: bold ;
+}
+table.tbl-list-plain tbody td,
+table.tbl-list-plain tbody th {
+  border-bottom: 1px #33001a solid;
+}
+table.tbl-dialog th,
+table.tbl-dialog td {
+  background-color: #eeeeee;
+}
+table.tbl-dialog th {
+  color: #ffffff;
+  font-size: 11pt;
+  vertical-align: top ;
+}
+table.clear {
+  float: none ;
+  clear: both ;
+}
+table.test th,
+table.test-plain th {
+  background-color: #b3b3b3 ;
+  color: #110009;
+  font-weight: normal ;
+}
+table.test th.caption,
+table.test-plain th.caption {
+  background-color: #b3b3b3 ;
+}
+table.test td,
+table.test-plain td {
+  background-color: #cfcdd2 ;
+}
+table.test td.longdesc,
+table.test-plain td.longdesc,
+table.test td.longdescription,
+table.test-plain td.longdescription,
+table.test td.long-desc,
+table.test-plain td.long-desc,
+table.test td.long-description,
+table.test-plain td.long-description {
+  border: 1px solid green !important ;
+}
+table.test table,
+table.test-plain table {
+  border: 1px #0000ff solid ;
+  border-collapse: collapse ;
+}
+table.test table td,
+table.test-plain table td,
+table.test table th,
+table.test-plain table th {
+  border: 1px #c20d18 dotted !important ;
+}
+table.test th {
+  border: 1px #666666 solid !important;
+  background-color: #b3b3b3 ;
+  color: #000 ;
+  font-weight: normal ;
+}
+table.test th.caption {
+  background-color: transparent;
+}
+table.test td {
+  border: 1px #000 solid ;
+  background-color: #cfcdd2 ;
+}
+table.test td.longdesc,
+table.test td.longdescription,
+table.test td.long-desc,
+table.test td.long-description {
+  border: 1px solid green !important ;
+}
+table.test table {
+  border: 2px #0000ff solid ;
+  border-collapse: collapse ;
+}
+table.test table td,
+table.test table th {
+  border: 1px #c20d18 dotted !important ;
+}
+table.wi-smallest,
+table colgroup col.wi-smallest {
+  width: 42px;
+}
+table.wi-verysmall,
+table colgroup col.wi-verysmall {
+  width: 80px;
+}
+table.wi-small,
+table colgroup col.wi-small {
+  width: 128px;
+}
+table.wi-mediumsmall,
+table colgroup col.wi-mediumsmall {
+  width: 160px;
+}
+table.wi-normal,
+table colgroup col.wi-normal {
+  width: 208px;
+}
+table.wi-lightwide,
+table colgroup col.wi-lightwide {
+  width: 256px;
+}
+table.wi-wide,
+table colgroup col.wi-wide {
+  width: 320px;
+}
+table.wi-wider,
+table colgroup col.wi-wider {
+  width: 384px;
+}
+table.wi-verywide,
+table colgroup col.wi-verywide {
+  width: 576px;
+}
+table.wi-small-small,
+table colgroup col.wi-small-small {
+  width: 256px;
+}
+table.wi-small-mediumsmall,
+table colgroup col.wi-small-mediumsmall {
+  width: 288px;
+}
+table.wi-small-normal,
+table colgroup col.wi-small-normal {
+  width: 336px;
+}
+table.wi-small-lightwide,
+table colgroup col.wi-small-lightwide {
+  width: 384px;
+}
+table.wi-small-wide,
+table colgroup col.wi-small-wide {
+  width: 484px;
+}
+table.wi-small-wider,
+table colgroup col.wi-small-wider {
+  width: 512px;
+}
+table.wi-small-verywide,
+table colgroup col.wi-small-verywide {
+  width: 704px;
+}
+table.wi-mediumsmall-small,
+table colgroup col.wi-mediumsmall-small {
+  width: 416px;
+}
+table.wi-mediumsmall-mediumsmall,
+table colgroup col.wi-mediumsmall-mediumsmall {
+  width: 320px;
+}
+table.wi-mediumsmall-normal,
+table colgroup col.wi-mediumsmall-normal {
+  width: 368px;
+}
+table.wi-mediumsmall-lightwide,
+table colgroup col.wi-mediumsmall-lightwide {
+  width: 416px;
+}
+table.wi-mediumsmall-wide,
+table colgroup col.wi-mediumsmall-wide {
+  width: 480px;
+}
+table.wi-mediumsmall-wider,
+table colgroup col.wi-mediumsmall-wider {
+  width: 544px;
+}
+table.wi-mediumsmall-verywide,
+table colgroup col.wi-mediumsmall-verywide {
+  width: 736px;
+}
+table.wi-normal-small,
+table colgroup col.wi-normal-small {
+  width: 336px;
+}
+table.wi-normal-mediumsmall,
+table colgroup col.wi-normal-mediumsmall {
+  width: 368px;
+}
+table.wi-normal-normal,
+table colgroup col.wi-normal-normal {
+  width: 416px;
+}
+table.wi-normal-lightwide,
+table colgroup col.wi-normal-lightwide {
+  width: 464px;
+}
+table.wi-normal-wide,
+table colgroup col.wi-normal-wide {
+  width: 528px;
+}
+table.wi-normal-wider,
+table colgroup col.wi-normal-wider {
+  width: 592px;
+}
+table.wi-normal-verywide,
+table colgroup col.wi-normal-verywide {
+  width: 784px;
+}
+table.wi-lightwide-small,
+table colgroup col.wi-lightwide-small {
+  width: 384px;
+}
+table.wi-lightwide-mediumsmall,
+table colgroup col.wi-lightwide-mediumsmall {
+  width: 416px;
+}
+table.wi-lightwide-normal,
+table colgroup col.wi-lightwide-normal {
+  width: 464px;
+}
+table.wi-lightwide-lightwide,
+table colgroup col.wi-lightwide-lightwide {
+  width: 512px;
+}
+table.wi-lightwide-wide,
+table colgroup col.wi-lightwide-wide {
+  width: 576px;
+}
+table.wi-lightwide-wider,
+table colgroup col.wi-lightwide-wider {
+  width: 640px;
+}
+table.wi-lightwide-verywide,
+table colgroup col.wi-lightwide-verywide {
+  width: 832px;
+}
+table.width-full,
+table.full-width,
+table.wi-full {
+  width: 100% ;
+}
+table.width-moderate,
+table.moderate-width,
+table.wi-moderate {
+  width: auto ;
+}
+table.width-moderate td,
+table.moderate-width td,
+table.wi-moderate td,
+table.width-moderate th,
+table.moderate-width th,
+table.wi-moderate th {
+  padding-left: 0.6em ;
+  padding-right: 1.2em ;
+}
+div.wrapper table.tbl-list tr,
+div.cols table.tbl-list tr {
+  border-left: 1px solid #33001a;
+  border-right: 1px solid #33001a;
+}
+#content .ui-tabs-panel > table.tbl-list caption {
+  margin-left: 0.3em ;
+}
+#content .ui-tabs-panel > table.tbl-list caption {
+  margin-left: 0.3em ;
+}
+#content > table.tbl-plain,
+#content > table.tbl-list-plain {
+  margin-top: 1.0em ;
+}
+span.sort {
+  display: inline-block;
+  height: 100% ;
+  vertical-align: top;
+  padding-top: 6px;
+}
+span.sort_symbol {
+  display: inline-block;
+  width: 10px ;
+  padding: 0 ;
+  margin: 0 10px 0 0 ;
+}
+span.sort_symbol a {
+  display: block ;
+  width: 8px ;
+  height: 8px ;
+  font-size: 7pt ;
+  padding: 0 0 3px 0 ;
+  margin: 0 ;
+  text-align: center ;
+  clear: both ;
+  float: none ;
+  vertical-align: top ;
+}
+span.sort_symbol a.ascending {
+  border-top: 1px #33001a solid;
+  border-right: 1px #33001a solid;
+  border-left: 1px #33001a solid;
+}
+span.sort_symbol a.descending {
+  border-right: 1px #33001a solid;
+  border-bottom: 1px #33001a solid;
+  border-left: 1px #33001a solid;
+}
+span.sort_symbol a.active {
+  color: #ffffff ;
+}
+span.sort_symbol a:link,
+span.sort_symbol a:visited {
+  color: #d5aabf;
+}
+table#report_table_id.tbl-list > tbody > tr > td {
+  vertical-align: top ;
+}
+table#konten-plan tbody tr td:first-child {
+  text-align: right !important;
+}
+table#konten-plan tbody tr.heading td {
+  font-size: 14pt;
+  border-top: 1px #999 solid;
+}
+table#konten-plan tr:first-child.heading td {
+  border: none;
+}
+table#eurtable {
+  border-collapse: collapse;
+  width: 100%;
+}
+table tr.chart {
+  border: 0;
+}
+table td.chartname {
+  padding-left: 50px;
+}
+table tr.chartrow {
+  font-size: 75%;
+}
+table .guv_row_background {
+  background: #f0f0f0;
+}
+table .tr_error {
+  background-color: #ffc9c9;
+}
+/* ------------------------------------------------------------- */
+/* LISTS (lists.less)                                            */
+/* ------------------------------------------------------------- */
+ul {
+  list-style-type: disc;
+  list-style-position: outside;
+  list-style-image: none;
+  padding: 0 0 0 1.4em;
+  margin: 0.4em 0 0.4em 0;
+}
+ul.footnotes {
+  list-style-type: none !important ;
+  list-style-position: outside ;
+  margin: 1.0em 0 0 1.8em !important ;
+}
+ul.footnotes li sup {
+  display: inline-block;
+  margin: 0 0.6em 0 -2.6em;
+  padding: 0;
+}
+ul.footnotes li > ul {
+  position: relative;
+  list-style-type: circle ;
+  list-style-position: outside ;
+  margin: 0.3em 0 0.3em 1.4em !important ;
+}
+ul li ul {
+  list-style-type: circle ;
+  list-style-position: outside ;
+}
+div.table {
+  margin-bottom: 1.0em ;
+}
+div.table.col {
+  float: left ;
+  margin-right: 1.6em ;
+}
+div.table div.caption {
+  clear: left ;
+  display: block ;
+  font-weight: bold ;
+  color: #33001a;
+}
+div.table div.field {
+  clear: left ;
+  display: block ;
+  overflow: hidden ;
+  margin-right: 2.0em ;
+}
+div.table div.field span.label {
+  display: inline-block;
+  float: left ;
+  min-width: 12em;
+  width: auto;
+}
+div.table div.field span.value {
+  display: inline-block;
+  float: left ;
+  min-width: 12em;
+  width: auto;
+}
+div.list {
+  font-size: 10pt;
+  color: #110009;
+}
+div.list.col {
+  float: left ;
+  margin-right: 2.6em !important ;
+  width: auto ;
+  min-width: 110px ;
+}
+div.list h4 {
+  padding: 0.6em 0 0.2em 0.0em !important ;
+  margin: 0.2em 0 0 0 ;
+  font-weight: normal;
+  font-size: 11pt;
+  font-family: "Helvetica Neue", Helvetica, Arial;
+  color: #33001a;
+}
+div.list > p,
+div.list > div {
+  padding: 0.2em 0 0.2em 0 !important ;
+  margin: 0 !important ;
+  white-space: normal ;
+}
+div.list > p > input[type="checkbox"],
+div.list > div > input[type="checkbox"],
+div.list > p > input[type="radio"],
+div.list > div > input[type="radio"] {
+  padding: 0 ;
+  margin: 0.3em 0.3em 0 0 ;
+  float: left ;
+}
+div.list > p label,
+div.list > div label {
+  width: auto ;
+  float: left ;
+}
+div.list > p {
+  overflow: hidden ;
+}
+div.list > input[type="checkbox"] {
+  clear: both;
+  float: left;
+  margin-right: 0.4em ;
+}
+div.list > label {
+  width: 82% ;
+}
+div.list div {
+  clear: left;
+}
+div.list > div.no-rows > input[type="checkbox"],
+div.list > div.no-rows > input[type="radio"] {
+  padding: 0 ;
+  margin: 0.3em 0.3em 0 0 ;
+  clear: left ;
+}
+div.list > div.no-rows label {
+  width: 82% ;
+  float: left ;
+}
+div.list-table-with-separate-total-table div.full-width {
+  padding-bottom: 0 ;
+  margin-bottom: 0 ;
+}
+div.list-table-with-separate-total-table div.full-width .tbl-list {
+  margin-bottom: 0 ;
+}
+div.list-table-with-separate-total-table div.list-total {
+  width: 100% ;
+  margin: 0 ;
+  padding: 0 ;
+  overflow: hidden ;
+}
+div.list-table-with-separate-total-table div.list-total table.footer-only {
+  margin: 0 ;
+  padding: 0 ;
+}
+div.list-table-with-separate-total-table div.list-total table.footer-only.right {
+  float: right ;
+}
+/* ------------------------------------------------------------- */
+/* FORM ELEMENTS (forms.less)                                    */
+/* ------------------------------------------------------------- */
+/* forms.less */
+form {
+  display: table;
+  width: 100%;
+  text-align: left;
+  margin: 0 auto 0 auto;
+}
+form.box {
+  display: block;
+  overflow: hidden ;
+  padding: 0 0 1.6em 0 ;
+}
+input,
+textarea,
+select {
+  font-family: Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  padding: 0.2em 0.2em 0.2em 0.6em;
+  border: 1px;
+  border-color: darkgray lightgray lightgray;
+  border-style: solid;
+  outline: none;
+  background-color: #fff ;
+}
+input[type="text"].accent,
+textarea[type="text"].accent,
+select[type="text"].accent {
+  font-weight: bold ;
+  font-size: 130% !important ;
+  padding: 0.6em auto !important ;
+}
+textarea {
+  resize: vertical;
+}
+input[type="text"]:focus,
+input[type="password"]:focus,
+textarea:focus,
+select:focus,
+input[type="text"]:active,
+input[type="password"]:active,
+textarea:active,
+select:active {
+  background-color: #d5aabf;
+  border: 1px 1px #110009 solid solid;
+  color: #220011;
+}
+select.helper {
+  background-color: #ffffff;
+}
+select > option {
+  padding-left: 0.6em ;
+}
+input[type="file"] {
+  padding: 0.8em;
+  background-color: #cccccc;
+  color: #666666;
+  border: 1px #666666 solid;
+}
+input[type="file"] button,
+input[type="file"] input[type="button"] {
+  background-color: #A3FFA8;
+}
+label {
+  cursor: pointer;
+  vertical-align: top;
+  display: inline-block;
+  width: 88% ;
+  color: #220011;
+}
+label:link,
+label:visited {
+  text-decoration: none ;
+}
+label:hover {
+  text-decoration: underline ;
+}
+fieldset {
+  margin-top: 15px;
+  color: black;
+  font-weight: normal;
+  font-size: 14pt;
+  text-transform: uppercase;
+  border-color: grey;
+  border-width: 1px ;
+  margin: 0.4em 0.6em 1.4em 0.6em;
+}
+fieldset h4 {
+  font-weight: normal ;
+  font-size: 11pt;
+  margin: 0;
+  padding: 0 0 0.2em 0;
+}
+input[type="text"].wi-smallest,
+input[type="password"].wi-smallest {
+  width: 42px;
+}
+input[type="text"].wi-verysmall,
+input[type="password"].wi-verysmall {
+  width: 80px;
+}
+input[type="text"].wi-small,
+input[type="password"].wi-small {
+  width: 92px;
+}
+input[type="text"].wi-mediumsmall,
+input[type="password"].wi-mediumsmall {
+  width: 124px;
+}
+input[type="text"].wi-normal,
+input[type="password"].wi-normal {
+  width: 172px;
+}
+input[type="text"].wi-lightwide,
+input[type="password"].wi-lightwide {
+  width: 220px;
+}
+input[type="text"].wi-wide,
+input[type="password"].wi-wide {
+  width: 284px;
+}
+input[type="text"].wi-wider,
+input[type="password"].wi-wider {
+  min-width: 348px;
+}
+input[type="text"].wi-verywide,
+input[type="password"].wi-verywide {
+  min-width: 540px;
+}
+input[type="text"].wi-date,
+input[type="password"].wi-date {
+  width: 92px;
+}
+input[type="text"].wi-number,
+input[type="password"].wi-number {
+  width: 92px;
+}
+input[type="text"].wi-tinynumber,
+input[type="password"].wi-tinynumber {
+  width: 80px;
+}
+input[type="text"].wi-largenumber,
+input[type="password"].wi-largenumber {
+  width: 124px;
+}
+input[type="text"].wi-lightwide--verysmall,
+input[type="password"].wi-lightwide--verysmall {
+  width: 139px;
+}
+input[type="text"].wi-wide--verysmall,
+input[type="password"].wi-wide--verysmall {
+  width: 203px !important;
+}
+input .fixed_width {
+  width: 250px;
+}
+select.wi-smallest {
+  width: 42px;
+}
+select.wi-verysmall {
+  width: 80px;
+}
+select.wi-small {
+  width: 92px;
+}
+select.wi-mediumsmall {
+  width: 124px;
+}
+select.wi-normal {
+  width: 172px;
+}
+select.wi-lightwide {
+  width: 220px;
+}
+select.wi-wide {
+  width: 284px;
+}
+select.wi-wider {
+  min-width: 348px;
+}
+select.wi-verywide {
+  min-width: 540px;
+}
+select.wi-full {
+  width: 100%                   ;
+}
+select.wi-small-normal {
+  width: 300px;
+}
+select.wi-small-lightwide {
+  width: 348px;
+}
+select.wi-small-wide {
+  width: 412px;
+}
+select.wi-small-wider {
+  width: 476px;
+}
+select.wi-small-verywide {
+  width: 668px;
+}
+select.wi-mediumsmall-normal {
+  width: 332px;
+}
+select.wi-mediumsmall-lightwide {
+  width: 380px;
+}
+select.wi-mediumsmall-wide {
+  width: 444px;
+}
+select.wi-mediumsmall-wider {
+  width: 508px;
+}
+select.wi-mediumsmall-verywide {
+  width: 700px;
+}
+select.wi-normal-normal {
+  width: 380px;
+}
+select.wi-normal-lightwide {
+  width: 428px;
+}
+select.wi-normal-wide {
+  width: 492px;
+}
+select.wi-normal-wider {
+  width: 556px;
+}
+select.wi-normal-verywide {
+  width: 748px;
+}
+select.wi-lightwide-normal {
+  width: 428px;
+}
+select.wi-lightwide-lightwide {
+  width: 476px;
+}
+select.wi-lightwide-wide {
+  width: 540px;
+}
+select.wi-lightwide-wider {
+  width: 604px;
+}
+select.wi-lightwide-verywide {
+  width: 796px;
+}
+select.wi-wide-normal {
+  width: 492px;
+}
+select.wi-wide-lightwide {
+  width: 540px;
+}
+select.wi-wide-wide {
+  width: 604px;
+}
+select.wi-wide-wider {
+  width: 668px;
+}
+select.wi-wide-verywide {
+  width: 860px;
+}
+textarea.wi-smallest {
+  width: 172px;
+}
+textarea.wi-verysmall {
+  width: 172px;
+}
+textarea.wi-small {
+  width: 172px;
+}
+textarea.wi-mediumsmall {
+  width: 172px;
+}
+textarea.wi-normal {
+  width: 172px;
+}
+textarea.wi-lightwide {
+  min-width: 220px;
+}
+textarea.wi-wide {
+  min-width: 284px;
+}
+textarea.wi-wide.strict {
+  max-width: 284px !important;
+}
+textarea.wi-wider {
+  min-width: 348px;
+}
+textarea.wi-verywide {
+  min-width: 540px;
+}
+textarea.wi-full {
+  width: 100%                  ;
+}
+textarea.wi-small-small {
+  width: 220px;
+}
+textarea.wi-small-mediumsmall {
+  width: 252px;
+  margin: 0 30px 0 0 ;
+}
+textarea.wi-small-normal {
+  width: 300px;
+}
+textarea.wi-small-lightwide {
+  width: 348px;
+}
+textarea.wi-small-wide {
+  width: 412px;
+}
+textarea.wi-small-wider {
+  width: 476px;
+}
+textarea.wi-small-verywide {
+  width: 668px;
+}
+textarea.wi-mediumsmall-small {
+  width: 252px;
+}
+textarea.wi-mediumsmall-mediumsmall {
+  width: 284px;
+}
+textarea.wi-mediumsmall-normal {
+  width: 332px;
+}
+textarea.wi-mediumsmall-lightwide {
+  width: 380px;
+}
+textarea.wi-mediumsmall-wide {
+  width: 444px;
+}
+textarea.wi-mediumsmall-wider {
+  width: 508px;
+}
+textarea.wi-mediumsmall-verywide {
+  width: 700px;
+}
+textarea.wi-normal-small {
+  width: 300px;
+}
+textarea.wi-normal-mediumsmall {
+  width: 332px;
+}
+textarea.wi-normal-normal {
+  width: 380px;
+}
+textarea.wi-normal-lightwide {
+  width: 428px;
+}
+textarea.wi-normal-wide {
+  width: 492px;
+}
+textarea.wi-normal-wider {
+  width: 556px;
+}
+textarea.wi-normal-verywide {
+  width: 748px;
+}
+textarea.wi-lightwide-small {
+  width: 348px;
+}
+textarea.wi-lightwide-mediumsmall {
+  width: 380px;
+}
+textarea.wi-lightwide-normal {
+  width: 428px;
+}
+textarea.wi-lightwide-lightwide {
+  width: 476px;
+}
+textarea.wi-lightwide-wide {
+  width: 540px;
+}
+textarea.wi-lightwide-wider {
+  width: 604px;
+}
+textarea.wi-lightwide-verywide {
+  width: 796px;
+}
+textarea.wi-wide-small {
+  width: 412px;
+}
+textarea.wi-wide-mediumsmall {
+  width: 444px;
+}
+textarea.wi-wide-normal {
+  width: 492px;
+}
+textarea.wi-wide-lightwide {
+  width: 604px;
+}
+textarea.wi-wide-wide {
+  width: 604px;
+}
+textarea.wi-wide-wider {
+  width: 668px;
+}
+textarea.wi-wide-verywide {
+  width: 860px;
+}
+td.wi-date > input[type="text"],
+th.wi-date > input[type="text"] {
+  width: 92px;
+}
+td.wi-lightwide > textarea,
+th.wi-lightwide > textarea {
+  width: 284px;
+}
+td.wi-wide > textarea,
+th.wi-wide > textarea {
+  width: 284px;
+}
+td.wi-small-verywide > textarea,
+th.wi-small-verywide > textarea {
+  width: 668px;
+}
+th.wi-lightwide textarea,
+td.wi-lightwide textarea,
+th.wi-lightwide input[type="text"],
+td.wi-lightwide input[type="text"],
+th.wi-lightwide div.cke_editable,
+td.wi-lightwide div.cke_editable,
+th.wi-lightwide input#order_vendor_id_name,
+td.wi-lightwide input#order_vendor_id_name {
+  width: 220px;
+}
+th.wi-wide textarea,
+td.wi-wide textarea,
+th.wi-wide input[type="text"],
+td.wi-wide input[type="text"],
+th.wi-wide div.cke_editable,
+td.wi-wide div.cke_editable,
+th.wi-wide input#order_vendor_id_name,
+td.wi-wide input#order_vendor_id_name {
+  width: 284px;
+}
+span.wi-smallest {
+  padding: 0 ;
+}
+span.wi-smallest textarea,
+span.wi-smallest div.cke_editable {
+  width: 172px;
+}
+span.wi-verysmall {
+  padding: 0 ;
+}
+span.wi-verysmall textarea,
+span.wi-verysmall div.cke_editable {
+  width: 172px;
+}
+span.wi-small {
+  padding: 0 ;
+}
+span.wi-small textarea,
+span.wi-small div.cke_editable {
+  width: 172px;
+}
+span.wi-mediumsmall {
+  padding: 0 ;
+}
+span.wi-mediumsmall textarea,
+span.wi-mediumsmall div.cke_editable {
+  width: 172px;
+}
+span.wi-normal {
+  padding: 0 ;
+}
+span.wi-normal textarea,
+span.wi-normal div.cke_editable {
+  width: 172px;
+}
+span.wi-lightwide {
+  padding: 0 ;
+}
+span.wi-lightwide textarea,
+span.wi-lightwide div.cke_editable {
+  width: 220px;
+}
+span.wi-wide {
+  padding: 0 ;
+}
+span.wi-wide textarea,
+span.wi-wide > div.cke_editable {
+  width: 284px !important;
+}
+span.wi-wide.strict {
+  max-width: 284px !important;
+}
+span.wi-wider {
+  padding: 0 ;
+}
+span.wi-wider textarea,
+span.wi-wider div.cke_editable {
+  width: 348px;
+}
+span.wi-verywide {
+  padding: 0 ;
+}
+span.wi-verywide textarea,
+span.wi-verywide div.cke_editable {
+  min-width: 540px;
+}
+span.wi-full {
+  padding: 0 ;
+}
+span.wi-full textarea,
+span.wi-full div.cke_editable {
+  width: 100%                     ;
+}
+span.wi-small-small {
+  padding: 0 ;
+}
+span.wi-small-small textarea,
+span.wi-small-small div.cke_editable {
+  width: 220px;
+}
+span.wi-small-mediumsmall {
+  padding: 0 ;
+}
+span.wi-small-mediumsmall textarea,
+span.wi-small-mediumsmall div.cke_editable {
+  width: 252px;
+  margin: 0 30px 0 0 ;
+}
+span.wi-small-normal {
+  padding: 0 ;
+}
+span.wi-small-normal textarea,
+span.wi-small-normal div.cke_editable {
+  width: 300px;
+}
+span.wi-small-lightwide {
+  padding: 0 ;
+}
+span.wi-small-lightwide textarea,
+span.wi-small-lightwide div.cke_editable {
+  width: 348px;
+}
+span.wi-small-wide {
+  padding: 0 ;
+}
+span.wi-small-wide textarea,
+span.wi-small-wide div.cke_editable {
+  width: 412px;
+}
+span.wi-small-wider {
+  padding: 0 ;
+}
+span.wi-small-wider textarea,
+span.wi-small-wider div.cke_editable {
+  width: 476px;
+}
+span.wi-small-verywide {
+  padding: 0 ;
+}
+span.wi-small-verywide textarea,
+span.wi-small-verywide div.cke_editable {
+  width: 668px;
+}
+span.wi-mediumsmall-small {
+  padding: 0 ;
+}
+span.wi-mediumsmall-small textarea,
+span.wi-mediumsmall-small div.cke_editable {
+  width: 252px;
+}
+span.wi-mediumsmall-mediumsmall {
+  padding: 0 ;
+}
+span.wi-mediumsmall-mediumsmall textarea,
+span.wi-mediumsmall-mediumsmall div.cke_editable {
+  width: 284px;
+}
+span.wi-mediumsmall-normal {
+  padding: 0 ;
+}
+span.wi-mediumsmall-normal textarea,
+span.wi-mediumsmall-normal div.cke_editable {
+  width: 332px;
+}
+span.wi-mediumsmall-lightwide {
+  padding: 0 ;
+}
+span.wi-mediumsmall-lightwide textarea,
+span.wi-mediumsmall-lightwide div.cke_editable {
+  width: 380px;
+}
+span.wi-mediumsmall-wide {
+  padding: 0 ;
+}
+span.wi-mediumsmall-wide textarea,
+span.wi-mediumsmall-wide.wi-mediumsmall-wide > div.cke_editable {
+  width: 444px !important;
+}
+span.wi-mediumsmall-wider {
+  padding: 0 ;
+}
+span.wi-mediumsmall-wider textarea,
+span.wi-mediumsmall-wider div.cke_editable {
+  width: 508px;
+}
+span.wi-mediumsmall-verywide {
+  padding: 0 ;
+}
+span.wi-mediumsmall-verywide textarea,
+span.wi-mediumsmall-verywide div.cke_editable {
+  width: 700px;
+}
+span.wi-normal-small {
+  padding: 0 ;
+}
+span.wi-normal-small textarea,
+span.wi-normal-small div.cke_editable {
+  width: 300px;
+}
+span.wi-normal-mediumsmall {
+  padding: 0 ;
+}
+span.wi-normal-mediumsmall textarea,
+span.wi-normal-mediumsmall div.cke_editable {
+  width: 332px;
+}
+span.wi-normal-normal {
+  padding: 0 ;
+}
+span.wi-normal-normal textarea,
+span.wi-normal-normal div.cke_editable {
+  width: 380px;
+}
+span.wi-normal-lightwide {
+  padding: 0 ;
+}
+span.wi-normal-lightwide textarea,
+span.wi-normal-lightwide div.cke_editable {
+  width: 428px;
+}
+span.wi-normal-wide {
+  padding: 0 ;
+}
+span.wi-normal-wide textarea,
+span.wi-normal-wide div.cke_editable {
+  width: 492px;
+}
+span.wi-normal-wider {
+  padding: 0 ;
+}
+span.wi-normal-wider textarea,
+span.wi-normal-wider div.cke_editable {
+  width: 556px;
+}
+span.wi-normal-verywide {
+  padding: 0 ;
+}
+span.wi-normal-verywide textarea,
+span.wi-normal-verywide div.cke_editable {
+  width: 748px;
+}
+span.wi-lightwide-small {
+  padding: 0 ;
+}
+span.wi-lightwide-small textarea,
+span.wi-lightwide-small div.cke_editable {
+  width: 348px;
+}
+span.wi-lightwide-mediumsmall {
+  padding: 0 ;
+}
+span.wi-lightwide-mediumsmall textarea,
+span.wi-lightwide-mediumsmall div.cke_editable {
+  width: 380px;
+}
+span.wi-lightwide-normal {
+  padding: 0 ;
+}
+span.wi-lightwide-normal textarea,
+span.wi-lightwide-normal div.cke_editable {
+  width: 428px;
+}
+span.wi-lightwide-lightwide {
+  padding: 0 ;
+}
+span.wi-lightwide-lightwide textarea,
+span.wi-lightwide-lightwide div.cke_editable {
+  width: 476px;
+}
+span.wi-lightwide-wide {
+  padding: 0 ;
+}
+span.wi-lightwide-wide textarea,
+span.wi-lightwide-wide div.cke_editable {
+  width: 540px;
+}
+span.wi-lightwide-wider {
+  padding: 0 ;
+}
+span.wi-lightwide-wider textarea,
+span.wi-lightwide-wider div.cke_editable {
+  width: 604px;
+}
+span.wi-lightwide-verywide {
+  padding: 0 ;
+}
+span.wi-lightwide-verywide textarea,
+span.wi-lightwide-verywide div.cke_editable {
+  width: 796px;
+}
+span.wi-wide-small {
+  padding: 0 ;
+}
+span.wi-wide-small textarea,
+span.wi-wide-small div.cke_editable {
+  width: 412px;
+}
+span.wi-wide-mediumsmall {
+  padding: 0 ;
+}
+span.wi-wide-mediumsmall textarea,
+span.wi-wide-mediumsmall div.cke_editable {
+  width: 444px;
+}
+span.wi-wide-normal {
+  padding: 0 ;
+}
+span.wi-wide-normal textarea,
+span.wi-wide-normal div.cke_editable {
+  width: 492px;
+}
+span.wi-wide-lightwide {
+  padding: 0 ;
+}
+span.wi-wide-lightwide textarea,
+span.wi-wide-lightwide div.cke_editable {
+  width: 604px;
+}
+span.wi-wide-wide {
+  padding: 0 ;
+}
+span.wi-wide-wide textarea,
+span.wi-wide-wide div.cke_editable {
+  width: 604px;
+}
+span.wi-wide-wider {
+  padding: 0 ;
+}
+span.wi-wide-wider textarea,
+span.wi-wide-wider div.cke_editable {
+  width: 668px;
+}
+span.wi-wide-verywide {
+  padding: 0 ;
+}
+span.wi-wide-verywide textarea,
+span.wi-wide-verywide div.cke_editable {
+  width: 860px;
+}
+th.wi-smallest input[type="text"],
+td.wi-smallest input[type="text"],
+th.wi-smallest select,
+td.wi-smallest select {
+  width: 42px;
+}
+th.wi-verysmall input[type="text"],
+td.wi-verysmall input[type="text"],
+th.wi-verysmall select,
+td.wi-verysmall select {
+  width: 80px;
+}
+th.wi-small input[type="text"],
+td.wi-small input[type="text"],
+th.wi-small select,
+td.wi-small select {
+  width: 92px;
+}
+th.wi-mediumsmall input[type="text"],
+td.wi-mediumsmall input[type="text"],
+th.wi-mediumsmall select,
+td.wi-mediumsmall select {
+  width: 124px;
+}
+th.wi-normal input[type="text"],
+td.wi-normal input[type="text"],
+th.wi-normal select,
+td.wi-normal select,
+th.wi-normal textarea,
+td.wi-normal textarea,
+th.wi-normal div.cke_editable,
+td.wi-normal div.cke_editable {
+  width: 172px;
+}
+th.wi-lightwide input[type="text"],
+td.wi-lightwide input[type="text"],
+th.wi-lightwide select,
+td.wi-lightwide select,
+th.wi-lightwide textarea,
+td.wi-lightwide textarea,
+th.wi-lightwide div.cke_editable,
+td.wi-lightwide div.cke_editable {
+  width: 220px;
+}
+th.wi-wide input[type="text"],
+td.wi-wide input[type="text"],
+th.wi-wide select,
+td.wi-wide select,
+th.wi-wide textarea,
+td.wi-wide textarea,
+th.wi-wide div.cke_editable,
+td.wi-wide div.cke_editable {
+  width: 284px !important;
+}
+th.wi-wide.strict input[type="text"],
+td.wi-wide.strict input[type="text"],
+th.wi-wide.strict select,
+td.wi-wide.strict select,
+th.wi-wide.strict textarea,
+td.wi-wide.strict textarea,
+th.wi-wide.strict div.cke_editable,
+td.wi-wide.strict div.cke_editable {
+  max-width: 284px !important;
+}
+th.wi-wider input[type="text"],
+td.wi-wider input[type="text"],
+th.wi-wider select,
+td.wi-wider select,
+th.wi-wider textarea,
+td.wi-wider textarea,
+th.wi-wider div.cke_editable,
+td.wi-wider div.cke_editable {
+  width: 348px !important;
+}
+th.wi-verywide input[type="text"],
+td.wi-verywide input[type="text"],
+th.wi-verywide select,
+td.wi-verywide select,
+th.wi-verywide textarea,
+td.wi-verywide textarea,
+th.wi-verywide div.cke_editable,
+td.wi-verywide div.cke_editable {
+  min-width: 540px;
+}
+th.wi-full input[type="text"],
+td.wi-full input[type="text"],
+th.wi-full select,
+td.wi-full select,
+th.wi-full textarea,
+td.wi-full textarea,
+th.wi-full div.cke_editable,
+td.wi-full div.cke_editable {
+  width: 100% ;
+}
+th.wi-mediumsmall-wide input[type="text"],
+td.wi-mediumsmall-wide input[type="text"],
+th.wi-mediumsmall-wide select,
+td.wi-mediumsmall-wide select,
+th.wi-mediumsmall-wide textarea,
+td.wi-mediumsmall-wide textarea,
+th.wi-mediumsmall-wide div.cke_editable,
+td.wi-mediumsmall-wide div.cke_editable {
+  width: 444px;
+}
+th.wi-small-mediumsmall input[type="text"],
+td.wi-small-mediumsmall input[type="text"],
+th.wi-small-mediumsmall select,
+td.wi-small-mediumsmall select,
+th.wi-small-mediumsmall textarea,
+td.wi-small-mediumsmall textarea,
+th.wi-small-mediumsmall div.cke_editable,
+td.wi-small-mediumsmall div.cke_editable {
+  width: 252px;
+}
+th.wi-mediumsmall-lightwide input[type="text"],
+td.wi-mediumsmall-lightwide input[type="text"],
+th.wi-mediumsmall-lightwide select,
+td.wi-mediumsmall-lightwide select,
+th.wi-mediumsmall-lightwide textarea,
+td.wi-mediumsmall-lightwide textarea,
+th.wi-mediumsmall-lightwide div.cke_editable,
+td.wi-mediumsmall-lightwide div.cke_editable {
+  width: 380px;
+}
+th.below input[type="text"],
+td.below input[type="text"],
+th.below select,
+td.below select,
+th.below textarea,
+td.below textarea,
+th.below div.cke_editable,
+td.below div.cke_editable {
+  clear: both;
+  margin-top: 0.4em  ;
+}
+td.wi-lightwide > span.customer_vendor_picker > input {
+  width: 220px;
+}
+td.wi-wide > span.customer_vendor_picker > input {
+  width: 284px;
+}
+td.wi-wider > span.customer_vendor_picker > input {
+  width: 348px;
+}
+input.number,
+select.number {
+  text-align: right ;
+}
+input.numeric,
+select.numeric {
+  text-align: right ;
+}
+input.right,
+select.right {
+  text-align: right ;
+}
+input[type=text].emphasized {
+  word-wrap: break-word;
+  word-break: break-all;
+  height: auto;
+  overflow: hidden ;
+}
+td img.ui-datepicker-trigger {
+  vertical-align: middle ;
+  padding: 0 0.2em ;
+}
+td div.rowspan-table {
+  display: table-row;
+  float: left;
+  margin: 0.8em 2.8em 0.8em 0 ;
+}
+td div.rowspan-table div.label-n-value {
+  display: table-cell;
+  vertical-align: middle;
+  height: 1.6em !important ;
+  float: left;
+  padding: 0 2.0em 0 0 ;
+}
+td div.rowspan-table div.label-n-value b {
+  font-weight: normal;
+  padding: 0 0 0 0 ;
+}
+table td > span.data {
+  display: block;
+  overflow: hidden ;
+  height: 15.299999999999999pt;
+  font-size: 9pt;
+  color: #220011;
+  border: 1px #800040 solid;
+  margin: 0 ;
+  line-height: 120%;
+}
+table td > span.data.below {
+  margin-top: 0.2em;
+}
+table td > span.data.numeric,
+table td > span.data.right {
+  text-align: right;
+}
+table td > span.data.wi-smallest {
+  width: 42px;
+}
+table td > span.data.wi-verysmall {
+  width: 80px;
+}
+table td > span.data.wi-small {
+  width: 92px;
+}
+table td > span.data.wi-mediumsmall {
+  width: 124px;
+}
+table td > span.data.wi-normal {
+  width: 172px;
+}
+table td > span.data.wi-lightwide {
+  width: 220px;
+}
+table td > span.data.wi-wide {
+  width: 284px;
+}
+table td > span.data.numeric {
+  text-align: right ;
+}
+table td > span.data.right {
+  text-align: right ;
+}
+div.boxes {
+  margin: 0 0 0.9em 0 ;
+  overflow: hidden ;
+  max-width: 800px ;
+}
+div.boxes h3 {
+  padding: 0.2em 0 0.2em 0.0em;
+}
+div.boxes h3 label {
+  float: left;
+  width: 88% ;
+  font-size: 13pt;
+  padding: 0 0 0.6em 0.2em ;
+  line-height: 1.2em ;
+}
+div.boxes > div {
+  clear: both;
+  margin: 0 0 0.6em 0 ;
+  padding: 0;
+  display: block ;
+  overflow: hidden ;
+}
+div.boxes > div label {
+  float: left;
+  width: 88% ;
+}
+div.boxes > div input[type="checkbox"],
+div.boxes > div input[type="radio"] {
+  float: left;
+  margin-right: 0.6em ;
+}
+td.horizontal input[type="radio"],
+td.horizontal input[type="checkbox"] {
+  float: left !important;
+  clear: none !important;
+  width: auto;
+}
+td.horizontal label {
+  width: auto !important;
+  margin-right: 2.0em ;
+  float: left !important;
+  clear: none !important;
+}
+table.tbl-horizontal th label,
+table.tbl-list th label,
+table.tbl-plain th label {
+  display: inline-block;
+}
+table.tbl-horizontal td input[type="radio"],
+table.tbl-list td input[type="radio"],
+table.tbl-plain td input[type="radio"],
+table.tbl-horizontal td input[type="checkbox"],
+table.tbl-list td input[type="checkbox"],
+table.tbl-plain td input[type="checkbox"] {
+  float: left;
+  clear: left;
+}
+table.tbl-horizontal td input[type="radio"] ~ label,
+table.tbl-list td input[type="radio"] ~ label,
+table.tbl-plain td input[type="radio"] ~ label,
+table.tbl-horizontal td input[type="checkbox"] ~ label,
+table.tbl-list td input[type="checkbox"] ~ label,
+table.tbl-plain td input[type="checkbox"] ~ label {
+  float: left;
+  width: auto;
+  margin-left: 0.2em ;
+  line-height: 1.4em ;
+}
+table.tbl-horizontal td span.wi-date,
+table.tbl-list td span.wi-date,
+table.tbl-plain td span.wi-date {
+  padding: 0 ;
+}
+table.tbl-horizontal td span.wi-date input[type="text"],
+table.tbl-list td span.wi-date input[type="text"],
+table.tbl-plain td span.wi-date input[type="text"],
+table.tbl-horizontal td span.wi-date input[type="date"],
+table.tbl-list td span.wi-date input[type="date"],
+table.tbl-plain td span.wi-date input[type="date"] {
+  width: 92px;
+}
+div.fake-textarea {
+  width: 220px;
+  height: 150px;
+  background-color: white;
+  overflow: auto;
+  border: 1px #999999 solid;
+}
+div.fake-textarea.fake-wi-wide {
+  width: 284px;
+}
+div.admin form {
+  font-size: 10pt;
+}
+div.admin form input[type="checkbox"] {
+  margin: 0.2em 0.6em 0.3em 0 ;
+  float: left;
+}
+div.admin form h3 {
+  margin: 1.2em 0 0.6em 0 ;
+  display: block;
+}
+.ms2side {
+  display: block;
+  overflow: hidden;
+}
+.ms2side p {
+  margin: 0 0 0.4em 0 ;
+}
+.ms2side .ms2side__div .ms2side__header {
+  width: 12.0em ;
+  height: 2.2em ;
+  display: table-cell;
+  vertical-align: bottom;
+}
+.ms2side .ms2side__div .ms2side__options > p.ms2side__hide,
+.ms2side .ms2side__div .ms2side__updown > p.ms2side__hide {
+  cursor: default;
+  color: #9e9e9e;
+  border: 1px solid grey;
+  background-color: #D4D4D4 !important;
+}
+.frame-header-quicksearch input::placeholder {
+  color: #666666;
+}
+#content input::placeholder {
+  color: #999 ;
+}
+span.customer_vendor_picker {
+  padding: 0 ;
+}
+input#vendor_id_name.ui-autocomplete-input,
+input#customer_id_name.ui-autocomplete-input {
+  margin: 0 ;
+}
+input#vendor_id_name.ui-autocomplete-input.wi-wide,
+input#customer_id_name.ui-autocomplete-input.wi-wide {
+  width: 284px;
+}
+table td span.project_picker {
+  padding: 0 !important;
+}
+/* ------------------------------------------------------------- */
+/* BUTTONS (buttons.less)                                        */
+/* ------------------------------------------------------------- */
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+button {
+  display: inline-block;
+  cursor: pointer ;
+  width: auto ;
+  padding: 0.2em 0.6em;
+  font-size: 9pt;
+  font-weight: normal;
+  font-style: normal;
+  text-align: center;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 6px;
+}
+input[type="button"].clear,
+input[type="submit"].clear,
+input[type="reset"].clear,
+button.clear {
+  clear: left;
+}
+input[type="button"].wi-verysmall,
+input[type="submit"].wi-verysmall,
+input[type="reset"].wi-verysmall,
+button.wi-verysmall {
+  min-width: 80px;
+}
+input[type="button"].wi-small,
+input[type="submit"].wi-small,
+input[type="reset"].wi-small,
+button.wi-small {
+  min-width: 92px;
+}
+input[type="button"].wi-mediumsmall,
+input[type="submit"].wi-mediumsmall,
+input[type="reset"].wi-mediumsmall,
+button.wi-mediumsmall {
+  min-width: 124px;
+}
+input[type="button"].wi-normal,
+input[type="submit"].wi-normal,
+input[type="reset"].wi-normal,
+button.wi-normal {
+  min-width: 172px;
+}
+input[type="button"].wi-lightwide,
+input[type="submit"].wi-lightwide,
+input[type="reset"].wi-lightwide,
+button.wi-lightwide {
+  width: 220px;
+}
+input[type="button"].wi-wide,
+input[type="submit"].wi-wide,
+input[type="reset"].wi-wide,
+button.wi-wide {
+  width: 284px;
+}
+input[type="button"].wi-wider,
+input[type="submit"].wi-wider,
+input[type="reset"].wi-wider,
+button.wi-wider {
+  width: 348px;
+}
+input[type="button"].wi-verywide,
+input[type="submit"].wi-verywide,
+input[type="reset"].wi-verywide,
+button.wi-verywide {
+  width: 540px;
+}
+input[type="button"].wi-tiny,
+input[type="submit"].wi-tiny,
+input[type="reset"].wi-tiny,
+button.wi-tiny {
+  width: auto ;
+  padding: 0.16em 0.2em 0.1em 0.2em;
+  margin: -0.3em 0 0 0.2em;
+  display: inline-block;
+  font-size: 84% ;
+  min-height: 23px;
+  max-height: 23px;
+}
+input[type="button"].wi-verytiny,
+input[type="submit"].wi-verytiny,
+input[type="reset"].wi-verytiny,
+button.wi-verytiny {
+  font-size: 8pt !important;
+  padding: 0.0em 0.3em 0.1em 0.3em;
+  display: inline-block;
+  min-height: 17px;
+  max-height: 17px;
+}
+button.icon {
+  padding: 0 ;
+  margin: 0 ;
+  background: none !important;
+  border: 0 !important;
+  display: inline-block;
+}
+button.icon img {
+  vertical-align: middle ;
+}
+input[type="submit"],
+input[type="button"],
+input[type="button"].button,
+button[type="submit"],
+button[type="button"] {
+  color: #f7eef2;
+  background-color: #33001a;
+  border: 1px #220011 solid;
+}
+input[type="submit"]:hover,
+input[type="button"]:hover,
+input[type="button"].button:hover,
+button[type="submit"]:hover,
+button[type="button"]:hover {
+  color: #e6ccd9;
+  background-color: #220011;
+  border: 1px #000000 solid;
+}
+input[type="submit"]:active,
+input[type="button"]:active,
+input[type="button"].button:active,
+button[type="submit"]:active,
+button[type="button"]:active,
+input[type="submit"]:focus,
+input[type="button"]:focus,
+input[type="button"].button:focus,
+button[type="submit"]:focus,
+button[type="button"]:focus {
+  color: #e6ccd9;
+  background-color: #000000;
+  border: 1px #000000 solid;
+}
+input[type="button"].neutral,
+input[type="submit"].neutral,
+input[type="reset"],
+input[type="reset"].neutral,
+button.neutral,
+button[type="reset"] {
+  color: #220011;
+  background-color: #e6ccd9;
+  border: 1px #800040 solid;
+}
+input[type="button"].neutral:hover,
+input[type="submit"].neutral:hover,
+input[type="reset"]:hover,
+input[type="reset"].neutral:hover,
+button.neutral:hover,
+button[type="reset"]:hover {
+  color: #220011;
+  background-color: #f7eef2;
+  border: 1px #800040 solid;
+}
+input[type="button"].neutral:active,
+input[type="submit"].neutral:active,
+input[type="reset"]:active,
+input[type="reset"].neutral:active,
+button.neutral:active,
+button[type="reset"]:active,
+input[type="button"].neutral:focus,
+input[type="submit"].neutral:focus,
+input[type="reset"]:focus,
+input[type="reset"].neutral:focus,
+button.neutral:focus,
+button[type="reset"]:focus {
+  color: #000000;
+  background-color: #800040;
+  border: 1px #110009 solid;
+}
+input[type="button"].neutral.positions,
+input[type="submit"].neutral.positions,
+input[type="reset"].positions,
+input[type="reset"].neutral.positions,
+button.neutral.positions,
+button[type="reset"].positions {
+  padding-right: 1.2em ;
+}
+input[type="button"].below {
+  clear: both !important;
+  float: none;
+  overflow: hidden ;
+}
+a.button {
+  display: inline-block;
+  cursor: pointer ;
+  width: auto ;
+  padding: 0.2em 0.6em;
+  font-size: 9pt;
+  font-weight: normal;
+  font-style: normal;
+  text-align: center;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 6px;
+  border: 1px #220011 solid;
+  background-color: #33001a;
+  color: #f7eef2;
+  text-decoration: none;
+}
+a.button.below {
+  clear: both !important;
+}
+a.button:hover {
+  border: 1px #000000 solid;
+  background-color: #220011;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+a.button:active,
+a.button:focus {
+  border: 1px #000000 solid;
+  background-color: #000000;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+a.button.neutral:link,
+a.button.neutral:visited {
+  border: 1px #800040 solid;
+  background-color: #e6ccd9;
+  color: #220011;
+}
+a.button.neutral:hover {
+  border: 1px #800040 solid;
+  background-color: #f7eef2;
+  color: #220011;
+  text-decoration: none;
+}
+a.button.neutral:active,
+a.button.neutral:focus {
+  border: 1px #110009 solid;
+  background-color: #800040;
+  color: #000000;
+  text-decoration: none;
+}
+a.button.wi-smallest {
+  width: 42px;
+}
+a.button.wi-verysmall {
+  width: 80px;
+}
+a.button.wi-small {
+  width: 92px;
+}
+a.button.wi-mediumsmall {
+  width: 124px;
+}
+a.button.wi-normal {
+  width: 172px;
+}
+a.button.wi-lightwide {
+  width: 220px;
+}
+a.button.wi-wide {
+  width: 284px;
+}
+a.button.wi-wider {
+  min-width: 348px;
+}
+a.button.wi-verywide {
+  min-width: 540px;
+}
+a.button.wi-tiny {
+  display: inline-block;
+  width: auto ;
+  padding: 0.16em 0.2em 0.1em 0.2em;
+  margin: -0.3em 0 0 0.2em;
+  font-size: 84% ;
+}
+a.button.toggle {
+  background-color: #f7eef2 !important;
+}
+a.button.toggle.off::after {
+  content: " ▸";
+  padding-right: 1.0em;
+}
+a.button.toggle.on::after {
+  content: " ▾";
+  padding-right: 1.0em;
+}
+a.button.toggle.with-panel {
+  margin-bottom: 0 ;
+  border-bottom: none;
+  border-bottom-left-radius: 0px ;
+  border-bottom-right-radius: 0px ;
+}
+a.button.toggle.with-panel:hover {
+  border-top: 1px #800040 solid !important;
+  border-right: 1px #800040 solid !important;
+  border-bottom: 0 !important;
+  border-left: 1px #800040 solid !important;
+}
+a.button.toggle:hover {
+  background-color: #e6ccd9 !important;
+  border: 1px #800040 solid !important;
+  color: #220011;
+  text-decoration: none;
+}
+#content label.button {
+  display: inline-block;
+  cursor: pointer ;
+  width: auto ;
+  padding: 0.2em 0.6em;
+  font-size: 9pt;
+  font-weight: normal;
+  font-style: normal;
+  text-align: center;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 6px;
+  border: 1px #220011 solid;
+  background-color: #33001a;
+  color: #f7eef2;
+  text-decoration: none;
+}
+#content label.button:hover {
+  border: 1px #000000 solid;
+  background-color: #220011;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+#content label.button:active,
+#content label.button:focus {
+  border: 1px #000000 solid;
+  background-color: #000000;
+  color: #e6ccd9;
+  text-decoration: none;
+}
+#content label.button.neutral {
+  border: 1px #800040 solid;
+  background-color: #e6ccd9;
+  color: #220011;
+}
+#content label.button.neutral:hover {
+  border: 1px #800040 solid;
+  background-color: #f7eef2;
+  color: #220011;
+  text-decoration: none;
+}
+#content label.button.neutral:active,
+#content label.button.neutral:focus {
+  border: 1px #110009 solid;
+  background-color: #800040;
+  color: #000000;
+  text-decoration: none;
+}
+div.buttons {
+  padding: 1.0em ;
+  clear: left ;
+  display: block;
+}
+div.buttons.positions {
+  margin: 0 0 -1.7em 26em;
+  padding: 0em;
+}
+div.buttons.below {
+  padding: 0 ;
+  margin: 0 ;
+}
+.col > .buttons,
+.wrapper * .buttons {
+  padding: 1.0em 1.0em 1.0em 0 !important;
+}
+.button-image {
+  display: inline-block;
+}
+td .button-image,
+th .button-image {
+  vertical-align: middle;
+}
+input[type="button"].button-image.delete {
+  background-image: url("image/cross.png");
+  background-repeat: no-repeat;
+  background-position: 0 0;
+  color: #fff;
+  background-color: transparent;
+  border-color: none;
+  border-width: 0;
+}
+/* ------------------------------------------------------------- */
+/* CONTROL PANELS (control_panels.less)                          */
+/* ------------------------------------------------------------- */
+.control-panel {
+  border: 1px #800040 solid;
+  background-color: #f7eef2;
+  background: linear-gradient(to top, #d5aabf, #f7eef2);
+  border-radius: 0.6em;
+  overflow: hidden ;
+}
+.form-addition {
+  padding: 0.8em 1em 1.4em 1.2em;
+  margin: 1em 1em 1em 1.2em !important;
+  width: auto !important ;
+  display: inline-block;
+}
+.form-addition h3 {
+  margin: 0.3em 0 0.1em 0 !important;
+  padding: 0 ;
+}
+.form-addition h4 {
+  color: #33001a !important;
+  font-size: 11pt;
+  font-weight: normal;
+  font-style: normal;
+}
+.form-addition div.list {
+  margin-top: 0.2em !important ;
+}
+.select-item {
+  display: inline-block;
+  width: auto ;
+  height: auto;
+  padding: 0.6em 1em 0.6em 0.8em;
+  margin: 1em 1em 1em 1.2em;
+  color: #33001a;
+  font-size: 9pt;
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+  background-color: #f7eef2;
+  background: linear-gradient(to top, #d5aabf, #f7eef2);
+}
+.select-item input,
+.select-item select {
+  margin-left: 0.6em ;
+}
+.select-item span.label {
+  float: left ;
+  color: #33001a;
+}
+.select-item table {
+  margin: 0 ;
+}
+.select-item table td,
+.select-item table th {
+  color: #33001a;
+}
+.select-item .floating-boxes {
+  display: table ;
+  margin: 0.4em 0 0.8em 0 ;
+}
+.select-item .floating-boxes .floating-box {
+  display: table-cell;
+  float: left ;
+  font-size: 9pt;
+  height: 1.9em ;
+  vertical-align: middle;
+  padding: 0 2.0em 0 0 ;
+}
+.select-item .floating-boxes .floating-box .button,
+.select-item .floating-boxes .floating-box button {
+  margin: 0 ;
+}
+.select-item .floating-boxes .floating-box label,
+.select-item .floating-boxes .floating-box span.label {
+  width: auto;
+  display: inline-block;
+  height: 160%;
+}
+.select-item .floating-boxes .floating-box input[type="checkbox"] {
+  margin: 0 0.4em 0 0 ;
+}
+.select-item .floating-boxes .floating-box select {
+  margin: -0.3em 0 0 0;
+}
+.ui-tabs-panel > .select-item {
+  margin: 1em 1em 1em 1.2em;
+  vertical-align: top ;
+}
+.wrapper > .select-item {
+  margin: 0.8em 0 1.0em 0 ;
+}
+.toggle_panel.control-panel {
+  border: none !important;
+  background: none !important;
+  border-radius: 0 !important;
+  overflow: visible !important;
+}
+.toggle_panel > a.button.toggle {
+  padding: 0.2em 0 0.2em 1.4em;
+}
+.toggle_panel > a.button.toggle:hover {
+  background-color: #f7eef2 !important;
+  text-decoration: underline ;
+}
+.toggle_panel span.summary {
+  font-size: 10pt;
+  padding-left: 2.0em;
+  color: #33001a;
+}
+.toggle_panel .toggle_panel_block {
+  display: block;
+  overflow: hidden;
+  padding: 1.2em 1em 0.8em 0.9em;
+  margin: 2em 1em 0em 0;
+  background-color: #f7eef2;
+  border: 1px #800040 solid;
+  border-bottom-left-radius: 0.6em;
+  border-bottom-right-radius: 0.6em;
+  border-top-right-radius: 0.6em;
+  margin-top: -1px;
+}
+.toggle_panel .toggle_panel_block .buttons {
+  clear: left ;
+  padding: 0 !important;
+  margin: 0;
+}
+#content .input-panel {
+  display: inline-block;
+  overflow: hidden;
+  padding: 1.2em 1em 0.8em 0.9em;
+  margin: 0 0 0.4em 0;
+  background-color: #f7eef2;
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+  width: auto ;
+  min-width: 30% ;
+}
+#content .input-panel > h3 {
+  margin-top: 0 ;
+}
+#content .input-panel p {
+  font-size: 9pt;
+  margin: 0 0 0.4em 0 ;
+}
+.paginate {
+  display: inline-block;
+  width: auto ;
+  height: auto;
+  padding: 0;
+  margin: 1em 1em 1em 1.2em;
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+  background-color: #f7eef2;
+  color: #33001a;
+}
+.paginate > a,
+.paginate > span {
+  padding: 0.4em 0.6em !important;
+  margin-top: -1px;
+}
+.paginate .paginate-prev {
+  display: inline-block;
+}
+.paginate .paginate-prev::before {
+  content: "◄";
+}
+.paginate .paginate-prev:hover {
+  border-bottom-left-radius: 0.6em;
+  border-top-left-radius: 0.6em;
+}
+.paginate .paginate-next {
+  display: inline-block;
+}
+.paginate .paginate-next::after {
+  content: "►";
+}
+.paginate .paginate-next:hover {
+  border-bottom-right-radius: 0.6em;
+  border-top-right-radius: 0.6em;
+}
+.paginate .paginate-page {
+  display: inline-block;
+  padding: 0 ;
+}
+.paginate span.paginate-page {
+  background-color: #220011;
+  color: #e6ccd9;
+}
+.paginate a:hover,
+.paginate a:active {
+  background-color: #000000;
+  color: #d5aabf;
+  text-decoration: none;
+}
+table.jump-to {
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+  background-color: #f7eef2;
+  margin: 0.8em 2.0em 0 1.2em !important;
+}
+table.jump-to.right {
+  float: right;
+}
+div.float-cells-table {
+  display: block ;
+  width: 100% ;
+  overflow: hidden;
+  font-size: 80% ;
+}
+div.float-cells-table div.caption {
+  float: left;
+  display: block;
+  width: auto:
+    padding: 0 2.0em 0 0;
+  margin: 0;
+}
+div.float-cells-table div.cells {
+  float: left;
+  display: block;
+  overflow: hidden;
+  width: 100%;
+  background-color: #F66;
+}
+div.float-cells-table div.cells div.cell {
+  float: left;
+  padding: 0 2.0em 0 0;
+  border-right: 1px #fff solid;
+  background-color: #FC6;
+}
+/* ------------------------------------------------------------- */
+/* REQUIREMENT SPEC (requirement_spec.less)                      */
+/* ------------------------------------------------------------- */
+#requirement_spec_version {
+  padding: 0.6em 1em 1.2em 1.8em;
+  letter-spacing: 0.16em ;
+  font-size: 110% ;
+}
+#column-container {
+  padding-left: 0;
+  padding-right: 0;
+  margin-left: 0;
+  margin-top: 0.2em ;
+  margin-right: 0;
+  overflow: hidden ;
+}
+#column-container #tree-column {
+  float: left;
+  width: 30em;
+  padding: 0.3em 1.2em 2.0em 0.8em;
+  border-right: 1px #000 solid;
+  background-color: none;
+}
+#column-container #tree-column .jstree > ul {
+  width: 342px;
+  overflow-x: hidden;
+}
+#column-container #tree-column .jstree ul li {
+  line-height: 1.8em;
+  padding: 0 ;
+  font-size: 10pt;
+}
+#column-container #tree-column .jstree ul li a {
+  border-bottom: none;
+  width: 98% ;
+}
+#column-container #tree-column #tree li.flagged > a > ins {
+  background-image: url("../image/flag-red.png") !important;
+  background-position: 0;
+}
+#column-container #content-column {
+  float: left;
+  width: 58em;
+  padding-left: 3.0em;
+  background-color: none;
+}
+#column-container #content-column #column-content .section {
+  border-left: 0;
+  margin-left: 0;
+}
+#column-container #content-column #column-content .section .section-header {
+  display: block ;
+  overflow: hidden;
+  width: 90% ;
+}
+#column-container #content-column #column-content .section .section-header h3 {
+  font-size: 140%;
+  letter-spacing: 0.16em;
+}
+#column-container #content-column #column-content .section .section-header h3 span.label {
+  font-size: 90% ;
+  font-weight: bold;
+  letter-spacing: 0.1em;
+  color: #33001a;
+}
+#column-container #content-column #column-content .section .section-header .section-description {
+  margin-bottom: 15px;
+  margin-left: 0;
+}
+#column-container #content-column #column-content .section .section-header .section-description div {
+  padding: 0.3em 0 0.4em 0;
+}
+#column-container #content-column #column-content .section .section-header .section-description div .section-description-heading {
+  font-weight: normal;
+  font-size: 100% ;
+  /* margin:       0 0 1.2em 0; */
+
+  padding: 0 0 0.0em 0;
+  display: block;
+}
+#column-container #content-column #column-content .section .section-header .section-description div span.label {
+  font-size: 90%;
+}
+#column-container #content-column #column-content .section .section-header .section-description div p {
+  color: #000;
+  font-size: 106%;
+  line-height: 1.5em;
+  margin: 0 0 0.3em 0;
+}
+#column-container #content-column #column-content .section .section-header .section-context-menu h3 {
+  background-color: #000;
+  color: #000 !important ;
+}
+#column-container #content-column #column-content .section .section-header .section-context-menu h3 span.label {
+  font-weight: normal;
+}
+#column-container #content-column #column-content .section .section-header #section-list-empty {
+  border: 1px #0C42FF solid ;
+  background-color: #BBCDFF ;
+  padding: 0.6em ;
+}
+#column-container #content-column #column-content .function-block {
+  border-top: 1px solid #bbb;
+  margin: 0 ;
+  padding: 0.8em 0 1.8em 0 ;
+  overflow: hidden;
+  display: block;
+  clear: both;
+  float: none;
+  width: 48em;
+}
+#column-container #content-column #column-content .function-block .function-block-content {
+  overflow: hidden ;
+  padding: 0 0 0 0.6em;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-header {
+  clear: both;
+  overflow: hidden;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-number {
+  font-weight: normal;
+  width: 5.0em ;
+  display: block;
+  float: left;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc {
+  display: inline-block;
+  overflow: hidden;
+  float: left;
+  width: 80%;
+  padding-bottom: 1.0em ;
+  font-weight: normal;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc p {
+  margin: 0 0 0.6em 0;
+  padding: 0 ;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-header .function-block-desc p:first-child {
+  font-weight: bold ;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-properties {
+  display: block ;
+  margin: 0 0 0 5.6em;
+  padding: 0 ;
+  overflow: hidden;
+  clear: both;
+  font-size: 9pt;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.label,
+#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.value {
+  float: left;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.label {
+  width: 110px ;
+}
+#column-container #content-column #column-content .function-block .function-block-content .function-block-properties span.value {
+  width: 200px;
+  padding: 0 30px 0 0;
+  margin: 0;
+}
+#column-container #content-column #column-content .function-block .sub-function-block-container {
+  margin: 1.8em 0 0 5.1em;
+  display: block;
+}
+#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block-header {
+  border-top: 1px solid #ccc;
+  padding: 0.4em 0 0.4em 0.6em ;
+  font-size: 86% ;
+  letter-spacing: 0.2em;
+}
+#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block {
+  border-top: 1px solid #ccc;
+  margin: 0.2em 0 0.2em 0;
+  padding: 0.2em 0 0.4em 0 ;
+}
+#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block .sub-function-block-content {
+  margin: 0.2em 0 0.2em 0;
+  padding: 0.2em 0.6em 0.4em 0.6em;
+}
+#column-container #content-column #column-content .function-block .sub-function-block-container .sub-function-block .sub-function-block-content .sub-function-block-header {
+  font-weight: normal;
+  font-size: 120% ;
+  color: #666666;
+  margin-top: 1.0em ;
+}
+#column-container #content-column #column-content .function-block-form > div {
+  padding: 0.4em;
+}
+#column-container #content-column #column-content .section.flagged .section-description,
+#column-container #content-column #column-content .function-block.flagged,
+#column-container #content-column #column-content .sub-function-block.flagged {
+  background-color: #ebf8fc;
+}
+#column-container #content-column #column-content .section.flagged .section-description > .section-description-heading,
+#column-container #content-column #column-content .function-block.flagged > .function-block-content > div > .function-block-number,
+#column-container #content-column #column-content .sub-function-block.flagged > .sub-function-block-content > div > .function-block-number {
+  color: #209ec8;
+}
+#column-container #content-column #column-content .section.selected,
+#column-container #content-column #column-content .function-block.selected,
+#column-container #content-column #column-content .sub-function-block.selected {
+  margin-left: -3px;
+  border-left: 3px solid #24D115;
+}
+.section-empty-description {
+  color: #bbb;
+}
+.context-menu-item.icon-flag {
+  background-image: url("../image/flag-red.png");
+}
+.context-menu-item.icon-close {
+  background-image: url("../image/document-close.png");
+}
+.context-menu-item.icon-save {
+  background-image: url("../image/document-save.png");
+}
+.context-menu-item.icon-revert {
+  background-image: url("../image/edit-undo.png");
+}
+.context-menu-item.icon-pdf {
+  background-image: url("../image/application-pdf.png");
+}
+.context-menu-item.icon-html {
+  background-image: url("../image/text-html.png");
+}
+.context-menu-item.icon-add-picture {
+  background-image: url("../image/add-picture.png");
+}
+.context-menu-item.icon-download {
+  background-image: url("../image/download.png");
+}
+.context-menu-item.icon-renumber {
+  background-image: url("../image/format-list-ordered.png");
+}
+#requirement_spec_tabs #function-blocks-tab {
+  margin-top: 1.4em ;
+}
+.requirement-spec-text-block {
+  border-left: 0;
+  margin-left: 3px;
+  margin-top: 10px;
+}
+.requirement-spec-text-block > h2 {
+  margin-top: 0px;
+}
+.requirement-spec-text-block.flagged > h2 {
+  color: #fff;
+}
+.requirement-spec-text-block.selected {
+  border-left: 3px solid #cbb120;
+  margin-left: 0;
+}
+.requirement-spec-text-block-picture-thumbnail {
+  border-radius: 5px;
+  border: 2px solid #ebebeb;
+  float: left;
+  margin-right: 20px;
+  padding: 5px;
+  text-align: center;
+  width: 130px;
+}
+.requirement-spec-text-block-picture-thumbnail-img-container {
+  height: 64px;
+  margin: auto;
+  padding: 0;
+  width: 64px;
+}
+.requirement-spec-text-block-picture-thumbnail.selected {
+  border: 2px solid #cbb120;
+}
+#time_cost_estimate p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+#time_cost_estimate table tbody tr td {
+  vertical-align: top ;
+}
+#time_cost_estimate table tbody tr td:first-child {
+  width: 66% ;
+}
+#time_cost_estimate table tbody tr.section th {
+  line-height: 2.2em ;
+  background-color: #800040;
+  color: #000000;
+}
+#time_cost_estimate table tbody tr.section th b {
+  font-size: 116% ;
+}
+#time_cost_estimate table tbody tr.subtotal td,
+#time_cost_estimate table tbody tr.subtotal th {
+  font-weight: bold ;
+  background-color: #888888;
+  border-top: 1px #000000 solid;
+  border-bottom: 1px #000000 solid;
+  text-align: right;
+}
+div.function-block * table.tbl-horizontal td {
+  font-size: 66% !important ;
+}
+.jstree-requirement-spec .jstree-clicked {
+  background: #cccccc !important;
+  border: 0 !important;
+}
+/* ------------------------------------------------------------- */
+/* SPECIALS (specials.less)                                      */
+/* ------------------------------------------------------------- */
+#tbl-accounts {
+  border-width: 0;
+}
+#tbl-accounts tbody tr.heading.heading th {
+  border-top: 1px #999 solid;
+}
+#tbl-accounts tbody tr.heading.heading th.numeric {
+  padding-right: 20px;
+  padding-left: 10px;
+}
+#tbl-accounts tbody tr.heading.th1 {
+  font-size: 14pt;
+}
+#tbl-accounts tbody tr.heading.th1 th {
+  padding: 1.0em 0 0.4em 0 ;
+}
+#tbl-accounts tbody tr.heading.th2 {
+  font-size: 11pt;
+}
+#tbl-accounts tbody tr.heading.th2 th {
+  padding: 1.0em 0 0.4em 0 ;
+}
+#tbl-accounts tbody tr.heading.th3 {
+  font-size: 10pt;
+}
+#tbl-accounts tbody tr.heading.th3 th {
+  padding: 1.0em 0 0.4em 0 ;
+}
+#tbl-accounts tbody td:first-child {
+  text-align: right !important;
+}
+#tbl-accounts tbody tr.ajax-account-details td {
+  padding: 0.8em 0 1.0em 4.0em ;
+}
+td.row-position-detail {
+  padding: 0 0 0.2em 0.4em !important;
+}
+td.row-position-detail div.table {
+  display: table;
+}
+td.row-position-detail div.table div.field {
+  display: table-row;
+  padding: 0.1em 0 ;
+  height: 2.0em !important;
+}
+td.row-position-detail div.table div.field span.label {
+  width: 10.0em;
+  height: 2.0em !important;
+  vertical-align: middle;
+  display: table-cell;
+  padding: 0.3em 0 0 0;
+}
+td.row-position-detail div.table div.field span.value {
+  height: 2.0em ;
+}
+td.row-position-detail div.table div.field span.value span.data {
+  padding: 0.3em 0 0.2em 0.5em !important;
+  display: block;
+}
+table#display_row tbody tr td a.row-position {
+  float: left;
+  padding: 0.6em 0.2em 0 0 ;
+}
+table#display_row tbody tr td input.row-position {
+  float: left;
+}
+/* ------------------------------------------------------------- */
+/* JQUERY UI (jquery-ui.less)                                    */
+/* ------------------------------------------------------------- */
+.ui-helper-hidden {
+  display: none;
+}
+.ui-helper-hidden-accessible {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+.ui-helper-reset {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  line-height: 1.3;
+  text-decoration: none;
+  font-size: 11pt;
+  list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+  content: "";
+  display: table;
+  border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+  clear: both;
+}
+.ui-helper-clearfix {
+  min-height: 0;
+}
+.ui-helper-zfix {
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  opacity: 0;
+}
+.ui-front {
+  z-index: 100;
+}
+.ui-state-disabled {
+  cursor: default !important;
+}
+.ui-icon {
+  display: block;
+  text-indent: -99999px;
+  overflow: hidden;
+  background-repeat: no-repeat;
+}
+.ui-widget-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.ui-resizable {
+  position: relative;
+}
+.ui-resizable-handle {
+  position: absolute;
+  font-size: 0.1px;
+  display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+  display: none;
+}
+.ui-resizable-n {
+  cursor: n-resize;
+  height: 7px;
+  width: 100%;
+  top: -5px;
+  left: 0;
+}
+.ui-resizable-s {
+  cursor: s-resize;
+  height: 7px;
+  width: 100%;
+  bottom: -5px;
+  left: 0;
+}
+.ui-resizable-e {
+  cursor: e-resize;
+  width: 7px;
+  right: -5px;
+  top: 0;
+  height: 100%;
+}
+.ui-resizable-w {
+  cursor: w-resize;
+  width: 7px;
+  left: -5px;
+  top: 0;
+  height: 100%;
+}
+.ui-resizable-se {
+  cursor: se-resize;
+  width: 12px;
+  height: 12px;
+  right: 1px;
+  bottom: 1px;
+}
+.ui-resizable-sw {
+  cursor: sw-resize;
+  width: 9px;
+  height: 9px;
+  left: -5px;
+  bottom: -5px;
+}
+.ui-resizable-nw {
+  cursor: nw-resize;
+  width: 9px;
+  height: 9px;
+  left: -5px;
+  top: -5px;
+}
+.ui-resizable-ne {
+  cursor: ne-resize;
+  width: 9px;
+  height: 9px;
+  right: -5px;
+  top: -5px;
+}
+.ui-selectable-helper {
+  position: absolute;
+  z-index: 100;
+  border: 1px dotted black;
+}
+.ui-accordion .ui-accordion-header {
+  display: block;
+  cursor: pointer;
+  position: relative;
+  margin-top: 2px;
+  padding: .5em .5em .5em .7em;
+  min-height: 0;
+}
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+  position: absolute;
+  left: .5em;
+  top: 50%;
+  margin-top: -8px;
+}
+.ui-accordion .ui-accordion-content {
+  padding: 1em 2.2em;
+  border-top: 0;
+  overflow: auto;
+}
+.ui-accordion .ui-accordion-icons {
+  padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-icons .ui-accordion-icons {
+  padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-noicons {
+  padding-left: .7em;
+}
+.ui-autocomplete {
+  position: absolute;
+  top: 0;
+  left: 0;
+  cursor: default;
+}
+.ui-autocomplete .ui-menu-item a:hover {
+  background-color: #33001a;
+  color: #fff ;
+}
+.ui-button {
+  display: inline-block;
+  position: relative;
+  padding: 0;
+  line-height: normal;
+  margin-right: .1em;
+  cursor: pointer;
+  vertical-align: middle;
+  text-align: center;
+  overflow: visible;
+}
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+  text-decoration: none;
+}
+.ui-button-icon-only {
+  width: 2.2em;
+}
+button.ui-button-icon-only {
+  width: 2.4em;
+}
+.ui-button-icons-only {
+  width: 3.4em;
+}
+button.ui-button-icons-only {
+  width: 3.7em;
+}
+.ui-button .ui-button-text {
+  display: block;
+  line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+  padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+  padding: .4em;
+  text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+  padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+  padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+  padding-left: 2.1em;
+  padding-right: 2.1em;
+}
+input.ui-button {
+  padding: .4em 1em;
+}
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+  position: absolute;
+  top: 50%;
+  margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+  left: 50%;
+  margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+  left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+  right: .5em;
+}
+.ui-buttonset {
+  margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+  margin-left: 0;
+  margin-right: -0.3em;
+}
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+.ui-datepicker {
+  width: 17em;
+  padding: .2em .2em 0;
+  display: none;
+}
+.ui-datepicker.ui-widget-content {
+  background-color: #ffffff;
+  border: 1px #800040 solid;
+}
+.ui-datepicker .ui-datepicker-header {
+  position: relative;
+  padding: 0.2em 0;
+}
+.ui-datepicker .ui-datepicker-header.ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-header.ui-datepicker-next {
+  position: absolute;
+  top: 2px;
+  width: 1.8em;
+  height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-header.ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-header.ui-datepicker-next-hover {
+  top: 1px;
+}
+.ui-datepicker .ui-datepicker-header.ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-header.ui-datepicker-next span {
+  display: block;
+  position: absolute;
+  left: 50%;
+  margin-left: -8px;
+  top: 50%;
+  margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-prev {
+  float: left;
+  left: 2px;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-prev-hover {
+  left: 1px;
+  background-position: 25% 25% ;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-next {
+  float: right ;
+  right: 2px;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-next-hover {
+  right: 1px;
+  background-position: 25% 25% ;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-title {
+  margin: 0 2.3em;
+  line-height: 1.8em;
+  text-align: center;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-title select {
+  margin: 1px 0;
+}
+.ui-datepicker .ui-datepicker-header .ui-datepicker-title select.ui-datepicker-month {
+  margin-right: 0.2em ;
+}
+.ui-datepicker .ui-datepicker-header select.ui-datepicker-month-year {
+  width: 100%;
+}
+.ui-datepicker .ui-datepicker-header select.ui-datepicker-month,
+.ui-datepicker .ui-datepicker-header select.ui-datepicker-year {
+  width: 49%;
+}
+.ui-datepicker .ui-datepicker-header.ui-corner-all {
+  cursor: pointer ;
+}
+.ui-datepicker .ui-datepicker-header.ui-corner-all.ui-state-hover {
+  border: none !important ;
+  curser: pointer ;
+}
+.ui-datepicker .ui-datepicker-header.ui-widget-header .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_222222_256x240.png);
+}
+.ui-datepicker .ui-datepicker-header.ui-widget-header .ui-state-hover .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ef8c08_256x240.png);
+}
+.ui-datepicker table {
+  width: 100%;
+  font-size: 9pt;
+  border-collapse: collapse;
+  margin: 0 0 0.4em;
+}
+.ui-datepicker table th {
+  padding: 0.7em 0.3em;
+  text-align: center;
+  font-weight: bold;
+  border: 0;
+}
+.ui-datepicker table td {
+  border: 0;
+  padding: 1px;
+}
+.ui-datepicker table td span,
+.ui-datepicker table td a {
+  display: block;
+  padding: 0.2em;
+  text-align: right;
+  text-decoration: none;
+}
+.ui-datepicker table td a.ui-state-hover {
+  color: #ffffff ;
+  background-color: #220011;
+}
+.ui-datepicker table.ui-datepicker-calendar .ui-state-highlight {
+  color: #ffffff ;
+  background-color: #220011;
+  border: 1px #888888 solid;
+}
+.ui-datepicker table.ui-datepicker-calendar td a.ui-state-default {
+  color: #33001a;
+}
+.ui-datepicker table.ui-datepicker-calendar td a.ui-state-hover {
+  color: #ffffff ;
+  background-color: #000000;
+  border: #000000 ;
+}
+.ui-datepicker table.ui-datepicker-calendar td a.ui-state-active {
+  border: 1px solid #33001a;
+  background-color: #33001a;
+  color: #f7eef2;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+  background-image: none;
+  margin: 0.7em 0 0 0;
+  padding: 0 0.2em;
+  border-left: 0;
+  border-right: 0;
+  border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+  float: right;
+  margin: .5em .2em .4em;
+  cursor: pointer;
+  padding: .2em .6em .3em .6em;
+  width: auto;
+  overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+  float: left;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close {
+  border: 1px #800040 solid;
+  background-color: #e6ccd9;
+  color: #220011;
+  font-weight: normal ;
+}
+.ui-datepicker.ui-datepicker-multi {
+  width: auto;
+}
+.ui-datepicker.ui-datepicker-multi .ui-datepicker-group {
+  float: left;
+}
+.ui-datepicker.ui-datepicker-multi .ui-datepicker-group table {
+  width: 95%;
+  margin: 0 auto .4em;
+}
+.ui-datepicker.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+  border-left-width: 0;
+}
+.ui-datepicker.ui-datepicker-multi .ui-datepicker-buttonpane {
+  clear: left;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+  width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+  width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+  width: 25%;
+}
+.ui-datepicker-row-break {
+  clear: both;
+  width: 100%;
+  font-size: 0;
+}
+img.ui-datepicker-trigger {
+  vertical-align: middle;
+  margin-left: 0.2em ;
+}
+.ui-dialog {
+  z-index: 8001 ;
+  position: absolute;
+  top: 0;
+  left: 0;
+  outline: 0;
+  border: 1px #800040 solid;
+  border-radius: 0.6em;
+}
+.ui-dialog .ui-dialog-titlebar {
+  padding: 0.4em 1.0em;
+  border: none;
+  background-color: #33001a !important;
+  color: #e6ccd9 !important;
+  font-weight: normal;
+  position: relative;
+  text-align: left;
+  font-size: 13pt;
+}
+.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
+  float: left;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
+}
+.ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close {
+  position: absolute;
+  right: 0.3em;
+  top: 0;
+  width: 21px;
+  margin: 5px 0 0 0;
+  padding: 1px;
+  height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+  position: relative;
+  border: 0;
+  padding: 0.5em 1em;
+  background-color: #f7eef2 !important;
+  background: linear-gradient(to bottom, #f7eef2, #d5aabf) !important;
+  overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+  text-align: left;
+  border-width: 1px 0 0 0;
+  background-image: none;
+  margin-top: 0.5em;
+  padding: 0.3em 1em 0.5em 0.4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+  float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+  margin: .5em .4em .5em 0;
+  cursor: pointer;
+}
+.ui-dialog .ui-resizable-se {
+  width: 12px;
+  height: 12px;
+  right: -5px;
+  bottom: -5px;
+  background-position: 16px 16px;
+}
+.ui-dialog.ui-draggable .ui-dialog-titlebar {
+  cursor: move;
+}
+.ui-menu {
+  list-style: none;
+  padding: 2px;
+  margin: 0;
+  display: block;
+  outline: none;
+  display: inline-table;
+  border-collapse: collapse ;
+}
+.ui-menu.ui-widget-content {
+  border: 1px #800040 solid;
+}
+.ui-menu .ui-menu-item {
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  background-color: #e6ccd9;
+  border-bottom: 1px #800040 solid;
+}
+.ui-menu .ui-menu-item a {
+  text-decoration: none;
+  display: block;
+  padding: 2px .4em;
+  line-height: 1.5;
+  min-height: 0;
+  font-weight: normal;
+  background: none ;
+  border: 0 ;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+  font-weight: normal;
+  margin: -1px;
+}
+.ui-menu .ui-menu-divider {
+  margin: 5px -2px 5px -2px;
+  height: 0;
+  font-size: 0;
+  line-height: 0;
+  border-width: 1px 0 0 0;
+}
+.ui-menu .ui-state-disabled {
+  font-weight: normal;
+  margin: .4em 0 .2em;
+  line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+  cursor: default;
+}
+.ui-menu .ui-menu {
+  margin-top: -3px;
+  position: absolute;
+}
+.ui-menu.ui-menu-icons {
+  position: relative;
+}
+.ui-menu.ui-menu-icons .ui-menu-item a {
+  position: relative;
+  padding-left: 2em;
+}
+.ui-menu .ui-icon {
+  position: absolute;
+  top: .2em;
+  left: .2em;
+}
+.ui-menu .ui-menu-icon {
+  position: static;
+  float: right;
+}
+.ui-progressbar {
+  height: 2em;
+  text-align: left;
+  overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+  margin: -1px;
+  height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+  background: url("ui-lightness/images/animated-overlay.gif");
+  height: 100%;
+  filter: alpha(opacity=25);
+  opacity: 0.25;
+}
+.ui-progressbar .ui-progressbar-indeterminate .ui-progressbar-value {
+  background-image: none;
+}
+.ui-slider {
+  position: relative;
+  text-align: left;
+}
+.ui-slider .ui-slider-handle {
+  position: absolute;
+  z-index: 2;
+  width: 1.2em;
+  height: 1.2em;
+  cursor: default;
+}
+.ui-slider .ui-slider-range {
+  position: absolute;
+  z-index: 1;
+  display: block;
+  border: 0;
+  background-position: 0 0;
+}
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+  filter: inherit;
+}
+.ui-slider-horizontal {
+  height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+  top: -0.3em;
+  margin-left: -0.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+  top: 0;
+  height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+  left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+  right: 0;
+}
+.ui-slider-vertical {
+  width: .8em;
+  height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+  left: -0.3em;
+  margin-left: 0;
+  margin-bottom: -0.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+  left: 0;
+  width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+  bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+  top: 0;
+}
+.ui-spinner {
+  position: relative;
+  display: inline-block;
+  overflow: hidden;
+  padding: 0;
+  vertical-align: middle;
+}
+.ui-spinner .ui-spinner-input {
+  border: none;
+  background: none;
+  color: inherit;
+  padding: 0;
+  margin: .2em 0;
+  vertical-align: middle;
+  margin-left: .4em;
+  margin-right: 22px;
+}
+.ui-spinner .ui-spinner-button {
+  width: 16px;
+  height: 50%;
+  padding: 0;
+  margin: 0;
+  text-align: center;
+  position: absolute;
+  cursor: default;
+  display: block;
+  overflow: hidden;
+  right: 0;
+}
+.ui-spinner a.ui-spinner-button {
+  border-top: none;
+  border-bottom: none;
+  border-right: none;
+}
+.ui-spinner .ui-icon {
+  position: absolute;
+  margin-top: -8px;
+  top: 50%;
+  left: 0;
+}
+.ui-spinner .ui-spinner-up {
+  top: 0;
+}
+.ui-spinner .ui-spinner-down {
+  bottom: 0;
+}
+.ui-spinner .ui-spinner .ui-icon-triangle-1-s {
+  background-position: -65px -16px;
+}
+.ui-tabs {
+  position: relative;
+  padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+  margin: 0;
+  padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+  list-style: none;
+  float: left;
+  position: relative;
+  top: 0;
+  margin: 1px .2em 0 0;
+  border-bottom-width: 0;
+  padding: 0;
+  white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav li a {
+  float: left;
+  padding: .5em 1em;
+  text-decoration: none;
+  cursor: pointer;
+}
+.ui-tabs .ui-tabs-nav li .ui-tabs-active {
+  margin-bottom: -1px;
+  padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li .ui-tabs-active a,
+.ui-tabs .ui-tabs-nav li .ui-state-disabled a,
+.ui-tabs .ui-tabs-nav li .ui-tabs-loading a {
+  cursor: text;
+  outline: 0 ;
+}
+.ui-tabs .ui-tabs-panel {
+  display: block;
+  border-width: 0;
+  padding: 0.4em 0 1.0em 0;
+}
+.ui-tabs .ui-tabs-nav li a,
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
+  cursor: pointer;
+}
+.ui-tooltip {
+  padding: 8px;
+  position: absolute;
+  z-index: 9999;
+  max-width: 300px;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
+  background-color: #800040 !important;
+}
+body .ui-tooltip {
+  border-width: 2px;
+}
+.ui-widget .ui-widget-header {
+  background: none;
+  color: #ffffff;
+  font-weight: bold;
+}
+.ui-widget .ui-widget-header a {
+  color: #ffffff;
+}
+.ui-widget .ui-widget-content {
+  border: none;
+  background: none ;
+}
+.ui-widget .ui-widget {
+  font-size: 10pt;
+}
+.ui-state-default .ui-icon,
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon,
+.ui-state-active .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_777777_256x240.png) !important;
+}
+.ui-state-default {
+  border: 1px solid #cccccc;
+  background: none ;
+  font-weight: bold;
+  color: #220011;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+  color: #1c94c4;
+  text-decoration: none;
+}
+.ui-state-hover,
+.ui-state-focus {
+  background: none ;
+  font-weight: bold;
+  color: #c77405;
+}
+.ui-state-hover a,
+.ui-state-focus a,
+.ui-state-hover a:hover,
+.ui-state-focus a:hover,
+.ui-state-hover a:link,
+.ui-state-focus a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a:visited {
+  color: #000;
+  text-decoration: underline;
+}
+.ui-state-active {
+  border: 1px solid #fbd850;
+  background: none ;
+  font-weight: bold;
+  color: #eb8f00;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+  color: #eb8f00;
+  text-decoration: none;
+}
+.ui-state-highlight {
+  border: 1px solid #fed22f;
+  background: none ;
+  color: #363636;
+}
+.ui-state-highlight a {
+  color: #363636;
+}
+.ui-state-error {
+  border: 1px solid #cd0a0a;
+  background: none ;
+  color: #ffffff;
+}
+.ui-state-error a {
+  color: #ffffff;
+}
+.ui-state-error-text {
+  color: #ffffff;
+}
+.ui-priority-primary {
+  font-weight: bold;
+}
+.ui-priority-secondary {
+  opacity: .7;
+  filter: alpha(opacity=70);
+  font-weight: normal;
+}
+.ui-state-disabled {
+  opacity: .35;
+  filter: alpha(opacity=35);
+  background-image: none;
+}
+.ui-state-disabled .ui-icon {
+  filter: alpha(opacity=35);
+}
+.ui-icon {
+  width: 16px;
+  height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ffffff_256x240.png);
+}
+.ui-state-default .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-active .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_228ef1_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+  background-image: url(ui-lightness/images/ui-icons_ffd27a_256x240.png);
+}
+.ui-icon-blank {
+  background-position: 16px 16px;
+}
+.ui-icon-carat-1-n {
+  background-position: 0 0;
+}
+.ui-icon-carat-1-ne {
+  background-position: -16px 0;
+}
+.ui-icon-carat-1-e {
+  background-position: -32px 0;
+}
+.ui-icon-carat-1-se {
+  background-position: -48px 0;
+}
+.ui-icon-carat-1-s {
+  background-position: -64px 0;
+}
+.ui-icon-carat-1-sw {
+  background-position: -80px 0;
+}
+.ui-icon-carat-1-w {
+  background-position: -96px 0;
+}
+.ui-icon-carat-1-nw {
+  background-position: -112px 0;
+}
+.ui-icon-carat-2-n-s {
+  background-position: -128px 0;
+}
+.ui-icon-carat-2-e-w {
+  background-position: -144px 0;
+}
+.ui-icon-triangle-1-n {
+  background-position: 0 -16px;
+}
+.ui-icon-triangle-1-ne {
+  background-position: -16px -16px;
+}
+.ui-icon-triangle-1-e {
+  background-position: -32px -16px;
+}
+.ui-icon-triangle-1-se {
+  background-position: -48px -16px;
+}
+.ui-icon-triangle-1-s {
+  background-position: -64px -16px;
+}
+.ui-icon-triangle-1-sw {
+  background-position: -80px -16px;
+}
+.ui-icon-triangle-1-w {
+  background-position: -96px -16px;
+}
+.ui-icon-triangle-1-nw {
+  background-position: -112px -16px;
+}
+.ui-icon-triangle-2-n-s {
+  background-position: -128px -16px;
+}
+.ui-icon-triangle-2-e-w {
+  background-position: -144px -16px;
+}
+.ui-icon-arrow-1-n {
+  background-position: 0 -32px;
+}
+.ui-icon-arrow-1-ne {
+  background-position: -16px -32px;
+}
+.ui-icon-arrow-1-e {
+  background-position: -32px -32px;
+}
+.ui-icon-arrow-1-se {
+  background-position: -48px -32px;
+}
+.ui-icon-arrow-1-s {
+  background-position: -64px -32px;
+}
+.ui-icon-arrow-1-sw {
+  background-position: -80px -32px;
+}
+.ui-icon-arrow-1-w {
+  background-position: -96px -32px;
+}
+.ui-icon-arrow-1-nw {
+  background-position: -112px -32px;
+}
+.ui-icon-arrow-2-n-s {
+  background-position: -128px -32px;
+}
+.ui-icon-arrow-2-ne-sw {
+  background-position: -144px -32px;
+}
+.ui-icon-arrow-2-e-w {
+  background-position: -160px -32px;
+}
+.ui-icon-arrow-2-se-nw {
+  background-position: -176px -32px;
+}
+.ui-icon-arrowstop-1-n {
+  background-position: -192px -32px;
+}
+.ui-icon-arrowstop-1-e {
+  background-position: -208px -32px;
+}
+.ui-icon-arrowstop-1-s {
+  background-position: -224px -32px;
+}
+.ui-icon-arrowstop-1-w {
+  background-position: -240px -32px;
+}
+.ui-icon-arrowthick-1-n {
+  background-position: 0 -48px;
+}
+.ui-icon-arrowthick-1-ne {
+  background-position: -16px -48px;
+}
+.ui-icon-arrowthick-1-e {
+  background-position: -32px -48px;
+}
+.ui-icon-arrowthick-1-se {
+  background-position: -48px -48px;
+}
+.ui-icon-arrowthick-1-s {
+  background-position: -64px -48px;
+}
+.ui-icon-arrowthick-1-sw {
+  background-position: -80px -48px;
+}
+.ui-icon-arrowthick-1-w {
+  background-position: -96px -48px;
+}
+.ui-icon-arrowthick-1-nw {
+  background-position: -112px -48px;
+}
+.ui-icon-arrowthick-2-n-s {
+  background-position: -128px -48px;
+}
+.ui-icon-arrowthick-2-ne-sw {
+  background-position: -144px -48px;
+}
+.ui-icon-arrowthick-2-e-w {
+  background-position: -160px -48px;
+}
+.ui-icon-arrowthick-2-se-nw {
+  background-position: -176px -48px;
+}
+.ui-icon-arrowthickstop-1-n {
+  background-position: -192px -48px;
+}
+.ui-icon-arrowthickstop-1-e {
+  background-position: -208px -48px;
+}
+.ui-icon-arrowthickstop-1-s {
+  background-position: -224px -48px;
+}
+.ui-icon-arrowthickstop-1-w {
+  background-position: -240px -48px;
+}
+.ui-icon-arrowreturnthick-1-w {
+  background-position: 0 -64px;
+}
+.ui-icon-arrowreturnthick-1-n {
+  background-position: -16px -64px;
+}
+.ui-icon-arrowreturnthick-1-e {
+  background-position: -32px -64px;
+}
+.ui-icon-arrowreturnthick-1-s {
+  background-position: -48px -64px;
+}
+.ui-icon-arrowreturn-1-w {
+  background-position: -64px -64px;
+}
+.ui-icon-arrowreturn-1-n {
+  background-position: -80px -64px;
+}
+.ui-icon-arrowreturn-1-e {
+  background-position: -96px -64px;
+}
+.ui-icon-arrowreturn-1-s {
+  background-position: -112px -64px;
+}
+.ui-icon-arrowrefresh-1-w {
+  background-position: -128px -64px;
+}
+.ui-icon-arrowrefresh-1-n {
+  background-position: -144px -64px;
+}
+.ui-icon-arrowrefresh-1-e {
+  background-position: -160px -64px;
+}
+.ui-icon-arrowrefresh-1-s {
+  background-position: -176px -64px;
+}
+.ui-icon-arrow-4 {
+  background-position: 0 -80px;
+}
+.ui-icon-arrow-4-diag {
+  background-position: -16px -80px;
+}
+.ui-icon-extlink {
+  background-position: -32px -80px;
+}
+.ui-icon-newwin {
+  background-position: -48px -80px;
+}
+.ui-icon-refresh {
+  background-position: -64px -80px;
+}
+.ui-icon-shuffle {
+  background-position: -80px -80px;
+}
+.ui-icon-transfer-e-w {
+  background-position: -96px -80px;
+}
+.ui-icon-transferthick-e-w {
+  background-position: -112px -80px;
+}
+.ui-icon-folder-collapsed {
+  background-position: 0 -96px;
+}
+.ui-icon-folder-open {
+  background-position: -16px -96px;
+}
+.ui-icon-document {
+  background-position: -32px -96px;
+}
+.ui-icon-document-b {
+  background-position: -48px -96px;
+}
+.ui-icon-note {
+  background-position: -64px -96px;
+}
+.ui-icon-mail-closed {
+  background-position: -80px -96px;
+}
+.ui-icon-mail-open {
+  background-position: -96px -96px;
+}
+.ui-icon-suitcase {
+  background-position: -112px -96px;
+}
+.ui-icon-comment {
+  background-position: -128px -96px;
+}
+.ui-icon-person {
+  background-position: -144px -96px;
+}
+.ui-icon-print {
+  background-position: -160px -96px;
+}
+.ui-icon-trash {
+  background-position: -176px -96px;
+}
+.ui-icon-locked {
+  background-position: -192px -96px;
+}
+.ui-icon-unlocked {
+  background-position: -208px -96px;
+}
+.ui-icon-bookmark {
+  background-position: -224px -96px;
+}
+.ui-icon-tag {
+  background-position: -240px -96px;
+}
+.ui-icon-home {
+  background-position: 0 -112px;
+}
+.ui-icon-flag {
+  background-position: -16px -112px;
+}
+.ui-icon-calendar {
+  background-position: -32px -112px;
+}
+.ui-icon-cart {
+  background-position: -48px -112px;
+}
+.ui-icon-pencil {
+  background-position: -64px -112px;
+}
+.ui-icon-clock {
+  background-position: -80px -112px;
+}
+.ui-icon-disk {
+  background-position: -96px -112px;
+}
+.ui-icon-calculator {
+  background-position: -112px -112px;
+}
+.ui-icon-zoomin {
+  background-position: -128px -112px;
+}
+.ui-icon-zoomout {
+  background-position: -144px -112px;
+}
+.ui-icon-search {
+  background-position: -160px -112px;
+}
+.ui-icon-wrench {
+  background-position: -176px -112px;
+}
+.ui-icon-gear {
+  background-position: -192px -112px;
+}
+.ui-icon-heart {
+  background-position: -208px -112px;
+}
+.ui-icon-star {
+  background-position: -224px -112px;
+}
+.ui-icon-link {
+  background-position: -240px -112px;
+}
+.ui-icon-cancel {
+  background-position: 0 -128px;
+}
+.ui-icon-plus {
+  background-position: -16px -128px;
+}
+.ui-icon-plusthick {
+  background-position: -32px -128px;
+}
+.ui-icon-minus {
+  background-position: -48px -128px;
+}
+.ui-icon-minusthick {
+  background-position: -64px -128px;
+}
+.ui-icon-close {
+  background-position: -80px -128px;
+}
+.ui-icon-closethick {
+  background-position: -96px -128px;
+}
+.ui-icon-key {
+  background-position: -112px -128px;
+}
+.ui-icon-lightbulb {
+  background-position: -128px -128px;
+}
+.ui-icon-scissors {
+  background-position: -144px -128px;
+}
+.ui-icon-clipboard {
+  background-position: -160px -128px;
+}
+.ui-icon-copy {
+  background-position: -176px -128px;
+}
+.ui-icon-contact {
+  background-position: -192px -128px;
+}
+.ui-icon-image {
+  background-position: -208px -128px;
+}
+.ui-icon-video {
+  background-position: -224px -128px;
+}
+.ui-icon-script {
+  background-position: -240px -128px;
+}
+.ui-icon-alert {
+  background-position: 0 -144px;
+}
+.ui-icon-info {
+  background-position: -16px -144px;
+}
+.ui-icon-notice {
+  background-position: -32px -144px;
+}
+.ui-icon-help {
+  background-position: -48px -144px;
+}
+.ui-icon-check {
+  background-position: -64px -144px;
+}
+.ui-icon-bullet {
+  background-position: -80px -144px;
+}
+.ui-icon-radio-on {
+  background-position: -96px -144px;
+}
+.ui-icon-radio-off {
+  background-position: -112px -144px;
+}
+.ui-icon-pin-w {
+  background-position: -128px -144px;
+}
+.ui-icon-pin-s {
+  background-position: -144px -144px;
+}
+.ui-icon-play {
+  background-position: 0 -160px;
+}
+.ui-icon-pause {
+  background-position: -16px -160px;
+}
+.ui-icon-seek-next {
+  background-position: -32px -160px;
+}
+.ui-icon-seek-prev {
+  background-position: -48px -160px;
+}
+.ui-icon-seek-end {
+  background-position: -64px -160px;
+}
+.ui-icon-seek-start {
+  background-position: -80px -160px;
+}
+.ui-icon-seek-first {
+  background-position: -80px -160px;
+}
+.ui-icon-stop {
+  background-position: -96px -160px;
+}
+.ui-icon-eject {
+  background-position: -112px -160px;
+}
+.ui-icon-volume-off {
+  background-position: -128px -160px;
+}
+.ui-icon-volume-on {
+  background-position: -144px -160px;
+}
+.ui-icon-power {
+  background-position: 0 -176px;
+}
+.ui-icon-signal-diag {
+  background-position: -16px -176px;
+}
+.ui-icon-signal {
+  background-position: -32px -176px;
+}
+.ui-icon-battery-0 {
+  background-position: -48px -176px;
+}
+.ui-icon-battery-1 {
+  background-position: -64px -176px;
+}
+.ui-icon-battery-2 {
+  background-position: -80px -176px;
+}
+.ui-icon-battery-3 {
+  background-position: -96px -176px;
+}
+.ui-icon-circle-plus {
+  background-position: 0 -192px;
+}
+.ui-icon-circle-minus {
+  background-position: -16px -192px;
+}
+.ui-icon-circle-close {
+  background-position: -32px -192px;
+}
+.ui-icon-circle-triangle-e {
+  background-position: -48px -192px;
+}
+.ui-icon-circle-triangle-s {
+  background-position: -64px -192px;
+}
+.ui-icon-circle-triangle-w {
+  background-position: -80px -192px;
+}
+.ui-icon-circle-triangle-n {
+  background-position: -96px -192px;
+}
+.ui-icon-circle-arrow-e {
+  background-position: -112px -192px;
+}
+.ui-icon-circle-arrow-s {
+  background-position: -128px -192px;
+}
+.ui-icon-circle-arrow-w {
+  background-position: -144px -192px;
+}
+.ui-icon-circle-arrow-n {
+  background-position: -160px -192px;
+}
+.ui-icon-circle-zoomin {
+  background-position: -176px -192px;
+}
+.ui-icon-circle-zoomout {
+  background-position: -192px -192px;
+}
+.ui-icon-circle-check {
+  background-position: -208px -192px;
+}
+.ui-icon-circlesmall-plus {
+  background-position: 0 -208px;
+}
+.ui-icon-circlesmall-minus {
+  background-position: -16px -208px;
+}
+.ui-icon-circlesmall-close {
+  background-position: -32px -208px;
+}
+.ui-icon-squaresmall-plus {
+  background-position: -48px -208px;
+}
+.ui-icon-squaresmall-minus {
+  background-position: -64px -208px;
+}
+.ui-icon-squaresmall-close {
+  background-position: -80px -208px;
+}
+.ui-icon-grip-dotted-vertical {
+  background-position: 0 -224px;
+}
+.ui-icon-grip-dotted-horizontal {
+  background-position: -16px -224px;
+}
+.ui-icon-grip-solid-vertical {
+  background-position: -32px -224px;
+}
+.ui-icon-grip-solid-horizontal {
+  background-position: -48px -224px;
+}
+.ui-icon-gripsmall-diagonal-se {
+  background-position: -64px -224px;
+}
+.ui-icon-grip-diagonal-se {
+  background-position: -80px -224px;
+}
+.ui-widget-overlay {
+  background: #666666 ;
+  opacity: .5;
+  filter: alpha(opacity=50);
+}
+.ui-widget-shadow {
+  margin: -5px 0 0 -5px;
+  padding: 5px;
+  background: #000000 ;
+  opacity: .2;
+  filter: alpha(opacity=20);
+  border-radius: 0.6em;
+}
+.chart_picker,
+.part_picker {
+  display: inline-block;
+}
+.chart_picker:before,
+.part_picker:before {
+  display: inline-block;
+  vertical-align: middle;
+  height: 100%;
+}
+span.chart_picker,
+span.part_picker {
+  white-space: nowrap ;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+}
+span.chart_picker input,
+span.part_picker input {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+div.part_picker_part,
+div.chart_picker_chart {
+  padding: 5px;
+  margin: 5px;
+  border: 1px;
+  border-color: darkgray;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  background-color: white;
+  cursor: pointer;
+}
+div.part_picker_part:hover,
+div.chart_picker_chart:hover {
+  color: #000;
+  text-decoration: underline;
+}
+span.customer_vendor_picker {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+.customer-vendor-picker-undefined,
+.chartpicker-undefined,
+.projectpicker-undefined,
+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}
+/* ------------------------------------------------------------- */
+/* Jquery-Autocomplete (jquery.autocomplete.less)                */
+/* ------------------------------------------------------------- */
+.ac_results {
+  padding: 0px;
+  border: 1px solid black;
+  background-color: white;
+  overflow: hidden;
+  z-index: 99999;
+}
+.ac_results ul {
+  width: 100%;
+  list-style-position: outside;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+.ac_results li {
+  margin: 0px;
+  padding: 2px 5px;
+  cursor: default;
+  display: block;
+  font: menu;
+  font-size: 11pt;
+  /*hps: vorher 12px */
+
+  line-height: 16px;
+  overflow: hidden;
+}
+.ac_odd {
+  background-color: #eee;
+}
+.ac_over {
+  background-color: #0A246A;
+  color: white;
+}
+/* ------------------------------------------------------------- */
+/* JQUERY MULTISELECT2SIDE (jquery.multiselect2side.less)        */
+/* ------------------------------------------------------------- */
+.ms2side__div {
+  clear: left;
+  width: 100%;
+  padding: 1px;
+  float: left;
+  background: url('') repeat-x;
+}
+.ms2side__select {
+  float: left;
+}
+/* siehe H3 */
+.ms2side__header {
+  color: #666;
+  /* hps */
+
+  font-size: 9pt;
+  line-height: 1.0em;
+  padding: 0 0 0.3em 0;
+  display: block;
+}
+.ms2side__options,
+.ms2side__updown {
+  float: left;
+  font-size: 10pt;
+  margin: 0;
+  padding: 0 8px;
+  width: 40px;
+  color: black;
+  text-align: center;
+  overflow: hidden;
+}
+.ms2side__options {
+  padding-top: 1.0em !important;
+}
+.ms2side__updown {
+  font-size: 10pt;
+}
+.ms2side__options p,
+.ms2side__updown p {
+  margin: 2px 0;
+  padding: 0;
+  cursor: pointer;
+  border: 1px solid black;
+  width: auto !important;
+  /* hps */
+
+  background-color: #e6ccd9;
+  /* hps */
+
+  color: #220011;
+  /* hps */
+
+  border-color: 1px #800040 solid;
+  /* hps */
+
+  border-radius: 3px;
+  /* hps */
+
+}
+.ms2side__options p.ms2side_hover,
+.ms2side__updown p.ms2side_hover {
+  background-color: #3C3C3B;
+  /* hps */
+
+  border-color: #000000;
+  color: #ffffff ;
+  cursor: pointer;
+}
+.ms2side__options > p.ms2side__hide,
+.ms2side__updown > p.ms2side__hide {
+  cursor: default;
+  color: #9e9e9e;
+  border: 1px solid grey;
+  background-color: #D4D4D4 !important;
+}
+.ms2side__div select {
+  width: 12.0em;
+  /*hps:400px*/
+
+  float: left;
+}
+/* ------------------------------------------------------------- */
+/* JQUERY TOOLTIPSTER (jquery.tooltipster.less)                  */
+/* ------------------------------------------------------------- */
+/* This is the default Tooltipster theme */
+/* (feel free to modify or duplicate and create multiple themes!): */
+.tooltipster-default {
+  border-radius: 0.6em;
+  border: 2px solid #000;
+  background-color: #800040;
+  color: #fff;
+  max-width: 400px ;
+  /* Use this next selector to style things like font-size and line-height: */
+
+  /* These next classes handle the styles for the little arrow attached to the tooltip. */
+
+  /* By default, the arrow will inherit the same colors and border as what is set on the main tooltip itself. */
+
+}
+.tooltipster-default .tooltipster-content {
+  font-size: 10pt;
+  line-height: 16px;
+  padding: 1.2em 1.0em 1.2em 1.4em;
+  overflow: hidden;
+  background-color: #800040;
+}
+.tooltipster-default .tooltipster-arrow {
+  display: block;
+  text-align: center;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: -1;
+  /* This next selector defines the color of the border on the outside of the arrow. */
+
+  /* This will automatically match the color and size of the border set on the main tooltip styles. */
+
+  /* Set display: none; if you would like a border around the tooltip but no border around the arrow */
+
+}
+/* If you're using the icon option, use this next selector to style them */
+.tooltipster-icon {
+  cursor: help;
+  margin-left: 4px;
+}
+/* This is the base styling required to make all Tooltipsters work */
+.tooltipster-base {
+  padding: 0;
+  font-size: 0;
+  line-height: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 9999999;
+  pointer-events: none;
+  width: auto;
+  max-width: 400px ;
+  overflow: visible;
+}
+.tooltipster-base .tooltipster-content {
+  overflow: hidden;
+}
+.tooltipster-arrow span,
+.tooltipster-arrow-border {
+  display: block;
+  width: 0;
+  height: 0;
+  position: absolute;
+}
+.tooltipster-arrow-top span,
+.tooltipster-arrow-top-right span,
+.tooltipster-arrow-top-left span {
+  border-left: 8px solid transparent !important;
+  border-right: 8px solid transparent !important;
+  border-top: 8px solid;
+  bottom: -7px;
+}
+.tooltipster-arrow-top .tooltipster-arrow-border,
+.tooltipster-arrow-top-right .tooltipster-arrow-border,
+.tooltipster-arrow-top-left .tooltipster-arrow-border {
+  border-left: 9px solid transparent !important;
+  border-right: 9px solid transparent !important;
+  border-top: 9px solid;
+  bottom: -7px;
+}
+.tooltipster-arrow-bottom span,
+.tooltipster-arrow-bottom-right span,
+.tooltipster-arrow-bottom-left span {
+  border-left: 8px solid transparent !important;
+  border-right: 8px solid transparent !important;
+  border-bottom: 8px solid;
+  top: -7px;
+}
+.tooltipster-arrow-bottom .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-right .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-left .tooltipster-arrow-border {
+  border-left: 9px solid transparent !important;
+  border-right: 9px solid transparent !important;
+  border-bottom: 9px solid;
+  top: -7px;
+}
+.tooltipster-arrow-top span,
+.tooltipster-arrow-top .tooltipster-arrow-border,
+.tooltipster-arrow-bottom span,
+.tooltipster-arrow-bottom .tooltipster-arrow-border {
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+}
+.tooltipster-arrow-top-left span,
+.tooltipster-arrow-bottom-left span {
+  left: 6px;
+}
+.tooltipster-arrow-top-left .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-left .tooltipster-arrow-border {
+  left: 5px;
+}
+.tooltipster-arrow-top-right span,
+.tooltipster-arrow-bottom-right span {
+  right: 6px;
+}
+.tooltipster-arrow-top-right .tooltipster-arrow-border,
+.tooltipster-arrow-bottom-right .tooltipster-arrow-border {
+  right: 5px;
+}
+.tooltipster-arrow-left span,
+.tooltipster-arrow-left .tooltipster-arrow-border {
+  border-top: 8px solid transparent !important;
+  border-bottom: 8px solid transparent !important;
+  border-left: 8px solid;
+  top: 50%;
+  margin-top: -7px;
+  right: -7px;
+}
+.tooltipster-arrow-left .tooltipster-arrow-border {
+  border-top: 9px solid transparent !important;
+  border-bottom: 9px solid transparent !important;
+  border-left: 9px solid;
+  margin-top: -8px;
+}
+.tooltipster-arrow-right span,
+.tooltipster-arrow-right .tooltipster-arrow-border {
+  border-top: 8px solid transparent !important;
+  border-bottom: 8px solid transparent !important;
+  border-right: 8px solid;
+  top: 50%;
+  margin-top: -7px;
+  left: -7px;
+}
+.tooltipster-arrow-right .tooltipster-arrow-border {
+  border-top: 9px solid transparent !important;
+  border-bottom: 9px solid transparent !important;
+  border-right: 9px solid;
+  margin-top: -8px;
+}
+/* Some CSS magic for the awesome animations - feel free to make your own custom animations and reference it in your Tooltipster settings! */
+.tooltipster-fade {
+  opacity: 0;
+  -webkit-transition-property: opacity;
+  -moz-transition-property: opacity;
+  -o-transition-property: opacity;
+  -ms-transition-property: opacity;
+  transition-property: opacity;
+}
+.tooltipster-fade-show {
+  opacity: 1;
+}
+.tooltipster-grow {
+  -webkit-transform: scale(0, 0);
+  -moz-transform: scale(0, 0);
+  -o-transform: scale(0, 0);
+  -ms-transform: scale(0, 0);
+  transform: scale(0, 0);
+  -webkit-transition-property: -webkit-transform;
+  -moz-transition-property: -moz-transform;
+  -o-transition-property: -o-transform;
+  -ms-transition-property: -ms-transform;
+  transition-property: transform;
+  -webkit-backface-visibility: hidden;
+}
+.tooltipster-grow-show {
+  -webkit-transform: scale(1, 1);
+  -moz-transform: scale(1, 1);
+  -o-transform: scale(1, 1);
+  -ms-transform: scale(1, 1);
+  transform: scale(1, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+}
+.tooltipster-swing {
+  opacity: 0;
+  -webkit-transform: rotateZ(4deg);
+  -moz-transform: rotateZ(4deg);
+  -o-transform: rotateZ(4deg);
+  -ms-transform: rotateZ(4deg);
+  transform: rotateZ(4deg);
+  -webkit-transition-property: -webkit-transform, opacity;
+  -moz-transition-property: -moz-transform;
+  -o-transition-property: -o-transform;
+  -ms-transition-property: -ms-transform;
+  transition-property: transform;
+}
+.tooltipster-swing-show {
+  opacity: 1;
+  -webkit-transform: rotateZ(0deg);
+  -moz-transform: rotateZ(0deg);
+  -o-transform: rotateZ(0deg);
+  -ms-transform: rotateZ(0deg);
+  transform: rotateZ(0deg);
+  -webkit-transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 2.4);
+  -moz-transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 2.4);
+  -ms-transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 2.4);
+  -o-transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 2.4);
+  transition-timing-function: cubic-bezier(0.23, 0.635, 0.495, 2.4);
+}
+.tooltipster-fall {
+  top: 0;
+  -webkit-transition-property: top;
+  -moz-transition-property: top;
+  -o-transition-property: top;
+  -ms-transition-property: top;
+  transition-property: top;
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+}
+.tooltipster-fall.tooltipster-dying {
+  -webkit-transition-property: all;
+  -moz-transition-property: all;
+  -o-transition-property: all;
+  -ms-transition-property: all;
+  transition-property: all;
+  top: 0px !important;
+  opacity: 0;
+}
+.tooltipster-slide {
+  left: -40px;
+  -webkit-transition-property: left;
+  -moz-transition-property: left;
+  -o-transition-property: left;
+  -ms-transition-property: left;
+  transition-property: left;
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+  -webkit-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -moz-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -ms-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  -o-transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+  transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.15);
+}
+.tooltipster-slide.tooltipster-dying {
+  -webkit-transition-property: all;
+  -moz-transition-property: all;
+  -o-transition-property: all;
+  -ms-transition-property: all;
+  transition-property: all;
+  left: 0px !important;
+  opacity: 0;
+}
+/* CSS transition for when contenting is changing in a tooltip that is still open. */
+/* The only properties that will NOT transition are: width, height, top, and left */
+.tooltipster-content-changing {
+  opacity: 0.5;
+  -webkit-transform: scale(1.1, 1.1);
+  -moz-transform: scale(1.1, 1.1);
+  -o-transform: scale(1.1, 1.1);
+  -ms-transform: scale(1.1, 1.1);
+  transform: scale(1.1, 1.1);
+}
+.tooltipster-light {
+  border-radius: 0.6em;
+  border: 1px solid #e6ccd9;
+  background-color: #800040;
+  color: #f7eef2;
+}
+.tooltipster-light .tooltipster-content {
+  font-size: 9pt;
+  line-height: 16px;
+  background-color: #800040;
+  padding: 1.0em 1.4em;
+}
+/* ------------------------------------------------------------- */
+/* JQUERY CHART-PICKER (jquery.chartpicker.less)                 */
+/* ------------------------------------------------------------- */
+div.cpc_block,
+div.ppp_block {
+  overflow: hidden;
+  float: left;
+  width: 350px;
+}
+div.ppp_block span.ppp_block_number {
+  float: left;
+}
+div.ppp_block span.ppp_block_description {
+  float: right;
+  margin-left: 1em;
+  font-weight: bold;
+}
+div.cpc_block span.cpc_block_number {
+  float: left;
+}
+div.cpc_block span.cpc_block_description {
+  float: left;
+  margin-left: 1em;
+  font-weight: bold;
+}
+div.cpc_block span.cpc_block_balance {
+  float: right;
+}
+div.cpc_block span.cpc_line_balance {
+  display: none;
+}
+div.ppp_line span.ppp_block_description {
+  margin-left: 1em;
+  font-weight: bold;
+}
+div.cpc_line span.cpc_block_description {
+  margin-left: 1em;
+  font-weight: bold;
+}
+div.cpc_line span.cpc_block_second_row {
+  display: none;
+}
+.customer-vendor-picker-undefined,
+.chartpicker-undefined,
+.projectpicker-undefined,
+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}
+span.cpc_popup_button,
+span.ppp_popup_button {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: -24px;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background: url("../image/search.svg") no-repeat center right;
+  background-size: contain;
+}
+/* ------------------------------------------------------------- */
+/* MAIN OVERRIDES (main_overrides.less)                          */
+/* ------------------------------------------------------------- */
+.wrapper > .buttons {
+  padding-left: 0 !important;
+}
+.wrapper .select-item,
+.wrapper .form-addition,
+.wrapper .input-panel {
+  margin-left: 0 !important;
+}
+.wrapper > .col {
+  margin-right: 1.6em ;
+}
+.wrapper > .col > .tbl-horizontal {
+  margin-right: 0 !important ;
+}
+.wrapper .tbl-list caption {
+  padding-left: 0 ;
+}
+#content .ui-tabs-panel div.wrapper:first-child {
+  margin-top: 3.0em ;
+}
+.ui-tabs-panel > div.select-item {
+  margin: 1.8em 2em 0.8em 1.2em !important;
+}
+.ui-tabs-panel > div.form-addition {
+  margin-left: 0 !important ;
+}
+.ui-dialog-content {
+  background: #ffffff;
+}
+.ui-widget-content {
+  background: transparent;
+}
+.ui-dialog-content .select-item,
+.ui-widget-content .select-item {
+  margin: 1em 1em 1.0em 0;
+}
+.ui-dialog-content .buttons,
+.ui-widget-content .buttons {
+  padding: 1.0em 1.0em 1.0em 0;
+}
+/* ------------------------------------------------------------- */
+/* JQUERY-UI OVERRIDES (jquery-ui_overrides.less)                */
+/* ------------------------------------------------------------- */
+.tabwidget {
+  width: 100%;
+  overflow: hidden;
+  position: relative;
+  zoom: 1;
+  padding: 0 !important;
+  border: 0;
+  color: #220011;
+  background: transparent;
+}
+.tabwidget > ul {
+  display: block;
+  list-style: none;
+  outline: 0;
+  padding: 0.2em 0.2em 0 0;
+  margin: 0;
+  font-size: 11pt;
+  font-weight: bold;
+  line-height: 1.3;
+  text-decoration: none;
+}
+.tabwidget > ul li {
+  position: relative;
+  top: 1px;
+  float: left;
+  list-style: none;
+  margin: 1px 0.2em 0 0;
+  padding: 0;
+  white-space: nowrap;
+  border-bottom: 0 !important;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  border: 1px solid #cccccc;
+  background-color: #ffffff;
+  color: #220011;
+  font-size: 9pt;
+  font-weight: bold;
+}
+.tabwidget > ul li.ui-tabs-selected {
+  margin-bottom: 0;
+  padding-bottom: 1px;
+}
+.tabwidget > ul li.ui-tabs-selected a {
+  cursor: pointer;
+}
+.tabwidget > ul li a {
+  float: left;
+  padding: 0.2em 0.7em;
+  text-decoration: none;
+  cursor: pointer;
+}
+.tabwidget > ul li.ui-state-default {
+  margin: 0 0 0 0.6em;
+  background: #ffffff;
+  color: #220011;
+  border: 1px #800040 solid;
+  font-weight: normal;
+}
+.tabwidget > ul li.ui-state-default a,
+.tabwidget > ul li.ui-state-default a:link {
+  color: #220011;
+}
+.tabwidget > ul li.ui-state-hover {
+  color: #220011;
+  background-color: #e6ccd9;
+}
+.tabwidget > ul li.ui-state-active {
+  color: #220011;
+  background-color: #f1e4eb;
+}
+.tabwidget > ul li.ui-state-active a,
+.tabwidget > ul li.ui-state-active a:link,
+.tabwidget > ul li.ui-state-active a:visited {
+  color: #220011;
+  outline: 0 ;
+}
+.tabwidget > ul li.ui-state-active.ui-state-hover {
+  color: #220011;
+}
+.tabwidget > ul li.ui-state-disabled a {
+  cursor: text;
+  outline: 0 ;
+}
+.tabwidget > ul li.ui-state-processing a {
+  cursor: text;
+}
+.tabwidget > ul li.ui-state-loading a {
+  outline: 0 ;
+}
+.tabwidget > ul.ui-tabs-nav {
+  position: fixed;
+  top: 100px;
+  width: 100%;
+  z-index: 1029;
+  margin: 0 0.4em 0.6em 0;
+  padding: 0.4em 0.2em 0 0.7em;
+  background-color: #ffffff;
+  border-bottom: 1px #800040 solid !important;
+}
+.tabwidget > ul.ui-tabs-nav li {
+  margin: 1px 0.2em 0 0;
+}
+.tabwidget > ul.ui-tabs-nav li a {
+  padding: 0.2em 0.7em;
+}
+.tabwidget > ul.ui-tabs-nav li.ui-tabs-active {
+  border-bottom: 1px #f1e4eb solid !important;
+  margin-bottom: -1px;
+  padding-bottom: 0;
+}
+.tabwidget.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a {
+  cursor: pointer;
+}
+.tabwidget > div {
+  display: none;
+  padding-top: 1.8em !important;
+  border-bottom: none;
+  width: 100%;
+  height: 100%;
+  min-height: 400px;
+  overflow: hidden ;
+}
+.tabwidget > div.ui-tabs-panel {
+  width: 100%;
+  overflow: hidden;
+  display: block;
+}
+.tabwidget > div.ui-tabs-panel > .tabwidget {
+  position: relative ;
+}
+.tabwidget > div.ui-tabs-panel > .tabwidget > .ui-tabs-nav {
+  position: relative ;
+  top: auto;
+  background-color: transparent;
+}
+.tabwidget > div.ui-tabs-panel > .tabwidget > .ui-tabs-panel {
+  background-color: #ffffff;
+  background-color: transparent ;
+  position: relative ;
+  top: auto;
+  padding-top: 0 !important ;
+}
+.tabwidget > div.ui-tabs-panel.ui-widget-content {
+  border: 0 ;
+}
+.ui-autocomplete {
+  z-index: 9000 ;
+}
+.ui-autocomplete li a {
+  display: block ;
+  font-size: 80% ;
+  padding-top: 0.4em !important;
+  padding-bottom: 0.4em !important;
+}
+.ui-autocomplete li a:hover {
+  background-color: #C9C9C9;
+  border: none ;
+  color: #000 ;
+}
+/*  
+.ui-datepicker-calendar  {
+  .ui-state-highlight{
+    color: #ffffff ;
+    background-color: @gray-standard;
+    border: 1px @gray-standard solid  
+  }
+  // Days
+  td a {
+    &.ui-state-default {
+      color: @brand-dark;
+    }
+    &.ui-state-hover {
+      color: #ffffff ;
+      background-color: #000000;
+      border: #000000 ;
+    }
+    &.ui-state-active {
+      border: 1px solid @brand-dark;
+      background-color: @brand-dark;
+      color: @brand-verylight;
+    }
+
+  }
+
+} // /.ui-datepicker-calendar  
+*/
+.cke_editable {
+  background-color: white;
+  padding: 6px;
+  border-top: 1px #999 solid;
+  border-right: 1px #ddd solid;
+  border-left: 1px #ddd solid;
+  overflow: auto ;
+  font-size: 11pt ;
+  min-width: 220px;
+  min-height: 4.0em ;
+}
+.cke_editable:focus {
+  outline: none ;
+  background-color: #d5aabf;
+  border: 1px 1px #110009 solid solid;
+}
+.cke_editable p {
+  font-size: 10pt !important;
+  padding: 0  ;
+  margin: 0 0 0.4em 0 ;
+  font-weight: normal;
+}
+div.cke_editable.wi-small-wide {
+  margin-right: 24px !important ;
+}
+body > .ui-dialog > .ui-dialog-content > p > .cke_editable {
+  border: 1px #dcdcdc solid !important;
+  padding: 0.4em;
+  margin: 0;
+  font-size: 100%;
+  width: 100% !important;
+}
+a.no-underlined-links,
+a.no-underlined-links:visited,
+a.no-underlined-links:hover {
+  text-decoration: none !important;
+  background-color: transparent !important;
+  border: none;
+}
+a.no-underlined-links:hover {
+  background: none;
+}
+body + #menuv3 {
+  top: 0 important;
+}
+body div.admin {
+  padding: 60px 0 0 0 ;
+  background-image: linear-gradient(to bottom, #f7eef2, #d5aabf);
+}
+body div.admin h1 {
+  background-color: #fe5f14 !important;
+  color: #ffffff;
+  top: 30px ;
+  position: fixed;
+  width: 100% ;
+  padding: 0.6em 0.5em 0.5em 0.6em;
+  z-index: 1000;
+}
+body div.admin h1 + .wrapper {
+  padding-top: 1.2em;
+}
+body div.admin .logo {
+  width: auto;
+  clear: both;
+  margin: 3.0em auto 1.0em auto;
+  padding: 2.0em 0 0 0;
+}
+body div.admin .separate-form {
+  background-color: #ddd ;
+  border: 1px #888888 solid;
+  border-radius: 0.6em;
+  display: block ;
+  width: 24.0em;
+  margin: 0 auto ;
+  padding: 0.7em 0.6em 1.0em 0.6em ;
+}
+body div.admin .tabwidget {
+  padding: 2.4em 0 0 0 !important;
+}
+body div.admin .tabwidget .ui-tabs-nav {
+  top: 66px;
+}
+body div.admin .tabwidget .ui-tabs-panel {
+  padding: 2.0em 1.0em 1.0em 1.0em ;
+  overflow: hidden;
+  height: auto;
+  min-height: 300px ;
+}
+body div.admin > form {
+  display: block ;
+  margin-top: 1px ;
+  padding-top: 1.2em ;
+}
+/* ------------------------------------------------------------- */
+/* RESPONSIVE (responsive.less)                          */
+/* ------------------------------------------------------------- */
+@media screen and (max-device-width: 479px) {
+  
+}
+@media screen and (min-device-width: 480px) and (max-device-width: 767px) {
+  body #content .tbl-horizontal th {
+    width: 208px;
+    background-color: #D6EEBF;
+  }
+  body #content .tbl-horizontal th .colgroup col {
+    width: 256px;
+  }
+  body #content .tbl-horizontal th.wi-smallest {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-verysmall {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-small {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-mediumsmall {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-normal {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-lightwide {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-wide {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-wider {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-verywide {
+    width: 208px;
+  }
+}
+@media screen and (max-device-width: 1024px) {
+  body #content .tbl-horizontal th {
+    width: 256px;
+  }
+  body #content .tbl-horizontal th.wi-smallest {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-verysmall {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-small {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-mediumsmall {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-normal {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-lightwide {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-wide {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-wider {
+    width: 208px;
+  }
+  body #content .tbl-horizontal th.wi-verywide {
+    width: 208px;
+  }
+}
+@media screen and (min-device-width: 768px) and (max-device-width: 1023px) {
+  .tbl-horizontal th {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-smallest {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-verysmall {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-small {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-mediumsmall {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-normal {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-lightwide {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-wide {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-wider {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-verywide {
+    width: 208px;
+  }
+}
+@media screen and (max-device-width: 1024px) {
+  .tbl-horizontal th {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-smallest {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-verysmall {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-small {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-mediumsmall {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-normal {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-lightwide {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-wide {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-wider {
+    width: 208px;
+  }
+  .tbl-horizontal th.wi-verywide {
+    width: 208px;
+  }
+}
+@media screen and (min-device-width: 1110px) {
+  
+}
+/* ------------------------------------------------------------- */
+/* PRINT (print.less)                                            */
+/* ------------------------------------------------------------- */
+@media print {
+  body {
+    margin-left: 1.4em ;
+  }
+  #menuv3,
+  #html-menu,
+  #frame-header,
+  #main_menu_div,
+  #js-header,
+  body > #layout-split-left,
+  #tree-column,
+  ul.ui-tabs-nav,
+  div.layout-actionbar,
+  .control-panel {
+    display: none;
+  }
+  body > #layout-split-right {
+    margin-left: 0;
+  }
+  #content {
+    padding: 1.0em 0 0 0 !important ;
+    margin: 0 ;
+  }
+  #content td,
+  #content p,
+  #content div,
+  #content span,
+  #content input,
+  #content textarea,
+  #content select,
+  #content option {
+    font-size: 7pt !important;
+  }
+  #content > h1 {
+    color: #222222;
+    padding: 0 0 0 0 ;
+    top: 0 ;
+    position: absolute ;
+  }
+  #content wrapper {
+    margin: 0.4em 1em 1em 1.2em;
+    padding: 0 0 0.4em 0;
+  }
+  #content caption,
+  #content th.caption,
+  #content td.caption {
+    font-size: 9pt;
+    font-weight: bold;
+    padding: 0.1em 0 0.1em 0.2em;
+    margin: 0.1em 0 0.1em 0 ;
+  }
+  #content .tbl-horizontal tbody tr td,
+  #content .tbl-horizontal tbody tr th {
+    border-color: #33001a;
+    border-width: 0.3pt !important;
+    border-style: solid ;
+    padding: 0.3em 0.6em ;
+  }
+  #content .tbl-horizontal tbody tr th,
+  #content .tbl-horizontal tbody tr span.label {
+    font-size: 6pt !important;
+  }
+  #content .tbl-list {
+    margin-top: 1.2em ;
+    width: 98% !important ;
+  }
+  #content .tbl-list thead {
+    display: table-header-group;
+    overflow: hidden ;
+  }
+  #content .tbl-list thead tr th {
+    font-size: 70% ;
+  }
+  #content .tbl-list tbody tr {
+    border-bottom: 1px #000 solid !important;
+  }
+  #content .tbl-list tbody tr:nth-child(odd) {
+    background-color: none;
+  }
+  #content .tbl-list tbody tr:nth-child(even) {
+    background-color: none;
+  }
+  #content .tbl-list tbody tr td {
+    border-bottom: 1px #000 solid !important;
+    vertical-align: top !important ;
+  }
+  #content col.wi-smallest {
+    width: 25px !important;
+  }
+  #content col.wi-verysmall {
+    width: 48px !important;
+  }
+  #content col.wi-small {
+    width: 77px !important;
+  }
+  #content col.wi-mediumsmall {
+    width: 96px !important;
+  }
+  #content col.wi-normal {
+    width: 125px !important;
+  }
+  #content col.wi-lightwide {
+    width: 154px !important;
+  }
+  #content col.wi-wide {
+    width: 192px !important;
+  }
+  #content col.wi-wider {
+    width: 230px !important;
+  }
+  #content col.wi-verywide {
+    width: 346px !important;
+  }
+  #content input[type="text"],
+  #content input[type="customer"],
+  #content input.numeric,
+  #content textarea,
+  #content select,
+  #content span.data,
+  #content select,
+  #content textarea {
+    width: auto !important;
+    appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    border: none;
+    color: #000 !important ;
+    background-color: none !important;
+    background: none !important;
+    /* rest needed for Firefox: */
+  
+    overflow: hidden;
+  }
+  #content textarea {
+    height: auto !important ;
+    min-height: 3.6em ;
+    overflow-y: auto !important;
+    min-width: 16em ;
+    width: 100% !important;
+    padding: 0 ;
+    resize: vertical;
+  }
+  #content table.tbl-list td textarea {
+    min-height: 4.2em !important;
+  }
+  #content table.tbl-list td input {
+    padding-left: 0 !important;
+  }
+  #content span.data {
+    width: auto;
+    border: none ;
+  }
+  #content input.wi-date {
+    align: left !important;
+    padding: 0 !important;
+  }
+  #content select {
+    padding: 0 0 0.4em 0.2em !important;
+  }
+  #content div.cke_editable {
+    min-height: 1.8em  !important;
+    height: auto !important;
+    border: none;
+    overflow: hidden !important;
+  }
+  #content a.button-image,
+  #content a.button,
+  #content input[type="button"],
+  #content input.neutral,
+  #content td img {
+    display: none ;
+  }
+  #content input.wi-smallest,
+  #content select.wi-smallest {
+    width: 25px !important;
+  }
+  #content input.wi-verysmall,
+  #content select.wi-verysmall {
+    width: 48px !important;
+  }
+  #content input.wi-small,
+  #content select.wi-small {
+    width: 55px !important;
+  }
+  #content input.wi-mediumsmall,
+  #content select.wi-mediumsmall {
+    width: 74px !important;
+  }
+  #content input.wi-normal,
+  #content select.wi-normal {
+    width: 103px !important;
+  }
+  #content input.wi-lightwide,
+  #content select.wi-lightwide {
+    width: 132px !important;
+  }
+  #content input.wi-wide,
+  #content select.wi-wide {
+    width: 170px !important;
+  }
+  #content input.wi-wider,
+  #content select.wi-wider {
+    width: 209px !important;
+  }
+  #content input.wi-verywide,
+  #content select.wi-verywide {
+    width: 324px !important;
+  }
+}
+/* ------------------------------------------------------------- */
+/* CUSTOM LESS STUFF (custom.less)                               */
+/* ------------------------------------------------------------- */
+/* ------------------------------------------------------------- */
+/* DEVELOPING (developing.less)                                  */
+/* ------------------------------------------------------------- */
+body.developing > header {
+  background-color: #33001a;
+  display: block;
+  overflow: hidden;
+}
+body.developing > header h1 {
+  float: left;
+  color: #e6ccd9;
+  padding: 1.0em;
+}
+body.developing > header nav {
+  float: right;
+  padding: 1.0em;
+}
+body.developing > header nav a:link,
+body.developing > header nav a:visited {
+  color: white ;
+}
+body.developing .wrapper p,
+body.developing .wrapper ul,
+body.developing .wrapper ol,
+body.developing .wrapper li,
+body.developing .wrapper h2,
+body.developing .wrapper h3,
+body.developing .wrapper h4 {
+  clear: both;
+  width: 60.0em;
+  max-width: 60em;
+}
+body.developing > p,
+body.developing > h2,
+body.developing > h3,
+body.developing > h4 {
+  margin-left: 0.8em ;
+}
+body.developing h2,
+body.developing h3,
+body.developing h4 {
+  font-weight: bold ;
+  color: #000 !important;
+  clear: left;
+  padding-left: 0 !important;
+}
+body.developing h2 {
+  font-size: 130%;
+}
+body.developing h3 {
+  font-size: 120%;
+}
+body.developing h4 {
+  font-size: 110%;
+}
+body.developing pre {
+  margin: 0 0 1.0em 0 ;
+  padding: 0.6em ;
+  border: 1px #000 solid ;
+  background-color: #ddd ;
+  display: inline-block;
+  clear: both;
+}
+body.developing pre code {
+  padding: 0 ;
+}
+body.developing div.code-highlighted {
+  margin: 0 0 1.0em 0 ;
+  padding: 0.6em ;
+  border: 1px #000 solid ;
+  background-color: #ddd ;
+  display: inline-block;
+}
+body.developing p.picture {
+  background-color: #fff;
+  padding: 0.8em;
+  border: 1px #888888 solid;
+  display: inline-block;
+  width: auto;
+}
+body.developing .wrapper .tbl-horizontal {
+  border: 1px black solid !important;
+  border-collapse: collapse;
+}
+body.developing .wrapper .tbl-horizontal tbody {
+  border-top: none;
+}
+body.developing .wrapper .tbl-horizontal caption,
+body.developing .wrapper .tbl-horizontal th {
+  padding-left: 0.6em ;
+}
+body.developing .wrapper .tbl-horizontal th.caption {
+  border-top: none;
+  border-bottom: none;
+}
+body.developing .wrapper .tbl-horizontal.test th,
+body.developing .wrapper .tbl-horizontal.test-plain th {
+  padding-left: 0.3em;
+}
+body.developing .wrapper .tbl-horizontal.test td,
+body.developing .wrapper .tbl-horizontal.test-plain td {
+  display: block;
+  overflow: visible;
+  border-bottom: 1px #666666 solid;
+}
+body.developing .wrapper .tbl-horizontal.test tr:last-child td,
+body.developing .wrapper .tbl-horizontal.test-plain tr:last-child td {
+  border: none ;
+}
+body.developing .wrapper.clear .tbl-horizontal {
+  clear: both ;
+}
+body.developing .wrapper table.tbl-list > thead > tr th:first-child,
+body.developing .wrapper table.tbl-list > tbody > tr td:first-child {
+  padding-left: 0 !important;
+}
+body.developing .wrapper div.test-box {
+  font-size: 80% ;
+  overflow: visible;
+  padding: 0.3em 0.5em ;
+  background-color: #9D9E9D;
+  float: left;
+  border: 1px #000 dotted ;
+}
+body.developing input[type="submit"],
+body.developing input[type="button"],
+body.developing input[type="button"].button,
+body.developing button[type="submit"],
+body.developing button[type="button"],
+body.developing a.button {
+  color: #f7eef2;
+  background-color: #33001a;
+  border: 1px #220011 solid;
+}
+body.developing input[type="submit"].hover,
+body.developing input[type="button"].hover,
+body.developing input[type="button"].button.hover,
+body.developing button[type="submit"].hover,
+body.developing button[type="button"].hover,
+body.developing a.button.hover {
+  color: #e6ccd9;
+  background-color: #220011;
+  border: 1px #000000 solid;
+}
+body.developing input[type="submit"].active,
+body.developing input[type="button"].active,
+body.developing input[type="button"].button.active,
+body.developing button[type="submit"].active,
+body.developing button[type="button"].active,
+body.developing a.button.active {
+  color: #e6ccd9;
+  background-color: #000000;
+  border: 1px #000000 solid;
+}
+body.developing input[type="button"].neutral,
+body.developing input[type="submit"].neutral,
+body.developing input[type="reset"],
+body.developing input[type="reset"].neutral,
+body.developing button.neutral,
+body.developing button[type="reset"] {
+  color: #220011;
+  background-color: #e6ccd9;
+  border: 1px #800040 solid;
+}
+body.developing input[type="button"].neutral.neutral-hover,
+body.developing input[type="submit"].neutral.neutral-hover,
+body.developing input[type="reset"].neutral-hover,
+body.developing input[type="reset"].neutral.neutral-hover,
+body.developing button.neutral.neutral-hover,
+body.developing button[type="reset"].neutral-hover {
+  color: #220011;
+  background-color: #f7eef2;
+  border: 1px #800040 solid;
+}
+body.developing input[type="button"].neutral.neutral-active,
+body.developing input[type="submit"].neutral.neutral-active,
+body.developing input[type="reset"].neutral-active,
+body.developing input[type="reset"].neutral.neutral-active,
+body.developing button.neutral.neutral-active,
+body.developing button[type="reset"].neutral-active,
+body.developing input[type="button"].neutral.neutral-focus,
+body.developing input[type="submit"].neutral.neutral-focus,
+body.developing input[type="reset"].neutral-focus,
+body.developing input[type="reset"].neutral.neutral-focus,
+body.developing button.neutral.neutral-focus,
+body.developing button[type="reset"].neutral-focus {
+  color: #000000;
+  background-color: #800040;
+  border: 1px #110009 solid;
+}
+/* ------------------------------------------------------------- */
+/* ICONS 16 (icons16.less)                                    */
+/* ------------------------------------------------------------- */
+.icon16 {
+  background: url(../image/maps/icons16.png) 16px 0px no-repeat;
+  padding: 0;
+  width: 16px;
+  height: 16px;
+}
+.icon16.admin {
+  background-position: 0px 0px;
+}
+.icon16.ap {
+  background-position: -16px 0px;
+}
+.icon16.ap_aging {
+  background-position: -32px 0px;
+}
+.icon16.ap_report {
+  background-position: -48px 0px;
+}
+.icon16.ap_transaction_add {
+  background-position: -64px 0px;
+}
+.icon16.appointment {
+  background-position: -80px 0px;
+}
+.icon16.ar {
+  background-position: -96px 0px;
+}
+.icon16.ar_aging {
+  background-position: -112px 0px;
+}
+.icon16.ar_report {
+  background-position: -128px 0px;
+}
+.icon16.ar_transaction_add {
+  background-position: -144px 0px;
+}
+.icon16.assembly_add {
+  background-position: -160px 0px;
+}
+.icon16.assembly_produce {
+  background-position: -176px 0px;
+}
+.icon16.assembly_report {
+  background-position: -192px 0px;
+}
+.icon16.balance_sheet {
+  background-position: -208px 0px;
+}
+.icon16.cash {
+  background-position: -224px 0px;
+}
+.icon16.cash_report {
+  background-position: -240px 0px;
+}
+.icon16.chart_of_accounts {
+  background-position: -256px 0px;
+}
+.icon16.contact {
+  background-position: -272px 0px;
+}
+.icon16.credit_note_add {
+  background-position: -288px 0px;
+}
+.icon16.crm {
+  background-position: -304px 0px;
+}
+.icon16.customer {
+  background-position: -320px 0px;
+}
+.icon16.customer_add {
+  background-position: -336px 0px;
+}
+.icon16.customer_report {
+  background-position: -352px 0px;
+}
+.icon16.datev {
+  background-position: -368px 0px;
+}
+.icon16.delivery_order_add {
+  background-position: -384px 0px;
+}
+.icon16.delivery_order_report {
+  background-position: -400px 0px;
+}
+.icon16.document_template {
+  background-position: -416px 0px;
+}
+.icon16.dunning_add {
+  background-position: -432px 0px;
+}
+.icon16.dunnings_report {
+  background-position: -448px 0px;
+}
+.icon16.email {
+  background-position: -464px 0px;
+}
+.icon16.follow_up {
+  background-position: -480px 0px;
+}
+.icon16.gl {
+  background-position: -496px 0px;
+}
+.icon16.gl_report {
+  background-position: -512px 0px;
+}
+.icon16.help {
+  background-position: -528px 0px;
+}
+.icon16.income_statement {
+  background-position: -544px 0px;
+}
+.icon16.invoices_report {
+  background-position: -560px 0px;
+}
+.icon16.journal {
+  background-position: -576px 0px;
+}
+.icon16.knowledge {
+  background-position: -592px 0px;
+}
+.icon16.label {
+  background-position: -608px 0px;
+}
+.icon16.license_add {
+  background-position: -624px 0px;
+}
+.icon16.license_report {
+  background-position: -640px 0px;
+}
+.icon16.logout {
+  background-position: -656px 0px;
+}
+.icon16.master_data {
+  background-position: -672px 0px;
+}
+.icon16.master_data_report {
+  background-position: -688px 0px;
+}
+.icon16.mdi_text_editor {
+  background-position: -704px 0px;
+}
+.icon16.memo {
+  background-position: -720px 0px;
+}
+.icon16.message {
+  background-position: -736px 0px;
+}
+.icon16.opportunity {
+  background-position: -752px 0px;
+}
+.icon16.package_lists {
+  background-position: -768px 0px;
+}
+.icon16.part_add {
+  background-position: -784px 0px;
+}
+.icon16.part_report {
+  background-position: -800px 0px;
+}
+.icon16.payment {
+  background-position: -816px 0px;
+}
+.icon16.payment_report {
+  background-position: -832px 0px;
+}
+.icon16.phone {
+  background-position: -848px 0px;
+}
+.icon16.preferences {
+  background-position: -864px 0px;
+}
+.icon16.prices_update {
+  background-position: -880px 0px;
+}
+.icon16.printing {
+  background-position: -896px 0px;
+}
+.icon16.program {
+  background-position: -912px 0px;
+}
+.icon16.project_add {
+  background-position: -928px 0px;
+}
+.icon16.project_report {
+  background-position: -944px 0px;
+}
+.icon16.project_transaction_report {
+  background-position: -960px 0px;
+}
+.icon16.purchase_order_add {
+  background-position: -976px 0px;
+}
+.icon16.purchase_order_printing {
+  background-position: -992px 0px;
+}
+.icon16.purchase_order_report {
+  background-position: -1008px 0px;
+}
+.icon16.quotation_add {
+  background-position: -1024px 0px;
+}
+.icon16.quotation_printing {
+  background-position: -1040px 0px;
+}
+.icon16.receipt {
+  background-position: -1056px 0px;
+}
+.icon16.receipt_printing {
+  background-position: -1072px 0px;
+}
+.icon16.receipt_report {
+  background-position: -1088px 0px;
+}
+.icon16.reconcilliation {
+  background-position: -1104px 0px;
+}
+.icon16.report {
+  background-position: -1120px 0px;
+}
+.icon16.report_quotations {
+  background-position: -1136px 0px;
+}
+.icon16.report_sales_orders {
+  background-position: -1152px 0px;
+}
+.icon16.rfq_add {
+  background-position: -1168px 0px;
+}
+.icon16.rfq_printing {
+  background-position: -1184px 0px;
+}
+.icon16.rfq_report {
+  background-position: -1200px 0px;
+}
+.icon16.sales_invoice_add {
+  background-position: -1216px 0px;
+}
+.icon16.sales_invoice_printing {
+  background-position: -1232px 0px;
+}
+.icon16.sales_order_add {
+  background-position: -1248px 0px;
+}
+.icon16.sales_order_printing {
+  background-position: -1264px 0px;
+}
+.icon16.search {
+  background-position: -1280px 0px;
+}
+.icon16.service {
+  background-position: -1296px 0px;
+}
+.icon16.service_add {
+  background-position: -1312px 0px;
+}
+.icon16.service_report {
+  background-position: -1328px 0px;
+}
+.icon16.status {
+  background-position: -1344px 0px;
+}
+.icon16.system {
+  background-position: -1360px 0px;
+}
+.icon16.transaction_add {
+  background-position: -1376px 0px;
+}
+.icon16.user {
+  background-position: -1392px 0px;
+}
+.icon16.user_group {
+  background-position: -1408px 0px;
+}
+.icon16.ustva {
+  background-position: -1424px 0px;
+}
+.icon16.vendor {
+  background-position: -1440px 0px;
+}
+.icon16.vendor_add {
+  background-position: -1456px 0px;
+}
+.icon16.vendor_report {
+  background-position: -1472px 0px;
+}
+.icon16.version {
+  background-position: -1488px 0px;
+}
+.icon16.warehouse {
+  background-position: -1504px 0px;
+}
+.icon16.window_new {
+  background-position: -1520px 0px;
+}
diff --git a/css/design40/to_do_2019.md b/css/design40/to_do_2019.md
new file mode 100644
index 000000000..282b7f8b9
--- /dev/null
+++ b/css/design40/to_do_2019.md
@@ -0,0 +1,48 @@
+# Kivitendo 4-Design-Pendenzen
+
+## /templates/webpages/
+
+ - **customer_vendor.picker:** für das Auswahlfeld zum Kunden oder Lieferanten wurde in der Funktion "P.customer_vendor.picker" fälschlicherweise im INPUT-Tag das Attribut TYPE für die Zuordnung zu customer/vendor verwendet. <br>Das ist falsch und unerlaubt, wurde aber von Bernd Blessmann an der Froscom 2018 korrigiert. <br>Diese Korrektur wird in der Version 3.5.3 spürbar sein. Aus diesem Grunde müssen sämtliche diesbezügliche Funktionsaufrufe überprüft und angepasst werden. Das Attribut TYPE muss in jedem dieser Tags den reservierten Wert "text" enthalten.
+ - **Attribut TYPE im INPUT-Tag:** sämtliche INPUT-Elemente müssen das Attribut TYPE aufweisen. Nur so können die Stylesheets die Formular-Elemente dynamisch formatieren.
+ - **Wrapper (.wrapper) in allen Layouts einbauen:** Der Wrapper weist eine Polsterung zum Rand des #Content auf, was deutlich schöner aussieht. Dort, wo die Formularelemente mit den Rändern kollidieren, fehlt dieser Wrapper. Der Wrapper kann mehrmals pro Seite hintereinander eingesetzt werden.<br>Für Tabellen, die sich über die ganze Breite erstrecken (width:100%) ist dieser aber nicht erforderlich.
+ - **Auswahl Zeiträume:** Beispiel /rp.pl?report=erfolgsrechnung&action=report<br>Diese Auswahl-Elemente für Berichte sind mindestens sieben Mal oder mehr in den Kivitendo-Templates vorhanden, und sind also Redundanzen. Diese Elemente sollten im /templates/webpages/common/ oder anderswo einmalig gespeichert sein, verfügbar via INCLUDE. Mit dem Bonner Kivitendo-Team absprechen und genau anschauen, denn es könnte in einem Fall leichte Abweichungen geben. Zudem sollten LABEL für die Auswahl der Options-/Checkboxen via Klick auf den Text eingesetzt werden.
+ - **/templates/webpages/amcvar/search_include.html:** DIVs um Label & Checkbox (Table-Elemente werden automatisch entfernt)
+ - **/templates/webpages/mass_invoice_create_print_from_do/_filter.html:** Ueberpruefen, ob Formular richtig kommen.
+ - **templates/webpages/generic/print_options.html:** body-Tag anstelle von tbody-Tag
+ - **templates/webpages/do/form_footer.html:** set RO=' readonly' -> wohin verschwunden?
+ - **templates/webpages/acc_trans/_mini_ledger.html:** TR in TFOOT nicht vorh.
+ - **templates/webpages/part/_edit_translations.html:** Hunk 'SET language_id' mit fehlendem Komma
+ - **templates/webpages/part/_multi_items_result.html:** ausgabe ueberpruefen
+ - **templates/webpages/order/tabs/_row.html:** rowspan="100%" (falsch)
+ - **templates/webpages/order/tabs/_second_row.html:** [% var.config.description %] ist nicht mehr vorhanden
+ - **templates/webpages/shops/form.html:** Abschliessendes </tr> fehlt bei [% 'Shop type' | $T8 %]
+
+
+
+## Übersetzungen
+ - Alle neuen Textelemente müssen übersetzt werden.
+
+## Messages
+
+### Zwei verschiedene Arten von Styles
+Es gibt die alten, einfachen Messages, die in einem Paragrafen oder einem DIV untergebracht sind. Und dann gibt es noch die neueren Flash-Messages, die jeweils verborgen (display:none;) in praktisch jedem #content→form untergebracht sind. Hier wäre eine Vereinheitlichung anzustreben. Ist allerdings im LESS/CSS berücksichtigt.
+
+### Doppelte bzw. zweifache Message in Dialog-Buchung
+Beim Buchen erscheinen zwei Nachrichten; eine im alten Standard-Formular und eine im neuen .Flash_Message-Format.
+Eine zusammengefasst würde ja genügen, auch im vorgesehenen neuen Stil: https://rochen.revamp-it.ch:25443/design4/gl.pl?action=add
+
+
+
+## Features-Vorschläge
+
+### Dialog-Buchen
+Nach der Buchungsmaske Liste mit allen Buchungen des Benutzers am gleichen Tag.
+Somit hätte der Buchende die Möglichkeit, allfällige Fehler frühzeitig zu erkennen und zu korrigieren.
+https://rochen.revamp-it.ch:25443/design4/gl.pl?action=add
+
+
+## Control-Panels
+Alle Beschriftungen in Span.Label-Container einpassen. Ausrichtung oben mit entsprechender Anpassung für alle anderen Elementen. Dies ist vor allem noetig, weil Select-Elemente später u.U. vergrössert werden könnten (z.B. Anzeige aller Ansprechspersonen)
+
+
+
diff --git a/css/design40/webshop.css b/css/design40/webshop.css
new file mode 100644
index 000000000..08bb2b86a
--- /dev/null
+++ b/css/design40/webshop.css
@@ -0,0 +1,49 @@
+div.shop_table {
+  display: table;
+  background-color: #ebebeb;
+  /* padding: 15px;
+  margin: 15px; */
+}
+div.shop_table_address {
+  display: table;
+  /* padding: 15px; */
+  margin: 0px 0px 0px 15px;
+}
+div.shop_table-row {
+  display: table-row;
+}
+div.shop_table-cell {
+  display: table-cell;
+  padding: 20px,20px,20px,20px;
+}
+div.shop_table-cell_colspan {
+  flex: 2;
+  align: center;
+}
+div.shop_main{
+  width: 100%;
+  padding: 15px,15px,15px,15px;
+  margin: 15px,15px,15px,15px;
+}
+.shop_fleft {
+  width: 30%;
+  float: left;
+  border: thin solid red;
+}
+
+div.shop_table_info {
+  color: #b3b3b3;
+  width: 100%;
+  align: left;
+}
+
+.shop_transferable{
+  background:rgba(43, 208, 54, 1);
+}
+.shop_alert{
+  background:rgba(255, 0, 0, 1);
+}
+.shop_delivery{
+  background:rgba(100, 100, 100, 1);
+}
+
diff --git a/css/email_journal.css b/css/email_journal.css
index 5e5bf8f03..53aafcb12 100644
--- a/css/email_journal.css
+++ b/css/email_journal.css
@@ -11,3 +11,12 @@
 .email_journal_details tbody td {
   vertical-align: top;
 }
+
+input.record_button {
+  color: var(--color-dark);
+  background-color: var(--color-lighter);
+  width: 300px;
+  padding: 5px;
+  margin: 5px;
+  float: left;
+}
diff --git a/css/kivitendo/dhtmlsuite/menu-bar.css b/css/kivitendo/dhtmlsuite/menu-bar.css
index 9ae0fc3d6..2c970a33b 100644
--- a/css/kivitendo/dhtmlsuite/menu-bar.css
+++ b/css/kivitendo/dhtmlsuite/menu-bar.css
@@ -29,4 +29,5 @@
   background-color: #FFF;
   border: 1px solid #000;
   display: inline;
+  min-width: 75px;
 }
diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 1cbebb2ce..861fc7238 100644
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -553,6 +553,10 @@ span.toggle_selected {
   background-color: #006400;
   color: #FFFFFF;
 }
+#bank_transactions_proposals span.qr_reference_highlight {
+  background-color: #006400;
+  color: #FFFFFF;
+}
 
 /* actionbar styling */
 div.layout-actionbar {
@@ -642,3 +646,28 @@ div.filtered_select input {
 div.filtered_select select {
   width: 522px;
 }
+
+/* icons that change between stylesheets */
+img.icon-sort-up {
+  content:url("../../image/up.png");
+}
+img.icon-sort-down {
+  content:url("../../image/down.png");
+}
+img.icon-dragdrop {
+  content:url("../../image/updown.png");
+}
+img.icon-delete {
+  content:url("../../image/cross.png");
+}
+img.icon-map {
+  content:url("../../image/map.png");
+}
+
+
+
+/* styling for input to textarea switch */
+span.area-input span.switch-to-textarea {
+  content: url("../../image/edit-entry.png");
+  margin-left: 2px;
+}
diff --git a/css/lx-office-erp/dhtmlsuite/menu-bar.css b/css/lx-office-erp/dhtmlsuite/menu-bar.css
index 4a2bd641a..e38846c29 100644
--- a/css/lx-office-erp/dhtmlsuite/menu-bar.css
+++ b/css/lx-office-erp/dhtmlsuite/menu-bar.css
@@ -29,5 +29,6 @@
   background-color: #FFF;
   border: 1px solid #000;
   display: inline;
+  min-width: 75px;
 }
 
diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index 0c604fd72..9292f1218 100644
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -549,7 +549,10 @@ a.red {
 #bank_transactions_proposals span.invoice_number_highlight {
   background-color: #006400;
   color: #FFFFFF;
-
+}
+#bank_transactions_proposals span.qr_reference_highlight {
+  background-color: #006400;
+  color: #FFFFFF;
 }
 
 /* actionbar styling */
@@ -642,3 +645,28 @@ div.filtered_select > input {
 div.filtered_select select {
   width: 522px;
 }
+
+/* icons that change between stylesheets */
+img.icon-sort-up {
+  content:url("../../image/up.png");
+}
+img.icon-sort-down {
+  content:url("../../image/down.png");
+}
+img.icon-dragdrop {
+  content:url("../../image/updown.png");
+}
+img.icon-delete {
+  content:url("../../image/cross.png");
+}
+img.icon-map {
+  content:url("../../image/map.png");
+}
+
+
+
+/* styling for input to textarea switch */
+span.area-input span.switch-to-textarea {
+  content: url("../../image/edit-entry.png");
+  margin-left: 2px;
+}
diff --git a/debian/kivitendo-mebil.changelog b/debian/kivitendo-mebil.changelog
deleted file mode 100644
index d84e814bd..000000000
--- a/debian/kivitendo-mebil.changelog
+++ /dev/null
@@ -1,4 +0,0 @@
-kivitendo-erp (0.1-%BUILD%) unstable; urgency=medium
-  * start of mebil mapping
- -- Michael Wagner <info@wagnertech.de>  Tue, 08 Feb 2022 20:03:04 +0100
-
diff --git a/debian/kivitendo-mebil.control b/debian/kivitendo-mebil.control
deleted file mode 100644
index adf2607e6..000000000
--- a/debian/kivitendo-mebil.control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: kivitendo-erp
-Section: main
-Priority: optional
-Maintainer: Michael Wagner <michael@wagnertech.de>
-Build-Depends: git,mbuild
- 
-Package: kivitendo-mebil
-Section: main
-Priority: optional
-Architecture: all
-Depends: kivitendo
-Description: kivitendo-ERP
-
diff --git a/debian/kivitendo-mebil.cp b/debian/kivitendo-mebil.cp
deleted file mode 100755
index d1b9d755d..000000000
--- a/debian/kivitendo-mebil.cp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-# parameter: $1: base dir for copy (optional)
-
-. debian/setenv.sh
-mkdir -p $1/opt/kivitendo-mebil
-
-ov=$(head -1 VERSION)
-
-# test release tag for original version
-git diff --name-only release-$ov >git.tmp
-cat git.tmp |grep -v debian |grep -v "^Test" |grep -v ".dummy" >git.diff
-
-while read line
-do
-	path=${line%/*}
-	mkdir -p $1/opt/kivitendo-mebil/$path
-	cp $line $1/opt/kivitendo-mebil/$path/
-done <git.diff
-
-echo "$version" > $1/opt/kivitendo-mebil/VERSION_mebil
-
diff --git a/debian/kivitendo-mebil.postinst b/debian/kivitendo-mebil.postinst
deleted file mode 100755
index 62e3bf4c1..000000000
--- a/debian/kivitendo-mebil.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -ex
-
-rsync -av /opt/kivitendo-mebil/ /opt/kivitendo-erp
-
-mv=$(head -1 /opt/kivitendo-mebil/VERSION_mebil)
-if grep ":" /opt/kivitendo-erp/VERSION >/dev/null
-then
-	# kivitendo-mebil ist bereits mal installiert worden
-	sed -i "s/-.*/-$mv/" /opt/kivitendo-erp/VERSION
-else
-	# erstmalige Installation
-	sed -i "s/\([0-9].*\)/\1-$mv/" /opt/kivitendo-erp/VERSION
-fi
-
diff --git a/debian/mfinanz-mebil.changelog b/debian/mfinanz-mebil.changelog
new file mode 100644
index 000000000..dcb7d366a
--- /dev/null
+++ b/debian/mfinanz-mebil.changelog
@@ -0,0 +1,8 @@
+kivitendo-erp (0.2-%BUILD%) unstable; urgency=medium
+  * packet REPLACES kivitendo
+ -- Michael Wagner <info@wagnertech.de>  Tue, 08 Feb 2022 20:03:04 +0100
+
+kivitendo-erp (0.1) unstable; urgency=medium
+  * start of mebil mapping
+ -- Michael Wagner <info@wagnertech.de>  Tue, 08 Feb 2022 20:03:04 +0100
+
diff --git a/debian/mfinanz-mebil.conf b/debian/mfinanz-mebil.conf
new file mode 100644
index 000000000..4f91cd702
--- /dev/null
+++ b/debian/mfinanz-mebil.conf
@@ -0,0 +1,2 @@
+compile_type=NONE
+target_type=DEB
diff --git a/debian/mfinanz-mebil.control b/debian/mfinanz-mebil.control
new file mode 100644
index 000000000..5a1e9cf61
--- /dev/null
+++ b/debian/mfinanz-mebil.control
@@ -0,0 +1,14 @@
+Source: kivitendo-erp
+Section: main
+Priority: optional
+Maintainer: Michael Wagner <michael@wagnertech.de>
+Build-Depends: git,mbuild
+ 
+Package: mfinanz-mebil
+Section: main
+Priority: optional
+Replaces: kivitendo
+Architecture: all
+Depends: kivitendo
+Description: mfinanz-mebil-Erweiterung
+
diff --git a/debian/mfinanz-mebil.cp b/debian/mfinanz-mebil.cp
new file mode 100755
index 000000000..39d059619
--- /dev/null
+++ b/debian/mfinanz-mebil.cp
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# parameter: $1: base dir for copy (optional)
+
+. debian/setenv.sh
+mkdir -p $1/opt/kivitendo
+
+ov=$(head -1 VERSION)
+
+# test release tag for original version
+git diff --name-only release-$ov >git.tmp
+cat git.tmp |grep -v debian |grep -v "^Test" |grep -v ".dummy" >git.diff
+
+while read line
+do
+	path=${line%/*}
+	mkdir -p $1/opt/kivitendo-erp/$path
+	cp $line $1/opt/kivitendo-erp/$path/
+done <git.diff
+
+echo "$version" > $1/opt/kivitendo-erp/VERSION_mebil
+
diff --git a/debian/mfinanz-mebil.postinst b/debian/mfinanz-mebil.postinst
new file mode 100755
index 000000000..b8eb3cb3f
--- /dev/null
+++ b/debian/mfinanz-mebil.postinst
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+mv=$(head -1 /opt/kivitendo-erp/VERSION_mebil)
+if grep "-" /opt/kivitendo-erp/VERSION >/dev/null
+then
+	# kivitendo-mebil ist bereits mal installiert worden
+	sed -i "s/-.*/-$mv/" /opt/kivitendo-erp/VERSION
+else
+	# erstmalige Installation
+	sed -i "s/\([0-9].*\)/\1-$mv/" /opt/kivitendo-erp/VERSION
+fi
+
+systemctl restart apache2
+
diff --git a/doc/UPGRADE b/doc/UPGRADE
index 6b809eea0..06810214e 100644
--- a/doc/UPGRADE
+++ b/doc/UPGRADE
@@ -3,9 +3,90 @@ Wichtige Hinweise zum Upgrade von älteren Versionen
 
 ** BITTE FERTIGEN SIE VOR DEM UPGRADE EIN BACKUP IHRER DATENBANK(EN) AN! **
 
+Upgrade auf v3.9.2
+
+Es sind keine neuen Perl-Abhängigkeiten hinzugekommen.
+
+* Änderung bei Schweizer QR-Rechnung mit QR-IBAN/QR-Referenz
+
+  Bisher wurde für die QR-IBAN eine zusätzliche Zeile bei den Bankkonten
+  erfasst. Die QR-IBAN wird aber jeweils als zusätzliche IBAN für ein
+  existierendes Bankkonto vergeben. Daher wird diese neu als zusätzliche Spalte
+  beim entsprechenden Bankkonto eingetragen. Dies muss nach dem Upgrade unter
+  System -> Bankkonten angepasst werden.
+
+Upgrade auf v3.9.1
+
+Es sind keine neuen Perl-Abhängigkeiten hinzugekommen.
+
+Die Dateieendung für SEPA-XML wurde auf .xml geändert, die vorherigen Werte
+können aber über die Mandantenkonfiguration wieder aktiviert werden.
+
+Upgrade auf v3.9.0
+
+Einige neue Perl-Module sind hinzugekommen, Hilfe zum Installieren bietet wie
+immer das Skript 'scripts/installation_check.pl -v'.
+
+  * Neue Perl Abhängigkeiten:
+
+  * Encode::IMAPUTF7
+  * Mail::IMAPClient
+
+Wichtige Hinweise:
+
+- manuelle Zahlungen von Belegen mit Fremdwährungen verbuchen ist leider seit der Version 3.8 buggy!
+  Diese Version flickt das Verhalten notdürftig und das Problem liegt auf Wiedervorlage, wenn die
+  Rechnungsbelege prinzipiell modernisiert werden (aktuell sind die Belegtypen Aufträge und
+  Lieferschein mit modernen Code implementiert).
+
+  Es gibt drei + x Möglichkeiten:
+  - Zahlungen über das Format MT940 oder CSV importieren und dann über den Menüpunkt 'Kontoauszug
+    verbuchen' alle Zahlungen verbuchen.
+  - Zahlungsverkehr -> Zahlungseingang / Zahlungsausgang für die manuelle Zahlungsverbuchung verwenden
+  - Doch manuell über die Belege die Zahlungen verbuchen, dann aber zwingend die Änderbarkeit von
+    Zahlungen auf 'niemals' setzen
+  - Den kivitendo-Dienstleister seiner Wahl für weitere Optionen (Downgrade, Entwicklungsunterstützung
+    für schnellere Rechnungsüberarbeitung) kontaktieren und beauftragen
+  Weitere Details, https://kivitendo.de/redmine/issues/563
+
+- Diese Version benötigt zwingend PostgreSQL Version 12 oder höher!
+
+Wer es dennoch zwingend in einer älteren Version benötigt, kann diese beiden Skripte deaktivieren:
+
+Shell-Befehl zum Deaktivieren des Skripts:
+  sed -i 's/ignore: 0/ignore: 1/' sql/Pg-upgrade2/oe_purchase_order_confirmation_order_types.sql
+
+SQL-Kommando, das ausgeführt werden muss:
+  ALTER TYPE order_types ADD VALUE IF NOT EXISTS 'purchase_order_confirmation';
+
+
+Upgrade auf v3.8.0
+
+Buchungskonten die mit einem Bankkonto verknüpft sind, können nicht mehr
+manuell in den Belegen bebucht werden.
+
+LaTeX-Druckvorlagen werden nun standardmäßig nicht mehr zwei mal durch
+den LaTeX-Interpreter übersetzt. Statt dessen wird in der
+Standardkonfiguration das Programm »latexmk --pdflatex« aufgerufen,
+das selbständig feststellen kann, ob eine mehrfache Ausführung nötig
+ist, z.B. um Referenzen richtig auflösen zu können.
+
+Bei existierenden Installationen muss dafür in der Konfigurationsdatei
+»config/kivitendo.conf« der Pfad in der Einstellung »[applications]« →
+»latex« umgestellt werden, z.B. auf »latexmk --pdflatex«. Andere
+TeX-Interpreter wie luatex werden ebenfalls unterstützt; siehe Ausgabe
+von »latexmk --help«.
+
+Es sind keine neuen Perl-Abhängigkeiten hinzugekommen.
+
+
+Upgrade auf v3.7.0
+
+Es sind keine neuen Perl-Abhängigkeiten hinzugekommen.
+
 Upgrade auf v3.6.1
 
-Das manueller Korrigieren der Steuer bei Skontoverbuchungen entfällt seit
+Das manuelle Korrigieren der Steuer bei Skontoverbuchungen entfällt seit
 dieser Version, da die Steuerkorrektur automatisch gemacht wird.
 
 Ein neues Perl-Modul ist hinzugekommen, Hilfe zum Installieren bietet wie immer
diff --git a/doc/changelog b/doc/changelog
index 88a0e0164..a8e7382e5 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -2,6 +2,672 @@
 # Veränderungen von kivitendo #
 ###############################
 
+2025-04-29 - Release 3.9.2
+
+Größere neue Features:
+
+- Der alte Controller-Code im Bereich Auftrag/Lieferschein wurde
+  komplett entfernt und steht ab dieser Version nicht mehr
+  abwärtskompatibel zu Verfügung.
+
+- Bei allen Anwendern wird automatisch das neuere Design 4.0 automatisch
+  voreingestellt, das kann aber noch letzmalig auf eine andere
+  Variante in den Benutzereinstellung verändert werden. Ab der
+  Version 4.0 werden die älteren Designs entfernt.
+
+
+Mittelgroße neue Features:
+
+- ZUGFeRD, bzw. generelle eRechnungen von Lieferanten können über
+  das Testsystem t/ validiert werden.
+  Entsprechende PDFs müssten in den Ordner t/xml_invoice/corpus/ kopiert werden
+  und werden dann mit dem Aufruf: t/run.sh t/xml_invoice/xml_invoice.t validiert.
+
+
+Kleinere neue Features und Detailverbesserungen:
+
+- SSO (Single-Sign-On) Unterstützung über entsprechende HTTP-Header.
+  Für Details s.a. Doku und ggf. API-Doku im POD-Style
+
+- XXE Sicherheitslücke bei ZUGFeRD parsen verhindern (Upload), s.a.
+  https://www.usenix.org/sites/default/files/conference/protected-files/woot16_slides_spath.pdf
+
+- Der Hintergrund-Job Nummernkreise aktualisieren hat mehrere neue Paramter zur
+  Verwendung bekommen und kann somit auch monatlich Nummernkreise setzen. Details
+  in der Dokumentation.pdf oder perldoc SL/BackgroundJob/SetNumberRange.pm
+
+- Neuer Hintergrund-Job der alle Angebote/Aufträge älter als x Jahre schliessen kann.
+
+- Neuer Hintergrund-Job der den kompletten Lagerbestand auf 0 setzen kann.
+
+- Die Funktion Sortiment im Artikelstamm ist nicht mehr experimentell.
+
+- Die Vorgangsbezeichnung kann im E-Mail-Betreff vorbelegt werden (Mandantenkonfig)
+
+- Die Eingabezeile für Artikel kann mandantenweit und benutzerbezogen unterhalb der Positionszeile
+  positioniert werden, was eher dem Verhalten der vorherigen Eingabemaske entspricht.
+
+## Änderungshistorie laut Github  (https://github.com/kivitendo/kivitendo-erp/)
+
+#359 Lieferschein Speichern u. schliessen "Als geschlossen markieren"
+#370 Backgroundjob: ShopPartMassCreate Existierende Bilder überspringen
+#385 202409 feat zugferd email address
+#393 FIX: shopware6 connector: Bilder Upload für Shopware >= v6.6 Beheben
+#401 SelfTest:check_missing_tax: Bei reverse_charge Steuer, kein Fehlalarm
+#409 FIX: DeliveryOrder: Ohne Prüfung auf Bestand
+#410 202411-fix-doku-minor-enhancement-backgroundjob-setnumberrange
+#411 20241128 fix qr account
+#412 Debitorenbuchungen input eine ID gegeben, Zahlenformartierungen
+#413 202411 match end to end bt
+#414 202412 doku installation logpfad
+#415 202412 dodate in lieferschein
+#416 Doku: Typos
+#418 FIX: S:C:DeliveryOrder: instances of SL::DB::Unit have attribute $name
+#420 marei - bugfix: fix check for billing_address_department_
+#421 202501 ISO-3166 Ländernamen ZUGFeRD
+#422 202501 bt code 191
+#423 202501 Lieferschein: Button Speichern und weiter
+#425 F http header auth
+#426 202502 fix is empty on undefined value
+#427 202502 experimentelle Features assortment und order kommen in den Standard, oe.pl aufgeräumt
+#428 locale/de: Rechtschreibung korrigiert
+#430 202502 follow up trans info delivery order.js
+#431 202502 E-Mail Vorgangsbezeichnung in Betreff aufnehmen mandantenspez. konfigurierbar
+#434 202503 Druckvorlagen Bugfixes
+#435 202503 Background-Job Lager leeren vor Inventur und CloseQuotations
+#436 202503-fix-742 Wiederkehrende Rechnung bei Auftrag als_neu_speichern
+#438 2024 item input below item list 2
+#439 202503 preformatted html for result in backgroundjob
+#440 Fix Maske Sortiment Add_item mit Enter
+#441 Fix Anhänge bei Emailversand immer angehakt. Nur Design 4.0
+#442 DB: alle Benutzer auf Stilvorlage design40 setzen
+#443 CsvImport: Datumsformat bei Multiplex-Importen berücksichtigen
+#444 S:C:Order: Beschreibung übernehmen bei Hinzufügen neuer Artikel
+#446 fehlende Belegtypen bei Wiedervorlagen
+#447 Offene Angebote/Aufträge auf login-Seite schliessen können
+#448 202501 zugferd xrechnung namespaces aus xml 2
+#449 202503 Skontobuchung Einkaufsgutschrift Fix #699
+#450 Setting doc generation to use https dtd url for download since http i…
+#451 Expanding units of measure (cloned from NX dev stack) because those u…
+#454 templates: vergessenes feature_experimental_assortment entfernt
+#456 2024 set number range 6
+#458 MT940 SWIFT Codes Sonderfall
+#459 FIX: S:C:DeliverOrder: Überprüfen der Lagerbewegungen auf Bestand
+
+
+## Änderungshistorie aus dem Bugfix-Tracker (https://www.kivitendo.de/redmine)
+
+451	Design4.0: Radiobuttons/Texte verschoben
+499	Auftrags-Controller: geänderte Artikel-Beschreibung aus der Eingabezeile wird nicht in Position übernommen
+542	design4.0 SEPA Export ist visuell unbrauchbar (Hintergrundfarbe alterniert nicht und ist durchgängig rosa).
+543	design 4.0: Aktiviertes DMS beim E-Mail-Dialog nicht beachtet
+616	Design4.0: alternierende (Zebra) Tabellen mit dynamischen Zeilen
+628	SL::BackgroundJob::SetNumberRange Automatik auf die "neueren" Nummernkreise erweitern
+665	Individuelle Lieferadresse wird nicht übernommen im Workflow Autftrag  -> Lieferschein
+670	RecordImport aus Email über EmailJournal lädt den Anhang runter und zeigt nichts an
+675	Die Inhalte der Reiter Dokumente/Anhänge werden bei Lieferscheinen EK/VK nicht gerendet, wenn ein Lieferscheine über einen Link aufgerufen wird
+677	Link von der Wiedervorlagenliste zum Lieferschein
+678	Link vom Lagerbewegungsbericht zum Lieferschein
+684	Lieferscheindatum fehlt beim Drucken
+686	Shopware Version > 6.4 akzeptiert den POST '/api/media?_response=true' nicht mehr => shopware erwartet uuids in der Version 7 als zusätzlichen Parameter
+694	neuer Lieferschein-Controller: Speichern und Schließen defekt
+695	Anhänge bei Emailversand immer angehakt. Nur Design 4.0
+696	Workflow Auftrag -> Lieferschein: Positionsdetails gehen verloren
+697	Lieferschein: Formular-Details /zweite Zeile) lässt sich nicht ausklappen nach Workflow aus Auftrag
+699	Einkaufsgutschrift mit Skonto per Kontenauszug verbuchen, erzeugt DATEV Fehler, bzw. eine Fehlbuchung
+700	Email Lieferschein ohne Anhang
+702	Lieferschein fehlende Funktion als geschlossen markieren
+718	 Shopconnector shopware6: Check API Zeigt Fehlermeldung nicht an
+723	Kontoauszug verbuchen -> Eine Zahlung mehreren Rechnungen inkl. Schlussrechnung zuweisen wirft Fehler
+734	Design 4.0 Debitorenbuchung kein zahlungseingang möglich
+735	Auslagern (Nicht auslagern über Standardlagerplatz) im Lieferschein lässt zu das mehr ausgelagert wird wie auf den Lagern vorhanden
+736	Neuer Auftrags Controller: Artikel hier hinzufügen! Beschreibung wird nicht übernommen
+742	Konfiguration wiederkehrende Rechnung E-Mail Versand an Ansprechpartner angewählt -> als neu speichern -> Kunde wechseln -> alter Ansprechpartner bleibt bestehen ...
+744	Design4.0: Tabellenhöhe bei Auftrag erfassen im CSS nicht anpassbar
+745	Filter bei Zeiterfassung in erp-yaml vorkonfigurieren
+753	Design4.0: Verlauf der Hintergrund-Job-Ausführungen anzeigen, pre Fehlermeldung läuft über
+754	CSV-Import: bei Multiplex-Importen wird das Datumsformat ignoriert
+758	Reklamation: Aktualisieren aus Stammdaten geht nicht
+
+
+
+
+
+2024-10-23 - Release 3.9.1
+
+Größere Features und Komponentenupdates:
+  -
+
+Mittelgroße neue Features:
+  - Umwandeln mehrerer Aufträge in jeweils einen Lieferschein aus
+    dem Auftragsbericht.
+  - Neues Recht zum Anzeigen der Beträge in Auftragsberichten. Wer dieses
+    Recht nicht hat, sieht keine Beträge in den Berichten und die Links
+    zu nicht eigenen Aufträgen erscheinen nicht (nur die Auftragsnummer
+    als Text).
+    Als Standardeinstellung bekommen alle Gruppen mit Rechten, Aufträge
+    einzusehen bzw. zu bearbeiten, das Recht, Beträge im Bericht zu sehen.
+    Das Recht lässt sich getrennt nach Ein- und Verkauf einstellen.
+  - Neues Recht zum Ändern von Preisen in Artikelstammdaten.
+    Das Recht ist nach dem Update standardmäßig an, wenn man das Recht zum
+    Anlegen und Bearbeiten von Artikeln hat.
+    Fehlt einem dieses Recht, so lassen sich die Preise sehen, aber nicht
+    bearbeiten. Das betrifft Listen-, Einkaufs-, Verkaufs, Preisgruppen-,
+    Lieferanten- und Kundenpreise.
+
+Kleinere neue Features und Detailverbesserungen:
+  - Verkaufsreklamationen: Support für Drucken via odt-Vorlagen sowie eine
+    Beispiel odt-Vorlage hinzugefügt
+  - Neuer Backgroundjob zum Massen-generieren von Shop Artikeln aus Artikeln.
+    Dokumentation siehe POD in SL/BackgroundJob/ShopPartMassCreate.pm.
+  - Möglichkeit nach internen Bemerkungen zu suchen und zu filtern im
+    Bericht Einkaufsrechnungen/Kreditorenbuchungen.
+  - Der Inhalt der Picker (Artikel/Kunde/Lieferant/Projekt/Konto) wird
+    beim Klick in das Picker-Eingabefeld selektiert. Damit wird der Inhalt
+    dann beim Lostippen gelöscht und es kann direkt nach einem neuen
+    Objekt gesucht werden.
+  - Bei aktiviertem DMS wird bei SEPA-Überweisungen zusätzlich eine PDF zum Download
+    angeboten, die alle bei den Buchungen hinterlegten PDF-Belege in einem PDF bündelt.
+    Somit kann der Überweisende an dieser Stelle nochmal die Überweisungsliste anhand der
+    hinterlegten PDF-Rechnungen vor der Überweisung kontrollieren
+  - Beim Einlagern die Liste der letzten Einlagerungen von 10 auf 20 erhöht und auch
+    das entsprechende Dokument anzeigen
+  - Neues Feld Beschreibung bei den Backgroundjob. Dient zur besseren
+    Unterscheidung.
+  - Dialogbuchungen als "als neu verwenden" können.
+  - eigene Zugriffsrechte für die Verkaufs-Berichte "Auftragsartikelsuche",
+    "Finanz-Controlling" und "Verkaufsbericht".
+  - Ob einige Belege in den Menüs bzw. Workflows verfügbar sind, lässt sich nun
+    in der Mandantenkonfigurtion einstellen. Das gilt zur Zeit für
+    Auftragseingang, Angebotseingang und Lieferantenauftragsbestätigung,
+    sowie für Anzahlungs- bzw. Schluss-Rechnung.
+  - Möglichkeit einer Datenbank-Verklemmung bei CSV-Importen verringert.
+  - Die SEPA END-TO-END wird extrahiert und kann zur Duplikatserkennung beim
+    Bank-Import verwendet werden. Die Einstellung ist erstmal abgeschaltet und
+    der kivi Admin kann selber entscheiden ab wann genügend END-TO-END IDs im
+    Datenbestand vorhanden sind. Die Einstellung befindet sich in der
+    Mandantenkonfiguration unter Buchungseinstellungen.
+  - Neues Recht, um benutzedefinierte Berichte überhaupt nutzen zu können. Wenn
+    dieses Recht nicht gesetzt ist, taucht auch der Menüpunkt für die
+    benutzerdefinierten Berichte nicht auf und die Oberfläche ist etwas
+    übersichtlicher.
+  - Neues Recht, um Kunden-/Lieferanten-Liste (Stammdaten) aufrufen zu können.
+    Diese Recht beschränkt im Moment nur den Menüpunkt und den Bericht
+    unter Stammdaten, nicht aber den generellen Zugriff auf die Kunden- bzw.
+    Lieferanten-Maske.
+  - Neues Recht, um Liste der Ansprechpersonen (Stammdaten) aufrufen zu können.
+  - Die Dateiendung für den SEPA-Export wurde auf .xml geändert, konfigurierbar auf
+    den vorherigen Wert (.cct oder .cdd) über die Mandantenkonfiguration
+  - Kontoauszug verbuchen, der Reiter "Alle Buchungen" kann per Konfiguration immer
+    als erstes angezeigt werden (Vorschläge werden generiert, aber nicht direkt geöffnet)
+  - Neuer Hintergrund-Job der IBAN und BIC in den Stammdaten setzt, insofern diese
+    sich über verbuchte Bank-Transaktion ableiten lassen, s.a.
+    perldoc SL/BackgroundJob/SetBankAccountsMasterData.pm
+
+Bugfixes (Tracker: https://www.kivitendo.de/redmine):
+718 Shopconnector shopware6: Check API Zeigt Fehlermeldung nicht an
+708 Design40 Feld salesman/Verkäufer beim Kunden fehlt
+705 design40: Sortieren (reorder) von Listen im SimpleSystemSettings-Controller kaputt
+704 Lieferschein email an "Email Lieferadresse" defekt
+700 Email Lieferschein ohne Anhang
+697 Lieferschein: Formular-Details /zweite Zeile) lässt sich nicht ausklappen nach Workflow aus Auftrag
+696 Workflow Auftrag -> Lieferschein: Positionsdetails gehen verloren
+694 neuer Lieferschein-Controller: Speichern und Schließen defekt
+688 Design4.0: Toggle Wrapper in Belegen, beim Aufklappen werden ein teil der Felder nicht mehr angezeigt
+680 Design 4.0: "neue" Controller: Update-Symbol falsch nach Anzeigen/Verstecken der 2. Zeile (Details)
+678 Link vom Lagerbewegungsbericht zum Lieferschein
+679 Lieferschein "als neu speichern" liefert Fehler
+671 Admin Bereich: Beim Anlegen einer Datenbank mit schweizer Kontenrahmen kommt eine Ansicht ohne CSS
+647 Kunde editieren: Belege: XML Parsing Error: not well-formed
+
+
+2024-04-10 - Release 3.9.0
+
+Größere Features und Komponentenupdates
+
+  - Bestell- oder Einkaufshelfer
+      Über einen Bericht "Meldebestand" können Artikel, die den Mindestbestand
+      unterschritten haben, in einen Warenkorb gelegt werden. Der Warenkorb
+      kann gefiltert nach Lieferant dann Einkaufsbestellungen auslösen.
+      Zusätzlich zu den Meldebestandwaren können weitere Artikel des
+      Lieferanten gleich mitbestellt werden. Artikel die in offenen und nicht
+      gelieferten Einkaufsbestellungen sind, werden nicht im Meldebestand
+      angezeigt. Artikel können auch direkt aus der Stammdatenmaske in den
+      Einkaufswarenkorb gelegt werden.
+
+  - Eingehender E-Mail-Import im E-Mail-Journal
+      E-Mails können von beliebigen IMAP-Ordnern importiert werden und sind
+      anschließend im E-Mail-Journal sichtbar. Beim Klick auf eine importierte
+      E-Mail werden PDF Anhänge direkt im Browser geöffnet und mit jedem Anhang
+      oder der gesamten E-Mail können weitere Aktionen innerhalb kivitendos
+      angestoßen werden. Diese Aktionen sind
+        - E-Mail-Anhang zum Beleg hinzufügen
+        - von einem beliebigen Einstiegspunkt einen weiteren Workflow Schritt
+          mit Mitnahme des Anhangs machen
+        - E-Mail-Anhänge in Belegvorlagen verbuchen
+        - Einen komplett neuen Workflow/Beleg starten
+
+      Falls der E-Mail-Anhang ein PDF vom Typ 'E-Rechnung' im Format ZUGFeRD/Factur-X ist,
+      wird bei der Erstellung einer Kreditorenbuchung probiert, sinnvolle Daten dort automatisch
+      vorzubelegen.
+      Diese Verfahren kann auch vollautomatisch direkt beim Import der E-Mail mit einer
+      entsprechend konfigurierten Kreditorenbelegvorlage durchgeführt werden.
+
+
+  - Update CKEditor auf CKEditor5 39.0.2
+    Featureabgleich mit ckeditor4:
+    - die folgenden Features sind alle weiterhin verfügbar, können aus alten
+      Daten gelesen werden und funktionieren in Export und Print
+      - bold
+      - italic
+      - strikethrough
+      - underline
+      - superscript
+      - subscript
+      - numbered list
+      - bulleted list
+      - remove format
+    - zusätzlich sind in der neuen Konfiguration noch:
+      - undo/redo (for free)
+      - horizontal line (wurde in ein paar Kundenprojekten verwendet, ist
+        default konfiguriert)
+      - source editor (wurde in einigen Anpassungen verwendet, ist jetzt
+        default konfiguriert)
+      wenn etwas davon nicht gewünscht ist, einfach in js/kivi.js aus der
+      toolbar entfernen.
+    - mehr als eine Instanz in der gleichen Seite funktioniert
+    - Lokalisierung des Editors auf die Benutzersprache
+      (myconfig.countrycode) funktioniert für de und en.
+    - cut/copy/paste aus dem alten Editor gibt es nicht mehr
+    - Enter events im Editor werden nicht an umliegende Forms gebubblet
+    - Focus, initial Fokus und focus_when_ready funktionieren wie vorher
+      auch
+    - die folgenden Attribute im unterliegenden <textarea> werden korrekt
+      interpretiert:
+      - disabled
+      - style: height
+    - clientjs fokus funktioniert
+
+    Wichtige Änderungen:
+
+    - die funktion kivi.selectall_ckeditor wurde nicht mehr verwendet und
+      wurde entfernt.
+    - Der neue Editor ist jetzt wieder Classic und NICHT Inline. Der Grund
+      dafür ist:
+      - Inline funktioniert nicht auf <textarea> Tags sondern brauch
+        zwingend <div> tags. Das würde deutlich mehr Migrationsaufwand
+        bedeuten.
+      - Inline kopiert nicht automatisch den Inhalt des ckeditors zurück in
+        das originale DOM Element, was zu versteckten Bugs führen könnte.
+      Wenn Inline gewünscht ist, bitte separat bauen.
+    - CSS Theme Anpassungen sind nicht mehr kompatibel. Die Klassen und der
+      DOM Aufbau haben sich geändert. Die Standardversion sieht aber in
+      allen Stylesheets gut genug aus, dass das erstmal so bleiben kann.
+    - Das "width" Attribut im unterliegenden <textarea> wird nicht mehr
+      benutzt um den Editor zu dimensionieren. Der ckeditor nimmt sich immer
+      die volle Breite des umliegenden Containers.
+    - dymanisches resize ist nicht mehr unterstützt.
+    - es gibt keinen jquery adapter mehr. Interaktion mit dem editor müssen
+      mit der API des ckeditors passieren. Das Editor Objekt ist weiterhin
+      im data-ckeditorInstance des unterliegenden <textarea>.
+
+Mittelgroße neue Features:
+
+  - Neben Artikelnummern pro Lieferant und pro Kunden können auch
+    Artikelnummern pro Kunden-/Lieferantentyp mit Beschreibung und
+    Langtext verwaltet werden.
+  - Das WebDAV Repository kann mit einem externen WebDAV-Repo in eine Richtung (kivi -> WebDAV)
+    mittels Hintergrund-Job periodisch synchronisiert werden. Der entsprechende Job heißt
+    ExternalSyncWebDAV. Die Einstellungen für das externe Repo befinden sich in der Mandanten-
+    konfiguration. Der Job kann mit dem Daten-Parameter delete: 1 aufgerufen werden und anstatt
+    die Daten zu kopieren wird das externe Repo gelöscht. Mit delete: 0 wird dann wieder normal
+    synchronisiert. Ferner wird nur das  WebDAV-Repo des eingeloggten Benutzers synchronisiert
+    (alle Einträge unterhalb $KIVI/webdav/$MANDANT/, z.B. /usr/local/src/kivitendo/webdav/2/).
+    Für das Verfahren wird das optionale Paket HTTP::DAV benötigt, s.a. (scripts/installation_check.pl -ov)
+    Der Hintergrund-Job kann ferner auch direkt auf Unterordner des entfernten WebDAV-Repos
+    zugreifen, bspw. nextclound (https://nc.firma.de/remote.php/webdav/dateien für den stb)
+  - Neuer Workflow Auftrags-Eingang auf der Verkaufsseite zwischen Angebot
+    und Auftrag.
+  - Neuer Workflow Angebots-Eingang auf der Einkaufsseite zwischen Preisanfrage
+    und Lieferantenauftrag.
+  - Neuer Workflow Lieferantenauftragsbestätigung auf der Einkaufsseite nach
+    Lieferantenauftrag.
+  - Scan Funktion für Schweizer QR-Rechnungen in mobilen templates. Die QR-Rechnung kann
+    mittels eingebauter Kamera Funktion eingescannt werden. Anschließend wird die Rechnung
+    einem Lieferanten zugeordnet und als Kreditorbuchung gespeichert.
+  - Beim fertigen eines Erzeugnisses können nun die Bestandteile genau bestimmt
+    werden, sofern diese nicht eingeutig sind. Gibt es also z.B. Bestandteile in
+    verschiedenen Lagerplätzen oder mit verschiedenen Chargen, so können diese
+    gewählt ausgewählt werden. Das Mindeshaltbarkeitsdatum wird dabei (noch
+    nicht) berücksichtigt.
+  - Beim Jahresabschluss besteht neu die Möglichkeit, zwischen den Methoden Einfach und Standard
+    zu wählen. Die Methode Einfach berücksichtigt nur die Bestandskonten und verwendet das
+    gleiche Konto für die Verbuchung von Gewinn oder Verlust.
+
+Kleinere neue Features und Detailverbesserungen:
+
+  - Beim Export aller Kontenblätter (Berichte -> Buchungsliste) können nun auch PDFs
+    erzeugt werden
+  - Schweizer QR-Rechnungen: Bei der Erzeugung via OpenDocument, innerhalb des QR-Code
+    Adresstyp S anstatt K verwenden
+  - Bei den Bankkonten Auswahlmöglichkeit hinzugefügt, ob das Konto für den Bankimport
+    verwendet (und somit für manuelle Buchungen gesperrt) werden soll
+    (Standardwert und für bestehende Mandanten: Ja)
+  - Mahnsperre beim Kunden
+  - Bei Mahnungen den schon erstellten Beleg mitversenden (optional einstellbar in der
+    Mahnungskonfiguration.
+  - Schon erstellte Belege aus dem Webdav/DMS als zip herunterladen.
+  - Volltextsuche auch für Einkaufsbelege EK-Rechnungen/Kreditorenbuchungen
+  - Volltextsuche auch für Lieferscheine
+  - weitere Filtermöglichkeiten wie Zahlungsbedingungen und Typ bei Mahnungen erzeugen
+  - In diversen Formularfeldern Kunden/Lieferanten trailing withespaces nicht speichern
+  - Bericht Lagerbestand nach text-artigen benutzer definierten Variablen
+    sortieren lassen
+  - Neben Lieferantenartikelnummern kann auch ein Langtext hierzu in
+    den Artikelstammdaten verwaltet werden.
+  - Zu kundenspezifischen Preisen/Artikelnummern können jetzt auch
+    Beschreibung und Langtext in den Artikelstammdaten verwaltet
+    werden.
+  - Hintergrund-Job zum Überprüfen des Mindestlagerbestands für Artikel, der
+    Emailversand kann über die Konfigurationsdatei eingestellt werden.
+  - Gesendete Emails können im Email-Server (IMAP-Ordner Sent) gespeichert werden
+    (konfigurierbar in kivitendo.conf [sent_emails_in_imap])
+  - IMAP Client (konfigurierbar in kivitendo.conf [imap_client]):
+    - Bei der Erstellung von VK-Angebote und VK-Aufträge können automatisch
+      Ordner im Email-Server angelegt werden
+    - Bei der Bearbeitung von VK-Angebote und VK-Aufträgen können die Emails aus
+      den angelegten Ordner im Email-Server automatisch importiert werden
+    - Hintergrund-Job zum Aufräumen der erstellten Email-Unterordner, nur
+      Unterordner für offene Belege werden behalten
+    - Hintergrund-Job zum Synchronisieren von Email-Ordner. Emails werden in das
+      E-Mail-Journal importiert, wenn sie nicht schon vorhanden sind
+  - Belege ("neue" Controller, sprich Angebot/Auftrag/Beistelllieferschein/RMA/
+    Reklamation) können nicht mehr ohne Positionen gespeichert werden. Ausnahmen
+    lassen sich in der Mandantenkonfiguration einstellen.
+  - Projektspezifische Testfälle 'NovoclonStrict' sind im Standard verfügbar.
+    Optimiert für die Branche 'Handel', die in der Regel nur eine Handelsware pro
+    Vorgang einkaufen und verkaufen. Das Modul ist als einzelner SelfTest mit
+    folgender JSON-Konfiguration im Feld 'Daten' aktivierbar (email tauschen):
+    email: prozessueberwacher@meinkunde.com
+    modules: NovoclonStrict
+  - Gutschriften können beim Kontoauszug verbuchen gegen Rechnungen über durchlaufende
+    Posten ausgebucht werden. Funktioniert bei exakt einer Rechnung und einer Gutschrift
+    die mit einer Banktbewegung vom Anwender verknüpft wird. Die Automatik wird
+    beim Zurücksetzen einer Bankbewegung auch entsprechend aufgelöst. Die Buchungen
+    bekommen zusätzlich einen Hinweis auf eine Automatik im Feld 'Memo'
+  - Kontoauszug verbuchen setzt automatisch ein unscharfes Skonto bei Skonto-Abweichungen
+    bis 0,5 % des Original-Rechnungbetrags. Der Prozentwert kann mandantenweit konfiguriert werden
+    und die Funktion kann deaktiviert werden, s.a. Mandantenkonfig->Buchungskonfiguration
+  - Mahnungsversand per E-Mail, nimmt Daten von der abweichenden Rechnungsadresse und priorisiert
+    ansonsten nach Mahnungsempfänger (E-Mail) und Rechnungsempfänger (E-Mail). Falls überhaupt
+    keine gültige E-Mail gefunden wird, ist die Funktion an der Oberfläche für den Anwender
+    deaktiviert.
+  - Bei Wechselkursgewinnen oder -verlusten wird dieser jetzt im Beleg angezeigt für
+    deutsche Kontenrahmen (chart_link nachträglich korrigiert)
+  - Rechnungsversand per E-Mail, auch bei Anzahlungs- und Schlußrechnung
+  - Bei neuen Wiedervorlagen wird der Benutzer automatisch per E-Mail informiert.
+    Dies kann in den Benutzereinstellungen deaktiviert werden. Die E-Mail kann
+    in kivitendo.conf [follow_up_notify] konfiguriert werden.
+  - Bei der Übernahme von Shop-Aufträgen kann jetzt auch nur eine teilweise Auswahl
+    der Artikel übernommen werden (hilfreich für den Fall Artikel existiert im Shop
+    aber so nicht in kivitendo oder es handelt sich um nicht abrechenbare Artikel)
+  - Ein Hintergrundjob ShopwareSetPaid setzt den Bezahlstatus eines Shopauftrags.
+    Sollte standardmäßig nach jedem Werktag angeschaltet werden, s.a. API-Doku im POD-Format.
+  - Lieferplan filtert auch nach Artikelnummer des Erzeugnisbestandteils
+  - In der Mandantenkonfiguration bzw. Benutzereinstellungen kann ausgewählt
+    werden, ob immer das Desktop-Layout gewählt wird. Das kann nützlich sein,
+    wenn man die kivi klassisch auf dem Tablet oder Smartphone verwenden will.
+  - Artikel können auf "nicht mehr bestellen" gesetzt werden. Dann sind diese
+    in neuen Preisanfragen und Lieferantenaufträgen nicht mehr auswählbar.
+
+
+Bugfixes (Tracker: https://www.kivitendo.de/redmine):
+676 Druckvorlagen (marai): Fehler bei natürlicher Person
+675 Die Inhalte der Reiter Dokumente/Anhänge werden bei Lieferscheinen EK/VK nicht gerendet, wenn ein Lieferscheine über einen Link aufgerufen wird
+673 Design 4.0 Dialogbuchungsmaske hat keinen Reiter Verknüpfungen
+672 Schlussrechnung beim Schweizer Kontenrahmen 2024 mit MWST wirft Fehler.
+668 Design 4.0: Flash beim Anlegen einer neuen Datenbank wird versteckt
+666 Design4.0: Der wrapper für horizontales scrollen ist zu breit, wenn menü links verwendet wird
+665 Individuelle Lieferadresse wird nicht übernommen im Workflow Autftrag -> Lieferschein
+658 DMS -> Backend WebDAV verknüpfte Belege
+657 Schnellsuche Fibu findet Rechnungnummer nicht
+654 Aufzählungsliste ist im ckeditor 5 nicht mehr gut einsehbar einsehbar/editierbar
+653 Auftragscontroller: Als neu speichern: Hinweis auf ungültige Artikel zeigt Position nicht mehr an
+651 Design4.0: CSV-Import: Report zeigt erste Datenzeile nicht an
+649 CSV-Import Lieferanten 3.9 alpha geht nicht mehr
+648 Einkaufs- und Verkaufsreklamationen funktionieren nicht mehr
+646 Design4.0: Vorgangsbezeichnung: Feld in EK-Rechnung fehlt.
+643 Design4.0: Konten ungültig machen: checkobx fehlt im Template
+640 DBUpgrade fehler bei sql/Pg-upgrade2/oe_purchase_order_confirmation_order_types.sql
+637 load_zugferd fehlerhaft bei Ermitteln der tax
+636 ZuGFeRD Import defekt
+634 Verkauf -> Berichte -> Rechnungen -> Drucken kaputt
+633 Alte Berechnungsautomatiken von Auftrag nach Lieferschein defekt
+632 Verkaufslieferschein lässt sich nicht mehr Auslagern
+631 Lager -> Lagerbuchungen wirft einen DB-Fehler: "sales_invoice" ist kein gültiges enjm
+630 design40: Bei Lagereingang im Lieferschein-Popup wird Information abgeschnitten
+625 Speichern und Lieferschein (E) mit Artikelauswahl -> Fehler:
+624 Einkaufslieferschein lässt sich nicht zrücklagern
+622 Kein CKEditor bei Rechnung erfassen/bearbeiten
+621 Das Menü Links verschwindet / leer bei Rechnung erfassen, Anzahlungsrechnung erfassen, Gutschrift erfassen
+620 Mahnstatus wird in Rechung nicht richtig angezeigt
+617 Design4.0: Kunden/Lieferantenmaske Reiter "Belege"
+615 Reverse Charge $13 für UStVA richtig konfigurieren
+610 Lieferscheine an Lieferanten
+609 Nach Update von Debian11 auf Denian12 Fehler beim Ausdrucken von Rechnungen wenn ZugFerD eingeschaltert.
+608 DBUpgrade fehler bei sql/Pg-upgrade2/record_links_remove_to_quotation.pl
+607 Design4.0 Reportgenerator erzeugt sehr viele Leerzeilen
+605 Kontoauszug verbuchen rückgängig machen, setzt datepaid im Nebenbuch nicht null zurück, wenn keine Zahlungen mehr zum Beleg vorhanden sind
+603 Mailversand liefert immer einen Fehler / Mails über IMAP ablegen
+594 Design4.0: Mandantenkonfiguration
+593 Design40: Dialogbuchen
+592 Design40: CSV-Importe: Hilfe zu Spaltennamen nicht ganz lesbar bei Multiplex-Importen
+591 Design40: CSV-Importe: große leere Stelle bei Multiplex-Importen
+590 Design40: CSV-Importe: Einstellungen: Texteingabefelder zu weit rechts
+589 neue Buchungsliste saldiert falsch.
+584 SL/Controller/Reclamation.pm merge marker in POD
+578 Admin-Oberfläche: Fehler beim Anlegen eines Benutzers
+569 Design4.0 Kunden/Lieferantenmaske Reiter "Belege" überlagert andere tabs
+564 div. Belege/Dialogbuchen Beim Löschen eines Dokuments wird der DB Eintrag nicht gelöscht
+551 Design4.0: Bei Wiedervorlagen fehlt die Auswahlliste der Benutzer (für den die WV erstellt wird)
+541 ! LaTeX Error: There's no line here to end
+533 Design 4.0: Speichern der Mandantenkonfiguration: Can't locate object method "shipped_qty_fill_up" via package "SL::DB::Default" at /usr/share/perl5/Rose/DB/Object.pm line 1657.
+525 Design4.0 Kreditoren/Debitorenbuchungen
+524 Design4.0 Dialogbuchen
+523 Design4.0 Benutzereinstellungen
+522 Design4.0 Fehlende Option Benutzerdefinierte Variablen
+513 Beistellieferschein PDF wird nicht im DMS abgelegt
+474 Artikeldaten aktualisieren wenn Spache geändert
+473 SQL-Fehler bei "Suche nach in Erzeugnissen verbauten Artikeln"
+440 Im neuen Auftragscontroller kein Workflow "Angebot"
+374 Benutzerdefinierte Variablen lassen sich nicht leeren
+363 Standardbuchungskonto ("Buchen auf") wird in Rechnungen EK/VK nicht vorbelegt.
+313 unstable: Kontoauszug verbuchen - Verkaufsrechnungen werden SEPA-Sammelüberweisungen zugeordnet
+298 Artikel "Als neu verwenden" übernimmt die BDVs nicht.
+216 Kunden als csv exportieren2
+189 Sortierung in den Listen aus der Schnellsuche verwirft den Suchbegriff
+129 Erfolgsrechnung für nicht Schweizer-Anwender
+118 item in record_links für auftrag zu rechnung hinzufügen
+114 Wird ein Artikel gelöscht, zu dem eine Preisregel definiert ist, so bleibt die Preisregel bestehen und erzeugt Fehlermeldung beim Aufruf von Preisregeln
+112 Zeilenumbruch falsch konvertiert von 3.1 nach 3.3
+95  Händischer CSV-Import wirft (unter bestimmten Umständen) Fehler, bzw. sperrt die gesamte kivi
+93  Workflow Auftrag -> Lieferschein -> Rechnung "Steuer im Preis inbegriffen" wird nicht aus dem Auftrag mit in die Rechnung übernommen
+89  Berichte -> Projektbuchungen | zwei direkte SQL-Fehler
+88  Export der SuSa vergisst Projekt- oder Abteilungsfilter
+63  Standard-Druckvorlagen - parsen LaTeX-Bedingung nicht korrekt
+14  Lieferplan zeigt nicht alle Positionen / Liefertermine an.
+12  Erzeugnisse deren Einzelteile unterschiedliche Einheiten verwenden werden falsch berechnet.
+6   2437 Falsche Marge bei Verwendung von Preisfaktor
+5   1991 SelfTests: Undefiniertes Verhalten bei NOTESTS
+
+2023-04-05 - Release 3.8.0
+
+Größere neue Features:
+
+ - Reklamationscontroller
+   Zum Erfassen und Auswerten von Einkaufs- und Verkaufsreklamationen
+
+Mittelgroße neue Features:
+
+ - Export-Option als Chart/Grafik für den Report-Generator und damit für
+   alle Berichte
+ - Benutzerdefinierter Datenexport verwendet Report-Generator
+ - Überarbeitung von Berichte -> Kontenübersicht und Buchungsliste
+   Die Buchungsliste hat neu einen eigenen Menüpunkt. Dort kann das Konto,
+   zusammen mit dem Zeitraum und den Einstellungen, ausgewählt und dann die
+   Buchungsliste angezeigt werden. Die Auswahl des Kontos über die
+   Kontenübersicht ist weiterhin möglich. Zusätzlich gibt es in der
+   Buchungsliste, via Action-bar, neu die Funktion: Export -> Alle Konten als
+   CSV exportieren (ZIP-Datei) Diese exportiert die Buchungslisten aller
+   bebuchten Konten als CSV und bietet diese in einer ZIP Datei zum Download
+   an. Die Datumsauswahl zum Zeitraum ist neu in einem kompakten Modul mit
+   optionalen Voreinstellungen (in einem popup) untergebracht.
+ - Buchungsgruppen können auf "ungültig" gesetzt werden.
+
+Kleinere neue Features und Detailverbesserungen:
+
+ - Die Variablen zur Ersetzung der Zahlungsbedingungen stehen auch als einzelne
+   Variable für das Druckvorlagensystem zu Verfügung, bspw. bezeichnet
+   <%invtotal_wo_skonto%> den Rechnungsbetrag abzgl. des Skontos.
+ - Bei den Transaktions-SelfTest kann eine optional weitere E-Mail-Adresse direkt
+   beim Anlegen des Hintergrundjobs im Textfeld data json formatiert wie folgt
+   hinzugefügt werden 'email: meine@email.adresse' (Hochkommatas weglassen).
+ - Bücher können vom Benutzer auch beim Arbeitsschritt: Lohnbuchhaltung importieren
+   geschlossen werden.
+ - Metadaten für DATEV-CSV-Export exakter nach den Wünschen des DATEV-Prüfprogramms
+   gesetzt (SKR ergänzt und weniger Spalten)
+ - Hintergrund-Job der automatisch periodisch die Bücher schließt, falls dies manuell
+   vergessen wird. Als Intervall sind Monate und Tage rückwirkend auswählbar:
+   'subtract_month: n', 'subtract_days: n'. Die Einstellung im Job muss wie immer json
+   kodiert passieren. Falls keine Parameter gesetzt sind, werden die Bücher am 10. des
+   Monats rückwirkend am letzten Tag des Vorvormonats geschlossen.
+ - LaTeX-Druckvorlagen werden nun standardmäßig nicht mehr zwei mal
+   durch den LaTeX-Interpreter übersetzt. Statt dessen wird in der
+   Standardkonfiguration das Programm »latexmk --pdflatex« aufgerufen,
+   das selbständig feststellen kann, ob eine mehrfache Ausführung
+   nötig ist, z.B. um Referenzen richtig auflösen zu können. Bei
+   existierenden Installationen muss dafür in der Konfigurationsdatei
+   »config/kivitendo.conf« der Pfad in der Einstellung
+   »[applications]« → »latex« umgestellt werden, z.B. auf »latexmk
+   --pdflatex«.
+ - Neben Lieferantenartikelnummern kann auch eine Lieferantenartikelbeschreibung
+   in den Artikelstammdaten verwaltet werden.
+ - Umsatzübersicht im Kunden-/Lieferanten-Stamm als Chart. Umschalten zwischen
+   Monats/Jahresansicht per Klick.
+ - Für Einkaufsrechnungen und Kreditorenbuchungen können Überweisungen via SEPA
+   manuell gesperrt werden.
+ - Die E-Mail-Absenderadresse kann jetzt belegweise generisch gesetzt werden, konfigurierbar
+   in der Mandanteneinstellung auf Workflow-Ebene im Bereich Einkauf und Verkauf
+ - Schnellsuche für Projekte eingeführt
+ - In der benutzerkonfigurierten Kundenanzeige kann man nun auch das Land mit
+   anzeigen
+ - Einkaufsrechnungen können positionsweise mit Aufwands- oder Bestandskonten
+   und einem Steuerschlüssel überlagert werden (sichtbar in der 2.
+   Positionszeile)
+ - Die Rechnungsberichte Verkauf und Einkauf können nach Zahlungsbedingung
+   gefiltert werden.
+ - Buchungskonten haben ein Attribut ungültig und stehen damit standardmäßig nicht
+   mehr zur Auswahl bei neu erfassten Buchungen
+
+Bugfixes (Tracker: https://www.kivitendo.de/redmine):
+585 Lieferschein läss sich nicht mehr auslagern/speichern wenn Seriennummer ist Pflicht
+584 SL/Controller/Reclamation.pm merge marker in POD
+583 ListTransactions (Buchungsliste) (neuer controller) Saldo alt / Jahresverkehrszahlen alt / Bilanz falsch
+580 Umbuchung im Lager gleicher Fehler wie bei Lagerentnahme
+579 Lagerntnahme wirft DBI fehler
+570 Test invoice_to_reclamation.t kaputt
+568 Fehler bei "Positionen" anzeigen in Berichte Lieferschein
+566 Beistelllieferschein Nummernkreis
+565 Artikel->Lieferantenauftrag Meldung: Das Formular ist nicht mehr gültig
+562 DMS mit Backend WebDAV Datei hochladen stürzt ab, sobald ein '/' in der Rechnungsnummer, bzw. Buchungsbeschreibung vorkommt
+559 E-Mail-Versand von Briefen, berücksichtigt nicht die Firmensignatur
+558 Lagerbestand für den Import kompatibel machen
+556 Design4.0: Web-Templates für neues Design werden nicht gezogen
+553 Adminbereich: Beim Editieren von Benutzer*innen fehlt Anzeige der Gruppen und Mandantenzugehörigkeit
+550 Lieferschein - Datenbank stimmt nich mit MetaSetup überein
+549 Workflow EK-Reklamation -> VK-Reklamation geht nicht
+548 Workflow VK-Reklamation -> EK-Reklamation landet bei VK-Reklamation
+547 Workflow Reklamation -> Auftrag; dann Auftrag speicher schlägt fehl
+546 Workflow Reklamation -> Auftrag (direkt ohne speichern)
+545 Ausgelagerte Beistell-Lieferscheine können nicht mehr gedruckt werden
+544 Verknüpfte Belege: Manuelle Auswahl von Dialogbuchung liefert keine Suchtreffer im Popup
+535 Lieferbedingungen können nicht ungültig gesetzt werden
+534 "Das Formular ist nicht mehr gültig." beim Erzeugen einer Schlussrechnung/weitere Anzahlungsrechnung
+531 Retourenlieferschein: Es gibt keinen Eintrag für Dokument im Bericht Lagerbuchungen
+530 Reklamationscontroller: Workflow VK-Auftrag -> VK-Lieferschein ist defekt: Fehler: Invalid action 'undefined' for controller SL::Controller::Order
+529 Retourenlieferschein: Verkaufs-Retouren können nur auf schon bebuchte Lagerplätze gesetzt werden
+527 Design4.0 Kunden/Lieferantenmaske Reiter "Belege" Inhalt sieht unschön aus
+526 Design4.0 Reiter "Dateianhänge" fehlt das DROP-Feld "Dateien hierher ziehen und fallen lassen"
+521 System -> UStVa Einstellungen Maske erscheint in ungewöhnlich grosser Schrift.
+520 Mandantenkonfiguration: design40_webpages erscheint in der Liste existierender Druckvorlagen
+519 locales.pl neues Design verursacht Fehler
+518 Neues Design - Fehler in Rechnung/Gutschrift erfassen
+517 Neues Design - Fehler in Mandantenkonfiguration
+516 Neues Design - Fehler in der Kunden/Lieferantenmaske
+515 Design4.0 Benutzer lässt sich nicht speichern
+512 Rechnung aus Lieferscheinen buchen geht nicht mehr bei Version 3.7
+506 Beistelllieferschein lässt nach auslagern nicht mehr drucken
+493 Cannot rethrow string ... bei Fehler in der Kreditoren-Transaktion
+490 DeliveryOrder order_type db upgrade
+451 Design4.0: Radiobuttons/Texte verschoben (Status Feedback)
+317 DATEV KNE-Export komplett entfernen
+
+
+2022-09-19 - Release 3.7.0
+
+Größere neue Features:
+
+Mittelgroße neue Features:
+
+ - Angebote und Aufträge um Unterversionierungen erweitert.
+   Dabei werden vorherige Unterversionen von Verkaufs-Angebote und Verkaufs-Aufträge
+   gesperrt sobald diese per E-Mail versendet wurden. Die Funktion ist
+   standardmäßig deaktiviert und kann über die Mandantenkonfiguration aktiviert werden.
+ - Angebote und Aufträge bekommen einen Status. Die Status können im
+   System-Menü angelegt, editiert und gelöscht (sofern noch nicht
+   verwendet) werden. Ein Status "bestätigt" ist bereits angelegt.
+   Der Status kann in den Masken per Hand gesetzt werden. Es erfolgt
+   keine automatische Statusänderung. In den Berichten kann der Status
+   angezeigt werden und es kann danach gefiltert werden.
+ - Informationen über Positionen in Belegberichten können in einer eigenen
+   Spalte angezeigt werden. Es wird zuerst nur die erste Position angezeigt,
+   die Information weiterer Positionen lässt sich aus- und einklappen.
+ - Wiedervorlagen können für mehrere Benutzer angelegt werden. Zudem können
+   die Benutzer aus den Benutzergruppen gewählt werden.
+ - Erinnerungen an fällige Wiedervorlagen können an Benutzer gemailt werden.
+   Dazu gibt es einen Hintergrund-Job (SendFollowUpReminder), der angelegt und
+   aktiviert werden kann.
+
+Kleinere neue Features und Detailverbesserungen:
+
+ - Angebote/Preisanfragen können aus der Aufgabenliste (auch auf dem
+   Startbildschrim) heraus geschlossen werden.
+ - Schweizer QR-Rechnungen: Bei den Adressdaten für Kunden und Rechnungssteller wird
+   Schweiz als Standardwert verwendet. Es werden nur noch Druckvorlagen welche 'qr' im
+   Vorlagenkürzel enthalten für die QR-Rechnung verwendet, dies ermöglicht die gleichzeitige
+   Verwendung von QR und nicht-QR Rechnungen.
+ - Beim Abschluss von Wiedervorlagen wird der Benutzer und der Zeitpunkt gespeichert.
+ - Formular-Gültigkeit beim Buchen von Verkaufsrechnungen überprüfen. Aktuelles Browser-Verhalten
+   kann dazu führen, dass der Anwender doppelte Buchungen erstellt.
+ - Das E-Mail-Journal protokolliert jetzt die genaue Fehlermeldung des SMTP-Servers
+ - Finanzübersicht funktioniert jetzt auch korrekt mit Fremdwährungs-Belegen
+ - Die Konfigurations-Option "git_commit_reload_recources", um bei
+   einer git-basierten Installation den js/css-Resource-Dateien den
+   Hash des aktuellen git-Heads anzuhängen, entfällt. Nun wird
+   vielmehr immer der Hash angehängt. Wenn dieser nicht ermittelt
+   werden kann, dann wird die kivi-Versionsnummer angehängt.
+   Die Entwickler-Option "auto_reload_resources" bleibt vorhanden und
+   hat Vorrang.
+   Das dient dazu, dass der Browser die Resource-Dateien neu lädt und
+   bei einem Upgrade nicht bei allen Anwender-Browsern der
+   Broser-Cache manuell gelöscht werden muss ("Drück mal Strg-F5"
+   entfällt dann hoffentlich).
+
+Bugfixes (Tracker: https://www.kivitendo.de/redmine):
+504 BDV Auswahlbox mit Checkbox ignoriert Parameter 7) Deaktiviert als Voreinstellung
+501 Gelöschten Benutzernamen für einen andere Person neu vergeben verursacht Durcheinander
+
+
 2022-05-20 - Release 3.6.1
 
 Größere neue Features:
@@ -114,6 +780,8 @@ Größere neue Features:
   Buchhalterische Änderungen:
   Die Anzahlungsrechnung wird nicht auf das Standard-Ertragkonto gebucht,
   sondern auf ein definiertes Transferkonto, ferner wird keine Mehrwertsteuer gebucht.
+  Wichtig ist in diesem Fall, dass dieses Transferkonten in der Mandatenkonfiguration
+  beim Reiter Standardkonten hinterlegt werden muss.
   Sobald der Zahlungseingang zu dieser Anzahlungsrechnung verbucht wird (per Bankimport),
   wird die Mehrwertsteuer entsprechend zum Zahlbetrag brutto verbucht.
   Damit das ganze DATEV konform bleibt, wird der entsprechende netto Betrag des Zahlbetrags
@@ -124,6 +792,12 @@ Größere neue Features:
   Die Standard-Druckvorlage marei, enthält exemplarisch zwei neue Druckvarianten die
   diesen Fall abbilden und somit als Orientierung für eigene Vorlagen-Anpassungen
   dienen können.
+  Wichtig: Für nicht DATEV-Kontenrahmen ist die Funktionalität nicht implementiert, kann aber
+  konfiguriert werden, falls man zusätzlich das Verrechnungskonto unter Mandanten-Konfig
+  Standard-Konten und die Anzahlungskonten nach Steuersatz (bspw. 1718 (SKR03) / 3272 (SKR04))
+  in der Tabelle defaults definiert.
+  Die Spalten für die Konto-ID der Anzahlungskonten lauten advance_payment_taxable_7 (verm. Steuersatz)
+  und advance_payment_taxable_19 (normaler Steuersatz).
 
 
 Mittelgroße neue Features:
diff --git a/doc/dokumentation.xml b/doc/dokumentation.xml
index 1da27983b..aaacf8f9e 100644
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+"https://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <book id="kivitendo-documentation" lang="de">
-  <title>kivitendo 3.6.1: Installation, Konfiguration,
+  <title>kivitendo 3.9.2: Installation, Konfiguration,
   Entwicklung</title>
 
   <chapter id="Aktuelle-Hinweise">
@@ -18,7 +18,7 @@
 
       <listitem>
         <para>im Kunden-Forum: <ulink
-        url="http://redmine.kivitendo-premium.de/projects/forum/boards/">http://redmine.kivitendo-premium.de/projects/forum/boards/</ulink></para>
+        url="https://www.kivitendo.de/redmine/projects/forum/boards/">https://www.kivitendo.de/redmine/projects/forum/boards/</ulink></para>
       </listitem>
 
       <listitem>
@@ -29,7 +29,7 @@
       <listitem>
         <para>Im Schulungs- und Dienstleistungsangebot der entsprechenden
         kivitendo-Partner: <ulink
-        url="http://www.kivitendo.de/partner.html">http://www.kivitendo.de/partner.html</ulink></para>
+        url="https://www.kivitendo.de/partner.html">https://www.kivitendo.de/partner.html</ulink></para>
       </listitem>
     </itemizedlist>
   </chapter>
@@ -106,7 +106,7 @@
         ohne große Probleme auf den derzeit aktuellen verbreiteten
         Distributionen läuft.</para>
 
-        <para>Mitte 2020 (ab Version 3.5.6) empfehlen wir:</para>
+        <para>Mitte 2024 (ab Version 3.9) empfehlen wir:</para>
 
         <itemizedlist>
           <listitem>
@@ -114,25 +114,32 @@
 
             <itemizedlist>
               <listitem>
-                <para>10.0 "Buster"</para>
+                <para>11.0 "Bullseye"</para>
               </listitem>
               <listitem>
-                <para>11.0 "Bullseye"</para>
+                <para>12.0 "Bookworm"</para>
               </listitem>
             </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>20.04 "Focal Fossa" LTS
-          </para>
+            <para>Ubuntu</para>
+            <itemizedlist>
+             <listitem>
+              <para>20.04 "Focal Fossa" LTS</para>
+             </listitem>
+             <listitem>
+              <para>22.04 "Jammy Jellyfish" LTS</para>
+             </listitem>
+            </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>openSUSE Leap 15.x und SUSE Linux Enterprise Server 15 GA</para>
+            <para>openSUSE Leap 15.5 und SUSE Linux Enterprise Server 15 SP4</para>
           </listitem>
 
           <listitem>
-            <para>Fedora 29</para>
+            <para>Fedora 39</para>
           </listitem>
         </itemizedlist>
       </sect2>
@@ -146,12 +153,16 @@
         benötigt.</para>
 
         <para>Zusätzlich benötigt kivitendo einige Perl-Pakete, die nicht
-        Bestandteil einer Standard-Perl-Installation sind. Um zu überprüfen,
+        Bestandteil einer Standard-Perl-Installation sind. Um nach der
+	Installation von Kivitendo zu überprüfen,
         ob die erforderlichen Pakete installiert und aktuell genug sind, wird
         ein Script mitgeliefert, das wie folgt aufgerufen wird:</para>
 
         <programlisting>./scripts/installation_check.pl</programlisting>
 
+      <note id="List-Moreutils">
+        <para>Das Paket <literal>List::MoreUtils</literal> wird benötigt um das Script ausführen zu können!</para>
+      </note>
         <para>Die vollständige Liste der benötigten Perl-Module lautet:</para>
 
         <itemizedlist>
@@ -163,10 +174,6 @@
             <para><literal>Archive::Zip</literal></para>
           </listitem>
 
-          <listitem>
-            <para><literal>CAM::PDF</literal></para>
-          </listitem>
-
           <listitem>
             <para><literal>CGI</literal></para>
           </listitem>
@@ -219,14 +226,16 @@
             <para><literal>Email::MIME</literal></para>
           </listitem>
 
+          <listitem>
+            <para><literal>Encode::IMAPUTF7</literal></para>
+          </listitem>
+
           <listitem>
             <para><literal>Exception::Class</literal></para>
           </listitem>
 
           <listitem>
-            <para><literal>FCGI</literal> (nicht Versionen 0.68 bis 0.71
-            inklusive; siehe <xref
-            linkend="Apache-Konfiguration.FCGI.WebserverUndPlugin"/>)</para>
+            <para><literal>FCGI</literal></para>
           </listitem>
 
           <listitem>
@@ -293,6 +302,10 @@
             <para>LWP::UserAgent</para>
           </listitem>
 
+          <listitem>
+            <para><literal>Mail::IMAPClient</literal></para>
+          </listitem>
+
           <listitem>
             <para><literal>Net::SMTP::SSL</literal> (optional, bei
             E-Mail-Versand über SSL; siehe Abschnitt "<xref
@@ -389,8 +402,21 @@
           <listitem>
             <para><literal>YAML::XS</literal> oder <literal>YAML</literal></para>
           </listitem>
+          <listitem>
+            <para><literal>UUID::Tiny</literal></para>
+          </listitem>
         </itemizedlist>
 
+        <para>In der Version v3.9.1 sind keine neuen Pakete hinzugekommen.</para>
+
+        <para>In der Version v3.9.0 sind die folgenden Pakete hinzugekommen:
+          <literal>Mail::IMAPClient</literal>, <literal>Encode::IMAPUTF7</literal>.
+          Nicht mehr benötigt wird <literal>CAM::PDF</literal>.
+        </para>
+
+        <para>In der Version v3.8.0 sind keine neuen Pakete hinzugekommen.</para>
+
+        <para>In der Version v3.7.0 sind keine neuen Pakete hinzugekommen.</para>
 
         <para>Seit Version größer v3.6.0 sind die folgenden Pakete hinzugekommen: <literal>IPC::Run</literal></para>
 
@@ -398,7 +424,7 @@
 <literal>Rest::Client</literal><literal>Term::ReadLine::Gnu</literal></para>
 
         <para>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <literal>Try::Tiny</literal>, <literal>Math::Round</literal></para>
-        <para>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <literal>XML::LibXML</literal>, <literal>CAM::PDF</literal></para>
+        <para>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <literal>XML::LibXML</literal></para>
         <para>Seit Version größer v3.5.3 sind die folgenden Pakete hinzugekommen: <literal>Exception::Class</literal></para>
 
         <para>Seit Version größer v3.5.1 sind die folgenden Pakete hinzugekommen: <literal>Set::Infinite</literal>,
@@ -431,22 +457,20 @@
         <literal>XML::Writer</literal> sind notwendig. Ohne startet kivitendo
         nicht.</para>
 
-        <para>Gegenüber Version 2.6.1 sind <literal>parent</literal>,
-        <literal>DateTime</literal>, <literal>Rose::Object</literal>,
-        <literal>Rose::DB</literal> und <literal>Rose::DB::Object</literal>
-        neu hinzugekommen. <literal>IO::Wrap</literal> wurde entfernt.</para>
-
         <para>Gegenüber Version 2.6.3 ist <literal>JSON</literal> neu
         hinzugekommen.</para>
 
         <para><literal>Email::Address</literal> und
-        <literal>List::MoreUtils</literal> sind schon länger feste
-        Abhängigkeiten, wurden aber bisher mit kivitendo mitgeliefert. Beide
-        sind auch in 2.6.1 weiterhin mit ausgeliefert, wurden in einer
-        zukünftigen Version aber aus dem Paket entfernt werden. Es wird
+        <literal>List::MoreUtils</literal> wurden aus dem Lieferumfang entfernt. Es wird
         empfohlen diese Module zusammen mit den anderen als Bibliotheken zu
         installieren.</para>
 
+        <para>Gegenüber Version 2.6.1 sind <literal>parent</literal>,
+        <literal>DateTime</literal>, <literal>Rose::Object</literal>,
+        <literal>Rose::DB</literal> und <literal>Rose::DB::Object</literal>
+        neu hinzugekommen. <literal>IO::Wrap</literal> wurde entfernt.</para>
+
+
         <sect3>
           <title>Debian und Ubuntu</title>
           <para>Für Debian und Ubuntu stehen die meisten der benötigten
@@ -468,9 +492,10 @@
   libdatetime-set-perl libset-infinite-perl liblist-utilsby-perl \
   libdaemon-generic-perl libfile-flock-perl libfile-slurp-perl \
   libfile-mimeinfo-perl libpbkdf2-tiny-perl libregexp-ipv6-perl \
-  libdatetime-event-cron-perl libexception-class-perl libcam-pdf-perl \
+  libdatetime-event-cron-perl libexception-class-perl \
   libxml-libxml-perl libtry-tiny-perl libmath-round-perl \
-  libimager-perl libimager-qrcode-perl librest-client-perl libipc-run-perl
+  libimager-perl libimager-qrcode-perl librest-client-perl libipc-run-perl \
+  libencode-imaputf7-perl libmail-imapclient-perl libuuid-tiny-perl
           </programlisting>
 
           <para>Sollten Pakete nicht zu Verfügung stehen, so können diese auch mittels CPAN installiert werden. Ferner muss für Ubuntu das Repository "Universe" aktiv sein (s.a. Anmerkungen).</para>
@@ -501,35 +526,36 @@
         </sect3>
 
         <sect3>
-          <title>openSUSE Leap 15.x und SUSE Linux Enterprise Server 15 GA</title>
+          <title>openSUSE Leap 15.4 und SUSE Linux Enterprise Server 15</title>
 
-          <para>Für openSUSE Leap 15.x stehen die meisten der benötigten Perl-Pakete als RPM-Pakete zur Verfügung.</para>
+          <para>Für openSUSE Leap 15.4, sowie SLES 15 stehen alle benötigten Perl-Pakete als RPM-Pakete zur Verfügung.</para>
           <para>Damit diese installiert werden können, muß das System die erforderlichen Repositories kennen und Zugriff über das Internet darauf haben.</para>
           <para>Daher machen wir die Repositories dem System bekannt.</para>
           <para>Um die zusätzlichen Repositories für die Installation zur Verfügung zu stellen, kann man diese mit YaST oder auch in einem Terminal auf der Konsole bekannt geben. Wir beschränken uns hier mit der Eingabe auf der Konsole. In den allermeisten Fällen verwenden die Administratoren eine sichere SSH-Verbindung zum zu administrierenden Server.</para>
           <para>Dazu geben wir folgenden Befehl ein:</para>
-          <programlisting>zypper addrepo -f \
-  http://download.opensuse.org/repositories/devel:languages:perl/openSUSE_Leap_15.2/ \
-  "devel:languages:perl"
-          </programlisting>
-          <programlisting>zypper addrepo -f \
-  https://download.opensuse.org/repositories/devel:languages:haskell:lts:13/\
-  openSUSE_Leap_15.0/ "devel:languages:haskell:lts:13"
-          </programlisting>
-          <programlisting>zypper addrepo -f \
-  https://download.opensuse.org/repositories/devel:languages:haskell:lts:13/\
-  openSUSE_Leap_15.0/ "devel:languages:haskell:lts:13"
-          </programlisting>
+
+          <para>Das ERP kivitendo Repository:</para>
+
+          <programlisting>zypper addrepo -f -p 90 \
+  http://download.opensuse.org/repositories/Application:/ERP:/kivitendo/15.4/ \
+  "OSS-15.4-App_ERP_kivitendo"</programlisting>
+
+          <para>Das ERP kivitendo Evaluation Repository:</para>
+
+          <programlisting>zypper addrepo -f -p 90 \
+  http://download.opensuse.org/repositories/Application:/ERP:/kivitendo:/eval/15.4/ \
+  "OSS-15.4-App_ERP_kivitendo_eval"</programlisting>
+
           <para>Danach geben wir noch die beiden folgenden Befehle ein:</para>
           <programlisting>zypper clean</programlisting>
           <programlisting>zypper refresh</programlisting>
-          <para>Sollte zypper eine Meldung ausgeben, ob der Repositorie Key abgelehnt, nicht vertraut oder für immer akzeptiert werden soll, ist die Beantwortung durch drücken der "i" Taste am besten geeignet. Wer noch mehr über zypper erfahren möchte, kann sich einmal die zypper Hilfe anschauen.</para>
+          <para>Sollte zypper eine Meldung ausgeben, ob der Repository Key abgelehnt, nicht vertraut oder für immer akzeptiert werden soll, ist die Beantwortung durch drücken der "i" Taste am besten geeignet. Wer noch mehr über zypper erfahren möchte, kann sich einmal die zypper Hilfe anschauen.</para>
           <programlisting>zypper --help</programlisting>
           <note>
-          <para>Offiziell wird von openSUSE nur noch Versionen ab 15.2 unterstützt. Die SuSE Macher haben ab Version 15.x einen großen Umbau in der Verwaltung der Pakete vorgenommen, das heißt, der Paketumfang ist der SLES 15 als Programmunterbau angepasst. Dies gilt besonders der openSUSE Distribution. Es gibt ja einmal die openSUSE Distri und die Professionelle SLES Version. Dadurch sind viele Pakete aus dem ursprünglich nur für die openSUSE geltenen Repositorie enfernt worden, aber auch viele auf aktuellem Stand gehalten.</para>
+          <para>Offiziell wird von openSUSE nur noch Versionen ab 15.4 unterstützt. Die SuSE Macher haben ab Version 15.x einen großen Umbau in der Verwaltung der Pakete vorgenommen, das heißt, der Paketumfang ist der SLE 15 als Programmunterbau angepasst. Dies gilt besonders der openSUSE Distribution. Es gibt ja einmal die openSUSE Distri und die professionelle SLE (SUSE Linux Enterprise) Version. Dadurch sind viele Pakete aus dem ursprünglich nur für die openSUSE geltenen Repository enfernt worden, aber auch viele auf aktuellem Stand gehalten. Mit der openSUSE Leap 15.4 ist es dem Benutzer ganz einfach gemacht worden zur professionellen SUSE Linux Enterprise zu wechseln, da die RPM Paketbasis identisch ist.</para>
           </note>
-          <para>Ab openSUSE Leap 15.x kann man die Distribution auch als reine Text Version, also ohne KDE Oberfläche aufsetzen. Vorteil hierbei ist, dass weniger Balast und unnötige Pakte installiert werden.</para>
-          <para>Bei openSUSE Versionen bis 15.x, also 10.x, 11.x, 12.x, 13.x hatte der Administrator die Möglichkeit, bei der Installation der Distribution die KDE Oberfläche zu aktivieren. In dieser Konstellation hat man die Möglichkeit, eine VNC Verbindung vom administrativen Client zu verwenden. Ist das nicht eingerichtet, arbeitet der Admin dann direkt am Bildschirm des Servers. Nun loggen wir uns am Server direkt ein, starten Yast2 in einer Konsole wie folgt:</para>
+          <para>Ob openSUSE Leap oder SLE, man kann die Distribution auch als reine Text Version, also ohne KDE Oberfläche aufsetzen. Vorteil hierbei ist, dass weniger Balast und unnötige Pakte installiert werden. Diese Variante wird gerne auch als 'Server', 'minimale Server' oder auch 'minmal X' Variante bezeichnet.</para>
+          <para>Als Administrator hatte man jedoch auch immer die Möglichkeit, bei der Installation der Distribution die KDE (graphische) Oberfläche zu aktivieren. In dieser Konstellation hat man die Möglichkeit, eine VNC Verbindung vom administrativen Client zu verwenden. Ist das nicht eingerichtet, arbeitet der Admin dann direkt am Bildschirm des Servers. Nun loggen wir uns am Server direkt ein, starten Yast2 in einer Konsole wie folgt:</para>
           <para>yast2 return.</para>
           <para>Oder über die Menüführung wie folgt: Ein Klick auf das runde Icon, ganz links unten in der Menüleiste, dann die Maus verfahren auf System und YaST.</para>
           <para>Im weiteren Verlauf der Installation, beschränken wir uns mit dem Installations Werkzeug zypper. Zypper ist ein Komandozeilen basiertes Installations Tool, welches bei openSUSE Standard ist. Zypper weist ein etwas eigenartiges Verhalten auf, dass sich in etwa wie folgt darstellt. Hat man die Repositories eingerichtet, kann man diese mit Yast als auch mit Zypper benutzen, setzt man einen Befehl wie etwa: zypper up ab, so findet zypper mehr neuere Programmversionen als Yast. Ich habe im allgemeinen noch keine Nachteile damit erlebt.</para>
@@ -537,55 +563,11 @@
           <para>zypper install Paketname</para>
           <para>Es wird empfohlen zusätzliche Pakete nicht direkt mit CPAN zu installieren, da man diese auch über andere Repositories beziehen kann, die bei openSUSE zur Verfügung stehen. Dadurch hat man den Vorteil, dass die Pakete mit YaST verwaltet werden, also wieder deinstalliert oder durch neuere ersetzt werden können. Zudem kann man auch noch eventuelle Bugs an openSUSE senden und diese dem Maintainer melden.</para>
 
-          <programlisting>zypper install perl-threads-shared ghc-pdfinfo apache2-mod_fcgid \
-  yast2-http-server postgresql-server postgresql-contrib perl-Algorithm-CheckDigits \
-  perl-Archive-Zip perl-CGI perl-CGI-Ajax perl-Clone \
-  perl-Config-Std perl-Class-XSAccessor perl-Daemon-Generic perl-DateTime \
-  perl-DateTime-Event-Cron perl-DateTime-Format-Strptime perl-DateTime-Set \
-  perl-DBI perl-DBD-Pg perl-Devel-REPL perl-FastCGI perl-Email-Address \
-  perl-Email-MIME perl-Email-MIME-ContentType perl-Email-MIME-Encodings \
-  perl-FCGI perl-File-Copy-Recursive perl-File-Flock perl-File-MimeInfo \
-  perl-File-Slurp perl-GD perl-HTML-Restrict perl-Image-Info \
-  perl-JSON perl-List-MoreUtils perl-List-UtilsBy perl-Log-Log4perl perl-Net-LDAP-Server \
-  perl-Net-SSLGlue perl-Net-SMTP-SSL perl-PBKDF2-Tiny perl-PDF-API2 \
-  perl-Params-Validate perl-Regexp-IPv6 perl-Rose-DB perl-Rose-Object \
-  perl-Rose-DB-Object perl-MooseX-Role-Cmd perl-Set-Crontab perl-Set-Infinite \
-  perl-Sort-Naturally perl-String-ShellQuote perl-Sys-CPU perl-Template-Toolkit \
-  perl-Text-CSV_XS perl-Test-Deep perl-Test-Output perl-Text-Iconv \
-  perl-Text-Unidecode perl-URI perl-URI-Find perl-XML-Writer \
-  perl-YAML perl-libwww-perl
-          </programlisting>
-
-          <para>Für die Entwickler installiert man noch die folgenden Pakete:</para>
-
-          <programlisting>zypper install ghc-mtl-devel ghc-old-locale-devel \
-  ghc-process-extras-devel ghc-rpm-macros ghc-text-devel ghc-time-devel \
-  ghc-Cabal-devel ghc-time-locale-compat-devel perl-Log-Log4perl ghc-pdfinfo \
-  ghc-pdfinfo-devel perl-Devel-REPL perl-URI-Find perl-Class-Utils \
-  perl-Error-Pure perl-File-Object perl-Readonly perl-Test-Warnings \
-  perl-Test-NoWarnings perl-Test-Deep perl-Test-Output perl-Test-Strict \
-  perl-Test-LongString perl-File-Find-Rule
-          </programlisting>
-
-          <para>Zusätzlich müssen einige Pakete für den Umgang mit Latex installiert werden. Die Latex Module barcodes sind nützliche Helfer um auch Barcodes im Dokument zu platzieren, der Vollständigkeit halber hier für die Installation mit angegeben.
-              Dazu können Sie die folgenden Befehle nutzen:</para>
-
-          <programlisting>zypper install texlive-wallpaper texlive-colortbl \
-  texlive-scrlttr2copy texlive-eurosym \
-  texlive-geometry texlive-german texlive-graphbox texlive-hyperref \
-  texlive-xifthen texlive-luainputenc texlive-lastpage texlive-ltabptch \
-  texlive-nomentbl texlive-threeparttablex texlive-substr texlive-tabulary \
-  texlive-ulem texlive-wallpaper texlive-xcolor texlive-xstring \
-  texlive-xypic texlive-mwe texlive-mweights texlive-barcodes \
-  texlive-GS1 texlive-ean texlive-makebarcode texlive-pst-barcode \
-  texlive-upca
-          </programlisting>
+          <programlisting>zypper install kivitendo-erp</programlisting>
 
-          <para>Zusätzlich müssen einige Pakete aus dem CPAN installiert
-          werden. Dazu können Sie die folgenden Befehle anwenden:</para>
+          <para>Für Entwickler installiert man noch das folgende Paket:</para>
 
-          <programlisting>cpan DateTime::event::Cron DateTime::Set FCGI \
-  HTML::Restrict PBKDF2::Tiny Rose::Db::Object Set::Infinite</programlisting>
+          <programlisting>zypper install kivitendo-erp-devel</programlisting>
         </sect3>
       </sect2>
 
@@ -602,65 +584,73 @@
         </itemizedlist>
         <para>Debian und Ubuntu: <programlisting>apt install postgresql-contrib poppler-utils</programlisting></para>
         <para>Fedora: <programlisting>dnf install poppler-utils postgresql-contrib</programlisting></para>
-        <para>openSUSE: <programlisting>zypper install poppler-tools</programlisting></para>
+        <para>openSUSE:<programlisting>Nicht notwendig, da poppler-utils bereits i.v.m. kivitendo-erp installiert wird</programlisting></para>
       </sect2>
     </sect1>
+    <sect1 id="Installation mittels Ansible"
+           xreflabel="Installation mittels Ansible">
+      <title>Installation mittels Ansible auf Ubuntu 22.04</title>
+      <para>
+        Ansible ist ein Open-Source-Automatisierungstool, das verwendet
+        wird, um die Bereitstellung, Konfiguration und Verwaltung von
+        IT-Systemen zu automatisieren. Dabei führt es Aufgaben über SSH auf
+        entfernten Rechnern (Hosts) aus. Die Aufgaben werden dabei
+        deklarativ als YAML Dateien, den sogenannten Playbooks, übergeben.
+        Benötigt wird lediglich python und ansible ab Version 2.10.
+      </para>
+      <para>
+        Alle benötigten Konfigurationsdateien und das Playbook sind auf dem kivitendo github Account
+        unter dem Repository namens <ulink
+      url="https://github.com/kivitendo/kivitendo-ansible">kivitendo-ansible</ulink> verfügbar.
+        Das Repo kann lokal mit folgendem git-Befehl "geklont" werden:
+    <programlisting>git clone https://github.com/kivitendo/kivitendo-ansible</programlisting>
+      In diesem Repository befindet sich auch eine Readme.md, die aktuelle Installationshinweise auf englisch enthält.
+      </para>
+      <para>
+        Um die Installation zu starten,  wechseln Sie dann zunächst in den erstellten Ordner 'kivitendo-ansible' und
+        editieren die Datei inventory.
+
+        <programlisting>cd kivitendo-ansible
+vim inventory</programlisting>
+
+        Der/die Hosts auf denen Kivitendo installiert werden soll wird dann in
+        dieser Datei ('inventory') eingefügt, bspw. die
 
+        <programlisting>192.168.1.121</programlisting>
+        oder als Namen:
+        <programlisting>kivi.meine-lokale-domaene.de</programlisting>
+        Zusätzliche Parameter könnten erforderlich sein, bspw. der Benutzer für den SSH-Login:
+        <programlisting>kivi.meine-lokale-domaene.de ansible_user=myuser</programlisting>
+      </para>
+      <para>
+      Danach kann das Playbook mittels:
+      <programlisting>ansible-playbook --ask-become main.yml</programlisting>
+        ausgeführt werden, je nach Konfiguration wird man noch
+        aufgefordert das BECOME password einzutragen, hierbei handelt es
+        sich um das Passwort des Benutzers, über den die Installation dann auf dem Ziel-Rechner ausgeführt wird.
+      </para>
+      <para>
+        Nach erfolgreichen Ausführen des Playbooks ist Kivitendo dann über den Browser
+        erreichbar unter
+        <literal>http://&lt;IP des rechners&gt;/kivitendo-erp/</literal>
+      </para>
+      <para>
+        Nun muss noch eine Datenbank für Benutzer und Mandanten angelegt
+        werden. Dies kann über die Weboberfläche getan werden, indem man
+        sich mit dem Passwort <literal>admin123</literal> in der
+        Administrationsoberfläche anmeldet.
+        Weitere Details siehe Abschnitt "<xref
+            linkend="Benutzerauthentifizierung-und-Administratorpasswort"/>"
+      </para>
+    </sect1>
     <sect1 id="Manuelle-Installation-des-Programmpaketes"
            xreflabel="Manuelle Installation des Programmpaketes">
       <title>Manuelle Installation des Programmpaketes</title>
 
-      <para>Der aktuelle Stable-Release, bzw. beta Release wird bei github
-      gehostet und kann <ulink
-      url="https://github.com/kivitendo/kivitendo-erp/releases">hier</ulink>
-      heruntergeladen werden.</para>
-
-      <para>Das aktuelleste kivitendo ERP-Archiv
-      (<filename>kivitendo-erp-*.tgz</filename>) wird dann im
-      Dokumentenverzeichnis des Webservers (z.B.
-      <filename>/var/www/html/</filename>,
-      <filename>/srv/www/htdocs</filename> oder
-      <filename>/var/www/</filename>) entpackt:</para>
-
-      <programlisting>cd /var/www
-tar xvzf kivitendo-erp-*.tgz</programlisting>
-
-      <para>Wechseln Sie in das entpackte Verzeichnis:</para>
-
-      <programlisting>cd kivitendo-erp</programlisting>
+      <sect2 id="Installation-mit-git">
+	<title>Installation mit git</title>
 
-      <para>Alternativ können Sie auch einen Alias in der
-      Webserverkonfiguration benutzen, um auf das tatsächliche
-      Installationsverzeichnis zu verweisen.</para>
-
-      <para>Bei einer Neuinstallation von Version 3.1.0 oder später muß das
-      WebDAV Verzeichnis derzeit manuell angelegt werden:</para>
-
-      <programlisting>mkdir webdav</programlisting>
-
-      <para>Die Verzeichnisse <filename>users</filename>,
-      <filename>spool</filename> und <filename>webdav</filename> müssen für
-      den Benutzer beschreibbar sein, unter dem der Webserver läuft. Die
-      restlichen Dateien müssen für diesen Benutzer lesbar sein. Die Benutzer-
-      und Gruppennamen sind bei verschiedenen Distributionen unterschiedlich
-      (z.B. bei Debian/Ubuntu <constant>www-data</constant>, bei Fedora
-      <constant>apache</constant> oder bei openSUSE
-      <constant>wwwrun</constant>).</para>
-
-      <para>Der folgende Befehl ändert den Besitzer für die oben genannten
-      Verzeichnisse auf einem Debian/Ubuntu-System:</para>
-
-      <programlisting>chown -R www-data users spool webdav</programlisting>
-
-      <para>Weiterhin muss der Webserver-Benutzer in den Verzeichnissen
-      <filename>templates</filename> und <filename>users</filename>
-      Unterverzeichnisse für jeden neuen Benutzer anlegen dürfen, der in
-      kivitendo angelegt wird:</para>
-
-      <programlisting>chown www-data templates users</programlisting>
-
-      <note>
-        <para>Wir empfehlen eine Installation mittels des Versionsmanagager
+        <para>Wir empfehlen eine Installation mittels des Versionsmanager
         git. Hierfür muss ein git-Client installiert sein. Damit ist man sehr
         viel flexibler für zukünftige Upgrades. Installations-Anleitung (bitte
         die Pfade anpassen) bspw. wie folgt: <programlisting>cd /var/www/
@@ -706,7 +696,73 @@ darauf neu anzuwenden ...
 Wende an: juhu tolle änderungen
 $ service apache2 restart                   # webserver starten!
 </programlisting></para>
-      </note>
+      </sect2>
+
+      <sect2 id="Installation_mit_Github">
+        <title>Installation über die Github Website</title>
+
+        <para>Der aktuelle Stable-Release, bzw. beta Release wird bei github
+        gehostet und kann <ulink
+        url="https://github.com/kivitendo/kivitendo-erp/tags">hier</ulink>
+        heruntergeladen werden.</para>
+
+
+        <para>Das aktuelleste kivitendo ERP-Archiv
+	(<filename>kivitendo-erp-*.tgz</filename>) wird dann im
+	Dokumentenverzeichnis des Webservers (z.B.
+	<filename>/var/www/html/</filename>,
+	<filename>/srv/www/htdocs</filename> oder
+	<filename>/var/www/</filename>) entpackt:</para>
+
+        <programlisting>cd /var/www
+tar xvzf kivitendo-erp-*.tgz</programlisting>
+
+        <para>Wechseln Sie in das entpackte Verzeichnis:</para>
+
+        <programlisting>cd kivitendo-erp</programlisting>
+
+        <para>Alternativ können Sie auch einen Alias in der
+        Webserverkonfiguration benutzen, um auf das tatsächliche
+        Installationsverzeichnis zu verweisen.</para>
+      </sect2>
+
+      <sect2 id="restliche-Verzeichnisse-erstellen-und-Besitzer-ändern">
+	<title>Restliche Verzeichnisse ändern und bearbeiten</title>
+
+        <para>Die folgenden Schritte müssen nach der Installation mittels git
+	oder der Github Website angewendet werden.</para>
+
+        <para>Bei einer Neuinstallation von Version 3.1.0 oder später muss das
+	WebDAV Verzeichnis derzeit manuell angelegt werden:</para>
+
+        <programlisting>mkdir webdav</programlisting>
+
+        <para>Die Verzeichnisse <filename>users</filename>,
+        <filename>spool</filename> und <filename>webdav</filename> müssen für
+        den Benutzer beschreibbar sein, unter dem der Webserver läuft. Die
+        restlichen Dateien müssen für diesen Benutzer lesbar sein. Die Benutzer-
+        und Gruppennamen sind bei verschiedenen Distributionen unterschiedlich
+        (z.B. bei Debian/Ubuntu <constant>www-data</constant>, bei Fedora
+        <constant>apache</constant> oder bei openSUSE
+        <constant>wwwrun</constant>).</para>
+
+        <para>Der folgende Befehl ändert den Besitzer für die oben genannten
+        Verzeichnisse auf einem Debian/Ubuntu-System:</para>
+
+        <programlisting>chown -R www-data users spool webdav</programlisting>
+
+        <para>Weiterhin muss der Webserver-Benutzer in den Verzeichnissen
+        <filename>templates</filename> und <filename>users</filename>
+        Unterverzeichnisse für jeden neuen Benutzer anlegen dürfen, der in
+        kivitendo angelegt wird:</para>
+
+        <programlisting>chown www-data templates</programlisting>
+      </sect2>
+
+
+
+
+
     </sect1>
 
     <sect1 id="config.config-file">
@@ -767,6 +823,14 @@ $ service apache2 restart                   # webserver starten!
             <para><literal>authentication/database</literal></para>
           </listitem>
 
+          <listitem>
+            <para><literal>authentication/http_basic</literal></para>
+          </listitem>
+
+          <listitem>
+            <para><literal>authentication/http_headers</literal></para>
+          </listitem>
+
           <listitem>
             <para><literal>authentication/ldap</literal></para>
           </listitem>
@@ -784,6 +848,16 @@ $ service apache2 restart                   # webserver starten!
             linkend="config.sending-email.smtp"/>)</para>
           </listitem>
 
+          <listitem>
+            <para><literal>imap_client</literal> (siehe Abschnitt "<xref
+            linkend="config.imap_client"/>)</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>sent_emails_in_imap</literal> (siehe Abschnitt "<xref
+            linkend="config.sent_emails_in_imap"/>)</para>
+          </listitem>
+
           <listitem>
             <para><literal>applications</literal></para>
           </listitem>
@@ -984,7 +1058,7 @@ exit </programlisting>
         Datenbank zum Beispiel:</para>
 
         <programlisting>local all kivitendo password
-host all kivitendo 127.0.0.1 255.255.255.255 password</programlisting>
+host all kivitendo 127.0.0.1 255.255.255.255 scram-sha-256</programlisting>
       </sect2>
 
       <sect2 id="Erweiterung-für-servergespeicherte-Prozeduren">
@@ -1065,200 +1139,57 @@ exit</programlisting>
     <sect1 id="Apache-Konfiguration">
       <title>Webserver-Konfiguration</title>
 
-      <sect2>
-        <title>Grundkonfiguration mittels CGI</title>
+      <para>In diesem Abschnitt wird die Konfiguration des Apache-Webservers
+      beschrieben. kivitendo wird mittels FastCGI/FCGI ausgeführt.</para>
 
-        <note>
-          <para>Für einen deutlichen Performanceschub sorgt die Ausführung
-          mittels FastCGI/FCGI. Die Einrichtung wird ausführlich im Abschnitt
-          <xref linkend="Apache-Konfiguration.FCGI"/> beschrieben.</para>
-        </note>
-
-        <para>Der Zugriff auf das Programmverzeichnis muss in der Apache
-        Webserverkonfigurationsdatei <literal>httpd.conf</literal> eingestellt
-        werden. Fügen Sie den folgenden Abschnitt dieser Datei oder einer
-        anderen Datei hinzu, die beim Starten des Webservers eingelesen
-        wird:</para>
-
-        <programlisting>AliasMatch ^/kivitendo-erp/[^/]+\.pl /var/www/kivitendo-erp/dispatcher.pl
-Alias /kivitendo-erp/ /var/www/kivitendo-erp/
+      <para>Es ist empfehlenswert, SSL einzusetzen, um die Daten per HTTPS
+      verschlüsselt zwischen Browser und Webserver über das Netzwerk zu
+      übertragen. Eine Möglichkeit dazu ist das Erstellen eines self-signed
+      SSL Zertifikates, was unter Debian/Ubuntu durch Installieren des Pakets
+      <literal>ssl-cert</literal> geschehen kann.</para>
 
-&lt;Directory /var/www/kivitendo-erp&gt;
- AddHandler cgi-script .pl
- Options ExecCGI Includes FollowSymlinks
-&lt;/Directory&gt;
+      <para>Der Zugriff auf den Installationspfad von kivitendo im Dateisystem
+      muss in der Apache Webserverkonfigurationsdatei eingestellt werden,
+      welche beim Starten des Webservers eingelesen wird. Wird SSL/HTTPS
+      eingesetzt, so ist dies die Datei <literal>default-ssl.conf</literal>,
+      für unverschlüsseltes HTTP ist es die Datei
+      <literal>000-default.conf</literal>.</para>
 
-&lt;Directory /var/www/kivitendo-erp/users&gt;
- Require all granted
-&lt;/Directory&gt;</programlisting>
+      <para>Bitte konsultieren Sie die Dokumentation des Apache-Webservers und
+      Ihres Betriebssystems. Es kann erforderlich sein, das SSL-Modul und die
+      Webserverkonfigurationsdatei zu aktivieren:</para>
 
-        <para>Ersetzen Sie dabei die Pfade durch diejenigen, in die Sie vorher
-        das kivitendo-Archiv entpacket haben.</para>
+      <programlisting>a2enmod ssl
+a2ensite default-ssl</programlisting>
 
-        <note>
-          <para>Vor den einzelnen Optionen muss bei einigen Distributionen ein
-          Plus ‘<literal>+</literal>’ gesetzt werden.</para>
-
-          <para>Bei einigen Distribution (Ubuntu ab 14.04, Debian ab 8.2) muss
-          noch explizit das cgi-Modul mittels <programlisting>a2enmod cgi</programlisting>
-          aktiviert werden.</para>
-        </note>
-
-        <para>Auf einigen Webservern werden manchmal die Grafiken und
-        Style-Sheets nicht ausgeliefert. In solchen Fällen hat es oft
-        geholfen, die folgende Option in die Konfiguration aufzunehmen:</para>
-
-        <programlisting>EnableSendfile Off</programlisting>
-      </sect2>
+      <para>Unter Fedora und openSUSE müssen weiterhin in der Firewall die
+      Ports 80 (HTTP) bzw. 443 (HTTPS) geöffnet werden.</para>
 
       <sect2 id="Apache-Konfiguration.FCGI"
              xreflabel="Konfiguration für FastCGI/FCGI">
         <title>Konfiguration für FastCGI/FCGI</title>
 
-        <sect3 id="Apache-Konfiguration.FCGI.WasIstEs">
-          <title>Was ist FastCGI?</title>
-
-          <para>Direkt aus <ulink
-          url="http://de.wikipedia.org/wiki/FastCGI">Wikipedia</ulink>
-          kopiert:</para>
-
-          <para><citation> FastCGI ist ein Standard für die Einbindung
-          externer Software zur Generierung dynamischer Webseiten in einem
-          Webserver. FastCGI ist vergleichbar zum Common Gateway Interface
-          (CGI), wurde jedoch entwickelt, um dessen Performance-Probleme zu
-          umgehen. </citation></para>
-        </sect3>
-
-        <sect3 id="Apache-Konfiguration.FCGI.Warum">
-          <title>Warum FastCGI?</title>
-
-          <para>Perl Programme (wie kivitendo eines ist) werden nicht statisch
-          kompiliert. Stattdessen werden die Quelldateien bei jedem Start
-          übersetzt, was bei kurzen Laufzeiten einen Großteil der Laufzeit
-          ausmacht. Während SQL Ledger einen Großteil der Funktionalität in
-          einzelne Module kapselt, um immer nur einen kleinen Teil laden zu
-          müssen, ist die Funktionalität von kivitendo soweit gewachsen, dass
-          immer mehr Module auf den Rest des Programms zugreifen. Zusätzlich
-          benutzen wir umfangreiche Bibliotheken um Funktionaltät nicht selber
-          entwickeln zu müssen, die zusätzliche Ladezeit kosten. All dies
-          führt dazu dass ein kivitendo Aufruf der Kernmasken mittlerweile
-          deutlich länger dauert als früher, und dass davon 90% für das Laden
-          der Module verwendet wird.</para>
-
-          <para>Mit FastCGI werden nun die Module einmal geladen, und danach
-          wird nur die eigentliche Programmlogik ausgeführt.</para>
-        </sect3>
-
-        <sect3 id="Apache-Konfiguration.FCGI.WebserverUndPlugin">
-          <title>Getestete Kombinationen aus Webservern und Plugin</title>
-
-          <para>Folgende Kombinationen sind getestet:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Apache 2.4.7 (Ubuntu 14.04.2 LTS) und mod_fcgid.</para>
-            </listitem>
-            <listitem>
-              <para>Apache 2.4.18 (Ubuntu 16.04 LTS) und mod_fcgid</para>
-            </listitem>
-            <listitem>
-              <para>Apache 2.4.29 (Ubuntu 18.04 LTS) und mod_fcgid</para>
-            </listitem>
-             <listitem>
-              <para>Apache 2.4.41 (Ubuntu 20.04 LTS) und mod_fcgid</para>
-            </listitem>
-
-          </itemizedlist>
-
-          <para>Als Perl Backend wird das Modul <filename>FCGI.pm</filename>
-          verwendet.</para>
-
-          <warning>
-            <para>FCGI-Versionen ab 0.69 und bis zu 0.71 inklusive sind extrem
-            strict in der Behandlung von Unicode, und verweigern bestimmte
-            Eingaben von kivitendo. Falls es Probleme mit Umlauten in Ihrer
-            Installation gibt, muss zwingend Version 0.68 oder aber Version
-            0.72 und neuer eingesetzt werden.</para>
-
-            <para>Mit <ulink url="http://www.cpan.org">CPAN</ulink> lässt sie
-            sich die Vorgängerversion wie folgt installieren:</para>
-
-            <programlisting>force install M/MS/MSTROUT/FCGI-0.68.tar.gz</programlisting>
-          </warning>
-        </sect3>
-
-        <sect3 id="Apache-Konfiguration.FCGI.Konfiguration">
-          <title>Konfiguration des Webservers</title>
-
-          <para>Bevor Sie versuchen, eine kivitendo Installation unter FCGI
-          laufen zu lassen, empfiehlt es sich die Installation ersteinmal
-          unter CGI aufzusetzen. FCGI macht es nicht einfach Fehler zu
-          debuggen die beim ersten aufsetzen auftreten können. Sollte die
-          Installation schon funktionieren, lesen Sie weiter.</para>
+        <para>Mit FastCGI wird der kivitendo-Programmcode beim Start des
+        Webservers einmal geladen und danach wird nur die eigentliche
+        Programmlogik ausgeführt.</para>
 
-          <para>Zuerst muss das FastCGI-Modul aktiviert werden. Dies kann
-          unter Debian/Ubuntu z.B. mit folgendem Befehl geschehen:</para>
+        <para>Zuerst muss das FastCGI-Modul aktiviert werden. Dies kann
+        unter Debian/Ubuntu z.B. mit folgendem Befehl geschehen:</para>
 
-          <programlisting>a2enmod fcgid</programlisting>
+        <programlisting>a2enmod fcgid</programlisting>
 
-          <para>Die Konfiguration für die Verwendung von kivitendo mit FastCGI
-          erfolgt durch Anpassung der vorhandenen <function>Alias</function>-
-          und <function>Directory</function>-Direktiven. Dabei wird zwischen
-          dem Installationspfad von kivitendo im Dateisystem
-          ("<filename>/path/to/kivitendo-erp</filename>") und der URL
-          unterschieden, unter der kivitendo im Webbrowser erreichbar ist
-          ("<filename>/url/for/kivitendo-erp</filename>").</para>
+        <para>Die Konfiguration für die Verwendung von kivitendo mit FastCGI
+        erfolgt durch Einfügen von <function>Alias</function>-
+        und <function>Directory</function>-Direktiven. Dabei wird zwischen
+        dem Installationspfad von kivitendo im Dateisystem
+        ("<filename>/path/to/kivitendo-erp</filename>") und der URL
+        unterschieden, unter der kivitendo im Webbrowser erreichbar ist
+        ("<filename>/url/for/kivitendo-erp</filename>").</para>
 
-          <para>Folgender Konfigurationsschnipsel funktioniert mit
-          mod_fastcgi:</para>
+        <para>Folgender Konfigurationsschnipsel funktioniert mit
+        mod_fcgid:</para>
 
-          <programlisting>AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fcgi
-Alias       /url/for/kivitendo-erp/          /path/to/kivitendo-erp/
-
-&lt;Directory /path/to/kivitendo-erp&gt;
-  AllowOverride All
-  Options ExecCGI Includes FollowSymlinks
-  Require all granted
-&lt;/Directory&gt;
-
-&lt;DirectoryMatch /path/to/kivitendo-erp/users&gt;
-Require all denied
-&lt;/DirectoryMatch&gt;</programlisting>
-
-          <warning>
-            <para>Wer einen älteren Apache als Version 2.4 im Einsatz hat,
-            muss entsprechend die Syntax der Directorydirektiven verändert.
-            Statt</para>
-
-            <programlisting>Require all granted</programlisting>
-
-            <para>muß man Folgendes einstellen:</para>
-
-            <programlisting>
-  Order Allow,Deny
-  Allow from All </programlisting>
-
-            <para>und statt</para>
-
-            <programlisting>Require all denied</programlisting>
-
-            <para>muss stehen:</para>
-
-            <programlisting>
-  Order Deny,Allow
-  Deny from All </programlisting>
-          </warning>
-
-          <para>Seit mod_fcgid-Version 2.3.6 gelten sehr kleine Grenzen für
-          die maximale Größe eines Requests. Diese sollte wie folgt
-          hochgesetzt werden:</para>
-
-          <programlisting>FcgidMaxRequestLen 10485760</programlisting>
-
-          <para>Das Ganze sollte dann so aussehen:</para>
-
-          <programlisting>AddHandler fcgid-script .fpl
-AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fpl
+        <programlisting>AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fcgi
 Alias       /url/for/kivitendo-erp/          /path/to/kivitendo-erp/
 FcgidMaxRequestLen 10485760
 
@@ -1269,45 +1200,21 @@ FcgidMaxRequestLen 10485760
 &lt;/Directory&gt;
 
 &lt;DirectoryMatch /path/to/kivitendo-erp/users&gt;
-Require all denied
+  Require all denied
 &lt;/DirectoryMatch&gt;</programlisting>
 
-          <para>Hierdurch wird nur ein zentraler Dispatcher gestartet. Alle
-          Zugriffe auf die einzelnen Scripte werden auf diesen umgeleitet.
-          Dadurch, dass zur Laufzeit öfter mal Scripte neu geladen werden,
-          gibt es hier kleine Performance-Einbußen.</para>
+        <para>Hierdurch wird nur ein zentraler Dispatcher gestartet. Alle
+        Zugriffe auf die einzelnen Scripte werden auf diesen umgeleitet.
+        Dadurch, dass zur Laufzeit öfter mal Scripte neu geladen werden,
+        gibt es hier kleine Performance-Einbußen.</para>
 
-          <para>Es ist möglich, die gleiche kivitendo Version parallel unter
-          CGI und FastCGI zu betreiben. Dafür bleiben die Directorydirektiven
-          wie oben beschrieben, die URLs werden aber umgeleitet:</para>
+        <para>Seit mod_fcgid-Version 2.3.6 gelten sehr kleine Grenzen für
+        die maximale Größe eines Requests. Mit folgender Zeile wird diese
+        Grenze hochgesetzt:</para>
 
-          <programlisting># Zugriff über CGI
-Alias       /url/for/kivitendo-erp                /path/to/kivitendo-erp
-
-# Zugriff mit mod_fcgid:
-AliasMatch ^/url/for/kivitendo-erp-fcgid/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fpl
-Alias       /url/for/kivitendo-erp-fcgid/          /path/to/kivitendo-erp/</programlisting>
-
-          <para>Dann ist unter <filename>/url/for/kivitendo-erp/</filename>
-          die normale Version erreichbar, und unter
-          <constant>/url/for/kivitendo-erp-fcgid/</constant> die
-          FastCGI-Version.</para>
-        </sect3>
+        <programlisting>FcgidMaxRequestLen 10485760</programlisting>
       </sect2>
 
-      <sect2>
-       <title>Authentifizierung mittels HTTP Basic Authentication</title>
-
-       <para>
-        Kivitendo unterstützt, dass Benutzerauthentifizierung über den Webserver mittels des »Basic«-HTTP-Authentifizierungs-Schema erfolgt
-        (siehe <ulink url="https://tools.ietf.org/html/rfc7617">RFC 7617</ulink>). Dazu ist es aber nötig, dass der dabei vom Client
-        mitgeschickte Header <constant>Authorization</constant> vom Webserver an Kivitendo über die Umgebungsvariable
-        <constant>HTTP_AUTHORIZATION</constant> weitergegeben wird, was standardmäßig nicht der Fall ist. Für Apache kann dies über die
-        folgende Konfigurationsoption aktiviert werden:
-       </para>
-
-       <programlisting>SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1</programlisting>
-      </sect2>
       <sect2>
        <title>Aktivierung von mod_rewrite/directory_match für git basierte Installationen</title>
 
@@ -1334,10 +1241,10 @@ Alias       /url/for/kivitendo-erp-fcgid/          /path/to/kivitendo-erp/</prog
 
         <para>Für einen deutlichen Sicherheitsmehrwert sorgt die Ausführung
         von kivitendo nur über https-verschlüsselten Verbindungen, sowie
-        weiteren Zusatzmassnahmen, wie beispielsweise Basic Authenticate. Die
+        weiteren Zusatzmassnahmen, wie beispielsweise Basic Authentication. Die
         Konfigurationsmöglichkeiten sprengen allerdings den Rahmen dieser
         Anleitung, hier ein Hinweis auf einen entsprechenden <ulink
-        url="http://redmine.kivitendo-premium.de/boards/1/topics/142">Foreneintrag
+        url="https://www.kivitendo.de/redmine/boards/1/topics/142">Foreneintrag
         (Stand Sept. 2015)</ulink> und einen aktuellen (Stand Mai 2017) <ulink
         url="https://mozilla.github.io/server-side-tls/ssl-config-generator/">
         SSL-Konfigurations-Generator</ulink>.</para>
@@ -1573,11 +1480,12 @@ systemctl enable kivitendo-task-server.service</programlisting>
         so startet dieser nach Beendigung automatisch erneut.</para>
 
       </sect2>
-      <sect2 id="Tasks-konfigurieren">
-        <title>Exemplarische Konfiguration eines Hintergrund-Jobs, der die Jahreszahl in allen Nummernkreisen zum Jahreswechsel erhöht</title>
+    </sect1>
+      <sect1 id="Hintergrund-Jobs konfigurieren">
+        <title>Konfiguration der Hintergrund-Jobs</title>
 
         <para>Hintergrund-Jobs werden über System -> Hintergrund-Jobs und Task-Server -> Aktuelle Hintergrund-Jobs anzeigen -> Aktions-Knopf 'erfassen' angelegt. </para>
-        <para>Nachdem wir über das Menü dort angelangt sind, legen wir unseren exemplarischen Hintergrund-Jobs "Erhöhung der Nummernkreise" mit folgenden Werten an:</para>
+        <para>Nachdem wir über das Menü dort angelangt sind, legen wir hier unseren Hintergrund-Jobs an:</para>
         <itemizedlist>
           <listitem>
             <para><literal>Aktiv:</literal> Hier ein 'Ja' auswählen</para>
@@ -1586,7 +1494,7 @@ systemctl enable kivitendo-task-server.service</programlisting>
             <para><literal>Ausführungsart:</literal> 'wiederholte Ausführung' auswählen</para>
           </listitem>
           <listitem>
-            <para><literal>Paketname:</literal> 'SetNumberRange' auswählen</para>
+            <para><literal>Paketname:</literal> Hintergrundjob auswählen</para>
           </listitem>
           <listitem>
             <para><literal>Ausführungszeitplan:</literal> Hier entsprechend Werte wie in der crontab eingeben.</para><para>Syntax:</para>
@@ -1608,24 +1516,157 @@ systemctl enable kivitendo-task-server.service</programlisting>
 4 = Monat (1-12)
 5 = Wochentag (0-7, Sonntag ist 0 oder 7)
 </programlisting>
-<para>Um die Ausführung auf eine Minute vor Sylvester zu setzen, müssen die folgenden Werte eingetragen werden:</para>
+<para>Um die Ausführung auf eine Minute vor den Jahreswechsel zu setzen, müssen die folgenden Werte eingetragen werden:</para>
 <programlisting>59 23 31 12 *</programlisting>
           </listitem>
           <listitem>
-            <para><literal>Daten:</literal>In diesem Feld können optionale Parameter für den Hintergrund im JSON-Format gesetzt werden. Der Hintergrund-Job <literal>SetNumberRange</literal> akzeptiert zwei Variable nämlich <literal>digit_year</literal> sowieso <literal>multiplier</literal>.</para><para> <literal>digit_year</literal> kann zwei Werte haben entweder 2 oder 4, darüber wird gesteuert ob die Jahreszahl zwei oder vierstellig kodiert wird (für 2019, dann entweder 19 oder 2019). Der Standardwert ist vierstellig.</para><para> <literal>multiplier</literal> ist ein Vielfaches von 10, darüber wird die erste Nummer im Nummernkreis (die Anzahl der Stellen) wie folgt bestimmt:</para>
-<programlisting>
+            <para><literal>Daten:</literal>In diesem Feld können optionale Parameter für den Hintergrund im YAML-Format gesetzt werden.</para>
+            </listitem>
+        </itemizedlist>
+<sect2 id="Hintergrund-Job SetNumberRange">
+  <title>SetNumberRange</title>
+  <para>Der Hintergrund-Job <literal>SetNumberRange</literal> kann entweder jährlich oder monatlich/täglich den Nummernkreis verändern. Der Standardmodus 'jährlich' kodiert die nächste Jahreszahl in alle Nummernkreise und initialisiert diese von Beginn, bpsw. 202500001. Zusätzlich bleiben Präfixe in den Nummernkreis erhalten und es gibt drei konfigurierbare Parameter in diesem Modus:</para>
+  <para>Der jährliche Modus (default) akzeptiert im Feld <literal>Daten</literal> drei optionale Parameter, nämlich <literal>digit_year</literal>, <literal>multiplier</literal> so wie <literal>current_year</literal>.</para><para> <literal>digit_year</literal> kann zwei Werte haben entweder 2 oder 4, darüber wird gesteuert ob die Jahreszahl zwei oder vierstellig kodiert wird (für 2019, dann entweder 19 oder 2019). Der Standardwert ist vierstellig.</para><para> <literal>multiplier</literal> ist ein Vielfaches von 10, darüber wird die erste Nummer im Nummernkreis (die Anzahl der Stellen) wie folgt bestimmt:</para>
+  <programlisting>
 multiplier     Nummernkreis 2020
 10        ->   20200
 100       ->   202000
 1000      ->   2020000
 </programlisting>
+<para>Falls der Parameter <literal>current_year</literal> bspw. so gesetzt ist:
+<programlisting>current_year: 1</programlisting>
+ wird der Nummernkreis nicht um eins hochgezählt. Das ist sinnvoll wenn vom 31.12. auf den 01.01. sowieso keine Rechnungsläufe stattfinden und man die Nummernkreise dann am 01.01. des neuen Jahres automatisch hochsetzen möchte. </para>
+
 <para>Wir gehen jetzt beispielhaft von einer letzten Rechnungsnummer von RE2019456 aus. Demnach sollte ab Januar 2020 die erste Nummer RE2020001 sein. Da der Task auch Präfixe berücksichtigt, kann dies mit folgenden JSON-kodierten Werten umgesetzt werden:</para>
 <para><literal>Daten:</literal></para><programlisting>multiplier: 100
 digits_year: 4</programlisting>
+<para>Dieser Job müsste dann zwingend vor Mitternacht des 31.12. ausgeführt werden.</para>
+<para><literal>Daten:</literal></para><programlisting>multiplier: 100
+digits_year: 4
+current_year: 1</programlisting>
+<para>Mit dieser Einstellung kann der Job auf 00:01h des 01.01. gesetzt werden.</para>
+<para>Der (wahrscheinliche) monatliche Modus wird über den Parameter <literal>monthly</literal> gesteuert und erzeugt standardmäßig folgende Nummernkreise JJ-MM-000, bspw. am 01.04.2025 25-04-000. Dieser Modus akzeptiert die zwei optionalen Parameter <literal>monthly_postfix</literal> für die Überlagerung am Ende der Zeichenkette und <literal>monthly_strftime</literal> für die beliebige Formatierung der strftime C-Methode, s.a. <ulink url='https://metacpan.org/pod/DateTime#strftime-Patterns'>strftime-Patterns</ulink>.
+Folgende Parameter erzeugen am 01.04.2025 folgenden Nummernkreis: 2025-04-01-A0001.
+<para><literal>Daten:</literal></para>
+<programlisting>
+monthly: 1
+monthly_postfix: '-A0001'
+monthly_strftime: '%Y-%m-%d'
+</programlisting>
+</para>
+
+        </sect2>
+        <sect2 id="Hintergrund-Job ImportRecordEmails">
+  <title>ImportRecordEmails</title>
+<para> Der Hintergrund-Job <literal>ImportRecordEmails</literal> kann vollständig über das Feld Daten konfiguriert werden. Er benötigt folgende Variablen:</para>
+  <itemizedlist>
+          <listitem>
+            <para><literal>hostname:</literal> Hier wird der E-Mail-Server (IMAP) eingetragen</para>
+          </listitem>
+          <listitem>
+            <para><literal>username:</literal> Benutzername, für den IMAP-Server (häufig die E-Mail-Adresse)</para>
+          </listitem>
+          <listitem>
+            <para><literal>password:</literal> Passwort des Benutzers</para>
+          </listitem>
+          <listitem>
+            <para><literal>folder:</literal> Hier wird der Ordner eingetragen, aus dem die E-Mails importert werden sollen, bspw. 'INBOX'</para>
+          </listitem>
+          <listitem>
+            <para><literal>port:</literal> Port am E-Mail-Server. Default ist 993</para>
+          </listitem>
+          <listitem>
+            <para><literal>ssl:</literal> Gibt an ob SSL verwendet werden soll. Default: 1</para>
           </listitem>
         </itemizedlist>
-     </sect2>
-    </sect1>
+
+    <para> Optional können außerdem folgende Variablen verwendet werden:</para>
+
+    <itemizedlist>
+          <listitem>
+            <para><literal>email_import_ids_to_delete:</literal> Hier können IDs von Importen eingetragen werden, deren E-Mails aus dem E-Mail-Journal gelöscht werden sollen.</para>
+          </listitem>
+          <listitem>
+            <para><literal>process_imported_emails:</literal> Wenn nach dem Import noch weitere Verarbeitung der angehangenen Dokumente erfolgen soll, müssen hier die jeweiligen Schritte eingetragen werden. Aktuell ist es möglich, dass angehangene ZUGFeRD-Rechnung direkt verbucht und mit der E-Mail verknüpft werden. Dazu muss hier 'zugferd' eingetragen werden.</para>
+          </listitem>
+          <listitem>
+            <para><literal>processed_imap_flag:</literal> Das hier eingetragenen Flag wird nach dem Verarbeiten in der E-Mail auf den IMAP-Server gesetzt.</para>
+          </listitem>
+          <listitem>
+            <para><literal>not_processed_imap_flag:</literal> Dieses Flag wird gesetzt, wenn die E-Mail nicht verarbeitet werden konnte.</para>
+          </listitem>
+          <listitem>
+            <para><literal>record_type:</literal> Einträge im E-Mail-Journal können direkt einem Belegtypen zugeordnet werden. Wenn alle E-Mails, die mit einem Hintergrundjob importiert werden, den gleichen Belegtypen haben, kann man diesen hier festlegen und alle Einträge im E-Mail-Journal werden entsprechend zugeordnet. Für Eingangsrechnungen kann man hier bspw. 'ap_transaction' setzen.</para>
+          </listitem>
+        </itemizedlist>
+
+    <para>Wie die IMAP Flags von den jeweiligen Clients angezeigt und eingerichtet werden, ist aktuell im Thunderbird (Version 115.8.0 und Version 115.8.1) und SoGo (Version 5.9.1) getestet:</para>
+
+          <para>In Thunderbird heißen die Flags Schlagwörter. In unseren beiden Testfälle, war das Verfahren unterschiedlich:</para>
+<para>Thunderbird 115.8.0:  Sie werden durchnummeriert mit dem Prefix "$label". Über die Einstellungen kann man Schlagwort und Farbe für den jeweiligen Tag setzen und berabeiten. Um die vordefenierten Tags in Thunderbird zu nutzen kann man $label1 - $label5 nutzen. Eigene Labels werden dann von thunderbird automatisch hochgezählt. Um das korrekte Tag für ein Label zu finden oder auch selbst ein Tag mit einer selbst gewählten Zahl zu definieren kann man in den Einstellunge ganz am Ende über den Button <literal>Konfiguration berabeiten...</literal> die Werte in der Kofiguration einsehen, ändern und berabeiten. Hier muss man nach <literal>mailnews.tags</literal> suchen.</para>
+<para>Thunderbird 115.8.1: Einstellungen -> Schlagwörter -> hinzufügen. Das Schlagwort wird mit dem 'Label' 'name_mit_unterstrichen' zu Verfügung gestellt. Was wirklich passiert kann man dann ganz unten in den Einstellungen unter 'Konfiguration bearbeiten' und einer darauf folgenden Filtersuche nach 'mailnews.tag' erkennen.</para>
+          <para>In SoGo kann man unter Einstellungen -> Mail -> Labels beliebige Label mit $ als Prefix anlegen und Namen und Farbe zuweisen.</para>
+          <para>Eine beispielhafte Konfiguration im YAML-Format für das Feld 'Daten' im Hintergrund-Job könnte bspw. so aussehen:
+            <programlisting>
+record_type: ap_transaction
+folder: INBOX/Eingangsrechnung
+processed_imap_flag: zugferd_verarbeitet
+not_processed_imap_flag: zugferd_geht_net
+process_imported_emails: zugferd
+hostname:  www.meine-domaene.de
+username: alpha39@meine-domaene.de
+password: supipass8
+            </programlisting>
+        </para>
+        </sect2>
+        <sect2 id="Hintergrund-Job InventoryClearAll">
+          <title>InventoryClearAll</title>
+          <para>Besteht die Anforderung, vor einer Inventur sämtliche Lagerplätze mittels Korrekturbuchungen auf Bestand 0 zu bringen, so kann dies mit dem Hintergrund-Job <literal>InventoryClearAll</literal> erledigt werden.</para>
+          <note>Damit diese Korrekturbuchungen nur einmalig auf Nutzerwunsch ausgeführt werden und nicht ausversehen periodisch das Lager leer räumen, muss die Variable <literal>correction_date</literal> auf das aktuelle Datum gesetzt sein. Die Korrekturbuchungen können nicht ohne Weiteres rückgängig gemacht werden.
+          Nachdem der Job im Menü System -> Hintergrund-Jobs und Task-Server -> Aktuelle Hintergrund-Jobs anzeigen erfasst wurde, kann er einmalig ausgeführt werden, indem beim Bearbeiten der Button <literal>Speichern und Ausführen</literal> gewählt wird.</note>
+          <para>Im Feld Daten werden folgende Variablen akzeptiert:</para>
+          <itemizedlist>
+            <listitem>
+              <para><literal>correction_date:</literal> Das aktuelle Datum in der Form <literal>YYYY-MM-DD</literal>, sonst läuft der Job nicht</para>
+            </listitem>
+            <listitem>
+              <para><literal>comment:</literal> (optional) Wird in den Korrekturbuchungen als Kommentar gesetzt. Falls kein Wert gegeben ist, wird der Kommentar <literal>vor Inventur</literal> gesetzt</para>
+            </listitem>
+            <listitem>
+              <para><literal>dry_run:</literal> (optional) Falls <literal>dry_run: 1</literal> gesetzt ist, werden keine Korrekturbuchungen ausgeführt, die notwenigen Korrekturbuchungen werden lediglich im Ergebnis des Jobs angezeigt</para>
+            </listitem>
+            <listitem>
+              <para><literal>warehouse:</literal> (optional) Schränkt die Korrekturbuchungen auf ein bestimmtes Lager ein; andernfalls werden Korrekturbuchungen für alle Lager ausgeführt</para>
+            </listitem>
+          </itemizedlist>
+          <para>Ein Konfigurationsbeispiel ist:</para>
+          <programlisting>
+correction_date: 2025-03-11
+comment: vor Inventur
+dry_run: 1
+# warehouse: Stahllager Industriepark Gallin
+          </programlisting>
+        </sect2>
+        <sect2 id="Hintergrund-Job CloseQuotations">
+          <title>CloseQuotations</title>
+          <para>Gibt es viele alte offene Preisanfragen im Einkauf und Angebote im Verkauf, so können diese komfortabel mit dem Hintergrund-Job <literal>CloseQuotations</literal> geschlossen werden.</para>
+          <para>Im Feld Daten werden folgende Variablen akzeptiert:</para>
+          <itemizedlist>
+            <listitem>
+              <para><literal>dry_run:</literal> (optional) Falls <literal>dry_run: 1</literal> gesetzt ist, werden keine Belege geschlossen, die Nummern der betroffenen Belege werden lediglich im Ergebnis des Jobs angezeigt</para>
+            </listitem>
+            <listitem>
+              <para><literal>years:</literal> (optional) Anzahl der Jahre, die offene Preisanfragen und Angebote alt sein müssen, damit sie geschlossen werden. Standardwert: <literal>years: 1</literal> (ein Jahr)</para>
+            </listitem>
+          </itemizedlist>
+          <para>Ein Konfigurationsbeispiel ist:</para>
+          <programlisting>
+dry_run: 1
+years: 1
+          </programlisting>
+        </sect2>
+     </sect1>
+
     <sect1 id="Benutzerauthentifizierung-und-Administratorpasswort">
       <title>Benutzerauthentifizierung und Administratorpasswort</title>
 
@@ -1645,8 +1686,8 @@ digits_year: 4</programlisting>
         Datenbank, in der sowohl die Benutzerinformationen als auch die Daten
         abgelegt werden.</para>
 
-        <para>Zusätzlich ermöglicht es kivitendo, dass die Benutzerpasswörter gegen die Authentifizierungsdatenbank oder gegen einen oder
-        mehrere LDAP-Server überprüft werden.</para>
+        <para>Zusätzlich ermöglicht es kivitendo, dass die Benutzerpasswörter gegen verschiedene Authentifizierungsmethoden geprüft
+        werden. Dazu zählen die Authentifizierungsdatenbank, LDAP-Server sowie verschiedene Arten von HTTP-Header-basierten Methoden.</para>
 
         <para>Welche Art der Passwortüberprüfung kivitendo benutzt und wie
         kivitendo die Authentifizierungsdatenbank erreichen kann, wird in der
@@ -1728,128 +1769,234 @@ digits_year: 4</programlisting>
       <sect2 id="Passwortüberprüfung">
         <title>Passwortüberprüfung</title>
 
-        <para>kivitendo unterstützt Passwortüberprüfung auf zwei Arten: gegen
-        die Authentifizierungsdatenbank und gegen externe LDAP- oder
-        Active-Directory-Server. Welche davon benutzt wird, regelt der
-        Parameter <varname>module</varname> im Abschnitt
-        <varname>[authentication]</varname>.</para>
+        <para>kivitendo unterstützt verschiedene Module für die Passwortüberprüfung. Welche benutzt wird, regelt der Parameter
+        <varname>module</varname> im Abschnitt <varname>[authentication]</varname>.</para>
 
         <para>Dieser Parameter listet die zu verwendenden Authentifizierungsmodule auf. Es muss mindestens ein Modul angegeben werden, es
         können aber auch mehrere angegeben werden. Weiterhin ist es möglich, das LDAP-Modul mehrfach zu verwenden und für jede Verwendung
         eine unterschiedliche Konfiguration zu nutzen, z.B. um einen Fallback-Server anzugeben, der benutzt wird, sofern der Hauptserver
         nicht erreichbar ist.</para>
 
-        <para>Sollen die Benutzerpasswörter in der Authentifizierungsdatenbank geprüft werden, so muss der Parameter
-        <varname>module</varname> das Modul <literal>DB</literal> enthalten. Sofern das Modul in der Liste enthalten ist, egal an welcher
-        Position, können sowohl der Administrator als auch die Benutzer selber ihre Passwörter in kivitendo ändern.</para>
+        <para>Verfügbare Module sind:</para>
 
-        <para>Wenn Passwörter gegen einen oder mehrere externe LDAP- oder Active-Directory-Server geprüft werden, so muss der Parameter
-        <varname>module</varname> den Wert <literal>LDAP</literal> enthalten. In diesem Fall müssen zusätzliche Informationen über den
-        LDAP-Server im Abschnitt <literal>[authentication/ldap]</literal> angegeben werden. Das Modul kann auch mehrfach angegeben werden,
-        wobei jedes Modul eine eigene Konfiguration bekommen sollte. Der Name der Konfiguration wird dabei mit einem Doppelpunkt getrennt an
-        den Modulnamen angehängt (<literal>LDAP:Name-der-Konfiguration</literal>). Der entsprechende Abschnitt in der Konfigurationsdatei
-        lautet dann <literal>[authentication/Name-der-Konfiguration]</literal>.</para>
+        <itemizedlist>
+          <listitem><para><literal>DB</literal>: in Authentifizierungsdatenbank integrierte Benutzerverwaltung</para></listitem>
 
-        <para>Die verfügbaren Parameter für die LDAP-Konfiguration lauten:</para>
+          <listitem><para><literal>ldap</literal>: Bind mit User-Objekten gegen einen oder mehrere LDAP-Server</para></listitem>
 
-        <variablelist>
-          <varlistentry>
-            <term><literal>host</literal></term>
+          <listitem><para><literal>http_headers</literal>: überlässt Authenfizierung vorgelagerten Proxy-Servern &aml; übernimmt Usernamen
+          aus mitgeschickten HTTP-Headern</para></listitem>
+        </itemizedlist>
 
-            <listitem>
-              <para>Der Rechnername oder die IP-Adresse des LDAP- oder
-              Active-Directory-Servers. Diese Angabe ist zwingend
-              erforderlich.</para>
-            </listitem>
-          </varlistentry>
+        <sect3 id="Passwortüberprüfung_DB">
+          <title>Authentifizierungsdatenbank</title>
 
-          <varlistentry>
-            <term><literal>port</literal></term>
+          <para>Sollen die Benutzerpasswörter in der Authentifizierungsdatenbank geprüft werden, so muss der Parameter
+          <varname>module</varname> das Modul <literal>DB</literal> enthalten. Sofern das Modul in der Liste enthalten ist, egal an welcher
+          Position, können sowohl der Administrator als auch die Benutzer selber ihre Passwörter in kivitendo ändern.</para>
+        </sect3>
 
-            <listitem>
-              <para>Die Portnummer des LDAP-Servers; meist 389.</para>
-            </listitem>
-          </varlistentry>
+        <sect3 id="Passwortüberprüfung_LDAP">
+          <title>LDAP-Server</title>
 
-          <varlistentry>
-            <term><literal>tls</literal></term>
+          <para>Wenn Passwörter gegen einen oder mehrere externe LDAP- oder Active-Directory-Server geprüft werden, so muss der Parameter
+          <varname>module</varname> den Wert <literal>LDAP</literal> enthalten. In diesem Fall müssen zusätzliche Informationen über den
+          LDAP-Server im Abschnitt <literal>[authentication/ldap]</literal> angegeben werden. Das Modul kann auch mehrfach angegeben werden,
+          wobei jedes Modul eine eigene Konfiguration bekommen sollte. Der Name der Konfiguration wird dabei mit einem Doppelpunkt getrennt an
+          den Modulnamen angehängt (<literal>LDAP:Name-der-Konfiguration</literal>). Der entsprechende Abschnitt in der Konfigurationsdatei
+          lautet dann <literal>[authentication/Name-der-Konfiguration]</literal>.</para>
 
-            <listitem>
-              <para>Wenn Verbindungsverschlüsselung gewünscht ist, so diesen
-              Wert auf ‘<literal>1</literal>’ setzen, andernfalls auf
-              ‘<literal>0</literal>’ belassen</para>
-            </listitem>
-          </varlistentry>
+          <para>Die verfügbaren Parameter für die LDAP-Konfiguration lauten:</para>
 
-          <varlistentry>
-            <term><literal>verify</literal></term>
+          <variablelist>
+            <varlistentry>
+              <term><literal>host</literal></term>
 
-            <listitem>
-              <para>Wenn Verbindungsverschlüsselung gewünscht und der Parameter <parameter>tls</parameter> gesetzt ist, so gibt dieser
-              Parameter an, ob das Serverzertifikat auf Gültigkeit geprüft wird. Mögliche Werte sind <literal>require</literal> (Zertifikat
-              wird überprüft und muss gültig sei; dies ist der Standard) und <literal>none</literal> (Zertifikat wird nicht
-              überpfüft).</para>
-            </listitem>
-          </varlistentry>
+              <listitem>
+                <para>Der Rechnername oder die IP-Adresse des LDAP- oder
+                Active-Directory-Servers. Diese Angabe ist zwingend
+                erforderlich.</para>
+              </listitem>
+            </varlistentry>
 
-          <varlistentry>
-            <term><literal>attribute</literal></term>
+            <varlistentry>
+              <term><literal>port</literal></term>
 
-            <listitem>
-              <para>Das LDAP-Attribut, in dem der Benutzername steht, den der
-              Benutzer eingegeben hat. Für Active-Directory-Server ist dies
-              meist ‘<literal>sAMAccountName</literal>’, für andere
-              LDAP-Server hingegen ‘<literal>uid</literal>’. Diese Angabe ist
-              zwingend erforderlich.</para>
-            </listitem>
-          </varlistentry>
+              <listitem>
+                <para>Die Portnummer des LDAP-Servers; meist 389.</para>
+              </listitem>
+            </varlistentry>
 
-          <varlistentry>
-            <term><literal>base_dn</literal></term>
+            <varlistentry>
+              <term><literal>tls</literal></term>
 
-            <listitem>
-              <para>Der Abschnitt des LDAP-Baumes, der durchsucht werden soll.
-              Diese Angabe ist zwingend erforderlich.</para>
-            </listitem>
-          </varlistentry>
+              <listitem>
+                <para>Wenn Verbindungsverschlüsselung gewünscht ist, so diesen
+                Wert auf ‘<literal>1</literal>’ setzen, andernfalls auf
+                ‘<literal>0</literal>’ belassen</para>
+              </listitem>
+            </varlistentry>
 
-          <varlistentry>
-            <term><literal>filter</literal></term>
+            <varlistentry>
+              <term><literal>verify</literal></term>
 
-            <listitem>
-              <para>Ein optionaler LDAP-Filter. Enthält dieser Filter das Wort
-              <literal>&lt;%login%&gt;</literal>, so wird dieses durch den vom
-              Benutzer eingegebenen Benutzernamen ersetzt. Andernfalls wird
-              der LDAP-Baum nach einem Element durchsucht, bei dem das oben
-              angegebene Attribut mit dem Benutzernamen identisch ist.</para>
-            </listitem>
-          </varlistentry>
+              <listitem>
+                <para>Wenn Verbindungsverschlüsselung gewünscht und der Parameter <parameter>tls</parameter> gesetzt ist, so gibt dieser
+                Parameter an, ob das Serverzertifikat auf Gültigkeit geprüft wird. Mögliche Werte sind <literal>require</literal> (Zertifikat
+                wird überprüft und muss gültig sei; dies ist der Standard) und <literal>none</literal> (Zertifikat wird nicht
+                überpfüft).</para>
+              </listitem>
+            </varlistentry>
 
-          <varlistentry>
-            <term><literal>bind_dn</literal> und
-            <literal>bind_password</literal></term>
+            <varlistentry>
+              <term><literal>attribute</literal></term>
 
-            <listitem>
-              <para>Wenn der LDAP-Server eine Anmeldung erfordert, bevor er
-              durchsucht werden kann (z.B. ist dies bei
-              Active-Directory-Servern der Fall), so kann diese hier angegeben
-              werden. Für Active-Directory-Server kann als
-              ‘<literal>bind_dn</literal>’ entweder eine komplette LDAP-DN wie
-              z.B. ‘<literal>cn=Martin
-              Mustermann,cn=Users,dc=firmendomain</literal>’ auch nur der
-              volle Name des Benutzers eingegeben werden; in diesem Beispiel
-              also ‘<literal>Martin Mustermann</literal>’.</para>
-            </listitem>
-          </varlistentry>
+              <listitem>
+                <para>Das LDAP-Attribut, in dem der Benutzername steht, den der
+                Benutzer eingegeben hat. Für Active-Directory-Server ist dies
+                meist ‘<literal>sAMAccountName</literal>’, für andere
+                LDAP-Server hingegen ‘<literal>uid</literal>’. Diese Angabe ist
+                zwingend erforderlich.</para>
+              </listitem>
+            </varlistentry>
 
-          <varlistentry>
-            <term><literal>timeout</literal></term>
+            <varlistentry>
+              <term><literal>base_dn</literal></term>
 
-            <listitem>
-              <para>Timeout beim Verbindungsversuch, bevor der Server als nicht erreichbar gilt; Standardwert: 10</para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
+              <listitem>
+                <para>Der Abschnitt des LDAP-Baumes, der durchsucht werden soll.
+                Diese Angabe ist zwingend erforderlich.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>filter</literal></term>
+
+              <listitem>
+                <para>Ein optionaler LDAP-Filter. Enthält dieser Filter das Wort
+                <literal>&lt;%login%&gt;</literal>, so wird dieses durch den vom
+                Benutzer eingegebenen Benutzernamen ersetzt. Andernfalls wird
+                der LDAP-Baum nach einem Element durchsucht, bei dem das oben
+                angegebene Attribut mit dem Benutzernamen identisch ist.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>bind_dn</literal> und
+              <literal>bind_password</literal></term>
+
+              <listitem>
+                <para>Wenn der LDAP-Server eine Anmeldung erfordert, bevor er
+                durchsucht werden kann (z.B. ist dies bei
+                Active-Directory-Servern der Fall), so kann diese hier angegeben
+                werden. Für Active-Directory-Server kann als
+                ‘<literal>bind_dn</literal>’ entweder eine komplette LDAP-DN wie
+                z.B. ‘<literal>cn=Martin
+                Mustermann,cn=Users,dc=firmendomain</literal>’ auch nur der
+                volle Name des Benutzers eingegeben werden; in diesem Beispiel
+                also ‘<literal>Martin Mustermann</literal>’.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>timeout</literal></term>
+
+              <listitem>
+                <para>Timeout beim Verbindungsversuch, bevor der Server als nicht erreichbar gilt; Standardwert: 10</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </sect3>
+
+        <sect3 id="Passwortüberprüfung_HTTPHeaders">
+          <title>HTTP-Header: Username in Header</title>
+
+          <para>
+            Diese Methode der Authentifizierung überlässt einem vorgelagerten Webserver oder Proxyserver die Authentifizierung. Dazu können
+            SSO-Systeme wie z.B. Authelia oder Authentik zum Einsatz kommen. Die vorgelagerten Server übermitteln dann den Usernamen der
+            authentifizierten Person in einem speziellen HTTP-Header, der an kivitendo durchgereicht wird. Damit kivitendo nicht von
+            beliebigen Quellen aus mit so einem Usernamen aufgerufen werden kann, verlangt kivitendo weiterhin, dass in einem weiteren
+            Header ein Shared Secret übertragen wird. Dieses Secret wird vom Administrator vergeben und sollte nicht weitergegeben werden.
+          </para>
+
+          <para>
+            Über einen weiteren Header wird wiederum gesteuert, an welchem Mandanten die Anmeldung erfolgt. Dies geschieht über die
+            Datenbank-ID des Mandanten.
+          </para>
+
+          <para>
+            Um diese Methode zu aktivieren, muss das Authentifizierungsmodul auf <literal>HTTPHeaders</literal> gestellt werden. Zusätzlich
+            muss im Abschnitt <literal>authentication/http_headers</literal> der Parameter <literal>enabled=1</literal> und im Abschnitt
+            <literal>authentication/http_basic</literal> der Parameter <literal>enabled=0</literal> gesetzt werden. Die folgenden Parameter
+            müssen anschließend im Abschnitt <literal>authentication/http_headers</literal> konfiguriert werden:
+          </para>
+
+          <variablelist>
+            <varlistentry>
+              <term><literal>client_id_header</literal></term>
+
+              <listitem>
+                <para>Name des Headers, in dem das vorgelagerte System die Datenbank-ID des Mandanten überträgt.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>user_header</literal></term>
+
+              <listitem>
+                <para>Name des Headers, in dem das vorgelagerte System den Namen des authentifizierten Users überträgt.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>secret_header</literal></term>
+
+              <listitem>
+                <para>Name des Headers, in dem das vorgelagerte System das Shared Secret.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><literal>secret</literal></term>
+
+              <listitem>
+                <para>Wert des Shared Secrets selber, der vom vorgelagerten System übertragen werden muss, damit die Werte als gültig
+                angesehen werden.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </sect3>
+
+        <sect3 id="Passwortüberprüfung_HTTPBasic">
+          <title>HTTP-Header: Basic Authorization</title>
+
+          <para>
+            Diese Methode der Authentifizierung überlässt dem Webserver (meist Apache) die Authentifizierung mittels der standardisierten
+            HTTP Basic Authentication (RFC 7617). Dazu muss der Webserver so konfiguriert werden, dass er für alle kivitendo-Requests vom
+            Webbrowser Authentifizierung verlangt. Zusätzlich muss er veranlasst werden, den angegebenen Usernamen auch an kivitendo zu
+            übermitteln. Dies könnte beispielhaft wie folgt aussehen:
+          </para>
+
+          <programlisting>&lt;Directory /path/to/kivitendo-erp&gt;
+  AllowOverride All
+  Options ExecCGI Includes FollowSymlinks
+
+  # Require authentication from local user file:
+  AuthType Basic
+  AuthName "kivitendo"
+  AuthUserFile /etc/apache2/htpasswd.kivitendo
+  Require valid-user
+
+  # Pass name of authorized user to kivitendo:
+  SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+&lt;/Directory&gt;</programlisting>
+
+           <para>
+             Um diese Methode zu aktivieren, muss das Authentifizierungsmodul auf <literal>HTTPHeaders</literal> gestellt werden. Zusätzlich
+             muss im Abschnitt <literal>authentication/http_basic</literal> der Parameter <literal>enabled=1</literal> und im Abschnitt
+             <literal>authentication/http_headers</literal> der Parameter <literal>enabled=0</literal> gesetzt werden.
+           </para>
+        </sect3>
       </sect2>
 
       <sect2 id="Name-des-Session-Cookies">
@@ -2091,66 +2238,287 @@ digits_year: 4</programlisting>
       </sect2>
     </sect1>
 
-    <sect1 id="config.sending-email"
-           xreflabel="E-Mail-Versand aus kivitendo heraus">
-      <title>E-Mail-Versand aus kivitendo heraus</title>
-
-      <para>kivitendo kann direkt aus dem Programm heraus E-Mails versenden,
-      z.B. um ein Angebot direkt an einen Kunden zu verschicken. Damit dies
-      funktioniert, muss eingestellt werden, über welchen Server die E-Mails
-      verschickt werden sollen. kivitendo unterstützt dabei zwei Mechanismen:
-      Versand über einen lokalen E-Mail-Server (z.B. mit
-      <productname>Postfix</productname> oder <productname>Exim</productname>,
-      was auch die standardmäßig aktive Methode ist) sowie Versand über einen
-      SMTP-Server (z.B. der des eigenen Internet-Providers).</para>
-
-      <para>Welche Methode und welcher Server verwendet werden, wird über die
-      Konfigurationsdatei <filename>config/kivitendo.conf</filename>
-      festgelegt. Dort befinden sich alle Einstellungen zu diesem Thema im
-      Abschnitt '<literal>[mail_delivery]</literal>'.</para>
-
-      <sect2 id="config.sending-email.sendmail"
-             xreflabel="E-Mail-Versand über lokalen E-Mail-Server">
-        <title>Versand über lokalen E-Mail-Server</title>
-
-        <para>Diese Methode bietet sich an, wenn auf dem Server, auf dem
-        kivitendo läuft, bereits ein funktionsfähiger E-Mail-Server wie z.B.
-        <productname>Postfix</productname>, <productname>Exim</productname>
-        oder <productname>Sendmail</productname> läuft.</para>
-
-        <para>Um diese Methode auszuwählen, muss der Konfigurationsparameter
-        '<literal>method = sendmail</literal>' gesetzt sein. Dies ist
-        gleichzeitig der Standardwert, falls er nicht verändert wird.</para>
-
-        <para>Um zu kontrollieren, wie das Programm zum Einliefern gestartet
-        wird, dient der Parameter '<literal>sendmail = ...</literal>'. Der
-        Standardwert verweist auf das Programm
-        <filename>/usr/bin/sendmail</filename>, das bei allen oben genannten
-        E-Mail-Serverprodukten für diesen Zweck funktionieren sollte.</para>
-
-        <para>Die Konfiguration des E-Mail-Servers selber würde den Rahmen
-        dieses sprengen. Hierfür sei auf die Dokumentation des E-Mail-Servers
-        verwiesen.</para>
-      </sect2>
-
-      <sect2 id="config.sending-email.smtp"
-             xreflabel="E-Mail-Versand über einen SMTP-Server">
-        <title>Versand über einen SMTP-Server</title>
-
-        <para>Diese Methode bietet sich an, wenn kein lokaler E-Mail-Server
-        vorhanden oder zwar einer vorhanden, dieser aber nicht konfiguriert
-        ist.</para>
+    <sect1 id="Email">
+      <title>E-Mail</title>
+
+        <para>
+          kivitendo kann sowohl E-Mails direkt aus dem Programm heraus E-Mails
+          versenden, als auch in das Programm importiern. Damit dies
+          funktioniert, müssen die E-Mail-Parameter korrekt konfiguriert sein.
+          Dazu mehr in den folgenden Abschnitten.
+        </para>
+
+      <sect2 id="config.sending-email"
+             xreflabel="E-Mail-Versand aus kivitendo heraus">
+        <title>E-Mail-Versand aus kivitendo heraus</title>
+
+        <para>Das Versenden von E-Mails kann zum Verschicken von Belegen genutzt
+        werden, z.B. um ein Angebot direkt an einen Kunden zu verschicken. Damit
+        dies funktioniert, muss eingestellt werden, über welchen Server die
+        E-Mails verschickt werden sollen. kivitendo unterstützt dabei zwei
+        Mechanismen: Versand über einen lokalen E-Mail-Server (z.B. mit
+        <productname>Postfix</productname> oder <productname>Exim</productname>,
+        was auch die standardmäßig aktive Methode ist) sowie Versand über einen
+        SMTP-Server (z.B. der des eigenen Internet-Providers).</para>
+
+        <para>Welche Methode und welcher Server verwendet werden, wird über die
+        Konfigurationsdatei <filename>config/kivitendo.conf</filename>
+        festgelegt. Dort befinden sich alle Einstellungen zu diesem Thema im
+        Abschnitt '<literal>[mail_delivery]</literal>'.</para>
+
+        <sect3 id="config.sending-email.sendmail"
+               xreflabel="E-Mail-Versand über lokalen E-Mail-Server">
+          <title>Versand über lokalen E-Mail-Server</title>
+
+          <para>Diese Methode bietet sich an, wenn auf dem Server, auf dem
+          kivitendo läuft, bereits ein funktionsfähiger E-Mail-Server wie z.B.
+          <productname>Postfix</productname>, <productname>Exim</productname>
+          oder <productname>Sendmail</productname> läuft.</para>
+
+          <para>Um diese Methode auszuwählen, muss der Konfigurationsparameter
+          '<literal>method = sendmail</literal>' gesetzt sein. Dies ist
+          gleichzeitig der Standardwert, falls er nicht verändert wird.</para>
+
+          <para>Um zu kontrollieren, wie das Programm zum Einliefern gestartet
+          wird, dient der Parameter '<literal>sendmail = ...</literal>'. Der
+          Standardwert verweist auf das Programm
+          <filename>/usr/bin/sendmail</filename>, das bei allen oben genannten
+          E-Mail-Serverprodukten für diesen Zweck funktionieren sollte.</para>
+
+          <para>Die Konfiguration des E-Mail-Servers selber würde den Rahmen
+          dieses sprengen. Hierfür sei auf die Dokumentation des E-Mail-Servers
+          verwiesen.</para>
+        </sect3>
 
-        <para>Um diese Methode auszuwählen, muss der Konfigurationsparameter
-        '<literal>method = smtp</literal>' gesetzt sein. Die folgenden
-        Parameter dienen dabei der weiteren Konfiguration:</para>
+        <sect3 id="config.sending-email.smtp"
+               xreflabel="E-Mail-Versand über einen SMTP-Server">
+          <title>Versand über einen SMTP-Server</title>
+
+          <para>Diese Methode bietet sich an, wenn kein lokaler E-Mail-Server
+          vorhanden ist oder einer vorhanden, dieser aber nicht konfiguriert
+          ist.</para>
+
+          <para>Um diese Methode auszuwählen, muss der Konfigurationsparameter
+          '<literal>method = smtp</literal>' gesetzt sein. Die folgenden
+          Parameter dienen dabei der weiteren Konfiguration:</para>
+
+          <variablelist>
+            <varlistentry>
+              <term><varname>hostname</varname></term>
+
+              <listitem>
+                <para>Name oder IP-Adresse des SMTP-Servers. Standardwert:
+                '<literal>localhost</literal>'</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>port</varname></term>
+
+              <listitem>
+                <para>Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<literal>security =
+                none</literal>' oder '<literal>security = tls</literal>', so ist
+                25 die Standardportnummer. Für '<literal>security =
+                ssl</literal>' ist 465 die Portnummer. Muss normalerweise nicht
+                geändert werden.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>security</varname></term>
+
+              <listitem>
+                <para>Wahl der zu verwendenden Verschlüsselung der Verbindung
+                mit dem Server. Standardwert ist '<literal>none</literal>',
+                wodurch keine Verschlüsselung verwendet wird. Mit
+                '<literal>tls</literal>' wird TLS-Verschlüsselung eingeschaltet,
+                und mit '<literal>ssl</literal>' wird Verschlüsselung via SSL
+                eingeschaltet. Achtung: Für '<literal>tls</literal>' und
+                '<literal>ssl</literal>' werden zusätzliche Perl-Module benötigt
+                (siehe unten).</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>login</varname> und
+              <varname>password</varname></term>
+
+              <listitem>
+                <para>Falls der E-Mail-Server eine Authentifizierung verlangt,
+                so können mit diesen zwei Parametern der Benutzername und das
+                Passwort angegeben werden. Wird Authentifizierung verwendet, so
+                sollte aus Sicherheitsgründen auch eine Form von Verschlüsselung
+                aktiviert werden.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </sect3>
+
+      </sect2>
+
+      <sect2 id="config.sent_emails_in_imap"
+             xreflabel="Versendete E-Mails über IMAP exportieren">
+        <title>Versendete E-Mails über IMAP exportieren</title>
+
+        <para>
+          Es können versendete E-Mails über IMAP exportiert werden. Dazu muss
+          der entsprechende Server, auf dem die E-Mails abgelegt werden
+          sollen, konfiguriert werden. Dies geschieht in der Konfigurationsdatei
+          <filename>config/kivitendo.conf</filename> im Abschnitt
+          '<literal>[sent_emails_in_imap]</literal>'. Es können auch Server für
+          spezifische E-Mail-Adressen konfiguriert werden, indem der Abschnitt
+          kopiert wird und mit dem Namen
+          '<literal>[sent_emails_in_imap/email/EMAILADDRESS]</literal>', wobei
+          '<literal>EMAILADDRESS</literal>' die entsprechenden E-Mail-Adresse
+          ist, versehen wird.
+        </para>
+
+        <para>
+          Die Reihenfolge für die Auswahl der Konfiguration ist wie folgt:
+        </para>
+
+        <orderedlist>
+          <listitem>
+            <para> Falls es für die Absender-Adresse eine Konfiguration gibt nimm
+            diese. </para>
+          </listitem>
+          <listitem>
+            <para> Falls es es für die benutzerbezogene E-Mail-Adresse eine
+            Konfiguration gibt dann nimm diese. </para>
+          </listitem>
+          <listitem>
+            <para> Falls es eine generelle Konfiguration gibt dann nimm diese.
+            </para>
+          </listitem>
+        </orderedlist>
+
+
+        <para>Die folgenden Parameter dienen der Konfiguration:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><varname>enabled</varname></term>
+
+            <listitem>
+              <para>
+                Falls '<literal>enabled = 0</literal>' gesetzt ist, wird der
+                Export von E-Mails deaktiviert. Dies ist der Standardwert. Falls
+                '<literal>enabled = 1</literal>' gesetzt ist, wird ist der
+                Export von E-Mails aktiviert.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>hostname</varname></term>
+
+            <listitem>
+              <para>Name oder IP-Adresse des IMAP-Servers. Standardwert:
+              '<literal>localhost</literal>'</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>port</varname></term>
+
+            <listitem>
+              <para>
+                Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<literal>ssl = 1</literal>',
+                so ist 993 die Standardportnummer. Für
+                '<literal>ssl = 0</literal>' ist 143 die Portnummer. Muss
+                normalerweise nicht geändert werden.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>ssl</varname></term>
+
+            <listitem>
+              <para>
+                Wahl ob eine Verschlüsselung bei der Verbindung mit dem Server
+                verwendet wird. Standardwert ist '<literal>1</literal>',
+                wodurch eine SSL-Verschlüsselung verwendet wird. Mit
+                '<literal>0</literal>' wird keine Verschlüsselung genutzt.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>username</varname> und
+            <varname>password</varname></term>
+
+            <listitem>
+              <para>
+                Falls der IMAP-Server eine Authentifizierung verlangt, so können
+                mit diesen zwei Parametern der Nutzername und das Passwort
+                angegeben werden. Wird Authentifizierung verwendet, so sollte
+                aus Sicherheitsgründen auch Verschlüsselung aktiviert werden.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>folder</varname></term>
+
+            <listitem>
+              <para>
+                Wahl des Ordners, in den kivitendo gesendete E-Mails
+                gespeichert. Standardwert ist
+                '<literal>Sent/Kivitendo</literal>'. Ordnerhierarchien können
+                mit einem Slash ('<literal>/</literal>') getrennt werden.
+                Der gewählte Ordner muss existieren.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+
+        <para>
+          Bei einem Fehler bricht die Funktion ab und der Anwender bekommt die
+          Fehlermeldung, dass die E-Mail prinzipiell nicht verschickt werden
+          konnte. An dieser Stelle muss der kivitendo-Admin etwas genauer
+          prüfen, ob der Mail-Versand und/oder die Synchronisation den Fehler
+          verursacht hat. Ein Blick ins Email-Journal kann helfen den Fehler
+          einzuschränken.
+        </para>
+
+      </sect2>
+
+      <sect2 id="config.imap_client"
+             xreflabel="E-Mails in kivitendo importieren">
+        <title>E-Mails in kivitendo importieren</title>
+
+        <para>
+          Um E-Mails in kivitendo zu importieren, muss der entsprechende
+          Server, von dem die E-Mails abgeholt werden sollen, konfiguriert
+          werden. Dies geschieht in der Konfigurationsdatei
+          <filename>config/kivitendo.conf</filename> im Abschnitt
+          '<literal>[imap_client]</literal>'.
+        </para>
+
+        <para>Die folgenden Parameter dienen der Konfiguration:</para>
 
         <variablelist>
+          <varlistentry>
+            <term><varname>enabled</varname></term>
+
+            <listitem>
+              <para>
+                Falls '<literal>enabled = 0</literal>' gesetzt ist, wird der
+                Import von E-Mails deaktiviert. Dies ist der Standardwert. Falls
+                '<literal>enabled = 1</literal>' gesetzt ist, wird ist der
+                Import von E-Mails aktiviert.
+              </para>
+            </listitem>
+          </varlistentry>
+
           <varlistentry>
             <term><varname>hostname</varname></term>
 
             <listitem>
-              <para>Name oder IP-Adresse des SMTP-Servers. Standardwert:
+              <para>Name oder IP-Adresse des IMAP-Servers. Standardwert:
               '<literal>localhost</literal>'</para>
             </listitem>
           </varlistentry>
@@ -2159,43 +2527,87 @@ digits_year: 4</programlisting>
             <term><varname>port</varname></term>
 
             <listitem>
-              <para>Portnummer. Der Standardwert hängt von der verwendeten
-              Verschlüsselungsmethode ab. Gilt '<literal>security =
-              none</literal>' oder '<literal>security = tls</literal>', so ist
-              25 die Standardportnummer. Für '<literal>security =
-              ssl</literal>' ist 465 die Portnummer. Muss normalerweise nicht
-              geändert werden.</para>
+              <para>
+                Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<literal>ssl = 1</literal>',
+                so ist 993 die Standardportnummer. Für
+                '<literal>ssl = 0</literal>' ist 143 die Portnummer. Muss
+                normalerweise nicht geändert werden.
+              </para>
             </listitem>
           </varlistentry>
 
           <varlistentry>
-            <term><varname>security</varname></term>
+            <term><varname>ssl</varname></term>
 
             <listitem>
-              <para>Wahl der zu verwendenden Verschlüsselung der Verbindung
-              mit dem Server. Standardwert ist '<literal>none</literal>',
-              wodurch keine Verschlüsselung verwendet wird. Mit
-              '<literal>tls</literal>' wird TLS-Verschlüsselung eingeschaltet,
-              und mit '<literal>ssl</literal>' wird Verschlüsselung via SSL
-              eingeschaltet. Achtung: Für '<literal>tls</literal>' und
-              '<literal>ssl</literal>' werden zusätzliche Perl-Module benötigt
-              (siehe unten).</para>
+              <para>
+                Wahl, ob eine Verschlüsselung bei der Verbindung mit dem Server
+                verwendendet wird. Standardwert ist '<literal>1</literal>',
+                wodurch eine SSL-Verschlüsselung verwendet wird. Mit
+                '<literal>0</literal>' wird keine Verschlüsselung genutzt.
+              </para>
             </listitem>
           </varlistentry>
 
           <varlistentry>
-            <term><varname>login</varname> und
+            <term><varname>username</varname> und
             <varname>password</varname></term>
 
             <listitem>
-              <para>Falls der E-Mail-Server eine Authentifizierung verlangt,
-              so können mit diesen zwei Parametern der Benutzername und das
-              Passwort angegeben werden. Wird Authentifizierung verwendet, so
-              sollte aus Sicherheitsgründen auch eine Form von Verschlüsselung
-              aktiviert werden.</para>
+              <para>
+                Falls der IMAP-Server eine Authentifizierung verlangt, so können
+                mit diesen zwei Parametern der Nutzername und das Passwort
+                angegeben werden. Wird Authentifizierung verwendet, so sollte
+                aus Sicherheitsgründen auch Verschlüsselung aktiviert werden.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><varname>base_folder</varname></term>
+
+            <listitem>
+              <para>
+                Wahl des Ordners, den kivitendo als Basis für das Erstellen von
+                Unterordnern und das Abholen von E-Mails verwendet. Standardwert
+                ist '<literal>INBOX</literal>'. Ordnerhierarchien können mit
+                einem Slash ('<literal>/</literal>') getrennt werden. Beispiel:
+                '<literal>INBOX/kivitendo</literal>'. In diesem Ordner dürfen
+                keine Unterordner existieren und keine manuell angelegt werden.
+              </para>
             </listitem>
           </varlistentry>
         </variablelist>
+
+        <para>
+          Wenn eingeschaltet, wird beim Anlegen von Verkaufsangeboten und
+          -aufträgen ein Unterordner im E-Mail-Client für den entsprechenden
+          Beleg angelegt. E-Mails, in diesen Ordner werden automatisch beim
+          Öffnen des Belegs in kivitendo importiert. Um die E-Mails übersichtlich
+          zu halten, kann der Hintergrund-Job
+          '<literal>CleanUpEmailSubfolders</literal>' genutzt werden. Dieser
+          importiert alle E-Mails und löscht alle Unterordnern, die nicht zu
+          einem offenen Beleg gehören. Importierte E-Mails werden nicht
+          gelöscht; erst beim Löschen des Unterordners werden sie gelöscht.
+        </para>
+
+        <para>
+          Es können auch E-Mails in kivitendo importiert werden, die nicht zu
+          einem Beleg gehören. Dafür kann der Hintergrund-Job
+          '<literal>SyncEmailFolder</literal>' verwendet werden. Dieser
+          synchronisiert standartmäßig den Ordner der in
+          '<literal>base_folder</literal>' angegeben ist. Dies kann mit dem
+          Job-Parameter '<literal>folder</literal>' geändert. Die Importierten
+          E-Mails werden im E-Mail-Journal gespeichert.
+        </para>
+
+        <para>
+          Beim Umzug des E-Mail-Servers kann kivitendo schon
+          importierte E-Mails nicht mehr erkennen. Dies führt dazu, dass alle
+          E-Mails erneut importiert werden.
+        </para>
+
       </sect2>
     </sect1>
 
@@ -2208,7 +2620,7 @@ digits_year: 4</programlisting>
       debianoiden Betriebssystemen installiert man die Pakete mit:</para>
 
       <para><programlisting>apt install texlive-base-bin texlive-latex-recommended texlive-fonts-recommended \
-  texlive-latex-extra texlive-lang-german ghostscript</programlisting></para>
+  texlive-latex-extra texlive-lang-german ghostscript latexmk</programlisting></para>
 
       <para>Für Fedora benötigen Sie die folgenden Pakete:</para>
 
@@ -2280,7 +2692,338 @@ digits_year: 4</programlisting>
         vorgenommen werden. Den Ordner findet man im Dateisystem unter
         <filename>./templates/[Neuer Name]</filename></para>
       </sect2>
+ <sect2 id="Aufbau des marei Vorlagensatzes">
+  <title>Der Druckvorlagensatz marei</title>
+          <note id="marei.document.link">
+            <para>Die aktuelle Dokumentation inkl. dem Foliensatz vom kivi-Treffen im August 2023 befindet sich hier:
+            <ulink url="https://peitex.de/materialien/2023-08-04_kivitendo/"> https://peitex.de/materialien/2023-08-04_kivitendo/</ulink>
+            </para>
+          </note>
+
+  <sect3 id="Quickstart – Wo kann was angepasst werden?">
+    <title>Quickstart – Wo kann was angepasst werden?</title>
+    <note id="do-not-edit-marei">
+    <para>In keinem Fall sollten Dateien mit der Endung <filename>*.cls</filename> oder <filename>*.sty</filename> geändert werden. Durch Änderungen an diesen Dateien verhindert man Updates auf neuer Versionen.
+    Zwar kopiert kivitendo die Datei und bearbeitet diese beim Update nicht. Allerdings sind sämtliche Änderungen über die Konfigurationsdateien möglich und erhöhen die Wartbarkeit.</para>
+    </note>
+    <itemizedlist>
+      <listitem>
+        <para><filename>insettings.tex</filename> :</para>
+      </listitem>
+
+        <itemizedlist>
+        <listitem>
+          <para>Pfad zu Angaben über Mandant*innen (default: firma)</para>
+        </listitem>
+
+        <listitem>
+          <para>Logo/Briefpapier, falls für alle Mandant*innen in gleicher Struktur. Sonst in der <filename>ident.tex</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Layout der Kopf/Fußzeile</para>
+        </listitem>
+
+        <listitem>
+          <para>innerhalb dieser Datei werden auch die folgenden Dateien geladen:</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>firma/ident.tex</filename> Mandant*innenspezifische Konfiguration, Adressdaten</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>firma/$währungskürzel_account.tex</filename></para>
+        </listitem>
+        </itemizedlist>
+
+      <listitem>
+        <para>Sprache/Übersetzungen.\\Es muss mindestens eine Sprache angelegt werden!        <programlisting>
+        \item[deutsch.tex] Textschnipsel für Deutsch\\
+                              Dafür eine Sprache mit Vorlagenkürzel DE anlegen
+        \item[english.tex] Textschnipsel für Englisch\\
+                              Dafür eine Sprache mit Vorlagenkürzel EN anlegen
+        </programlisting></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Alle dokumententypspezifischen Einstellungen müssen in der jeweiligen Template-Datei modifiziert werden.</para>
+
+  </sect3>
+  <sect3 id="Aufbau">
+    <title>Aufbau</title>
+    <para>Die Grundstruktur besteht je Dokumententyp aus einer Basisdatei und verschiedenen Setup-Dateien.</para>
+
+    <para>Die Basis wurde so überarbeitet, dass Dokumente nun generell auf
+    der Dokumentenklasse <filename>scrartcl.cls</filename> basieren und
+    das Paket <filename>kiviletter.sty</filename> benutzen.</para>
+
+    <para>Mandant*innenspezifische Konfiguration findet sich in der Datei <filename>insettings.tex</filename> und
+    dem Ordner eines spezifischen Mandant*innen (default=*firma/*).</para>
+
+
+    <!-- <sect2 id="Struktur der Basisdatei (je Dokumententyp eine)">
+    <title>Struktur der Basisdatei (je Dokumententyp eine)</title>
+
+      <orderedlist>
+        <listitem>
+        <para>Dokumentenklasse</para>
+        </listitem>
+
+        <listitem>
+        <para><filename>kiviletter.sty</filename></para>
+        </listitem>
+
+        <listitem>
+        <para>Einstellungen, die über Variablen gesetzt werden: Mandant, Währung, Sprache</para>
+        </listitem>
+
+        <listitem>
+        <para><filename>insettings.tex</filename> wird geladen. Anteil der spezifischen Anpassungen, die von den Variablen unter 2. abhängig sind.
+        Geladen werden darin die Dateien:</para>
+        </listitem>
 
+        <itemizedlist>
+          <listitem>
+              <para>Sprache: lädt die entsprechende Sprachdatei <filename>deutsch.tex</filename> (DE) oder  <filename>englisch.tex</filename> (EN) und setzt die babel Optionen.
+              Die Datei enthält Übersetzungen von Einzelbegriffen und Textbausteinen.</para>
+            </listitem>
+
+          <listitem>
+              <para>Lädt die Konfigurationsdatei, ohne spezielle Mandant*innen ist der Suchpfad zur Konfiguration der Unterordner <filename>firma/</filename></para>
+            </listitem>
+
+            <listitem>
+            <para>Lädt die Datei <filename>ident.tex</filename> welche Mandant*innenspezifische Anpassungen enthält.</para>
+            </listitem>
+        </itemizedlist>
+
+      </orderedlist>
+    -->
+
+  </sect3>
+  <sect3 id="Mandant*innen / Firma">
+    <title>Mandant*innen / Firma</title>
+
+    <para>Um gleiche Vorlagen für verschiedene Firmen verwenden zu können, wird je
+    nach dem Wert der Kivitendo-Variablen \kivivar{kivicompany} ein
+    Firmenverzeichnis ausgewählt (siehe <filename>insettings.tex</filename>), in dem Briefkopf,
+    Identitäten und Währungs-/Kontoeinstellungen hinterlegt sind.
+    \kivivar{kivicompany} enthält den Namen des verwendeten Mandant*innendaten.
+    Ist kein Firmenname eingetragen, so wird das
+    generische Unterverzeichnis *firma* verwendet.</para>
+
+
+  </sect3>
+  <sect3 id="Identitäten">
+    <title>Identitäten</title>
+
+    <para>In jedem Firmen-Unterverzeichnis soll eine Datei <filename>ident.tex</filename>
+    vorhanden sein, die mit |\newcommand| Werte für |\telefon|, |\fax|,
+    |\firma|, |\strasse|, |\ort|, |\ustid|, |\email| und |\homepage| definiert.</para>
+
+
+  </sect3>
+  <sect3 id="Währungen/Konten">
+    <title>Währungen/Konten</title>
+
+    <para>Für jede Währung (siehe <filename>insettings.tex</filename>) soll eine Datei vorhanden
+    sein, die das Währungssymbol (|\currency|) und folgende Angaben für
+    ein Konto in dieser Währung enthält |\kontonummer|, |\bank|,
+    |\bankleitzahl|, |\bic| und |\iban|.
+    So kann in den Dokumenten je nach Währung ein anderes Konto
+    angegeben werden.
+    Nach demselben Schema können auch weitere, alternative Bankverbindungen
+    angelegt werden, die dann in <filename>insettings.tex</filename> als Variable in der Fußzeile eingefügt werden.</para>
+
+    <para>Als Fallback (falls kivitendo keine Währung an das Druckvorlagen-System übergibt)
+    ist Euro eingestellt. Dies lässt sich in der <filename>insettings.tex</filename> über das optionale Argument
+    von |\setupCurrencyConfig| anpassen, z.B.</para>
+
+    <programlisting>
+    \setupCurrencyConfig[chf]{\identpath}{\lxcurrency}</programlisting>
+    <para>für Schweizer Franken als Standardwährung.</para>
+
+
+  </sect3>
+  <sect3 id="Briefbogen/Logos">
+    <title>Briefbogen/Logos</title>
+
+    <para>Eine Hintergrundgrafik oder ein Logo kann in Abhängigkeit vom
+    Medium (z.B. nur beim Verschicken mit E-Mail) eingebunden
+    werden.</para>
+
+    <para>Desweiteren sind (auskommentierte) Beispiele enthalten für eine
+    Grafik als Briefkopf, nur ein Logo, oder ein komplettes A4-PDF
+    als Briefpapier.</para>
+
+    <para>Absolute Positionierung innerhalb des Brief-Layouts ist über die entsprechende Dokumentation des scrlayer-Paketes möglich.
+    Da die Voreinstellungen bereits einige Sonderfälle automatisch berücksichtigen ist mit den Anpassungen Vorsicht geboten.
+    Sämtliche Einstellungen sollten jedoch außerhalb der *.sty-Dateien vorgenommen werden.
+    Anpassungen der <filename>insettings.tex</filename> betreffen hierbei alle Mandant*innen. Spezifischere Einstellungen sind über die zugehörige Konfigurationsdatei (<filename>ident.tex</filename>) möglich.
+    In diesem Fall kann zum Ende der insettings eine weitere Konfigurationsdatei über die Verwendung von |\identpath| geladen werden. Ein Beispiel ist in der <filename>insettings.tex</filename> enthalten.</para>
+
+
+  </sect3>
+  <sect3 id="Fußzeile">
+    <title>Fußzeile</title>
+
+    <para>Die Tabelle im Fuß verwendet die Angaben aus <filename>firma/ident.tex</filename> und
+    *firma/<filename>\_account.tex</filename>. Ihre Struktur wird in der <filename>insettings.tex</filename> definiert.
+    Sie kann anschließend auch Mandant*innenspezifisch überschrieben werden.</para>
+
+
+  </sect3>
+  <sect3 id="Seitenstil/Basislayout">
+    <title>Seitenstil/Basislayout</title>
+
+    <para>Das Seitenlayout wird über \pck{scrlayer-scrpage} bestimmt. Die ausführliche Dokumentation findet sich in \cite{scrguide}.
+    Es existieren in der Datei <filename>insettings.tex</filename> einige Hinweise zu den Anpassungen. Die Basiskonfiguration ist ebenfalls dort eingetragen.</para>
+
+    <para>Neben den in Abschnitt \ref{sec:options}  beschriebenen Optionen zum Abschalten der Fußzeile kann
+    der Inhalt der Fußzeile über die \pck{scrlayer-scrpage} Makros, wie</para>
+    <programlisting>
+      \cfoot[|\meta{Inhalt auf der ersten Briefseite}|]{|\meta{Inhalt auf folgenden Briefseiten}|}    </programlisting>
+
+    <para>geändert werden.</para>
+
+    <para>Die Kopfzeile unterscheidet sich von Dokumententyp zu Dokumententyp leicht, da diese über Datenbankvariablen befüllt wird.
+    Hierfür wird das Makro |\ourhead| in der <filename>insettings.tex</filename> definiert.</para>
+
+    <programlisting>
+      \DescribeMacro{\ourhead}\marg{Bezeichner}\marg{Eintrag}\marg{Titel}\marg{Nummer}\marg{Datum}    </programlisting>
+
+    <para>Diese Definition kann ebenfalls über die <filename>insettings.tex</filename> angepasst oder auch nachträglich überschrieben werden:</para>
+
+    <programlisting>
+      \newcommand{\ourhead}[5] {%
+        \chead{%
+          \makebox[\textwidth]{%
+            \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}%
+            #3%
+            \Ifstr{#4}{}{}{~\nr: #4}%
+            \Ifstr{#5}{}{}{\vom ~ #5}%
+            \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+          }%
+        }%
+      }
+    </programlisting>
+    <para>In der Standard-Einstellung sieht eine Kopfzeile mit obigen Aufruf dann folgendermaßen aus:</para>
+
+    <programlisting>
+      \newcommand{\ourhead}[5] {%
+          \makebox[\textwidth]{%
+            \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}%
+            #3%
+            \Ifstr{#4}{}{}{~\nr: #4}%
+            \Ifstr{#5}{}{}{\vom ~ #5}%
+            \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+          }%
+      }
+
+      \begingroup
+      \def\letterlastpage{50}
+
+      \ourhead{arg1}{arg2}{arg3}{arg4}{arg5}
+
+      \smallskip
+      Erzeugt mit dem Aufruf
+      \ourhead{arg1}{arg2}{arg3}{arg4}{arg5}
+      \endgroup    </programlisting>
+
+
+  </sect3>
+  <sect3 id="Absenderergänzung">
+    <title>Absenderergänzung</title>
+
+    <para>Die Absenderergänzung wird über die Variable |location| in der |kiviletter.sty| folgendermaßen belegt:</para>
+
+    <programlisting>
+      \setkomavar{location}{
+        \Ifkomavarempty{transaction}{}{{
+              \usekomafont{transaction}
+              \usekomavar{transaction}
+            }
+        }
+        \par
+        \medskip
+        \parbox{\useplength{locwidth}}{
+          \locationentry{date}
+          \locationentry{myref}
+          \locationentry{customer}
+          \locationentry{yourref}
+          \locationentry{delivery}
+          \locationentry{quote}
+          \locationentry{orderID}
+          \locationentry{projectID}
+          \locationentry{taxpoint}
+          \locationentry[\ansprechpartner]{fromname}
+          \locationentry{fromphone}
+          \locationentry*{fromemail}
+        }
+      }    </programlisting>
+
+    <para>Um die Reihenfolge der Variablenausgabe zu verändern, kann diese Definition als Basis in
+    die <filename>insettings.tex</filename> oder <filename>ident.tex</filename> (Falls nur für eine Firma) kopiert und dort entsprechend modifiziert werden.</para>
+
+    <para>Das Vorgehen geht für alle vorbelegten Variablen analog.</para>
+
+
+  </sect3>
+<sect3 id="Allgemeine TeXnische Hinweise">
+  <title>Allgemeine TeXnische Hinweise</title>
+
+
+  <sect4 id="Änderung der Basisschriftart">
+    <title>Änderung der Basisschriftart</title>
+
+    <para>\LaTeX{} kann grundsätzlich beliebige Schriftarten verwenden. Hierfür sollte allerdings immer darauf geachtet werden,
+    dass die Lizenz der Schriftart das einbetten von Glyphen erlaubt. Dies liegt in der Verantwortung der Anwender*innen.
+    Darüber hinaus ist wichtig, welches Kompilierungsprogramm verwendet werden muss. Um TrueType oder OpenType Schriftarten
+    zu nutzen sollte |lualatex| verwendet werden. Bei Type1 Schriftarten, die speziell für \LaTeX{} installiert wurden, ist pdfLaTeX möglich.
+    Da man heutzutage nur noch moderne Schriftformate Verwenden sollte, wird hier lediglich die Variante für |lualatex| aufgelistet.</para>
+
+    <para>Die Konfiguration läuft hierbei über das \pck{fontspec} Paket (Doku siehe \cite{fontspec}).
+    Dann hängt es davon ab, ob die Basisschriftart eine Serifenschriftart ist oder nicht.
+    In jedem Fall wird die Änderung entweder in der <filename>insettings.tex</filename>, sofern sie für alle
+    Mandant*innen gelten soll oder in der Mantant*innenspezifischen Konfigurationsdatei gsesetzt.</para>
+
+
+    <sect5>
+      <title>Änderung, falls es ein Schriftpaket gibt</title>
+
+      <para>Wenn möglich sollte die Schriftart über ein entsprechendes Konfigurationspaket gesetzt werden.
+        Ob ein solches existiert kann man sehr leicht über eine Suche nach dem Namen unter \url{ctan.org} herausfinden.</para>
+
+    </sect5>
+
+    <sect5>
+      <title>Änderung der Basisschriftart auf eine Schriftart mit Serifen</title>
+
+    <programlisting>
+      \setmainfont{|\meta{Name der Schriftart, z.B. SourceSerifPro}|}    </programlisting>
+
+    </sect5>
+
+    <sect5>
+      <title>Änderung der Basisschriftart auf eine Schriftart ohne Serifen</title>
+
+    <programlisting>
+      \setsansfont{|\meta{Name der Schriftart, z.B. SourceSansPro}|}
+      \renewcommand*{\familydefault}{\sfdefault}    </programlisting>
+
+    </sect5>
+
+
+  </sect4>
+  <sect4 id="Unterscheidungen durch String-Vergleich">
+    <title>Unterscheidungen durch String-Vergleich</title>
+
+    <programlisting>
+    \Ifstr{\lxmedia}{printer}{Falls gedruckt werden soll} {sonst}    </programlisting>
+  </sect4>
+  </sect3>
+</sect2>
       <sect2 id="Vorlagen-RB">
         <title>Der Druckvorlagensatz RB</title>
 
@@ -2408,9 +3151,9 @@ digits_year: 4</programlisting>
         <para>Wird gar kein Fehler angezeigt, sondern nur der Name des
         Templates, heißt das normalerweise, dass das LaTeX Binary nicht
         gefunden wurde. Prüfen Sie den Namen in der Konfiguration (Standard:
-        <literal>pdflatex</literal>), und stellen Sie sicher, dass pdflatex
-        (oder das von Ihnen verwendete System) vom Webserver ausgeführt werden
-        darf.</para>
+        <literal>latexmk --pdflatex</literal>), und stellen Sie sicher, dass
+        latexmk (oder das von Ihnen verwendete System) vom Webserver ausgeführt
+        werden darf.</para>
 
         <para>Wenn sich das Problem nicht auf Grund der Ausgabe im Webbrowser
         verifizieren lässt:</para>
@@ -2470,116 +3213,75 @@ digits_year: 4</programlisting>
       <para>kivitendo unterstützt die Verwendung von Vorlagen im
       OpenDocument-Format, wie es LibreOffice oder OpenOffice (ab Version 2)
       erzeugen. kivitendo kann dabei sowohl neue OpenDocument-Dokumente als
-      auch aus diesen direkt PDF-Dateien erzeugen. Um die Unterstützung von
-      OpenDocument-Vorlagen zu aktivieren muss in der Datei
-      <filename>config/kivitendo.conf</filename> die Variable
-      <literal>opendocument</literal> im Abschnitt
-      <literal>print_templates</literal> auf ‘<literal>1</literal>’ stehen.
-      Dieses ist die Standardeinstellung.</para>
-
-      <para>Während die Erzeugung von reinen OpenDocument-Dateien keinerlei
-      weitere Software benötigt, wird zur Umwandlung dieser Dateien in PDF
-      LibreOffice oder OpenOffice benötigt. Soll dieses Feature genutzt
-      werden, so muss neben LibreOffice oder OpenOffice auch der “X virtual
-      frame buffer” (xvfb) installiert werden. Bei Debian ist er im Paket
-      “xvfb” enthalten. Andere Distributionen enthalten ihn in anderen
-      Paketen.</para>
-
-      <para>Nach der Installation müssen in der Datei
-      <filename>config/kivitendo.conf</filename> im Abschnitt
-      <literal>applications</literal> zwei weitere Variablen angepasst
-      werden:</para>
-
-      <para><literal>openofficeorg_writer</literal> muss den vollständigen
-      Pfad zu LibreOffice oder OpenOffice enthalten. Dabei dürfen keine
-      Anführungszeichen eingesetzt werden.</para>
-
-      <para>Beispiel für Debian oder Ubuntu:</para>
-
-      <programlisting>openofficeorg_writer = /usr/bin/libreoffice</programlisting>
-
-      <para><literal>xvfb</literal> muss den Pfad zum “X virtual frame buffer”
-      enthalten.</para>
-
-      <para>Zusätzlich gibt es zwei verschiedene Arten, wie kivitendo mit
-      LibreOffice bzw. OpenOffice kommuniziert. Die erste Variante, die
-      benutzt wird, wenn die Variable <literal>$openofficeorg_daemon</literal>
-      gesetzt ist, startet ein LibreOffice oder OpenOffice, das auch nach der
-      Umwandlung des Dokumentes gestartet bleibt. Bei weiteren Umwandlungen
-      wird dann diese laufende Instanz benutzt. Der Vorteil ist, dass die Zeit
-      zur Umwandlung deutlich reduziert wird, weil nicht für jedes Dokument
-      ein LibreOffice bzw. OpenOffice gestartet werden muss. Der Nachteil ist,
-      dass diese Methode Python und die Python-UNO-Bindings benötigt, die
-      Bestandteil von LibreOffice bzw. OpenOffice sind.</para>
-
-      <note>
-        <para>Für die Verbindung zu LibreOffice bzw. OpenOffice wird
-        normalerweise der Python-Interpreter
-        <filename>/usr/bin/python</filename> benutzt. Sollte dies nicht der
-        richtige sein, so kann man mit zwei Konfigurationsvariablen
-        entscheiden, welcher Python-Interpreter genutzt wird. Mit der Option
-        <literal>python_uno</literal> aus dem Abschnitt
-        <literal>applications</literal> wird der Interpreter selber
-        festgelegt; sie steht standardmäßig auf dem eben erwähnten Wert
-        <literal>/usr/bin/python</literal>.</para>
-
-        <para>Zusätzlich ist es möglich, Pfade anzugeben, in denen Python
-        neben seinen normalen Suchpfaden ebenfalls nach Modulen gesucht wird,
-        z.B. falls sich diese in einem gesonderten LibreOffice- bzw.
-        OpenOffice-Verzeichnis befinden. Diese zweite Variable heißt
-        <literal>python_uno_path</literal> und befindet sich im Abschnitt
-        <literal>environment</literal>. Sie ist standardmäßig leer. Werden
-        hier mehrere Pfade angegeben, so müssen diese durch Doppelpunkte
-        voneinander getrennt werden. Der Inhalt wird an den Python-Interpreter
-        über die Umgebungsvariable <literal>PYTHONPATH</literal>
-        übergeben.</para>
-      </note>
+      auch aus diesen direkt PDF-Dateien erzeugen. Nachfolgend ist die
+      Verwendung mit LibreOffice beschrieben. Für die Verwendung mit
+      OpenOffice müssen die Einstellungen allenfalls angepasst werden.</para>
+
+      <sect2>
+        <title>Grundeinstellung</title>
 
-      <para>Ist <literal>$openofficeorg_daemon</literal> nicht gesetzt, so
-      wird für jedes Dokument LibreOffice bzw. OpenOffice neu gestartet und
-      die Konvertierung mit Hilfe eines Makros durchgeführt. Dieses Makro muss
-      in der Dokumentenvorlage enthalten sein und
-      “Standard.Conversion.ConvertSelfToPDF()” heißen. Die Beispielvorlage
-      ‘<literal>templates/print/rev-odt/invoice.odt</literal>’ enthält ein
-      solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls
-      enthalten sein muss.</para>
-
-      <para>Als letztes muss herausgefunden werden, welchen Namen OpenOffice
-      bzw. LibreOffice dem Verzeichnis mit den Benutzereinstellungen gibt.
-      Unter Debian ist dies momentan <literal>~/.config/libreoffice</literal>.
-      kivitendo verwendet das Verzeichnis
-      <literal>users/.openoffice.org2</literal>. Eventuell muss dieses
-      Verzeichnis umbenannt werden.</para>
-
-      <para>Dieses Verzeichnis, wie auch das komplette
-      <literal>users</literal>-Verzeichnis, muss vom Webserver beschreibbar
-      sein. Dieses wurde bereits erledigt (siehe <xref
-      linkend="Manuelle-Installation-des-Programmpaketes"/>), kann aber erneut
-      überprüft werden, wenn die Konvertierung nach PDF fehlschlägt.</para>
+        <para>Um die Unterstützung von OpenDocument-Vorlagen zu aktivieren,
+        muss in der Datei <filename>config/kivitendo.conf</filename> die
+        Variable <literal>opendocument</literal>, im Abschnitt
+        <literal>print_templates</literal>, auf <literal>1</literal> stehen.
+        Dies ist die Standardeinstellung.</para>
+      </sect2>
 
       <sect2>
-        <title>OpenDocument (odt) Druckvorlagen mit Makros</title>
+        <title>Direkte Erzeugung von PDF-Dateien</title>
+
+        <para>Während die Erzeugung von reinen OpenDocument-Dateien keinerlei
+        weitere Software benötigt, wird zur Umwandlung dieser Dateien in PDF
+        LibreOffice oder OpenOffice benötigt.</para>
 
-        <para>OpenDocument Vorlagen können Makros enthalten, welche komplexere
-        Aufgaben erfüllen.</para>
+        <para>Unter Debian kann dieses installiert werden mit:</para>
 
-        <para>Der Vorlagensatz "rev-odt" enthält solche Vorlagen mit <emphasis
-        role="bold">Schweizer Bank-Einzahlungsscheinen (BESR)</emphasis>.
-        Diese Makros haben die Aufgabe, die in den Einzahlungsscheinen
-        benötigte Referenznummer und Kodierzeile zu erzeugen. Hier eine kurze
-        Beschreibung, wie die Makros aufgebaut sind, und was bei ihrer Nutzung
-        zu beachten ist (<emphasis role="bold">in fett sind nötige einmalige
-        Anpassungen aufgeführt</emphasis>):</para>
+        <programlisting>apt install libreoffice</programlisting>
+
+        <para>Der Pfad zu LibreOffice kann in der Datei
+        <filename>config/kivitendo.conf</filename>, im Abschnitt
+        <literal>applications</literal>, angepasst werden. Unter Debian sollte
+        dies nicht notwendig sein.</para>
 
         <sect3>
-          <title>Bezeichnung der Vorlagen</title>
+          <title>Variante 1)</title>
+
+          <para>In der Standardeinstellung wird LibreOffice für jedes Dokument
+          neu gestartet. Es ist keine weitere Konfiguration
+          erforderlich.</para>
+        </sect3>
 
-          <para>Rechnung: invoice_besr.odt, Auftrag:
-          sales_order_besr.odt</para>
+        <sect3>
+          <title>Variante 2)</title>
+
+          <para>Die zweite Variante startet ein LibreOffice, das auch nach der
+          Umwandlung des Dokumentes gestartet bleibt. Bei weiteren
+          Umwandlungen wird dann diese laufende Instanz benutzt. Der Vorteil
+          ist, dass die Zeit zur Umwandlung möglicherweise reduziert wird,
+          weil nicht für jedes Dokument eine neue Instanz gestartet werden
+          muss.</para>
+
+          <para>Dazu muss in der Konfigurationsdatei
+          <filename>config/kivitendo.conf</filename>, im Abschnitt
+          <literal>print_templates</literal>, <literal>openofficeorg_daemon =
+          1</literal> gesetzt werden.</para>
+
+          <para>Diese Methode verwendet Python und die Python uno bindings.
+          Unter Debian werden diese mit LibreOffice mitgeliefert.</para>
+
+          <para>Die Optionen <literal>python_uno</literal> und
+          <literal>python_uno_path</literal> in der Konfigurationsdatei
+          <filename>config/kivitendo.conf</filename> dienen zur Anpassung der
+          Python uno Pfade. Unter Debian sollte keine Anpassung notwendig
+          sein.</para>
         </sect3>
+      </sect2>
+
+      <sect2>
+        <title>Vorbereitungen</title>
 
         <sect3 id="opendocument-druckvorlagen-mit-makros.vorbereitungen">
-          <title>Vorbereitungen im Adminbereich</title>
+          <title>Adminbereich</title>
 
           <para>Damit beim Erstellen von Rechnungen und Aufträgen neben der
           Standardvorlage ohne Einzahlungsschein weitere Vorlagen (z.B. mit
@@ -2655,97 +3357,6 @@ digits_year: 4</programlisting>
           </itemizedlist>
         </sect3>
 
-        <sect3>
-          <title>Aufbau und nötige Anpassungen der Vorlagen</title>
-
-          <para>In der Vorlage sind als Modul "BESR" 4 Makros gespeichert, die
-          aus dem von kivitendo erzeugten odt-Dokument die korrekte
-          Referenznummer inklusive Prüfziffer sowie die Kodierzeile in
-          OCRB-Schrift erzeugen und am richtigen Ort ins Dokument
-          schreiben.</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Für den Einzahlungsschein ist die letzte Seite des
-              Dokuments reserviert</para>
-            </listitem>
-
-            <listitem>
-              <para>Direkt über dem Einzahlungsschein enthält die Vorlage eine
-              Zeile mit folgenden Angaben (<emphasis
-              role="bold">Bank-Konto-Identifikationsnummer und
-              Postkonto-Nummer der Bank müssen gemäss Angaben der jeweiligen
-              Bank angepasst werden</emphasis>):<itemizedlist>
-                  <listitem>
-                    <para>DDDREF: 4 Werte zum Bilden der Referenznummer
-                    (jeweils durch einen Leerschlag getrennt): <itemizedlist>
-                        <listitem>
-                          <para>erster Wert: <emphasis
-                          role="bold">Bank-Konto-Identifikation</emphasis>
-                          (nur Ziffern, maximal 6), <emphasis role="bold">muss
-                          angepasst werden</emphasis>.</para>
-                        </listitem>
-
-                        <listitem>
-                          <para>zweiter Wert: &lt;%customernumber%&gt;
-                          (Kundennummer: nur Ziffern, maximal 6)</para>
-                        </listitem>
-
-                        <listitem>
-                          <para>dritter Wert: &lt;%ordnumber%&gt;
-                          (Auftragsnummer bei Auftragsvorlage
-                          sales_oder_besr.odt, sonst 0) maximal 7 Ziffern,
-                          führende Buchstaben werden vom Makro entfernt</para>
-                        </listitem>
-
-                        <listitem>
-                          <para>vierter Wert: &lt;%invnumber%&gt;
-                          (Rechnungsnummer bei Rechnungsvorlage
-                          invoice_besr.odt, sonst 0) maximal 7 Ziffern,
-                          führende Buchstaben werden vom Makro entfernt</para>
-                        </listitem>
-                      </itemizedlist></para>
-                  </listitem>
-
-                  <listitem>
-                    <para>DDDKONTO: <emphasis role="bold">Postkonto-Nummer der
-                    Bank, muss angepasst werden</emphasis>.</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>DDDBETRAG: &lt;%total%&gt; Einzahlungsbetrag oder 0,
-                    falls Einzahlungsschein ohne Betrag</para>
-                  </listitem>
-
-                  <listitem>
-                    <para>DDDEND: muss am Ende der Zeile vorhanden sein</para>
-                  </listitem>
-                </itemizedlist></para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">Im Einzahlungsschein selbst müssen
-              der Name und die Adresse der Bank, die Postkonto-Nummer der
-              Bank, sowie der eigene Firmenname und die Firmenadresse
-              angepasst werden.</emphasis> Dabei ist darauf zu achten, dass
-              sich die Positionen der Postkonto-Nummern der Bank, sowie der
-              Zeichenfolgen dddfr, DDDREF1, DDDREF2, 609, DDDKODIERZEILE nicht
-              verschieben.</para>
-            </listitem>
-          </itemizedlist>
-
-          <screenshot>
-            <screeninfo>Rechnungsvorlage Schweizer Bank-Einzahlungsschein - zu
-            ändernde Einträge in rot</screeninfo>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="images/Einzahlungsschein_Makro.png"/>
-              </imageobject>
-            </mediaobject>
-          </screenshot>
-        </sect3>
-
         <sect3>
           <title>Auswahl der Druckvorlage in kivitendo beim Erzeugen einer
           odt-Rechnung (analog bei Auftrag)</title>
@@ -2756,79 +3367,27 @@ digits_year: 4</programlisting>
           den Benutzereinstellungen als persönlicher Standard gewählt
           wurde.</para>
         </sect3>
-
-        <sect3>
-          <title>Makroeinstellungen in LibreOffice anpassen</title>
-
-          <para>Falls beim Öffnen einer von kivitendo erzeugten odt-Rechnung
-          die Meldung kommt, dass Makros aus Sicherheitsgründen nicht
-          ausgeführt werden, so müssen folgende Einstellungen in LibreOffice
-          angepasst werden:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Extras → Optionen → Sicherheit → Makrosicherheit</para>
-            </listitem>
-
-            <listitem>
-              <para>Sicherheitslevel auf "Mittel" einstellen (Diese
-              Einstellung muss auf jedem Computer durchgeführt werden, mit dem
-              von kivitendo erzeugte odt-Rechnungen oder Aufträge geöffnet
-              werden.)</para>
-            </listitem>
-
-            <listitem>
-              <para>Beim Öffnen einer odt-Rechnung oder eines odt-Auftrags bei
-              der entsprechenden Nachfrage "Makros ausführen"
-              auswählen.</para>
-
-              <para><emphasis role="bold">Wichtig</emphasis>: die Makros sind
-              so eingestellt, dass sie beim Öffnen der Vorlagen selbst nicht
-              ausgeführt werden. Das heisst für das Ansehen und Bearbeiten der
-              Vorlagen sind keine speziellen Einstellungen in LibreOffice
-              nötig.</para>
-            </listitem>
-          </itemizedlist>
-        </sect3>
       </sect2>
 
       <sect2>
         <title>Schweizer QR-Rechnung mit OpenDocument Vorlagen</title>
 
-        <sect3>
-          <title>Übersicht</title>
-
-          <para>Mit der Version 3.6.0 unterstützt Kivitendo die Erstellung von
-          Schweizer QR-Rechnungen gemäss <ulink
-          url="https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-de.pdf">Swiss
-          Payment Standards, Version 2.2</ulink>. Implementiert sind hierbei die
-          Varianten:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para><emphasis role="bold">QR-IBAN mit
-              QR-Referenz</emphasis></para>
-            </listitem>
+        <para>Mit der Version 3.6.0 unterstützt Kivitendo die Erstellung von
+        Schweizer QR-Rechnungen gemäss <ulink
+        url="https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-de.pdf">Swiss
+        Payment Standards, Version 2.2</ulink>. Implementiert sind hierbei die
+        Varianten:</para>
 
-            <listitem>
-              <para><emphasis role="bold">IBAN ohne Referenz</emphasis></para>
-            </listitem>
-          </itemizedlist>
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">QR-IBAN mit
+            QR-Referenz</emphasis></para>
+          </listitem>
 
-          <para>Der Vorlagensatz "rev-odt" enthält die Vorlage
-          <literal>invoice_qr.odt</literal>, welche für die Erstellung von
-          QR-Rechnungen vorgesehen ist. Damit diese verwendet werden kann muss
-          wie obenstehend beschrieben ein Drucker hinzugefügt werden (siehe
-          <xref linkend="opendocument-druckvorlagen-mit-makros.vorbereitungen"/>
-          ). Alternativ kann die Vorlage umbenannt werden in
-          <literal>invoice.odt</literal>.</para>
-
-          <para>Die Vorlage <literal>invoice_qr.odt</literal> kann beliebig
-          angepasst werden. Zwingend muss diese jedoch das QR-Code Platzhalter
-          Bild, als eingebettetes Bild, enthalten. Da dieses beim
-          Ausdrucken/Erzeugen der Rechnung durch das neu generierte QR-Code
-          Bild ersetzt wird.</para>
-        </sect3>
+          <listitem>
+            <para><emphasis role="bold">IBAN ohne Referenz</emphasis></para>
+          </listitem>
+        </itemizedlist>
 
         <sect3>
           <title>Einstellungen</title>
@@ -2851,9 +3410,11 @@ digits_year: 4</programlisting>
             Schweizer QR-Rechnung</emphasis> auf <emphasis
             role="bold">Ja</emphasis> gestellt werden.</para>
 
+            <para>Die IBAN muss ohne Leerzeichen angegeben werden.</para>
+
             <tip>
               <para>Für die Variante <emphasis role="bold">QR-IBAN mit
-              QR-Referenz</emphasis> muss dieses Konto unter IBAN eine gültige
+              QR-Referenz</emphasis> muss dieses Konto unter QR-IBAN (Schweiz) eine gültige
               <emphasis role="bold">QR-IBAN Nummer</emphasis> enthalten. Diese
               unterscheidet sich von der regulären IBAN.</para>
 
@@ -2893,12 +3454,12 @@ digits_year: 4</programlisting>
           <para>Die Adressdaten zum Zahlungspflichtigen stammen aus den
           Kundendaten der jeweiligen Rechnung.</para>
 
-          <para>Die Adressen müssen inklusive Land angegeben werden. Akzeptiert
-          werden Ländername oder Ländercode, also z.B. "Schweiz" oder "CH".
-          </para>
+          <para>Ist bei den Adressdaten kein Land angegeben, wird standardmässig
+          Schweiz verwendet. Akzeptiert werden Ländername oder Ländercode, also
+          z.B. "Schweiz" oder "CH".</para>
 
-          <para>Diese können in der Vorlage mit den jeweiligen Variablen
-          eingetragen werden. Siehe auch: <xref
+          <para>Die Adressdaten können in der Vorlage mit den jeweiligen
+          Variablen eingetragen werden. Siehe auch: <xref
           linkend="dokumentenvorlagen-und-variablen"/></para>
 
           <para>Der erzeugte QR-Code verwendet Adress-Typ "K" (Kombinierte
@@ -2922,12 +3483,7 @@ digits_year: 4</programlisting>
             </listitem>
 
             <listitem>
-              <para>Auftragsnummer (7-stellig, mit führenden Nullen
-              aufgefüllt)</para>
-            </listitem>
-
-            <listitem>
-              <para>Rechnungsnummer (7-stellig, mit führenden Nullen
+              <para>Rechnungsnummer (14-stellig, mit führenden Nullen
               aufgefüllt)</para>
             </listitem>
 
@@ -2937,45 +3493,68 @@ digits_year: 4</programlisting>
             </listitem>
           </itemizedlist>
 
-          <para>Es sind lediglich Ziffern erlaubt. Allfällige Prefixe mit
-          Buchstaben werden entfernt und fehlende Stellen werden mit führenden
-          Nullen aufgefüllt.</para>
+          <para>Es sind lediglich Ziffern erlaubt. Allfällige Buchstaben und
+          Sonderzeichen werden entfernt und fehlende Stellen werden mit
+          führenden Nullen aufgefüllt.</para>
         </sect3>
 
         <sect3>
-          <title>Zusätzliche Variablen für Vorlage</title>
-
-          <para>Zusätzlich zu den in der Vorlage standardmässig verfügbaren
-          Variablen (siehe <xref linkend="dokumentenvorlagen-und-variablen"/>),
-          werden die folgenden Variablen erzeugt:</para>
-
-          <variablelist>
-            <varlistentry>
-              <term>ref_number_formatted</term>
-
-              <listitem>
-                <para>Referenznummer formatiert mit Leerzeichen, z.B.: 21 00000
-                00003 13947 14300 09017</para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>iban_formatted</term>
-
-              <listitem>
-                <para>IBAN formatiert mit Leerzeichen</para>
-              </listitem>
-            </varlistentry>
+          <title>Vorlage</title>
 
-            <varlistentry>
-              <term>amount_formatted</term>
+          <para>Der Vorlagensatz "rev-odt" enthält die Vorlage
+          <literal>invoice_qr.odt</literal>, welche für die Erstellung von
+          QR-Rechnungen vorgesehen ist. Damit diese verwendet werden kann muss
+          wie obenstehend beschrieben ein Drucker hinzugefügt werden, allerdings
+          mit dem Vorlagenkürzel <literal>qr</literal> (siehe <xref
+          linkend="opendocument-druckvorlagen-mit-makros.vorbereitungen"/>).
+          Weitere Vorlagen für die QR-Rechnung müssen im Dateinamen, bzw.
+          Vorlagenkürzel, ebenfalls die Zeichenfolge <literal>qr</literal>
+          enthalten, also z.b. <literal>invoice_qr2.odt</literal> etc.</para>
+
+          <para>Die Vorlagen können beliebig angepasst werden. Zwingend müssen
+          diese jedoch das QR-Code Platzhalter Bild, als eingebettetes Bild,
+          enthalten. Da dieses beim Ausdrucken/Erzeugen der Rechnung durch das
+          neu generierte QR-Code Bild ersetzt wird. Das Bild muss den Namen
+          <literal>QRCodePlaceholder</literal> tragen. In Libreoffice unter
+          <emphasis>Bild-Kontextmenü → </emphasis><emphasis>Einstellungen →
+          Optionen → Name</emphasis> einstellbar. Siehe dazu auch die
+          Beispielvorlage.</para>
 
-              <listitem>
-                <para>Betrag formatiert mit Tausendertrennzeichen Leerschlag,
-                z.B.: 1 005.55</para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
+          <sect4>
+            <title>Zusätzliche Variablen für Vorlage</title>
+
+            <para>Zusätzlich zu den in der Vorlage standardmässig verfügbaren
+            Variablen (siehe <xref linkend="dokumentenvorlagen-und-variablen"/>),
+            werden die folgenden Variablen erzeugt:</para>
+
+            <variablelist>
+              <varlistentry>
+                <term>ref_number_formatted</term>
+
+                <listitem>
+                  <para>Referenznummer formatiert mit Leerzeichen, z.B.: 21 00000
+                  00003 13947 14300 09017</para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term>iban_formatted</term>
+
+                <listitem>
+                  <para>IBAN formatiert mit Leerzeichen</para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term>amount_formatted</term>
+
+                <listitem>
+                  <para>Betrag formatiert mit Tausendertrennzeichen Leerschlag,
+                  z.B.: 1 005.55</para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </sect4>
         </sect3>
       </sect2>
     </sect1>
@@ -3342,6 +3921,62 @@ digits_year: 4</programlisting>
       Erfolgsrechnung.</para>
     </sect1>
 
+    <sect1 id="config.jahresabschluss">
+      <title>Jahresabschluss</title>
+
+      <para>Beim Jahresabschluss stehen 2 Methoden zur Verfügung, die in der
+      Buchungskonfiguration der Mandantenkonfiguration eingestellt werden
+      können.</para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Standard-Methode</emphasis>.</para>
+          <itemizedlist>
+            <listitem>
+              <para>Sowohl Bestandskonten wie auch Erfolgskonten werden
+              abgeschlossen</para>
+            </listitem>
+            <listitem>
+              <para>Es wird ein Konto für das Verbuchen eines Jahresgewinns
+              verwendet und ein zweites Konto für das Verbuchen eines
+              Jahresverlusts.</para>
+            </listitem>
+            <listitem>
+              <para>Bei den Konten für den Jahresabschluss können bei den
+              Standardkonten in der Mandantenkonfiguration nur Aktiva-Konten
+              ausgewählt werden.</para>
+            </listitem>
+            <listitem>
+              <para>Der Jahresgewinn oder -verlust wird sowohl bei den
+              Jahresabschlussbuchungen wie auch bei den Eröffnungsbuchungen
+              verbucht.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Einfach-Methode</emphasis>.</para>
+          <itemizedlist>
+            <listitem>
+              <para>Nur Bestandskonten werden abgeschlossen</para>
+            </listitem>
+            <listitem>
+              <para>Für das Verbuchen eines Jahresgewinns oder -verlusts wird
+              das gleiche Konto verwendet.</para>
+            </listitem>
+            <listitem>
+              <para>Bei den Konten für den Jahresabschluss können bei den
+              Standardkonten in der Mandantenkonfiguration alle Konten
+              ausgewählt werden.</para>
+            </listitem>
+            <listitem>
+              <para>Der Jahresgewinn oder -verlust wird nur bei den
+              Eröffnungsbuchungen verbucht.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
+    </sect1>
+
     <sect1 id="config.erfolgsrechnung">
       <title>Erfolgsrechnung</title>
 
@@ -3922,7 +4557,7 @@ digits_year: 4</programlisting>
         <para>Will man im laufenden Monat eine monatlich wiederkehrende
         Rechnung inkl. des laufenden Monats starten, stellt man das Startdatum
         auf den Monatsanfang und wartet ein paar Minuten, bis der Task-Server
-        den neu konfigurieren Auftrag erkennt und daraus eine Rechnung
+        den neu konfigurierten Auftrag erkennt und daraus eine Rechnung
         generiert hat. Alternativ setzt man das Startdatum auf den
         Monatsersten des Folgemonats und erstellt die erste Rechnung direkt
         manuell über den Workflow.</para>
@@ -3940,7 +4575,9 @@ digits_year: 4</programlisting>
         im Wiki und soll von dort später hierhin übernommen werden:</para>
 
         <para><ulink
-        url="http://redmine.kivitendo-premium.de/projects/forum/wiki/Bankerweiterung">http://redmine.kivitendo-premium.de/projects/forum/wiki/Bankerweiterung</ulink></para>
+        url="https://www.kivitendo.de/redmine/projects/forum/wiki/Bankerweiterung">
+        https://www.kivitendo.de/redmine/projects/forum/wiki/Bankerweiterung
+        </ulink></para>
       </sect2>
     </sect1>
 
@@ -5289,58 +5926,119 @@ digits_year: 4</programlisting>
               <term><varname>rounding</varname></term>
 
               <listitem>
-                <para>Betrag, um den <varname>invtotal</varname> gerundet
-                wurde (kann positiv oder negativ sein)</para>
+                <para>Betrag, um den <varname>invtotal</varname> gerundet
+                wurde (kann positiv oder negativ sein)</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>shippingpoint</varname></term>
+
+              <listitem>
+                <para>Versandort</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>shipvia</varname></term>
+
+              <listitem>
+                <para>Transportmittel</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>subtotal</varname></term>
+
+              <listitem>
+                <para>Zwischensumme aller Posten ohne Steuern</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>total</varname></term>
+
+              <listitem>
+                <para>Restsumme der Rechnung (Summe abzüglich bereits
+                bezahlter Posten)</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>transaction_description</varname></term>
+
+              <listitem>
+                <para>Vorgangsbezeichnung</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><varname>shippingpoint</varname></term>
+              <term><varname>transdate</varname></term>
 
               <listitem>
-                <para>Versandort</para>
+                <para>Auftragsdatum wenn die Rechnung aus einem Auftrag
+                erstellt wurde</para>
               </listitem>
             </varlistentry>
+          </variablelist>
+        </sect3>
+
+        <sect3>
+          <title>Variablen für die schweizer QR-Rechnung</title>
+
+          <para>Diese Variablen können mit dem LaTeX Modul qrbill verwendet
+          werden: <ulink
+          url="https://ctan.org/pkg/qrbill?lang=de">https://ctan.org/pkg/qrbill?lang=de</ulink></para>
 
+          <para>Für die Erstellung von QR-Rechnungen mit OpenDocument Vorlagen
+          siehe: <xref linkend="OpenDocument-Vorlagen"/></para>
+
+          <variablelist>
             <varlistentry>
-              <term><varname>shipvia</varname></term>
+              <term>qrbill_iban</term>
 
               <listitem>
-                <para>Transportmittel</para>
+                <para>IBAN/QR-IBAN des Rechnungsstellers, aus <emphasis>System
+                → Bankkonten</emphasis></para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><varname>subtotal</varname></term>
+              <term>qrbill_biller_countrycode</term>
 
               <listitem>
-                <para>Zwischensumme aller Posten ohne Steuern</para>
+                <para>Länderkürzel des Rechnungsstellers gem. ISO 3166, aus
+                <emphasis>Mandantenkonfiguration → Firmenname und
+                -adresse</emphasis></para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><varname>total</varname></term>
+              <term>qrbill_customer_countrycode</term>
 
               <listitem>
-                <para>Restsumme der Rechnung (Summe abzüglich bereits
-                bezahlter Posten)</para>
+                <para>Länderkürzel des Rechnungsempfängers gem. ISO 3166, aus
+                der jeweiligen Rechnung</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><varname>transaction_description</varname></term>
+              <term>qrbill_amount</term>
 
               <listitem>
-                <para>Vorgangsbezeichnung</para>
+                <para>Betrag für die QR-Rechnung (Zahl ohne
+                Tausendertrennzeichen mit zwei Nachkommastellen), entsprechend
+                total</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><varname>transdate</varname></term>
+              <term>qr_reference</term>
 
               <listitem>
-                <para>Auftragsdatum wenn die Rechnung aus einem Auftrag
-                erstellt wurde</para>
+                <para>QR-Referenz der jeweiligen Rechnung, sofern in der
+                <emphasis>Mandantenkonfiguration → Features → Variante QR-IBAN
+                mit QR-Referenz erzeugen</emphasis> aktiviert ist</para>
               </listitem>
             </varlistentry>
           </variablelist>
@@ -5655,9 +6353,12 @@ digits_year: 4</programlisting>
           </variablelist>
 
           <para>Für jeden Posten gibt es ein Unterarray mit den Informationen
-          über Lieferanten und Lieferantenartikelnummer. Diese müssen mit
+          über Lieferanten und Lieferantenartikelnummer, Kunde und Kundenartikelnummer
+          und Kunden- bzw. Lieferantentyp und zugehöriger Artikelnummer mit Beschreibung
+          und Langtext. Diese müssen jeweils mit
           einer <function>foreach</function>-Schleife ausgegeben werden, da
-          für jeden Artikel mehrere Lieferanteninformationen hinterlegt sein
+          für jeden Artikel mehrere Lieferanten- und Kundeninformationen bzw.
+          kunden- bzw. lieferantenspezifische Informationen hinterlegt sein
           können. Die Variablen dafür lauten:</para>
 
           <variablelist>
@@ -5676,9 +6377,105 @@ digits_year: 4</programlisting>
                 <para>Lieferantenartikelnummer</para>
               </listitem>
             </varlistentry>
+
+            <varlistentry>
+              <term><varname>mm_part_description</varname></term>
+
+              <listitem>
+                <para>Lieferantenartikelbeschreibung</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>mm_part_longdescription</varname></term>
+
+              <listitem>
+                <para>Lieferantenartikelbeschreibung (Langtext)</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>customer_make</varname></term>
+
+              <listitem>
+                <para>Kunde</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>customer_model</varname></term>
+
+              <listitem>
+                <para>Kundenartikelnummer</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>cm_part_description</varname></term>
+
+              <listitem>
+                <para>Kundenartikelbeschreibung</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>cm_part_longdescription</varname></term>
+
+              <listitem>
+                <para>Kundenartikelbeschreibung (Langtext)</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>business_make</varname></term>
+
+              <listitem>
+                <para>Kunden-/Lieferantentyp</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>business_model</varname></term>
+
+              <listitem>
+                <para>Kunden-/Lieferantentyp-spezifische Artikelnummer</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>bm_part_description</varname></term>
+
+              <listitem>
+                <para>Kunden-/Lieferantentyp-spezifische Artikelbeschreibung</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term><varname>bm_part_longdescription</varname></term>
+
+              <listitem>
+                <para>Kunden-/Lieferantentyp-spezifische Artikelbeschreibung (Langtext)</para>
+              </listitem>
+            </varlistentry>
+
           </variablelist>
         </sect3>
 
+        <sect3 id="dokumentenvorlagen-und-variablen.invoice-posten-cvars">
+          <title>Benutzerdefinierte Variablen für jeden Posten auf der Rechnung</title>
+          <para>
+            Für jeden Posten stehen auch die benutzerdefinierten Variablen zum
+            Artikel zur Verfügung. Ihre Namen bestehen aus dem Präfix
+            <varname>ic_cvar_</varname> und dem vom Benutzer festgelegten
+            Variablennamen.
+          </para>
+          <para>
+            Ebenso stehen die benutzerdefinierten Variablen zum positionsbezogenen
+            Projekt unter dem Namen mit dem Präfix <varname>project_cvar_</varname>
+            und dem vom Benutzer festgelegten Variablennamen zur Verfügung.
+          </para>
+        </sect3>
+
         <sect3 id="dokumentenvorlagen-und-variablen.invoice-zahlungen">
           <title>Variablen für die einzelnen Zahlungseingänge</title>
 
@@ -5747,6 +6544,10 @@ digits_year: 4</programlisting>
           <para>Analog stehen die benutzerdefinierten Variablen für
           Ansprechpersonen mit dem Namenspräfix <varname>cp_cvar_</varname>
           zur Verfügung.</para>
+
+          <para>Auch für das globale Projekt des Belegs stehen die
+          benutzerdefinierten Variablen mit dem Namenspräfix
+          <varname>project_cvar_</varname> zur Verfügung.</para>
         </sect3>
       </sect2>
 
@@ -7378,147 +8179,552 @@ document_path = /var/local/kivi_documents
         url="https://developers.shopware.com/developers-guide/rest-api/">https://developers.shopware.com/developers-guide/rest-api/</ulink></para>
       </sect2>
     </sect1>
-	<sect1 id="features.zugferd">
-		<title>ZUGFeRD Rechnungen</title>
-		<sect2 id="features.zugferd.preamble">
-			<title>Vorbedingung</title>
-         <para>
-          Für die Erstellung von ZUGFeRD PDFs wird TexLive2018 oder höher benötigt.
-         </para>
-        <note>
-         <para>
-          Wer kein TexLive2018 oder höher installieren kann, kann eine lokale Umgebung nur für kivitendo wie folgt erzeugen:
-         </para>
-        <programlisting>
-        1. Download des offiziellen Installers von https://www.tug.org/texlive/quickinstall.html
+    <sect1 id="features.zugferd">
+      <title>ZUGFeRD Rechnungen</title>
+      <sect2 id="features.zugferd.preamble">
+        <title>Vorbedingung</title>
+           <para>
+            Für die Erstellung von ZUGFeRD PDFs wird TexLive2018 oder höher benötigt.
+           </para>
+          <note>
+           <para>
+            Wer kein TexLive2018 oder höher installieren kann, kann eine lokale Umgebung nur für kivitendo wie folgt erzeugen:
+           </para>
+          <programlisting>
+          1. Download des offiziellen Installers von https://www.tug.org/texlive/quickinstall.html
 
-        2. Installer ausführen, Standard-Ort für Installation belassen, evtl. ein paar Pakete abwählen, installieren lassen
+          2. Installer ausführen, Standard-Ort für Installation belassen, evtl. ein paar Pakete abwählen, installieren lassen
 
-        3. Ein kleine Script »run_pdflatex.sh« anlegen, das den PATH auf das  Installationsverezichnis setzt und pdflatex ausführt:
+          3. Ein kleine Script »run_pdflatex.sh« anlegen, das den PATH auf das  Installationsverezichnis setzt und pdflatex ausführt:
 
-        ------------------------------------------------------------
-        #!/bin/bash
+          ------------------------------------------------------------
+          #!/bin/bash
 
-        export PATH=/usr/local/texlive/2020/bin/x86_64-linux:$PATH
-        hash -r
+          export PATH=/usr/local/texlive/2020/bin/x86_64-linux:$PATH
+          hash -r
 
-        exec pdflatex &quot;$@&quot;
-        ------------------------------------------------------------
+          exec latexmk --pdflatex &quot;$@&quot;
+          ------------------------------------------------------------
 
-        4. In config/kivitendo.conf den Parameter »latex« auf den Pfad zu »run_pdflatex.sh« setzen
+          4. In config/kivitendo.conf den Parameter »latex« auf den Pfad zu »run_pdflatex.sh« setzen
 
-        5. Webserver neu starten
-        </programlisting>
-      </note>
-    </sect2>
-		<sect2 id="features.zugferd.summary">
-			<title>Übersicht</title>
-
-			<para>Mit der Version 3.5.6 bietet kivitendo die Möglichkeit ZUGFeRD
-			Rechnungen zu erstellen, sowie auch  ZUGFeRD Rechnungen direkt in
-			kivitendo einzulesen. </para>
-
-			<para>Bei  ZUGFeRD Rechnungen handelt es sich um eine PDF Datei in
-			der eine XML-Datei eingebettet ist. Der Aufbau der XML-Datei ist
-			standardisiert und ermöglicht so den Austausch zwischen
-			den verschiedenen Softwareprodukten. Kivitendo setzt mit der
-			Version 3.5.6 den ZUGFeRD 2.1 Standard um.</para>
-
-			<para>Weiter Details zu ZUGFeRD sind unter diesem Link zu finden:
-			<ulink url="https://www.ferd-net.de/standards/was-ist-zugferd/index.html">https://www.ferd-net.de/standards/was-ist-zugferd/index.html</ulink>
-      </para>
-		</sect2>
+          5. Webserver neu starten
+          </programlisting>
+        </note>
+      </sect2>
+      <sect2 id="features.zugferd.summary">
+        <title>Übersicht</title>
+
+        <para>Mit der Version 3.5.6 bietet kivitendo die Möglichkeit ZUGFeRD
+        Rechnungen zu erstellen, sowie auch  ZUGFeRD Rechnungen direkt in
+        kivitendo einzulesen. </para>
+
+        <para>Bei  ZUGFeRD Rechnungen handelt es sich um eine PDF Datei in
+        der eine XML-Datei eingebettet ist. Der Aufbau der XML-Datei ist
+        standardisiert und ermöglicht so den Austausch zwischen
+        den verschiedenen Softwareprodukten. Kivitendo setzt mit der
+        Version 3.5.6 den ZUGFeRD 2.1 Standard um.</para>
+
+        <para>Weiter Details zu ZUGFeRD sind unter diesem Link zu finden:
+        <ulink url="https://www.ferd-net.de/standards/was-ist-zugferd/index.html">https://www.ferd-net.de/standards/was-ist-zugferd/index.html</ulink>
+        </para>
+      </sect2>
+      <sect2 id="features.zugferd.create_zugferd_bills">
+
+        <title>Erstellen von ZUGFeRD Rechnungen in Kivitendo</title>
+        <para>Für die Erstellung von ZUGFeRD Rechnungen bedarf es in
+        kivitendo zwei Dinge:</para>
+
+        <orderedlist>
+
+          <listitem>
+            <para>Die Erstellung muss in der Mandantenkonfiguration
+            aktiviert sein</para>
+          </listitem>
+
+          <listitem>
+            <para>Beim mindestens einem Bankkonto muss die Option
+            „Nutzung von ZUGFeRD“ aktiviert sein</para>
+          </listitem>
+
+        </orderedlist>
+        <sect3>
+          <title>Mandantenkonfiguration</title>
+
+          <para>Die Einstellung für die Erstellung von ZUGFeRD Rechnungen
+          erfolgt unter „System“ → „Mandatenkonfiguration“ → „Features“.
+          Im Abschnitt „Einkauf und Verkauf“ finden Sie die Einstellung
+          „Verkaufsrechnungen mit ZUGFeRD-Daten erzeugen“.
+          Hier besteht die Auswahl zwischen:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>ZUGFeRD-Rechnungen erzeugen</para>
+            </listitem>
+
+            <listitem>
+              <para>ZUGFeRD-Rechnungen im Testmodus erzeugen</para>
+            </listitem>
+
+            <listitem>
+              <para>Keine ZUGFeRD Rechnungen erzeugen</para>
+            </listitem>
 
-		<sect2 id="features.zugferd.create_zugferd_bills">
+          </itemizedlist>
 
-			<title>Erstellen von ZUGFeRD Rechnungen in Kivitendo</title>
-			<para>Für die Erstellung von ZUGFeRD Rechnungen bedarf es in
-			kivitendo zwei Dinge:</para>
+          <para>Rechnungen die als PDF erzeugt werden, werden je nach
+          Einstellung nun im ZUGFeRD Format ausgegeben.</para>
 
-			<orderedlist>
+        </sect3>
+        <sect3>
+          <title>Konfiguration der Bankkonten</title>
 
-				<listitem>
-					<para>Die Erstellung muss in der Mandantenkonfiguration
-					aktiviert sein</para>
-				</listitem>
+          <para>Unter „System → Bankkonten“ muss bei mindestens einem
+          Bankkonto die Option „Nutzung mit ZUGFeRD“ auf „Ja“ gestellt
+          werden.</para>
+        </sect3>
+      </sect2>
 
-				<listitem>
-					<para>Beim mindestens einem Bankkonto muss die Option
-					„Nutzung von ZUGFeRD“ aktiviert sein</para>
-				</listitem>
+      <sect2 id="features.zugferd.read_zugferd_bills">
 
-			</orderedlist>
-			<sect3>
-				<title>Mandantenkonfiguration</title>
+        <title>Einlesen von ZUGFeRD Rechnungen in Kivitendo</title>
 
-				<para>Die Einstellung für die Erstellung von ZUGFeRD Rechnungen
-				erfolgt unter „System“ → „Mandatenkonfiguration“ → „Features“.
-				Im Abschnitt „Einkauf und Verkauf“ finden Sie die Einstellung
-				„Verkaufsrechnungen mit ZUGFeRD-Daten erzeugen“.
-				Hier besteht die Auswahl zwischen:</para>
+        <para>Es lassen sich auch Rechnungen von Kreditoren, die im
+        ZUGFeRD Format erstellt wurden, nach Kivitendo importieren.
+        Hierfür müssen auch zwei Voraussetzungen erfüllt werden:
+        </para>
 
-				<itemizedlist>
-					<listitem>
-						<para>ZUGFeRD-Rechnungen erzeugen</para>
-					</listitem>
+        <orderedlist>
 
-					<listitem>
-						<para>ZUGFeRD-Rechnungen im Testmodus erzeugen</para>
-					</listitem>
+          <listitem>
+            <para>Beim Lieferanten muss die Umsatzsteuer-ID und das
+            Bankkonto hinterlegt sein</para>
+          </listitem>
 
-					<listitem>
-						<para>Keine ZUGFeRD Rechnungen erzeugen</para>
-					</listitem>
+          <listitem>
+            <para>Für den Kreditoren muss eine Buchungsvorlage existieren.</para>
+          </listitem>
 
-				</itemizedlist>
+        </orderedlist>
 
-				<para>Rechnungen die als PDF erzeugt werden, werden je nach
-				Einstellung nun im ZUGFeRD Format ausgegeben.</para>
+        <para>Wenn diese Voraussetzungen erfüllt sind, kann die Rechnung
+        über „Finanzbuchhaltung“ → „Factur-X-/ZUGFeRD-Import“ über die „Durchsuchen“
+        Schaltfläche ausgewählt werden und über die Schaltfläche „Import“
+        eingeladen werden. Es öffnet sich daraufhin die Kreditorenbuchung.
+        Die auslesbaren Daten aus dem eingebetteten XML der PDF Datei
+        werden in der Kreditorenbuchung ergänzt.</para>
 
-			</sect3>
+      </sect2>
 
-			<sect3>
-				<title>Konfiguration der Bankkonten</title>
+    </sect1>
 
-				<para>Unter „System → Bankkonten“ muss bei mindestens einem
-				Bankkonto die Option „Nutzung mit ZUGFeRD“ auf „Ja“ gestellt
-				werden.</para>
-			</sect3>
+    <sect1 id="features.reclamations">
+      <title>Reklamationen</title>
 
-		</sect2>
+      <para> Reklamationen dienen dazu im Verkauf die Kundenzufriedenheit zu verbessern und Fehler in der Abwicklung von Aufträgen aufzuspüren und dann zu vermeiden.</para>
 
-		<sect2 id="features.zugferd.read_zugferd_bills">
+      <para>Im Einkauf helfen Reklamationen beanstandete Lieferungen zu verwalten und zu kontrollieren.</para>
+      <sect2>
+        <title>Konfiguration des Reklamationsmodul</title>
+        <para>Unter dem Menu "System->Reklamationsgründe" muss mindestens ein Reklamationsgrund erfasst werden.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Reklamationsgruende_anlegen.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Aufgrund der Gründe können später in den Berichten Auswertungen gemacht werden.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Reklamationsgruende_liste.png"/>
+          </imageobject>
+        </mediaobject>
+      </sect2>
+      <sect2>
+        <title>Reklamation erfassen</title>
+        <para>Aus den Belegen EK/VK Auftrag, EK/VK Lieferschein, EK/VK Rechnung kann unter "Workflow->Reklöamation erfassen" eine dem Workflow zugehörige Reklamation erfasst werden.
+          Die Reklamationsmaske ähnelt im großem die der Auftragsmaske.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Reklamation_erfassen.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Es werden alle Positionen aus dem Beleg übernomen. Deswegen müssen hie die Positionen angepasst werden.
+          Zusätzlich muss noch ein Reklamationsgrund angegeben werden.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Reklamation_erfassen_grund.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Die Reklamationsgründe sind für spätere Auswertungen notwendig</para>
+        <note id="reclamations.anmerkung_grund_einkauf">
+          <para>Anmerkung: Da bei einem Auftrag, sowohl im EK als auch im VK, noch keine Ware versendet bzw. empfangen wurde, könnte hier ein Reklamationsgrund "Lieferver sein.</para>
+        </note>
+      </sect2>
+      <sect2>
+        <title>Reklamationen auswerten</title>
+        <para>Bisher gibt es nur eine Liste mit Reklamationen und deren Filtermöglichkeiten.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Reklamation_erfassen_grund.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Einen individuellen Reklamationsbericht kann über einen "benutzerdefinierten Datenexport" erstellt werden</para>
+      </sect2>
+    </sect1>
 
-			<title>Einlesen von ZUGFeRD Rechnungen in Kivitendo</title>
+    <sect1 id="features.dispositionsmanager">
+      <title>Dispositionsmanager/Einkaufshelfer</title>
 
-			<para>Es lassen sich auch Rechnungen von Kreditoren, die im
-			ZUGFeRD Format erstellt wurden, nach Kivitendo importieren.
-			Hierfür müssen auch zwei Voraussetzungen erfüllt werden:
-			</para>
+      <para> Der Einkaufshelfer generiert Lieferantenaufträge anhand eines Warenkorbes. Der Warenkorb kann
+      einzeln oder mit dem Meldebestandsbericht gefüllt werden. Mit dem Filter „Lieferant“ im
+      Warenkorb werden die Artikel einem Lieferanten zugeordnet und können dann bestellt, d.h. ein
+      Lieferantenauftragerstellt, werden.</para>
 
-			<orderedlist>
+      <sect2>
+        <title>So kommen die Artikel in den Einkaufswarenkorb:</title>
+        <para>1) Sofern ein Artikel einen oder mehrere Lieferanten hat kann dieser über den Button „Einkaufen“
+        in den Einkaufswarenkorn gelegt werden. Soll der Einkauf über den Mindestlagerbestand gesteuert werden sind die Felder "Mindestlagerbestand" und "Bestellmenge" auszufüllen.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Disp-Artikel.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Der Button „Einkaufen“ ist deaktiviert, wenn es keinen Lieferanten zu diesem Artikel gibt oder der
+        Artikel schon im Einkaufswarenkorb liegt.</para>
+      <para>2) Bericht „Meldebestand“
+      Über das Menu "Einkauf->Meldebestand" kann der Meldebestand abgerufen werden</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Disp-Einkauf-meldeb.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Die obere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben und können
+        sofern markiert über die Aktion "Einkaufen" in den Einkaufswarenkorb gelegt werden. Hierzu muss
+        das Feld Mindesbestand in den Artikelstammdaten einen Wert > 0 haben</para>
+      <para>Die untere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben aber bestellt sind.</para>
+      </sect2>
 
-				<listitem>
-					<para>Beim Lieferanten muss die Umsatzsteuer-ID und das
-					Bankkonto hinterlegt sein</para>
-				</listitem>
+      <sect2>
+        <title>Der Einkaufswarenkorb</title>
+        <para>Ohne Filter: der erste Lieferant ist ausgewählt. Hier kann jetzt auch ein anderer Lieferant
+        ausgewählt werden.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Disp-Einkauf-wrnkrb1.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Wird dann nach einem Lieferanten gefiltert und dieser ist und bleibt eindeutig, kann daraus ein
+        Lieferantenauftrag erstellt werden.</para>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/Disp-Einkauf-wrnkrb.png"/>
+          </imageobject>
+        </mediaobject>
+        <para>Die obere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben, der untere Teil zeigt alle
+        Artikel des Lieferanten an, somit ist es möglich diese Artikel auszuwählen und gleich mitzubestellen</para>
+      </sect2>
+    </sect1>
 
-				<listitem>
-					<para>Für den Kreditoren muss eine Buchungsvorlage existieren.</para>
-				</listitem>
+    <sect1 id="features.timerecording">
+      <title>Zeiterfassung</title>
+      <para>
+        Seit der Version 3.5.7 enthält kivitendo ein Modul zur Zeiterfassung.
+        Damit ist es möglich, auftrags-, kunden- oder projektbezogen,
+        Arbeitszeiten zu erfassen. Die erfassten Zeiten können über einen
+        Hintergrund-Job in Lieferscheine umgewandelt werden.
+      </para>
+      <sect2 id="features.timerecording.config">
+        <title>Konfiguration</title>
+        <para>
+          Die Zeiterfasssung funktioniert auch ohne Konfiguration, sofern der Benutzer
+          die entsprechenden Rechte besitzt. Allerdings ist
+          es möglich, Artikel für die Zeiterfassung zu konfigurieren, die im Bericht
+          ausgewertet und bei der Umwandlung zum Lieferschein verwendet werden
+          können.
+          Zudem kann auf benutzerebene eingestellt werden, ob Zeiten mit Start- und
+          End-Zeit oder mit Datum und Dauer erfasst werden sollen.
+        </para>
+        <sect3 id="features.timerecording.config.rights">
+          <title>Zugriffsrechte</title>
+          <para>
+            In der Rechteverwaltung im Admin-Bereich können im Zusammenhang mit
+            der Zeiterfassung drei verschiedene Rechte vergeben werden:
 
-			</orderedlist>
+            <itemizedlist>
+              <listitem>
+                <para><emphasis>Zeiterfassungen erfassen, bearbeiten und ansehen</emphasis></para>
+                <para>Diese Recht steuert, ob eine Gruppe den Menüpunkt zur
+                Zeiterfassung überhaupt sehen und diese verwenden kann.</para>
+              </listitem>
 
-			<para>Wenn diese Voraussetzungen erfüllt sind, kann die Rechnung
-			über „Finanzbuchhaltung“ → „Factur-X-/ZUGFeRD-Import“ über die „Durchsuchen“
-			Schaltfläche ausgewählt werden und über die Schaltfläche „Import“
-			eingeladen werden. Es öffnet sich daraufhin die Kreditorenbuchung.
-			Die auslesbaren Daten aus dem eingebetteten XML der PDF Datei
-			werden in der Kreditorenbuchung ergänzt.</para>
+              <listitem>
+                <para><emphasis>Zeiterfassungseinträge aller Mitarbeiter anzeigen</emphasis></para>
+                <para>Ohne dieses Recht darf ein Benutzer einer Benutzergruppe,
+                die die Zeiterfassung verwenden darf, nur Zeiteinträge im Bericht
+                sehen, bei denen dieser als Mitarbeiter eingetragen ist.</para>
+              </listitem>
 
-		</sect2>
+              <listitem>
+                <para><emphasis>Zeiterfassungseinträge aller Mitarbeiter bearbeiten</emphasis></para>
+                <para>Ohne dieses Recht darf ein Benutzer einer Benutzergruppe,
+                die die Zeiterfassung verwenden darf, nur Zeiteinträge anlegen
+                und bearbeiten, bei denen dieser als Mitarbeiter eingetragen ist.</para>
+              </listitem>
+          </itemizedlist>
 
-	</sect1>
+          </para>
+        </sect3>
+        <sect3 id="features.timerecording.config.part">
+          <title>Artikel für Zeiterfassung</title>
+          <para>
+            Unter <emphasis><guimenu>System</guimenu>
+            → <guisubmenu>Artikel für Zeiterfassung</guisubmenu></emphasis>
+            können Artikel zur Nutzung mit der Zeiterfassung erfasst werden. Diese Artikel
+            müssen eine zeitbasierte Einheit haben.
+          </para>
+        </sect3>
+        <sect3 id="features.timerecording.config.time_or_duration">
+          <title>Benutzereinstellungen</title>
+          <para>
+            Unter <emphasis><guimenu>Programm</guimenu>
+            → <guisubmenu>Benutzereinstellungen</guisubmenu></emphasis>
+            im Reiter <emphasis>Persönliche Einstellungen</emphasis> bei
+            <emphasis>Datum und Dauer für Zeiterfassung verwenden</emphasis>
+            kann der Benutzer angeben, ob Zeiten mit Start- und End-Zeit oder mit
+            Datum und Dauer erfasst werden sollen.
+          </para>
+        </sect3>
+      </sect2>
+      <sect2 id="features.timerecording.add">
+        <title>Erfassen</title>
+        <para>
+          Über den Menüpunkt <emphasis><guimenu>Produktivität</guimenu>
+          → <guisubmenu>Zeiterfassung</guisubmenu></emphasis>
+          gelangt man zur Erfassungsmaske der Zeiterfassung. Je nach Einstellung
+          muss ein Datum oder Datum und Start-Zeit angegeben werden. Ebenso sind
+          die Felder <emphasis>Kunde</emphasis> und
+          <emphasis>Beschreibung</emphasis>
+          Pflichtfelder.
+        </para>
+        <para>
+          Wird ein Auftrag oder ein Projekt, dem ein Kunde zugeordnet ist,
+          ausgewählt, so wird das Feld <emphasis>Kunde</emphasis>
+          automatisch mit dem zugehörigen Kunden gefüllt und für die
+          manuelle Bearbeitung gesperrt.
+        </para>
+        <para>
+          Die End-Zeit bzw. die Dauer ist kein Pflichtfeld, damit
+          man einen Eintrag z.B. beim Start der Arbeit anlegen und
+          später am Ende dann die End-Zeit bzw. Dauer erfassen kann.
+          Bei Eingabe über Start- und End-Zeit dürfen sich die Zeiten für
+          ein und denselben Mitarbeiter nicht überlappen.
+        </para>
+        <para>
+          Falls der Bearbeiter das Recht
+          <emphasis>Zeiterfassungseinträge aller Mitarbeiter
+          bearbeiten</emphasis> besitzt, kann auch der Mitarbeiter für
+          diesen Zeiteintrag ausgewählt werden.
+        </para>
+      </sect2>
+      <sect2 id="features.timerecording.report">
+        <title>Bericht</title>
+        <para>
+          Ein Bericht über die erfassten Zeiten lässt sich über
+          <emphasis><guimenu>Produktivität</guimenu> → <guisubmenu>Berichte</guisubmenu>
+          → <guisubmenu>Zeiterfassung</guisubmenu></emphasis> ausgeben.
+          Hier lassen sich die Zeiten auch filtern, sortieren und exportieren.
+        </para>
+        <para>
+          Ausgewählte Zeiteinträge können über <emphasis><guimenu>Aktionen</guimenu>
+          → <guisubmenu>Als gebucht markieren</guisubmenu></emphasis> als schon gebucht
+          markiert werden. Dies geschieht normalerweise bei der Konvertierung
+          zum Lieferschein und kann hier händisch durchgeführt werden, wenn diese
+          Zeitbuchungen bei der Konvertierung nicht mehr berücksichtigt werden sollen.
+        </para>
+      </sect2>
+      <sect2 id="features.timerecording.conversion">
+        <title>Konvertierung zu Lieferscheinen</title>
+        <para>
+          Über den Hintergrund-Job
+          <emphasis>ConvertTimeRecordings</emphasis> können
+          Zeiteinträge in Lieferscheine umgewandelt werden. Hierbei
+          werden alle noch nicht gebuchten Zeiteinträge eines
+          bestimmten Zeitraums für bestimmte Kunden gesammelt und
+          in Lieferscheine umgewandelt.
+          Pro Kunde wird ein Lieferschein generiert und
+          pro Artikel wird eine Positionszeile erzeugt. Dabei werden
+          Einträge mit gleichen Beschreibungen zusammengefasst. Die
+          Details landen im Langtext der Position.
+        </para>
+        <para>
+          Ohne übergebene Parameter im Feld <emphasis>Daten</emphasis> werden alle
+          Zeiteinträge des letzten Monats für alle Kunden umgewandelt. Dabei
+          werden die Zeiten auf volle Viertelstunden aufgerundet (siehe auch
+          <xref linkend="features.timerecording.configuration"/>).
+        </para>
+        <sect3 id="features.timerecording.configuration" xreflabel="Konfigurations-Optionen der Zeiterfassung">
+          <title>Konfigurations-Optionen</title>
+          <para>
+            Zur generellen Konfiguration von Hintergrund-Jobs und zur Übergabe
+            von Parametern als Daten an diese, siehe <xref linkend="config.task-server"/>
+            bzw. <xref linkend="Hintergrund-Jobs konfigurieren"/>).
+          </para>
+          <para>
+            Folgende Parameter können als <emphasis>Daten</emphasis> an den
+            Hintergrund-Job zur Konvertierung übergeben werden:
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <emphasis>from_date</emphasis>
+                </para>
+                <para>
+                  Das Startdatum, von welchen an die Zeiteinträge berücksicht werden.
+                  Voreinstellung ist der erste Tag des vorherigen Montats.
+                </para>
+                <para>
+                  Beispiel (das Zeitformat hängt von der persönlichen Einstellungen ab):
+                  <programlisting>from_date: 01.12.2020</programlisting>
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <emphasis>to_date</emphasis>
+                </para>
+                <para>
+                  Das Datum, bis zu welchem die Zeiteinträge zur Konvertierung gesammelt
+                  werden. Voreinstellung ist der letzte Tag des vorherigen Montas.
+                </para>
+                <para>
+                  Beispiel (das Zeitformat hängt von der persönlichen Einstellungen ab):
+                  <programlisting>to_date: 15.12.2020</programlisting>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  <emphasis>customernumbers</emphasis>
+                </para>
+                <para>
+                  Eine Liste mit Kundennummern, für die Zeiteinträge gesammelt werden
+                  sollen. Wird diese Liste nicht angegeben, werden Einträge für
+                  alle Kunden berücksichtig.
+                </para>
+                <para>
+                  <programlisting>customernumbers: [c1,22332,334343]</programlisting>
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <emphasis>override_part_id</emphasis>
+                </para>
+                <para>
+                  Die Datenbank-Id einer zeitbasierten Dienstleistung, die verwendet
+                  werden soll, um die Zeiteinträge zu buchen. Dieser Wert überschreibt
+                  den Eintrag des Artikels des Zeiteintrags.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <emphasis>default_part_id</emphasis>
+                </para>
+                <para>
+                  Die Datenbank-Id einer zeitbasierten Dienstleistung, die verwendet
+                  werden soll, um die Zeiteinträge zu buchen, falls im Zeiteintrag
+                  kein Artikel gespeichert ist.
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <emphasis>rounding</emphasis>
+                </para>
+                <para>
+                  Ist dieser Wert <literal>0</literal>, so werden die Zeiten nicht gerundet.
+                  Ist der Wert <literal>1</literal> (oder "wahr" in Perl"), so werden die Zeiten auf volle Viertelstunden aufgerundet, also z.B. 0.25h, 0.5h, 0.75h,
+                  1.25h ...
+                </para>
+                <para>
+                  Voreinstellung ist <literal>1</literal> ("wahr").
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <emphasis>link_order</emphasis>
+                </para>
+                <para>
+                  Ist der Wert <literal>1</literal> (oder "wahr" in Perl"), so verknüpft
+                  der Hintergrund-Job den erzeugten Lieferschein mit dem im Zeiteintrag
+                  angegebenen Auftrag.
+                  Ist kein Auftrag angegeben, wird versucht, einen Auftrag für den
+                  angegebenen Kunden und die angegebene Projektnummer zu finden.
+                </para>
+                <para>
+                  Folgende Kriterien werden zum Finden eines Vorgängerauftrags angwendet:
+                  <itemizedlist>
+                    <listitem><para>
+                      Auftrag ist im Zeiteintrag angegeben <emphasis>oder</emphasis>
+                    </para></listitem>
+                    <listitem><para>
+                      Datenbank-Id des Projekts des Auftrags ist gleich
+                      der Datenbank-Id des Zeiteintrags <emphasis>oder</emphasis> der in den Daten
+                      übergebenen Projekt-Id
+                    </para></listitem>
+                    <listitem><para>
+                      Kunde des Auftrags ist gleich Kunde des Zeiteintrags
+                    </para></listitem>
+                    <listitem><para>
+                      der Auftrag muss mindestens eine zugehörige zeitbasierte Position haben
+                    </para></listitem>
+                    <listitem><para>
+                      das Projekt muss gültig und aktiv sein
+                    </para></listitem>
+                  </itemizedlist>
+                </para>
+                <para>
+                  Voreinstellung ist aus. Wenn dieser Parameter gesetzt ist, läuft der
+                  Hintergrund-Job auf einen Fehler, falls kein geeigneter Vorgängerauftrag
+                  gefunden werden kann.
+                </para>
+                <para>
+                  Der Job beachtet nicht, ob der Auftrag schon geliefert oder geschlossen
+                  ist.
+                  Wenn der Kundenauftrag überliefert wird, muss dies organisatorisch
+                  geklärt werden. Der Kundenauftrag kann auch bereits geschlossen sein,
+                  d.h. der Betrag ist vollständig fakturiert, aber die Leistungen sind
+                  noch nicht vollständig geliefert (einfacher Fall: "Vorauskasse").
+                </para>
+                <para>
+                  siehe auch den Hintergrund-Job
+                  <literal>CloseProjectsBelongingToClosedSalesOrder</literal>
+                  für eine weitergehende Automatisierung der Abläufe.
+                </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    <emphasis>override_project_id</emphasis>
+                  </para>
+                  <para>
+                    Verwende diese Datenbank-Id für das Projekt an Stelle des
+                    im Zeiteintrag angegebenen Projekts, um den zugehörigen Auftrag
+                    zu finden. Dieser Parameter wird nur berücksichtig, wenn
+                    <emphasis>link_order</emphasis> wahr ist.
+                  </para>
+                </listitem>
+                <listitem>
+                  <para>
+                    <emphasis>default_project_id</emphasis>
+                  </para>
+                  <para>
+                    Verwende diese Datenbank-Id für das Projekt, falls
+                    im Zeiteintrag kein Projekt angegeben ist, um den
+                    zugehörigen Auftrag zu finden.
+                    Dieser Parameter wird nur berücksichtig, wenn
+                  </para>
+                </listitem>
+            </itemizedlist>
+          </para>
+        </sect3>
+      </sect2>
+    </sect1>
 
   </chapter>
 
@@ -7872,8 +9078,8 @@ document_path = /var/local/kivi_documents
           brauchbares Tracing gebaut ist, "<function>log_time</function>", mit
           der man die Wallclockzeit seit Requeststart loggen kann, sowie
           "<function>message</function>" und "<function>dump</function>" mit
-          denen man flott Informationen ins Log (tmp/kivitendo-debug.log)
-          packen kann.</para>
+          denen man flott Informationen ins Log (users/kivitendo-debug.log
+          relativ zum kivitendo-Installationsverzeichnis) packen kann.</para>
 
           <para>Beispielsweise so:</para>
 
@@ -7943,7 +9149,7 @@ $main::lxdebug-&gt;message(0, 'Wer bin ich? Kunde oder Lieferant:' . $form-&gt;{
           verfügbar:</para>
 
           <programlisting>[debug]
-file_name = /tmp/kivitendo-debug.log</programlisting>
+file_name = users/kivitendo-debug.log</programlisting>
 
           <para>ist der Key <varname>file</varname> im Programm als
           <varname>$::lx_office_conf-&gt;{debug}{file}</varname>
@@ -9378,7 +10584,7 @@ $some_hash{42}    = 54;</programlisting>
             Paket, das benötigt wird, ist zum Zeitpunkt der
             Dokumentationserstellung
             <filename>dobudish-nojre-1.1.4.zip</filename>, aus auf <ulink
-            url="http://code.google.com/p/dobudish/downloads/list">code.google.com</ulink>
+            url="https://code.google.com/archive/p/dobudish/downloads">code.google.com</ulink>
             bereitsteht.</para>
           </listitem>
         </itemizedlist>
@@ -9387,15 +10593,22 @@ $some_hash{42}    = 54;</programlisting>
         sind auf allen gängigen Plattformen verfügbar. Beispiel für
         Debian/Ubuntu:</para>
 
-        <programlisting>apt-get install ant openjdk-7-jre</programlisting>
+        <programlisting>apt-get install ant default-jre</programlisting>
 
         <para>Nach dem Download von Dobudish muss Dobudish im Unterverzeichnis
-        <filename>doc/build</filename> entpackt werden. Beispiel unter der
+        <filename>kivitendo-erp/doc/build</filename> entpackt werden. Beispiel unter der
         Annahme, das <productname>Dobudish</productname> in
         <filename>$HOME/Downloads</filename> heruntergeladen wurde:</para>
 
-        <programlisting>cd doc/build
+        <programlisting>cd kivitendo-erp/doc/build
 unzip $HOME/Downloads/dobudish-nojre-1.1.4.zip</programlisting>
+
+        <para>Damit auf Dobudish zugegriffen werden kann, muss ein Link mit dem Namen
+        <filename>dobudish</filename> erstellt werden, der auf den Ordner
+        <filename>dobudish-nojre-1.1.4</filename> zeigt.</para>
+
+        <programlisting>cd kivitendo-erp/doc/build
+ln -sf dobudish-1.1.4 dobudish</programlisting>
       </sect2>
 
       <sect2 id="devel.build-doc.build">
diff --git a/doc/html/ch01.html b/doc/html/ch01.html
index 1e8bca35a..018c20b23 100644
--- a/doc/html/ch01.html
+++ b/doc/html/ch01.html
@@ -1,9 +1,9 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>Kapitel 1. Aktuelle Hinweise</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="prev" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="next" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 1. Aktuelle Hinweise</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 1. Aktuelle Hinweise"><div class="titlepage"><div><div><h2 class="title"><a name="Aktuelle-Hinweise"></a>Kapitel 1. Aktuelle Hinweise</h2></div></div></div><p>Aktuelle Installations- und Konfigurationshinweise gibt es:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>im Community-Forum: <a class="ulink" href="https://forum.kivitendo.de" target="_top">https://forum.kivitendo.de</a>
-            </p></li><li class="listitem"><p>im Kunden-Forum: <a class="ulink" href="http://redmine.kivitendo-premium.de/projects/forum/boards/" target="_top">http://redmine.kivitendo-premium.de/projects/forum/boards/</a>
+   <title>Kapitel 1. Aktuelle Hinweise</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="prev" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="next" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 1. Aktuelle Hinweise</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 1. Aktuelle Hinweise"><div class="titlepage"><div><div><h2 class="title"><a name="Aktuelle-Hinweise"></a>Kapitel 1. Aktuelle Hinweise</h2></div></div></div><p>Aktuelle Installations- und Konfigurationshinweise gibt es:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>im Community-Forum: <a class="ulink" href="https://forum.kivitendo.de" target="_top">https://forum.kivitendo.de</a>
+            </p></li><li class="listitem"><p>im Kunden-Forum: <a class="ulink" href="https://www.kivitendo.de/redmine/projects/forum/boards/" target="_top">https://www.kivitendo.de/redmine/projects/forum/boards/</a>
             </p></li><li class="listitem"><p>in der doc/UPGRADE Datei im doc-Verzeichnis der
         Installation</p></li><li class="listitem"><p>Im Schulungs- und Dienstleistungsangebot der entsprechenden
-        kivitendo-Partner: <a class="ulink" href="http://www.kivitendo.de/partner.html" target="_top">http://www.kivitendo.de/partner.html</a>
-            </p></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">kivitendo 3.6.1: Installation, Konfiguration,
+        kivitendo-Partner: <a class="ulink" href="https://www.kivitendo.de/partner.html" target="_top">https://www.kivitendo.de/partner.html</a>
+            </p></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">kivitendo 3.9.2: Installation, Konfiguration,
   Entwicklung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;Kapitel 2. Installation und Grundkonfiguration</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02.html b/doc/html/ch02.html
index 1c494b747..d9320d28c 100644
--- a/doc/html/ch02.html
+++ b/doc/html/ch02.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>Kapitel 2. Installation und Grundkonfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch01.html" title="Kapitel 1. Aktuelle Hinweise"><link rel="next" href="ch02s02.html" title="2.2. Benötigte Software und Pakete"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 2. Installation und Grundkonfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 2. Installation und Grundkonfiguration"><div class="titlepage"><div><div><h2 class="title"><a name="config"></a>Kapitel 2. Installation und Grundkonfiguration</h2></div></div></div><div class="sect1" title="2.1. Übersicht"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Installation-%C3%9Cbersicht"></a>2.1. Übersicht</h2></div></div></div><p>Die Installation von kivitendo umfasst mehrere Schritte. Die
+   <title>Kapitel 2. Installation und Grundkonfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch01.html" title="Kapitel 1. Aktuelle Hinweise"><link rel="next" href="ch02s02.html" title="2.2. Benötigte Software und Pakete"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 2. Installation und Grundkonfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 2. Installation und Grundkonfiguration"><div class="titlepage"><div><div><h2 class="title"><a name="config"></a>Kapitel 2. Installation und Grundkonfiguration</h2></div></div></div><div class="sect1" title="2.1. Übersicht"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Installation-%C3%9Cbersicht"></a>2.1. Übersicht</h2></div></div></div><p>Die Installation von kivitendo umfasst mehrere Schritte. Die
       folgende Liste kann sowohl für Neulinge als auch für alte Hasen als
       Übersicht und Stichpunktliste zum Abhaken dienen, um eine Version mit
       minimalen Features möglichst schnell zum Laufen zu kriegen.</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>
@@ -10,18 +10,18 @@
           diese. Auch die Liste der benötigten Perl-Module befindet sich
           hier.</p></li><li class="listitem"><p>
                   <span class="emphasis"><em>Installation von kivitendo</em></span>: Diese umfasst
-          die "<a class="xref" href="ch02s03.html" title="2.3. Manuelle Installation des Programmpaketes">Manuelle Installation des Programmpaketes</a>"
-          sowie grundlegende Einstellungen, die der "<a class="xref" href="ch02s04.html" title="2.4. kivitendo-Konfigurationsdatei">Abschnitt&nbsp;2.4, „kivitendo-Konfigurationsdatei“</a>" erläutert.</p></li><li class="listitem"><p>
+          die "<a class="xref" href="ch02s04.html" title="2.4. Manuelle Installation des Programmpaketes">Manuelle Installation des Programmpaketes</a>"
+          sowie grundlegende Einstellungen, die der "<a class="xref" href="ch02s05.html" title="2.5. kivitendo-Konfigurationsdatei">Abschnitt&nbsp;2.5, „kivitendo-Konfigurationsdatei“</a>" erläutert.</p></li><li class="listitem"><p>
                   <span class="emphasis"><em>Konfiguration externer Programme</em></span>: hierzu
-          gehören die Datenbank ("<a class="xref" href="ch02s05.html" title="2.5. Anpassung der PostgreSQL-Konfiguration">Abschnitt&nbsp;2.5, „Anpassung der PostgreSQL-Konfiguration“</a>") und der
-          Webserver ("<a class="xref" href="ch02s06.html" title="2.6. Webserver-Konfiguration">Abschnitt&nbsp;2.6, „Webserver-Konfiguration“</a>").</p></li><li class="listitem"><p>
+          gehören die Datenbank ("<a class="xref" href="ch02s06.html" title="2.6. Anpassung der PostgreSQL-Konfiguration">Abschnitt&nbsp;2.6, „Anpassung der PostgreSQL-Konfiguration“</a>") und der
+          Webserver ("<a class="xref" href="ch02s07.html" title="2.7. Webserver-Konfiguration">Abschnitt&nbsp;2.7, „Webserver-Konfiguration“</a>").</p></li><li class="listitem"><p>
                   <span class="emphasis"><em>Benutzerinformationen speichern können</em></span>:
           man benötigt mindestens eine Datenbank, in der Informationen zur
           Authentifizierung sowie die Nutzdaten gespeichert werden. Wie man
-          das als Administrator macht, verrät "<a class="xref" href="ch02s08.html" title="2.8. Benutzerauthentifizierung und Administratorpasswort">Abschnitt&nbsp;2.8, „Benutzerauthentifizierung und Administratorpasswort“</a>".</p></li><li class="listitem"><p>
+          das als Administrator macht, verrät "<a class="xref" href="ch02s10.html" title="2.10. Benutzerauthentifizierung und Administratorpasswort">Abschnitt&nbsp;2.10, „Benutzerauthentifizierung und Administratorpasswort“</a>".</p></li><li class="listitem"><p>
                   <span class="emphasis"><em>Benutzer, Gruppen und Datenbanken
-          anlegen</em></span>: wie dies alles zusammenspielt erläutert "<a class="xref" href="ch02s09.html" title="2.9. Mandanten-, Benutzer- und Gruppenverwaltung">Abschnitt&nbsp;2.9, „Mandanten-, Benutzer- und Gruppenverwaltung“</a>".</p></li><li class="listitem"><p>
+          anlegen</em></span>: wie dies alles zusammenspielt erläutert "<a class="xref" href="ch02s11.html" title="2.11. Mandanten-, Benutzer- und Gruppenverwaltung">Abschnitt&nbsp;2.11, „Mandanten-, Benutzer- und Gruppenverwaltung“</a>".</p></li><li class="listitem"><p>
                   <span class="emphasis"><em>Los geht's</em></span>: alles soweit erledigt? Dann
-          kann es losgehen: "<a class="xref" href="ch02s21.html" title="2.21. kivitendo ERP verwenden">Abschnitt&nbsp;2.21, „kivitendo ERP verwenden“</a>"</p></li></ol></div><p>Alle weiteren Unterkapitel in diesem Kapitel sind ebenfalls
+          kann es losgehen: "<a class="xref" href="ch02s24.html" title="2.24. kivitendo ERP verwenden">Abschnitt&nbsp;2.24, „kivitendo ERP verwenden“</a>"</p></li></ol></div><p>Alle weiteren Unterkapitel in diesem Kapitel sind ebenfalls
       wichtig und sollten vor einer ernsthaften Inbetriebnahme gelesen
       werden.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">Kapitel 1. Aktuelle Hinweise&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.2. Benötigte Software und Pakete</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s02.html b/doc/html/ch02s02.html
index 1a0ec0131..d6a4a88f1 100644
--- a/doc/html/ch02s02.html
+++ b/doc/html/ch02s02.html
@@ -1,23 +1,21 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.2. Benötigte Software und Pakete</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="next" href="ch02s03.html" title="2.3. Manuelle Installation des Programmpaketes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.2. Benötigte Software und Pakete</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.2. Benötigte Software und Pakete"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Ben%C3%B6tigte-Software-und-Pakete"></a>2.2. Benötigte Software und Pakete</h2></div></div></div><div class="sect2" title="2.2.1. Betriebssystem"><div class="titlepage"><div><div><h3 class="title"><a name="Betriebssystem"></a>2.2.1. Betriebssystem</h3></div></div></div><p>kivitendo ist für Linux konzipiert, und sollte auf jedem
+   <title>2.2. Benötigte Software und Pakete</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="next" href="ch02s03.html" title="2.3. Installation mittels Ansible auf Ubuntu 22.04"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.2. Benötigte Software und Pakete</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.2. Benötigte Software und Pakete"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Ben%C3%B6tigte-Software-und-Pakete"></a>2.2. Benötigte Software und Pakete</h2></div></div></div><div class="sect2" title="2.2.1. Betriebssystem"><div class="titlepage"><div><div><h3 class="title"><a name="Betriebssystem"></a>2.2.1. Betriebssystem</h3></div></div></div><p>kivitendo ist für Linux konzipiert, und sollte auf jedem
         unixoiden Betriebssystem zum Laufen zu kriegen sein. Getestet ist
         diese Version im speziellen auf Debian und Ubuntu, grundsätzlich wurde
         bei der Auswahl der Pakete aber darauf Rücksicht genommen, dass es
         ohne große Probleme auf den derzeit aktuellen verbreiteten
-        Distributionen läuft.</p><p>Mitte 2020 (ab Version 3.5.6) empfehlen wir:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Debian</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>10.0 "Buster"</p></li><li class="listitem"><p>11.0 "Bullseye"</p></li></ul></div></li><li class="listitem"><p>20.04 "Focal Fossa" LTS
-          </p></li><li class="listitem"><p>openSUSE Leap 15.x und SUSE Linux Enterprise Server 15 GA</p></li><li class="listitem"><p>Fedora 29</p></li></ul></div></div><div class="sect2" title="2.2.2. Benötigte Perl-Pakete installieren"><div class="titlepage"><div><div><h3 class="title"><a name="Pakete"></a>2.2.2. Benötigte Perl-Pakete installieren</h3></div></div></div><p>Zum Betrieb von kivitendo werden zwingend ein Webserver (meist
+        Distributionen läuft.</p><p>Mitte 2024 (ab Version 3.9) empfehlen wir:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Debian</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>11.0 "Bullseye"</p></li><li class="listitem"><p>12.0 "Bookworm"</p></li></ul></div></li><li class="listitem"><p>Ubuntu</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>20.04 "Focal Fossa" LTS</p></li><li class="listitem"><p>22.04 "Jammy Jellyfish" LTS</p></li></ul></div></li><li class="listitem"><p>openSUSE Leap 15.5 und SUSE Linux Enterprise Server 15 SP4</p></li><li class="listitem"><p>Fedora 39</p></li></ul></div></div><div class="sect2" title="2.2.2. Benötigte Perl-Pakete installieren"><div class="titlepage"><div><div><h3 class="title"><a name="Pakete"></a>2.2.2. Benötigte Perl-Pakete installieren</h3></div></div></div><p>Zum Betrieb von kivitendo werden zwingend ein Webserver (meist
         Apache) und ein Datenbankserver (PostgreSQL) in einer aktuellen
         Version (s.a. Liste der unterstützten Betriebssysteme)
         benötigt.</p><p>Zusätzlich benötigt kivitendo einige Perl-Pakete, die nicht
-        Bestandteil einer Standard-Perl-Installation sind. Um zu überprüfen,
+        Bestandteil einer Standard-Perl-Installation sind. Um nach der
+	Installation von Kivitendo zu überprüfen,
         ob die erforderlichen Pakete installiert und aktuell genug sind, wird
-        ein Script mitgeliefert, das wie folgt aufgerufen wird:</p><pre class="programlisting">./scripts/installation_check.pl</pre><p>Die vollständige Liste der benötigten Perl-Module lautet:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+        ein Script mitgeliefert, das wie folgt aufgerufen wird:</p><pre class="programlisting">./scripts/installation_check.pl</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left"><a name="List-Moreutils"></a>Anmerkung</th></tr><tr><td align="left" valign="top"><p>Das Paket <code class="literal">List::MoreUtils</code> wird benötigt um das Script ausführen zu können!</p></td></tr></table></div><p>Die vollständige Liste der benötigten Perl-Module lautet:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
                      <code class="literal">Algorithm::CheckDigits</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">Archive::Zip</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">CAM::PDF</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">CGI</code>
                   </p></li><li class="listitem"><p>
@@ -44,11 +42,13 @@
                      <code class="literal">Email::Address</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">Email::MIME</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">Encode::IMAPUTF7</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">Exception::Class</code>
                   </p></li><li class="listitem"><p>
-                     <code class="literal">FCGI</code> (nicht Versionen 0.68 bis 0.71
-            inklusive; siehe <a class="xref" href="ch02s06.html#Apache-Konfiguration.FCGI.WebserverUndPlugin" title="2.6.2.3. Getestete Kombinationen aus Webservern und Plugin">Abschnitt&nbsp;2.6.2.3, „Getestete Kombinationen aus Webservern und Plugin“</a>)</p></li><li class="listitem"><p>
+                     <code class="literal">FCGI</code>
+                  </p></li><li class="listitem"><p>
                      <code class="literal">File::Copy::Recursive</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">File::Flock</code>
@@ -77,10 +77,12 @@
                   </p></li><li class="listitem"><p>
                      <code class="literal">List::UtilsBy</code>
                   </p></li><li class="listitem"><p>LWP::Authen::Digest</p></li><li class="listitem"><p>LWP::UserAgent</p></li><li class="listitem"><p>
+                     <code class="literal">Mail::IMAPClient</code>
+                  </p></li><li class="listitem"><p>
                      <code class="literal">Net::SMTP::SSL</code> (optional, bei
-            E-Mail-Versand über SSL; siehe Abschnitt "<a class="xref" href="ch02s11.html#config.sending-email.smtp" title="2.11.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>")</p></li><li class="listitem"><p>
+            E-Mail-Versand über SSL; siehe Abschnitt "<a class="xref" href="ch02s13.html#config.sending-email.smtp" title="2.13.1.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>")</p></li><li class="listitem"><p>
                      <code class="literal">Net::SSLGlue</code> (optional, bei
-            E-Mail-Versand über TLS; siehe Abschnitt "<a class="xref" href="ch02s11.html#config.sending-email.smtp" title="2.11.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>")</p></li><li class="listitem"><p>
+            E-Mail-Versand über TLS; siehe Abschnitt "<a class="xref" href="ch02s13.html#config.sending-email.smtp" title="2.13.1.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>")</p></li><li class="listitem"><p>
                      <code class="literal">Math::Round</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">Params::Validate</code>
@@ -122,13 +124,18 @@
                      <code class="literal">XML::LibXML</code>
                   </p></li><li class="listitem"><p>
                      <code class="literal">YAML::XS</code> oder <code class="literal">YAML</code>
-                  </p></li></ul></div><p>Seit Version größer v3.6.0 sind die folgenden Pakete hinzugekommen: <code class="literal">IPC::Run</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">UUID::Tiny</code>
+                  </p></li></ul></div><p>In der Version v3.9.1 sind keine neuen Pakete hinzugekommen.</p><p>In der Version v3.9.0 sind die folgenden Pakete hinzugekommen:
+          <code class="literal">Mail::IMAPClient</code>, <code class="literal">Encode::IMAPUTF7</code>.
+          Nicht mehr benötigt wird <code class="literal">CAM::PDF</code>.
+        </p><p>In der Version v3.8.0 sind keine neuen Pakete hinzugekommen.</p><p>In der Version v3.7.0 sind keine neuen Pakete hinzugekommen.</p><p>Seit Version größer v3.6.0 sind die folgenden Pakete hinzugekommen: <code class="literal">IPC::Run</code>
             </p><p>Seit Version größer v3.5.8 sind die folgenden Pakete hinzugekommen: <code class="literal">Imager</code>, <code class="literal">Imager::QRCode</code>
 
                <code class="literal">Rest::Client</code>
                <code class="literal">Term::ReadLine::Gnu</code>
             </p><p>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <code class="literal">Try::Tiny</code>, <code class="literal">Math::Round</code>
-            </p><p>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <code class="literal">XML::LibXML</code>, <code class="literal">CAM::PDF</code>
+            </p><p>Seit Version größer v3.5.6 sind die folgenden Pakete hinzugekommen: <code class="literal">XML::LibXML</code>
             </p><p>Seit Version größer v3.5.3 sind die folgenden Pakete hinzugekommen: <code class="literal">Exception::Class</code>
             </p><p>Seit Version größer v3.5.1 sind die folgenden Pakete hinzugekommen: <code class="literal">Set::Infinite</code>,
         <code class="literal">List::UtilsBy</code>, <code class="literal">DateTime::Set</code>, <code class="literal">DateTime::Event::Cron</code>
@@ -151,18 +158,15 @@
         <code class="literal">Net::SSLGlue</code>.</p><p>Gegenüber Version 2.6.0 sind zu dieser Liste 2 Pakete
         hinzugekommen, <code class="literal">URI</code> und
         <code class="literal">XML::Writer</code> sind notwendig. Ohne startet kivitendo
-        nicht.</p><p>Gegenüber Version 2.6.1 sind <code class="literal">parent</code>,
-        <code class="literal">DateTime</code>, <code class="literal">Rose::Object</code>,
-        <code class="literal">Rose::DB</code> und <code class="literal">Rose::DB::Object</code>
-        neu hinzugekommen. <code class="literal">IO::Wrap</code> wurde entfernt.</p><p>Gegenüber Version 2.6.3 ist <code class="literal">JSON</code> neu
+        nicht.</p><p>Gegenüber Version 2.6.3 ist <code class="literal">JSON</code> neu
         hinzugekommen.</p><p>
                <code class="literal">Email::Address</code> und
-        <code class="literal">List::MoreUtils</code> sind schon länger feste
-        Abhängigkeiten, wurden aber bisher mit kivitendo mitgeliefert. Beide
-        sind auch in 2.6.1 weiterhin mit ausgeliefert, wurden in einer
-        zukünftigen Version aber aus dem Paket entfernt werden. Es wird
+        <code class="literal">List::MoreUtils</code> wurden aus dem Lieferumfang entfernt. Es wird
         empfohlen diese Module zusammen mit den anderen als Bibliotheken zu
-        installieren.</p><div class="sect3" title="2.2.2.1. Debian und Ubuntu"><div class="titlepage"><div><div><h4 class="title"><a name="d0e634"></a>2.2.2.1. Debian und Ubuntu</h4></div></div></div><p>Für Debian und Ubuntu stehen die meisten der benötigten
+        installieren.</p><p>Gegenüber Version 2.6.1 sind <code class="literal">parent</code>,
+        <code class="literal">DateTime</code>, <code class="literal">Rose::Object</code>,
+        <code class="literal">Rose::DB</code> und <code class="literal">Rose::DB::Object</code>
+        neu hinzugekommen. <code class="literal">IO::Wrap</code> wurde entfernt.</p><div class="sect3" title="2.2.2.1. Debian und Ubuntu"><div class="titlepage"><div><div><h4 class="title"><a name="d0e671"></a>2.2.2.1. Debian und Ubuntu</h4></div></div></div><p>Für Debian und Ubuntu stehen die meisten der benötigten
           Pakete als Debian-Pakete zur Verfügung. Sie können mit
           folgendem Befehl installiert werden:</p><pre class="programlisting">apt install  apache2 libarchive-zip-perl libclone-perl \
   libconfig-std-perl libdatetime-perl libdbd-pg-perl libdbi-perl \
@@ -179,12 +183,13 @@
   libdatetime-set-perl libset-infinite-perl liblist-utilsby-perl \
   libdaemon-generic-perl libfile-flock-perl libfile-slurp-perl \
   libfile-mimeinfo-perl libpbkdf2-tiny-perl libregexp-ipv6-perl \
-  libdatetime-event-cron-perl libexception-class-perl libcam-pdf-perl \
+  libdatetime-event-cron-perl libexception-class-perl \
   libxml-libxml-perl libtry-tiny-perl libmath-round-perl \
-  libimager-perl libimager-qrcode-perl librest-client-perl libipc-run-perl
+  libimager-perl libimager-qrcode-perl librest-client-perl libipc-run-perl \
+  libencode-imaputf7-perl libmail-imapclient-perl libuuid-tiny-perl
           </pre><p>Sollten Pakete nicht zu Verfügung stehen, so können diese auch mittels CPAN installiert werden. Ferner muss für Ubuntu das Repository "Universe" aktiv sein (s.a. Anmerkungen).</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left"><a name="ubuntu-universe"></a>Anmerkung</th></tr><tr><td align="left" valign="top"><p>Die Perl Pakete für Ubuntu befinden sich im "Universe" Repository. Falls dies nicht aktiv ist, kann dies mit folgendem Aufruf aktiviert werden:
 </p><pre class="programlisting">add-apt-repository universe</pre><p>
-                  </p></td></tr></table></div></div><div class="sect3" title="2.2.2.2. Fedora"><div class="titlepage"><div><div><h4 class="title"><a name="d0e649"></a>2.2.2.2. Fedora</h4></div></div></div><p>Für Fedora stehen die meisten der benötigten Perl-Pakete als
+                  </p></td></tr></table></div></div><div class="sect3" title="2.2.2.2. Fedora"><div class="titlepage"><div><div><h4 class="title"><a name="d0e686"></a>2.2.2.2. Fedora</h4></div></div></div><p>Für Fedora stehen die meisten der benötigten Perl-Pakete als
           RPM-Pakete zur Verfügung. Sie können mit folgendem Befehl
           installiert werden:</p><pre class="programlisting">dnf install httpd mod_fcgid postgresql-server postgresql-contrib\
   perl-Algorithm-CheckDigits perl-Archive-Zip perl-CPAN perl-Class-XSAccessor \
@@ -196,54 +201,13 @@
   perl-Params-Validate perl-Regexp-IPv6 perl-Rose-DB perl-Rose-DB-Object \
   perl-Rose-Object perl-Sort-Naturally perl-String-ShellQuote \
   perl-Template-Toolkit perl-Text-CSV_XS perl-Text-Iconv perl-URI perl-XML-Writer \
-  perl-YAML perl-libwww-perl</pre></div><div class="sect3" title="2.2.2.3. openSUSE Leap 15.x und SUSE Linux Enterprise Server 15 GA"><div class="titlepage"><div><div><h4 class="title"><a name="d0e656"></a>2.2.2.3. openSUSE Leap 15.x und SUSE Linux Enterprise Server 15 GA</h4></div></div></div><p>Für openSUSE Leap 15.x stehen die meisten der benötigten Perl-Pakete als RPM-Pakete zur Verfügung.</p><p>Damit diese installiert werden können, muß das System die erforderlichen Repositories kennen und Zugriff über das Internet darauf haben.</p><p>Daher machen wir die Repositories dem System bekannt.</p><p>Um die zusätzlichen Repositories für die Installation zur Verfügung zu stellen, kann man diese mit YaST oder auch in einem Terminal auf der Konsole bekannt geben. Wir beschränken uns hier mit der Eingabe auf der Konsole. In den allermeisten Fällen verwenden die Administratoren eine sichere SSH-Verbindung zum zu administrierenden Server.</p><p>Dazu geben wir folgenden Befehl ein:</p><pre class="programlisting">zypper addrepo -f \
-  http://download.opensuse.org/repositories/devel:languages:perl/openSUSE_Leap_15.2/ \
-  "devel:languages:perl"
-          </pre><pre class="programlisting">zypper addrepo -f \
-  https://download.opensuse.org/repositories/devel:languages:haskell:lts:13/\
-  openSUSE_Leap_15.0/ "devel:languages:haskell:lts:13"
-          </pre><pre class="programlisting">zypper addrepo -f \
-  https://download.opensuse.org/repositories/devel:languages:haskell:lts:13/\
-  openSUSE_Leap_15.0/ "devel:languages:haskell:lts:13"
-          </pre><p>Danach geben wir noch die beiden folgenden Befehle ein:</p><pre class="programlisting">zypper clean</pre><pre class="programlisting">zypper refresh</pre><p>Sollte zypper eine Meldung ausgeben, ob der Repositorie Key abgelehnt, nicht vertraut oder für immer akzeptiert werden soll, ist die Beantwortung durch drücken der "i" Taste am besten geeignet. Wer noch mehr über zypper erfahren möchte, kann sich einmal die zypper Hilfe anschauen.</p><pre class="programlisting">zypper --help</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Offiziell wird von openSUSE nur noch Versionen ab 15.2 unterstützt. Die SuSE Macher haben ab Version 15.x einen großen Umbau in der Verwaltung der Pakete vorgenommen, das heißt, der Paketumfang ist der SLES 15 als Programmunterbau angepasst. Dies gilt besonders der openSUSE Distribution. Es gibt ja einmal die openSUSE Distri und die Professionelle SLES Version. Dadurch sind viele Pakete aus dem ursprünglich nur für die openSUSE geltenen Repositorie enfernt worden, aber auch viele auf aktuellem Stand gehalten.</p></td></tr></table></div><p>Ab openSUSE Leap 15.x kann man die Distribution auch als reine Text Version, also ohne KDE Oberfläche aufsetzen. Vorteil hierbei ist, dass weniger Balast und unnötige Pakte installiert werden.</p><p>Bei openSUSE Versionen bis 15.x, also 10.x, 11.x, 12.x, 13.x hatte der Administrator die Möglichkeit, bei der Installation der Distribution die KDE Oberfläche zu aktivieren. In dieser Konstellation hat man die Möglichkeit, eine VNC Verbindung vom administrativen Client zu verwenden. Ist das nicht eingerichtet, arbeitet der Admin dann direkt am Bildschirm des Servers. Nun loggen wir uns am Server direkt ein, starten Yast2 in einer Konsole wie folgt:</p><p>yast2 return.</p><p>Oder über die Menüführung wie folgt: Ein Klick auf das runde Icon, ganz links unten in der Menüleiste, dann die Maus verfahren auf System und YaST.</p><p>Im weiteren Verlauf der Installation, beschränken wir uns mit dem Installations Werkzeug zypper. Zypper ist ein Komandozeilen basiertes Installations Tool, welches bei openSUSE Standard ist. Zypper weist ein etwas eigenartiges Verhalten auf, dass sich in etwa wie folgt darstellt. Hat man die Repositories eingerichtet, kann man diese mit Yast als auch mit Zypper benutzen, setzt man einen Befehl wie etwa: zypper up ab, so findet zypper mehr neuere Programmversionen als Yast. Ich habe im allgemeinen noch keine Nachteile damit erlebt.</p><p>Programmpakete können mit folgendem Befehl installiert werden:</p><p>zypper install Paketname</p><p>Es wird empfohlen zusätzliche Pakete nicht direkt mit CPAN zu installieren, da man diese auch über andere Repositories beziehen kann, die bei openSUSE zur Verfügung stehen. Dadurch hat man den Vorteil, dass die Pakete mit YaST verwaltet werden, also wieder deinstalliert oder durch neuere ersetzt werden können. Zudem kann man auch noch eventuelle Bugs an openSUSE senden und diese dem Maintainer melden.</p><pre class="programlisting">zypper install perl-threads-shared ghc-pdfinfo apache2-mod_fcgid \
-  yast2-http-server postgresql-server postgresql-contrib perl-Algorithm-CheckDigits \
-  perl-Archive-Zip perl-CGI perl-CGI-Ajax perl-Clone \
-  perl-Config-Std perl-Class-XSAccessor perl-Daemon-Generic perl-DateTime \
-  perl-DateTime-Event-Cron perl-DateTime-Format-Strptime perl-DateTime-Set \
-  perl-DBI perl-DBD-Pg perl-Devel-REPL perl-FastCGI perl-Email-Address \
-  perl-Email-MIME perl-Email-MIME-ContentType perl-Email-MIME-Encodings \
-  perl-FCGI perl-File-Copy-Recursive perl-File-Flock perl-File-MimeInfo \
-  perl-File-Slurp perl-GD perl-HTML-Restrict perl-Image-Info \
-  perl-JSON perl-List-MoreUtils perl-List-UtilsBy perl-Log-Log4perl perl-Net-LDAP-Server \
-  perl-Net-SSLGlue perl-Net-SMTP-SSL perl-PBKDF2-Tiny perl-PDF-API2 \
-  perl-Params-Validate perl-Regexp-IPv6 perl-Rose-DB perl-Rose-Object \
-  perl-Rose-DB-Object perl-MooseX-Role-Cmd perl-Set-Crontab perl-Set-Infinite \
-  perl-Sort-Naturally perl-String-ShellQuote perl-Sys-CPU perl-Template-Toolkit \
-  perl-Text-CSV_XS perl-Test-Deep perl-Test-Output perl-Text-Iconv \
-  perl-Text-Unidecode perl-URI perl-URI-Find perl-XML-Writer \
-  perl-YAML perl-libwww-perl
-          </pre><p>Für die Entwickler installiert man noch die folgenden Pakete:</p><pre class="programlisting">zypper install ghc-mtl-devel ghc-old-locale-devel \
-  ghc-process-extras-devel ghc-rpm-macros ghc-text-devel ghc-time-devel \
-  ghc-Cabal-devel ghc-time-locale-compat-devel perl-Log-Log4perl ghc-pdfinfo \
-  ghc-pdfinfo-devel perl-Devel-REPL perl-URI-Find perl-Class-Utils \
-  perl-Error-Pure perl-File-Object perl-Readonly perl-Test-Warnings \
-  perl-Test-NoWarnings perl-Test-Deep perl-Test-Output perl-Test-Strict \
-  perl-Test-LongString perl-File-Find-Rule
-          </pre><p>Zusätzlich müssen einige Pakete für den Umgang mit Latex installiert werden. Die Latex Module barcodes sind nützliche Helfer um auch Barcodes im Dokument zu platzieren, der Vollständigkeit halber hier für die Installation mit angegeben.
-              Dazu können Sie die folgenden Befehle nutzen:</p><pre class="programlisting">zypper install texlive-wallpaper texlive-colortbl \
-  texlive-scrlttr2copy texlive-eurosym \
-  texlive-geometry texlive-german texlive-graphbox texlive-hyperref \
-  texlive-xifthen texlive-luainputenc texlive-lastpage texlive-ltabptch \
-  texlive-nomentbl texlive-threeparttablex texlive-substr texlive-tabulary \
-  texlive-ulem texlive-wallpaper texlive-xcolor texlive-xstring \
-  texlive-xypic texlive-mwe texlive-mweights texlive-barcodes \
-  texlive-GS1 texlive-ean texlive-makebarcode texlive-pst-barcode \
-  texlive-upca
-          </pre><p>Zusätzlich müssen einige Pakete aus dem CPAN installiert
-          werden. Dazu können Sie die folgenden Befehle anwenden:</p><pre class="programlisting">cpan DateTime::event::Cron DateTime::Set FCGI \
-  HTML::Restrict PBKDF2::Tiny Rose::Db::Object Set::Infinite</pre></div></div><div class="sect2" title="2.2.3. Andere Pakete installieren"><div class="titlepage"><div><div><h3 class="title"><a name="d0e718"></a>2.2.3. Andere Pakete installieren</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+  perl-YAML perl-libwww-perl</pre></div><div class="sect3" title="2.2.2.3. openSUSE Leap 15.4 und SUSE Linux Enterprise Server 15"><div class="titlepage"><div><div><h4 class="title"><a name="d0e693"></a>2.2.2.3. openSUSE Leap 15.4 und SUSE Linux Enterprise Server 15</h4></div></div></div><p>Für openSUSE Leap 15.4, sowie SLES 15 stehen alle benötigten Perl-Pakete als RPM-Pakete zur Verfügung.</p><p>Damit diese installiert werden können, muß das System die erforderlichen Repositories kennen und Zugriff über das Internet darauf haben.</p><p>Daher machen wir die Repositories dem System bekannt.</p><p>Um die zusätzlichen Repositories für die Installation zur Verfügung zu stellen, kann man diese mit YaST oder auch in einem Terminal auf der Konsole bekannt geben. Wir beschränken uns hier mit der Eingabe auf der Konsole. In den allermeisten Fällen verwenden die Administratoren eine sichere SSH-Verbindung zum zu administrierenden Server.</p><p>Dazu geben wir folgenden Befehl ein:</p><p>Das ERP kivitendo Repository:</p><pre class="programlisting">zypper addrepo -f -p 90 \
+  http://download.opensuse.org/repositories/Application:/ERP:/kivitendo/15.4/ \
+  "OSS-15.4-App_ERP_kivitendo"</pre><p>Das ERP kivitendo Evaluation Repository:</p><pre class="programlisting">zypper addrepo -f -p 90 \
+  http://download.opensuse.org/repositories/Application:/ERP:/kivitendo:/eval/15.4/ \
+  "OSS-15.4-App_ERP_kivitendo_eval"</pre><p>Danach geben wir noch die beiden folgenden Befehle ein:</p><pre class="programlisting">zypper clean</pre><pre class="programlisting">zypper refresh</pre><p>Sollte zypper eine Meldung ausgeben, ob der Repository Key abgelehnt, nicht vertraut oder für immer akzeptiert werden soll, ist die Beantwortung durch drücken der "i" Taste am besten geeignet. Wer noch mehr über zypper erfahren möchte, kann sich einmal die zypper Hilfe anschauen.</p><pre class="programlisting">zypper --help</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Offiziell wird von openSUSE nur noch Versionen ab 15.4 unterstützt. Die SuSE Macher haben ab Version 15.x einen großen Umbau in der Verwaltung der Pakete vorgenommen, das heißt, der Paketumfang ist der SLE 15 als Programmunterbau angepasst. Dies gilt besonders der openSUSE Distribution. Es gibt ja einmal die openSUSE Distri und die professionelle SLE (SUSE Linux Enterprise) Version. Dadurch sind viele Pakete aus dem ursprünglich nur für die openSUSE geltenen Repository enfernt worden, aber auch viele auf aktuellem Stand gehalten. Mit der openSUSE Leap 15.4 ist es dem Benutzer ganz einfach gemacht worden zur professionellen SUSE Linux Enterprise zu wechseln, da die RPM Paketbasis identisch ist.</p></td></tr></table></div><p>Ob openSUSE Leap oder SLE, man kann die Distribution auch als reine Text Version, also ohne KDE Oberfläche aufsetzen. Vorteil hierbei ist, dass weniger Balast und unnötige Pakte installiert werden. Diese Variante wird gerne auch als 'Server', 'minimale Server' oder auch 'minmal X' Variante bezeichnet.</p><p>Als Administrator hatte man jedoch auch immer die Möglichkeit, bei der Installation der Distribution die KDE (graphische) Oberfläche zu aktivieren. In dieser Konstellation hat man die Möglichkeit, eine VNC Verbindung vom administrativen Client zu verwenden. Ist das nicht eingerichtet, arbeitet der Admin dann direkt am Bildschirm des Servers. Nun loggen wir uns am Server direkt ein, starten Yast2 in einer Konsole wie folgt:</p><p>yast2 return.</p><p>Oder über die Menüführung wie folgt: Ein Klick auf das runde Icon, ganz links unten in der Menüleiste, dann die Maus verfahren auf System und YaST.</p><p>Im weiteren Verlauf der Installation, beschränken wir uns mit dem Installations Werkzeug zypper. Zypper ist ein Komandozeilen basiertes Installations Tool, welches bei openSUSE Standard ist. Zypper weist ein etwas eigenartiges Verhalten auf, dass sich in etwa wie folgt darstellt. Hat man die Repositories eingerichtet, kann man diese mit Yast als auch mit Zypper benutzen, setzt man einen Befehl wie etwa: zypper up ab, so findet zypper mehr neuere Programmversionen als Yast. Ich habe im allgemeinen noch keine Nachteile damit erlebt.</p><p>Programmpakete können mit folgendem Befehl installiert werden:</p><p>zypper install Paketname</p><p>Es wird empfohlen zusätzliche Pakete nicht direkt mit CPAN zu installieren, da man diese auch über andere Repositories beziehen kann, die bei openSUSE zur Verfügung stehen. Dadurch hat man den Vorteil, dass die Pakete mit YaST verwaltet werden, also wieder deinstalliert oder durch neuere ersetzt werden können. Zudem kann man auch noch eventuelle Bugs an openSUSE senden und diese dem Maintainer melden.</p><pre class="programlisting">zypper install kivitendo-erp</pre><p>Für Entwickler installiert man noch das folgende Paket:</p><pre class="programlisting">zypper install kivitendo-erp-devel</pre></div></div><div class="sect2" title="2.2.3. Andere Pakete installieren"><div class="titlepage"><div><div><h3 class="title"><a name="d0e749"></a>2.2.3. Andere Pakete installieren</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
                      <code class="literal">poppler-utils</code> 'pdfinfo' zum Erkennen der Seitenanzahl bei der PDF-Generierung</p></li><li class="listitem"><p>
                      <code class="literal">Postgres Trigram-Index</code> Für datenbankoptimierte Suchanfragen. Bspw. im Paket <code class="literal">postgresql-contrib</code> enthalten</p></li></ul></div><p>Debian und Ubuntu: </p><pre class="programlisting">apt install postgresql-contrib poppler-utils</pre><p>
             </p><p>Fedora: </p><pre class="programlisting">dnf install poppler-utils postgresql-contrib</pre><p>
-            </p><p>openSUSE: </p><pre class="programlisting">zypper install poppler-tools</pre><p>
-            </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s03.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">Kapitel 2. Installation und Grundkonfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.3. Manuelle Installation des Programmpaketes</td></tr></table></div></body></html>
\ No newline at end of file
+            </p><p>openSUSE:</p><pre class="programlisting">Nicht notwendig, da poppler-utils bereits i.v.m. kivitendo-erp installiert wird</pre><p>
+            </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s03.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">Kapitel 2. Installation und Grundkonfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.3. Installation mittels Ansible auf Ubuntu 22.04</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s03.html b/doc/html/ch02s03.html
index 584a17a59..3303927e2 100644
--- a/doc/html/ch02s03.html
+++ b/doc/html/ch02s03.html
@@ -1,68 +1,49 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.3. Manuelle Installation des Programmpaketes</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s02.html" title="2.2. Benötigte Software und Pakete"><link rel="next" href="ch02s04.html" title="2.4. kivitendo-Konfigurationsdatei"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.3. Manuelle Installation des Programmpaketes</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.3. Manuelle Installation des Programmpaketes"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Manuelle-Installation-des-Programmpaketes"></a>2.3. Manuelle Installation des Programmpaketes</h2></div></div></div><p>Der aktuelle Stable-Release, bzw. beta Release wird bei github
-      gehostet und kann <a class="ulink" href="https://github.com/kivitendo/kivitendo-erp/releases" target="_top">hier</a>
-      heruntergeladen werden.</p><p>Das aktuelleste kivitendo ERP-Archiv
-      (<code class="filename">kivitendo-erp-*.tgz</code>) wird dann im
-      Dokumentenverzeichnis des Webservers (z.B.
-      <code class="filename">/var/www/html/</code>,
-      <code class="filename">/srv/www/htdocs</code> oder
-      <code class="filename">/var/www/</code>) entpackt:</p><pre class="programlisting">cd /var/www
-tar xvzf kivitendo-erp-*.tgz</pre><p>Wechseln Sie in das entpackte Verzeichnis:</p><pre class="programlisting">cd kivitendo-erp</pre><p>Alternativ können Sie auch einen Alias in der
-      Webserverkonfiguration benutzen, um auf das tatsächliche
-      Installationsverzeichnis zu verweisen.</p><p>Bei einer Neuinstallation von Version 3.1.0 oder später muß das
-      WebDAV Verzeichnis derzeit manuell angelegt werden:</p><pre class="programlisting">mkdir webdav</pre><p>Die Verzeichnisse <code class="filename">users</code>,
-      <code class="filename">spool</code> und <code class="filename">webdav</code> müssen für
-      den Benutzer beschreibbar sein, unter dem der Webserver läuft. Die
-      restlichen Dateien müssen für diesen Benutzer lesbar sein. Die Benutzer-
-      und Gruppennamen sind bei verschiedenen Distributionen unterschiedlich
-      (z.B. bei Debian/Ubuntu <code class="constant">www-data</code>, bei Fedora
-      <code class="constant">apache</code> oder bei openSUSE
-      <code class="constant">wwwrun</code>).</p><p>Der folgende Befehl ändert den Besitzer für die oben genannten
-      Verzeichnisse auf einem Debian/Ubuntu-System:</p><pre class="programlisting">chown -R www-data users spool webdav</pre><p>Weiterhin muss der Webserver-Benutzer in den Verzeichnissen
-      <code class="filename">templates</code> und <code class="filename">users</code>
-      Unterverzeichnisse für jeden neuen Benutzer anlegen dürfen, der in
-      kivitendo angelegt wird:</p><pre class="programlisting">chown www-data templates users</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Wir empfehlen eine Installation mittels des Versionsmanagager
-        git. Hierfür muss ein git-Client installiert sein. Damit ist man sehr
-        viel flexibler für zukünftige Upgrades. Installations-Anleitung (bitte
-        die Pfade anpassen) bspw. wie folgt: </p><pre class="programlisting">cd /var/www/
-git clone https://github.com/kivitendo/kivitendo-erp.git
-cd kivitendo-erp/
-git checkout `git tag -l | egrep -ve "(alpha|beta|rc)" | tail -1`</pre><p>
-        Erläuterung: Der Befehl wechselt zur letzten Stable-Version (git tag
-        -l listet alle Tags auf, das egrep schmeisst alle Einträge mit alpha,
-        beta oder rc raus und das tail gibt davon den obersten Treffer
-        zurück). Sehr sinnvoll ist es, direkt im Anschluss einen eigenen
-        Branch zu erzeugen, um bspw. seine eigenen Druckvorlagen-Anpassungen
-        damit zu verwalten. Hierfür reicht ein simples </p><pre class="programlisting">  git checkout -b meine_eigenen_änderungen</pre><p>
-        nach dem letzten Kommando (weiterführende Informationen <a class="ulink" href="http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html" target="_top">
-        Git Magic</a>).</p><p>Ein beispielhafter Workflow für Druckvorlagen-Anpassungen von
-        3.4.1 nach 3.5: </p><pre class="programlisting">
-$ git clone https://github.com/kivitendo/kivitendo-erp.git
-$ cd kivitendo-erp/
-$ git checkout release-3.4.1                # das ist ein alter release aus dem wir starten ...
-$ git checkout -b meine_eigene_änderungen   # unser lokaler branch - unabhängig von allen anderen
-$ git add templates/mein_druck              # das sind unsere druckvorlagen inkl. produktbilder
-$ git commit -m "juhu tolle änderungen"
+   <title>2.3. Installation mittels Ansible auf Ubuntu 22.04</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s02.html" title="2.2. Benötigte Software und Pakete"><link rel="next" href="ch02s04.html" title="2.4. Manuelle Installation des Programmpaketes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.3. Installation mittels Ansible auf Ubuntu 22.04</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.3. Installation mittels Ansible auf Ubuntu 22.04"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Installation mittels Ansible"></a>2.3. Installation mittels Ansible auf Ubuntu 22.04</h2></div></div></div><p>
+        Ansible ist ein Open-Source-Automatisierungstool, das verwendet
+        wird, um die Bereitstellung, Konfiguration und Verwaltung von
+        IT-Systemen zu automatisieren. Dabei führt es Aufgaben über SSH auf
+        entfernten Rechnern (Hosts) aus. Die Aufgaben werden dabei
+        deklarativ als YAML Dateien, den sogenannten Playbooks, übergeben.
+        Benötigt wird lediglich python und ansible ab Version 2.10.
+      </p><p>
+        Alle benötigten Konfigurationsdateien und das Playbook sind auf dem kivitendo github Account
+        unter dem Repository namens <a class="ulink" href="https://github.com/kivitendo/kivitendo-ansible" target="_top">kivitendo-ansible</a> verfügbar.
+        Das Repo kann lokal mit folgendem git-Befehl "geklont" werden:
+    </p><pre class="programlisting">git clone https://github.com/kivitendo/kivitendo-ansible</pre><p>
+      In diesem Repository befindet sich auch eine Readme.md, die aktuelle Installationshinweise auf englisch enthält.
+      </p><p>
+        Um die Installation zu starten,  wechseln Sie dann zunächst in den erstellten Ordner 'kivitendo-ansible' und
+        editieren die Datei inventory.
 
-[meine_aenderungen 1d89e41] juhu tolle ändernungen
- 4 files changed, 380 insertions(+)
- create mode 100644 templates/mein_druck/img/webdav/tesla.png
- create mode 100644 templates/mein_druck/mahnung.tex
- create mode 100644 templates/mein_druck/zahlungserinnerung_zwei.tex
- create mode 100644 templates/mein_druck/zahlungserinnerung_zwei_invoice.tex
+        </p><pre class="programlisting">cd kivitendo-ansible
+vim inventory</pre><p>
 
-# 5 Jahre später ...
-# webserver abschalten!
+        Der/die Hosts auf denen Kivitendo installiert werden soll wird dann in
+        dieser Datei ('inventory') eingefügt, bspw. die
 
-$ git checkout master
-$ git pull                                  # oder git fetch und danach ein stable release tag auswählen (s.o.)
-$ git checkout meine_eigenen_änderungen
-$ git rebase master
-
-Zunächst wird der Branch zurückgespult, um Ihre Änderungen
-darauf neu anzuwenden ...
-Wende an: juhu tolle änderungen
-$ service apache2 restart                   # webserver starten!
-</pre><p>
-            </p></td></tr></table></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s04.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.2. Benötigte Software und Pakete&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.4. kivitendo-Konfigurationsdatei</td></tr></table></div></body></html>
\ No newline at end of file
+        </p><pre class="programlisting">192.168.1.121</pre><p>
+        oder als Namen:
+        </p><pre class="programlisting">kivi.meine-lokale-domaene.de</pre><p>
+        Zusätzliche Parameter könnten erforderlich sein, bspw. der Benutzer für den SSH-Login:
+        </p><pre class="programlisting">kivi.meine-lokale-domaene.de ansible_user=myuser</pre><p>
+      
+         </p><p>
+      Danach kann das Playbook mittels:
+      </p><pre class="programlisting">ansible-playbook --ask-become main.yml</pre><p>
+        ausgeführt werden, je nach Konfiguration wird man noch
+        aufgefordert das BECOME password einzutragen, hierbei handelt es
+        sich um das Passwort des Benutzers, über den die Installation dann auf dem Ziel-Rechner ausgeführt wird.
+      </p><p>
+        Nach erfolgreichen Ausführen des Playbooks ist Kivitendo dann über den Browser
+        erreichbar unter
+        <code class="literal">http://&lt;IP des rechners&gt;/kivitendo-erp/</code>
+      
+         </p><p>
+        Nun muss noch eine Datenbank für Benutzer und Mandanten angelegt
+        werden. Dies kann über die Weboberfläche getan werden, indem man
+        sich mit dem Passwort <code class="literal">admin123</code> in der
+        Administrationsoberfläche anmeldet.
+        Weitere Details siehe Abschnitt "<a class="xref" href="ch02s10.html" title="2.10. Benutzerauthentifizierung und Administratorpasswort">Abschnitt&nbsp;2.10, „Benutzerauthentifizierung und Administratorpasswort“</a>"
+      </p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s04.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.2. Benötigte Software und Pakete&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.4. Manuelle Installation des Programmpaketes</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s04.html b/doc/html/ch02s04.html
index 7de19f2ae..8a3745434 100644
--- a/doc/html/ch02s04.html
+++ b/doc/html/ch02s04.html
@@ -1,97 +1,69 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.4. kivitendo-Konfigurationsdatei</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s03.html" title="2.3. Manuelle Installation des Programmpaketes"><link rel="next" href="ch02s05.html" title="2.5. Anpassung der PostgreSQL-Konfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.4. kivitendo-Konfigurationsdatei</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.4. kivitendo-Konfigurationsdatei"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.config-file"></a>2.4. kivitendo-Konfigurationsdatei</h2></div></div></div><div class="sect2" title="2.4.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.introduction"></a>2.4.1. Einführung</h3></div></div></div><p>In kivitendo gibt es nur noch eine Konfigurationsdatei, die
-        benötigt wird: <code class="filename">config/kivitendo.conf</code> (kurz: "die
-        Hauptkonfigurationsdatei"). Diese muss bei der Erstinstallation von
-        kivitendo bzw. der Migration von älteren Versionen angelegt
-        werden.</p><p>Als Vorlage dient die Datei
-        <code class="filename">config/kivitendo.conf.default</code> (kurz: "die
-        Default-Datei"):</p><pre class="programlisting">$ cp config/kivitendo.conf.default config/kivitendo.conf</pre><p>Die Default-Datei wird immer zuerst eingelesen. Werte, die in
-        der Hauptkonfigurationsdatei stehen, überschreiben die Werte aus der
-        Default-Datei. Die Hauptkonfigurationsdatei muss also nur die
-        Abschnitte und Werte enthalten, die von denen der Default-Datei
-        abweichen.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Vor der Umbenennung in kivitendo hieß diese Datei noch
-          <code class="filename">config/lx_office.conf</code>. Aus Gründen der
-          Kompatibilität wird diese Datei eingelesen, sofern die Datei
-          <code class="filename">config/kivitendo.conf</code> nicht existiert.</p></td></tr></table></div><p>Diese Hauptkonfigurationsdatei ist dann eine
-        installationsspezifische Datei, d.h. sie enthält bspw. lokale
-        Passwörter und wird auch nicht im Versionsmanagement (git)
-        verwaltet.</p><p>Die Konfiguration ist ferner serverabhängig, d.h. für alle
-        Mandaten, bzw. Datenbanken gleich.</p></div><div class="sect2" title="2.4.2. Abschnitte und Parameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.sections-parameters"></a>2.4.2. Abschnitte und Parameter</h3></div></div></div><p>Die Konfigurationsdatei besteht aus mehreren Teilen, die
-        entsprechend kommentiert sind:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                     <code class="literal">authentication</code> (siehe Abschnitt "<a class="xref" href="ch02s08.html" title="2.8. Benutzerauthentifizierung und Administratorpasswort">Abschnitt&nbsp;2.8, „Benutzerauthentifizierung und Administratorpasswort“</a>"
-            in diesem Kapitel)</p></li><li class="listitem"><p>
-                     <code class="literal">authentication/database</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">authentication/ldap</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">system</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">paths</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">mail_delivery</code> (siehe Abschnitt "<a class="xref" href="ch02s11.html#config.sending-email.smtp" title="2.11.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>)</p></li><li class="listitem"><p>
-                     <code class="literal">applications</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">environment</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">print_templates</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">task_server</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">periodic_invoices</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">self_tests</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">console</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">testing</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">testing/database</code>
-                  </p></li><li class="listitem"><p>
-                     <code class="literal">debug</code>
-                  </p></li></ul></div><p>Die üblicherweise wichtigsten Parameter, die am Anfang
-        einzustellen oder zu kontrollieren sind, sind:</p><pre class="programlisting">[authentication]
-admin_password = geheim
+   <title>2.4. Manuelle Installation des Programmpaketes</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s03.html" title="2.3. Installation mittels Ansible auf Ubuntu 22.04"><link rel="next" href="ch02s05.html" title="2.5. kivitendo-Konfigurationsdatei"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.4. Manuelle Installation des Programmpaketes</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.4. Manuelle Installation des Programmpaketes"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Manuelle-Installation-des-Programmpaketes"></a>2.4. Manuelle Installation des Programmpaketes</h2></div></div></div><div class="sect2" title="2.4.1. Installation mit git"><div class="titlepage"><div><div><h3 class="title"><a name="Installation-mit-git"></a>2.4.1. Installation mit git</h3></div></div></div><p>Wir empfehlen eine Installation mittels des Versionsmanager
+        git. Hierfür muss ein git-Client installiert sein. Damit ist man sehr
+        viel flexibler für zukünftige Upgrades. Installations-Anleitung (bitte
+        die Pfade anpassen) bspw. wie folgt: </p><pre class="programlisting">cd /var/www/
+git clone https://github.com/kivitendo/kivitendo-erp.git
+cd kivitendo-erp/
+git checkout `git tag -l | egrep -ve "(alpha|beta|rc)" | tail -1`</pre><p>
+        Erläuterung: Der Befehl wechselt zur letzten Stable-Version (git tag
+        -l listet alle Tags auf, das egrep schmeisst alle Einträge mit alpha,
+        beta oder rc raus und das tail gibt davon den obersten Treffer
+        zurück). Sehr sinnvoll ist es, direkt im Anschluss einen eigenen
+        Branch zu erzeugen, um bspw. seine eigenen Druckvorlagen-Anpassungen
+        damit zu verwalten. Hierfür reicht ein simples </p><pre class="programlisting">  git checkout -b meine_eigenen_änderungen</pre><p>
+        nach dem letzten Kommando (weiterführende Informationen <a class="ulink" href="http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html" target="_top">
+        Git Magic</a>).</p><p>Ein beispielhafter Workflow für Druckvorlagen-Anpassungen von
+        3.4.1 nach 3.5: </p><pre class="programlisting">
+$ git clone https://github.com/kivitendo/kivitendo-erp.git
+$ cd kivitendo-erp/
+$ git checkout release-3.4.1                # das ist ein alter release aus dem wir starten ...
+$ git checkout -b meine_eigene_änderungen   # unser lokaler branch - unabhängig von allen anderen
+$ git add templates/mein_druck              # das sind unsere druckvorlagen inkl. produktbilder
+$ git commit -m "juhu tolle änderungen"
 
-[authentication/database]
-host     = localhost
-port     = 5432
-db       = kivitendo_auth
-user     = postgres
-password =
+[meine_aenderungen 1d89e41] juhu tolle ändernungen
+ 4 files changed, 380 insertions(+)
+ create mode 100644 templates/mein_druck/img/webdav/tesla.png
+ create mode 100644 templates/mein_druck/mahnung.tex
+ create mode 100644 templates/mein_druck/zahlungserinnerung_zwei.tex
+ create mode 100644 templates/mein_druck/zahlungserinnerung_zwei_invoice.tex
 
-[system]
-default_manager = german</pre><p>Für kivitendo Installationen in der Schweiz sollte hier
-        <code class="varname">german</code> durch <code class="varname">swiss</code> ersetzt
-        werden.</p><p>Die Einstellung <code class="varname">default_manager = swiss</code>
-        bewirkt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Beim Erstellen einer neuen Datenbank in der kivitendo
-            Administration werden automatisch die Standard-Werte für die
-            Schweiz voreingestellt: Währung CHF, 5er-Rundung, Schweizer
-            KMU-Kontenplan, Sollversteuerung, Aufwandsmethode, Bilanzierung
-            (die Werte können aber manuell angepasst werden).</p></li><li class="listitem"><p>Einstellen der Standardkonten für Rundungserträge und
-            -aufwendungen (unter Mandantenkonfiguration → Standardkonten
-            veränderbar)</p></li><li class="listitem"><p>das verwendete Zahlenformat wird auf
-            <code class="varname">1'000.00</code> eingestellt (unter Programm →
-            Benutzereinstellungen veränderbar)</p></li><li class="listitem"><p>DATEV-Automatik und UStVA werden nicht angezeigt,
-            Erfolgsrechnung ersetzt GUV ( unter Mandantenkonfiguration →
-            Features veränderbar)</p></li></ul></div><p>Nutzt man wiederkehrende Rechnungen, kann man unter
-        <code class="varname">[periodic_invoices]</code> den Login eines Benutzers
-        angeben, der nach Erstellung der Rechnungen eine entsprechende E-Mail
-        mit Informationen über die erstellten Rechnungen bekommt.</p><p>kivitendo bringt eine eigene Komponente zur zeitgesteuerten
-        Ausführung bestimmter Aufgaben mit, den <a class="link" href="ch02s07.html" title="2.7. Der Task-Server">Task-Server</a>. Er wird u.a. für
-        Features wie die <a class="link" href="ch03.html#features.periodic-invoices" title="3.1. Wiederkehrende Rechnungen">wiederkehrenden Rechnungen</a>
-        benötigt, erledigt aber auch andere erforderliche Aufgaben und muss
-        daher in Betrieb genommen werden. Seine Einrichtung wird im Abschnitt
-        <a class="link" href="ch02s07.html" title="2.7. Der Task-Server">Task-Server</a> genauer
-        beschrieben.</p><p>Für Entwickler finden sich unter <code class="varname">[debug]</code>
-        wichtige Funktionen, um die Fehlersuche zu erleichtern.</p></div><div class="sect2" title="2.4.3. Versionen vor 2.6.3"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.prior-versions"></a>2.4.3. Versionen vor 2.6.3</h3></div></div></div><p>In älteren kivitendo Versionen gab es im Verzeichnis
-        <code class="filename">config</code> die Dateien
-        <code class="filename">authentication.pl</code> und
-        <code class="filename">lx-erp.conf</code>, die jeweils Perl-Dateien waren. Es
-        gab auch die Möglichkeit, eine lokale Version der Konfigurationsdatei
-        zu erstellen (<code class="filename">lx-erp-local.conf</code>). Dies ist ab
-        2.6.3 nicht mehr möglich, aber auch nicht mehr nötig.</p><p>Beim Update von einer kivitendo-Version vor 2.6.3 auf 2.6.3 oder
-        jünger müssen die Einstellungen aus den alten Konfigurationsdateien
-        manuell übertragen und die alten Konfigurationsdateien anschließend
-        gelöscht oder verschoben werden. Ansonsten zeigt kivitendo eine
-        entsprechende Fehlermeldung an.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s05.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.3. Manuelle Installation des Programmpaketes&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.5. Anpassung der PostgreSQL-Konfiguration</td></tr></table></div></body></html>
\ No newline at end of file
+# 5 Jahre später ...
+# webserver abschalten!
+
+$ git checkout master
+$ git pull                                  # oder git fetch und danach ein stable release tag auswählen (s.o.)
+$ git checkout meine_eigenen_änderungen
+$ git rebase master
+
+Zunächst wird der Branch zurückgespult, um Ihre Änderungen
+darauf neu anzuwenden ...
+Wende an: juhu tolle änderungen
+$ service apache2 restart                   # webserver starten!
+</pre><p>
+            </p></div><div class="sect2" title="2.4.2. Installation über die Github Website"><div class="titlepage"><div><div><h3 class="title"><a name="Installation_mit_Github"></a>2.4.2. Installation über die Github Website</h3></div></div></div><p>Der aktuelle Stable-Release, bzw. beta Release wird bei github
+        gehostet und kann <a class="ulink" href="https://github.com/kivitendo/kivitendo-erp/tags" target="_top">hier</a>
+        heruntergeladen werden.</p><p>Das aktuelleste kivitendo ERP-Archiv
+	(<code class="filename">kivitendo-erp-*.tgz</code>) wird dann im
+	Dokumentenverzeichnis des Webservers (z.B.
+	<code class="filename">/var/www/html/</code>,
+	<code class="filename">/srv/www/htdocs</code> oder
+	<code class="filename">/var/www/</code>) entpackt:</p><pre class="programlisting">cd /var/www
+tar xvzf kivitendo-erp-*.tgz</pre><p>Wechseln Sie in das entpackte Verzeichnis:</p><pre class="programlisting">cd kivitendo-erp</pre><p>Alternativ können Sie auch einen Alias in der
+        Webserverkonfiguration benutzen, um auf das tatsächliche
+        Installationsverzeichnis zu verweisen.</p></div><div class="sect2" title="2.4.3. Restliche Verzeichnisse ändern und bearbeiten"><div class="titlepage"><div><div><h3 class="title"><a name="restliche-Verzeichnisse-erstellen-und-Besitzer-%C3%A4ndern"></a>2.4.3. Restliche Verzeichnisse ändern und bearbeiten</h3></div></div></div><p>Die folgenden Schritte müssen nach der Installation mittels git
+	oder der Github Website angewendet werden.</p><p>Bei einer Neuinstallation von Version 3.1.0 oder später muss das
+	WebDAV Verzeichnis derzeit manuell angelegt werden:</p><pre class="programlisting">mkdir webdav</pre><p>Die Verzeichnisse <code class="filename">users</code>,
+        <code class="filename">spool</code> und <code class="filename">webdav</code> müssen für
+        den Benutzer beschreibbar sein, unter dem der Webserver läuft. Die
+        restlichen Dateien müssen für diesen Benutzer lesbar sein. Die Benutzer-
+        und Gruppennamen sind bei verschiedenen Distributionen unterschiedlich
+        (z.B. bei Debian/Ubuntu <code class="constant">www-data</code>, bei Fedora
+        <code class="constant">apache</code> oder bei openSUSE
+        <code class="constant">wwwrun</code>).</p><p>Der folgende Befehl ändert den Besitzer für die oben genannten
+        Verzeichnisse auf einem Debian/Ubuntu-System:</p><pre class="programlisting">chown -R www-data users spool webdav</pre><p>Weiterhin muss der Webserver-Benutzer in den Verzeichnissen
+        <code class="filename">templates</code> und <code class="filename">users</code>
+        Unterverzeichnisse für jeden neuen Benutzer anlegen dürfen, der in
+        kivitendo angelegt wird:</p><pre class="programlisting">chown www-data templates</pre></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s05.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.3. Installation mittels Ansible auf Ubuntu 22.04&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.5. kivitendo-Konfigurationsdatei</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s05.html b/doc/html/ch02s05.html
index c598c4767..e040d5f0f 100644
--- a/doc/html/ch02s05.html
+++ b/doc/html/ch02s05.html
@@ -1,73 +1,103 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.5. Anpassung der PostgreSQL-Konfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s04.html" title="2.4. kivitendo-Konfigurationsdatei"><link rel="next" href="ch02s06.html" title="2.6. Webserver-Konfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.5. Anpassung der PostgreSQL-Konfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.5. Anpassung der PostgreSQL-Konfiguration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Anpassung-der-PostgreSQL-Konfiguration"></a>2.5. Anpassung der PostgreSQL-Konfiguration</h2></div></div></div><p>PostgreSQL muss auf verschiedene Weisen angepasst werden.</p><p>Dies variert je nach eingesetzter Distribution, da distributionsabhängig unterschiedliche Strategien beim Upgrade der Postgres Version eingesetzt werden.
-            Als Hinweis einige Links zu den drei Distribution (Stand Dezember 2018):</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                  <a class="ulink" href="https://fedoraproject.org/wiki/PostgreSQL" target="_top">Fedora (Postgres-Installation unter Fedora)</a>
-               </p></li><li class="listitem"><p>
-                  <a class="ulink" href="https://help.ubuntu.com/lts/serverguide/postgresql.html" target="_top">Ubuntu (Infos für Postgres für die aktuelle LTS Version)</a>
-               </p></li><li class="listitem"><p>
-                  <a class="ulink" href="https://de.opensuse.org/PostgreSQL" target="_top">OpenSuSE (aktuell nur bis Version OpenSuSE 13 verifiziert)</a>
-               </p></li></ul></div><div class="sect2" title="2.5.1. Zeichensätze/die Verwendung von Unicode/UTF-8"><div class="titlepage"><div><div><h3 class="title"><a name="Zeichens%C3%A4tze-die-Verwendung-von-UTF-8"></a>2.5.1. Zeichensätze/die Verwendung von Unicode/UTF-8</h3></div></div></div><p>kivitendo setzt zwingend voraus, dass die Datenbank
-        Unicode/UTF-8 als Encoding einsetzt. Bei aktuellen
-        Serverinstallationen braucht man hier meist nicht einzugreifen.</p><p>Das Encoding des Datenbankservers kann überprüft werden. Ist das
-        Encoding der Datenbank "template1" "Unicode" bzw. "UTF-8", so braucht
-        man nichts weiteres diesbezüglich unternehmen. Zum Testen:</p><pre class="programlisting">su postgres
-echo '\l' | psql
-exit </pre><p>Andernfalls ist es notwendig, einen neuen Datenbankcluster mit
-        Unicode-Encoding anzulegen und diesen zu verwenden. Unter Debian und
-        Ubuntu kann dies z.B. für PostgreSQL 9.3 mit dem folgenden Befehl
-        getan werden:</p><pre class="programlisting">pg_createcluster --locale=de_DE.UTF-8 --encoding=UTF-8 9.3 clustername</pre><p>Die Datenbankversionsnummer muss an die tatsächlich verwendete
-        Versionsnummer angepasst werden.</p><p>Unter anderen Distributionen gibt es ähnliche Methoden.</p><p>Das Encoding einer Datenbank kann in <span class="command"><strong>psql</strong></span> mit
-        <code class="literal">\l</code> geprüft werden.</p></div><div class="sect2" title="2.5.2. Änderungen an Konfigurationsdateien"><div class="titlepage"><div><div><h3 class="title"><a name="%C3%84nderungen-an-Konfigurationsdateien"></a>2.5.2. Änderungen an Konfigurationsdateien</h3></div></div></div><p>In der Datei <code class="filename">postgresql.conf</code>, die je nach
-        Distribution in verschiedenen Verzeichnissen liegen kann (z.B.
-        <code class="filename">/var/lib/pgsql/data/</code> oder
-        <code class="filename">/etc/postgresql/</code>), muss sichergestellt werden,
-        dass TCP/IP-Verbindungen aktiviert sind. Das Verhalten wird über den
-        Parameter <code class="varname">listen_address</code> gesteuert. Laufen
-        PostgreSQL und kivitendo auf demselben Rechner, so kann dort der Wert
-        <code class="literal">localhost</code> verwendet werden. Andernfalls müssen
-        Datenbankverbindungen auch von anderen Rechnern aus zugelassen werden,
-        was mit dem Wert <code class="literal">*</code> geschieht.</p><p>In der Datei <code class="filename">pg_hba.conf</code>, die im gleichen
-        Verzeichnis wie die <code class="filename">postgresql.conf</code> zu finden
-        sein sollte, müssen die Berechtigungen für den Zugriff geändert
-        werden. Hier gibt es mehrere Möglichkeiten. Sinnvoll ist es nur die
-        nötigen Verbindungen immer zuzulassen, für eine lokal laufende
-        Datenbank zum Beispiel:</p><pre class="programlisting">local all kivitendo password
-host all kivitendo 127.0.0.1 255.255.255.255 password</pre></div><div class="sect2" title="2.5.3. Erweiterung für servergespeicherte Prozeduren"><div class="titlepage"><div><div><h3 class="title"><a name="Erweiterung-f%C3%BCr-servergespeicherte-Prozeduren"></a>2.5.3. Erweiterung für servergespeicherte Prozeduren</h3></div></div></div><p>In der Datenbank <code class="literal">template1</code> muss die
-        Unterstützung für servergespeicherte Prozeduren eingerichet werden.
-        Melden Sie sich dafür als Benutzer “postgres” an der Datenbank an:
-        </p><pre class="programlisting">su - postgres
-psql template1</pre><p> führen Sie die folgenden Kommandos aus:</p><pre class="programlisting">CREATE EXTENSION IF NOT EXISTS plpgsql;
-\q</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
-                  <code class="literal">CREATE EXTENSION</code> ist seit Version 9.1 die
-          bevorzugte Syntax um die Sprache <code class="literal">plpgsql</code>
-          anzulegen. In diesen Versionen ist die Extension meist auch schon
-          vorhanden. Sollten Sie eine ältere Version von Postgres haben,
-          benutzen Sie stattdessen den folgenden Befehl.</p><pre class="programlisting">CREATE LANGUAGE 'plpgsql';
-\q</pre></td></tr></table></div></div><div class="sect2" title="2.5.4. Erweiterung für Trigram Prozeduren"><div class="titlepage"><div><div><h3 class="title"><a name="Erweiterung-f%C3%BCr-trigram"></a>2.5.4. Erweiterung für Trigram Prozeduren</h3></div></div></div><p>Ab Version 3.5.1 wird die Trigram-Index-Erweiterung benötigt.
-        Diese wird mit dem SQL-Updatescript
-        sql/Pg-upgrade2/trigram_extension.sql und Datenbank-Super-Benutzer
-        Rechten automatisch installiert. Dazu braucht der
-        DatenbankSuperbenutzer "postgres" ein Passwort.</p><pre class="programlisting">su - postgres
-psql
-\password postgres
+   <title>2.5. kivitendo-Konfigurationsdatei</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s04.html" title="2.4. Manuelle Installation des Programmpaketes"><link rel="next" href="ch02s06.html" title="2.6. Anpassung der PostgreSQL-Konfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.5. kivitendo-Konfigurationsdatei</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.5. kivitendo-Konfigurationsdatei"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.config-file"></a>2.5. kivitendo-Konfigurationsdatei</h2></div></div></div><div class="sect2" title="2.5.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.introduction"></a>2.5.1. Einführung</h3></div></div></div><p>In kivitendo gibt es nur noch eine Konfigurationsdatei, die
+        benötigt wird: <code class="filename">config/kivitendo.conf</code> (kurz: "die
+        Hauptkonfigurationsdatei"). Diese muss bei der Erstinstallation von
+        kivitendo bzw. der Migration von älteren Versionen angelegt
+        werden.</p><p>Als Vorlage dient die Datei
+        <code class="filename">config/kivitendo.conf.default</code> (kurz: "die
+        Default-Datei"):</p><pre class="programlisting">$ cp config/kivitendo.conf.default config/kivitendo.conf</pre><p>Die Default-Datei wird immer zuerst eingelesen. Werte, die in
+        der Hauptkonfigurationsdatei stehen, überschreiben die Werte aus der
+        Default-Datei. Die Hauptkonfigurationsdatei muss also nur die
+        Abschnitte und Werte enthalten, die von denen der Default-Datei
+        abweichen.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Vor der Umbenennung in kivitendo hieß diese Datei noch
+          <code class="filename">config/lx_office.conf</code>. Aus Gründen der
+          Kompatibilität wird diese Datei eingelesen, sofern die Datei
+          <code class="filename">config/kivitendo.conf</code> nicht existiert.</p></td></tr></table></div><p>Diese Hauptkonfigurationsdatei ist dann eine
+        installationsspezifische Datei, d.h. sie enthält bspw. lokale
+        Passwörter und wird auch nicht im Versionsmanagement (git)
+        verwaltet.</p><p>Die Konfiguration ist ferner serverabhängig, d.h. für alle
+        Mandaten, bzw. Datenbanken gleich.</p></div><div class="sect2" title="2.5.2. Abschnitte und Parameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.sections-parameters"></a>2.5.2. Abschnitte und Parameter</h3></div></div></div><p>Die Konfigurationsdatei besteht aus mehreren Teilen, die
+        entsprechend kommentiert sind:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">authentication</code> (siehe Abschnitt "<a class="xref" href="ch02s10.html" title="2.10. Benutzerauthentifizierung und Administratorpasswort">Abschnitt&nbsp;2.10, „Benutzerauthentifizierung und Administratorpasswort“</a>"
+            in diesem Kapitel)</p></li><li class="listitem"><p>
+                     <code class="literal">authentication/database</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">authentication/http_basic</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">authentication/http_headers</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">authentication/ldap</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">system</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">paths</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">mail_delivery</code> (siehe Abschnitt "<a class="xref" href="ch02s13.html#config.sending-email.smtp" title="2.13.1.2. Versand über einen SMTP-Server">E-Mail-Versand über einen SMTP-Server</a>)</p></li><li class="listitem"><p>
+                     <code class="literal">imap_client</code> (siehe Abschnitt "<a class="xref" href="ch02s13.html#config.imap_client" title="2.13.3. E-Mails in kivitendo importieren">E-Mails in kivitendo importieren</a>)</p></li><li class="listitem"><p>
+                     <code class="literal">sent_emails_in_imap</code> (siehe Abschnitt "<a class="xref" href="ch02s13.html#config.sent_emails_in_imap" title="2.13.2. Versendete E-Mails über IMAP exportieren">Versendete E-Mails über IMAP exportieren</a>)</p></li><li class="listitem"><p>
+                     <code class="literal">applications</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">environment</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">print_templates</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">task_server</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">periodic_invoices</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">self_tests</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">console</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">testing</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">testing/database</code>
+                  </p></li><li class="listitem"><p>
+                     <code class="literal">debug</code>
+                  </p></li></ul></div><p>Die üblicherweise wichtigsten Parameter, die am Anfang
+        einzustellen oder zu kontrollieren sind, sind:</p><pre class="programlisting">[authentication]
+admin_password = geheim
 
-Eingabe Passwort
-\q</pre><p>Benutzername Postgres und Passwort können jetzt beim Anlegen
-        einer Datenbank bzw. bei Updatescripten, die SuperuserRechte
-        benötigen, eingegeben werden.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
-                  <code class="literal">pg_trgm</code> ist je nach Distribution nicht im
-          Standard-Paket von Postgres enthalten. Ein </p><pre class="programlisting">select * from pg_available_extensions where name ='pg_trgm';</pre><p>
-          in template1 sollte entsprechend erfolgreich sein. Andernfalls muss
-          das Paket nachinstalliert werden, bspw. bei debian/ubuntu
-          </p><pre class="programlisting">apt install postgresql-contrib</pre><p>
-               </p></td></tr></table></div></div><div class="sect2" title="2.5.5. Datenbankbenutzer anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Datenbankbenutzer-anlegen"></a>2.5.5. Datenbankbenutzer anlegen</h3></div></div></div><p>Wenn Sie nicht den Datenbanksuperuser “postgres” zum Zugriff
-        benutzen wollen, so sollten Sie bei PostgreSQL einen neuen Benutzer
-        anlegen. Ein Beispiel, wie Sie einen neuen Benutzer anlegen
-        können:</p><p>Die Frage, ob der neue User Superuser sein soll, können Sie mit
-        nein beantworten, genauso ist die Berechtigung neue User (Roles) zu
-        generieren nicht nötig.</p><pre class="programlisting">su - postgres
-createuser -d -P kivitendo
-exit</pre><p>Wenn Sie später einen Datenbankzugriff konfigurieren, verändern
-        Sie den evtl. voreingestellten Benutzer “postgres” auf “kivitendo”
-        bzw. den hier gewählten Benutzernamen.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s04.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s06.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.4. kivitendo-Konfigurationsdatei&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.6. Webserver-Konfiguration</td></tr></table></div></body></html>
\ No newline at end of file
+[authentication/database]
+host     = localhost
+port     = 5432
+db       = kivitendo_auth
+user     = postgres
+password =
+
+[system]
+default_manager = german</pre><p>Für kivitendo Installationen in der Schweiz sollte hier
+        <code class="varname">german</code> durch <code class="varname">swiss</code> ersetzt
+        werden.</p><p>Die Einstellung <code class="varname">default_manager = swiss</code>
+        bewirkt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Beim Erstellen einer neuen Datenbank in der kivitendo
+            Administration werden automatisch die Standard-Werte für die
+            Schweiz voreingestellt: Währung CHF, 5er-Rundung, Schweizer
+            KMU-Kontenplan, Sollversteuerung, Aufwandsmethode, Bilanzierung
+            (die Werte können aber manuell angepasst werden).</p></li><li class="listitem"><p>Einstellen der Standardkonten für Rundungserträge und
+            -aufwendungen (unter Mandantenkonfiguration → Standardkonten
+            veränderbar)</p></li><li class="listitem"><p>das verwendete Zahlenformat wird auf
+            <code class="varname">1'000.00</code> eingestellt (unter Programm →
+            Benutzereinstellungen veränderbar)</p></li><li class="listitem"><p>DATEV-Automatik und UStVA werden nicht angezeigt,
+            Erfolgsrechnung ersetzt GUV ( unter Mandantenkonfiguration →
+            Features veränderbar)</p></li></ul></div><p>Nutzt man wiederkehrende Rechnungen, kann man unter
+        <code class="varname">[periodic_invoices]</code> den Login eines Benutzers
+        angeben, der nach Erstellung der Rechnungen eine entsprechende E-Mail
+        mit Informationen über die erstellten Rechnungen bekommt.</p><p>kivitendo bringt eine eigene Komponente zur zeitgesteuerten
+        Ausführung bestimmter Aufgaben mit, den <a class="link" href="ch02s08.html" title="2.8. Der Task-Server">Task-Server</a>. Er wird u.a. für
+        Features wie die <a class="link" href="ch03.html#features.periodic-invoices" title="3.1. Wiederkehrende Rechnungen">wiederkehrenden Rechnungen</a>
+        benötigt, erledigt aber auch andere erforderliche Aufgaben und muss
+        daher in Betrieb genommen werden. Seine Einrichtung wird im Abschnitt
+        <a class="link" href="ch02s08.html" title="2.8. Der Task-Server">Task-Server</a> genauer
+        beschrieben.</p><p>Für Entwickler finden sich unter <code class="varname">[debug]</code>
+        wichtige Funktionen, um die Fehlersuche zu erleichtern.</p></div><div class="sect2" title="2.5.3. Versionen vor 2.6.3"><div class="titlepage"><div><div><h3 class="title"><a name="config.config-file.prior-versions"></a>2.5.3. Versionen vor 2.6.3</h3></div></div></div><p>In älteren kivitendo Versionen gab es im Verzeichnis
+        <code class="filename">config</code> die Dateien
+        <code class="filename">authentication.pl</code> und
+        <code class="filename">lx-erp.conf</code>, die jeweils Perl-Dateien waren. Es
+        gab auch die Möglichkeit, eine lokale Version der Konfigurationsdatei
+        zu erstellen (<code class="filename">lx-erp-local.conf</code>). Dies ist ab
+        2.6.3 nicht mehr möglich, aber auch nicht mehr nötig.</p><p>Beim Update von einer kivitendo-Version vor 2.6.3 auf 2.6.3 oder
+        jünger müssen die Einstellungen aus den alten Konfigurationsdateien
+        manuell übertragen und die alten Konfigurationsdateien anschließend
+        gelöscht oder verschoben werden. Ansonsten zeigt kivitendo eine
+        entsprechende Fehlermeldung an.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s04.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s06.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.4. Manuelle Installation des Programmpaketes&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.6. Anpassung der PostgreSQL-Konfiguration</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s06.html b/doc/html/ch02s06.html
index 59be848d9..80c32dd7e 100644
--- a/doc/html/ch02s06.html
+++ b/doc/html/ch02s06.html
@@ -1,140 +1,73 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.6. Webserver-Konfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s05.html" title="2.5. Anpassung der PostgreSQL-Konfiguration"><link rel="next" href="ch02s07.html" title="2.7. Der Task-Server"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.6. Webserver-Konfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.6. Webserver-Konfiguration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Apache-Konfiguration"></a>2.6. Webserver-Konfiguration</h2></div></div></div><div class="sect2" title="2.6.1. Grundkonfiguration mittels CGI"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1192"></a>2.6.1. Grundkonfiguration mittels CGI</h3></div></div></div><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Für einen deutlichen Performanceschub sorgt die Ausführung
-          mittels FastCGI/FCGI. Die Einrichtung wird ausführlich im Abschnitt
-          <a class="xref" href="ch02s06.html#Apache-Konfiguration.FCGI" title="2.6.2. Konfiguration für FastCGI/FCGI">Konfiguration für FastCGI/FCGI</a> beschrieben.</p></td></tr></table></div><p>Der Zugriff auf das Programmverzeichnis muss in der Apache
-        Webserverkonfigurationsdatei <code class="literal">httpd.conf</code> eingestellt
-        werden. Fügen Sie den folgenden Abschnitt dieser Datei oder einer
-        anderen Datei hinzu, die beim Starten des Webservers eingelesen
-        wird:</p><pre class="programlisting">AliasMatch ^/kivitendo-erp/[^/]+\.pl /var/www/kivitendo-erp/dispatcher.pl
-Alias /kivitendo-erp/ /var/www/kivitendo-erp/
+   <title>2.6. Anpassung der PostgreSQL-Konfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s05.html" title="2.5. kivitendo-Konfigurationsdatei"><link rel="next" href="ch02s07.html" title="2.7. Webserver-Konfiguration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.6. Anpassung der PostgreSQL-Konfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.6. Anpassung der PostgreSQL-Konfiguration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Anpassung-der-PostgreSQL-Konfiguration"></a>2.6. Anpassung der PostgreSQL-Konfiguration</h2></div></div></div><p>PostgreSQL muss auf verschiedene Weisen angepasst werden.</p><p>Dies variert je nach eingesetzter Distribution, da distributionsabhängig unterschiedliche Strategien beim Upgrade der Postgres Version eingesetzt werden.
+            Als Hinweis einige Links zu den drei Distribution (Stand Dezember 2018):</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                  <a class="ulink" href="https://fedoraproject.org/wiki/PostgreSQL" target="_top">Fedora (Postgres-Installation unter Fedora)</a>
+               </p></li><li class="listitem"><p>
+                  <a class="ulink" href="https://help.ubuntu.com/lts/serverguide/postgresql.html" target="_top">Ubuntu (Infos für Postgres für die aktuelle LTS Version)</a>
+               </p></li><li class="listitem"><p>
+                  <a class="ulink" href="https://de.opensuse.org/PostgreSQL" target="_top">OpenSuSE (aktuell nur bis Version OpenSuSE 13 verifiziert)</a>
+               </p></li></ul></div><div class="sect2" title="2.6.1. Zeichensätze/die Verwendung von Unicode/UTF-8"><div class="titlepage"><div><div><h3 class="title"><a name="Zeichens%C3%A4tze-die-Verwendung-von-UTF-8"></a>2.6.1. Zeichensätze/die Verwendung von Unicode/UTF-8</h3></div></div></div><p>kivitendo setzt zwingend voraus, dass die Datenbank
+        Unicode/UTF-8 als Encoding einsetzt. Bei aktuellen
+        Serverinstallationen braucht man hier meist nicht einzugreifen.</p><p>Das Encoding des Datenbankservers kann überprüft werden. Ist das
+        Encoding der Datenbank "template1" "Unicode" bzw. "UTF-8", so braucht
+        man nichts weiteres diesbezüglich unternehmen. Zum Testen:</p><pre class="programlisting">su postgres
+echo '\l' | psql
+exit </pre><p>Andernfalls ist es notwendig, einen neuen Datenbankcluster mit
+        Unicode-Encoding anzulegen und diesen zu verwenden. Unter Debian und
+        Ubuntu kann dies z.B. für PostgreSQL 9.3 mit dem folgenden Befehl
+        getan werden:</p><pre class="programlisting">pg_createcluster --locale=de_DE.UTF-8 --encoding=UTF-8 9.3 clustername</pre><p>Die Datenbankversionsnummer muss an die tatsächlich verwendete
+        Versionsnummer angepasst werden.</p><p>Unter anderen Distributionen gibt es ähnliche Methoden.</p><p>Das Encoding einer Datenbank kann in <span class="command"><strong>psql</strong></span> mit
+        <code class="literal">\l</code> geprüft werden.</p></div><div class="sect2" title="2.6.2. Änderungen an Konfigurationsdateien"><div class="titlepage"><div><div><h3 class="title"><a name="%C3%84nderungen-an-Konfigurationsdateien"></a>2.6.2. Änderungen an Konfigurationsdateien</h3></div></div></div><p>In der Datei <code class="filename">postgresql.conf</code>, die je nach
+        Distribution in verschiedenen Verzeichnissen liegen kann (z.B.
+        <code class="filename">/var/lib/pgsql/data/</code> oder
+        <code class="filename">/etc/postgresql/</code>), muss sichergestellt werden,
+        dass TCP/IP-Verbindungen aktiviert sind. Das Verhalten wird über den
+        Parameter <code class="varname">listen_address</code> gesteuert. Laufen
+        PostgreSQL und kivitendo auf demselben Rechner, so kann dort der Wert
+        <code class="literal">localhost</code> verwendet werden. Andernfalls müssen
+        Datenbankverbindungen auch von anderen Rechnern aus zugelassen werden,
+        was mit dem Wert <code class="literal">*</code> geschieht.</p><p>In der Datei <code class="filename">pg_hba.conf</code>, die im gleichen
+        Verzeichnis wie die <code class="filename">postgresql.conf</code> zu finden
+        sein sollte, müssen die Berechtigungen für den Zugriff geändert
+        werden. Hier gibt es mehrere Möglichkeiten. Sinnvoll ist es nur die
+        nötigen Verbindungen immer zuzulassen, für eine lokal laufende
+        Datenbank zum Beispiel:</p><pre class="programlisting">local all kivitendo password
+host all kivitendo 127.0.0.1 255.255.255.255 scram-sha-256</pre></div><div class="sect2" title="2.6.3. Erweiterung für servergespeicherte Prozeduren"><div class="titlepage"><div><div><h3 class="title"><a name="Erweiterung-f%C3%BCr-servergespeicherte-Prozeduren"></a>2.6.3. Erweiterung für servergespeicherte Prozeduren</h3></div></div></div><p>In der Datenbank <code class="literal">template1</code> muss die
+        Unterstützung für servergespeicherte Prozeduren eingerichet werden.
+        Melden Sie sich dafür als Benutzer “postgres” an der Datenbank an:
+        </p><pre class="programlisting">su - postgres
+psql template1</pre><p> führen Sie die folgenden Kommandos aus:</p><pre class="programlisting">CREATE EXTENSION IF NOT EXISTS plpgsql;
+\q</pre><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
+                  <code class="literal">CREATE EXTENSION</code> ist seit Version 9.1 die
+          bevorzugte Syntax um die Sprache <code class="literal">plpgsql</code>
+          anzulegen. In diesen Versionen ist die Extension meist auch schon
+          vorhanden. Sollten Sie eine ältere Version von Postgres haben,
+          benutzen Sie stattdessen den folgenden Befehl.</p><pre class="programlisting">CREATE LANGUAGE 'plpgsql';
+\q</pre></td></tr></table></div></div><div class="sect2" title="2.6.4. Erweiterung für Trigram Prozeduren"><div class="titlepage"><div><div><h3 class="title"><a name="Erweiterung-f%C3%BCr-trigram"></a>2.6.4. Erweiterung für Trigram Prozeduren</h3></div></div></div><p>Ab Version 3.5.1 wird die Trigram-Index-Erweiterung benötigt.
+        Diese wird mit dem SQL-Updatescript
+        sql/Pg-upgrade2/trigram_extension.sql und Datenbank-Super-Benutzer
+        Rechten automatisch installiert. Dazu braucht der
+        DatenbankSuperbenutzer "postgres" ein Passwort.</p><pre class="programlisting">su - postgres
+psql
+\password postgres
 
-&lt;Directory /var/www/kivitendo-erp&gt;
- AddHandler cgi-script .pl
- Options ExecCGI Includes FollowSymlinks
-&lt;/Directory&gt;
-
-&lt;Directory /var/www/kivitendo-erp/users&gt;
- Require all granted
-&lt;/Directory&gt;</pre><p>Ersetzen Sie dabei die Pfade durch diejenigen, in die Sie vorher
-        das kivitendo-Archiv entpacket haben.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Vor den einzelnen Optionen muss bei einigen Distributionen ein
-          Plus ‘<code class="literal">+</code>’ gesetzt werden.</p><p>Bei einigen Distribution (Ubuntu ab 14.04, Debian ab 8.2) muss
-          noch explizit das cgi-Modul mittels </p><pre class="programlisting">a2enmod cgi</pre><p>
-          aktiviert werden.</p></td></tr></table></div><p>Auf einigen Webservern werden manchmal die Grafiken und
-        Style-Sheets nicht ausgeliefert. In solchen Fällen hat es oft
-        geholfen, die folgende Option in die Konfiguration aufzunehmen:</p><pre class="programlisting">EnableSendfile Off</pre></div><div class="sect2" title="2.6.2. Konfiguration für FastCGI/FCGI"><div class="titlepage"><div><div><h3 class="title"><a name="Apache-Konfiguration.FCGI"></a>2.6.2. Konfiguration für FastCGI/FCGI</h3></div></div></div><div class="sect3" title="2.6.2.1. Was ist FastCGI?"><div class="titlepage"><div><div><h4 class="title"><a name="Apache-Konfiguration.FCGI.WasIstEs"></a>2.6.2.1. Was ist FastCGI?</h4></div></div></div><p>Direkt aus <a class="ulink" href="http://de.wikipedia.org/wiki/FastCGI" target="_top">Wikipedia</a>
-          kopiert:</p><p>
-                  [<span class="citation"> FastCGI ist ein Standard für die Einbindung
-          externer Software zur Generierung dynamischer Webseiten in einem
-          Webserver. FastCGI ist vergleichbar zum Common Gateway Interface
-          (CGI), wurde jedoch entwickelt, um dessen Performance-Probleme zu
-          umgehen. </span>]
-               </p></div><div class="sect3" title="2.6.2.2. Warum FastCGI?"><div class="titlepage"><div><div><h4 class="title"><a name="Apache-Konfiguration.FCGI.Warum"></a>2.6.2.2. Warum FastCGI?</h4></div></div></div><p>Perl Programme (wie kivitendo eines ist) werden nicht statisch
-          kompiliert. Stattdessen werden die Quelldateien bei jedem Start
-          übersetzt, was bei kurzen Laufzeiten einen Großteil der Laufzeit
-          ausmacht. Während SQL Ledger einen Großteil der Funktionalität in
-          einzelne Module kapselt, um immer nur einen kleinen Teil laden zu
-          müssen, ist die Funktionalität von kivitendo soweit gewachsen, dass
-          immer mehr Module auf den Rest des Programms zugreifen. Zusätzlich
-          benutzen wir umfangreiche Bibliotheken um Funktionaltät nicht selber
-          entwickeln zu müssen, die zusätzliche Ladezeit kosten. All dies
-          führt dazu dass ein kivitendo Aufruf der Kernmasken mittlerweile
-          deutlich länger dauert als früher, und dass davon 90% für das Laden
-          der Module verwendet wird.</p><p>Mit FastCGI werden nun die Module einmal geladen, und danach
-          wird nur die eigentliche Programmlogik ausgeführt.</p></div><div class="sect3" title="2.6.2.3. Getestete Kombinationen aus Webservern und Plugin"><div class="titlepage"><div><div><h4 class="title"><a name="Apache-Konfiguration.FCGI.WebserverUndPlugin"></a>2.6.2.3. Getestete Kombinationen aus Webservern und Plugin</h4></div></div></div><p>Folgende Kombinationen sind getestet:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Apache 2.4.7 (Ubuntu 14.04.2 LTS) und mod_fcgid.</p></li><li class="listitem"><p>Apache 2.4.18 (Ubuntu 16.04 LTS) und mod_fcgid</p></li><li class="listitem"><p>Apache 2.4.29 (Ubuntu 18.04 LTS) und mod_fcgid</p></li><li class="listitem"><p>Apache 2.4.41 (Ubuntu 20.04 LTS) und mod_fcgid</p></li></ul></div><p>Als Perl Backend wird das Modul <code class="filename">FCGI.pm</code>
-          verwendet.</p><div class="warning" title="Warnung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Warning"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Warnung]" src="system/docbook-xsl/images/warning.png"></td><th align="left">Warnung</th></tr><tr><td align="left" valign="top"><p>FCGI-Versionen ab 0.69 und bis zu 0.71 inklusive sind extrem
-            strict in der Behandlung von Unicode, und verweigern bestimmte
-            Eingaben von kivitendo. Falls es Probleme mit Umlauten in Ihrer
-            Installation gibt, muss zwingend Version 0.68 oder aber Version
-            0.72 und neuer eingesetzt werden.</p><p>Mit <a class="ulink" href="http://www.cpan.org" target="_top">CPAN</a> lässt sie
-            sich die Vorgängerversion wie folgt installieren:</p><pre class="programlisting">force install M/MS/MSTROUT/FCGI-0.68.tar.gz</pre></td></tr></table></div></div><div class="sect3" title="2.6.2.4. Konfiguration des Webservers"><div class="titlepage"><div><div><h4 class="title"><a name="Apache-Konfiguration.FCGI.Konfiguration"></a>2.6.2.4. Konfiguration des Webservers</h4></div></div></div><p>Bevor Sie versuchen, eine kivitendo Installation unter FCGI
-          laufen zu lassen, empfiehlt es sich die Installation ersteinmal
-          unter CGI aufzusetzen. FCGI macht es nicht einfach Fehler zu
-          debuggen die beim ersten aufsetzen auftreten können. Sollte die
-          Installation schon funktionieren, lesen Sie weiter.</p><p>Zuerst muss das FastCGI-Modul aktiviert werden. Dies kann
-          unter Debian/Ubuntu z.B. mit folgendem Befehl geschehen:</p><pre class="programlisting">a2enmod fcgid</pre><p>Die Konfiguration für die Verwendung von kivitendo mit FastCGI
-          erfolgt durch Anpassung der vorhandenen <code class="function">Alias</code>-
-          und <code class="function">Directory</code>-Direktiven. Dabei wird zwischen
-          dem Installationspfad von kivitendo im Dateisystem
-          ("<code class="filename">/path/to/kivitendo-erp</code>") und der URL
-          unterschieden, unter der kivitendo im Webbrowser erreichbar ist
-          ("<code class="filename">/url/for/kivitendo-erp</code>").</p><p>Folgender Konfigurationsschnipsel funktioniert mit
-          mod_fastcgi:</p><pre class="programlisting">AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fcgi
-Alias       /url/for/kivitendo-erp/          /path/to/kivitendo-erp/
-
-&lt;Directory /path/to/kivitendo-erp&gt;
-  AllowOverride All
-  Options ExecCGI Includes FollowSymlinks
-  Require all granted
-&lt;/Directory&gt;
-
-&lt;DirectoryMatch /path/to/kivitendo-erp/users&gt;
-Require all denied
-&lt;/DirectoryMatch&gt;</pre><div class="warning" title="Warnung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Warning"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Warnung]" src="system/docbook-xsl/images/warning.png"></td><th align="left">Warnung</th></tr><tr><td align="left" valign="top"><p>Wer einen älteren Apache als Version 2.4 im Einsatz hat,
-            muss entsprechend die Syntax der Directorydirektiven verändert.
-            Statt</p><pre class="programlisting">Require all granted</pre><p>muß man Folgendes einstellen:</p><pre class="programlisting">
-  Order Allow,Deny
-  Allow from All </pre><p>und statt</p><pre class="programlisting">Require all denied</pre><p>muss stehen:</p><pre class="programlisting">
-  Order Deny,Allow
-  Deny from All </pre></td></tr></table></div><p>Seit mod_fcgid-Version 2.3.6 gelten sehr kleine Grenzen für
-          die maximale Größe eines Requests. Diese sollte wie folgt
-          hochgesetzt werden:</p><pre class="programlisting">FcgidMaxRequestLen 10485760</pre><p>Das Ganze sollte dann so aussehen:</p><pre class="programlisting">AddHandler fcgid-script .fpl
-AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fpl
-Alias       /url/for/kivitendo-erp/          /path/to/kivitendo-erp/
-FcgidMaxRequestLen 10485760
-
-&lt;Directory /path/to/kivitendo-erp&gt;
-  AllowOverride All
-  Options ExecCGI Includes FollowSymlinks
-  Require all granted
-&lt;/Directory&gt;
-
-&lt;DirectoryMatch /path/to/kivitendo-erp/users&gt;
-Require all denied
-&lt;/DirectoryMatch&gt;</pre><p>Hierdurch wird nur ein zentraler Dispatcher gestartet. Alle
-          Zugriffe auf die einzelnen Scripte werden auf diesen umgeleitet.
-          Dadurch, dass zur Laufzeit öfter mal Scripte neu geladen werden,
-          gibt es hier kleine Performance-Einbußen.</p><p>Es ist möglich, die gleiche kivitendo Version parallel unter
-          CGI und FastCGI zu betreiben. Dafür bleiben die Directorydirektiven
-          wie oben beschrieben, die URLs werden aber umgeleitet:</p><pre class="programlisting"># Zugriff über CGI
-Alias       /url/for/kivitendo-erp                /path/to/kivitendo-erp
-
-# Zugriff mit mod_fcgid:
-AliasMatch ^/url/for/kivitendo-erp-fcgid/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fpl
-Alias       /url/for/kivitendo-erp-fcgid/          /path/to/kivitendo-erp/</pre><p>Dann ist unter <code class="filename">/url/for/kivitendo-erp/</code>
-          die normale Version erreichbar, und unter
-          <code class="constant">/url/for/kivitendo-erp-fcgid/</code> die
-          FastCGI-Version.</p></div></div><div class="sect2" title="2.6.3. Authentifizierung mittels HTTP Basic Authentication"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1346"></a>2.6.3. Authentifizierung mittels HTTP Basic Authentication</h3></div></div></div><p>
-        Kivitendo unterstützt, dass Benutzerauthentifizierung über den Webserver mittels des »Basic«-HTTP-Authentifizierungs-Schema erfolgt
-        (siehe <a class="ulink" href="https://tools.ietf.org/html/rfc7617" target="_top">RFC 7617</a>). Dazu ist es aber nötig, dass der dabei vom Client
-        mitgeschickte Header <code class="constant">Authorization</code> vom Webserver an Kivitendo über die Umgebungsvariable
-        <code class="constant">HTTP_AUTHORIZATION</code> weitergegeben wird, was standardmäßig nicht der Fall ist. Für Apache kann dies über die
-        folgende Konfigurationsoption aktiviert werden:
-       </p><pre class="programlisting">SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1</pre></div><div class="sect2" title="2.6.4. Aktivierung von mod_rewrite/directory_match für git basierte Installationen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1362"></a>2.6.4. Aktivierung von mod_rewrite/directory_match für git basierte Installationen</h3></div></div></div><p>
-        Aufgrund von aktuellen (Mitte 2020) Sicherheitswarnungen für git basierte Webanwendungen ist die mitausgelieferte .htaccess
-        restriktiver geworden und verhindert somit das Auslesen von git basierten Daten.
-        Für debian/ubuntu muss das Modul mod_rewrite einmalig so aktiviert werden:
-        </p><pre class="programlisting">a2enmod rewrite</pre><p>
-        Alternativ und für Installationen ohne Apache ist folgender Artikel interessant:
-        <a class="ulink" href="https://www.cyberscan.io/blog/git-luecke" target="_top">git-lücke</a>.
-        Anstelle des dort beschriebenen DirectoryMatch für Apache2 würden wir etwas weitergehend auch noch das Verzeichnis config miteinbeziehen
-        sowie ferner auch die Möglichkeit nicht ausschließen, dass es in Unterverzeichnissen auch noch .git Repositories geben kann.
-        Die Empfehlung für Apache 2.4 wäre damit:
-        </p><pre class="programlisting">
-        &lt;DirectoryMatch "/(\.git|config)/"&gt;
-          Require all denied
-        &lt;/DirectoryMatch&gt;</pre><p>
-       
-            </p></div><div class="sect2" title="2.6.5. Weitergehende Konfiguration"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1376"></a>2.6.5. Weitergehende Konfiguration</h3></div></div></div><p>Für einen deutlichen Sicherheitsmehrwert sorgt die Ausführung
-        von kivitendo nur über https-verschlüsselten Verbindungen, sowie
-        weiteren Zusatzmassnahmen, wie beispielsweise Basic Authenticate. Die
-        Konfigurationsmöglichkeiten sprengen allerdings den Rahmen dieser
-        Anleitung, hier ein Hinweis auf einen entsprechenden <a class="ulink" href="http://redmine.kivitendo-premium.de/boards/1/topics/142" target="_top">Foreneintrag
-        (Stand Sept. 2015)</a> und einen aktuellen (Stand Mai 2017) <a class="ulink" href="https://mozilla.github.io/server-side-tls/ssl-config-generator/" target="_top">
-        SSL-Konfigurations-Generator</a>.</p></div><div class="sect2" title="2.6.6. Aktivierung von Apache2 modsecurity"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1387"></a>2.6.6. Aktivierung von Apache2 modsecurity</h3></div></div></div><p>Aufgrund des OpenSource Charakters ist kivitendo nicht "out of the box" sicher.
-  Organisatorisch empfehlen wir hier die enge Zusammenarbeit mit einem kivitendo Partner der auch in der
-Lage ist weiterführende Fragen in Bezug auf Datenschutz und Datensicherheit zu beantworten.
-Unabhängig davon empfehlen wir im Webserver Bereich die Aktivierung und Konfiguration des Moduls modsecurity für den Apache2, damit
-XSS und SQL-Injections verhindert werden.</p><p> Als Idee hierfür sei dieser Blog-Eintrag genannt:
-<a class="ulink" href="https://doxsec.wordpress.com/2017/06/11/using-modsecurity-web-application-firewall-to-prevent-sql-injection-and-xss-using-blocking-rules/" target="_top">
-        Test Apache2 modsecurity for SQL Injection</a>.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s05.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s07.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.5. Anpassung der PostgreSQL-Konfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.7. Der Task-Server</td></tr></table></div></body></html>
\ No newline at end of file
+Eingabe Passwort
+\q</pre><p>Benutzername Postgres und Passwort können jetzt beim Anlegen
+        einer Datenbank bzw. bei Updatescripten, die SuperuserRechte
+        benötigen, eingegeben werden.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
+                  <code class="literal">pg_trgm</code> ist je nach Distribution nicht im
+          Standard-Paket von Postgres enthalten. Ein </p><pre class="programlisting">select * from pg_available_extensions where name ='pg_trgm';</pre><p>
+          in template1 sollte entsprechend erfolgreich sein. Andernfalls muss
+          das Paket nachinstalliert werden, bspw. bei debian/ubuntu
+          </p><pre class="programlisting">apt install postgresql-contrib</pre><p>
+               </p></td></tr></table></div></div><div class="sect2" title="2.6.5. Datenbankbenutzer anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Datenbankbenutzer-anlegen"></a>2.6.5. Datenbankbenutzer anlegen</h3></div></div></div><p>Wenn Sie nicht den Datenbanksuperuser “postgres” zum Zugriff
+        benutzen wollen, so sollten Sie bei PostgreSQL einen neuen Benutzer
+        anlegen. Ein Beispiel, wie Sie einen neuen Benutzer anlegen
+        können:</p><p>Die Frage, ob der neue User Superuser sein soll, können Sie mit
+        nein beantworten, genauso ist die Berechtigung neue User (Roles) zu
+        generieren nicht nötig.</p><pre class="programlisting">su - postgres
+createuser -d -P kivitendo
+exit</pre><p>Wenn Sie später einen Datenbankzugriff konfigurieren, verändern
+        Sie den evtl. voreingestellten Benutzer “postgres” auf “kivitendo”
+        bzw. den hier gewählten Benutzernamen.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s05.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s07.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.5. kivitendo-Konfigurationsdatei&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.7. Webserver-Konfiguration</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s07.html b/doc/html/ch02s07.html
index 39312f80b..a47fcf9d6 100644
--- a/doc/html/ch02s07.html
+++ b/doc/html/ch02s07.html
@@ -1,119 +1,71 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.7. Der Task-Server</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s06.html" title="2.6. Webserver-Konfiguration"><link rel="next" href="ch02s08.html" title="2.8. Benutzerauthentifizierung und Administratorpasswort"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.7. Der Task-Server</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.7. Der Task-Server"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.task-server"></a>2.7. Der Task-Server</h2></div></div></div><p>Der Task-Server ist ein Prozess, der im Hintergrund läuft, in
-      regelmäßigen Abständen nach abzuarbeitenden Aufgaben sucht und diese zu
-      festgelegten Zeitpunkten abarbeitet (ähnlich wie Cron). Dieser Prozess
-      wird u.a. für die Erzeugung der wiederkehrenden Rechnungen und weitere
-      essenzielle Aufgaben benutzt.</p><p>Der Task-Server muss einmalig global in der Konfigurationsdatei
-      konfiguriert werden. Danach wird er für jeden Mandanten, für den er
-      laufen soll, in der Adminsitrationsmaske eingeschaltet.</p><p>Beachten Sie, dass der Task-Server in den Boot-Vorgang Ihres
-      Servers integriert werden muss, damit er automatisch gestartet wird.
-      Dies kann kivitendo nicht für Sie erledigen.</p><p>Da der Task-Server als Perlscript läuft, wird Arbeitsspeicher, der
-      einmal benötigt wurde, nicht mehr an das Betriebssystem zurückgegeben,
-      solange der Task-Server läuft. Dies kann dazu führen, dass ein länger
-      laufender Task-Server mit der Zeit immer mehr Arbeitsspeicher für sich
-      beansprucht. Es ist deshalb sinnvoll, dass der Task-Server in
-      regelmässigen Abständen neu gestartet wird. Allerdings berücksichtigt der
-      Task-Server ein Memory-Limit, wenn dieses in der Konfigurationsdatei
-      angegeben ist. Bei Überschreiten dieses Limits beendet sich der
-      Task-Server. Sofern der Task-Server als systemd-Service mit dem
-      mitgelieferten Skript eingerichtet wurde, startet dieser danach
-      automatisch erneut.</p><div class="sect2" title="2.7.1. Verfügbare und notwendige Konfigurationsoptionen"><div class="titlepage"><div><div><h3 class="title"><a name="Konfiguration-des-Task-Servers"></a>2.7.1. Verfügbare und notwendige Konfigurationsoptionen</h3></div></div></div><p>Die Konfiguration erfolgt über den Abschnitt
-        <code class="literal">[task_server]</code> in der Datei
-        <code class="filename">config/kivitendo.conf</code>. Die dort verfügbaren
-        Optionen sind:</p><div class="variablelist"><dl><dt><span class="term">
-                     <code class="varname">run_as</code>
-                  </span></dt><dd><p>Wird der Server vom Systembenutzer <code class="literal">root</code>
-              gestartet, so wechselt er auf den mit <code class="literal">run_as</code>
-              angegebenen Systembenutzer. Der Systembenutzer muss dieselben
-              Lese- und Schreibrechte haben, wie auch der Webserverbenutzer
-              (siehe see <a class="xref" href="ch02s03.html" title="2.3. Manuelle Installation des Programmpaketes">Manuelle Installation des Programmpaketes</a>). Daher
-              ist es erforderlich, hier denselben Systembenutzer einzutragen,
-              unter dem auch der Webserver läuft.</p></dd><dt><span class="term">
-                     <code class="varname">debug</code>
-                  </span></dt><dd><p>Schaltet Debug-Informationen an und aus.</p></dd></dl></div></div><div class="sect2" title="2.7.2. Konfiguration der Mandanten für den Task-Server"><div class="titlepage"><div><div><h3 class="title"><a name="Konfiguration-der-Mandanten-fuer-den-Task-Servers"></a>2.7.2. Konfiguration der Mandanten für den Task-Server</h3></div></div></div><p>Ist der Task-Server grundlegend konfiguriert, so muss
-        anschließend jeder Mandant, für den der Task-Server laufen soll,
-        einmalig konfiguriert werden. Dazu kann in der Maske zum Bearbeiten
-        von Mandanten im Administrationsbereich eine kivitendo-Benutzerkennung
-        ausgewählt werden, unter der der Task-Server seine Arbeit
-        verrichtet.</p><p>Ist in dieser Einstellung keine Benutzerkennung ausgewählt, so
-        wird der Task-Server für diesen Mandanten keine Aufgaben
-        ausführen.</p></div><div class="sect2" title="2.7.3. Automatisches Starten des Task-Servers beim Booten"><div class="titlepage"><div><div><h3 class="title"><a name="Einbinden-in-den-Boot-Prozess"></a>2.7.3. Automatisches Starten des Task-Servers beim Booten</h3></div></div></div><p>Der Task-Server verhält sich von seinen Optionen her wie ein
-        reguläres SystemV-kompatibles Boot-Script. Außerdem wechselt er beim
-        Starten automatisch in das kivitendo-Installationsverzeichnis.</p><p>Deshalb ist es möglich, ihn durch Setzen eines symbolischen
-        Links aus einem der Runlevel-Verzeichnisse heraus in den Boot-Prozess
-        einzubinden. Da das bei neueren Linux-Distributionen aber nicht
-        zwangsläufig funktioniert, werden auch Start-Scripte mitgeliefert, die
-        anstelle eines symbolischen Links verwendet werden können.</p><div class="sect3" title="2.7.3.1. SystemV-basierende Systeme (z.B. ältere Debian, ältere openSUSE, ältere Fedora)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1460"></a>2.7.3.1. SystemV-basierende Systeme (z.B. ältere Debian, ältere
-          openSUSE, ältere Fedora)</h4></div></div></div><p>Kopieren Sie die Datei
-          <code class="filename">scripts/boot/system-v/kivitendo-task-server</code>
-          nach <code class="filename">/etc/init.d/kivitendo-task-server</code>. Passen
-          Sie in der kopierten Datei den Pfad zum Task-Server an (Zeile
-          <code class="literal">DAEMON=....</code>). Binden Sie das Script in den
-          Boot-Prozess ein. Dies ist distributionsabhängig:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Debian-basierende Systeme:</p><pre class="programlisting">update-rc.d kivitendo-task-server defaults
-insserv kivitendo-task-server</pre></li><li class="listitem"><p>Ältere openSUSE und ältere Fedora:</p><pre class="programlisting">chkconfig --add kivitendo-task-server</pre></li></ul></div><p>Danach kann der Task-Server mit dem folgenden Befehl gestartet
-          werden:</p><pre class="programlisting">/etc/init.d/kivitendo-task-server start</pre></div><div class="sect3" title="2.7.3.2. Upstart-basierende Systeme (z.B. Ubuntu bis 14.04)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1489"></a>2.7.3.2. Upstart-basierende Systeme (z.B. Ubuntu bis 14.04)</h4></div></div></div><p>Kopieren Sie die Datei
-          <code class="filename">scripts/boot/upstart/kivitendo-task-server.conf</code>
-          nach <code class="filename">/etc/init/kivitendo-task-server.conf</code>.
-          Passen Sie in der kopierten Datei den Pfad zum Task-Server an (Zeile
-          <code class="literal">exec ....</code>).</p><p>Danach kann der Task-Server mit dem folgenden Befehl gestartet
-          werden:</p><pre class="programlisting">service kivitendo-task-server start</pre></div><div class="sect3" title="2.7.3.3. systemd-basierende Systeme (z.B. neure openSUSE, neuere Fedora, neuere Ubuntu und neuere Debians)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1507"></a>2.7.3.3. systemd-basierende Systeme (z.B. neure openSUSE, neuere
-          Fedora, neuere Ubuntu und neuere Debians)</h4></div></div></div><p>Kopieren Sie die Datei
-          <code class="filename">scripts/boot/systemd/kivitendo-task-server.service</code>
-          nach <code class="filename">/etc/systemd/system/</code>. Passen Sie in der
-          kopierten Datei den Pfad zum Task-Server an (Zeilen
-          <code class="literal">ExecStart=....</code> und
-          <code class="literal">ExecStop=...</code>).</p><p>Machen Sie anschließend das Script systemd bekannt, und binden
-          Sie es in den Boot-Prozess ein. Dazu führen Sie die folgenden Befehl
-          aus:</p><pre class="programlisting">systemctl daemon-reload
-systemctl enable kivitendo-task-server.service</pre><p>Wenn Sie den Task-Server jetzt sofort starten möchten, anstatt
-          den Server neu zu starten, so können Sie das mit dem folgenden
-          Befehl tun:</p><pre class="programlisting">systemctl start kivitendo-task-server.service</pre><p>Ein so eingerichteter Task-Server startet nach Beendigung
-          automatisch erneut. Das betrifft eine Beendigung über die Oberfläche,
-          eine Beendingung über die Prozesskontrolle und eine Beendigung bei
-          Überschreiten des Memory-Limits. Soll der Task-Server nicht erneut
-          starten, so können Sie ihn mit folgendem Befehl stoppen:</p><pre class="programlisting">systemctl stop kivitendo-task-server.service</pre></div></div><div class="sect2" title="2.7.4. Wie der Task-Server gestartet und beendet wird"><div class="titlepage"><div><div><h3 class="title"><a name="Prozesskontrolle"></a>2.7.4. Wie der Task-Server gestartet und beendet wird</h3></div></div></div><p>Der Task-Server wird wie folgt kontrolliert:</p><pre class="programlisting">./scripts/task_server.pl Befehl</pre><p>
-               <code class="literal">Befehl</code> ist dabei eine der folgenden
-        Optionen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                     <code class="literal">start</code> startet eine neue Instanz des
-            Task-Servers. Die Prozess-ID wird innerhalb des
-            <code class="filename">users</code>-Verzeichnisses abgelegt.</p></li><li class="listitem"><p>
-                     <code class="literal">stop</code> beendet einen laufenden
-            Task-Server.</p></li><li class="listitem"><p>
-                     <code class="literal">restart</code> beendet und startet ihn
-            neu.</p></li><li class="listitem"><p>
-                     <code class="literal">status</code> berichtet, ob der Task-Server
-            läuft.</p></li></ul></div><p>Der Task-Server wechselt beim Starten automatisch in das
-        kivitendo-Installationsverzeichnis.</p><p>Dieselben Optionen können auch für die SystemV-basierenden
-        Runlevel-Scripte benutzt werden (siehe oben).</p><p>Wurde der Task-Server als systemd-Service eingerichtet (s.o.),
-        so startet dieser nach Beendigung automatisch erneut.</p></div><div class="sect2" title="2.7.5. Exemplarische Konfiguration eines Hintergrund-Jobs, der die Jahreszahl in allen Nummernkreisen zum Jahreswechsel erhöht"><div class="titlepage"><div><div><h3 class="title"><a name="Tasks-konfigurieren"></a>2.7.5. Exemplarische Konfiguration eines Hintergrund-Jobs, der die Jahreszahl in allen Nummernkreisen zum Jahreswechsel erhöht</h3></div></div></div><p>Hintergrund-Jobs werden über System -&gt; Hintergrund-Jobs und Task-Server -&gt; Aktuelle Hintergrund-Jobs anzeigen -&gt; Aktions-Knopf 'erfassen' angelegt. </p><p>Nachdem wir über das Menü dort angelangt sind, legen wir unseren exemplarischen Hintergrund-Jobs "Erhöhung der Nummernkreise" mit folgenden Werten an:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                     <code class="literal">Aktiv:</code> Hier ein 'Ja' auswählen</p></li><li class="listitem"><p>
-                     <code class="literal">Ausführungsart:</code> 'wiederholte Ausführung' auswählen</p></li><li class="listitem"><p>
-                     <code class="literal">Paketname:</code> 'SetNumberRange' auswählen</p></li><li class="listitem"><p>
-                     <code class="literal">Ausführungszeitplan:</code> Hier entsprechend Werte wie in der crontab eingeben.</p><p>Syntax:</p><pre class="programlisting">* * * * *
-┬ ┬ ┬ ┬ ┬
-│ │ │ │ │
-│ │ │ │ └──── Wochentag (0-7, Sonntag ist 0 oder 7)
-│ │ │ └────── Monat (1-12)
-│ │ └──────── Tag (1-31)
-│ └────────── Stunde (0-23)
-└──────────── Minute (0-59)  </pre><p>Die Sterne können folgende Werte haben:</p><pre class="programlisting">
-1 2 3 4 5
+   <title>2.7. Webserver-Konfiguration</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s06.html" title="2.6. Anpassung der PostgreSQL-Konfiguration"><link rel="next" href="ch02s08.html" title="2.8. Der Task-Server"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.7. Webserver-Konfiguration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.7. Webserver-Konfiguration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Apache-Konfiguration"></a>2.7. Webserver-Konfiguration</h2></div></div></div><p>In diesem Abschnitt wird die Konfiguration des Apache-Webservers
+      beschrieben. kivitendo wird mittels FastCGI/FCGI ausgeführt.</p><p>Es ist empfehlenswert, SSL einzusetzen, um die Daten per HTTPS
+      verschlüsselt zwischen Browser und Webserver über das Netzwerk zu
+      übertragen. Eine Möglichkeit dazu ist das Erstellen eines self-signed
+      SSL Zertifikates, was unter Debian/Ubuntu durch Installieren des Pakets
+      <code class="literal">ssl-cert</code> geschehen kann.</p><p>Der Zugriff auf den Installationspfad von kivitendo im Dateisystem
+      muss in der Apache Webserverkonfigurationsdatei eingestellt werden,
+      welche beim Starten des Webservers eingelesen wird. Wird SSL/HTTPS
+      eingesetzt, so ist dies die Datei <code class="literal">default-ssl.conf</code>,
+      für unverschlüsseltes HTTP ist es die Datei
+      <code class="literal">000-default.conf</code>.</p><p>Bitte konsultieren Sie die Dokumentation des Apache-Webservers und
+      Ihres Betriebssystems. Es kann erforderlich sein, das SSL-Modul und die
+      Webserverkonfigurationsdatei zu aktivieren:</p><pre class="programlisting">a2enmod ssl
+a2ensite default-ssl</pre><p>Unter Fedora und openSUSE müssen weiterhin in der Firewall die
+      Ports 80 (HTTP) bzw. 443 (HTTPS) geöffnet werden.</p><div class="sect2" title="2.7.1. Konfiguration für FastCGI/FCGI"><div class="titlepage"><div><div><h3 class="title"><a name="Apache-Konfiguration.FCGI"></a>2.7.1. Konfiguration für FastCGI/FCGI</h3></div></div></div><p>Mit FastCGI wird der kivitendo-Programmcode beim Start des
+        Webservers einmal geladen und danach wird nur die eigentliche
+        Programmlogik ausgeführt.</p><p>Zuerst muss das FastCGI-Modul aktiviert werden. Dies kann
+        unter Debian/Ubuntu z.B. mit folgendem Befehl geschehen:</p><pre class="programlisting">a2enmod fcgid</pre><p>Die Konfiguration für die Verwendung von kivitendo mit FastCGI
+        erfolgt durch Einfügen von <code class="function">Alias</code>-
+        und <code class="function">Directory</code>-Direktiven. Dabei wird zwischen
+        dem Installationspfad von kivitendo im Dateisystem
+        ("<code class="filename">/path/to/kivitendo-erp</code>") und der URL
+        unterschieden, unter der kivitendo im Webbrowser erreichbar ist
+        ("<code class="filename">/url/for/kivitendo-erp</code>").</p><p>Folgender Konfigurationsschnipsel funktioniert mit
+        mod_fcgid:</p><pre class="programlisting">AliasMatch ^/url/for/kivitendo-erp/[^/]+\.pl /path/to/kivitendo-erp/dispatcher.fcgi
+Alias       /url/for/kivitendo-erp/          /path/to/kivitendo-erp/
+FcgidMaxRequestLen 10485760
 
-1 = Minute (0-59)
-2 = Stunde (0-23)
-3 = Tag (0-31)
-4 = Monat (1-12)
-5 = Wochentag (0-7, Sonntag ist 0 oder 7)
-</pre><p>Um die Ausführung auf eine Minute vor Sylvester zu setzen, müssen die folgenden Werte eingetragen werden:</p><pre class="programlisting">59 23 31 12 *</pre></li><li class="listitem"><p>
-                     <code class="literal">Daten:</code>In diesem Feld können optionale Parameter für den Hintergrund im JSON-Format gesetzt werden. Der Hintergrund-Job <code class="literal">SetNumberRange</code> akzeptiert zwei Variable nämlich <code class="literal">digit_year</code> sowieso <code class="literal">multiplier</code>.</p><p> 
-                     <code class="literal">digit_year</code> kann zwei Werte haben entweder 2 oder 4, darüber wird gesteuert ob die Jahreszahl zwei oder vierstellig kodiert wird (für 2019, dann entweder 19 oder 2019). Der Standardwert ist vierstellig.</p><p> 
-                     <code class="literal">multiplier</code> ist ein Vielfaches von 10, darüber wird die erste Nummer im Nummernkreis (die Anzahl der Stellen) wie folgt bestimmt:</p><pre class="programlisting">
-multiplier     Nummernkreis 2020
-10        -&gt;   20200
-100       -&gt;   202000
-1000      -&gt;   2020000
-</pre><p>Wir gehen jetzt beispielhaft von einer letzten Rechnungsnummer von RE2019456 aus. Demnach sollte ab Januar 2020 die erste Nummer RE2020001 sein. Da der Task auch Präfixe berücksichtigt, kann dies mit folgenden JSON-kodierten Werten umgesetzt werden:</p><p>
-                     <code class="literal">Daten:</code>
-                  </p><pre class="programlisting">multiplier: 100
-digits_year: 4</pre></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s06.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s08.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.6. Webserver-Konfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.8. Benutzerauthentifizierung und Administratorpasswort</td></tr></table></div></body></html>
\ No newline at end of file
+&lt;Directory /path/to/kivitendo-erp&gt;
+  AllowOverride All
+  Options ExecCGI Includes FollowSymlinks
+  Require all granted
+&lt;/Directory&gt;
+
+&lt;DirectoryMatch /path/to/kivitendo-erp/users&gt;
+  Require all denied
+&lt;/DirectoryMatch&gt;</pre><p>Hierdurch wird nur ein zentraler Dispatcher gestartet. Alle
+        Zugriffe auf die einzelnen Scripte werden auf diesen umgeleitet.
+        Dadurch, dass zur Laufzeit öfter mal Scripte neu geladen werden,
+        gibt es hier kleine Performance-Einbußen.</p><p>Seit mod_fcgid-Version 2.3.6 gelten sehr kleine Grenzen für
+        die maximale Größe eines Requests. Mit folgender Zeile wird diese
+        Grenze hochgesetzt:</p><pre class="programlisting">FcgidMaxRequestLen 10485760</pre></div><div class="sect2" title="2.7.2. Aktivierung von mod_rewrite/directory_match für git basierte Installationen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1359"></a>2.7.2. Aktivierung von mod_rewrite/directory_match für git basierte Installationen</h3></div></div></div><p>
+        Aufgrund von aktuellen (Mitte 2020) Sicherheitswarnungen für git basierte Webanwendungen ist die mitausgelieferte .htaccess
+        restriktiver geworden und verhindert somit das Auslesen von git basierten Daten.
+        Für debian/ubuntu muss das Modul mod_rewrite einmalig so aktiviert werden:
+        </p><pre class="programlisting">a2enmod rewrite</pre><p>
+        Alternativ und für Installationen ohne Apache ist folgender Artikel interessant:
+        <a class="ulink" href="https://www.cyberscan.io/blog/git-luecke" target="_top">git-lücke</a>.
+        Anstelle des dort beschriebenen DirectoryMatch für Apache2 würden wir etwas weitergehend auch noch das Verzeichnis config miteinbeziehen
+        sowie ferner auch die Möglichkeit nicht ausschließen, dass es in Unterverzeichnissen auch noch .git Repositories geben kann.
+        Die Empfehlung für Apache 2.4 wäre damit:
+        </p><pre class="programlisting">
+        &lt;DirectoryMatch "/(\.git|config)/"&gt;
+          Require all denied
+        &lt;/DirectoryMatch&gt;</pre><p>
+       
+            </p></div><div class="sect2" title="2.7.3. Weitergehende Konfiguration"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1373"></a>2.7.3. Weitergehende Konfiguration</h3></div></div></div><p>Für einen deutlichen Sicherheitsmehrwert sorgt die Ausführung
+        von kivitendo nur über https-verschlüsselten Verbindungen, sowie
+        weiteren Zusatzmassnahmen, wie beispielsweise Basic Authentication. Die
+        Konfigurationsmöglichkeiten sprengen allerdings den Rahmen dieser
+        Anleitung, hier ein Hinweis auf einen entsprechenden <a class="ulink" href="https://www.kivitendo.de/redmine/boards/1/topics/142" target="_top">Foreneintrag
+        (Stand Sept. 2015)</a> und einen aktuellen (Stand Mai 2017) <a class="ulink" href="https://mozilla.github.io/server-side-tls/ssl-config-generator/" target="_top">
+        SSL-Konfigurations-Generator</a>.</p></div><div class="sect2" title="2.7.4. Aktivierung von Apache2 modsecurity"><div class="titlepage"><div><div><h3 class="title"><a name="d0e1384"></a>2.7.4. Aktivierung von Apache2 modsecurity</h3></div></div></div><p>Aufgrund des OpenSource Charakters ist kivitendo nicht "out of the box" sicher.
+  Organisatorisch empfehlen wir hier die enge Zusammenarbeit mit einem kivitendo Partner der auch in der
+Lage ist weiterführende Fragen in Bezug auf Datenschutz und Datensicherheit zu beantworten.
+Unabhängig davon empfehlen wir im Webserver Bereich die Aktivierung und Konfiguration des Moduls modsecurity für den Apache2, damit
+XSS und SQL-Injections verhindert werden.</p><p> Als Idee hierfür sei dieser Blog-Eintrag genannt:
+<a class="ulink" href="https://doxsec.wordpress.com/2017/06/11/using-modsecurity-web-application-firewall-to-prevent-sql-injection-and-xss-using-blocking-rules/" target="_top">
+        Test Apache2 modsecurity for SQL Injection</a>.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s06.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s08.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.6. Anpassung der PostgreSQL-Konfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.8. Der Task-Server</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s08.html b/doc/html/ch02s08.html
index d10b46cf2..c99799b90 100644
--- a/doc/html/ch02s08.html
+++ b/doc/html/ch02s08.html
@@ -1,107 +1,89 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.8. Benutzerauthentifizierung und Administratorpasswort</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s07.html" title="2.7. Der Task-Server"><link rel="next" href="ch02s09.html" title="2.9. Mandanten-, Benutzer- und Gruppenverwaltung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.8. Benutzerauthentifizierung und Administratorpasswort</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s09.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.8. Benutzerauthentifizierung und Administratorpasswort"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Benutzerauthentifizierung-und-Administratorpasswort"></a>2.8. Benutzerauthentifizierung und Administratorpasswort</h2></div></div></div><p>Informationen über die Einrichtung der Benutzerauthentifizierung,
-      über die Verwaltung von Gruppen und weitere Einstellungen</p><div class="sect2" title="2.8.1. Grundlagen zur Benutzerauthentifizierung"><div class="titlepage"><div><div><h3 class="title"><a name="Grundlagen-zur-Benutzerauthentifizierung"></a>2.8.1. Grundlagen zur Benutzerauthentifizierung</h3></div></div></div><p>kivitendo verwaltet die Benutzerinformationen in einer
-        Datenbank, die im folgenden “Authentifizierungsdatenbank” genannt
-        wird. Für jeden Benutzer kann dort eine eigene Datenbank für die
-        eigentlichen Finanzdaten hinterlegt sein. Diese beiden Datenbanken
-        können, müssen aber nicht unterschiedlich sein.</p><p>Im einfachsten Fall gibt es für kivitendo nur eine einzige
-        Datenbank, in der sowohl die Benutzerinformationen als auch die Daten
-        abgelegt werden.</p><p>Zusätzlich ermöglicht es kivitendo, dass die Benutzerpasswörter gegen die Authentifizierungsdatenbank oder gegen einen oder
-        mehrere LDAP-Server überprüft werden.</p><p>Welche Art der Passwortüberprüfung kivitendo benutzt und wie
-        kivitendo die Authentifizierungsdatenbank erreichen kann, wird in der
-        Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
-        festgelegt. Diese muss bei der Installation und bei einem Upgrade von
-        einer Version vor v2.6.0 angelegt werden. Eine
-        Beispielkonfigurationsdatei
-        <code class="filename">config/kivitendo.conf.default</code> existiert, die als
-        Vorlage benutzt werden kann.</p></div><div class="sect2" title="2.8.2. Administratorpasswort"><div class="titlepage"><div><div><h3 class="title"><a name="Administratorpasswort"></a>2.8.2. Administratorpasswort</h3></div></div></div><p>Das Passwort, das zum Zugriff auf das Administrationsinterface
-        von kivitendo benutzt wird, wird ebenfalls in dieser Datei
-        gespeichert. Es kann auch nur dort und nicht mehr im
-        Administrationsinterface selber geändert werden. Der Parameter dazu
-        heißt <code class="varname">admin_password</code> im Abschnitt
-        <code class="varname">[authentication]</code>.</p></div><div class="sect2" title="2.8.3. Authentifizierungsdatenbank"><div class="titlepage"><div><div><h3 class="title"><a name="Authentifizierungsdatenbank"></a>2.8.3. Authentifizierungsdatenbank</h3></div></div></div><p>Die Verbindung zur Authentifizierungsdatenbank wird mit den
-        Parametern in <code class="varname">[authentication/database]</code>
-        konfiguriert. Hier sind die folgenden Parameter anzugeben:</p><div class="variablelist"><dl><dt><span class="term">
-                     <code class="literal">host</code>
-                  </span></dt><dd><p>Der Rechnername oder die IP-Adresse des
-              Datenbankservers</p></dd><dt><span class="term">
-                     <code class="literal">port</code>
-                  </span></dt><dd><p>Die Portnummer des Datenbankservers, meist 5432</p></dd><dt><span class="term">
-                     <code class="literal">db</code>
-                  </span></dt><dd><p>Der Name der Authentifizierungsdatenbank</p></dd><dt><span class="term">
-                     <code class="literal">user</code>
-                  </span></dt><dd><p>Der Benutzername, mit dem sich kivitendo beim
-              Datenbankserver anmeldet (z.B.
-              "<code class="literal">postgres</code>")</p></dd><dt><span class="term">
-                     <code class="literal">password</code>
-                  </span></dt><dd><p>Das Passwort für den Datenbankbenutzer</p></dd></dl></div><p>Die Datenbank muss noch nicht existieren. kivitendo kann sie
-        automatisch anlegen (mehr dazu siehe unten).</p></div><div class="sect2" title="2.8.4. Passwortüberprüfung"><div class="titlepage"><div><div><h3 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung"></a>2.8.4. Passwortüberprüfung</h3></div></div></div><p>kivitendo unterstützt Passwortüberprüfung auf zwei Arten: gegen
-        die Authentifizierungsdatenbank und gegen externe LDAP- oder
-        Active-Directory-Server. Welche davon benutzt wird, regelt der
-        Parameter <code class="varname">module</code> im Abschnitt
-        <code class="varname">[authentication]</code>.</p><p>Dieser Parameter listet die zu verwendenden Authentifizierungsmodule auf. Es muss mindestens ein Modul angegeben werden, es
-        können aber auch mehrere angegeben werden. Weiterhin ist es möglich, das LDAP-Modul mehrfach zu verwenden und für jede Verwendung
-        eine unterschiedliche Konfiguration zu nutzen, z.B. um einen Fallback-Server anzugeben, der benutzt wird, sofern der Hauptserver
-        nicht erreichbar ist.</p><p>Sollen die Benutzerpasswörter in der Authentifizierungsdatenbank geprüft werden, so muss der Parameter
-        <code class="varname">module</code> das Modul <code class="literal">DB</code> enthalten. Sofern das Modul in der Liste enthalten ist, egal an welcher
-        Position, können sowohl der Administrator als auch die Benutzer selber ihre Passwörter in kivitendo ändern.</p><p>Wenn Passwörter gegen einen oder mehrere externe LDAP- oder Active-Directory-Server geprüft werden, so muss der Parameter
-        <code class="varname">module</code> den Wert <code class="literal">LDAP</code> enthalten. In diesem Fall müssen zusätzliche Informationen über den
-        LDAP-Server im Abschnitt <code class="literal">[authentication/ldap]</code> angegeben werden. Das Modul kann auch mehrfach angegeben werden,
-        wobei jedes Modul eine eigene Konfiguration bekommen sollte. Der Name der Konfiguration wird dabei mit einem Doppelpunkt getrennt an
-        den Modulnamen angehängt (<code class="literal">LDAP:Name-der-Konfiguration</code>). Der entsprechende Abschnitt in der Konfigurationsdatei
-        lautet dann <code class="literal">[authentication/Name-der-Konfiguration]</code>.</p><p>Die verfügbaren Parameter für die LDAP-Konfiguration lauten:</p><div class="variablelist"><dl><dt><span class="term">
-                     <code class="literal">host</code>
-                  </span></dt><dd><p>Der Rechnername oder die IP-Adresse des LDAP- oder
-              Active-Directory-Servers. Diese Angabe ist zwingend
-              erforderlich.</p></dd><dt><span class="term">
-                     <code class="literal">port</code>
-                  </span></dt><dd><p>Die Portnummer des LDAP-Servers; meist 389.</p></dd><dt><span class="term">
-                     <code class="literal">tls</code>
-                  </span></dt><dd><p>Wenn Verbindungsverschlüsselung gewünscht ist, so diesen
-              Wert auf ‘<code class="literal">1</code>’ setzen, andernfalls auf
-              ‘<code class="literal">0</code>’ belassen</p></dd><dt><span class="term">
-                     <code class="literal">verify</code>
-                  </span></dt><dd><p>Wenn Verbindungsverschlüsselung gewünscht und der Parameter <em class="parameter"><code>tls</code></em> gesetzt ist, so gibt dieser
-              Parameter an, ob das Serverzertifikat auf Gültigkeit geprüft wird. Mögliche Werte sind <code class="literal">require</code> (Zertifikat
-              wird überprüft und muss gültig sei; dies ist der Standard) und <code class="literal">none</code> (Zertifikat wird nicht
-              überpfüft).</p></dd><dt><span class="term">
-                     <code class="literal">attribute</code>
-                  </span></dt><dd><p>Das LDAP-Attribut, in dem der Benutzername steht, den der
-              Benutzer eingegeben hat. Für Active-Directory-Server ist dies
-              meist ‘<code class="literal">sAMAccountName</code>’, für andere
-              LDAP-Server hingegen ‘<code class="literal">uid</code>’. Diese Angabe ist
-              zwingend erforderlich.</p></dd><dt><span class="term">
-                     <code class="literal">base_dn</code>
-                  </span></dt><dd><p>Der Abschnitt des LDAP-Baumes, der durchsucht werden soll.
-              Diese Angabe ist zwingend erforderlich.</p></dd><dt><span class="term">
-                     <code class="literal">filter</code>
-                  </span></dt><dd><p>Ein optionaler LDAP-Filter. Enthält dieser Filter das Wort
-              <code class="literal">&lt;%login%&gt;</code>, so wird dieses durch den vom
-              Benutzer eingegebenen Benutzernamen ersetzt. Andernfalls wird
-              der LDAP-Baum nach einem Element durchsucht, bei dem das oben
-              angegebene Attribut mit dem Benutzernamen identisch ist.</p></dd><dt><span class="term">
-                     <code class="literal">bind_dn</code> und
-            <code class="literal">bind_password</code>
-                  </span></dt><dd><p>Wenn der LDAP-Server eine Anmeldung erfordert, bevor er
-              durchsucht werden kann (z.B. ist dies bei
-              Active-Directory-Servern der Fall), so kann diese hier angegeben
-              werden. Für Active-Directory-Server kann als
-              ‘<code class="literal">bind_dn</code>’ entweder eine komplette LDAP-DN wie
-              z.B. ‘<code class="literal">cn=Martin
-              Mustermann,cn=Users,dc=firmendomain</code>’ auch nur der
-              volle Name des Benutzers eingegeben werden; in diesem Beispiel
-              also ‘<code class="literal">Martin Mustermann</code>’.</p></dd><dt><span class="term">
-                     <code class="literal">timeout</code>
-                  </span></dt><dd><p>Timeout beim Verbindungsversuch, bevor der Server als nicht erreichbar gilt; Standardwert: 10</p></dd></dl></div></div><div class="sect2" title="2.8.5. Name des Session-Cookies"><div class="titlepage"><div><div><h3 class="title"><a name="Name-des-Session-Cookies"></a>2.8.5. Name des Session-Cookies</h3></div></div></div><p>Sollen auf einem Server mehrere kivitendo-Installationen
-        aufgesetzt werden, so müssen die Namen der Session-Cookies für alle
-        Installationen unterschiedlich sein. Der Name des Cookies wird mit dem
-        Parameter <code class="varname">cookie_name</code> im Abschnitt
-        <code class="varname">[authentication]</code>gesetzt.</p><p>Diese Angabe ist optional, wenn nur eine Installation auf dem
-        Server existiert.</p></div><div class="sect2" title="2.8.6. Anlegen der Authentifizierungsdatenbank"><div class="titlepage"><div><div><h3 class="title"><a name="Anlegen-der-Authentifizierungsdatenbank"></a>2.8.6. Anlegen der Authentifizierungsdatenbank</h3></div></div></div><p>Nachdem alle Einstellungen in
-        <code class="filename">config/kivitendo.conf</code> vorgenommen wurden, muss
-        kivitendo die Authentifizierungsdatenbank anlegen. Dieses geschieht
-        automatisch, wenn Sie sich im Administrationsmodul anmelden, das unter
-        der folgenden URL erreichbar sein sollte:</p><p>
-               <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
-            </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s07.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s09.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.7. Der Task-Server&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.9. Mandanten-, Benutzer- und Gruppenverwaltung</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.8. Der Task-Server</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s07.html" title="2.7. Webserver-Konfiguration"><link rel="next" href="ch02s09.html" title="2.9. Konfiguration der Hintergrund-Jobs"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.8. Der Task-Server</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s09.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.8. Der Task-Server"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.task-server"></a>2.8. Der Task-Server</h2></div></div></div><p>Der Task-Server ist ein Prozess, der im Hintergrund läuft, in
+      regelmäßigen Abständen nach abzuarbeitenden Aufgaben sucht und diese zu
+      festgelegten Zeitpunkten abarbeitet (ähnlich wie Cron). Dieser Prozess
+      wird u.a. für die Erzeugung der wiederkehrenden Rechnungen und weitere
+      essenzielle Aufgaben benutzt.</p><p>Der Task-Server muss einmalig global in der Konfigurationsdatei
+      konfiguriert werden. Danach wird er für jeden Mandanten, für den er
+      laufen soll, in der Adminsitrationsmaske eingeschaltet.</p><p>Beachten Sie, dass der Task-Server in den Boot-Vorgang Ihres
+      Servers integriert werden muss, damit er automatisch gestartet wird.
+      Dies kann kivitendo nicht für Sie erledigen.</p><p>Da der Task-Server als Perlscript läuft, wird Arbeitsspeicher, der
+      einmal benötigt wurde, nicht mehr an das Betriebssystem zurückgegeben,
+      solange der Task-Server läuft. Dies kann dazu führen, dass ein länger
+      laufender Task-Server mit der Zeit immer mehr Arbeitsspeicher für sich
+      beansprucht. Es ist deshalb sinnvoll, dass der Task-Server in
+      regelmässigen Abständen neu gestartet wird. Allerdings berücksichtigt der
+      Task-Server ein Memory-Limit, wenn dieses in der Konfigurationsdatei
+      angegeben ist. Bei Überschreiten dieses Limits beendet sich der
+      Task-Server. Sofern der Task-Server als systemd-Service mit dem
+      mitgelieferten Skript eingerichtet wurde, startet dieser danach
+      automatisch erneut.</p><div class="sect2" title="2.8.1. Verfügbare und notwendige Konfigurationsoptionen"><div class="titlepage"><div><div><h3 class="title"><a name="Konfiguration-des-Task-Servers"></a>2.8.1. Verfügbare und notwendige Konfigurationsoptionen</h3></div></div></div><p>Die Konfiguration erfolgt über den Abschnitt
+        <code class="literal">[task_server]</code> in der Datei
+        <code class="filename">config/kivitendo.conf</code>. Die dort verfügbaren
+        Optionen sind:</p><div class="variablelist"><dl><dt><span class="term">
+                     <code class="varname">run_as</code>
+                  </span></dt><dd><p>Wird der Server vom Systembenutzer <code class="literal">root</code>
+              gestartet, so wechselt er auf den mit <code class="literal">run_as</code>
+              angegebenen Systembenutzer. Der Systembenutzer muss dieselben
+              Lese- und Schreibrechte haben, wie auch der Webserverbenutzer
+              (siehe see <a class="xref" href="ch02s04.html" title="2.4. Manuelle Installation des Programmpaketes">Manuelle Installation des Programmpaketes</a>). Daher
+              ist es erforderlich, hier denselben Systembenutzer einzutragen,
+              unter dem auch der Webserver läuft.</p></dd><dt><span class="term">
+                     <code class="varname">debug</code>
+                  </span></dt><dd><p>Schaltet Debug-Informationen an und aus.</p></dd></dl></div></div><div class="sect2" title="2.8.2. Konfiguration der Mandanten für den Task-Server"><div class="titlepage"><div><div><h3 class="title"><a name="Konfiguration-der-Mandanten-fuer-den-Task-Servers"></a>2.8.2. Konfiguration der Mandanten für den Task-Server</h3></div></div></div><p>Ist der Task-Server grundlegend konfiguriert, so muss
+        anschließend jeder Mandant, für den der Task-Server laufen soll,
+        einmalig konfiguriert werden. Dazu kann in der Maske zum Bearbeiten
+        von Mandanten im Administrationsbereich eine kivitendo-Benutzerkennung
+        ausgewählt werden, unter der der Task-Server seine Arbeit
+        verrichtet.</p><p>Ist in dieser Einstellung keine Benutzerkennung ausgewählt, so
+        wird der Task-Server für diesen Mandanten keine Aufgaben
+        ausführen.</p></div><div class="sect2" title="2.8.3. Automatisches Starten des Task-Servers beim Booten"><div class="titlepage"><div><div><h3 class="title"><a name="Einbinden-in-den-Boot-Prozess"></a>2.8.3. Automatisches Starten des Task-Servers beim Booten</h3></div></div></div><p>Der Task-Server verhält sich von seinen Optionen her wie ein
+        reguläres SystemV-kompatibles Boot-Script. Außerdem wechselt er beim
+        Starten automatisch in das kivitendo-Installationsverzeichnis.</p><p>Deshalb ist es möglich, ihn durch Setzen eines symbolischen
+        Links aus einem der Runlevel-Verzeichnisse heraus in den Boot-Prozess
+        einzubinden. Da das bei neueren Linux-Distributionen aber nicht
+        zwangsläufig funktioniert, werden auch Start-Scripte mitgeliefert, die
+        anstelle eines symbolischen Links verwendet werden können.</p><div class="sect3" title="2.8.3.1. SystemV-basierende Systeme (z.B. ältere Debian, ältere openSUSE, ältere Fedora)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1457"></a>2.8.3.1. SystemV-basierende Systeme (z.B. ältere Debian, ältere
+          openSUSE, ältere Fedora)</h4></div></div></div><p>Kopieren Sie die Datei
+          <code class="filename">scripts/boot/system-v/kivitendo-task-server</code>
+          nach <code class="filename">/etc/init.d/kivitendo-task-server</code>. Passen
+          Sie in der kopierten Datei den Pfad zum Task-Server an (Zeile
+          <code class="literal">DAEMON=....</code>). Binden Sie das Script in den
+          Boot-Prozess ein. Dies ist distributionsabhängig:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Debian-basierende Systeme:</p><pre class="programlisting">update-rc.d kivitendo-task-server defaults
+insserv kivitendo-task-server</pre></li><li class="listitem"><p>Ältere openSUSE und ältere Fedora:</p><pre class="programlisting">chkconfig --add kivitendo-task-server</pre></li></ul></div><p>Danach kann der Task-Server mit dem folgenden Befehl gestartet
+          werden:</p><pre class="programlisting">/etc/init.d/kivitendo-task-server start</pre></div><div class="sect3" title="2.8.3.2. Upstart-basierende Systeme (z.B. Ubuntu bis 14.04)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1486"></a>2.8.3.2. Upstart-basierende Systeme (z.B. Ubuntu bis 14.04)</h4></div></div></div><p>Kopieren Sie die Datei
+          <code class="filename">scripts/boot/upstart/kivitendo-task-server.conf</code>
+          nach <code class="filename">/etc/init/kivitendo-task-server.conf</code>.
+          Passen Sie in der kopierten Datei den Pfad zum Task-Server an (Zeile
+          <code class="literal">exec ....</code>).</p><p>Danach kann der Task-Server mit dem folgenden Befehl gestartet
+          werden:</p><pre class="programlisting">service kivitendo-task-server start</pre></div><div class="sect3" title="2.8.3.3. systemd-basierende Systeme (z.B. neure openSUSE, neuere Fedora, neuere Ubuntu und neuere Debians)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e1504"></a>2.8.3.3. systemd-basierende Systeme (z.B. neure openSUSE, neuere
+          Fedora, neuere Ubuntu und neuere Debians)</h4></div></div></div><p>Kopieren Sie die Datei
+          <code class="filename">scripts/boot/systemd/kivitendo-task-server.service</code>
+          nach <code class="filename">/etc/systemd/system/</code>. Passen Sie in der
+          kopierten Datei den Pfad zum Task-Server an (Zeilen
+          <code class="literal">ExecStart=....</code> und
+          <code class="literal">ExecStop=...</code>).</p><p>Machen Sie anschließend das Script systemd bekannt, und binden
+          Sie es in den Boot-Prozess ein. Dazu führen Sie die folgenden Befehl
+          aus:</p><pre class="programlisting">systemctl daemon-reload
+systemctl enable kivitendo-task-server.service</pre><p>Wenn Sie den Task-Server jetzt sofort starten möchten, anstatt
+          den Server neu zu starten, so können Sie das mit dem folgenden
+          Befehl tun:</p><pre class="programlisting">systemctl start kivitendo-task-server.service</pre><p>Ein so eingerichteter Task-Server startet nach Beendigung
+          automatisch erneut. Das betrifft eine Beendigung über die Oberfläche,
+          eine Beendingung über die Prozesskontrolle und eine Beendigung bei
+          Überschreiten des Memory-Limits. Soll der Task-Server nicht erneut
+          starten, so können Sie ihn mit folgendem Befehl stoppen:</p><pre class="programlisting">systemctl stop kivitendo-task-server.service</pre></div></div><div class="sect2" title="2.8.4. Wie der Task-Server gestartet und beendet wird"><div class="titlepage"><div><div><h3 class="title"><a name="Prozesskontrolle"></a>2.8.4. Wie der Task-Server gestartet und beendet wird</h3></div></div></div><p>Der Task-Server wird wie folgt kontrolliert:</p><pre class="programlisting">./scripts/task_server.pl Befehl</pre><p>
+               <code class="literal">Befehl</code> ist dabei eine der folgenden
+        Optionen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">start</code> startet eine neue Instanz des
+            Task-Servers. Die Prozess-ID wird innerhalb des
+            <code class="filename">users</code>-Verzeichnisses abgelegt.</p></li><li class="listitem"><p>
+                     <code class="literal">stop</code> beendet einen laufenden
+            Task-Server.</p></li><li class="listitem"><p>
+                     <code class="literal">restart</code> beendet und startet ihn
+            neu.</p></li><li class="listitem"><p>
+                     <code class="literal">status</code> berichtet, ob der Task-Server
+            läuft.</p></li></ul></div><p>Der Task-Server wechselt beim Starten automatisch in das
+        kivitendo-Installationsverzeichnis.</p><p>Dieselben Optionen können auch für die SystemV-basierenden
+        Runlevel-Scripte benutzt werden (siehe oben).</p><p>Wurde der Task-Server als systemd-Service eingerichtet (s.o.),
+        so startet dieser nach Beendigung automatisch erneut.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s07.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s09.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.7. Webserver-Konfiguration&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.9. Konfiguration der Hintergrund-Jobs</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s09.html b/doc/html/ch02s09.html
index 8a718e63d..2a385fae9 100644
--- a/doc/html/ch02s09.html
+++ b/doc/html/ch02s09.html
@@ -1,83 +1,89 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.9. Mandanten-, Benutzer- und Gruppenverwaltung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s08.html" title="2.8. Benutzerauthentifizierung und Administratorpasswort"><link rel="next" href="ch02s10.html" title="2.10. Drucker- und Systemverwaltung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.9. Mandanten-, Benutzer- und Gruppenverwaltung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s08.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s10.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.9. Mandanten-, Benutzer- und Gruppenverwaltung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Benutzer--und-Gruppenverwaltung"></a>2.9. Mandanten-, Benutzer- und Gruppenverwaltung</h2></div></div></div><p>Nach der Installation müssen Mandanten, Benutzer, Gruppen und
-      Datenbanken angelegt werden. Dieses geschieht im Administrationsmenü,
-      das Sie unter folgender URL finden:</p><p>
-            <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
-         </p><p>Verwenden Sie zur Anmeldung das Passwort, das Sie in der Datei
-      <code class="filename">config/kivitendo.conf</code> eingetragen haben.</p><div class="sect2" title="2.9.1. Zusammenhänge"><div class="titlepage"><div><div><h3 class="title"><a name="Zusammenh%C3%A4nge"></a>2.9.1. Zusammenhänge</h3></div></div></div><p>kivitendo verwaltet zwei Sets von Daten, die je nach Einrichtung
-        in einer oder zwei Datenbanken gespeichert werden.</p><p>Das erste Set besteht aus Anmeldeinformationen: welche Benutzer
-        und Mandanten gibt es, welche Gruppen, welche BenutzerIn hat Zugriff
-        auf welche Mandanten, und welche Gruppe verfügt über welche Rechte.
-        Diese Informationen werden in der Authentifizierungsdatenbank
-        gespeichert. Dies ist diejenige Datenbank, deren Verbindungsparameter
-        in der Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
-        gespeichert werden.</p><p>Das zweite Set besteht aus den eigentlichen Verkehrsdaten eines
-        Mandanten, wie beispielsweise die Stammdaten (Kunden, Lieferanten,
-        Waren) und Belege (Angebote, Lieferscheine, Rechnungen). Diese werden
-        in einer Mandantendatenbank gespeichert. Die Verbindungsinformationen
-        einer solchen Mandantendatenbank werden im Administrationsbereich
-        konfiguriert, indem man einen Mandanten anlegt und dort die Parameter
-        einträgt. Dabei hat jeder Mandant eine eigene Datenbank.</p><p>Aufgrund des Datenbankdesigns ist es für einfache Fälle möglich,
-        die Authentifizierungsdatenbank und eine der Mandantendatenbanken in
-        ein und derselben Datenbank zu speichern. Arbeitet man hingegen mit
-        mehr als einem Mandanten, wird empfohlen, für die
-        Authentifizierungsdatenbank eine eigene Datenbank zu verwenden, die
-        nicht gleichzeitig für einen Mandanten verwendet wird.</p></div><div class="sect2" title="2.9.2. Mandanten, Benutzer und Gruppen"><div class="titlepage"><div><div><h3 class="title"><a name="Mandanten-Benutzer-Gruppen"></a>2.9.2. Mandanten, Benutzer und Gruppen</h3></div></div></div><p>kivitendos Administration kennt Mandanten, Benutzer und Gruppen,
-        die sich frei zueinander zuordnen lassen.</p><p>kivitendo kann mehrere Mandaten aus einer Installation heraus
-        verwalten. Welcher Mandant benutzt wird, kann direkt beim Login
-        ausgewählt werden. Für jeden Mandanten wird ein eindeutiger Name
-        vergeben, der beim Login angezeigt wird. Weiterhin benötigt der
-        Mandant Datenbankverbindungsparameter für seine Mandantendatenbank.
-        Diese sollte über die <a class="link" href="ch02s09.html#Datenbanken-anlegen" title="2.9.3. Datenbanken anlegen">Datenbankverwaltung</a>
-        geschehen.</p><p>Ein Benutzer ist eine Person, die Zugriff auf kivitendo erhalten
-        soll. Sie erhält einen Loginnamen sowie ein Passwort. Weiterhin legt
-        der Administrator fest, an welchen Mandanten sich ein Benutzer
-        anmelden kann, was beim Login verifiziert wird.</p><p>Gruppen dienen dazu, Benutzern innerhalb eines Mandanten Zugriff
-        auf bestimmte Funktionen zu geben. Einer Gruppe werden dafür vom
-        Administrator gewisse Rechte zugeordnet. Weiterhin legt der
-        Administrator fest, für welche Mandanten eine Gruppe gilt, und welche
-        Benutzer Mitglieder in dieser Gruppe sind. Meldet sich ein Benutzer
-        dann an einem Mandanten an, so erhält er alle Rechte von allen
-        denjenigen Gruppen, die zum Einen dem Mandanten zugeordnet sind und in
-        denen der Benutzer zum Anderen Mitglied ist,</p><p>Die Reihenfolge, in der Datenbanken, Mandanten, Gruppen und
-        Benutzer angelegt werden, kann im Prinzip beliebig gewählt werden. Die
-        folgende Reihenfolge beinhaltet die wenigsten Arbeitsschritte:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Datenbank anlegen</p></li><li class="listitem"><p>Gruppen anlegen</p></li><li class="listitem"><p>Benutzer anlegen und Gruppen als Mitglied zuordnen</p></li><li class="listitem"><p>Mandanten anlegen und Gruppen sowie Benutzer zuweisen</p></li></ol></div></div><div class="sect2" title="2.9.3. Datenbanken anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Datenbanken-anlegen"></a>2.9.3. Datenbanken anlegen</h3></div></div></div><p>Zuerst muss eine Datenbank angelegt werden. Verwenden Sie für
-        den Datenbankzugriff den vorhin angelegten Benutzer (in unseren
-        Beispielen ist dies ‘<code class="literal">kivitendo</code>’).</p></div><div class="sect2" title="2.9.4. Gruppen anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Gruppen-anlegen"></a>2.9.4. Gruppen anlegen</h3></div></div></div><p>Eine Gruppe wird in der Gruppenverwaltung angelegt. Ihr muss ein
-        Name gegeben werden, eine Beschreibung ist hingegen optional. Nach dem
-        Anlegen können Sie die verschiedenen Bereiche wählen, auf die
-        Mitglieder dieser Gruppe Zugriff haben sollen.</p><p>Benutzergruppen werden zwar in der Authentifizierungsdatenbank
-        gespeichert, gelten aber nicht automatisch für alle Mandanten. Der
-        Administrator legt vielmehr fest, für welche Mandanten eine Gruppe
-        gültig ist. Dies kann entweder beim Bearbeiten der Gruppe geschehen
-        ("diese Gruppe ist gültig für Mandanten X, Y und Z"), oder aber wenn
-        man einen Mandanten bearbeitet ("für diesen Mandanten sind die Gruppen
-        A, B und C gültig").</p><p>Wurden bereits Benutzer angelegt, so können hier die Mitglieder
-        dieser Gruppe festgelegt werden ("in dieser Gruppe sind die Benutzer
-        X, Y und Z Mitglieder"). Dies kann auch nachträglich beim Bearbeiten
-        eines Benutzers geschehen ("dieser Benutzer ist Mitglied in den
-        Gruppen A, B und C").</p></div><div class="sect2" title="2.9.5. Benutzer anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Benutzer-anlegen"></a>2.9.5. Benutzer anlegen</h3></div></div></div><p>Beim Anlegen von Benutzern werden für viele Parameter
-        Standardeinstellungen vorgenommen, die den Gepflogenheiten des
-        deutschen Raumes entsprechen.</p><p>Zwingend anzugeben ist der Loginname. Wenn die
-        Passwortauthentifizierung über die Datenbank eingestellt ist, so kann
-        hier auch das Benutzerpasswort gesetzt bzw. geändert werden. Ist
-        hingegen die LDAP-Authentifizierung aktiv, so ist das Passwort-Feld
-        deaktiviert.</p><p>Hat man bereits Mandanten und Gruppen angelegt, so kann hier
-        auch konfiguriert werden, auf welche Mandanten der Benutzer Zugriff
-        hat bzw. in welchen Gruppen er Mitglied ist. Beide Zuweisungen können
-        sowohl beim Benutzer vorgenommen werden ("dieser Benutzer hat Zugriff
-        auf Mandanten X, Y, Z" bzw. "dieser Benutzer ist Mitglied in Gruppen
-        X, Y und Z") als auch beim Mandanten ("auf diesen Mandanten haben
-        Benutzer A, B und C Zugriff") bzw. bei der Gruppe ("in dieser Gruppe
-        sind Benutzer A, B und C Mitglieder").</p></div><div class="sect2" title="2.9.6. Mandanten anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Mandanten-anlegen"></a>2.9.6. Mandanten anlegen</h3></div></div></div><p>Ein Mandant besteht aus Administrationssicht primär aus einem
-        eindeutigen Namen. Weiterhin wird hier hinterlegt, welche Datenbank
-        als Mandantendatenbank benutzt wird. Hier müssen die Zugriffsdaten
-        einer der eben angelegten Datenbanken eingetragen werden.</p><p>Hat man bereits Benutzer und Gruppen angelegt, so kann hier auch
-        konfiguriert werden, welche Benutzer Zugriff auf den Mandanten haben
-        bzw. welche Gruppen für den Mandanten gültig sind. Beide Zuweisungen
-        können sowohl beim Mandanten vorgenommen werden ("auf diesen Mandanten
-        haben Benutzer X, Y und Z Zugriff" bzw. "für diesen Mandanten sind die
-        Gruppen X, Y und Z gültig") als auch beim Benutzer ("dieser Benutzer
-        hat Zugriff auf Mandanten A, B und C") bzw. bei der Gruppe ("diese
-        Gruppe ist für Mandanten A, B und C gültig").</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s08.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s10.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.8. Benutzerauthentifizierung und Administratorpasswort&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.10. Drucker- und Systemverwaltung</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.9. Konfiguration der Hintergrund-Jobs</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s08.html" title="2.8. Der Task-Server"><link rel="next" href="ch02s10.html" title="2.10. Benutzerauthentifizierung und Administratorpasswort"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.9. Konfiguration der Hintergrund-Jobs</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s08.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s10.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.9. Konfiguration der Hintergrund-Jobs"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Hintergrund-Jobs konfigurieren"></a>2.9. Konfiguration der Hintergrund-Jobs</h2></div></div></div><p>Hintergrund-Jobs werden über System -&gt; Hintergrund-Jobs und Task-Server -&gt; Aktuelle Hintergrund-Jobs anzeigen -&gt; Aktions-Knopf 'erfassen' angelegt. </p><p>Nachdem wir über das Menü dort angelangt sind, legen wir hier unseren Hintergrund-Jobs an:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                  <code class="literal">Aktiv:</code> Hier ein 'Ja' auswählen</p></li><li class="listitem"><p>
+                  <code class="literal">Ausführungsart:</code> 'wiederholte Ausführung' auswählen</p></li><li class="listitem"><p>
+                  <code class="literal">Paketname:</code> Hintergrundjob auswählen</p></li><li class="listitem"><p>
+                  <code class="literal">Ausführungszeitplan:</code> Hier entsprechend Werte wie in der crontab eingeben.</p><p>Syntax:</p><pre class="programlisting">* * * * *
+┬ ┬ ┬ ┬ ┬
+│ │ │ │ │
+│ │ │ │ └──── Wochentag (0-7, Sonntag ist 0 oder 7)
+│ │ │ └────── Monat (1-12)
+│ │ └──────── Tag (1-31)
+│ └────────── Stunde (0-23)
+└──────────── Minute (0-59)  </pre><p>Die Sterne können folgende Werte haben:</p><pre class="programlisting">
+1 2 3 4 5
+
+1 = Minute (0-59)
+2 = Stunde (0-23)
+3 = Tag (0-31)
+4 = Monat (1-12)
+5 = Wochentag (0-7, Sonntag ist 0 oder 7)
+</pre><p>Um die Ausführung auf eine Minute vor den Jahreswechsel zu setzen, müssen die folgenden Werte eingetragen werden:</p><pre class="programlisting">59 23 31 12 *</pre></li><li class="listitem"><p>
+                  <code class="literal">Daten:</code>In diesem Feld können optionale Parameter für den Hintergrund im YAML-Format gesetzt werden.</p></li></ul></div><div class="sect2" title="2.9.1. SetNumberRange"><div class="titlepage"><div><div><h3 class="title"><a name="Hintergrund-Job SetNumberRange"></a>2.9.1. SetNumberRange</h3></div></div></div><p>Der Hintergrund-Job <code class="literal">SetNumberRange</code> kann entweder jährlich oder monatlich/täglich den Nummernkreis verändern. Der Standardmodus 'jährlich' kodiert die nächste Jahreszahl in alle Nummernkreise und initialisiert diese von Beginn, bpsw. 202500001. Zusätzlich bleiben Präfixe in den Nummernkreis erhalten und es gibt drei konfigurierbare Parameter in diesem Modus:</p><p>Der jährliche Modus (default) akzeptiert im Feld <code class="literal">Daten</code> drei optionale Parameter, nämlich <code class="literal">digit_year</code>, <code class="literal">multiplier</code> so wie <code class="literal">current_year</code>.</p><p> 
+               <code class="literal">digit_year</code> kann zwei Werte haben entweder 2 oder 4, darüber wird gesteuert ob die Jahreszahl zwei oder vierstellig kodiert wird (für 2019, dann entweder 19 oder 2019). Der Standardwert ist vierstellig.</p><p> 
+               <code class="literal">multiplier</code> ist ein Vielfaches von 10, darüber wird die erste Nummer im Nummernkreis (die Anzahl der Stellen) wie folgt bestimmt:</p><pre class="programlisting">
+multiplier     Nummernkreis 2020
+10        -&gt;   20200
+100       -&gt;   202000
+1000      -&gt;   2020000
+</pre><p>Falls der Parameter <code class="literal">current_year</code> bspw. so gesetzt ist:
+</p><pre class="programlisting">current_year: 1</pre><p>
+ wird der Nummernkreis nicht um eins hochgezählt. Das ist sinnvoll wenn vom 31.12. auf den 01.01. sowieso keine Rechnungsläufe stattfinden und man die Nummernkreise dann am 01.01. des neuen Jahres automatisch hochsetzen möchte. </p><p>Wir gehen jetzt beispielhaft von einer letzten Rechnungsnummer von RE2019456 aus. Demnach sollte ab Januar 2020 die erste Nummer RE2020001 sein. Da der Task auch Präfixe berücksichtigt, kann dies mit folgenden JSON-kodierten Werten umgesetzt werden:</p><p>
+               <code class="literal">Daten:</code>
+            </p><pre class="programlisting">multiplier: 100
+digits_year: 4</pre><p>Dieser Job müsste dann zwingend vor Mitternacht des 31.12. ausgeführt werden.</p><p>
+               <code class="literal">Daten:</code>
+            </p><pre class="programlisting">multiplier: 100
+digits_year: 4
+current_year: 1</pre><p>Mit dieser Einstellung kann der Job auf 00:01h des 01.01. gesetzt werden.</p><p>Der (wahrscheinliche) monatliche Modus wird über den Parameter <code class="literal">monthly</code> gesteuert und erzeugt standardmäßig folgende Nummernkreise JJ-MM-000, bspw. am 01.04.2025 25-04-000. Dieser Modus akzeptiert die zwei optionalen Parameter <code class="literal">monthly_postfix</code> für die Überlagerung am Ende der Zeichenkette und <code class="literal">monthly_strftime</code> für die beliebige Formatierung der strftime C-Methode, s.a. <a class="ulink" href="https://metacpan.org/pod/DateTime#strftime-Patterns" target="_top">strftime-Patterns</a>.
+Folgende Parameter erzeugen am 01.04.2025 folgenden Nummernkreis: 2025-04-01-A0001.
+</p><p>
+                  <code class="literal">Daten:</code>
+               </p><p>
+
+               </p><pre class="programlisting">
+monthly: 1
+monthly_postfix: '-A0001'
+monthly_strftime: '%Y-%m-%d'
+</pre><p>
+
+            </p></div><div class="sect2" title="2.9.2. ImportRecordEmails"><div class="titlepage"><div><div><h3 class="title"><a name="Hintergrund-Job ImportRecordEmails"></a>2.9.2. ImportRecordEmails</h3></div></div></div><p> Der Hintergrund-Job <code class="literal">ImportRecordEmails</code> kann vollständig über das Feld Daten konfiguriert werden. Er benötigt folgende Variablen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">hostname:</code> Hier wird der E-Mail-Server (IMAP) eingetragen</p></li><li class="listitem"><p>
+                     <code class="literal">username:</code> Benutzername, für den IMAP-Server (häufig die E-Mail-Adresse)</p></li><li class="listitem"><p>
+                     <code class="literal">password:</code> Passwort des Benutzers</p></li><li class="listitem"><p>
+                     <code class="literal">folder:</code> Hier wird der Ordner eingetragen, aus dem die E-Mails importert werden sollen, bspw. 'INBOX'</p></li><li class="listitem"><p>
+                     <code class="literal">port:</code> Port am E-Mail-Server. Default ist 993</p></li><li class="listitem"><p>
+                     <code class="literal">ssl:</code> Gibt an ob SSL verwendet werden soll. Default: 1</p></li></ul></div><p> Optional können außerdem folgende Variablen verwendet werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">email_import_ids_to_delete:</code> Hier können IDs von Importen eingetragen werden, deren E-Mails aus dem E-Mail-Journal gelöscht werden sollen.</p></li><li class="listitem"><p>
+                     <code class="literal">process_imported_emails:</code> Wenn nach dem Import noch weitere Verarbeitung der angehangenen Dokumente erfolgen soll, müssen hier die jeweiligen Schritte eingetragen werden. Aktuell ist es möglich, dass angehangene ZUGFeRD-Rechnung direkt verbucht und mit der E-Mail verknüpft werden. Dazu muss hier 'zugferd' eingetragen werden.</p></li><li class="listitem"><p>
+                     <code class="literal">processed_imap_flag:</code> Das hier eingetragenen Flag wird nach dem Verarbeiten in der E-Mail auf den IMAP-Server gesetzt.</p></li><li class="listitem"><p>
+                     <code class="literal">not_processed_imap_flag:</code> Dieses Flag wird gesetzt, wenn die E-Mail nicht verarbeitet werden konnte.</p></li><li class="listitem"><p>
+                     <code class="literal">record_type:</code> Einträge im E-Mail-Journal können direkt einem Belegtypen zugeordnet werden. Wenn alle E-Mails, die mit einem Hintergrundjob importiert werden, den gleichen Belegtypen haben, kann man diesen hier festlegen und alle Einträge im E-Mail-Journal werden entsprechend zugeordnet. Für Eingangsrechnungen kann man hier bspw. 'ap_transaction' setzen.</p></li></ul></div><p>Wie die IMAP Flags von den jeweiligen Clients angezeigt und eingerichtet werden, ist aktuell im Thunderbird (Version 115.8.0 und Version 115.8.1) und SoGo (Version 5.9.1) getestet:</p><p>In Thunderbird heißen die Flags Schlagwörter. In unseren beiden Testfälle, war das Verfahren unterschiedlich:</p><p>Thunderbird 115.8.0:  Sie werden durchnummeriert mit dem Prefix "$label". Über die Einstellungen kann man Schlagwort und Farbe für den jeweiligen Tag setzen und berabeiten. Um die vordefenierten Tags in Thunderbird zu nutzen kann man $label1 - $label5 nutzen. Eigene Labels werden dann von thunderbird automatisch hochgezählt. Um das korrekte Tag für ein Label zu finden oder auch selbst ein Tag mit einer selbst gewählten Zahl zu definieren kann man in den Einstellunge ganz am Ende über den Button <code class="literal">Konfiguration berabeiten...</code> die Werte in der Kofiguration einsehen, ändern und berabeiten. Hier muss man nach <code class="literal">mailnews.tags</code> suchen.</p><p>Thunderbird 115.8.1: Einstellungen -&gt; Schlagwörter -&gt; hinzufügen. Das Schlagwort wird mit dem 'Label' 'name_mit_unterstrichen' zu Verfügung gestellt. Was wirklich passiert kann man dann ganz unten in den Einstellungen unter 'Konfiguration bearbeiten' und einer darauf folgenden Filtersuche nach 'mailnews.tag' erkennen.</p><p>In SoGo kann man unter Einstellungen -&gt; Mail -&gt; Labels beliebige Label mit $ als Prefix anlegen und Namen und Farbe zuweisen.</p><p>Eine beispielhafte Konfiguration im YAML-Format für das Feld 'Daten' im Hintergrund-Job könnte bspw. so aussehen:
+            </p><pre class="programlisting">
+record_type: ap_transaction
+folder: INBOX/Eingangsrechnung
+processed_imap_flag: zugferd_verarbeitet
+not_processed_imap_flag: zugferd_geht_net
+process_imported_emails: zugferd
+hostname:  www.meine-domaene.de
+username: alpha39@meine-domaene.de
+password: supipass8
+            </pre><p>
+        
+            </p></div><div class="sect2" title="2.9.3. InventoryClearAll"><div class="titlepage"><div><div><h3 class="title"><a name="Hintergrund-Job InventoryClearAll"></a>2.9.3. InventoryClearAll</h3></div></div></div><p>Besteht die Anforderung, vor einer Inventur sämtliche Lagerplätze mittels Korrekturbuchungen auf Bestand 0 zu bringen, so kann dies mit dem Hintergrund-Job <code class="literal">InventoryClearAll</code> erledigt werden.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top">Damit diese Korrekturbuchungen nur einmalig auf Nutzerwunsch ausgeführt werden und nicht ausversehen periodisch das Lager leer räumen, muss die Variable <code class="literal">correction_date</code> auf das aktuelle Datum gesetzt sein. Die Korrekturbuchungen können nicht ohne Weiteres rückgängig gemacht werden.
+          Nachdem der Job im Menü System -&gt; Hintergrund-Jobs und Task-Server -&gt; Aktuelle Hintergrund-Jobs anzeigen erfasst wurde, kann er einmalig ausgeführt werden, indem beim Bearbeiten der Button <code class="literal">Speichern und Ausführen</code> gewählt wird.</td></tr></table></div><p>Im Feld Daten werden folgende Variablen akzeptiert:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">correction_date:</code> Das aktuelle Datum in der Form <code class="literal">YYYY-MM-DD</code>, sonst läuft der Job nicht</p></li><li class="listitem"><p>
+                     <code class="literal">comment:</code> (optional) Wird in den Korrekturbuchungen als Kommentar gesetzt. Falls kein Wert gegeben ist, wird der Kommentar <code class="literal">vor Inventur</code> gesetzt</p></li><li class="listitem"><p>
+                     <code class="literal">dry_run:</code> (optional) Falls <code class="literal">dry_run: 1</code> gesetzt ist, werden keine Korrekturbuchungen ausgeführt, die notwenigen Korrekturbuchungen werden lediglich im Ergebnis des Jobs angezeigt</p></li><li class="listitem"><p>
+                     <code class="literal">warehouse:</code> (optional) Schränkt die Korrekturbuchungen auf ein bestimmtes Lager ein; andernfalls werden Korrekturbuchungen für alle Lager ausgeführt</p></li></ul></div><p>Ein Konfigurationsbeispiel ist:</p><pre class="programlisting">
+correction_date: 2025-03-11
+comment: vor Inventur
+dry_run: 1
+# warehouse: Stahllager Industriepark Gallin
+          </pre></div><div class="sect2" title="2.9.4. CloseQuotations"><div class="titlepage"><div><div><h3 class="title"><a name="Hintergrund-Job CloseQuotations"></a>2.9.4. CloseQuotations</h3></div></div></div><p>Gibt es viele alte offene Preisanfragen im Einkauf und Angebote im Verkauf, so können diese komfortabel mit dem Hintergrund-Job <code class="literal">CloseQuotations</code> geschlossen werden.</p><p>Im Feld Daten werden folgende Variablen akzeptiert:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">dry_run:</code> (optional) Falls <code class="literal">dry_run: 1</code> gesetzt ist, werden keine Belege geschlossen, die Nummern der betroffenen Belege werden lediglich im Ergebnis des Jobs angezeigt</p></li><li class="listitem"><p>
+                     <code class="literal">years:</code> (optional) Anzahl der Jahre, die offene Preisanfragen und Angebote alt sein müssen, damit sie geschlossen werden. Standardwert: <code class="literal">years: 1</code> (ein Jahr)</p></li></ul></div><p>Ein Konfigurationsbeispiel ist:</p><pre class="programlisting">
+dry_run: 1
+years: 1
+          </pre></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s08.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s10.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.8. Der Task-Server&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.10. Benutzerauthentifizierung und Administratorpasswort</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s10.html b/doc/html/ch02s10.html
index 1127acdd8..534b60db2 100644
--- a/doc/html/ch02s10.html
+++ b/doc/html/ch02s10.html
@@ -1,23 +1,152 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.10. Drucker- und Systemverwaltung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s09.html" title="2.9. Mandanten-, Benutzer- und Gruppenverwaltung"><link rel="next" href="ch02s11.html" title="2.11. E-Mail-Versand aus kivitendo heraus"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.10. Drucker- und Systemverwaltung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s09.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s11.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.10. Drucker- und Systemverwaltung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Drucker--Systemverwaltung"></a>2.10. Drucker- und Systemverwaltung</h2></div></div></div><p>Im Administrationsmenü gibt es ferner noch die beiden Menüpunkte
-      Druckeradministration und System.</p><div class="sect2" title="2.10.1. Druckeradministration"><div class="titlepage"><div><div><h3 class="title"><a name="Druckeradministration"></a>2.10.1. Druckeradministration</h3></div></div></div><p>Unter dem Menüpunkt Druckeradministration lassen sich beliebig
-        viele "Druckbefehle" im System verwalten. Diese Befehle werden
-        mandantenweise zugeordnet. Unter Druckerbeschreibung wird der Namen
-        des Druckbefehls festgelegt, der dann in der Druckerauswahl des Belegs
-        angezeigt wird.</p><p>Unter Druckbefehl definiert man den eigentlichen Druckbefehl,
-        der direkt auf dem Webserver ausgeführt wird, bspw. 'lpr -P
-        meinDrucker' oder ein kompletter Pfad zu einem Skript
-        (/usr/local/src/kivitendo/scripts/pdf_druck_in_verzeichnis.sh). Wird
-        ferner noch ein optionales Vorlagenkürzel verwendet, wird dieses
-        Kürzel bei der Auswahl der Druckvorlagendatei mit einem Unterstrich
-        ergänzt, ist bspw. das Kürzel 'epson_drucker' definiert, so wird beim
-        Ausdruck eines Angebots folgende Vorlage geparst:
-        sales_quotation_epson_drucker.tex.</p></div><div class="sect2" title="2.10.2. System sperren / entsperren"><div class="titlepage"><div><div><h3 class="title"><a name="System"></a>2.10.2. System sperren / entsperren</h3></div></div></div><p>Unter dem Menüpunkt System gibt es den Eintrag 'Installation
-        sperren/entsperren'. Setzt man diese Sperre so ist der Zugang zu der
-        gesamten kivitendo Installation gesperrt.</p><p>Falls die Sperre gesetzt ist, erscheint anstelle der
-        Anmeldemaske die Information: 'kivitendo ist momentan zwecks
-        Wartungsarbeiten nicht zugänglich.'.</p><p>Wichtig zu erwähnen ist hierbei noch, dass sich kivitendo
-        automatisch 'sperrt', falls es bei einem Versionsupdate zu einem
-        Datenbankfehler kam. Somit kann hier nicht aus Versehen mit einem
-        inkonsistenten Datenbestand weitergearbeitet werden.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s09.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s11.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.9. Mandanten-, Benutzer- und Gruppenverwaltung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.11. E-Mail-Versand aus kivitendo heraus</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.10. Benutzerauthentifizierung und Administratorpasswort</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s09.html" title="2.9. Konfiguration der Hintergrund-Jobs"><link rel="next" href="ch02s11.html" title="2.11. Mandanten-, Benutzer- und Gruppenverwaltung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.10. Benutzerauthentifizierung und Administratorpasswort</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s09.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s11.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.10. Benutzerauthentifizierung und Administratorpasswort"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Benutzerauthentifizierung-und-Administratorpasswort"></a>2.10. Benutzerauthentifizierung und Administratorpasswort</h2></div></div></div><p>Informationen über die Einrichtung der Benutzerauthentifizierung,
+      über die Verwaltung von Gruppen und weitere Einstellungen</p><div class="sect2" title="2.10.1. Grundlagen zur Benutzerauthentifizierung"><div class="titlepage"><div><div><h3 class="title"><a name="Grundlagen-zur-Benutzerauthentifizierung"></a>2.10.1. Grundlagen zur Benutzerauthentifizierung</h3></div></div></div><p>kivitendo verwaltet die Benutzerinformationen in einer
+        Datenbank, die im folgenden “Authentifizierungsdatenbank” genannt
+        wird. Für jeden Benutzer kann dort eine eigene Datenbank für die
+        eigentlichen Finanzdaten hinterlegt sein. Diese beiden Datenbanken
+        können, müssen aber nicht unterschiedlich sein.</p><p>Im einfachsten Fall gibt es für kivitendo nur eine einzige
+        Datenbank, in der sowohl die Benutzerinformationen als auch die Daten
+        abgelegt werden.</p><p>Zusätzlich ermöglicht es kivitendo, dass die Benutzerpasswörter gegen verschiedene Authentifizierungsmethoden geprüft
+        werden. Dazu zählen die Authentifizierungsdatenbank, LDAP-Server sowie verschiedene Arten von HTTP-Header-basierten Methoden.</p><p>Welche Art der Passwortüberprüfung kivitendo benutzt und wie
+        kivitendo die Authentifizierungsdatenbank erreichen kann, wird in der
+        Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
+        festgelegt. Diese muss bei der Installation und bei einem Upgrade von
+        einer Version vor v2.6.0 angelegt werden. Eine
+        Beispielkonfigurationsdatei
+        <code class="filename">config/kivitendo.conf.default</code> existiert, die als
+        Vorlage benutzt werden kann.</p></div><div class="sect2" title="2.10.2. Administratorpasswort"><div class="titlepage"><div><div><h3 class="title"><a name="Administratorpasswort"></a>2.10.2. Administratorpasswort</h3></div></div></div><p>Das Passwort, das zum Zugriff auf das Administrationsinterface
+        von kivitendo benutzt wird, wird ebenfalls in dieser Datei
+        gespeichert. Es kann auch nur dort und nicht mehr im
+        Administrationsinterface selber geändert werden. Der Parameter dazu
+        heißt <code class="varname">admin_password</code> im Abschnitt
+        <code class="varname">[authentication]</code>.</p></div><div class="sect2" title="2.10.3. Authentifizierungsdatenbank"><div class="titlepage"><div><div><h3 class="title"><a name="Authentifizierungsdatenbank"></a>2.10.3. Authentifizierungsdatenbank</h3></div></div></div><p>Die Verbindung zur Authentifizierungsdatenbank wird mit den
+        Parametern in <code class="varname">[authentication/database]</code>
+        konfiguriert. Hier sind die folgenden Parameter anzugeben:</p><div class="variablelist"><dl><dt><span class="term">
+                     <code class="literal">host</code>
+                  </span></dt><dd><p>Der Rechnername oder die IP-Adresse des
+              Datenbankservers</p></dd><dt><span class="term">
+                     <code class="literal">port</code>
+                  </span></dt><dd><p>Die Portnummer des Datenbankservers, meist 5432</p></dd><dt><span class="term">
+                     <code class="literal">db</code>
+                  </span></dt><dd><p>Der Name der Authentifizierungsdatenbank</p></dd><dt><span class="term">
+                     <code class="literal">user</code>
+                  </span></dt><dd><p>Der Benutzername, mit dem sich kivitendo beim
+              Datenbankserver anmeldet (z.B.
+              "<code class="literal">postgres</code>")</p></dd><dt><span class="term">
+                     <code class="literal">password</code>
+                  </span></dt><dd><p>Das Passwort für den Datenbankbenutzer</p></dd></dl></div><p>Die Datenbank muss noch nicht existieren. kivitendo kann sie
+        automatisch anlegen (mehr dazu siehe unten).</p></div><div class="sect2" title="2.10.4. Passwortüberprüfung"><div class="titlepage"><div><div><h3 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung"></a>2.10.4. Passwortüberprüfung</h3></div></div></div><p>kivitendo unterstützt verschiedene Module für die Passwortüberprüfung. Welche benutzt wird, regelt der Parameter
+        <code class="varname">module</code> im Abschnitt <code class="varname">[authentication]</code>.</p><p>Dieser Parameter listet die zu verwendenden Authentifizierungsmodule auf. Es muss mindestens ein Modul angegeben werden, es
+        können aber auch mehrere angegeben werden. Weiterhin ist es möglich, das LDAP-Modul mehrfach zu verwenden und für jede Verwendung
+        eine unterschiedliche Konfiguration zu nutzen, z.B. um einen Fallback-Server anzugeben, der benutzt wird, sofern der Hauptserver
+        nicht erreichbar ist.</p><p>Verfügbare Module sind:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="literal">DB</code>: in Authentifizierungsdatenbank integrierte Benutzerverwaltung</p></li><li class="listitem"><p>
+                     <code class="literal">ldap</code>: Bind mit User-Objekten gegen einen oder mehrere LDAP-Server</p></li><li class="listitem"><p>
+                     <code class="literal">http_headers</code>: überlässt Authenfizierung vorgelagerten Proxy-Servern  übernimmt Usernamen
+          aus mitgeschickten HTTP-Headern</p></li></ul></div><div class="sect3" title="2.10.4.1. Authentifizierungsdatenbank"><div class="titlepage"><div><div><h4 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung_DB"></a>2.10.4.1. Authentifizierungsdatenbank</h4></div></div></div><p>Sollen die Benutzerpasswörter in der Authentifizierungsdatenbank geprüft werden, so muss der Parameter
+          <code class="varname">module</code> das Modul <code class="literal">DB</code> enthalten. Sofern das Modul in der Liste enthalten ist, egal an welcher
+          Position, können sowohl der Administrator als auch die Benutzer selber ihre Passwörter in kivitendo ändern.</p></div><div class="sect3" title="2.10.4.2. LDAP-Server"><div class="titlepage"><div><div><h4 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung_LDAP"></a>2.10.4.2. LDAP-Server</h4></div></div></div><p>Wenn Passwörter gegen einen oder mehrere externe LDAP- oder Active-Directory-Server geprüft werden, so muss der Parameter
+          <code class="varname">module</code> den Wert <code class="literal">LDAP</code> enthalten. In diesem Fall müssen zusätzliche Informationen über den
+          LDAP-Server im Abschnitt <code class="literal">[authentication/ldap]</code> angegeben werden. Das Modul kann auch mehrfach angegeben werden,
+          wobei jedes Modul eine eigene Konfiguration bekommen sollte. Der Name der Konfiguration wird dabei mit einem Doppelpunkt getrennt an
+          den Modulnamen angehängt (<code class="literal">LDAP:Name-der-Konfiguration</code>). Der entsprechende Abschnitt in der Konfigurationsdatei
+          lautet dann <code class="literal">[authentication/Name-der-Konfiguration]</code>.</p><p>Die verfügbaren Parameter für die LDAP-Konfiguration lauten:</p><div class="variablelist"><dl><dt><span class="term">
+                        <code class="literal">host</code>
+                     </span></dt><dd><p>Der Rechnername oder die IP-Adresse des LDAP- oder
+                Active-Directory-Servers. Diese Angabe ist zwingend
+                erforderlich.</p></dd><dt><span class="term">
+                        <code class="literal">port</code>
+                     </span></dt><dd><p>Die Portnummer des LDAP-Servers; meist 389.</p></dd><dt><span class="term">
+                        <code class="literal">tls</code>
+                     </span></dt><dd><p>Wenn Verbindungsverschlüsselung gewünscht ist, so diesen
+                Wert auf ‘<code class="literal">1</code>’ setzen, andernfalls auf
+                ‘<code class="literal">0</code>’ belassen</p></dd><dt><span class="term">
+                        <code class="literal">verify</code>
+                     </span></dt><dd><p>Wenn Verbindungsverschlüsselung gewünscht und der Parameter <em class="parameter"><code>tls</code></em> gesetzt ist, so gibt dieser
+                Parameter an, ob das Serverzertifikat auf Gültigkeit geprüft wird. Mögliche Werte sind <code class="literal">require</code> (Zertifikat
+                wird überprüft und muss gültig sei; dies ist der Standard) und <code class="literal">none</code> (Zertifikat wird nicht
+                überpfüft).</p></dd><dt><span class="term">
+                        <code class="literal">attribute</code>
+                     </span></dt><dd><p>Das LDAP-Attribut, in dem der Benutzername steht, den der
+                Benutzer eingegeben hat. Für Active-Directory-Server ist dies
+                meist ‘<code class="literal">sAMAccountName</code>’, für andere
+                LDAP-Server hingegen ‘<code class="literal">uid</code>’. Diese Angabe ist
+                zwingend erforderlich.</p></dd><dt><span class="term">
+                        <code class="literal">base_dn</code>
+                     </span></dt><dd><p>Der Abschnitt des LDAP-Baumes, der durchsucht werden soll.
+                Diese Angabe ist zwingend erforderlich.</p></dd><dt><span class="term">
+                        <code class="literal">filter</code>
+                     </span></dt><dd><p>Ein optionaler LDAP-Filter. Enthält dieser Filter das Wort
+                <code class="literal">&lt;%login%&gt;</code>, so wird dieses durch den vom
+                Benutzer eingegebenen Benutzernamen ersetzt. Andernfalls wird
+                der LDAP-Baum nach einem Element durchsucht, bei dem das oben
+                angegebene Attribut mit dem Benutzernamen identisch ist.</p></dd><dt><span class="term">
+                        <code class="literal">bind_dn</code> und
+              <code class="literal">bind_password</code>
+                     </span></dt><dd><p>Wenn der LDAP-Server eine Anmeldung erfordert, bevor er
+                durchsucht werden kann (z.B. ist dies bei
+                Active-Directory-Servern der Fall), so kann diese hier angegeben
+                werden. Für Active-Directory-Server kann als
+                ‘<code class="literal">bind_dn</code>’ entweder eine komplette LDAP-DN wie
+                z.B. ‘<code class="literal">cn=Martin
+                Mustermann,cn=Users,dc=firmendomain</code>’ auch nur der
+                volle Name des Benutzers eingegeben werden; in diesem Beispiel
+                also ‘<code class="literal">Martin Mustermann</code>’.</p></dd><dt><span class="term">
+                        <code class="literal">timeout</code>
+                     </span></dt><dd><p>Timeout beim Verbindungsversuch, bevor der Server als nicht erreichbar gilt; Standardwert: 10</p></dd></dl></div></div><div class="sect3" title="2.10.4.3. HTTP-Header: Username in Header"><div class="titlepage"><div><div><h4 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung_HTTPHeaders"></a>2.10.4.3. HTTP-Header: Username in Header</h4></div></div></div><p>
+            Diese Methode der Authentifizierung überlässt einem vorgelagerten Webserver oder Proxyserver die Authentifizierung. Dazu können
+            SSO-Systeme wie z.B. Authelia oder Authentik zum Einsatz kommen. Die vorgelagerten Server übermitteln dann den Usernamen der
+            authentifizierten Person in einem speziellen HTTP-Header, der an kivitendo durchgereicht wird. Damit kivitendo nicht von
+            beliebigen Quellen aus mit so einem Usernamen aufgerufen werden kann, verlangt kivitendo weiterhin, dass in einem weiteren
+            Header ein Shared Secret übertragen wird. Dieses Secret wird vom Administrator vergeben und sollte nicht weitergegeben werden.
+          </p><p>
+            Über einen weiteren Header wird wiederum gesteuert, an welchem Mandanten die Anmeldung erfolgt. Dies geschieht über die
+            Datenbank-ID des Mandanten.
+          </p><p>
+            Um diese Methode zu aktivieren, muss das Authentifizierungsmodul auf <code class="literal">HTTPHeaders</code> gestellt werden. Zusätzlich
+            muss im Abschnitt <code class="literal">authentication/http_headers</code> der Parameter <code class="literal">enabled=1</code> und im Abschnitt
+            <code class="literal">authentication/http_basic</code> der Parameter <code class="literal">enabled=0</code> gesetzt werden. Die folgenden Parameter
+            müssen anschließend im Abschnitt <code class="literal">authentication/http_headers</code> konfiguriert werden:
+          </p><div class="variablelist"><dl><dt><span class="term">
+                        <code class="literal">client_id_header</code>
+                     </span></dt><dd><p>Name des Headers, in dem das vorgelagerte System die Datenbank-ID des Mandanten überträgt.</p></dd><dt><span class="term">
+                        <code class="literal">user_header</code>
+                     </span></dt><dd><p>Name des Headers, in dem das vorgelagerte System den Namen des authentifizierten Users überträgt.</p></dd><dt><span class="term">
+                        <code class="literal">secret_header</code>
+                     </span></dt><dd><p>Name des Headers, in dem das vorgelagerte System das Shared Secret.</p></dd><dt><span class="term">
+                        <code class="literal">secret</code>
+                     </span></dt><dd><p>Wert des Shared Secrets selber, der vom vorgelagerten System übertragen werden muss, damit die Werte als gültig
+                angesehen werden.</p></dd></dl></div></div><div class="sect3" title="2.10.4.4. HTTP-Header: Basic Authorization"><div class="titlepage"><div><div><h4 class="title"><a name="Passwort%C3%BCberpr%C3%BCfung_HTTPBasic"></a>2.10.4.4. HTTP-Header: Basic Authorization</h4></div></div></div><p>
+            Diese Methode der Authentifizierung überlässt dem Webserver (meist Apache) die Authentifizierung mittels der standardisierten
+            HTTP Basic Authentication (RFC 7617). Dazu muss der Webserver so konfiguriert werden, dass er für alle kivitendo-Requests vom
+            Webbrowser Authentifizierung verlangt. Zusätzlich muss er veranlasst werden, den angegebenen Usernamen auch an kivitendo zu
+            übermitteln. Dies könnte beispielhaft wie folgt aussehen:
+          </p><pre class="programlisting">&lt;Directory /path/to/kivitendo-erp&gt;
+  AllowOverride All
+  Options ExecCGI Includes FollowSymlinks
+
+  # Require authentication from local user file:
+  AuthType Basic
+  AuthName "kivitendo"
+  AuthUserFile /etc/apache2/htpasswd.kivitendo
+  Require valid-user
+
+  # Pass name of authorized user to kivitendo:
+  SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+&lt;/Directory&gt;</pre><p>
+             Um diese Methode zu aktivieren, muss das Authentifizierungsmodul auf <code class="literal">HTTPHeaders</code> gestellt werden. Zusätzlich
+             muss im Abschnitt <code class="literal">authentication/http_basic</code> der Parameter <code class="literal">enabled=1</code> und im Abschnitt
+             <code class="literal">authentication/http_headers</code> der Parameter <code class="literal">enabled=0</code> gesetzt werden.
+           </p></div></div><div class="sect2" title="2.10.5. Name des Session-Cookies"><div class="titlepage"><div><div><h3 class="title"><a name="Name-des-Session-Cookies"></a>2.10.5. Name des Session-Cookies</h3></div></div></div><p>Sollen auf einem Server mehrere kivitendo-Installationen
+        aufgesetzt werden, so müssen die Namen der Session-Cookies für alle
+        Installationen unterschiedlich sein. Der Name des Cookies wird mit dem
+        Parameter <code class="varname">cookie_name</code> im Abschnitt
+        <code class="varname">[authentication]</code>gesetzt.</p><p>Diese Angabe ist optional, wenn nur eine Installation auf dem
+        Server existiert.</p></div><div class="sect2" title="2.10.6. Anlegen der Authentifizierungsdatenbank"><div class="titlepage"><div><div><h3 class="title"><a name="Anlegen-der-Authentifizierungsdatenbank"></a>2.10.6. Anlegen der Authentifizierungsdatenbank</h3></div></div></div><p>Nachdem alle Einstellungen in
+        <code class="filename">config/kivitendo.conf</code> vorgenommen wurden, muss
+        kivitendo die Authentifizierungsdatenbank anlegen. Dieses geschieht
+        automatisch, wenn Sie sich im Administrationsmodul anmelden, das unter
+        der folgenden URL erreichbar sein sollte:</p><p>
+               <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
+            </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s09.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s11.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.9. Konfiguration der Hintergrund-Jobs&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.11. Mandanten-, Benutzer- und Gruppenverwaltung</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s11.html b/doc/html/ch02s11.html
index c2ce198c4..23d633576 100644
--- a/doc/html/ch02s11.html
+++ b/doc/html/ch02s11.html
@@ -1,54 +1,83 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.11. E-Mail-Versand aus kivitendo heraus</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s10.html" title="2.10. Drucker- und Systemverwaltung"><link rel="next" href="ch02s12.html" title="2.12. Drucken mit kivitendo"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.11. E-Mail-Versand aus kivitendo heraus</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s10.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s12.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.11. E-Mail-Versand aus kivitendo heraus"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.sending-email"></a>2.11. E-Mail-Versand aus kivitendo heraus</h2></div></div></div><p>kivitendo kann direkt aus dem Programm heraus E-Mails versenden,
-      z.B. um ein Angebot direkt an einen Kunden zu verschicken. Damit dies
-      funktioniert, muss eingestellt werden, über welchen Server die E-Mails
-      verschickt werden sollen. kivitendo unterstützt dabei zwei Mechanismen:
-      Versand über einen lokalen E-Mail-Server (z.B. mit
-      <span class="productname">Postfix</span>™ oder <span class="productname">Exim</span>™,
-      was auch die standardmäßig aktive Methode ist) sowie Versand über einen
-      SMTP-Server (z.B. der des eigenen Internet-Providers).</p><p>Welche Methode und welcher Server verwendet werden, wird über die
-      Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
-      festgelegt. Dort befinden sich alle Einstellungen zu diesem Thema im
-      Abschnitt '<code class="literal">[mail_delivery]</code>'.</p><div class="sect2" title="2.11.1. Versand über lokalen E-Mail-Server"><div class="titlepage"><div><div><h3 class="title"><a name="config.sending-email.sendmail"></a>2.11.1. Versand über lokalen E-Mail-Server</h3></div></div></div><p>Diese Methode bietet sich an, wenn auf dem Server, auf dem
-        kivitendo läuft, bereits ein funktionsfähiger E-Mail-Server wie z.B.
-        <span class="productname">Postfix</span>™, <span class="productname">Exim</span>™
-        oder <span class="productname">Sendmail</span>™ läuft.</p><p>Um diese Methode auszuwählen, muss der Konfigurationsparameter
-        '<code class="literal">method = sendmail</code>' gesetzt sein. Dies ist
-        gleichzeitig der Standardwert, falls er nicht verändert wird.</p><p>Um zu kontrollieren, wie das Programm zum Einliefern gestartet
-        wird, dient der Parameter '<code class="literal">sendmail = ...</code>'. Der
-        Standardwert verweist auf das Programm
-        <code class="filename">/usr/bin/sendmail</code>, das bei allen oben genannten
-        E-Mail-Serverprodukten für diesen Zweck funktionieren sollte.</p><p>Die Konfiguration des E-Mail-Servers selber würde den Rahmen
-        dieses sprengen. Hierfür sei auf die Dokumentation des E-Mail-Servers
-        verwiesen.</p></div><div class="sect2" title="2.11.2. Versand über einen SMTP-Server"><div class="titlepage"><div><div><h3 class="title"><a name="config.sending-email.smtp"></a>2.11.2. Versand über einen SMTP-Server</h3></div></div></div><p>Diese Methode bietet sich an, wenn kein lokaler E-Mail-Server
-        vorhanden oder zwar einer vorhanden, dieser aber nicht konfiguriert
-        ist.</p><p>Um diese Methode auszuwählen, muss der Konfigurationsparameter
-        '<code class="literal">method = smtp</code>' gesetzt sein. Die folgenden
-        Parameter dienen dabei der weiteren Konfiguration:</p><div class="variablelist"><dl><dt><span class="term">
-                     <code class="varname">hostname</code>
-                  </span></dt><dd><p>Name oder IP-Adresse des SMTP-Servers. Standardwert:
-              '<code class="literal">localhost</code>'</p></dd><dt><span class="term">
-                     <code class="varname">port</code>
-                  </span></dt><dd><p>Portnummer. Der Standardwert hängt von der verwendeten
-              Verschlüsselungsmethode ab. Gilt '<code class="literal">security =
-              none</code>' oder '<code class="literal">security = tls</code>', so ist
-              25 die Standardportnummer. Für '<code class="literal">security =
-              ssl</code>' ist 465 die Portnummer. Muss normalerweise nicht
-              geändert werden.</p></dd><dt><span class="term">
-                     <code class="varname">security</code>
-                  </span></dt><dd><p>Wahl der zu verwendenden Verschlüsselung der Verbindung
-              mit dem Server. Standardwert ist '<code class="literal">none</code>',
-              wodurch keine Verschlüsselung verwendet wird. Mit
-              '<code class="literal">tls</code>' wird TLS-Verschlüsselung eingeschaltet,
-              und mit '<code class="literal">ssl</code>' wird Verschlüsselung via SSL
-              eingeschaltet. Achtung: Für '<code class="literal">tls</code>' und
-              '<code class="literal">ssl</code>' werden zusätzliche Perl-Module benötigt
-              (siehe unten).</p></dd><dt><span class="term">
-                     <code class="varname">login</code> und
-            <code class="varname">password</code>
-                  </span></dt><dd><p>Falls der E-Mail-Server eine Authentifizierung verlangt,
-              so können mit diesen zwei Parametern der Benutzername und das
-              Passwort angegeben werden. Wird Authentifizierung verwendet, so
-              sollte aus Sicherheitsgründen auch eine Form von Verschlüsselung
-              aktiviert werden.</p></dd></dl></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s10.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s12.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.10. Drucker- und Systemverwaltung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.12. Drucken mit kivitendo</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.11. Mandanten-, Benutzer- und Gruppenverwaltung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s10.html" title="2.10. Benutzerauthentifizierung und Administratorpasswort"><link rel="next" href="ch02s12.html" title="2.12. Drucker- und Systemverwaltung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.11. Mandanten-, Benutzer- und Gruppenverwaltung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s10.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s12.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.11. Mandanten-, Benutzer- und Gruppenverwaltung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Benutzer--und-Gruppenverwaltung"></a>2.11. Mandanten-, Benutzer- und Gruppenverwaltung</h2></div></div></div><p>Nach der Installation müssen Mandanten, Benutzer, Gruppen und
+      Datenbanken angelegt werden. Dieses geschieht im Administrationsmenü,
+      das Sie unter folgender URL finden:</p><p>
+            <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
+         </p><p>Verwenden Sie zur Anmeldung das Passwort, das Sie in der Datei
+      <code class="filename">config/kivitendo.conf</code> eingetragen haben.</p><div class="sect2" title="2.11.1. Zusammenhänge"><div class="titlepage"><div><div><h3 class="title"><a name="Zusammenh%C3%A4nge"></a>2.11.1. Zusammenhänge</h3></div></div></div><p>kivitendo verwaltet zwei Sets von Daten, die je nach Einrichtung
+        in einer oder zwei Datenbanken gespeichert werden.</p><p>Das erste Set besteht aus Anmeldeinformationen: welche Benutzer
+        und Mandanten gibt es, welche Gruppen, welche BenutzerIn hat Zugriff
+        auf welche Mandanten, und welche Gruppe verfügt über welche Rechte.
+        Diese Informationen werden in der Authentifizierungsdatenbank
+        gespeichert. Dies ist diejenige Datenbank, deren Verbindungsparameter
+        in der Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
+        gespeichert werden.</p><p>Das zweite Set besteht aus den eigentlichen Verkehrsdaten eines
+        Mandanten, wie beispielsweise die Stammdaten (Kunden, Lieferanten,
+        Waren) und Belege (Angebote, Lieferscheine, Rechnungen). Diese werden
+        in einer Mandantendatenbank gespeichert. Die Verbindungsinformationen
+        einer solchen Mandantendatenbank werden im Administrationsbereich
+        konfiguriert, indem man einen Mandanten anlegt und dort die Parameter
+        einträgt. Dabei hat jeder Mandant eine eigene Datenbank.</p><p>Aufgrund des Datenbankdesigns ist es für einfache Fälle möglich,
+        die Authentifizierungsdatenbank und eine der Mandantendatenbanken in
+        ein und derselben Datenbank zu speichern. Arbeitet man hingegen mit
+        mehr als einem Mandanten, wird empfohlen, für die
+        Authentifizierungsdatenbank eine eigene Datenbank zu verwenden, die
+        nicht gleichzeitig für einen Mandanten verwendet wird.</p></div><div class="sect2" title="2.11.2. Mandanten, Benutzer und Gruppen"><div class="titlepage"><div><div><h3 class="title"><a name="Mandanten-Benutzer-Gruppen"></a>2.11.2. Mandanten, Benutzer und Gruppen</h3></div></div></div><p>kivitendos Administration kennt Mandanten, Benutzer und Gruppen,
+        die sich frei zueinander zuordnen lassen.</p><p>kivitendo kann mehrere Mandaten aus einer Installation heraus
+        verwalten. Welcher Mandant benutzt wird, kann direkt beim Login
+        ausgewählt werden. Für jeden Mandanten wird ein eindeutiger Name
+        vergeben, der beim Login angezeigt wird. Weiterhin benötigt der
+        Mandant Datenbankverbindungsparameter für seine Mandantendatenbank.
+        Diese sollte über die <a class="link" href="ch02s11.html#Datenbanken-anlegen" title="2.11.3. Datenbanken anlegen">Datenbankverwaltung</a>
+        geschehen.</p><p>Ein Benutzer ist eine Person, die Zugriff auf kivitendo erhalten
+        soll. Sie erhält einen Loginnamen sowie ein Passwort. Weiterhin legt
+        der Administrator fest, an welchen Mandanten sich ein Benutzer
+        anmelden kann, was beim Login verifiziert wird.</p><p>Gruppen dienen dazu, Benutzern innerhalb eines Mandanten Zugriff
+        auf bestimmte Funktionen zu geben. Einer Gruppe werden dafür vom
+        Administrator gewisse Rechte zugeordnet. Weiterhin legt der
+        Administrator fest, für welche Mandanten eine Gruppe gilt, und welche
+        Benutzer Mitglieder in dieser Gruppe sind. Meldet sich ein Benutzer
+        dann an einem Mandanten an, so erhält er alle Rechte von allen
+        denjenigen Gruppen, die zum Einen dem Mandanten zugeordnet sind und in
+        denen der Benutzer zum Anderen Mitglied ist,</p><p>Die Reihenfolge, in der Datenbanken, Mandanten, Gruppen und
+        Benutzer angelegt werden, kann im Prinzip beliebig gewählt werden. Die
+        folgende Reihenfolge beinhaltet die wenigsten Arbeitsschritte:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Datenbank anlegen</p></li><li class="listitem"><p>Gruppen anlegen</p></li><li class="listitem"><p>Benutzer anlegen und Gruppen als Mitglied zuordnen</p></li><li class="listitem"><p>Mandanten anlegen und Gruppen sowie Benutzer zuweisen</p></li></ol></div></div><div class="sect2" title="2.11.3. Datenbanken anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Datenbanken-anlegen"></a>2.11.3. Datenbanken anlegen</h3></div></div></div><p>Zuerst muss eine Datenbank angelegt werden. Verwenden Sie für
+        den Datenbankzugriff den vorhin angelegten Benutzer (in unseren
+        Beispielen ist dies ‘<code class="literal">kivitendo</code>’).</p></div><div class="sect2" title="2.11.4. Gruppen anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Gruppen-anlegen"></a>2.11.4. Gruppen anlegen</h3></div></div></div><p>Eine Gruppe wird in der Gruppenverwaltung angelegt. Ihr muss ein
+        Name gegeben werden, eine Beschreibung ist hingegen optional. Nach dem
+        Anlegen können Sie die verschiedenen Bereiche wählen, auf die
+        Mitglieder dieser Gruppe Zugriff haben sollen.</p><p>Benutzergruppen werden zwar in der Authentifizierungsdatenbank
+        gespeichert, gelten aber nicht automatisch für alle Mandanten. Der
+        Administrator legt vielmehr fest, für welche Mandanten eine Gruppe
+        gültig ist. Dies kann entweder beim Bearbeiten der Gruppe geschehen
+        ("diese Gruppe ist gültig für Mandanten X, Y und Z"), oder aber wenn
+        man einen Mandanten bearbeitet ("für diesen Mandanten sind die Gruppen
+        A, B und C gültig").</p><p>Wurden bereits Benutzer angelegt, so können hier die Mitglieder
+        dieser Gruppe festgelegt werden ("in dieser Gruppe sind die Benutzer
+        X, Y und Z Mitglieder"). Dies kann auch nachträglich beim Bearbeiten
+        eines Benutzers geschehen ("dieser Benutzer ist Mitglied in den
+        Gruppen A, B und C").</p></div><div class="sect2" title="2.11.5. Benutzer anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Benutzer-anlegen"></a>2.11.5. Benutzer anlegen</h3></div></div></div><p>Beim Anlegen von Benutzern werden für viele Parameter
+        Standardeinstellungen vorgenommen, die den Gepflogenheiten des
+        deutschen Raumes entsprechen.</p><p>Zwingend anzugeben ist der Loginname. Wenn die
+        Passwortauthentifizierung über die Datenbank eingestellt ist, so kann
+        hier auch das Benutzerpasswort gesetzt bzw. geändert werden. Ist
+        hingegen die LDAP-Authentifizierung aktiv, so ist das Passwort-Feld
+        deaktiviert.</p><p>Hat man bereits Mandanten und Gruppen angelegt, so kann hier
+        auch konfiguriert werden, auf welche Mandanten der Benutzer Zugriff
+        hat bzw. in welchen Gruppen er Mitglied ist. Beide Zuweisungen können
+        sowohl beim Benutzer vorgenommen werden ("dieser Benutzer hat Zugriff
+        auf Mandanten X, Y, Z" bzw. "dieser Benutzer ist Mitglied in Gruppen
+        X, Y und Z") als auch beim Mandanten ("auf diesen Mandanten haben
+        Benutzer A, B und C Zugriff") bzw. bei der Gruppe ("in dieser Gruppe
+        sind Benutzer A, B und C Mitglieder").</p></div><div class="sect2" title="2.11.6. Mandanten anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Mandanten-anlegen"></a>2.11.6. Mandanten anlegen</h3></div></div></div><p>Ein Mandant besteht aus Administrationssicht primär aus einem
+        eindeutigen Namen. Weiterhin wird hier hinterlegt, welche Datenbank
+        als Mandantendatenbank benutzt wird. Hier müssen die Zugriffsdaten
+        einer der eben angelegten Datenbanken eingetragen werden.</p><p>Hat man bereits Benutzer und Gruppen angelegt, so kann hier auch
+        konfiguriert werden, welche Benutzer Zugriff auf den Mandanten haben
+        bzw. welche Gruppen für den Mandanten gültig sind. Beide Zuweisungen
+        können sowohl beim Mandanten vorgenommen werden ("auf diesen Mandanten
+        haben Benutzer X, Y und Z Zugriff" bzw. "für diesen Mandanten sind die
+        Gruppen X, Y und Z gültig") als auch beim Benutzer ("dieser Benutzer
+        hat Zugriff auf Mandanten A, B und C") bzw. bei der Gruppe ("diese
+        Gruppe ist für Mandanten A, B und C gültig").</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s10.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s12.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.10. Benutzerauthentifizierung und Administratorpasswort&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.12. Drucker- und Systemverwaltung</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s12.html b/doc/html/ch02s12.html
index 8c7835fa6..dd3d44b6b 100644
--- a/doc/html/ch02s12.html
+++ b/doc/html/ch02s12.html
@@ -1,108 +1,23 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.12. Drucken mit kivitendo</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s11.html" title="2.11. E-Mail-Versand aus kivitendo heraus"><link rel="next" href="ch02s13.html" title="2.13. OpenDocument-Vorlagen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.12. Drucken mit kivitendo</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s11.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s13.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.12. Drucken mit kivitendo"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Drucken-mit-kivitendo"></a>2.12. Drucken mit kivitendo</h2></div></div></div><p>Das Drucksystem von kivitendo benutzt von Haus aus LaTeX-Vorlagen.
-      Um drucken zu können, braucht der Server ein geeignetes LaTeX System. Am
-      einfachsten ist dazu eine <code class="literal">texlive</code> Installation. Unter
-      debianoiden Betriebssystemen installiert man die Pakete mit:</p><p>
-            </p><pre class="programlisting">apt install texlive-base-bin texlive-latex-recommended texlive-fonts-recommended \
-  texlive-latex-extra texlive-lang-german ghostscript</pre><p>
-         </p><p>Für Fedora benötigen Sie die folgenden Pakete:</p><p>
-            </p><pre class="programlisting">dnf install texlive-collection-latex texlive-collection-latexextra \
-  texlive-collection-latexrecommended texlive-collection-langgerman \
-  texlive-collection-langenglish</pre><p>
-         </p><p>Für openSUSE benötigen Sie die folgenden Pakete:</p><p>
-            </p><pre class="programlisting">zypper install texlive-collection-latex texlive-collection-latexextra \
-  texlive-collection-latexrecommended texlive-collection-langgerman \
-  texlive-collection-langenglish</pre><p>
-         </p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>kivitendo erwartet eine aktuelle TeX Live Umgebung, um PDF/A zu erzeugen. Aktuelle Distributionen von 2020 erfüllen diese. Überprüfbar ist dies mit dem Aufruf des installation_check.pl mit Parameter -l:</p><p>
-               </p><pre class="programlisting">scripts/installations_check.pl -l</pre><p>
-            </p></td></tr></table></div><p>kivitendo bringt drei alternative Vorlagensätze mit:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>RB</p></li><li class="listitem"><p>marei</p></li><li class="listitem"><p>rev-odt</p></li></ul></div><p>Der ehemalige Druckvorlagensatz "f-tex" wurde mit der Version
-      3.5.6 entfernt, da er nicht mehr gepflegt wird.</p><div class="sect2" title="2.12.1. Vorlagenverzeichnis anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagenverzeichnis-anlegen"></a>2.12.1. Vorlagenverzeichnis anlegen</h3></div></div></div><p>Es lässt sich ein initialer Vorlagensatz erstellen. Die
-        LaTeX-System-Abhängigkeiten hierfür kann man prüfen mit:</p><pre class="programlisting">./scripts/installation_check.pl -lv</pre><p>Der Angemeldete Benutzer muss in einer Gruppe sein, die über das
-        Recht "Konfiguration -&gt; Mandantenverwaltung" verfügt. Siehe auch
-        <a class="xref" href="ch02s09.html#Gruppen-anlegen" title="2.9.4. Gruppen anlegen">Abschnitt&nbsp;2.9.4, „Gruppen anlegen“</a>.</p><p>Im Userbereich lässt sich unter: "<span class="guimenu">System</span>
-        -&gt; <span class="guisubmenu">Mandantenverwaltung</span> -&gt;
-        <span class="guimenuitem">Verschiedenes</span>" die Option "Neue
-        Druckvorlagen aus Vorlagensatz erstellen" auswählen.</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>
-                     <code class="option">Vorlagen auswählen</code>: Wählen Sie hier den
-            Vorlagensatz aus, der kopiert werden soll
-            (<code class="filename">RB</code>, <code class="filename">marei</code> oder
-            <code class="filename">odt-rev</code>.)</p></li><li class="listitem"><p>
-                     <code class="option">Neuer Name</code>: Der Verzeichnisname für den
-            neuen Vorlagensatz. Dieser kann im Rahmen der üblichen Bedingungen
-            für Verzeichnisnamen frei gewählt werden.</p></li></ol></div><p>Nach dem Speichern wird das Vorlagenverzeichnis angelegt und ist
-        für den aktuellen Mandanten ausgewählt. Der gleiche Vorlagensatz kann,
-        wenn er mal angelegt ist, bei mehreren Mandanten verwendet werden.
-        Eventuell müssen Anpassungen (Logo, Erscheinungsbild, etc) noch
-        vorgenommen werden. Den Ordner findet man im Dateisystem unter
-        <code class="filename">./templates/[Neuer Name]</code>
-            </p></div><div class="sect2" title="2.12.2. Der Druckvorlagensatz RB"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagen-RB"></a>2.12.2. Der Druckvorlagensatz RB</h3></div></div></div><p>Hierbei handelt es sich um einen vollständigen LaTeX
-        Dokumentensatz mit alternativem Design. Die odt oder html-Varianten
-        sind nicht gepflegt.</p><p>Die konzeptionelle Idee der Vorlagen wird <a class="ulink" href="http://www.kivitendo-support.de/vortraege/Lx-Office%20Anwendertreffen%20LaTeX-Druckvorlagen-Teil3-finale.pdf" target="_top">hier</a>
-        auf Folie 5 bis 10 vorgestellt. Informationen zur Anpassung an die
-        eigenen Firmendaten finden sich in der Datei Readme.tex im
-        Vorlagenverzeichnis.</p><p>Eine kurze Übersicht der Features:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Mehrsprachenfähig, mit Deutscher und Englischer
-            Übersetzung</p></li><li class="listitem"><p>Zentrale Konfigurationsdateien, die für alle Belege benutzt
-            werden, z.B. für Kopf- und Fußzeilen, und Infos wie
-            Bankdaten</p></li><li class="listitem"><p>mehrere vordefinierte Varianten für
-            Logos/Hintergrundbilder</p></li><li class="listitem"><p>Berücksichtigung für Steuerzonen "EU mit USt-ID Nummer" oder
-            "Außerhalb EU"</p></li></ul></div></div><div class="sect2" title="2.12.3. Der Druckvorlagensatz rev-odt"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagen-rev-odt"></a>2.12.3. Der Druckvorlagensatz rev-odt</h3></div></div></div><p>Hierbei handelt es sich um einen Dokumentensatz der mit
-        odt-Vorlagen erstellt wurde. Es gibt in dem Verzeichnis eine
-        Readme-Datei, die eventuell aktueller als die Dokumentation hier ist.
-        Die odt-Vorlagen in diesem Verzeichnis "rev-odt" wurden von revamp-it,
-        Zürich erstellt und werden laufend aktualisiert. Ein paar der
-        Formulierungen in den Druckvorlagen entsprechen dem Schweizer
-        Sprachgebrauch, z.B. "Offerte" oder "allfällig".</p><p>Hinweis zum Einsatz des Feldes "Land" bei den Stammdaten für
-        KundInnen und LieferantInnen, sowie bei Lieferadressen: Die in diesem
-        Vorlagensatz vorhandenen Vorlagen erwarten für "Land" das
-        entsprechende Kürzel, das in Adressen vor die Postleitzahl gesetzt
-        wird. Das Feld kann auch komplett leer bleiben. Wer dies anders
-        handhaben möchte, muss die Vorlagen entsprechend anpassen.</p><p>odt-Vorlagen können mit LibreOffice oder OpenOffice editiert und
-        den eigenen Bedürfnissen angepasst werden. Wichtig beim Editieren von
-        if-Blöcken ist, dass immer der gesamte Block überschrieben werden muss
-        und nicht nur Teile davon, da dies sonst oft zu einer odt-Datei führt,
-        die vom Parser nicht korrekt gelesen werden kann.</p><p>Mahnungen können unter folgenden Einschränkungen mit den
-        odt-Vorlagen im Vorlagensatz rev-odt erzeugt werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>als Druckoption steht nur 'PDF(OpenDocument/OASIS)' zur
-            Verfügung, das heisst, die Mahnungen werden als PDF-Datei
-            ausgegeben.</p></li><li class="listitem"><p>für jede Rechnung muss eine eigene Mahnung erzeugt werden
-            (auch wenn bei einzelnen KundInnen mehrere überfällige Rechnungen
-            vorhanden sind).</p></li></ul></div><p>Mehrere Mahnungen für eine Kundin / einen Kunden werden zu einer
-        PDF-Datei zusammengefasst</p><p>Die Vorlagen zahlungserinnerung.odt sowie mahnung.odt sind für
-        das Erstellen einer Zahlungserinnerung bzw. Mahnung selbst vorgesehen,
-        die Vorlage mahnung_invoice.odt für das Erstellen einer Rechnung über
-        die verrechneten Mahngebühren und Verzugszinsen.</p><p>Zur Zeit gibt es in kivitendo noch keine Möglichkeit,
-        odt-Vorlagen bei Briefen und Pflichtenheften einzusetzen.
-        Entsprechende Vorlagen sind deshalb nicht vorhanden.</p><p>Fehlermeldungen, Anregungen und Wünsche bitte senden an:
-        empfang@revamp-it.ch</p></div><div class="sect2" title="2.12.4. Allgemeine Hinweise zu LaTeX Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="allgemeine-hinweise-zu-latex"></a>2.12.4. Allgemeine Hinweise zu LaTeX Vorlagen</h3></div></div></div><p>In den allermeisten Installationen sollte das Drucken jetzt
-        schon funktionieren. Sollte ein Fehler auftreten, wirft TeX sehr lange
-        Fehlerbeschreibungen, der eigentliche Fehler ist immer die erste
-        Zeile, die mit einem Ausrufezeichen anfängt. Häufig auftretende Fehler
-        sind zum Beispiel:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>! LaTeX Error: File `eurosym.sty' not found. Die
-            entsprechende LaTeX-Bibliothek wurde nicht gefunden. Das tritt vor
-            allem bei Vorlagen aus der Community auf. Installieren Sie die
-            entsprechenden Pakete.</p></li><li class="listitem"><p>! Package inputenc Error: Unicode char \u8:... set up for
-            use with LaTeX. Dieser Fehler tritt auf, wenn sie versuchen mit
-            einer Standardinstallation exotische utf8 Zeichen zu drucken.
-            TeXLive unterstützt von Haus nur romanische Schriften und muss mit
-            diversen Tricks dazu gebracht werden andere Zeichen zu
-            akzeptieren. Adere TeX Systeme wie XeTeX schaffen hier
-            Abhilfe.</p></li></ul></div><p>Wird gar kein Fehler angezeigt, sondern nur der Name des
-        Templates, heißt das normalerweise, dass das LaTeX Binary nicht
-        gefunden wurde. Prüfen Sie den Namen in der Konfiguration (Standard:
-        <code class="literal">pdflatex</code>), und stellen Sie sicher, dass pdflatex
-        (oder das von Ihnen verwendete System) vom Webserver ausgeführt werden
-        darf.</p><p>Wenn sich das Problem nicht auf Grund der Ausgabe im Webbrowser
-        verifizieren lässt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>editiere [kivitendo-home]/config/kivitendo.conf und ändere
-            "keep_temp_files" auf 1</p><p>
-                     </p><pre class="programlisting">keep_temp_files = 1;</pre><p>
-                  </p></li><li class="listitem"><p>bei fastcgi oder mod_perl den Webserver neu Starten</p></li><li class="listitem"><p>Nochmal einen Druckversuch im Webfrontend auslösen</p></li><li class="listitem"><p>wechsel in das users Verzeichnis von kivitendo</p><p>
-                     </p><pre class="programlisting">cd [kivitendo-home]/users</pre><p>
-                  </p></li><li class="listitem"><p>LaTeX Suchpfad anpassen:</p><p>
-                     </p><pre class="programlisting">export TEXINPUTS=".:[kivitendo-home]/templates/[aktuelles_template_verzeichniss]:"</pre><p>
-                  </p></li><li class="listitem"><p>Finde heraus, welche Datei kivitendo beim letzten Durchlauf
-            erstellt hat</p><p>
-                     </p><pre class="programlisting">ls -lahtr ./1*.tex</pre><p>
-                  </p><p>Es sollte die letzte Datei ganz unten sein</p></li><li class="listitem"><p>für besseren Hinweis auf Fehler texdatei nochmals
-            übersetzen</p><p>
-                     </p><pre class="programlisting">pdflatex ./1*.tex</pre><p>
-                  </p><p>in der *.tex datei nach dem Fehler suchen.</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s11.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s13.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.11. E-Mail-Versand aus kivitendo heraus&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.13. OpenDocument-Vorlagen</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.12. Drucker- und Systemverwaltung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s11.html" title="2.11. Mandanten-, Benutzer- und Gruppenverwaltung"><link rel="next" href="ch02s13.html" title="2.13. E-Mail"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.12. Drucker- und Systemverwaltung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s11.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s13.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.12. Drucker- und Systemverwaltung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Drucker--Systemverwaltung"></a>2.12. Drucker- und Systemverwaltung</h2></div></div></div><p>Im Administrationsmenü gibt es ferner noch die beiden Menüpunkte
+      Druckeradministration und System.</p><div class="sect2" title="2.12.1. Druckeradministration"><div class="titlepage"><div><div><h3 class="title"><a name="Druckeradministration"></a>2.12.1. Druckeradministration</h3></div></div></div><p>Unter dem Menüpunkt Druckeradministration lassen sich beliebig
+        viele "Druckbefehle" im System verwalten. Diese Befehle werden
+        mandantenweise zugeordnet. Unter Druckerbeschreibung wird der Namen
+        des Druckbefehls festgelegt, der dann in der Druckerauswahl des Belegs
+        angezeigt wird.</p><p>Unter Druckbefehl definiert man den eigentlichen Druckbefehl,
+        der direkt auf dem Webserver ausgeführt wird, bspw. 'lpr -P
+        meinDrucker' oder ein kompletter Pfad zu einem Skript
+        (/usr/local/src/kivitendo/scripts/pdf_druck_in_verzeichnis.sh). Wird
+        ferner noch ein optionales Vorlagenkürzel verwendet, wird dieses
+        Kürzel bei der Auswahl der Druckvorlagendatei mit einem Unterstrich
+        ergänzt, ist bspw. das Kürzel 'epson_drucker' definiert, so wird beim
+        Ausdruck eines Angebots folgende Vorlage geparst:
+        sales_quotation_epson_drucker.tex.</p></div><div class="sect2" title="2.12.2. System sperren / entsperren"><div class="titlepage"><div><div><h3 class="title"><a name="System"></a>2.12.2. System sperren / entsperren</h3></div></div></div><p>Unter dem Menüpunkt System gibt es den Eintrag 'Installation
+        sperren/entsperren'. Setzt man diese Sperre so ist der Zugang zu der
+        gesamten kivitendo Installation gesperrt.</p><p>Falls die Sperre gesetzt ist, erscheint anstelle der
+        Anmeldemaske die Information: 'kivitendo ist momentan zwecks
+        Wartungsarbeiten nicht zugänglich.'.</p><p>Wichtig zu erwähnen ist hierbei noch, dass sich kivitendo
+        automatisch 'sperrt', falls es bei einem Versionsupdate zu einem
+        Datenbankfehler kam. Somit kann hier nicht aus Versehen mit einem
+        inkonsistenten Datenbestand weitergearbeitet werden.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s11.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s13.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.11. Mandanten-, Benutzer- und Gruppenverwaltung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.13. E-Mail</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s13.html b/doc/html/ch02s13.html
index ed0cdfb58..6f7feb12b 100644
--- a/doc/html/ch02s13.html
+++ b/doc/html/ch02s13.html
@@ -1,189 +1,193 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.13. OpenDocument-Vorlagen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s12.html" title="2.12. Drucken mit kivitendo"><link rel="next" href="ch02s14.html" title="2.14. Nomenklatur"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.13. OpenDocument-Vorlagen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s12.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s14.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.13. OpenDocument-Vorlagen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="OpenDocument-Vorlagen"></a>2.13. OpenDocument-Vorlagen</h2></div></div></div><p>kivitendo unterstützt die Verwendung von Vorlagen im
-      OpenDocument-Format, wie es LibreOffice oder OpenOffice (ab Version 2)
-      erzeugen. kivitendo kann dabei sowohl neue OpenDocument-Dokumente als
-      auch aus diesen direkt PDF-Dateien erzeugen. Um die Unterstützung von
-      OpenDocument-Vorlagen zu aktivieren muss in der Datei
-      <code class="filename">config/kivitendo.conf</code> die Variable
-      <code class="literal">opendocument</code> im Abschnitt
-      <code class="literal">print_templates</code> auf ‘<code class="literal">1</code>’ stehen.
-      Dieses ist die Standardeinstellung.</p><p>Während die Erzeugung von reinen OpenDocument-Dateien keinerlei
-      weitere Software benötigt, wird zur Umwandlung dieser Dateien in PDF
-      LibreOffice oder OpenOffice benötigt. Soll dieses Feature genutzt
-      werden, so muss neben LibreOffice oder OpenOffice auch der “X virtual
-      frame buffer” (xvfb) installiert werden. Bei Debian ist er im Paket
-      “xvfb” enthalten. Andere Distributionen enthalten ihn in anderen
-      Paketen.</p><p>Nach der Installation müssen in der Datei
-      <code class="filename">config/kivitendo.conf</code> im Abschnitt
-      <code class="literal">applications</code> zwei weitere Variablen angepasst
-      werden:</p><p>
-            <code class="literal">openofficeorg_writer</code> muss den vollständigen
-      Pfad zu LibreOffice oder OpenOffice enthalten. Dabei dürfen keine
-      Anführungszeichen eingesetzt werden.</p><p>Beispiel für Debian oder Ubuntu:</p><pre class="programlisting">openofficeorg_writer = /usr/bin/libreoffice</pre><p>
-            <code class="literal">xvfb</code> muss den Pfad zum “X virtual frame buffer”
-      enthalten.</p><p>Zusätzlich gibt es zwei verschiedene Arten, wie kivitendo mit
-      LibreOffice bzw. OpenOffice kommuniziert. Die erste Variante, die
-      benutzt wird, wenn die Variable <code class="literal">$openofficeorg_daemon</code>
-      gesetzt ist, startet ein LibreOffice oder OpenOffice, das auch nach der
-      Umwandlung des Dokumentes gestartet bleibt. Bei weiteren Umwandlungen
-      wird dann diese laufende Instanz benutzt. Der Vorteil ist, dass die Zeit
-      zur Umwandlung deutlich reduziert wird, weil nicht für jedes Dokument
-      ein LibreOffice bzw. OpenOffice gestartet werden muss. Der Nachteil ist,
-      dass diese Methode Python und die Python-UNO-Bindings benötigt, die
-      Bestandteil von LibreOffice bzw. OpenOffice sind.</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Für die Verbindung zu LibreOffice bzw. OpenOffice wird
-        normalerweise der Python-Interpreter
-        <code class="filename">/usr/bin/python</code> benutzt. Sollte dies nicht der
-        richtige sein, so kann man mit zwei Konfigurationsvariablen
-        entscheiden, welcher Python-Interpreter genutzt wird. Mit der Option
-        <code class="literal">python_uno</code> aus dem Abschnitt
-        <code class="literal">applications</code> wird der Interpreter selber
-        festgelegt; sie steht standardmäßig auf dem eben erwähnten Wert
-        <code class="literal">/usr/bin/python</code>.</p><p>Zusätzlich ist es möglich, Pfade anzugeben, in denen Python
-        neben seinen normalen Suchpfaden ebenfalls nach Modulen gesucht wird,
-        z.B. falls sich diese in einem gesonderten LibreOffice- bzw.
-        OpenOffice-Verzeichnis befinden. Diese zweite Variable heißt
-        <code class="literal">python_uno_path</code> und befindet sich im Abschnitt
-        <code class="literal">environment</code>. Sie ist standardmäßig leer. Werden
-        hier mehrere Pfade angegeben, so müssen diese durch Doppelpunkte
-        voneinander getrennt werden. Der Inhalt wird an den Python-Interpreter
-        über die Umgebungsvariable <code class="literal">PYTHONPATH</code>
-        übergeben.</p></td></tr></table></div><p>Ist <code class="literal">$openofficeorg_daemon</code> nicht gesetzt, so
-      wird für jedes Dokument LibreOffice bzw. OpenOffice neu gestartet und
-      die Konvertierung mit Hilfe eines Makros durchgeführt. Dieses Makro muss
-      in der Dokumentenvorlage enthalten sein und
-      “Standard.Conversion.ConvertSelfToPDF()” heißen. Die Beispielvorlage
-      ‘<code class="literal">templates/print/rev-odt/invoice.odt</code>’ enthält ein
-      solches Makro, das in jeder anderen Dokumentenvorlage ebenfalls
-      enthalten sein muss.</p><p>Als letztes muss herausgefunden werden, welchen Namen OpenOffice
-      bzw. LibreOffice dem Verzeichnis mit den Benutzereinstellungen gibt.
-      Unter Debian ist dies momentan <code class="literal">~/.config/libreoffice</code>.
-      kivitendo verwendet das Verzeichnis
-      <code class="literal">users/.openoffice.org2</code>. Eventuell muss dieses
-      Verzeichnis umbenannt werden.</p><p>Dieses Verzeichnis, wie auch das komplette
-      <code class="literal">users</code>-Verzeichnis, muss vom Webserver beschreibbar
-      sein. Dieses wurde bereits erledigt (siehe <a class="xref" href="ch02s03.html" title="2.3. Manuelle Installation des Programmpaketes">Manuelle Installation des Programmpaketes</a>), kann aber erneut
-      überprüft werden, wenn die Konvertierung nach PDF fehlschlägt.</p><div class="sect2" title="2.13.1. OpenDocument (odt) Druckvorlagen mit Makros"><div class="titlepage"><div><div><h3 class="title"><a name="d0e2489"></a>2.13.1. OpenDocument (odt) Druckvorlagen mit Makros</h3></div></div></div><p>OpenDocument Vorlagen können Makros enthalten, welche komplexere
-        Aufgaben erfüllen.</p><p>Der Vorlagensatz "rev-odt" enthält solche Vorlagen mit <span class="bold"><strong>Schweizer Bank-Einzahlungsscheinen (BESR)</strong></span>.
-        Diese Makros haben die Aufgabe, die in den Einzahlungsscheinen
-        benötigte Referenznummer und Kodierzeile zu erzeugen. Hier eine kurze
-        Beschreibung, wie die Makros aufgebaut sind, und was bei ihrer Nutzung
-        zu beachten ist (<span class="bold"><strong>in fett sind nötige einmalige
-        Anpassungen aufgeführt</strong></span>):</p><div class="sect3" title="2.13.1.1. Bezeichnung der Vorlagen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2502"></a>2.13.1.1. Bezeichnung der Vorlagen</h4></div></div></div><p>Rechnung: invoice_besr.odt, Auftrag:
-          sales_order_besr.odt</p></div><div class="sect3" title="2.13.1.2. Vorbereitungen im Adminbereich"><div class="titlepage"><div><div><h4 class="title"><a name="opendocument-druckvorlagen-mit-makros.vorbereitungen"></a>2.13.1.2. Vorbereitungen im Adminbereich</h4></div></div></div><p>Damit beim Erstellen von Rechnungen und Aufträgen neben der
-          Standardvorlage ohne Einzahlungsschein weitere Vorlagen (z.B. mit
-          Einzahlungsschein) auswählbar sind, muss für jedes Vorlagen-Suffix
-          ein Drucker eingerichtet werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Druckeradministration → Drucker hinzufügen</p></li><li class="listitem"><p>Mandant wählen</p></li><li class="listitem"><p>Druckerbeschreibung → aussagekräftiger Text: wird in der
-              Auftrags- bzw. Rechnungsmaske als Auswahl angezeigt (z.B. mit
-              Einzahlungsschein Bank xy)</p></li><li class="listitem"><p>Druckbefehl → beliebiger Text (hat für das Erzeugen von
-              Aufträgen oder Rechnungen als odt-Datei keine Bedeutung, darf
-              aber nicht leer sein)</p></li><li class="listitem"><p>Vorlagenkürzel → besr bzw. selbst gewähltes Vorlagensuffix
-              (muss genau der Zeichenfolge entsprechen, die zwischen
-              "invoice_" bzw. "sales_order_" und ".odt" steht.)</p></li><li class="listitem"><p>speichern</p></li></ul></div></div><div class="sect3" title="2.13.1.3. Benutzereinstellungen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2531"></a>2.13.1.3. Benutzereinstellungen</h4></div></div></div><p>Wer den Ausdruck mit Einzahlungsschein als Standardeinstellung
-          im Rechnungs- bzw. Auftragsformular angezeigt haben möchte, kann
-          dies persönlich für sich bei den Benutzereinstellungen
-          konfigurieren:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Programm → Benutzereinstellungen → Druckoptionen</p></li><li class="listitem"><p>Standardvorlagenformat → OpenDocument/OASIS</p></li><li class="listitem"><p>Standardausgabekanal → Bildschirm</p></li><li class="listitem"><p>Standarddrucker → gewünschte Druckerbeschreibung auswählen
-              (z.B. mit Einzahlungsschein Bank xy)</p></li><li class="listitem"><p>Anzahl Kopien → leer</p></li><li class="listitem"><p>speichern</p></li></ul></div></div><div class="sect3" title="2.13.1.4. Aufbau und nötige Anpassungen der Vorlagen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2555"></a>2.13.1.4. Aufbau und nötige Anpassungen der Vorlagen</h4></div></div></div><p>In der Vorlage sind als Modul "BESR" 4 Makros gespeichert, die
-          aus dem von kivitendo erzeugten odt-Dokument die korrekte
-          Referenznummer inklusive Prüfziffer sowie die Kodierzeile in
-          OCRB-Schrift erzeugen und am richtigen Ort ins Dokument
-          schreiben.</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Für den Einzahlungsschein ist die letzte Seite des
-              Dokuments reserviert</p></li><li class="listitem"><p>Direkt über dem Einzahlungsschein enthält die Vorlage eine
-              Zeile mit folgenden Angaben (<span class="bold"><strong>Bank-Konto-Identifikationsnummer und
-              Postkonto-Nummer der Bank müssen gemäss Angaben der jeweiligen
-              Bank angepasst werden</strong></span>):</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>DDDREF: 4 Werte zum Bilden der Referenznummer
-                    (jeweils durch einen Leerschlag getrennt): </p><div class="itemizedlist"><ul class="itemizedlist" type="square"><li class="listitem"><p>erster Wert: <span class="bold"><strong>Bank-Konto-Identifikation</strong></span>
-                          (nur Ziffern, maximal 6), <span class="bold"><strong>muss
-                          angepasst werden</strong></span>.</p></li><li class="listitem"><p>zweiter Wert: &lt;%customernumber%&gt;
-                          (Kundennummer: nur Ziffern, maximal 6)</p></li><li class="listitem"><p>dritter Wert: &lt;%ordnumber%&gt;
-                          (Auftragsnummer bei Auftragsvorlage
-                          sales_oder_besr.odt, sonst 0) maximal 7 Ziffern,
-                          führende Buchstaben werden vom Makro entfernt</p></li><li class="listitem"><p>vierter Wert: &lt;%invnumber%&gt;
-                          (Rechnungsnummer bei Rechnungsvorlage
-                          invoice_besr.odt, sonst 0) maximal 7 Ziffern,
-                          führende Buchstaben werden vom Makro entfernt</p></li></ul></div><p>
-                              </p></li><li class="listitem"><p>DDDKONTO: <span class="bold"><strong>Postkonto-Nummer der
-                    Bank, muss angepasst werden</strong></span>.</p></li><li class="listitem"><p>DDDBETRAG: &lt;%total%&gt; Einzahlungsbetrag oder 0,
-                    falls Einzahlungsschein ohne Betrag</p></li><li class="listitem"><p>DDDEND: muss am Ende der Zeile vorhanden sein</p></li></ul></div><p>
-                     </p></li><li class="listitem"><p>
-                        <span class="bold"><strong>Im Einzahlungsschein selbst müssen
-              der Name und die Adresse der Bank, die Postkonto-Nummer der
-              Bank, sowie der eigene Firmenname und die Firmenadresse
-              angepasst werden.</strong></span> Dabei ist darauf zu achten, dass
-              sich die Positionen der Postkonto-Nummern der Bank, sowie der
-              Zeichenfolgen dddfr, DDDREF1, DDDREF2, 609, DDDKODIERZEILE nicht
-              verschieben.</p></li></ul></div><div class="screenshot"><div class="mediaobject"><img src="images/Einzahlungsschein_Makro.png"></div></div></div><div class="sect3" title="2.13.1.5. Auswahl der Druckvorlage in kivitendo beim Erzeugen einer odt-Rechnung (analog bei Auftrag)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2619"></a>2.13.1.5. Auswahl der Druckvorlage in kivitendo beim Erzeugen einer
-          odt-Rechnung (analog bei Auftrag)</h4></div></div></div><p>Im Fussbereich der Rechnungsmaske muss neben Rechnung,
-          OpenDocument/OASIS und Bildschirm die im Adminbereich erstellte
-          Druckerbeschreibung ausgewählt werden, falls diese nicht bereits bei
-          den Benutzereinstellungen als persönlicher Standard gewählt
-          wurde.</p></div><div class="sect3" title="2.13.1.6. Makroeinstellungen in LibreOffice anpassen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2624"></a>2.13.1.6. Makroeinstellungen in LibreOffice anpassen</h4></div></div></div><p>Falls beim Öffnen einer von kivitendo erzeugten odt-Rechnung
-          die Meldung kommt, dass Makros aus Sicherheitsgründen nicht
-          ausgeführt werden, so müssen folgende Einstellungen in LibreOffice
-          angepasst werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Extras → Optionen → Sicherheit → Makrosicherheit</p></li><li class="listitem"><p>Sicherheitslevel auf "Mittel" einstellen (Diese
-              Einstellung muss auf jedem Computer durchgeführt werden, mit dem
-              von kivitendo erzeugte odt-Rechnungen oder Aufträge geöffnet
-              werden.)</p></li><li class="listitem"><p>Beim Öffnen einer odt-Rechnung oder eines odt-Auftrags bei
-              der entsprechenden Nachfrage "Makros ausführen"
-              auswählen.</p><p>
-                        <span class="bold"><strong>Wichtig</strong></span>: die Makros sind
-              so eingestellt, dass sie beim Öffnen der Vorlagen selbst nicht
-              ausgeführt werden. Das heisst für das Ansehen und Bearbeiten der
-              Vorlagen sind keine speziellen Einstellungen in LibreOffice
-              nötig.</p></li></ul></div></div></div><div class="sect2" title="2.13.2. Schweizer QR-Rechnung mit OpenDocument Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e2644"></a>2.13.2. Schweizer QR-Rechnung mit OpenDocument Vorlagen</h3></div></div></div><div class="sect3" title="2.13.2.1. Übersicht"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2647"></a>2.13.2.1. Übersicht</h4></div></div></div><p>Mit der Version 3.6.0 unterstützt Kivitendo die Erstellung von
-          Schweizer QR-Rechnungen gemäss <a class="ulink" href="https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-de.pdf" target="_top">Swiss
-          Payment Standards, Version 2.2</a>. Implementiert sind hierbei die
-          Varianten:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                        <span class="bold"><strong>QR-IBAN mit
-              QR-Referenz</strong></span>
-                     </p></li><li class="listitem"><p>
-                        <span class="bold"><strong>IBAN ohne Referenz</strong></span>
-                     </p></li></ul></div><p>Der Vorlagensatz "rev-odt" enthält die Vorlage
-          <code class="literal">invoice_qr.odt</code>, welche für die Erstellung von
-          QR-Rechnungen vorgesehen ist. Damit diese verwendet werden kann muss
-          wie obenstehend beschrieben ein Drucker hinzugefügt werden (siehe
-          <a class="xref" href="ch02s13.html#opendocument-druckvorlagen-mit-makros.vorbereitungen" title="2.13.1.2. Vorbereitungen im Adminbereich">Abschnitt&nbsp;2.13.1.2, „Vorbereitungen im Adminbereich“</a>
-          ). Alternativ kann die Vorlage umbenannt werden in
-          <code class="literal">invoice.odt</code>.</p><p>Die Vorlage <code class="literal">invoice_qr.odt</code> kann beliebig
-          angepasst werden. Zwingend muss diese jedoch das QR-Code Platzhalter
-          Bild, als eingebettetes Bild, enthalten. Da dieses beim
-          Ausdrucken/Erzeugen der Rechnung durch das neu generierte QR-Code
-          Bild ersetzt wird.</p></div><div class="sect3" title="2.13.2.2. Einstellungen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2683"></a>2.13.2.2. Einstellungen</h4></div></div></div><div class="sect4" title="2.13.2.2.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h5 class="title"><a name="d0e2686"></a>2.13.2.2.1. Mandantenkonfiguration</h5></div></div></div><p>Unter <span class="emphasis"><em>System → Mandantenkonfiguration →
-            Features</em></span>. Im Abschnitt <span class="emphasis"><em>Einkauf und
-            Verkauf</em></span>, beim Punkt <span class="emphasis"><em>Verkaufsrechnungen mit
-            Schweizer QR-Rechnung erzeugen</em></span>, die gewünschte Variante
-            wählen.</p></div><div class="sect4" title="2.13.2.2.2. Konfiguration der Bankkonten"><div class="titlepage"><div><div><h5 class="title"><a name="d0e2700"></a>2.13.2.2.2. Konfiguration der Bankkonten</h5></div></div></div><p>Unter <span class="emphasis"><em>System → Bankkonten</em></span> muss bei
-            mindestens einem Bankkonto die Option <span class="emphasis"><em>Nutzung mit
-            Schweizer QR-Rechnung</em></span> auf <span class="bold"><strong>Ja</strong></span> gestellt werden.</p><div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Tip"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Tipp]" src="system/docbook-xsl/images/tip.png"></td><th align="left">Tipp</th></tr><tr><td align="left" valign="top"><p>Für die Variante <span class="bold"><strong>QR-IBAN mit
-              QR-Referenz</strong></span> muss dieses Konto unter IBAN eine gültige
-              <span class="bold"><strong>QR-IBAN Nummer</strong></span> enthalten. Diese
-              unterscheidet sich von der regulären IBAN.</p><p>Zusätzlich muss eine gültige <span class="bold"><strong>Bankkonto
-              Identifikationsnummer</strong></span> angegeben werden
-              (6-stellig).</p><p>Diese werden von der jeweiligen Bank vergeben.</p></td></tr></table></div><p>Sind mehrere Konten ausgewählt wird das erste
-            verwendet.</p></div><div class="sect4" title="2.13.2.2.3. Rechnungen ohne Betrag"><div class="titlepage"><div><div><h5 class="title"><a name="d0e2732"></a>2.13.2.2.3. Rechnungen ohne Betrag</h5></div></div></div><p>Für Rechnungen ohne Betrag (z.B. Spenden) kann, in der
-            jeweiligen Rechnung, die Checkbox <span class="emphasis"><em>QR-Rechnung ohne
-            Betrag</em></span> aktiviert werden. Diese Checkbox erscheint nur,
-            wenn QR-Rechnungen in der Mandantenkonfiguration aktiviert sind
-            (variante ausgewählt).</p><p>Dies wirkt sich lediglich auf den erzeugten QR-Code aus. Die
-            Vorlage muss separat angepasst und ausgewählt werden.</p></div></div><div class="sect3" title="2.13.2.3. Adressdaten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2742"></a>2.13.2.3. Adressdaten</h4></div></div></div><p>Die Adressdaten zum Zahlungsempfänger werden aus der
-          Mandantenkonfiguration entnommen. Unter <span class="emphasis"><em>System →
-          Mandantenkonfiguration → Verschiedenes</em></span>, Abschnitt
-          <span class="emphasis"><em>Firmenname und -adresse.</em></span>
-               </p><p>Die Adressdaten zum Zahlungspflichtigen stammen aus den
-          Kundendaten der jeweiligen Rechnung.</p><p>Die Adressen müssen inklusive Land angegeben werden. Akzeptiert
-          werden Ländername oder Ländercode, also z.B. "Schweiz" oder "CH".
-          </p><p>Diese können in der Vorlage mit den jeweiligen Variablen
-          eingetragen werden. Siehe auch: <a class="xref" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen">Abschnitt&nbsp;3.3, „Dokumentenvorlagen und verfügbare Variablen“</a>
-               </p><p>Der erzeugte QR-Code verwendet Adress-Typ "K" (Kombinierte
-          Adressfelder, 2 Zeilen).</p></div><div class="sect3" title="2.13.2.4. Referenznummer"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2763"></a>2.13.2.4. Referenznummer</h4></div></div></div><p>Die Referenznummer wird in Kivitendo erzeugt und setzt sich
-          wiefolgt zusammen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Bankkonto Identifikationsnummer (6-stellig)</p></li><li class="listitem"><p>Kundennummer (6-stellig, mit führenden Nullen
-              aufgefüllt)</p></li><li class="listitem"><p>Auftragsnummer (7-stellig, mit führenden Nullen
-              aufgefüllt)</p></li><li class="listitem"><p>Rechnungsnummer (7-stellig, mit führenden Nullen
-              aufgefüllt)</p></li><li class="listitem"><p>Prüfziffer (1-stellig, berechnet mittels modulo 10,
-              rekursiv)</p></li></ul></div><p>Es sind lediglich Ziffern erlaubt. Allfällige Prefixe mit
-          Buchstaben werden entfernt und fehlende Stellen werden mit führenden
-          Nullen aufgefüllt.</p></div><div class="sect3" title="2.13.2.5. Zusätzliche Variablen für Vorlage"><div class="titlepage"><div><div><h4 class="title"><a name="d0e2786"></a>2.13.2.5. Zusätzliche Variablen für Vorlage</h4></div></div></div><p>Zusätzlich zu den in der Vorlage standardmässig verfügbaren
-          Variablen (siehe <a class="xref" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen">Abschnitt&nbsp;3.3, „Dokumentenvorlagen und verfügbare Variablen“</a>),
-          werden die folgenden Variablen erzeugt:</p><div class="variablelist"><dl><dt><span class="term">ref_number_formatted</span></dt><dd><p>Referenznummer formatiert mit Leerzeichen, z.B.: 21 00000
-                00003 13947 14300 09017</p></dd><dt><span class="term">iban_formatted</span></dt><dd><p>IBAN formatiert mit Leerzeichen</p></dd><dt><span class="term">amount_formatted</span></dt><dd><p>Betrag formatiert mit Tausendertrennzeichen Leerschlag,
-                z.B.: 1 005.55</p></dd></dl></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s12.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s14.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.12. Drucken mit kivitendo&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.14. Nomenklatur</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.13. E-Mail</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s12.html" title="2.12. Drucker- und Systemverwaltung"><link rel="next" href="ch02s14.html" title="2.14. Drucken mit kivitendo"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.13. E-Mail</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s12.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s14.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.13. E-Mail"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Email"></a>2.13. E-Mail</h2></div></div></div><p>
+          kivitendo kann sowohl E-Mails direkt aus dem Programm heraus E-Mails
+          versenden, als auch in das Programm importiern. Damit dies
+          funktioniert, müssen die E-Mail-Parameter korrekt konfiguriert sein.
+          Dazu mehr in den folgenden Abschnitten.
+        </p><div class="sect2" title="2.13.1. E-Mail-Versand aus kivitendo heraus"><div class="titlepage"><div><div><h3 class="title"><a name="config.sending-email"></a>2.13.1. E-Mail-Versand aus kivitendo heraus</h3></div></div></div><p>Das Versenden von E-Mails kann zum Verschicken von Belegen genutzt
+        werden, z.B. um ein Angebot direkt an einen Kunden zu verschicken. Damit
+        dies funktioniert, muss eingestellt werden, über welchen Server die
+        E-Mails verschickt werden sollen. kivitendo unterstützt dabei zwei
+        Mechanismen: Versand über einen lokalen E-Mail-Server (z.B. mit
+        <span class="productname">Postfix</span>™ oder <span class="productname">Exim</span>™,
+        was auch die standardmäßig aktive Methode ist) sowie Versand über einen
+        SMTP-Server (z.B. der des eigenen Internet-Providers).</p><p>Welche Methode und welcher Server verwendet werden, wird über die
+        Konfigurationsdatei <code class="filename">config/kivitendo.conf</code>
+        festgelegt. Dort befinden sich alle Einstellungen zu diesem Thema im
+        Abschnitt '<code class="literal">[mail_delivery]</code>'.</p><div class="sect3" title="2.13.1.1. Versand über lokalen E-Mail-Server"><div class="titlepage"><div><div><h4 class="title"><a name="config.sending-email.sendmail"></a>2.13.1.1. Versand über lokalen E-Mail-Server</h4></div></div></div><p>Diese Methode bietet sich an, wenn auf dem Server, auf dem
+          kivitendo läuft, bereits ein funktionsfähiger E-Mail-Server wie z.B.
+          <span class="productname">Postfix</span>™, <span class="productname">Exim</span>™
+          oder <span class="productname">Sendmail</span>™ läuft.</p><p>Um diese Methode auszuwählen, muss der Konfigurationsparameter
+          '<code class="literal">method = sendmail</code>' gesetzt sein. Dies ist
+          gleichzeitig der Standardwert, falls er nicht verändert wird.</p><p>Um zu kontrollieren, wie das Programm zum Einliefern gestartet
+          wird, dient der Parameter '<code class="literal">sendmail = ...</code>'. Der
+          Standardwert verweist auf das Programm
+          <code class="filename">/usr/bin/sendmail</code>, das bei allen oben genannten
+          E-Mail-Serverprodukten für diesen Zweck funktionieren sollte.</p><p>Die Konfiguration des E-Mail-Servers selber würde den Rahmen
+          dieses sprengen. Hierfür sei auf die Dokumentation des E-Mail-Servers
+          verwiesen.</p></div><div class="sect3" title="2.13.1.2. Versand über einen SMTP-Server"><div class="titlepage"><div><div><h4 class="title"><a name="config.sending-email.smtp"></a>2.13.1.2. Versand über einen SMTP-Server</h4></div></div></div><p>Diese Methode bietet sich an, wenn kein lokaler E-Mail-Server
+          vorhanden ist oder einer vorhanden, dieser aber nicht konfiguriert
+          ist.</p><p>Um diese Methode auszuwählen, muss der Konfigurationsparameter
+          '<code class="literal">method = smtp</code>' gesetzt sein. Die folgenden
+          Parameter dienen dabei der weiteren Konfiguration:</p><div class="variablelist"><dl><dt><span class="term">
+                        <code class="varname">hostname</code>
+                     </span></dt><dd><p>Name oder IP-Adresse des SMTP-Servers. Standardwert:
+                '<code class="literal">localhost</code>'</p></dd><dt><span class="term">
+                        <code class="varname">port</code>
+                     </span></dt><dd><p>Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<code class="literal">security =
+                none</code>' oder '<code class="literal">security = tls</code>', so ist
+                25 die Standardportnummer. Für '<code class="literal">security =
+                ssl</code>' ist 465 die Portnummer. Muss normalerweise nicht
+                geändert werden.</p></dd><dt><span class="term">
+                        <code class="varname">security</code>
+                     </span></dt><dd><p>Wahl der zu verwendenden Verschlüsselung der Verbindung
+                mit dem Server. Standardwert ist '<code class="literal">none</code>',
+                wodurch keine Verschlüsselung verwendet wird. Mit
+                '<code class="literal">tls</code>' wird TLS-Verschlüsselung eingeschaltet,
+                und mit '<code class="literal">ssl</code>' wird Verschlüsselung via SSL
+                eingeschaltet. Achtung: Für '<code class="literal">tls</code>' und
+                '<code class="literal">ssl</code>' werden zusätzliche Perl-Module benötigt
+                (siehe unten).</p></dd><dt><span class="term">
+                        <code class="varname">login</code> und
+              <code class="varname">password</code>
+                     </span></dt><dd><p>Falls der E-Mail-Server eine Authentifizierung verlangt,
+                so können mit diesen zwei Parametern der Benutzername und das
+                Passwort angegeben werden. Wird Authentifizierung verwendet, so
+                sollte aus Sicherheitsgründen auch eine Form von Verschlüsselung
+                aktiviert werden.</p></dd></dl></div></div></div><div class="sect2" title="2.13.2. Versendete E-Mails über IMAP exportieren"><div class="titlepage"><div><div><h3 class="title"><a name="config.sent_emails_in_imap"></a>2.13.2. Versendete E-Mails über IMAP exportieren</h3></div></div></div><p>
+          Es können versendete E-Mails über IMAP exportiert werden. Dazu muss
+          der entsprechende Server, auf dem die E-Mails abgelegt werden
+          sollen, konfiguriert werden. Dies geschieht in der Konfigurationsdatei
+          <code class="filename">config/kivitendo.conf</code> im Abschnitt
+          '<code class="literal">[sent_emails_in_imap]</code>'. Es können auch Server für
+          spezifische E-Mail-Adressen konfiguriert werden, indem der Abschnitt
+          kopiert wird und mit dem Namen
+          '<code class="literal">[sent_emails_in_imap/email/EMAILADDRESS]</code>', wobei
+          '<code class="literal">EMAILADDRESS</code>' die entsprechenden E-Mail-Adresse
+          ist, versehen wird.
+        </p><p>
+          Die Reihenfolge für die Auswahl der Konfiguration ist wie folgt:
+        </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p> Falls es für die Absender-Adresse eine Konfiguration gibt nimm
+            diese. </p></li><li class="listitem"><p> Falls es es für die benutzerbezogene E-Mail-Adresse eine
+            Konfiguration gibt dann nimm diese. </p></li><li class="listitem"><p> Falls es eine generelle Konfiguration gibt dann nimm diese.
+            </p></li></ol></div><p>Die folgenden Parameter dienen der Konfiguration:</p><div class="variablelist"><dl><dt><span class="term">
+                     <code class="varname">enabled</code>
+                  </span></dt><dd><p>
+                Falls '<code class="literal">enabled = 0</code>' gesetzt ist, wird der
+                Export von E-Mails deaktiviert. Dies ist der Standardwert. Falls
+                '<code class="literal">enabled = 1</code>' gesetzt ist, wird ist der
+                Export von E-Mails aktiviert.
+              </p></dd><dt><span class="term">
+                     <code class="varname">hostname</code>
+                  </span></dt><dd><p>Name oder IP-Adresse des IMAP-Servers. Standardwert:
+              '<code class="literal">localhost</code>'</p></dd><dt><span class="term">
+                     <code class="varname">port</code>
+                  </span></dt><dd><p>
+                Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<code class="literal">ssl = 1</code>',
+                so ist 993 die Standardportnummer. Für
+                '<code class="literal">ssl = 0</code>' ist 143 die Portnummer. Muss
+                normalerweise nicht geändert werden.
+              </p></dd><dt><span class="term">
+                     <code class="varname">ssl</code>
+                  </span></dt><dd><p>
+                Wahl ob eine Verschlüsselung bei der Verbindung mit dem Server
+                verwendet wird. Standardwert ist '<code class="literal">1</code>',
+                wodurch eine SSL-Verschlüsselung verwendet wird. Mit
+                '<code class="literal">0</code>' wird keine Verschlüsselung genutzt.
+              </p></dd><dt><span class="term">
+                     <code class="varname">username</code> und
+            <code class="varname">password</code>
+                  </span></dt><dd><p>
+                Falls der IMAP-Server eine Authentifizierung verlangt, so können
+                mit diesen zwei Parametern der Nutzername und das Passwort
+                angegeben werden. Wird Authentifizierung verwendet, so sollte
+                aus Sicherheitsgründen auch Verschlüsselung aktiviert werden.
+              </p></dd><dt><span class="term">
+                     <code class="varname">folder</code>
+                  </span></dt><dd><p>
+                Wahl des Ordners, in den kivitendo gesendete E-Mails
+                gespeichert. Standardwert ist
+                '<code class="literal">Sent/Kivitendo</code>'. Ordnerhierarchien können
+                mit einem Slash ('<code class="literal">/</code>') getrennt werden.
+                Der gewählte Ordner muss existieren.
+              </p></dd></dl></div><p>
+          Bei einem Fehler bricht die Funktion ab und der Anwender bekommt die
+          Fehlermeldung, dass die E-Mail prinzipiell nicht verschickt werden
+          konnte. An dieser Stelle muss der kivitendo-Admin etwas genauer
+          prüfen, ob der Mail-Versand und/oder die Synchronisation den Fehler
+          verursacht hat. Ein Blick ins Email-Journal kann helfen den Fehler
+          einzuschränken.
+        </p></div><div class="sect2" title="2.13.3. E-Mails in kivitendo importieren"><div class="titlepage"><div><div><h3 class="title"><a name="config.imap_client"></a>2.13.3. E-Mails in kivitendo importieren</h3></div></div></div><p>
+          Um E-Mails in kivitendo zu importieren, muss der entsprechende
+          Server, von dem die E-Mails abgeholt werden sollen, konfiguriert
+          werden. Dies geschieht in der Konfigurationsdatei
+          <code class="filename">config/kivitendo.conf</code> im Abschnitt
+          '<code class="literal">[imap_client]</code>'.
+        </p><p>Die folgenden Parameter dienen der Konfiguration:</p><div class="variablelist"><dl><dt><span class="term">
+                     <code class="varname">enabled</code>
+                  </span></dt><dd><p>
+                Falls '<code class="literal">enabled = 0</code>' gesetzt ist, wird der
+                Import von E-Mails deaktiviert. Dies ist der Standardwert. Falls
+                '<code class="literal">enabled = 1</code>' gesetzt ist, wird ist der
+                Import von E-Mails aktiviert.
+              </p></dd><dt><span class="term">
+                     <code class="varname">hostname</code>
+                  </span></dt><dd><p>Name oder IP-Adresse des IMAP-Servers. Standardwert:
+              '<code class="literal">localhost</code>'</p></dd><dt><span class="term">
+                     <code class="varname">port</code>
+                  </span></dt><dd><p>
+                Portnummer. Der Standardwert hängt von der verwendeten
+                Verschlüsselungsmethode ab. Gilt '<code class="literal">ssl = 1</code>',
+                so ist 993 die Standardportnummer. Für
+                '<code class="literal">ssl = 0</code>' ist 143 die Portnummer. Muss
+                normalerweise nicht geändert werden.
+              </p></dd><dt><span class="term">
+                     <code class="varname">ssl</code>
+                  </span></dt><dd><p>
+                Wahl, ob eine Verschlüsselung bei der Verbindung mit dem Server
+                verwendendet wird. Standardwert ist '<code class="literal">1</code>',
+                wodurch eine SSL-Verschlüsselung verwendet wird. Mit
+                '<code class="literal">0</code>' wird keine Verschlüsselung genutzt.
+              </p></dd><dt><span class="term">
+                     <code class="varname">username</code> und
+            <code class="varname">password</code>
+                  </span></dt><dd><p>
+                Falls der IMAP-Server eine Authentifizierung verlangt, so können
+                mit diesen zwei Parametern der Nutzername und das Passwort
+                angegeben werden. Wird Authentifizierung verwendet, so sollte
+                aus Sicherheitsgründen auch Verschlüsselung aktiviert werden.
+              </p></dd><dt><span class="term">
+                     <code class="varname">base_folder</code>
+                  </span></dt><dd><p>
+                Wahl des Ordners, den kivitendo als Basis für das Erstellen von
+                Unterordnern und das Abholen von E-Mails verwendet. Standardwert
+                ist '<code class="literal">INBOX</code>'. Ordnerhierarchien können mit
+                einem Slash ('<code class="literal">/</code>') getrennt werden. Beispiel:
+                '<code class="literal">INBOX/kivitendo</code>'. In diesem Ordner dürfen
+                keine Unterordner existieren und keine manuell angelegt werden.
+              </p></dd></dl></div><p>
+          Wenn eingeschaltet, wird beim Anlegen von Verkaufsangeboten und
+          -aufträgen ein Unterordner im E-Mail-Client für den entsprechenden
+          Beleg angelegt. E-Mails, in diesen Ordner werden automatisch beim
+          Öffnen des Belegs in kivitendo importiert. Um die E-Mails übersichtlich
+          zu halten, kann der Hintergrund-Job
+          '<code class="literal">CleanUpEmailSubfolders</code>' genutzt werden. Dieser
+          importiert alle E-Mails und löscht alle Unterordnern, die nicht zu
+          einem offenen Beleg gehören. Importierte E-Mails werden nicht
+          gelöscht; erst beim Löschen des Unterordners werden sie gelöscht.
+        </p><p>
+          Es können auch E-Mails in kivitendo importiert werden, die nicht zu
+          einem Beleg gehören. Dafür kann der Hintergrund-Job
+          '<code class="literal">SyncEmailFolder</code>' verwendet werden. Dieser
+          synchronisiert standartmäßig den Ordner der in
+          '<code class="literal">base_folder</code>' angegeben ist. Dies kann mit dem
+          Job-Parameter '<code class="literal">folder</code>' geändert. Die Importierten
+          E-Mails werden im E-Mail-Journal gespeichert.
+        </p><p>
+          Beim Umzug des E-Mail-Servers kann kivitendo schon
+          importierte E-Mails nicht mehr erkennen. Dies führt dazu, dass alle
+          E-Mails erneut importiert werden.
+        </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s12.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s14.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.12. Drucker- und Systemverwaltung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.14. Drucken mit kivitendo</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s14.html b/doc/html/ch02s14.html
index 305687cee..9f109fdbc 100644
--- a/doc/html/ch02s14.html
+++ b/doc/html/ch02s14.html
@@ -1,21 +1,225 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.14. Nomenklatur</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s13.html" title="2.13. OpenDocument-Vorlagen"><link rel="next" href="ch02s15.html" title="2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.14. Nomenklatur</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s13.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s15.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.14. Nomenklatur"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="nomenclature"></a>2.14. Nomenklatur</h2></div></div></div><div class="sect2" title="2.14.1. Datum bei Buchungen"><div class="titlepage"><div><div><h3 class="title"><a name="booking.dates"></a>2.14.1. Datum bei Buchungen</h3></div></div></div><p>Seit der Version 3.5 werden für Buchungen in kivitendo
-        einheitlich folgende Bezeichnungen verwendet:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
-                     <code class="option">Erfassungsdatum</code> (en: <code class="option">Entry
-            Date</code>, code: <code class="option">Gldate</code>)</p><p>bezeichnet das Datum, an dem die Buchung in kivitendo
-            erfasst wurde.</p></li><li class="listitem"><p>
-                     <code class="option">Buchungsdatum</code> (en: <code class="option">Booking
-            Date</code>, code: <code class="option">Transdate</code>)</p><p>bezeichnet das buchhaltungstechnisch für eine Buchung
-            relevante Datum</p><p>Das <code class="option">Rechnungsdatum</code> bei Verkaufs- und
-            Einkaufsrechnungen entspricht dem Buchungsdatum. Das heisst, in
-            Berichten wie dem Buchungsjournal, in denen eine Spalte
-            <code class="option">Buchungsdatum</code> angezeigt werden kann, erscheint
-            hier im Fall von Rechnungen das Rechnungsdatum.</p></li><li class="listitem"><p>Bezieht sich ein verbuchter Beleg auf einen Zeitpunkt, der
-            nicht mit dem Buchungsdatum übereinstimmt, so kann dieses Datum
-            momentan in kivitendo nur unter Bemerkungen erfasst werden.</p><p>Möglicherweise wird für solche Fälle in einer späteren
-            Version von kivitendo ein dritter Datumswert für Buchungen
-            erstellt. (Beispiel: Einkaufsbeleg stammt aus einem früheren Jahr,
-            das bereits buchhaltungstechnisch abgeschlossen wurde, und muss
-            deshalb später verbucht werden.)</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s13.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s15.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.13. OpenDocument-Vorlagen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
-      EUR</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.14. Drucken mit kivitendo</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s13.html" title="2.13. E-Mail"><link rel="next" href="ch02s15.html" title="2.15. OpenDocument-Vorlagen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.14. Drucken mit kivitendo</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s13.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s15.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.14. Drucken mit kivitendo"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Drucken-mit-kivitendo"></a>2.14. Drucken mit kivitendo</h2></div></div></div><p>Das Drucksystem von kivitendo benutzt von Haus aus LaTeX-Vorlagen.
+      Um drucken zu können, braucht der Server ein geeignetes LaTeX System. Am
+      einfachsten ist dazu eine <code class="literal">texlive</code> Installation. Unter
+      debianoiden Betriebssystemen installiert man die Pakete mit:</p><p>
+            </p><pre class="programlisting">apt install texlive-base-bin texlive-latex-recommended texlive-fonts-recommended \
+  texlive-latex-extra texlive-lang-german ghostscript latexmk</pre><p>
+         </p><p>Für Fedora benötigen Sie die folgenden Pakete:</p><p>
+            </p><pre class="programlisting">dnf install texlive-collection-latex texlive-collection-latexextra \
+  texlive-collection-latexrecommended texlive-collection-langgerman \
+  texlive-collection-langenglish</pre><p>
+         </p><p>Für openSUSE benötigen Sie die folgenden Pakete:</p><p>
+            </p><pre class="programlisting">zypper install texlive-collection-latex texlive-collection-latexextra \
+  texlive-collection-latexrecommended texlive-collection-langgerman \
+  texlive-collection-langenglish</pre><p>
+         </p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>kivitendo erwartet eine aktuelle TeX Live Umgebung, um PDF/A zu erzeugen. Aktuelle Distributionen von 2020 erfüllen diese. Überprüfbar ist dies mit dem Aufruf des installation_check.pl mit Parameter -l:</p><p>
+               </p><pre class="programlisting">scripts/installations_check.pl -l</pre><p>
+            </p></td></tr></table></div><p>kivitendo bringt drei alternative Vorlagensätze mit:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>RB</p></li><li class="listitem"><p>marei</p></li><li class="listitem"><p>rev-odt</p></li></ul></div><p>Der ehemalige Druckvorlagensatz "f-tex" wurde mit der Version
+      3.5.6 entfernt, da er nicht mehr gepflegt wird.</p><div class="sect2" title="2.14.1. Vorlagenverzeichnis anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagenverzeichnis-anlegen"></a>2.14.1. Vorlagenverzeichnis anlegen</h3></div></div></div><p>Es lässt sich ein initialer Vorlagensatz erstellen. Die
+        LaTeX-System-Abhängigkeiten hierfür kann man prüfen mit:</p><pre class="programlisting">./scripts/installation_check.pl -lv</pre><p>Der Angemeldete Benutzer muss in einer Gruppe sein, die über das
+        Recht "Konfiguration -&gt; Mandantenverwaltung" verfügt. Siehe auch
+        <a class="xref" href="ch02s11.html#Gruppen-anlegen" title="2.11.4. Gruppen anlegen">Abschnitt&nbsp;2.11.4, „Gruppen anlegen“</a>.</p><p>Im Userbereich lässt sich unter: "<span class="guimenu">System</span>
+        -&gt; <span class="guisubmenu">Mandantenverwaltung</span> -&gt;
+        <span class="guimenuitem">Verschiedenes</span>" die Option "Neue
+        Druckvorlagen aus Vorlagensatz erstellen" auswählen.</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>
+                     <code class="option">Vorlagen auswählen</code>: Wählen Sie hier den
+            Vorlagensatz aus, der kopiert werden soll
+            (<code class="filename">RB</code>, <code class="filename">marei</code> oder
+            <code class="filename">odt-rev</code>.)</p></li><li class="listitem"><p>
+                     <code class="option">Neuer Name</code>: Der Verzeichnisname für den
+            neuen Vorlagensatz. Dieser kann im Rahmen der üblichen Bedingungen
+            für Verzeichnisnamen frei gewählt werden.</p></li></ol></div><p>Nach dem Speichern wird das Vorlagenverzeichnis angelegt und ist
+        für den aktuellen Mandanten ausgewählt. Der gleiche Vorlagensatz kann,
+        wenn er mal angelegt ist, bei mehreren Mandanten verwendet werden.
+        Eventuell müssen Anpassungen (Logo, Erscheinungsbild, etc) noch
+        vorgenommen werden. Den Ordner findet man im Dateisystem unter
+        <code class="filename">./templates/[Neuer Name]</code>
+            </p></div><div class="sect2" title="2.14.2. Der Druckvorlagensatz marei"><div class="titlepage"><div><div><h3 class="title"><a name="Aufbau des marei Vorlagensatzes"></a>2.14.2. Der Druckvorlagensatz marei</h3></div></div></div><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left"><a name="marei.document.link"></a>Anmerkung</th></tr><tr><td align="left" valign="top"><p>Die aktuelle Dokumentation inkl. dem Foliensatz vom kivi-Treffen im August 2023 befindet sich hier:
+            <a class="ulink" href="https://peitex.de/materialien/2023-08-04_kivitendo/" target="_top"> https://peitex.de/materialien/2023-08-04_kivitendo/</a>
+            
+               </p></td></tr></table></div><div class="sect3" title="2.14.2.1. Quickstart – Wo kann was angepasst werden?"><div class="titlepage"><div><div><h4 class="title"><a name="Quickstart %E2%80%93 Wo kann was angepasst werden?"></a>2.14.2.1. Quickstart – Wo kann was angepasst werden?</h4></div></div></div><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left"><a name="do-not-edit-marei"></a>Anmerkung</th></tr><tr><td align="left" valign="top"><p>In keinem Fall sollten Dateien mit der Endung <code class="filename">*.cls</code> oder <code class="filename">*.sty</code> geändert werden. Durch Änderungen an diesen Dateien verhindert man Updates auf neuer Versionen.
+    Zwar kopiert kivitendo die Datei und bearbeitet diese beim Update nicht. Allerdings sind sämtliche Änderungen über die Konfigurationsdateien möglich und erhöhen die Wartbarkeit.</p></td></tr></table></div><div class="itemizedlist"><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>Pfad zu Angaben über Mandant*innen (default: firma)</p></li><li class="listitem"><p>Logo/Briefpapier, falls für alle Mandant*innen in gleicher Struktur. Sonst in der <code class="filename">ident.tex</code>.</p></li><li class="listitem"><p>Layout der Kopf/Fußzeile</p></li><li class="listitem"><p>innerhalb dieser Datei werden auch die folgenden Dateien geladen:</p></li><li class="listitem"><p>
+                           <code class="filename">firma/ident.tex</code> Mandant*innenspezifische Konfiguration, Adressdaten</p></li><li class="listitem"><p>
+                           <code class="filename">firma/$währungskürzel_account.tex</code>
+                        </p></li></ul></div><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                        <code class="filename">insettings.tex</code> :</p></li><li class="listitem"><p>Sprache/Übersetzungen.\\Es muss mindestens eine Sprache angelegt werden!        </p><pre class="programlisting">
+        \item[deutsch.tex] Textschnipsel für Deutsch\\
+                              Dafür eine Sprache mit Vorlagenkürzel DE anlegen
+        \item[english.tex] Textschnipsel für Englisch\\
+                              Dafür eine Sprache mit Vorlagenkürzel EN anlegen
+        </pre><p>
+                     </p></li></ul></div><p>Alle dokumententypspezifischen Einstellungen müssen in der jeweiligen Template-Datei modifiziert werden.</p></div><div class="sect3" title="2.14.2.2. Aufbau"><div class="titlepage"><div><div><h4 class="title"><a name="Aufbau"></a>2.14.2.2. Aufbau</h4></div></div></div><p>Die Grundstruktur besteht je Dokumententyp aus einer Basisdatei und verschiedenen Setup-Dateien.</p><p>Die Basis wurde so überarbeitet, dass Dokumente nun generell auf
+    der Dokumentenklasse <code class="filename">scrartcl.cls</code> basieren und
+    das Paket <code class="filename">kiviletter.sty</code> benutzen.</p><p>Mandant*innenspezifische Konfiguration findet sich in der Datei <code class="filename">insettings.tex</code> und
+    dem Ordner eines spezifischen Mandant*innen (default=*firma/*).</p></div><div class="sect3" title="2.14.2.3. Mandant*innen / Firma"><div class="titlepage"><div><div><h4 class="title"><a name="Mandant*innen / Firma"></a>2.14.2.3. Mandant*innen / Firma</h4></div></div></div><p>Um gleiche Vorlagen für verschiedene Firmen verwenden zu können, wird je
+    nach dem Wert der Kivitendo-Variablen \kivivar{kivicompany} ein
+    Firmenverzeichnis ausgewählt (siehe <code class="filename">insettings.tex</code>), in dem Briefkopf,
+    Identitäten und Währungs-/Kontoeinstellungen hinterlegt sind.
+    \kivivar{kivicompany} enthält den Namen des verwendeten Mandant*innendaten.
+    Ist kein Firmenname eingetragen, so wird das
+    generische Unterverzeichnis *firma* verwendet.</p></div><div class="sect3" title="2.14.2.4. Identitäten"><div class="titlepage"><div><div><h4 class="title"><a name="Identit%C3%A4ten"></a>2.14.2.4. Identitäten</h4></div></div></div><p>In jedem Firmen-Unterverzeichnis soll eine Datei <code class="filename">ident.tex</code>
+    vorhanden sein, die mit |\newcommand| Werte für |\telefon|, |\fax|,
+    |\firma|, |\strasse|, |\ort|, |\ustid|, |\email| und |\homepage| definiert.</p></div><div class="sect3" title="2.14.2.5. Währungen/Konten"><div class="titlepage"><div><div><h4 class="title"><a name="W%C3%A4hrungen/Konten"></a>2.14.2.5. Währungen/Konten</h4></div></div></div><p>Für jede Währung (siehe <code class="filename">insettings.tex</code>) soll eine Datei vorhanden
+    sein, die das Währungssymbol (|\currency|) und folgende Angaben für
+    ein Konto in dieser Währung enthält |\kontonummer|, |\bank|,
+    |\bankleitzahl|, |\bic| und |\iban|.
+    So kann in den Dokumenten je nach Währung ein anderes Konto
+    angegeben werden.
+    Nach demselben Schema können auch weitere, alternative Bankverbindungen
+    angelegt werden, die dann in <code class="filename">insettings.tex</code> als Variable in der Fußzeile eingefügt werden.</p><p>Als Fallback (falls kivitendo keine Währung an das Druckvorlagen-System übergibt)
+    ist Euro eingestellt. Dies lässt sich in der <code class="filename">insettings.tex</code> über das optionale Argument
+    von |\setupCurrencyConfig| anpassen, z.B.</p><pre class="programlisting">
+    \setupCurrencyConfig[chf]{\identpath}{\lxcurrency}</pre><p>für Schweizer Franken als Standardwährung.</p></div><div class="sect3" title="2.14.2.6. Briefbogen/Logos"><div class="titlepage"><div><div><h4 class="title"><a name="Briefbogen/Logos"></a>2.14.2.6. Briefbogen/Logos</h4></div></div></div><p>Eine Hintergrundgrafik oder ein Logo kann in Abhängigkeit vom
+    Medium (z.B. nur beim Verschicken mit E-Mail) eingebunden
+    werden.</p><p>Desweiteren sind (auskommentierte) Beispiele enthalten für eine
+    Grafik als Briefkopf, nur ein Logo, oder ein komplettes A4-PDF
+    als Briefpapier.</p><p>Absolute Positionierung innerhalb des Brief-Layouts ist über die entsprechende Dokumentation des scrlayer-Paketes möglich.
+    Da die Voreinstellungen bereits einige Sonderfälle automatisch berücksichtigen ist mit den Anpassungen Vorsicht geboten.
+    Sämtliche Einstellungen sollten jedoch außerhalb der *.sty-Dateien vorgenommen werden.
+    Anpassungen der <code class="filename">insettings.tex</code> betreffen hierbei alle Mandant*innen. Spezifischere Einstellungen sind über die zugehörige Konfigurationsdatei (<code class="filename">ident.tex</code>) möglich.
+    In diesem Fall kann zum Ende der insettings eine weitere Konfigurationsdatei über die Verwendung von |\identpath| geladen werden. Ein Beispiel ist in der <code class="filename">insettings.tex</code> enthalten.</p></div><div class="sect3" title="2.14.2.7. Fußzeile"><div class="titlepage"><div><div><h4 class="title"><a name="Fu%C3%9Fzeile"></a>2.14.2.7. Fußzeile</h4></div></div></div><p>Die Tabelle im Fuß verwendet die Angaben aus <code class="filename">firma/ident.tex</code> und
+    *firma/<code class="filename">\_account.tex</code>. Ihre Struktur wird in der <code class="filename">insettings.tex</code> definiert.
+    Sie kann anschließend auch Mandant*innenspezifisch überschrieben werden.</p></div><div class="sect3" title="2.14.2.8. Seitenstil/Basislayout"><div class="titlepage"><div><div><h4 class="title"><a name="Seitenstil/Basislayout"></a>2.14.2.8. Seitenstil/Basislayout</h4></div></div></div><p>Das Seitenlayout wird über \pck{scrlayer-scrpage} bestimmt. Die ausführliche Dokumentation findet sich in \cite{scrguide}.
+    Es existieren in der Datei <code class="filename">insettings.tex</code> einige Hinweise zu den Anpassungen. Die Basiskonfiguration ist ebenfalls dort eingetragen.</p><p>Neben den in Abschnitt \ref{sec:options}  beschriebenen Optionen zum Abschalten der Fußzeile kann
+    der Inhalt der Fußzeile über die \pck{scrlayer-scrpage} Makros, wie</p><pre class="programlisting">
+      \cfoot[|\meta{Inhalt auf der ersten Briefseite}|]{|\meta{Inhalt auf folgenden Briefseiten}|}    </pre><p>geändert werden.</p><p>Die Kopfzeile unterscheidet sich von Dokumententyp zu Dokumententyp leicht, da diese über Datenbankvariablen befüllt wird.
+    Hierfür wird das Makro |\ourhead| in der <code class="filename">insettings.tex</code> definiert.</p><pre class="programlisting">
+      \DescribeMacro{\ourhead}\marg{Bezeichner}\marg{Eintrag}\marg{Titel}\marg{Nummer}\marg{Datum}    </pre><p>Diese Definition kann ebenfalls über die <code class="filename">insettings.tex</code> angepasst oder auch nachträglich überschrieben werden:</p><pre class="programlisting">
+      \newcommand{\ourhead}[5] {%
+        \chead{%
+          \makebox[\textwidth]{%
+            \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}%
+            #3%
+            \Ifstr{#4}{}{}{~\nr: #4}%
+            \Ifstr{#5}{}{}{\vom ~ #5}%
+            \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+          }%
+        }%
+      }
+    </pre><p>In der Standard-Einstellung sieht eine Kopfzeile mit obigen Aufruf dann folgendermaßen aus:</p><pre class="programlisting">
+      \newcommand{\ourhead}[5] {%
+          \makebox[\textwidth]{%
+            \Ifstr{#1}{}{}{#1: #2 \hspace{0.7cm}}%
+            #3%
+            \Ifstr{#4}{}{}{~\nr: #4}%
+            \Ifstr{#5}{}{}{\vom ~ #5}%
+            \hspace{0.7cm} - \seite ~ \thepage/\letterlastpage  ~-%
+          }%
+      }
+
+      \begingroup
+      \def\letterlastpage{50}
+
+      \ourhead{arg1}{arg2}{arg3}{arg4}{arg5}
+
+      \smallskip
+      Erzeugt mit dem Aufruf
+      \ourhead{arg1}{arg2}{arg3}{arg4}{arg5}
+      \endgroup    </pre></div><div class="sect3" title="2.14.2.9. Absenderergänzung"><div class="titlepage"><div><div><h4 class="title"><a name="Absendererg%C3%A4nzung"></a>2.14.2.9. Absenderergänzung</h4></div></div></div><p>Die Absenderergänzung wird über die Variable |location| in der |kiviletter.sty| folgendermaßen belegt:</p><pre class="programlisting">
+      \setkomavar{location}{
+        \Ifkomavarempty{transaction}{}{{
+              \usekomafont{transaction}
+              \usekomavar{transaction}
+            }
+        }
+        \par
+        \medskip
+        \parbox{\useplength{locwidth}}{
+          \locationentry{date}
+          \locationentry{myref}
+          \locationentry{customer}
+          \locationentry{yourref}
+          \locationentry{delivery}
+          \locationentry{quote}
+          \locationentry{orderID}
+          \locationentry{projectID}
+          \locationentry{taxpoint}
+          \locationentry[\ansprechpartner]{fromname}
+          \locationentry{fromphone}
+          \locationentry*{fromemail}
+        }
+      }    </pre><p>Um die Reihenfolge der Variablenausgabe zu verändern, kann diese Definition als Basis in
+    die <code class="filename">insettings.tex</code> oder <code class="filename">ident.tex</code> (Falls nur für eine Firma) kopiert und dort entsprechend modifiziert werden.</p><p>Das Vorgehen geht für alle vorbelegten Variablen analog.</p></div><div class="sect3" title="2.14.2.10. Allgemeine TeXnische Hinweise"><div class="titlepage"><div><div><h4 class="title"><a name="Allgemeine TeXnische Hinweise"></a>2.14.2.10. Allgemeine TeXnische Hinweise</h4></div></div></div><div class="sect4" title="2.14.2.10.1. Änderung der Basisschriftart"><div class="titlepage"><div><div><h5 class="title"><a name="%C3%84nderung der Basisschriftart"></a>2.14.2.10.1. Änderung der Basisschriftart</h5></div></div></div><p>\LaTeX{} kann grundsätzlich beliebige Schriftarten verwenden. Hierfür sollte allerdings immer darauf geachtet werden,
+    dass die Lizenz der Schriftart das einbetten von Glyphen erlaubt. Dies liegt in der Verantwortung der Anwender*innen.
+    Darüber hinaus ist wichtig, welches Kompilierungsprogramm verwendet werden muss. Um TrueType oder OpenType Schriftarten
+    zu nutzen sollte |lualatex| verwendet werden. Bei Type1 Schriftarten, die speziell für \LaTeX{} installiert wurden, ist pdfLaTeX möglich.
+    Da man heutzutage nur noch moderne Schriftformate Verwenden sollte, wird hier lediglich die Variante für |lualatex| aufgelistet.</p><p>Die Konfiguration läuft hierbei über das \pck{fontspec} Paket (Doku siehe \cite{fontspec}).
+    Dann hängt es davon ab, ob die Basisschriftart eine Serifenschriftart ist oder nicht.
+    In jedem Fall wird die Änderung entweder in der <code class="filename">insettings.tex</code>, sofern sie für alle
+    Mandant*innen gelten soll oder in der Mantant*innenspezifischen Konfigurationsdatei gsesetzt.</p><div class="sect5" title="2.14.2.10.1.1. Änderung, falls es ein Schriftpaket gibt"><div class="titlepage"><div><div><h6 class="title"><a name="d0e3082"></a>2.14.2.10.1.1. Änderung, falls es ein Schriftpaket gibt</h6></div></div></div><p>Wenn möglich sollte die Schriftart über ein entsprechendes Konfigurationspaket gesetzt werden.
+        Ob ein solches existiert kann man sehr leicht über eine Suche nach dem Namen unter \url{ctan.org} herausfinden.</p></div><div class="sect5" title="2.14.2.10.1.2. Änderung der Basisschriftart auf eine Schriftart mit Serifen"><div class="titlepage"><div><div><h6 class="title"><a name="d0e3087"></a>2.14.2.10.1.2. Änderung der Basisschriftart auf eine Schriftart mit Serifen</h6></div></div></div><pre class="programlisting">
+      \setmainfont{|\meta{Name der Schriftart, z.B. SourceSerifPro}|}    </pre></div><div class="sect5" title="2.14.2.10.1.3. Änderung der Basisschriftart auf eine Schriftart ohne Serifen"><div class="titlepage"><div><div><h6 class="title"><a name="d0e3092"></a>2.14.2.10.1.3. Änderung der Basisschriftart auf eine Schriftart ohne Serifen</h6></div></div></div><pre class="programlisting">
+      \setsansfont{|\meta{Name der Schriftart, z.B. SourceSansPro}|}
+      \renewcommand*{\familydefault}{\sfdefault}    </pre></div></div><div class="sect4" title="2.14.2.10.2. Unterscheidungen durch String-Vergleich"><div class="titlepage"><div><div><h5 class="title"><a name="Unterscheidungen durch String-Vergleich"></a>2.14.2.10.2. Unterscheidungen durch String-Vergleich</h5></div></div></div><pre class="programlisting">
+    \Ifstr{\lxmedia}{printer}{Falls gedruckt werden soll} {sonst}    </pre></div></div></div><div class="sect2" title="2.14.3. Der Druckvorlagensatz RB"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagen-RB"></a>2.14.3. Der Druckvorlagensatz RB</h3></div></div></div><p>Hierbei handelt es sich um einen vollständigen LaTeX
+        Dokumentensatz mit alternativem Design. Die odt oder html-Varianten
+        sind nicht gepflegt.</p><p>Die konzeptionelle Idee der Vorlagen wird <a class="ulink" href="http://www.kivitendo-support.de/vortraege/Lx-Office%20Anwendertreffen%20LaTeX-Druckvorlagen-Teil3-finale.pdf" target="_top">hier</a>
+        auf Folie 5 bis 10 vorgestellt. Informationen zur Anpassung an die
+        eigenen Firmendaten finden sich in der Datei Readme.tex im
+        Vorlagenverzeichnis.</p><p>Eine kurze Übersicht der Features:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Mehrsprachenfähig, mit Deutscher und Englischer
+            Übersetzung</p></li><li class="listitem"><p>Zentrale Konfigurationsdateien, die für alle Belege benutzt
+            werden, z.B. für Kopf- und Fußzeilen, und Infos wie
+            Bankdaten</p></li><li class="listitem"><p>mehrere vordefinierte Varianten für
+            Logos/Hintergrundbilder</p></li><li class="listitem"><p>Berücksichtigung für Steuerzonen "EU mit USt-ID Nummer" oder
+            "Außerhalb EU"</p></li></ul></div></div><div class="sect2" title="2.14.4. Der Druckvorlagensatz rev-odt"><div class="titlepage"><div><div><h3 class="title"><a name="Vorlagen-rev-odt"></a>2.14.4. Der Druckvorlagensatz rev-odt</h3></div></div></div><p>Hierbei handelt es sich um einen Dokumentensatz der mit
+        odt-Vorlagen erstellt wurde. Es gibt in dem Verzeichnis eine
+        Readme-Datei, die eventuell aktueller als die Dokumentation hier ist.
+        Die odt-Vorlagen in diesem Verzeichnis "rev-odt" wurden von revamp-it,
+        Zürich erstellt und werden laufend aktualisiert. Ein paar der
+        Formulierungen in den Druckvorlagen entsprechen dem Schweizer
+        Sprachgebrauch, z.B. "Offerte" oder "allfällig".</p><p>Hinweis zum Einsatz des Feldes "Land" bei den Stammdaten für
+        KundInnen und LieferantInnen, sowie bei Lieferadressen: Die in diesem
+        Vorlagensatz vorhandenen Vorlagen erwarten für "Land" das
+        entsprechende Kürzel, das in Adressen vor die Postleitzahl gesetzt
+        wird. Das Feld kann auch komplett leer bleiben. Wer dies anders
+        handhaben möchte, muss die Vorlagen entsprechend anpassen.</p><p>odt-Vorlagen können mit LibreOffice oder OpenOffice editiert und
+        den eigenen Bedürfnissen angepasst werden. Wichtig beim Editieren von
+        if-Blöcken ist, dass immer der gesamte Block überschrieben werden muss
+        und nicht nur Teile davon, da dies sonst oft zu einer odt-Datei führt,
+        die vom Parser nicht korrekt gelesen werden kann.</p><p>Mahnungen können unter folgenden Einschränkungen mit den
+        odt-Vorlagen im Vorlagensatz rev-odt erzeugt werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>als Druckoption steht nur 'PDF(OpenDocument/OASIS)' zur
+            Verfügung, das heisst, die Mahnungen werden als PDF-Datei
+            ausgegeben.</p></li><li class="listitem"><p>für jede Rechnung muss eine eigene Mahnung erzeugt werden
+            (auch wenn bei einzelnen KundInnen mehrere überfällige Rechnungen
+            vorhanden sind).</p></li></ul></div><p>Mehrere Mahnungen für eine Kundin / einen Kunden werden zu einer
+        PDF-Datei zusammengefasst</p><p>Die Vorlagen zahlungserinnerung.odt sowie mahnung.odt sind für
+        das Erstellen einer Zahlungserinnerung bzw. Mahnung selbst vorgesehen,
+        die Vorlage mahnung_invoice.odt für das Erstellen einer Rechnung über
+        die verrechneten Mahngebühren und Verzugszinsen.</p><p>Zur Zeit gibt es in kivitendo noch keine Möglichkeit,
+        odt-Vorlagen bei Briefen und Pflichtenheften einzusetzen.
+        Entsprechende Vorlagen sind deshalb nicht vorhanden.</p><p>Fehlermeldungen, Anregungen und Wünsche bitte senden an:
+        empfang@revamp-it.ch</p></div><div class="sect2" title="2.14.5. Allgemeine Hinweise zu LaTeX Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="allgemeine-hinweise-zu-latex"></a>2.14.5. Allgemeine Hinweise zu LaTeX Vorlagen</h3></div></div></div><p>In den allermeisten Installationen sollte das Drucken jetzt
+        schon funktionieren. Sollte ein Fehler auftreten, wirft TeX sehr lange
+        Fehlerbeschreibungen, der eigentliche Fehler ist immer die erste
+        Zeile, die mit einem Ausrufezeichen anfängt. Häufig auftretende Fehler
+        sind zum Beispiel:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>! LaTeX Error: File `eurosym.sty' not found. Die
+            entsprechende LaTeX-Bibliothek wurde nicht gefunden. Das tritt vor
+            allem bei Vorlagen aus der Community auf. Installieren Sie die
+            entsprechenden Pakete.</p></li><li class="listitem"><p>! Package inputenc Error: Unicode char \u8:... set up for
+            use with LaTeX. Dieser Fehler tritt auf, wenn sie versuchen mit
+            einer Standardinstallation exotische utf8 Zeichen zu drucken.
+            TeXLive unterstützt von Haus nur romanische Schriften und muss mit
+            diversen Tricks dazu gebracht werden andere Zeichen zu
+            akzeptieren. Adere TeX Systeme wie XeTeX schaffen hier
+            Abhilfe.</p></li></ul></div><p>Wird gar kein Fehler angezeigt, sondern nur der Name des
+        Templates, heißt das normalerweise, dass das LaTeX Binary nicht
+        gefunden wurde. Prüfen Sie den Namen in der Konfiguration (Standard:
+        <code class="literal">latexmk --pdflatex</code>), und stellen Sie sicher, dass
+        latexmk (oder das von Ihnen verwendete System) vom Webserver ausgeführt
+        werden darf.</p><p>Wenn sich das Problem nicht auf Grund der Ausgabe im Webbrowser
+        verifizieren lässt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>editiere [kivitendo-home]/config/kivitendo.conf und ändere
+            "keep_temp_files" auf 1</p><p>
+                     </p><pre class="programlisting">keep_temp_files = 1;</pre><p>
+                  </p></li><li class="listitem"><p>bei fastcgi oder mod_perl den Webserver neu Starten</p></li><li class="listitem"><p>Nochmal einen Druckversuch im Webfrontend auslösen</p></li><li class="listitem"><p>wechsel in das users Verzeichnis von kivitendo</p><p>
+                     </p><pre class="programlisting">cd [kivitendo-home]/users</pre><p>
+                  </p></li><li class="listitem"><p>LaTeX Suchpfad anpassen:</p><p>
+                     </p><pre class="programlisting">export TEXINPUTS=".:[kivitendo-home]/templates/[aktuelles_template_verzeichniss]:"</pre><p>
+                  </p></li><li class="listitem"><p>Finde heraus, welche Datei kivitendo beim letzten Durchlauf
+            erstellt hat</p><p>
+                     </p><pre class="programlisting">ls -lahtr ./1*.tex</pre><p>
+                  </p><p>Es sollte die letzte Datei ganz unten sein</p></li><li class="listitem"><p>für besseren Hinweis auf Fehler texdatei nochmals
+            übersetzen</p><p>
+                     </p><pre class="programlisting">pdflatex ./1*.tex</pre><p>
+                  </p><p>in der *.tex datei nach dem Fehler suchen.</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s13.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s15.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.13. E-Mail&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.15. OpenDocument-Vorlagen</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s15.html b/doc/html/ch02s15.html
index 24f58c3a4..b6e7fe957 100644
--- a/doc/html/ch02s15.html
+++ b/doc/html/ch02s15.html
@@ -1,72 +1,110 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s14.html" title="2.14. Nomenklatur"><link rel="next" href="ch02s16.html" title="2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
-      EUR</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s14.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s16.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.eur"></a>2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
-      EUR</h2></div></div></div><div class="sect2" title="2.15.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.introduction"></a>2.15.1. Einführung</h3></div></div></div><p>kivitendo besaß bis inklusive Version 2.6.3 einen
-        Konfigurationsparameter namens <code class="varname">eur</code>, der sich in der
-        Konfigurationsdatei <code class="filename">config/kivitendo.conf</code> (damals
-        noch <code class="filename">config/lx_office.conf</code>) befand. Somit galt er
-        für alle Mandanten, die in dieser Installation benutzt wurden.</p><p>Mit der nachfolgenden Version wurde der Parameter zum Einen in
-        die Mandantendatenbank verschoben und dabei auch gleich in drei
-        Einzelparameter aufgeteilt, mit denen sich das Verhalten genauer
-        steuern lässt.</p></div><div class="sect2" title="2.15.2. Konfigurationsparameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.parameters"></a>2.15.2. Konfigurationsparameter</h3></div></div></div><p>Es gibt drei Parameter, die die Gewinnermittlungsart,
-        Versteuerungsart und die Warenbuchungsmethode regeln:</p><div class="variablelist"><dl><dt><span class="term">
-                     <code class="varname">profit_determination</code>
-                  </span></dt><dd><p>Dieser Parameter legt die Berechnungsmethode für die
-              Gewinnermittlung fest. Er enthält entweder
-              <code class="literal">balance</code> für
-              Betriebsvermögensvergleich/Bilanzierung oder
-              <code class="literal">income</code> für die
-              Einnahmen-Überschuss-Rechnung.</p></dd><dt><span class="term">
-                     <code class="varname">accounting_method</code>
-                  </span></dt><dd><p>Dieser Parameter steuert die Buchungs- und
-              Berechnungsmethoden für die Versteuerungsart. Er enthält
-              entweder <code class="literal">accrual</code> für die Soll-Versteuerung
-              oder <code class="literal">cash</code> für die Ist-Versteuerung.</p></dd><dt><span class="term">
-                     <code class="varname">inventory_system</code>
-                  </span></dt><dd><p>Dieser Parameter legt die Warenbuchungsmethode fest. Er
-              enthält entweder <code class="literal">perpetual</code> für die
-              Bestandsmethode oder <code class="literal">periodic</code> für die
-              Aufwandsmethode.</p></dd></dl></div><p>Zum Vergleich der Funktionalität bis und nach 2.6.3:
-        <code class="varname">eur</code> = 1 bedeutete Einnahmen-Überschuss-Rechnung,
-        Ist-Versteuerung und Aufwandsmethode. <code class="varname">eur</code> = 0
-        bedeutete hingegen Bilanzierung, Soll-Versteuerung und
-        Bestandsmethode.</p><p>Die Konfiguration "<code class="varname">eur</code>" unter
-        <code class="varname">[system]</code> in der <a class="link" href="ch02s04.html" title="2.4. kivitendo-Konfigurationsdatei">Konfigurationsdatei</a>
-        
-               <code class="filename">config/kivitendo.conf</code> wird nun nicht mehr
-        benötigt und kann entfernt werden. Dies muss manuell geschehen.</p></div><div class="sect2" title="2.15.3. Festlegen der Parameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.setting-parameters"></a>2.15.3. Festlegen der Parameter</h3></div></div></div><p>Beim Anlegen eines neuen Mandanten bzw. einer neuen Datenbank in
-        der Admininstration können diese Optionen nun unabhängig voneinander
-        eingestellt werden.</p><p>Für die Schweiz sind folgende Einstellungen üblich:
-        </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Sollversteuerung</p></li><li class="listitem"><p>Aufwandsmethode</p></li><li class="listitem"><p>Bilanzierung</p></li></ul></div><p> Diese Einstellungen werden automatisch beim
-        Erstellen einer neuen Datenbank vorausgewählt, wenn in
-        <code class="filename">config/kivitendo.conf</code> unter
-        <code class="varname">[system]</code> 
-               <code class="literal">default_manager = swiss</code>
-        eingestellt ist.</p><p>Beim Upgrade bestehender Mandanten wird eur ausgelesen und die
-        Variablen werden so gesetzt, daß sich an der Funktionalität nichts
-        ändert.</p><p>Die aktuelle Konfiguration wird unter Nummernkreise und
-        Standardkonten unter dem neuen Punkt "Einstellungen" (read-only)
-        angezeigt. Unter <span class="guimenu">System</span> →
-        <span class="guisubmenu">Mandantenkonfiguration</span> können die
-        Einstellungen auch geändert werden. Dabei ist zu beachten, dass eine
-        Änderung vorhandene Daten so belässt und damit evtl. die Ergebnisse
-        verfälscht. Dies gilt vor Allem für die Warenbuchungsmethode (siehe
-        auch <a class="link" href="ch02s15.html#config.eur.inventory-system-perpetual" title="2.15.4. Bemerkungen zur Bestandsmethode">
-        Bemerkungen zur Bestandsmethode</a>).</p></div><div class="sect2" title="2.15.4. Bemerkungen zur Bestandsmethode"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.inventory-system-perpetual"></a>2.15.4. Bemerkungen zur Bestandsmethode</h3></div></div></div><p>Die Bestandsmethode ist eigentlich eine sehr elegante Methode,
-        funktioniert in kivitendo aber nur unter bestimmten Bedingungen:
-        Voraussetzung ist, daß auch immer alle Einkaufsrechnungen gepflegt
-        werden, und man beim Jahreswechsel nicht mit einer leeren Datenbank
-        anfängt, da bei jedem Verkauf anhand der gesamten Rechnungshistorie
-        der Einkaufswert der Ware nach dem FIFO-Prinzip aus den
-        Einkaufsrechnungen berechnet wird.</p><p>Die Bestandsmethode kann vom Prinzip her also nur funktioneren,
-        wenn man mit den Buchungen bei Null anfängt, und man kann auch nicht
-        im laufenden Betrieb von der Aufwandsmethode zur Bestandsmethode
-        wechseln.</p></div><div class="sect2" title="2.15.5. Bekannte Probleme"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.knonw-issues"></a>2.15.5. Bekannte Probleme</h3></div></div></div><p>Bei bestimmten Berichten kann man derzeit noch inviduell
-        einstellen, ob man nach Ist- oder Sollversteuerung auswertet, und es
-        werden im Code Variablen wie $accrual oder $cash gesetzt. Diese
-        Codestellen wurden noch nicht angepasst, sondern nur die, wo bisher
-        die Konfigurationsvariable
-        <code class="varname">$::lx_office_conf{system}-&gt;{eur}</code> ausgewertet
-        wurde.</p><p>Es fehlen Hilfetext beim Neuanlegen eines Mandanten, was die
-        Optionen bewirken, z.B. mit zwei Standardfällen.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s14.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s16.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.14. Nomenklatur&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.15. OpenDocument-Vorlagen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s14.html" title="2.14. Drucken mit kivitendo"><link rel="next" href="ch02s16.html" title="2.16. Nomenklatur"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.15. OpenDocument-Vorlagen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s14.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s16.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.15. OpenDocument-Vorlagen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="OpenDocument-Vorlagen"></a>2.15. OpenDocument-Vorlagen</h2></div></div></div><p>kivitendo unterstützt die Verwendung von Vorlagen im
+      OpenDocument-Format, wie es LibreOffice oder OpenOffice (ab Version 2)
+      erzeugen. kivitendo kann dabei sowohl neue OpenDocument-Dokumente als
+      auch aus diesen direkt PDF-Dateien erzeugen. Nachfolgend ist die
+      Verwendung mit LibreOffice beschrieben. Für die Verwendung mit
+      OpenOffice müssen die Einstellungen allenfalls angepasst werden.</p><div class="sect2" title="2.15.1. Grundeinstellung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e3228"></a>2.15.1. Grundeinstellung</h3></div></div></div><p>Um die Unterstützung von OpenDocument-Vorlagen zu aktivieren,
+        muss in der Datei <code class="filename">config/kivitendo.conf</code> die
+        Variable <code class="literal">opendocument</code>, im Abschnitt
+        <code class="literal">print_templates</code>, auf <code class="literal">1</code> stehen.
+        Dies ist die Standardeinstellung.</p></div><div class="sect2" title="2.15.2. Direkte Erzeugung von PDF-Dateien"><div class="titlepage"><div><div><h3 class="title"><a name="d0e3245"></a>2.15.2. Direkte Erzeugung von PDF-Dateien</h3></div></div></div><p>Während die Erzeugung von reinen OpenDocument-Dateien keinerlei
+        weitere Software benötigt, wird zur Umwandlung dieser Dateien in PDF
+        LibreOffice oder OpenOffice benötigt.</p><p>Unter Debian kann dieses installiert werden mit:</p><pre class="programlisting">apt install libreoffice</pre><p>Der Pfad zu LibreOffice kann in der Datei
+        <code class="filename">config/kivitendo.conf</code>, im Abschnitt
+        <code class="literal">applications</code>, angepasst werden. Unter Debian sollte
+        dies nicht notwendig sein.</p><div class="sect3" title="2.15.2.1. Variante 1)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3262"></a>2.15.2.1. Variante 1)</h4></div></div></div><p>In der Standardeinstellung wird LibreOffice für jedes Dokument
+          neu gestartet. Es ist keine weitere Konfiguration
+          erforderlich.</p></div><div class="sect3" title="2.15.2.2. Variante 2)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3267"></a>2.15.2.2. Variante 2)</h4></div></div></div><p>Die zweite Variante startet ein LibreOffice, das auch nach der
+          Umwandlung des Dokumentes gestartet bleibt. Bei weiteren
+          Umwandlungen wird dann diese laufende Instanz benutzt. Der Vorteil
+          ist, dass die Zeit zur Umwandlung möglicherweise reduziert wird,
+          weil nicht für jedes Dokument eine neue Instanz gestartet werden
+          muss.</p><p>Dazu muss in der Konfigurationsdatei
+          <code class="filename">config/kivitendo.conf</code>, im Abschnitt
+          <code class="literal">print_templates</code>, <code class="literal">openofficeorg_daemon =
+          1</code> gesetzt werden.</p><p>Diese Methode verwendet Python und die Python uno bindings.
+          Unter Debian werden diese mit LibreOffice mitgeliefert.</p><p>Die Optionen <code class="literal">python_uno</code> und
+          <code class="literal">python_uno_path</code> in der Konfigurationsdatei
+          <code class="filename">config/kivitendo.conf</code> dienen zur Anpassung der
+          Python uno Pfade. Unter Debian sollte keine Anpassung notwendig
+          sein.</p></div></div><div class="sect2" title="2.15.3. Vorbereitungen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e3296"></a>2.15.3. Vorbereitungen</h3></div></div></div><div class="sect3" title="2.15.3.1. Adminbereich"><div class="titlepage"><div><div><h4 class="title"><a name="opendocument-druckvorlagen-mit-makros.vorbereitungen"></a>2.15.3.1. Adminbereich</h4></div></div></div><p>Damit beim Erstellen von Rechnungen und Aufträgen neben der
+          Standardvorlage ohne Einzahlungsschein weitere Vorlagen (z.B. mit
+          Einzahlungsschein) auswählbar sind, muss für jedes Vorlagen-Suffix
+          ein Drucker eingerichtet werden:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Druckeradministration → Drucker hinzufügen</p></li><li class="listitem"><p>Mandant wählen</p></li><li class="listitem"><p>Druckerbeschreibung → aussagekräftiger Text: wird in der
+              Auftrags- bzw. Rechnungsmaske als Auswahl angezeigt (z.B. mit
+              Einzahlungsschein Bank xy)</p></li><li class="listitem"><p>Druckbefehl → beliebiger Text (hat für das Erzeugen von
+              Aufträgen oder Rechnungen als odt-Datei keine Bedeutung, darf
+              aber nicht leer sein)</p></li><li class="listitem"><p>Vorlagenkürzel → besr bzw. selbst gewähltes Vorlagensuffix
+              (muss genau der Zeichenfolge entsprechen, die zwischen
+              "invoice_" bzw. "sales_order_" und ".odt" steht.)</p></li><li class="listitem"><p>speichern</p></li></ul></div></div><div class="sect3" title="2.15.3.2. Benutzereinstellungen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3323"></a>2.15.3.2. Benutzereinstellungen</h4></div></div></div><p>Wer den Ausdruck mit Einzahlungsschein als Standardeinstellung
+          im Rechnungs- bzw. Auftragsformular angezeigt haben möchte, kann
+          dies persönlich für sich bei den Benutzereinstellungen
+          konfigurieren:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Programm → Benutzereinstellungen → Druckoptionen</p></li><li class="listitem"><p>Standardvorlagenformat → OpenDocument/OASIS</p></li><li class="listitem"><p>Standardausgabekanal → Bildschirm</p></li><li class="listitem"><p>Standarddrucker → gewünschte Druckerbeschreibung auswählen
+              (z.B. mit Einzahlungsschein Bank xy)</p></li><li class="listitem"><p>Anzahl Kopien → leer</p></li><li class="listitem"><p>speichern</p></li></ul></div></div><div class="sect3" title="2.15.3.3. Auswahl der Druckvorlage in kivitendo beim Erzeugen einer odt-Rechnung (analog bei Auftrag)"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3347"></a>2.15.3.3. Auswahl der Druckvorlage in kivitendo beim Erzeugen einer
+          odt-Rechnung (analog bei Auftrag)</h4></div></div></div><p>Im Fussbereich der Rechnungsmaske muss neben Rechnung,
+          OpenDocument/OASIS und Bildschirm die im Adminbereich erstellte
+          Druckerbeschreibung ausgewählt werden, falls diese nicht bereits bei
+          den Benutzereinstellungen als persönlicher Standard gewählt
+          wurde.</p></div></div><div class="sect2" title="2.15.4. Schweizer QR-Rechnung mit OpenDocument Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e3352"></a>2.15.4. Schweizer QR-Rechnung mit OpenDocument Vorlagen</h3></div></div></div><p>Mit der Version 3.6.0 unterstützt Kivitendo die Erstellung von
+        Schweizer QR-Rechnungen gemäss <a class="ulink" href="https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-de.pdf" target="_top">Swiss
+        Payment Standards, Version 2.2</a>. Implementiert sind hierbei die
+        Varianten:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <span class="bold"><strong>QR-IBAN mit
+            QR-Referenz</strong></span>
+                  </p></li><li class="listitem"><p>
+                     <span class="bold"><strong>IBAN ohne Referenz</strong></span>
+                  </p></li></ul></div><div class="sect3" title="2.15.4.1. Einstellungen"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3373"></a>2.15.4.1. Einstellungen</h4></div></div></div><div class="sect4" title="2.15.4.1.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h5 class="title"><a name="d0e3376"></a>2.15.4.1.1. Mandantenkonfiguration</h5></div></div></div><p>Unter <span class="emphasis"><em>System → Mandantenkonfiguration →
+            Features</em></span>. Im Abschnitt <span class="emphasis"><em>Einkauf und
+            Verkauf</em></span>, beim Punkt <span class="emphasis"><em>Verkaufsrechnungen mit
+            Schweizer QR-Rechnung erzeugen</em></span>, die gewünschte Variante
+            wählen.</p></div><div class="sect4" title="2.15.4.1.2. Konfiguration der Bankkonten"><div class="titlepage"><div><div><h5 class="title"><a name="d0e3390"></a>2.15.4.1.2. Konfiguration der Bankkonten</h5></div></div></div><p>Unter <span class="emphasis"><em>System → Bankkonten</em></span> muss bei
+            mindestens einem Bankkonto die Option <span class="emphasis"><em>Nutzung mit
+            Schweizer QR-Rechnung</em></span> auf <span class="bold"><strong>Ja</strong></span> gestellt werden.</p><p>Die IBAN muss ohne Leerzeichen angegeben werden.</p><div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Tip"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Tipp]" src="system/docbook-xsl/images/tip.png"></td><th align="left">Tipp</th></tr><tr><td align="left" valign="top"><p>Für die Variante <span class="bold"><strong>QR-IBAN mit
+              QR-Referenz</strong></span> muss dieses Konto unter QR-IBAN (Schweiz) eine gültige
+              <span class="bold"><strong>QR-IBAN Nummer</strong></span> enthalten. Diese
+              unterscheidet sich von der regulären IBAN.</p><p>Zusätzlich muss eine gültige <span class="bold"><strong>Bankkonto
+              Identifikationsnummer</strong></span> angegeben werden
+              (6-stellig).</p><p>Diese werden von der jeweiligen Bank vergeben.</p></td></tr></table></div><p>Sind mehrere Konten ausgewählt wird das erste
+            verwendet.</p></div><div class="sect4" title="2.15.4.1.3. Rechnungen ohne Betrag"><div class="titlepage"><div><div><h5 class="title"><a name="d0e3424"></a>2.15.4.1.3. Rechnungen ohne Betrag</h5></div></div></div><p>Für Rechnungen ohne Betrag (z.B. Spenden) kann, in der
+            jeweiligen Rechnung, die Checkbox <span class="emphasis"><em>QR-Rechnung ohne
+            Betrag</em></span> aktiviert werden. Diese Checkbox erscheint nur,
+            wenn QR-Rechnungen in der Mandantenkonfiguration aktiviert sind
+            (variante ausgewählt).</p><p>Dies wirkt sich lediglich auf den erzeugten QR-Code aus. Die
+            Vorlage muss separat angepasst und ausgewählt werden.</p></div></div><div class="sect3" title="2.15.4.2. Adressdaten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3434"></a>2.15.4.2. Adressdaten</h4></div></div></div><p>Die Adressdaten zum Zahlungsempfänger werden aus der
+          Mandantenkonfiguration entnommen. Unter <span class="emphasis"><em>System →
+          Mandantenkonfiguration → Verschiedenes</em></span>, Abschnitt
+          <span class="emphasis"><em>Firmenname und -adresse.</em></span>
+               </p><p>Die Adressdaten zum Zahlungspflichtigen stammen aus den
+          Kundendaten der jeweiligen Rechnung.</p><p>Ist bei den Adressdaten kein Land angegeben, wird standardmässig
+          Schweiz verwendet. Akzeptiert werden Ländername oder Ländercode, also
+          z.B. "Schweiz" oder "CH".</p><p>Die Adressdaten können in der Vorlage mit den jeweiligen
+          Variablen eingetragen werden. Siehe auch: <a class="xref" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen">Abschnitt&nbsp;3.3, „Dokumentenvorlagen und verfügbare Variablen“</a>
+               </p><p>Der erzeugte QR-Code verwendet Adress-Typ "K" (Kombinierte
+          Adressfelder, 2 Zeilen).</p></div><div class="sect3" title="2.15.4.3. Referenznummer"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3455"></a>2.15.4.3. Referenznummer</h4></div></div></div><p>Die Referenznummer wird in Kivitendo erzeugt und setzt sich
+          wiefolgt zusammen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Bankkonto Identifikationsnummer (6-stellig)</p></li><li class="listitem"><p>Kundennummer (6-stellig, mit führenden Nullen
+              aufgefüllt)</p></li><li class="listitem"><p>Rechnungsnummer (14-stellig, mit führenden Nullen
+              aufgefüllt)</p></li><li class="listitem"><p>Prüfziffer (1-stellig, berechnet mittels modulo 10,
+              rekursiv)</p></li></ul></div><p>Es sind lediglich Ziffern erlaubt. Allfällige Buchstaben und
+          Sonderzeichen werden entfernt und fehlende Stellen werden mit
+          führenden Nullen aufgefüllt.</p></div><div class="sect3" title="2.15.4.4. Vorlage"><div class="titlepage"><div><div><h4 class="title"><a name="d0e3475"></a>2.15.4.4. Vorlage</h4></div></div></div><p>Der Vorlagensatz "rev-odt" enthält die Vorlage
+          <code class="literal">invoice_qr.odt</code>, welche für die Erstellung von
+          QR-Rechnungen vorgesehen ist. Damit diese verwendet werden kann muss
+          wie obenstehend beschrieben ein Drucker hinzugefügt werden, allerdings
+          mit dem Vorlagenkürzel <code class="literal">qr</code> (siehe <a class="xref" href="ch02s15.html#opendocument-druckvorlagen-mit-makros.vorbereitungen" title="2.15.3.1. Adminbereich">Abschnitt&nbsp;2.15.3.1, „Adminbereich“</a>).
+          Weitere Vorlagen für die QR-Rechnung müssen im Dateinamen, bzw.
+          Vorlagenkürzel, ebenfalls die Zeichenfolge <code class="literal">qr</code>
+          enthalten, also z.b. <code class="literal">invoice_qr2.odt</code> etc.</p><p>Die Vorlagen können beliebig angepasst werden. Zwingend müssen
+          diese jedoch das QR-Code Platzhalter Bild, als eingebettetes Bild,
+          enthalten. Da dieses beim Ausdrucken/Erzeugen der Rechnung durch das
+          neu generierte QR-Code Bild ersetzt wird. Das Bild muss den Namen
+          <code class="literal">QRCodePlaceholder</code> tragen. In Libreoffice unter
+          <span class="emphasis"><em>Bild-Kontextmenü → </em></span>
+                  <span class="emphasis"><em>Einstellungen →
+          Optionen → Name</em></span> einstellbar. Siehe dazu auch die
+          Beispielvorlage.</p><div class="sect4" title="2.15.4.4.1. Zusätzliche Variablen für Vorlage"><div class="titlepage"><div><div><h5 class="title"><a name="d0e3505"></a>2.15.4.4.1. Zusätzliche Variablen für Vorlage</h5></div></div></div><p>Zusätzlich zu den in der Vorlage standardmässig verfügbaren
+            Variablen (siehe <a class="xref" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen">Abschnitt&nbsp;3.3, „Dokumentenvorlagen und verfügbare Variablen“</a>),
+            werden die folgenden Variablen erzeugt:</p><div class="variablelist"><dl><dt><span class="term">ref_number_formatted</span></dt><dd><p>Referenznummer formatiert mit Leerzeichen, z.B.: 21 00000
+                  00003 13947 14300 09017</p></dd><dt><span class="term">iban_formatted</span></dt><dd><p>IBAN formatiert mit Leerzeichen</p></dd><dt><span class="term">amount_formatted</span></dt><dd><p>Betrag formatiert mit Tausendertrennzeichen Leerschlag,
+                  z.B.: 1 005.55</p></dd></dl></div></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s14.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s16.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.14. Drucken mit kivitendo&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.16. Nomenklatur</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s16.html b/doc/html/ch02s16.html
index 13e79cfdc..ae2baf3e6 100644
--- a/doc/html/ch02s16.html
+++ b/doc/html/ch02s16.html
@@ -1,38 +1,21 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s15.html" title="2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"><link rel="next" href="ch02s17.html" title="2.17. Verhalten des Bilanzberichts"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s15.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s17.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.skr04-update-3804"></a>2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</h2></div></div></div><div class="sect2" title="2.16.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.skr04-update-3804.introduction"></a>2.16.1. Einführung</h3></div></div></div><p>Die Umsatzsteuerumstellung auf 19% für SKR04 für die
-        Steuerschlüssel "EU ohne USt-ID Nummer" ist erst 2010 erfolgt.
-        kivitendo beinhaltet ein Upgradeskript, das das Konto 3804 automatisch
-        erstellt und die Steuereinstellungen korrekt einstellt. Hat der
-        Benutzer aber schon selber das Konto 3804 angelegt, oder gab es schon
-        Buchungen im Zeitraum nach dem 01.01.2007 auf das Konto 3803, wird das
-        Upgradeskript vorsichtshalber nicht ausgeführt, da der Benutzer sich
-        vielleicht schon selbst geholfen hat und mit seinen Änderungen
-        zufrieden ist. Die korrekten Einstellungen kann man aber auch per Hand
-        ausführen. Nachfolgend werden die entsprechenden Schritte anhand von
-        Screenshots dargestellt.</p><p>Für den Fall, daß Buchungen mit der Steuerschlüssel "EU ohne
-        USt.-IdNr." nach dem 01.01.2007 erfolgt sind, ist davon auszugehen,
-        dass diese mit dem alten Umsatzsteuersatz von 16% gebucht worden sind,
-        und diese Buchungen sollten entsprechend kontrolliert werden.</p></div><div class="sect2" title="2.16.2. Konto 3804 manuell anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="config.skr04-update-3804.create-chart"></a>2.16.2. Konto 3804 manuell anlegen</h3></div></div></div><p>Die folgenden Schritte sind notwendig, um das Konto manuell
-        anzulegen und zu konfigurieren. Zuerst wird in
-        <span class="guimenu">System</span> → <span class="guisubmenu">Kontenübersicht</span> →
-        <span class="guimenuitem">Konto erfassen</span> das Konto angelegt.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/konto3804.png"></div></div><p>Als Zweites muss Steuergruppe 13 für Konto 3803 angepasst
-        werden. Dazu unter <span class="guimenu">System</span> →
-        <span class="guisubmenu">Steuern</span> →
-        <span class="guimenuitem">Bearbeiten</span> den Eintrag mit Steuerschlüssel
-        13 auswählen und ihn wie im folgenden Screenshot angezeigt
-        anpassen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuer3803.png"></div></div><p>Als Drittes wird ein neuer Eintrag mit Steuerschlüssel 13 für
-        Konto 3804 (19%) angelegt. Dazu unter <span class="guimenu">System</span> →
-        <span class="guisubmenu">Steuern</span> → <span class="guimenuitem">Erfassen</span>
-        auswählen und die Werte aus dem Screenshot übernehmen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuer3804.png"></div></div><p>Als Nächstes sind alle Konten anzupassen, die als
-        Steuerautomatikkonto die 3803 haben, sodass sie ab dem 1.1.2007 auch
-        Steuerautomatik auf 3804 bekommen. Dies betrifft in der
-        Standardkonfiguration die Konten 4315 und 4726. Als Beispiel für 4315
-        müssen Sie dazu unter <span class="guimenu">System</span> →
-        <span class="guisubmenu">Kontenübersicht</span> → <span class="guimenuitem">Konten
-        anzeigen</span> das Konto 4315 anklicken und die Einstellungen
-        wie im Screenshot gezeigt vornehmen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/konto4315.png"></div></div><p>Als Letztes sollte die Steuerliste unter
-        <span class="guimenu">System</span> → <span class="guisubmenu">Steuern</span> →
-        <span class="guimenuitem">Bearbeiten</span> kontrolliert werden. Zum
-        Vergleich der Screenshot.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuerliste.png"></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s15.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s17.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
-      EUR&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.17. Verhalten des Bilanzberichts</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.16. Nomenklatur</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s15.html" title="2.15. OpenDocument-Vorlagen"><link rel="next" href="ch02s17.html" title="2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.16. Nomenklatur</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s15.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s17.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.16. Nomenklatur"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="nomenclature"></a>2.16. Nomenklatur</h2></div></div></div><div class="sect2" title="2.16.1. Datum bei Buchungen"><div class="titlepage"><div><div><h3 class="title"><a name="booking.dates"></a>2.16.1. Datum bei Buchungen</h3></div></div></div><p>Seit der Version 3.5 werden für Buchungen in kivitendo
+        einheitlich folgende Bezeichnungen verwendet:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                     <code class="option">Erfassungsdatum</code> (en: <code class="option">Entry
+            Date</code>, code: <code class="option">Gldate</code>)</p><p>bezeichnet das Datum, an dem die Buchung in kivitendo
+            erfasst wurde.</p></li><li class="listitem"><p>
+                     <code class="option">Buchungsdatum</code> (en: <code class="option">Booking
+            Date</code>, code: <code class="option">Transdate</code>)</p><p>bezeichnet das buchhaltungstechnisch für eine Buchung
+            relevante Datum</p><p>Das <code class="option">Rechnungsdatum</code> bei Verkaufs- und
+            Einkaufsrechnungen entspricht dem Buchungsdatum. Das heisst, in
+            Berichten wie dem Buchungsjournal, in denen eine Spalte
+            <code class="option">Buchungsdatum</code> angezeigt werden kann, erscheint
+            hier im Fall von Rechnungen das Rechnungsdatum.</p></li><li class="listitem"><p>Bezieht sich ein verbuchter Beleg auf einen Zeitpunkt, der
+            nicht mit dem Buchungsdatum übereinstimmt, so kann dieses Datum
+            momentan in kivitendo nur unter Bemerkungen erfasst werden.</p><p>Möglicherweise wird für solche Fälle in einer späteren
+            Version von kivitendo ein dritter Datumswert für Buchungen
+            erstellt. (Beispiel: Einkaufsbeleg stammt aus einem früheren Jahr,
+            das bereits buchhaltungstechnisch abgeschlossen wurde, und muss
+            deshalb später verbucht werden.)</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s15.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s17.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.15. OpenDocument-Vorlagen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
+      EUR</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s17.html b/doc/html/ch02s17.html
index a5030e653..50b4f9ff5 100644
--- a/doc/html/ch02s17.html
+++ b/doc/html/ch02s17.html
@@ -1,21 +1,72 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.17. Verhalten des Bilanzberichts</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s16.html" title="2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"><link rel="next" href="ch02s18.html" title="2.18. Erfolgsrechnung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.17. Verhalten des Bilanzberichts</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s16.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s18.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.17. Verhalten des Bilanzberichts"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.bilanz"></a>2.17. Verhalten des Bilanzberichts</h2></div></div></div><p>Bis Version 3.0 wurde "closedto" ("Bücher schließen zum") als
-      Grundlage für das Startdatum benutzt. Schließt man die Bücher allerdings
-      monatsweise führt dies zu falschen Werten.</p><p>In der Mandantenkonfiguration kann man dieses Verhalten genau
-      einstellen indem man:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>weiterhin closed_to benutzt (Default, es ändert sich nichts zu
-          vorher)</p></li><li class="listitem"><p>immer den Jahresanfang nimmt (1.1. relativ zum
-          Stichtag)</p></li><li class="listitem"><p>immer die letzte Eröffnungsbuchung als Startdatum nimmt</p><p>- mit Jahresanfang als Alternative wenn es keine EB-Buchungen
-          gibt</p><p>- oder mit "alle Buchungen" als Alternative"</p></li><li class="listitem"><p>mit Jahresanfang als Alternative wenn es keine EB-Buchungen
-          gibt</p></li><li class="listitem"><p>immer alle Buchungen seit Beginn der Datenbank nimmt</p></li></ul></div><p>Folgende Hinweise zu den Optionen: Das "Bücher schließen Datum"
-      ist sinnvoll, wenn man nur komplette Jahre schließt. Bei Wirtschaftsjahr
-      = Kalendarjahr entspricht dies aber auch dem Jahresanfang. "Alle
-      Buchungen" kann z.B. sinnvoll sein wenn man ohne Jahresabschluß
-      durchbucht. Eröffnungsbuchung mit "alle Buchungen" als Fallback ist z.B.
-      sinnvoll, wenn man am sich Anfang des zweiten Buchungsjahres befindet,
-      und noch keinen Jahreswechsel und auch noch keine EB-Buchungen hat. Bei
-      den Optionen mit EB-Buchungen wird vorausgesetzt, daß diese immer am 1.
-      Tag des Wirtschaftsjahres gebucht werden. Zur Sicherheit wird das
-      Startdatum im Bilanzbericht jetzt zusätzlich zum Stichtag mit angezeigt.
-      Das hilft auch bei der Kontrolle für den Abgleich mit der GuV bzw.
-      Erfolgsrechnung.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s16.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s18.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.18. Erfolgsrechnung</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s16.html" title="2.16. Nomenklatur"><link rel="next" href="ch02s18.html" title="2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
+      EUR</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s16.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s18.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.eur"></a>2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
+      EUR</h2></div></div></div><div class="sect2" title="2.17.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.introduction"></a>2.17.1. Einführung</h3></div></div></div><p>kivitendo besaß bis inklusive Version 2.6.3 einen
+        Konfigurationsparameter namens <code class="varname">eur</code>, der sich in der
+        Konfigurationsdatei <code class="filename">config/kivitendo.conf</code> (damals
+        noch <code class="filename">config/lx_office.conf</code>) befand. Somit galt er
+        für alle Mandanten, die in dieser Installation benutzt wurden.</p><p>Mit der nachfolgenden Version wurde der Parameter zum Einen in
+        die Mandantendatenbank verschoben und dabei auch gleich in drei
+        Einzelparameter aufgeteilt, mit denen sich das Verhalten genauer
+        steuern lässt.</p></div><div class="sect2" title="2.17.2. Konfigurationsparameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.parameters"></a>2.17.2. Konfigurationsparameter</h3></div></div></div><p>Es gibt drei Parameter, die die Gewinnermittlungsart,
+        Versteuerungsart und die Warenbuchungsmethode regeln:</p><div class="variablelist"><dl><dt><span class="term">
+                     <code class="varname">profit_determination</code>
+                  </span></dt><dd><p>Dieser Parameter legt die Berechnungsmethode für die
+              Gewinnermittlung fest. Er enthält entweder
+              <code class="literal">balance</code> für
+              Betriebsvermögensvergleich/Bilanzierung oder
+              <code class="literal">income</code> für die
+              Einnahmen-Überschuss-Rechnung.</p></dd><dt><span class="term">
+                     <code class="varname">accounting_method</code>
+                  </span></dt><dd><p>Dieser Parameter steuert die Buchungs- und
+              Berechnungsmethoden für die Versteuerungsart. Er enthält
+              entweder <code class="literal">accrual</code> für die Soll-Versteuerung
+              oder <code class="literal">cash</code> für die Ist-Versteuerung.</p></dd><dt><span class="term">
+                     <code class="varname">inventory_system</code>
+                  </span></dt><dd><p>Dieser Parameter legt die Warenbuchungsmethode fest. Er
+              enthält entweder <code class="literal">perpetual</code> für die
+              Bestandsmethode oder <code class="literal">periodic</code> für die
+              Aufwandsmethode.</p></dd></dl></div><p>Zum Vergleich der Funktionalität bis und nach 2.6.3:
+        <code class="varname">eur</code> = 1 bedeutete Einnahmen-Überschuss-Rechnung,
+        Ist-Versteuerung und Aufwandsmethode. <code class="varname">eur</code> = 0
+        bedeutete hingegen Bilanzierung, Soll-Versteuerung und
+        Bestandsmethode.</p><p>Die Konfiguration "<code class="varname">eur</code>" unter
+        <code class="varname">[system]</code> in der <a class="link" href="ch02s05.html" title="2.5. kivitendo-Konfigurationsdatei">Konfigurationsdatei</a>
+        
+               <code class="filename">config/kivitendo.conf</code> wird nun nicht mehr
+        benötigt und kann entfernt werden. Dies muss manuell geschehen.</p></div><div class="sect2" title="2.17.3. Festlegen der Parameter"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.setting-parameters"></a>2.17.3. Festlegen der Parameter</h3></div></div></div><p>Beim Anlegen eines neuen Mandanten bzw. einer neuen Datenbank in
+        der Admininstration können diese Optionen nun unabhängig voneinander
+        eingestellt werden.</p><p>Für die Schweiz sind folgende Einstellungen üblich:
+        </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Sollversteuerung</p></li><li class="listitem"><p>Aufwandsmethode</p></li><li class="listitem"><p>Bilanzierung</p></li></ul></div><p> Diese Einstellungen werden automatisch beim
+        Erstellen einer neuen Datenbank vorausgewählt, wenn in
+        <code class="filename">config/kivitendo.conf</code> unter
+        <code class="varname">[system]</code> 
+               <code class="literal">default_manager = swiss</code>
+        eingestellt ist.</p><p>Beim Upgrade bestehender Mandanten wird eur ausgelesen und die
+        Variablen werden so gesetzt, daß sich an der Funktionalität nichts
+        ändert.</p><p>Die aktuelle Konfiguration wird unter Nummernkreise und
+        Standardkonten unter dem neuen Punkt "Einstellungen" (read-only)
+        angezeigt. Unter <span class="guimenu">System</span> →
+        <span class="guisubmenu">Mandantenkonfiguration</span> können die
+        Einstellungen auch geändert werden. Dabei ist zu beachten, dass eine
+        Änderung vorhandene Daten so belässt und damit evtl. die Ergebnisse
+        verfälscht. Dies gilt vor Allem für die Warenbuchungsmethode (siehe
+        auch <a class="link" href="ch02s17.html#config.eur.inventory-system-perpetual" title="2.17.4. Bemerkungen zur Bestandsmethode">
+        Bemerkungen zur Bestandsmethode</a>).</p></div><div class="sect2" title="2.17.4. Bemerkungen zur Bestandsmethode"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.inventory-system-perpetual"></a>2.17.4. Bemerkungen zur Bestandsmethode</h3></div></div></div><p>Die Bestandsmethode ist eigentlich eine sehr elegante Methode,
+        funktioniert in kivitendo aber nur unter bestimmten Bedingungen:
+        Voraussetzung ist, daß auch immer alle Einkaufsrechnungen gepflegt
+        werden, und man beim Jahreswechsel nicht mit einer leeren Datenbank
+        anfängt, da bei jedem Verkauf anhand der gesamten Rechnungshistorie
+        der Einkaufswert der Ware nach dem FIFO-Prinzip aus den
+        Einkaufsrechnungen berechnet wird.</p><p>Die Bestandsmethode kann vom Prinzip her also nur funktioneren,
+        wenn man mit den Buchungen bei Null anfängt, und man kann auch nicht
+        im laufenden Betrieb von der Aufwandsmethode zur Bestandsmethode
+        wechseln.</p></div><div class="sect2" title="2.17.5. Bekannte Probleme"><div class="titlepage"><div><div><h3 class="title"><a name="config.eur.knonw-issues"></a>2.17.5. Bekannte Probleme</h3></div></div></div><p>Bei bestimmten Berichten kann man derzeit noch inviduell
+        einstellen, ob man nach Ist- oder Sollversteuerung auswertet, und es
+        werden im Code Variablen wie $accrual oder $cash gesetzt. Diese
+        Codestellen wurden noch nicht angepasst, sondern nur die, wo bisher
+        die Konfigurationsvariable
+        <code class="varname">$::lx_office_conf{system}-&gt;{eur}</code> ausgewertet
+        wurde.</p><p>Es fehlen Hilfetext beim Neuanlegen eines Mandanten, was die
+        Optionen bewirken, z.B. mit zwei Standardfällen.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s16.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s18.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.16. Nomenklatur&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s18.html b/doc/html/ch02s18.html
index 2641cddb9..091263cd9 100644
--- a/doc/html/ch02s18.html
+++ b/doc/html/ch02s18.html
@@ -1,23 +1,38 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.18. Erfolgsrechnung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s17.html" title="2.17. Verhalten des Bilanzberichts"><link rel="next" href="ch02s19.html" title="2.19. Rundung in Verkaufsbelegen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.18. Erfolgsrechnung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s17.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s19.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.18. Erfolgsrechnung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.erfolgsrechnung"></a>2.18. Erfolgsrechnung</h2></div></div></div><p>Seit der Version 3.4.1 existiert in kivitendo der Bericht
-      <span class="bold"><strong> Erfolgsrechnung</strong></span>.</p><p>Die Erfolgsrechnung kann in der Mandantenkonfiguration unter
-      Features an- oder abgeschaltet werden. Mit der Einstellung
-      <code class="varname">default_manager = swiss </code> in der
-      <code class="filename">config/kivitendo.conf</code> wird beim neu Erstellen einer
-      Datenbank automatisch die Anzeige der Erfolgsrechnung im Menü
-      <span class="guimenu">Berichte </span> ausgewählt und ersetzt dort die GUV.</p><p>Im Gegensatz zur GUV werden bei der Erfolgsrechnung sämtliche
-      Aufwands- und Erlöskonten einzeln aufgelistet (analog zur Bilanz),
-      sortiert nach ERTRAG und AUFWAND.</p><p>Bei den Konteneinstellungen muss bei jedem Konto, das in der
-      Erfolgsrechnung erscheinen soll, unter <code class="varname">Sonstige
-      Einstellungen/Erfolgsrechnung</code> entweder
-      <code class="literal">01.Ertrag</code> oder <code class="literal">06.Aufwand</code>
-      ausgewählt werden.</p><p>Wird bei einem Erlöskonto <code class="literal">06.Aufwand</code>
-      ausgewählt, so wird dieses Konto als Aufwandsminderung unter AUFWAND
-      aufgelistet.</p><p>Wird bei einem Aufwandskonto <code class="literal">01.Ertrag</code>
-      ausgewählt, so wird dieses Konto als Ertragsminderung unter ERTRAG
-      aufgelistet.</p><p>Soll bei einer bereits bestehenden Buchhaltung in Zukunft
-      zusätzlich die Erfolgsrechnung als Bericht verwendet werden, so müssen
-      die Einstellungen zu allen Erlös- und Aufwandskonten unter
-      <code class="varname">Sonstige Einstellungen/Erfolgsrechnung</code> überprüft und
-      allenfalls neu gesetzt werden.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s17.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s19.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.17. Verhalten des Bilanzberichts&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.19. Rundung in Verkaufsbelegen</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s17.html" title="2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung: EUR"><link rel="next" href="ch02s19.html" title="2.19. Verhalten des Bilanzberichts"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s17.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s19.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.skr04-update-3804"></a>2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</h2></div></div></div><div class="sect2" title="2.18.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="config.skr04-update-3804.introduction"></a>2.18.1. Einführung</h3></div></div></div><p>Die Umsatzsteuerumstellung auf 19% für SKR04 für die
+        Steuerschlüssel "EU ohne USt-ID Nummer" ist erst 2010 erfolgt.
+        kivitendo beinhaltet ein Upgradeskript, das das Konto 3804 automatisch
+        erstellt und die Steuereinstellungen korrekt einstellt. Hat der
+        Benutzer aber schon selber das Konto 3804 angelegt, oder gab es schon
+        Buchungen im Zeitraum nach dem 01.01.2007 auf das Konto 3803, wird das
+        Upgradeskript vorsichtshalber nicht ausgeführt, da der Benutzer sich
+        vielleicht schon selbst geholfen hat und mit seinen Änderungen
+        zufrieden ist. Die korrekten Einstellungen kann man aber auch per Hand
+        ausführen. Nachfolgend werden die entsprechenden Schritte anhand von
+        Screenshots dargestellt.</p><p>Für den Fall, daß Buchungen mit der Steuerschlüssel "EU ohne
+        USt.-IdNr." nach dem 01.01.2007 erfolgt sind, ist davon auszugehen,
+        dass diese mit dem alten Umsatzsteuersatz von 16% gebucht worden sind,
+        und diese Buchungen sollten entsprechend kontrolliert werden.</p></div><div class="sect2" title="2.18.2. Konto 3804 manuell anlegen"><div class="titlepage"><div><div><h3 class="title"><a name="config.skr04-update-3804.create-chart"></a>2.18.2. Konto 3804 manuell anlegen</h3></div></div></div><p>Die folgenden Schritte sind notwendig, um das Konto manuell
+        anzulegen und zu konfigurieren. Zuerst wird in
+        <span class="guimenu">System</span> → <span class="guisubmenu">Kontenübersicht</span> →
+        <span class="guimenuitem">Konto erfassen</span> das Konto angelegt.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/konto3804.png"></div></div><p>Als Zweites muss Steuergruppe 13 für Konto 3803 angepasst
+        werden. Dazu unter <span class="guimenu">System</span> →
+        <span class="guisubmenu">Steuern</span> →
+        <span class="guimenuitem">Bearbeiten</span> den Eintrag mit Steuerschlüssel
+        13 auswählen und ihn wie im folgenden Screenshot angezeigt
+        anpassen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuer3803.png"></div></div><p>Als Drittes wird ein neuer Eintrag mit Steuerschlüssel 13 für
+        Konto 3804 (19%) angelegt. Dazu unter <span class="guimenu">System</span> →
+        <span class="guisubmenu">Steuern</span> → <span class="guimenuitem">Erfassen</span>
+        auswählen und die Werte aus dem Screenshot übernehmen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuer3804.png"></div></div><p>Als Nächstes sind alle Konten anzupassen, die als
+        Steuerautomatikkonto die 3803 haben, sodass sie ab dem 1.1.2007 auch
+        Steuerautomatik auf 3804 bekommen. Dies betrifft in der
+        Standardkonfiguration die Konten 4315 und 4726. Als Beispiel für 4315
+        müssen Sie dazu unter <span class="guimenu">System</span> →
+        <span class="guisubmenu">Kontenübersicht</span> → <span class="guimenuitem">Konten
+        anzeigen</span> das Konto 4315 anklicken und die Einstellungen
+        wie im Screenshot gezeigt vornehmen.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/konto4315.png"></div></div><p>Als Letztes sollte die Steuerliste unter
+        <span class="guimenu">System</span> → <span class="guisubmenu">Steuern</span> →
+        <span class="guimenuitem">Bearbeiten</span> kontrolliert werden. Zum
+        Vergleich der Screenshot.</p><div class="screenshot"><div class="mediaobject"><img src="images/skr04-update-3804/steuerliste.png"></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s17.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s19.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
+      EUR&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.19. Verhalten des Bilanzberichts</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s19.html b/doc/html/ch02s19.html
index 8ef856976..a40ec5a21 100644
--- a/doc/html/ch02s19.html
+++ b/doc/html/ch02s19.html
@@ -1,27 +1,21 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.19. Rundung in Verkaufsbelegen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s18.html" title="2.18. Erfolgsrechnung"><link rel="next" href="ch02s20.html" title="2.20. Einstellungen pro Mandant"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.19. Rundung in Verkaufsbelegen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s18.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s20.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.19. Rundung in Verkaufsbelegen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.rounding"></a>2.19. Rundung in Verkaufsbelegen</h2></div></div></div><p>In der Schweiz hat die kleinste aktuell benutzte Münze den Wert
-      von 5 Rappen (0.05 CHF).</p><p>Auch wenn im elektronischen Zahlungsverkehr Beträge mit einer
-      Genauigkeit von 0.01 CHF verwendet werden können, ist es trotzdem nach
-      wie vor üblich, Rechnungen mit auf 0.05 CHF gerundeten Beträgen
-      auszustellen.</p><p>In kivitendo kann seit der Version 3.4.1 die Einstellung für eine
-      solche Rundung pro Mandant / Datenbank festgelegt werden.</p><p>Die Einstellung wird beim Erstellen der Datenbank bei
-      <code class="literal">Genauigkeit</code> festgelegt. Sie kann anschliessend über
-      das Webinterface von kivitendo nicht mehr verändert werden.</p><p>Abhängig vom Wert für <code class="varname">default_manager</code> in
-      <code class="filename">config/kivitendo.conf</code> werden dabei folgende Werte
-      voreingestellt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>0.05 (default_manager = swiss)</p></li><li class="listitem"><p>0.01 (default_manager = german)</p></li></ul></div><p>Der Wert wird in der Datenbank in der Tabelle <code class="varname">defaults
-      </code>in der Spalte <code class="varname">precision</code> gespeichert.</p><p>In allen Verkaufsangeboten, Verkaufsaufträgen, Verkaufsrechnungen
-      und Verkaufsgutschriften wird der Endbetrag inkl. MWST gerundet, wenn
-      dieser nicht der eingestellten Genauigkeit entspricht.</p><p>Beim Buchen einer Verkaufsrechnung wird der Rundungsbetrag
-      automatisch auf die in der Mandantenkonfiguration festgelegten
-      Standardkonten für Rundungserträge bzw. Rundungsaufwendungen
-      gebucht.</p><p>(Die berechnete MWST wird durch den Rundungsbetrag nicht mehr
-      verändert.)</p><p>Die in den Druckvorlagen zur Verfügung stehenden Variablen
-      <code class="varname">quototal</code>, <code class="varname">ordtotal</code> bzw.
-      <code class="varname">invtotal</code> enthalten den gerundeten Betrag.</p><p>
-            <span class="bold"><strong>Achtung:</strong></span> Werden Verkaufsbelege in
-      anderen Währungen als der Standardwährung erstellt, so muss in kivitendo
-      ab Version 3.4.1 die Genauigkeit 0.01 verwendet werden.</p><p>Das heisst, Firmen in der Schweiz, die teilweise
-      Verkaufsrechnungen in Euro oder anderen Währungen erstellen wollen,
-      müssen beim Erstellen der Datenbank als Genauigkeit 0.01 wählen und
-      können zur Zeit die 5er Rundung noch nicht nutzen.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s18.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s20.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.18. Erfolgsrechnung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.20. Einstellungen pro Mandant</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.19. Verhalten des Bilanzberichts</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s18.html" title="2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb"><link rel="next" href="ch02s20.html" title="2.20. Jahresabschluss"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.19. Verhalten des Bilanzberichts</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s18.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s20.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.19. Verhalten des Bilanzberichts"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.bilanz"></a>2.19. Verhalten des Bilanzberichts</h2></div></div></div><p>Bis Version 3.0 wurde "closedto" ("Bücher schließen zum") als
+      Grundlage für das Startdatum benutzt. Schließt man die Bücher allerdings
+      monatsweise führt dies zu falschen Werten.</p><p>In der Mandantenkonfiguration kann man dieses Verhalten genau
+      einstellen indem man:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>weiterhin closed_to benutzt (Default, es ändert sich nichts zu
+          vorher)</p></li><li class="listitem"><p>immer den Jahresanfang nimmt (1.1. relativ zum
+          Stichtag)</p></li><li class="listitem"><p>immer die letzte Eröffnungsbuchung als Startdatum nimmt</p><p>- mit Jahresanfang als Alternative wenn es keine EB-Buchungen
+          gibt</p><p>- oder mit "alle Buchungen" als Alternative"</p></li><li class="listitem"><p>mit Jahresanfang als Alternative wenn es keine EB-Buchungen
+          gibt</p></li><li class="listitem"><p>immer alle Buchungen seit Beginn der Datenbank nimmt</p></li></ul></div><p>Folgende Hinweise zu den Optionen: Das "Bücher schließen Datum"
+      ist sinnvoll, wenn man nur komplette Jahre schließt. Bei Wirtschaftsjahr
+      = Kalendarjahr entspricht dies aber auch dem Jahresanfang. "Alle
+      Buchungen" kann z.B. sinnvoll sein wenn man ohne Jahresabschluß
+      durchbucht. Eröffnungsbuchung mit "alle Buchungen" als Fallback ist z.B.
+      sinnvoll, wenn man am sich Anfang des zweiten Buchungsjahres befindet,
+      und noch keinen Jahreswechsel und auch noch keine EB-Buchungen hat. Bei
+      den Optionen mit EB-Buchungen wird vorausgesetzt, daß diese immer am 1.
+      Tag des Wirtschaftsjahres gebucht werden. Zur Sicherheit wird das
+      Startdatum im Bilanzbericht jetzt zusätzlich zum Stichtag mit angezeigt.
+      Das hilft auch bei der Kontrolle für den Abgleich mit der GuV bzw.
+      Erfolgsrechnung.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s18.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s20.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.20. Jahresabschluss</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s20.html b/doc/html/ch02s20.html
index ac383fb9a..98fe1fa86 100644
--- a/doc/html/ch02s20.html
+++ b/doc/html/ch02s20.html
@@ -1,16 +1,18 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.20. Einstellungen pro Mandant</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s19.html" title="2.19. Rundung in Verkaufsbelegen"><link rel="next" href="ch02s21.html" title="2.21. kivitendo ERP verwenden"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.20. Einstellungen pro Mandant</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s19.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s21.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.20. Einstellungen pro Mandant"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.client"></a>2.20. Einstellungen pro Mandant</h2></div></div></div><p>Einige Einstellungen können von einem Benutzer mit dem <a class="link" href="ch02s09.html#Zusammenh%C3%A4nge" title="2.9.1. Zusammenhänge">Recht</a> "Administration (Für die Verwaltung
-      der aktuellen Instanz aus einem Userlogin heraus)" gemacht werden. Diese
-      Einstellungen sind dann für die aktuellen Mandanten-Datenbank gültig.
-      Die Einstellungen sind unter <span class="guimenu">System</span> →
-      <span class="guisubmenu">Mandantenkonfiguration</span> erreichbar.</p><p>Bitte beachten Sie die Hinweise zu den einzelnen Einstellungen.
-      Einige Einstellungen sollten nicht ohne Weiteres im laufenden Betrieb
-      geändert werden (siehe auch <a class="link" href="ch02s15.html#config.eur.inventory-system-perpetual" title="2.15.4. Bemerkungen zur Bestandsmethode">Bemerkungen zu
-      Bestandsmethode</a>).</p><p>Die Einstellungen <code class="literal">show_bestbefore</code> und
-      <code class="literal">payments_changeable</code> aus dem Abschnitt
-      <code class="literal">features</code> und die Einstellungen im Abschnitt
-      <code class="literal">datev_check</code> (sofern schon vorhanden) der <a class="link" href="ch02s04.html" title="2.4. kivitendo-Konfigurationsdatei">kivitendo-Konfigurationsdatei</a> werden
-      bei einem Datenbankupdate einer älteren Version automatisch übernommen.
-      Diese Einträge können danach aus der Konfigurationsdatei entfernt
-      werden.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s19.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s21.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.19. Rundung in Verkaufsbelegen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.21. kivitendo ERP verwenden</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.20. Jahresabschluss</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s19.html" title="2.19. Verhalten des Bilanzberichts"><link rel="next" href="ch02s21.html" title="2.21. Erfolgsrechnung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.20. Jahresabschluss</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s19.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s21.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.20. Jahresabschluss"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.jahresabschluss"></a>2.20. Jahresabschluss</h2></div></div></div><p>Beim Jahresabschluss stehen 2 Methoden zur Verfügung, die in der
+      Buchungskonfiguration der Mandantenkonfiguration eingestellt werden
+      können.</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                  <span class="bold"><strong>Standard-Methode</strong></span>.</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>Sowohl Bestandskonten wie auch Erfolgskonten werden
+              abgeschlossen</p></li><li class="listitem"><p>Es wird ein Konto für das Verbuchen eines Jahresgewinns
+              verwendet und ein zweites Konto für das Verbuchen eines
+              Jahresverlusts.</p></li><li class="listitem"><p>Bei den Konten für den Jahresabschluss können bei den
+              Standardkonten in der Mandantenkonfiguration nur Aktiva-Konten
+              ausgewählt werden.</p></li><li class="listitem"><p>Der Jahresgewinn oder -verlust wird sowohl bei den
+              Jahresabschlussbuchungen wie auch bei den Eröffnungsbuchungen
+              verbucht.</p></li></ul></div></li><li class="listitem"><p>
+                  <span class="bold"><strong>Einfach-Methode</strong></span>.</p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>Nur Bestandskonten werden abgeschlossen</p></li><li class="listitem"><p>Für das Verbuchen eines Jahresgewinns oder -verlusts wird
+              das gleiche Konto verwendet.</p></li><li class="listitem"><p>Bei den Konten für den Jahresabschluss können bei den
+              Standardkonten in der Mandantenkonfiguration alle Konten
+              ausgewählt werden.</p></li><li class="listitem"><p>Der Jahresgewinn oder -verlust wird nur bei den
+              Eröffnungsbuchungen verbucht.</p></li></ul></div></li></ul></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s19.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s21.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.19. Verhalten des Bilanzberichts&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.21. Erfolgsrechnung</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s21.html b/doc/html/ch02s21.html
index 2bad9f794..28ab85742 100644
--- a/doc/html/ch02s21.html
+++ b/doc/html/ch02s21.html
@@ -1,8 +1,23 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>2.21. kivitendo ERP verwenden</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s20.html" title="2.20. Einstellungen pro Mandant"><link rel="next" href="ch03.html" title="Kapitel 3. Features und Funktionen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.21. kivitendo ERP verwenden</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s20.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.21. kivitendo ERP verwenden"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="kivitendo-ERP-verwenden"></a>2.21. kivitendo ERP verwenden</h2></div></div></div><p>Nach erfolgreicher Installation ist der Loginbildschirm unter
-      folgender URL erreichbar:</p><p>
-            <a class="ulink" href="http://localhost/kivitendo-erp/login.pl" target="_top">http://localhost/kivitendo-erp/login.pl</a>
-         </p><p>Die Administrationsseite erreichen Sie unter:</p><p>
-            <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
-         </p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s20.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.20. Einstellungen pro Mandant&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;Kapitel 3. Features und Funktionen</td></tr></table></div></body></html>
\ No newline at end of file
+   <title>2.21. Erfolgsrechnung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s20.html" title="2.20. Jahresabschluss"><link rel="next" href="ch02s22.html" title="2.22. Rundung in Verkaufsbelegen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.21. Erfolgsrechnung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s20.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s22.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.21. Erfolgsrechnung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.erfolgsrechnung"></a>2.21. Erfolgsrechnung</h2></div></div></div><p>Seit der Version 3.4.1 existiert in kivitendo der Bericht
+      <span class="bold"><strong> Erfolgsrechnung</strong></span>.</p><p>Die Erfolgsrechnung kann in der Mandantenkonfiguration unter
+      Features an- oder abgeschaltet werden. Mit der Einstellung
+      <code class="varname">default_manager = swiss </code> in der
+      <code class="filename">config/kivitendo.conf</code> wird beim neu Erstellen einer
+      Datenbank automatisch die Anzeige der Erfolgsrechnung im Menü
+      <span class="guimenu">Berichte </span> ausgewählt und ersetzt dort die GUV.</p><p>Im Gegensatz zur GUV werden bei der Erfolgsrechnung sämtliche
+      Aufwands- und Erlöskonten einzeln aufgelistet (analog zur Bilanz),
+      sortiert nach ERTRAG und AUFWAND.</p><p>Bei den Konteneinstellungen muss bei jedem Konto, das in der
+      Erfolgsrechnung erscheinen soll, unter <code class="varname">Sonstige
+      Einstellungen/Erfolgsrechnung</code> entweder
+      <code class="literal">01.Ertrag</code> oder <code class="literal">06.Aufwand</code>
+      ausgewählt werden.</p><p>Wird bei einem Erlöskonto <code class="literal">06.Aufwand</code>
+      ausgewählt, so wird dieses Konto als Aufwandsminderung unter AUFWAND
+      aufgelistet.</p><p>Wird bei einem Aufwandskonto <code class="literal">01.Ertrag</code>
+      ausgewählt, so wird dieses Konto als Ertragsminderung unter ERTRAG
+      aufgelistet.</p><p>Soll bei einer bereits bestehenden Buchhaltung in Zukunft
+      zusätzlich die Erfolgsrechnung als Bericht verwendet werden, so müssen
+      die Einstellungen zu allen Erlös- und Aufwandskonten unter
+      <code class="varname">Sonstige Einstellungen/Erfolgsrechnung</code> überprüft und
+      allenfalls neu gesetzt werden.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s20.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s22.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.20. Jahresabschluss&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.22. Rundung in Verkaufsbelegen</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s22.html b/doc/html/ch02s22.html
new file mode 100644
index 000000000..cda7bec98
--- /dev/null
+++ b/doc/html/ch02s22.html
@@ -0,0 +1,27 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>2.22. Rundung in Verkaufsbelegen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s21.html" title="2.21. Erfolgsrechnung"><link rel="next" href="ch02s23.html" title="2.23. Einstellungen pro Mandant"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.22. Rundung in Verkaufsbelegen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s21.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s23.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.22. Rundung in Verkaufsbelegen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.rounding"></a>2.22. Rundung in Verkaufsbelegen</h2></div></div></div><p>In der Schweiz hat die kleinste aktuell benutzte Münze den Wert
+      von 5 Rappen (0.05 CHF).</p><p>Auch wenn im elektronischen Zahlungsverkehr Beträge mit einer
+      Genauigkeit von 0.01 CHF verwendet werden können, ist es trotzdem nach
+      wie vor üblich, Rechnungen mit auf 0.05 CHF gerundeten Beträgen
+      auszustellen.</p><p>In kivitendo kann seit der Version 3.4.1 die Einstellung für eine
+      solche Rundung pro Mandant / Datenbank festgelegt werden.</p><p>Die Einstellung wird beim Erstellen der Datenbank bei
+      <code class="literal">Genauigkeit</code> festgelegt. Sie kann anschliessend über
+      das Webinterface von kivitendo nicht mehr verändert werden.</p><p>Abhängig vom Wert für <code class="varname">default_manager</code> in
+      <code class="filename">config/kivitendo.conf</code> werden dabei folgende Werte
+      voreingestellt:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>0.05 (default_manager = swiss)</p></li><li class="listitem"><p>0.01 (default_manager = german)</p></li></ul></div><p>Der Wert wird in der Datenbank in der Tabelle <code class="varname">defaults
+      </code>in der Spalte <code class="varname">precision</code> gespeichert.</p><p>In allen Verkaufsangeboten, Verkaufsaufträgen, Verkaufsrechnungen
+      und Verkaufsgutschriften wird der Endbetrag inkl. MWST gerundet, wenn
+      dieser nicht der eingestellten Genauigkeit entspricht.</p><p>Beim Buchen einer Verkaufsrechnung wird der Rundungsbetrag
+      automatisch auf die in der Mandantenkonfiguration festgelegten
+      Standardkonten für Rundungserträge bzw. Rundungsaufwendungen
+      gebucht.</p><p>(Die berechnete MWST wird durch den Rundungsbetrag nicht mehr
+      verändert.)</p><p>Die in den Druckvorlagen zur Verfügung stehenden Variablen
+      <code class="varname">quototal</code>, <code class="varname">ordtotal</code> bzw.
+      <code class="varname">invtotal</code> enthalten den gerundeten Betrag.</p><p>
+            <span class="bold"><strong>Achtung:</strong></span> Werden Verkaufsbelege in
+      anderen Währungen als der Standardwährung erstellt, so muss in kivitendo
+      ab Version 3.4.1 die Genauigkeit 0.01 verwendet werden.</p><p>Das heisst, Firmen in der Schweiz, die teilweise
+      Verkaufsrechnungen in Euro oder anderen Währungen erstellen wollen,
+      müssen beim Erstellen der Datenbank als Genauigkeit 0.01 wählen und
+      können zur Zeit die 5er Rundung noch nicht nutzen.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s21.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s23.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.21. Erfolgsrechnung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.23. Einstellungen pro Mandant</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s23.html b/doc/html/ch02s23.html
new file mode 100644
index 000000000..df40c51ff
--- /dev/null
+++ b/doc/html/ch02s23.html
@@ -0,0 +1,16 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>2.23. Einstellungen pro Mandant</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s22.html" title="2.22. Rundung in Verkaufsbelegen"><link rel="next" href="ch02s24.html" title="2.24. kivitendo ERP verwenden"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.23. Einstellungen pro Mandant</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s22.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch02s24.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.23. Einstellungen pro Mandant"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="config.client"></a>2.23. Einstellungen pro Mandant</h2></div></div></div><p>Einige Einstellungen können von einem Benutzer mit dem <a class="link" href="ch02s11.html#Zusammenh%C3%A4nge" title="2.11.1. Zusammenhänge">Recht</a> "Administration (Für die Verwaltung
+      der aktuellen Instanz aus einem Userlogin heraus)" gemacht werden. Diese
+      Einstellungen sind dann für die aktuellen Mandanten-Datenbank gültig.
+      Die Einstellungen sind unter <span class="guimenu">System</span> →
+      <span class="guisubmenu">Mandantenkonfiguration</span> erreichbar.</p><p>Bitte beachten Sie die Hinweise zu den einzelnen Einstellungen.
+      Einige Einstellungen sollten nicht ohne Weiteres im laufenden Betrieb
+      geändert werden (siehe auch <a class="link" href="ch02s17.html#config.eur.inventory-system-perpetual" title="2.17.4. Bemerkungen zur Bestandsmethode">Bemerkungen zu
+      Bestandsmethode</a>).</p><p>Die Einstellungen <code class="literal">show_bestbefore</code> und
+      <code class="literal">payments_changeable</code> aus dem Abschnitt
+      <code class="literal">features</code> und die Einstellungen im Abschnitt
+      <code class="literal">datev_check</code> (sofern schon vorhanden) der <a class="link" href="ch02s05.html" title="2.5. kivitendo-Konfigurationsdatei">kivitendo-Konfigurationsdatei</a> werden
+      bei einem Datenbankupdate einer älteren Version automatisch übernommen.
+      Diese Einträge können danach aus der Konfigurationsdatei entfernt
+      werden.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s22.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch02s24.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.22. Rundung in Verkaufsbelegen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;2.24. kivitendo ERP verwenden</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch02s24.html b/doc/html/ch02s24.html
new file mode 100644
index 000000000..b9b02549b
--- /dev/null
+++ b/doc/html/ch02s24.html
@@ -0,0 +1,8 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>2.24. kivitendo ERP verwenden</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch02.html" title="Kapitel 2. Installation und Grundkonfiguration"><link rel="prev" href="ch02s23.html" title="2.23. Einstellungen pro Mandant"><link rel="next" href="ch03.html" title="Kapitel 3. Features und Funktionen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2.24. kivitendo ERP verwenden</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s23.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 2. Installation und Grundkonfiguration</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="2.24. kivitendo ERP verwenden"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="kivitendo-ERP-verwenden"></a>2.24. kivitendo ERP verwenden</h2></div></div></div><p>Nach erfolgreicher Installation ist der Loginbildschirm unter
+      folgender URL erreichbar:</p><p>
+            <a class="ulink" href="http://localhost/kivitendo-erp/login.pl" target="_top">http://localhost/kivitendo-erp/login.pl</a>
+         </p><p>Die Administrationsseite erreichen Sie unter:</p><p>
+            <a class="ulink" href="http://localhost/kivitendo-erp/controller.pl?action=Admin/login" target="_top">http://localhost/kivitendo-erp/controller.pl?action=Admin/login</a>
+         </p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s23.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.23. Einstellungen pro Mandant&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;Kapitel 3. Features und Funktionen</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03.html b/doc/html/ch03.html
index d75edb01a..783d3d196 100644
--- a/doc/html/ch03.html
+++ b/doc/html/ch03.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>Kapitel 3. Features und Funktionen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch02s21.html" title="2.21. kivitendo ERP verwenden"><link rel="next" href="ch03s02.html" title="3.2. Bankerweiterung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 3. Features und Funktionen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s21.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 3. Features und Funktionen"><div class="titlepage"><div><div><h2 class="title"><a name="features"></a>Kapitel 3. Features und Funktionen</h2></div></div></div><div class="sect1" title="3.1. Wiederkehrende Rechnungen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.periodic-invoices"></a>3.1. Wiederkehrende Rechnungen</h2></div></div></div><div class="sect2" title="3.1.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="features.periodic-invoices.introduction"></a>3.1.1. Einführung</h3></div></div></div><p>Wiederkehrende Rechnungen werden als normale Aufträge definiert
+   <title>Kapitel 3. Features und Funktionen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch02s24.html" title="2.24. kivitendo ERP verwenden"><link rel="next" href="ch03s02.html" title="3.2. Bankerweiterung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 3. Features und Funktionen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s24.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 3. Features und Funktionen"><div class="titlepage"><div><div><h2 class="title"><a name="features"></a>Kapitel 3. Features und Funktionen</h2></div></div></div><div class="sect1" title="3.1. Wiederkehrende Rechnungen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.periodic-invoices"></a>3.1. Wiederkehrende Rechnungen</h2></div></div></div><div class="sect2" title="3.1.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="features.periodic-invoices.introduction"></a>3.1.1. Einführung</h3></div></div></div><p>Wiederkehrende Rechnungen werden als normale Aufträge definiert
         und konfiguriert, mit allen dazugehörigen Kunden- und Artikelangaben.
         Die konfigurierten Aufträge werden später automatisch in Rechnungen
         umgewandelt, so als ob man den Workflow benutzen würde, und auch die
@@ -35,7 +35,7 @@
               automatisch nach hinten geschoben wird.</p></dd><dt><span class="term">Drucken</span></dt><dd><p>Sind Drucker konfiguriert, so kann man sich die erstellten
               Rechnungen auch gleich ausdrucken lassen.</p></dd></dl></div><p>Nach Erstellung der Rechnungen kann eine E-Mail mit
         Informationen zu den erstellten Rechnungen verschickt werden.
-        Konfiguriert wird dies in der <a class="link" href="ch02s04.html#config.config-file.sections-parameters" title="2.4.2. Abschnitte und Parameter">Konfigurationsdatei</a>
+        Konfiguriert wird dies in der <a class="link" href="ch02s05.html#config.config-file.sections-parameters" title="2.5.2. Abschnitte und Parameter">Konfigurationsdatei</a>
         
                <code class="filename">config/kivitendo.conf</code> im Abschnitt
         <code class="varname">[periodic_invoices]</code>.</p></div><div class="sect2" title="3.1.3. Spezielle Variablen"><div class="titlepage"><div><div><h3 class="title"><a name="features.periodic-invoices.variables"></a>3.1.3. Spezielle Variablen</h3></div></div></div><p>Um die erzeugten Rechnungen individualisieren zu können, werden
@@ -147,12 +147,12 @@
         Rechnungen inaktiv", mit denen man sich einen Überglick über die
         wiederkehrenden Rechnungen verschaffen kann.</p></div><div class="sect2" title="3.1.5. Erzeugung der eigentlichen Rechnungen"><div class="titlepage"><div><div><h3 class="title"><a name="features.periodic-invoices.task-server"></a>3.1.5. Erzeugung der eigentlichen Rechnungen</h3></div></div></div><p>Die zeitliche und periodische Überprüfung, ob eine
         wiederkehrende Rechnung automatisch erstellt werden soll, geschieht
-        durch den <a class="link" href="ch02s07.html" title="2.7. Der Task-Server">Task-Server</a>, einen
+        durch den <a class="link" href="ch02s08.html" title="2.8. Der Task-Server">Task-Server</a>, einen
         externen Dienst, der automatisch beim Start des Servers gestartet
         werden sollte.</p></div><div class="sect2" title="3.1.6. Erste Rechnung für aktuellen Monat erstellen"><div class="titlepage"><div><div><h3 class="title"><a name="features.periodic-invoices.create-for-current-month"></a>3.1.6. Erste Rechnung für aktuellen Monat erstellen</h3></div></div></div><p>Will man im laufenden Monat eine monatlich wiederkehrende
         Rechnung inkl. des laufenden Monats starten, stellt man das Startdatum
         auf den Monatsanfang und wartet ein paar Minuten, bis der Task-Server
-        den neu konfigurieren Auftrag erkennt und daraus eine Rechnung
+        den neu konfigurierten Auftrag erkennt und daraus eine Rechnung
         generiert hat. Alternativ setzt man das Startdatum auf den
         Monatsersten des Folgemonats und erstellt die erste Rechnung direkt
-        manuell über den Workflow.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s21.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.21. kivitendo ERP verwenden&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.2. Bankerweiterung</td></tr></table></div></body></html>
\ No newline at end of file
+        manuell über den Workflow.</p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s24.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">2.24. kivitendo ERP verwenden&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.2. Bankerweiterung</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03s02.html b/doc/html/ch03s02.html
index 1c2668da8..e45524ca5 100644
--- a/doc/html/ch03s02.html
+++ b/doc/html/ch03s02.html
@@ -1,6 +1,8 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.2. Bankerweiterung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="next" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.2. Bankerweiterung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.2. Bankerweiterung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.bank"></a>3.2. Bankerweiterung</h2></div></div></div><div class="sect2" title="3.2.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="features.bank.introduction"></a>3.2.1. Einführung</h3></div></div></div><p>Die Beschreibung der Bankerweiterung befindet sich derzeit noch
+   <title>3.2. Bankerweiterung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="next" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.2. Bankerweiterung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.2. Bankerweiterung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.bank"></a>3.2. Bankerweiterung</h2></div></div></div><div class="sect2" title="3.2.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="features.bank.introduction"></a>3.2.1. Einführung</h3></div></div></div><p>Die Beschreibung der Bankerweiterung befindet sich derzeit noch
         im Wiki und soll von dort später hierhin übernommen werden:</p><p>
-               <a class="ulink" href="http://redmine.kivitendo-premium.de/projects/forum/wiki/Bankerweiterung" target="_top">http://redmine.kivitendo-premium.de/projects/forum/wiki/Bankerweiterung</a>
+               <a class="ulink" href="https://www.kivitendo.de/redmine/projects/forum/wiki/Bankerweiterung" target="_top">
+        https://www.kivitendo.de/redmine/projects/forum/wiki/Bankerweiterung
+        </a>
             </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s03.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">Kapitel 3. Features und Funktionen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.3. Dokumentenvorlagen und verfügbare Variablen</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03s03.html b/doc/html/ch03s03.html
index 7c455f0ab..f18975a86 100644
--- a/doc/html/ch03s03.html
+++ b/doc/html/ch03s03.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.3. Dokumentenvorlagen und verfügbare Variablen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s02.html" title="3.2. Bankerweiterung"><link rel="next" href="ch03s04.html" title="3.4. Excel-Vorlagen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.3. Dokumentenvorlagen und verfügbare Variablen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.3. Dokumentenvorlagen und verfügbare Variablen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dokumentenvorlagen-und-variablen"></a>3.3. Dokumentenvorlagen und verfügbare Variablen</h2></div></div></div><div class="sect2" title="3.3.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.einf%C3%BChrung"></a>3.3.1. Einführung</h3></div></div></div><p>Dies ist eine Auflistung der Standard-Dokumentenvorlagen und
+   <title>3.3. Dokumentenvorlagen und verfügbare Variablen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s02.html" title="3.2. Bankerweiterung"><link rel="next" href="ch03s04.html" title="3.4. Excel-Vorlagen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.3. Dokumentenvorlagen und verfügbare Variablen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.3. Dokumentenvorlagen und verfügbare Variablen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dokumentenvorlagen-und-variablen"></a>3.3. Dokumentenvorlagen und verfügbare Variablen</h2></div></div></div><div class="sect2" title="3.3.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.einf%C3%BChrung"></a>3.3.1. Einführung</h3></div></div></div><p>Dies ist eine Auflistung der Standard-Dokumentenvorlagen und
         aller zur Bearbeitung verfügbaren Variablen. Eine Variable wird in
         einer Vorlage durch ihren Inhalt ersetzt, wenn sie in der Form
         <code class="function">&lt;%variablenname%&gt;</code> verwendet wird. Für
@@ -421,7 +421,21 @@
                      </span></dt><dd><p>Vorgangsbezeichnung</p></dd><dt><span class="term">
                         <code class="varname">transdate</code>
                      </span></dt><dd><p>Auftragsdatum wenn die Rechnung aus einem Auftrag
-                erstellt wurde</p></dd></dl></div></div><div class="sect3" title="3.3.8.2. Variablen für jeden Posten auf der Rechnung"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.invoice-posten"></a>3.3.8.2. Variablen für jeden Posten auf der Rechnung</h4></div></div></div><div class="variablelist"><dl><dt><span class="term">
+                erstellt wurde</p></dd></dl></div></div><div class="sect3" title="3.3.8.2. Variablen für die schweizer QR-Rechnung"><div class="titlepage"><div><div><h4 class="title"><a name="d0e6096"></a>3.3.8.2. Variablen für die schweizer QR-Rechnung</h4></div></div></div><p>Diese Variablen können mit dem LaTeX Modul qrbill verwendet
+          werden: <a class="ulink" href="https://ctan.org/pkg/qrbill?lang=de" target="_top">https://ctan.org/pkg/qrbill?lang=de</a>
+               </p><p>Für die Erstellung von QR-Rechnungen mit OpenDocument Vorlagen
+          siehe: <a class="xref" href="ch02s15.html" title="2.15. OpenDocument-Vorlagen">Abschnitt&nbsp;2.15, „OpenDocument-Vorlagen“</a>
+               </p><div class="variablelist"><dl><dt><span class="term">qrbill_iban</span></dt><dd><p>IBAN/QR-IBAN des Rechnungsstellers, aus <span class="emphasis"><em>System
+                → Bankkonten</em></span>
+                        </p></dd><dt><span class="term">qrbill_biller_countrycode</span></dt><dd><p>Länderkürzel des Rechnungsstellers gem. ISO 3166, aus
+                <span class="emphasis"><em>Mandantenkonfiguration → Firmenname und
+                -adresse</em></span>
+                        </p></dd><dt><span class="term">qrbill_customer_countrycode</span></dt><dd><p>Länderkürzel des Rechnungsempfängers gem. ISO 3166, aus
+                der jeweiligen Rechnung</p></dd><dt><span class="term">qrbill_amount</span></dt><dd><p>Betrag für die QR-Rechnung (Zahl ohne
+                Tausendertrennzeichen mit zwei Nachkommastellen), entsprechend
+                total</p></dd><dt><span class="term">qr_reference</span></dt><dd><p>QR-Referenz der jeweiligen Rechnung, sofern in der
+                <span class="emphasis"><em>Mandantenkonfiguration → Features → Variante QR-IBAN
+                mit QR-Referenz erzeugen</em></span> aktiviert ist</p></dd></dl></div></div><div class="sect3" title="3.3.8.3. Variablen für jeden Posten auf der Rechnung"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.invoice-posten"></a>3.3.8.3. Variablen für jeden Posten auf der Rechnung</h4></div></div></div><div class="variablelist"><dl><dt><span class="term">
                         <code class="varname">bin</code>
                      </span></dt><dd><p>Stellage</p></dd><dt><span class="term">
                         <code class="varname">description</code>
@@ -515,14 +529,46 @@
                      </span></dt><dd><p>Einheit</p></dd><dt><span class="term">
                         <code class="varname">weight</code>
                      </span></dt><dd><p>Gewicht</p></dd></dl></div><p>Für jeden Posten gibt es ein Unterarray mit den Informationen
-          über Lieferanten und Lieferantenartikelnummer. Diese müssen mit
+          über Lieferanten und Lieferantenartikelnummer, Kunde und Kundenartikelnummer
+          und Kunden- bzw. Lieferantentyp und zugehöriger Artikelnummer mit Beschreibung
+          und Langtext. Diese müssen jeweils mit
           einer <code class="function">foreach</code>-Schleife ausgegeben werden, da
-          für jeden Artikel mehrere Lieferanteninformationen hinterlegt sein
+          für jeden Artikel mehrere Lieferanten- und Kundeninformationen bzw.
+          kunden- bzw. lieferantenspezifische Informationen hinterlegt sein
           können. Die Variablen dafür lauten:</p><div class="variablelist"><dl><dt><span class="term">
                         <code class="varname">make</code>
                      </span></dt><dd><p>Lieferant</p></dd><dt><span class="term">
                         <code class="varname">model</code>
-                     </span></dt><dd><p>Lieferantenartikelnummer</p></dd></dl></div></div><div class="sect3" title="3.3.8.3. Variablen für die einzelnen Zahlungseingänge"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.invoice-zahlungen"></a>3.3.8.3. Variablen für die einzelnen Zahlungseingänge</h4></div></div></div><div class="variablelist"><dl><dt><span class="term">
+                     </span></dt><dd><p>Lieferantenartikelnummer</p></dd><dt><span class="term">
+                        <code class="varname">mm_part_description</code>
+                     </span></dt><dd><p>Lieferantenartikelbeschreibung</p></dd><dt><span class="term">
+                        <code class="varname">mm_part_longdescription</code>
+                     </span></dt><dd><p>Lieferantenartikelbeschreibung (Langtext)</p></dd><dt><span class="term">
+                        <code class="varname">customer_make</code>
+                     </span></dt><dd><p>Kunde</p></dd><dt><span class="term">
+                        <code class="varname">customer_model</code>
+                     </span></dt><dd><p>Kundenartikelnummer</p></dd><dt><span class="term">
+                        <code class="varname">cm_part_description</code>
+                     </span></dt><dd><p>Kundenartikelbeschreibung</p></dd><dt><span class="term">
+                        <code class="varname">cm_part_longdescription</code>
+                     </span></dt><dd><p>Kundenartikelbeschreibung (Langtext)</p></dd><dt><span class="term">
+                        <code class="varname">business_make</code>
+                     </span></dt><dd><p>Kunden-/Lieferantentyp</p></dd><dt><span class="term">
+                        <code class="varname">business_model</code>
+                     </span></dt><dd><p>Kunden-/Lieferantentyp-spezifische Artikelnummer</p></dd><dt><span class="term">
+                        <code class="varname">bm_part_description</code>
+                     </span></dt><dd><p>Kunden-/Lieferantentyp-spezifische Artikelbeschreibung</p></dd><dt><span class="term">
+                        <code class="varname">bm_part_longdescription</code>
+                     </span></dt><dd><p>Kunden-/Lieferantentyp-spezifische Artikelbeschreibung (Langtext)</p></dd></dl></div></div><div class="sect3" title="3.3.8.4. Benutzerdefinierte Variablen für jeden Posten auf der Rechnung"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.invoice-posten-cvars"></a>3.3.8.4. Benutzerdefinierte Variablen für jeden Posten auf der Rechnung</h4></div></div></div><p>
+            Für jeden Posten stehen auch die benutzerdefinierten Variablen zum
+            Artikel zur Verfügung. Ihre Namen bestehen aus dem Präfix
+            <code class="varname">ic_cvar_</code> und dem vom Benutzer festgelegten
+            Variablennamen.
+          </p><p>
+            Ebenso stehen die benutzerdefinierten Variablen zum positionsbezogenen
+            Projekt unter dem Namen mit dem Präfix <code class="varname">project_cvar_</code>
+            und dem vom Benutzer festgelegten Variablennamen zur Verfügung.
+          </p></div><div class="sect3" title="3.3.8.5. Variablen für die einzelnen Zahlungseingänge"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.invoice-zahlungen"></a>3.3.8.5. Variablen für die einzelnen Zahlungseingänge</h4></div></div></div><div class="variablelist"><dl><dt><span class="term">
                         <code class="varname">payment</code>
                      </span></dt><dd><p>Betrag</p></dd><dt><span class="term">
                         <code class="varname">paymentaccount</code>
@@ -532,7 +578,7 @@
                         <code class="varname">paymentmemo</code>
                      </span></dt><dd><p>Memo</p></dd><dt><span class="term">
                         <code class="varname">paymentsource</code>
-                     </span></dt><dd><p>Beleg</p></dd></dl></div></div><div class="sect3" title="3.3.8.4. Benutzerdefinierte Kunden- und Lieferantenvariablen"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.benutzerdefinierte-variablen-vc"></a>3.3.8.4. Benutzerdefinierte Kunden- und Lieferantenvariablen</h4></div></div></div><p>Die vom Benutzer definierten Variablen für Kunden und
+                     </span></dt><dd><p>Beleg</p></dd></dl></div></div><div class="sect3" title="3.3.8.6. Benutzerdefinierte Kunden- und Lieferantenvariablen"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.benutzerdefinierte-variablen-vc"></a>3.3.8.6. Benutzerdefinierte Kunden- und Lieferantenvariablen</h4></div></div></div><p>Die vom Benutzer definierten Variablen für Kunden und
           Lieferanten stehen beim Ausdruck von Einkaufs- und Verkaufsbelegen
           ebenfalls zur Verfügung. Ihre Namen setzen sich aus dem Präfix
           <code class="varname">vc_cvar_</code> und dem vom Benutzer festgelegten
@@ -544,7 +590,9 @@
           unter einem ähnlichen Namensschema zur Verfügung. Hier lautet der
           Präfix <code class="varname">shiptocvar_</code>.</p><p>Analog stehen die benutzerdefinierten Variablen für
           Ansprechpersonen mit dem Namenspräfix <code class="varname">cp_cvar_</code>
-          zur Verfügung.</p></div></div><div class="sect2" title="3.3.9. Variablen in Mahnungen und Rechnungen über Mahngebühren"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.dunning"></a>3.3.9. Variablen in Mahnungen und Rechnungen über Mahngebühren</h3></div></div></div><div class="sect3" title="3.3.9.1. Namen der Vorlagen"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.dunning-vorlagennamen"></a>3.3.9.1. Namen der Vorlagen</h4></div></div></div><p>Die Namen der Vorlagen werden im System-Menü vom Benutzer
+          zur Verfügung.</p><p>Auch für das globale Projekt des Belegs stehen die
+          benutzerdefinierten Variablen mit dem Namenspräfix
+          <code class="varname">project_cvar_</code> zur Verfügung.</p></div></div><div class="sect2" title="3.3.9. Variablen in Mahnungen und Rechnungen über Mahngebühren"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.dunning"></a>3.3.9. Variablen in Mahnungen und Rechnungen über Mahngebühren</h3></div></div></div><div class="sect3" title="3.3.9.1. Namen der Vorlagen"><div class="titlepage"><div><div><h4 class="title"><a name="dokumentenvorlagen-und-variablen.dunning-vorlagennamen"></a>3.3.9.1. Namen der Vorlagen</h4></div></div></div><p>Die Namen der Vorlagen werden im System-Menü vom Benutzer
           eingegeben. Wird für ein Mahnlevel die Option zur automatischen
           Erstellung einer Rechnung über die Mahngebühren und Zinsen
           aktiviert, so wird der Name der Vorlage für diese Rechnung aus dem
@@ -633,7 +681,7 @@
                         <code class="varname">invdate</code>
                      </span></dt><dd><p>Rechnungsdatum</p></dd><dt><span class="term">
                         <code class="varname">invnumber</code>
-                     </span></dt><dd><p>Rechnungsnummer</p></dd></dl></div></div></div><div class="sect2" title="3.3.10. Variablen in anderen Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.andere-vorlagen"></a>3.3.10. Variablen in anderen Vorlagen</h3></div></div></div><div class="sect3" title="3.3.10.1. Einführung"><div class="titlepage"><div><div><h4 class="title"><a name="d0e6135"></a>3.3.10.1. Einführung</h4></div></div></div><p>Die Variablen in anderen Vorlagen sind ähnlich wie in der
+                     </span></dt><dd><p>Rechnungsnummer</p></dd></dl></div></div></div><div class="sect2" title="3.3.10. Variablen in anderen Vorlagen"><div class="titlepage"><div><div><h3 class="title"><a name="dokumentenvorlagen-und-variablen.andere-vorlagen"></a>3.3.10. Variablen in anderen Vorlagen</h3></div></div></div><div class="sect3" title="3.3.10.1. Einführung"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7058"></a>3.3.10.1. Einführung</h4></div></div></div><p>Die Variablen in anderen Vorlagen sind ähnlich wie in der
           Rechnung. Allerdings heißen die Variablen, die mit
           <code class="varname">inv</code> beginnen, jetzt anders. Bei den Angeboten
           fangen sie mit <code class="varname">quo</code> für "quotation" an:
@@ -778,7 +826,7 @@ Zahlungseingänge:
           wie das Perl-Array der Variablen <code class="varname">variablenname</code>
           Elemente enthät. Dieses Konstrukt wird zur Ausgabe der einzelnen
           Posten einer Rechnung / eines Angebots sowie zur Ausgabe der Steuern
-          benutzt. In jedem Durchlauf werden die <a class="link" href="ch03s03.html#dokumentenvorlagen-und-variablen.invoice-posten" title="3.3.8.2. Variablen für jeden Posten auf der Rechnung">zeilenbezogenen
+          benutzt. In jedem Durchlauf werden die <a class="link" href="ch03s03.html#dokumentenvorlagen-und-variablen.invoice-posten" title="3.3.8.3. Variablen für jeden Posten auf der Rechnung">zeilenbezogenen
           Variablen</a> jeweils auf den Wert für die aktuelle Position
           gesetzt.</p><p>Die Syntax sieht normalerweise wie folgt aus:</p><pre class="programlisting">&lt;%foreach number%&gt;
 Position: &lt;%runningnumber%&gt;
diff --git a/doc/html/ch03s04.html b/doc/html/ch03s04.html
index 19a2b731e..59821ee16 100644
--- a/doc/html/ch03s04.html
+++ b/doc/html/ch03s04.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.4. Excel-Vorlagen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen"><link rel="next" href="ch03s05.html" title="3.5. Mandantenkonfiguration Lager"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.4. Excel-Vorlagen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.4. Excel-Vorlagen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="excel-templates"></a>3.4. Excel-Vorlagen</h2></div></div></div><div class="sect2" title="3.4.1. Zusammenfassung"><div class="titlepage"><div><div><h3 class="title"><a name="excel-templates.summary"></a>3.4.1. Zusammenfassung</h3></div></div></div><p>Dieses Dokument beschreibt den Mechanismus, mit dem
+   <title>3.4. Excel-Vorlagen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s03.html" title="3.3. Dokumentenvorlagen und verfügbare Variablen"><link rel="next" href="ch03s05.html" title="3.5. Mandantenkonfiguration Lager"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.4. Excel-Vorlagen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.4. Excel-Vorlagen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="excel-templates"></a>3.4. Excel-Vorlagen</h2></div></div></div><div class="sect2" title="3.4.1. Zusammenfassung"><div class="titlepage"><div><div><h3 class="title"><a name="excel-templates.summary"></a>3.4.1. Zusammenfassung</h3></div></div></div><p>Dieses Dokument beschreibt den Mechanismus, mit dem
         Exceltemplates abgearbeitet werden, und die Einschränkungen, die damit
         einhergehen.</p></div><div class="sect2" title="3.4.2. Bedienung"><div class="titlepage"><div><div><h3 class="title"><a name="excel-templates.usage"></a>3.4.2. Bedienung</h3></div></div></div><p>Der Excel Mechanismus muss in der Konfigurationsdatei aktiviert
         werden. Die Konfigurationsoption heißt <code class="varname">excel_templates =
diff --git a/doc/html/ch03s05.html b/doc/html/ch03s05.html
index a623a985b..115a83d7f 100644
--- a/doc/html/ch03s05.html
+++ b/doc/html/ch03s05.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.5. Mandantenkonfiguration Lager</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s04.html" title="3.4. Excel-Vorlagen"><link rel="next" href="ch03s06.html" title="3.6. Schweizer Kontenpläne"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.5. Mandantenkonfiguration Lager</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.5. Mandantenkonfiguration Lager"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.warehouse"></a>3.5. Mandantenkonfiguration Lager</h2></div></div></div><p>Die Lagerverwaltung in kivitendo funktioniert standardmässig wie
+   <title>3.5. Mandantenkonfiguration Lager</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s04.html" title="3.4. Excel-Vorlagen"><link rel="next" href="ch03s06.html" title="3.6. Schweizer Kontenpläne"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.5. Mandantenkonfiguration Lager</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.5. Mandantenkonfiguration Lager"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.warehouse"></a>3.5. Mandantenkonfiguration Lager</h2></div></div></div><p>Die Lagerverwaltung in kivitendo funktioniert standardmässig wie
       folgt: Wird ein Lager mit einem Lagerplatz angelegt, so gibt es die
       Möglichkeit hier über den Menüpunkt Lager entsprechende Warenbewegungen
       durchzuführen. Ferner kann jede Position eines Lieferscheins ein-, bzw.
diff --git a/doc/html/ch03s06.html b/doc/html/ch03s06.html
index 5444a322c..8d10398c2 100644
--- a/doc/html/ch03s06.html
+++ b/doc/html/ch03s06.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.6. Schweizer Kontenpläne</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s05.html" title="3.5. Mandantenkonfiguration Lager"><link rel="next" href="ch03s07.html" title="3.7. Artikelklassifizierung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.6. Schweizer Kontenpläne</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.6. Schweizer Kontenpläne"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.swiss-charts-of-accounts"></a>3.6. Schweizer Kontenpläne</h2></div></div></div><p>Seit der Version 3.5 stehen in kivitendo 3 Kontenpläne für den
+   <title>3.6. Schweizer Kontenpläne</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s05.html" title="3.5. Mandantenkonfiguration Lager"><link rel="next" href="ch03s07.html" title="3.7. Artikelklassifizierung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.6. Schweizer Kontenpläne</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.6. Schweizer Kontenpläne"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.swiss-charts-of-accounts"></a>3.6. Schweizer Kontenpläne</h2></div></div></div><p>Seit der Version 3.5 stehen in kivitendo 3 Kontenpläne für den
       Einsatz in der Schweiz zur Verfügung, einer für Firmen und
       Organisationen, die nicht mehrwertsteuerpflichtig sind, einer für
       Firmen, die mehrwertsteuerpflichtig sind und einer speziell für
diff --git a/doc/html/ch03s07.html b/doc/html/ch03s07.html
index 32ef9e4be..6580bca0a 100644
--- a/doc/html/ch03s07.html
+++ b/doc/html/ch03s07.html
@@ -1,15 +1,15 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.7. Artikelklassifizierung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s06.html" title="3.6. Schweizer Kontenpläne"><link rel="next" href="ch03s08.html" title="3.8. Dateiverwaltung (Mini-DMS)"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.7. Artikelklassifizierung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.7. Artikelklassifizierung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.part_classification"></a>3.7. Artikelklassifizierung</h2></div></div></div><div class="sect2" title="3.7.1. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6817"></a>3.7.1. Übersicht</h3></div></div></div><p>Die Klassifizierung von Artikeln dient einer weiteren
+   <title>3.7. Artikelklassifizierung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s06.html" title="3.6. Schweizer Kontenpläne"><link rel="next" href="ch03s08.html" title="3.8. Dateiverwaltung (Mini-DMS)"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.7. Artikelklassifizierung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.7. Artikelklassifizierung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.part_classification"></a>3.7. Artikelklassifizierung</h2></div></div></div><div class="sect2" title="3.7.1. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7740"></a>3.7.1. Übersicht</h3></div></div></div><p>Die Klassifizierung von Artikeln dient einer weiteren
         Gliederung, um zum Beispiel den Einkauf vom Verkauf zu trennen,
         gekennzeichnet durch eine Beschreibung (z.B. "Einkauf") und ein Kürzel
         (z.B. "E"). Für jede Klassifizierung besteht eine Beschreibung und
         eine Abkürzung die normalerweise aus einem Zeichen besteht, kann aber
         auf mehrere Zeichen erweitert werden, falls zur Unterscheidung
-        notwendig. Sinnvoll sind jedoch nur maximal 2 Zeichen.</p></div><div class="sect2" title="3.7.2. Basisklassifizierung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6822"></a>3.7.2. Basisklassifizierung</h3></div></div></div><p>Als Basisklassifizierungen gibt es</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Einkauf</p></li><li class="listitem"><p>Verkauf</p></li><li class="listitem"><p>Handelsware</p></li><li class="listitem"><p>Produktion</p></li><li class="listitem"><p>- keine - (diese wird bei einer Aktualisierung für alle
+        notwendig. Sinnvoll sind jedoch nur maximal 2 Zeichen.</p></div><div class="sect2" title="3.7.2. Basisklassifizierung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7745"></a>3.7.2. Basisklassifizierung</h3></div></div></div><p>Als Basisklassifizierungen gibt es</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Einkauf</p></li><li class="listitem"><p>Verkauf</p></li><li class="listitem"><p>Handelsware</p></li><li class="listitem"><p>Produktion</p></li><li class="listitem"><p>- keine - (diese wird bei einer Aktualisierung für alle
             existierenden Artikel verwendet und ist gültig für Verkauf und
             Einkauf)</p></li></ul></div><p>Es können weitere Klassifizierungen angelegt werden. So kann es
-        z.B. für separat auszuweisende Artikel folgende Klassen geben:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Lieferung (Logistik, Transport) mit Kürzel L</p></li><li class="listitem"><p>Material (Verpackungsmaterial) mit Kürzel M</p></li></ul></div></div><div class="sect2" title="3.7.3. Attribute"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6852"></a>3.7.3. Attribute</h3></div></div></div><p>Bisher haben die Klassifizierungen folgende Attribute, die auch
+        z.B. für separat auszuweisende Artikel folgende Klassen geben:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Lieferung (Logistik, Transport) mit Kürzel L</p></li><li class="listitem"><p>Material (Verpackungsmaterial) mit Kürzel M</p></li></ul></div></div><div class="sect2" title="3.7.3. Attribute"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7775"></a>3.7.3. Attribute</h3></div></div></div><p>Bisher haben die Klassifizierungen folgende Attribute, die auch
         alle gleichzeitg gültig sein können</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>gültig für Verkauf - dieser Artikel kann im Verkauf genutzt
             werden</p></li><li class="listitem"><p>gültig für Einkauf - dieser Artikel kann im Einkauf genutzt
             werden</p></li><li class="listitem"><p>separat ausweisen - hierzu gibt es zur Dokumentengenerierung
@@ -19,7 +19,7 @@
         pro separat auszuweisenden Klassifizierungen die Variable<span class="bold"><strong>&lt; %separate_X_subtotal%&gt;</strong></span>, wobei X das
         Kürzel der Klassifizierung ist.</p><p>Im obigen Beispiel wäre das für Lieferkosten <span class="bold"><strong>&lt;%separate_L_subtotal%&gt;</strong></span> und für
         Verpackungsmaterial <span class="bold"><strong>
-        &lt;%separate_M_subtotal%&gt;</strong></span>.</p></div><div class="sect2" title="3.7.4. Zwei-Zeichen Abkürzung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6883"></a>3.7.4. Zwei-Zeichen Abkürzung</h3></div></div></div><p>Der Typ des Artikels und die Klassifizierung werden durch zwei
+        &lt;%separate_M_subtotal%&gt;</strong></span>.</p></div><div class="sect2" title="3.7.4. Zwei-Zeichen Abkürzung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7806"></a>3.7.4. Zwei-Zeichen Abkürzung</h3></div></div></div><p>Der Typ des Artikels und die Klassifizierung werden durch zwei
         Buchstaben dargestellt. Der erste Buchstabe ist eine Lokalisierung des
         Artikel-Typs ('P','A','S'), deutsch 'W', 'E', und 'D' für Ware
         Erzeugnis oder Dienstleistung und ggf. weiterer Typen.</p><p>Der zweite Buchstabe (und ggf. auch ein dritter, falls nötig)
diff --git a/doc/html/ch03s08.html b/doc/html/ch03s08.html
index 17a969ee5..527a463e0 100644
--- a/doc/html/ch03s08.html
+++ b/doc/html/ch03s08.html
@@ -1,10 +1,10 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.8. Dateiverwaltung (Mini-DMS)</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s07.html" title="3.7. Artikelklassifizierung"><link rel="next" href="ch03s09.html" title="3.9. Webshop-Api"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.8. Dateiverwaltung (Mini-DMS)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s09.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.8. Dateiverwaltung (Mini-DMS)"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.file_managment"></a>3.8. Dateiverwaltung (Mini-DMS)</h2></div></div></div><div class="sect2" title="3.8.1. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6895"></a>3.8.1. Übersicht</h3></div></div></div><p>Parallel zum alten WebDAV gibt es ein Datei-Management-System,
+   <title>3.8. Dateiverwaltung (Mini-DMS)</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s07.html" title="3.7. Artikelklassifizierung"><link rel="next" href="ch03s09.html" title="3.9. Webshop-Api"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.8. Dateiverwaltung (Mini-DMS)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s09.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.8. Dateiverwaltung (Mini-DMS)"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.file_managment"></a>3.8. Dateiverwaltung (Mini-DMS)</h2></div></div></div><div class="sect2" title="3.8.1. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7818"></a>3.8.1. Übersicht</h3></div></div></div><p>Parallel zum alten WebDAV gibt es ein Datei-Management-System,
         das Dateien verschiedenen Typs verwaltet. Dies können</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>aus ERP-Daten per LaTeX Template erzeugte
             PDF-Dokumente,</p></li><li class="listitem"><p>zu bestimmten ERP-Daten gehörende Anhangdateien
             unterschiedlichen Formats,</p></li><li class="listitem"><p>per Scanner eingelesene PDF-Dateien,</p></li><li class="listitem"><p>per E-Mail empfangene Dateianhänge unterschiedlichen
-            Formats,</p></li><li class="listitem"><p>sowie speziel für Artikel hochgeladene Bilder sein.</p></li></ol></div><div class="screenshot"><div class="mediaobject"><img src="images/DMS-Overview.png"></div></div></div><div class="sect2" title="3.8.2. Struktur"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6922"></a>3.8.2. Struktur</h3></div></div></div><p>Über eine vom Speichermedium unabhängige Zwischenschicht werden
+            Formats,</p></li><li class="listitem"><p>sowie speziel für Artikel hochgeladene Bilder sein.</p></li></ol></div><div class="screenshot"><div class="mediaobject"><img src="images/DMS-Overview.png"></div></div></div><div class="sect2" title="3.8.2. Struktur"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7845"></a>3.8.2. Struktur</h3></div></div></div><p>Über eine vom Speichermedium unabhängige Zwischenschicht werden
         die Dateien und ihre Versionen in der Datenbank verwaltet. Darunter
         können verschiedene Implementierungen (Backends) gleichzeitig
         existieren:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Dateisystem</p></li><li class="listitem"><p>WebDAV</p></li><li class="listitem"><p>Schnittstelle zu externen
@@ -23,7 +23,7 @@
         für "attachment" und "image" nur die Quelle "uploaded". Für "document"
         gibt es auf jeden Fall die Quelle "created". Die Quellen "scanner" und
         "email" müssen derzeit in der Datenbank konfiguriert werden (siehe
-        <a class="xref" href="ch03s08.html#file_management.dbconfig" title="3.8.4.2. Datenbank-Konfigurierung">Datenbank-Konfigurierung</a>).</p></div><div class="sect2" title="3.8.3. Anwendung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e6974"></a>3.8.3. Anwendung</h3></div></div></div><p>Die Daten werden bei den ERP-Objekten als extra Reiter
+        <a class="xref" href="ch03s08.html#file_management.dbconfig" title="3.8.4.2. Datenbank-Konfigurierung">Datenbank-Konfigurierung</a>).</p></div><div class="sect2" title="3.8.3. Anwendung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7897"></a>3.8.3. Anwendung</h3></div></div></div><p>Die Daten werden bei den ERP-Objekten als extra Reiter
         dargestellt. Eine Verkaufsrechnung z.B. hat die Reiter "Dokumente" und
         "Dateianhänge".</p><div class="screenshot"><div class="mediaobject"><img src="images/DMS-Anhaenge.png"></div></div><p>Bei den Dateianhängen wird immer nur die aktuelle Version einer
         Datei angezeigt. Wird eine Datei mit gleichem Namen hochgeladen, so
@@ -39,13 +39,13 @@
         so sind diese z.B. bei Einkaufsrechnungen sichtbar:</p><div class="screenshot"><div class="mediaobject"><img src="images/DMS-Dokumente-Scanner.png"></div></div><p>Statt des Löschens wird hier die Datei zurück zur Quelle
         verschoben. Somit kann die Datei anschließend an ein anderes
         ERP-Objekt angehängt werden.</p><p>Derzeit sind "Titel" und "Beschreibung" noch nicht genutzt. Sie
-        sind bisher nur bei Bildern relevant.</p></div><div class="sect2" title="3.8.4. Konfigurierung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7017"></a>3.8.4. Konfigurierung</h3></div></div></div><div class="sect3" title="3.8.4.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h4 class="title"><a name="file_management.clientconfig"></a>3.8.4.1. Mandantenkonfiguration</h4></div></div></div><div class="sect4" title="3.8.4.1.1. Reiter &#34;Features&#34;"><div class="titlepage"><div><div><h5 class="title"><a name="d0e7023"></a>3.8.4.1.1. Reiter "Features"</h5></div></div></div><p>Unter dem Reiter <span class="bold"><strong>Features</strong></span>
+        sind bisher nur bei Bildern relevant.</p></div><div class="sect2" title="3.8.4. Konfigurierung"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7940"></a>3.8.4. Konfigurierung</h3></div></div></div><div class="sect3" title="3.8.4.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h4 class="title"><a name="file_management.clientconfig"></a>3.8.4.1. Mandantenkonfiguration</h4></div></div></div><div class="sect4" title="3.8.4.1.1. Reiter &#34;Features&#34;"><div class="titlepage"><div><div><h5 class="title"><a name="d0e7946"></a>3.8.4.1.1. Reiter "Features"</h5></div></div></div><p>Unter dem Reiter <span class="bold"><strong>Features</strong></span>
             im Abschnitt Dateimanagement ist neben dem "alten" WebDAV das
             Dateimangement generell zu- und abschaltbar, sowie die Zuordnung
             der Dateitypen zu Backends. Die Löschbarkeit von Dateien, sowie
             die maximale Uploadgröße sind Backend-unabhängig</p><div class="screenshot"><div class="mediaobject"><img src="images/DMS-ClientConfig.png"></div></div><p>Die einzelnen Backends sind einzeln einschaltbar.
             Spezifische Backend-Konfigurierungen sind hier noch
-            ergänzbar.</p></div><div class="sect4" title="3.8.4.1.2. Reiter &#34;Allgemeine Dokumentenanhänge&#34;"><div class="titlepage"><div><div><h5 class="title"><a name="d0e7039"></a>3.8.4.1.2. Reiter "Allgemeine Dokumentenanhänge"</h5></div></div></div><p>Unter dem Reiter <span class="bold"><strong>Allgemeine
+            ergänzbar.</p></div><div class="sect4" title="3.8.4.1.2. Reiter &#34;Allgemeine Dokumentenanhänge&#34;"><div class="titlepage"><div><div><h5 class="title"><a name="d0e7962"></a>3.8.4.1.2. Reiter "Allgemeine Dokumentenanhänge"</h5></div></div></div><p>Unter dem Reiter <span class="bold"><strong>Allgemeine
             Dokumentenanhänge</strong></span> kann für alle ERP-Dokumente (
             Angebote, Aufträge, Lieferscheine, Rechnungen im Verkauf und
             Einkauf ) allgemeingültige Anhänge hochgeladen werden.</p><div class="screenshot"><div class="mediaobject"><img src="images/DMS-Allgemeine-Dokumentenanhaenge.png"></div></div><p>Diese Anhänge werden beim Generieren von PDF-Dateien an die
diff --git a/doc/html/ch03s09.html b/doc/html/ch03s09.html
index 3bb78a34c..cf1dd575b 100644
--- a/doc/html/ch03s09.html
+++ b/doc/html/ch03s09.html
@@ -1,13 +1,13 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.9. Webshop-Api</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s08.html" title="3.8. Dateiverwaltung (Mini-DMS)"><link rel="next" href="ch03s10.html" title="3.10. ZUGFeRD Rechnungen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.9. Webshop-Api</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s08.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s10.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.9. Webshop-Api"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e7073"></a>3.9. Webshop-Api</h2></div></div></div><p>Das Shopmodul bietet die Möglichkeit Onlineshopartikel und
+   <title>3.9. Webshop-Api</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s08.html" title="3.8. Dateiverwaltung (Mini-DMS)"><link rel="next" href="ch03s10.html" title="3.10. ZUGFeRD Rechnungen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.9. Webshop-Api</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s08.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s10.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.9. Webshop-Api"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e7996"></a>3.9. Webshop-Api</h2></div></div></div><p>Das Shopmodul bietet die Möglichkeit Onlineshopartikel und
       Onlineshopbestellungen zu verwalten und zu bearbeiten.</p><p>Es ist Multishopfähig, d.h. Artikel können mehreren oder
       unterschiedlichen Shops zugeordnet werden. Bestellungen können aus
       mehreren Shops geholt werden.</p><p>Zur Zeit bietet das Modul nur einen Connector zur REST-Api von
       Shopware. Weitere Connectoren können dazu programmiert und eingerichtet
-      werden.</p><div class="sect2" title="3.9.1. Rechte für die Webshopapi"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7082"></a>3.9.1. Rechte für die Webshopapi</h3></div></div></div><p>In der Administration können folgende Rechte vergeben
-        werden</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Webshopartikel anlegen und bearbeiten</p></li><li class="listitem"><p>Shopbestellungen holen und bearbeiten</p></li><li class="listitem"><p>Shop anlegen und bearbeiten</p></li></ul></div></div><div class="sect2" title="3.9.2. Konfiguration"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7097"></a>3.9.2. Konfiguration</h3></div></div></div><p>Unter System-&gt;Webshops können Shops angelegt und konfiguriert
-        werden</p><div class="mediaobject"><img src="images/Shop_Listing.png"></div></div><div class="sect2" title="3.9.3. Webshopartikel"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7105"></a>3.9.3. Webshopartikel</h3></div></div></div><div class="sect3" title="3.9.3.1. Shopvariablenreiter in Artikelstammdaten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7108"></a>3.9.3.1. Shopvariablenreiter in Artikelstammdaten</h4></div></div></div><p>Mit dem Recht "Shopartikel anlegen und bearbeiten" und des
+      werden.</p><div class="sect2" title="3.9.1. Rechte für die Webshopapi"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8005"></a>3.9.1. Rechte für die Webshopapi</h3></div></div></div><p>In der Administration können folgende Rechte vergeben
+        werden</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Webshopartikel anlegen und bearbeiten</p></li><li class="listitem"><p>Shopbestellungen holen und bearbeiten</p></li><li class="listitem"><p>Shop anlegen und bearbeiten</p></li></ul></div></div><div class="sect2" title="3.9.2. Konfiguration"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8020"></a>3.9.2. Konfiguration</h3></div></div></div><p>Unter System-&gt;Webshops können Shops angelegt und konfiguriert
+        werden</p><div class="mediaobject"><img src="images/Shop_Listing.png"></div></div><div class="sect2" title="3.9.3. Webshopartikel"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8028"></a>3.9.3. Webshopartikel</h3></div></div></div><div class="sect3" title="3.9.3.1. Shopvariablenreiter in Artikelstammdaten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8031"></a>3.9.3.1. Shopvariablenreiter in Artikelstammdaten</h4></div></div></div><p>Mit dem Recht "Shopartikel anlegen und bearbeiten" und des
           Markers <span class="bold"><strong>"Shopartikel" in den Basisdaten
           </strong></span>zeigt sich der Reiter "Shopvariablen" in den
           Artikelstammdaten. Hier können jetzt die Artikel mit
@@ -16,11 +16,11 @@
           Stelle können auch beliebig viele Bilder dem Shopartikel zugeordnet
           werden. Artikelbilder gelten für alle Shops.</p><div class="mediaobject"><img src="images/Shop_Artikel.png"></div><p>Die Artikelgruppen werden direkt vom Shopsystem geholt somit
           ist es möglich einen Artikel auch mehreren Gruppen
-          zuzuordenen</p></div><div class="sect3" title="3.9.3.2. Shopartikelliste"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7121"></a>3.9.3.2. Shopartikelliste</h4></div></div></div><p>Unter dem Menu Webshop-&gt;Webshop Artikel hat man nochmal
+          zuzuordenen</p></div><div class="sect3" title="3.9.3.2. Shopartikelliste"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8044"></a>3.9.3.2. Shopartikelliste</h4></div></div></div><p>Unter dem Menu Webshop-&gt;Webshop Artikel hat man nochmal
           eine Gesamtübersicht. Von hier aus ist es möglich Artikel im Stapel
           unter verschiedenen Kriterien &lt;alles&gt;&lt;nur Preis&gt;&lt;nur
           Bestand&gt;&lt;Preis und Bestand&gt; an die jeweiligen Shops
-          hochzuladen.</p><div class="mediaobject"><img src="images/Shop_Artikel_Listing.png"></div></div></div><div class="sect2" title="3.9.4. Bestellimport"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7129"></a>3.9.4. Bestellimport</h3></div></div></div><p>Unter dem Menupunkt Webshop-&gt;Webshop Import öffnet sich die
+          hochzuladen.</p><div class="mediaobject"><img src="images/Shop_Artikel_Listing.png"></div></div></div><div class="sect2" title="3.9.4. Bestellimport"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8052"></a>3.9.4. Bestellimport</h3></div></div></div><p>Unter dem Menupunkt Webshop-&gt;Webshop Import öffnet sich die
         Bestellimportsliste. Hier ist sind Möglichkeiten gegeben Neue
         Bestellungen vom Shop abzuholen, geholte Bestellungen im Stapel oder
         einzeln als Auftrag zu transferieren. Die Liste kann nach
@@ -52,7 +52,7 @@
             auch der Grund für die Auftragssperre sein.</p></li><li class="listitem"><p>Die Buttons "Auftrag erstellen" und "Kunde mit
             Rechnungsadresse überschreiben" zeigen sich erst, wenn ein Kunde
             aus dem Listing ausgewählt ist.</p></li><li class="listitem"><p>Es ist aber möglich die Shopbestellung zu löschen.</p></li><li class="listitem"><p>Ist eine Bestellung schon übernommen, zeigen sich an dieser
-            Stelle, die dazugehörigen Belegverknüpfungen.</p></li></ul></div></div><div class="sect2" title="3.9.5. Mapping der Daten"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7182"></a>3.9.5. Mapping der Daten</h3></div></div></div><p>Das Mapping der kivitendo Daten mit den Shopdaten geschieht in
+            Stelle, die dazugehörigen Belegverknüpfungen.</p></li></ul></div></div><div class="sect2" title="3.9.5. Mapping der Daten"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8105"></a>3.9.5. Mapping der Daten</h3></div></div></div><p>Das Mapping der kivitendo Daten mit den Shopdaten geschieht in
         der Datei SL/ShopConnector/&lt;SHOPCONNECTORNAME&gt;.pm
         z.B.:SL/ShopConnector/Shopware.pm</p><p>In dieser Datei gibt es einen Bereich wo die Bestellpostionen,
         die Bestellkopfdaten und die Artikeldaten gemapt werden. In dieser
diff --git a/doc/html/ch03s10.html b/doc/html/ch03s10.html
index ef0de2ebd..038b2640e 100644
--- a/doc/html/ch03s10.html
+++ b/doc/html/ch03s10.html
@@ -1,54 +1,54 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>3.10. ZUGFeRD Rechnungen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s09.html" title="3.9. Webshop-Api"><link rel="next" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.10. ZUGFeRD Rechnungen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s09.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.10. ZUGFeRD Rechnungen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.zugferd"></a>3.10. ZUGFeRD Rechnungen</h2></div></div></div><div class="sect2" title="3.10.1. Vorbedingung"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.preamble"></a>3.10.1. Vorbedingung</h3></div></div></div><p>
-          Für die Erstellung von ZUGFeRD PDFs wird TexLive2018 oder höher benötigt.
-         </p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
-          Wer kein TexLive2018 oder höher installieren kann, kann eine lokale Umgebung nur für kivitendo wie folgt erzeugen:
-         </p><pre class="programlisting">
-        1. Download des offiziellen Installers von https://www.tug.org/texlive/quickinstall.html
+   <title>3.10. ZUGFeRD Rechnungen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s09.html" title="3.9. Webshop-Api"><link rel="next" href="ch03s11.html" title="3.11. Reklamationen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.10. ZUGFeRD Rechnungen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s09.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s11.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.10. ZUGFeRD Rechnungen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.zugferd"></a>3.10. ZUGFeRD Rechnungen</h2></div></div></div><div class="sect2" title="3.10.1. Vorbedingung"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.preamble"></a>3.10.1. Vorbedingung</h3></div></div></div><p>
+            Für die Erstellung von ZUGFeRD PDFs wird TexLive2018 oder höher benötigt.
+           </p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>
+            Wer kein TexLive2018 oder höher installieren kann, kann eine lokale Umgebung nur für kivitendo wie folgt erzeugen:
+           </p><pre class="programlisting">
+          1. Download des offiziellen Installers von https://www.tug.org/texlive/quickinstall.html
 
-        2. Installer ausführen, Standard-Ort für Installation belassen, evtl. ein paar Pakete abwählen, installieren lassen
+          2. Installer ausführen, Standard-Ort für Installation belassen, evtl. ein paar Pakete abwählen, installieren lassen
 
-        3. Ein kleine Script »run_pdflatex.sh« anlegen, das den PATH auf das  Installationsverezichnis setzt und pdflatex ausführt:
+          3. Ein kleine Script »run_pdflatex.sh« anlegen, das den PATH auf das  Installationsverezichnis setzt und pdflatex ausführt:
 
-        ------------------------------------------------------------
-        #!/bin/bash
+          ------------------------------------------------------------
+          #!/bin/bash
 
-        export PATH=/usr/local/texlive/2020/bin/x86_64-linux:$PATH
-        hash -r
+          export PATH=/usr/local/texlive/2020/bin/x86_64-linux:$PATH
+          hash -r
 
-        exec pdflatex "$@"
-        ------------------------------------------------------------
+          exec latexmk --pdflatex "$@"
+          ------------------------------------------------------------
 
-        4. In config/kivitendo.conf den Parameter »latex« auf den Pfad zu »run_pdflatex.sh« setzen
+          4. In config/kivitendo.conf den Parameter »latex« auf den Pfad zu »run_pdflatex.sh« setzen
 
-        5. Webserver neu starten
-        </pre></td></tr></table></div></div><div class="sect2" title="3.10.2. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.summary"></a>3.10.2. Übersicht</h3></div></div></div><p>Mit der Version 3.5.6 bietet kivitendo die Möglichkeit ZUGFeRD
-			Rechnungen zu erstellen, sowie auch  ZUGFeRD Rechnungen direkt in
-			kivitendo einzulesen. </p><p>Bei  ZUGFeRD Rechnungen handelt es sich um eine PDF Datei in
-			der eine XML-Datei eingebettet ist. Der Aufbau der XML-Datei ist
-			standardisiert und ermöglicht so den Austausch zwischen
-			den verschiedenen Softwareprodukten. Kivitendo setzt mit der
-			Version 3.5.6 den ZUGFeRD 2.1 Standard um.</p><p>Weiter Details zu ZUGFeRD sind unter diesem Link zu finden:
-			<a class="ulink" href="https://www.ferd-net.de/standards/was-ist-zugferd/index.html" target="_top">https://www.ferd-net.de/standards/was-ist-zugferd/index.html</a>
-      
+          5. Webserver neu starten
+          </pre></td></tr></table></div></div><div class="sect2" title="3.10.2. Übersicht"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.summary"></a>3.10.2. Übersicht</h3></div></div></div><p>Mit der Version 3.5.6 bietet kivitendo die Möglichkeit ZUGFeRD
+        Rechnungen zu erstellen, sowie auch  ZUGFeRD Rechnungen direkt in
+        kivitendo einzulesen. </p><p>Bei  ZUGFeRD Rechnungen handelt es sich um eine PDF Datei in
+        der eine XML-Datei eingebettet ist. Der Aufbau der XML-Datei ist
+        standardisiert und ermöglicht so den Austausch zwischen
+        den verschiedenen Softwareprodukten. Kivitendo setzt mit der
+        Version 3.5.6 den ZUGFeRD 2.1 Standard um.</p><p>Weiter Details zu ZUGFeRD sind unter diesem Link zu finden:
+        <a class="ulink" href="https://www.ferd-net.de/standards/was-ist-zugferd/index.html" target="_top">https://www.ferd-net.de/standards/was-ist-zugferd/index.html</a>
+        
             </p></div><div class="sect2" title="3.10.3. Erstellen von ZUGFeRD Rechnungen in Kivitendo"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.create_zugferd_bills"></a>3.10.3. Erstellen von ZUGFeRD Rechnungen in Kivitendo</h3></div></div></div><p>Für die Erstellung von ZUGFeRD Rechnungen bedarf es in
-			kivitendo zwei Dinge:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Die Erstellung muss in der Mandantenkonfiguration
-					aktiviert sein</p></li><li class="listitem"><p>Beim mindestens einem Bankkonto muss die Option
-					„Nutzung von ZUGFeRD“ aktiviert sein</p></li></ol></div><div class="sect3" title="3.10.3.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7229"></a>3.10.3.1. Mandantenkonfiguration</h4></div></div></div><p>Die Einstellung für die Erstellung von ZUGFeRD Rechnungen
-				erfolgt unter „System“ → „Mandatenkonfiguration“ → „Features“.
-				Im Abschnitt „Einkauf und Verkauf“ finden Sie die Einstellung
-				„Verkaufsrechnungen mit ZUGFeRD-Daten erzeugen“.
-				Hier besteht die Auswahl zwischen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>ZUGFeRD-Rechnungen erzeugen</p></li><li class="listitem"><p>ZUGFeRD-Rechnungen im Testmodus erzeugen</p></li><li class="listitem"><p>Keine ZUGFeRD Rechnungen erzeugen</p></li></ul></div><p>Rechnungen die als PDF erzeugt werden, werden je nach
-				Einstellung nun im ZUGFeRD Format ausgegeben.</p></div><div class="sect3" title="3.10.3.2. Konfiguration der Bankkonten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7246"></a>3.10.3.2. Konfiguration der Bankkonten</h4></div></div></div><p>Unter „System → Bankkonten“ muss bei mindestens einem
-				Bankkonto die Option „Nutzung mit ZUGFeRD“ auf „Ja“ gestellt
-				werden.</p></div></div><div class="sect2" title="3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.read_zugferd_bills"></a>3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo</h3></div></div></div><p>Es lassen sich auch Rechnungen von Kreditoren, die im
-			ZUGFeRD Format erstellt wurden, nach Kivitendo importieren.
-			Hierfür müssen auch zwei Voraussetzungen erfüllt werden:
-			</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Beim Lieferanten muss die Umsatzsteuer-ID und das
-					Bankkonto hinterlegt sein</p></li><li class="listitem"><p>Für den Kreditoren muss eine Buchungsvorlage existieren.</p></li></ol></div><p>Wenn diese Voraussetzungen erfüllt sind, kann die Rechnung
-			über „Finanzbuchhaltung“ → „Factur-X-/ZUGFeRD-Import“ über die „Durchsuchen“
-			Schaltfläche ausgewählt werden und über die Schaltfläche „Import“
-			eingeladen werden. Es öffnet sich daraufhin die Kreditorenbuchung.
-			Die auslesbaren Daten aus dem eingebetteten XML der PDF Datei
-			werden in der Kreditorenbuchung ergänzt.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s09.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch04.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.9. Webshop-Api&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;Kapitel 4. Entwicklerdokumentation</td></tr></table></div></body></html>
\ No newline at end of file
+        kivitendo zwei Dinge:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Die Erstellung muss in der Mandantenkonfiguration
+            aktiviert sein</p></li><li class="listitem"><p>Beim mindestens einem Bankkonto muss die Option
+            „Nutzung von ZUGFeRD“ aktiviert sein</p></li></ol></div><div class="sect3" title="3.10.3.1. Mandantenkonfiguration"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8152"></a>3.10.3.1. Mandantenkonfiguration</h4></div></div></div><p>Die Einstellung für die Erstellung von ZUGFeRD Rechnungen
+          erfolgt unter „System“ → „Mandatenkonfiguration“ → „Features“.
+          Im Abschnitt „Einkauf und Verkauf“ finden Sie die Einstellung
+          „Verkaufsrechnungen mit ZUGFeRD-Daten erzeugen“.
+          Hier besteht die Auswahl zwischen:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>ZUGFeRD-Rechnungen erzeugen</p></li><li class="listitem"><p>ZUGFeRD-Rechnungen im Testmodus erzeugen</p></li><li class="listitem"><p>Keine ZUGFeRD Rechnungen erzeugen</p></li></ul></div><p>Rechnungen die als PDF erzeugt werden, werden je nach
+          Einstellung nun im ZUGFeRD Format ausgegeben.</p></div><div class="sect3" title="3.10.3.2. Konfiguration der Bankkonten"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8169"></a>3.10.3.2. Konfiguration der Bankkonten</h4></div></div></div><p>Unter „System → Bankkonten“ muss bei mindestens einem
+          Bankkonto die Option „Nutzung mit ZUGFeRD“ auf „Ja“ gestellt
+          werden.</p></div></div><div class="sect2" title="3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo"><div class="titlepage"><div><div><h3 class="title"><a name="features.zugferd.read_zugferd_bills"></a>3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo</h3></div></div></div><p>Es lassen sich auch Rechnungen von Kreditoren, die im
+        ZUGFeRD Format erstellt wurden, nach Kivitendo importieren.
+        Hierfür müssen auch zwei Voraussetzungen erfüllt werden:
+        </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Beim Lieferanten muss die Umsatzsteuer-ID und das
+            Bankkonto hinterlegt sein</p></li><li class="listitem"><p>Für den Kreditoren muss eine Buchungsvorlage existieren.</p></li></ol></div><p>Wenn diese Voraussetzungen erfüllt sind, kann die Rechnung
+        über „Finanzbuchhaltung“ → „Factur-X-/ZUGFeRD-Import“ über die „Durchsuchen“
+        Schaltfläche ausgewählt werden und über die Schaltfläche „Import“
+        eingeladen werden. Es öffnet sich daraufhin die Kreditorenbuchung.
+        Die auslesbaren Daten aus dem eingebetteten XML der PDF Datei
+        werden in der Kreditorenbuchung ergänzt.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s09.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s11.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.9. Webshop-Api&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.11. Reklamationen</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03s11.html b/doc/html/ch03s11.html
new file mode 100644
index 000000000..bb05eed8d
--- /dev/null
+++ b/doc/html/ch03s11.html
@@ -0,0 +1,5 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>3.11. Reklamationen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s10.html" title="3.10. ZUGFeRD Rechnungen"><link rel="next" href="ch03s12.html" title="3.12. Dispositionsmanager/Einkaufshelfer"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.11. Reklamationen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s10.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s12.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.11. Reklamationen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.reclamations"></a>3.11. Reklamationen</h2></div></div></div><p> Reklamationen dienen dazu im Verkauf die Kundenzufriedenheit zu verbessern und Fehler in der Abwicklung von Aufträgen aufzuspüren und dann zu vermeiden.</p><p>Im Einkauf helfen Reklamationen beanstandete Lieferungen zu verwalten und zu kontrollieren.</p><div class="sect2" title="3.11.1. Konfiguration des Reklamationsmodul"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8195"></a>3.11.1. Konfiguration des Reklamationsmodul</h3></div></div></div><p>Unter dem Menu "System-&gt;Reklamationsgründe" muss mindestens ein Reklamationsgrund erfasst werden.</p><div class="mediaobject"><img src="images/Reklamationsgruende_anlegen.png"></div><p>Aufgrund der Gründe können später in den Berichten Auswertungen gemacht werden.</p><div class="mediaobject"><img src="images/Reklamationsgruende_liste.png"></div></div><div class="sect2" title="3.11.2. Reklamation erfassen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8208"></a>3.11.2. Reklamation erfassen</h3></div></div></div><p>Aus den Belegen EK/VK Auftrag, EK/VK Lieferschein, EK/VK Rechnung kann unter "Workflow-&gt;Reklöamation erfassen" eine dem Workflow zugehörige Reklamation erfasst werden.
+          Die Reklamationsmaske ähnelt im großem die der Auftragsmaske.</p><div class="mediaobject"><img src="images/Reklamation_erfassen.png"></div><p>Es werden alle Positionen aus dem Beleg übernomen. Deswegen müssen hie die Positionen angepasst werden.
+          Zusätzlich muss noch ein Reklamationsgrund angegeben werden.</p><div class="mediaobject"><img src="images/Reklamation_erfassen_grund.png"></div><p>Die Reklamationsgründe sind für spätere Auswertungen notwendig</p><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left"><a name="reclamations.anmerkung_grund_einkauf"></a>Anmerkung</th></tr><tr><td align="left" valign="top"><p>Anmerkung: Da bei einem Auftrag, sowohl im EK als auch im VK, noch keine Ware versendet bzw. empfangen wurde, könnte hier ein Reklamationsgrund "Lieferver sein.</p></td></tr></table></div></div><div class="sect2" title="3.11.3. Reklamationen auswerten"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8226"></a>3.11.3. Reklamationen auswerten</h3></div></div></div><p>Bisher gibt es nur eine Liste mit Reklamationen und deren Filtermöglichkeiten.</p><div class="mediaobject"><img src="images/Reklamation_erfassen_grund.png"></div><p>Einen individuellen Reklamationsbericht kann über einen "benutzerdefinierten Datenexport" erstellt werden</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s10.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s12.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.10. ZUGFeRD Rechnungen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.12. Dispositionsmanager/Einkaufshelfer</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03s12.html b/doc/html/ch03s12.html
new file mode 100644
index 000000000..2fc08b96b
--- /dev/null
+++ b/doc/html/ch03s12.html
@@ -0,0 +1,14 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>3.12. Dispositionsmanager/Einkaufshelfer</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s11.html" title="3.11. Reklamationen"><link rel="next" href="ch03s13.html" title="3.13. Zeiterfassung"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.12. Dispositionsmanager/Einkaufshelfer</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s11.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch03s13.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.12. Dispositionsmanager/Einkaufshelfer"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.dispositionsmanager"></a>3.12. Dispositionsmanager/Einkaufshelfer</h2></div></div></div><p> Der Einkaufshelfer generiert Lieferantenaufträge anhand eines Warenkorbes. Der Warenkorb kann
+      einzeln oder mit dem Meldebestandsbericht gefüllt werden. Mit dem Filter „Lieferant“ im
+      Warenkorb werden die Artikel einem Lieferanten zugeordnet und können dann bestellt, d.h. ein
+      Lieferantenauftragerstellt, werden.</p><div class="sect2" title="3.12.1. So kommen die Artikel in den Einkaufswarenkorb:"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8241"></a>3.12.1. So kommen die Artikel in den Einkaufswarenkorb:</h3></div></div></div><p>1) Sofern ein Artikel einen oder mehrere Lieferanten hat kann dieser über den Button „Einkaufen“
+        in den Einkaufswarenkorn gelegt werden. Soll der Einkauf über den Mindestlagerbestand gesteuert werden sind die Felder "Mindestlagerbestand" und "Bestellmenge" auszufüllen.</p><div class="mediaobject"><img src="images/Disp-Artikel.png"></div><p>Der Button „Einkaufen“ ist deaktiviert, wenn es keinen Lieferanten zu diesem Artikel gibt oder der
+        Artikel schon im Einkaufswarenkorb liegt.</p><p>2) Bericht „Meldebestand“
+      Über das Menu "Einkauf-&gt;Meldebestand" kann der Meldebestand abgerufen werden</p><div class="mediaobject"><img src="images/Disp-Einkauf-meldeb.png"></div><p>Die obere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben und können
+        sofern markiert über die Aktion "Einkaufen" in den Einkaufswarenkorb gelegt werden. Hierzu muss
+        das Feld Mindesbestand in den Artikelstammdaten einen Wert &gt; 0 haben</p><p>Die untere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben aber bestellt sind.</p></div><div class="sect2" title="3.12.2. Der Einkaufswarenkorb"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8260"></a>3.12.2. Der Einkaufswarenkorb</h3></div></div></div><p>Ohne Filter: der erste Lieferant ist ausgewählt. Hier kann jetzt auch ein anderer Lieferant
+        ausgewählt werden.</p><div class="mediaobject"><img src="images/Disp-Einkauf-wrnkrb1.png"></div><p>Wird dann nach einem Lieferanten gefiltert und dieser ist und bleibt eindeutig, kann daraus ein
+        Lieferantenauftrag erstellt werden.</p><div class="mediaobject"><img src="images/Disp-Einkauf-wrnkrb.png"></div><p>Die obere Tabelle zeigt die Artikel an, die den Mindestbestand unterschritten haben, der untere Teil zeigt alle
+        Artikel des Lieferanten an, somit ist es möglich diese Artikel auszuwählen und gleich mitzubestellen</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s11.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch03s13.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.11. Reklamationen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;3.13. Zeiterfassung</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch03s13.html b/doc/html/ch03s13.html
new file mode 100644
index 000000000..2275a93c4
--- /dev/null
+++ b/doc/html/ch03s13.html
@@ -0,0 +1,236 @@
+<html><head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   <title>3.13. Zeiterfassung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch03.html" title="Kapitel 3. Features und Funktionen"><link rel="prev" href="ch03s12.html" title="3.12. Dispositionsmanager/Einkaufshelfer"><link rel="next" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3.13. Zeiterfassung</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s12.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 3. Features und Funktionen</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="3.13. Zeiterfassung"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features.timerecording"></a>3.13. Zeiterfassung</h2></div></div></div><p>
+        Seit der Version 3.5.7 enthält kivitendo ein Modul zur Zeiterfassung.
+        Damit ist es möglich, auftrags-, kunden- oder projektbezogen,
+        Arbeitszeiten zu erfassen. Die erfassten Zeiten können über einen
+        Hintergrund-Job in Lieferscheine umgewandelt werden.
+      </p><div class="sect2" title="3.13.1. Konfiguration"><div class="titlepage"><div><div><h3 class="title"><a name="features.timerecording.config"></a>3.13.1. Konfiguration</h3></div></div></div><p>
+          Die Zeiterfasssung funktioniert auch ohne Konfiguration, sofern der Benutzer
+          die entsprechenden Rechte besitzt. Allerdings ist
+          es möglich, Artikel für die Zeiterfassung zu konfigurieren, die im Bericht
+          ausgewertet und bei der Umwandlung zum Lieferschein verwendet werden
+          können.
+          Zudem kann auf benutzerebene eingestellt werden, ob Zeiten mit Start- und
+          End-Zeit oder mit Datum und Dauer erfasst werden sollen.
+        </p><div class="sect3" title="3.13.1.1. Zugriffsrechte"><div class="titlepage"><div><div><h4 class="title"><a name="features.timerecording.config.rights"></a>3.13.1.1. Zugriffsrechte</h4></div></div></div><p>
+            In der Rechteverwaltung im Admin-Bereich können im Zusammenhang mit
+            der Zeiterfassung drei verschiedene Rechte vergeben werden:
+
+            </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                           <span class="emphasis"><em>Zeiterfassungen erfassen, bearbeiten und ansehen</em></span>
+                        </p><p>Diese Recht steuert, ob eine Gruppe den Menüpunkt zur
+                Zeiterfassung überhaupt sehen und diese verwenden kann.</p></li><li class="listitem"><p>
+                           <span class="emphasis"><em>Zeiterfassungseinträge aller Mitarbeiter anzeigen</em></span>
+                        </p><p>Ohne dieses Recht darf ein Benutzer einer Benutzergruppe,
+                die die Zeiterfassung verwenden darf, nur Zeiteinträge im Bericht
+                sehen, bei denen dieser als Mitarbeiter eingetragen ist.</p></li><li class="listitem"><p>
+                           <span class="emphasis"><em>Zeiterfassungseinträge aller Mitarbeiter bearbeiten</em></span>
+                        </p><p>Ohne dieses Recht darf ein Benutzer einer Benutzergruppe,
+                die die Zeiterfassung verwenden darf, nur Zeiteinträge anlegen
+                und bearbeiten, bei denen dieser als Mitarbeiter eingetragen ist.</p></li></ul></div><p>
+
+          
+               </p></div><div class="sect3" title="3.13.1.2. Artikel für Zeiterfassung"><div class="titlepage"><div><div><h4 class="title"><a name="features.timerecording.config.part"></a>3.13.1.2. Artikel für Zeiterfassung</h4></div></div></div><p>
+            Unter <span class="emphasis"><em>
+                     <span class="guimenu">System</span>
+            → <span class="guisubmenu">Artikel für Zeiterfassung</span>
+                  </em></span>
+            können Artikel zur Nutzung mit der Zeiterfassung erfasst werden. Diese Artikel
+            müssen eine zeitbasierte Einheit haben.
+          </p></div><div class="sect3" title="3.13.1.3. Benutzereinstellungen"><div class="titlepage"><div><div><h4 class="title"><a name="features.timerecording.config.time_or_duration"></a>3.13.1.3. Benutzereinstellungen</h4></div></div></div><p>
+            Unter <span class="emphasis"><em>
+                     <span class="guimenu">Programm</span>
+            → <span class="guisubmenu">Benutzereinstellungen</span>
+                  </em></span>
+            im Reiter <span class="emphasis"><em>Persönliche Einstellungen</em></span> bei
+            <span class="emphasis"><em>Datum und Dauer für Zeiterfassung verwenden</em></span>
+            kann der Benutzer angeben, ob Zeiten mit Start- und End-Zeit oder mit
+            Datum und Dauer erfasst werden sollen.
+          </p></div></div><div class="sect2" title="3.13.2. Erfassen"><div class="titlepage"><div><div><h3 class="title"><a name="features.timerecording.add"></a>3.13.2. Erfassen</h3></div></div></div><p>
+          Über den Menüpunkt <span class="emphasis"><em>
+                  <span class="guimenu">Produktivität</span>
+          → <span class="guisubmenu">Zeiterfassung</span>
+               </em></span>
+          gelangt man zur Erfassungsmaske der Zeiterfassung. Je nach Einstellung
+          muss ein Datum oder Datum und Start-Zeit angegeben werden. Ebenso sind
+          die Felder <span class="emphasis"><em>Kunde</em></span> und
+          <span class="emphasis"><em>Beschreibung</em></span>
+          Pflichtfelder.
+        </p><p>
+          Wird ein Auftrag oder ein Projekt, dem ein Kunde zugeordnet ist,
+          ausgewählt, so wird das Feld <span class="emphasis"><em>Kunde</em></span>
+          automatisch mit dem zugehörigen Kunden gefüllt und für die
+          manuelle Bearbeitung gesperrt.
+        </p><p>
+          Die End-Zeit bzw. die Dauer ist kein Pflichtfeld, damit
+          man einen Eintrag z.B. beim Start der Arbeit anlegen und
+          später am Ende dann die End-Zeit bzw. Dauer erfassen kann.
+          Bei Eingabe über Start- und End-Zeit dürfen sich die Zeiten für
+          ein und denselben Mitarbeiter nicht überlappen.
+        </p><p>
+          Falls der Bearbeiter das Recht
+          <span class="emphasis"><em>Zeiterfassungseinträge aller Mitarbeiter
+          bearbeiten</em></span> besitzt, kann auch der Mitarbeiter für
+          diesen Zeiteintrag ausgewählt werden.
+        </p></div><div class="sect2" title="3.13.3. Bericht"><div class="titlepage"><div><div><h3 class="title"><a name="features.timerecording.report"></a>3.13.3. Bericht</h3></div></div></div><p>
+          Ein Bericht über die erfassten Zeiten lässt sich über
+          <span class="emphasis"><em>
+                  <span class="guimenu">Produktivität</span> → <span class="guisubmenu">Berichte</span>
+          → <span class="guisubmenu">Zeiterfassung</span>
+               </em></span> ausgeben.
+          Hier lassen sich die Zeiten auch filtern, sortieren und exportieren.
+        </p><p>
+          Ausgewählte Zeiteinträge können über <span class="emphasis"><em>
+                  <span class="guimenu">Aktionen</span>
+          → <span class="guisubmenu">Als gebucht markieren</span>
+               </em></span> als schon gebucht
+          markiert werden. Dies geschieht normalerweise bei der Konvertierung
+          zum Lieferschein und kann hier händisch durchgeführt werden, wenn diese
+          Zeitbuchungen bei der Konvertierung nicht mehr berücksichtigt werden sollen.
+        </p></div><div class="sect2" title="3.13.4. Konvertierung zu Lieferscheinen"><div class="titlepage"><div><div><h3 class="title"><a name="features.timerecording.conversion"></a>3.13.4. Konvertierung zu Lieferscheinen</h3></div></div></div><p>
+          Über den Hintergrund-Job
+          <span class="emphasis"><em>ConvertTimeRecordings</em></span> können
+          Zeiteinträge in Lieferscheine umgewandelt werden. Hierbei
+          werden alle noch nicht gebuchten Zeiteinträge eines
+          bestimmten Zeitraums für bestimmte Kunden gesammelt und
+          in Lieferscheine umgewandelt.
+          Pro Kunde wird ein Lieferschein generiert und
+          pro Artikel wird eine Positionszeile erzeugt. Dabei werden
+          Einträge mit gleichen Beschreibungen zusammengefasst. Die
+          Details landen im Langtext der Position.
+        </p><p>
+          Ohne übergebene Parameter im Feld <span class="emphasis"><em>Daten</em></span> werden alle
+          Zeiteinträge des letzten Monats für alle Kunden umgewandelt. Dabei
+          werden die Zeiten auf volle Viertelstunden aufgerundet (siehe auch
+          <a class="xref" href="ch03s13.html#features.timerecording.configuration" title="3.13.4.1. Konfigurations-Optionen">Konfigurations-Optionen der Zeiterfassung</a>).
+        </p><div class="sect3" title="3.13.4.1. Konfigurations-Optionen"><div class="titlepage"><div><div><h4 class="title"><a name="features.timerecording.configuration"></a>3.13.4.1. Konfigurations-Optionen</h4></div></div></div><p>
+            Zur generellen Konfiguration von Hintergrund-Jobs und zur Übergabe
+            von Parametern als Daten an diese, siehe <a class="xref" href="ch02s08.html" title="2.8. Der Task-Server">Abschnitt&nbsp;2.8, „Der Task-Server“</a>
+            bzw. <a class="xref" href="ch02s09.html" title="2.9. Konfiguration der Hintergrund-Jobs">Abschnitt&nbsp;2.9, „Konfiguration der Hintergrund-Jobs“</a>).
+          </p><p>
+            Folgende Parameter können als <span class="emphasis"><em>Daten</em></span> an den
+            Hintergrund-Job zur Konvertierung übergeben werden:
+            </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>from_date</em></span>
+                
+                        </p><p>
+                  Das Startdatum, von welchen an die Zeiteinträge berücksicht werden.
+                  Voreinstellung ist der erste Tag des vorherigen Montats.
+                </p><p>
+                  Beispiel (das Zeitformat hängt von der persönlichen Einstellungen ab):
+                  </p><pre class="programlisting">from_date: 01.12.2020</pre><p>
+                
+                        </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>to_date</em></span>
+                
+                        </p><p>
+                  Das Datum, bis zu welchem die Zeiteinträge zur Konvertierung gesammelt
+                  werden. Voreinstellung ist der letzte Tag des vorherigen Montas.
+                </p><p>
+                  Beispiel (das Zeitformat hängt von der persönlichen Einstellungen ab):
+                  </p><pre class="programlisting">to_date: 15.12.2020</pre><p>
+                
+                        </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>customernumbers</em></span>
+                
+                        </p><p>
+                  Eine Liste mit Kundennummern, für die Zeiteinträge gesammelt werden
+                  sollen. Wird diese Liste nicht angegeben, werden Einträge für
+                  alle Kunden berücksichtig.
+                </p><p>
+                  
+                           </p><pre class="programlisting">customernumbers: [c1,22332,334343]</pre><p>
+                
+                        </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>override_part_id</em></span>
+                
+                        </p><p>
+                  Die Datenbank-Id einer zeitbasierten Dienstleistung, die verwendet
+                  werden soll, um die Zeiteinträge zu buchen. Dieser Wert überschreibt
+                  den Eintrag des Artikels des Zeiteintrags.
+                </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>default_part_id</em></span>
+                
+                        </p><p>
+                  Die Datenbank-Id einer zeitbasierten Dienstleistung, die verwendet
+                  werden soll, um die Zeiteinträge zu buchen, falls im Zeiteintrag
+                  kein Artikel gespeichert ist.
+                </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>rounding</em></span>
+                
+                        </p><p>
+                  Ist dieser Wert <code class="literal">0</code>, so werden die Zeiten nicht gerundet.
+                  Ist der Wert <code class="literal">1</code> (oder "wahr" in Perl"), so werden die Zeiten auf volle Viertelstunden aufgerundet, also z.B. 0.25h, 0.5h, 0.75h,
+                  1.25h ...
+                </p><p>
+                  Voreinstellung ist <code class="literal">1</code> ("wahr").
+                </p></li><li class="listitem"><p>
+                  
+                           <span class="emphasis"><em>link_order</em></span>
+                
+                        </p><p>
+                  Ist der Wert <code class="literal">1</code> (oder "wahr" in Perl"), so verknüpft
+                  der Hintergrund-Job den erzeugten Lieferschein mit dem im Zeiteintrag
+                  angegebenen Auftrag.
+                  Ist kein Auftrag angegeben, wird versucht, einen Auftrag für den
+                  angegebenen Kunden und die angegebene Projektnummer zu finden.
+                </p><p>
+                  Folgende Kriterien werden zum Finden eines Vorgängerauftrags angwendet:
+                  </p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>
+                      Auftrag ist im Zeiteintrag angegeben <span class="emphasis"><em>oder</em></span>
+                    
+                                 </p></li><li class="listitem"><p>
+                      Datenbank-Id des Projekts des Auftrags ist gleich
+                      der Datenbank-Id des Zeiteintrags <span class="emphasis"><em>oder</em></span> der in den Daten
+                      übergebenen Projekt-Id
+                    </p></li><li class="listitem"><p>
+                      Kunde des Auftrags ist gleich Kunde des Zeiteintrags
+                    </p></li><li class="listitem"><p>
+                      der Auftrag muss mindestens eine zugehörige zeitbasierte Position haben
+                    </p></li><li class="listitem"><p>
+                      das Projekt muss gültig und aktiv sein
+                    </p></li></ul></div><p>
+                
+                        </p><p>
+                  Voreinstellung ist aus. Wenn dieser Parameter gesetzt ist, läuft der
+                  Hintergrund-Job auf einen Fehler, falls kein geeigneter Vorgängerauftrag
+                  gefunden werden kann.
+                </p><p>
+                  Der Job beachtet nicht, ob der Auftrag schon geliefert oder geschlossen
+                  ist.
+                  Wenn der Kundenauftrag überliefert wird, muss dies organisatorisch
+                  geklärt werden. Der Kundenauftrag kann auch bereits geschlossen sein,
+                  d.h. der Betrag ist vollständig fakturiert, aber die Leistungen sind
+                  noch nicht vollständig geliefert (einfacher Fall: "Vorauskasse").
+                </p><p>
+                  siehe auch den Hintergrund-Job
+                  <code class="literal">CloseProjectsBelongingToClosedSalesOrder</code>
+                  für eine weitergehende Automatisierung der Abläufe.
+                </p></li><li class="listitem"><p>
+                    
+                           <span class="emphasis"><em>override_project_id</em></span>
+                  
+                        </p><p>
+                    Verwende diese Datenbank-Id für das Projekt an Stelle des
+                    im Zeiteintrag angegebenen Projekts, um den zugehörigen Auftrag
+                    zu finden. Dieser Parameter wird nur berücksichtig, wenn
+                    <span class="emphasis"><em>link_order</em></span> wahr ist.
+                  </p></li><li class="listitem"><p>
+                    
+                           <span class="emphasis"><em>default_project_id</em></span>
+                  
+                        </p><p>
+                    Verwende diese Datenbank-Id für das Projekt, falls
+                    im Zeiteintrag kein Projekt angegeben ist, um den
+                    zugehörigen Auftrag zu finden.
+                    Dieser Parameter wird nur berücksichtig, wenn
+                  </p></li></ul></div><p>
+          
+               </p></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s12.html">Zurück</a>&nbsp;</td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Nach oben</a></td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch04.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.12. Dispositionsmanager/Einkaufshelfer&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;Kapitel 4. Entwicklerdokumentation</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch04.html b/doc/html/ch04.html
index 6abd36c6f..aba63f202 100644
--- a/doc/html/ch04.html
+++ b/doc/html/ch04.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>Kapitel 4. Entwicklerdokumentation</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch03s10.html" title="3.10. ZUGFeRD Rechnungen"><link rel="next" href="ch04s02.html" title="4.2. Entwicklung unter FastCGI"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 4. Entwicklerdokumentation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s10.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 4. Entwicklerdokumentation"><div class="titlepage"><div><div><h2 class="title"><a name="d0e7265"></a>Kapitel 4. Entwicklerdokumentation</h2></div></div></div><div class="sect1" title="4.1. Globale Variablen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.globals"></a>4.1. Globale Variablen</h2></div></div></div><div class="sect2" title="4.1.1. Wie sehen globale Variablen in Perl aus?"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7271"></a>4.1.1. Wie sehen globale Variablen in Perl aus?</h3></div></div></div><p>Globale Variablen liegen in einem speziellen namespace namens
+   <title>Kapitel 4. Entwicklerdokumentation</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="prev" href="ch03s13.html" title="3.13. Zeiterfassung"><link rel="next" href="ch04s02.html" title="4.2. Entwicklung unter FastCGI"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Kapitel 4. Entwicklerdokumentation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s13.html">Zurück</a>&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s02.html">Weiter</a></td></tr></table><hr></div><div class="chapter" title="Kapitel 4. Entwicklerdokumentation"><div class="titlepage"><div><div><h2 class="title"><a name="d0e8579"></a>Kapitel 4. Entwicklerdokumentation</h2></div></div></div><div class="sect1" title="4.1. Globale Variablen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.globals"></a>4.1. Globale Variablen</h2></div></div></div><div class="sect2" title="4.1.1. Wie sehen globale Variablen in Perl aus?"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8585"></a>4.1.1. Wie sehen globale Variablen in Perl aus?</h3></div></div></div><p>Globale Variablen liegen in einem speziellen namespace namens
         "main", der von überall erreichbar ist. Darüber hinaus sind bareword
         globs global und die meisten speziellen Variablen sind...
         speziell.</p><p>Daraus ergeben sich folgende Formen:</p><div class="variablelist"><dl><dt><span class="term">
@@ -25,7 +25,7 @@
               <code class="varname">$PACKAGE::form</code>.</p></dd><dt><span class="term">
                      <code class="literal">local $form</code>
                   </span></dt><dd><p>Alle Änderungen an <code class="varname">$form</code> werden am Ende
-              des scopes zurückgesetzt</p></dd></dl></div></div><div class="sect2" title="4.1.2. Warum sind globale Variablen ein Problem?"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7372"></a>4.1.2. Warum sind globale Variablen ein Problem?</h3></div></div></div><p>Das erste Problem ist <span class="productname">FCGI</span>™.</p><p>
+              des scopes zurückgesetzt</p></dd></dl></div></div><div class="sect2" title="4.1.2. Warum sind globale Variablen ein Problem?"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8686"></a>4.1.2. Warum sind globale Variablen ein Problem?</h3></div></div></div><p>Das erste Problem ist <span class="productname">FCGI</span>™.</p><p>
                <span class="productname">SQL-Ledger</span>™ hat fast alles im globalen
         namespace abgelegt, und erwartet, dass es da auch wiederzufinden ist.
         Unter <span class="productname">FCGI</span>™ müssen diese Sachen aber wieder
@@ -39,7 +39,7 @@
         dies hat, seit der Einführung, u.a. schon so manche langwierige
         Bug-Suche verkürzt. Da globale Variablen aber implizit mit Package
         angegeben werden, werden die nicht geprüft, und somit kann sich
-        schnell ein Tippfehler einschleichen.</p></div><div class="sect2" title="4.1.3. Kanonische globale Variablen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7405"></a>4.1.3. Kanonische globale Variablen</h3></div></div></div><p>Um dieses Problem im Griff zu halten gibt es einige wenige
+        schnell ein Tippfehler einschleichen.</p></div><div class="sect2" title="4.1.3. Kanonische globale Variablen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e8719"></a>4.1.3. Kanonische globale Variablen</h3></div></div></div><p>Um dieses Problem im Griff zu halten gibt es einige wenige
         globale Variablen, die kanonisch sind, d.h. sie haben bestimmte
         vorgegebenen Eigenschaften, und alles andere sollte anderweitig
         umhergereicht werden.</p><p>Diese Variablen sind im Moment die folgenden neun:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
@@ -62,7 +62,7 @@
                      <code class="varname">$::request</code>
                   </p></li></ul></div><p>Damit diese nicht erneut als Müllhalde missbraucht werden, im
         Folgenden eine kurze Erläuterung der bestimmten vorgegebenen
-        Eigenschaften (Konventionen):</p><div class="sect3" title="4.1.3.1. $::form"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7469"></a>4.1.3.1. $::form</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Ist ein Objekt der Klasse
+        Eigenschaften (Konventionen):</p><div class="sect3" title="4.1.3.1. $::form"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8783"></a>4.1.3.1. $::form</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Ist ein Objekt der Klasse
               "<code class="classname">Form</code>"</p></li><li class="listitem"><p>Wird nach jedem Request gelöscht</p></li><li class="listitem"><p>Muss auch in Tests und Konsolenscripts vorhanden
               sein.</p></li><li class="listitem"><p>Enthält am Anfang eines Requests die Requestparameter vom
               User</p></li><li class="listitem"><p>Kann zwar intern über Requestgrenzen ein Datenbankhandle
@@ -110,7 +110,7 @@
   push @{ $form-&gt;{TEMPLATE_ARRAYS}{number} },          $form-&gt;{"partnumber_$i"};
   push @{ $form-&gt;{TEMPLATE_ARRAYS}{description} },     $form-&gt;{"description_$i"};
   # ...
-}</pre></div><div class="sect3" title="4.1.3.2. %::myconfig"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7553"></a>4.1.3.2. %::myconfig</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Das einzige Hash unter den globalen Variablen</p></li><li class="listitem"><p>Wird spätestens benötigt wenn auf die Datenbank
+}</pre></div><div class="sect3" title="4.1.3.2. %::myconfig"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8867"></a>4.1.3.2. %::myconfig</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Das einzige Hash unter den globalen Variablen</p></li><li class="listitem"><p>Wird spätestens benötigt wenn auf die Datenbank
               zugegriffen wird</p></li><li class="listitem"><p>Wird bei jedem Request neu erstellt.</p></li><li class="listitem"><p>Enthält die Userdaten des aktuellen Logins</p></li><li class="listitem"><p>Sollte nicht ohne Filterung irgendwo gedumpt werden oder
               extern serialisiert werden, weil da auch der Datenbankzugriff
               für diesen user drinsteht.</p></li><li class="listitem"><p>Enthält unter anderem Datumsformat dateformat und
@@ -122,10 +122,10 @@
           überwiegend die Daten, die sich unter <span class="guimenu">Programm</span>
           -&gt; <span class="guimenuitem">Einstellungen</span> befinden, bzw. die
           Informationen über den Benutzer die über die
-          Administrator-Schnittstelle eingegeben wurden.</p></div><div class="sect3" title="4.1.3.3. $::locale"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7592"></a>4.1.3.3. $::locale</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "Locale"</p></li><li class="listitem"><p>Wird pro Request erstellt</p></li><li class="listitem"><p>Muss auch für Tests und Scripte immer verfügbar
+          Administrator-Schnittstelle eingegeben wurden.</p></div><div class="sect3" title="4.1.3.3. $::locale"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8906"></a>4.1.3.3. $::locale</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "Locale"</p></li><li class="listitem"><p>Wird pro Request erstellt</p></li><li class="listitem"><p>Muss auch für Tests und Scripte immer verfügbar
               sein.</p></li><li class="listitem"><p>Cached intern über Requestgrenzen hinweg benutzte
               Locales</p></li></ul></div><p>Lokalisierung für den aktuellen User. Alle Übersetzungen,
-          Zahlen- und Datumsformatierungen laufen über dieses Objekt.</p></div><div class="sect3" title="4.1.3.4. $::lxdebug"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7610"></a>4.1.3.4. $::lxdebug</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "LXDebug"</p></li><li class="listitem"><p>Wird global gecached</p></li><li class="listitem"><p>Muss immer verfügbar sein, in nahezu allen
+          Zahlen- und Datumsformatierungen laufen über dieses Objekt.</p></div><div class="sect3" title="4.1.3.4. $::lxdebug"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8924"></a>4.1.3.4. $::lxdebug</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "LXDebug"</p></li><li class="listitem"><p>Wird global gecached</p></li><li class="listitem"><p>Muss immer verfügbar sein, in nahezu allen
               Funktionen</p></li></ul></div><p>
                   <code class="varname">$::lxdebug</code> stellt Debuggingfunktionen
           bereit, wie "<code class="function">enter_sub</code>" und
@@ -133,9 +133,9 @@
           brauchbares Tracing gebaut ist, "<code class="function">log_time</code>", mit
           der man die Wallclockzeit seit Requeststart loggen kann, sowie
           "<code class="function">message</code>" und "<code class="function">dump</code>" mit
-          denen man flott Informationen ins Log (tmp/kivitendo-debug.log)
-          packen kann.</p><p>Beispielsweise so:</p><pre class="programlisting">$main::lxdebug-&gt;message(0, 'Meine Konfig:' . Dumper (%::myconfig));
-$main::lxdebug-&gt;message(0, 'Wer bin ich? Kunde oder Lieferant:' . $form-&gt;{vc});</pre></div><div class="sect3" title="4.1.3.5. $::auth"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7647"></a>4.1.3.5. $::auth</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "SL::Auth"</p></li><li class="listitem"><p>Wird global gecached</p></li><li class="listitem"><p>Hat eine permanente DB Verbindung zur Authdatenbank</p></li><li class="listitem"><p>Wird nach jedem Request resettet.</p></li></ul></div><p>
+          denen man flott Informationen ins Log (users/kivitendo-debug.log
+          relativ zum kivitendo-Installationsverzeichnis) packen kann.</p><p>Beispielsweise so:</p><pre class="programlisting">$main::lxdebug-&gt;message(0, 'Meine Konfig:' . Dumper (%::myconfig));
+$main::lxdebug-&gt;message(0, 'Wer bin ich? Kunde oder Lieferant:' . $form-&gt;{vc});</pre></div><div class="sect3" title="4.1.3.5. $::auth"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8961"></a>4.1.3.5. $::auth</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse "SL::Auth"</p></li><li class="listitem"><p>Wird global gecached</p></li><li class="listitem"><p>Hat eine permanente DB Verbindung zur Authdatenbank</p></li><li class="listitem"><p>Wird nach jedem Request resettet.</p></li></ul></div><p>
                   <code class="varname">$::auth</code> stellt Funktionen bereit um die
           Rechte des aktuellen Users abzufragen. Obwohl diese Informationen
           vom aktuellen User abhängen wird das Objekt aus
@@ -144,26 +144,26 @@ $main::lxdebug-&gt;message(0, 'Wer bin ich? Kunde oder Lieferant:' . $form-&gt;{
           Dessen Einstellungen können über
           <code class="literal">$::auth-&gt;client</code> abgefragt werden; Rückgabewert
           ist ein Hash mit den Werten aus der Tabelle
-          <code class="literal">auth.clients</code>.</p></div><div class="sect3" title="4.1.3.6. $::lx_office_conf"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7676"></a>4.1.3.6. $::lx_office_conf</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
+          <code class="literal">auth.clients</code>.</p></div><div class="sect3" title="4.1.3.6. $::lx_office_conf"><div class="titlepage"><div><div><h4 class="title"><a name="d0e8990"></a>4.1.3.6. $::lx_office_conf</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
               "<code class="classname">SL::LxOfficeConf</code>"</p></li><li class="listitem"><p>Global gecached</p></li><li class="listitem"><p>Repräsentation der
               <code class="filename">config/kivitendo.conf[.default]</code>-Dateien</p></li></ul></div><p>Globale Konfiguration. Configdateien werden zum Start gelesen
           und danach nicht mehr angefasst. Es ist derzeit nicht geplant, dass
           das Programm die Konfiguration ändern kann oder sollte.</p><p>Beispielsweise ist über den Konfigurationseintrag [debug] die
           Debug- und Trace-Log-Datei wie folgt konfiguriert und
           verfügbar:</p><pre class="programlisting">[debug]
-file_name = /tmp/kivitendo-debug.log</pre><p>ist der Key <code class="varname">file</code> im Programm als
+file_name = users/kivitendo-debug.log</pre><p>ist der Key <code class="varname">file</code> im Programm als
           <code class="varname">$::lx_office_conf-&gt;{debug}{file}</code>
           erreichbar.</p><div class="warning" title="Warnung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Warning"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Warnung]" src="system/docbook-xsl/images/warning.png"></td><th align="left">Warnung</th></tr><tr><td align="left" valign="top"><p>Zugriff auf die Konfiguration erfolgt im Moment über
-            Hashkeys, sind also nicht gegen Tippfehler abgesichert.</p></td></tr></table></div></div><div class="sect3" title="4.1.3.7. $::instance_conf"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7712"></a>4.1.3.7. $::instance_conf</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
+            Hashkeys, sind also nicht gegen Tippfehler abgesichert.</p></td></tr></table></div></div><div class="sect3" title="4.1.3.7. $::instance_conf"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9026"></a>4.1.3.7. $::instance_conf</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
               "<code class="classname">SL::InstanceConfiguration</code>"</p></li><li class="listitem"><p>wird pro Request neu erstellt</p></li></ul></div><p>Funktioniert wie <code class="varname">$::lx_office_conf</code>,
           speichert aber Daten die von der Instanz abhängig sind. Eine Instanz
           ist hier eine Mandantendatenbank. Beispielsweise überprüft
           </p><pre class="programlisting">$::instance_conf-&gt;get_inventory_system eq 'perpetual'</pre><p>
-          ob die berüchtigte Bestandsmethode zur Anwendung kommt.</p></div><div class="sect3" title="4.1.3.8. $::dispatcher"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7733"></a>4.1.3.8. $::dispatcher</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
+          ob die berüchtigte Bestandsmethode zur Anwendung kommt.</p></div><div class="sect3" title="4.1.3.8. $::dispatcher"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9047"></a>4.1.3.8. $::dispatcher</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Objekt der Klasse
               "<code class="varname">SL::Dispatcher</code>"</p></li><li class="listitem"><p>wird pro Serverprozess erstellt.</p></li><li class="listitem"><p>enthält Informationen über die technische Verbindung zum
               Server</p></li></ul></div><p>Der dritte Punkt ist auch der einzige Grund warum das Objekt
           global gespeichert wird. Wird vermutlich irgendwann in einem anderen
-          Objekt untergebracht.</p></div><div class="sect3" title="4.1.3.9. $::request"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7751"></a>4.1.3.9. $::request</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Hashref (evtl später Objekt)</p></li><li class="listitem"><p>Wird pro Request neu initialisiert.</p></li><li class="listitem"><p>Keine Unterstruktur garantiert.</p></li></ul></div><p>
+          Objekt untergebracht.</p></div><div class="sect3" title="4.1.3.9. $::request"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9065"></a>4.1.3.9. $::request</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Hashref (evtl später Objekt)</p></li><li class="listitem"><p>Wird pro Request neu initialisiert.</p></li><li class="listitem"><p>Keine Unterstruktur garantiert.</p></li></ul></div><p>
                   <code class="varname">$::request</code> ist ein generischer Platz um
           Daten "für den aktuellen Request" abzulegen. Sollte nicht für action
           at a distance benutzt werden, sondern um lokales memoizing zu
@@ -176,20 +176,20 @@ file_name = /tmp/kivitendo-debug.log</pre><p>ist der Key <code class="varname">f
               <code class="varname">$::request</code>
                      </p></li><li class="listitem"><p>Muss ich von anderen Teilen des Programms lesend drauf
               zugreifen? Dann <code class="varname">$::request</code>, aber Zugriff über
-              Wrappermethode</p></li></ul></div></div></div><div class="sect2" title="4.1.4. Ehemalige globale Variablen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e7793"></a>4.1.4. Ehemalige globale Variablen</h3></div></div></div><p>Die folgenden Variablen waren einmal im Programm, und wurden
-        entfernt.</p><div class="sect3" title="4.1.4.1. $::cgi"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7798"></a>4.1.4.1. $::cgi</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>war nötig, weil cookie Methoden nicht als
+              Wrappermethode</p></li></ul></div></div></div><div class="sect2" title="4.1.4. Ehemalige globale Variablen"><div class="titlepage"><div><div><h3 class="title"><a name="d0e9107"></a>4.1.4. Ehemalige globale Variablen</h3></div></div></div><p>Die folgenden Variablen waren einmal im Programm, und wurden
+        entfernt.</p><div class="sect3" title="4.1.4.1. $::cgi"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9112"></a>4.1.4.1. $::cgi</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>war nötig, weil cookie Methoden nicht als
               Klassenfunktionen funktionieren</p></li><li class="listitem"><p>Aufruf als Klasse erzeugt Dummyobjekt was im
               Klassennamespace gehalten wird und über Requestgrenzen
               leaked</p></li><li class="listitem"><p>liegt jetzt unter
               <code class="varname">$::request-&gt;{cgi}</code>
-                     </p></li></ul></div></div><div class="sect3" title="4.1.4.2. $::all_units"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7814"></a>4.1.4.2. $::all_units</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>war nötig, weil einige Funktionen in Schleifen zum Teil
+                     </p></li></ul></div></div><div class="sect3" title="4.1.4.2. $::all_units"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9128"></a>4.1.4.2. $::all_units</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>war nötig, weil einige Funktionen in Schleifen zum Teil
               ein paar hundert mal pro Request eine Liste der Einheiten
               brauchen, und de als Parameter durch einen Riesenstack von
               Funktionen geschleift werden müssten.</p></li><li class="listitem"><p>Liegt jetzt unter
               <code class="varname">$::request-&gt;{cache}{all_units}</code>
                      </p></li><li class="listitem"><p>Wird nur in
               <code class="function">AM-&gt;retrieve_all_units()</code> gesetzt oder
-              gelesen.</p></li></ul></div></div><div class="sect3" title="4.1.4.3. %::called_subs"><div class="titlepage"><div><div><h4 class="title"><a name="d0e7833"></a>4.1.4.3. %::called_subs</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>wurde benutzt um callsub deep recursions
+              gelesen.</p></li></ul></div></div><div class="sect3" title="4.1.4.3. %::called_subs"><div class="titlepage"><div><div><h4 class="title"><a name="d0e9147"></a>4.1.4.3. %::called_subs</h4></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>wurde benutzt um callsub deep recursions
               abzufangen.</p></li><li class="listitem"><p>Wurde entfernt, weil callsub nur einen Bruchteil der
               möglichen Rekursioenen darstellt, und da nie welche
-              auftreten.</p></li><li class="listitem"><p>komplette recursion protection wurde entfernt.</p></li></ul></div></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s10.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch04s02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.10. ZUGFeRD Rechnungen&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;4.2. Entwicklung unter FastCGI</td></tr></table></div></body></html>
\ No newline at end of file
+              auftreten.</p></li><li class="listitem"><p>komplette recursion protection wurde entfernt.</p></li></ul></div></div></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s13.html">Zurück</a>&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch04s02.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">3.13. Zeiterfassung&nbsp;</td><td width="20%" align="center"><a accesskey="h" href="index.html">Zum Anfang</a></td><td width="40%" align="right" valign="top">&nbsp;4.2. Entwicklung unter FastCGI</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/html/ch04s02.html b/doc/html/ch04s02.html
index 3c91746ca..99147382a 100644
--- a/doc/html/ch04s02.html
+++ b/doc/html/ch04s02.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.2. Entwicklung unter FastCGI</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="next" href="ch04s03.html" title="4.3. Programmatische API-Aufrufe"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.2. Entwicklung unter FastCGI</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.2. Entwicklung unter FastCGI"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.fcgi"></a>4.2. Entwicklung unter FastCGI</h2></div></div></div><div class="sect2" title="4.2.1. Allgemeines"><div class="titlepage"><div><div><h3 class="title"><a name="devel.fcgi.general"></a>4.2.1. Allgemeines</h3></div></div></div><p>Wenn Änderungen in der Konfiguration von kivitendo gemacht
+   <title>4.2. Entwicklung unter FastCGI</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="next" href="ch04s03.html" title="4.3. Programmatische API-Aufrufe"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.2. Entwicklung unter FastCGI</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s03.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.2. Entwicklung unter FastCGI"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.fcgi"></a>4.2. Entwicklung unter FastCGI</h2></div></div></div><div class="sect2" title="4.2.1. Allgemeines"><div class="titlepage"><div><div><h3 class="title"><a name="devel.fcgi.general"></a>4.2.1. Allgemeines</h3></div></div></div><p>Wenn Änderungen in der Konfiguration von kivitendo gemacht
         werden, muss der Webserver neu gestartet werden.</p><p>Bei der Entwicklung für FastCGI ist auf ein paar Fallstricke zu
         achten. Dadurch, dass das Programm in einer Endlosschleife läuft,
         müssen folgende Aspekte beachtet werden.</p></div><div class="sect2" title="4.2.2. Programmende und Ausnahmen"><div class="titlepage"><div><div><h3 class="title"><a name="devel.fcgi.exiting"></a>4.2.2. Programmende und Ausnahmen</h3></div></div></div><p>Betrifft die Funktionen <code class="function">warn</code>,
diff --git a/doc/html/ch04s03.html b/doc/html/ch04s03.html
index b05a45420..2b4c3b3a8 100644
--- a/doc/html/ch04s03.html
+++ b/doc/html/ch04s03.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.3. Programmatische API-Aufrufe</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s02.html" title="4.2. Entwicklung unter FastCGI"><link rel="next" href="ch04s04.html" title="4.4. SQL-Upgradedateien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.3. Programmatische API-Aufrufe</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.3. Programmatische API-Aufrufe"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dev-programmatic-api-calls"></a>4.3. Programmatische API-Aufrufe</h2></div></div></div><div class="sect2" title="4.3.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="dev-programmatic-api-calls.introduction"></a>4.3.1. Einführung</h3></div></div></div><p>
+   <title>4.3. Programmatische API-Aufrufe</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s02.html" title="4.2. Entwicklung unter FastCGI"><link rel="next" href="ch04s04.html" title="4.4. SQL-Upgradedateien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.3. Programmatische API-Aufrufe</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s02.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s04.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.3. Programmatische API-Aufrufe"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dev-programmatic-api-calls"></a>4.3. Programmatische API-Aufrufe</h2></div></div></div><div class="sect2" title="4.3.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="dev-programmatic-api-calls.introduction"></a>4.3.1. Einführung</h3></div></div></div><p>
          Es ist möglich, Funktionen in kivitendo programmatisch aus anderen Programmen aufzurufen. Dazu ist nötig, dass
          Authentifizierungsinformationen in jedem Aufruf mitgegeben werden. Dafür gibt es zwei Methoden: die HTTP-»Basic«-Authentifizierung
          oder die Übergabe als spziell benannte GET-Parameter. Neben den Authentifizierungsinformationen muss auch der zu verwendende Mandant
diff --git a/doc/html/ch04s04.html b/doc/html/ch04s04.html
index f53c439c7..d72582ad0 100644
--- a/doc/html/ch04s04.html
+++ b/doc/html/ch04s04.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.4. SQL-Upgradedateien</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s03.html" title="4.3. Programmatische API-Aufrufe"><link rel="next" href="ch04s05.html" title="4.5. Translations and languages"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.4. SQL-Upgradedateien</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.4. SQL-Upgradedateien"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="db-upgrade-files"></a>4.4. SQL-Upgradedateien</h2></div></div></div><div class="sect2" title="4.4.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="db-upgrade-files.introduction"></a>4.4.1. Einführung</h3></div></div></div><p>Datenbankupgrades werden über einzelne Upgrade-Scripte
+   <title>4.4. SQL-Upgradedateien</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s03.html" title="4.3. Programmatische API-Aufrufe"><link rel="next" href="ch04s05.html" title="4.5. Translations and languages"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.4. SQL-Upgradedateien</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s03.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s05.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.4. SQL-Upgradedateien"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="db-upgrade-files"></a>4.4. SQL-Upgradedateien</h2></div></div></div><div class="sect2" title="4.4.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="db-upgrade-files.introduction"></a>4.4.1. Einführung</h3></div></div></div><p>Datenbankupgrades werden über einzelne Upgrade-Scripte
         gesteuert, die sich im Verzeichnis
         <code class="filename">sql/Pg-upgrade2</code> befinden. In diesem Verzeichnis
         muss pro Datenbankupgrade eine Datei existieren, die neben den
diff --git a/doc/html/ch04s05.html b/doc/html/ch04s05.html
index cc2d124b7..413eb49a5 100644
--- a/doc/html/ch04s05.html
+++ b/doc/html/ch04s05.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.5. Translations and languages</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s04.html" title="4.4. SQL-Upgradedateien"><link rel="next" href="ch04s06.html" title="4.6. Die kivitendo-Test-Suite"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.5. Translations and languages</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.5. Translations and languages"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="translations-languages"></a>4.5. Translations and languages</h2></div></div></div><div class="sect2" title="4.5.1. Introduction"><div class="titlepage"><div><div><h3 class="title"><a name="translations-languages.introduction"></a>4.5.1. Introduction</h3></div></div></div><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Dieser Abschnitt ist in Englisch geschrieben, um
+   <title>4.5. Translations and languages</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s04.html" title="4.4. SQL-Upgradedateien"><link rel="next" href="ch04s06.html" title="4.6. Die kivitendo-Test-Suite"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.5. Translations and languages</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s04.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s06.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.5. Translations and languages"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="translations-languages"></a>4.5. Translations and languages</h2></div></div></div><div class="sect2" title="4.5.1. Introduction"><div class="titlepage"><div><div><h3 class="title"><a name="translations-languages.introduction"></a>4.5.1. Introduction</h3></div></div></div><div class="note" title="Anmerkung" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Anmerkung]" src="system/docbook-xsl/images/note.png"></td><th align="left">Anmerkung</th></tr><tr><td align="left" valign="top"><p>Dieser Abschnitt ist in Englisch geschrieben, um
           internationalen Übersetzern die Arbeit zu erleichtern.</p></td></tr></table></div><p>This section describes how localization packages in kivitendo
         are built. Currently the only language fully supported is German, and
         since most of the internal messages are held in English the English
diff --git a/doc/html/ch04s06.html b/doc/html/ch04s06.html
index 6eddda524..2772e242f 100644
--- a/doc/html/ch04s06.html
+++ b/doc/html/ch04s06.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.6. Die kivitendo-Test-Suite</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s05.html" title="4.5. Translations and languages"><link rel="next" href="ch04s07.html" title="4.7. Stil-Richtlinien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.6. Die kivitendo-Test-Suite</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.6. Die kivitendo-Test-Suite"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.testsuite"></a>4.6. Die kivitendo-Test-Suite</h2></div></div></div><div class="sect2" title="4.6.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="devel.testsuite.intro"></a>4.6.1. Einführung</h3></div></div></div><p>kivitendo enthält eine Suite für automatisierte Tests. Sie
+   <title>4.6. Die kivitendo-Test-Suite</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s05.html" title="4.5. Translations and languages"><link rel="next" href="ch04s07.html" title="4.7. Stil-Richtlinien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.6. Die kivitendo-Test-Suite</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s05.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s07.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.6. Die kivitendo-Test-Suite"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.testsuite"></a>4.6. Die kivitendo-Test-Suite</h2></div></div></div><div class="sect2" title="4.6.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="devel.testsuite.intro"></a>4.6.1. Einführung</h3></div></div></div><p>kivitendo enthält eine Suite für automatisierte Tests. Sie
         basiert auf dem Standard-Perl-Modul
         <code class="literal">Test::More</code>.</p><p>Die grundlegenden Fakten sind:</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Alle Tests liegen im Unterverzeichnis
             <code class="filename">t/</code>.</p></li><li class="listitem"><p>Ein Script (bzw. ein Test) in <code class="filename">t/</code>
diff --git a/doc/html/ch04s07.html b/doc/html/ch04s07.html
index c1e0dd873..684722d3a 100644
--- a/doc/html/ch04s07.html
+++ b/doc/html/ch04s07.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.7. Stil-Richtlinien</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s06.html" title="4.6. Die kivitendo-Test-Suite"><link rel="next" href="ch04s08.html" title="4.8. Dokumentation erstellen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.7. Stil-Richtlinien</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.7. Stil-Richtlinien"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.style-guide"></a>4.7. Stil-Richtlinien</h2></div></div></div><p>Die folgenden Regeln haben das Ziel, den Code möglichst gut les-
+   <title>4.7. Stil-Richtlinien</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s06.html" title="4.6. Die kivitendo-Test-Suite"><link rel="next" href="ch04s08.html" title="4.8. Dokumentation erstellen"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.7. Stil-Richtlinien</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s06.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch04s08.html">Weiter</a></td></tr></table><hr></div><div class="sect1" title="4.7. Stil-Richtlinien"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.style-guide"></a>4.7. Stil-Richtlinien</h2></div></div></div><p>Die folgenden Regeln haben das Ziel, den Code möglichst gut les-
       und wartbar zu machen. Dazu gehört zum Einen, dass der Code einheitlich
       eingerückt ist, aber auch, dass Mehrdeutigkeit so weit es geht vermieden
       wird (Stichworte "Klammern" oder "Hash-Keys").</p><p>Diese Regeln sind keine Schikane sondern erleichtern allen das
diff --git a/doc/html/ch04s08.html b/doc/html/ch04s08.html
index 11e225212..5887b8fdf 100644
--- a/doc/html/ch04s08.html
+++ b/doc/html/ch04s08.html
@@ -1,6 +1,6 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>4.8. Dokumentation erstellen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s07.html" title="4.7. Stil-Richtlinien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.8. Dokumentation erstellen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;</td></tr></table><hr></div><div class="sect1" title="4.8. Dokumentation erstellen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.build-doc"></a>4.8. Dokumentation erstellen</h2></div></div></div><div class="sect2" title="4.8.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="devel.build-doc.introduction"></a>4.8.1. Einführung</h3></div></div></div><p>Diese Dokumentation ist in <span class="productname">DocBook</span>™
+   <title>4.8. Dokumentation erstellen</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="up" href="ch04.html" title="Kapitel 4. Entwicklerdokumentation"><link rel="prev" href="ch04s07.html" title="4.7. Stil-Richtlinien"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.8. Dokumentation erstellen</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch04s07.html">Zurück</a>&nbsp;</td><th width="60%" align="center">Kapitel 4. Entwicklerdokumentation</th><td width="20%" align="right">&nbsp;</td></tr></table><hr></div><div class="sect1" title="4.8. Dokumentation erstellen"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="devel.build-doc"></a>4.8. Dokumentation erstellen</h2></div></div></div><div class="sect2" title="4.8.1. Einführung"><div class="titlepage"><div><div><h3 class="title"><a name="devel.build-doc.introduction"></a>4.8.1. Einführung</h3></div></div></div><p>Diese Dokumentation ist in <span class="productname">DocBook</span>™
         XML geschrieben. Zum Bearbeiten reicht grundsätzlich ein Text-Editor.
         Mehr Komfort bekommt man, wenn man einen dedizierten XML-fähigen
         Editor nutzt, der spezielle Unterstützung für
@@ -22,14 +22,17 @@
             <span class="productname">DocBook</span>™ XML in andere Formate. Das
             Paket, das benötigt wird, ist zum Zeitpunkt der
             Dokumentationserstellung
-            <code class="filename">dobudish-nojre-1.1.4.zip</code>, aus auf <a class="ulink" href="http://code.google.com/p/dobudish/downloads/list" target="_top">code.google.com</a>
+            <code class="filename">dobudish-nojre-1.1.4.zip</code>, aus auf <a class="ulink" href="https://code.google.com/archive/p/dobudish/downloads" target="_top">code.google.com</a>
             bereitsteht.</p></li></ul></div><p>Apache Ant sowie ein dazu passendes Java Runtime Environment
         sind auf allen gängigen Plattformen verfügbar. Beispiel für
-        Debian/Ubuntu:</p><pre class="programlisting">apt-get install ant openjdk-7-jre</pre><p>Nach dem Download von Dobudish muss Dobudish im Unterverzeichnis
-        <code class="filename">doc/build</code> entpackt werden. Beispiel unter der
+        Debian/Ubuntu:</p><pre class="programlisting">apt-get install ant default-jre</pre><p>Nach dem Download von Dobudish muss Dobudish im Unterverzeichnis
+        <code class="filename">kivitendo-erp/doc/build</code> entpackt werden. Beispiel unter der
         Annahme, das <span class="productname">Dobudish</span>™ in
-        <code class="filename">$HOME/Downloads</code> heruntergeladen wurde:</p><pre class="programlisting">cd doc/build
-unzip $HOME/Downloads/dobudish-nojre-1.1.4.zip</pre></div><div class="sect2" title="4.8.3. PDFs und HTML-Seiten erstellen"><div class="titlepage"><div><div><h3 class="title"><a name="devel.build-doc.build"></a>4.8.3. PDFs und HTML-Seiten erstellen</h3></div></div></div><p>Die eigentliche Konvertierung erfolgt nach Installation der
+        <code class="filename">$HOME/Downloads</code> heruntergeladen wurde:</p><pre class="programlisting">cd kivitendo-erp/doc/build
+unzip $HOME/Downloads/dobudish-nojre-1.1.4.zip</pre><p>Damit auf Dobudish zugegriffen werden kann, muss ein Link mit dem Namen
+        <code class="filename">dobudish</code> erstellt werden, der auf den Ordner
+        <code class="filename">dobudish-nojre-1.1.4</code> zeigt.</p><pre class="programlisting">cd kivitendo-erp/doc/build
+ln -sf dobudish-1.1.4 dobudish</pre></div><div class="sect2" title="4.8.3. PDFs und HTML-Seiten erstellen"><div class="titlepage"><div><div><h3 class="title"><a name="devel.build-doc.build"></a>4.8.3. PDFs und HTML-Seiten erstellen</h3></div></div></div><p>Die eigentliche Konvertierung erfolgt nach Installation der
         benötigten Software mit einem einfachen Aufruf direkt aus dem
         kivitendo-Installationsverzeichnis heraus:</p><pre class="programlisting">./scripts/build_doc.sh</pre></div><div class="sect2" title="4.8.4. Einchecken in das Git-Repository"><div class="titlepage"><div><div><h3 class="title"><a name="devel.build-doc.repository"></a>4.8.4. Einchecken in das Git-Repository</h3></div></div></div><p>Sowohl die XML-Datei als auch die erzeugten PDF- und
         HTML-Dateien sind Bestandteil des Git-Repositories. Daraus folgt, dass
diff --git a/doc/html/images/Disp-Artikel.png b/doc/html/images/Disp-Artikel.png
new file mode 100644
index 000000000..4fba0dccb
Binary files /dev/null and b/doc/html/images/Disp-Artikel.png differ
diff --git a/doc/html/images/Disp-Einkauf-meldeb.png b/doc/html/images/Disp-Einkauf-meldeb.png
new file mode 100644
index 000000000..0ae6c9e53
Binary files /dev/null and b/doc/html/images/Disp-Einkauf-meldeb.png differ
diff --git a/doc/html/images/Disp-Einkauf-wrnkrb.png b/doc/html/images/Disp-Einkauf-wrnkrb.png
new file mode 100644
index 000000000..b3a213b39
Binary files /dev/null and b/doc/html/images/Disp-Einkauf-wrnkrb.png differ
diff --git a/doc/html/images/Disp-Einkauf-wrnkrb1.png b/doc/html/images/Disp-Einkauf-wrnkrb1.png
new file mode 100644
index 000000000..ce892c0ce
Binary files /dev/null and b/doc/html/images/Disp-Einkauf-wrnkrb1.png differ
diff --git a/doc/html/images/Einzahlungsschein_Makro.png b/doc/html/images/Einzahlungsschein_Makro.png
deleted file mode 100644
index 435691145..000000000
Binary files a/doc/html/images/Einzahlungsschein_Makro.png and /dev/null differ
diff --git a/doc/html/images/Reklamation_erfassen.png b/doc/html/images/Reklamation_erfassen.png
new file mode 100644
index 000000000..3108b122b
Binary files /dev/null and b/doc/html/images/Reklamation_erfassen.png differ
diff --git a/doc/html/images/Reklamation_erfassen_grund.png b/doc/html/images/Reklamation_erfassen_grund.png
new file mode 100644
index 000000000..b60295227
Binary files /dev/null and b/doc/html/images/Reklamation_erfassen_grund.png differ
diff --git a/doc/html/images/Reklamation_liste.png b/doc/html/images/Reklamation_liste.png
new file mode 100644
index 000000000..ae8088a71
Binary files /dev/null and b/doc/html/images/Reklamation_liste.png differ
diff --git a/doc/html/images/Reklamationsgruende_anlegen.png b/doc/html/images/Reklamationsgruende_anlegen.png
new file mode 100644
index 000000000..87ad91fe3
Binary files /dev/null and b/doc/html/images/Reklamationsgruende_anlegen.png differ
diff --git a/doc/html/images/Reklamationsgruende_liste.png b/doc/html/images/Reklamationsgruende_liste.png
new file mode 100644
index 000000000..e2a1fd3fb
Binary files /dev/null and b/doc/html/images/Reklamationsgruende_liste.png differ
diff --git a/doc/html/index.html b/doc/html/index.html
index ce6a9ac98..df7006792 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -1,9 +1,9 @@
 <html><head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-   <title>kivitendo 3.6.1: Installation, Konfiguration, Entwicklung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><link rel="next" href="ch01.html" title="Kapitel 1. Aktuelle Hinweise"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">kivitendo 3.6.1: Installation, Konfiguration,
-  Entwicklung</th></tr><tr><td width="20%" align="left">&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch01.html">Weiter</a></td></tr></table><hr></div><div lang="de" class="book" title="kivitendo 3.6.1: Installation, Konfiguration, Entwicklung"><div class="titlepage"><div><div><h1 class="title"><a name="kivitendo-documentation"></a>kivitendo 3.6.1: Installation, Konfiguration,
-  Entwicklung</h1></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="ch01.html">1. Aktuelle Hinweise</a></span></dt><dt><span class="chapter"><a href="ch02.html">2. Installation und Grundkonfiguration</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch02.html#Installation-%C3%9Cbersicht">2.1. Übersicht</a></span></dt><dt><span class="sect1"><a href="ch02s02.html">2.2. Benötigte Software und Pakete</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s02.html#Betriebssystem">2.2.1. Betriebssystem</a></span></dt><dt><span class="sect2"><a href="ch02s02.html#Pakete">2.2.2. Benötigte Perl-Pakete installieren</a></span></dt><dt><span class="sect2"><a href="ch02s02.html#d0e718">2.2.3. Andere Pakete installieren</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s03.html">2.3. Manuelle Installation des Programmpaketes</a></span></dt><dt><span class="sect1"><a href="ch02s04.html">2.4. kivitendo-Konfigurationsdatei</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s04.html#config.config-file.introduction">2.4.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s04.html#config.config-file.sections-parameters">2.4.2. Abschnitte und Parameter</a></span></dt><dt><span class="sect2"><a href="ch02s04.html#config.config-file.prior-versions">2.4.3. Versionen vor 2.6.3</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s05.html">2.5. Anpassung der PostgreSQL-Konfiguration</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s05.html#Zeichens%C3%A4tze-die-Verwendung-von-UTF-8">2.5.1. Zeichensätze/die Verwendung von Unicode/UTF-8</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#%C3%84nderungen-an-Konfigurationsdateien">2.5.2. Änderungen an Konfigurationsdateien</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#Erweiterung-f%C3%BCr-servergespeicherte-Prozeduren">2.5.3. Erweiterung für servergespeicherte Prozeduren</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#Erweiterung-f%C3%BCr-trigram">2.5.4. Erweiterung für Trigram Prozeduren</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#Datenbankbenutzer-anlegen">2.5.5. Datenbankbenutzer anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s06.html">2.6. Webserver-Konfiguration</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s06.html#d0e1192">2.6.1. Grundkonfiguration mittels CGI</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#Apache-Konfiguration.FCGI">2.6.2. Konfiguration für FastCGI/FCGI</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#d0e1346">2.6.3. Authentifizierung mittels HTTP Basic Authentication</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#d0e1362">2.6.4. Aktivierung von mod_rewrite/directory_match für git basierte Installationen</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#d0e1376">2.6.5. Weitergehende Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#d0e1387">2.6.6. Aktivierung von Apache2 modsecurity</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s07.html">2.7. Der Task-Server</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s07.html#Konfiguration-des-Task-Servers">2.7.1. Verfügbare und notwendige Konfigurationsoptionen</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#Konfiguration-der-Mandanten-fuer-den-Task-Servers">2.7.2. Konfiguration der Mandanten für den Task-Server</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#Einbinden-in-den-Boot-Prozess">2.7.3. Automatisches Starten des Task-Servers beim Booten</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#Prozesskontrolle">2.7.4. Wie der Task-Server gestartet und beendet wird</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#Tasks-konfigurieren">2.7.5. Exemplarische Konfiguration eines Hintergrund-Jobs, der die Jahreszahl in allen Nummernkreisen zum Jahreswechsel erhöht</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s08.html">2.8. Benutzerauthentifizierung und Administratorpasswort</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s08.html#Grundlagen-zur-Benutzerauthentifizierung">2.8.1. Grundlagen zur Benutzerauthentifizierung</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Administratorpasswort">2.8.2. Administratorpasswort</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Authentifizierungsdatenbank">2.8.3. Authentifizierungsdatenbank</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Passwort%C3%BCberpr%C3%BCfung">2.8.4. Passwortüberprüfung</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Name-des-Session-Cookies">2.8.5. Name des Session-Cookies</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Anlegen-der-Authentifizierungsdatenbank">2.8.6. Anlegen der Authentifizierungsdatenbank</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s09.html">2.9. Mandanten-, Benutzer- und Gruppenverwaltung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s09.html#Zusammenh%C3%A4nge">2.9.1. Zusammenhänge</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Mandanten-Benutzer-Gruppen">2.9.2. Mandanten, Benutzer und Gruppen</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Datenbanken-anlegen">2.9.3. Datenbanken anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Gruppen-anlegen">2.9.4. Gruppen anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Benutzer-anlegen">2.9.5. Benutzer anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Mandanten-anlegen">2.9.6. Mandanten anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s10.html">2.10. Drucker- und Systemverwaltung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s10.html#Druckeradministration">2.10.1. Druckeradministration</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#System">2.10.2. System sperren / entsperren</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s11.html">2.11. E-Mail-Versand aus kivitendo heraus</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s11.html#config.sending-email.sendmail">2.11.1. Versand über lokalen E-Mail-Server</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#config.sending-email.smtp">2.11.2. Versand über einen SMTP-Server</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s12.html">2.12. Drucken mit kivitendo</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s12.html#Vorlagenverzeichnis-anlegen">2.12.1. Vorlagenverzeichnis anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s12.html#Vorlagen-RB">2.12.2. Der Druckvorlagensatz RB</a></span></dt><dt><span class="sect2"><a href="ch02s12.html#Vorlagen-rev-odt">2.12.3. Der Druckvorlagensatz rev-odt</a></span></dt><dt><span class="sect2"><a href="ch02s12.html#allgemeine-hinweise-zu-latex">2.12.4. Allgemeine Hinweise zu LaTeX Vorlagen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s13.html">2.13. OpenDocument-Vorlagen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s13.html#d0e2489">2.13.1. OpenDocument (odt) Druckvorlagen mit Makros</a></span></dt><dt><span class="sect2"><a href="ch02s13.html#d0e2644">2.13.2. Schweizer QR-Rechnung mit OpenDocument Vorlagen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s14.html">2.14. Nomenklatur</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s14.html#booking.dates">2.14.1. Datum bei Buchungen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s15.html">2.15. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
-      EUR</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s15.html#config.eur.introduction">2.15.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#config.eur.parameters">2.15.2. Konfigurationsparameter</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#config.eur.setting-parameters">2.15.3. Festlegen der Parameter</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#config.eur.inventory-system-perpetual">2.15.4. Bemerkungen zur Bestandsmethode</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#config.eur.knonw-issues">2.15.5. Bekannte Probleme</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s16.html">2.16. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s16.html#config.skr04-update-3804.introduction">2.16.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s16.html#config.skr04-update-3804.create-chart">2.16.2. Konto 3804 manuell anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s17.html">2.17. Verhalten des Bilanzberichts</a></span></dt><dt><span class="sect1"><a href="ch02s18.html">2.18. Erfolgsrechnung</a></span></dt><dt><span class="sect1"><a href="ch02s19.html">2.19. Rundung in Verkaufsbelegen</a></span></dt><dt><span class="sect1"><a href="ch02s20.html">2.20. Einstellungen pro Mandant</a></span></dt><dt><span class="sect1"><a href="ch02s21.html">2.21. kivitendo ERP verwenden</a></span></dt></dl></dd><dt><span class="chapter"><a href="ch03.html">3. Features und Funktionen</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch03.html#features.periodic-invoices">3.1. Wiederkehrende Rechnungen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.introduction">3.1.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.configuration">3.1.2. Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.variables">3.1.3. Spezielle Variablen</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.reports">3.1.4. Auflisten</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.task-server">3.1.5. Erzeugung der eigentlichen Rechnungen</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.create-for-current-month">3.1.6. Erste Rechnung für aktuellen Monat erstellen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s02.html">3.2. Bankerweiterung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s02.html#features.bank.introduction">3.2.1. Einführung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s03.html">3.3. Dokumentenvorlagen und verfügbare Variablen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.einf%C3%BChrung">3.3.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.variablen-ausgeben">3.3.2. Variablen ausgeben</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.verwendung-in-druckbefehlen">3.3.3. Verwendung in Druckbefehlen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.tag-style">3.3.4. Anfang und Ende der Tags verändern</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.zuordnung-dateinamen">3.3.5. Zuordnung von den Dateinamen zu den Funktionen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.dateinamen-erweitert">3.3.6. Sprache, Drucker und E-Mail</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.allgemeine-variablen">3.3.7. Allgemeine Variablen, die in allen Vorlagen vorhanden
+   <title>kivitendo 3.9.2: Installation, Konfiguration, Entwicklung</title><link rel="stylesheet" type="text/css" href="style.css"><meta name="generator" content="DocBook XSL Stylesheets V1.76.1-RC2"><link rel="home" href="index.html" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><link rel="next" href="ch01.html" title="Kapitel 1. Aktuelle Hinweise"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">kivitendo 3.9.2: Installation, Konfiguration,
+  Entwicklung</th></tr><tr><td width="20%" align="left">&nbsp;</td><th width="60%" align="center">&nbsp;</th><td width="20%" align="right">&nbsp;<a accesskey="n" href="ch01.html">Weiter</a></td></tr></table><hr></div><div lang="de" class="book" title="kivitendo 3.9.2: Installation, Konfiguration, Entwicklung"><div class="titlepage"><div><div><h1 class="title"><a name="kivitendo-documentation"></a>kivitendo 3.9.2: Installation, Konfiguration,
+  Entwicklung</h1></div></div><hr></div><div class="toc"><p><b>Inhaltsverzeichnis</b></p><dl><dt><span class="chapter"><a href="ch01.html">1. Aktuelle Hinweise</a></span></dt><dt><span class="chapter"><a href="ch02.html">2. Installation und Grundkonfiguration</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch02.html#Installation-%C3%9Cbersicht">2.1. Übersicht</a></span></dt><dt><span class="sect1"><a href="ch02s02.html">2.2. Benötigte Software und Pakete</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s02.html#Betriebssystem">2.2.1. Betriebssystem</a></span></dt><dt><span class="sect2"><a href="ch02s02.html#Pakete">2.2.2. Benötigte Perl-Pakete installieren</a></span></dt><dt><span class="sect2"><a href="ch02s02.html#d0e749">2.2.3. Andere Pakete installieren</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s03.html">2.3. Installation mittels Ansible auf Ubuntu 22.04</a></span></dt><dt><span class="sect1"><a href="ch02s04.html">2.4. Manuelle Installation des Programmpaketes</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s04.html#Installation-mit-git">2.4.1. Installation mit git</a></span></dt><dt><span class="sect2"><a href="ch02s04.html#Installation_mit_Github">2.4.2. Installation über die Github Website</a></span></dt><dt><span class="sect2"><a href="ch02s04.html#restliche-Verzeichnisse-erstellen-und-Besitzer-%C3%A4ndern">2.4.3. Restliche Verzeichnisse ändern und bearbeiten</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s05.html">2.5. kivitendo-Konfigurationsdatei</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s05.html#config.config-file.introduction">2.5.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#config.config-file.sections-parameters">2.5.2. Abschnitte und Parameter</a></span></dt><dt><span class="sect2"><a href="ch02s05.html#config.config-file.prior-versions">2.5.3. Versionen vor 2.6.3</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s06.html">2.6. Anpassung der PostgreSQL-Konfiguration</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s06.html#Zeichens%C3%A4tze-die-Verwendung-von-UTF-8">2.6.1. Zeichensätze/die Verwendung von Unicode/UTF-8</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#%C3%84nderungen-an-Konfigurationsdateien">2.6.2. Änderungen an Konfigurationsdateien</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#Erweiterung-f%C3%BCr-servergespeicherte-Prozeduren">2.6.3. Erweiterung für servergespeicherte Prozeduren</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#Erweiterung-f%C3%BCr-trigram">2.6.4. Erweiterung für Trigram Prozeduren</a></span></dt><dt><span class="sect2"><a href="ch02s06.html#Datenbankbenutzer-anlegen">2.6.5. Datenbankbenutzer anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s07.html">2.7. Webserver-Konfiguration</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s07.html#Apache-Konfiguration.FCGI">2.7.1. Konfiguration für FastCGI/FCGI</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#d0e1359">2.7.2. Aktivierung von mod_rewrite/directory_match für git basierte Installationen</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#d0e1373">2.7.3. Weitergehende Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch02s07.html#d0e1384">2.7.4. Aktivierung von Apache2 modsecurity</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s08.html">2.8. Der Task-Server</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s08.html#Konfiguration-des-Task-Servers">2.8.1. Verfügbare und notwendige Konfigurationsoptionen</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Konfiguration-der-Mandanten-fuer-den-Task-Servers">2.8.2. Konfiguration der Mandanten für den Task-Server</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Einbinden-in-den-Boot-Prozess">2.8.3. Automatisches Starten des Task-Servers beim Booten</a></span></dt><dt><span class="sect2"><a href="ch02s08.html#Prozesskontrolle">2.8.4. Wie der Task-Server gestartet und beendet wird</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s09.html">2.9. Konfiguration der Hintergrund-Jobs</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s09.html#Hintergrund-Job SetNumberRange">2.9.1. SetNumberRange</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Hintergrund-Job ImportRecordEmails">2.9.2. ImportRecordEmails</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Hintergrund-Job InventoryClearAll">2.9.3. InventoryClearAll</a></span></dt><dt><span class="sect2"><a href="ch02s09.html#Hintergrund-Job CloseQuotations">2.9.4. CloseQuotations</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s10.html">2.10. Benutzerauthentifizierung und Administratorpasswort</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s10.html#Grundlagen-zur-Benutzerauthentifizierung">2.10.1. Grundlagen zur Benutzerauthentifizierung</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#Administratorpasswort">2.10.2. Administratorpasswort</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#Authentifizierungsdatenbank">2.10.3. Authentifizierungsdatenbank</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#Passwort%C3%BCberpr%C3%BCfung">2.10.4. Passwortüberprüfung</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#Name-des-Session-Cookies">2.10.5. Name des Session-Cookies</a></span></dt><dt><span class="sect2"><a href="ch02s10.html#Anlegen-der-Authentifizierungsdatenbank">2.10.6. Anlegen der Authentifizierungsdatenbank</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s11.html">2.11. Mandanten-, Benutzer- und Gruppenverwaltung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s11.html#Zusammenh%C3%A4nge">2.11.1. Zusammenhänge</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#Mandanten-Benutzer-Gruppen">2.11.2. Mandanten, Benutzer und Gruppen</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#Datenbanken-anlegen">2.11.3. Datenbanken anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#Gruppen-anlegen">2.11.4. Gruppen anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#Benutzer-anlegen">2.11.5. Benutzer anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s11.html#Mandanten-anlegen">2.11.6. Mandanten anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s12.html">2.12. Drucker- und Systemverwaltung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s12.html#Druckeradministration">2.12.1. Druckeradministration</a></span></dt><dt><span class="sect2"><a href="ch02s12.html#System">2.12.2. System sperren / entsperren</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s13.html">2.13. E-Mail</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s13.html#config.sending-email">2.13.1. E-Mail-Versand aus kivitendo heraus</a></span></dt><dt><span class="sect2"><a href="ch02s13.html#config.sent_emails_in_imap">2.13.2. Versendete E-Mails über IMAP exportieren</a></span></dt><dt><span class="sect2"><a href="ch02s13.html#config.imap_client">2.13.3. E-Mails in kivitendo importieren</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s14.html">2.14. Drucken mit kivitendo</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s14.html#Vorlagenverzeichnis-anlegen">2.14.1. Vorlagenverzeichnis anlegen</a></span></dt><dt><span class="sect2"><a href="ch02s14.html#Aufbau des marei Vorlagensatzes">2.14.2. Der Druckvorlagensatz marei</a></span></dt><dt><span class="sect2"><a href="ch02s14.html#Vorlagen-RB">2.14.3. Der Druckvorlagensatz RB</a></span></dt><dt><span class="sect2"><a href="ch02s14.html#Vorlagen-rev-odt">2.14.4. Der Druckvorlagensatz rev-odt</a></span></dt><dt><span class="sect2"><a href="ch02s14.html#allgemeine-hinweise-zu-latex">2.14.5. Allgemeine Hinweise zu LaTeX Vorlagen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s15.html">2.15. OpenDocument-Vorlagen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s15.html#d0e3228">2.15.1. Grundeinstellung</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#d0e3245">2.15.2. Direkte Erzeugung von PDF-Dateien</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#d0e3296">2.15.3. Vorbereitungen</a></span></dt><dt><span class="sect2"><a href="ch02s15.html#d0e3352">2.15.4. Schweizer QR-Rechnung mit OpenDocument Vorlagen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s16.html">2.16. Nomenklatur</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s16.html#booking.dates">2.16.1. Datum bei Buchungen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s17.html">2.17. Konfiguration zur Einnahmenüberschussrechnung/Bilanzierung:
+      EUR</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s17.html#config.eur.introduction">2.17.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s17.html#config.eur.parameters">2.17.2. Konfigurationsparameter</a></span></dt><dt><span class="sect2"><a href="ch02s17.html#config.eur.setting-parameters">2.17.3. Festlegen der Parameter</a></span></dt><dt><span class="sect2"><a href="ch02s17.html#config.eur.inventory-system-perpetual">2.17.4. Bemerkungen zur Bestandsmethode</a></span></dt><dt><span class="sect2"><a href="ch02s17.html#config.eur.knonw-issues">2.17.5. Bekannte Probleme</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s18.html">2.18. SKR04 19% Umstellung für innergemeinschaftlichen Erwerb</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch02s18.html#config.skr04-update-3804.introduction">2.18.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch02s18.html#config.skr04-update-3804.create-chart">2.18.2. Konto 3804 manuell anlegen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch02s19.html">2.19. Verhalten des Bilanzberichts</a></span></dt><dt><span class="sect1"><a href="ch02s20.html">2.20. Jahresabschluss</a></span></dt><dt><span class="sect1"><a href="ch02s21.html">2.21. Erfolgsrechnung</a></span></dt><dt><span class="sect1"><a href="ch02s22.html">2.22. Rundung in Verkaufsbelegen</a></span></dt><dt><span class="sect1"><a href="ch02s23.html">2.23. Einstellungen pro Mandant</a></span></dt><dt><span class="sect1"><a href="ch02s24.html">2.24. kivitendo ERP verwenden</a></span></dt></dl></dd><dt><span class="chapter"><a href="ch03.html">3. Features und Funktionen</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch03.html#features.periodic-invoices">3.1. Wiederkehrende Rechnungen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.introduction">3.1.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.configuration">3.1.2. Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.variables">3.1.3. Spezielle Variablen</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.reports">3.1.4. Auflisten</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.task-server">3.1.5. Erzeugung der eigentlichen Rechnungen</a></span></dt><dt><span class="sect2"><a href="ch03.html#features.periodic-invoices.create-for-current-month">3.1.6. Erste Rechnung für aktuellen Monat erstellen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s02.html">3.2. Bankerweiterung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s02.html#features.bank.introduction">3.2.1. Einführung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s03.html">3.3. Dokumentenvorlagen und verfügbare Variablen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.einf%C3%BChrung">3.3.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.variablen-ausgeben">3.3.2. Variablen ausgeben</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.verwendung-in-druckbefehlen">3.3.3. Verwendung in Druckbefehlen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.tag-style">3.3.4. Anfang und Ende der Tags verändern</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.zuordnung-dateinamen">3.3.5. Zuordnung von den Dateinamen zu den Funktionen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.dateinamen-erweitert">3.3.6. Sprache, Drucker und E-Mail</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.allgemeine-variablen">3.3.7. Allgemeine Variablen, die in allen Vorlagen vorhanden
         sind</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.invoice">3.3.8. Variablen in Rechnungen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.dunning">3.3.9. Variablen in Mahnungen und Rechnungen über Mahngebühren</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.andere-vorlagen">3.3.10. Variablen in anderen Vorlagen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.bloecke">3.3.11. Blöcke, bedingte Anweisungen und Schleifen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.markup">3.3.12. Markup-Code zur Textformatierung innerhalb von
-        Formularen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.anrede">3.3.13. Hinweise zur Anrede</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s04.html">3.4. Excel-Vorlagen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s04.html#excel-templates.summary">3.4.1. Zusammenfassung</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.usage">3.4.2. Bedienung</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.syntax">3.4.3. Variablensyntax</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.limitations">3.4.4. Einschränkungen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s05.html">3.5. Mandantenkonfiguration Lager</a></span></dt><dt><span class="sect1"><a href="ch03s06.html">3.6. Schweizer Kontenpläne</a></span></dt><dt><span class="sect1"><a href="ch03s07.html">3.7. Artikelklassifizierung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s07.html#d0e6817">3.7.1. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e6822">3.7.2. Basisklassifizierung</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e6852">3.7.3. Attribute</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e6883">3.7.4. Zwei-Zeichen Abkürzung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s08.html">3.8. Dateiverwaltung (Mini-DMS)</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s08.html#d0e6895">3.8.1. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e6922">3.8.2. Struktur</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e6974">3.8.3. Anwendung</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e7017">3.8.4. Konfigurierung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s09.html">3.9. Webshop-Api</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s09.html#d0e7082">3.9.1. Rechte für die Webshopapi</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e7097">3.9.2. Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e7105">3.9.3. Webshopartikel</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e7129">3.9.4. Bestellimport</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e7182">3.9.5. Mapping der Daten</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s10.html">3.10. ZUGFeRD Rechnungen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.preamble">3.10.1. Vorbedingung</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.summary">3.10.2. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.create_zugferd_bills">3.10.3. Erstellen von ZUGFeRD Rechnungen in Kivitendo</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.read_zugferd_bills">3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="ch04.html">4. Entwicklerdokumentation</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch04.html#devel.globals">4.1. Globale Variablen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04.html#d0e7271">4.1.1. Wie sehen globale Variablen in Perl aus?</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e7372">4.1.2. Warum sind globale Variablen ein Problem?</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e7405">4.1.3. Kanonische globale Variablen</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e7793">4.1.4. Ehemalige globale Variablen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s02.html">4.2. Entwicklung unter FastCGI</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.general">4.2.1. Allgemeines</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.exiting">4.2.2. Programmende und Ausnahmen</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.globals">4.2.3. Globale Variablen</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.performance">4.2.4. Performance und Statistiken</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s03.html">4.3. Programmatische API-Aufrufe</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.introduction">4.3.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.client_selection">4.3.2. Wahl des Mandanten</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.http_basic_authentication">4.3.3. HTTP-»Basic«-Authentifizierung</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.authentication_via_parameters">4.3.4. Authentifizierung mit Parametern</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.examples">4.3.5. Beispiele</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s04.html">4.4. SQL-Upgradedateien</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.introduction">4.4.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.format">4.4.2. Format der Kontrollinformationen</a></span></dt><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.format-perl-files">4.4.3. Format von in Perl geschriebenen
+        Formularen</a></span></dt><dt><span class="sect2"><a href="ch03s03.html#dokumentenvorlagen-und-variablen.anrede">3.3.13. Hinweise zur Anrede</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s04.html">3.4. Excel-Vorlagen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s04.html#excel-templates.summary">3.4.1. Zusammenfassung</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.usage">3.4.2. Bedienung</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.syntax">3.4.3. Variablensyntax</a></span></dt><dt><span class="sect2"><a href="ch03s04.html#excel-templates.limitations">3.4.4. Einschränkungen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s05.html">3.5. Mandantenkonfiguration Lager</a></span></dt><dt><span class="sect1"><a href="ch03s06.html">3.6. Schweizer Kontenpläne</a></span></dt><dt><span class="sect1"><a href="ch03s07.html">3.7. Artikelklassifizierung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s07.html#d0e7740">3.7.1. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e7745">3.7.2. Basisklassifizierung</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e7775">3.7.3. Attribute</a></span></dt><dt><span class="sect2"><a href="ch03s07.html#d0e7806">3.7.4. Zwei-Zeichen Abkürzung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s08.html">3.8. Dateiverwaltung (Mini-DMS)</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s08.html#d0e7818">3.8.1. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e7845">3.8.2. Struktur</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e7897">3.8.3. Anwendung</a></span></dt><dt><span class="sect2"><a href="ch03s08.html#d0e7940">3.8.4. Konfigurierung</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s09.html">3.9. Webshop-Api</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s09.html#d0e8005">3.9.1. Rechte für die Webshopapi</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e8020">3.9.2. Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e8028">3.9.3. Webshopartikel</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e8052">3.9.4. Bestellimport</a></span></dt><dt><span class="sect2"><a href="ch03s09.html#d0e8105">3.9.5. Mapping der Daten</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s10.html">3.10. ZUGFeRD Rechnungen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.preamble">3.10.1. Vorbedingung</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.summary">3.10.2. Übersicht</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.create_zugferd_bills">3.10.3. Erstellen von ZUGFeRD Rechnungen in Kivitendo</a></span></dt><dt><span class="sect2"><a href="ch03s10.html#features.zugferd.read_zugferd_bills">3.10.4. Einlesen von ZUGFeRD Rechnungen in Kivitendo</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s11.html">3.11. Reklamationen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s11.html#d0e8195">3.11.1. Konfiguration des Reklamationsmodul</a></span></dt><dt><span class="sect2"><a href="ch03s11.html#d0e8208">3.11.2. Reklamation erfassen</a></span></dt><dt><span class="sect2"><a href="ch03s11.html#d0e8226">3.11.3. Reklamationen auswerten</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s12.html">3.12. Dispositionsmanager/Einkaufshelfer</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s12.html#d0e8241">3.12.1. So kommen die Artikel in den Einkaufswarenkorb:</a></span></dt><dt><span class="sect2"><a href="ch03s12.html#d0e8260">3.12.2. Der Einkaufswarenkorb</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch03s13.html">3.13. Zeiterfassung</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch03s13.html#features.timerecording.config">3.13.1. Konfiguration</a></span></dt><dt><span class="sect2"><a href="ch03s13.html#features.timerecording.add">3.13.2. Erfassen</a></span></dt><dt><span class="sect2"><a href="ch03s13.html#features.timerecording.report">3.13.3. Bericht</a></span></dt><dt><span class="sect2"><a href="ch03s13.html#features.timerecording.conversion">3.13.4. Konvertierung zu Lieferscheinen</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="ch04.html">4. Entwicklerdokumentation</a></span></dt><dd><dl><dt><span class="sect1"><a href="ch04.html#devel.globals">4.1. Globale Variablen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04.html#d0e8585">4.1.1. Wie sehen globale Variablen in Perl aus?</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e8686">4.1.2. Warum sind globale Variablen ein Problem?</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e8719">4.1.3. Kanonische globale Variablen</a></span></dt><dt><span class="sect2"><a href="ch04.html#d0e9107">4.1.4. Ehemalige globale Variablen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s02.html">4.2. Entwicklung unter FastCGI</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.general">4.2.1. Allgemeines</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.exiting">4.2.2. Programmende und Ausnahmen</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.globals">4.2.3. Globale Variablen</a></span></dt><dt><span class="sect2"><a href="ch04s02.html#devel.fcgi.performance">4.2.4. Performance und Statistiken</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s03.html">4.3. Programmatische API-Aufrufe</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.introduction">4.3.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.client_selection">4.3.2. Wahl des Mandanten</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.http_basic_authentication">4.3.3. HTTP-»Basic«-Authentifizierung</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.authentication_via_parameters">4.3.4. Authentifizierung mit Parametern</a></span></dt><dt><span class="sect2"><a href="ch04s03.html#dev-programmatic-api-calls.examples">4.3.5. Beispiele</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s04.html">4.4. SQL-Upgradedateien</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.introduction">4.4.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.format">4.4.2. Format der Kontrollinformationen</a></span></dt><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.format-perl-files">4.4.3. Format von in Perl geschriebenen
         Datenbankupgradescripten</a></span></dt><dt><span class="sect2"><a href="ch04s04.html#db-upgrade-files.dbupgrade-tool">4.4.4. Hilfsscript dbupgrade2_tool.pl</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s05.html">4.5. Translations and languages</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s05.html#translations-languages.introduction">4.5.1. Introduction</a></span></dt><dt><span class="sect2"><a href="ch04s05.html#translations-languages.character-set">4.5.2. Character set</a></span></dt><dt><span class="sect2"><a href="ch04s05.html#translations-languages.file-structure">4.5.3. File structure</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s06.html">4.6. Die kivitendo-Test-Suite</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s06.html#devel.testsuite.intro">4.6.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s06.html#devel.testsuite.prerequisites">4.6.2. Voraussetzungen</a></span></dt><dt><span class="sect2"><a href="ch04s06.html#devel.testsuite.execution">4.6.3. Existierende Tests ausführen</a></span></dt><dt><span class="sect2"><a href="ch04s06.html#devel.testsuite.meaning_of_scripts">4.6.4. Bedeutung der verschiedenen Test-Scripte</a></span></dt><dt><span class="sect2"><a href="ch04s06.html#devel.testsuite.create_new">4.6.5. Neue Test-Scripte erstellen</a></span></dt></dl></dd><dt><span class="sect1"><a href="ch04s07.html">4.7. Stil-Richtlinien</a></span></dt><dt><span class="sect1"><a href="ch04s08.html">4.8. Dokumentation erstellen</a></span></dt><dd><dl><dt><span class="sect2"><a href="ch04s08.html#devel.build-doc.introduction">4.8.1. Einführung</a></span></dt><dt><span class="sect2"><a href="ch04s08.html#devel.build-doc.required-software">4.8.2. Benötigte Software</a></span></dt><dt><span class="sect2"><a href="ch04s08.html#devel.build-doc.build">4.8.3. PDFs und HTML-Seiten erstellen</a></span></dt><dt><span class="sect2"><a href="ch04s08.html#devel.build-doc.repository">4.8.4. Einchecken in das Git-Repository</a></span></dt></dl></dd></dl></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left">&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right">&nbsp;<a accesskey="n" href="ch01.html">Weiter</a></td></tr><tr><td width="40%" align="left" valign="top">&nbsp;</td><td width="20%" align="center">&nbsp;</td><td width="40%" align="right" valign="top">&nbsp;Kapitel 1. Aktuelle Hinweise</td></tr></table></div></body></html>
\ No newline at end of file
diff --git a/doc/images/Disp-Artikel.png b/doc/images/Disp-Artikel.png
new file mode 100644
index 000000000..4fba0dccb
Binary files /dev/null and b/doc/images/Disp-Artikel.png differ
diff --git a/doc/images/Disp-Einkauf-meldeb.png b/doc/images/Disp-Einkauf-meldeb.png
new file mode 100644
index 000000000..0ae6c9e53
Binary files /dev/null and b/doc/images/Disp-Einkauf-meldeb.png differ
diff --git a/doc/images/Disp-Einkauf-wrnkrb.png b/doc/images/Disp-Einkauf-wrnkrb.png
new file mode 100644
index 000000000..b3a213b39
Binary files /dev/null and b/doc/images/Disp-Einkauf-wrnkrb.png differ
diff --git a/doc/images/Disp-Einkauf-wrnkrb1.png b/doc/images/Disp-Einkauf-wrnkrb1.png
new file mode 100644
index 000000000..ce892c0ce
Binary files /dev/null and b/doc/images/Disp-Einkauf-wrnkrb1.png differ
diff --git a/doc/images/Einzahlungsschein_Makro.png b/doc/images/Einzahlungsschein_Makro.png
deleted file mode 100644
index 435691145..000000000
Binary files a/doc/images/Einzahlungsschein_Makro.png and /dev/null differ
diff --git a/doc/images/Reklamation_erfassen.png b/doc/images/Reklamation_erfassen.png
new file mode 100644
index 000000000..3108b122b
Binary files /dev/null and b/doc/images/Reklamation_erfassen.png differ
diff --git a/doc/images/Reklamation_erfassen_grund.png b/doc/images/Reklamation_erfassen_grund.png
new file mode 100644
index 000000000..b60295227
Binary files /dev/null and b/doc/images/Reklamation_erfassen_grund.png differ
diff --git a/doc/images/Reklamation_liste.png b/doc/images/Reklamation_liste.png
new file mode 100644
index 000000000..ae8088a71
Binary files /dev/null and b/doc/images/Reklamation_liste.png differ
diff --git a/doc/images/Reklamationsgruende_anlegen.png b/doc/images/Reklamationsgruende_anlegen.png
new file mode 100644
index 000000000..87ad91fe3
Binary files /dev/null and b/doc/images/Reklamationsgruende_anlegen.png differ
diff --git a/doc/images/Reklamationsgruende_liste.png b/doc/images/Reklamationsgruende_liste.png
new file mode 100644
index 000000000..e2a1fd3fb
Binary files /dev/null and b/doc/images/Reklamationsgruende_liste.png differ
diff --git a/doc/kivitendo-Dokumentation.pdf b/doc/kivitendo-Dokumentation.pdf
index 205b04302..db7b14a3f 100644
Binary files a/doc/kivitendo-Dokumentation.pdf and b/doc/kivitendo-Dokumentation.pdf differ
diff --git a/doc/release_management.txt b/doc/release_management.txt
index eb5cd2a8b..d0984f639 100644
--- a/doc/release_management.txt
+++ b/doc/release_management.txt
@@ -163,12 +163,6 @@ als freundliche Checkliste zum Ausdrucken und Erweitern.
   $ scripts/locales.pl en
   $ scripts/locales.pl de
 
-* SL::DB::Helper::ALL auf Vollständigkeit prüfen
-
-  (TODO: Mag da einer ein Script für schreiben?
-     find SL/DB -type f | grep -v MetaSetup | grep -v Helper | grep -v Manager | sort
-   hilft, kriegt aber die Sortierung durcheinander)
-
 * VERSION updaten
 
   Zu den Versionierungen ab 3.0.0:
@@ -250,3 +244,7 @@ als freundliche Checkliste zum Ausdrucken und Erweitern.
 
 * Nach einem Major Release alle Bugs, die den Milestone hatten und nicht gefixt
   wurden, zurücksetzen
+
+* Im Ansible Script die Verionsnummer aktualisieren und
+  neu hinzugekommene Pakete hinzufügen.
+  https://github.com/kivitendo/kivitendo-ansible
diff --git a/image/cross2.png b/image/cross2.png
new file mode 100644
index 000000000..025467ace
Binary files /dev/null and b/image/cross2.png differ
diff --git a/image/detail.png b/image/detail.png
new file mode 100644
index 000000000..a109157f4
Binary files /dev/null and b/image/detail.png differ
diff --git a/image/header-icon-home.png b/image/header-icon-home.png
new file mode 100644
index 000000000..413f0aeaf
Binary files /dev/null and b/image/header-icon-home.png differ
diff --git a/image/header-icon-logout.png b/image/header-icon-logout.png
new file mode 100644
index 000000000..7a0d609a4
Binary files /dev/null and b/image/header-icon-logout.png differ
diff --git a/image/header-icon-new-window.png b/image/header-icon-new-window.png
new file mode 100644
index 000000000..b0ab9b8e8
Binary files /dev/null and b/image/header-icon-new-window.png differ
diff --git a/image/header-icon-print.png b/image/header-icon-print.png
new file mode 100644
index 000000000..85d48bb7b
Binary files /dev/null and b/image/header-icon-print.png differ
diff --git a/image/header-icon-user.png b/image/header-icon-user.png
new file mode 100644
index 000000000..9e8e4796b
Binary files /dev/null and b/image/header-icon-user.png differ
diff --git a/image/mail.png b/image/mail.png
new file mode 100644
index 000000000..36ab3f2e6
Binary files /dev/null and b/image/mail.png differ
diff --git a/image/map-earth-hover.png b/image/map-earth-hover.png
new file mode 100644
index 000000000..60e2fbb5a
Binary files /dev/null and b/image/map-earth-hover.png differ
diff --git a/image/map-earth-link.png b/image/map-earth-link.png
new file mode 100644
index 000000000..2009976d5
Binary files /dev/null and b/image/map-earth-link.png differ
diff --git a/image/map-earth.png b/image/map-earth.png
new file mode 100644
index 000000000..82b062478
Binary files /dev/null and b/image/map-earth.png differ
diff --git a/image/menu-arrow-to-right-2.png b/image/menu-arrow-to-right-2.png
new file mode 100644
index 000000000..89a4b3b47
Binary files /dev/null and b/image/menu-arrow-to-right-2.png differ
diff --git a/image/menu-arrow-to-right-3.png b/image/menu-arrow-to-right-3.png
new file mode 100644
index 000000000..db895ba6e
Binary files /dev/null and b/image/menu-arrow-to-right-3.png differ
diff --git a/image/menu-arrow-to-right-4.png b/image/menu-arrow-to-right-4.png
new file mode 100644
index 000000000..6045edf60
Binary files /dev/null and b/image/menu-arrow-to-right-4.png differ
diff --git a/image/menu-arrow-to-right-5.png b/image/menu-arrow-to-right-5.png
new file mode 100644
index 000000000..40fb9612c
Binary files /dev/null and b/image/menu-arrow-to-right-5.png differ
diff --git a/image/menu-arrow-to-right.png b/image/menu-arrow-to-right.png
new file mode 100644
index 000000000..415b17e28
Binary files /dev/null and b/image/menu-arrow-to-right.png differ
diff --git a/image/pencil.png b/image/pencil.png
new file mode 100644
index 000000000..632ab7efe
Binary files /dev/null and b/image/pencil.png differ
diff --git a/image/search.png b/image/search.png
new file mode 100644
index 000000000..d3a456470
Binary files /dev/null and b/image/search.png differ
diff --git a/image/toggle-down.png b/image/toggle-down.png
new file mode 100644
index 000000000..7b0aece89
Binary files /dev/null and b/image/toggle-down.png differ
diff --git a/image/toggle-left.png b/image/toggle-left.png
new file mode 100644
index 000000000..23cf19ce6
Binary files /dev/null and b/image/toggle-left.png differ
diff --git a/image/up-small.png b/image/up-small.png
new file mode 100755
index 000000000..d8afa100e
Binary files /dev/null and b/image/up-small.png differ
diff --git a/image/updown2.png b/image/updown2.png
new file mode 100644
index 000000000..3c0a46500
Binary files /dev/null and b/image/updown2.png differ
diff --git a/js/autocomplete_chart.js b/js/autocomplete_chart.js
index c3d4cbd2e..618677c64 100644
--- a/js/autocomplete_chart.js
+++ b/js/autocomplete_chart.js
@@ -38,6 +38,7 @@ namespace('kivi', function(k){
     var $category = $('#' + real_id + '_category');  // hidden input_field of the chart_picker, added in Presenter, never changes
     var $choose = $('#' + real_id + '_choose');
     var $booked = $('#' + real_id + '_booked');
+    var $status = $('#' + real_id + '_status');
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
@@ -84,6 +85,9 @@ namespace('kivi', function(k){
       if ($category && $category.val())
         data['filter.category'] = $category.val().split(',');
 
+      // show only valid charts
+      data['filter.status'] = ($status && $status.val()) ? $status.val() : 'valid';
+
       return data;
     }
 
diff --git a/js/chart.js b/js/chart.js
new file mode 120000
index 000000000..bb3faaf2e
--- /dev/null
+++ b/js/chart.js
@@ -0,0 +1 @@
+chart/chart-3.8.2.min.js
\ No newline at end of file
diff --git a/js/chart/chart-3.8.2.min.js b/js/chart/chart-3.8.2.min.js
new file mode 100644
index 000000000..f75523089
--- /dev/null
+++ b/js/chart/chart-3.8.2.min.js
@@ -0,0 +1,13 @@
+/*!
+ * Chart.js v3.8.2
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Chart=e()}(this,(function(){"use strict";const t="undefined"==typeof window?function(t){return t()}:window.requestAnimationFrame;function e(e,i,s){const n=s||(t=>Array.prototype.slice.call(t));let o=!1,a=[];return function(...s){a=n(s),o||(o=!0,t.call(window,(()=>{o=!1,e.apply(i,a)})))}}function i(t,e){let i;return function(...s){return e?(clearTimeout(i),i=setTimeout(t,e,s)):t.apply(this,s),e}}const s=t=>"start"===t?"left":"end"===t?"right":"center",n=(t,e,i)=>"start"===t?e:"end"===t?i:(e+i)/2,o=(t,e,i,s)=>t===(s?"left":"right")?i:"center"===t?(e+i)/2:e;var a=new class{constructor(){this._request=null,this._charts=new Map,this._running=!1,this._lastDate=void 0}_notify(t,e,i,s){const n=e.listeners[s],o=e.duration;n.forEach((s=>s({chart:t,initial:e.initial,numSteps:o,currentStep:Math.min(i-e.start,o)})))}_refresh(){this._request||(this._running=!0,this._request=t.call(window,(()=>{this._update(),this._request=null,this._running&&this._refresh()})))}_update(t=Date.now()){let e=0;this._charts.forEach(((i,s)=>{if(!i.running||!i.items.length)return;const n=i.items;let o,a=n.length-1,r=!1;for(;a>=0;--a)o=n[a],o._active?(o._total>i.duration&&(i.duration=o._total),o.tick(t),r=!0):(n[a]=n[n.length-1],n.pop());r&&(s.draw(),this._notify(s,i,t,"progress")),n.length||(i.running=!1,this._notify(s,i,t,"complete"),i.initial=!1),e+=n.length})),this._lastDate=t,0===e&&(this._running=!1)}_getAnims(t){const e=this._charts;let i=e.get(t);return i||(i={running:!1,initial:!0,items:[],listeners:{complete:[],progress:[]}},e.set(t,i)),i}listen(t,e,i){this._getAnims(t).listeners[e].push(i)}add(t,e){e&&e.length&&this._getAnims(t).items.push(...e)}has(t){return this._getAnims(t).items.length>0}start(t){const e=this._charts.get(t);e&&(e.running=!0,e.start=Date.now(),e.duration=e.items.reduce(((t,e)=>Math.max(t,e._duration)),0),this._refresh())}running(t){if(!this._running)return!1;const e=this._charts.get(t);return!!(e&&e.running&&e.items.length)}stop(t){const e=this._charts.get(t);if(!e||!e.items.length)return;const i=e.items;let s=i.length-1;for(;s>=0;--s)i[s].cancel();e.items=[],this._notify(t,e,Date.now(),"complete")}remove(t){return this._charts.delete(t)}};
+/*!
+ * @kurkle/color v0.2.1
+ * https://github.com/kurkle/color#readme
+ * (c) 2022 Jukka Kurkela
+ * Released under the MIT License
+ */function r(t){return t+.5|0}const l=(t,e,i)=>Math.max(Math.min(t,i),e);function h(t){return l(r(2.55*t),0,255)}function c(t){return l(r(255*t),0,255)}function d(t){return l(r(t/2.55)/100,0,1)}function u(t){return l(r(100*t),0,100)}const f={0:0,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,A:10,B:11,C:12,D:13,E:14,F:15,a:10,b:11,c:12,d:13,e:14,f:15},g=[..."0123456789ABCDEF"],p=t=>g[15&t],m=t=>g[(240&t)>>4]+g[15&t],b=t=>(240&t)>>4==(15&t);function x(t){var e=(t=>b(t.r)&&b(t.g)&&b(t.b)&&b(t.a))(t)?p:m;return t?"#"+e(t.r)+e(t.g)+e(t.b)+((t,e)=>t<255?e(t):"")(t.a,e):void 0}const _=/^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;function y(t,e,i){const s=e*Math.min(i,1-i),n=(e,n=(e+t/30)%12)=>i-s*Math.max(Math.min(n-3,9-n,1),-1);return[n(0),n(8),n(4)]}function v(t,e,i){const s=(s,n=(s+t/60)%6)=>i-i*e*Math.max(Math.min(n,4-n,1),0);return[s(5),s(3),s(1)]}function w(t,e,i){const s=y(t,1,.5);let n;for(e+i>1&&(n=1/(e+i),e*=n,i*=n),n=0;n<3;n++)s[n]*=1-e-i,s[n]+=e;return s}function M(t){const e=t.r/255,i=t.g/255,s=t.b/255,n=Math.max(e,i,s),o=Math.min(e,i,s),a=(n+o)/2;let r,l,h;return n!==o&&(h=n-o,l=a>.5?h/(2-n-o):h/(n+o),r=function(t,e,i,s,n){return t===n?(e-i)/s+(e<i?6:0):e===n?(i-t)/s+2:(t-e)/s+4}(e,i,s,h,n),r=60*r+.5),[0|r,l||0,a]}function k(t,e,i,s){return(Array.isArray(e)?t(e[0],e[1],e[2]):t(e,i,s)).map(c)}function S(t,e,i){return k(y,t,e,i)}function P(t){return(t%360+360)%360}function D(t){const e=_.exec(t);let i,s=255;if(!e)return;e[5]!==i&&(s=e[6]?h(+e[5]):c(+e[5]));const n=P(+e[2]),o=+e[3]/100,a=+e[4]/100;return i="hwb"===e[1]?function(t,e,i){return k(w,t,e,i)}(n,o,a):"hsv"===e[1]?function(t,e,i){return k(v,t,e,i)}(n,o,a):S(n,o,a),{r:i[0],g:i[1],b:i[2],a:s}}const C={x:"dark",Z:"light",Y:"re",X:"blu",W:"gr",V:"medium",U:"slate",A:"ee",T:"ol",S:"or",B:"ra",C:"lateg",D:"ights",R:"in",Q:"turquois",E:"hi",P:"ro",O:"al",N:"le",M:"de",L:"yello",F:"en",K:"ch",G:"arks",H:"ea",I:"ightg",J:"wh"},O={OiceXe:"f0f8ff",antiquewEte:"faebd7",aqua:"ffff",aquamarRe:"7fffd4",azuY:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"0",blanKedOmond:"ffebcd",Xe:"ff",XeviTet:"8a2be2",bPwn:"a52a2a",burlywood:"deb887",caMtXe:"5f9ea0",KartYuse:"7fff00",KocTate:"d2691e",cSO:"ff7f50",cSnflowerXe:"6495ed",cSnsilk:"fff8dc",crimson:"dc143c",cyan:"ffff",xXe:"8b",xcyan:"8b8b",xgTMnPd:"b8860b",xWay:"a9a9a9",xgYF:"6400",xgYy:"a9a9a9",xkhaki:"bdb76b",xmagFta:"8b008b",xTivegYF:"556b2f",xSange:"ff8c00",xScEd:"9932cc",xYd:"8b0000",xsOmon:"e9967a",xsHgYF:"8fbc8f",xUXe:"483d8b",xUWay:"2f4f4f",xUgYy:"2f4f4f",xQe:"ced1",xviTet:"9400d3",dAppRk:"ff1493",dApskyXe:"bfff",dimWay:"696969",dimgYy:"696969",dodgerXe:"1e90ff",fiYbrick:"b22222",flSOwEte:"fffaf0",foYstWAn:"228b22",fuKsia:"ff00ff",gaRsbSo:"dcdcdc",ghostwEte:"f8f8ff",gTd:"ffd700",gTMnPd:"daa520",Way:"808080",gYF:"8000",gYFLw:"adff2f",gYy:"808080",honeyMw:"f0fff0",hotpRk:"ff69b4",RdianYd:"cd5c5c",Rdigo:"4b0082",ivSy:"fffff0",khaki:"f0e68c",lavFMr:"e6e6fa",lavFMrXsh:"fff0f5",lawngYF:"7cfc00",NmoncEffon:"fffacd",ZXe:"add8e6",ZcSO:"f08080",Zcyan:"e0ffff",ZgTMnPdLw:"fafad2",ZWay:"d3d3d3",ZgYF:"90ee90",ZgYy:"d3d3d3",ZpRk:"ffb6c1",ZsOmon:"ffa07a",ZsHgYF:"20b2aa",ZskyXe:"87cefa",ZUWay:"778899",ZUgYy:"778899",ZstAlXe:"b0c4de",ZLw:"ffffe0",lime:"ff00",limegYF:"32cd32",lRF:"faf0e6",magFta:"ff00ff",maPon:"800000",VaquamarRe:"66cdaa",VXe:"cd",VScEd:"ba55d3",VpurpN:"9370db",VsHgYF:"3cb371",VUXe:"7b68ee",VsprRggYF:"fa9a",VQe:"48d1cc",VviTetYd:"c71585",midnightXe:"191970",mRtcYam:"f5fffa",mistyPse:"ffe4e1",moccasR:"ffe4b5",navajowEte:"ffdead",navy:"80",Tdlace:"fdf5e6",Tive:"808000",TivedBb:"6b8e23",Sange:"ffa500",SangeYd:"ff4500",ScEd:"da70d6",pOegTMnPd:"eee8aa",pOegYF:"98fb98",pOeQe:"afeeee",pOeviTetYd:"db7093",papayawEp:"ffefd5",pHKpuff:"ffdab9",peru:"cd853f",pRk:"ffc0cb",plum:"dda0dd",powMrXe:"b0e0e6",purpN:"800080",YbeccapurpN:"663399",Yd:"ff0000",Psybrown:"bc8f8f",PyOXe:"4169e1",saddNbPwn:"8b4513",sOmon:"fa8072",sandybPwn:"f4a460",sHgYF:"2e8b57",sHshell:"fff5ee",siFna:"a0522d",silver:"c0c0c0",skyXe:"87ceeb",UXe:"6a5acd",UWay:"708090",UgYy:"708090",snow:"fffafa",sprRggYF:"ff7f",stAlXe:"4682b4",tan:"d2b48c",teO:"8080",tEstN:"d8bfd8",tomato:"ff6347",Qe:"40e0d0",viTet:"ee82ee",JHt:"f5deb3",wEte:"ffffff",wEtesmoke:"f5f5f5",Lw:"ffff00",LwgYF:"9acd32"};let A;function T(t){A||(A=function(){const t={},e=Object.keys(O),i=Object.keys(C);let s,n,o,a,r;for(s=0;s<e.length;s++){for(a=r=e[s],n=0;n<i.length;n++)o=i[n],r=r.replace(o,C[o]);o=parseInt(O[a],16),t[r]=[o>>16&255,o>>8&255,255&o]}return t}(),A.transparent=[0,0,0,0]);const e=A[t.toLowerCase()];return e&&{r:e[0],g:e[1],b:e[2],a:4===e.length?e[3]:255}}const L=/^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;const R=t=>t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055,E=t=>t<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4);function I(t,e,i){if(t){let s=M(t);s[e]=Math.max(0,Math.min(s[e]+s[e]*i,0===e?360:1)),s=S(s),t.r=s[0],t.g=s[1],t.b=s[2]}}function z(t,e){return t?Object.assign(e||{},t):t}function F(t){var e={r:0,g:0,b:0,a:255};return Array.isArray(t)?t.length>=3&&(e={r:t[0],g:t[1],b:t[2],a:255},t.length>3&&(e.a=c(t[3]))):(e=z(t,{r:0,g:0,b:0,a:1})).a=c(e.a),e}function B(t){return"r"===t.charAt(0)?function(t){const e=L.exec(t);let i,s,n,o=255;if(e){if(e[7]!==i){const t=+e[7];o=e[8]?h(t):l(255*t,0,255)}return i=+e[1],s=+e[3],n=+e[5],i=255&(e[2]?h(i):l(i,0,255)),s=255&(e[4]?h(s):l(s,0,255)),n=255&(e[6]?h(n):l(n,0,255)),{r:i,g:s,b:n,a:o}}}(t):D(t)}class V{constructor(t){if(t instanceof V)return t;const e=typeof t;let i;var s,n,o;"object"===e?i=F(t):"string"===e&&(o=(s=t).length,"#"===s[0]&&(4===o||5===o?n={r:255&17*f[s[1]],g:255&17*f[s[2]],b:255&17*f[s[3]],a:5===o?17*f[s[4]]:255}:7!==o&&9!==o||(n={r:f[s[1]]<<4|f[s[2]],g:f[s[3]]<<4|f[s[4]],b:f[s[5]]<<4|f[s[6]],a:9===o?f[s[7]]<<4|f[s[8]]:255})),i=n||T(t)||B(t)),this._rgb=i,this._valid=!!i}get valid(){return this._valid}get rgb(){var t=z(this._rgb);return t&&(t.a=d(t.a)),t}set rgb(t){this._rgb=F(t)}rgbString(){return this._valid?(t=this._rgb)&&(t.a<255?`rgba(${t.r}, ${t.g}, ${t.b}, ${d(t.a)})`:`rgb(${t.r}, ${t.g}, ${t.b})`):void 0;var t}hexString(){return this._valid?x(this._rgb):void 0}hslString(){return this._valid?function(t){if(!t)return;const e=M(t),i=e[0],s=u(e[1]),n=u(e[2]);return t.a<255?`hsla(${i}, ${s}%, ${n}%, ${d(t.a)})`:`hsl(${i}, ${s}%, ${n}%)`}(this._rgb):void 0}mix(t,e){if(t){const i=this.rgb,s=t.rgb;let n;const o=e===n?.5:e,a=2*o-1,r=i.a-s.a,l=((a*r==-1?a:(a+r)/(1+a*r))+1)/2;n=1-l,i.r=255&l*i.r+n*s.r+.5,i.g=255&l*i.g+n*s.g+.5,i.b=255&l*i.b+n*s.b+.5,i.a=o*i.a+(1-o)*s.a,this.rgb=i}return this}interpolate(t,e){return t&&(this._rgb=function(t,e,i){const s=E(d(t.r)),n=E(d(t.g)),o=E(d(t.b));return{r:c(R(s+i*(E(d(e.r))-s))),g:c(R(n+i*(E(d(e.g))-n))),b:c(R(o+i*(E(d(e.b))-o))),a:t.a+i*(e.a-t.a)}}(this._rgb,t._rgb,e)),this}clone(){return new V(this.rgb)}alpha(t){return this._rgb.a=c(t),this}clearer(t){return this._rgb.a*=1-t,this}greyscale(){const t=this._rgb,e=r(.3*t.r+.59*t.g+.11*t.b);return t.r=t.g=t.b=e,this}opaquer(t){return this._rgb.a*=1+t,this}negate(){const t=this._rgb;return t.r=255-t.r,t.g=255-t.g,t.b=255-t.b,this}lighten(t){return I(this._rgb,2,t),this}darken(t){return I(this._rgb,2,-t),this}saturate(t){return I(this._rgb,1,t),this}desaturate(t){return I(this._rgb,1,-t),this}rotate(t){return function(t,e){var i=M(t);i[0]=P(i[0]+e),i=S(i),t.r=i[0],t.g=i[1],t.b=i[2]}(this._rgb,t),this}}function W(t){return new V(t)}function N(t){if(t&&"object"==typeof t){const e=t.toString();return"[object CanvasPattern]"===e||"[object CanvasGradient]"===e}return!1}function j(t){return N(t)?t:W(t)}function H(t){return N(t)?t:W(t).saturate(.5).darken(.1).hexString()}function $(){}const Y=function(){let t=0;return function(){return t++}}();function U(t){return null==t}function X(t){if(Array.isArray&&Array.isArray(t))return!0;const e=Object.prototype.toString.call(t);return"[object"===e.slice(0,7)&&"Array]"===e.slice(-6)}function q(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)}const K=t=>("number"==typeof t||t instanceof Number)&&isFinite(+t);function G(t,e){return K(t)?t:e}function Z(t,e){return void 0===t?e:t}const J=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100:t/e,Q=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100*e:+t;function tt(t,e,i){if(t&&"function"==typeof t.call)return t.apply(i,e)}function et(t,e,i,s){let n,o,a;if(X(t))if(o=t.length,s)for(n=o-1;n>=0;n--)e.call(i,t[n],n);else for(n=0;n<o;n++)e.call(i,t[n],n);else if(q(t))for(a=Object.keys(t),o=a.length,n=0;n<o;n++)e.call(i,t[a[n]],a[n])}function it(t,e){let i,s,n,o;if(!t||!e||t.length!==e.length)return!1;for(i=0,s=t.length;i<s;++i)if(n=t[i],o=e[i],n.datasetIndex!==o.datasetIndex||n.index!==o.index)return!1;return!0}function st(t){if(X(t))return t.map(st);if(q(t)){const e=Object.create(null),i=Object.keys(t),s=i.length;let n=0;for(;n<s;++n)e[i[n]]=st(t[i[n]]);return e}return t}function nt(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}function ot(t,e,i,s){if(!nt(t))return;const n=e[t],o=i[t];q(n)&&q(o)?at(n,o,s):e[t]=st(o)}function at(t,e,i){const s=X(e)?e:[e],n=s.length;if(!q(t))return t;const o=(i=i||{}).merger||ot;for(let a=0;a<n;++a){if(!q(e=s[a]))continue;const n=Object.keys(e);for(let s=0,a=n.length;s<a;++s)o(n[s],t,e,i)}return t}function rt(t,e){return at(t,e,{merger:lt})}function lt(t,e,i){if(!nt(t))return;const s=e[t],n=i[t];q(s)&&q(n)?rt(s,n):Object.prototype.hasOwnProperty.call(e,t)||(e[t]=st(n))}function ht(t,e){const i=t.indexOf(".",e);return-1===i?t.length:i}function ct(t,e){if(""===e)return t;let i=0,s=ht(e,i);for(;t&&s>i;)t=t[e.slice(i,s)],i=s+1,s=ht(e,i);return t}function dt(t){return t.charAt(0).toUpperCase()+t.slice(1)}const ut=t=>void 0!==t,ft=t=>"function"==typeof t,gt=(t,e)=>{if(t.size!==e.size)return!1;for(const i of t)if(!e.has(i))return!1;return!0};function pt(t){return"mouseup"===t.type||"click"===t.type||"contextmenu"===t.type}const mt=Object.create(null),bt=Object.create(null);function xt(t,e){if(!e)return t;const i=e.split(".");for(let e=0,s=i.length;e<s;++e){const s=i[e];t=t[s]||(t[s]=Object.create(null))}return t}function _t(t,e,i){return"string"==typeof e?at(xt(t,e),i):at(xt(t,""),e)}var yt=new class{constructor(t){this.animation=void 0,this.backgroundColor="rgba(0,0,0,0.1)",this.borderColor="rgba(0,0,0,0.1)",this.color="#666",this.datasets={},this.devicePixelRatio=t=>t.chart.platform.getDevicePixelRatio(),this.elements={},this.events=["mousemove","mouseout","click","touchstart","touchmove"],this.font={family:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",size:12,style:"normal",lineHeight:1.2,weight:null},this.hover={},this.hoverBackgroundColor=(t,e)=>H(e.backgroundColor),this.hoverBorderColor=(t,e)=>H(e.borderColor),this.hoverColor=(t,e)=>H(e.color),this.indexAxis="x",this.interaction={mode:"nearest",intersect:!0,includeInvisible:!1},this.maintainAspectRatio=!0,this.onHover=null,this.onClick=null,this.parsing=!0,this.plugins={},this.responsive=!0,this.scale=void 0,this.scales={},this.showLine=!0,this.drawActiveElementsOnTop=!0,this.describe(t)}set(t,e){return _t(this,t,e)}get(t){return xt(this,t)}describe(t,e){return _t(bt,t,e)}override(t,e){return _t(mt,t,e)}route(t,e,i,s){const n=xt(this,t),o=xt(this,i),a="_"+e;Object.defineProperties(n,{[a]:{value:n[e],writable:!0},[e]:{enumerable:!0,get(){const t=this[a],e=o[s];return q(t)?Object.assign({},e,t):Z(t,e)},set(t){this[a]=t}}})}}({_scriptable:t=>!t.startsWith("on"),_indexable:t=>"events"!==t,hover:{_fallback:"interaction"},interaction:{_scriptable:!1,_indexable:!1}});function vt(t,e,i){i=i||(i=>t[i]<e);let s,n=t.length-1,o=0;for(;n-o>1;)s=o+n>>1,i(s)?o=s:n=s;return{lo:o,hi:n}}const wt=(t,e,i)=>vt(t,i,(s=>t[s][e]<i)),Mt=(t,e,i)=>vt(t,i,(s=>t[s][e]>=i));function kt(t,e,i){let s=0,n=t.length;for(;s<n&&t[s]<e;)s++;for(;n>s&&t[n-1]>i;)n--;return s>0||n<t.length?t.slice(s,n):t}const St=["push","pop","shift","splice","unshift"];function Pt(t,e){t._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),St.forEach((e=>{const i="_onData"+dt(e),s=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value(...e){const n=s.apply(this,e);return t._chartjs.listeners.forEach((t=>{"function"==typeof t[i]&&t[i](...e)})),n}})})))}function Dt(t,e){const i=t._chartjs;if(!i)return;const s=i.listeners,n=s.indexOf(e);-1!==n&&s.splice(n,1),s.length>0||(St.forEach((e=>{delete t[e]})),delete t._chartjs)}function Ct(t){const e=new Set;let i,s;for(i=0,s=t.length;i<s;++i)e.add(t[i]);return e.size===s?t:Array.from(e)}const Ot=Math.PI,At=2*Ot,Tt=At+Ot,Lt=Number.POSITIVE_INFINITY,Rt=Ot/180,Et=Ot/2,It=Ot/4,zt=2*Ot/3,Ft=Math.log10,Bt=Math.sign;function Vt(t){const e=Math.round(t);t=jt(t,e,t/1e3)?e:t;const i=Math.pow(10,Math.floor(Ft(t))),s=t/i;return(s<=1?1:s<=2?2:s<=5?5:10)*i}function Wt(t){const e=[],i=Math.sqrt(t);let s;for(s=1;s<i;s++)t%s==0&&(e.push(s),e.push(t/s));return i===(0|i)&&e.push(i),e.sort(((t,e)=>t-e)).pop(),e}function Nt(t){return!isNaN(parseFloat(t))&&isFinite(t)}function jt(t,e,i){return Math.abs(t-e)<i}function Ht(t,e){const i=Math.round(t);return i-e<=t&&i+e>=t}function $t(t,e,i){let s,n,o;for(s=0,n=t.length;s<n;s++)o=t[s][i],isNaN(o)||(e.min=Math.min(e.min,o),e.max=Math.max(e.max,o))}function Yt(t){return t*(Ot/180)}function Ut(t){return t*(180/Ot)}function Xt(t){if(!K(t))return;let e=1,i=0;for(;Math.round(t*e)/e!==t;)e*=10,i++;return i}function qt(t,e){const i=e.x-t.x,s=e.y-t.y,n=Math.sqrt(i*i+s*s);let o=Math.atan2(s,i);return o<-.5*Ot&&(o+=At),{angle:o,distance:n}}function Kt(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))}function Gt(t,e){return(t-e+Tt)%At-Ot}function Zt(t){return(t%At+At)%At}function Jt(t,e,i,s){const n=Zt(t),o=Zt(e),a=Zt(i),r=Zt(o-n),l=Zt(a-n),h=Zt(n-o),c=Zt(n-a);return n===o||n===a||s&&o===a||r>l&&h<c}function Qt(t,e,i){return Math.max(e,Math.min(i,t))}function te(t){return Qt(t,-32768,32767)}function ee(t,e,i,s=1e-6){return t>=Math.min(e,i)-s&&t<=Math.max(e,i)+s}function ie(){return"undefined"!=typeof window&&"undefined"!=typeof document}function se(t){let e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e}function ne(t,e,i){let s;return"string"==typeof t?(s=parseInt(t,10),-1!==t.indexOf("%")&&(s=s/100*e.parentNode[i])):s=t,s}const oe=t=>window.getComputedStyle(t,null);function ae(t,e){return oe(t).getPropertyValue(e)}const re=["top","right","bottom","left"];function le(t,e,i){const s={};i=i?"-"+i:"";for(let n=0;n<4;n++){const o=re[n];s[o]=parseFloat(t[e+"-"+o+i])||0}return s.width=s.left+s.right,s.height=s.top+s.bottom,s}function he(t,e){if("native"in t)return t;const{canvas:i,currentDevicePixelRatio:s}=e,n=oe(i),o="border-box"===n.boxSizing,a=le(n,"padding"),r=le(n,"border","width"),{x:l,y:h,box:c}=function(t,e){const i=t.touches,s=i&&i.length?i[0]:t,{offsetX:n,offsetY:o}=s;let a,r,l=!1;if(((t,e,i)=>(t>0||e>0)&&(!i||!i.shadowRoot))(n,o,t.target))a=n,r=o;else{const t=e.getBoundingClientRect();a=s.clientX-t.left,r=s.clientY-t.top,l=!0}return{x:a,y:r,box:l}}(t,i),d=a.left+(c&&r.left),u=a.top+(c&&r.top);let{width:f,height:g}=e;return o&&(f-=a.width+r.width,g-=a.height+r.height),{x:Math.round((l-d)/f*i.width/s),y:Math.round((h-u)/g*i.height/s)}}const ce=t=>Math.round(10*t)/10;function de(t,e,i,s){const n=oe(t),o=le(n,"margin"),a=ne(n.maxWidth,t,"clientWidth")||Lt,r=ne(n.maxHeight,t,"clientHeight")||Lt,l=function(t,e,i){let s,n;if(void 0===e||void 0===i){const o=se(t);if(o){const t=o.getBoundingClientRect(),a=oe(o),r=le(a,"border","width"),l=le(a,"padding");e=t.width-l.width-r.width,i=t.height-l.height-r.height,s=ne(a.maxWidth,o,"clientWidth"),n=ne(a.maxHeight,o,"clientHeight")}else e=t.clientWidth,i=t.clientHeight}return{width:e,height:i,maxWidth:s||Lt,maxHeight:n||Lt}}(t,e,i);let{width:h,height:c}=l;if("content-box"===n.boxSizing){const t=le(n,"border","width"),e=le(n,"padding");h-=e.width+t.width,c-=e.height+t.height}return h=Math.max(0,h-o.width),c=Math.max(0,s?Math.floor(h/s):c-o.height),h=ce(Math.min(h,a,l.maxWidth)),c=ce(Math.min(c,r,l.maxHeight)),h&&!c&&(c=ce(h/2)),{width:h,height:c}}function ue(t,e,i){const s=e||1,n=Math.floor(t.height*s),o=Math.floor(t.width*s);t.height=n/s,t.width=o/s;const a=t.canvas;return a.style&&(i||!a.style.height&&!a.style.width)&&(a.style.height=`${t.height}px`,a.style.width=`${t.width}px`),(t.currentDevicePixelRatio!==s||a.height!==n||a.width!==o)&&(t.currentDevicePixelRatio=s,a.height=n,a.width=o,t.ctx.setTransform(s,0,0,s,0,0),!0)}const fe=function(){let t=!1;try{const e={get passive(){return t=!0,!1}};window.addEventListener("test",null,e),window.removeEventListener("test",null,e)}catch(t){}return t}();function ge(t,e){const i=ae(t,e),s=i&&i.match(/^(\d+)(\.\d+)?px$/);return s?+s[1]:void 0}function pe(t){return!t||U(t.size)||U(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}function me(t,e,i,s,n){let o=e[n];return o||(o=e[n]=t.measureText(n).width,i.push(n)),o>s&&(s=o),s}function be(t,e,i,s){let n=(s=s||{}).data=s.data||{},o=s.garbageCollect=s.garbageCollect||[];s.font!==e&&(n=s.data={},o=s.garbageCollect=[],s.font=e),t.save(),t.font=e;let a=0;const r=i.length;let l,h,c,d,u;for(l=0;l<r;l++)if(d=i[l],null!=d&&!0!==X(d))a=me(t,n,o,a,d);else if(X(d))for(h=0,c=d.length;h<c;h++)u=d[h],null==u||X(u)||(a=me(t,n,o,a,u));t.restore();const f=o.length/2;if(f>i.length){for(l=0;l<f;l++)delete n[o[l]];o.splice(0,f)}return a}function xe(t,e,i){const s=t.currentDevicePixelRatio,n=0!==i?Math.max(i/2,.5):0;return Math.round((e-n)*s)/s+n}function _e(t,e){(e=e||t.getContext("2d")).save(),e.resetTransform(),e.clearRect(0,0,t.width,t.height),e.restore()}function ye(t,e,i,s){ve(t,e,i,s,null)}function ve(t,e,i,s,n){let o,a,r,l,h,c;const d=e.pointStyle,u=e.rotation,f=e.radius;let g=(u||0)*Rt;if(d&&"object"==typeof d&&(o=d.toString(),"[object HTMLImageElement]"===o||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,s),t.rotate(g),t.drawImage(d,-d.width/2,-d.height/2,d.width,d.height),void t.restore();if(!(isNaN(f)||f<=0)){switch(t.beginPath(),d){default:n?t.ellipse(i,s,n/2,f,0,0,At):t.arc(i,s,f,0,At),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(g)*f,s-Math.cos(g)*f),g+=zt,t.lineTo(i+Math.sin(g)*f,s-Math.cos(g)*f),g+=zt,t.lineTo(i+Math.sin(g)*f,s-Math.cos(g)*f),t.closePath();break;case"rectRounded":h=.516*f,l=f-h,a=Math.cos(g+It)*l,r=Math.sin(g+It)*l,t.arc(i-a,s-r,h,g-Ot,g-Et),t.arc(i+r,s-a,h,g-Et,g),t.arc(i+a,s+r,h,g,g+Et),t.arc(i-r,s+a,h,g+Et,g+Ot),t.closePath();break;case"rect":if(!u){l=Math.SQRT1_2*f,c=n?n/2:l,t.rect(i-c,s-l,2*c,2*l);break}g+=It;case"rectRot":a=Math.cos(g)*f,r=Math.sin(g)*f,t.moveTo(i-a,s-r),t.lineTo(i+r,s-a),t.lineTo(i+a,s+r),t.lineTo(i-r,s+a),t.closePath();break;case"crossRot":g+=It;case"cross":a=Math.cos(g)*f,r=Math.sin(g)*f,t.moveTo(i-a,s-r),t.lineTo(i+a,s+r),t.moveTo(i+r,s-a),t.lineTo(i-r,s+a);break;case"star":a=Math.cos(g)*f,r=Math.sin(g)*f,t.moveTo(i-a,s-r),t.lineTo(i+a,s+r),t.moveTo(i+r,s-a),t.lineTo(i-r,s+a),g+=It,a=Math.cos(g)*f,r=Math.sin(g)*f,t.moveTo(i-a,s-r),t.lineTo(i+a,s+r),t.moveTo(i+r,s-a),t.lineTo(i-r,s+a);break;case"line":a=n?n/2:Math.cos(g)*f,r=Math.sin(g)*f,t.moveTo(i-a,s-r),t.lineTo(i+a,s+r);break;case"dash":t.moveTo(i,s),t.lineTo(i+Math.cos(g)*f,s+Math.sin(g)*f)}t.fill(),e.borderWidth>0&&t.stroke()}}function we(t,e,i){return i=i||.5,!e||t&&t.x>e.left-i&&t.x<e.right+i&&t.y>e.top-i&&t.y<e.bottom+i}function Me(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()}function ke(t){t.restore()}function Se(t,e,i,s,n){if(!e)return t.lineTo(i.x,i.y);if("middle"===n){const s=(e.x+i.x)/2;t.lineTo(s,e.y),t.lineTo(s,i.y)}else"after"===n!=!!s?t.lineTo(e.x,i.y):t.lineTo(i.x,e.y);t.lineTo(i.x,i.y)}function Pe(t,e,i,s){if(!e)return t.lineTo(i.x,i.y);t.bezierCurveTo(s?e.cp1x:e.cp2x,s?e.cp1y:e.cp2y,s?i.cp2x:i.cp1x,s?i.cp2y:i.cp1y,i.x,i.y)}function De(t,e,i,s,n,o={}){const a=X(e)?e:[e],r=o.strokeWidth>0&&""!==o.strokeColor;let l,h;for(t.save(),t.font=n.string,function(t,e){e.translation&&t.translate(e.translation[0],e.translation[1]);U(e.rotation)||t.rotate(e.rotation);e.color&&(t.fillStyle=e.color);e.textAlign&&(t.textAlign=e.textAlign);e.textBaseline&&(t.textBaseline=e.textBaseline)}(t,o),l=0;l<a.length;++l)h=a[l],r&&(o.strokeColor&&(t.strokeStyle=o.strokeColor),U(o.strokeWidth)||(t.lineWidth=o.strokeWidth),t.strokeText(h,i,s,o.maxWidth)),t.fillText(h,i,s,o.maxWidth),Ce(t,i,s,h,o),s+=n.lineHeight;t.restore()}function Ce(t,e,i,s,n){if(n.strikethrough||n.underline){const o=t.measureText(s),a=e-o.actualBoundingBoxLeft,r=e+o.actualBoundingBoxRight,l=i-o.actualBoundingBoxAscent,h=i+o.actualBoundingBoxDescent,c=n.strikethrough?(l+h)/2:h;t.strokeStyle=t.fillStyle,t.beginPath(),t.lineWidth=n.decorationWidth||2,t.moveTo(a,c),t.lineTo(r,c),t.stroke()}}function Oe(t,e){const{x:i,y:s,w:n,h:o,radius:a}=e;t.arc(i+a.topLeft,s+a.topLeft,a.topLeft,-Et,Ot,!0),t.lineTo(i,s+o-a.bottomLeft),t.arc(i+a.bottomLeft,s+o-a.bottomLeft,a.bottomLeft,Ot,Et,!0),t.lineTo(i+n-a.bottomRight,s+o),t.arc(i+n-a.bottomRight,s+o-a.bottomRight,a.bottomRight,Et,0,!0),t.lineTo(i+n,s+a.topRight),t.arc(i+n-a.topRight,s+a.topRight,a.topRight,0,-Et,!0),t.lineTo(i+a.topLeft,s)}function Ae(t,e=[""],i=t,s,n=(()=>t[0])){ut(s)||(s=Ne("_fallback",t));const o={[Symbol.toStringTag]:"Object",_cacheable:!0,_scopes:t,_rootScopes:i,_fallback:s,_getTarget:n,override:n=>Ae([n,...t],e,i,s)};return new Proxy(o,{deleteProperty:(e,i)=>(delete e[i],delete e._keys,delete t[0][i],!0),get:(i,s)=>Ie(i,s,(()=>function(t,e,i,s){let n;for(const o of e)if(n=Ne(Re(o,t),i),ut(n))return Ee(t,n)?Ve(i,s,t,n):n}(s,e,t,i))),getOwnPropertyDescriptor:(t,e)=>Reflect.getOwnPropertyDescriptor(t._scopes[0],e),getPrototypeOf:()=>Reflect.getPrototypeOf(t[0]),has:(t,e)=>je(t).includes(e),ownKeys:t=>je(t),set(t,e,i){const s=t._storage||(t._storage=n());return t[e]=s[e]=i,delete t._keys,!0}})}function Te(t,e,i,s){const n={_cacheable:!1,_proxy:t,_context:e,_subProxy:i,_stack:new Set,_descriptors:Le(t,s),setContext:e=>Te(t,e,i,s),override:n=>Te(t.override(n),e,i,s)};return new Proxy(n,{deleteProperty:(e,i)=>(delete e[i],delete t[i],!0),get:(t,e,i)=>Ie(t,e,(()=>function(t,e,i){const{_proxy:s,_context:n,_subProxy:o,_descriptors:a}=t;let r=s[e];ft(r)&&a.isScriptable(e)&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_stack:r}=i;if(r.has(t))throw new Error("Recursion detected: "+Array.from(r).join("->")+"->"+t);r.add(t),e=e(o,a||s),r.delete(t),Ee(t,e)&&(e=Ve(n._scopes,n,t,e));return e}(e,r,t,i));X(r)&&r.length&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_descriptors:r}=i;if(ut(o.index)&&s(t))e=e[o.index%e.length];else if(q(e[0])){const i=e,s=n._scopes.filter((t=>t!==i));e=[];for(const l of i){const i=Ve(s,n,t,l);e.push(Te(i,o,a&&a[t],r))}}return e}(e,r,t,a.isIndexable));Ee(e,r)&&(r=Te(r,n,o&&o[e],a));return r}(t,e,i))),getOwnPropertyDescriptor:(e,i)=>e._descriptors.allKeys?Reflect.has(t,i)?{enumerable:!0,configurable:!0}:void 0:Reflect.getOwnPropertyDescriptor(t,i),getPrototypeOf:()=>Reflect.getPrototypeOf(t),has:(e,i)=>Reflect.has(t,i),ownKeys:()=>Reflect.ownKeys(t),set:(e,i,s)=>(t[i]=s,delete e[i],!0)})}function Le(t,e={scriptable:!0,indexable:!0}){const{_scriptable:i=e.scriptable,_indexable:s=e.indexable,_allKeys:n=e.allKeys}=t;return{allKeys:n,scriptable:i,indexable:s,isScriptable:ft(i)?i:()=>i,isIndexable:ft(s)?s:()=>s}}const Re=(t,e)=>t?t+dt(e):e,Ee=(t,e)=>q(e)&&"adapters"!==t&&(null===Object.getPrototypeOf(e)||e.constructor===Object);function Ie(t,e,i){if(Object.prototype.hasOwnProperty.call(t,e))return t[e];const s=i();return t[e]=s,s}function ze(t,e,i){return ft(t)?t(e,i):t}const Fe=(t,e)=>!0===t?e:"string"==typeof t?ct(e,t):void 0;function Be(t,e,i,s,n){for(const o of e){const e=Fe(i,o);if(e){t.add(e);const o=ze(e._fallback,i,n);if(ut(o)&&o!==i&&o!==s)return o}else if(!1===e&&ut(s)&&i!==s)return null}return!1}function Ve(t,e,i,s){const n=e._rootScopes,o=ze(e._fallback,i,s),a=[...t,...n],r=new Set;r.add(s);let l=We(r,a,i,o||i,s);return null!==l&&((!ut(o)||o===i||(l=We(r,a,o,l,s),null!==l))&&Ae(Array.from(r),[""],n,o,(()=>function(t,e,i){const s=t._getTarget();e in s||(s[e]={});const n=s[e];if(X(n)&&q(i))return i;return n}(e,i,s))))}function We(t,e,i,s,n){for(;i;)i=Be(t,e,i,s,n);return i}function Ne(t,e){for(const i of e){if(!i)continue;const e=i[t];if(ut(e))return e}}function je(t){let e=t._keys;return e||(e=t._keys=function(t){const e=new Set;for(const i of t)for(const t of Object.keys(i).filter((t=>!t.startsWith("_"))))e.add(t);return Array.from(e)}(t._scopes)),e}function He(t,e,i,s){const{iScale:n}=t,{key:o="r"}=this._parsing,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={r:n.parse(ct(c,o),h)};return a}const $e=Number.EPSILON||1e-14,Ye=(t,e)=>e<t.length&&!t[e].skip&&t[e],Ue=t=>"x"===t?"y":"x";function Xe(t,e,i,s){const n=t.skip?e:t,o=e,a=i.skip?e:i,r=Kt(o,n),l=Kt(a,o);let h=r/(r+l),c=l/(r+l);h=isNaN(h)?0:h,c=isNaN(c)?0:c;const d=s*h,u=s*c;return{previous:{x:o.x-d*(a.x-n.x),y:o.y-d*(a.y-n.y)},next:{x:o.x+u*(a.x-n.x),y:o.y+u*(a.y-n.y)}}}function qe(t,e="x"){const i=Ue(e),s=t.length,n=Array(s).fill(0),o=Array(s);let a,r,l,h=Ye(t,0);for(a=0;a<s;++a)if(r=l,l=h,h=Ye(t,a+1),l){if(h){const t=h[e]-l[e];n[a]=0!==t?(h[i]-l[i])/t:0}o[a]=r?h?Bt(n[a-1])!==Bt(n[a])?0:(n[a-1]+n[a])/2:n[a-1]:n[a]}!function(t,e,i){const s=t.length;let n,o,a,r,l,h=Ye(t,0);for(let c=0;c<s-1;++c)l=h,h=Ye(t,c+1),l&&h&&(jt(e[c],0,$e)?i[c]=i[c+1]=0:(n=i[c]/e[c],o=i[c+1]/e[c],r=Math.pow(n,2)+Math.pow(o,2),r<=9||(a=3/Math.sqrt(r),i[c]=n*a*e[c],i[c+1]=o*a*e[c])))}(t,n,o),function(t,e,i="x"){const s=Ue(i),n=t.length;let o,a,r,l=Ye(t,0);for(let h=0;h<n;++h){if(a=r,r=l,l=Ye(t,h+1),!r)continue;const n=r[i],c=r[s];a&&(o=(n-a[i])/3,r[`cp1${i}`]=n-o,r[`cp1${s}`]=c-o*e[h]),l&&(o=(l[i]-n)/3,r[`cp2${i}`]=n+o,r[`cp2${s}`]=c+o*e[h])}}(t,o,e)}function Ke(t,e,i){return Math.max(Math.min(t,i),e)}function Ge(t,e,i,s,n){let o,a,r,l;if(e.spanGaps&&(t=t.filter((t=>!t.skip))),"monotone"===e.cubicInterpolationMode)qe(t,n);else{let i=s?t[t.length-1]:t[0];for(o=0,a=t.length;o<a;++o)r=t[o],l=Xe(i,r,t[Math.min(o+1,a-(s?0:1))%a],e.tension),r.cp1x=l.previous.x,r.cp1y=l.previous.y,r.cp2x=l.next.x,r.cp2y=l.next.y,i=r}e.capBezierPoints&&function(t,e){let i,s,n,o,a,r=we(t[0],e);for(i=0,s=t.length;i<s;++i)a=o,o=r,r=i<s-1&&we(t[i+1],e),o&&(n=t[i],a&&(n.cp1x=Ke(n.cp1x,e.left,e.right),n.cp1y=Ke(n.cp1y,e.top,e.bottom)),r&&(n.cp2x=Ke(n.cp2x,e.left,e.right),n.cp2y=Ke(n.cp2y,e.top,e.bottom)))}(t,i)}const Ze=t=>0===t||1===t,Je=(t,e,i)=>-Math.pow(2,10*(t-=1))*Math.sin((t-e)*At/i),Qe=(t,e,i)=>Math.pow(2,-10*t)*Math.sin((t-e)*At/i)+1,ti={linear:t=>t,easeInQuad:t=>t*t,easeOutQuad:t=>-t*(t-2),easeInOutQuad:t=>(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1),easeInCubic:t=>t*t*t,easeOutCubic:t=>(t-=1)*t*t+1,easeInOutCubic:t=>(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2),easeInQuart:t=>t*t*t*t,easeOutQuart:t=>-((t-=1)*t*t*t-1),easeInOutQuart:t=>(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2),easeInQuint:t=>t*t*t*t*t,easeOutQuint:t=>(t-=1)*t*t*t*t+1,easeInOutQuint:t=>(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2),easeInSine:t=>1-Math.cos(t*Et),easeOutSine:t=>Math.sin(t*Et),easeInOutSine:t=>-.5*(Math.cos(Ot*t)-1),easeInExpo:t=>0===t?0:Math.pow(2,10*(t-1)),easeOutExpo:t=>1===t?1:1-Math.pow(2,-10*t),easeInOutExpo:t=>Ze(t)?t:t<.5?.5*Math.pow(2,10*(2*t-1)):.5*(2-Math.pow(2,-10*(2*t-1))),easeInCirc:t=>t>=1?t:-(Math.sqrt(1-t*t)-1),easeOutCirc:t=>Math.sqrt(1-(t-=1)*t),easeInOutCirc:t=>(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1),easeInElastic:t=>Ze(t)?t:Je(t,.075,.3),easeOutElastic:t=>Ze(t)?t:Qe(t,.075,.3),easeInOutElastic(t){const e=.1125;return Ze(t)?t:t<.5?.5*Je(2*t,e,.45):.5+.5*Qe(2*t-1,e,.45)},easeInBack(t){const e=1.70158;return t*t*((e+1)*t-e)},easeOutBack(t){const e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack(t){let e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:t=>1-ti.easeOutBounce(1-t),easeOutBounce(t){const e=7.5625,i=2.75;return t<1/i?e*t*t:t<2/i?e*(t-=1.5/i)*t+.75:t<2.5/i?e*(t-=2.25/i)*t+.9375:e*(t-=2.625/i)*t+.984375},easeInOutBounce:t=>t<.5?.5*ti.easeInBounce(2*t):.5*ti.easeOutBounce(2*t-1)+.5};function ei(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:t.y+i*(e.y-t.y)}}function ii(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:"middle"===s?i<.5?t.y:e.y:"after"===s?i<1?t.y:e.y:i>0?e.y:t.y}}function si(t,e,i,s){const n={x:t.cp2x,y:t.cp2y},o={x:e.cp1x,y:e.cp1y},a=ei(t,n,i),r=ei(n,o,i),l=ei(o,e,i),h=ei(a,r,i),c=ei(r,l,i);return ei(h,c,i)}const ni=new Map;function oi(t,e,i){return function(t,e){e=e||{};const i=t+JSON.stringify(e);let s=ni.get(i);return s||(s=new Intl.NumberFormat(t,e),ni.set(i,s)),s}(e,i).format(t)}const ai=new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/),ri=new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/);function li(t,e){const i=(""+t).match(ai);if(!i||"normal"===i[1])return 1.2*e;switch(t=+i[2],i[3]){case"px":return t;case"%":t/=100}return e*t}function hi(t,e){const i={},s=q(e),n=s?Object.keys(e):e,o=q(t)?s?i=>Z(t[i],t[e[i]]):e=>t[e]:()=>t;for(const t of n)i[t]=+o(t)||0;return i}function ci(t){return hi(t,{top:"y",right:"x",bottom:"y",left:"x"})}function di(t){return hi(t,["topLeft","topRight","bottomLeft","bottomRight"])}function ui(t){const e=ci(t);return e.width=e.left+e.right,e.height=e.top+e.bottom,e}function fi(t,e){t=t||{},e=e||yt.font;let i=Z(t.size,e.size);"string"==typeof i&&(i=parseInt(i,10));let s=Z(t.style,e.style);s&&!(""+s).match(ri)&&(console.warn('Invalid font style specified: "'+s+'"'),s="");const n={family:Z(t.family,e.family),lineHeight:li(Z(t.lineHeight,e.lineHeight),i),size:i,style:s,weight:Z(t.weight,e.weight),string:""};return n.string=pe(n),n}function gi(t,e,i,s){let n,o,a,r=!0;for(n=0,o=t.length;n<o;++n)if(a=t[n],void 0!==a&&(void 0!==e&&"function"==typeof a&&(a=a(e),r=!1),void 0!==i&&X(a)&&(a=a[i%a.length],r=!1),void 0!==a))return s&&!r&&(s.cacheable=!1),a}function pi(t,e,i){const{min:s,max:n}=t,o=Q(e,(n-s)/2),a=(t,e)=>i&&0===t?0:t+e;return{min:a(s,-Math.abs(o)),max:a(n,o)}}function mi(t,e){return Object.assign(Object.create(t),e)}function bi(t,e,i){return t?function(t,e){return{x:i=>t+t+e-i,setWidth(t){e=t},textAlign:t=>"center"===t?t:"right"===t?"left":"right",xPlus:(t,e)=>t-e,leftForLtr:(t,e)=>t-e}}(e,i):{x:t=>t,setWidth(t){},textAlign:t=>t,xPlus:(t,e)=>t+e,leftForLtr:(t,e)=>t}}function xi(t,e){let i,s;"ltr"!==e&&"rtl"!==e||(i=t.canvas.style,s=[i.getPropertyValue("direction"),i.getPropertyPriority("direction")],i.setProperty("direction",e,"important"),t.prevTextDirection=s)}function _i(t,e){void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}function yi(t){return"angle"===t?{between:Jt,compare:Gt,normalize:Zt}:{between:ee,compare:(t,e)=>t-e,normalize:t=>t}}function vi({start:t,end:e,count:i,loop:s,style:n}){return{start:t%i,end:e%i,loop:s&&(e-t+1)%i==0,style:n}}function wi(t,e,i){if(!i)return[t];const{property:s,start:n,end:o}=i,a=e.length,{compare:r,between:l,normalize:h}=yi(s),{start:c,end:d,loop:u,style:f}=function(t,e,i){const{property:s,start:n,end:o}=i,{between:a,normalize:r}=yi(s),l=e.length;let h,c,{start:d,end:u,loop:f}=t;if(f){for(d+=l,u+=l,h=0,c=l;h<c&&a(r(e[d%l][s]),n,o);++h)d--,u--;d%=l,u%=l}return u<d&&(u+=l),{start:d,end:u,loop:f,style:t.style}}(t,e,i),g=[];let p,m,b,x=!1,_=null;const y=()=>x||l(n,b,p)&&0!==r(n,b),v=()=>!x||0===r(o,p)||l(o,b,p);for(let t=c,i=c;t<=d;++t)m=e[t%a],m.skip||(p=h(m[s]),p!==b&&(x=l(p,n,o),null===_&&y()&&(_=0===r(p,n)?t:i),null!==_&&v()&&(g.push(vi({start:_,end:t,loop:u,count:a,style:f})),_=null),i=t,b=p));return null!==_&&g.push(vi({start:_,end:d,loop:u,count:a,style:f})),g}function Mi(t,e){const i=[],s=t.segments;for(let n=0;n<s.length;n++){const o=wi(s[n],t.points,e);o.length&&i.push(...o)}return i}function ki(t,e){const i=t.points,s=t.options.spanGaps,n=i.length;if(!n)return[];const o=!!t._loop,{start:a,end:r}=function(t,e,i,s){let n=0,o=e-1;if(i&&!s)for(;n<e&&!t[n].skip;)n++;for(;n<e&&t[n].skip;)n++;for(n%=e,i&&(o+=n);o>n&&t[o%e].skip;)o--;return o%=e,{start:n,end:o}}(i,n,o,s);if(!0===s)return Si(t,[{start:a,end:r,loop:o}],i,e);return Si(t,function(t,e,i,s){const n=t.length,o=[];let a,r=e,l=t[e];for(a=e+1;a<=i;++a){const i=t[a%n];i.skip||i.stop?l.skip||(s=!1,o.push({start:e%n,end:(a-1)%n,loop:s}),e=r=i.stop?a:null):(r=a,l.skip&&(e=a)),l=i}return null!==r&&o.push({start:e%n,end:r%n,loop:s}),o}(i,a,r<a?r+n:r,!!t._fullLoop&&0===a&&r===n-1),i,e)}function Si(t,e,i,s){return s&&s.setContext&&i?function(t,e,i,s){const n=t._chart.getContext(),o=Pi(t.options),{_datasetIndex:a,options:{spanGaps:r}}=t,l=i.length,h=[];let c=o,d=e[0].start,u=d;function f(t,e,s,n){const o=r?-1:1;if(t!==e){for(t+=l;i[t%l].skip;)t-=o;for(;i[e%l].skip;)e+=o;t%l!=e%l&&(h.push({start:t%l,end:e%l,loop:s,style:n}),c=n,d=e%l)}}for(const t of e){d=r?d:t.start;let e,o=i[d%l];for(u=d+1;u<=t.end;u++){const r=i[u%l];e=Pi(s.setContext(mi(n,{type:"segment",p0:o,p1:r,p0DataIndex:(u-1)%l,p1DataIndex:u%l,datasetIndex:a}))),Di(e,c)&&f(d,u-1,t.loop,c),o=r,c=e}d<u-1&&f(d,u-1,t.loop,c)}return h}(t,e,i,s):e}function Pi(t){return{backgroundColor:t.backgroundColor,borderCapStyle:t.borderCapStyle,borderDash:t.borderDash,borderDashOffset:t.borderDashOffset,borderJoinStyle:t.borderJoinStyle,borderWidth:t.borderWidth,borderColor:t.borderColor}}function Di(t,e){return e&&JSON.stringify(t)!==JSON.stringify(e)}var Ci=Object.freeze({__proto__:null,easingEffects:ti,isPatternOrGradient:N,color:j,getHoverColor:H,noop:$,uid:Y,isNullOrUndef:U,isArray:X,isObject:q,isFinite:K,finiteOrDefault:G,valueOrDefault:Z,toPercentage:J,toDimension:Q,callback:tt,each:et,_elementsEqual:it,clone:st,_merger:ot,merge:at,mergeIf:rt,_mergerIf:lt,_deprecated:function(t,e,i,s){void 0!==e&&console.warn(t+': "'+i+'" is deprecated. Please use "'+s+'" instead')},resolveObjectKey:ct,_capitalize:dt,defined:ut,isFunction:ft,setsEqual:gt,_isClickEvent:pt,toFontString:pe,_measureText:me,_longestText:be,_alignPixel:xe,clearCanvas:_e,drawPoint:ye,drawPointLegend:ve,_isPointInArea:we,clipArea:Me,unclipArea:ke,_steppedLineTo:Se,_bezierCurveTo:Pe,renderText:De,addRoundedRectPath:Oe,_lookup:vt,_lookupByKey:wt,_rlookupByKey:Mt,_filterBetween:kt,listenArrayEvents:Pt,unlistenArrayEvents:Dt,_arrayUnique:Ct,_createResolver:Ae,_attachContext:Te,_descriptors:Le,_parseObjectDataRadialScale:He,splineCurve:Xe,splineCurveMonotone:qe,_updateBezierControlPoints:Ge,_isDomSupported:ie,_getParentNode:se,getStyle:ae,getRelativePosition:he,getMaximumSize:de,retinaScale:ue,supportsEventListenerOptions:fe,readUsedSize:ge,fontString:function(t,e,i){return e+" "+t+"px "+i},requestAnimFrame:t,throttled:e,debounce:i,_toLeftRightCenter:s,_alignStartEnd:n,_textX:o,_pointInLine:ei,_steppedInterpolation:ii,_bezierInterpolation:si,formatNumber:oi,toLineHeight:li,_readValueToProps:hi,toTRBL:ci,toTRBLCorners:di,toPadding:ui,toFont:fi,resolve:gi,_addGrace:pi,createContext:mi,PI:Ot,TAU:At,PITAU:Tt,INFINITY:Lt,RAD_PER_DEG:Rt,HALF_PI:Et,QUARTER_PI:It,TWO_THIRDS_PI:zt,log10:Ft,sign:Bt,niceNum:Vt,_factorize:Wt,isNumber:Nt,almostEquals:jt,almostWhole:Ht,_setMinAndMaxByKey:$t,toRadians:Yt,toDegrees:Ut,_decimalPlaces:Xt,getAngleFromPoint:qt,distanceBetweenPoints:Kt,_angleDiff:Gt,_normalizeAngle:Zt,_angleBetween:Jt,_limitValue:Qt,_int16Range:te,_isBetween:ee,getRtlAdapter:bi,overrideTextDirection:xi,restoreTextDirection:_i,_boundSegment:wi,_boundSegments:Mi,_computeSegments:ki});function Oi(t,e,i,s){const{controller:n,data:o,_sorted:a}=t,r=n._cachedMeta.iScale;if(r&&e===r.axis&&"r"!==e&&a&&o.length){const t=r._reversePixels?Mt:wt;if(!s)return t(o,e,i);if(n._sharedOptions){const s=o[0],n="function"==typeof s.getRange&&s.getRange(e);if(n){const s=t(o,e,i-n),a=t(o,e,i+n);return{lo:s.lo,hi:a.hi}}}}return{lo:0,hi:o.length-1}}function Ai(t,e,i,s,n){const o=t.getSortedVisibleDatasetMetas(),a=i[e];for(let t=0,i=o.length;t<i;++t){const{index:i,data:r}=o[t],{lo:l,hi:h}=Oi(o[t],e,a,n);for(let t=l;t<=h;++t){const e=r[t];e.skip||s(e,i,t)}}}function Ti(t,e,i,s,n){const o=[];if(!n&&!t.isPointInArea(e))return o;return Ai(t,i,e,(function(i,a,r){(n||we(i,t.chartArea,0))&&i.inRange(e.x,e.y,s)&&o.push({element:i,datasetIndex:a,index:r})}),!0),o}function Li(t,e,i,s,n,o){let a=[];const r=function(t){const e=-1!==t.indexOf("x"),i=-1!==t.indexOf("y");return function(t,s){const n=e?Math.abs(t.x-s.x):0,o=i?Math.abs(t.y-s.y):0;return Math.sqrt(Math.pow(n,2)+Math.pow(o,2))}}(i);let l=Number.POSITIVE_INFINITY;return Ai(t,i,e,(function(i,h,c){const d=i.inRange(e.x,e.y,n);if(s&&!d)return;const u=i.getCenterPoint(n);if(!(!!o||t.isPointInArea(u))&&!d)return;const f=r(e,u);f<l?(a=[{element:i,datasetIndex:h,index:c}],l=f):f===l&&a.push({element:i,datasetIndex:h,index:c})})),a}function Ri(t,e,i,s,n,o){return o||t.isPointInArea(e)?"r"!==i||s?Li(t,e,i,s,n,o):function(t,e,i,s){let n=[];return Ai(t,i,e,(function(t,i,o){const{startAngle:a,endAngle:r}=t.getProps(["startAngle","endAngle"],s),{angle:l}=qt(t,{x:e.x,y:e.y});Jt(l,a,r)&&n.push({element:t,datasetIndex:i,index:o})})),n}(t,e,i,n):[]}function Ei(t,e,i,s,n){const o=[],a="x"===i?"inXRange":"inYRange";let r=!1;return Ai(t,i,e,((t,s,l)=>{t[a](e[i],n)&&(o.push({element:t,datasetIndex:s,index:l}),r=r||t.inRange(e.x,e.y,n))})),s&&!r?[]:o}var Ii={evaluateInteractionItems:Ai,modes:{index(t,e,i,s){const n=he(e,t),o=i.axis||"x",a=i.includeInvisible||!1,r=i.intersect?Ti(t,n,o,s,a):Ri(t,n,o,!1,s,a),l=[];return r.length?(t.getSortedVisibleDatasetMetas().forEach((t=>{const e=r[0].index,i=t.data[e];i&&!i.skip&&l.push({element:i,datasetIndex:t.index,index:e})})),l):[]},dataset(t,e,i,s){const n=he(e,t),o=i.axis||"xy",a=i.includeInvisible||!1;let r=i.intersect?Ti(t,n,o,s,a):Ri(t,n,o,!1,s,a);if(r.length>0){const e=r[0].datasetIndex,i=t.getDatasetMeta(e).data;r=[];for(let t=0;t<i.length;++t)r.push({element:i[t],datasetIndex:e,index:t})}return r},point:(t,e,i,s)=>Ti(t,he(e,t),i.axis||"xy",s,i.includeInvisible||!1),nearest(t,e,i,s){const n=he(e,t),o=i.axis||"xy",a=i.includeInvisible||!1;return Ri(t,n,o,i.intersect,s,a)},x:(t,e,i,s)=>Ei(t,he(e,t),"x",i.intersect,s),y:(t,e,i,s)=>Ei(t,he(e,t),"y",i.intersect,s)}};const zi=["left","top","right","bottom"];function Fi(t,e){return t.filter((t=>t.pos===e))}function Bi(t,e){return t.filter((t=>-1===zi.indexOf(t.pos)&&t.box.axis===e))}function Vi(t,e){return t.sort(((t,i)=>{const s=e?i:t,n=e?t:i;return s.weight===n.weight?s.index-n.index:s.weight-n.weight}))}function Wi(t,e){const i=function(t){const e={};for(const i of t){const{stack:t,pos:s,stackWeight:n}=i;if(!t||!zi.includes(s))continue;const o=e[t]||(e[t]={count:0,placed:0,weight:0,size:0});o.count++,o.weight+=n}return e}(t),{vBoxMaxWidth:s,hBoxMaxHeight:n}=e;let o,a,r;for(o=0,a=t.length;o<a;++o){r=t[o];const{fullSize:a}=r.box,l=i[r.stack],h=l&&r.stackWeight/l.weight;r.horizontal?(r.width=h?h*s:a&&e.availableWidth,r.height=n):(r.width=s,r.height=h?h*n:a&&e.availableHeight)}return i}function Ni(t,e,i,s){return Math.max(t[i],e[i])+Math.max(t[s],e[s])}function ji(t,e){t.top=Math.max(t.top,e.top),t.left=Math.max(t.left,e.left),t.bottom=Math.max(t.bottom,e.bottom),t.right=Math.max(t.right,e.right)}function Hi(t,e,i,s){const{pos:n,box:o}=i,a=t.maxPadding;if(!q(n)){i.size&&(t[n]-=i.size);const e=s[i.stack]||{size:0,count:1};e.size=Math.max(e.size,i.horizontal?o.height:o.width),i.size=e.size/e.count,t[n]+=i.size}o.getPadding&&ji(a,o.getPadding());const r=Math.max(0,e.outerWidth-Ni(a,t,"left","right")),l=Math.max(0,e.outerHeight-Ni(a,t,"top","bottom")),h=r!==t.w,c=l!==t.h;return t.w=r,t.h=l,i.horizontal?{same:h,other:c}:{same:c,other:h}}function $i(t,e){const i=e.maxPadding;function s(t){const s={left:0,top:0,right:0,bottom:0};return t.forEach((t=>{s[t]=Math.max(e[t],i[t])})),s}return s(t?["left","right"]:["top","bottom"])}function Yi(t,e,i,s){const n=[];let o,a,r,l,h,c;for(o=0,a=t.length,h=0;o<a;++o){r=t[o],l=r.box,l.update(r.width||e.w,r.height||e.h,$i(r.horizontal,e));const{same:a,other:d}=Hi(e,i,r,s);h|=a&&n.length,c=c||d,l.fullSize||n.push(r)}return h&&Yi(n,e,i,s)||c}function Ui(t,e,i,s,n){t.top=i,t.left=e,t.right=e+s,t.bottom=i+n,t.width=s,t.height=n}function Xi(t,e,i,s){const n=i.padding;let{x:o,y:a}=e;for(const r of t){const t=r.box,l=s[r.stack]||{count:1,placed:0,weight:1},h=r.stackWeight/l.weight||1;if(r.horizontal){const s=e.w*h,o=l.size||t.height;ut(l.start)&&(a=l.start),t.fullSize?Ui(t,n.left,a,i.outerWidth-n.right-n.left,o):Ui(t,e.left+l.placed,a,s,o),l.start=a,l.placed+=s,a=t.bottom}else{const s=e.h*h,a=l.size||t.width;ut(l.start)&&(o=l.start),t.fullSize?Ui(t,o,n.top,a,i.outerHeight-n.bottom-n.top):Ui(t,o,e.top+l.placed,a,s),l.start=o,l.placed+=s,o=t.right}}e.x=o,e.y=a}yt.set("layout",{autoPadding:!0,padding:{top:0,right:0,bottom:0,left:0}});var qi={addBox(t,e){t.boxes||(t.boxes=[]),e.fullSize=e.fullSize||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw(t){e.draw(t)}}]},t.boxes.push(e)},removeBox(t,e){const i=t.boxes?t.boxes.indexOf(e):-1;-1!==i&&t.boxes.splice(i,1)},configure(t,e,i){e.fullSize=i.fullSize,e.position=i.position,e.weight=i.weight},update(t,e,i,s){if(!t)return;const n=ui(t.options.layout.padding),o=Math.max(e-n.width,0),a=Math.max(i-n.height,0),r=function(t){const e=function(t){const e=[];let i,s,n,o,a,r;for(i=0,s=(t||[]).length;i<s;++i)n=t[i],({position:o,options:{stack:a,stackWeight:r=1}}=n),e.push({index:i,box:n,pos:o,horizontal:n.isHorizontal(),weight:n.weight,stack:a&&o+a,stackWeight:r});return e}(t),i=Vi(e.filter((t=>t.box.fullSize)),!0),s=Vi(Fi(e,"left"),!0),n=Vi(Fi(e,"right")),o=Vi(Fi(e,"top"),!0),a=Vi(Fi(e,"bottom")),r=Bi(e,"x"),l=Bi(e,"y");return{fullSize:i,leftAndTop:s.concat(o),rightAndBottom:n.concat(l).concat(a).concat(r),chartArea:Fi(e,"chartArea"),vertical:s.concat(n).concat(l),horizontal:o.concat(a).concat(r)}}(t.boxes),l=r.vertical,h=r.horizontal;et(t.boxes,(t=>{"function"==typeof t.beforeLayout&&t.beforeLayout()}));const c=l.reduce(((t,e)=>e.box.options&&!1===e.box.options.display?t:t+1),0)||1,d=Object.freeze({outerWidth:e,outerHeight:i,padding:n,availableWidth:o,availableHeight:a,vBoxMaxWidth:o/2/c,hBoxMaxHeight:a/2}),u=Object.assign({},n);ji(u,ui(s));const f=Object.assign({maxPadding:u,w:o,h:a,x:n.left,y:n.top},n),g=Wi(l.concat(h),d);Yi(r.fullSize,f,d,g),Yi(l,f,d,g),Yi(h,f,d,g)&&Yi(l,f,d,g),function(t){const e=t.maxPadding;function i(i){const s=Math.max(e[i]-t[i],0);return t[i]+=s,s}t.y+=i("top"),t.x+=i("left"),i("right"),i("bottom")}(f),Xi(r.leftAndTop,f,d,g),f.x+=f.w,f.y+=f.h,Xi(r.rightAndBottom,f,d,g),t.chartArea={left:f.left,top:f.top,right:f.left+f.w,bottom:f.top+f.h,height:f.h,width:f.w},et(r.chartArea,(e=>{const i=e.box;Object.assign(i,t.chartArea),i.update(f.w,f.h,{left:0,top:0,right:0,bottom:0})}))}};class Ki{acquireContext(t,e){}releaseContext(t){return!1}addEventListener(t,e,i){}removeEventListener(t,e,i){}getDevicePixelRatio(){return 1}getMaximumSize(t,e,i,s){return e=Math.max(0,e||t.width),i=i||t.height,{width:e,height:Math.max(0,s?Math.floor(e/s):i)}}isAttached(t){return!0}updateConfig(t){}}class Gi extends Ki{acquireContext(t){return t&&t.getContext&&t.getContext("2d")||null}updateConfig(t){t.options.animation=!1}}const Zi={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"},Ji=t=>null===t||""===t;const Qi=!!fe&&{passive:!0};function ts(t,e,i){t.canvas.removeEventListener(e,i,Qi)}function es(t,e){for(const i of t)if(i===e||i.contains(e))return!0}function is(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||es(i.addedNodes,s),e=e&&!es(i.removedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}function ss(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||es(i.removedNodes,s),e=e&&!es(i.addedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}const ns=new Map;let os=0;function as(){const t=window.devicePixelRatio;t!==os&&(os=t,ns.forEach(((e,i)=>{i.currentDevicePixelRatio!==t&&e()})))}function rs(t,i,s){const n=t.canvas,o=n&&se(n);if(!o)return;const a=e(((t,e)=>{const i=o.clientWidth;s(t,e),i<o.clientWidth&&s()}),window),r=new ResizeObserver((t=>{const e=t[0],i=e.contentRect.width,s=e.contentRect.height;0===i&&0===s||a(i,s)}));return r.observe(o),function(t,e){ns.size||window.addEventListener("resize",as),ns.set(t,e)}(t,a),r}function ls(t,e,i){i&&i.disconnect(),"resize"===e&&function(t){ns.delete(t),ns.size||window.removeEventListener("resize",as)}(t)}function hs(t,i,s){const n=t.canvas,o=e((e=>{null!==t.ctx&&s(function(t,e){const i=Zi[t.type]||t.type,{x:s,y:n}=he(t,e);return{type:i,chart:e,native:t,x:void 0!==s?s:null,y:void 0!==n?n:null}}(e,t))}),t,(t=>{const e=t[0];return[e,e.offsetX,e.offsetY]}));return function(t,e,i){t.addEventListener(e,i,Qi)}(n,i,o),o}class cs extends Ki{acquireContext(t,e){const i=t&&t.getContext&&t.getContext("2d");return i&&i.canvas===t?(function(t,e){const i=t.style,s=t.getAttribute("height"),n=t.getAttribute("width");if(t.$chartjs={initial:{height:s,width:n,style:{display:i.display,height:i.height,width:i.width}}},i.display=i.display||"block",i.boxSizing=i.boxSizing||"border-box",Ji(n)){const e=ge(t,"width");void 0!==e&&(t.width=e)}if(Ji(s))if(""===t.style.height)t.height=t.width/(e||2);else{const e=ge(t,"height");void 0!==e&&(t.height=e)}}(t,e),i):null}releaseContext(t){const e=t.canvas;if(!e.$chartjs)return!1;const i=e.$chartjs.initial;["height","width"].forEach((t=>{const s=i[t];U(s)?e.removeAttribute(t):e.setAttribute(t,s)}));const s=i.style||{};return Object.keys(s).forEach((t=>{e.style[t]=s[t]})),e.width=e.width,delete e.$chartjs,!0}addEventListener(t,e,i){this.removeEventListener(t,e);const s=t.$proxies||(t.$proxies={}),n={attach:is,detach:ss,resize:rs}[e]||hs;s[e]=n(t,e,i)}removeEventListener(t,e){const i=t.$proxies||(t.$proxies={}),s=i[e];if(!s)return;({attach:ls,detach:ls,resize:ls}[e]||ts)(t,e,s),i[e]=void 0}getDevicePixelRatio(){return window.devicePixelRatio}getMaximumSize(t,e,i,s){return de(t,e,i,s)}isAttached(t){const e=se(t);return!(!e||!e.isConnected)}}function ds(t){return!ie()||"undefined"!=typeof OffscreenCanvas&&t instanceof OffscreenCanvas?Gi:cs}var us=Object.freeze({__proto__:null,_detectPlatform:ds,BasePlatform:Ki,BasicPlatform:Gi,DomPlatform:cs});const fs="transparent",gs={boolean:(t,e,i)=>i>.5?e:t,color(t,e,i){const s=j(t||fs),n=s.valid&&j(e||fs);return n&&n.valid?n.mix(s,i).hexString():e},number:(t,e,i)=>t+(e-t)*i};class ps{constructor(t,e,i,s){const n=e[i];s=gi([t.to,s,n,t.from]);const o=gi([t.from,n,s]);this._active=!0,this._fn=t.fn||gs[t.type||typeof o],this._easing=ti[t.easing]||ti.linear,this._start=Math.floor(Date.now()+(t.delay||0)),this._duration=this._total=Math.floor(t.duration),this._loop=!!t.loop,this._target=e,this._prop=i,this._from=o,this._to=s,this._promises=void 0}active(){return this._active}update(t,e,i){if(this._active){this._notify(!1);const s=this._target[this._prop],n=i-this._start,o=this._duration-n;this._start=i,this._duration=Math.floor(Math.max(o,t.duration)),this._total+=n,this._loop=!!t.loop,this._to=gi([t.to,e,s,t.from]),this._from=gi([t.from,s,e])}}cancel(){this._active&&(this.tick(Date.now()),this._active=!1,this._notify(!1))}tick(t){const e=t-this._start,i=this._duration,s=this._prop,n=this._from,o=this._loop,a=this._to;let r;if(this._active=n!==a&&(o||e<i),!this._active)return this._target[s]=a,void this._notify(!0);e<0?this._target[s]=n:(r=e/i%2,r=o&&r>1?2-r:r,r=this._easing(Math.min(1,Math.max(0,r))),this._target[s]=this._fn(n,a,r))}wait(){const t=this._promises||(this._promises=[]);return new Promise(((e,i)=>{t.push({res:e,rej:i})}))}_notify(t){const e=t?"res":"rej",i=this._promises||[];for(let t=0;t<i.length;t++)i[t][e]()}}yt.set("animation",{delay:void 0,duration:1e3,easing:"easeOutQuart",fn:void 0,from:void 0,loop:void 0,to:void 0,type:void 0});const ms=Object.keys(yt.animation);yt.describe("animation",{_fallback:!1,_indexable:!1,_scriptable:t=>"onProgress"!==t&&"onComplete"!==t&&"fn"!==t}),yt.set("animations",{colors:{type:"color",properties:["color","borderColor","backgroundColor"]},numbers:{type:"number",properties:["x","y","borderWidth","radius","tension"]}}),yt.describe("animations",{_fallback:"animation"}),yt.set("transitions",{active:{animation:{duration:400}},resize:{animation:{duration:0}},show:{animations:{colors:{from:"transparent"},visible:{type:"boolean",duration:0}}},hide:{animations:{colors:{to:"transparent"},visible:{type:"boolean",easing:"linear",fn:t=>0|t}}}});class bs{constructor(t,e){this._chart=t,this._properties=new Map,this.configure(e)}configure(t){if(!q(t))return;const e=this._properties;Object.getOwnPropertyNames(t).forEach((i=>{const s=t[i];if(!q(s))return;const n={};for(const t of ms)n[t]=s[t];(X(s.properties)&&s.properties||[i]).forEach((t=>{t!==i&&e.has(t)||e.set(t,n)}))}))}_animateOptions(t,e){const i=e.options,s=function(t,e){if(!e)return;let i=t.options;if(!i)return void(t.options=e);i.$shared&&(t.options=i=Object.assign({},i,{$shared:!1,$animations:{}}));return i}(t,i);if(!s)return[];const n=this._createAnimations(s,i);return i.$shared&&function(t,e){const i=[],s=Object.keys(e);for(let e=0;e<s.length;e++){const n=t[s[e]];n&&n.active()&&i.push(n.wait())}return Promise.all(i)}(t.options.$animations,i).then((()=>{t.options=i}),(()=>{})),n}_createAnimations(t,e){const i=this._properties,s=[],n=t.$animations||(t.$animations={}),o=Object.keys(e),a=Date.now();let r;for(r=o.length-1;r>=0;--r){const l=o[r];if("$"===l.charAt(0))continue;if("options"===l){s.push(...this._animateOptions(t,e));continue}const h=e[l];let c=n[l];const d=i.get(l);if(c){if(d&&c.active()){c.update(d,h,a);continue}c.cancel()}d&&d.duration?(n[l]=c=new ps(d,t,l,h),s.push(c)):t[l]=h}return s}update(t,e){if(0===this._properties.size)return void Object.assign(t,e);const i=this._createAnimations(t,e);return i.length?(a.add(this._chart,i),!0):void 0}}function xs(t,e){const i=t&&t.options||{},s=i.reverse,n=void 0===i.min?e:0,o=void 0===i.max?e:0;return{start:s?o:n,end:s?n:o}}function _s(t,e){const i=[],s=t._getSortedDatasetMetas(e);let n,o;for(n=0,o=s.length;n<o;++n)i.push(s[n].index);return i}function ys(t,e,i,s={}){const n=t.keys,o="single"===s.mode;let a,r,l,h;if(null!==e){for(a=0,r=n.length;a<r;++a){if(l=+n[a],l===i){if(s.all)continue;break}h=t.values[l],K(h)&&(o||0===e||Bt(e)===Bt(h))&&(e+=h)}return e}}function vs(t,e){const i=t&&t.options.stacked;return i||void 0===i&&void 0!==e.stack}function ws(t,e,i){const s=t[e]||(t[e]={});return s[i]||(s[i]={})}function Ms(t,e,i,s){for(const n of e.getMatchingVisibleMetas(s).reverse()){const e=t[n.index];if(i&&e>0||!i&&e<0)return n.index}return null}function ks(t,e){const{chart:i,_cachedMeta:s}=t,n=i._stacks||(i._stacks={}),{iScale:o,vScale:a,index:r}=s,l=o.axis,h=a.axis,c=function(t,e,i){return`${t.id}.${e.id}.${i.stack||i.type}`}(o,a,s),d=e.length;let u;for(let t=0;t<d;++t){const i=e[t],{[l]:o,[h]:d}=i;u=(i._stacks||(i._stacks={}))[h]=ws(n,c,o),u[r]=d,u._top=Ms(u,a,!0,s.type),u._bottom=Ms(u,a,!1,s.type)}}function Ss(t,e){const i=t.scales;return Object.keys(i).filter((t=>i[t].axis===e)).shift()}function Ps(t,e){const i=t.controller.index,s=t.vScale&&t.vScale.axis;if(s){e=e||t._parsed;for(const t of e){const e=t._stacks;if(!e||void 0===e[s]||void 0===e[s][i])return;delete e[s][i]}}}const Ds=t=>"reset"===t||"none"===t,Cs=(t,e)=>e?t:Object.assign({},t);class Os{constructor(t,e){this.chart=t,this._ctx=t.ctx,this.index=e,this._cachedDataOpts={},this._cachedMeta=this.getMeta(),this._type=this._cachedMeta.type,this.options=void 0,this._parsing=!1,this._data=void 0,this._objectData=void 0,this._sharedOptions=void 0,this._drawStart=void 0,this._drawCount=void 0,this.enableOptionSharing=!1,this.supportsDecimation=!1,this.$context=void 0,this._syncList=[],this.initialize()}initialize(){const t=this._cachedMeta;this.configure(),this.linkScales(),t._stacked=vs(t.vScale,t),this.addElements()}updateIndex(t){this.index!==t&&Ps(this._cachedMeta),this.index=t}linkScales(){const t=this.chart,e=this._cachedMeta,i=this.getDataset(),s=(t,e,i,s)=>"x"===t?e:"r"===t?s:i,n=e.xAxisID=Z(i.xAxisID,Ss(t,"x")),o=e.yAxisID=Z(i.yAxisID,Ss(t,"y")),a=e.rAxisID=Z(i.rAxisID,Ss(t,"r")),r=e.indexAxis,l=e.iAxisID=s(r,n,o,a),h=e.vAxisID=s(r,o,n,a);e.xScale=this.getScaleForId(n),e.yScale=this.getScaleForId(o),e.rScale=this.getScaleForId(a),e.iScale=this.getScaleForId(l),e.vScale=this.getScaleForId(h)}getDataset(){return this.chart.data.datasets[this.index]}getMeta(){return this.chart.getDatasetMeta(this.index)}getScaleForId(t){return this.chart.scales[t]}_getOtherScale(t){const e=this._cachedMeta;return t===e.iScale?e.vScale:e.iScale}reset(){this._update("reset")}_destroy(){const t=this._cachedMeta;this._data&&Dt(this._data,this),t._stacked&&Ps(t)}_dataCheck(){const t=this.getDataset(),e=t.data||(t.data=[]),i=this._data;if(q(e))this._data=function(t){const e=Object.keys(t),i=new Array(e.length);let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s],i[s]={x:o,y:t[o]};return i}(e);else if(i!==e){if(i){Dt(i,this);const t=this._cachedMeta;Ps(t),t._parsed=[]}e&&Object.isExtensible(e)&&Pt(e,this),this._syncList=[],this._data=e}}addElements(){const t=this._cachedMeta;this._dataCheck(),this.datasetElementType&&(t.dataset=new this.datasetElementType)}buildOrUpdateElements(t){const e=this._cachedMeta,i=this.getDataset();let s=!1;this._dataCheck();const n=e._stacked;e._stacked=vs(e.vScale,e),e.stack!==i.stack&&(s=!0,Ps(e),e.stack=i.stack),this._resyncElements(t),(s||n!==e._stacked)&&ks(this,e._parsed)}configure(){const t=this.chart.config,e=t.datasetScopeKeys(this._type),i=t.getOptionScopes(this.getDataset(),e,!0);this.options=t.createResolver(i,this.getContext()),this._parsing=this.options.parsing,this._cachedDataOpts={}}parse(t,e){const{_cachedMeta:i,_data:s}=this,{iScale:n,_stacked:o}=i,a=n.axis;let r,l,h,c=0===t&&e===s.length||i._sorted,d=t>0&&i._parsed[t-1];if(!1===this._parsing)i._parsed=s,i._sorted=!0,h=s;else{h=X(s[t])?this.parseArrayData(i,s,t,e):q(s[t])?this.parseObjectData(i,s,t,e):this.parsePrimitiveData(i,s,t,e);const n=()=>null===l[a]||d&&l[a]<d[a];for(r=0;r<e;++r)i._parsed[r+t]=l=h[r],c&&(n()&&(c=!1),d=l);i._sorted=c}o&&ks(this,h)}parsePrimitiveData(t,e,i,s){const{iScale:n,vScale:o}=t,a=n.axis,r=o.axis,l=n.getLabels(),h=n===o,c=new Array(s);let d,u,f;for(d=0,u=s;d<u;++d)f=d+i,c[d]={[a]:h||n.parse(l[f],f),[r]:o.parse(e[f],f)};return c}parseArrayData(t,e,i,s){const{xScale:n,yScale:o}=t,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={x:n.parse(c[0],h),y:o.parse(c[1],h)};return a}parseObjectData(t,e,i,s){const{xScale:n,yScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l=new Array(s);let h,c,d,u;for(h=0,c=s;h<c;++h)d=h+i,u=e[d],l[h]={x:n.parse(ct(u,a),d),y:o.parse(ct(u,r),d)};return l}getParsed(t){return this._cachedMeta._parsed[t]}getDataElement(t){return this._cachedMeta.data[t]}applyStack(t,e,i){const s=this.chart,n=this._cachedMeta,o=e[t.axis];return ys({keys:_s(s,!0),values:e._stacks[t.axis]},o,n.index,{mode:i})}updateRangeFromParsed(t,e,i,s){const n=i[e.axis];let o=null===n?NaN:n;const a=s&&i._stacks[e.axis];s&&a&&(s.values=a,o=ys(s,n,this._cachedMeta.index)),t.min=Math.min(t.min,o),t.max=Math.max(t.max,o)}getMinMax(t,e){const i=this._cachedMeta,s=i._parsed,n=i._sorted&&t===i.iScale,o=s.length,a=this._getOtherScale(t),r=((t,e,i)=>t&&!e.hidden&&e._stacked&&{keys:_s(i,!0),values:null})(e,i,this.chart),l={min:Number.POSITIVE_INFINITY,max:Number.NEGATIVE_INFINITY},{min:h,max:c}=function(t){const{min:e,max:i,minDefined:s,maxDefined:n}=t.getUserBounds();return{min:s?e:Number.NEGATIVE_INFINITY,max:n?i:Number.POSITIVE_INFINITY}}(a);let d,u;function f(){u=s[d];const e=u[a.axis];return!K(u[t.axis])||h>e||c<e}for(d=0;d<o&&(f()||(this.updateRangeFromParsed(l,t,u,r),!n));++d);if(n)for(d=o-1;d>=0;--d)if(!f()){this.updateRangeFromParsed(l,t,u,r);break}return l}getAllParsedValues(t){const e=this._cachedMeta._parsed,i=[];let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s][t.axis],K(o)&&i.push(o);return i}getMaxOverflow(){return!1}getLabelAndValue(t){const e=this._cachedMeta,i=e.iScale,s=e.vScale,n=this.getParsed(t);return{label:i?""+i.getLabelForValue(n[i.axis]):"",value:s?""+s.getLabelForValue(n[s.axis]):""}}_update(t){const e=this._cachedMeta;this.update(t||"default"),e._clip=function(t){let e,i,s,n;return q(t)?(e=t.top,i=t.right,s=t.bottom,n=t.left):e=i=s=n=t,{top:e,right:i,bottom:s,left:n,disabled:!1===t}}(Z(this.options.clip,function(t,e,i){if(!1===i)return!1;const s=xs(t,i),n=xs(e,i);return{top:n.end,right:s.end,bottom:n.start,left:s.start}}(e.xScale,e.yScale,this.getMaxOverflow())))}update(t){}draw(){const t=this._ctx,e=this.chart,i=this._cachedMeta,s=i.data||[],n=e.chartArea,o=[],a=this._drawStart||0,r=this._drawCount||s.length-a,l=this.options.drawActiveElementsOnTop;let h;for(i.dataset&&i.dataset.draw(t,n,a,r),h=a;h<a+r;++h){const e=s[h];e.hidden||(e.active&&l?o.push(e):e.draw(t,n))}for(h=0;h<o.length;++h)o[h].draw(t,n)}getStyle(t,e){const i=e?"active":"default";return void 0===t&&this._cachedMeta.dataset?this.resolveDatasetElementOptions(i):this.resolveDataElementOptions(t||0,i)}getContext(t,e,i){const s=this.getDataset();let n;if(t>=0&&t<this._cachedMeta.data.length){const e=this._cachedMeta.data[t];n=e.$context||(e.$context=function(t,e,i){return mi(t,{active:!1,dataIndex:e,parsed:void 0,raw:void 0,element:i,index:e,mode:"default",type:"data"})}(this.getContext(),t,e)),n.parsed=this.getParsed(t),n.raw=s.data[t],n.index=n.dataIndex=t}else n=this.$context||(this.$context=function(t,e){return mi(t,{active:!1,dataset:void 0,datasetIndex:e,index:e,mode:"default",type:"dataset"})}(this.chart.getContext(),this.index)),n.dataset=s,n.index=n.datasetIndex=this.index;return n.active=!!e,n.mode=i,n}resolveDatasetElementOptions(t){return this._resolveElementOptions(this.datasetElementType.id,t)}resolveDataElementOptions(t,e){return this._resolveElementOptions(this.dataElementType.id,e,t)}_resolveElementOptions(t,e="default",i){const s="active"===e,n=this._cachedDataOpts,o=t+"-"+e,a=n[o],r=this.enableOptionSharing&&ut(i);if(a)return Cs(a,r);const l=this.chart.config,h=l.datasetElementScopeKeys(this._type,t),c=s?[`${t}Hover`,"hover",t,""]:[t,""],d=l.getOptionScopes(this.getDataset(),h),u=Object.keys(yt.elements[t]),f=l.resolveNamedOptions(d,u,(()=>this.getContext(i,s)),c);return f.$shared&&(f.$shared=r,n[o]=Object.freeze(Cs(f,r))),f}_resolveAnimations(t,e,i){const s=this.chart,n=this._cachedDataOpts,o=`animation-${e}`,a=n[o];if(a)return a;let r;if(!1!==s.options.animation){const s=this.chart.config,n=s.datasetAnimationScopeKeys(this._type,e),o=s.getOptionScopes(this.getDataset(),n);r=s.createResolver(o,this.getContext(t,i,e))}const l=new bs(s,r&&r.animations);return r&&r._cacheable&&(n[o]=Object.freeze(l)),l}getSharedOptions(t){if(t.$shared)return this._sharedOptions||(this._sharedOptions=Object.assign({},t))}includeOptions(t,e){return!e||Ds(t)||this.chart._animationsDisabled}_getSharedOptions(t,e){const i=this.resolveDataElementOptions(t,e),s=this._sharedOptions,n=this.getSharedOptions(i),o=this.includeOptions(e,n)||n!==s;return this.updateSharedOptions(n,e,i),{sharedOptions:n,includeOptions:o}}updateElement(t,e,i,s){Ds(s)?Object.assign(t,i):this._resolveAnimations(e,s).update(t,i)}updateSharedOptions(t,e,i){t&&!Ds(e)&&this._resolveAnimations(void 0,e).update(t,i)}_setStyle(t,e,i,s){t.active=s;const n=this.getStyle(e,s);this._resolveAnimations(e,i,s).update(t,{options:!s&&this.getSharedOptions(n)||n})}removeHoverStyle(t,e,i){this._setStyle(t,i,"active",!1)}setHoverStyle(t,e,i){this._setStyle(t,i,"active",!0)}_removeDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!1)}_setDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!0)}_resyncElements(t){const e=this._data,i=this._cachedMeta.data;for(const[t,e,i]of this._syncList)this[t](e,i);this._syncList=[];const s=i.length,n=e.length,o=Math.min(n,s);o&&this.parse(0,o),n>s?this._insertElements(s,n-s,t):n<s&&this._removeElements(n,s-n)}_insertElements(t,e,i=!0){const s=this._cachedMeta,n=s.data,o=t+e;let a;const r=t=>{for(t.length+=e,a=t.length-1;a>=o;a--)t[a]=t[a-e]};for(r(n),a=t;a<o;++a)n[a]=new this.dataElementType;this._parsing&&r(s._parsed),this.parse(t,e),i&&this.updateElements(n,t,e,"reset")}updateElements(t,e,i,s){}_removeElements(t,e){const i=this._cachedMeta;if(this._parsing){const s=i._parsed.splice(t,e);i._stacked&&Ps(i,s)}i.data.splice(t,e)}_sync(t){if(this._parsing)this._syncList.push(t);else{const[e,i,s]=t;this[e](i,s)}this.chart._dataChanges.push([this.index,...t])}_onDataPush(){const t=arguments.length;this._sync(["_insertElements",this.getDataset().data.length-t,t])}_onDataPop(){this._sync(["_removeElements",this._cachedMeta.data.length-1,1])}_onDataShift(){this._sync(["_removeElements",0,1])}_onDataSplice(t,e){e&&this._sync(["_removeElements",t,e]);const i=arguments.length-2;i&&this._sync(["_insertElements",t,i])}_onDataUnshift(){this._sync(["_insertElements",0,arguments.length])}}Os.defaults={},Os.prototype.datasetElementType=null,Os.prototype.dataElementType=null;class As{constructor(){this.x=void 0,this.y=void 0,this.active=!1,this.options=void 0,this.$animations=void 0}tooltipPosition(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}hasValue(){return Nt(this.x)&&Nt(this.y)}getProps(t,e){const i=this.$animations;if(!e||!i)return this;const s={};return t.forEach((t=>{s[t]=i[t]&&i[t].active()?i[t]._to:this[t]})),s}}As.defaults={},As.defaultRoutes=void 0;const Ts={values:t=>X(t)?t:""+t,numeric(t,e,i){if(0===t)return"0";const s=this.chart.options.locale;let n,o=t;if(i.length>1){const e=Math.max(Math.abs(i[0].value),Math.abs(i[i.length-1].value));(e<1e-4||e>1e15)&&(n="scientific"),o=function(t,e){let i=e.length>3?e[2].value-e[1].value:e[1].value-e[0].value;Math.abs(i)>=1&&t!==Math.floor(t)&&(i=t-Math.floor(t));return i}(t,i)}const a=Ft(Math.abs(o)),r=Math.max(Math.min(-1*Math.floor(a),20),0),l={notation:n,minimumFractionDigits:r,maximumFractionDigits:r};return Object.assign(l,this.options.ticks.format),oi(t,s,l)},logarithmic(t,e,i){if(0===t)return"0";const s=t/Math.pow(10,Math.floor(Ft(t)));return 1===s||2===s||5===s?Ts.numeric.call(this,t,e,i):""}};var Ls={formatters:Ts};function Rs(t,e){const i=t.options.ticks,s=i.maxTicksLimit||function(t){const e=t.options.offset,i=t._tickSize(),s=t._length/i+(e?0:1),n=t._maxLength/i;return Math.floor(Math.min(s,n))}(t),n=i.major.enabled?function(t){const e=[];let i,s;for(i=0,s=t.length;i<s;i++)t[i].major&&e.push(i);return e}(e):[],o=n.length,a=n[0],r=n[o-1],l=[];if(o>s)return function(t,e,i,s){let n,o=0,a=i[0];for(s=Math.ceil(s),n=0;n<t.length;n++)n===a&&(e.push(t[n]),o++,a=i[o*s])}(e,l,n,o/s),l;const h=function(t,e,i){const s=function(t){const e=t.length;let i,s;if(e<2)return!1;for(s=t[0],i=1;i<e;++i)if(t[i]-t[i-1]!==s)return!1;return s}(t),n=e.length/i;if(!s)return Math.max(n,1);const o=Wt(s);for(let t=0,e=o.length-1;t<e;t++){const e=o[t];if(e>n)return e}return Math.max(n,1)}(n,e,s);if(o>0){let t,i;const s=o>1?Math.round((r-a)/(o-1)):null;for(Es(e,l,h,U(s)?0:a-s,a),t=0,i=o-1;t<i;t++)Es(e,l,h,n[t],n[t+1]);return Es(e,l,h,r,U(s)?e.length:r+s),l}return Es(e,l,h),l}function Es(t,e,i,s,n){const o=Z(s,0),a=Math.min(Z(n,t.length),t.length);let r,l,h,c=0;for(i=Math.ceil(i),n&&(r=n-s,i=r/Math.floor(r/i)),h=o;h<0;)c++,h=Math.round(o+c*i);for(l=Math.max(o,0);l<a;l++)l===h&&(e.push(t[l]),c++,h=Math.round(o+c*i))}yt.set("scale",{display:!0,offset:!1,reverse:!1,beginAtZero:!1,bounds:"ticks",grace:0,grid:{display:!0,lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickLength:8,tickWidth:(t,e)=>e.lineWidth,tickColor:(t,e)=>e.color,offset:!1,borderDash:[],borderDashOffset:0,borderWidth:1},title:{display:!1,text:"",padding:{top:4,bottom:4}},ticks:{minRotation:0,maxRotation:50,mirror:!1,textStrokeWidth:0,textStrokeColor:"",padding:3,display:!0,autoSkip:!0,autoSkipPadding:3,labelOffset:0,callback:Ls.formatters.values,minor:{},major:{},align:"center",crossAlign:"near",showLabelBackdrop:!1,backdropColor:"rgba(255, 255, 255, 0.75)",backdropPadding:2}}),yt.route("scale.ticks","color","","color"),yt.route("scale.grid","color","","borderColor"),yt.route("scale.grid","borderColor","","borderColor"),yt.route("scale.title","color","","color"),yt.describe("scale",{_fallback:!1,_scriptable:t=>!t.startsWith("before")&&!t.startsWith("after")&&"callback"!==t&&"parser"!==t,_indexable:t=>"borderDash"!==t&&"tickBorderDash"!==t}),yt.describe("scales",{_fallback:"scale"}),yt.describe("scale.ticks",{_scriptable:t=>"backdropPadding"!==t&&"callback"!==t,_indexable:t=>"backdropPadding"!==t});const Is=(t,e,i)=>"top"===e||"left"===e?t[e]+i:t[e]-i;function zs(t,e){const i=[],s=t.length/e,n=t.length;let o=0;for(;o<n;o+=s)i.push(t[Math.floor(o)]);return i}function Fs(t,e,i){const s=t.ticks.length,n=Math.min(e,s-1),o=t._startPixel,a=t._endPixel,r=1e-6;let l,h=t.getPixelForTick(n);if(!(i&&(l=1===s?Math.max(h-o,a-h):0===e?(t.getPixelForTick(1)-h)/2:(h-t.getPixelForTick(n-1))/2,h+=n<e?l:-l,h<o-r||h>a+r)))return h}function Bs(t){return t.drawTicks?t.tickLength:0}function Vs(t,e){if(!t.display)return 0;const i=fi(t.font,e),s=ui(t.padding);return(X(t.text)?t.text.length:1)*i.lineHeight+s.height}function Ws(t,e,i){let n=s(t);return(i&&"right"!==e||!i&&"right"===e)&&(n=(t=>"left"===t?"right":"right"===t?"left":t)(n)),n}class Ns extends As{constructor(t){super(),this.id=t.id,this.type=t.type,this.options=void 0,this.ctx=t.ctx,this.chart=t.chart,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this._margins={left:0,right:0,top:0,bottom:0},this.maxWidth=void 0,this.maxHeight=void 0,this.paddingTop=void 0,this.paddingBottom=void 0,this.paddingLeft=void 0,this.paddingRight=void 0,this.axis=void 0,this.labelRotation=void 0,this.min=void 0,this.max=void 0,this._range=void 0,this.ticks=[],this._gridLineItems=null,this._labelItems=null,this._labelSizes=null,this._length=0,this._maxLength=0,this._longestTextCache={},this._startPixel=void 0,this._endPixel=void 0,this._reversePixels=!1,this._userMax=void 0,this._userMin=void 0,this._suggestedMax=void 0,this._suggestedMin=void 0,this._ticksLength=0,this._borderValue=0,this._cache={},this._dataLimitsCached=!1,this.$context=void 0}init(t){this.options=t.setContext(this.getContext()),this.axis=t.axis,this._userMin=this.parse(t.min),this._userMax=this.parse(t.max),this._suggestedMin=this.parse(t.suggestedMin),this._suggestedMax=this.parse(t.suggestedMax)}parse(t,e){return t}getUserBounds(){let{_userMin:t,_userMax:e,_suggestedMin:i,_suggestedMax:s}=this;return t=G(t,Number.POSITIVE_INFINITY),e=G(e,Number.NEGATIVE_INFINITY),i=G(i,Number.POSITIVE_INFINITY),s=G(s,Number.NEGATIVE_INFINITY),{min:G(t,i),max:G(e,s),minDefined:K(t),maxDefined:K(e)}}getMinMax(t){let e,{min:i,max:s,minDefined:n,maxDefined:o}=this.getUserBounds();if(n&&o)return{min:i,max:s};const a=this.getMatchingVisibleMetas();for(let r=0,l=a.length;r<l;++r)e=a[r].controller.getMinMax(this,t),n||(i=Math.min(i,e.min)),o||(s=Math.max(s,e.max));return i=o&&i>s?s:i,s=n&&i>s?i:s,{min:G(i,G(s,i)),max:G(s,G(i,s))}}getPadding(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}}getTicks(){return this.ticks}getLabels(){const t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]}beforeLayout(){this._cache={},this._dataLimitsCached=!1}beforeUpdate(){tt(this.options.beforeUpdate,[this])}update(t,e,i){const{beginAtZero:s,grace:n,ticks:o}=this.options,a=o.sampleSize;this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this._margins=i=Object.assign({left:0,right:0,top:0,bottom:0},i),this.ticks=null,this._labelSizes=null,this._gridLineItems=null,this._labelItems=null,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this._maxLength=this.isHorizontal()?this.width+i.left+i.right:this.height+i.top+i.bottom,this._dataLimitsCached||(this.beforeDataLimits(),this.determineDataLimits(),this.afterDataLimits(),this._range=pi(this,n,s),this._dataLimitsCached=!0),this.beforeBuildTicks(),this.ticks=this.buildTicks()||[],this.afterBuildTicks();const r=a<this.ticks.length;this._convertTicksToLabels(r?zs(this.ticks,a):this.ticks),this.configure(),this.beforeCalculateLabelRotation(),this.calculateLabelRotation(),this.afterCalculateLabelRotation(),o.display&&(o.autoSkip||"auto"===o.source)&&(this.ticks=Rs(this,this.ticks),this._labelSizes=null,this.afterAutoSkip()),r&&this._convertTicksToLabels(this.ticks),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate()}configure(){let t,e,i=this.options.reverse;this.isHorizontal()?(t=this.left,e=this.right):(t=this.top,e=this.bottom,i=!i),this._startPixel=t,this._endPixel=e,this._reversePixels=i,this._length=e-t,this._alignToPixels=this.options.alignToPixels}afterUpdate(){tt(this.options.afterUpdate,[this])}beforeSetDimensions(){tt(this.options.beforeSetDimensions,[this])}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0}afterSetDimensions(){tt(this.options.afterSetDimensions,[this])}_callHooks(t){this.chart.notifyPlugins(t,this.getContext()),tt(this.options[t],[this])}beforeDataLimits(){this._callHooks("beforeDataLimits")}determineDataLimits(){}afterDataLimits(){this._callHooks("afterDataLimits")}beforeBuildTicks(){this._callHooks("beforeBuildTicks")}buildTicks(){return[]}afterBuildTicks(){this._callHooks("afterBuildTicks")}beforeTickToLabelConversion(){tt(this.options.beforeTickToLabelConversion,[this])}generateTickLabels(t){const e=this.options.ticks;let i,s,n;for(i=0,s=t.length;i<s;i++)n=t[i],n.label=tt(e.callback,[n.value,i,t],this)}afterTickToLabelConversion(){tt(this.options.afterTickToLabelConversion,[this])}beforeCalculateLabelRotation(){tt(this.options.beforeCalculateLabelRotation,[this])}calculateLabelRotation(){const t=this.options,e=t.ticks,i=this.ticks.length,s=e.minRotation||0,n=e.maxRotation;let o,a,r,l=s;if(!this._isVisible()||!e.display||s>=n||i<=1||!this.isHorizontal())return void(this.labelRotation=s);const h=this._getLabelSizes(),c=h.widest.width,d=h.highest.height,u=Qt(this.chart.width-c,0,this.maxWidth);o=t.offset?this.maxWidth/i:u/(i-1),c+6>o&&(o=u/(i-(t.offset?.5:1)),a=this.maxHeight-Bs(t.grid)-e.padding-Vs(t.title,this.chart.options.font),r=Math.sqrt(c*c+d*d),l=Ut(Math.min(Math.asin(Qt((h.highest.height+6)/o,-1,1)),Math.asin(Qt(a/r,-1,1))-Math.asin(Qt(d/r,-1,1)))),l=Math.max(s,Math.min(n,l))),this.labelRotation=l}afterCalculateLabelRotation(){tt(this.options.afterCalculateLabelRotation,[this])}afterAutoSkip(){}beforeFit(){tt(this.options.beforeFit,[this])}fit(){const t={width:0,height:0},{chart:e,options:{ticks:i,title:s,grid:n}}=this,o=this._isVisible(),a=this.isHorizontal();if(o){const o=Vs(s,e.options.font);if(a?(t.width=this.maxWidth,t.height=Bs(n)+o):(t.height=this.maxHeight,t.width=Bs(n)+o),i.display&&this.ticks.length){const{first:e,last:s,widest:n,highest:o}=this._getLabelSizes(),r=2*i.padding,l=Yt(this.labelRotation),h=Math.cos(l),c=Math.sin(l);if(a){const e=i.mirror?0:c*n.width+h*o.height;t.height=Math.min(this.maxHeight,t.height+e+r)}else{const e=i.mirror?0:h*n.width+c*o.height;t.width=Math.min(this.maxWidth,t.width+e+r)}this._calculatePadding(e,s,c,h)}}this._handleMargins(),a?(this.width=this._length=e.width-this._margins.left-this._margins.right,this.height=t.height):(this.width=t.width,this.height=this._length=e.height-this._margins.top-this._margins.bottom)}_calculatePadding(t,e,i,s){const{ticks:{align:n,padding:o},position:a}=this.options,r=0!==this.labelRotation,l="top"!==a&&"x"===this.axis;if(this.isHorizontal()){const a=this.getPixelForTick(0)-this.left,h=this.right-this.getPixelForTick(this.ticks.length-1);let c=0,d=0;r?l?(c=s*t.width,d=i*e.height):(c=i*t.height,d=s*e.width):"start"===n?d=e.width:"end"===n?c=t.width:"inner"!==n&&(c=t.width/2,d=e.width/2),this.paddingLeft=Math.max((c-a+o)*this.width/(this.width-a),0),this.paddingRight=Math.max((d-h+o)*this.width/(this.width-h),0)}else{let i=e.height/2,s=t.height/2;"start"===n?(i=0,s=t.height):"end"===n&&(i=e.height,s=0),this.paddingTop=i+o,this.paddingBottom=s+o}}_handleMargins(){this._margins&&(this._margins.left=Math.max(this.paddingLeft,this._margins.left),this._margins.top=Math.max(this.paddingTop,this._margins.top),this._margins.right=Math.max(this.paddingRight,this._margins.right),this._margins.bottom=Math.max(this.paddingBottom,this._margins.bottom))}afterFit(){tt(this.options.afterFit,[this])}isHorizontal(){const{axis:t,position:e}=this.options;return"top"===e||"bottom"===e||"x"===t}isFullSize(){return this.options.fullSize}_convertTicksToLabels(t){let e,i;for(this.beforeTickToLabelConversion(),this.generateTickLabels(t),e=0,i=t.length;e<i;e++)U(t[e].label)&&(t.splice(e,1),i--,e--);this.afterTickToLabelConversion()}_getLabelSizes(){let t=this._labelSizes;if(!t){const e=this.options.ticks.sampleSize;let i=this.ticks;e<i.length&&(i=zs(i,e)),this._labelSizes=t=this._computeLabelSizes(i,i.length)}return t}_computeLabelSizes(t,e){const{ctx:i,_longestTextCache:s}=this,n=[],o=[];let a,r,l,h,c,d,u,f,g,p,m,b=0,x=0;for(a=0;a<e;++a){if(h=t[a].label,c=this._resolveTickFontOptions(a),i.font=d=c.string,u=s[d]=s[d]||{data:{},gc:[]},f=c.lineHeight,g=p=0,U(h)||X(h)){if(X(h))for(r=0,l=h.length;r<l;++r)m=h[r],U(m)||X(m)||(g=me(i,u.data,u.gc,g,m),p+=f)}else g=me(i,u.data,u.gc,g,h),p=f;n.push(g),o.push(p),b=Math.max(g,b),x=Math.max(p,x)}!function(t,e){et(t,(t=>{const i=t.gc,s=i.length/2;let n;if(s>e){for(n=0;n<s;++n)delete t.data[i[n]];i.splice(0,s)}}))}(s,e);const _=n.indexOf(b),y=o.indexOf(x),v=t=>({width:n[t]||0,height:o[t]||0});return{first:v(0),last:v(e-1),widest:v(_),highest:v(y),widths:n,heights:o}}getLabelForValue(t){return t}getPixelForValue(t,e){return NaN}getValueForPixel(t){}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getPixelForDecimal(t){this._reversePixels&&(t=1-t);const e=this._startPixel+t*this._length;return te(this._alignToPixels?xe(this.chart,e,0):e)}getDecimalForPixel(t){const e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e}getBasePixel(){return this.getPixelForValue(this.getBaseValue())}getBaseValue(){const{min:t,max:e}=this;return t<0&&e<0?e:t>0&&e>0?t:0}getContext(t){const e=this.ticks||[];if(t>=0&&t<e.length){const i=e[t];return i.$context||(i.$context=function(t,e,i){return mi(t,{tick:i,index:e,type:"tick"})}(this.getContext(),t,i))}return this.$context||(this.$context=mi(this.chart.getContext(),{scale:this,type:"scale"}))}_tickSize(){const t=this.options.ticks,e=Yt(this.labelRotation),i=Math.abs(Math.cos(e)),s=Math.abs(Math.sin(e)),n=this._getLabelSizes(),o=t.autoSkipPadding||0,a=n?n.widest.width+o:0,r=n?n.highest.height+o:0;return this.isHorizontal()?r*i>a*s?a/i:r/s:r*s<a*i?r/i:a/s}_isVisible(){const t=this.options.display;return"auto"!==t?!!t:this.getMatchingVisibleMetas().length>0}_computeGridLineItems(t){const e=this.axis,i=this.chart,s=this.options,{grid:n,position:o}=s,a=n.offset,r=this.isHorizontal(),l=this.ticks.length+(a?1:0),h=Bs(n),c=[],d=n.setContext(this.getContext()),u=d.drawBorder?d.borderWidth:0,f=u/2,g=function(t){return xe(i,t,u)};let p,m,b,x,_,y,v,w,M,k,S,P;if("top"===o)p=g(this.bottom),y=this.bottom-h,w=p-f,k=g(t.top)+f,P=t.bottom;else if("bottom"===o)p=g(this.top),k=t.top,P=g(t.bottom)-f,y=p+f,w=this.top+h;else if("left"===o)p=g(this.right),_=this.right-h,v=p-f,M=g(t.left)+f,S=t.right;else if("right"===o)p=g(this.left),M=t.left,S=g(t.right)-f,_=p+f,v=this.left+h;else if("x"===e){if("center"===o)p=g((t.top+t.bottom)/2+.5);else if(q(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}k=t.top,P=t.bottom,y=p+f,w=y+h}else if("y"===e){if("center"===o)p=g((t.left+t.right)/2);else if(q(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}_=p-f,v=_-h,M=t.left,S=t.right}const D=Z(s.ticks.maxTicksLimit,l),C=Math.max(1,Math.ceil(l/D));for(m=0;m<l;m+=C){const t=n.setContext(this.getContext(m)),e=t.lineWidth,s=t.color,o=n.borderDash||[],l=t.borderDashOffset,h=t.tickWidth,d=t.tickColor,u=t.tickBorderDash||[],f=t.tickBorderDashOffset;b=Fs(this,m,a),void 0!==b&&(x=xe(i,b,e),r?_=v=M=S=x:y=w=k=P=x,c.push({tx1:_,ty1:y,tx2:v,ty2:w,x1:M,y1:k,x2:S,y2:P,width:e,color:s,borderDash:o,borderDashOffset:l,tickWidth:h,tickColor:d,tickBorderDash:u,tickBorderDashOffset:f}))}return this._ticksLength=l,this._borderValue=p,c}_computeLabelItems(t){const e=this.axis,i=this.options,{position:s,ticks:n}=i,o=this.isHorizontal(),a=this.ticks,{align:r,crossAlign:l,padding:h,mirror:c}=n,d=Bs(i.grid),u=d+h,f=c?-h:u,g=-Yt(this.labelRotation),p=[];let m,b,x,_,y,v,w,M,k,S,P,D,C="middle";if("top"===s)v=this.bottom-f,w=this._getXAxisLabelAlignment();else if("bottom"===s)v=this.top+f,w=this._getXAxisLabelAlignment();else if("left"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("right"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("x"===e){if("center"===s)v=(t.top+t.bottom)/2+u;else if(q(s)){const t=Object.keys(s)[0],e=s[t];v=this.chart.scales[t].getPixelForValue(e)+u}w=this._getXAxisLabelAlignment()}else if("y"===e){if("center"===s)y=(t.left+t.right)/2-u;else if(q(s)){const t=Object.keys(s)[0],e=s[t];y=this.chart.scales[t].getPixelForValue(e)}w=this._getYAxisLabelAlignment(d).textAlign}"y"===e&&("start"===r?C="top":"end"===r&&(C="bottom"));const O=this._getLabelSizes();for(m=0,b=a.length;m<b;++m){x=a[m],_=x.label;const t=n.setContext(this.getContext(m));M=this.getPixelForTick(m)+n.labelOffset,k=this._resolveTickFontOptions(m),S=k.lineHeight,P=X(_)?_.length:1;const e=P/2,i=t.color,r=t.textStrokeColor,h=t.textStrokeWidth;let d,u=w;if(o?(y=M,"inner"===w&&(u=m===b-1?this.options.reverse?"left":"right":0===m?this.options.reverse?"right":"left":"center"),D="top"===s?"near"===l||0!==g?-P*S+S/2:"center"===l?-O.highest.height/2-e*S+S:-O.highest.height+S/2:"near"===l||0!==g?S/2:"center"===l?O.highest.height/2-e*S:O.highest.height-P*S,c&&(D*=-1)):(v=M,D=(1-P)*S/2),t.showLabelBackdrop){const e=ui(t.backdropPadding),i=O.heights[m],s=O.widths[m];let n=v+D-e.top,o=y-e.left;switch(C){case"middle":n-=i/2;break;case"bottom":n-=i}switch(w){case"center":o-=s/2;break;case"right":o-=s}d={left:o,top:n,width:s+e.width,height:i+e.height,color:t.backdropColor}}p.push({rotation:g,label:_,font:k,color:i,strokeColor:r,strokeWidth:h,textOffset:D,textAlign:u,textBaseline:C,translation:[y,v],backdrop:d})}return p}_getXAxisLabelAlignment(){const{position:t,ticks:e}=this.options;if(-Yt(this.labelRotation))return"top"===t?"left":"right";let i="center";return"start"===e.align?i="left":"end"===e.align?i="right":"inner"===e.align&&(i="inner"),i}_getYAxisLabelAlignment(t){const{position:e,ticks:{crossAlign:i,mirror:s,padding:n}}=this.options,o=t+n,a=this._getLabelSizes().widest.width;let r,l;return"left"===e?s?(l=this.right+n,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l+=a)):(l=this.right-o,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l=this.left)):"right"===e?s?(l=this.left+n,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l-=a)):(l=this.left+o,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l=this.right)):r="right",{textAlign:r,x:l}}_computeLabelArea(){if(this.options.ticks.mirror)return;const t=this.chart,e=this.options.position;return"left"===e||"right"===e?{top:0,left:this.left,bottom:t.height,right:this.right}:"top"===e||"bottom"===e?{top:this.top,left:0,bottom:this.bottom,right:t.width}:void 0}drawBackground(){const{ctx:t,options:{backgroundColor:e},left:i,top:s,width:n,height:o}=this;e&&(t.save(),t.fillStyle=e,t.fillRect(i,s,n,o),t.restore())}getLineWidthForValue(t){const e=this.options.grid;if(!this._isVisible()||!e.display)return 0;const i=this.ticks.findIndex((e=>e.value===t));if(i>=0){return e.setContext(this.getContext(i)).lineWidth}return 0}drawGrid(t){const e=this.options.grid,i=this.ctx,s=this._gridLineItems||(this._gridLineItems=this._computeGridLineItems(t));let n,o;const a=(t,e,s)=>{s.width&&s.color&&(i.save(),i.lineWidth=s.width,i.strokeStyle=s.color,i.setLineDash(s.borderDash||[]),i.lineDashOffset=s.borderDashOffset,i.beginPath(),i.moveTo(t.x,t.y),i.lineTo(e.x,e.y),i.stroke(),i.restore())};if(e.display)for(n=0,o=s.length;n<o;++n){const t=s[n];e.drawOnChartArea&&a({x:t.x1,y:t.y1},{x:t.x2,y:t.y2},t),e.drawTicks&&a({x:t.tx1,y:t.ty1},{x:t.tx2,y:t.ty2},{color:t.tickColor,width:t.tickWidth,borderDash:t.tickBorderDash,borderDashOffset:t.tickBorderDashOffset})}}drawBorder(){const{chart:t,ctx:e,options:{grid:i}}=this,s=i.setContext(this.getContext()),n=i.drawBorder?s.borderWidth:0;if(!n)return;const o=i.setContext(this.getContext(0)).lineWidth,a=this._borderValue;let r,l,h,c;this.isHorizontal()?(r=xe(t,this.left,n)-n/2,l=xe(t,this.right,o)+o/2,h=c=a):(h=xe(t,this.top,n)-n/2,c=xe(t,this.bottom,o)+o/2,r=l=a),e.save(),e.lineWidth=s.borderWidth,e.strokeStyle=s.borderColor,e.beginPath(),e.moveTo(r,h),e.lineTo(l,c),e.stroke(),e.restore()}drawLabels(t){if(!this.options.ticks.display)return;const e=this.ctx,i=this._computeLabelArea();i&&Me(e,i);const s=this._labelItems||(this._labelItems=this._computeLabelItems(t));let n,o;for(n=0,o=s.length;n<o;++n){const t=s[n],i=t.font,o=t.label;t.backdrop&&(e.fillStyle=t.backdrop.color,e.fillRect(t.backdrop.left,t.backdrop.top,t.backdrop.width,t.backdrop.height)),De(e,o,0,t.textOffset,i,t)}i&&ke(e)}drawTitle(){const{ctx:t,options:{position:e,title:i,reverse:s}}=this;if(!i.display)return;const o=fi(i.font),a=ui(i.padding),r=i.align;let l=o.lineHeight/2;"bottom"===e||"center"===e||q(e)?(l+=a.bottom,X(i.text)&&(l+=o.lineHeight*(i.text.length-1))):l+=a.top;const{titleX:h,titleY:c,maxWidth:d,rotation:u}=function(t,e,i,s){const{top:o,left:a,bottom:r,right:l,chart:h}=t,{chartArea:c,scales:d}=h;let u,f,g,p=0;const m=r-o,b=l-a;if(t.isHorizontal()){if(f=n(s,a,l),q(i)){const t=Object.keys(i)[0],s=i[t];g=d[t].getPixelForValue(s)+m-e}else g="center"===i?(c.bottom+c.top)/2+m-e:Is(t,i,e);u=l-a}else{if(q(i)){const t=Object.keys(i)[0],s=i[t];f=d[t].getPixelForValue(s)-b+e}else f="center"===i?(c.left+c.right)/2-b+e:Is(t,i,e);g=n(s,r,o),p="left"===i?-Et:Et}return{titleX:f,titleY:g,maxWidth:u,rotation:p}}(this,l,e,r);De(t,i.text,0,0,o,{color:i.color,maxWidth:d,rotation:u,textAlign:Ws(r,e,s),textBaseline:"middle",translation:[h,c]})}draw(t){this._isVisible()&&(this.drawBackground(),this.drawGrid(t),this.drawBorder(),this.drawTitle(),this.drawLabels(t))}_layers(){const t=this.options,e=t.ticks&&t.ticks.z||0,i=Z(t.grid&&t.grid.z,-1);return this._isVisible()&&this.draw===Ns.prototype.draw?[{z:i,draw:t=>{this.drawBackground(),this.drawGrid(t),this.drawTitle()}},{z:i+1,draw:()=>{this.drawBorder()}},{z:e,draw:t=>{this.drawLabels(t)}}]:[{z:e,draw:t=>{this.draw(t)}}]}getMatchingVisibleMetas(t){const e=this.chart.getSortedVisibleDatasetMetas(),i=this.axis+"AxisID",s=[];let n,o;for(n=0,o=e.length;n<o;++n){const o=e[n];o[i]!==this.id||t&&o.type!==t||s.push(o)}return s}_resolveTickFontOptions(t){return fi(this.options.ticks.setContext(this.getContext(t)).font)}_maxDigits(){const t=this._resolveTickFontOptions(0).lineHeight;return(this.isHorizontal()?this.width:this.height)/t}}class js{constructor(t,e,i){this.type=t,this.scope=e,this.override=i,this.items=Object.create(null)}isForType(t){return Object.prototype.isPrototypeOf.call(this.type.prototype,t.prototype)}register(t){const e=Object.getPrototypeOf(t);let i;(function(t){return"id"in t&&"defaults"in t})(e)&&(i=this.register(e));const s=this.items,n=t.id,o=this.scope+"."+n;if(!n)throw new Error("class does not have id: "+t);return n in s||(s[n]=t,function(t,e,i){const s=at(Object.create(null),[i?yt.get(i):{},yt.get(e),t.defaults]);yt.set(e,s),t.defaultRoutes&&function(t,e){Object.keys(e).forEach((i=>{const s=i.split("."),n=s.pop(),o=[t].concat(s).join("."),a=e[i].split("."),r=a.pop(),l=a.join(".");yt.route(o,n,l,r)}))}(e,t.defaultRoutes);t.descriptors&&yt.describe(e,t.descriptors)}(t,o,i),this.override&&yt.override(t.id,t.overrides)),o}get(t){return this.items[t]}unregister(t){const e=this.items,i=t.id,s=this.scope;i in e&&delete e[i],s&&i in yt[s]&&(delete yt[s][i],this.override&&delete mt[i])}}var Hs=new class{constructor(){this.controllers=new js(Os,"datasets",!0),this.elements=new js(As,"elements"),this.plugins=new js(Object,"plugins"),this.scales=new js(Ns,"scales"),this._typedRegistries=[this.controllers,this.scales,this.elements]}add(...t){this._each("register",t)}remove(...t){this._each("unregister",t)}addControllers(...t){this._each("register",t,this.controllers)}addElements(...t){this._each("register",t,this.elements)}addPlugins(...t){this._each("register",t,this.plugins)}addScales(...t){this._each("register",t,this.scales)}getController(t){return this._get(t,this.controllers,"controller")}getElement(t){return this._get(t,this.elements,"element")}getPlugin(t){return this._get(t,this.plugins,"plugin")}getScale(t){return this._get(t,this.scales,"scale")}removeControllers(...t){this._each("unregister",t,this.controllers)}removeElements(...t){this._each("unregister",t,this.elements)}removePlugins(...t){this._each("unregister",t,this.plugins)}removeScales(...t){this._each("unregister",t,this.scales)}_each(t,e,i){[...e].forEach((e=>{const s=i||this._getRegistryForType(e);i||s.isForType(e)||s===this.plugins&&e.id?this._exec(t,s,e):et(e,(e=>{const s=i||this._getRegistryForType(e);this._exec(t,s,e)}))}))}_exec(t,e,i){const s=dt(t);tt(i["before"+s],[],i),e[t](i),tt(i["after"+s],[],i)}_getRegistryForType(t){for(let e=0;e<this._typedRegistries.length;e++){const i=this._typedRegistries[e];if(i.isForType(t))return i}return this.plugins}_get(t,e,i){const s=e.get(t);if(void 0===s)throw new Error('"'+t+'" is not a registered '+i+".");return s}};class $s{constructor(){this._init=[]}notify(t,e,i,s){"beforeInit"===e&&(this._init=this._createDescriptors(t,!0),this._notify(this._init,t,"install"));const n=s?this._descriptors(t).filter(s):this._descriptors(t),o=this._notify(n,t,e,i);return"afterDestroy"===e&&(this._notify(n,t,"stop"),this._notify(this._init,t,"uninstall")),o}_notify(t,e,i,s){s=s||{};for(const n of t){const t=n.plugin;if(!1===tt(t[i],[e,s,n.options],t)&&s.cancelable)return!1}return!0}invalidate(){U(this._cache)||(this._oldCache=this._cache,this._cache=void 0)}_descriptors(t){if(this._cache)return this._cache;const e=this._cache=this._createDescriptors(t);return this._notifyStateChanges(t),e}_createDescriptors(t,e){const i=t&&t.config,s=Z(i.options&&i.options.plugins,{}),n=function(t){const e={},i=[],s=Object.keys(Hs.plugins.items);for(let t=0;t<s.length;t++)i.push(Hs.getPlugin(s[t]));const n=t.plugins||[];for(let t=0;t<n.length;t++){const s=n[t];-1===i.indexOf(s)&&(i.push(s),e[s.id]=!0)}return{plugins:i,localIds:e}}(i);return!1!==s||e?function(t,{plugins:e,localIds:i},s,n){const o=[],a=t.getContext();for(const r of e){const e=r.id,l=Ys(s[e],n);null!==l&&o.push({plugin:r,options:Us(t.config,{plugin:r,local:i[e]},l,a)})}return o}(t,n,s,e):[]}_notifyStateChanges(t){const e=this._oldCache||[],i=this._cache,s=(t,e)=>t.filter((t=>!e.some((e=>t.plugin.id===e.plugin.id))));this._notify(s(e,i),t,"stop"),this._notify(s(i,e),t,"start")}}function Ys(t,e){return e||!1!==t?!0===t?{}:t:null}function Us(t,{plugin:e,local:i},s,n){const o=t.pluginScopeKeys(e),a=t.getOptionScopes(s,o);return i&&e.defaults&&a.push(e.defaults),t.createResolver(a,n,[""],{scriptable:!1,indexable:!1,allKeys:!0})}function Xs(t,e){const i=yt.datasets[t]||{};return((e.datasets||{})[t]||{}).indexAxis||e.indexAxis||i.indexAxis||"x"}function qs(t,e){return"x"===t||"y"===t?t:e.axis||("top"===(i=e.position)||"bottom"===i?"x":"left"===i||"right"===i?"y":void 0)||t.charAt(0).toLowerCase();var i}function Ks(t){const e=t.options||(t.options={});e.plugins=Z(e.plugins,{}),e.scales=function(t,e){const i=mt[t.type]||{scales:{}},s=e.scales||{},n=Xs(t.type,e),o=Object.create(null),a=Object.create(null);return Object.keys(s).forEach((t=>{const e=s[t];if(!q(e))return console.error(`Invalid scale configuration for scale: ${t}`);if(e._proxy)return console.warn(`Ignoring resolver passed as options for scale: ${t}`);const r=qs(t,e),l=function(t,e){return t===e?"_index_":"_value_"}(r,n),h=i.scales||{};o[r]=o[r]||t,a[t]=rt(Object.create(null),[{axis:r},e,h[r],h[l]])})),t.data.datasets.forEach((i=>{const n=i.type||t.type,r=i.indexAxis||Xs(n,e),l=(mt[n]||{}).scales||{};Object.keys(l).forEach((t=>{const e=function(t,e){let i=t;return"_index_"===t?i=e:"_value_"===t&&(i="x"===e?"y":"x"),i}(t,r),n=i[e+"AxisID"]||o[e]||e;a[n]=a[n]||Object.create(null),rt(a[n],[{axis:e},s[n],l[t]])}))})),Object.keys(a).forEach((t=>{const e=a[t];rt(e,[yt.scales[e.type],yt.scale])})),a}(t,e)}function Gs(t){return(t=t||{}).datasets=t.datasets||[],t.labels=t.labels||[],t}const Zs=new Map,Js=new Set;function Qs(t,e){let i=Zs.get(t);return i||(i=e(),Zs.set(t,i),Js.add(i)),i}const tn=(t,e,i)=>{const s=ct(e,i);void 0!==s&&t.add(s)};class en{constructor(t){this._config=function(t){return(t=t||{}).data=Gs(t.data),Ks(t),t}(t),this._scopeCache=new Map,this._resolverCache=new Map}get platform(){return this._config.platform}get type(){return this._config.type}set type(t){this._config.type=t}get data(){return this._config.data}set data(t){this._config.data=Gs(t)}get options(){return this._config.options}set options(t){this._config.options=t}get plugins(){return this._config.plugins}update(){const t=this._config;this.clearCache(),Ks(t)}clearCache(){this._scopeCache.clear(),this._resolverCache.clear()}datasetScopeKeys(t){return Qs(t,(()=>[[`datasets.${t}`,""]]))}datasetAnimationScopeKeys(t,e){return Qs(`${t}.transition.${e}`,(()=>[[`datasets.${t}.transitions.${e}`,`transitions.${e}`],[`datasets.${t}`,""]]))}datasetElementScopeKeys(t,e){return Qs(`${t}-${e}`,(()=>[[`datasets.${t}.elements.${e}`,`datasets.${t}`,`elements.${e}`,""]]))}pluginScopeKeys(t){const e=t.id;return Qs(`${this.type}-plugin-${e}`,(()=>[[`plugins.${e}`,...t.additionalOptionScopes||[]]]))}_cachedScopes(t,e){const i=this._scopeCache;let s=i.get(t);return s&&!e||(s=new Map,i.set(t,s)),s}getOptionScopes(t,e,i){const{options:s,type:n}=this,o=this._cachedScopes(t,i),a=o.get(e);if(a)return a;const r=new Set;e.forEach((e=>{t&&(r.add(t),e.forEach((e=>tn(r,t,e)))),e.forEach((t=>tn(r,s,t))),e.forEach((t=>tn(r,mt[n]||{},t))),e.forEach((t=>tn(r,yt,t))),e.forEach((t=>tn(r,bt,t)))}));const l=Array.from(r);return 0===l.length&&l.push(Object.create(null)),Js.has(e)&&o.set(e,l),l}chartOptionScopes(){const{options:t,type:e}=this;return[t,mt[e]||{},yt.datasets[e]||{},{type:e},yt,bt]}resolveNamedOptions(t,e,i,s=[""]){const n={$shared:!0},{resolver:o,subPrefixes:a}=sn(this._resolverCache,t,s);let r=o;if(function(t,e){const{isScriptable:i,isIndexable:s}=Le(t);for(const n of e){const e=i(n),o=s(n),a=(o||e)&&t[n];if(e&&(ft(a)||nn(a))||o&&X(a))return!0}return!1}(o,e)){n.$shared=!1;r=Te(o,i=ft(i)?i():i,this.createResolver(t,i,a))}for(const t of e)n[t]=r[t];return n}createResolver(t,e,i=[""],s){const{resolver:n}=sn(this._resolverCache,t,i);return q(e)?Te(n,e,void 0,s):n}}function sn(t,e,i){let s=t.get(e);s||(s=new Map,t.set(e,s));const n=i.join();let o=s.get(n);if(!o){o={resolver:Ae(e,i),subPrefixes:i.filter((t=>!t.toLowerCase().includes("hover")))},s.set(n,o)}return o}const nn=t=>q(t)&&Object.getOwnPropertyNames(t).reduce(((e,i)=>e||ft(t[i])),!1);const on=["top","bottom","left","right","chartArea"];function an(t,e){return"top"===t||"bottom"===t||-1===on.indexOf(t)&&"x"===e}function rn(t,e){return function(i,s){return i[t]===s[t]?i[e]-s[e]:i[t]-s[t]}}function ln(t){const e=t.chart,i=e.options.animation;e.notifyPlugins("afterRender"),tt(i&&i.onComplete,[t],e)}function hn(t){const e=t.chart,i=e.options.animation;tt(i&&i.onProgress,[t],e)}function cn(t){return ie()&&"string"==typeof t?t=document.getElementById(t):t&&t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas),t}const dn={},un=t=>{const e=cn(t);return Object.values(dn).filter((t=>t.canvas===e)).pop()};function fn(t,e,i){const s=Object.keys(t);for(const n of s){const s=+n;if(s>=e){const o=t[n];delete t[n],(i>0||s>e)&&(t[s+i]=o)}}}class gn{constructor(t,e){const s=this.config=new en(e),n=cn(t),o=un(n);if(o)throw new Error("Canvas is already in use. Chart with ID '"+o.id+"' must be destroyed before the canvas with ID '"+o.canvas.id+"' can be reused.");const r=s.createResolver(s.chartOptionScopes(),this.getContext());this.platform=new(s.platform||ds(n)),this.platform.updateConfig(s);const l=this.platform.acquireContext(n,r.aspectRatio),h=l&&l.canvas,c=h&&h.height,d=h&&h.width;this.id=Y(),this.ctx=l,this.canvas=h,this.width=d,this.height=c,this._options=r,this._aspectRatio=this.aspectRatio,this._layers=[],this._metasets=[],this._stacks=void 0,this.boxes=[],this.currentDevicePixelRatio=void 0,this.chartArea=void 0,this._active=[],this._lastEvent=void 0,this._listeners={},this._responsiveListeners=void 0,this._sortedMetasets=[],this.scales={},this._plugins=new $s,this.$proxies={},this._hiddenIndices={},this.attached=!1,this._animationsDisabled=void 0,this.$context=void 0,this._doResize=i((t=>this.update(t)),r.resizeDelay||0),this._dataChanges=[],dn[this.id]=this,l&&h?(a.listen(this,"complete",ln),a.listen(this,"progress",hn),this._initialize(),this.attached&&this.update()):console.error("Failed to create chart: can't acquire context from the given item")}get aspectRatio(){const{options:{aspectRatio:t,maintainAspectRatio:e},width:i,height:s,_aspectRatio:n}=this;return U(t)?e&&n?n:s?i/s:null:t}get data(){return this.config.data}set data(t){this.config.data=t}get options(){return this._options}set options(t){this.config.options=t}_initialize(){return this.notifyPlugins("beforeInit"),this.options.responsive?this.resize():ue(this,this.options.devicePixelRatio),this.bindEvents(),this.notifyPlugins("afterInit"),this}clear(){return _e(this.canvas,this.ctx),this}stop(){return a.stop(this),this}resize(t,e){a.running(this)?this._resizeBeforeDraw={width:t,height:e}:this._resize(t,e)}_resize(t,e){const i=this.options,s=this.canvas,n=i.maintainAspectRatio&&this.aspectRatio,o=this.platform.getMaximumSize(s,t,e,n),a=i.devicePixelRatio||this.platform.getDevicePixelRatio(),r=this.width?"resize":"attach";this.width=o.width,this.height=o.height,this._aspectRatio=this.aspectRatio,ue(this,a,!0)&&(this.notifyPlugins("resize",{size:o}),tt(i.onResize,[this,o],this),this.attached&&this._doResize(r)&&this.render())}ensureScalesHaveIDs(){et(this.options.scales||{},((t,e)=>{t.id=e}))}buildOrUpdateScales(){const t=this.options,e=t.scales,i=this.scales,s=Object.keys(i).reduce(((t,e)=>(t[e]=!1,t)),{});let n=[];e&&(n=n.concat(Object.keys(e).map((t=>{const i=e[t],s=qs(t,i),n="r"===s,o="x"===s;return{options:i,dposition:n?"chartArea":o?"bottom":"left",dtype:n?"radialLinear":o?"category":"linear"}})))),et(n,(e=>{const n=e.options,o=n.id,a=qs(o,n),r=Z(n.type,e.dtype);void 0!==n.position&&an(n.position,a)===an(e.dposition)||(n.position=e.dposition),s[o]=!0;let l=null;if(o in i&&i[o].type===r)l=i[o];else{l=new(Hs.getScale(r))({id:o,type:r,ctx:this.ctx,chart:this}),i[l.id]=l}l.init(n,t)})),et(s,((t,e)=>{t||delete i[e]})),et(i,(t=>{qi.configure(this,t,t.options),qi.addBox(this,t)}))}_updateMetasets(){const t=this._metasets,e=this.data.datasets.length,i=t.length;if(t.sort(((t,e)=>t.index-e.index)),i>e){for(let t=e;t<i;++t)this._destroyDatasetMeta(t);t.splice(e,i-e)}this._sortedMetasets=t.slice(0).sort(rn("order","index"))}_removeUnreferencedMetasets(){const{_metasets:t,data:{datasets:e}}=this;t.length>e.length&&delete this._stacks,t.forEach(((t,i)=>{0===e.filter((e=>e===t._dataset)).length&&this._destroyDatasetMeta(i)}))}buildOrUpdateControllers(){const t=[],e=this.data.datasets;let i,s;for(this._removeUnreferencedMetasets(),i=0,s=e.length;i<s;i++){const s=e[i];let n=this.getDatasetMeta(i);const o=s.type||this.config.type;if(n.type&&n.type!==o&&(this._destroyDatasetMeta(i),n=this.getDatasetMeta(i)),n.type=o,n.indexAxis=s.indexAxis||Xs(o,this.options),n.order=s.order||0,n.index=i,n.label=""+s.label,n.visible=this.isDatasetVisible(i),n.controller)n.controller.updateIndex(i),n.controller.linkScales();else{const e=Hs.getController(o),{datasetElementType:s,dataElementType:a}=yt.datasets[o];Object.assign(e.prototype,{dataElementType:Hs.getElement(a),datasetElementType:s&&Hs.getElement(s)}),n.controller=new e(this,i),t.push(n.controller)}}return this._updateMetasets(),t}_resetElements(){et(this.data.datasets,((t,e)=>{this.getDatasetMeta(e).controller.reset()}),this)}reset(){this._resetElements(),this.notifyPlugins("reset")}update(t){const e=this.config;e.update();const i=this._options=e.createResolver(e.chartOptionScopes(),this.getContext()),s=this._animationsDisabled=!i.animation;if(this._updateScales(),this._checkEventBindings(),this._updateHiddenIndices(),this._plugins.invalidate(),!1===this.notifyPlugins("beforeUpdate",{mode:t,cancelable:!0}))return;const n=this.buildOrUpdateControllers();this.notifyPlugins("beforeElementsUpdate");let o=0;for(let t=0,e=this.data.datasets.length;t<e;t++){const{controller:e}=this.getDatasetMeta(t),i=!s&&-1===n.indexOf(e);e.buildOrUpdateElements(i),o=Math.max(+e.getMaxOverflow(),o)}o=this._minPadding=i.layout.autoPadding?o:0,this._updateLayout(o),s||et(n,(t=>{t.reset()})),this._updateDatasets(t),this.notifyPlugins("afterUpdate",{mode:t}),this._layers.sort(rn("z","_idx"));const{_active:a,_lastEvent:r}=this;r?this._eventHandler(r,!0):a.length&&this._updateHoverStyles(a,a,!0),this.render()}_updateScales(){et(this.scales,(t=>{qi.removeBox(this,t)})),this.ensureScalesHaveIDs(),this.buildOrUpdateScales()}_checkEventBindings(){const t=this.options,e=new Set(Object.keys(this._listeners)),i=new Set(t.events);gt(e,i)&&!!this._responsiveListeners===t.responsive||(this.unbindEvents(),this.bindEvents())}_updateHiddenIndices(){const{_hiddenIndices:t}=this,e=this._getUniformDataChanges()||[];for(const{method:i,start:s,count:n}of e){fn(t,s,"_removeElements"===i?-n:n)}}_getUniformDataChanges(){const t=this._dataChanges;if(!t||!t.length)return;this._dataChanges=[];const e=this.data.datasets.length,i=e=>new Set(t.filter((t=>t[0]===e)).map(((t,e)=>e+","+t.splice(1).join(",")))),s=i(0);for(let t=1;t<e;t++)if(!gt(s,i(t)))return;return Array.from(s).map((t=>t.split(","))).map((t=>({method:t[1],start:+t[2],count:+t[3]})))}_updateLayout(t){if(!1===this.notifyPlugins("beforeLayout",{cancelable:!0}))return;qi.update(this,this.width,this.height,t);const e=this.chartArea,i=e.width<=0||e.height<=0;this._layers=[],et(this.boxes,(t=>{i&&"chartArea"===t.position||(t.configure&&t.configure(),this._layers.push(...t._layers()))}),this),this._layers.forEach(((t,e)=>{t._idx=e})),this.notifyPlugins("afterLayout")}_updateDatasets(t){if(!1!==this.notifyPlugins("beforeDatasetsUpdate",{mode:t,cancelable:!0})){for(let t=0,e=this.data.datasets.length;t<e;++t)this.getDatasetMeta(t).controller.configure();for(let e=0,i=this.data.datasets.length;e<i;++e)this._updateDataset(e,ft(t)?t({datasetIndex:e}):t);this.notifyPlugins("afterDatasetsUpdate",{mode:t})}}_updateDataset(t,e){const i=this.getDatasetMeta(t),s={meta:i,index:t,mode:e,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetUpdate",s)&&(i.controller._update(e),s.cancelable=!1,this.notifyPlugins("afterDatasetUpdate",s))}render(){!1!==this.notifyPlugins("beforeRender",{cancelable:!0})&&(a.has(this)?this.attached&&!a.running(this)&&a.start(this):(this.draw(),ln({chart:this})))}draw(){let t;if(this._resizeBeforeDraw){const{width:t,height:e}=this._resizeBeforeDraw;this._resize(t,e),this._resizeBeforeDraw=null}if(this.clear(),this.width<=0||this.height<=0)return;if(!1===this.notifyPlugins("beforeDraw",{cancelable:!0}))return;const e=this._layers;for(t=0;t<e.length&&e[t].z<=0;++t)e[t].draw(this.chartArea);for(this._drawDatasets();t<e.length;++t)e[t].draw(this.chartArea);this.notifyPlugins("afterDraw")}_getSortedDatasetMetas(t){const e=this._sortedMetasets,i=[];let s,n;for(s=0,n=e.length;s<n;++s){const n=e[s];t&&!n.visible||i.push(n)}return i}getSortedVisibleDatasetMetas(){return this._getSortedDatasetMetas(!0)}_drawDatasets(){if(!1===this.notifyPlugins("beforeDatasetsDraw",{cancelable:!0}))return;const t=this.getSortedVisibleDatasetMetas();for(let e=t.length-1;e>=0;--e)this._drawDataset(t[e]);this.notifyPlugins("afterDatasetsDraw")}_drawDataset(t){const e=this.ctx,i=t._clip,s=!i.disabled,n=this.chartArea,o={meta:t,index:t.index,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetDraw",o)&&(s&&Me(e,{left:!1===i.left?0:n.left-i.left,right:!1===i.right?this.width:n.right+i.right,top:!1===i.top?0:n.top-i.top,bottom:!1===i.bottom?this.height:n.bottom+i.bottom}),t.controller.draw(),s&&ke(e),o.cancelable=!1,this.notifyPlugins("afterDatasetDraw",o))}isPointInArea(t){return we(t,this.chartArea,this._minPadding)}getElementsAtEventForMode(t,e,i,s){const n=Ii.modes[e];return"function"==typeof n?n(this,t,i,s):[]}getDatasetMeta(t){const e=this.data.datasets[t],i=this._metasets;let s=i.filter((t=>t&&t._dataset===e)).pop();return s||(s={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e&&e.order||0,index:t,_dataset:e,_parsed:[],_sorted:!1},i.push(s)),s}getContext(){return this.$context||(this.$context=mi(null,{chart:this,type:"chart"}))}getVisibleDatasetCount(){return this.getSortedVisibleDatasetMetas().length}isDatasetVisible(t){const e=this.data.datasets[t];if(!e)return!1;const i=this.getDatasetMeta(t);return"boolean"==typeof i.hidden?!i.hidden:!e.hidden}setDatasetVisibility(t,e){this.getDatasetMeta(t).hidden=!e}toggleDataVisibility(t){this._hiddenIndices[t]=!this._hiddenIndices[t]}getDataVisibility(t){return!this._hiddenIndices[t]}_updateVisibility(t,e,i){const s=i?"show":"hide",n=this.getDatasetMeta(t),o=n.controller._resolveAnimations(void 0,s);ut(e)?(n.data[e].hidden=!i,this.update()):(this.setDatasetVisibility(t,i),o.update(n,{visible:i}),this.update((e=>e.datasetIndex===t?s:void 0)))}hide(t,e){this._updateVisibility(t,e,!1)}show(t,e){this._updateVisibility(t,e,!0)}_destroyDatasetMeta(t){const e=this._metasets[t];e&&e.controller&&e.controller._destroy(),delete this._metasets[t]}_stop(){let t,e;for(this.stop(),a.remove(this),t=0,e=this.data.datasets.length;t<e;++t)this._destroyDatasetMeta(t)}destroy(){this.notifyPlugins("beforeDestroy");const{canvas:t,ctx:e}=this;this._stop(),this.config.clearCache(),t&&(this.unbindEvents(),_e(t,e),this.platform.releaseContext(e),this.canvas=null,this.ctx=null),this.notifyPlugins("destroy"),delete dn[this.id],this.notifyPlugins("afterDestroy")}toBase64Image(...t){return this.canvas.toDataURL(...t)}bindEvents(){this.bindUserEvents(),this.options.responsive?this.bindResponsiveEvents():this.attached=!0}bindUserEvents(){const t=this._listeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(t,e,i)=>{t.offsetX=e,t.offsetY=i,this._eventHandler(t)};et(this.options.events,(t=>i(t,s)))}bindResponsiveEvents(){this._responsiveListeners||(this._responsiveListeners={});const t=this._responsiveListeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(i,s)=>{t[i]&&(e.removeEventListener(this,i,s),delete t[i])},n=(t,e)=>{this.canvas&&this.resize(t,e)};let o;const a=()=>{s("attach",a),this.attached=!0,this.resize(),i("resize",n),i("detach",o)};o=()=>{this.attached=!1,s("resize",n),this._stop(),this._resize(0,0),i("attach",a)},e.isAttached(this.canvas)?a():o()}unbindEvents(){et(this._listeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._listeners={},et(this._responsiveListeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._responsiveListeners=void 0}updateHoverStyle(t,e,i){const s=i?"set":"remove";let n,o,a,r;for("dataset"===e&&(n=this.getDatasetMeta(t[0].datasetIndex),n.controller["_"+s+"DatasetHoverStyle"]()),a=0,r=t.length;a<r;++a){o=t[a];const e=o&&this.getDatasetMeta(o.datasetIndex).controller;e&&e[s+"HoverStyle"](o.element,o.datasetIndex,o.index)}}getActiveElements(){return this._active||[]}setActiveElements(t){const e=this._active||[],i=t.map((({datasetIndex:t,index:e})=>{const i=this.getDatasetMeta(t);if(!i)throw new Error("No dataset found at index "+t);return{datasetIndex:t,element:i.data[e],index:e}}));!it(i,e)&&(this._active=i,this._lastEvent=null,this._updateHoverStyles(i,e))}notifyPlugins(t,e,i){return this._plugins.notify(this,t,e,i)}_updateHoverStyles(t,e,i){const s=this.options.hover,n=(t,e)=>t.filter((t=>!e.some((e=>t.datasetIndex===e.datasetIndex&&t.index===e.index)))),o=n(e,t),a=i?t:n(t,e);o.length&&this.updateHoverStyle(o,s.mode,!1),a.length&&s.mode&&this.updateHoverStyle(a,s.mode,!0)}_eventHandler(t,e){const i={event:t,replay:e,cancelable:!0,inChartArea:this.isPointInArea(t)},s=e=>(e.options.events||this.options.events).includes(t.native.type);if(!1===this.notifyPlugins("beforeEvent",i,s))return;const n=this._handleEvent(t,e,i.inChartArea);return i.cancelable=!1,this.notifyPlugins("afterEvent",i,s),(n||i.changed)&&this.render(),this}_handleEvent(t,e,i){const{_active:s=[],options:n}=this,o=e,a=this._getActiveElements(t,s,i,o),r=pt(t),l=function(t,e,i,s){return i&&"mouseout"!==t.type?s?e:t:null}(t,this._lastEvent,i,r);i&&(this._lastEvent=null,tt(n.onHover,[t,a,this],this),r&&tt(n.onClick,[t,a,this],this));const h=!it(a,s);return(h||e)&&(this._active=a,this._updateHoverStyles(a,s,e)),this._lastEvent=l,h}_getActiveElements(t,e,i,s){if("mouseout"===t.type)return[];if(!i)return e;const n=this.options.hover;return this.getElementsAtEventForMode(t,n.mode,n,s)}}const pn=()=>et(gn.instances,(t=>t._plugins.invalidate())),mn=!0;function bn(){throw new Error("This method is not implemented: Check that a complete date adapter is provided.")}Object.defineProperties(gn,{defaults:{enumerable:mn,value:yt},instances:{enumerable:mn,value:dn},overrides:{enumerable:mn,value:mt},registry:{enumerable:mn,value:Hs},version:{enumerable:mn,value:"3.8.2"},getChart:{enumerable:mn,value:un},register:{enumerable:mn,value:(...t)=>{Hs.add(...t),pn()}},unregister:{enumerable:mn,value:(...t)=>{Hs.remove(...t),pn()}}});class xn{constructor(t){this.options=t||{}}formats(){return bn()}parse(t,e){return bn()}format(t,e){return bn()}add(t,e,i){return bn()}diff(t,e,i){return bn()}startOf(t,e,i){return bn()}endOf(t,e){return bn()}}xn.override=function(t){Object.assign(xn.prototype,t)};var _n={_date:xn};function yn(t){const e=t.iScale,i=function(t,e){if(!t._cache.$bar){const i=t.getMatchingVisibleMetas(e);let s=[];for(let e=0,n=i.length;e<n;e++)s=s.concat(i[e].controller.getAllParsedValues(t));t._cache.$bar=Ct(s.sort(((t,e)=>t-e)))}return t._cache.$bar}(e,t.type);let s,n,o,a,r=e._length;const l=()=>{32767!==o&&-32768!==o&&(ut(a)&&(r=Math.min(r,Math.abs(o-a)||r)),a=o)};for(s=0,n=i.length;s<n;++s)o=e.getPixelForValue(i[s]),l();for(a=void 0,s=0,n=e.ticks.length;s<n;++s)o=e.getPixelForTick(s),l();return r}function vn(t,e,i,s){return X(t)?function(t,e,i,s){const n=i.parse(t[0],s),o=i.parse(t[1],s),a=Math.min(n,o),r=Math.max(n,o);let l=a,h=r;Math.abs(a)>Math.abs(r)&&(l=r,h=a),e[i.axis]=h,e._custom={barStart:l,barEnd:h,start:n,end:o,min:a,max:r}}(t,e,i,s):e[i.axis]=i.parse(t,s),e}function wn(t,e,i,s){const n=t.iScale,o=t.vScale,a=n.getLabels(),r=n===o,l=[];let h,c,d,u;for(h=i,c=i+s;h<c;++h)u=e[h],d={},d[n.axis]=r||n.parse(a[h],h),l.push(vn(u,d,o,h));return l}function Mn(t){return t&&void 0!==t.barStart&&void 0!==t.barEnd}function kn(t,e,i,s){let n=e.borderSkipped;const o={};if(!n)return void(t.borderSkipped=o);const{start:a,end:r,reverse:l,top:h,bottom:c}=function(t){let e,i,s,n,o;return t.horizontal?(e=t.base>t.x,i="left",s="right"):(e=t.base<t.y,i="bottom",s="top"),e?(n="end",o="start"):(n="start",o="end"),{start:i,end:s,reverse:e,top:n,bottom:o}}(t);"middle"===n&&i&&(t.enableBorderRadius=!0,(i._top||0)===s?n=h:(i._bottom||0)===s?n=c:(o[Sn(c,a,r,l)]=!0,n=h)),o[Sn(n,a,r,l)]=!0,t.borderSkipped=o}function Sn(t,e,i,s){var n,o,a;return s?(a=i,t=Pn(t=(n=t)===(o=e)?a:n===a?o:n,i,e)):t=Pn(t,e,i),t}function Pn(t,e,i){return"start"===t?e:"end"===t?i:t}function Dn(t,{inflateAmount:e},i){t.inflateAmount="auto"===e?1===i?.33:0:e}class Cn extends Os{parsePrimitiveData(t,e,i,s){return wn(t,e,i,s)}parseArrayData(t,e,i,s){return wn(t,e,i,s)}parseObjectData(t,e,i,s){const{iScale:n,vScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l="x"===n.axis?a:r,h="x"===o.axis?a:r,c=[];let d,u,f,g;for(d=i,u=i+s;d<u;++d)g=e[d],f={},f[n.axis]=n.parse(ct(g,l),d),c.push(vn(ct(g,h),f,o,d));return c}updateRangeFromParsed(t,e,i,s){super.updateRangeFromParsed(t,e,i,s);const n=i._custom;n&&e===this._cachedMeta.vScale&&(t.min=Math.min(t.min,n.min),t.max=Math.max(t.max,n.max))}getMaxOverflow(){return 0}getLabelAndValue(t){const e=this._cachedMeta,{iScale:i,vScale:s}=e,n=this.getParsed(t),o=n._custom,a=Mn(o)?"["+o.start+", "+o.end+"]":""+s.getLabelForValue(n[s.axis]);return{label:""+i.getLabelForValue(n[i.axis]),value:a}}initialize(){this.enableOptionSharing=!0,super.initialize();this._cachedMeta.stack=this.getDataset().stack}update(t){const e=this._cachedMeta;this.updateElements(e.data,0,e.data.length,t)}updateElements(t,e,i,s){const n="reset"===s,{index:o,_cachedMeta:{vScale:a}}=this,r=a.getBasePixel(),l=a.isHorizontal(),h=this._getRuler(),{sharedOptions:c,includeOptions:d}=this._getSharedOptions(e,s);for(let u=e;u<e+i;u++){const e=this.getParsed(u),i=n||U(e[a.axis])?{base:r,head:r}:this._calculateBarValuePixels(u),f=this._calculateBarIndexPixels(u,h),g=(e._stacks||{})[a.axis],p={horizontal:l,base:i.base,enableBorderRadius:!g||Mn(e._custom)||o===g._top||o===g._bottom,x:l?i.head:f.center,y:l?f.center:i.head,height:l?f.size:Math.abs(i.size),width:l?Math.abs(i.size):f.size};d&&(p.options=c||this.resolveDataElementOptions(u,t[u].active?"active":s));const m=p.options||t[u].options;kn(p,m,g,o),Dn(p,m,h.ratio),this.updateElement(t[u],u,p,s)}}_getStacks(t,e){const{iScale:i}=this._cachedMeta,s=i.getMatchingVisibleMetas(this._type).filter((t=>t.controller.options.grouped)),n=i.options.stacked,o=[],a=t=>{const i=t.controller.getParsed(e),s=i&&i[t.vScale.axis];if(U(s)||isNaN(s))return!0};for(const i of s)if((void 0===e||!a(i))&&((!1===n||-1===o.indexOf(i.stack)||void 0===n&&void 0===i.stack)&&o.push(i.stack),i.index===t))break;return o.length||o.push(void 0),o}_getStackCount(t){return this._getStacks(void 0,t).length}_getStackIndex(t,e,i){const s=this._getStacks(t,i),n=void 0!==e?s.indexOf(e):-1;return-1===n?s.length-1:n}_getRuler(){const t=this.options,e=this._cachedMeta,i=e.iScale,s=[];let n,o;for(n=0,o=e.data.length;n<o;++n)s.push(i.getPixelForValue(this.getParsed(n)[i.axis],n));const a=t.barThickness;return{min:a||yn(e),pixels:s,start:i._startPixel,end:i._endPixel,stackCount:this._getStackCount(),scale:i,grouped:t.grouped,ratio:a?1:t.categoryPercentage*t.barPercentage}}_calculateBarValuePixels(t){const{_cachedMeta:{vScale:e,_stacked:i},options:{base:s,minBarLength:n}}=this,o=s||0,a=this.getParsed(t),r=a._custom,l=Mn(r);let h,c,d=a[e.axis],u=0,f=i?this.applyStack(e,a,i):d;f!==d&&(u=f-d,f=d),l&&(d=r.barStart,f=r.barEnd-r.barStart,0!==d&&Bt(d)!==Bt(r.barEnd)&&(u=0),u+=d);const g=U(s)||l?u:s;let p=e.getPixelForValue(g);if(h=this.chart.getDataVisibility(t)?e.getPixelForValue(u+f):p,c=h-p,Math.abs(c)<n){c=function(t,e,i){return 0!==t?Bt(t):(e.isHorizontal()?1:-1)*(e.min>=i?1:-1)}(c,e,o)*n,d===o&&(p-=c/2);const t=e.getPixelForDecimal(0),i=e.getPixelForDecimal(1),s=Math.min(t,i),a=Math.max(t,i);p=Math.max(Math.min(p,a),s),h=p+c}if(p===e.getPixelForValue(o)){const t=Bt(c)*e.getLineWidthForValue(o)/2;p+=t,c-=t}return{size:c,base:p,head:h,center:h+c/2}}_calculateBarIndexPixels(t,e){const i=e.scale,s=this.options,n=s.skipNull,o=Z(s.maxBarThickness,1/0);let a,r;if(e.grouped){const i=n?this._getStackCount(t):e.stackCount,l="flex"===s.barThickness?function(t,e,i,s){const n=e.pixels,o=n[t];let a=t>0?n[t-1]:null,r=t<n.length-1?n[t+1]:null;const l=i.categoryPercentage;null===a&&(a=o-(null===r?e.end-e.start:r-o)),null===r&&(r=o+o-a);const h=o-(o-Math.min(a,r))/2*l;return{chunk:Math.abs(r-a)/2*l/s,ratio:i.barPercentage,start:h}}(t,e,s,i):function(t,e,i,s){const n=i.barThickness;let o,a;return U(n)?(o=e.min*i.categoryPercentage,a=i.barPercentage):(o=n*s,a=1),{chunk:o/s,ratio:a,start:e.pixels[t]-o/2}}(t,e,s,i),h=this._getStackIndex(this.index,this._cachedMeta.stack,n?t:void 0);a=l.start+l.chunk*h+l.chunk/2,r=Math.min(o,l.chunk*l.ratio)}else a=i.getPixelForValue(this.getParsed(t)[i.axis],t),r=Math.min(o,e.min*e.ratio);return{base:a-r/2,head:a+r/2,center:a,size:r}}draw(){const t=this._cachedMeta,e=t.vScale,i=t.data,s=i.length;let n=0;for(;n<s;++n)null!==this.getParsed(n)[e.axis]&&i[n].draw(this._ctx)}}Cn.id="bar",Cn.defaults={datasetElementType:!1,dataElementType:"bar",categoryPercentage:.8,barPercentage:.9,grouped:!0,animations:{numbers:{type:"number",properties:["x","y","base","width","height"]}}},Cn.overrides={scales:{_index_:{type:"category",offset:!0,grid:{offset:!0}},_value_:{type:"linear",beginAtZero:!0}}};class On extends Os{initialize(){this.enableOptionSharing=!0,super.initialize()}parsePrimitiveData(t,e,i,s){const n=super.parsePrimitiveData(t,e,i,s);for(let t=0;t<n.length;t++)n[t]._custom=this.resolveDataElementOptions(t+i).radius;return n}parseArrayData(t,e,i,s){const n=super.parseArrayData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=Z(s[2],this.resolveDataElementOptions(t+i).radius)}return n}parseObjectData(t,e,i,s){const n=super.parseObjectData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=Z(s&&s.r&&+s.r,this.resolveDataElementOptions(t+i).radius)}return n}getMaxOverflow(){const t=this._cachedMeta.data;let e=0;for(let i=t.length-1;i>=0;--i)e=Math.max(e,t[i].size(this.resolveDataElementOptions(i))/2);return e>0&&e}getLabelAndValue(t){const e=this._cachedMeta,{xScale:i,yScale:s}=e,n=this.getParsed(t),o=i.getLabelForValue(n.x),a=s.getLabelForValue(n.y),r=n._custom;return{label:e.label,value:"("+o+", "+a+(r?", "+r:"")+")"}}update(t){const e=this._cachedMeta.data;this.updateElements(e,0,e.length,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a}=this._cachedMeta,{sharedOptions:r,includeOptions:l}=this._getSharedOptions(e,s),h=o.axis,c=a.axis;for(let d=e;d<e+i;d++){const e=t[d],i=!n&&this.getParsed(d),u={},f=u[h]=n?o.getPixelForDecimal(.5):o.getPixelForValue(i[h]),g=u[c]=n?a.getBasePixel():a.getPixelForValue(i[c]);u.skip=isNaN(f)||isNaN(g),l&&(u.options=r||this.resolveDataElementOptions(d,e.active?"active":s),n&&(u.options.radius=0)),this.updateElement(e,d,u,s)}}resolveDataElementOptions(t,e){const i=this.getParsed(t);let s=super.resolveDataElementOptions(t,e);s.$shared&&(s=Object.assign({},s,{$shared:!1}));const n=s.radius;return"active"!==e&&(s.radius=0),s.radius+=Z(i&&i._custom,n),s}}On.id="bubble",On.defaults={datasetElementType:!1,dataElementType:"point",animations:{numbers:{type:"number",properties:["x","y","borderWidth","radius"]}}},On.overrides={scales:{x:{type:"linear"},y:{type:"linear"}},plugins:{tooltip:{callbacks:{title:()=>""}}}};class An extends Os{constructor(t,e){super(t,e),this.enableOptionSharing=!0,this.innerRadius=void 0,this.outerRadius=void 0,this.offsetX=void 0,this.offsetY=void 0}linkScales(){}parse(t,e){const i=this.getDataset().data,s=this._cachedMeta;if(!1===this._parsing)s._parsed=i;else{let n,o,a=t=>+i[t];if(q(i[t])){const{key:t="value"}=this._parsing;a=e=>+ct(i[e],t)}for(n=t,o=t+e;n<o;++n)s._parsed[n]=a(n)}}_getRotation(){return Yt(this.options.rotation-90)}_getCircumference(){return Yt(this.options.circumference)}_getRotationExtents(){let t=At,e=-At;for(let i=0;i<this.chart.data.datasets.length;++i)if(this.chart.isDatasetVisible(i)){const s=this.chart.getDatasetMeta(i).controller,n=s._getRotation(),o=s._getCircumference();t=Math.min(t,n),e=Math.max(e,n+o)}return{rotation:t,circumference:e-t}}update(t){const e=this.chart,{chartArea:i}=e,s=this._cachedMeta,n=s.data,o=this.getMaxBorderWidth()+this.getMaxOffset(n)+this.options.spacing,a=Math.max((Math.min(i.width,i.height)-o)/2,0),r=Math.min(J(this.options.cutout,a),1),l=this._getRingWeight(this.index),{circumference:h,rotation:c}=this._getRotationExtents(),{ratioX:d,ratioY:u,offsetX:f,offsetY:g}=function(t,e,i){let s=1,n=1,o=0,a=0;if(e<At){const r=t,l=r+e,h=Math.cos(r),c=Math.sin(r),d=Math.cos(l),u=Math.sin(l),f=(t,e,s)=>Jt(t,r,l,!0)?1:Math.max(e,e*i,s,s*i),g=(t,e,s)=>Jt(t,r,l,!0)?-1:Math.min(e,e*i,s,s*i),p=f(0,h,d),m=f(Et,c,u),b=g(Ot,h,d),x=g(Ot+Et,c,u);s=(p-b)/2,n=(m-x)/2,o=-(p+b)/2,a=-(m+x)/2}return{ratioX:s,ratioY:n,offsetX:o,offsetY:a}}(c,h,r),p=(i.width-o)/d,m=(i.height-o)/u,b=Math.max(Math.min(p,m)/2,0),x=Q(this.options.radius,b),_=(x-Math.max(x*r,0))/this._getVisibleDatasetWeightTotal();this.offsetX=f*x,this.offsetY=g*x,s.total=this.calculateTotal(),this.outerRadius=x-_*this._getRingWeightOffset(this.index),this.innerRadius=Math.max(this.outerRadius-_*l,0),this.updateElements(n,0,n.length,t)}_circumference(t,e){const i=this.options,s=this._cachedMeta,n=this._getCircumference();return e&&i.animation.animateRotate||!this.chart.getDataVisibility(t)||null===s._parsed[t]||s.data[t].hidden?0:this.calculateCircumference(s._parsed[t]*n/At)}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.chartArea,r=o.options.animation,l=(a.left+a.right)/2,h=(a.top+a.bottom)/2,c=n&&r.animateScale,d=c?0:this.innerRadius,u=c?0:this.outerRadius,{sharedOptions:f,includeOptions:g}=this._getSharedOptions(e,s);let p,m=this._getRotation();for(p=0;p<e;++p)m+=this._circumference(p,n);for(p=e;p<e+i;++p){const e=this._circumference(p,n),i=t[p],o={x:l+this.offsetX,y:h+this.offsetY,startAngle:m,endAngle:m+e,circumference:e,outerRadius:u,innerRadius:d};g&&(o.options=f||this.resolveDataElementOptions(p,i.active?"active":s)),m+=e,this.updateElement(i,p,o,s)}}calculateTotal(){const t=this._cachedMeta,e=t.data;let i,s=0;for(i=0;i<e.length;i++){const n=t._parsed[i];null===n||isNaN(n)||!this.chart.getDataVisibility(i)||e[i].hidden||(s+=Math.abs(n))}return s}calculateCircumference(t){const e=this._cachedMeta.total;return e>0&&!isNaN(t)?At*(Math.abs(t)/e):0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=oi(e._parsed[t],i.options.locale);return{label:s[t]||"",value:n}}getMaxBorderWidth(t){let e=0;const i=this.chart;let s,n,o,a,r;if(!t)for(s=0,n=i.data.datasets.length;s<n;++s)if(i.isDatasetVisible(s)){o=i.getDatasetMeta(s),t=o.data,a=o.controller;break}if(!t)return 0;for(s=0,n=t.length;s<n;++s)r=a.resolveDataElementOptions(s),"inner"!==r.borderAlign&&(e=Math.max(e,r.borderWidth||0,r.hoverBorderWidth||0));return e}getMaxOffset(t){let e=0;for(let i=0,s=t.length;i<s;++i){const t=this.resolveDataElementOptions(i);e=Math.max(e,t.offset||0,t.hoverOffset||0)}return e}_getRingWeightOffset(t){let e=0;for(let i=0;i<t;++i)this.chart.isDatasetVisible(i)&&(e+=this._getRingWeight(i));return e}_getRingWeight(t){return Math.max(Z(this.chart.data.datasets[t].weight,1),0)}_getVisibleDatasetWeightTotal(){return this._getRingWeightOffset(this.chart.data.datasets.length)||1}}An.id="doughnut",An.defaults={datasetElementType:!1,dataElementType:"arc",animation:{animateRotate:!0,animateScale:!1},animations:{numbers:{type:"number",properties:["circumference","endAngle","innerRadius","outerRadius","startAngle","x","y","offset","borderWidth","spacing"]}},cutout:"50%",rotation:0,circumference:360,radius:"100%",spacing:0,indexAxis:"r"},An.descriptors={_scriptable:t=>"spacing"!==t,_indexable:t=>"spacing"!==t},An.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label(t){let e=t.label;const i=": "+t.formattedValue;return X(e)?(e=e.slice(),e[0]+=i):e+=i,e}}}}};class Tn extends Os{initialize(){this.enableOptionSharing=!0,this.supportsDecimation=!0,super.initialize()}update(t){const e=this._cachedMeta,{dataset:i,data:s=[],_dataset:n}=e,o=this.chart._animationsDisabled;let{start:a,count:r}=function(t,e,i){const s=e.length;let n=0,o=s;if(t._sorted){const{iScale:a,_parsed:r}=t,l=a.axis,{min:h,max:c,minDefined:d,maxDefined:u}=a.getUserBounds();d&&(n=Qt(Math.min(wt(r,a.axis,h).lo,i?s:wt(e,l,a.getPixelForValue(h)).lo),0,s-1)),o=u?Qt(Math.max(wt(r,a.axis,c).hi+1,i?0:wt(e,l,a.getPixelForValue(c)).hi+1),n,s)-n:s-n}return{start:n,count:o}}(e,s,o);this._drawStart=a,this._drawCount=r,function(t){const{xScale:e,yScale:i,_scaleRanges:s}=t,n={xmin:e.min,xmax:e.max,ymin:i.min,ymax:i.max};if(!s)return t._scaleRanges=n,!0;const o=s.xmin!==e.min||s.xmax!==e.max||s.ymin!==i.min||s.ymax!==i.max;return Object.assign(s,n),o}(e)&&(a=0,r=s.length),i._chart=this.chart,i._datasetIndex=this.index,i._decimated=!!n._decimated,i.points=s;const l=this.resolveDatasetElementOptions(t);this.options.showLine||(l.borderWidth=0),l.segment=this.options.segment,this.updateElement(i,void 0,{animated:!o,options:l},t),this.updateElements(s,a,r,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a,_stacked:r,_dataset:l}=this._cachedMeta,{sharedOptions:h,includeOptions:c}=this._getSharedOptions(e,s),d=o.axis,u=a.axis,{spanGaps:f,segment:g}=this.options,p=Nt(f)?f:Number.POSITIVE_INFINITY,m=this.chart._animationsDisabled||n||"none"===s;let b=e>0&&this.getParsed(e-1);for(let f=e;f<e+i;++f){const e=t[f],i=this.getParsed(f),x=m?e:{},_=U(i[u]),y=x[d]=o.getPixelForValue(i[d],f),v=x[u]=n||_?a.getBasePixel():a.getPixelForValue(r?this.applyStack(a,i,r):i[u],f);x.skip=isNaN(y)||isNaN(v)||_,x.stop=f>0&&Math.abs(i[d]-b[d])>p,g&&(x.parsed=i,x.raw=l.data[f]),c&&(x.options=h||this.resolveDataElementOptions(f,e.active?"active":s)),m||this.updateElement(e,f,x,s),b=i}}getMaxOverflow(){const t=this._cachedMeta,e=t.dataset,i=e.options&&e.options.borderWidth||0,s=t.data||[];if(!s.length)return i;const n=s[0].size(this.resolveDataElementOptions(0)),o=s[s.length-1].size(this.resolveDataElementOptions(s.length-1));return Math.max(i,n,o)/2}draw(){const t=this._cachedMeta;t.dataset.updateControlPoints(this.chart.chartArea,t.iScale.axis),super.draw()}}Tn.id="line",Tn.defaults={datasetElementType:"line",dataElementType:"point",showLine:!0,spanGaps:!1},Tn.overrides={scales:{_index_:{type:"category"},_value_:{type:"linear"}}};class Ln extends Os{constructor(t,e){super(t,e),this.innerRadius=void 0,this.outerRadius=void 0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=oi(e._parsed[t].r,i.options.locale);return{label:s[t]||"",value:n}}parseObjectData(t,e,i,s){return He.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta.data;this._updateRadius(),this.updateElements(e,0,e.length,t)}getMinMax(){const t=this._cachedMeta,e={min:Number.POSITIVE_INFINITY,max:Number.NEGATIVE_INFINITY};return t.data.forEach(((t,i)=>{const s=this.getParsed(i).r;!isNaN(s)&&this.chart.getDataVisibility(i)&&(s<e.min&&(e.min=s),s>e.max&&(e.max=s))})),e}_updateRadius(){const t=this.chart,e=t.chartArea,i=t.options,s=Math.min(e.right-e.left,e.bottom-e.top),n=Math.max(s/2,0),o=(n-Math.max(i.cutoutPercentage?n/100*i.cutoutPercentage:1,0))/t.getVisibleDatasetCount();this.outerRadius=n-o*this.index,this.innerRadius=this.outerRadius-o}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.options.animation,r=this._cachedMeta.rScale,l=r.xCenter,h=r.yCenter,c=r.getIndexAngle(0)-.5*Ot;let d,u=c;const f=360/this.countVisibleElements();for(d=0;d<e;++d)u+=this._computeAngle(d,s,f);for(d=e;d<e+i;d++){const e=t[d];let i=u,g=u+this._computeAngle(d,s,f),p=o.getDataVisibility(d)?r.getDistanceFromCenterForValue(this.getParsed(d).r):0;u=g,n&&(a.animateScale&&(p=0),a.animateRotate&&(i=g=c));const m={x:l,y:h,innerRadius:0,outerRadius:p,startAngle:i,endAngle:g,options:this.resolveDataElementOptions(d,e.active?"active":s)};this.updateElement(e,d,m,s)}}countVisibleElements(){const t=this._cachedMeta;let e=0;return t.data.forEach(((t,i)=>{!isNaN(this.getParsed(i).r)&&this.chart.getDataVisibility(i)&&e++})),e}_computeAngle(t,e,i){return this.chart.getDataVisibility(t)?Yt(this.resolveDataElementOptions(t,e).angle||i):0}}Ln.id="polarArea",Ln.defaults={dataElementType:"arc",animation:{animateRotate:!0,animateScale:!0},animations:{numbers:{type:"number",properties:["x","y","startAngle","endAngle","innerRadius","outerRadius"]}},indexAxis:"r",startAngle:0},Ln.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label:t=>t.chart.data.labels[t.dataIndex]+": "+t.formattedValue}}},scales:{r:{type:"radialLinear",angleLines:{display:!1},beginAtZero:!0,grid:{circular:!0},pointLabels:{display:!1},startAngle:0}}};class Rn extends An{}Rn.id="pie",Rn.defaults={cutout:0,rotation:0,circumference:360,radius:"100%"};class En extends Os{getLabelAndValue(t){const e=this._cachedMeta.vScale,i=this.getParsed(t);return{label:e.getLabels()[t],value:""+e.getLabelForValue(i[e.axis])}}parseObjectData(t,e,i,s){return He.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta,i=e.dataset,s=e.data||[],n=e.iScale.getLabels();if(i.points=s,"resize"!==t){const e=this.resolveDatasetElementOptions(t);this.options.showLine||(e.borderWidth=0);const o={_loop:!0,_fullLoop:n.length===s.length,options:e};this.updateElement(i,void 0,o,t)}this.updateElements(s,0,s.length,t)}updateElements(t,e,i,s){const n=this._cachedMeta.rScale,o="reset"===s;for(let a=e;a<e+i;a++){const e=t[a],i=this.resolveDataElementOptions(a,e.active?"active":s),r=n.getPointPositionForValue(a,this.getParsed(a).r),l=o?n.xCenter:r.x,h=o?n.yCenter:r.y,c={x:l,y:h,angle:r.angle,skip:isNaN(l)||isNaN(h),options:i};this.updateElement(e,a,c,s)}}}En.id="radar",En.defaults={datasetElementType:"line",dataElementType:"point",indexAxis:"r",showLine:!0,elements:{line:{fill:"start"}}},En.overrides={aspectRatio:1,scales:{r:{type:"radialLinear"}}};class In extends Tn{}In.id="scatter",In.defaults={showLine:!1,fill:!1},In.overrides={interaction:{mode:"point"},plugins:{tooltip:{callbacks:{title:()=>"",label:t=>"("+t.label+", "+t.formattedValue+")"}}},scales:{x:{type:"linear"},y:{type:"linear"}}};var zn=Object.freeze({__proto__:null,BarController:Cn,BubbleController:On,DoughnutController:An,LineController:Tn,PolarAreaController:Ln,PieController:Rn,RadarController:En,ScatterController:In});function Fn(t,e,i){const{startAngle:s,pixelMargin:n,x:o,y:a,outerRadius:r,innerRadius:l}=e;let h=n/r;t.beginPath(),t.arc(o,a,r,s-h,i+h),l>n?(h=n/l,t.arc(o,a,l,i+h,s-h,!0)):t.arc(o,a,n,i+Et,s-Et),t.closePath(),t.clip()}function Bn(t,e,i,s){const n=hi(t.options.borderRadius,["outerStart","outerEnd","innerStart","innerEnd"]);const o=(i-e)/2,a=Math.min(o,s*e/2),r=t=>{const e=(i-Math.min(o,t))*s/2;return Qt(t,0,Math.min(o,e))};return{outerStart:r(n.outerStart),outerEnd:r(n.outerEnd),innerStart:Qt(n.innerStart,0,a),innerEnd:Qt(n.innerEnd,0,a)}}function Vn(t,e,i,s){return{x:i+t*Math.cos(e),y:s+t*Math.sin(e)}}function Wn(t,e,i,s,n){const{x:o,y:a,startAngle:r,pixelMargin:l,innerRadius:h}=e,c=Math.max(e.outerRadius+s+i-l,0),d=h>0?h+s+i+l:0;let u=0;const f=n-r;if(s){const t=((h>0?h-s:0)+(c>0?c-s:0))/2;u=(f-(0!==t?f*t/(t+s):f))/2}const g=(f-Math.max(.001,f*c-i/Ot)/c)/2,p=r+g+u,m=n-g-u,{outerStart:b,outerEnd:x,innerStart:_,innerEnd:y}=Bn(e,d,c,m-p),v=c-b,w=c-x,M=p+b/v,k=m-x/w,S=d+_,P=d+y,D=p+_/S,C=m-y/P;if(t.beginPath(),t.arc(o,a,c,M,k),x>0){const e=Vn(w,k,o,a);t.arc(e.x,e.y,x,k,m+Et)}const O=Vn(P,m,o,a);if(t.lineTo(O.x,O.y),y>0){const e=Vn(P,C,o,a);t.arc(e.x,e.y,y,m+Et,C+Math.PI)}if(t.arc(o,a,d,m-y/d,p+_/d,!0),_>0){const e=Vn(S,D,o,a);t.arc(e.x,e.y,_,D+Math.PI,p-Et)}const A=Vn(v,p,o,a);if(t.lineTo(A.x,A.y),b>0){const e=Vn(v,M,o,a);t.arc(e.x,e.y,b,p-Et,M)}t.closePath()}function Nn(t,e,i,s,n){const{options:o}=e,{borderWidth:a,borderJoinStyle:r}=o,l="inner"===o.borderAlign;a&&(l?(t.lineWidth=2*a,t.lineJoin=r||"round"):(t.lineWidth=a,t.lineJoin=r||"bevel"),e.fullCircles&&function(t,e,i){const{x:s,y:n,startAngle:o,pixelMargin:a,fullCircles:r}=e,l=Math.max(e.outerRadius-a,0),h=e.innerRadius+a;let c;for(i&&Fn(t,e,o+At),t.beginPath(),t.arc(s,n,h,o+At,o,!0),c=0;c<r;++c)t.stroke();for(t.beginPath(),t.arc(s,n,l,o,o+At),c=0;c<r;++c)t.stroke()}(t,e,l),l&&Fn(t,e,n),Wn(t,e,i,s,n),t.stroke())}class jn extends As{constructor(t){super(),this.options=void 0,this.circumference=void 0,this.startAngle=void 0,this.endAngle=void 0,this.innerRadius=void 0,this.outerRadius=void 0,this.pixelMargin=0,this.fullCircles=0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.getProps(["x","y"],i),{angle:n,distance:o}=qt(s,{x:t,y:e}),{startAngle:a,endAngle:r,innerRadius:l,outerRadius:h,circumference:c}=this.getProps(["startAngle","endAngle","innerRadius","outerRadius","circumference"],i),d=this.options.spacing/2,u=Z(c,r-a)>=At||Jt(n,a,r),f=ee(o,l+d,h+d);return u&&f}getCenterPoint(t){const{x:e,y:i,startAngle:s,endAngle:n,innerRadius:o,outerRadius:a}=this.getProps(["x","y","startAngle","endAngle","innerRadius","outerRadius","circumference"],t),{offset:r,spacing:l}=this.options,h=(s+n)/2,c=(o+a+l+r)/2;return{x:e+Math.cos(h)*c,y:i+Math.sin(h)*c}}tooltipPosition(t){return this.getCenterPoint(t)}draw(t){const{options:e,circumference:i}=this,s=(e.offset||0)/2,n=(e.spacing||0)/2;if(this.pixelMargin="inner"===e.borderAlign?.33:0,this.fullCircles=i>At?Math.floor(i/At):0,0===i||this.innerRadius<0||this.outerRadius<0)return;t.save();let o=0;if(s){o=s/2;const e=(this.startAngle+this.endAngle)/2;t.translate(Math.cos(e)*o,Math.sin(e)*o),this.circumference>=Ot&&(o=s)}t.fillStyle=e.backgroundColor,t.strokeStyle=e.borderColor;const a=function(t,e,i,s){const{fullCircles:n,startAngle:o,circumference:a}=e;let r=e.endAngle;if(n){Wn(t,e,i,s,o+At);for(let e=0;e<n;++e)t.fill();isNaN(a)||(r=o+a%At,a%At==0&&(r+=At))}return Wn(t,e,i,s,r),t.fill(),r}(t,this,o,n);Nn(t,this,o,n,a),t.restore()}}function Hn(t,e,i=e){t.lineCap=Z(i.borderCapStyle,e.borderCapStyle),t.setLineDash(Z(i.borderDash,e.borderDash)),t.lineDashOffset=Z(i.borderDashOffset,e.borderDashOffset),t.lineJoin=Z(i.borderJoinStyle,e.borderJoinStyle),t.lineWidth=Z(i.borderWidth,e.borderWidth),t.strokeStyle=Z(i.borderColor,e.borderColor)}function $n(t,e,i){t.lineTo(i.x,i.y)}function Yn(t,e,i={}){const s=t.length,{start:n=0,end:o=s-1}=i,{start:a,end:r}=e,l=Math.max(n,a),h=Math.min(o,r),c=n<a&&o<a||n>r&&o>r;return{count:s,start:l,loop:e.loop,ilen:h<l&&!c?s+h-l:h-l}}function Un(t,e,i,s){const{points:n,options:o}=e,{count:a,start:r,loop:l,ilen:h}=Yn(n,i,s),c=function(t){return t.stepped?Se:t.tension||"monotone"===t.cubicInterpolationMode?Pe:$n}(o);let d,u,f,{move:g=!0,reverse:p}=s||{};for(d=0;d<=h;++d)u=n[(r+(p?h-d:d))%a],u.skip||(g?(t.moveTo(u.x,u.y),g=!1):c(t,f,u,p,o.stepped),f=u);return l&&(u=n[(r+(p?h:0))%a],c(t,f,u,p,o.stepped)),!!l}function Xn(t,e,i,s){const n=e.points,{count:o,start:a,ilen:r}=Yn(n,i,s),{move:l=!0,reverse:h}=s||{};let c,d,u,f,g,p,m=0,b=0;const x=t=>(a+(h?r-t:t))%o,_=()=>{f!==g&&(t.lineTo(m,g),t.lineTo(m,f),t.lineTo(m,p))};for(l&&(d=n[x(0)],t.moveTo(d.x,d.y)),c=0;c<=r;++c){if(d=n[x(c)],d.skip)continue;const e=d.x,i=d.y,s=0|e;s===u?(i<f?f=i:i>g&&(g=i),m=(b*m+e)/++b):(_(),t.lineTo(e,i),u=s,b=0,f=g=i),p=i}_()}function qn(t){const e=t.options,i=e.borderDash&&e.borderDash.length;return!(t._decimated||t._loop||e.tension||"monotone"===e.cubicInterpolationMode||e.stepped||i)?Xn:Un}jn.id="arc",jn.defaults={borderAlign:"center",borderColor:"#fff",borderJoinStyle:void 0,borderRadius:0,borderWidth:2,offset:0,spacing:0,angle:void 0},jn.defaultRoutes={backgroundColor:"backgroundColor"};const Kn="function"==typeof Path2D;function Gn(t,e,i,s){Kn&&!e.options.segment?function(t,e,i,s){let n=e._path;n||(n=e._path=new Path2D,e.path(n,i,s)&&n.closePath()),Hn(t,e.options),t.stroke(n)}(t,e,i,s):function(t,e,i,s){const{segments:n,options:o}=e,a=qn(e);for(const r of n)Hn(t,o,r.style),t.beginPath(),a(t,e,r,{start:i,end:i+s-1})&&t.closePath(),t.stroke()}(t,e,i,s)}class Zn extends As{constructor(t){super(),this.animated=!0,this.options=void 0,this._chart=void 0,this._loop=void 0,this._fullLoop=void 0,this._path=void 0,this._points=void 0,this._segments=void 0,this._decimated=!1,this._pointsUpdated=!1,this._datasetIndex=void 0,t&&Object.assign(this,t)}updateControlPoints(t,e){const i=this.options;if((i.tension||"monotone"===i.cubicInterpolationMode)&&!i.stepped&&!this._pointsUpdated){const s=i.spanGaps?this._loop:this._fullLoop;Ge(this._points,i,t,s,e),this._pointsUpdated=!0}}set points(t){this._points=t,delete this._segments,delete this._path,this._pointsUpdated=!1}get points(){return this._points}get segments(){return this._segments||(this._segments=ki(this,this.options.segment))}first(){const t=this.segments,e=this.points;return t.length&&e[t[0].start]}last(){const t=this.segments,e=this.points,i=t.length;return i&&e[t[i-1].end]}interpolate(t,e){const i=this.options,s=t[e],n=this.points,o=Mi(this,{property:e,start:s,end:s});if(!o.length)return;const a=[],r=function(t){return t.stepped?ii:t.tension||"monotone"===t.cubicInterpolationMode?si:ei}(i);let l,h;for(l=0,h=o.length;l<h;++l){const{start:h,end:c}=o[l],d=n[h],u=n[c];if(d===u){a.push(d);continue}const f=r(d,u,Math.abs((s-d[e])/(u[e]-d[e])),i.stepped);f[e]=t[e],a.push(f)}return 1===a.length?a[0]:a}pathSegment(t,e,i){return qn(this)(t,this,e,i)}path(t,e,i){const s=this.segments,n=qn(this);let o=this._loop;e=e||0,i=i||this.points.length-e;for(const a of s)o&=n(t,this,a,{start:e,end:e+i-1});return!!o}draw(t,e,i,s){const n=this.options||{};(this.points||[]).length&&n.borderWidth&&(t.save(),Gn(t,this,i,s),t.restore()),this.animated&&(this._pointsUpdated=!1,this._path=void 0)}}function Jn(t,e,i,s){const n=t.options,{[i]:o}=t.getProps([i],s);return Math.abs(e-o)<n.radius+n.hitRadius}Zn.id="line",Zn.defaults={borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",borderWidth:3,capBezierPoints:!0,cubicInterpolationMode:"default",fill:!1,spanGaps:!1,stepped:!1,tension:0},Zn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"},Zn.descriptors={_scriptable:!0,_indexable:t=>"borderDash"!==t&&"fill"!==t};class Qn extends As{constructor(t){super(),this.options=void 0,this.parsed=void 0,this.skip=void 0,this.stop=void 0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.options,{x:n,y:o}=this.getProps(["x","y"],i);return Math.pow(t-n,2)+Math.pow(e-o,2)<Math.pow(s.hitRadius+s.radius,2)}inXRange(t,e){return Jn(this,t,"x",e)}inYRange(t,e){return Jn(this,t,"y",e)}getCenterPoint(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}size(t){let e=(t=t||this.options||{}).radius||0;e=Math.max(e,e&&t.hoverRadius||0);return 2*(e+(e&&t.borderWidth||0))}draw(t,e){const i=this.options;this.skip||i.radius<.1||!we(this,e,this.size(i)/2)||(t.strokeStyle=i.borderColor,t.lineWidth=i.borderWidth,t.fillStyle=i.backgroundColor,ye(t,i,this.x,this.y))}getRange(){const t=this.options||{};return t.radius+t.hitRadius}}function to(t,e){const{x:i,y:s,base:n,width:o,height:a}=t.getProps(["x","y","base","width","height"],e);let r,l,h,c,d;return t.horizontal?(d=a/2,r=Math.min(i,n),l=Math.max(i,n),h=s-d,c=s+d):(d=o/2,r=i-d,l=i+d,h=Math.min(s,n),c=Math.max(s,n)),{left:r,top:h,right:l,bottom:c}}function eo(t,e,i,s){return t?0:Qt(e,i,s)}function io(t){const e=to(t),i=e.right-e.left,s=e.bottom-e.top,n=function(t,e,i){const s=t.options.borderWidth,n=t.borderSkipped,o=ci(s);return{t:eo(n.top,o.top,0,i),r:eo(n.right,o.right,0,e),b:eo(n.bottom,o.bottom,0,i),l:eo(n.left,o.left,0,e)}}(t,i/2,s/2),o=function(t,e,i){const{enableBorderRadius:s}=t.getProps(["enableBorderRadius"]),n=t.options.borderRadius,o=di(n),a=Math.min(e,i),r=t.borderSkipped,l=s||q(n);return{topLeft:eo(!l||r.top||r.left,o.topLeft,0,a),topRight:eo(!l||r.top||r.right,o.topRight,0,a),bottomLeft:eo(!l||r.bottom||r.left,o.bottomLeft,0,a),bottomRight:eo(!l||r.bottom||r.right,o.bottomRight,0,a)}}(t,i/2,s/2);return{outer:{x:e.left,y:e.top,w:i,h:s,radius:o},inner:{x:e.left+n.l,y:e.top+n.t,w:i-n.l-n.r,h:s-n.t-n.b,radius:{topLeft:Math.max(0,o.topLeft-Math.max(n.t,n.l)),topRight:Math.max(0,o.topRight-Math.max(n.t,n.r)),bottomLeft:Math.max(0,o.bottomLeft-Math.max(n.b,n.l)),bottomRight:Math.max(0,o.bottomRight-Math.max(n.b,n.r))}}}}function so(t,e,i,s){const n=null===e,o=null===i,a=t&&!(n&&o)&&to(t,s);return a&&(n||ee(e,a.left,a.right))&&(o||ee(i,a.top,a.bottom))}function no(t,e){t.rect(e.x,e.y,e.w,e.h)}function oo(t,e,i={}){const s=t.x!==i.x?-e:0,n=t.y!==i.y?-e:0,o=(t.x+t.w!==i.x+i.w?e:0)-s,a=(t.y+t.h!==i.y+i.h?e:0)-n;return{x:t.x+s,y:t.y+n,w:t.w+o,h:t.h+a,radius:t.radius}}Qn.id="point",Qn.defaults={borderWidth:1,hitRadius:1,hoverBorderWidth:1,hoverRadius:4,pointStyle:"circle",radius:3,rotation:0},Qn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};class ao extends As{constructor(t){super(),this.options=void 0,this.horizontal=void 0,this.base=void 0,this.width=void 0,this.height=void 0,this.inflateAmount=void 0,t&&Object.assign(this,t)}draw(t){const{inflateAmount:e,options:{borderColor:i,backgroundColor:s}}=this,{inner:n,outer:o}=io(this),a=(r=o.radius).topLeft||r.topRight||r.bottomLeft||r.bottomRight?Oe:no;var r;t.save(),o.w===n.w&&o.h===n.h||(t.beginPath(),a(t,oo(o,e,n)),t.clip(),a(t,oo(n,-e,o)),t.fillStyle=i,t.fill("evenodd")),t.beginPath(),a(t,oo(n,e)),t.fillStyle=s,t.fill(),t.restore()}inRange(t,e,i){return so(this,t,e,i)}inXRange(t,e){return so(this,t,null,e)}inYRange(t,e){return so(this,null,t,e)}getCenterPoint(t){const{x:e,y:i,base:s,horizontal:n}=this.getProps(["x","y","base","horizontal"],t);return{x:n?(e+s)/2:e,y:n?i:(i+s)/2}}getRange(t){return"x"===t?this.width/2:this.height/2}}ao.id="bar",ao.defaults={borderSkipped:"start",borderWidth:0,borderRadius:0,inflateAmount:"auto",pointStyle:void 0},ao.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};var ro=Object.freeze({__proto__:null,ArcElement:jn,LineElement:Zn,PointElement:Qn,BarElement:ao});function lo(t){if(t._decimated){const e=t._data;delete t._decimated,delete t._data,Object.defineProperty(t,"data",{value:e})}}function ho(t){t.data.datasets.forEach((t=>{lo(t)}))}var co={id:"decimation",defaults:{algorithm:"min-max",enabled:!1},beforeElementsUpdate:(t,e,i)=>{if(!i.enabled)return void ho(t);const s=t.width;t.data.datasets.forEach(((e,n)=>{const{_data:o,indexAxis:a}=e,r=t.getDatasetMeta(n),l=o||e.data;if("y"===gi([a,t.options.indexAxis]))return;if(!r.controller.supportsDecimation)return;const h=t.scales[r.xAxisID];if("linear"!==h.type&&"time"!==h.type)return;if(t.options.parsing)return;let{start:c,count:d}=function(t,e){const i=e.length;let s,n=0;const{iScale:o}=t,{min:a,max:r,minDefined:l,maxDefined:h}=o.getUserBounds();return l&&(n=Qt(wt(e,o.axis,a).lo,0,i-1)),s=h?Qt(wt(e,o.axis,r).hi+1,n,i)-n:i-n,{start:n,count:s}}(r,l);if(d<=(i.threshold||4*s))return void lo(e);let u;switch(U(o)&&(e._data=l,delete e.data,Object.defineProperty(e,"data",{configurable:!0,enumerable:!0,get:function(){return this._decimated},set:function(t){this._data=t}})),i.algorithm){case"lttb":u=function(t,e,i,s,n){const o=n.samples||s;if(o>=i)return t.slice(e,e+i);const a=[],r=(i-2)/(o-2);let l=0;const h=e+i-1;let c,d,u,f,g,p=e;for(a[l++]=t[p],c=0;c<o-2;c++){let s,n=0,o=0;const h=Math.floor((c+1)*r)+1+e,m=Math.min(Math.floor((c+2)*r)+1,i)+e,b=m-h;for(s=h;s<m;s++)n+=t[s].x,o+=t[s].y;n/=b,o/=b;const x=Math.floor(c*r)+1+e,_=Math.min(Math.floor((c+1)*r)+1,i)+e,{x:y,y:v}=t[p];for(u=f=-1,s=x;s<_;s++)f=.5*Math.abs((y-n)*(t[s].y-v)-(y-t[s].x)*(o-v)),f>u&&(u=f,d=t[s],g=s);a[l++]=d,p=g}return a[l++]=t[h],a}(l,c,d,s,i);break;case"min-max":u=function(t,e,i,s){let n,o,a,r,l,h,c,d,u,f,g=0,p=0;const m=[],b=e+i-1,x=t[e].x,_=t[b].x-x;for(n=e;n<e+i;++n){o=t[n],a=(o.x-x)/_*s,r=o.y;const e=0|a;if(e===l)r<u?(u=r,h=n):r>f&&(f=r,c=n),g=(p*g+o.x)/++p;else{const i=n-1;if(!U(h)&&!U(c)){const e=Math.min(h,c),s=Math.max(h,c);e!==d&&e!==i&&m.push({...t[e],x:g}),s!==d&&s!==i&&m.push({...t[s],x:g})}n>0&&i!==d&&m.push(t[i]),m.push(o),l=e,p=0,u=f=r,h=c=d=n}}return m}(l,c,d,s);break;default:throw new Error(`Unsupported decimation algorithm '${i.algorithm}'`)}e._decimated=u}))},destroy(t){ho(t)}};function uo(t,e,i,s){if(s)return;let n=e[t],o=i[t];return"angle"===t&&(n=Zt(n),o=Zt(o)),{property:t,start:n,end:o}}function fo(t,e,i){for(;e>t;e--){const t=i[e];if(!isNaN(t.x)&&!isNaN(t.y))break}return e}function go(t,e,i,s){return t&&e?s(t[i],e[i]):t?t[i]:e?e[i]:0}function po(t,e){let i=[],s=!1;return X(t)?(s=!0,i=t):i=function(t,e){const{x:i=null,y:s=null}=t||{},n=e.points,o=[];return e.segments.forEach((({start:t,end:e})=>{e=fo(t,e,n);const a=n[t],r=n[e];null!==s?(o.push({x:a.x,y:s}),o.push({x:r.x,y:s})):null!==i&&(o.push({x:i,y:a.y}),o.push({x:i,y:r.y}))})),o}(t,e),i.length?new Zn({points:i,options:{tension:0},_loop:s,_fullLoop:s}):null}function mo(t){return t&&!1!==t.fill}function bo(t,e,i){let s=t[e].fill;const n=[e];let o;if(!i)return s;for(;!1!==s&&-1===n.indexOf(s);){if(!K(s))return s;if(o=t[s],!o)return!1;if(o.visible)return s;n.push(s),s=o.fill}return!1}function xo(t,e,i){const s=function(t){const e=t.options,i=e.fill;let s=Z(i&&i.target,i);void 0===s&&(s=!!e.backgroundColor);if(!1===s||null===s)return!1;if(!0===s)return"origin";return s}(t);if(q(s))return!isNaN(s.value)&&s;let n=parseFloat(s);return K(n)&&Math.floor(n)===n?function(t,e,i,s){"-"!==t&&"+"!==t||(i=e+i);if(i===e||i<0||i>=s)return!1;return i}(s[0],e,n,i):["origin","start","end","stack","shape"].indexOf(s)>=0&&s}function _o(t,e,i){const s=[];for(let n=0;n<i.length;n++){const o=i[n],{first:a,last:r,point:l}=yo(o,e,"x");if(!(!l||a&&r))if(a)s.unshift(l);else if(t.push(l),!r)break}t.push(...s)}function yo(t,e,i){const s=t.interpolate(e,i);if(!s)return{};const n=s[i],o=t.segments,a=t.points;let r=!1,l=!1;for(let t=0;t<o.length;t++){const e=o[t],s=a[e.start][i],h=a[e.end][i];if(ee(n,s,h)){r=n===s,l=n===h;break}}return{first:r,last:l,point:s}}class vo{constructor(t){this.x=t.x,this.y=t.y,this.radius=t.radius}pathSegment(t,e,i){const{x:s,y:n,radius:o}=this;return e=e||{start:0,end:At},t.arc(s,n,o,e.end,e.start,!0),!i.bounds}interpolate(t){const{x:e,y:i,radius:s}=this,n=t.angle;return{x:e+Math.cos(n)*s,y:i+Math.sin(n)*s,angle:n}}}function wo(t){const{chart:e,fill:i,line:s}=t;if(K(i))return function(t,e){const i=t.getDatasetMeta(e);return i&&t.isDatasetVisible(e)?i.dataset:null}(e,i);if("stack"===i)return function(t){const{scale:e,index:i,line:s}=t,n=[],o=s.segments,a=s.points,r=function(t,e){const i=[],s=t.getMatchingVisibleMetas("line");for(let t=0;t<s.length;t++){const n=s[t];if(n.index===e)break;n.hidden||i.unshift(n.dataset)}return i}(e,i);r.push(po({x:null,y:e.bottom},s));for(let t=0;t<o.length;t++){const e=o[t];for(let t=e.start;t<=e.end;t++)_o(n,a[t],r)}return new Zn({points:n,options:{}})}(t);if("shape"===i)return!0;const n=function(t){if((t.scale||{}).getPointPositionForValue)return function(t){const{scale:e,fill:i}=t,s=e.options,n=e.getLabels().length,o=s.reverse?e.max:e.min,a=function(t,e,i){let s;return s="start"===t?i:"end"===t?e.options.reverse?e.min:e.max:q(t)?t.value:e.getBaseValue(),s}(i,e,o),r=[];if(s.grid.circular){const t=e.getPointPositionForValue(0,o);return new vo({x:t.x,y:t.y,radius:e.getDistanceFromCenterForValue(a)})}for(let t=0;t<n;++t)r.push(e.getPointPositionForValue(t,a));return r}(t);return function(t){const{scale:e={},fill:i}=t,s=function(t,e){let i=null;return"start"===t?i=e.bottom:"end"===t?i=e.top:q(t)?i=e.getPixelForValue(t.value):e.getBasePixel&&(i=e.getBasePixel()),i}(i,e);if(K(s)){const t=e.isHorizontal();return{x:t?s:null,y:t?null:s}}return null}(t)}(t);return n instanceof vo?n:po(n,s)}function Mo(t,e,i){const s=wo(e),{line:n,scale:o,axis:a}=e,r=n.options,l=r.fill,h=r.backgroundColor,{above:c=h,below:d=h}=l||{};s&&n.points.length&&(Me(t,i),function(t,e){const{line:i,target:s,above:n,below:o,area:a,scale:r}=e,l=i._loop?"angle":e.axis;t.save(),"x"===l&&o!==n&&(ko(t,s,a.top),So(t,{line:i,target:s,color:n,scale:r,property:l}),t.restore(),t.save(),ko(t,s,a.bottom));So(t,{line:i,target:s,color:o,scale:r,property:l}),t.restore()}(t,{line:n,target:s,above:c,below:d,area:i,scale:o,axis:a}),ke(t))}function ko(t,e,i){const{segments:s,points:n}=e;let o=!0,a=!1;t.beginPath();for(const r of s){const{start:s,end:l}=r,h=n[s],c=n[fo(s,l,n)];o?(t.moveTo(h.x,h.y),o=!1):(t.lineTo(h.x,i),t.lineTo(h.x,h.y)),a=!!e.pathSegment(t,r,{move:a}),a?t.closePath():t.lineTo(c.x,i)}t.lineTo(e.first().x,i),t.closePath(),t.clip()}function So(t,e){const{line:i,target:s,property:n,color:o,scale:a}=e,r=function(t,e,i){const s=t.segments,n=t.points,o=e.points,a=[];for(const t of s){let{start:s,end:r}=t;r=fo(s,r,n);const l=uo(i,n[s],n[r],t.loop);if(!e.segments){a.push({source:t,target:l,start:n[s],end:n[r]});continue}const h=Mi(e,l);for(const e of h){const s=uo(i,o[e.start],o[e.end],e.loop),r=wi(t,n,s);for(const t of r)a.push({source:t,target:e,start:{[i]:go(l,s,"start",Math.max)},end:{[i]:go(l,s,"end",Math.min)}})}}return a}(i,s,n);for(const{source:e,target:l,start:h,end:c}of r){const{style:{backgroundColor:r=o}={}}=e,d=!0!==s;t.save(),t.fillStyle=r,Po(t,a,d&&uo(n,h,c)),t.beginPath();const u=!!i.pathSegment(t,e);let f;if(d){u?t.closePath():Do(t,s,c,n);const e=!!s.pathSegment(t,l,{move:u,reverse:!0});f=u&&e,f||Do(t,s,h,n)}t.closePath(),t.fill(f?"evenodd":"nonzero"),t.restore()}}function Po(t,e,i){const{top:s,bottom:n}=e.chart.chartArea,{property:o,start:a,end:r}=i||{};"x"===o&&(t.beginPath(),t.rect(a,s,r-a,n-s),t.clip())}function Do(t,e,i,s){const n=e.interpolate(i,s);n&&t.lineTo(n.x,n.y)}var Co={id:"filler",afterDatasetsUpdate(t,e,i){const s=(t.data.datasets||[]).length,n=[];let o,a,r,l;for(a=0;a<s;++a)o=t.getDatasetMeta(a),r=o.dataset,l=null,r&&r.options&&r instanceof Zn&&(l={visible:t.isDatasetVisible(a),index:a,fill:xo(r,a,s),chart:t,axis:o.controller.options.indexAxis,scale:o.vScale,line:r}),o.$filler=l,n.push(l);for(a=0;a<s;++a)l=n[a],l&&!1!==l.fill&&(l.fill=bo(n,a,i.propagate))},beforeDraw(t,e,i){const s="beforeDraw"===i.drawTime,n=t.getSortedVisibleDatasetMetas(),o=t.chartArea;for(let e=n.length-1;e>=0;--e){const i=n[e].$filler;i&&(i.line.updateControlPoints(o,i.axis),s&&i.fill&&Mo(t.ctx,i,o))}},beforeDatasetsDraw(t,e,i){if("beforeDatasetsDraw"!==i.drawTime)return;const s=t.getSortedVisibleDatasetMetas();for(let e=s.length-1;e>=0;--e){const i=s[e].$filler;mo(i)&&Mo(t.ctx,i,t.chartArea)}},beforeDatasetDraw(t,e,i){const s=e.meta.$filler;mo(s)&&"beforeDatasetDraw"===i.drawTime&&Mo(t.ctx,s,t.chartArea)},defaults:{propagate:!0,drawTime:"beforeDatasetDraw"}};const Oo=(t,e)=>{let{boxHeight:i=e,boxWidth:s=e}=t;return t.usePointStyle&&(i=Math.min(i,e),s=t.pointStyleWidth||Math.min(s,e)),{boxWidth:s,boxHeight:i,itemHeight:Math.max(e,i)}};class Ao extends As{constructor(t){super(),this._added=!1,this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1,this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this.legendItems=void 0,this.columnSizes=void 0,this.lineWidths=void 0,this.maxHeight=void 0,this.maxWidth=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.height=void 0,this.width=void 0,this._margins=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e,i){this.maxWidth=t,this.maxHeight=e,this._margins=i,this.setDimensions(),this.buildLabels(),this.fit()}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=this._margins.left,this.right=this.width):(this.height=this.maxHeight,this.top=this._margins.top,this.bottom=this.height)}buildLabels(){const t=this.options.labels||{};let e=tt(t.generateLabels,[this.chart],this)||[];t.filter&&(e=e.filter((e=>t.filter(e,this.chart.data)))),t.sort&&(e=e.sort(((e,i)=>t.sort(e,i,this.chart.data)))),this.options.reverse&&e.reverse(),this.legendItems=e}fit(){const{options:t,ctx:e}=this;if(!t.display)return void(this.width=this.height=0);const i=t.labels,s=fi(i.font),n=s.size,o=this._computeTitleHeight(),{boxWidth:a,itemHeight:r}=Oo(i,n);let l,h;e.font=s.string,this.isHorizontal()?(l=this.maxWidth,h=this._fitRows(o,n,a,r)+10):(h=this.maxHeight,l=this._fitCols(o,n,a,r)+10),this.width=Math.min(l,t.maxWidth||this.maxWidth),this.height=Math.min(h,t.maxHeight||this.maxHeight)}_fitRows(t,e,i,s){const{ctx:n,maxWidth:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.lineWidths=[0],h=s+a;let c=t;n.textAlign="left",n.textBaseline="middle";let d=-1,u=-h;return this.legendItems.forEach(((t,f)=>{const g=i+e/2+n.measureText(t.text).width;(0===f||l[l.length-1]+g+2*a>o)&&(c+=h,l[l.length-(f>0?0:1)]=0,u+=h,d++),r[f]={left:0,top:u,row:d,width:g,height:s},l[l.length-1]+=g+a})),c}_fitCols(t,e,i,s){const{ctx:n,maxHeight:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.columnSizes=[],h=o-t;let c=a,d=0,u=0,f=0,g=0;return this.legendItems.forEach(((t,o)=>{const p=i+e/2+n.measureText(t.text).width;o>0&&u+s+2*a>h&&(c+=d+a,l.push({width:d,height:u}),f+=d+a,g++,d=u=0),r[o]={left:f,top:u,col:g,width:p,height:s},d=Math.max(d,p),u+=s+a})),c+=d,l.push({width:d,height:u}),c}adjustHitBoxes(){if(!this.options.display)return;const t=this._computeTitleHeight(),{legendHitBoxes:e,options:{align:i,labels:{padding:s},rtl:o}}=this,a=bi(o,this.left,this.width);if(this.isHorizontal()){let o=0,r=n(i,this.left+s,this.right-this.lineWidths[o]);for(const l of e)o!==l.row&&(o=l.row,r=n(i,this.left+s,this.right-this.lineWidths[o])),l.top+=this.top+t+s,l.left=a.leftForLtr(a.x(r),l.width),r+=l.width+s}else{let o=0,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height);for(const l of e)l.col!==o&&(o=l.col,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height)),l.top=r,l.left+=this.left+s,l.left=a.leftForLtr(a.x(l.left),l.width),r+=l.height+s}}isHorizontal(){return"top"===this.options.position||"bottom"===this.options.position}draw(){if(this.options.display){const t=this.ctx;Me(t,this),this._draw(),ke(t)}}_draw(){const{options:t,columnSizes:e,lineWidths:i,ctx:s}=this,{align:a,labels:r}=t,l=yt.color,h=bi(t.rtl,this.left,this.width),c=fi(r.font),{color:d,padding:u}=r,f=c.size,g=f/2;let p;this.drawTitle(),s.textAlign=h.textAlign("left"),s.textBaseline="middle",s.lineWidth=.5,s.font=c.string;const{boxWidth:m,boxHeight:b,itemHeight:x}=Oo(r,f),_=this.isHorizontal(),y=this._computeTitleHeight();p=_?{x:n(a,this.left+u,this.right-i[0]),y:this.top+u+y,line:0}:{x:this.left+u,y:n(a,this.top+y+u,this.bottom-e[0].height),line:0},xi(this.ctx,t.textDirection);const v=x+u;this.legendItems.forEach(((w,M)=>{s.strokeStyle=w.fontColor||d,s.fillStyle=w.fontColor||d;const k=s.measureText(w.text).width,S=h.textAlign(w.textAlign||(w.textAlign=r.textAlign)),P=m+g+k;let D=p.x,C=p.y;h.setWidth(this.width),_?M>0&&D+P+u>this.right&&(C=p.y+=v,p.line++,D=p.x=n(a,this.left+u,this.right-i[p.line])):M>0&&C+v>this.bottom&&(D=p.x=D+e[p.line].width+u,p.line++,C=p.y=n(a,this.top+y+u,this.bottom-e[p.line].height));!function(t,e,i){if(isNaN(m)||m<=0||isNaN(b)||b<0)return;s.save();const n=Z(i.lineWidth,1);if(s.fillStyle=Z(i.fillStyle,l),s.lineCap=Z(i.lineCap,"butt"),s.lineDashOffset=Z(i.lineDashOffset,0),s.lineJoin=Z(i.lineJoin,"miter"),s.lineWidth=n,s.strokeStyle=Z(i.strokeStyle,l),s.setLineDash(Z(i.lineDash,[])),r.usePointStyle){const o={radius:b*Math.SQRT2/2,pointStyle:i.pointStyle,rotation:i.rotation,borderWidth:n},a=h.xPlus(t,m/2);ve(s,o,a,e+g,m)}else{const o=e+Math.max((f-b)/2,0),a=h.leftForLtr(t,m),r=di(i.borderRadius);s.beginPath(),Object.values(r).some((t=>0!==t))?Oe(s,{x:a,y:o,w:m,h:b,radius:r}):s.rect(a,o,m,b),s.fill(),0!==n&&s.stroke()}s.restore()}(h.x(D),C,w),D=o(S,D+m+g,_?D+P:this.right,t.rtl),function(t,e,i){De(s,i.text,t,e+x/2,c,{strikethrough:i.hidden,textAlign:h.textAlign(i.textAlign)})}(h.x(D),C,w),_?p.x+=P+u:p.y+=v})),_i(this.ctx,t.textDirection)}drawTitle(){const t=this.options,e=t.title,i=fi(e.font),o=ui(e.padding);if(!e.display)return;const a=bi(t.rtl,this.left,this.width),r=this.ctx,l=e.position,h=i.size/2,c=o.top+h;let d,u=this.left,f=this.width;if(this.isHorizontal())f=Math.max(...this.lineWidths),d=this.top+c,u=n(t.align,u,this.right-f);else{const e=this.columnSizes.reduce(((t,e)=>Math.max(t,e.height)),0);d=c+n(t.align,this.top,this.bottom-e-t.labels.padding-this._computeTitleHeight())}const g=n(l,u,u+f);r.textAlign=a.textAlign(s(l)),r.textBaseline="middle",r.strokeStyle=e.color,r.fillStyle=e.color,r.font=i.string,De(r,e.text,g,d,i)}_computeTitleHeight(){const t=this.options.title,e=fi(t.font),i=ui(t.padding);return t.display?e.lineHeight+i.height:0}_getLegendItemAt(t,e){let i,s,n;if(ee(t,this.left,this.right)&&ee(e,this.top,this.bottom))for(n=this.legendHitBoxes,i=0;i<n.length;++i)if(s=n[i],ee(t,s.left,s.left+s.width)&&ee(e,s.top,s.top+s.height))return this.legendItems[i];return null}handleEvent(t){const e=this.options;if(!function(t,e){if(("mousemove"===t||"mouseout"===t)&&(e.onHover||e.onLeave))return!0;if(e.onClick&&("click"===t||"mouseup"===t))return!0;return!1}(t.type,e))return;const i=this._getLegendItemAt(t.x,t.y);if("mousemove"===t.type||"mouseout"===t.type){const o=this._hoveredItem,a=(n=i,null!==(s=o)&&null!==n&&s.datasetIndex===n.datasetIndex&&s.index===n.index);o&&!a&&tt(e.onLeave,[t,o,this],this),this._hoveredItem=i,i&&!a&&tt(e.onHover,[t,i,this],this)}else i&&tt(e.onClick,[t,i,this],this);var s,n}}var To={id:"legend",_element:Ao,start(t,e,i){const s=t.legend=new Ao({ctx:t.ctx,options:i,chart:t});qi.configure(t,s,i),qi.addBox(t,s)},stop(t){qi.removeBox(t,t.legend),delete t.legend},beforeUpdate(t,e,i){const s=t.legend;qi.configure(t,s,i),s.options=i},afterUpdate(t){const e=t.legend;e.buildLabels(),e.adjustHitBoxes()},afterEvent(t,e){e.replay||t.legend.handleEvent(e.event)},defaults:{display:!0,position:"top",align:"center",fullSize:!0,reverse:!1,weight:1e3,onClick(t,e,i){const s=e.datasetIndex,n=i.chart;n.isDatasetVisible(s)?(n.hide(s),e.hidden=!0):(n.show(s),e.hidden=!1)},onHover:null,onLeave:null,labels:{color:t=>t.chart.options.color,boxWidth:40,padding:10,generateLabels(t){const e=t.data.datasets,{labels:{usePointStyle:i,pointStyle:s,textAlign:n,color:o}}=t.legend.options;return t._getSortedDatasetMetas().map((t=>{const a=t.controller.getStyle(i?0:void 0),r=ui(a.borderWidth);return{text:e[t.index].label,fillStyle:a.backgroundColor,fontColor:o,hidden:!t.visible,lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:(r.width+r.height)/4,strokeStyle:a.borderColor,pointStyle:s||a.pointStyle,rotation:a.rotation,textAlign:n||a.textAlign,borderRadius:0,datasetIndex:t.index}}),this)}},title:{color:t=>t.chart.options.color,display:!1,position:"center",text:""}},descriptors:{_scriptable:t=>!t.startsWith("on"),labels:{_scriptable:t=>!["generateLabels","filter","sort"].includes(t)}}};class Lo extends As{constructor(t){super(),this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this._padding=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e){const i=this.options;if(this.left=0,this.top=0,!i.display)return void(this.width=this.height=this.right=this.bottom=0);this.width=this.right=t,this.height=this.bottom=e;const s=X(i.text)?i.text.length:1;this._padding=ui(i.padding);const n=s*fi(i.font).lineHeight+this._padding.height;this.isHorizontal()?this.height=n:this.width=n}isHorizontal(){const t=this.options.position;return"top"===t||"bottom"===t}_drawArgs(t){const{top:e,left:i,bottom:s,right:o,options:a}=this,r=a.align;let l,h,c,d=0;return this.isHorizontal()?(h=n(r,i,o),c=e+t,l=o-i):("left"===a.position?(h=i+t,c=n(r,s,e),d=-.5*Ot):(h=o-t,c=n(r,e,s),d=.5*Ot),l=s-e),{titleX:h,titleY:c,maxWidth:l,rotation:d}}draw(){const t=this.ctx,e=this.options;if(!e.display)return;const i=fi(e.font),n=i.lineHeight/2+this._padding.top,{titleX:o,titleY:a,maxWidth:r,rotation:l}=this._drawArgs(n);De(t,e.text,0,0,i,{color:e.color,maxWidth:r,rotation:l,textAlign:s(e.align),textBaseline:"middle",translation:[o,a]})}}var Ro={id:"title",_element:Lo,start(t,e,i){!function(t,e){const i=new Lo({ctx:t.ctx,options:e,chart:t});qi.configure(t,i,e),qi.addBox(t,i),t.titleBlock=i}(t,i)},stop(t){const e=t.titleBlock;qi.removeBox(t,e),delete t.titleBlock},beforeUpdate(t,e,i){const s=t.titleBlock;qi.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"bold"},fullSize:!0,padding:10,position:"top",text:"",weight:2e3},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const Eo=new WeakMap;var Io={id:"subtitle",start(t,e,i){const s=new Lo({ctx:t.ctx,options:i,chart:t});qi.configure(t,s,i),qi.addBox(t,s),Eo.set(t,s)},stop(t){qi.removeBox(t,Eo.get(t)),Eo.delete(t)},beforeUpdate(t,e,i){const s=Eo.get(t);qi.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"normal"},fullSize:!0,padding:0,position:"top",text:"",weight:1500},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const zo={average(t){if(!t.length)return!1;let e,i,s=0,n=0,o=0;for(e=0,i=t.length;e<i;++e){const i=t[e].element;if(i&&i.hasValue()){const t=i.tooltipPosition();s+=t.x,n+=t.y,++o}}return{x:s/o,y:n/o}},nearest(t,e){if(!t.length)return!1;let i,s,n,o=e.x,a=e.y,r=Number.POSITIVE_INFINITY;for(i=0,s=t.length;i<s;++i){const s=t[i].element;if(s&&s.hasValue()){const t=Kt(e,s.getCenterPoint());t<r&&(r=t,n=s)}}if(n){const t=n.tooltipPosition();o=t.x,a=t.y}return{x:o,y:a}}};function Fo(t,e){return e&&(X(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Bo(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Vo(t,e){const{element:i,datasetIndex:s,index:n}=e,o=t.getDatasetMeta(s).controller,{label:a,value:r}=o.getLabelAndValue(n);return{chart:t,label:a,parsed:o.getParsed(n),raw:t.data.datasets[s].data[n],formattedValue:r,dataset:o.getDataset(),dataIndex:n,datasetIndex:s,element:i}}function Wo(t,e){const i=t.chart.ctx,{body:s,footer:n,title:o}=t,{boxWidth:a,boxHeight:r}=e,l=fi(e.bodyFont),h=fi(e.titleFont),c=fi(e.footerFont),d=o.length,u=n.length,f=s.length,g=ui(e.padding);let p=g.height,m=0,b=s.reduce(((t,e)=>t+e.before.length+e.lines.length+e.after.length),0);if(b+=t.beforeBody.length+t.afterBody.length,d&&(p+=d*h.lineHeight+(d-1)*e.titleSpacing+e.titleMarginBottom),b){p+=f*(e.displayColors?Math.max(r,l.lineHeight):l.lineHeight)+(b-f)*l.lineHeight+(b-1)*e.bodySpacing}u&&(p+=e.footerMarginTop+u*c.lineHeight+(u-1)*e.footerSpacing);let x=0;const _=function(t){m=Math.max(m,i.measureText(t).width+x)};return i.save(),i.font=h.string,et(t.title,_),i.font=l.string,et(t.beforeBody.concat(t.afterBody),_),x=e.displayColors?a+2+e.boxPadding:0,et(s,(t=>{et(t.before,_),et(t.lines,_),et(t.after,_)})),x=0,i.font=c.string,et(t.footer,_),i.restore(),m+=g.width,{width:m,height:p}}function No(t,e,i,s){const{x:n,width:o}=i,{width:a,chartArea:{left:r,right:l}}=t;let h="center";return"center"===s?h=n<=(r+l)/2?"left":"right":n<=o/2?h="left":n>=a-o/2&&(h="right"),function(t,e,i,s){const{x:n,width:o}=s,a=i.caretSize+i.caretPadding;return"left"===t&&n+o+a>e.width||"right"===t&&n-o-a<0||void 0}(h,t,e,i)&&(h="center"),h}function jo(t,e,i){const s=i.yAlign||e.yAlign||function(t,e){const{y:i,height:s}=e;return i<s/2?"top":i>t.height-s/2?"bottom":"center"}(t,i);return{xAlign:i.xAlign||e.xAlign||No(t,e,i,s),yAlign:s}}function Ho(t,e,i,s){const{caretSize:n,caretPadding:o,cornerRadius:a}=t,{xAlign:r,yAlign:l}=i,h=n+o,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=di(a);let g=function(t,e){let{x:i,width:s}=t;return"right"===e?i-=s:"center"===e&&(i-=s/2),i}(e,r);const p=function(t,e,i){let{y:s,height:n}=t;return"top"===e?s+=i:s-="bottom"===e?n+i:n/2,s}(e,l,h);return"center"===l?"left"===r?g+=h:"right"===r&&(g-=h):"left"===r?g-=Math.max(c,u)+n:"right"===r&&(g+=Math.max(d,f)+n),{x:Qt(g,0,s.width-e.width),y:Qt(p,0,s.height-e.height)}}function $o(t,e,i){const s=ui(i.padding);return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-s.right:t.x+s.left}function Yo(t){return Fo([],Bo(t))}function Uo(t,e){const i=e&&e.dataset&&e.dataset.tooltip&&e.dataset.tooltip.callbacks;return i?t.override(i):t}class Xo extends As{constructor(t){super(),this.opacity=0,this._active=[],this._eventPosition=void 0,this._size=void 0,this._cachedAnimations=void 0,this._tooltipItems=[],this.$animations=void 0,this.$context=void 0,this.chart=t.chart||t._chart,this._chart=this.chart,this.options=t.options,this.dataPoints=void 0,this.title=void 0,this.beforeBody=void 0,this.body=void 0,this.afterBody=void 0,this.footer=void 0,this.xAlign=void 0,this.yAlign=void 0,this.x=void 0,this.y=void 0,this.height=void 0,this.width=void 0,this.caretX=void 0,this.caretY=void 0,this.labelColors=void 0,this.labelPointStyles=void 0,this.labelTextColors=void 0}initialize(t){this.options=t,this._cachedAnimations=void 0,this.$context=void 0}_resolveAnimations(){const t=this._cachedAnimations;if(t)return t;const e=this.chart,i=this.options.setContext(this.getContext()),s=i.enabled&&e.options.animation&&i.animations,n=new bs(this.chart,s);return s._cacheable&&(this._cachedAnimations=Object.freeze(n)),n}getContext(){return this.$context||(this.$context=(t=this.chart.getContext(),e=this,i=this._tooltipItems,mi(t,{tooltip:e,tooltipItems:i,type:"tooltip"})));var t,e,i}getTitle(t,e){const{callbacks:i}=e,s=i.beforeTitle.apply(this,[t]),n=i.title.apply(this,[t]),o=i.afterTitle.apply(this,[t]);let a=[];return a=Fo(a,Bo(s)),a=Fo(a,Bo(n)),a=Fo(a,Bo(o)),a}getBeforeBody(t,e){return Yo(e.callbacks.beforeBody.apply(this,[t]))}getBody(t,e){const{callbacks:i}=e,s=[];return et(t,(t=>{const e={before:[],lines:[],after:[]},n=Uo(i,t);Fo(e.before,Bo(n.beforeLabel.call(this,t))),Fo(e.lines,n.label.call(this,t)),Fo(e.after,Bo(n.afterLabel.call(this,t))),s.push(e)})),s}getAfterBody(t,e){return Yo(e.callbacks.afterBody.apply(this,[t]))}getFooter(t,e){const{callbacks:i}=e,s=i.beforeFooter.apply(this,[t]),n=i.footer.apply(this,[t]),o=i.afterFooter.apply(this,[t]);let a=[];return a=Fo(a,Bo(s)),a=Fo(a,Bo(n)),a=Fo(a,Bo(o)),a}_createItems(t){const e=this._active,i=this.chart.data,s=[],n=[],o=[];let a,r,l=[];for(a=0,r=e.length;a<r;++a)l.push(Vo(this.chart,e[a]));return t.filter&&(l=l.filter(((e,s,n)=>t.filter(e,s,n,i)))),t.itemSort&&(l=l.sort(((e,s)=>t.itemSort(e,s,i)))),et(l,(e=>{const i=Uo(t.callbacks,e);s.push(i.labelColor.call(this,e)),n.push(i.labelPointStyle.call(this,e)),o.push(i.labelTextColor.call(this,e))})),this.labelColors=s,this.labelPointStyles=n,this.labelTextColors=o,this.dataPoints=l,l}update(t,e){const i=this.options.setContext(this.getContext()),s=this._active;let n,o=[];if(s.length){const t=zo[i.position].call(this,s,this._eventPosition);o=this._createItems(i),this.title=this.getTitle(o,i),this.beforeBody=this.getBeforeBody(o,i),this.body=this.getBody(o,i),this.afterBody=this.getAfterBody(o,i),this.footer=this.getFooter(o,i);const e=this._size=Wo(this,i),a=Object.assign({},t,e),r=jo(this.chart,i,a),l=Ho(i,a,r,this.chart);this.xAlign=r.xAlign,this.yAlign=r.yAlign,n={opacity:1,x:l.x,y:l.y,width:e.width,height:e.height,caretX:t.x,caretY:t.y}}else 0!==this.opacity&&(n={opacity:0});this._tooltipItems=o,this.$context=void 0,n&&this._resolveAnimations().update(this,n),t&&i.external&&i.external.call(this,{chart:this.chart,tooltip:this,replay:e})}drawCaret(t,e,i,s){const n=this.getCaretPosition(t,i,s);e.lineTo(n.x1,n.y1),e.lineTo(n.x2,n.y2),e.lineTo(n.x3,n.y3)}getCaretPosition(t,e,i){const{xAlign:s,yAlign:n}=this,{caretSize:o,cornerRadius:a}=i,{topLeft:r,topRight:l,bottomLeft:h,bottomRight:c}=di(a),{x:d,y:u}=t,{width:f,height:g}=e;let p,m,b,x,_,y;return"center"===n?(_=u+g/2,"left"===s?(p=d,m=p-o,x=_+o,y=_-o):(p=d+f,m=p+o,x=_-o,y=_+o),b=p):(m="left"===s?d+Math.max(r,h)+o:"right"===s?d+f-Math.max(l,c)-o:this.caretX,"top"===n?(x=u,_=x-o,p=m-o,b=m+o):(x=u+g,_=x+o,p=m+o,b=m-o),y=x),{x1:p,x2:m,x3:b,y1:x,y2:_,y3:y}}drawTitle(t,e,i){const s=this.title,n=s.length;let o,a,r;if(n){const l=bi(i.rtl,this.x,this.width);for(t.x=$o(this,i.titleAlign,i),e.textAlign=l.textAlign(i.titleAlign),e.textBaseline="middle",o=fi(i.titleFont),a=i.titleSpacing,e.fillStyle=i.titleColor,e.font=o.string,r=0;r<n;++r)e.fillText(s[r],l.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+a,r+1===n&&(t.y+=i.titleMarginBottom-a)}}_drawColorBox(t,e,i,s,n){const o=this.labelColors[i],a=this.labelPointStyles[i],{boxHeight:r,boxWidth:l,boxPadding:h}=n,c=fi(n.bodyFont),d=$o(this,"left",n),u=s.x(d),f=r<c.lineHeight?(c.lineHeight-r)/2:0,g=e.y+f;if(n.usePointStyle){const e={radius:Math.min(l,r)/2,pointStyle:a.pointStyle,rotation:a.rotation,borderWidth:1},i=s.leftForLtr(u,l)+l/2,h=g+r/2;t.strokeStyle=n.multiKeyBackground,t.fillStyle=n.multiKeyBackground,ye(t,e,i,h),t.strokeStyle=o.borderColor,t.fillStyle=o.backgroundColor,ye(t,e,i,h)}else{t.lineWidth=q(o.borderWidth)?Math.max(...Object.values(o.borderWidth)):o.borderWidth||1,t.strokeStyle=o.borderColor,t.setLineDash(o.borderDash||[]),t.lineDashOffset=o.borderDashOffset||0;const e=s.leftForLtr(u,l-h),i=s.leftForLtr(s.xPlus(u,1),l-h-2),a=di(o.borderRadius);Object.values(a).some((t=>0!==t))?(t.beginPath(),t.fillStyle=n.multiKeyBackground,Oe(t,{x:e,y:g,w:l,h:r,radius:a}),t.fill(),t.stroke(),t.fillStyle=o.backgroundColor,t.beginPath(),Oe(t,{x:i,y:g+1,w:l-2,h:r-2,radius:a}),t.fill()):(t.fillStyle=n.multiKeyBackground,t.fillRect(e,g,l,r),t.strokeRect(e,g,l,r),t.fillStyle=o.backgroundColor,t.fillRect(i,g+1,l-2,r-2))}t.fillStyle=this.labelTextColors[i]}drawBody(t,e,i){const{body:s}=this,{bodySpacing:n,bodyAlign:o,displayColors:a,boxHeight:r,boxWidth:l,boxPadding:h}=i,c=fi(i.bodyFont);let d=c.lineHeight,u=0;const f=bi(i.rtl,this.x,this.width),g=function(i){e.fillText(i,f.x(t.x+u),t.y+d/2),t.y+=d+n},p=f.textAlign(o);let m,b,x,_,y,v,w;for(e.textAlign=o,e.textBaseline="middle",e.font=c.string,t.x=$o(this,p,i),e.fillStyle=i.bodyColor,et(this.beforeBody,g),u=a&&"right"!==p?"center"===o?l/2+h:l+2+h:0,_=0,v=s.length;_<v;++_){for(m=s[_],b=this.labelTextColors[_],e.fillStyle=b,et(m.before,g),x=m.lines,a&&x.length&&(this._drawColorBox(e,t,_,f,i),d=Math.max(c.lineHeight,r)),y=0,w=x.length;y<w;++y)g(x[y]),d=c.lineHeight;et(m.after,g)}u=0,d=c.lineHeight,et(this.afterBody,g),t.y-=n}drawFooter(t,e,i){const s=this.footer,n=s.length;let o,a;if(n){const r=bi(i.rtl,this.x,this.width);for(t.x=$o(this,i.footerAlign,i),t.y+=i.footerMarginTop,e.textAlign=r.textAlign(i.footerAlign),e.textBaseline="middle",o=fi(i.footerFont),e.fillStyle=i.footerColor,e.font=o.string,a=0;a<n;++a)e.fillText(s[a],r.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+i.footerSpacing}}drawBackground(t,e,i,s){const{xAlign:n,yAlign:o}=this,{x:a,y:r}=t,{width:l,height:h}=i,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=di(s.cornerRadius);e.fillStyle=s.backgroundColor,e.strokeStyle=s.borderColor,e.lineWidth=s.borderWidth,e.beginPath(),e.moveTo(a+c,r),"top"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+l-d,r),e.quadraticCurveTo(a+l,r,a+l,r+d),"center"===o&&"right"===n&&this.drawCaret(t,e,i,s),e.lineTo(a+l,r+h-f),e.quadraticCurveTo(a+l,r+h,a+l-f,r+h),"bottom"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+u,r+h),e.quadraticCurveTo(a,r+h,a,r+h-u),"center"===o&&"left"===n&&this.drawCaret(t,e,i,s),e.lineTo(a,r+c),e.quadraticCurveTo(a,r,a+c,r),e.closePath(),e.fill(),s.borderWidth>0&&e.stroke()}_updateAnimationTarget(t){const e=this.chart,i=this.$animations,s=i&&i.x,n=i&&i.y;if(s||n){const i=zo[t.position].call(this,this._active,this._eventPosition);if(!i)return;const o=this._size=Wo(this,t),a=Object.assign({},i,this._size),r=jo(e,t,a),l=Ho(t,a,r,e);s._to===l.x&&n._to===l.y||(this.xAlign=r.xAlign,this.yAlign=r.yAlign,this.width=o.width,this.height=o.height,this.caretX=i.x,this.caretY=i.y,this._resolveAnimations().update(this,l))}}_willRender(){return!!this.opacity}draw(t){const e=this.options.setContext(this.getContext());let i=this.opacity;if(!i)return;this._updateAnimationTarget(e);const s={width:this.width,height:this.height},n={x:this.x,y:this.y};i=Math.abs(i)<.001?0:i;const o=ui(e.padding),a=this.title.length||this.beforeBody.length||this.body.length||this.afterBody.length||this.footer.length;e.enabled&&a&&(t.save(),t.globalAlpha=i,this.drawBackground(n,t,s,e),xi(t,e.textDirection),n.y+=o.top,this.drawTitle(n,t,e),this.drawBody(n,t,e),this.drawFooter(n,t,e),_i(t,e.textDirection),t.restore())}getActiveElements(){return this._active||[]}setActiveElements(t,e){const i=this._active,s=t.map((({datasetIndex:t,index:e})=>{const i=this.chart.getDatasetMeta(t);if(!i)throw new Error("Cannot find a dataset at index "+t);return{datasetIndex:t,element:i.data[e],index:e}})),n=!it(i,s),o=this._positionChanged(s,e);(n||o)&&(this._active=s,this._eventPosition=e,this._ignoreReplayEvents=!0,this.update(!0))}handleEvent(t,e,i=!0){if(e&&this._ignoreReplayEvents)return!1;this._ignoreReplayEvents=!1;const s=this.options,n=this._active||[],o=this._getActiveElements(t,n,e,i),a=this._positionChanged(o,t),r=e||!it(o,n)||a;return r&&(this._active=o,(s.enabled||s.external)&&(this._eventPosition={x:t.x,y:t.y},this.update(!0,e))),r}_getActiveElements(t,e,i,s){const n=this.options;if("mouseout"===t.type)return[];if(!s)return e;const o=this.chart.getElementsAtEventForMode(t,n.mode,n,i);return n.reverse&&o.reverse(),o}_positionChanged(t,e){const{caretX:i,caretY:s,options:n}=this,o=zo[n.position].call(this,t,e);return!1!==o&&(i!==o.x||s!==o.y)}}Xo.positioners=zo;var qo={id:"tooltip",_element:Xo,positioners:zo,afterInit(t,e,i){i&&(t.tooltip=new Xo({chart:t,options:i}))},beforeUpdate(t,e,i){t.tooltip&&t.tooltip.initialize(i)},reset(t,e,i){t.tooltip&&t.tooltip.initialize(i)},afterDraw(t){const e=t.tooltip;if(e&&e._willRender()){const i={tooltip:e};if(!1===t.notifyPlugins("beforeTooltipDraw",i))return;e.draw(t.ctx),t.notifyPlugins("afterTooltipDraw",i)}},afterEvent(t,e){if(t.tooltip){const i=e.replay;t.tooltip.handleEvent(e.event,i,e.inChartArea)&&(e.changed=!0)}},defaults:{enabled:!0,external:null,position:"average",backgroundColor:"rgba(0,0,0,0.8)",titleColor:"#fff",titleFont:{weight:"bold"},titleSpacing:2,titleMarginBottom:6,titleAlign:"left",bodyColor:"#fff",bodySpacing:2,bodyFont:{},bodyAlign:"left",footerColor:"#fff",footerSpacing:2,footerMarginTop:6,footerFont:{weight:"bold"},footerAlign:"left",padding:6,caretPadding:2,caretSize:5,cornerRadius:6,boxHeight:(t,e)=>e.bodyFont.size,boxWidth:(t,e)=>e.bodyFont.size,multiKeyBackground:"#fff",displayColors:!0,boxPadding:0,borderColor:"rgba(0,0,0,0)",borderWidth:0,animation:{duration:400,easing:"easeOutQuart"},animations:{numbers:{type:"number",properties:["x","y","width","height","caretX","caretY"]},opacity:{easing:"linear",duration:200}},callbacks:{beforeTitle:$,title(t){if(t.length>0){const e=t[0],i=e.chart.data.labels,s=i?i.length:0;if(this&&this.options&&"dataset"===this.options.mode)return e.dataset.label||"";if(e.label)return e.label;if(s>0&&e.dataIndex<s)return i[e.dataIndex]}return""},afterTitle:$,beforeBody:$,beforeLabel:$,label(t){if(this&&this.options&&"dataset"===this.options.mode)return t.label+": "+t.formattedValue||t.formattedValue;let e=t.dataset.label||"";e&&(e+=": ");const i=t.formattedValue;return U(i)||(e+=i),e},labelColor(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{borderColor:e.borderColor,backgroundColor:e.backgroundColor,borderWidth:e.borderWidth,borderDash:e.borderDash,borderDashOffset:e.borderDashOffset,borderRadius:0}},labelTextColor(){return this.options.bodyColor},labelPointStyle(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{pointStyle:e.pointStyle,rotation:e.rotation}},afterLabel:$,afterBody:$,beforeFooter:$,footer:$,afterFooter:$}},defaultRoutes:{bodyFont:"font",footerFont:"font",titleFont:"font"},descriptors:{_scriptable:t=>"filter"!==t&&"itemSort"!==t&&"external"!==t,_indexable:!1,callbacks:{_scriptable:!1,_indexable:!1},animation:{_fallback:!1},animations:{_fallback:"animation"}},additionalOptionScopes:["interaction"]},Ko=Object.freeze({__proto__:null,Decimation:co,Filler:Co,Legend:To,SubTitle:Io,Title:Ro,Tooltip:qo});function Go(t,e,i,s){const n=t.indexOf(e);if(-1===n)return((t,e,i,s)=>("string"==typeof e?(i=t.push(e)-1,s.unshift({index:i,label:e})):isNaN(e)&&(i=null),i))(t,e,i,s);return n!==t.lastIndexOf(e)?i:n}class Zo extends Ns{constructor(t){super(t),this._startValue=void 0,this._valueRange=0,this._addedLabels=[]}init(t){const e=this._addedLabels;if(e.length){const t=this.getLabels();for(const{index:i,label:s}of e)t[i]===s&&t.splice(i,1);this._addedLabels=[]}super.init(t)}parse(t,e){if(U(t))return null;const i=this.getLabels();return((t,e)=>null===t?null:Qt(Math.round(t),0,e))(e=isFinite(e)&&i[e]===t?e:Go(i,t,Z(e,t),this._addedLabels),i.length-1)}determineDataLimits(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let{min:i,max:s}=this.getMinMax(!0);"ticks"===this.options.bounds&&(t||(i=0),e||(s=this.getLabels().length-1)),this.min=i,this.max=s}buildTicks(){const t=this.min,e=this.max,i=this.options.offset,s=[];let n=this.getLabels();n=0===t&&e===n.length-1?n:n.slice(t,e+1),this._valueRange=Math.max(n.length-(i?0:1),1),this._startValue=this.min-(i?.5:0);for(let i=t;i<=e;i++)s.push({value:i});return s}getLabelForValue(t){const e=this.getLabels();return t>=0&&t<e.length?e[t]:t}configure(){super.configure(),this.isHorizontal()||(this._reversePixels=!this._reversePixels)}getPixelForValue(t){return"number"!=typeof t&&(t=this.parse(t)),null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getValueForPixel(t){return Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange)}getBasePixel(){return this.bottom}}function Jo(t,e,{horizontal:i,minRotation:s}){const n=Yt(s),o=(i?Math.sin(n):Math.cos(n))||.001,a=.75*e*(""+t).length;return Math.min(e/o,a)}Zo.id="category",Zo.defaults={ticks:{callback:Zo.prototype.getLabelForValue}};class Qo extends Ns{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._endValue=void 0,this._valueRange=0}parse(t,e){return U(t)||("number"==typeof t||t instanceof Number)&&!isFinite(+t)?null:+t}handleTickRangeOptions(){const{beginAtZero:t}=this.options,{minDefined:e,maxDefined:i}=this.getUserBounds();let{min:s,max:n}=this;const o=t=>s=e?s:t,a=t=>n=i?n:t;if(t){const t=Bt(s),e=Bt(n);t<0&&e<0?a(0):t>0&&e>0&&o(0)}if(s===n){let e=1;(n>=Number.MAX_SAFE_INTEGER||s<=Number.MIN_SAFE_INTEGER)&&(e=Math.abs(.05*n)),a(n+e),t||o(s-e)}this.min=s,this.max=n}getTickLimit(){const t=this.options.ticks;let e,{maxTicksLimit:i,stepSize:s}=t;return s?(e=Math.ceil(this.max/s)-Math.floor(this.min/s)+1,e>1e3&&(console.warn(`scales.${this.id}.ticks.stepSize: ${s} would result generating up to ${e} ticks. Limiting to 1000.`),e=1e3)):(e=this.computeTickLimit(),i=i||11),i&&(e=Math.min(i,e)),e}computeTickLimit(){return Number.POSITIVE_INFINITY}buildTicks(){const t=this.options,e=t.ticks;let i=this.getTickLimit();i=Math.max(2,i);const s=function(t,e){const i=[],{bounds:s,step:n,min:o,max:a,precision:r,count:l,maxTicks:h,maxDigits:c,includeBounds:d}=t,u=n||1,f=h-1,{min:g,max:p}=e,m=!U(o),b=!U(a),x=!U(l),_=(p-g)/(c+1);let y,v,w,M,k=Vt((p-g)/f/u)*u;if(k<1e-14&&!m&&!b)return[{value:g},{value:p}];M=Math.ceil(p/k)-Math.floor(g/k),M>f&&(k=Vt(M*k/f/u)*u),U(r)||(y=Math.pow(10,r),k=Math.ceil(k*y)/y),"ticks"===s?(v=Math.floor(g/k)*k,w=Math.ceil(p/k)*k):(v=g,w=p),m&&b&&n&&Ht((a-o)/n,k/1e3)?(M=Math.round(Math.min((a-o)/k,h)),k=(a-o)/M,v=o,w=a):x?(v=m?o:v,w=b?a:w,M=l-1,k=(w-v)/M):(M=(w-v)/k,M=jt(M,Math.round(M),k/1e3)?Math.round(M):Math.ceil(M));const S=Math.max(Xt(k),Xt(v));y=Math.pow(10,U(r)?S:r),v=Math.round(v*y)/y,w=Math.round(w*y)/y;let P=0;for(m&&(d&&v!==o?(i.push({value:o}),v<o&&P++,jt(Math.round((v+P*k)*y)/y,o,Jo(o,_,t))&&P++):v<o&&P++);P<M;++P)i.push({value:Math.round((v+P*k)*y)/y});return b&&d&&w!==a?i.length&&jt(i[i.length-1].value,a,Jo(a,_,t))?i[i.length-1].value=a:i.push({value:a}):b&&w!==a||i.push({value:w}),i}({maxTicks:i,bounds:t.bounds,min:t.min,max:t.max,precision:e.precision,step:e.stepSize,count:e.count,maxDigits:this._maxDigits(),horizontal:this.isHorizontal(),minRotation:e.minRotation||0,includeBounds:!1!==e.includeBounds},this._range||this);return"ticks"===t.bounds&&$t(s,this,"value"),t.reverse?(s.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),s}configure(){const t=this.ticks;let e=this.min,i=this.max;if(super.configure(),this.options.offset&&t.length){const s=(i-e)/Math.max(t.length-1,1)/2;e-=s,i+=s}this._startValue=e,this._endValue=i,this._valueRange=i-e}getLabelForValue(t){return oi(t,this.chart.options.locale,this.options.ticks.format)}}class ta extends Qo{determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=K(t)?t:0,this.max=K(e)?e:1,this.handleTickRangeOptions()}computeTickLimit(){const t=this.isHorizontal(),e=t?this.width:this.height,i=Yt(this.options.ticks.minRotation),s=(t?Math.sin(i):Math.cos(i))||.001,n=this._resolveTickFontOptions(0);return Math.ceil(e/Math.min(40,n.lineHeight/s))}getPixelForValue(t){return null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getValueForPixel(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange}}function ea(t){return 1===t/Math.pow(10,Math.floor(Ft(t)))}ta.id="linear",ta.defaults={ticks:{callback:Ls.formatters.numeric}};class ia extends Ns{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._valueRange=0}parse(t,e){const i=Qo.prototype.parse.apply(this,[t,e]);if(0!==i)return K(i)&&i>0?i:null;this._zero=!0}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=K(t)?Math.max(0,t):null,this.max=K(e)?Math.max(0,e):null,this.options.beginAtZero&&(this._zero=!0),this.handleTickRangeOptions()}handleTickRangeOptions(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let i=this.min,s=this.max;const n=e=>i=t?i:e,o=t=>s=e?s:t,a=(t,e)=>Math.pow(10,Math.floor(Ft(t))+e);i===s&&(i<=0?(n(1),o(10)):(n(a(i,-1)),o(a(s,1)))),i<=0&&n(a(s,-1)),s<=0&&o(a(i,1)),this._zero&&this.min!==this._suggestedMin&&i===a(this.min,0)&&n(a(i,-1)),this.min=i,this.max=s}buildTicks(){const t=this.options,e=function(t,e){const i=Math.floor(Ft(e.max)),s=Math.ceil(e.max/Math.pow(10,i)),n=[];let o=G(t.min,Math.pow(10,Math.floor(Ft(e.min)))),a=Math.floor(Ft(o)),r=Math.floor(o/Math.pow(10,a)),l=a<0?Math.pow(10,Math.abs(a)):1;do{n.push({value:o,major:ea(o)}),++r,10===r&&(r=1,++a,l=a>=0?1:l),o=Math.round(r*Math.pow(10,a)*l)/l}while(a<i||a===i&&r<s);const h=G(t.max,o);return n.push({value:h,major:ea(o)}),n}({min:this._userMin,max:this._userMax},this);return"ticks"===t.bounds&&$t(e,this,"value"),t.reverse?(e.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),e}getLabelForValue(t){return void 0===t?"0":oi(t,this.chart.options.locale,this.options.ticks.format)}configure(){const t=this.min;super.configure(),this._startValue=Ft(t),this._valueRange=Ft(this.max)-Ft(t)}getPixelForValue(t){return void 0!==t&&0!==t||(t=this.min),null===t||isNaN(t)?NaN:this.getPixelForDecimal(t===this.min?0:(Ft(t)-this._startValue)/this._valueRange)}getValueForPixel(t){const e=this.getDecimalForPixel(t);return Math.pow(10,this._startValue+e*this._valueRange)}}function sa(t){const e=t.ticks;if(e.display&&t.display){const t=ui(e.backdropPadding);return Z(e.font&&e.font.size,yt.font.size)+t.height}return 0}function na(t,e,i,s,n){return t===s||t===n?{start:e-i/2,end:e+i/2}:t<s||t>n?{start:e-i,end:e}:{start:e,end:e+i}}function oa(t){const e={l:t.left+t._padding.left,r:t.right-t._padding.right,t:t.top+t._padding.top,b:t.bottom-t._padding.bottom},i=Object.assign({},e),s=[],n=[],o=t._pointLabels.length,a=t.options.pointLabels,r=a.centerPointLabels?Ot/o:0;for(let d=0;d<o;d++){const o=a.setContext(t.getPointLabelContext(d));n[d]=o.padding;const u=t.getPointPosition(d,t.drawingArea+n[d],r),f=fi(o.font),g=(l=t.ctx,h=f,c=X(c=t._pointLabels[d])?c:[c],{w:be(l,h.string,c),h:c.length*h.lineHeight});s[d]=g;const p=Zt(t.getIndexAngle(d)+r),m=Math.round(Ut(p));aa(i,e,p,na(m,u.x,g.w,0,180),na(m,u.y,g.h,90,270))}var l,h,c;t.setCenterPoint(e.l-i.l,i.r-e.r,e.t-i.t,i.b-e.b),t._pointLabelItems=function(t,e,i){const s=[],n=t._pointLabels.length,o=t.options,a=sa(o)/2,r=t.drawingArea,l=o.pointLabels.centerPointLabels?Ot/n:0;for(let o=0;o<n;o++){const n=t.getPointPosition(o,r+a+i[o],l),h=Math.round(Ut(Zt(n.angle+Et))),c=e[o],d=ha(n.y,c.h,h),u=ra(h),f=la(n.x,c.w,u);s.push({x:n.x,y:d,textAlign:u,left:f,top:d,right:f+c.w,bottom:d+c.h})}return s}(t,s,n)}function aa(t,e,i,s,n){const o=Math.abs(Math.sin(i)),a=Math.abs(Math.cos(i));let r=0,l=0;s.start<e.l?(r=(e.l-s.start)/o,t.l=Math.min(t.l,e.l-r)):s.end>e.r&&(r=(s.end-e.r)/o,t.r=Math.max(t.r,e.r+r)),n.start<e.t?(l=(e.t-n.start)/a,t.t=Math.min(t.t,e.t-l)):n.end>e.b&&(l=(n.end-e.b)/a,t.b=Math.max(t.b,e.b+l))}function ra(t){return 0===t||180===t?"center":t<180?"left":"right"}function la(t,e,i){return"right"===i?t-=e:"center"===i&&(t-=e/2),t}function ha(t,e,i){return 90===i||270===i?t-=e/2:(i>270||i<90)&&(t-=e),t}function ca(t,e,i,s){const{ctx:n}=t;if(i)n.arc(t.xCenter,t.yCenter,e,0,At);else{let i=t.getPointPosition(0,e);n.moveTo(i.x,i.y);for(let o=1;o<s;o++)i=t.getPointPosition(o,e),n.lineTo(i.x,i.y)}}ia.id="logarithmic",ia.defaults={ticks:{callback:Ls.formatters.logarithmic,major:{enabled:!0}}};class da extends Qo{constructor(t){super(t),this.xCenter=void 0,this.yCenter=void 0,this.drawingArea=void 0,this._pointLabels=[],this._pointLabelItems=[]}setDimensions(){const t=this._padding=ui(sa(this.options)/2),e=this.width=this.maxWidth-t.width,i=this.height=this.maxHeight-t.height;this.xCenter=Math.floor(this.left+e/2+t.left),this.yCenter=Math.floor(this.top+i/2+t.top),this.drawingArea=Math.floor(Math.min(e,i)/2)}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!1);this.min=K(t)&&!isNaN(t)?t:0,this.max=K(e)&&!isNaN(e)?e:0,this.handleTickRangeOptions()}computeTickLimit(){return Math.ceil(this.drawingArea/sa(this.options))}generateTickLabels(t){Qo.prototype.generateTickLabels.call(this,t),this._pointLabels=this.getLabels().map(((t,e)=>{const i=tt(this.options.pointLabels.callback,[t,e],this);return i||0===i?i:""})).filter(((t,e)=>this.chart.getDataVisibility(e)))}fit(){const t=this.options;t.display&&t.pointLabels.display?oa(this):this.setCenterPoint(0,0,0,0)}setCenterPoint(t,e,i,s){this.xCenter+=Math.floor((t-e)/2),this.yCenter+=Math.floor((i-s)/2),this.drawingArea-=Math.min(this.drawingArea/2,Math.max(t,e,i,s))}getIndexAngle(t){return Zt(t*(At/(this._pointLabels.length||1))+Yt(this.options.startAngle||0))}getDistanceFromCenterForValue(t){if(U(t))return NaN;const e=this.drawingArea/(this.max-this.min);return this.options.reverse?(this.max-t)*e:(t-this.min)*e}getValueForDistanceFromCenter(t){if(U(t))return NaN;const e=t/(this.drawingArea/(this.max-this.min));return this.options.reverse?this.max-e:this.min+e}getPointLabelContext(t){const e=this._pointLabels||[];if(t>=0&&t<e.length){const i=e[t];return function(t,e,i){return mi(t,{label:i,index:e,type:"pointLabel"})}(this.getContext(),t,i)}}getPointPosition(t,e,i=0){const s=this.getIndexAngle(t)-Et+i;return{x:Math.cos(s)*e+this.xCenter,y:Math.sin(s)*e+this.yCenter,angle:s}}getPointPositionForValue(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))}getBasePosition(t){return this.getPointPositionForValue(t||0,this.getBaseValue())}getPointLabelPosition(t){const{left:e,top:i,right:s,bottom:n}=this._pointLabelItems[t];return{left:e,top:i,right:s,bottom:n}}drawBackground(){const{backgroundColor:t,grid:{circular:e}}=this.options;if(t){const i=this.ctx;i.save(),i.beginPath(),ca(this,this.getDistanceFromCenterForValue(this._endValue),e,this._pointLabels.length),i.closePath(),i.fillStyle=t,i.fill(),i.restore()}}drawGrid(){const t=this.ctx,e=this.options,{angleLines:i,grid:s}=e,n=this._pointLabels.length;let o,a,r;if(e.pointLabels.display&&function(t,e){const{ctx:i,options:{pointLabels:s}}=t;for(let n=e-1;n>=0;n--){const e=s.setContext(t.getPointLabelContext(n)),o=fi(e.font),{x:a,y:r,textAlign:l,left:h,top:c,right:d,bottom:u}=t._pointLabelItems[n],{backdropColor:f}=e;if(!U(f)){const t=di(e.borderRadius),s=ui(e.backdropPadding);i.fillStyle=f;const n=h-s.left,o=c-s.top,a=d-h+s.width,r=u-c+s.height;Object.values(t).some((t=>0!==t))?(i.beginPath(),Oe(i,{x:n,y:o,w:a,h:r,radius:t}),i.fill()):i.fillRect(n,o,a,r)}De(i,t._pointLabels[n],a,r+o.lineHeight/2,o,{color:e.color,textAlign:l,textBaseline:"middle"})}}(this,n),s.display&&this.ticks.forEach(((t,e)=>{if(0!==e){a=this.getDistanceFromCenterForValue(t.value);!function(t,e,i,s){const n=t.ctx,o=e.circular,{color:a,lineWidth:r}=e;!o&&!s||!a||!r||i<0||(n.save(),n.strokeStyle=a,n.lineWidth=r,n.setLineDash(e.borderDash),n.lineDashOffset=e.borderDashOffset,n.beginPath(),ca(t,i,o,s),n.closePath(),n.stroke(),n.restore())}(this,s.setContext(this.getContext(e-1)),a,n)}})),i.display){for(t.save(),o=n-1;o>=0;o--){const s=i.setContext(this.getPointLabelContext(o)),{color:n,lineWidth:l}=s;l&&n&&(t.lineWidth=l,t.strokeStyle=n,t.setLineDash(s.borderDash),t.lineDashOffset=s.borderDashOffset,a=this.getDistanceFromCenterForValue(e.ticks.reverse?this.min:this.max),r=this.getPointPosition(o,a),t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(r.x,r.y),t.stroke())}t.restore()}}drawBorder(){}drawLabels(){const t=this.ctx,e=this.options,i=e.ticks;if(!i.display)return;const s=this.getIndexAngle(0);let n,o;t.save(),t.translate(this.xCenter,this.yCenter),t.rotate(s),t.textAlign="center",t.textBaseline="middle",this.ticks.forEach(((s,a)=>{if(0===a&&!e.reverse)return;const r=i.setContext(this.getContext(a)),l=fi(r.font);if(n=this.getDistanceFromCenterForValue(this.ticks[a].value),r.showLabelBackdrop){t.font=l.string,o=t.measureText(s.label).width,t.fillStyle=r.backdropColor;const e=ui(r.backdropPadding);t.fillRect(-o/2-e.left,-n-l.size/2-e.top,o+e.width,l.size+e.height)}De(t,s.label,0,-n,l,{color:r.color})})),t.restore()}drawTitle(){}}da.id="radialLinear",da.defaults={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,lineWidth:1,borderDash:[],borderDashOffset:0},grid:{circular:!1},startAngle:0,ticks:{showLabelBackdrop:!0,callback:Ls.formatters.numeric},pointLabels:{backdropColor:void 0,backdropPadding:2,display:!0,font:{size:10},callback:t=>t,padding:5,centerPointLabels:!1}},da.defaultRoutes={"angleLines.color":"borderColor","pointLabels.color":"color","ticks.color":"color"},da.descriptors={angleLines:{_fallback:"grid"}};const ua={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},fa=Object.keys(ua);function ga(t,e){return t-e}function pa(t,e){if(U(e))return null;const i=t._adapter,{parser:s,round:n,isoWeekday:o}=t._parseOpts;let a=e;return"function"==typeof s&&(a=s(a)),K(a)||(a="string"==typeof s?i.parse(a,s):i.parse(a)),null===a?null:(n&&(a="week"!==n||!Nt(o)&&!0!==o?i.startOf(a,n):i.startOf(a,"isoWeek",o)),+a)}function ma(t,e,i,s){const n=fa.length;for(let o=fa.indexOf(t);o<n-1;++o){const t=ua[fa[o]],n=t.steps?t.steps:Number.MAX_SAFE_INTEGER;if(t.common&&Math.ceil((i-e)/(n*t.size))<=s)return fa[o]}return fa[n-1]}function ba(t,e,i){if(i){if(i.length){const{lo:s,hi:n}=vt(i,e);t[i[s]>=e?i[s]:i[n]]=!0}}else t[e]=!0}function xa(t,e,i){const s=[],n={},o=e.length;let a,r;for(a=0;a<o;++a)r=e[a],n[r]=a,s.push({value:r,major:!1});return 0!==o&&i?function(t,e,i,s){const n=t._adapter,o=+n.startOf(e[0].value,s),a=e[e.length-1].value;let r,l;for(r=o;r<=a;r=+n.add(r,1,s))l=i[r],l>=0&&(e[l].major=!0);return e}(t,s,n,i):s}class _a extends Ns{constructor(t){super(t),this._cache={data:[],labels:[],all:[]},this._unit="day",this._majorUnit=void 0,this._offsets={},this._normalized=!1,this._parseOpts=void 0}init(t,e){const i=t.time||(t.time={}),s=this._adapter=new _n._date(t.adapters.date);rt(i.displayFormats,s.formats()),this._parseOpts={parser:i.parser,round:i.round,isoWeekday:i.isoWeekday},super.init(t),this._normalized=e.normalized}parse(t,e){return void 0===t?null:pa(this,t)}beforeLayout(){super.beforeLayout(),this._cache={data:[],labels:[],all:[]}}determineDataLimits(){const t=this.options,e=this._adapter,i=t.time.unit||"day";let{min:s,max:n,minDefined:o,maxDefined:a}=this.getUserBounds();function r(t){o||isNaN(t.min)||(s=Math.min(s,t.min)),a||isNaN(t.max)||(n=Math.max(n,t.max))}o&&a||(r(this._getLabelBounds()),"ticks"===t.bounds&&"labels"===t.ticks.source||r(this.getMinMax(!1))),s=K(s)&&!isNaN(s)?s:+e.startOf(Date.now(),i),n=K(n)&&!isNaN(n)?n:+e.endOf(Date.now(),i)+1,this.min=Math.min(s,n-1),this.max=Math.max(s+1,n)}_getLabelBounds(){const t=this.getLabelTimestamps();let e=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;return t.length&&(e=t[0],i=t[t.length-1]),{min:e,max:i}}buildTicks(){const t=this.options,e=t.time,i=t.ticks,s="labels"===i.source?this.getLabelTimestamps():this._generate();"ticks"===t.bounds&&s.length&&(this.min=this._userMin||s[0],this.max=this._userMax||s[s.length-1]);const n=this.min,o=kt(s,n,this.max);return this._unit=e.unit||(i.autoSkip?ma(e.minUnit,this.min,this.max,this._getLabelCapacity(n)):function(t,e,i,s,n){for(let o=fa.length-1;o>=fa.indexOf(i);o--){const i=fa[o];if(ua[i].common&&t._adapter.diff(n,s,i)>=e-1)return i}return fa[i?fa.indexOf(i):0]}(this,o.length,e.minUnit,this.min,this.max)),this._majorUnit=i.major.enabled&&"year"!==this._unit?function(t){for(let e=fa.indexOf(t)+1,i=fa.length;e<i;++e)if(ua[fa[e]].common)return fa[e]}(this._unit):void 0,this.initOffsets(s),t.reverse&&o.reverse(),xa(this,o,this._majorUnit)}afterAutoSkip(){this.options.offsetAfterAutoskip&&this.initOffsets(this.ticks.map((t=>+t.value)))}initOffsets(t){let e,i,s=0,n=0;this.options.offset&&t.length&&(e=this.getDecimalForValue(t[0]),s=1===t.length?1-e:(this.getDecimalForValue(t[1])-e)/2,i=this.getDecimalForValue(t[t.length-1]),n=1===t.length?i:(i-this.getDecimalForValue(t[t.length-2]))/2);const o=t.length<3?.5:.25;s=Qt(s,0,o),n=Qt(n,0,o),this._offsets={start:s,end:n,factor:1/(s+1+n)}}_generate(){const t=this._adapter,e=this.min,i=this.max,s=this.options,n=s.time,o=n.unit||ma(n.minUnit,e,i,this._getLabelCapacity(e)),a=Z(n.stepSize,1),r="week"===o&&n.isoWeekday,l=Nt(r)||!0===r,h={};let c,d,u=e;if(l&&(u=+t.startOf(u,"isoWeek",r)),u=+t.startOf(u,l?"day":o),t.diff(i,e,o)>1e5*a)throw new Error(e+" and "+i+" are too far apart with stepSize of "+a+" "+o);const f="data"===s.ticks.source&&this.getDataTimestamps();for(c=u,d=0;c<i;c=+t.add(c,a,o),d++)ba(h,c,f);return c!==i&&"ticks"!==s.bounds&&1!==d||ba(h,c,f),Object.keys(h).sort(((t,e)=>t-e)).map((t=>+t))}getLabelForValue(t){const e=this._adapter,i=this.options.time;return i.tooltipFormat?e.format(t,i.tooltipFormat):e.format(t,i.displayFormats.datetime)}_tickFormatFunction(t,e,i,s){const n=this.options,o=n.time.displayFormats,a=this._unit,r=this._majorUnit,l=a&&o[a],h=r&&o[r],c=i[e],d=r&&h&&c&&c.major,u=this._adapter.format(t,s||(d?h:l)),f=n.ticks.callback;return f?tt(f,[u,e,i],this):u}generateTickLabels(t){let e,i,s;for(e=0,i=t.length;e<i;++e)s=t[e],s.label=this._tickFormatFunction(s.value,e,t)}getDecimalForValue(t){return null===t?NaN:(t-this.min)/(this.max-this.min)}getPixelForValue(t){const e=this._offsets,i=this.getDecimalForValue(t);return this.getPixelForDecimal((e.start+i)*e.factor)}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return this.min+i*(this.max-this.min)}_getLabelSize(t){const e=this.options.ticks,i=this.ctx.measureText(t).width,s=Yt(this.isHorizontal()?e.maxRotation:e.minRotation),n=Math.cos(s),o=Math.sin(s),a=this._resolveTickFontOptions(0).size;return{w:i*n+a*o,h:i*o+a*n}}_getLabelCapacity(t){const e=this.options.time,i=e.displayFormats,s=i[e.unit]||i.millisecond,n=this._tickFormatFunction(t,0,xa(this,[t],this._majorUnit),s),o=this._getLabelSize(n),a=Math.floor(this.isHorizontal()?this.width/o.w:this.height/o.h)-1;return a>0?a:1}getDataTimestamps(){let t,e,i=this._cache.data||[];if(i.length)return i;const s=this.getMatchingVisibleMetas();if(this._normalized&&s.length)return this._cache.data=s[0].controller.getAllParsedValues(this);for(t=0,e=s.length;t<e;++t)i=i.concat(s[t].controller.getAllParsedValues(this));return this._cache.data=this.normalize(i)}getLabelTimestamps(){const t=this._cache.labels||[];let e,i;if(t.length)return t;const s=this.getLabels();for(e=0,i=s.length;e<i;++e)t.push(pa(this,s[e]));return this._cache.labels=this._normalized?t:this.normalize(t)}normalize(t){return Ct(t.sort(ga))}}function ya(t,e,i){let s,n,o,a,r=0,l=t.length-1;i?(e>=t[r].pos&&e<=t[l].pos&&({lo:r,hi:l}=wt(t,"pos",e)),({pos:s,time:o}=t[r]),({pos:n,time:a}=t[l])):(e>=t[r].time&&e<=t[l].time&&({lo:r,hi:l}=wt(t,"time",e)),({time:s,pos:o}=t[r]),({time:n,pos:a}=t[l]));const h=n-s;return h?o+(a-o)*(e-s)/h:o}_a.id="time",_a.defaults={bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{source:"auto",major:{enabled:!1}}};class va extends _a{constructor(t){super(t),this._table=[],this._minPos=void 0,this._tableRange=void 0}initOffsets(){const t=this._getTimestampsForTable(),e=this._table=this.buildLookupTable(t);this._minPos=ya(e,this.min),this._tableRange=ya(e,this.max)-this._minPos,super.initOffsets(t)}buildLookupTable(t){const{min:e,max:i}=this,s=[],n=[];let o,a,r,l,h;for(o=0,a=t.length;o<a;++o)l=t[o],l>=e&&l<=i&&s.push(l);if(s.length<2)return[{time:e,pos:0},{time:i,pos:1}];for(o=0,a=s.length;o<a;++o)h=s[o+1],r=s[o-1],l=s[o],Math.round((h+r)/2)!==l&&n.push({time:l,pos:o/(a-1)});return n}_getTimestampsForTable(){let t=this._cache.all||[];if(t.length)return t;const e=this.getDataTimestamps(),i=this.getLabelTimestamps();return t=e.length&&i.length?this.normalize(e.concat(i)):e.length?e:i,t=this._cache.all=t,t}getDecimalForValue(t){return(ya(this._table,t)-this._minPos)/this._tableRange}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return ya(this._table,i*this._tableRange+this._minPos,!0)}}va.id="timeseries",va.defaults=_a.defaults;var wa=Object.freeze({__proto__:null,CategoryScale:Zo,LinearScale:ta,LogarithmicScale:ia,RadialLinearScale:da,TimeScale:_a,TimeSeriesScale:va});return gn.register(zn,wa,ro,Ko),gn.helpers={...Ci},gn._adapters=_n,gn.Animation=ps,gn.Animations=bs,gn.animator=a,gn.controllers=Hs.controllers.items,gn.DatasetController=Os,gn.Element=As,gn.elements=ro,gn.Interaction=Ii,gn.layouts=qi,gn.platforms=us,gn.Scale=Ns,gn.Ticks=Ls,Object.assign(gn,zn,wa,ro,Ko,us),gn.Chart=gn,"undefined"!=typeof window&&(window.Chart=gn),gn}));
diff --git a/js/ckeditor/CHANGES.md b/js/ckeditor/CHANGES.md
deleted file mode 100644
index f9bb0a210..000000000
--- a/js/ckeditor/CHANGES.md
+++ /dev/null
@@ -1,1332 +0,0 @@
-CKEditor 4 Changelog
-====================
-
-## CKEditor 4.7.2
-
-New Features:
-
-* [#455](https://github.com/ckeditor/ckeditor-dev/issues/455): Added [Advanced Content Filter](https://docs.ckeditor.com/#!/guide/dev_acf) integration with the [Justify](http://ckeditor.com/addon/justify) plugin.
-
-Fixed Issues:
-
-* [#663](https://github.com/ckeditor/ckeditor-dev/issues/663): [Chrome] Fixed: Clicking the scrollbar throws an `Uncaught TypeError: element.is is not a function` error.
-* [#520](https://github.com/ckeditor/ckeditor-dev/issues/520): Fixed: Widgets cannot be properly pasted into a table cell.
-* [#579](https://github.com/ckeditor/ckeditor-dev/issues/579): Fixed: Internal `cke_table-faked-selection-table` class is visible in the Stylesheet Classes field of the [Table Properties](http://ckeditor.com/addon/table) dialog.
-* [#545](https://github.com/ckeditor/ckeditor-dev/issues/545): [Edge] Fixed: Error thrown when pressing the [Select All](https://ckeditor.com/addon/selectall) button in [Source Mode](http://ckeditor.com/addon/sourcearea).
-* [#582](https://github.com/ckeditor/ckeditor-dev/issues/582): Fixed: Double slash in the path to stylesheet needed by the [Table Selection](http://ckeditor.com/addon/tableselection) plugin. Thanks to [Marius Dumitru Florea](https://github.com/mflorea)!
-* [#491](https://github.com/ckeditor/ckeditor-dev/issues/491): Fixed: Unnecessary dependency on the [Editor Toolbar](http://ckeditor.com/addon/toolbar) plugin inside the [Notification](http://ckeditor.com/addon/notification) plugin.
-* [#646](https://github.com/ckeditor/ckeditor-dev/issues/646): Fixed: Error thrown into the browser console after opening the [Styles Combo](http://ckeditor.com/addon/stylescombo) plugin menu in the editor without any selection.
-* [#501](https://github.com/ckeditor/ckeditor-dev/issues/501): Fixed: Double click does not open the dialog for modifying anchors inserted via the [Link](http://ckeditor.com/addon/link) plugin.
-* [#9780](https://dev.ckeditor.com/ticket/9780): [IE8-9] Fixed: Clicking inside an empty [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) editor throws an error.
-* [#16820](https://dev.ckeditor.com/ticket/16820): [IE10] Fixed: Clicking below a single horizontal rule throws an error.
-* [#426](https://github.com/ckeditor/ckeditor-dev/issues/426): Fixed: The [`range.cloneContents`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) method selects the whole element when the selection starts at the beginning of that element.
-* [#644](https://github.com/ckeditor/ckeditor-dev/issues/644): Fixed: The [`range.extractContents`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-extractContents) method returns an incorrect result when multiple nodes are selected.
-* [#684](https://github.com/ckeditor/ckeditor-dev/issues/684): Fixed: The [`elementPath.contains`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.elementPath-method-contains) method incorrectly excludes the last element instead of root when the `fromTop` parameter is set to `true`.
-
-Other Changes:
-
-* Updated the [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) plugin:
-	* [#148](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/148): Fixed: SCAYT leaves underlined word after the CKEditor Replace dialog corrects it.
-* [#751](https://github.com/ckeditor/ckeditor-dev/issues/751): Added the [`CKEDITOR.dom.nodeList.toArray`](https://docs.ckeditor.com/#!/api/CKEDITOR.dom.nodeList-method-toArray) method which returns an array representation of a [node list](https://docs.ckeditor.com/#!/api/CKEDITOR.dom.nodeList).
-
-## CKEditor 4.7.1
-
-New Features:
-
-* Added a new Mexican Spanish localization. Thanks to [David Alexandro Rodriguez](https://www.transifex.com/user/profile/darsco16/)!
-* [#413](https://github.com/ckeditor/ckeditor-dev/issues/413): Added Paste as Plain Text keyboard shortcut to the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) instructions.
-
-Fixed Issues:
-
-* [#515](https://github.com/ckeditor/ckeditor-dev/issues/515): [Chrome] Fixed: Mouse actions on CKEditor scrollbar throw an exception when the [Table Selection](http://ckeditor.com/addon/tableselection) plugin is loaded.
-* [#493](https://github.com/ckeditor/ckeditor-dev/issues/493): Fixed: Selection started from a nested table causes an error in the browser while scrolling down.
-* [#415](https://github.com/ckeditor/ckeditor-dev/issues/415): [Firefox] Fixed: <kbd>Enter</kbd> key breaks the table structure when pressed in a table selection.
-* [#457](https://github.com/ckeditor/ckeditor-dev/issues/457): Fixed: Error thrown when deleting content from the editor with no selection.
-* [#478](https://github.com/ckeditor/ckeditor-dev/issues/478): [Chrome] Fixed:  Error thrown by the [Enter Key](http://ckeditor.com/addon/enterkey) plugin when pressing <kbd>Enter</kbd> with no selection.
-* [#424](https://github.com/ckeditor/ckeditor-dev/issues/424): Fixed: Error thrown by [Tab Key Handling](http://ckeditor.com/addon/tab) and [Indent List](http://ckeditor.com/addon/indentlist) plugins when pressing <kbd>Tab</kbd> with no selection in inline editor.
-* [#476](https://github.com/ckeditor/ckeditor-dev/issues/476): Fixed: Anchors inserted with the [Link](http://ckeditor.com/addon/link) plugin on collapsed selection cannot be edited.
-* [#417](https://github.com/ckeditor/ckeditor-dev/issues/417): Fixed: The [Table Resize](http://ckeditor.com/addon/tableresize) plugin throws an error when used with a table with only header or footer rows.
-* [#523](https://github.com/ckeditor/ckeditor-dev/issues/523): Fixed: The [`editor.getCommandKeystroke`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getCommandKeystroke) method does not obtain the correct keystroke.
-* [#534](https://github.com/ckeditor/ckeditor-dev/issues/534): [IE] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not work in Quirks Mode.
-* [#450](https://github.com/ckeditor/ckeditor-dev/issues/450): Fixed: [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) incorrectly transforms the `margin` CSS property.
-
-## CKEditor 4.7
-
-**Important Notes:**
-
-* [#13793](http://dev.ckeditor.com/ticket/13793): The [`embed_provider`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-embed_provider) configuration option for the [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins is no longer preset by default.
-* The [UI Color](http://ckeditor.com/addon/uicolor) plugin now uses a custom color picker instead of the `YUI 2.7.0` library which has some known vulnerabilities (it's a security precaution, there was no security issue in CKEditor due to the way it was used).
-
-New Features:
-
-* [#16755](http://dev.ckeditor.com/ticket/16755): Added the [Table Selection](http://ckeditor.com/addon/tableselection) plugin that lets you select and manipulate an arbitrary rectangular table fragment (a few cells, a row or a column).
-* [#16961](http://dev.ckeditor.com/ticket/16961): Added support for pasting from Microsoft Excel.
-* [#13381](http://dev.ckeditor.com/ticket/13381): Dynamic code evaluation call in [`CKEDITOR.template`](http://docs.ckeditor.com/#!/api/CKEDITOR.template) removed. CKEditor can now be used with the `unsafe-eval` Content Security Policy. Thanks to [Caridy Patiño](http://caridy.name)!
-* [#16971](http://dev.ckeditor.com/ticket/16971): Added support for color in the `background` property containing also other styles for table cells in the [Table Tools](http://ckeditor.com/addon/tabletools) plugin.
-* [#16847](http://dev.ckeditor.com/ticket/16847): Added support for parsing and inlining any formatting created using the Microsoft Word style system to the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16818](http://dev.ckeditor.com/ticket/16818): Added table cell height parsing in the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16850](http://dev.ckeditor.com/ticket/16850): Added a new [`config.enableContextMenu`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enableContextMenu) configuration option for enabling and disabling the [context menu](http://ckeditor.com/addon/contextmenu).
-* [#16937](http://dev.ckeditor.com/ticket/16937): The `command` parameter in [CKEDITOR.editor.getCommandKeystroke](http://docs.ckeditor.dev/#!/api/CKEDITOR.editor-method-getCommandKeystroke) now also accepts a command name as an argument.
-* [#17010](http://dev.ckeditor.com/ticket/17010): The [`CKEDITOR.dom.range.shrink`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-shrink) method now allows for skipping bogus `<br>` elements.
-
-Fixed Issues:
-
-* [#16935](http://dev.ckeditor.com/ticket/16935): [Chrome] Fixed: Blurring the editor in [Source Mode](http://ckeditor.com/addon/sourcearea) throws an error.
-* [#16825](http://dev.ckeditor.com/ticket/16825): [Chrome] Fixed: Error thrown when destroying a focused inline editor.
-* [#16857](http://dev.ckeditor.com/ticket/16857): Fixed: <kbd>Ctrl+Shift+V</kbd> blocked by [Copy Formatting](http://ckeditor.com/addon/copyformatting).
-* [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.
-* [#16786](http://dev.ckeditor.com/ticket/16786): Fixed: Added missing translations for the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin.
-* [#14714](http://dev.ckeditor.com/ticket/14714): [WebKit/Blink] Fixed: Exception thrown on refocusing a blurred inline editor.
-* [#16913](http://dev.ckeditor.com/ticket/16913): [Firefox, IE] Fixed: [Paste as Plain Text](http://ckeditor.com/addon/pastetext) keystroke does not work.
-* [#16968](http://dev.ckeditor.com/ticket/16968): Fixed: [Safari] [Paste as Plain Text](http://ckeditor.com/addon/pastetext) is not handled by the editor.
-* [#16912](http://dev.ckeditor.com/ticket/16912): Fixed: Exception thrown when a single image is pasted using [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#16821](http://dev.ckeditor.com/ticket/16821): Fixed: Extraneous `<span>` elements with `height` style stacked when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16866](http://dev.ckeditor.com/ticket/16866): [IE, Edge] Fixed: Whitespaces not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16860](http://dev.ckeditor.com/ticket/16860): Fixed: Paragraphs which only look like lists incorrectly transformed into them when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16817](http://dev.ckeditor.com/ticket/16817): Fixed: When [pasting from Word](http://ckeditor.com/addon/pastefromword), paragraphs are transformed into lists with some corrupted data.
-* [#16833](http://dev.ckeditor.com/ticket/16833): [IE11] Fixed: Malformed list with headers [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#16826](http://dev.ckeditor.com/ticket/16826): [IE] Fixed: Superfluous paragraphs within lists [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#12465](http://dev.ckeditor.com/ticket/12465): Fixed: Cannot change the state of checkboxes or radio buttons if the properties dialog was invoked with a double-click.
-* [#13062](http://dev.ckeditor.com/ticket/13062): Fixed: Impossible to unlink when the caret is at the edge of the link.
-* [#13585](http://dev.ckeditor.com/ticket/13585): Fixed: Error when wrapping two adjacent `<div>` elements with a `<div>`.
-* [#16811](http://dev.ckeditor.com/ticket/16811): Fixed: Table alignment is not preserved by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16810](http://dev.ckeditor.com/ticket/16810): Fixed: Vertical align in tables is not supported by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#11956](http://dev.ckeditor.com/ticket/11956): [Blink, IE] Fixed: [Link](http://ckeditor.com/addon/link) dialog does not open on a double click on the second word of the link with a background color or other styles.
-* [#10472](http://dev.ckeditor.com/ticket/10472): Fixed: Unable to use [Table Resize](http://ckeditor.com/addon/tableresize) on table header and footer.
-* [#14762](http://dev.ckeditor.com/ticket/14762): Fixed: Hovering over an empty table (without rows or cells) throws an error when the [Table Resize](http://ckeditor.com/addon/tableresize) plugin is active.
-* [#16777](https://dev.ckeditor.com/ticket/16777): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin does not allow to drop widgets into the editor.
-* [#14894](https://dev.ckeditor.com/ticket/14894): [Chrome] Fixed: The editor scrolls to the top after focusing or when a dialog is opened.
-* [#14769](https://dev.ckeditor.com/ticket/14769): Fixed: URLs with '-' in host are not detected by the [Auto Link](http://ckeditor.com/addon/autolink) plugin.
-* [#16804](https://dev.ckeditor.com/ticket/16804): Fixed: Focus is not on the first menu item when the user opens a context menu or a drop-down list from the editor toolbar.
-* [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
-* [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: An error thrown if a bundle containing the [Color Button](http://ckeditor.com/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
-* [#16920](http://dev.ckeditor.com/ticket/16920): Fixed: Several plugins not using the [Dialog](http://ckeditor.com/addon/dialog) plugin as a direct dependency.
-* [PR#336](https://github.com/ckeditor/ckeditor-dev/pull/336): Fixed: Typo in [`CKEDITOR.getCss`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getCss) API documentation. Thanks to [knusperpixel](https://github.com/knusperpixel)!
-* [#17027](http://dev.ckeditor.com/ticket/17027): Fixed: Command event data should be initialized as an empty object.
-* Fixed the behavior of HTML parser when parsing `src`/`srcdoc` attributes of the `<iframe>` element in a CKEditor setup with ACF turned off and without the [Iframe Dialog](http://ckeditor.com/addon/iframe) plugin. The issue was originally reported as a security issue by [Sriramk21](https://twitter.com/sriramk21) from Pegasystems and was later downgraded by the security team into a normal issue due to the requirement of having ACF turned off. Disabling [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) is against [security best practices](http://docs.ckeditor.com/#!/guide/dev_best_practices-section-security), so the problem described above has not been considered a security issue as such.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
-	* Fixed: DOM Exception after clicking "Remove Language" on a selected word with enabled [Language](http://ckeditor.com/addon/language) plugin in SCAYT.
-* [#16958](http://dev.ckeditor.com/ticket/16958): Switched the default MathJax CDN provider for the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin from `cdn.mathjax.org` to [cdnjs](https://cdnjs.com/), due to closing of `cdn.mathjax.org` scheduled for April 30, 2017.
-* [#16954](http://dev.ckeditor.com/ticket/16954): Removed the paste dialog.
-* [#16982](http://dev.ckeditor.com/ticket/16982): Latest Safari now supports enhanced Clipboard API introduced in CKEditor 4.5.0.
-* [#17025](http://dev.ckeditor.com/ticket/17025): Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.4.2.
-
-## CKEditor 4.6.2
-
-New Features:
-
-* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
-* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
-* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
-
-Fixed Issues:
-
-* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
-* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
-* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
-* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
-* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
-* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
-* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
-* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
-* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
-* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.6.1
-
-New Features:
-
-* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
-
-Fixed Issues:
-
-* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
-* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
-* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
-
-## CKEditor 4.6
-
-New Features:
-
-* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
-* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
-* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
-	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
-	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
-	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
-	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
-* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
-* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
-* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
-* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
-* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
-* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
-* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
-* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
-
-Fixed Issues:
-
-* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
-* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
-* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
-* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
-* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
-* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
-* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
-* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
-* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
-* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
-* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
-* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
-* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
-* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
-* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
-* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
-* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
-* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
-* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
-* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
-* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
-* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
- 	* Support for the new default Moono-Lisa skin.
- 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
- 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
- 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
- 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
-
-## CKEditor 4.5.11
-
-**Security Updates:**
-
-* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
-
-	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
-
-  An upgrade is recommended.
-
-New Features:
-
-* [#14747](http://dev.ckeditor.com/ticket/14747): The [Enhanced Image](http://ckeditor.com/addon/image2) caption now supports the link `target` attribute.
-* [#7154](http://dev.ckeditor.com/ticket/7154): Added support for the "Display Text" field to the [Link](http://ckeditor.com/addon/link) dialog. Thanks to [Ryan Guill](https://github.com/ryanguill)!
-
-Fixed Issues:
-
-* [#13362](http://dev.ckeditor.com/ticket/13362): [Blink, WebKit] Fixed: Active widget element is not cached when it is losing focus and it is inside an editable element.
-* [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images does not work.
-* [#13548](http://dev.ckeditor.com/ticket/13548): [IE] Fixed: Clicking the [elements path](http://ckeditor.com/addon/elementspath) disables Cut and Copy icons.
-* [#13812](http://dev.ckeditor.com/ticket/13812): Fixed: When aborting file upload the placeholder for image is left.
-* [#14659](http://dev.ckeditor.com/ticket/14659): [Blink] Fixed: Content scrolled to the top after closing the dialog in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-* [#14825](http://dev.ckeditor.com/ticket/14825): [Edge] Fixed: Focusing the editor causes unwanted scrolling due to dropped support for the `setActive` method.
-
-## CKEditor 4.5.10
-
-Fixed Issues:
-
-* [#10750](http://dev.ckeditor.com/ticket/10750): Fixed: The editor does not escape the `font-style` family property correctly, removing quotes and whitespace from font names.
-* [#14413](http://dev.ckeditor.com/ticket/14413): Fixed: The [Auto Grow](http://ckeditor.com/addon/autogrow) plugin with the [`config.autoGrow_onStartup`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoGrow_onStartup) option set to `true` does not work properly for an editor that is not visible.
-* [#14451](http://dev.ckeditor.com/ticket/14451): Fixed: Numeric element ID not escaped properly. Thanks to [Jakub Chalupa](https://github.com/chaluja7)!
-* [#14590](http://dev.ckeditor.com/ticket/14590): Fixed: Additional line break appearing after inline elements when switching modes. Thanks to [dpidcock](https://github.com/dpidcock)!
-* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting a widget.
-* [#14701](http://dev.ckeditor.com/ticket/14701): Fixed: More precise labels for [Enhanced Image](http://ckeditor.com/addon/image2) and [Placeholder](http://ckeditor.com/addon/placeholder) widgets.
-* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
-* [#14252](http://dev.ckeditor.com/ticket/14252): [IE] Fixed: Styles drop-down list does not always reflect the current style of the text line.
-* [#14275](http://dev.ckeditor.com/ticket/14275): [IE9+] Fixed: `onerror` and `onload` events are not used in browsers it could have been used when loading scripts dynamically.
-
-## CKEditor 4.5.9
-
-Fixed Issues:
-
-* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
-* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances.
-* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin.
-* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
-* [#14602](http://dev.ckeditor.com/ticket/14602): Fixed: The [`dom.element.removeAttribute()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeAttribute) method does not remove all attributes if no parameter is given.
-* [#8679](http://dev.ckeditor.com/ticket/8679): Fixed: Better focus indication and ability to style the selected color in the [color picker dialog](http://ckeditor.com/addon/colordialog).
-* [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
-* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
-
-## CKEditor 4.5.8
-
-New Features:
-
-* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).
-
-Fixed Issues:
-
-* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
-* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
-* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.
-
-## CKEditor 4.5.7
-
-New Features:
-
-* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!
-
-Fixed Issues:
-
-* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
-	* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
-	* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
-	* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
-	* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
-* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
-* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.
-
-## CKEditor 4.5.6
-
-New Features:
-
-* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
-* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
-	- New features:
-		- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
-		- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
-		- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
-		- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
-	- Fixed issues:
-		* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
-		* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
-		* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
-		* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
-		* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
-		* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
-		* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
-		* Issue with pasting SCAYT markup in CKEditor.
-		* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.
-
-## CKEditor 4.5.5
-
-Fixed Issues:
-
-* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)!
-* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: The [Link](http://ckeditor.com/addon/link) plugin dialog does not display the subject of email links if the subject parameter is not lowercase.
-* [#9192](http://dev.ckeditor.com/ticket/9192): Fixed: An `undefined` string is appended to an email address added with the [Link](http://ckeditor.com/addon/link) plugin if subject and email body are empty and [`config.emailProtection`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-emailProtection) is set to `encode`.
-* [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: It is not possible to destroy the editor `<iframe>` after the editor was detached from DOM. Thanks to [Stefan Rijnhart](https://github.com/StefanRijnhart)!
-* [#13803](https://dev.ckeditor.com/ticket/13803): Fixed: The editor cannot be destroyed before being fully initialized. Thanks to [Cyril Fluck](https://github.com/cyril-sf)!
-* [#13867](http://dev.ckeditor.com/ticket/13867): Fixed: CKEditor does not work when the `classList` polyfill is used.
-* [#13885](http://dev.ckeditor.com/ticket/13885): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) requires the [Link](http://ckeditor.com/addon/link) plugin to link an image.
-* [#13883](http://dev.ckeditor.com/ticket/13883): Fixed: Copying a table using the context menu strips off styles.
-* [#13872](http://dev.ckeditor.com/ticket/13872): Fixed: Cutting is possible in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode.
-* [#12848](http://dev.ckeditor.com/ticket/12848): [Blink] Fixed: Opening the [Find and Replace](http://ckeditor.com/addon/find) dialog window in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode throws an exception.
-* [#13879](http://dev.ckeditor.com/ticket/13879): Fixed: It is not possible to prevent the [`editor.drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop) event.
-* [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Skin images fail when the site path includes parentheses because the `background-image` path needs single quotes around the URL value.
-* [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: The `contents.css` style is not used if the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing.
-* [#13782](http://dev.ckeditor.com/ticket/13782): Fixed: Unclear log messages.
-* [#13919](http://dev.ckeditor.com/ticket/13919): [Edge] Fixed: Browser window crashes when accessing the `isContentEditable` property of an `<input>` DOM element.
-
-Other Changes:
-
-* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.
-
-## CKEditor 4.5.4
-
-New Features:
-
-* [#13632](http://dev.ckeditor.com/ticket/13632): Introduce error logging mechanism.
-* [#13730](http://dev.ckeditor.com/ticket/13730): Switch to the new error logging mechanism.
-
-Fixed Issues:
-
-* [#9856](http://dev.ckeditor.com/ticket/9856): Fixed: Cannot use the native context menu together with the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Mark Wade](https://github.com/mark-wade)!
-* [#12733](http://dev.ckeditor.com/ticket/12733): [IE9+] Fixed: Radio button `onChange` does not work. Thanks to [Iliya Kostadinov](https://github.com/iliyakostadinov)!
-* [#13142](http://dev.ckeditor.com/ticket/13142): [Edge] Fixed: *Ctrl+A* and then *Backspace* result in an empty `<div>` element.
-* [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor drag and drop of an inline widget results in error/artifacts.
-* [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside the `<body>` element is not handled correctly.
-* [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
-* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow the `<h1-6>` element to be a child of the `<summary>` element.
-* [#11724](http://dev.ckeditor.com/ticket/11724): [Touch devices] Fixed: Drop-downs often hide right after opening them.
-* [#13690](http://dev.ckeditor.com/ticket/13690): Fixed: Copying content from IE to Chrome adds an extra paragraph.
-* [#13284](http://dev.ckeditor.com/ticket/13284): Fixed: Cannot drag and drop a widget if the text caret is placed just after the widget instance.
-* [#13516](http://dev.ckeditor.com/ticket/13516): Fixed: CKEditor removes empty HTML5 anchors without the `name` attribute.
-* [#13765](http://dev.ckeditor.com/ticket/13765): [Safari 9] Fixed: Problems with rendering samples.
-
-Other Changes:
-
-* [#11725](http://dev.ckeditor.com/ticket/11725): Marked [`CKEDITOR.env.mobile`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-mobile) as deprecated. The reason is that it is no longer clear what "mobile" means.
-* [#13737](http://dev.ckeditor.com/ticket/13737): Upgraded [Bender.js](https://github.com/benderjs/benderjs) to 0.4.1.
-
-## CKEditor 4.5.3
-
-New Features:
-
-* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
-* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.
-
-Fixed Issues:
-
-* [#13590](http://dev.ckeditor.com/ticket/13590): Fixed: Various issues related to the [Paste from Word](http://ckeditor.com/addon/pastefromword) feature. Fixes also:
-  * [#11215](http://dev.ckeditor.com/ticket/11215),
-  * [#8780](http://dev.ckeditor.com/ticket/8780),
-  * [#12762](http://dev.ckeditor.com/ticket/12762).
-* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.
-* [#13568](http://dev.ckeditor.com/ticket/13568): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method returns invalid results for entire content selection.
-* [#13453](http://dev.ckeditor.com/ticket/13453): Fixed: Drag&drop of entire editor content throws an error.
-* [#13465](http://dev.ckeditor.com/ticket/13465): Fixed: Error is thrown and the widget is lost on drag&drop if it is the only content of the editor.
-* [#13414](http://dev.ckeditor.com/ticket/13414): Fixed: Content auto paragraphing in a nested editable despite editor configuration.
-* [#13429](http://dev.ckeditor.com/ticket/13429): Fixed: Incorrect selection after content insertion by the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-* [#13388](http://dev.ckeditor.com/ticket/13388): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) integration with [Undo](http://ckeditor.com/addon/undo) is broken.
-
-Other Changes:
-
-* [#13637](https://dev.ckeditor.com/ticket/13637): Several icons were refactored.
-* Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.3.0 and introduced the ability to run tests via HTTPs ([#13265](https://dev.ckeditor.com/ticket/13265)).
-
-## CKEditor 4.5.2
-
-Fixed Issues:
-
-* [#13609](http://dev.ckeditor.com/ticket/13609): [Edge] Fixed: The browser crashes when switching to the source mode. Thanks to [Andrew Williams and Mark Smeed](http://webxsolution.com/)!
-* [PR#201](https://github.com/ckeditor/ckeditor-dev/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
-* [#13422](http://dev.ckeditor.com/ticket/13422): Fixed: A monospaced font should be used in the `<textarea>` element storing editor configuration in the toolbar configurator.
-* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in the toolbar configurator if plugin requirements are not met.
-* [#13409](http://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
-* [#13434](http://dev.ckeditor.com/ticket/13434): Fixed: Dialog state indicator broken in Right–To–Left environments.
-* [#13460](http://dev.ckeditor.com/ticket/13460): [IE8] Fixed: Copying inline widgets is broken when [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) is disabled.
-* [#13495](http://dev.ckeditor.com/ticket/13495): [Firefox, IE] Fixed: Text is not word-wrapped in the Paste dialog window.
-* [#13528](http://dev.ckeditor.com/ticket/13528): [Firefox@Windows] Fixed: Content copied from Microsoft Word and other external applications is pasted as a plain text. Removed the `CKEDITOR.plugins.clipboard.isHtmlInExternalDataTransfer` property as the check must be dynamic.
-* [#13583](http://dev.ckeditor.com/ticket/13583): Fixed: [`DataTransfer.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer-method-getData) should work consistently in all browsers and should not strip valuable content. Fixed pasting tables from Microsoft Excel on Chrome.
-* [#13468](http://dev.ckeditor.com/ticket/13468): [IE] Fixed: Binding drag&drop `dataTransfer` does not work if `text` data was set in the meantime.
-* [#13451](http://dev.ckeditor.com/ticket/13451): [IE8-9] Fixed: One drag&drop operation may affect following ones.
-* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after a drop on editor UI.
-* [#13129](http://dev.ckeditor.com/ticket/13129) Fixed: Block widget blurred after a drop followed by an undo.
-* [#13397](http://dev.ckeditor.com/ticket/13397): Fixed: Drag&drop of a widget inside its nested widget crashes the editor.
-* [#13385](http://dev.ckeditor.com/ticket/13385): Fixed: [`editor.getSnapshot()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSnapshot) may return a non-string value.
-* [#13419](http://dev.ckeditor.com/ticket/13419): Fixed: The [Auto Link](http://ckeditor.com/addon/autolink) plugin does not encode double quotes in URLs.
-* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
-* [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
-* [#13566](http://dev.ckeditor.com/ticket/13566): Fixed: Suppressed notifications in the [Media Embed Base](http://ckeditor.com/addon/embedbase) plugin.
-* [#11616](http://dev.ckeditor.com/ticket/11616): [Chrome] Fixed: Resizing the editor while it is not displayed breaks the editable. Fixes also [#9160](http://dev.ckeditor.com/ticket/9160) and [#9715](http://dev.ckeditor.com/ticket/9715).
-* [#11376](http://dev.ckeditor.com/ticket/11376): [IE11] Fixed: Loss of text when pasting bulleted lists from Microsoft Word.
-* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost when opening the panel.
-* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown when loading the editor with developer tools open.
-* [#13574](http://dev.ckeditor.com/ticket/13574): [Edge] Fixed: "Permission denied" error thrown when opening editor dialog windows.
-* [#13441](http://dev.ckeditor.com/ticket/13441): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin breaks the state of [Undo](http://ckeditor.com/addon/undo) commands after a paste.
-* [#13554](http://dev.ckeditor.com/ticket/13554): [Edge] Fixed: Paste dialog's iframe does not receive focus on show.
-* [#13440](http://dev.ckeditor.com/ticket/13440): [Edge] Fixed: Unable to paste a widget.
-
-Other Changes:
-
-* [#13421](http://dev.ckeditor.com/ticket/13421): UX improvements to notifications in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-
-## CKEditor 4.5.1
-
-Fixed Issues:
-
-* [#13486](http://dev.ckeditor.com/ticket/13486): Fixed: The [Upload Image](http://ckeditor.com/addon/uploadimage) plugin should log an error, not throw an error when upload URL is not set.
-
-## CKEditor 4.5
-
-New Features:
-
-* [#13304](http://dev.ckeditor.com/ticket/13304): Added support for passing DOM elements to [`config.sharedSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-sharedSpaces). Thanks to [Undergrounder](https://github.com/Undergrounder)!
-* [#13215](http://dev.ckeditor.com/ticket/13215): Added ability to cancel fetching a resource by the Embed plugins.
-* [#13213](http://dev.ckeditor.com/ticket/13213): Added the [`dialog#setState()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-method-setState) method and used it in the [Embed](http://ckeditor.com/addon/embed) dialog to indicate that a resource is being loaded.
-* [#13337](http://dev.ckeditor.com/ticket/13337): Added the [`repository.onWidget()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-onWidget) method &mdash; a convenient way to listen to [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) events through the [repository](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository).
-* [#13214](http://dev.ckeditor.com/ticket/13214): Added support for pasting links that convert into embeddable resources on the fly.
-
-Fixed Issues:
-
-* [#13334](http://dev.ckeditor.com/ticket/13334): Fixed: Error after nesting widgets and playing with undo/redo.
-* [#13118](http://dev.ckeditor.com/ticket/13118): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method throws an error when called in the source mode.
-* [#13158](http://dev.ckeditor.com/ticket/13158): Fixed: Error after canceling a dialog when creating a widget.
-* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline [Enhanced Image](http://ckeditor.com/addon/image2) alignment class is not transferred to the widget wrapper.
-* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: [Semantic Embed](http://ckeditor.com/addon/embedsemantic) does not support widget classes.
-* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
-* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done, notification update should be marked as important.
-* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the [Image](http://ckeditor.com/addon/image) dialog seems to be never used.
-* [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are moved 10px to the right.
-* [#13280](http://dev.ckeditor.com/ticket/13280): [IE8] Fixed: Undo after inline widget drag&drop throws an error.
-* [#13186](http://dev.ckeditor.com/ticket/13186): Fixed: Content dropped into a nested editable is not filtered by [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf).
-* [#13140](http://dev.ckeditor.com/ticket/13140): Fixed: Error thrown when dropping a block widget right after itself.
-* [#13176](http://dev.ckeditor.com/ticket/13176): [IE8] Fixed: Errors on drag&drop of embed widgets.
-* [#13015](http://dev.ckeditor.com/ticket/13015): Fixed: Dropping an image file on [Enhanced Image](http://ckeditor.com/addon/image2) causes a page reload.
-* [#13080](http://dev.ckeditor.com/ticket/13080): Fixed: Ugly notification shown when the response contains HTML content.
-* [#13011](http://dev.ckeditor.com/ticket/13011): [IE8] Fixed: Anchors are duplicated on drag&drop in specific locations.
-* [#13105](http://dev.ckeditor.com/ticket/13105): Fixed: Various issues related to [`CKEDITOR.tools.htmlEncode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlEncode) and [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) methods.
-* [#11976](http://dev.ckeditor.com/ticket/11976): [Chrome] Fixed: Copy&paste and drag&drop lists from Microsoft Word.
-* [#13128](http://dev.ckeditor.com/ticket/13128): Fixed: Various issues with cloning element IDs:
-  * Fixed the default behavior of [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) and [`range.extractContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-extractContents) methods which now clone IDs similarly to their native counterparts.
-  * Added `cloneId` arguments to the above methods, [`range.splitBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-splitBlock) and [`element.breakParent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-breakParent). Mind the default values and special behavior in the `extractContents()` method!
-  * Fixed issues where IDs were lost on copy&paste and drag&drop.
-* Toolbar configurators:
-  * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
-  * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
-  * [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
-  * [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
-  * [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: [`config.removeButtons`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-removeButtons) is ignored by the advanced toolbar configurator.
-
-Other Changes:
-
-* [#13119](http://dev.ckeditor.com/ticket/13119): Improved compatibility of editor skins ([Moono](http://ckeditor.com/addon/moono) and [Kama](http://ckeditor.com/addon/kama)) with external web page style sheets.
-* Toolbar configurators:
-  * [#13147](http://dev.ckeditor.com/ticket/13147): Added buttons to the sticky toolbar.
-  * [#13207](http://dev.ckeditor.com/ticket/13207): Used modal window to display toolbar configurator help.
-* [#13316](http://dev.ckeditor.com/ticket/13316): Made [`CKEDITOR.env.isCompatible`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-isCompatible) a blacklist rather than a whitelist. More about the change in the [Browser Compatibility](http://docs.ckeditor.com/#!/guide/dev_browsers) guide.
-* [#13398](http://dev.ckeditor.com/ticket/13398): Renamed `CKEDITOR.fileTools.UploadsRepository` to [`CKEDITOR.fileTools.UploadRepository`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadRepository) and changed all related properties.
-* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.
-* [#13454](http://dev.ckeditor.com/ticket/13454): Removed unused `lang.image.alertUrl` token from the [Image](http://ckeditor.com/addon/image) plugin.
-
-## CKEditor 4.5 Beta
-
-New Features:
-
-* Clipboard (copy&paste, drag&drop) and file uploading features and improvements ([#11437](http://dev.ckeditor.com/ticket/11437)).
-
-  * Major features:
-    * Support for dropping and pasting files into the editor was introduced. Through a set of new facades for native APIs it is now possible to easily intercept and process inserted files.
-    * [File upload tools](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools) were introduced in order to simplify controlling the loading, uploading and handling server response, properly handle [new upload configuration](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uploadUrl) options, etc.
-    * [Upload Image](http://ckeditor.com/addon/uploadimage) widget was introduced to upload dropped images. A base class for the [upload widget](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition) was exposed, too, to make it simple to create new types of upload widgets which can handle any type of dropped file, show the upload progress and update the content when the process is done. It also handles editing and undo/redo operations when a file is being uploaded and integrates with the [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) to show progress and success or error.
-    * All drag and drop operations were integrated with the editor. All dropped content is passed through the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event and a set of new editor events was introduced &mdash; [`dragstart`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragstart), [`drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop), [`dragend`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragend).
-    * The [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) facade was introduced to unify access to data in various types and files. [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) is now always available in the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * Switched from the pastebin to using the native clipboard access whenever possible. This solved many issues related to pastebin such as unnecessary scrolling or data loss. Additionally, on copy and cut from the editor the clipboard data is set. Therefore, on paste the editor has access to clean data, undisturbed by the browsers.
-    * Drag and drop of inline and block widgets was integrated with the standard clipboard APIs. By listening to drag events you will thus be notified about widgets, too. This opens a possibility to filter pasted and dropped widgets.
-    * The [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event can have the `range` parameter so it is possible to change the paste position in the listener or paste in the not selectable position. Also the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method now accepts `range` as an additional parameter.
-    * [#11621](http://dev.ckeditor.com/ticket/11621): A configurable [paste filter](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFilter) was introduced. The filter is by default turned to `'semantic-content'` on Webkit and Blink for all pasted content coming from external sources because of the low quality of HTML that these engines put into the clipboard. Internal and cross-editor paste is safe due to the change explained in the previous point.
-
-  * Other changes and related fixes:
-    * [#12095](http://dev.ckeditor.com/ticket/12095): On drag and copy of widgets [the same method](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) is used to get selected HTML as in the normal case. Thanks to that styles applied to inline widgets are not lost.
-    * [#11219](http://dev.ckeditor.com/ticket/11219): Fixed: Dragging a [captioned image](http://ckeditor.com/addon/image2) does not fire the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * [#9554](http://dev.ckeditor.com/ticket/9554): [Webkit Mac] Fixed: Editor scrolls on paste.
-    * [#9898](http://dev.ckeditor.com/ticket/9898): [Webkit&Divarea] Fixed: Pasting causes undesirable scrolling.
-    * [#11993](http://dev.ckeditor.com/ticket/11993): [Chrome] Fixed: Pasting content scrolls the document.
-    * [#12613](http://dev.ckeditor.com/ticket/12613): Show the user that they can not drop on editor UI (toolbar, bottom bar).
-    * [#12851](http://dev.ckeditor.com/ticket/12851): [Blink/Webkit] Fixed: Formatting disappears when pasting content into cells.
-    * [#12914](http://dev.ckeditor.com/ticket/12914): Fixed: Copy/Paste of table broken in `div`-based editor.
-
-  * Browser support.<br>Browser support for related features varies significantly (see http://caniuse.com/clipboard).
-    * File APIs needed to operate and file upload is not supported in Internet Explorer 9 and below.
-    * Only Chrome and Safari on Mac OS support setting custom data items in the clipboard, so currently it is possible to recognize the origin of the copied content in these browsers only. All drag and drop operations can be identified thanks to the new Data Transfer facade.
-    * No Internet Explorer browser supports the standard clipboard API which results in small glitches like where only plain text can be dropped from outside the editor. Thanks to the new Data Transfer facade, internal and cross-editor drag and drop supports the full range of data.
-    * Direct access to clipboard could only be implemented in Chrome, Safari on Mac OS, Opera and Firefox. In other browsers the pastebin must still be used.
-
-* [#12875](http://dev.ckeditor.com/ticket/12875): Samples and toolbar configuration tools.
-  * The old set of samples shipped with every CKEditor package was replaced with a shiny new single-page sample. This change concluded a long term plan which started from introducing the [CKEditor SDK](http://sdk.ckeditor.com/) and [CKEditor Functionality Overview](http://docs.ckeditor.com/#!/guide/dev_features) section in the documentation which essentially redefined the old samples.
-  * Toolbar configurators with live previews were introduced. They will be shipped with every CKEditor package and are meant to help in configuring toolbar layouts.
-
-* [#10925](http://dev.ckeditor.com/ticket/10925): The [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins were introduced. Read more about the new features in the [Embedding Content](http://docs.ckeditor.com/#!/guide/dev_media_embed) article.
-* [#10931](http://dev.ckeditor.com/ticket/10931): Added support for nesting widgets. It is now possible to insert one widget into another widget's nested editable. Note that unless nested editable's [allowed content](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable.definition-property-allowedContent) is defined precisely, starting from CKEditor 4.5 some widget buttons may become enabled. This feature is not supported in IE8. Included issues:
-  * [#12018](http://dev.ckeditor.com/ticket/12018): Fixed and reviewed: Nested widgets garbage collection.
-  * [#12024](http://dev.ckeditor.com/ticket/12024): [Firefox] Fixed: Outline is extended to the left by unpositioned drag handlers.
-  * [#12006](http://dev.ckeditor.com/ticket/12006): Fixed: Drag and drop of nested block widgets.
-  * [#12008](http://dev.ckeditor.com/ticket/12008): Fixed various cases of inserting a single non-editable element using the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method. Fixes pasting a widget with a nested editable inside another widget's nested editable.
-
-* Notification system:
-  * [#11580](http://dev.ckeditor.com/ticket/11580): Introduced the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification).
-  * [#12810](http://dev.ckeditor.com/ticket/12810): Introduced a [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) for the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification) which simplifies displaying progress of many concurrent tasks.
-* [#11636](http://dev.ckeditor.com/ticket/11636): Introduced new, UX-focused, methods for getting selected HTML and deleting it &mdash; [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) and [`editor.extractSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-extractSelectedHtml).
-* [#12416](http://dev.ckeditor.com/ticket/12416): Added the [`widget.definition.upcastPriority`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-upcastPriority) property which gives more control over widget upcasting order to the widget author.
-* [#12036](http://dev.ckeditor.com/ticket/12036): Initialize the editor in [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode when the `<textarea>` element has a `readonly` attribute.
-* [#11905](http://dev.ckeditor.com/ticket/11905): The [`resize` event](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-resize) passes the current dimensions in its data.
-* [#12126](http://dev.ckeditor.com/ticket/12126): Introduced [`config.image_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image_prefillDimensions) and [`config.image2_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_prefillDimensions) to make pre-filling `width` and `height` configurable for the [Enhanced Image](http://ckeditor.com/addon/image2).
-* [#12746](http://dev.ckeditor.com/ticket/12746): Added a new configuration option to hide the [Enhanced Image](http://ckeditor.com/addon/image2) resizer.
-* [#12150](http://dev.ckeditor.com/ticket/12150): Exposed the [`getNestedEditable()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-static-method-getNestedEditable) and `is*` [widget helper](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) functions (see the static methods).
-* [#12448](http://dev.ckeditor.com/ticket/12448): Introduced the [`editable.insertHtmlIntoRange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertHtmlIntoRange) method.
-* [#12143](http://dev.ckeditor.com/ticket/12143): Added the [`config.floatSpacePreferRight`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-floatSpacePreferRight) configuration option that switches the alignment of the floating toolbar. Thanks to [InvisibleBacon](http://github.com/InvisibleBacon)!
-* [#10986](http://dev.ckeditor.com/ticket/10986): Added support for changing dialog input and textarea text directions by using the *Shift+Alt+Home/End* keystrokes. The direction is stored in the value of the input by prepending the [`\u202A`](http://unicode.org/cldr/utility/character.jsp?a=202A) or [`\u202B`](http://unicode.org/cldr/utility/character.jsp?a=202B) marker to it. Read more in the [documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog.definition.textInput-property-bidi). Thanks to [edithkk](https://github.com/edithkk)!
-* [#12770](http://dev.ckeditor.com/ticket/12770): Added support for passing [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget)'s startup data as a widget command's argument. Thanks to [Rebrov Boris](https://github.com/zipp3r) and [Tieme van Veen](https://github.com/tiemevanveen)!
-* [#11583](http://dev.ckeditor.com/ticket/11583): Added support for the HTML5 `required` attribute in various form elements. Thanks to [Steven Busse](https://github.com/sbusse)!
-
-Changes:
-
-* [#12858](http://dev.ckeditor.com/ticket/12858): Basic [Spartan](http://blogs.windows.com/bloggingwindows/2015/03/30/introducing-project-spartan-the-new-browser-built-for-windows-10/) browser compatibility. Full compatibility will be introduced later, because at the moment Spartan is still too unstable to be used for tests and we see many changes from version to version.
-* [#12948](http://dev.ckeditor.com/ticket/12948): The [`config.mathJaxLibrary`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-mathJaxLib) option does not default to the MathJax CDN any more. It needs to be configured to enable the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin now.
-* [#13069](http://dev.ckeditor.com/ticket/13069): Fixed inconsistencies between [`editable.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) and [`editable.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) when the `range` parameter is used. Now, the `editor.insertElement()` method works on a higher level, which means that it saves undo snapshots and sets the selection after insertion. Use the [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange) method directly for the pre 4.5 behavior of `editable.insertElement()`.
-* [#12870](http://dev.ckeditor.com/ticket/12870): Use [`editor.showNotification()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-showNotification) instead of `alert()` directly whenever possible. When the [Notification plugin](http://ckeditor.com/addon/notification) is loaded, the notification system is used automatically. Otherwise, the native `alert()` is displayed.
-* [#8024](http://dev.ckeditor.com/ticket/8024): Swapped behavior of the Split Cell Vertically and Horizontally features of the [Table Tools](http://ckeditor.com/addon/tabletools) plugin to be more intuitive. Thanks to [kevinisagit](https://github.com/kevinisagit)!
-* [#10903](http://dev.ckeditor.com/ticket/10903): Performance improvements for the [`dom.element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass), [`dom.element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass) and [`dom.element.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-hasClass) methods. Note: The previous implementation allowed passing multiple classes to `addClass()` although it was only a side effect of that implementation. The new implementation does not allow this.
-* [#11856](http://dev.ckeditor.com/ticket/11856): The jQuery adapter throws a meaningful error if CKEditor or jQuery are not loaded.
-
-Fixed issues:
-
-* [#11586](http://dev.ckeditor.com/ticket/11586): Fixed: [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) should not change the DOM in order not to affect selection.
-* [#12148](http://dev.ckeditor.com/ticket/12148): Fixed: [`dom.element.getChild()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getChild) should not modify a passed array.
-* [#12503](http://dev.ckeditor.com/ticket/12503): [Blink/Webkit] Fixed: Incorrect result of Select All and *Backspace* or *Delete*.
-* [#13001](http://dev.ckeditor.com/ticket/13001): [Firefox] Fixed: The `<br />` filler is placed in the wrong position by the [`range.fixBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-fixBlock) method due to quirky Firefox behavior.
-* [#13101](http://dev.ckeditor.com/ticket/13101): [IE8] Fixed: Colons are prepended to HTML5 element names when cloning them.
-
-## CKEditor 4.4.8
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Dheeraj Joshi](https://twitter.com/dheerajhere) and [Prem Kumar](https://twitter.com/iAmPr3m).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-Fixed Issues:
-
-* [#12899](http://dev.ckeditor.com/ticket/12899): Fixed: Corrected wrong tag ending for horizontal box definition in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin. Thanks to [mizafish](https://github.com/mizafish)!
-* [#13254](http://dev.ckeditor.com/ticket/13254): Fixed: Cannot outdent block after indent when using the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Jonathan Cottrill](https://github.com/jcttrll)!
-* [#13268](http://dev.ckeditor.com/ticket/13268): Fixed: Documentation for [`CKEDITOR.dom.text`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.text) is incorrect. Thanks to [Ben Kiefer](https://github.com/benkiefer)!
-* [#12739](http://dev.ckeditor.com/ticket/12739): Fixed: Link loses inline styles when edited without the [Advanced Tab for Dialogs](http://ckeditor.com/addon/dialogadvtab) plugin. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [#13292](http://dev.ckeditor.com/ticket/13292): Fixed: Protection pattern does not work in attribute in self-closing elements with no space before `/>`. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [PR#192](https://github.com/ckeditor/ckeditor-dev/pull/192): Fixed: Variable name typo in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](http://docs.ckeditor.com/#!/api/CKEDITOR.ui.dialog.radio) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
-* [#13232](http://dev.ckeditor.com/ticket/13232): [Safari] Fixed: The [`element.appendText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-appendText) method does not work properly for empty elements.
-* [#13233](http://dev.ckeditor.com/ticket/13233): Fixed: [HTMLDataProcessor](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) can process `foo:href` attributes.
-* [#12796](http://dev.ckeditor.com/ticket/12796): Fixed: The [Indent List](http://ckeditor.com/addon/indentlist) plugin unwraps parent `<li>` elements. Thanks to [Andrew Stucki](https://github.com/andrewstucki)!
-* [#12885](http://dev.ckeditor.com/ticket/12885): Added missing [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) parameter documentation.
-* [#11982](http://dev.ckeditor.com/ticket/11982): Fixed: Bullet added in a wrong position after the *Enter* key is pressed in a nested list.
-* [#13027](http://dev.ckeditor.com/ticket/13027): Fixed: Keyboard navigation in dialog windows with multiple tabs not following IBM CI 162 instructions or [ARIA Authoring Practices](http://www.w3.org/TR/2013/WD-wai-aria-practices-20130307/#tabpanel).
-* [#12256](http://dev.ckeditor.com/ticket/12256): Fixed: Basic styles classes are lost when pasting from Microsoft Word if [basic styles](http://ckeditor.com/addon/basicstyles) were configured to use classes.
-* [#12729](http://dev.ckeditor.com/ticket/12729): Fixed: Incorrect structure created when merging a block into a list item on *Backspace* and *Delete*.
-* [#13031](http://dev.ckeditor.com/ticket/13031): [Firefox] Fixed: No more line breaks in source view since Firefox 36.
-* [#13131](http://dev.ckeditor.com/ticket/13131): Fixed: The [Code Snippet](http://ckeditor.com/addon/codesnippet) plugin cannot be used without the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin.
-* [#9086](http://dev.ckeditor.com/ticket/9086): Fixed: Invalid ARIA property used on paste area `<iframe>`.
-* [#13164](http://dev.ckeditor.com/ticket/13164): Fixed: Error when inserting a hidden field.
-* [#13155](http://dev.ckeditor.com/ticket/13155): Fixed: Incorrect [Line Utilities](http://ckeditor.com/addon/lineutils) positioning when `<body>` has a margin.
-* [#13351](http://dev.ckeditor.com/ticket/13351): Fixed: Link lost when editing a linked image with the Link tab disabled. This also fixed a bug when inserting an image into a fully selected link would throw an error ([#12847](https://dev.ckeditor.com/ticket/12847)).
-* [#13344](http://dev.ckeditor.com/ticket/13344): [WebKit/Blink] Fixed: It is possible to remove or change editor content in [read-only mode](http://docs.ckeditor.com/#!/guide/dev_readonly).
-
-Other Changes:
-
-* [#12844](http://dev.ckeditor.com/ticket/12844) and [#13103](http://dev.ckeditor.com/ticket/13103): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.3`.
-* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licensing issues, `truncated-mathjax/` is now removed from the `tests/` directory. Now `bender.config.mathJaxLibPath` must be configured manually in order to run [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin tests.
-* [#13266](http://dev.ckeditor.com/ticket/13266): Added more shades of gray in the [Color Dialog](http://ckeditor.com/addon/colordialog) window. Thanks to [mizafish](https://github.com/mizafish)!
-
-
-## CKEditor 4.4.7
-
-Fixed Issues:
-
-* [#12825](http://dev.ckeditor.com/ticket/12825): Fixed: Preventing the [Table Resize](http://ckeditor.com/addon/tableresize) plugin from operating on elements outside the editor. Thanks to [Paul Martin](https://github.com/Paul-Martin)!
-* [#12157](http://dev.ckeditor.com/ticket/12157): Fixed: Lost text formatting on pressing *Tab* when the [`config.tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces) configuration option value was greater than zero.
-* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
-* [#12812](http://dev.ckeditor.com/ticket/12812): Fixed: An uncaught security exception is thrown when [Line Utilities](http://ckeditor.com/addon/lineutils) are used in an inline editor loaded in a cross-domain `iframe`. Thanks to [Vitaliy Zurian](https://github.com/thecatontheflat)!
-* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
-* [#10032](http://dev.ckeditor.com/ticket/10032): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter is executed for every paste after using the button.
-* [#12597](http://dev.ckeditor.com/ticket/12597): [Blink/WebKit] Fixed: Multi-byte Japanese characters entry not working properly after *Shift+Enter*.
-* [#12387](http://dev.ckeditor.com/ticket/12387): Fixed: An error is thrown if a skin does not have the [`chameleon`](http://docs.ckeditor.com/#!/api/CKEDITOR.skin-method-chameleon) property defined and [`config.uiColor`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uiColor) is defined.
-* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when the editor is maximized results in incorrect drop-down panel position.
-* [#12850](http://dev.ckeditor.com/ticket/12850): [IEQM] Fixed: An error is thrown after focusing the editor.
-
-## CKEditor 4.4.6
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format).
-* [#12550](http://dev.ckeditor.com/ticket/12550): Added the `<main>` element to the [`CKEDITOR.dtd`](http://docs.ckeditor.com/#!/api/CKEDITOR.dtd).
-
-Fixed Issues:
-
-* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Cannot paste into inline editor if the page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)!
-* [#12683](http://dev.ckeditor.com/ticket/12683): Fixed: [Filter](http://docs.ckeditor.com/#!/guide/dev_acf) fails to remove custom tags. Thanks to [timselier](https://github.com/timselier)!
-* [#12489](http://dev.ckeditor.com/ticket/12489) and [#12491](http://dev.ckeditor.com/ticket/12491): Fixed: Various issues related to restoring the selection after performing operations on filler character. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
-* [#12621](http://dev.ckeditor.com/ticket/12621): Fixed: Cannot remove inline styles (bold, italic, etc.) in empty lines.
-* [#12630](http://dev.ckeditor.com/ticket/12630): [Chrome] Fixed: Selection is placed outside the paragraph when the [New Page](http://ckeditor.com/addon/newpage) button is clicked. This patch significantly simplified the way how the initial selection (a selection after the content of the editable is overwritten) is being fixed. That might have fixed many related scenarios in all browsers.
-* [#11647](http://dev.ckeditor.com/ticket/11647): Fixed: The [`editor.blur`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-blur) event is not fired on first blur after initializing the inline editor on an already focused element.
-* [#12601](http://dev.ckeditor.com/ticket/12601): Fixed: [Strikethrough](http://ckeditor.com/addon/basicstyles) button tooltip spelling.
-* [#12546](http://dev.ckeditor.com/ticket/12546): Fixed: The Preview tab in the [Document Properties](http://ckeditor.com/addon/docprops) dialog window is always disabled.
-* [#12300](http://dev.ckeditor.com/ticket/12300): Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event fired on first navigation key press after typing.
-* [#12141](http://dev.ckeditor.com/ticket/12141): Fixed: List items are lost when indenting a list item with content wrapped with a block element.
-* [#12515](http://dev.ckeditor.com/ticket/12515): Fixed: Cursor is in the wrong position when undoing after adding an image and typing some text.
-* [#12484](http://dev.ckeditor.com/ticket/12484): [Blink/WebKit] Fixed: DOM is changed outside the editor area in a certain case.
-* [#12688](http://dev.ckeditor.com/ticket/12688): Improved the tests of the [styles system](http://docs.ckeditor.com/#!/api/CKEDITOR.style) and fixed two minor issues.
-* [#12403](http://dev.ckeditor.com/ticket/12403): Fixed: Changing the [font](http://ckeditor.com/addon/font) style should not lead to nesting it in the previous style element.
-* [#12609](http://dev.ckeditor.com/ticket/12609): Fixed: Incorrect `config.magicline_putEverywhere` name used for a [Magic Line](http://ckeditor.com/addon/magicline) all-encompassing [`config.magicline_everywhere`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-magicline_everywhere) configuration option.
-
-
-## CKEditor 4.4.5
-
-New Features:
-
-* [#12279](http://dev.ckeditor.com/ticket/12279): Added a possibility to pass a custom evaluator to [`node.getAscendant()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.node-method-getAscendant).
-
-Fixed Issues:
-
-* [#12423](http://dev.ckeditor.com/ticket/12423): [Safari7.1+] Fixed: *Enter* key moved cursor to a strange position.
-* [#12381](http://dev.ckeditor.com/ticket/12381): [iOS] Fixed: Selection issue. Thanks to [Remiremi](https://github.com/Remiremi)!
-* [#10804](http://dev.ckeditor.com/ticket/10804): Fixed: `CKEDITOR_GETURL` is not used with some plugins where it should be used. Thanks to [Thomas Andraschko](https://github.com/tandraschko)!
-* [#9137](http://dev.ckeditor.com/ticket/9137): Fixed: The `<base>` tag is not created when `<head>` has an attribute. Thanks to [naoki.fujikawa](https://github.com/naoki-fujikawa)!
-* [#12377](http://dev.ckeditor.com/ticket/12377): Fixed: Errors thrown in the [Image](http://ckeditor.com/addon/image) plugin when removing preview from the dialog window definition. Thanks to [Axinet](https://github.com/Axinet)!
-* [#12162](http://dev.ckeditor.com/ticket/12162): Fixed: Auto paragraphing and *Enter* key in nested editables.
-* [#12315](http://dev.ckeditor.com/ticket/12315): Fixed: Marked [`config.autoParagraph`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoParagraph) as deprecated.
-* [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: A [code snippet](http://ckeditor.com/addon/codesnippet) should be presented in the [elements path](http://ckeditor.com/addon/elementspath) as "code snippet" (translatable).
-* [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) should also remove `<cite>` elements.
-* [#12261](http://dev.ckeditor.com/ticket/12261): Fixed: Filter has to be destroyed and removed from [`CKEDITOR.filter.instances`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-static-property-instances) on editor destroy.
-* [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: [Maximize](http://ckeditor.com/addon/maximize) does not work on an instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#12097](http://dev.ckeditor.com/ticket/12097): Fixed: JAWS not reading the number of options correctly in the [Text Color and Background Color](http://ckeditor.com/addon/colorbutton) button menu.
-* [#12411](http://dev.ckeditor.com/ticket/12411): Fixed: [Page Break](http://ckeditor.com/addon/pagebreak) used directly in the editable breaks the editor.
-* [#12354](http://dev.ckeditor.com/ticket/12354): Fixed: Various issues in undo manager when holding keys.
-* [#12324](http://dev.ckeditor.com/ticket/12324): [IE8] Fixed: Undo steps are not recorded when changing the caret position by clicking below the body.
-* [#12332](http://dev.ckeditor.com/ticket/12332): Fixed: Lowered DOM events listeners' priorities in undo manager in order to avoid ambiguity.
-* [#12402](http://dev.ckeditor.com/ticket/12402): [Blink] Fixed: Workaround for Blink bug with `document.title` which breaks updating title in the full HTML mode.
-* [#12338](http://dev.ckeditor.com/ticket/12338): Fixed: The CKEditor package contains unoptimized images.
-
-
-## CKEditor 4.4.4
-
-Fixed Issues:
-
-* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of [UI Color](http://ckeditor.com/addon/uicolor) YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
-* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter does not properly normalize semicolons style text. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost when pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#111739](http://dev.ckeditor.com/ticket/11739): Fixed: `keypress` listeners should not be used in the undo manager. A complete rewrite of keyboard handling in the undo manager was made. Numerous smaller issues were fixed, among others:
-  * [#10926](http://dev.ckeditor.com/ticket/10926): [Chrome@Android] Fixed: Typing does not record snapshots and does not fire the [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-  * [#11611](http://dev.ckeditor.com/ticket/11611): [Firefox] Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event is fired when pressing Arrow keys.
-  * [#12219](http://dev.ckeditor.com/ticket/12219): [Safari] Fixed: Some modifications of the [`UndoManager.locked`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-property-locked) property violate strict mode in the [Undo](http://ckeditor.com/addon/undo) plugin.
-* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed: [Magic Line](http://ckeditor.com/addon/magicline) icon in Right-To-Left environments.
-* [#11970](http://dev.ckeditor.com/ticket/11970): [IE] Fixed: CKEditor `paste` event is not fired when pasting with *Shift+Ins*.
-* [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog window by doubleclicking.
-* [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
-* [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in a description list breaks it.
-* [#12218](http://dev.ckeditor.com/ticket/12218): Fixed: Minor syntax issue in CSS files.
-* [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/WebKit] Fixed: Iterator does not return the block if the selection is located at the end of it.
-* [#12185](http://dev.ckeditor.com/ticket/12185): [IE9QM] Fixed: Error thrown when moving the mouse over focused editor's scrollbar.
-* [#12215](http://dev.ckeditor.com/ticket/12215): Fixed: Basepath resolution does not recognize semicolon as a query separator.
-* [#12135](http://dev.ckeditor.com/ticket/12135): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) does not work on widgets.
-* [#12298](http://dev.ckeditor.com/ticket/12298): [IE11] Fixed: Clicking below `<body>` in Compatibility Mode will no longer reset selection to the first line.
-* [#12204](http://dev.ckeditor.com/ticket/12204): Fixed: Editor's voice label is not affected by [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#11915](http://dev.ckeditor.com/ticket/11915): Fixed: With [SCAYT](http://ckeditor.com/addon/scayt) enabled, cursor moves to the beginning of the first highlighted, misspelled word after typing or pasting into the editor.
-* [SCAYT](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/69): Fixed: Error thrown in the console after enabling [SCAYT](http://ckeditor.com/addon/scayt) and trying to add a new image.
-
-
-Other Changes:
-
-* [#12296](http://dev.ckeditor.com/ticket/12296): Merged `benderjs-ckeditor` into the main CKEditor repository.
-
-## CKEditor 4.4.3
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the Preview plugin reported by Mario Heiderich of [Cure53](https://cure53.de/).
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12164](http://dev.ckeditor.com/ticket/12164): Added the "Justify" option to the "Horizontal Alignment" drop-down in the Table Cell Properties dialog window.
-
-Fixed Issues:
-
-* [#12110](http://dev.ckeditor.com/ticket/12110): Fixed: Editor crash after deleting a table. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: *Enter* key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)!
-* [#12140](http://dev.ckeditor.com/ticket/12140): Fixed: Double-clicking linked widgets opens two dialog windows.
-* [#12132](http://dev.ckeditor.com/ticket/12132): Fixed: Image is inserted with `width` and `height` styles even when they are not allowed.
-* [#9317](http://dev.ckeditor.com/ticket/9317): [IE] Fixed: [`config.disableObjectResizing`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableObjectResizing) does not work on IE. **Note**: We were not able to fix this issue on IE11+ because necessary events stopped working. See a [last resort workaround](http://dev.ckeditor.com/ticket/9317#comment:16) and make sure to [support our complaint to Microsoft](https://connect.microsoft.com/IE/feedback/details/742593/please-respect-execcommand-enableobjectresizing-in-contenteditable-elements).
-* [#9638](http://dev.ckeditor.com/ticket/9638): Fixed: There should be no information about accessibility help available under the *Alt+0* keyboard shortcut if the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) plugin is not available.
-* [#8117](http://dev.ckeditor.com/ticket/8117) and [#9186](http://dev.ckeditor.com/ticket/9186): Fixed: In HTML5 `<meta>` tags should be allowed everywhere, including inside the `<body>` element.
-* [#10422](http://dev.ckeditor.com/ticket/10422): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) not working properly if a function is specified.
-
-## CKEditor 4.4.2
-
-Important Notes:
-
-* The CKEditor testing environment is now publicly available. Read more about how to set up the environment and execute tests in the [CKEditor Testing Environment](http://docs.ckeditor.com/#!/guide/dev_tests) guide.
-	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor-dev/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor-dev/).
-
-New Features:
-
-* [#11909](http://dev.ckeditor.com/ticket/11909): Introduced a parameter to prevent the [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) method from recording undo snapshots.
-
-Fixed Issues:
-
-* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
-* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
-* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to [adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) configuration.
-* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image link.
-* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method was improved.
-* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
-* [#12022](http://dev.ckeditor.com/ticket/12022): Fixed: Outer widget's drag handler is not created at all if it has any nested widgets inside.
-* [#11960](http://dev.ckeditor.com/ticket/11960): [Blink/WebKit] Fixed: The caret should be scrolled into view on *Backspace* and *Delete* (covers only the merging blocks case).
-* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/WebKit] Fixed: No widget entries in the context menu on widget right-click.
-* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window are not translated.
-* [#11980](http://dev.ckeditor.com/ticket/11980): [Blink/WebKit] Fixed: `<span>` elements created when joining adjacent elements (non-collapsed selection).
-* [#12009](http://dev.ckeditor.com/ticket/12009): [Nested widgets] Integration with the [Magic Line](http://ckeditor.com/addon/magicline) plugin.
-* [#11387](http://dev.ckeditor.com/ticket/11387): Fixed: `role="radiogroup"` should be applied only to radio inputs' container.
-* [#7975](http://dev.ckeditor.com/ticket/7975): [IE8] Fixed: Errors when trying to select an empty table cell.
-* [#11947](http://dev.ckeditor.com/ticket/11947): [Firefox+IE11] Fixed: *Shift+Enter* in lists produces two line breaks.
-* [#11972](http://dev.ckeditor.com/ticket/11972): Fixed: Feature detection in the [`element.setText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setText) method should not trigger the layout engine.
-* [#7634](http://dev.ckeditor.com/ticket/7634): Fixed: The [Flash Dialog](http://ckeditor.com/addon/flash) plugin omits the `allowFullScreen` parameter in the editor data if set to `true`.
-* [#11910](http://dev.ckeditor.com/ticket/11910): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) does not take [`config.baseHref`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-baseHref) into account when updating image dimensions.
-* [#11753](http://dev.ckeditor.com/ticket/11753): Fixed: Wrong [`checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method value after focusing or blurring a widget.
-* [#11830](http://dev.ckeditor.com/ticket/11830): Fixed: Impossible to pass some arguments to [CKBuilder](https://github.com/ckeditor/ckbuilder) when using the `/dev/builder/build.sh` script.
-* [#11945](http://dev.ckeditor.com/ticket/11945): Fixed: [Form Elements](http://ckeditor.com/addon/forms) plugin should not change a core method.
-* [#11384](http://dev.ckeditor.com/ticket/11384): [IE9+] Fixed: `IndexSizeError` thrown when pasting into a non-empty selection anchored in one text node.
-
-## CKEditor 4.4.1
-
-New Features:
-
-* [#9661](http://dev.ckeditor.com/ticket/9661): Added the option to [configure](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-linkJavaScriptLinksAllowed) anchor tags with JavaScript code in the `href` attribute.
-
-Fixed Issues:
-
-* [#11861](http://dev.ckeditor.com/ticket/11861): [WebKit/Blink] Fixed: Span elements created while joining adjacent elements. **Note:** This patch only covers cases when *Backspace* or *Delete* is pressed on a collapsed (empty) selection. The remaining case, with a non-empty selection, will be fixed in the next release.
-* [#10714](http://dev.ckeditor.com/ticket/10714): [iOS] Fixed: Selection and drop-downs are broken if a touch event listener is used due to a [WebKit bug](https://bugs.webkit.org/show_bug.cgi?id=128924). Thanks to [Arty Gus](https://github.com/artygus)!
-* [#11911](http://dev.ckeditor.com/ticket/11911): Fixed setting the `dir` attribute for a preloaded language in [CKEDITOR.lang](http://docs.ckeditor.com/#!/api/CKEDITOR.lang). Thanks to [Akash Mohapatra](https://github.com/akashmohapatra)!
-* [#11926](http://dev.ckeditor.com/ticket/11926): Fixed: [Code Snippet](http://ckeditor.com/addon/codesnippet) does not decode HTML entities when loading code from the `<code>` element.
-* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: Issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the `<title>` element.
-* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin dependency from the [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
-* [#11754](http://dev.ckeditor.com/ticket/11754): [Chrome] Fixed: Infinite loop when content includes not closed attributes.
-* [#11848](http://dev.ckeditor.com/ticket/11848): [IE] Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception when there was no selection in the editor.
-* [#11801](http://dev.ckeditor.com/ticket/11801): Fixed: Editor anchors unavailable when linking the [Enhanced Image](http://ckeditor.com/addon/image2) widget.
-* [#11626](http://dev.ckeditor.com/ticket/11626): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) sets invalid column width.
-* [#11872](http://dev.ckeditor.com/ticket/11872): Made [`element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass) chainable symmetrically to [`element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass).
-* [#11813](http://dev.ckeditor.com/ticket/11813): Fixed: Link lost while pasting a captioned image and restoring an undo snapshot ([Enhanced Image](http://ckeditor.com/addon/image2)).
-* [#11814](http://dev.ckeditor.com/ticket/11814): Fixed: _Link_ and _Unlink_ entries persistently displayed in the [Enhanced Image](http://ckeditor.com/addon/image2) context menu.
-* [#11839](http://dev.ckeditor.com/ticket/11839): [IE9] Fixed: The caret jumps out of the editable area when resizing the editor in the source mode.
-* [#11822](http://dev.ckeditor.com/ticket/11822): [WebKit] Fixed: Editing anchors by double-click is broken in some cases.
-* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws an error over scrollbar.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change the language back to _Not set_ in the [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog window.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with the `contenteditable` attribute set to `true`.
-* [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting a non-editable element inside a table cell breaks the table.
-* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop-down is not "on" when clicking it while the editor is blurred.
-* [#11850](http://dev.ckeditor.com/ticket/11850): Fixed: Fake objects with the `contenteditable` attribute set to `false` are not downcasted properly.
-* [#11811](http://dev.ckeditor.com/ticket/11811): Fixed: Widget's data is not encoded correctly when passed to an attribute.
-* [#11777](http://dev.ckeditor.com/ticket/11777): Fixed encoding ampersand in the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin.
-* [#11880](http://dev.ckeditor.com/ticket/11880): [IE8-9] Fixed: Linked image has a default thick border.
-
-Other Changes:
-
-* [#11807](http://dev.ckeditor.com/ticket/11807): Updated jQuery version used in the sample to 1.11.0 and tested CKEditor jQuery Adapter with version 1.11.0 and 2.1.0.
-* [#9504](http://dev.ckeditor.com/ticket/9504): Stopped using deprecated `attribute.specified` in all browsers except Internet Explorer.
-* [#11809](http://dev.ckeditor.com/ticket/11809): Changed tab size in `<pre>` to 4 spaces.
-
-## CKEditor 4.4
-
-**Important Notes:**
-
-* Marked the [`editor.beforePaste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-beforePaste) event as deprecated.
-* The default class of captioned images has changed to `image` (was: `caption`). Please note that once edited in CKEditor 4.4+, all existing images of the `caption` class (`<figure class="caption">`) will be [filtered out](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) unless the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option is set to `caption`. For backward compatibility (i.e. when upgrading), it is highly recommended to use this setting, which also helps prevent CSS conflicts, etc. This does not apply to new CKEditor integrations.
-* Widgets without defined buttons are no longer registered automatically to the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter). Before CKEditor 4.4 widgets were registered to the ACF which was an incorrect behavior ([#11567](http://dev.ckeditor.com/ticket/11567)). This change should not have any impact on standard scenarios, but if your button does not execute the widget command, you need to set [`allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-allowedContent) and [`requiredContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-requiredContent) properties for it manually, because the editor will not be able to find them.
-* The [Show Borders](http://ckeditor.com/addon/showborders) plugin was added to the Standard installation package in order to ensure that unstyled tables are still visible for the user ([#11665](http://dev.ckeditor.com/ticket/11665)).
-* Since CKEditor 4.4 the editor instance should be passed to [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) methods to ensure full compatibility with other features (e.g. applying styles to widgets requires that). We ensured backward compatibility though, so the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) will work even when the editor instance is not provided.
-
-New Features:
-
-* [#11297](http://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles) section of the "Syles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
-  * Introduced the [`CKEDITOR.style.addCustomHandler()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-static-method-addCustomHandler) method for registering custom style handlers.
-  * The [`CKEDITOR.style.apply()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-apply) and [`CKEDITOR.style.remove()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-remove) methods are now called with an editor instance instead of the document so they can be reused by the [`CKEDITOR.editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) and [`CKEDITOR.editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) methods. Backward compatibility was preserved, but from CKEditor 4.4 it is highly recommended to pass an editor instead of a document to these methods.
-  * Many new methods and properties were introduced in the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) to make the handling of styles by widgets fully customizable. See: [`widget.definition.styleableElements`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleableElements), [`widget.definition.styleToAllowedContentRule`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleToAllowedContentRules), [`widget.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-addClass), [`widget.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeClass), [`widget.getClasses()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-getClasses), [`widget.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-hasClass), [`widget.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-applyStyle), [`widget.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeStyle), [`widget.checkStyleActive()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-checkStyleActive).
-  * Integration with the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) required an introduction of the [`CKEDITOR.style.toAllowedContent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-toAllowedContentRules) method which can be implemented by the custom style handler and if exists, it is used by the [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) to translate a style to [allowed content rules](http://docs.ckeditor.com/#!/api/CKEDITOR.filter.allowedContentRules).
-* [#11300](http://dev.ckeditor.com/ticket/11300): Various changes in the [Enhanced Image](http://ckeditor.com/addon/image2) plugin:
-  * Introduced the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option to configure the class of captioned images.
-  * Introduced the [`config.image2_alignClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_alignClasses) option to configure the way images are aligned with CSS classes.
-  If this setting is defined, the editor produces classes instead of inline styles for aligned images.
-  * Default image caption can be translated (customized) with the `editor.lang.image2.captionPlaceholder` string.
-* [#11341](http://dev.ckeditor.com/ticket/11341): [Enhanced Image](http://ckeditor.com/addon/image2) plugin: It is now possible to add a link to any image type.
-* [#10202](http://dev.ckeditor.com/ticket/10202): Introduced wildcard support in the [Allowed Content Rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) format.
-* [#10276](http://dev.ckeditor.com/ticket/10276): Introduced blacklisting in the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#10480](http://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](http://ckeditor.com/addon/codesnippet) which uses the [highlight.js](http://highlightjs.org) library and the [Code Snippet GeSHi](http://ckeditor.com/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
-* [#11737](http://dev.ckeditor.com/ticket/11737): Introduced an option to prevent [filtering](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) of an element that matches custom criteria (see [`filter.addElementCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-method-addElementCallback)).
-* [#11532](http://dev.ckeditor.com/ticket/11532): Introduced the [`editor.addContentsCss()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addContentsCss) method that can be used for [adding custom CSS files](http://docs.ckeditor.com/#!/guide/plugin_sdk_styles).
-* [#11536](http://dev.ckeditor.com/ticket/11536): Added the [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) method for decoding HTML entities.
-* [#11225](http://dev.ckeditor.com/ticket/11225): Introduced the [`CKEDITOR.tools.transparentImageData`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-property-transparentImageData) property which contains transparent image data to be used in CSS or as image source.
-
-Other Changes:
-
-* [#11377](http://dev.ckeditor.com/ticket/11377): Unified internal representation of empty anchors using the [fake objects](http://ckeditor.com/addon/fakeobjects).
-* [#11422](http://dev.ckeditor.com/ticket/11422): Removed Firefox 3.x, Internet Explorer 6 and Opera 12.x leftovers in code.
-* [#5217](http://dev.ckeditor.com/ticket/5217): Setting data (including switching between modes) creates a new undo snapshot. Besides that:
-  * Introduced the [`editable.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-property-status) property.
-  * Introduced a new `forceUpdate` option for the [`editor.lockSnapshot`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-lockSnapshot) event.
-  * Fixed: Selection not being unlocked in inline editor after setting data ([#11500](http://dev.ckeditor.com/ticket/11500)).
-* The [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin was updated to the latest version.
-
-Fixed Issues:
-
-* [#10190](http://dev.ckeditor.com/ticket/10190): Fixed: Removing block style with [`editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) should result in a paragraph and not a div.
-* [#11727](http://dev.ckeditor.com/ticket/11727): Fixed: The editor tries to select a non-editable image which was clicked.
-
-## CKEditor 4.3.5
-
-New Features:
-
-* Added new translation: Tatar.
-
-Fixed Issues:
-
-* [#11677](http://dev.ckeditor.com/ticket/11677): Fixed: Undo/Redo keystrokes are blocked in the source mode.
-* [#11717](http://dev.ckeditor.com/ticket/11717): [Document Properties](http://ckeditor.com/addon/docprops) plugin requires the [Color Dialog](http://ckeditor.com/addon/colordialog) plugin to work.
-
-## CKEditor 4.3.4
-
-Fixed Issues:
-
-* [#11597](http://dev.ckeditor.com/ticket/11597): [IE11] Fixed: Error thrown when trying to open the [preview](http://ckeditor.com/addon/preview) using the keyboard.
-* [#11544](http://dev.ckeditor.com/ticket/11544): [Placeholders](http://ckeditor.com/addon/placeholder) will no longer be upcasted in parents not accepting `<span>` elements.
-* [#8663](http://dev.ckeditor.com/ticket/8663): Fixed [`element.renameNode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-renameNode) not clearing the [`element.getName()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getName) cache.
-* [#11574](http://dev.ckeditor.com/ticket/11574): Fixed: *Backspace* destroying the DOM structure if an inline editable is placed in a list item.
-* [#11603](http://dev.ckeditor.com/ticket/11603): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) attaches to tables outside the editable.
-* [#9205](http://dev.ckeditor.com/ticket/9205), [#7805](http://dev.ckeditor.com/ticket/7805), [#8216](http://dev.ckeditor.com/ticket/8216): Fixed: `{cke_protected_1}` appearing in data in various cases where HTML comments are placed next to `"` or `'`.
-* [#11635](http://dev.ckeditor.com/ticket/11635): Fixed: Some attributes are not protected before the content is passed through the fix bin.
-* [#11660](http://dev.ckeditor.com/ticket/11660): [IE] Fixed: Table content is lost when some extra markup is inside the table.
-* [#11641](http://dev.ckeditor.com/ticket/11641): Fixed: Switching between modes in the classic editor removes content styles for the inline editor.
-* [#11568](http://dev.ckeditor.com/ticket/11568): Fixed: [Styles](http://ckeditor.com/addon/stylescombo) drop-down list is not enabled on selection change.
-
-## CKEditor 4.3.3
-
-Fixed Issues:
-
-* [#11500](http://dev.ckeditor.com/ticket/11500): [WebKit/Blink] Fixed: Selection lost when setting data in another inline editor. Additionally, [`selection.removeAllRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-removeAllRanges) is now scoped to selection's [root](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-property-root).
-* [#11104](http://dev.ckeditor.com/ticket/11104): [IE] Fixed: Various issues with scrolling and selection when focusing widgets.
-* [#11487](http://dev.ckeditor.com/ticket/11487): Moving mouse over the [Enhanced Image](http://ckeditor.com/addon/image2) widget will no longer change the value returned by the [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method.
-* [#8673](http://dev.ckeditor.com/ticket/8673): [WebKit] Fixed: Cannot select and remove the [Page Break](http://ckeditor.com/addon/pagebreak).
-* [#11413](http://dev.ckeditor.com/ticket/11413): Fixed: Incorrect [`editor.execCommand()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand) behavior.
-* [#11438](http://dev.ckeditor.com/ticket/11438): Splitting table cells vertically is no longer changing table structure.
-* [#8899](http://dev.ckeditor.com/ticket/8899): Fixed: Links in the [About CKEditor](http://ckeditor.com/addon/about) dialog window now open in a new browser window or tab.
-* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed: [Menu button](http://ckeditor.com/addon/menubutton) panel not showing in the source mode.
-* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not canceled anymore after editing was triggered.
-* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#11359](http://dev.ckeditor.com/ticket/11359): Standardized the way anchors are discovered by the [Link](http://ckeditor.com/addon/link) plugin.
-* [#11058](http://dev.ckeditor.com/ticket/11058): [IE8] Fixed: Error when deleting a table row.
-* [#11508](http://dev.ckeditor.com/ticket/11508): Fixed: [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) discovering protected attributes within other attributes' values.
-* [#11533](http://dev.ckeditor.com/ticket/11533): Widgets: Avoid recurring upcasts if the DOM structure was modified during an upcast.
-* [#11400](http://dev.ckeditor.com/ticket/11400): Fixed: The [`domObject.removeAllListeners()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.domObject-method-removeAllListeners) method does not remove custom listeners completely.
-* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed: The [`selection.getRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) method does not override cached ranges when used with the `onlyEditables` argument.
-* [#11390](http://dev.ckeditor.com/ticket/11390): [IE] All [XML](http://ckeditor.com/addon/xml) plugin [methods](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) now work in IE10+.
-* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when Right-to-Left UI language is set.
-* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When [`config.fullPage`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fullPage) is set to `true`, entities are not encoded in editor output.
-* [#11004](http://dev.ckeditor.com/ticket/11004): Integrated [Enhanced Image](http://ckeditor.com/addon/image2) dialog window with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#11439](http://dev.ckeditor.com/ticket/11439): Fixed: Properties get cloned in the Cell Properties dialog window if multiple cells are selected.
-
-## CKEditor 4.3.2
-
-Fixed Issues:
-
-* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
-* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
-  * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
-  * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
-  * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
-  * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
-* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
-* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
-  * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
-  * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
-* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
-* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
-* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
-* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
-* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
-* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
-* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
-* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
-* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
-* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
-* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
-* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
-* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
-* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
-* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
-* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
-* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
-* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
-* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
-* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
-* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
-* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
-* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
-
-## CKEditor 4.3.1
-
-**Important Notes:**
-
-* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
-* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
-
-Fixed Issues:
-
-* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
-* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
-* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
-* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
-* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
-* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
-* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
-* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
-* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
-* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
-* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
-* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
-* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
-* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
-* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
-* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
-* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
-* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
-* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
-* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
-* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
-* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
-* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
-* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
-* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
-* [#11200](http://dev.ckeditor.com/ticket/11200):  Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
-
-## CKEditor 4.3
-
-New Features:
-
-* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 support.
-* [#10869](http://dev.ckeditor.com/ticket/10869): Widgets: Added better integration with the [Elements Path](http://ckeditor.com/addon/elementspath) plugin.
-* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: Added tooltip to the drag handle.
-* [#10933](http://dev.ckeditor.com/ticket/10933): Widgets: Introduced drag and drop of block widgets with the [Line Utilities](http://ckeditor.com/addon/lineutils) plugin.
-* [#10936](http://dev.ckeditor.com/ticket/10936): Widget System changes for easier integration with other dialog systems.
-* [#10895](http://dev.ckeditor.com/ticket/10895): [Enhanced Image](http://ckeditor.com/addon/image2): Added file browser integration.
-* [#11002](http://dev.ckeditor.com/ticket/11002): Added the [`draggable`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-draggable) option to disable drag and drop support for widgets.
-* [#10937](http://dev.ckeditor.com/ticket/10937): [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget improvements:
-  * loading indicator ([#10948](http://dev.ckeditor.com/ticket/10948)),
-  * applying paragraph changes (like font color change) to iframe ([#10841](http://dev.ckeditor.com/ticket/10841)),
-  * Firefox and IE9 clipboard fixes ([#10857](http://dev.ckeditor.com/ticket/10857)),
-  * fixing same origin policy issue ([#10840](http://dev.ckeditor.com/ticket/10840)),
-  * fixing undo bugs ([#10842](http://dev.ckeditor.com/ticket/10842), [#10930](http://dev.ckeditor.com/ticket/10930)),
-  * fixing other minor bugs.
-* [#10862](http://dev.ckeditor.com/ticket/10862): [Placeholder](http://ckeditor.com/addon/placeholder) plugin was rewritten as a widget.
-* [#10822](http://dev.ckeditor.com/ticket/10822): Added styles system integration with non-editable elements (for example widgets) and their nested editables. Styles cannot change non-editable content and are applied in nested editable only if allowed by its type and content filter.
-* [#10856](http://dev.ckeditor.com/ticket/10856): Menu buttons will now toggle the visibility of their panels when clicked multiple times. [Language](http://ckeditor.com/addon/language) plugin fixes: Added active language highlighting, added an option to remove the language.
-* [#10028](http://dev.ckeditor.com/ticket/10028): New [`config.dialog_noConfirmCancel`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-dialog_noConfirmCancel) configuration option that eliminates the need to confirm closing of a dialog window when the user changed any of its fields.
-* [#10848](http://dev.ckeditor.com/ticket/10848): Integrate remaining plugins ([Styles](http://ckeditor.com/addon/stylescombo), [Format](http://ckeditor.com/addon/format), [Font](http://ckeditor.com/addon/font), [Color Button](http://ckeditor.com/addon/colorbutton), [Language](http://ckeditor.com/addon/language) and [Indent](http://ckeditor.com/addon/indent)) with [active filter](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter).
-* [#10855](http://dev.ckeditor.com/ticket/10855): Change the extension of emoticons in the [BBCode](http://ckeditor.com/addon/bbcode) sample from GIF to PNG.
-
-Fixed Issues:
-
-* [#10831](http://dev.ckeditor.com/ticket/10831): [Enhanced Image](http://ckeditor.com/addon/image2): Merged `image2inline` and `image2block` into one `image2` widget.
-* [#10835](http://dev.ckeditor.com/ticket/10835): [Enhanced Image](http://ckeditor.com/addon/image2): Improved visibility of the resize handle.
-* [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
-* [#10939](http://dev.ckeditor.com/ticket/10939): [Firefox] [Enhanced Image](http://ckeditor.com/addon/image2): hovering the image causes it to change.
-* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10833](http://dev.ckeditor.com/ticket/10833): Fixed: *Lock ratio* option should be on by default in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behavior in nested editables.
-* [#10879](http://dev.ckeditor.com/ticket/10879): [Remove Format](http://ckeditor.com/addon/removeformat) should not leak from a nested editable.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [WebSpellChecker](http://ckeditor.com/addon/wsc) fails to apply changes if a nested editable was focused.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [SCAYT](http://ckeditor.com/addon/wsc) blocks typing in nested editables.
-* [#11079](http://dev.ckeditor.com/ticket/11079): Add button icons to the [Placeholder](http://ckeditor.com/addon/placeholder) sample.
-* [#10870](http://dev.ckeditor.com/ticket/10870): The `paste` command is no longer being disabled when the clipboard is empty.
-* [#10854](http://dev.ckeditor.com/ticket/10854): Fixed: Firefox prepends `<br>` to `<body>`, so it is stripped by the HTML data processor.
-* [#10823](http://dev.ckeditor.com/ticket/10823): Fixed: [Link](http://ckeditor.com/addon/link) plugin does not work with non-editable content.
-* [#10828](http://dev.ckeditor.com/ticket/10828): [Magic Line](http://ckeditor.com/addon/magicline) integration with the Widget System.
-* [#10865](http://dev.ckeditor.com/ticket/10865): Improved hiding copybin, so copying widgets works smoothly.
-* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts use CSS reset.
-* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed: Block commands break on widgets; added the [`contentDomInvalidated`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-contentDomInvalidated) event.
-* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of the [Image](http://ckeditor.com/addon/image) plugin on the [Form Elements](http://ckeditor.com/addon/forms) plugin.
-* [#10911](http://dev.ckeditor.com/ticket/10911): Fixed: Browser *Alt* hotkeys will no longer be blocked while a widget is focused.
-* [#11082](http://dev.ckeditor.com/ticket/11082): Fixed: Selected widget is not copied or cut when using toolbar buttons or context menu.
-* [#11083](http://dev.ckeditor.com/ticket/11083): Fixed list and div element application to block widgets.
-* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
-* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widget drag and drop, because of seriously buggy native `range#moveToPoint` method.
-* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed: Wrong selection position after undoing widget drag and drop.
-* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed: IFrame and Flash objects are being incorrectly pasted in certain conditions.
-* [#11129](http://dev.ckeditor.com/ticket/11129): Page break is lost when loading data.
-* [#11123](http://dev.ckeditor.com/ticket/11123): [Firefox] Widget is destroyed after being dragged outside of `<body>`.
-* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed the [Elements Path](http://ckeditor.com/addon/elementspath) in an editor using the [Div Editing Area](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.3 Beta
-
-New Features:
-
-* [#9764](http://dev.ckeditor.com/ticket/9764): Widget System.
-  * [Widget plugin](http://ckeditor.com/addon/widget) introducing the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget).
-  * New [`editor.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) and [`editor.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-shiftEnterMode) properties &ndash; normalized versions of [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) and [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-  * Dynamic editor settings. Starting from CKEditor 4.3 Beta, *Enter* mode values and [content filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) instances may be changed dynamically (for example when the caret was placed in an element in which editor features should be adjusted). When you are implementing a new editor feature, you should base its behavior on [dynamic](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) or [static](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) *Enter* mode values depending on whether this feature works in selection context or globally on editor content.
-      * Dynamic *Enter* mode values &ndash; [`editor.setActiveEnterMode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveEnterMode) method, [`editor.activeEnterModeChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeEnterModeChange) event, and two properties: [`editor.activeEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) and [`editor.activeShiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeShiftEnterMode).
-      * Dynamic content filter instances &ndash; [`editor.setActiveFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveFilter) method, [`editor.activeFilterChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeFilterChange) event, and [`editor.activeFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter) property.
-  * "Fake" selection was introduced. It makes it possible to virtually select any element when the real selection remains hidden. See the  [`selection.fake()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-fake) method.
-  * Default [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied to non-editable elements (elements with `contenteditable` attribute set to `false` and their descendants) anymore. To add a rule which will be applied to all elements you need to pass an additional argument to the [`filter.addRules()`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter-method-addRules) method.
-  * Dozens of new methods were introduced &ndash; most interesting ones:
-      * [`document.find()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-find),
-      * [`document.findOne()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-findOne),
-      * [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange),
-      * [`range.moveToClosestEditablePosition()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-moveToClosestEditablePosition),
-      * New methods for [`htmlParser.node`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.node) and [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element).
-* [#10659](http://dev.ckeditor.com/ticket/10659): New [Enhanced Image](http://ckeditor.com/addon/image2) plugin that introduces a widget with integrated image captions, an option to center images, and dynamic "click and drag" resizing.
-* [#10664](http://dev.ckeditor.com/ticket/10664): New [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin that introduces the MathJax widget.
-* [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
-* [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
-
-## CKEditor 4.2.3
-
-Fixed Issues:
-
-* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: Loading external jQuery library when opening the [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) sample directly from file.
-* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening the color palette.
-* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/WebKit] Fixed: A non-breaking space is created once a character is deleted and a regular space is typed.
-* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with the keyboard shortcut for [Magic Line](http://ckeditor.com/addon/magicline).
-* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
-
-## CKEditor 4.2.2
-
-Fixed Issues:
-
-* [#9314](http://dev.ckeditor.com/ticket/9314): Fixed: Incorrect error message on closing a dialog window without saving changs.
-* [#10308](http://dev.ckeditor.com/ticket/10308): [IE10] Fixed: Unspecified error when deleting a row.
-* [#10945](http://dev.ckeditor.com/ticket/10945): [Chrome] Fixed: Clicking with a mouse inside the editor does not show the caret.
-* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
-* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed [`CKEDITOR.plugins.addExternal()`](http://docs.ckeditor.com/#!/api/CKEDITOR.resourceManager-method-addExternal) not handling paths including file name specified.
-* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed [`CKEDITOR.tools.isArray()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-isArray) not working cross frame.
-* [#10910](http://dev.ckeditor.com/ticket/10910): [IE9] Fixed JavaScript error thrown in Compatibility Mode when clicking and/or typing in the editing area.
-* [#10868](http://dev.ckeditor.com/ticket/10868): [IE8] Prevent the browser from crashing when applying the Inline Quotation style.
-* [#10915](http://dev.ckeditor.com/ticket/10915): Fixed: Invalid CSS filter in the Kama skin.
-* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock) are now included in the build configuration.
-* [#10812](http://dev.ckeditor.com/ticket/10812): Fixed [`range.createBookmark2()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-createBookmark2) incorrectly normalizing offsets. This bug was causing many issues: [#10850](http://dev.ckeditor.com/ticket/10850), [#10842](http://dev.ckeditor.com/ticket/10842).
-* [#10951](http://dev.ckeditor.com/ticket/10951): Reviewed and optimized focus handling on panels (combo, menu buttons, color buttons, and context menu) to enhance accessibility. Fixed [#10705](http://dev.ckeditor.com/ticket/10705), [#10706](http://dev.ckeditor.com/ticket/10706) and [#10707](http://dev.ckeditor.com/ticket/10707).
-* [#10704](http://dev.ckeditor.com/ticket/10704): Fixed a JAWS issue with the Select Color dialog window title not being announced.
-* [#10753](http://dev.ckeditor.com/ticket/10753): The floating toolbar in inline instances now has a dedicated accessibility label.
-
-## CKEditor 4.2.1
-
-Fixed Issues:
-
-* [#10301](http://dev.ckeditor.com/ticket/10301): [IE9-10] Undo fails after 3+ consecutive paste actions with a JavaScript error.
-* [#10689](http://dev.ckeditor.com/ticket/10689): Save toolbar button saves only the first editor instance.
-* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition (`dir`) from main language file to core.
-* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
-* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
-* [#9958](http://dev.ckeditor.com/ticket/9958): [IE9] Pressing the "OK" button will trigger the `onbeforeunload` event in the popup dialog.
-* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from the Styles drop-down list not registering to the ACF in case when the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
-* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with Internet Explorer 10 Quirks Mode.
-* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
-* [#10646](http://dev.ckeditor.com/ticket/10646): Removing a selected sublist or nested table with *Backspace/Delete* removes the parent element.
-* [#10623](http://dev.ckeditor.com/ticket/10623): [WebKit] Page is scrolled when opening a drop-down list.
-* [#10004](http://dev.ckeditor.com/ticket/10004): [ChromeVox] Button names are not announced.
-* [#10731](http://dev.ckeditor.com/ticket/10731): [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin breaks cloning of editor configuration.
-* It is now possible to set per instance [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin configuration instead of setting the configuration globally.
-
-## CKEditor 4.2
-
-**Important Notes:**
-
-* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
-
-* Both the Basic and the Standard distribution packages will not contain the new [Indent Block](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the Indent Block plugin in [CKBuilder](http://ckeditor.com/builder).
-
-New Features:
-
-* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock).
-* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
-* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
-* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
-* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
-* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements &mdash; introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
-* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.
-
-Fixed Issues:
-
-* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [List](http://ckeditor.com/addon/list) plugin.
-* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
-* [#10438](http://dev.ckeditor.com/ticket/10438): [FF, IE] No selection is done on an editable element on executing [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData).
-
-## CKEditor 4.1.3
-
-New Features:
-
-* Added new translation: Indonesian.
-
-Fixed Issues:
-
-* [#10644](http://dev.ckeditor.com/ticket/10644): Fixed a critical bug when pasting plain text in Blink-based browsers.
-* [#5189](http://dev.ckeditor.com/ticket/5189): [Find/Replace](http://ckeditor.com/addon/find) dialog window: rename "Cancel" button to "Close".
-* [#10562](http://dev.ckeditor.com/ticket/10562): [Housekeeping] Unified CSS gradient filter formats in the [Moono](http://ckeditor.com/addon/moono) skin.
-* [#10537](http://dev.ckeditor.com/ticket/10537): Advanced Content Filter should register a default rule for [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-* [#10610](http://dev.ckeditor.com/ticket/10610): [`CKEDITOR.dialog.addIframe()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-static-method-addIframe) incorrectly sets the iframe size in dialog windows.
-
-## CKEditor 4.1.2
-
-New Features:
-
-* Added new translation: Sinhala.
-
-Fixed Issues:
-
-* [#10339](http://dev.ckeditor.com/ticket/10339): Fixed: Error thrown when inserted data was totally stripped out after filtering and processing.
-* [#10298](http://dev.ckeditor.com/ticket/10298): Fixed: Data processor breaks attributes containing protected parts.
-* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: [`editable.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertText) loses characters when `RegExp` replace controls are being inserted.
-* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error when `document.domain` has been altered.
-* [#9761](http://dev.ckeditor.com/ticket/9761): Update the *Backspace* key state in [`keystrokeHandler.blockedKeystrokes`](http://docs.ckeditor.com/#!/api/CKEDITOR.keystrokeHandler-property-blockedKeystrokes) when calling [`editor.setReadOnly()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly).
-* [#6504](http://dev.ckeditor.com/ticket/6504): Fixed: Race condition while loading several [`config.customConfig`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-customConfig) files.
-* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#10360](http://dev.ckeditor.com/ticket/10360): Fixed: ARIA `role="application"` should not be used for dialog windows.
-* [#10361](http://dev.ckeditor.com/ticket/10361): Fixed: ARIA `role="application"` should not be used for floating panels.
-* [#10510](http://dev.ckeditor.com/ticket/10510): Introduced unique voice labels to differentiate between different editor instances.
-* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
-* [#10389](http://dev.ckeditor.com/ticket/10389): Fixed: Invalid HTML in the "Text and Table" template.
-* [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin user interface was changed to match CKEditor 4 style.
-
-## CKEditor 4.1.1
-
-New Features:
-
-* Added new translation: Albanian.
-
-Fixed Issues:
-
-* [#10172](http://dev.ckeditor.com/ticket/10172): Pressing *Delete* or *Backspace* in an empty table cell moves the cursor to the next/previous cell.
-* [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an editor instance in parallel with a `mouseup` event.
-* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in the [File Browser](http://ckeditor.com/addon/filebrowser) plugin.
-* [#10249](http://dev.ckeditor.com/ticket/10249): Wrong undo/redo states at start.
-* [#10268](http://dev.ckeditor.com/ticket/10268): [Show Blocks](http://ckeditor.com/addon/showblocks) does not recover after switching to Source view.
-* [#9995](http://dev.ckeditor.com/ticket/9995): HTML code in the `<textarea>` should not be modified by the [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor).
-* [#10320](http://dev.ckeditor.com/ticket/10320): [Justify](http://ckeditor.com/addon/justify) plugin should add elements to Advanced Content Filter based on current [Enter mode](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode).
-* [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks [`tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces). Unified `data-cke-*` attributes filtering.
-* [#10315](http://dev.ckeditor.com/ticket/10315): [WebKit] [Undo manager](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager) should not record snapshots after a filling character was added/removed.
-* [#10291](http://dev.ckeditor.com/ticket/10291): [WebKit] Space after a filling character should be secured.
-* [#10330](http://dev.ckeditor.com/ticket/10330): [WebKit] The filling character is not removed on `keydown` in specific cases.
-* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: Styled text pasted from MS Word causes an infinite loop.
-* [#10131](http://dev.ckeditor.com/ticket/10131): Fixed: [`undoManager.update()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-method-update) does not refresh the command state.
-* [#10337](http://dev.ckeditor.com/ticket/10337): Fixed: Unable to remove `<s>` using [Remove Format](http://ckeditor.com/addon/removeformat).
-
-## CKEditor 4.1
-
-Fixed Issues:
-
-* [#10192](http://dev.ckeditor.com/ticket/10192): Closing lists with the *Enter* key does not work with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) in several cases.
-* [#10191](http://dev.ckeditor.com/ticket/10191): Fixed allowed content rules unification, so the [`filter.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-property-allowedContent) property always contains rules in the same format.
-* [#10224](http://dev.ckeditor.com/ticket/10224): Advanced Content Filter does not remove non-empty `<a>` elements anymore.
-* Minor issues in plugin integration with Advanced Content Filter:
-  * [#10166](http://dev.ckeditor.com/ticket/10166): Added transformation from the `align` attribute to `float` style to preserve backward compatibility after the introduction of Advanced Content Filter.
-  * [#10195](http://dev.ckeditor.com/ticket/10195): [Image](http://ckeditor.com/addon/image) plugin no longer registers rules for links to Advanced Content Filter.
-  * [#10213](http://dev.ckeditor.com/ticket/10213): [Justify](http://ckeditor.com/addon/justify) plugin is now correctly registering rules to Advanced Content Filter when [`config.justifyClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-justifyClasses) is defined.
-
-## CKEditor 4.1 RC
-
-New Features:
-
-* [#9829](http://dev.ckeditor.com/ticket/9829): Advanced Content Filter - data and features activation based on editor configuration.
-
-  Brand new data filtering system that works in 2 modes:
-
-  * Based on loaded features (toolbar items, plugins) - the data will be filtered according to what the editor in its
-  current configuration can handle.
-  * Based on [`config.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent) rules - the data
-  will be filtered and the editor features (toolbar items, commands, keystrokes) will be enabled if they are allowed.
-
-  See the `datafiltering.html` sample, [guides](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) and [`CKEDITOR.filter` API documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#9387](http://dev.ckeditor.com/ticket/9387): Reintroduced [Shared Spaces](http://ckeditor.com/addon/sharedspace) - the ability to display toolbar and bottom editor space in selected locations and to share them by different editor instances.
-* [#9907](http://dev.ckeditor.com/ticket/9907): Added the [`contentPreview`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-contentPreview) event for preview data manipulation.
-* [#9713](http://dev.ckeditor.com/ticket/9713): Introduced the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin that brings raw HTML editing for inline editor instances.
-* Included in [#9829](http://dev.ckeditor.com/ticket/9829): Introduced new events, [`toHtml`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toHtml) and [`toDataFormat`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toDataFormat), allowing for better integration with data processing.
-* [#9981](http://dev.ckeditor.com/ticket/9981): Added ability to filter [`htmlParser.fragment`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.fragment), [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element) etc. by many [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter)s before writing structure to an HTML string.
-* Included in [#10103](http://dev.ckeditor.com/ticket/10103):
-  * Introduced the [`editor.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-status) property to make it easier to check the current status of the editor.
-  * Default [`command`](http://docs.ckeditor.com/#!/api/CKEDITOR.command) state is now [`CKEDITOR.TRISTATE_DISABLE`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-TRISTATE_DISABLED). It will be activated on [`editor.instanceReady`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-instanceReady) or immediately after being added if the editor is already initialized.
-* [#9796](http://dev.ckeditor.com/ticket/9796): Introduced `<s>` as a default tag for strikethrough, which replaces obsolete `<strike>` in HTML5.
-
-## CKEditor 4.0.3
-
-Fixed Issues:
-
-* [#10196](http://dev.ckeditor.com/ticket/10196): Fixed context menus not opening with keyboard shortcuts when [Autogrow](http://ckeditor.com/addon/autogrow) is enabled.
-* [#10212](http://dev.ckeditor.com/ticket/10212): [IE7-10] Undo command throws errors after multiple switches between Source and WYSIWYG view.
-* [#10219](http://dev.ckeditor.com/ticket/10219): [Inline editor] Error thrown after calling [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy).
-
-## CKEditor 4.0.2
-
-Fixed Issues:
-
-* [#9779](http://dev.ckeditor.com/ticket/9779): Fixed overriding [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl) with `CKEDITOR_GETURL`.
-* [#9772](http://dev.ckeditor.com/ticket/9772): Custom buttons in the dialog window footer have different look and size ([Moono](http://ckeditor.com/addon/moono), [Kama](http://ckeditor.com/addon/kama) skins).
-* [#9029](http://dev.ckeditor.com/ticket/9029): Custom styles added with the [`stylesSet.add()`](http://docs.ckeditor.com/#!/api/CKEDITOR.stylesSet-method-add) are displayed in the wrong order.
-* [#9887](http://dev.ckeditor.com/ticket/9887): Disable [Magic Line](http://ckeditor.com/addon/magicline) when [`editor.readOnly`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) is set.
-* [#9882](http://dev.ckeditor.com/ticket/9882): Fixed empty document title on [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) if set via the Document Properties dialog window.
-* [#9773](http://dev.ckeditor.com/ticket/9773): Fixed rendering problems with selection fields in the Kama skin.
-* [#9851](http://dev.ckeditor.com/ticket/9851): The [`selectionChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-selectionChange) event is not fired when mouse selection ended outside editable.
-* [#9903](http://dev.ckeditor.com/ticket/9903): [Inline editor] Bad positioning of floating space with page horizontal scroll.
-* [#9872](http://dev.ckeditor.com/ticket/9872): [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) returns `true` when called onload. Removed the obsolete `editor.mayBeDirty` flag.
-* [#9893](http://dev.ckeditor.com/ticket/9893): [IE] Fixed broken toolbar when editing mixed direction content in Quirks mode.
-* [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the [Link](http://ckeditor.com/addon/link) dialog window when the Anchor option is used and no anchors are available.
-* [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with [divarea](http://ckeditor.com/addon/divarea)-based editors.
-* [#9940](http://dev.ckeditor.com/ticket/9940): [Firefox] Navigating back to a page with the editor was making the entire page editable.
-* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed [Magic Line](http://ckeditor.com/addon/magicline) keystrokes.
-* [#9507](http://dev.ckeditor.com/ticket/9507): [Firefox] Selection is moved before editable position when the editor is focused for the first time.
-* [#9947](http://dev.ckeditor.com/ticket/9947): [WebKit] Editor overflows parent container in some edge cases.
-* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken [sourcearea](http://ckeditor.com/addon/sourcearea) view when an RTL language is set.
-* [#10123](http://dev.ckeditor.com/ticket/10123): [WebKit] Fixed: Several dialog windows have broken layout since the latest WebKit release.
-* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.
-
-## CKEditor 4.0.1.1
-
-Fixed Issues:
-
-* Security update: Added protection against XSS attack and possible path disclosure in the PHP sample.
-
-## CKEditor 4.0.1
-
-Fixed Issues:
-
-* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in the new [Moono skin](http://ckeditor.com/addon/moono).
-* Accessibility issues (mainly in inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
-* [Magic Line](http://ckeditor.com/addon/magicline) plugin:
-    * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic Line.
-    * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic Line support for forms.
-    * [#9573](http://dev.ckeditor.com/ticket/9573): Magic Line does not disappear on `mouseout` in a specific case.
-* [#9754](http://dev.ckeditor.com/ticket/9754): [WebKit] Cutting & pasting simple unformatted text generates an inline wrapper in WebKit browsers.
-* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS Word.
-* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
-* Context menu:
-    * [#9712](http://dev.ckeditor.com/ticket/9712): Opening the context menu destroys editor focus.
-    * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over the floating toolbar.
-    * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates a JavaScript error in inline mode when the editor is attached to a header element.
-* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing the window.
-* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div-based editor puts the editing area under the bottom UI space.
-* [#9528](http://dev.ckeditor.com/ticket/9528): Host page `box-sizing` style should not influence the editor UI elements.
-* [#9503](http://dev.ckeditor.com/ticket/9503): [Form Elements](http://ckeditor.com/addon/forms) plugin adds context menu listeners only on supported input types. Added support for `tel`, `email`, `search` and `url` input types.
-* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in a narrow window.
-* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog window does not populate width correctly.
-* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in a nested table removes the outer table cell.
-* [#9815](http://dev.ckeditor.com/ticket/9815): Cannot edit dialog window fields in an editor initialized in the jQuery UI modal dialog.
-* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialog windows do not show completely in a small window.
-* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a `<div>` element stay permanently even after the user exits editing the `<div>`.
-* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing the Format drop-down list by clicking its button.
-* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when the `border-width` style is specified.
-* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read-only mode.
-* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected images.
-* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>` elements.
-* [#9709](http://dev.ckeditor.com/ticket/9709): [Paste from Word](http://ckeditor.com/addon/pastefromword) should not depend on configuration from other styles.
-* [#9726](http://dev.ckeditor.com/ticket/9726): Removed [Color Dialog](http://ckeditor.com/addon/colordialog) plugin dependency from [Table Tools](http://ckeditor.com/addon/tabletools).
-* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly in the [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp) dialog window.
-* [#9771](http://dev.ckeditor.com/ticket/9771): [WebKit & Opera] Fixed scrolling issues when pasting.
-* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] `onChange` is not fired for checkboxes in dialogs.
-* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When opening a toolbar menu for the first time and pressing the *Down Arrow* key, focus goes to the next toolbar button instead of the menu options.
-* [#9847](http://dev.ckeditor.com/ticket/9847): [Elements Path](http://ckeditor.com/addon/elementspath) should not be initialized in the inline editor.
-* [#9853](http://dev.ckeditor.com/ticket/9853): [`editor.addRemoveFormatFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addRemoveFormatFilter) is exposed before it really works.
-* [#8893](http://dev.ckeditor.com/ticket/8893): Value of the [`pasteFromWordCleanupFile`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordCleanupFile) configuration option is now taken from the instance configuration.
-* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "Live Preview" checkbox from UI color picker.
-
-
-## CKEditor 4.0
-
-The first stable release of the new CKEditor 4 code line.
-
-The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
-possible. The list of relevant changes can be found in the [API Changes page of
-the CKEditor 4 documentation][1].
-
-[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes"
diff --git a/js/ckeditor/LICENSE.md b/js/ckeditor/LICENSE.md
deleted file mode 100644
index 044e7daf9..000000000
--- a/js/ckeditor/LICENSE.md
+++ /dev/null
@@ -1,1420 +0,0 @@
-Software License Agreement
-==========================
-
-CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-   (See Appendix A)
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-   (See Appendix B)
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-   (See Appendix C)
-
-You are not required to, but if you want to explicitly declare the
-license you have chosen to be bound to when using, reproducing,
-modifying and distributing this software, just include a text file
-titled "legal.txt" in your version of this software, indicating your
-license choice. In any case, your choice will not restrict any
-recipient of your version of this software to use, reproduce, modify
-and distribute this software under any of the above licenses.
-
-Sources of Intellectual Property Included in CKEditor
------------------------------------------------------
-
-Where not otherwise indicated, all CKEditor content is authored by
-CKSource engineers and consists of CKSource-owned intellectual
-property. In some specific instances, CKEditor will incorporate work
-done by developers outside of CKSource with their express permission.
-
-The following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
-* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
-* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
-
-Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
-
-The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
-
-* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
-
-The following libraries are included in CKEditor under the BSD-3 License (see Appendix F):
-
-* highlight.js (included in the `codesnippet` plugin) - Copyright (c) 2006, Ivan Sagalaev.
-* YUI Library (included in the `uicolor` plugin) - Copyright (c) 2009, Yahoo! Inc.
-
-
-Trademarks
-----------
-
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
-and product names are trademarks, registered trademarks or service
-marks of their respective holders.
-
----
-
-Appendix A: The GPL License
----------------------------
-
-```
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software-to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix B: The LGPL License
-----------------------------
-
-```
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software-to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages-typically libraries-of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-GNU LESSER GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix C: The MPL License
----------------------------
-
-```
-MOZILLA PUBLIC LICENSE
-Version 1.1
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-```
-
-Appendix D: The MIT License
----------------------------
-
-```
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-```
-
-Appendix E: The SIL Open Font License Version 1.1
----------------------------------------------
-
-```
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-```
-
-Appendix F: The BSD-3 License
------------------------------
-
-```
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
-
diff --git a/js/ckeditor/README.md b/js/ckeditor/README.md
deleted file mode 100644
index d18d4a108..000000000
--- a/js/ckeditor/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-CKEditor 4
-==========
-
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-http://ckeditor.com - See LICENSE.md for license information.
-
-CKEditor is a text editor to be used inside web pages. It's not a replacement
-for desktop text editors like Word or OpenOffice, but a component to be used as
-part of web applications and websites.
-
-## Documentation
-
-The full editor documentation is available online at the following address:
-http://docs.ckeditor.com
-
-## Installation
-
-Installing CKEditor is an easy task. Just follow these simple steps:
-
- 1. **Download** the latest version from the CKEditor website:
-    http://ckeditor.com. You should have already completed this step, but be
-    sure you have the very latest version.
- 2. **Extract** (decompress) the downloaded file into the root of your website.
-
-**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
-place the files in whichever you want though.
-
-## Checking Your Installation
-
-The editor comes with a few sample pages that can be used to verify that
-installation proceeded properly. Take a look at the `samples` directory.
-
-To test your installation, just call the following page at your website:
-
-	http://<your site>/<CKEditor installation path>/samples/index.html
-
-For example:
-
-	http://www.example.com/ckeditor/samples/index.html
diff --git a/js/ckeditor/adapters/jquery.js b/js/ckeditor/adapters/jquery.js
deleted file mode 100644
index 86cb458bc..000000000
--- a/js/ckeditor/adapters/jquery.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(a){if("undefined"==typeof a)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},
-ckeditor:function(g,d){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g)){var m=d;d=g;g=m}var k=[];d=d||{};this.each(function(){var b=a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,l=new a.Deferred;k.push(l.promise());if(c&&!f)g&&g.apply(c,[this]),l.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),l.resolve()):setTimeout(arguments.callee,100)},0)},
-null,null,9999);else{if(d.autoUpdateElement||"undefined"==typeof d.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)d.autoUpdateElementJquery=!0;d.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",!0);c=a(this).is("textarea")?CKEDITOR.replace(h,d):CKEDITOR.inline(h,d);b.data("ckeditorInstance",c);c.on("instanceReady",function(d){var e=d.editor;setTimeout(function(){if(e.element){d.removeListener();e.on("dataReady",function(){b.trigger("dataReady.ckeditor",[e])});e.on("setData",function(a){b.trigger("setData.ckeditor",
-[e,a.data])});e.on("getData",function(a){b.trigger("getData.ckeditor",[e,a.data])},999);e.on("destroy",function(){b.trigger("destroy.ckeditor",[e])});e.on("save",function(){a(h.form).submit();return!1},null,null,20);if(e.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){e.updateElement()})};a(h.form).submit(c);a(h.form).bind("form-pre-serialize",c);b.bind("destroy.ckeditor",function(){a(h.form).unbind("submit",c);a(h.form).unbind("form-pre-serialize",
-c)})}e.on("destroy",function(){b.removeData("ckeditorInstance")});b.removeData("_ckeditorInstanceLock");b.trigger("instanceReady.ckeditor",[e]);g&&g.apply(e,[h]);l.resolve()}else setTimeout(arguments.callee,100)},0)},null,null,9999)}});var f=new a.Deferred;this.promise=f.promise();a.when.apply(this,k).then(function(){f.resolve()});this.editor=this.eq(0).data("ckeditorInstance");return this}});CKEDITOR.config.jqueryOverrideVal&&(a.fn.val=CKEDITOR.tools.override(a.fn.val,function(g){return function(d){if(arguments.length){var m=
-this,k=[],f=this.each(function(){var b=a(this),c=b.data("ckeditorInstance");if(b.is("textarea")&&c){var f=new a.Deferred;c.setData(d,function(){f.resolve()});k.push(f.promise());return!0}return g.call(b,d)});if(k.length){var b=new a.Deferred;a.when.apply(this,k).done(function(){b.resolveWith(m)});return b.promise()}return f}var f=a(this).eq(0),c=f.data("ckeditorInstance");return f.is("textarea")&&c?c.getData():g.call(f)}}))})(window.jQuery);
\ No newline at end of file
diff --git a/js/ckeditor/build-config.js b/js/ckeditor/build-config.js
deleted file mode 100644
index 0e3b8260d..000000000
--- a/js/ckeditor/build-config.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-/**
- * This file was added automatically by CKEditor builder.
- * You may re-use it at any time to build CKEditor again.
- *
- * If you would like to build CKEditor online again
- * (for example to upgrade), visit one the following links:
- *
- * (1) http://ckeditor.com/builder
- *     Visit online builder to build CKEditor from scratch.
- *
- * (2) http://ckeditor.com/builder/43e1bb7eecc49e498b91b6045b267c42
- *     Visit online builder to build CKEditor, starting with the same setup as before.
- *
- * (3) http://ckeditor.com/builder/download/43e1bb7eecc49e498b91b6045b267c42
- *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
- *
- * NOTE:
- *    This file is not used by CKEditor, you may remove it.
- *    Changing this file will not change your CKEditor configuration.
- */
-
-var CKBUILDER_CONFIG = {
-	skin: 'moono-lisa',
-	preset: 'standard',
-	ignore: [
-		'.DS_Store',
-		'.bender',
-		'.editorconfig',
-		'.gitattributes',
-		'.gitignore',
-		'.idea',
-		'.jscsrc',
-		'.jshintignore',
-		'.jshintrc',
-		'.mailmap',
-		'.travis.yml',
-		'bender-err.log',
-		'bender-out.log',
-		'bender.ci.js',
-		'bender.js',
-		'dev',
-		'gruntfile.js',
-		'less',
-		'node_modules',
-		'package.json',
-		'tests'
-	],
-	plugins : {
-		'basicstyles' : 1,
-		'clipboard' : 1,
-		'enterkey' : 1,
-		'entities' : 1,
-		'floatingspace' : 1,
-		'horizontalrule' : 1,
-		'indentlist' : 1,
-		'link' : 1,
-		'list' : 1,
-		'removeformat' : 1,
-		'sourcedialog' : 1,
-		'toolbar' : 1
-	},
-	languages : {
-		'de' : 1,
-		'en' : 1
-	}
-};
\ No newline at end of file
diff --git a/js/ckeditor/ckeditor.js b/js/ckeditor/ckeditor.js
deleted file mode 100644
index 068941c0f..000000000
--- a/js/ckeditor/ckeditor.js
+++ /dev/null
@@ -1,797 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"H7HD",version:"4.7.2",revision:"c9b79c9",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var k=c[d].src.match(a);if(k){b=k[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
-b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
-a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(c){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){function n(){try{document.documentElement.doScroll("left")}catch(f){setTimeout(n,1);return}a()}c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",
-a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(u){}document.documentElement.doScroll&&b&&n()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
-CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var d=CKEDITOR.event.prototype,b;for(b in d)null==a[b]&&(a[b]=d[b])},CKEDITOR.event.prototype=function(){function a(a){var e=d(this);return e[a]||(e[a]=new b(a))}var d=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},b=function(a){this.name=a;this.listeners=[]};b.prototype={getListenerIndex:function(a){for(var b=0,d=this.listeners;b<d.length;b++)if(d[b].fn==a)return b;return-1}};
-return{define:function(b,d){var g=a.call(this,b);CKEDITOR.tools.extend(g,d,!0)},on:function(b,d,g,h,k){function n(a,f,D,k){a={name:b,sender:this,editor:a,data:f,listenerData:h,stop:D,cancel:k,removeListener:u};return!1===d.call(g,a)?!1:a.data}function u(){D.removeListener(b,d)}var f=a.call(this,b);if(0>f.getListenerIndex(d)){f=f.listeners;g||(g=this);isNaN(k)&&(k=10);var D=this;n.fn=d;n.priority=k;for(var w=f.length-1;0<=w;w--)if(f[w].priority<=k)return f.splice(w+1,0,n),{removeListener:u};f.unshift(n)}return{removeListener:u}},
-once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},g=0,h=function(){g=1};return function(k,n,u){var f=d(this)[k];k=a;var D=g;a=g=0;if(f){var w=f.listeners;if(w.length)for(var w=w.slice(0),A,F=0;F<w.length;F++){if(f.errorProof)try{A=
-w[F].call(this,u,n,b,h)}catch(x){}else A=w[F].call(this,u,n,b,h);!1===A?g=1:"undefined"!=typeof A&&(n=A);if(a||g)break}}n=g?!1:"undefined"==typeof n?!0:n;a=k;g=D;return n}}(),fireOnce:function(a,b,g){b=this.fire(a,b,g);delete d(this)[a];return b},removeListener:function(a,b){var g=d(this)[a];if(g){var h=g.getListenerIndex(b);0<=h&&g.listeners.splice(h,1)}},removeAllListeners:function(){var a=d(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=d(this)[a])&&0<a.listeners.length}}}());
-CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,d,this)},CKEDITOR.editor.prototype.fireOnce=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,d,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
-CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),d=a.match(/edge[ \/](\d+.?\d*)/),b=-1<a.indexOf("trident/"),b=!(!d&&!b),b={ie:b,edge:!!d,webkit:!b&&-1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,b=window.location.hostname;
-return a!=b&&a!="["+b+"]"},secure:"https:"==location.protocol};b.gecko="Gecko"==navigator.product&&!b.webkit&&!b.ie;b.webkit&&(-1<a.indexOf("chrome")?b.chrome=!0:b.safari=!0);var c=0;b.ie&&(c=d?parseFloat(d[1]):b.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,b.ie9Compat=9==c,b.ie8Compat=8==c,b.ie7Compat=7==c,b.ie6Compat=7>c||b.quirks);b.gecko&&(d=a.match(/rv:([\d\.]+)/))&&(d=d[1].split("."),c=1E4*d[0]+100*(d[1]||0)+1*(d[2]||0));b.air&&(c=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));
-b.webkit&&(c=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));b.version=c;b.isCompatible=!(b.ie&&7>c)&&!(b.gecko&&4E4>c)&&!(b.webkit&&534>c);b.hidpi=2<=window.devicePixelRatio;b.needsBrFiller=b.gecko||b.webkit||b.ie&&10<c;b.needsNbspFiller=b.ie&&11>c;b.cssClass="cke_browser_"+(b.ie?"ie":b.gecko?"gecko":b.webkit?"webkit":"unknown");b.quirks&&(b.cssClass+=" cke_browser_quirks");b.ie&&(b.cssClass+=" cke_browser_ie"+(b.quirks?"6 cke_browser_iequirks":b.version));b.air&&(b.cssClass+=" cke_browser_air");
-b.iOS&&(b.cssClass+=" cke_browser_ios");b.hidpi&&(b.cssClass+=" cke_hidpi");return b}());
-"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=
-CKEDITOR.loadFullCore,d=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status="basic_ready",a&&a._load?a():d&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*d))})})();CKEDITOR.status="basic_loaded"}();"use strict";CKEDITOR.VERBOSITY_WARN=1;CKEDITOR.VERBOSITY_ERROR=2;CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR;CKEDITOR.warn=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:d})};
-CKEDITOR.error=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",{type:"error",errorCode:a,additionalData:d})};
-CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var d=console[a.data.type]?a.data.type:"log",b=a.data.errorCode;if(a=a.data.additionalData)console[d]("[CKEDITOR] Error code: "+b+".",a);else console[d]("[CKEDITOR] Error code: "+b+".");console[d]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+b)}},null,null,999);CKEDITOR.dom={};
-(function(){var a=[],d=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",b=/&/g,c=/>/g,e=/</g,g=/"/g,h=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},n=function(a,f){return"#"==f[0]?String.fromCharCode(parseInt(f.slice(1),10)):k[f]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(a,f){if(!a&&!f)return!0;if(!a||!f||a.length!=f.length)return!1;for(var b=0;b<a.length;b++)if(a[b]!=f[b])return!1;
-return!0},getIndex:function(a,f){for(var b=0;b<a.length;++b)if(f(a[b]))return b;return-1},clone:function(a){var f;if(a&&a instanceof Array){f=[];for(var b=0;b<a.length;b++)f[b]=CKEDITOR.tools.clone(a[b]);return f}if(null===a||"object"!=typeof a||a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp||a.nodeType||a.window===a)return a;f=new a.constructor;for(b in a)f[b]=CKEDITOR.tools.clone(a[b]);return f},capitalize:function(a,f){return a.charAt(0).toUpperCase()+
-(f?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var f=arguments.length,b,c;"boolean"==typeof(b=arguments[f-1])?f--:"boolean"==typeof(b=arguments[f-2])&&(c=arguments[f-1],f-=2);for(var k=1;k<f;k++){var d=arguments[k],n;for(n in d)if(!0===b||null==a[n])if(!c||n in c)a[n]=d[n]}return a},prototypedCopy:function(a){var f=function(){};f.prototype=a;return new f},copy:function(a){var f={},b;for(b in a)f[b]=a[b];return f},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},
-isEmpty:function(a){for(var f in a)if(a.hasOwnProperty(f))return!1;return!0},cssVendorPrefix:function(a,f,b){if(b)return d+a+":"+f+";"+a+":"+f;b={};b[a]=f;b[d+a]=f;return b},cssStyleToDomStyle:function(){var a=document.createElement("div").style,f="undefined"!=typeof a.cssFloat?"cssFloat":"undefined"!=typeof a.styleFloat?"styleFloat":"float";return function(a){return"float"==a?f:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){a=[].concat(a);for(var f,
-b=[],c=0;c<a.length;c++)if(f=a[c])/@import|[{}]/.test(f)?b.push("\x3cstyle\x3e"+f+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+f+'"\x3e');return b.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(b,"\x26amp;").replace(c,"\x26gt;").replace(e,"\x26lt;")},htmlDecode:function(a){return a.replace(h,n)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(g,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},
-transformPlainTextToHtml:function(a,f){var b=f==CKEDITOR.ENTER_BR,c=this.htmlEncode(a.replace(/\r\n/g,"\n")),c=c.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=f==CKEDITOR.ENTER_P?"p":"div";if(!b){var d=/\n{2}/g;if(d.test(c))var n="\x3c"+k+"\x3e",m="\x3c/"+k+"\x3e",c=n+c.replace(d,function(){return m+n})+m}c=c.replace(/\n/g,"\x3cbr\x3e");b||(c=c.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));c=c.replace(/^ | $/g,"\x26nbsp;");return c=c.replace(/(>|\s) /g,
-function(a,f){return f+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",f=0;8>f;f++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return a},override:function(a,f){var b=f(a);b.prototype=a.prototype;return b},setTimeout:function(a,f,b,c,k){k||(k=window);b||(b=k);return k.setTimeout(function(){c?a.apply(b,[].concat(c)):a.apply(b)},
-f||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(f){return f.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(f){return f.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(f){return f.replace(a,"")}}(),indexOf:function(a,f){if("function"==typeof f)for(var b=0,c=a.length;b<c;b++){if(f(a[b]))return b}else{if(a.indexOf)return a.indexOf(f);b=0;for(c=a.length;b<c;b++)if(a[b]===f)return b}return-1},search:function(a,f){var b=CKEDITOR.tools.indexOf(a,
-f);return 0<=b?a[b]:null},bind:function(a,f){return function(){return a.apply(f,arguments)}},createClass:function(a){var f=a.$,b=a.base,c=a.privates||a._,k=a.proto;a=a.statics;!f&&(f=function(){b&&this.base.apply(this,arguments)});if(c)var d=f,f=function(){var a=this._||(this._={}),f;for(f in c){var b=c[f];a[f]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}d.apply(this,arguments)};b&&(f.prototype=this.prototypedCopy(b.prototype),f.prototype.constructor=f,f.base=b,f.baseProto=b.prototype,f.prototype.base=
-function(){this.base=b.prototype.base;b.apply(this,arguments);this.base=arguments.callee});k&&this.extend(f.prototype,k,!0);a&&this.extend(f,a,!0);return f},addFunction:function(b,f){return a.push(function(){return b.apply(f||this,arguments)})-1},removeFunction:function(b){a[b]=null},callFunction:function(b){var f=a[b];return f&&f.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,f;return function(b){f=CKEDITOR.tools.trim(b+"")+"px";return a.test(f)?
-f:b||""}}(),convertToPx:function(){var a;return function(f){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(a));return/%$/.test(f)?f:(a.setStyle("width",f),a.$.clientWidth)}}(),repeat:function(a,f){return Array(f+1).join(a)},tryThese:function(){for(var a,f=0,b=arguments.length;f<b;f++){var c=arguments[f];try{a=c();break}catch(k){}}return a},
-genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var f=arguments,b=this;window.setTimeout(function(){a.apply(b,f)},0)}},normalizeCssText:function(a,f){var b=[],c,k=CKEDITOR.tools.parseCssText(a,!0,f);for(c in k)b.push(c+":"+k[c]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,c,k){a=[b,c,k];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);
-return"#"+a.join("")})},normalizeHex:function(a){return a.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,function(a,b,c,k){a=b.toLowerCase();3==a.length&&(a=a.split(""),a=[a[0],a[0],a[1],a[1],a[2],a[2]].join(""));return"#"+a+k})},parseCssText:function(a,f,b){var c={};b&&(a=(new CKEDITOR.dom.element("span")).setAttribute("style",a).getAttribute("style")||"");a&&(a=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(a)));if(!a||";"==a)return c;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
-function(a,b,k){f&&(b=b.toLowerCase(),"font-family"==b&&(k=k.replace(/\s*,\s*/g,",")),k=CKEDITOR.tools.trim(k));c[b]=k});return c},writeCssText:function(a,f){var b,c=[];for(b in a)c.push(b+":"+a[b]);f&&c.sort();return c.join("; ")},objectCompare:function(a,f,b){var c;if(!a&&!f)return!0;if(!a||!f)return!1;for(c in a)if(a[c]!=f[c])return!1;if(!b)for(c in f)if(a[c]!=f[c])return!1;return!0},objectKeys:function(a){var f=[],b;for(b in a)f.push(b);return f},convertArrayToObject:function(a,b){var c={};1==
-arguments.length&&(b=!0);for(var k=0,d=a.length;k<d;++k)c[a[k]]=b;return c},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,""):document.domain;if(!a)break;document.domain=a}return!!a},eventsBuffer:function(a,b,c){function k(){n=(new Date).getTime();d=!1;c?b.call(c):b()}var d,n=0;return{input:function(){if(!d){var b=(new Date).getTime()-n;b<a?d=setTimeout(k,a-b):k()}},reset:function(){d&&clearTimeout(d);d=n=0}}},enableHtml5Elements:function(a,
-b){for(var c="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),k=c.length,d;k--;)d=a.createElement(c[k]),b&&a.appendChild(d)},checkIfAnyArrayItemMatches:function(a,b){for(var c=0,k=a.length;c<k;++c)if(a[c].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,b){for(var c in a)if(c.match(b))return!0;return!1},keystrokeToString:function(a,b){var c=b&16711680,k=
-b&65535,d=CKEDITOR.env.mac,n=[],e=[];c&CKEDITOR.CTRL&&(n.push(d?"⌘":a[17]),e.push(d?a[224]:a[17]));c&CKEDITOR.ALT&&(n.push(d?"⌥":a[18]),e.push(a[18]));c&CKEDITOR.SHIFT&&(n.push(d?"⇧":a[16]),e.push(a[16]));k&&(a[k]?(n.push(a[k]),e.push(a[k])):(n.push(String.fromCharCode(k)),e.push(String.fromCharCode(k))));return{display:n.join("+"),aria:e.join("+")}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(a){a=a.toLowerCase();
-for(var b=document.cookie.split(";"),c,k,d=0;d<b.length;d++)if(c=b[d].split("\x3d"),k=decodeURIComponent(CKEDITOR.tools.trim(c[0]).toLowerCase()),k===a)return decodeURIComponent(1<c.length?c[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=new Uint8Array(40),window.crypto.getRandomValues(a);
-else for(var c=0;40>c;c++)a.push(Math.floor(256*Math.random()));for(c=0;c<a.length;c++)var k="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[c]%36),b=b+(.5<Math.random()?k.toUpperCase():k);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a},escapeCss:function(a){return a?window.CSS&&CSS.escape?CSS.escape(a):isNaN(parseInt(a.charAt(0),10))?a:"\\3"+a.charAt(0)+" "+a.substring(1,a.length):""},style:{parse:{_colors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",
-beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",
-darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",
-grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",
-lightyellow:"#FFFFE0",lime:"#00FF00",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",
-orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",
-slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"},_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,background:function(a){var b={},c=this._findColor(a);
-c.length&&(b.color=c[0],CKEDITOR.tools.array.forEach(c,function(b){a=a.replace(b,"")}));if(a=CKEDITOR.tools.trim(a))b.unprocessed=a;return b},margin:function(a){function b(a){c.top=k[a[0]];c.right=k[a[1]];c.bottom=k[a[2]];c.left=k[a[3]]}var c={},k=a.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset)/g)||["0px"];switch(k.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}return c},_findColor:function(a){var b=[],c=CKEDITOR.tools.array,b=
-b.concat(a.match(this._rgbaRegExp)||[]),b=b.concat(a.match(this._hslaRegExp)||[]);return b=b.concat(c.filter(a.split(/\s+/),function(a){return a.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?!0:a.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},array:{filter:function(a,b,c){var k=[];this.forEach(a,function(d,n){b.call(c,d,n,a)&&k.push(d)});return k},forEach:function(a,b,c){var k=a.length,d;for(d=0;d<k;d++)b.call(c,a[d],d,a)},map:function(a,b,c){for(var k=[],d=0;d<a.length;d++)k.push(b.call(c,
-a[d],d,a));return k},reduce:function(a,b,c,k){for(var d=0;d<a.length;d++)c=b.call(k,c,a[d],d,a);return c}},object:{findKey:function(a,b){if("object"!==typeof a)return null;for(var c in a)if(a[c]===b)return c;return null}}};CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=CKEDITOR.tools.isArray})();
-CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),k=1;k<arguments.length;k++){b=arguments[k];for(var d in b)delete c[d]}return c},b={},c={},e={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},g={command:1,link:1,meta:1,noscript:1,script:1,style:1},h={},k={"#":1},n={center:1,dir:1,noframes:1};
-a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,e,b,n);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
-area:h,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:h,bdi:b,bdo:b,blockquote:c,body:c,br:h,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:h,colgroup:{col:1},command:h,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:h,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},g),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:h,html:a({head:1,
-body:1},c,g),i:b,iframe:k,img:h,input:h,ins:b,kbd:b,keygen:h,label:b,legend:b,li:c,link:h,main:c,map:c,mark:b,menu:a({li:1},c),meta:h,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:k,output:b,p:b,param:h,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:k,section:c,select:{optgroup:1,option:1},small:b,source:h,span:b,strong:b,style:k,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
-sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:k,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:k,tr:{th:1,td:1},track:h,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:h,acronym:b,applet:a({param:1},c),basefont:h,big:b,center:c,dialog:h,dir:{li:1},font:b,isindex:h,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},e,n),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
-fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,
-track:1,wbr:1},$inline:b,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},d.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,
-s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return d}();
-CKEDITOR.dom.event=function(a){this.$=a};
-CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var d=this.$;d.preventDefault?d.preventDefault():d.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},getTarget:function(){var a=
-this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}};CKEDITOR.CTRL=1114112;CKEDITOR.SHIFT=2228224;CKEDITOR.ALT=4456448;CKEDITOR.EVENT_PHASE_CAPTURING=1;CKEDITOR.EVENT_PHASE_AT_TARGET=2;
-CKEDITOR.EVENT_PHASE_BUBBLING=3;CKEDITOR.dom.domObject=function(a){a&&(this.$=a)};
-CKEDITOR.dom.domObject.prototype=function(){var a=function(a,b){return function(c){"undefined"!=typeof CKEDITOR&&a.fire(b,new CKEDITOR.dom.event(c))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(d){var b=this.getCustomData("_cke_nativeListeners");b||(b={},this.setCustomData("_cke_nativeListeners",b));b[d]||(b=b[d]=a(this,d),this.$.addEventListener?this.$.addEventListener(d,b,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+
-d,b));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var b=this.getCustomData("_cke_nativeListeners"),c=b&&b[a];c&&(this.$.removeEventListener?this.$.removeEventListener(a,c,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,c),delete b[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),b;for(b in a){var c=a[b];this.$.detachEvent?this.$.detachEvent("on"+
-b,c):this.$.removeEventListener&&this.$.removeEventListener(b,c,!1);delete a[b]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}();
-(function(a){var d={};CKEDITOR.on("reset",function(){d={}});a.equals=function(a){try{return a&&a.$===this.$}catch(c){return!1}};a.setCustomData=function(a,c){var e=this.getUniqueId();(d[e]||(d[e]={}))[a]=c;return this};a.getCustomData=function(a){var c=this.$["data-cke-expando"];return(c=c&&d[c])&&a in c?c[a]:null};a.removeCustomData=function(a){var c=this.$["data-cke-expando"],c=c&&d[c],e,g;c&&(e=c[a],g=a in c,delete c[a]);return g?e:null};a.clearCustomData=function(){this.removeAllListeners();var a=
-this.$["data-cke-expando"];a&&delete d[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)})(CKEDITOR.dom.domObject.prototype);
-CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?"documentFragment":"domObject"](a):this};CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject;CKEDITOR.NODE_ELEMENT=1;CKEDITOR.NODE_DOCUMENT=9;CKEDITOR.NODE_TEXT=3;CKEDITOR.NODE_COMMENT=8;CKEDITOR.NODE_DOCUMENT_FRAGMENT=11;
-CKEDITOR.POSITION_IDENTICAL=0;CKEDITOR.POSITION_DISCONNECTED=1;CKEDITOR.POSITION_FOLLOWING=2;CKEDITOR.POSITION_PRECEDING=4;CKEDITOR.POSITION_IS_CONTAINED=8;CKEDITOR.POSITION_CONTAINS=16;
-CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,d){a.append(this,d);return a},clone:function(a,d){function b(c){c["data-cke-expando"]&&(c["data-cke-expando"]=!1);if(c.nodeType==CKEDITOR.NODE_ELEMENT||c.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(d||c.nodeType!=CKEDITOR.NODE_ELEMENT||c.removeAttribute("id",!1),a){c=c.childNodes;for(var e=0;e<c.length;e++)b(c[e])}}function c(b){if(b.type==CKEDITOR.NODE_ELEMENT||b.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(b.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=
-b.getName();":"==d[0]&&b.renameNode(d.substring(1))}if(a)for(d=0;d<b.getChildCount();d++)c(b.getChild(d))}}var e=this.$.cloneNode(a);b(e);e=new CKEDITOR.dom.node(e);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&c(e);return e},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,
-a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this.$;c&&c!=b;){var e=c.parentNode;e&&d.unshift(this.getIndex.call({$:c},a));c=e}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,c){var n=c?a.nextSibling:a.previousSibling;return n&&n.nodeType==CKEDITOR.NODE_TEXT?b(n)?d(n,
-c):n:null}function b(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var c=this.$,e=-1,g;if(!this.$.parentNode||a&&c.nodeType==CKEDITOR.NODE_TEXT&&b(c)&&!d(c)&&!d(c,!0))return-1;do a&&c!=this.$&&c.nodeType==CKEDITOR.NODE_TEXT&&(g||b(c))||(e++,g=c.nodeType==CKEDITOR.NODE_TEXT);while(c=c.previousSibling);return e},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var e;if(!a){if(this.type==
-CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getNext()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===b(e,!0))return null;a=e.getNext()}return!a||b&&!1===b(a)?null:d&&d!=a.type?a.getNextSourceNode(!1,d,b):a},getPreviousSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getLast&&this.getLast();var e;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getPrevious()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===
-b(e,!0))return null;a=e.getPrevious()}return!a||b&&!1===b(a)?null:d&&a.type!=d?a.getPreviousSourceNode(!1,d,b):a},getPrevious:function(a){var d=this.$,b;do b=(d=d.previousSibling)&&10!=d.nodeType&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getNext:function(a){var d=this.$,b;do b=(d=d.nextSibling)&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getParent:function(a){var d=this.$.parentNode;return d&&(d.nodeType==CKEDITOR.NODE_ELEMENT||a&&d.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?
-new CKEDITOR.dom.node(d):null},getParents:function(a){var d=this,b=[];do b[a?"push":"unshift"](d);while(d=d.getParent());return b},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var d=this.contains?this:this.getParent();do if(d.contains(a))return d;while(d=d.getParent());return null},getPosition:function(a){var d=this.$,b=a.$;if(d.compareDocumentPosition)return d.compareDocumentPosition(b);if(d==b)return CKEDITOR.POSITION_IDENTICAL;if(this.type==
-CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(d.contains){if(d.contains(b))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(b.contains(d))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in d)return 0>d.sourceIndex||0>b.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:d.sourceIndex<b.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}d=this.getAddress();a=a.getAddress();for(var b=Math.min(d.length,a.length),c=0;c<b;c++)if(d[c]!=
-a[c])return d[c]<a[c]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return d.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,d){var b=this.$,c,e;d||(b=b.parentNode);"function"==typeof a?(e=!0,c=a):(e=!1,c=function(b){b="string"==typeof b.nodeName?b.nodeName.toLowerCase():"";return"string"==typeof a?b==a:b in a});for(;b;){if(c(e?new CKEDITOR.dom.node(b):b))return new CKEDITOR.dom.node(b);
-try{b=b.parentNode}catch(g){b=null}}return null},hasAscendant:function(a,d){var b=this.$;d||(b=b.parentNode);for(;b;){if(b.nodeName&&b.nodeName.toLowerCase()==a)return!0;b=b.parentNode}return!1},move:function(a,d){a.append(this.remove(),d)},remove:function(a){var d=this.$,b=d.parentNode;if(b){if(a)for(;a=d.firstChild;)b.insertBefore(d.removeChild(a),d);b.removeChild(d)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&
-(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.ltrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(b-d.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.rtrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(d.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&
-(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var d=this;this.type!=CKEDITOR.NODE_ELEMENT&&(d=this.getParent());CKEDITOR.env.edge&&d&&d.is("textarea","input")&&(a=!0);if(!a&&d&&"undefined"!=typeof d.$.isContentEditable)return!(d.$.isContentEditable||d.data("cke-editable"));for(;d;){if(d.data("cke-editable"))return!1;if(d.hasAttribute("contenteditable"))return"false"==d.getAttribute("contenteditable");d=d.getParent()}return!0}});
-CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject;
-CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,d="CSS1Compat"==a.compatMode;return{width:(d?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(d?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||
-a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}});CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject;
-CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var d=new CKEDITOR.dom.element("link");d.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(d)}},appendStyleText:function(a){if(this.$.createStyleSheet){var d=this.$.createStyleSheet("");d.cssText=a}else{var b=new CKEDITOR.dom.element("style",this);b.append(new CKEDITOR.dom.text(a,this));this.getHead().append(b)}return d||
-b.$.sheet},createElement:function(a,d){var b=new CKEDITOR.dom.element(a,this);d&&(d.attributes&&b.setAttributes(d.attributes),d.styles&&b.setStyles(d.styles));return b},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(d){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,d){for(var b=
-this.$.documentElement,c=0;b&&c<a.length;c++){var e=a[c];if(d)for(var g=-1,h=0;h<b.childNodes.length;h++){var k=b.childNodes[h];if(!0!==d||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(g++,g==e){b=k;break}}else b=b.childNodes[e]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];
-return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+
-CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}});CKEDITOR.dom.nodeList=function(a){this.$=a};
-CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null},toArray:function(){return CKEDITOR.tools.array.map(this.$,function(a){return new CKEDITOR.dom.node(a)})}};CKEDITOR.dom.element=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)};
-CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))};CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node;CKEDITOR.dom.element.createFromHtml=function(a,d){var b=new CKEDITOR.dom.element("div",d);b.setHtml(a);return b.getFirst().remove()};
-CKEDITOR.dom.element.setMarker=function(a,d,b,c){var e=d.getCustomData("list_marker_id")||d.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),g=d.getCustomData("list_marker_names")||d.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[e]=d;g[b]=1;return d.setCustomData(b,c)};CKEDITOR.dom.element.clearAllMarkers=function(a){for(var d in a)CKEDITOR.dom.element.clearMarkers(a,a[d],1)};
-CKEDITOR.dom.element.clearMarkers=function(a,d,b){var c=d.getCustomData("list_marker_names"),e=d.getCustomData("list_marker_id"),g;for(g in c)d.removeCustomData(g);d.removeCustomData("list_marker_names");b&&(d.removeCustomData("list_marker_id"),delete a[e])};
-(function(){function a(a,b){return-1<(" "+a+" ").replace(g," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){var c=CKEDITOR.tools.escapeCss(a.$.id);return"#"+c+" "+b.split(/,\s*/).join(", #"+c+" ")}function c(a){for(var b=0,c=0,f=h[a].length;c<f;c++)b+=parseFloat(this.getComputedStyle(h[a][c])||0,10)||0;return b}var e=document.createElement("_").classList,e="undefined"!==typeof e&&
-null!==String(e.add).match(/\[Native code\]/gi),g=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:e?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:e?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+
-b+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",c):this.removeAttribute("class"));return this},hasClass:function(b){return a(this.$.className,b)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=
-this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var c=new CKEDITOR.dom.range(this.getDocument());c.setStartAfter(this);c.setEndAfter(a);
-var f=c.extractContents(!1,b||!1),d;c.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(c=new CKEDITOR.dom.element("div");d=f.getFirst();)d.$.style.backgroundColor&&(d.$.style.backgroundColor=d.$.style.backgroundColor),c.append(d);c.insertAfter(this);c.remove(!0)}else f.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
-b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},
-this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(f){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:
-function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,
-2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,f;a=CKEDITOR.tools.isArray(a)?
-a:[];for(f=0;f<c.length;f++)-1===CKEDITOR.tools.indexOf(a,c[f].name)&&(b[c[f].name]=c[f].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=
-function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();
-if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
-is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||
-CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=
-a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var c=this.getParent();c.type==CKEDITOR.NODE_ELEMENT&&(c=c.clone(),c.setHtml(b),b=c.getHtml(),c.setHtml(a),a=c.getHtml())}return b==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,c;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(c=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(c)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;
-for(var a=this.getChildren(),b=0,c=a.count();b<c;b++){var f=a.getItem(b);if(f.type!=CKEDITOR.NODE_ELEMENT||!f.data("cke-bookmark"))if(f.type==CKEDITOR.NODE_ELEMENT&&!f.isEmptyInlineRemoveable()||f.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(f.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var c=a[b];switch(c.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
-default:if(c.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,c={"data-cke-expando":1,_moz_dirty:1};return 0<b&&(2<b||!c[a[0].nodeName]||2==b&&!c[a[1].nodeName])},hasAttribute:function(){function a(b){var c=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return c?
-c.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var c=this.$;a=a.$;if(c!=a){var f;if(b)for(;f=c.lastChild;)a.insertBefore(c.removeChild(f),a.firstChild);else for(;f=c.firstChild;)a.appendChild(c.removeChild(f))}},mergeSiblings:function(){function a(b,c,f){if(c&&c.type==CKEDITOR.NODE_ELEMENT){for(var d=
-[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=f?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var k=f?b.getLast():b.getFirst();d.length;)d.shift().move(b,!f);c.moveChildren(b,!f);c.remove();k&&k.type==CKEDITOR.NODE_ELEMENT&&k.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
-visibility:""})},setAttribute:function(){var a=function(a,b){this.$.setAttribute(a,b);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,c){"class"==b?this.$.className=c:"style"==b?this.$.style.cssText=c:"tabindex"==b?this.$.tabIndex=c:"checked"==b?this.$.checked=c:"contenteditable"==b?a.call(this,"contentEditable",c):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,c){if("src"==b&&c.match(/^http:\/\//))try{a.apply(this,
-arguments)}catch(f){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=
-0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],f;"border"==a&&(f=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(f)for(var w=
-0;w<f.length;w++)b.push([a,c[d],f[w]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
-"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,f=b.count();c<f;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,f=this.getDocument(),d=f.getBody(),w="BackCompat"==f.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
-8!==CKEDITOR.env.version:1)){var e=this.$.getBoundingClientRect(),g=f.$.documentElement,x=g.clientTop||d.$.clientTop||0,m=g.clientLeft||d.$.clientLeft||0,h=!0;CKEDITOR.env.ie&&(h=f.getDocumentElement().contains(this),f=f.getBody().contains(this),h=w&&f||!w&&h);h&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||g.scrollLeft,c=d.$.scrollTop||g.scrollTop):(c=w?d.$:g,b=c.scrollLeft,c=c.scrollTop),b=e.left+b-m,c=e.top+c-x)}else for(x=this,m=null;x&&"body"!=x.getName()&&
-"html"!=x.getName();){b+=x.$.offsetLeft-x.$.scrollLeft;c+=x.$.offsetTop-x.$.scrollTop;x.equals(this)||(b+=x.$.clientLeft||0,c+=x.$.clientTop||0);for(;m&&!m.equals(x);)b-=m.$.scrollLeft,c-=m.$.scrollTop,m=m.getParent();m=x;x=(e=x.$.offsetParent)?new CKEDITOR.dom.element(e):null}a&&(e=this.getWindow(),x=a.getWindow(),!e.equals(x)&&e.$.frameElement&&(a=(new CKEDITOR.dom.element(e.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
-w||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var f=c.$.frameElement;f&&(b=new CKEDITOR.dom.element(f))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var f,d,w,e;function g(b,c){/body|html/.test(a.getName())?
-a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=b,a.$.scrollTop+=c)}function x(a,b){var c={x:0,y:0};if(!a.is(h?"body":"html")){var f=a.$.getBoundingClientRect();c.x=f.left;c.y=f.top}f=a.getWindow();f.equals(b)||(f=x(CKEDITOR.dom.element.get(f.$.frameElement),b),c.x+=f.x,c.y+=f.y);return c}function m(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());w=a.getDocument();var h="BackCompat"==w.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=h?w.getBody():w.getDocumentElement());
-CKEDITOR.env.webkit&&(w=this.getEditor(!1))&&(w._.previousScrollTop=null);w=a.getWindow();d=x(this,w);var z=x(a,w),I=this.$.offsetHeight;f=this.$.offsetWidth;var l=a.$.clientHeight,t=a.$.clientWidth;w=d.x-m(this,"left")-z.x||0;e=d.y-m(this,"top")-z.y||0;f=d.x+f+m(this,"right")-(z.x+t)||0;d=d.y+I+m(this,"bottom")-(z.y+l)||0;(0>e||0<d)&&g(0,!0===b?e:!1===b?d:0>e?e:d);c&&(0>w||0<f)&&g(0>w?w:f,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
-"_off");this.removeClass(b+"_disabled");c&&this.setAttribute("aria-pressed",!0);c&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");c&&this.setAttribute("aria-disabled",!0);c&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),c&&this.removeAttribute("aria-pressed"),c&&this.removeAttribute("aria-disabled")}},
-getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var f=0;f<c.length;f++){var d=c[f],w=d.nodeName.toLowerCase(),e;if(!(w in b))if("checked"==w&&(e=this.getAttribute(w)))a.setAttribute(w,e);else if(!CKEDITOR.env.ie||this.hasAttribute(w))e=this.getAttribute(w),null===e&&(e=d.nodeValue),a.setAttribute(w,e)}""!==this.$.style.cssText&&
-(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var f=b.childNodes;if(0<=c&&c<f.length)return f[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,
-b.shift());else c=a(c,b);return c?new CKEDITOR.dom.node(c):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
-"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,c,f,d;a=a||void 0===a;for(c in b)if(f=b[c],f.element.equals(this)&&f.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(d=f.editable())&&(d.equals(this)||d.contains(this)))return f;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,
-a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var f=a(this);if(!1!==f){c=this.getChildren();for(var d=0;d<c.count();d++)f=c.getItem(d),f.type==CKEDITOR.NODE_ELEMENT?f.forEach(a,b):b&&f.type!=b||a(f)}}});var h={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
-CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
-CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,
-insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});
-(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var f,d=c.startContainer;f=c.endContainer;var e=c.startOffset,D=c.endOffset,g,l=this.guard,t=this.type,J=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var H=f.type==CKEDITOR.NODE_ELEMENT?f:f.getParent(),k=f.type==CKEDITOR.NODE_ELEMENT?f.getChild(D):f.getNext();this._.guardLTR=function(a,b){return(!b||!H.equals(a))&&(!k||
-!a.equals(k))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var q=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),y=d.type==CKEDITOR.NODE_ELEMENT?e?d.getChild(e-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!q.equals(a))&&(!y||!a.equals(y))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var v=a?this._.guardRTL:this._.guardLTR;g=l?function(a,b){return!1===v(a,b)?!1:l(a,b)}:v;this.current?f=this.current[J](!1,t,g):(a?f.type==CKEDITOR.NODE_ELEMENT&&
-(f=0<D?f.getChild(D-1):!1===g(f,!0)?null:f.getPreviousSourceNode(!0,t,g)):(f=d,f.type==CKEDITOR.NODE_ELEMENT&&((f=f.getChild(e))||(f=!1===g(d,!0)?null:d.getNextSourceNode(!0,t,g)))),f&&!1===g(f)&&(f=null));for(;f&&!this._.end;){this.current=f;if(!this.evaluator||!1!==this.evaluator(f)){if(!b)return f}else if(b&&this.evaluator)return!1;f=f[J](!1,t,g)}this.end();return this.current=null}function d(b){for(var c,f=null;c=a.call(this,b);)f=c;return f}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
-a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return d.call(this)},lastBackward:function(){return d.call(this,1)},reset:function(){delete this.current;this._={}}}});var b={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,
-"table-column":1,"table-cell":1,"table-caption":1},c={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in c||!b[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(b){return!(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};
-CKEDITOR.dom.walker.bookmark=function(a,b){function c(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(f){var d,e;d=f&&f.type!=CKEDITOR.NODE_ELEMENT&&(e=f.getParent())&&c(e);d=a?d:d||c(f);return!!(b^d)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(b){var c;b&&b.type==CKEDITOR.NODE_TEXT&&(c=!CKEDITOR.tools.trim(b.getText())||CKEDITOR.env.webkit&&b.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^c)}};CKEDITOR.dom.walker.invisible=
-function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(f){b(f)?f=1:(f.type==CKEDITOR.NODE_TEXT&&(f=f.getParent()),f=f.$.offsetWidth<=c);return!!(a^f)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!g(a)&&!h(a)}return function(c){var f=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&e.test(c.getText());f&&(f=c.getParent(),c=c.getNext(b),f=f.isBlockBoundary()&&
-(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^f)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var e=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,g=CKEDITOR.dom.walker.whitespaces(),h=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),n=function(a){return h(a)||g(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
-function(a){return function(b){b=g(b)||h(b)||k(b);return!!(a^b)}};var u=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,f=b.getChildCount();c<f;++c)if(!u(b.getChild(c)))return!!a;return!a}};var f=CKEDITOR.dom.walker.empty(),D=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
-u(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(D)&&f(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(n(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&e.test(a.getText()))?a:!1}})();
-CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var d=a instanceof CKEDITOR.dom.document;this.document=d?a:a.getDocument();this.root=d?a.getBody():a};
-(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,e){function g(a,b,c,f){var d=c?a.getPrevious():a.getNext();if(f&&h)return d;l||f?b.append(a.clone(!0,e),c):(a.remove(),u&&b.append(a,c));return d}function m(){var a,b,c,f=Math.min(O.length,p.length);for(a=0;a<f;a++)if(b=O[a],c=p[a],!b.equals(c))return a;return a-1}function k(){var b=C-1,c=v&&B&&!t.equals(J);b<r-1||b<G-1||c?(c?a.moveToPosition(J,
-CKEDITOR.POSITION_BEFORE_START):G==b+1&&y?a.moveToPosition(p[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(p[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=O[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var h=0===b,u=1==b,l=2==b;b=l||u;var t=a.startContainer,J=a.endContainer,
-H=a.startOffset,E=a.endOffset,q,y,v,B,L,n;if(l&&J.type==CKEDITOR.NODE_TEXT&&(t.equals(J)||t.type===CKEDITOR.NODE_ELEMENT&&t.getFirst().equals(J)))c.append(a.document.createText(J.substring(H,E)));else{J.type==CKEDITOR.NODE_TEXT?l?n=!0:J=J.split(E):0<J.getChildCount()?E>=J.getChildCount()?(J=J.getChild(E-1),y=!0):J=J.getChild(E):B=y=!0;t.type==CKEDITOR.NODE_TEXT?l?L=!0:t.split(H):0<t.getChildCount()?0===H?(t=t.getChild(H),q=!0):t=t.getChild(H-1):v=q=!0;for(var O=t.getParents(),p=J.getParents(),C=m(),
-r=O.length-1,G=p.length-1,N=c,P,Y,V,ea=-1,Q=C;Q<=r;Q++){Y=O[Q];V=Y.getNext();for(Q!=r||Y.equals(p[Q])&&r<G?b&&(P=N.append(Y.clone(0,e))):q?g(Y,N,!1,v):L&&N.append(a.document.createText(Y.substring(H)));V;){if(V.equals(p[Q])){ea=Q;break}V=g(V,N)}N=P}N=c;for(Q=C;Q<=G;Q++)if(c=p[Q],V=c.getPrevious(),c.equals(O[Q]))b&&(N=N.getChild(0));else{Q!=G||c.equals(O[Q])&&G<r?b&&(P=N.append(c.clone(0,e))):y?g(c,N,!1,B):n&&N.append(a.document.createText(c.substring(0,E)));if(Q>ea)for(;V;)V=g(V,N,!0);N=P}l||k()}}
-function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(g)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&h(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}
-function e(a){return function(){var b;return this[a?"getPreviousNode":"getNextNode"](function(a){!b&&u(a)&&(b=a);return n(a)&&!(h(a)&&a.equals(b))})}}var g={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},h=CKEDITOR.dom.walker.bogus(),k=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,n=CKEDITOR.dom.walker.editable(),u=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=
-new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||
-d(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,e,g=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(d="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",
-d+(g?"C":"S")));g||(c=b.clone(),c.setHtml("\x26nbsp;"),a&&c.setAttribute("id",d+"E"),e=this.clone(),e.collapse(),e.insertNode(c));e=this.clone();e.collapse(!0);e.insertNode(b);c?(this.setStartAfter(b),this.setEndBefore(c)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?d+(g?"C":"S"):b,endNode:a?d+"E":c,serializable:a,collapsed:g}},createBookmark2:function(){function a(b){var f=b.container,d=b.offset,e;e=f;var g=d;e=e.type!=CKEDITOR.NODE_ELEMENT||0===g||g==e.getChildCount()?
-0:e.getChild(g-1).type==CKEDITOR.NODE_TEXT&&e.getChild(g).type==CKEDITOR.NODE_TEXT;e&&(f=f.getChild(d-1),d=f.getLength());if(f.type==CKEDITOR.NODE_ELEMENT&&0<d){a:{for(e=f;d--;)if(g=e.getChild(d).getIndex(!0),0<=g){d=g;break a}d=-1}d+=1}if(f.type==CKEDITOR.NODE_TEXT){e=f;for(g=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)g+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;e=g;f.getText()?d+=e:(g=f.getPrevious(c),e?(d=e,f=g?g.getNext():f.getParent().getFirst()):(f=
-f.getParent(),d=g?g.getIndex(!0)+1:0))}b.container=f;b.offset=d}function b(a,c){var f=c.getCustomData("cke-fillingChar");if(f){var d=a.container;f.equals(d)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=d.getIndex(),a.container=d.getParent()))}}var c=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(c){var d=this.collapsed,e={container:this.startContainer,offset:this.startOffset},m={container:this.endContainer,offset:this.endOffset};c&&(a(e),
-b(e,this.root),d||(a(m),b(m,this.root)));return{start:e.container.getAddress(c),end:d?null:m.container.getAddress(c),startOffset:e.offset,endOffset:m.offset,normalized:c,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),c=a.startOffset,d=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,c);d?this.setEnd(d,a):this.collapse(!0)}else b=(c=a.serializable)?this.document.getById(a.startNode):a.startNode,
-a=c?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,c=this.startOffset,d=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>c)a=a.getChild(c);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),
-e>d)b=b.getChild(d).getPreviousSourceNode(!0);else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var c=this.startContainer,d=this.endContainer,c=c.equals(d)?a&&c.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?c.getChild(this.startOffset):c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=
-this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},
-trim:function(a,b){var c=this.startContainer,d=this.startOffset,e=this.collapsed;if((!a||e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var g=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(g,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;
-b||e||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var g=function(a,b){var c=new CKEDITOR.dom.range(k);c.setStart(a,b);c.setEndAt(k,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),
-f;for(c.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};f=c.next();){if(f.type!=CKEDITOR.NODE_TEXT)return!1;q=f!=a?f.getText():f.substring(b);if(d.test(q))return!1}return!0};if(this.collapsed)break;var m=this.getCommonAncestor(),k=this.root,h,u,l,t,J,H=!1,E,q;E=this.startContainer;var y=this.startOffset;E.type==CKEDITOR.NODE_TEXT?(y&&(E=!CKEDITOR.tools.trim(E.substring(0,y)).length&&E,H=!!E),E&&((t=E.getPrevious())||(l=E.getParent()))):(y&&(t=E.getChild(y-1)||E.getLast()),
-t||(l=E));for(l=c(l);l||t;){if(l&&!t){!J&&l.equals(m)&&(J=!0);if(e?l.isBlockBoundary():!k.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,J?h=l:this.setStartBefore(l));t=l.getPrevious()}for(;t;)if(E=!1,t.type==CKEDITOR.NODE_COMMENT)t=t.getPrevious();else{if(t.type==CKEDITOR.NODE_TEXT)q=t.getText(),d.test(q)&&(t=null),E=/[\s\ufeff]$/.test(q);else if((t.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&t.is("br"))&&!t.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[t.getName()]){q=
-t.getText();if(d.test(q))t=null;else for(var y=t.$.getElementsByTagName("*"),v=0,B;B=y[v++];)if(!CKEDITOR.dtd.$removeEmpty[B.nodeName.toLowerCase()]){t=null;break}t&&(E=!!q.length)}else t=null;E&&(H?J?h=l:l&&this.setStartBefore(l):H=!0);if(t){E=t.getPrevious();if(!l&&!E){l=t;t=null;break}t=E}else l=null}l&&(l=c(l.getParent()))}E=this.endContainer;y=this.endOffset;l=t=null;J=H=!1;E.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(E.substring(y)).length?H=!0:(H=!E.getLength(),y==E.getLength()?(t=E.getNext())||
-(l=E.getParent()):g(E,y)&&(l=E.getParent())):(t=E.getChild(y))||(l=E);for(;l||t;){if(l&&!t){!J&&l.equals(m)&&(J=!0);if(e?l.isBlockBoundary():!k.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,J?u=l:l&&this.setEndAfter(l));t=l.getNext()}for(;t;){E=!1;if(t.type==CKEDITOR.NODE_TEXT)q=t.getText(),g(t,0)||(t=null),E=/^[\s\ufeff]/.test(q);else if(t.type==CKEDITOR.NODE_ELEMENT){if((0<t.$.offsetWidth||b&&t.is("br"))&&!t.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[t.getName()]){q=
-t.getText();if(d.test(q))t=null;else for(y=t.$.getElementsByTagName("*"),v=0;B=y[v++];)if(!CKEDITOR.dtd.$removeEmpty[B.nodeName.toLowerCase()]){t=null;break}t&&(E=!!q.length)}else t=null}else E=1;E&&H&&(J?u=l:this.setEndAfter(l));if(t){E=t.getNext();if(!l&&!E){l=t;t=null;break}t=E}else l=null}l&&(l=c(l.getParent()))}h&&u&&(m=h.contains(u)?u:h,this.setStartBefore(m),this.setEndAfter(m));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:l=new CKEDITOR.dom.range(this.root);
-k=this.root;l.setStartAt(k,CKEDITOR.POSITION_AFTER_START);l.setEnd(this.startContainer,this.startOffset);l=new CKEDITOR.dom.walker(l);var L,n,O=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),p=null,C=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(p){if(p.equals(a)){p=null;return}}else p=a;else if(p)return;var b=O(a);b||(L=a);return b},e=function(a){var b=C(a);!b&&a.is&&a.is("br")&&(n=a);return b};l.guard=C;l=l.lastBackward();
-L=L||k;this.setStartAt(L,!L.is("br")&&(!l&&this.checkStartOfBlock()||l&&L.contains(l))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){l=this.clone();l=new CKEDITOR.dom.walker(l);var r=CKEDITOR.dom.walker.whitespaces(),G=CKEDITOR.dom.walker.bookmark();l.evaluator=function(a){return!r(a)&&!G(a)};if((l=l.previous())&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("br"))break}l=this.clone();l.collapse();l.setEndAt(k,CKEDITOR.POSITION_BEFORE_END);l=new CKEDITOR.dom.walker(l);
-l.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:C;L=p=n=null;l=l.lastForward();L=L||k;this.setEndAt(L,!l&&this.checkEndOfBlock()||l&&L.contains(l)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);n&&this.setEndAfter(n)}},shrink:function(a,b,c){var d="boolean"===typeof c?c:c&&"boolean"===typeof c.shrinkOnBlockBoundary?c.shrinkOnBlockBoundary:!0,e=c&&c.skipBogus;if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var g=this.clone(),m=this.startContainer,k=this.endContainer,h=this.startOffset,
-u=this.endOffset,l=c=1;m&&m.type==CKEDITOR.NODE_TEXT&&(h?h>=m.getLength()?g.setStartAfter(m):(g.setStartBefore(m),c=0):g.setStartBefore(m));k&&k.type==CKEDITOR.NODE_TEXT&&(u?u>=k.getLength()?g.setEndAfter(k):(g.setEndAfter(k),l=0):g.setEndBefore(k));var g=new CKEDITOR.dom.walker(g),t=CKEDITOR.dom.walker.bookmark(),J=CKEDITOR.dom.walker.bogus();g.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var H;g.guard=function(b,c){if(e&&J(b)||t(b))return!0;
-if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(H)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(H=b);return!0};c&&(m=g[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(m,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);l&&(g.reset(),(g=g[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(g,b?CKEDITOR.POSITION_BEFORE_END:
-CKEDITOR.POSITION_AFTER_END));return!(!c&&!l)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,
-0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||
-(this._setStartContainer(b),this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,
-b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},
-fixBlock:function(a,b){var c=this.createBookmark(),d=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(d);d.trim();this.insertNode(d);var e=d.getBogus();e&&e.remove();d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=c.block,g=d.block,m=null;if(!c.blockLimit.equals(d.blockLimit))return null;
-"br"!=a&&(e||(e=this.fixBlock(!0,a),g=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),g||(g=this.fixBlock(!1,a)));c=e&&this.checkStartOfBlock();d=g&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(g)&&(d?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(g,CKEDITOR.POSITION_AFTER_END),g=null):c?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(g=this.splitElement(e,
-b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:g,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:m}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var c=this.extractContents(!1,b||!1),d=a.clone(!1,b||!1);c.appendTo(d);d.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return d},removeEmptyBlocksAtEnd:function(){function a(d){return function(a){return b(a)||c(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||
-d.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var c=this.createBookmark(),d=this[b?"endPath":"startPath"](),e=d.block||d.blockLimit,g;e&&!e.equals(d.root)&&!e.getFirst(a(e));)g=e.getParent(),this[b?"setEndAt":"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=g;this.moveToBookmark(c)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,
-this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,e=this.clone();e.collapse(d);e[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);e.evaluator=c(d);return e[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,c=this.startOffset;CKEDITOR.env.ie&&c&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,c)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,
-this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,c=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(c)),k.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);
-a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkForward()},getPreviousNode:function(a,b,c){var d=this.clone();d.collapse(1);d.setStartAt(c||this.root,CKEDITOR.POSITION_AFTER_START);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.previous()},getNextNode:function(a,b,c){var d=this.clone();d.collapse();d.setEndAt(c||this.root,CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.next()},checkReadOnly:function(){function a(b,c){for(;b;){if(b.type==
-CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(c)||b.equals(c)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,c=this.endContainer;return!(a(b,c)&&a(c,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),
-!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);
-else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var d=a,e=c,g=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(g=d[b?"getLast":"getFirst"](u));e||g||(g=d[b?"getPrevious":"getNext"](u));a=g}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,e,g,m=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,m[b?0:1])):c=this.clone();if(a&&
-!a.is(CKEDITOR.dtd.$block))d=1;else if(e=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(g=e.type==CKEDITOR.NODE_ELEMENT)&&e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&g&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(e,0),c.collapse()):c.moveToPosition(e,m[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},
-moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),c=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return c(a)&&b(a)};var d=a.next();a.reset();return d&&d.equals(a.previous())?d:null},getTouchedStartNode:function(){var a=this.startContainer;
-return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:e(),getPreviousEditableNode:e(1),_getTableElement:function(a){a=a||{td:1,th:1,tr:1,tbody:1,thead:1,tfoot:1,table:1};var b=this.startContainer,c=this.endContainer,d=b.getAscendant("table",!0),e=c.getAscendant("table",!0);return CKEDITOR.env.safari&&d&&c.equals(this.root)?
-b.getAscendant(a,!0):this.getEnclosedNode()?this.getEnclosedNode().getAscendant(a,!0):d&&e&&(d.equals(e)||d.contains(e)||e.contains(d))?b.getAscendant(a,!0):null},scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,c,d,e=this.clone();e.optimize();(d=e.startContainer.type==CKEDITOR.NODE_TEXT)?(c=e.startContainer.getText(),b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();
-d&&(e.startContainer.setText(c),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var c=this.getCommonAncestor(),d=this.getBoundaryNodes(),e=[],g,m,k,h;if(c&&c.find)for(m=c.find(a),g=0;g<m.count();g++)if(c=m.getItem(g),b||!c.isReadOnly())k=c.getPosition(d.startNode)&CKEDITOR.POSITION_FOLLOWING||d.startNode.equals(c),h=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED||
-d.endNode.equals(c),k&&h&&e.push(c);return e}};CKEDITOR.dom.range.mergeRanges=function(a){return CKEDITOR.tools.array.reduce(a,function(a,b){var c=a[a.length-1],d=!1;b=b.clone();b.enlarge(CKEDITOR.ENLARGE_ELEMENT);if(c){var e=new CKEDITOR.dom.range(b.root),d=new CKEDITOR.dom.walker(e),f=CKEDITOR.dom.walker.whitespaces();e.setStart(c.endContainer,c.endOffset);e.setEnd(b.startContainer,b.startOffset);for(e=d.next();f(e)||b.endContainer.equals(e);)e=d.next();d=!e}d?c.setEnd(b.endContainer,b.endOffset):
-a.push(b);return a},[])}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
-(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,e,g){a:{null==g&&(g=d(e));for(var k;k=g.shift();)if(k.getDtd().p){g={element:k,remaining:g};break a}g=null}if(!g)return 0;if((k=CKEDITOR.filter.instances[g.element.data("cke-filter")])&&!k.check(c))return b(a,
-c,e,g.remaining);c=new CKEDITOR.dom.range(g.element);c.selectNodeContents(g.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=k;a._.nestedEditable={element:g.element,container:e,remaining:g.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var e=/^[\r\n\t ]+$/,g=CKEDITOR.dom.walker.bookmark(!1,!0),h=CKEDITOR.dom.walker.whitespaces(!0),
-k=function(a){return g(a)&&h(a)},n={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,h,w,A,F;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
-null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var x=this.range.clone();h=x.startPath();var m=x.endPath(),K=!x.collapsed&&c(x,h.block),z=!x.collapsed&&c(x,m.block,1);x.shrink(CKEDITOR.SHRINK_ELEMENT,!0);K&&x.setStartAt(h.block,CKEDITOR.POSITION_BEFORE_END);z&&x.setEndAt(m.block,CKEDITOR.POSITION_AFTER_START);h=x.endContainer.hasAscendant("pre",!0)||x.startContainer.hasAscendant("pre",!0);x.enlarge(this.forceBrBreak&&!h||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
-x.collapsed||(h=new CKEDITOR.dom.walker(x.clone()),m=CKEDITOR.dom.walker.bookmark(!0,!0),h.evaluator=m,this._.nextNode=h.next(),h=new CKEDITOR.dom.walker(x.clone()),h.evaluator=m,h=h.previous(),this._.lastNode=h.getNextSourceNode(!0,null,x.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(m=this.range.clone(),m.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),m.checkEndOfBlock()&&
-(m=new CKEDITOR.dom.elementPath(m.endContainer,m.root),this._.lastNode=(m.block||m.blockLimit).getNextSourceNode(!0))),this._.lastNode&&x.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=x.document.createText(""),this._.lastNode.insertAfter(h)),x=null);this._.started=1;h=x}m=this._.nextNode;x=this._.lastNode;for(this._.nextNode=null;m;){var K=0,z=m.hasAscendant("pre"),I=m.type!=CKEDITOR.NODE_ELEMENT,l=0;if(I)m.type==CKEDITOR.NODE_TEXT&&e.test(m.getText())&&(I=0);else{var t=m.getName();
-if(CKEDITOR.dtd.$block[t]&&"false"==m.getAttribute("contenteditable")){d=m;b(this,a,d);break}else if(m.isBlockBoundary(this.forceBrBreak&&!z&&{br:1})){if("br"==t)I=1;else if(!h&&!m.getChildCount()&&"hr"!=t){d=m;w=m.equals(x);break}h&&(h.setEndAt(m,CKEDITOR.POSITION_BEFORE_START),"br"!=t&&(this._.nextNode=m));K=1}else{if(m.getFirst()){h||(h=this.range.clone(),h.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));m=m.getFirst();continue}I=1}}I&&!h&&(h=this.range.clone(),h.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));
-w=(!K||I)&&m.equals(x);if(h&&!K)for(;!m.getNext(k)&&!w;){t=m.getParent();if(t.isBlockBoundary(this.forceBrBreak&&!z&&{br:1})){K=1;I=0;w||t.equals(x);h.setEndAt(t,CKEDITOR.POSITION_BEFORE_END);break}m=t;I=1;w=m.equals(x);l=1}I&&h.setEndAt(m,CKEDITOR.POSITION_AFTER_END);m=this._getNextSourceNode(m,l,x);if((w=!m)||K&&h)break}if(!d){if(!h)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(h.startContainer,h.root);m=d.blockLimit;K={div:1,th:1,td:1};
-d=d.block;!d&&m&&!this.enforceRealBlocks&&K[m.getName()]&&h.checkStartOfBlock()&&h.checkEndOfBlock()&&!m.equals(h.root)?d=m:!d||this.enforceRealBlocks&&d.is(n)?(d=this.range.document.createElement(a),h.extractContents().appendTo(d),d.trim(),h.insertNode(d),A=F=!0):"li"!=d.getName()?h.checkStartOfBlock()&&h.checkEndOfBlock()||(d=d.clone(!1),h.extractContents().appendTo(d),d.trim(),F=h.splitBlock(),A=!F.wasStartOfBlock,F=!F.wasEndOfBlock,h.insertNode(d)):w||(this._.nextNode=d.equals(x)?null:this._getNextSourceNode(h.getBoundaryNodes().endNode,
-1,x))}A&&(A=d.getPrevious())&&A.type==CKEDITOR.NODE_ELEMENT&&("br"==A.getName()?A.remove():A.getLast()&&"br"==A.getLast().$.nodeName.toLowerCase()&&A.getLast().remove());F&&(A=d.getLast())&&A.type==CKEDITOR.NODE_ELEMENT&&"br"==A.getName()&&(!CKEDITOR.env.needsBrFiller||A.getPrevious(g)||A.getNext(g))&&A.remove();this._.nextNode||(this._.nextNode=w||d.equals(x)||!x?null:this._getNextSourceNode(d,1,x));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(e))}var e=
-this.range.root;for(a=a.getNextSourceNode(b,null,d);!g(a);)a=a.getNextSourceNode(b,null,d);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}})();
-CKEDITOR.command=function(a,d){this.uiItems=[];this.exec=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==d.exec.call(this,a,b)};this.refresh=function(a,b){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!b.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",
-{editor:a,path:b})?!0:d.refresh&&!1!==d.refresh.apply(this,arguments)};var b;this.checkAllowed=function(c){return c||"boolean"!=typeof b?b=a.activeFilter.checkFeature(this):b};CKEDITOR.tools.extend(this,d,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!d.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)};
-CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?
-this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.event.implementOn(CKEDITOR.command.prototype);CKEDITOR.ENTER_P=1;CKEDITOR.ENTER_BR=2;CKEDITOR.ENTER_DIV=3;
-CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};
-(function(){function a(a,b,c,d,e){var l,f;a=[];for(l in b){f=b[l];f="boolean"==typeof f?{}:"function"==typeof f?{match:f}:v(f);"$"!=l.charAt(0)&&(f.elements=l);c&&(f.featureName=c.toLowerCase());var r=f;r.elements=h(r.elements,/\s+/)||null;r.propertiesOnly=r.propertiesOnly||!0===r.elements;var q=/\s*,\s*/,g=void 0;for(g in W){r[g]=h(r[g],q)||null;var p=r,t=O[g],m=h(r[O[g]],q),G=r[g],y=[],B=!0,C=void 0;m?B=!1:m={};for(C in G)"!"==C.charAt(0)&&(C=C.slice(1),y.push(C),m[C]=!0,B=!1);for(;C=y.pop();)G[C]=
-G["!"+C],delete G["!"+C];p[t]=(B?!1:m)||null}r.match=r.match||null;d.push(f);a.push(f)}b=e.elements;e=e.generic;var k;c=0;for(d=a.length;c<d;++c){l=v(a[c]);f=!0===l.classes||!0===l.styles||!0===l.attributes;r=l;g=t=q=void 0;for(q in W)r[q]=K(r[q]);p=!0;for(g in O){q=O[g];t=r[q];m=[];G=void 0;for(G in t)-1<G.indexOf("*")?m.push(new RegExp("^"+G.replace(/\*/g,".*")+"$")):m.push(G);t=m;t.length&&(r[q]=t,p=!1)}r.nothingRequired=p;r.noProperties=!(r.attributes||r.classes||r.styles);if(!0===l.elements||
-null===l.elements)e[f?"unshift":"push"](l);else for(k in r=l.elements,delete l.elements,r)if(b[k])b[k][f?"unshift":"push"](l);else b[k]=[l]}}function d(a,c,d,e){if(!a.match||a.match(c))if(e||k(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;e=d.validClasses;if(a)if(!0===a)a=!0;else{for(var l=0,f=c.length,r;l<f;++l)r=c[l],e[r]||
-(e[r]=a(r));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=e(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=e(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,l=!0===a,r=b.length;r--;)if(l||a(b[r]))b.splice(r,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function e(a,
-b){if(!a)return!1;var c=!1,d=!0===a,e;for(e in b)if(d||a(e))delete b[e],c=!0;return c}function g(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function h(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=B(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,e;for(e in a)c[e]=a[e],d++;return d?c:!1}function k(a,b){if(a.nothingRequired)return!0;
-var c,d,e,l;if(e=a.requiredClasses)for(l=b.classes,c=0;c<e.length;++c)if(d=e[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(l,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(l,d))return!1;return n(b.styles,a.requiredStyles)&&n(b.attributes,a.requiredAttributes)}function n(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function u(a){if(!a)return{};
-a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function f(a){var b,c,d,e,l={},r=1;for(a=B(a);b=a.match(p);)(c=b[2])?(d=D(c,"styles"),e=D(c,"attrs"),c=D(c,"classes")):d=e=c=null,l["$"+r++]={elements:b[1],classes:c,styles:d,attributes:e},a=a.slice(b[0].length);return l}function D(a,b){var c=a.match(C[b]);return c?B(c[1]):null}function w(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
-"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function A(a,b,e,l){var f=0,q;l.toHtml&&(b.name=b.name.replace(r,"$1"));if(l.doCallbacks&&a.elementCallbacks){a:{q=a.elementCallbacks;for(var v=0,g=q.length,p;v<g;++v)if(p=q[v](b)){q=p;break a}q=void 0}if(q)return q}if(l.doTransform&&(q=a._.transformations[b.name])){w(b);for(v=0;v<q.length;++v)t(a,b,q[v]);x(b)}if(l.doFilter){a:{v=b.name;g=a._;a=g.allowedRules.elements[v];q=g.allowedRules.generic;v=g.disallowedRules.elements[v];g=g.disallowedRules.generic;
-p=l.skipRequired;var y={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},B,C;if(a||q){w(b);if(v)for(B=0,C=v.length;B<C;++B)if(!1===c(v[B],b,y)){a=null;break a}if(g)for(B=0,C=g.length;B<C;++B)c(g[B],b,y);if(a)for(B=0,C=a.length;B<C;++B)d(a[B],b,y,p);if(q)for(B=0,C=q.length;B<C;++B)d(q[B],b,y,p);a=y}else a=null}if(!a||!a.valid)return e.push(b),1;C=a.validAttributes;var h=a.validStyles;
-q=a.validClasses;var v=b.attributes,k=b.styles,g=b.classes;p=b.classBackup;var J=b.styleBackup,H,N,E=[],y=[],O=/^data-cke-/;B=!1;delete v.style;delete v["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(H in v)C[H]||(O.test(H)?H==(N=H.replace(/^data-cke-saved-/,""))||C[N]||(delete v[H],B=!0):(delete v[H],B=!0));if(!a.allStyles||a.hadInvalidStyle){for(H in k)a.allStyles||h[H]?E.push(H+":"+k[H]):B=!0;E.length&&(v.style=E.sort().join("; "))}else J&&(v.style=J);if(!a.allClasses||
-a.hadInvalidClass){for(H=0;H<g.length;++H)(a.allClasses||q[g[H]])&&y.push(g[H]);y.length&&(v["class"]=y.sort().join(" "));p&&y.length<p.split(/\s+/).length&&(B=!0)}else p&&(v["class"]=p);B&&(f=1);if(!l.skipFinalValidation&&!m(b))return e.push(b),1}l.toHtml&&(b.name=b.name.replace(G,"cke:$1"));return f}function F(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function x(a){var b=a.attributes,c;delete b.style;delete b["class"];
-if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function m(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function K(a){if(!a)return!1;if(!0===a)return!0;var b=F(a);return function(c){return c in a||b&&c.match(b)}}function z(){return new CKEDITOR.htmlParser.element("br")}function I(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
-a.name||y.$block[a.name])}function l(a,b,c){var d=a.name;if(y.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(z()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(y.$block[d]||"tr"==d)if("br"==b)a.previous&&!I(a.previous)&&(b=z(),b.insertBefore(a)),a.next&&!I(a.next)&&(b=z(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,e;b:{e=y[b];for(var l=0,r=d.length,f;l<r;++l)if(f=d[l],f.type==CKEDITOR.NODE_ELEMENT&&!e[f.name]){e=!1;break b}e=!0}if(e)a.name=b,a.attributes=
-{},c.push({check:"parent-down",el:a});else{e=a.parent;for(var l=e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==e.name,v,q,r=d.length;0<r;)f=d[--r],l&&(f.type==CKEDITOR.NODE_TEXT||f.type==CKEDITOR.NODE_ELEMENT&&y.$inline[f.name])?(v||(v=new CKEDITOR.htmlParser.element(b),v.insertAfter(a),c.push({check:"parent-down",el:v})),v.add(f,0)):(v=null,q=y[e.name]||y.span,f.insertAfter(a),e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||f.type!=CKEDITOR.NODE_ELEMENT||q[f.name]||c.push({check:"el-up",el:f}));a.remove()}}else d in
-{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function t(a,b,c){var d,e;for(d=0;d<c.length;++d)if(e=c[d],!(e.check&&!a.check(e.check,!1)||e.left&&!e.left(b))){e.right(b,N);break}}function J(a,b){var c=b.getDefinition(),d=c.attributes,e=c.styles,l,f,r,v;if(a.name!=c.element)return!1;for(l in d)if("class"==l)for(c=d[l].split(/\s+/),r=a.classes.join("|");v=c.pop();){if(-1==r.indexOf(v))return!1}else if(a.attributes[l]!=d[l])return!1;for(f in e)if(a.styles[f]!=
-e[f])return!1;return!0}function H(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function E(a){return function(b){return J(b,a)}}function q(a){return function(b,c){c[a](b)}}var y=CKEDITOR.dtd,v=CKEDITOR.tools.copy,B=CKEDITOR.tools.trim,L=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
-!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(L[a.enterMode]+" "+L[a.shiftEnterMode],"default",
-1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!g(this,b,d))return!1;var e,l;if("string"==typeof b)b=f(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);e=b.getDefinition();b={};d=e.attributes;b[e.element]=e={styles:e.styles,requiredStyles:e.styles&&CKEDITOR.tools.objectKeys(e.styles)};d&&(d=
-v(d),e.classes=d["class"]?d["class"].split(/\s+/):null,e.requiredClasses=e.classes,delete d["class"],e.attributes=d,e.requiredAttributes=d&&CKEDITOR.tools.objectKeys(d))}else if(CKEDITOR.tools.isArray(b)){for(e=0;e<b.length;++e)l=this.allow(b[e],c,d);return l}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var e=this,f=[],r=this.editor&&this.editor.config.protectedSource,v,q=!1,g={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(v=A(e,a,f,g),v&1)q=!0;else if(v&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var l,p,t;if(r)for(p=0;p<r.length;++p)if((t=d.match(r[p]))&&t[0].length==d.length){c=!0;
-break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(l=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&A(e,l,c,g);c=!c.length}c||f.push(a)}},null,!0);f.length&&(q=!0);var p;a=[];d=L[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var t;c=f.pop();)c.type==CKEDITOR.NODE_ELEMENT?l(c,d,a):c.remove();for(;p=a.pop();)if(c=p.el,c.parent)switch(t=y[c.parent.name]||y.span,p.check){case "it":y.$removeEmpty[c.name]&&!c.children.length?l(c,d,a):m(c)||l(c,d,a);break;case "el-up":c.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||t[c.name]||l(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||t[c.name]||l(c.parent,d,a)}return q},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!g(this,b,!0))return!1;"string"==typeof b&&(b=f(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
-addContentForms:function(a){if(!this.disabled&&a){var b,c,d=[],e;for(b=0;b<a.length&&!e;++b)c=a[b],("string"==typeof c||c instanceof CKEDITOR.style)&&this.check(c)&&(e=c);if(e){for(b=0;b<a.length;++b)d.push(H(a[b],e));this.addTransformations(d)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,e;for(e=0;e<a.length;++e){b=a[e];var l=void 0,f=void 0,r=void 0,v=void 0,g=void 0,p=void 0;c=[];for(f=0;f<b.length;++f)r=b[f],"string"==typeof r?(r=r.split(/\s*:\s*/),v=r[0],g=null,p=r[1]):(v=r.check,g=r.left,p=r.right),l||(l=r,l=l.element?l.element:v?v.match(/^([a-z0-9]+)/i)[0]:
-l.left.getDefinition().element),g instanceof CKEDITOR.style&&(g=E(g)),c.push({check:v==l?null:v,left:g,right:"string"==typeof p?q(p):p});b=l;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var e,l;if("string"==typeof a){l=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(l in this._.cachedChecks)return this._.cachedChecks[l];d=f(a).$1;e=d.styles;var r=d.classes;d.name=d.elements;
-d.classes=r=r?r.split(/\s*,\s*/):[];d.styles=u(e);d.attributes=u(d.attributes);d.children=[];r.length&&(d.attributes["class"]=r.join(" "));e&&(d.attributes.style=CKEDITOR.tools.writeCssText(d.styles));e=d}else d=a.getDefinition(),e=d.styles,r=d.attributes||{},e&&!CKEDITOR.tools.isEmpty(e)?(e=v(e),r.style=CKEDITOR.tools.writeCssText(e,!0)):e={},e={name:d.element,attributes:r,classes:r["class"]?r["class"].split(/\s+/):[],styles:e,children:[]};var r=CKEDITOR.tools.clone(e),q=[],g;if(!1!==b&&(g=this._.transformations[e.name])){for(d=
-0;d<g.length;++d)t(this,e,g[d]);x(e)}A(this,r,q,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<q.length?!1:CKEDITOR.tools.objectCompare(e.attributes,r.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[l]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(c,d){var e=a.slice(),l;if(this.check(L[c]))return c;for(d||(e=e.reverse());l=e.pop();)if(this.check(l))return b[l];
-return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var W={styles:1,attributes:1,classes:1},O={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},p=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,C={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},r=/^cke:(object|embed|param)$/,
-G=/^(object|embed|param)$/,N;N=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],e=d&&d.match(/^(\d+)(?:\.\d*)?px$/);
-e?a.attributes[c]=e[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},splitBorderShorthand:function(a){function b(d){a.styles["border-top-width"]=c[d[0]];a.styles["border-right-width"]=
-c[d[1]];a.styles["border-bottom-width"]=c[d[2]];a.styles["border-left-width"]=c[d[3]]}if(a.styles.border){var c=a.styles.border.match(/([\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:a.styles["border-width"]=c[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}a.styles["border-style"]=a.styles["border-style"]||(a.styles.border.match(/(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/)||[])[0];a.styles["border-style"]||delete a.styles["border-style"];
-delete a.styles.border}},listTypeToStyle:function(a){if(a.attributes.type)switch(a.attributes.type){case "a":a.styles["list-style-type"]="lower-alpha";break;case "A":a.styles["list-style-type"]="upper-alpha";break;case "i":a.styles["list-style-type"]="lower-roman";break;case "I":a.styles["list-style-type"]="upper-roman";break;case "1":a.styles["list-style-type"]="decimal";break;default:a.styles["list-style-type"]=a.attributes.type}},splitMarginShorthand:function(a){function b(d){a.styles["margin-top"]=
-c[d[0]];a.styles["margin-right"]=c[d[1]];a.styles["margin-bottom"]=c[d[2]];a.styles["margin-left"]=c[d[3]]}if(a.styles.margin){var c=a.styles.margin.match(/(\-?[\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:J,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,e=c.attributes,l,r,f,v;a.name=c.element;for(l in e)if("class"==l)for(c=
-a.classes.join("|"),f=e[l].split(/\s+/);v=f.pop();)-1==c.indexOf(v)&&a.classes.push(v);else a.attributes[l]=e[l];for(r in d)a.styles[r]=d[r]}}}})();
-(function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=
-1},unlock:function(){delete this._.locked},blur:function(a){function d(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var b=CKEDITOR.focusManager._.blurDelay;a||!b?d.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;d.call(this)},b,this)}},add:function(a,d){var b=a.getCustomData("focusmanager");if(!b||b!=this){b&&b.remove(a);var b=
-"focus",c="blur";d&&(CKEDITOR.env.ie?(b="focusin",c="focusout"):CKEDITOR.event.useCapture=1);var e={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(b,e.focus,this);a.on(c,e.blur,this);d&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",e)}},remove:function(a){a.removeCustomData("focusmanager");var d=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",d.blur);a.removeListener("focus",
-d.focus)}}})();CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this};
-(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),g=this.keystrokes[d],h=this._.editor;a=!1===h.fire("key",{keyCode:d,domEvent:b});a||(g&&(a=!1!==h.execCommand(g,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
-(function(){CKEDITOR.lang={languages:{af:1,ar:1,az:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,"es-mx":1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,oc:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,d,b){a&&CKEDITOR.lang.languages[a]||
-(a=this.detect(d,a));var c=this;d=function(){c[a].dir=c.rtl[a]?"rtl":"ltr";b(a,c[a])};this[a]?d():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),d,this)},detect:function(a,d){var b=this.languages;d=d||navigator.userLanguage||navigator.language||a;var c=d.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),e=c[1],c=c[2];b[e+"-"+c]?e=e+"-"+c:b[e]||(e=null);CKEDITOR.lang.detect=e?function(){return e}:function(a){return a};return e||a}}})();
-CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,e,g){var h="string"==typeof b;h&&(b=[b]);e||(e=CKEDITOR);var k=b.length,n=[],u=[],f=function(a){c&&(h?c.call(e,a):c.call(e,n,u))};if(0===k)f(!0);else{var D=function(a,b){(b?n:u).push(a);0>=--k&&(g&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),f(b))},w=function(b,c){a[b]=1;var e=d[b];delete d[b];for(var f=0;f<e.length;f++)e[f](b,c)},A=function(b){if(a[b])D(b,!0);else{var e=d[b]||(d[b]=[]);e.push(D);if(!(1<e.length)){var f=
-new CKEDITOR.dom.element("script");f.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?f.$.onreadystatechange=function(){if("loaded"==f.$.readyState||"complete"==f.$.readyState)f.$.onreadystatechange=null,w(b,!0)}:(f.$.onload=function(){setTimeout(function(){w(b,!0)},0)},f.$.onerror=function(){w(b,!1)}));f.appendTo(CKEDITOR.document.getHead())}}};g&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var F=0;F<k;F++)A(b[F])}},
-queue:function(){function a(){var b;(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,g){var h=this;c.push({scriptUrl:d,callback:function(){g&&g.apply(this,arguments);c.shift();a.call(h)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
-CKEDITOR.resourceManager.prototype={add:function(a,d){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var b=this.registered[a]=d||{};b.name=a;b.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",b);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var d=this.externals[a];return CKEDITOR.getUrl(d&&d.dir||this.basePath+a+"/")},getFilePath:function(a){var d=this.externals[a];
-return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){a=a.split(",");for(var c=0;c<a.length;c++){var e=a[c];b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));this.externals[e]={dir:d,file:b||this.fileName+".js"}}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,e=this.registered,g=[],h={},k={},n=0;n<a.length;n++){var u=a[n];if(u)if(c[u]||e[u])k[u]=this.get(u);else{var f=this.getFilePath(u);g.push(f);f in h||(h[f]=
-[]);h[f].push(u)}}CKEDITOR.scriptLoader.load(g,function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+h[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var g=h[a[f]],n=0;n<g.length;n++){var m=g[n];k[m]=this.get(m);c[m]=1}d.call(b,k)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
-CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,e){var g={},h=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(g,a);var b=[],f;for(f in a){var k=a[f],w=k&&k.requires;if(!d[f]){if(k.icons)for(var A=k.icons.split(","),F=A.length;F--;)CKEDITOR.skin.addIcon(A[F],k.path+"icons/"+(CKEDITOR.env.hidpi&&k.hidpi?"hidpi/":"")+A[F]+".png");d[f]=1}if(w)for(w.split&&(w=w.split(",")),k=0;k<w.length;k++)g[w[k]]||b.push(w[k])}if(b.length)h.call(this,
-b);else{for(f in g)k=g[f],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete g[f],k.onLoad._called=1);c&&c.call(e||window,g)}},this)};h.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this};
-CKEDITOR.ui.prototype={add:function(a,d,b){b.name=a.toLowerCase();var c=this.items[a]={type:d,command:b.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(c,b)},get:function(a){return this.instances[a]},create:function(a){var d=this.items[a],b=d&&this._.handlers[d.type],c=d&&d.command&&this.editor.getCommand(d.command),b=b&&b.create.apply(this,d.args);this.instances[a]=b;c&&c.uiItems.push(b);b&&!b.type&&(b.type=d.type);return b},addHandler:function(a,d){this._.handlers[a]=
-d},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}};CKEDITOR.event.implementOn(CKEDITOR.ui);
-(function(){function a(a,e,f){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==e){if(!(e instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!f)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!b(e,f))throw Error('The specified element mode is not supported on element: "'+e.getName()+'".');
-this.element=e;this.elementMode=f;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(e.getId()||e.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||d();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",
-c);this.on("selectionChange",function(a){g(this,a.data.path)});this.on("activeFilterChange",function(){g(this,this.elementPath(),!0)});this.on("mode",c);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function d(){do var a="editor"+ ++F;while(CKEDITOR.instances[a]);return a}function b(a,
-b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)e(this,a[b])}function e(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function g(a,b,c){if(b){var d,e,f=a.commands;for(e in f)d=f[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function h(a){var b=a.config.customConfig;if(!b)return!1;var b=
-CKEDITOR.getUrl(b),c=x[b]||(x[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&h(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};h(a)});return!0}function k(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?
-a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;
-a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);n(a)});b&&null!=b.customConfig&&(a.config.customConfig=b.customConfig);h(a)||a.fireOnce("customConfigLoaded")}function n(a){CKEDITOR.skin.loadPart("editor",function(){u(a)})}function u(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,
-c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");f(a)})}function f(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);D(a)})}function D(a){var b=a.config,c=b.plugins,d=b.extraPlugins,e=
-b.removePlugins;if(d)var f=new RegExp("(?:^|,)(?:"+d.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(f,""),c=c+(","+d);if(e)var g=new RegExp("(?:^|,)(?:"+e.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(g,"");CKEDITOR.env.air&&(c+=",adobeair");CKEDITOR.plugins.load(c.split(","),function(c){var d=[],e=[],f=[];a.plugins=c;for(var l in c){var t=c[l],k=t.lang,h=null,O=t.requires,p;CKEDITOR.tools.isArray(O)&&(O=O.join(","));if(O&&(p=O.match(g)))for(;O=p.pop();)CKEDITOR.error("editor-plugin-required",
-{plugin:O.replace(",",""),requiredBy:l});k&&!a.lang[l]&&(k.split&&(k=k.split(",")),0<=CKEDITOR.tools.indexOf(k,a.langCode)?h=a.langCode:(h=a.langCode.replace(/-.*/,""),h=h!=a.langCode&&0<=CKEDITOR.tools.indexOf(k,h)?h:0<=CKEDITOR.tools.indexOf(k,"en")?"en":k[0]),t.langEntries&&t.langEntries[h]?(a.lang[l]=t.langEntries[h],h=null):f.push(CKEDITOR.getUrl(t.path+"lang/"+h+".js")));e.push(h);d.push(t)}CKEDITOR.scriptLoader.load(f,function(){for(var c=["beforeInit","init","afterInit"],f=0;f<c.length;f++)for(var l=
-0;l<d.length;l++){var v=d[l];0===f&&e[l]&&v.lang&&v.langEntries&&(a.lang[v.name]=v.langEntries[e[l]]);if(v[c[f]])v[c[f]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(l=0;l<a.config.blockedKeystrokes.length;l++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[l]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function w(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
-this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}function A(a,b){function c(a){var b=a.startContainer,d=a.endContainer;return b.is&&(b.is("tr")||b.is("td")&&b.equals(d)&&a.endOffset===b.getChildCount())?!0:!1}function d(a){var b=a.startContainer;return b.is("tr")?a.cloneContents():b.clone(!0)}for(var e=new CKEDITOR.dom.documentFragment,f,g,k,h=0;h<a.length;h++){var q=a[h],y=q.startContainer.getAscendant("tr",!0);c(q)?(f||
-(f=y.getAscendant("table").clone(),f.append(y.getAscendant({thead:1,tbody:1,tfoot:1}).clone()),e.append(f),f=f.findOne("thead, tbody, tfoot")),g&&g.equals(y)||(g=y,k=y.clone(),f.append(k)),k.append(d(q))):e.append(q.cloneContents())}return f?e:b.getHtmlFromRange(a[0])}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var F=0,x={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var c=new CKEDITOR.command(this,b);this.mode&&e(this,c);return this.commands[a]=
-c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&b.data.preventDefault()}function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");
-!a&&w.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status="destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,
-b){var c=this.getCommand(a),d={name:a,commandData:b||{},command:c};return c&&c.state!=CKEDITOR.TRISTATE_DISABLED&&!1!==this.fire("beforeCommandExec",d)&&(d.returnValue=c.exec(d.commandData),!c.async&&!1!==this.fire("afterCommandExec",d))?d.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?b.getValue():b.getHtml():
-"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,c){var d=!0,e=b;b&&"object"==typeof b&&(c=b.internal,e=b.callback,d=!b.noSnapshot);!c&&d&&this.fire("saveSnapshot");if(e||!c)this.once("dataReady",function(a){!c&&
-d&&this.fire("saveSnapshot");e&&e.call(a.editor)});a={dataValue:a};!c&&this.fire("setData",a);this._.data=a.dataValue;!c&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,c){this.fire("insertHtml",{dataValue:a,mode:b,range:c})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",
-a)},getSelectedHtml:function(a){var b=this.editable(),c=this.getSelection(),c=c&&c.getRanges();if(!b||!c||0===c.length)return null;b=A(c,b);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges(),e=new CKEDITOR.dom.documentFragment,f;if(!c||0===d.length)return null;for(f=0;f<d.length;f++)e.append(c.extractHtmlFromRange(d[f],b));b||this.getSelection().selectRanges([d[0]]);return a?e.getHtml():e},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==
-this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return w.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},getCommandKeystroke:function(a){if(a="string"===typeof a?this.getCommand(a):a){var b=CKEDITOR.tools.object.findKey(this.commands,
-a),c=this.keystrokeHandler.keystrokes,d;if(a.fakeKeystroke)return a.fakeKeystroke;for(d in c)if(c.hasOwnProperty(d)&&c[d]==b)return d}return null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,
-b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})})();CKEDITOR.ELEMENT_MODE_NONE=0;CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
-(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,e,g=0,h;c=this._.htmlPartsRegex.exec(b);){e=c.index;if(e>g)if(g=b.substring(g,e),h)h.push(g);else this.onText(g);
-g=this._.htmlPartsRegex.lastIndex;if(e=c[1])if(e=e.toLowerCase(),h&&CKEDITOR.dtd.$cdata[e]&&(this.onCDATA(h.join("")),h=null),!h){this.onTagClose(e);continue}if(h)h.push(c[0]);else if(e=c[3]){if(e=e.toLowerCase(),!/="/.test(e)){var k={},n,u=c[4];c=!!c[5];if(u)for(;n=a.exec(u);){var f=n[1].toLowerCase();n=n[2]||n[3]||n[4]||"";k[f]=!n&&d[f]?f:CKEDITOR.tools.htmlDecodeAttr(n)}this.onTagOpen(e,k,c);!h&&CKEDITOR.dtd.$cdata[e]&&(h=[])}}else if(e=c[2])this.onComment(e)}if(b.length>g)this.onText(b.substring(g,
-b.length))}}})();
-CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,d){d?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,d){"string"==typeof d&&(d=CKEDITOR.tools.htmlEncodeAttr(d));this._.output.push(" ",a,'\x3d"',d,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,
-"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var d=this._.output.join("");a&&this.reset();return d}}});"use strict";
-(function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype={remove:function(){var a=this.parent.children,d=CKEDITOR.tools.indexOf(a,this),b=this.previous,c=this.next;b&&(b.next=c);c&&(c.previous=b);a.splice(d,1);this.parent=null},replaceWith:function(a){var d=this.parent.children,b=CKEDITOR.tools.indexOf(d,this),c=a.previous=this.previous,e=a.next=this.next;c&&(c.next=a);e&&(e.previous=a);d[b]=a;a.parent=this.parent;this.parent=null},insertAfter:function(a){var d=a.parent.children,
-b=CKEDITOR.tools.indexOf(d,a),c=a.next;d.splice(b+1,0,this);this.next=a.next;this.previous=a;a.next=this;c&&(c.previous=this);this.parent=a.parent},insertBefore:function(a){var d=a.parent.children,b=CKEDITOR.tools.indexOf(d,a);d.splice(b,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var d="function"==typeof a?a:"string"==typeof a?function(b){return b.name==a}:function(b){return b.name in a},b=this.parent;for(;b&&
-b.type==CKEDITOR.NODE_ELEMENT;){if(d(b))return b;b=b.parent}return null},wrapWith:function(a){this.replaceWith(a);a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}})();"use strict";CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}};
-CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,d){var b=this.value;if(!(b=a.onComment(d,b,this)))return this.remove(),!1;if("string"!=typeof b)return this.replaceWith(b),!1;this.value=b;return!0},writeHtml:function(a,d){d&&this.filter(d);a.comment(this.value)}});"use strict";
-(function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,d){if(!(this.value=a.onText(d,this.value,this)))return this.remove(),!1},writeHtml:function(a,d){d&&this.filter(d);a.text(this.value)}})})();"use strict";
-(function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})})();"use strict";CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}};
-(function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var d=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),b={ol:1,ul:1},c=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),e={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=
-function(g,h,k){function n(a){var b;if(0<m.length)for(var c=0;c<m.length;c++){var d=m[c],e=d.name,f=CKEDITOR.dtd[e],l=z.name&&CKEDITOR.dtd[z.name];l&&!l[e]||a&&f&&!f[a]&&CKEDITOR.dtd[a]?e==z.name&&(D(z,z.parent,1),c--):(b||(u(),b=1),d=d.clone(),d.parent=z,z=d,m.splice(c,1),c--)}}function u(){for(;K.length;)D(K.shift(),z)}function f(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
-c.value=d:a.children.length=b-1)}}function D(b,c,d){c=c||z||x;var e=z;void 0===b.previous&&(w(c,b)&&(z=c,F.onTagOpen(k,{}),b.returnPoint=c=z),f(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(l=!1),"textarea"==b.name&&(I=!1));b.returnPoint?(z=b.returnPoint,delete b.returnPoint):z=d?c:e}function w(a,b){if((a==x||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
-!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function A(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var F=new CKEDITOR.htmlParser,x=h instanceof CKEDITOR.htmlParser.element?h:"string"==typeof h?new CKEDITOR.htmlParser.element(h):new CKEDITOR.htmlParser.fragment,m=[],K=[],z=x,I="textarea"==x.name,l="pre"==x.name;F.onTagOpen=function(e,f,g,k){f=new CKEDITOR.htmlParser.element(e,f);f.isUnknown&&g&&(f.isEmpty=!0);f.isOptionalClose=k;
-if(a(f))m.push(f);else{if("pre"==e)l=!0;else{if("br"==e&&l){z.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(I=!0)}if("br"==e)K.push(f);else{for(;!(k=(g=z.name)?CKEDITOR.dtd[g]||(z._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,f.isUnknown||z.isUnknown||k[e]);)if(z.isOptionalClose)F.onTagClose(g);else if(e in b&&g in b)g=z.children,(g=g[g.length-1])&&"li"==g.name||D(g=new CKEDITOR.htmlParser.element("li"),z),!f.returnPoint&&(f.returnPoint=z),z=g;else if(e in CKEDITOR.dtd.$listItem&&
-!A(e,g))F.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(g in d&&!A(e,g))!f.returnPoint&&(f.returnPoint=z),z=z.parent;else if(g in CKEDITOR.dtd.$inline&&m.unshift(z),z.parent)D(z,z.parent,1);else{f.isOrphan=1;break}n(e);u();f.parent=z;f.isEmpty?D(f):z=f}}};F.onTagClose=function(a){for(var b=m.length-1;0<=b;b--)if(a==m[b].name){m.splice(b,1);return}for(var c=[],d=[],e=z;e!=x&&e.name!=a;)e._.isBlockLike||d.unshift(e),c.push(e),e=e.returnPoint||e.parent;if(e!=x){for(b=0;b<c.length;b++){var f=c[b];D(f,f.parent)}z=
-e;e._.isBlockLike&&u();D(e,e.parent);e==z&&(z=z.parent);m=m.concat(d)}"body"==a&&(k=!1)};F.onText=function(a){if(!(z._.hasInlineStarted&&!K.length||l||I)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=z.name,f=b?CKEDITOR.dtd[b]||(z._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!I&&!f["#"]&&b in d)F.onTagOpen(e[b]||""),F.onText(a);else{u();n();l||I||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(w(z,a))this.onTagOpen(k,{},0,1);z.add(a)}};F.onCDATA=
-function(a){z.add(new CKEDITOR.htmlParser.cdata(a))};F.onComment=function(a){u();n();z.add(new CKEDITOR.htmlParser.comment(a))};F.parse(g);for(u();z!=x;)D(z,z.parent,1);f(x);return x};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
-a}a.previous=c;a.parent=this;this.children.splice(b,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,b){b=this.getFilterContext(b);a.onRoot(b,this);this.filterChildren(a,!1,b)},filterChildren:function(a,b,c){if(this.childrenFilteredBy!=a.id){c=this.getFilterContext(c);if(b&&!this.parent)a.onRoot(c,this);this.childrenFilteredBy=a.id;for(b=0;b<this.children.length;b++)!1===this.children[b].filter(a,
-c)&&b--}},writeHtml:function(a,b){b&&this.filter(b);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,b,c){var d=this.getFilterContext();if(c&&!this.parent&&b)b.onRoot(d,this);b&&this.filterChildren(b,!1,d);b=0;c=this.children;for(d=c.length;b<d;b++)c[b].writeHtml(a)},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var d=a(this);if(!1!==d){c=this.children;for(var e=0;e<c.length;e++)d=c[e],d.type==CKEDITOR.NODE_ELEMENT?d.forEach(a,b):b&&d.type!=b||a(d)}},getFilterContext:function(a){return a||
-{}}}})();"use strict";
-(function(){function a(){this.rules=[]}function d(b,c,d,g){var h,k;for(h in c)(k=b[h])||(k=b[h]=new a),k.add(c[h],d,g)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var e;"number"==typeof c?e=c:c&&"priority"in c&&(e=
-c.priority);"number"!=typeof e&&(e=10);"object"!=typeof c&&(c={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,e,c);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,e,c);a.elements&&d(this.elementsRules,a.elements,e,c);a.attributes&&d(this.attributesRules,a.attributes,e,c);a.text&&this.textRules.add(a.text,e,c);a.comment&&this.commentRules.add(a.comment,e,c);a.root&&this.rootRules.add(a.root,e,c)},applyTo:function(a){a.filter(this)},onElementName:function(a,c){return this.elementNameRules.execOnName(a,
-c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],g,h=0;3>h;h++)if(g=d[h]){g=g.exec(a,c,this);if(!1===g)return null;if(g&&g!=c)return this.onNode(a,g);if(c.parent&&!c.name)break}return c},
-onNode:function(a,c){var d=c.type;return d==CKEDITOR.NODE_ELEMENT?this.onElement(a,c):d==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,c.value)):d==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,c.value)):null},onAttribute:function(a,c,d,g){return(d=this.attributesRules[d])?d.exec(a,g,c,this):g}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,c,d){this.rules.splice(this.findIndex(c),0,{value:a,priority:c,options:d})},addMany:function(a,
-c,d){for(var g=[this.findIndex(c),0],h=0,k=a.length;h<k;h++)g.push({value:a[h],priority:c,options:d});this.rules.splice.apply(this.rules,g)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,g=Array.prototype.slice.call(arguments,1),h=this.rules,k=h.length,n,u,f,D;for(D=0;D<k;D++)if(d&&(n=c.type,u=c.name),f=h[D],!(a.nonEditable&&!f.options.applyToAll||
-a.nestedEditable&&f.options.excludeNestedEditable)){f=f.value.apply(null,g);if(!1===f||d&&f&&(f.name!=u||f.type!=n))return f;null!=f&&(g[0]=c=f)}return c},execOnName:function(a,c){for(var d=0,g=this.rules,h=g.length,k;c&&d<h;d++)k=g[d],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(c=c.replace(k.value[0],k.value[1]));return c}}})();
-(function(){function a(a,d){function f(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function v(a,d){return function(e){if(e.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var l=[],r=b(e),v,p;if(r)for(q(r,1)&&l.push(r);r;)g(r)&&(v=c(r))&&q(v)&&((p=c(v))&&!g(p)?l.push(v):(f(y).insertAfter(v),v.remove())),r=r.previous;for(r=0;r<l.length;r++)l[r].remove();if(l=!a||!1!==("function"==typeof d?d(e):d))y||CKEDITOR.env.needsBrFiller||
-e.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?y||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||e.name in CKEDITOR.dtd.tr||e.name in CKEDITOR.dtd.$listItem)?(l=b(e),l=!l||"form"==e.name&&"input"==l.name):l=!1:l=!1;l&&e.add(f(a))}}}function q(a,b){if((!y||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(m))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
-a.value=c[0]),!CKEDITOR.env.needsBrFiller&&y&&(!b||a.parent.name in B)||!y&&((c=a.previous)&&"br"==c.name||!c||g(c)))?!0:!1}var p={elements:{}},y="html"==d,B=CKEDITOR.tools.extend({},l),C;for(C in B)"#"in z[C]||delete B[C];for(C in B)p.elements[C]=v(y,a.config.fillEmptyBlocks);p.root=v(y,!1);p.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&e(d);)d=
-d.next;var l=c(b);!d&&g(b.parent)?h(b.parent,f(a)):g(d)&&l&&!g(l)&&f(a).insertBefore(d)}}}}(y);return p}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&e(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&e(a);)a=a.previous;return a}function e(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function g(a){return a&&
-(a.type==CKEDITOR.NODE_ELEMENT&&a.name in l||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function h(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function n(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function u(a){return a.replace(q,
-function(a,b,c){return"\x3c"+b+c.replace(y,function(a,b){return v.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function f(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+A(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function D(a){return a.replace(W,function(a,b){return decodeURIComponent(b)})}function w(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
-function(a){return"\x3c!--"+K+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function A(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function F(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function x(a,b){var c=[],d=b.config.protectedSource,e=b._.dataStore||(b._.dataStore=
-{id:1}),f=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(d);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(c.push(a)-1)+"--\x3e"});for(var l=0;l<d.length;l++)a=a.replace(d[l],function(a){a=a.replace(f,function(a,b,d){return c[d]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(c.push(a)-1)+"--\x3e"});a=a.replace(f,function(a,b,d){return"\x3c!--"+K+(b?"{C}":
-"")+encodeURIComponent(c[d]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){e[e.id]=decodeURIComponent(b);return"{cke_protected_"+e.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,e){return"\x3c"+c+d+"\x3e"+F(A(e),b)+"\x3c/"+c+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,
-e,l=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=e=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(t);c.addRules(J,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});e.addRules(H);e.addRules(E,{applyToAll:!0});e.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,e,c=x(c,b),c=f(c,L),c=u(c),c=f(c,B),c=c.replace(O,"$1cke:$2"),c=c.replace(C,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),
-c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");e=a.context||b.editable().getName();var l;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==e&&(e="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",l=1);e=b.document.createElement(e);e.setHtml("a"+c);c=e.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");l&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(p,"$1$2");c=D(c);c=A(c);e=!1===a.fixForBody?!1:
-d(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,e);e&&(l=c,!l.children.length&&CKEDITOR.dtd[l.name][e]&&(e=new CKEDITOR.htmlParser.element(e),l.add(e)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(l.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,
-c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=w(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(l.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,
-!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=l.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=A(c);c=F(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,c,d){var e=this.editor,f,l,v,g;b&&"object"==typeof b?(f=b.context,c=b.fixForBody,d=b.dontFilter,l=b.filter,v=b.enterMode,g=b.protectedWhitespaces):f=b;f||null===f||(f=e.editable().getName());return e.fire("toHtml",{dataValue:a,context:f,fixForBody:c,dontFilter:d,
-filter:l||e.filter,enterMode:v||e.enterMode,protectedWhitespaces:g}).dataValue},toDataFormat:function(a,b){var c,d,e;b&&(c=b.context,d=b.filter,e=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:e||this.editor.enterMode}).dataValue}};var m=/(?:&nbsp;|\xa0)$/,K="{cke_protected}",z=CKEDITOR.dtd,I="caption colgroup col thead tfoot tbody".split(" "),l=CKEDITOR.tools.extend({},z.$blockLimit,
-z.$block),t={elements:{input:k,textarea:k}},J={attributeNames:[[/^on/,"data-cke-pa-on"],[/^srcdoc/,"data-cke-pa-srcdoc"],[/^data-cke-expando$/,""]],elements:{iframe:function(a){if(a.attributes&&a.attributes.src){var b=a.attributes.src.toLowerCase().replace(/[^a-z]/gi,"");if(0===b.indexOf("javascript")||0===b.indexOf("data"))a.attributes["data-cke-pa-src"]=a.attributes.src,delete a.attributes.src}}}},H={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;
-c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},E={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,e=0;e<c.length;e++)d="data-cke-saved-"+c[e],d in b&&delete b[c[e]]}return a},
-table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(I,a.name),d=CKEDITOR.tools.indexOf(I,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;
-delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&h(a,b=new CKEDITOR.htmlParser.text);b.value=a.attributes["data-cke-title"]||""},input:n,textarea:n},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(E.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,
-function(a){return a.toLowerCase()})});var q=/<(a|area|img|input|source)\b([^>]*)>/gi,y=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,v=/^(href|src|name)$/i,B=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,L=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,W=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,O=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,p=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,C=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi})();
-"use strict";CKEDITOR.htmlParser.element=function(a,d){this.name=a;this.attributes=d||{};this.children=[];var b=a||"",c=b.match(/^cke:(.*)/);c&&(b=c[1]);b=!!(CKEDITOR.dtd.$nonBodyContent[b]||CKEDITOR.dtd.$block[b]||CKEDITOR.dtd.$listItem[b]||CKEDITOR.dtd.$tableContent[b]||CKEDITOR.dtd.$nonEditable[b]||"br"==b);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:b,hasInlineStarted:this.isEmpty||!b}};
-CKEDITOR.htmlParser.cssStyle=function(a){var d={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,c,e){"font-family"==c&&(e=e.replace(/["']/g,""));d[c.toLowerCase()]=e});return{rules:d,populate:function(a){var c=this.toString();c&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",c):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=c:a.style=c)},toString:function(){var a=[],c;
-for(c in d)d[c]&&a.push(c,":",d[c],";");return a.join("")}}};
-(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,h,k;b=d.getFilterContext(b);if(b.off)return!0;
-if(!d.parent)a.onRoot(b,d);for(;;){h=d.name;if(!(k=a.onElementName(b,h)))return this.remove(),!1;d.name=k;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==h)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}h=d.attributes;var n,u;for(n in h){for(k=h[n];;)if(u=a.onAttributeName(b,n))if(u!=n)delete h[n],n=u;else break;else{delete h[n];break}u&&(!1===(k=a.onAttribute(b,d,u,k))?delete h[u]:
-h[u]=k)}d.isEmpty||this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var g=this.name,h=[],k=this.attributes,n,u;a.openTag(g,k);for(n in k)h.push([n,k[n]]);a.sortAttributes&&h.sort(d);n=0;for(u=h.length;n<u;n++)k=h[n],a.attribute(k[0],k[1]);a.openTagClose(g,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(g)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
-this.remove()},forEach:b.forEach,getFirst:function(b){if(!b)return this.children.length?this.children[0]:null;"function"!=typeof b&&(b=a(b));for(var d=0,g=this.children.length;d<g;++d)if(b(this.children[d]))return this.children[d];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var b=0,d=a.length;b<d;++b)a[b].parent=this},getOuterHtml:function(){var a=
-new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),h=0;h<b.length;++h)b[h].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},find:function(a,b){void 0===b&&(b=!1);var d=[],h;for(h=0;h<this.children.length;h++){var k=this.children[h];"function"==typeof a&&a(k)?d.push(k):"string"==typeof a&&k.name===a&&d.push(k);
-b&&k.find&&(d=d.concat(k.find(a,b)))}return d},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=b:delete this.attributes["class"])},hasClass:function(a){var b=this.attributes["class"];return b?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(b):!1},getFilterContext:function(a){var b=
-[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||b.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&b.push("nestedEditable",!0):b.push("nonEditable",!0);if(b.length){a=CKEDITOR.tools.copy(a);for(var d=0;d<b.length;d+=2)a[b[d]]=b[d+1]}return a}},!0)})();
-(function(){var a=/{([^}]+)}/g;CKEDITOR.template=function(a){this.source=String(a)};CKEDITOR.template.prototype.output=function(d,b){var c=this.source.replace(a,function(a,b){return void 0!==d[b]?d[b]:a});return b?b.push(c):c}})();delete CKEDITOR.loadFullCore;CKEDITOR.instances={};CKEDITOR.document=new CKEDITOR.dom.document(document);
-CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)};CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]};
-(function(){var a={};CKEDITOR.addTemplate=function(d,b){var c=a[d];if(c)return c;c={name:d,source:b};CKEDITOR.fire("template",c);return a[d]=new CKEDITOR.template(c.source)};CKEDITOR.getTemplate=function(d){return a[d]}})();(function(){var a=[];CKEDITOR.addCss=function(d){a.push(d)};CKEDITOR.getCss=function(){return a.join("\n")}})();CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")});CKEDITOR.TRISTATE_ON=1;CKEDITOR.TRISTATE_OFF=2;
-CKEDITOR.TRISTATE_DISABLED=0;
-(function(){CKEDITOR.inline=function(a,d){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var b=new CKEDITOR.editor(d,a,CKEDITOR.ELEMENT_MODE_INLINE),c=a.is("textarea")?a:null;c?(b.setData(c.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!b.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+c.getValue()+"\x3c/div\x3e",CKEDITOR.document),(d.width&&a.setStyle('width',CKEDITOR.tools.cssLength(d.width))),(d.height&&a.setStyle('height',CKEDITOR.tools.cssLength(d.height))),
-a.insertAfter(c),c.hide(),c.$.form&&b._attachToForm()):b.setData(a.getHtml(),null,!0);b.on("loaded",function(){b.fire("uiReady");b.editable(a);b.container=a;b.ui.contentsElement=a;b.setData(b.getData(1));b.resetDirty();b.fire("contentDom");b.mode="wysiwyg";b.fire("mode");b.status="ready";b.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,b)},null,null,1E4);b.on("destroy",function(){c&&(b.container.clearCustomData(),b.container.remove(),c.show());b.element.clearCustomData();delete b.element});
-return b};CKEDITOR.inlineAll=function(){var a,d,b;for(b in CKEDITOR.dtd.$editable)for(var c=CKEDITOR.document.getElementsByTag(b),e=0,g=c.count();e<g;e++)a=c.getItem(e),"true"==a.getAttribute("contenteditable")&&(d={element:a,config:{}},!1!==CKEDITOR.fire("inline",d)&&CKEDITOR.inline(a,d.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})})();CKEDITOR.replaceClass="ckeditor";
-(function(){function a(a,e,g,h){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(e,a,h);h==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=a.hasAttribute("required"),a.removeAttribute("required"));g&&k.setData(g,null,!0);k.on("loaded",function(){b(k);h==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&
-a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",d);return k}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=a.element,h=a.elementMode,k=
-a.fire("uiSpace",{space:"top",html:""}).html,n=a.fire("uiSpace",{space:"bottom",html:""}).html,u=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-b=CKEDITOR.dom.element.createFromHtml(u.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:n?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+n+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));h==CKEDITOR.ELEMENT_MODE_REPLACE?
-(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();n&&a.ui.space("bottom").unselectable();d=a.config.width;h=a.config.height;d&&b.setStyle("width",CKEDITOR.tools.cssLength(d));h&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(h));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(b,d,g){return a(b,d,g,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,h=a[b];if(h.name||h.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(h.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](h,d)))continue;this.replace(h,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes=
-{}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,h=this._.modes;if(a!=d.mode&&h&&h[a]){d.fire("beforeSetMode",a);if(d.mode){var k=d.checkDirty(),h=d._.previousModeData,n,u=0;d.fire("beforeModeUnload");d.editable(0);d._.previousMode=d.mode;d._.previousModeData=n=d.getData(1);"source"==d.mode&&h==n&&(d.fire("lockSnapshot",{forceUpdate:!0}),u=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==k&&!k&&
-d.resetDirty();u?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.fire("mode");b&&b.call(d)},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,h){var k=this.container,n=this.ui.space("contents"),u=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;h=h?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;h.setSize("width",a,!0);u&&(u.style.width="1%");var f=(h.$.offsetHeight||0)-(n.$.clientHeight||
-0),k=Math.max(b-(d?0:f),0);b=d?b+f:b;n.setStyle("height",k+"px");u&&(u.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:k,outerWidth:a||h.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
-(function(){function a(a){var b=a.editor,e=a.data.path,f=e.blockLimit,g=a.data.selection,q=g.getRanges()[0],y;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=d(g,e))g.appendBogus(),y=CKEDITOR.env.ie;h(b,e.block,f)&&q.collapsed&&!q.getCommonAncestor().isReadOnly()&&(e=q.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),f=new CKEDITOR.dom.walker(e),f.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!f.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&
-(b=q.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),y=1,a.cancel());y&&q.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function b(a){var b=a.data.getTarget();b.is("input")&&
-(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return f(a)&&D(a)}function e(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function g(a){function b(a){return function(b,e){e&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(f)&&(d=b);if(!(e||!c(b)||a&&A(b)))return!1}}var d,e=a.getRanges()[0];a=a.root;
-var f={table:1,ul:1,ol:1,dl:1};if(e.startPath().contains(f)){var q=e.clone();q.collapse(1);q.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(q);a.guard=b();a.checkBackward();if(d)return q=e.clone(),q.collapse(),q.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(q),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function h(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}
-function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function n(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function u(a,b,c){var d=a.getCommonAncestor(b);for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var f,D,w,A,F,x,m,K,z,I;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||
-b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{if(!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document))if(CKEDITOR.env.chrome){var b=
-this.$.scrollTop;this.$.focus();this.$.scrollTop=b}else this.$.focus();else this.$.setActive()}catch(c){if(!CKEDITOR.env.ie)throw c;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=e(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&
-(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",
-b),this.addClass(a))},changeAttr:function(a,b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,
-b)},insertHtml:function(a,b,c){var d=this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);x(this,b||"html",a,c);c.select();n(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){x(this,c||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,
-b)&&(b.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return c(a)&&!A(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?b.moveToElementEditStart(f):b.moveToElementEditEnd(a):f||e==CKEDITOR.ENTER_BR||(f=b.fixBlock(!0,e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(f))));d.selectRanges([b]);n(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,
-e=a.getName(),f=CKEDITOR.dtd.$block[e];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?m(b):b.startContainer.is(CKEDITOR.dtd.$list)&&K(b));var g,v;if(f)for(;(g=b.getCommonAncestor(0,1))&&(v=CKEDITOR.dtd[g.getName()])&&(!v||!v[e]);)g.getName()in CKEDITOR.dtd.span?b.splitElement(g):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(g),b.collapse(!0),g.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?
-"div":"p",c.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();
-delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),e;a:if(d.anchorNode&&d.anchorNode==c.$)e=!0;else{if(CKEDITOR.env.webkit&&(e=c.getDocument().getActive())&&e.equals(c)&&!d.anchorNode){e=!0;break a}e=void 0}e&&(e=new CKEDITOR.dom.range(c),e.moveToElementEditStart(c),b=b.createRange(),b.setStart(e.startContainer.$,e.startOffset),b.collapse(!0),d.removeAllRanges(),
-d.addRange(b))}function b(){var a=c.getDocument().$,d=a.selection,e=c.getDocument().getActive();"None"==d.type&&e.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",
-function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};z.eol.detect(a,this);z.bogus.exclude(a);z.cell.shrink(a);a.fragment=a.range.cloneContents();z.tree.rebuild(a,this);z.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var c=I,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),e;a.enlarge(CKEDITOR.ENLARGE_INLINE,
-1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var f=this.editor.createRange();f.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=f.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);a.optimize();
-c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),f=0,g;if(d)for(;g=d.getItem(f++);)if(!D(g)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),w(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
-return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(F,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
-"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):
-a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,
-null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var d=function(){var b=a.editable();null!=a._.previousScrollTop&&b.getDocument().equals(CKEDITOR.document)&&(b.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",d))};this.on("scroll",d)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=
-this.getDocument();a.window=this.getWindow();var e=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var k=a.config.contentsLangDirection;this.getDirection(1)!=k&&this.changeAttr("dir",k);var h=CKEDITOR.getCss();if(h){var k=e.getHead(),q=k.getCustomData("stylesheet");q?h!=q.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?q.$.styleSheet.cssText=h:q.setText(h)):(h=e.appendStyleText(h),h=new CKEDITOR.dom.element(h.ownerNode||h.owningElement),k.setCustomData("stylesheet",
-h),h.data("cke-temp",1))}k=e.getCustomData("stylesheet_ref")||0;e.setCustomData("stylesheet_ref",k+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var y={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d;b=a.getSelection();if(0!==b.getRanges().length){if(c in
-y){var e,q=b.getRanges()[0],p=q.startPath(),C,r,k,c=8==c;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=g(b))?(a.fire("saveSnapshot"),q.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e.remove(),q.select(),a.fire("saveSnapshot"),d=1):q.collapsed&&((C=p.block)&&(k=C[c?"getPrevious":"getNext"](f))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("table")&&q[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),q[c?"checkEndOfBlock":"checkStartOfBlock"]()&&C.remove(),q["moveToElementEdit"+
-(c?"End":"Start")](k),q.select(),a.fire("saveSnapshot"),d=1):p.blockLimit&&p.blockLimit.is("td")&&(r=p.blockLimit.getAscendant("table"))&&q.checkBoundaryOfElement(r,c?CKEDITOR.START:CKEDITOR.END)&&(k=r[c?"getPrevious":"getNext"](f))?(a.fire("saveSnapshot"),q["moveToElementEdit"+(c?"End":"Start")](k),q.checkStartOfBlock()&&q.checkEndOfBlock()?k.remove():q.select(),a.fire("saveSnapshot"),d=1):(r=p.contains(["td","th","caption"]))&&q.checkBoundaryOfElement(r,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d}});
-a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in y&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",
-function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(F,""))){var c=a.createRange();
-c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey();if(c in y&&(b=a.getSelection(),0!==b.getRanges().length)){var c=8==c,d=b.getRanges()[0];b=d.startPath();
-if(d.collapsed)a:{var e=b.block;if(e&&d[c?"checkStartOfBlock":"checkEndOfBlock"]()&&d.moveToClosestEditablePosition(e,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var f=d.startContainer.getChild(d.startOffset-(c?1:0));if(f&&f.type==CKEDITOR.NODE_ELEMENT&&f.is("hr")){a.fire("saveSnapshot");f.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(e))b=void 0;else{a.fire("saveSnapshot");var p;(p=(c?d:e).getBogus())&&p.remove();p=a.getSelection();f=p.createBookmarks();
-(c?e:d).moveChildren(c?d:e,!1);b.lastElement.mergeSiblings();u(e,d,!c);p.selectBookmarks(f);b=!0}}else b=!1}else c=d,p=b.block,d=c.endPath().block,p&&d&&!p.equals(d)?(a.fire("saveSnapshot"),(e=p.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),d.getParent()&&(d.moveChildren(p,!1),b.lastElement.mergeSiblings(),u(p,d,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;
-a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");
-delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?
-"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;
-if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+e+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");f=CKEDITOR.dom.walker.whitespaces(!0);D=CKEDITOR.dom.walker.bookmark(!1,!0);w=CKEDITOR.dom.walker.empty();
-A=CKEDITOR.dom.walker.bogus();F=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;x=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var e,f,q,g,y=[],k=d.range.startContainer;e=d.range.startPath();for(var k=v[k.getName()],h=0,B=c.getChildren(),n=B.count(),L=-1,u=-1,E=0,H=e.contains(v.$list);h<n;++h)e=B.getItem(h),a(e)?(q=e.getName(),H&&q in CKEDITOR.dtd.$list?y=y.concat(b(e,d)):(g=!!k[q],
-"br"!=q||!e.data("cke-eol")||h&&h!=n-1||(E=(f=h?y[h-1].node:B.getItem(h+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&v.$block[f.getName()]),-1!=L||g||(L=h),g||(u=h),y.push({isElement:1,isLineBreak:E,isBlock:e.isBlockBoundary(),hasBlockSibling:f,node:e,name:q,allowed:g}),f=E=0)):y.push({isElement:0,node:e,allowed:1});-1<L&&(y[L].firstNotAllowed=1);-1<u&&(y[u].lastNotAllowed=1);return y}function d(b,c){var e=[],f=b.getChildren(),q=f.count(),g,y=0,k=v[c],h=!b.is(v.$inline)||b.is("br");for(h&&e.push(" ");y<q;y++)g=
-f.getItem(y),a(g)&&!g.is(k)?e=e.concat(d(g,c)):e.push(g);h&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&a(b)&&(b.is(v.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function q(b,c,d,e){var f=b.clone(),g,v;f.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(g=(new CKEDITOR.dom.walker(f)).next())&&a(g)&&B[g.getName()]&&(v=g.getPrevious())&&a(v)&&!v.getParent().equals(b.startContainer)&&d.contains(v)&&e.contains(g)&&g.isIdentical(v)&&
-(g.moveChildren(v),g.remove(),q(b,c,d,e))}function g(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),f=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);f&&d(f,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var v=CKEDITOR.dtd,B={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},u=CKEDITOR.tools.extend({},
-v.$inline);delete u.br;return function(B,p,C,r){var G=B.editor,N=!1;"unfiltered_html"==p&&(p="html",N=!0);if(!r.checkReadOnly()){var P=(new CKEDITOR.dom.elementPath(r.startContainer,r.root)).blockLimit||r.root;B={type:p,dontFilter:N,editable:B,editor:G,range:r,blockLimit:P,mergeCandidates:[],zombies:[]};p=B.range;r=B.mergeCandidates;var m,w;"text"==B.type&&p.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(m=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",p.document),p.insertNode(m),
-p.setStartAfter(m));N=new CKEDITOR.dom.elementPath(p.startContainer);B.endPath=P=new CKEDITOR.dom.elementPath(p.endContainer);if(!p.collapsed){var G=P.block||P.blockLimit,x=p.getCommonAncestor();G&&!G.equals(x)&&!G.contains(x)&&p.checkEndOfBlock()&&B.zombies.push(G);p.deleteContents()}for(;(w=e(p))&&a(w)&&w.isBlockBoundary()&&N.contains(w);)p.moveToPosition(w,CKEDITOR.POSITION_BEFORE_END);q(p,B.blockLimit,N,P);m&&(p.setEndBefore(m),p.collapse(),m.remove());m=p.startPath();if(G=m.contains(f,!1,1))p.splitElement(G),
-B.inlineStylesRoot=G,B.inlineStylesPeak=m.lastElement;m=p.createBookmark();(G=m.startNode.getPrevious(c))&&a(G)&&f(G)&&r.push(G);(G=m.startNode.getNext(c))&&a(G)&&f(G)&&r.push(G);for(G=m.startNode;(G=G.getParent())&&f(G);)r.push(G);p.moveToBookmark(m);if(m=C){m=B.range;if("text"==B.type&&B.inlineStylesRoot){w=B.inlineStylesPeak;p=w.getDocument().createText("{cke-peak}");for(r=B.inlineStylesRoot.getParent();!w.equals(r);)p=p.appendTo(w.clone()),w=w.getParent();C=p.getOuterHtml().split("{cke-peak}").join(C)}w=
-B.blockLimit.getName();if(/^\s+|\s+$/.test(C)&&"span"in CKEDITOR.dtd[w]){var D='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';C=D+C+D}C=B.editor.dataProcessor.toHtml(C,{context:null,fixForBody:!1,protectedWhitespaces:!!D,dontFilter:B.dontFilter,filter:B.editor.activeFilter,enterMode:B.editor.activeEnterMode});w=m.document.createElement("body");w.setHtml(C);D&&(w.getFirst().remove(),w.getLast().remove());if((D=m.startPath().block)&&(1!=D.getChildCount()||!D.getBogus()))a:{var A;if(1==
-w.getChildCount()&&a(A=w.getFirst())&&A.is(n)&&!A.hasAttribute("contenteditable")){D=A.getElementsByTag("*");m=0;for(r=D.count();m<r;m++)if(p=D.getItem(m),!p.is(u))break a;A.moveChildren(A.getParent(1));A.remove()}}B.dataWrapper=w;m=C}if(m){A=B.range;m=A.document;var M;w=B.blockLimit;r=0;var z,D=[],F,T;C=G=0;var I,K;p=A.startContainer;var N=B.endPath.elements[0],X,P=N.getPosition(p),x=!!N.getCommonAncestor(p)&&P!=CKEDITOR.POSITION_IDENTICAL&&!(P&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);
-p=b(B.dataWrapper,B);for(g(p,A);r<p.length;r++){P=p[r];if(M=P.isLineBreak){M=A;I=w;var S=void 0,Z=void 0;P.hasBlockSibling?M=1:(S=M.startContainer.getAscendant(v.$block,1))&&S.is({div:1,p:1})?(Z=S.getPosition(I),Z==CKEDITOR.POSITION_IDENTICAL||Z==CKEDITOR.POSITION_CONTAINS?M=0:(I=M.splitElement(S),M.moveToPosition(I,CKEDITOR.POSITION_AFTER_START),M=1)):M=0}if(M)C=0<r;else{M=A.startPath();!P.isBlock&&h(B.editor,M.block,M.blockLimit)&&(T=k(B.editor))&&(T=m.createElement(T),T.appendBogus(),A.insertNode(T),
-CKEDITOR.env.needsBrFiller&&(z=T.getBogus())&&z.remove(),A.moveToPosition(T,CKEDITOR.POSITION_BEFORE_END));if((M=A.startPath().block)&&!M.equals(F)){if(z=M.getBogus())z.remove(),D.push(M);F=M}P.firstNotAllowed&&(G=1);if(G&&P.isElement){M=A.startContainer;for(I=null;M&&!v[M.getName()][P.name];){if(M.equals(w)){M=null;break}I=M;M=M.getParent()}if(M)I&&(K=A.splitElement(I),B.zombies.push(K),B.zombies.push(I));else{I=w.getName();X=!r;M=r==p.length-1;I=d(P.node,I);for(var S=[],Z=I.length,aa=0,ca=void 0,
-da=0,U=-1;aa<Z;aa++)ca=I[aa]," "==ca?(da||X&&!aa||(S.push(new CKEDITOR.dom.text(" ")),U=S.length),da=1):(S.push(ca),da=0);M&&U==S.length&&S.pop();X=S}}if(X){for(;M=X.pop();)A.insertNode(M);X=0}else A.insertNode(P.node);P.lastNotAllowed&&r<p.length-1&&((K=x?N:K)&&A.setEndAt(K,CKEDITOR.POSITION_AFTER_START),G=0);A.collapse()}}1!=p.length?z=!1:(z=p[0],z=z.isElement&&"false"==z.node.getAttribute("contenteditable"));z&&(C=!0,M=p[0].node,A.setStartAt(M,CKEDITOR.POSITION_BEFORE_START),A.setEndAt(M,CKEDITOR.POSITION_AFTER_END));
-B.dontMoveCaret=C;B.bogusNeededBlocks=D}z=B.range;var R;K=B.bogusNeededBlocks;for(X=z.createBookmark();F=B.zombies.pop();)F.getParent()&&(T=z.clone(),T.moveToElementEditStart(F),T.removeEmptyBlocksAtEnd());if(K)for(;F=K.pop();)CKEDITOR.env.needsBrFiller?F.appendBogus():F.append(z.document.createText(" "));for(;F=B.mergeCandidates.pop();)F.mergeSiblings();z.moveToBookmark(X);if(!B.dontMoveCaret){for(F=e(z);F&&a(F)&&!F.is(v.$empty);){if(F.isBlockBoundary())z.moveToPosition(F,CKEDITOR.POSITION_BEFORE_END);
-else{if(f(F)&&F.getHtml().match(/(\s|&nbsp;)$/g)){R=null;break}R=z.clone();R.moveToPosition(F,CKEDITOR.POSITION_BEFORE_END)}F=F.getLast(c)}R&&z.moveToRange(R)}}}}();m=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),
-d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,f=e.getAscendant("table",1),g=!1;c(f.getElementsByTag("td"));c(f.getElementsByTag("th"));f=d.clone();f.setStart(e,0);f=a(f).lastBackward();f||(f=d.clone(),f.setEndAt(e,CKEDITOR.POSITION_BEFORE_END),f=a(f).lastForward(),g=!0);f||(f=e);f.is("table")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),
-d.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",g)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",g)),(e=f.getBogus())&&e.remove(),d.moveToPosition(f,g?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();K=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||a.is(CKEDITOR.dtd.$listItem)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&
-a.is(CKEDITOR.dtd.$listItem)};return b}return function(b){var c=b.startContainer,d=!1,e;e=b.clone();e.setStart(c,0);e=a(e).lastBackward();e||(e=b.clone(),e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),d=!0);e||(e=c);e.is(CKEDITOR.dtd.$list)?(b.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),b.collapse(!0),e.remove()):((c=e.getBogus())&&c.remove(),b.moveToPosition(e,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END),b.select())}}();z={eol:{detect:function(a,b){var c=a.range,
-d=c.clone(),e=c.clone(),f=new CKEDITOR.dom.elementPath(c.startContainer,b),g=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();f.block&&d.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(c.setStartAfter(f.block),a.prependEolBr=1);g.block&&e.checkBoundaryOfElement(g.block,CKEDITOR.START)&&(c.setEndBefore(g.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),
-1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!A(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),f=new CKEDITOR.dom.elementPath(c.startContainer,b),c=new CKEDITOR.dom.elementPath(c.endContainer,b),g;d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,
-table:1})){var v=e.contains("table").getParent();g=function(a){return!a.equals(v)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!f.equals(c))){var k=e.contains(CKEDITOR.dtd.$list).getParent();g=function(a){return!a.equals(k)}}g||(g=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,b,d,g)},rebuildFragment:function(a,b,c,d){for(var e;c&&!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),
-a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};I=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var f;f=e.getNext();)f.insertAfter(d),d=f;w(c)&&c.remove()}function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);
-d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),f=d.endPath(),g=e.contains(CKEDITOR.dtd.$list),k=f.contains(CKEDITOR.dtd.$list);a.mergeList=g&&k&&g.getParent().equals(k.getParent())&&!g.equals(k);a.mergeListItems=e.block&&f.block&&e.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=
-d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var k=f.contains(CKEDITOR.dtd.$list),h=g.contains(CKEDITOR.dtd.$list);k.equals(h)||(h.moveChildren(k),h.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),g=g.contains(CKEDITOR.dtd.$listItem),f.equals(g)||b(g,d,e));d.remove();e.remove()}}},block:{detectMerge:function(a,
-b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,c),f=f.block,g=g.block;f&&g&&!f.equals(g)&&b(g,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=
-[],f,g=new CKEDITOR.dom.walker(c),k=c.startPath().contains(d),h=c.endPath().contains(d),p={};g.guard=function(a,g){if(a.type==CKEDITOR.NODE_ELEMENT){var l="visited_"+(g?"out":"in");if(a.getCustomData(l))return;CKEDITOR.dom.element.setMarker(p,a,l,1)}if(g&&k&&a.equals(k))f=c.clone(),f.setEndAt(k,CKEDITOR.POSITION_BEFORE_END),e.push(f);else if(!g&&h&&a.equals(h))f=c.clone(),f.setStartAt(h,CKEDITOR.POSITION_AFTER_START),e.push(f);else{if(l=!g)l=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!k||b(a,k))&&(!h||
-b(a,h));l&&(f=c.clone(),f.selectNodeContents(a),e.push(f))}};g.lastForward();CKEDITOR.dom.element.clearAllMarkers(p);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};
-c.checkForward();if(1<e){var c=b.startPath().contains("table"),f=b.endPath().contains("table");c&&f&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,f){var g=c(f,e.bookmark),k=g.clone(),h,l,p=g.getCommonAncestor();p.is(CKEDITOR.dtd.$tableContent)&&!p.is(d)&&(p=p.getAscendant("table",!0));l=p;p=new CKEDITOR.dom.elementPath(g.startContainer,
-l);l=new CKEDITOR.dom.elementPath(g.endContainer,l);p=p.contains("table");l=l.contains("table");if(p||l)p&&l&&b(p,l)?(e.tableSurroundingRange=k,k.setStartAt(p,CKEDITOR.POSITION_AFTER_END),k.setEndAt(l,CKEDITOR.POSITION_BEFORE_START),k=g.clone(),k.setEndAt(p,CKEDITOR.POSITION_AFTER_END),h=g.clone(),h.setStartAt(l,CKEDITOR.POSITION_BEFORE_START),h=a(k).concat(a(h))):p?l||(e.tableSurroundingRange=k,k.setStartAt(p,CKEDITOR.POSITION_AFTER_END),g.setEndAt(p,CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=
-k,k.setEndAt(l,CKEDITOR.POSITION_BEFORE_START),g.setStartAt(l,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=h?h:a(g)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),w(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,c=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);c.moveToBookmark(a.purgeTableBookmark);
-c.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;h(a,c.block,c.blockLimit)&&(d=k(a))&&(d=b.document.createElement(d),d.appendBogus(),b.insertNode(d),b.moveToPosition(d,
-CKEDITOR.POSITION_AFTER_START))}}}()})();
-(function(){function a(a,b){if(0===a.length)return!1;var c,d;if((c=!b&&1===a.length)&&!(c=a[0].collapsed)){var e=a[0];c=e.startContainer.getAscendant({td:1,th:1},!0);var f=e.endContainer.getAscendant({td:1,th:1},!0);d=CKEDITOR.tools.trim;c&&c.equals(f)&&!c.findOne("td, th, tr, tbody, table")?(e=e.cloneContents(),c=e.getFirst()?d(e.getFirst().getText())!==d(c.getText()):!0):c=!1}if(c)return!1;for(d=0;d<a.length;d++)if(c=a[d]._getTableElement(),!c)return!1;return!0}function d(a){function b(a){a=a.find("td, th");
-var c=[],d;for(d=0;d<a.count();d++)c.push(a.getItem(d));return c}var c=[],d,e;for(e=0;e<a.length;e++)d=a[e]._getTableElement(),d.is&&d.is({td:1,th:1})?c.push(d):c=c.concat(b(d));return c}function b(a){a=d(a);var b="",c=[],e,f;for(f=0;f<a.length;f++)e&&!e.equals(a[f].getAscendant("tr"))?(b+=c.join("\t")+"\n",e=a[f].getAscendant("tr"),c=[]):0===f&&(e=a[f].getAscendant("tr")),c.push(a[f].getText());return b+=c.join("\t")}function c(a){var c=this.root.editor,d=c.getSelection(1);this.reset();I=!0;d.root.once("selectionchange",
-function(a){a.cancel()},null,null,0);d.selectRanges([a[0]]);d=this._.cache;d.ranges=new CKEDITOR.dom.rangeList(a);d.type=CKEDITOR.SELECTION_TEXT;d.selectedElement=a[0]._getTableElement();d.selectedText=b(a);d.nativeSel=null;this.isFake=1;this.rev=m++;c._.fakeSelection=this;I=!1;this.root.fire("selectionchange")}function e(){var b=this._.fakeSelection,c;if(b){c=this.getSelection(1);var d;if(!(d=!c)&&(d=!c.isHidden())){d=b;var e=c.getRanges(),f=d.getRanges(),g=e.length&&e[0]._getTableElement()&&e[0]._getTableElement().getAscendant("table",
-!0),k=f.length&&f[0]._getTableElement()&&f[0]._getTableElement().getAscendant("table",!0),p=1===e.length&&e[0]._getTableElement()&&e[0]._getTableElement().is("table"),h=1===f.length&&f[0]._getTableElement()&&f[0]._getTableElement().is("table"),r=1===e.length&&e[0].collapsed,f=a(e,!!CKEDITOR.env.webkit)&&a(f);g=g&&k?g.equals(k)||k.contains(g):!1;g&&(r||f)?(p&&!h&&d.selectRanges(e),d=!0):d=!1;d=!d}d&&(b.reset(),b=0)}if(!b&&(b=c||this.getSelection(1),!b||b.getType()==CKEDITOR.SELECTION_NONE))return;
-this.fire("selectionCheck",b);c=this.elementPath();c.compare(this._.selectionPreviousPath)||(d=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(c.blockLimit),CKEDITOR.env.webkit&&!d&&(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=c,this.fire("selectionChange",{selection:b,path:c}))}function g(){t=!0;l||(h.call(this),l=CKEDITOR.tools.setTimeout(h,200,this))}function h(){l=null;t&&(CKEDITOR.tools.setTimeout(e,0,this),t=!1)}function k(a){return J(a)||
-a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function n(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var c=a.startContainer,d=a.getPreviousNode(k,null,c),e=a.getNextNode(k,null,c);return b(d)||b(e,1)||!(d||e||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()&&c.getBogus())?!0:!1}function u(a){f(a,!1);var b=a.getDocument().createText(K);a.setCustomData("cke-fillingChar",
-b);return b}function f(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),f=K.length;if(c.getLength()>f&&e&&e.intersectsNode(c.$)){var g=[{node:d.anchorNode,offset:d.anchorOffset},{node:d.focusNode,offset:d.focusOffset}];d.anchorNode==c.$&&d.anchorOffset>f&&(g[0].offset-=f);d.focusNode==c.$&&d.focusOffset>f&&(g[1].offset-=f)}}c.setText(D(c.getText(),1));g&&(c=a.getDocument().$,d=c.getSelection(),
-c=c.createRange(),c.setStart(g[0].node,g[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(g[1].node,g[1].offset))}}function D(a,b){return b?a.replace(z,function(a,b){return b?" ":""}):a.replace(K,"")}function w(a,b){var c=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e'+(b||"\x26nbsp;")+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");
-a.editable().append(c);var d=a.getSelection(1),e=a.createRange(),f=d.root.on("selectionchange",function(a){a.cancel()},null,null,0);e.setStartAt(c,CKEDITOR.POSITION_AFTER_START);e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);d.selectRanges([e]);f.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=c}function A(a){var b={37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection().getRanges(),f=e[0];1==e.length&&f.collapsed&&(d=f[38>d?"getPreviousEditableNode":
-"getNextEditableNode"]())&&d.type==CKEDITOR.NODE_ELEMENT&&"false"==d.getAttribute("contenteditable")&&(a.getSelection().fake(d),c.data.preventDefault(),c.cancel())}}}function F(a){for(var b=0;b<a.length;b++){var c=a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();
-d=c.startContainer;e=c.endContainer;var f=c.startOffset,g=c.endOffset,p=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(f>=d.getLength()?p.setStartAfter(d):p.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(g?p.setEndAfter(e):p.setEndBefore(e));d=new CKEDITOR.dom.walker(p);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(p.endContainer)&CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+
-1,0,e));return!0}return!1};d.next()}}return a}var x="function"!=typeof window.getSelection,m=1,K=CKEDITOR.tools.repeat("​",7),z=new RegExp(K+"( )?","g"),I,l,t,J=CKEDITOR.dom.walker.invisible(1),H=function(){function a(b){return function(a){var c=a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,
-!a));e&&c.getSelection().selectRanges([d]);c.fire("saveSnapshot");b.selected.remove();e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d]));c.fire("saveSnapshot");return!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(a){function b(){var a=c.getSelection();a&&a.removeAllRanges()}var c=a.editor;c.on("contentDom",function(){function a(){n=new CKEDITOR.dom.selection(c.getSelection());n.lock()}function b(){p.removeListener("mouseup",
-b);l.removeListener("mouseup",b);var a=CKEDITOR.document.$.selection,c=a.createRange();"None"!=a.type&&c.parentElement()&&c.parentElement().ownerDocument==k.$&&c.select()}function d(a){if(CKEDITOR.env.ie){var b=(a=a.getRanges()[0])?a.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&("false"==a.getAttribute("contenteditable")||"true"==a.getAttribute("contenteditable"))},!0):null;return a&&"false"==b.getAttribute("contenteditable")&&b}}var k=c.document,p=CKEDITOR.document,
-h=c.editable(),r=k.getBody(),l=k.getDocumentElement(),q=h.isInline(),y,n;CKEDITOR.env.gecko&&h.attachListener(h,"focus",function(a){a.removeListener();0!==y&&(a=c.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==h.$&&(a=c.createRange(),a.moveToElementEditStart(h),a.select())},null,null,-2);h.attachListener(h,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){y&&CKEDITOR.env.webkit&&(y=c._.previousActive&&c._.previousActive.equals(k.getActive()))&&null!=c._.previousScrollTop&&c._.previousScrollTop!=
-h.$.scrollTop&&(h.$.scrollTop=c._.previousScrollTop);c.unlockSelection(y);y=0},null,null,-1);h.attachListener(h,"mousedown",function(){y=0});if(CKEDITOR.env.ie||q)x?h.attachListener(h,"beforedeactivate",a,null,null,-1):h.attachListener(c,"selectionCheck",a,null,null,-1),h.attachListener(h,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){c.lockSelection(n);y=1},null,null,-1),h.attachListener(h,"mousedown",function(){y=0});if(CKEDITOR.env.ie&&!q){var m;h.attachListener(h,"mousedown",function(a){2==
-a.data.$.button&&((a=c.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(m=c.window.getScrollPosition()))});h.attachListener(h,"mouseup",function(a){2==a.data.$.button&&m&&(c.document.$.documentElement.scrollLeft=m.x,c.document.$.documentElement.scrollTop=m.y);m=null});if("BackCompat"!=k.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var u,w;l.on("mousedown",function(a){function b(a){a=a.data.$;if(u){var c=r.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(d){}u.setEndPoint(0>
-w.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);u.select()}}function c(){l.removeListener("mousemove",b);p.removeListener("mouseup",c);l.removeListener("mouseup",c);u.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<l.$.clientHeight&&a.$.x<l.$.clientWidth){u=r.$.createTextRange();try{u.moveToPoint(a.$.clientX,a.$.clientY)}catch(d){}w=u.duplicate();l.on("mousemove",b);p.on("mouseup",c);l.on("mouseup",c)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)l.on("mousedown",function(a){a.data.getTarget().is("html")&&
-(p.on("mouseup",b),l.on("mouseup",b))})}}h.attachListener(h,"selectionchange",e,c);h.attachListener(h,"keyup",g,c);h.attachListener(h,"keydown",function(a){var b=this.getSelection(1);d(b)&&(b.selectElement(d(b)),a.data.preventDefault())},c);h.attachListener(h,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){c.forceNextSelectionCheck();c.selectionChange(1)});if(q&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var t;h.attachListener(h,"mousedown",function(){t=1});h.attachListener(k.getDocumentElement(),
-"mouseup",function(){t&&g.call(c);t=0})}else h.attachListener(CKEDITOR.env.ie?h:k.getDocumentElement(),"mouseup",g,c);CKEDITOR.env.webkit&&h.attachListener(k,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:h.hasFocus&&f(h)}},null,null,-1);h.attachListener(h,"keydown",A(c),null,null,-1)});c.on("setData",function(){c.unlockSelection();CKEDITOR.env.webkit&&b()});c.on("contentDomUnload",function(){c.unlockSelection()});if(CKEDITOR.env.ie9Compat)c.on("beforeDestroy",
-b,null,null,9);c.on("dataReady",function(){delete c._.fakeSelection;delete c._.hiddenSelectionContainer;c.selectionChange(1)});c.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=c.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&(b.remove(),CKEDITOR.env.gecko&&(a=c.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);c.on("key",function(a){if("wysiwyg"==c.mode){var b=c.getSelection();if(b.isFake){var d=
-H[a.data.keyCode];if(d)return d({editor:c,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");c&&(c.getCustomData("ready")?(f(a),a.editor.fire("selectionCheck")):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){f(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=D(a.data))},
-b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=D(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(a){(a?e:g).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?
-(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():
-new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:m++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),
-this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(f){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=
-null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var E={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:D,_createFillingCharSequenceNode:u,FILLING_CHAR_SEQUENCE:K});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=
-x?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:x?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;
-else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-c.startOffset&&E[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=x?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,offset:0};for(var e=d.children,f,g,h=b.duplicate(),k=0,
-l=e.length-1,q=-1,n,m;k<=l;)if(q=Math.floor((k+l)/2),f=e[q],h.moveToElementText(f),n=h.compareEndPoints("StartToStart",b),0<n)l=q-1;else if(0>n)k=q+1;else return{container:d,offset:a(f)};if(-1==q||q==e.length-1&&0>n){h.moveToElementText(d);h.setEndPoint("StartToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!h)return f=e[e.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:f,offset:f.nodeValue.length};for(d=e.length;0<h&&0<d;)g=e[--d],g.nodeType==
-CKEDITOR.NODE_TEXT&&(m=g,h-=g.nodeValue.length);return{container:m,offset:-h}}h.collapse(0<n?!0:!1);h.setEndPoint(0<n?"StartToStart":"EndToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;if(!h)return{container:d,offset:a(f)+(0<n?0:1)};for(;0<h;)try{g=f[0<n?"previousSibling":"nextSibling"],g.nodeType==CKEDITOR.NODE_TEXT&&(h-=g.nodeValue.length,m=g),f=g}catch(u){return{container:d,offset:a(f)}}return{container:m,offset:0<n?-h:m.nodeValue.length+h}};return function(){var a=this.getNative(),c=a&&
-a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var f=c.item(e),g=f.parentNode,h=0,a=new CKEDITOR.dom.range(this.root);h<
-g.childNodes.length&&g.childNodes[h]!=f;h++);a.setStart(new CKEDITOR.dom.node(g),h);a.setEnd(new CKEDITOR.dom.node(g),h+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=
-d=new CKEDITOR.dom.rangeList(a.call(this)));return b?F(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=c.startContainer,c.startOffset==(b.getChildCount?
-b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},
-function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&E[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=x?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();
-this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(b){if(this.isLocked){if(b)var d=this.getSelectedElement(),e=this.getRanges(),f=this.isFake;this.isLocked=0;this.reset();b&&(b=d||e[0]&&e[0].getCommonAncestor())&&b.getAscendant("body",1)&&(a(e)?c.call(this,e):f?this.fake(d):d?this.selectElement(d):this.selectRanges(e))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;
-var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=m++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(b){var d=this.root.editor,e=d&&d._.hiddenSelectionContainer;this.reset();if(e)for(var e=this.root,g,h=0;h<b.length;++h)g=
-b[h],g.endContainer.equals(e)&&(g.endOffset=Math.min(g.endOffset,e.getChildCount()));if(b.length)if(this.isLocked){var k=CKEDITOR.document.getActive();this.unlock();this.selectRanges(b);this.lock();k&&!k.equals(this.root)&&k.focus()}else{var l;a:{var p,C;if(1==b.length&&!(C=b[0]).collapsed&&(l=C.getEnclosedNode())&&l.type==CKEDITOR.NODE_ELEMENT&&(C=C.clone(),C.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(p=C.getEnclosedNode())&&p.type==CKEDITOR.NODE_ELEMENT&&(l=p),"false"==l.getAttribute("contenteditable")))break a;
-l=void 0}if(l)this.fake(l);else if(d&&d.plugins.tableselection&&CKEDITOR.plugins.tableselection.isSupportedEnvironment&&a(b)&&!I)c.call(this,b);else{if(x){p=CKEDITOR.dom.walker.whitespaces(!0);l=/\ufeff|\u00a0/;C={table:1,tbody:1,tr:1};1<b.length&&(d=b[b.length-1],b[0].setEnd(d.endContainer,d.endOffset));d=b[0];b=d.collapsed;var r,G,m;if((e=d.getEnclosedNode())&&e.type==CKEDITOR.NODE_ELEMENT&&e.getName()in E&&(!e.is("a")||!e.getText()))try{m=e.$.createControlRange();m.addElement(e.$);m.select();return}catch(w){}if(d.startContainer.type==
-CKEDITOR.NODE_ELEMENT&&d.startContainer.getName()in C||d.endContainer.type==CKEDITOR.NODE_ELEMENT&&d.endContainer.getName()in C)d.shrink(CKEDITOR.NODE_ELEMENT,!0),b=d.collapsed;m=d.createBookmark();C=m.startNode;b||(k=m.endNode);m=d.document.$.body.createTextRange();m.moveToElementText(C.$);m.moveStart("character",1);k?(l=d.document.$.body.createTextRange(),l.moveToElementText(k.$),m.setEndPoint("EndToEnd",l),m.moveEnd("character",-1)):(r=C.getNext(p),G=C.hasAscendant("pre"),r=!(r&&r.getText&&r.getText().match(l))&&
-(G||!C.hasPrevious()||C.getPrevious().is&&C.getPrevious().is("br")),G=d.document.createElement("span"),G.setHtml("\x26#65279;"),G.insertBefore(C),r&&d.document.createText("").insertBefore(C));d.setStartBefore(C);C.remove();b?(r?(m.moveStart("character",-1),m.select(),d.document.$.selection.clear()):m.select(),d.moveToPosition(G,CKEDITOR.POSITION_BEFORE_START),G.remove()):(d.setEndBefore(k),k.remove(),m.select())}else{k=this.getNative();if(!k)return;this.removeAllRanges();for(m=0;m<b.length;m++){if(m<
-b.length-1&&(r=b[m],G=b[m+1],l=r.clone(),l.setStart(r.endContainer,r.endOffset),l.setEnd(G.startContainer,G.startOffset),!l.collapsed&&(l.shrink(CKEDITOR.NODE_ELEMENT,!0),d=l.getCommonAncestor(),l=l.getEnclosedNode(),d.isReadOnly()||l&&l.isReadOnly()))){G.setStart(r.startContainer,r.startOffset);b.splice(m--,1);continue}d=b[m];G=this.document.$.createRange();d.collapsed&&CKEDITOR.env.webkit&&n(d)&&(l=u(this.root),d.insertNode(l),(r=l.getNext())&&!l.getPrevious()&&r.type==CKEDITOR.NODE_ELEMENT&&"br"==
-r.getName()?(f(this.root),d.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START)):d.moveToPosition(l,CKEDITOR.POSITION_AFTER_END));G.setStart(d.startContainer.$,d.startOffset);try{G.setEnd(d.endContainer.$,d.endOffset)}catch(t){if(0<=t.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))d.collapse(1),G.setEnd(d.endContainer.$,d.endOffset);else throw t;}k.addRange(G)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));
-this.reset();w(c,b);var d=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(e);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=m++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},isInTable:function(b){return a(this.getRanges(),
-b)},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(b){for(var c=[],d,e=0;e<b.length;e++){var f=new CKEDITOR.dom.range(this.root);f.moveToBookmark(b[e]);c.push(f)}b.isFake&&(d=a(c)?c[0]._getTableElement():c[0].getEnclosedNode(),d&&d.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),b.isFake=0));b.isFake&&
-!a(c)?this.fake(d):this.selectRanges(c);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[x?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();"use strict";CKEDITOR.STYLE_BLOCK=1;
-CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
-(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var f=c.document;if(c.collapsed)f=K(this,f),c.insertNode(f),c.moveToPosition(f,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,k,l=h.ignoreReadonly,m=l||h.includeReadonly;null==
-m&&(m=c.root.getCustomData("cke_includeReadonly"));var n=CKEDITOR.dtd[g];n||(k=!0,n=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var u=c.createBookmark(),w=u.startNode,t=u.endNode,q=w,v;if(!l){var x=c.getCommonAncestor(),l=a(w,x),x=a(t,x);l&&(q=l.getNextSourceNode(!0));x&&(t=x)}for(q.getPosition(t)==CKEDITOR.POSITION_FOLLOWING&&(q=0);q;){l=!1;if(q.equals(t))q=null,l=!0;else{var A=q.type==CKEDITOR.NODE_ELEMENT?q.getName():null,x=A&&"false"==q.getAttribute("contentEditable"),D=A&&
-q.getAttribute("data-nostyle");if(A&&q.data("cke-bookmark")){q=q.getNextSourceNode(!0);continue}if(x&&m&&CKEDITOR.dtd.$block[A])for(var z=q,y=e(z),E=void 0,H=y.length,I=0,z=H&&new CKEDITOR.dom.range(z.getDocument());I<H;++I){var E=y[I],J=CKEDITOR.filter.instances[E.data("cke-filter")];if(J?J.check(this):1)z.selectNodeContents(E),b.call(this,z)}y=A?!n[A]||D?0:x&&!m?0:d(q,t,h,W):1;if(y)if(E=q.getParent(),y=h,H=g,I=k,!E||!(E.getDtd()||CKEDITOR.dtd.span)[H]&&!I||y.parentRule&&!y.parentRule(E))l=!0;else{if(v||
-A&&CKEDITOR.dtd.$removeEmpty[A]&&(q.getPosition(t)|W)!=W||(v=c.clone(),v.setStartBefore(q)),A=q.type,A==CKEDITOR.NODE_TEXT||x||A==CKEDITOR.NODE_ELEMENT&&!q.getChildCount()){for(var A=q,L;(l=!A.getNext(B))&&(L=A.getParent(),n[L.getName()])&&d(L,w,h,O);)A=L;v.setEndAfter(A)}}else l=!0;q=q.getNextSourceNode(D||x)}if(l&&v&&!v.collapsed){for(var l=K(this,f),x=l.hasAttributes(),D=v.getCommonAncestor(),A={},y={},E={},H={},U,R,ba;l&&D;){if(D.getName()==g){for(U in h.attributes)!H[U]&&(ba=D.getAttribute(R))&&
-(l.getAttribute(U)==ba?y[U]=1:H[U]=1);for(R in h.styles)!E[R]&&(ba=D.getStyle(R))&&(l.getStyle(R)==ba?A[R]=1:E[R]=1)}D=D.getParent()}for(U in y)l.removeAttribute(U);for(R in A)l.removeStyle(R);x&&!l.hasAttributes()&&(l=null);l?(v.extractContents().appendTo(l),v.insertNode(l),F.call(this,l),l.mergeSiblings(),CKEDITOR.env.ie||l.$.normalize()):(l=new CKEDITOR.dom.element("span"),v.extractContents().appendTo(l),v.insertNode(l),F.call(this,l),l.remove(!0));v=null}}c.moveToBookmark(u);c.shrink(CKEDITOR.SHRINK_TEXT);
-c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(n.getParent()),e=null,f=null,g=0;g<a.elements.length;g++){var h=a.elements[g];if(h==a.block||h==a.blockLimit)break;u.checkElementRemovable(h,!0)&&(e=h)}for(g=0;g<c.elements.length;g++){h=c.elements[g];if(h==c.block||h==c.blockLimit)break;u.checkElementRemovable(h,!0)&&(f=h)}f&&n.breakParent(f);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var c=
-a.createBookmark(),d=c.startNode,e=this._.definition.alwaysRemoveElement;if(a.collapsed){for(var f=new CKEDITOR.dom.elementPath(d.getParent(),a.root),g,h=0,k;h<f.elements.length&&(k=f.elements[h])&&k!=f.block&&k!=f.blockLimit;h++)if(this.checkElementRemovable(k)){var m;!e&&a.collapsed&&(a.checkBoundaryOfElement(k,CKEDITOR.END)||(m=a.checkBoundaryOfElement(k,CKEDITOR.START)))?(g=k,g.match=m?"start":"end"):(k.mergeSiblings(),k.is(this.element)?A.call(this,k):x(k,l(this)[k.getName()]))}if(g){e=d;for(h=
-0;;h++){k=f.elements[h];if(k.equals(g))break;else if(k.match)continue;else k=k.clone();k.append(e);e=k}e["start"==g.match?"insertBefore":"insertAfter"](g)}}else{var n=c.endNode,u=this;b();for(f=d;!f.equals(n);)g=f.getNextSourceNode(),f.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(f)&&(f.getName()==this.element?A.call(this,f):x(f,l(this)[f.getName()]),g.type==CKEDITOR.NODE_ELEMENT&&g.contains(d)&&(b(),g=d.getNext())),f=g}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function e(a){var b=
-[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function g(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&z(a,this)}function h(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&
-a.removeStyle(e)}}function k(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,f;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(f=K(this,e,d),u(d,f));a.moveToBookmark(b)}function n(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&
-(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),u(d,e)):A.call(this,d));a.moveToBookmark(b)}function u(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),e=a.is("pre"),g=!d&&e;if(d&&!e){e=b;(g=a.getBogus())&&g.remove();g=a.getHtml();g=D(g,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");g=g.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");g=g.replace(/([ \t\n\r]+|&nbsp;)/g,
-" ");g=g.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+g+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(g);b=e}else g?b=w(c?[a.getHtml()]:f(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(L))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=D(k.getHtml(),/\n$/,"")+"\n\n"+D(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":
-c.setHtml(d),k.remove())}else c&&m(b)}function f(a){var b=[];D(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function D(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function w(a,b){var c;
-1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=D(e,/^[ \t]*\n/,""),e=D(e,/\n$/,""),e=D(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(c){var f=b.clone();f.setHtml(e);
-c.append(f)}else b.setHtml(e)}return c||b}function A(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=l(this)[a.getName()],f=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),g;for(g in d)if("class"!=g&&!this._.definition.fullMatch||a.getAttribute(g)==t(g,d[g]))b&&"data-"==g.slice(0,5)||(f=a.hasAttribute(g),a.removeAttribute(g));for(var h in c)this._.definition.fullMatch&&a.getStyle(h)!=t(h,c[h],!0)||(f=f||!!a.getStyle(h),a.removeStyle(h));x(a,e,E[a.getName()]);f&&(this._.definition.alwaysRemoveElement?
-m(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?m(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function F(a){for(var b=l(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||A.call(this,d,!0);for(var f in b)if(f!=this.element)for(c=a.getElementsByTag(f),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||x(d,b[f])}function x(a,b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],
-f;if(f=a.getAttribute(e)){var g=b[d][1];(null===g||g.test&&g.test(f)||"string"==typeof g&&f==g)&&a.removeAttribute(e)}}c||m(a)}function m(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var c=a.getPrevious(L),d=a.getNext(L);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br",1);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else c=a.getFirst(),d=a.getLast(),a.remove(!0),c&&(c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings(),
-d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function K(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=z(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function z(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,d[e]);c&&a.setAttribute("style",c);return a}function I(a,
-b){for(var c in a)a[c]=a[c].replace(v,function(a,c){return b[c]})}function l(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],f,g;"string"==typeof e?f=e.toLowerCase():(f=e.element?e.element.toLowerCase():a.element,g=e.attributes);e=b[f]||(b[f]={});if(g){var e=e.attributes=e.attributes||[],h;for(h in g)e.push([h.toLowerCase(),g[h]])}}}return b}function t(a,b,c){var d=new CKEDITOR.dom.element("span");
-d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function J(a,b){function c(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var d in a)if(!(d in b)||c(b[d],d)!=c(a[d],d)&&"inherit"!=a[d]&&"inherit"!=b[d])return!1;return!0}function H(a,b,c){var d=a.document,e=a.getRanges();b=b?this.removeFromRange:this.applyToRange;var f,g;if(a.isFake&&a.isInTable())for(f=
-[],g=0;g<e.length;g++)f.push(e[g].clone());for(var h=e.createIterator();g=h.getNextRange();)b.call(this,g,c);a.selectRanges(f||e);d.removeCustomData("doc_processing_style")}var E={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},q={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,
-dd:1,form:1,audio:1,video:1},y=/\s*(?:;\s*|$)/,v=/#\((.+?)\)/g,B=CKEDITOR.dom.walker.bookmark(0,1),L=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);b&&(a=CKEDITOR.tools.clone(a),I(a.attributes,b),I(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():
-a.element:"*";this.type=a.type||(E[c]?CKEDITOR.STYLE_BLOCK:q[c]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return H.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof
-CKEDITOR.dom.document)return H.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?g:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?
-n:this.type==CKEDITOR.STYLE_OBJECT?h:null;return this.removeFromRange(a)},applyToObject:function(a){z(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=e.getName();if(!("string"==typeof this.element?
-f==this.element:f in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?
-d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,f=c.attributes;if(f)for(var g in f)e++,d[g]=f[g];if(g=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=g;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h)if(d=a.getAttribute(h)||"","style"==h?J(c[h],d):c[h]==d){if(!b)return!0}else if(b)return!1;if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=l(this)[a.getName()]){var d;
-if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];if(null===e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var f in e)c.push(" ",f,'\x3d"',e[f],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};
-CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(y,";"));for(var e in b){var f=b[e],g=(e+":"+f).replace(y,";");"inherit"==f?d+=g:c+=g}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),
-{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var W=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,O=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
-CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)};CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet");CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet);CKEDITOR.loadStylesSet=function(a,d,b){CKEDITOR.stylesSet.addExternal(a,d,"");CKEDITOR.stylesSet.load(a,b)};
-CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var g=b[d],h=g.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;g.fn.call(this,h)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
-else{var d=this,b=d.config.stylesCombo_stylesSet||d.config.stylesSet;if(!1===b)a(null);else if(b instanceof Array)d._.stylesDefinitions=b,a(b);else{b||(b="default");var b=b.split(":"),c=b[0];CKEDITOR.stylesSet.addExternal(c,b[1]?b.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(c,function(b){d._.stylesDefinitions=b[c];a(d._.stylesDefinitions)})}}}});
-CKEDITOR.dom.comment=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node;CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}});"use strict";
-(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,e){var g=null,h=null,k=[],n=b,u;e=e||b.getDocument().getBody();n||(n=e);do if(n.type==CKEDITOR.NODE_ELEMENT){k.push(n);if(!this.lastElement&&(this.lastElement=n,n.is(CKEDITOR.dtd.$object)||"false"==n.getAttribute("contenteditable")))continue;if(n.equals(e))break;if(!h&&(u=n.getName(),
-"true"==n.getAttribute("contenteditable")?h=n:!g&&d[u]&&(g=n),a[u])){if(u=!g&&"div"==u){a:{u=n.getChildren();for(var f=0,D=u.count();f<D;f++){var w=u.getItem(f);if(w.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[w.getName()]){u=!0;break a}}u=!1}u=!u}u?g=n:h=n}}while(n=n.getParent());h||(h=e);this.block=g;this.blockLimit=h;this.root=e;this.elements=k}})();
-CKEDITOR.dom.elementPath.prototype={compare:function(a){var d=this.elements;a=a&&a.elements;if(!a||d.length!=a.length)return!1;for(var b=0;b<d.length;b++)if(!d[b].equals(a[b]))return!1;return!0},contains:function(a,d,b){var c=0,e;"string"==typeof a&&(e=function(b){return b.getName()==a});a instanceof CKEDITOR.dom.element?e=function(b){return b.equals(a)}:CKEDITOR.tools.isArray(a)?e=function(b){return-1<CKEDITOR.tools.indexOf(a,b.getName())}:"function"==typeof a?e=a:"object"==typeof a&&(e=function(b){return b.getName()in
-a});var g=this.elements,h=g.length;d&&(b?c+=1:--h);b&&(g=Array.prototype.slice.call(g,0),g.reverse());for(;c<h;c++)if(e(g[c]))return g[c];return null},isContextFor:function(a){var d;return a in CKEDITOR.dtd.$block?(d=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!d.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}};
-CKEDITOR.dom.text=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createTextNode(a));this.$=a};CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node;
-CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var d=this.$.parentNode,b=d.childNodes.length,c=this.getLength(),e=this.getDocument(),g=new CKEDITOR.dom.text(this.$.splitText(a),e);d.childNodes.length==b&&(a>=c?(g=e.createText(""),g.insertAfter(this)):(a=e.createText(""),a.insertAfter(g),a.remove()));return g},substring:function(a,
-d){return"number"!=typeof d?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,d)}});
-(function(){function a(a,c,d){var g=a.serializable,h=c[d?"endContainer":"startContainer"],k=d?"endOffset":"startOffset",n=g?c.document.getById(a.startNode):a.startNode;a=g?c.document.getById(a.endNode):a.endNode;h.equals(n.getPrevious())?(c.startOffset=c.startOffset-h.getLength()-a.getPrevious().getLength(),h=a.getNext()):h.equals(a.getPrevious())&&(c.startOffset-=h.getLength(),h=a.getNext());h.equals(n.getParent())&&c[k]++;h.equals(a.getParent())&&c[k]++;c[d?"endContainer":"startContainer"]=h;return c}
-CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],g;return{getNextRange:function(h){g=void 0===g?0:g+1;var k=a[g];if(k&&1<a.length){if(!g)for(var n=a.length-1;0<=n;n--)d.unshift(a[n].createBookmark(!0));if(h)for(var u=0;a[g+u+1];){var f=k.document;h=0;n=f.getById(d[u].endNode);for(f=f.getById(d[u+1].startNode);;){n=
-n.getNextSourceNode(!1);if(f.equals(n))h=1;else if(c(n)||n.type==CKEDITOR.NODE_ELEMENT&&n.isBlockBoundary())continue;break}if(!h)break;u++}for(k.moveToBookmark(d.shift());u--;)n=a[++g],n.moveToBookmark(d.shift()),k.setEnd(n.endContainer,n.endOffset)}return k}}},createBookmarks:function(b){for(var c=[],d,g=0;g<this.length;g++){c.push(d=this[g].createBookmark(b,!0));for(var h=g+1;h<this.length;h++)this[h]=a(d,this[h]),this[h]=a(d,this[h],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
-this.length;d++)c.push(this[d].createBookmark2(a));return c},moveToBookmarks:function(a){for(var c=0;c<this.length;c++)this[c].moveToBookmark(a[c])}}})();
-(function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function d(b){var c=CKEDITOR.skin["ua_"+b],d=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),e=0,g;e<c.length;e++)if(g=c[e],d.ie&&(g.replace(/^ie/,"")==d.version||d.quirks&&"iequirks"==g)&&(g="ie"),d[g]){b+="_"+c[e];break}return CKEDITOR.getUrl(a()+b+".css")}function b(a,b){g[a]||(CKEDITOR.document.appendStyleSheet(d(a)),g[a]=1);b&&b()}function c(a){var b=
-a.getById(h);b||(b=a.getHead().append("style"),b.setAttribute("id",h),b.setAttribute("type","text/css"));return b}function e(a,b,c){var d,e,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var h=0;h<a.length;h++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){g=b[e][1];for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);a[h].$.sheet.addRule(b[e][0],g)}else{g=b;for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
-a[h].$.styleSheet.cssText+=g:a[h].$.innerHTML+=g}}var g={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,e){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),
-g||(g=this.icons[a]));a=c||g&&g.path||"";d=d||g&&g.offset;e=e||g&&g.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+d+"px;background-size:"+e+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var b=c(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var c=CKEDITOR.skin.chameleon,d="",g="";"function"==typeof c&&(d=c(this,"editor"),g=
-c(this,"panel"));a=[[n,a]];e([b],d,a);e(k,g,a)}).call(this,a)}});var h="cke_ui_color",k=[],n=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=c(a);k.push(a);var d=b.getUiColor();d&&e([a],CKEDITOR.skin.chameleon(b,"panel"),[[n,d]])}};b.on("panelShow",a);b.on("menuShow",a);b.config.uiColor&&b.setUiColor(b.config.uiColor)}})})();
-(function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var d=a.getComputedStyle("border-top-color"),b=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!d||d!=b)}catch(c){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");
-CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,d=0;d<a.length;d++)CKEDITOR.editor.prototype.constructor.apply(a[d][0],a[d][1]),CKEDITOR.add(a[d][0])})();/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
-CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
-return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();CKEDITOR.plugins.add("basicstyles",{init:function(c){var e=0,d=function(g,d,b,a){if(a){a=new CKEDITOR.style(a);var f=h[b];f.unshift(a);c.attachStyleStateChange(a,function(a){!c.readOnly&&c.getCommand(b).setState(a)});c.addCommand(b,new CKEDITOR.styleCommand(a,{contentForms:f}));c.ui.addButton&&c.ui.addButton(g,{label:d,command:b,toolbar:"basicstyles,"+(e+=10)})}},h={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==
-a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},b=c.config,a=c.lang.basicstyles;d("Bold",a.bold,"bold",b.coreStyles_bold);d("Italic",a.italic,"italic",b.coreStyles_italic);d("Underline",a.underline,"underline",b.coreStyles_underline);d("Strike",a.strike,"strike",b.coreStyles_strike);d("Subscript",a.subscript,
-"subscript",b.coreStyles_subscript);d("Superscript",a.superscript,"superscript",b.coreStyles_superscript);c.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],[CKEDITOR.CTRL+85,"underline"]])}});CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"};CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"};CKEDITOR.config.coreStyles_underline={element:"u"};CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"};CKEDITOR.config.coreStyles_subscript={element:"sub"};
-CKEDITOR.config.coreStyles_superscript={element:"sup"};CKEDITOR.plugins.add("notification",{init:function(b){function a(b){var a=new CKEDITOR.dom.element("div");a.setStyles({position:"fixed","margin-left":"-9999px"});a.setAttributes({"aria-live":"assertive","aria-atomic":"true"});a.setText(b);CKEDITOR.document.getBody().append(a);setTimeout(function(){a.remove()},100)}b._.notificationArea=new Area(b);b.showNotification=function(a,d,e){var f,l;"progress"==d?f=e:l=e;a=new CKEDITOR.plugins.notification(b,{message:a,type:d,progress:f,duration:l});a.show();
-return a};b.on("key",function(c){if(27==c.data.keyCode){var d=b._.notificationArea.notifications;d.length&&(a(b.lang.notification.closed),d[d.length-1].hide(),c.cancel())}})}});function Notification(b,a){CKEDITOR.tools.extend(this,a,{editor:b,id:"cke-"+CKEDITOR.tools.getUniqueId(),area:b._.notificationArea});a.type||(this.type="info");this.element=this._createElement();b.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(this.element)}
-Notification.prototype={show:function(){!1!==this.editor.fire("notificationShow",{notification:this})&&(this.area.add(this),this._hideAfterTimeout())},update:function(b){var a=!0;!1===this.editor.fire("notificationUpdate",{notification:this,options:b})&&(a=!1);var c=this.element,d=c.findOne(".cke_notification_message"),e=c.findOne(".cke_notification_progress"),f=b.type;c.removeAttribute("role");b.progress&&"progress"!=this.type&&(f="progress");f&&(c.removeClass(this._getClass()),c.removeAttribute("aria-label"),
-this.type=f,c.addClass(this._getClass()),c.setAttribute("aria-label",this.type),"progress"!=this.type||e?"progress"!=this.type&&e&&e.remove():(e=this._createProgressElement(),e.insertBefore(d)));void 0!==b.message&&(this.message=b.message,d.setHtml(this.message));void 0!==b.progress&&(this.progress=b.progress,e&&e.setStyle("width",this._getPercentageProgress()));a&&b.important&&(c.setAttribute("role","alert"),this.isVisible()||this.area.add(this));this.duration=b.duration;this._hideAfterTimeout()},
-hide:function(){!1!==this.editor.fire("notificationHide",{notification:this})&&this.area.remove(this)},isVisible:function(){return 0<=CKEDITOR.tools.indexOf(this.area.notifications,this)},_createElement:function(){var b=this,a,c,d=this.editor.lang.common.close;a=new CKEDITOR.dom.element("div");a.addClass("cke_notification");a.addClass(this._getClass());a.setAttributes({id:this.id,role:"alert","aria-label":this.type});"progress"==this.type&&a.append(this._createProgressElement());c=new CKEDITOR.dom.element("p");
-c.addClass("cke_notification_message");c.setHtml(this.message);a.append(c);c=CKEDITOR.dom.element.createFromHtml('\x3ca class\x3d"cke_notification_close" href\x3d"javascript:void(0)" title\x3d"'+d+'" role\x3d"button" tabindex\x3d"-1"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e');a.append(c);c.on("click",function(){b.editor.focus();b.hide()});return a},_getClass:function(){return"progress"==this.type?"cke_notification_info":"cke_notification_"+this.type},_createProgressElement:function(){var b=
-new CKEDITOR.dom.element("span");b.addClass("cke_notification_progress");b.setStyle("width",this._getPercentageProgress());return b},_getPercentageProgress:function(){return Math.round(100*(this.progress||0))+"%"},_hideAfterTimeout:function(){var b=this,a;this._hideTimeoutId&&clearTimeout(this._hideTimeoutId);if("number"==typeof this.duration)a=this.duration;else if("info"==this.type||"success"==this.type)a="number"==typeof this.editor.config.notification_duration?this.editor.config.notification_duration:
-5E3;a&&(b._hideTimeoutId=setTimeout(function(){b.hide()},a))}};function Area(b){var a=this;this.editor=b;this.notifications=[];this.element=this._createElement();this._uiBuffer=CKEDITOR.tools.eventsBuffer(10,this._layout,this);this._changeBuffer=CKEDITOR.tools.eventsBuffer(500,this._layout,this);b.on("destroy",function(){a._removeListeners();a.element.remove()})}
-Area.prototype={add:function(b){this.notifications.push(b);this.element.append(b.element);1==this.element.getChildCount()&&(CKEDITOR.document.getBody().append(this.element),this._attachListeners());this._layout()},remove:function(b){var a=CKEDITOR.tools.indexOf(this.notifications,b);0>a||(this.notifications.splice(a,1),b.element.remove(),this.element.getChildCount()||(this._removeListeners(),this.element.remove()))},_createElement:function(){var b=this.editor,a=b.config,c=new CKEDITOR.dom.element("div");
-c.addClass("cke_notifications_area");c.setAttribute("id","cke_notifications_area_"+b.name);c.setStyle("z-index",a.baseFloatZIndex-2);return c},_attachListeners:function(){var b=CKEDITOR.document.getWindow(),a=this.editor;b.on("scroll",this._uiBuffer.input);b.on("resize",this._uiBuffer.input);a.on("change",this._changeBuffer.input);a.on("floatingSpaceLayout",this._layout,this,null,20);a.on("blur",this._layout,this,null,20)},_removeListeners:function(){var b=CKEDITOR.document.getWindow(),a=this.editor;
-b.removeListener("scroll",this._uiBuffer.input);b.removeListener("resize",this._uiBuffer.input);a.removeListener("change",this._changeBuffer.input);a.removeListener("floatingSpaceLayout",this._layout);a.removeListener("blur",this._layout)},_layout:function(){function b(){a.setStyle("left",k(n+d.width-g-h))}var a=this.element,c=this.editor,d=c.ui.contentsElement.getClientRect(),e=c.ui.contentsElement.getDocumentPosition(),f,l,r=a.getClientRect(),m,g=this._notificationWidth,h=this._notificationMargin;
-m=CKEDITOR.document.getWindow();var p=m.getScrollPosition(),q=m.getViewPaneSize(),t=CKEDITOR.document.getBody(),u=t.getDocumentPosition(),k=CKEDITOR.tools.cssLength;g&&h||(m=this.element.getChild(0),g=this._notificationWidth=m.getClientRect().width,h=this._notificationMargin=parseInt(m.getComputedStyle("margin-left"),10)+parseInt(m.getComputedStyle("margin-right"),10));c.toolbar&&(f=c.ui.space("top"),l=f.getClientRect());f&&f.isVisible()&&l.bottom>d.top&&l.bottom<d.bottom-r.height?a.setStyles({position:"fixed",
-top:k(l.bottom)}):0<d.top?a.setStyles({position:"absolute",top:k(e.y)}):e.y+d.height-r.height>p.y?a.setStyles({position:"fixed",top:0}):a.setStyles({position:"absolute",top:k(e.y+d.height-r.height)});var n="fixed"==a.getStyle("position")?d.left:"static"!=t.getComputedStyle("position")?e.x-u.x:e.x;d.width<g+h?e.x+g+h>p.x+q.width?b():a.setStyle("left",k(n)):e.x+g+h>p.x+q.width?a.setStyle("left",k(n)):e.x+d.width/2+g/2+h>p.x+q.width?a.setStyle("left",k(n-e.x+p.x+q.width-g-h)):0>d.left+d.width-g-h?b():
-0>d.left+d.width/2-g/2?a.setStyle("left",k(n-e.x+p.x)):a.setStyle("left",k(n+d.width/2-g/2-h/2))}};CKEDITOR.plugins.notification=Notification;(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=
-' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),c=c+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
-t=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),u=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
-CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var f=a.mode;f&&(f=this.modes[f]?void 0!==m[f]?m[f]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,f=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:f,this.setState(f),this.refresh&&this.refresh())}var n=CKEDITOR.env,p=this._.id=CKEDITOR.tools.getNextId(),g="",d=this.command,q,k,h;this._.editor=a;var e={id:p,button:this,editor:a,focus:function(){CKEDITOR.document.getById(p).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
-v=CKEDITOR.tools.addFunction(function(a){if(e.onkey)return a=new CKEDITOR.dom.event(a),!1!==e.onkey(e,a.getKeystroke())}),w=CKEDITOR.tools.addFunction(function(a){var b;e.onfocus&&(b=!1!==e.onfocus(e,new CKEDITOR.dom.event(a)));return b}),r=0;e.clickFn=q=CKEDITOR.tools.addFunction(function(){r&&(a.unlockSelection(1),r=0);e.execute();n.iOS&&a.focus()});if(this.modes){var m={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(m[a.mode]=this._.state)},this);a.on("activeFilterChange",
-c,this);a.on("mode",c,this);!this.readOnly&&a.on("readOnly",c,this)}else d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),g+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(l,
-"rtl"==b,this.icon,this.iconOffset))},this);d?(k=a.getCommandKeystroke(d))&&(h=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,k)):g+="off";var l=k=this.name||this.command;this.icon&&!/\./.test(this.icon)&&(l=this.icon,this.icon=null);g={id:p,name:k,iconName:l,label:this.label,cls:this.className||"",state:g,ariaDisabled:"disabled"==g?"true":"false",title:this.title+(h?" ("+h.display+")":""),ariaShortcut:h?a.lang.common.keyboardShortcut+" "+h.aria:"",titleJs:n.gecko&&!n.hc?"":(this.title||
-"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:v,focusFn:w,clickFn:q,style:CKEDITOR.skin.getIconStyle(l,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?t.output():""};u.output(g,b);if(this.onRender)this.onRender();return e},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled"),
-this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=
-b}};CKEDITOR.ui.prototype.addButton=function(a,b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();(function(){function D(a){function d(){for(var b=f(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||v(a),n=0;n<e.length;n++){var g=e[n];if("/"!=g){"string"==typeof g&&(g=e[n]={name:g});var l,d=g.groups;if(d)for(var h=0;h<d.length;h++)l=d[h],(l=b[l])&&c(g,l);(l=b[g.name])&&c(g,l)}}return e}function f(){var b={},c,e,g;for(c in a.ui.items)e=a.ui.items[c],g=e.toolbar||"others",g=g.split(","),e=g[0],g=parseInt(g[1]||-1,10),b[e]||(b[e]=[]),b[e].push({name:c,order:g});for(e in b)b[e]=b[e].sort(function(b,
-a){return b.order==a.order?0:0>a.order?-1:0>b.order?1:b.order<a.order?-1:1});return b}function c(c,e){if(e.length){c.items?c.items.push(a.ui.create("-")):c.items=[];for(var d;d=e.shift();)d="string"==typeof d?d:d.name,b&&-1!=CKEDITOR.tools.indexOf(b,d)||(d=a.ui.create(d))&&a.addFeature(d)&&c.items.push(d)}}function h(b){var a=[],e,d,h;for(e=0;e<b.length;++e)d=b[e],h={},"/"==d?a.push(d):CKEDITOR.tools.isArray(d)?(c(h,CKEDITOR.tools.clone(d)),a.push(h)):d.items&&(c(h,CKEDITOR.tools.clone(d.items)),
-h.name=d.name,a.push(h));return a}var b=a.config.removeButtons,b=b&&b.split(","),e=a.config.toolbar;"string"==typeof e&&(e=a.config["toolbar_"+e]);return a.toolbar=e?h(e):d()}function v(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list",
-"indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var z=function(){this.toolbars=[];this.focusCommandExecuted=!1};z.prototype.focus=function(){for(var a=0,d;d=this.toolbars[a++];)for(var f=0,c;c=d.items[f++];)if(c.focus){c.focus();return}};var E={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},
-100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(a){var d,f=function(c,h){var b,e="rtl"==a.lang.dir,k=a.config.toolbarGroupCycling,q=e?37:39,e=e?39:37,k=void 0===k||k;switch(h){case 9:case CKEDITOR.SHIFT+9:for(;!b||!b.items.length;)if(b=9==h?(b?b.next:c.toolbar.next)||a.toolbox.toolbars[0]:(b?b.previous:c.toolbar.previous)||a.toolbox.toolbars[a.toolbox.toolbars.length-1],b.items.length)for(c=b.items[d?b.items.length-1:0];c&&!c.focus;)(c=d?c.previous:c.next)||
-(b=0);c&&c.focus();return!1;case q:b=c;do b=b.next,!b&&k&&(b=c.toolbar.items[0]);while(b&&!b.focus);b?b.focus():f(c,9);return!1;case 40:return c.button&&c.button.hasArrow?c.execute():f(c,40==h?q:e),!1;case e:case 38:b=c;do b=b.previous,!b&&k&&(b=c.toolbar.items[c.toolbar.items.length-1]);while(b&&!b.focus);b?b.focus():(d=1,f(c,CKEDITOR.SHIFT+9),d=0);return!1;case 27:return a.focus(),!1;case 13:case 32:return c.execute(),!1}return!0};a.on("uiSpace",function(c){if(c.data.space==a.config.toolbarLocation){c.removeListener();
-a.toolbox=new z;var d=CKEDITOR.tools.getNextId(),b=['\x3cspan id\x3d"',d,'" class\x3d"cke_voice_label"\x3e',a.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+a.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',d,'" onmousedown\x3d"return false;"\x3e'],d=!1!==a.config.toolbarStartupExpanded,e,k;a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&b.push('\x3cspan class\x3d"cke_toolbox_main"'+(d?"\x3e":' style\x3d"display:none"\x3e'));
-for(var q=a.toolbox.toolbars,n=D(a),g=n.length,l=0;l<g;l++){var r,m=0,w,p=n[l],v="/"!==p&&("/"===n[l+1]||l==g-1),x;if(p)if(e&&(b.push("\x3c/span\x3e"),k=e=0),"/"===p)b.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{x=p.items||p;for(var y=0;y<x.length;y++){var t=x[y],A;if(t){var B=function(c){c=c.render(a,b);u=m.items.push(c)-1;0<u&&(c.previous=m.items[u-1],c.previous.next=c);c.toolbar=m;c.onkey=f;c.onfocus=function(){a.toolbox.focusCommandExecuted||a.focus()}};if(t.type==CKEDITOR.UI_SEPARATOR)k=
-e&&t;else{A=!1!==t.canGroup;if(!m){r=CKEDITOR.tools.getNextId();m={id:r,items:[]};w=p.name&&(a.lang.toolbar.toolbarGroups[p.name]||p.name);b.push('\x3cspan id\x3d"',r,'" class\x3d"cke_toolbar'+(v?' cke_toolbar_last"':'"'),w?' aria-labelledby\x3d"'+r+'_label"':"",' role\x3d"toolbar"\x3e');w&&b.push('\x3cspan id\x3d"',r,'_label" class\x3d"cke_voice_label"\x3e',w,"\x3c/span\x3e");b.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var u=q.push(m)-1;0<u&&(m.previous=q[u-1],m.previous.next=
-m)}A?e||(b.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),e=1):e&&(b.push("\x3c/span\x3e"),e=0);k&&(B(k),k=0);B(t)}}}e&&(b.push("\x3c/span\x3e"),k=e=0);m&&b.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}a.config.toolbarCanCollapse&&b.push("\x3c/span\x3e");if(a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var C=CKEDITOR.tools.addFunction(function(){a.execCommand("toolbarCollapse")});a.on("destroy",function(){CKEDITOR.tools.removeFunction(C)});
-a.addCommand("toolbarCollapse",{readOnly:1,exec:function(b){var a=b.ui.space("toolbar_collapser"),c=a.getPrevious(),d=b.ui.space("contents"),e=c.getParent(),h=parseInt(d.$.style.height,10),g=e.$.offsetHeight,f=a.hasClass("cke_toolbox_collapser_min");f?(c.show(),a.removeClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarCollapse)):(c.hide(),a.addClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarExpand));a.getFirst().setText(f?"▲":"◀");d.setStyle("height",
-h-(e.$.offsetHeight-g)+"px");b.fire("resize",{outerHeight:b.container.$.offsetHeight,contentsHeight:d.$.offsetHeight,outerWidth:b.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});a.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?a.lang.toolbar.toolbarCollapse:a.lang.toolbar.toolbarExpand)+'" id\x3d"'+a.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');d||b.push(" cke_toolbox_collapser_min");
-b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+C+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");c.data.html+=b.join("")}});a.on("destroy",function(){if(this.toolbox){var a,d=0,b,e,f;for(a=this.toolbox.toolbars;d<a.length;d++)for(e=a[d].items,b=0;b<e.length;b++)f=e[b],f.clickFn&&CKEDITOR.tools.removeFunction(f.clickFn),f.keyDownFn&&CKEDITOR.tools.removeFunction(f.keyDownFn)}});a.on("uiReady",function(){var c=a.ui.space("toolbox");c&&a.focusManager.add(c,
-1)});a.addCommand("toolbarFocus",E);a.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");a.ui.add("-",CKEDITOR.UI_SEPARATOR,{});a.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,d,f){var c=v(this.editor),h=0===d,b={name:a};if(f){if(f=CKEDITOR.tools.search(c,function(a){return a.name==f})){!f.groups&&(f.groups=[]);if(d&&
-(d=CKEDITOR.tools.indexOf(f.groups,d),0<=d)){f.groups.splice(d+1,0,a);return}h?f.groups.splice(0,0,a):f.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){function q(b,a,c){a.type||(a.type="auto");if(c&&!1===b.fire("beforePaste",a)||!a.dataValue&&a.dataTransfer.isEmpty())return!1;a.dataValue||(a.dataValue="");if(CKEDITOR.env.gecko&&"drop"==a.method&&b.toolbox)b.once("afterPaste",function(){b.toolbox.focus()});return b.fire("paste",a)}function y(b){function a(){var a=b.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||m.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",
-c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(m.mainPasteEvent,function(b){"beforepaste"==m.mainPasteEvent&&n||t(b)});"beforepaste"==m.mainPasteEvent&&(a.on("paste",function(b){u||(f(),b.data.preventDefault(),t(b),e("paste"))}),a.on("contextmenu",g,null,null,0),a.on("beforepaste",function(b){!b.data||b.data.$.ctrlKey||b.data.$.shiftKey||g()},null,null,0));a.on("beforecut",function(){!n&&h(b)});var d;a.attachListener(CKEDITOR.env.ie?a:b.document.getDocumentElement(),
-"mouseup",function(){d=setTimeout(function(){r()},0)});b.on("destroy",function(){clearTimeout(d)});a.on("keyup",r)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,fakeKeystroke:"cut"==a?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&h();var a;var c=this.type;if(CKEDITOR.env.ie)a=e(c);else try{a=b.document.$.execCommand(c,!1,null)}catch(d){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function d(){return{canUndo:!1,async:!0,fakeKeystroke:CKEDITOR.CTRL+
-86,exec:function(b,a){function c(a,g){g="undefined"!==typeof g?g:!0;a?(a.method="paste",a.dataTransfer||(a.dataTransfer=m.initPasteDataTransfer()),q(b,a,g)):d&&b.showNotification(l,"info",b.config.clipboard_notificationDuration);b.fire("afterCommandExec",{name:"paste",command:e,returnValue:!!a})}a="undefined"!==typeof a&&null!==a?a:{};var e=this,d="undefined"!==typeof a.notification?a.notification:!0,g=a.type,h=CKEDITOR.tools.keystrokeToString(b.lang.common.keyboard,b.getCommandKeystroke(this)),l=
-"string"===typeof d?d:b.lang.clipboard.pasteNotification.replace(/%1/,'\x3ckbd aria-label\x3d"'+h.aria+'"\x3e'+h.display+"\x3c/kbd\x3e"),h="string"===typeof a?a:a.dataValue;g?b._.nextPasteType=g:delete b._.nextPasteType;"string"===typeof h?c({dataValue:h}):b.getClipboardData(c)}}}function f(){u=1;setTimeout(function(){u=0},100)}function g(){n=1;setTimeout(function(){n=0},10)}function e(a){var c=b.document,d=c.getBody(),e=!1,g=function(){e=!0};d.on(a,g);7<CKEDITOR.env.version?c.$.execCommand(a):c.$.selection.createRange().execCommand(a);
-d.removeListener(a,g);return e}function h(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),c,d,e;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(c=a.getSelectedElement())&&(d=a.getRanges()[0],e=b.document.createText(""),e.insertBefore(c),d.setStartBefore(e),d.setEndAfter(c),a.selectRanges([d]),setTimeout(function(){c.getParent()&&(e.remove(),a.selectElement(c))},0))}}function k(a,c){var d=b.document,e=b.editable(),g=function(b){b.cancel()},h;if(!d.getById("cke_pastebin")){var l=b.getSelection(),
-t=l.createBookmarks();CKEDITOR.env.ie&&l.root.fire("selectionchange");var f=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",d);f.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var k=0,d=d.getWindow();CKEDITOR.env.webkit?(e.append(f),f.addClass("cke_editable"),e.is("body")||(k="static"!=e.getComputedStyle("position")?e:CKEDITOR.dom.element.get(e.$.offsetParent),k=k.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(f);
-f.setStyles({position:"absolute",top:d.getScrollPosition().y-k+10+"px",width:"1px",height:Math.max(1,d.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&f.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(k=f.getParent().isReadOnly())?(f.setOpacity(0),f.setAttribute("contenteditable",!0)):f.setStyle("ltr"==b.config.contentsLangDirection?"left":"right","-10000px");b.on("selectionChange",g,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)h=
-e.once("blur",g,null,null,-100);k&&f.focus();k=new CKEDITOR.dom.range(f);k.selectNodeContents(f);var r=k.select();CKEDITOR.env.ie&&(h=e.once("blur",function(){b.lockSelection(r)}));var p=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=p);h&&h.removeListener();CKEDITOR.env.ie&&e.focus();l.selectBookmarks(t);f.remove();var a;CKEDITOR.env.webkit&&(a=f.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(f=a);b.removeListener("selectionChange",
-g);c(f.getHtml())},0)}}function v(){if("paste"==m.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();f();var a=b.focusManager;a.lock();if(b.editable().fire(m.mainPasteEvent)&&!e("paste"))return a.unlock(),!1;a.unlock();return!0}function l(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=b.editable();f();"paste"==m.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),
-setTimeout(function(){b.fire("saveSnapshot")},50)}}function t(a){var c={type:"auto",method:"paste",dataTransfer:m.initPasteDataTransfer(a)};c.dataTransfer.cacheData();var e=!1!==b.fire("beforePaste",c);e&&m.canClipboardApiBeTrusted(c.dataTransfer,b)?(a.data.preventDefault(),setTimeout(function(){q(b,c)},0)):k(a,function(a){c.dataValue=a.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,"");e&&q(b,c)})}function r(){if("wysiwyg"==b.mode){var a=p("paste");b.getCommand("cut").setState(p("cut"));b.getCommand("copy").setState(p("copy"));
-b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function p(a){if(w&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var c=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==c.length&&c[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var m=CKEDITOR.plugins.clipboard,n=0,u=0,w=0;(function(){b.on("key",l);b.on("contentDom",a);b.on("selectionChange",function(b){w=b.data.selection.getRanges()[0].checkReadOnly();
-r()});b.contextMenu&&b.contextMenu.addListener(function(b,a){w=a.getRanges()[0].checkReadOnly();return{cut:p("cut"),copy:p("copy"),paste:p("paste")}})})();(function(){function a(c,e,d,g,h){var l=b.lang.clipboard[e];b.addCommand(e,d);b.ui.addButton&&b.ui.addButton(c,{label:l,command:e,toolbar:"clipboard,"+g});b.addMenuItems&&b.addMenuItem(e,{label:l,command:e,group:"clipboard",order:h})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",d(),30,8)})();b.getClipboardData=
-function(a,c){function e(b){b.removeListener();b.cancel();c(b.data)}c||(c=a,a=null);b.on("paste",e,null,null,0);!1===v()&&(b.removeListener("paste",e),c(null))}}function z(b){if(CKEDITOR.env.webkit){if(!b.match(/^[^<]*$/g)&&!b.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!b.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
-return"htmlifiedtext"}function A(b,a){function c(b){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(b/2))+(1==b%2?"\x3cbr\x3e":"")}a=a.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");a=a.replace(/<\/?[A-Z]+>/g,function(b){return b.toLowerCase()});if(a.match(/^[^<]$/))return a;CKEDITOR.env.webkit&&-1<a.indexOf("\x3cdiv\x3e")&&(a=a.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
-a.match(/<div>(<br>|)<\/div>/)&&(a="\x3cp\x3e"+a.replace(/(<div>(<br>|)<\/div>)+/g,function(b){return c(b.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),a=a.replace(/<\/div><div>/g,"\x3cbr\x3e"),a=a.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&b.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(a=a.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<a.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(a="\x3cp\x3e"+a.replace(/(<br>){2,}/g,function(b){return c(b.length/4)})+"\x3c/p\x3e"));return B(b,a)}function C(){function b(){var b=
-{},a;for(a in CKEDITOR.dtd)"$"!=a.charAt(0)&&"div"!=a&&"span"!=a&&(b[a]=1);return b}var a={};return{get:function(c){return"plain-text"==c?a.plainText||(a.plainText=new CKEDITOR.filter("br")):"semantic-content"==c?((c=a.semanticContent)||(c=new CKEDITOR.filter,c.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),c=a.semanticContent=c),c):c?new CKEDITOR.filter(c):null}}}function x(b,a,c){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var d=new CKEDITOR.htmlParser.basicWriter;c.applyTo(a,!0,!1,
-b.activeEnterMode);a.writeHtml(d);return d.getHtml()}function B(b,a){b.enterMode==CKEDITOR.ENTER_BR?a=a.replace(/(<\/p><p>)+/g,function(b){return CKEDITOR.tools.repeat("\x3cbr\x3e",b.length/7*2)}).replace(/<\/?p>/g,""):b.enterMode==CKEDITOR.ENTER_DIV&&(a=a.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return a}function D(b){b.data.preventDefault();b.data.$.dataTransfer.dropEffect="none"}function E(b){var a=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(a,c,e){c.select();q(b,{dataTransfer:e,
-method:"drop"},1);e.sourceEditor.fire("saveSnapshot");e.sourceEditor.editable().extractHtmlFromRange(a);e.sourceEditor.getSelection().selectRanges([a]);e.sourceEditor.fire("saveSnapshot")}function d(c,e){c.select();q(b,{dataTransfer:e,method:"drop"},1);a.resetDragDataTransfer()}function f(a,c,e){var g={$:a.data.$,target:a.data.getTarget()};c&&(g.dragRange=c);e&&(g.dropRange=e);!1===b.fire(a.name,g)&&a.data.preventDefault()}function g(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());return b.getChildCount()}
-var e=b.editable(),h=CKEDITOR.plugins.clipboard.getDropTarget(b),k=b.ui.space("top"),v=b.ui.space("bottom");a.preventDefaultDropOnElement(k);a.preventDefaultDropOnElement(v);e.attachListener(h,"dragstart",f);e.attachListener(b,"dragstart",a.resetDragDataTransfer,a,null,1);e.attachListener(b,"dragstart",function(c){a.initDragDataTransfer(c,b)},null,null,2);e.attachListener(b,"dragstart",function(){var c=a.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(a.dragStartContainerChildCount=
-c?g(c.startContainer):null,a.dragEndContainerChildCount=c?g(c.endContainer):null)},null,null,100);e.attachListener(h,"dragend",f);e.attachListener(b,"dragend",a.initDragDataTransfer,a,null,1);e.attachListener(b,"dragend",a.resetDragDataTransfer,a,null,100);e.attachListener(h,"dragover",function(b){if(CKEDITOR.env.edge)b.data.preventDefault();else{var a=b.data.getTarget();a&&a.is&&a.is("html")?b.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&b.data.$.dataTransfer.types.contains("Files")&&
-b.data.preventDefault()}});e.attachListener(h,"drop",function(c){if(!c.data.$.defaultPrevented){c.data.preventDefault();var e=c.data.getTarget();if(!e.isReadOnly()||e.type==CKEDITOR.NODE_ELEMENT&&e.is("html")){var e=a.getRangeAtDropPosition(c,b),g=a.dragRange;e&&f(c,g,e)}}},null,null,9999);e.attachListener(b,"drop",a.initDragDataTransfer,a,null,1);e.attachListener(b,"drop",function(e){if(e=e.data){var g=e.dropRange,h=e.dragRange,f=e.dataTransfer;f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?
-setTimeout(function(){a.internalDrop(h,g,f,b)},0):f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(h,g,f):d(g,f)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"notification,toolbar",init:function(b){var a,c=C();b.config.forcePasteAsPlainText?a="plain-text":b.config.pasteFilter?a=b.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in b.config||(a="semantic-content");b.pasteFilter=c.get(a);y(b);E(b);if(CKEDITOR.env.gecko){var d=["image/png","image/jpeg","image/gif"],
-f;b.on("paste",function(a){var c=a.data,h=c.dataTransfer;if(!c.dataValue&&"paste"==c.method&&h&&1==h.getFilesCount()&&f!=h.id&&(h=h.getFile(0),-1!=CKEDITOR.tools.indexOf(d,h.type))){var k=new FileReader;k.addEventListener("load",function(){a.data.dataValue='\x3cimg src\x3d"'+k.result+'" /\x3e';b.fire("paste",a.data)},!1);k.addEventListener("abort",function(){b.fire("paste",a.data)},!1);k.addEventListener("error",function(){b.fire("paste",a.data)},!1);k.readAsDataURL(h);f=c.dataTransfer.id;a.stop()}},
-null,null,1)}b.on("paste",function(a){a.data.dataTransfer||(a.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!a.data.dataValue){var c=a.data.dataTransfer,d=c.getData("text/html");if(d)a.data.dataValue=d,a.data.type="html";else if(d=c.getData("text/plain"))a.data.dataValue=b.editable().transformPlainTextToHtml(d),a.data.type="text"}},null,null,1);b.on("paste",function(b){var a=b.data.dataValue,c=CKEDITOR.dtd.$block;-1<a.indexOf("Apple-")&&(a=a.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi,
-" "),"html"!=b.data.type&&(a=a.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<a.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(b.data.startsWithEOL=1,b.data.preSniffing="html",a=a.replace(/<br class="Apple-interchange-newline">/,"")),a=a.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(a.match(/^<[^<]+cke_(editable|contents)/i)){var d,f,l=new CKEDITOR.dom.element("div");for(l.setHtml(a);1==l.getChildCount()&&
-(d=l.getFirst())&&d.type==CKEDITOR.NODE_ELEMENT&&(d.hasClass("cke_editable")||d.hasClass("cke_contents"));)l=f=d;f&&(a=f.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?a=a.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(a,e){return e.toLowerCase()in c?(b.data.preSniffing="html","\x3c"+e):a}):CKEDITOR.env.webkit?a=a.replace(/<\/(\w+)><div><br><\/div>$/,function(a,e){return e in c?(b.data.endsWithEOL=1,"\x3c/"+e+"\x3e"):a}):CKEDITOR.env.gecko&&(a=a.replace(/(\s)<br>$/,"$1"));b.data.dataValue=a},null,
-null,3);b.on("paste",function(a){a=a.data;var e=b._.nextPasteType||a.type,d=a.dataValue,f,n=b.config.clipboard_defaultContentType||"html",l=a.dataTransfer.getTransferType(b);f="html"==e||"html"==a.preSniffing?"html":z(d);delete b._.nextPasteType;"htmlifiedtext"==f&&(d=A(b.config,d));"text"==e&&"html"==f?d=x(b,d,c.get("plain-text")):l==CKEDITOR.DATA_TRANSFER_EXTERNAL&&b.pasteFilter&&!a.dontFilter&&(d=x(b,d,b.pasteFilter));a.startsWithEOL&&(d='\x3cbr data-cke-eol\x3d"1"\x3e'+d);a.endsWithEOL&&(d+='\x3cbr data-cke-eol\x3d"1"\x3e');
-"auto"==e&&(e="html"==f||"html"==n?"html":"text");a.type=e;a.dataValue=d;delete a.preSniffing;delete a.startsWithEOL;delete a.endsWithEOL},null,null,6);b.on("paste",function(a){a=a.data;a.dataValue&&(b.insertHtml(a.dataValue,a.type,a.range),setTimeout(function(){b.fire("afterPaste")},0))},null,null,1E3)}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,
-mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",canClipboardApiBeTrusted:function(b,a){return b.getTransferType(a)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!b.isEmpty()||CKEDITOR.env.gecko&&(b.getData("text/html")||b.getFilesCount())||CKEDITOR.env.safari&&603<=CKEDITOR.env.version&&!CKEDITOR.env.iOS?!0:!1},getDropTarget:function(b){var a=b.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||a.isInline()?a:b.document},fixSplitNodesAfterDrop:function(b,
-a,c,d){function f(b,c,d){var f=b;f.type==CKEDITOR.NODE_TEXT&&(f=b.getParent());if(f.equals(c)&&d!=c.getChildCount())return b=a.startContainer.getChild(a.startOffset-1),c=a.startContainer.getChild(a.startOffset),b&&b.type==CKEDITOR.NODE_TEXT&&c&&c.type==CKEDITOR.NODE_TEXT&&(d=b.getLength(),b.setText(b.getText()+c.getText()),c.remove(),a.setStart(b,d),a.collapse(!0)),!0}var g=a.startContainer;"number"==typeof d&&"number"==typeof c&&g.type==CKEDITOR.NODE_ELEMENT&&(f(b.startContainer,g,c)||f(b.endContainer,
-g,d))},isDropRangeAffectedByDragRange:function(b,a){var c=a.startContainer,d=a.endOffset;return b.endContainer.equals(c)&&b.endOffset<=d||b.startContainer.getParent().equals(c)&&b.startContainer.getIndex()<d||b.endContainer.getParent().equals(c)&&b.endContainer.getIndex()<d?!0:!1},internalDrop:function(b,a,c,d){var f=CKEDITOR.plugins.clipboard,g=d.editable(),e,h;d.fire("saveSnapshot");d.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,a,f.dragStartContainerChildCount,
-f.dragEndContainerChildCount);(h=this.isDropRangeAffectedByDragRange(b,a))||(e=b.createBookmark(!1));f=a.clone().createBookmark(!1);h&&(e=b.createBookmark(!1));b=e.startNode;a=e.endNode;h=f.startNode;a&&b.getPosition(h)&CKEDITOR.POSITION_PRECEDING&&a.getPosition(h)&CKEDITOR.POSITION_FOLLOWING&&h.insertBefore(b);b=d.createRange();b.moveToBookmark(e);g.extractHtmlFromRange(b,1);a=d.createRange();a.moveToBookmark(f);q(d,{dataTransfer:c,method:"drop",range:a},1);d.fire("unlockSnapshot")},getRangeAtDropPosition:function(b,
-a){var c=b.data.$,d=c.clientX,f=c.clientY,g=a.getSelection(!0).getRanges()[0],e=a.createRange();if(b.data.testRange)return b.data.testRange;if(document.caretRangeFromPoint&&a.document.$.caretRangeFromPoint(d,f))c=a.document.$.caretRangeFromPoint(d,f),e.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),e.collapse(!0);else if(c.rangeParent)e.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),e.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&g&&a.editable().hasFocus)return g;
-if(document.body.createTextRange){a.focus();c=a.document.getBody().$.createTextRange();try{for(var h=!1,k=0;20>k&&!h;k++){if(!h)try{c.moveToPoint(d,f-k),h=!0}catch(n){}if(!h)try{c.moveToPoint(d,f+k),h=!0}catch(l){}}if(h){var t="cke-temp-"+(new Date).getTime();c.pasteHTML('\x3cspan id\x3d"'+t+'"\x3e​\x3c/span\x3e');var r=a.document.getById(t);e.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START);r.remove()}else{var p=a.document.$.elementFromPoint(d,f),m=new CKEDITOR.dom.element(p),q;if(m.equals(a.editable())||
-"html"==m.getName())return g&&g.startContainer&&!g.startContainer.equals(a.editable())?g:null;q=m.getClientRect();d<q.left?e.setStartAt(m,CKEDITOR.POSITION_AFTER_START):e.setStartAt(m,CKEDITOR.POSITION_BEFORE_END);e.collapse(!0)}}catch(u){return null}}else return null}return e},initDragDataTransfer:function(b,a){var c=b.data.$?b.data.$.dataTransfer:null,d=new this.dataTransfer(c,a);c?this.dragData&&d.id==this.dragData.id?d=this.dragData:this.dragData=d:this.dragData?d=this.dragData:this.dragData=
-d;b.data.dataTransfer=d},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(b,a){if(this.isCustomCopyCutSupported){if(b&&b.data&&b.data.$){var c=new this.dataTransfer(b.data.$.clipboardData,a);this.copyCutData&&c.id==this.copyCutData.id?(c=this.copyCutData,c.$=b.data.$.clipboardData):this.copyCutData=c;return c}return new this.dataTransfer(null,a)}return new this.dataTransfer(CKEDITOR.env.edge&&b&&b.data.$&&b.data.$.clipboardData||null,a)},preventDefaultDropOnElement:function(b){b&&
-b.on("dragover",D)}};var n=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(b,a){b&&(this.$=b);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(n);this.id||(this.id="Text"==n?"":"cke-"+CKEDITOR.tools.getUniqueId());
-if("Text"!=n)try{this.$.setData(n,this.id)}catch(c){}a&&(this.sourceEditor=a,this.setData("text/html",a.getSelectedHtml(1)),"Text"==n||this.getData("text/plain")||this.setData("text/plain",a.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(b,a){b=this._.normalizeType(b);var c=this._.data[b],d;if(void 0===c||null===c||""===c)try{c=this.$.getData(b)}catch(f){}if(void 0===
-c||null===c||""===c)c="";"text/html"!=b||a?"Text"==b&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==c.substring(0,7)&&(c=""):(c=c.replace(this._.metaRegExp,""),(d=this._.bodyRegExp.exec(c))&&d.length&&(c=d[1],c=c.replace(this._.fragmentRegExp,"")));"string"===typeof c&&(d=c.indexOf("\x3c/html\x3e"),c=-1!==d?c.substring(0,d+7):c);return c},setData:function(b,a){b=this._.normalizeType(b);this._.data[b]=a;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==b||"Text"==b){"Text"==n&&
-"Text"==b&&(this.id=a);try{this.$.setData(b,a)}catch(c){}}},getTransferType:function(b){return this.sourceEditor?this.sourceEditor==b?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function b(b){b=a._.normalizeType(b);var c=a.getData(b,!0);c&&(a._.data[b]=c)}if(this.$){var a=this,c,d;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=0;c<this.$.types.length;c++)b(this.$.types[c])}else b("Text"),
-b("URL");d=this._getImageFromClipboard();if(this.$&&this.$.files||d){this._.files=[];if(this.$.files&&this.$.files.length)for(c=0;c<this.$.files.length;c++)this._.files.push(this.$.files[c]);0===this._.files.length&&d&&this._.files.push(d)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(b){return this._.files.length?this._.files[b]:this.$&&this.$.files&&this.$.files.length?
-this.$.files[b]:0===b?this._getImageFromClipboard():void 0},isEmpty:function(){var b={},a;if(this.getFilesCount())return!1;for(a in this._.data)b[a]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=0;c<this.$.types.length;c++)b[this.$.types[c]]=1}else b.Text=1,b.URL=1;"Text"!=n&&(b[n]=0);for(a in b)if(b[a]&&""!==this.getData(a))return!1;return!0},_getImageFromClipboard:function(){var b;if(this.$&&this.$.items&&this.$.items[0])try{if((b=this.$.items[0].getAsFile())&&
-b.type)return b}catch(a){}}}})();CKEDITOR.config.clipboard_notificationDuration=1E4;(function(){function q(b,d,a){a=b.config.forceEnterMode||a;if("wysiwyg"==b.mode){d||(d=b.activeEnterMode);var h=b.elementPath();h&&!h.isContextFor("p")&&(d=CKEDITOR.ENTER_BR,a=1);b.fire("saveSnapshot");d==CKEDITOR.ENTER_BR?t(b,d,null,a):u(b,d,null,a);b.fire("saveSnapshot")}}function v(b){b=b.getSelection().getRanges(!0);for(var d=b.length-1;0<d;d--)b[d].deleteContents();return b[0]}function y(b){var d=b.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},
-!0);if(b.root.equals(d))return b;d=new CKEDITOR.dom.range(d);d.moveToRange(b);return d}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b,b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var z=CKEDITOR.dom.walker.whitespaces(),A=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(b,
-d,a,h){if(a=a||v(b)){a=y(a);var f=a.document,k=a.checkStartOfBlock(),m=a.checkEndOfBlock(),l=b.elementPath(a.startContainer),c=l.block,n=d==CKEDITOR.ENTER_DIV?"div":"p",e;if(k&&m){if(c&&(c.is("li")||c.getParent().is("li"))){c.is("li")||(c=c.getParent());a=c.getParent();e=a.getParent();h=!c.hasPrevious();var p=!c.hasNext(),n=b.getSelection(),g=n.createBookmarks(),k=c.getDirection(1),m=c.getAttribute("class"),r=c.getAttribute("style"),q=e.getDirection(1)!=k;b=b.enterMode!=CKEDITOR.ENTER_BR||q||r||m;
-if(e.is("li"))h||p?(h&&p&&a.remove(),c[p?"insertAfter":"insertBefore"](e)):c.breakParent(e);else{if(b)if(l.block.is("li")?(e=f.createElement(d==CKEDITOR.ENTER_P?"p":"div"),q&&e.setAttribute("dir",k),r&&e.setAttribute("style",r),m&&e.setAttribute("class",m),c.moveChildren(e)):e=l.block,h||p)e[h?"insertBefore":"insertAfter"](a);else c.breakParent(a),e.insertAfter(a);else if(c.appendBogus(!0),h||p)for(;f=c[h?"getFirst":"getLast"]();)f[h?"insertBefore":"insertAfter"](a);else for(c.breakParent(a);f=c.getLast();)f.insertAfter(a);
-c.remove()}n.selectBookmarks(g);return}if(c&&c.getParent().is("blockquote")){c.breakParent(c.getParent());c.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||c.getPrevious().remove();c.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||c.getNext().remove();a.moveToElementEditStart(c);a.select();return}}else if(c&&c.is("pre")&&!m){t(b,d,a,h);return}if(k=a.splitBlock(n)){d=k.previousBlock;c=k.nextBlock;l=k.wasStartOfBlock;b=k.wasEndOfBlock;c?(g=c.getParent(),g.is("li")&&(c.breakParent(g),
-c.move(c.getNext(),1))):d&&(g=d.getParent())&&g.is("li")&&(d.breakParent(g),g=d.getNext(),a.moveToElementEditStart(g),d.move(d.getPrevious()));if(l||b){if(d){if(d.is("li")||!w.test(d.getName())&&!d.is("pre"))e=d.clone()}else c&&(e=c.clone());e?h&&!e.is("li")&&e.renameNode(n):g&&g.is("li")?e=g:(e=f.createElement(n),d&&(p=d.getDirection())&&e.setAttribute("dir",p));if(f=k.elementPath)for(h=0,n=f.elements.length;h<n;h++){g=f.elements[h];if(g.equals(f.block)||g.equals(f.blockLimit))break;CKEDITOR.dtd.$removeEmpty[g.getName()]&&
-(g=g.clone(),e.moveChildren(g),e.append(g))}e.appendBogus();e.getParent()||a.insertNode(e);e.is("li")&&e.removeAttribute("value");!CKEDITOR.env.ie||!l||b&&d.getChildCount()||(a.moveToElementEditStart(b?d:e),a.select());a.moveToElementEditStart(l&&!b?c:e)}else c.is("li")&&(e=a.clone(),e.selectNodeContents(c),e=new CKEDITOR.dom.walker(e),e.evaluator=function(a){return!(A(a)||z(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(g=e.next())&&
-g.type==CKEDITOR.NODE_ELEMENT&&g.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?f.createElement("br"):f.createText(" ")).insertBefore(g)),c&&a.moveToElementEditStart(c);a.select();a.scrollIntoView()}}},enterBr:function(b,d,a,h){if(a=a||v(b)){var f=a.document,k=a.checkEndOfBlock(),m=new CKEDITOR.dom.elementPath(b.getSelection().getStartElement()),l=m.block,c=l&&m.block.getName();h||"li"!=c?(!h&&k&&w.test(c)?(k=l.getDirection())?(f=f.createElement("div"),f.setAttribute("dir",k),f.insertAfter(l),a.setStart(f,
-0)):(f.createElement("br").insertAfter(l),CKEDITOR.env.gecko&&f.createText("").insertAfter(l),a.setStartAt(l.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(b="pre"==c&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?f.createText("\r"):f.createElement("br"),a.deleteContents(),a.insertNode(b),CKEDITOR.env.needsBrFiller?(f.createText("").insertAfter(b),k&&(l||m.blockLimit).appendBogus(),b.getNext().$.nodeValue="",a.setStartAt(b.getNext(),CKEDITOR.POSITION_AFTER_START)):
-a.setStartAt(b,CKEDITOR.POSITION_AFTER_END)),a.collapse(!0),a.select(),a.scrollIntoView()):u(b,d,a,h)}}};var x=CKEDITOR.plugins.enterkey,t=x.enterBr,u=x.enterBlock,w=/^h[1-6]$/})();(function(){function k(b,f){var g={},c=[],e={nbsp:" ",shy:"­",gt:"\x3e",lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};b=b.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(b,a){var d=f?"\x26"+a+";":e[a];g[d]=f?e[a]:"\x26"+a+";";c.push(d);return""});if(!f&&b){b=b.split(",");var a=document.createElement("div"),d;a.innerHTML="\x26"+b.join(";\x26")+";";d=a.innerHTML;a=null;for(a=0;a<d.length;a++){var h=d.charAt(a);g[h]="\x26"+b[a]+";";c.push(h)}}g.regex=c.join(f?"|":"");return g}CKEDITOR.plugins.add("entities",
-{afterInit:function(b){function f(a){return h[a]}function g(b){return"force"!=c.entities_processNumerical&&a[b]?a[b]:"\x26#"+b.charCodeAt(0)+";"}var c=b.config;if(b=(b=b.dataProcessor)&&b.htmlFilter){var e=[];!1!==c.basicEntities&&e.push("nbsp,gt,lt,amp");c.entities&&(e.length&&e.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
-c.entities_latin&&e.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),c.entities_greek&&e.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
-c.entities_additional&&e.push(c.entities_additional));var a=k(e.join(",")),d=a.regex?"["+a.regex+"]":"a^";delete a.regex;c.entities&&c.entities_processNumerical&&(d="[^ -~]|"+d);var d=new RegExp(d,"g"),h=k("nbsp,gt,lt,amp,shy",!0),l=new RegExp(h.regex,"g");b.addRules({text:function(a){return a.replace(l,f).replace(d,g)}},{applyToAll:!0,excludeNestedEditable:!0})}}})})();CKEDITOR.config.basicEntities=!0;CKEDITOR.config.entities=!0;CKEDITOR.config.entities_latin=!0;CKEDITOR.config.entities_greek=!0;
-CKEDITOR.config.entities_additional="#39";(function(){function k(a){var l=a.config,p=a.fire("uiSpace",{space:"top",html:""}).html,
-el=(function(e){var p=e.$.getAttribute("position"),s=p==="absolute",o="overflow";return e.getParents().filter(function(q){var c=window.getComputedStyle(q.$);if(s&&c.position==="static")return false;return(/(auto|scroll)/).test(c[o]+c[o+"-y"]+c[o+"-x"] )})})(a.element),
-t=function(){function f(a,c,e){b.setStyle(c,w(e));b.setStyle("position",a)}function e(a){var b=k.getDocumentPosition();switch(a){case "top":f("absolute","top",b.y-q-r);break;case "pin":f("fixed","top",x);break;case "bottom":f("absolute","top",b.y+(c.height||c.bottom-c.top)+r)}m=a}var m,k,n,c,h,q,v,p=l.floatSpaceDockedOffsetX||0,r=l.floatSpaceDockedOffsetY||0,u=l.floatSpacePinnedOffsetX||0,x=l.floatSpacePinnedOffsetY||
-window.innerHeight-28;return function(d){if(k=a.editable()){var f=d&&"focus"==d.name;f&&b.show();a.fire("floatingSpaceLayout",{show:f});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();c=k.getClientRect();h=g.getViewPaneSize();q=n.height;v="pageXOffset"in g.$?g.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;m?(q+r<=c.top-77?e("top"):q+r>h.height-c.bottom?e("pin"):e("bottom"),d=h.width/2,d=l.floatSpacePreferRight?"right":0<c.left&&c.right<h.width&&c.width>n.width?"rtl"==l.contentsLangDirection?
-"right":"left":d-c.left>c.right-d?"left":"right",n.width>h.width?(d="left",f=0):(f="left"==d?0<c.left?c.left:0:c.right<h.width?h.width-c.right:0,f+n.width>h.width&&(d="left"==d?"right":"left",f=0)),b.setStyle(d,w(("pin"==m?u:p)+f+("pin"==m?0:"left"==d?v:-v)))):(m="pin",e("pin"),t(d))}}}();if(p){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?
-" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:p,id:a.id,langDir:a.lang.dir,
-langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(l.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),u=CKEDITOR.tools.eventsBuffer(500,t),e=CKEDITOR.tools.eventsBuffer(10,t);b.unselectable();b.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){t(b);a.on("change",u.input);g.on("scroll",e.input);el.forEach(function(i){i.on("scroll",e.input)});g.on("resize",e.input)});a.on("blur",function(){b.hide();a.removeListener("change",u.input);g.removeListener("scroll",
-e.input);el.forEach(function(i){i.removeListener("scroll",e.input)});
-g.removeListener("resize",e.input)});a.on("destroy",function(){g.removeListener("scroll",e.input);el.forEach(function(i){i.removeListener("scroll",e.input)});g.removeListener("resize",e.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,1)}}var g=CKEDITOR.document.getWindow(),w=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(a){a.on("loaded",function(){k(this)},null,null,20)}})})();(function(){var b={canUndo:!1,exec:function(a){var b=a.document.createElement("hr");a.insertElement(b)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(a){a.blockless||(a.addCommand("horizontalrule",b),a.ui.addButton&&a.ui.addButton("HorizontalRule",{label:a.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})})();(function(){function m(a,b){var e,f;b.on("refresh",function(a){var b=[k],c;for(c in a.data.states)b.push(a.data.states[c]);this.setState(CKEDITOR.tools.search(b,p)?p:k)},b,null,100);b.on("exec",function(b){e=a.getSelection();f=e.createBookmarks(1);b.data||(b.data={});b.data.done=!1},b,null,0);b.on("exec",function(){a.forceNextSelectionCheck();e.selectBookmarks(f)},b,null,100)}var k=CKEDITOR.TRISTATE_DISABLED,p=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(a){var b=CKEDITOR.plugins.indent.genericDefinition;
-m(a,a.addCommand("indent",new b(!0)));m(a,a.addCommand("outdent",new b));a.ui.addButton&&(a.ui.addButton("Indent",{label:a.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),a.ui.addButton("Outdent",{label:a.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));a.on("dirChanged",function(b){var f=a.createRange(),l=b.data.node;f.setStartBefore(l);f.setEndAfter(l);for(var n=new CKEDITOR.dom.walker(f),c;c=n.next();)if(c.type==CKEDITOR.NODE_ELEMENT)if(!c.equals(l)&&
-c.getDirection())f.setStartAfter(c),n=new CKEDITOR.dom.walker(f);else{var d=a.config.indentClasses;if(d)for(var g="ltr"==b.data.dir?["_rtl",""]:["","_rtl"],h=0;h<d.length;h++)c.hasClass(d[h]+g[0])&&(c.removeClass(d[h]+g[0]),c.addClass(d[h]+g[1]));d=c.getStyle("margin-right");g=c.getStyle("margin-left");d?c.setStyle("margin-left",d):c.removeStyle("margin-left");g?c.setStyle("margin-right",g):c.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;
-this.startDisabled=!this.isIndent},specificDefinition:function(a,b,e){this.name=b;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==CKEDITOR.ENTER_BR;this.isIndent=!!e;this.relatedGlobal=e?"indent":"outdent";this.indentKey=e?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,b){a.on("pluginsLoaded",function(){for(var a in b)(function(a,b){var e=a.getCommand(b.relatedGlobal),c;for(c in b.jobs)e.on("exec",function(d){d.data.done||(a.fire("lockSnapshot"),b.execJob(a,c)&&(d.data.done=
-!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(b.database))},this,null,c),e.on("refresh",function(d){d.data.states||(d.data.states={});d.data.states[b.name+"@"+c]=b.refreshJob(a,c,d.data.path)},this,null,c);a.addFeature(b)})(this,b[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype={execJob:function(a,b){var e=this.jobs[b];if(e.state!=k)return e.exec.call(this,a)},refreshJob:function(a,
-b,e){b=this.jobs[b];a.activeFilter.checkFeature(this)?b.state=b.refresh.call(this,a,e):b.state=k;return b.state},getContext:function(a){return a.contains(this.context)}}})();(function(){function w(d){function f(b){for(var e=c.startContainer,a=c.endContainer;e&&!e.getParent().equals(b);)e=e.getParent();for(;a&&!a.getParent().equals(b);)a=a.getParent();if(!e||!a)return!1;for(var g=e,e=[],k=!1;!k;)g.equals(a)&&(k=!0),e.push(g),g=g.getNext();if(1>e.length)return!1;g=b.getParents(!0);for(a=0;a<g.length;a++)if(g[a].getName&&p[g[a].getName()]){b=g[a];break}for(var g=l.isIndent?1:-1,a=e[0],e=e[e.length-1],k=CKEDITOR.plugins.list.listToArray(b,q),h=k[e.getCustomData("listarray_index")].indent,
-a=a.getCustomData("listarray_index");a<=e.getCustomData("listarray_index");a++)if(k[a].indent+=g,0<g){var n=k[a].parent;k[a].parent=new CKEDITOR.dom.element(n.getName(),n.getDocument())}for(a=e.getCustomData("listarray_index")+1;a<k.length&&k[a].indent>h;a++)k[a].indent+=g;e=CKEDITOR.plugins.list.arrayToList(k,q,null,d.config.enterMode,b.getDirection());if(!l.isIndent){var f;if((f=b.getParent())&&f.is("li"))for(var g=e.listNode.getChildren(),r=[],m,a=g.count()-1;0<=a;a--)(m=g.getItem(a))&&m.is&&m.is("li")&&
-r.push(m)}e&&e.listNode.replace(b);if(r&&r.length)for(a=0;a<r.length;a++){for(m=b=r[a];(m=m.getNext())&&m.is&&m.getName()in p;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(x)&&b.append(c.document.createText(" ")),b.append(m);b.insertAfter(f)}e&&d.fire("contentDomInvalidated");return!0}for(var l=this,q=this.database,p=this.context,c,n=d.getSelection(),n=(n&&n.getRanges()).createIterator();c=n.getNextRange();){for(var b=c.getCommonAncestor();b&&(b.type!=CKEDITOR.NODE_ELEMENT||!p[b.getName()]);){if(d.editable().equals(b)){b=
-!1;break}b=b.getParent()}b||(b=c.startPath().contains(p))&&c.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);if(!b){var h=c.getEnclosedNode();h&&h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in p&&(c.setStartAt(h,CKEDITOR.POSITION_AFTER_START),c.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),b=h)}b&&c.startContainer.type==CKEDITOR.NODE_ELEMENT&&c.startContainer.getName()in p&&(h=new CKEDITOR.dom.walker(c),h.evaluator=t,c.startContainer=h.next());b&&c.endContainer.type==CKEDITOR.NODE_ELEMENT&&c.endContainer.getName()in
-p&&(h=new CKEDITOR.dom.walker(c),h.evaluator=t,c.endContainer=h.previous());if(b)return f(b)}return 0}function t(d){return d.type==CKEDITOR.NODE_ELEMENT&&d.is("li")}function x(d){return y(d)&&z(d)}var y=CKEDITOR.dom.walker.whitespaces(!0),z=CKEDITOR.dom.walker.bookmark(!1,!0),u=CKEDITOR.TRISTATE_DISABLED,v=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(d){function f(d){l.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];d.on("key",
-function(f){var c=d.elementPath();if("wysiwyg"==d.mode&&f.data.keyCode==this.indentKey&&c){var n=this.getContext(c);!n||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,c,n)||(d.execCommand(this.relatedGlobal),f.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(d,c){var f=this.getContext(c),b=CKEDITOR.plugins.indentList.firstItemInPath(this.context,c,f);return f&&this.isIndent&&!b?v:u}:function(d,c){return!this.getContext(c)||this.isIndent?u:v},
-exec:CKEDITOR.tools.bind(w,this)}}var l=CKEDITOR.plugins.indent;l.registerCommands(d,{indentlist:new f(d,"indentlist",!0),outdentlist:new f(d,"outdentlist")});CKEDITOR.tools.extend(f.prototype,l.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(d,f,l){var q=f.contains(t);l||(l=f.contains(d));return l&&q&&q.equals(l.getFirst(t))}})();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;d<arguments.length;d++)a.push(arguments[d]);a.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,a);return this._},v={build:function(b,a,d){return new CKEDITOR.ui.dialog.textInput(b,a,d)}},n={build:function(b,a,d){return new CKEDITOR.ui.dialog[a.type](b,a,d)}},q={isChanged:function(){return this.getValue()!=
-this.getInitValue()},reset:function(b){this.setValue(this.getInitValue(),b)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},r=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(b,a){this._.domOnChangeRegistered||(b.on("load",function(){this.getInputElement().on("change",function(){b.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
-this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},!0),x=/^on([A-Z]\w+)/,t=function(b){for(var a in b)(x.test(a)||"title"==a||"type"==a)&&delete b[a];return b},w=function(b){b=b.data.getKeystroke();b==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):b==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,a,d,f){if(!(4>arguments.length)){var c=h.call(this,a);c.labelId=CKEDITOR.tools.getNextId()+
-"_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
-a.controlStyle?' style\x3d"'+a.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,a),"\x3c/div\x3e"):(g={type:"hbox",widths:a.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" id\x3d"'+c.labelId+'" for\x3d"'+c.inputId+'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(a.controlStyle?' style\x3d"'+a.controlStyle+
-'"':"")+"\x3e"+f.call(this,b,a)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,g,e));return e.join("")})}},textInput:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",c={"class":"cke_dialog_ui_input_"+a.type,id:f,type:a.type};a.validate&&(this.validate=a.validate);a.maxLength&&(c.maxlength=a.maxLength);a.size&&(c.size=a.size);a.inputStyle&&(c.style=a.inputStyle);var e=this,m=!1;b.on("load",function(){e.getInputElement().on("keydown",
-function(a){13==a.data.getKeystroke()&&(m=!0)});e.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&m&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),m=!1);e.bidi&&w.call(e,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var b=['\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"'];a.width&&b.push('style\x3d"width:'+a.width+'" ');b.push("\x3e\x3cinput ");c["aria-labelledby"]=this._.labelId;this._.required&&
-(c["aria-required"]=this._.required);for(var e in c)b.push(e+'\x3d"'+c[e]+'" ');b.push(" /\x3e\x3c/div\x3e");return b.join("")})}},textarea:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this,c=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",e={};a.validate&&(this.validate=a.validate);e.rows=a.rows||5;e.cols=a.cols||20;e["class"]="cke_dialog_ui_input_textarea "+(a["class"]||"");"undefined"!=typeof a.inputStyle&&(e.style=a.inputStyle);a.dir&&(e.dir=a.dir);if(f.bidi)b.on("load",
-function(){f.getInputElement().on("keyup",w)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){e["aria-labelledby"]=this._.labelId;this._.required&&(e["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',c,'" '],b;for(b in e)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(e[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
-a,d){if(!(3>arguments.length)){var f=h.call(this,a,{"default":!!a["default"]});a.validate&&(this.validate=a.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"span",null,null,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),e=[],d=CKEDITOR.tools.getNextId()+"_label",g={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":d};t(c);a["default"]&&(g.checked="checked");"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);
-f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,c,e,"input",null,g);e.push(' \x3clabel id\x3d"',d,'" for\x3d"',g.id,'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(a.label),"\x3c/label\x3e");return e.join("")})}},radio:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);this._["default"]||(this._["default"]=this._.initValue=a.items[0][1]);a.validate&&(this.validate=a.validate);var f=[],c=this;a.role="radiogroup";a.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
-b,a,d,function(){for(var e=[],d=[],g=(a.id?a.id:CKEDITOR.tools.getNextId())+"_radio",k=0;k<a.items.length;k++){var l=a.items[k],h=void 0!==l[2]?l[2]:l[0],n=void 0!==l[1]?l[1]:l[0],p=CKEDITOR.tools.getNextId()+"_radio_input",q=p+"_label",p=CKEDITOR.tools.extend({},a,{id:p,title:null,type:null},!0),h=CKEDITOR.tools.extend({},p,{title:h},!0),r={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:n,"aria-labelledby":q},u=[];c._["default"]==n&&(r.checked="checked");t(p);t(h);"undefined"!=typeof p.inputStyle&&
-(p.style=p.inputStyle);p.keyboardFocusable=!0;f.push(new CKEDITOR.ui.dialog.uiElement(b,p,u,"input",null,r));u.push(" ");new CKEDITOR.ui.dialog.uiElement(b,h,u,"label",null,{id:q,"for":r.id},l[0]);e.push(u.join(""))}new CKEDITOR.ui.dialog.hbox(b,f,e,d);return d.join("")});this._.children=f}},button:function(b,a,d){if(arguments.length){"function"==typeof a&&(a=a(b.getParentEditor()));h.call(this,a,{disabled:a.disabled||!1});CKEDITOR.event.implementOn(this);var f=this;b.on("load",function(){var a=this.getElement();
-(function(){a.on("click",function(a){f.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(f.click(),a.data.preventDefault())})})();a.unselectable()},this);var c=CKEDITOR.tools.extend({},a);delete c.style;var e=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,c,d,"a",null,{style:a.style,href:"javascript:void(0)",title:a.label,hidefocus:"true","class":a["class"],role:"button","aria-labelledby":e},'\x3cspan id\x3d"'+e+'" class\x3d"cke_dialog_ui_button"\x3e'+
-CKEDITOR.tools.htmlEncode(a.label)+"\x3c/span\x3e")}},select:function(b,a,d){if(!(3>arguments.length)){var f=h.call(this,a);a.validate&&(this.validate=a.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),e=[],d=[],g={id:f.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};e.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
-a.type,'" role\x3d"presentation"');a.width&&e.push('style\x3d"width:'+a.width+'" ');e.push("\x3e");void 0!==a.size&&(g.size=a.size);void 0!==a.multiple&&(g.multiple=a.multiple);t(c);for(var k=0,l;k<a.items.length&&(l=a.items[k]);k++)d.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==l[1]?l[1]:l[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(l[0]));"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);f.select=new CKEDITOR.ui.dialog.uiElement(b,c,e,"select",null,
-g,d.join(""));e.push("\x3c/div\x3e");return e.join("")})}},file:function(b,a,d){if(!(3>arguments.length)){void 0===a["default"]&&(a["default"]="");var f=CKEDITOR.tools.extend(h.call(this,a),{definition:a,buttons:[]});a.validate&&(this.validate=a.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var b=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
-f.frameId,'" title\x3d"',a.label,'" src\x3d"javascript:void('];b.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");b.push(')"\x3e\x3c/iframe\x3e');return b.join("")})}},fileButton:function(b,a,d){var f=this;if(!(3>arguments.length)){h.call(this,a);a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),e=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d=
-a["for"];e&&!1===e.call(this,c)||(b.getContentElement(d[0],d[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,d=/\/$/;return function(f,c,e){if(!(3>arguments.length)){var m=[],g=c.html;"\x3c"!=g.charAt(0)&&(g="\x3cspan\x3e"+g+"\x3c/span\x3e");var k=c.focus;if(k){var l=this.focus;this.focus=function(){("function"==
-typeof k?k:l).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,c,m,"span",null,null,"");m=m.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);e.push([g[1]," ",m[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,f,c){var e=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,f,"fieldset",null,null,function(){var a=[];e&&a.push("\x3clegend"+
-(c.labelStyle?' style\x3d"'+c.labelStyle+'"':"")+"\x3e"+e+"\x3c/legend\x3e");for(var b=0;b<d.length;b++)a.push(d[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(b){var a=CKEDITOR.document.getById(this._.labelId);1>a.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=b;return this},getLabel:function(){var b=
-CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:r},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},
-isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(b,a){this.on("click",function(){a.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
-focus:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&a.$.focus()},0)},select:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&(a.$.focus(),a.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(b){if(this.bidi){var a=b&&b.charAt(0);(a="‪"==a?"ltr":"‫"==a?"rtl":null)&&(b=b.slice(1));this.setDirectionMarker(a)}b||(b="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
-getValue:function(){var b=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&b){var a=this.getDirectionMarker();a&&(b=("ltr"==a?"‪":"‫")+b)}return b},setDirectionMarker:function(b){var a=this.getInputElement();b?a.setAttributes({dir:b,"data-cke-dir-marker":b}):this.getDirectionMarker()&&a.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.textarea.prototype=
-new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(b,a,d){var f=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),c=this.getInputElement().$;f.$.text=b;f.$.value=void 0===a||null===a?b:a;void 0===d||null===d?CKEDITOR.env.ie?c.add(f.$):c.add(f.$,null):c.add(f.$,d);return this},remove:function(b){this.getInputElement().$.remove(b);
-return this},clear:function(){for(var b=this.getInputElement().$;0<b.length;)b.remove(0);return this},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(b,a){this.getInputElement().$.checked=b;!a&&this.fire("change",{value:b})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(b,
-a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return r.onChange.apply(this,arguments);b.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",a);return null}},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(b,a){for(var d=this._.children,f,c=0;c<d.length&&(f=d[c]);c++)f.getElement().$.checked=
-f.getValue()==b;!a&&this.fire("change",{value:b})},getValue:function(){for(var b=this._.children,a=0;a<b.length;a++)if(b[a].getElement().$.checked)return b[a].getValue();return null},accessKeyUp:function(){var b=this._.children,a;for(a=0;a<b.length;a++)if(b[a].getElement().$.checked){b[a].getElement().focus();return}b[0].getElement().focus()},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return r.onChange.apply(this,arguments);b.on("load",function(){for(var a=
-this._.children,b=this,c=0;c<a.length;c++)a[c].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",a);return null}}},q,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,q,{getInputElement:function(){var b=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<b.$.forms.length?new CKEDITOR.dom.element(b.$.forms[0].elements[0]):
-this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(b){var a=/^on([A-Z]\w+)/,d,f=function(a,b,c,d){a.on("formLoaded",function(){a.getInputElement().on(c,d,a)})},c;for(c in b)if(d=c.match(a))this.eventProcessors[c]?this.eventProcessors[c].call(this,this._.dialog,b[c]):f(this,this._.dialog,d[1].toLowerCase(),b[c]);return this},reset:function(){function b(){d.$.open();
-var b="";f.size&&(b=f.size-(CKEDITOR.env.ie?7:0));var h=a.frameId+"_input";d.$.write(['\x3chtml dir\x3d"'+g+'" lang\x3d"'+k+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+g+'" lang\x3d"'+k+'" action\x3d"',CKEDITOR.tools.htmlEncode(f.action),'"\x3e\x3clabel id\x3d"',a.labelId,'" for\x3d"',h,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(f.label),
-'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',h,'" aria-labelledby\x3d"',a.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(f.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+e+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+m+")}","\x3c/script\x3e"].join(""));
-d.$.close();for(b=0;b<c.length;b++)c[b].enable()}var a=this._,d=CKEDITOR.document.getById(a.frameId).getFrameDocument(),f=a.definition,c=a.buttons,e=this.formLoadedNumber,m=this.formUnloadNumber,g=a.dialog._.editor.lang.dir,k=a.dialog._.editor.langCode;e||(e=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),m=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(e);
-CKEDITOR.tools.removeFunction(m)}));CKEDITOR.env.gecko?setTimeout(b,500):b()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(b,a){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
-new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",v);CKEDITOR.dialog.addUIElement("password",v);CKEDITOR.dialog.addUIElement("textarea",n);CKEDITOR.dialog.addUIElement("checkbox",n);CKEDITOR.dialog.addUIElement("radio",n);CKEDITOR.dialog.addUIElement("button",n);CKEDITOR.dialog.addUIElement("select",n);CKEDITOR.dialog.addUIElement("file",n);CKEDITOR.dialog.addUIElement("fileButton",n);CKEDITOR.dialog.addUIElement("html",
-n);CKEDITOR.dialog.addUIElement("fieldset",{build:function(b,a,d){for(var f=a.children,c,e=[],h=[],g=0;g<f.length&&(c=f[g]);g++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[c.type].build(b,c,k))}return new CKEDITOR.ui.dialog[a.type](b,h,e,d,a)}})}});CKEDITOR.DIALOG_RESIZE_NONE=0;CKEDITOR.DIALOG_RESIZE_WIDTH=1;CKEDITOR.DIALOG_RESIZE_HEIGHT=2;CKEDITOR.DIALOG_RESIZE_BOTH=3;CKEDITOR.DIALOG_STATE_IDLE=1;CKEDITOR.DIALOG_STATE_BUSY=2;
-(function(){function x(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,c=b-1;c>b-a;c--)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function A(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),c=b+1;c<b+a;c++)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function K(a,b){for(var c=a.$.getElementsByTagName("input"),
-e=0,d=c.length;e<d;e++){var f=new CKEDITOR.dom.element(c[e]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function T(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}
-function U(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function V(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",W).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),e=c.getChild(0),d=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);
-!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));e.unselectable();d.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:e,close:d,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),
-footer:c.getChild([3,0,1,0])}}}function L(a,b,c){this.element=b;this.focusIndex=c;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function X(a){function b(){a.layout()}var c=CKEDITOR.document.getWindow();
-c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function M(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function Y(a){function b(b){var c=a.getSize(),k=CKEDITOR.document.getWindow().getViewPaneSize(),q=b.data.$.screenX,n=b.data.$.screenY,r=q-e.x,l=n-e.y;e={x:q,y:n};d.x+=r;d.y+=l;a.move(d.x+h[3]<g?-h[3]:d.x-h[1]>k.width-c.width-g?k.width-c.width+("rtl"==f.lang.dir?0:h[1]):d.x,d.y+h[0]<g?-h[0]:d.y-h[2]>k.height-c.height-g?k.height-c.height+h[2]:d.y,1);b.data.preventDefault()}
-function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",c)}}var e=null,d=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(g){e={x:g.data.$.screenX,y:g.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",
-c);d=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=u.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",c)}g.data.preventDefault()},a)}function Z(a){function b(b){var c="rtl"==f.lang.dir,n=k.width,q=k.height,G=n+(b.data.$.screenX-m.x)*(c?-1:1)*(a._.moved?1:2),H=q+(b.data.$.screenY-m.y)*(a._.moved?1:2),B=a._.element.getFirst(),B=c&&B.getComputedStyle("right"),C=a.getPosition();C.y+H>p.height&&(H=p.height-C.y);(c?B:C.x)+G>p.width&&(G=p.width-(c?B:C.x));if(d==CKEDITOR.DIALOG_RESIZE_WIDTH||
-d==CKEDITOR.DIALOG_RESIZE_BOTH)n=Math.max(e.minWidth||0,G-g);if(d==CKEDITOR.DIALOG_RESIZE_HEIGHT||d==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(e.minHeight||0,H-h);a.resize(n,q);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var e=a.definition,d=e.resizable;
-if(d!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,h,p,m,k,q,n=CKEDITOR.tools.addFunction(function(d){k=a.getSize();var e=a.parts.contents;e.$.getElementsByTagName("iframe").length&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),e.append(q));h=k.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));g=k.width-a.parts.contents.getSize("width",
-1);m={x:d.screenX,y:d.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(e=u.getChild(0).getFrameDocument(),e.on("mousemove",b),e.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("load",function(){var b="";d==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":d==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+
-b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function I(a){a.data.preventDefault(1)}function N(a){var b=CKEDITOR.document.getWindow(),c=a.config,e=CKEDITOR.skinName||a.config.skin,d=c.dialog_backgroundCoverColor||("moono-lisa"==e?"black":"white"),e=c.dialog_backgroundCoverOpacity,
-f=c.baseFloatZIndex,c=CKEDITOR.tools.genKey(d,e,f),g=z[c];g?g.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+d,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(d="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+d+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),
-f.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+d+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),g=CKEDITOR.dom.element.createFromHtml(f.join("")),g.setOpacity(void 0!==e?e:.5),g.on("keydown",I),g.on("keypress",I),g.on("keyup",I),g.appendTo(CKEDITOR.document.getBody()),
-z[c]=g);a.focusManager.add(g);u=g;a=function(){var a=b.getViewPaneSize();g.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),c=CKEDITOR.dialog._.currentTop;g.setStyles({left:a.x+"px",top:a.y+"px"});if(c){do a=c.getPosition(),c.move(a.x,a.y);while(c=c._.parentDialog)}};J=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||g.focus();if(CKEDITOR.env.ie6Compat){var p=function(){h();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){p.prevScrollHandler=
-window.onscroll||function(){};window.onscroll=p},0);h()}}function O(a){u&&(a.focusManager.remove(u),a=CKEDITOR.document.getWindow(),u.hide(),a.removeListener("resize",J),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),J=null)}var v=CKEDITOR.tools.cssLength,W='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+
-CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(a,b){function c(){var a=l._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function e(a){var b=l._.focusList;a=a||0;if(!(1>b.length)){var c=l._.currentFocusIndex;l._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(d){}var e=c,g=1<l._.pageCount;do{e+=a;if(g&&!l._.tabBarMode&&(e==b.length||-1==e)){l._.tabBarMode=!0;l._.tabs[l._.currentTabId][0].focus();
-l._.currentFocusIndex=-1;return}e=(e+b.length)%b.length;if(e==c)break}while(a&&!b[e].isFocusable());b[e].focus();"text"==b[e].type&&b[e].select()}}function d(b){if(l==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),d="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)e(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!l._.tabBarMode&&1<l.getPageCount())l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1,q=1;else if(-1!=CKEDITOR.tools.indexOf(g,
-c)&&l._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([d?39:37,38],c)?x.call(l):A.call(l),l.selectPage(c),l._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!l._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],h=CKEDITOR.tools.clone(aa),p=a.config.dialog_buttonsOrder||"OS",m=a.lang.dir,k={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==m||"ltr"==p&&"rtl"==m)&&h.buttons.reverse();g=CKEDITOR.tools.extend(g(a),h);g=CKEDITOR.tools.clone(g);g=new P(this,g);h=V(a);this._={editor:a,element:h.element,name:b,contentSize:{width:0,height:0},
-size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=h.parts;CKEDITOR.tools.setTimeout(function(){a.fire("ariaWidget",this.parts.contents)},0,this);h={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};h["rtl"==m?"right":"left"]=0;this.parts.dialog.setStyles(h);CKEDITOR.event.call(this);this.definition=g=CKEDITOR.fire("dialogDefinition",
-{name:b,definition:g},a).definition;if(!("removeDialogTabs"in a._)&&a.config.removeDialogTabs){h=a.config.removeDialogTabs.split(";");for(m=0;m<h.length;m++)if(p=h[m].split(":"),2==p.length){var r=p[0];k[r]||(k[r]=[]);k[r].push(p[1])}a._.removeDialogTabs=k}if(a._.removeDialogTabs&&(k=a._.removeDialogTabs[b]))for(m=0;m<k.length;m++)g.removeContents(k[m]);if(g.onLoad)this.on("load",g.onLoad);if(g.onShow)this.on("show",g.onShow);if(g.onHide)this.on("hide",g.onHide);if(g.onOk)this.on("ok",function(b){a.fire("saveSnapshot");
-setTimeout(function(){a.fire("saveSnapshot")},0);!1===g.onOk.call(this,b)&&(b.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(g.onCancel)this.on("cancel",function(a){!1===g.onCancel.call(this,a)&&(a.data.hide=!1)});var l=this,t=function(a){var b=l._.contents,c=!1,d;for(d in b)for(var e in b[d])if(c=a.call(this,b[d][e]))return};this.on("ok",function(a){t(function(b){if(b.validate){var c=b.validate(this),d="string"==typeof c||!1===c;d&&(a.data.hide=!1,a.stop());T.call(b,!d,"string"==typeof c?
-c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=e;var y=this._.element;a.focusManager.add(y,1);this.on("show",function(){y.on("keydown",d,this);if(CKEDITOR.env.gecko)y.on("keypress",f,this)});this.on("hide",
-function(){y.removeListener("keydown",d);CKEDITOR.env.gecko&&y.removeListener("keypress",f);t(function(a){U.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",d,this,null,0)});this.on("show",function(){c();var b=1<l._.pageCount;a.config.dialog_startupFocusTab&&b?(l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-1,g.onFocus?
-(b=g.onFocus.call(this))&&b.focus():e(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);Y(this);Z(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(m=0;m<g.contents.length;m++)(k=g.contents[m])&&this.addPage(k);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1)),a.data.preventDefault())},this);m=[];k=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},m).getChild();this.parts.footer.setHtml(m.join(""));for(m=0;m<k.length;m++)this._.buttons[k[m].id]=k[m]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
-a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
-return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,c){var e=this._.element.getFirst(),d="rtl"==this._.editor.lang.dir,f="fixed"==e.getComputedStyle("position");CKEDITOR.env.ie&&e.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),d&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
-b[d?"right":"left"]=(0<a?a:0)+"px",e.setStyles(b),c&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
-null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,N(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
-a.on("keydown",Q);a.on("keyup",R);this._.hasFocus=!1;for(var c in b.contents)if(b.contents[c]){var a=b.contents[c],e=this._.tabs[a.id],d=a.requiredContent,f=0;if(e){for(var g in this._.contents[a.id]){var h=this._.contents[a.id][g];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),f++))}!f||d&&!this._.editor.activeFilter.check(d)?e[0].addClass("cke_dialog_tab_disabled"):e[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
-X(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),e=(c.width-b.width)/2,d=(c.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<d?d:0)>c.height||
-b.width+(0<e?e:0)>c.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:e,this._.moved?this._.position.y:d)},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
-commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(ba(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
-if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else O(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",Q);a.removeListener("keyup",R);var c=this._.editor;c.focus();setTimeout(function(){c.focusManager.unlock();CKEDITOR.env.iOS&&c.window.focus()},0)}delete this._.parentDialog;
-this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",e=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),d=this._.contents[a.id]={},f=e.getChild(),
-g=0;e=f.shift();)e.notAllowed||"hbox"==e.type||"vbox"==e.type||g++,d[e.id]=e,"function"==typeof e.getChild&&f.push.apply(f,e.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");e=CKEDITOR.env;d="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',d,'"',e.gecko&&!e.hc?"":' href\x3d"javascript:void(0)"',
-' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",d);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&(S(this,this,"CTRL+"+a.accessKey,ca,da),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
-!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],e=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),e.hide());e.setAttribute("aria-hidden",b!=a)}var d=this._.tabs[a];d[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(K(d[1]),d[1].show(),setTimeout(function(){K(d[1],1)},0)):d[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
-updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(a){var b=this._.tabs[a]&&this._.tabs[a][0];b&&1!=this._.pageCount&&b.isVisible()&&(a==this._.currentTabId&&this.selectPage(x.call(this)),b.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},
-getContentElement:function(a,b){var c=this._.contents[a];return c&&c[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,c){return this.getContentElement(a,b).setValue(c)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},
-getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new L(this,a,b));else{this._.focusList.splice(b,0,new L(this,a,b));for(var c=b+1;c<this._.focusList.length;c++)this._.focusList[c].focusIndex++}},setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,c={attributes:{"class":"cke_dialog_spinner"},
-styles:{"float":"rtl"==b?"right":"left"}};c.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",c);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&
-"function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,c){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+c+"(?:$|;)","i")))},okButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",
-{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,
-b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var aa={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},D=function(a,b,c){for(var e=0,d;d=a[e];e++)if(d.id==b||c&&d[c]&&(d=D(d[c],
-b,c)))return d;return null},E=function(a,b,c,e,d){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(e&&g[e]&&(g=E(g[e],b,c,e,!0)))return g}if(d)return null}a.push(b);return b},F=function(a,b,c){for(var e=0,d;d=a[e];e++){if(d.id==b)return a.splice(e,1);if(c&&d[c]&&(d=F(d[c],b,c)))return d}return null},P=function(a,b){this.dialog=a;for(var c=b.contents,e=0,d;d=c[e];e++)c[e]=d&&new M(a,d);CKEDITOR.tools.extend(this,b)};P.prototype={getContents:function(a){return D(this.contents,
-a)},getButton:function(a){return D(this.buttons,a)},addContents:function(a,b){return E(this.contents,a,b)},addButton:function(a,b){return E(this.buttons,a,b)},removeContents:function(a){F(this.contents,a)},removeButton:function(a){F(this.buttons,a)}};M.prototype={get:function(a){return D(this.elements,a,"children")},add:function(a,b){return E(this.elements,a,b,"children")},remove:function(a){F(this.elements,a,"children")}};var J,z={},u,w={},Q=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=
-a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},R=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
-a.data.preventDefault()))},S=function(a,b,c,e,d){(w[c]||(w[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:d||a.accessKeyUp,keydown:e||a.accessKeyDown})},ba=function(a){for(var b in w){for(var c=w[b],e=c.length-1;0<=e;e--)c[e].dialog!=a&&c[e].uiElement!=a||c.splice(e,1);0===c.length&&delete w[b]}},da=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},ca=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,e,d,f,g){if(!(4>arguments.length)){var h=(e.call?e(b):e)||
-"div",p=["\x3c",h," "],m=(d&&d.call?d(b):d)||{},k=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=k.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(m.display="none",this.notAllowed=!0);k.id=n;var r={};b.type&&(r["cke_dialog_ui_"+b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var l=k["class"]&&k["class"].split?k["class"].split(" "):[],n=0;n<l.length;n++)l[n]&&(r[l[n]]=1);l=
-[];for(n in r)l.push(n);k["class"]=l.join(" ");b.title&&(k.title=b.title);r=(b.style||"").split(";");b.align&&(l=b.align,m["margin-left"]="left"==l?0:"auto",m["margin-right"]="right"==l?0:"auto");for(n in m)r.push(n+":"+m[n]);b.hidden&&r.push("display:none");for(n=r.length-1;0<=n;n--)""===r[n]&&r.splice(n,1);0<r.length&&(k.style=(k.style?k.style+"; ":"")+r.join("; "));for(n in k)p.push(n+'\x3d"'+CKEDITOR.tools.htmlEncode(k[n])+'" ');p.push("\x3e",q,"\x3c/",h,"\x3e");c.push(p.join(""));(this._||(this._=
-{})).dialog=a;"boolean"==typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(c){a.call(this,b.setValue.call(this,c))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);
-this.registerEvents(b);this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&S(this,a,"CTRL+"+b.accessKey);var t=this;a.on("load",function(){var b=t.getInputElement();if(b){var c=t.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;t.fire("focus");c&&this.addClass(c)});b.on("blur",function(){t.fire("blur");c&&this.removeClass(c)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=
-b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,e,d){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.widths||null,h=d&&d.height||null,p,m={role:"presentation"};d&&d.align&&(m.align=d.align);CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"hbox"},e,"table",{},m,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",
-e=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&e.push("width:"+v(g[p])):e.push("width:"+Math.floor(100/c.length)+"%");h&&e.push("height:"+v(h));d&&void 0!==d.padding&&e.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[p].align&&e.push("text-align:"+f[p].align);0<e.length&&a.push('style\x3d"'+e.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");
-return a.join("")})}},vbox:function(a,b,c,e,d){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.width||null,h=d&&d.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"vbox"},e,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');d&&d.expand&&b.push("height:100%;");b.push("width:"+v(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',
-CKEDITOR.tools.htmlEncode(d&&d.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var e=0;e<c.length;e++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&k.push("width:"+v(g||"100%"));h?k.push("height:"+v(h[e])):d&&d.expand&&k.push("height:"+Math.floor(100/c.length)+"%");d&&void 0!==d.padding&&k.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[e].align&&k.push("text-align:"+f[e].align);0<k.length&&b.push('style\x3d"',
-k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[e],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},
-isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},d;for(d in a)if(c=
-d.match(b))this.eventProcessors[d]?this.eventProcessors[d].call(this,this._.dialog,a[d]):e(this,this._.dialog,c[1].toLowerCase(),a[d]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=
-this.getElement();this.getInputElement().removeAttribute("disabled");a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>
-a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,c,e){for(var d=c.children,f,g=[],h=[],p=0;p<d.length&&(f=d[p]);p++){var m=[];g.push(m);h.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,m))}return new CKEDITOR.ui.dialog[c.type](a,h,g,e,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",
-a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,c=/^\d*(?:\.\d+)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,d=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=
-arguments;return function(){var b=this&&this.getValue?this.getValue():a[0],c,d=CKEDITOR.VALIDATE_AND,e=[],f;for(f=0;f<a.length;f++)if("function"==typeof a[f])e.push(a[f]);else break;f<a.length&&"string"==typeof a[f]&&(c=a[f],f++);f<a.length&&"number"==typeof a[f]&&(d=a[f]);var n=d==CKEDITOR.VALIDATE_AND?!0:!1;for(f=0;f<e.length;f++)n=d==CKEDITOR.VALIDATE_AND?n&&e[f](b):n||e[f](b);return n?!0:c}},regex:function(a,b){return function(c){c=this&&this.getValue?this.getValue():c;return a.test(c)?!0:b}},
-notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,a)},number:function(a){return this.regex(c,a)},cssLength:function(a){return this.functions(function(a){return d.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},
-notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in z)z[c].remove();z={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var c=null,e=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&N(this);if("function"==typeof e)c=
-this._.storedDialogs||(this._.storedDialogs={}),c=c[a]||(c[a]=new CKEDITOR.dialog(this,a)),b&&b.call(c,c),c.show();else{if("failed"==e)throw O(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof e&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return c}})})();
-CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(x){x.on("doubleclick",function(A){A.data.dialog&&x.openDialog(A.data.dialog)},null,null,999)}});(function(){function g(a,b){var c=l.exec(a),d=l.exec(b);if(c){if(!c[2]&&"px"==d[2])return d[1];if("px"==c[2]&&!d[2])return d[1]+"px"}return b}var k=CKEDITOR.htmlParser.cssStyle,h=CKEDITOR.tools.cssLength,l=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i,m={elements:{$:function(a){var b=a.attributes;if((b=(b=(b=b&&b["data-cke-realelement"])&&new CKEDITOR.htmlParser.fragment.fromHtml(decodeURIComponent(b)))&&b.children[0])&&a.attributes["data-cke-resizable"]){var c=(new k(a)).rules;a=b.attributes;var d=c.width,
-c=c.height;d&&(a.width=g(a.width,d));c&&(a.height=g(a.height,c))}return b}}};CKEDITOR.plugins.add("fakeobjects",{init:function(a){a.filter.allow("img[!data-cke-realelement,src,alt,title](*){*}","fakeobjects")},afterInit:function(a){(a=(a=a.dataProcessor)&&a.htmlFilter)&&a.addRules(m,{applyToAll:!0})}});CKEDITOR.editor.prototype.createFakeElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown;b={"class":b,"data-cke-realelement":encodeURIComponent(a.getOuterHtml()),"data-cke-real-node-type":a.type,
-alt:e,title:e,align:a.getAttribute("align")||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,c=new k,d=a.getAttribute("width"),a=a.getAttribute("height"),d&&(c.rules.width=h(d)),a&&(c.rules.height=h(a)),c.populate(b));return this.document.createElement("img",{attributes:b})};CKEDITOR.editor.prototype.createFakeParserElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown,f;f=new CKEDITOR.htmlParser.basicWriter;
-a.writeHtml(f);f=f.getHtml();b={"class":b,"data-cke-realelement":encodeURIComponent(f),"data-cke-real-node-type":a.type,alt:e,title:e,align:a.attributes.align||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,d=a.attributes,a=new k,c=d.width,d=d.height,void 0!==c&&(a.rules.width=h(c)),void 0!==d&&(a.rules.height=h(d)),a.populate(b));return new CKEDITOR.htmlParser.element("img",b)};CKEDITOR.editor.prototype.restoreRealElement=
-function(a){if(a.data("cke-real-node-type")!=CKEDITOR.NODE_ELEMENT)return null;var b=CKEDITOR.dom.element.createFromHtml(decodeURIComponent(a.data("cke-realelement")),this.document);if(a.data("cke-resizable")){var c=a.getStyle("width");a=a.getStyle("height");c&&b.setAttribute("width",g(b.getAttribute("width"),c));a&&b.setAttribute("height",g(b.getAttribute("height"),a))}return b}})();(function(){function p(c){return c.replace(/'/g,"\\$\x26")}function q(c){for(var b,a=c.length,d=[],f=0;f<a;f++)b=c.charCodeAt(f),d.push(b);return"String.fromCharCode("+d.join(",")+")"}function r(c,b){var a=c.plugins.link,d=a.compiledProtectionFunction.params,f,e;e=[a.compiledProtectionFunction.name,"("];for(var g=0;g<d.length;g++)a=d[g].toLowerCase(),f=b[a],0<g&&e.push(","),e.push("'",f?p(encodeURIComponent(b[a])):"","'");e.push(")");return e.join("")}function n(c){c=c.config.emailProtection||"";
-var b;c&&"encode"!=c&&(b={},c.replace(/^([^(]+)\(([^)]+)\)$/,function(a,c,f){b.name=c;b.params=[];f.replace(/[^,\s]+/g,function(a){b.params.push(a)})}));return b}CKEDITOR.plugins.add("link",{requires:"dialog,fakeobjects",onLoad:function(){function c(b){return a.replace(/%1/g,"rtl"==b?"right":"left").replace(/%2/g,"cke_contents_"+b)}var b="background:url("+CKEDITOR.getUrl(this.path+"images"+(CKEDITOR.env.hidpi?"/hidpi":"")+"/anchor.png")+") no-repeat %1 center;border:1px dotted #00f;background-size:16px;",
-a=".%2 a.cke_anchor,.%2 a.cke_anchor_empty,.cke_editable.%2 a[name],.cke_editable.%2 a[data-cke-saved-name]{"+b+"padding-%1:18px;cursor:auto;}.%2 img.cke_anchor{"+b+"width:16px;min-height:15px;height:1.15em;vertical-align:text-bottom;}";CKEDITOR.addCss(c("ltr")+c("rtl"))},init:function(c){var b="a[!href]";CKEDITOR.dialog.isTabEnabled(c,"link","advanced")&&(b=b.replace("]",",accesskey,charset,dir,id,lang,name,rel,tabindex,title,type,download]{*}(*)"));CKEDITOR.dialog.isTabEnabled(c,"link","target")&&
-(b=b.replace("]",",target,onclick]"));c.addCommand("link",new CKEDITOR.dialogCommand("link",{allowedContent:b,requiredContent:"a[href]"}));c.addCommand("anchor",new CKEDITOR.dialogCommand("anchor",{allowedContent:"a[!name,id]",requiredContent:"a[name]"}));c.addCommand("unlink",new CKEDITOR.unlinkCommand);c.addCommand("removeAnchor",new CKEDITOR.removeAnchorCommand);c.setKeystroke(CKEDITOR.CTRL+76,"link");c.ui.addButton&&(c.ui.addButton("Link",{label:c.lang.link.toolbar,command:"link",toolbar:"links,10"}),
-c.ui.addButton("Unlink",{label:c.lang.link.unlink,command:"unlink",toolbar:"links,20"}),c.ui.addButton("Anchor",{label:c.lang.link.anchor.toolbar,command:"anchor",toolbar:"links,30"}));CKEDITOR.dialog.add("link",this.path+"dialogs/link.js");CKEDITOR.dialog.add("anchor",this.path+"dialogs/anchor.js");c.on("doubleclick",function(a){var b=a.data.element.getAscendant({a:1,img:1},!0);b&&!b.isReadOnly()&&(b.is("a")?(a.data.dialog=!b.getAttribute("name")||b.getAttribute("href")&&b.getChildCount()?"link":
-"anchor",a.data.link=b):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b)&&(a.data.dialog="anchor"))},null,null,0);c.on("doubleclick",function(a){a.data.dialog in{link:1,anchor:1}&&a.data.link&&c.getSelection().selectElement(a.data.link)},null,null,20);c.addMenuItems&&c.addMenuItems({anchor:{label:c.lang.link.anchor.menu,command:"anchor",group:"anchor",order:1},removeAnchor:{label:c.lang.link.anchor.remove,command:"removeAnchor",group:"anchor",order:5},link:{label:c.lang.link.menu,command:"link",group:"link",
-order:1},unlink:{label:c.lang.link.unlink,command:"unlink",group:"link",order:5}});c.contextMenu&&c.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;a=CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a);if(!a&&!(a=CKEDITOR.plugins.link.getSelectedLink(c)))return null;var b={};a.getAttribute("href")&&a.getChildCount()&&(b={link:CKEDITOR.TRISTATE_OFF,unlink:CKEDITOR.TRISTATE_OFF});a&&a.hasAttribute("name")&&(b.anchor=b.removeAnchor=CKEDITOR.TRISTATE_OFF);return b});this.compiledProtectionFunction=
-n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^mailto:([^?]+)(?:\?(.+))?$/,v=/subject=([^;?:@&=$,\/]*)/i,
-w=/body=([^;?:@&=$,\/]*)/i,x=/^#(.*)$/,y=/^((?:http|https|ftp|news):\/\/)?(.*)$/,z=/^(_(?:self|top|parent|blank))$/,A=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,B=/^javascript:([^(]+)\(([^)]+)\)$/,C=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,D=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,m={id:"advId",dir:"advLangDir",accessKey:"advAccessKey",name:"advName",lang:"advLangCode",tabindex:"advTabIndex",
-title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};CKEDITOR.plugins.link={getSelectedLink:function(c,b){var a=c.getSelection(),d=a.getSelectedElement(),f=a.getRanges(),e=[],g;if(!b&&d&&d.is("a"))return d;for(d=0;d<f.length;d++)if(g=a.getRanges()[d],g.shrink(CKEDITOR.SHRINK_TEXT,!1,{skipBogus:!0}),(g=c.elementPath(g.getCommonAncestor()).contains("a",1))&&b)e.push(g);else if(g)return g;return b?e:null},getEditorAnchors:function(c){for(var b=
-c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),d=[],f=0,e;e=b.getItem(f++);)(e.data("cke-saved-name")||e.hasAttribute("name"))&&d.push({name:e.data("cke-saved-name")||e.getAttribute("name"),id:e.getAttribute("id")});for(f=0;e=a.getItem(f++);)(e=this.tryRestoreFakeAnchor(c,e))&&d.push({name:e.getAttribute("name"),id:e.getAttribute("id")});return d},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,b){if(b&&b.data("cke-real-element-type")&&
-"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",d=c.plugins.link.compiledProtectionFunction,f=c.config.emailProtection,e,g={};a.match(t)&&("encode"==f?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):f&&a.replace(B,function(a,b,c){if(b==d.name){g.type="email";a=g.email=
-{};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var e=c.length,f,h,k=0;k<e;k++)f=decodeURIComponent,h=c[k].replace(b,"").replace(/\\'/g,"'"),h=f(h),f=d.params[k].toLowerCase(),a[f]=h;a.address=[a.name,a.domain].join("@")}}));if(!g.type)if(f=a.match(x))g.type="anchor",g.anchor={},g.anchor.name=g.anchor.id=f[1];else if(f=a.match(u)){e=a.match(v);a=a.match(w);g.type="email";var k=g.email={};k.address=f[1];e&&(k.subject=decodeURIComponent(e[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(e=a.match(y))&&
-(g.type="url",g.url={},g.url.protocol=e[1],g.url.url=e[2]);if(b){if(a=b.getAttribute("target"))g.target={type:a.match(z)?a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(g.target={type:"popup",name:a[1]};f=D.exec(a[2]);)"yes"!=f[2]&&"1"!=f[2]||f[1]in{height:1,width:1,top:1,left:1}?isFinite(f[2])&&(g.target[f[1]]=f[2]):g.target[f[1]]=!0;null!==b.getAttribute("download")&&(g.download=!0);var a={},h;for(h in m)(f=b.getAttribute(h))&&(a[m[h]]=f);if(h=
-b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(g.advanced=a)}return g},getLinkAttributes:function(c,b){var a=c.config.emailProtection||"",d={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",f=b.url&&CKEDITOR.tools.trim(b.url.url)||"";d["data-cke-saved-href"]=0===f.indexOf("/")?f:a+f;break;case "anchor":a=b.anchor&&b.anchor.id;d["data-cke-saved-href"]="#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var e=b.email,f=e.address;
-switch(a){case "":case "encode":var g=encodeURIComponent(e.subject||""),k=encodeURIComponent(e.body||""),e=[];g&&e.push("subject\x3d"+g);k&&e.push("body\x3d"+k);e=e.length?"?"+e.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(f)],e&&a.push("+'",p(e),"'"),a.push(")")):a=["mailto:",f,e];break;default:a=f.split("@",2),e.name=a[0],e.domain=a[1],a=["javascript:",r(c,e)]}d["data-cke-saved-href"]=a.join("")}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",
-b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),f=h.length,g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},e=0;e<f;e++)h[e]+=b.target[h[e]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");d["data-cke-pa-onclick"]=a.join("")}else"notSet"!=b.target.type&&b.target.name&&(d.target=b.target.name);b.download&&(d.download="");if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&
-(d[l]=a);d.name&&(d["data-cke-saved-name"]=d.name)}d["data-cke-saved-href"]&&(d.href=d["data-cke-saved-href"]);l={target:1,onclick:1,"data-cke-pa-onclick":1,"data-cke-saved-name":1,download:1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in d)delete l[n];return{set:d,removed:CKEDITOR.tools.objectKeys(l)}},showDisplayTextForElement:function(c,b){var a={img:1,table:1,tbody:1,thead:1,tfoot:1,input:1,select:1,textarea:1},d=b.getSelection();return b.widgets&&b.widgets.focused||d&&1<d.getRanges().length?
-!1:!c||!c.getName||!c.is(a)}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype={exec:function(c){if(CKEDITOR.env.ie){var b=c.getSelection().getRanges()[0],a=b.getPreviousEditableNode()&&b.getPreviousEditableNode().getAscendant("a",!0)||b.getNextEditableNode()&&b.getNextEditableNode().getAscendant("a",!0),d;b.collapsed&&a&&(d=b.createBookmark(),b.selectNodeContents(a),b.select())}a=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,alwaysRemoveElement:1});c.removeStyle(a);
-d&&(b.moveToBookmark(d),b.select())},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]",editorFocus:1};CKEDITOR.removeAnchorCommand=function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=c.getSelection(),a=b.createBookmarks(),d;if(b&&(d=b.getSelectedElement())&&
-(d.getChildCount()?d.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,d)))d.remove(1);else if(d=CKEDITOR.plugins.link.getSelectedLink(c))d.hasAttribute("href")?(d.removeAttributes({name:1,"data-cke-saved-name":1}),d.removeClass("cke_anchor")):d.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,linkShowTargetTab:!0})})();(function(){function I(b,m,e){function c(c){if(!(!(a=d[c?"getFirst":"getLast"]())||a.is&&a.isBlockBoundary()||!(p=m.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||p.is&&p.isBlockBoundary({br:1})))b.document.createElement("br")[c?"insertBefore":"insertAfter"](a)}for(var f=CKEDITOR.plugins.list.listToArray(m.root,e),g=[],k=0;k<m.contents.length;k++){var h=m.contents[k];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(e,
-h,"list_item_processed",!0))}h=null;for(k=0;k<g.length;k++)h=g[k].getCustomData("listarray_index"),f[h].indent=-1;for(k=h+1;k<f.length;k++)if(f[k].indent>f[k-1].indent+1){g=f[k-1].indent+1-f[k].indent;for(h=f[k].indent;f[k]&&f[k].indent>=h;)f[k].indent+=g,k++;k--}var d=CKEDITOR.plugins.list.arrayToList(f,e,null,b.config.enterMode,m.root.getAttribute("dir")).listNode,a,p;c(!0);c();d.replace(m.root);b.fire("contentDomInvalidated")}function B(b,m){this.name=b;this.context=this.type=m;this.allowedContent=
-m+" li";this.requiredContent=m}function E(b,m,e,c){for(var f,g;f=b[c?"getLast":"getFirst"](J);)(g=f.getDirection(1))!==m.getDirection(1)&&f.setAttribute("dir",g),f.remove(),e?f[c?"insertBefore":"insertAfter"](e):m.append(f,c)}function F(b){function m(e){var c=b[e?"getPrevious":"getNext"](u);c&&c.type==CKEDITOR.NODE_ELEMENT&&c.is(b.getName())&&(E(b,c,null,!e),b.remove(),b=c)}m();m(1)}function G(b){return b.type==CKEDITOR.NODE_ELEMENT&&(b.getName()in CKEDITOR.dtd.$block||b.getName()in CKEDITOR.dtd.$listItem)&&
-CKEDITOR.dtd[b.getName()]["#"]}function C(b,m,e){b.fire("saveSnapshot");e.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var c=e.extractContents();m.trim(!1,!0);var f=m.createBookmark(),g=new CKEDITOR.dom.elementPath(m.startContainer),k=g.block,g=g.lastElement.getAscendant("li",1)||k,h=new CKEDITOR.dom.elementPath(e.startContainer),d=h.contains(CKEDITOR.dtd.$listItem),h=h.contains(CKEDITOR.dtd.$list);k?(k=k.getBogus())&&k.remove():h&&(k=h.getPrevious(u))&&z(k)&&k.remove();(k=c.getLast())&&k.type==CKEDITOR.NODE_ELEMENT&&
-k.is("br")&&k.remove();(k=m.startContainer.getChild(m.startOffset))?c.insertBefore(k):m.startContainer.append(c);d&&(c=A(d))&&(g.contains(d)?(E(c,d.getParent(),d),c.remove()):g.append(c));for(;e.checkStartOfBlock()&&e.checkEndOfBlock();){h=e.startPath();c=h.block;if(!c)break;c.is("li")&&(g=c.getParent(),c.equals(g.getLast(u))&&c.equals(g.getFirst(u))&&(c=g));e.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove()}e=e.clone();c=b.editable();e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);
-e.evaluator=function(a){return u(a)&&!z(a)};(e=e.next())&&e.type==CKEDITOR.NODE_ELEMENT&&e.getName()in CKEDITOR.dtd.$list&&F(e);m.moveToBookmark(f);m.select();b.fire("saveSnapshot")}function A(b){return(b=b.getLast(u))&&b.type==CKEDITOR.NODE_ELEMENT&&b.getName()in v?b:null}var v={ol:1,ul:1},K=CKEDITOR.dom.walker.whitespaces(),H=CKEDITOR.dom.walker.bookmark(),u=function(b){return!(K(b)||H(b))},z=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(b,m,e,c,f){if(!v[b.getName()])return[];
-c||(c=0);e||(e=[]);for(var g=0,k=b.getChildCount();g<k;g++){var h=b.getChild(g);h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in CKEDITOR.dtd.$list&&CKEDITOR.plugins.list.listToArray(h,m,e,c+1);if("li"==h.$.nodeName.toLowerCase()){var d={parent:b,indent:c,element:h,contents:[]};f?d.grandparent=f:(d.grandparent=b.getParent(),d.grandparent&&"li"==d.grandparent.$.nodeName.toLowerCase()&&(d.grandparent=d.grandparent.getParent()));m&&CKEDITOR.dom.element.setMarker(m,h,"listarray_index",e.length);e.push(d);
-for(var a=0,p=h.getChildCount(),l;a<p;a++)l=h.getChild(a),l.type==CKEDITOR.NODE_ELEMENT&&v[l.getName()]?CKEDITOR.plugins.list.listToArray(l,m,e,c+1,d.grandparent):d.contents.push(l)}}return e},arrayToList:function(b,m,e,c,f){e||(e=0);if(!b||b.length<e+1)return null;for(var g,k=b[e].parent.getDocument(),h=new CKEDITOR.dom.documentFragment(k),d=null,a=e,p=Math.max(b[e].indent,0),l=null,q,n,t=c==CKEDITOR.ENTER_P?"p":"div";;){var r=b[a];g=r.grandparent;q=r.element.getDirection(1);if(r.indent==p){d&&b[a].parent.getName()==
-d.getName()||(d=b[a].parent.clone(!1,1),f&&d.setAttribute("dir",f),h.append(d));l=d.append(r.element.clone(0,1));q!=d.getDirection(1)&&l.setAttribute("dir",q);for(g=0;g<r.contents.length;g++)l.append(r.contents[g].clone(1,1));a++}else if(r.indent==Math.max(p,0)+1)r=b[a-1].element.getDirection(1),a=CKEDITOR.plugins.list.arrayToList(b,null,a,c,r!=q?q:null),!l.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=k.$.documentMode&&l.append(k.createText(" ")),l.append(a.listNode),a=a.nextIndex;else if(-1==
-r.indent&&!e&&g){v[g.getName()]?(l=r.element.clone(!1,!0),q!=g.getDirection(1)&&l.setAttribute("dir",q)):l=new CKEDITOR.dom.documentFragment(k);var d=g.getDirection(1)!=q,y=r.element,D=y.getAttribute("class"),z=y.getAttribute("style"),A=l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(c!=CKEDITOR.ENTER_BR||d||z||D),w,B=r.contents.length,x;for(g=0;g<B;g++)if(w=r.contents[g],H(w)&&1<B)A?x=w.clone(1,1):l.append(w.clone(1,1));else if(w.type==CKEDITOR.NODE_ELEMENT&&w.isBlockBoundary()){d&&!w.getDirection()&&
-w.setAttribute("dir",q);n=w;var C=y.getAttribute("style");C&&n.setAttribute("style",C.replace(/([^;])$/,"$1;")+(n.getAttribute("style")||""));D&&w.addClass(D);n=null;x&&(l.append(x),x=null);l.append(w.clone(1,1))}else A?(n||(n=k.createElement(t),l.append(n),d&&n.setAttribute("dir",q)),z&&n.setAttribute("style",z),D&&n.setAttribute("class",D),x&&(n.append(x),x=null),n.append(w.clone(1,1))):l.append(w.clone(1,1));x&&((n||l).append(x),x=null);l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&a!=b.length-1&&(CKEDITOR.env.needsBrFiller&&
-(q=l.getLast())&&q.type==CKEDITOR.NODE_ELEMENT&&q.is("br")&&q.remove(),(q=l.getLast(u))&&q.type==CKEDITOR.NODE_ELEMENT&&q.is(CKEDITOR.dtd.$block)||l.append(k.createElement("br")));q=l.$.nodeName.toLowerCase();"div"!=q&&"p"!=q||l.appendBogus();h.append(l);d=null;a++}else return null;n=null;if(b.length<=a||Math.max(b[a].indent,0)<p)break}if(m)for(b=h.getFirst();b;){if(b.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(m,b),b.getName()in CKEDITOR.dtd.$listItem&&(e=b,k=f=c=void 0,c=e.getDirection()))){for(f=
-e.getParent();f&&!(k=f.getDirection());)f=f.getParent();c==k&&e.removeAttribute("dir")}b=b.getNextSourceNode()}return{listNode:h,nextIndex:a}}};var L=/^h[1-6]$/,J=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);B.prototype={exec:function(b){this.refresh(b,b.elementPath());var m=b.config,e=b.getSelection(),c=e&&e.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var f=b.editable();if(f.getFirst(u)){var g=1==c.length&&c[0];(m=g&&g.getEnclosedNode())&&m.is&&this.type==m.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else m.enterMode==
-CKEDITOR.ENTER_BR?f.appendBogus():c[0].fixBlock(1,m.enterMode==CKEDITOR.ENTER_P?"p":"div"),e.selectRanges(c)}for(var m=e.createBookmarks(!0),f=[],k={},c=c.createIterator(),h=0;(g=c.getNextRange())&&++h;){var d=g.getBoundaryNodes(),a=d.startNode,p=d.endNode;a.type==CKEDITOR.NODE_ELEMENT&&"td"==a.getName()&&g.setStartAt(d.startNode,CKEDITOR.POSITION_AFTER_START);p.type==CKEDITOR.NODE_ELEMENT&&"td"==p.getName()&&g.setEndAt(d.endNode,CKEDITOR.POSITION_BEFORE_END);g=g.createIterator();for(g.forceBrBreak=
-this.state==CKEDITOR.TRISTATE_OFF;d=g.getNextParagraph();)if(!d.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(k,d,"list_block",1);for(var l=b.elementPath(d),a=l.elements,p=0,l=l.blockLimit,q,n=a.length-1;0<=n&&(q=a[n]);n--)if(v[q.getName()]&&l.contains(q)){l.removeCustomData("list_group_object_"+h);(a=q.getCustomData("list_group_object"))?a.contents.push(d):(a={root:q,contents:[d]},f.push(a),CKEDITOR.dom.element.setMarker(k,q,"list_group_object",a));p=1;break}p||(p=l,p.getCustomData("list_group_object_"+
-h)?p.getCustomData("list_group_object_"+h).contents.push(d):(a={root:p,contents:[d]},CKEDITOR.dom.element.setMarker(k,p,"list_group_object_"+h,a),f.push(a)))}}for(q=[];0<f.length;)if(a=f.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(v[a.root.getName()]){c=b;h=a;a=k;g=q;p=CKEDITOR.plugins.list.listToArray(h.root,a);l=[];for(d=0;d<h.contents.length;d++)n=h.contents[d],(n=n.getAscendant("li",!0))&&!n.getCustomData("list_item_processed")&&(l.push(n),CKEDITOR.dom.element.setMarker(a,n,"list_item_processed",
-!0));for(var n=h.root.getDocument(),t=void 0,r=void 0,d=0;d<l.length;d++){var y=l[d].getCustomData("listarray_index"),t=p[y].parent;t.is(this.type)||(r=n.createElement(this.type),t.copyAttributes(r,{start:1,type:1}),r.removeStyle("list-style-type"),p[y].parent=r)}a=CKEDITOR.plugins.list.arrayToList(p,a,null,c.config.enterMode);p=void 0;l=a.listNode.getChildCount();for(d=0;d<l&&(p=a.listNode.getChild(d));d++)p.getName()==this.type&&g.push(p);a.listNode.replace(h.root);c.fire("contentDomInvalidated")}else{p=
-b;g=a;d=q;l=g.contents;c=g.root.getDocument();h=[];1==l.length&&l[0].equals(g.root)&&(a=c.createElement("div"),l[0].moveChildren&&l[0].moveChildren(a),l[0].append(a),l[0]=a);g=g.contents[0].getParent();for(n=0;n<l.length;n++)g=g.getCommonAncestor(l[n].getParent());t=p.config.useComputedState;p=a=void 0;t=void 0===t||t;for(n=0;n<l.length;n++)for(r=l[n];y=r.getParent();){if(y.equals(g)){h.push(r);!p&&r.getDirection()&&(p=1);r=r.getDirection(t);null!==a&&(a=a&&a!=r?null:r);break}r=y}if(!(1>h.length)){l=
-h[h.length-1].getNext();n=c.createElement(this.type);d.push(n);for(t=d=void 0;h.length;)d=h.shift(),t=c.createElement("li"),r=d,r.is("pre")||L.test(r.getName())||"false"==r.getAttribute("contenteditable")?d.appendTo(t):(d.copyAttributes(t),a&&d.getDirection()&&(t.removeStyle("direction"),t.removeAttribute("dir")),d.moveChildren(t),d.remove()),t.appendTo(n);a&&p&&n.setAttribute("dir",a);l?n.insertBefore(l):n.appendTo(g)}}else this.state==CKEDITOR.TRISTATE_ON&&v[a.root.getName()]&&I.call(this,b,a,k);
-for(n=0;n<q.length;n++)F(q[n]);CKEDITOR.dom.element.clearAllMarkers(k);e.selectBookmarks(m);b.focus()},refresh:function(b,m){var e=m.contains(v,1),c=m.blockLimit||m.root;e&&c.contains(e)?this.setState(e.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(b){b.blockless||(b.addCommand("numberedlist",new B("numberedlist","ol")),b.addCommand("bulletedlist",new B("bulletedlist","ul")),b.ui.addButton&&
-(b.ui.addButton("NumberedList",{label:b.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),b.ui.addButton("BulletedList",{label:b.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),b.on("key",function(m){var e=m.data.domEvent.getKey(),c;if("wysiwyg"==b.mode&&e in{8:1,46:1}){var f=b.getSelection().getRanges()[0],g=f&&f.startPath();if(f&&f.collapsed){var k=8==e,h=b.editable(),d=new CKEDITOR.dom.walker(f.clone());d.evaluator=function(a){return u(a)&&
-!z(a)};d.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};e=f.clone();if(k){var a;(a=g.contains(v))&&f.checkBoundaryOfElement(a,CKEDITOR.START)&&(a=a.getParent())&&a.is("li")&&(a=A(a))?(c=a,a=a.getPrevious(u),e.moveToPosition(a&&z(a)?a:c,CKEDITOR.POSITION_BEFORE_START)):(d.range.setStartAt(h,CKEDITOR.POSITION_AFTER_START),d.range.setEnd(f.startContainer,f.startOffset),(a=d.previous())&&a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in v||a.is("li"))&&(a.is("li")||(d.range.selectNodeContents(a),
-d.reset(),d.evaluator=G,a=d.previous()),c=a,e.moveToElementEditEnd(c),e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END)));if(c)C(b,e,f),m.cancel();else{var p=g.contains(v);p&&f.checkBoundaryOfElement(p,CKEDITOR.START)&&(c=p.getFirst(u),f.checkBoundaryOfElement(c,CKEDITOR.START)&&(a=p.getPrevious(u),A(c)?a&&(f.moveToElementEditEnd(a),f.select()):b.execCommand("outdent"),m.cancel()))}}else if(c=g.contains("li")){if(d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),k=(h=c.getLast(u))&&
-G(h)?h:c,g=0,(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in v&&a.equals(h)?(g=1,a=d.next()):f.checkBoundaryOfElement(k,CKEDITOR.END)&&(g=2),g&&a){f=f.clone();f.moveToElementEditStart(a);if(1==g&&(e.optimize(),!e.startContainer.equals(c))){for(c=e.startContainer;c.is(CKEDITOR.dtd.$inline);)p=c,c=c.getParent();p&&e.moveToPosition(p,CKEDITOR.POSITION_AFTER_END)}2==g&&(e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END),f.endPath().block&&f.moveToPosition(f.endPath().block,CKEDITOR.POSITION_AFTER_START));
-C(b,e,f);m.cancel()}}else d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.is(v)&&(a=a.getFirst(u),g.block&&f.checkStartOfBlock()&&f.checkEndOfBlock()?(g.block.remove(),f.moveToElementEditStart(a),f.select()):A(a)?(f.moveToElementEditStart(a),f.select()):(f=f.clone(),f.moveToElementEditStart(a),C(b,e,f)),m.cancel());setTimeout(function(){b.selectionChange(1)})}}}))}})})();CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}});
-CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),e=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,m=a.getSelection().getRanges(),n=m.createIterator(),p=function(a){return a.type==CKEDITOR.NODE_ELEMENT},c;c=n.getNextRange();){c.collapsed||c.enlarge(CKEDITOR.ENLARGE_ELEMENT);
-var l=c.createBookmark(),b=l.startNode,d=l.endNode,k=function(b){for(var c=a.elementPath(b),e=c.elements,d=1,g;(g=e[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&f(a,g)&&b.breakParent(g)};k(b);if(d)for(k(d),b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(d);)if(b.isReadOnly()){if(b.getPosition(d)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(p)}else k=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==b.getName()&&b.data("cke-realelement")||!f(a,b)||(h.test(b.getName())?
-b.remove(1):(b.removeAttributes(e),a.fire("removeFormatCleanup",b))),b=k;c.moveToBookmark(l)}a.forceNextSelectionCheck();a.getSelection().selectRanges(m)}}},filter:function(a,h){for(var e=a._.removeFormatFilters||[],f=0;f<e.length;f++)if(!1===e[f](h))return!1;return!0}};CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)};CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var";
-CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign";CKEDITOR.plugins.add("sourcedialog",{requires:"dialog",init:function(a){a.addCommand("sourcedialog",new CKEDITOR.dialogCommand("sourcedialog"));CKEDITOR.dialog.add("sourcedialog",this.path+"dialogs/sourcedialog.js");a.ui.addButton&&a.ui.addButton("Sourcedialog",{label:a.lang.sourcedialog.toolbar,command:"sourcedialog",toolbar:"mode,10"})}});CKEDITOR.config.plugins='basicstyles,notification,button,toolbar,clipboard,enterkey,entities,floatingspace,horizontalrule,indent,indentlist,dialogui,dialog,fakeobjects,link,list,removeformat,sourcedialog';CKEDITOR.config.skin='moono-lisa';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('bold,0,,italic,24,,strike,48,,subscript,72,,superscript,96,,underline,120,,copy-rtl,144,,copy,168,,cut-rtl,192,,cut,216,,paste-rtl,240,,paste,264,,horizontalrule,288,,indent-rtl,312,,indent,336,,outdent-rtl,360,,outdent,384,,anchor-rtl,408,,anchor,432,,link,456,,unlink,480,,bulletedlist-rtl,504,,bulletedlist,528,,numberedlist-rtl,552,,numberedlist,576,,removeformat,600,,sourcedialog-rtl,624,,sourcedialog,648,','icons_hidpi.png');else setIcons('bold,0,auto,italic,24,auto,strike,48,auto,subscript,72,auto,superscript,96,auto,underline,120,auto,copy-rtl,144,auto,copy,168,auto,cut-rtl,192,auto,cut,216,auto,paste-rtl,240,auto,paste,264,auto,horizontalrule,288,auto,indent-rtl,312,auto,indent,336,auto,outdent-rtl,360,auto,outdent,384,auto,anchor-rtl,408,auto,anchor,432,auto,link,456,auto,unlink,480,auto,bulletedlist-rtl,504,auto,bulletedlist,528,auto,numberedlist-rtl,552,auto,numberedlist,576,auto,removeformat,600,auto,sourcedialog-rtl,624,auto,sourcedialog,648,auto','icons.png');})();CKEDITOR.lang.languages={"en":1,"de":1};}());
diff --git a/js/ckeditor/config.js b/js/ckeditor/config.js
deleted file mode 100644
index 13c398ad2..000000000
--- a/js/ckeditor/config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-CKEDITOR.editorConfig = function( config ) {
-	// Simplify the dialog windows.
-	config.removeDialogTabs = 'image:advanced;link:advanced';
-};
diff --git a/js/ckeditor/contents.css b/js/ckeditor/contents.css
deleted file mode 100644
index 920f2cad9..000000000
--- a/js/ckeditor/contents.css
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-
-body
-{
-	/* Font */
-	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
-	font-size: 12px;
-
-	/* Text color */
-	color: #333;
-
-	/* Remove the background color to make it transparent */
-	background-color: #fff;
-
-	margin: 20px;
-}
-
-.cke_editable
-{
-	font-size: 13px;
-	line-height: 1.6;
-
-	/* Fix for missing scrollbars with RTL texts. (#10488) */
-	word-wrap: break-word;
-}
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-a
-{
-	color: #0782C1;
-}
-
-ol,ul,dl
-{
-	/* IE7: reset rtl list margin. (#7334) */
-	*margin-right: 0px;
-	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
-	padding: 0 40px;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-weight: normal;
-	line-height: 1.2;
-}
-
-hr
-{
-	border: 0px;
-	border-top: 1px solid #ccc;
-}
-
-img.right
-{
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left
-{
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
-
-span[lang]
-{
-	font-style: italic;
-}
-
-figure
-{
-	text-align: center;
-	border: solid 1px #ccc;
-	border-radius: 2px;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: inline-block;
-}
-
-figure > figcaption
-{
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
-a > img {
-	padding: 1px;
-	margin: 1px;
-	border: none;
-	outline: 1px solid #0782C1;
-}
-
-/* Widget Styles */
-.code-featured
-{
-	border: 5px solid red;
-}
-
-.math-featured
-{
-	padding: 20px;
-	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
-	background-color: rgba(255, 0, 0, 0.05);
-	margin: 10px;
-}
-
-.image-clean
-{
-	border: 0;
-	background: none;
-	padding: 0;
-}
-
-.image-clean > figcaption
-{
-	font-size: .9em;
-	text-align: right;
-}
-
-.image-grayscale
-{
-	background-color: white;
-	color: #666;
-}
-
-.image-grayscale img, img.image-grayscale
-{
-	filter: grayscale(100%);
-}
-
-.embed-240p
-{
-	max-width: 426px;
-	max-height: 240px;
-	margin:0 auto;
-}
-
-.embed-360p
-{
-	max-width: 640px;
-	max-height: 360px;
-	margin:0 auto;
-}
-
-.embed-480p
-{
-	max-width: 854px;
-	max-height: 480px;
-	margin:0 auto;
-}
-
-.embed-720p
-{
-	max-width: 1280px;
-	max-height: 720px;
-	margin:0 auto;
-}
-
-.embed-1080p
-{
-	max-width: 1920px;
-	max-height: 1080px;
-	margin:0 auto;
-}
diff --git a/js/ckeditor/lang/de.js b/js/ckeditor/lang/de.js
deleted file mode 100644
index cf8a6d9b5..000000000
--- a/js/ckeditor/lang/de.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verloren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"notification":{"closed":"Benachrichtigung geschlossen."},"button":{"selectedLabel":"%1 (Ausgewählt)"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteNotification":"Ihr Browser verhindert das Einfügen über diesen Weg. Zum einfügen drücken Sie %1."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"removeformat":{"toolbar":"Formatierung entfernen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/en.js b/js/ckeditor/lang/en.js
deleted file mode 100644
index 897fa47c4..000000000
--- a/js/ckeditor/lang/en.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"notification":{"closed":"Notification closed."},"button":{"selectedLabel":"%1 (Selected)"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Your browser doesn't allow you to paste this way. Press %1 to paste."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"removeformat":{"toolbar":"Remove Format"},"sourcedialog":{"toolbar":"Source","title":"Source"}};
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/css/codemirror.min.css b/js/ckeditor/plugins/codemirror/css/codemirror.min.css
deleted file mode 100644
index dfd7af09c..000000000
--- a/js/ckeditor/plugins/codemirror/css/codemirror.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.CodeMirror{font-family:monospace;height:300px;color:black}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color:white}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:black}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid black;border-right:0;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:blue}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:bold}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:#f00}.cm-invalidchar{color:#f00}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0f0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#f22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:white}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:none!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:transparent;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;overflow:auto}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background:#ffa;background:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0}.CodeMirror{font:13px/1.4em monospace;text-align:left}.CodeMirror .activeline{background:#e8f2ff}.CodeMirror .CodeMirror-foldmarker{color:blue;-ms-text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;-webkit-text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-matchingtag{background:#ff9600;background:rgba(255,150,0,0.3)}.searchCodeButton span,.autoFormat span,.CommentSelectedRange span,.UncommentSelectedRange span{width:16px;height:16px;margin-left:6px}.searchCodeButton span{background:url("../icons/searchcode.png") no-repeat}.autoFormat span{background:url("../icons/autoformat.png") no-repeat}.CommentSelectedRange span{background:url("../icons/commentselectedrange.png") no-repeat}.UncommentSelectedRange span{background:url("../icons/uncommentselectedrange.png") no-repeat}.cke_reset_all .CodeMirror-scroll *{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.cke_reset_all .cm-s-cobalt *,.cke_reset_all .cm-s-erlang-dark *,.cke_reset_all .cm-s-lesser-dark *,.cke_reset_all .cm-s-monokai *,.cke_reset_all .cm-s-night *,.cke_reset_all .cm-s-rubyblue *,.cke_reset_all .cm-s-twilight *,.cke_reset_all .cm-s-xq-dark *,.cke_reset_all .cm-s-base16-dark *,.cke_reset_all .cm-s-3024-night *,.cke_reset_all .cm-s-the-matrix *,.cke_reset_all .cm-s-paraiso-dark *,.cke_reset_all .cm-s-paraiso-light *{color:inherit;font:inherit}.cm-s-cobalt .CodeMirror-selected{background:#b36539!important}.cm-s-erlang-dark .CodeMirror-selected{background:#b36539!important}.cm-s-lesser-dark .CodeMirror-selected{background:#45443b!important}.cm-s-monokai .CodeMirror-selected{background:#49483e!important}.cm-s-night .CodeMirror-selected{background:#447!important}.cm-s-rubyblue .CodeMirror-selected{background:#38566f!important}.cm-s-twilight .CodeMirror-selected{background:#323232!important}.cm-s-xq-dark .CodeMirror-selected{background:#a8f!important}.cm-s-the-matrix .CodeMirror-selected{background:#494949!important}.cm-s-mbo .CodeMirror-selected{background:#716c62!important}.cm-s-blackboard .activeline,.cm-s-cobalt .activeline,.cm-s-erlang-dark .activeline,.cm-s-lesser-dark .activeline,.cm-s-monokai .activeline,.cm-s-night .activeline,.cm-s-rubyblue .activeline,.cm-s-vibrant-ink .activeline,.cm-s-xq-dark .activeline,.cm-s-base16-dark .activeline,.cm-s-3024-night .activeline,.cm-s-paraiso-light .activeline,.cm-s-paraiso-dark .activeline,.cm-s-pastel-on-dark .activeline{background:#757575}.cm-s-pastel-on-dark .activeline{background:#404040}.cm-s-mbo .activeline{background:#716c62}.cm-s-twilight .activeline{background:#494949}.cm-s-the-matrix .activeline{background:#060}.CodeMirror-focused .cm-matchhighlight{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);background-position:bottom;background-repeat:repeat-x}.CodeMirror-hints{position:absolute;z-index:10;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px #000;-ms-box-shadow:2px 3px 5px #000;box-shadow:2px 3px 5px #000;border-radius:3px;border:1px solid silver;background:white;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;max-width:19em;overflow:hidden;white-space:pre;color:black;cursor:pointer}.CodeMirror-hint-active{background:#08f;color:white}.cm-trailingspace{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.1em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:0;outline:0;background:transparent;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}.CodeMirror-foldmarker{color:blue;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-open,.CodeMirror-foldgutter-folded{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}
diff --git a/js/ckeditor/plugins/codemirror/js/beautify.min.js b/js/ckeditor/plugins/codemirror/js/beautify.min.js
deleted file mode 100644
index 33cdfb6af..000000000
--- a/js/ckeditor/plugins/codemirror/js/beautify.min.js
+++ /dev/null
@@ -1,75 +0,0 @@
-!function(){function f(a,l){for(var d=0;d<l.length;d+=1)if(l[d]===a)return!0;return!1}function x(a,l){return(new I(a,l)).beautify()}function I(r,l){function w(c,b){var e=0;return c&&(e=c.indentation_level,!g.just_added_newline()&&c.line_indent_level>e&&(e=c.line_indent_level)),{mode:b,parent:c,last_text:c?c.last_text:"",last_word:c?c.last_word:"",declaration_statement:!1,declaration_assignment:!1,multiline_frame:!1,if_block:!1,else_block:!1,do_block:!1,do_while:!1,in_case_statement:!1,in_case:!1,
-case_body:!1,indentation_level:e,line_indent_level:c?c.line_indent_level:e,start_line_index:g.get_line_number(),ternary_depth:0}}function p(b){var e=b.newlines;if(m.keep_array_indentation&&c.mode===a.ArrayLiteral)for(g=0;g<e;g+=1)q(0<g);else if(m.max_preserve_newlines&&e>m.max_preserve_newlines&&(e=m.max_preserve_newlines),m.preserve_newlines&&1<b.newlines){q();for(var g=1;g<e;g+=1)q(!0)}h=b;O[h.type]()}function B(c){(c=void 0!==c&&c,g.just_added_newline())||(m.preserve_newlines&&h.wanted_newline||
-c?q(!1,!0):m.wrap_line_length&&g.current_line.get_character_count()+h.text.length+(g.space_before_token?1:0)>=m.wrap_line_length&&q(!1,!0))}function q(b,e){if(!e&&";"!==c.last_text&&","!==c.last_text&&"\x3d"!==c.last_text&&"TK_OPERATOR"!==k)for(;c.mode===a.Statement&&!c.if_block&&!c.do_block;)z();g.add_new_line(b)&&(c.multiline_frame=!0)}function K(){g.just_added_newline()&&(m.keep_array_indentation&&c.mode===a.ArrayLiteral&&h.wanted_newline?(g.current_line.push(h.whitespace_before),g.space_before_token=
-!1):g.set_indent(c.indentation_level)&&(c.line_indent_level=c.indentation_level))}function t(c){if(g.raw)return void g.add_raw_token(h);m.comma_first&&"TK_COMMA"===k&&g.just_added_newline()&&","===g.previous_line.last()&&(g.previous_line.pop(),K(),g.add_token(","),g.space_before_token=!0);c=c||h.text;K();g.add_token(c)}function D(b){c?(N.push(c),e=c):e=w(null,b);c=w(e,b)}function E(c){return f(c,[a.Expression,a.ForInitializer,a.Conditional])}function z(){0<N.length&&(e=c,c=N.pop(),e.mode===a.Statement&&
-g.remove_redundant_indentation(e))}function C(){return c.parent.mode===a.ObjectLiteral&&c.mode===a.Statement&&(":"===c.last_text&&0===c.ternary_depth||"TK_RESERVED"===k&&f(c.last_text,["get","set"]))}function b(){var b;if(b=!!("TK_RESERVED"===k&&f(c.last_text,["var","let","const"])&&"TK_WORD"===h.type||"TK_RESERVED"===k&&"do"===c.last_text||"TK_RESERVED"===k&&"return"===c.last_text&&!h.wanted_newline||"TK_RESERVED"===k&&"else"===c.last_text&&("TK_RESERVED"!==h.type||"if"!==h.text)||"TK_END_EXPR"===
-k&&(e.mode===a.ForInitializer||e.mode===a.Conditional)||"TK_WORD"===k&&c.mode===a.BlockStatement&&!c.in_case&&"--"!==h.text&&"++"!==h.text&&"function"!==G&&"TK_WORD"!==h.type&&"TK_RESERVED"!==h.type||c.mode===a.ObjectLiteral&&(":"===c.last_text&&0===c.ternary_depth||"TK_RESERVED"===k&&f(c.last_text,["get","set"]))))D(a.Statement),c.indentation_level+=1,b=("TK_RESERVED"===k&&f(c.last_text,["var","let","const"])&&"TK_WORD"===h.type&&(c.declaration_statement=!0),C()||B("TK_RESERVED"===h.type&&f(h.text,
-["do","for","if","while"])),!0);return b}function u(c){return f(c,"case return do if throw else".split(" "))}function y(c){c=L+(c||0);return 0>c||c>=x.length?null:x[c]}function F(){("TK_RESERVED"===h.type&&c.mode!==a.ObjectLiteral&&f(h.text,["set","get"])&&(h.type="TK_WORD"),"TK_RESERVED"===h.type&&c.mode===a.ObjectLiteral)&&":"==y(1).text&&(h.type="TK_WORD");if(b()||!h.wanted_newline||E(c.mode)||"TK_OPERATOR"===k&&"--"!==c.last_text&&"++"!==c.last_text||"TK_EQUALS"===k||!m.preserve_newlines&&"TK_RESERVED"===
-k&&f(c.last_text,["var","let","const","set","get"])||q(),c.do_block&&!c.do_while){if("TK_RESERVED"===h.type&&"while"===h.text)return g.space_before_token=!0,t(),g.space_before_token=!0,void(c.do_while=!0);q();c.do_block=!1}if(c.if_block)if(c.else_block||"TK_RESERVED"!==h.type||"else"!==h.text){for(;c.mode===a.Statement;)z();c.if_block=!1;c.else_block=!1}else c.else_block=!0;if("TK_RESERVED"===h.type&&("case"===h.text||"default"===h.text&&c.in_case_statement)){q();if(c.case_body||m.jslint_happy)0<
-c.indentation_level&&(!c.parent||c.indentation_level>c.parent.indentation_level)&&--c.indentation_level,c.case_body=!1;return t(),c.in_case=!0,void(c.in_case_statement=!0)}if("TK_RESERVED"===h.type&&"function"===h.text&&((f(c.last_text,["}",";"])||g.just_added_newline()&&!f(c.last_text,["[","{",":","\x3d",","]))&&(g.just_added_blankline()||h.comments_before.length||(q(),q(!0))),"TK_RESERVED"===k||"TK_WORD"===k?"TK_RESERVED"===k&&f(c.last_text,"get set new return export async".split(" "))?g.space_before_token=
-!0:"TK_RESERVED"===k&&"default"===c.last_text&&"export"===G?g.space_before_token=!0:q():"TK_OPERATOR"===k||"\x3d"===c.last_text?g.space_before_token=!0:(c.multiline_frame||!E(c.mode)&&c.mode!==a.ArrayLiteral)&&q()),"TK_COMMA"!==k&&"TK_START_EXPR"!==k&&"TK_EQUALS"!==k&&"TK_OPERATOR"!==k||C()||B(),"TK_RESERVED"===h.type&&f(h.text,["function","get","set"]))return t(),void(c.last_word=h.text);(v="NONE","TK_END_BLOCK"===k?"TK_RESERVED"===h.type&&f(h.text,["else","catch","finally"])?"expand"===m.brace_style||
-"end-expand"===m.brace_style||"none"===m.brace_style&&h.wanted_newline?v="NEWLINE":(v="SPACE",g.space_before_token=!0):v="NEWLINE":"TK_SEMICOLON"===k&&c.mode===a.BlockStatement?v="NEWLINE":"TK_SEMICOLON"===k&&E(c.mode)?v="SPACE":"TK_STRING"===k?v="NEWLINE":"TK_RESERVED"===k||"TK_WORD"===k||"*"===c.last_text&&"function"===G?v="SPACE":"TK_START_BLOCK"===k?v="NEWLINE":"TK_END_EXPR"===k&&(g.space_before_token=!0,v="NEWLINE"),"TK_RESERVED"===h.type&&f(h.text,H.line_starters)&&")"!==c.last_text&&(v="else"===
-c.last_text||"export"===c.last_text?"SPACE":"NEWLINE"),"TK_RESERVED"===h.type&&f(h.text,["else","catch","finally"]))?"TK_END_BLOCK"!==k||"expand"===m.brace_style||"end-expand"===m.brace_style||"none"===m.brace_style&&h.wanted_newline?q():(g.trim(!0),"}"!==g.current_line.last()&&q(),g.space_before_token=!0):"NEWLINE"===v?"TK_RESERVED"===k&&u(c.last_text)?g.space_before_token=!0:"TK_END_EXPR"!==k?"TK_START_EXPR"===k&&"TK_RESERVED"===h.type&&f(h.text,["var","let","const"])||":"===c.last_text||("TK_RESERVED"===
-h.type&&"if"===h.text&&"else"===c.last_text?g.space_before_token=!0:q()):"TK_RESERVED"===h.type&&f(h.text,H.line_starters)&&")"!==c.last_text&&q():c.multiline_frame&&c.mode===a.ArrayLiteral&&","===c.last_text&&"}"===G?q():"SPACE"===v&&(g.space_before_token=!0);t();c.last_word=h.text;"TK_RESERVED"===h.type&&"do"===h.text&&(c.do_block=!0);"TK_RESERVED"===h.type&&"if"===h.text&&(c.if_block=!0)}var g,L,H,h,k,G,n,c,e,N,v,O,m,x=[],J="";O={TK_START_EXPR:function(){b();var e=a.Expression;if("["===h.text){if("TK_WORD"===
-k||")"===c.last_text)return"TK_RESERVED"===k&&f(c.last_text,H.line_starters)&&(g.space_before_token=!0),D(e),t(),c.indentation_level+=1,void(m.space_in_paren&&(g.space_before_token=!0));e=a.ArrayLiteral;c.mode===a.ArrayLiteral&&("["!==c.last_text&&(","!==c.last_text||"]"!==G&&"}"!==G)||m.keep_array_indentation||q())}else"TK_RESERVED"===k&&"for"===c.last_text?e=a.ForInitializer:"TK_RESERVED"===k&&f(c.last_text,["if","while"])&&(e=a.Conditional);";"===c.last_text||"TK_START_BLOCK"===k?q():"TK_END_EXPR"===
-k||"TK_START_EXPR"===k||"TK_END_BLOCK"===k||"."===c.last_text?B(h.wanted_newline):"TK_RESERVED"===k&&"("===h.text||"TK_WORD"===k||"TK_OPERATOR"===k?"TK_RESERVED"===k&&("function"===c.last_word||"typeof"===c.last_word)||"*"===c.last_text&&"function"===G?m.space_after_anon_function&&(g.space_before_token=!0):"TK_RESERVED"!==k||!f(c.last_text,H.line_starters)&&"catch"!==c.last_text||m.space_before_conditional&&(g.space_before_token=!0):g.space_before_token=!0;"("===h.text&&"TK_RESERVED"===k&&"await"===
-c.last_word&&(g.space_before_token=!0);"("===h.text&&("TK_EQUALS"!==k&&"TK_OPERATOR"!==k||C()||B());D(e);t();m.space_in_paren&&(g.space_before_token=!0);c.indentation_level+=1},TK_END_EXPR:function(){for(;c.mode===a.Statement;)z();c.multiline_frame&&B("]"===h.text&&c.mode===a.ArrayLiteral&&!m.keep_array_indentation);m.space_in_paren&&("TK_START_EXPR"!==k||m.space_in_empty_paren?g.space_before_token=!0:(g.trim(),g.space_before_token=!1));"]"===h.text&&m.keep_array_indentation?(t(),z()):(z(),t());g.remove_redundant_indentation(e);
-c.do_while&&e.mode===a.Conditional&&(e.mode=a.Expression,c.do_block=!1,c.do_while=!1)},TK_START_BLOCK:function(){var b=y(1),r=y(2);D(r&&(":"===r.text&&f(b.type,["TK_STRING","TK_WORD","TK_RESERVED"])||f(b.text,["get","set"])&&f(r.type,["TK_WORD","TK_RESERVED"]))?f(G,["class","interface"])?a.BlockStatement:a.ObjectLiteral:a.BlockStatement);b=!b.comments_before.length&&"}"===b.text&&"function"===c.last_word&&"TK_END_EXPR"===k;"expand"===m.brace_style||"none"===m.brace_style&&h.wanted_newline?"TK_OPERATOR"!==
-k&&(b||"TK_EQUALS"===k||"TK_RESERVED"===k&&u(c.last_text)&&"else"!==c.last_text)?g.space_before_token=!0:q(!1,!0):"TK_OPERATOR"!==k&&"TK_START_EXPR"!==k?"TK_START_BLOCK"===k?q():g.space_before_token=!0:e.mode===a.ArrayLiteral&&","===c.last_text&&("}"===G?g.space_before_token=!0:q());t();c.indentation_level+=1},TK_END_BLOCK:function(){for(;c.mode===a.Statement;)z();var b="TK_START_BLOCK"===k;"expand"===m.brace_style?b||q():b||(c.mode===a.ArrayLiteral&&m.keep_array_indentation?(m.keep_array_indentation=
-!1,q(),m.keep_array_indentation=!0):q());z();t()},TK_WORD:F,TK_RESERVED:F,TK_SEMICOLON:function(){for(b()&&(g.space_before_token=!1);c.mode===a.Statement&&!c.if_block&&!c.do_block;)z();t()},TK_STRING:function(){b()?g.space_before_token=!0:"TK_RESERVED"===k||"TK_WORD"===k?g.space_before_token=!0:"TK_COMMA"===k||"TK_START_EXPR"===k||"TK_EQUALS"===k||"TK_OPERATOR"===k?C()||B():q();t()},TK_EQUALS:function(){b();c.declaration_statement&&(c.declaration_assignment=!0);g.space_before_token=!0;t();g.space_before_token=
-!0},TK_OPERATOR:function(){if(b(),"TK_RESERVED"===k&&u(c.last_text))return g.space_before_token=!0,void t();if("*"===h.text&&"TK_DOT"===k)return void t();if(":"===h.text&&c.in_case)return c.case_body=!0,c.indentation_level+=1,t(),q(),void(c.in_case=!1);if("::"===h.text)return void t();"TK_OPERATOR"===k&&B();var e=!0,y=!0;f(h.text,["--","++","!","~"])||f(h.text,["-","+"])&&(f(k,["TK_START_BLOCK","TK_START_EXPR","TK_EQUALS","TK_OPERATOR"])||f(c.last_text,H.line_starters)||","===c.last_text)?(e=!1,y=
-!1,!h.wanted_newline||"--"!==h.text&&"++"!==h.text||q(!1,!0),";"===c.last_text&&E(c.mode)&&(e=!0),"TK_RESERVED"===k?e=!0:"TK_END_EXPR"===k?e=!("]"===c.last_text&&("--"===h.text||"++"===h.text)):"TK_OPERATOR"===k&&(e=f(h.text,["--","-","++","+"])&&f(c.last_text,["--","-","++","+"]),f(h.text,["+","-"])&&f(c.last_text,["--","++"])&&(y=!0)),c.mode!==a.BlockStatement&&c.mode!==a.Statement||"{"!==c.last_text&&";"!==c.last_text||q()):":"===h.text?0===c.ternary_depth?e=!1:--c.ternary_depth:"?"===h.text?c.ternary_depth+=
-1:"*"===h.text&&"TK_RESERVED"===k&&"function"===c.last_text&&(e=!1,y=!1);g.space_before_token=g.space_before_token||e;t();g.space_before_token=y},TK_COMMA:function(){if(c.declaration_statement)return E(c.parent.mode)&&(c.declaration_assignment=!1),t(),void(c.declaration_assignment?(c.declaration_assignment=!1,q(!1,!0)):(g.space_before_token=!0,m.comma_first&&B()));t();c.mode===a.ObjectLiteral||c.mode===a.Statement&&c.parent.mode===a.ObjectLiteral?(c.mode===a.Statement&&z(),q()):(g.space_before_token=
-!0,m.comma_first&&B())},TK_BLOCK_COMMENT:function(){if(g.raw)return g.add_raw_token(h),void(h.directives&&"end"===h.directives.preserve&&(m.test_output_raw||(g.raw=!1)));if(h.directives)return q(!1,!0),t(),"start"===h.directives.preserve&&(g.raw=!0),void q(!1,!0);if(!A.newline.test(h.text)&&!h.wanted_newline)return g.space_before_token=!0,t(),void(g.space_before_token=!0);var c,b;b=h.text;b=b.replace(/\x0d/g,"");for(var e=[],a=b.indexOf("\n");-1!==a;)e.push(b.substring(0,a)),b=b.substring(a+1),a=
-b.indexOf("\n");b=(b.length&&e.push(b),e);var a=e=!1,y=h.whitespace_before,r=y.length;q(!1,!0);if(1<b.length){var k;a:{k=b.slice(1);for(var F=0;F<k.length;F++)if("*"!==k[F].replace(/^\s+|\s+$/g,"").charAt(0)){k=!1;break a}k=!0}if(k)e=!0;else{a:{k=b.slice(1);for(var F=0,l=k.length;F<l;F++)if((c=k[F])&&0!==c.indexOf(y)){c=!1;break a}c=!0}c&&(a=!0)}}t(b[0]);for(c=1;c<b.length;c++)q(!1,!0),e?t(" "+b[c].replace(/^\s+/g,"")):a&&b[c].length>r?t(b[c].substring(r)):g.add_token(b[c]);q(!1,!0)},TK_COMMENT:function(){h.wanted_newline?
-q(!1,!0):g.trim(!0);g.space_before_token=!0;t();q(!1,!0)},TK_DOT:function(){b();"TK_RESERVED"===k&&u(c.last_text)?g.space_before_token=!0:B(")"===c.last_text&&m.break_chained_methods);t()},TK_UNKNOWN:function(){t();"\n"===h.text[h.text.length-1]&&q()},TK_EOF:function(){for(;c.mode===a.Statement;)z()}};l=l||{};m={};void 0!==l.braces_on_own_line&&(m.brace_style=l.braces_on_own_line?"expand":"collapse");m.brace_style=l.brace_style?l.brace_style:m.brace_style?m.brace_style:"collapse";"expand-strict"===
-m.brace_style&&(m.brace_style="expand");m.indent_size=l.indent_size?parseInt(l.indent_size,10):4;m.indent_char=l.indent_char?l.indent_char:" ";m.eol=l.eol?l.eol:"\n";m.preserve_newlines=void 0===l.preserve_newlines||l.preserve_newlines;m.break_chained_methods=void 0!==l.break_chained_methods&&l.break_chained_methods;m.max_preserve_newlines=void 0===l.max_preserve_newlines?0:parseInt(l.max_preserve_newlines,10);m.space_in_paren=void 0!==l.space_in_paren&&l.space_in_paren;m.space_in_empty_paren=void 0!==
-l.space_in_empty_paren&&l.space_in_empty_paren;m.jslint_happy=void 0!==l.jslint_happy&&l.jslint_happy;m.space_after_anon_function=void 0!==l.space_after_anon_function&&l.space_after_anon_function;m.keep_array_indentation=void 0!==l.keep_array_indentation&&l.keep_array_indentation;m.space_before_conditional=void 0===l.space_before_conditional||l.space_before_conditional;m.unescape_strings=void 0!==l.unescape_strings&&l.unescape_strings;m.wrap_line_length=void 0===l.wrap_line_length?0:parseInt(l.wrap_line_length,
-10);m.e4x=void 0!==l.e4x&&l.e4x;m.end_with_newline=void 0!==l.end_with_newline&&l.end_with_newline;m.comma_first=void 0!==l.comma_first&&l.comma_first;m.test_output_raw=void 0!==l.test_output_raw&&l.test_output_raw;m.jslint_happy&&(m.space_after_anon_function=!0);l.indent_with_tabs&&(m.indent_char="\t",m.indent_size=1);m.eol=m.eol.replace(/\\r/,"\r").replace(/\\n/,"\n");for(n="";0<m.indent_size;)n+=m.indent_char,--m.indent_size;var M=0;if(r&&r.length){for(;" "===r.charAt(M)||"\t"===r.charAt(M);)J+=
-r.charAt(M),M+=1;r=r.substring(M)}k="TK_START_BLOCK";G="";g=new d(n,J);g.raw=m.test_output_raw;N=[];D(a.BlockStatement);this.beautify=function(){var b,e;H=new P(r,m,n);x=H.tokenize();for(L=0;b=y();){for(var a=0;a<b.comments_before.length;a++)p(b.comments_before[a]);p(b);G=c.last_text;k=b.type;c.last_text=b.text;L+=1}return e=g.get_code(),m.end_with_newline&&(e+="\n"),"\n"!=m.eol&&(e=e.replace(/[\n]/g,m.eol)),e}}function K(a){var l=0,d=-1,p=[],f=!0;this.set_indent=function(p){l=a.baseIndentLength+
-p*a.indent_length;d=p};this.get_character_count=function(){return l};this.is_empty=function(){return f};this.last=function(){return this._empty?null:p[p.length-1]};this.push=function(a){p.push(a);l+=a.length;f=!1};this.pop=function(){var a=null;return f||(a=p.pop(),l-=a.length,f=0===p.length),a};this.remove_indent=function(){0<d&&(--d,l-=a.indent_length)};this.trim=function(){for(;" "===this.last();)p.pop(),--l;f=0===p.length};this.toString=function(){var l="";return this._empty||(0<=d&&(l=a.indent_cache[d]),
-l+=p.join("")),l}}function d(r,l){l=l||"";this.indent_cache=[l];this.baseIndentLength=l.length;this.indent_length=r.length;this.raw=!1;var d=[];this.baseIndentString=l;this.indent_string=r;this.current_line=this.previous_line=null;this.space_before_token=!1;this.add_outputline=function(){this.previous_line=this.current_line;this.current_line=new K(this);d.push(this.current_line)};this.add_outputline();this.get_line_number=function(){return d.length};this.add_new_line=function(a){return(1!==this.get_line_number()||
-!this.just_added_newline())&&!(!a&&this.just_added_newline())&&(this.raw||this.add_outputline(),!0)};this.get_code=function(){return d.join("\n").replace(/[\r\n\t ]+$/,"")};this.set_indent=function(a){if(1<d.length){for(;a>=this.indent_cache.length;)this.indent_cache.push(this.indent_cache[this.indent_cache.length-1]+this.indent_string);return this.current_line.set_indent(a),!0}return this.current_line.set_indent(0),!1};this.add_raw_token=function(a){for(var r=0;r<a.newlines;r++)this.add_outputline();
-this.current_line.push(a.whitespace_before);this.current_line.push(a.text);this.space_before_token=!1};this.add_token=function(a){this.add_space_before_token();this.current_line.push(a)};this.add_space_before_token=function(){this.space_before_token&&!this.just_added_newline()&&this.current_line.push(" ");this.space_before_token=!1};this.remove_redundant_indentation=function(r){if(!r.multiline_frame&&r.mode!==a.ForInitializer&&r.mode!==a.Conditional){r=r.start_line_index;for(var l=d.length;r<l;)d[r].remove_indent(),
-r++}};this.trim=function(a){a=void 0!==a&&a;for(this.current_line.trim(r,l);a&&1<d.length&&this.current_line.is_empty();)d.pop(),this.current_line=d[d.length-1],this.current_line.trim();this.previous_line=1<d.length?d[d.length-2]:null};this.just_added_newline=function(){return this.current_line.is_empty()};this.just_added_blankline=function(){return this.just_added_newline()?1===d.length?!0:d[d.length-2].is_empty():!1}}function P(a,l,d){function p(){var d,n=[];if(D=0,E="",b>=u)return["","TK_EOF"];
-var c;c=C.length?C[C.length-1]:new J("TK_START_BLOCK","{");var e=a.charAt(b);for(b+=1;f(e,K);){if(A.newline.test(e)?"\n"===e&&"\r"===a.charAt(b-2)||(D+=1,n=[]):n.push(e),b>=u)return["","TK_EOF"];e=a.charAt(b);b+=1}if(n.length&&(E=n.join("")),q.test(e)){c=n=!0;var p=q;for("0"===e&&b<u&&/[Xx]/.test(a.charAt(b))?(n=!1,c=!1,e+=a.charAt(b),b+=1,p=x):(e="",--b);b<u&&p.test(a.charAt(b));)e+=a.charAt(b),b+=1,n&&b<u&&"."===a.charAt(b)&&(e+=a.charAt(b),b+=1,n=!1),c&&b<u&&/[Ee]/.test(a.charAt(b))&&(e+=a.charAt(b),
-b+=1,b<u&&/[+-]/.test(a.charAt(b))&&(e+=a.charAt(b),b+=1),c=!1,n=!1);return[e,"TK_WORD"]}if(A.isIdentifierStart(a.charCodeAt(b-1))){if(b<u)for(;A.isIdentifierChar(a.charCodeAt(b))&&(e+=a.charAt(b),(b+=1)!==u););return"TK_DOT"===c.type||"TK_RESERVED"===c.type&&f(c.text,["set","get"])||!f(e,y)?[e,"TK_WORD"]:"in"===e?[e,"TK_OPERATOR"]:[e,"TK_RESERVED"]}if("("===e||"["===e)return[e,"TK_START_EXPR"];if(")"===e||"]"===e)return[e,"TK_END_EXPR"];if("{"===e)return[e,"TK_START_BLOCK"];if("}"===e)return[e,"TK_END_BLOCK"];
-if(";"===e)return[e,"TK_SEMICOLON"];if("/"===e){n="";if("*"===a.charAt(b)){b+=1;F.lastIndex=b;e=F.exec(a);n="/*"+e[0];b+=e[0].length;c=n;if(c.match(L)){p={};H.lastIndex=0;for(d=H.exec(c);d;)p[d[1]]=d[2],d=H.exec(c);c=p}else c=null;return c&&"start"===c.ignore&&(h.lastIndex=b,e=h.exec(a),n+=e[0],b+=e[0].length),n=n.replace(A.lineBreak,"\n"),[n,"TK_BLOCK_COMMENT",c]}if("/"===a.charAt(b))return b+=1,g.lastIndex=b,e=g.exec(a),n="//"+e[0],b+=e[0].length,[n,"TK_COMMENT"]}if("`"===e||"'"===e||'"'===e||("/"===
-e||l.e4x&&"\x3c"===e&&a.slice(b-1).match(/^<([-a-zA-Z:0-9_.]+|{[^{}]*}|!\[CDATA\[[\s\S]*?\]\])(\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{.*?}))*\s*(\/?)\s*>/))&&("TK_RESERVED"===c.type&&f(c.text,"return case throw else do typeof yield".split(" "))||"TK_END_EXPR"===c.type&&")"===c.text&&c.parent&&"TK_RESERVED"===c.parent.type&&f(c.parent.text,["if","while","for"])||f(c.type,"TK_COMMENT TK_START_EXPR TK_START_BLOCK TK_END_BLOCK TK_OPERATOR TK_EQUALS TK_EOF TK_SEMICOLON TK_COMMA".split(" ")))){var n=
-e,v=c=!1;if(d=e,"/"===n)for(e=!1;b<u&&(c||e||a.charAt(b)!==n)&&!A.newline.test(a.charAt(b));)d+=a.charAt(b),c?c=!1:(c="\\"===a.charAt(b),"["===a.charAt(b)?e=!0:"]"===a.charAt(b)&&(e=!1)),b+=1;else if(l.e4x&&"\x3c"===n){if(c=/<(\/?)([-a-zA-Z:0-9_.]+|{[^{}]*}|!\[CDATA\[[\s\S]*?\]\])(\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{.*?}))*\s*(\/?)\s*>/g,e=a.slice(b-1),(p=c.exec(e))&&0===p.index){n=p[2];for(d=0;p;){var v=!!p[1],w=p[2],m=!!p[p.length-1]||"![CDATA["===w.slice(0,8);if(w!==n||m||(v?--d:++d),0>=
-d)break;p=c.exec(e)}n=p?p.index+p[0].length:e.length;return e=e.slice(0,n),b+=n-1,e=e.replace(A.lineBreak,"\n"),[e,"TK_STRING"]}}else for(;b<u&&(c||a.charAt(b)!==n&&("`"===n||!A.newline.test(a.charAt(b))));)(c||"`"===n)&&A.newline.test(a.charAt(b))?("\r"===a.charAt(b)&&"\n"===a.charAt(b+1)&&(b+=1),d+="\n"):d+=a.charAt(b),c?("x"!==a.charAt(b)&&"u"!==a.charAt(b)||(v=!0),c=!1):c="\\"===a.charAt(b),b+=1;if(v&&l.unescape_strings){a:{e=d;p=!1;d="";v=0;w="";for(m=0;p||v<e.length;)if(c=e.charAt(v),v++,p){if(p=
-!1,"x"===c)w=e.substr(v,2),v+=2;else{if("u"!==c){d+="\\"+c;continue}w=e.substr(v,4);v+=4}if(!w.match(/^[0123456789abcdefABCDEF]+$/))break a;if(0<=(m=parseInt(w,16))&&32>m)d+="x"===c?"\\x"+w:"\\u"+w;else if(34===m||39===m||92===m)d+="\\"+String.fromCharCode(m);else{if("x"===c&&126<m&&255>=m)break a;d+=String.fromCharCode(m)}}else"\\"===c?p=!0:d+=c;e=d}d=e}if(b<u&&a.charAt(b)===n&&(d+=n,b+=1,"/"===n))for(;b<u&&A.isIdentifierStart(a.charCodeAt(b));)d+=a.charAt(b),b+=1;return[d,"TK_STRING"]}if("#"===
-e){if(0===C.length&&"!"===a.charAt(b)){for(d=e;b<u&&"\n"!==e;)e=a.charAt(b),d+=e,b+=1;return[d.replace(/^\s+|\s+$/g,"")+"\n","TK_UNKNOWN"]}n="#";if(b<u&&q.test(a.charAt(b))){do e=a.charAt(b),n+=e,b+=1;while(b<u&&"#"!==e&&"\x3d"!==e);return"#"===e||("["===a.charAt(b)&&"]"===a.charAt(b+1)?(n+="[]",b+=2):"{"===a.charAt(b)&&"}"===a.charAt(b+1)&&(n+="{}",b+=2)),[n,"TK_WORD"]}}if("\x3c"===e&&("?"===a.charAt(b)||"%"===a.charAt(b))&&(k.lastIndex=b-1,n=k.exec(a)))return e=n[0],b+=e.length-1,e=e.replace(A.lineBreak,
-"\n"),[e,"TK_STRING"];if("\x3c"===e&&"\x3c!--"===a.substring(b-1,b+3)){b+=3;for(e="\x3c!--";!A.newline.test(a.charAt(b))&&b<u;)e+=a.charAt(b),b++;return z=!0,[e,"TK_COMMENT"]}if("-"===e&&z&&"--\x3e"===a.substring(b-1,b+2))return z=!1,b+=2,["--\x3e","TK_COMMENT"];if("."===e)return[e,"TK_DOT"];if(f(e,t)){for(;b<u&&f(e+a.charAt(b),t)&&(e+=a.charAt(b),!((b+=1)>=u)););return","===e?[e,"TK_COMMA"]:"\x3d"===e?[e,"TK_EQUALS"]:[e,"TK_OPERATOR"]}return[e,"TK_UNKNOWN"]}var K=["\n","\r","\t"," "],q=/[0-9]/,x=
-/[0123456789abcdefABCDEF]/,t="+ - * / % \x26 ++ -- \x3d +\x3d -\x3d *\x3d /\x3d %\x3d \x3d\x3d \x3d\x3d\x3d !\x3d !\x3d\x3d \x3e \x3c \x3e\x3d \x3c\x3d \x3e\x3e \x3c\x3c \x3e\x3e\x3e \x3e\x3e\x3e\x3d \x3e\x3e\x3d \x3c\x3c\x3d \x26\x26 \x26\x3d | || ! ~ , : ? ^ ^\x3d |\x3d :: \x3d\x3e \x3c%\x3d \x3c% %\x3e \x3c?\x3d \x3c? ?\x3e".split(" ");this.line_starters="continue try throw return var let const if switch case default for while break function import export".split(" ");var D,E,z,C,b,u,y=this.line_starters.concat("do in else get set new catch finally typeof yield async await".split(" ")),
-F=/([\s\S]*?)((?:\*\/)|$)/g,g=/([^\n\r\u2028\u2029]*)/g,L=/\/\* beautify( \w+[:]\w+)+ \*\//g,H=/ (\w+)[:](\w+)/g,h=/([\s\S]*?)((?:\/\*\sbeautify\signore:end\s\*\/)|$)/g,k=/((<\?php|<\?=)[\s\S]*?\?>)|(<%[\s\S]*?%>)/g;this.tokenize=function(){u=a.length;b=0;z=!1;C=[];for(var g,d,c,e=null,h=[],y=[];!d||"TK_EOF"!==d.type;){c=p();for(g=new J(c[1],c[0],D,E);"TK_COMMENT"===g.type||"TK_BLOCK_COMMENT"===g.type||"TK_UNKNOWN"===g.type;)"TK_BLOCK_COMMENT"===g.type&&(g.directives=c[2]),y.push(g),c=p(),g=new J(c[1],
-c[0],D,E);y.length&&(g.comments_before=y,y=[]);"TK_START_BLOCK"===g.type||"TK_START_EXPR"===g.type?(g.parent=d,h.push(e),e=g):("TK_END_BLOCK"===g.type||"TK_END_EXPR"===g.type)&&e&&("]"===g.text&&"["===e.text||")"===g.text&&"("===e.text||"}"===g.text&&"{"===e.text)&&(g.parent=e.parent,e=h.pop());C.push(g);d=g}return C}}var A={};!function(a){var d=RegExp("[ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԧԱ-Ֆՙա-ևא-תװ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࢠࢢ-ࢬऄ-हऽॐक़-ॡॱ-ॷॹ-ॿঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-ళవ-హఽౘౙౠౡಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೞೠೡೱೲഅ-ഌഎ-ഐഒ-ഺഽൎൠൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄງຈຊຍດ-ທນ-ຟມ-ຣລວສຫອ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏼᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛰᜀ-ᜌᜎ-ᜑᜠ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡷᢀ-ᢨᢪᢰ-ᣵᤀ-ᤜᥐ-ᥭᥰ-ᥴᦀ-ᦫᧁ-ᧇᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭋᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᳩ-ᳬᳮ-ᳱᳵᳶᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕℙ-ℝℤΩℨK-ℭℯ-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-Ⱞⰰ-ⱞⱠ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞⸯ々-〇〡-〩〱-〵〸-〼ぁ-ゖゝ-ゟァ-ヺー-ヿㄅ-ㄭㄱ-ㆎㆠ-ㆺㇰ-ㇿ㐀-䶵一-鿌ꀀ-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚗꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꞎꞐ-ꞓꞠ-Ɦꟸ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꪀ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꯀ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ]"),
-f=RegExp("[ªµºÀ-ÖØ-öø-ˁˆ-ˑˠ-ˤˬˮͰ-ʹͶͷͺ-ͽΆΈ-ΊΌΎ-ΡΣ-ϵϷ-ҁҊ-ԧԱ-Ֆՙա-ևא-תװ-ײؠ-يٮٯٱ-ۓەۥۦۮۯۺ-ۼۿܐܒ-ܯݍ-ޥޱߊ-ߪߴߵߺࠀ-ࠕࠚࠤࠨࡀ-ࡘࢠࢢ-ࢬऄ-हऽॐक़-ॡॱ-ॷॹ-ॿঅ-ঌএঐও-নপ-রলশ-হঽৎড়ঢ়য়-ৡৰৱਅ-ਊਏਐਓ-ਨਪ-ਰਲਲ਼ਵਸ਼ਸਹਖ਼-ੜਫ਼ੲ-ੴઅ-ઍએ-ઑઓ-નપ-રલળવ-હઽૐૠૡଅ-ଌଏଐଓ-ନପ-ରଲଳଵ-ହଽଡ଼ଢ଼ୟ-ୡୱஃஅ-ஊஎ-ஐஒ-கஙசஜஞடணதந-பம-ஹௐఅ-ఌఎ-ఐఒ-నప-ళవ-హఽౘౙౠౡಅ-ಌಎ-ಐಒ-ನಪ-ಳವ-ಹಽೞೠೡೱೲഅ-ഌഎ-ഐഒ-ഺഽൎൠൡൺ-ൿඅ-ඖක-නඳ-රලව-ෆก-ะาำเ-ๆກຂຄງຈຊຍດ-ທນ-ຟມ-ຣລວສຫອ-ະາຳຽເ-ໄໆໜ-ໟༀཀ-ཇཉ-ཬྈ-ྌက-ဪဿၐ-ၕၚ-ၝၡၥၦၮ-ၰၵ-ႁႎႠ-ჅჇჍა-ჺჼ-ቈቊ-ቍቐ-ቖቘቚ-ቝበ-ኈኊ-ኍነ-ኰኲ-ኵኸ-ኾዀዂ-ዅወ-ዖዘ-ጐጒ-ጕጘ-ፚᎀ-ᎏᎠ-Ᏼᐁ-ᙬᙯ-ᙿᚁ-ᚚᚠ-ᛪᛮ-ᛰᜀ-ᜌᜎ-ᜑᜠ-ᜱᝀ-ᝑᝠ-ᝬᝮ-ᝰក-ឳៗៜᠠ-ᡷᢀ-ᢨᢪᢰ-ᣵᤀ-ᤜᥐ-ᥭᥰ-ᥴᦀ-ᦫᧁ-ᧇᨀ-ᨖᨠ-ᩔᪧᬅ-ᬳᭅ-ᭋᮃ-ᮠᮮᮯᮺ-ᯥᰀ-ᰣᱍ-ᱏᱚ-ᱽᳩ-ᳬᳮ-ᳱᳵᳶᴀ-ᶿḀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼιῂ-ῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲ-ῴῶ-ῼⁱⁿₐ-ₜℂℇℊ-ℓℕℙ-ℝℤΩℨK-ℭℯ-ℹℼ-ℿⅅ-ⅉⅎⅠ-ↈⰀ-Ⱞⰰ-ⱞⱠ-ⳤⳫ-ⳮⳲⳳⴀ-ⴥⴧⴭⴰ-ⵧⵯⶀ-ⶖⶠ-ⶦⶨ-ⶮⶰ-ⶶⶸ-ⶾⷀ-ⷆⷈ-ⷎⷐ-ⷖⷘ-ⷞⸯ々-〇〡-〩〱-〵〸-〼ぁ-ゖゝ-ゟァ-ヺー-ヿㄅ-ㄭㄱ-ㆎㆠ-ㆺㇰ-ㇿ㐀-䶵一-鿌ꀀ-ꒌꓐ-ꓽꔀ-ꘌꘐ-ꘟꘪꘫꙀ-ꙮꙿ-ꚗꚠ-ꛯꜗ-ꜟꜢ-ꞈꞋ-ꞎꞐ-ꞓꞠ-Ɦꟸ-ꠁꠃ-ꠅꠇ-ꠊꠌ-ꠢꡀ-ꡳꢂ-ꢳꣲ-ꣷꣻꤊ-ꤥꤰ-ꥆꥠ-ꥼꦄ-ꦲꧏꨀ-ꨨꩀ-ꩂꩄ-ꩋꩠ-ꩶꩺꪀ-ꪯꪱꪵꪶꪹ-ꪽꫀꫂꫛ-ꫝꫠ-ꫪꫲ-ꫴꬁ-ꬆꬉ-ꬎꬑ-ꬖꬠ-ꬦꬨ-ꬮꯀ-ꯢ가-힣ힰ-ퟆퟋ-ퟻ豈-舘並-龎ff-stﬓ-ﬗיִײַ-ﬨשׁ-זּטּ-לּמּנּסּףּפּצּ-ﮱﯓ-ﴽﵐ-ﶏﶒ-ﷇﷰ-ﷻﹰ-ﹴﹶ-ﻼＡ-Ｚａ-ｚｦ-ﾾￂ-ￇￊ-ￏￒ-ￗￚ-ￜ̀-ͯ҃-֑҇-ׇֽֿׁׂׅׄؐ-ؚؠ-ىٲ-ۓۧ-ۨۻ-ۼܰ-݊ࠀ-ࠔࠛ-ࠣࠥ-ࠧࠩ-࠭ࡀ-ࡗࣤ-ࣾऀ-ःऺ-़ा-ॏ॑-ॗॢ-ॣ०-९ঁ-ঃ়া-ৄেৈৗয়-ৠਁ-ਃ਼ਾ-ੂੇੈੋ-੍ੑ੦-ੱੵઁ-ઃ઼ા-ૅે-ૉો-્ૢ-ૣ૦-૯ଁ-ଃ଼ା-ୄେୈୋ-୍ୖୗୟ-ୠ୦-୯ஂா-ூெ-ைொ-்ௗ௦-௯ఁ-ఃె-ైొ-్ౕౖౢ-ౣ౦-౯ಂಃ಼ಾ-ೄೆ-ೈೊ-್ೕೖೢ-ೣ೦-೯ംഃെ-ൈൗൢ-ൣ൦-൯ංඃ්ා-ුූෘ-ෟෲෳิ-ฺเ-ๅ๐-๙ິ-ູ່-ໍ໐-໙༘༙༠-༩༹༵༷ཁ-ཇཱ-྄྆-྇ྍ-ྗྙ-ྼ࿆က-ဩ၀-၉ၧ-ၭၱ-ၴႂ-ႍႏ-ႝ፝-፟ᜎ-ᜐᜠ-ᜰᝀ-ᝐᝲᝳក-ឲ៝០-៩᠋-᠍᠐-᠙ᤠ-ᤫᤰ-᤻ᥑ-ᥭᦰ-ᧀᧈ-ᧉ᧐-᧙ᨀ-ᨕᨠ-ᩓ᩠-᩿᩼-᪉᪐-᪙ᭆ-ᭋ᭐-᭙᭫-᭳᮰-᮹᯦-᯳ᰀ-ᰢ᱀-᱉ᱛ-ᱽ᳐-᳒ᴀ-ᶾḁ-ἕ‌‍‿⁀⁔⃐-⃥⃜⃡-⃰ⶁ-ⶖⷠ-ⷿ〡-〨゙゚Ꙁ-ꙭꙴ-꙽ꚟ꛰-꛱ꟸ-ꠀ꠆ꠋꠣ-ꠧꢀ-ꢁꢴ-꣄꣐-꣙ꣳ-ꣷ꤀-꤉ꤦ-꤭ꤰ-ꥅꦀ-ꦃ꦳-꧀ꨀ-ꨧꩀ-ꩁꩌ-ꩍ꩐-꩙ꩻꫠ-ꫩꫲ-ꫳꯀ-ꯡ꯬꯭꯰-꯹ﬠ-ﬨ︀-️︠-︦︳︴﹍-﹏０-９＿]");
-a.newline=/[\n\r\u2028\u2029]/;a.lineBreak=/\r\n|[\n\r\u2028\u2029]/g;a.isIdentifierStart=function(a){return 65>a?36===a:91>a||(97>a?95===a:123>a||170<=a&&d.test(String.fromCharCode(a)))};a.isIdentifierChar=function(a){return 48>a?36===a:58>a||!(65>a)&&(91>a||(97>a?95===a:123>a||170<=a&&f.test(String.fromCharCode(a))))}}(A);var a={BlockStatement:"BlockStatement",Statement:"Statement",ObjectLiteral:"ObjectLiteral",ArrayLiteral:"ArrayLiteral",ForInitializer:"ForInitializer",Conditional:"Conditional",
-Expression:"Expression"},J=function(a,d,f,p,K,q){this.type=a;this.text=d;this.comments_before=[];this.newlines=f||0;this.wanted_newline=0<f;this.whitespace_before=p||"";this.directives=this.parent=null};"function"==typeof define&&define.amd?define("beautify.js",[],function(){return{js_beautify:x}}):"undefined"!=typeof exports?exports.js_beautify=x:"undefined"!=typeof window?window.js_beautify=x:"undefined"!=typeof global&&(global.js_beautify=x)}();
-(function(){function f(f,d,x,A){var a,J,r,l,w,p,B,q,I,t,D,E,z,C,b;d=d||{};void 0!==d.wrap_line_length&&0!==parseInt(d.wrap_line_length,10)||void 0===d.max_char||0===parseInt(d.max_char,10)||(d.wrap_line_length=d.max_char);J=void 0!==d.indent_inner_html&&d.indent_inner_html;r=void 0===d.indent_size?4:parseInt(d.indent_size,10);l=void 0===d.indent_char?" ":d.indent_char;p=void 0===d.brace_style?"collapse":d.brace_style;w=0===parseInt(d.wrap_line_length,10)?32786:parseInt(d.wrap_line_length||250,10);
-B=d.unformatted||"a span img bdo em strong dfn code samp kbd var cite abbr acronym q sub sup tt i b big small u s strike font ins del pre address dt h1 h2 h3 h4 h5 h6".split(" ");I=(q=void 0===d.preserve_newlines||d.preserve_newlines)?isNaN(parseInt(d.max_preserve_newlines,10))?32786:parseInt(d.max_preserve_newlines,10):0;t=void 0!==d.indent_handlebars&&d.indent_handlebars;D=void 0===d.wrap_attributes?"auto":d.wrap_attributes;E=void 0===d.wrap_attributes_indent_size?r:parseInt(d.wrap_attributes_indent_size,
-10)||r;z=void 0!==d.end_with_newline&&d.end_with_newline;C="object"==typeof d.extra_liners&&d.extra_liners?d.extra_liners.concat():"string"==typeof d.extra_liners?d.extra_liners.split(","):["head","body","/html"];b=d.eol?d.eol:"\n";d.indent_with_tabs&&(l="\t",r=1);b=b.replace(/\\r/,"\r").replace(/\\n/,"\n");a=new function(){return this.pos=0,this.token="",this.current_mode="CONTENT",this.tags={parent:"parent1",parentcount:1,parent1:""},this.tag_type="",this.token_text=this.last_token=this.last_text=
-this.token_type="",this.newlines=0,this.indent_content=J,this.Utils={whitespace:["\n","\r","\t"," "],single_token:"br input link meta source !doctype basefont base area hr wbr param img isindex embed".split(" "),extra_liners:C,in_array:function(a,b){for(var g=0;g<b.length;g++)if(a===b[g])return!0;return!1}},this.is_whitespace=function(a){for(;0<a.length;a++)if(!this.Utils.in_array(a.charAt(0),this.Utils.whitespace))return!1;return!0},this.traverse_whitespace=function(){var a="";if(a=this.input.charAt(this.pos),
-this.Utils.in_array(a,this.Utils.whitespace)){for(this.newlines=0;this.Utils.in_array(a,this.Utils.whitespace);)q&&"\n"===a&&this.newlines<=I&&(this.newlines+=1),this.pos++,a=this.input.charAt(this.pos);return!0}return!1},this.space_or_wrap=function(a){this.line_char_count>=this.wrap_line_length?(this.print_newline(!1,a),this.print_indentation(a)):(this.line_char_count++,a.push(" "))},this.get_content=function(){for(var a="",b=[];"\x3c"!==this.input.charAt(this.pos);){if(this.pos>=this.input.length)return b.length?
-b.join(""):["","TK_EOF"];if(this.traverse_whitespace())this.space_or_wrap(b);else{if(t){a=this.input.substr(this.pos,3);if("{{#"===a||"{{/"===a)break;if("{{!"===a)return[this.get_tag(),"TK_TAG_HANDLEBARS_COMMENT"];if("{{"===this.input.substr(this.pos,2)&&"{{else}}"===this.get_tag(!0))break}a=this.input.charAt(this.pos);this.pos++;this.line_char_count++;b.push(a)}}return b.length?b.join(""):""},this.get_contents_to=function(a){if(this.pos===this.input.length)return["","TK_EOF"];var b="";a=new RegExp("\x3c/"+
-a+"\\s*\x3e","igm");a.lastIndex=this.pos;a=(a=a.exec(this.input))?a.index:this.input.length;return this.pos<a&&(b=this.input.substring(this.pos,a),this.pos=a),b},this.record_tag=function(a){this.tags[a+"count"]?(this.tags[a+"count"]++,this.tags[a+this.tags[a+"count"]]=this.indent_level):(this.tags[a+"count"]=1,this.tags[a+this.tags[a+"count"]]=this.indent_level);this.tags[a+this.tags[a+"count"]+"parent"]=this.tags.parent;this.tags.parent=a+this.tags[a+"count"]},this.retrieve_tag=function(a){if(this.tags[a+
-"count"]){for(var b=this.tags.parent;b&&a+this.tags[a+"count"]!==b;)b=this.tags[b+"parent"];b&&(this.indent_level=this.tags[a+this.tags[a+"count"]],this.tags.parent=this.tags[b+"parent"]);delete this.tags[a+this.tags[a+"count"]+"parent"];delete this.tags[a+this.tags[a+"count"]];1===this.tags[a+"count"]?delete this.tags[a+"count"]:this.tags[a+"count"]--}},this.indent_to_tag=function(a){if(this.tags[a+"count"]){for(var b=this.tags.parent;b&&a+this.tags[a+"count"]!==b;)b=this.tags[b+"parent"];b&&(this.indent_level=
-this.tags[a+this.tags[a+"count"]])}},this.get_tag=function(a){var b,g,d="",f=[],h="",k=!1,p=!0,n=this.pos,c=this.line_char_count;a=void 0!==a&&a;do{if(this.pos>=this.input.length)return a&&(this.pos=n,this.line_char_count=c),f.length?f.join(""):["","TK_EOF"];if(d=this.input.charAt(this.pos),this.pos++,this.Utils.in_array(d,this.Utils.whitespace))k=!0;else{if("'"!==d&&'"'!==d||(d+=this.get_unformatted(d),k=!0),"\x3d"===d&&(k=!1),f.length&&"\x3d"!==f[f.length-1]&&"\x3e"!==d&&k){if(this.space_or_wrap(f),
-k=!1,!p&&"force"===D&&"/"!==d){this.print_newline(!0,f);this.print_indentation(f);for(var e=0;e<E;e++)f.push(l)}for(e=0;e<f.length;e++)if(" "===f[e]){p=!1;break}}if(t&&"\x3c"===g&&"{{"===d+this.input.charAt(this.pos)&&(d+=this.get_unformatted("}}"),f.length&&" "!==f[f.length-1]&&"\x3c"!==f[f.length-1]&&(d=" "+d),k=!0),"\x3c"!==d||g||(b=this.pos-1,g="\x3c"),t&&!g&&2<=f.length&&"{"===f[f.length-1]&&"{"===f[f.length-2]&&(b="#"===d||"/"===d||"!"===d?this.pos-3:this.pos-2,g="{"),this.line_char_count++,
-f.push(d),f[1]&&("!"===f[1]||"?"===f[1]||"%"===f[1])){f=[this.get_comment(b)];break}if(t&&f[1]&&"{"===f[1]&&f[2]&&"!"===f[2]){f=[this.get_comment(b)];break}if(t&&"{"===g&&2<f.length&&"}"===f[f.length-2]&&"}"===f[f.length-1])break}}while("\x3e"!==d);b=f.join("");g=-1!==b.indexOf(" ")?b.indexOf(" "):"{"===b.charAt(0)?b.indexOf("}"):b.indexOf("\x3e");d="\x3c"!==b.charAt(0)&&t?"#"===b.charAt(2)?3:2:1;g=b.substring(d,g).toLowerCase();return"/"===b.charAt(b.length-2)||this.Utils.in_array(g,this.Utils.single_token)?
-a||(this.tag_type="SINGLE"):t&&"{"===b.charAt(0)&&"else"===g?a||(this.indent_to_tag("if"),this.tag_type="HANDLEBARS_ELSE",this.indent_content=!0,this.traverse_whitespace()):this.is_unformatted(g,B)?(h=this.get_unformatted("\x3c/"+g+"\x3e",b),f.push(h),this.pos-1,this.tag_type="SINGLE"):"script"===g&&(-1===b.search("type")||-1<b.search("type")&&-1<b.search(/\b(text|application)\/(x-)?(javascript|ecmascript|jscript|livescript)/))?a||(this.record_tag(g),this.tag_type="SCRIPT"):"style"===g&&(-1===b.search("type")||
--1<b.search("type")&&-1<b.search("text/css"))?a||(this.record_tag(g),this.tag_type="STYLE"):"!"===g.charAt(0)?a||(this.tag_type="SINGLE",this.traverse_whitespace()):a||("/"===g.charAt(0)?(this.retrieve_tag(g.substring(1)),this.tag_type="END"):(this.record_tag(g),"html"!==g.toLowerCase()&&(this.indent_content=!0),this.tag_type="START"),this.traverse_whitespace()&&this.space_or_wrap(f),this.Utils.in_array(g,this.Utils.extra_liners)&&(this.print_newline(!1,this.output),this.output.length&&"\n"!==this.output[this.output.length-
-2]&&this.print_newline(!0,this.output))),a&&(this.pos=n,this.line_char_count=c),f.join("")},this.get_comment=function(a){var b="",d="\x3e",f=!1;this.pos=a;input_char=this.input.charAt(this.pos);for(this.pos++;this.pos<=this.input.length&&(b+=input_char,b.charAt(b.length-1)!==d.charAt(d.length-1)||-1===b.indexOf(d));)!f&&10>b.length&&(0===b.indexOf("\x3c![if")?(d="\x3c![endif]\x3e",f=!0):0===b.indexOf("\x3c![cdata[")?(d="]]\x3e",f=!0):0===b.indexOf("\x3c![")?(d="]\x3e",f=!0):0===b.indexOf("\x3c!--")?
-(d="--\x3e",f=!0):0===b.indexOf("{{!")?(d="}}",f=!0):0===b.indexOf("\x3c?")?(d="?\x3e",f=!0):0===b.indexOf("\x3c%")&&(d="%\x3e",f=!0)),input_char=this.input.charAt(this.pos),this.pos++;return b},this.get_unformatted=function(a,b){if(b&&-1!==b.toLowerCase().indexOf(a))return"";var d="",f="",l=0,h=!0;do{if(this.pos>=this.input.length)break;if(d=this.input.charAt(this.pos),this.pos++,this.Utils.in_array(d,this.Utils.whitespace)){if(!h){this.line_char_count--;continue}if("\n"===d||"\r"===d){f+="\n";this.line_char_count=
-0;continue}}f+=d;this.line_char_count++;h=!0;t&&"{"===d&&f.length&&"{"===f.charAt(f.length-2)&&(f+=this.get_unformatted("}}"),l=f.length)}while(-1===f.toLowerCase().indexOf(a,l));return f},this.get_token=function(){var a;if("TK_TAG_SCRIPT"===this.last_token||"TK_TAG_STYLE"===this.last_token){var b=this.last_token.substr(7);return a=this.get_contents_to(b),"string"!=typeof a?a:[a,"TK_"+b]}if("CONTENT"===this.current_mode)return a=this.get_content(),"string"!=typeof a?a:[a,"TK_CONTENT"];if("TAG"===
-this.current_mode)return"string"!=typeof(a=this.get_tag())?a:[a,"TK_TAG_"+this.tag_type]},this.get_full_indent=function(a){return a=this.indent_level+a||0,1>a?"":Array(a+1).join(this.indent_string)},this.is_unformatted=function(a,b){if(!this.Utils.in_array(a,b))return!1;if("a"!==a.toLowerCase()||!this.Utils.in_array("a",b))return!0;var d=(this.get_tag(!0)||"").match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);return!(d&&!this.Utils.in_array(d,b))},this.printer=function(a,b,d,f,l){this.input=a||"";this.input=
-this.input.replace(/\r\n|[\r\u2028\u2029]/g,"\n");this.output=[];this.indent_character=b;this.indent_string="";this.indent_size=d;this.brace_style=l;this.indent_level=0;this.wrap_line_length=f;for(a=this.line_char_count=0;a<this.indent_size;a++)this.indent_string+=this.indent_character;this.print_newline=function(a,b){this.line_char_count=0;b&&b.length&&(a||"\n"!==b[b.length-1])&&("\n"!==b[b.length-1]&&(b[b.length-1]=b[b.length-1].replace(/\s+$/g,"")),b.push("\n"))};this.print_indentation=function(a){for(var b=
-0;b<this.indent_level;b++)a.push(this.indent_string),this.line_char_count+=this.indent_string.length};this.print_token=function(a){this.is_whitespace(a)&&!this.output.length||((a||""!==a)&&this.output.length&&"\n"===this.output[this.output.length-1]&&(this.print_indentation(this.output),a=a.replace(/^\s+/g,"")),this.print_token_raw(a))};this.print_token_raw=function(a){0<this.newlines&&(a=a.replace(/\s+$/g,""));a&&""!==a&&(1<a.length&&"\n"===a.charAt(a.length-1)?(this.output.push(a.slice(0,-1)),this.print_newline(!1,
-this.output)):this.output.push(a));for(a=0;a<this.newlines;a++)this.print_newline(0<a,this.output);this.newlines=0};this.indent=function(){this.indent_level++};this.unindent=function(){0<this.indent_level&&this.indent_level--}},this};for(a.printer(f,l,r,w,p);;){f=a.get_token();if(a.token_text=f[0],a.token_type=f[1],"TK_EOF"===a.token_type)break;switch(a.token_type){case "TK_TAG_START":a.print_newline(!1,a.output);a.print_token(a.token_text);a.indent_content&&(a.indent(),a.indent_content=!1);a.current_mode=
-"CONTENT";break;case "TK_TAG_STYLE":case "TK_TAG_SCRIPT":a.print_newline(!1,a.output);a.print_token(a.token_text);a.current_mode="CONTENT";break;case "TK_TAG_END":"TK_CONTENT"===a.last_token&&""===a.last_text&&(f=a.token_text.match(/\w+/)[0],r=null,a.output.length&&(r=a.output[a.output.length-1].match(/(?:<|{{#)\s*(\w+)/)),(null===r||r[1]!==f&&!a.Utils.in_array(r[1],B))&&a.print_newline(!1,a.output));a.print_token(a.token_text);a.current_mode="CONTENT";break;case "TK_TAG_SINGLE":(f=a.token_text.match(/^\s*<([a-z-]+)/i))&&
-a.Utils.in_array(f[1],B)||a.print_newline(!1,a.output);a.print_token(a.token_text);a.current_mode="CONTENT";break;case "TK_TAG_HANDLEBARS_ELSE":a.print_token(a.token_text);a.indent_content&&(a.indent(),a.indent_content=!1);a.current_mode="CONTENT";break;case "TK_TAG_HANDLEBARS_COMMENT":case "TK_CONTENT":a.print_token(a.token_text);a.current_mode="TAG";break;case "TK_STYLE":case "TK_SCRIPT":if(""!==a.token_text){a.print_newline(!1,a.output);var u;f=a.token_text;w=1;"TK_SCRIPT"===a.token_type?u="function"==
-typeof x&&x:"TK_STYLE"===a.token_type&&(u="function"==typeof A&&A);"keep"===d.indent_scripts?w=0:"separate"===d.indent_scripts&&(w=-a.indent_level);r=a.get_full_indent(w);u?(w=function(){this.eol="\n"},w.prototype=d,w=new w,f=u(f.replace(/^\s*/,r),w)):(p=f.match(/^\s*/)[0].match(/[^\n\r]*$/)[0].split(a.indent_string).length-1,w=a.get_full_indent(w-p),f=f.replace(/^\s*/,r).replace(/\r\n|\r|\n/g,"\n"+w).replace(/\s+$/,""));f&&(a.print_token_raw(f),a.print_newline(!0,a.output))}a.current_mode="TAG";
-break;default:""!==a.token_text&&a.print_token(a.token_text)}a.last_token=a.token_type;a.last_text=a.token_text}d=a.output.join("").replace(/[\r\n\t ]+$/,"");return z&&(d+="\n"),"\n"!=b&&(d=d.replace(/[\n]/g,b)),d}if("function"==typeof define&&define.amd)define("beautify-html.js",["require","./beautify","./beautify-css"],function(x){var d=x("./beautify"),I=x("./beautify-css");return{html_beautify:function(x,a){return f(x,a,d.js_beautify,I.css_beautify)}}});else if("undefined"!=typeof exports){var x=
-require("./beautify.js"),I=require("./beautify-css.js");exports.html_beautify=function(K,d){return f(K,d,x.js_beautify,I.css_beautify)}}else"undefined"!=typeof window?window.html_beautify=function(x,d){return f(x,d,window.js_beautify,window.css_beautify)}:"undefined"!=typeof global&&(global.html_beautify=function(x,d){return f(x,d,global.js_beautify,global.css_beautify)})})();
-(function(f){"function"==typeof f.define&&(f.define("beautify",["beautify.js"],function(f){return f}),f.define("beautify-css",[],function(){return{css_beautify:void 0}}),f.define("beautifyModule",["beautify","beautify-html.js"],function(x,I){f.js_beautify=x.js_beautify;f.html_beautify=I.html_beautify}))})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.addons.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.addons.min.js
deleted file mode 100644
index 3fe140383..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.addons.min.js
+++ /dev/null
@@ -1,103 +0,0 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/comment/continuecomment.js",["../../lib/codemirror"],a):a(CodeMirror)}(function(a){function m(b){if(b.getOption("disableInput"))return a.Pass;for(var d,c=b.listSelections(),r=[],q=0;q<c.length;q++){var n=c[q].head,p=b.getTokenAt(n);if("comment"!=p.type)return a.Pass;var e=a.innerMode(b.getMode(),p.state).mode;if(d){if(d!=e)return a.Pass}else d=e;e=null;
-if(d.blockCommentStart&&d.blockCommentContinue){var l,f=p.string.indexOf(d.blockCommentEnd),k=b.getRange(a.Pos(n.line,0),a.Pos(n.line,p.end));if(!(-1!=f&&f==p.string.length-d.blockCommentEnd.length&&n.ch>=f))if(0==p.string.indexOf(d.blockCommentStart)){if(e=k.slice(0,p.start),!/^\s*$/.test(e))for(e="",f=0;f<p.start;++f)e+=" "}else-1!=(l=k.indexOf(d.blockCommentContinue))&&l+d.blockCommentContinue.length>p.start&&/^\s*$/.test(k.slice(0,l))&&(e=k.slice(0,l));null!=e&&(e+=d.blockCommentContinue)}null==
-e&&d.lineComment&&t(b)&&(n=b.getLine(n.line),l=n.indexOf(d.lineComment),-1<l&&(e=n.slice(0,l),/\S/.test(e)?e=null:e+=d.lineComment+n.slice(l+d.lineComment.length).match(/^\s*/)[0]));if(null==e)return a.Pass;r[q]="\n"+e}b.operation(function(){for(var f=c.length-1;0<=f;f--)b.replaceRange(r[f],c[f].from(),c[f].to(),"+insert")})}function t(b){b=b.getOption("continueComments");return!b||"object"!=typeof b||!1!==b.continueLineComment}for(var g=["clike","css","javascript"],c=0;c<g.length;++c)a.extendMode(g[c],
-{blockCommentContinue:" * "});a.defineOption("continueComments",null,function(b,d,c){if(c&&c!=a.Init&&b.removeKeyMap("continueComment"),d)c="Enter","string"==typeof d?c=d:"object"==typeof d&&d.key&&(c=d.key),d={name:"continueComment"},d[c]=m,b.addKeyMap(d)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/edit/closebrackets.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(l,f){return"pairs"==f&&"string"==typeof l?l:"object"==typeof l&&null!=l[f]?l[f]:r[f]}function t(l){var f=l.state.closeBrackets;return!f||f.override?f:l.getModeAt(l.getCursor()).closeBrackets||f}function g(l,f){var k=t(l);if(!k||l.getOption("disableInput"))return a.Pass;
-var b=m(k,"pairs"),e=b.indexOf(f);if(-1==e)return a.Pass;for(var p,k=m(k,"triples"),n=b.charAt(e+1)==f,r=l.listSelections(),g=0==e%2,C=0;C<r.length;C++){var w;w=r[C];var u=w.head,y=l.getRange(u,q(u.line,u.ch+1));if(g&&!w.empty())w="surround";else if(!n&&g||y!=f)if(n&&1<u.ch&&0<=k.indexOf(f)&&l.getRange(q(u.line,u.ch-2),u)==f+f&&(2>=u.ch||l.getRange(q(u.line,u.ch-3),q(u.line,u.ch-2))!=f))w="addFour";else{if(n){if(a.isWordChar(y)||!d(l,u,f))return a.Pass}else if(!g||l.getLine(u.line).length!=u.ch&&
-!c(y,b)&&!/\s/.test(y))return a.Pass;w="both"}else w=n&&h(l,u)?"both":0<=k.indexOf(f)&&l.getRange(u,q(u.line,u.ch+3))==f+f+f?"skipThree":"skip";if(p){if(p!=w)return a.Pass}else p=w}var z=e%2?b.charAt(e-1):f,D=e%2?f:b.charAt(e+1);l.operation(function(){if("skip"==p)l.execCommand("goCharRight");else if("skipThree"==p)for(var f=0;3>f;f++)l.execCommand("goCharRight");else if("surround"==p){for(var k=l.getSelections(),f=0;f<k.length;f++)k[f]=z+k[f]+D;l.replaceSelections(k,"around");k=l.listSelections().slice();
-for(f=0;f<k.length;f++){var e=k,b=f,d;d=k[f];var c=0<a.cmpPos(d.anchor,d.head);d={anchor:new q(d.anchor.line,d.anchor.ch+(c?-1:1)),head:new q(d.head.line,d.head.ch+(c?1:-1))};e[b]=d}l.setSelections(k)}else"both"==p?(l.replaceSelection(z+D,null),l.triggerElectric(z+D),l.execCommand("goCharLeft")):"addFour"==p&&(l.replaceSelection(z+z+z+z,"before"),l.execCommand("goCharRight"))})}function c(l,f){var k=f.lastIndexOf(l);return-1<k&&1==k%2}function b(l,f){var k=l.getRange(q(f.line,f.ch-1),q(f.line,f.ch+
-1));return 2==k.length?k:null}function d(l,f,k){var e=l.getLine(f.line),b=l.getTokenAt(f);if(/\bstring2?\b/.test(b.type)||h(l,f))return!1;k=new a.StringStream(e.slice(0,f.ch)+k+e.slice(f.ch),4);for(k.pos=k.start=b.start;;){e=l.getMode().token(k,b.state);if(k.pos>=f.ch+1)return/\bstring2?\b/.test(e);k.start=k.pos}}function h(l,f){var k=l.getTokenAt(q(f.line,f.ch+1));return/\bstring/.test(k.type)&&k.start==f.ch}var r={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},q=a.Pos;a.defineOption("autoCloseBrackets",
-!1,function(l,f,k){k&&k!=a.Init&&(l.removeKeyMap(p),l.state.closeBrackets=null);f&&(l.state.closeBrackets=f,l.addKeyMap(p))});for(var n=r.pairs+"`",p={Backspace:function(l){var f=t(l);if(!f||l.getOption("disableInput"))return a.Pass;for(var k=m(f,"pairs"),f=l.listSelections(),e=0;e<f.length;e++){if(!f[e].empty())return a.Pass;var d=b(l,f[e].head);if(!d||0!=k.indexOf(d)%2)return a.Pass}for(e=f.length-1;0<=e;e--)k=f[e].head,l.replaceRange("",q(k.line,k.ch-1),q(k.line,k.ch+1),"+delete")},Enter:function(e){var f=
-t(e),f=f&&m(f,"explode");if(!f||e.getOption("disableInput"))return a.Pass;for(var k=e.listSelections(),d=0;d<k.length;d++){if(!k[d].empty())return a.Pass;var c=b(e,k[d].head);if(!c||0!=f.indexOf(c)%2)return a.Pass}e.operation(function(){e.replaceSelection("\n\n",null);e.execCommand("goCharLeft");k=e.listSelections();for(var f=0;f<k.length;f++){var b=k[f].head.line;e.indentLine(b,null,!0);e.indentLine(b+1,null,!0)}})}},e=0;e<n.length;e++)p["'"+n.charAt(e)+"'"]=function(e){return function(f){return g(f,
-e)}}(n.charAt(e))});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/fold/xml-fold",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(e,b,f,k){this.line=b;this.ch=f;this.cm=e;this.text=e.getLine(b);this.min=k?Math.max(k.from,e.firstLine()):e.firstLine();this.max=k?Math.min(k.to-1,e.lastLine()):e.lastLine()}function t(e,b){var f=e.cm.getTokenTypeAt(n(e.line,b));return f&&/\btag\b/.test(f)}function g(e){if(!(e.line>=
-e.max))return e.ch=0,e.text=e.cm.getLine(++e.line),!0}function c(e){if(!(e.line<=e.min))return e.text=e.cm.getLine(--e.line),e.ch=e.text.length,!0}function b(e){for(;;){var b=e.text.indexOf("\x3e",e.ch);if(-1==b){if(g(e))continue;break}if(t(e,b+1)){var f=e.text.lastIndexOf("/",b),f=-1<f&&!/\S/.test(e.text.slice(f+1,b));return e.ch=b+1,f?"selfClose":"regular"}e.ch=b+1}}function d(e){for(;;){var b=e.ch?e.text.lastIndexOf("\x3c",e.ch-1):-1;if(-1==b){if(c(e))continue;break}if(t(e,b+1)){p.lastIndex=b;
-e.ch=b;var f=p.exec(e.text);if(f&&f.index==b)return f}else e.ch=b}}function h(e){for(;;){p.lastIndex=e.ch;var b=p.exec(e.text);if(!b){if(g(e))continue;break}if(t(e,b.index+1))return e.ch=b.index+b[0].length,b;e.ch=b.index+1}}function r(e,d){for(var f=[];;){var k,a=h(e),c=e.line,p=e.ch-(a?a[0].length:0);if(!a||!(k=b(e)))break;if("selfClose"!=k)if(a[1]){for(var q=f.length-1;0<=q;--q)if(f[q]==a[2]){f.length=q;break}if(0>q&&(!d||d==a[2]))return{tag:a[2],from:n(c,p),to:n(e.line,e.ch)}}else f.push(a[2])}}
-function q(b,a){for(var f=[];;){var k;a:for(k=b;;){var p=k.ch?k.text.lastIndexOf("\x3e",k.ch-1):-1;if(-1==p){if(c(k))continue;k=void 0;break a}if(t(k,p+1)){var h=k.text.lastIndexOf("/",p),h=-1<h&&!/\S/.test(k.text.slice(h+1,p));k=(k.ch=p+1,h?"selfClose":"regular");break a}k.ch=p}if(!k)break;if("selfClose"!=k){k=b.line;p=b.ch;h=d(b);if(!h)break;if(h[1])f.push(h[2]);else{for(var q=f.length-1;0<=q;--q)if(f[q]==h[2]){f.length=q;break}if(0>q&&(!a||a==h[2]))return{tag:h[2],from:n(b.line,b.ch),to:n(k,p)}}}else d(b)}}
-var n=a.Pos,p=RegExp("\x3c(/?)([A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*)","g");a.registerHelper("fold","xml",function(e,a){for(var f=new m(e,a.line,0);;){var k,
-d=h(f);if(!d||f.line!=a.line||!(k=b(f)))break;if(!d[1]&&"selfClose"!=k)return k=n(f.line,f.ch),(f=r(f,d[2]))&&{from:k,to:f.from}}});a.findMatchingTag=function(e,a,f){var k=new m(e,a.line,a.ch,f);if(-1!=k.text.indexOf("\x3e")||-1!=k.text.indexOf("\x3c")){var c=b(k),p=c&&n(k.line,k.ch),h=c&&d(k);if(c&&h&&!(0<(k.line-a.line||k.ch-a.ch)))return a={from:n(k.line,k.ch),to:p,tag:h[2]},"selfClose"==c?{open:a,close:null,at:"open"}:h[1]?{open:q(k,h[2]),close:a,at:"close"}:(k=new m(e,p.line,p.ch,f),{open:a,
-close:r(k,h[2]),at:"open"})}};a.findEnclosingTag=function(b,a,f,k){for(var d=new m(b,a.line,a.ch,f);;){var c=q(d,k);if(!c)break;var p=new m(b,a.line,a.ch,f);if(p=r(p,c.tag))return{open:c,close:p}}};a.scanForClosingTag=function(b,a,f,k){return r(new m(b,a.line,a.ch,k?{from:0,to:k}:null),f)}});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define("addon/edit/closetag.js",["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})(function(a){function m(h){if(h.getOption("disableInput"))return a.Pass;for(var r=h.listSelections(),q=[],n=0;n<r.length;n++){if(!r[n].empty())return a.Pass;var p=r[n].head,e=h.getTokenAt(p),l=a.innerMode(h.getMode(),e.state),f=l.state;if("xml"!=
-l.mode.name||!f.tagName)return a.Pass;var k=h.getOption("autoCloseTags"),v="html"==l.mode.configuration,l="object"==typeof k&&k.dontCloseTags||v&&b,v="object"==typeof k&&k.indentTags||v&&d,k=f.tagName;e.end>p.ch&&(k=k.slice(0,k.length-e.end+p.ch));var t=k.toLowerCase();if(!k||"string"==e.type&&(e.end!=p.ch||!/[\"\']/.test(e.string.charAt(e.string.length-1))||1==e.string.length)||"tag"==e.type&&"closeTag"==f.type||e.string.indexOf("/")==e.string.length-1||l&&-1<g(l,t)||c(h,k,p,f,!0))return a.Pass;
-e=v&&-1<g(v,t);q[n]={indent:e,text:"\x3e"+(e?"\n\n":"")+"\x3c/"+k+"\x3e",newPos:e?a.Pos(p.line+1,0):a.Pos(p.line,p.ch+1)}}for(n=r.length-1;0<=n;n--)p=q[n],h.replaceRange(p.text,r[n].head,r[n].anchor,"+insert"),e=h.listSelections().slice(0),e[n]={head:p.newPos,anchor:p.newPos},h.setSelections(e),p.indent&&(h.indentLine(p.newPos.line,null,!0),h.indentLine(p.newPos.line+1,null,!0))}function t(b,d){for(var q=b.listSelections(),n=[],p=d?"/":"\x3c/",e=0;e<q.length;e++){if(!q[e].empty())return a.Pass;var l=
-q[e].head,f=b.getTokenAt(l),k=a.innerMode(b.getMode(),f.state),g=k.state;if(d&&("string"==f.type||"\x3c"!=f.string.charAt(0)||f.start!=l.ch-1))return a.Pass;if("xml"!=k.mode.name)if("htmlmixed"==b.getMode().name&&"javascript"==k.mode.name)k=p+"script";else{if("htmlmixed"!=b.getMode().name||"css"!=k.mode.name)return a.Pass;k=p+"style"}else{if(!g.context||!g.context.tagName||c(b,g.context.tagName,l,g))return a.Pass;k=p+g.context.tagName}"\x3e"!=b.getLine(l.line).charAt(f.end)&&(k+="\x3e");n[e]=k}b.replaceSelections(n);
-q=b.listSelections();for(e=0;e<q.length;e++)(e==q.length-1||q[e].head.line<q[e+1].head.line)&&b.indentLine(q[e].head.line)}function g(b,a){if(b.indexOf)return b.indexOf(a);for(var d=0,c=b.length;d<c;++d)if(b[d]==a)return d;return-1}function c(b,d,c,n,p){if(!a.scanForClosingTag)return!1;var e=Math.min(b.lastLine()+1,c.line+500);c=a.scanForClosingTag(b,c,null,e);if(!c||c.tag!=d)return!1;n=n.context;for(p=p?1:0;n&&n.tagName==d;n=n.prev)++p;c=c.to;for(n=1;n<p;n++){c=a.scanForClosingTag(b,c,null,e);if(!c||
-c.tag!=d)return!1;c=c.to}return!0}a.defineOption("autoCloseTags",!1,function(b,d,c){if(c!=a.Init&&c&&b.removeKeyMap("autoCloseTags"),d)c={name:"autoCloseTags"},("object"!=typeof d||d.whenClosing)&&(c["'/'"]=function(b){return b.getOption("disableInput")?a.Pass:t(b,!0)}),("object"!=typeof d||d.whenOpening)&&(c["'\x3e'"]=function(b){return m(b)}),b.addKeyMap(c)});var b="area base br col command embed hr img input keygen link meta param source track wbr".split(" "),d="applet blockquote body button div dl fieldset form frameset h1 h2 h3 h4 h5 h6 head html iframe layer legend object ol p select table ul".split(" ");
-a.commands.closeTag=function(b){return t(b)}});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/edit/matchbrackets.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(b,a,c){var e=b.getLineHandle(a.line),l=a.ch-1,f=c&&c.afterCursor;null==f&&(f=/(^| )cm-fat-cursor($| )/.test(b.getWrapperElement().className));e=!f&&0<=l&&h[e.text.charAt(l)]||h[e.text.charAt(++l)];if(!e)return null;f="\x3e"==e.charAt(1)?1:-1;if(c&&c.strict&&0<f!=
-(l==a.ch))return null;var k=b.getTokenTypeAt(d(a.line,l+1));b=t(b,d(a.line,l+(0<f?1:0)),f,k||null,c);return null==b?null:{from:d(a.line,l),to:b&&b.pos,match:b&&b.ch==e.charAt(0),forward:0<f}}function t(b,a,c,e,l){var f=l&&l.maxScanLineLength||1E4,k=l&&l.maxScanLines||1E3,g=[];l=l&&l.bracketRegex?l.bracketRegex:/[(){}[\]]/;for(var k=0<c?Math.min(a.line+k,b.lastLine()+1):Math.max(b.firstLine()-1,a.line-k),r=a.line;r!=k;r+=c){var t=b.getLine(r);if(t){var m=0<c?0:t.length-1,E=0<c?t.length:-1;if(!(t.length>
-f))for(r==a.line&&(m=a.ch-(0>c?1:0));m!=E;m+=c){var A=t.charAt(m);if(l.test(A)&&(void 0===e||b.getTokenTypeAt(d(r,m+1))==e))if("\x3e"==h[A].charAt(1)==0<c)g.push(A);else{if(!g.length)return{pos:d(r,m),ch:A};g.pop()}}}}return r-c!=(0<c?b.lastLine():b.firstLine())&&null}function g(a,c,p){for(var e=a.state.matchBrackets.maxHighlightLineLength||1E3,l=[],f=a.listSelections(),k=0;k<f.length;k++){var h=f[k].empty()&&m(a,f[k].head,p);if(h&&a.getLine(h.from.line).length<=e){var g=h.match?"CodeMirror-matchingbracket":
-"CodeMirror-nonmatchingbracket";l.push(a.markText(h.from,d(h.from.line,h.from.ch+1),{className:g}));h.to&&a.getLine(h.to.line).length<=e&&l.push(a.markText(h.to,d(h.to.line,h.to.ch+1),{className:g}))}}if(l.length){b&&a.state.focused&&a.focus();p=function(){a.operation(function(){for(var b=0;b<l.length;b++)l[b].clear()})};if(!c)return p;setTimeout(p,800)}}function c(b){b.operation(function(){r&&(r(),r=null);r=g(b,!1,b.state.matchBrackets)})}var b=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||
-8>document.documentMode),d=a.Pos,h={"(":")\x3e",")":"(\x3c","[":"]\x3e","]":"[\x3c","{":"}\x3e","}":"{\x3c"},r=null;a.defineOption("matchBrackets",!1,function(b,d,p){p&&p!=a.Init&&(b.off("cursorActivity",c),r&&(r(),r=null));d&&(b.state.matchBrackets="object"==typeof d?d:{},b.on("cursorActivity",c))});a.defineExtension("matchBrackets",function(){g(this,!0)});a.defineExtension("findMatchingBracket",function(b,a,c){return(c||"boolean"==typeof a)&&(c?(c.strict=a,a=c):a=a?{strict:!0}:null),m(this,b,a)});
-a.defineExtension("scanForBracket",function(b,a,c,e){return t(this,b,a,c,e)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define("addon/edit/matchtags.js",["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})(function(a){function m(a){a.state.tagHit&&a.state.tagHit.clear();a.state.tagOther&&a.state.tagOther.clear();a.state.tagHit=a.state.tagOther=null}function t(c){c.state.failedTagMatch=!1;c.operation(function(){if(m(c),!c.somethingSelected()){var b=
-c.getCursor(),d=c.getViewport();d.from=Math.min(d.from,b.line);d.to=Math.max(b.line+1,d.to);if(b=a.findMatchingTag(c,b,d))c.state.matchBothTags&&(d="open"==b.at?b.open:b.close)&&(c.state.tagHit=c.markText(d.from,d.to,{className:"CodeMirror-matchingtag"})),(b="close"==b.at?b.open:b.close)?c.state.tagOther=c.markText(b.from,b.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}})}function g(a){a.state.failedTagMatch&&t(a)}a.defineOption("matchTags",!1,function(c,b,d){d&&d!=a.Init&&(c.off("cursorActivity",
-t),c.off("viewportChange",g),m(c));b&&(c.state.matchBothTags="object"==typeof b&&b.bothTags,c.on("cursorActivity",t),c.on("viewportChange",g),t(c))});a.commands.toMatchingTag=function(c){var b=a.findMatchingTag(c,c.getCursor());b&&(b="close"==b.at?b.open:b.close)&&c.extendSelection(b.to,b.from)}});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/edit/trailingspace.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){a.defineOption("showTrailingSpace",!1,function(m,t,g){g==a.Init&&(g=!1);g&&!t?m.removeOverlay("trailingspace"):!g&&t&&m.addOverlay({token:function(a){for(var b=a.string.length,d=b;d&&/\s/.test(a.string.charAt(d-1));--d);return d>a.pos?(a.pos=d,null):(a.pos=b,"trailingspace")},
-name:"trailingspace"})})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/fold/foldcode",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(b,d,c,r){function q(f){var a=n(b,d);if(!a||a.to.line-a.from.line<p)return null;for(var e=b.findMarksAt(a.from),c=0;c<e.length;++c)if(e[c].__isFold&&"fold"!==r){if(!f)return null;a.cleared=!0;e[c].clear()}return a}if(c&&c.call){var n=c;c=null}else n=g(b,c,"rangeFinder");
-"number"==typeof d&&(d=a.Pos(d,0));var p=g(b,c,"minFoldSize"),e=q(!0);if(g(b,c,"scanUp"))for(;!e&&d.line>b.firstLine();)d=a.Pos(d.line-1,0),e=q(!1);if(e&&!e.cleared&&"unfold"!==r){var l=t(b,c);a.on(l,"mousedown",function(b){f.clear();a.e_preventDefault(b)});var f=b.markText(e.from,e.to,{replacedWith:l,clearOnEnter:g(b,c,"clearOnEnter"),__isFold:!0});f.on("clear",function(f,c){a.signal(b,"unfold",b,f,c)});a.signal(b,"fold",b,e.from,e.to)}}function t(b,a){var c=g(b,a,"widget");if("string"==typeof c){var r=
-document.createTextNode(c),c=document.createElement("span");c.appendChild(r);c.className="CodeMirror-foldmarker"}else c&&(c=c.cloneNode(!0));return c}function g(b,a,h){return a&&void 0!==a[h]?a[h]:(b=b.options.foldOptions)&&void 0!==b[h]?b[h]:c[h]}a.newFoldFunction=function(b,a){return function(c,g){m(c,g,{rangeFinder:b,widget:a})}};a.defineExtension("foldCode",function(b,a,c){m(this,b,a,c)});a.defineExtension("isFolded",function(b){b=this.findMarksAt(b);for(var a=0;a<b.length;++a)if(b[a].__isFold)return!0});
-a.commands.toggleFold=function(b){b.foldCode(b.getCursor())};a.commands.fold=function(b){b.foldCode(b.getCursor(),null,"fold")};a.commands.unfold=function(b){b.foldCode(b.getCursor(),null,"unfold")};a.commands.foldAll=function(b){b.operation(function(){for(var c=b.firstLine(),h=b.lastLine();c<=h;c++)b.foldCode(a.Pos(c,0),null,"fold")})};a.commands.unfoldAll=function(b){b.operation(function(){for(var c=b.firstLine(),h=b.lastLine();c<=h;c++)b.foldCode(a.Pos(c,0),null,"unfold")})};a.registerHelper("fold",
-"combine",function(){var b=Array.prototype.slice.call(arguments,0);return function(a,c){for(var g=0;g<b.length;++g){var t=b[g](a,c);if(t)return t}}});a.registerHelper("fold","auto",function(b,a){for(var c=b.getHelpers(a,"fold"),g=0;g<c.length;g++){var t=c[g](b,a);if(t)return t}});var c={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null);a.defineExtension("foldOption",function(b,a){return g(this,b,a)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define("addon/fold/foldgutter.js",["../../lib/codemirror","./foldcode"],a):a(CodeMirror)})(function(a){function m(b){this.options=b;this.from=this.to=0}function t(b,a){for(var c=b.findMarks(n(a,0),n(a+1,0)),f=0;f<c.length;++f)if(c[f].__isFold&&c[f].find().from.line==a)return c[f]}function g(b){if("string"==typeof b){var a=document.createElement("div");
-return a.className=b+" CodeMirror-guttermarker-subtle",a}return b.cloneNode(!0)}function c(b,a,c){var f=b.state.foldGutter.options,k=a,d=b.foldOption(f,"minFoldSize"),h=b.foldOption(f,"rangeFinder");b.eachLine(a,c,function(a){var c=null;if(t(b,k))c=g(f.indicatorFolded);else{var e=n(k,0);(e=h&&h(b,e))&&e.to.line-e.from.line>=d&&(c=g(f.indicatorOpen))}b.setGutterMarker(a,f.gutter,c);++k})}function b(b){var a=b.getViewport(),d=b.state.foldGutter;d&&(b.operation(function(){c(b,a.from,a.to)}),d.from=a.from,
-d.to=a.to)}function d(b,a,c){var f=b.state.foldGutter;f&&(f=f.options,c==f.gutter&&((c=t(b,a))?c.clear():b.foldCode(n(a,0),f.rangeFinder)))}function h(a){var c=a.state.foldGutter;if(c){var d=c.options;c.from=c.to=0;clearTimeout(c.changeUpdate);c.changeUpdate=setTimeout(function(){b(a)},d.foldOnChangeTimeSpan||600)}}function r(a){var e=a.state.foldGutter;if(e){var d=e.options;clearTimeout(e.changeUpdate);e.changeUpdate=setTimeout(function(){var f=a.getViewport();e.from==e.to||20<f.from-e.to||20<e.from-
-f.to?b(a):a.operation(function(){f.from<e.from&&(c(a,f.from,e.from),e.from=f.from);f.to>e.to&&(c(a,e.to,f.to),e.to=f.to)})},d.updateViewportTimeSpan||400)}}function q(b,a){var d=b.state.foldGutter;if(d){var f=a.line;f>=d.from&&f<d.to&&c(b,f,f+1)}}a.defineOption("foldGutter",!1,function(c,e,l){l&&l!=a.Init&&(c.clearGutter(c.state.foldGutter.options.gutter),c.state.foldGutter=null,c.off("gutterClick",d),c.off("change",h),c.off("viewportChange",r),c.off("fold",q),c.off("unfold",q),c.off("swapDoc",h));
-if(e){l=c.state;var f=e;e=(!0===f&&(f={}),null==f.gutter&&(f.gutter="CodeMirror-foldgutter"),null==f.indicatorOpen&&(f.indicatorOpen="CodeMirror-foldgutter-open"),null==f.indicatorFolded&&(f.indicatorFolded="CodeMirror-foldgutter-folded"),f);l.foldGutter=new m(e);b(c);c.on("gutterClick",d);c.on("change",h);c.on("viewportChange",r);c.on("fold",q);c.on("unfold",q);c.on("swapDoc",h)}});var n=a.Pos});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/fold/brace-fold.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){a.registerHelper("fold","brace",function(m,t){function g(f){for(var k=t.ch,e=0;;)if(k=0>=k?-1:d.lastIndexOf(f,k-1),-1!=k){if(1==e&&k<t.ch)break;if(c=m.getTokenTypeAt(a.Pos(b,k+1)),!/^(comment|string)/.test(c))return k+1;--k}else{if(1==e)break;e=1;k=d.length}}var c,b=t.line,d=
-m.getLine(b),h="{",r="}",q=g("{");if(null==q&&(h="[",r="]",q=g("[")),null!=q){var n,p,e=1,l=m.lastLine(),f=b;a:for(;f<=l;++f)for(var k=m.getLine(f),v=f==b?q:0;;){var x=k.indexOf(h,v),B=k.indexOf(r,v);if(0>x&&(x=k.length),0>B&&(B=k.length),(v=Math.min(x,B))==k.length)break;if(m.getTokenTypeAt(a.Pos(f,v+1))==c)if(v==x)++e;else if(!--e){n=f;p=v;break a}++v}if(null!=n&&(b!=n||p!=q))return{from:a.Pos(b,q),to:a.Pos(n,p)}}});a.registerHelper("fold","import",function(m,t){function g(b){if(b<m.firstLine()||
-b>m.lastLine())return null;var c=m.getTokenAt(a.Pos(b,1));if(/\S/.test(c.string)||(c=m.getTokenAt(a.Pos(b,c.end+1))),"keyword"!=c.type||"import"!=c.string)return null;var d=b;for(b=Math.min(m.lastLine(),b+10);d<=b;++d){var g=m.getLine(d).indexOf(";");if(-1!=g)return{startCh:c.end,end:a.Pos(d,g)}}}var c,b=t.line,d=g(b);if(!d||g(b-1)||(c=g(b-2))&&c.end.line==b-1)return null;for(c=d.end;;){var h=g(c.line+1);if(null==h)break;c=h.end}return{from:m.clipPos(a.Pos(b,d.startCh+1)),to:c}});a.registerHelper("fold",
-"include",function(m,t){function g(b){if(b<m.firstLine()||b>m.lastLine())return null;var c=m.getTokenAt(a.Pos(b,1));return/\S/.test(c.string)||(c=m.getTokenAt(a.Pos(b,c.end+1))),"meta"==c.type&&"#include"==c.string.slice(0,8)?c.start+8:void 0}var c=t.line,b=g(c);if(null==b||null!=g(c-1))return null;for(var d=c;null!=g(d+1);)++d;return{from:a.Pos(c,b+1),to:m.clipPos(a.Pos(d))}})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/fold/comment-fold.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){a.registerGlobalHelper("fold","comment",function(a){return a.blockCommentStart&&a.blockCommentEnd},function(m,t){var g=m.getModeAt(t),c=g.blockCommentStart,g=g.blockCommentEnd;if(c&&g){var b,d=t.line;b=m.getLine(d);for(var h=t.ch,r=0;;)if(h=0>=h?-1:b.lastIndexOf(c,h-1),-1!=
-h){if(1==r&&h<t.ch)return;if(/comment/.test(m.getTokenTypeAt(a.Pos(d,h+1)))&&(0==h||b.slice(h-g.length,h)==g||!/comment/.test(m.getTokenTypeAt(a.Pos(d,h))))){b=h+c.length;break}--h}else{if(1==r)return;r=1;h=b.length}var q,n,r=1,h=m.lastLine(),p=d;a:for(;p<=h;++p)for(var e=m.getLine(p),l=p==d?b:0;;){var f=e.indexOf(c,l),k=e.indexOf(g,l);if(0>f&&(f=e.length),0>k&&(k=e.length),(l=Math.min(f,k))==e.length)break;if(l==f)++r;else if(!--r){q=p;n=l;break a}++l}if(null!=q&&(d!=q||n!=b))return{from:a.Pos(d,
-b),to:a.Pos(q,n)}}})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/fold/indent-fold.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(t,g){var c=t.getLine(g),b=c.search(/\S/);return-1==b||/\bcomment\b/.test(t.getTokenTypeAt(a.Pos(g,b+1)))?-1:a.countColumn(c,null,t.getOption("tabSize"))}a.registerHelper("fold","indent",function(t,g){var c=m(t,g.line);if(!(0>c)){for(var b=null,d=g.line+1,h=t.lastLine();d<=
-h;++d){var r=m(t,d);if(-1!=r){if(!(r>c))break;b=d}}return b?{from:a.Pos(g.line,t.getLine(g.line).length),to:a.Pos(b,t.getLine(b).length)}:void 0}})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/format/autoFormatAll.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){a.defineExtension("autoFormatAll",function(m,t){for(var g=this,c=g.getMode(),b=g.getRange(m,t).split("\n"),d=a.copyState(c,g.getTokenAt(m).state),h=g.getOption("tabSize"),r="",q=0,n=0==m.ch,p=0;p<b.length;++p){for(var e=new a.StringStream(b[p],h);!e.eol();){var l=a.innerMode(c,
-d),f=c.token(e,d),k=e.current();e.start=e.pos;n&&!/\S/.test(k)||(r+=k,n=!1);!n&&l.mode.newlineAfterToken&&l.mode.newlineAfterToken(f,k,e.string.slice(e.pos)||b[p+1]||"",l.state)&&(r+="\n",n=!0,++q)}!e.pos&&c.blankLine&&c.blankLine(d);!n&&p<b.length-1&&(r+="\n",n=!0,++q)}g.operation(function(){g.replaceRange(r,m,t);for(var b=m.line+1,a=m.line+q;b<=a;++b)g.indentLine(b,"smart");g.setCursor({line:0,ch:0})})})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/format/formatting.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(a){for(var g=[/for\s*?\((.*?)\)/g,/&#?[a-z0-9]+;[\s\S]/g,/\"(.*?)((\")|$)/g,/\/\*(.*?)(\*\/|$)/g,/^\/\/.*/g],c=[],b=0;b<g.length;b++)for(var d=0;d<a.length;){var h=a.substr(d).match(g[b]);if(null==h)break;c.push({start:d+h.index,end:d+h.index+h[0].length});d+=h.index+
-Math.max(1,h[0].length)}return c.sort(function(b,a){return b.start-a.start}),c}a.extendMode("css",{commentStart:"/*",commentEnd:"*/",newlineAfterToken:function(a,g){return/^[;{}]$/.test(g)}});a.extendMode("javascript",{commentStart:"/*",commentEnd:"*/",wordWrapChars:[";","\\{","\\}"],autoFormatLineBreaks:function(a){var g=0,c=this.jsonMode?function(b){return b.replace(/([,{])/g,"$1\n").replace(/}/g,"\n}")}:function(b){return b.replace(/(;|\{|\})([^\r\n;])/g,"$1\n$2")},b=m(a),d="";if(null!=b){for(var h=
-0;h<b.length;h++)b[h].start>g&&(d+=c(a.substring(g,b[h].start)),g=b[h].start),b[h].start<=g&&b[h].end>=g&&(d+=a.substring(g,b[h].end),g=b[h].end);g<a.length&&(d+=c(a.substr(g)))}else d=c(a);return d.replace(/^\n*|\n*$/,"")}});a.extendMode("xml",{commentStart:"\x3c!--",commentEnd:"--\x3e",noBreak:!1,noBreakEmpty:null,tagType:"",tagName:"",isXML:!1,newlineAfterToken:function(a,g,c,b){b=!1;var d=null,h="";if(this.isXML="xml"==this.configuration,"comment"==a||/\x3c!--/.test(c))return!1;if("tag"==a){0==
-g.indexOf("\x3c")&&0==!g.indexOf("\x3c/")&&(this.tagType="open",d=g.match(/^<\s*?([\w]+?)$/i),this.tagName=null!=d?d[1]:"",h=this.tagName.toLowerCase(),-1!="|label|li|option|textarea|title|a|b|bdi|bdo|big|center|cite|del|em|font|i|img|ins|s|small|span|strike|strong|sub|sup|u|".indexOf("|"+h+"|")&&(this.noBreak=!0));if(0==g.indexOf("\x3e")&&"open"==this.tagType)return this.tagType="",RegExp("^"+(this.isXML?"[^\x3c]*?":"")+"\x3c/s*?"+this.tagName+"s*?\x3e","i").test(c)?(this.noBreak=!1,this.isXML||
-(this.tagName=""),!1):(b=this.noBreak,this.noBreak=!1,!b);if(0==g.indexOf("\x3c/")&&(this.tagType="close",d=g.match(/^<\/\s*?([\w]+?)$/i),null!=d&&(h=d[1].toLowerCase()),-1!="|a|b|bdi|bdo|big|center|cite|del|em|font|i|img|ins|s|small|span|strike|strong|sub|sup|u|".indexOf("|"+h+"|")&&(this.noBreak=!0)),0==g.indexOf("\x3e")&&"close"==this.tagType)return this.tagType="",0==c.indexOf("\x3c")&&(d=c.match(/^<\/?\s*?([\w]+?)(\s|>)/i),h=null!=d?d[1].toLowerCase():"",-1=="|label|li|option|textarea|title|a|b|bdi|bdo|big|center|cite|del|em|font|i|img|ins|s|small|span|strike|strong|sub|sup|u|".indexOf("|"+
-h+"|"))?(this.noBreak=!1,!0):(b=this.noBreak,this.noBreak=!1,!b)}return 0==c.indexOf("\x3c")&&(this.noBreak=!1,this.isXML&&""!=this.tagName?(this.tagName="",!1):(d=c.match(/^<\/?\s*?([\w]+?)(\s|>)/i),h=null!=d?d[1].toLowerCase():"",-1=="|label|li|option|textarea|title|a|b|bdi|bdo|big|center|cite|del|em|font|i|img|ins|s|small|span|strike|strong|sub|sup|u|".indexOf("|"+h+"|")))}});a.defineExtension("commentRange",function(t,g,c){var b=this,d=a.innerMode(b.getMode(),b.getTokenAt(g).state).mode;b.operation(function(){if(t)b.replaceRange(d.commentEnd,
-c),b.replaceRange(d.commentStart,g),b.setSelection(g,{line:c.line,ch:c.ch+d.commentStart.length+d.commentEnd.length}),g.line==c.line&&g.ch==c.ch&&b.setCursor(g.line,g.ch+d.commentStart.length);else{var a=b.getRange(g,c),r=a.indexOf(d.commentStart),q=a.lastIndexOf(d.commentEnd);-1<r&&-1<q&&q>r&&(a=a.substr(0,r)+a.substring(r+d.commentStart.length,q)+a.substr(q+d.commentEnd.length));b.replaceRange(a,g,c);b.setSelection(g,{line:c.line,ch:c.ch-d.commentStart.length-d.commentEnd.length})}})});a.defineExtension("autoIndentRange",
-function(a,g){var c=this;this.operation(function(){for(var b=a.line;b<=g.line;b++)c.indentLine(b,"smart")})});a.defineExtension("autoFormatRange",function(t,g){for(var c=this,b=c.getMode(),d=c.getRange(t,g).split("\n"),h=a.copyState(b,c.getTokenAt(t).state),r=c.getOption("tabSize"),q="",n=0,p=0==t.ch,e=0;e<d.length;++e){for(var l=new a.StringStream(d[e],r);!l.eol();){var f=a.innerMode(b,h),k=b.token(l,h),m=l.current();l.start=l.pos;p&&!/\S/.test(m)||(q+=m,p=!1);!p&&f.mode.newlineAfterToken&&f.mode.newlineAfterToken(k,
-m,l.string.slice(l.pos)||d[e+1]||"",f.state)&&(q+="\n",p=!0,++n)}!l.pos&&b.blankLine&&b.blankLine(h);!p&&e<d.length-1&&(q+="\n",p=!0,++n)}c.operation(function(){c.replaceRange(q,t,g);for(var b=t.line+1,a=t.line+n;b<=a;++b)c.indentLine(b,"smart");c.setSelection(t,c.getCursor(!1))})})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/selection/active-line.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(a){for(var c=0;c<a.state.activeLines.length;c++)a.removeLineClass(a.state.activeLines[c],"wrap",b),a.removeLineClass(a.state.activeLines[c],"background",d),a.removeLineClass(a.state.activeLines[c],"gutter",h)}function t(b,a){if(b.length!=a.length)return!1;for(var c=
-0;c<b.length;c++)if(b[c]!=a[c])return!1;return!0}function g(a,c){for(var g=[],p=0;p<c.length;p++){var e=c[p],l=a.getOption("styleActiveLine");if("object"==typeof l&&l.nonEmpty?e.anchor.line==e.head.line:e.empty())e=a.getLineHandleVisualStart(e.head.line),g[g.length-1]!=e&&g.push(e)}t(a.state.activeLines,g)||a.operation(function(){m(a);for(var c=0;c<g.length;c++)a.addLineClass(g[c],"wrap",b),a.addLineClass(g[c],"background",d),a.addLineClass(g[c],"gutter",h);a.state.activeLines=g})}function c(b,a){g(b,
-a.ranges)}var b="CodeMirror-activeline",d="CodeMirror-activeline-background",h="CodeMirror-activeline-gutter";a.defineOption("styleActiveLine",!1,function(b,d,h){h=h!=a.Init&&h;d!=h&&(h&&(b.off("beforeSelectionChange",c),m(b),delete b.state.activeLines),d&&(b.state.activeLines=[],g(b,b.listSelections()),b.on("beforeSelectionChange",c)))})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/search/searchcursor",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(b){if(!b.global){var a=b.flags;b=new RegExp(b.source,(null!=a?a:(b.ignoreCase?"i":"")+(b.global?"g":"")+(b.multiline?"m":""))+"g")}return b}function t(b,a,c){a=m(a);var e=c.line,d=c.ch;for(c=b.lastLine();e<=c;e++,d=0)if(a.lastIndex=d,d=b.getLine(e),d=a.exec(d))return{from:l(e,
-d.index),to:l(e,d.index+d[0].length),match:d}}function g(b,a,c){if(!/\\s|\\n|\n|\\W|\\D|\[\^/.test(a.source))return t(b,a,c);a=m(a);for(var d,e=1,g=c.line,h=b.lastLine();g<=h;){for(var p=0;p<e;p++){var n=b.getLine(g++);d=null==d?n:d+"\n"+n}e*=2;a.lastIndex=c.ch;if(p=a.exec(d))return a=d.slice(0,p.index).split("\n"),b=p[0].split("\n"),c=c.line+a.length-1,a=a[a.length-1].length,{from:l(c,a),to:l(c+b.length-1,1==b.length?a+b[0].length:b[b.length-1].length),match:p}}}function c(b,a){for(var c,d=0;;){a.lastIndex=
-d;var e=a.exec(b);if(!e||(c=e,(d=c.index+(c[0].length||1))==b.length))return c}}function b(b,a,d){a=m(a);var e=d.line,g=d.ch;for(d=b.firstLine();e>=d;e--,g=-1){var h=b.getLine(e);-1<g&&(h=h.slice(0,g));if(g=c(h,a))return{from:l(e,g.index),to:l(e,g.index+g[0].length),match:g}}}function d(b,a,d){a=m(a);for(var e,g=1,h=d.line,p=b.firstLine();h>=p;){for(var n=0;n<g;n++){var t=b.getLine(h--);e=null==e?t.slice(0,d.ch):t+"\n"+e}g*=2;if(n=c(e,a))return a=e.slice(0,n.index).split("\n"),b=n[0].split("\n"),
-h+=a.length,a=a[a.length-1].length,{from:l(h,a),to:l(h+b.length-1,1==b.length?a+b[0].length:b[b.length-1].length),match:n}}}function h(b,a,c,d){if(b.length==a.length)return c;var e=0;for(a=c+Math.max(0,b.length-a.length);;){if(e==a)return e;var g=e+a>>1,l=d(b.slice(0,g)).length;if(l==c)return g;l>c?a=g:e=g+1}}function r(b,a,c,d){if(!a.length)return null;d=d?p:e;a=d(a).split(/\r|\n\r?/);var g=c.line;c=c.ch;var n=b.lastLine()+1-a.length;a:for(;g<=n;g++,c=0){var t=b.getLine(g).slice(c),m=d(t);if(1==
-a.length){var q=m.indexOf(a[0]);if(-1==q)continue a;h(t,m,q,d);return{from:l(g,h(t,m,q,d)+c),to:l(g,h(t,m,q+a[0].length,d)+c)}}q=m.length-a[0].length;if(m.slice(q)==a[0]){for(var r=1;r<a.length-1;r++)if(d(b.getLine(g+r))!=a[r])continue a;var r=b.getLine(g+a.length-1),u=d(r),y=a[a.length-1];if(r.slice(0,y.length)==y)return{from:l(g,h(t,m,q,d)+c),to:l(g+a.length-1,h(r,u,y.length,d))}}}}function q(a,b,c,d){if(!b.length)return null;d=d?p:e;b=d(b).split(/\r|\n\r?/);var g=c.line,n=c.ch,t=a.firstLine()-
-1+b.length;a:for(;g>=t;g--,n=-1){var m=a.getLine(g);-1<n&&(m=m.slice(0,n));n=d(m);if(1==b.length){c=n.lastIndexOf(b[0]);if(-1==c)continue a;return{from:l(g,h(m,n,c,d)),to:l(g,h(m,n,c+b[0].length,d))}}var q=b[b.length-1];if(n.slice(0,q.length)==q){var r=1;for(c=g-b.length+1;r<b.length-1;r++)if(d(a.getLine(c+r))!=b[r])continue a;c=a.getLine(g+1-b.length);r=d(c);if(r.slice(r.length-b[0].length)==b[0])return{from:l(g+1-b.length,h(c,r,c.length-b[0].length,d)),to:l(g,h(m,n,q.length,d))}}}}function n(a,
-c,e,h){this.atOccurrence=!1;this.doc=a;e=e?a.clipPos(e):l(0,0);this.pos={from:e,to:e};var n;"object"==typeof h?n=h.caseFold:(n=h,h=null);"string"==typeof c?(null==n&&(n=!1),this.matches=function(b,d){return(b?q:r)(a,c,d,n)}):(c=m(c),h&&!1===h.multiline?this.matches=function(d,e){return(d?b:t)(a,c,e)}:this.matches=function(b,e){return(b?d:g)(a,c,e)})}var p,e,l=a.Pos;String.prototype.normalize?(p=function(b){return b.normalize("NFD").toLowerCase()},e=function(b){return b.normalize("NFD")}):(p=function(b){return b.toLowerCase()},
-e=function(b){return b});n.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(b){for(var c=this.matches(b,this.doc.clipPos(b?this.pos.from:this.pos.to));c&&0==a.cmpPos(c.from,c.to);)b?c.from.ch?c.from=l(c.from.line,c.from.ch-1):c=c.from.line==this.doc.firstLine()?null:this.matches(b,this.doc.clipPos(l(c.from.line-1))):c.to.ch<this.doc.getLine(c.to.line).length?c.to=l(c.to.line,c.to.ch+1):c=c.to.line==this.doc.lastLine()?null:this.matches(b,
-l(c.to.line+1,0));if(c)return this.pos=c,this.atOccurrence=!0,this.pos.match||!0;b=l(b?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:b,to:b},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var d=a.splitLines(b);this.doc.replaceRange(d,this.pos.from,this.pos.to,c);this.pos.to=l(this.pos.from.line+d.length-1,d[d.length-1].length+(1==d.length?this.pos.from.ch:
-0))}}};a.defineExtension("getSearchCursor",function(b,a,c){return new n(this.doc,b,a,c)});a.defineDocExtension("getSearchCursor",function(b,a,c){return new n(this,b,a,c)});a.defineExtension("selectMatches",function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(0<a.cmpPos(e.to(),this.getCursor("to")));)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/scroll/annotatescrollbar",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function m(a,g){function c(a){clearTimeout(b.doRedraw);b.doRedraw=setTimeout(function(){b.redraw()},a)}this.cm=a;this.options=g;this.buttonHeight=g.scrollButtonHeight||a.getOption("scrollButtonHeight");this.annotations=[];this.doRedraw=this.doUpdate=null;this.div=a.getWrapperElement().appendChild(document.createElement("div"));
-this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";this.computeScale();var b=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(b.doUpdate);b.doUpdate=setTimeout(function(){b.computeScale()&&c(20)},100)});a.on("markerAdded",this.resizeHandler);a.on("markerCleared",this.resizeHandler);!1!==g.listenForChanges&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",function(a){return"string"==typeof a&&(a={className:a}),
-new m(this,a)});a.defineOption("scrollButtonHeight",0);m.prototype.computeScale=function(){var a=this.cm,a=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(a!=this.hScale)return this.hScale=a,!0};m.prototype.update=function(a){this.annotations=a;this.redraw()};m.prototype.redraw=function(a){function g(a,b){return q!=a.line&&(q=a.line,n=c.getLineHandle(q)),n.widgets&&n.widgets.length||h&&n.height>m?c.charCoords(a,"local")[b?"top":"bottom"]:
-c.heightAtLine(n,"local")+(b?0:n.height)}!1!==a&&this.computeScale();var c=this.cm;a=this.hScale;var b=document.createDocumentFragment(),d=this.annotations,h=c.getOption("lineWrapping"),m=h&&1.5*c.defaultTextHeight(),q=null,n=null,p=c.lastLine();if(c.display.barWidth)for(var e,l=0;l<d.length;l++){var f=d[l];if(!(f.to.line>p)){for(var k=e||g(f.from,!0)*a,v=g(f.to,!1)*a;l<d.length-1&&!(d[l+1].to.line>p)&&!((e=g(d[l+1].from,!0)*a)>v+.9);)f=d[++l],v=g(f.to,!1)*a;if(v!=k){var v=Math.max(v-k,3),x=b.appendChild(document.createElement("div"));
-x.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(k+this.buttonHeight)+"px; height: "+v+"px";x.className=this.options.className;f.id&&x.setAttribute("annotation-id",f.id)}}}this.div.textContent="";this.div.appendChild(b)};m.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler);this.cm.off("markerAdded",this.resizeHandler);this.cm.off("markerCleared",this.resizeHandler);this.changeHandler&&this.cm.off("change",this.changeHandler);
-this.div.parentNode.removeChild(this.div)}});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar")):"function"==typeof define&&define.amd?define("addon/search/matchesonscrollbar",["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a):a(CodeMirror)})(function(a){function m(a,c,b,d){this.cm=a;this.options=d;var h={listenForChanges:!1},m;for(m in d)h[m]=d[m];h.className||(h.className="CodeMirror-search-match");this.annotation=
-a.annotateScrollbar(h);this.query=c;this.caseFold=b;this.gap={from:a.firstLine(),to:a.lastLine()+1};this.matches=[];this.update=null;this.findMatches();this.annotation.update(this.matches);var q=this;a.on("change",this.changeHandler=function(a,b){q.onChange(b)})}function t(a,c,b){return a<=c?a:Math.max(c,a+b)}a.defineExtension("showMatchesOnScrollbar",function(a,c,b){return"string"==typeof b&&(b={className:b}),b||(b={}),new m(this,a,c,b)});m.prototype.findMatches=function(){if(this.gap){for(var g=
-0;g<this.matches.length;g++){var c=this.matches[g];if(c.from.line>=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(g--,1)}for(var b=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),d=this.options&&this.options.maxMatches||1E3;b.findNext();){c={from:b.from(),to:b.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(g++,0,c),this.matches.length>d)break}this.gap=null}};m.prototype.onChange=function(g){var c=g.from.line,b=a.changeEnd(g).line,d=b-g.to.line;
-if(this.gap?(this.gap.from=Math.min(t(this.gap.from,c,d),g.from.line),this.gap.to=Math.max(t(this.gap.to,c,d),g.from.line)):this.gap={from:g.from.line,to:b+1},d)for(g=0;g<this.matches.length;g++){var b=this.matches[g],h=t(b.from.line,c,d);h!=b.from.line&&(b.from=a.Pos(h,b.from.ch));h=t(b.to.line,c,d);h!=b.to.line&&(b.to=a.Pos(h,b.to.ch))}clearTimeout(this.update);var m=this;this.update=setTimeout(function(){m.updateAfterChange()},250)};m.prototype.updateAfterChange=function(){this.findMatches();this.annotation.update(this.matches)};
-m.prototype.clear=function(){this.cm.off("change",this.changeHandler);this.annotation.clear()}});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define("addon/search/match-highlighter.js",["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)})(function(a){function m(a){this.options={};for(var b in q)this.options[b]=(a&&a.hasOwnProperty(b)?a:q)[b];this.matchesonscroll=this.overlay=this.timeout=null;this.active=!1}function t(a){var b=a.state.matchHighlighter;(b.active||
-a.hasFocus())&&c(a,b)}function g(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,c(a,b))}function c(a,b){clearTimeout(b.timeout);b.timeout=setTimeout(function(){h(a)},b.options.delay)}function b(a,b,c,d){var f=a.state.matchHighlighter;if(a.addOverlay(f.overlay=r(b,c,d)),f.options.annotateScrollbar&&a.showMatchesOnScrollbar)f.matchesonscroll=a.showMatchesOnScrollbar(c?new RegExp("\\b"+b+"\\b"):b,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}function d(a){var b=a.state.matchHighlighter;
-b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation(function(){var c=a.state.matchHighlighter;if(d(a),!a.somethingSelected()&&c.options.showToken){for(var e=!0===c.options.showToken?/[\w$]/:c.options.showToken,g=a.getCursor(),f=a.getLine(g.line),h=g=g.ch;g&&e.test(f.charAt(g-1));)--g;for(;h<f.length&&e.test(f.charAt(h));)++h;return void(g<h&&b(a,f.slice(g,h),e,c.options.style))}e=a.getCursor("from");
-f=a.getCursor("to");if((g=e.line==f.line)&&!(g=!c.options.wordsOnly))a:if(null!==a.getRange(e,f).match(/^\w+$/)){if(0<e.ch&&(g={line:e.line,ch:e.ch-1},g=a.getRange(g,e),null===g.match(/\W/))){g=!1;break a}if(f.ch<a.getLine(e.line).length&&(g={line:f.line,ch:f.ch+1},g=a.getRange(f,g),null===g.match(/\W/))){g=!1;break a}g=!0}else g=!1;g&&(e=a.getRange(e,f),c.options.trim&&(e=e.replace(/^\s+|\s+$/g,"")),e.length>=c.options.minChars&&b(a,e,!1,c.options.style))})}function r(a,b,c){return{token:function(d){var f;
-if(f=d.match(a))(f=!b)||(f=!(d.start&&b.test(d.string.charAt(d.start-1))||d.pos!=d.string.length&&b.test(d.string.charAt(d.pos))));if(f)return c;d.next();d.skipTo(a.charAt(0))||d.skipToEnd()}}}var q={style:"matchhighlight",minChars:2,delay:100,wordsOnly:!1,annotateScrollbar:!1,showToken:!1,trim:!0};a.defineOption("highlightSelectionMatches",!1,function(b,c,e){if(e&&e!=a.Init&&(d(b),clearTimeout(b.state.matchHighlighter.timeout),b.state.matchHighlighter=null,b.off("cursorActivity",t),b.off("focus",
-g)),c)c=b.state.matchHighlighter=new m(c),b.hasFocus()?(c.active=!0,h(b)):b.on("focus",g),b.on("cursorActivity",t)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/mode/multiplex.js",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){a.multiplexingMode=function(m){function t(a,b,d,g){return"string"==typeof b?(d=a.indexOf(b,d),g&&-1<d?d+b.length:d):(b=b.exec(d?a.slice(d):a))?b.index+d+(g?b[0].length:0):-1}var g=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(m),
-innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(m,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(c,b){if(b.innerActive){var d=b.innerActive,h=c.string;if(!d.close&&c.sol())return b.innerActive=b.inner=null,this.token(c,b);var r=d.close?t(h,d.close,c.pos,d.parseDelimiters):-1;if(r==c.pos&&!d.parseDelimiters)return c.match(d.close),b.innerActive=b.inner=null,d.delimStyle&&d.delimStyle+" "+d.delimStyle+"-close";
--1<r&&(c.string=h.slice(0,r));var q=d.mode.token(c,b.inner);return-1<r&&(c.string=h),r==c.pos&&d.parseDelimiters&&(b.innerActive=b.inner=null),d.innerStyle&&(q=q?q+" "+d.innerStyle:d.innerStyle),q}d=1/0;h=c.string;for(q=0;q<g.length;++q){var n=g[q],r=t(h,n.open,c.pos);if(r==c.pos)return n.parseDelimiters||c.match(n.open),b.innerActive=n,b.inner=a.startState(n.mode,m.indent?m.indent(b.outer,""):0),n.delimStyle&&n.delimStyle+" "+n.delimStyle+"-open";-1!=r&&r<d&&(d=r)}d!=1/0&&(c.string=h.slice(0,d));
-r=m.token(c,b.outer);return d!=1/0&&(c.string=h),r},indent:function(c,b){var d=c.innerActive?c.innerActive.mode:m;return d.indent?d.indent(c.innerActive?c.inner:c.outer,b):a.Pass},blankLine:function(c){var b=c.innerActive?c.innerActive.mode:m;if(b.blankLine&&b.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var d=0;d<g.length;++d){var h=g[d];"\n"===h.open&&(c.innerActive=h,c.inner=a.startState(h.mode,b.indent?b.indent(c.outer,
-""):0))}},electricChars:m.electricChars,innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:m}}}}});
-(function(a){"function"==typeof a.define&&a.define("addons","addon/comment/continuecomment.js addon/edit/closebrackets.js addon/edit/closetag.js addon/edit/matchbrackets.js addon/edit/matchtags.js addon/edit/trailingspace.js addon/fold/foldgutter.js addon/fold/brace-fold.js addon/fold/comment-fold.js addon/fold/indent-fold.js addon/format/autoFormatAll.js addon/format/formatting.js addon/selection/active-line.js addon/search/match-highlighter.js addon/mode/multiplex.js".split(" "),function(){})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js
deleted file mode 100644
index 5f906a01d..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-!function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/search/searchcursor",["../../lib/codemirror"],a):a(CodeMirror)}(function(a){function x(d){if(!d.global){var b=d.flags;d=new RegExp(d.source,(null!=b?b:(d.ignoreCase?"i":"")+(d.global?"g":"")+(d.multiline?"m":""))+"g")}return d}function z(d,b,e){b=x(b);var k=e.line,f=e.ch;for(e=d.lastLine();k<=e;k++,f=0)if(b.lastIndex=f,f=d.getLine(k),f=b.exec(f))return{from:m(k,
-f.index),to:m(k,f.index+f[0].length),match:f}}function q(d,b,e){if(!/\\s|\\n|\n|\\W|\\D|\[\^/.test(b.source))return z(d,b,e);b=x(b);for(var k,f=1,a=e.line,c=d.lastLine();a<=c;){for(var h=0;h<f;h++){var t=d.getLine(a++);k=null==k?t:k+"\n"+t}f*=2;b.lastIndex=e.ch;if(h=b.exec(k))return b=k.slice(0,h.index).split("\n"),d=h[0].split("\n"),e=e.line+b.length-1,b=b[b.length-1].length,{from:m(e,b),to:m(e+d.length-1,1==d.length?b+d[0].length:d[d.length-1].length),match:h}}}function p(d,b){for(var e,k=0;;){b.lastIndex=
-k;var f=b.exec(d);if(!f||(e=f,(k=e.index+(e[0].length||1))==d.length))return e}}function c(d,b,e){b=x(b);var k=e.line,f=e.ch;for(e=d.firstLine();k>=e;k--,f=-1){var a=d.getLine(k);-1<f&&(a=a.slice(0,f));if(f=p(a,b))return{from:m(k,f.index),to:m(k,f.index+f[0].length),match:f}}}function g(d,b,e){b=x(b);for(var k,a=1,c=e.line,n=d.firstLine();c>=n;){for(var h=0;h<a;h++){var t=d.getLine(c--);k=null==k?t.slice(0,e.ch):t+"\n"+k}a*=2;if(h=p(k,b))return b=k.slice(0,h.index).split("\n"),d=h[0].split("\n"),
-c+=b.length,b=b[b.length-1].length,{from:m(c,b),to:m(c+d.length-1,1==d.length?b+d[0].length:d[d.length-1].length),match:h}}}function l(d,b,e,a){if(d.length==b.length)return e;var f=0;for(b=e+Math.max(0,d.length-b.length);;){if(f==b)return f;var c=f+b>>1,m=a(d.slice(0,c)).length;if(m==e)return c;m>e?b=c:f=c+1}}function r(d,b,e,a){if(!b.length)return null;a=a?n:y;b=a(b).split(/\r|\n\r?/);var f=e.line;e=e.ch;var c=d.lastLine()+1-b.length;a:for(;f<=c;f++,e=0){var g=d.getLine(f).slice(e),h=a(g);if(1==
-b.length){var t=h.indexOf(b[0]);if(-1==t)continue a;l(g,h,t,a);return{from:m(f,l(g,h,t,a)+e),to:m(f,l(g,h,t+b[0].length,a)+e)}}t=h.length-b[0].length;if(h.slice(t)==b[0]){for(var u=1;u<b.length-1;u++)if(a(d.getLine(f+u))!=b[u])continue a;var u=d.getLine(f+b.length-1),E=a(u),A=b[b.length-1];if(u.slice(0,A.length)==A)return{from:m(f,l(g,h,t,a)+e),to:m(f+b.length-1,l(u,E,A.length,a))}}}}function v(d,b,a,c){if(!b.length)return null;c=c?n:y;b=c(b).split(/\r|\n\r?/);var f=a.line,g=a.ch,q=d.firstLine()-
-1+b.length;a:for(;f>=q;f--,g=-1){var h=d.getLine(f);-1<g&&(h=h.slice(0,g));g=c(h);if(1==b.length){a=g.lastIndexOf(b[0]);if(-1==a)continue a;return{from:m(f,l(h,g,a,c)),to:m(f,l(h,g,a+b[0].length,c))}}var t=b[b.length-1];if(g.slice(0,t.length)==t){var u=1;for(a=f-b.length+1;u<b.length-1;u++)if(c(d.getLine(a+u))!=b[u])continue a;a=d.getLine(f+1-b.length);u=c(a);if(u.slice(u.length-b[0].length)==b[0])return{from:m(f+1-b.length,l(a,u,a.length-b[0].length,c)),to:m(f,l(h,g,t.length,c))}}}}function w(a,
-b,e,k){this.atOccurrence=!1;this.doc=a;e=e?a.clipPos(e):m(0,0);this.pos={from:e,to:e};var f;"object"==typeof k?f=k.caseFold:(f=k,k=null);"string"==typeof b?(null==f&&(f=!1),this.matches=function(c,e){return(c?v:r)(a,b,e,f)}):(b=x(b),k&&!1===k.multiline?this.matches=function(e,f){return(e?c:z)(a,b,f)}:this.matches=function(c,e){return(c?g:q)(a,b,e)})}var n,y,m=a.Pos;String.prototype.normalize?(n=function(a){return a.normalize("NFD").toLowerCase()},y=function(a){return a.normalize("NFD")}):(n=function(a){return a.toLowerCase()},
-y=function(a){return a});w.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(d){for(var b=this.matches(d,this.doc.clipPos(d?this.pos.from:this.pos.to));b&&0==a.cmpPos(b.from,b.to);)d?b.from.ch?b.from=m(b.from.line,b.from.ch-1):b=b.from.line==this.doc.firstLine()?null:this.matches(d,this.doc.clipPos(m(b.from.line-1))):b.to.ch<this.doc.getLine(b.to.line).length?b.to=m(b.to.line,b.to.ch+1):b=b.to.line==this.doc.lastLine()?null:this.matches(d,
-m(b.to.line+1,0));if(b)return this.pos=b,this.atOccurrence=!0,this.pos.match||!0;d=m(d?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:d,to:d},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(d,b){if(this.atOccurrence){var c=a.splitLines(d);this.doc.replaceRange(c,this.pos.from,this.pos.to,b);this.pos.to=m(this.pos.from.line+c.length-1,c[c.length-1].length+(1==c.length?this.pos.from.ch:
-0))}}};a.defineExtension("getSearchCursor",function(a,b,c){return new w(this.doc,a,b,c)});a.defineDocExtension("getSearchCursor",function(a,b,c){return new w(this,a,b,c)});a.defineExtension("selectMatches",function(c,b){for(var e=[],k=this.getSearchCursor(c,this.getCursor("from"),b);k.findNext()&&!(0<a.cmpPos(k.to(),this.getCursor("to")));)e.push({anchor:k.from(),head:k.to()});e.length&&this.setSelections(e,0)})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/dialog/dialog",["../../lib/codemirror"],a):a(CodeMirror)})(function(a){function x(a,p,c){var g;return g=a.getWrapperElement().appendChild(document.createElement("div")),g.className=c?"CodeMirror-dialog CodeMirror-dialog-bottom":"CodeMirror-dialog CodeMirror-dialog-top","string"==typeof p?g.innerHTML=p:g.appendChild(p),g}function z(a,p){a.state.currentNotificationClose&&
-a.state.currentNotificationClose();a.state.currentNotificationClose=p}a.defineExtension("openDialog",function(q,p,c){function g(a){"string"==typeof a?n.value=a:v||(v=!0,r.parentNode.removeChild(r),w.focus(),c.onClose&&c.onClose(r))}c||(c={});z(this,null);var l,r=x(this,q,c.bottom),v=!1,w=this,n=r.getElementsByTagName("input")[0];return n?(n.focus(),c.value&&(n.value=c.value,!1!==c.selectValueOnOpen&&n.select()),c.onInput&&a.on(n,"input",function(a){c.onInput(a,n.value,g)}),c.onKeyUp&&a.on(n,"keyup",
-function(a){c.onKeyUp(a,n.value,g)}),a.on(n,"keydown",function(l){c&&c.onKeyDown&&c.onKeyDown(l,n.value,g)||((27==l.keyCode||!1!==c.closeOnEnter&&13==l.keyCode)&&(n.blur(),a.e_stop(l),g()),13==l.keyCode&&p(n.value,l))}),!1!==c.closeOnBlur&&a.on(n,"blur",g)):(l=r.getElementsByTagName("button")[0])&&(a.on(l,"click",function(){g();w.focus()}),!1!==c.closeOnBlur&&a.on(l,"blur",g),l.focus()),g});a.defineExtension("openConfirm",function(q,p,c){function g(){r||(r=!0,l.parentNode.removeChild(l),v.focus())}
-z(this,null);var l=x(this,q,c&&c.bottom);q=l.getElementsByTagName("button");var r=!1,v=this,w=1;q[0].focus();for(c=0;c<q.length;++c){var n=q[c];!function(c){a.on(n,"click",function(l){a.e_preventDefault(l);g();c&&c(v)})}(p[c]);a.on(n,"blur",function(){--w;setTimeout(function(){0>=w&&g()},200)});a.on(n,"focus",function(){++w})}});a.defineExtension("openNotification",function(q,p){function c(){r||(r=!0,clearTimeout(g),l.parentNode.removeChild(l))}z(this,c);var g,l=x(this,q,p&&p.bottom),r=!1,v=p&&void 0!==
-p.duration?p.duration:5E3;return a.on(l,"click",function(g){a.e_preventDefault(g);c()}),v&&(g=setTimeout(c,v)),c})});
-(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define("addon/search/search.js",["../../lib/codemirror","./searchcursor","../dialog/dialog"],a):a(CodeMirror)})(function(a){function x(h,a){return"string"==typeof h?h=new RegExp(h.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$\x26"),a?"gi":"g"):h.global||(h=new RegExp(h.source,h.ignoreCase?"gi":"g")),{token:function(a){h.lastIndex=
-a.pos;var b=h.exec(a.string);if(b&&b.index==a.pos)return a.pos+=b[0].length||1,"searching";b?a.pos=b.index:a.skipToEnd()}}}function z(){this.overlay=this.posFrom=this.posTo=this.lastQuery=this.query=null}function q(h){return h.state.search||(h.state.search=new z)}function p(h){return"string"==typeof h&&h==h.toLowerCase()}function c(h,a,b){return h.getSearchCursor(a,b,{caseFold:p(a),multiline:!0})}function g(h,a,b,c,f){h.openDialog(a,c,{value:b,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){d(h)},
-onKeyDown:f})}function l(h,a,b,c,d){h.openDialog?h.openDialog(a,d,{value:c,selectValueOnOpen:!0}):d(prompt(b,c))}function r(a,b,c,d){a.openConfirm?a.openConfirm(b,d):confirm(c)&&d[0]()}function v(a){return a.replace(/\\(.)/g,function(a,h){return"n"==h?"\n":"r"==h?"\r":h})}function w(a){var b=a.match(/^\/(.*)\/([a-z]*)$/);if(b)try{a=new RegExp(b[1],-1==b[2].indexOf("i")?"":"i")}catch(c){}else a=v(a);return("string"==typeof a?""==a:a.test(""))&&(a=/x^/),a}function n(a,b,c){b.queryText=c;b.query=w(c);
-a.removeOverlay(b.overlay,p(b.query));b.overlay=x(b.query,p(b.query));a.addOverlay(b.overlay);a.showMatchesOnScrollbar&&(b.annotate&&(b.annotate.clear(),b.annotate=null),b.annotate=a.showMatchesOnScrollbar(b.query,p(b.query)))}function y(b,c,d,f){var e=q(b);if(e.query)return m(b,c);var p=b.getSelection()||e.lastQuery;if(d&&b.openDialog){var B=null,r=function(c,d){a.e_stop(d);c&&(c!=e.queryText&&(n(b,e,c),e.posFrom=e.posTo=b.getCursor()),B&&(B.style.opacity=1),m(b,d.shiftKey,function(a,c){var d;3>
-c.line&&document.querySelector&&(d=b.display.wrapper.querySelector(".CodeMirror-dialog"))&&d.getBoundingClientRect().bottom-4>b.cursorCoords(c,"window").top&&((B=d).style.opacity=.4)}))};g(b,k,p,r,function(c,d){var e=a.keyName(c),f=a.keyMap[b.getOption("keyMap")][e];f||(f=b.getOption("extraKeys")[e]);"findNext"==f||"findPrev"==f||"findPersistentNext"==f||"findPersistentPrev"==f?(a.e_stop(c),n(b,q(b),d),b.execCommand(f)):"find"!=f&&"findPersistent"!=f||(a.e_stop(c),r(d,c))});f&&p&&(n(b,e,p),m(b,c))}else l(b,
-k,"Search for:",p,function(a){a&&!e.query&&b.operation(function(){n(b,e,a);e.posFrom=e.posTo=b.getCursor();m(b,c)})})}function m(b,d,f){b.operation(function(){var e=q(b),g=c(b,e.query,d?e.posFrom:e.posTo);(g.find(d)||(g=c(b,e.query,d?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),g.find(d)))&&(b.setSelection(g.from(),g.to()),b.scrollIntoView({from:g.from(),to:g.to()},20),e.posFrom=g.from(),e.posTo=g.to(),f&&f(g.from(),g.to()))})}function d(b){b.operation(function(){var a=q(b);(a.lastQuery=a.query)&&
-(a.query=a.queryText=null,b.removeOverlay(a.overlay),a.annotate&&(a.annotate.clear(),a.annotate=null))})}function b(b,a,d){b.operation(function(){for(var e=c(b,a);e.findNext();)if("string"!=typeof a){var f=b.getRange(e.from(),e.to()).match(a);e.replace(d.replace(/\$(\d)/g,function(b,a){return f[a]}))}else e.replace(d)})}function e(a,e){if(!a.getOption("readOnly")){var g=a.getSelection()||q(a).lastQuery,k='\x3cspan class\x3d"CodeMirror-search-label"\x3e'+(e?"Replace all:":"Replace:")+"\x3c/span\x3e";
-l(a,k+f,k,g,function(f){f&&(f=w(f),l(a,C,"Replace with:","",function(g){if(g=v(g),e)b(a,f,g);else{d(a);var k=c(a,f,a.getCursor("from")),l=function(){var d,e=k.from();!(d=k.findNext())&&(k=c(a,f),!(d=k.findNext())||e&&k.from().line==e.line&&k.from().ch==e.ch)||(a.setSelection(k.from(),k.to()),a.scrollIntoView({from:k.from(),to:k.to()}),r(a,D,"Replace?",[function(){m(d)},l,function(){b(a,f,g)}]))},m=function(a){k.replace("string"==typeof f?g:g.replace(/\$(\d)/g,function(b,c){return a[c]}));l()};l()}}))})}}
-var k='\x3cspan class\x3d"CodeMirror-search-label"\x3eSearch:\x3c/span\x3e \x3cinput type\x3d"text" style\x3d"width: 10em" class\x3d"CodeMirror-search-field"/\x3e \x3cspan style\x3d"color: #888" class\x3d"CodeMirror-search-hint"\x3e(Use /re/ syntax for regexp search)\x3c/span\x3e',f=' \x3cinput type\x3d"text" style\x3d"width: 10em" class\x3d"CodeMirror-search-field"/\x3e \x3cspan style\x3d"color: #888" class\x3d"CodeMirror-search-hint"\x3e(Use /re/ syntax for regexp search)\x3c/span\x3e',C='\x3cspan class\x3d"CodeMirror-search-label"\x3eWith:\x3c/span\x3e \x3cinput type\x3d"text" style\x3d"width: 10em" class\x3d"CodeMirror-search-field"/\x3e',
-D='\x3cspan class\x3d"CodeMirror-search-label"\x3eReplace?\x3c/span\x3e \x3cbutton\x3eYes\x3c/button\x3e \x3cbutton\x3eNo\x3c/button\x3e \x3cbutton\x3eAll\x3c/button\x3e \x3cbutton\x3eStop\x3c/button\x3e';a.commands.find=function(a){d(a);y(a)};a.commands.findPersistent=function(a){d(a);y(a,!1,!0)};a.commands.findPersistentNext=function(a){y(a,!1,!0,!0)};a.commands.findPersistentPrev=function(a){y(a,!0,!0,!0)};a.commands.findNext=y;a.commands.findPrev=function(a){y(a,!0)};a.commands.clearSearch=d;
-a.commands.replace=e;a.commands.replaceAll=function(a){e(a,!0)}});(function(a){"function"==typeof a.define&&a.define("addonSearch",["addon/search/search.js"],function(){})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.min.js
deleted file mode 100644
index 2f07d97ba..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.min.js
+++ /dev/null
@@ -1,315 +0,0 @@
-!function(ga,X){"object"==typeof exports&&"undefined"!=typeof module?module.exports=X():"function"==typeof define&&define.amd?define("codemirror.js",X):ga.CodeMirror=X()}(this,function(){function ga(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}function X(a){for(var b=a.childNodes.length;0<b;--b)a.removeChild(a.firstChild);return a}function Z(a,b){return X(a).appendChild(b)}function r(a,b,c,d){a=document.createElement(a);if(c&&(a.className=c),d&&(a.style.cssText=d),"string"==typeof b)a.appendChild(document.createTextNode(b));
-else if(b)for(c=0;c<b.length;++c)a.appendChild(b[c]);return a}function Za(a,b,c,d){a=r(a,b,c,d);return a.setAttribute("role","presentation"),a}function va(a,b){if(3==b.nodeType&&(b=b.parentNode),a.contains)return a.contains(b);do if(11==b.nodeType&&(b=b.host),b==a)return!0;while(b=b.parentNode)}function qa(){var a;try{a=document.activeElement}catch(b){a=document.body||null}for(;a&&a.shadowRoot&&a.shadowRoot.activeElement;)a=a.shadowRoot.activeElement;return a}function Ea(a,b){var c=a.className;ga(b).test(c)||
-(a.className+=(c?" ":"")+b)}function Jc(a,b){for(var c=a.split(" "),d=0;d<c.length;d++)c[d]&&!ga(c[d]).test(b)&&(b+=" "+c[d]);return b}function Kc(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function Fa(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||!1===c&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}function ea(a,b,c,d,e){null==b&&-1==(b=a.search(/[^\s\u00a0]/))&&(b=a.length);d=d||0;for(e=e||0;;){var f=a.indexOf("\t",d);if(0>f||f>=b)return e+(b-
-d);e+=f-d;e+=c-e%c;d=f+1}}function N(a,b){for(var c=0;c<a.length;++c)if(a[c]==b)return c;return-1}function Lc(a,b,c){for(var d=0,e=0;;){var f=a.indexOf("\t",d);-1==f&&(f=a.length);var g=f-d;if(f==a.length||e+g>=b)return d+Math.min(g,b-e);if(e+=f-d,e+=c-e%c,d=f+1,e>=b)return d}}function Mc(a){for(;dc.length<=a;)dc.push(z(dc)+" ");return dc[a]}function z(a){return a[a.length-1]}function ec(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=b(a[d],d);return c}function bg(a,b,c){for(var d=0,e=c(b);d<a.length&&
-c(a[d])<=e;)d++;a.splice(d,0,b)}function Qd(){}function Rd(a,b){var c;return Object.create?c=Object.create(a):(Qd.prototype=a,c=new Qd),b&&Fa(b,c),c}function Nc(a){return/\w/.test(a)||"€"<a&&(a.toUpperCase()!=a.toLowerCase()||cg.test(a))}function fc(a,b){return b?!!(-1<b.source.indexOf("\\w")&&Nc(a))||b.test(a):Nc(a)}function Sd(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function Oc(a){return 768<=a.charCodeAt(0)&&dg.test(a)}function Td(a,b,c){for(;(0>c?0<b:b<a.length)&&Oc(a.charAt(b));)b+=
-c;return b}function gc(a,b,c){for(;;){if(1>=Math.abs(b-c))return a(b)?b:c;var d=Math.floor((b+c)/2);a(d)?c=d:b=d}}function eg(a,b,c){this.input=c;this.scrollbarFiller=r("div",null,"CodeMirror-scrollbar-filler");this.scrollbarFiller.setAttribute("cm-not-content","true");this.gutterFiller=r("div",null,"CodeMirror-gutter-filler");this.gutterFiller.setAttribute("cm-not-content","true");this.lineDiv=Za("div",null,"CodeMirror-code");this.selectionDiv=r("div",null,null,"position: relative; z-index: 1");
-this.cursorDiv=r("div",null,"CodeMirror-cursors");this.measure=r("div",null,"CodeMirror-measure");this.lineMeasure=r("div",null,"CodeMirror-measure");this.lineSpace=Za("div",[this.measure,this.lineMeasure,this.selectionDiv,this.cursorDiv,this.lineDiv],null,"position: relative; outline: none");var d=Za("div",[this.lineSpace],"CodeMirror-lines");this.mover=r("div",[d],null,"position: relative");this.sizer=r("div",[this.mover],"CodeMirror-sizer");this.sizerWidth=null;this.heightForcer=r("div",null,null,
-"position: absolute; height: "+Ud+"px; width: 1px;");this.gutters=r("div",null,"CodeMirror-gutters");this.lineGutter=null;this.scroller=r("div",[this.sizer,this.heightForcer,this.gutters],"CodeMirror-scroll");this.scroller.setAttribute("tabIndex","-1");this.wrapper=r("div",[this.scrollbarFiller,this.gutterFiller,this.scroller],"CodeMirror");C&&8>B&&(this.gutters.style.zIndex=-1,this.scroller.style.paddingRight=0);R||wa&&rb||(this.scroller.draggable=!0);a&&(a.appendChild?a.appendChild(this.wrapper):
-a(this.wrapper));this.reportedViewFrom=this.reportedViewTo=this.viewFrom=this.viewTo=b.first;this.view=[];this.externalMeasured=this.renderedView=null;this.lastWrapHeight=this.lastWrapWidth=this.viewOffset=0;this.updateLineNumbers=null;this.nativeBarWidth=this.barHeight=this.barWidth=0;this.scrollbarsClipped=!1;this.lineNumWidth=this.lineNumInnerWidth=this.lineNumChars=null;this.alignWidgets=!1;this.maxLine=this.cachedCharWidth=this.cachedTextHeight=this.cachedPaddingH=null;this.maxLineLength=0;this.maxLineChanged=
-!1;this.wheelDX=this.wheelDY=this.wheelStartX=this.wheelStartY=null;this.shift=!1;this.activeTouch=this.selForContextMenu=null;c.init(this)}function w(a,b){if(0>(b-=a.first)||b>=a.size)throw Error("There is no line "+(b+a.first)+" in the document.");for(var c=a;!c.lines;)for(var d=0;;++d){var e=c.children[d],f=e.chunkSize();if(b<f){c=e;break}b-=f}return c.lines[b]}function Ga(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,function(a){a=a.text;e==c.line&&(a=a.slice(0,c.ch));e==b.line&&(a=a.slice(b.ch));
-d.push(a);++e}),d}function Pc(a,b,c){var d=[];return a.iter(b,c,function(a){d.push(a.text)}),d}function la(a,b){var c=b-a.height;if(c)for(var d=a;d;d=d.parent)d.height+=c}function D(a){if(null==a.parent)return null;var b=a.parent;a=N(b.lines,a);for(var c=b.parent;c;b=c,c=c.parent)for(var d=0;c.children[d]!=b;++d)a+=c.children[d].chunkSize();return a+b.first}function Ha(a,b){var c=a.first;a:do{for(var d=0;d<a.children.length;++d){var e=a.children[d],f=e.height;if(b<f){a=e;continue a}b-=f;c+=e.chunkSize()}return c}while(!a.lines);
-for(d=0;d<a.lines.length;++d){e=a.lines[d].height;if(b<e)break;b-=e}return c+d}function sb(a,b){return b>=a.first&&b<a.first+a.size}function Qc(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function m(a,b,c){if(void 0===c&&(c=null),!(this instanceof m))return new m(a,b,c);this.line=a;this.ch=b;this.sticky=c}function x(a,b){return a.line-b.line||a.ch-b.ch}function Rc(a,b){return a.sticky==b.sticky&&0==x(a,b)}function Sc(a){return m(a.line,a.ch)}function hc(a,b){return 0>x(a,b)?b:a}
-function ic(a,b){return 0>x(a,b)?a:b}function v(a,b){if(b.line<a.first)return m(a.first,0);var c=a.first+a.size-1;if(b.line>c)c=m(c,w(a,c).text.length);else var c=w(a,b.line).text.length,d=b.ch,c=null==d||d>c?m(b.line,c):0>d?m(b.line,0):b;return c}function Vd(a,b){for(var c=[],d=0;d<b.length;d++)c[d]=v(a,b[d]);return c}function jc(a,b,c){this.marker=a;this.from=b;this.to=c}function tb(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function Tc(a,b){if(b.full)return null;
-var c=sb(a,b.from.line)&&w(a,b.from.line).markedSpans,d=sb(a,b.to.line)&&w(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=0==x(b.from,b.to),h;if(c)for(var k=0;k<c.length;++k){var l=c[k],n=l.marker;if(null==l.from||(n.inclusiveLeft?l.from<=e:l.from<e)||!(l.from!=e||"bookmark"!=n.type||g&&l.marker.insertLeft)){var q=null==l.to||(n.inclusiveRight?l.to>=e:l.to>e);(h||(h=[])).push(new jc(n,l.from,q?null:l.to))}}var c=h,p;if(d)for(h=0;h<d.length;++h)if(k=d[h],l=k.marker,null==
-k.to||(l.inclusiveRight?k.to>=f:k.to>f)||k.from==f&&"bookmark"==l.type&&(!g||k.marker.insertLeft))n=null==k.from||(l.inclusiveLeft?k.from<=f:k.from<f),(p||(p=[])).push(new jc(l,n?null:k.from-f,null==k.to?null:k.to-f));d=p;f=1==b.text.length;g=z(b.text).length+(f?e:0);if(c)for(p=0;p<c.length;++p)h=c[p],null==h.to&&((k=tb(d,h.marker))?f&&(h.to=null==k.to?null:k.to+g):h.to=e);if(d)for(e=0;e<d.length;++e)p=d[e],(null!=p.to&&(p.to+=g),null==p.from)?tb(c,p.marker)||(p.from=g,f&&(c||(c=[])).push(p)):(p.from+=
-g,f&&(c||(c=[])).push(p));c&&(c=Wd(c));d&&d!=c&&(d=Wd(d));e=[c];if(!f){var u,f=b.text.length-2;if(0<f&&c)for(g=0;g<c.length;++g)null==c[g].to&&(u||(u=[])).push(new jc(c[g].marker,null,null));for(c=0;c<f;++c)e.push(u);e.push(d)}return e}function Wd(a){for(var b=0;b<a.length;++b){var c=a[b];null!=c.from&&c.from==c.to&&!1!==c.marker.clearWhenEmpty&&a.splice(b--,1)}return a.length?a:null}function fg(a,b,c){var d=null;if(a.iter(b.line,c.line+1,function(a){if(a.markedSpans)for(var b=0;b<a.markedSpans.length;++b){var c=
-a.markedSpans[b].marker;!c.readOnly||d&&-1!=N(d,c)||(d||(d=[])).push(c)}}),!d)return null;a=[{from:b,to:c}];for(b=0;b<d.length;++b){c=d[b];for(var e=c.find(0),f=0;f<a.length;++f){var g=a[f];if(!(0>x(g.to,e.from)||0<x(g.from,e.to))){var h=[f,1],k=x(g.from,e.from),l=x(g.to,e.to);(0>k||!c.inclusiveLeft&&!k)&&h.push({from:g.from,to:e.from});(0<l||!c.inclusiveRight&&!l)&&h.push({from:e.to,to:g.to});a.splice.apply(a,h);f+=h.length-3}}}return a}function Xd(a){var b=a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);
-a.markedSpans=null}}function Yd(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function Zd(a,b){var c=a.lines.length-b.lines.length;if(0!=c)return c;var c=a.find(),d=b.find(),e=x(c.from,d.from)||(a.inclusiveLeft?-1:0)-(b.inclusiveLeft?-1:0);return e?-e:x(c.to,d.to)||(a.inclusiveRight?1:0)-(b.inclusiveRight?1:0)||b.id-a.id}function Ia(a,b){var c,d=xa&&a.markedSpans;if(d)for(var e=void 0,f=0;f<d.length;++f)e=d[f],e.marker.collapsed&&null==(b?e.from:e.to)&&(!c||0>Zd(c,
-e.marker))&&(c=e.marker);return c}function $d(a,b,c,d,e){a=w(a,b);if(a=xa&&a.markedSpans)for(b=0;b<a.length;++b){var f=a[b];if(f.marker.collapsed){var g=f.marker.find(0),h=x(g.from,c)||(f.marker.inclusiveLeft?-1:0)-(e.inclusiveLeft?-1:0),k=x(g.to,d)||(f.marker.inclusiveRight?1:0)-(e.inclusiveRight?1:0);if(!(0<=h&&0>=k||0>=h&&0<=k)&&(0>=h&&(f.marker.inclusiveRight&&e.inclusiveLeft?0<=x(g.to,c):0<x(g.to,c))||0<=h&&(f.marker.inclusiveRight&&e.inclusiveLeft?0>=x(g.from,d):0>x(g.from,d))))return!0}}}function ma(a){for(var b;b=
-Ia(a,!0);)a=b.find(-1,!0).line;return a}function Uc(a,b){var c=w(a,b),d=ma(c);return c==d?b:D(d)}function ae(a,b){if(b>a.lastLine())return b;var c,d=w(a,b);if(!Ja(a,d))return b;for(;c=Ia(d,!1);)d=c.find(1,!0).line;return D(d)+1}function Ja(a,b){var c=xa&&b.markedSpans;if(c)for(var d=void 0,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed)if(null==d.from||!d.marker.widgetNode&&0==d.from&&d.marker.inclusiveLeft&&Vc(a,b,d))return!0}function Vc(a,b,c){if(null==c.to)return b=c.marker.find(1,!0),Vc(a,b.line,
-tb(b.line.markedSpans,c.marker));if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var d=void 0,e=0;e<b.markedSpans.length;++e)if(d=b.markedSpans[e],d.marker.collapsed&&!d.marker.widgetNode&&d.from==c.to&&(null==d.to||d.to!=c.from)&&(d.marker.inclusiveLeft||c.marker.inclusiveRight)&&Vc(a,b,d))return!0}function na(a){a=ma(a);for(var b=0,c=a.parent,d=0;d<c.lines.length;++d){var e=c.lines[d];if(e==a)break;b+=e.height}for(a=c.parent;a;c=a,a=c.parent)for(d=0;d<a.children.length;++d){e=a.children[d];
-if(e==c)break;b+=e.height}return b}function kc(a){if(0==a.height)return 0;for(var b,c=a.text.length,d=a;b=Ia(d,!0);)b=b.find(0,!0),d=b.from.line,c+=b.from.ch-b.to.ch;for(d=a;b=Ia(d,!1);)a=b.find(0,!0),c-=d.text.length-a.from.ch,d=a.to.line,c+=d.text.length-a.to.ch;return c}function Wc(a){var b=a.display;a=a.doc;b.maxLine=w(a,a.first);b.maxLineLength=kc(b.maxLine);b.maxLineChanged=!0;a.iter(function(a){var d=kc(a);d>b.maxLineLength&&(b.maxLineLength=d,b.maxLine=a)})}function gg(a,b,c,d){if(!a)return d(b,
-c,"ltr");for(var e=!1,f=0;f<a.length;++f){var g=a[f];(g.from<c&&g.to>b||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function Xc(a,b,c){var d;ub=null;for(var e=0;e<a.length;++e){var f=a[e];if(f.from<b&&f.to>b)return e;f.to==b&&(f.from!=f.to&&"before"==c?d=e:ub=e);f.from==b&&(f.from!=f.to&&"before"!=c?d=e:ub=e)}return null!=d?d:ub}function ya(a,b){var c=a.order;return null==c&&(c=a.order=hg(a.text,b)),c}function Yc(a,b,c){b=Td(a.text,b+c,c);return 0>
-b||b>a.text.length?null:b}function Zc(a,b,c){a=Yc(a,b.ch,c);return null==a?null:new m(b.line,a,0>c?"after":"before")}function $c(a,b,c,d,e){if(a&&(a=ya(c,b.doc.direction))){var f=0>e?z(a):a[0],g=0>e==(1==f.level)?"after":"before";if(0<f.level){var h=$a(b,c);a=0>e?c.text.length-1:0;var k=ra(b,h,a).top;a=gc(function(a){return ra(b,h,a).top==k},0>e==(1==f.level)?f.from:f.to-1,a);"before"==g&&(a=Yc(c,a,1))}else a=0>e?f.to:f.from;return new m(d,a,g)}return new m(d,0>e?c.text.length:0,0>e?"before":"after")}
-function be(a,b,c,d){var e=ya(b,a.doc.direction);if(!e)return Zc(b,c,d);c.ch>=b.text.length?(c.ch=b.text.length,c.sticky="before"):0>=c.ch&&(c.ch=0,c.sticky="after");var f=Xc(e,c.ch,c.sticky),g=e[f];if("ltr"==a.doc.direction&&0==g.level%2&&(0<d?g.to>c.ch:g.from<c.ch))return Zc(b,c,d);var h,k=function(a,d){return Yc(b,a instanceof m?a.ch:a,d)},l=function(d){return a.options.lineWrapping?(h=h||$a(a,b),ce(a,b,h,Ka(a,b,ra(a,h,d),"line").top)):{begin:0,end:b.text.length}},n=l("before"==c.sticky?k(c,-1):
-c.ch);if("rtl"==a.doc.direction||1==g.level){var q=1==g.level==0>d,p=k(c,q?1:-1);if(null!=p&&(q?p<=g.to&&p<=n.end:p>=g.from&&p>=n.begin))return new m(c.line,p,q?"before":"after")}g=function(a,b,d){for(;0<=a&&a<e.length;a+=b){var f=e[a],g=0<b==(1!=f.level),h=g?d.begin:k(d.end,-1);if(f.from<=h&&h<f.to||(h=g?f.from:k(f.to,-1),d.begin<=h&&h<d.end))return a=h,g?new m(c.line,k(a,1),"before"):new m(c.line,a,"after")}};if(f=g(f+d,d,n))return f;n=0<d?n.end:k(n.begin,-1);return null==n||0<d&&n==b.text.length||
-!(f=g(0<d?0:e.length-1,d,l(n)))?null:f}function aa(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else{var d=(a=a._handlers)&&a[b];d&&(c=N(d,c),-1<c&&(a[b]=d.slice(0,c).concat(d.slice(c+1))))}}function F(a,b){var c=a._handlers&&a._handlers[b]||lc;if(c.length)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)}function K(a,b,c){return"string"==typeof b&&(b={type:b,preventDefault:function(){this.defaultPrevented=
-!0}}),F(a,c||b.type,a,b),ad(b)||b.codemirrorIgnore}function de(a){var b=a._handlers&&a._handlers.cursorActivity;if(b){a=a.curOp.cursorActivityHandlers||(a.curOp.cursorActivityHandlers=[]);for(var c=0;c<b.length;++c)-1==N(a,b[c])&&a.push(b[c])}}function fa(a,b){return 0<(a._handlers&&a._handlers[b]||lc).length}function ab(a){a.prototype.on=function(a,c){t(this,a,c)};a.prototype.off=function(a,c){aa(this,a,c)}}function S(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function ee(a){a.stopPropagation?
-a.stopPropagation():a.cancelBubble=!0}function ad(a){return null!=a.defaultPrevented?a.defaultPrevented:0==a.returnValue}function vb(a){S(a);ee(a)}function fe(a){var b=a.which;return null==b&&(1&a.button?b=1:2&a.button?b=3:4&a.button&&(b=2)),ha&&a.ctrlKey&&1==b&&(b=3),b}function ig(a){if(null==bd){var b=r("span","​");Z(a,r("span",[b,document.createTextNode("x")]));0!=a.firstChild.offsetHeight&&(bd=1>=b.offsetWidth&&2<b.offsetHeight&&!(C&&8>B))}a=bd?r("span","​"):r("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");
-return a.setAttribute("cm-text",""),a}function jg(a,b){2<arguments.length&&(b.dependencies=Array.prototype.slice.call(arguments,2));cd[a]=b}function mc(a){if("string"==typeof a&&bb.hasOwnProperty(a))a=bb[a];else if(a&&"string"==typeof a.name&&bb.hasOwnProperty(a.name)){var b=bb[a.name];"string"==typeof b&&(b={name:b});a=Rd(b,a);a.name=b.name}else{if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return mc("application/xml");if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+json$/.test(a))return mc("application/json")}return"string"==
-typeof a?{name:a}:a||{name:"null"}}function dd(a,b){b=mc(b);var c=cd[b.name];if(!c)return dd(a,"text/plain");c=c(a,b);if(cb.hasOwnProperty(b.name)){var d=cb[b.name],e;for(e in d)d.hasOwnProperty(e)&&(c.hasOwnProperty(e)&&(c["_"+e]=c[e]),c[e]=d[e])}if(c.name=b.name,b.helperType&&(c.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)c[f]=b.modeProps[f];return c}function kg(a,b){Fa(b,cb.hasOwnProperty(a)?cb[a]:cb[a]={})}function La(a,b){if(!0===b)return b;if(a.copyState)return a.copyState(b);
-var c={},d;for(d in b){var e=b[d];e instanceof Array&&(e=e.concat([]));c[d]=e}return c}function ed(a,b){for(var c;a.innerMode&&(c=a.innerMode(b))&&c.mode!=a;)b=c.state,a=c.mode;return c||{mode:a,state:b}}function ge(a,b,c){return!a.startState||a.startState(b,c)}function he(a,b,c,d){var e=[a.state.modeGen],f={};ie(a,b.text,a.doc.mode,c,function(a,b){return e.push(a,b)},f,d);d=c.state;for(var g=0;g<a.state.overlays.length;++g)!function(d){var g=a.state.overlays[d],l=1,n=0;c.state=!0;ie(a,b.text,g.mode,
-c,function(a,b){for(var d=l;n<a;){var c=e[l];c>a&&e.splice(l,1,a,e[l+1],c);l+=2;n=Math.min(a,c)}if(b)if(g.opaque)e.splice(d,l-d,a,"overlay "+b),l=d+2;else for(;d<l;d+=2)c=e[d+1],e[d+1]=(c?c+" ":"")+"overlay "+b},f)}(g);return c.state=d,{styles:e,classes:f.bgClass||f.textClass?f:null}}function je(a,b,c){if(!b.styles||b.styles[0]!=a.state.modeGen){var d=wb(a,D(b)),e=b.text.length>a.options.maxHighlightLength&&La(a.doc.mode,d.state),f=he(a,b,d);e&&(d.state=e);b.stateAfter=d.save(!e);b.styles=f.styles;
-f.classes?b.styleClasses=f.classes:b.styleClasses&&(b.styleClasses=null);c===a.doc.highlightFrontier&&(a.doc.modeFrontier=Math.max(a.doc.modeFrontier,++a.doc.highlightFrontier))}return b.styles}function wb(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return new sa(d,!0,b);var f=lg(a,b,c),g=f>d.first&&w(d,f-1).stateAfter,h=g?sa.fromSaved(d,g,f):new sa(d,ge(d.mode),f);return d.iter(f,b,function(d){fd(a,d.text,h);var c=h.line;d.stateAfter=c==b-1||0==c%5||c>=e.viewFrom&&c<e.viewTo?h.save():null;
-h.nextLine()}),c&&(d.modeFrontier=h.line),h}function fd(a,b,c,d){var e=a.doc.mode;a=new H(b,a.options.tabSize,c);a.start=a.pos=d||0;for(""==b&&ke(e,c.state);!a.eol();)gd(e,a,c.state),a.start=a.pos}function ke(a,b){if(a.blankLine)return a.blankLine(b);if(a.innerMode){var c=ed(a,b);return c.mode.blankLine?c.mode.blankLine(c.state):void 0}}function gd(a,b,c,d){for(var e=0;10>e;e++){d&&(d[0]=ed(a,c).mode);var f=a.token(b,c);if(b.pos>b.start)return f}throw Error("Mode "+a.name+" failed to advance stream.");
-}function le(a,b,c,d){var e,f=a.doc,g=f.mode;b=v(f,b);var h,k=w(f,b.line);c=wb(a,b.line,c);a=new H(k.text,a.options.tabSize,c);for(d&&(h=[]);(d||a.pos<b.ch)&&!a.eol();)a.start=a.pos,e=gd(g,a,c.state),d&&h.push(new me(a,e,La(f.mode,c.state)));return d?h:new me(a,e,c.state)}function ne(a,b){if(a)for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:(new RegExp("(?:^|s)"+c[2]+"(?:$|s)")).test(b[d])||
-(b[d]+=" "+c[2])}return a}function ie(a,b,c,d,e,f,g){var h=c.flattenSpans;null==h&&(h=a.options.flattenSpans);var k,l=0,n=null,q=new H(b,a.options.tabSize,d),p=a.options.addModeClass&&[null];for(""==b&&ne(ke(c,d.state),f);!q.eol();){if(q.pos>a.options.maxHighlightLength?(h=!1,g&&fd(a,b,d,q.pos),q.pos=b.length,k=null):k=ne(gd(c,q,d.state,p),f),p){var u=p[0].name;u&&(k="m-"+(k?u+" "+k:u))}if(!h||n!=k){for(;l<q.start;)l=Math.min(q.start,l+5E3),e(l,n);n=k}q.start=q.pos}for(;l<q.pos;)a=Math.min(q.pos,
-l+5E3),e(a,n),l=a}function lg(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1E3:100);b>g;--b){if(b<=f.first)return f.first;var h=w(f,b-1),k=h.stateAfter;if(k&&(!c||b+(k instanceof nc?k.lookAhead:0)<=f.modeFrontier))return b;h=ea(h.text,null,a.options.tabSize);(null==e||d>h)&&(e=b-1,d=h)}return e}function mg(a,b){if(a.modeFrontier=Math.min(a.modeFrontier,b),!(a.highlightFrontier<b-10)){for(var c=a.first,d=b-1;d>c;d--){var e=w(a,d).stateAfter;if(e&&(!(e instanceof nc)||d+e.lookAhead<b)){c=
-d+1;break}}a.highlightFrontier=Math.min(a.highlightFrontier,c)}}function oe(a,b){if(!a||/^\s*$/.test(a))return null;var c=b.addModeClass?ng:og;return c[a]||(c[a]=a.replace(/\S+/g,"cm-$\x26"))}function pe(a,b){var c=Za("span",null,null,R?"padding-right: .1px":null),c={pre:Za("pre",[c],"CodeMirror-line"),content:c,col:0,pos:0,cm:a,trailingSpace:!1,splitSpaces:(C||R)&&a.getOption("lineWrapping")};b.measure={};for(var d=0;d<=(b.rest?b.rest.length:0);d++){var e=d?b.rest[d-1]:b.line,f=void 0;c.pos=0;c.addToken=
-pg;var g;g=a.display.measure;if(null!=hd)g=hd;else{var h=Z(g,document.createTextNode("AخA")),k=db(h,0,1).getBoundingClientRect(),h=db(h,1,2).getBoundingClientRect();g=(X(g),!(!k||k.left==k.right)&&(hd=3>h.right-k.right))}g&&(f=ya(e,a.doc.direction))&&(c.addToken=qg(c.addToken,f));c.map=[];a:{f=c;g=je(a,e,b!=a.display.externalMeasured&&D(e));var l=e.markedSpans,k=e.text,h=0;if(l)for(var n=void 0,q=void 0,p=void 0,u=void 0,O=void 0,m=void 0,J=void 0,w=k.length,G=0,r=1,t="",x=0;;){if(x==G){for(var p=
-u=O=m=q="",J=null,x=1/0,v=[],z=void 0,A=0;A<l.length;++A){var y=l[A],B=y.marker;"bookmark"==B.type&&y.from==G&&B.widgetNode?v.push(B):y.from<=G&&(null==y.to||y.to>G||B.collapsed&&y.to==G&&y.from==G)?(null!=y.to&&y.to!=G&&x>y.to&&(x=y.to,u=""),B.className&&(p+=" "+B.className),B.css&&(q=(q?q+";":"")+B.css),B.startStyle&&y.from==G&&(O+=" "+B.startStyle),B.endStyle&&y.to==x&&(z||(z=[])).push(B.endStyle,y.to),B.title&&!m&&(m=B.title),B.collapsed&&(!J||0>Zd(J.marker,B))&&(J=y)):y.from>G&&x>y.from&&(x=
-y.from)}if(z)for(A=0;A<z.length;A+=2)z[A+1]==x&&(u+=" "+z[A]);if(!J||J.from==G)for(z=0;z<v.length;++z)qe(f,0,v[z]);if(J&&(J.from||0)==G){if(qe(f,(null==J.to?w+1:J.to)-G,J.marker,null==J.from),null==J.to)break a;J.to==G&&(J=!1)}}if(G>=w)break;for(v=Math.min(w,x);;){if(t){z=G+t.length;J||(A=z>v?t.slice(0,v-G):t,f.addToken(f,A,n?n+p:p,O,G+A.length==x?u:"",m,q));if(z>=v){t=t.slice(v-G);G=v;break}G=z;O=""}t=k.slice(h,h=g[r++]);n=oe(g[r++],f.cm.options)}}else for(l=1;l<g.length;l+=2)f.addToken(f,k.slice(h,
-h=g[l]),oe(g[l+1],f.cm.options))}e.styleClasses&&(e.styleClasses.bgClass&&(c.bgClass=Jc(e.styleClasses.bgClass,c.bgClass||"")),e.styleClasses.textClass&&(c.textClass=Jc(e.styleClasses.textClass,c.textClass||"")));0==c.map.length&&c.map.push(0,0,c.content.appendChild(ig(a.display.measure)));0==d?(b.measure.map=c.map,b.measure.cache={}):((b.measure.maps||(b.measure.maps=[])).push(c.map),(b.measure.caches||(b.measure.caches=[])).push({}))}R&&(d=c.content.lastChild,(/\bcm-tab\b/.test(d.className)||d.querySelector&&
-d.querySelector(".cm-tab"))&&(c.content.className="cm-tab-wrap-hack"));return F(a,"renderLine",a,b.line,c.pre),c.pre.className&&(c.textClass=Jc(c.pre.className,c.textClass||"")),c}function rg(a){var b=r("span","•","cm-invalidchar");return b.title="\\u"+a.charCodeAt(0).toString(16),b.setAttribute("aria-label",b.title),b}function pg(a,b,c,d,e,f,g){if(b){var h;if(a.splitSpaces)if(h=a.trailingSpace,1<b.length&&!/  /.test(b))h=b;else{for(var k="",l=0;l<b.length;l++){var n=b.charAt(l);" "!=n||!h||l!=b.length-
-1&&32!=b.charCodeAt(l+1)||(n=" ");k+=n;h=" "==n}h=k}else h=b;k=h;l=a.cm.state.specialChars;n=!1;if(l.test(b)){h=document.createDocumentFragment();for(var q=0;;){l.lastIndex=q;var p=l.exec(b),u=p?p.index-q:b.length-q;if(u){var O=document.createTextNode(k.slice(q,q+u));C&&9>B?h.appendChild(r("span",[O])):h.appendChild(O);a.map.push(a.pos,a.pos+u,O);a.col+=u;a.pos+=u}if(!p)break;q+=u+1;u=void 0;"\t"==p[0]?(p=a.cm.options.tabSize,p-=a.col%p,u=h.appendChild(r("span",Mc(p),"cm-tab")),u.setAttribute("role",
-"presentation"),u.setAttribute("cm-text","\t"),a.col+=p):"\r"==p[0]||"\n"==p[0]?(u=h.appendChild(r("span","\r"==p[0]?"␍":"␤","cm-invalidchar")),u.setAttribute("cm-text",p[0]),a.col+=1):(u=a.cm.options.specialCharPlaceholder(p[0]),u.setAttribute("cm-text",p[0]),C&&9>B?h.appendChild(r("span",[u])):h.appendChild(u),a.col+=1);a.map.push(a.pos,a.pos+1,u);a.pos++}}else a.col+=b.length,h=document.createTextNode(k),a.map.push(a.pos,a.pos+b.length,h),C&&9>B&&(n=!0),a.pos+=b.length;if(a.trailingSpace=32==k.charCodeAt(b.length-
-1),c||d||e||n||g)return b=c||"",d&&(b+=d),e&&(b+=e),d=r("span",[h],b,g),f&&(d.title=f),a.content.appendChild(d);a.content.appendChild(h)}}function qg(a,b){return function(c,d,e,f,g,h,k){e=e?e+" cm-force-border":"cm-force-border";for(var l=c.pos,n=l+d.length;;){for(var q=void 0,p=0;p<b.length&&(q=b[p],!(q.to>l&&q.from<=l));p++);if(q.to>=n)return a(c,d,e,f,g,h,k);a(c,d.slice(0,q.to-l),e,f,null,h,k);f=null;d=d.slice(q.to-l);l=q.to}}}function qe(a,b,c,d){var e=!d&&c.widgetNode;e&&a.map.push(a.pos,a.pos+
-b,e);!d&&a.cm.display.input.needsContentAttribute&&(e||(e=a.content.appendChild(document.createElement("span"))),e.setAttribute("cm-marker",c.id));e&&(a.cm.display.input.setUneditable(e),a.content.appendChild(e));a.pos+=b;a.trailingSpace=!1}function re(a,b,c){for(var d=this.line=b,e;d=Ia(d,!1);)d=d.find(1,!0).line,(e||(e=[])).push(d);this.size=(this.rest=e)?D(z(this.rest))-c+1:1;this.node=this.text=null;this.hidden=Ja(a,b)}function oc(a,b,c){var d,e=[];for(d=b;d<c;)b=new re(a.doc,w(a.doc,d),d),d+=
-b.size,e.push(b);return e}function sg(a,b){var c=a.ownsGroup;if(c)try{var d=c.delayedCallbacks,e=0;do{for(;e<d.length;e++)d[e].call(null);for(var f=0;f<c.ops.length;f++){var g=c.ops[f];if(g.cursorActivityHandlers)for(;g.cursorActivityCalled<g.cursorActivityHandlers.length;)g.cursorActivityHandlers[g.cursorActivityCalled++].call(null,g.cm)}}while(e<d.length)}finally{eb=null,b(c)}}function P(a,b){var c=a._handlers&&a._handlers[b]||lc;if(c.length){var d,e=Array.prototype.slice.call(arguments,2);eb?d=
-eb.delayedCallbacks:xb?d=xb:(d=xb=[],setTimeout(tg,0));for(var f=0;f<c.length;++f)!function(a){d.push(function(){return c[a].apply(null,e)})}(f)}}function tg(){var a=xb;xb=null;for(var b=0;b<a.length;++b)a[b]()}function se(a,b,c,d){for(var e=0;e<b.changes.length;e++){var f=b.changes[e];if("text"==f){var f=a,g=b,h=g.text.className,k=te(f,g);g.text==g.node&&(g.node=k.pre);g.text.parentNode.replaceChild(k.pre,g.text);g.text=k.pre;k.bgClass!=g.bgClass||k.textClass!=g.textClass?(g.bgClass=k.bgClass,g.textClass=
-k.textClass,id(f,g)):h&&(g.text.className=h)}else if("gutter"==f)ue(a,b,c,d);else if("class"==f)id(a,b);else if("widget"==f){f=a;g=b;h=d;g.alignable&&(g.alignable=null);for(var k=g.node.firstChild,l=void 0;k;k=l)l=k.nextSibling,"CodeMirror-linewidget"==k.className&&g.node.removeChild(k);ve(f,g,h)}}b.changes=null}function yb(a){return a.node==a.text&&(a.node=r("div",null,null,"position: relative"),a.text.parentNode&&a.text.parentNode.replaceChild(a.node,a.text),a.node.appendChild(a.text),C&&8>B&&(a.node.style.zIndex=
-2)),a.node}function te(a,b){var c=a.display.externalMeasured;return c&&c.line==b.line?(a.display.externalMeasured=null,b.measure=c.measure,c.built):pe(a,b)}function id(a,b){var c=b.bgClass?b.bgClass+" "+(b.line.bgClass||""):b.line.bgClass;if(c&&(c+=" CodeMirror-linebackground"),b.background)c?b.background.className=c:(b.background.parentNode.removeChild(b.background),b.background=null);else if(c){var d=yb(b);b.background=d.insertBefore(r("div",null,c),d.firstChild);a.display.input.setUneditable(b.background)}b.line.wrapClass?
-yb(b).className=b.line.wrapClass:b.node!=b.text&&(b.node.className="");b.text.className=(b.textClass?b.textClass+" "+(b.line.textClass||""):b.line.textClass)||""}function ue(a,b,c,d){if(b.gutter&&(b.node.removeChild(b.gutter),b.gutter=null),b.gutterBackground&&(b.node.removeChild(b.gutterBackground),b.gutterBackground=null),b.line.gutterClass){var e=yb(b);b.gutterBackground=r("div",null,"CodeMirror-gutter-background "+b.line.gutterClass,"left: "+(a.options.fixedGutter?d.fixedPos:-d.gutterTotalWidth)+
-"px; width: "+d.gutterTotalWidth+"px");a.display.input.setUneditable(b.gutterBackground);e.insertBefore(b.gutterBackground,b.text)}e=b.line.gutterMarkers;if(a.options.lineNumbers||e){var f=yb(b),g=b.gutter=r("div",null,"CodeMirror-gutter-wrapper","left: "+(a.options.fixedGutter?d.fixedPos:-d.gutterTotalWidth)+"px");if(a.display.input.setUneditable(g),f.insertBefore(g,b.text),b.line.gutterClass&&(g.className+=" "+b.line.gutterClass),!a.options.lineNumbers||e&&e["CodeMirror-linenumbers"]||(b.lineNumber=
-g.appendChild(r("div",Qc(a.options,c),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+d.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+a.display.lineNumInnerWidth+"px"))),e)for(b=0;b<a.options.gutters.length;++b)c=a.options.gutters[b],(f=e.hasOwnProperty(c)&&e[c])&&g.appendChild(r("div",[f],"CodeMirror-gutter-elt","left: "+d.gutterLeft[c]+"px; width: "+d.gutterWidth[c]+"px"))}}function ug(a,b,c,d){var e=te(a,b);return b.text=b.node=e.pre,e.bgClass&&(b.bgClass=e.bgClass),e.textClass&&(b.textClass=
-e.textClass),id(a,b),ue(a,b,c,d),ve(a,b,d),b.node}function ve(a,b,c){if(we(a,b.line,b,c,!0),b.rest)for(var d=0;d<b.rest.length;d++)we(a,b.rest[d],b,c,!1)}function we(a,b,c,d,e){if(b.widgets){var f=yb(c),g=0;for(b=b.widgets;g<b.length;++g){var h=b[g],k=r("div",[h.node],"CodeMirror-linewidget");h.handleMouseEvents||k.setAttribute("cm-ignore-events","true");var l=h,n=k,q=d;if(l.noHScroll){(c.alignable||(c.alignable=[])).push(n);var p=q.wrapperWidth;n.style.left=q.fixedPos+"px";l.coverGutter||(p-=q.gutterTotalWidth,
-n.style.paddingLeft=q.gutterTotalWidth+"px");n.style.width=p+"px"}l.coverGutter&&(n.style.zIndex=5,n.style.position="relative",l.noHScroll||(n.style.marginLeft=-q.gutterTotalWidth+"px"));a.display.input.setUneditable(k);e&&h.above?f.insertBefore(k,c.gutter||c.text):f.appendChild(k);P(h,"redraw")}}}function zb(a){if(null!=a.height)return a.height;var b=a.doc.cm;if(!b)return 0;if(!va(document.body,a.node)){var c="position: relative;";a.coverGutter&&(c+="margin-left: -"+b.display.gutters.offsetWidth+
-"px;");a.noHScroll&&(c+="width: "+b.display.wrapper.clientWidth+"px;");Z(b.display.measure,r("div",[a.node],null,c))}return a.height=a.node.parentNode.offsetHeight}function ta(a,b){for(var c=b.target||b.srcElement;c!=a.wrapper;c=c.parentNode)if(!c||1==c.nodeType&&"true"==c.getAttribute("cm-ignore-events")||c.parentNode==a.sizer&&c!=a.mover)return!0}function jd(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function xe(a){if(a.cachedPaddingH)return a.cachedPaddingH;var b=Z(a.measure,r("pre",
-"x")),b=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,b={left:parseInt(b.paddingLeft),right:parseInt(b.paddingRight)};return isNaN(b.left)||isNaN(b.right)||(a.cachedPaddingH=b),b}function oa(a){return Ud-a.display.nativeBarWidth}function Ma(a){return a.display.scroller.clientWidth-oa(a)-a.display.barWidth}function kd(a){return a.display.scroller.clientHeight-oa(a)-a.display.barHeight}function ye(a,b,c){if(a.line==b)return{map:a.measure.map,cache:a.measure.cache};for(var d=0;d<
-a.rest.length;d++)if(a.rest[d]==b)return{map:a.measure.maps[d],cache:a.measure.caches[d]};for(b=0;b<a.rest.length;b++)if(D(a.rest[b])>c)return{map:a.measure.maps[b],cache:a.measure.caches[b],before:!0}}function ld(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo)return a.display.view[Na(a,b)];var c=a.display.externalMeasured;return c&&b>=c.lineN&&b<c.lineN+c.size?c:void 0}function $a(a,b){var c=D(b),d=ld(a,c);d&&!d.text?d=null:d&&d.changes&&(se(a,d,c,md(a)),a.curOp.forceUpdate=!0);if(!d){var e;e=
-ma(b);d=D(e);e=a.display.externalMeasured=new re(a.doc,e,d);e.lineN=d;d=e.built=pe(a,e);d=(e.text=d.pre,Z(a.display.lineMeasure,d.pre),e)}c=ye(d,b,c);return{line:b,view:d,rect:null,map:c.map,cache:c.cache,before:c.before,hasHeights:!1}}function ra(a,b,c,d,e){b.before&&(c=-1);var f=c+(d||"");if(b.cache.hasOwnProperty(f))a=b.cache[f];else{b.rect||(b.rect=b.view.text.getBoundingClientRect());if(!b.hasHeights){var g=b.view,h=b.rect,k=a.options.lineWrapping,l=k&&Ma(a);if(!g.measure.heights||k&&g.measure.width!=
-l){var n=g.measure.heights=[];if(k)for(g.measure.width=l,g=g.text.firstChild.getClientRects(),k=0;k<g.length-1;k++){var l=g[k],q=g[k+1];2<Math.abs(l.bottom-q.bottom)&&n.push((l.bottom+q.top)/2-h.top)}n.push(h.bottom-h.top)}b.hasHeights=!0}var n=d,p,g=ze(b.map,c,n);d=g.node;h=g.start;k=g.end;c=g.collapse;if(3==d.nodeType){for(var u=0;4>u;u++){for(;h&&Oc(b.line.text.charAt(g.coverStart+h));)--h;for(;g.coverStart+k<g.coverEnd&&Oc(b.line.text.charAt(g.coverStart+k));)++k;if(C&&9>B&&0==h&&k==g.coverEnd-
-g.coverStart)k=d.parentNode.getBoundingClientRect();else{k=db(d,h,k).getClientRects();l=Ae;if("left"==n)for(q=0;q<k.length&&(l=k[q]).left==l.right;q++);else for(q=k.length-1;0<=q&&(l=k[q]).left==l.right;q--);k=l}if(p=k,p.left||p.right||0==h)break;k=h;--h;c="right"}C&&11>B&&((u=!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI)||(null!=nd?u=nd:(n=Z(a.display.measure,r("span","x")),u=n.getBoundingClientRect(),n=db(n,0,1).getBoundingClientRect(),u=nd=1<Math.abs(u.left-n.left)),
-u=!u),u||(u=screen.logicalXDPI/screen.deviceXDPI,n=screen.logicalYDPI/screen.deviceYDPI,p={left:p.left*u,right:p.right*u,top:p.top*n,bottom:p.bottom*n}))}else 0<h&&(c=n="right"),p=a.options.lineWrapping&&1<(u=d.getClientRects()).length?u["right"==n?u.length-1:0]:d.getBoundingClientRect();!(C&&9>B)||h||p&&(p.left||p.right)||(p=(p=d.parentNode.getClientRects()[0])?{left:p.left,right:p.left+Ab(a.display),top:p.top,bottom:p.bottom}:Ae);d=p.top-b.rect.top;h=p.bottom-b.rect.top;u=(d+h)/2;n=b.view.measure.heights;
-for(g=0;g<n.length-1&&!(u<n[g]);g++);c={left:("right"==c?p.right:p.left)-b.rect.left,right:("left"==c?p.left:p.right)-b.rect.left,top:g?n[g-1]:0,bottom:n[g]};a=(p.left||p.right||(c.bogus=!0),a.options.singleCursorHeightPerLine||(c.rtop=d,c.rbottom=h),c);a.bogus||(b.cache[f]=a)}return{left:a.left,right:a.right,top:e?a.rtop:a.top,bottom:e?a.rbottom:a.bottom}}function ze(a,b,c){for(var d,e,f,g,h,k,l=0;l<a.length;l+=3)if(h=a[l],k=a[l+1],b<h?(e=0,f=1,g="left"):b<k?(e=b-h,f=e+1):(l==a.length-3||b==k&&a[l+
-3]>b)&&(f=k-h,e=f-1,b>=k&&(g="right")),null!=e){if(d=a[l+2],h==k&&c==(d.insertLeft?"left":"right")&&(g=c),"left"==c&&0==e)for(;l&&a[l-2]==a[l-3]&&a[l-1].insertLeft;)d=a[2+(l-=3)],g="left";if("right"==c&&e==k-h)for(;l<a.length-3&&a[l+3]==a[l+4]&&!a[l+5].insertLeft;)d=a[(l+=3)+2],g="right";break}return{node:d,start:e,end:f,collapse:g,coverStart:h,coverEnd:k}}function Be(a){if(a.measure&&(a.measure.cache={},a.measure.heights=null,a.rest))for(var b=0;b<a.rest.length;b++)a.measure.caches[b]={}}function Ce(a){a.display.externalMeasure=
-null;X(a.display.lineMeasure);for(var b=0;b<a.display.view.length;b++)Be(a.display.view[b])}function Bb(a){Ce(a);a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null;a.options.lineWrapping||(a.display.maxLineChanged=!0);a.display.lineNumChars=null}function De(){return pc&&qc?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function Ee(){return pc&&
-qc?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function Ka(a,b,c,d,e){if(!e&&b.widgets)for(e=0;e<b.widgets.length;++e)if(b.widgets[e].above){var f=zb(b.widgets[e]);c.top+=f;c.bottom+=f}if("line"==d)return c;d||(d="local");b=na(b);if("local"==d?b+=a.display.lineSpace.offsetTop:b-=a.display.viewOffset,"page"==d||"window"==d)a=a.display.lineSpace.getBoundingClientRect(),b+=a.top+
-("window"==d?0:Ee()),d=a.left+("window"==d?0:De()),c.left+=d,c.right+=d;return c.top+=b,c.bottom+=b,c}function Fe(a,b,c){if("div"==c)return b;var d=b.left;b=b.top;"page"==c?(d-=De(),b-=Ee()):"local"!=c&&c||(c=a.display.sizer.getBoundingClientRect(),d+=c.left,b+=c.top);a=a.display.lineSpace.getBoundingClientRect();return{left:d-a.left,top:b-a.top}}function rc(a,b,c,d,e){d||(d=w(a.doc,b.line));var f=d;b=b.ch;d=ra(a,$a(a,d),b,e);return Ka(a,f,d,c)}function ia(a,b,c,d,e,f){function g(b,g){var h=ra(a,
-e,b,g?"right":"left",f);return g?h.left=h.right:h.right=h.left,Ka(a,d,h,c)}function h(a,b,d){return g(d?a-1:a,0!=k[b].level%2!=d)}d=d||w(a.doc,b.line);e||(e=$a(a,d));var k=ya(d,a.doc.direction),l=b.ch;b=b.sticky;if(l>=d.text.length?(l=d.text.length,b="before"):0>=l&&(l=0,b="after"),!k)return g("before"==b?l-1:l,"before"==b);var n=Xc(k,l,b),q=ub,n=h(l,n,"before"==b);return null!=q&&(n.other=h(l,q,"before"!=b)),n}function Ge(a,b){var c=0;b=v(a.doc,b);a.options.lineWrapping||(c=Ab(a.display)*b.ch);var d=
-w(a.doc,b.line),e=na(d)+a.display.lineSpace.offsetTop;return{left:c,right:c,top:e,bottom:e+d.height}}function od(a,b,c){var d=a.doc;if(0>(c+=a.display.viewOffset))return a=m(d.first,0,null),a.xRel=-1,a.outside=!0,a;var e=Ha(d,c),f=d.first+d.size-1;if(e>f)return a=w(d,f).text.length,a=m(d.first+d.size-1,a,null),a.xRel=1,a.outside=!0,a;0>b&&(b=0);for(f=w(d,e);;){d=vg(a,f,e,b,c);f=(e=Ia(f,!1))&&e.find(0,!0);if(!e||!(d.ch>f.from.ch||d.ch==f.from.ch&&0<d.xRel))return d;e=D(f=f.to.line)}}function ce(a,
-b,c,d){var e=b.text.length,f=gc(function(e){return Ka(a,b,ra(a,c,e-1),"line").bottom<=d},e,0);return e=gc(function(e){return Ka(a,b,ra(a,c,e),"line").top>d},f,e),{begin:f,end:e}}function vg(a,b,c,d,e){e-=na(b);var f=0,g=b.text.length,h=$a(a,b);if(ya(b,a.doc.direction)){if(a.options.lineWrapping){var k;k=ce(a,b,h,e);f=k.begin;g=k.end}c=new m(c,Math.floor(f+(g-f)/2));var l;k=ia(a,c,"line",b,h).left;var n=k<d?1:-1,q=k-d,p=Math.ceil((g-f)/4);a:do{k=q;l=c;for(var u=0;u<p;++u){var O=c;if(null==(c=be(a,
-b,c,n))||c.ch<f||g<=("before"==c.sticky?c.ch-1:c.ch)){c=O;break a}}if(q=ia(a,c,"line",b,h).left-d,1<p)n=Math.abs(q-k)/p,p=Math.min(p,Math.ceil(Math.abs(q)/n)),n=0>q?1:-1}while(0!=q&&(1<p||0>n!=0>q&&Math.abs(q)<=Math.abs(k)));if(Math.abs(q)>Math.abs(k)){if(0>q==0>k)throw Error("Broke out of infinite loop in coordsCharInner");c=l}}else f=gc(function(c){var f=Ka(a,b,ra(a,h,c),"line");return f.top>e?(g=Math.min(c,g),!0):!(f.bottom<=e)&&(f.left>d||!(f.right<d)&&d-f.left<f.right-d)},f,g),f=Td(b.text,f,
-1),c=new m(c,f,f==g?"before":"after");f=ia(a,c,"line",b,h);return(e<f.top||f.bottom<e)&&(c.outside=!0),c.xRel=d<f.left?-1:d>f.right?1:0,c}function Oa(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==Pa){Pa=r("pre");for(var b=0;49>b;++b)Pa.appendChild(document.createTextNode("x")),Pa.appendChild(r("br"));Pa.appendChild(document.createTextNode("x"))}Z(a.measure,Pa);b=Pa.offsetHeight/50;return 3<b&&(a.cachedTextHeight=b),X(a.measure),b||1}function Ab(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;
-var b=r("span","xxxxxxxxxx"),c=r("pre",[b]);Z(a.measure,c);b=b.getBoundingClientRect();b=(b.right-b.left)/10;return 2<b&&(a.cachedCharWidth=b),b||10}function md(a){for(var b=a.display,c={},d={},e=b.gutters.clientLeft,f=b.gutters.firstChild,g=0;f;f=f.nextSibling,++g)c[a.options.gutters[g]]=f.offsetLeft+f.clientLeft+e,d[a.options.gutters[g]]=f.clientWidth;return{fixedPos:pd(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function pd(a){return a.scroller.getBoundingClientRect().left-
-a.sizer.getBoundingClientRect().left}function He(a){var b=Oa(a.display),c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/Ab(a.display)-3);return function(e){if(Ja(a.doc,e))return 0;var f=0;if(e.widgets)for(var g=0;g<e.widgets.length;g++)e.widgets[g].height&&(f+=e.widgets[g].height);return c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function qd(a){var b=a.doc,c=He(a);b.iter(function(a){var b=c(a);b!=a.height&&la(a,b)})}function Qa(a,b,c,d){var e=a.display;if(!c&&"true"==(b.target||
-b.srcElement).getAttribute("cm-not-content"))return null;var f,g;c=e.lineSpace.getBoundingClientRect();try{f=b.clientX-c.left,g=b.clientY-c.top}catch(h){return null}var k;b=od(a,f,g);d&&1==b.xRel&&(k=w(a.doc,b.line).text).length==b.ch&&(d=ea(k,k.length,a.options.tabSize)-k.length,b=m(b.line,Math.max(0,Math.round((f-xe(a.display).left)/Ab(a.display))-d)));return b}function Na(a,b){if(b>=a.display.viewTo||0>(b-=a.display.viewFrom))return null;for(var c=a.display.view,d=0;d<c.length;d++)if(0>(b-=c[d].size))return d}
-function Cb(a){a.display.input.showSelection(a.display.input.prepareSelection())}function Ie(a,b){for(var c=a.doc,d={},e=d.cursors=document.createDocumentFragment(),f=d.selection=document.createDocumentFragment(),g=0;g<c.sel.ranges.length;g++)if(!1!==b||g!=c.sel.primIndex){var h=c.sel.ranges[g];if(!(h.from().line>=a.display.viewTo||h.to().line<a.display.viewFrom)){var k=h.empty();(k||a.options.showCursorWhenSelecting)&&Je(a,h.head,e);k||wg(a,h,f)}}return d}function Je(a,b,c){b=ia(a,b,"div",null,null,
-!a.options.singleCursorHeightPerLine);var d=c.appendChild(r("div"," ","CodeMirror-cursor"));if(d.style.left=b.left+"px",d.style.top=b.top+"px",d.style.height=Math.max(0,b.bottom-b.top)*a.options.cursorHeight+"px",b.other)a=c.appendChild(r("div"," ","CodeMirror-cursor CodeMirror-secondarycursor")),a.style.display="",a.style.left=b.other.left+"px",a.style.top=b.other.top+"px",a.style.height=.85*(b.other.bottom-b.other.top)+"px"}function wg(a,b,c){function d(a,b,d,c){0>b&&(b=0);b=Math.round(b);c=Math.round(c);
-h.appendChild(r("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px;\n                             top: "+b+"px; width: "+(null==d?n-a:d)+"px;\n                             height: "+(c-b)+"px"))}function e(b,c,e){var f,h,k=w(g,b),q=k.text.length;return gg(ya(k,g.direction),c||0,null==e?q:e,function(g,w,t){var r,x,v=rc(a,m(b,g),"div",k,"left");if(g==w)r=v,t=x=v.left;else{if(r=rc(a,m(b,w-1),"div",k,"right"),"rtl"==t)t=v,v=r,r=t;t=v.left;x=r.right}null==c&&0==g&&(t=l);3<r.top-v.top&&
-(d(t,v.top,null,v.bottom),t=l,v.bottom<r.top&&d(t,v.bottom,null,r.top));null==e&&w==q&&(x=n);(!f||v.top<f.top||v.top==f.top&&v.left<f.left)&&(f=v);(!h||r.bottom>h.bottom||r.bottom==h.bottom&&r.right>h.right)&&(h=r);t<l+1&&(t=l);d(t,r.top,x-t,r.bottom)}),{start:f,end:h}}var f=a.display,g=a.doc,h=document.createDocumentFragment(),k=xe(a.display),l=k.left,n=Math.max(f.sizerWidth,Ma(a)-f.sizer.offsetLeft)-k.right,f=b.from();b=b.to();if(f.line==b.line)e(f.line,f.ch,b.ch);else{var q=w(g,f.line),k=w(g,b.line),
-k=ma(q)==ma(k),f=e(f.line,f.ch,k?q.text.length+1:null).end;b=e(b.line,k?0:null,b.ch).start;k&&(f.top<b.top-2?(d(f.right,f.top,null,f.bottom),d(l,b.top,b.left,b.bottom)):d(f.right,f.top,b.left-f.right,f.bottom));f.bottom<b.top&&d(l,f.bottom,null,b.top)}c.appendChild(h)}function rd(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursorDiv.style.visibility="";0<a.options.cursorBlinkRate?b.blinker=setInterval(function(){return b.cursorDiv.style.visibility=(c=!c)?"":"hidden"},
-a.options.cursorBlinkRate):0>a.options.cursorBlinkRate&&(b.cursorDiv.style.visibility="hidden")}}function Ke(a){a.state.focused||(a.display.input.focus(),sd(a))}function Le(a){a.state.delayingBlurEvent=!0;setTimeout(function(){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1,Db(a))},100)}function sd(a,b){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1);"nocursor"!=a.options.readOnly&&(a.state.focused||(F(a,"focus",a,b),a.state.focused=!0,Ea(a.display.wrapper,"CodeMirror-focused"),
-a.curOp||a.display.selForContextMenu==a.doc.sel||(a.display.input.reset(),R&&setTimeout(function(){return a.display.input.reset(!0)},20)),a.display.input.receivedFocus()),rd(a))}function Db(a,b){a.state.delayingBlurEvent||(a.state.focused&&(F(a,"blur",a,b),a.state.focused=!1,Ra(a.display.wrapper,"CodeMirror-focused")),clearInterval(a.display.blinker),setTimeout(function(){a.state.focused||(a.display.shift=!1)},150))}function sc(a){a=a.display;for(var b=a.lineDiv.offsetTop,c=0;c<a.view.length;c++){var d=
-a.view[c],e=void 0;if(!d.hidden){if(C&&8>B)var f=d.node.offsetTop+d.node.offsetHeight,e=f-b,b=f;else e=d.node.getBoundingClientRect(),e=e.bottom-e.top;f=d.line.height-e;if(2>e&&(e=Oa(a)),(.005<f||-.005>f)&&(la(d.line,e),Me(d.line),d.rest))for(e=0;e<d.rest.length;e++)Me(d.rest[e])}}}function Me(a){if(a.widgets)for(var b=0;b<a.widgets.length;++b)a.widgets[b].height=a.widgets[b].node.parentNode.offsetHeight}function td(a,b,c){var d=c&&null!=c.top?Math.max(0,c.top):a.scroller.scrollTop,d=Math.floor(d-
-a.lineSpace.offsetTop),e=c&&null!=c.bottom?c.bottom:d+a.wrapper.clientHeight,d=Ha(b,d),e=Ha(b,e);if(c&&c.ensure){var f=c.ensure.from.line;c=c.ensure.to.line;f<d?(d=f,e=Ha(b,na(w(b,f))+a.wrapper.clientHeight)):Math.min(c,b.lastLine())>=e&&(d=Ha(b,na(w(b,c))-a.wrapper.clientHeight),e=c)}return{from:d,to:Math.max(e,d+1)}}function Ne(a){var b=a.display,c=b.view;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var d=pd(b)-b.scroller.scrollLeft+a.doc.scrollLeft,e=b.gutters.offsetWidth,
-f=d+"px",g=0;g<c.length;g++)if(!c[g].hidden){a.options.fixedGutter&&(c[g].gutter&&(c[g].gutter.style.left=f),c[g].gutterBackground&&(c[g].gutterBackground.style.left=f));var h=c[g].alignable;if(h)for(var k=0;k<h.length;k++)h[k].style.left=f}a.options.fixedGutter&&(b.gutters.style.left=d+e+"px")}}function Oe(a){if(!a.options.lineNumbers)return!1;var b=a.doc,b=Qc(a.options,b.first+b.size-1),c=a.display;if(b.length!=c.lineNumChars){var d=c.measure.appendChild(r("div",[r("div",b)],"CodeMirror-linenumber CodeMirror-gutter-elt")),
-e=d.firstChild.offsetWidth,d=d.offsetWidth-e;return c.lineGutter.style.width="",c.lineNumInnerWidth=Math.max(e,c.lineGutter.offsetWidth-d)+1,c.lineNumWidth=c.lineNumInnerWidth+d,c.lineNumChars=c.lineNumInnerWidth?b.length:-1,c.lineGutter.style.width=c.lineNumWidth+"px",ud(a),!0}return!1}function vd(a,b){var c=a.display,d=Oa(a.display);0>b.top&&(b.top=0);var e=a.curOp&&null!=a.curOp.scrollTop?a.curOp.scrollTop:c.scroller.scrollTop,f=kd(a),g={};b.bottom-b.top>f&&(b.bottom=b.top+f);var h=a.doc.height+
-jd(c),k=b.top<d,d=b.bottom>h-d;b.top<e?g.scrollTop=k?0:b.top:b.bottom>e+f&&(f=Math.min(b.top,(d?h:b.bottom)-f),f!=e&&(g.scrollTop=f));e=a.curOp&&null!=a.curOp.scrollLeft?a.curOp.scrollLeft:c.scroller.scrollLeft;c=Ma(a)-(a.options.fixedGutter?c.gutters.offsetWidth:0);f=b.right-b.left>c;return f&&(b.right=b.left+c),10>b.left?g.scrollLeft=0:b.left<e?g.scrollLeft=Math.max(0,b.left-(f?0:10)):b.right>c+e-3&&(g.scrollLeft=b.right+(f?0:10)-c),g}function tc(a,b){null!=b&&(uc(a),a.curOp.scrollTop=(null==a.curOp.scrollTop?
-a.doc.scrollTop:a.curOp.scrollTop)+b)}function fb(a){uc(a);var b=a.getCursor();a.curOp.scrollToPos={from:b,to:b,margin:a.options.cursorScrollMargin}}function Eb(a,b,c){null==b&&null==c||uc(a);null!=b&&(a.curOp.scrollLeft=b);null!=c&&(a.curOp.scrollTop=c)}function uc(a){var b=a.curOp.scrollToPos;b&&(a.curOp.scrollToPos=null,Pe(a,Ge(a,b.from),Ge(a,b.to),b.margin))}function Pe(a,b,c,d){b=vd(a,{left:Math.min(b.left,c.left),top:Math.min(b.top,c.top)-d,right:Math.max(b.right,c.right),bottom:Math.max(b.bottom,
-c.bottom)+d});Eb(a,b.scrollLeft,b.scrollTop)}function Fb(a,b){2>Math.abs(a.doc.scrollTop-b)||(wa||wd(a,{top:b}),Qe(a,b,!0),wa&&wd(a),Gb(a,100))}function Qe(a,b,c){b=Math.min(a.display.scroller.scrollHeight-a.display.scroller.clientHeight,b);(a.display.scroller.scrollTop!=b||c)&&(a.doc.scrollTop=b,a.display.scrollbars.setScrollTop(b),a.display.scroller.scrollTop!=b&&(a.display.scroller.scrollTop=b))}function Sa(a,b,c,d){b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth);(c?
-b==a.doc.scrollLeft:2>Math.abs(a.doc.scrollLeft-b))&&!d||(a.doc.scrollLeft=b,Ne(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbars.setScrollLeft(b))}function Hb(a){var b=a.display,c=b.gutters.offsetWidth,d=Math.round(a.doc.height+jd(a.display));return{clientHeight:b.scroller.clientHeight,viewHeight:b.wrapper.clientHeight,scrollWidth:b.scroller.scrollWidth,clientWidth:b.scroller.clientWidth,viewWidth:b.wrapper.clientWidth,barLeft:a.options.fixedGutter?c:0,docHeight:d,
-scrollHeight:d+oa(a)+b.barHeight,nativeBarWidth:b.nativeBarWidth,gutterWidth:c}}function gb(a,b){b||(b=Hb(a));var c=a.display.barWidth,d=a.display.barHeight;Re(a,b);for(var e=0;4>e&&c!=a.display.barWidth||d!=a.display.barHeight;e++)c!=a.display.barWidth&&a.options.lineWrapping&&sc(a),Re(a,Hb(a)),c=a.display.barWidth,d=a.display.barHeight}function Re(a,b){var c=a.display,d=c.scrollbars.update(b);c.sizer.style.paddingRight=(c.barWidth=d.right)+"px";c.sizer.style.paddingBottom=(c.barHeight=d.bottom)+
-"px";c.heightForcer.style.borderBottom=d.bottom+"px solid transparent";d.right&&d.bottom?(c.scrollbarFiller.style.display="block",c.scrollbarFiller.style.height=d.bottom+"px",c.scrollbarFiller.style.width=d.right+"px"):c.scrollbarFiller.style.display="";d.bottom&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(c.gutterFiller.style.display="block",c.gutterFiller.style.height=d.bottom+"px",c.gutterFiller.style.width=b.gutterWidth+"px"):c.gutterFiller.style.display=""}function Se(a){a.display.scrollbars&&
-(a.display.scrollbars.clear(),a.display.scrollbars.addClass&&Ra(a.display.wrapper,a.display.scrollbars.addClass));a.display.scrollbars=new Te[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller);t(b,"mousedown",function(){a.state.focused&&setTimeout(function(){return a.display.input.focus()},0)});b.setAttribute("cm-not-content","true")},function(b,c){"horizontal"==c?Sa(a,b):Fb(a,b)},a);a.display.scrollbars.addClass&&Ea(a.display.wrapper,a.display.scrollbars.addClass)}
-function Ta(a){a.curOp={cm:a,viewChanged:!1,startHeight:a.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++xg};a=a.curOp;eb?eb.ops.push(a):a.ownsGroup=eb={ops:[a],delayedCallbacks:[]}}function Ua(a){sg(a.curOp,function(a){for(var c=0;c<a.ops.length;c++)a.ops[c].cm.curOp=null;a=a.ops;for(c=0;c<a.length;c++){var d=a[c],e=d.cm,f=e.display,
-g=e.display;!g.scrollbarsClipped&&g.scroller.offsetWidth&&(g.nativeBarWidth=g.scroller.offsetWidth-g.scroller.clientWidth,g.heightForcer.style.height=oa(e)+"px",g.sizer.style.marginBottom=-g.nativeBarWidth+"px",g.sizer.style.borderRightWidth=oa(e)+"px",g.scrollbarsClipped=!0);d.updateMaxLine&&Wc(e);d.mustUpdate=d.viewChanged||d.forceUpdate||null!=d.scrollTop||d.scrollToPos&&(d.scrollToPos.from.line<f.viewFrom||d.scrollToPos.to.line>=f.viewTo)||f.maxLineChanged&&e.options.lineWrapping;d.update=d.mustUpdate&&
-new vc(e,d.mustUpdate&&{top:d.scrollTop,ensure:d.scrollToPos},d.forceUpdate)}for(c=0;c<a.length;c++)d=a[c],d.updatedDisplay=d.mustUpdate&&xd(d.cm,d.update);for(c=0;c<a.length;c++)d=a[c],e=d.cm,f=e.display,d.updatedDisplay&&sc(e),d.barMeasure=Hb(e),f.maxLineChanged&&!e.options.lineWrapping&&(g=void 0,g=f.maxLine.text.length,g=ra(e,$a(e,f.maxLine),g,void 0),d.adjustWidthTo=g.left+3,e.display.sizerWidth=d.adjustWidthTo,d.barMeasure.scrollWidth=Math.max(f.scroller.clientWidth,f.sizer.offsetLeft+d.adjustWidthTo+
-oa(e)+e.display.barWidth),d.maxScrollLeft=Math.max(0,f.sizer.offsetLeft+d.adjustWidthTo-Ma(e))),(d.updatedDisplay||d.selectionChanged)&&(d.preparedSelection=f.input.prepareSelection(d.focus));for(c=0;c<a.length;c++)d=a[c],e=d.cm,null!=d.adjustWidthTo&&(e.display.sizer.style.minWidth=d.adjustWidthTo+"px",d.maxScrollLeft<e.doc.scrollLeft&&Sa(e,Math.min(e.display.scroller.scrollLeft,d.maxScrollLeft),!0),e.display.maxLineChanged=!1),f=d.focus&&d.focus==qa()&&(!document.hasFocus||document.hasFocus()),
-d.preparedSelection&&e.display.input.showSelection(d.preparedSelection,f),(d.updatedDisplay||d.startHeight!=e.doc.height)&&gb(e,d.barMeasure),d.updatedDisplay&&yd(e,d.barMeasure),d.selectionChanged&&rd(e),e.state.focused&&d.updateInput&&e.display.input.reset(d.typing),f&&Ke(d.cm);for(c=0;c<a.length;c++){d=a[c];e=d.cm;f=e.display;g=e.doc;if(d.updatedDisplay&&Ue(e,d.update),null==f.wheelStartX||null==d.scrollTop&&null==d.scrollLeft&&!d.scrollToPos||(f.wheelStartX=f.wheelStartY=null),null!=d.scrollTop&&
-Qe(e,d.scrollTop,d.forceScroll),null!=d.scrollLeft&&Sa(e,d.scrollLeft,!0,!0),d.scrollToPos){var h=v(g,d.scrollToPos.from),k=v(g,d.scrollToPos.to),l=d.scrollToPos.margin;null==l&&(l=0);var n=void 0;e.options.lineWrapping||h!=k||(h=h.ch?m(h.line,"before"==h.sticky?h.ch-1:h.ch,"after"):h,k="before"==h.sticky?m(h.line,h.ch+1,"before"):h);for(var q=0;5>q;q++){var p=!1,n=ia(e,h),u=k&&k!=h?ia(e,k):n,n={left:Math.min(n.left,u.left),top:Math.min(n.top,u.top)-l,right:Math.max(n.left,u.left),bottom:Math.max(n.bottom,
-u.bottom)+l},u=vd(e,n),O=e.doc.scrollTop,t=e.doc.scrollLeft;if(null!=u.scrollTop&&(Fb(e,u.scrollTop),1<Math.abs(e.doc.scrollTop-O)&&(p=!0)),null!=u.scrollLeft&&(Sa(e,u.scrollLeft),1<Math.abs(e.doc.scrollLeft-t)&&(p=!0)),!p)break}k=n;K(e,"scrollCursorIntoView")||(l=e.display,q=l.sizer.getBoundingClientRect(),h=null,(0>k.top+q.top?h=!0:k.bottom+q.top>(window.innerHeight||document.documentElement.clientHeight)&&(h=!1),null==h||yg)||(k=r("div","​",null,"position: absolute;\n                         top: "+
-(k.top-l.viewOffset-e.display.lineSpace.offsetTop)+"px;\n                         height: "+(k.bottom-k.top+oa(e)+l.barHeight)+"px;\n                         left: "+k.left+"px; width: "+Math.max(2,k.right-k.left)+"px;"),e.display.lineSpace.appendChild(k),k.scrollIntoView(h),e.display.lineSpace.removeChild(k)))}k=d.maybeHiddenMarkers;h=d.maybeUnhiddenMarkers;if(k)for(l=0;l<k.length;++l)k[l].lines.length||F(k[l],"hide");if(h)for(k=0;k<h.length;++k)h[k].lines.length&&F(h[k],"unhide");f.wrapper.offsetHeight&&
-(g.scrollTop=e.display.scroller.scrollTop);d.changeObjs&&F(e,"changes",e,d.changeObjs);d.update&&d.update.finish()}})}function Y(a,b){if(a.curOp)return b();Ta(a);try{return b()}finally{Ua(a)}}function L(a,b){return function(){if(a.curOp)return b.apply(a,arguments);Ta(a);try{return b.apply(a,arguments)}finally{Ua(a)}}}function T(a){return function(){if(this.curOp)return a.apply(this,arguments);Ta(this);try{return a.apply(this,arguments)}finally{Ua(this)}}}function M(a){return function(){var b=this.cm;
-if(!b||b.curOp)return a.apply(this,arguments);Ta(b);try{return a.apply(this,arguments)}finally{Ua(b)}}}function V(a,b,c,d){null==b&&(b=a.doc.first);null==c&&(c=a.doc.first+a.doc.size);d||(d=0);var e=a.display;if(d&&c<e.viewTo&&(null==e.updateLineNumbers||e.updateLineNumbers>b)&&(e.updateLineNumbers=b),a.curOp.viewChanged=!0,b>=e.viewTo)xa&&Uc(a.doc,b)<e.viewTo&&za(a);else if(c<=e.viewFrom)xa&&ae(a.doc,c+d)>e.viewFrom?za(a):(e.viewFrom+=d,e.viewTo+=d);else if(b<=e.viewFrom&&c>=e.viewTo)za(a);else if(b<=
-e.viewFrom){var f=wc(a,c,c+d,1);f?(e.view=e.view.slice(f.index),e.viewFrom=f.lineN,e.viewTo+=d):za(a)}else if(c>=e.viewTo)(f=wc(a,b,b,-1))?(e.view=e.view.slice(0,f.index),e.viewTo=f.lineN):za(a);else{var f=wc(a,b,b,-1),g=wc(a,c,c+d,1);f&&g?(e.view=e.view.slice(0,f.index).concat(oc(a,f.lineN,g.lineN)).concat(e.view.slice(g.index)),e.viewTo+=d):za(a)}(a=e.externalMeasured)&&(c<a.lineN?a.lineN+=d:b<a.lineN+a.size&&(e.externalMeasured=null))}function Aa(a,b,c){a.curOp.viewChanged=!0;var d=a.display,e=
-a.display.externalMeasured;(e&&b>=e.lineN&&b<e.lineN+e.size&&(d.externalMeasured=null),b<d.viewFrom||b>=d.viewTo)||(a=d.view[Na(a,b)],null!=a.node&&(a=a.changes||(a.changes=[]),-1==N(a,c)&&a.push(c)))}function za(a){a.display.viewFrom=a.display.viewTo=a.doc.first;a.display.view=[];a.display.viewOffset=0}function wc(a,b,c,d){var e=Na(a,b),f=a.display.view;if(!xa||c==a.doc.first+a.doc.size)return{index:e,lineN:c};for(var g=a.display.viewFrom,h=0;h<e;h++)g+=f[h].size;if(g!=b){if(0<d){if(e==f.length-
-1)return null;b=g+f[e].size-b;e++}else b=g-b;c+=b}for(;Uc(a.doc,c)!=c;){if(e==(0>d?0:f.length-1))return null;c+=d*f[e-(0>d?1:0)].size;e+=d}return{index:e,lineN:c}}function Ve(a){a=a.display.view;for(var b=0,c=0;c<a.length;c++){var d=a[c];d.hidden||d.node&&!d.changes||++b}return b}function Gb(a,b){a.doc.highlightFrontier<a.display.viewTo&&a.state.highlight.set(b,Kc(zg,a))}function zg(a){var b=a.doc;if(!(b.highlightFrontier>=a.display.viewTo)){var c=+new Date+a.options.workTime,d=wb(a,b.highlightFrontier),
-e=[];b.iter(d.line,Math.min(b.first+b.size,a.display.viewTo+500),function(f){if(d.line>=a.display.viewFrom){var g=f.styles,h=f.text.length>a.options.maxHighlightLength?La(b.mode,d.state):null,k=he(a,f,d,!0);h&&(d.state=h);f.styles=k.styles;h=f.styleClasses;(k=k.classes)?f.styleClasses=k:h&&(f.styleClasses=null);k=!g||g.length!=f.styles.length||h!=k&&(!h||!k||h.bgClass!=k.bgClass||h.textClass!=k.textClass);for(h=0;!k&&h<g.length;++h)k=g[h]!=f.styles[h];k&&e.push(d.line);f.stateAfter=d.save()}else f.text.length<=
-a.options.maxHighlightLength&&fd(a,f.text,d),f.stateAfter=0==d.line%5?d.save():null;d.nextLine();if(+new Date>c)return Gb(a,a.options.workDelay),!0});b.highlightFrontier=d.line;b.modeFrontier=Math.max(b.modeFrontier,d.line);e.length&&Y(a,function(){for(var b=0;b<e.length;b++)Aa(a,e[b],"text")})}}function xd(a,b){var c=a.display,d=a.doc;if(b.editorIsHidden)return za(a),!1;if(!b.force&&b.visible.from>=c.viewFrom&&b.visible.to<=c.viewTo&&(null==c.updateLineNumbers||c.updateLineNumbers>=c.viewTo)&&c.renderedView==
-c.view&&0==Ve(a))return!1;Oe(a)&&(za(a),b.dims=md(a));var e=d.first+d.size,f=Math.max(b.visible.from-a.options.viewportMargin,d.first),g=Math.min(e,b.visible.to+a.options.viewportMargin);c.viewFrom<f&&20>f-c.viewFrom&&(f=Math.max(d.first,c.viewFrom));c.viewTo>g&&20>c.viewTo-g&&(g=Math.min(e,c.viewTo));xa&&(f=Uc(a.doc,f),g=ae(a.doc,g));d=f!=c.viewFrom||g!=c.viewTo||c.lastWrapHeight!=b.wrapperHeight||c.lastWrapWidth!=b.wrapperWidth;e=a.display;0==e.view.length||f>=e.viewTo||g<=e.viewFrom?(e.view=oc(a,
-f,g),e.viewFrom=f):(e.viewFrom>f?e.view=oc(a,f,e.viewFrom).concat(e.view):e.viewFrom<f&&(e.view=e.view.slice(Na(a,f))),e.viewFrom=f,e.viewTo<g?e.view=e.view.concat(oc(a,e.viewTo,g)):e.viewTo>g&&(e.view=e.view.slice(0,Na(a,g))));e.viewTo=g;c.viewOffset=na(w(a.doc,c.viewFrom));a.display.mover.style.top=c.viewOffset+"px";g=Ve(a);if(!d&&0==g&&!b.force&&c.renderedView==c.view&&(null==c.updateLineNumbers||c.updateLineNumbers>=c.viewTo))return!1;a.hasFocus()?f=null:(f=qa())&&va(a.display.lineDiv,f)?(f={activeElt:f},
-window.getSelection&&(e=window.getSelection(),e.anchorNode&&e.extend&&va(a.display.lineDiv,e.anchorNode)&&(f.anchorNode=e.anchorNode,f.anchorOffset=e.anchorOffset,f.focusNode=e.focusNode,f.focusOffset=e.focusOffset))):f=null;4<g&&(c.lineDiv.style.display="none");Ag(a,c.updateLineNumbers,b.dims);4<g&&(c.lineDiv.style.display="");c.renderedView=c.view;(g=f)&&g.activeElt&&g.activeElt!=qa()&&(g.activeElt.focus(),g.anchorNode&&va(document.body,g.anchorNode)&&va(document.body,g.focusNode))&&(f=window.getSelection(),
-e=document.createRange(),e.setEnd(g.anchorNode,g.anchorOffset),e.collapse(!1),f.removeAllRanges(),f.addRange(e),f.extend(g.focusNode,g.focusOffset));return X(c.cursorDiv),X(c.selectionDiv),c.gutters.style.height=c.sizer.style.minHeight=0,d&&(c.lastWrapHeight=b.wrapperHeight,c.lastWrapWidth=b.wrapperWidth,Gb(a,400)),c.updateLineNumbers=null,!0}function Ue(a,b){for(var c=b.viewport,d=!0;(d&&a.options.lineWrapping&&b.oldDisplayWidth!=Ma(a)||(c&&null!=c.top&&(c={top:Math.min(a.doc.height+jd(a.display)-
-kd(a),c.top)}),b.visible=td(a.display,a.doc,c),!(b.visible.from>=a.display.viewFrom&&b.visible.to<=a.display.viewTo)))&&xd(a,b);d=!1)sc(a),d=Hb(a),Cb(a),gb(a,d),yd(a,d),b.force=!1;b.signal(a,"update",a);a.display.viewFrom==a.display.reportedViewFrom&&a.display.viewTo==a.display.reportedViewTo||(b.signal(a,"viewportChange",a,a.display.viewFrom,a.display.viewTo),a.display.reportedViewFrom=a.display.viewFrom,a.display.reportedViewTo=a.display.viewTo)}function wd(a,b){var c=new vc(a,b);if(xd(a,c)){sc(a);
-Ue(a,c);var d=Hb(a);Cb(a);gb(a,d);yd(a,d);c.finish()}}function Ag(a,b,c){function d(b){var d=b.nextSibling;return R&&ha&&a.display.currentWheelTarget==b?b.style.display="none":b.parentNode.removeChild(b),d}for(var e=a.display,f=a.options.lineNumbers,g=e.lineDiv,h=g.firstChild,k=e.view,e=e.viewFrom,l=0;l<k.length;l++){var n=k[l];if(!n.hidden)if(n.node&&n.node.parentNode==g){for(;h!=n.node;)h=d(h);h=f&&null!=b&&b<=e&&n.lineNumber;n.changes&&(-1<N(n.changes,"gutter")&&(h=!1),se(a,n,e,c));h&&(X(n.lineNumber),
-n.lineNumber.appendChild(document.createTextNode(Qc(a.options,e))));h=n.node.nextSibling}else{var q=ug(a,n,e,c);g.insertBefore(q,h)}e+=n.size}for(;h;)h=d(h)}function ud(a){a.display.sizer.style.marginLeft=a.display.gutters.offsetWidth+"px"}function yd(a,b){a.display.sizer.style.minHeight=b.docHeight+"px";a.display.heightForcer.style.top=b.docHeight+"px";a.display.gutters.style.height=b.docHeight+a.display.barHeight+oa(a)+"px"}function We(a){var b=a.display.gutters,c=a.options.gutters;X(b);for(var d=
-0;d<c.length;++d){var e=c[d],f=b.appendChild(r("div",null,"CodeMirror-gutter "+e));"CodeMirror-linenumbers"==e&&(a.display.lineGutter=f,f.style.width=(a.display.lineNumWidth||1)+"px")}b.style.display=d?"":"none";ud(a)}function zd(a){var b=N(a.gutters,"CodeMirror-linenumbers");-1==b&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):-1<b&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function Xe(a){var b=a.wheelDeltaX,c=a.wheelDeltaY;return null==b&&a.detail&&
-a.axis==a.HORIZONTAL_AXIS&&(b=a.detail),null==c&&a.detail&&a.axis==a.VERTICAL_AXIS?c=a.detail:null==c&&(c=a.wheelDelta),{x:b,y:c}}function Bg(a){a=Xe(a);return a.x*=ba,a.y*=ba,a}function Ye(a,b){var c=Xe(b),d=c.x,c=c.y,e=a.display,f=e.scroller,g=f.scrollWidth>f.clientWidth,h=f.scrollHeight>f.clientHeight;if(d&&g||c&&h){if(c&&ha&&R){var g=b.target,k=e.view;a:for(;g!=f;g=g.parentNode)for(var l=0;l<k.length;l++)if(k[l].node==g){a.display.currentWheelTarget=g;break a}}if(d&&!wa&&!ja&&null!=ba)return c&&
-h&&Fb(a,Math.max(0,f.scrollTop+c*ba)),Sa(a,Math.max(0,f.scrollLeft+d*ba)),(!c||c&&h)&&S(b),void(e.wheelStartX=null);c&&null!=ba&&(h=c*ba,g=a.doc.scrollTop,k=g+e.wrapper.clientHeight,0>h?g=Math.max(0,g+h-50):k=Math.min(a.doc.height,k+h+50),wd(a,{top:g,bottom:k}));20>xc&&(null==e.wheelStartX?(e.wheelStartX=f.scrollLeft,e.wheelStartY=f.scrollTop,e.wheelDX=d,e.wheelDY=c,setTimeout(function(){if(null!=e.wheelStartX){var a=f.scrollLeft-e.wheelStartX,b=f.scrollTop-e.wheelStartY,a=b&&e.wheelDY&&b/e.wheelDY||
-a&&e.wheelDX&&a/e.wheelDX;e.wheelStartX=e.wheelStartY=null;a&&(ba=(ba*xc+a)/(xc+1),++xc)}},200)):(e.wheelDX+=d,e.wheelDY+=c))}}function ka(a,b){var c=a[b];a.sort(function(a,b){return x(a.from(),b.from())});b=N(a,c);for(c=1;c<a.length;c++){var d=a[c],e=a[c-1];if(0<=x(e.to(),d.from())){var f=ic(e.from(),d.from()),g=hc(e.to(),d.to()),d=e.empty()?d.from()==d.head:e.from()==e.head;c<=b&&--b;a.splice(--c,2,new A(d?g:f,d?f:g))}}return new ca(a,b)}function ua(a,b){return new ca([new A(a,b||a)],0)}function Ba(a){return a.text?
-m(a.from.line+a.text.length-1,z(a.text).length+(1==a.text.length?a.from.ch:0)):a.to}function Ze(a,b){if(0>x(a,b.from))return a;if(0>=x(a,b.to))return Ba(b);var c=a.line+b.text.length-(b.to.line-b.from.line)-1,d=a.ch;return a.line==b.to.line&&(d+=Ba(b).ch-b.to.ch),m(c,d)}function Ad(a,b){for(var c=[],d=0;d<a.sel.ranges.length;d++){var e=a.sel.ranges[d];c.push(new A(Ze(e.anchor,b),Ze(e.head,b)))}return ka(c,a.sel.primIndex)}function $e(a,b,c){return a.line==b.line?m(c.line,a.ch-b.ch+c.ch):m(c.line+
-(a.line-b.line),a.ch)}function Bd(a){a.doc.mode=dd(a.options,a.doc.modeOption);Ib(a)}function Ib(a){a.doc.iter(function(a){a.stateAfter&&(a.stateAfter=null);a.styles&&(a.styles=null)});a.doc.modeFrontier=a.doc.highlightFrontier=a.doc.first;Gb(a,100);a.state.modeGen++;a.curOp&&V(a)}function af(a,b){return 0==b.from.ch&&0==b.to.ch&&""==z(b.text)&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function Cd(a,b,c,d){function e(a,c,e){a.text=c;a.stateAfter&&(a.stateAfter=null);a.styles&&(a.styles=null);null!=
-a.order&&(a.order=null);Xd(a);Yd(a,e);c=d?d(a):1;c!=a.height&&la(a,c);P(a,"change",a,b)}function f(a,b){for(var e=[],f=a;f<b;++f)e.push(new hb(k[f],c?c[f]:null,d));return e}var g=b.from,h=b.to,k=b.text,l=w(a,g.line),n=w(a,h.line),q=z(k),p=c?c[k.length-1]:null,u=h.line-g.line;b.full?(a.insert(0,f(0,k.length)),a.remove(k.length,a.size-k.length)):af(a,b)?(h=f(0,k.length-1),e(n,n.text,p),u&&a.remove(g.line,u),h.length&&a.insert(g.line,h)):l==n?1==k.length?e(l,l.text.slice(0,g.ch)+q+l.text.slice(h.ch),
-p):(u=f(1,k.length-1),u.push(new hb(q+l.text.slice(h.ch),p,d)),e(l,l.text.slice(0,g.ch)+k[0],c?c[0]:null),a.insert(g.line+1,u)):1==k.length?(e(l,l.text.slice(0,g.ch)+k[0]+n.text.slice(h.ch),c?c[0]:null),a.remove(g.line+1,u)):(e(l,l.text.slice(0,g.ch)+k[0],c?c[0]:null),e(n,q+n.text.slice(h.ch),p),p=f(1,k.length-1),1<u&&a.remove(g.line+1,u-1),a.insert(g.line+1,p));P(a,"change",a,b)}function Va(a,b,c){function d(a,f,g){if(a.linked)for(var h=0;h<a.linked.length;++h){var k=a.linked[h];if(k.doc!=f){var l=
-g&&k.sharedHist;c&&!l||(b(k.doc,l),d(k.doc,a,l))}}}d(a,null,!0)}function bf(a,b){if(b.cm)throw Error("This document is already in use.");a.doc=b;b.cm=a;qd(a);Bd(a);cf(a);a.options.lineWrapping||Wc(a);a.options.mode=b.modeOption;V(a)}function cf(a){("rtl"==a.doc.direction?Ea:Ra)(a.display.lineDiv,"CodeMirror-rtl")}function Cg(a){Y(a,function(){cf(a);V(a)})}function yc(a){this.done=[];this.undone=[];this.undoDepth=1/0;this.lastModTime=this.lastSelTime=0;this.lastOrigin=this.lastSelOrigin=this.lastOp=
-this.lastSelOp=null;this.generation=this.maxGeneration=a||1}function Dd(a,b){var c={from:Sc(b.from),to:Ba(b),text:Ga(a,b.from,b.to)};return df(a,c,b.from.line,b.to.line+1),Va(a,function(a){return df(a,c,b.from.line,b.to.line+1)},!0),c}function ef(a){for(;a.length&&z(a).ranges;)a.pop()}function ff(a,b,c,d){var e=a.history;e.undone.length=0;var f,g,h=+new Date,k;if(k=e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&a.cm&&e.lastModTime>h-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))k=
-f=e.lastOp==d?(ef(e.done),z(e.done)):e.done.length&&!z(e.done).ranges?z(e.done):1<e.done.length&&!e.done[e.done.length-2].ranges?(e.done.pop(),z(e.done)):void 0;if(k)g=z(f.changes),0==x(b.from,b.to)&&0==x(b.from,g.to)?g.to=Ba(b):f.changes.push(Dd(a,b));else for((f=z(e.done))&&f.ranges||zc(a.sel,e.done),f={changes:[Dd(a,b)],generation:e.generation},e.done.push(f);e.done.length>e.undoDepth;)e.done.shift(),e.done[0].ranges||e.done.shift();e.done.push(c);e.generation=++e.maxGeneration;e.lastModTime=e.lastSelTime=
-h;e.lastOp=e.lastSelOp=d;e.lastOrigin=e.lastSelOrigin=b.origin;g||F(a,"historyAdded")}function zc(a,b){var c=z(b);c&&c.ranges&&c.equals(a)||b.push(a)}function df(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),function(d){d.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=d.markedSpans);++f})}function Dg(a){if(!a)return null;for(var b,c=0;c<a.length;++c)a[c].marker.explicitlyCleared?b||(b=a.slice(0,c)):b&&b.push(a[c]);return b?b.length?b:null:a}function gf(a,
-b){var c;if(c=b["spans_"+a.id]){for(var d=[],e=0;e<b.text.length;++e)d.push(Dg(c[e]));c=d}else c=null;d=Tc(a,b);if(!c)return d;if(!d)return c;for(e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g){var h=0;a:for(;h<g.length;++h){for(var k=g[h],l=0;l<f.length;++l)if(f[l].marker==k.marker)continue a;f.push(k)}}else g&&(c[e]=g)}return c}function ib(a,b,c){for(var d=[],e=0;e<a.length;++e){var f=a[e];if(f.ranges)d.push(c?ca.prototype.deepCopy.call(f):f);else{var f=f.changes,g=[];d.push({changes:g});for(var h=
-0;h<f.length;++h){var k=f[h],l=void 0;if(g.push({from:k.from,to:k.to,text:k.text}),b)for(var n in k)(l=n.match(/^spans_(\d+)$/))&&-1<N(b,Number(l[1]))&&(z(g)[n]=k[n],delete k[n])}}}return d}function Ed(a,b,c,d){return d?(a=a.anchor,c&&(d=0>x(b,a),d!=0>x(c,a)?(a=b,b=c):d!=0>x(b,c)&&(b=c)),new A(a,b)):new A(c||b,b)}function Ac(a,b,c,d,e){null==e&&(e=a.cm&&(a.cm.display.shift||a.extend));Q(a,new ca([Ed(a.sel.primary(),b,c,e)],0),d)}function hf(a,b,c){for(var d=[],e=a.cm&&(a.cm.display.shift||a.extend),
-f=0;f<a.sel.ranges.length;f++)d[f]=Ed(a.sel.ranges[f],b[f],null,e);Q(a,ka(d,a.sel.primIndex),c)}function Fd(a,b,c,d){var e=a.sel.ranges.slice(0);e[b]=c;Q(a,ka(e,a.sel.primIndex),d)}function Eg(a,b,c){c={ranges:b.ranges,update:function(b){this.ranges=[];for(var c=0;c<b.length;c++)this.ranges[c]=new A(v(a,b[c].anchor),v(a,b[c].head))},origin:c&&c.origin};return F(a,"beforeSelectionChange",a,c),a.cm&&F(a.cm,"beforeSelectionChange",a.cm,c),c.ranges!=b.ranges?ka(c.ranges,c.ranges.length-1):b}function jf(a,
-b,c){var d=a.history.done,e=z(d);e&&e.ranges?(d[d.length-1]=b,Bc(a,b,c)):Q(a,b,c)}function Q(a,b,c){Bc(a,b,c);b=a.sel;var d=a.cm?a.cm.curOp.id:NaN,e=a.history,f=c&&c.origin,g;if(!(g=d==e.lastSelOp)&&(g=f&&e.lastSelOrigin==f)&&!(g=e.lastModTime==e.lastSelTime&&e.lastOrigin==f)){g=z(e.done);var h=f.charAt(0);g="*"==h||"+"==h&&g.ranges.length==b.ranges.length&&g.somethingSelected()==b.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}g?e.done[e.done.length-
-1]=b:zc(b,e.done);e.lastSelTime=+new Date;e.lastSelOrigin=f;e.lastSelOp=d;c&&!1!==c.clearRedo&&ef(e.undone)}function Bc(a,b,c){(fa(a,"beforeSelectionChange")||a.cm&&fa(a.cm,"beforeSelectionChange"))&&(b=Eg(a,b,c));kf(a,lf(a,b,c&&c.bias||(0>x(b.primary().head,a.sel.primary().head)?-1:1),!0));c&&!1===c.scroll||!a.cm||fb(a.cm)}function kf(a,b){b.equals(a.sel)||(a.sel=b,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=!0,de(a.cm)),P(a,"cursorActivity",a))}function mf(a){kf(a,lf(a,a.sel,null,
-!1))}function lf(a,b,c,d){for(var e,f=0;f<b.ranges.length;f++){var g=b.ranges[f],h=b.ranges.length==a.sel.ranges.length&&a.sel.ranges[f],k=Gd(a,g.anchor,h&&h.anchor,c,d),h=Gd(a,g.head,h&&h.head,c,d);(e||k!=g.anchor||h!=g.head)&&(e||(e=b.ranges.slice(0,f)),e[f]=new A(k,h))}return e?ka(e,b.primIndex):b}function jb(a,b,c,d,e){var f=w(a,b.line);if(f.markedSpans)for(var g=0;g<f.markedSpans.length;++g){var h=f.markedSpans[g],k=h.marker;if((null==h.from||(k.inclusiveLeft?h.from<=b.ch:h.from<b.ch))&&(null==
-h.to||(k.inclusiveRight?h.to>=b.ch:h.to>b.ch))){if(e&&(F(k,"beforeCursorEnter"),k.explicitlyCleared)){if(f.markedSpans){--g;continue}break}if(k.atomic){if(c&&(g=k.find(0>d?1:-1),h=void 0,(0>d?k.inclusiveRight:k.inclusiveLeft)&&(g=nf(a,g,-d,g&&g.line==b.line?f:null)),g&&g.line==b.line&&(h=x(g,c))&&(0>d?0>h:0<h)))return jb(a,g,b,d,e);c=k.find(0>d?-1:1);return(0>d?k.inclusiveLeft:k.inclusiveRight)&&(c=nf(a,c,d,c.line==b.line?f:null)),c?jb(a,c,b,d,e):null}}}return b}function Gd(a,b,c,d,e){d=d||1;return jb(a,
-b,c,d,e)||!e&&jb(a,b,c,d,!0)||jb(a,b,c,-d,e)||!e&&jb(a,b,c,-d,!0)||(a.cantEdit=!0,m(a.first,0))}function nf(a,b,c,d){return 0>c&&0==b.ch?b.line>a.first?v(a,m(b.line-1)):null:0<c&&b.ch==(d||w(a,b.line)).text.length?b.line<a.first+a.size-1?m(b.line+1,0):null:new m(b.line,b.ch+c)}function of(a){a.setSelection(m(a.firstLine(),0),m(a.lastLine()),pa)}function pf(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){return d.canceled=!0}};return c&&(d.update=function(b,
-c,g,h){b&&(d.from=v(a,b));c&&(d.to=v(a,c));g&&(d.text=g);void 0!==h&&(d.origin=h)}),F(a,"beforeChange",a,d),a.cm&&F(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function kb(a,b,c){if(a.cm){if(!a.cm.curOp)return L(a.cm,kb)(a,b,c);if(a.cm.state.suppressEdits)return}if(!(fa(a,"beforeChange")||a.cm&&fa(a.cm,"beforeChange"))||(b=pf(a,b,!0)))if(c=qf&&!c&&fg(a,b.from,b.to))for(var d=c.length-1;0<=d;--d)rf(a,{from:c[d].from,to:c[d].to,text:d?[""]:b.text});
-else rf(a,b)}function rf(a,b){if(1!=b.text.length||""!=b.text[0]||0!=x(b.from,b.to)){var c=Ad(a,b);ff(a,b,c,a.cm?a.cm.curOp.id:NaN);Jb(a,b,c,Tc(a,b));var d=[];Va(a,function(a,c){c||-1!=N(d,a.history)||(sf(a.history,b),d.push(a.history));Jb(a,b,null,Tc(a,b))})}}function Cc(a,b,c){if(!a.cm||!a.cm.state.suppressEdits||c){for(var d,e=a.history,f=a.sel,g="undo"==b?e.done:e.undone,h="undo"==b?e.undone:e.done,k=0;k<g.length&&(d=g[k],c?!d.ranges||d.equals(a.sel):d.ranges);k++);if(k!=g.length){for(e.lastOrigin=
-e.lastSelOrigin=null;d=g.pop(),d.ranges;){if(zc(d,h),c&&!d.equals(a.sel))return void Q(a,d,{clearRedo:!1});f=d}var l=[];zc(f,h);h.push({changes:l,generation:e.generation});e.generation=d.generation||++e.maxGeneration;var n=fa(a,"beforeChange")||a.cm&&fa(a.cm,"beforeChange");for(c=d.changes.length-1;0<=c;--c)if(e=function(c){var e=d.changes[c];if(e.origin=b,n&&!pf(a,e,!1))return g.length=0,{};l.push(Dd(a,e));var f=c?Ad(a,e):z(g);Jb(a,e,f,gf(a,e));!c&&a.cm&&a.cm.scrollIntoView({from:e.from,to:Ba(e)});
-var h=[];Va(a,function(a,b){b||-1!=N(h,a.history)||(sf(a.history,e),h.push(a.history));Jb(a,e,null,gf(a,e))})}(c))return e.v}}}function tf(a,b){if(0!=b&&(a.first+=b,a.sel=new ca(ec(a.sel.ranges,function(a){return new A(m(a.anchor.line+b,a.anchor.ch),m(a.head.line+b,a.head.ch))}),a.sel.primIndex),a.cm)){V(a.cm,a.first,a.first-b,b);for(var c=a.cm.display,d=c.viewFrom;d<c.viewTo;d++)Aa(a.cm,d,"gutter")}}function Jb(a,b,c,d){if(a.cm&&!a.cm.curOp)return L(a.cm,Jb)(a,b,c,d);if(b.to.line<a.first)return void tf(a,
-b.text.length-1-(b.to.line-b.from.line));if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);tf(a,e);b={from:m(a.first,0),to:m(b.to.line+e,b.to.ch),text:[z(b.text)],origin:b.origin}}e=a.lastLine();b.to.line>e&&(b={from:b.from,to:m(e,w(a,e).text.length),text:[b.text[0]],origin:b.origin});b.removed=Ga(a,b.from,b.to);c||(c=Ad(a,b));a.cm?Fg(a.cm,b,d):Cd(a,b,d);Bc(a,c,pa)}}function Fg(a,b,c){var d=a.doc,e=a.display,f=b.from,g=b.to,h=!1,k=f.line;a.options.lineWrapping||
-(k=D(ma(w(d,f.line))),d.iter(k,g.line+1,function(a){if(a==e.maxLine)return h=!0,!0}));-1<d.sel.contains(b.from,b.to)&&de(a);Cd(d,b,c,He(a));a.options.lineWrapping||(d.iter(k,f.line+b.text.length,function(a){var b=kc(a);b>e.maxLineLength&&(e.maxLine=a,e.maxLineLength=b,e.maxLineChanged=!0,h=!1)}),h&&(a.curOp.updateMaxLine=!0));mg(d,f.line);Gb(a,400);c=b.text.length-(g.line-f.line)-1;b.full?V(a):f.line!=g.line||1!=b.text.length||af(a.doc,b)?V(a,f.line,g.line+1,c):Aa(a,f.line,"text");c=fa(a,"changes");
-if((d=fa(a,"change"))||c)b={from:f,to:g,text:b.text,removed:b.removed,origin:b.origin},d&&P(a,"change",a,b),c&&(a.curOp.changeObjs||(a.curOp.changeObjs=[])).push(b);a.display.selForContextMenu=null}function lb(a,b,c,d,e){if(d||(d=c),0>x(d,c)){var f=d;d=c;c=f}"string"==typeof b&&(b=a.splitLines(b));kb(a,{from:c,to:d,text:b,origin:e})}function uf(a,b,c,d){for(var e=0;e<a.length;++e){var f=a[e],g=!0;if(f.ranges)for(f.copied||(f=a[e]=f.deepCopy(),f.copied=!0),g=0;g<f.ranges.length;g++){var h=f.ranges[g].anchor,
-k=b;c<h.line?h.line+=d:k<h.line&&(h.line=k,h.ch=0);h=f.ranges[g].head;k=b;c<h.line?h.line+=d:k<h.line&&(h.line=k,h.ch=0)}else{for(h=0;h<f.changes.length;++h)if(k=f.changes[h],c<k.from.line)k.from=m(k.from.line+d,k.from.ch),k.to=m(k.to.line+d,k.to.ch);else if(b<=k.to.line){g=!1;break}g||(a.splice(0,e+1),e=0)}}}function sf(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;uf(a.done,c,d,e);uf(a.undone,c,d,e)}function Kb(a,b,c,d){var e=b,f=b;return"number"==typeof b?f=w(a,Math.max(a.first,Math.min(b,
-a.first+a.size-1))):e=D(b),null==e?null:(d(f,e)&&a.cm&&Aa(a.cm,e,c),f)}function Lb(a){this.lines=a;this.parent=null;for(var b=0,c=0;c<a.length;++c)a[c].parent=this,b+=a[c].height;this.height=b}function Mb(a){this.children=a;for(var b=0,c=0,d=0;d<a.length;++d){var e=a[d],b=b+e.chunkSize(),c=c+e.height;e.parent=this}this.size=b;this.height=c;this.parent=null}function Gg(a,b,c,d){var e=new Nb(a,c,d),f=a.cm;return f&&e.noHScroll&&(f.display.alignWidgets=!0),Kb(a,b,"widget",function(b){var c=b.widgets||
-(b.widgets=[]);if(null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e),e.line=b,f&&!Ja(a,b))c=na(b)<a.scrollTop,la(b,b.height+zb(e)),c&&tc(f,e.height),f.curOp.forceUpdate=!0;return!0}),P(f,"lineWidgetAdded",f,e,"number"==typeof b?b:D(b)),e}function mb(a,b,c,d,e){if(d&&d.shared)return Hg(a,b,c,d,e);if(a.cm&&!a.cm.curOp)return L(a.cm,mb)(a,b,c,d,e);var f=new Ca(a,e);e=x(b,c);if(d&&Fa(d,f,!1),0<e||0==e&&!1!==f.clearWhenEmpty)return f;if(f.replacedWith&&(f.collapsed=!0,
-f.widgetNode=Za("span",[f.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||f.widgetNode.setAttribute("cm-ignore-events","true"),d.insertLeft&&(f.widgetNode.insertLeft=!0)),f.collapsed){if($d(a,b.line,b,c,f)||b.line!=c.line&&$d(a,c.line,b,c,f))throw Error("Inserting collapsed marker partially overlapping an existing one");xa=!0}f.addToHistory&&ff(a,{from:b,to:c,origin:"markText"},a.sel,NaN);var g,h=b.line,k=a.cm;a.iter(h,c.line+1,function(a){k&&f.collapsed&&!k.options.lineWrapping&&ma(a)==k.display.maxLine&&
-(g=!0);f.collapsed&&h!=b.line&&la(a,0);var d=new jc(f,h==b.line?b.ch:null,h==c.line?c.ch:null);a.markedSpans=a.markedSpans?a.markedSpans.concat([d]):[d];d.marker.attachLine(a);++h});f.collapsed&&a.iter(b.line,c.line+1,function(b){Ja(a,b)&&la(b,0)});f.clearOnEnter&&t(f,"beforeCursorEnter",function(){return f.clear()});f.readOnly&&(qf=!0,(a.history.done.length||a.history.undone.length)&&a.clearHistory());if(f.collapsed&&(f.id=++vf,f.atomic=!0),k){if(g&&(k.curOp.updateMaxLine=!0),f.collapsed)V(k,b.line,
-c.line+1);else if(f.className||f.title||f.startStyle||f.endStyle||f.css)for(d=b.line;d<=c.line;d++)Aa(k,d,"text");f.atomic&&mf(k.doc);P(k,"markerAdded",k,f)}return f}function Hg(a,b,c,d,e){d=Fa(d);d.shared=!1;var f=[mb(a,b,c,d,e)],g=f[0],h=d.widgetNode;return Va(a,function(a){h&&(d.widgetNode=h.cloneNode(!0));f.push(mb(a,v(a,b),v(a,c),d,e));for(var l=0;l<a.linked.length;++l)if(a.linked[l].isParent)return;g=z(f)}),new Ob(f,g)}function wf(a){return a.findMarks(m(a.first,0),a.clipPos(m(a.lastLine())),
-function(a){return a.parent})}function Ig(a){for(var b=0;b<a.length;b++)!function(b){b=a[b];var d=[b.primary.doc];Va(b.primary.doc,function(a){return d.push(a)});for(var e=0;e<b.markers.length;e++){var f=b.markers[e];-1==N(d,f.doc)&&(f.parent=null,b.markers.splice(e--,1))}}(b)}function Jg(a){var b=this;if(xf(b),!K(b,a)&&!ta(b.display,a)){S(a);C&&(yf=+new Date);var c=Qa(b,a,!0),d=a.dataTransfer.files;if(c&&!b.isReadOnly())if(d&&d.length&&window.FileReader&&window.File)for(var e=d.length,f=Array(e),
-g=0,h=0;h<e;++h)!function(a,d){if(!b.options.allowDropFileTypes||-1!=N(b.options.allowDropFileTypes,a.type)){var h=new FileReader;h.onload=L(b,function(){var a=h.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(a)&&(a=""),f[d]=a,++g==e)c=v(b.doc,c),a={from:c,to:c,text:b.doc.splitLines(f.join(b.doc.lineSeparator())),origin:"paste"},kb(b.doc,a),jf(b.doc,ua(c,Ba(a)))});h.readAsText(a)}}(d[h],h);else{if(b.state.draggingText&&-1<b.doc.sel.contains(c))return b.state.draggingText(a),void setTimeout(function(){return b.display.input.focus()},
-20);try{if(h=a.dataTransfer.getData("Text")){var k;if(b.state.draggingText&&!b.state.draggingText.copy&&(k=b.listSelections()),Bc(b.doc,ua(c,c)),k)for(d=0;d<k.length;++d)lb(b.doc,"",k[d].anchor,k[d].head,"drag");b.replaceSelection(h,"around","paste");b.display.input.focus()}}catch(l){}}}}function xf(a){a.display.dragCursor&&(a.display.lineSpace.removeChild(a.display.dragCursor),a.display.dragCursor=null)}function zf(a){if(document.getElementsByClassName)for(var b=document.getElementsByClassName("CodeMirror"),
-c=0;c<b.length;c++){var d=b[c].CodeMirror;d&&a(d)}}function Kg(){var a;t(window,"resize",function(){null==a&&(a=setTimeout(function(){a=null;zf(Lg)},100))});t(window,"blur",function(){return zf(Db)})}function Lg(a){var b=a.display;b.lastWrapHeight==b.wrapper.clientHeight&&b.lastWrapWidth==b.wrapper.clientWidth||(b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null,b.scrollbarsClipped=!1,a.setSize())}function Mg(a){var b=a.split(/-(?!$)/);a=b[b.length-1];for(var c,d,e,f,g=0;g<b.length-1;g++){var h=
-b[g];if(/^(cmd|meta|m)$/i.test(h))f=!0;else if(/^a(lt)?$/i.test(h))c=!0;else if(/^(c|ctrl|control)$/i.test(h))d=!0;else{if(!/^s(hift)?$/i.test(h))throw Error("Unrecognized modifier name: "+h);e=!0}}return c&&(a="Alt-"+a),d&&(a="Ctrl-"+a),f&&(a="Cmd-"+a),e&&(a="Shift-"+a),a}function Ng(a){var b={},c;for(c in a)if(a.hasOwnProperty(c)){var d=a[c];if(!/^(name|fallthrough|(de|at)tach)$/.test(c)){if("..."!=d)for(var e=ec(c.split(" "),Mg),f=0;f<e.length;f++){var g=void 0,h=void 0;f==e.length-1?(h=e.join(" "),
-g=d):(h=e.slice(0,f+1).join(" "),g="...");var k=b[h];if(k){if(k!=g)throw Error("Inconsistent bindings for "+h);}else b[h]=g}delete a[c]}}for(var l in b)a[l]=b[l];return a}function nb(a,b,c,d){b=Dc(b);var e=b.call?b.call(a,d):b[a];if(!1===e)return"nothing";if("..."===e)return"multi";if(null!=e&&c(e))return"handled";if(b.fallthrough){if("[object Array]"!=Object.prototype.toString.call(b.fallthrough))return nb(a,b.fallthrough,c,d);for(e=0;e<b.fallthrough.length;e++){var f=nb(a,b.fallthrough[e],c,d);
-if(f)return f}}}function Af(a){a="string"==typeof a?a:Da[a.keyCode];return"Ctrl"==a||"Alt"==a||"Shift"==a||"Mod"==a}function Bf(a,b,c){var d=a;return b.altKey&&"Alt"!=d&&(a="Alt-"+a),(Cf?b.metaKey:b.ctrlKey)&&"Ctrl"!=d&&(a="Ctrl-"+a),(Cf?b.ctrlKey:b.metaKey)&&"Cmd"!=d&&(a="Cmd-"+a),!c&&b.shiftKey&&"Shift"!=d&&(a="Shift-"+a),a}function Df(a,b){if(ja&&34==a.keyCode&&a["char"])return!1;var c=Da[a.keyCode];return null!=c&&!a.altGraphKey&&Bf(c,a,b)}function Dc(a){return"string"==typeof a?Pb[a]:a}function ob(a,
-b){for(var c=a.doc.sel.ranges,d=[],e=0;e<c.length;e++){for(var f=b(c[e]);d.length&&0>=x(f.from,z(d).to);){var g=d.pop();if(0>x(g.from,f.from)){f.from=g.from;break}}d.push(f)}Y(a,function(){for(var b=d.length-1;0<=b;b--)lb(a.doc,"",d[b].from,d[b].to,"+delete");fb(a)})}function Ef(a,b){var c=w(a.doc,b),d=ma(c);return d!=c&&(b=D(d)),$c(!0,a,d,b,1)}function Ff(a,b){var c=Ef(a,b.line),d=w(a.doc,c.line),e=ya(d,a.doc.direction);return e&&0!=e[0].level?c:(d=Math.max(0,d.text.search(/\S/)),m(c.line,b.line==
-c.line&&b.ch<=d&&b.ch?0:d,c.sticky))}function Ec(a,b,c){if("string"==typeof b&&!(b=Qb[b]))return!1;a.display.input.ensurePolled();var d=a.display.shift,e=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),c&&(a.display.shift=!1),e=b(a)!=Fc}finally{a.display.shift=d,a.state.suppressEdits=!1}return e}function Og(a,b,c){for(var d=0;d<a.state.keyMaps.length;d++){var e=nb(b,a.state.keyMaps[d],c,a);if(e)return e}return a.options.extraKeys&&nb(b,a.options.extraKeys,c,a)||nb(b,a.options.keyMap,c,a)}function Rb(a,
-b,c,d){var e=a.state.keySeq;if(e){if(Af(b))return"handled";Pg.set(50,function(){a.state.keySeq==e&&(a.state.keySeq=null,a.display.input.reset())});b=e+" "+b}d=Og(a,b,d);return"multi"==d&&(a.state.keySeq=b),"handled"==d&&P(a,"keyHandled",a,b,c),"handled"!=d&&"multi"!=d||(S(c),rd(a)),e&&!d&&/\'$/.test(b)?(S(c),!0):!!d}function Gf(a,b){var c=Df(b,!0);return!!c&&(b.shiftKey&&!a.state.keySeq?Rb(a,"Shift-"+c,b,function(b){return Ec(a,b,!0)})||Rb(a,c,b,function(b){if("string"==typeof b?/^go[A-Z]/.test(b):
-b.motion)return Ec(a,b)}):Rb(a,c,b,function(b){return Ec(a,b)}))}function Qg(a,b,c){return Rb(a,"'"+c+"'",b,function(b){return Ec(a,b,!0)})}function Hf(a){if(this.curOp.focus=qa(),!K(this,a)){C&&11>B&&27==a.keyCode&&(a.returnValue=!1);var b=a.keyCode;this.display.shift=16==b||a.shiftKey;var c=Gf(this,a);ja&&(Hd=c?b:null,!c&&88==b&&!Rg&&(ha?a.metaKey:a.ctrlKey)&&this.replaceSelection("",null,"cut"));18!=b||/\bCodeMirror-crosshair\b/.test(this.display.lineDiv.className)||Sg(this)}}function Sg(a){function b(a){18!=
-a.keyCode&&a.altKey||(Ra(c,"CodeMirror-crosshair"),aa(document,"keyup",b),aa(document,"mouseover",b))}var c=a.display.lineDiv;Ea(c,"CodeMirror-crosshair");t(document,"keyup",b);t(document,"mouseover",b)}function If(a){16==a.keyCode&&(this.doc.sel.shift=!1);K(this,a)}function Jf(a){if(!(ta(this.display,a)||K(this,a)||a.ctrlKey&&!a.altKey||ha&&a.metaKey)){var b=a.keyCode,c=a.charCode;if(ja&&b==Hd)return Hd=null,void S(a);ja&&(!a.which||10>a.which)&&Gf(this,a)||(b=String.fromCharCode(null==c?b:c),"\b"!=
-b&&(Qg(this,a,b)||this.display.input.onKeyPress(a)))}}function Tg(a,b){var c=+new Date;return Sb&&Sb.compare(c,a,b)?(Tb=Sb=null,"triple"):Tb&&Tb.compare(c,a,b)?(Sb=new Id(c,a,b),Tb=null,"double"):(Tb=new Id(c,a,b),Sb=null,"single")}function Kf(a){var b=this.display;if(!(K(this,a)||b.activeTouch&&b.input.supportsTouch())){if(b.input.ensurePolled(),b.shift=a.shiftKey,ta(b,a))return void(R||(b.scroller.draggable=!1,setTimeout(function(){return b.scroller.draggable=!0},100)));if(!Jd(this,a,"gutterClick",
-!0)){var c=Qa(this,a),d=fe(a),e=c?Tg(c,d):"single";window.focus();1==d&&this.state.selectingText&&this.state.selectingText(a);c&&Ug(this,d,c,e,a)||(1==d?c?Vg(this,c,e,a):(a.target||a.srcElement)==b.scroller&&S(a):2==d?(c&&Ac(this.doc,c),setTimeout(function(){return b.input.focus()},20)):3==d&&(Kd?Lf(this,a):Le(this)))}}}function Ug(a,b,c,d,e){var f="Click";return"double"==d?f="Double"+f:"triple"==d&&(f="Triple"+f),f=(1==b?"Left":2==b?"Middle":"Right")+f,Rb(a,Bf(f,e),e,function(b){if("string"==typeof b&&
-(b=Qb[b]),!b)return!1;var d=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),d=b(a,c)!=Fc}finally{a.state.suppressEdits=!1}return d})}function Vg(a,b,c,d){C?setTimeout(Kc(Ke,a),0):a.curOp.focus=qa();var e,f;f=(f=a.getOption("configureMouse"))?f(a,c,d):{};null==f.unit&&(f.unit=(Wg?d.shiftKey&&d.metaKey:d.altKey)?"rectangle":"single"==c?"char":"double"==c?"word":"line");f=((null==f.extend||a.doc.extend)&&(f.extend=a.doc.extend||d.shiftKey),null==f.addNew&&(f.addNew=ha?d.metaKey:d.ctrlKey),null==f.moveOnDrag&&
-(f.moveOnDrag=!(ha?d.altKey:d.ctrlKey)),f);var g=a.doc.sel;a.options.dragDrop&&Xg&&!a.isReadOnly()&&"single"==c&&-1<(e=g.contains(b))&&(0>x((e=g.ranges[e]).from(),b)||0<b.xRel)&&(0<x(e.to(),b)||0>b.xRel)?Yg(a,d,b,f):Zg(a,d,b,f)}function Yg(a,b,c,d){var e=a.display,f=!1,g=L(a,function(b){R&&(e.scroller.draggable=!1);a.state.draggingText=!1;aa(document,"mouseup",g);aa(document,"mousemove",h);aa(e.scroller,"dragstart",k);aa(e.scroller,"drop",g);f||(S(b),d.addNew||Ac(a.doc,c,null,null,d.extend),R||C&&
-9==B?setTimeout(function(){document.body.focus();e.input.focus()},20):e.input.focus())}),h=function(a){f=f||10<=Math.abs(b.clientX-a.clientX)+Math.abs(b.clientY-a.clientY)},k=function(){return f=!0};R&&(e.scroller.draggable=!0);a.state.draggingText=g;g.copy=!d.moveOnDrag;e.scroller.dragDrop&&e.scroller.dragDrop();t(document,"mouseup",g);t(document,"mousemove",h);t(e.scroller,"dragstart",k);t(e.scroller,"drop",g);Le(a);setTimeout(function(){return e.input.focus()},20)}function Mf(a,b,c){if("char"==
-c)return new A(b,b);if("word"==c)return a.findWordAt(b);if("line"==c)return new A(m(b.line,0),v(a.doc,m(b.line+1,0)));a=c(a,b);return new A(a.from,a.to)}function Zg(a,b,c,d){function e(b){if(0!=x(u,b))if(u=b,"rectangle"==d.unit){for(var e=[],f=a.options.tabSize,g=ea(w(k,c.line).text,c.ch,f),h=ea(w(k,b.line).text,b.ch,f),p=Math.min(g,h),g=Math.max(g,h),h=Math.min(c.line,b.line),O=Math.min(a.lastLine(),Math.max(c.line,b.line));h<=O;h++){var r=w(k,h).text,t=Lc(r,p,f);p==g?e.push(new A(m(h,t),m(h,t))):
-r.length>t&&e.push(new A(m(h,t),m(h,Lc(r,g,f))))}e.length||e.push(new A(c,c));Q(k,ka(q.ranges.slice(0,n).concat(e),n),{origin:"*mouse",scroll:!1});a.scrollIntoView(b)}else f=l,p=Mf(a,b,d.unit),b=f.anchor,0<x(p.anchor,b)?(e=p.head,b=ic(f.from(),p.anchor)):(e=p.anchor,b=hc(f.to(),p.head)),f=q.ranges.slice(0),f[n]=new A(v(k,b),e),Q(k,ka(f,n),Ld)}function f(b){var c=++r,g=Qa(a,b,!0,"rectangle"==d.unit);if(g)if(0!=x(g,u)){a.curOp.focus=qa();e(g);var l=td(h,k);(g.line>=l.to||g.line<l.from)&&setTimeout(L(a,
-function(){r==c&&f(b)}),150)}else{var n=b.clientY<O.top?-20:b.clientY>O.bottom?20:0;n&&setTimeout(L(a,function(){r==c&&(h.scroller.scrollTop+=n,f(b))}),50)}}function g(b){a.state.selectingText=!1;r=1/0;S(b);h.input.focus();aa(document,"mousemove",J);aa(document,"mouseup",y);k.history.lastSelOrigin=null}var h=a.display,k=a.doc;S(b);var l,n,q=k.sel,p=q.ranges;(d.addNew&&!d.extend?(n=k.sel.contains(c),l=-1<n?p[n]:new A(c,c)):(l=k.sel.primary(),n=k.sel.primIndex),"rectangle"==d.unit)?(d.addNew||(l=new A(c,
-c)),c=Qa(a,b,!0,!0),n=-1):(b=Mf(a,c,d.unit),l=d.extend?Ed(l,b.anchor,b.head,d.extend):b);d.addNew?-1==n?(n=p.length,Q(k,ka(p.concat([l]),n),{scroll:!1,origin:"*mouse"})):1<p.length&&p[n].empty()&&"char"==d.unit&&!d.extend?(Q(k,ka(p.slice(0,n).concat(p.slice(n+1)),0),{scroll:!1,origin:"*mouse"}),q=k.sel):Fd(k,n,l,Ld):(n=0,Q(k,new ca([l],0),Ld),q=k.sel);var u=c,O=h.wrapper.getBoundingClientRect(),r=0,J=L(a,function(a){fe(a)?f(a):g(a)}),y=L(a,g);a.state.selectingText=y;t(document,"mousemove",J);t(document,
-"mouseup",y)}function Jd(a,b,c,d){var e,f;try{e=b.clientX,f=b.clientY}catch(g){return!1}if(e>=Math.floor(a.display.gutters.getBoundingClientRect().right))return!1;d&&S(b);d=a.display;var h=d.lineDiv.getBoundingClientRect();if(f>h.bottom||!fa(a,c))return ad(b);f-=h.top-d.viewOffset;for(h=0;h<a.options.gutters.length;++h){var k=d.gutters.childNodes[h];if(k&&k.getBoundingClientRect().right>=e)return F(a,c,a,Ha(a.doc,f),a.options.gutters[h],b),ad(b)}}function Lf(a,b){var c;(c=ta(a.display,b))||(c=!!fa(a,
-"gutterContextMenu")&&Jd(a,b,"gutterContextMenu",!1));c||K(a,b,"contextmenu")||a.display.input.onContextMenu(b)}function Nf(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-");Bb(a)}function Ub(a){We(a);V(a);Ne(a)}function $g(a,b,c){!b!=!(c&&c!=pb)&&(c=a.display.dragFunctions,b=b?t:aa,b(a.display.scroller,"dragstart",c.start),b(a.display.scroller,"dragenter",c.enter),b(a.display.scroller,"dragover",c.over),b(a.display.scroller,
-"dragleave",c.leave),b(a.display.scroller,"drop",c.drop))}function ah(a){a.options.lineWrapping?(Ea(a.display.wrapper,"CodeMirror-wrap"),a.display.sizer.style.minWidth="",a.display.sizerWidth=null):(Ra(a.display.wrapper,"CodeMirror-wrap"),Wc(a));qd(a);V(a);Bb(a);setTimeout(function(){return gb(a)},100)}function E(a,b){var c=this;if(!(this instanceof E))return new E(a,b);this.options=b=b?Fa(b):{};Fa(Of,b,!1);zd(b);var d=b.value;"string"==typeof d&&(d=new W(d,b.mode,null,b.lineSeparator,b.direction));
-this.doc=d;var e=new E.inputStyles[b.inputStyle](this),e=this.display=new eg(a,d,e);e.wrapper.CodeMirror=this;We(this);Nf(this);b.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap");Se(this);this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new Wa,keySeq:null,specialChars:null};b.autofocus&&!rb&&e.input.focus();C&&11>B&&setTimeout(function(){return c.display.input.reset(!0)},
-20);bh(this);Pf||(Kg(),Pf=!0);Ta(this);this.curOp.forceUpdate=!0;bf(this,d);b.autofocus&&!rb||this.hasFocus()?setTimeout(Kc(sd,this),20):Db(this);for(var f in Gc)Gc.hasOwnProperty(f)&&Gc[f](c,b[f],pb);Oe(this);b.finishInit&&b.finishInit(this);for(d=0;d<Md.length;++d)Md[d](c);Ua(this);R&&b.lineWrapping&&"optimizelegibility"==getComputedStyle(e.lineDiv).textRendering&&(e.lineDiv.style.textRendering="auto")}function bh(a){function b(){d.activeTouch&&(e=setTimeout(function(){return d.activeTouch=null},
-1E3),f=d.activeTouch,f.end=+new Date)}function c(a,b){if(null==b.left)return!0;var c=b.left-a.left,d=b.top-a.top;return 400<c*c+d*d}var d=a.display;t(d.scroller,"mousedown",L(a,Kf));C&&11>B?t(d.scroller,"dblclick",L(a,function(b){if(!K(a,b)){var c=Qa(a,b);!c||Jd(a,b,"gutterClick",!0)||ta(a.display,b)||(S(b),b=a.findWordAt(c),Ac(a.doc,b.anchor,b.head))}})):t(d.scroller,"dblclick",function(b){return K(a,b)||S(b)});Kd||t(d.scroller,"contextmenu",function(b){return Lf(a,b)});var e,f={end:0};t(d.scroller,
-"touchstart",function(b){var c;if(c=!K(a,b))1!=b.touches.length?c=!1:(c=b.touches[0],c=1>=c.radiusX&&1>=c.radiusY),c=!c;c&&(d.input.ensurePolled(),clearTimeout(e),c=+new Date,d.activeTouch={start:c,moved:!1,prev:300>=c-f.end?f:null},1==b.touches.length&&(d.activeTouch.left=b.touches[0].pageX,d.activeTouch.top=b.touches[0].pageY))});t(d.scroller,"touchmove",function(){d.activeTouch&&(d.activeTouch.moved=!0)});t(d.scroller,"touchend",function(e){var f=d.activeTouch;if(f&&!ta(d,e)&&null!=f.left&&!f.moved&&
-300>new Date-f.start){var g=a.coordsChar(d.activeTouch,"page"),f=!f.prev||c(f,f.prev)?new A(g,g):!f.prev.prev||c(f,f.prev.prev)?a.findWordAt(g):new A(m(g.line,0),v(a.doc,m(g.line+1,0)));a.setSelection(f.anchor,f.head);a.focus();S(e)}b()});t(d.scroller,"touchcancel",b);t(d.scroller,"scroll",function(){d.scroller.clientHeight&&(Fb(a,d.scroller.scrollTop),Sa(a,d.scroller.scrollLeft,!0),F(a,"scroll",a))});t(d.scroller,"mousewheel",function(b){return Ye(a,b)});t(d.scroller,"DOMMouseScroll",function(b){return Ye(a,
-b)});t(d.wrapper,"scroll",function(){return d.wrapper.scrollTop=d.wrapper.scrollLeft=0});d.dragFunctions={enter:function(b){K(a,b)||vb(b)},over:function(b){if(!K(a,b)){var c=Qa(a,b);if(c){var d=document.createDocumentFragment();Je(a,c,d);a.display.dragCursor||(a.display.dragCursor=r("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),a.display.lineSpace.insertBefore(a.display.dragCursor,a.display.cursorDiv));Z(a.display.dragCursor,d)}vb(b)}},start:function(b){if(C&&(!a.state.draggingText||100>
-+new Date-yf))b=void vb(b);else{if(!K(a,b)&&!ta(a.display,b)&&(b.dataTransfer.setData("Text",a.getSelection()),b.dataTransfer.effectAllowed="copyMove",b.dataTransfer.setDragImage&&!Qf)){var c=r("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw\x3d\x3d";ja&&(c.width=c.height=1,a.display.wrapper.appendChild(c),c._top=c.offsetTop);b.dataTransfer.setDragImage(c,0,0);ja&&c.parentNode.removeChild(c)}b=void 0}return b},drop:L(a,
-Jg),leave:function(b){K(a,b)||xf(a)}};var g=d.input.getField();t(g,"keyup",function(b){return If.call(a,b)});t(g,"keydown",L(a,Hf));t(g,"keypress",L(a,Jf));t(g,"focus",function(b){return sd(a,b)});t(g,"blur",function(b){return Db(a,b)})}function Vb(a,b,c,d){var e,f=a.doc;null==c&&(c="add");"smart"==c&&(f.mode.indent?e=wb(a,b).state:c="prev");var g=a.options.tabSize,h=w(f,b),k=ea(h.text,null,g);h.stateAfter&&(h.stateAfter=null);var l,n=h.text.match(/^\s*/)[0];if(d||/\S/.test(h.text)){if("smart"==c&&
-((l=f.mode.indent(e,h.text.slice(n.length),h.text))==Fc||150<l)){if(!d)return;c="prev"}}else l=0,c="not";"prev"==c?l=b>f.first?ea(w(f,b-1).text,null,g):0:"add"==c?l=k+a.options.indentUnit:"subtract"==c?l=k-a.options.indentUnit:"number"==typeof c&&(l=k+c);l=Math.max(0,l);c="";d=0;if(a.options.indentWithTabs)for(a=Math.floor(l/g);a;--a)d+=g,c+="\t";if(d<l&&(c+=Mc(l-d)),c!=n)return lb(f,c,m(b,0),m(b,n.length),"+input"),h.stateAfter=null,!0;for(g=0;g<f.sel.ranges.length;g++)if(h=f.sel.ranges[g],h.head.line==
-b&&h.head.ch<n.length){b=m(b,n.length);Fd(f,g,new A(b,b));break}}function Rf(a){da=a}function Nd(a,b,c,d,e){var f=a.doc;a.display.shift=!1;d||(d=f.sel);var g=a.state.pasteIncoming||"paste"==e,h=Od(b),k=null;if(g&&1<d.ranges.length)if(da&&da.text.join("\n")==b){if(0==d.ranges.length%da.text.length)for(var k=[],l=0;l<da.text.length;l++)k.push(f.splitLines(da.text[l]))}else h.length==d.ranges.length&&a.options.pasteLinesPerSelection&&(k=ec(h,function(a){return[a]}));for(var n,l=d.ranges.length-1;0<=
-l;l--){n=d.ranges[l];var q=n.from(),p=n.to();n.empty()&&(c&&0<c?q=m(q.line,q.ch-c):a.state.overwrite&&!g?p=m(p.line,Math.min(w(f,p.line).text.length,p.ch+z(h).length)):da&&da.lineWise&&da.text.join("\n")==b&&(q=p=m(q.line,0)));n=a.curOp.updateInput;q={from:q,to:p,text:k?k[l%k.length]:h,origin:e||(g?"paste":a.state.cutIncoming?"cut":"+input")};kb(a.doc,q);P(a,"inputRead",a,q)}b&&!g&&Sf(a,b);fb(a);a.curOp.updateInput=n;a.curOp.typing=!0;a.state.pasteIncoming=a.state.cutIncoming=!1}function Tf(a,b){var c=
-a.clipboardData&&a.clipboardData.getData("Text");if(c)return a.preventDefault(),b.isReadOnly()||b.options.disableInput||Y(b,function(){return Nd(b,c,0,null,"paste")}),!0}function Sf(a,b){if(a.options.electricChars&&a.options.smartIndent)for(var c=a.doc.sel,d=c.ranges.length-1;0<=d;d--){var e=c.ranges[d];if(!(100<e.head.ch||d&&c.ranges[d-1].head.line==e.head.line)){var f=a.getModeAt(e.head),g=!1;if(f.electricChars)for(var h=0;h<f.electricChars.length;h++){if(-1<b.indexOf(f.electricChars.charAt(h))){g=
-Vb(a,e.head.line,"smart");break}}else f.electricInput&&f.electricInput.test(w(a.doc,e.head.line).text.slice(0,e.head.ch))&&(g=Vb(a,e.head.line,"smart"));g&&P(a,"electricInput",a,e.head.line)}}}function Uf(a){for(var b=[],c=[],d=0;d<a.doc.sel.ranges.length;d++){var e=a.doc.sel.ranges[d].head.line,e={anchor:m(e,0),head:m(e+1,0)};c.push(e);b.push(a.getRange(e.anchor,e.head))}return{text:b,ranges:c}}function Vf(a,b){a.setAttribute("autocorrect","off");a.setAttribute("autocapitalize","off");a.setAttribute("spellcheck",
-!!b)}function Wf(){var a=r("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),b=r("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return R?a.style.width="1000px":a.setAttribute("wrap","off"),Wb&&(a.style.border="1px solid black"),Vf(a),b}function Pd(a,b,c,d,e){function f(d){var f;if(null==(f=e?be(a.cm,k,b,c):Zc(k,b,c))){d||(d=b.line+c,d=!(!(d<a.first||d>=a.first+a.size)&&(b=new m(d,b.ch,b.sticky),k=w(a,d))));
-if(d)return!1;b=$c(e,a.cm,k,b.line,c)}else b=f;return!0}var g=b,h=c,k=w(a,b.line);if("char"==d)f();else if("column"==d)f(!0);else if("word"==d||"group"==d){var l=null;d="group"==d;for(var n=a.cm&&a.cm.getHelper(b,"wordChars"),q=!0;!(0>c)||f(!q);q=!1){var p=k.text.charAt(b.ch)||"\n",p=fc(p,n)?"w":d&&"\n"==p?"n":!d||/\s/.test(p)?null:"p";if(!d||q||p||(p="s"),l&&l!=p){0>c&&(c=1,f(),b.sticky="after");break}if(p&&(l=p),0<c&&!f(!q))break}}h=Gd(a,b,g,h,!0);return Rc(g,h)&&(h.hitSide=!0),h}function Xf(a,
-b,c,d){var e,f=a.doc,g=b.left;"page"==d?(d=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),d=Math.max(d-.5*Oa(a.display),3),e=(0<c?b.bottom:b.top)+c*d):"line"==d&&(e=0<c?b.bottom+3:b.top-3);for(var h;h=od(a,g,e),h.outside;){if(0>c?0>=e:e>=f.height){h.hitSide=!0;break}e+=5*c}return h}function Yf(a,b){var c=ld(a,b.line);if(!c||c.hidden)return null;var d=w(a.doc,b.line),c=ye(c,d,b.line),d=ya(d,a.doc.direction),e="left";d&&(e=Xc(d,b.ch)%2?"right":"left");
-c=ze(c.map,b.ch,e);return c.offset="right"==c.collapse?c.end:c.start,c}function ch(a){for(;a;a=a.parentNode)if(/CodeMirror-gutter-wrapper/.test(a.className))return!0;return!1}function qb(a,b){return b&&(a.bad=!0),a}function dh(a,b,c,d,e){function f(a){return function(b){return b.id==a}}function g(){l&&(k+=n,l=!1)}function h(b){if(1==b.nodeType){var c=b.getAttribute("cm-text");if(null!=c)(b=c||b.textContent.replace(/\u200b/g,""))&&(g(),k+=b);else{var u;if(c=b.getAttribute("cm-marker"))b=a.findMarks(m(d,
-0),m(e+1,0),f(+c)),b.length&&(u=b[0].find())&&(b=Ga(a.doc,u.from,u.to).join(n))&&(g(),k+=b);else if("false"!=b.getAttribute("contenteditable")){(u=/^(pre|div|p)$/i.test(b.nodeName))&&g();for(c=0;c<b.childNodes.length;c++)h(b.childNodes[c]);u&&(l=!0)}}}else 3==b.nodeType&&(b=b.nodeValue)&&(g(),k+=b)}for(var k="",l=!1,n=a.doc.lineSeparator();h(b),b!=c;)b=b.nextSibling;return k}function Hc(a,b,c){var d;if(b==a.display.lineDiv){if(!(d=a.display.lineDiv.childNodes[c]))return qb(a.clipPos(m(a.display.viewTo-
-1)),!0);b=null;c=0}else for(d=b;;d=d.parentNode){if(!d||d==a.display.lineDiv)return null;if(d.parentNode&&d.parentNode==a.display.lineDiv)break}for(var e=0;e<a.display.view.length;e++){var f=a.display.view[e];if(f.node==d)return eh(f,b,c)}}function eh(a,b,c){function d(b,c,d){for(var e=-1;e<(l?l.length:0);e++)for(var f=0>e?k.map:l[e],g=0;g<f.length;g+=3){var h=f[g+2];if(h==b||h==c)return c=D(0>e?a.line:a.rest[e]),e=f[g]+d,(0>d||h!=b)&&(e=f[g+(d?1:0)]),m(c,e)}}var e=a.text.firstChild,f=!1;if(!b||!va(e,
-b))return qb(m(D(a.line),0),!0);if(b==e&&(f=!0,b=e.childNodes[c],c=0,!b))return c=a.rest?z(a.rest):a.line,qb(m(D(c),c.text.length),f);var g=3==b.nodeType?b:null,h=b;for(g||1!=b.childNodes.length||3!=b.firstChild.nodeType||(g=b.firstChild,c&&(c=g.nodeValue.length));h.parentNode!=e;)h=h.parentNode;var k=a.measure,l=k.maps;if(b=d(g,h,c))return qb(b,f);e=h.nextSibling;for(g=g?g.nodeValue.length-c:0;e;e=e.nextSibling){if(b=d(e,e.firstChild,0))return qb(m(b.line,b.ch-g),f);g+=e.textContent.length}for(h=
-h.previousSibling;h;h=h.previousSibling){if(b=d(h,h.firstChild,-1))return qb(m(b.line,b.ch+c),f);c+=h.textContent.length}}var U=navigator.userAgent,Zf=navigator.platform,wa=/gecko\/\d/i.test(U),$f=/MSIE \d/.test(U),ag=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(U),Xb=/Edge\/(\d+)/.exec(U),C=$f||ag||Xb,B=C&&($f?document.documentMode||6:+(Xb||ag)[1]),R=!Xb&&/WebKit\//.test(U),fh=R&&/Qt\/\d+\.\d+/.test(U),pc=!Xb&&/Chrome\//.test(U),ja=/Opera\//.test(U),Qf=/Apple Computer/.test(navigator.vendor),gh=
-/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(U),yg=/PhantomJS/.test(U),Wb=!Xb&&/AppleWebKit/.test(U)&&/Mobile\/\w+/.test(U),qc=/Android/.test(U),rb=Wb||qc||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(U),ha=Wb||/Mac/.test(Zf),Wg=/\bCrOS\b/.test(U),hh=/win/i.test(Zf),Xa=ja&&U.match(/Version\/(\d*\.\d*)/);Xa&&(Xa=Number(Xa[1]));Xa&&15<=Xa&&(ja=!1,R=!0);var db,Cf=ha&&(fh||ja&&(null==Xa||12.11>Xa)),Kd=wa||C&&9<=B,Ra=function(a,b){var c=a.className,d=ga(b).exec(c);if(d){var e=c.slice(d.index+d[0].length);
-a.className=c.slice(0,d.index)+(e?d[1]+e:"")}};db=document.createRange?function(a,b,c,d){var e=document.createRange();return e.setEnd(d||a,c),e.setStart(a,b),e}:function(a,b,c){var d=document.body.createTextRange();try{d.moveToElementText(a.parentNode)}catch(e){return d}return d.collapse(!0),d.moveEnd("character",c),d.moveStart("character",b),d};var Yb=function(a){a.select()};Wb?Yb=function(a){a.selectionStart=0;a.selectionEnd=a.value.length}:C&&(Yb=function(a){try{a.select()}catch(b){}});var Wa=
-function(){this.id=null};Wa.prototype.set=function(a,b){clearTimeout(this.id);this.id=setTimeout(b,a)};var bd,hd,Ud=30,Fc={toString:function(){return"CodeMirror.Pass"}},pa={scroll:!1},Ld={origin:"*mouse"},Zb={origin:"+move"},dc=[""],cg=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,dg=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/,
-qf=!1,xa=!1,ub=null,hg=function(){function a(a){return 247>=a?c.charAt(a):1424<=a&&1524>=a?"R":1536<=a&&1785>=a?d.charAt(a-1536):1774<=a&&2220>=a?"r":8192<=a&&8203>=a?"w":8204==a?"b":"L"}function b(a,b,c){this.level=a;this.from=b;this.to=c}var c="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",d="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111",
-e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,f=/[stwN]/,g=/[LRr]/,h=/[Lb1n]/,k=/[1n]/;return function(c,d){var q="ltr"==d?"L":"R";if(0==c.length||"ltr"==d&&!e.test(c))return!1;for(var p=c.length,u=[],m=0;m<p;++m)u.push(a(c.charCodeAt(m)));for(var m=0,r=q;m<p;++m){var t=u[m];"m"==t?u[m]=r:r=t}m=0;for(r=q;m<p;++m)t=u[m],"1"==t&&"r"==r?u[m]="n":g.test(t)&&(r=t,"r"==t&&(u[m]="R"));m=1;for(r=u[0];m<p-1;++m)t=u[m],"+"==t&&"1"==r&&"1"==u[m+1]?u[m]="1":","!=t||r!=u[m+1]||"1"!=r&&"n"!=r||(u[m]=r),r=t;for(m=
-0;m<p;++m)if(r=u[m],","==r)u[m]="N";else if("%"==r){r=void 0;for(r=m+1;r<p&&"%"==u[r];++r);for(t=m&&"!"==u[m-1]||r<p&&"1"==u[r]?"1":"N";m<r;++m)u[m]=t;m=r-1}m=0;for(r=q;m<p;++m)t=u[m],"L"==r&&"1"==t?u[m]="L":g.test(t)&&(r=t);for(r=0;r<p;++r)if(f.test(u[r])){m=void 0;for(m=r+1;m<p&&f.test(u[m]);++m);t="L"==(r?u[r-1]:q);for(t=t==("L"==(m<p?u[m]:q))?t?"L":"R":q;r<m;++r)u[r]=t;r=m-1}for(var v,q=[],m=0;m<p;)if(h.test(u[m])){r=m;for(++m;m<p&&h.test(u[m]);++m);q.push(new b(0,r,m))}else{var w=m,r=q.length;
-for(++m;m<p&&"L"!=u[m];++m);for(t=w;t<m;)if(k.test(u[t])){w<t&&q.splice(r,0,new b(1,w,t));w=t;for(++t;t<m&&k.test(u[t]);++t);q.splice(r,0,new b(2,w,t));w=t}else++t;w<m&&q.splice(r,0,new b(1,w,m))}return 1==q[0].level&&(v=c.match(/^\s+/))&&(q[0].from=v[0].length,q.unshift(new b(0,0,v[0].length))),1==z(q).level&&(v=c.match(/\s+$/))&&(z(q).to-=v[0].length,q.push(new b(0,p-v[0].length,p))),"rtl"==d?q.reverse():q}}(),lc=[],t=function(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+
-b,c):(a=a._handlers||(a._handlers={}),a[b]=(a[b]||lc).concat(c))},Xg=function(){if(C&&9>B)return!1;var a=r("div");return"draggable"in a||"dragDrop"in a}(),Od=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;b<=d;){var e=a.indexOf("\n",b);-1==e&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");-1!=g?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)},ih=window.getSelection?function(a){try{return a.selectionStart!=
-a.selectionEnd}catch(b){return!1}}:function(a){var b;try{b=a.ownerDocument.selection.createRange()}catch(c){}return!(!b||b.parentElement()!=a)&&0!=b.compareEndPoints("StartToEnd",b)},Rg=function(){var a=r("div");return"oncopy"in a||(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)}(),nd=null,cd={},bb={},cb={},H=function(a,b,c){this.pos=this.start=0;this.string=a;this.tabSize=b||8;this.lineStart=this.lastColumnPos=this.lastColumnValue=0;this.lineOracle=c};H.prototype.eol=function(){return this.pos>=
-this.string.length};H.prototype.sol=function(){return this.pos==this.lineStart};H.prototype.peek=function(){return this.string.charAt(this.pos)||void 0};H.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)};H.prototype.eat=function(a){var b=this.string.charAt(this.pos);if("string"==typeof a?b==a:b&&(a.test?a.test(b):a(b)))return++this.pos,b};H.prototype.eatWhile=function(a){for(var b=this.pos;this.eat(a););return this.pos>b};H.prototype.eatSpace=function(){for(var a=
-this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a};H.prototype.skipToEnd=function(){this.pos=this.string.length};H.prototype.skipTo=function(a){a=this.string.indexOf(a,this.pos);if(-1<a)return this.pos=a,!0};H.prototype.backUp=function(a){this.pos-=a};H.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=ea(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-
-(this.lineStart?ea(this.string,this.lineStart,this.tabSize):0)};H.prototype.indentation=function(){return ea(this.string,null,this.tabSize)-(this.lineStart?ea(this.string,this.lineStart,this.tabSize):0)};H.prototype.match=function(a,b,c){if("string"!=typeof a)return(a=this.string.slice(this.pos).match(a))&&0<a.index?null:(a&&!1!==b&&(this.pos+=a[0].length),a);var d=function(a){return c?a.toLowerCase():a};if(d(this.string.substr(this.pos,a.length))==d(a))return!1!==b&&(this.pos+=a.length),!0};H.prototype.current=
-function(){return this.string.slice(this.start,this.pos)};H.prototype.hideFirstChars=function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}};H.prototype.lookAhead=function(a){var b=this.lineOracle;return b&&b.lookAhead(a)};var nc=function(a,b){this.state=a;this.lookAhead=b},sa=function(a,b,c,d){this.state=b;this.doc=a;this.line=c;this.maxLookAhead=d||0};sa.prototype.lookAhead=function(a){var b=this.doc.getLine(this.line+a);return null!=b&&a>this.maxLookAhead&&(this.maxLookAhead=
-a),b};sa.prototype.nextLine=function(){this.line++;0<this.maxLookAhead&&this.maxLookAhead--};sa.fromSaved=function(a,b,c){return b instanceof nc?new sa(a,La(a.mode,b.state),c,b.lookAhead):new sa(a,La(a.mode,b),c)};sa.prototype.save=function(a){a=!1!==a?La(this.doc.mode,this.state):this.state;return 0<this.maxLookAhead?new nc(a,this.maxLookAhead):a};var me=function(a,b,c){this.start=a.start;this.end=a.pos;this.string=a.current();this.type=b||null;this.state=c},hb=function(a,b,c){this.text=a;Yd(this,
-b);this.height=c?c(this):1};hb.prototype.lineNo=function(){return D(this)};ab(hb);var Pa,og={},ng={},eb=null,xb=null,Ae={left:0,right:0,top:0,bottom:0},Ya=function(a,b,c){this.cm=c;var d=this.vert=r("div",[r("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),e=this.horiz=r("div",[r("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");a(d);a(e);t(d,"scroll",function(){d.clientHeight&&b(d.scrollTop,"vertical")});t(e,"scroll",function(){e.clientWidth&&b(e.scrollLeft,"horizontal")});
-this.checkedZeroWidth=!1;C&&8>B&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Ya.prototype.update=function(a){var b=a.scrollWidth>a.clientWidth+1,c=a.scrollHeight>a.clientHeight+1,d=a.nativeBarWidth;c?(this.vert.style.display="block",this.vert.style.bottom=b?d+"px":"0",this.vert.firstChild.style.height=Math.max(0,a.scrollHeight-a.clientHeight+(a.viewHeight-(b?d:0)))+"px"):(this.vert.style.display="",this.vert.firstChild.style.height="0");b?(this.horiz.style.display="block",this.horiz.style.right=
-c?d+"px":"0",this.horiz.style.left=a.barLeft+"px",this.horiz.firstChild.style.width=Math.max(0,a.scrollWidth-a.clientWidth+(a.viewWidth-a.barLeft-(c?d:0)))+"px"):(this.horiz.style.display="",this.horiz.firstChild.style.width="0");return!this.checkedZeroWidth&&0<a.clientHeight&&(0==d&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:c?d:0,bottom:b?d:0}};Ya.prototype.setScrollLeft=function(a){this.horiz.scrollLeft!=a&&(this.horiz.scrollLeft=a);this.disableHoriz&&this.enableZeroWidthBar(this.horiz,
-this.disableHoriz,"horiz")};Ya.prototype.setScrollTop=function(a){this.vert.scrollTop!=a&&(this.vert.scrollTop=a);this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")};Ya.prototype.zeroWidthHack=function(){this.horiz.style.height=this.vert.style.width=ha&&!gh?"12px":"18px";this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none";this.disableHoriz=new Wa;this.disableVert=new Wa};Ya.prototype.enableZeroWidthBar=function(a,b,c){function d(){var e=a.getBoundingClientRect();
-("vert"==c?document.elementFromPoint(e.right-1,(e.top+e.bottom)/2):document.elementFromPoint((e.right+e.left)/2,e.bottom-1))!=a?a.style.pointerEvents="none":b.set(1E3,d)}a.style.pointerEvents="auto";b.set(1E3,d)};Ya.prototype.clear=function(){var a=this.horiz.parentNode;a.removeChild(this.horiz);a.removeChild(this.vert)};var $b=function(){};$b.prototype.update=function(){return{bottom:0,right:0}};$b.prototype.setScrollLeft=function(){};$b.prototype.setScrollTop=function(){};$b.prototype.clear=function(){};
-var Te={"native":Ya,"null":$b},xg=0,vc=function(a,b,c){var d=a.display;this.viewport=b;this.visible=td(d,a.doc,b);this.editorIsHidden=!d.wrapper.offsetWidth;this.wrapperHeight=d.wrapper.clientHeight;this.wrapperWidth=d.wrapper.clientWidth;this.oldDisplayWidth=Ma(a);this.force=c;this.dims=md(a);this.events=[]};vc.prototype.signal=function(a,b){fa(a,b)&&this.events.push(arguments)};vc.prototype.finish=function(){for(var a=0;a<this.events.length;a++)F.apply(null,this.events[a])};var xc=0,ba=null;C?ba=
--.53:wa?ba=15:pc?ba=-.7:Qf&&(ba=-1/3);var ca=function(a,b){this.ranges=a;this.primIndex=b};ca.prototype.primary=function(){return this.ranges[this.primIndex]};ca.prototype.equals=function(a){if(a==this)return!0;if(a.primIndex!=this.primIndex||a.ranges.length!=this.ranges.length)return!1;for(var b=0;b<this.ranges.length;b++){var c=this.ranges[b],d=a.ranges[b];if(!Rc(c.anchor,d.anchor)||!Rc(c.head,d.head))return!1}return!0};ca.prototype.deepCopy=function(){for(var a=[],b=0;b<this.ranges.length;b++)a[b]=
-new A(Sc(this.ranges[b].anchor),Sc(this.ranges[b].head));return new ca(a,this.primIndex)};ca.prototype.somethingSelected=function(){for(var a=0;a<this.ranges.length;a++)if(!this.ranges[a].empty())return!0;return!1};ca.prototype.contains=function(a,b){b||(b=a);for(var c=0;c<this.ranges.length;c++){var d=this.ranges[c];if(0<=x(b,d.from())&&0>=x(a,d.to()))return c}return-1};var A=function(a,b){this.anchor=a;this.head=b};A.prototype.from=function(){return ic(this.anchor,this.head)};A.prototype.to=function(){return hc(this.anchor,
-this.head)};A.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch};Lb.prototype={chunkSize:function(){return this.lines.length},removeInner:function(a,b){for(var c=a,d=a+b;c<d;++c){var e=this.lines[c];this.height-=e.height;var f=e;f.parent=null;Xd(f);P(e,"delete")}this.lines.splice(a,b)},collapse:function(a){a.push.apply(a,this.lines)},insertInner:function(a,b,c){this.height+=c;this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(a=
-0;a<b.length;++a)b[a].parent=this},iterN:function(a,b,c){for(b=a+b;a<b;++a)if(c(this.lines[a]))return!0}};Mb.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){this.size-=b;for(var c=0;c<this.children.length;++c){var d=this.children[c],e=d.chunkSize();if(a<e){var f=Math.min(b,e-a),g=d.height;if(d.removeInner(a,f),this.height-=g-d.height,e==f&&(this.children.splice(c--,1),d.parent=null),0==(b-=f))break;a=0}else a-=e}25>this.size-b&&(1<this.children.length||!(this.children[0]instanceof
-Lb))&&(c=[],this.collapse(c),this.children=[new Lb(c)],this.children[0].parent=this)},collapse:function(a){for(var b=0;b<this.children.length;++b)this.children[b].collapse(a)},insertInner:function(a,b,c){this.size+=b.length;this.height+=c;for(var d=0;d<this.children.length;++d){var e=this.children[d],f=e.chunkSize();if(a<=f){if(e.insertInner(a,b,c),e.lines&&50<e.lines.length){for(b=a=e.lines.length%25+25;b<e.lines.length;)c=new Lb(e.lines.slice(b,b+=25)),e.height-=c.height,this.children.splice(++d,
-0,c),c.parent=this;e.lines=e.lines.slice(0,a);this.maybeSpill()}break}a-=f}},maybeSpill:function(){if(!(10>=this.children.length)){var a=this;do{var b=a.children.splice(a.children.length-5,5),b=new Mb(b);if(a.parent){a.size-=b.size;a.height-=b.height;var c=N(a.parent.children,a);a.parent.children.splice(c+1,0,b)}else c=new Mb(a.children),c.parent=a,a.children=[c,b],a=c;b.parent=a.parent}while(10<a.children.length);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=0;d<this.children.length;++d){var e=
-this.children[d],f=e.chunkSize();if(a<f){f=Math.min(b,f-a);if(e.iterN(a,f,c))return!0;if(0==(b-=f))break;a=0}else a-=f}}};var Nb=function(a,b,c){if(c)for(var d in c)c.hasOwnProperty(d)&&(this[d]=c[d]);this.doc=a;this.node=b};Nb.prototype.clear=function(){var a=this.doc.cm,b=this.line.widgets,c=this.line,d=D(c);if(null!=d&&b){for(var e=0;e<b.length;++e)b[e]==this&&b.splice(e--,1);b.length||(c.widgets=null);var f=zb(this);la(c,Math.max(0,c.height-f));a&&(Y(a,function(){var b=-f;na(c)<(a.curOp&&a.curOp.scrollTop||
-a.doc.scrollTop)&&tc(a,b);Aa(a,d,"widget")}),P(a,"lineWidgetCleared",a,this,d))}};Nb.prototype.changed=function(){var a=this,b=this.height,c=this.doc.cm,d=this.line;this.height=null;var e=zb(this)-b;e&&(la(d,d.height+e),c&&Y(c,function(){c.curOp.forceUpdate=!0;na(d)<(c.curOp&&c.curOp.scrollTop||c.doc.scrollTop)&&tc(c,e);P(c,"lineWidgetChanged",c,a,D(d))}))};ab(Nb);var vf=0,Ca=function(a,b){this.lines=[];this.type=b;this.doc=a;this.id=++vf};Ca.prototype.clear=function(){if(!this.explicitlyCleared){var a=
-this.doc.cm,b=a&&!a.curOp;if(b&&Ta(a),fa(this,"clear")){var c=this.find();c&&P(this,"clear",c.from,c.to)}for(var d=c=null,e=0;e<this.lines.length;++e){var f=this.lines[e],g=tb(f.markedSpans,this);a&&!this.collapsed?Aa(a,D(f),"text"):a&&(null!=g.to&&(d=D(f)),null!=g.from&&(c=D(f)));for(var h=f,k=f.markedSpans,l=g,n=void 0,m=0;m<k.length;++m)k[m]!=l&&(n||(n=[])).push(k[m]);h.markedSpans=n;null==g.from&&this.collapsed&&!Ja(this.doc,f)&&a&&la(f,Oa(a.display))}if(a&&this.collapsed&&!a.options.lineWrapping)for(e=
-0;e<this.lines.length;++e)f=ma(this.lines[e]),g=kc(f),g>a.display.maxLineLength&&(a.display.maxLine=f,a.display.maxLineLength=g,a.display.maxLineChanged=!0);null!=c&&a&&this.collapsed&&V(a,c,d+1);this.lines.length=0;this.explicitlyCleared=!0;this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,a&&mf(a.doc));a&&P(a,"markerCleared",a,this,c,d);b&&Ua(a);this.parent&&this.parent.clear()}};Ca.prototype.find=function(a,b){null==a&&"bookmark"==this.type&&(a=1);for(var c,d,e=0;e<this.lines.length;++e){var f=
-this.lines[e],g=tb(f.markedSpans,this);if(null!=g.from&&(c=m(b?f:D(f),g.from),-1==a))return c;if(null!=g.to&&(d=m(b?f:D(f),g.to),1==a))return d}return c&&{from:c,to:d}};Ca.prototype.changed=function(){var a=this,b=this.find(-1,!0),c=this,d=this.doc.cm;b&&d&&Y(d,function(){var e=b.line,f=D(b.line),f=ld(d,f);(f&&(Be(f),d.curOp.selectionChanged=d.curOp.forceUpdate=!0),d.curOp.updateMaxLine=!0,Ja(c.doc,e)||null==c.height)||(f=c.height,c.height=null,(f=zb(c)-f)&&la(e,e.height+f));P(d,"markerChanged",d,
-a)})};Ca.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&-1!=N(b.maybeHiddenMarkers,this)||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)};Ca.prototype.detachLine=function(a){if(this.lines.splice(N(this.lines,a),1),!this.lines.length&&this.doc.cm)a=this.doc.cm.curOp,(a.maybeHiddenMarkers||(a.maybeHiddenMarkers=[])).push(this)};ab(Ca);var Ob=function(a,b){this.markers=a;this.primary=b;for(var c=
-0;c<a.length;++c)a[c].parent=this};Ob.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var a=0;a<this.markers.length;++a)this.markers[a].clear();P(this,"clear")}};Ob.prototype.find=function(a,b){return this.primary.find(a,b)};ab(Ob);var jh=0,W=function(a,b,c,d,e){if(!(this instanceof W))return new W(a,b,c,d,e);null==c&&(c=0);Mb.call(this,[new Lb([new hb("",null)])]);this.first=c;this.scrollTop=this.scrollLeft=0;this.cantEdit=!1;this.cleanGeneration=1;this.modeFrontier=
-this.highlightFrontier=c;c=m(c,0);this.sel=ua(c);this.history=new yc(null);this.id=++jh;this.modeOption=b;this.lineSep=d;this.direction="rtl"==e?"rtl":"ltr";this.extend=!1;"string"==typeof a&&(a=this.splitLines(a));Cd(this,{from:c,to:c,text:a});Q(this,ua(c),pa)};W.prototype=Rd(Mb.prototype,{constructor:W,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0;d<b.length;++d)c+=b[d].height;this.insertInner(a-this.first,
-b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=Pc(this,this.first,this.first+this.size);return!1===a?b:b.join(a||this.lineSeparator())},setValue:M(function(a){var b=m(this.first,0),c=this.first+this.size-1;kb(this,{from:b,to:m(c,w(this,c).text.length),text:this.splitLines(a),origin:"setValue",full:!0},!0);this.cm&&Eb(this.cm,0,0);Q(this,ua(b),pa)}),replaceRange:function(a,b,c,d){b=v(this,b);c=c?v(this,c):b;lb(this,a,b,c,d)},getRange:function(a,b,c){a=Ga(this,
-v(this,a),v(this,b));return!1===c?a:a.join(c||this.lineSeparator())},getLine:function(a){return(a=this.getLineHandle(a))&&a.text},getLineHandle:function(a){if(sb(this,a))return w(this,a)},getLineNumber:function(a){return D(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=w(this,a)),ma(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return v(this,a)},getCursor:function(a){var b=
-this.sel.primary();return null==a||"head"==a?b.head:"anchor"==a?b.anchor:"end"==a||"to"==a||!1===a?b.to():b.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:M(function(a,b,c){a=v(this,"number"==typeof a?m(a,b||0):a);Q(this,ua(a,null),c)}),setSelection:M(function(a,b,c){var d=v(this,a);a=v(this,b||a);Q(this,ua(d,a),c)}),extendSelection:M(function(a,b,c){Ac(this,v(this,a),b&&v(this,b),c)}),extendSelections:M(function(a,
-b){hf(this,Vd(this,a),b)}),extendSelectionsBy:M(function(a,b){hf(this,Vd(this,ec(this.sel.ranges,a)),b)}),setSelections:M(function(a,b,c){if(a.length){for(var d=[],e=0;e<a.length;e++)d[e]=new A(v(this,a[e].anchor),v(this,a[e].head));null==b&&(b=Math.min(a.length-1,this.sel.primIndex));Q(this,ka(d,b),c)}}),addSelection:M(function(a,b,c){var d=this.sel.ranges.slice(0);d.push(new A(v(this,a),v(this,b||a)));Q(this,ka(d,d.length-1),c)}),getSelection:function(a){for(var b,c=this.sel.ranges,d=0;d<c.length;d++){var e=
-Ga(this,c[d].from(),c[d].to());b=b?b.concat(e):e}return!1===a?b:b.join(a||this.lineSeparator())},getSelections:function(a){for(var b=[],c=this.sel.ranges,d=0;d<c.length;d++){var e=Ga(this,c[d].from(),c[d].to());!1!==a&&(e=e.join(a||this.lineSeparator()));b[d]=e}return b},replaceSelection:function(a,b,c){for(var d=[],e=0;e<this.sel.ranges.length;e++)d[e]=a;this.replaceSelections(d,b,c||"+input")},replaceSelections:M(function(a,b,c){for(var d=[],e=this.sel,f=0;f<e.ranges.length;f++){var g=e.ranges[f];
-d[f]={from:g.from(),to:g.to(),text:this.splitLines(a[f]),origin:c}}if(a=b&&"end"!=b){a=[];e=c=m(this.first,0);for(f=0;f<d.length;f++){var h=d[f],g=$e(h.from,c,e),k=$e(Ba(h),c,e);(c=h.to,e=k,"around"==b)?(h=this.sel.ranges[f],h=0>x(h.head,h.anchor),a[f]=new A(h?k:g,h?g:k)):a[f]=new A(g,g)}a=new ca(a,this.sel.primIndex)}b=a;for(a=d.length-1;0<=a;a--)kb(this,d[a]);b?jf(this,b):this.cm&&fb(this.cm)}),undo:M(function(){Cc(this,"undo")}),redo:M(function(){Cc(this,"redo")}),undoSelection:M(function(){Cc(this,
-"undo",!0)}),redoSelection:M(function(){Cc(this,"redo",!0)}),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){for(var a=this.history,b=0,c=0,d=0;d<a.done.length;d++)a.done[d].ranges||++b;for(d=0;d<a.undone.length;d++)a.undone[d].ranges||++c;return{undo:b,redo:c}},clearHistory:function(){this.history=new yc(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){return a&&
-(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:ib(this.history.done),undone:ib(this.history.undone)}},setHistory:function(a){var b=this.history=new yc(this.history.maxGeneration);b.done=ib(a.done.slice(0),null,!0);b.undone=ib(a.undone.slice(0),null,!0)},setGutterMarker:M(function(a,b,c){return Kb(this,a,"gutter",function(a){var e=a.gutterMarkers||
-(a.gutterMarkers={});return e[b]=c,!c&&Sd(e)&&(a.gutterMarkers=null),!0})}),clearGutter:M(function(a){var b=this;this.iter(function(c){c.gutterMarkers&&c.gutterMarkers[a]&&Kb(b,c,"gutter",function(){return c.gutterMarkers[a]=null,Sd(c.gutterMarkers)&&(c.gutterMarkers=null),!0})})}),lineInfo:function(a){var b;if("number"==typeof a){if(!(sb(this,a)&&(b=a,a=w(this,a))))return null}else if(null==(b=D(a)))return null;return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,
-bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},addLineClass:M(function(a,b,c){return Kb(this,a,"gutter"==b?"gutter":"class",function(a){var e="text"==b?"textClass":"background"==b?"bgClass":"gutter"==b?"gutterClass":"wrapClass";if(a[e]){if(ga(c).test(a[e]))return!1;a[e]+=" "+c}else a[e]=c;return!0})}),removeLineClass:M(function(a,b,c){return Kb(this,a,"gutter"==b?"gutter":"class",function(a){var e="text"==b?"textClass":"background"==b?"bgClass":"gutter"==b?"gutterClass":"wrapClass",f=
-a[e];if(!f)return!1;if(null==c)a[e]=null;else{var g=f.match(ga(c));if(!g)return!1;var h=g.index+g[0].length;a[e]=f.slice(0,g.index)+(g.index&&h!=f.length?" ":"")+f.slice(h)||null}return!0})}),addLineWidget:M(function(a,b,c){return Gg(this,a,b,c)}),removeLineWidget:function(a){a.clear()},markText:function(a,b,c){return mb(this,v(this,a),v(this,b),c,c&&c.type||"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1,shared:b&&
-b.shared,handleMouseEvents:b&&b.handleMouseEvents};return a=v(this,a),mb(this,a,a,c,"bookmark")},findMarksAt:function(a){a=v(this,a);var b=[],c=w(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b,c){a=v(this,a);b=v(this,b);var d=[],e=a.line;return this.iter(a.line,b.line+1,function(f){if(f=f.markedSpans)for(var g=0;g<f.length;g++){var h=f[g];null!=h.to&&e==
-a.line&&a.ch>=h.to||null==h.from&&e!=a.line||null!=h.from&&e==b.line&&h.from>=b.ch||c&&!c(h.marker)||d.push(h.marker.parent||h.marker)}++e}),d},getAllMarks:function(){var a=[];return this.iter(function(b){if(b=b.markedSpans)for(var c=0;c<b.length;++c)null!=b[c].from&&a.push(b[c].marker)}),a},posFromIndex:function(a){var b,c=this.first,d=this.lineSeparator().length;return this.iter(function(e){e=e.text.length+d;if(e>a)return b=a,!0;a-=e;++c}),v(this,m(c,b))},indexFromPos:function(a){a=v(this,a);var b=
-a.ch;if(a.line<this.first||0>a.ch)return 0;var c=this.lineSeparator().length;return this.iter(this.first,a.line,function(a){b+=a.text.length+c}),b},copy:function(a){var b=new W(Pc(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return b.scrollTop=this.scrollTop,b.scrollLeft=this.scrollLeft,b.sel=this.sel,b.extend=!1,a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory())),b},linkedDoc:function(a){a||(a={});var b=this.first,c=this.first+
-this.size;null!=a.from&&a.from>b&&(b=a.from);null!=a.to&&a.to<c&&(c=a.to);b=new W(Pc(this,b,c),a.mode||this.modeOption,b,this.lineSep,this.direction);a.sharedHist&&(b.history=this.history);(this.linked||(this.linked=[])).push({doc:b,sharedHist:a.sharedHist});b.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}];a=wf(this);for(c=0;c<a.length;c++){var d=a[c],e=d.find(),f=b.clipPos(e.from),e=b.clipPos(e.to);x(f,e)&&(f=mb(b,f,e,d.primary,d.primary.type),d.markers.push(f),f.parent=d)}return b},unlinkDoc:function(a){if(a instanceof
-E&&(a=a.doc),this.linked)for(var b=0;b<this.linked.length;++b)if(this.linked[b].doc==a){this.linked.splice(b,1);a.unlinkDoc(this);Ig(wf(this));break}if(a.history==this.history){var c=[a.id];Va(a,function(a){return c.push(a.id)},!0);a.history=new yc(null);a.history.done=ib(this.history.done,c);a.history.undone=ib(this.history.undone,c)}},iterLinkedDocs:function(a){Va(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(a){return this.lineSep?a.split(this.lineSep):
-Od(a)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:M(function(a){"rtl"!=a&&(a="ltr");a!=this.direction&&(this.direction=a,this.iter(function(a){return a.order=null}),this.cm&&Cg(this.cm))})});W.prototype.eachLine=W.prototype.iter;for(var yf=0,Pf=!1,Da={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",
-46:"Delete",59:";",61:"\x3d",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"\x3d",109:"-",110:".",111:"/",127:"Delete",173:"-",186:";",187:"\x3d",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},ac=0;10>ac;ac++)Da[ac+48]=Da[ac+96]=String(ac);for(var Ic=65;90>=Ic;Ic++)Da[Ic]=String.fromCharCode(Ic);for(var bc=1;12>=bc;bc++)Da[bc+111]=Da[bc+63235]=
-"F"+bc;var Pb={basic:{Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},pcDefault:{"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart",
-"Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},
-emacsy:{"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},macDefault:{"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo",
-"Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight",
-"Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]}};Pb["default"]=ha?Pb.macDefault:Pb.pcDefault;var Qb={selectAll:of,singleSelection:function(a){return a.setSelection(a.getCursor("anchor"),a.getCursor("head"),pa)},killLine:function(a){return ob(a,function(b){if(b.empty()){var c=w(a.doc,b.head.line).text.length;return b.head.ch==c&&b.head.line<a.lastLine()?{from:b.head,to:m(b.head.line+1,0)}:{from:b.head,to:m(b.head.line,
-c)}}return{from:b.from(),to:b.to()}})},deleteLine:function(a){return ob(a,function(b){return{from:m(b.from().line,0),to:v(a.doc,m(b.to().line+1,0))}})},delLineLeft:function(a){return ob(a,function(a){return{from:m(a.from().line,0),to:a.from()}})},delWrappedLineLeft:function(a){return ob(a,function(b){var c=a.charCoords(b.head,"div").top+5;return{from:a.coordsChar({left:0,top:c},"div"),to:b.from()}})},delWrappedLineRight:function(a){return ob(a,function(b){var c=a.charCoords(b.head,"div").top+5,c=
-a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div");return{from:b.from(),to:c}})},undo:function(a){return a.undo()},redo:function(a){return a.redo()},undoSelection:function(a){return a.undoSelection()},redoSelection:function(a){return a.redoSelection()},goDocStart:function(a){return a.extendSelection(m(a.firstLine(),0))},goDocEnd:function(a){return a.extendSelection(m(a.lastLine()))},goLineStart:function(a){return a.extendSelectionsBy(function(b){return Ef(a,b.head.line)},{origin:"+move",
-bias:1})},goLineStartSmart:function(a){return a.extendSelectionsBy(function(b){return Ff(a,b.head)},{origin:"+move",bias:1})},goLineEnd:function(a){return a.extendSelectionsBy(function(b){b=b.head.line;var c=w(a.doc,b),d;d=c;for(var e;e=Ia(d,!1);)d=e.find(1,!0).line;return d!=c&&(b=D(d)),$c(!0,a,c,b,-1)},{origin:"+move",bias:-1})},goLineRight:function(a){return a.extendSelectionsBy(function(b){b=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:b},
-"div")},Zb)},goLineLeft:function(a){return a.extendSelectionsBy(function(b){b=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:0,top:b},"div")},Zb)},goLineLeftSmart:function(a){return a.extendSelectionsBy(function(b){var c=a.cursorCoords(b.head,"div").top+5,c=a.coordsChar({left:0,top:c},"div");return c.ch<a.getLine(c.line).search(/\S/)?Ff(a,b.head):c},Zb)},goLineUp:function(a){return a.moveV(-1,"line")},goLineDown:function(a){return a.moveV(1,"line")},goPageUp:function(a){return a.moveV(-1,
-"page")},goPageDown:function(a){return a.moveV(1,"page")},goCharLeft:function(a){return a.moveH(-1,"char")},goCharRight:function(a){return a.moveH(1,"char")},goColumnLeft:function(a){return a.moveH(-1,"column")},goColumnRight:function(a){return a.moveH(1,"column")},goWordLeft:function(a){return a.moveH(-1,"word")},goGroupRight:function(a){return a.moveH(1,"group")},goGroupLeft:function(a){return a.moveH(-1,"group")},goWordRight:function(a){return a.moveH(1,"word")},delCharBefore:function(a){return a.deleteH(-1,
-"char")},delCharAfter:function(a){return a.deleteH(1,"char")},delWordBefore:function(a){return a.deleteH(-1,"word")},delWordAfter:function(a){return a.deleteH(1,"word")},delGroupBefore:function(a){return a.deleteH(-1,"group")},delGroupAfter:function(a){return a.deleteH(1,"group")},indentAuto:function(a){return a.indentSelection("smart")},indentMore:function(a){return a.indentSelection("add")},indentLess:function(a){return a.indentSelection("subtract")},insertTab:function(a){return a.replaceSelection("\t")},
-insertSoftTab:function(a){for(var b=[],c=a.listSelections(),d=a.options.tabSize,e=0;e<c.length;e++){var f=c[e].from(),f=ea(a.getLine(f.line),f.ch,d);b.push(Mc(d-f%d))}a.replaceSelections(b)},defaultTab:function(a){a.somethingSelected()?a.indentSelection("add"):a.execCommand("insertTab")},transposeChars:function(a){return Y(a,function(){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)if(b[d].empty()){var e=b[d].head,f=w(a.doc,e.line).text;if(f)if(e.ch==f.length&&(e=new m(e.line,e.ch-1)),0<e.ch)e=
-new m(e.line,e.ch+1),a.replaceRange(f.charAt(e.ch-1)+f.charAt(e.ch-2),m(e.line,e.ch-2),e,"+transpose");else if(e.line>a.doc.first){var g=w(a.doc,e.line-1).text;g&&(e=new m(e.line,1),a.replaceRange(f.charAt(0)+a.doc.lineSeparator()+g.charAt(g.length-1),m(e.line-1,g.length-1),e,"+transpose"))}c.push(new A(e,e))}a.setSelections(c)})},newlineAndIndent:function(a){return Y(a,function(){for(var b=a.listSelections(),c=b.length-1;0<=c;c--)a.replaceRange(a.doc.lineSeparator(),b[c].anchor,b[c].head,"+input");
-b=a.listSelections();for(c=0;c<b.length;c++)a.indentLine(b[c].from().line,null,!0);fb(a)})},openLine:function(a){return a.replaceSelection("\n","start")},toggleOverwrite:function(a){return a.toggleOverwrite()}},Pg=new Wa,Hd=null,Id=function(a,b,c){this.time=a;this.pos=b;this.button=c};Id.prototype.compare=function(a,b,c){return this.time+400>a&&0==x(b,this.pos)&&c==this.button};var Tb,Sb,pb={toString:function(){return"CodeMirror.Init"}},Of={},Gc={};E.defaults=Of;E.optionHandlers=Gc;var Md=[];E.defineInitHook=
-function(a){return Md.push(a)};var da=null,y=function(a){this.cm=a;this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null;this.polling=new Wa;this.composing=null;this.gracePeriod=!1;this.readDOMTimeout=null};y.prototype.init=function(a){function b(a){if(!K(e,a)){if(e.somethingSelected())Rf({lineWise:!1,text:e.getSelections()}),"cut"==a.type&&e.replaceSelection("",null,"cut");else{if(!e.options.lineWiseCopyCut)return;var b=Uf(e);Rf({lineWise:!0,text:b.text});"cut"==
-a.type&&e.operation(function(){e.setSelections(b.ranges,0,pa);e.replaceSelection("",null,"cut")})}if(a.clipboardData){a.clipboardData.clearData();var c=da.text.join("\n");if(a.clipboardData.setData("Text",c),a.clipboardData.getData("Text")==c)return void a.preventDefault()}var l=Wf();a=l.firstChild;e.display.lineSpace.insertBefore(l,e.display.lineSpace.firstChild);a.value=da.text.join("\n");var n=document.activeElement;Yb(a);setTimeout(function(){e.display.lineSpace.removeChild(l);n.focus();n==f&&
-d.showPrimarySelection()},50)}}var c=this,d=this,e=d.cm,f=d.div=a.lineDiv;Vf(f,e.options.spellcheck);t(f,"paste",function(a){K(e,a)||Tf(a,e)||11>=B&&setTimeout(L(e,function(){return c.updateFromDOM()}),20)});t(f,"compositionstart",function(a){c.composing={data:a.data,done:!1}});t(f,"compositionupdate",function(a){c.composing||(c.composing={data:a.data,done:!1})});t(f,"compositionend",function(a){c.composing&&(a.data!=c.composing.data&&c.readFromDOMSoon(),c.composing.done=!0)});t(f,"touchstart",function(){return d.forceCompositionEnd()});
-t(f,"input",function(){c.composing||c.readFromDOMSoon()});t(f,"copy",b);t(f,"cut",b)};y.prototype.prepareSelection=function(){var a=Ie(this.cm,!1);return a.focus=this.cm.state.focused,a};y.prototype.showSelection=function(a,b){a&&this.cm.display.view.length&&((a.focus||b)&&this.showPrimarySelection(),this.showMultipleSelections(a))};y.prototype.showPrimarySelection=function(){var a=window.getSelection(),b=this.cm,c=b.doc.sel.primary(),d=c.from(),c=c.to();if(b.display.viewTo==b.display.viewFrom||d.line>=
-b.display.viewTo||c.line<b.display.viewFrom)return void a.removeAllRanges();var e=Hc(b,a.anchorNode,a.anchorOffset),f=Hc(b,a.focusNode,a.focusOffset);if(!e||e.bad||!f||f.bad||0!=x(ic(e,f),d)||0!=x(hc(e,f),c)){e=b.display.view;d=d.line>=b.display.viewFrom&&Yf(b,d)||{node:e[0].measure.map[2],offset:0};c=c.line<b.display.viewTo&&Yf(b,c);c||(c=e[e.length-1].measure,c=c.maps?c.maps[c.maps.length-1]:c.map,c={node:c[c.length-1],offset:c[c.length-2]-c[c.length-3]});if(!d||!c)return void a.removeAllRanges();
-var g,e=a.rangeCount&&a.getRangeAt(0);try{g=db(d.node,d.offset,c.offset,c.node)}catch(h){}g&&(!wa&&b.state.focused?(a.collapse(d.node,d.offset),g.collapsed||(a.removeAllRanges(),a.addRange(g))):(a.removeAllRanges(),a.addRange(g)),e&&null==a.anchorNode?a.addRange(e):wa&&this.startGracePeriod());this.rememberSelection()}};y.prototype.startGracePeriod=function(){var a=this;clearTimeout(this.gracePeriod);this.gracePeriod=setTimeout(function(){a.gracePeriod=!1;a.selectionChanged()&&a.cm.operation(function(){return a.cm.curOp.selectionChanged=
-!0})},20)};y.prototype.showMultipleSelections=function(a){Z(this.cm.display.cursorDiv,a.cursors);Z(this.cm.display.selectionDiv,a.selection)};y.prototype.rememberSelection=function(){var a=window.getSelection();this.lastAnchorNode=a.anchorNode;this.lastAnchorOffset=a.anchorOffset;this.lastFocusNode=a.focusNode;this.lastFocusOffset=a.focusOffset};y.prototype.selectionInEditor=function(){var a=window.getSelection();if(!a.rangeCount)return!1;a=a.getRangeAt(0).commonAncestorContainer;return va(this.div,
-a)};y.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())};y.prototype.blur=function(){this.div.blur()};y.prototype.getField=function(){return this.div};y.prototype.supportsTouch=function(){return!0};y.prototype.receivedFocus=function(){function a(){b.cm.state.focused&&(b.pollSelection(),b.polling.set(b.cm.options.pollInterval,a))}var b=this;this.selectionInEditor()?this.pollSelection():Y(this.cm,
-function(){return b.cm.curOp.selectionChanged=!0});this.polling.set(this.cm.options.pollInterval,a)};y.prototype.selectionChanged=function(){var a=window.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset};y.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var a=window.getSelection(),b=this.cm;if(qc&&pc&&this.cm.options.gutters.length&&
-ch(a.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var c=Hc(b,a.anchorNode,a.anchorOffset),d=Hc(b,a.focusNode,a.focusOffset);c&&d&&Y(b,function(){Q(b.doc,ua(c,d),pa);(c.bad||d.bad)&&(b.curOp.selectionChanged=!0)})}}};y.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var a=this.cm,b=a.display,c=a.doc.sel.primary(),
-d=c.from(),c=c.to();if(0==d.ch&&d.line>a.firstLine()&&(d=m(d.line-1,w(a.doc,d.line-1).length)),c.ch==w(a.doc,c.line).text.length&&c.line<a.lastLine()&&(c=m(c.line+1,0)),d.line<b.viewFrom||c.line>b.viewTo-1)return!1;var e,f,g;d.line==b.viewFrom||0==(e=Na(a,d.line))?(f=D(b.view[0].line),g=b.view[0].node):(f=D(b.view[e].line),g=b.view[e-1].node.nextSibling);var h,k;e=Na(a,c.line);if(e==b.view.length-1?(h=b.viewTo-1,k=b.lineDiv.lastChild):(h=D(b.view[e+1].line)-1,k=b.view[e+1].node.previousSibling),!g)return!1;
-b=a.doc.splitLines(dh(a,g,k,f,h));for(g=Ga(a.doc,m(f,0),m(h,w(a.doc,h).text.length));1<b.length&&1<g.length;)if(z(b)==z(g))b.pop(),g.pop(),h--;else{if(b[0]!=g[0])break;b.shift();g.shift();f++}k=e=0;for(var c=b[0],l=g[0],n=Math.min(c.length,l.length);e<n&&c.charCodeAt(e)==l.charCodeAt(e);)++e;c=z(b);l=z(g);for(n=Math.min(c.length-(1==b.length?e:0),l.length-(1==g.length?e:0));k<n&&c.charCodeAt(c.length-k-1)==l.charCodeAt(l.length-k-1);)++k;if(1==b.length&&1==g.length&&f==d.line)for(;e&&e>d.ch&&c.charCodeAt(c.length-
-k-1)==l.charCodeAt(l.length-k-1);)e--,k++;b[b.length-1]=c.slice(0,c.length-k).replace(/^\u200b+/,"");b[0]=b[0].slice(e).replace(/\u200b+$/,"");d=m(f,e);h=m(h,g.length?z(g).length-k:0);return 1<b.length||b[0]||x(d,h)?(lb(a.doc,b,d,h,"+input"),!0):void 0};y.prototype.ensurePolled=function(){this.forceCompositionEnd()};y.prototype.reset=function(){this.forceCompositionEnd()};y.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),
-this.div.blur(),this.div.focus())};y.prototype.readFromDOMSoon=function(){var a=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout(function(){if(a.readDOMTimeout=null,a.composing){if(!a.composing.done)return;a.composing=null}a.updateFromDOM()},80))};y.prototype.updateFromDOM=function(){var a=this;!this.cm.isReadOnly()&&this.pollContent()||Y(this.cm,function(){return V(a.cm)})};y.prototype.setUneditable=function(a){a.contentEditable="false"};y.prototype.onKeyPress=function(a){0!=a.charCode&&
-(a.preventDefault(),this.cm.isReadOnly()||L(this.cm,Nd)(this.cm,String.fromCharCode(null==a.charCode?a.keyCode:a.charCode),0))};y.prototype.readOnlyChanged=function(a){this.div.contentEditable=String("nocursor"!=a)};y.prototype.onContextMenu=function(){};y.prototype.resetPosition=function(){};y.prototype.needsContentAttribute=!0;var I=function(a){this.cm=a;this.prevInput="";this.pollingFast=!1;this.polling=new Wa;this.hasSelection=!1;this.composing=null};I.prototype.init=function(a){function b(a){if(!K(e,
-a)){if(e.somethingSelected())da={lineWise:!1,text:e.getSelections()};else{if(!e.options.lineWiseCopyCut)return;var b=Uf(e);da={lineWise:!0,text:b.text};"cut"==a.type?e.setSelections(b.ranges,null,pa):(d.prevInput="",g.value=b.text.join("\n"),Yb(g))}"cut"==a.type&&(e.state.cutIncoming=!0)}}var c=this,d=this,e=this.cm,f=this.wrapper=Wf(),g=this.textarea=f.firstChild;a.wrapper.insertBefore(f,a.wrapper.firstChild);Wb&&(g.style.width="0px");t(g,"input",function(){C&&9<=B&&c.hasSelection&&(c.hasSelection=
-null);d.poll()});t(g,"paste",function(a){K(e,a)||Tf(a,e)||(e.state.pasteIncoming=!0,d.fastPoll())});t(g,"cut",b);t(g,"copy",b);t(a.scroller,"paste",function(b){ta(a,b)||K(e,b)||(e.state.pasteIncoming=!0,d.focus())});t(a.lineSpace,"selectstart",function(b){ta(a,b)||S(b)});t(g,"compositionstart",function(){var a=e.getCursor("from");d.composing&&d.composing.range.clear();d.composing={start:a,range:e.markText(a,e.getCursor("to"),{className:"CodeMirror-composing"})}});t(g,"compositionend",function(){d.composing&&
-(d.poll(),d.composing.range.clear(),d.composing=null)})};I.prototype.prepareSelection=function(){var a=this.cm,b=a.display,c=a.doc,d=Ie(a);if(a.options.moveInputWithCursor){var a=ia(a,c.sel.primary().head,"div"),c=b.wrapper.getBoundingClientRect(),e=b.lineDiv.getBoundingClientRect();d.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,a.top+e.top-c.top));d.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,a.left+e.left-c.left))}return d};I.prototype.showSelection=function(a){var b=this.cm.display;
-Z(b.cursorDiv,a.cursors);Z(b.selectionDiv,a.selection);null!=a.teTop&&(this.wrapper.style.top=a.teTop+"px",this.wrapper.style.left=a.teLeft+"px")};I.prototype.reset=function(a){if(!this.contextMenuPending&&!this.composing){var b=this.cm;b.somethingSelected()?(this.prevInput="",a=b.getSelection(),this.textarea.value=a,b.state.focused&&Yb(this.textarea),C&&9<=B&&(this.hasSelection=a)):a||(this.prevInput=this.textarea.value="",C&&9<=B&&(this.hasSelection=null))}};I.prototype.getField=function(){return this.textarea};
-I.prototype.supportsTouch=function(){return!1};I.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!rb||qa()!=this.textarea))try{this.textarea.focus()}catch(a){}};I.prototype.blur=function(){this.textarea.blur()};I.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0};I.prototype.receivedFocus=function(){this.slowPoll()};I.prototype.slowPoll=function(){var a=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,function(){a.poll();a.cm.state.focused&&
-a.slowPoll()})};I.prototype.fastPoll=function(){function a(){c.poll()||b?(c.pollingFast=!1,c.slowPoll()):(b=!0,c.polling.set(60,a))}var b=!1,c=this;c.pollingFast=!0;c.polling.set(20,a)};I.prototype.poll=function(){var a=this,b=this.cm,c=this.textarea,d=this.prevInput;if(this.contextMenuPending||!b.state.focused||ih(c)&&!d&&!this.composing||b.isReadOnly()||b.options.disableInput||b.state.keySeq)return!1;var e=c.value;if(e==d&&!b.somethingSelected())return!1;if(C&&9<=B&&this.hasSelection===e||ha&&/[\uf700-\uf7ff]/.test(e))return b.display.input.reset(),
-!1;if(b.doc.sel==b.display.selForContextMenu){var f=e.charCodeAt(0);if(8203!=f||d||(d="​"),8666==f)return this.reset(),this.cm.execCommand("undo")}for(var g=0,f=Math.min(d.length,e.length);g<f&&d.charCodeAt(g)==e.charCodeAt(g);)++g;return Y(b,function(){Nd(b,e.slice(g),d.length-g,null,a.composing?"*compose":null);1E3<e.length||-1<e.indexOf("\n")?c.value=a.prevInput="":a.prevInput=e;a.composing&&(a.composing.range.clear(),a.composing.range=b.markText(a.composing.start,b.getCursor("to"),{className:"CodeMirror-composing"}))}),
-!0};I.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)};I.prototype.onKeyPress=function(){C&&9<=B&&(this.hasSelection=null);this.fastPoll()};I.prototype.onContextMenu=function(a){function b(){if(null!=g.selectionStart){var a=e.somethingSelected(),b="​"+(a?g.value:"");g.value="⇚";g.value=b;d.prevInput=a?"":"​";g.selectionStart=1;g.selectionEnd=b.length;f.selForContextMenu=e.doc.sel}}function c(){if(d.contextMenuPending=!1,d.wrapper.style.cssText=n,g.style.cssText=
-l,C&&9>B&&f.scrollbars.setScrollTop(f.scroller.scrollTop=k),null!=g.selectionStart){(!C||C&&9>B)&&b();var a=0,c=function(){f.selForContextMenu==e.doc.sel&&0==g.selectionStart&&0<g.selectionEnd&&"​"==d.prevInput?L(e,of)(e):10>a++?f.detectingSelectAll=setTimeout(c,500):(f.selForContextMenu=null,f.input.reset())};f.detectingSelectAll=setTimeout(c,200)}}var d=this,e=d.cm,f=e.display,g=d.textarea,h=Qa(e,a),k=f.scroller.scrollTop;if(h&&!ja){e.options.resetSelectionOnContextMenu&&-1==e.doc.sel.contains(h)&&
-L(e,Q)(e.doc,ua(h),pa);var l=g.style.cssText,n=d.wrapper.style.cssText;d.wrapper.style.cssText="position: absolute";h=d.wrapper.getBoundingClientRect();g.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(a.clientY-h.top-5)+"px; left: "+(a.clientX-h.left-5)+"px;\n      z-index: 1000; background: "+(C?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity\x3d5);";var m;if(R&&
-(m=window.scrollY),f.input.focus(),R&&window.scrollTo(null,m),f.input.reset(),e.somethingSelected()||(g.value=d.prevInput=" "),d.contextMenuPending=!0,f.selForContextMenu=e.doc.sel,clearTimeout(f.detectingSelectAll),C&&9<=B&&b(),Kd){vb(a);var p=function(){aa(window,"mouseup",p);setTimeout(c,20)};t(window,"mouseup",p)}else setTimeout(c,50)}};I.prototype.readOnlyChanged=function(a){a||this.reset();this.textarea.disabled="nocursor"==a};I.prototype.setUneditable=function(){};I.prototype.needsContentAttribute=
-!1;(function(a){function b(b,e,f,g){a.defaults[b]=e;f&&(c[b]=g?function(a,b,c){c!=pb&&f(a,b,c)}:f)}var c=a.optionHandlers;a.defineOption=b;a.Init=pb;b("value","",function(a,b){return a.setValue(b)},!0);b("mode",null,function(a,b){a.doc.modeOption=b;Bd(a)},!0);b("indentUnit",2,Bd,!0);b("indentWithTabs",!1);b("smartIndent",!0);b("tabSize",4,function(a){Ib(a);Bb(a);V(a)},!0);b("lineSeparator",null,function(a,b){if(a.doc.lineSep=b,b){var c=[],g=a.doc.first;a.doc.iter(function(a){for(var d=0;;){var h=
-a.text.indexOf(b,d);if(-1==h)break;d=h+b.length;c.push(m(g,h))}g++});for(var h=c.length-1;0<=h;h--)lb(a.doc,b,c[h],m(c[h].line,c[h].ch+b.length))}});b("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,function(a,b,c){a.state.specialChars=new RegExp(b.source+(b.test("\t")?"":"|\t"),"g");c!=pb&&a.refresh()});b("specialCharPlaceholder",rg,function(a){return a.refresh()},!0);b("electricChars",!0);b("inputStyle",rb?"contenteditable":"textarea",function(){throw Error("inputStyle can not (yet) be changed in a running editor");
-},!0);b("spellcheck",!1,function(a,b){return a.getInputField().spellcheck=b},!0);b("rtlMoveVisually",!hh);b("wholeLineUpdateBefore",!0);b("theme","default",function(a){Nf(a);Ub(a)},!0);b("keyMap","default",function(a,b,c){b=Dc(b);(c=c!=pb&&Dc(c))&&c.detach&&c.detach(a,b);b.attach&&b.attach(a,c||null)});b("extraKeys",null);b("configureMouse",null);b("lineWrapping",!1,ah,!0);b("gutters",[],function(a){zd(a.options);Ub(a)},!0);b("fixedGutter",!0,function(a,b){a.display.gutters.style.left=b?pd(a.display)+
-"px":"0";a.refresh()},!0);b("coverGutterNextToScrollbar",!1,function(a){return gb(a)},!0);b("scrollbarStyle","native",function(a){Se(a);gb(a);a.display.scrollbars.setScrollTop(a.doc.scrollTop);a.display.scrollbars.setScrollLeft(a.doc.scrollLeft)},!0);b("lineNumbers",!1,function(a){zd(a.options);Ub(a)},!0);b("firstLineNumber",1,Ub,!0);b("lineNumberFormatter",function(a){return a},Ub,!0);b("showCursorWhenSelecting",!1,Cb,!0);b("resetSelectionOnContextMenu",!0);b("lineWiseCopyCut",!0);b("pasteLinesPerSelection",
-!0);b("readOnly",!1,function(a,b){"nocursor"==b&&(Db(a),a.display.input.blur());a.display.input.readOnlyChanged(b)});b("disableInput",!1,function(a,b){b||a.display.input.reset()},!0);b("dragDrop",!0,$g);b("allowDropFileTypes",null);b("cursorBlinkRate",530);b("cursorScrollMargin",0);b("cursorHeight",1,Cb,!0);b("singleCursorHeightPerLine",!0,Cb,!0);b("workTime",100);b("workDelay",100);b("flattenSpans",!0,Ib,!0);b("addModeClass",!1,Ib,!0);b("pollInterval",100);b("undoDepth",200,function(a,b){return a.doc.history.undoDepth=
-b});b("historyEventDelay",1250);b("viewportMargin",10,function(a){return a.refresh()},!0);b("maxHighlightLength",1E4,Ib,!0);b("moveInputWithCursor",!0,function(a,b){b||a.display.input.resetPosition()});b("tabindex",null,function(a,b){return a.display.input.getField().tabIndex=b||""});b("autofocus",null);b("direction","ltr",function(a,b){return a.doc.setDirection(b)},!0)})(E);(function(a){var b=a.optionHandlers,c=a.helpers={};a.prototype={constructor:a,focus:function(){window.focus();this.display.input.focus()},
-setOption:function(a,c){var f=this.options,g=f[a];f[a]==c&&"mode"!=a||(f[a]=c,b.hasOwnProperty(a)&&L(this,b[a])(this,c,g),F(this,"optionChange",this,a))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](Dc(a))},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||b[c].name==a)return b.splice(c,1),!0},addOverlay:T(function(b,c){var f=b.token?b:a.getMode(this.options,b);if(f.startState)throw Error("Overlays may not be stateful.");
-bg(this.state.overlays,{mode:f,modeSpec:b,opaque:c&&c.opaque,priority:c&&c.priority||0},function(a){return a.priority});this.state.modeGen++;V(this)}),removeOverlay:T(function(a){for(var b=this.state.overlays,c=0;c<b.length;++c){var g=b[c].modeSpec;if(g==a||"string"==typeof a&&g.name==a)return b.splice(c,1),this.state.modeGen++,void V(this)}}),indentLine:T(function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract");sb(this.doc,a)&&
-Vb(this,a,b,c)}),indentSelection:T(function(a){for(var b=this.doc.sel.ranges,c=-1,g=0;g<b.length;g++){var h=b[g];if(h.empty())h.head.line>c&&(Vb(this,h.head.line,a,!0),c=h.head.line,g==this.doc.sel.primIndex&&fb(this));else{for(var k=h.from(),h=h.to(),l=Math.max(c,k.line),c=Math.min(this.lastLine(),h.line-(h.ch?0:1))+1,h=l;h<c;++h)Vb(this,h,a);h=this.doc.sel.ranges;0==k.ch&&b.length==h.length&&0<h[g].from().ch&&Fd(this.doc,g,new A(k,h[g].to()),pa)}}}),getTokenAt:function(a,b){return le(this,a,b)},
-getLineTokens:function(a,b){return le(this,m(a),b,!0)},getTokenTypeAt:function(a){a=v(this.doc,a);var b;b=je(this,w(this.doc,a.line));var c=0,g=(b.length-1)/2;a=a.ch;if(0==a)b=b[2];else for(;;){var h=c+g>>1;if((h?b[2*h-1]:0)>=a)g=h;else{if(!(b[2*h+1]<a)){b=b[2*h+2];break}c=h+1}}c=b?b.indexOf("overlay "):-1;return 0>c?b:0==c?null:b.slice(0,c-1)},getModeAt:function(b){var c=this.doc.mode;return c.innerMode?a.innerMode(c,this.getTokenAt(b).state).mode:c},getHelper:function(a,b){return this.getHelpers(a,
-b)[0]},getHelpers:function(a,b){var f=[];if(!c.hasOwnProperty(b))return f;var g=c[b],h=this.getModeAt(a);if("string"==typeof h[b])g[h[b]]&&f.push(g[h[b]]);else if(h[b])for(var k=0;k<h[b].length;k++){var l=g[h[b][k]];l&&f.push(l)}else h.helperType&&g[h.helperType]?f.push(g[h.helperType]):g[h.name]&&f.push(g[h.name]);for(k=0;k<g._global.length;k++)l=g._global[k],l.pred(h,this)&&-1==N(f,l.val)&&f.push(l.val);return f},getStateAfter:function(a,b){var c=this.doc;return a=Math.max(c.first,Math.min(null==
-a?c.first+c.size-1:a,c.first+c.size-1)),wb(this,a+1,b).state},cursorCoords:function(a,b){var c,g=this.doc.sel.primary();return c=null==a?g.head:"object"==typeof a?v(this.doc,a):a?g.from():g.to(),ia(this,c,b||"page")},charCoords:function(a,b){return rc(this,v(this.doc,a),b||"page")},coordsChar:function(a,b){return a=Fe(this,a,b||"page"),od(this,a.left,a.top)},lineAtHeight:function(a,b){return a=Fe(this,{top:a,left:0},b||"page").top,Ha(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b,
-c){var g=!1;if("number"==typeof a){var h=this.doc.first+this.doc.size-1;a<this.doc.first?a=this.doc.first:a>h&&(a=h,g=!0);a=w(this.doc,a)}return Ka(this,a,{top:0,left:0},b||"page",c||g).top+(g?this.doc.height-na(a):0)},defaultTextHeight:function(){return Oa(this.display)},defaultCharWidth:function(){return Ab(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(a,b,c,g,h){var k=this.display;a=ia(this,v(this.doc,a));var l=a.bottom,n=a.left;
-if(b.style.position="absolute",b.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(b),k.sizer.appendChild(b),"over"==g)l=a.top;else if("above"==g||"near"==g){var m=Math.max(k.wrapper.clientHeight,this.doc.height),p=Math.max(k.sizer.clientWidth,k.lineSpace.clientWidth);("above"==g||a.bottom+b.offsetHeight>m)&&a.top>b.offsetHeight?l=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=m&&(l=a.bottom);n+b.offsetWidth>p&&(n=p-b.offsetWidth)}b.style.top=l+"px";b.style.left=b.style.right=
-"";"right"==h?(n=k.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==h?n=0:"middle"==h&&(n=(k.sizer.clientWidth-b.offsetWidth)/2),b.style.left=n+"px");c&&(a=vd(this,{left:n,top:l,right:n+b.offsetWidth,bottom:l+b.offsetHeight}),null!=a.scrollTop&&Fb(this,a.scrollTop),null!=a.scrollLeft&&Sa(this,a.scrollLeft))},triggerOnKeyDown:T(Hf),triggerOnKeyPress:T(Jf),triggerOnKeyUp:If,triggerOnMouseDown:T(Kf),execCommand:function(a){if(Qb.hasOwnProperty(a))return Qb[a].call(null,this)},triggerElectric:T(function(a){Sf(this,
-a)}),findPosH:function(a,b,c,g){var h=1;0>b&&(h=-1,b=-b);a=v(this.doc,a);for(var k=0;k<b&&(a=Pd(this.doc,a,h,c,g),!a.hitSide);++k);return a},moveH:T(function(a,b){var c=this;this.extendSelectionsBy(function(g){return c.display.shift||c.doc.extend||g.empty()?Pd(c.doc,g.head,a,b,c.options.rtlMoveVisually):0>a?g.from():g.to()},Zb)}),deleteH:T(function(a,b){var c=this.doc;this.doc.sel.somethingSelected()?c.replaceSelection("",null,"+delete"):ob(this,function(g){var h=Pd(c,g.head,a,b,!1);return 0>a?{from:h,
-to:g.head}:{from:g.head,to:h}})}),findPosV:function(a,b,c,g){var h=1;0>b&&(h=-1,b=-b);a=v(this.doc,a);for(var k=0;k<b;++k){var l=ia(this,a,"div");if(null==g?g=l.left:l.left=g,a=Xf(this,l,h,c),a.hitSide)break}return a},moveV:T(function(a,b){var c=this,g=this.doc,h=[],k=!this.display.shift&&!g.extend&&g.sel.somethingSelected();if(g.extendSelectionsBy(function(l){if(k)return 0>a?l.from():l.to();var m=ia(c,l.head,"div");null!=l.goalColumn&&(m.left=l.goalColumn);h.push(m.left);var p=Xf(c,m,a,b);return"page"==
-b&&l==g.sel.primary()&&tc(c,rc(c,p,"div").top-m.top),p},Zb),h.length)for(var l=0;l<g.sel.ranges.length;l++)g.sel.ranges[l].goalColumn=h[l]}),findWordAt:function(a){var b=w(this.doc,a.line).text,c=a.ch,g=a.ch;if(b){var h=this.getHelper(a,"wordChars");"before"!=a.sticky&&g!=b.length||!c?++g:--c;for(var k=b.charAt(c),k=fc(k,h)?function(a){return fc(a,h)}:/\s/.test(k)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!fc(a)};0<c&&k(b.charAt(c-1));)--c;for(;g<b.length&&k(b.charAt(g));)++g}return new A(m(a.line,
-c),m(a.line,g))},toggleOverwrite:function(a){null!=a&&a==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?Ea(this.display.cursorDiv,"CodeMirror-overwrite"):Ra(this.display.cursorDiv,"CodeMirror-overwrite"),F(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==qa()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:T(function(a,b){Eb(this,a,b)}),getScrollInfo:function(){var a=this.display.scroller;
-return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-oa(this)-this.display.barHeight,width:a.scrollWidth-oa(this)-this.display.barWidth,clientHeight:kd(this),clientWidth:Ma(this)}},scrollIntoView:T(function(a,b){null==a?(a={from:this.doc.sel.primary().head,to:null},null==b&&(b=this.options.cursorScrollMargin)):"number"==typeof a?a={from:m(a,0),to:null}:null==a.from&&(a={from:a,to:null});a.to||(a.to=a.from);a.margin=b||0;if(null!=a.from.line){var c=a;uc(this);this.curOp.scrollToPos=c}else Pe(this,
-a.from,a.to,a.margin)}),setSize:T(function(a,b){var c=this,g=function(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a};null!=a&&(this.display.wrapper.style.width=g(a));null!=b&&(this.display.wrapper.style.height=g(b));this.options.lineWrapping&&Ce(this);var h=this.display.viewFrom;this.doc.iter(h,this.display.viewTo,function(a){if(a.widgets)for(var b=0;b<a.widgets.length;b++)if(a.widgets[b].noHScroll){Aa(c,h,"widget");break}++h});this.curOp.forceUpdate=!0;F(this,"refresh",this)}),operation:function(a){return Y(this,
-a)},startOperation:function(){return Ta(this)},endOperation:function(){return Ua(this)},refresh:T(function(){var a=this.display.cachedTextHeight;V(this);this.curOp.forceUpdate=!0;Bb(this);Eb(this,this.doc.scrollLeft,this.doc.scrollTop);ud(this);(null==a||.5<Math.abs(a-Oa(this.display)))&&qd(this);F(this,"refresh",this)}),swapDoc:T(function(a){var b=this.doc;return b.cm=null,bf(this,a),Bb(this),this.display.input.reset(),Eb(this,a.scrollLeft,a.scrollTop),this.curOp.forceScroll=!0,P(this,"swapDoc",
-this,b),b}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}};ab(a);a.registerHelper=function(b,e,f){c.hasOwnProperty(b)||(c[b]=a[b]={_global:[]});c[b][e]=f};a.registerGlobalHelper=function(b,e,f,g){a.registerHelper(b,e,g);c[b]._global.push({pred:f,val:g})}})(E);var kh="iter insert remove copy getEditor constructor".split(" "),
-cc;for(cc in W.prototype)W.prototype.hasOwnProperty(cc)&&0>N(kh,cc)&&(E.prototype[cc]=function(a){return function(){return a.apply(this.doc,arguments)}}(W.prototype[cc]));return ab(W),E.inputStyles={textarea:I,contenteditable:y},E.defineMode=function(a){E.defaults.mode||"null"==a||(E.defaults.mode=a);jg.apply(this,arguments)},E.defineMIME=function(a,b){bb[a]=b},E.defineMode("null",function(){return{token:function(a){return a.skipToEnd()}}}),E.defineMIME("text/plain","null"),E.defineExtension=function(a,
-b){E.prototype[a]=b},E.defineDocExtension=function(a,b){W.prototype[a]=b},E.fromTextArea=function(a,b){function c(){a.value=k.getValue()}if(b=b?Fa(b):{},b.value=a.value,!b.tabindex&&a.tabIndex&&(b.tabindex=a.tabIndex),!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder),null==b.autofocus){var d=qa();b.autofocus=d==a||null!=a.getAttribute("autofocus")&&d==document.body}var e;if(a.form&&(t(a.form,"submit",c),!b.leaveSubmitMethodAlone)){var f=a.form;e=f.submit;try{var g=f.submit=function(){c();
-f.submit=e;f.submit();f.submit=g}}catch(h){}}b.finishInit=function(b){b.save=c;b.getTextArea=function(){return a};b.toTextArea=function(){b.toTextArea=isNaN;c();a.parentNode.removeChild(b.getWrapperElement());a.style.display="";a.form&&(aa(a.form,"submit",c),"function"==typeof a.form.submit&&(a.form.submit=e))}};a.style.display="none";var k=E(function(b){return a.parentNode.insertBefore(b,a.nextSibling)},b);return k},function(a){a.off=aa;a.on=t;a.wheelEventPixels=Bg;a.Doc=W;a.splitLines=Od;a.countColumn=
-ea;a.findColumn=Lc;a.isWordChar=Nc;a.Pass=Fc;a.signal=F;a.Line=hb;a.changeEnd=Ba;a.scrollbarModel=Te;a.Pos=m;a.cmpPos=x;a.modes=cd;a.mimeModes=bb;a.resolveMode=mc;a.getMode=dd;a.modeExtensions=cb;a.extendMode=kg;a.copyState=La;a.startState=ge;a.innerMode=ed;a.commands=Qb;a.keyMap=Pb;a.keyName=Df;a.isModifierKey=Af;a.lookupKey=nb;a.normalizeKeyMap=Ng;a.StringStream=H;a.SharedTextMarker=Ob;a.TextMarker=Ca;a.LineWidget=Nb;a.e_preventDefault=S;a.e_stopPropagation=ee;a.e_stop=vb;a.addClass=Ea;a.contains=
-va;a.rmClass=Ra;a.keyNames=Da}(E),E.version="5.28.0",E});(function(ga){"function"==typeof ga.define&&ga.define("core",["codemirror.js"],function(X){ga.CodeMirror=X})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcode.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcode.min.js
deleted file mode 100644
index b881206b0..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcode.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-CodeMirror.defineMode("bbcode",function(h){var k,l,m;k="b i u s img quote code list table  tr td size color url";l="* :-) hr cut";h.hasOwnProperty("bbCodeTags")&&(k=h.bbCodeTags);h.hasOwnProperty("bbCodeUnaryTags")&&(l=h.bbCodeUnaryTags);var c={cont:function(a,b){m=b;return a},escapeRegEx:function(a){return a.replace(/([\:\-\)\(\*\+\?\[\]])/g,"\\$1")}},n=/[a-zA-Z0-9_]/,p=/['"]/,q=new RegExp("(?:"+c.escapeRegEx(k).split(" ").join("|")+")"),r=new RegExp("(?:"+c.escapeRegEx(l).split(" ").join("|")+")"),
-f={tokenizer:function(a,b){if(a.eatSpace())return null;if(a.match("[",!0))return b.tokenize=f.bbcode,c.cont("tag","startTag");a.next();return null},inAttribute:function(a){return function(b,c){for(var d=null,g=null;!b.eol();){g=b.peek();if(b.next()==a&&"\\"!==d){c.tokenize=f.bbcode;break}d=g}return"string"}},bbcode:function(a,b){if(a.match("]",!0))return b.tokenize=f.tokenizer,c.cont("tag",null);if(a.match("[",!0))return c.cont("tag","startTag");var e=a.next();if(p.test(e))return b.tokenize=f.inAttribute(e),
-c.cont("string","string");if(/\d/.test(e))return a.eatWhile(/\d/),c.cont("number","number");if("whitespace"==b.last)return a.eatWhile(n),c.cont("attribute","modifier");if("property"==b.last)return a.eatWhile(n),c.cont("property",null);if(/\s/.test(e))return m="whitespace",null;var d="";"/"!=e&&(d+=e);for(var g=null;g=a.eat(n);)d+=g;return r.test(d)?c.cont("atom","atom"):q.test(d)?c.cont("keyword","keyword"):/\s/.test(e)?null:c.cont("tag","tag")}};return{startState:function(){return{tokenize:f.tokenizer,
-mode:"bbcode",last:null}},token:function(a,b){var c=b.tokenize(a,b);b.last=m;return c},electricChars:""}});CodeMirror.defineMIME("text/x-bbcode","bbcode");
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js
deleted file mode 100644
index 4234575c7..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js
+++ /dev/null
@@ -1,76 +0,0 @@
-(function(g){"object"==typeof exports&&"object"==typeof module?g(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],g):g(CodeMirror)})(function(g){var z={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,
-dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,
-caseFold:!0},C={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1};g.defineMode("xml",function(r,n){function B(a,f){function d(d){f.tokenize=d;return d(a,f)}var c=a.next();if("\x3c"==c){if(a.eat("!"))return a.eat("[")?a.match("CDATA[")?d(A("atom","]]\x3e")):null:a.match("--")?d(A("comment","--\x3e")):a.match("DOCTYPE",!0,!0)?(a.eatWhile(/[\w\._\-]/),d(H(1))):null;if(a.eat("?"))return a.eatWhile(/[\w\._\-]/),f.tokenize=A("meta","?\x3e"),
-"meta";M=a.eat("/")?"closeTag":"openTag";f.tokenize=G;return"tag bracket"}if("\x26"==c)return(a.eat("#")?a.eat("x")?a.eatWhile(/[a-fA-F\d]/)&&a.eat(";"):a.eatWhile(/[\d]/)&&a.eat(";"):a.eatWhile(/[\w\.\-:]/)&&a.eat(";"))?"atom":"error";a.eatWhile(/[^&<]/);return null}function G(a,f){var d=a.next();if("\x3e"==d||"/"==d&&a.eat("\x3e"))return f.tokenize=B,M="\x3e"==d?"endTag":"selfcloseTag","tag bracket";if("\x3d"==d)return M="equals",null;if("\x3c"==d)return f.tokenize=B,f.state=c,f.tagName=f.tagStart=
-null,(d=f.tokenize(a,f))?d+" tag error":"tag error";if(/[\'\"]/.test(d))return f.tokenize=J(d),f.stringStartCol=a.column(),f.tokenize(a,f);a.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);return"word"}function J(a){var f=function(d,f){for(;!d.eol();)if(d.next()==a){f.tokenize=G;break}return"string"};f.isInAttribute=!0;return f}function A(a,f){return function(d,c){for(;!d.eol();){if(d.match(f)){c.tokenize=B;break}d.next()}return a}}function H(a){return function(f,d){for(var c;null!=(c=f.next());){if("\x3c"==
-c)return d.tokenize=H(a+1),d.tokenize(f,d);if("\x3e"==c)if(1==a){d.tokenize=B;break}else return d.tokenize=H(a-1),d.tokenize(f,d)}return"meta"}}function w(a,f,d){this.prev=a.context;this.tagName=f;this.indent=a.indented;this.startOfLine=d;if(F.doNotIndent.hasOwnProperty(f)||a.context&&a.context.noIndent)this.noIndent=!0}function h(a){a.context&&(a.context=a.context.prev)}function a(a,f){for(var d;a.context;){d=a.context.tagName;if(!F.contextGrabbers.hasOwnProperty(d)||!F.contextGrabbers[d].hasOwnProperty(f))break;
-h(a)}}function c(a,f,d){return"openTag"==a?(d.tagStart=f.column(),K):"closeTag"==a?x:c}function K(a,f,d){if("word"==a)return d.tagName=f.current(),E="tag",l;E="error";return K}function x(a,f,d){if("word"==a){a=f.current();d.context&&d.context.tagName!=a&&F.implicitlyClosed.hasOwnProperty(d.context.tagName)&&h(d);if(d.context&&d.context.tagName==a||!1===F.matchClosing)return E="tag",t;E="tag error";return m}E="error";return m}function t(a,f,d){if("endTag"!=a)return E="error",t;h(d);return c}function m(a,
-f,d){E="error";return t(a,f,d)}function l(R,f,d){if("word"==R)return E="attribute",D;if("endTag"==R||"selfcloseTag"==R){f=d.tagName;var g=d.tagStart;d.tagName=d.tagStart=null;"selfcloseTag"==R||F.autoSelfClosers.hasOwnProperty(f)?a(d,f):(a(d,f),d.context=new w(d,f,g==d.indented));return c}E="error";return l}function D(a,f,d){if("equals"==a)return u;F.allowMissing||(E="error");return l(a,f,d)}function u(a,f,d){if("string"==a)return L;if("word"==a&&F.allowUnquoted)return E="string",l;E="error";return l(a,
-f,d)}function L(a,f,d){return"string"==a?L:l(a,f,d)}var V=r.indentUnit,F={},Y=n.htmlMode?z:C,S;for(S in Y)F[S]=Y[S];for(S in n)F[S]=n[S];var M,E;B.isInText=!0;return{startState:function(a){var f={tokenize:B,state:c,indented:a||0,tagName:null,tagStart:null,context:null};null!=a&&(f.baseIndent=a);return f},token:function(a,f){!f.tagName&&a.sol()&&(f.indented=a.indentation());if(a.eatSpace())return null;M=null;var d=f.tokenize(a,f);(d||M)&&"comment"!=d&&(E=null,f.state=f.state(M||d,a,f),E&&(d="error"==
-E?d+" error":E));return d},indent:function(a,f,d){var c=a.context;if(a.tokenize.isInAttribute)return a.tagStart==a.indented?a.stringStartCol+1:a.indented+V;if(c&&c.noIndent)return g.Pass;if(a.tokenize!=G&&a.tokenize!=B)return d?d.match(/^(\s*)/)[0].length:0;if(a.tagName)return!1!==F.multilineTagIndentPastTag?a.tagStart+a.tagName.length+2:a.tagStart+V*(F.multilineTagIndentFactor||1);if(F.alignCDATA&&/<!\[CDATA\[/.test(f))return 0;if((f=f&&/^<(\/)?([\w_:\.-]*)/.exec(f))&&f[1])for(;c;)if(c.tagName==
-f[2]){c=c.prev;break}else if(F.implicitlyClosed.hasOwnProperty(c.tagName))c=c.prev;else break;else if(f)for(;c;)if((d=F.contextGrabbers[c.tagName])&&d.hasOwnProperty(f[2]))c=c.prev;else break;for(;c&&c.prev&&!c.startOfLine;)c=c.prev;return c?c.indent+V:a.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:F.htmlMode?"html":"xml",helperType:F.htmlMode?"html":"xml",skipAttribute:function(a){a.state==u&&(a.state=l)}}});g.defineMIME("text/xml",
-"xml");g.defineMIME("application/xml","xml");g.mimeModes.hasOwnProperty("text/html")||g.defineMIME("text/html",{name:"xml",htmlMode:!0})});
-(function(g){"object"==typeof exports&&"object"==typeof module?g(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],g):g(CodeMirror)})(function(g){function z(g,r,n){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(r.lastType)||"quasi"==r.lastType&&/\{\s*$/.test(g.string.slice(0,g.pos-(n||0)))}g.defineMode("javascript",function(C,r){function n(p,a,e){da=p;fa=e;return a}function B(a,e){var b=a.next();if('"'==b||"'"==
-b)return e.tokenize=G(b),e.tokenize(a,e);if("."==b&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return n("number","number");if("."==b&&a.match(".."))return n("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(b))return n(b);if("\x3d"==b&&a.eat("\x3e"))return n("\x3d\x3e","operator");if("0"==b&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),n("number","number");if("0"==b&&a.eat(/o/i))return a.eatWhile(/[0-7]/i),n("number","number");if("0"==b&&a.eat(/b/i))return a.eatWhile(/[01]/i),n("number","number");if(/\d/.test(b))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),
-n("number","number");if("/"==b){if(a.eat("*"))return e.tokenize=J,J(a,e);if(a.eat("/"))return a.skipToEnd(),n("comment","comment");if(z(a,e,1)){a:for(var b=!1,v,c=!1;null!=(v=a.next());){if(!b){if("/"==v&&!c)break a;"["==v?c=!0:c&&"]"==v&&(c=!1)}b=!b&&"\\"==v}a.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);return n("regexp","string-2")}a.eatWhile(ga);return n("operator","operator",a.current())}if("`"==b)return e.tokenize=A,A(a,e);if("#"==b)return a.skipToEnd(),n("error","error");if(ga.test(b))return"\x3e"==
-b&&e.lexical&&"\x3e"==e.lexical.type||a.eatWhile(ga),n("operator","operator",a.current());if(ma.test(b)){a.eatWhile(ma);b=a.current();if("."!=e.lastType){if(sa.propertyIsEnumerable(b))return v=sa[b],n(v.type,v.style,b);if("async"==b&&a.match(/^\s*[\(\w]/,!1))return n("async","keyword",b)}return n("variable","variable",b)}}function G(a){return function(e,b){var v=!1,c;if(ha&&"@"==e.peek()&&e.match(Aa))return b.tokenize=B,n("jsonld-keyword","meta");for(;null!=(c=e.next())&&(c!=a||v);)v=!v&&"\\"==c;
-v||(b.tokenize=B);return n("string","string")}}function J(a,e){for(var b=!1,v;v=a.next();){if("/"==v&&b){e.tokenize=B;break}b="*"==v}return n("comment","comment")}function A(a,e){for(var b=!1,v;null!=(v=a.next());){if(!b&&("`"==v||"$"==v&&a.eat("{"))){e.tokenize=B;break}b=!b&&"\\"==v}return n("quasi","string-2",a.current())}function H(a,e){e.fatArrowAt&&(e.fatArrowAt=null);var b=a.string.indexOf("\x3d\x3e",a.start);if(!(0>b)){if(O){var v=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(a.string.slice(a.start,
-b));v&&(b=v.index)}for(var v=0,c=!1,b=b-1;0<=b;--b){var d=a.string.charAt(b),q="([{}])".indexOf(d);if(0<=q&&3>q){if(!v){++b;break}if(0==--v){"("==d&&(c=!0);break}}else if(3<=q&&6>q)++v;else if(ma.test(d))c=!0;else{if(/["'\/]/.test(d))return;if(c&&!v){++b;break}}}c&&!v&&(e.fatArrowAt=b)}}function w(a,e,b,c,d,q){this.indented=a;this.column=e;this.type=b;this.prev=d;this.info=q;null!=c&&(this.align=c)}function h(){for(var a=arguments.length-1;0<=a;a--)k.cc.push(arguments[a])}function a(){h.apply(null,
-arguments);return!0}function c(a){function e(b){for(;b;b=b.next)if(b.name==a)return!0;return!1}var b=k.state;k.marked="def";b.context?e(b.localVars)||(b.localVars={name:a,next:b.localVars}):!e(b.globalVars)&&r.globalVars&&(b.globalVars={name:a,next:b.globalVars})}function K(){k.state.context={prev:k.state.context,vars:k.state.localVars};k.state.localVars=Ba}function x(){k.state.localVars=k.state.context.vars;k.state.context=k.state.context.prev}function t(a,e){var b=function(){var b=k.state,c=b.indented;
-if("stat"==b.lexical.type)c=b.lexical.indented;else for(var d=b.lexical;d&&")"==d.type&&d.align;d=d.prev)c=d.indented;b.lexical=new w(c,k.stream.column(),a,null,b.lexical,e)};b.lex=!0;return b}function m(){var a=k.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function l(p){function b(e){return e==p?a():";"==p?h():a(b)}return b}function D(p,b){return"var"==p?a(t("vardef",b.length),N,l(";"),m):"keyword a"==p?a(t("form"),V,D,m):"keyword b"==p?a(t("form"),
-D,m):"{"==p?a(t("}"),ia,m):";"==p?a():"if"==p?("else"==k.state.lexical.info&&k.state.cc[k.state.cc.length-1]==m&&k.state.cc.pop()(),a(t("form"),V,D,m,ta)):"function"==p?a(P):"for"==p?a(t("form"),Ca,D,m):"variable"==p?O&&"type"==b?(k.marked="keyword",a(I,l("operator"),I,l(";"))):a(t("stat"),Da):"switch"==p?a(t("form"),V,l("{"),t("}","switch"),ia,m,m):"case"==p?a(u,l(":")):"default"==p?a(l(":")):"catch"==p?a(t("form"),K,l("("),na,l(")"),D,m,x):"class"==p?a(t("form"),ua,m):"export"==p?a(t("stat"),Ea,
-m):"import"==p?a(t("stat"),Fa,m):"module"==p?a(t("form"),e,l("{"),t("}"),ia,m,m):"async"==p?a(D):"@"==b?a(u,D):h(t("stat"),u,l(";"),m)}function u(a){return F(a,!1)}function L(a){return F(a,!0)}function V(p){return"("!=p?h():a(t(")"),u,l(")"),m)}function F(p,b){if(k.state.fatArrowAt==k.stream.start){var c=b?ra:d;if("("==p)return a(K,t(")"),Q(e,")"),m,l("\x3d\x3e"),c,x);if("variable"==p)return h(K,e,l("\x3d\x3e"),c,x)}c=b?E:M;return Ga.hasOwnProperty(p)?a(c):"function"==p?a(P,c):"class"==p?a(t("form"),
-Ha,m):"keyword c"==p||"async"==p?a(b?S:Y):"("==p?a(t(")"),Y,l(")"),m,c):"operator"==p||"spread"==p?a(b?L:u):"["==p?a(t("]"),Ia,m,c):"{"==p?ea(oa,"}",null,c):"quasi"==p?h(R,c):"new"==p?a(za(b)):a()}function Y(a){return a.match(/[;\}\)\],]/)?h():h(u)}function S(a){return a.match(/[;\}\)\],]/)?h():h(L)}function M(p,b){return","==p?a(u):E(p,b,!1)}function E(b,e,c){var v=0==c?M:E,q=0==c?u:L;if("\x3d\x3e"==b)return a(K,c?ra:d,x);if("operator"==b)return/\+\+|--/.test(e)?a(v):"?"==e?a(u,l(":"),q):a(q);if("quasi"==
-b)return h(R,v);if(";"!=b){if("("==b)return ea(L,")","call",v);if("."==b)return a(Ja,v);if("["==b)return a(t("]"),Y,l("]"),m,v);if(O&&"as"==e)return k.marked="keyword",a(I,v)}}function R(b,e){return"quasi"!=b?h():"${"!=e.slice(e.length-2)?a(R):a(u,f)}function f(b){if("}"==b)return k.marked="string-2",k.state.tokenize=A,a(R)}function d(a){H(k.stream,k.state);return h("{"==a?D:u)}function ra(a){H(k.stream,k.state);return h("{"==a?D:L)}function za(b){return function(e){return"."==e?a(b?Ka:La):h(b?L:
-u)}}function La(b,e){if("target"==e)return k.marked="keyword",a(M)}function Ka(b,e){if("target"==e)return k.marked="keyword",a(E)}function Da(b){return":"==b?a(m,D):h(M,l(";"),m)}function Ja(b){if("variable"==b)return k.marked="property",a()}function oa(b,e){if("async"==b)return k.marked="property",a(oa);if("variable"==b||"keyword"==k.style)return k.marked="property","get"==e||"set"==e?a(Ma):a(W);if("number"==b||"string"==b)return k.marked=ha?"property":k.style+" property",a(W);if("jsonld-keyword"==
-b)return a(W);if("modifier"==b)return a(oa);if("["==b)return a(u,l("]"),W);if("spread"==b)return a(u,W);if(":"==b)return h(W)}function Ma(b){if("variable"!=b)return h(W);k.marked="property";return a(P)}function W(b){if(":"==b)return a(L);if("("==b)return h(P)}function Q(b,e,c){function d(q,f){if(c?-1<c.indexOf(q):","==q){var g=k.state.lexical;"call"==g.info&&(g.pos=(g.pos||0)+1);return a(function(a,c){return a==e||c==e?h():h(b)},d)}return q==e||f==e?a():a(l(e))}return function(c,q){return c==e||q==
-e?a():h(b,d)}}function ea(b,e,c){for(var d=3;d<arguments.length;d++)k.cc.push(arguments[d]);return a(t(e,c),Q(b,e),m)}function ia(b){return"}"==b?a():h(D,ia)}function T(b,e){if(O){if(":"==b)return a(I);if("?"==e)return a(T)}}function I(b){if("variable"==b)return k.marked="type",a(y);if("string"==b||"number"==b||"atom"==b)return a(y);if("{"==b)return a(t("}"),Q(Z,"}",",;"),m,y);if("("==b)return a(Q(aa,")"),U)}function U(b){if("\x3d\x3e"==b)return a(I)}function Z(b,e){if("variable"==b||"keyword"==k.style)return k.marked=
-"property",a(Z);if("?"==e)return a(Z);if(":"==b)return a(I);if("["==b)return a(u,T,l("]"),Z)}function aa(b){if("variable"==b)return a(aa);if(":"==b)return a(I)}function y(b,e){if("\x3c"==e)return a(t("\x3e"),Q(I,"\x3e"),m,y);if("|"==e||"."==b)return a(I);if("["==b)return a(l("]"),y);if("extends"==e)return a(I)}function N(){return h(e,T,b,Na)}function e(b,d){if("modifier"==b)return a(e);if("variable"==b)return c(d),a();if("spread"==b)return a(e);if("["==b)return ea(e,"]");if("{"==b)return ea(q,"}")}
-function q(p,d){if("variable"==p&&!k.stream.match(/^\s*:/,!1))return c(d),a(b);"variable"==p&&(k.marked="property");return"spread"==p?a(e):"}"==p?h():a(l(":"),e,b)}function b(b,e){if("\x3d"==e)return a(L)}function Na(b){if(","==b)return a(N)}function ta(b,e){if("keyword b"==b&&"else"==e)return a(t("form","else"),D,m)}function Ca(b){if("("==b)return a(t(")"),Oa,l(")"),m)}function Oa(b){return"var"==b?a(N,l(";"),ja):";"==b?a(ja):"variable"==b?a(Pa):h(u,l(";"),ja)}function Pa(b,e){return"in"==e||"of"==
-e?(k.marked="keyword",a(u)):a(M,ja)}function ja(b,e){return";"==b?a(va):"in"==e||"of"==e?(k.marked="keyword",a(u)):h(u,l(";"),va)}function va(b){")"!=b&&a(u)}function P(b,e){if("*"==e)return k.marked="keyword",a(P);if("variable"==b)return c(e),a(P);if("("==b)return a(K,t(")"),Q(na,")"),m,T,D,x);if(O&&"\x3c"==e)return a(t("\x3e"),Q(I,"\x3e"),m,P)}function na(c){return"spread"==c?a(na):h(e,T,b)}function Ha(a,b){return"variable"==a?ua(a,b):ka(a,b)}function ua(b,e){if("variable"==b)return c(e),a(ka)}
-function ka(b,e){if("\x3c"==e)return a(t("\x3e"),Q(I,"\x3e"),m,ka);if("extends"==e||"implements"==e||O&&","==b)return a(O?I:u,ka);if("{"==b)return a(t("}"),X,m)}function X(b,e){if("variable"==b||"keyword"==k.style){if(("async"==e||"static"==e||"get"==e||"set"==e||O&&("public"==e||"private"==e||"protected"==e||"readonly"==e||"abstract"==e))&&k.stream.match(/^\s+[\w$\xa1-\uffff]/,!1))return k.marked="keyword",a(X);k.marked="property";return a(O?pa:P,X)}if("["==b)return a(u,l("]"),O?pa:P,X);if("*"==
-e)return k.marked="keyword",a(X);if(";"==b)return a(X);if("}"==b)return a();if("@"==e)return a(u,X)}function pa(e,c){return"?"==c?a(pa):":"==e?a(I,b):"\x3d"==c?a(L):h(P)}function Ea(b,e){return"*"==e?(k.marked="keyword",a(qa,l(";"))):"default"==e?(k.marked="keyword",a(u,l(";"))):"{"==b?a(Q(wa,"}"),qa,l(";")):h(D)}function wa(b,e){if("as"==e)return k.marked="keyword",a(l("variable"));if("variable"==b)return h(L,wa)}function Fa(b){return"string"==b?a():h(la,xa,qa)}function la(b,e){if("{"==b)return ea(la,
-"}");"variable"==b&&c(e);"*"==e&&(k.marked="keyword");return a(Qa)}function xa(b){if(","==b)return a(la,xa)}function Qa(b,e){if("as"==e)return k.marked="keyword",a(la)}function qa(b,e){if("from"==e)return k.marked="keyword",a(u)}function Ia(b){return"]"==b?a():h(Q(L,"]"))}var ba=C.indentUnit,ya=r.statementIndent,ha=r.jsonld,ca=r.json||ha,O=r.typescript,ma=r.wordCharacters||/[\w$\xa1-\uffff]/,sa=function(){function a(b){return{type:b,style:"keyword"}}var b=a("keyword a"),e=a("keyword b"),c=a("keyword c"),
-d=a("operator"),q={type:"atom",style:"atom"},b={"if":a("if"),"while":b,"with":b,"else":e,"do":e,"try":e,"finally":e,"return":c,"break":c,"continue":c,"new":a("new"),"delete":c,"throw":c,"debugger":c,"var":a("var"),"const":a("var"),let:a("var"),"function":a("function"),"catch":a("catch"),"for":a("for"),"switch":a("switch"),"case":a("case"),"default":a("default"),"in":d,"typeof":d,"instanceof":d,"true":q,"false":q,"null":q,undefined:q,NaN:q,Infinity:q,"this":a("this"),"class":a("class"),"super":a("atom"),
-yield:c,"export":a("export"),"import":a("import"),"extends":c,await:c};if(O){var e={type:"variable",style:"type"},c={"interface":a("class"),"implements":c,namespace:c,module:a("module"),"enum":a("module"),"public":a("modifier"),"private":a("modifier"),"protected":a("modifier"),"abstract":a("modifier"),string:e,number:e,"boolean":e,any:e},f;for(f in c)b[f]=c[f]}return b}(),ga=/[+\-*&%=<>!?|~^@]/,Aa=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,da,fa,Ga={atom:!0,
-number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},k={state:null,column:null,marked:null,cc:null},Ba={name:"this",next:{name:"arguments"}};m.lex=!0;return{startState:function(a){a={tokenize:B,lastType:"sof",cc:[],lexical:new w((a||0)-ba,0,"block",!1),localVars:r.localVars,context:r.localVars&&{vars:r.localVars},indented:a||0};r.globalVars&&"object"==typeof r.globalVars&&(a.globalVars=r.globalVars);return a},token:function(a,b){a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=
-!1),b.indented=a.indentation(),H(a,b));if(b.tokenize!=J&&a.eatSpace())return null;var e=b.tokenize(a,b);if("comment"==da)return e;b.lastType="operator"!=da||"++"!=fa&&"--"!=fa?da:"incdec";a:{var c=da,d=fa,q=b.cc;k.state=b;k.stream=a;k.marked=null;k.cc=q;k.style=e;b.lexical.hasOwnProperty("align")||(b.lexical.align=!0);for(;;)if((q.length?q.pop():ca?u:D)(c,d)){for(;q.length&&q[q.length-1].lex;)q.pop()();if(k.marked){e=k.marked;break a}if(c="variable"==c)b:{for(c=b.localVars;c;c=c.next)if(c.name==d){c=
-!0;break b}for(q=b.context;q;q=q.prev)for(c=q.vars;c;c=c.next)if(c.name==d){c=!0;break b}c=void 0}if(c){e="variable-2";break a}break a}}return e},indent:function(a,b){if(a.tokenize==J)return g.Pass;if(a.tokenize!=B)return 0;var e=b&&b.charAt(0),c=a.lexical,q;if(!/^\s*else\b/.test(b))for(var d=a.cc.length-1;0<=d;--d){var f=a.cc[d];if(f==m)c=c.prev;else if(f!=ta)break}for(;!("stat"!=c.type&&"form"!=c.type||"}"!=e&&(!(q=a.cc[a.cc.length-1])||q!=M&&q!=E||/^[,\.=+\-*:?[\(]/.test(b)));)c=c.prev;ya&&")"==
-c.type&&"stat"==c.prev.type&&(c=c.prev);q=c.type;d=e==q;return"vardef"==q?c.indented+("operator"==a.lastType||","==a.lastType?c.info+1:0):"form"==q&&"{"==e?c.indented:"form"==q?c.indented+ba:"stat"==q?(e=c.indented,c="operator"==a.lastType||","==a.lastType||ga.test(b.charAt(0))||/[,.]/.test(b.charAt(0)),e+(c?ya||ba:0)):"switch"!=c.info||d||0==r.doubleIndentSwitch?c.align?c.column+(d?0:1):c.indented+(d?0:ba):c.indented+(/^(?:case|default)\b/.test(b)?ba:2*ba)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,
-blockCommentStart:ca?null:"/*",blockCommentEnd:ca?null:"*/",lineComment:ca?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:ca?"json":"javascript",jsonldMode:ha,jsonMode:ca,expressionAllowed:z,skipExpression:function(a){var b=a.cc[a.cc.length-1];b!=u&&b!=L||a.cc.pop()}}});g.registerHelper("wordChars","javascript",/[\w$]/);g.defineMIME("text/javascript","javascript");g.defineMIME("text/ecmascript","javascript");g.defineMIME("application/javascript","javascript");g.defineMIME("application/x-javascript",
-"javascript");g.defineMIME("application/ecmascript","javascript");g.defineMIME("application/json",{name:"javascript",json:!0});g.defineMIME("application/x-json",{name:"javascript",json:!0});g.defineMIME("application/ld+json",{name:"javascript",jsonld:!0});g.defineMIME("text/typescript",{name:"javascript",typescript:!0});g.defineMIME("application/typescript",{name:"javascript",typescript:!0})});
-(function(g){"object"==typeof exports&&"object"==typeof module?g(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],g):g(CodeMirror)})(function(g){function z(a){for(var c={},g=0;g<a.length;++g)c[a[g].toLowerCase()]=!0;return c}function C(a,c){for(var g=!1,h;null!=(h=a.next());){if(g&&"/"==h){c.tokenize=null;break}g="*"==h}return["comment","comment"]}g.defineMode("css",function(a,c){function h(a,c){aa=c;return a}function K(a,c){var b=a.next();if(w[b]){var d=
-w[b](a,c);if(!1!==d)return d}if("@"==b)return a.eatWhile(/[\w\\\-]/),h("def",a.current());if("\x3d"==b||("~"==b||"|"==b)&&a.eat("\x3d"))return h(null,"compare");if('"'==b||"'"==b)return c.tokenize=l(b),c.tokenize(a,c);if("#"==b)return a.eatWhile(/[\w\\\-]/),h("atom","hash");if("!"==b)return a.match(/^\s*\w*/),h("keyword","important");if(/\d/.test(b)||"."==b&&a.eat(/\d/))return a.eatWhile(/[\w.%]/),h("number","unit");if("-"===b){if(/[\d.]/.test(a.peek()))return a.eatWhile(/[\w.%]/),h("number","unit");
-if(a.match(/^-[\w\\\-]+/))return a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?h("variable-2","variable-definition"):h("variable-2","variable");if(a.match(/^\w+-/))return h("meta","meta")}else return/[,+>*\/]/.test(b)?h(null,"select-op"):"."==b&&a.match(/^-?[_a-z][_a-z0-9-]*/i)?h("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(b)?h(null,b):"u"==b&&a.match(/rl(-prefix)?\(/)||"d"==b&&a.match("omain(")||"r"==b&&a.match("egexp(")?(a.backUp(1),c.tokenize=m,h("property","word")):/[\w\\\-]/.test(b)?(a.eatWhile(/[\w\\\-]/),
-h("property","word")):h(null,null)}function l(a){return function(c,b){for(var d=!1,f;null!=(f=c.next());){if(f==a&&!d){")"==a&&c.backUp(1);break}d=!d&&"\\"==f}if(f==a||!d&&")"!=a)b.tokenize=null;return h("string","string")}}function m(a,c){a.next();a.match(/\s*[\"\')]/,!1)?c.tokenize=null:c.tokenize=l(")");return h(null,"(")}function t(a,c,b){this.type=a;this.indent=c;this.prev=b}function x(a,c,b,d){a.context=new t(b,c.indentation()+(!1===d?0:A),a.context);return b}function f(a){a.context.prev&&(a.context=
-a.context.prev);return a.context.type}function d(a,c,b,d){for(d=d||1;0<d;d--)b.context=b.context.prev;return N[b.context.type](a,c,b)}function u(a){a=a.current().toLowerCase();y=I.hasOwnProperty(a)?"atom":T.hasOwnProperty(a)?"keyword":"variable"}var n=c.inline;c.propertyKeywords||(c=g.resolveMode("text/css"));var A=a.indentUnit,w=c.tokenHooks,r=c.documentTypes||{},H=c.mediaTypes||{},J=c.mediaFeatures||{},z=c.mediaValueKeywords||{},B=c.propertyKeywords||{},D=c.nonStandardPropertyKeywords||{},C=c.fontProperties||
-{},G=c.counterDescriptors||{},T=c.colorKeywords||{},I=c.valueKeywords||{},U=c.allowNested,Z=!0===c.supportsAtComponent,aa,y,N={top:function(a,c,b){if("{"==a)return x(b,c,"block");if("}"==a&&b.context.prev)return f(b);if(Z&&/@component/.test(a))return x(b,c,"atComponentBlock");if(/^@(-moz-)?document$/.test(a))return x(b,c,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/.test(a))return x(b,c,"atBlock");if(/^@(font-face|counter-style)/.test(a))return b.stateArg=a,"restricted_atBlock_before";
-if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return"keyframes";if(a&&"@"==a.charAt(0))return x(b,c,"at");if("hash"==a)y="builtin";else if("word"==a)y="tag";else{if("variable-definition"==a)return"maybeprop";if("interpolation"==a)return x(b,c,"interpolation");if(":"==a)return"pseudo";if(U&&"("==a)return x(b,c,"parens")}return b.context.type},block:function(a,c,b){if("word"==a){a=c.current().toLowerCase();if(B.hasOwnProperty(a))return y="property","maybeprop";if(D.hasOwnProperty(a))return y="string-2",
-"maybeprop";if(U)return y=c.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block";y+=" error";return"maybeprop"}if("meta"==a)return"block";if(U||"hash"!=a&&"qualifier"!=a)return N.top(a,c,b);y="error";return"block"},maybeprop:function(a,c,b){return":"==a?x(b,c,"prop"):N[b.context.type](a,c,b)},prop:function(a,c,b){if(";"==a)return f(b);if("{"==a&&U)return x(b,c,"propBlock");if("}"==a||"{"==a)return d(a,c,b);if("("==a)return x(b,c,"parens");if("hash"==a&&!/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(c.current()))y+=
-" error";else if("word"==a)u(c);else if("interpolation"==a)return x(b,c,"interpolation");return"prop"},propBlock:function(a,c,b){return"}"==a?f(b):"word"==a?(y="property","maybeprop"):b.context.type},parens:function(a,c,b){if("{"==a||"}"==a)return d(a,c,b);if(")"==a)return f(b);if("("==a)return x(b,c,"parens");if("interpolation"==a)return x(b,c,"interpolation");"word"==a&&u(c);return"parens"},pseudo:function(a,c,b){return"meta"==a?"pseudo":"word"==a?(y="variable-3",b.context.type):N[b.context.type](a,
-c,b)},documentTypes:function(a,c,b){return"word"==a&&r.hasOwnProperty(c.current())?(y="tag",b.context.type):N.atBlock(a,c,b)},atBlock:function(a,c,b){if("("==a)return x(b,c,"atBlock_parens");if("}"==a||";"==a)return d(a,c,b);if("{"==a)return f(b)&&x(b,c,U?"block":"top");if("interpolation"==a)return x(b,c,"interpolation");"word"==a&&(a=c.current().toLowerCase(),y="only"==a||"not"==a||"and"==a||"or"==a?"keyword":H.hasOwnProperty(a)?"attribute":J.hasOwnProperty(a)?"property":z.hasOwnProperty(a)?"keyword":
-B.hasOwnProperty(a)?"property":D.hasOwnProperty(a)?"string-2":I.hasOwnProperty(a)?"atom":T.hasOwnProperty(a)?"keyword":"error");return b.context.type},atComponentBlock:function(a,c,b){if("}"==a)return d(a,c,b);if("{"==a)return f(b)&&x(b,c,U?"block":"top",!1);"word"==a&&(y="error");return b.context.type},atBlock_parens:function(a,c,b){return")"==a?f(b):"{"==a||"}"==a?d(a,c,b,2):N.atBlock(a,c,b)},restricted_atBlock_before:function(a,c,b){return"{"==a?x(b,c,"restricted_atBlock"):"word"==a&&"@counter-style"==
-b.stateArg?(y="variable","restricted_atBlock_before"):N[b.context.type](a,c,b)},restricted_atBlock:function(a,c,b){return"}"==a?(b.stateArg=null,f(b)):"word"==a?(y="@font-face"==b.stateArg&&!C.hasOwnProperty(c.current().toLowerCase())||"@counter-style"==b.stateArg&&!G.hasOwnProperty(c.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},keyframes:function(a,c,b){return"word"==a?(y="variable","keyframes"):"{"==a?x(b,c,"top"):N[b.context.type](a,c,b)},at:function(a,c,b){if(";"==
-a)return f(b);if("{"==a||"}"==a)return d(a,c,b);"word"==a?y="tag":"hash"==a&&(y="builtin");return"at"},interpolation:function(a,c,b){if("}"==a)return f(b);if("{"==a||";"==a)return d(a,c,b);"word"==a?y="variable":"variable"!=a&&"("!=a&&")"!=a&&(y="error");return"interpolation"}};return{startState:function(a){return{tokenize:null,state:n?"block":"top",stateArg:null,context:new t(n?"block":"top",a||0,null)}},token:function(a,c){if(!c.tokenize&&a.eatSpace())return null;var b=(c.tokenize||K)(a,c);b&&"object"==
-typeof b&&(aa=b[1],b=b[0]);y=b;c.state=N[c.state](aa,a,c);return y},indent:function(a,c){var b=a.context,d=c&&c.charAt(0),f=b.indent;"prop"!=b.type||"}"!=d&&")"!=d||(b=b.prev);if(b.prev)if("}"==d&&("block"==b.type||"top"==b.type||"interpolation"==b.type||"restricted_atBlock"==b.type))b=b.prev,f=b.indent;else if(")"==d&&("parens"==b.type||"atBlock_parens"==b.type)||"{"==d&&("at"==b.type||"atBlock"==b.type))f=Math.max(0,b.indent-A);return f},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",
-lineComment:c.lineComment,fold:"brace"}});var r=["domain","regexp","url","url-prefix"],n=z(r),B="all aural braille handheld print projection screen tty tv embossed".split(" "),G=z(B),J="width min-width max-width height min-height max-height device-width min-device-width max-device-width device-height min-device-height max-device-height aspect-ratio min-aspect-ratio max-aspect-ratio device-aspect-ratio min-device-aspect-ratio max-device-aspect-ratio color min-color max-color color-index min-color-index max-color-index monochrome min-monochrome max-monochrome resolution min-resolution max-resolution scan grid orientation device-pixel-ratio min-device-pixel-ratio max-device-pixel-ratio pointer any-pointer hover any-hover".split(" "),
-A=z(J),H="landscape portrait none coarse fine on-demand hover interlace progressive".split(" "),w=z(H),h="align-content align-items align-self alignment-adjust alignment-baseline anchor-point animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function appearance azimuth backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size baseline-shift binding bleed bookmark-label bookmark-level bookmark-state bookmark-target border border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side caret-color clear clip color color-profile column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width columns content counter-increment counter-reset crop cue cue-after cue-before cursor direction display dominant-baseline drop-initial-after-adjust drop-initial-after-align drop-initial-before-adjust drop-initial-before-align drop-initial-size drop-initial-value elevation empty-cells fit fit-position flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float float-offset flow-from flow-into font font-feature-settings font-family font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-rows grid-column grid-column-end grid-column-gap grid-column-start grid-gap grid-row grid-row-end grid-row-gap grid-row-start grid-template grid-template-areas grid-template-columns grid-template-rows hanging-punctuation height hyphens icon image-orientation image-rendering image-resolution inline-box-align justify-content justify-items justify-self left letter-spacing line-break line-height line-stacking line-stacking-ruby line-stacking-shift line-stacking-strategy list-style list-style-image list-style-position list-style-type margin margin-bottom margin-left margin-right margin-top marks marquee-direction marquee-loop marquee-play-count marquee-speed marquee-style max-height max-width min-height min-width move-to nav-down nav-index nav-left nav-right nav-up object-fit object-position opacity order orphans outline outline-color outline-offset outline-style outline-width overflow overflow-style overflow-wrap overflow-x overflow-y padding padding-bottom padding-left padding-right padding-top page page-break-after page-break-before page-break-inside page-policy pause pause-after pause-before perspective perspective-origin pitch pitch-range place-content place-items place-self play-during position presentation-level punctuation-trim quotes region-break-after region-break-before region-break-inside region-fragment rendering-intent resize rest rest-after rest-before richness right rotation rotation-point ruby-align ruby-overhang ruby-position ruby-span shape-image-threshold shape-inside shape-margin shape-outside size speak speak-as speak-header speak-numeral speak-punctuation speech-rate stress string-set tab-size table-layout target target-name target-new target-position text-align text-align-last text-decoration text-decoration-color text-decoration-line text-decoration-skip text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-height text-indent text-justify text-outline text-overflow text-shadow text-size-adjust text-space-collapse text-transform text-underline-position text-wrap top transform transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi user-select vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-range voice-rate voice-stress voice-volume volume white-space widows width will-change word-break word-spacing word-wrap z-index clip-path clip-rule mask enable-background filter flood-color flood-opacity lighting-color stop-color stop-opacity pointer-events color-interpolation color-interpolation-filters color-rendering fill fill-opacity fill-rule image-rendering marker marker-end marker-mid marker-start shape-rendering stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-rendering baseline-shift dominant-baseline glyph-orientation-horizontal glyph-orientation-vertical text-anchor writing-mode".split(" "),
-a=z(h),c="scrollbar-arrow-color scrollbar-base-color scrollbar-dark-shadow-color scrollbar-face-color scrollbar-highlight-color scrollbar-shadow-color scrollbar-3d-light-color scrollbar-track-color shape-inside searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration zoom".split(" "),K=z(c),x=z("font-family src unicode-range font-variant font-feature-settings font-stretch font-weight font-style".split(" ")),t=z("additive-symbols fallback negative pad prefix range speak-as suffix symbols system".split(" ")),
-m="aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkturquoise darkviolet deeppink deepskyblue dimgray dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray grey green greenyellow honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightpink lightsalmon lightseagreen lightskyblue lightslategray lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple rebeccapurple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen".split(" "),
-l=z(m),D="above absolute activeborder additive activecaption afar after-white-space ahead alias all all-scroll alphabetic alternate always amharic amharic-abegede antialiased appworkspace arabic-indic armenian asterisks attr auto auto-flow avoid avoid-column avoid-page avoid-region background backwards baseline below bidi-override binary bengali blink block block-axis bold bolder border border-box both bottom break break-all break-word bullets button button-bevel buttonface buttonhighlight buttonshadow buttontext calc cambodian capitalize caps-lock-indicator caption captiontext caret cell center checkbox circle cjk-decimal cjk-earthly-branch cjk-heavenly-stem cjk-ideographic clear clip close-quote col-resize collapse color color-burn color-dodge column column-reverse compact condensed contain content contents content-box context-menu continuous copy counter counters cover crop cross crosshair currentcolor cursive cyclic darken dashed decimal decimal-leading-zero default default-button dense destination-atop destination-in destination-out destination-over devanagari difference disc discard disclosure-closed disclosure-open document dot-dash dot-dot-dash dotted double down e-resize ease ease-in ease-in-out ease-out element ellipse ellipsis embed end ethiopic ethiopic-abegede ethiopic-abegede-am-et ethiopic-abegede-gez ethiopic-abegede-ti-er ethiopic-abegede-ti-et ethiopic-halehame-aa-er ethiopic-halehame-aa-et ethiopic-halehame-am-et ethiopic-halehame-gez ethiopic-halehame-om-et ethiopic-halehame-sid-et ethiopic-halehame-so-et ethiopic-halehame-ti-er ethiopic-halehame-ti-et ethiopic-halehame-tig ethiopic-numeric ew-resize exclusion expanded extends extra-condensed extra-expanded fantasy fast fill fixed flat flex flex-end flex-start footnotes forwards from geometricPrecision georgian graytext grid groove gujarati gurmukhi hand hangul hangul-consonant hard-light hebrew help hidden hide higher highlight highlighttext hiragana hiragana-iroha horizontal hsl hsla hue icon ignore inactiveborder inactivecaption inactivecaptiontext infinite infobackground infotext inherit initial inline inline-axis inline-block inline-flex inline-grid inline-table inset inside intrinsic invert italic japanese-formal japanese-informal justify kannada katakana katakana-iroha keep-all khmer korean-hangul-formal korean-hanja-formal korean-hanja-informal landscape lao large larger left level lighter lighten line-through linear linear-gradient lines list-item listbox listitem local logical loud lower lower-alpha lower-armenian lower-greek lower-hexadecimal lower-latin lower-norwegian lower-roman lowercase ltr luminosity malayalam match matrix matrix3d media-controls-background media-current-time-display media-fullscreen-button media-mute-button media-play-button media-return-to-realtime-button media-rewind-button media-seek-back-button media-seek-forward-button media-slider media-sliderthumb media-time-remaining-display media-volume-slider media-volume-slider-container media-volume-sliderthumb medium menu menulist menulist-button menulist-text menulist-textfield menutext message-box middle min-intrinsic mix mongolian monospace move multiple multiply myanmar n-resize narrower ne-resize nesw-resize no-close-quote no-drop no-open-quote no-repeat none normal not-allowed nowrap ns-resize numbers numeric nw-resize nwse-resize oblique octal opacity open-quote optimizeLegibility optimizeSpeed oriya oromo outset outside outside-shape overlay overline padding padding-box painted page paused persian perspective plus-darker plus-lighter pointer polygon portrait pre pre-line pre-wrap preserve-3d progress push-button radial-gradient radio read-only read-write read-write-plaintext-only rectangle region relative repeat repeating-linear-gradient repeating-radial-gradient repeat-x repeat-y reset reverse rgb rgba ridge right rotate rotate3d rotateX rotateY rotateZ round row row-resize row-reverse rtl run-in running s-resize sans-serif saturation scale scale3d scaleX scaleY scaleZ screen scroll scrollbar scroll-position se-resize searchfield searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration self-start self-end semi-condensed semi-expanded separate serif show sidama simp-chinese-formal simp-chinese-informal single skew skewX skewY skip-white-space slide slider-horizontal slider-vertical sliderthumb-horizontal sliderthumb-vertical slow small small-caps small-caption smaller soft-light solid somali source-atop source-in source-out source-over space space-around space-between space-evenly spell-out square square-button start static status-bar stretch stroke sub subpixel-antialiased super sw-resize symbolic symbols system-ui table table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group tamil telugu text text-bottom text-top textarea textfield thai thick thin threeddarkshadow threedface threedhighlight threedlightshadow threedshadow tibetan tigre tigrinya-er tigrinya-er-abegede tigrinya-et tigrinya-et-abegede to top trad-chinese-formal trad-chinese-informal transform translate translate3d translateX translateY translateZ transparent ultra-condensed ultra-expanded underline unset up upper-alpha upper-armenian upper-greek upper-hexadecimal upper-latin upper-norwegian upper-roman uppercase urdu url var vertical vertical-text visible visibleFill visiblePainted visibleStroke visual w-resize wait wave wider window windowframe windowtext words wrap wrap-reverse x-large x-small xor xx-large xx-small".split(" "),
-u=z(D),r=r.concat(B).concat(J).concat(H).concat(h).concat(c).concat(m).concat(D);g.registerHelper("hintWords","css",r);g.defineMIME("text/css",{documentTypes:n,mediaTypes:G,mediaFeatures:A,mediaValueKeywords:w,propertyKeywords:a,nonStandardPropertyKeywords:K,fontProperties:x,counterDescriptors:t,colorKeywords:l,valueKeywords:u,tokenHooks:{"/":function(a,c){if(!a.eat("*"))return!1;c.tokenize=C;return C(a,c)}},name:"css"});g.defineMIME("text/x-scss",{mediaTypes:G,mediaFeatures:A,mediaValueKeywords:w,
-propertyKeywords:a,nonStandardPropertyKeywords:K,colorKeywords:l,valueKeywords:u,fontProperties:x,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,c){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(c.tokenize=C,C(a,c)):["operator","operator"]},":":function(a){return a.match(/\s*\{/,!1)?[null,null]:!1},$:function(a){a.match(/^[\w-]+/);return a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return a.eat("{")?[null,"interpolation"]:
-!1}},name:"css",helperType:"scss"});g.defineMIME("text/x-less",{mediaTypes:G,mediaFeatures:A,mediaValueKeywords:w,propertyKeywords:a,nonStandardPropertyKeywords:K,colorKeywords:l,valueKeywords:u,fontProperties:x,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,c){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(c.tokenize=C,C(a,c)):["operator","operator"]},"@":function(a){if(a.eat("{"))return[null,"interpolation"];if(a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,
-!1))return!1;a.eatWhile(/[\w\\\-]/);return a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"\x26":function(){return["atom","atom"]}},name:"css",helperType:"less"});g.defineMIME("text/x-gss",{documentTypes:n,mediaTypes:G,mediaFeatures:A,propertyKeywords:a,nonStandardPropertyKeywords:K,fontProperties:x,counterDescriptors:t,colorKeywords:l,valueKeywords:u,supportsAtComponent:!0,tokenHooks:{"/":function(a,c){if(!a.eat("*"))return!1;c.tokenize=C;return C(a,c)}},name:"css",
-helperType:"gss"})});
-(function(g){"object"==typeof exports&&"object"==typeof module?g(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],g):g(CodeMirror)})(function(g){function z(g){var n=G[g];return n?n:G[g]=new RegExp("\\s+"+g+"\\s*\x3d\\s*('|\")?([^'\"]+)('|\")?\\s*")}function C(g,n){var r=g.match(z(n));return r?/^\s*(.*?)\s*$/.exec(r[2])[1]:
-""}function r(g,n){for(var r in g)for(var w=n[r]||(n[r]=[]),h=g[r],a=h.length-1;0<=a;a--)w.unshift(h[a])}function n(g,n){for(var r=0;r<g.length;r++){var w=g[r];if(!w[0]||w[1].test(C(n,w[0])))return w[2]}}var B={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],
-[null,null,"css"]]},G={};g.defineMode("htmlmixed",function(z,A){function C(a,c){var t=w.token(a,c.htmlState),m=/\btag\b/.test(t),l;if(m&&!/[<>\s\/]/.test(a.current())&&(l=c.htmlState.tagName&&c.htmlState.tagName.toLowerCase())&&h.hasOwnProperty(l))c.inTag=l+" ";else if(c.inTag&&m&&/>$/.test(a.current())){m=/^([\S]+) (.*)/.exec(c.inTag);c.inTag=null;l="\x3e"==a.current()&&n(h[m[1]],m[2]);l=g.getMode(z,l);var r=new RegExp("^\x3c/s*"+m[1]+"s*\x3e","i"),u=new RegExp("\x3c/s*"+m[1]+"s*\x3e","i");c.token=
-function(a,c){if(a.match(r,!1))return c.token=C,c.localState=c.localMode=null;var g=c.localMode.token(a,c.localState),h=a.current(),l=h.search(u);-1<l?a.backUp(h.length-l):h.match(/<\/?$/)&&(a.backUp(h.length),a.match(u,!1)||a.match(h));return g};c.localMode=l;c.localState=g.startState(l,w.indent(c.htmlState,""))}else c.inTag&&(c.inTag+=a.current(),a.eol()&&(c.inTag+=" "));return t}var w=g.getMode(z,{name:"xml",htmlMode:!0,multilineTagIndentFactor:A.multilineTagIndentFactor,multilineTagIndentPastTag:A.multilineTagIndentPastTag}),
-h={},a=A&&A.tags,c=A&&A.scriptTypes;r(B,h);a&&r(a,h);if(c)for(a=c.length-1;0<=a;a--)h.script.unshift(["type",c[a].matches,c[a].mode]);return{startState:function(){var a=g.startState(w);return{token:C,inTag:null,localMode:null,localState:null,htmlState:a}},copyState:function(a){var c;a.localState&&(c=g.copyState(a.localMode,a.localState));return{token:a.token,inTag:a.inTag,localMode:a.localMode,localState:c,htmlState:g.copyState(w,a.htmlState)}},token:function(a,c){return c.token(a,c)},indent:function(a,
-c,h){return!a.localMode||/^\s*<\//.test(c)?w.indent(a.htmlState,c):a.localMode.indent?a.localMode.indent(a.localState,c,h):g.Pass},innerMode:function(a){return{state:a.localState||a.htmlState,mode:a.localMode||w}}}},"xml","javascript","css");g.defineMIME("text/html","htmlmixed")});
-CodeMirror.defineMode("bbcodemixed",function(g){var z,C,r,n,B,G,J;function A(a){return a.replace(/([\[\]\.\-\+\<\>\?\:\(\)\{\}])/g,"\\$1")}var H,w=CodeMirror.getMode(g,"htmlmixed"),h=CodeMirror.getMode(g,"bbcode");J="literal";g.hasOwnProperty("bbCodeLiteral")&&(J=g.bbCodeLiteral);r=/.*\[/;n=/[^\<\>]*\[/;B=new RegExp(A("["+J+"]"));G=new RegExp(A("[/"+J+"]"));H={chain:function(a,c,g){c.tokenize=g;return g(a,c)},cleanChain:function(a,c,g){c.tokenize=null;c.localState=null;c.localMode=null;return"string"==
-typeof g?g?g:null:g(a,c)},maybeBackup:function(a,c,g){c=A(c);var h=a.current(),n=h.search(c);-1<n?a.backUp(h.length-n):h.match(/<\/?$/)&&(a.backUp(h.length),a.match(c,!1)||a.match(h[0]));return g}};z=function(a,c){return!c.inLiteral&&a.match(n,!1)&&null===c.htmlMixedState.htmlState.tagName||!c.inLiteral&&a.match("[",!1)?(c.tokenize=C,c.localMode=h,c.localState=h.startState(w.indent(c.htmlMixedState,"")),H.maybeBackup(a,"[",h.token(a,c.localState))):w.token(a,c.htmlMixedState)};C=function(a,c){return a.match("]",
-!1)?(a.eat("]"),c.tokenize=z,c.localMode=w,c.localState=c.htmlMixedState,"tag"):H.maybeBackup(a,"]",h.token(a,c.localState))};return{startState:function(){var a=w.startState();return{token:z,localMode:null,localState:null,htmlMixedState:a,tokenize:null,inLiteral:!1}},copyState:function(a){var c=null,g=a.tokenize||a.token;a.localState&&(c=CodeMirror.copyState(g!=z?h:w,a.localState));return{token:a.token,tokenize:a.tokenize,localMode:a.localMode,localState:c,htmlMixedState:CodeMirror.copyState(w,a.htmlMixedState),
-inLiteral:a.inLiteral}},token:function(a,c){if(a.match("[",!1)){if(!c.inLiteral&&a.match(B,!0))return c.inLiteral=!0,"keyword";if(c.inLiteral&&a.match(G,!0))return c.inLiteral=!1,"keyword"}c.inLiteral&&c.localState!=c.htmlMixedState&&(c.tokenize=z,c.localMode=w,c.localState=c.htmlMixedState);return(c.tokenize||c.token)(a,c)},indent:function(a,c){return a.localMode==h||a.inLiteral&&!a.localMode||r.test(c)?CodeMirror.Pass:w.indent(a.htmlMixedState,c)},innerMode:function(a){return{state:a.localState||
-a.htmlMixedState,mode:a.localMode||w}}}},"xml","javascript","css");CodeMirror.defineMIME("text/x-bbcode","bbcodemixed");
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js
deleted file mode 100644
index eb0fa7c7c..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js
+++ /dev/null
@@ -1,77 +0,0 @@
-!function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/xml/xml",["../../lib/codemirror"],d):d(CodeMirror)}(function(d){var p={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,
-dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,
-caseFold:!0},B={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1};d.defineMode("xml",function(x,b){function n(a,b){function H(H){return b.tokenize=H,H(a,b)}var d=a.next();if("\x3c"==d)return a.eat("!")?a.eat("[")?a.match("CDATA[")?H(k("atom","]]\x3e")):null:a.match("--")?H(k("comment","--\x3e")):a.match("DOCTYPE",!0,!0)?(a.eatWhile(/[\w\._\-]/),H(y(1))):null:a.eat("?")?(a.eatWhile(/[\w\._\-]/),b.tokenize=k("meta","?\x3e"),"meta"):
-(K=a.eat("/")?"closeTag":"openTag",b.tokenize=q,"tag bracket");if("\x26"==d){var m;return m=a.eat("#")?a.eat("x")?a.eatWhile(/[a-fA-F\d]/)&&a.eat(";"):a.eatWhile(/[\d]/)&&a.eat(";"):a.eatWhile(/[\w\.\-:]/)&&a.eat(";"),m?"atom":"error"}return a.eatWhile(/[^&<]/),null}function q(a,b){var H=a.next();return"\x3e"==H||"/"==H&&a.eat("\x3e")?(b.tokenize=n,K="\x3e"==H?"endTag":"selfcloseTag","tag bracket"):"\x3d"==H?(K="equals",null):"\x3c"==H?(b.tokenize=n,b.state=E,b.tagName=b.tagStart=null,(H=b.tokenize(a,
-b))?H+" tag error":"tag error"):/[\'\"]/.test(H)?(b.tokenize=A(H),b.stringStartCol=a.column(),b.tokenize(a,b)):(a.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function A(a){var b=function(b,d){for(;!b.eol();)if(b.next()==a){d.tokenize=q;break}return"string"};return b.isInAttribute=!0,b}function k(a,b){return function(d,m){for(;!d.eol();){if(d.match(b)){m.tokenize=n;break}d.next()}return a}}function y(a){return function(b,d){for(var m;null!=(m=b.next());){if("\x3c"==m)return d.tokenize=
-y(a+1),d.tokenize(b,d);if("\x3e"==m){if(1==a){d.tokenize=n;break}return d.tokenize=y(a-1),d.tokenize(b,d)}}return"meta"}}function C(a,b,d){this.prev=a.context;this.tagName=b;this.indent=a.indented;this.startOfLine=d;(G.doNotIndent.hasOwnProperty(b)||a.context&&a.context.noIndent)&&(this.noIndent=!0)}function g(a){a.context&&(a.context=a.context.prev)}function a(a,b){for(var d;a.context&&(d=a.context.tagName,G.contextGrabbers.hasOwnProperty(d)&&G.contextGrabbers[d].hasOwnProperty(b));)g(a)}function E(a,
-b,d){return"openTag"==a?(d.tagStart=b.column(),w):"closeTag"==a?J:E}function w(a,b,d){return"word"==a?(d.tagName=b.current(),F="tag",h):(F="error",w)}function J(a,b,d){return"word"==a?(a=b.current(),d.context&&d.context.tagName!=a&&G.implicitlyClosed.hasOwnProperty(d.context.tagName)&&g(d),d.context&&d.context.tagName==a||!1===G.matchClosing?(F="tag",v):(F="tag error",r)):(F="error",r)}function v(a,b,d){return"endTag"!=a?(F="error",v):(g(d),E)}function r(a,b,d){return F="error",v(a,b,d)}function h(b,
-d,m){if("word"==b)return F="attribute",D;if("endTag"==b||"selfcloseTag"==b){d=m.tagName;var q=m.tagStart;return m.tagName=m.tagStart=null,"selfcloseTag"==b||G.autoSelfClosers.hasOwnProperty(d)?a(m,d):(a(m,d),m.context=new C(m,d,q==m.indented)),E}return F="error",h}function D(a,b,d){return"equals"==a?u:(G.allowMissing||(F="error"),h(a,b,d))}function u(a,b,d){return"string"==a?m:"word"==a&&G.allowUnquoted?(F="string",h):(F="error",h(a,b,d))}function m(a,b,d){return"string"==a?m:h(a,b,d)}var R=x.indentUnit,
-G={},W=b.htmlMode?p:B,P;for(P in W)G[P]=W[P];for(P in b)G[P]=b[P];var K,F;return n.isInText=!0,{startState:function(a){var b={tokenize:n,state:E,indented:a||0,tagName:null,tagStart:null,context:null};return null!=a&&(b.baseIndent=a),b},token:function(a,b){if(!b.tagName&&a.sol()&&(b.indented=a.indentation()),a.eatSpace())return null;K=null;var d=b.tokenize(a,b);return(d||K)&&"comment"!=d&&(F=null,b.state=b.state(K||d,a,b),F&&(d="error"==F?d+" error":F)),d},indent:function(a,b,m){var g=a.context;if(a.tokenize.isInAttribute)return a.tagStart==
-a.indented?a.stringStartCol+1:a.indented+R;if(g&&g.noIndent)return d.Pass;if(a.tokenize!=q&&a.tokenize!=n)return m?m.match(/^(\s*)/)[0].length:0;if(a.tagName)return!1!==G.multilineTagIndentPastTag?a.tagStart+a.tagName.length+2:a.tagStart+R*(G.multilineTagIndentFactor||1);if(G.alignCDATA&&/<!\[CDATA\[/.test(b))return 0;if((b=b&&/^<(\/)?([\w_:\.-]*)/.exec(b))&&b[1])for(;g;){if(g.tagName==b[2]){g=g.prev;break}if(!G.implicitlyClosed.hasOwnProperty(g.tagName))break;g=g.prev}else if(b)for(;g;){m=G.contextGrabbers[g.tagName];
-if(!m||!m.hasOwnProperty(b[2]))break;g=g.prev}for(;g&&g.prev&&!g.startOfLine;)g=g.prev;return g?g.indent+R:a.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:G.htmlMode?"html":"xml",helperType:G.htmlMode?"html":"xml",skipAttribute:function(a){a.state==u&&(a.state=h)}}});d.defineMIME("text/xml","xml");d.defineMIME("application/xml","xml");d.mimeModes.hasOwnProperty("text/html")||d.defineMIME("text/html",{name:"xml",htmlMode:!0})});
-(function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/javascript/javascript",["../../lib/codemirror"],d):d(CodeMirror)})(function(d){function p(d,p,b){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(p.lastType)||"quasi"==p.lastType&&/\{\s*$/.test(d.string.slice(0,d.pos-(b||0)))}d.defineMode("javascript",function(B,x){function b(f,a,c){return aa=f,ca=c,a}function n(f,a){var c=
-f.next();if('"'==c||"'"==c)return a.tokenize=q(c),a.tokenize(f,a);if("."==c&&f.match(/^\d+(?:[eE][+\-]?\d+)?/))return b("number","number");if("."==c&&f.match(".."))return b("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(c))return b(c);if("\x3d"==c&&f.eat("\x3e"))return b("\x3d\x3e","operator");if("0"==c&&f.eat(/x/i))return f.eatWhile(/[\da-f]/i),b("number","number");if("0"==c&&f.eat(/o/i))return f.eatWhile(/[0-7]/i),b("number","number");if("0"==c&&f.eat(/b/i))return f.eatWhile(/[01]/i),b("number",
-"number");if(/\d/.test(c))return f.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),b("number","number");if("/"==c){if(f.eat("*"))c=(a.tokenize=A,A(f,a));else if(f.eat("/"))c=(f.skipToEnd(),b("comment","comment"));else if(p(f,a,1)){a:for(var e=!1,d=!1;null!=(c=f.next());){if(!e){if("/"==c&&!d)break a;"["==c?d=!0:d&&"]"==c&&(d=!1)}e=!e&&"\\"==c}c=(f.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),b("regexp","string-2"))}else c=(f.eatWhile(da),b("operator","operator",f.current()));return c}if("`"==c)return a.tokenize=
-k,k(f,a);if("#"==c)return f.skipToEnd(),b("error","error");if(da.test(c))return"\x3e"==c&&a.lexical&&"\x3e"==a.lexical.type||f.eatWhile(da),b("operator","operator",f.current());if(ka.test(c)){f.eatWhile(ka);c=f.current();if("."!=a.lastType){if(qa.propertyIsEnumerable(c))return e=qa[c],b(e.type,e.style,c);if("async"==c&&f.match(/^\s*[\(\w]/,!1))return b("async","keyword",c)}return b("variable","variable",c)}}function q(f){return function(a,c){var e,d=!1;if(ea&&"@"==a.peek()&&a.match(Aa))return c.tokenize=
-n,b("jsonld-keyword","meta");for(;null!=(e=a.next())&&(e!=f||d);)d=!d&&"\\"==e;return d||(c.tokenize=n),b("string","string")}}function A(f,a){for(var c,e=!1;c=f.next();){if("/"==c&&e){a.tokenize=n;break}e="*"==c}return b("comment","comment")}function k(f,a){for(var c,e=!1;null!=(c=f.next());){if(!e&&("`"==c||"$"==c&&f.eat("{"))){a.tokenize=n;break}e=!e&&"\\"==c}return b("quasi","string-2",f.current())}function y(f,a){a.fatArrowAt&&(a.fatArrowAt=null);var c=f.string.indexOf("\x3d\x3e",f.start);if(!(0>
-c)){if(L){var e=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(f.string.slice(f.start,c));e&&(c=e.index)}for(var e=0,b=!1,c=c-1;0<=c;--c){var d=f.string.charAt(c),t=Ba.indexOf(d);if(0<=t&&3>t){if(!e){++c;break}if(0==--e){"("==d&&(b=!0);break}}else if(3<=t&&6>t)++e;else if(ka.test(d))b=!0;else{if(/["'\/]/.test(d))return;if(b&&!e){++c;break}}}b&&!e&&(a.fatArrowAt=c)}}function C(f,a,c,e,b,d){this.indented=f;this.column=a;this.type=c;this.prev=b;this.info=d;null!=e&&(this.align=e)}function g(){for(var f=
-arguments.length-1;0<=f;f--)l.cc.push(arguments[f])}function a(){return g.apply(null,arguments),!0}function E(f){function a(c){for(;c;c=c.next)if(c.name==f)return!0;return!1}var c=l.state;(l.marked="def",c.context)?a(c.localVars)||(c.localVars={name:f,next:c.localVars}):a(c.globalVars)||x.globalVars&&(c.globalVars={name:f,next:c.globalVars})}function w(){l.state.context={prev:l.state.context,vars:l.state.localVars};l.state.localVars=Ca}function J(){l.state.localVars=l.state.context.vars;l.state.context=
-l.state.context.prev}function v(f,a){var c=function(){var c=l.state,e=c.indented;if("stat"==c.lexical.type)e=c.lexical.indented;else for(var b=c.lexical;b&&")"==b.type&&b.align;b=b.prev)e=b.indented;c.lexical=new C(e,l.stream.column(),f,null,c.lexical,a)};return c.lex=!0,c}function r(){var f=l.state;f.lexical.prev&&(")"==f.lexical.type&&(f.indented=f.lexical.indented),f.lexical=f.lexical.prev)}function h(f){function c(e){return e==f?a():";"==f?g():a(c)}return c}function D(f,e){return"var"==f?a(v("vardef",
-e.length),z,h(";"),r):"keyword a"==f?a(v("form"),R,D,r):"keyword b"==f?a(v("form"),D,r):"{"==f?a(v("}"),X,r):";"==f?a():"if"==f?("else"==l.state.lexical.info&&l.state.cc[l.state.cc.length-1]==r&&l.state.cc.pop()(),a(v("form"),R,D,r,ra)):"function"==f?a(N):"for"==f?a(v("form"),Da,D,r):"variable"==f?L&&"type"==e?(l.marked="keyword",a(I,h("operator"),I,h(";"))):a(v("stat"),Ea):"switch"==f?a(v("form"),R,h("{"),v("}","switch"),X,r,r):"case"==f?a(u,h(":")):"default"==f?a(h(":")):"catch"==f?a(v("form"),
-w,h("("),la,h(")"),D,r,J):"class"==f?a(v("form"),sa,r):"export"==f?a(v("stat"),Fa,r):"import"==f?a(v("stat"),Ga,r):"module"==f?a(v("form"),c,h("{"),v("}"),X,r,r):"async"==f?a(D):"@"==e?a(u,D):g(v("stat"),u,h(";"),r)}function u(f){return G(f,!1)}function m(f){return G(f,!0)}function R(f){return"("!=f?g():a(v(")"),u,h(")"),r)}function G(f,e){if(l.state.fatArrowAt==l.stream.start){var b=e?pa:H;if("("==f)return a(w,v(")"),O(c,")"),r,h("\x3d\x3e"),b,J);if("variable"==f)return g(w,c,h("\x3d\x3e"),b,J)}b=
-e?F:K;return Ha.hasOwnProperty(f)?a(b):"function"==f?a(N,b):"class"==f?a(v("form"),Ia,r):"keyword c"==f||"async"==f?a(e?P:W):"("==f?a(v(")"),W,h(")"),r,b):"operator"==f||"spread"==f?a(e?m:u):"["==f?a(v("]"),Ja,r,b):"{"==f?Q(ma,"}",null,b):"quasi"==f?g(ba,b):"new"==f?a(za(e)):a()}function W(f){return f.match(/[;\}\)\],]/)?g():g(u)}function P(f){return f.match(/[;\}\)\],]/)?g():g(m)}function K(f,c){return","==f?a(u):F(f,c,!1)}function F(f,c,e){var b=0==e?K:F,d=0==e?u:m;return"\x3d\x3e"==f?a(w,e?pa:
-H,J):"operator"==f?/\+\+|--/.test(c)?a(b):"?"==c?a(u,h(":"),d):a(d):"quasi"==f?g(ba,b):";"!=f?"("==f?Q(m,")","call",b):"."==f?a(Ka,b):"["==f?a(v("]"),W,h("]"),r,b):L&&"as"==c?(l.marked="keyword",a(I,b)):void 0:void 0}function ba(f,c){return"quasi"!=f?g():"${"!=c.slice(c.length-2)?a(ba):a(u,xa)}function xa(f){if("}"==f)return l.marked="string-2",l.state.tokenize=k,a(ba)}function H(f){return y(l.stream,l.state),g("{"==f?D:u)}function pa(f){return y(l.stream,l.state),g("{"==f?D:m)}function za(f){return function(c){return"."==
-c?a(f?La:ya):g(f?m:u)}}function ya(f,c){if("target"==c)return l.marked="keyword",a(K)}function La(f,c){if("target"==c)return l.marked="keyword",a(F)}function Ea(f){return":"==f?a(r,D):g(K,h(";"),r)}function Ka(f){if("variable"==f)return l.marked="property",a()}function ma(f,c){return"async"==f?(l.marked="property",a(ma)):"variable"==f||"keyword"==l.style?(l.marked="property",a("get"==c||"set"==c?Ma:S)):"number"==f||"string"==f?(l.marked=ea?"property":l.style+" property",a(S)):"jsonld-keyword"==f?
-a(S):"modifier"==f?a(ma):"["==f?a(u,h("]"),S):"spread"==f?a(u,S):":"==f?g(S):void 0}function Ma(f){return"variable"!=f?g(S):(l.marked="property",a(N))}function S(f){return":"==f?a(m):"("==f?g(N):void 0}function O(f,c,e){function b(d,t){if(e?-1<e.indexOf(d):","==d){var m=l.state.lexical;return"call"==m.info&&(m.pos=(m.pos||0)+1),a(function(a,e){return a==c||e==c?g():g(f)},b)}return d==c||t==c?a():a(h(c))}return function(e,d){return e==c||d==c?a():g(f,b)}}function Q(f,c,e){for(var b=3;b<arguments.length;b++)l.cc.push(arguments[b]);
-return a(v(c,e),O(f,c),r)}function X(f){return"}"==f?a():g(D,X)}function T(f,c){if(L){if(":"==f)return a(I);if("?"==c)return a(T)}}function I(c){return"variable"==c?(l.marked="type",a(U)):"string"==c||"number"==c||"atom"==c?a(U):"{"==c?a(v("}"),O(M,"}",",;"),r,U):"("==c?a(O(fa,")"),ga):void 0}function ga(c){if("\x3d\x3e"==c)return a(I)}function M(c,e){return"variable"==c||"keyword"==l.style?(l.marked="property",a(M)):"?"==e?a(M):":"==c?a(I):"["==c?a(u,T,h("]"),M):void 0}function fa(c){return"variable"==
-c?a(fa):":"==c?a(I):void 0}function U(c,e){return"\x3c"==e?a(v("\x3e"),O(I,"\x3e"),r,U):"|"==e||"."==c?a(I):"["==c?a(h("]"),U):"extends"==e?a(I):void 0}function z(){return g(c,T,e,Na)}function c(f,e){return"modifier"==f?a(c):"variable"==f?(E(e),a()):"spread"==f?a(c):"["==f?Q(c,"]"):"{"==f?Q(t,"}"):void 0}function t(f,b){return"variable"!=f||l.stream.match(/^\s*:/,!1)?("variable"==f&&(l.marked="property"),"spread"==f?a(c):"}"==f?g():a(h(":"),c,e)):(E(b),a(e))}function e(c,e){if("\x3d"==e)return a(m)}
-function Na(c){if(","==c)return a(z)}function ra(c,e){if("keyword b"==c&&"else"==e)return a(v("form","else"),D,r)}function Da(c){if("("==c)return a(v(")"),Oa,h(")"),r)}function Oa(c){return"var"==c?a(z,h(";"),ha):";"==c?a(ha):"variable"==c?a(Pa):g(u,h(";"),ha)}function Pa(c,e){return"in"==e||"of"==e?(l.marked="keyword",a(u)):a(K,ha)}function ha(c,e){return";"==c?a(ta):"in"==e||"of"==e?(l.marked="keyword",a(u)):g(u,h(";"),ta)}function ta(c){")"!=c&&a(u)}function N(c,e){return"*"==e?(l.marked="keyword",
-a(N)):"variable"==c?(E(e),a(N)):"("==c?a(w,v(")"),O(la,")"),r,T,D,J):L&&"\x3c"==e?a(v("\x3e"),O(I,"\x3e"),r,N):void 0}function la(f){return"spread"==f?a(la):g(c,T,e)}function Ia(c,a){return"variable"==c?sa(c,a):ia(c,a)}function sa(c,e){if("variable"==c)return E(e),a(ia)}function ia(c,e){return"\x3c"==e?a(v("\x3e"),O(I,"\x3e"),r,ia):"extends"==e||"implements"==e||L&&","==c?a(L?I:u,ia):"{"==c?a(v("}"),V,r):void 0}function V(c,e){return"variable"==c||"keyword"==l.style?("async"==e||"static"==e||"get"==
-e||"set"==e||L&&("public"==e||"private"==e||"protected"==e||"readonly"==e||"abstract"==e))&&l.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(l.marked="keyword",a(V)):(l.marked="property",a(L?na:N,V)):"["==c?a(u,h("]"),L?na:N,V):"*"==e?(l.marked="keyword",a(V)):";"==c?a(V):"}"==c?a():"@"==e?a(u,V):void 0}function na(c,b){return"?"==b?a(na):":"==c?a(I,e):"\x3d"==b?a(m):g(N)}function Fa(c,e){return"*"==e?(l.marked="keyword",a(oa,h(";"))):"default"==e?(l.marked="keyword",a(u,h(";"))):"{"==c?a(O(ua,"}"),oa,
-h(";")):g(D)}function ua(c,e){return"as"==e?(l.marked="keyword",a(h("variable"))):"variable"==c?g(m,ua):void 0}function Ga(c){return"string"==c?a():g(ja,va,oa)}function ja(c,e){return"{"==c?Q(ja,"}"):("variable"==c&&E(e),"*"==e&&(l.marked="keyword"),a(Qa))}function va(c){if(","==c)return a(ja,va)}function Qa(c,e){if("as"==e)return l.marked="keyword",a(ja)}function oa(c,e){if("from"==e)return l.marked="keyword",a(u)}function Ja(c){return"]"==c?a():g(O(m,"]"))}var aa,ca,Y=B.indentUnit,wa=x.statementIndent,
-ea=x.jsonld,Z=x.json||ea,L=x.typescript,ka=x.wordCharacters||/[\w$\xa1-\uffff]/,qa=function(){function c(a){return{type:a,style:"keyword"}}var a=c("keyword a"),e=c("keyword b"),b=c("keyword c"),d=c("operator"),t={type:"atom",style:"atom"},a={"if":c("if"),"while":a,"with":a,"else":e,"do":e,"try":e,"finally":e,"return":b,"break":b,"continue":b,"new":c("new"),"delete":b,"throw":b,"debugger":b,"var":c("var"),"const":c("var"),let:c("var"),"function":c("function"),"catch":c("catch"),"for":c("for"),"switch":c("switch"),
-"case":c("case"),"default":c("default"),"in":d,"typeof":d,"instanceof":d,"true":t,"false":t,"null":t,undefined:t,NaN:t,Infinity:t,"this":c("this"),"class":c("class"),"super":c("atom"),yield:b,"export":c("export"),"import":c("import"),"extends":b,await:b};if(L){var e={type:"variable",style:"type"},b={"interface":c("class"),"implements":b,namespace:b,module:c("module"),"enum":c("module"),"public":c("modifier"),"private":c("modifier"),"protected":c("modifier"),"abstract":c("modifier"),string:e,number:e,
-"boolean":e,any:e},m;for(m in b)a[m]=b[m]}return a}(),da=/[+\-*&%=<>!?|~^@]/,Aa=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Ba="([{}])",Ha={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},l={state:null,column:null,marked:null,cc:null},Ca={name:"this",next:{name:"arguments"}};return r.lex=!0,{startState:function(c){c={tokenize:n,lastType:"sof",cc:[],lexical:new C((c||0)-Y,0,"block",!1),localVars:x.localVars,context:x.localVars&&
-{vars:x.localVars},indented:c||0};return x.globalVars&&"object"==typeof x.globalVars&&(c.globalVars=x.globalVars),c},token:function(c,a){if(c.sol()&&(a.lexical.hasOwnProperty("align")||(a.lexical.align=!1),a.indented=c.indentation(),y(c,a)),a.tokenize!=A&&c.eatSpace())return null;var e=a.tokenize(c,a);if("comment"!=aa){a.lastType="operator"!=aa||"++"!=ca&&"--"!=ca?aa:"incdec";a:{var b=aa,d=ca,t=a.cc;l.state=a;l.stream=c;l.marked=null;l.cc=t;l.style=e;for(a.lexical.hasOwnProperty("align")||(a.lexical.align=
-!0);;)if((t.length?t.pop():Z?u:D)(b,d)){for(;t.length&&t[t.length-1].lex;)t.pop()();if(l.marked)e=l.marked;else{if(b="variable"==b)b:{for(b=a.localVars;b;b=b.next)if(b.name==d){b=!0;break b}for(t=a.context;t;t=t.prev)for(b=t.vars;b;b=b.next)if(b.name==d){b=!0;break b}b=void 0}e=b?"variable-2":e}break a}}}return e},indent:function(c,a){if(c.tokenize==A)return d.Pass;if(c.tokenize!=n)return 0;var e,b=a&&a.charAt(0),t=c.lexical;if(!/^\s*else\b/.test(a))for(var m=c.cc.length-1;0<=m;--m){var g=c.cc[m];
-if(g==r)t=t.prev;else if(g!=ra)break}for(;!("stat"!=t.type&&"form"!=t.type||"}"!=b&&(!(e=c.cc[c.cc.length-1])||e!=K&&e!=F||/^[,\.=+\-*:?[\(]/.test(a)));)t=t.prev;wa&&")"==t.type&&"stat"==t.prev.type&&(t=t.prev);e=t.type;m=b==e;"vardef"==e?b=t.indented+("operator"==c.lastType||","==c.lastType?t.info+1:0):"form"==e&&"{"==b?b=t.indented:"form"==e?b=t.indented+Y:"stat"==e?(b=t.indented,t="operator"==c.lastType||","==c.lastType||da.test(a.charAt(0))||/[,.]/.test(a.charAt(0)),b+=t?wa||Y:0):b="switch"!=
-t.info||m||0==x.doubleIndentSwitch?t.align?t.column+(m?0:1):t.indented+(m?0:Y):t.indented+(/^(?:case|default)\b/.test(a)?Y:2*Y);return b},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:Z?null:"/*",blockCommentEnd:Z?null:"*/",lineComment:Z?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:Z?"json":"javascript",jsonldMode:ea,jsonMode:Z,expressionAllowed:p,skipExpression:function(c){var a=c.cc[c.cc.length-1];a!=u&&a!=m||c.cc.pop()}}});d.registerHelper("wordChars",
-"javascript",/[\w$]/);d.defineMIME("text/javascript","javascript");d.defineMIME("text/ecmascript","javascript");d.defineMIME("application/javascript","javascript");d.defineMIME("application/x-javascript","javascript");d.defineMIME("application/ecmascript","javascript");d.defineMIME("application/json",{name:"javascript",json:!0});d.defineMIME("application/x-json",{name:"javascript",json:!0});d.defineMIME("application/ld+json",{name:"javascript",jsonld:!0});d.defineMIME("text/typescript",{name:"javascript",
-typescript:!0});d.defineMIME("application/typescript",{name:"javascript",typescript:!0})});
-(function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/css/css",["../../lib/codemirror"],d):d(CodeMirror)})(function(d){function p(a){for(var b={},d=0;d<a.length;++d)b[a[d].toLowerCase()]=!0;return b}function B(a,b){for(var d,g=!1;null!=(d=a.next());){if(g&&"/"==d){b.tokenize=null;break}g="*"==d}return["comment","comment"]}d.defineMode("css",function(a,b){function g(c,a){var e=c.next();if(y[e]){var b=y[e](c,
-a);if(!1!==b)return b}"@"==e?(c.eatWhile(/[\w\\\-]/),e=(w=c.current(),"def")):e="\x3d"==e||("~"==e||"|"==e)&&c.eat("\x3d")?(w="compare",null):'"'==e||"'"==e?(a.tokenize=q(e),a.tokenize(c,a)):"#"==e?(c.eatWhile(/[\w\\\-]/),w="hash","atom"):"!"==e?(c.match(/^\s*\w*/),w="important","keyword"):/\d/.test(e)||"."==e&&c.eat(/\d/)?(c.eatWhile(/[\w.%]/),w="unit","number"):"-"!==e?/[,+>*\/]/.test(e)?(w="select-op",null):"."==e&&c.match(/^-?[_a-z][_a-z0-9-]*/i)?(w="qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(e)?
-(w=e,null):"u"==e&&c.match(/rl(-prefix)?\(/)||"d"==e&&c.match("omain(")||"r"==e&&c.match("egexp(")?(c.backUp(1),a.tokenize=n,w="word","property"):/[\w\\\-]/.test(e)?(c.eatWhile(/[\w\\\-]/),w="word","property"):(w=null,null):/[\d.]/.test(c.peek())?(c.eatWhile(/[\w.%]/),w="unit","number"):c.match(/^-[\w\\\-]+/)?(c.eatWhile(/[\w\\\-]/),c.match(/^\s*:/,!1)?(w="variable-definition","variable-2"):(w="variable","variable-2")):c.match(/^\w+-/)?(w="meta","meta"):void 0;return e}function q(c){return function(a,
-e){for(var b,d=!1;null!=(b=a.next());){if(b==c&&!d){")"==c&&a.backUp(1);break}d=!d&&"\\"==b}return(b==c||!d&&")"!=c)&&(e.tokenize=null),w="string","string"}}function n(c,a){return c.next(),c.match(/\s*[\"\')]/,!1)?a.tokenize=null:a.tokenize=q(")"),w="(",null}function r(c,a,e){this.type=c;this.indent=a;this.prev=e}function h(c,a,e,b){return c.context=new r(e,a.indentation()+(!1===b?0:p),c.context),e}function u(c){return c.context.prev&&(c.context=c.context.prev),c.context.type}function E(c,a,e,b){for(b=
-b||1;0<b;b--)e.context=e.context.prev;return z[e.context.type](c,a,e)}function v(c){c=c.current().toLowerCase();k=ga.hasOwnProperty(c)?"atom":I.hasOwnProperty(c)?"keyword":"variable"}var A=b.inline;b.propertyKeywords||(b=d.resolveMode("text/css"));var w,k,p=a.indentUnit,y=b.tokenHooks,x=b.documentTypes||{},C=b.mediaTypes||{},B=b.mediaFeatures||{},J=b.mediaValueKeywords||{},D=b.propertyKeywords||{},Q=b.nonStandardPropertyKeywords||{},X=b.fontProperties||{},T=b.counterDescriptors||{},I=b.colorKeywords||
-{},ga=b.valueKeywords||{},M=b.allowNested,fa=b.lineComment,U=!0===b.supportsAtComponent,z={};return z.top=function(c,a,b){if("{"==c)return h(b,a,"block");if("}"==c&&b.context.prev)return u(b);if(U&&/@component/.test(c))return h(b,a,"atComponentBlock");if(/^@(-moz-)?document$/.test(c))return h(b,a,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/.test(c))return h(b,a,"atBlock");if(/^@(font-face|counter-style)/.test(c))return b.stateArg=c,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(c))return"keyframes";
-if(c&&"@"==c.charAt(0))return h(b,a,"at");if("hash"==c)k="builtin";else if("word"==c)k="tag";else{if("variable-definition"==c)return"maybeprop";if("interpolation"==c)return h(b,a,"interpolation");if(":"==c)return"pseudo";if(M&&"("==c)return h(b,a,"parens")}return b.context.type},z.block=function(c,a,b){return"word"==c?(c=a.current().toLowerCase(),D.hasOwnProperty(c)?(k="property","maybeprop"):Q.hasOwnProperty(c)?(k="string-2","maybeprop"):M?(k=a.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):
-(k+=" error","maybeprop")):"meta"==c?"block":M||"hash"!=c&&"qualifier"!=c?z.top(c,a,b):(k="error","block")},z.maybeprop=function(c,a,b){return":"==c?h(b,a,"prop"):z[b.context.type](c,a,b)},z.prop=function(c,a,b){if(";"==c)return u(b);if("{"==c&&M)return h(b,a,"propBlock");if("}"==c||"{"==c)return E(c,a,b);if("("==c)return h(b,a,"parens");if("hash"!=c||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(a.current()))if("word"==c)v(a);else{if("interpolation"==c)return h(b,a,"interpolation")}else k+=
-" error";return"prop"},z.propBlock=function(c,a,b){return"}"==c?u(b):"word"==c?(k="property","maybeprop"):b.context.type},z.parens=function(c,a,b){return"{"==c||"}"==c?E(c,a,b):")"==c?u(b):"("==c?h(b,a,"parens"):"interpolation"==c?h(b,a,"interpolation"):("word"==c&&v(a),"parens")},z.pseudo=function(c,a,b){return"meta"==c?"pseudo":"word"==c?(k="variable-3",b.context.type):z[b.context.type](c,a,b)},z.documentTypes=function(c,a,b){return"word"==c&&x.hasOwnProperty(a.current())?(k="tag",b.context.type):
-z.atBlock(c,a,b)},z.atBlock=function(c,a,b){if("("==c)return h(b,a,"atBlock_parens");if("}"==c||";"==c)return E(c,a,b);if("{"==c)return u(b)&&h(b,a,M?"block":"top");if("interpolation"==c)return h(b,a,"interpolation");"word"==c&&(c=a.current().toLowerCase(),k="only"==c||"not"==c||"and"==c||"or"==c?"keyword":C.hasOwnProperty(c)?"attribute":B.hasOwnProperty(c)?"property":J.hasOwnProperty(c)?"keyword":D.hasOwnProperty(c)?"property":Q.hasOwnProperty(c)?"string-2":ga.hasOwnProperty(c)?"atom":I.hasOwnProperty(c)?
-"keyword":"error");return b.context.type},z.atComponentBlock=function(c,a,b){return"}"==c?E(c,a,b):"{"==c?u(b)&&h(b,a,M?"block":"top",!1):("word"==c&&(k="error"),b.context.type)},z.atBlock_parens=function(c,a,b){return")"==c?u(b):"{"==c||"}"==c?E(c,a,b,2):z.atBlock(c,a,b)},z.restricted_atBlock_before=function(c,a,b){return"{"==c?h(b,a,"restricted_atBlock"):"word"==c&&"@counter-style"==b.stateArg?(k="variable","restricted_atBlock_before"):z[b.context.type](c,a,b)},z.restricted_atBlock=function(c,a,
-b){return"}"==c?(b.stateArg=null,u(b)):"word"==c?(k="@font-face"==b.stateArg&&!X.hasOwnProperty(a.current().toLowerCase())||"@counter-style"==b.stateArg&&!T.hasOwnProperty(a.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},z.keyframes=function(c,a,b){return"word"==c?(k="variable","keyframes"):"{"==c?h(b,a,"top"):z[b.context.type](c,a,b)},z.at=function(c,a,b){return";"==c?u(b):"{"==c||"}"==c?E(c,a,b):("word"==c?k="tag":"hash"==c&&(k="builtin"),"at")},z.interpolation=function(c,
-a,b){return"}"==c?u(b):"{"==c||";"==c?E(c,a,b):("word"==c?k="variable":"variable"!=c&&"("!=c&&")"!=c&&(k="error"),"interpolation")},{startState:function(c){return{tokenize:null,state:A?"block":"top",stateArg:null,context:new r(A?"block":"top",c||0,null)}},token:function(c,a){if(!a.tokenize&&c.eatSpace())return null;var b=(a.tokenize||g)(c,a);return b&&"object"==typeof b&&(w=b[1],b=b[0]),k=b,a.state=z[a.state](w,c,a),k},indent:function(c,a){var b=c.context,d=a&&a.charAt(0),m=b.indent;return"prop"!=
-b.type||"}"!=d&&")"!=d||(b=b.prev),b.prev&&("}"!=d||"block"!=b.type&&"top"!=b.type&&"interpolation"!=b.type&&"restricted_atBlock"!=b.type?(")"!=d||"parens"!=b.type&&"atBlock_parens"!=b.type)&&("{"!=d||"at"!=b.type&&"atBlock"!=b.type)||(m=Math.max(0,b.indent-p)):(b=b.prev,m=b.indent)),m},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:fa,fold:"brace"}});var x=["domain","regexp","url","url-prefix"],b=p(x),n="all aural braille handheld print projection screen tty tv embossed".split(" "),
-q=p(n),A="width min-width max-width height min-height max-height device-width min-device-width max-device-width device-height min-device-height max-device-height aspect-ratio min-aspect-ratio max-aspect-ratio device-aspect-ratio min-device-aspect-ratio max-device-aspect-ratio color min-color max-color color-index min-color-index max-color-index monochrome min-monochrome max-monochrome resolution min-resolution max-resolution scan grid orientation device-pixel-ratio min-device-pixel-ratio max-device-pixel-ratio pointer any-pointer hover any-hover".split(" "),
-k=p(A),y="landscape portrait none coarse fine on-demand hover interlace progressive".split(" "),C=p(y),g="align-content align-items align-self alignment-adjust alignment-baseline anchor-point animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function appearance azimuth backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size baseline-shift binding bleed bookmark-label bookmark-level bookmark-state bookmark-target border border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side caret-color clear clip color color-profile column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width columns content counter-increment counter-reset crop cue cue-after cue-before cursor direction display dominant-baseline drop-initial-after-adjust drop-initial-after-align drop-initial-before-adjust drop-initial-before-align drop-initial-size drop-initial-value elevation empty-cells fit fit-position flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float float-offset flow-from flow-into font font-feature-settings font-family font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-rows grid-column grid-column-end grid-column-gap grid-column-start grid-gap grid-row grid-row-end grid-row-gap grid-row-start grid-template grid-template-areas grid-template-columns grid-template-rows hanging-punctuation height hyphens icon image-orientation image-rendering image-resolution inline-box-align justify-content justify-items justify-self left letter-spacing line-break line-height line-stacking line-stacking-ruby line-stacking-shift line-stacking-strategy list-style list-style-image list-style-position list-style-type margin margin-bottom margin-left margin-right margin-top marks marquee-direction marquee-loop marquee-play-count marquee-speed marquee-style max-height max-width min-height min-width move-to nav-down nav-index nav-left nav-right nav-up object-fit object-position opacity order orphans outline outline-color outline-offset outline-style outline-width overflow overflow-style overflow-wrap overflow-x overflow-y padding padding-bottom padding-left padding-right padding-top page page-break-after page-break-before page-break-inside page-policy pause pause-after pause-before perspective perspective-origin pitch pitch-range place-content place-items place-self play-during position presentation-level punctuation-trim quotes region-break-after region-break-before region-break-inside region-fragment rendering-intent resize rest rest-after rest-before richness right rotation rotation-point ruby-align ruby-overhang ruby-position ruby-span shape-image-threshold shape-inside shape-margin shape-outside size speak speak-as speak-header speak-numeral speak-punctuation speech-rate stress string-set tab-size table-layout target target-name target-new target-position text-align text-align-last text-decoration text-decoration-color text-decoration-line text-decoration-skip text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-height text-indent text-justify text-outline text-overflow text-shadow text-size-adjust text-space-collapse text-transform text-underline-position text-wrap top transform transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi user-select vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-range voice-rate voice-stress voice-volume volume white-space widows width will-change word-break word-spacing word-wrap z-index clip-path clip-rule mask enable-background filter flood-color flood-opacity lighting-color stop-color stop-opacity pointer-events color-interpolation color-interpolation-filters color-rendering fill fill-opacity fill-rule image-rendering marker marker-end marker-mid marker-start shape-rendering stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-rendering baseline-shift dominant-baseline glyph-orientation-horizontal glyph-orientation-vertical text-anchor writing-mode".split(" "),
-a=p(g),E="scrollbar-arrow-color scrollbar-base-color scrollbar-dark-shadow-color scrollbar-face-color scrollbar-highlight-color scrollbar-shadow-color scrollbar-3d-light-color scrollbar-track-color shape-inside searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration zoom".split(" "),w=p(E),J=p("font-family src unicode-range font-variant font-feature-settings font-stretch font-weight font-style".split(" ")),v=p("additive-symbols fallback negative pad prefix range speak-as suffix symbols system".split(" ")),
-r="aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkturquoise darkviolet deeppink deepskyblue dimgray dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray grey green greenyellow honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightpink lightsalmon lightseagreen lightskyblue lightslategray lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple rebeccapurple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen".split(" "),
-h=p(r),D="above absolute activeborder additive activecaption afar after-white-space ahead alias all all-scroll alphabetic alternate always amharic amharic-abegede antialiased appworkspace arabic-indic armenian asterisks attr auto auto-flow avoid avoid-column avoid-page avoid-region background backwards baseline below bidi-override binary bengali blink block block-axis bold bolder border border-box both bottom break break-all break-word bullets button button-bevel buttonface buttonhighlight buttonshadow buttontext calc cambodian capitalize caps-lock-indicator caption captiontext caret cell center checkbox circle cjk-decimal cjk-earthly-branch cjk-heavenly-stem cjk-ideographic clear clip close-quote col-resize collapse color color-burn color-dodge column column-reverse compact condensed contain content contents content-box context-menu continuous copy counter counters cover crop cross crosshair currentcolor cursive cyclic darken dashed decimal decimal-leading-zero default default-button dense destination-atop destination-in destination-out destination-over devanagari difference disc discard disclosure-closed disclosure-open document dot-dash dot-dot-dash dotted double down e-resize ease ease-in ease-in-out ease-out element ellipse ellipsis embed end ethiopic ethiopic-abegede ethiopic-abegede-am-et ethiopic-abegede-gez ethiopic-abegede-ti-er ethiopic-abegede-ti-et ethiopic-halehame-aa-er ethiopic-halehame-aa-et ethiopic-halehame-am-et ethiopic-halehame-gez ethiopic-halehame-om-et ethiopic-halehame-sid-et ethiopic-halehame-so-et ethiopic-halehame-ti-er ethiopic-halehame-ti-et ethiopic-halehame-tig ethiopic-numeric ew-resize exclusion expanded extends extra-condensed extra-expanded fantasy fast fill fixed flat flex flex-end flex-start footnotes forwards from geometricPrecision georgian graytext grid groove gujarati gurmukhi hand hangul hangul-consonant hard-light hebrew help hidden hide higher highlight highlighttext hiragana hiragana-iroha horizontal hsl hsla hue icon ignore inactiveborder inactivecaption inactivecaptiontext infinite infobackground infotext inherit initial inline inline-axis inline-block inline-flex inline-grid inline-table inset inside intrinsic invert italic japanese-formal japanese-informal justify kannada katakana katakana-iroha keep-all khmer korean-hangul-formal korean-hanja-formal korean-hanja-informal landscape lao large larger left level lighter lighten line-through linear linear-gradient lines list-item listbox listitem local logical loud lower lower-alpha lower-armenian lower-greek lower-hexadecimal lower-latin lower-norwegian lower-roman lowercase ltr luminosity malayalam match matrix matrix3d media-controls-background media-current-time-display media-fullscreen-button media-mute-button media-play-button media-return-to-realtime-button media-rewind-button media-seek-back-button media-seek-forward-button media-slider media-sliderthumb media-time-remaining-display media-volume-slider media-volume-slider-container media-volume-sliderthumb medium menu menulist menulist-button menulist-text menulist-textfield menutext message-box middle min-intrinsic mix mongolian monospace move multiple multiply myanmar n-resize narrower ne-resize nesw-resize no-close-quote no-drop no-open-quote no-repeat none normal not-allowed nowrap ns-resize numbers numeric nw-resize nwse-resize oblique octal opacity open-quote optimizeLegibility optimizeSpeed oriya oromo outset outside outside-shape overlay overline padding padding-box painted page paused persian perspective plus-darker plus-lighter pointer polygon portrait pre pre-line pre-wrap preserve-3d progress push-button radial-gradient radio read-only read-write read-write-plaintext-only rectangle region relative repeat repeating-linear-gradient repeating-radial-gradient repeat-x repeat-y reset reverse rgb rgba ridge right rotate rotate3d rotateX rotateY rotateZ round row row-resize row-reverse rtl run-in running s-resize sans-serif saturation scale scale3d scaleX scaleY scaleZ screen scroll scrollbar scroll-position se-resize searchfield searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration self-start self-end semi-condensed semi-expanded separate serif show sidama simp-chinese-formal simp-chinese-informal single skew skewX skewY skip-white-space slide slider-horizontal slider-vertical sliderthumb-horizontal sliderthumb-vertical slow small small-caps small-caption smaller soft-light solid somali source-atop source-in source-out source-over space space-around space-between space-evenly spell-out square square-button start static status-bar stretch stroke sub subpixel-antialiased super sw-resize symbolic symbols system-ui table table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group tamil telugu text text-bottom text-top textarea textfield thai thick thin threeddarkshadow threedface threedhighlight threedlightshadow threedshadow tibetan tigre tigrinya-er tigrinya-er-abegede tigrinya-et tigrinya-et-abegede to top trad-chinese-formal trad-chinese-informal transform translate translate3d translateX translateY translateZ transparent ultra-condensed ultra-expanded underline unset up upper-alpha upper-armenian upper-greek upper-hexadecimal upper-latin upper-norwegian upper-roman uppercase urdu url var vertical vertical-text visible visibleFill visiblePainted visibleStroke visual w-resize wait wave wider window windowframe windowtext words wrap wrap-reverse x-large x-small xor xx-large xx-small".split(" "),
-u=p(D),x=x.concat(n).concat(A).concat(y).concat(g).concat(E).concat(r).concat(D);d.registerHelper("hintWords","css",x);d.defineMIME("text/css",{documentTypes:b,mediaTypes:q,mediaFeatures:k,mediaValueKeywords:C,propertyKeywords:a,nonStandardPropertyKeywords:w,fontProperties:J,counterDescriptors:v,colorKeywords:h,valueKeywords:u,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=B,B(a,b))}},name:"css"});d.defineMIME("text/x-scss",{mediaTypes:q,mediaFeatures:k,mediaValueKeywords:C,propertyKeywords:a,
-nonStandardPropertyKeywords:w,colorKeywords:h,valueKeywords:u,fontProperties:J,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=B,B(a,b)):["operator","operator"]},":":function(a){return!!a.match(/\s*\{/,!1)&&[null,null]},$:function(a){return a.match(/^[\w-]+/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return!!a.eat("{")&&[null,"interpolation"]}},name:"css",
-helperType:"scss"});d.defineMIME("text/x-less",{mediaTypes:q,mediaFeatures:k,mediaValueKeywords:C,propertyKeywords:a,nonStandardPropertyKeywords:w,colorKeywords:h,valueKeywords:u,fontProperties:J,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=B,B(a,b)):["operator","operator"]},"@":function(a){return a.eat("{")?[null,"interpolation"]:!a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,
-!1)&&(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"\x26":function(){return["atom","atom"]}},name:"css",helperType:"less"});d.defineMIME("text/x-gss",{documentTypes:b,mediaTypes:q,mediaFeatures:k,propertyKeywords:a,nonStandardPropertyKeywords:w,fontProperties:J,counterDescriptors:v,colorKeywords:h,valueKeywords:u,supportsAtComponent:!0,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=B,B(a,b))}},name:"css",helperType:"gss"})});
-(function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define("mode/htmlmixed/htmlmixed",["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],d):d(CodeMirror)})(function(d){function p(b,d){var k=b.match(n[d]||(n[d]=new RegExp("\\s+"+d+"\\s*\x3d\\s*('|\")?([^'\"]+)('|\")?\\s*")));return k?/^\s*(.*?)\s*$/.exec(k[2])[1]:
-""}function B(b,d){for(var k in b)for(var n=d[k]||(d[k]=[]),p=b[k],g=p.length-1;0<=g;g--)n.unshift(p[g])}function x(b,d){for(var k=0;k<b.length;k++){var n=b[k];if(!n[0]||n[1].test(p(d,n[0])))return n[2]}}var b={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],
-[null,null,"css"]]},n={};d.defineMode("htmlmixed",function(n,p){function k(a,b){var g,p=y.token(a,b.htmlState),r=/\btag\b/.test(p);if(r&&!/[<>\s\/]/.test(a.current())&&(g=b.htmlState.tagName&&b.htmlState.tagName.toLowerCase())&&C.hasOwnProperty(g))b.inTag=g+" ";else if(b.inTag&&r&&/>$/.test(a.current())){g=/^([\S]+) (.*)/.exec(b.inTag);b.inTag=null;var r="\x3e"==a.current()&&x(C[g[1]],g[2]),r=d.getMode(n,r),h=new RegExp("^\x3c/s*"+g[1]+"s*\x3e","i"),A=new RegExp("\x3c/s*"+g[1]+"s*\x3e","i");b.token=
-function(a,b){var d;if(a.match(h,!1))d=(b.token=k,b.localState=b.localMode=null,null);else{d=b.localMode.token(a,b.localState);var g=a.current(),n=g.search(A);d=(-1<n?a.backUp(g.length-n):g.match(/<\/?$/)&&(a.backUp(g.length),a.match(A,!1)||a.match(g)),d)}return d};b.localMode=r;b.localState=d.startState(r,y.indent(b.htmlState,""))}else b.inTag&&(b.inTag+=a.current(),a.eol()&&(b.inTag+=" "));return p}var y=d.getMode(n,{name:"xml",htmlMode:!0,multilineTagIndentFactor:p.multilineTagIndentFactor,multilineTagIndentPastTag:p.multilineTagIndentPastTag}),
-C={},g=p&&p.tags,a=p&&p.scriptTypes;if(B(b,C),g&&B(g,C),a)for(g=a.length-1;0<=g;g--)C.script.unshift(["type",a[g].matches,a[g].mode]);return{startState:function(){return{token:k,inTag:null,localMode:null,localState:null,htmlState:d.startState(y)}},copyState:function(a){var b;return a.localState&&(b=d.copyState(a.localMode,a.localState)),{token:a.token,inTag:a.inTag,localMode:a.localMode,localState:b,htmlState:d.copyState(y,a.htmlState)}},token:function(a,b){return b.token(a,b)},indent:function(a,
-b,g){return!a.localMode||/^\s*<\//.test(b)?y.indent(a.htmlState,b):a.localMode.indent?a.localMode.indent(a.localState,b,g):d.Pass},innerMode:function(a){return{state:a.localState||a.htmlState,mode:a.localMode||y}}}},"xml","javascript","css");d.defineMIME("text/html","htmlmixed")});
-(function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/mode/multiplex",["../../lib/codemirror"],d):d(CodeMirror)})(function(d){d.multiplexingMode=function(p){function B(b,d,q,p){return"string"==typeof d?(q=b.indexOf(d,q),p&&-1<q?q+d.length:q):(d=d.exec(q?b.slice(q):b))?d.index+q+(p?d[0].length:0):-1}var x=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:d.startState(p),innerActive:null,
-inner:null}},copyState:function(b){return{outer:d.copyState(p,b.outer),innerActive:b.innerActive,inner:b.innerActive&&d.copyState(b.innerActive.mode,b.inner)}},token:function(b,n){if(n.innerActive){var q=n.innerActive,A=b.string;if(!q.close&&b.sol())return n.innerActive=n.inner=null,this.token(b,n);var k=q.close?B(A,q.close,b.pos,q.parseDelimiters):-1;if(k==b.pos&&!q.parseDelimiters)return b.match(q.close),n.innerActive=n.inner=null,q.delimStyle&&q.delimStyle+" "+q.delimStyle+"-close";-1<k&&(b.string=
-A.slice(0,k));var y=q.mode.token(b,n.inner);return-1<k&&(b.string=A),k==b.pos&&q.parseDelimiters&&(n.innerActive=n.inner=null),q.innerStyle&&(y=y?y+" "+q.innerStyle:q.innerStyle),y}q=1/0;A=b.string;for(y=0;y<x.length;++y){var C=x[y],k=B(A,C.open,b.pos);if(k==b.pos)return C.parseDelimiters||b.match(C.open),n.innerActive=C,n.inner=d.startState(C.mode,p.indent?p.indent(n.outer,""):0),C.delimStyle&&C.delimStyle+" "+C.delimStyle+"-open";-1!=k&&k<q&&(q=k)}q!=1/0&&(b.string=A.slice(0,q));k=p.token(b,n.outer);
-return q!=1/0&&(b.string=A),k},indent:function(b,n){var q=b.innerActive?b.innerActive.mode:p;return q.indent?q.indent(b.innerActive?b.inner:b.outer,n):d.Pass},blankLine:function(b){var n=b.innerActive?b.innerActive.mode:p;if(n.blankLine&&n.blankLine(b.innerActive?b.inner:b.outer),b.innerActive)"\n"===b.innerActive.close&&(b.innerActive=b.inner=null);else for(var q=0;q<x.length;++q){var A=x[q];"\n"===A.open&&(b.innerActive=A,b.inner=d.startState(A.mode,n.indent?n.indent(b.outer,""):0))}},electricChars:p.electricChars,
-innerMode:function(b){return b.inner?{state:b.inner,mode:b.innerActive.mode}:{state:b.outer,mode:p}}}}});
-(function(d){"object"==typeof exports&&"object"==typeof module?d(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define("mode/htmlembedded/htmlembedded.js",["../../lib/codemirror","../htmlmixed/htmlmixed","../../addon/mode/multiplex"],d):d(CodeMirror)})(function(d){d.defineMode("htmlembedded",function(p,B){return d.multiplexingMode(d.getMode(p,"htmlmixed"),{open:B.open||B.scriptStartRegex||"\x3c%",close:B.close||
-B.scriptEndRegex||"%\x3e",mode:d.getMode(p,B.scriptingModeSpec)})},"htmlmixed");d.defineMIME("application/x-ejs",{name:"htmlembedded",scriptingModeSpec:"javascript"});d.defineMIME("application/x-aspx",{name:"htmlembedded",scriptingModeSpec:"text/x-csharp"});d.defineMIME("application/x-jsp",{name:"htmlembedded",scriptingModeSpec:"text/x-java"});d.defineMIME("application/x-erb",{name:"htmlembedded",scriptingModeSpec:"ruby"})});
-(function(d){"function"==typeof define&&define("modeHtml",["mode/htmlembedded/htmlembedded.js"],function(){})})();
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js
deleted file mode 100644
index 4b4ff986e..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js
+++ /dev/null
@@ -1,29 +0,0 @@
-!function(p){"object"==typeof exports&&"object"==typeof module?p(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/javascript/javascript.js",["../../lib/codemirror"],p):p(CodeMirror)}(function(p){function ka(p,r,q){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(r.lastType)||"quasi"==r.lastType&&/\{\s*$/.test(p.string.slice(0,p.pos-(q||0)))}p.defineMode("javascript",function(xa,r){function q(a,c,b){return H=a,Q=b,c}function D(a,c){var b=
-a.next();if('"'==b||"'"==b)return c.tokenize=ya(b),c.tokenize(a,c);if("."==b&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return q("number","number");if("."==b&&a.match(".."))return q("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(b))return q(b);if("\x3d"==b&&a.eat("\x3e"))return q("\x3d\x3e","operator");if("0"==b&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),q("number","number");if("0"==b&&a.eat(/o/i))return a.eatWhile(/[0-7]/i),q("number","number");if("0"==b&&a.eat(/b/i))return a.eatWhile(/[01]/i),q("number",
-"number");if(/\d/.test(b))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),q("number","number");if("/"==b){if(a.eat("*"))b=(c.tokenize=R,R(a,c));else if(a.eat("/"))b=(a.skipToEnd(),q("comment","comment"));else if(ka(a,c,1)){a:for(var e=!1,d=!1;null!=(b=a.next());){if(!e){if("/"==b&&!d)break a;"["==b?d=!0:d&&"]"==b&&(d=!1)}e=!e&&"\\"==b}b=(a.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),q("regexp","string-2"))}else b=(a.eatWhile(S),q("operator","operator",a.current()));return b}if("`"==b)return c.tokenize=
-aa,aa(a,c);if("#"==b)return a.skipToEnd(),q("error","error");if(S.test(b))return"\x3e"==b&&c.lexical&&"\x3e"==c.lexical.type||a.eatWhile(S),q("operator","operator",a.current());if(ba.test(b)){a.eatWhile(ba);b=a.current();if("."!=c.lastType){if(la.propertyIsEnumerable(b))return e=la[b],q(e.type,e.style,b);if("async"==b&&a.match(/^\s*[\(\w]/,!1))return q("async","keyword",b)}return q("variable","variable",b)}}function ya(a){return function(c,b){var e,d=!1;if(T&&"@"==c.peek()&&c.match(za))return b.tokenize=
-D,q("jsonld-keyword","meta");for(;null!=(e=c.next())&&(e!=a||d);)d=!d&&"\\"==e;return d||(b.tokenize=D),q("string","string")}}function R(a,b){for(var f,e=!1;f=a.next();){if("/"==f&&e){b.tokenize=D;break}e="*"==f}return q("comment","comment")}function aa(a,b){for(var f,e=!1;null!=(f=a.next());){if(!e&&("`"==f||"$"==f&&a.eat("{"))){b.tokenize=D;break}e=!e&&"\\"==f}return q("quasi","string-2",a.current())}function ca(a,b){b.fatArrowAt&&(b.fatArrowAt=null);var f=a.string.indexOf("\x3d\x3e",a.start);if(!(0>
-f)){if(w){var e=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(a.string.slice(a.start,f));e&&(f=e.index)}for(var e=0,d=!1,f=f-1;0<=f;--f){var k=a.string.charAt(f),h=Aa.indexOf(k);if(0<=h&&3>h){if(!e){++f;break}if(0==--e){"("==k&&(d=!0);break}}else if(3<=h&&6>h)++e;else if(ba.test(k))d=!0;else{if(/["'\/]/.test(k))return;if(d&&!e){++f;break}}}d&&!e&&(b.fatArrowAt=f)}}function ma(a,b,d,e,A,k){this.indented=a;this.column=b;this.type=d;this.prev=A;this.info=k;null!=e&&(this.align=e)}function g(){for(var a=
-arguments.length-1;0<=a;a--)d.cc.push(arguments[a])}function b(){return g.apply(null,arguments),!0}function I(a){function b(c){for(;c;c=c.next)if(c.name==a)return!0;return!1}var f=d.state;(d.marked="def",f.context)?b(f.localVars)||(f.localVars={name:a,next:f.localVars}):b(f.globalVars)||r.globalVars&&(f.globalVars={name:a,next:f.globalVars})}function J(){d.state.context={prev:d.state.context,vars:d.state.localVars};d.state.localVars=Ba}function K(){d.state.localVars=d.state.context.vars;d.state.context=
-d.state.context.prev}function l(a,b){var f=function(){var e=d.state,f=e.indented;if("stat"==e.lexical.type)f=e.lexical.indented;else for(var k=e.lexical;k&&")"==k.type&&k.align;k=k.prev)f=k.indented;e.lexical=new ma(f,d.stream.column(),a,null,e.lexical,b)};return f.lex=!0,f}function h(){var a=d.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function m(a){function c(d){return d==a?b():";"==a?g():b(c)}return c}function t(a,c){return"var"==a?b(l("vardef",
-c.length),da,m(";"),h):"keyword a"==a?b(l("form"),ea,t,h):"keyword b"==a?b(l("form"),t,h):"{"==a?b(l("}"),U,h):";"==a?b():"if"==a?("else"==d.state.lexical.info&&d.state.cc[d.state.cc.length-1]==h&&d.state.cc.pop()(),b(l("form"),ea,t,h,na)):"function"==a?b(x):"for"==a?b(l("form"),Ca,t,h):"variable"==a?w&&"type"==c?(d.marked="keyword",b(u,m("operator"),u,m(";"))):b(l("stat"),Da):"switch"==a?b(l("form"),ea,m("{"),l("}","switch"),U,h,h):"case"==a?b(n,m(":")):"default"==a?b(m(":")):"catch"==a?b(l("form"),
-J,m("("),fa,m(")"),t,h,K):"class"==a?b(l("form"),oa,h):"export"==a?b(l("stat"),Ea,h):"import"==a?b(l("stat"),Fa,h):"module"==a?b(l("form"),y,m("{"),l("}"),U,h,h):"async"==a?b(t):"@"==c?b(n,t):g(l("stat"),n,m(";"),h)}function n(a){return pa(a,!1)}function v(a){return pa(a,!0)}function ea(a){return"("!=a?g():b(l(")"),n,m(")"),h)}function pa(a,c){if(d.state.fatArrowAt==d.stream.start){var f=c?qa:ra;if("("==a)return b(J,l(")"),z(y,")"),h,m("\x3d\x3e"),f,K);if("variable"==a)return g(J,y,m("\x3d\x3e"),
-f,K)}f=c?L:E;return Ga.hasOwnProperty(a)?b(f):"function"==a?b(x,f):"class"==a?b(l("form"),Ha,h):"keyword c"==a||"async"==a?b(c?Ia:ga):"("==a?b(l(")"),ga,m(")"),h,f):"operator"==a||"spread"==a?b(c?v:n):"["==a?b(l("]"),Ja,h,f):"{"==a?M(ha,"}",null,f):"quasi"==a?g(V,f):"new"==a?b(Ka(c)):b()}function ga(a){return a.match(/[;\}\)\],]/)?g():g(n)}function Ia(a){return a.match(/[;\}\)\],]/)?g():g(v)}function E(a,c){return","==a?b(n):L(a,c,!1)}function L(a,c,f){var e=0==f?E:L,A=0==f?n:v;return"\x3d\x3e"==
-a?b(J,f?qa:ra,K):"operator"==a?/\+\+|--/.test(c)?b(e):"?"==c?b(n,m(":"),A):b(A):"quasi"==a?g(V,e):";"!=a?"("==a?M(v,")","call",e):"."==a?b(La,e):"["==a?b(l("]"),ga,m("]"),h,e):w&&"as"==c?(d.marked="keyword",b(u,e)):void 0:void 0}function V(a,c){return"quasi"!=a?g():"${"!=c.slice(c.length-2)?b(V):b(n,Ma)}function Ma(a){if("}"==a)return d.marked="string-2",d.state.tokenize=aa,b(V)}function ra(a){return ca(d.stream,d.state),g("{"==a?t:n)}function qa(a){return ca(d.stream,d.state),g("{"==a?t:v)}function Ka(a){return function(c){return"."==
-c?b(a?Na:Oa):g(a?v:n)}}function Oa(a,c){if("target"==c)return d.marked="keyword",b(E)}function Na(a,c){if("target"==c)return d.marked="keyword",b(L)}function Da(a){return":"==a?b(h,t):g(E,m(";"),h)}function La(a){if("variable"==a)return d.marked="property",b()}function ha(a,c){return"async"==a?(d.marked="property",b(ha)):"variable"==a||"keyword"==d.style?(d.marked="property",b("get"==c||"set"==c?Pa:B)):"number"==a||"string"==a?(d.marked=T?"property":d.style+" property",b(B)):"jsonld-keyword"==a?b(B):
-"modifier"==a?b(ha):"["==a?b(n,m("]"),B):"spread"==a?b(n,B):":"==a?g(B):void 0}function Pa(a){return"variable"!=a?g(B):(d.marked="property",b(x))}function B(a){return":"==a?b(v):"("==a?g(x):void 0}function z(a,c,f){function e(A,k){if(f?-1<f.indexOf(A):","==A){var h=d.state.lexical;return"call"==h.info&&(h.pos=(h.pos||0)+1),b(function(b,e){return b==c||e==c?g():g(a)},e)}return A==c||k==c?b():b(m(c))}return function(d,f){return d==c||f==c?b():g(a,e)}}function M(a,c,f){for(var e=3;e<arguments.length;e++)d.cc.push(arguments[e]);
-return b(l(c,f),z(a,c),h)}function U(a){return"}"==a?b():g(t,U)}function N(a,c){if(w){if(":"==a)return b(u);if("?"==c)return b(N)}}function u(a){return"variable"==a?(d.marked="type",b(O)):"string"==a||"number"==a||"atom"==a?b(O):"{"==a?b(l("}"),z(W,"}",",;"),h,O):"("==a?b(z(sa,")"),Qa):void 0}function Qa(a){if("\x3d\x3e"==a)return b(u)}function W(a,c){return"variable"==a||"keyword"==d.style?(d.marked="property",b(W)):"?"==c?b(W):":"==a?b(u):"["==a?b(n,N,m("]"),W):void 0}function sa(a){return"variable"==
-a?b(sa):":"==a?b(u):void 0}function O(a,c){return"\x3c"==c?b(l("\x3e"),z(u,"\x3e"),h,O):"|"==c||"."==a?b(u):"["==a?b(m("]"),O):"extends"==c?b(u):void 0}function da(){return g(y,N,P,Ra)}function y(a,c){return"modifier"==a?b(y):"variable"==a?(I(c),b()):"spread"==a?b(y):"["==a?M(y,"]"):"{"==a?M(Sa,"}"):void 0}function Sa(a,c){return"variable"!=a||d.stream.match(/^\s*:/,!1)?("variable"==a&&(d.marked="property"),"spread"==a?b(y):"}"==a?g():b(m(":"),y,P)):(I(c),b(P))}function P(a,c){if("\x3d"==c)return b(v)}
-function Ra(a){if(","==a)return b(da)}function na(a,c){if("keyword b"==a&&"else"==c)return b(l("form","else"),t,h)}function Ca(a){if("("==a)return b(l(")"),Ta,m(")"),h)}function Ta(a){return"var"==a?b(da,m(";"),X):";"==a?b(X):"variable"==a?b(Ua):g(n,m(";"),X)}function Ua(a,c){return"in"==c||"of"==c?(d.marked="keyword",b(n)):b(E,X)}function X(a,c){return";"==a?b(ta):"in"==c||"of"==c?(d.marked="keyword",b(n)):g(n,m(";"),ta)}function ta(a){")"!=a&&b(n)}function x(a,c){return"*"==c?(d.marked="keyword",
-b(x)):"variable"==a?(I(c),b(x)):"("==a?b(J,l(")"),z(fa,")"),h,N,t,K):w&&"\x3c"==c?b(l("\x3e"),z(u,"\x3e"),h,x):void 0}function fa(a){return"spread"==a?b(fa):g(y,N,P)}function Ha(a,b){return"variable"==a?oa(a,b):Y(a,b)}function oa(a,c){if("variable"==a)return I(c),b(Y)}function Y(a,c){return"\x3c"==c?b(l("\x3e"),z(u,"\x3e"),h,Y):"extends"==c||"implements"==c||w&&","==a?b(w?u:n,Y):"{"==a?b(l("}"),C,h):void 0}function C(a,c){return"variable"==a||"keyword"==d.style?("async"==c||"static"==c||"get"==c||
-"set"==c||w&&("public"==c||"private"==c||"protected"==c||"readonly"==c||"abstract"==c))&&d.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(d.marked="keyword",b(C)):(d.marked="property",b(w?ia:x,C)):"["==a?b(n,m("]"),w?ia:x,C):"*"==c?(d.marked="keyword",b(C)):";"==a?b(C):"}"==a?b():"@"==c?b(n,C):void 0}function ia(a,c){return"?"==c?b(ia):":"==a?b(u,P):"\x3d"==c?b(v):g(x)}function Ea(a,c){return"*"==c?(d.marked="keyword",b(ja,m(";"))):"default"==c?(d.marked="keyword",b(n,m(";"))):"{"==a?b(z(ua,"}"),ja,m(";")):
-g(t)}function ua(a,c){return"as"==c?(d.marked="keyword",b(m("variable"))):"variable"==a?g(v,ua):void 0}function Fa(a){return"string"==a?b():g(Z,va,ja)}function Z(a,c){return"{"==a?M(Z,"}"):("variable"==a&&I(c),"*"==c&&(d.marked="keyword"),b(Va))}function va(a){if(","==a)return b(Z,va)}function Va(a,c){if("as"==c)return d.marked="keyword",b(Z)}function ja(a,c){if("from"==c)return d.marked="keyword",b(n)}function Ja(a){return"]"==a?b():g(z(v,"]"))}var H,Q,F=xa.indentUnit,wa=r.statementIndent,T=r.jsonld,
-G=r.json||T,w=r.typescript,ba=r.wordCharacters||/[\w$\xa1-\uffff]/,la=function(){function a(a){return{type:a,style:"keyword"}}var b=a("keyword a"),d=a("keyword b"),e=a("keyword c"),h=a("operator"),k={type:"atom",style:"atom"},b={"if":a("if"),"while":b,"with":b,"else":d,"do":d,"try":d,"finally":d,"return":e,"break":e,"continue":e,"new":a("new"),"delete":e,"throw":e,"debugger":e,"var":a("var"),"const":a("var"),let:a("var"),"function":a("function"),"catch":a("catch"),"for":a("for"),"switch":a("switch"),
-"case":a("case"),"default":a("default"),"in":h,"typeof":h,"instanceof":h,"true":k,"false":k,"null":k,undefined:k,NaN:k,Infinity:k,"this":a("this"),"class":a("class"),"super":a("atom"),yield:e,"export":a("export"),"import":a("import"),"extends":e,await:e};if(w){var d={type:"variable",style:"type"},e={"interface":a("class"),"implements":e,namespace:e,module:a("module"),"enum":a("module"),"public":a("modifier"),"private":a("modifier"),"protected":a("modifier"),"abstract":a("modifier"),string:d,number:d,
-"boolean":d,any:d},g;for(g in e)b[g]=e[g]}return b}(),S=/[+\-*&%=<>!?|~^@]/,za=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Aa="([{}])",Ga={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},d={state:null,column:null,marked:null,cc:null},Ba={name:"this",next:{name:"arguments"}};return h.lex=!0,{startState:function(a){a={tokenize:D,lastType:"sof",cc:[],lexical:new ma((a||0)-F,0,"block",!1),localVars:r.localVars,context:r.localVars&&
-{vars:r.localVars},indented:a||0};return r.globalVars&&"object"==typeof r.globalVars&&(a.globalVars=r.globalVars),a},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),ca(a,b)),b.tokenize!=R&&a.eatSpace())return null;var f=b.tokenize(a,b);if("comment"!=H){b.lastType="operator"!=H||"++"!=Q&&"--"!=Q?H:"incdec";a:{var e=H,h=Q,k=b.cc;d.state=b;d.stream=a;d.marked=null;d.cc=k;d.style=f;for(b.lexical.hasOwnProperty("align")||(b.lexical.align=
-!0);;)if((k.length?k.pop():G?n:t)(e,h)){for(;k.length&&k[k.length-1].lex;)k.pop()();if(d.marked)f=d.marked;else{if(e="variable"==e)b:{for(e=b.localVars;e;e=e.next)if(e.name==h){e=!0;break b}for(k=b.context;k;k=k.prev)for(e=k.vars;e;e=e.next)if(e.name==h){e=!0;break b}e=void 0}f=e?"variable-2":f}break a}}}return f},indent:function(a,b){if(a.tokenize==R)return p.Pass;if(a.tokenize!=D)return 0;var d,e=b&&b.charAt(0),g=a.lexical;if(!/^\s*else\b/.test(b))for(var k=a.cc.length-1;0<=k;--k){var l=a.cc[k];
-if(l==h)g=g.prev;else if(l!=na)break}for(;!("stat"!=g.type&&"form"!=g.type||"}"!=e&&(!(d=a.cc[a.cc.length-1])||d!=E&&d!=L||/^[,\.=+\-*:?[\(]/.test(b)));)g=g.prev;wa&&")"==g.type&&"stat"==g.prev.type&&(g=g.prev);d=g.type;k=e==d;"vardef"==d?e=g.indented+("operator"==a.lastType||","==a.lastType?g.info+1:0):"form"==d&&"{"==e?e=g.indented:"form"==d?e=g.indented+F:"stat"==d?(e=g.indented,g="operator"==a.lastType||","==a.lastType||S.test(b.charAt(0))||/[,.]/.test(b.charAt(0)),e+=g?wa||F:0):e="switch"!=g.info||
-k||0==r.doubleIndentSwitch?g.align?g.column+(k?0:1):g.indented+(k?0:F):g.indented+(/^(?:case|default)\b/.test(b)?F:2*F);return e},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:G?null:"/*",blockCommentEnd:G?null:"*/",lineComment:G?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:G?"json":"javascript",jsonldMode:T,jsonMode:G,expressionAllowed:ka,skipExpression:function(a){var b=a.cc[a.cc.length-1];b!=n&&b!=v||a.cc.pop()}}});p.registerHelper("wordChars","javascript",
-/[\w$]/);p.defineMIME("text/javascript","javascript");p.defineMIME("text/ecmascript","javascript");p.defineMIME("application/javascript","javascript");p.defineMIME("application/x-javascript","javascript");p.defineMIME("application/ecmascript","javascript");p.defineMIME("application/json",{name:"javascript",json:!0});p.defineMIME("application/x-json",{name:"javascript",json:!0});p.defineMIME("application/ld+json",{name:"javascript",jsonld:!0});p.defineMIME("text/typescript",{name:"javascript",typescript:!0});
-p.defineMIME("application/typescript",{name:"javascript",typescript:!0})});(function(p){"function"==typeof p.define&&p.define("modeJs",["mode/javascript/javascript.js"],function(){})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js
deleted file mode 100644
index 6005e39cf..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js
+++ /dev/null
@@ -1,113 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/xml/xml",["../../lib/codemirror"],e):e(CodeMirror)}(function(e){var A={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,
-dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,
-caseFold:!0},C={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,caseFold:!1};e.defineMode("xml",function(w,x){function f(b,c){function a(g){return c.tokenize=g,g(b,c)}var g=b.next();if("\x3c"==g)return b.eat("!")?b.eat("[")?b.match("CDATA[")?a(u("atom","]]\x3e")):null:b.match("--")?a(u("comment","--\x3e")):b.match("DOCTYPE",!0,!0)?(b.eatWhile(/[\w\._\-]/),a(n(1))):null:b.eat("?")?(b.eatWhile(/[\w\._\-]/),c.tokenize=u("meta","?\x3e"),"meta"):
-(I=b.eat("/")?"closeTag":"openTag",c.tokenize=d,"tag bracket");if("\x26"==g){var e;return e=b.eat("#")?b.eat("x")?b.eatWhile(/[a-fA-F\d]/)&&b.eat(";"):b.eatWhile(/[\d]/)&&b.eat(";"):b.eatWhile(/[\w\.\-:]/)&&b.eat(";"),e?"atom":"error"}return b.eatWhile(/[^&<]/),null}function d(b,c){var a=b.next();return"\x3e"==a||"/"==a&&b.eat("\x3e")?(c.tokenize=f,I="\x3e"==a?"endTag":"selfcloseTag","tag bracket"):"\x3d"==a?(I="equals",null):"\x3c"==a?(c.tokenize=f,c.state=D,c.tagName=c.tagStart=null,(a=c.tokenize(b,
-c))?a+" tag error":"tag error"):/[\'\"]/.test(a)?(c.tokenize=t(a),c.stringStartCol=b.column(),c.tokenize(b,c)):(b.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function t(b){var c=function(c,a){for(;!c.eol();)if(c.next()==b){a.tokenize=d;break}return"string"};return c.isInAttribute=!0,c}function u(b,c){return function(a,g){for(;!a.eol();){if(a.match(c)){g.tokenize=f;break}a.next()}return b}}function n(b){return function(c,a){for(var g;null!=(g=c.next());){if("\x3c"==g)return a.tokenize=
-n(b+1),a.tokenize(c,a);if("\x3e"==g){if(1==b){a.tokenize=f;break}return a.tokenize=n(b-1),a.tokenize(c,a)}}return"meta"}}function y(b,c,a){this.prev=b.context;this.tagName=c;this.indent=b.indented;this.startOfLine=a;(F.doNotIndent.hasOwnProperty(c)||b.context&&b.context.noIndent)&&(this.noIndent=!0)}function m(b){b.context&&(b.context=b.context.prev)}function c(b,c){for(var a;b.context&&(a=b.context.tagName,F.contextGrabbers.hasOwnProperty(a)&&F.contextGrabbers[a].hasOwnProperty(c));)m(b)}function D(b,
-c,a){return"openTag"==b?(a.tagStart=c.column(),z):"closeTag"==b?H:D}function z(b,c,a){return"word"==b?(a.tagName=c.current(),E="tag",k):(E="error",z)}function H(b,c,a){return"word"==b?(b=c.current(),a.context&&a.context.tagName!=b&&F.implicitlyClosed.hasOwnProperty(a.context.tagName)&&m(a),a.context&&a.context.tagName==b||!1===F.matchClosing?(E="tag",v):(E="tag error",p)):(E="error",p)}function v(b,a,c){return"endTag"!=b?(E="error",v):(m(c),D)}function p(b,a,c){return E="error",v(b,a,c)}function k(b,
-g,d){if("word"==b)return E="attribute",a;if("endTag"==b||"selfcloseTag"==b){g=d.tagName;var e=d.tagStart;return d.tagName=d.tagStart=null,"selfcloseTag"==b||F.autoSelfClosers.hasOwnProperty(g)?c(d,g):(c(d,g),d.context=new y(d,g,e==d.indented)),D}return E="error",k}function a(a,c,g){return"equals"==a?b:(F.allowMissing||(E="error"),k(a,c,g))}function b(b,a,c){return"string"==b?g:"word"==b&&F.allowUnquoted?(E="string",k):(E="error",k(b,a,c))}function g(b,a,c){return"string"==b?g:k(b,a,c)}var T=w.indentUnit,
-F={},W=x.htmlMode?A:C,Q;for(Q in W)F[Q]=W[Q];for(Q in x)F[Q]=x[Q];var I,E;return f.isInText=!0,{startState:function(b){var a={tokenize:f,state:D,indented:b||0,tagName:null,tagStart:null,context:null};return null!=b&&(a.baseIndent=b),a},token:function(b,a){if(!a.tagName&&b.sol()&&(a.indented=b.indentation()),b.eatSpace())return null;I=null;var c=a.tokenize(b,a);return(c||I)&&"comment"!=c&&(E=null,a.state=a.state(I||c,b,a),E&&(c="error"==E?c+" error":E)),c},indent:function(b,a,c){var g=b.context;if(b.tokenize.isInAttribute)return b.tagStart==
-b.indented?b.stringStartCol+1:b.indented+T;if(g&&g.noIndent)return e.Pass;if(b.tokenize!=d&&b.tokenize!=f)return c?c.match(/^(\s*)/)[0].length:0;if(b.tagName)return!1!==F.multilineTagIndentPastTag?b.tagStart+b.tagName.length+2:b.tagStart+T*(F.multilineTagIndentFactor||1);if(F.alignCDATA&&/<!\[CDATA\[/.test(a))return 0;if((a=a&&/^<(\/)?([\w_:\.-]*)/.exec(a))&&a[1])for(;g;){if(g.tagName==a[2]){g=g.prev;break}if(!F.implicitlyClosed.hasOwnProperty(g.tagName))break;g=g.prev}else if(a)for(;g;){c=F.contextGrabbers[g.tagName];
-if(!c||!c.hasOwnProperty(a[2]))break;g=g.prev}for(;g&&g.prev&&!g.startOfLine;)g=g.prev;return g?g.indent+T:b.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:F.htmlMode?"html":"xml",helperType:F.htmlMode?"html":"xml",skipAttribute:function(a){a.state==b&&(a.state=k)}}});e.defineMIME("text/xml","xml");e.defineMIME("application/xml","xml");e.mimeModes.hasOwnProperty("text/html")||e.defineMIME("text/html",{name:"xml",htmlMode:!0})});
-(function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/javascript/javascript",["../../lib/codemirror"],e):e(CodeMirror)})(function(e){function A(e,w,x){return/^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(w.lastType)||"quasi"==w.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(x||0)))}e.defineMode("javascript",function(C,w){function x(q,b,a){return Z=q,da=a,b}function f(q,b){var a=
-q.next();if('"'==a||"'"==a)return b.tokenize=d(a),b.tokenize(q,b);if("."==a&&q.match(/^\d+(?:[eE][+\-]?\d+)?/))return x("number","number");if("."==a&&q.match(".."))return x("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(a))return x(a);if("\x3d"==a&&q.eat("\x3e"))return x("\x3d\x3e","operator");if("0"==a&&q.eat(/x/i))return q.eatWhile(/[\da-f]/i),x("number","number");if("0"==a&&q.eat(/o/i))return q.eatWhile(/[0-7]/i),x("number","number");if("0"==a&&q.eat(/b/i))return q.eatWhile(/[01]/i),x("number",
-"number");if(/\d/.test(a))return q.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),x("number","number");if("/"==a){if(q.eat("*"))a=(b.tokenize=t,t(q,b));else if(q.eat("/"))a=(q.skipToEnd(),x("comment","comment"));else if(A(q,b,1)){a:for(var c=!1,h=!1;null!=(a=q.next());){if(!c){if("/"==a&&!h)break a;"["==a?h=!0:h&&"]"==a&&(h=!1)}c=!c&&"\\"==a}a=(q.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/),x("regexp","string-2"))}else a=(q.eatWhile(ea),x("operator","operator",q.current()));return a}if("`"==a)return b.tokenize=
-u,u(q,b);if("#"==a)return q.skipToEnd(),x("error","error");if(ea.test(a))return"\x3e"==a&&b.lexical&&"\x3e"==b.lexical.type||q.eatWhile(ea),x("operator","operator",q.current());if(la.test(a)){q.eatWhile(la);a=q.current();if("."!=b.lastType){if(ua.propertyIsEnumerable(a))return c=ua[a],x(c.type,c.style,a);if("async"==a&&q.match(/^\s*[\(\w]/,!1))return x("async","keyword",a)}return x("variable","variable",a)}}function d(q){return function(b,a){var c,h=!1;if(fa&&"@"==b.peek()&&b.match(Da))return a.tokenize=
-f,x("jsonld-keyword","meta");for(;null!=(c=b.next())&&(c!=q||h);)h=!h&&"\\"==c;return h||(a.tokenize=f),x("string","string")}}function t(q,b){for(var a,c=!1;a=q.next();){if("/"==a&&c){b.tokenize=f;break}c="*"==a}return x("comment","comment")}function u(q,b){for(var a,c=!1;null!=(a=q.next());){if(!c&&("`"==a||"$"==a&&q.eat("{"))){b.tokenize=f;break}c=!c&&"\\"==a}return x("quasi","string-2",q.current())}function n(q,a){a.fatArrowAt&&(a.fatArrowAt=null);var b=q.string.indexOf("\x3d\x3e",q.start);if(!(0>
-b)){if(K){var c=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(q.string.slice(q.start,b));c&&(b=c.index)}for(var c=0,h=!1,b=b-1;0<=b;--b){var g=q.string.charAt(b),l=Ea.indexOf(g);if(0<=l&&3>l){if(!c){++b;break}if(0==--c){"("==g&&(h=!0);break}}else if(3<=l&&6>l)++c;else if(la.test(g))h=!0;else{if(/["'\/]/.test(g))return;if(h&&!c){++b;break}}}h&&!c&&(a.fatArrowAt=b)}}function y(q,b,a,c,h,g){this.indented=q;this.column=b;this.type=a;this.prev=h;this.info=g;null!=c&&(this.align=c)}function m(){for(var q=
-arguments.length-1;0<=q;q--)r.cc.push(arguments[q])}function c(){return m.apply(null,arguments),!0}function D(q){function b(a){for(;a;a=a.next)if(a.name==q)return!0;return!1}var a=r.state;(r.marked="def",a.context)?b(a.localVars)||(a.localVars={name:q,next:a.localVars}):b(a.globalVars)||w.globalVars&&(a.globalVars={name:q,next:a.globalVars})}function z(){r.state.context={prev:r.state.context,vars:r.state.localVars};r.state.localVars=Fa}function H(){r.state.localVars=r.state.context.vars;r.state.context=
-r.state.context.prev}function v(q,a){var b=function(){var b=r.state,c=b.indented;if("stat"==b.lexical.type)c=b.lexical.indented;else for(var h=b.lexical;h&&")"==h.type&&h.align;h=h.prev)c=h.indented;b.lexical=new y(c,r.stream.column(),q,null,b.lexical,a)};return b.lex=!0,b}function p(){var b=r.state;b.lexical.prev&&(")"==b.lexical.type&&(b.indented=b.lexical.indented),b.lexical=b.lexical.prev)}function k(b){function a(h){return h==b?c():";"==b?m():c(a)}return a}function a(q,g){return"var"==q?c(v("vardef",
-g.length),B,k(";"),p):"keyword a"==q?c(v("form"),T,a,p):"keyword b"==q?c(v("form"),a,p):"{"==q?c(v("}"),R,p):";"==q?c():"if"==q?("else"==r.state.lexical.info&&r.state.cc[r.state.cc.length-1]==p&&r.state.cc.pop()(),c(v("form"),T,a,p,va)):"function"==q?c(M):"for"==q?c(v("form"),Ga,a,p):"variable"==q?K&&"type"==g?(r.marked="keyword",c(G,k("operator"),G,k(";"))):c(v("stat"),ma):"switch"==q?c(v("form"),T,k("{"),v("}","switch"),R,p,p):"case"==q?c(b,k(":")):"default"==q?c(k(":")):"catch"==q?c(v("form"),
-z,k("("),na,k(")"),a,p,H):"class"==q?c(v("form"),wa,p):"export"==q?c(v("stat"),Ha,p):"import"==q?c(v("stat"),Ia,p):"module"==q?c(v("form"),h,k("{"),v("}"),R,p,p):"async"==q?c(a):"@"==g?c(b,a):m(v("stat"),b,k(";"),p)}function b(b){return F(b,!1)}function g(b){return F(b,!0)}function T(a){return"("!=a?m():c(v(")"),b,k(")"),p)}function F(a,l){if(r.state.fatArrowAt==r.stream.start){var d=l?ta:sa;if("("==a)return c(z,v(")"),J(h,")"),p,k("\x3d\x3e"),d,H);if("variable"==a)return m(z,h,k("\x3d\x3e"),d,H)}d=
-l?E:I;return Ja.hasOwnProperty(a)?c(d):"function"==a?c(M,d):"class"==a?c(v("form"),Ka,p):"keyword c"==a||"async"==a?c(l?Q:W):"("==a?c(v(")"),W,k(")"),p,d):"operator"==a||"spread"==a?c(l?g:b):"["==a?c(v("]"),La,p,d):"{"==a?N(aa,"}",null,d):"quasi"==a?m(ba,d):"new"==a?c(Ca(l)):c()}function W(a){return a.match(/[;\}\)\],]/)?m():m(b)}function Q(a){return a.match(/[;\}\)\],]/)?m():m(g)}function I(a,h){return","==a?c(b):E(a,h,!1)}function E(a,h,l){var d=0==l?I:E,e=0==l?b:g;return"\x3d\x3e"==a?c(z,l?ta:
-sa,H):"operator"==a?/\+\+|--/.test(h)?c(d):"?"==h?c(b,k(":"),e):c(e):"quasi"==a?m(ba,d):";"!=a?"("==a?N(g,")","call",d):"."==a?c(S,d):"["==a?c(v("]"),W,k("]"),p,d):K&&"as"==h?(r.marked="keyword",c(G,d)):void 0:void 0}function ba(a,h){return"quasi"!=a?m():"${"!=h.slice(h.length-2)?c(ba):c(b,Ba)}function Ba(a){if("}"==a)return r.marked="string-2",r.state.tokenize=u,c(ba)}function sa(q){return n(r.stream,r.state),m("{"==q?a:b)}function ta(b){return n(r.stream,r.state),m("{"==b?a:g)}function Ca(a){return function(h){return"."==
-h?c(a?oa:ca):m(a?g:b)}}function ca(a,b){if("target"==b)return r.marked="keyword",c(I)}function oa(a,b){if("target"==b)return r.marked="keyword",c(E)}function ma(b){return":"==b?c(p,a):m(I,k(";"),p)}function S(a){if("variable"==a)return r.marked="property",c()}function aa(a,h){return"async"==a?(r.marked="property",c(aa)):"variable"==a||"keyword"==r.style?(r.marked="property",c("get"==h||"set"==h?pa:O)):"number"==a||"string"==a?(r.marked=fa?"property":r.style+" property",c(O)):"jsonld-keyword"==a?c(O):
-"modifier"==a?c(aa):"["==a?c(b,k("]"),O):"spread"==a?c(b,O):":"==a?m(O):void 0}function pa(a){return"variable"!=a?m(O):(r.marked="property",c(M))}function O(a){return":"==a?c(g):"("==a?m(M):void 0}function J(a,b,h){function g(l,d){if(h?-1<h.indexOf(l):","==l){var e=r.state.lexical;return"call"==e.info&&(e.pos=(e.pos||0)+1),c(function(c,h){return c==b||h==b?m():m(a)},g)}return l==b||d==b?c():c(k(b))}return function(h,l){return h==b||l==b?c():m(a,g)}}function N(a,b,h){for(var g=3;g<arguments.length;g++)r.cc.push(arguments[g]);
-return c(v(b,h),J(a,b),p)}function R(b){return"}"==b?c():m(a,R)}function P(a,b){if(K){if(":"==a)return c(G);if("?"==b)return c(P)}}function G(a){return"variable"==a?(r.marked="type",c(U)):"string"==a||"number"==a||"atom"==a?c(U):"{"==a?c(v("}"),J(L,"}",",;"),p,U):"("==a?c(J(ga,")"),ha):void 0}function ha(a){if("\x3d\x3e"==a)return c(G)}function L(a,h){return"variable"==a||"keyword"==r.style?(r.marked="property",c(L)):"?"==h?c(L):":"==a?c(G):"["==a?c(b,P,k("]"),L):void 0}function ga(a){return"variable"==
-a?c(ga):":"==a?c(G):void 0}function U(a,b){return"\x3c"==b?c(v("\x3e"),J(G,"\x3e"),p,U):"|"==b||"."==a?c(G):"["==a?c(k("]"),U):"extends"==b?c(G):void 0}function B(){return m(h,P,l,Ma)}function h(a,b){return"modifier"==a?c(h):"variable"==a?(D(b),c()):"spread"==a?c(h):"["==a?N(h,"]"):"{"==a?N(Na,"}"):void 0}function Na(a,b){return"variable"!=a||r.stream.match(/^\s*:/,!1)?("variable"==a&&(r.marked="property"),"spread"==a?c(h):"}"==a?m():c(k(":"),h,l)):(D(b),c(l))}function l(a,b){if("\x3d"==b)return c(g)}
-function Ma(a){if(","==a)return c(B)}function va(b,h){if("keyword b"==b&&"else"==h)return c(v("form","else"),a,p)}function Ga(a){if("("==a)return c(v(")"),Oa,k(")"),p)}function Oa(a){return"var"==a?c(B,k(";"),ia):";"==a?c(ia):"variable"==a?c(Pa):m(b,k(";"),ia)}function Pa(a,h){return"in"==h||"of"==h?(r.marked="keyword",c(b)):c(I,ia)}function ia(a,h){return";"==a?c(xa):"in"==h||"of"==h?(r.marked="keyword",c(b)):m(b,k(";"),xa)}function xa(a){")"!=a&&c(b)}function M(b,h){return"*"==h?(r.marked="keyword",
-c(M)):"variable"==b?(D(h),c(M)):"("==b?c(z,v(")"),J(na,")"),p,P,a,H):K&&"\x3c"==h?c(v("\x3e"),J(G,"\x3e"),p,M):void 0}function na(a){return"spread"==a?c(na):m(h,P,l)}function Ka(a,b){return"variable"==a?wa(a,b):ja(a,b)}function wa(a,b){if("variable"==a)return D(b),c(ja)}function ja(a,h){return"\x3c"==h?c(v("\x3e"),J(G,"\x3e"),p,ja):"extends"==h||"implements"==h||K&&","==a?c(K?G:b,ja):"{"==a?c(v("}"),V,p):void 0}function V(a,h){return"variable"==a||"keyword"==r.style?("async"==h||"static"==h||"get"==
-h||"set"==h||K&&("public"==h||"private"==h||"protected"==h||"readonly"==h||"abstract"==h))&&r.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(r.marked="keyword",c(V)):(r.marked="property",c(K?qa:M,V)):"["==a?c(b,k("]"),K?qa:M,V):"*"==h?(r.marked="keyword",c(V)):";"==a?c(V):"}"==a?c():"@"==h?c(b,V):void 0}function qa(a,b){return"?"==b?c(qa):":"==a?c(G,l):"\x3d"==b?c(g):m(M)}function Ha(h,g){return"*"==g?(r.marked="keyword",c(ra,k(";"))):"default"==g?(r.marked="keyword",c(b,k(";"))):"{"==h?c(J(ya,"}"),ra,
-k(";")):m(a)}function ya(a,b){return"as"==b?(r.marked="keyword",c(k("variable"))):"variable"==a?m(g,ya):void 0}function Ia(a){return"string"==a?c():m(ka,za,ra)}function ka(a,b){return"{"==a?N(ka,"}"):("variable"==a&&D(b),"*"==b&&(r.marked="keyword"),c(Qa))}function za(a){if(","==a)return c(ka,za)}function Qa(a,b){if("as"==b)return r.marked="keyword",c(ka)}function ra(a,h){if("from"==h)return r.marked="keyword",c(b)}function La(a){return"]"==a?c():m(J(g,"]"))}var Z,da,X=C.indentUnit,Aa=w.statementIndent,
-fa=w.jsonld,Y=w.json||fa,K=w.typescript,la=w.wordCharacters||/[\w$\xa1-\uffff]/,ua=function(){function a(b){return{type:b,style:"keyword"}}var b=a("keyword a"),h=a("keyword b"),c=a("keyword c"),g=a("operator"),l={type:"atom",style:"atom"},b={"if":a("if"),"while":b,"with":b,"else":h,"do":h,"try":h,"finally":h,"return":c,"break":c,"continue":c,"new":a("new"),"delete":c,"throw":c,"debugger":c,"var":a("var"),"const":a("var"),let:a("var"),"function":a("function"),"catch":a("catch"),"for":a("for"),"switch":a("switch"),
-"case":a("case"),"default":a("default"),"in":g,"typeof":g,"instanceof":g,"true":l,"false":l,"null":l,undefined:l,NaN:l,Infinity:l,"this":a("this"),"class":a("class"),"super":a("atom"),yield:c,"export":a("export"),"import":a("import"),"extends":c,await:c};if(K){var h={type:"variable",style:"type"},c={"interface":a("class"),"implements":c,namespace:c,module:a("module"),"enum":a("module"),"public":a("modifier"),"private":a("modifier"),"protected":a("modifier"),"abstract":a("modifier"),string:h,number:h,
-"boolean":h,any:h},d;for(d in c)b[d]=c[d]}return b}(),ea=/[+\-*&%=<>!?|~^@]/,Da=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Ea="([{}])",Ja={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},r={state:null,column:null,marked:null,cc:null},Fa={name:"this",next:{name:"arguments"}};return p.lex=!0,{startState:function(a){a={tokenize:f,lastType:"sof",cc:[],lexical:new y((a||0)-X,0,"block",!1),localVars:w.localVars,context:w.localVars&&
-{vars:w.localVars},indented:a||0};return w.globalVars&&"object"==typeof w.globalVars&&(a.globalVars=w.globalVars),a},token:function(h,c){if(h.sol()&&(c.lexical.hasOwnProperty("align")||(c.lexical.align=!1),c.indented=h.indentation(),n(h,c)),c.tokenize!=t&&h.eatSpace())return null;var g=c.tokenize(h,c);if("comment"!=Z){c.lastType="operator"!=Z||"++"!=da&&"--"!=da?Z:"incdec";a:{var l=Z,d=da,e=c.cc;r.state=c;r.stream=h;r.marked=null;r.cc=e;r.style=g;for(c.lexical.hasOwnProperty("align")||(c.lexical.align=
-!0);;)if((e.length?e.pop():Y?b:a)(l,d)){for(;e.length&&e[e.length-1].lex;)e.pop()();if(r.marked)g=r.marked;else{if(l="variable"==l)b:{for(l=c.localVars;l;l=l.next)if(l.name==d){l=!0;break b}for(e=c.context;e;e=e.prev)for(l=e.vars;l;l=l.next)if(l.name==d){l=!0;break b}l=void 0}g=l?"variable-2":g}break a}}}return g},indent:function(a,b){if(a.tokenize==t)return e.Pass;if(a.tokenize!=f)return 0;var h,c=b&&b.charAt(0),l=a.lexical;if(!/^\s*else\b/.test(b))for(var g=a.cc.length-1;0<=g;--g){var d=a.cc[g];
-if(d==p)l=l.prev;else if(d!=va)break}for(;!("stat"!=l.type&&"form"!=l.type||"}"!=c&&(!(h=a.cc[a.cc.length-1])||h!=I&&h!=E||/^[,\.=+\-*:?[\(]/.test(b)));)l=l.prev;Aa&&")"==l.type&&"stat"==l.prev.type&&(l=l.prev);h=l.type;g=c==h;"vardef"==h?c=l.indented+("operator"==a.lastType||","==a.lastType?l.info+1:0):"form"==h&&"{"==c?c=l.indented:"form"==h?c=l.indented+X:"stat"==h?(c=l.indented,l="operator"==a.lastType||","==a.lastType||ea.test(b.charAt(0))||/[,.]/.test(b.charAt(0)),c+=l?Aa||X:0):c="switch"!=
-l.info||g||0==w.doubleIndentSwitch?l.align?l.column+(g?0:1):l.indented+(g?0:X):l.indented+(/^(?:case|default)\b/.test(b)?X:2*X);return c},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:Y?null:"/*",blockCommentEnd:Y?null:"*/",lineComment:Y?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:Y?"json":"javascript",jsonldMode:fa,jsonMode:Y,expressionAllowed:A,skipExpression:function(a){var h=a.cc[a.cc.length-1];h!=b&&h!=g||a.cc.pop()}}});e.registerHelper("wordChars",
-"javascript",/[\w$]/);e.defineMIME("text/javascript","javascript");e.defineMIME("text/ecmascript","javascript");e.defineMIME("application/javascript","javascript");e.defineMIME("application/x-javascript","javascript");e.defineMIME("application/ecmascript","javascript");e.defineMIME("application/json",{name:"javascript",json:!0});e.defineMIME("application/x-json",{name:"javascript",json:!0});e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0});e.defineMIME("text/typescript",{name:"javascript",
-typescript:!0});e.defineMIME("application/typescript",{name:"javascript",typescript:!0})});
-(function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/css/css",["../../lib/codemirror"],e):e(CodeMirror)})(function(e){function A(a){for(var b={},c=0;c<a.length;++c)b[a[c].toLowerCase()]=!0;return b}function C(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}e.defineMode("css",function(a,b){function c(a,b){var l=a.next();if(v[l]){var g=v[l](a,
-b);if(!1!==g)return g}"@"==l?(a.eatWhile(/[\w\\\-]/),l=(p=a.current(),"def")):l="\x3d"==l||("~"==l||"|"==l)&&a.eat("\x3d")?(p="compare",null):'"'==l||"'"==l?(b.tokenize=d(l),b.tokenize(a,b)):"#"==l?(a.eatWhile(/[\w\\\-]/),p="hash","atom"):"!"==l?(a.match(/^\s*\w*/),p="important","keyword"):/\d/.test(l)||"."==l&&a.eat(/\d/)?(a.eatWhile(/[\w.%]/),p="unit","number"):"-"!==l?/[,+>*\/]/.test(l)?(p="select-op",null):"."==l&&a.match(/^-?[_a-z][_a-z0-9-]*/i)?(p="qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(l)?
-(p=l,null):"u"==l&&a.match(/rl(-prefix)?\(/)||"d"==l&&a.match("omain(")||"r"==l&&a.match("egexp(")?(a.backUp(1),b.tokenize=y,p="word","property"):/[\w\\\-]/.test(l)?(a.eatWhile(/[\w\\\-]/),p="word","property"):(p=null,null):/[\d.]/.test(a.peek())?(a.eatWhile(/[\w.%]/),p="unit","number"):a.match(/^-[\w\\\-]+/)?(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?(p="variable-definition","variable-2"):(p="variable","variable-2")):a.match(/^\w+-/)?(p="meta","meta"):void 0;return l}function d(a){return function(b,
-c){for(var g,d=!1;null!=(g=b.next());){if(g==a&&!d){")"==a&&b.backUp(1);break}d=!d&&"\\"==g}return(g==a||!d&&")"!=a)&&(c.tokenize=null),p="string","string"}}function y(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=d(")"),p="(",null}function m(a,b,c){this.type=a;this.indent=b;this.prev=c}function n(a,b,c,g){return a.context=new m(c,b.indentation()+(!1===g?0:D),a.context),c}function t(a){return a.context.prev&&(a.context=a.context.prev),a.context.type}function f(a,b,c,g){for(g=
-g||1;0<g;g--)c.context=c.context.prev;return B[c.context.type](a,b,c)}function u(a){a=a.current().toLowerCase();k=ha.hasOwnProperty(a)?"atom":G.hasOwnProperty(a)?"keyword":"variable"}var z=b.inline;b.propertyKeywords||(b=e.resolveMode("text/css"));var p,k,D=a.indentUnit,v=b.tokenHooks,w=b.documentTypes||{},x=b.mediaTypes||{},A=b.mediaFeatures||{},H=b.mediaValueKeywords||{},C=b.propertyKeywords||{},N=b.nonStandardPropertyKeywords||{},R=b.fontProperties||{},P=b.counterDescriptors||{},G=b.colorKeywords||
-{},ha=b.valueKeywords||{},L=b.allowNested,ga=b.lineComment,U=!0===b.supportsAtComponent,B={};return B.top=function(a,b,c){if("{"==a)return n(c,b,"block");if("}"==a&&c.context.prev)return t(c);if(U&&/@component/.test(a))return n(c,b,"atComponentBlock");if(/^@(-moz-)?document$/.test(a))return n(c,b,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/.test(a))return n(c,b,"atBlock");if(/^@(font-face|counter-style)/.test(a))return c.stateArg=a,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return"keyframes";
-if(a&&"@"==a.charAt(0))return n(c,b,"at");if("hash"==a)k="builtin";else if("word"==a)k="tag";else{if("variable-definition"==a)return"maybeprop";if("interpolation"==a)return n(c,b,"interpolation");if(":"==a)return"pseudo";if(L&&"("==a)return n(c,b,"parens")}return c.context.type},B.block=function(a,b,c){return"word"==a?(a=b.current().toLowerCase(),C.hasOwnProperty(a)?(k="property","maybeprop"):N.hasOwnProperty(a)?(k="string-2","maybeprop"):L?(k=b.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):
-(k+=" error","maybeprop")):"meta"==a?"block":L||"hash"!=a&&"qualifier"!=a?B.top(a,b,c):(k="error","block")},B.maybeprop=function(a,b,c){return":"==a?n(c,b,"prop"):B[c.context.type](a,b,c)},B.prop=function(a,b,c){if(";"==a)return t(c);if("{"==a&&L)return n(c,b,"propBlock");if("}"==a||"{"==a)return f(a,b,c);if("("==a)return n(c,b,"parens");if("hash"!=a||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(b.current()))if("word"==a)u(b);else{if("interpolation"==a)return n(c,b,"interpolation")}else k+=
-" error";return"prop"},B.propBlock=function(a,b,c){return"}"==a?t(c):"word"==a?(k="property","maybeprop"):c.context.type},B.parens=function(a,b,c){return"{"==a||"}"==a?f(a,b,c):")"==a?t(c):"("==a?n(c,b,"parens"):"interpolation"==a?n(c,b,"interpolation"):("word"==a&&u(b),"parens")},B.pseudo=function(a,b,c){return"meta"==a?"pseudo":"word"==a?(k="variable-3",c.context.type):B[c.context.type](a,b,c)},B.documentTypes=function(a,b,c){return"word"==a&&w.hasOwnProperty(b.current())?(k="tag",c.context.type):
-B.atBlock(a,b,c)},B.atBlock=function(a,b,c){if("("==a)return n(c,b,"atBlock_parens");if("}"==a||";"==a)return f(a,b,c);if("{"==a)return t(c)&&n(c,b,L?"block":"top");if("interpolation"==a)return n(c,b,"interpolation");"word"==a&&(a=b.current().toLowerCase(),k="only"==a||"not"==a||"and"==a||"or"==a?"keyword":x.hasOwnProperty(a)?"attribute":A.hasOwnProperty(a)?"property":H.hasOwnProperty(a)?"keyword":C.hasOwnProperty(a)?"property":N.hasOwnProperty(a)?"string-2":ha.hasOwnProperty(a)?"atom":G.hasOwnProperty(a)?
-"keyword":"error");return c.context.type},B.atComponentBlock=function(a,b,c){return"}"==a?f(a,b,c):"{"==a?t(c)&&n(c,b,L?"block":"top",!1):("word"==a&&(k="error"),c.context.type)},B.atBlock_parens=function(a,b,c){return")"==a?t(c):"{"==a||"}"==a?f(a,b,c,2):B.atBlock(a,b,c)},B.restricted_atBlock_before=function(a,b,c){return"{"==a?n(c,b,"restricted_atBlock"):"word"==a&&"@counter-style"==c.stateArg?(k="variable","restricted_atBlock_before"):B[c.context.type](a,b,c)},B.restricted_atBlock=function(a,b,
-c){return"}"==a?(c.stateArg=null,t(c)):"word"==a?(k="@font-face"==c.stateArg&&!R.hasOwnProperty(b.current().toLowerCase())||"@counter-style"==c.stateArg&&!P.hasOwnProperty(b.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},B.keyframes=function(a,b,c){return"word"==a?(k="variable","keyframes"):"{"==a?n(c,b,"top"):B[c.context.type](a,b,c)},B.at=function(a,b,c){return";"==a?t(c):"{"==a||"}"==a?f(a,b,c):("word"==a?k="tag":"hash"==a&&(k="builtin"),"at")},B.interpolation=function(a,
-b,c){return"}"==a?t(c):"{"==a||";"==a?f(a,b,c):("word"==a?k="variable":"variable"!=a&&"("!=a&&")"!=a&&(k="error"),"interpolation")},{startState:function(a){return{tokenize:null,state:z?"block":"top",stateArg:null,context:new m(z?"block":"top",a||0,null)}},token:function(a,b){if(!b.tokenize&&a.eatSpace())return null;var g=(b.tokenize||c)(a,b);return g&&"object"==typeof g&&(p=g[1],g=g[0]),k=g,b.state=B[b.state](p,a,b),k},indent:function(a,b){var c=a.context,g=b&&b.charAt(0),d=c.indent;return"prop"!=
-c.type||"}"!=g&&")"!=g||(c=c.prev),c.prev&&("}"!=g||"block"!=c.type&&"top"!=c.type&&"interpolation"!=c.type&&"restricted_atBlock"!=c.type?(")"!=g||"parens"!=c.type&&"atBlock_parens"!=c.type)&&("{"!=g||"at"!=c.type&&"atBlock"!=c.type)||(d=Math.max(0,c.indent-D)):(c=c.prev,d=c.indent)),d},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:ga,fold:"brace"}});var w=["domain","regexp","url","url-prefix"],x=A(w),f="all aural braille handheld print projection screen tty tv embossed".split(" "),
-d=A(f),t="width min-width max-width height min-height max-height device-width min-device-width max-device-width device-height min-device-height max-device-height aspect-ratio min-aspect-ratio max-aspect-ratio device-aspect-ratio min-device-aspect-ratio max-device-aspect-ratio color min-color max-color color-index min-color-index max-color-index monochrome min-monochrome max-monochrome resolution min-resolution max-resolution scan grid orientation device-pixel-ratio min-device-pixel-ratio max-device-pixel-ratio pointer any-pointer hover any-hover".split(" "),
-u=A(t),n="landscape portrait none coarse fine on-demand hover interlace progressive".split(" "),y=A(n),m="align-content align-items align-self alignment-adjust alignment-baseline anchor-point animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function appearance azimuth backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size baseline-shift binding bleed bookmark-label bookmark-level bookmark-state bookmark-target border border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side caret-color clear clip color color-profile column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width columns content counter-increment counter-reset crop cue cue-after cue-before cursor direction display dominant-baseline drop-initial-after-adjust drop-initial-after-align drop-initial-before-adjust drop-initial-before-align drop-initial-size drop-initial-value elevation empty-cells fit fit-position flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float float-offset flow-from flow-into font font-feature-settings font-family font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-rows grid-column grid-column-end grid-column-gap grid-column-start grid-gap grid-row grid-row-end grid-row-gap grid-row-start grid-template grid-template-areas grid-template-columns grid-template-rows hanging-punctuation height hyphens icon image-orientation image-rendering image-resolution inline-box-align justify-content justify-items justify-self left letter-spacing line-break line-height line-stacking line-stacking-ruby line-stacking-shift line-stacking-strategy list-style list-style-image list-style-position list-style-type margin margin-bottom margin-left margin-right margin-top marks marquee-direction marquee-loop marquee-play-count marquee-speed marquee-style max-height max-width min-height min-width move-to nav-down nav-index nav-left nav-right nav-up object-fit object-position opacity order orphans outline outline-color outline-offset outline-style outline-width overflow overflow-style overflow-wrap overflow-x overflow-y padding padding-bottom padding-left padding-right padding-top page page-break-after page-break-before page-break-inside page-policy pause pause-after pause-before perspective perspective-origin pitch pitch-range place-content place-items place-self play-during position presentation-level punctuation-trim quotes region-break-after region-break-before region-break-inside region-fragment rendering-intent resize rest rest-after rest-before richness right rotation rotation-point ruby-align ruby-overhang ruby-position ruby-span shape-image-threshold shape-inside shape-margin shape-outside size speak speak-as speak-header speak-numeral speak-punctuation speech-rate stress string-set tab-size table-layout target target-name target-new target-position text-align text-align-last text-decoration text-decoration-color text-decoration-line text-decoration-skip text-decoration-style text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-height text-indent text-justify text-outline text-overflow text-shadow text-size-adjust text-space-collapse text-transform text-underline-position text-wrap top transform transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi user-select vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-range voice-rate voice-stress voice-volume volume white-space widows width will-change word-break word-spacing word-wrap z-index clip-path clip-rule mask enable-background filter flood-color flood-opacity lighting-color stop-color stop-opacity pointer-events color-interpolation color-interpolation-filters color-rendering fill fill-opacity fill-rule image-rendering marker marker-end marker-mid marker-start shape-rendering stroke stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-rendering baseline-shift dominant-baseline glyph-orientation-horizontal glyph-orientation-vertical text-anchor writing-mode".split(" "),
-c=A(m),D="scrollbar-arrow-color scrollbar-base-color scrollbar-dark-shadow-color scrollbar-face-color scrollbar-highlight-color scrollbar-shadow-color scrollbar-3d-light-color scrollbar-track-color shape-inside searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration zoom".split(" "),z=A(D),H=A("font-family src unicode-range font-variant font-feature-settings font-stretch font-weight font-style".split(" ")),v=A("additive-symbols fallback negative pad prefix range speak-as suffix symbols system".split(" ")),
-p="aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkturquoise darkviolet deeppink deepskyblue dimgray dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray grey green greenyellow honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightpink lightsalmon lightseagreen lightskyblue lightslategray lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple rebeccapurple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen".split(" "),
-k=A(p),a="above absolute activeborder additive activecaption afar after-white-space ahead alias all all-scroll alphabetic alternate always amharic amharic-abegede antialiased appworkspace arabic-indic armenian asterisks attr auto auto-flow avoid avoid-column avoid-page avoid-region background backwards baseline below bidi-override binary bengali blink block block-axis bold bolder border border-box both bottom break break-all break-word bullets button button-bevel buttonface buttonhighlight buttonshadow buttontext calc cambodian capitalize caps-lock-indicator caption captiontext caret cell center checkbox circle cjk-decimal cjk-earthly-branch cjk-heavenly-stem cjk-ideographic clear clip close-quote col-resize collapse color color-burn color-dodge column column-reverse compact condensed contain content contents content-box context-menu continuous copy counter counters cover crop cross crosshair currentcolor cursive cyclic darken dashed decimal decimal-leading-zero default default-button dense destination-atop destination-in destination-out destination-over devanagari difference disc discard disclosure-closed disclosure-open document dot-dash dot-dot-dash dotted double down e-resize ease ease-in ease-in-out ease-out element ellipse ellipsis embed end ethiopic ethiopic-abegede ethiopic-abegede-am-et ethiopic-abegede-gez ethiopic-abegede-ti-er ethiopic-abegede-ti-et ethiopic-halehame-aa-er ethiopic-halehame-aa-et ethiopic-halehame-am-et ethiopic-halehame-gez ethiopic-halehame-om-et ethiopic-halehame-sid-et ethiopic-halehame-so-et ethiopic-halehame-ti-er ethiopic-halehame-ti-et ethiopic-halehame-tig ethiopic-numeric ew-resize exclusion expanded extends extra-condensed extra-expanded fantasy fast fill fixed flat flex flex-end flex-start footnotes forwards from geometricPrecision georgian graytext grid groove gujarati gurmukhi hand hangul hangul-consonant hard-light hebrew help hidden hide higher highlight highlighttext hiragana hiragana-iroha horizontal hsl hsla hue icon ignore inactiveborder inactivecaption inactivecaptiontext infinite infobackground infotext inherit initial inline inline-axis inline-block inline-flex inline-grid inline-table inset inside intrinsic invert italic japanese-formal japanese-informal justify kannada katakana katakana-iroha keep-all khmer korean-hangul-formal korean-hanja-formal korean-hanja-informal landscape lao large larger left level lighter lighten line-through linear linear-gradient lines list-item listbox listitem local logical loud lower lower-alpha lower-armenian lower-greek lower-hexadecimal lower-latin lower-norwegian lower-roman lowercase ltr luminosity malayalam match matrix matrix3d media-controls-background media-current-time-display media-fullscreen-button media-mute-button media-play-button media-return-to-realtime-button media-rewind-button media-seek-back-button media-seek-forward-button media-slider media-sliderthumb media-time-remaining-display media-volume-slider media-volume-slider-container media-volume-sliderthumb medium menu menulist menulist-button menulist-text menulist-textfield menutext message-box middle min-intrinsic mix mongolian monospace move multiple multiply myanmar n-resize narrower ne-resize nesw-resize no-close-quote no-drop no-open-quote no-repeat none normal not-allowed nowrap ns-resize numbers numeric nw-resize nwse-resize oblique octal opacity open-quote optimizeLegibility optimizeSpeed oriya oromo outset outside outside-shape overlay overline padding padding-box painted page paused persian perspective plus-darker plus-lighter pointer polygon portrait pre pre-line pre-wrap preserve-3d progress push-button radial-gradient radio read-only read-write read-write-plaintext-only rectangle region relative repeat repeating-linear-gradient repeating-radial-gradient repeat-x repeat-y reset reverse rgb rgba ridge right rotate rotate3d rotateX rotateY rotateZ round row row-resize row-reverse rtl run-in running s-resize sans-serif saturation scale scale3d scaleX scaleY scaleZ screen scroll scrollbar scroll-position se-resize searchfield searchfield-cancel-button searchfield-decoration searchfield-results-button searchfield-results-decoration self-start self-end semi-condensed semi-expanded separate serif show sidama simp-chinese-formal simp-chinese-informal single skew skewX skewY skip-white-space slide slider-horizontal slider-vertical sliderthumb-horizontal sliderthumb-vertical slow small small-caps small-caption smaller soft-light solid somali source-atop source-in source-out source-over space space-around space-between space-evenly spell-out square square-button start static status-bar stretch stroke sub subpixel-antialiased super sw-resize symbolic symbols system-ui table table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group tamil telugu text text-bottom text-top textarea textfield thai thick thin threeddarkshadow threedface threedhighlight threedlightshadow threedshadow tibetan tigre tigrinya-er tigrinya-er-abegede tigrinya-et tigrinya-et-abegede to top trad-chinese-formal trad-chinese-informal transform translate translate3d translateX translateY translateZ transparent ultra-condensed ultra-expanded underline unset up upper-alpha upper-armenian upper-greek upper-hexadecimal upper-latin upper-norwegian upper-roman uppercase urdu url var vertical vertical-text visible visibleFill visiblePainted visibleStroke visual w-resize wait wave wider window windowframe windowtext words wrap wrap-reverse x-large x-small xor xx-large xx-small".split(" "),
-b=A(a),w=w.concat(f).concat(t).concat(n).concat(m).concat(D).concat(p).concat(a);e.registerHelper("hintWords","css",w);e.defineMIME("text/css",{documentTypes:x,mediaTypes:d,mediaFeatures:u,mediaValueKeywords:y,propertyKeywords:c,nonStandardPropertyKeywords:z,fontProperties:H,counterDescriptors:v,colorKeywords:k,valueKeywords:b,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=C,C(a,b))}},name:"css"});e.defineMIME("text/x-scss",{mediaTypes:d,mediaFeatures:u,mediaValueKeywords:y,propertyKeywords:c,
-nonStandardPropertyKeywords:z,colorKeywords:k,valueKeywords:b,fontProperties:H,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=C,C(a,b)):["operator","operator"]},":":function(a){return!!a.match(/\s*\{/,!1)&&[null,null]},$:function(a){return a.match(/^[\w-]+/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return!!a.eat("{")&&[null,"interpolation"]}},name:"css",
-helperType:"scss"});e.defineMIME("text/x-less",{mediaTypes:d,mediaFeatures:u,mediaValueKeywords:y,propertyKeywords:c,nonStandardPropertyKeywords:z,colorKeywords:k,valueKeywords:b,fontProperties:H,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=C,C(a,b)):["operator","operator"]},"@":function(a){return a.eat("{")?[null,"interpolation"]:!a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/,
-!1)&&(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"\x26":function(){return["atom","atom"]}},name:"css",helperType:"less"});e.defineMIME("text/x-gss",{documentTypes:x,mediaTypes:d,mediaFeatures:u,propertyKeywords:c,nonStandardPropertyKeywords:z,fontProperties:H,counterDescriptors:v,colorKeywords:k,valueKeywords:b,supportsAtComponent:!0,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=C,C(a,b))}},name:"css",helperType:"gss"})});
-(function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define("mode/htmlmixed/htmlmixed",["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],e):e(CodeMirror)})(function(e){function A(d,e){var u=d.match(f[e]||(f[e]=new RegExp("\\s+"+e+"\\s*\x3d\\s*('|\")?([^'\"]+)('|\")?\\s*")));return u?/^\s*(.*?)\s*$/.exec(u[2])[1]:
-""}function C(d,e){for(var f in d)for(var n=e[f]||(e[f]=[]),y=d[f],m=y.length-1;0<=m;m--)n.unshift(y[m])}function w(d,e){for(var f=0;f<d.length;f++){var n=d[f];if(!n[0]||n[1].test(A(e,n[0])))return n[2]}}var x={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],
-[null,null,"css"]]},f={};e.defineMode("htmlmixed",function(d,f){function u(c,f){var m,t=n.token(c,f.htmlState),p=/\btag\b/.test(t);if(p&&!/[<>\s\/]/.test(c.current())&&(m=f.htmlState.tagName&&f.htmlState.tagName.toLowerCase())&&y.hasOwnProperty(m))f.inTag=m+" ";else if(f.inTag&&p&&/>$/.test(c.current())){m=/^([\S]+) (.*)/.exec(f.inTag);f.inTag=null;var p="\x3e"==c.current()&&w(y[m[1]],m[2]),p=e.getMode(d,p),k=new RegExp("^\x3c/s*"+m[1]+"s*\x3e","i"),a=new RegExp("\x3c/s*"+m[1]+"s*\x3e","i");f.token=
-function(b,c){var d;if(b.match(k,!1))d=(c.token=u,c.localState=c.localMode=null,null);else{d=c.localMode.token(b,c.localState);var e=b.current(),f=e.search(a);d=(-1<f?b.backUp(e.length-f):e.match(/<\/?$/)&&(b.backUp(e.length),b.match(a,!1)||b.match(e)),d)}return d};f.localMode=p;f.localState=e.startState(p,n.indent(f.htmlState,""))}else f.inTag&&(f.inTag+=c.current(),c.eol()&&(f.inTag+=" "));return t}var n=e.getMode(d,{name:"xml",htmlMode:!0,multilineTagIndentFactor:f.multilineTagIndentFactor,multilineTagIndentPastTag:f.multilineTagIndentPastTag}),
-y={},m=f&&f.tags,c=f&&f.scriptTypes;if(C(x,y),m&&C(m,y),c)for(m=c.length-1;0<=m;m--)y.script.unshift(["type",c[m].matches,c[m].mode]);return{startState:function(){return{token:u,inTag:null,localMode:null,localState:null,htmlState:e.startState(n)}},copyState:function(c){var d;return c.localState&&(d=e.copyState(c.localMode,c.localState)),{token:c.token,inTag:c.inTag,localMode:c.localMode,localState:d,htmlState:e.copyState(n,c.htmlState)}},token:function(c,d){return d.token(c,d)},indent:function(c,
-d,f){return!c.localMode||/^\s*<\//.test(d)?n.indent(c.htmlState,d):c.localMode.indent?c.localMode.indent(c.localState,d,f):e.Pass},innerMode:function(c){return{state:c.localState||c.htmlState,mode:c.localMode||n}}}},"xml","javascript","css");e.defineMIME("text/html","htmlmixed")});
-(function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("mode/clike/clike",["../../lib/codemirror"],e):e(CodeMirror)})(function(e){function A(a,b,c,d,e,f){this.indented=a;this.column=b;this.type=c;this.info=d;this.align=e;this.prev=f}function C(a,b,c,d){var e=a.indented;return a.context&&"statement"==a.context.type&&"statement"!=c&&(e=a.context.indented),a.context=new A(e,b,c,d,null,a.context)}function w(a){var b=
-a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function x(a,b,c){return"variable"==b.prevToken||"type"==b.prevToken||!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(a.string.slice(0,c))||!(!b.typeAtEndOfLine||a.column()!=a.indentation())||void 0}function f(a){for(;;){if(!a||"top"==a.type)return!0;if("}"==a.type&&"namespace"!=a.prev.info)return!1;a=a.prev}}function d(a){var b={};a=a.split(" ");for(var c=0;c<a.length;++c)b[a[c]]=!0;return b}function t(a,b){return"function"==
-typeof a?a(b):a.propertyIsEnumerable(b)}function u(a,b){if(!b.startOfLine)return!1;for(var c,d=null;c=a.peek();){if("\\"==c&&a.match(/^.$/)){d=u;break}if("/"==c&&a.match(/^\/[\/\*]/,!1))break;a.next()}return b.tokenize=d,"meta"}function n(a,b){return"type"==b.prevToken&&"type"}function y(a){return a.eatWhile(/[\w\.']/),"number"}function m(a,b){if(a.backUp(1),a.match(/(R|u8R|uR|UR|LR)/)){var c=a.match(/"([^\s\\()]{0,16})\(/);return!!c&&(b.cpp11RawStringDelim=c[1],b.tokenize=D,D(a,b))}return a.match(/(u8|u|U|L)/)?
-!!a.match(/["']/,!1)&&"string":(a.next(),!1)}function c(a,b){for(var c;null!=(c=a.next());)if('"'==c&&!a.eat('"')){b.tokenize=null;break}return"string"}function D(a,b){var c=b.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$\x26");return a.match(new RegExp(".*?\\)"+c+'"'))?b.tokenize=null:a.skipToEnd(),"string"}function z(a,b){function c(a){if(a)for(var b in a)a.hasOwnProperty(b)&&d.push(b)}"string"==typeof a&&(a=[a]);var d=[];c(b.keywords);c(b.types);c(b.builtin);c(b.atoms);d.length&&(b.helperType=a[0],
-e.registerHelper("hintWords",a[0],d));for(var f=0;f<a.length;++f)e.defineMIME(a[f],b)}function H(a,b){for(var c=!1;!a.eol();){if(!c&&a.match('"""')){b.tokenize=null;break}c="\\"==a.next()&&!c}return"string"}function v(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!a&&!e&&b.match('"')){f=!0;break}if(a&&b.match('"""')){f=!0;break}d=b.next();!e&&"$"==d&&b.match("{")&&b.skipTo("}");e=!e&&"\\"==d&&!a}return!f&&a||(c.tokenize=null),"string"}}function p(a){return function(b,c){for(var d,e=!1,
-f=!1;!b.eol();){if(!e&&b.match('"')&&("single"==a||b.match('""'))){f=!0;break}if(!e&&b.match("``")){k=p(a);f=!0;break}d=b.next();e="single"==a&&!e&&"\\"==d}return f&&(c.tokenize=null),"string"}}e.defineMode("clike",function(a,b){function c(a,b){var e=a.next();if(S[e]){var g=S[e](a,b);if(!1!==g)return g}if('"'==e||"'"==e)return b.tokenize=d(e),b.tokenize(a,b);if(J.test(e))return k=e,null;if(N.test(e)){if(a.backUp(1),a.match(R))return"number";a.next()}if("/"==e){if(a.eat("*"))return b.tokenize=n,n(a,
-b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(P.test(e)){for(;!a.match(/^\/[\/*]/,!1)&&a.eat(P););return"operator"}if(a.eatWhile(G),O)for(;a.match(O);)a.eatWhile(G);e=a.current();return t(z,e)?(t(ca,e)&&(k="newstatement"),t(oa,e)&&(y=!0),"keyword"):t(D,e)?"type":t(H,e)?(t(ca,e)&&(k="newstatement"),"builtin"):t(ma,e)?"atom":"variable"}function d(a){return function(b,c){for(var d,e=!1,g=!1;null!=(d=b.next());){if(d==a&&!e){g=!0;break}e=!e&&"\\"==d}return(g||!e&&!aa)&&(c.tokenize=null),"string"}}
-function n(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function m(a,c){b.typeFirstDefinitions&&a.eol()&&f(c.context)&&(c.typeAtEndOfLine=x(a,c,a.pos))}var k,y,p=a.indentUnit,u=b.statementIndentUnit||p,v=b.dontAlignCalls,z=b.keywords||{},D=b.types||{},H=b.builtin||{},ca=b.blockKeywords||{},oa=b.defKeywords||{},ma=b.atoms||{},S=b.hooks||{},aa=b.multiLineStrings,pa=!1!==b.indentStatements,O=b.namespaceSeparator,J=b.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,
-N=b.numberStart||/[\d\.]/,R=b.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,P=b.isOperatorChar||/[+\-*&%=<>!?|\/]/,G=b.isIdentifierChar||/[\w\$_\xa1-\uffff]/;return{startState:function(a){return{tokenize:null,context:new A((a||0)-p,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(a,d){var e=d.context;if(a.sol()&&(null==e.align&&(e.align=!1),d.indented=a.indentation(),d.startOfLine=!0),a.eatSpace())return m(a,d),null;k=y=null;var n=(d.tokenize||
-c)(a,d);if("comment"==n||"meta"==n)return n;if(null==e.align&&(e.align=!0),";"==k||":"==k||","==k&&a.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==d.context.type;)w(d);else if("{"==k)C(d,a.column(),"}");else if("["==k)C(d,a.column(),"]");else if("("==k)C(d,a.column(),")");else if("}"==k){for(;"statement"==e.type;)e=w(d);for("}"==e.type&&(e=w(d));"statement"==e.type;)e=w(d)}else k==e.type?w(d):pa&&(("}"==e.type||"top"==e.type)&&";"!=k||"statement"==e.type&&"newstatement"==k)&&C(d,a.column(),"statement",
-a.current());if("variable"==n&&("def"==d.prevToken||b.typeFirstDefinitions&&x(a,d,a.start)&&f(d.context)&&a.match(/^\s*\(/,!1))&&(n="def"),S.token)e=S.token(a,d,n),void 0!==e&&(n=e);return"def"==n&&!1===b.styleDefs&&(n="variable"),d.startOfLine=!1,d.prevToken=y?"def":n||k,m(a,d),n},indent:function(a,d){if(a.tokenize!=c&&null!=a.tokenize||a.typeAtEndOfLine)return e.Pass;var f=a.context,n=d&&d.charAt(0);if("statement"==f.type&&"}"==n&&(f=f.prev),b.dontIndentStatements)for(;"statement"==f.type&&b.dontIndentStatements.test(f.info);)f=
-f.prev;if(S.indent){var k=S.indent(a,f,d);if("number"==typeof k)return k}var k=n==f.type,h=f.prev&&"switch"==f.prev.info;if(b.allmanIndentation&&/[{(]/.test(n)){for(;"top"!=f.type&&"}"!=f.type;)f=f.prev;return f.indented}return"statement"==f.type?f.indented+("{"==n?0:u):!f.align||v&&")"==f.type?")"!=f.type||k?f.indented+(k?0:p)+(k||!h||/^(?:case|default)\b/.test(d)?0:p):f.indented+u:f.column+(k?0:1)},electricInput:!1!==b.indentSwitch?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",
-blockCommentEnd:"*/",lineComment:"//",fold:"brace"}});z(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:d("auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile"),types:d("int long char short double float unsigned signed void size_t ptrdiff_t bool _Complex _Bool float_t double_t intptr_t intmax_t int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),blockKeywords:d("case do else for if switch while struct"),
-defKeywords:d("struct"),typeFirstDefinitions:!0,atoms:d("null true false"),hooks:{"#":u,"*":n},modeProps:{fold:["brace","include"]}});z(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:d("auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile asm dynamic_cast namespace reinterpret_cast try explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected alignas alignof constexpr decltype nullptr noexcept thread_local final static_assert override"),
-types:d("int long char short double float unsigned signed void size_t ptrdiff_t bool wchar_t"),blockKeywords:d("catch class do else finally for if struct switch try while"),defKeywords:d("class namespace struct enum union"),typeFirstDefinitions:!0,atoms:d("true false null"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,hooks:{"#":u,"*":n,u:m,U:m,L:m,R:m,0:y,1:y,2:y,3:y,4:y,5:y,6:y,7:y,8:y,9:y,token:function(a,b,c){if(b="variable"==c&&"("==a.peek()&&(";"==b.prevToken||null==
-b.prevToken||"}"==b.prevToken))a=a.current(),b=(a=/(\w+)::~?(\w+)$/.exec(a))&&a[1]==a[2];if(b)return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}});z("text/x-java",{name:"clike",keywords:d("abstract assert break case catch class const continue default do else enum extends final finally float for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),
-types:d("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:d("catch class do else finally for if switch try while"),defKeywords:d("class interface package enum @interface"),typeFirstDefinitions:!0,atoms:d("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(a){return!a.match("interface",!1)&&(a.eatWhile(/[\w\$_]/),
-"meta")}},modeProps:{fold:["brace","import"]}});z("text/x-csharp",{name:"clike",keywords:d("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),
-types:d("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:d("catch class do else finally for foreach if struct switch try while"),defKeywords:d("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:d("true false null"),hooks:{"@":function(a,b){return a.eat('"')?(b.tokenize=c,
-c(a,b)):(a.eatWhile(/[\w\$_]/),"meta")}}});z("text/x-scala",{name:"clike",keywords:d("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:d("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),
-multiLineStrings:!0,blockKeywords:d("catch class enum do else finally for forSome if match switch try while"),defKeywords:d("class enum def object package trait type val var"),atoms:d("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return!!a.match('""')&&(b.tokenize=H,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"\x3d":function(a,b){var c=b.context;
-return!("}"!=c.type||!c.align||!a.eat("\x3e"))&&(b.context=new A(c.indented,c.column,c.type,c.info,null,c.prev),"operator")}},modeProps:{closeBrackets:{triples:'"'}}});z("text/x-kotlin",{name:"clike",keywords:d("package as typealias class interface this super val var fun for is in This throw return break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend"),
-types:d("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:d("catch class do else finally for if where try while enum"),
-defKeywords:d("class val var object package interface fun"),atoms:d("true false null this"),hooks:{'"':function(a,b){return b.tokenize=v(a.match('""')),b.tokenize(a,b)}},modeProps:{closeBrackets:{triples:'"'}}});z(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:d("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:d("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),
-blockKeywords:d("for while do if else struct"),builtin:d("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),
-atoms:d("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),
-indentSwitch:!1,hooks:{"#":u},modeProps:{fold:["brace","include"]}});z("text/x-nesc",{name:"clike",keywords:d("auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatileas atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:d("int long char short double float unsigned signed void size_t ptrdiff_t"),
-blockKeywords:d("case do else for if switch while struct"),atoms:d("null true false"),hooks:{"#":u},modeProps:{fold:["brace","include"]}});z("text/x-objectivec",{name:"clike",keywords:d("auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatileinline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
-types:d("int long char short double float unsigned signed void size_t ptrdiff_t"),atoms:d("YES NO NULL NILL ON OFF true false"),hooks:{"@":function(a){return a.eatWhile(/[\w\$]/),"keyword"},"#":u,indent:function(a,b,c){if("statement"==b.type&&/^@\w/.test(c))return b.indented}},modeProps:{fold:"brace"}});z("text/x-squirrel",{name:"clike",keywords:d("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),
-types:d("int long char short double float unsigned signed void size_t ptrdiff_t"),blockKeywords:d("case catch class else for foreach if switch try while"),defKeywords:d("function local class"),typeFirstDefinitions:!0,atoms:d("true false null"),hooks:{"#":u},modeProps:{fold:["brace","include"]}});var k=null;z("text/x-ceylon",{name:"clike",keywords:d("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),
-types:function(a){a=a.charAt(0);return a===a.toUpperCase()&&a!==a.toLowerCase()},blockKeywords:d("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:d("class dynamic function interface module object package value"),builtin:d("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,
-isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:d("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return b.tokenize=p(a.match('""')?"triple":"single"),b.tokenize(a,b)},"`":function(a,b){return!(!k||!a.match("`"))&&(b.tokenize=
-k,k=null,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(a,b,c){if(("variable"==c||"type"==c)&&"."==b.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})});
-(function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../clike/clike")):"function"==typeof define&&define.amd?define("mode/php/php.js",["../../lib/codemirror","../htmlmixed/htmlmixed","../clike/clike"],e):e(CodeMirror)})(function(e){function A(e){var d={};e=e.split(" ");for(var t=0;t<e.length;++t)d[e[t]]=!0;return d}function C(e,d,t){return 0==e.length?w(d):function(u,n){for(var y=e[0],m=0;m<y.length;m++)if(u.match(y[m][0]))return n.tokenize=
-C(e.slice(1),d),y[m][1];return n.tokenize=w(d,t),"string"}}function w(e,d){return function(t,u){var n;if(!1!==d&&t.match("${",!1)||t.match("{$",!1))n=(u.tokenize=null,"string");else if(!1!==d&&t.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/))n=(t.match("[",!1)&&(u.tokenize=C([[["[",null]],[[/\d[\w\.]*/,"number"],[/\$[a-zA-Z_][a-zA-Z0-9_]*/,"variable-2"],[/[\w\$]+/,"variable"]],[["]",null]]],e,d)),t.match(/\-\>\w/,!1)&&(u.tokenize=C([[["-\x3e",null]],[[/[\w]+/,"variable"]]],e,d)),"variable-2");else{for(n=!1;!t.eol()&&
-(n||!1===d||!t.match("{$",!1)&&!t.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/,!1));){if(!n&&t.match(e)){u.tokenize=null;u.tokStack.pop();u.tokStack.pop();break}n="\\"==t.next()&&!n}n="string"}return n}}e.registerHelper("hintWords","php","abstract and array as break case catch class clone const continue declare default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach function global goto if implements interface instanceof namespace new or private protected public static switch throw trait try use var while xor die echo empty exit eval include include_once isset list require require_once return print unset __halt_compiler self static parent yield insteadof finally true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__ func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count".split(" "));
-e.registerHelper("wordChars","php",/[\w$]/);var x={name:"clike",helperType:"php",keywords:A("abstract and array as break case catch class clone const continue declare default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach function global goto if implements interface instanceof namespace new or private protected public static switch throw trait try use var while xor die echo empty exit eval include include_once isset list require require_once return print unset __halt_compiler self static parent yield insteadof finally"),
-blockKeywords:A("catch do else elseif for foreach if switch try while finally"),defKeywords:A("class function interface namespace trait"),atoms:A("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"),builtin:A("func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count"),
-multiLineStrings:!0,hooks:{$:function(e){return e.eatWhile(/[\w\$_]/),"variable-2"},"\x3c":function(e,d){var t;if(t=e.match(/<<\s*/)){var u=e.eat(/['"]/);e.eatWhile(/[\w\.]/);t=e.current().slice(t[0].length+(u?2:1));if(u&&e.eat(u),t)return(d.tokStack||(d.tokStack=[])).push(t,0),d.tokenize=w(t,"'"!=u),"string"}return!1},"#":function(e){for(;!e.eol()&&!e.match("?\x3e",!1);)e.next();return"comment"},"/":function(e){if(e.eat("/")){for(;!e.eol()&&!e.match("?\x3e",!1);)e.next();return"comment"}return!1},
-'"':function(e,d){return(d.tokStack||(d.tokStack=[])).push('"',0),d.tokenize=w('"'),"string"},"{":function(e,d){return d.tokStack&&d.tokStack.length&&d.tokStack[d.tokStack.length-1]++,!1},"}":function(e,d){return d.tokStack&&0<d.tokStack.length&&!--d.tokStack[d.tokStack.length-1]&&(d.tokenize=w(d.tokStack[d.tokStack.length-2])),!1}}};e.defineMode("php",function(f,d){var t=e.getMode(f,"text/html"),u=e.getMode(f,x);return{startState:function(){var n=e.startState(t),f=d.startOpen?e.startState(u):null;
-return{html:n,php:f,curMode:d.startOpen?u:t,curState:d.startOpen?f:n,pending:null}},copyState:function(d){var f,m=e.copyState(t,d.html),c=d.php,c=c&&e.copyState(u,c);return f=d.curMode==t?m:c,{html:m,php:c,curMode:d.curMode,curState:f,pending:d.pending}},token:function(d,f){var m=f.curMode==u;if(d.sol()&&f.pending&&'"'!=f.pending&&"'"!=f.pending&&(f.pending=null),m)return m&&null==f.php.tokenize&&d.match("?\x3e")?(f.curMode=t,f.curState=f.html,f.php.context.prev||(f.php=null),"meta"):u.token(d,f.curState);
-if(d.match(/^<\?\w*/))return f.curMode=u,f.php||(f.php=e.startState(u,t.indent(f.html,""))),f.curState=f.php,"meta";if('"'==f.pending||"'"==f.pending){for(;!d.eol()&&d.next()!=f.pending;);m="string"}else f.pending&&d.pos<f.pending.end?(d.pos=f.pending.end,m=f.pending.style):m=t.token(d,f.curState);f.pending&&(f.pending=null);var c,w=d.current(),x=w.search(/<\?/);return-1!=x&&("string"==m&&(c=w.match(/[\'\"]$/))&&!/\?>/.test(w)?f.pending=c[0]:f.pending={end:d.pos,style:m},d.backUp(w.length-x)),m},
-indent:function(d,e){return d.curMode!=u&&/^\s*<\//.test(e)||d.curMode==u&&/^\?>/.test(e)?t.indent(d.html,e):d.curMode.indent(d.curState,e)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",innerMode:function(d){return{state:d.curState,mode:d.curMode}}}},"htmlmixed","clike");e.defineMIME("application/x-httpd-php","php");e.defineMIME("application/x-httpd-php-open",{name:"php",startOpen:!0});e.defineMIME("text/x-php",x)});
-(function(e){"function"==typeof e.define&&e.define("modePHP",["mode/php/php.js"],function(){})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/js/codemirror.mode.twig.min.js b/js/ckeditor/plugins/codemirror/js/codemirror.mode.twig.min.js
deleted file mode 100644
index 0b98b1085..000000000
--- a/js/ckeditor/plugins/codemirror/js/codemirror.mode.twig.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-!function(f){"object"==typeof exports&&"object"==typeof module?f(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define("addon/mode/multiplex",["../../lib/codemirror"],f):f(CodeMirror)}(function(f){f.multiplexingMode=function(h){function k(a,d,c,b){return"string"==typeof d?(c=a.indexOf(d,c),b&&-1<c?c+d.length:c):(d=d.exec(c?a.slice(c):a))?d.index+c+(b?d[0].length:0):-1}var l=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:f.startState(h),innerActive:null,
-inner:null}},copyState:function(a){return{outer:f.copyState(h,a.outer),innerActive:a.innerActive,inner:a.innerActive&&f.copyState(a.innerActive.mode,a.inner)}},token:function(a,d){if(d.innerActive){var c=d.innerActive,b=a.string;if(!c.close&&a.sol())return d.innerActive=d.inner=null,this.token(a,d);var e=c.close?k(b,c.close,a.pos,c.parseDelimiters):-1;if(e==a.pos&&!c.parseDelimiters)return a.match(c.close),d.innerActive=d.inner=null,c.delimStyle&&c.delimStyle+" "+c.delimStyle+"-close";-1<e&&(a.string=
-b.slice(0,e));var g=c.mode.token(a,d.inner);return-1<e&&(a.string=b),e==a.pos&&c.parseDelimiters&&(d.innerActive=d.inner=null),c.innerStyle&&(g=g?g+" "+c.innerStyle:c.innerStyle),g}c=1/0;b=a.string;for(g=0;g<l.length;++g){var m=l[g],e=k(b,m.open,a.pos);if(e==a.pos)return m.parseDelimiters||a.match(m.open),d.innerActive=m,d.inner=f.startState(m.mode,h.indent?h.indent(d.outer,""):0),m.delimStyle&&m.delimStyle+" "+m.delimStyle+"-open";-1!=e&&e<c&&(c=e)}c!=1/0&&(a.string=b.slice(0,c));e=h.token(a,d.outer);
-return c!=1/0&&(a.string=b),e},indent:function(a,d){var c=a.innerActive?a.innerActive.mode:h;return c.indent?c.indent(a.innerActive?a.inner:a.outer,d):f.Pass},blankLine:function(a){var d=a.innerActive?a.innerActive.mode:h;if(d.blankLine&&d.blankLine(a.innerActive?a.inner:a.outer),a.innerActive)"\n"===a.innerActive.close&&(a.innerActive=a.inner=null);else for(var c=0;c<l.length;++c){var b=l[c];"\n"===b.open&&(a.innerActive=b,a.inner=f.startState(b.mode,d.indent?d.indent(a.outer,""):0))}},electricChars:h.electricChars,
-innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:h}}}}});
-(function(f){"object"==typeof exports&&"object"==typeof module?f(require("../../lib/codemirror"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define("mode/twig/twig.js",["../../lib/codemirror","../../addon/mode/multiplex"],f):f(CodeMirror)})(function(f){f.defineMode("twig:inner",function(){function f(b,e){var g=b.peek();if(e.incomment)return b.skipTo("#}")?(b.eatWhile(/\#|}/),e.incomment=!1):b.skipToEnd(),"comment";if(e.intag){if(e.operator){if(e.operator=!1,b.match(d))return"atom";
-if(b.match(c))return"number"}if(e.sign){if(e.sign=!1,b.match(d))return"atom";if(b.match(c))return"number"}if(e.instring)return g==e.instring&&(e.instring=!1),b.next(),"string";if("'"==g||'"'==g)return e.instring=g,b.next(),"string";if(b.match(e.intag+"}")||b.eat("-")&&b.match(e.intag+"}"))return e.intag=!1,"tag";if(b.match(l))return e.operator=!0,"operator";if(b.match(a))e.sign=!0;else if(b.eat(" ")||b.sol()){if(b.match(k))return"keyword";if(b.match(d))return"atom";if(b.match(c))return"number";b.sol()&&
-b.next()}else b.next();return"variable"}if(b.eat("{")){if(b.eat("#"))return e.incomment=!0,b.skipTo("#}")?(b.eatWhile(/\#|}/),e.incomment=!1):b.skipToEnd(),"comment";if(g=b.eat(/\{|%/))return e.intag=g,"{"==g&&(e.intag="}"),b.eat("-"),"tag"}b.next()}var k="and as autoescape endautoescape block do endblock else elseif extends for endfor embed endembed filter endfilter flush from if endif in is include import not or set spaceless endspaceless with endwith trans endtrans blocktrans endblocktrans macro endmacro use verbatim endverbatim".split(" "),
-l=/^[+\-*&%=<>!?|~^]/,a=/^[:\[\(\{]/,d="true;false;null;empty;defined;divisibleby;divisible by;even;odd;iterable;sameas;same as".split(";"),c=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return k=new RegExp("(("+k.join(")|(")+"))\\b"),d=new RegExp("(("+d.join(")|(")+"))\\b"),{startState:function(){return{}},token:function(a,c){return f(a,c)}}});f.defineMode("twig",function(h,k){var l=f.getMode(h,"twig:inner");return k&&k.base?f.multiplexingMode(f.getMode(h,k.base),{open:/\{[{#%]/,close:/[}#%]\}/,mode:l,parseDelimiters:!0}):
-l});f.defineMIME("text/x-twig","twig")});(function(f){"function"==typeof f.define&&f.define("modeTwig",["mode/twig/twig.js"],function(){})})(this);
\ No newline at end of file
diff --git a/js/ckeditor/plugins/codemirror/theme/3024-day.css b/js/ckeditor/plugins/codemirror/theme/3024-day.css
deleted file mode 100644
index 5232267ef..000000000
--- a/js/ckeditor/plugins/codemirror/theme/3024-day.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-    Name:       3024 day
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
-.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
-
-.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
-.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
-
-.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
-.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
-
-.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
-
-.cm-s-3024-day span.cm-comment { color: #cdab53; }
-.cm-s-3024-day span.cm-atom { color: #a16a94; }
-.cm-s-3024-day span.cm-number { color: #a16a94; }
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
-.cm-s-3024-day span.cm-keyword { color: #db2d20; }
-.cm-s-3024-day span.cm-string { color: #fded02; }
-
-.cm-s-3024-day span.cm-variable { color: #01a252; }
-.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-day span.cm-def { color: #e8bbd0; }
-.cm-s-3024-day span.cm-bracket { color: #3a3432; }
-.cm-s-3024-day span.cm-tag { color: #db2d20; }
-.cm-s-3024-day span.cm-link { color: #a16a94; }
-.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
-
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/3024-night.css b/js/ckeditor/plugins/codemirror/theme/3024-night.css
deleted file mode 100644
index bd0b64dbe..000000000
--- a/js/ckeditor/plugins/codemirror/theme/3024-night.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-
-    Name:       3024 night
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
-.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
-.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
-.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
-
-.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
-
-.cm-s-3024-night span.cm-comment { color: #cdab53; }
-.cm-s-3024-night span.cm-atom { color: #a16a94; }
-.cm-s-3024-night span.cm-number { color: #a16a94; }
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
-.cm-s-3024-night span.cm-keyword { color: #db2d20; }
-.cm-s-3024-night span.cm-string { color: #fded02; }
-
-.cm-s-3024-night span.cm-variable { color: #01a252; }
-.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-night span.cm-def { color: #e8bbd0; }
-.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
-.cm-s-3024-night span.cm-tag { color: #db2d20; }
-.cm-s-3024-night span.cm-link { color: #a16a94; }
-.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
-
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/abcdef.css b/js/ckeditor/plugins/codemirror/theme/abcdef.css
deleted file mode 100644
index 748540b27..000000000
--- a/js/ckeditor/plugins/codemirror/theme/abcdef.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
-.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
-.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
-.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
-.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
-.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
-.cm-s-abcdef span.cm-atom { color: #77F; }
-.cm-s-abcdef span.cm-number { color: violet; }
-.cm-s-abcdef span.cm-def { color: #fffabc; }
-.cm-s-abcdef span.cm-variable { color: #abcdef; }
-.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
-.cm-s-abcdef span.cm-property { color: #fedcba; }
-.cm-s-abcdef span.cm-operator { color: #ff0; }
-.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
-.cm-s-abcdef span.cm-string { color: #2b4; }
-.cm-s-abcdef span.cm-meta { color: #C9F; }
-.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
-.cm-s-abcdef span.cm-builtin { color: #30aabc; }
-.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
-.cm-s-abcdef span.cm-tag { color: #FFDD44; }
-.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
-.cm-s-abcdef span.cm-error { color: #FF0000; }
-.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
-.cm-s-abcdef span.cm-link { color: blueviolet; }
-
-.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/js/ckeditor/plugins/codemirror/theme/ambiance-mobile.css b/js/ckeditor/plugins/codemirror/theme/ambiance-mobile.css
deleted file mode 100644
index 374818a71..000000000
--- a/js/ckeditor/plugins/codemirror/theme/ambiance-mobile.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-ambiance.CodeMirror {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/ambiance.css b/js/ckeditor/plugins/codemirror/theme/ambiance.css
deleted file mode 100644
index 4d25e3fa7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/ambiance.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ambiance theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-ambiance .cm-header { color: blue; }
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
-
-.cm-s-ambiance .cm-keyword { color: #cda869; }
-.cm-s-ambiance .cm-atom { color: #CF7EA9; }
-.cm-s-ambiance .cm-number { color: #78CF8A; }
-.cm-s-ambiance .cm-def { color: #aac6e3; }
-.cm-s-ambiance .cm-variable { color: #ffb795; }
-.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
-.cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator { color: #fa8d6a; }
-.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
-.cm-s-ambiance .cm-string { color: #8f9d6a; }
-.cm-s-ambiance .cm-string-2 { color: #9d937c; }
-.cm-s-ambiance .cm-meta { color: #D2A8A1; }
-.cm-s-ambiance .cm-qualifier { color: yellow; }
-.cm-s-ambiance .cm-builtin { color: #9999cc; }
-.cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff; }
-.cm-s-ambiance .cm-attribute { color: #9B859D; }
-.cm-s-ambiance .cm-hr { color: pink; }
-.cm-s-ambiance .cm-link { color: #F4C20B; }
-.cm-s-ambiance .cm-special { color: #FF9D00; }
-.cm-s-ambiance .cm-error { color: #AF2018; }
-
-.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
-.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
-
-.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-/* Editor styling */
-
-.cm-s-ambiance.CodeMirror {
-  line-height: 1.40em;
-  color: #E6E1DC;
-  background-color: #202020;
-  -webkit-box-shadow: inset 0 0 10px black;
-  -moz-box-shadow: inset 0 0 10px black;
-  box-shadow: inset 0 0 10px black;
-}
-
-.cm-s-ambiance .CodeMirror-gutters {
-  background: #3D3D3D;
-  border-right: 1px solid #4D4D4D;
-  box-shadow: 0 10px 20px black;
-}
-
-.cm-s-ambiance .CodeMirror-linenumber {
-  text-shadow: 0px 1px 1px #4d4d4d;
-  color: #111;
-  padding: 0 5px;
-}
-
-.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
-.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
-
-.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
-
-.cm-s-ambiance .CodeMirror-activeline-background {
-  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
-}
-
-.cm-s-ambiance.CodeMirror,
-.cm-s-ambiance .CodeMirror-gutters {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/base16-dark.css b/js/ckeditor/plugins/codemirror/theme/base16-dark.css
deleted file mode 100644
index c35a38dff..000000000
--- a/js/ckeditor/plugins/codemirror/theme/base16-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Dark
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
-.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
-.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
-.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
-.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
-
-.cm-s-base16-dark span.cm-comment { color: #8f5536; }
-.cm-s-base16-dark span.cm-atom { color: #aa759f; }
-.cm-s-base16-dark span.cm-number { color: #aa759f; }
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
-.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
-.cm-s-base16-dark span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-dark span.cm-variable { color: #90a959; }
-.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-dark span.cm-def { color: #d28445; }
-.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
-.cm-s-base16-dark span.cm-tag { color: #ac4142; }
-.cm-s-base16-dark span.cm-link { color: #aa759f; }
-.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
-
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/base16-light.css b/js/ckeditor/plugins/codemirror/theme/base16-light.css
deleted file mode 100644
index 5561f8c3c..000000000
--- a/js/ckeditor/plugins/codemirror/theme/base16-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Light
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
-.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
-.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
-
-.cm-s-base16-light span.cm-comment { color: #8f5536; }
-.cm-s-base16-light span.cm-atom { color: #aa759f; }
-.cm-s-base16-light span.cm-number { color: #aa759f; }
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
-.cm-s-base16-light span.cm-keyword { color: #ac4142; }
-.cm-s-base16-light span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-light span.cm-variable { color: #90a959; }
-.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-light span.cm-def { color: #d28445; }
-.cm-s-base16-light span.cm-bracket { color: #202020; }
-.cm-s-base16-light span.cm-tag { color: #ac4142; }
-.cm-s-base16-light span.cm-link { color: #aa759f; }
-.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
-
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/bespin.css b/js/ckeditor/plugins/codemirror/theme/bespin.css
deleted file mode 100644
index becfad9e7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/bespin.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Bespin
-    Author:     Mozilla / Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
-.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
-.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
-.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
-.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
-
-.cm-s-bespin span.cm-comment {color: #937121;}
-.cm-s-bespin span.cm-atom {color: #9b859d;}
-.cm-s-bespin span.cm-number {color: #9b859d;}
-
-.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
-.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
-.cm-s-bespin span.cm-string {color: #f9ee98;}
-
-.cm-s-bespin span.cm-variable {color: #54be0d;}
-.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
-.cm-s-bespin span.cm-def {color: #cf7d34;}
-.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
-.cm-s-bespin span.cm-bracket {color: #9d9b97;}
-.cm-s-bespin span.cm-tag {color: #cf6a4c;}
-.cm-s-bespin span.cm-link {color: #9b859d;}
-
-.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/js/ckeditor/plugins/codemirror/theme/blackboard.css b/js/ckeditor/plugins/codemirror/theme/blackboard.css
deleted file mode 100644
index 0fa55e7d7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/blackboard.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Port of TextMate's Blackboard theme */
-
-.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
-.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
-.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D; }
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
-
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
-.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/cobalt.css b/js/ckeditor/plugins/codemirror/theme/cobalt.css
deleted file mode 100644
index bf24bd2e9..000000000
--- a/js/ckeditor/plugins/codemirror/theme/cobalt.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
-.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
-.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-cobalt span.cm-comment { color: #08f; }
-.cm-s-cobalt span.cm-atom { color: #845dc4; }
-.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
-.cm-s-cobalt span.cm-keyword { color: #ffee80; }
-.cm-s-cobalt span.cm-string { color: #3ad900; }
-.cm-s-cobalt span.cm-meta { color: #ff9d00; }
-.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
-.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
-.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
-.cm-s-cobalt span.cm-link { color: #845dc4; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
-
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
-.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/colorforth.css b/js/ckeditor/plugins/codemirror/theme/colorforth.css
deleted file mode 100644
index a096504fe..000000000
--- a/js/ckeditor/plugins/codemirror/theme/colorforth.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
-.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
-.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
-.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-colorforth span.cm-comment     { color: #ededed; }
-.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
-.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
-.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
-.cm-s-colorforth span.cm-variable    { color: #73ff00; }
-.cm-s-colorforth span.cm-string      { color: #007bff; }
-.cm-s-colorforth span.cm-number      { color: #00c4ff; }
-.cm-s-colorforth span.cm-atom        { color: #606060; }
-
-.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
-.cm-s-colorforth span.cm-property    {}
-.cm-s-colorforth span.cm-operator    {}
-
-.cm-s-colorforth span.cm-meta        { color: yellow; }
-.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
-.cm-s-colorforth span.cm-bracket     { color: #cc7; }
-.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
-.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
-.cm-s-colorforth span.cm-error       { color: #f00; }
-
-.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
-
-.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
-
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/js/ckeditor/plugins/codemirror/theme/dracula.css b/js/ckeditor/plugins/codemirror/theme/dracula.css
deleted file mode 100644
index cc415549a..000000000
--- a/js/ckeditor/plugins/codemirror/theme/dracula.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-
-    Name:       dracula
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
-
-*/
-
-
-.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
-  background-color: #282a36 !important;
-  color: #f8f8f2 !important;
-  border: none;
-}
-.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
-.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula span.cm-comment { color: #6272a4; }
-.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
-.cm-s-dracula span.cm-number { color: #bd93f9; }
-.cm-s-dracula span.cm-variable { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-2 { color: white; }
-.cm-s-dracula span.cm-def { color: #50fa7b; }
-.cm-s-dracula span.cm-operator { color: #ff79c6; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-atom { color: #bd93f9; }
-.cm-s-dracula span.cm-meta { color: #f8f8f2; }
-.cm-s-dracula span.cm-tag { color: #ff79c6; }
-.cm-s-dracula span.cm-attribute { color: #50fa7b; }
-.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
-.cm-s-dracula span.cm-property { color: #66d9ef; }
-.cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
-
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/duotone-dark.css b/js/ckeditor/plugins/codemirror/theme/duotone-dark.css
deleted file mode 100644
index a493eb6d6..000000000
--- a/js/ckeditor/plugins/codemirror/theme/duotone-dark.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Name:   DuoTone-Dark
-Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
-
-CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
-*/
-
-.cm-s-duotone-dark.CodeMirror { background: #2a2734; color: #6c6783; }
-.cm-s-duotone-dark div.CodeMirror-selected { background: #545167!important; }
-.cm-s-duotone-dark .CodeMirror-gutters { background: #2a2734; border-right: 0px; }
-.cm-s-duotone-dark .CodeMirror-linenumber { color: #545167; }
-
-/* begin cursor */
-.cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
-.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
-.cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
-/* end cursor */
-
-.cm-s-duotone-dark span.cm-atom, .cm-s-duotone-dark span.cm-number, .cm-s-duotone-dark span.cm-keyword, .cm-s-duotone-dark span.cm-variable, .cm-s-duotone-dark span.cm-attribute, .cm-s-duotone-dark span.cm-quote, .cm-s-duotone-dark span.cm-hr, .cm-s-duotone-dark span.cm-link { color: #ffcc99; }
-
-.cm-s-duotone-dark span.cm-property { color: #9a86fd; }
-.cm-s-duotone-dark span.cm-punctuation, .cm-s-duotone-dark span.cm-unit, .cm-s-duotone-dark span.cm-negative { color: #e09142; }
-.cm-s-duotone-dark span.cm-string { color: #ffb870; }
-.cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
-.cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
-
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
-.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
-.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
-
-/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
-.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
-
-.cm-s-duotone-dark span.cm-header { font-weight: normal; }
-.cm-s-duotone-dark .CodeMirror-matchingbracket { text-decoration: underline; color: #eeebff !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/duotone-light.css b/js/ckeditor/plugins/codemirror/theme/duotone-light.css
deleted file mode 100644
index 68db16edd..000000000
--- a/js/ckeditor/plugins/codemirror/theme/duotone-light.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Name:   DuoTone-Light
-Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
-
-CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
-*/
-
-.cm-s-duotone-light.CodeMirror { background: #faf8f5; color: #b29762; }
-.cm-s-duotone-light div.CodeMirror-selected { background: #e3dcce !important; }
-.cm-s-duotone-light .CodeMirror-gutters { background: #faf8f5; border-right: 0px; }
-.cm-s-duotone-light .CodeMirror-linenumber { color: #cdc4b1; }
-
-/* begin cursor */
-.cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
-.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
-.cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
-/* end cursor */
-
-.cm-s-duotone-light span.cm-atom, .cm-s-duotone-light span.cm-number, .cm-s-duotone-light span.cm-keyword, .cm-s-duotone-light span.cm-variable, .cm-s-duotone-light span.cm-attribute, .cm-s-duotone-light span.cm-quote, .cm-s-duotone-light-light span.cm-hr, .cm-s-duotone-light-light span.cm-link { color: #063289; }
-
-.cm-s-duotone-light span.cm-property { color: #b29762; }
-.cm-s-duotone-light span.cm-punctuation, .cm-s-duotone-light span.cm-unit, .cm-s-duotone-light span.cm-negative { color: #063289; }
-.cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
-.cm-s-duotone-light span.cm-positive { color: #896724; }
-
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
-.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
-.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
-
-/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
-/* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */
-.cm-s-duotone-light span.cm-error, .cm-s-duotone-light span.cm-invalidchar { color: #f00; }
-
-.cm-s-duotone-light span.cm-header { font-weight: normal; }
-.cm-s-duotone-light .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/eclipse.css b/js/ckeditor/plugins/codemirror/theme/eclipse.css
deleted file mode 100644
index 30fe9d19e..000000000
--- a/js/ckeditor/plugins/codemirror/theme/eclipse.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta { color: #FF1717; }
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom { color: #219; }
-.cm-s-eclipse span.cm-number { color: #164; }
-.cm-s-eclipse span.cm-def { color: #00f; }
-.cm-s-eclipse span.cm-variable { color: black; }
-.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
-.cm-s-eclipse span.cm-property { color: black; }
-.cm-s-eclipse span.cm-operator { color: black; }
-.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
-.cm-s-eclipse span.cm-string { color: #2A00FF; }
-.cm-s-eclipse span.cm-string-2 { color: #f50; }
-.cm-s-eclipse span.cm-qualifier { color: #555; }
-.cm-s-eclipse span.cm-builtin { color: #30a; }
-.cm-s-eclipse span.cm-bracket { color: #cc7; }
-.cm-s-eclipse span.cm-tag { color: #170; }
-.cm-s-eclipse span.cm-attribute { color: #00c; }
-.cm-s-eclipse span.cm-link { color: #219; }
-.cm-s-eclipse span.cm-error { color: #f00; }
-
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/elegant.css b/js/ckeditor/plugins/codemirror/theme/elegant.css
deleted file mode 100644
index a5929c118..000000000
--- a/js/ckeditor/plugins/codemirror/theme/elegant.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
-.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-variable { color: black; }
-.cm-s-elegant span.cm-variable-2 { color: #b11; }
-.cm-s-elegant span.cm-qualifier { color: #555; }
-.cm-s-elegant span.cm-keyword { color: #730; }
-.cm-s-elegant span.cm-builtin { color: #30a; }
-.cm-s-elegant span.cm-link { color: #762; }
-.cm-s-elegant span.cm-error { background-color: #fdd; }
-
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/erlang-dark.css b/js/ckeditor/plugins/codemirror/theme/erlang-dark.css
deleted file mode 100644
index 35e8796f7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/erlang-dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
-.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
-.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
-.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
-.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
-.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
-.cm-s-erlang-dark span.cm-comment    { color: #77f; }
-.cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
-.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
-.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d55; }
-.cm-s-erlang-dark span.cm-property   { color: #ccc; }
-.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
-.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
-.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
-.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
-.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
-.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
-
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
-.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/hopscotch.css b/js/ckeditor/plugins/codemirror/theme/hopscotch.css
deleted file mode 100644
index c40094d08..000000000
--- a/js/ckeditor/plugins/codemirror/theme/hopscotch.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Hopscotch
-    Author:     Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
-.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
-.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
-.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
-.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
-
-.cm-s-hopscotch span.cm-comment {color: #b33508;}
-.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
-.cm-s-hopscotch span.cm-number {color: #c85e7c;}
-
-.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
-.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
-.cm-s-hopscotch span.cm-string {color: #fdcc59;}
-
-.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
-.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
-.cm-s-hopscotch span.cm-def {color: #fd8b19;}
-.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
-.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
-.cm-s-hopscotch span.cm-tag {color: #dd464c;}
-.cm-s-hopscotch span.cm-link {color: #c85e7c;}
-
-.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/js/ckeditor/plugins/codemirror/theme/icecoder.css b/js/ckeditor/plugins/codemirror/theme/icecoder.css
deleted file mode 100644
index 3056733e7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/icecoder.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
-*/
-
-.cm-s-icecoder { color: #666; background: #1d1d1b; }
-
-.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
-.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
-.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
-
-.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
-.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
-
-.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
-.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
-.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
-
-.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
-.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
-
-.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
-
-.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
-.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
-.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
-
-.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
-.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
-
-.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
-.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
-.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
-.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
-
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
-.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
diff --git a/js/ckeditor/plugins/codemirror/theme/isotope.css b/js/ckeditor/plugins/codemirror/theme/isotope.css
deleted file mode 100644
index a9642ace9..000000000
--- a/js/ckeditor/plugins/codemirror/theme/isotope.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Isotope
-    Author:     David Desandro / Jan T. Sott
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
-.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
-.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
-.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
-
-.cm-s-isotope span.cm-comment {color: #3300ff;}
-.cm-s-isotope span.cm-atom {color: #cc00ff;}
-.cm-s-isotope span.cm-number {color: #cc00ff;}
-
-.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
-.cm-s-isotope span.cm-keyword {color: #ff0000;}
-.cm-s-isotope span.cm-string {color: #ff0099;}
-
-.cm-s-isotope span.cm-variable {color: #33ff00;}
-.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
-.cm-s-isotope span.cm-def {color: #ff9900;}
-.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
-.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
-.cm-s-isotope span.cm-tag {color: #ff0000;}
-.cm-s-isotope span.cm-link {color: #cc00ff;}
-
-.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/js/ckeditor/plugins/codemirror/theme/lesser-dark.css b/js/ckeditor/plugins/codemirror/theme/lesser-dark.css
deleted file mode 100644
index 303e232fb..000000000
--- a/js/ckeditor/plugins/codemirror/theme/lesser-dark.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-.cm-s-lesser-dark {
-  line-height: 1.3em;
-}
-.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
-
-.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
-.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
-.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
-
-.cm-s-lesser-dark span.cm-header { color: #a0a; }
-.cm-s-lesser-dark span.cm-quote { color: #090; }
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def { color: white; }
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
-.cm-s-lesser-dark span.cm-property { color: #92A75C; }
-.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier { color: #555; }
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute { color: #00c; }
-.cm-s-lesser-dark span.cm-hr { color: #999; }
-.cm-s-lesser-dark span.cm-link { color: #00c; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
-.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/liquibyte.css b/js/ckeditor/plugins/codemirror/theme/liquibyte.css
deleted file mode 100644
index fa164f616..000000000
--- a/js/ckeditor/plugins/codemirror/theme/liquibyte.css
+++ /dev/null
@@ -1,95 +0,0 @@
-.cm-s-liquibyte.CodeMirror {
-	background-color: #000;
-	color: #fff;
-	line-height: 1.2em;
-	font-size: 1em;
-}
-.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
-	text-decoration: underline;
-	text-decoration-color: #0f0;
-	text-decoration-style: wavy;
-}
-.cm-s-liquibyte .cm-trailingspace {
-	text-decoration: line-through;
-	text-decoration-color: #f00;
-	text-decoration-style: dotted;
-}
-.cm-s-liquibyte .cm-tab {
-	text-decoration: line-through;
-	text-decoration-color: #404040;
-	text-decoration-style: dotted;
-}
-.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
-.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
-.cm-s-liquibyte .CodeMirror-guttermarker {  }
-.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
-.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
-.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
-
-.cm-s-liquibyte span.cm-comment     { color: #008000; }
-.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-string      { color: #ff8000; }
-.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
-
-.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
-.cm-s-liquibyte span.cm-operator    { color: #fff; }
-
-.cm-s-liquibyte span.cm-meta        { color: #0f0; }
-.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
-.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
-.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
-.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-error       { color: #f00; }
-
-.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
-
-.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
-
-.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
-
-/* Default styles for common addons */
-.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
-.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
-/* Scrollbars */
-/* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
-	background-color: rgba(80, 80, 80, .7);
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
-	background-color: rgba(80, 80, 80, .3);
-	border: 1px solid #404040;
-	border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
-	border-top: 1px solid #404040;
-	border-bottom: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
-	border-left: 1px solid #404040;
-	border-right: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
-	background-color: #262626;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
-	background-color: #262626;
-	border-top: 1px solid #404040;
-}
-/* Overlay */
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
-	background-color: #404040;
-	border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
-	border: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
-	border: 1px solid #404040;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/material.css b/js/ckeditor/plugins/codemirror/theme/material.css
deleted file mode 100644
index 634a01ac1..000000000
--- a/js/ckeditor/plugins/codemirror/theme/material.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
-    Name:       material
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
-
-*/
-
-.cm-s-material.CodeMirror {
-  background-color: #263238;
-  color: rgba(233, 237, 237, 1);
-}
-.cm-s-material .CodeMirror-gutters {
-  background: #263238;
-  color: rgb(83,127,126);
-  border: none;
-}
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
-.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
-.cm-s-material .cm-builtin { color: #DECB6B; }
-.cm-s-material .cm-atom { color: #F77669; }
-.cm-s-material .cm-number { color: #F77669; }
-.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-string { color: #C3E88D; }
-.cm-s-material .cm-string-2 { color: #80CBC4; }
-.cm-s-material .cm-comment { color: #546E7A; }
-.cm-s-material .cm-variable { color: #82B1FF; }
-.cm-s-material .cm-tag { color: #80CBC4; }
-.cm-s-material .cm-meta { color: #80CBC4; }
-.cm-s-material .cm-attribute { color: #FFCB6B; }
-.cm-s-material .cm-property { color: #80CBAE; }
-.cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
-.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
-.cm-s-material .cm-error {
-  color: rgba(255, 255, 255, 1.0);
-  background-color: #EC5F67;
-}
-.cm-s-material .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/mbo.css b/js/ckeditor/plugins/codemirror/theme/mbo.css
deleted file mode 100644
index a64c0fd11..000000000
--- a/js/ckeditor/plugins/codemirror/theme/mbo.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************/
-/*   Based on mbonaci's Brackets mbo theme                      */
-/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
-/*   Create your own: http://tmtheme-editor.herokuapp.com       */
-/****************************************************************/
-
-.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
-.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
-.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
-.cm-s-mbo .CodeMirror-guttermarker { color: white; }
-.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
-.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
-
-.cm-s-mbo span.cm-comment { color: #95958a; }
-.cm-s-mbo span.cm-atom { color: #00a8c6; }
-.cm-s-mbo span.cm-number { color: #00a8c6; }
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
-.cm-s-mbo span.cm-keyword { color: #ffb928; }
-.cm-s-mbo span.cm-string { color: #ffcf6c; }
-.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
-
-.cm-s-mbo span.cm-variable { color: #ffffec; }
-.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
-.cm-s-mbo span.cm-def { color: #ffffec; }
-.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
-.cm-s-mbo span.cm-tag { color: #9ddfe9; }
-.cm-s-mbo span.cm-link { color: #f54b07; }
-.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
-.cm-s-mbo span.cm-qualifier { color: #ffffec; }
-
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
-.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/js/ckeditor/plugins/codemirror/theme/mdn-like.css b/js/ckeditor/plugins/codemirror/theme/mdn-like.css
deleted file mode 100644
index c8c6de0ad..000000000
--- a/js/ckeditor/plugins/codemirror/theme/mdn-like.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  MDN-LIKE Theme - Mozilla
-  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
-  GitHub: @peterkroon
-
-  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
-
-*/
-.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
-.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
-
-.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
-.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
-
-.cm-s-mdn-like .cm-keyword { color: #6262FF; }
-.cm-s-mdn-like .cm-atom { color: #F90; }
-.cm-s-mdn-like .cm-number { color:  #ca7841; }
-.cm-s-mdn-like .cm-def { color: #8DA6CE; }
-.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
-
-.cm-s-mdn-like .cm-variable { color: #07a; }
-.cm-s-mdn-like .cm-property { color: #905; }
-.cm-s-mdn-like .cm-qualifier { color: #690; }
-
-.cm-s-mdn-like .cm-operator { color: #cda869; }
-.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
-.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
-.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
-.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
-.cm-s-mdn-like .cm-tag { color: #997643; }
-.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-mdn-like .cm-header { color: #FF6400; }
-.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
-.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
-.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
-
-div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
-div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
-
-.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/js/ckeditor/plugins/codemirror/theme/midnight.css b/js/ckeditor/plugins/codemirror/theme/midnight.css
deleted file mode 100644
index d9bdc2c55..000000000
--- a/js/ckeditor/plugins/codemirror/theme/midnight.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
-
-.cm-s-midnight.CodeMirror {
-    background: #0F192A;
-    color: #D1EDFF;
-}
-
-.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
-.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
-.cm-s-midnight .CodeMirror-guttermarker { color: white; }
-.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
-.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
-
-.cm-s-midnight span.cm-comment { color: #428BDD; }
-.cm-s-midnight span.cm-atom { color: #AE81FF; }
-.cm-s-midnight span.cm-number { color: #D1EDFF; }
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
-.cm-s-midnight span.cm-keyword { color: #E83737; }
-.cm-s-midnight span.cm-string { color: #1DC116; }
-
-.cm-s-midnight span.cm-variable { color: #FFAA3E; }
-.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
-.cm-s-midnight span.cm-def { color: #4DD; }
-.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
-.cm-s-midnight span.cm-tag { color: #449; }
-.cm-s-midnight span.cm-link { color: #AE81FF; }
-.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
-
-.cm-s-midnight .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/monokai.css b/js/ckeditor/plugins/codemirror/theme/monokai.css
deleted file mode 100644
index 69be556c7..000000000
--- a/js/ckeditor/plugins/codemirror/theme/monokai.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
-.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
-.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
-.cm-s-monokai .CodeMirror-guttermarker { color: white; }
-.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-
-.cm-s-monokai span.cm-comment { color: #75715e; }
-.cm-s-monokai span.cm-atom { color: #ae81ff; }
-.cm-s-monokai span.cm-number { color: #ae81ff; }
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
-.cm-s-monokai span.cm-keyword { color: #f92672; }
-.cm-s-monokai span.cm-builtin { color: #66d9ef; }
-.cm-s-monokai span.cm-string { color: #e6db74; }
-
-.cm-s-monokai span.cm-variable { color: #f8f8f2; }
-.cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
-.cm-s-monokai span.cm-def { color: #fd971f; }
-.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
-.cm-s-monokai span.cm-tag { color: #f92672; }
-.cm-s-monokai span.cm-header { color: #ae81ff; }
-.cm-s-monokai span.cm-link { color: #ae81ff; }
-.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
-
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
-.cm-s-monokai .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/neat.css b/js/ckeditor/plugins/codemirror/theme/neat.css
deleted file mode 100644
index d454fbbb5..000000000
--- a/js/ckeditor/plugins/codemirror/theme/neat.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
-.cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
-.cm-s-neat span.cm-variable { color: black; }
-.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta { color: #555; }
-.cm-s-neat span.cm-link { color: #3a3; }
-
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/neo.css b/js/ckeditor/plugins/codemirror/theme/neo.css
deleted file mode 100644
index 42a0a49d8..000000000
--- a/js/ckeditor/plugins/codemirror/theme/neo.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* neo theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-neo.CodeMirror {
-  background-color:#ffffff;
-  color:#2e383c;
-  line-height:1.4375;
-}
-.cm-s-neo .cm-comment { color:#75787b; }
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
-.cm-s-neo .cm-string { color:#b35e14; }
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
-
-
-/* Editor styling */
-
-.cm-s-neo pre {
-  padding:0;
-}
-
-.cm-s-neo .CodeMirror-gutters {
-  border:none;
-  border-right:10px solid transparent;
-  background-color:transparent;
-}
-
-.cm-s-neo .CodeMirror-linenumber {
-  padding:0;
-  color:#e0e2e5;
-}
-
-.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
-.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
-
-.cm-s-neo .CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: rgba(155,157,162,0.37);
-  z-index: 1;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/night.css b/js/ckeditor/plugins/codemirror/theme/night.css
deleted file mode 100644
index 07925c52c..000000000
--- a/js/ckeditor/plugins/codemirror/theme/night.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Loosely based on the Midnight Textmate theme */
-
-.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447; }
-.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-guttermarker { color: white; }
-.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
-.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-night span.cm-comment { color: #8900d1; }
-.cm-s-night span.cm-atom { color: #845dc4; }
-.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
-.cm-s-night span.cm-keyword { color: #599eff; }
-.cm-s-night span.cm-string { color: #37f14a; }
-.cm-s-night span.cm-meta { color: #7678e2; }
-.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
-.cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
-.cm-s-night span.cm-link { color: #845dc4; }
-.cm-s-night span.cm-error { color: #9d1e15; }
-
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
-.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/panda-syntax.css b/js/ckeditor/plugins/codemirror/theme/panda-syntax.css
deleted file mode 100644
index e9da8ca06..000000000
--- a/js/ckeditor/plugins/codemirror/theme/panda-syntax.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	Name:       Panda Syntax
-	Author:     Siamak Mokhtari (http://github.com/siamak/)
-	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
-*/
-.cm-s-panda-syntax {
-	background: #292A2B;
-	color: #E6E6E6;
-	line-height: 1.5;
-	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
-}
-.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
-.cm-s-panda-syntax .CodeMirror-activeline-background {
-	background: rgba(99, 123, 156, 0.1);
-}
-.cm-s-panda-syntax .CodeMirror-selected {
-	background: #FFF;
-}
-.cm-s-panda-syntax .cm-comment {
-	font-style: italic;
-	color: #676B79;
-}
-.cm-s-panda-syntax .cm-operator {
-	color: #f3f3f3;
-}
-.cm-s-panda-syntax .cm-string {
-	color: #19F9D8;
-}
-.cm-s-panda-syntax .cm-string-2 {
-    color: #FFB86C;
-}
-
-.cm-s-panda-syntax .cm-tag {
-	color: #ff2c6d;
-}
-.cm-s-panda-syntax .cm-meta {
-	color: #b084eb;
-}
-
-.cm-s-panda-syntax .cm-number {
-	color: #FFB86C;
-}
-.cm-s-panda-syntax .cm-atom {
-	color: #ff2c6d;
-}
-.cm-s-panda-syntax .cm-keyword {
-	color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-variable {
-	color: #ffb86c;
-}
-.cm-s-panda-syntax .cm-variable-2 {
-	color: #ff9ac1;
-}
-.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
-	color: #ff9ac1;
-}
-
-.cm-s-panda-syntax .cm-def {
-	color: #e6e6e6;
-}
-.cm-s-panda-syntax .cm-property {
-	color: #f3f3f3;
-}
-.cm-s-panda-syntax .cm-unit {
-    color: #ffb86c;
-}
-
-.cm-s-panda-syntax .cm-attribute {
-    color: #ffb86c;
-}
-
-.cm-s-panda-syntax .CodeMirror-matchingbracket {
-    border-bottom: 1px dotted #19F9D8;
-    padding-bottom: 2px;
-    color: #e6e6e6;
-}
-.cm-s-panda-syntax .CodeMirror-gutters {
-    background: #292a2b;
-    border-right-color: rgba(255, 255, 255, 0.1);
-}
-.cm-s-panda-syntax .CodeMirror-linenumber {
-    color: #e6e6e6;
-    opacity: 0.6;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/paraiso-dark.css b/js/ckeditor/plugins/codemirror/theme/paraiso-dark.css
deleted file mode 100644
index 25eb9262f..000000000
--- a/js/ckeditor/plugins/codemirror/theme/paraiso-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Dark)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
-.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
-.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
-
-.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
-.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
-.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
-.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/paraiso-light.css b/js/ckeditor/plugins/codemirror/theme/paraiso-light.css
deleted file mode 100644
index 479792e98..000000000
--- a/js/ckeditor/plugins/codemirror/theme/paraiso-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Light)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
-.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
-.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
-.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
-
-.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-light span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-light span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-light span.cm-variable { color: #48b685; }
-.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-light span.cm-def { color: #f99b15; }
-.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
-.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-light span.cm-link { color: #815ba4; }
-.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
-
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/pastel-on-dark.css b/js/ckeditor/plugins/codemirror/theme/pastel-on-dark.css
deleted file mode 100644
index 9fcfea8aa..000000000
--- a/js/ckeditor/plugins/codemirror/theme/pastel-on-dark.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Pastel On Dark theme ported from ACE editor
- * @license MIT
- * @copyright AtomicPages LLC 2014
- * @author Dennis Thompson, AtomicPages LLC
- * @version 1.1
- * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
- */
-
-.cm-s-pastel-on-dark.CodeMirror {
-	background: #2c2827;
-	color: #8F938F;
-	line-height: 1.5;
-}
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
-
-.cm-s-pastel-on-dark .CodeMirror-gutters {
-	background: #34302f;
-	border-right: 0px;
-	padding: 0 3px;
-}
-.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
-.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
-.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
-.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
-.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
-.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
-.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
-.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
-.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-error {
-	background: #757aD8;
-	color: #f8f8f0;
-}
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
-.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
-	border: 1px solid rgba(255,255,255,0.25);
-	color: #8F938F !important;
-	margin: -1px -1px 0 -1px;
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/railscasts.css b/js/ckeditor/plugins/codemirror/theme/railscasts.css
deleted file mode 100644
index 2336e7c95..000000000
--- a/js/ckeditor/plugins/codemirror/theme/railscasts.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Railscasts
-    Author:     Ryan Bates (http://railscasts.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
-.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
-.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
-.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
-.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
-
-.cm-s-railscasts span.cm-comment {color: #bc9458;}
-.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
-.cm-s-railscasts span.cm-number {color: #b6b3eb;}
-
-.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
-.cm-s-railscasts span.cm-keyword {color: #da4939;}
-.cm-s-railscasts span.cm-string {color: #ffc66d;}
-
-.cm-s-railscasts span.cm-variable {color: #a5c261;}
-.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
-.cm-s-railscasts span.cm-def {color: #cc7833;}
-.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
-.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
-.cm-s-railscasts span.cm-tag {color: #da4939;}
-.cm-s-railscasts span.cm-link {color: #b6b3eb;}
-
-.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/js/ckeditor/plugins/codemirror/theme/rubyblue.css b/js/ckeditor/plugins/codemirror/theme/rubyblue.css
deleted file mode 100644
index 8d4c17f04..000000000
--- a/js/ckeditor/plugins/codemirror/theme/rubyblue.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
-.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
-.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
-.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
-.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
-.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
-.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
-.cm-s-rubyblue span.cm-keyword { color: #F0F; }
-.cm-s-rubyblue span.cm-string { color: #F08047; }
-.cm-s-rubyblue span.cm-meta { color: #F0F; }
-.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
-.cm-s-rubyblue span.cm-bracket { color: #F0F; }
-.cm-s-rubyblue span.cm-link { color: #F4C20B; }
-.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
-.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
-
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/js/ckeditor/plugins/codemirror/theme/seti.css b/js/ckeditor/plugins/codemirror/theme/seti.css
deleted file mode 100644
index 400f0a5a9..000000000
--- a/js/ckeditor/plugins/codemirror/theme/seti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-    Name:       seti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
-
-*/
-
-
-.cm-s-seti.CodeMirror {
-  background-color: #151718 !important;
-  color: #CFD2D1 !important;
-  border: none;
-}
-.cm-s-seti .CodeMirror-gutters {
-  color: #404b53;
-  background-color: #0E1112;
-  border: none;
-}
-.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti span.cm-comment { color: #41535b; }
-.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
-.cm-s-seti span.cm-number { color: #cd3f45; }
-.cm-s-seti span.cm-variable { color: #55b5db; }
-.cm-s-seti span.cm-variable-2 { color: #a074c4; }
-.cm-s-seti span.cm-def { color: #55b5db; }
-.cm-s-seti span.cm-keyword { color: #ff79c6; }
-.cm-s-seti span.cm-operator { color: #9fca56; }
-.cm-s-seti span.cm-keyword { color: #e6cd69; }
-.cm-s-seti span.cm-atom { color: #cd3f45; }
-.cm-s-seti span.cm-meta { color: #55b5db; }
-.cm-s-seti span.cm-tag { color: #55b5db; }
-.cm-s-seti span.cm-attribute { color: #9fca56; }
-.cm-s-seti span.cm-qualifier { color: #9fca56; }
-.cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
-.cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/solarized.css b/js/ckeditor/plugins/codemirror/theme/solarized.css
deleted file mode 100644
index 44777cb62..000000000
--- a/js/ckeditor/plugins/codemirror/theme/solarized.css
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-Solarized theme for code-mirror
-http://ethanschoonover.com/solarized
-*/
-
-/*
-Solarized color palette
-http://ethanschoonover.com/solarized/img/solarized-palette.png
-*/
-
-.solarized.base03 { color: #002b36; }
-.solarized.base02 { color: #073642; }
-.solarized.base01 { color: #586e75; }
-.solarized.base00 { color: #657b83; }
-.solarized.base0 { color: #839496; }
-.solarized.base1 { color: #93a1a1; }
-.solarized.base2 { color: #eee8d5; }
-.solarized.base3  { color: #fdf6e3; }
-.solarized.solar-yellow  { color: #b58900; }
-.solarized.solar-orange  { color: #cb4b16; }
-.solarized.solar-red { color: #dc322f; }
-.solarized.solar-magenta { color: #d33682; }
-.solarized.solar-violet  { color: #6c71c4; }
-.solarized.solar-blue { color: #268bd2; }
-.solarized.solar-cyan { color: #2aa198; }
-.solarized.solar-green { color: #859900; }
-
-/* Color scheme for code-mirror */
-
-.cm-s-solarized {
-  line-height: 1.45em;
-  color-profile: sRGB;
-  rendering-intent: auto;
-}
-.cm-s-solarized.cm-s-dark {
-  color: #839496;
-  background-color: #002b36;
-  text-shadow: #002b36 0 1px;
-}
-.cm-s-solarized.cm-s-light {
-  background-color: #fdf6e3;
-  color: #657b83;
-  text-shadow: #eee8d5 0 1px;
-}
-
-.cm-s-solarized .CodeMirror-widget {
-  text-shadow: none;
-}
-
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
-
-.cm-s-solarized .cm-keyword { color: #cb4b16; }
-.cm-s-solarized .cm-atom { color: #d33682; }
-.cm-s-solarized .cm-number { color: #d33682; }
-.cm-s-solarized .cm-def { color: #2aa198; }
-
-.cm-s-solarized .cm-variable { color: #839496; }
-.cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
-
-.cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator { color: #6c71c4; }
-
-.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
-
-.cm-s-solarized .cm-string { color: #859900; }
-.cm-s-solarized .cm-string-2 { color: #b58900; }
-
-.cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-qualifier { color: #b58900; }
-.cm-s-solarized .cm-builtin { color: #d33682; }
-.cm-s-solarized .cm-bracket { color: #cb4b16; }
-.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
-.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1; }
-.cm-s-solarized .cm-attribute { color: #2aa198; }
-.cm-s-solarized .cm-hr {
-  color: transparent;
-  border-top: 1px solid #586e75;
-  display: block;
-}
-.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
-.cm-s-solarized .cm-special { color: #6c71c4; }
-.cm-s-solarized .cm-em {
-  color: #999;
-  text-decoration: underline;
-  text-decoration-style: dotted;
-}
-.cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
-  color: #586e75;
-  border-bottom: 1px dotted #dc322f;
-}
-
-.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
-.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
-.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
-
-.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
-
-/* Editor styling */
-
-
-
-/* Little shadow on the view-port of the buffer view */
-.cm-s-solarized.CodeMirror {
-  -moz-box-shadow: inset 7px 0 12px -6px #000;
-  -webkit-box-shadow: inset 7px 0 12px -6px #000;
-  box-shadow: inset 7px 0 12px -6px #000;
-}
-
-/* Remove gutter border */
-.cm-s-solarized .CodeMirror-gutters {
-  border-right: 0;
-}
-
-/* Gutter colors and line number styling based of color scheme (dark / light) */
-
-/* Dark */
-.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color: #073642;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
-  color: #586e75;
-  text-shadow: #021014 0 -1px;
-}
-
-/* Light */
-.cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #eee8d5;
-}
-
-.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
-  color: #839496;
-}
-
-/* Common */
-.cm-s-solarized .CodeMirror-linenumber {
-  padding: 0 5px;
-}
-.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
-.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
-.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
-
-.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: #586e75;
-}
-
-/* Cursor */
-.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
-
-/* Fat cursor */
-.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
-.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
-.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
-.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
-
-/* Active line */
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.06);
-}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.06);
-}
diff --git a/js/ckeditor/plugins/codemirror/theme/the-matrix.css b/js/ckeditor/plugins/codemirror/theme/the-matrix.css
deleted file mode 100644
index 2106c192c..000000000
--- a/js/ckeditor/plugins/codemirror/theme/the-matrix.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
-.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
-.cm-s-the-matrix span.cm-atom { color: #3FF; }
-.cm-s-the-matrix span.cm-number { color: #FFB94F; }
-.cm-s-the-matrix span.cm-def { color: #99C; }
-.cm-s-the-matrix span.cm-variable { color: #F6C; }
-.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
-.cm-s-the-matrix span.cm-property { color: #62FFA0; }
-.cm-s-the-matrix span.cm-operator { color: #999; }
-.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
-.cm-s-the-matrix span.cm-string { color: #39C; }
-.cm-s-the-matrix span.cm-meta { color: #C9F; }
-.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
-.cm-s-the-matrix span.cm-builtin { color: #30a; }
-.cm-s-the-matrix span.cm-bracket { color: #cc7; }
-.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
-.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
-.cm-s-the-matrix span.cm-error { color: #FF0000; }
-
-.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/js/ckeditor/plugins/codemirror/theme/tomorrow-night-bright.css b/js/ckeditor/plugins/codemirror/theme/tomorrow-night-bright.css
deleted file mode 100644
index 5d567c7e8..000000000
--- a/js/ckeditor/plugins/codemirror/theme/tomorrow-night-bright.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Bright
-    Author:     Chris Kempson
-
-    Port done by Gerard Braad <me@gbraad.nl>
-
-*/
-
-.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
-.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
-
-.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
-.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
-.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
-.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
-.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
-.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css b/js/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css
deleted file mode 100644
index 0eef9fedb..000000000
--- a/js/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Eighties
-    Author:     Chris Kempson
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
-
-.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
-.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
-.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/ttcn.css b/js/ckeditor/plugins/codemirror/theme/ttcn.css
deleted file mode 100644
index 69c9a0912..000000000
--- a/js/ckeditor/plugins/codemirror/theme/ttcn.css
+++ /dev/null
@@ -1,64 +0,0 @@
-.cm-s-ttcn .cm-quote { color: #090; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-link { text-decoration: underline; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
-
-.cm-s-ttcn .cm-atom { color: #219; }
-.cm-s-ttcn .cm-attribute { color: #00c; }
-.cm-s-ttcn .cm-bracket { color: #997; }
-.cm-s-ttcn .cm-comment { color: #333333; }
-.cm-s-ttcn .cm-def { color: #00f; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-error { color: #f00; }
-.cm-s-ttcn .cm-hr { color: #999; }
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-.cm-s-ttcn .cm-keyword { font-weight:bold; }
-.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
-.cm-s-ttcn .cm-meta { color: #555; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-qualifier { color: #555; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-string { color: #006400; }
-.cm-s-ttcn .cm-string-2 { color: #f50; }
-.cm-s-ttcn .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-tag { color: #170; }
-.cm-s-ttcn .cm-variable { color: #8B2252; }
-.cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
-
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-
-/* ASN */
-.cm-s-ttcn .cm-accessTypes,
-.cm-s-ttcn .cm-compareTypes { color: #27408B; }
-.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
-.cm-s-ttcn .cm-modifier { color:#D2691E; }
-.cm-s-ttcn .cm-status { color:#8B4545; }
-.cm-s-ttcn .cm-storage { color:#A020F0; }
-.cm-s-ttcn .cm-tags { color:#006400; }
-
-/* CFG */
-.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
-.cm-s-ttcn .cm-fileNCtrlMaskOptions,
-.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
-
-/* TTCN */
-.cm-s-ttcn .cm-booleanConsts,
-.cm-s-ttcn .cm-otherConsts,
-.cm-s-ttcn .cm-verdictConsts { color: #006400; }
-.cm-s-ttcn .cm-configOps,
-.cm-s-ttcn .cm-functionOps,
-.cm-s-ttcn .cm-portOps,
-.cm-s-ttcn .cm-sutOps,
-.cm-s-ttcn .cm-timerOps,
-.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
-.cm-s-ttcn .cm-preprocessor,
-.cm-s-ttcn .cm-templateMatch,
-.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
-.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
-.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/js/ckeditor/plugins/codemirror/theme/twilight.css b/js/ckeditor/plugins/codemirror/theme/twilight.css
deleted file mode 100644
index 8e6cb74e3..000000000
--- a/js/ckeditor/plugins/codemirror/theme/twilight.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
-.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
-.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
-
-.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
-.cm-s-twilight .CodeMirror-guttermarker { color: white; }
-.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
-.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
-.cm-s-twilight .cm-atom { color: #FC0; }
-.cm-s-twilight .cm-number { color:  #ca7841; } /**/
-.cm-s-twilight .cm-def { color: #8DA6CE; }
-.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
-.cm-s-twilight .cm-operator { color: #cda869; } /**/
-.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
-.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
-.cm-s-twilight .cm-tag { color: #997643; } /**/
-.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-twilight .cm-header { color: #FF6400; }
-.cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/vibrant-ink.css b/js/ckeditor/plugins/codemirror/theme/vibrant-ink.css
deleted file mode 100644
index e90019510..000000000
--- a/js/ckeditor/plugins/codemirror/theme/vibrant-ink.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
-
-.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
-.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
-.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
-
-.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
-.cm-s-vibrant-ink .cm-atom { color: #FC0; }
-.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
-.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
-.cm-s-vibrant-ink .cm-operator { color: #888; }
-.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
-.cm-s-vibrant-ink .cm-string-2 { color: red; }
-.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-header { color: #FF6400; }
-.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/xq-dark.css b/js/ckeditor/plugins/codemirror/theme/xq-dark.css
deleted file mode 100644
index 039b5a03b..000000000
--- a/js/ckeditor/plugins/codemirror/theme/xq-dark.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
-.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
-.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-dark span.cm-number { color: #164; }
-.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
-.cm-s-xq-dark span.cm-variable { color: #FFF; }
-.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment { color: gray; }
-.cm-s-xq-dark span.cm-string { color: #9FEE00; }
-.cm-s-xq-dark span.cm-meta { color: yellow; }
-.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
-.cm-s-xq-dark span.cm-builtin { color: #30a; }
-.cm-s-xq-dark span.cm-bracket { color: #cc7; }
-.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
-.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
-.cm-s-xq-dark span.cm-error { color: #f00; }
-
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/js/ckeditor/plugins/codemirror/theme/xq-light.css b/js/ckeditor/plugins/codemirror/theme/xq-light.css
deleted file mode 100644
index 1c6c63b78..000000000
--- a/js/ckeditor/plugins/codemirror/theme/xq-light.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-light span.cm-number { color: #164; }
-.cm-s-xq-light span.cm-def { text-decoration:underline; }
-.cm-s-xq-light span.cm-variable { color: black; }
-.cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
-.cm-s-xq-light span.cm-property {}
-.cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
-.cm-s-xq-light span.cm-string { color: red; }
-.cm-s-xq-light span.cm-meta { color: yellow; }
-.cm-s-xq-light span.cm-qualifier { color: grey; }
-.cm-s-xq-light span.cm-builtin { color: #7EA656; }
-.cm-s-xq-light span.cm-bracket { color: #cc7; }
-.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
-.cm-s-xq-light span.cm-attribute { color: #7F007F; }
-.cm-s-xq-light span.cm-error { color: #f00; }
-
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/js/ckeditor/plugins/codemirror/theme/yeti.css b/js/ckeditor/plugins/codemirror/theme/yeti.css
deleted file mode 100644
index 1edc1dd1c..000000000
--- a/js/ckeditor/plugins/codemirror/theme/yeti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-    Name:       yeti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
-
-*/
-
-
-.cm-s-yeti.CodeMirror {
-  background-color: #ECEAE8 !important;
-  color: #d1c9c0 !important;
-  border: none;
-}
-
-.cm-s-yeti .CodeMirror-gutters {
-  color: #adaba6;
-  background-color: #E5E1DB;
-  border: none;
-}
-.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
-.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
-.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
-.cm-s-yeti span.cm-comment { color: #d4c8be; }
-.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
-.cm-s-yeti span.cm-number { color: #a074c4; }
-.cm-s-yeti span.cm-variable { color: #55b5db; }
-.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
-.cm-s-yeti span.cm-def { color: #55b5db; }
-.cm-s-yeti span.cm-operator { color: #9fb96e; }
-.cm-s-yeti span.cm-keyword { color: #9fb96e; }
-.cm-s-yeti span.cm-atom { color: #a074c4; }
-.cm-s-yeti span.cm-meta { color: #96c0d8; }
-.cm-s-yeti span.cm-tag { color: #96c0d8; }
-.cm-s-yeti span.cm-attribute { color: #9fb96e; }
-.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
-.cm-s-yeti span.cm-property { color: #a074c4; }
-.cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/js/ckeditor/plugins/codemirror/theme/zenburn.css b/js/ckeditor/plugins/codemirror/theme/zenburn.css
deleted file mode 100644
index 69cecea7d..000000000
--- a/js/ckeditor/plugins/codemirror/theme/zenburn.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * "
- *  Using Zenburn color palette from the Emacs Zenburn Theme
- *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
- *
- *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
- * "
- * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
- */
-
-.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
-.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
-.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
-.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
-.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
-.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
-.cm-s-zenburn span.cm-atom { color: #bfebbf; }
-.cm-s-zenburn span.cm-def { color: #dcdccc; }
-.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
-.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
-.cm-s-zenburn span.cm-string { color: #cc9393; }
-.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
-.cm-s-zenburn span.cm-number { color: #dcdccc; }
-.cm-s-zenburn span.cm-tag { color: #93e0e3; }
-.cm-s-zenburn span.cm-property { color: #dfaf8f; }
-.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
-.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
-.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
-.cm-s-zenburn span.cm-header { color: #f0efd0; }
-.cm-s-zenburn span.cm-operator { color: #f0efd0; }
-.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
-.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
-.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
-.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
-.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
-.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/js/ckeditor/plugins/dialog/dialogDefinition.js b/js/ckeditor/plugins/dialog/dialogDefinition.js
deleted file mode 100644
index 5c35976df..000000000
--- a/js/ckeditor/plugins/dialog/dialogDefinition.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
diff --git a/js/ckeditor/plugins/icons.png b/js/ckeditor/plugins/icons.png
deleted file mode 100644
index ad22906e8..000000000
Binary files a/js/ckeditor/plugins/icons.png and /dev/null differ
diff --git a/js/ckeditor/plugins/icons_hidpi.png b/js/ckeditor/plugins/icons_hidpi.png
deleted file mode 100644
index 7c76e52e8..000000000
Binary files a/js/ckeditor/plugins/icons_hidpi.png and /dev/null differ
diff --git a/js/ckeditor/plugins/inline_resize/plugin.js b/js/ckeditor/plugins/inline_resize/plugin.js
deleted file mode 100644
index eefac2e37..000000000
--- a/js/ckeditor/plugins/inline_resize/plugin.js
+++ /dev/null
@@ -1,165 +0,0 @@
-( function() {
-  var win      = CKEDITOR.document.getWindow(),
-      pixelate = CKEDITOR.tools.cssLength;
-
-  CKEDITOR.plugins.add('inline_resize', {
-    init: function( editor ) {
-      var config = editor.config;
-
-      editor.on('loaded', function() {
-        attach(editor);
-      }, null, null, 20); // same priority as floatspace so that both get initialized
-    }
-  });
-
-  function parentScroll(e) {
-    var position = e.$.getAttribute("position"),
-        excludeStaticParent = position === "absolute";
-    return e.getParents().filter( function(parent) {
-      var style = window.getComputedStyle(parent.$);
-      if ( excludeStaticParent && style.position === "static" )
-        return false;
-      return (/(auto|scroll)/).test( style['overflow'] + style["overflow-y"] + style["overflow-x"] );
-    });
-  };
-
-  function parentDialog(e) {
-    return e.getParents().filter( function(parent) {
-      return parent.$.classList.contains("ui-dialog-content")
-    })[0];
-  };
-
-  function attach( editor ) {
-    var config = editor.config,
-        parent = parentScroll(editor.element),
-        divelt = editor.element.getNext(function(elt){return elt.getAttribute("class") === "cke_textarea_inline"}),
-        inline = editor.element.$.classList.contains("texteditor-in-dialog");
-
-    var dialog;
-
-    if (inline) {
-      dialog = parentDialog(divelt);
-    }
-
-    var resize = function (width, height) {
-      var editable;
-      if ( !( editable = editor.editable() ) )
-        return;
-
-      editable.setStyle('width',  pixelate(width));
-      editable.setStyle('height', pixelate(height));
-    }
-
-    var layout = function ( evt ) {
-      var editable;
-      if ( !( editable = editor.editable() ) )
-          return;
-
-      // Show up the space on focus gain.
-      if (  evt && evt.name == 'focus' )
-        float_space.show();
-
-      var editorPos  = editable.getDocumentPosition();
-      var editorRect = editable.getClientRect();
-      var floatRect  = float_space.getClientRect();
-      var viewRect   = win.getViewPaneSize();
-
-      float_space.setStyle( 'position', 'absolute' );
-      if (inline) {
-        var dialogPos = dialog.getDocumentPosition();
-        float_space.setStyle( 'top',  pixelate( editorPos.y - dialogPos.y + editorRect.height - floatRect.height + 1 ) );
-
-        //float_space.setStyle( 'left', pixelate( editorPos.x - dialogPos.x + editorRect.width  - floatRect.width ) );
-        // floatRect.width seems to be far to high on first dialog popup
-        float_space.setStyle( 'left', pixelate( editorPos.x - dialogPos.x + editorRect.width  - 11 ) );
-      } else {
-        float_space.setStyle( 'top',    pixelate( editorPos.y + editorRect.height - floatRect.height + 1) );
-        float_space.setStyle( 'right',  pixelate( viewRect.width - editorRect.right ) );
-      }
-    };
-
-    var float_html  = '<div class="cke_editor_inline_resize_button">\u25E2</div>'; // class so that csss can overrise content and style
-    var float_space = inline ? divelt.getParent().append( CKEDITOR.dom.element.createFromHtml( float_html ))
-                             : CKEDITOR.document.getBody().append( CKEDITOR.dom.element.createFromHtml( float_html ));
-
-    var drag_handler = function( evt ) {
-      var width  = startSize.width  + evt.data.$.screenX - origin.x,
-          height = startSize.height + evt.data.$.screenY - origin.y;
-
-      width  = Math.max( config.resize_minWidth  || 200, Math.min( width  || 0, config.resize_maxWidth  || 9000) );
-      height = Math.max( config.resize_minHeight || 75,  Math.min( height || 0, config.resize_maxHeight || 9000) );
-
-      resize( width, height );
-      layout();
-    };
-
-    var drag_end_handler = function() {
-      CKEDITOR.document.removeListener( 'mousemove', drag_handler );
-      CKEDITOR.document.removeListener( 'mouseup',   drag_end_handler );
-
-      if ( editor.document ) {
-        editor.document.removeListener( 'mousemove', drag_handler );
-        editor.document.removeListener( 'mouseup',   drag_end_handler );
-      }
-    }
-
-    var mousedown_fn =  function( evt ) {
-      var editable;
-      if ( !( editable = editor.editable() ) )
-        return;
-
-      var editorRect = editable.getClientRect();
-      startSize      = { width: editorRect.width, height: editorRect.height };
-      origin         = { x: evt.data.$.screenX, y: evt.data.$.screenY };
-
-      if (config.resize_minWidth  > startSize.width)   config.resize_minWidth = startSize.width;
-      if (config.resize_minHeight > startSize.height) config.resize_minHeight = startSize.height;
-
-      CKEDITOR.document.on( 'mousemove', drag_handler );
-      CKEDITOR.document.on( 'mouseup',   drag_end_handler );
-
-      if ( editor.document ) {
-        editor.document.on( 'mousemove', drag_handler );
-        editor.document.on( 'mouseup',   drag_end_handler );
-      }
-
-      evt.data.$.preventDefault();
-    };
-
-    float_space.setStyle( 'overflow', 'hidden' );
-    float_space.setStyle( 'cursor', 'se-resize' )
-    float_space.on('mousedown', mousedown_fn);
-    float_space.unselectable();
-    float_space.hide();
-
-    editor.on( 'focus', function( evt ) {
-      layout( evt );
-    } );
-
-    parent.forEach(function(e){
-      e.on('scroll', function (evt) { layout(evt) });
-    });
-
-    editor.on( 'blur', function() {
-      float_space.hide();
-    } );
-
-    editor.on( 'destroy', function() {
-      float_space.remove();
-    } );
-
-    if ( editor.focusManager.hasFocus )
-      float_space.show();
-
-    editor.focusManager.add( float_space, 1 );
-  }
-
-})();
-
-/*
-  TODO
-   * ltr support
-   * textarea/div mode safe, currently simply assumes that textarea inline is used
-   * positioning of resize handle is not browser zomm safe
-   * positioning of resize handle in dialog with scroll bars is broken
-*/
diff --git a/js/ckeditor/plugins/link/dialogs/anchor.js b/js/ckeditor/plugins/link/dialogs/anchor.js
deleted file mode 100644
index 50677e167..000000000
--- a/js/ckeditor/plugins/link/dialogs/anchor.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("anchor",function(c){function e(b,a){return b.createFakeElement(b.document.createElement("a",{attributes:a}),"cke_anchor","anchor")}return{title:c.lang.link.anchor.title,minWidth:300,minHeight:60,onOk:function(){var b=CKEDITOR.tools.trim(this.getValueOf("info","txtName")),a={id:b,name:b,"data-cke-saved-name":b};this._.selectedElement?this._.selectedElement.data("cke-realelement")?(b=e(c,a),b.replace(this._.selectedElement),CKEDITOR.env.ie&&c.getSelection().selectElement(b)):this._.selectedElement.setAttributes(a):
-(b=(b=c.getSelection())&&b.getRanges()[0],b.collapsed?(a=e(c,a),b.insertNode(a)):(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(a["class"]="cke_anchor"),a=new CKEDITOR.style({element:"a",attributes:a}),a.type=CKEDITOR.STYLE_INLINE,a.applyToRange(b)))},onHide:function(){delete this._.selectedElement},onShow:function(){var b=c.getSelection(),a;a=b.getRanges()[0];var d=b.getSelectedElement();a.shrink(CKEDITOR.SHRINK_ELEMENT);a=(d=a.getEnclosedNode())&&d.type===CKEDITOR.NODE_ELEMENT&&("anchor"===d.data("cke-real-element-type")||
-d.is("a"))?d:void 0;var f=(d=a&&a.data("cke-realelement"))?CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a):CKEDITOR.plugins.link.getSelectedLink(c);if(f){this._.selectedElement=f;var e=f.data("cke-saved-name");this.setValueOf("info","txtName",e||"");!d&&b.selectElement(f);a&&(this._.selectedElement=a)}this.getContentElement("info","txtName").focus()},contents:[{id:"info",label:c.lang.link.anchor.title,accessKey:"I",elements:[{type:"text",id:"txtName",label:c.lang.link.anchor.name,required:!0,validate:function(){return this.getValue()?
-!0:(alert(c.lang.link.anchor.errorName),!1)}}]}]}});
\ No newline at end of file
diff --git a/js/ckeditor/plugins/link/dialogs/link.js b/js/ckeditor/plugins/link/dialogs/link.js
deleted file mode 100644
index e8581a779..000000000
--- a/js/ckeditor/plugins/link/dialogs/link.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){CKEDITOR.dialog.add("link",function(c){function t(a,b){var c=a.createRange();c.setStartBefore(b);c.setEndAfter(b);return c}var n=CKEDITOR.plugins.link,q,r=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),p=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),p){case "frame":a.setLabel(c.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(c.lang.link.targetPopupName);
-a.getElement().show();break;default:a.setValue(p),a.getElement().hide()}},l=function(a){a.target&&this.setValue(a.target[this.id]||"")},e=function(a){a.advanced&&this.setValue(a.advanced[this.id]||"")},k=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},m=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},g=c.lang.common,b=c.lang.link,d;return{title:b.title,minWidth:"moono-lisa"==(CKEDITOR.skinName||c.config.skin)?450:350,minHeight:240,contents:[{id:"info",
-label:b.info,title:b.info,elements:[{type:"text",id:"linkDisplayText",label:b.displayText,setup:function(){this.enable();this.setValue(c.getSelection().getSelectedText());q=this.getValue()},commit:function(a){a.linkText=this.isEnabled()?this.getValue():""}},{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],[b.toAnchor,"anchor"],[b.toEmail,"email"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions"],p=this.getValue(),f=a.definition.getContents("upload"),
-f=f&&f.hidden;"url"==p?(c.config.linkShowTargetTab&&a.showPage("target"),f||a.showPage("upload")):(a.hidePage("target"),f||a.hidePage("upload"));for(f=0;f<b.length;f++){var h=a.getContentElement("info",b[f]);h&&(h=h.getElement().getParent().getParent(),b[f]==p+"Options"?h.show():h.hide())}a.layout()},setup:function(a){this.setValue(a.type||"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",
-label:g.protocol,"default":"http://",items:[["http://‎","http://"],["https://‎","https://"],["ftp://‎","ftp://"],["news://‎","news://"],[b.other,""]],setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:g.url,required:!0,onLoad:function(){this.allowOnChange=!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),c=/^((javascript:)|[#\/\.\?])/i,
-f=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);f?(this.setValue(b.substr(f[0].length)),a.setValue(f[0].toLowerCase())):c.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?!0:!c.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(g.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},
-setup:function(a){this.allowOnChange=!1;a.url&&this.setValue(a.url.url);this.allowOnChange=!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",id:"browse",hidden:"true",filebrowser:"info:url",label:g.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",
-label:b.selectAnchor,setup:function(){d=n.getEditorAnchors(c);this.getElement()[d&&d.length?"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=0;b<d.length;b++)d[b].name&&this.add(d[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||
-(a.anchor={});a.anchor.name=this.getValue()}},{type:"select",id:"anchorId","default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=0;b<d.length;b++)d[b].id&&this.add(d[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[d&&d.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+
-CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",focus:!0,setup:function(){this.getElement()[d&&d.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):
-!0},setup:function(a){a.email&&this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&
-this.setValue(a.email.body)},commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:g.target,"default":"notSet",style:"width : 100%;",items:[[g.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[g.targetNew,
-"_blank"],[g.targetTop,"_top"],[g.targetSelf,"_self"],[g.targetParent,"_parent"]],onChange:r,setup:function(a){a.target&&this.setValue(a.target.type||"notSet");r.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",
-width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",children:[{type:"checkbox",id:"resizable",label:b.popupResizable,setup:l,commit:k},{type:"checkbox",id:"status",label:b.popupStatusBar,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:l,commit:k},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",
-label:b.popupMenuBar,setup:l,commit:k},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"scrollbars",label:b.popupScrollBars,setup:l,commit:k},{type:"checkbox",id:"dependent",label:b.popupDependent,setup:l,commit:k}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:g.width,id:"width",setup:l,commit:k},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",
-setup:l,commit:k}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:g.height,id:"height",setup:l,commit:k},{type:"text",labelLayout:"horizontal",label:b.popupTop,widths:["50%","50%"],id:"top",setup:l,commit:k}]}]}]}]},{id:"upload",label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:g.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:g.uploadSubmit,filebrowser:"info:url","for":["upload",
-"upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",id:"advId",requiredContent:"a[id]",label:b.id,setup:e,commit:m},{type:"select",id:"advLangDir",requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[g.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:e,commit:m},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,
-maxLength:1,setup:e,commit:m}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,id:"advName",requiredContent:"a[name]",setup:e,commit:m},{type:"text",label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px","default":"",setup:e,commit:m},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:e,commit:m}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,
-requiredContent:"a[title]","default":"",id:"advTitle",setup:e,commit:m},{type:"text",label:b.advisoryContentType,requiredContent:"a[type]","default":"",id:"advContentType",setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:e,commit:m},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",
-label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:e,commit:m},{type:"text",label:b.styles,requiredContent:"a{cke-xyz}","default":"",id:"advStyles",validate:CKEDITOR.dialog.validate.inlineStyle(c.lang.common.invalidInlineStyle),setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"checkbox",id:"download",requiredContent:"a[download]",label:b.download,setup:function(a){void 0!==a.download&&this.setValue("checked","checked")},commit:function(a){this.getValue()&&(a.download=
-this.getValue())}}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent(),f=n.getSelectedLink(a,!0),h=f[0]||null;h&&h.hasAttribute("href")&&(b.getSelectedElement()||b.isInTable()||b.selectElement(h));b=n.parseLinkAttributes(a,h);1>=f.length&&n.showDisplayTextForElement(h,a)?c.show():c.hide();this._.selectedElements=f;this.setupContent(b)},onOk:function(){var a={};this.commitContent(a);if(this._.selectedElements.length){var b=
-this._.selectedElements,g=n.getLinkAttributes(c,a),f=[],h,d,l,e,k;for(k=0;k<b.length;k++){h=b[k];d=h.data("cke-saved-href");l=h.getHtml();h.setAttributes(g.set);h.removeAttributes(g.removed);if(a.linkText&&q!=a.linkText)e=a.linkText;else if(d==l||"email"==a.type&&-1!=l.indexOf("@"))e="email"==a.type?a.email.address:g.set["data-cke-saved-href"];e&&h.setText(e);f.push(t(c,h))}c.getSelection().selectRanges(f);delete this._.selectedElements}else{b=n.getLinkAttributes(c,a);g=c.getSelection().getRanges();
-f=new CKEDITOR.style({element:"a",attributes:b.set});h=[];f.type=CKEDITOR.STYLE_INLINE;for(l=0;l<g.length;l++){d=g[l];d.collapsed?(e=new CKEDITOR.dom.text(a.linkText||("email"==a.type?a.email.address:b.set["data-cke-saved-href"]),c.document),d.insertNode(e),d.selectNodeContents(e)):q!==a.linkText&&(e=new CKEDITOR.dom.text(a.linkText,c.document),d.shrink(CKEDITOR.SHRINK_TEXT),c.editable().extractHtmlFromRange(d),d.insertNode(e));e=d._find("a");for(k=0;k<e.length;k++)e[k].remove(!0);f.applyToRange(d,
-c);h.push(d)}c.getSelection().selectRanges(h)}},onLoad:function(){c.config.linkShowAdvancedTab||this.hidePage("advanced");c.config.linkShowTargetTab||this.hidePage("target")},onFocus:function(){var a=this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
diff --git a/js/ckeditor/plugins/link/images/anchor.png b/js/ckeditor/plugins/link/images/anchor.png
deleted file mode 100644
index d94adb413..000000000
Binary files a/js/ckeditor/plugins/link/images/anchor.png and /dev/null differ
diff --git a/js/ckeditor/plugins/link/images/hidpi/anchor.png b/js/ckeditor/plugins/link/images/hidpi/anchor.png
deleted file mode 100644
index 186c3e916..000000000
Binary files a/js/ckeditor/plugins/link/images/hidpi/anchor.png and /dev/null differ
diff --git a/js/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js b/js/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
deleted file mode 100644
index 048361c60..000000000
--- a/js/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("sourcedialog",function(a){var b=CKEDITOR.document.getWindow().getViewPaneSize(),e=Math.min(b.width-70,800),b=b.height/1.5,d;return{title:a.lang.sourcedialog.title,minWidth:100,minHeight:100,onShow:function(){this.setValueOf("main","data",d=a.getData())},onOk:function(){function b(f,c){a.focus();a.setData(c,function(){f.hide();var b=a.createRange();b.moveToElementEditStart(a.editable());b.select()})}return function(){var a=this.getValueOf("main","data").replace(/\r/g,""),c=this;
-if(a===d)return!0;setTimeout(function(){b(c,a)});return!1}}(),contents:[{id:"main",label:a.lang.sourcedialog.title,elements:[{type:"textarea",id:"data",dir:"ltr",inputStyle:"cursor:auto;width:"+e+"px;height:"+b+"px;tab-size:4;text-align:left;","class":"cke_source"}]}]}});
\ No newline at end of file
diff --git a/js/ckeditor/samples/css/samples.css b/js/ckeditor/samples/css/samples.css
deleted file mode 100644
index f1973d0ff..000000000
--- a/js/ckeditor/samples/css/samples.css
+++ /dev/null
@@ -1,1632 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-@media (max-width: 900px) {
-  .global-is-mobile-hidden {
-    display: none !important;
-  }
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section {
-  display: block;
-}
-body,
-html {
-  margin: 0;
-  padding: 0;
-  font: 16px / 1.8 Arial, 'Helvetica Neue', Helvetica, sans-serif;
-  font-weight: 300;
-  color: #575757;
-}
-.grid-width-10 {
-  width: 10%;
-}
-.grid-width-20 {
-  width: 20%;
-}
-.grid-width-30 {
-  width: 30%;
-}
-.grid-width-40 {
-  width: 40%;
-}
-.grid-width-50 {
-  width: 50%;
-}
-.grid-width-60 {
-  width: 60%;
-}
-.grid-width-70 {
-  width: 70%;
-}
-.grid-width-80 {
-  width: 80%;
-}
-.grid-width-90 {
-  width: 90%;
-}
-.grid-width-100 {
-  width: 100%;
-}
-@media (max-width: 900px) {
-  .grid-width-10,
-  .grid-width-20,
-  .grid-width-30,
-  .grid-width-40,
-  .grid-width-50,
-  .grid-width-60,
-  .grid-width-70,
-  .grid-width-80,
-  .grid-width-90,
-  .grid-width-100 {
-    width: 100%;
-  }
-}
-*[class*="grid-width"] {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  padding-left: 4%;
-  padding-right: 4%;
-  float: left;
-}
-*[class*="grid-width"]:after,
-.grid-container:after,
-*[class*="grid-width"]:before,
-.grid-container:before {
-  content: '';
-  display: block;
-  overflow: hidden;
-  visibility: hidden;
-  font-size: 0;
-  line-height: 0;
-  width: 0;
-  height: 0;
-}
-*[class*="grid-width"]:after,
-.grid-container:after {
-  clear: both;
-}
-.grid-container {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-left: auto;
-  margin-right: auto;
-}
-.grid-container-nested *[class*="grid-width"]:first-child {
-  padding-left: 0;
-}
-.grid-container-nested *[class*="grid-width"]:last-child {
-  padding-right: 0;
-}
-@media (max-width: 900px) {
-  .grid-container-nested *[class*="grid-width"]:first-child {
-    padding-left: 4%;
-  }
-  .grid-container-nested *[class*="grid-width"]:last-child {
-    padding-right: 4%;
-  }
-}
-.header-a {
-  min-height: 140px;
-  overflow: hidden;
-}
-.header-a .header-a-logo {
-  margin: 40px 0 0;
-}
-@media (max-width: 900px) {
-  .header-a .header-a-logo {
-    text-align: center;
-  }
-}
-.header-a .header-a-logo img {
-  border: transparent;
-}
-.navigation-a {
-  height: 30px;
-  background: #3D3D3D;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  padding: 0;
-  overflow: hidden;
-}
-@media (max-width: 900px) {
-  .navigation-a {
-    text-align: center;
-  }
-}
-.navigation-a ul {
-  list-style: none;
-  margin: 0;
-  overflow: hidden;
-}
-.navigation-a ul li,
-.navigation-a ul li a {
-  display: inline-block;
-}
-@media (max-width: 900px) {
-  .navigation-a ul {
-    width: auto;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    display: inline-block;
-    float: none;
-  }
-  .navigation-a ul:before,
-  .navigation-a ul:after {
-    display: none;
-  }
-}
-.navigation-a ul.navigation-a-left {
-  text-align: left;
-}
-@media (max-width: 900px) {
-  .navigation-a ul.navigation-a-left {
-    padding-right: 0;
-  }
-}
-.navigation-a ul.navigation-a-right {
-  text-align: right;
-}
-@media (max-width: 900px) {
-  .navigation-a ul.navigation-a-right {
-    padding-left: 23px;
-  }
-}
-.navigation-a ul li + li {
-  margin-left: 23px;
-}
-.navigation-a ul li a {
-  font-size: 10px;
-  font-size: 0.625rem;
-  line-height: 18px;
-  line-height: 1.13rem;
-  line-height: 30px;
-  float: left;
-  color: #ddd;
-  font-weight: bold;
-  text-decoration: none;
-  text-transform: uppercase;
-}
-.navigation-a ul li a:hover {
-  cursor: pointer;
-  color: #fff;
-}
-.icon-navigation-a-github:before,
-.icon-navigation-a-github:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAAXNSR0IArs4c6QAAAa9JREFUOBGNlM8rRGEUht0pDGosjKYZpUSIkuwsiCaxUEqK2VOUBcrWv2BjxUJho6wsLLDzY2fhD5iR5NeOcJvIjOfM3O927m3mmlPPnPec835nZprvjlVVJvL5fCOjMWiDCLzCLVxZlpUj/x8saYV9+IZS8UJzFWoCt2GYgk+oJG4wJUouZDANv5VsUZ47dNSzkEYHfIDEHixDWgoiB/rTHlPPwBNInPmXHRb7hdeUDFG10AN1Th1Fd5mD6BMwMVnoUyVA3t3EkjkQlDFfmwPkc7NsQTXf0bGgJWaGb16dk18+EmLYawzkC+6Q3KdK4kiZqtGdskx/kmdlCJS86RuGrDLFZJmtGi1KB0q+VhOGsDLZsiyjGsOY4qoOkrO+YUauwCDoOKWo9xk9JfM+MPdSzqZdA8UlyDO3AvKLPsIG9LsmBHUKduEHdCy6PrpJZyKXdwKMOemaissOHJ9O9xTeh57GluMYIsehWy8STW/d8ZhkI0b9PjFasA1fsAOb0KCN1PLXYyKLGNdzj2YYArnZDyDRrA3Ua4UuDzd5QM/KaoxhmAO5Om5Qt8OI2/CJP6MVa1dvltQ5AAAAAElFTkSuQmCC");
-}
-.navigation-b {
-  text-align: right;
-  margin: 52px 0 0;
-  overflow: visible;
-}
-@media (max-width: 900px) {
-  .navigation-b {
-    text-align: center;
-    margin-top: 20px;
-    padding: 0;
-  }
-}
-.navigation-b ul {
-  padding: 0;
-  list-style: none;
-  margin: 0;
-  overflow: visible;
-}
-.navigation-b ul li,
-.navigation-b ul li a {
-  display: inline-block;
-}
-@media (max-width: 900px) {
-  .navigation-b ul {
-    display: table;
-    width: 100%;
-    padding-bottom: 1.5em;
-  }
-}
-@media (max-width: 900px) {
-  .navigation-b ul li {
-    display: table-row;
-  }
-}
-.navigation-b ul li + li {
-  margin-left: 20px;
-}
-@media (max-width: 900px) {
-  .navigation-b ul li + li {
-    margin-left: 0;
-  }
-}
-.navigation-b ul li a {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  text-transform: uppercase;
-  text-decoration: none;
-  outline: none;
-}
-@media (max-width: 900px) {
-  .navigation-b ul li a {
-    width: 100%;
-    -webkit-border-radius: 0;
-    -webkit-background-clip: padding-box;
-    -moz-border-radius: 0;
-    -moz-background-clip: padding;
-    border-radius: 0;
-    background-clip: padding-box;
-  }
-}
-.footer-a {
-  font-size: 13px;
-  font-size: 0.8125rem;
-  line-height: 23.4px;
-  line-height: 1.46rem;
-  padding-top: 2.25em;
-  padding-bottom: 2.25em;
-  overflow: hidden;
-  color: #8a8a8a;
-}
-.footer-a a {
-  color: #27C0D8;
-  text-decoration: none;
-  border-bottom: 1px dotted #27C0D8;
-}
-.footer-a a:hover {
-  color: #23adc2;
-}
-.footer-a p {
-  margin: 0;
-  display: inline-block;
-  text-align: center;
-}
-.content {
-  font-size: 14px;
-  font-size: 0.875rem;
-  line-height: 25.2px;
-  line-height: 1.57rem;
-  overflow: hidden;
-  padding-top: 1.5em;
-  padding-bottom: 1.5em;
-}
-.content p {
-  margin: 0.75em 0;
-}
-.content ul,
-.content ol,
-.content pre,
-.content blockquote,
-.content textarea:not([class^="cke"]),
-.content .cke {
-  margin: 1.875em 0;
-}
-.content code,
-.content kbd {
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  padding: 3px 4px;
-}
-.content pre,
-.content code,
-.content kbd,
-.content blockquote {
-  background: #f5f5f5;
-}
-.content blockquote,
-.content pre {
-  background: none;
-  border-left: 4px solid #27C0D8;
-  padding: 1.5em 2.25em;
-}
-.content p a,
-.content ul a,
-.content ol a,
-.content blockquote a,
-.content h1 a,
-.content h2 a,
-.content h3 a,
-.content h4 a,
-.content h5 a {
-  color: #27C0D8;
-  text-decoration: none;
-  border-bottom: 1px dotted #27C0D8;
-}
-.content p a:hover,
-.content ul a:hover,
-.content ol a:hover,
-.content blockquote a:hover,
-.content h1 a:hover,
-.content h2 a:hover,
-.content h3 a:hover,
-.content h4 a:hover,
-.content h5 a:hover {
-  color: #23adc2;
-}
-.content h1,
-.content h2,
-.content h3,
-.content h4,
-.content h5 {
-  color: #000;
-  font-weight: 100;
-}
-.content h1 code,
-.content h2 code,
-.content h3 code,
-.content h4 code,
-.content h5 code,
-.content h1 kbd,
-.content h2 kbd,
-.content h3 kbd,
-.content h4 kbd,
-.content h5 kbd {
-  font-size: inherit;
-}
-.content h1 a.content-heading-anchor,
-.content h2 a.content-heading-anchor,
-.content h3 a.content-heading-anchor,
-.content h4 a.content-heading-anchor,
-.content h5 a.content-heading-anchor {
-  font-weight: 100;
-  vertical-align: middle;
-  opacity: 0;
-  border: 0;
-}
-.content h1:hover a.content-heading-anchor,
-.content h2:hover a.content-heading-anchor,
-.content h3:hover a.content-heading-anchor,
-.content h4:hover a.content-heading-anchor,
-.content h5:hover a.content-heading-anchor {
-  opacity: 1;
-}
-.content h1:target a,
-.content h2:target a,
-.content h3:target a,
-.content h4:target a,
-.content h5:target a {
-  -webkit-animation: targetLinkOpacity 0.5s linear alternate;
-  -moz-animation: targetLinkOpacity 0.5s linear alternate;
-  -o-animation: targetLinkOpacity 0.5s linear alternate;
-  animation: targetLinkOpacity 0.5s linear alternate;
-  opacity: 1;
-}
-.content input,
-.content select,
-.content textarea:not([class^="cke"]) {
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08);
-  font: inherit;
-  color: inherit;
-  border: 1px solid #D9D9D9;
-  padding: .2em .5em;
-}
-.content input:focus,
-.content select:focus,
-.content textarea:not([class^="cke"]):focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08), 0 0 8px #93c6ef;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08), 0 0 8px #93c6ef;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.08), 0 0 8px #93c6ef;
-}
-.content abbr {
-  border-bottom: 1px dotted #666;
-  cursor: pointer;
-}
-.content blockquote {
-  font-style: italic;
-  font-family: Georgia, Times, "Times New Roman", serif;
-  font-size: 16px;
-  font-size: 1rem;
-  line-height: 28.8px;
-  line-height: 1.8rem;
-}
-.content em {
-  font-style: italic;
-}
-.content h1 {
-  font-size: 36px;
-  font-size: 2.25rem;
-  line-height: 64.8px;
-  line-height: 4.05rem;
-  margin: 1.125em 0 0;
-}
-.content h2 {
-  font-size: 27.2px;
-  font-size: 1.7rem;
-  line-height: 48.96px;
-  line-height: 3.06rem;
-  margin: 0.9em 0 0;
-}
-.content h3 {
-  font-size: 24px;
-  font-size: 1.5rem;
-  line-height: 43.2px;
-  line-height: 2.7rem;
-  font-weight: 500;
-  margin: 0.75em 0 0;
-}
-.content h4 {
-  font-size: 19.2px;
-  font-size: 1.2rem;
-  line-height: 34.56px;
-  line-height: 2.16rem;
-  font-weight: 500;
-  margin: 0.75em 0 0;
-}
-.content h5 {
-  font-size: 17.6px;
-  font-size: 1.1rem;
-  line-height: 31.68px;
-  line-height: 1.98rem;
-  font-weight: 500;
-  margin: 0.75em 0 0;
-}
-.content hr {
-  border: 0;
-  border-top: 4px solid #D9D9D9;
-  margin: 1.5em 0;
-}
-.content input[type="text"] {
-  height: 1.8em;
-  line-height: 1.8em;
-}
-.content input[type="button"] {
-  -webkit-appearance: button;
-  -moz-appearance: button;
-  appearance: button;
-}
-.content kbd {
-  font-size: 12px;
-  font-size: 0.75rem;
-  line-height: 21.6px;
-  line-height: 1.35rem;
-  font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
-  padding: 2px 6px;
-  -webkit-box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
-  -moz-box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
-  box-shadow: 0 0 4px #fff inset, 0 2px 0 #D9D9D9;
-}
-.content p img {
-  vertical-align: middle;
-}
-.content p pre {
-  padding: 1.5em;
-}
-.content pre {
-  padding: 0;
-  border: 0;
-  tab-size: 4;
-  -o-tab-size: 4;
-  -moz-tab-size: 4;
-}
-.content pre,
-.content code {
-  font-size: 11.89px;
-  font-size: 0.743rem;
-  line-height: 21.4px;
-  line-height: 1.34rem;
-  font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
-}
-.content pre a,
-.content code a {
-  border: 0;
-}
-.content pre code {
-  padding: 0.75em;
-  display: block;
-}
-.content strong {
-  color: #000;
-}
-.content ul ul,
-.content ol ul,
-.content ul ol,
-.content ol ol {
-  margin: 0.75em 0;
-}
-.content ul li,
-.content ol li {
-  font-size: 14px;
-  font-size: 0.875rem;
-  line-height: 30.24px;
-  line-height: 1.89rem;
-}
-.content textarea:not([class^="cke"]) {
-  width: 100%;
-}
-.content div.todo {
-  border: 2px dotted #444;
-  padding: 10px;
-  margin: 60px 0 10px 0;
-  /* Remove me some day */
-}
-.content div.todo:before {
-  content: "TODO";
-  font-weight: bold;
-}
-body a.button-a,
-body button.button-a,
-body input.button-a {
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  font-size: 14px;
-  font-size: 0.875rem;
-  line-height: 25.2px;
-  line-height: 1.57rem;
-  height: 36px;
-  line-height: 36px;
-  padding: 0 1.1em;
-  font-weight: 700;
-  color: #3e3e3e;
-  white-space: nowrap;
-  text-decoration: none;
-  display: inline-block;
-  cursor: pointer;
-  border: 0;
-  vertical-align: middle;
-  margin: 1px 0;
-  background: transparent;
-}
-body a.button-a.icon-pos-left,
-body button.button-a.icon-pos-left,
-body input.button-a.icon-pos-left {
-  padding-left: .8em;
-}
-body a.button-a.icon-pos-right,
-body button.button-a.icon-pos-right,
-body input.button-a.icon-pos-right {
-  padding-right: .8em;
-}
-body a.button-a.button-a-no-text,
-body button.button-a.button-a-no-text,
-body input.button-a.button-a-no-text {
-  -webkit-border-radius: 100px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 100px;
-  -moz-background-clip: padding;
-  border-radius: 100px;
-  background-clip: padding-box;
-  width: 36px;
-  padding: 0;
-  text-indent: -999px;
-  overflow: hidden;
-  position: relative;
-  text-align: center;
-}
-body a.button-a.button-a-no-text:before,
-body button.button-a.button-a-no-text:before,
-body input.button-a.button-a-no-text:before {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -9px 0 0 -9px;
-}
-@media (max-width: 900px) {
-  body a.button-a.button-a-mobile-collapsed,
-  body button.button-a.button-a-mobile-collapsed,
-  body input.button-a.button-a-mobile-collapsed {
-    -webkit-border-radius: 100px;
-    -webkit-background-clip: padding-box;
-    -moz-border-radius: 100px;
-    -moz-background-clip: padding;
-    border-radius: 100px;
-    background-clip: padding-box;
-    width: 36px;
-    padding: 0;
-    text-indent: -999px;
-    overflow: hidden;
-    position: relative;
-    text-align: center;
-  }
-  body a.button-a.button-a-mobile-collapsed:before,
-  body button.button-a.button-a-mobile-collapsed:before,
-  body input.button-a.button-a-mobile-collapsed:before {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -9px 0 0 -9px;
-  }
-  body a.button-a.button-a-mobile-collapsed:before,
-  body button.button-a.button-a-mobile-collapsed:before,
-  body input.button-a.button-a-mobile-collapsed:before {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    margin: -9px 0 0 -9px;
-  }
-}
-body a.button-a:active,
-body button.button-a:active,
-body input.button-a:active,
-body a.button-a:hover,
-body button.button-a:hover,
-body input.button-a:hover {
-  color: #fff;
-  background: #23adc2;
-}
-body a.button-a:focus,
-body button.button-a:focus,
-body input.button-a:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #93c6ef;
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #93c6ef;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #93c6ef;
-}
-body a.button-a-soft,
-body button.button-a-soft,
-body input.button-a-soft {
-  background: #e7e7e7;
-}
-body a.button-a-soft:active,
-body button.button-a-soft:active,
-body input.button-a-soft:active,
-body a.button-a-soft:hover,
-body button.button-a-soft:hover,
-body input.button-a-soft:hover {
-  color: #3e3e3e;
-  background: #cecece;
-}
-body a.button-a-background,
-body button.button-a-background,
-body input.button-a-background,
-body a.navigation-b ul li a:hover,
-body button.navigation-b ul li a:hover,
-body input.navigation-b ul li a:hover {
-  color: #fff;
-  background: #27C0D8;
-}
-body a.button-a-background:active,
-body button.button-a-background:active,
-body input.button-a-background:active,
-body a.button-a-background:hover,
-body button.button-a-background:hover,
-body input.button-a-background:hover,
-body a.navigation-b ul li a:hover:active,
-body button.navigation-b ul li a:hover:active,
-body input.navigation-b ul li a:hover:active,
-body a.navigation-b ul li a:hover:hover,
-body button.navigation-b ul li a:hover:hover,
-body input.navigation-b ul li a:hover:hover {
-  color: #fff;
-  background: #23adc2;
-}
-.balloon-a {
-  font-size: 12px;
-  font-size: 0.75rem;
-  line-height: 21.6px;
-  line-height: 1.35rem;
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  border-bottom: 3px solid #d4d4d4;
-  background: #ebebeb;
-  display: inline-block;
-  white-space: nowrap;
-  padding: .4em 1.2em .2em;
-  font-weight: 700;
-  position: relative;
-  z-index: 1000;
-  text-transform: none;
-  color: #575757;
-}
-.balloon-a:hover {
-  color: #575757;
-}
-.balloon-a:before {
-  content: '';
-  width: 0;
-  height: 0;
-  border-style: solid;
-  position: absolute;
-}
-.balloon-a-ne:before,
-.balloon-a-nw:before {
-  top: -13px;
-  border-width: 0 9px 15.6px 9px;
-  border-color: transparent transparent #ebebeb transparent;
-}
-.balloon-a-se:before,
-.balloon-a-sw:before {
-  bottom: -13px;
-  border-width: 15.6px 9px 0 9px;
-  border-color: #ebebeb transparent transparent transparent;
-}
-.balloon-a-nw:before,
-.balloon-a-sw:before {
-  left: 20px;
-}
-.balloon-a-ne:before,
-.balloon-a-se:before {
-  right: 20px;
-}
-.icon-pos-left:before,
-.icon-pos-right:after {
-  content: '';
-  display: inline-block;
-  width: 18px;
-  height: 18px;
-  vertical-align: middle;
-  background-repeat: no-repeat;
-}
-.icon-pos-left:before {
-  margin-right: 10px;
-}
-.icon-pos-right:after {
-  margin-left: 10px;
-}
-.icon-download:before,
-.icon-download:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAQFJREFUOBGtVDESgjAQBGfobHwE/AIa/AN/8EEWfMWGZ+gDaG2ws8BdyY13SRgGcGducre3WQ5NSJIIxnGsES3ijhhcMCdXR7ZYCqIc0SGWQE1ud7sKjRLxXHJQfWpLYwaCk6wxET/u+U2GIngd8yRViINau28bBH/YAGqvSQPhRNQHqBqj3FY0NKq27TW7qhSTDaCOhkaRAj7Hmm8S4V+c6C+gUa+crsizuWmoc70MKbWCnqPy2GvcUJxE4a/sIajRaGkU+/sf4IuISQGePR/T/QMbHEhwPLVnMWPuOCwGnWg41dwVeaN3ccHch70idIRi/6WV0WC2/zMiZm661R+2DxyEdjTuST3mAAAAAElFTkSuQmCC");
-}
-.icon-question-mark:before,
-.icon-question-mark:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAUhJREFUOBGllLFOAkEQhjk0WthT2JFA7Czsqc7OxFLewEeAZ/AVbO0tTLTSBKhstTBUNkYLEoVAbD2//zILe5e9uwCT/JnZmX/+m83ebq0WsCRJYnANxmBhUKxcHGjJpiC1wQBUmTjtbLetKHTAT5WCVxe3kxEjoUmKRL6pvYEZyJt6VpOxCG3nmfyx+yJxBM7BFPg2SDlkTv2sxZqi4YnUvfgswI9FuHAkzz9EUTTRmqYeTifXsvoj/s9i57oi6ljz9kviFdyBCbgHe+rCn4C8jVXQ18rshuKOiTSIXwLkRZWQTurARJrE7wERpea7kD7BkcgB+yB3CFGlPmgqCNiXhEagSGif2qU1Ln8FW/tupK3pXhXZrWNDuCoikY/rHPMT5KFr2MAPTSM90rIrUjJIeq1WV0RTwN7+0rrtILb9M+LEbLq1H7Z/Ea3+RvBddl0AAAAASUVORK5CYII=");
-}
-.icon-close:before,
-.icon-close:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAAXNSR0IArs4c6QAAAUlJREFUOBGllDFuwzAMRe3Cd+jYKUCzd/XkDtm9dsoVOuUqBnqBoodwgBwiW8ZsXTIWqPu+Iia0LMAoTOBbJEV+UZTkosjIMAwN6MARXCKky9dkUsYuglagB3OimNU4O1pM1OB7jsHNK7YekeFQJZ5kj/0LcnLA+RMnlHOvDMNv5wO7BFuQkn3hq0ALjKwPVeF4BSaqpLRy0T1ZIHFz75bE2BR8dBImqmBrwRplg09QmR/9GZyBSadAHauXCZkRROKURLlHEemepJIlIyhHotzLg1/N6erTxtmmvqA8muHGIbc1rTBqrEuwnqWnGbbmmz0hwaHtvM2QhWbrXZnosvnTWWPrdCY9w7cDJtf3h9VHjy5Zq9UZ08beyJh7Aicg6W/VYvgnIjJdNn9PMIOITJWcgnV9VvcnEitY/mitNFZZ/hsxsljdv39sfybRQ4R/kU0MAAAAAElFTkSuQmCC");
-}
-.ie8 .switch > * {
-  vertical-align: middle;
-}
-.ie8 .switch input[type="radio"] {
-  margin: 0 0.25em;
-  display: inline-block;
-}
-.ie8 .switch label {
-  margin-left: 0 !important;
-  margin-right: 0 !important;
-}
-.ie8 .switch label[data-for="1"] {
-  float: left;
-}
-.ie8 .switch label[data-for="2"] {
-  float: right;
-}
-.ie8 .switch .switch-inner {
-  display: none;
-}
-.switch {
-  font-size: 14px;
-  font-size: 0.875rem;
-  line-height: 25.2px;
-  line-height: 1.57rem;
-  font-weight: bold;
-  background-color: #27C0D8;
-  overflow: hidden;
-  display: inline-block;
-  padding: 0.75em 0.25em;
-  color: #fff;
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  position: relative;
-}
-.switch input[type="radio"] {
-  display: none;
-}
-.switch label {
-  position: relative;
-  z-index: 2;
-  float: left;
-  cursor: pointer;
-  padding: 0 0.75em;
-}
-.switch label:hover {
-  text-decoration: underline;
-}
-.switch .switch-inner {
-  float: left;
-  background-color: #FFF;
-  height: 1.5em;
-  width: 4.125em;
-  padding: 2px;
-  margin: 0 0.25em;
-  -webkit-border-radius: 5.5px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 5.5px;
-  -moz-background-clip: padding;
-  border-radius: 5.5px;
-  background-clip: padding-box;
-}
-.switch .switch-inner .handler {
-  overflow: hidden;
-  position: relative;
-  display: block;
-  height: 1.5em;
-  width: 1.5em;
-  background: #25b4cb;
-  -webkit-border-radius: 4.5px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 4.5px;
-  -moz-background-clip: padding;
-  border-radius: 4.5px;
-  background-clip: padding-box;
-}
-.switch .switch-inner .handler:before {
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 3px;
-  left: 0;
-  background-color: #34c4da;
-  -webkit-border-bottom-left-radius: 4.5px;
-  -moz-border-radius-bottomleft: 4.5px;
-  border-bottom-left-radius: 4.5px;
-  -webkit-border-bottom-right-radius: 4.5px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius-bottomright: 4.5px;
-  -moz-background-clip: padding;
-  border-bottom-right-radius: 4.5px;
-  background-clip: padding-box;
-}
-.switch:hover .switch-inner .handler:before {
-  background: #45c9dd;
-}
-.switch input[data-num="2"]:checked ~ .switch-inner > .handler {
-  margin-left: auto;
-}
-.switch input[data-num="2"]:checked ~ label[data-for="1"] {
-  padding-right: 5.125em;
-  margin-right: -4.375em;
-}
-.switch input[data-num="1"]:checked ~ label[data-for="2"] {
-  padding-left: 5.125em;
-  margin-left: -4.375em;
-}
-.toggler {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.toggler label {
-  cursor: pointer;
-}
-.toggler [data-collapse] {
-  display: inherit;
-}
-.toggler [data-expand] {
-  display: none;
-}
-.toggler.collapsed [data-collapse] {
-  display: none;
-}
-.toggler.collapsed [data-expand] {
-  display: inherit;
-}
-.toggler-container {
-  overflow: hidden;
-}
-.toggler-container.collapsed {
-  height: 0;
-}
-.icon-toggler-expanded:before,
-.icon-toggler-collapsed:before,
-.icon-toggler-expanded:after,
-.icon-toggler-collapsed:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAByCAYAAABeOoENAAAAAXNSR0IArs4c6QAAAbxJREFUaAXtmT1KBEEQhRdFQdBEMfQEBoaGopl3MfECXsFERLyBh/AUIuwJDEUQM//eB11Dz1A1uzotGFTBY2rr58306+kNpmazP7Z98V8Kj8JrAT4xcgttXRVXwofwFYAcNdS6RuJegOBTuBUOhc0CfGLkqKHWJeMuFDwJJ0Jk5Kihlp6esW4embuNkVgTNdTS09MMEbkDj76sUUsPvZ2xIwTRATsQuBuxGsTIYdSSo7cztpggwprdyKlJ8ImZUUuM3s48ol1lXwQjwydm5hINl2bF53KMCL82d2mR2GvqnBfg1+aKPbb9p+oGtYXbT1GTFxKiZkfEyHgy7x0y0clR454zSGpDMzaA3fzV30hNln4qkAqkAqlAKpAKpAKpQCqQCqQCqUAqkAqkAqlAKpAKpAKpQCrw3xWY/GGcz++TP9U3Gx40GWdEAxabXA33NBywRCOfdzFcCztDJv12Rz7REMpmIc9qPBNWK0J3COWNxegxIrs+KHZcyHpjsZUSXPaypcLtseJFS3tT84WwUZG4S4vEZkl3wl5FYK4rdrT9R9Y1uIbbT12TFxKiZkfEyCYfWojMJv+NGNGPr99GI9DP7P9TCgAAAABJRU5ErkJggg==");
-}
-.icon-toggler-expanded.icon-light:before,
-.icon-toggler-collapsed.icon-light:before,
-.icon-toggler-expanded.icon-light:after,
-.icon-toggler-collapsed.icon-light:after {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAByCAYAAABeOoENAAAAAXNSR0IArs4c6QAAAcVJREFUaAXtmT9KA1EQxhMlASE2SkpPkCJlStHOu3gGwRPYBAm5gYfwFBKwtrARRAh26vr7ljfx7TrLChtBcAa+zOSbPy/7vcTC6fV+04qimIArsALrBMXiJq1nUzQEc/AOmkw51QzdgUqAWyD7AEswA6MExeKUk6n2+zBInSJ7BKfuaZDKpRpcMa/UQUgTfWSd1jjEmlSTatXzpRlvJKJsacVtXrVlB72bWgjdiGwmEj8FOq1u4qapRprJVvkgXbFsZCTxomSqL4ssr0uQrY3TJ/AGjeFfVJlM8diaiCuDdlLiIfmNcP1+/wnu0hoVJ84oq7XeUhNXbE4dgPuEgU2Qh3PFbrx+Gs6E2hD/+tMJ3b+QadB2fiLZsG4/2poG3f6M5MMiDgVCgVAgFAgFQoFQIBQIBUKBUCAUCAVCgVAgFAgFQoFQIBQIBf66AiwLuv1jnAH/Zb/Go5abq/qdwvsLFhJNK583ctfg0Bnmrnwq+zVrYoDZM8E52M1yP9uvqcGmZP6O+CTl3LWYHdTm9yk4aCzilLZHe6XmAuzZEGL30ZrEpr64AUc2wDycK7a7X6P42BpzD+9fv4pIxn4tWznnwm0r/gQpiG1tFshTowAAAABJRU5ErkJggg==");
-}
-.icon-toggler-expanded:before,
-.icon-toggler-expanded:after {
-  background-position: top left;
-}
-.icon-toggler-collapsed:before,
-.icon-toggler-collapsed:after {
-  background-position: bottom left;
-}
-.modal {
-  padding: 20px;
-  border-radius: 3px;
-  background-color: white;
-  max-width: 700px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 80% !important;
-  top: 50% !important;
-  -webkit-transform: translate(-50%, -50%) !important;
-  -moz-transform: translate(-50%, -50%) !important;
-  -o-transform: translate(-50%, -50%) !important;
-  -ms-transform: translate(-50%, -50%) !important;
-  transform: translate(-50%, -50%) !important;
-}
-.modal-close {
-  -webkit-border-radius: 100px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 100px;
-  -moz-background-clip: padding;
-  border-radius: 100px;
-  background-clip: padding-box;
-  cursor: pointer;
-  height: 18px;
-  width: 18px;
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  font-size: 17px;
-  text-align: center;
-  line-height: 19px;
-  background: #cccccc;
-}
-main .grid-container,
-header .grid-container,
-.navigation-a > div,
-footer > div {
-  max-width: 968px;
-}
-.header-a {
-  margin-top: 30px;
-}
-.footer-a {
-  border-top: 1px solid #D9D9D9;
-}
-.adjoined-top {
-  background-color: #27C0D8;
-  color: #fff;
-}
-.adjoined-top .content h1,
-.adjoined-top .content h2,
-.adjoined-top .content h3,
-.adjoined-top .content h4,
-.adjoined-top .content h5 {
-  color: #fff;
-}
-.adjoined-top .content p {
-  font-size: 18px;
-  font-size: 1.125rem;
-  line-height: 32.4px;
-  line-height: 2.02rem;
-  font-weight: 100;
-}
-.adjoined-top .content p a {
-  text-decoration: none;
-  border-bottom: 1px dotted #fff;
-  color: inherit;
-}
-.adjoined-top .content p a:hover {
-  color: #e6e6e6;
-}
-.adjoined-top .content button {
-  color: #fff;
-}
-.adjoined-top .content strong {
-  color: #fff;
-}
-.adjoined-top .content code {
-  font-size: inherit;
-  color: #27C0D8;
-}
-.adjoined-bottom {
-  position: relative;
-}
-.adjoined-bottom:before {
-  z-index: -1;
-  content: '';
-  background: #27C0D8;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 50%;
-}
-main .grid-container,
-header .grid-container,
-.navigation-a > div,
-footer > div {
-  max-width: 1052px;
-}
-main .grid-container.freed-width {
-  max-width: none;
-}
-.switch {
-  background: #25b4cb;
-  float: right;
-  overflow: visible;
-}
-.switch .balloon-a {
-  position: absolute;
-  top: -40px;
-  right: 50%;
-  margin-right: -15px;
-  background: #FFEFC1;
-  border-bottom-color: #DCDCA4;
-}
-.switch .balloon-a:before {
-  border-color: #FFEFC1 transparent transparent transparent;
-}
-#toolbar .editors-container {
-  overflow: hidden;
-  height: 0;
-  transition: height 200ms;
-}
-#toolbar .editors-container.active {
-  height: auto;
-}
-#main #editor {
-  background: #FFF;
-  padding: 2% 4%;
-  border: dashed 5px #27C0D8;
-}
-#main .adjoined-top:before {
-  height: 335px;
-}
-#toolbar .adjoined-top:before {
-  height: 219px;
-}
-#toolbar .adjoined-top .grid-container-nested {
-  height: 147px;
-}
-.content .grid-switch-magic {
-  margin: 3.5em 0 0;
-}
-#info-box {
-  padding-bottom: 0;
-}
-#info-box > div {
-  width: 100%;
-  text-align: right;
-}
-#info-box > div .toggler {
-  padding-right: 0;
-}
-#info-box > div .toggler:hover {
-  background: transparent;
-  color: #000;
-}
-#info-box > div .toggler:hover > label {
-  text-decoration: underline;
-}
-#info-box > div h2 {
-  float: left;
-  margin-top: 0;
-}
-#info-box > div#instructions-container {
-  text-align: left;
-}
-#toolbarModifierWrapper {
-  overflow: hidden;
-  height: 0;
-  opacity: 0;
-  transition: height 200ms;
-}
-#toolbarModifierWrapper.active {
-  height: auto;
-  opacity: 1;
-}
-header {
-  overflow: visible;
-}
-header div.grid-container {
-  overflow: visible;
-}
-header .navigation-b {
-  overflow: visible;
-}
-header .navigation-b ul {
-  overflow: visible;
-}
-header .navigation-b a {
-  position: relative;
-}
-header .balloon-a {
-  position: absolute;
-  top: 48px;
-  left: 50%;
-  margin-left: -35px;
-}
-@media (max-width: 1140px) {
-  header .balloon-a {
-    left: auto;
-    margin-left: auto;
-    right: 50%;
-    margin-right: -35px;
-  }
-  header .balloon-a:before {
-    left: auto;
-    right: 22px;
-  }
-}
-@media (max-width: 900px) {
-  header .balloon-a {
-    display: none;
-  }
-}
-#toolbar .cke_toolbar {
-  pointer-events: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  cursor: default;
-}
-.some-toolbar-active .cke_toolbar {
-  zoom: 1;
-  filter: alpha(opacity=50);
-  -webkit-opacity: 0.5;
-  -moz-opacity: 0.5;
-  opacity: 0.5;
-}
-.cke_toolbar.active {
-  position: relative;
-  zoom: 1;
-  filter: alpha(opacity=100);
-  -webkit-opacity: 1;
-  -moz-opacity: 1;
-  opacity: 1;
-}
-.cke_toolbar.active:after {
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 6px;
-  bottom: 5px;
-  left: 0;
-  -webkit-border-radius: 5px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 5px;
-  -moz-background-clip: padding;
-  border-radius: 5px;
-  background-clip: padding-box;
-  -webkit-box-shadow: 0px 0px 15px 3px #fff4b0;
-  -moz-box-shadow: 0px 0px 15px 3px #fff4b0;
-  box-shadow: 0px 0px 15px 3px #fff4b0;
-}
-.cke_toolbar.active .cke_toolgroup {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  border-color: #e3c300;
-}
-.cke_toolbar.active .cke_combo,
-.cke_toolbar.active .cke_toolgroup {
-  position: relative;
-  z-index: 2;
-}
-.cke_toolbar.active .cke_combo_button {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
-.unselectable {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.toolbar {
-  padding: 5px 0;
-  margin-bottom: 2.4em;
-  overflow: hidden;
-  background: #fff;
-}
-.toolbar button.button-a.cke_button {
-  cursor: pointer;
-  display: inline-block;
-  padding: 4px 6px;
-  outline: 0;
-  border: 1px solid #a6a6a6;
-}
-.toolbar button.button-a.hidden {
-  display: none;
-}
-.toolbar button.button-a.left {
-  float: left;
-  margin-right: 8px;
-}
-.toolbar button.button-a.right {
-  float: right;
-  margin-left: 8px;
-}
-.toolbar button.button-a .highlight {
-  color: #ffefc1;
-}
-.configContainer.hidden,
-.toolbarModifier.hidden,
-.toolbarModifier-hints.hidden {
-  display: none;
-}
-.toolbarModifier :focus,
-.toolbar button:focus,
-.configContainer textarea.configCode:focus {
-  outline: none;
-}
-div.toolbarModifier {
-  padding: 0;
-  overflow: hidden;
-  width: 100%;
-  position: relative;
-  display: table;
-  border-collapse: collapse;
-}
-div.toolbarModifier ::-moz-focus-inner {
-  border: 0;
-}
-div.toolbarModifier .empty {
-  display: none;
-}
-div.toolbarModifier.empty-visible .empty {
-  display: table-row;
-  zoom: 1;
-  filter: alpha(opacity=60);
-  -webkit-opacity: 0.6;
-  -moz-opacity: 0.6;
-  opacity: 0.6;
-}
-div.toolbarModifier .empty > p {
-  line-height: 31px;
-}
-div.toolbarModifier > ul {
-  padding: 0;
-  margin: 0;
-  border-top: 1px solid #ccc;
-  width: 100%;
-}
-div.toolbarModifier > ul[data-type="table-header"] {
-  display: table-header-group;
-}
-div.toolbarModifier > ul[data-type="table-body"] {
-  display: table-row-group;
-}
-div.toolbarModifier > ul p {
-  padding: 0;
-  margin: 0;
-}
-div.toolbarModifier > ul > li {
-  display: table-row;
-}
-div.toolbarModifier > ul > li[data-type="header"] {
-  font-weight: bold;
-  user-select: none;
-  cursor: default;
-}
-div.toolbarModifier > ul > li[data-type="group"],
-div.toolbarModifier > ul > li[data-type="separator"] {
-  border-bottom: 1px solid #ccc;
-}
-div.toolbarModifier > ul > li[data-type="subgroup"] {
-  border-top: 1px solid #eee;
-}
-div.toolbarModifier > ul > li[data-type="subgroup"]:first-child {
-  border-top: none;
-}
-div.toolbarModifier > ul > li[data-type="group"].active,
-div.toolbarModifier > ul > li[data-type="group"]:hover,
-div.toolbarModifier > ul > li[data-type="separator"].active,
-div.toolbarModifier > ul > li[data-type="separator"]:hover {
-  overflow: hidden;
-  z-index: 2;
-}
-div.toolbarModifier > ul > li[data-type="group"].active,
-div.toolbarModifier > ul > li[data-type="separator"].active,
-div.toolbarModifier > ul > li[data-type="group"].active:hover,
-div.toolbarModifier > ul > li[data-type="separator"].active:hover {
-  background: #f0fafb;
-}
-div.toolbarModifier > ul > li[data-type="group"]:hover,
-div.toolbarModifier > ul > li[data-type="separator"]:hover {
-  background: #fffbe3;
-}
-div.toolbarModifier > ul > li[data-type="separator"] {
-  background: #f5f5f5;
-}
-div.toolbarModifier > ul > li[data-type="separator"]:after {
-  content: '';
-  width: 100%;
-}
-div.toolbarModifier > ul > li[data-type="separator"] > p {
-  padding: 2px 5px;
-}
-div.toolbarModifier > ul > li > p,
-div.toolbarModifier > ul > li > ul {
-  display: table-cell;
-  vertical-align: middle;
-}
-div.toolbarModifier > ul > li p {
-  padding-left: 5px;
-  min-width: 200px;
-}
-div.toolbarModifier > ul > li p span {
-  white-space: nowrap;
-  cursor: default;
-}
-div.toolbarModifier > ul > li p span button {
-  font-size: 12.666px;
-  margin-right: 5px;
-  cursor: pointer;
-  background: #fff;
-  -webkit-border-radius: 5px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 5px;
-  -moz-background-clip: padding;
-  border-radius: 5px;
-  background-clip: padding-box;
-  border: 1px solid #bbb;
-  padding: 0 7px;
-  line-height: 12px;
-  height: 20px;
-}
-div.toolbarModifier > ul > li p span button:not(.disabled):hover,
-div.toolbarModifier > ul > li p span button:not(.disabled):focus {
-  color: #fff;
-  background-color: #454545;
-  border-color: transparent;
-}
-div.toolbarModifier > ul > li p span button.move.disabled {
-  cursor: default;
-  zoom: 1;
-  filter: alpha(opacity=20);
-  -webkit-opacity: 0.2;
-  -moz-opacity: 0.2;
-  opacity: 0.2;
-}
-div.toolbarModifier > ul > li ul {
-  border-collapse: collapse;
-  padding: 0;
-  width: 100%;
-}
-div.toolbarModifier > ul > li ul li {
-  display: table-row;
-  list-style-type: none;
-  line-height: 1;
-}
-div.toolbarModifier > ul > li ul li[data-type="subgroup"] {
-  border-top: 1px solid #ddd;
-}
-div.toolbarModifier > ul > li ul li[data-type="subgroup"]:first-child {
-  border-top: 0;
-}
-div.toolbarModifier > ul > li ul li[data-type="subgroup"] [data-type="button"] {
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  padding: 0 2px;
-}
-div.toolbarModifier > ul > li ul li[data-type="subgroup"] [data-type="button"]:focus {
-  background: rgba(0, 0, 0, 0.04);
-}
-div.toolbarModifier > ul > li ul li[data-type="subgroup"] [data-type="button"] input {
-  vertical-align: middle;
-}
-div.toolbarModifier > ul > li ul li > p,
-div.toolbarModifier > ul > li ul li > ul {
-  display: table-cell;
-  vertical-align: middle;
-}
-div.toolbarModifier > ul > li ul li ul {
-  padding: 0;
-}
-div.toolbarModifier > ul > li ul li ul li {
-  padding: 0;
-  display: inline-block;
-  cursor: pointer;
-  margin: 2px 5px 2px 0;
-}
-div.toolbarModifier > ul > li ul li ul li .cke_combo_text {
-  cursor: pointer;
-  white-space: nowrap;
-}
-div.toolbarModifier > ul > li ul li ul li .cke_toolgroup,
-div.toolbarModifier > ul > li ul li ul li .cke_combo_button {
-  cursor: pointer;
-  margin: 0;
-  vertical-align: middle;
-  border: 1px solid #ddd;
-  font-size: 11.41px;
-  font-size: 0.713rem;
-  line-height: 20.54px;
-  line-height: 1.28rem;
-}
-div.toolbarModifier > .codemirror-wrapper {
-  overflow-y: auto;
-}
-div.toolbarModifier-hints {
-  float: right;
-  width: 350px;
-  min-width: 150px;
-  overflow-y: auto;
-  margin-left: 1.5em;
-}
-div.toolbarModifier-hints h3 {
-  font-size: 18.08px;
-  font-size: 1.13rem;
-  line-height: 32.54px;
-  line-height: 2.03rem;
-  padding: 0.36em 1.5em;
-  background: #f5f5f5;
-  border-bottom: 1px solid #ddd;
-  margin-top: 0;
-  margin-bottom: 1.2em;
-}
-div.toolbarModifier-hints dl {
-  margin-bottom: 1.2em;
-  overflow: hidden;
-}
-div.toolbarModifier-hints dl .list-header {
-  font-weight: bold;
-  border: 0;
-  padding-bottom: 0.6em;
-}
-div.toolbarModifier-hints dl > p {
-  text-align: center;
-}
-div.toolbarModifier-hints dl dt {
-  float: left;
-  width: 9em;
-  clear: both;
-  text-align: right;
-  border-top: 1px solid #ddd;
-  padding-left: 1.5em;
-  padding-right: .1em;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-div.toolbarModifier-hints dl dt code {
-  background: none;
-  border: none;
-  vertical-align: middle;
-}
-div.toolbarModifier-hints dl dd {
-  margin-left: 10em;
-  clear: right;
-  padding-right: 1.5em;
-}
-div.toolbarModifier-hints dl dd code {
-  line-height: 2.2em;
-}
-div.toolbarModifier-hints dl dd:after {
-  content: '\00a0';
-  display: block;
-  clear: left;
-  float: right;
-  height: 0;
-  width: 0;
-}
-.toolbarModifier-hints,
-.configContainer textarea.configCode,
-.CodeMirror {
-  -webkit-border-radius: 3px;
-  -webkit-background-clip: padding-box;
-  -moz-border-radius: 3px;
-  -moz-background-clip: padding;
-  border-radius: 3px;
-  background-clip: padding-box;
-  border: 1px solid #ccc;
-  font-size: 13.01px;
-  font-size: 0.813rem;
-  line-height: 23.42px;
-  line-height: 1.46rem;
-}
-.configContainer textarea.configCode,
-.CodeMirror pre,
-.CodeMirror-linenumber {
-  font-size: 13.01px;
-  font-size: 0.813rem;
-  line-height: 23.42px;
-  line-height: 1.46rem;
-  font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
-}
-.CodeMirror pre {
-  border: none;
-  padding: 0;
-  margin: 0;
-}
-.configContainer textarea.configCode {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  color: #575757;
-  padding: 10px;
-  width: 100%;
-  min-height: 500px;
-  margin: 0;
-  resize: none;
-  outline: none;
-  -moz-tab-size: 4;
-  tab-size: 4;
-  white-space: pre;
-  word-wrap: normal;
-  overflow: auto;
-}
-.CodeMirror-hints.toolbar-modifier {
-  padding: 0;
-  color: #575757;
-  font-size: 14px;
-  font-size: 0.875rem;
-  line-height: 25.2px;
-  line-height: 1.57rem;
-  font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;
-}
-.CodeMirror-hints.toolbar-modifier .CodeMirror-hint-active {
-  color: #575757;
-  background: #f0fafb;
-}
-.CodeMirror-hints.toolbar-modifier > li:hover {
-  background: #fffbe3;
-}
-/* Text modifier */
-#toolbarModifierWrapper {
-  margin-bottom: 1.2em;
-}
-#toolbarModifierWrapper .invalid .CodeMirror {
-  background: #fff8f8;
-  border-color: red;
-}
-#toolbarModifierWrapper .CodeMirror {
-  height: auto;
-  padding: 0 0.6em;
-}
-.staticContainer {
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 10;
-}
-.staticContainer > .grid-container {
-  max-width: 1052px;
-}
-.staticContainer > .grid-container .inner {
-  background: #fff;
-}
-.staticContainer > .grid-container .inner .toolbar {
-  margin-bottom: 0;
-}
-#help {
-  position: relative;
-  top: -15px;
-  left: -5px;
-}
-#help-content {
-  display: none;
-}
-/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../node_modules/cksource-samples-framework/components/global/global.less","../../node_modules/cksource-samples-framework/components/core/core.less","../../node_modules/cksource-samples-framework/components/grid/grid.less","../../node_modules/cksource-samples-framework/node_modules/lesshat/build/lesshat.less","../../node_modules/cksource-samples-framework/components/header-a/header-a.less","../../node_modules/cksource-samples-framework/components/navigation-a/navigation-a.less","../../node_modules/cksource-samples-framework/components/navigation-b/navigation-b.less","../../node_modules/cksource-samples-framework/components/footer-a/footer-a.less","../../node_modules/cksource-samples-framework/components/content/content.less","../../node_modules/cksource-samples-framework/components/button-a/button-a.less","../../node_modules/cksource-samples-framework/components/balloon-a/balloon-a.less","../../node_modules/cksource-samples-framework/components/icon/icon.less","../../node_modules/cksource-samples-framework/components/switch/switch.less","../../node_modules/cksource-samples-framework/components/toggler/toggler.less","../../node_modules/cksource-samples-framework/components/modal/modal.less","../../node_modules/cksource-samples-framework/components/basicsample/core.less","../../node_modules/cksource-samples-framework/components/basicsample/adjoined.less","../../samples/less/custom.less","../../samples/toolbarconfigurator/less/toolbarmodifier.less","../../samples/toolbarconfigurator/less/base.less"],"names":[],"mappings":";;;;AAsDA,QAHiC;EAyChC;IACC,wBAAA;;;AC1FF;AAAS;AAAO;AAAS;AAAY;AAAQ;AAAQ;AAAQ;AAAQ;AAAM;AAAM;AAAK;EACrF,cAAA;;AAGD;AAAM;EACL,SAAA;EACA,UAAA;EACA,wBDN+B,uCCM/B;EACA,gBAAA;EACA,cAAA;;ACHA,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,UAAA;;AADD,YAAY;EACX,WAAA;;AF4CF,QAHiC;EEjChC;EAKC,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;EAAZ,YAAY;IAJZ,WAAA;;;AAaF,CAAC;ECqRC,8BAAA;EACA,2BAAA;EACA,sBAAA;EDrRD,gBAAA;EACA,iBAAA;EACA,WAAA;;AAIA,CADA,qBACC;AAAD,eAAC;AAAQ,CADT,qBACU;AAAD,eAAC;EACT,SAAS,EAAT;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,YAAA;EACA,cAAA;EACA,QAAA;EACA,SAAA;;AAKD,CADA,qBACC;AAAD,eAAC;EACA,WAAA;;AAIF;EC2PE,8BAAA;EACA,2BAAA;EACA,sBAAA;ED3PD,iBAAA;EACA,kBAAA;;AAKC,sBADD,EAAC,qBACC;EACA,eAAA;;AAGD,sBALD,EAAC,qBAKC;EACA,gBAAA;;AFjBH,QAHiC;EE0B9B,sBADD,EAAC,qBACC;IACA,gBAAA;;EAGD,sBALD,EAAC,qBAKC;IACA,iBAAA;;;AE7EJ;EACC,iBAAA;EAGA,gBAAA;;AAJD,SAMC;EACC,gBAAA;;AJ0CF,QAHiC;EA6CjC,SIrFC;IAIE,kBAAA;;;AAVH,SAMC,eAOC;EACC,mBAAA;;ACVH;EACC,YAAA;EACA,mBAAA;EACA,kBAAA;EACA,OAAA;EACA,QAAA;EACA,MAAA;EACA,UAAA;EACA,gBAAA;;ALqCD,QAHiC;EA6CjC;IK5EE,kBAAA;;;AAXF,aAcC;EACC,gBAAA;EACA,SAAA;EACA,gBAAA;;AAjBF,aAcC,GAKC;AAnBF,aAcC,GAKK,GAAG;EACN,qBAAA;;ALyBH,QAHiC;EA6CjC,aKzEC;IAUE,WAAA;IACA,uBAAA;IACA,mBAAA;IACA,qBAAA;IACA,WAAA;;EAEA,aAhBF,GAgBG;EAAS,aAhBZ,GAgBa;IACV,aAAA;;;AAKD,aAtBF,GAqBE,aACC;EACA,gBAAA;;ALQJ,QAHiC;EA6CjC,aKzEC,GAqBE,aACC;IAIC,gBAAA;;;AAIF,aA9BF,GAqBE,aASC;EACA,iBAAA;;ALAJ,QAHiC;EA6CjC,aKzEC,GAqBE,aASC;IAIC,kBAAA;;;AAMF,aAxCF,GAuCC,GACG;EACD,iBAAA;;AAvDJ,aAcC,GAuCC,GAKC;ELxCF,eAAA;EACA,mBAAA;EACA,iBAAA;EACA,oBAAA;EKuCG,iBAAA;EACA,WAAA;EACA,WAAA;EACA,iBAAA;EACA,qBAAA;EACA,yBAAA;;AAEA,aArDH,GAuCC,GAKC,EASE;EACA,eAAA;EACA,WAAA;;AAQJ,yBAAC;AAAS,yBAAC;EACV,sBAAkB,qrBAAlB;;ACpFF;EACC,iBAAA;EACA,gBAAA;EACA,iBAAA;;ANgDD,QAHiC;EA6CjC;IMvFE,kBAAA;IACA,gBAAA;IAGA,UAAA;;;AAVF,aAaC;EACC,UAAA;EACA,gBAAA;EACA,SAAA;EACA,iBAAA;;AAjBF,aAaC,GAMC;AAnBF,aAaC,GAMK,GAAG;EACN,qBAAA;;AN+BH,QAHiC;EA6CjC,aMhFC;IAWE,cAAA;IACA,WAAA;IACA,qBAAA;;;ANyBH,QAHiC;EA6CjC,aMhFC,GAgBC;IAEE,kBAAA;;;AAGD,aArBF,GAgBC,GAKG;EACD,iBAAA;;ANgBJ,QAHiC;EA6CjC,aMhFC,GAgBC,GAKG;IAIA,cAAA;;;AAtCL,aAaC,GAgBC,GAaC;EHwQD,8BAAA;EACA,2BAAA;EACA,sBAAA;EGxQE,yBAAA;EACA,qBAAA;EACA,aAAA;;ANKJ,QAHiC;EA6CjC,aMhFC,GAgBC,GAaC;IAOE,WAAA;IHqOH,wBAAA;IAAiC,oCAAA;IACjC,qBAAA;IAA8B,6BAAA;IAC9B,gBAAA;IAAyB,4BAAA;;;AIxR3B;EPwBC,eAAA;EACA,oBAAA;EACA,mBAAA;EACA,oBAAA;EOxBA,mBAAA;EACA,sBAAA;EACA,gBAAA;EACA,cAAA;;AAND,SP4EC;EACC,cAAA;EACA,qBAAA;EAEA,iCAAA;;AAEA,SAND,EAME;EACA,cAAA;;AOnFH,SAQC;EACC,SAAA;EACA,qBAAA;EACA,kBAAA;;ACXF;ERwBC,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;EQzBA,gBAAA;EACA,kBAAA;EACA,qBAAA;;AAJD,QASC;EACC,gBAAA;;AAVF,QAaC;AAbD,QAaK;AAbL,QAaS;AAbT,QAac;AAbd,QAa0B,SAAQ,IAAI;AAbtC,QAawD;EACtD,iBAAA;;AAdF,QAiBC;AAjBD,QAiBO;ELqQL,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EKrQzB,gBAAA;;AAnBF,QAsBC;AAtBD,QAsBM;AAtBN,QAsBY;AAtBZ,QAsBiB;EACf,mBAAA;;AAvBF,QA0BC;AA1BD,QA0Ba;EACX,gBAAA;EACA,8BAAA;EACA,qBAAA;;AA7BF,QAoCC,ERwCA;AQ5ED,QAoCI,GRwCH;AQ5ED,QAoCQ,GRwCP;AQ5ED,QAoCY,WRwCX;AQ5ED,QAoCwB,GRwCvB;AQ5ED,QAoC4B,GRwC3B;AQ5ED,QAoCgC,GRwC/B;AQ5ED,QAoCoC,GRwCnC;AQ5ED,QAoCwC,GRwCvC;EACC,cAAA;EACA,qBAAA;EAEA,iCAAA;;AAEA,QQ9CD,ERwCA,EAME;AAAD,QQ9CE,GRwCH,EAME;AAAD,QQ9CM,GRwCP,EAME;AAAD,QQ9CU,WRwCX,EAME;AAAD,QQ9CsB,GRwCvB,EAME;AAAD,QQ9C0B,GRwC3B,EAME;AAAD,QQ9C8B,GRwC/B,EAME;AAAD,QQ9CkC,GRwCnC,EAME;AAAD,QQ9CsC,GRwCvC,EAME;EACA,cAAA;;AQnFH,QAwCC;AAxCD,QAwCK;AAxCL,QAwCS;AAxCT,QAwCa;AAxCb,QAwCiB;EACf,WAAA;EACA,gBAAA;;AA1CF,QAwCC,GAKC;AA7CF,QAwCK,GAKH;AA7CF,QAwCS,GAKP;AA7CF,QAwCa,GAKX;AA7CF,QAwCiB,GAKf;AA7CF,QAwCC,GAKO;AA7CR,QAwCK,GAKG;AA7CR,QAwCS,GAKD;AA7CR,QAwCa,GAKL;AA7CR,QAwCiB,GAKT;EACL,kBAAA;;AA9CH,QAwCC,GAUC,EAAC;AAlDH,QAwCK,GAUH,EAAC;AAlDH,QAwCS,GAUP,EAAC;AAlDH,QAwCa,GAUX,EAAC;AAlDH,QAwCiB,GAUf,EAAC;EACA,gBAAA;EACA,sBAAA;EACA,UAAA;EACA,SAAA;;AAGD,QAjBD,GAiBE,MACA,EAAC;AADF,QAjBG,GAiBF,MACA,EAAC;AADF,QAjBO,GAiBN,MACA,EAAC;AADF,QAjBW,GAiBV,MACA,EAAC;AADF,QAjBe,GAiBd,MACA,EAAC;EACA,UAAA;;AAIF,QAvBD,GAuBE,OACA;AADD,QAvBG,GAuBF,OACA;AADD,QAvBO,GAuBN,OACA;AADD,QAvBW,GAuBV,OACA;AADD,QAvBe,GAuBd,OACA;EL8DD,0DAAA;EACA,uDAAA;EACA,qDAAA;EACA,kDAAA;EK/DE,UAAA;;AAlEJ,QAuEC;AAvED,QAuEQ;AAvER,QAuEgB,SAAQ,IAAI;EL+M1B,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EAmBzB,uDAAA;EACA,oDAAA;EACA,+CAAA;EKlOA,aAAA;EACA,cAAA;EAEA,yBAAA;EACA,kBAAA;;AAEA,QAVD,MAUE;AAAD,QAVM,OAUL;AAAD,QAVc,SAAQ,IAAI,gBAUzB;EACA,qBAAA;EACA,UAAA;ELwND,wEAAA;EACA,qEAAA;EACA,gEAAA;;AK7SF,QA8FC;EACC,8BAAA;EACA,eAAA;;AAhGF,QAmGC;EACC,kBAAA;EACA,6BRnG2C,wBQmG3C;ER7ED,eAAA;EACA,eAAA;EACA,mBAAA;EACA,mBAAA;;AQ3BD,QAyGC;EACC,kBAAA;;AA1GF,QA6GC;ERrFA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EQoFC,mBAAA;;AA/GF,QAkHC;ER1FA,iBAAA;EACA,iBAAA;EACA,oBAAA;EACA,oBAAA;EQyFC,iBAAA;;AApHF,QAuHC;ER/FA,eAAA;EACA,iBAAA;EACA,mBAAA;EACA,mBAAA;EQ8FC,gBAAA;EACA,kBAAA;;AA1HF,QA6HC;ERrGA,iBAAA;EACA,iBAAA;EACA,oBAAA;EACA,oBAAA;EQoGC,gBAAA;EACA,kBAAA;;AAhIF,QAmIC;ER3GA,iBAAA;EACA,iBAAA;EACA,oBAAA;EACA,oBAAA;EQ0GC,gBAAA;EACA,kBAAA;;AAtIF,QAyIC;EACC,SAAA;EACA,6BAAA;EACA,eAAA;;AAIA,QADD,MACE;EACA,aAAA;EACA,kBAAA;;AAGD,QAND,MAME;ELiDD,0BAAA;EACA,uBAAA;EACA,kBAAA;;AKxMF,QA4JC;ERpIA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EQmIC,oBR7J8B,uCQ6J9B;EACA,gBAAA;EL4IA,uDAAA;EACA,oDAAA;EACA,+CAAA;;AK7SF,QAuKC,EACC;EACC,sBAAA;;AAzKH,QAuKC,EAKC;EACC,cAAA;;AA7KH,QAiLC;EACC,UAAA;EACA,SAAA;EAEA,WAAA;EACA,cAAA;EACA,gBAAA;;AAvLF,QA0LC;AA1LD,QA0LM;ERlKL,kBAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;EQkKC,gJAAA;;AA7LF,QA0LC,IAKC;AA/LF,QA0LM,KAKJ;EACC,SAAA;;AAhMH,QAqMC,IAAI;EACH,eAAA;EACA,cAAA;;AAvMF,QA0MC;EACC,WAAA;;AA3MF,QA8MC,GAEC;AAhNF,QA8MK,GAEH;AAhNF,QA8MC,GAEK;AAhNN,QA8MK,GAEC;EACH,gBAAA;;AAjNH,QA8MC,GAMC;AApNF,QA8MK,GAMH;ER5LD,eAAA;EACA,mBAAA;EACA,oBAAA;EACA,oBAAA;;AQ3BD,QA0NC,SAAQ,IAAI;EACX,WAAA;;AA3NF,QA8NC,IAAG;EACF,uBAAA;EACA,aAAA;EACA,qBAAA;;;AAGA,QAND,IAAG,KAMD;EACA,SAAS,MAAT;EACA,iBAAA;;ACjOD,IADD,EACE;AAAD,IADE,OACD;AAAD,IADU,MACT;ENiRD,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EHhQ1B,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;ESnBE,YAAA;EACA,iBAAA;EACA,gBAAA;EACA,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,qBAAA;EACA,eAAA;EACA,SAAA;EACA,sBAAA;EAIA,aAAA;EAGA,uBAAA;;AAEA,IAvBF,EACE,SAsBC;AAAD,IAvBC,OACD,SAsBC;AAAD,IAvBS,MACT,SAsBC;EACA,kBAAA;;AAGD,IA3BF,EACE,SA0BC;AAAD,IA3BC,OACD,SA0BC;AAAD,IA3BS,MACT,SA0BC;EACA,mBAAA;;AAoBD,IAhDF,EACE,SA+CC;AAAD,IAhDC,OACD,SA+CC;AAAD,IAhDS,MACT,SA+CC;ENkOF,4BAAA;EAAiC,oCAAA;EACjC,yBAAA;EAA8B,6BAAA;EAC9B,oBAAA;EAAyB,4BAAA;EMnPvB,WAAA;EACA,UAAA;EACA,mBAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;;AAEA,IAxCH,EACE,SA+CC,iBARC;AAAD,IAxCA,OACD,SA+CC,iBARC;AAAD,IAxCQ,MACT,SA+CC,iBARC;EACA,kBAAA;EACA,SAAA;EACA,QAAA;EACA,qBAAA;;ATGL,QAHiC;EA6CjC,ISzFC,EACE,SAmDC;ETqCJ,ISzFI,OACD,SAmDC;ETqCJ,ISzFY,MACT,SAmDC;IN8NF,4BAAA;IAAiC,oCAAA;IACjC,yBAAA;IAA8B,6BAAA;IAC9B,oBAAA;IAAyB,4BAAA;IMnPvB,WAAA;IACA,UAAA;IACA,mBAAA;IACA,gBAAA;IACA,kBAAA;IACA,kBAAA;;EAEA,IAxCH,EACE,SAmDC,0BAZC;EAAD,IAxCA,OACD,SAmDC,0BAZC;EAAD,IAxCQ,MACT,SAmDC,0BAZC;IACA,kBAAA;IACA,SAAA;IACA,QAAA;IACA,qBAAA;;EAJD,IAxCH,EACE,SAmDC,0BAZC;EAAD,IAxCA,OACD,SAmDC,0BAZC;EAAD,IAxCQ,MACT,SAmDC,0BAZC;IACA,kBAAA;IACA,SAAA;IACA,QAAA;IACA,qBAAA;;;AAcF,IA1DF,EACE,SAyDC;AAAD,IA1DC,OACD,SAyDC;AAAD,IA1DS,MACT,SAyDC;AACD,IA3DF,EACE,SA0DC;AAAD,IA3DC,OACD,SA0DC;AAAD,IA3DS,MACT,SA0DC;EACA,WAAA;EACA,mBAAA;;AAGD,IAhEF,EACE,SA+DC;AAAD,IAhEC,OACD,SA+DC;AAAD,IAhES,MACT,SA+DC;EACA,qBAAA;EACA,UAAA;ENqOF,yEAAA;EACA,sEAAA;EACA,iEAAA;;AM5NA,IA7ED,EA6EE;AAAD,IA7EE,OA6ED;AAAD,IA7EU,MA6ET;EACA,mBAAA;;AAEA,IAhFF,EA6EE,cAGC;AAAD,IAhFC,OA6ED,cAGC;AAAD,IAhFS,MA6ET,cAGC;AACD,IAjFF,EA6EE,cAIC;AAAD,IAjFC,OA6ED,cAIC;AAAD,IAjFS,MA6ET,cAIC;EACA,cAAA;EACA,mBAAA;;AAIF,IAvFD,EAuFE;AAAD,IAvFE,OAuFD;AAAD,IAvFU,MAuFT;AAAD,IAvFD,EHiDG,aAxCH,GAgBC,GAaC,EAWE;AGsCH,IAvFE,OHiDA,aAxCH,GAgBC,GAaC,EAWE;AGsCH,IAvFU,MHiDR,aAxCH,GAgBC,GAaC,EAWE;EGuCF,WAAA;EACA,mBAAA;;AAEA,IA3FF,EAuFE,oBAIC;AAAD,IA3FC,OAuFD,oBAIC;AAAD,IA3FS,MAuFT,oBAIC;AACD,IA5FF,EAuFE,oBAKC;AAAD,IA5FC,OAuFD,oBAKC;AAAD,IA5FS,MAuFT,oBAKC;AADD,IA3FF,EHiDG,aAxCH,GAgBC,GAaC,EAWE,MG0CD;AAAD,IA3FC,OHiDA,aAxCH,GAgBC,GAaC,EAWE,MG0CD;AAAD,IA3FS,MHiDR,aAxCH,GAgBC,GAaC,EAWE,MG0CD;AACD,IA5FF,EHiDG,aAxCH,GAgBC,GAaC,EAWE,MG2CD;AAAD,IA5FC,OHiDA,aAxCH,GAgBC,GAaC,EAWE,MG2CD;AAAD,IA5FS,MHiDR,aAxCH,GAgBC,GAaC,EAWE,MG2CD;EACA,WAAA;EACA,mBAAA;;AChGJ;EVsBC,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EG2PC,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EOnR1B,gCAAA;EAEA,mBAAA;EACA,qBAAA;EACA,mBAAA;EACA,wBAAA;EACA,gBAAA;EACA,kBAAA;EACA,aAAA;EACA,oBAAA;EACA,cAAA;;AAEA,UAAC;EACA,cAAA;;AAGD,UAAC;EACA,SAAS,EAAT;EACA,QAAA;EACA,SAAA;EACA,mBAAA;EACA,kBAAA;;AAMD,aAAC;AAAD,aAAC;EACA,UAAA;EACA,8BAAA;EACA,yDAAA;;AAMD,aAAC;AAAD,aAAC;EACA,aAAA;EACA,8BAAA;EACA,yDAAA;;AAMD,aAAC;AAAD,aAAC;EACA,UAAA;;AAMD,aAAC;AAAD,aAAC;EACA,WAAA;;ACvDF,cAAc;AACd,eAAe;EACd,SAAS,EAAT;EACA,qBAAA;EACA,WAAA;EACA,YAAA;EACA,sBAAA;EACA,4BAAA;;AAGD,cAAc;EACb,kBAAA;;AAGD,eAAe;EACd,iBAAA;;AAIA,cAAC;AAAS,cAAC;EACV,sBAAkB,6cAAlB;;AAKD,mBAAC;AAAS,mBAAC;EACV,sBAAkB,6iBAAlB;;AAKD,WAAC;AAAS,WAAC;EACV,sBAAkB,6iBAAlB;;AC5BF,IAAK,QAEJ;EACC,sBAAA;;AAHF,IAAK,QAMJ,MAAK;EACJ,gBAAA;EACA,qBAAA;;AARF,IAAK,QAWJ;EACC,yBAAA;EACA,0BAAA;;AAEA,IAfG,QAWJ,MAIE;EACA,WAAA;;AAGD,IAnBG,QAWJ,MAQE;EACA,YAAA;;AApBH,IAAK,QAwBJ;EACC,aAAA;;AAIF;EZZC,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;EYWA,iBAAA;EACA,yBAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;ET2OC,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;ES3O1B,kBAAA;;AATD,OAWC,MAAK;EACJ,aAAA;;AAZF,OAeC;EACC,kBAAA;EACA,UAAA;EACA,WAAA;EACA,eAAA;EACA,iBAAA;;AAEA,OAPD,MAOE;EACA,0BAAA;;AAvBH,OA2BC;EACC,WAAA;EACA,sBAAA;EACA,aAAA;EACA,cAAA;EACA,YAAA;EACA,gBAAA;ETiNA,4BAAA;EAAiC,oCAAA;EACjC,yBAAA;EAA8B,6BAAA;EAC9B,oBAAA;EAAyB,4BAAA;;ASpP3B,OA2BC,cASC;EACC,gBAAA;EACA,kBAAA;EACA,cAAA;EACA,aAAA;EACA,YAAA;EACA,mBAAA;ETwMD,4BAAA;EAAiC,oCAAA;EACjC,yBAAA;EAA8B,6BAAA;EAC9B,oBAAA;EAAyB,4BAAA;;ASvMxB,OAlBF,cASC,SASE;EACA,SAAS,EAAT;EACA,cAAA;EACA,kBAAA;EACA,MAAA;EACA,QAAA;EACA,WAAA;EACA,OAAA;EAEA,yBAAA;ETsKF,wCAAA;EACA,oCAAA;EACA,gCAAA;EAKA,yCAAA;EAA8C,oCAAA;EAC9C,qCAAA;EAA0C,6BAAA;EAC1C,iCAAA;EAAsC,4BAAA;;ASvKvC,OAAC,MACA,cAAc,SAAQ;EACrB,mBAAA;;AAhEH,OAoEC,MAAK,cAAgB,QAEpB,gBAAgB;EACf,iBAAA;;AAvEH,OAoEC,MAAK,cAAgB,QASpB,QAAO;EACN,sBAAA;EACA,sBAAA;;AA/EH,OAmFC,MAAK,cAAgB,QAAS,QAAO;EACpC,qBAAA;EACA,qBAAA;;ACzHF;EVk3BE,yBAAA;EACA,sBAAA;EACA,qBAAA;EACA,iBAAA;;AUr3BF,QAGC;EACC,eAAA;;AAJF,QAMC;EACC,gBAAA;;AAPF,QAUC;EACC,aAAA;;AAGD,QAAC,UACA;EACC,aAAA;;AAFF,QAAC,UAKA;EACC,gBAAA;;AAKH;EACC,gBAAA;;AAEA,kBAAC;EACA,SAAA;;AAMD,sBAAC;AAAD,uBAAC;AAAS,sBAAC;AAAD,uBAAC;EACV,sBAAkB,ysBAAlB;;AAIA,sBADA,WACC;AAAD,uBADA,WACC;AAAS,sBADV,WACW;AAAD,uBADV,WACW;EACV,sBAAkB,qtBAAlB;;AAMF,sBAAC;AACD,sBAAC;EACA,6BAAA;;AAKD,uBAAC;AACD,uBAAC;EACA,gCAAA;;ACtDF;EACC,aAAA;EACA,kBAAA;EACA,uBAAA;EACA,gBAAA;EX4SC,8BAAA;EACA,2BAAA;EACA,sBAAA;EWzSD,qBAAA;EACA,mBAAA;EXgvBC,wCAAA;EACA,qCAAA;EACA,mCAAA;EACA,oCAAA;EACA,gCAAA;;AWjvBD,MAAC;EXuQA,4BAAA;EAAiC,oCAAA;EACjC,yBAAA;EAA8B,6BAAA;EAC9B,oBAAA;EAAyB,4BAAA;EWvQzB,eAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;EACA,SAAA;EACA,WAAA;EACA,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;;ACzBF,IAAK;AACL,MAAO;AACP,aAAc;AACd,MAAO;EACN,gBAAA;;AAID;EACC,gBAAA;;AAGD;EACC,6BAAA;;ACXA,SAAC;EACA,yBAAA;EACA,WAAA;;AAFD,SAAC,IAIA,SACC;AALF,SAAC,IAIA,SACK;AALN,SAAC,IAIA,SACS;AALV,SAAC,IAIA,SACa;AALd,SAAC,IAIA,SACiB;EACf,WAAA;;AANH,SAAC,IAIA,SAKC;EhBYF,eAAA;EACA,mBAAA;EACA,mBAAA;EACA,oBAAA;EgBbG,gBAAA;;AAXH,SAAC,IAIA,SAKC,EAIC;EACC,qBAAA;EACA,8BAAA;EACA,cAAA;;AAEA,SAlBH,IAIA,SAKC,EAIC,EAKE;EACA,cAAA;;AAnBL,SAAC,IAIA,SAoBC;EACC,WAAA;;AAzBH,SAAC,IAIA,SAwBC;EACC,WAAA;;AA7BH,SAAC,IAIA,SA4BC;EACC,kBAAA;EACA,cAAA;;AAKH,SAAC;EACA,kBAAA;;AAEA,SAHA,OAGC;EACA,WAAA;EACA,SAAS,EAAT;EACA,mBAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,QAAA;EACA,WAAA;;ACxDH,IAAK;AACL,MAAO;AACP,aAAc;AACd,MAAO;EACN,iBAAA;;AAGD,IAAK,gBAAe;EACnB,eAAA;;AAGD;EACC,mBAAA;EACA,YAAA;EACA,iBAAA;;AAHD,OAMC;EAEC,kBAAA;EACA,UAAA;EACA,UAAA;EACA,mBAAA;EAGA,mBAAA;EACA,4BAAA;;AAEA,OAXD,WAWE;EACA,yDAAA;;AAKH,QAAS;EACR,gBAAA;EACA,SAAA;EACA,wBAAA;;AAEA,QALQ,mBAKP;EACA,YAAA;;AAKF,KAAM;EACL,gBAAA;EACA,cAAA;EACA,0BAAA;;AAGD,KAAM,cAAa;EAClB,aAAA;;AAIA,QADQ,cACP;EACA,aAAA;;AAFF,QAAS,cAKR;EACC,aAAA;;AAIF,QACC;EACC,iBAAA;;AAIF;EACC,iBAAA;;AADD,SAGC;EACC,WAAA;EACA,iBAAA;;AALF,SAGC,MAIC;EACC,gBAAA;;AAEA,SAPF,MAIC,SAGE;EACA,uBAAA;EACA,WAAA;;AAFD,SAPF,MAIC,SAGE,MAIA;EACC,0BAAA;;AAfL,SAGC,MAiBC;EACC,WAAA;EACA,aAAA;;AAGD,SAtBD,MAsBE;EACA,gBAAA;;AAKH;EACC,gBAAA;EACA,SAAA;EACA,UAAA;EACA,wBAAA;;AAEA,uBAAC;EACA,YAAA;EACA,UAAA;;AAKF;EACC,iBAAA;;AADD,MAGC,IAAG;EACF,iBAAA;;AAJF,MAOC;EACC,iBAAA;;AARF,MAOC,cAGC;EACC,iBAAA;;AAXH,MAOC,cAOC;EAEC,kBAAA;;AAhBH,MAoBC;EACC,kBAAA;EACA,SAAA;EAEA,SAAA;EACA,kBAAA;;AjBtFF,QAHiC;EA6CjC,MiBuCC;IAUE,UAAA;IACA,iBAAA;IAEA,UAAA;IACA,mBAAA;;EAEA,MAhBF,WAgBG;IACA,UAAA;IACA,WAAA;;;AjBnGJ,QAHiC;EA6CjC,MiBuCC;IAwBE,aAAA;;;AC9IH,QAAS;EACR,oBAAA;Efm2BC,yBAAA;EACA,sBAAA;EACA,qBAAA;EACA,iBAAA;Eep2BD,eAAA;;AAID,oBAAqB;Ef6elB,OAAA;EAAS,yBAAA;EACV,oBAAA;EACA,iBAAA;EACA,YAAA;;Ae5eF,YAAY;EACX,kBAAA;EfweE,OAAA;EAAS,0BAAA;EACV,kBAAA;EACA,eAAA;EACA,UAAA;;AeteD,YANW,OAMV;EACA,SAAS,EAAT;EACA,cAAA;EACA,kBAAA;EACA,MAAA;EACA,UAAA;EACA,WAAA;EACA,OAAA;EfgPA,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EAmBzB,4CAAA;EACA,yCAAA;EACA,oCAAA;;AepRF,YAAY,OAkBX;EfgQC,wBAAA;EACA,qBAAA;EACA,gBAAA;EehQA,qBAAA;;AApBF,YAAY,OAuBX;AAvBD,YAAY,OAwBX;EACC,kBAAA;EACA,UAAA;;AA1BF,YAAY,OA6BX;EfqPC,wBAAA;EACA,qBAAA;EACA,gBAAA;;AelPF;EfuzBE,yBAAA;EACA,sBAAA;EACA,qBAAA;EACA,iBAAA;;AevzBF;EACC,cAAA;EACA,oBAAA;EACA,gBAAA;EACA,gBAAA;;AAGC,QADD,OAAM,SACJ;EACA,eAAA;EAEA,qBAAA;EACA,gBAAA;EACA,UAAA;EACA,yBAAA;;AAGD,QAVD,OAAM,SAUJ;EACA,aAAA;;AAGD,QAdD,OAAM,SAcJ;EACA,WAAA;EACA,iBAAA;;AAGD,QAnBD,OAAM,SAmBJ;EACA,YAAA;EACA,gBAAA;;AA3BH,QAMC,OAAM,SAwBL;EACC,cAAA;;AAMH,gBAAgB;AAChB,gBAAgB;AAChB,sBAAsB;EACrB,aAAA;;AAGD,gBAAiB;AACjB,QAAS,OAAM;AACf,gBAAiB,SAAQ,WAAW;EACnC,aAAA;;AAGD,GAAG;EACF,UAAA;EACA,gBAAA;EACA,WAAA;EACA,kBAAA;EACA,cAAA;EACA,yBAAA;;AAND,GAAG,gBAQF;EACC,SAAA;;AATF,GAAG,gBAYF;EACC,aAAA;;AAGD,GAhBE,gBAgBD,cAAe;EACf,kBAAA;EfkYC,OAAA;EAAS,yBAAA;EACV,oBAAA;EACA,iBAAA;EACA,YAAA;;AetZF,GAAG,gBAuBF,OAAO;EACN,iBAAA;;AAID,GA5BE,gBA4BA;EACD,UAAA;EACA,SAAA;EACA,0BAAA;EACA,WAAA;;AAEA,GAlCC,gBA4BA,KAMA;EACA,2BAAA;;AAGD,GAtCC,gBA4BA,KAUA;EACA,wBAAA;;AAXF,GA5BE,gBA4BA,KAeD;EACC,UAAA;EACA,SAAA;;AAID,GAjDC,gBA4BA,KAqBC;EACD,kBAAA;;AAEA,GApDA,gBA4BA,KAqBC,KAGA;EACA,iBAAA;EACA,iBAAA;EACA,eAAA;;AAGD,GA1DA,gBA4BA,KAqBC,KASA;AACD,GA3DA,gBA4BA,KAqBC,KAUA;EACA,6BAAA;;AAGD,GA/DA,gBA4BA,KAqBC,KAcA;EACA,0BAAA;;AAEA,GAlED,gBA4BA,KAqBC,KAcA,sBAGC;EACA,gBAAA;;AAIF,GAvEA,gBA4BA,KAqBC,KAsBA,mBAAmB;AACpB,GAxEA,gBA4BA,KAqBC,KAuBA,mBAAmB;AACpB,GAzEA,gBA4BA,KAqBC,KAwBA,uBAAuB;AACxB,GA1EA,gBA4BA,KAqBC,KAyBA,uBAAuB;EACvB,gBAAA;EACA,UAAA;;AAGD,GA/EA,gBA4BA,KAqBC,KA8BA,mBAAmB;AACpB,GAhFA,gBA4BA,KAqBC,KA+BA,uBAAuB;AACxB,GAjFA,gBA4BA,KAqBC,KAgCA,mBAAmB,OAAO;AAC3B,GAlFA,gBA4BA,KAqBC,KAiCA,uBAAuB,OAAO;EAC9B,mBAAA;;AAGD,GAtFA,gBA4BA,KAqBC,KAqCA,mBAAmB;AACpB,GAvFA,gBA4BA,KAqBC,KAsCA,uBAAuB;EACvB,mBAAA;;AAGD,GA3FA,gBA4BA,KAqBC,KA0CA;EAMA,mBAAA;;AALA,GA5FD,gBA4BA,KAqBC,KA0CA,uBACC;EACA,SAAS,EAAT;EACA,WAAA;;AAKD,GAnGD,gBA4BA,KAqBC,KA0CA,uBAQE;EACD,gBAAA;;AAIF,GAxGA,gBA4BA,KAqBC,KAuDC;AAAK,GAxGP,gBA4BA,KAqBC,KAuDQ;EACR,mBAAA;EACA,sBAAA;;AAzDF,GAjDC,gBA4BA,KAqBC,KA6DD;EACC,iBAAA;EACA,gBAAA;;AA/DF,GAjDC,gBA4BA,KAqBC,KA6DD,EAIC;EACC,mBAAA;EACA,eAAA;;AAnEH,GAjDC,gBA4BA,KAqBC,KA6DD,EAIC,KAIC;EACC,mBAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;Ef6CJ,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;Ee7CrB,sBAAA;EACA,cAAA;EACA,iBAAA;EACA,YAAA;;AAGC,GAlIJ,gBA4BA,KAqBC,KA6DD,EAIC,KAIC,OAWE,IAAI,WACH;AACD,GAnIJ,gBA4BA,KAqBC,KA6DD,EAIC,KAIC,OAWE,IAAI,WAEH;EACA,WAAA;EACA,yBAAA;EACA,yBAAA;;AAIF,GA1IH,gBA4BA,KAqBC,KA6DD,EAIC,KAIC,OAoBE,KAAK;EACL,eAAA;EfwQJ,OAAA;EAAS,yBAAA;EACV,oBAAA;EACA,iBAAA;EACA,YAAA;;AerWA,GAjDC,gBA4BA,KAqBC,KAkGD;EACC,yBAAA;EACA,UAAA;EACA,WAAA;;AArGF,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC;EACC,kBAAA;EACA,qBAAA;EAGA,cAAA;;AAEA,GAhKF,gBA4BA,KAqBC,KAkGD,GAMC,GAOE;EACA,0BAAA;;AAEA,GAnKH,gBA4BA,KAqBC,KAkGD,GAMC,GAOE,sBAGC;EACA,aAAA;;AAJF,GAhKF,gBA4BA,KAqBC,KAkGD,GAMC,GAOE,sBAOA;EfAJ,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EeApB,cAAA;;AAEA,GA3KJ,gBA4BA,KAqBC,KAkGD,GAMC,GAOE,sBAOA,qBAIE;EACA,+BAAA;;AAZH,GAhKF,gBA4BA,KAqBC,KAkGD,GAMC,GAOE,sBAOA,qBAQC;EACC,sBAAA;;AAKH,GArLF,gBA4BA,KAqBC,KAkGD,GAMC,GA4BG;AAAK,GArLT,gBA4BA,KAqBC,KAkGD,GAMC,GA4BU;EACR,mBAAA;EACA,sBAAA;;AAtIJ,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC,GAkCC;EACC,UAAA;;AA3IJ,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC,GAkCC,GAIC;EACC,UAAA;EACA,qBAAA;EACA,eAAA;EACA,qBAAA;;AAlJL,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC,GAkCC,GAIC,GAOC;EACC,eAAA;EACA,mBAAA;;AAvJN,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC,GAkCC,GAIC,GAYC;AA1JL,GAjDC,gBA4BA,KAqBC,KAkGD,GAMC,GAkCC,GAIC,GAaC;EACC,eAAA;EACA,SAAA;EACA,sBAAA;EACA,sBAAA;EClSP,kBAAA;EACA,mBAAA;EAEA,oBAAA;EACA,oBAAA;;ADwSA,GA1NE,gBA0NA;EACD,gBAAA;;AAID,GA/NE,gBA+ND;EACA,YAAA;EACA,YAAA;EACA,gBAAA;EACA,gBAAA;EACA,kBAAA;;AALD,GA/NE,gBA+ND,MAOA;ECxTD,kBAAA;EACA,kBAAA;EAEA,oBAAA;EACA,oBAAA;EDsTE,qBAAA;EACA,mBAAA;EACA,6BAAA;EACA,aAAA;EACA,oBAAA;;AAbF,GA/NE,gBA+ND,MAgBA;EAEC,oBAAA;EACA,gBAAA;;AAnBF,GA/NE,gBA+ND,MAgBA,GAKC;EACC,iBAAA;EACA,SAAA;EACA,qBAAA;;AAGD,GA1PA,gBA+ND,MAgBA,GAWG;EACD,kBAAA;;AA5BH,GA/NE,gBA+ND,MAgBA,GAeC;EACC,WAAA;EACA,UAAA;EACA,WAAA;EACA,iBAAA;EACA,0BAAA;EACA,mBAAA;EACA,mBAAA;EflEF,8BAAA;EACA,2BAAA;EACA,sBAAA;;Ae0BD,GA/NE,gBA+ND,MAgBA,GAeC,GAUC;EACC,gBAAA;EACA,YAAA;EACA,sBAAA;;AA5CJ,GA/NE,gBA+ND,MAgBA,GAgCC;EACC,iBAAA;EACA,YAAA;EACA,oBAAA;;AAnDH,GA/NE,gBA+ND,MAgBA,GAgCC,GAKC;EACC,kBAAA;;AAGD,GAxRD,gBA+ND,MAgBA,GAgCC,GASE;EACA,SAAS,OAAT;EACA,cAAA;EACA,WAAA;EACA,YAAA;EACA,SAAA;EACA,QAAA;;AAOL;AACA,gBAAiB,SAAQ;AACzB;EfhIE,0BAAA;EAAiC,oCAAA;EACjC,uBAAA;EAA8B,6BAAA;EAC9B,kBAAA;EAAyB,4BAAA;EegI1B,sBAAA;EC3XA,kBAAA;EACA,mBAAA;EAEA,oBAAA;EACA,oBAAA;;AD2XD,gBAAiB,SAAQ;AACzB,WAAY;AACZ;ECjYC,kBAAA;EACA,mBAAA;EAEA,oBAAA;EACA,oBAAA;ED+XA,gJAAA;;AAGD,WAAY;EACX,YAAA;EACA,UAAA;EACA,SAAA;;AAGD,gBAAiB,SAAQ;EfvHvB,8BAAA;EACA,2BAAA;EACA,sBAAA;EeuHD,cAAA;EACA,aAAA;EACA,WAAA;EACA,iBAAA;EACA,SAAA;EACA,YAAA;EACA,aAAA;EACA,gBAAA;EACA,WAAA;EACA,gBAAA;EACA,iBAAA;EACA,cAAA;;AAGD,iBAAiB;EAChB,UAAA;EACA,cAAA;EC9ZA,eAAA;EACA,mBAAA;EAEA,mBAAA;EACA,oBAAA;EDkaA,gJAAA;;AAVD,iBAAiB,iBAIhB;EACC,cAAA;EACA,mBAAA;;AAMD,iBAZgB,iBAYd,KAAI;EACL,mBAAA;;;AAKF;EACC,oBAAA;;AADD,uBAGC,SAAS;EACR,mBAAA;EACA,iBAAA;;AALF,uBAQC;EAEC,YAAA;EAGA,gBAAA;;AAIF;EACC,eAAA;EACA,MAAA;EACA,WAAA;EACA,WAAA;;AAJD,gBAMC;EACC,iBAAA;;AAPF,gBAMC,kBAGC;EACC,gBAAA;;AAVH,gBAMC,kBAGC,OAGC;EACC,gBAAA;;AAOJ;EACC,kBAAA;EACA,UAAA;EACA,UAAA;;AAEA,KAAC;EACA,aAAA"} */
diff --git a/js/ckeditor/samples/img/github-top.png b/js/ckeditor/samples/img/github-top.png
deleted file mode 100644
index 7b9cbb10f..000000000
Binary files a/js/ckeditor/samples/img/github-top.png and /dev/null differ
diff --git a/js/ckeditor/samples/img/header-bg.png b/js/ckeditor/samples/img/header-bg.png
deleted file mode 100644
index a14166a8f..000000000
Binary files a/js/ckeditor/samples/img/header-bg.png and /dev/null differ
diff --git a/js/ckeditor/samples/img/header-separator.png b/js/ckeditor/samples/img/header-separator.png
deleted file mode 100644
index 8c4fb9b56..000000000
Binary files a/js/ckeditor/samples/img/header-separator.png and /dev/null differ
diff --git a/js/ckeditor/samples/img/logo.png b/js/ckeditor/samples/img/logo.png
deleted file mode 100644
index 96d86e27c..000000000
Binary files a/js/ckeditor/samples/img/logo.png and /dev/null differ
diff --git a/js/ckeditor/samples/img/navigation-tip.png b/js/ckeditor/samples/img/navigation-tip.png
deleted file mode 100644
index 228611419..000000000
Binary files a/js/ckeditor/samples/img/navigation-tip.png and /dev/null differ
diff --git a/js/ckeditor/samples/index.html b/js/ckeditor/samples/index.html
deleted file mode 100644
index 663fc1798..000000000
--- a/js/ckeditor/samples/index.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>CKEditor Sample</title>
-	<script src="../ckeditor.js"></script>
-	<script src="js/sample.js"></script>
-	<link rel="stylesheet" href="css/samples.css">
-	<link rel="stylesheet" href="toolbarconfigurator/lib/codemirror/neo.css">
-</head>
-<body id="main">
-
-<nav class="navigation-a">
-	<div class="grid-container">
-		<ul class="navigation-a-left grid-width-70">
-			<li><a href="http://ckeditor.com">Project Homepage</a></li>
-			<li><a href="https://github.com/ckeditor/ckeditor-dev/issues">I found a bug</a></li>
-			<li><a href="http://github.com/ckeditor/ckeditor-dev" class="icon-pos-right icon-navigation-a-github">Fork CKEditor on GitHub</a></li>
-		</ul>
-		<ul class="navigation-a-right grid-width-30">
-			<li><a href="http://ckeditor.com/blog-list">CKEditor Blog</a></li>
-		</ul>
-	</div>
-</nav>
-
-<header class="header-a">
-	<div class="grid-container">
-		<h1 class="header-a-logo grid-width-30">
-			<a href="index.html"><img src="img/logo.png" alt="CKEditor Sample"></a>
-		</h1>
-
-		<nav class="navigation-b grid-width-70">
-			<ul>
-				<li><a href="index.html" class="button-a button-a-background">Start</a></li>
-				<li><a href="toolbarconfigurator/index.html" class="button-a">Toolbar configurator <span class="balloon-a balloon-a-nw">Edit your toolbar now!</span></a></li>
-			</ul>
-		</nav>
-	</div>
-</header>
-
-<main>
-	<div class="adjoined-top">
-		<div class="grid-container">
-			<div class="content grid-width-100">
-				<h1>Congratulations!</h1>
-				<p>
-					If you can see CKEditor below, it means that the installation succeeded.
-					You can now try out your new editor version, see its features, and when you are ready to move on, check some of the <a href="#sample-customize">most useful resources</a> recommended below.
-				</p>
-			</div>
-		</div>
-	</div>
-	<div class="adjoined-bottom">
-		<div class="grid-container">
-			<div class="grid-width-100">
-				<div id="editor">
-					<h1>Hello world!</h1>
-					<p>I'm an instance of <a href="http://ckeditor.com">CKEditor</a>.</p>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="grid-container">
-		<div class="content grid-width-100">
-			<section id="sample-customize">
-				<h2>Customize Your Editor</h2>
-				<p>Modular build and <a href="http://docs.ckeditor.com/#!/guide/dev_configuration">numerous configuration options</a> give you nearly endless possibilities to customize CKEditor. Replace the content of your <code><a href="../config.js">config.js</a></code> file with the following code and refresh this page (<strong>remember to clear the browser cache</strong>)!</p>
-		<pre class="cm-s-neo CodeMirror"><code><span style="padding-right: 0.1px;"><span class="cm-variable">CKEDITOR</span>.<span class="cm-property">editorConfig</span> <span class="cm-operator">=</span> <span class="cm-keyword">function</span>( <span class="cm-def">config</span> ) {</span>
-<span style="padding-right: 0.1px;"><span class="cm-tab">	</span><span class="cm-variable-2">config</span>.<span class="cm-property">language</span> <span class="cm-operator">=</span> <span class="cm-string">'es'</span>;</span>
-<span style="padding-right: 0.1px;"><span class="cm-tab">	</span><span class="cm-variable-2">config</span>.<span class="cm-property">uiColor</span> <span class="cm-operator">=</span> <span class="cm-string">'#F7B42C'</span>;</span>
-<span style="padding-right: 0.1px;"><span class="cm-tab">	</span><span class="cm-variable-2">config</span>.<span class="cm-property">height</span> <span class="cm-operator">=</span> <span class="cm-number">300</span>;</span>
-<span style="padding-right: 0.1px;"><span class="cm-tab">	</span><span class="cm-variable-2">config</span>.<span class="cm-property">toolbarCanCollapse</span> <span class="cm-operator">=</span> <span class="cm-atom">true</span>;</span>
-<span style="padding-right: 0.1px;">};</span></code></pre>
-			</section>
-
-			<section>
-				<h2>Toolbar Configuration</h2>
-				<p>If you want to reorder toolbar buttons or remove some of them, check <a href="toolbarconfigurator/index.html">this handy tool</a>!</p>
-			</section>
-
-			<section>
-				<h2>More Samples!</h2>
-				<p>Visit the <a href="http://sdk.ckeditor.com">CKEditor SDK</a> for a huge collection of samples showcasing editor features, with source code readily available to copy and use in your own implementation.</p>
-			</section>
-
-			<section>
-				<h2>Developer's Guide</h2>
-				<p>The most important resource for all developers working with CKEditor, integrating it with their websites and applications, and customizing to their needs. You can start from here:</p>
-				<ul>
-					<li><a href="http://docs.ckeditor.com/#!/guide/dev_installation">Getting Started</a> &ndash; Explains most crucial editor concepts and practices as well as the installation process and integration with your website.</li>
-					<li><a href="http://docs.ckeditor.com/#!/guide/dev_advanced_installation">Advanced Installation Concepts</a> &ndash; Describes how to upgrade, install additional components (plugins, skins), or create a custom build.</li>
-				</ul>
-					<p>When you have the basics sorted out, feel free to browse some more advanced sections like:</p>
-				<ul>
-					<li><a href="http://docs.ckeditor.com/#!/guide/dev_features">Functionality Overview</a> &ndash; Descriptions and samples of various editor features.</li>
-					<li><a href="http://docs.ckeditor.com/#!/guide/plugin_sdk_intro">Plugin SDK</a>, <a href="http://docs.ckeditor.com/#!/guide/widget_sdk_intro">Widget SDK</a>, and <a href="http://docs.ckeditor.com/#!/guide/skin_sdk_intro">Skin SDK</a> &ndash; Useful when you want to create your own editor components.</li>
-				</ul>
-			</section>
-
-			<section>
-				<h2>CKEditor JavaScript API</h2>
-				<p>CKEditor boasts a rich <a href="http://docs.ckeditor.com/#!/api">JavaScript API</a> that you can use to adjust the editor to your needs and integrate it with your website or application.</p>
-			</section>
-		</div>
-	</div>
-</main>
-
-<footer class="footer-a grid-container">
-	<div class="grid-container">
-		<p class="grid-width-100">
-			CKEditor &ndash; The text editor for the Internet &ndash; <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p class="grid-width-100" id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</footer>
-<script>
-	initSample();
-</script>
-
-</body>
-</html>
diff --git a/js/ckeditor/samples/js/sample.js b/js/ckeditor/samples/js/sample.js
deleted file mode 100644
index f0cd93913..000000000
--- a/js/ckeditor/samples/js/sample.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-/* exported initSample */
-
-if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
-	CKEDITOR.tools.enableHtml5Elements( document );
-
-// The trick to keep the editor in the sample quite small
-// unless user specified own height.
-CKEDITOR.config.height = 150;
-CKEDITOR.config.width = 'auto';
-
-var initSample = ( function() {
-	var wysiwygareaAvailable = isWysiwygareaAvailable(),
-		isBBCodeBuiltIn = !!CKEDITOR.plugins.get( 'bbcode' );
-
-	return function() {
-		var editorElement = CKEDITOR.document.getById( 'editor' );
-
-		// :(((
-		if ( isBBCodeBuiltIn ) {
-			editorElement.setHtml(
-				'Hello world!\n\n' +
-				'I\'m an instance of [url=http://ckeditor.com]CKEditor[/url].'
-			);
-		}
-
-		// Depending on the wysiwygare plugin availability initialize classic or inline editor.
-		if ( wysiwygareaAvailable ) {
-			CKEDITOR.replace( 'editor' );
-		} else {
-			editorElement.setAttribute( 'contenteditable', 'true' );
-			CKEDITOR.inline( 'editor' );
-
-			// TODO we can consider displaying some info box that
-			// without wysiwygarea the classic editor may not work.
-		}
-	};
-
-	function isWysiwygareaAvailable() {
-		// If in development mode, then the wysiwygarea must be available.
-		// Split REV into two strings so builder does not replace it :D.
-		if ( CKEDITOR.revision == ( '%RE' + 'V%' ) ) {
-			return true;
-		}
-
-		return !!CKEDITOR.plugins.get( 'wysiwygarea' );
-	}
-} )();
-
diff --git a/js/ckeditor/samples/js/sf.js b/js/ckeditor/samples/js/sf.js
deleted file mode 100644
index 69dd77d21..000000000
--- a/js/ckeditor/samples/js/sf.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-var SF=function(){function d(a){return(a=a.attributes?a.attributes.getNamedItem("class"):null)?a.value.split(" "):[]}function c(a){var e=document.createAttribute("class");e.value=a.join(" ");return e}var b={attachListener:function(a,e,b){if(a.addEventListener)a.addEventListener(e,b,!1);else if(a.attachEvent)a.attachEvent("on"+e,function(){b.apply(a,arguments)});else throw Error("Could not attach event.");}};b.indexOf=function(){var a=Array.prototype.indexOf;return"function"===a?function(e,b){return a.call(e,
-b)}:function(a,b){for(var c=a.length,d=0;d<c;d++)if(a[d]===b)return d;return-1}}();b.accept=function(a,e){var c;a.children?(c=a.children,e(a)):"number"===typeof a.length&&(c=a);for(var d=c?c.length||0:0;d--;)b.accept(c[d],e)};b.getByClass=function(){var a=document.getElementsByClassName;return"function"===typeof a?function(e,b){"string"===typeof e&&(b=e,e=document);return a.call(e,b)}:function(a,c){"string"===typeof a&&(c=a,a=document.getElementsByTagName("html")[0]);var d=[];b.accept(a,function(a){b.classList.contains(a,
-c)&&d.push(a)});return d}}();b.classList={};b.classList.add=function(a,b){var f=d(a);f.push(b);a.attributes.setNamedItem(c(f))};b.classList.remove=function(a,e){var f=d(a,e),n=b.indexOf(f,e);-1!==n&&(f.splice(n,1),a.attributes.setNamedItem(c(f)))};b.classList.contains=function(a,c){return-1!==b.indexOf(d(a),c)};b.classList.toggle=function(a,b){this.contains(a,b)?this.remove(a,b):this.add(a,b)};return b}();"use strict";
-(function(){function d(c){for(var b in c)delete c[b]}SF.modal=function(c){function b(a){27==a.keyCode&&f.close()}c.modalClass="modal content";c.closeClass="modal-close";c.modalStyles=d;c.closeStyles=d;var a=c.afterCreate,e=c.afterClose;c.afterCreate=function(c){a&&a(c);window.addEventListener("keydown",b)};c.afterClose=function(a){e&&e(a);window.removeEventListener("keydown",b)};var f=(new picoModal(c)).afterCreate(c.afterCreate).afterClose(c.afterClose);return f}})();"use strict";
-(function(){for(var d=SF.getByClass("toggler"),c=d.length;c--;)SF.attachListener(d[c],"click",function(){var b=SF.classList.contains(this,"icon-toggler-expanded")||SF.classList.contains(this,"icon-toggler-collapsed"),a=document.getElementById(this.getAttribute("data-for"));SF.classList.toggle(this,"collapsed");SF.classList.contains(this,"collapsed")?(SF.classList.add(a,"collapsed"),b&&(SF.classList.remove(this,"icon-toggler-expanded"),SF.classList.add(this,"icon-toggler-collapsed"))):(SF.classList.remove(a,
-"collapsed"),b&&(SF.classList.remove(this,"icon-toggler-collapsed"),SF.classList.add(this,"icon-toggler-expanded")))})})();"use strict";(function(){for(var d=SF.getByClass("tree-a"),c=d.length;c--;)SF.attachListener(d[c],"click",function(b){b=b.target||b.srcElement;"H2"!==b.nodeName||SF.classList.contains(b,"tree-a-no-sub")||SF.classList.toggle(b,"tree-a-active")})})();
-(function(d,c){function b(a){return"object"===typeof Node?a instanceof Node:a&&"object"===typeof a&&"number"===typeof a.nodeType}function a(){var a=[];return{watch:a.push.bind(a),trigger:function(b){for(var c=!0,d={preventDefault:function(){c=!1}},e=0;e<a.length;e++)a[e](b,d);return c}}}function e(a){this.elem=a}function f(a,b){return e.div().clazz("pico-overlay").clazz(a("overlayClass","")).stylize({display:"block",position:"fixed",top:"0px",left:"0px",height:"100%",width:"100%",zIndex:1E4}).stylize(a("overlayStyles",
-{opacity:.5,background:"#000"})).onClick(function(){a("overlayClose",!0)&&b()})}function n(a,b){var c=a("width","auto");"number"===typeof c&&(c=""+c+"px");return e.div().clazz("pico-content").clazz(a("modalClass","")).stylize({display:"block",position:"fixed",zIndex:10001,left:"50%",top:"50px",width:c,"-ms-transform":"translateX(-50%)","-moz-transform":"translateX(-50%)","-webkit-transform":"translateX(-50%)","-o-transform":"translateX(-50%)",transform:"translateX(-50%)"}).stylize(a("modalStyles",
-{backgroundColor:"white",padding:"20px",borderRadius:"5px"})).html(a("content")).attr("role","dialog").onClick(function(a){(new e(a.target)).anyAncestor(function(a){return/\bpico-close\b/.test(a.elem.className)})&&b()})}function p(a){return function(){return a().elem}}function k(c){function e(a,b){var d=c[a];"function"===typeof d&&(d=d(b));return void 0===d?b:d}function k(){l().hide();m().hide();v.trigger(h)}function q(){w.trigger(h)&&k()}function g(a){return function(){a.apply(this,arguments);return h}}
-function r(a){if(!t){var c=n(e,q),b=f(e,q),d;d=e("closeButton",!0)?c.child().html(e("closeHtml","\x26#xD7;")).clazz("pico-close").clazz(e("closeClass")).stylize(e("closeStyles",{borderRadius:"2px",cursor:"pointer",height:"15px",width:"15px",position:"absolute",top:"5px",right:"5px",fontSize:"16px",textAlign:"center",lineHeight:"15px",background:"#CCC"})):void 0;t={modal:c,overlay:b,close:d};x.trigger(h)}return t[a]}if("string"===typeof c||b(c))c={content:c};var x=a(),y=a(),z=a(),w=a(),v=a(),t,m=r.bind(d,
-"modal"),l=r.bind(d,"overlay"),u=r.bind(d,"close"),h={modalElem:p(m),closeElem:p(u),overlayElem:p(l),show:function(){y.trigger(h)&&(l().show(),u(),m().show(),z.trigger(h));return this},close:g(q),forceClose:g(k),destroy:function(){m=m().destroy();l=l().destroy();u=void 0},options:function(a){c=a},afterCreate:g(x.watch),beforeShow:g(y.watch),afterShow:g(z.watch),beforeClose:g(w.watch),afterClose:g(v.watch)};return h}e.div=function(a){var b=c.createElement("div");(a||c.body).appendChild(b);return new e(b)};
-e.prototype={child:function(){return e.div(this.elem)},stylize:function(a){a=a||{};"undefined"!==typeof a.opacity&&(a.filter="alpha(opacity\x3d"+100*a.opacity+")");for(var b in a)a.hasOwnProperty(b)&&(this.elem.style[b]=a[b]);return this},clazz:function(a){this.elem.className+=" "+a;return this},html:function(a){b(a)?this.elem.appendChild(a):this.elem.innerHTML=a;return this},onClick:function(a){this.elem.addEventListener("click",a);return this},destroy:function(){c.body.removeChild(this.elem)},hide:function(){this.elem.style.display=
-"none"},show:function(){this.elem.style.display="block"},attr:function(a,b){this.elem.setAttribute(a,b);return this},anyAncestor:function(a){for(var b=this.elem;b;){if(a(new e(b)))return!0;b=b.parentNode}return!1}};"function"===typeof d.define&&d.define.amd?d.define(function(){return k}):d.picoModal=k})(window,document);
\ No newline at end of file
diff --git a/js/ckeditor/samples/old/ajax.html b/js/ckeditor/samples/old/ajax.html
deleted file mode 100644
index 3ca07c216..000000000
--- a/js/ckeditor/samples/old/ajax.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Ajax &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-	<script>
-
-		var editor, html = '';
-
-		function createEditor() {
-			if ( editor )
-				return;
-
-			// Create a new editor inside the <div id="editor">, setting its value to html
-			var config = {};
-			editor = CKEDITOR.appendTo( 'editor', config, html );
-		}
-
-		function removeEditor() {
-			if ( !editor )
-				return;
-
-			// Retrieve the editor contents. In an Ajax application, this data would be
-			// sent to the server or used in any other way.
-			document.getElementById( 'editorcontents' ).innerHTML = html = editor.getData();
-			document.getElementById( 'contents' ).style.display = '';
-
-			// Destroy the editor.
-			editor.destroy();
-			editor = null;
-		}
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Create and Destroy Editor Instances for Ajax Applications
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/saveajax.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to create and destroy CKEditor instances on the fly. After the removal of CKEditor the content created inside the editing
-			area will be displayed in a <code>&lt;div&gt;</code> element.
-		</p>
-		<p>
-			For details of how to create this setup check the source code of this sample page
-			for JavaScript code responsible for the creation and destruction of a CKEditor instance.
-		</p>
-	</div>
-	<p>Click the buttons to create and remove a CKEditor instance.</p>
-	<p>
-		<input onclick="createEditor();" type="button" value="Create Editor">
-		<input onclick="removeEditor();" type="button" value="Remove Editor">
-	</p>
-	<!-- This div will hold the editor. -->
-	<div id="editor">
-	</div>
-	<div id="contents" style="display: none">
-		<p>
-			Edited Contents:
-		</p>
-		<!-- This div will be used to display the editor contents. -->
-		<div id="editorcontents">
-		</div>
-	</div>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/api.html b/js/ckeditor/samples/old/api.html
deleted file mode 100644
index 88a4b065d..000000000
--- a/js/ckeditor/samples/old/api.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>API Usage &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<script>
-
-// The instanceReady event is fired, when an instance of CKEditor has finished
-// its initialization.
-CKEDITOR.on( 'instanceReady', function( ev ) {
-	// Show the editor name and description in the browser status bar.
-	document.getElementById( 'eMessage' ).innerHTML = 'Instance <code>' + ev.editor.name + '<\/code> loaded.';
-
-	// Show this sample buttons.
-	document.getElementById( 'eButtons' ).style.display = 'block';
-});
-
-function InsertHTML() {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-	var value = document.getElementById( 'htmlArea' ).value;
-
-	// Check the active editing mode.
-	if ( editor.mode == 'wysiwyg' )
-	{
-		// Insert HTML code.
-		// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml
-		editor.insertHtml( value );
-	}
-	else
-		alert( 'You must be in WYSIWYG mode!' );
-}
-
-function InsertText() {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-	var value = document.getElementById( 'txtArea' ).value;
-
-	// Check the active editing mode.
-	if ( editor.mode == 'wysiwyg' )
-	{
-		// Insert as plain text.
-		// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText
-		editor.insertText( value );
-	}
-	else
-		alert( 'You must be in WYSIWYG mode!' );
-}
-
-function SetContents() {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-	var value = document.getElementById( 'htmlArea' ).value;
-
-	// Set editor contents (replace current contents).
-	// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData
-	editor.setData( value );
-}
-
-function GetContents() {
-	// Get the editor instance that you want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-
-	// Get editor contents
-	// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData
-	alert( editor.getData() );
-}
-
-function ExecuteCommand( commandName ) {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-
-	// Check the active editing mode.
-	if ( editor.mode == 'wysiwyg' )
-	{
-		// Execute the command.
-		// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand
-		editor.execCommand( commandName );
-	}
-	else
-		alert( 'You must be in WYSIWYG mode!' );
-}
-
-function CheckDirty() {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-	// Checks whether the current editor contents present changes when compared
-	// to the contents loaded into the editor at startup
-	// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty
-	alert( editor.checkDirty() );
-}
-
-function ResetDirty() {
-	// Get the editor instance that we want to interact with.
-	var editor = CKEDITOR.instances.editor1;
-	// Resets the "dirty state" of the editor (see CheckDirty())
-	// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-resetDirty
-	editor.resetDirty();
-	alert( 'The "IsDirty" status has been reset' );
-}
-
-function Focus() {
-	CKEDITOR.instances.editor1.focus();
-}
-
-function onFocus() {
-	document.getElementById( 'eMessage' ).innerHTML = '<b>' + this.name + ' is focused </b>';
-}
-
-function onBlur() {
-	document.getElementById( 'eMessage' ).innerHTML = this.name + ' lost focus';
-}
-
-	</script>
-
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Using CKEditor JavaScript API
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/api.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-	<p>
-		This sample shows how to use the
-		<a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.editor">CKEditor JavaScript API</a>
-		to interact with the editor at runtime.
-	</p>
-	<p>
-		For details on how to create this setup check the source code of this sample page.
-	</p>
-	</div>
-
-	<!-- This <div> holds alert messages to be display in the sample page. -->
-	<div id="alerts">
-		<noscript>
-			<p>
-				<strong>CKEditor requires JavaScript to run</strong>. In a browser with no JavaScript
-				support, like yours, you should still see the contents (HTML data) and you should
-				be able to edit it normally, without a rich editor interface.
-			</p>
-		</noscript>
-	</div>
-	<form action="../../../samples/sample_posteddata.php" method="post">
-		<textarea cols="100" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-
-		<script>
-			// Replace the <textarea id="editor1"> with an CKEditor instance.
-			CKEDITOR.replace( 'editor1', {
-				on: {
-					focus: onFocus,
-					blur: onBlur,
-
-					// Check for availability of corresponding plugins.
-					pluginsLoaded: function( evt ) {
-						var doc = CKEDITOR.document, ed = evt.editor;
-						if ( !ed.getCommand( 'bold' ) )
-							doc.getById( 'exec-bold' ).hide();
-						if ( !ed.getCommand( 'link' ) )
-							doc.getById( 'exec-link' ).hide();
-					}
-				}
-			});
-		</script>
-
-		<p id="eMessage">
-		</p>
-
-		<div id="eButtons" style="display: none">
-			<input id="exec-bold" onclick="ExecuteCommand('bold');" type="button" value="Execute &quot;bold&quot; Command">
-			<input id="exec-link" onclick="ExecuteCommand('link');" type="button" value="Execute &quot;link&quot; Command">
-			<input onclick="Focus();" type="button" value="Focus">
-			<br><br>
-			<input onclick="InsertHTML();" type="button" value="Insert HTML">
-			<input onclick="SetContents();" type="button" value="Set Editor Contents">
-			<input onclick="GetContents();" type="button" value="Get Editor Contents (HTML)">
-			<br>
-			<textarea cols="100" id="htmlArea" rows="3">&lt;h2&gt;Test&lt;/h2&gt;&lt;p&gt;This is some &lt;a href="/Test1.html"&gt;sample&lt;/a&gt; HTML code.&lt;/p&gt;</textarea>
-			<br>
-			<br>
-			<input onclick="InsertText();" type="button" value="Insert Text">
-			<br>
-			<textarea cols="100" id="txtArea" rows="3">   First line with some leading whitespaces.
-
-Second line of text preceded by two line breaks.</textarea>
-			<br>
-			<br>
-			<input onclick="CheckDirty();" type="button" value="checkDirty()">
-			<input onclick="ResetDirty();" type="button" value="resetDirty()">
-		</div>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/appendto.html b/js/ckeditor/samples/old/appendto.html
deleted file mode 100644
index dbabf750a..000000000
--- a/js/ckeditor/samples/old/appendto.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Append To Page Element Using JavaScript Code &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Append To Page Element Using JavaScript Code
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<div id="section1">
-		<div class="description">
-			<p>
-				The <code><a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR-method-appendTo">CKEDITOR.appendTo()</a></code> method serves to to place editors inside existing DOM elements. Unlike <code><a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR-method-replace">CKEDITOR.replace()</a></code>,
-				a target container to be replaced is no longer necessary. A new editor
-				instance is inserted directly wherever it is desired.
-			</p>
-<pre class="samples">CKEDITOR.appendTo( '<em>container_id</em>',
-	{ /* Configuration options to be used. */ }
-	'Editor content to be used.'
-);</pre>
-		</div>
-		<script>
-
-			// This call can be placed at any point after the
-			// DOM element to append CKEditor to or inside the <head><script>
-			// in a window.onload event handler.
-
-			// Append a CKEditor instance using the default configuration and the
-			// provided content to the <div> element of ID "section1".
-			CKEDITOR.appendTo( 'section1',
-				null,
-				'<p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p>'
-			);
-
-		</script>
-	</div>
-	<br>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/assets/inlineall/logo.png b/js/ckeditor/samples/old/assets/inlineall/logo.png
deleted file mode 100644
index b4d5979e3..000000000
Binary files a/js/ckeditor/samples/old/assets/inlineall/logo.png and /dev/null differ
diff --git a/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css b/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
deleted file mode 100644
index fbcc767f4..000000000
--- a/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- *
- * Styles used by the XHTML 1.1 sample page (xhtml.html).
- */
-
-/**
- * Basic definitions for the editing area.
- */
-body
-{
-	font-family: Arial, Verdana, sans-serif;
-	font-size: 80%;
-	color: #000000;
-	background-color: #ffffff;
-	padding: 5px;
-	margin: 0px;
-}
-
-/**
- * Core styles.
- */
-
-.Bold
-{
-	font-weight: bold;
-}
-
-.Italic
-{
-	font-style: italic;
-}
-
-.Underline
-{
-	text-decoration: underline;
-}
-
-.StrikeThrough
-{
-	text-decoration: line-through;
-}
-
-.Subscript
-{
-	vertical-align: sub;
-	font-size: smaller;
-}
-
-.Superscript
-{
-	vertical-align: super;
-	font-size: smaller;
-}
-
-/**
- * Font faces.
- */
-
-.FontComic
-{
-	font-family: 'Comic Sans MS';
-}
-
-.FontCourier
-{
-	font-family: 'Courier New';
-}
-
-.FontTimes
-{
-	font-family: 'Times New Roman';
-}
-
-/**
- * Font sizes.
- */
-
-.FontSmaller
-{
-	font-size: smaller;
-}
-
-.FontLarger
-{
-	font-size: larger;
-}
-
-.FontSmall
-{
-	font-size: 8pt;
-}
-
-.FontBig
-{
-	font-size: 14pt;
-}
-
-.FontDouble
-{
-	font-size: 200%;
-}
-
-/**
- * Font colors.
- */
-.FontColor1
-{
-	color: #ff9900;
-}
-
-.FontColor2
-{
-	color: #0066cc;
-}
-
-.FontColor3
-{
-	color: #ff0000;
-}
-
-.FontColor1BG
-{
-	background-color: #ff9900;
-}
-
-.FontColor2BG
-{
-	background-color: #0066cc;
-}
-
-.FontColor3BG
-{
-	background-color: #ff0000;
-}
-
-/**
- * Indentation.
- */
-
-.Indent1
-{
-	margin-left: 40px;
-}
-
-.Indent2
-{
-	margin-left: 80px;
-}
-
-.Indent3
-{
-	margin-left: 120px;
-}
-
-/**
- * Alignment.
- */
-
-.JustifyLeft
-{
-	text-align: left;
-}
-
-.JustifyRight
-{
-	text-align: right;
-}
-
-.JustifyCenter
-{
-	text-align: center;
-}
-
-.JustifyFull
-{
-	text-align: justify;
-}
-
-/**
- * Other.
- */
-
-code
-{
-	font-family: courier, monospace;
-	background-color: #eeeeee;
-	padding-left: 1px;
-	padding-right: 1px;
-	border: #c0c0c0 1px solid;
-}
-
-kbd
-{
-	padding: 0px 1px 0px 1px;
-	border-width: 1px 2px 2px 1px;
-	border-style: solid;
-}
-
-blockquote
-{
-	color: #808080;
-}
diff --git a/js/ckeditor/samples/old/assets/posteddata.php b/js/ckeditor/samples/old/assets/posteddata.php
deleted file mode 100644
index bb4dd9435..000000000
--- a/js/ckeditor/samples/old/assets/posteddata.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<?php
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-?>
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Sample &mdash; CKEditor</title>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		CKEditor &mdash; Posted Data
-	</h1>
-	<table border="1" cellspacing="0" id="outputSample">
-		<colgroup><col width="120"></colgroup>
-		<thead>
-			<tr>
-				<th>Field&nbsp;Name</th>
-				<th>Value</th>
-			</tr>
-		</thead>
-<?php
-
-if (!empty($_POST))
-{
-	foreach ( $_POST as $key => $value )
-	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
-			continue;
-
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
-		else
-			$value = htmlspecialchars( (string)$value );
-?>
-		<tr>
-			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
-			<td><pre class="samples"><?php echo $value; ?></pre></td>
-		</tr>
-	<?php
-	}
-}
-?>
-	</table>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/assets/sample.jpg b/js/ckeditor/samples/old/assets/sample.jpg
deleted file mode 100644
index 9498271c6..000000000
Binary files a/js/ckeditor/samples/old/assets/sample.jpg and /dev/null differ
diff --git a/js/ckeditor/samples/old/assets/uilanguages/languages.js b/js/ckeditor/samples/old/assets/uilanguages/languages.js
deleted file mode 100644
index 3208ff4c5..000000000
--- a/js/ckeditor/samples/old/assets/uilanguages/languages.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-var CKEDITOR_LANGS=function(){var c={af:"Afrikaans",ar:"Arabic",az:"Azerbaijani",bg:"Bulgarian",bn:"Bengali/Bangla",bs:"Bosnian",ca:"Catalan",cs:"Czech",cy:"Welsh",da:"Danish",de:"German","de-ch":"German (Switzerland)",el:"Greek",en:"English","en-au":"English (Australia)","en-ca":"English (Canadian)","en-gb":"English (United Kingdom)",eo:"Esperanto",es:"Spanish","es-mx":"Spanish (Mexico)",et:"Estonian",eu:"Basque",fa:"Persian",fi:"Finnish",fo:"Faroese",fr:"French","fr-ca":"French (Canada)",gl:"Galician",
-gu:"Gujarati",he:"Hebrew",hi:"Hindi",hr:"Croatian",hu:"Hungarian",id:"Indonesian",is:"Icelandic",it:"Italian",ja:"Japanese",ka:"Georgian",km:"Khmer",ko:"Korean",ku:"Kurdish",lt:"Lithuanian",lv:"Latvian",mk:"Macedonian",mn:"Mongolian",ms:"Malay",nb:"Norwegian Bokmal",nl:"Dutch",no:"Norwegian",oc:"Occitan",pl:"Polish",pt:"Portuguese (Portugal)","pt-br":"Portuguese (Brazil)",ro:"Romanian",ru:"Russian",si:"Sinhala",sk:"Slovak",sq:"Albanian",sl:"Slovenian",sr:"Serbian (Cyrillic)","sr-latn":"Serbian (Latin)",
-sv:"Swedish",th:"Thai",tr:"Turkish",tt:"Tatar",ug:"Uighur",uk:"Ukrainian",vi:"Vietnamese",zh:"Chinese Traditional","zh-cn":"Chinese Simplified"},b=[],a;for(a in CKEDITOR.lang.languages)b.push({code:a,name:c[a]||a});b.sort(function(a,b){return a.name<b.name?-1:1});return b}();
\ No newline at end of file
diff --git a/js/ckeditor/samples/old/datafiltering.html b/js/ckeditor/samples/old/datafiltering.html
deleted file mode 100644
index 637c17be7..000000000
--- a/js/ckeditor/samples/old/datafiltering.html
+++ /dev/null
@@ -1,508 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Data Filtering &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-	<script>
-		// Remove advanced tabs for all editors.
-		CKEDITOR.config.removeDialogTabs = 'image:advanced;link:advanced;flash:advanced;creatediv:advanced;editdiv:advanced';
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Data Filtering and Features Activation
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/acf.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample page demonstrates the idea of Advanced Content Filter
-			(<abbr title="Advanced Content Filter">ACF</abbr>), a sophisticated
-			tool that takes control over what kind of data is accepted by the editor and what
-			kind of output is produced.
-		</p>
-		<h2>When and what is being filtered?</h2>
-		<p>
-			<abbr title="Advanced Content Filter">ACF</abbr> controls
-			<strong>every single source of data</strong> that comes to the editor.
-			It process both HTML that is inserted manually (i.e. pasted by the user)
-			and programmatically like:
-		</p>
-<pre class="samples">
-editor.setData( '&lt;p&gt;Hello world!&lt;/p&gt;' );
-</pre>
-		<p>
-			<abbr title="Advanced Content Filter">ACF</abbr> discards invalid,
-			useless HTML tags and attributes so the editor remains "clean" during
-			runtime. <abbr title="Advanced Content Filter">ACF</abbr> behaviour
-			can be configured and adjusted for a particular case to prevent the
-			output HTML (i.e. in CMS systems) from being polluted.
-
-			This kind of filtering is a first, client-side line of defense
-			against "<a href="http://en.wikipedia.org/wiki/Tag_soup">tag soups</a>",
-			the tool that precisely restricts which tags, attributes and styles
-			are allowed (desired). When properly configured, <abbr title="Advanced Content Filter">ACF</abbr>
-			is an easy and fast way to produce a high-quality, intentionally filtered HTML.
-		</p>
-
-		<h3>How to configure or disable ACF?</h3>
-		<p>
-			Advanced Content Filter is enabled by default, working in "automatic mode", yet
-			it provides a set of easy rules that allow adjusting filtering rules
-			and disabling the entire feature when necessary. The config property
-			responsible for this feature is <code><a class="samples"
-			href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">config.allowedContent</a></code>.
-		</p>
-		<p>
-			By "automatic mode" is meant that loaded plugins decide which kind
-			of content is enabled and which is not. For example, if the link
-			plugin is loaded it implies that <code>&lt;a&gt;</code> tag is
-			automatically allowed. Each plugin is given a set
-			of predefined <abbr title="Advanced Content Filter">ACF</abbr> rules
-			that control the editor until <code><a class="samples"
-			href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">
-			config.allowedContent</a></code>
-			is defined manually.
-		</p>
-		<p>
-			Let's assume our intention is to restrict the editor to accept (produce) <strong>paragraphs
-			only: no attributes, no styles, no other tags</strong>.
-			With <abbr title="Advanced Content Filter">ACF</abbr>
-			this is very simple. Basically set <code><a class="samples"
-			href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">
-			config.allowedContent</a></code> to <code>'p'</code>:
-		</p>
-<pre class="samples">
-var editor = CKEDITOR.replace( <em>textarea_id</em>, {
-	<strong>allowedContent: 'p'</strong>
-} );
-</pre>
-		<p>
-			Now try to play with allowed content:
-		</p>
-<pre class="samples">
-// Trying to insert disallowed tag and attribute.
-editor.setData( '&lt;p <strong>style="color: red"</strong>&gt;Hello <strong>&lt;em&gt;world&lt;/em&gt;</strong>!&lt;/p&gt;' );
-alert( editor.getData() );
-
-// Filtered data is returned.
-"&lt;p&gt;Hello world!&lt;/p&gt;"
-</pre>
-		<p>
-			What happened? Since <code>config.allowedContent: 'p'</code> is set the editor assumes
-			that only plain <code>&lt;p&gt;</code> are accepted. Nothing more. This is why
-			<code>style</code> attribute and <code>&lt;em&gt;</code> tag are gone. The same
-			filtering would happen if we pasted disallowed HTML into this editor.
-		</p>
-		<p>
-			This is just a small sample of what <abbr title="Advanced Content Filter">ACF</abbr>
-			can do. To know more, please refer to the sample section below and
-			<a href="http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter">the official Advanced Content Filter guide</a>.
-		</p>
-		<p>
-			You may, of course, want CKEditor to avoid filtering of any kind.
-			To get rid of <abbr title="Advanced Content Filter">ACF</abbr>,
-			basically set <code><a class="samples"
-			href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">
-			config.allowedContent</a></code> to <code>true</code> like this:
-		</p>
-<pre class="samples">
-CKEDITOR.replace( <em>textarea_id</em>, {
-	<strong>allowedContent: true</strong>
-} );
-</pre>
-
-		<h2>Beyond data flow: Features activation</h2>
-		<p>
-			<abbr title="Advanced Content Filter">ACF</abbr> is far more than
-			<abbr title="Input/Output">I/O</abbr> control: the entire
-			<abbr title="User Interface">UI</abbr> of the editor is adjusted to what
-			filters restrict. For example: if <code>&lt;a&gt;</code> tag is
-			<strong>disallowed</strong>
-			by <abbr title="Advanced Content Filter">ACF</abbr>,
-			then accordingly <code>link</code> command, toolbar button and link dialog
-			are also disabled. Editor is smart: it knows which features must be
-			removed from the interface to match filtering rules.
-		</p>
-		<p>
-			CKEditor can be far more specific. If <code>&lt;a&gt;</code> tag is
-			<strong>allowed</strong> by filtering rules to be used but it is restricted
-			to have only one attribute (<code>href</code>)
-			<code>config.allowedContent = 'a[!href]'</code>, then
-			"Target" tab of the link dialog is automatically disabled as <code>target</code>
-			attribute isn't included in <abbr title="Advanced Content Filter">ACF</abbr> rules
-			for <code>&lt;a&gt;</code>. This behaviour applies to dialog fields, context
-			menus and toolbar buttons.
-		</p>
-
-		<h2>Sample configurations</h2>
-		<p>
-			There are several editor instances below that present different
-			<abbr title="Advanced Content Filter">ACF</abbr> setups. <strong>All of them,
-			except the inline instance, share the same HTML content</strong> to visualize
-			how different filtering rules affect the same input data.
-		</p>
-	</div>
-
-	<div>
-		<label for="editor1">
-			Editor 1:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using default configuration ("automatic mode"). It means that
-				<code><a class="samples"
-				href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">
-				config.allowedContent</a></code> is defined by loaded plugins.
-				Each plugin extends filtering rules to make it's own associated content
-				available for the user.
-			</p>
-		</div>
-		<textarea cols="80" id="editor1" name="editor1" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-
-		<script>
-
-			CKEDITOR.replace( 'editor1' );
-
-		</script>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor2">
-			Editor 2:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using a custom configuration for
-				<abbr title="Advanced Content Filter">ACF</abbr>:
-			</p>
-<pre class="samples">
-CKEDITOR.replace( 'editor2', {
-	allowedContent:
-		'h1 h2 h3 p blockquote strong em;' +
-		'a[!href];' +
-		'img(left,right)[!src,alt,width,height];' +
-		'table tr th td caption;' +
-		'span{!font-family};' +'
-		'span{!color};' +
-		'span(!marker);' +
-		'del ins'
-} );
-</pre>
-			<p>
-				The following rules may require additional explanation:
-			</p>
-			<ul>
-				<li>
-					<code>h1 h2 h3 p blockquote strong em</code> - These tags
-					are accepted by the editor. Any tag attributes will be discarded.
-				</li>
-				<li>
-					<code>a[!href]</code> - <code>href</code> attribute is obligatory
-					for <code>&lt;a&gt;</code> tag. Tags without this attribute
-					are disarded. No other attribute will be accepted.
-				</li>
-				<li>
-					<code>img(left,right)[!src,alt,width,height]</code> - <code>src</code>
-					attribute is obligatory for <code>&lt;img&gt;</code> tag.
-					<code>alt</code>, <code>width</code>, <code>height</code>
-					and <code>class</code> attributes are accepted but
-					<code>class</code> must be either <code>class="left"</code>
-					or <code>class="right"</code>
-				</li>
-				<li>
-					<code>table tr th td caption</code> - These tags
-					are accepted by the editor. Any tag attributes will be discarded.
-				</li>
-				<li>
-					<code>span{!font-family}</code>, <code>span{!color}</code>,
-					<code>span(!marker)</code> - <code>&lt;span&gt;</code> tags
-					will be accepted if either <code>font-family</code> or
-					<code>color</code> style is set or <code>class="marker"</code>
-					is present.
-				</li>
-				<li>
-					<code>del ins</code> - These tags
-					are accepted by the editor. Any tag attributes will be discarded.
-				</li>
-			</ul>
-			<p>
-				Please note that <strong><abbr title="User Interface">UI</abbr> of the
-				editor is different</strong>. It's a response to what happened to the filters.
-				Since <code>text-align</code> isn't allowed, the align toolbar is gone.
-				The same thing happened to subscript/superscript, strike, underline
-				(<code>&lt;u&gt;</code>, <code>&lt;sub&gt;</code>, <code>&lt;sup&gt;</code>
-				are disallowed by <code><a class="samples"
-				href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent">
-				config.allowedContent</a></code>) and many other buttons.
-			</p>
-		</div>
-		<textarea cols="80" id="editor2" name="editor2" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor2', {
-				allowedContent:
-					'h1 h2 h3 p blockquote strong em;' +
-					'a[!href];' +
-					'img(left,right)[!src,alt,width,height];' +
-					'table tr th td caption;' +
-					'span{!font-family};' +
-					'span{!color};' +
-					'span(!marker);' +
-					'del ins'
-			} );
-
-		</script>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor3">
-			Editor 3:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using a custom configuration for
-				<abbr title="Advanced Content Filter">ACF</abbr>.
-				Note that filters can be configured as an object literal
-				as an alternative to a string-based definition.
-			</p>
-<pre class="samples">
-CKEDITOR.replace( 'editor3', {
-	allowedContent: {
-		'b i ul ol big small': true,
-		'h1 h2 h3 p blockquote li': {
-			styles: 'text-align'
-		},
-		a: { attributes: '!href,target' },
-		img: {
-			attributes: '!src,alt',
-			styles: 'width,height',
-			classes: 'left,right'
-		}
-	}
-} );
-</pre>
-		</div>
-		<textarea cols="80" id="editor3" name="editor3" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor3', {
-				allowedContent: {
-					'b i ul ol big small': true,
-					'h1 h2 h3 p blockquote li': {
-						styles: 'text-align'
-					},
-					a: { attributes: '!href,target' },
-					img: {
-						attributes: '!src,alt',
-						styles: 'width,height',
-						classes: 'left,right'
-					}
-				}
-			} );
-
-		</script>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor4">
-			Editor 4:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using a custom set of plugins and buttons.
-			</p>
-<pre class="samples">
-CKEDITOR.replace( 'editor4', {
-	removePlugins: 'bidi,font,forms,flash,horizontalrule,iframe,justify,table,tabletools,smiley',
-	removeButtons: 'Anchor,Underline,Strike,Subscript,Superscript,Image',
-	format_tags: 'p;h1;h2;h3;pre;address'
-} );
-</pre>
-			<p>
-				As you can see, removing plugins and buttons implies filtering.
-				Several tags are not allowed in the editor because there's no
-				plugin/button that is responsible for creating and editing this
-				kind of content (for example: the image is missing because
-				of <code>removeButtons: 'Image'</code>). The conclusion is that
-				<abbr title="Advanced Content Filter">ACF</abbr> works "backwards"
-				as well: <strong>modifying <abbr title="User Interface">UI</abbr>
-				elements is changing allowed content rules</strong>.
-			</p>
-		</div>
-		<textarea cols="80" id="editor4" name="editor4" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor4', {
-				removePlugins: 'bidi,div,font,forms,flash,horizontalrule,iframe,justify,table,tabletools,smiley',
-				removeButtons: 'Anchor,Underline,Strike,Subscript,Superscript,Image',
-				format_tags: 'p;h1;h2;h3;pre;address'
-			} );
-
-		</script>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor5">
-			Editor 5:
-		</label>
-		<div class="description">
-			<p>
-				This editor is built on editable <code>&lt;h1&gt;</code> element.
-				<abbr title="Advanced Content Filter">ACF</abbr> takes care of
-				what can be included in <code>&lt;h1&gt;</code>. Note that there
-				are no block styles in Styles combo. Also why lists, indentation,
-				blockquote, div, form and other buttons are missing.
-			</p>
-			<p>
-				<abbr title="Advanced Content Filter">ACF</abbr> makes sure that
-				no disallowed tags will come to <code>&lt;h1&gt;</code> so the final
-				markup is valid. If the user tried to paste some invalid HTML
-				into this editor (let's say a list), it would be automatically
-				converted into plain text.
-			</p>
-		</div>
-		<h1 id="editor5" contenteditable="true">
-			<em>Apollo 11</em> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on July 20, 1969, at 20:18 UTC.
-		</h1>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor3">
-			Editor 6:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
-				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" rel="noopener noreferrer" target="_blank">
-				Disallowed Content</a> property of the filter to eliminate all <code>title</code> attributes.
-			</p>
-
-<pre class="samples">
-CKEDITOR.replace( 'editor6', {
-	allowedContent: {
-		'b i ul ol big small': true,
-		'h1 h2 h3 p blockquote li': {
-			styles: 'text-align'
-		},
-		a: {attributes: '!href,target'},
-		img: {
-			attributes: '!src,alt',
-			styles: 'width,height',
-			classes: 'left,right'
-		}
-	},
-	disallowedContent: '*{title*}'
-} );
-</pre>
-		</div>
-		<textarea cols="80" id="editor6" name="editor6" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor6', {
-				allowedContent: {
-					'b i ul ol big small': true,
-					'h1 h2 h3 p blockquote li': {
-						styles: 'text-align'
-					},
-					a: {attributes: '!href,target'},
-					img: {
-						attributes: '!src,alt',
-						styles: 'width,height',
-						classes: 'left,right'
-					}
-				},
-				disallowedContent: '*{title*}'
-			} );
-
-		</script>
-	</div>
-
-	<br>
-
-	<div>
-		<label for="editor7">
-			Editor 7:
-		</label>
-		<div class="description">
-			<p>
-				This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
-				It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" rel="noopener noreferrer" target="_blank">
-				Disallowed Content</a> property of the filter to eliminate all <code>a</code> and <code>img</code> tags,
-				while allowing all other tags.
-			</p>
-<pre class="samples">
-CKEDITOR.replace( 'editor7', {
-	allowedContent: {
-		// Allow all content.
-		$1: {
-			elements: CKEDITOR.dtd,
-			attributes: true,
-			styles: true,
-			classes: true
-		}
-	},
-	disallowedContent: 'img a'
-} );
-</pre>
-		</div>
-		<textarea cols="80" id="editor7" name="editor7" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor7', {
-				allowedContent: {
-					// allow all content
-					$1: {
-						elements: CKEDITOR.dtd,
-						attributes: true,
-						styles: true,
-						classes: true
-					}
-				},
-				disallowedContent: 'img a'
-			} );
-
-		</script>
-	</div>
-
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/dialog/assets/my_dialog.js b/js/ckeditor/samples/old/dialog/assets/my_dialog.js
deleted file mode 100644
index fcd1a4313..000000000
--- a/js/ckeditor/samples/old/dialog/assets/my_dialog.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-CKEDITOR.dialog.add( 'myDialog', function() {
-	return {
-		title: 'My Dialog',
-		minWidth: 400,
-		minHeight: 200,
-		contents: [
-			{
-				id: 'tab1',
-				label: 'First Tab',
-				title: 'First Tab',
-				elements: [
-					{
-						id: 'input1',
-						type: 'text',
-						label: 'Text Field'
-					},
-					{
-						id: 'select1',
-						type: 'select',
-						label: 'Select Field',
-						items: [
-							[ 'option1', 'value1' ],
-							[ 'option2', 'value2' ]
-						]
-					}
-				]
-			},
-			{
-				id: 'tab2',
-				label: 'Second Tab',
-				title: 'Second Tab',
-				elements: [
-					{
-						id: 'button1',
-						type: 'button',
-						label: 'Button Field'
-					}
-				]
-			}
-		]
-	};
-} );
-
diff --git a/js/ckeditor/samples/old/dialog/dialog.html b/js/ckeditor/samples/old/dialog/dialog.html
deleted file mode 100644
index 0f22a1ac4..000000000
--- a/js/ckeditor/samples/old/dialog/dialog.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Using API to Customize Dialog Windows &mdash; CKEditor Sample</title>
-	<script src="../../../ckeditor.js"></script>
-	<link rel="stylesheet" href="../../../samples/old/sample.css">
-	<meta name="ckeditor-sample-name" content="Using the JavaScript API to customize dialog windows">
-	<meta name="ckeditor-sample-group" content="Advanced Samples">
-	<meta name="ckeditor-sample-description" content="Using the dialog windows API to customize dialog windows without changing the original editor code.">
-	<style>
-
-		.cke_button__mybutton_icon
-		{
-			display: none !important;
-		}
-
-		.cke_button__mybutton_label
-		{
-			display: inline !important;
-		}
-
-	</style>
-	<script>
-
-		CKEDITOR.on( 'instanceCreated', function( ev ){
-			var editor = ev.editor;
-
-			// Listen for the "pluginsLoaded" event, so we are sure that the
-			// "dialog" plugin has been loaded and we are able to do our
-			// customizations.
-			editor.on( 'pluginsLoaded', function() {
-
-				// If our custom dialog has not been registered, do that now.
-				if ( !CKEDITOR.dialog.exists( 'myDialog' ) ) {
-					// We need to do the following trick to find out the dialog
-					// definition file URL path. In the real world, you would simply
-					// point to an absolute path directly, like "/mydir/mydialog.js".
-					var href = document.location.href.split( '/' );
-					href.pop();
-					href.push( 'assets/my_dialog.js' );
-					href = href.join( '/' );
-
-					// Finally, register the dialog.
-					CKEDITOR.dialog.add( 'myDialog', href );
-				}
-
-				// Register the command used to open the dialog.
-				editor.addCommand( 'myDialogCmd', new CKEDITOR.dialogCommand( 'myDialog' ) );
-
-				// Add the a custom toolbar buttons, which fires the above
-				// command..
-				editor.ui.add( 'MyButton', CKEDITOR.UI_BUTTON, {
-					label: 'My Dialog',
-					command: 'myDialogCmd'
-				});
-			});
-		});
-
-		// When opening a dialog, its "definition" is created for it, for
-		// each editor instance. The "dialogDefinition" event is then
-		// fired. We should use this event to make customizations to the
-		// definition of existing dialogs.
-		CKEDITOR.on( 'dialogDefinition', function( ev ) {
-			// Take the dialog name and its definition from the event data.
-			var dialogName = ev.data.name;
-			var dialogDefinition = ev.data.definition;
-
-			// Check if the definition is from the dialog we're
-			// interested on (the "Link" dialog).
-			if ( dialogName == 'myDialog' && ev.editor.name == 'editor2' ) {
-				// Get a reference to the "Link Info" tab.
-				var infoTab = dialogDefinition.getContents( 'tab1' );
-
-				// Add a new text field to the "tab1" tab page.
-				infoTab.add( {
-					type: 'text',
-					label: 'My Custom Field',
-					id: 'customField',
-					'default': 'Sample!',
-					validate: function() {
-						if ( ( /\d/ ).test( this.getValue() ) )
-							return 'My Custom Field must not contain digits';
-					}
-				});
-
-				// Remove the "select1" field from the "tab1" tab.
-				infoTab.remove( 'select1' );
-
-				// Set the default value for "input1" field.
-				var input1 = infoTab.get( 'input1' );
-				input1[ 'default' ] = 'www.example.com';
-
-				// Remove the "tab2" tab page.
-				dialogDefinition.removeContents( 'tab2' );
-
-				// Add a new tab to the "Link" dialog.
-				dialogDefinition.addContents( {
-					id: 'customTab',
-					label: 'My Tab',
-					accessKey: 'M',
-					elements: [
-						{
-							id: 'myField1',
-							type: 'text',
-							label: 'My Text Field'
-						},
-						{
-							id: 'myField2',
-							type: 'text',
-							label: 'Another Text Field'
-						}
-					]
-				});
-
-				// Provide the focus handler to start initial focus in "customField" field.
-				dialogDefinition.onFocus = function() {
-					var urlField = this.getContentElement( 'tab1', 'customField' );
-					urlField.select();
-				};
-			}
-		});
-
-		var config = {
-			extraPlugins: 'dialog',
-			toolbar: [ [ 'MyButton' ] ]
-		};
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Using CKEditor Dialog API
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to use the
-			<a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.dialog">CKEditor Dialog API</a>
-			to customize CKEditor dialog windows without changing the original editor code.
-			The following customizations are being done in the example below:
-		</p>
-		<p>
-			For details on how to create this setup check the source code of this sample page.
-		</p>
-	</div>
-	<p>A custom dialog is added to the editors using the <code>pluginsLoaded</code> event, from an external <a target="_blank" href="assets/my_dialog.js">dialog definition file</a>:</p>
-	<ol>
-		<li><strong>Creating a custom dialog window</strong> &ndash; "My Dialog" dialog window opened with the "My Dialog" toolbar button.</li>
-		<li><strong>Creating a custom button</strong> &ndash; Add button to open the dialog with "My Dialog" toolbar button.</li>
-	</ol>
-	<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-	<script>
-		// Replace the <textarea id="editor1"> with an CKEditor instance.
-		CKEDITOR.replace( 'editor1', config );
-	</script>
-	<p>The below editor modify the dialog definition of the above added dialog using the <code>dialogDefinition</code> event:</p>
-	<ol>
-		<li><strong>Adding dialog tab</strong> &ndash; Add new tab "My Tab" to dialog window.</li>
-		<li><strong>Removing a dialog window tab</strong> &ndash; Remove "Second Tab" page from the dialog window.</li>
-		<li><strong>Adding dialog window fields</strong> &ndash; Add "My Custom Field" to the dialog window.</li>
-		<li><strong>Removing dialog window field</strong> &ndash; Remove "Select Field" selection field from the dialog window.</li>
-		<li><strong>Setting default values for dialog window fields</strong> &ndash; Set default value of "Text Field" text field. </li>
-		<li><strong>Setup initial focus for dialog window</strong> &ndash; Put initial focus on "My Custom Field" text field. </li>
-	</ol>
-	<textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-	<script>
-
-		// Replace the <textarea id="editor1"> with an CKEditor instance.
-		CKEDITOR.replace( 'editor2', config );
-
-	</script>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/divreplace.html b/js/ckeditor/samples/old/divreplace.html
deleted file mode 100644
index c6724f09c..000000000
--- a/js/ckeditor/samples/old/divreplace.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Replace DIV &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		div.editable
-		{
-			border: solid 2px transparent;
-			padding-left: 15px;
-			padding-right: 15px;
-		}
-
-		div.editable:hover
-		{
-			border-color: black;
-		}
-
-	</style>
-	<script>
-
-		// Uncomment the following code to test the "Timeout Loading Method".
-		// CKEDITOR.loadFullCoreTimeout = 5;
-
-		window.onload = function() {
-			// Listen to the double click event.
-			if ( window.addEventListener )
-				document.body.addEventListener( 'dblclick', onDoubleClick, false );
-			else if ( window.attachEvent )
-				document.body.attachEvent( 'ondblclick', onDoubleClick );
-
-		};
-
-		function onDoubleClick( ev ) {
-			// Get the element which fired the event. This is not necessarily the
-			// element to which the event has been attached.
-			var element = ev.target || ev.srcElement;
-
-			// Find out the div that holds this element.
-			var name;
-
-			do {
-				element = element.parentNode;
-			}
-			while ( element && ( name = element.nodeName.toLowerCase() ) &&
-				( name != 'div' || element.className.indexOf( 'editable' ) == -1 ) && name != 'body' );
-
-			if ( name == 'div' && element.className.indexOf( 'editable' ) != -1 )
-				replaceDiv( element );
-		}
-
-		var editor;
-
-		function replaceDiv( div ) {
-			if ( editor )
-				editor.destroy();
-
-			editor = CKEDITOR.replace( div );
-		}
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Replace DIV with CKEditor on the Fly
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to automatically replace <code>&lt;div&gt;</code> elements
-			with a CKEditor instance on the fly, following user's doubleclick. The content
-			that was previously placed inside the <code>&lt;div&gt;</code> element will now
-			be moved into CKEditor editing area.
-		</p>
-		<p>
-			For details on how to create this setup check the source code of this sample page.
-		</p>
-	</div>
-	<p>
-		Double-click any of the following <code>&lt;div&gt;</code> elements to transform them into
-		editor instances.
-	</p>
-	<div class="editable">
-		<h3>
-			Part 1
-		</h3>
-		<p>
-			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-		</p>
-	</div>
-	<div class="editable">
-		<h3>
-			Part 2
-		</h3>
-		<p>
-			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-		</p>
-		<p>
-			Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus
-			sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum
-			vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate.
-		</p>
-	</div>
-	<div class="editable">
-		<h3>
-			Part 3
-		</h3>
-		<p>
-			Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi
-			semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna
-			rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla
-			nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce
-			eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus.
-		</p>
-	</div>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/enterkey/enterkey.html b/js/ckeditor/samples/old/enterkey/enterkey.html
deleted file mode 100644
index 79afee3e2..000000000
--- a/js/ckeditor/samples/old/enterkey/enterkey.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>ENTER Key Configuration &mdash; CKEditor Sample</title>
-	<script src="../../../ckeditor.js"></script>
-	<link href="../../../samples/old/sample.css" rel="stylesheet">
-	<meta name="ckeditor-sample-name" content="Using the &quot;Enter&quot; key in CKEditor">
-	<meta name="ckeditor-sample-group" content="Advanced Samples">
-	<meta name="ckeditor-sample-description" content="Configuring the behavior of &lt;em&gt;Enter&lt;/em&gt; and &lt;em&gt;Shift+Enter&lt;/em&gt; keys.">
-	<script>
-
-		var editor;
-
-		function changeEnter() {
-			// If we already have an editor, let's destroy it first.
-			if ( editor )
-				editor.destroy( true );
-
-			// Create the editor again, with the appropriate settings.
-			editor = CKEDITOR.replace( 'editor1', {
-				extraPlugins: 'enterkey',
-				enterMode: Number( document.getElementById( 'xEnter' ).value ),
-				shiftEnterMode: Number( document.getElementById( 'xShiftEnter' ).value )
-			});
-		}
-
-		window.onload = changeEnter;
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; ENTER Key Configuration
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/enterkey.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to configure the <em>Enter</em> and <em>Shift+Enter</em> keys
-			to perform actions specified in the
-			<a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode"><code>enterMode</code></a>
-			and <a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode"><code>shiftEnterMode</code></a>
-			parameters, respectively.
-	 		You can choose from the following options:
-		</p>
-		<ul class="samples">
-			<li><strong><code>ENTER_P</code></strong> &ndash; new <code>&lt;p&gt;</code> paragraphs are created;</li>
-			<li><strong><code>ENTER_BR</code></strong> &ndash; lines are broken with <code>&lt;br&gt;</code> elements;</li>
-			<li><strong><code>ENTER_DIV</code></strong> &ndash; new <code>&lt;div&gt;</code> blocks are created.</li>
-		</ul>
-		<p>
-			The sample code below shows how to configure CKEditor to create a <code>&lt;div&gt;</code> block when <em>Enter</em> key is pressed.
-		</p>
-<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>', {
-	<strong>enterMode: CKEDITOR.ENTER_DIV</strong>
-});</pre>
-		<p>
-			Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
-			the <code>&lt;textarea&gt;</code> element to be replaced.
-		</p>
-	</div>
-	<div style="float: left; margin-right: 20px">
-		When <em>Enter</em> is pressed:<br>
-		<select id="xEnter" onchange="changeEnter();">
-			<option selected="selected" value="1">Create a new &lt;P&gt; (recommended)</option>
-			<option value="3">Create a new &lt;DIV&gt;</option>
-			<option value="2">Break the line with a &lt;BR&gt;</option>
-		</select>
-	</div>
-	<div style="float: left">
-		When <em>Shift+Enter</em> is pressed:<br>
-		<select id="xShiftEnter" onchange="changeEnter();">
-			<option value="1">Create a new &lt;P&gt;</option>
-			<option value="3">Create a new &lt;DIV&gt;</option>
-			<option selected="selected" value="2">Break the line with a &lt;BR&gt; (recommended)</option>
-		</select>
-	</div>
-	<br style="clear: both">
-	<form action="../../../samples/sample_posteddata.php" method="post">
-		<p>
-			<br>
-			<textarea cols="80" id="editor1" name="editor1" rows="10">This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.</textarea>
-		</p>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/index.html b/js/ckeditor/samples/old/index.html
deleted file mode 100644
index aa51b7011..000000000
--- a/js/ckeditor/samples/old/index.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>CKEditor Samples</title>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		CKEditor Samples
-	</h1>
-	<div class="warning deprecated">
-		These samples are not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<div class="twoColumns">
-		<div class="twoColumnsLeft">
-			<h2 class="samples">
-				Basic Samples
-			</h2>
-			<dl class="samples">
-				<dt><a class="samples" href="replacebyclass.html">Replace textarea elements by class name</a></dt>
-				<dd>Automatic replacement of all textarea elements of a given class with a CKEditor instance.</dd>
-
-				<dt><a class="samples" href="replacebycode.html">Replace textarea elements by code</a></dt>
-				<dd>Replacement of textarea elements with CKEditor instances by using a JavaScript call.</dd>
-
-				<dt><a class="samples" href="jquery.html">Create editors with jQuery</a></dt>
-				<dd>Creating standard and inline CKEditor instances with jQuery adapter.</dd>
-			</dl>
-
-			<h2 class="samples">
-				Basic Customization
-			</h2>
-			<dl class="samples">
-				<dt><a class="samples" href="uicolor.html">User Interface color</a></dt>
-				<dd>Changing CKEditor User Interface color and adding a toolbar button that lets the user set the UI color.</dd>
-
-				<dt><a class="samples" href="uilanguages.html">User Interface languages</a></dt>
-				<dd>Changing CKEditor User Interface language and adding a drop-down list that lets the user choose the UI language.</dd>
-			</dl>
-
-
-			<h2 class="samples">Plugins</h2>
-<dl class="samples">
-<dt><a class="samples" href="sourcedialog/sourcedialog.html">Editing source code in a dialog</a><span class="new">New!</span></dt>
-<dd>Editing HTML content of both inline and classic editor instances.</dd>
-</dl>
-		</div>
-		<div class="twoColumnsRight">
-			<h2 class="samples">
-				Inline Editing
-			</h2>
-			<dl class="samples">
-				<dt><a class="samples" href="inlineall.html">Massive inline editor creation</a></dt>
-				<dd>Turn all elements with <code>contentEditable = true</code> attribute into inline editors.</dd>
-
-				<dt><a class="samples" href="inlinebycode.html">Convert element into an inline editor by code</a></dt>
-				<dd>Conversion of DOM elements into inline CKEditor instances by using a JavaScript call.</dd>
-
-				<dt><a class="samples" href="inlinetextarea.html">Replace textarea with inline editor</a> <span class="new">New!</span></dt>
-				<dd>A form with a textarea that is replaced by an inline editor at runtime.</dd>
-
-				
-			</dl>
-
-			<h2 class="samples">
-				Advanced Samples
-			</h2>
-			<dl class="samples">
-				<dt><a class="samples" href="datafiltering.html">Data filtering and features activation</a> <span class="new">New!</span></dt>
-				<dd>Data filtering and automatic features activation basing on configuration.</dd>
-
-				<dt><a class="samples" href="divreplace.html">Replace DIV elements on the fly</a></dt>
-				<dd>Transforming a <code>div</code> element into an instance of CKEditor with a mouse click.</dd>
-
-				<dt><a class="samples" href="appendto.html">Append editor instances</a></dt>
-				<dd>Appending editor instances to existing DOM elements.</dd>
-
-				<dt><a class="samples" href="ajax.html">Create and destroy editor instances for Ajax applications</a></dt>
-				<dd>Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window.</dd>
-
-				<dt><a class="samples" href="api.html">Basic usage of the API</a></dt>
-				<dd>Using the CKEditor JavaScript API to interact with the editor at runtime.</dd>
-
-				<dt><a class="samples" href="xhtmlstyle.html">XHTML-compliant style</a></dt>
-				<dd>Configuring CKEditor to produce XHTML 1.1 compliant attributes and styles.</dd>
-
-				<dt><a class="samples" href="readonly.html">Read-only mode</a></dt>
-				<dd>Using the readOnly API to block introducing changes to the editor contents.</dd>
-
-				<dt><a class="samples" href="tabindex.html">"Tab" key-based navigation</a></dt>
-				<dd>Navigating among editor instances with tab key.</dd>
-
-
-				
-<dt><a class="samples" href="dialog/dialog.html">Using the JavaScript API to customize dialog windows</a></dt>
-<dd>Using the dialog windows API to customize dialog windows without changing the original editor code.</dd>
-
-<dt><a class="samples" href="enterkey/enterkey.html">Using the &quot;Enter&quot; key in CKEditor</a></dt>
-<dd>Configuring the behavior of <em>Enter</em> and <em>Shift+Enter</em> keys.</dd>
-
-<dt><a class="samples" href="toolbar/toolbar.html">Toolbar Configurations</a></dt>
-<dd>Configuring CKEditor to display full or custom toolbar layout.</dd>
-
-			</dl>
-		</div>
-	</div>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/inlineall.html b/js/ckeditor/samples/old/inlineall.html
deleted file mode 100644
index e0241e87a..000000000
--- a/js/ckeditor/samples/old/inlineall.html
+++ /dev/null
@@ -1,314 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Massive inline editing &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<script>
-
-		// This code is generally not necessary, but it is here to demonstrate
-		// how to customize specific editor instances on the fly. This fits well
-		// this demo because we have editable elements (like headers) that
-		// require less features.
-
-		// The "instanceCreated" event is fired for every editor instance created.
-		CKEDITOR.on( 'instanceCreated', function( event ) {
-			var editor = event.editor,
-				element = editor.element;
-
-			// Customize editors for headers and tag list.
-			// These editors don't need features like smileys, templates, iframes etc.
-			if ( element.is( 'h1', 'h2', 'h3' ) || element.getAttribute( 'id' ) == 'taglist' ) {
-				// Customize the editor configurations on "configLoaded" event,
-				// which is fired after the configuration file loading and
-				// execution. This makes it possible to change the
-				// configurations before the editor initialization takes place.
-				editor.on( 'configLoaded', function() {
-
-					// Remove unnecessary plugins to make the editor simpler.
-					editor.config.removePlugins = 'colorbutton,find,flash,font,' +
-						'forms,iframe,image,newpage,removeformat,' +
-						'smiley,specialchar,stylescombo,templates';
-
-					// Rearrange the layout of the toolbar.
-					editor.config.toolbarGroups = [
-						{ name: 'editing',		groups: [ 'basicstyles', 'links' ] },
-						{ name: 'undo' },
-						{ name: 'clipboard',	groups: [ 'selection', 'clipboard' ] },
-						{ name: 'about' }
-					];
-				});
-			}
-		});
-
-	</script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		/* The following styles are just to make the page look nice. */
-
-		/* Workaround to show Arial Black in Firefox. */
-		@font-face
-		{
-			font-family: 'arial-black';
-			src: local('Arial Black');
-		}
-
-		*[contenteditable="true"]
-		{
-			padding: 10px;
-		}
-
-		#container
-		{
-			width: 960px;
-			margin: 30px auto 0;
-		}
-
-		#header
-		{
-			overflow: hidden;
-			padding: 0 0 30px;
-			border-bottom: 5px solid #05B2D2;
-			position: relative;
-		}
-
-		#headerLeft,
-		#headerRight
-		{
-			width: 49%;
-			overflow: hidden;
-		}
-
-		#headerLeft
-		{
-			float: left;
-			padding: 10px 1px 1px;
-		}
-
-		#headerLeft h2,
-		#headerLeft h3
-		{
-			text-align: right;
-			margin: 0;
-			overflow: hidden;
-			font-weight: normal;
-		}
-
-		#headerLeft h2
-		{
-			font-family: "Arial Black",arial-black;
-			font-size: 4.6em;
-			line-height: 1.1;
-			text-transform: uppercase;
-		}
-
-		#headerLeft h3
-		{
-			font-size: 2.3em;
-			line-height: 1.1;
-			margin: .2em 0 0;
-			color: #666;
-		}
-
-		#headerRight
-		{
-			float: right;
-			padding: 1px;
-		}
-
-		#headerRight p
-		{
-			line-height: 1.8;
-			text-align: justify;
-			margin: 0;
-		}
-
-		#headerRight p + p
-		{
-			margin-top: 20px;
-		}
-
-		#headerRight > div
-		{
-			padding: 20px;
-			margin: 0 0 0 30px;
-			font-size: 1.4em;
-			color: #666;
-		}
-
-		#columns
-		{
-			color: #333;
-			overflow: hidden;
-			padding: 20px 0;
-		}
-
-		#columns > div
-		{
-			float: left;
-			width: 33.3%;
-		}
-
-		#columns #column1 > div
-		{
-			margin-left: 1px;
-		}
-
-		#columns #column3 > div
-		{
-			margin-right: 1px;
-		}
-
-		#columns > div > div
-		{
-			margin: 0px 10px;
-			padding: 10px 20px;
-		}
-
-		#columns blockquote
-		{
-			margin-left: 15px;
-		}
-
-		#tagLine
-		{
-			border-top: 5px solid #05B2D2;
-			padding-top: 20px;
-		}
-
-		#taglist {
-			display: inline-block;
-			margin-left: 20px;
-			font-weight: bold;
-			margin: 0 0 0 20px;
-		}
-
-	</style>
-</head>
-<body>
-<div>
-	<h1 class="samples"><a href="index.html">CKEditor Samples</a> &raquo; Massive inline editing</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/inline.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>This sample page demonstrates the inline editing feature - CKEditor instances will be created automatically from page elements with <strong>contentEditable</strong> attribute set to value <strong>true</strong>:</p>
-		<pre class="samples">&lt;div <strong>contenteditable="true</strong>" &gt; ... &lt;/div&gt;</pre>
-		<p>Click inside of any element below to start editing.</p>
-	</div>
-</div>
-<div id="container">
-	<div id="header">
-		<div id="headerLeft">
-			<h2 id="sampleTitle" contenteditable="true">
-				CKEditor<br> Goes Inline!
-			</h2>
-			<h3 contenteditable="true">
-				Lorem ipsum dolor sit amet dolor duis blandit vestibulum faucibus a, tortor.
-			</h3>
-		</div>
-		<div id="headerRight">
-			<div contenteditable="true">
-				<p>
-					Lorem ipsum dolor sit amet enim. Etiam ullamcorper. Suspendisse a pellentesque dui, non felis. Maecenas malesuada elit lectus felis, malesuada ultricies.
-				</p>
-				<p>
-					Curabitur et ligula. Ut molestie a, ultricies porta urna. Vestibulum commodo volutpat a, convallis ac, laoreet enim. Phasellus fermentum in, dolor. Pellentesque facilisis. Nulla imperdiet sit amet magna. Vestibulum dapibus, mauris nec malesuada fames ac.
-				</p>
-			</div>
-		</div>
-	</div>
-	<div id="columns">
-		<div id="column1">
-			<div contenteditable="true">
-				<h3>
-					Fusce vitae porttitor
-				</h3>
-				<p>
-					<strong>
-						Lorem ipsum dolor sit amet dolor. Duis blandit vestibulum faucibus a, tortor.
-					</strong>
-				</p>
-				<p>
-					Proin nunc justo felis mollis tincidunt, risus risus pede, posuere cubilia Curae, Nullam euismod, enim. Etiam nibh ultricies dolor ac dignissim erat volutpat. Vivamus fermentum <a href="http://ckeditor.com/">nisl nulla sem in</a> metus. Maecenas wisi. Donec nec erat volutpat.
-				</p>
-				<blockquote>
-					<p>
-						Fusce vitae porttitor a, euismod convallis nisl, blandit risus tortor, pretium.
-						Vehicula vitae, imperdiet vel, ornare enim vel sodales rutrum
-					</p>
-				</blockquote>
-				<blockquote>
-					<p>
-						Libero nunc, rhoncus ante ipsum non ipsum. Nunc eleifend pede turpis id sollicitudin fringilla. Phasellus ultrices, velit ac arcu.
-					</p>
-				</blockquote>
-				<p>Pellentesque nunc. Donec suscipit erat. Pellentesque habitant morbi tristique ullamcorper.</p>
-				<p><s>Mauris mattis feugiat lectus nec mauris. Nullam vitae ante.</s></p>
-			</div>
-		</div>
-		<div id="column2">
-			<div contenteditable="true">
-				<h3>
-					Integer condimentum sit amet
-				</h3>
-				<p>
-					<strong>Aenean nonummy a, mattis varius. Cras aliquet.</strong>
-					Praesent <a href="http://ckeditor.com/">magna non mattis ac, rhoncus nunc</a>, rhoncus eget, cursus pulvinar mollis.</p>
-				<p>Proin id nibh. Sed eu libero posuere sed, lectus. Phasellus dui gravida gravida feugiat mattis ac, felis.</p>
-				<p>Integer condimentum sit amet, tempor elit odio, a dolor non ante at sapien. Sed ac lectus. Nulla ligula quis eleifend mi, id leo velit pede cursus arcu id nulla ac lectus. Phasellus vestibulum. Nunc viverra enim quis diam.</p>
-			</div>
-			<div contenteditable="true">
-				<h3>
-					Praesent wisi accumsan sit amet nibh
-				</h3>
-				<p>Donec ullamcorper, risus tortor, pretium porttitor. Morbi quam quis lectus non leo.</p>
-				<p style="margin-left: 40px; ">Integer faucibus scelerisque. Proin faucibus at, aliquet vulputate, odio at eros. Fusce <a href="http://ckeditor.com/">gravida, erat vitae augue</a>. Fusce urna fringilla gravida.</p>
-				<p>In hac habitasse platea dictumst. Praesent wisi accumsan sit amet nibh. Maecenas orci luctus a, lacinia quam sem, posuere commodo, odio condimentum tempor, pede semper risus. Suspendisse pede. In hac habitasse platea dictumst. Nam sed laoreet sit amet erat. Integer.</p>
-			</div>
-		</div>
-		<div id="column3">
-			<div contenteditable="true">
-				<p>
-					<img src="assets/inlineall/logo.png" alt="CKEditor logo" style="float:left">
-				</p>
-				<p>Quisque justo neque, mattis sed, fermentum ultrices <strong>posuere cubilia Curae</strong>, Vestibulum elit metus, quis placerat ut, lectus. Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis. Fusce porttitor, nulla quis turpis. Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi. Donec odio nec velit ac nunc sit amet, accumsan cursus aliquet. Vestibulum ante sit amet sagittis mi.</p>
-				<h3>
-					Nullam laoreet vel consectetuer tellus suscipit
-				</h3>
-				<ul>
-					<li>Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis.</li>
-					<li>Fusce porttitor, nulla quis turpis. Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi.</li>
-					<li>Mauris eget tellus. Donec non felis. Nam eget dolor. Vestibulum enim. Donec.</li>
-				</ul>
-				<p>Quisque justo neque, mattis sed, <a href="http://ckeditor.com/">fermentum ultrices posuere cubilia</a> Curae, Vestibulum elit metus, quis placerat ut, lectus.</p>
-				<p>Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi. Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis. Fusce porttitor, nulla quis turpis.</p>
-				<p>Donec odio nec velit ac nunc sit amet, accumsan cursus aliquet. Vestibulum ante sit amet sagittis mi. Sed in nonummy faucibus turpis. Mauris eget tellus. Donec non felis. Nam eget dolor. Vestibulum enim. Donec.</p>
-			</div>
-		</div>
-	</div>
-	<div id="tagLine">
-		Tags of this article:
-		<p id="taglist" contenteditable="true">
-			inline, editing, floating, CKEditor
-		</p>
-	</div>
-</div>
-<div id="footer">
-	<hr>
-	<p>
-		CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">
-			http://ckeditor.com</a>
-	</p>
-	<p id="copy">
-		Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
-		- Frederico Knabben. All rights reserved.
-	</p>
-</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/inlinebycode.html b/js/ckeditor/samples/old/inlinebycode.html
deleted file mode 100644
index 339be0cd2..000000000
--- a/js/ckeditor/samples/old/inlinebycode.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Inline Editing by Code &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		#editable
-		{
-			padding: 10px;
-			float: left;
-		}
-
-	</style>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Inline Editing by Code
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/inline.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to create an inline editor instance of CKEditor. It is created
-			with a JavaScript call using the following code:
-		</p>
-<pre class="samples">
-// This property tells CKEditor to not activate every element with contenteditable=true element.
-CKEDITOR.disableAutoInline = true;
-
-var editor = CKEDITOR.inline( document.getElementById( 'editable' ) );
-</pre>
-		<p>
-			Note that <code>editable</code> in the code above is the <code>id</code>
-			attribute of the <code>&lt;div&gt;</code> element to be converted into an inline instance.
-		</p>
-	</div>
-	<div id="editable" contenteditable="true">
-		<h1><img alt="Saturn V carrying Apollo 11" class="right" src="assets/sample.jpg" /> Apollo 11</h1>
-
-		<p><b>Apollo 11</b> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.</p>
-
-		<p>Armstrong spent about <s>three and a half</s> two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&nbsp;kg) of lunar material for return to Earth. A third member of the mission, <a href="http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)" title="Michael Collins (astronaut)">Michael Collins</a>, piloted the <a href="http://en.wikipedia.org/wiki/Apollo_Command/Service_Module" title="Apollo Command/Service Module">command</a> spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.</p>
-
-		<h2>Broadcasting and <em>quotes</em> <a id="quotes" name="quotes"></a></h2>
-
-		<p>Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:</p>
-
-		<blockquote>
-			<p>One small step for [a] man, one giant leap for mankind.</p>
-		</blockquote>
-
-		<p>Apollo 11 effectively ended the <a href="http://en.wikipedia.org/wiki/Space_Race" title="Space Race">Space Race</a> and fulfilled a national goal proposed in 1961 by the late U.S. President <a href="http://en.wikipedia.org/wiki/John_F._Kennedy" title="John F. Kennedy">John F. Kennedy</a> in a speech before the United States Congress:</p>
-
-		<blockquote>
-			<p>[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.</p>
-		</blockquote>
-
-		<h2>Technical details <a id="tech-details" name="tech-details"></a></h2>
-
-		<table align="right" border="1" bordercolor="#ccc" cellpadding="5" cellspacing="0" style="border-collapse:collapse;margin:10px 0 10px 15px;">
-			<caption><strong>Mission crew</strong></caption>
-			<thead>
-			<tr>
-				<th scope="col">Position</th>
-				<th scope="col">Astronaut</th>
-			</tr>
-			</thead>
-			<tbody>
-			<tr>
-				<td>Commander</td>
-				<td>Neil A. Armstrong</td>
-			</tr>
-			<tr>
-				<td>Command Module Pilot</td>
-				<td>Michael Collins</td>
-			</tr>
-			<tr>
-				<td>Lunar Module Pilot</td>
-				<td>Edwin &quot;Buzz&quot; E. Aldrin, Jr.</td>
-			</tr>
-			</tbody>
-		</table>
-
-		<p>Launched by a <strong>Saturn V</strong> rocket from <a href="http://en.wikipedia.org/wiki/Kennedy_Space_Center" title="Kennedy Space Center">Kennedy Space Center</a> in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of <a href="http://en.wikipedia.org/wiki/NASA" title="NASA">NASA</a>&#39;s Apollo program. The Apollo spacecraft had three parts:</p>
-
-		<ol>
-			<li><strong>Command Module</strong> with a cabin for the three astronauts which was the only part which landed back on Earth</li>
-			<li><strong>Service Module</strong> which supported the Command Module with propulsion, electrical power, oxygen and water</li>
-			<li><strong>Lunar Module</strong> for landing on the Moon.</li>
-		</ol>
-
-		<p>After being sent to the Moon by the Saturn V&#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the <a href="http://en.wikipedia.org/wiki/Mare_Tranquillitatis" title="Mare Tranquillitatis">Sea of Tranquility</a>. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the <a href="http://en.wikipedia.org/wiki/Pacific_Ocean" title="Pacific Ocean">Pacific Ocean</a> on July 24.</p>
-
-		<hr />
-		<p style="text-align: right;"><small>Source: <a href="http://en.wikipedia.org/wiki/Apollo_11">Wikipedia.org</a></small></p>
-	</div>
-
-	<script>
-		// We need to turn off the automatic editor creation first.
-		CKEDITOR.disableAutoInline = true;
-
-		var editor = CKEDITOR.inline( 'editable' );
-	</script>
-	<div id="footer">
-		<hr>
-		<p contenteditable="true">
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">
-				http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
-			- Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/inlinetextarea.html b/js/ckeditor/samples/old/inlinetextarea.html
deleted file mode 100644
index 504d181b3..000000000
--- a/js/ckeditor/samples/old/inlinetextarea.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Replace Textarea with Inline Editor &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		/* Style the CKEditor element to look like a textfield */
-		.cke_textarea_inline
-		{
-			padding: 10px;
-			height: 200px;
-			overflow: auto;
-
-			border: 1px solid gray;
-			-webkit-appearance: textfield;
-		}
-
-	</style>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Replace Textarea with Inline Editor
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/inline.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			You can also create an inline editor from a <code>textarea</code>
-			element. In this case the <code>textarea</code> will be replaced
-			by a <code>div</code> element with inline editing enabled.
-		</p>
-<pre class="samples">
-// "article-body" is the name of a textarea element.
-var editor = CKEDITOR.inline( 'article-body' );
-</pre>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<h2>This is a sample form with some fields</h2>
-		<p>
-			Title:<br>
-			<input type="text" name="title" value="Sample Form"></p>
-		<p>
-			Article Body (Textarea converted to CKEditor):<br>
-			<textarea name="article-body" style="height: 200px">
-				&lt;h2&gt;Technical details &lt;a id="tech-details" name="tech-details"&gt;&lt;/a&gt;&lt;/h2&gt;
-
-				&lt;table align="right" border="1" bordercolor="#ccc" cellpadding="5" cellspacing="0" style="border-collapse:collapse;margin:10px 0 10px 15px;"&gt;
-					&lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt;
-					&lt;thead&gt;
-					&lt;tr&gt;
-						&lt;th scope="col"&gt;Position&lt;/th&gt;
-						&lt;th scope="col"&gt;Astronaut&lt;/th&gt;
-					&lt;/tr&gt;
-					&lt;/thead&gt;
-					&lt;tbody&gt;
-					&lt;tr&gt;
-						&lt;td&gt;Commander&lt;/td&gt;
-						&lt;td&gt;Neil A. Armstrong&lt;/td&gt;
-					&lt;/tr&gt;
-					&lt;tr&gt;
-						&lt;td&gt;Command Module Pilot&lt;/td&gt;
-						&lt;td&gt;Michael Collins&lt;/td&gt;
-					&lt;/tr&gt;
-					&lt;tr&gt;
-						&lt;td&gt;Lunar Module Pilot&lt;/td&gt;
-						&lt;td&gt;Edwin &quot;Buzz&quot; E. Aldrin, Jr.&lt;/td&gt;
-					&lt;/tr&gt;
-					&lt;/tbody&gt;
-				&lt;/table&gt;
-
-				&lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href="http://en.wikipedia.org/wiki/Kennedy_Space_Center" title="Kennedy Space Center"&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href="http://en.wikipedia.org/wiki/NASA" title="NASA"&gt;NASA&lt;/a&gt;&#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt;
-
-				&lt;ol&gt;
-					&lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt;
-					&lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt;
-					&lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt;
-				&lt;/ol&gt;
-
-				&lt;p&gt;After being sent to the Moon by the Saturn V&#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href="http://en.wikipedia.org/wiki/Mare_Tranquillitatis" title="Mare Tranquillitatis"&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href="http://en.wikipedia.org/wiki/Pacific_Ocean" title="Pacific Ocean"&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt;
-
-				&lt;hr /&gt;
-				&lt;p style="text-align: right;"&gt;&lt;small&gt;Source: &lt;a href="http://en.wikipedia.org/wiki/Apollo_11"&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-			</textarea>
-		</p>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-
-	<script>
-		CKEDITOR.inline( 'article-body' );
-	</script>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">
-				http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
-			- Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/jquery.html b/js/ckeditor/samples/old/jquery.html
deleted file mode 100644
index 95e43eaa7..000000000
--- a/js/ckeditor/samples/old/jquery.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>jQuery Adapter &mdash; CKEditor Sample</title>
-	<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
-	<script src="../../ckeditor.js"></script>
-	<script src="../../adapters/jquery.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		#editable
-		{
-			padding: 10px;
-			float: left;
-		}
-
-	</style>
-	<script>
-
-		CKEDITOR.disableAutoInline = true;
-
-		$( document ).ready( function() {
-			$( '#editor1' ).ckeditor(); // Use CKEDITOR.replace() if element is <textarea>.
-			$( '#editable' ).ckeditor(); // Use CKEDITOR.inline().
-		} );
-
-		function setValue() {
-			$( '#editor1' ).val( $( 'input#val' ).val() );
-		}
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html" id="a-test">CKEditor Samples</a> &raquo; Create Editors with jQuery
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<div class="description">
-			<p>
-				This sample shows how to use the <a href="http://docs.ckeditor.com/#!/guide/dev_jquery">jQuery adapter</a>.
-				Note that you have to include both CKEditor and jQuery scripts before including the adapter.
-			</p>
-
-<pre class="samples">
-&lt;script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"&gt;&lt;/script&gt;
-&lt;script src="/ckedit../../ckeditor.js"&gt;&lt;/script&gt;
-&lt;script src="/ckeditor/adapters/jquery.js"&gt;&lt;/script&gt;
-</pre>
-
-			<p>Then you can replace HTML elements with a CKEditor instance using the <code>ckeditor()</code> method.</p>
-
-<pre class="samples">
-$( document ).ready( function() {
-	$( 'textarea#editor1' ).ckeditor();
-} );
-</pre>
-		</div>
-
-		<h2 class="samples">Inline Example</h2>
-
-		<div id="editable" contenteditable="true">
-			<p><img alt="Saturn V carrying Apollo 11" class="right" src="assets/sample.jpg"/><b>Apollo 11</b> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.</p>
-			<p>Armstrong spent about <s>three and a half</s> two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&nbsp;kg) of lunar material for return to Earth. A third member of the mission, <a href="http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)" title="Michael Collins (astronaut)">Michael Collins</a>, piloted the <a href="http://en.wikipedia.org/wiki/Apollo_Command/Service_Module" title="Apollo Command/Service Module">command</a> spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.
-			<p>Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:</p>
-			<blockquote><p>One small step for [a] man, one giant leap for mankind.</p></blockquote> <p>Apollo 11 effectively ended the <a href="http://en.wikipedia.org/wiki/Space_Race" title="Space Race">Space Race</a> and fulfilled a national goal proposed in 1961 by the late U.S. President <a href="http://en.wikipedia.org/wiki/John_F._Kennedy" title="John F. Kennedy">John F. Kennedy</a> in a speech before the United States Congress:</p> <blockquote><p>[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.</p></blockquote>
-		</div>
-
-		<br style="clear: both">
-
-		<h2 class="samples">Classic (iframe-based) Example</h2>
-
-		<textarea cols="80" id="editor1" name="editor1" rows="10">
-			&lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-
-		<p style="overflow: hidden">
-			<input style="float: left" type="submit" value="Submit">
-			<span style="float: right">
-				<input type="text" id="val" value="I'm using jQuery val()!" size="30">
-				<input onclick="setValue();" type="button" value="Set value">
-			</span>
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/readonly.html b/js/ckeditor/samples/old/readonly.html
deleted file mode 100644
index edd111893..000000000
--- a/js/ckeditor/samples/old/readonly.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Using the CKEditor Read-Only API &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-	<script>
-
-		var editor;
-
-		// The instanceReady event is fired, when an instance of CKEditor has finished
-		// its initialization.
-		CKEDITOR.on( 'instanceReady', function( ev ) {
-			editor = ev.editor;
-
-			// Show this "on" button.
-			document.getElementById( 'readOnlyOn' ).style.display = '';
-
-			// Event fired when the readOnly property changes.
-			editor.on( 'readOnly', function() {
-				document.getElementById( 'readOnlyOn' ).style.display = this.readOnly ? 'none' : '';
-				document.getElementById( 'readOnlyOff' ).style.display = this.readOnly ? '' : 'none';
-			});
-		});
-
-		function toggleReadOnly( isReadOnly ) {
-			// Change the read-only state of the editor.
-			// http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly
-			editor.setReadOnly( isReadOnly );
-		}
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Using the CKEditor Read-Only API
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/readonly.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to use the
-			<code><a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly">setReadOnly</a></code>
-			API to put editor into the read-only state that makes it impossible for users to change the editor contents.
-		</p>
-		<p>
-			For details on how to create this setup check the source code of this sample page.
-		</p>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<p>
-			<textarea class="ckeditor" id="editor1" name="editor1" cols="100" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		</p>
-		<p>
-			<input id="readOnlyOn" onclick="toggleReadOnly();" type="button" value="Make it read-only" style="display:none">
-			<input id="readOnlyOff" onclick="toggleReadOnly( false );" type="button" value="Make it editable again" style="display:none">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/replacebyclass.html b/js/ckeditor/samples/old/replacebyclass.html
deleted file mode 100644
index 2edbf4934..000000000
--- a/js/ckeditor/samples/old/replacebyclass.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Replace Textareas by Class Name &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Replace Textarea Elements by Class Name
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="http://sdk.ckeditor.com/">brand new samples in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to automatically replace all <code>&lt;textarea&gt;</code> elements
-			of a given class with a CKEditor instance.
-		</p>
-		<p>
-			To replace a <code>&lt;textarea&gt;</code> element, simply assign it the <code>ckeditor</code>
-			class, as in the code below:
-		</p>
-<pre class="samples">
-&lt;textarea <strong>class="ckeditor</strong>" name="editor1"&gt;&lt;/textarea&gt;
-</pre>
-		<p>
-			Note that other <code>&lt;textarea&gt;</code> attributes (like <code>id</code> or <code>name</code>) need to be adjusted to your document.
-		</p>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<p>
-			<label for="editor1">
-				Editor 1:
-			</label>
-			<textarea class="ckeditor" cols="80" id="editor1" name="editor1" rows="10">
-				&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-			</textarea>
-		</p>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/replacebycode.html b/js/ckeditor/samples/old/replacebycode.html
deleted file mode 100644
index 36ace8b18..000000000
--- a/js/ckeditor/samples/old/replacebycode.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Replace Textarea by Code &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Replace Textarea Elements Using JavaScript Code
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/classic.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<div class="description">
-			<p>
-				This editor is using an <code>&lt;iframe&gt;</code> element-based editing area, provided by the <strong>Wysiwygarea</strong> plugin.
-			</p>
-<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>' )
-</pre>
-		</div>
-		<textarea cols="80" id="editor1" name="editor1" rows="10">
-			&lt;h1&gt;&lt;img alt=&quot;Saturn V carrying Apollo 11&quot; class=&quot;right&quot; src=&quot;assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			// This call can be placed at any point after the
-			// <textarea>, or inside a <head><script> in a
-			// window.onload event handler.
-
-			// Replace the <textarea id="editor"> with an CKEditor
-			// instance, using default configurations.
-
-			CKEDITOR.replace( 'editor1' );
-
-		</script>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/sample.css b/js/ckeditor/samples/old/sample.css
deleted file mode 100644
index af866fe24..000000000
--- a/js/ckeditor/samples/old/sample.css
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-
-html, body, h1, h2, h3, h4, h5, h6, div, span, blockquote, p, address, form, fieldset, img, ul, ol, dl, dt, dd, li, hr, table, td, th, strong, em, sup, sub, dfn, ins, del, q, cite, var, samp, code, kbd, tt, pre
-{
-	line-height: 1.5;
-}
-
-body
-{
-	padding: 10px 30px;
-}
-
-input, textarea, select, option, optgroup, button, td, th
-{
-	font-size: 100%;
-}
-
-pre
-{
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-pre, code, kbd, samp, tt
-{
-	font-family: monospace,monospace;
-	font-size: 1em;
-}
-
-body {
-	width: 960px;
-	margin: 0 auto;
-}
-
-code
-{
-	background: #f3f3f3;
-	border: 1px solid #ddd;
-	padding: 1px 4px;
-	border-radius: 3px;
-}
-
-abbr
-{
-	border-bottom: 1px dotted #555;
-	cursor: pointer;
-}
-
-.new, .beta
-{
-	text-transform: uppercase;
-	font-size: 10px;
-	font-weight: bold;
-	padding: 1px 4px;
-	margin: 0 0 0 5px;
-	color: #fff;
-	float: right;
-	border-radius: 3px;
-}
-
-.new
-{
-	background: #FF7E00;
-	border: 1px solid #DA8028;
-	text-shadow: 0 1px 0 #C97626;
-
-	box-shadow: 0 2px 3px 0 #FFA54E inset;
-}
-
-.beta
-{
-	background: #18C0DF;
-	border: 1px solid #19AAD8;
-	text-shadow: 0 1px 0 #048CAD;
-	font-style: italic;
-
-	box-shadow: 0 2px 3px 0 #50D4FD inset;
-}
-
-h1.samples
-{
-	color: #0782C1;
-	font-size: 200%;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-h1.samples a
-{
-	color: #0782C1;
-	text-decoration: none;
-	border-bottom: 1px dotted #0782C1;
-}
-
-.samples a:hover
-{
-	border-bottom: 1px dotted #0782C1;
-}
-
-h2.samples
-{
-	color: #000000;
-	font-size: 130%;
-	margin: 15px 0 0 0;
-	padding: 0;
-}
-
-p, blockquote, address, form, pre, dl, h1.samples, h2.samples
-{
-	margin-bottom: 15px;
-}
-
-ul.samples
-{
-	margin-bottom: 15px;
-}
-
-.clear
-{
-	clear: both;
-}
-
-fieldset
-{
-	margin: 0;
-	padding: 10px;
-}
-
-body, input, textarea
-{
-	color: #333333;
-	font-family: Arial, Helvetica, sans-serif;
-}
-
-body
-{
-	font-size: 75%;
-}
-
-a.samples
-{
-	color: #189DE1;
-	text-decoration: none;
-}
-
-form
-{
-	margin: 0;
-	padding: 0;
-}
-
-pre.samples
-{
-	background-color: #F7F7F7;
-	border: 1px solid #D7D7D7;
-	overflow: auto;
-	padding: 0.25em;
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-}
-
-#footer
-{
-	clear: both;
-	padding-top: 10px;
-}
-
-#footer hr
-{
-	margin: 10px 0 15px 0;
-	height: 1px;
-	border: solid 1px gray;
-	border-bottom: none;
-}
-
-#footer p
-{
-	margin: 0 10px 10px 10px;
-	float: left;
-}
-
-#footer #copy
-{
-	float: right;
-}
-
-#outputSample
-{
-	width: 100%;
-	table-layout: fixed;
-}
-
-#outputSample thead th
-{
-	color: #dddddd;
-	background-color: #999999;
-	padding: 4px;
-	white-space: nowrap;
-}
-
-#outputSample tbody th
-{
-	vertical-align: top;
-	text-align: left;
-}
-
-#outputSample pre
-{
-	margin: 0;
-	padding: 0;
-}
-
-.description
-{
-	border: 1px dotted #B7B7B7;
-	margin-bottom: 10px;
-	padding: 10px 10px 0;
-	overflow: hidden;
-}
-
-label
-{
-	display: block;
-	margin-bottom: 6px;
-}
-
-/**
- *	CKEditor editables are automatically set with the "cke_editable" class
- *	plus cke_editable_(inline|themed) depending on the editor type.
- */
-
-/* Style a bit the inline editables. */
-.cke_editable.cke_editable_inline
-{
-	cursor: pointer;
-}
-
-/* Once an editable element gets focused, the "cke_focus" class is
-   added to it, so we can style it differently. */
-.cke_editable.cke_editable_inline.cke_focus
-{
-	box-shadow: inset 0px 0px 20px 3px #ddd, inset 0 0 1px #000;
-	outline: none;
-	background: #eee;
-	cursor: text;
-}
-
-/* Avoid pre-formatted overflows inline editable. */
-.cke_editable_inline pre
-{
-	white-space: pre-wrap;
-	word-wrap: break-word;
-}
-
-/**
- *	Samples index styles.
- */
-
-.twoColumns,
-.twoColumnsLeft,
-.twoColumnsRight
-{
-	overflow: hidden;
-}
-
-.twoColumnsLeft,
-.twoColumnsRight
-{
-	width: 45%;
-}
-
-.twoColumnsLeft
-{
-	float: left;
-}
-
-.twoColumnsRight
-{
-	float: right;
-}
-
-dl.samples
-{
-	padding: 0 0 0 40px;
-}
-dl.samples > dt
-{
-	display: list-item;
-	list-style-type: disc;
-	list-style-position: outside;
-	margin: 0 0 3px;
-}
-dl.samples > dd
-{
-	margin: 0 0 3px;
-}
-.warning
-{
-	color: #ff0000;
-	background-color: #FFCCBA;
-	border: 2px dotted #ff0000;
-	padding: 15px 10px;
-	margin: 10px 0;
-}
-
-.warning.deprecated {
-	font-size: 1.3em;
-}
-
-/* Used on inline samples */
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-img.right {
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left {
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
diff --git a/js/ckeditor/samples/old/sample.js b/js/ckeditor/samples/old/sample.js
deleted file mode 100644
index 59b64eee2..000000000
--- a/js/ckeditor/samples/old/sample.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-// Tool scripts for the sample pages.
-// This file can be ignored and is not required to make use of CKEditor.
-
-( function() {
-	CKEDITOR.on( 'instanceReady', function( ev ) {
-		// Check for sample compliance.
-		var editor = ev.editor,
-			meta = CKEDITOR.document.$.getElementsByName( 'ckeditor-sample-required-plugins' ),
-			requires = meta.length ? CKEDITOR.dom.element.get( meta[ 0 ] ).getAttribute( 'content' ).split( ',' ) : [],
-			missing = [],
-			i;
-
-		if ( requires.length ) {
-			for ( i = 0; i < requires.length; i++ ) {
-				if ( !editor.plugins[ requires[ i ] ] )
-					missing.push( '<code>' + requires[ i ] + '</code>' );
-			}
-
-			if ( missing.length ) {
-				var warn = CKEDITOR.dom.element.createFromHtml(
-					'<div class="warning">' +
-						'<span>To fully experience this demo, the ' + missing.join( ', ' ) + ' plugin' + ( missing.length > 1 ? 's are' : ' is' ) + ' required.</span>' +
-					'</div>'
-				);
-				warn.insertBefore( editor.container );
-			}
-		}
-
-		// Set icons.
-		var doc = new CKEDITOR.dom.document( document ),
-			icons = doc.find( '.button_icon' );
-
-		for ( i = 0; i < icons.count(); i++ ) {
-			var icon = icons.getItem( i ),
-				name = icon.getAttribute( 'data-icon' ),
-				style = CKEDITOR.skin.getIconStyle( name, ( CKEDITOR.lang.dir == 'rtl' ) );
-
-			icon.addClass( 'cke_button_icon' );
-			icon.addClass( 'cke_button__' + name + '_icon' );
-			icon.setAttribute( 'style', style );
-			icon.setStyle( 'float', 'none' );
-
-		}
-	} );
-} )();
diff --git a/js/ckeditor/samples/old/sample_posteddata.php b/js/ckeditor/samples/old/sample_posteddata.php
deleted file mode 100644
index 866867e70..000000000
--- a/js/ckeditor/samples/old/sample_posteddata.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php /* <body><pre>
-
--------------------------------------------------------------------------------------------
-  CKEditor - Posted Data
-
-  We are sorry, but your Web server does not support the PHP language used in this script.
-
-  Please note that CKEditor can be used with any other server-side language than just PHP.
-  To save the content created with CKEditor you need to read the POST data on the server
-  side and write it to a file or the database.
-
-  Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-  For licensing, see LICENSE.md or http://ckeditor.com/license
--------------------------------------------------------------------------------------------
-
-</pre><div style="display:none"></body> */ include "assets/posteddata.php"; ?>
diff --git a/js/ckeditor/samples/old/sourcedialog/sourcedialog.html b/js/ckeditor/samples/old/sourcedialog/sourcedialog.html
deleted file mode 100644
index 9232b0e02..000000000
--- a/js/ckeditor/samples/old/sourcedialog/sourcedialog.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Editing source code in a dialog &mdash; CKEditor Sample</title>
-	<script src="../../../ckeditor.js"></script>
-	<link rel="stylesheet" href="../../../samples/old/sample.css">
-	<meta name="ckeditor-sample-name" content="Editing source code in a dialog">
-	<meta name="ckeditor-sample-group" content="Plugins">
-	<meta name="ckeditor-sample-description" content="Editing HTML content of both inline and classic editor instances.">
-	<meta name="ckeditor-sample-isnew" content="1">
-	<style>
-
-		#editable
-		{
-			padding: 10px;
-			float: left;
-		}
-
-	</style>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Editing source code in a dialog
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/sourcearea.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			<strong>Sourcedialog</strong> plugin provides an easy way to edit raw HTML content
-			of an editor, similarly to what is possible with <strong>Sourcearea</strong>
-			plugin for classic (<code>iframe</code>-based) instances but using dialogs. Thanks to that, it's also possible
-			to manipulate raw content of inline editor instances.
-		</p>
-		<p>
-			This plugin extends the toolbar with a button,
-			which opens a dialog window with a source code editor. It works with both classic
-			and inline instances. To enable this
-			plugin, basically add <code>extraPlugins: 'sourcedialog'</code> to editor's
-			config:
-		</p>
-<pre class="samples">
-// Inline editor.
-CKEDITOR.inline( 'editable', {
-	<strong>extraPlugins: 'sourcedialog'</strong>
-});
-
-// Classic (iframe-based) editor.
-CKEDITOR.replace( 'textarea_id', {
-	<strong>extraPlugins: 'sourcedialog'</strong>,
-	removePlugins: 'sourcearea'
-});
-</pre>
-		<p>
-			Note that you may want to include <code>removePlugins: 'sourcearea'</code>
-			in your config when using <strong>Sourcedialog</strong> in classic editor instances.
-			This prevents feature redundancy.
-		</p>
-		<p>
-			Note that <code>editable</code> in the code above is the <code>id</code>
-			attribute of the <code>&lt;div&gt;</code> element to be converted into an inline instance.
-		</p>
-		<p>
-			Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
-			the <code>&lt;textarea&gt;</code> element to be replaced with CKEditor.
-		</p>
-	</div>
-	<div>
-		<label for="editor1">
-			Inline editor:
-		</label>
-		<div id="editor1" contenteditable="true" style="padding: 5px 20px;">
-			<p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p>
-		</div>
-	</div>
-	<br>
-	<div>
-		<label for="editor2">
-			Classic editor:
-		</label>
-		<textarea cols="80" id="editor2" name="editor2" rows="10">
-			This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.
-		</textarea>
-	</div>
-	<script>
-
-		// We need to turn off the automatic editor creation first.
-		CKEDITOR.disableAutoInline = true;
-
-		var config = {
-			toolbarGroups: [
-				{ name: 'mode' },
-				{ name: 'basicstyles' },
-				{ name: 'links' }
-			],
-			extraPlugins: 'sourcedialog',
-			removePlugins: 'sourcearea'
-		}
-
-		CKEDITOR.inline( 'editor1', config );
-		CKEDITOR.replace( 'editor2', config );
-
-	</script>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">
-				http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a>
-			- Frederico Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/tabindex.html b/js/ckeditor/samples/old/tabindex.html
deleted file mode 100644
index 82ed647bd..000000000
--- a/js/ckeditor/samples/old/tabindex.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>TAB Key-Based Navigation &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link href="sample.css" rel="stylesheet">
-	<style>
-
-		.cke_focused,
-		.cke_editable.cke_focused
-		{
-			outline: 3px dotted blue !important;
-			*border: 3px dotted blue !important;	/* For IE7 */
-		}
-
-	</style>
-	<script>
-
-		CKEDITOR.on( 'instanceReady', function( evt ) {
-			var editor = evt.editor;
-			editor.setData( 'This editor has it\'s tabIndex set to <strong>' + editor.tabIndex + '</strong>' );
-
-			// Apply focus class name.
-			editor.on( 'focus', function() {
-				editor.container.addClass( 'cke_focused' );
-			});
-			editor.on( 'blur', function() {
-				editor.container.removeClass( 'cke_focused' );
-			});
-
-			// Put startup focus on the first editor in tab order.
-			if ( editor.tabIndex == 1 )
-				editor.focus();
-		});
-
-	</script>
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; TAB Key-Based Navigation
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/tabindex.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how tab key navigation among editor instances is
-			affected by the <code>tabIndex</code> attribute from
-			the original page element. Use TAB key to move between the editors.
-		</p>
-	</div>
-	<p>
-		<textarea class="ckeditor" cols="80" id="editor4" rows="10" tabindex="1"></textarea>
-	</p>
-	<div class="ckeditor" contenteditable="true" id="editor1" tabindex="4"></div>
-	<p>
-		<textarea class="ckeditor" cols="80" id="editor2" rows="10" tabindex="2"></textarea>
-	</p>
-	<p>
-		<textarea class="ckeditor" cols="80" id="editor3" rows="10" tabindex="3"></textarea>
-	</p>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/toolbar/toolbar.html b/js/ckeditor/samples/old/toolbar/toolbar.html
deleted file mode 100644
index e40d2a194..000000000
--- a/js/ckeditor/samples/old/toolbar/toolbar.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Toolbar Configuration &mdash; CKEditor Sample</title>
-	<meta name="ckeditor-sample-name" content="Toolbar Configurations">
-	<meta name="ckeditor-sample-group" content="Advanced Samples">
-	<meta name="ckeditor-sample-description" content="Configuring CKEditor to display full or custom toolbar layout.">
-	<script src="../../../ckeditor.js"></script>
-	<link href="../../../samples/old/sample.css" rel="stylesheet">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Toolbar Configuration
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out the <a href="../../../samples/toolbarconfigurator/index.html#basic">brand new CKEditor Toolbar Configurator</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample page demonstrates editor with loaded <a href="#fullToolbar">full toolbar</a> (all registered buttons) and, if
-			current editor's configuration modifies default settings, also editor with <a href="#currentToolbar">modified toolbar</a>.
-		</p>
-
-		<p>Since CKEditor 4 there are two ways to configure toolbar buttons.</p>
-
-		<h2 class="samples">By <a href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-toolbar">config.toolbar</a></h2>
-
-		<p>
-			You can explicitly define which buttons are displayed in which groups and in which order.
-			This is the more precise setting, but less flexible. If newly added plugin adds its
-			own button you'll have to add it manually to your <code>config.toolbar</code> setting as well.
-		</p>
-
-		<p>To add a CKEditor instance with custom toolbar setting, insert the following JavaScript call to your code:</p>
-
-		<pre class="samples">
-CKEDITOR.replace( <em>'textarea_id'</em>, {
-	<strong>toolbar:</strong> [
-		{ name: 'document', items: [ 'Source', '-', 'NewPage', 'Preview', '-', 'Templates' ] },	// Defines toolbar group with name (used to create voice label) and items in 3 subgroups.
-		[ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ],			// Defines toolbar group without name.
-		'/',																					// Line break - next group will be placed in new line.
-		{ name: 'basicstyles', items: [ 'Bold', 'Italic' ] }
-	]
-});</pre>
-
-		<h2 class="samples">By <a href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-toolbarGroups">config.toolbarGroups</a></h2>
-
-		<p>
-			You can define which groups of buttons (like e.g. <code>basicstyles</code>, <code>clipboard</code>
-			and <code>forms</code>) are displayed and in which order. Registered buttons are associated
-			with toolbar groups by <code>toolbar</code> property in their definition.
-			This setting's advantage is that you don't have to modify toolbar configuration
-			when adding/removing plugins which register their own buttons.
-		</p>
-
-		<p>To add a CKEditor instance with custom toolbar groups setting, insert the following JavaScript call to your code:</p>
-
-		<pre class="samples">
-CKEDITOR.replace( <em>'textarea_id'</em>, {
-	<strong>toolbarGroups:</strong> [
-		{ name: 'document',	   groups: [ 'mode', 'document' ] },			// Displays document group with its two subgroups.
- 		{ name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },			// Group's name will be used to create voice label.
- 		'/',																// Line break - next group will be placed in new line.
- 		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
- 		{ name: 'links' }
-	]
-
-	// NOTE: Remember to leave 'toolbar' property with the default value (null).
-});</pre>
-	</div>
-
-	<div id="currentToolbar" style="display: none">
-		<h2 class="samples">Current toolbar configuration</h2>
-		<p>Below you can see editor with current toolbar definition.</p>
-		<textarea cols="80" id="editorCurrent" name="editorCurrent" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		<pre id="editorCurrentCfg" class="samples"></pre>
-	</div>
-
-	<div id="fullToolbar">
-		<h2 class="samples">Full toolbar configuration</h2>
-		<p>Below you can see editor with full toolbar, generated automatically by the editor.</p>
-		<p>
-			<strong>Note</strong>: To create editor instance with full toolbar you don't have to set anything.
-			Just leave <code>toolbar</code> and <code>toolbarGroups</code> with the default, <code>null</code> values.
-		</p>
-		<textarea cols="80" id="editorFull" name="editorFull" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		<pre id="editorFullCfg" class="samples"></pre>
-	</div>
-
-	<script>
-
-(function() {
-	'use strict';
-
-	var buttonsNames;
-
-	CKEDITOR.config.extraPlugins = 'toolbar';
-
-	CKEDITOR.on( 'instanceReady', function( evt ) {
-		var editor = evt.editor,
-			editorCurrent = editor.name == 'editorCurrent',
-			defaultToolbar = !( editor.config.toolbar || editor.config.toolbarGroups || editor.config.removeButtons ),
-			pre = CKEDITOR.document.getById( editor.name + 'Cfg' ),
-			output = '';
-
-		if ( editorCurrent ) {
-			// If default toolbar configuration has been modified, show "current toolbar" section.
-			if ( !defaultToolbar )
-				CKEDITOR.document.getById( 'currentToolbar' ).show();
-			else
-				return;
-		}
-
-		if ( !buttonsNames )
-			buttonsNames = createButtonsNamesHash( editor.ui.items );
-
-		// Toolbar isn't set explicitly, so it was created automatically from toolbarGroups.
-		if ( !editor.config.toolbar ) {
-			output +=
-				'// Toolbar configuration generated automatically by the editor based on config.toolbarGroups.\n' +
-				dumpToolbarConfiguration( editor ) +
-				'\n\n' +
-				'// Toolbar groups configuration.\n' +
-				dumpToolbarConfiguration( editor, true )
-		}
-		// Toolbar groups doesn't count in this case - print only toolbar.
-		else {
-			output += '// Toolbar configuration.\n' +
-				dumpToolbarConfiguration( editor );
-		}
-
-		// Recreate to avoid old IE from loosing whitespaces on filling <pre> content.
-		var preOutput = pre.getOuterHtml().replace( /(?=<\/)/, output );
-		CKEDITOR.dom.element.createFromHtml( preOutput ).replace( pre );
-	} );
-
-	CKEDITOR.replace( 'editorCurrent', { height: 100 } );
-	CKEDITOR.replace( 'editorFull', {
-		// Reset toolbar settings, so full toolbar will be generated automatically.
-		toolbar: null,
-		toolbarGroups: null,
-		removeButtons: null,
-		height: 100
-	} );
-
-	function dumpToolbarConfiguration( editor, printGroups ) {
-		var output = [],
-			toolbar = editor.toolbar;
-
-		for ( var i = 0; i < toolbar.length; ++i ) {
-			var group = dumpToolbarGroup( toolbar[ i ], printGroups );
-			if ( group )
-				output.push( group );
-		}
-
-		return 'config.toolbar' + ( printGroups ? 'Groups' : '' ) + ' = [\n\t' + output.join( ',\n\t' ) + '\n];';
-	}
-
-	function dumpToolbarGroup( group, printGroups ) {
-		var output = [];
-
-		if ( typeof group == 'string' )
-			return '\'' + group + '\'';
-		if ( CKEDITOR.tools.isArray( group ) )
-			return dumpToolbarItems( group );
-		// Skip group when printing entire toolbar configuration and there are no items in this group.
-		if ( !printGroups && !group.items )
-			return;
-
-		if ( group.name )
-			output.push( 'name: \'' + group.name + '\'' );
-
-		if ( group.groups )
-			output.push( 'groups: ' + dumpToolbarItems( group.groups ) );
-
-		if ( !printGroups )
-			output.push( 'items: ' + dumpToolbarItems( group.items ) );
-
-		return '{ ' + output.join( ', ' ) + ' }';
-	}
-
-	function dumpToolbarItems( items ) {
-		if ( typeof items == 'string' )
-			return '\'' + items + '\'';
-
-		var names = [],
-			i, item;
-
-		for ( var i = 0; i < items.length; ++i ) {
-			item = items[ i ];
-			if ( typeof item == 'string' )
-				names.push( item );
-			else {
-				if ( item.type == CKEDITOR.UI_SEPARATOR )
-					names.push( '-' );
-				else
-					names.push( buttonsNames[ item.name ] );
-			}
-		}
-
-		return '[ \'' + names.join( '\', \'' ) + '\' ]';
-	}
-
-	// Creates { 'lowercased': 'LowerCased' } buttons names hash.
-	function createButtonsNamesHash( items ) {
-		var hash = {},
-			name;
-
-		for ( name in items ) {
-			hash[ items[ name ].name ] = name;
-		}
-
-		return hash;
-	}
-
-})();
-	</script>
-
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/uicolor.html b/js/ckeditor/samples/old/uicolor.html
deleted file mode 100644
index bff1b9638..000000000
--- a/js/ckeditor/samples/old/uicolor.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>UI Color Picker &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; UI Color
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/uicolor.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to automatically replace <code>&lt;textarea&gt;</code> elements
-			with a CKEditor instance with an option to change the color of its user interface.<br>
-			<strong>Note:</strong>The UI skin color feature depends on the CKEditor skin
-			compatibility. The Moono and Kama skins are examples of skins that work with it.
-		</p>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-	<p>
-		This editor instance has a UI color value defined in configuration to change the skin color,
-		To specify the color of the user interface, set the <code>uiColor</code> property:
-	</p>
-	<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>', {
-	<strong>uiColor: '#14B8C4'</strong>
-});</pre>
-	<p>
-		Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
-		the <code>&lt;textarea&gt;</code> element to be replaced.
-	</p>
-	<p>
-		<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-		<script>
-
-			// Replace the <textarea id="editor"> with an CKEditor
-			// instance, using default configurations.
-			CKEDITOR.replace( 'editor1', {
-				uiColor: '#14B8C4',
-				toolbar: [
-					[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
-					[ 'FontSize', 'TextColor', 'BGColor' ]
-				]
-			});
-
-		</script>
-	</p>
-	<p>
-		<input type="submit" value="Submit">
-	</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/uilanguages.html b/js/ckeditor/samples/old/uilanguages.html
deleted file mode 100644
index 9c1d0b842..000000000
--- a/js/ckeditor/samples/old/uilanguages.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>User Interface Globalization &mdash; CKEditor Sample</title>
-	<script src="../../ckeditor.js"></script>
-	<script src="assets/uilanguages/languages.js"></script>
-	<link rel="stylesheet" href="sample.css">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; User Interface Languages
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/uilanguages.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to automatically replace <code>&lt;textarea&gt;</code> elements
-			with a CKEditor instance with an option to change the language of its user interface.
-		</p>
-		<p>
-			It pulls the language list from CKEditor <code>_languages.js</code> file that contains the list of supported languages and creates
-			a drop-down list that lets the user change the UI language.
-		</p>
-		<p>
-			By default, CKEditor automatically localizes the editor to the language of the user.
-			The UI language can be controlled with two configuration options:
-			<code><a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-language">language</a></code> and
-			<code><a class="samples" href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-defaultLanguage">
-			defaultLanguage</a></code>. The <code>defaultLanguage</code> setting specifies the
-			default CKEditor language to be used when a localization suitable for user's settings is not available.
-		</p>
-		<p>
-			To specify the user interface language that will be used no matter what language is
-			specified in user's browser or operating system, set the <code>language</code> property:
-		</p>
-<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>', {
-	// Load the German interface.
-	<strong>language: 'de'</strong>
-});</pre>
-		<p>
-			Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
-			the <code>&lt;textarea&gt;</code> element to be replaced.
-		</p>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<p>
-			Available languages (<span id="count"> </span> languages!):<br>
-			<script>
-
-				document.write( '<select disabled="disabled" id="languages" onchange="createEditor( this.value );">' );
-
-				// Get the language list from the _languages.js file.
-				for ( var i = 0 ; i < window.CKEDITOR_LANGS.length ; i++ ) {
-					document.write(
-						'<option value="' + window.CKEDITOR_LANGS[i].code + '">' +
-							window.CKEDITOR_LANGS[i].name +
-						'</option>' );
-				}
-
-				document.write( '</select>' );
-
-			</script>
-			<br>
-			<span style="color: #888888">
-				(You may see strange characters if your system does not support the selected language)
-			</span>
-		</p>
-		<p>
-			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-			<script>
-
-				// Set the number of languages.
-				document.getElementById( 'count' ).innerHTML = window.CKEDITOR_LANGS.length;
-
-				var editor;
-
-				function createEditor( languageCode ) {
-					if ( editor )
-						editor.destroy();
-
-					// Replace the <textarea id="editor"> with an CKEditor
-					// instance, using default configurations.
-					editor = CKEDITOR.replace( 'editor1', {
-						language: languageCode,
-
-						on: {
-							instanceReady: function() {
-								// Wait for the editor to be ready to set
-								// the language combo.
-								var languages = document.getElementById( 'languages' );
-								languages.value = this.langCode;
-								languages.disabled = false;
-							}
-						}
-					});
-				}
-
-				// At page startup, load the default language:
-				createEditor( '' );
-
-			</script>
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/wysiwygarea/fullpage.html b/js/ckeditor/samples/old/wysiwygarea/fullpage.html
deleted file mode 100644
index bb3193af1..000000000
--- a/js/ckeditor/samples/old/wysiwygarea/fullpage.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>Full Page Editing &mdash; CKEditor Sample</title>
-	<script src="../../../ckeditor.js"></script>
-	<script src="../../../samples/old/sample.js"></script>
-	<link rel="stylesheet" href="../../../samples/old/sample.css">
-	<meta name="ckeditor-sample-required-plugins" content="sourcearea">
-	<meta name="ckeditor-sample-name" content="Full page support">
-	<meta name="ckeditor-sample-group" content="Plugins">
-	<meta name="ckeditor-sample-description" content="CKEditor inserted with a JavaScript call and used to edit the whole page from &lt;html&gt; to &lt;/html&gt;.">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="../../../samples/old/index.html">CKEditor Samples</a> &raquo; Full Page Editing
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/fullpage.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to configure CKEditor to edit entire HTML pages, from the
-			<code>&lt;html&gt;</code> tag to the <code>&lt;/html&gt;</code> tag.
-		</p>
-		<p>
-			The CKEditor instance below is inserted with a JavaScript call using the following code:
-		</p>
-<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>', {
-	<strong>fullPage: true</strong>,
-	<strong>allowedContent: true</strong>
-});
-</pre>
-		<p>
-			Note that <code><em>textarea_id</em></code> in the code above is the <code>id</code> attribute of
-			the <code>&lt;textarea&gt;</code> element to be replaced.
-		</p>
-		<p>
-			The <code><em>allowedContent</em></code> in the code above is set to <code>true</code> to disable content filtering.
-			Setting this option is not obligatory, but in full page mode there is a strong chance that one may want be able to freely enter any HTML content in source mode without any limitations.
-		</p>
-	</div>
-	<form action="../../../samples/sample_posteddata.php" method="post">
-		<label for="editor1">
-			CKEditor output the entire page including content outside of
-			<code>&lt;body&gt;</code> element, so content like meta and title can be changed:
-		</label>
-		<textarea cols="80" id="editor1" name="editor1" rows="10">
-			&lt;h1&gt;&lt;img align=&quot;right&quot; alt=&quot;Saturn V carrying Apollo 11&quot; src=&quot;../../../samples/old/assets/sample.jpg&quot;/&gt; Apollo 11&lt;/h1&gt; &lt;p&gt;&lt;b&gt;Apollo 11&lt;/b&gt; was the spaceflight that landed the first humans, Americans &lt;a href=&quot;http://en.wikipedia.org/wiki/Neil_Armstrong&quot; title=&quot;Neil Armstrong&quot;&gt;Neil Armstrong&lt;/a&gt; and &lt;a href=&quot;http://en.wikipedia.org/wiki/Buzz_Aldrin&quot; title=&quot;Buzz Aldrin&quot;&gt;Buzz Aldrin&lt;/a&gt;, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.&lt;/p&gt; &lt;p&gt;Armstrong spent about &lt;s&gt;three and a half&lt;/s&gt; two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&amp;nbsp;kg) of lunar material for return to Earth. A third member of the mission, &lt;a href=&quot;http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)&quot; title=&quot;Michael Collins (astronaut)&quot;&gt;Michael Collins&lt;/a&gt;, piloted the &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_Command/Service_Module&quot; title=&quot;Apollo Command/Service Module&quot;&gt;command&lt;/a&gt; spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.&lt;/p&gt; &lt;h2&gt;Broadcasting and &lt;em&gt;quotes&lt;/em&gt; &lt;a id=&quot;quotes&quot; name=&quot;quotes&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;p&gt;Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;One small step for [a] man, one giant leap for mankind.&lt;/p&gt;&lt;/blockquote&gt; &lt;p&gt;Apollo 11 effectively ended the &lt;a href=&quot;http://en.wikipedia.org/wiki/Space_Race&quot; title=&quot;Space Race&quot;&gt;Space Race&lt;/a&gt; and fulfilled a national goal proposed in 1961 by the late U.S. President &lt;a href=&quot;http://en.wikipedia.org/wiki/John_F._Kennedy&quot; title=&quot;John F. Kennedy&quot;&gt;John F. Kennedy&lt;/a&gt; in a speech before the United States Congress:&lt;/p&gt; &lt;blockquote&gt;&lt;p&gt;[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.&lt;/p&gt;&lt;/blockquote&gt; &lt;h2&gt;Technical details &lt;a id=&quot;tech-details&quot; name=&quot;tech-details&quot;&gt;&lt;/a&gt;&lt;/h2&gt; &lt;table align=&quot;right&quot; border=&quot;1&quot; bordercolor=&quot;#ccc&quot; cellpadding=&quot;5&quot; cellspacing=&quot;0&quot; style=&quot;border-collapse:collapse;margin:10px 0 10px 15px;&quot;&gt; &lt;caption&gt;&lt;strong&gt;Mission crew&lt;/strong&gt;&lt;/caption&gt; &lt;thead&gt; &lt;tr&gt; &lt;th scope=&quot;col&quot;&gt;Position&lt;/th&gt; &lt;th scope=&quot;col&quot;&gt;Astronaut&lt;/th&gt; &lt;/tr&gt; &lt;/thead&gt; &lt;tbody&gt; &lt;tr&gt; &lt;td&gt;Commander&lt;/td&gt; &lt;td&gt;Neil A. Armstrong&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Command Module Pilot&lt;/td&gt; &lt;td&gt;Michael Collins&lt;/td&gt; &lt;/tr&gt; &lt;tr&gt; &lt;td&gt;Lunar Module Pilot&lt;/td&gt; &lt;td&gt;Edwin &amp;quot;Buzz&amp;quot; E. Aldrin, Jr.&lt;/td&gt; &lt;/tr&gt; &lt;/tbody&gt; &lt;/table&gt; &lt;p&gt;Launched by a &lt;strong&gt;Saturn V&lt;/strong&gt; rocket from &lt;a href=&quot;http://en.wikipedia.org/wiki/Kennedy_Space_Center&quot; title=&quot;Kennedy Space Center&quot;&gt;Kennedy Space Center&lt;/a&gt; in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of &lt;a href=&quot;http://en.wikipedia.org/wiki/NASA&quot; title=&quot;NASA&quot;&gt;NASA&lt;/a&gt;&amp;#39;s Apollo program. The Apollo spacecraft had three parts:&lt;/p&gt; &lt;ol&gt; &lt;li&gt;&lt;strong&gt;Command Module&lt;/strong&gt; with a cabin for the three astronauts which was the only part which landed back on Earth&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Service Module&lt;/strong&gt; which supported the Command Module with propulsion, electrical power, oxygen and water&lt;/li&gt; &lt;li&gt;&lt;strong&gt;Lunar Module&lt;/strong&gt; for landing on the Moon.&lt;/li&gt; &lt;/ol&gt; &lt;p&gt;After being sent to the Moon by the Saturn V&amp;#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Mare_Tranquillitatis&quot; title=&quot;Mare Tranquillitatis&quot;&gt;Sea of Tranquility&lt;/a&gt;. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the &lt;a href=&quot;http://en.wikipedia.org/wiki/Pacific_Ocean&quot; title=&quot;Pacific Ocean&quot;&gt;Pacific Ocean&lt;/a&gt; on July 24.&lt;/p&gt; &lt;hr/&gt; &lt;p style=&quot;text-align: right;&quot;&gt;&lt;small&gt;Source: &lt;a href=&quot;http://en.wikipedia.org/wiki/Apollo_11&quot;&gt;Wikipedia.org&lt;/a&gt;&lt;/small&gt;&lt;/p&gt;
-		</textarea>
-		<script>
-
-			CKEDITOR.replace( 'editor1', {
-				fullPage: true,
-				allowedContent: true,
-				extraPlugins: 'wysiwygarea'
-			});
-
-		</script>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/old/xhtmlstyle.html b/js/ckeditor/samples/old/xhtmlstyle.html
deleted file mode 100644
index daf587958..000000000
--- a/js/ckeditor/samples/old/xhtmlstyle.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<html>
-<head>
-	<meta charset="utf-8">
-	<title>XHTML Compliant Output &mdash; CKEditor Sample</title>
-	<meta name="ckeditor-sample-required-plugins" content="sourcearea">
-	<script src="../../ckeditor.js"></script>
-	<script src="sample.js"></script>
-	<link href="sample.css" rel="stylesheet">
-</head>
-<body>
-	<h1 class="samples">
-		<a href="index.html">CKEditor Samples</a> &raquo; Producing XHTML Compliant Output
-	</h1>
-	<div class="warning deprecated">
-		This sample is not maintained anymore. Check out its <a href="http://sdk.ckeditor.com/samples/basicstyles.html">brand new version in CKEditor SDK</a>.
-	</div>
-	<div class="description">
-		<p>
-			This sample shows how to configure CKEditor to output valid
-			<a class="samples" href="http://www.w3.org/TR/xhtml11/">XHTML 1.1</a> code.
-			Deprecated elements (<code>&lt;font&gt;</code>, <code>&lt;u&gt;</code>) or attributes
-			(<code>size</code>, <code>face</code>) will be replaced with XHTML compliant code.
-		</p>
-		<p>
-			To add a CKEditor instance outputting valid XHTML code, load the editor using a standard
-			JavaScript call and define CKEditor features to use the XHTML compliant elements and styles.
-		</p>
-		<p>
-			A snippet of the configuration code can be seen below; check the source of this page for
-			full definition:
-		</p>
-<pre class="samples">
-CKEDITOR.replace( '<em>textarea_id</em>', {
-	contentsCss: 'assets/outputxhtml.css',
-
-	coreStyles_bold: {
-		element: 'span',
-		attributes: { 'class': 'Bold' }
-	},
-	coreStyles_italic: {
-		element: 'span',
-		attributes: { 'class': 'Italic' }
-	},
-
-	...
-});</pre>
-	</div>
-	<form action="sample_posteddata.php" method="post">
-		<p>
-			<label for="editor1">
-				Editor 1:
-			</label>
-			<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;span class="Bold"&gt;sample text&lt;/span&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-			<script>
-
-				CKEDITOR.replace( 'editor1', {
-					/*
-					 * Style sheet for the contents
-					 */
-					contentsCss: 'assets/outputxhtml/outputxhtml.css',
-
-					/*
-					 * Special allowed content rules for spans used by
-					 * font face, size, and color buttons.
-					 *
-					 * Note: all rules have been written separately so
-					 * it was possible to specify required classes.
-					 */
-					extraAllowedContent: 'span(!FontColor1);span(!FontColor2);span(!FontColor3);' +
-						'span(!FontColor1BG);span(!FontColor2BG);span(!FontColor3BG);' +
-						'span(!FontComic);span(!FontCourier);span(!FontTimes);' +
-						'span(!FontSmaller);span(!FontLarger);span(!FontSmall);span(!FontBig);span(!FontDouble)',
-
-					/*
-					 * Core styles.
-					 */
-					coreStyles_bold: {
-						element: 'span',
-						attributes: { 'class': 'Bold' }
-					},
-					coreStyles_italic: {
-						element: 'span',
-						attributes: { 'class': 'Italic' }
-					},
-					coreStyles_underline: {
-						element: 'span',
-						attributes: { 'class': 'Underline' }
-					},
-					coreStyles_strike: {
-						element: 'span',
-						attributes: { 'class': 'StrikeThrough' },
-						overrides: 'strike'
-					},
-					coreStyles_subscript: {
-						element: 'span',
-						attributes: { 'class': 'Subscript' },
-						overrides: 'sub'
-					},
-					coreStyles_superscript: {
-						element: 'span',
-						attributes: { 'class': 'Superscript' },
-						overrides: 'sup'
-					},
-
-					/*
-					 * Font face.
-					 */
-
-					// List of fonts available in the toolbar combo. Each font definition is
-					// separated by a semi-colon (;). We are using class names here, so each font
-					// is defined by {Combo Label}/{Class Name}.
-					font_names: 'Comic Sans MS/FontComic;Courier New/FontCourier;Times New Roman/FontTimes',
-
-					// Define the way font elements will be applied to the document. The "span"
-					// element will be used. When a font is selected, the font name defined in the
-					// above list is passed to this definition with the name "Font", being it
-					// injected in the "class" attribute.
-					// We must also instruct the editor to replace span elements that are used to
-					// set the font (Overrides).
-					font_style: {
-						element: 'span',
-						attributes: { 'class': '#(family)' },
-						overrides: [
-							{
-								element: 'span',
-								attributes: {
-									'class': /^Font(?:Comic|Courier|Times)$/
-								}
-							}
-						]
-					},
-
-					/*
-					 * Font sizes.
-					 */
-					fontSize_sizes: 'Smaller/FontSmaller;Larger/FontLarger;8pt/FontSmall;14pt/FontBig;Double Size/FontDouble',
-					fontSize_style: {
-						element: 'span',
-						attributes: { 'class': '#(size)' },
-						overrides: [
-							{
-								element: 'span',
-								attributes: {
-									'class': /^Font(?:Smaller|Larger|Small|Big|Double)$/
-								}
-							}
-						]
-					} ,
-
-					/*
-					 * Font colors.
-					 */
-					colorButton_enableMore: false,
-
-					colorButton_colors: 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00',
-					colorButton_foreStyle: {
-						element: 'span',
-						attributes: { 'class': '#(color)' },
-						overrides: [
-							{
-								element: 'span',
-								attributes: {
-									'class': /^FontColor(?:1|2|3)$/
-								}
-							}
-						]
-					},
-
-					colorButton_backStyle: {
-						element: 'span',
-						attributes: { 'class': '#(color)BG' },
-						overrides: [
-							{
-								element: 'span',
-								attributes: {
-									'class': /^FontColor(?:1|2|3)BG$/
-								}
-							}
-						]
-					},
-
-					/*
-					 * Indentation.
-					 */
-					indentClasses: [ 'Indent1', 'Indent2', 'Indent3' ],
-
-					/*
-					 * Paragraph justification.
-					 */
-					justifyClasses: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyFull' ],
-
-					/*
-					 * Styles combo.
-					 */
-					stylesSet: [
-						{ name: 'Strong Emphasis', element: 'strong' },
-						{ name: 'Emphasis', element: 'em' },
-
-						{ name: 'Computer Code', element: 'code' },
-						{ name: 'Keyboard Phrase', element: 'kbd' },
-						{ name: 'Sample Text', element: 'samp' },
-						{ name: 'Variable', element: 'var' },
-
-						{ name: 'Deleted Text', element: 'del' },
-						{ name: 'Inserted Text', element: 'ins' },
-
-						{ name: 'Cited Work', element: 'cite' },
-						{ name: 'Inline Quotation', element: 'q' }
-					]
-				});
-
-			</script>
-		</p>
-		<p>
-			<input type="submit" value="Submit">
-		</p>
-	</form>
-	<div id="footer">
-		<hr>
-		<p>
-			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-		</p>
-		<p id="copy">
-			Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
-			Knabben. All rights reserved.
-		</p>
-	</div>
-</body>
-</html>
diff --git a/js/ckeditor/samples/toolbarconfigurator/css/fontello.css b/js/ckeditor/samples/toolbarconfigurator/css/fontello.css
deleted file mode 100644
index d98370795..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/css/fontello.css
+++ /dev/null
@@ -1,55 +0,0 @@
-@font-face {
-  font-family: 'fontello';
-  src: url('../font/fontello.eot?89024372');
-  src: url('../font/fontello.eot?89024372#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff?89024372') format('woff'),
-       url('../font/fontello.ttf?89024372') format('truetype'),
-       url('../font/fontello.svg?89024372#fontello') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: 'fontello';
-    src: url('../font/fontello.svg?89024372#fontello') format('svg');
-  }
-}
-*/
-
- [class^="icon-"]:before, [class*=" icon-"]:before {
-  font-family: "fontello";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
-
-  display: inline-block;
-  text-decoration: inherit;
-  width: 1em;
-  margin-right: .2em;
-  text-align: center;
-  /* opacity: .8; */
-
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
-
-  /* fix buttons height, for twitter bootstrap */
-  line-height: 1em;
-
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  margin-left: .2em;
-
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-
-  /* Uncomment for 3D effect */
-  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
-
-.icon-trash:before { content: '\e802'; } /* '' */
-.icon-down-big:before { content: '\e800'; } /* '' */
-.icon-up-big:before { content: '\e801'; } /* '' */
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt b/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
deleted file mode 100644
index 4a73f6c97..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Font license info
-
-
-## Font Awesome
-
-   Copyright (C) 2012 by Dave Gandy
-
-   Author:    Dave Gandy
-   License:   SIL ()
-   Homepage:  http://fortawesome.github.com/Font-Awesome/
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/config.json b/js/ckeditor/samples/toolbarconfigurator/font/config.json
deleted file mode 100644
index 94809d70d..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/font/config.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "",
-  "css_prefix_text": "icon-",
-  "css_use_suffix": false,
-  "hinting": true,
-  "units_per_em": 1000,
-  "ascent": 850,
-  "glyphs": [
-    {
-      "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
-      "css": "trash-empty",
-      "code": 59392,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "1c4068ed75209e21af36017df8871802",
-      "css": "down-big",
-      "code": 59393,
-      "src": "fontawesome"
-    },
-    {
-      "uid": "95376bf082bfec6ce06ea1cda7bd7ead",
-      "css": "up-big",
-      "code": 59394,
-      "src": "fontawesome"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot b/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot
deleted file mode 100644
index 2732fad4b..000000000
Binary files a/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot and /dev/null differ
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg b/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg
deleted file mode 100644
index 33d14ac83..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
-<defs>
-<font id="fontello" horiz-adv-x="1000" >
-<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="trash" unicode="&#xe802;" d="m286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15t6-5h464q2 0 6 5t8 15t4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q22 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
-<glyph glyph-name="down-big" unicode="&#xe800;" d="m899 386q0-30-21-50l-363-364q-22-21-51-21q-29 0-50 21l-363 364q-21 20-21 50q0 29 21 51l41 41q22 21 51 21q29 0 50-21l164-164v393q0 29 21 50t51 22h71q29 0 50-22t21-50v-393l164 164q21 21 51 21q29 0 50-21l42-42q21-21 21-50z" horiz-adv-x="928.6" />
-<glyph glyph-name="up-big" unicode="&#xe801;" d="m899 308q0-28-21-50l-42-42q-21-21-50-21q-30 0-51 21l-164 164v-393q0-29-20-47t-51-19h-71q-30 0-51 19t-21 47v393l-164-164q-20-21-50-21t-50 21l-42 42q-21 21-21 50q0 30 21 51l363 363q20 21 50 21q30 0 51-21l363-363q21-22 21-51z" horiz-adv-x="928.6" />
-</font>
-</defs>
-</svg>
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf b/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
deleted file mode 100644
index fbcbf06af..000000000
Binary files a/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf and /dev/null differ
diff --git a/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff b/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff
deleted file mode 100644
index e1d56472f..000000000
Binary files a/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff and /dev/null differ
diff --git a/js/ckeditor/samples/toolbarconfigurator/index.html b/js/ckeditor/samples/toolbarconfigurator/index.html
deleted file mode 100644
index 5c06a0fbe..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/index.html
+++ /dev/null
@@ -1,446 +0,0 @@
-<!DOCTYPE html>
-<!--
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
--->
-<!--[if IE 8]><html class="ie8"><![endif]-->
-<!--[if gt IE 8]><html><![endif]-->
-<!--[if !IE]><!--><html><!--<![endif]-->
-<head>
-	<meta charset="utf-8">
-	<title>Toolbar Configurator</title>
-	<script src="../../ckeditor.js"></script>
-	<script>
-		if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 )
-			CKEDITOR.tools.enableHtml5Elements( document );
-	</script>
-	<link rel="stylesheet" href="lib/codemirror/codemirror.css">
-	<link rel="stylesheet" href="lib/codemirror/show-hint.css">
-	<link rel="stylesheet" href="lib/codemirror/neo.css">
-	<link rel="stylesheet" href="css/fontello.css">
-	<link rel="stylesheet" href="../css/samples.css">
-</head>
-<body id="toolbar">
-
-<nav class="navigation-a">
-	<div class="grid-container">
-		<ul class="navigation-a-left grid-width-70">
-			<li><a href="http://ckeditor.com">Project Homepage</a></li>
-			<li><a href="https://github.com/ckeditor/ckeditor-dev/issues">I found a bug</a></li>
-			<li><a href="http://github.com/ckeditor/ckeditor-dev" class="icon-pos-right icon-navigation-a-github">Fork CKEditor on GitHub</a></li>
-		</ul>
-		<ul class="navigation-a-right grid-width-30">
-			<li><a href="http://ckeditor.com/blog-list">CKEditor Blog</a></li>
-		</ul>
-	</div>
-</nav>
-
-<header class="header-a">
-	<div class="grid-container">
-		<h1 class="header-a-logo grid-width-30">
-			<a href="../index.html"><img src="../img/logo.png" alt="CKEditor Logo"></a>
-		</h1>
-		<nav class="navigation-b grid-width-70">
-			<ul>
-				<li><a href="../index.html"  class="button-a">Start</a></li>
-				<li><a href="index.html"  class="button-a button-a-background">Toolbar configurator</a></li>
-			</ul>
-		</nav>
-	</div>
-</header>
-
-<main>
-	<div class="adjoined-top">
-		<div class="grid-container">
-			<div class="content grid-width-100">
-				<div class="grid-container-nested">
-					<h1 class="grid-width-60">
-						Toolbar Configurator
-						<a href="#help-content" type="button" title="Configurator help" id="help" class="button-a button-a-background button-a-no-text icon-pos-left icon-question-mark">Help</a>
-					</h1>
-
-					<div class="grid-width-40 grid-switch-magic">
-						<div class="switch">
-							<span class="balloon-a balloon-a-se">Select configurator type</span>
-							<input type="radio" name="radio" data-num="1" id="radio-basic" />
-							<input type="radio" name="radio" data-num="2" id="radio-advanced" />
-							<label data-for="1" for="radio-basic">Basic</label>
-							<span class="switch-inner">
-								<span class="handler"></span>
-							</span>
-							<label data-for="2" for="radio-advanced">Advanced</label>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="adjoined-bottom">
-		<div class="grid-container">
-			<div class="grid-width-100">
-				<div class="editors-container">
-					<div id="editor-basic"></div>
-					<div id="editor-advanced"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="grid-container configurator">
-		<div class="content grid-width-100">
-			<div class="configurator">
-				<div>
-					<div id="toolbarModifierWrapper"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div id="help-content">
-		<div class="grid-container">
-			<div class="grid-width-100">
-				<h2>What Am I Doing Here?</h2>
-
-				<div class="grid-container grid-container-nested">
-					<div class="basic">
-						<div class="grid-width-50">
-							<p>Arrange <a href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-toolbarGroups">toolbar groups</a>, toggle <a href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-removeButtons">button visibility</a> according to your needs and get your toolbar configuration.</p>
-							<p>You can replace the content of the <a href="../../config.js"><code>config.js</code></a> file with the generated configuration. If you already set some configuration options you will need to merge both configurations.</p>
-						</div>
-						<div class="grid-width-50">
-							<p>Read more about different ways of <a href="http://docs.ckeditor.com/#!/guide/dev_configuration">setting configuration</a> and do not forget about <strong>clearing browser cache</strong>.</p>
-							<p>Arranging toolbar groups is the recommended way of configuring the toolbar, but if you need more freedom you can use the <a href="#advanced">advanced configurator</a>.</p>
-						</div>
-					</div>
-					<div class="advanced" style="display: none;">
-						<div class="grid-width-50">
-							<p>With this code editor you can edit your <a href="http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-toolbar">toolbar configuration</a> live.</p>
-							<p>You can replace the content of the <a href="../../config.js"><code>config.js</code></a> file with the generated configuration. If you already set some configuration options you will need to merge both configurations.</p>
-						</div>
-						<div class="grid-width-50">
-							<p>Read more about different ways of <a href="http://docs.ckeditor.com/#!/guide/dev_configuration">setting configuration</a> and do not forget about <strong>clearing browser cache</strong>.</p>
-						</div>
-					</div>
-				</div>
-
-				<p class="grid-container grid-container-nested">
-					<button type="button" class="help-content-close grid-width-100 button-a button-a-background">Got it. Let's play!</button>
-				</p>
-			</div>
-		</div>
-	</div>
-</main>
-
-<footer class="footer-a grid-container">
-	<p class="grid-width-100">
-		CKEditor &ndash; The text editor for the Internet &ndash; <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
-	</p>
-	<p class="grid-width-100" id="copy">
-		Copyright &copy; 2003-2017, <a class="samples" href="http://cksource.com/">CKSource</a> &ndash; Frederico Knabben. All rights reserved.
-	</p>
-</footer>
-
-<script src="lib/codemirror/codemirror.js"></script>
-<script src="lib/codemirror/javascript.js"></script>
-<script src="lib/codemirror/show-hint.js"></script>
-
-<script src="js/fulltoolbareditor.js"></script>
-<script src="js/abstracttoolbarmodifier.js"></script>
-<script src="js/toolbarmodifier.js"></script>
-<script src="js/toolbartextmodifier.js"></script>
-<script src="../js/sf.js"></script>
-
-<script>
-	( function() {
-		'use strict';
-
-		var mode = ( window.location.hash.substr( 1 ) === 'advanced' ) ? 'advanced' : 'basic',
-			configuratorSection = CKEDITOR.document.findOne( 'main > .grid-container.configurator' ),
-			basicInstruction = CKEDITOR.document.findOne( '#help-content .basic' ),
-			advancedInstruction = CKEDITOR.document.findOne( '#help-content .advanced' ),
-
-			// Configurator mode switcher.
-			modeSwitchBasic = CKEDITOR.document.getById( 'radio-basic' ),
-			modeSwitchAdvanced = CKEDITOR.document.getById( 'radio-advanced' );
-
-		// Initial setup
-		function updateSwitcher() {
-			if ( mode === 'advanced' ) {
-				modeSwitchAdvanced.$.checked = true;
-			} else {
-				modeSwitchBasic.$.checked = true;
-			}
-		}
-
-		updateSwitcher();
-
-		CKEDITOR.document.getWindow().on( 'hashchange', function( e ) {
-			var hash = window.location.hash.substr( 1 );
-			if ( !( hash === 'advanced' || hash === 'basic' ) ) {
-				return;
-			}
-			mode = hash;
-			onToolbarsDone( mode );
-		} );
-
-		CKEDITOR.document.getWindow().on( 'resize', function() {
-			updateToolbar( ( mode === 'basic' ? toolbarModifier : toolbarTextModifier )[ 'editorInstance' ] );
-		} );
-
-		function onRefresh( modifier ) {
-			modifier = modifier || this;
-
-			if ( mode === 'basic' && modifier instanceof ToolbarConfigurator.ToolbarTextModifier ) {
-				return;
-			}
-
-			// CodeMirror container becomes visible, so we need to refresh and to avoid rendering problems.
-			if ( mode === 'advanced' && modifier instanceof ToolbarConfigurator.ToolbarTextModifier ) {
-				modifier.codeContainer.refresh();
-			}
-
-			updateToolbar( modifier.editorInstance );
-		}
-
-		function updateToolbar( editor ) {
-			var editorContainer = editor.container;
-
-			// Not always editor is loaded.
-			if ( !editorContainer ) {
-				return;
-			}
-
-			var displayStyle = editorContainer.getStyle( 'display' );
-
-			editorContainer.setStyle( 'display', 'block' );
-
-			var newHeight = editorContainer.getSize( 'height' );
-
-			var newMarginTop = parseInt( editorContainer.getComputedStyle( 'margin-top' ), 10 );
-			newMarginTop = ( isNaN( newMarginTop ) ? 0 : Number( newMarginTop ) );
-
-			var newMarginBottom = parseInt( editorContainer.getComputedStyle( 'margin-bottom' ), 10 );
-			newMarginBottom = ( isNaN( newMarginBottom ) ? 0 : Number( newMarginBottom ) );
-
-			var result = newHeight + newMarginTop + newMarginBottom;
-
-			editorContainer.setStyle( 'display', displayStyle );
-
-			editor.container.getAscendant( 'div' ).setStyle( 'height', result + 'px' );
-		}
-
-		var toolbarModifier = new ToolbarConfigurator.ToolbarModifier( 'editor-basic' );
-
-		var done = 0;
-		toolbarModifier.init( onToolbarInit );
-		toolbarModifier.onRefresh = onRefresh;
-
-		CKEDITOR.document.getById( 'toolbarModifierWrapper' ).append( toolbarModifier.mainContainer );
-
-		var toolbarTextModifier = new ToolbarConfigurator.ToolbarTextModifier( 'editor-advanced' );
-		toolbarTextModifier.init( onToolbarInit );
-		toolbarTextModifier.onRefresh = onRefresh;
-
-		function onToolbarInit() {
-			if ( ++done === 2 ) {
-				onToolbarsDone();
-
-				positionSticky.watch( CKEDITOR.document.findOne( '.toolbar' ), function() {
-					return mode === 'advanced';
-				} );
-			}
-		}
-
-		function onToolbarsDone() {
-			if ( mode === 'basic' ) {
-				toggleModeBasic( false );
-			} else {
-				toggleModeAdvanced( false );
-			}
-
-			updateSwitcher();
-
-			setTimeout( function() {
-				CKEDITOR.document.findOne( '.editors-container' ).addClass( 'active' );
-				CKEDITOR.document.findOne( '#toolbarModifierWrapper' ).addClass( 'active' );
-			}, 200 );
-		}
-
-		CKEDITOR.document.getById( 'toolbarModifierWrapper' ).append( toolbarTextModifier.mainContainer );
-
-		function toogleModeSwitch( onElement, offElement, onModifier, offModifier ) {
-			onElement.addClass( 'fancy-button-active' );
-			offElement.removeClass( 'fancy-button-active' );
-
-			onModifier.showUI();
-			offModifier.hideUI();
-		}
-
-		function toggleModeBasic( callOnRefresh ) {
-			callOnRefresh = ( callOnRefresh !== false );
-			mode = 'basic';
-			window.location.hash = '#basic';
-			toogleModeSwitch( modeSwitchBasic, modeSwitchAdvanced, toolbarModifier, toolbarTextModifier );
-
-			configuratorSection.removeClass( 'freed-width' );
-			basicInstruction.show();
-			advancedInstruction.hide();
-
-			callOnRefresh && onRefresh( toolbarModifier );
-		}
-
-		function toggleModeAdvanced( callOnRefresh ) {
-			callOnRefresh = ( callOnRefresh !== false );
-			mode = 'advanced';
-			window.location.hash = '#advanced';
-			toogleModeSwitch( modeSwitchAdvanced, modeSwitchBasic, toolbarTextModifier, toolbarModifier );
-
-			configuratorSection.addClass( 'freed-width' );
-			advancedInstruction.show();
-			basicInstruction.hide();
-
-			callOnRefresh && onRefresh( toolbarTextModifier );
-		}
-
-		modeSwitchBasic.on( 'click', toggleModeBasic );
-		modeSwitchAdvanced.on( 'click', toggleModeAdvanced );
-
-		//
-		// Position:sticky for the toolbar.
-		//
-
-		// Will make elements behave like they were styled with position:sticky.
-		var positionSticky = {
-			// Store object: {
-			// 		element: CKEDITOR.dom.element, // Element which will float.
-			// 		placeholder: CKEDITOR.dom.element, // Placeholder which is place to prevent page bounce.
-			// 		isFixed: boolean // Whether element float now.
-			// }
-			watched: [],
-
-			active: [],
-
-			staticContainer: null,
-
-			init: function() {
-				var element = CKEDITOR.dom.element.createFromHtml(
-					'<div class="staticContainer">' +
-						'<div class="grid-container" >' +
-							'<div class="grid-width-100">' +
-								'<div class="inner"></div>' +
-							'</div>' +
-						'</div>' +
-					'</div>' );
-
-				this.staticContainer = element.findOne( '.inner' );
-
-				CKEDITOR.document.getBody().append( element );
-			},
-
-			watch: function( element, preventFunc ) {
-				this.watched.push( {
-					element: element,
-					placeholder: new CKEDITOR.dom.element( 'div' ),
-					isFixed: false,
-					preventFunc: preventFunc
-				} );
-			},
-
-			checkAll: function() {
-				for ( var i = 0; i < this.watched.length; i++ ) {
-					this.check( this.watched[ i ] );
-				}
-			},
-
-			check: function( element ) {
-				var isFixed = element.isFixed;
-				var shouldBeFixed = this.shouldBeFixed( element );
-
-				// Nothing to be done.
-				if ( isFixed === shouldBeFixed ) {
-					return;
-				}
-
-				var placeholder = element.placeholder;
-
-				if ( isFixed ) {
-					// Unfixing.
-
-					element.element.insertBefore( placeholder );
-					placeholder.remove();
-
-					element.element.removeStyle( 'margin' );
-
-					this.active.splice( CKEDITOR.tools.indexOf( this.active, element ), 1 );
-
-				} else {
-					// Fixing.
-					placeholder.setStyle( 'width', element.element.getSize( 'width' ) + 'px' );
-					placeholder.setStyle( 'height', element.element.getSize( 'height' ) + 'px' );
-					placeholder.setStyle( 'margin-bottom', element.element.getComputedStyle( 'margin-bottom' ) );
-					placeholder.setStyle( 'display', element.element.getComputedStyle( 'display' ) );
-					placeholder.insertAfter( element.element );
-
-					this.staticContainer.append( element.element );
-
-					this.active.push( element );
-				}
-
-				element.isFixed = !element.isFixed;
-			},
-
-			shouldBeFixed: function( element ) {
-				if ( element.preventFunc && element.preventFunc() ) {
-					return false;
-				}
-
-				// If element is already fixed we are checking it's placeholder.
-				var related = ( element.isFixed ? element.placeholder : element.element ),
-					clientRect = related.$.getBoundingClientRect(),
-					staticHeight = this.staticContainer.getSize('height' ),
-					elemHeight = element.element.getSize( 'height' );
-
-				if ( element.isFixed ) {
-					return ( clientRect.top + elemHeight < staticHeight );
-				} else {
-					return ( clientRect.top < staticHeight );
-				}
-			}
-		};
-
-		positionSticky.init();
-
-		CKEDITOR.document.getWindow().on( 'scroll',
-			new CKEDITOR.tools.eventsBuffer( 100, positionSticky.checkAll, positionSticky ).input
-		);
-
-		// Make the toolbar sticky.
-		positionSticky.watch( CKEDITOR.document.findOne( '.editors-container' ) );
-
-		// Help button and help-content.
-		( function() {
-			var helpButton = CKEDITOR.document.getById( 'help' ),
-				helpContent = CKEDITOR.document.getById( 'help-content' );
-
-			// Don't show help button on IE8 because it's unsupported by Pico Modal.
-			if ( CKEDITOR.env.ie && CKEDITOR.env.version == 8 ) {
-				helpButton.hide();
-			} else {
-				// Display help modal when the button is clicked.
-				helpButton.on( 'click', function( evt ) {
-					SF.modal( {
-						// Clone modal content from DOM.
-						content: helpContent.getHtml(),
-
-						afterCreate: function( modal ) {
-							// Enable modal content button to close the modal.
-							new CKEDITOR.dom.element( modal.modalElem() ).findOne( '.help-content-close' ).once( 'click', modal.close );
-						}
-					} ).show();
-				} );
-			}
-		} )();
-	} )();
-</script>
-</body>
-</html>
diff --git a/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
deleted file mode 100644
index 65f0b8753..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"function"!=typeof Object.create&&function(){var a=function(){};Object.create=function(b){if(1<arguments.length)throw Error("Second argument not supported");if(null===b)throw Error("Cannot set a null [[Prototype]]");if("object"!=typeof b)throw TypeError("Argument must be an object");a.prototype=b;return new a}}();
-CKEDITOR.plugins.add("toolbarconfiguratorarea",{afterInit:function(a){a.addMode("wysiwyg",function(b){var c=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_wysiwyg_div cke_reset" hidefocus\x3d"true"\x3e\x3c/div\x3e');a.ui.space("contents").append(c);c=a.editable(c);c.detach=CKEDITOR.tools.override(c.detach,function(b){return function(){b.apply(this,arguments);this.remove()}});a.setData(a.getData(1),b);a.fire("contentDom")});a.dataProcessor.toHtml=function(b){return b};a.dataProcessor.toDataFormat=
-function(b){return b}}});Object.keys||(Object.keys=function(){var a=Object.prototype.hasOwnProperty,b=!{toString:null}.propertyIsEnumerable("toString"),c="toString toLocaleString valueOf hasOwnProperty isPrototypeOf propertyIsEnumerable constructor".split(" "),e=c.length;return function(d){if("object"!==typeof d&&("function"!==typeof d||null===d))throw new TypeError("Object.keys called on non-object");var g=[],f;for(f in d)a.call(d,f)&&g.push(f);if(b)for(f=0;f<e;f++)a.call(d,c[f])&&g.push(c[f]);return g}}());
-(function(){function a(b,c){this.cfg=c||{};this.hidden=!1;this.editorId=b;this.fullToolbarEditor=new ToolbarConfigurator.FullToolbarEditor;this.actualConfig=this.originalConfig=this.mainContainer=null;this.isEditableVisible=this.waitForReady=!1;this.toolbarContainer=null;this.toolbarButtons=[]}ToolbarConfigurator.AbstractToolbarModifier=a;a.prototype.setConfig=function(b){this._onInit(void 0,b,!0)};a.prototype.init=function(b){var c=this;this.mainContainer=new CKEDITOR.dom.element("div");if(null!==
-this.fullToolbarEditor.editorInstance)throw"Only one instance of ToolbarModifier is allowed";this.editorInstance||this._createEditor(!1);this.editorInstance.once("loaded",function(){c.fullToolbarEditor.init(function(){c._onInit(b);if("function"==typeof c.onRefresh)c.onRefresh()},c.editorInstance.config)});return this.mainContainer};a.prototype._onInit=function(b,c){this.originalConfig=this.editorInstance.config;this.actualConfig=c?JSON.parse(c):JSON.parse(JSON.stringify(this.originalConfig));if(!this.actualConfig.toolbarGroups&&
-!this.actualConfig.toolbar){for(var a=this.actualConfig,d=this.editorInstance.toolbar,g=[],f=d.length,k=0;k<f;k++){var h=d[k];"string"==typeof h?g.push(h):g.push({name:h.name,groups:h.groups?h.groups.slice():[]})}a.toolbarGroups=g}"function"===typeof b&&b(this.mainContainer)};a.prototype._createModifier=function(){this.mainContainer.addClass("unselectable");this.modifyContainer&&this.modifyContainer.remove();this.modifyContainer=new CKEDITOR.dom.element("div");this.modifyContainer.addClass("toolbarModifier");
-this.mainContainer.append(this.modifyContainer);return this.mainContainer};a.prototype.getEditableArea=function(){return this.editorInstance.container.findOne("#"+this.editorInstance.id+"_contents")};a.prototype._hideEditable=function(){var b=this.getEditableArea();this.isEditableVisible=!1;this.lastEditableAreaHeight=b.getStyle("height");b.setStyle("height","0")};a.prototype._showEditable=function(){this.isEditableVisible=!0;this.getEditableArea().setStyle("height",this.lastEditableAreaHeight||"auto")};
-a.prototype._toggleEditable=function(){this.isEditableVisible?this._hideEditable():this._showEditable()};a.prototype._refreshEditor=function(){function b(){c.editorInstance.destroy();c._createEditor(!0,c.getActualConfig());c.waitForReady=!1}var c=this,a=this.editorInstance.status;this.waitForReady||("unloaded"==a||"loaded"==a?(this.waitForReady=!0,this.editorInstance.once("instanceReady",function(){b()},this)):b())};a.prototype._createEditor=function(b,c){function e(){}var d=this;this.editorInstance=
-CKEDITOR.replace(this.editorId);this.editorInstance.on("configLoaded",function(){var b=d.editorInstance.config;c&&CKEDITOR.tools.extend(b,c,!0);a.extendPluginsConfig(b)});this.editorInstance.on("uiSpace",function(b){"top"!=b.data.space&&b.stop()},null,null,-999);this.editorInstance.once("loaded",function(){var c=d.editorInstance.ui.instances,a;for(a in c)c[a]&&(c[a].click=e,c[a].onClick=e);d.isEditableVisible||d._hideEditable();d.currentActive&&d.currentActive.name&&d._highlightGroup(d.currentActive.name);
-d.hidden?d.hideUI():d.showUI();if(b&&"function"===typeof d.onRefresh)d.onRefresh()})};a.prototype.getActualConfig=function(){return JSON.parse(JSON.stringify(this.actualConfig))};a.prototype._createToolbar=function(){if(this.toolbarButtons.length){this.toolbarContainer=new CKEDITOR.dom.element("div");this.toolbarContainer.addClass("toolbar");for(var b=this.toolbarButtons.length,c=0;c<b;c+=1)this._createToolbarBtn(this.toolbarButtons[c])}};a.prototype._createToolbarBtn=function(b){var c=ToolbarConfigurator.FullToolbarEditor.createButton("string"===
-typeof b.text?b.text:b.text.inactive,b.cssClass);this.toolbarContainer.append(c);c.data("group",b.group);c.addClass(b.position);c.on("click",function(){b.clickCallback.call(this,c,b)},this);return c};a.prototype._fixGroups=function(b){b=b.toolbarGroups||[];for(var c=b.length,a=0;a<c;a+=1){var d=b[a];"/"==d?(d=b[a]={},d.type="separator",d.name="separator"+CKEDITOR.tools.getNextNumber()):(d.groups=d.groups||[],-1==CKEDITOR.tools.indexOf(d.groups,d.name)&&(this.editorInstance.ui.addToolbarGroup(d.name,
-d.groups[d.groups.length-1],d.name),d.groups.push(d.name)),this._fixSubgroups(d))}};a.prototype._fixSubgroups=function(b){b=b.groups;for(var c=b.length,a=0;a<c;a+=1){var d=b[a];b[a]={name:d,totalBtns:ToolbarConfigurator.ToolbarModifier.getTotalSubGroupButtonsNumber(d,this.fullToolbarEditor)}}};a.stringifyJSONintoOneLine=function(b,a){a=a||{};var e=JSON.stringify(b,null,""),e=e.replace(/\n/g,"");a.addSpaces&&(e=e.replace(/(\{|:|,|\[|\])/g,function(a){return a+" "}),e=e.replace(/(\])/g,function(a){return" "+
-a}));a.noQuotesOnKey&&(e=e.replace(/"(\w*)":/g,function(a,b){return b+":"}));a.singleQuotes&&(e=e.replace(/\"/g,"'"));return e};a.prototype.hideUI=function(){this.hidden=!0;this.mainContainer.hide();this.editorInstance.container&&this.editorInstance.container.hide()};a.prototype.showUI=function(){this.hidden=!1;this.mainContainer.show();this.editorInstance.container&&this.editorInstance.container.show()};a.extendPluginsConfig=function(a){var c=a.extraPlugins;a.extraPlugins=(c?c+",":"")+"toolbarconfiguratorarea"}})();
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js b/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
deleted file mode 100644
index dc19beedf..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-window.ToolbarConfigurator={};
-(function(){function e(){this.instanceid="fte"+CKEDITOR.tools.getNextId();this.textarea=new CKEDITOR.dom.element("textarea");this.textarea.setAttributes({id:this.instanceid,name:this.instanceid,contentEditable:!0});this.editorInstance=this.buttons=null}ToolbarConfigurator.FullToolbarEditor=e;e.prototype.init=function(b){var a=this;document.body.appendChild(this.textarea.$);CKEDITOR.replace(this.instanceid);this.editorInstance=CKEDITOR.instances[this.instanceid];this.editorInstance.once("configLoaded",function(d){var c=
-d.editor.config;delete c.removeButtons;delete c.toolbarGroups;delete c.toolbar;ToolbarConfigurator.AbstractToolbarModifier.extendPluginsConfig(c);d.editor.once("loaded",function(){a.buttons=e.toolbarToButtons(a.editorInstance.toolbar);a.buttonsByGroup=e.groupButtons(a.buttons);a.buttonNamesByGroup=a.groupButtonNamesByGroup(a.buttons);d.editor.container.hide();"function"===typeof b&&b(a.buttons)})})};e.prototype.groupButtonNamesByGroup=function(b){var a=this;b=e.groupButtons(b);for(var d in b)b[d]=
-e.map(b[d],function(b){return a.getCamelCasedButtonName(b.name)});return b};e.prototype.getGroupByName=function(b){for(var a=this.editorInstance.config.toolbarGroups||this.getFullToolbarGroupsConfig(),d=a.length,c=0;c<d;c+=1)if(a[c].name===b)return a[c];return null};e.prototype.getCamelCasedButtonName=function(b){var a=this.editorInstance.ui.items,d;for(d in a)if(a[d].name==b)return d;return null};e.prototype.getFullToolbarGroupsConfig=function(b){b=!0===b?!0:!1;for(var a=[],d=this.editorInstance.toolbar,
-c=d.length,f=0;f<c;f+=1){var e=d[f],g={};"string"!=typeof e.name?b&&a.push("/"):(g.name=e.name,e.groups&&(g.groups=Array.prototype.slice.call(e.groups)),a.push(g))}return a};e.filter=function(b,a){for(var d=b&&b.length?b.length:0,c=[],f=0;f<d;f+=1)a(b[f])&&c.push(b[f]);return c};e.map=function(b,a){var d;if(CKEDITOR.tools.isArray(b)){d=[];for(var c=b.length,f=0;f<c;f+=1)d.push(a(b[f]))}else for(c in d={},b)d[c]=a(b[c]);return d};e.groupButtons=function(b){for(var a={},d=b.length,c=0;c<d;c+=1){var f=
-b[c],e=f.toolbar.split(",")[0];a[e]=a[e]||[];a[e].push(f)}return a};e.toolbarToButtons=function(b){for(var a=[],d=b.length,c=0;c<d;c+=1)"object"==typeof b[c]&&(a=a.concat(e.groupToButtons(b[c])));return a};e.createToolbarButton=function(b){var a=new CKEDITOR.dom.element("a"),d=e.createIcon(b.name,b.icon,b.command);a.setStyle("float","none");a.addClass("cke_"+("rtl"==CKEDITOR.lang.dir?"rtl":"ltr"));if(b instanceof CKEDITOR.ui.button)a.addClass("cke_button"),a.addClass("cke_toolgroup"),a.append(d);
-else if(CKEDITOR.ui.richCombo&&b instanceof CKEDITOR.ui.richCombo){var d=new CKEDITOR.dom.element("span"),c=new CKEDITOR.dom.element("span"),f=new CKEDITOR.dom.element("span");a.addClass("cke_combo_button");d.addClass("cke_combo_text");d.addClass("cke_combo_inlinelabel");d.setText(b.label);c.addClass("cke_combo_open");f.addClass("cke_combo_arrow");c.append(f);a.append(d);a.append(c)}return a};e.createIcon=function(b,a,d){var c=CKEDITOR.skin.getIconStyle(b,"rtl"==CKEDITOR.lang.dir),c=(c=c||CKEDITOR.skin.getIconStyle(a,
-"rtl"==CKEDITOR.lang.dir))||CKEDITOR.skin.getIconStyle(d,"rtl"==CKEDITOR.lang.dir);a=new CKEDITOR.dom.element("span");a.addClass("cke_button_icon");a.addClass("cke_button__"+b+"_icon");a.setAttribute("style",c);a.setStyle("float","none");return a};e.createButton=function(b,a){var d=new CKEDITOR.dom.element("button");d.addClass("button-a");d.setAttribute("type","button");if("string"==typeof a){a=a.split(" ");for(var c=a.length;c--;)d.addClass(a[c])}d.setHtml(b);return d};e.groupToButtons=function(b){for(var a=
-[],d=(b=b.items)?b.length:0,c=0;c<d;c+=1){var f=b[c];if(f instanceof CKEDITOR.ui.button||CKEDITOR.ui.richCombo&&f instanceof CKEDITOR.ui.richCombo)f.$=e.createToolbarButton(f),a.push(f)}return a}})();
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js b/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
deleted file mode 100644
index 973181837..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
+++ /dev/null
@@ -1,33 +0,0 @@
-(function(){function d(a,b){l.call(this,a,b);this.actualConfig=this.originalConfig=this.removedButtons=null;this.emptyVisible=!1;this.state="edit";this.toolbarButtons=[{text:{active:"Hide empty toolbar groups",inactive:"Show empty toolbar groups"},group:"edit",position:"left",cssClass:"button-a-soft",clickCallback:function(a,b){a[a.hasClass("button-a-background")?"removeClass":"addClass"]("button-a-background");this._toggleVisibilityEmptyElements();this.emptyVisible?a.setText(b.text.active):a.setText(b.text.inactive)}},
-{text:"Add row separator",group:"edit",position:"left",cssClass:"button-a-soft",clickCallback:function(){this._addSeparator()}},{text:"Select config",group:"config",position:"left",cssClass:"button-a-soft",clickCallback:function(){this.configContainer.findOne("textarea").$.select()}},{text:"Back to configurator",group:"config",position:"right",cssClass:"button-a-background",clickCallback:function(){if("paste"===this.state){var a=this.configContainer.findOne("textarea").getValue();(a=d.evaluateToolbarGroupsConfig(a))?
-this.setConfig(a):alert("Your pasted config is wrong.")}this.state="edit";this._showConfigurationTool();this.showToolbarBtnsByGroupName(this.state)}},{text:'Get toolbar \x3cspan class\x3d"highlight"\x3econfig\x3c/span\x3e',group:"edit",position:"right",cssClass:"button-a-background icon-pos-left icon-download",clickCallback:function(){this.state="config";this._showConfig();this.showToolbarBtnsByGroupName(this.state)}}];this.cachedActiveElement=null}var l=ToolbarConfigurator.AbstractToolbarModifier;
-ToolbarConfigurator.ToolbarModifier=d;d.prototype=Object.create(ToolbarConfigurator.AbstractToolbarModifier.prototype);d.prototype.getActualConfig=function(){var a=l.prototype.getActualConfig.call(this);if(a.toolbarGroups)for(var b=a.toolbarGroups.length,c=0;c<b;c+=1)a.toolbarGroups[c]=d.parseGroupToConfigValue(a.toolbarGroups[c]);return a};d.prototype._onInit=function(a,b,c){c=!0===c;l.prototype._onInit.call(this,void 0,b);this.removedButtons=[];c?this.removedButtons=this.actualConfig.removeButtons?
-this.actualConfig.removeButtons.split(","):[]:"removeButtons"in this.originalConfig?this.removedButtons=this.originalConfig.removeButtons?this.originalConfig.removeButtons.split(","):[]:(this.originalConfig.removeButtons="",this.removedButtons=[]);this.actualConfig.toolbarGroups||(this.actualConfig.toolbarGroups=this.fullToolbarEditor.getFullToolbarGroupsConfig());this._fixGroups(this.actualConfig);this._calculateTotalBtns();this._createModifier();this._refreshMoveBtnsAvalibility();this._refreshBtnTabIndexes();
-"function"===typeof a&&a(this.mainContainer)};d.prototype._showConfigurationTool=function(){this.configContainer.addClass("hidden");this.modifyContainer.removeClass("hidden")};d.prototype._showConfig=function(){var a=this.getActualConfig(),b,c;if(a.toolbarGroups){b=a.toolbarGroups;for(var e=this.cfg.trimEmptyGroups,f=[],g=b.length,m=0;m<g;m++){var h=b[m];if("/"===h)f.push("'/'");else{if(e)for(var k=h.groups.length;k--;)0===d.getTotalSubGroupButtonsNumber(h.groups[k],this.fullToolbarEditor)&&h.groups.splice(k,
-1);e&&0===h.groups.length||f.push(l.stringifyJSONintoOneLine(h,{addSpaces:!0,noQuotesOnKey:!0,singleQuotes:!0}))}}b="\n\t\t"+f.join(",\n\t\t")}a.removeButtons&&(c=a.removeButtons);a=['\x3ctextarea class\x3d"configCode" readonly\x3eCKEDITOR.editorConfig \x3d function( config ) {\n',b?"\tconfig.toolbarGroups \x3d ["+b+"\n\t];":"",c?"\n\n":"",c?"\tconfig.removeButtons \x3d '"+c+"';":"","\n};\x3c/textarea\x3e"].join("");this.modifyContainer.addClass("hidden");this.configContainer.removeClass("hidden");
-this.configContainer.setHtml(a)};d.prototype._toggleVisibilityEmptyElements=function(){this.modifyContainer.hasClass("empty-visible")?(this.modifyContainer.removeClass("empty-visible"),this.emptyVisible=!1):(this.modifyContainer.addClass("empty-visible"),this.emptyVisible=!0);this._refreshMoveBtnsAvalibility()};d.prototype._createModifier=function(){function a(){b._highlightGroup(this.data("name"))}var b=this;l.prototype._createModifier.call(this);this.modifyContainer.setHtml(this._toolbarConfigToListString());
-var c=this.modifyContainer.find('li[data-type\x3d"group"]');this.modifyContainer.on("mouseleave",function(){this._dehighlightActiveToolGroup()},this);for(var e=c.count(),f=0;f<e;f+=1)c.getItem(f).on("mouseenter",a);CKEDITOR.document.on("keypress",function(a){a=a.data.$.keyCode;a=32===a||13===a;var c=new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);c.getAscendant(function(a){return a.$===b.mainContainer.$})&&a&&"button"===c.data("type")&&c.findOne("input").$.click()});this.modifyContainer.on("click",
-function(a){var c=a.data.$,e=new CKEDITOR.dom.element(c.target||c.srcElement);if(a=d.getGroupOrSeparatorLiAncestor(e)){b.cachedActiveElement=document.activeElement;if(e.$ instanceof HTMLInputElement)b._handleCheckboxClicked(e);else if(e.$ instanceof HTMLButtonElement&&(c.preventDefault?c.preventDefault():c.returnValue=!1,(c=b._handleAnchorClicked(e.$))&&"remove"==c.action))return;c=a.data("type");a=a.data("name");b._setActiveElement(c,a);b.cachedActiveElement&&b.cachedActiveElement.focus()}});this.toolbarContainer||
-(this._createToolbar(),this.toolbarContainer.insertBefore(this.mainContainer.getChildren().getItem(0)));this.showToolbarBtnsByGroupName("edit");this.configContainer||(this.configContainer=new CKEDITOR.dom.element("div"),this.configContainer.addClass("configContainer"),this.configContainer.addClass("hidden"),this.mainContainer.append(this.configContainer));return this.mainContainer};d.prototype.showToolbarBtnsByGroupName=function(a){if(this.toolbarContainer)for(var b=this.toolbarContainer.find("button"),
-c=b.count(),e=0;e<c;e+=1){var d=b.getItem(e);d.data("group")==a?d.removeClass("hidden"):d.addClass("hidden")}};d.parseGroupToConfigValue=function(a){if("separator"==a.type)return"/";var b=a.groups,c=b.length;delete a.totalBtns;for(var e=0;e<c;e+=1)b[e]=b[e].name;return a};d.getGroupOrSeparatorLiAncestor=function(a){return a.$ instanceof HTMLLIElement&&"group"==a.data("type")?a:d.getFirstAncestor(a,function(a){a=a.data("type");return"group"==a||"separator"==a})};d.prototype._setActiveElement=function(a,
-b){this.currentActive&&this.currentActive.elem.removeClass("active");if(null===a)this._dehighlightActiveToolGroup(),this.currentActive=null;else{var c=this.mainContainer.findOne('ul[data-type\x3dtable-body] li[data-type\x3d"'+a+'"][data-name\x3d"'+b+'"]');c.addClass("active");this.currentActive={type:a,name:b,elem:c};"group"==a&&this._highlightGroup(b);"separator"==a&&this._dehighlightActiveToolGroup()}};d.prototype.getActiveToolGroup=function(){return this.editorInstance.container?this.editorInstance.container.findOne(".cke_toolgroup.active, .cke_toolbar.active"):
-null};d.prototype._dehighlightActiveToolGroup=function(){var a=this.getActiveToolGroup();a&&a.removeClass("active");this.editorInstance.container&&this.editorInstance.container.removeClass("some-toolbar-active")};d.prototype._highlightGroup=function(a){this.editorInstance.container&&(a=this.getFirstEnabledButtonInGroup(a),a=this.editorInstance.container.findOne(".cke_button__"+a+", .cke_combo__"+a),this._dehighlightActiveToolGroup(),this.editorInstance.container&&this.editorInstance.container.addClass("some-toolbar-active"),
-a&&(a=d.getFirstAncestor(a,function(a){return a.hasClass("cke_toolbar")}))&&a.addClass("active"))};d.prototype.getFirstEnabledButtonInGroup=function(a){var b=this.actualConfig.toolbarGroups;a=this.getGroupIndex(a);b=b[a];if(-1===a)return null;a=b.groups?b.groups.length:0;for(var c=0;c<a;c+=1){var e=this.getFirstEnabledButtonInSubgroup(b.groups[c].name);if(e)return e}return null};d.prototype.getFirstEnabledButtonInSubgroup=function(a){for(var b=(a=this.fullToolbarEditor.buttonsByGroup[a])?a.length:
-0,c=0;c<b;c+=1){var e=a[c].name;if(!this.isButtonRemoved(e))return e}return null};d.prototype._handleCheckboxClicked=function(a){var b=a.getAscendant("li").data("name");a.$.checked?this._removeButtonFromRemoved(b):this._addButtonToRemoved(b)};d.prototype._handleAnchorClicked=function(a){a=new CKEDITOR.dom.element(a);var b=a.getAscendant("li"),c=b.getAscendant("ul"),e=b.data("type"),d=b.data("name"),g=a.data("direction"),m="up"===g?b.getPrevious():b.getNext(),h;if(a.hasClass("disabled"))return null;
-if(a.hasClass("remove"))return b.remove(),this._removeSeparator(b.data("name")),this._setActiveElement(null),{action:"remove"};if(!a.hasClass("move")||!m)return{action:null};if("group"===e||"separator"===e)h=this._moveGroup(g,d);"subgroup"===e&&(h=b.getAscendant("li").data("name"),h=this._moveSubgroup(g,h,d));"up"===g&&b.insertBefore(c.getChild(h));"down"===g&&b.insertAfter(c.getChild(h));for(var k;b="up"===g?b.getPrevious():b.getNext();)if(this.emptyVisible||!b.hasClass("empty")){k=b;break}k||(k=
-'[data-direction\x3d"'+("up"===g?"down":"up")+'"]',this.cachedActiveElement=a.getParent().findOne(k));this._refreshMoveBtnsAvalibility();this._refreshBtnTabIndexes();return{action:"move"}};d.prototype._refreshMoveBtnsAvalibility=function(){function a(a){var c=a.count();for(d=0;d<c;d+=1)b._disableElementsInList(a.getItem(d))}for(var b=this,c=this.mainContainer.find("ul[data-type\x3dtable-body] li \x3e p \x3e span \x3e button.move.disabled"),e=c.count(),d=0;d<e;d+=1)c.getItem(d).removeClass("disabled");
-a(this.mainContainer.find("ul[data-type\x3dtable-body]"));a(this.mainContainer.find("ul[data-type\x3dtable-body] \x3e li \x3e ul"))};d.prototype._refreshBtnTabIndexes=function(){for(var a=this.mainContainer.find('[data-tab\x3d"true"]'),b=a.count(),c=0;c<b;c++){var e=a.getItem(c),d=e.hasClass("disabled");e.setAttribute("tabindex",d?-1:c)}};d.prototype._disableElementsInList=function(a){function b(a){return!a.hasClass("empty")}if(a.getChildren().count()){var c;this.emptyVisible?(c=a.getFirst(),a=a.getLast()):
-(c=a.getFirst(b),a=a.getLast(b));if(c)var e=c.findOne('p button[data-direction\x3d"up"]');if(a)var d=a.findOne('p button[data-direction\x3d"down"]');e&&(e.addClass("disabled"),e.setAttribute("tabindex","-1"));d&&(d.addClass("disabled"),d.setAttribute("tabindex","-1"))}};d.prototype.getGroupIndex=function(a){for(var b=this.actualConfig.toolbarGroups,c=b.length,d=0;d<c;d+=1)if(b[d].name===a)return d;return-1};d.prototype._addSeparator=function(){var a=this._determineSeparatorToAddIndex(),b=d.createSeparatorLiteral(),
-c=CKEDITOR.dom.element.createFromHtml(d.getToolbarSeparatorString(b));this.actualConfig.toolbarGroups.splice(a,0,b);c.insertBefore(this.modifyContainer.findOne("ul[data-type\x3dtable-body]").getChild(a));this._setActiveElement("separator",b.name);this._refreshMoveBtnsAvalibility();this._refreshBtnTabIndexes();this._refreshEditor()};d.prototype._removeSeparator=function(a){var b=CKEDITOR.tools.indexOf(this.actualConfig.toolbarGroups,function(b){return"separator"==b.type&&b.name==a});this.actualConfig.toolbarGroups.splice(b,
-1);this._refreshMoveBtnsAvalibility();this._refreshBtnTabIndexes();this._refreshEditor()};d.prototype._determineSeparatorToAddIndex=function(){return this.currentActive?("group"==this.currentActive.elem.data("type")||"separator"==this.currentActive.elem.data("type")?this.currentActive.elem:this.currentActive.elem.getAscendant("li")).getIndex():0};d.prototype._moveElement=function(a,b,c){function e(a){return a.totalBtns||"separator"==a.type}c=this.emptyVisible?"down"==c?b+1:b-1:d.getFirstElementIndexWith(a,
-b,c,e);return d.moveTo(c-b,a,b)};d.prototype._moveGroup=function(a,b){var c=this.getGroupIndex(b),c=this._moveElement(this.actualConfig.toolbarGroups,c,a);this._refreshMoveBtnsAvalibility();this._refreshBtnTabIndexes();this._refreshEditor();return c};d.prototype._moveSubgroup=function(a,b,c){b=this.getGroupIndex(b);b=this.actualConfig.toolbarGroups[b];var d=CKEDITOR.tools.indexOf(b.groups,function(a){return a.name==c});a=this._moveElement(b.groups,d,a);this._refreshEditor();return a};d.prototype._calculateTotalBtns=
-function(){for(var a=this.actualConfig.toolbarGroups,b=a.length;b--;){var c=a[b],e=d.getTotalGroupButtonsNumber(c,this.fullToolbarEditor);"separator"!=c.type&&(c.totalBtns=e)}};d.prototype._addButtonToRemoved=function(a){if(-1!=CKEDITOR.tools.indexOf(this.removedButtons,a))throw"Button already added to removed";this.removedButtons.push(a);this.actualConfig.removeButtons=this.removedButtons.join(",");this._refreshEditor()};d.prototype._removeButtonFromRemoved=function(a){a=CKEDITOR.tools.indexOf(this.removedButtons,
-a);if(-1===a)throw"Trying to remove button from removed, but not found";this.removedButtons.splice(a,1);this.actualConfig.removeButtons=this.removedButtons.join(",");this._refreshEditor()};d.parseGroupToConfigValue=function(a){if("separator"==a.type)return"/";var b=a.groups,c=b.length;delete a.totalBtns;for(var d=0;d<c;d+=1)b[d]=b[d].name;return a};d.getGroupOrSeparatorLiAncestor=function(a){return a.$ instanceof HTMLLIElement&&"group"==a.data("type")?a:d.getFirstAncestor(a,function(a){a=a.data("type");
-return"group"==a||"separator"==a})};d.createSeparatorLiteral=function(){return{type:"separator",name:"separator"+CKEDITOR.tools.getNextNumber()}};d.prototype._toolbarConfigToListString=function(){for(var a=this.actualConfig.toolbarGroups||[],b='\x3cul data-type\x3d"table-body"\x3e',c=a.length,e=0;e<c;e+=1)var f=a[e],b="separator"===f.type?b+d.getToolbarSeparatorString(f):b+this._getToolbarGroupString(f);b+="\x3c/ul\x3e";return d.getToolbarHeaderString()+b};d.prototype._getToolbarGroupString=function(a){var b=
-a.groups,c;c=""+['\x3cli data-type\x3d"group" data-name\x3d"',a.name,'" ',a.totalBtns?"":'class\x3d"empty"',"\x3e"].join("");c+=d.getToolbarElementPreString(a)+"\x3cul\x3e";a=b.length;for(var e=0;e<a;e+=1){var f=b[e];c+=this._getToolbarSubgroupString(f,this.fullToolbarEditor.buttonsByGroup[f.name])}return c+"\x3c/ul\x3e\x3c/li\x3e"};d.getToolbarSeparatorString=function(a){return['\x3cli data-type\x3d"',a.type,'" data-name\x3d"',a.name,'"\x3e',d.getToolbarElementPreString("row separator"),"\x3c/li\x3e"].join("")};
-d.getToolbarHeaderString=function(){return'\x3cul data-type\x3d"table-header"\x3e\x3cli data-type\x3d"header"\x3e\x3cp\x3eToolbars\x3c/p\x3e\x3cul\x3e\x3cli\x3e\x3cp\x3eToolbar groups\x3c/p\x3e\x3cp\x3eToolbar group items\x3c/p\x3e\x3c/li\x3e\x3c/ul\x3e\x3c/li\x3e\x3c/ul\x3e'};d.getFirstAncestor=function(a,b){for(var c=a.getParents(),d=c.length;d--;)if(b(c[d]))return c[d];return null};d.getFirstElementIndexWith=function(a,b,c,d){for(;"up"===c?b--:++b<a.length;)if(d(a[b]))return b;return-1};d.moveTo=
-function(a,b,c){var d;-1!==c&&(d=b.splice(c,1)[0]);a=c+a;b.splice(a,0,d);return a};d.getTotalSubGroupButtonsNumber=function(a,b){var c=b.buttonsByGroup["string"==typeof a?a:a.name];return c?c.length:0};d.getTotalGroupButtonsNumber=function(a,b){for(var c=0,e=a.groups,f=e?e.length:0,g=0;g<f;g+=1)c+=d.getTotalSubGroupButtonsNumber(e[g],b);return c};d.prototype._getToolbarSubgroupString=function(a,b){var c;c=""+['\x3cli data-type\x3d"subgroup" data-name\x3d"',a.name,'" ',a.totalBtns?"":'class\x3d"empty" ',
-"\x3e"].join("");c+=d.getToolbarElementPreString(a.name);c+="\x3cul\x3e";for(var e=b?b.length:0,f=0;f<e;f+=1)c+=this.getButtonString(b[f]);return c+="\x3c/ul\x3e\x3c/li\x3e"};d.prototype._getConfigButtonName=function(a){var b=this.fullToolbarEditor.editorInstance.ui.items,c;for(c in b)if(b[c].name==a)return c;return null};d.prototype.isButtonRemoved=function(a){return-1!=CKEDITOR.tools.indexOf(this.removedButtons,this._getConfigButtonName(a))};d.prototype.getButtonString=function(a){var b=this.isButtonRemoved(a.name)?
-"":'checked\x3d"checked"';return['\x3cli data-tab\x3d"true" data-type\x3d"button" data-name\x3d"',this._getConfigButtonName(a.name),'"\x3e\x3clabel title\x3d"',a.label,'" \x3e\x3cinput tabindex\x3d"-1"type\x3d"checkbox"',b,"/\x3e",a.$.getOuterHtml(),"\x3c/label\x3e\x3c/li\x3e"].join("")};d.getToolbarElementPreString=function(a){a=a.name?a.name:a;return['\x3cp\x3e\x3cspan\x3e\x3cbutton title\x3d"Move element upward" data-tab\x3d"true" data-direction\x3d"up" class\x3d"move icon-up-big"\x3e\x3c/button\x3e\x3cbutton title\x3d"Move element downward" data-tab\x3d"true" data-direction\x3d"down" class\x3d"move icon-down-big"\x3e\x3c/button\x3e',
-"row separator"==a?'\x3cbutton title\x3d"Remove element" data-tab\x3d"true" class\x3d"remove icon-trash"\x3e\x3c/button\x3e':"",a,"\x3c/span\x3e\x3c/p\x3e"].join("")};d.evaluateToolbarGroupsConfig=function(a){return a=function(a){var c={},d;try{d=eval("("+a+")")}catch(f){try{d=eval(a)}catch(g){return null}}return c.toolbarGroups&&"number"===typeof c.toolbarGroups.length?JSON.stringify(c):d&&"number"===typeof d.length?JSON.stringify({toolbarGroups:d}):d&&d.toolbarGroups?JSON.stringify(d):null}(a)};
-return d})();
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js b/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
deleted file mode 100644
index b9ef46be7..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function(){function e(a){l.call(this,a);this.hintContainer=this.codeContainer=null}var l=ToolbarConfigurator.AbstractToolbarModifier,g=ToolbarConfigurator.FullToolbarEditor;ToolbarConfigurator.ToolbarTextModifier=e;e.prototype=Object.create(l.prototype);e.prototype._onInit=function(a,d){l.prototype._onInit.call(this,void 0,d);this._createModifier(d?this.actualConfig:void 0);"function"===typeof a&&a(this.mainContainer)};e.prototype._createModifier=function(a){function d(a){var b=c(a);if(null!==b.charsBetween){var d=
-k.getUnusedButtonsArray(k.actualConfig.toolbar,!0,b.charsBetween),e=a.getCursor(),b=CodeMirror.Pos(e.line,e.ch-b.charsBetween.length),h=a.getTokenAt(e);"{"===a.getTokenAt({line:e.line,ch:h.start}).string&&(d=["name"]);if(0!==d.length)return new f(b,e,d)}}function f(a,c,b){this.from=a;this.to=c;this.list=b;this._handlers=[]}function c(a,c){var b={};b.cur=a.getCursor();b.tok=a.getTokenAt(b.cur);b["char"]=c||b.tok.string.charAt(b.tok.string.length-1);var d=a.getRange(CodeMirror.Pos(b.cur.line,0),b.cur).split("").reverse().join(""),
-d=d.replace(/(['|"]\w*['|"])/g,"");b.charsBetween=d.match(/(^\w*)(['|"])/);b.charsBetween&&(b.endChar=b.charsBetween[2],b.charsBetween=b.charsBetween[1].split("").reverse().join(""));return b}function b(a){setTimeout(function(){a.state.completionActive||CodeMirror.showHint(a,d,{hintsClass:"toolbar-modifier",completeSingle:!1})},100);return CodeMirror.Pass}var k=this;this._createToolbar();this.toolbarContainer&&this.mainContainer.append(this.toolbarContainer);l.prototype._createModifier.call(this);
-this._setupActualConfig(a);a=this.actualConfig.toolbar;a=CKEDITOR.tools.isArray(a)?"\tconfig.toolbar \x3d "+("[\n\t\t"+g.map(a,function(a){return l.stringifyJSONintoOneLine(a,{addSpaces:!0,noQuotesOnKey:!0,singleQuotes:!0})}).join(",\n\t\t")+"\n\t]")+";":"config.toolbar \x3d [];";a=["CKEDITOR.editorConfig \x3d function( config ) {\n",a,"\n};"].join("");var e=new CKEDITOR.dom.element("div");e.addClass("codemirror-wrapper");this.modifyContainer.append(e);this.codeContainer=CodeMirror(e.$,{mode:{name:"javascript",
-json:!0},lineNumbers:!1,lineWrapping:!0,viewportMargin:Infinity,value:a,smartIndent:!1,indentWithTabs:!0,indentUnit:4,tabSize:4,theme:"neo",extraKeys:{Left:b,Right:b,"'''":b,"'\"'":b,Backspace:b,Delete:b,"Shift-Tab":"indentLess"}});this.codeContainer.on("endCompletion",function(a,b){var d=c(a);void 0!==b&&a.replaceSelection(d.endChar)});this.codeContainer.on("change",function(){var a=k.codeContainer.getValue(),a=k._evaluateValue(a);null!==a?(k.actualConfig.toolbar=a.toolbar?a.toolbar:k.actualConfig.toolbar,
-k._fillHintByUnusedElements(),k._refreshEditor(),k.mainContainer.removeClass("invalid")):k.mainContainer.addClass("invalid")});this.hintContainer=new CKEDITOR.dom.element("div");this.hintContainer.addClass("toolbarModifier-hints");this._fillHintByUnusedElements();this.hintContainer.insertBefore(e)};e.prototype._fillHintByUnusedElements=function(){var a=this.getUnusedButtonsArray(this.actualConfig.toolbar,!0),a=this.groupButtonNamesByGroup(a),d=g.map(a,function(a){var b=g.map(a.buttons,function(a){return"\x3ccode\x3e"+
-a+"\x3c/code\x3e "}).join("");return["\x3cdt\x3e\x3ccode\x3e",a.name,"\x3c/code\x3e\x3c/dt\x3e\x3cdd\x3e",b,"\x3c/dd\x3e"].join("")}).join(" "),f='\x3cdt class\x3d"list-header"\x3eToolbar group\x3c/dt\x3e\x3cdd class\x3d"list-header"\x3eUnused items\x3c/dd\x3e';a.length||(f="\x3cp\x3eAll items are in use.\x3c/p\x3e");this.codeContainer.refresh();this.hintContainer.setHtml("\x3ch3\x3eUnused toolbar items\x3c/h3\x3e\x3cdl\x3e"+f+d+"\x3c/dl\x3e")};e.prototype.getToolbarGroupByButtonName=function(a){var d=
-this.fullToolbarEditor.buttonNamesByGroup,f;for(f in d)for(var c=d[f],b=c.length;b--;)if(a===c[b])return f;return null};e.prototype.getUnusedButtonsArray=function(a,d,f){d=!0===d?!0:!1;var c=e.mapToolbarCfgToElementsList(a);a=Object.keys(this.fullToolbarEditor.editorInstance.ui.items);a=g.filter(a,function(a){var d="-"===a;a=void 0===f||0===a.toLowerCase().indexOf(f.toLowerCase());return!d&&a});a=g.filter(a,function(a){return-1==CKEDITOR.tools.indexOf(c,a)});d&&a.sort();return a};e.prototype.groupButtonNamesByGroup=
-function(a){var d=[],f=JSON.parse(JSON.stringify(this.fullToolbarEditor.buttonNamesByGroup)),c;for(c in f){var b=f[c],b=g.filter(b,function(b){return-1!==CKEDITOR.tools.indexOf(a,b)});b.length&&d.push({name:c,buttons:b})}return d};e.mapToolbarCfgToElementsList=function(a){function d(a){return"-"!==a}for(var f=[],c=a.length,b=0;b<c;b+=1)a[b]&&"string"!==typeof a[b]&&(f=f.concat(g.filter(a[b].items,d)));return f};e.prototype._setupActualConfig=function(a){a=a||this.editorInstance.config;CKEDITOR.tools.isArray(a.toolbar)||
-(a.toolbarGroups||(a.toolbarGroups=this.fullToolbarEditor.getFullToolbarGroupsConfig(!0)),this._fixGroups(a),a.toolbar=this._mapToolbarGroupsToToolbar(a.toolbarGroups,this.actualConfig.removeButtons),this.actualConfig.toolbar=a.toolbar,this.actualConfig.removeButtons="")};e.prototype._mapToolbarGroupsToToolbar=function(a,d){d=d||this.editorInstance.config.removedBtns;d="string"==typeof d?d.split(","):[];for(var f=a.length;f--;){var c=this._mapToolbarSubgroup(a[f],d);"separator"===a[f].type?a[f]="/":
-CKEDITOR.tools.isArray(c)&&0===c.length?a.splice(f,1):a[f]="string"==typeof c?c:{name:a[f].name,items:c}}return a};e.prototype._mapToolbarSubgroup=function(a,d){if("string"==typeof a)return a;for(var f=a.groups?a.groups.length:0,c=[],b=0;b<f;b+=1){var e=a.groups[b],e=this.fullToolbarEditor.buttonsByGroup["string"===typeof e?e:e.name]||[],e=this._mapButtonsToButtonsNames(e,d),g=e.length,c=c.concat(e);g&&c.push("-")}"-"==c[c.length-1]&&c.pop();return c};e.prototype._mapButtonsToButtonsNames=function(a,
-d){for(var f=a.length;f--;){var c=a[f],c="string"===typeof c?c:this.fullToolbarEditor.getCamelCasedButtonName(c.name);-1!==CKEDITOR.tools.indexOf(d,c)?a.splice(f,1):a[f]=c}return a};e.prototype._evaluateValue=function(a){var d;try{var f={};Function("var CKEDITOR \x3d {}; "+a+"; return CKEDITOR;")().editorConfig(f);d=f;for(var c=d.toolbar.length;c--;)d.toolbar[c]||d.toolbar.splice(c,1)}catch(b){d=null}return d};e.prototype.mapToolbarToToolbarGroups=function(a){function d(a,b){a=a.slice();for(var d=
-b.length;d--;){var c=a.indexOf(b[d]);-1!==c&&a.splice(c,1)}return a}for(var f={},c=[],b=[],c=a.length,e=0;e<c;e++)if("/"===a[e])b.push("/");else{var g=a[e].items,m={};m.name=a[e].name;m.groups=[];for(var l=g.length,p=0;p<l;p++){var n=g[p];if("-"!==n){var h=this.getToolbarGroupByButtonName(n);-1===m.groups.indexOf(h)&&m.groups.push(h);f[h]=f[h]||{};h=f[h].buttons=f[h].buttons||{};h[n]=h[n]||{used:0,origin:m.name};h[n].used++}}b.push(m)}c=function(a,b){var c=[],e;for(e in a)var f=a[e],g=b[e].slice(),
-c=c.concat(d(g,Object.keys(f.buttons)));return c}(f,this.fullToolbarEditor.buttonNamesByGroup);return{toolbarGroups:b,removeButtons:c.join(",")}};return e})();
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
deleted file mode 100644
index d21bbea5a..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
deleted file mode 100644
index 2fe9d0f54..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
+++ /dev/null
@@ -1,325 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror div.CodeMirror-cursor {
-  border-left: 1px solid black;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: #7e7;
-}
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-}
-@-moz-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-@-webkit-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-@keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  position: relative;
-  overflow: hidden;
-  background: white;
-}
-
-.CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-}
-.CodeMirror-sizer {
-  position: relative;
-  border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  display: inline-block;
-  margin-bottom: -30px;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
-}
-.CodeMirror-gutter-wrapper {
-  position: absolute;
-  z-index: 4;
-  height: 100%;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-.CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-
-.CodeMirror-lines {
-  cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-  -webkit-tap-highlight-color: transparent;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-code {
-  outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-.CodeMirror-measure pre { position: static; }
-
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
-
-div.CodeMirror-cursors {
-  visibility: hidden;
-  position: relative;
-  z-index: 3;
-}
-.CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror ::selection { background: #d7d4f0; }
-.CodeMirror ::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
-  }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
deleted file mode 100644
index 538493fe0..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
+++ /dev/null
@@ -1,288 +0,0 @@
-(function(q){if("object"==typeof exports&&"object"==typeof module)module.exports=q();else{if("function"==typeof define&&define.amd)return define([],q);this.CodeMirror=q()}})(function(){function q(a,b){if(!(this instanceof q))return new q(a,b);this.options=b=b?V(b):{};V(qf,b,!1);wc(b);var c=b.value;"string"==typeof c&&(c=new P(c,b.mode));this.doc=c;var d=new q.inputStyles[b.inputStyle](this),d=this.display=new rf(a,c,d);d.wrapper.CodeMirror=this;Ad(this);Bd(this);b.lineWrapping&&(this.display.wrapper.className+=
-" CodeMirror-wrap");b.autofocus&&!ab&&d.input.focus();Cd(this);this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new bb,keySeq:null,specialChars:null};var e=this;B&&11>C&&setTimeout(function(){e.display.input.reset(!0)},20);sf(this);Dd||(tf(),Dd=!0);Ja(this);this.curOp.forceUpdate=!0;Ed(this,c);b.autofocus&&!ab||e.hasFocus()?setTimeout(cb(xc,this),20):db(this);for(var f in Ka)if(Ka.hasOwnProperty(f))Ka[f](this,
-b[f],Fd);Gd(this);b.finishInit&&b.finishInit(this);for(c=0;c<yc.length;++c)yc[c](this);La(this);J&&b.lineWrapping&&"optimizelegibility"==getComputedStyle(d.lineDiv).textRendering&&(d.lineDiv.style.textRendering="auto")}function rf(a,b,c){this.input=c;this.scrollbarFiller=t("div",null,"CodeMirror-scrollbar-filler");this.scrollbarFiller.setAttribute("cm-not-content","true");this.gutterFiller=t("div",null,"CodeMirror-gutter-filler");this.gutterFiller.setAttribute("cm-not-content","true");this.lineDiv=
-t("div",null,"CodeMirror-code");this.selectionDiv=t("div",null,null,"position: relative; z-index: 1");this.cursorDiv=t("div",null,"CodeMirror-cursors");this.measure=t("div",null,"CodeMirror-measure");this.lineMeasure=t("div",null,"CodeMirror-measure");this.lineSpace=t("div",[this.measure,this.lineMeasure,this.selectionDiv,this.cursorDiv,this.lineDiv],null,"position: relative; outline: none");this.mover=t("div",[t("div",[this.lineSpace],"CodeMirror-lines")],null,"position: relative");this.sizer=t("div",
-[this.mover],"CodeMirror-sizer");this.sizerWidth=null;this.heightForcer=t("div",null,null,"position: absolute; height: "+Hd+"px; width: 1px;");this.gutters=t("div",null,"CodeMirror-gutters");this.lineGutter=null;this.scroller=t("div",[this.sizer,this.heightForcer,this.gutters],"CodeMirror-scroll");this.scroller.setAttribute("tabIndex","-1");this.wrapper=t("div",[this.scrollbarFiller,this.gutterFiller,this.scroller],"CodeMirror");B&&8>C&&(this.gutters.style.zIndex=-1,this.scroller.style.paddingRight=
-0);J||wa&&ab||(this.scroller.draggable=!0);a&&(a.appendChild?a.appendChild(this.wrapper):a(this.wrapper));this.reportedViewFrom=this.reportedViewTo=this.viewFrom=this.viewTo=b.first;this.view=[];this.externalMeasured=this.renderedView=null;this.lastWrapHeight=this.lastWrapWidth=this.viewOffset=0;this.updateLineNumbers=null;this.nativeBarWidth=this.barHeight=this.barWidth=0;this.scrollbarsClipped=!1;this.lineNumWidth=this.lineNumInnerWidth=this.lineNumChars=null;this.alignWidgets=!1;this.maxLine=this.cachedCharWidth=
-this.cachedTextHeight=this.cachedPaddingH=null;this.maxLineLength=0;this.maxLineChanged=!1;this.wheelDX=this.wheelDY=this.wheelStartX=this.wheelStartY=null;this.shift=!1;this.activeTouch=this.selForContextMenu=null;c.init(this)}function zc(a){a.doc.mode=q.getMode(a.options,a.doc.modeOption);eb(a)}function eb(a){a.doc.iter(function(a){a.stateAfter&&(a.stateAfter=null);a.styles&&(a.styles=null)});a.doc.frontier=a.doc.first;fb(a,100);a.state.modeGen++;a.curOp&&Q(a)}function Id(a){var b=xa(a.display),
-c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/gb(a.display)-3);return function(e){if(ya(a.doc,e))return 0;var f=0;if(e.widgets)for(var g=0;g<e.widgets.length;g++)e.widgets[g].height&&(f+=e.widgets[g].height);return c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function Ac(a){var b=a.doc,c=Id(a);b.iter(function(a){var b=c(a);b!=a.height&&ca(a,b)})}function Bd(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g,
-" cm-s-");hb(a)}function ib(a){Ad(a);Q(a);setTimeout(function(){Bc(a)},20)}function Ad(a){var b=a.display.gutters,c=a.options.gutters;za(b);for(var d=0;d<c.length;++d){var e=c[d],f=b.appendChild(t("div",null,"CodeMirror-gutter "+e));"CodeMirror-linenumbers"==e&&(a.display.lineGutter=f,f.style.width=(a.display.lineNumWidth||1)+"px")}b.style.display=d?"":"none";Cc(a)}function Cc(a){a.display.sizer.style.marginLeft=a.display.gutters.offsetWidth+"px"}function Kb(a){if(0==a.height)return 0;for(var b=a.text.length,
-c,d=a;c=Aa(d,!0);)c=c.find(0,!0),d=c.from.line,b+=c.from.ch-c.to.ch;for(d=a;c=Aa(d,!1);)c=c.find(0,!0),b-=d.text.length-c.from.ch,d=c.to.line,b+=d.text.length-c.to.ch;return b}function Dc(a){var b=a.display;a=a.doc;b.maxLine=u(a,a.first);b.maxLineLength=Kb(b.maxLine);b.maxLineChanged=!0;a.iter(function(a){var d=Kb(a);d>b.maxLineLength&&(b.maxLineLength=d,b.maxLine=a)})}function wc(a){var b=D(a.gutters,"CodeMirror-linenumbers");-1==b&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):
--1<b&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function jb(a){var b=a.display,c=b.gutters.offsetWidth,d=Math.round(a.doc.height+Ec(a.display));return{clientHeight:b.scroller.clientHeight,viewHeight:b.wrapper.clientHeight,scrollWidth:b.scroller.scrollWidth,clientWidth:b.scroller.clientWidth,viewWidth:b.wrapper.clientWidth,barLeft:a.options.fixedGutter?c:0,docHeight:d,scrollHeight:d+da(a)+b.barHeight,nativeBarWidth:b.nativeBarWidth,gutterWidth:c}}function Fc(a,b,c){this.cm=
-c;var d=this.vert=t("div",[t("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),e=this.horiz=t("div",[t("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");a(d);a(e);v(d,"scroll",function(){d.clientHeight&&b(d.scrollTop,"vertical")});v(e,"scroll",function(){e.clientWidth&&b(e.scrollLeft,"horizontal")});this.checkedOverlay=!1;B&&8>C&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")}function Gc(){}function Cd(a){a.display.scrollbars&&(a.display.scrollbars.clear(),
-a.display.scrollbars.addClass&&kb(a.display.wrapper,a.display.scrollbars.addClass));a.display.scrollbars=new q.scrollbarModel[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller);v(b,"mousedown",function(){a.state.focused&&setTimeout(function(){a.display.input.focus()},0)});b.setAttribute("cm-not-content","true")},function(b,c){"horizontal"==c?Ma(a,b):lb(a,b)},a);a.display.scrollbars.addClass&&mb(a.display.wrapper,a.display.scrollbars.addClass)}function Na(a,
-b){b||(b=jb(a));var c=a.display.barWidth,d=a.display.barHeight;Jd(a,b);for(var e=0;4>e&&c!=a.display.barWidth||d!=a.display.barHeight;e++)c!=a.display.barWidth&&a.options.lineWrapping&&Lb(a),Jd(a,jb(a)),c=a.display.barWidth,d=a.display.barHeight}function Jd(a,b){var c=a.display,d=c.scrollbars.update(b);c.sizer.style.paddingRight=(c.barWidth=d.right)+"px";c.sizer.style.paddingBottom=(c.barHeight=d.bottom)+"px";d.right&&d.bottom?(c.scrollbarFiller.style.display="block",c.scrollbarFiller.style.height=
-d.bottom+"px",c.scrollbarFiller.style.width=d.right+"px"):c.scrollbarFiller.style.display="";d.bottom&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(c.gutterFiller.style.display="block",c.gutterFiller.style.height=d.bottom+"px",c.gutterFiller.style.width=b.gutterWidth+"px"):c.gutterFiller.style.display=""}function Hc(a,b,c){var d=c&&null!=c.top?Math.max(0,c.top):a.scroller.scrollTop,d=Math.floor(d-a.lineSpace.offsetTop),e=c&&null!=c.bottom?c.bottom:d+a.wrapper.clientHeight,d=Ba(b,d),
-e=Ba(b,e);if(c&&c.ensure){var f=c.ensure.from.line;c=c.ensure.to.line;f<d?(d=f,e=Ba(b,ea(u(b,f))+a.wrapper.clientHeight)):Math.min(c,b.lastLine())>=e&&(d=Ba(b,ea(u(b,c))-a.wrapper.clientHeight),e=c)}return{from:d,to:Math.max(e,d+1)}}function Bc(a){var b=a.display,c=b.view;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var d=Ic(b)-b.scroller.scrollLeft+a.doc.scrollLeft,e=b.gutters.offsetWidth,f=d+"px",g=0;g<c.length;g++)if(!c[g].hidden){a.options.fixedGutter&&c[g].gutter&&(c[g].gutter.style.left=
-f);var h=c[g].alignable;if(h)for(var k=0;k<h.length;k++)h[k].style.left=f}a.options.fixedGutter&&(b.gutters.style.left=d+e+"px")}}function Gd(a){if(!a.options.lineNumbers)return!1;var b=a.doc,b=Jc(a.options,b.first+b.size-1),c=a.display;if(b.length!=c.lineNumChars){var d=c.measure.appendChild(t("div",[t("div",b)],"CodeMirror-linenumber CodeMirror-gutter-elt")),e=d.firstChild.offsetWidth,d=d.offsetWidth-e;c.lineGutter.style.width="";c.lineNumInnerWidth=Math.max(e,c.lineGutter.offsetWidth-d)+1;c.lineNumWidth=
-c.lineNumInnerWidth+d;c.lineNumChars=c.lineNumInnerWidth?b.length:-1;c.lineGutter.style.width=c.lineNumWidth+"px";Cc(a);return!0}return!1}function Jc(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function Ic(a){return a.scroller.getBoundingClientRect().left-a.sizer.getBoundingClientRect().left}function Mb(a,b,c){var d=a.display;this.viewport=b;this.visible=Hc(d,a.doc,b);this.editorIsHidden=!d.wrapper.offsetWidth;this.wrapperHeight=d.wrapper.clientHeight;this.wrapperWidth=d.wrapper.clientWidth;
-this.oldDisplayWidth=pa(a);this.force=c;this.dims=Kc(a);this.events=[]}function Lc(a,b){var c=a.display,d=a.doc;if(b.editorIsHidden)return qa(a),!1;if(!b.force&&b.visible.from>=c.viewFrom&&b.visible.to<=c.viewTo&&(null==c.updateLineNumbers||c.updateLineNumbers>=c.viewTo)&&c.renderedView==c.view&&0==Kd(a))return!1;Gd(a)&&(qa(a),b.dims=Kc(a));var e=d.first+d.size,f=Math.max(b.visible.from-a.options.viewportMargin,d.first),g=Math.min(e,b.visible.to+a.options.viewportMargin);c.viewFrom<f&&20>f-c.viewFrom&&
-(f=Math.max(d.first,c.viewFrom));c.viewTo>g&&20>c.viewTo-g&&(g=Math.min(e,c.viewTo));ra&&(f=Mc(a.doc,f),g=Ld(a.doc,g));d=f!=c.viewFrom||g!=c.viewTo||c.lastWrapHeight!=b.wrapperHeight||c.lastWrapWidth!=b.wrapperWidth;e=a.display;0==e.view.length||f>=e.viewTo||g<=e.viewFrom?(e.view=Nb(a,f,g),e.viewFrom=f):(e.viewFrom>f?e.view=Nb(a,f,e.viewFrom).concat(e.view):e.viewFrom<f&&(e.view=e.view.slice(Ca(a,f))),e.viewFrom=f,e.viewTo<g?e.view=e.view.concat(Nb(a,e.viewTo,g)):e.viewTo>g&&(e.view=e.view.slice(0,
-Ca(a,g))));e.viewTo=g;c.viewOffset=ea(u(a.doc,c.viewFrom));a.display.mover.style.top=c.viewOffset+"px";g=Kd(a);if(!d&&0==g&&!b.force&&c.renderedView==c.view&&(null==c.updateLineNumbers||c.updateLineNumbers>=c.viewTo))return!1;f=fa();4<g&&(c.lineDiv.style.display="none");uf(a,c.updateLineNumbers,b.dims);4<g&&(c.lineDiv.style.display="");c.renderedView=c.view;f&&fa()!=f&&f.offsetHeight&&f.focus();za(c.cursorDiv);za(c.selectionDiv);c.gutters.style.height=0;d&&(c.lastWrapHeight=b.wrapperHeight,c.lastWrapWidth=
-b.wrapperWidth,fb(a,400));c.updateLineNumbers=null;return!0}function Md(a,b){for(var c=b.viewport,d=!0;;d=!1){if(!d||!a.options.lineWrapping||b.oldDisplayWidth==pa(a))if(c&&null!=c.top&&(c={top:Math.min(a.doc.height+Ec(a.display)-Nc(a),c.top)}),b.visible=Hc(a.display,a.doc,c),b.visible.from>=a.display.viewFrom&&b.visible.to<=a.display.viewTo)break;if(!Lc(a,b))break;Lb(a);d=jb(a);nb(a);Oc(a,d);Na(a,d)}b.signal(a,"update",a);if(a.display.viewFrom!=a.display.reportedViewFrom||a.display.viewTo!=a.display.reportedViewTo)b.signal(a,
-"viewportChange",a,a.display.viewFrom,a.display.viewTo),a.display.reportedViewFrom=a.display.viewFrom,a.display.reportedViewTo=a.display.viewTo}function Pc(a,b){var c=new Mb(a,b);if(Lc(a,c)){Lb(a);Md(a,c);var d=jb(a);nb(a);Oc(a,d);Na(a,d);c.finish()}}function Oc(a,b){a.display.sizer.style.minHeight=b.docHeight+"px";var c=b.docHeight+a.display.barHeight;a.display.heightForcer.style.top=c+"px";a.display.gutters.style.height=Math.max(c+da(a),b.clientHeight)+"px"}function Lb(a){a=a.display;for(var b=
-a.lineDiv.offsetTop,c=0;c<a.view.length;c++){var d=a.view[c],e;if(!d.hidden){if(B&&8>C){var f=d.node.offsetTop+d.node.offsetHeight;e=f-b;b=f}else e=d.node.getBoundingClientRect(),e=e.bottom-e.top;f=d.line.height-e;2>e&&(e=xa(a));if(.001<f||-.001>f)if(ca(d.line,e),Nd(d.line),d.rest)for(e=0;e<d.rest.length;e++)Nd(d.rest[e])}}}function Nd(a){if(a.widgets)for(var b=0;b<a.widgets.length;++b)a.widgets[b].height=a.widgets[b].node.offsetHeight}function Kc(a){for(var b=a.display,c={},d={},e=b.gutters.clientLeft,
-f=b.gutters.firstChild,g=0;f;f=f.nextSibling,++g)c[a.options.gutters[g]]=f.offsetLeft+f.clientLeft+e,d[a.options.gutters[g]]=f.clientWidth;return{fixedPos:Ic(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function uf(a,b,c){function d(b){var c=b.nextSibling;J&&W&&a.display.currentWheelTarget==b?b.style.display="none":b.parentNode.removeChild(b);return c}for(var e=a.display,f=a.options.lineNumbers,g=e.lineDiv,h=g.firstChild,k=e.view,e=e.viewFrom,
-l=0;l<k.length;l++){var m=k[l];if(!m.hidden)if(m.node&&m.node.parentNode==g){for(;h!=m.node;)h=d(h);h=f&&null!=b&&b<=e&&m.lineNumber;m.changes&&(-1<D(m.changes,"gutter")&&(h=!1),Od(a,m,e,c));h&&(za(m.lineNumber),m.lineNumber.appendChild(document.createTextNode(Jc(a.options,e))));h=m.node.nextSibling}else{var p=vf(a,m,e,c);g.insertBefore(p,h)}e+=m.size}for(;h;)h=d(h)}function Od(a,b,c,d){for(var e=0;e<b.changes.length;e++){var f=b.changes[e];if("text"==f){var f=b,g=f.text.className,h=Pd(a,f);f.text==
-f.node&&(f.node=h.pre);f.text.parentNode.replaceChild(h.pre,f.text);f.text=h.pre;h.bgClass!=f.bgClass||h.textClass!=f.textClass?(f.bgClass=h.bgClass,f.textClass=h.textClass,Qc(f)):g&&(f.text.className=g)}else if("gutter"==f)Qd(a,b,c,d);else if("class"==f)Qc(b);else if("widget"==f){f=a;g=b;h=d;g.alignable&&(g.alignable=null);for(var k=g.node.firstChild,l=void 0;k;k=l)l=k.nextSibling,"CodeMirror-linewidget"==k.className&&g.node.removeChild(k);Rd(f,g,h)}}b.changes=null}function Ob(a){a.node==a.text&&
-(a.node=t("div",null,null,"position: relative"),a.text.parentNode&&a.text.parentNode.replaceChild(a.node,a.text),a.node.appendChild(a.text),B&&8>C&&(a.node.style.zIndex=2));return a.node}function Pd(a,b){var c=a.display.externalMeasured;return c&&c.line==b.line?(a.display.externalMeasured=null,b.measure=c.measure,c.built):Sd(a,b)}function Qc(a){var b=a.bgClass?a.bgClass+" "+(a.line.bgClass||""):a.line.bgClass;b&&(b+=" CodeMirror-linebackground");if(a.background)b?a.background.className=b:(a.background.parentNode.removeChild(a.background),
-a.background=null);else if(b){var c=Ob(a);a.background=c.insertBefore(t("div",null,b),c.firstChild)}a.line.wrapClass?Ob(a).className=a.line.wrapClass:a.node!=a.text&&(a.node.className="");a.text.className=(a.textClass?a.textClass+" "+(a.line.textClass||""):a.line.textClass)||""}function Qd(a,b,c,d){b.gutter&&(b.node.removeChild(b.gutter),b.gutter=null);var e=b.line.gutterMarkers;if(a.options.lineNumbers||e){var f=Ob(b),g=b.gutter=t("div",null,"CodeMirror-gutter-wrapper","left: "+(a.options.fixedGutter?
-d.fixedPos:-d.gutterTotalWidth)+"px; width: "+d.gutterTotalWidth+"px");a.display.input.setUneditable(g);f.insertBefore(g,b.text);b.line.gutterClass&&(g.className+=" "+b.line.gutterClass);!a.options.lineNumbers||e&&e["CodeMirror-linenumbers"]||(b.lineNumber=g.appendChild(t("div",Jc(a.options,c),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+d.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+a.display.lineNumInnerWidth+"px")));if(e)for(b=0;b<a.options.gutters.length;++b)c=a.options.gutters[b],
-(f=e.hasOwnProperty(c)&&e[c])&&g.appendChild(t("div",[f],"CodeMirror-gutter-elt","left: "+d.gutterLeft[c]+"px; width: "+d.gutterWidth[c]+"px"))}}function vf(a,b,c,d){var e=Pd(a,b);b.text=b.node=e.pre;e.bgClass&&(b.bgClass=e.bgClass);e.textClass&&(b.textClass=e.textClass);Qc(b);Qd(a,b,c,d);Rd(a,b,d);return b.node}function Rd(a,b,c){Td(a,b.line,b,c,!0);if(b.rest)for(var d=0;d<b.rest.length;d++)Td(a,b.rest[d],b,c,!1)}function Td(a,b,c,d,e){if(b.widgets){var f=Ob(c),g=0;for(b=b.widgets;g<b.length;++g){var h=
-b[g],k=t("div",[h.node],"CodeMirror-linewidget");h.handleMouseEvents||k.setAttribute("cm-ignore-events","true");var l=h,m=k,p=d;if(l.noHScroll){(c.alignable||(c.alignable=[])).push(m);var n=p.wrapperWidth;m.style.left=p.fixedPos+"px";l.coverGutter||(n-=p.gutterTotalWidth,m.style.paddingLeft=p.gutterTotalWidth+"px");m.style.width=n+"px"}l.coverGutter&&(m.style.zIndex=5,m.style.position="relative",l.noHScroll||(m.style.marginLeft=-p.gutterTotalWidth+"px"));a.display.input.setUneditable(k);e&&h.above?
-f.insertBefore(k,c.gutter||c.text):f.appendChild(k);L(h,"redraw")}}}function Rc(a){return r(a.line,a.ch)}function Pb(a,b){return 0>y(a,b)?b:a}function Qb(a,b){return 0>y(a,b)?a:b}function Ud(a){a.state.focused||(a.display.input.focus(),xc(a))}function Rb(a){return a.options.readOnly||a.doc.cantEdit}function Sc(a,b,c,d,e){var f=a.doc;a.display.shift=!1;d||(d=f.sel);var g=sa(b),h=null;a.state.pasteIncoming&&1<d.ranges.length&&(X&&X.join("\n")==b?h=0==d.ranges.length%X.length&&ob(X,sa):g.length==d.ranges.length&&
-(h=ob(g,function(a){return[a]})));for(var k=d.ranges.length-1;0<=k;k--){var l=d.ranges[k],m=l.from(),p=l.to();l.empty()&&(c&&0<c?m=r(m.line,m.ch-c):a.state.overwrite&&!a.state.pasteIncoming&&(p=r(p.line,Math.min(u(f,p.line).text.length,p.ch+A(g).length))));var n=a.curOp.updateInput,m={from:m,to:p,text:h?h[k%h.length]:g,origin:e||(a.state.pasteIncoming?"paste":a.state.cutIncoming?"cut":"+input")};Oa(a.doc,m);L(a,"inputRead",a,m);if(b&&!a.state.pasteIncoming&&a.options.electricChars&&a.options.smartIndent&&
-100>l.head.ch&&(!k||d.ranges[k-1].head.line!=l.head.line)){l=a.getModeAt(l.head);m=ta(m);p=!1;if(l.electricChars)for(var E=0;E<l.electricChars.length;E++){if(-1<b.indexOf(l.electricChars.charAt(E))){p=pb(a,m.line,"smart");break}}else l.electricInput&&l.electricInput.test(u(f,m.line).text.slice(0,m.ch))&&(p=pb(a,m.line,"smart"));p&&L(a,"electricInput",a,m.line)}}Pa(a);a.curOp.updateInput=n;a.curOp.typing=!0;a.state.pasteIncoming=a.state.cutIncoming=!1}function Vd(a){for(var b=[],c=[],d=0;d<a.doc.sel.ranges.length;d++){var e=
-a.doc.sel.ranges[d].head.line,e={anchor:r(e,0),head:r(e+1,0)};c.push(e);b.push(a.getRange(e.anchor,e.head))}return{text:b,ranges:c}}function Wd(a){a.setAttribute("autocorrect","off");a.setAttribute("autocapitalize","off");a.setAttribute("spellcheck","false")}function Tc(a){this.cm=a;this.prevInput="";this.pollingFast=!1;this.polling=new bb;this.hasSelection=this.inaccurateSelection=!1;this.composing=null}function Xd(){var a=t("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em; outline: none"),
-b=t("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");J?a.style.width="1000px":a.setAttribute("wrap","off");Qa&&(a.style.border="1px solid black");Wd(a);return b}function Uc(a){this.cm=a;this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null;this.polling=new bb;this.gracePeriod=!1}function Yd(a,b){var c=Vc(a,b.line);if(!c||c.hidden)return null;var d=u(a.doc,b.line),c=Zd(c,d,b.line);(d=Y(d))&&Sb(d,b.ch);d=$d(c.map,b.ch,"left");d.offset=
-"right"==d.collapse?d.end:d.start;return d}function Ra(a,b){b&&(a.bad=!0);return a}function Tb(a,b,c){var d;if(b==a.display.lineDiv){d=a.display.lineDiv.childNodes[c];if(!d)return Ra(a.clipPos(r(a.display.viewTo-1)),!0);b=null;c=0}else for(d=b;;d=d.parentNode){if(!d||d==a.display.lineDiv)return null;if(d.parentNode&&d.parentNode==a.display.lineDiv)break}for(var e=0;e<a.display.view.length;e++){var f=a.display.view[e];if(f.node==d)return wf(f,b,c)}}function wf(a,b,c){function d(b,c,d){for(var e=-1;e<
-(l?l.length:0);e++)for(var f=0>e?k.map:l[e],g=0;g<f.length;g+=3){var h=f[g+2];if(h==b||h==c){c=F(0>e?a.line:a.rest[e]);e=f[g]+d;if(0>d||h!=b)e=f[g+(d?1:0)];return r(c,e)}}}var e=a.text.firstChild,f=!1;if(!b||!Wc(e,b))return Ra(r(F(a.line),0),!0);if(b==e&&(f=!0,b=e.childNodes[c],c=0,!b))return c=a.rest?A(a.rest):a.line,Ra(r(F(c),c.text.length),f);var g=3==b.nodeType?b:null,h=b;g||1!=b.childNodes.length||3!=b.firstChild.nodeType||(g=b.firstChild,c&&(c=g.nodeValue.length));for(;h.parentNode!=e;)h=h.parentNode;
-var k=a.measure,l=k.maps;if(b=d(g,h,c))return Ra(b,f);e=h.nextSibling;for(g=g?g.nodeValue.length-c:0;e;e=e.nextSibling){if(b=d(e,e.firstChild,0))return Ra(r(b.line,b.ch-g),f);g+=e.textContent.length}h=h.previousSibling;for(g=c;h;h=h.previousSibling){if(b=d(h,h.firstChild,-1))return Ra(r(b.line,b.ch+g),f);g+=e.textContent.length}}function xf(a,b,c,d,e){function f(a){return function(b){return b.id==a}}function g(b){if(1==b.nodeType){var c=b.getAttribute("cm-text");if(null!=c)""==c&&(c=b.textContent.replace(/\u200b/g,
-"")),h+=c;else{var c=b.getAttribute("cm-marker"),p;if(c)b=a.findMarks(r(d,0),r(e+1,0),f(+c)),b.length&&(p=b[0].find())&&(h+=Da(a.doc,p.from,p.to).join("\n"));else if("false"!=b.getAttribute("contenteditable")){for(p=0;p<b.childNodes.length;p++)g(b.childNodes[p]);/^(pre|div|p)$/i.test(b.nodeName)&&(k=!0)}}}else 3==b.nodeType&&(b=b.nodeValue)&&(k&&(h+="\n",k=!1),h+=b)}for(var h="",k=!1;;){g(b);if(b==c)break;b=b.nextSibling}return h}function la(a,b){this.ranges=a;this.primIndex=b}function z(a,b){this.anchor=
-a;this.head=b}function Z(a,b){var c=a[b];a.sort(function(a,b){return y(a.from(),b.from())});b=D(a,c);for(c=1;c<a.length;c++){var d=a[c],e=a[c-1];if(0<=y(e.to(),d.from())){var f=Qb(e.from(),d.from()),g=Pb(e.to(),d.to()),d=e.empty()?d.from()==d.head:e.from()==e.head;c<=b&&--b;a.splice(--c,2,new z(d?g:f,d?f:g))}}return new la(a,b)}function ga(a,b){return new la([new z(a,b||a)],0)}function w(a,b){if(b.line<a.first)return r(a.first,0);var c=a.first+a.size-1;if(b.line>c)return r(c,u(a,c).text.length);var c=
-u(a,b.line).text.length,d=b.ch,c=null==d||d>c?r(b.line,c):0>d?r(b.line,0):b;return c}function qb(a,b){return b>=a.first&&b<a.first+a.size}function rb(a,b,c,d){return a.cm&&a.cm.display.shift||a.extend?(a=b.anchor,d&&(b=0>y(c,a),b!=0>y(d,a)?(a=c,c=d):b!=0>y(c,d)&&(c=d)),new z(a,c)):new z(d||c,c)}function Ub(a,b,c,d){H(a,new la([rb(a,a.sel.primary(),b,c)],0),d)}function ae(a,b,c){for(var d=[],e=0;e<a.sel.ranges.length;e++)d[e]=rb(a,a.sel.ranges[e],b[e],null);b=Z(d,a.sel.primIndex);H(a,b,c)}function Xc(a,
-b,c,d){var e=a.sel.ranges.slice(0);e[b]=c;H(a,Z(e,a.sel.primIndex),d)}function yf(a,b){var c={ranges:b.ranges,update:function(b){this.ranges=[];for(var c=0;c<b.length;c++)this.ranges[c]=new z(w(a,b[c].anchor),w(a,b[c].head))}};K(a,"beforeSelectionChange",a,c);a.cm&&K(a.cm,"beforeSelectionChange",a.cm,c);return c.ranges!=b.ranges?Z(c.ranges,c.ranges.length-1):b}function be(a,b,c){var d=a.history.done,e=A(d);e&&e.ranges?(d[d.length-1]=b,Vb(a,b,c)):H(a,b,c)}function H(a,b,c){Vb(a,b,c);b=a.sel;var d=
-a.cm?a.cm.curOp.id:NaN,e=a.history,f=c&&c.origin,g;if(!(g=d==e.lastSelOp)&&(g=f&&e.lastSelOrigin==f)&&!(g=e.lastModTime==e.lastSelTime&&e.lastOrigin==f)){g=A(e.done);var h=f.charAt(0);g="*"==h||"+"==h&&g.ranges.length==b.ranges.length&&g.somethingSelected()==b.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}g?e.done[e.done.length-1]=b:Wb(b,e.done);e.lastSelTime=+new Date;e.lastSelOrigin=f;e.lastSelOp=d;c&&!1!==c.clearRedo&&ce(e.undone)}function Vb(a,
-b,c){if(S(a,"beforeSelectionChange")||a.cm&&S(a.cm,"beforeSelectionChange"))b=yf(a,b);var d=c&&c.bias||(0>y(b.primary().head,a.sel.primary().head)?-1:1);de(a,ee(a,b,d,!0));c&&!1===c.scroll||!a.cm||Pa(a.cm)}function de(a,b){b.equals(a.sel)||(a.sel=b,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=!0,fe(a.cm)),L(a,"cursorActivity",a))}function ge(a){de(a,ee(a,a.sel,null,!1),ha)}function ee(a,b,c,d){for(var e,f=0;f<b.ranges.length;f++){var g=b.ranges[f],h=Xb(a,g.anchor,c,d),k=Xb(a,g.head,c,
-d);if(e||h!=g.anchor||k!=g.head)e||(e=b.ranges.slice(0,f)),e[f]=new z(h,k)}return e?Z(e,b.primIndex):b}function Xb(a,b,c,d){var e=!1,f=b,g=c||1;a.cantEdit=!1;a:for(;;){var h=u(a,f.line);if(h.markedSpans)for(var k=0;k<h.markedSpans.length;++k){var l=h.markedSpans[k],m=l.marker;if((null==l.from||(m.inclusiveLeft?l.from<=f.ch:l.from<f.ch))&&(null==l.to||(m.inclusiveRight?l.to>=f.ch:l.to>f.ch))){if(d&&(K(m,"beforeCursorEnter"),m.explicitlyCleared))if(h.markedSpans){--k;continue}else break;if(m.atomic){k=
-m.find(0>g?-1:1);if(0==y(k,f)&&(k.ch+=g,0>k.ch?k=k.line>a.first?w(a,r(k.line-1)):null:k.ch>h.text.length&&(k=k.line<a.first+a.size-1?r(k.line+1,0):null),!k)){if(e){if(!d)return Xb(a,b,c,!0);a.cantEdit=!0;return r(a.first,0)}e=!0;k=b;g=-g}f=k;continue a}}}return f}}function nb(a){a.display.input.showSelection(a.display.input.prepareSelection())}function he(a,b){for(var c=a.doc,d={},e=d.cursors=document.createDocumentFragment(),f=d.selection=document.createDocumentFragment(),g=0;g<c.sel.ranges.length;g++)if(!1!==
-b||g!=c.sel.primIndex){var h=c.sel.ranges[g],k=h.empty();if(k||a.options.showCursorWhenSelecting){var l=a,m=e,p=ma(l,h.head,"div",null,null,!l.options.singleCursorHeightPerLine),n=m.appendChild(t("div"," ","CodeMirror-cursor"));n.style.left=p.left+"px";n.style.top=p.top+"px";n.style.height=Math.max(0,p.bottom-p.top)*l.options.cursorHeight+"px";p.other&&(l=m.appendChild(t("div"," ","CodeMirror-cursor CodeMirror-secondarycursor")),l.style.display="",l.style.left=p.other.left+"px",l.style.top=p.other.top+
-"px",l.style.height=.85*(p.other.bottom-p.other.top)+"px")}k||zf(a,h,f)}return d}function zf(a,b,c){function d(a,b,c,d){0>b&&(b=0);b=Math.round(b);d=Math.round(d);h.appendChild(t("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px; top: "+b+"px; width: "+(null==c?m-a:c)+"px; height: "+(d-b)+"px"))}function e(b,c,e){var f=u(g,b),h=f.text.length,k,p;Af(Y(f),c||0,null==e?h:e,function(g,q,t){var u=Yb(a,r(b,g),"div",f,"left"),v,w;g==q?(v=u,t=w=u.left):(v=Yb(a,r(b,q-1),"div",f,"right"),
-"rtl"==t&&(t=u,u=v,v=t),t=u.left,w=v.right);null==c&&0==g&&(t=l);3<v.top-u.top&&(d(t,u.top,null,u.bottom),t=l,u.bottom<v.top&&d(t,u.bottom,null,v.top));null==e&&q==h&&(w=m);if(!k||u.top<k.top||u.top==k.top&&u.left<k.left)k=u;if(!p||v.bottom>p.bottom||v.bottom==p.bottom&&v.right>p.right)p=v;t<l+1&&(t=l);d(t,v.top,w-t,v.bottom)});return{start:k,end:p}}var f=a.display,g=a.doc,h=document.createDocumentFragment(),k=ie(a.display),l=k.left,m=Math.max(f.sizerWidth,pa(a)-f.sizer.offsetLeft)-k.right,f=b.from();
-b=b.to();if(f.line==b.line)e(f.line,f.ch,b.ch);else{var p=u(g,f.line),k=u(g,b.line),k=ia(p)==ia(k),f=e(f.line,f.ch,k?p.text.length+1:null).end;b=e(b.line,k?0:null,b.ch).start;k&&(f.top<b.top-2?(d(f.right,f.top,null,f.bottom),d(l,b.top,b.left,b.bottom)):d(f.right,f.top,b.left-f.right,f.bottom));f.bottom<b.top&&d(l,f.bottom,null,b.top)}c.appendChild(h)}function Yc(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursorDiv.style.visibility="";0<a.options.cursorBlinkRate?b.blinker=
-setInterval(function(){b.cursorDiv.style.visibility=(c=!c)?"":"hidden"},a.options.cursorBlinkRate):0>a.options.cursorBlinkRate&&(b.cursorDiv.style.visibility="hidden")}}function fb(a,b){a.doc.mode.startState&&a.doc.frontier<a.display.viewTo&&a.state.highlight.set(b,cb(Bf,a))}function Bf(a){var b=a.doc;b.frontier<b.first&&(b.frontier=b.first);if(!(b.frontier>=a.display.viewTo)){var c=+new Date+a.options.workTime,d=Sa(b.mode,sb(a,b.frontier)),e=[];b.iter(b.frontier,Math.min(b.first+b.size,a.display.viewTo+
-500),function(f){if(b.frontier>=a.display.viewFrom){var g=f.styles,h=je(a,f,d,!0);f.styles=h.styles;var k=f.styleClasses;(h=h.classes)?f.styleClasses=h:k&&(f.styleClasses=null);k=!g||g.length!=f.styles.length||k!=h&&(!k||!h||k.bgClass!=h.bgClass||k.textClass!=h.textClass);for(h=0;!k&&h<g.length;++h)k=g[h]!=f.styles[h];k&&e.push(b.frontier);f.stateAfter=Sa(b.mode,d)}else Zc(a,f.text,d),f.stateAfter=0==b.frontier%5?Sa(b.mode,d):null;++b.frontier;if(+new Date>c)return fb(a,a.options.workDelay),!0});
-e.length&&T(a,function(){for(var b=0;b<e.length;b++)na(a,e[b],"text")})}}function Cf(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1E3:100);b>g;--b){if(b<=f.first)return f.first;var h=u(f,b-1);if(h.stateAfter&&(!c||b<=f.frontier))return b;h=aa(h.text,null,a.options.tabSize);if(null==e||d>h)e=b-1,d=h}return e}function sb(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return!0;var f=Cf(a,b,c),g=f>d.first&&u(d,f-1).stateAfter,g=g?Sa(d.mode,g):Df(d.mode);d.iter(f,b,function(c){Zc(a,
-c.text,g);c.stateAfter=f==b-1||0==f%5||f>=e.viewFrom&&f<e.viewTo?Sa(d.mode,g):null;++f});c&&(d.frontier=f);return g}function Ec(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function ie(a){if(a.cachedPaddingH)return a.cachedPaddingH;var b=U(a.measure,t("pre","x")),b=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,b={left:parseInt(b.paddingLeft),right:parseInt(b.paddingRight)};isNaN(b.left)||isNaN(b.right)||(a.cachedPaddingH=b);return b}function da(a){return Hd-a.display.nativeBarWidth}
-function pa(a){return a.display.scroller.clientWidth-da(a)-a.display.barWidth}function Nc(a){return a.display.scroller.clientHeight-da(a)-a.display.barHeight}function Zd(a,b,c){if(a.line==b)return{map:a.measure.map,cache:a.measure.cache};for(var d=0;d<a.rest.length;d++)if(a.rest[d]==b)return{map:a.measure.maps[d],cache:a.measure.caches[d]};for(d=0;d<a.rest.length;d++)if(F(a.rest[d])>c)return{map:a.measure.maps[d],cache:a.measure.caches[d],before:!0}}function Vc(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo)return a.display.view[Ca(a,
-b)];var c=a.display.externalMeasured;if(c&&b>=c.lineN&&b<c.lineN+c.size)return c}function Zb(a,b){var c=F(b),d=Vc(a,c);d&&!d.text?d=null:d&&d.changes&&Od(a,d,c,Kc(a));if(!d){var e;e=ia(b);d=F(e);e=a.display.externalMeasured=new ke(a.doc,e,d);e.lineN=d;d=e.built=Sd(a,e);e.text=d.pre;U(a.display.lineMeasure,d.pre);d=e}c=Zd(d,b,c);return{line:b,view:d,rect:null,map:c.map,cache:c.cache,before:c.before,hasHeights:!1}}function $c(a,b,c,d,e){b.before&&(c=-1);var f=c+(d||"");if(b.cache.hasOwnProperty(f))a=
-b.cache[f];else{b.rect||(b.rect=b.view.text.getBoundingClientRect());if(!b.hasHeights){var g=b.view,h=b.rect,k=a.options.lineWrapping,l=k&&pa(a);if(!g.measure.heights||k&&g.measure.width!=l){var m=g.measure.heights=[];if(k)for(g.measure.width=l,g=g.text.firstChild.getClientRects(),k=0;k<g.length-1;k++){var l=g[k],p=g[k+1];2<Math.abs(l.bottom-p.bottom)&&m.push((l.bottom+p.top)/2-h.top)}m.push(h.bottom-h.top)}b.hasHeights=!0}g=d;k=$d(b.map,c,g);d=k.node;h=k.start;l=k.end;c=k.collapse;var n;if(3==d.nodeType){for(m=
-0;4>m;m++){for(;h&&tb(b.line.text.charAt(k.coverStart+h));)--h;for(;k.coverStart+l<k.coverEnd&&tb(b.line.text.charAt(k.coverStart+l));)++l;if(B&&9>C&&0==h&&l==k.coverEnd-k.coverStart)n=d.parentNode.getBoundingClientRect();else if(B&&a.options.lineWrapping){var E=Ea(d,h,l).getClientRects();n=E.length?E["right"==g?E.length-1:0]:ad}else n=Ea(d,h,l).getBoundingClientRect()||ad;if(n.left||n.right||0==h)break;l=h;--h;c="right"}B&&11>C&&((E=!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI)||
-(null!=bd?E=bd:(m=U(a.display.measure,t("span","x")),E=m.getBoundingClientRect(),m=Ea(m,0,1).getBoundingClientRect(),E=bd=1<Math.abs(E.left-m.left)),E=!E),E||(E=screen.logicalXDPI/screen.deviceXDPI,m=screen.logicalYDPI/screen.deviceYDPI,n={left:n.left*E,right:n.right*E,top:n.top*m,bottom:n.bottom*m}))}else 0<h&&(c=g="right"),n=a.options.lineWrapping&&1<(E=d.getClientRects()).length?E["right"==g?E.length-1:0]:d.getBoundingClientRect();!(B&&9>C)||h||n&&(n.left||n.right)||(n=(n=d.parentNode.getClientRects()[0])?
-{left:n.left,right:n.left+gb(a.display),top:n.top,bottom:n.bottom}:ad);E=n.top-b.rect.top;d=n.bottom-b.rect.top;h=(E+d)/2;g=b.view.measure.heights;for(m=0;m<g.length-1&&!(h<g[m]);m++);c={left:("right"==c?n.right:n.left)-b.rect.left,right:("left"==c?n.left:n.right)-b.rect.left,top:m?g[m-1]:0,bottom:g[m]};n.left||n.right||(c.bogus=!0);a.options.singleCursorHeightPerLine||(c.rtop=E,c.rbottom=d);a=c;a.bogus||(b.cache[f]=a)}return{left:a.left,right:a.right,top:e?a.rtop:a.top,bottom:e?a.rbottom:a.bottom}}
-function $d(a,b,c){for(var d,e,f,g,h=0;h<a.length;h+=3){var k=a[h],l=a[h+1];if(b<k)e=0,f=1,g="left";else if(b<l)e=b-k,f=e+1;else if(h==a.length-3||b==l&&a[h+3]>b)f=l-k,e=f-1,b>=l&&(g="right");if(null!=e){d=a[h+2];k==l&&c==(d.insertLeft?"left":"right")&&(g=c);if("left"==c&&0==e)for(;h&&a[h-2]==a[h-3]&&a[h-1].insertLeft;)d=a[(h-=3)+2],g="left";if("right"==c&&e==l-k)for(;h<a.length-3&&a[h+3]==a[h+4]&&!a[h+5].insertLeft;)d=a[(h+=3)+2],g="right";break}}return{node:d,start:e,end:f,collapse:g,coverStart:k,
-coverEnd:l}}function le(a){if(a.measure&&(a.measure.cache={},a.measure.heights=null,a.rest))for(var b=0;b<a.rest.length;b++)a.measure.caches[b]={}}function me(a){a.display.externalMeasure=null;za(a.display.lineMeasure);for(var b=0;b<a.display.view.length;b++)le(a.display.view[b])}function hb(a){me(a);a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null;a.options.lineWrapping||(a.display.maxLineChanged=!0);a.display.lineNumChars=null}function cd(a,b,c,d){if(b.widgets)for(var e=
-0;e<b.widgets.length;++e)if(b.widgets[e].above){var f=ub(b.widgets[e]);c.top+=f;c.bottom+=f}if("line"==d)return c;d||(d="local");b=ea(b);b="local"==d?b+a.display.lineSpace.offsetTop:b-a.display.viewOffset;if("page"==d||"window"==d)a=a.display.lineSpace.getBoundingClientRect(),b+=a.top+("window"==d?0:window.pageYOffset||(document.documentElement||document.body).scrollTop),d=a.left+("window"==d?0:window.pageXOffset||(document.documentElement||document.body).scrollLeft),c.left+=d,c.right+=d;c.top+=b;
-c.bottom+=b;return c}function ne(a,b,c){if("div"==c)return b;var d=b.left;b=b.top;"page"==c?(d-=window.pageXOffset||(document.documentElement||document.body).scrollLeft,b-=window.pageYOffset||(document.documentElement||document.body).scrollTop):"local"!=c&&c||(c=a.display.sizer.getBoundingClientRect(),d+=c.left,b+=c.top);a=a.display.lineSpace.getBoundingClientRect();return{left:d-a.left,top:b-a.top}}function Yb(a,b,c,d,e){d||(d=u(a.doc,b.line));var f=d;b=b.ch;d=$c(a,Zb(a,d),b,e);return cd(a,f,d,c)}
-function ma(a,b,c,d,e,f){function g(b,g){var h=$c(a,e,b,g?"right":"left",f);g?h.left=h.right:h.right=h.left;return cd(a,d,h,c)}function h(a,b){var c=k[b],d=c.level%2;a==dd(c)&&b&&c.level<k[b-1].level?(c=k[--b],a=ed(c)-(c.level%2?0:1),d=!0):a==ed(c)&&b<k.length-1&&c.level<k[b+1].level&&(c=k[++b],a=dd(c)-c.level%2,d=!1);return d&&a==c.to&&a>c.from?g(a-1):g(a,d)}d=d||u(a.doc,b.line);e||(e=Zb(a,d));var k=Y(d);b=b.ch;if(!k)return g(b);var l=Sb(k,b),l=h(b,l);null!=vb&&(l.other=h(b,vb));return l}function oe(a,
-b){var c=0;b=w(a.doc,b);a.options.lineWrapping||(c=gb(a.display)*b.ch);var d=u(a.doc,b.line),e=ea(d)+a.display.lineSpace.offsetTop;return{left:c,right:c,top:e,bottom:e+d.height}}function $b(a,b,c,d){a=r(a,b);a.xRel=d;c&&(a.outside=!0);return a}function fd(a,b,c){var d=a.doc;c+=a.display.viewOffset;if(0>c)return $b(d.first,0,!0,-1);var e=Ba(d,c),f=d.first+d.size-1;if(e>f)return $b(d.first+d.size-1,u(d,f).text.length,!0,1);0>b&&(b=0);for(d=u(d,e);;)if(e=Ef(a,d,e,b,c),f=(d=Aa(d,!1))&&d.find(0,!0),d&&
-(e.ch>f.from.ch||e.ch==f.from.ch&&0<e.xRel))e=F(d=f.to.line);else return e}function Ef(a,b,c,d,e){function f(d){d=ma(a,r(c,d),"line",b,l);h=!0;if(g>d.bottom)return d.left-k;if(g<d.top)return d.left+k;h=!1;return d.left}var g=e-ea(b),h=!1,k=2*a.display.wrapper.clientWidth,l=Zb(a,b),m=Y(b),p=b.text.length;e=ac(b);var n=bc(b),E=f(e),q=h,t=f(n),u=h;if(d>t)return $b(c,n,u,1);for(;;){if(m?n==e||n==gd(b,e,1):1>=n-e){m=d<E||d-E<=t-d?e:n;for(d-=m==e?E:t;tb(b.text.charAt(m));)++m;return $b(c,m,m==e?q:u,-1>
-d?-1:1<d?1:0)}var v=Math.ceil(p/2),w=e+v;if(m)for(var w=e,x=0;x<v;++x)w=gd(b,w,1);x=f(w);if(x>d){n=w;t=x;if(u=h)t+=1E3;p=v}else e=w,E=x,q=h,p-=v}}function xa(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==Fa){Fa=t("pre");for(var b=0;49>b;++b)Fa.appendChild(document.createTextNode("x")),Fa.appendChild(t("br"));Fa.appendChild(document.createTextNode("x"))}U(a.measure,Fa);b=Fa.offsetHeight/50;3<b&&(a.cachedTextHeight=b);za(a.measure);return b||1}function gb(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;
-var b=t("span","xxxxxxxxxx"),c=t("pre",[b]);U(a.measure,c);b=b.getBoundingClientRect();b=(b.right-b.left)/10;2<b&&(a.cachedCharWidth=b);return b||10}function Ja(a){a.curOp={cm:a,viewChanged:!1,startHeight:a.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Ff};Ta?Ta.ops.push(a.curOp):a.curOp.ownsGroup=Ta={ops:[a.curOp],delayedCallbacks:[]}}
-function La(a){if(a=a.curOp.ownsGroup)try{var b=a.delayedCallbacks,c=0;do{for(;c<b.length;c++)b[c]();for(var d=0;d<a.ops.length;d++){var e=a.ops[d];if(e.cursorActivityHandlers)for(;e.cursorActivityCalled<e.cursorActivityHandlers.length;)e.cursorActivityHandlers[e.cursorActivityCalled++](e.cm)}}while(c<b.length)}finally{Ta=null;for(b=0;b<a.ops.length;b++)a.ops[b].cm.curOp=null;a=a.ops;for(b=0;b<a.length;b++){var e=a[b],c=e.cm,f=d=c.display;!f.scrollbarsClipped&&f.scroller.offsetWidth&&(f.nativeBarWidth=
-f.scroller.offsetWidth-f.scroller.clientWidth,f.heightForcer.style.height=da(c)+"px",f.sizer.style.marginBottom=-f.nativeBarWidth+"px",f.sizer.style.borderRightWidth=da(c)+"px",f.scrollbarsClipped=!0);e.updateMaxLine&&Dc(c);e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<d.viewFrom||e.scrollToPos.to.line>=d.viewTo)||d.maxLineChanged&&c.options.lineWrapping;e.update=e.mustUpdate&&new Mb(c,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}for(b=
-0;b<a.length;b++)e=a[b],e.updatedDisplay=e.mustUpdate&&Lc(e.cm,e.update);for(b=0;b<a.length;b++)if(e=a[b],c=e.cm,d=c.display,e.updatedDisplay&&Lb(c),e.barMeasure=jb(c),d.maxLineChanged&&!c.options.lineWrapping&&(f=void 0,f=d.maxLine.text.length,f=$c(c,Zb(c,d.maxLine),f,void 0),e.adjustWidthTo=f.left+3,c.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(d.scroller.clientWidth,d.sizer.offsetLeft+e.adjustWidthTo+da(c)+c.display.barWidth),e.maxScrollLeft=Math.max(0,d.sizer.offsetLeft+
-e.adjustWidthTo-pa(c))),e.updatedDisplay||e.selectionChanged)e.preparedSelection=d.input.prepareSelection();for(b=0;b<a.length;b++)e=a[b],c=e.cm,null!=e.adjustWidthTo&&(c.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<c.doc.scrollLeft&&Ma(c,Math.min(c.display.scroller.scrollLeft,e.maxScrollLeft),!0),c.display.maxLineChanged=!1),e.preparedSelection&&c.display.input.showSelection(e.preparedSelection),e.updatedDisplay&&Oc(c,e.barMeasure),(e.updatedDisplay||e.startHeight!=c.doc.height)&&
-Na(c,e.barMeasure),e.selectionChanged&&Yc(c),c.state.focused&&e.updateInput&&c.display.input.reset(e.typing),e.focus&&e.focus==fa()&&Ud(e.cm);for(b=0;b<a.length;b++){e=a[b];c=e.cm;d=c.display;f=c.doc;e.updatedDisplay&&Md(c,e.update);null==d.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(d.wheelStartX=d.wheelStartY=null);null==e.scrollTop||d.scroller.scrollTop==e.scrollTop&&!e.forceScroll||(f.scrollTop=Math.max(0,Math.min(d.scroller.scrollHeight-d.scroller.clientHeight,e.scrollTop)),
-d.scrollbars.setScrollTop(f.scrollTop),d.scroller.scrollTop=f.scrollTop);null==e.scrollLeft||d.scroller.scrollLeft==e.scrollLeft&&!e.forceScroll||(f.scrollLeft=Math.max(0,Math.min(d.scroller.scrollWidth-pa(c),e.scrollLeft)),d.scrollbars.setScrollLeft(f.scrollLeft),d.scroller.scrollLeft=f.scrollLeft,Bc(c));if(e.scrollToPos){var g=void 0,h=w(f,e.scrollToPos.from),g=w(f,e.scrollToPos.to),k=e.scrollToPos.margin;null==k&&(k=0);for(var l=0;5>l;l++){var m=!1,p=ma(c,h),n=g&&g!=h?ma(c,g):p,n=cc(c,Math.min(p.left,
-n.left),Math.min(p.top,n.top)-k,Math.max(p.left,n.left),Math.max(p.bottom,n.bottom)+k),q=c.doc.scrollTop,r=c.doc.scrollLeft;null!=n.scrollTop&&(lb(c,n.scrollTop),1<Math.abs(c.doc.scrollTop-q)&&(m=!0));null!=n.scrollLeft&&(Ma(c,n.scrollLeft),1<Math.abs(c.doc.scrollLeft-r)&&(m=!0));if(!m)break}g=p;e.scrollToPos.isCursor&&c.state.focused&&(ja(c,"scrollCursorIntoView")||(k=c.display,l=k.sizer.getBoundingClientRect(),h=null,0>g.top+l.top?h=!0:g.bottom+l.top>(window.innerHeight||document.documentElement.clientHeight)&&
-(h=!1),null==h||Gf||(g=t("div","​",null,"position: absolute; top: "+(g.top-k.viewOffset-c.display.lineSpace.offsetTop)+"px; height: "+(g.bottom-g.top+da(c)+k.barHeight)+"px; left: "+g.left+"px; width: 2px;"),c.display.lineSpace.appendChild(g),g.scrollIntoView(h),c.display.lineSpace.removeChild(g))))}h=e.maybeHiddenMarkers;g=e.maybeUnhiddenMarkers;if(h)for(k=0;k<h.length;++k)h[k].lines.length||K(h[k],"hide");if(g)for(k=0;k<g.length;++k)g[k].lines.length&&K(g[k],"unhide");d.wrapper.offsetHeight&&(f.scrollTop=
-c.display.scroller.scrollTop);e.changeObjs&&K(c,"changes",c,e.changeObjs);e.update&&e.update.finish()}}}function T(a,b){if(a.curOp)return b();Ja(a);try{return b()}finally{La(a)}}function G(a,b){return function(){if(a.curOp)return b.apply(a,arguments);Ja(a);try{return b.apply(a,arguments)}finally{La(a)}}}function M(a){return function(){if(this.curOp)return a.apply(this,arguments);Ja(this);try{return a.apply(this,arguments)}finally{La(this)}}}function N(a){return function(){var b=this.cm;if(!b||b.curOp)return a.apply(this,
-arguments);Ja(b);try{return a.apply(this,arguments)}finally{La(b)}}}function ke(a,b,c){for(var d=this.line=b,e;d=Aa(d,!1);)d=d.find(1,!0).line,(e||(e=[])).push(d);this.size=(this.rest=e)?F(A(this.rest))-c+1:1;this.node=this.text=null;this.hidden=ya(a,b)}function Nb(a,b,c){var d=[],e;for(e=b;e<c;)b=new ke(a.doc,u(a.doc,e),e),e+=b.size,d.push(b);return d}function Q(a,b,c,d){null==b&&(b=a.doc.first);null==c&&(c=a.doc.first+a.doc.size);d||(d=0);var e=a.display;d&&c<e.viewTo&&(null==e.updateLineNumbers||
-e.updateLineNumbers>b)&&(e.updateLineNumbers=b);a.curOp.viewChanged=!0;if(b>=e.viewTo)ra&&Mc(a.doc,b)<e.viewTo&&qa(a);else if(c<=e.viewFrom)ra&&Ld(a.doc,c+d)>e.viewFrom?qa(a):(e.viewFrom+=d,e.viewTo+=d);else if(b<=e.viewFrom&&c>=e.viewTo)qa(a);else if(b<=e.viewFrom){var f=dc(a,c,c+d,1);f?(e.view=e.view.slice(f.index),e.viewFrom=f.lineN,e.viewTo+=d):qa(a)}else if(c>=e.viewTo)(f=dc(a,b,b,-1))?(e.view=e.view.slice(0,f.index),e.viewTo=f.lineN):qa(a);else{var f=dc(a,b,b,-1),g=dc(a,c,c+d,1);f&&g?(e.view=
-e.view.slice(0,f.index).concat(Nb(a,f.lineN,g.lineN)).concat(e.view.slice(g.index)),e.viewTo+=d):qa(a)}if(a=e.externalMeasured)c<a.lineN?a.lineN+=d:b<a.lineN+a.size&&(e.externalMeasured=null)}function na(a,b,c){a.curOp.viewChanged=!0;var d=a.display,e=a.display.externalMeasured;e&&b>=e.lineN&&b<e.lineN+e.size&&(d.externalMeasured=null);b<d.viewFrom||b>=d.viewTo||(a=d.view[Ca(a,b)],null!=a.node&&(a=a.changes||(a.changes=[]),-1==D(a,c)&&a.push(c)))}function qa(a){a.display.viewFrom=a.display.viewTo=
-a.doc.first;a.display.view=[];a.display.viewOffset=0}function Ca(a,b){if(b>=a.display.viewTo)return null;b-=a.display.viewFrom;if(0>b)return null;for(var c=a.display.view,d=0;d<c.length;d++)if(b-=c[d].size,0>b)return d}function dc(a,b,c,d){var e=Ca(a,b),f=a.display.view;if(!ra||c==a.doc.first+a.doc.size)return{index:e,lineN:c};for(var g=0,h=a.display.viewFrom;g<e;g++)h+=f[g].size;if(h!=b){if(0<d){if(e==f.length-1)return null;b=h+f[e].size-b;e++}else b=h-b;c+=b}for(;Mc(a.doc,c)!=c;){if(e==(0>d?0:f.length-
-1))return null;c+=d*f[e-(0>d?1:0)].size;e+=d}return{index:e,lineN:c}}function Kd(a){a=a.display.view;for(var b=0,c=0;c<a.length;c++){var d=a[c];d.hidden||d.node&&!d.changes||++b}return b}function sf(a){function b(){d.activeTouch&&(e=setTimeout(function(){d.activeTouch=null},1E3),f=d.activeTouch,f.end=+new Date)}function c(a,b){if(null==b.left)return!0;var c=b.left-a.left,d=b.top-a.top;return 400<c*c+d*d}var d=a.display;v(d.scroller,"mousedown",G(a,pe));B&&11>C?v(d.scroller,"dblclick",G(a,function(b){if(!ja(a,
-b)){var c=Ua(a,b);!c||hd(a,b,"gutterClick",!0,L)||oa(a.display,b)||(O(b),b=a.findWordAt(c),Ub(a.doc,b.anchor,b.head))}})):v(d.scroller,"dblclick",function(b){ja(a,b)||O(b)});id||v(d.scroller,"contextmenu",function(b){qe(a,b)});var e,f={end:0};v(d.scroller,"touchstart",function(a){var b;1!=a.touches.length?b=!1:(b=a.touches[0],b=1>=b.radiusX&&1>=b.radiusY);b||(clearTimeout(e),b=+new Date,d.activeTouch={start:b,moved:!1,prev:300>=b-f.end?f:null},1==a.touches.length&&(d.activeTouch.left=a.touches[0].pageX,
-d.activeTouch.top=a.touches[0].pageY))});v(d.scroller,"touchmove",function(){d.activeTouch&&(d.activeTouch.moved=!0)});v(d.scroller,"touchend",function(e){var f=d.activeTouch;if(f&&!oa(d,e)&&null!=f.left&&!f.moved&&300>new Date-f.start){var g=a.coordsChar(d.activeTouch,"page"),f=!f.prev||c(f,f.prev)?new z(g,g):!f.prev.prev||c(f,f.prev.prev)?a.findWordAt(g):new z(r(g.line,0),w(a.doc,r(g.line+1,0)));a.setSelection(f.anchor,f.head);a.focus();O(e)}b()});v(d.scroller,"touchcancel",b);v(d.scroller,"scroll",
-function(){d.scroller.clientHeight&&(lb(a,d.scroller.scrollTop),Ma(a,d.scroller.scrollLeft,!0),K(a,"scroll",a))});v(d.scroller,"mousewheel",function(b){re(a,b)});v(d.scroller,"DOMMouseScroll",function(b){re(a,b)});v(d.wrapper,"scroll",function(){d.wrapper.scrollTop=d.wrapper.scrollLeft=0});d.dragFunctions={simple:function(b){ja(a,b)||jd(b)},start:function(b){if(B&&(!a.state.draggingText||100>+new Date-se))jd(b);else if(!ja(a,b)&&!oa(a.display,b)&&(b.dataTransfer.setData("Text",a.getSelection()),b.dataTransfer.setDragImage&&
-!te)){var c=t("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw\x3d\x3d";ba&&(c.width=c.height=1,a.display.wrapper.appendChild(c),c._top=c.offsetTop);b.dataTransfer.setDragImage(c,0,0);ba&&c.parentNode.removeChild(c)}},drop:G(a,Hf)};var g=d.input.getField();v(g,"keyup",function(b){ue.call(a,b)});v(g,"keydown",G(a,ve));v(g,"keypress",G(a,we));v(g,"focus",cb(xc,a));v(g,"blur",cb(db,a))}function If(a){var b=a.display;
-if(b.lastWrapHeight!=b.wrapper.clientHeight||b.lastWrapWidth!=b.wrapper.clientWidth)b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null,b.scrollbarsClipped=!1,a.setSize()}function oa(a,b){for(var c=b.target||b.srcElement;c!=a.wrapper;c=c.parentNode)if(!c||1==c.nodeType&&"true"==c.getAttribute("cm-ignore-events")||c.parentNode==a.sizer&&c!=a.mover)return!0}function Ua(a,b,c,d){var e=a.display;if(!c&&"true"==(b.target||b.srcElement).getAttribute("cm-not-content"))return null;var f,g;c=e.lineSpace.getBoundingClientRect();
-try{f=b.clientX-c.left,g=b.clientY-c.top}catch(h){return null}b=fd(a,f,g);var k;d&&1==b.xRel&&(k=u(a.doc,b.line).text).length==b.ch&&(d=aa(k,k.length,a.options.tabSize)-k.length,b=r(b.line,Math.max(0,Math.round((f-ie(a.display).left)/gb(a.display))-d)));return b}function pe(a){var b=this.display;if(!(b.activeTouch&&b.input.supportsTouch()||ja(this,a)))if(b.shift=a.shiftKey,oa(b,a))J||(b.scroller.draggable=!1,setTimeout(function(){b.scroller.draggable=!0},100));else if(!hd(this,a,"gutterClick",!0,
-L)){var c=Ua(this,a);window.focus();switch(xe(a)){case 1:c?Jf(this,a,c):(a.target||a.srcElement)==b.scroller&&O(a);break;case 2:J&&(this.state.lastMiddleDown=+new Date);c&&Ub(this.doc,c);setTimeout(function(){b.input.focus()},20);O(a);break;case 3:id?qe(this,a):Kf(this)}}}function Jf(a,b,c){B?setTimeout(cb(Ud,a),0):a.curOp.focus=fa();var d=+new Date,e;ec&&ec.time>d-400&&0==y(ec.pos,c)?e="triple":fc&&fc.time>d-400&&0==y(fc.pos,c)?(e="double",ec={time:d,pos:c}):(e="single",fc={time:d,pos:c});var d=
-a.doc.sel,f=W?b.metaKey:b.ctrlKey,g;a.options.dragDrop&&Lf&&!Rb(a)&&"single"==e&&-1<(g=d.contains(c))&&!d.ranges[g].empty()?Mf(a,b,c,f):Nf(a,b,c,e,f)}function Mf(a,b,c,d){var e=a.display,f=+new Date,g=G(a,function(h){J&&(e.scroller.draggable=!1);a.state.draggingText=!1;ka(document,"mouseup",g);ka(e.scroller,"drop",g);10>Math.abs(b.clientX-h.clientX)+Math.abs(b.clientY-h.clientY)&&(O(h),!d&&+new Date-200<f&&Ub(a.doc,c),J||B&&9==C?setTimeout(function(){document.body.focus();e.input.focus()},20):e.input.focus())});
-J&&(e.scroller.draggable=!0);a.state.draggingText=g;e.scroller.dragDrop&&e.scroller.dragDrop();v(document,"mouseup",g);v(e.scroller,"drop",g)}function Nf(a,b,c,d,e){function f(b){if(0!=y(x,b))if(x=b,"rect"==d){for(var e=[],f=a.options.tabSize,g=aa(u(l,c.line).text,c.ch,f),h=aa(u(l,b.line).text,b.ch,f),k=Math.min(g,h),g=Math.max(g,h),h=Math.min(c.line,b.line),q=Math.min(a.lastLine(),Math.max(c.line,b.line));h<=q;h++){var E=u(l,h).text,t=ye(E,k,f);k==g?e.push(new z(r(h,t),r(h,t))):E.length>t&&e.push(new z(r(h,
-t),r(h,ye(E,g,f))))}e.length||e.push(new z(c,c));H(l,Z(n.ranges.slice(0,p).concat(e),p),{origin:"*mouse",scroll:!1});a.scrollIntoView(b)}else e=m,f=e.anchor,k=b,"single"!=d&&(b="double"==d?a.findWordAt(b):new z(r(b.line,0),w(l,r(b.line+1,0))),0<y(b.anchor,f)?(k=b.head,f=Qb(e.from(),b.anchor)):(k=b.anchor,f=Pb(e.to(),b.head))),e=n.ranges.slice(0),e[p]=new z(w(l,f),k),H(l,Z(e,p),kd)}function g(b){var c=++A,e=Ua(a,b,!0,"rect"==d);if(e)if(0!=y(e,x)){a.curOp.focus=fa();f(e);var h=Hc(k,l);(e.line>=h.to||
-e.line<h.from)&&setTimeout(G(a,function(){A==c&&g(b)}),150)}else{var m=b.clientY<B.top?-20:b.clientY>B.bottom?20:0;m&&setTimeout(G(a,function(){A==c&&(k.scroller.scrollTop+=m,g(b))}),50)}}function h(a){A=Infinity;O(a);k.input.focus();ka(document,"mousemove",F);ka(document,"mouseup",C);l.history.lastSelOrigin=null}var k=a.display,l=a.doc;O(b);var m,p,n=l.sel,q=n.ranges;e&&!b.shiftKey?(p=l.sel.contains(c),m=-1<p?q[p]:new z(c,c)):(m=l.sel.primary(),p=l.sel.primIndex);if(b.altKey)d="rect",e||(m=new z(c,
-c)),c=Ua(a,b,!0,!0),p=-1;else if("double"==d){var t=a.findWordAt(c);m=a.display.shift||l.extend?rb(l,m,t.anchor,t.head):t}else"triple"==d?(t=new z(r(c.line,0),w(l,r(c.line+1,0))),m=a.display.shift||l.extend?rb(l,m,t.anchor,t.head):t):m=rb(l,m,c);e?-1==p?(p=q.length,H(l,Z(q.concat([m]),p),{scroll:!1,origin:"*mouse"})):1<q.length&&q[p].empty()&&"single"==d&&!b.shiftKey?(H(l,Z(q.slice(0,p).concat(q.slice(p+1)),0)),n=l.sel):Xc(l,p,m,kd):(p=0,H(l,new la([m],0),kd),n=l.sel);var x=c,B=k.wrapper.getBoundingClientRect(),
-A=0,F=G(a,function(a){xe(a)?g(a):h(a)}),C=G(a,h);v(document,"mousemove",F);v(document,"mouseup",C)}function hd(a,b,c,d,e){try{var f=b.clientX,g=b.clientY}catch(h){return!1}if(f>=Math.floor(a.display.gutters.getBoundingClientRect().right))return!1;d&&O(b);d=a.display;var k=d.lineDiv.getBoundingClientRect();if(g>k.bottom||!S(a,c))return ld(b);g-=k.top-d.viewOffset;for(k=0;k<a.options.gutters.length;++k){var l=d.gutters.childNodes[k];if(l&&l.getBoundingClientRect().right>=f)return f=Ba(a.doc,g),e(a,
-c,a,f,a.options.gutters[k],b),ld(b)}}function Hf(a){var b=this;if(!ja(b,a)&&!oa(b.display,a)){O(a);B&&(se=+new Date);var c=Ua(b,a,!0),d=a.dataTransfer.files;if(c&&!Rb(b))if(d&&d.length&&window.FileReader&&window.File){var e=d.length,f=Array(e),g=0;a=function(a,d){var h=new FileReader;h.onload=G(b,function(){f[d]=h.result;if(++g==e){c=w(b.doc,c);var a={from:c,to:c,text:sa(f.join("\n")),origin:"paste"};Oa(b.doc,a);be(b.doc,ga(c,ta(a)))}});h.readAsText(a)};for(var h=0;h<e;++h)a(d[h],h)}else if(b.state.draggingText&&
--1<b.doc.sel.contains(c))b.state.draggingText(a),setTimeout(function(){b.display.input.focus()},20);else try{if(f=a.dataTransfer.getData("Text")){if(b.state.draggingText&&(W?!a.altKey:!a.ctrlKey))var k=b.listSelections();Vb(b.doc,ga(c,c));if(k)for(h=0;h<k.length;++h)wb(b.doc,"",k[h].anchor,k[h].head,"drag");b.replaceSelection(f,"around","paste");b.display.input.focus()}}catch(l){}}}function lb(a,b){2>Math.abs(a.doc.scrollTop-b)||(a.doc.scrollTop=b,wa||Pc(a,{top:b}),a.display.scroller.scrollTop!=b&&
-(a.display.scroller.scrollTop=b),a.display.scrollbars.setScrollTop(b),wa&&Pc(a),fb(a,100))}function Ma(a,b,c){(c?b==a.doc.scrollLeft:2>Math.abs(a.doc.scrollLeft-b))||(b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),a.doc.scrollLeft=b,Bc(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbars.setScrollLeft(b))}function re(a,b){var c=ze(b),d=c.x,c=c.y,e=a.display,f=e.scroller;if(d&&f.scrollWidth>f.clientWidth||c&&f.scrollHeight>f.clientHeight){if(c&&
-W&&J){var g=b.target,h=e.view;a:for(;g!=f;g=g.parentNode)for(var k=0;k<h.length;k++)if(h[k].node==g){a.display.currentWheelTarget=g;break a}}!d||wa||ba||null==R?(c&&null!=R&&(g=c*R,h=a.doc.scrollTop,k=h+e.wrapper.clientHeight,0>g?h=Math.max(0,h+g-50):k=Math.min(a.doc.height,k+g+50),Pc(a,{top:h,bottom:k})),20>gc&&(null==e.wheelStartX?(e.wheelStartX=f.scrollLeft,e.wheelStartY=f.scrollTop,e.wheelDX=d,e.wheelDY=c,setTimeout(function(){if(null!=e.wheelStartX){var a=f.scrollLeft-e.wheelStartX,b=f.scrollTop-
-e.wheelStartY,a=b&&e.wheelDY&&b/e.wheelDY||a&&e.wheelDX&&a/e.wheelDX;e.wheelStartX=e.wheelStartY=null;a&&(R=(R*gc+a)/(gc+1),++gc)}},200)):(e.wheelDX+=d,e.wheelDY+=c))):(c&&lb(a,Math.max(0,Math.min(f.scrollTop+c*R,f.scrollHeight-f.clientHeight))),Ma(a,Math.max(0,Math.min(f.scrollLeft+d*R,f.scrollWidth-f.clientWidth))),O(b),e.wheelStartX=null)}}function hc(a,b,c){if("string"==typeof b&&(b=ic[b],!b))return!1;a.display.input.ensurePolled();var d=a.display.shift,e=!1;try{Rb(a)&&(a.state.suppressEdits=
-!0),c&&(a.display.shift=!1),e=b(a)!=Ae}finally{a.display.shift=d,a.state.suppressEdits=!1}return e}function Of(a,b,c){for(var d=0;d<a.state.keyMaps.length;d++){var e=xb(b,a.state.keyMaps[d],c,a);if(e)return e}return a.options.extraKeys&&xb(b,a.options.extraKeys,c,a)||xb(b,a.options.keyMap,c,a)}function jc(a,b,c,d){var e=a.state.keySeq;if(e){if(Pf(b))return"handled";Qf.set(50,function(){a.state.keySeq==e&&(a.state.keySeq=null,a.display.input.reset())});b=e+" "+b}d=Of(a,b,d);"multi"==d&&(a.state.keySeq=
-b);"handled"==d&&L(a,"keyHandled",a,b,c);if("handled"==d||"multi"==d)O(c),Yc(a);return e&&!d&&/\'$/.test(b)?(O(c),!0):!!d}function Be(a,b){var c=Rf(b,!0);return c?b.shiftKey&&!a.state.keySeq?jc(a,"Shift-"+c,b,function(b){return hc(a,b,!0)})||jc(a,c,b,function(b){if("string"==typeof b?/^go[A-Z]/.test(b):b.motion)return hc(a,b)}):jc(a,c,b,function(b){return hc(a,b)}):!1}function Sf(a,b,c){return jc(a,"'"+c+"'",b,function(b){return hc(a,b,!0)})}function ve(a){this.curOp.focus=fa();if(!ja(this,a)){B&&
-11>C&&27==a.keyCode&&(a.returnValue=!1);var b=a.keyCode;this.display.shift=16==b||a.shiftKey;var c=Be(this,a);ba&&(md=c?b:null,!c&&88==b&&!Ce&&(W?a.metaKey:a.ctrlKey)&&this.replaceSelection("",null,"cut"));18!=b||/\bCodeMirror-crosshair\b/.test(this.display.lineDiv.className)||Tf(this)}}function Tf(a){function b(a){18!=a.keyCode&&a.altKey||(kb(c,"CodeMirror-crosshair"),ka(document,"keyup",b),ka(document,"mouseover",b))}var c=a.display.lineDiv;mb(c,"CodeMirror-crosshair");v(document,"keyup",b);v(document,
-"mouseover",b)}function ue(a){16==a.keyCode&&(this.doc.sel.shift=!1);ja(this,a)}function we(a){if(!(oa(this.display,a)||ja(this,a)||a.ctrlKey&&!a.altKey||W&&a.metaKey)){var b=a.keyCode,c=a.charCode;if(ba&&b==md)md=null,O(a);else if(!ba||a.which&&!(10>a.which)||!Be(this,a))if(b=String.fromCharCode(null==c?b:c),!Sf(this,a,b))this.display.input.onKeyPress(a)}}function Kf(a){a.state.delayingBlurEvent=!0;setTimeout(function(){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1,db(a))},100)}function xc(a){a.state.delayingBlurEvent&&
-(a.state.delayingBlurEvent=!1);"nocursor"!=a.options.readOnly&&(a.state.focused||(K(a,"focus",a),a.state.focused=!0,mb(a.display.wrapper,"CodeMirror-focused"),a.curOp||a.display.selForContextMenu==a.doc.sel||(a.display.input.reset(),J&&setTimeout(function(){a.display.input.reset(!0)},20)),a.display.input.receivedFocus()),Yc(a))}function db(a){a.state.delayingBlurEvent||(a.state.focused&&(K(a,"blur",a),a.state.focused=!1,kb(a.display.wrapper,"CodeMirror-focused")),clearInterval(a.display.blinker),
-setTimeout(function(){a.state.focused||(a.display.shift=!1)},150))}function qe(a,b){var c;(c=oa(a.display,b))||(c=S(a,"gutterContextMenu")?hd(a,b,"gutterContextMenu",!1,K):!1);if(!c)a.display.input.onContextMenu(b)}function De(a,b){if(0>y(a,b.from))return a;if(0>=y(a,b.to))return ta(b);var c=a.line+b.text.length-(b.to.line-b.from.line)-1,d=a.ch;a.line==b.to.line&&(d+=ta(b).ch-b.to.ch);return r(c,d)}function nd(a,b){for(var c=[],d=0;d<a.sel.ranges.length;d++){var e=a.sel.ranges[d];c.push(new z(De(e.anchor,
-b),De(e.head,b)))}return Z(c,a.sel.primIndex)}function Ee(a,b,c){return a.line==b.line?r(c.line,a.ch-b.ch+c.ch):r(c.line+(a.line-b.line),a.ch)}function Fe(a,b,c){b={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){this.canceled=!0}};c&&(b.update=function(b,c,f,g){b&&(this.from=w(a,b));c&&(this.to=w(a,c));f&&(this.text=f);void 0!==g&&(this.origin=g)});K(a,"beforeChange",a,b);a.cm&&K(a.cm,"beforeChange",a.cm,b);return b.canceled?null:{from:b.from,to:b.to,text:b.text,origin:b.origin}}
-function Oa(a,b,c){if(a.cm){if(!a.cm.curOp)return G(a.cm,Oa)(a,b,c);if(a.cm.state.suppressEdits)return}if(S(a,"beforeChange")||a.cm&&S(a.cm,"beforeChange"))if(b=Fe(a,b,!0),!b)return;if(c=Ge&&!c&&Uf(a,b.from,b.to))for(var d=c.length-1;0<=d;--d)He(a,{from:c[d].from,to:c[d].to,text:d?[""]:b.text});else He(a,b)}function He(a,b){if(1!=b.text.length||""!=b.text[0]||0!=y(b.from,b.to)){var c=nd(a,b);Ie(a,b,c,a.cm?a.cm.curOp.id:NaN);yb(a,b,c,od(a,b));var d=[];Ga(a,function(a,c){c||-1!=D(d,a.history)||(Je(a.history,
-b),d.push(a.history));yb(a,b,null,od(a,b))})}}function kc(a,b,c){if(!a.cm||!a.cm.state.suppressEdits){for(var d=a.history,e,f=a.sel,g="undo"==b?d.done:d.undone,h="undo"==b?d.undone:d.done,k=0;k<g.length&&(e=g[k],c?!e.ranges||e.equals(a.sel):e.ranges);k++);if(k!=g.length){for(d.lastOrigin=d.lastSelOrigin=null;;)if(e=g.pop(),e.ranges){Wb(e,h);if(c&&!e.equals(a.sel)){H(a,e,{clearRedo:!1});return}f=e}else break;c=[];Wb(f,h);h.push({changes:c,generation:d.generation});d.generation=e.generation||++d.maxGeneration;
-d=S(a,"beforeChange")||a.cm&&S(a.cm,"beforeChange");for(k=e.changes.length-1;0<=k;--k){var l=e.changes[k];l.origin=b;if(d&&!Fe(a,l,!1)){g.length=0;break}c.push(pd(a,l));f=k?nd(a,l):A(g);yb(a,l,f,Ke(a,l));!k&&a.cm&&a.cm.scrollIntoView({from:l.from,to:ta(l)});var m=[];Ga(a,function(a,b){b||-1!=D(m,a.history)||(Je(a.history,l),m.push(a.history));yb(a,l,null,Ke(a,l))})}}}}function Le(a,b){if(0!=b&&(a.first+=b,a.sel=new la(ob(a.sel.ranges,function(a){return new z(r(a.anchor.line+b,a.anchor.ch),r(a.head.line+
-b,a.head.ch))}),a.sel.primIndex),a.cm)){Q(a.cm,a.first,a.first-b,b);for(var c=a.cm.display,d=c.viewFrom;d<c.viewTo;d++)na(a.cm,d,"gutter")}}function yb(a,b,c,d){if(a.cm&&!a.cm.curOp)return G(a.cm,yb)(a,b,c,d);if(b.to.line<a.first)Le(a,b.text.length-1-(b.to.line-b.from.line));else if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);Le(a,e);b={from:r(a.first,0),to:r(b.to.line+e,b.to.ch),text:[A(b.text)],origin:b.origin}}e=a.lastLine();b.to.line>e&&(b=
-{from:b.from,to:r(e,u(a,e).text.length),text:[b.text[0]],origin:b.origin});b.removed=Da(a,b.from,b.to);c||(c=nd(a,b));a.cm?Vf(a.cm,b,d):qd(a,b,d);Vb(a,c,ha)}}function Vf(a,b,c){var d=a.doc,e=a.display,f=b.from,g=b.to,h=!1,k=f.line;a.options.lineWrapping||(k=F(ia(u(d,f.line))),d.iter(k,g.line+1,function(a){if(a==e.maxLine)return h=!0}));-1<d.sel.contains(b.from,b.to)&&fe(a);qd(d,b,c,Id(a));a.options.lineWrapping||(d.iter(k,f.line+b.text.length,function(a){var b=Kb(a);b>e.maxLineLength&&(e.maxLine=
-a,e.maxLineLength=b,e.maxLineChanged=!0,h=!1)}),h&&(a.curOp.updateMaxLine=!0));d.frontier=Math.min(d.frontier,f.line);fb(a,400);c=b.text.length-(g.line-f.line)-1;b.full?Q(a):f.line!=g.line||1!=b.text.length||Me(a.doc,b)?Q(a,f.line,g.line+1,c):na(a,f.line,"text");c=S(a,"changes");if((d=S(a,"change"))||c)b={from:f,to:g,text:b.text,removed:b.removed,origin:b.origin},d&&L(a,"change",a,b),c&&(a.curOp.changeObjs||(a.curOp.changeObjs=[])).push(b);a.display.selForContextMenu=null}function wb(a,b,c,d,e){d||
-(d=c);if(0>y(d,c)){var f=d;d=c;c=f}"string"==typeof b&&(b=sa(b));Oa(a,{from:c,to:d,text:b,origin:e})}function cc(a,b,c,d,e){var f=a.display,g=xa(a.display);0>c&&(c=0);var h=a.curOp&&null!=a.curOp.scrollTop?a.curOp.scrollTop:f.scroller.scrollTop,k=Nc(a),l={};e-c>k&&(e=c+k);var m=a.doc.height+Ec(f),p=c<g,g=e>m-g;c<h?l.scrollTop=p?0:c:e>h+k&&(c=Math.min(c,(g?m:e)-k),c!=h&&(l.scrollTop=c));h=a.curOp&&null!=a.curOp.scrollLeft?a.curOp.scrollLeft:f.scroller.scrollLeft;a=pa(a)-(a.options.fixedGutter?f.gutters.offsetWidth:
-0);(f=d-b>a)&&(d=b+a);10>b?l.scrollLeft=0:b<h?l.scrollLeft=Math.max(0,b-(f?0:10)):d>a+h-3&&(l.scrollLeft=d+(f?0:10)-a);return l}function lc(a,b,c){null==b&&null==c||mc(a);null!=b&&(a.curOp.scrollLeft=(null==a.curOp.scrollLeft?a.doc.scrollLeft:a.curOp.scrollLeft)+b);null!=c&&(a.curOp.scrollTop=(null==a.curOp.scrollTop?a.doc.scrollTop:a.curOp.scrollTop)+c)}function Pa(a){mc(a);var b=a.getCursor(),c=b,d=b;a.options.lineWrapping||(c=b.ch?r(b.line,b.ch-1):b,d=r(b.line,b.ch+1));a.curOp.scrollToPos={from:c,
-to:d,margin:a.options.cursorScrollMargin,isCursor:!0}}function mc(a){var b=a.curOp.scrollToPos;if(b){a.curOp.scrollToPos=null;var c=oe(a,b.from),d=oe(a,b.to),b=cc(a,Math.min(c.left,d.left),Math.min(c.top,d.top)-b.margin,Math.max(c.right,d.right),Math.max(c.bottom,d.bottom)+b.margin);a.scrollTo(b.scrollLeft,b.scrollTop)}}function pb(a,b,c,d){var e=a.doc,f;null==c&&(c="add");"smart"==c&&(e.mode.indent?f=sb(a,b):c="prev");var g=a.options.tabSize,h=u(e,b),k=aa(h.text,null,g);h.stateAfter&&(h.stateAfter=
-null);var l=h.text.match(/^\s*/)[0],m;if(!d&&!/\S/.test(h.text))m=0,c="not";else if("smart"==c&&(m=e.mode.indent(f,h.text.slice(l.length),h.text),m==Ae||150<m)){if(!d)return;c="prev"}"prev"==c?m=b>e.first?aa(u(e,b-1).text,null,g):0:"add"==c?m=k+a.options.indentUnit:"subtract"==c?m=k-a.options.indentUnit:"number"==typeof c&&(m=k+c);m=Math.max(0,m);c="";d=0;if(a.options.indentWithTabs)for(a=Math.floor(m/g);a;--a)d+=g,c+="\t";d<m&&(c+=Ne(m-d));if(c!=l)return wb(e,c,r(b,0),r(b,l.length),"+input"),h.stateAfter=
-null,!0;for(a=0;a<e.sel.ranges.length;a++)if(g=e.sel.ranges[a],g.head.line==b&&g.head.ch<l.length){d=r(b,l.length);Xc(e,a,new z(d,d));break}}function nc(a,b,c,d){var e=b,f=b;"number"==typeof b?f=u(a,Math.max(a.first,Math.min(b,a.first+a.size-1))):e=F(b);if(null==e)return null;d(f,e)&&a.cm&&na(a.cm,e,c);return f}function Va(a,b){for(var c=a.doc.sel.ranges,d=[],e=0;e<c.length;e++){for(var f=b(c[e]);d.length&&0>=y(f.from,A(d).to);){var g=d.pop();if(0>y(g.from,f.from)){f.from=g.from;break}}d.push(f)}T(a,
-function(){for(var b=d.length-1;0<=b;b--)wb(a.doc,"",d[b].from,d[b].to,"+delete");Pa(a)})}function rd(a,b,c,d,e){function f(b){var d=(e?gd:Oe)(l,h,c,!0);if(null==d){if(b=!b)b=g+c,b<a.first||b>=a.first+a.size?b=m=!1:(g=b,b=l=u(a,b));if(b)h=e?(0>c?bc:ac)(l):0>c?l.text.length:0;else return m=!1}else h=d;return!0}var g=b.line,h=b.ch,k=c,l=u(a,g),m=!0;if("char"==d)f();else if("column"==d)f(!0);else if("word"==d||"group"==d){var p=null;d="group"==d;b=a.cm&&a.cm.getHelper(b,"wordChars");for(var n=!0;!(0>
-c)||f(!n);n=!1){var q=l.text.charAt(h)||"\n",q=oc(q,b)?"w":d&&"\n"==q?"n":!d||/\s/.test(q)?null:"p";!d||n||q||(q="s");if(p&&p!=q){0>c&&(c=1,f());break}q&&(p=q);if(0<c&&!f(!n))break}}k=Xb(a,r(g,h),k,!0);m||(k.hitSide=!0);return k}function Pe(a,b,c,d){var e=a.doc,f=b.left,g;"page"==d?(g=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),g=b.top+c*(g-(0>c?1.5:.5)*xa(a.display))):"line"==d&&(g=0<c?b.bottom+3:b.top-3);for(;;){b=fd(a,f,g);if(!b.outside)break;
-if(0>c?0>=g:g>=e.height){b.hitSide=!0;break}g+=5*c}return b}function x(a,b,c,d){q.defaults[a]=b;c&&(Ka[a]=d?function(a,b,d){d!=Fd&&c(a,b,d)}:c)}function Wf(a){var b=a.split(/-(?!$)/);a=b[b.length-1];for(var c,d,e,f,g=0;g<b.length-1;g++){var h=b[g];if(/^(cmd|meta|m)$/i.test(h))f=!0;else if(/^a(lt)?$/i.test(h))c=!0;else if(/^(c|ctrl|control)$/i.test(h))d=!0;else if(/^s(hift)$/i.test(h))e=!0;else throw Error("Unrecognized modifier name: "+h);}c&&(a="Alt-"+a);d&&(a="Ctrl-"+a);f&&(a="Cmd-"+a);e&&(a="Shift-"+
-a);return a}function pc(a){return"string"==typeof a?ua[a]:a}function Wa(a,b,c,d,e){if(d&&d.shared)return Xf(a,b,c,d,e);if(a.cm&&!a.cm.curOp)return G(a.cm,Wa)(a,b,c,d,e);var f=new Ha(a,e);e=y(b,c);d&&V(d,f,!1);if(0<e||0==e&&!1!==f.clearWhenEmpty)return f;f.replacedWith&&(f.collapsed=!0,f.widgetNode=t("span",[f.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||f.widgetNode.setAttribute("cm-ignore-events","true"),d.insertLeft&&(f.widgetNode.insertLeft=!0));if(f.collapsed){if(Qe(a,b.line,b,c,f)||
-b.line!=c.line&&Qe(a,c.line,b,c,f))throw Error("Inserting collapsed marker partially overlapping an existing one");ra=!0}f.addToHistory&&Ie(a,{from:b,to:c,origin:"markText"},a.sel,NaN);var g=b.line,h=a.cm,k;a.iter(g,c.line+1,function(a){h&&f.collapsed&&!h.options.lineWrapping&&ia(a)==h.display.maxLine&&(k=!0);f.collapsed&&g!=b.line&&ca(a,0);var d=new qc(f,g==b.line?b.ch:null,g==c.line?c.ch:null);a.markedSpans=a.markedSpans?a.markedSpans.concat([d]):[d];d.marker.attachLine(a);++g});f.collapsed&&a.iter(b.line,
-c.line+1,function(b){ya(a,b)&&ca(b,0)});f.clearOnEnter&&v(f,"beforeCursorEnter",function(){f.clear()});f.readOnly&&(Ge=!0,(a.history.done.length||a.history.undone.length)&&a.clearHistory());f.collapsed&&(f.id=++sd,f.atomic=!0);if(h){k&&(h.curOp.updateMaxLine=!0);if(f.collapsed)Q(h,b.line,c.line+1);else if(f.className||f.title||f.startStyle||f.endStyle||f.css)for(d=b.line;d<=c.line;d++)na(h,d,"text");f.atomic&&ge(h.doc);L(h,"markerAdded",h,f)}return f}function Xf(a,b,c,d,e){d=V(d);d.shared=!1;var f=
-[Wa(a,b,c,d,e)],g=f[0],h=d.widgetNode;Ga(a,function(a){h&&(d.widgetNode=h.cloneNode(!0));f.push(Wa(a,w(a,b),w(a,c),d,e));for(var l=0;l<a.linked.length;++l)if(a.linked[l].isParent)return;g=A(f)});return new rc(f,g)}function Re(a){return a.findMarks(r(a.first,0),a.clipPos(r(a.lastLine())),function(a){return a.parent})}function Yf(a){for(var b=0;b<a.length;b++){var c=a[b],d=[c.primary.doc];Ga(c.primary.doc,function(a){d.push(a)});for(var e=0;e<c.markers.length;e++){var f=c.markers[e];-1==D(d,f.doc)&&
-(f.parent=null,c.markers.splice(e--,1))}}}function qc(a,b,c){this.marker=a;this.from=b;this.to=c}function zb(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function od(a,b){if(b.full)return null;var c=qb(a,b.from.line)&&u(a,b.from.line).markedSpans,d=qb(a,b.to.line)&&u(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=0==y(b.from,b.to);if(c)for(var h=0,k;h<c.length;++h){var l=c[h],m=l.marker;if(null==l.from||(m.inclusiveLeft?l.from<=e:l.from<e)||
-!(l.from!=e||"bookmark"!=m.type||g&&l.marker.insertLeft)){var p=null==l.to||(m.inclusiveRight?l.to>=e:l.to>e);(k||(k=[])).push(new qc(m,l.from,p?null:l.to))}}c=k;if(d)for(var h=0,n;h<d.length;++h)if(k=d[h],l=k.marker,null==k.to||(l.inclusiveRight?k.to>=f:k.to>f)||k.from==f&&"bookmark"==l.type&&(!g||k.marker.insertLeft))m=null==k.from||(l.inclusiveLeft?k.from<=f:k.from<f),(n||(n=[])).push(new qc(l,m?null:k.from-f,null==k.to?null:k.to-f));d=n;g=1==b.text.length;n=A(b.text).length+(g?e:0);if(c)for(f=
-0;f<c.length;++f)if(h=c[f],null==h.to)(k=zb(d,h.marker),k)?g&&(h.to=null==k.to?null:k.to+n):h.to=e;if(d)for(f=0;f<d.length;++f)h=d[f],null!=h.to&&(h.to+=n),null==h.from?(k=zb(c,h.marker),k||(h.from=n,g&&(c||(c=[])).push(h))):(h.from+=n,g&&(c||(c=[])).push(h));c&&(c=Se(c));d&&d!=c&&(d=Se(d));e=[c];if(!g){var g=b.text.length-2,q;if(0<g&&c)for(f=0;f<c.length;++f)null==c[f].to&&(q||(q=[])).push(new qc(c[f].marker,null,null));for(f=0;f<g;++f)e.push(q);e.push(d)}return e}function Se(a){for(var b=0;b<a.length;++b){var c=
-a[b];null!=c.from&&c.from==c.to&&!1!==c.marker.clearWhenEmpty&&a.splice(b--,1)}return a.length?a:null}function Ke(a,b){var c;if(c=b["spans_"+a.id]){for(var d=0,e=[];d<b.text.length;++d)e.push(Zf(c[d]));c=e}else c=null;d=od(a,b);if(!c)return d;if(!d)return c;for(e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g){var h=0;a:for(;h<g.length;++h){for(var k=g[h],l=0;l<f.length;++l)if(f[l].marker==k.marker)continue a;f.push(k)}}else g&&(c[e]=g)}return c}function Uf(a,b,c){var d=null;a.iter(b.line,c.line+1,function(a){if(a.markedSpans)for(var b=
-0;b<a.markedSpans.length;++b){var c=a.markedSpans[b].marker;!c.readOnly||d&&-1!=D(d,c)||(d||(d=[])).push(c)}});if(!d)return null;a=[{from:b,to:c}];for(b=0;b<d.length;++b){c=d[b];for(var e=c.find(0),f=0;f<a.length;++f){var g=a[f];if(!(0>y(g.to,e.from)||0<y(g.from,e.to))){var h=[f,1],k=y(g.from,e.from),l=y(g.to,e.to);(0>k||!c.inclusiveLeft&&!k)&&h.push({from:g.from,to:e.from});(0<l||!c.inclusiveRight&&!l)&&h.push({from:e.to,to:g.to});a.splice.apply(a,h);f+=h.length-1}}}return a}function Te(a){var b=
-a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);a.markedSpans=null}}function Ue(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function Ve(a,b){var c=a.lines.length-b.lines.length;if(0!=c)return c;var c=a.find(),d=b.find(),e=y(c.from,d.from)||(a.inclusiveLeft?-1:0)-(b.inclusiveLeft?-1:0);return e?-e:(c=y(c.to,d.to)||(a.inclusiveRight?1:0)-(b.inclusiveRight?1:0))?c:b.id-a.id}function Aa(a,b){var c=ra&&a.markedSpans,d;if(c)for(var e,f=0;f<c.length;++f)e=
-c[f],e.marker.collapsed&&null==(b?e.from:e.to)&&(!d||0>Ve(d,e.marker))&&(d=e.marker);return d}function Qe(a,b,c,d,e){a=u(a,b);if(a=ra&&a.markedSpans)for(b=0;b<a.length;++b){var f=a[b];if(f.marker.collapsed){var g=f.marker.find(0),h=y(g.from,c)||(f.marker.inclusiveLeft?-1:0)-(e.inclusiveLeft?-1:0),k=y(g.to,d)||(f.marker.inclusiveRight?1:0)-(e.inclusiveRight?1:0);if(!(0<=h&&0>=k||0>=h&&0<=k)&&(0>=h&&(0<y(g.to,c)||f.marker.inclusiveRight&&e.inclusiveLeft)||0<=h&&(0>y(g.from,d)||f.marker.inclusiveLeft&&
-e.inclusiveRight)))return!0}}}function ia(a){for(var b;b=Aa(a,!0);)a=b.find(-1,!0).line;return a}function Mc(a,b){var c=u(a,b),d=ia(c);return c==d?b:F(d)}function Ld(a,b){if(b>a.lastLine())return b;var c=u(a,b),d;if(!ya(a,c))return b;for(;d=Aa(c,!1);)c=d.find(1,!0).line;return F(c)+1}function ya(a,b){var c=ra&&b.markedSpans;if(c)for(var d,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed&&(null==d.from||!d.marker.widgetNode&&0==d.from&&d.marker.inclusiveLeft&&td(a,b,d)))return!0}function td(a,b,c){if(null==
-c.to)return b=c.marker.find(1,!0),td(a,b.line,zb(b.line.markedSpans,c.marker));if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var d,e=0;e<b.markedSpans.length;++e)if(d=b.markedSpans[e],d.marker.collapsed&&!d.marker.widgetNode&&d.from==c.to&&(null==d.to||d.to!=c.from)&&(d.marker.inclusiveLeft||c.marker.inclusiveRight)&&td(a,b,d))return!0}function ub(a){if(null!=a.height)return a.height;var b=a.doc.cm;if(!b)return 0;if(!Wc(document.body,a.node)){var c="position: relative;";a.coverGutter&&
-(c+="margin-left: -"+b.display.gutters.offsetWidth+"px;");a.noHScroll&&(c+="width: "+b.display.wrapper.clientWidth+"px;");U(b.display.measure,t("div",[a.node],null,c))}return a.height=a.node.offsetHeight}function $f(a,b,c,d){var e=new sc(a,c,d),f=a.cm;f&&e.noHScroll&&(f.display.alignWidgets=!0);nc(a,b,"widget",function(b){var c=b.widgets||(b.widgets=[]);null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e);e.line=b;f&&!ya(a,b)&&(c=ea(b)<a.scrollTop,ca(b,b.height+ub(e)),
-c&&lc(f,null,e.height),f.curOp.forceUpdate=!0);return!0});return e}function We(a,b){if(a)for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:(new RegExp("(?:^|s)"+c[2]+"(?:$|s)")).test(b[d])||(b[d]+=" "+c[2])}return a}function Xe(a,b){if(a.blankLine)return a.blankLine(b);if(a.innerMode){var c=q.innerMode(a,b);if(c.mode.blankLine)return c.mode.blankLine(c.state)}}function ud(a,
-b,c,d){for(var e=0;10>e;e++){d&&(d[0]=q.innerMode(a,c).mode);var f=a.token(b,c);if(b.pos>b.start)return f}throw Error("Mode "+a.name+" failed to advance stream.");}function Ye(a,b,c,d){function e(a){return{start:m.start,end:m.pos,string:m.current(),type:h||null,state:a?Sa(f.mode,l):l}}var f=a.doc,g=f.mode,h;b=w(f,b);var k=u(f,b.line),l=sb(a,b.line,c),m=new tc(k.text,a.options.tabSize),p;for(d&&(p=[]);(d||m.pos<b.ch)&&!m.eol();)m.start=m.pos,h=ud(g,m,l),d&&p.push(e(!0));return d?p:e()}function Ze(a,
-b,c,d,e,f,g){var h=c.flattenSpans;null==h&&(h=a.options.flattenSpans);var k=0,l=null,m=new tc(b,a.options.tabSize),p,n=a.options.addModeClass&&[null];for(""==b&&We(Xe(c,d),f);!m.eol();){m.pos>a.options.maxHighlightLength?(h=!1,g&&Zc(a,b,d,m.pos),m.pos=b.length,p=null):p=We(ud(c,m,d,n),f);if(n){var q=n[0].name;q&&(p="m-"+(p?q+" "+p:q))}if(!h||l!=p){for(;k<m.start;)k=Math.min(m.start,k+5E4),e(k,l);l=p}m.start=m.pos}for(;k<m.pos;)a=Math.min(m.pos,k+5E4),e(a,l),k=a}function je(a,b,c,d){var e=[a.state.modeGen],
-f={};Ze(a,b.text,a.doc.mode,c,function(a,b){e.push(a,b)},f,d);for(c=0;c<a.state.overlays.length;++c){var g=a.state.overlays[c],h=1,k=0;Ze(a,b.text,g.mode,!0,function(a,b){for(var c=h;k<a;){var d=e[h];d>a&&e.splice(h,1,a,e[h+1],d);h+=2;k=Math.min(a,d)}if(b)if(g.opaque)e.splice(c,h-c,a,"cm-overlay "+b),h=c+2;else for(;c<h;c+=2)d=e[c+1],e[c+1]=(d?d+" ":"")+"cm-overlay "+b},f)}return{styles:e,classes:f.bgClass||f.textClass?f:null}}function $e(a,b,c){if(!b.styles||b.styles[0]!=a.state.modeGen){var d=je(a,
-b,b.stateAfter=sb(a,F(b)));b.styles=d.styles;d.classes?b.styleClasses=d.classes:b.styleClasses&&(b.styleClasses=null);c===a.doc.frontier&&a.doc.frontier++}return b.styles}function Zc(a,b,c,d){var e=a.doc.mode,f=new tc(b,a.options.tabSize);f.start=f.pos=d||0;for(""==b&&Xe(e,c);!f.eol()&&f.pos<=a.options.maxHighlightLength;)ud(e,f,c),f.start=f.pos}function af(a,b){if(!a||/^\s*$/.test(a))return null;var c=b.addModeClass?ag:bg;return c[a]||(c[a]=a.replace(/\S+/g,"cm-$\x26"))}function Sd(a,b){var c=t("span",
-null,null,J?"padding-right: .1px":null),c={pre:t("pre",[c]),content:c,col:0,pos:0,cm:a,splitSpaces:(B||J)&&a.getOption("lineWrapping")};b.measure={};for(var d=0;d<=(b.rest?b.rest.length:0);d++){var e=d?b.rest[d-1]:b.line,f;c.pos=0;c.addToken=cg;var g;if(null!=vd)g=vd;else{g=U(a.display.measure,document.createTextNode("AخA"));var h=Ea(g,0,1).getBoundingClientRect();g=h&&h.left!=h.right?vd=3>Ea(g,1,2).getBoundingClientRect().right-h.right:!1}g&&(f=Y(e))&&(c.addToken=dg(c.addToken,f));c.map=[];h=b!=
-a.display.externalMeasured&&F(e);a:{g=c;var h=$e(a,e,h),k=e.markedSpans,l=e.text,m=0;if(k)for(var p=l.length,n=0,q=1,r="",u=void 0,v=void 0,w=0,x=void 0,y=void 0,A=void 0,C=void 0,z=void 0;;){if(w==n){for(var x=y=A=C=v="",z=null,w=Infinity,G=[],H=0;H<k.length;++H){var I=k[H],D=I.marker;"bookmark"==D.type&&I.from==n&&D.widgetNode?G.push(D):I.from<=n&&(null==I.to||I.to>n||D.collapsed&&I.to==n&&I.from==n)?(null!=I.to&&I.to!=n&&w>I.to&&(w=I.to,y=""),D.className&&(x+=" "+D.className),D.css&&(v=D.css),
-D.startStyle&&I.from==n&&(A+=" "+D.startStyle),D.endStyle&&I.to==w&&(y+=" "+D.endStyle),D.title&&!C&&(C=D.title),D.collapsed&&(!z||0>Ve(z.marker,D))&&(z=I)):I.from>n&&w>I.from&&(w=I.from)}if(z&&(z.from||0)==n){bf(g,(null==z.to?p+1:z.to)-n,z.marker,null==z.from);if(null==z.to)break a;z.to==n&&(z=!1)}if(!z&&G.length)for(H=0;H<G.length;++H)bf(g,0,G[H])}if(n>=p)break;for(G=Math.min(p,w);;){if(r){H=n+r.length;z||(I=H>G?r.slice(0,G-n):r,g.addToken(g,I,u?u+x:x,A,n+I.length==w?y:"",C,v));if(H>=G){r=r.slice(G-
-n);n=G;break}n=H;A=""}r=l.slice(m,m=h[q++]);u=af(h[q++],g.cm.options)}}else for(var q=1;q<h.length;q+=2)g.addToken(g,l.slice(m,m=h[q]),af(h[q+1],g.cm.options))}e.styleClasses&&(e.styleClasses.bgClass&&(c.bgClass=wd(e.styleClasses.bgClass,c.bgClass||"")),e.styleClasses.textClass&&(c.textClass=wd(e.styleClasses.textClass,c.textClass||"")));0==c.map.length&&c.map.push(0,0,c.content.appendChild(eg(a.display.measure)));0==d?(b.measure.map=c.map,b.measure.cache={}):((b.measure.maps||(b.measure.maps=[])).push(c.map),
-(b.measure.caches||(b.measure.caches=[])).push({}))}J&&/\bcm-tab\b/.test(c.content.lastChild.className)&&(c.content.className="cm-tab-wrap-hack");K(a,"renderLine",a,b.line,c.pre);c.pre.className&&(c.textClass=wd(c.pre.className,c.textClass||""));return c}function cg(a,b,c,d,e,f,g){if(b){var h=a.splitSpaces?b.replace(/ {3,}/g,fg):b,k=a.cm.state.specialChars,l=!1;if(k.test(b))for(var m=document.createDocumentFragment(),p=0;;){k.lastIndex=p;var n=k.exec(b),q=n?n.index-p:b.length-p;if(q){var r=document.createTextNode(h.slice(p,
-p+q));B&&9>C?m.appendChild(t("span",[r])):m.appendChild(r);a.map.push(a.pos,a.pos+q,r);a.col+=q;a.pos+=q}if(!n)break;p+=q+1;"\t"==n[0]?(r=a.cm.options.tabSize,n=r-a.col%r,r=m.appendChild(t("span",Ne(n),"cm-tab")),r.setAttribute("role","presentation"),r.setAttribute("cm-text","\t"),a.col+=n):(r=a.cm.options.specialCharPlaceholder(n[0]),r.setAttribute("cm-text",n[0]),B&&9>C?m.appendChild(t("span",[r])):m.appendChild(r),a.col+=1);a.map.push(a.pos,a.pos+1,r);a.pos++}else{a.col+=b.length;var m=document.createTextNode(h);
-a.map.push(a.pos,a.pos+b.length,m);B&&9>C&&(l=!0);a.pos+=b.length}if(c||d||e||l||g)return b=c||"",d&&(b+=d),e&&(b+=e),d=t("span",[m],b,g),f&&(d.title=f),a.content.appendChild(d);a.content.appendChild(m)}}function fg(a){for(var b=" ",c=0;c<a.length-2;++c)b+=c%2?" ":" ";return b+" "}function dg(a,b){return function(c,d,e,f,g,h,k){e=e?e+" cm-force-border":"cm-force-border";for(var l=c.pos,m=l+d.length;;){for(var p=0;p<b.length;p++){var n=b[p];if(n.to>l&&n.from<=l)break}if(n.to>=m)return a(c,d,e,f,g,
-h,k);a(c,d.slice(0,n.to-l),e,f,null,h,k);f=null;d=d.slice(n.to-l);l=n.to}}}function bf(a,b,c,d){var e=!d&&c.widgetNode;e&&a.map.push(a.pos,a.pos+b,e);!d&&a.cm.display.input.needsContentAttribute&&(e||(e=a.content.appendChild(document.createElement("span"))),e.setAttribute("cm-marker",c.id));e&&(a.cm.display.input.setUneditable(e),a.content.appendChild(e));a.pos+=b}function Me(a,b){return 0==b.from.ch&&0==b.to.ch&&""==A(b.text)&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function qd(a,b,c,d){function e(a,
-c,e){a.text=c;a.stateAfter&&(a.stateAfter=null);a.styles&&(a.styles=null);null!=a.order&&(a.order=null);Te(a);Ue(a,e);c=d?d(a):1;c!=a.height&&ca(a,c);L(a,"change",a,b)}function f(a,b){for(var e=a,f=[];e<b;++e)f.push(new Ab(k[e],c?c[e]:null,d));return f}var g=b.from,h=b.to,k=b.text,l=u(a,g.line),m=u(a,h.line),p=A(k),n=c?c[k.length-1]:null,q=h.line-g.line;if(b.full)a.insert(0,f(0,k.length)),a.remove(k.length,a.size-k.length);else if(Me(a,b)){var r=f(0,k.length-1);e(m,m.text,n);q&&a.remove(g.line,q);
-r.length&&a.insert(g.line,r)}else l==m?1==k.length?e(l,l.text.slice(0,g.ch)+p+l.text.slice(h.ch),n):(r=f(1,k.length-1),r.push(new Ab(p+l.text.slice(h.ch),n,d)),e(l,l.text.slice(0,g.ch)+k[0],c?c[0]:null),a.insert(g.line+1,r)):1==k.length?(e(l,l.text.slice(0,g.ch)+k[0]+m.text.slice(h.ch),c?c[0]:null),a.remove(g.line+1,q)):(e(l,l.text.slice(0,g.ch)+k[0],c?c[0]:null),e(m,p+m.text.slice(h.ch),n),r=f(1,k.length-1),1<q&&a.remove(g.line+1,q-1),a.insert(g.line+1,r));L(a,"change",a,b)}function Bb(a){this.lines=
-a;this.parent=null;for(var b=0,c=0;b<a.length;++b)a[b].parent=this,c+=a[b].height;this.height=c}function Cb(a){this.children=a;for(var b=0,c=0,d=0;d<a.length;++d){var e=a[d],b=b+e.chunkSize(),c=c+e.height;e.parent=this}this.size=b;this.height=c;this.parent=null}function Ga(a,b,c){function d(a,f,g){if(a.linked)for(var h=0;h<a.linked.length;++h){var k=a.linked[h];if(k.doc!=f){var l=g&&k.sharedHist;if(!c||l)b(k.doc,l),d(k.doc,a,l)}}}d(a,null,!0)}function Ed(a,b){if(b.cm)throw Error("This document is already in use.");
-a.doc=b;b.cm=a;Ac(a);zc(a);a.options.lineWrapping||Dc(a);a.options.mode=b.modeOption;Q(a)}function u(a,b){b-=a.first;if(0>b||b>=a.size)throw Error("There is no line "+(b+a.first)+" in the document.");for(var c=a;!c.lines;)for(var d=0;;++d){var e=c.children[d],f=e.chunkSize();if(b<f){c=e;break}b-=f}return c.lines[b]}function Da(a,b,c){var d=[],e=b.line;a.iter(b.line,c.line+1,function(a){a=a.text;e==c.line&&(a=a.slice(0,c.ch));e==b.line&&(a=a.slice(b.ch));d.push(a);++e});return d}function xd(a,b,c){var d=
-[];a.iter(b,c,function(a){d.push(a.text)});return d}function ca(a,b){var c=b-a.height;if(c)for(var d=a;d;d=d.parent)d.height+=c}function F(a){if(null==a.parent)return null;var b=a.parent;a=D(b.lines,a);for(var c=b.parent;c;b=c,c=c.parent)for(var d=0;c.children[d]!=b;++d)a+=c.children[d].chunkSize();return a+b.first}function Ba(a,b){var c=a.first;a:do{for(var d=0;d<a.children.length;++d){var e=a.children[d],f=e.height;if(b<f){a=e;continue a}b-=f;c+=e.chunkSize()}return c}while(!a.lines);for(d=0;d<
-a.lines.length;++d){e=a.lines[d].height;if(b<e)break;b-=e}return c+d}function ea(a){a=ia(a);for(var b=0,c=a.parent,d=0;d<c.lines.length;++d){var e=c.lines[d];if(e==a)break;else b+=e.height}for(a=c.parent;a;c=a,a=c.parent)for(d=0;d<a.children.length&&(e=a.children[d],e!=c);++d)b+=e.height;return b}function Y(a){var b=a.order;null==b&&(b=a.order=gg(a.text));return b}function uc(a){this.done=[];this.undone=[];this.undoDepth=Infinity;this.lastModTime=this.lastSelTime=0;this.lastOrigin=this.lastSelOrigin=
-this.lastOp=this.lastSelOp=null;this.generation=this.maxGeneration=a||1}function pd(a,b){var c={from:Rc(b.from),to:ta(b),text:Da(a,b.from,b.to)};cf(a,c,b.from.line,b.to.line+1);Ga(a,function(a){cf(a,c,b.from.line,b.to.line+1)},!0);return c}function ce(a){for(;a.length;)if(A(a).ranges)a.pop();else break}function Ie(a,b,c,d){var e=a.history;e.undone.length=0;var f=+new Date,g,h;if(h=e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&a.cm&&e.lastModTime>f-a.cm.options.historyEventDelay||
-"*"==b.origin.charAt(0)))e.lastOp==d?(ce(e.done),g=A(e.done)):e.done.length&&!A(e.done).ranges?g=A(e.done):1<e.done.length&&!e.done[e.done.length-2].ranges?(e.done.pop(),g=A(e.done)):g=void 0,h=g;if(h){var k=A(g.changes);0==y(b.from,b.to)&&0==y(b.from,k.to)?k.to=ta(b):g.changes.push(pd(a,b))}else for((g=A(e.done))&&g.ranges||Wb(a.sel,e.done),g={changes:[pd(a,b)],generation:e.generation},e.done.push(g);e.done.length>e.undoDepth;)e.done.shift(),e.done[0].ranges||e.done.shift();e.done.push(c);e.generation=
-++e.maxGeneration;e.lastModTime=e.lastSelTime=f;e.lastOp=e.lastSelOp=d;e.lastOrigin=e.lastSelOrigin=b.origin;k||K(a,"historyAdded")}function Wb(a,b){var c=A(b);c&&c.ranges&&c.equals(a)||b.push(a)}function cf(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),function(c){c.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=c.markedSpans);++f})}function Zf(a){if(!a)return null;for(var b=0,c;b<a.length;++b)a[b].marker.explicitlyCleared?c||(c=a.slice(0,b)):c&&c.push(a[b]);
-return c?c.length?c:null:a}function Xa(a,b,c){for(var d=0,e=[];d<a.length;++d){var f=a[d];if(f.ranges)e.push(c?la.prototype.deepCopy.call(f):f);else{var f=f.changes,g=[];e.push({changes:g});for(var h=0;h<f.length;++h){var k=f[h],l;g.push({from:k.from,to:k.to,text:k.text});if(b)for(var m in k)(l=m.match(/^spans_(\d+)$/))&&-1<D(b,Number(l[1]))&&(A(g)[m]=k[m],delete k[m])}}}return e}function df(a,b,c,d){c<a.line?a.line+=d:b<a.line&&(a.line=b,a.ch=0)}function ef(a,b,c,d){for(var e=0;e<a.length;++e){var f=
-a[e],g=!0;if(f.ranges){f.copied||(f=a[e]=f.deepCopy(),f.copied=!0);for(var h=0;h<f.ranges.length;h++)df(f.ranges[h].anchor,b,c,d),df(f.ranges[h].head,b,c,d)}else{for(h=0;h<f.changes.length;++h){var k=f.changes[h];if(c<k.from.line)k.from=r(k.from.line+d,k.from.ch),k.to=r(k.to.line+d,k.to.ch);else if(b<=k.to.line){g=!1;break}}g||(a.splice(0,e+1),e=0)}}}function Je(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;ef(a.done,c,d,e);ef(a.undone,c,d,e)}function ld(a){return null!=a.defaultPrevented?
-a.defaultPrevented:0==a.returnValue}function xe(a){var b=a.which;null==b&&(a.button&1?b=1:a.button&2?b=3:a.button&4&&(b=2));W&&a.ctrlKey&&1==b&&(b=3);return b}function L(a,b){function c(a){return function(){a.apply(null,e)}}var d=a._handlers&&a._handlers[b];if(d){var e=Array.prototype.slice.call(arguments,2),f;Ta?f=Ta.delayedCallbacks:Db?f=Db:(f=Db=[],setTimeout(hg,0));for(var g=0;g<d.length;++g)f.push(c(d[g]))}}function hg(){var a=Db;Db=null;for(var b=0;b<a.length;++b)a[b]()}function ja(a,b,c){"string"==
-typeof b&&(b={type:b,preventDefault:function(){this.defaultPrevented=!0}});K(a,c||b.type,a,b);return ld(b)||b.codemirrorIgnore}function fe(a){var b=a._handlers&&a._handlers.cursorActivity;if(b){a=a.curOp.cursorActivityHandlers||(a.curOp.cursorActivityHandlers=[]);for(var c=0;c<b.length;++c)-1==D(a,b[c])&&a.push(b[c])}}function S(a,b){var c=a._handlers&&a._handlers[b];return c&&0<c.length}function Ya(a){a.prototype.on=function(a,c){v(this,a,c)};a.prototype.off=function(a,c){ka(this,a,c)}}function bb(){this.id=
-null}function ye(a,b,c){for(var d=0,e=0;;){var f=a.indexOf("\t",d);-1==f&&(f=a.length);var g=f-d;if(f==a.length||e+g>=b)return d+Math.min(g,b-e);e+=f-d;e+=c-e%c;d=f+1;if(e>=b)return d}}function Ne(a){for(;vc.length<=a;)vc.push(A(vc)+" ");return vc[a]}function A(a){return a[a.length-1]}function D(a,b){for(var c=0;c<a.length;++c)if(a[c]==b)return c;return-1}function ob(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=b(a[d],d);return c}function Eb(){}function ff(a,b){var c;Object.create?c=Object.create(a):
-(Eb.prototype=a,c=new Eb);b&&V(b,c);return c}function V(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||!1===c&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}function cb(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function oc(a,b){return b?-1<b.source.indexOf("\\w")&&gf(a)?!0:b.test(a):gf(a)}function hf(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function tb(a){return 768<=a.charCodeAt(0)&&ig.test(a)}function t(a,b,c,d){a=document.createElement(a);
-c&&(a.className=c);d&&(a.style.cssText=d);if("string"==typeof b)a.appendChild(document.createTextNode(b));else if(b)for(c=0;c<b.length;++c)a.appendChild(b[c]);return a}function za(a){for(var b=a.childNodes.length;0<b;--b)a.removeChild(a.firstChild);return a}function U(a,b){return za(a).appendChild(b)}function fa(){return document.activeElement}function Fb(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}function wd(a,b){for(var c=a.split(" "),d=0;d<c.length;d++)c[d]&&!Fb(c[d]).test(b)&&(b+=" "+c[d]);
-return b}function jf(a){if(document.body.getElementsByClassName)for(var b=document.body.getElementsByClassName("CodeMirror"),c=0;c<b.length;c++){var d=b[c].CodeMirror;d&&a(d)}}function tf(){var a;v(window,"resize",function(){null==a&&(a=setTimeout(function(){a=null;jf(If)},100))});v(window,"blur",function(){jf(db)})}function eg(a){if(null==yd){var b=t("span","​");U(a,t("span",[b,document.createTextNode("x")]));0!=a.firstChild.offsetHeight&&(yd=1>=b.offsetWidth&&2<b.offsetHeight&&!(B&&8>C))}a=yd?t("span",
-"​"):t("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");a.setAttribute("cm-text","");return a}function Af(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;f<a.length;++f){var g=a[f];if(g.from<c&&g.to>b||b==c&&g.to==b)d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0}e||d(b,c,"ltr")}function dd(a){return a.level%2?a.to:a.from}function ed(a){return a.level%2?a.from:a.to}function ac(a){return(a=Y(a))?dd(a[0]):0}function bc(a){var b=Y(a);return b?ed(A(b)):a.text.length}
-function kf(a,b){var c=u(a.doc,b),d=ia(c);d!=c&&(b=F(d));d=(c=Y(d))?c[0].level%2?bc(d):ac(d):0;return r(b,d)}function lf(a,b){var c=kf(a,b.line),d=u(a.doc,c.line),e=Y(d);return e&&0!=e[0].level?c:(d=Math.max(0,d.text.search(/\S/)),r(c.line,b.line==c.line&&b.ch<=d&&b.ch?0:d))}function Sb(a,b){vb=null;for(var c=0,d;c<a.length;++c){var e=a[c];if(e.from<b&&e.to>b)return c;if(e.from==b||e.to==b)if(null==d)d=c;else{var f;f=e.level;var g=a[d].level,h=a[0].level;f=f==h?!0:g==h?!1:f<g;if(f)return e.from!=
-e.to&&(vb=d),c;e.from!=e.to&&(vb=c);break}}return d}function zd(a,b,c,d){if(!d)return b+c;do b+=c;while(0<b&&tb(a.text.charAt(b)));return b}function gd(a,b,c,d){var e=Y(a);if(!e)return Oe(a,b,c,d);var f=Sb(e,b),g=e[f];for(b=zd(a,b,g.level%2?-c:c,d);;){if(b>g.from&&b<g.to)return b;if(b==g.from||b==g.to){if(Sb(e,b)==f)return b;g=e[f+c];return 0<c==g.level%2?g.to:g.from}g=e[f+=c];if(!g)return null;b=0<c==g.level%2?zd(a,g.to,-1,d):zd(a,g.from,1,d)}}function Oe(a,b,c,d){b+=c;if(d)for(;0<b&&tb(a.text.charAt(b));)b+=
-c;return 0>b||b>a.text.length?null:b}var wa=/gecko\/\d/i.test(navigator.userAgent),mf=/MSIE \d/.test(navigator.userAgent),nf=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent),B=mf||nf,C=B&&(mf?document.documentMode||6:nf[1]),J=/WebKit\//.test(navigator.userAgent),jg=J&&/Qt\/\d+\.\d+/.test(navigator.userAgent),kg=/Chrome\//.test(navigator.userAgent),ba=/Opera\//.test(navigator.userAgent),te=/Apple Computer/.test(navigator.vendor),lg=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent),
-Gf=/PhantomJS/.test(navigator.userAgent),Qa=/AppleWebKit/.test(navigator.userAgent)&&/Mobile\/\w+/.test(navigator.userAgent),ab=Qa||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent),W=Qa||/Mac/.test(navigator.platform),mg=/win/i.test(navigator.platform),Ia=ba&&navigator.userAgent.match(/Version\/(\d*\.\d*)/);Ia&&(Ia=Number(Ia[1]));Ia&&15<=Ia&&(ba=!1,J=!0);var of=W&&(jg||ba&&(null==Ia||12.11>Ia)),id=wa||B&&9<=C,Ge=!1,ra=!1;Fc.prototype=V({update:function(a){var b=
-a.scrollWidth>a.clientWidth+1,c=a.scrollHeight>a.clientHeight+1,d=a.nativeBarWidth;c?(this.vert.style.display="block",this.vert.style.bottom=b?d+"px":"0",this.vert.firstChild.style.height=Math.max(0,a.scrollHeight-a.clientHeight+(a.viewHeight-(b?d:0)))+"px"):(this.vert.style.display="",this.vert.firstChild.style.height="0");b?(this.horiz.style.display="block",this.horiz.style.right=c?d+"px":"0",this.horiz.style.left=a.barLeft+"px",this.horiz.firstChild.style.width=a.scrollWidth-a.clientWidth+(a.viewWidth-
-a.barLeft-(c?d:0))+"px"):(this.horiz.style.display="",this.horiz.firstChild.style.width="0");!this.checkedOverlay&&0<a.clientHeight&&(0==d&&this.overlayHack(),this.checkedOverlay=!0);return{right:c?d:0,bottom:b?d:0}},setScrollLeft:function(a){this.horiz.scrollLeft!=a&&(this.horiz.scrollLeft=a)},setScrollTop:function(a){this.vert.scrollTop!=a&&(this.vert.scrollTop=a)},overlayHack:function(){this.horiz.style.minHeight=this.vert.style.minWidth=W&&!lg?"12px":"18px";var a=this,b=function(b){(b.target||
-b.srcElement)!=a.vert&&(b.target||b.srcElement)!=a.horiz&&G(a.cm,pe)(b)};v(this.vert,"mousedown",b);v(this.horiz,"mousedown",b)},clear:function(){var a=this.horiz.parentNode;a.removeChild(this.horiz);a.removeChild(this.vert)}},Fc.prototype);Gc.prototype=V({update:function(){return{bottom:0,right:0}},setScrollLeft:function(){},setScrollTop:function(){},clear:function(){}},Gc.prototype);q.scrollbarModel={"native":Fc,"null":Gc};Mb.prototype.signal=function(a,b){S(a,b)&&this.events.push(arguments)};Mb.prototype.finish=
-function(){for(var a=0;a<this.events.length;a++)K.apply(null,this.events[a])};var r=q.Pos=function(a,b){if(!(this instanceof r))return new r(a,b);this.line=a;this.ch=b},y=q.cmpPos=function(a,b){return a.line-b.line||a.ch-b.ch},X=null;Tc.prototype=V({init:function(a){function b(a){if(d.somethingSelected())X=d.getSelections(),c.inaccurateSelection&&(c.prevInput="",c.inaccurateSelection=!1,f.value=X.join("\n"),Za(f));else if(d.options.lineWiseCopyCut){var b=Vd(d);X=b.text;"cut"==a.type?d.setSelections(b.ranges,
-null,ha):(c.prevInput="",f.value=b.text.join("\n"),Za(f))}else return;"cut"==a.type&&(d.state.cutIncoming=!0)}var c=this,d=this.cm,e=this.wrapper=Xd(),f=this.textarea=e.firstChild;a.wrapper.insertBefore(e,a.wrapper.firstChild);Qa&&(f.style.width="0px");v(f,"input",function(){B&&9<=C&&c.hasSelection&&(c.hasSelection=null);c.poll()});v(f,"paste",function(){if(J&&!d.state.fakedLastChar&&!(200>new Date-d.state.lastMiddleDown)){var a=f.selectionStart,b=f.selectionEnd;f.value+="$";f.selectionEnd=b;f.selectionStart=
-a;d.state.fakedLastChar=!0}d.state.pasteIncoming=!0;c.fastPoll()});v(f,"cut",b);v(f,"copy",b);v(a.scroller,"paste",function(b){oa(a,b)||(d.state.pasteIncoming=!0,c.focus())});v(a.lineSpace,"selectstart",function(b){oa(a,b)||O(b)});v(f,"compositionstart",function(){var a=d.getCursor("from");c.composing={start:a,range:d.markText(a,d.getCursor("to"),{className:"CodeMirror-composing"})}});v(f,"compositionend",function(){c.composing&&(c.poll(),c.composing.range.clear(),c.composing=null)})},prepareSelection:function(){var a=
-this.cm,b=a.display,c=a.doc,d=he(a);if(a.options.moveInputWithCursor){var a=ma(a,c.sel.primary().head,"div"),c=b.wrapper.getBoundingClientRect(),e=b.lineDiv.getBoundingClientRect();d.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,a.top+e.top-c.top));d.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,a.left+e.left-c.left))}return d},showSelection:function(a){var b=this.cm.display;U(b.cursorDiv,a.cursors);U(b.selectionDiv,a.selection);null!=a.teTop&&(this.wrapper.style.top=a.teTop+"px",this.wrapper.style.left=
-a.teLeft+"px")},reset:function(a){if(!this.contextMenuPending){var b,c,d=this.cm,e=d.doc;d.somethingSelected()?(this.prevInput="",b=e.sel.primary(),c=(b=Ce&&(100<b.to().line-b.from().line||1E3<(c=d.getSelection()).length))?"-":c||d.getSelection(),this.textarea.value=c,d.state.focused&&Za(this.textarea),B&&9<=C&&(this.hasSelection=c)):a||(this.prevInput=this.textarea.value="",B&&9<=C&&(this.hasSelection=null));this.inaccurateSelection=b}},getField:function(){return this.textarea},supportsTouch:function(){return!1},
-focus:function(){if("nocursor"!=this.cm.options.readOnly&&(!ab||fa()!=this.textarea))try{this.textarea.focus()}catch(a){}},blur:function(){this.textarea.blur()},resetPosition:function(){this.wrapper.style.top=this.wrapper.style.left=0},receivedFocus:function(){this.slowPoll()},slowPoll:function(){var a=this;a.pollingFast||a.polling.set(this.cm.options.pollInterval,function(){a.poll();a.cm.state.focused&&a.slowPoll()})},fastPoll:function(){function a(){c.poll()||b?(c.pollingFast=!1,c.slowPoll()):(b=
-!0,c.polling.set(60,a))}var b=!1,c=this;c.pollingFast=!0;c.polling.set(20,a)},poll:function(){var a=this.cm,b=this.textarea,c=this.prevInput;if(!a.state.focused||ng(b)&&!c||Rb(a)||a.options.disableInput||a.state.keySeq)return!1;a.state.pasteIncoming&&a.state.fakedLastChar&&(b.value=b.value.substring(0,b.value.length-1),a.state.fakedLastChar=!1);var d=b.value;if(d==c&&!a.somethingSelected())return!1;if(B&&9<=C&&this.hasSelection===d||W&&/[\uf700-\uf7ff]/.test(d))return a.display.input.reset(),!1;if(a.doc.sel==
-a.display.selForContextMenu){var e=d.charCodeAt(0);8203!=e||c||(c="​");if(8666==e)return this.reset(),this.cm.execCommand("undo")}for(var f=0,e=Math.min(c.length,d.length);f<e&&c.charCodeAt(f)==d.charCodeAt(f);)++f;var g=this;T(a,function(){Sc(a,d.slice(f),c.length-f,null,g.composing?"*compose":null);1E3<d.length||-1<d.indexOf("\n")?b.value=g.prevInput="":g.prevInput=d;g.composing&&(g.composing.range.clear(),g.composing.range=a.markText(g.composing.start,a.getCursor("to"),{className:"CodeMirror-composing"}))});
-return!0},ensurePolled:function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},onKeyPress:function(){B&&9<=C&&(this.hasSelection=null);this.fastPoll()},onContextMenu:function(a){function b(){if(null!=g.selectionStart){var a=e.somethingSelected(),b="​"+(a?g.value:"");g.value="⇚";g.value=b;d.prevInput=a?"":"​";g.selectionStart=1;g.selectionEnd=b.length;f.selForContextMenu=e.doc.sel}}function c(){d.contextMenuPending=!1;d.wrapper.style.position="relative";g.style.cssText=l;B&&9>C&&f.scrollbars.setScrollTop(f.scroller.scrollTop=
-k);if(null!=g.selectionStart){(!B||B&&9>C)&&b();var a=0,c=function(){f.selForContextMenu==e.doc.sel&&0==g.selectionStart&&0<g.selectionEnd&&"​"==d.prevInput?G(e,ic.selectAll)(e):10>a++?f.detectingSelectAll=setTimeout(c,500):f.input.reset()};f.detectingSelectAll=setTimeout(c,200)}}var d=this,e=d.cm,f=e.display,g=d.textarea,h=Ua(e,a),k=f.scroller.scrollTop;if(h&&!ba){e.options.resetSelectionOnContextMenu&&-1==e.doc.sel.contains(h)&&G(e,H)(e.doc,ga(h),ha);var l=g.style.cssText;d.wrapper.style.position=
-"absolute";g.style.cssText="position: fixed; width: 30px; height: 30px; top: "+(a.clientY-5)+"px; left: "+(a.clientX-5)+"px; z-index: 1000; background: "+(B?"rgba(255, 255, 255, .05)":"transparent")+"; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity\x3d5);";if(J)var m=window.scrollY;f.input.focus();J&&window.scrollTo(null,m);f.input.reset();e.somethingSelected()||(g.value=d.prevInput=" ");d.contextMenuPending=!0;f.selForContextMenu=e.doc.sel;clearTimeout(f.detectingSelectAll);
-B&&9<=C&&b();if(id){jd(a);var p=function(){ka(window,"mouseup",p);setTimeout(c,20)};v(window,"mouseup",p)}else setTimeout(c,50)}},setUneditable:Eb,needsContentAttribute:!1},Tc.prototype);Uc.prototype=V({init:function(a){function b(a){if(d.somethingSelected())X=d.getSelections(),"cut"==a.type&&d.replaceSelection("",null,"cut");else if(d.options.lineWiseCopyCut){var b=Vd(d);X=b.text;"cut"==a.type&&d.operation(function(){d.setSelections(b.ranges,0,ha);d.replaceSelection("",null,"cut")})}else return;
-if(a.clipboardData&&!Qa)a.preventDefault(),a.clipboardData.clearData(),a.clipboardData.setData("text/plain",X.join("\n"));else{var c=Xd();a=c.firstChild;d.display.lineSpace.insertBefore(c,d.display.lineSpace.firstChild);a.value=X.join("\n");var h=document.activeElement;Za(a);setTimeout(function(){d.display.lineSpace.removeChild(c);h.focus()},50)}}var c=this,d=c.cm;a=c.div=a.lineDiv;a.contentEditable="true";Wd(a);v(a,"paste",function(a){var b=a.clipboardData&&a.clipboardData.getData("text/plain");
-b&&(a.preventDefault(),d.replaceSelection(b,null,"paste"))});v(a,"compositionstart",function(a){a=a.data;c.composing={sel:d.doc.sel,data:a,startData:a};if(a){var b=d.doc.sel.primary(),g=d.getLine(b.head.line).indexOf(a,Math.max(0,b.head.ch-a.length));-1<g&&g<=b.head.ch&&(c.composing.sel=ga(r(b.head.line,g),r(b.head.line,g+a.length)))}});v(a,"compositionupdate",function(a){c.composing.data=a.data});v(a,"compositionend",function(a){var b=c.composing;b&&(a.data==b.startData||/\u200b/.test(a.data)||(b.data=
-a.data),setTimeout(function(){b.handled||c.applyComposition(b);c.composing==b&&(c.composing=null)},50))});v(a,"touchstart",function(){c.forceCompositionEnd()});v(a,"input",function(){c.composing||c.pollContent()||T(c.cm,function(){Q(d)})});v(a,"copy",b);v(a,"cut",b)},prepareSelection:function(){var a=he(this.cm,!1);a.focus=this.cm.state.focused;return a},showSelection:function(a){a&&this.cm.display.view.length&&(a.focus&&this.showPrimarySelection(),this.showMultipleSelections(a))},showPrimarySelection:function(){var a=
-window.getSelection(),b=this.cm.doc.sel.primary(),c=Tb(this.cm,a.anchorNode,a.anchorOffset),d=Tb(this.cm,a.focusNode,a.focusOffset);if(!c||c.bad||!d||d.bad||0!=y(Qb(c,d),b.from())||0!=y(Pb(c,d),b.to()))if(c=Yd(this.cm,b.from()),d=Yd(this.cm,b.to()),c||d){var e=this.cm.display.view,b=a.rangeCount&&a.getRangeAt(0);c?d||(d=e[e.length-1].measure,d=d.maps?d.maps[d.maps.length-1]:d.map,d={node:d[d.length-1],offset:d[d.length-2]-d[d.length-3]}):c={node:e[0].measure.map[2],offset:0};try{var f=Ea(c.node,c.offset,
-d.offset,d.node)}catch(g){}f&&(a.removeAllRanges(),a.addRange(f),b&&null==a.anchorNode?a.addRange(b):wa&&this.startGracePeriod());this.rememberSelection()}},startGracePeriod:function(){var a=this;clearTimeout(this.gracePeriod);this.gracePeriod=setTimeout(function(){a.gracePeriod=!1;a.selectionChanged()&&a.cm.operation(function(){a.cm.curOp.selectionChanged=!0})},20)},showMultipleSelections:function(a){U(this.cm.display.cursorDiv,a.cursors);U(this.cm.display.selectionDiv,a.selection)},rememberSelection:function(){var a=
-window.getSelection();this.lastAnchorNode=a.anchorNode;this.lastAnchorOffset=a.anchorOffset;this.lastFocusNode=a.focusNode;this.lastFocusOffset=a.focusOffset},selectionInEditor:function(){var a=window.getSelection();if(!a.rangeCount)return!1;a=a.getRangeAt(0).commonAncestorContainer;return Wc(this.div,a)},focus:function(){"nocursor"!=this.cm.options.readOnly&&this.div.focus()},blur:function(){this.div.blur()},getField:function(){return this.div},supportsTouch:function(){return!0},receivedFocus:function(){function a(){b.cm.state.focused&&
-(b.pollSelection(),b.polling.set(b.cm.options.pollInterval,a))}var b=this;this.selectionInEditor()?this.pollSelection():T(this.cm,function(){b.cm.curOp.selectionChanged=!0});this.polling.set(this.cm.options.pollInterval,a)},selectionChanged:function(){var a=window.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset},pollSelection:function(){if(!this.composing&&!this.gracePeriod&&this.selectionChanged()){var a=
-window.getSelection(),b=this.cm;this.rememberSelection();var c=Tb(b,a.anchorNode,a.anchorOffset),d=Tb(b,a.focusNode,a.focusOffset);c&&d&&T(b,function(){H(b.doc,ga(c,d),ha);if(c.bad||d.bad)b.curOp.selectionChanged=!0})}},pollContent:function(){var a=this.cm,b=a.display,c=a.doc.sel.primary(),d=c.from(),c=c.to();if(d.line<b.viewFrom||c.line>b.viewTo-1)return!1;var e;d.line==b.viewFrom||0==(e=Ca(a,d.line))?(d=F(b.view[0].line),e=b.view[0].node):(d=F(b.view[e].line),e=b.view[e-1].node.nextSibling);var f=
-Ca(a,c.line);f==b.view.length-1?(c=b.viewTo-1,b=b.view[f].node):(c=F(b.view[f+1].line)-1,b=b.view[f+1].node.previousSibling);b=sa(xf(a,e,b,d,c));for(e=Da(a.doc,r(d,0),r(c,u(a.doc,c).text.length));1<b.length&&1<e.length;)if(A(b)==A(e))b.pop(),e.pop(),c--;else if(b[0]==e[0])b.shift(),e.shift(),d++;else break;for(var g=0,f=0,h=b[0],k=e[0],l=Math.min(h.length,k.length);g<l&&h.charCodeAt(g)==k.charCodeAt(g);)++g;h=A(b);k=A(e);for(l=Math.min(h.length-(1==b.length?g:0),k.length-(1==e.length?g:0));f<l&&h.charCodeAt(h.length-
-f-1)==k.charCodeAt(k.length-f-1);)++f;b[b.length-1]=h.slice(0,h.length-f);b[0]=b[0].slice(g);d=r(d,g);c=r(c,e.length?A(e).length-f:0);if(1<b.length||b[0]||y(d,c))return wb(a.doc,b,d,c,"+input"),!0},ensurePolled:function(){this.forceCompositionEnd()},reset:function(){this.forceCompositionEnd()},forceCompositionEnd:function(){this.composing&&!this.composing.handled&&(this.applyComposition(this.composing),this.composing.handled=!0,this.div.blur(),this.div.focus())},applyComposition:function(a){a.data&&
-a.data!=a.startData&&G(this.cm,Sc)(this.cm,a.data,0,a.sel)},setUneditable:function(a){a.setAttribute("contenteditable","false")},onKeyPress:function(a){a.preventDefault();G(this.cm,Sc)(this.cm,String.fromCharCode(null==a.charCode?a.keyCode:a.charCode),0)},onContextMenu:Eb,resetPosition:Eb,needsContentAttribute:!0},Uc.prototype);q.inputStyles={textarea:Tc,contenteditable:Uc};la.prototype={primary:function(){return this.ranges[this.primIndex]},equals:function(a){if(a==this)return!0;if(a.primIndex!=
-this.primIndex||a.ranges.length!=this.ranges.length)return!1;for(var b=0;b<this.ranges.length;b++){var c=this.ranges[b],d=a.ranges[b];if(0!=y(c.anchor,d.anchor)||0!=y(c.head,d.head))return!1}return!0},deepCopy:function(){for(var a=[],b=0;b<this.ranges.length;b++)a[b]=new z(Rc(this.ranges[b].anchor),Rc(this.ranges[b].head));return new la(a,this.primIndex)},somethingSelected:function(){for(var a=0;a<this.ranges.length;a++)if(!this.ranges[a].empty())return!0;return!1},contains:function(a,b){b||(b=a);
-for(var c=0;c<this.ranges.length;c++){var d=this.ranges[c];if(0<=y(b,d.from())&&0>=y(a,d.to()))return c}return-1}};z.prototype={from:function(){return Qb(this.anchor,this.head)},to:function(){return Pb(this.anchor,this.head)},empty:function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch}};var ad={left:0,right:0,top:0,bottom:0},Fa,Ta=null,Ff=0,fc,ec,se=0,gc=0,R=null;B?R=-.53:wa?R=15:kg?R=-.7:te&&(R=-1/3);var ze=function(a){var b=a.wheelDeltaX,c=a.wheelDeltaY;null==b&&a.detail&&
-a.axis==a.HORIZONTAL_AXIS&&(b=a.detail);null==c&&a.detail&&a.axis==a.VERTICAL_AXIS?c=a.detail:null==c&&(c=a.wheelDelta);return{x:b,y:c}};q.wheelEventPixels=function(a){a=ze(a);a.x*=R;a.y*=R;return a};var Qf=new bb,md=null,ta=q.changeEnd=function(a){return a.text?r(a.from.line+a.text.length-1,A(a.text).length+(1==a.text.length?a.from.ch:0)):a.to};q.prototype={constructor:q,focus:function(){window.focus();this.display.input.focus()},setOption:function(a,b){var c=this.options,d=c[a];if(c[a]!=b||"mode"==
-a)c[a]=b,Ka.hasOwnProperty(a)&&G(this,Ka[a])(this,b,d)},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](pc(a))},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||b[c].name==a)return b.splice(c,1),!0},addOverlay:M(function(a,b){var c=a.token?a:q.getMode(this.options,a);if(c.startState)throw Error("Overlays may not be stateful.");this.state.overlays.push({mode:c,modeSpec:a,
-opaque:b&&b.opaque});this.state.modeGen++;Q(this)}),removeOverlay:M(function(a){for(var b=this.state.overlays,c=0;c<b.length;++c){var d=b[c].modeSpec;if(d==a||"string"==typeof a&&d.name==a){b.splice(c,1);this.state.modeGen++;Q(this);break}}}),indentLine:M(function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract");qb(this.doc,a)&&pb(this,a,b,c)}),indentSelection:M(function(a){for(var b=this.doc.sel.ranges,c=-1,d=0;d<b.length;d++){var e=
-b[d];if(e.empty())e.head.line>c&&(pb(this,e.head.line,a,!0),c=e.head.line,d==this.doc.sel.primIndex&&Pa(this));else{for(var f=e.from(),e=e.to(),g=Math.max(c,f.line),c=Math.min(this.lastLine(),e.line-(e.ch?0:1))+1,e=g;e<c;++e)pb(this,e,a);e=this.doc.sel.ranges;0==f.ch&&b.length==e.length&&0<e[d].from().ch&&Xc(this.doc,d,new z(f,e[d].to()),ha)}}}),getTokenAt:function(a,b){return Ye(this,a,b)},getLineTokens:function(a,b){return Ye(this,r(a),b,!0)},getTokenTypeAt:function(a){a=w(this.doc,a);var b=$e(this,
-u(this.doc,a.line)),c=0,d=(b.length-1)/2;a=a.ch;if(0==a)b=b[2];else for(;;){var e=c+d>>1;if((e?b[2*e-1]:0)>=a)d=e;else if(b[2*e+1]<a)c=e+1;else{b=b[2*e+2];break}}c=b?b.indexOf("cm-overlay "):-1;return 0>c?b:0==c?null:b.slice(0,c-1)},getModeAt:function(a){var b=this.doc.mode;return b.innerMode?q.innerMode(b,this.getTokenAt(a).state).mode:b},getHelper:function(a,b){return this.getHelpers(a,b)[0]},getHelpers:function(a,b){var c=[];if(!$a.hasOwnProperty(b))return c;var d=$a[b],e=this.getModeAt(a);if("string"==
-typeof e[b])d[e[b]]&&c.push(d[e[b]]);else if(e[b])for(var f=0;f<e[b].length;f++){var g=d[e[b][f]];g&&c.push(g)}else e.helperType&&d[e.helperType]?c.push(d[e.helperType]):d[e.name]&&c.push(d[e.name]);for(f=0;f<d._global.length;f++)g=d._global[f],g.pred(e,this)&&-1==D(c,g.val)&&c.push(g.val);return c},getStateAfter:function(a,b){var c=this.doc;a=Math.max(c.first,Math.min(null==a?c.first+c.size-1:a,c.first+c.size-1));return sb(this,a+1,b)},cursorCoords:function(a,b){var c;c=this.doc.sel.primary();c=
-null==a?c.head:"object"==typeof a?w(this.doc,a):a?c.from():c.to();return ma(this,c,b||"page")},charCoords:function(a,b){return Yb(this,w(this.doc,a),b||"page")},coordsChar:function(a,b){a=ne(this,a,b||"page");return fd(this,a.left,a.top)},lineAtHeight:function(a,b){a=ne(this,{top:a,left:0},b||"page").top;return Ba(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b){var c=!1,d;"number"==typeof a?(d=this.doc.first+this.doc.size-1,a<this.doc.first?a=this.doc.first:a>d&&(a=d,c=!0),d=u(this.doc,
-a)):d=a;return cd(this,d,{top:0,left:0},b||"page").top+(c?this.doc.height-ea(d):0)},defaultTextHeight:function(){return xa(this.display)},defaultCharWidth:function(){return gb(this.display)},setGutterMarker:M(function(a,b,c){return nc(this.doc,a,"gutter",function(a){var e=a.gutterMarkers||(a.gutterMarkers={});e[b]=c;!c&&hf(e)&&(a.gutterMarkers=null);return!0})}),clearGutter:M(function(a){var b=this,c=b.doc,d=c.first;c.iter(function(c){c.gutterMarkers&&c.gutterMarkers[a]&&(c.gutterMarkers[a]=null,
-na(b,d,"gutter"),hf(c.gutterMarkers)&&(c.gutterMarkers=null));++d})}),lineInfo:function(a){if("number"==typeof a){if(!qb(this.doc,a))return null;var b=a;a=u(this.doc,a);if(!a)return null}else if(b=F(a),null==b)return null;return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=
-ma(this,w(this.doc,a));var g=a.bottom,h=a.left;b.style.position="absolute";b.setAttribute("cm-ignore-events","true");this.display.input.setUneditable(b);f.sizer.appendChild(b);if("over"==d)g=a.top;else if("above"==d||"near"==d){var k=Math.max(f.wrapper.clientHeight,this.doc.height),l=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>k)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=k&&(g=a.bottom);h+b.offsetWidth>l&&(h=l-b.offsetWidth)}b.style.top=
-g+"px";b.style.left=b.style.right="";"right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px");c&&(a=cc(this,h,g,h+b.offsetWidth,g+b.offsetHeight),null!=a.scrollTop&&lb(this,a.scrollTop),null!=a.scrollLeft&&Ma(this,a.scrollLeft))},triggerOnKeyDown:M(ve),triggerOnKeyPress:M(we),triggerOnKeyUp:ue,execCommand:function(a){if(ic.hasOwnProperty(a))return ic[a](this)},findPosH:function(a,b,c,d){var e=1;
-0>b&&(e=-1,b=-b);var f=0;for(a=w(this.doc,a);f<b&&(a=rd(this.doc,a,e,c,d),!a.hitSide);++f);return a},moveH:M(function(a,b){var c=this;c.extendSelectionsBy(function(d){return c.display.shift||c.doc.extend||d.empty()?rd(c.doc,d.head,a,b,c.options.rtlMoveVisually):0>a?d.from():d.to()},Gb)}),deleteH:M(function(a,b){var c=this.doc;this.doc.sel.somethingSelected()?c.replaceSelection("",null,"+delete"):Va(this,function(d){var e=rd(c,d.head,a,b,!1);return 0>a?{from:e,to:d.head}:{from:d.head,to:e}})}),findPosV:function(a,
-b,c,d){var e=1;0>b&&(e=-1,b=-b);var f=0;for(a=w(this.doc,a);f<b&&(a=ma(this,a,"div"),null==d?d=a.left:a.left=d,a=Pe(this,a,e,c),!a.hitSide);++f);return a},moveV:M(function(a,b){var c=this,d=this.doc,e=[],f=!c.display.shift&&!d.extend&&d.sel.somethingSelected();d.extendSelectionsBy(function(g){if(f)return 0>a?g.from():g.to();var k=ma(c,g.head,"div");null!=g.goalColumn&&(k.left=g.goalColumn);e.push(k.left);var l=Pe(c,k,a,b);"page"==b&&g==d.sel.primary()&&lc(c,null,Yb(c,l,"div").top-k.top);return l},
-Gb);if(e.length)for(var g=0;g<d.sel.ranges.length;g++)d.sel.ranges[g].goalColumn=e[g]}),findWordAt:function(a){var b=u(this.doc,a.line).text,c=a.ch,d=a.ch;if(b){var e=this.getHelper(a,"wordChars");(0>a.xRel||d==b.length)&&c?--c:++d;for(var f=b.charAt(c),f=oc(f,e)?function(a){return oc(a,e)}:/\s/.test(f)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!oc(a)};0<c&&f(b.charAt(c-1));)--c;for(;d<b.length&&f(b.charAt(d));)++d}return new z(r(a.line,c),r(a.line,d))},toggleOverwrite:function(a){if(null==
-a||a!=this.state.overwrite)(this.state.overwrite=!this.state.overwrite)?mb(this.display.cursorDiv,"CodeMirror-overwrite"):kb(this.display.cursorDiv,"CodeMirror-overwrite"),K(this,"overwriteToggle",this,this.state.overwrite)},hasFocus:function(){return this.display.input.getField()==fa()},scrollTo:M(function(a,b){null==a&&null==b||mc(this);null!=a&&(this.curOp.scrollLeft=a);null!=b&&(this.curOp.scrollTop=b)}),getScrollInfo:function(){var a=this.display.scroller;return{left:a.scrollLeft,top:a.scrollTop,
-height:a.scrollHeight-da(this)-this.display.barHeight,width:a.scrollWidth-da(this)-this.display.barWidth,clientHeight:Nc(this),clientWidth:pa(this)}},scrollIntoView:M(function(a,b){null==a?(a={from:this.doc.sel.primary().head,to:null},null==b&&(b=this.options.cursorScrollMargin)):"number"==typeof a?a={from:r(a,0),to:null}:null==a.from&&(a={from:a,to:null});a.to||(a.to=a.from);a.margin=b||0;if(null!=a.from.line)mc(this),this.curOp.scrollToPos=a;else{var c=cc(this,Math.min(a.from.left,a.to.left),Math.min(a.from.top,
-a.to.top)-a.margin,Math.max(a.from.right,a.to.right),Math.max(a.from.bottom,a.to.bottom)+a.margin);this.scrollTo(c.scrollLeft,c.scrollTop)}}),setSize:M(function(a,b){function c(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a}var d=this;null!=a&&(d.display.wrapper.style.width=c(a));null!=b&&(d.display.wrapper.style.height=c(b));d.options.lineWrapping&&me(this);var e=d.display.viewFrom;d.doc.iter(e,d.display.viewTo,function(a){if(a.widgets)for(var b=0;b<a.widgets.length;b++)if(a.widgets[b].noHScroll){na(d,
-e,"widget");break}++e});d.curOp.forceUpdate=!0;K(d,"refresh",this)}),operation:function(a){return T(this,a)},refresh:M(function(){var a=this.display.cachedTextHeight;Q(this);this.curOp.forceUpdate=!0;hb(this);this.scrollTo(this.doc.scrollLeft,this.doc.scrollTop);Cc(this);(null==a||.5<Math.abs(a-xa(this.display)))&&Ac(this);K(this,"refresh",this)}),swapDoc:M(function(a){var b=this.doc;b.cm=null;Ed(this,a);hb(this);this.display.input.reset();this.scrollTo(a.scrollLeft,a.scrollTop);this.curOp.forceScroll=
-!0;L(this,"swapDoc",this,b);return b}),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}};Ya(q);var qf=q.defaults={},Ka=q.optionHandlers={},Fd=q.Init={toString:function(){return"CodeMirror.Init"}};x("value","",function(a,b){a.setValue(b)},!0);x("mode",null,function(a,b){a.doc.modeOption=b;zc(a)},!0);x("indentUnit",
-2,zc,!0);x("indentWithTabs",!1);x("smartIndent",!0);x("tabSize",4,function(a){eb(a);hb(a);Q(a)},!0);x("specialChars",/[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g,function(a,b,c){a.state.specialChars=new RegExp(b.source+(b.test("\t")?"":"|\t"),"g");c!=q.Init&&a.refresh()});x("specialCharPlaceholder",function(a){var b=t("span","•","cm-invalidchar");b.title="\\u"+a.charCodeAt(0).toString(16);b.setAttribute("aria-label",b.title);return b},function(a){a.refresh()},!0);x("electricChars",!0);
-x("inputStyle",ab?"contenteditable":"textarea",function(){throw Error("inputStyle can not (yet) be changed in a running editor");},!0);x("rtlMoveVisually",!mg);x("wholeLineUpdateBefore",!0);x("theme","default",function(a){Bd(a);ib(a)},!0);x("keyMap","default",function(a,b,c){b=pc(b);(c=c!=q.Init&&pc(c))&&c.detach&&c.detach(a,b);b.attach&&b.attach(a,c||null)});x("extraKeys",null);x("lineWrapping",!1,function(a){a.options.lineWrapping?(mb(a.display.wrapper,"CodeMirror-wrap"),a.display.sizer.style.minWidth=
-"",a.display.sizerWidth=null):(kb(a.display.wrapper,"CodeMirror-wrap"),Dc(a));Ac(a);Q(a);hb(a);setTimeout(function(){Na(a)},100)},!0);x("gutters",[],function(a){wc(a.options);ib(a)},!0);x("fixedGutter",!0,function(a,b){a.display.gutters.style.left=b?Ic(a.display)+"px":"0";a.refresh()},!0);x("coverGutterNextToScrollbar",!1,function(a){Na(a)},!0);x("scrollbarStyle","native",function(a){Cd(a);Na(a);a.display.scrollbars.setScrollTop(a.doc.scrollTop);a.display.scrollbars.setScrollLeft(a.doc.scrollLeft)},
-!0);x("lineNumbers",!1,function(a){wc(a.options);ib(a)},!0);x("firstLineNumber",1,ib,!0);x("lineNumberFormatter",function(a){return a},ib,!0);x("showCursorWhenSelecting",!1,nb,!0);x("resetSelectionOnContextMenu",!0);x("lineWiseCopyCut",!0);x("readOnly",!1,function(a,b){"nocursor"==b?(db(a),a.display.input.blur(),a.display.disabled=!0):(a.display.disabled=!1,b||a.display.input.reset())});x("disableInput",!1,function(a,b){b||a.display.input.reset()},!0);x("dragDrop",!0,function(a,b,c){!b!=!(c&&c!=q.Init)&&
-(c=a.display.dragFunctions,b=b?v:ka,b(a.display.scroller,"dragstart",c.start),b(a.display.scroller,"dragenter",c.simple),b(a.display.scroller,"dragover",c.simple),b(a.display.scroller,"drop",c.drop))});x("cursorBlinkRate",530);x("cursorScrollMargin",0);x("cursorHeight",1,nb,!0);x("singleCursorHeightPerLine",!0,nb,!0);x("workTime",100);x("workDelay",100);x("flattenSpans",!0,eb,!0);x("addModeClass",!1,eb,!0);x("pollInterval",100);x("undoDepth",200,function(a,b){a.doc.history.undoDepth=b});x("historyEventDelay",
-1250);x("viewportMargin",10,function(a){a.refresh()},!0);x("maxHighlightLength",1E4,eb,!0);x("moveInputWithCursor",!0,function(a,b){b||a.display.input.resetPosition()});x("tabindex",null,function(a,b){a.display.input.getField().tabIndex=b||""});x("autofocus",null);var pf=q.modes={},Hb=q.mimeModes={};q.defineMode=function(a,b){q.defaults.mode||"null"==a||(q.defaults.mode=a);2<arguments.length&&(b.dependencies=Array.prototype.slice.call(arguments,2));pf[a]=b};q.defineMIME=function(a,b){Hb[a]=b};q.resolveMode=
-function(a){if("string"==typeof a&&Hb.hasOwnProperty(a))a=Hb[a];else if(a&&"string"==typeof a.name&&Hb.hasOwnProperty(a.name)){var b=Hb[a.name];"string"==typeof b&&(b={name:b});a=ff(b,a);a.name=b.name}else if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return q.resolveMode("application/xml");return"string"==typeof a?{name:a}:a||{name:"null"}};q.getMode=function(a,b){b=q.resolveMode(b);var c=pf[b.name];if(!c)return q.getMode(a,"text/plain");c=c(a,b);if(Ib.hasOwnProperty(b.name)){var d=Ib[b.name],
-e;for(e in d)d.hasOwnProperty(e)&&(c.hasOwnProperty(e)&&(c["_"+e]=c[e]),c[e]=d[e])}c.name=b.name;b.helperType&&(c.helperType=b.helperType);if(b.modeProps)for(e in b.modeProps)c[e]=b.modeProps[e];return c};q.defineMode("null",function(){return{token:function(a){a.skipToEnd()}}});q.defineMIME("text/plain","null");var Ib=q.modeExtensions={};q.extendMode=function(a,b){var c=Ib.hasOwnProperty(a)?Ib[a]:Ib[a]={};V(b,c)};q.defineExtension=function(a,b){q.prototype[a]=b};q.defineDocExtension=function(a,b){P.prototype[a]=
-b};q.defineOption=x;var yc=[];q.defineInitHook=function(a){yc.push(a)};var $a=q.helpers={};q.registerHelper=function(a,b,c){$a.hasOwnProperty(a)||($a[a]=q[a]={_global:[]});$a[a][b]=c};q.registerGlobalHelper=function(a,b,c,d){q.registerHelper(a,b,d);$a[a]._global.push({pred:c,val:d})};var Sa=q.copyState=function(a,b){if(!0===b)return b;if(a.copyState)return a.copyState(b);var c={},d;for(d in b){var e=b[d];e instanceof Array&&(e=e.concat([]));c[d]=e}return c},Df=q.startState=function(a,b,c){return a.startState?
-a.startState(b,c):!0};q.innerMode=function(a,b){for(;a.innerMode;){var c=a.innerMode(b);if(!c||c.mode==a)break;b=c.state;a=c.mode}return c||{mode:a,state:b}};var ic=q.commands={selectAll:function(a){a.setSelection(r(a.firstLine(),0),r(a.lastLine()),ha)},singleSelection:function(a){a.setSelection(a.getCursor("anchor"),a.getCursor("head"),ha)},killLine:function(a){Va(a,function(b){if(b.empty()){var c=u(a.doc,b.head.line).text.length;return b.head.ch==c&&b.head.line<a.lastLine()?{from:b.head,to:r(b.head.line+
-1,0)}:{from:b.head,to:r(b.head.line,c)}}return{from:b.from(),to:b.to()}})},deleteLine:function(a){Va(a,function(b){return{from:r(b.from().line,0),to:w(a.doc,r(b.to().line+1,0))}})},delLineLeft:function(a){Va(a,function(a){return{from:r(a.from().line,0),to:a.from()}})},delWrappedLineLeft:function(a){Va(a,function(b){var c=a.charCoords(b.head,"div").top+5;return{from:a.coordsChar({left:0,top:c},"div"),to:b.from()}})},delWrappedLineRight:function(a){Va(a,function(b){var c=a.charCoords(b.head,"div").top+
-5,c=a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div");return{from:b.from(),to:c}})},undo:function(a){a.undo()},redo:function(a){a.redo()},undoSelection:function(a){a.undoSelection()},redoSelection:function(a){a.redoSelection()},goDocStart:function(a){a.extendSelection(r(a.firstLine(),0))},goDocEnd:function(a){a.extendSelection(r(a.lastLine()))},goLineStart:function(a){a.extendSelectionsBy(function(b){return kf(a,b.head.line)},{origin:"+move",bias:1})},goLineStartSmart:function(a){a.extendSelectionsBy(function(b){return lf(a,
-b.head)},{origin:"+move",bias:1})},goLineEnd:function(a){a.extendSelectionsBy(function(b){b=b.head.line;for(var c,d=u(a.doc,b);c=Aa(d,!1);)d=c.find(1,!0).line,b=null;c=(c=Y(d))?c[0].level%2?ac(d):bc(d):d.text.length;return r(null==b?F(d):b,c)},{origin:"+move",bias:-1})},goLineRight:function(a){a.extendSelectionsBy(function(b){b=a.charCoords(b.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:b},"div")},Gb)},goLineLeft:function(a){a.extendSelectionsBy(function(b){b=
-a.charCoords(b.head,"div").top+5;return a.coordsChar({left:0,top:b},"div")},Gb)},goLineLeftSmart:function(a){a.extendSelectionsBy(function(b){var c=a.charCoords(b.head,"div").top+5,c=a.coordsChar({left:0,top:c},"div");return c.ch<a.getLine(c.line).search(/\S/)?lf(a,b.head):c},Gb)},goLineUp:function(a){a.moveV(-1,"line")},goLineDown:function(a){a.moveV(1,"line")},goPageUp:function(a){a.moveV(-1,"page")},goPageDown:function(a){a.moveV(1,"page")},goCharLeft:function(a){a.moveH(-1,"char")},goCharRight:function(a){a.moveH(1,
-"char")},goColumnLeft:function(a){a.moveH(-1,"column")},goColumnRight:function(a){a.moveH(1,"column")},goWordLeft:function(a){a.moveH(-1,"word")},goGroupRight:function(a){a.moveH(1,"group")},goGroupLeft:function(a){a.moveH(-1,"group")},goWordRight:function(a){a.moveH(1,"word")},delCharBefore:function(a){a.deleteH(-1,"char")},delCharAfter:function(a){a.deleteH(1,"char")},delWordBefore:function(a){a.deleteH(-1,"word")},delWordAfter:function(a){a.deleteH(1,"word")},delGroupBefore:function(a){a.deleteH(-1,
-"group")},delGroupAfter:function(a){a.deleteH(1,"group")},indentAuto:function(a){a.indentSelection("smart")},indentMore:function(a){a.indentSelection("add")},indentLess:function(a){a.indentSelection("subtract")},insertTab:function(a){a.replaceSelection("\t")},insertSoftTab:function(a){for(var b=[],c=a.listSelections(),d=a.options.tabSize,e=0;e<c.length;e++){var f=c[e].from(),f=aa(a.getLine(f.line),f.ch,d);b.push(Array(d-f%d+1).join(" "))}a.replaceSelections(b)},defaultTab:function(a){a.somethingSelected()?
-a.indentSelection("add"):a.execCommand("insertTab")},transposeChars:function(a){T(a,function(){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d].head,f=u(a.doc,e.line).text;if(f)if(e.ch==f.length&&(e=new r(e.line,e.ch-1)),0<e.ch)e=new r(e.line,e.ch+1),a.replaceRange(f.charAt(e.ch-1)+f.charAt(e.ch-2),r(e.line,e.ch-2),e,"+transpose");else if(e.line>a.doc.first){var g=u(a.doc,e.line-1).text;g&&a.replaceRange(f.charAt(0)+"\n"+g.charAt(g.length-1),r(e.line-1,g.length-1),r(e.line,1),"+transpose")}c.push(new z(e,
-e))}a.setSelections(c)})},newlineAndIndent:function(a){T(a,function(){for(var b=a.listSelections().length,c=0;c<b;c++){var d=a.listSelections()[c];a.replaceRange("\n",d.anchor,d.head,"+input");a.indentLine(d.from().line+1,null,!0);Pa(a)}})},toggleOverwrite:function(a){a.toggleOverwrite()}},ua=q.keyMap={};ua.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore",
-"Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"};ua.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter",
-"Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"};ua.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp",
-"Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars"};ua.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter",
-"Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]};ua["default"]=W?ua.macDefault:ua.pcDefault;q.normalizeKeyMap=function(a){var b={},c;for(c in a)if(a.hasOwnProperty(c)){var d=
-a[c];if(!/^(name|fallthrough|(de|at)tach)$/.test(c)){if("..."!=d)for(var e=ob(c.split(" "),Wf),f=0;f<e.length;f++){var g,h;f==e.length-1?(h=c,g=d):(h=e.slice(0,f+1).join(" "),g="...");var k=b[h];if(!k)b[h]=g;else if(k!=g)throw Error("Inconsistent bindings for "+h);}delete a[c]}}for(var l in b)a[l]=b[l];return a};var xb=q.lookupKey=function(a,b,c,d){b=pc(b);var e=b.call?b.call(a,d):b[a];if(!1===e)return"nothing";if("..."===e)return"multi";if(null!=e&&c(e))return"handled";if(b.fallthrough){if("[object Array]"!=
-Object.prototype.toString.call(b.fallthrough))return xb(a,b.fallthrough,c,d);for(e=0;e<b.fallthrough.length;e++){var f=xb(a,b.fallthrough[e],c,d);if(f)return f}}},Pf=q.isModifierKey=function(a){a="string"==typeof a?a:va[a.keyCode];return"Ctrl"==a||"Alt"==a||"Shift"==a||"Mod"==a},Rf=q.keyName=function(a,b){if(ba&&34==a.keyCode&&a["char"])return!1;var c=va[a.keyCode],d=c;if(null==d||a.altGraphKey)return!1;a.altKey&&"Alt"!=c&&(d="Alt-"+d);(of?a.metaKey:a.ctrlKey)&&"Ctrl"!=c&&(d="Ctrl-"+d);(of?a.ctrlKey:
-a.metaKey)&&"Cmd"!=c&&(d="Cmd-"+d);!b&&a.shiftKey&&"Shift"!=c&&(d="Shift-"+d);return d};q.fromTextArea=function(a,b){function c(){a.value=k.getValue()}b=b?V(b):{};b.value=a.value;!b.tabindex&&a.tabIndex&&(b.tabindex=a.tabIndex);!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder);if(null==b.autofocus){var d=fa();b.autofocus=d==a||null!=a.getAttribute("autofocus")&&d==document.body}if(a.form&&(v(a.form,"submit",c),!b.leaveSubmitMethodAlone)){var e=a.form,f=e.submit;try{var g=e.submit=function(){c();
-e.submit=f;e.submit();e.submit=g}}catch(h){}}b.finishInit=function(b){b.save=c;b.getTextArea=function(){return a};b.toTextArea=function(){b.toTextArea=isNaN;c();a.parentNode.removeChild(b.getWrapperElement());a.style.display="";a.form&&(ka(a.form,"submit",c),"function"==typeof a.form.submit&&(a.form.submit=f))}};a.style.display="none";var k=q(function(b){a.parentNode.insertBefore(b,a.nextSibling)},b);return k};var tc=q.StringStream=function(a,b){this.pos=this.start=0;this.string=a;this.tabSize=b||
-8;this.lineStart=this.lastColumnPos=this.lastColumnValue=0};tc.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a?b==a:b&&(a.test?a.test(b):a(b)))return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>
-b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){a=this.string.indexOf(a,this.pos);if(-1<a)return this.pos=a,!0},backUp:function(a){this.pos-=a},column:function(){this.lastColumnPos<this.start&&(this.lastColumnValue=aa(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start);return this.lastColumnValue-(this.lineStart?
-aa(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return aa(this.string,null,this.tabSize)-(this.lineStart?aa(this.string,this.lineStart,this.tabSize):0)},match:function(a,b,c){if("string"==typeof a){var d=function(a){return c?a.toLowerCase():a},e=this.string.substr(this.pos,a.length);if(d(e)==d(a))return!1!==b&&(this.pos+=a.length),!0}else{if((a=this.string.slice(this.pos).match(a))&&0<a.index)return null;a&&!1!==b&&(this.pos+=a[0].length);return a}},current:function(){return this.string.slice(this.start,
-this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}}};var sd=0,Ha=q.TextMarker=function(a,b){this.lines=[];this.type=b;this.doc=a;this.id=++sd};Ya(Ha);Ha.prototype.clear=function(){if(!this.explicitlyCleared){var a=this.doc.cm,b=a&&!a.curOp;b&&Ja(a);if(S(this,"clear")){var c=this.find();c&&L(this,"clear",c.from,c.to)}for(var d=c=null,e=0;e<this.lines.length;++e){var f=this.lines[e],g=zb(f.markedSpans,this);a&&!this.collapsed?na(a,F(f),"text"):a&&(null!=
-g.to&&(d=F(f)),null!=g.from&&(c=F(f)));for(var h=f,k=f.markedSpans,l=g,m=void 0,p=0;p<k.length;++p)k[p]!=l&&(m||(m=[])).push(k[p]);h.markedSpans=m;null==g.from&&this.collapsed&&!ya(this.doc,f)&&a&&ca(f,xa(a.display))}if(a&&this.collapsed&&!a.options.lineWrapping)for(e=0;e<this.lines.length;++e)f=ia(this.lines[e]),g=Kb(f),g>a.display.maxLineLength&&(a.display.maxLine=f,a.display.maxLineLength=g,a.display.maxLineChanged=!0);null!=c&&a&&this.collapsed&&Q(a,c,d+1);this.lines.length=0;this.explicitlyCleared=
-!0;this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,a&&ge(a.doc));a&&L(a,"markerCleared",a,this);b&&La(a);this.parent&&this.parent.clear()}};Ha.prototype.find=function(a,b){null==a&&"bookmark"==this.type&&(a=1);for(var c,d,e=0;e<this.lines.length;++e){var f=this.lines[e],g=zb(f.markedSpans,this);if(null!=g.from&&(c=r(b?f:F(f),g.from),-1==a))return c;if(null!=g.to&&(d=r(b?f:F(f),g.to),1==a))return d}return c&&{from:c,to:d}};Ha.prototype.changed=function(){var a=this.find(-1,!0),b=this,c=this.doc.cm;
-a&&c&&T(c,function(){var d=a.line,e=F(a.line);if(e=Vc(c,e))le(e),c.curOp.selectionChanged=c.curOp.forceUpdate=!0;c.curOp.updateMaxLine=!0;ya(b.doc,d)||null==b.height||(e=b.height,b.height=null,(e=ub(b)-e)&&ca(d,d.height+e))})};Ha.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&-1!=D(b.maybeHiddenMarkers,this)||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)};Ha.prototype.detachLine=function(a){this.lines.splice(D(this.lines,
-a),1);!this.lines.length&&this.doc.cm&&(a=this.doc.cm.curOp,(a.maybeHiddenMarkers||(a.maybeHiddenMarkers=[])).push(this))};var sd=0,rc=q.SharedTextMarker=function(a,b){this.markers=a;this.primary=b;for(var c=0;c<a.length;++c)a[c].parent=this};Ya(rc);rc.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var a=0;a<this.markers.length;++a)this.markers[a].clear();L(this,"clear")}};rc.prototype.find=function(a,b){return this.primary.find(a,b)};var sc=q.LineWidget=function(a,
-b,c){if(c)for(var d in c)c.hasOwnProperty(d)&&(this[d]=c[d]);this.doc=a;this.node=b};Ya(sc);sc.prototype.clear=function(){var a=this.doc.cm,b=this.line.widgets,c=this.line,d=F(c);if(null!=d&&b){for(var e=0;e<b.length;++e)b[e]==this&&b.splice(e--,1);b.length||(c.widgets=null);var f=ub(this);ca(c,Math.max(0,c.height-f));a&&T(a,function(){var b=-f;ea(c)<(a.curOp&&a.curOp.scrollTop||a.doc.scrollTop)&&lc(a,null,b);na(a,d,"widget")})}};sc.prototype.changed=function(){var a=this.height,b=this.doc.cm,c=this.line;
-this.height=null;var d=ub(this)-a;d&&(ca(c,c.height+d),b&&T(b,function(){b.curOp.forceUpdate=!0;ea(c)<(b.curOp&&b.curOp.scrollTop||b.doc.scrollTop)&&lc(b,null,d)}))};var Ab=q.Line=function(a,b,c){this.text=a;Ue(this,b);this.height=c?c(this):1};Ya(Ab);Ab.prototype.lineNo=function(){return F(this)};var bg={},ag={};Bb.prototype={chunkSize:function(){return this.lines.length},removeInner:function(a,b){for(var c=a,d=a+b;c<d;++c){var e=this.lines[c];this.height-=e.height;var f=e;f.parent=null;Te(f);L(e,
-"delete")}this.lines.splice(a,b)},collapse:function(a){a.push.apply(a,this.lines)},insertInner:function(a,b,c){this.height+=c;this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(a=0;a<b.length;++a)b[a].parent=this},iterN:function(a,b,c){for(b=a+b;a<b;++a)if(c(this.lines[a]))return!0}};Cb.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){this.size-=b;for(var c=0;c<this.children.length;++c){var d=this.children[c],e=d.chunkSize();if(a<e){var f=Math.min(b,
-e-a),g=d.height;d.removeInner(a,f);this.height-=g-d.height;e==f&&(this.children.splice(c--,1),d.parent=null);if(0==(b-=f))break;a=0}else a-=e}25>this.size-b&&(1<this.children.length||!(this.children[0]instanceof Bb))&&(c=[],this.collapse(c),this.children=[new Bb(c)],this.children[0].parent=this)},collapse:function(a){for(var b=0;b<this.children.length;++b)this.children[b].collapse(a)},insertInner:function(a,b,c){this.size+=b.length;this.height+=c;for(var d=0;d<this.children.length;++d){var e=this.children[d],
-f=e.chunkSize();if(a<=f){e.insertInner(a,b,c);if(e.lines&&50<e.lines.length){for(;50<e.lines.length;)a=e.lines.splice(e.lines.length-25,25),a=new Bb(a),e.height-=a.height,this.children.splice(d+1,0,a),a.parent=this;this.maybeSpill()}break}a-=f}},maybeSpill:function(){if(!(10>=this.children.length)){var a=this;do{var b=a.children.splice(a.children.length-5,5),b=new Cb(b);if(a.parent){a.size-=b.size;a.height-=b.height;var c=D(a.parent.children,a);a.parent.children.splice(c+1,0,b)}else c=new Cb(a.children),
-c.parent=a,a.children=[c,b],a=c;b.parent=a.parent}while(10<a.children.length);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=0;d<this.children.length;++d){var e=this.children[d],f=e.chunkSize();if(a<f){f=Math.min(b,f-a);if(e.iterN(a,f,c))return!0;if(0==(b-=f))break;a=0}else a-=f}}};var og=0,P=q.Doc=function(a,b,c){if(!(this instanceof P))return new P(a,b,c);null==c&&(c=0);Cb.call(this,[new Bb([new Ab("",null)])]);this.first=c;this.scrollTop=this.scrollLeft=0;this.cantEdit=!1;this.cleanGeneration=
-1;this.frontier=c;c=r(c,0);this.sel=ga(c);this.history=new uc(null);this.id=++og;this.modeOption=b;"string"==typeof a&&(a=sa(a));qd(this,{from:c,to:c,text:a});H(this,ga(c),ha)};P.prototype=ff(Cb.prototype,{constructor:P,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0;d<b.length;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=
-xd(this,this.first,this.first+this.size);return!1===a?b:b.join(a||"\n")},setValue:N(function(a){var b=r(this.first,0),c=this.first+this.size-1;Oa(this,{from:b,to:r(c,u(this,c).text.length),text:sa(a),origin:"setValue",full:!0},!0);H(this,ga(b))}),replaceRange:function(a,b,c,d){b=w(this,b);c=c?w(this,c):b;wb(this,a,b,c,d)},getRange:function(a,b,c){a=Da(this,w(this,a),w(this,b));return!1===c?a:a.join(c||"\n")},getLine:function(a){return(a=this.getLineHandle(a))&&a.text},getLineHandle:function(a){if(qb(this,
-a))return u(this,a)},getLineNumber:function(a){return F(a)},getLineHandleVisualStart:function(a){"number"==typeof a&&(a=u(this,a));return ia(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return w(this,a)},getCursor:function(a){var b=this.sel.primary();return null==a||"head"==a?b.head:"anchor"==a?b.anchor:"end"==a||"to"==a||!1===a?b.to():b.from()},listSelections:function(){return this.sel.ranges},
-somethingSelected:function(){return this.sel.somethingSelected()},setCursor:N(function(a,b,c){a=w(this,"number"==typeof a?r(a,b||0):a);H(this,ga(a,null),c)}),setSelection:N(function(a,b,c){var d=w(this,a);a=w(this,b||a);H(this,ga(d,a),c)}),extendSelection:N(function(a,b,c){Ub(this,w(this,a),b&&w(this,b),c)}),extendSelections:N(function(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=w(this,a[d]);ae(this,c)}),extendSelectionsBy:N(function(a,b){ae(this,ob(this.sel.ranges,a),b)}),setSelections:N(function(a,
-b,c){if(a.length){for(var d=0,e=[];d<a.length;d++)e[d]=new z(w(this,a[d].anchor),w(this,a[d].head));null==b&&(b=Math.min(a.length-1,this.sel.primIndex));H(this,Z(e,b),c)}}),addSelection:N(function(a,b,c){var d=this.sel.ranges.slice(0);d.push(new z(w(this,a),w(this,b||a)));H(this,Z(d,d.length-1),c)}),getSelection:function(a){for(var b=this.sel.ranges,c,d=0;d<b.length;d++){var e=Da(this,b[d].from(),b[d].to());c=c?c.concat(e):e}return!1===a?c:c.join(a||"\n")},getSelections:function(a){for(var b=[],c=
-this.sel.ranges,d=0;d<c.length;d++){var e=Da(this,c[d].from(),c[d].to());!1!==a&&(e=e.join(a||"\n"));b[d]=e}return b},replaceSelection:function(a,b,c){for(var d=[],e=0;e<this.sel.ranges.length;e++)d[e]=a;this.replaceSelections(d,b,c||"+input")},replaceSelections:N(function(a,b,c){for(var d=[],e=this.sel,f=0;f<e.ranges.length;f++){var g=e.ranges[f];d[f]={from:g.from(),to:g.to(),text:sa(a[f]),origin:c}}if(f=b&&"end"!=b){f=[];c=a=r(this.first,0);for(e=0;e<d.length;e++){var h=d[e],g=Ee(h.from,a,c),k=
-Ee(ta(h),a,c);a=h.to;c=k;"around"==b?(h=this.sel.ranges[e],h=0>y(h.head,h.anchor),f[e]=new z(h?k:g,h?g:k)):f[e]=new z(g,g)}f=new la(f,this.sel.primIndex)}b=f;for(f=d.length-1;0<=f;f--)Oa(this,d[f]);b?be(this,b):this.cm&&Pa(this.cm)}),undo:N(function(){kc(this,"undo")}),redo:N(function(){kc(this,"redo")}),undoSelection:N(function(){kc(this,"undo",!0)}),redoSelection:N(function(){kc(this,"redo",!0)}),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){for(var a=
-this.history,b=0,c=0,d=0;d<a.done.length;d++)a.done[d].ranges||++b;for(d=0;d<a.undone.length;d++)a.undone[d].ranges||++c;return{undo:b,redo:c}},clearHistory:function(){this.history=new uc(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){a&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null);return this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},
-getHistory:function(){return{done:Xa(this.history.done),undone:Xa(this.history.undone)}},setHistory:function(a){var b=this.history=new uc(this.history.maxGeneration);b.done=Xa(a.done.slice(0),null,!0);b.undone=Xa(a.undone.slice(0),null,!0)},addLineClass:N(function(a,b,c){return nc(this,a,"gutter"==b?"gutter":"class",function(a){var e="text"==b?"textClass":"background"==b?"bgClass":"gutter"==b?"gutterClass":"wrapClass";if(a[e]){if(Fb(c).test(a[e]))return!1;a[e]+=" "+c}else a[e]=c;return!0})}),removeLineClass:N(function(a,
-b,c){return nc(this,a,"gutter"==b?"gutter":"class",function(a){var e="text"==b?"textClass":"background"==b?"bgClass":"gutter"==b?"gutterClass":"wrapClass",f=a[e];if(f)if(null==c)a[e]=null;else{var g=f.match(Fb(c));if(!g)return!1;var h=g.index+g[0].length;a[e]=f.slice(0,g.index)+(g.index&&h!=f.length?" ":"")+f.slice(h)||null}else return!1;return!0})}),addLineWidget:N(function(a,b,c){return $f(this,a,b,c)}),removeLineWidget:function(a){a.clear()},markText:function(a,b,c){return Wa(this,w(this,a),w(this,
-b),c,"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1,shared:b&&b.shared,handleMouseEvents:b&&b.handleMouseEvents};a=w(this,a);return Wa(this,a,a,c,"bookmark")},findMarksAt:function(a){a=w(this,a);var b=[],c=u(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b,c){a=w(this,a);
-b=w(this,b);var d=[],e=a.line;this.iter(a.line,b.line+1,function(f){if(f=f.markedSpans)for(var g=0;g<f.length;g++){var h=f[g];e==a.line&&a.ch>h.to||null==h.from&&e!=a.line||e==b.line&&h.from>b.ch||c&&!c(h.marker)||d.push(h.marker.parent||h.marker)}++e});return d},getAllMarks:function(){var a=[];this.iter(function(b){if(b=b.markedSpans)for(var c=0;c<b.length;++c)null!=b[c].from&&a.push(b[c].marker)});return a},posFromIndex:function(a){var b,c=this.first;this.iter(function(d){d=d.text.length+1;if(d>
-a)return b=a,!0;a-=d;++c});return w(this,r(c,b))},indexFromPos:function(a){a=w(this,a);var b=a.ch;if(a.line<this.first||0>a.ch)return 0;this.iter(this.first,a.line,function(a){b+=a.text.length+1});return b},copy:function(a){var b=new P(xd(this,this.first,this.first+this.size),this.modeOption,this.first);b.scrollTop=this.scrollTop;b.scrollLeft=this.scrollLeft;b.sel=this.sel;b.extend=!1;a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory()));return b},linkedDoc:function(a){a||
-(a={});var b=this.first,c=this.first+this.size;null!=a.from&&a.from>b&&(b=a.from);null!=a.to&&a.to<c&&(c=a.to);b=new P(xd(this,b,c),a.mode||this.modeOption,b);a.sharedHist&&(b.history=this.history);(this.linked||(this.linked=[])).push({doc:b,sharedHist:a.sharedHist});b.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}];a=Re(this);for(c=0;c<a.length;c++){var d=a[c],e=d.find(),f=b.clipPos(e.from),e=b.clipPos(e.to);y(f,e)&&(f=Wa(b,f,e,d.primary,d.primary.type),d.markers.push(f),f.parent=d)}return b},
-unlinkDoc:function(a){a instanceof q&&(a=a.doc);if(this.linked)for(var b=0;b<this.linked.length;++b)if(this.linked[b].doc==a){this.linked.splice(b,1);a.unlinkDoc(this);Yf(Re(this));break}if(a.history==this.history){var c=[a.id];Ga(a,function(a){c.push(a.id)},!0);a.history=new uc(null);a.history.done=Xa(this.history.done,c);a.history.undone=Xa(this.history.undone,c)}},iterLinkedDocs:function(a){Ga(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm}});P.prototype.eachLine=
-P.prototype.iter;var pg=["iter","insert","remove","copy","getEditor"],Jb;for(Jb in P.prototype)P.prototype.hasOwnProperty(Jb)&&0>D(pg,Jb)&&(q.prototype[Jb]=function(a){return function(){return a.apply(this.doc,arguments)}}(P.prototype[Jb]));Ya(P);var O=q.e_preventDefault=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},qg=q.e_stopPropagation=function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},jd=q.e_stop=function(a){O(a);qg(a)},v=q.on=function(a,b,c){a.addEventListener?
-a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):(a=a._handlers||(a._handlers={}),(a[b]||(a[b]=[])).push(c))},ka=q.off=function(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else if(a=a._handlers&&a._handlers[b])for(b=0;b<a.length;++b)if(a[b]==c){a.splice(b,1);break}},K=q.signal=function(a,b){var c=a._handlers&&a._handlers[b];if(c)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)},Db=
-null,Hd=30,Ae=q.Pass={toString:function(){return"CodeMirror.Pass"}},ha={scroll:!1},kd={origin:"*mouse"},Gb={origin:"+move"};bb.prototype.set=function(a,b){clearTimeout(this.id);this.id=setTimeout(b,a)};var aa=q.countColumn=function(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),-1==b&&(b=a.length));d=d||0;for(e=e||0;;){var f=a.indexOf("\t",d);if(0>f||f>=b)return e+(b-d);e+=f-d;e+=c-e%c;d=f+1}},vc=[""],Za=function(a){a.select()};Qa?Za=function(a){a.selectionStart=0;a.selectionEnd=a.value.length}:B&&
-(Za=function(a){try{a.select()}catch(b){}});var rg=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,gf=q.isWordChar=function(a){return/\w/.test(a)||"€"<a&&(a.toUpperCase()!=a.toLowerCase()||rg.test(a))},ig=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/,
-Ea;Ea=document.createRange?function(a,b,c,d){var e=document.createRange();e.setEnd(d||a,c);e.setStart(a,b);return e}:function(a,b,c){var d=document.body.createTextRange();try{d.moveToElementText(a.parentNode)}catch(e){return d}d.collapse(!0);d.moveEnd("character",c);d.moveStart("character",b);return d};var Wc=q.contains=function(a,b){3==b.nodeType&&(b=b.parentNode);if(a.contains)return a.contains(b);do if(11==b.nodeType&&(b=b.host),b==a)return!0;while(b=b.parentNode)};B&&11>C&&(fa=function(){try{return document.activeElement}catch(a){return document.body}});
-var kb=q.rmClass=function(a,b){var c=a.className,d=Fb(b).exec(c);if(d){var e=c.slice(d.index+d[0].length);a.className=c.slice(0,d.index)+(e?d[1]+e:"")}},mb=q.addClass=function(a,b){var c=a.className;Fb(b).test(c)||(a.className+=(c?" ":"")+b)},Dd=!1,Lf=function(){if(B&&9>C)return!1;var a=t("div");return"draggable"in a||"dragDrop"in a}(),yd,vd,sa=q.splitLines=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;b<=d;){var e=a.indexOf("\n",b);-1==e&&(e=a.length);var f=a.slice(b,"\r"==
-a.charAt(e-1)?e-1:e),g=f.indexOf("\r");-1!=g?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)},ng=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(b){return!1}}:function(a){try{var b=a.ownerDocument.selection.createRange()}catch(c){}return b&&b.parentElement()==a?0!=b.compareEndPoints("StartToEnd",b):!1},Ce=function(){var a=t("div");if("oncopy"in a)return!0;a.setAttribute("oncopy","return;");return"function"==typeof a.oncopy}(),
-bd=null,va={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"\x3d",91:"Mod",92:"Mod",93:"Mod",107:"\x3d",109:"-",127:"Delete",173:"-",186:";",187:"\x3d",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",
-63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"};q.keyNames=va;(function(){for(var a=0;10>a;a++)va[a+48]=va[a+96]=String(a);for(a=65;90>=a;a++)va[a]=String.fromCharCode(a);for(a=1;12>=a;a++)va[a+111]=va[a+63235]="F"+a})();var vb,gg=function(){function a(a){return 247>=a?"bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN".charAt(a):
-1424<=a&&1524>=a?"R":1536<=a&&1773>=a?"rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm".charAt(a-1536):1774<=a&&2220>=a?"r":8192<=a&&8203>=a?"w":8204==a?"b":"L"}function b(a,b,c){this.level=a;this.from=b;this.to=c}var c=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,d=/[stwN]/,e=/[LRr]/,f=/[Lb1n]/,g=/[1n]/;return function(h){if(!c.test(h))return!1;
-for(var k=h.length,l=[],m=0,p;m<k;++m)l.push(a(h.charCodeAt(m)));for(var m=0,n="L";m<k;++m)p=l[m],"m"==p?l[m]=n:n=p;m=0;for(n="L";m<k;++m)p=l[m],"1"==p&&"r"==n?l[m]="n":e.test(p)&&(n=p,"r"==p&&(l[m]="R"));m=1;for(n=l[0];m<k-1;++m)p=l[m],"+"==p&&"1"==n&&"1"==l[m+1]?l[m]="1":","!=p||n!=l[m+1]||"1"!=n&&"n"!=n||(l[m]=n),n=p;for(m=0;m<k;++m)if(p=l[m],","==p)l[m]="N";else if("%"==p){for(n=m+1;n<k&&"%"==l[n];++n);var q=m&&"!"==l[m-1]||n<k&&"1"==l[n]?"1":"N";for(p=m;p<n;++p)l[p]=q;m=n-1}m=0;for(n="L";m<k;++m)p=
-l[m],"L"==n&&"1"==p?l[m]="L":e.test(p)&&(n=p);for(m=0;m<k;++m)if(d.test(l[m])){for(n=m+1;n<k&&d.test(l[n]);++n);p="L"==(n<k?l[n]:"L");q="L"==(m?l[m-1]:"L")||p?"L":"R";for(p=m;p<n;++p)l[p]=q;m=n-1}for(var n=[],r,m=0;m<k;)if(f.test(l[m])){p=m;for(++m;m<k&&f.test(l[m]);++m);n.push(new b(0,p,m))}else{var t=m,q=n.length;for(++m;m<k&&"L"!=l[m];++m);for(p=t;p<m;)if(g.test(l[p])){t<p&&n.splice(q,0,new b(1,t,p));t=p;for(++p;p<m&&g.test(l[p]);++p);n.splice(q,0,new b(2,t,p));t=p}else++p;t<m&&n.splice(q,0,new b(1,
-t,m))}1==n[0].level&&(r=h.match(/^\s+/))&&(n[0].from=r[0].length,n.unshift(new b(0,0,r[0].length)));1==A(n).level&&(r=h.match(/\s+$/))&&(A(n).to-=r[0].length,n.push(new b(0,k-r[0].length,k)));2==n[0].level&&n.unshift(new b(1,n[0].to,n[0].to));n[0].level!=A(n).level&&n.push(new b(n[0].level,k,k));return n}}();q.version="5.2.0";return q});
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
deleted file mode 100644
index c76ab4653..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
+++ /dev/null
@@ -1,25 +0,0 @@
-(function(p){"object"==typeof exports&&"object"==typeof module?p(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],p):p(CodeMirror)})(function(p){p.defineMode("javascript",function(oa,t){function q(a,c,e){E=a;I=e;return c}function w(a,c){var e=a.next();if('"'==e||"'"==e)return c.tokenize=pa(e),c.tokenize(a,c);if("."==e&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return q("number","number");if("."==e&&a.match(".."))return q("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(e))return q(e);
-if("\x3d"==e&&a.eat("\x3e"))return q("\x3d\x3e","operator");if("0"==e&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),q("number","number");if(/\d/.test(e))return a.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/),q("number","number");if("/"==e){if(a.eat("*"))return c.tokenize=J,J(a,c);if(a.eat("/"))return a.skipToEnd(),q("comment","comment");if("operator"==c.lastType||"keyword c"==c.lastType||"sof"==c.lastType||/^[\[{}\(,;:]$/.test(c.lastType)){a:for(var e=!1,d,b=!1;null!=(d=a.next());){if(!e){if("/"==d&&!b)break a;
-"["==d?b=!0:b&&"]"==d&&(b=!1)}e=!e&&"\\"==d}a.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);return q("regexp","string-2")}a.eatWhile(K);return q("operator","operator",a.current())}if("`"==e)return c.tokenize=Q,Q(a,c);if("#"==e)return a.skipToEnd(),q("error","error");if(K.test(e))return a.eatWhile(K),q("operator","operator",a.current());if(R.test(e))return a.eatWhile(R),e=a.current(),(d=ba.propertyIsEnumerable(e)&&ba[e])&&"."!=c.lastType?q(d.type,d.style,e):q("variable","variable",e)}function pa(a){return function(c,
-e){var d=!1,b;if(L&&"@"==c.peek()&&c.match(qa))return e.tokenize=w,q("jsonld-keyword","meta");for(;null!=(b=c.next())&&(b!=a||d);)d=!d&&"\\"==b;d||(e.tokenize=w);return q("string","string")}}function J(a,c){for(var e=!1,d;d=a.next();){if("/"==d&&e){c.tokenize=w;break}e="*"==d}return q("comment","comment")}function Q(a,c){for(var e=!1,d;null!=(d=a.next());){if(!e&&("`"==d||"$"==d&&a.eat("{"))){c.tokenize=w;break}e=!e&&"\\"==d}return q("quasi","string-2",a.current())}function S(a,c){c.fatArrowAt&&(c.fatArrowAt=
-null);var e=a.string.indexOf("\x3d\x3e",a.start);if(!(0>e)){for(var d=0,b=!1,e=e-1;0<=e;--e){var f=a.string.charAt(e),g="([{}])".indexOf(f);if(0<=g&&3>g){if(!d){++e;break}if(0==--d)break}else if(3<=g&&6>g)++d;else if(R.test(f))b=!0;else{if(/["'\/]/.test(f))return;if(b&&!d){++e;break}}}b&&!d&&(c.fatArrowAt=e)}}function ca(a,c,b,d,f,h){this.indented=a;this.column=c;this.type=b;this.prev=f;this.info=h;null!=d&&(this.align=d)}function g(){for(var a=arguments.length-1;0<=a;a--)f.cc.push(arguments[a])}
-function b(){g.apply(null,arguments);return!0}function x(a){function c(c){for(;c;c=c.next)if(c.name==a)return!0;return!1}var b=f.state;b.context?(f.marked="def",c(b.localVars)||(b.localVars={name:a,next:b.localVars})):!c(b.globalVars)&&t.globalVars&&(b.globalVars={name:a,next:b.globalVars})}function y(){f.state.context={prev:f.state.context,vars:f.state.localVars};f.state.localVars=ra}function z(){f.state.localVars=f.state.context.vars;f.state.context=f.state.context.prev}function l(a,c){var b=function(){var b=
-f.state,e=b.indented;if("stat"==b.lexical.type)e=b.lexical.indented;else for(var h=b.lexical;h&&")"==h.type&&h.align;h=h.prev)e=h.indented;b.lexical=new ca(e,f.stream.column(),a,null,b.lexical,c)};b.lex=!0;return b}function k(){var a=f.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function m(a){function c(e){return e==a?b():";"==a?g():b(c)}return c}function r(a,c){return"var"==a?b(l("vardef",c.length),T,m(";"),k):"keyword a"==a?b(l("form"),n,
-r,k):"keyword b"==a?b(l("form"),r,k):"{"==a?b(l("}"),U,k):";"==a?b():"if"==a?("else"==f.state.lexical.info&&f.state.cc[f.state.cc.length-1]==k&&f.state.cc.pop()(),b(l("form"),n,r,k,da)):"function"==a?b(v):"for"==a?b(l("form"),ea,r,k):"variable"==a?b(l("stat"),sa):"switch"==a?b(l("form"),n,l("}","switch"),m("{"),U,k,k):"case"==a?b(n,m(":")):"default"==a?b(m(":")):"catch"==a?b(l("form"),y,m("("),V,m(")"),r,k,z):"module"==a?b(l("form"),y,ta,z,k):"class"==a?b(l("form"),ua,k):"export"==a?b(l("form"),va,
-k):"import"==a?b(l("form"),wa,k):g(l("stat"),n,m(";"),k)}function n(a){return fa(a,!1)}function u(a){return fa(a,!0)}function fa(a,c){if(f.state.fatArrowAt==f.stream.start){var e=c?ga:ha;if("("==a)return b(y,l(")"),F(A,")"),k,m("\x3d\x3e"),e,z);if("variable"==a)return g(y,A,m("\x3d\x3e"),e,z)}e=c?W:M;return xa.hasOwnProperty(a)?b(e):"function"==a?b(v,e):"keyword c"==a?b(c?ia:X):"("==a?b(l(")"),X,N,m(")"),k,e):"operator"==a||"spread"==a?b(c?u:n):"["==a?b(l("]"),ya,k,e):"{"==a?G(za,"}",null,e):"quasi"==
-a?g(O,e):b()}function X(a){return a.match(/[;\}\)\],]/)?g():g(n)}function ia(a){return a.match(/[;\}\)\],]/)?g():g(u)}function M(a,c){return","==a?b(n):W(a,c,!1)}function W(a,c,e){var d=0==e?M:W,f=0==e?n:u;if("\x3d\x3e"==a)return b(y,e?ga:ha,z);if("operator"==a)return/\+\+|--/.test(c)?b(d):"?"==c?b(n,m(":"),f):b(f);if("quasi"==a)return g(O,d);if(";"!=a){if("("==a)return G(u,")","call",d);if("."==a)return b(Aa,d);if("["==a)return b(l("]"),X,m("]"),k,d)}}function O(a,c){return"quasi"!=a?g():"${"!=c.slice(c.length-
-2)?b(O):b(n,Ba)}function Ba(a){if("}"==a)return f.marked="string-2",f.state.tokenize=Q,b(O)}function ha(a){S(f.stream,f.state);return g("{"==a?r:n)}function ga(a){S(f.stream,f.state);return g("{"==a?r:u)}function sa(a){return":"==a?b(k,r):g(M,m(";"),k)}function Aa(a){if("variable"==a)return f.marked="property",b()}function za(a,c){if("variable"==a||"keyword"==f.style)return f.marked="property","get"==c||"set"==c?b(Ca):b(H);if("number"==a||"string"==a)return f.marked=L?"property":f.style+" property",
-b(H);if("jsonld-keyword"==a)return b(H);if("["==a)return b(n,m("]"),H)}function Ca(a){if("variable"!=a)return g(H);f.marked="property";return b(v)}function H(a){if(":"==a)return b(u);if("("==a)return g(v)}function F(a,c){function e(d){return","==d?(d=f.state.lexical,"call"==d.info&&(d.pos=(d.pos||0)+1),b(a,e)):d==c?b():b(m(c))}return function(d){return d==c?b():g(a,e)}}function G(a,c,e){for(var d=3;d<arguments.length;d++)f.cc.push(arguments[d]);return b(l(c,e),F(a,c),k)}function U(a){return"}"==a?
-b():g(r,U)}function ja(a){if(ka&&":"==a)return b(Da)}function Da(a){if("variable"==a)return f.marked="variable-3",b()}function T(){return g(A,ja,Y,Ea)}function A(a,c){if("variable"==a)return x(c),b();if("["==a)return G(A,"]");if("{"==a)return G(Fa,"}")}function Fa(a,c){if("variable"==a&&!f.stream.match(/^\s*:/,!1))return x(c),b(Y);"variable"==a&&(f.marked="property");return b(m(":"),A,Y)}function Y(a,c){if("\x3d"==c)return b(u)}function Ea(a){if(","==a)return b(T)}function da(a,c){if("keyword b"==
-a&&"else"==c)return b(l("form","else"),r,k)}function ea(a){if("("==a)return b(l(")"),Ga,m(")"),k)}function Ga(a){return"var"==a?b(T,m(";"),P):";"==a?b(P):"variable"==a?b(Ha):g(n,m(";"),P)}function Ha(a,c){return"in"==c||"of"==c?(f.marked="keyword",b(n)):b(M,P)}function P(a,c){return";"==a?b(la):"in"==c||"of"==c?(f.marked="keyword",b(n)):g(n,m(";"),la)}function la(a){")"!=a&&b(n)}function v(a,c){if("*"==c)return f.marked="keyword",b(v);if("variable"==a)return x(c),b(v);if("("==a)return b(y,l(")"),
-F(V,")"),k,r,z)}function V(a){return"spread"==a?b(V):g(A,ja)}function ua(a,c){if("variable"==a)return x(c),b(ma)}function ma(a,c){if("extends"==c)return b(n,ma);if("{"==a)return b(l("}"),B,k)}function B(a,c){if("variable"==a||"keyword"==f.style){if("static"==c)return f.marked="keyword",b(B);f.marked="property";return"get"==c||"set"==c?b(Ia,v,B):b(v,B)}if("*"==c)return f.marked="keyword",b(B);if(";"==a)return b(B);if("}"==a)return b()}function Ia(a){if("variable"!=a)return g();f.marked="property";
-return b()}function ta(a,c){if("string"==a)return b(r);if("variable"==a)return x(c),b(Z)}function va(a,c){return"*"==c?(f.marked="keyword",b(Z,m(";"))):"default"==c?(f.marked="keyword",b(n,m(";"))):g(r)}function wa(a){return"string"==a?b():g(aa,Z)}function aa(a,c){if("{"==a)return G(aa,"}");"variable"==a&&x(c);"*"==c&&(f.marked="keyword");return b(Ja)}function Ja(a,c){if("as"==c)return f.marked="keyword",b(aa)}function Z(a,c){if("from"==c)return f.marked="keyword",b(n)}function ya(a){return"]"==a?
-b():g(u,Ka)}function Ka(a){return"for"==a?g(N,m("]")):","==a?b(F(ia,"]")):g(F(u,"]"))}function N(a){if("for"==a)return b(ea,N);if("if"==a)return b(n,N)}var C=oa.indentUnit,na=t.statementIndent,L=t.jsonld,D=t.json||L,ka=t.typescript,R=t.wordCharacters||/[\w$\xa1-\uffff]/,ba=function(){function a(a){return{type:a,style:"keyword"}}var c=a("keyword a"),b=a("keyword b"),d=a("keyword c"),f=a("operator"),h={type:"atom",style:"atom"},c={"if":a("if"),"while":c,"with":c,"else":b,"do":b,"try":b,"finally":b,
-"return":d,"break":d,"continue":d,"new":d,"delete":d,"throw":d,"debugger":d,"var":a("var"),"const":a("var"),let:a("var"),"function":a("function"),"catch":a("catch"),"for":a("for"),"switch":a("switch"),"case":a("case"),"default":a("default"),"in":f,"typeof":f,"instanceof":f,"true":h,"false":h,"null":h,undefined:h,NaN:h,Infinity:h,"this":a("this"),module:a("module"),"class":a("class"),"super":a("atom"),yield:d,"export":a("export"),"import":a("import"),"extends":d};if(ka){var b={type:"variable",style:"variable-3"},
-b={"interface":a("interface"),"extends":a("extends"),constructor:a("constructor"),"public":a("public"),"private":a("private"),"protected":a("protected"),"static":a("static"),string:b,number:b,bool:b,any:b},g;for(g in b)c[g]=b[g]}return c}(),K=/[+\-*&%=<>!?|~^]/,qa=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,E,I,xa={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,"this":!0,"jsonld-keyword":!0},f={state:null,column:null,marked:null,cc:null},ra={name:"this",
-next:{name:"arguments"}};k.lex=!0;return{startState:function(a){a={tokenize:w,lastType:"sof",cc:[],lexical:new ca((a||0)-C,0,"block",!1),localVars:t.localVars,context:t.localVars&&{vars:t.localVars},indented:0};t.globalVars&&"object"==typeof t.globalVars&&(a.globalVars=t.globalVars);return a},token:function(a,b){a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),S(a,b));if(b.tokenize!=J&&a.eatSpace())return null;var e=b.tokenize(a,b);if("comment"==E)return e;
-b.lastType="operator"!=E||"++"!=I&&"--"!=I?E:"incdec";a:{var d=E,g=I,h=b.cc;f.state=b;f.stream=a;f.marked=null;f.cc=h;f.style=e;b.lexical.hasOwnProperty("align")||(b.lexical.align=!0);for(;;)if((h.length?h.pop():D?n:r)(d,g)){for(;h.length&&h[h.length-1].lex;)h.pop()();if(f.marked){e=f.marked;break a}if(d="variable"==d)b:{for(d=b.localVars;d;d=d.next)if(d.name==g){d=!0;break b}for(h=b.context;h;h=h.prev)for(d=h.vars;d;d=d.next)if(d.name==g){d=!0;break b}d=void 0}if(d){e="variable-2";break a}break a}}return e},
-indent:function(a,b){if(a.tokenize==J)return p.Pass;if(a.tokenize!=w)return 0;var e=b&&b.charAt(0),d=a.lexical;if(!/^\s*else\b/.test(b))for(var f=a.cc.length-1;0<=f;--f){var g=a.cc[f];if(g==k)d=d.prev;else if(g!=da)break}"stat"==d.type&&"}"==e&&(d=d.prev);na&&")"==d.type&&"stat"==d.prev.type&&(d=d.prev);f=d.type;g=e==f;return"vardef"==f?d.indented+("operator"==a.lastType||","==a.lastType?d.info+1:0):"form"==f&&"{"==e?d.indented:"form"==f?d.indented+C:"stat"==f?(e=d.indented,d="operator"==a.lastType||
-","==a.lastType||K.test(b.charAt(0))||/[,.]/.test(b.charAt(0)),e+(d?na||C:0)):"switch"!=d.info||g||0==t.doubleIndentSwitch?d.align?d.column+(g?0:1):d.indented+(g?0:C):d.indented+(/^(?:case|default)\b/.test(b)?C:2*C)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:D?null:"/*",blockCommentEnd:D?null:"*/",lineComment:D?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:D?"json":"javascript",jsonldMode:L,jsonMode:D}});p.registerHelper("wordChars","javascript",/[\w$]/);
-p.defineMIME("text/javascript","javascript");p.defineMIME("text/ecmascript","javascript");p.defineMIME("application/javascript","javascript");p.defineMIME("application/x-javascript","javascript");p.defineMIME("application/ecmascript","javascript");p.defineMIME("application/json",{name:"javascript",json:!0});p.defineMIME("application/x-json",{name:"javascript",json:!0});p.defineMIME("application/ld+json",{name:"javascript",jsonld:!0});p.defineMIME("text/typescript",{name:"javascript",typescript:!0});
-p.defineMIME("application/typescript",{name:"javascript",typescript:!0})});
\ No newline at end of file
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
deleted file mode 100644
index f932db075..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* neo theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-neo.CodeMirror {
-  background-color:#ffffff;
-  color:#2e383c;
-  line-height:1.4375;
-}
-.cm-s-neo .cm-comment {color:#75787b}
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property {color:#1d75b3}
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number {color:#75438a}
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag {color:#9c3328}
-.cm-s-neo .cm-string {color:#b35e14}
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier {color:#047d65}
-
-
-/* Editor styling */
-
-.cm-s-neo pre {
-  padding:0;
-}
-
-.cm-s-neo .CodeMirror-gutters {
-  border:none;
-  border-right:10px solid transparent;
-  background-color:transparent;
-}
-
-.cm-s-neo .CodeMirror-linenumber {
-  padding:0;
-  color:#e0e2e5;
-}
-
-.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
-.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
deleted file mode 100644
index e38bfb6ba..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  max-width: 19em;
-  overflow: hidden;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
diff --git a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js b/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
deleted file mode 100644
index 072359c2f..000000000
--- a/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function(f){"object"==typeof exports&&"object"==typeof module?f(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],f):f(CodeMirror)})(function(f){function p(a,b){this.cm=a;this.options=this.buildOptions(b);this.widget=null;this.tick=this.debounce=0;this.startPos=this.cm.getCursor();this.startLen=this.cm.getLine(this.startPos.line).length;var c=this;a.on("cursorActivity",this.activityFunc=function(){c.cursorActivity()})}function w(a,b){function c(a,
-c){var d;d="string"!=typeof c?function(a){return c(a,b)}:e.hasOwnProperty(c)?e[c]:c;f[a]=d}var e={Up:function(){b.moveFocus(-1)},Down:function(){b.moveFocus(1)},PageUp:function(){b.moveFocus(-b.menuSize()+1,!0)},PageDown:function(){b.moveFocus(b.menuSize()-1,!0)},Home:function(){b.setFocus(0)},End:function(){b.setFocus(b.length-1)},Enter:b.pick,Tab:b.pick,Esc:b.close},d=a.options.customKeys,f=d?{}:e;if(d)for(var g in d)d.hasOwnProperty(g)&&c(g,d[g]);if(d=a.options.extraKeys)for(g in d)d.hasOwnProperty(g)&&
-c(g,d[g]);return f}function v(a,b){for(;b&&b!=a;){if("LI"===b.nodeName.toUpperCase()&&b.parentNode==a)return b;b=b.parentNode}}function n(a,b){this.completion=a;this.data=b;this.picked=!1;var c=this,e=a.cm,d=this.hints=document.createElement("ul");d.className="CodeMirror-hints";this.selectedHint=b.selectedHint||0;for(var m=b.list,g=0;g<m.length;++g){var l=d.appendChild(document.createElement("li")),h=m[g],k="CodeMirror-hint"+(g!=this.selectedHint?"":" CodeMirror-hint-active");null!=h.className&&(k=
-h.className+" "+k);l.className=k;h.render?h.render(l,b,h):l.appendChild(document.createTextNode(h.displayText||("string"==typeof h?h:h.text)));l.hintId=g}var g=e.cursorCoords(a.options.alignWithWord?b.from:null),r=g.left,t=g.bottom,n=!0;d.style.left=r+"px";d.style.top=t+"px";l=window.innerWidth||Math.max(document.body.offsetWidth,document.documentElement.offsetWidth);k=window.innerHeight||Math.max(document.body.offsetHeight,document.documentElement.offsetHeight);(a.options.container||document.body).appendChild(d);
-h=d.getBoundingClientRect();if(0<h.bottom-k){var u=h.bottom-h.top;0<g.top-(g.bottom-h.top)-u?(d.style.top=(t=g.top-u)+"px",n=!1):u>k&&(d.style.height=k-5+"px",d.style.top=(t=g.bottom-h.top)+"px",k=e.getCursor(),b.from.ch!=k.ch&&(g=e.cursorCoords(k),d.style.left=(r=g.left)+"px",h=d.getBoundingClientRect()))}k=h.right-l;0<k&&(h.right-h.left>l&&(d.style.width=l-5+"px",k-=h.right-h.left-l),d.style.left=(r=g.left-k)+"px");e.addKeyMap(this.keyMap=w(a,{moveFocus:function(a,b){c.changeActive(c.selectedHint+
-a,b)},setFocus:function(a){c.changeActive(a)},menuSize:function(){return c.screenAmount()},length:m.length,close:function(){a.close()},pick:function(){c.pick()},data:b}));if(a.options.closeOnUnfocus){var p;e.on("blur",this.onBlur=function(){p=setTimeout(function(){a.close()},100)});e.on("focus",this.onFocus=function(){clearTimeout(p)})}var q=e.getScrollInfo();e.on("scroll",this.onScroll=function(){var c=e.getScrollInfo(),b=e.getWrapperElement().getBoundingClientRect(),f=t+q.top-c.top,g=f-(window.pageYOffset||
-(document.documentElement||document.body).scrollTop);n||(g+=d.offsetHeight);if(g<=b.top||g>=b.bottom)return a.close();d.style.top=f+"px";d.style.left=r+q.left-c.left+"px"});f.on(d,"dblclick",function(a){(a=v(d,a.target||a.srcElement))&&null!=a.hintId&&(c.changeActive(a.hintId),c.pick())});f.on(d,"click",function(b){(b=v(d,b.target||b.srcElement))&&null!=b.hintId&&(c.changeActive(b.hintId),a.options.completeOnSingleClick&&c.pick())});f.on(d,"mousedown",function(){setTimeout(function(){e.focus()},20)});
-f.signal(b,"select",m[0],d.firstChild);return!0}f.showHint=function(a,b,c){if(!b)return a.showHint(c);c&&c.async&&(b.async=!0);b={hint:b};if(c)for(var e in c)b[e]=c[e];return a.showHint(b)};f.defineExtension("showHint",function(a){1<this.listSelections().length||this.somethingSelected()||(this.state.completionActive&&this.state.completionActive.close(),a=this.state.completionActive=new p(this,a),a.options.hint&&(f.signal(this,"startCompletion",this),a.update()))});var x=window.requestAnimationFrame||
-function(a){return setTimeout(a,1E3/60)},y=window.cancelAnimationFrame||clearTimeout;p.prototype={close:function(){this.active()&&(this.tick=this.cm.state.completionActive=null,this.cm.off("cursorActivity",this.activityFunc),this.widget&&this.widget.close(),f.signal(this.cm,"endCompletion",this.cm))},active:function(){return this.cm.state.completionActive==this},pick:function(a,b){var c=a.list[b];c.hint?c.hint(this.cm,a,c):this.cm.replaceRange("string"==typeof c?c:c.text,c.from||a.from,c.to||a.to,
-"complete");f.signal(a,"pick",c);this.close()},showHints:function(a){if(!a||!a.list.length||!this.active())return this.close();this.options.completeSingle&&1==a.list.length?this.pick(a,0):this.showWidget(a)},cursorActivity:function(){this.debounce&&(y(this.debounce),this.debounce=0);var a=this.cm.getCursor(),b=this.cm.getLine(a.line);if(a.line!=this.startPos.line||b.length-a.ch!=this.startLen-this.startPos.ch||a.ch<this.startPos.ch||this.cm.somethingSelected()||a.ch&&this.options.closeCharacters.test(b.charAt(a.ch-
-1)))this.close();else{var c=this;this.debounce=x(function(){c.update()});this.widget&&this.widget.disable()}},update:function(){if(null!=this.tick)if(this.data&&f.signal(this.data,"update"),this.options.hint.async){var a=++this.tick,b=this;this.options.hint(this.cm,function(c){b.tick==a&&b.finishUpdate(c)},this.options)}else this.finishUpdate(this.options.hint(this.cm,this.options),a)},finishUpdate:function(a){this.data=a;var b=this.widget&&this.widget.picked;this.widget&&this.widget.close();a&&a.list.length&&
-(b&&1==a.list.length?this.pick(a,0):this.widget=new n(this,a))},showWidget:function(a){this.data=a;this.widget=new n(this,a);f.signal(a,"shown")},buildOptions:function(a){var b=this.cm.options.hintOptions,c={},e;for(e in q)c[e]=q[e];if(b)for(e in b)void 0!==b[e]&&(c[e]=b[e]);if(a)for(e in a)void 0!==a[e]&&(c[e]=a[e]);return c}};n.prototype={close:function(){if(this.completion.widget==this){this.completion.widget=null;this.hints.parentNode.removeChild(this.hints);this.completion.cm.removeKeyMap(this.keyMap);
-var a=this.completion.cm;this.completion.options.closeOnUnfocus&&(a.off("blur",this.onBlur),a.off("focus",this.onFocus));a.off("scroll",this.onScroll)}},disable:function(){this.completion.cm.removeKeyMap(this.keyMap);var a=this;this.keyMap={Enter:function(){a.picked=!0}};this.completion.cm.addKeyMap(this.keyMap)},pick:function(){this.completion.pick(this.data,this.selectedHint)},changeActive:function(a,b){a>=this.data.list.length?a=b?this.data.list.length-1:0:0>a&&(a=b?0:this.data.list.length-1);
-if(this.selectedHint!=a){var c=this.hints.childNodes[this.selectedHint];c.className=c.className.replace(" CodeMirror-hint-active","");c=this.hints.childNodes[this.selectedHint=a];c.className+=" CodeMirror-hint-active";c.offsetTop<this.hints.scrollTop?this.hints.scrollTop=c.offsetTop-3:c.offsetTop+c.offsetHeight>this.hints.scrollTop+this.hints.clientHeight&&(this.hints.scrollTop=c.offsetTop+c.offsetHeight-this.hints.clientHeight+3);f.signal(this.data,"select",this.data.list[this.selectedHint],c)}},
-screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}};f.registerHelper("hint","auto",function(a,b){var c=a.getHelpers(a.getCursor(),"hint");if(c.length)for(var e=0;e<c.length;e++){var d=c[e](a,b);if(d&&d.list.length)return d}else if(c=a.getHelper(a.getCursor(),"hintWords")){if(c)return f.hint.fromList(a,{words:c})}else if(f.hint.anyword)return f.hint.anyword(a,b)});f.registerHelper("hint","fromList",function(a,b){for(var c=a.getCursor(),e=a.getTokenAt(c),
-d=[],m=0;m<b.words.length;m++){var g=b.words[m];g.slice(0,e.string.length)==e.string&&d.push(g)}if(d.length)return{list:d,from:f.Pos(c.line,e.start),to:f.Pos(c.line,e.end)}});f.commands.autocomplete=f.showHint;var q={hint:f.hint.auto,completeSingle:!0,alignWithWord:!0,closeCharacters:/[\s()\[\]{};:>,]/,closeOnUnfocus:!0,completeOnSingleClick:!1,container:null,customKeys:null,extraKeys:null};f.defineOption("hintOptions",null)});
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/dialog.css b/js/ckeditor/skins/moono-lisa/dialog.css
deleted file mode 100644
index 76f885432..000000000
--- a/js/ckeditor/skins/moono-lisa/dialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/dialog_ie.css b/js/ckeditor/skins/moono-lisa/dialog_ie.css
deleted file mode 100644
index cc53ab1e5..000000000
--- a/js/ckeditor/skins/moono-lisa/dialog_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/dialog_ie8.css b/js/ckeditor/skins/moono-lisa/dialog_ie8.css
deleted file mode 100644
index 4356336c8..000000000
--- a/js/ckeditor/skins/moono-lisa/dialog_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/dialog_iequirks.css b/js/ckeditor/skins/moono-lisa/dialog_iequirks.css
deleted file mode 100644
index fcbeb5158..000000000
--- a/js/ckeditor/skins/moono-lisa/dialog_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/editor.css b/js/ckeditor/skins/moono-lisa/editor.css
deleted file mode 100644
index 7ecdefa69..000000000
--- a/js/ckeditor/skins/moono-lisa/editor.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__bold_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -0px !important;}.cke_button__italic_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -24px !important;}.cke_button__strike_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -48px !important;}.cke_button__subscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -72px !important;}.cke_button__superscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -96px !important;}.cke_button__underline_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -120px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -144px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -168px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -192px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -216px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -240px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -264px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -288px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -312px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -336px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -360px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -384px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -408px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -432px !important;}.cke_button__link_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -456px !important;}.cke_button__unlink_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -480px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -504px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -528px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -552px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -576px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -600px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -624px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -648px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -648px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/editor_gecko.css b/js/ckeditor/skins/moono-lisa/editor_gecko.css
deleted file mode 100644
index ff104f1e1..000000000
--- a/js/ckeditor/skins/moono-lisa/editor_gecko.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__bold_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -0px !important;}.cke_button__italic_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -24px !important;}.cke_button__strike_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -48px !important;}.cke_button__subscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -72px !important;}.cke_button__superscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -96px !important;}.cke_button__underline_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -120px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -144px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -168px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -192px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -216px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -240px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -264px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -288px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -312px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -336px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -360px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -384px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -408px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -432px !important;}.cke_button__link_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -456px !important;}.cke_button__unlink_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -480px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -504px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -528px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -552px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -576px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -600px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -624px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -648px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -648px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/editor_ie.css b/js/ckeditor/skins/moono-lisa/editor_ie.css
deleted file mode 100644
index 603df074e..000000000
--- a/js/ckeditor/skins/moono-lisa/editor_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__bold_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -0px !important;}.cke_button__italic_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -24px !important;}.cke_button__strike_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -48px !important;}.cke_button__subscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -72px !important;}.cke_button__superscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -96px !important;}.cke_button__underline_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -120px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -144px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -168px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -192px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -216px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -240px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -264px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -288px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -312px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -336px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -360px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -384px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -408px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -432px !important;}.cke_button__link_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -456px !important;}.cke_button__unlink_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -480px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -504px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -528px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -552px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -576px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -600px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -624px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -648px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -648px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/editor_ie8.css b/js/ckeditor/skins/moono-lisa/editor_ie8.css
deleted file mode 100644
index e4202f049..000000000
--- a/js/ckeditor/skins/moono-lisa/editor_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}.cke_button__bold_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -0px !important;}.cke_button__italic_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -24px !important;}.cke_button__strike_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -48px !important;}.cke_button__subscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -72px !important;}.cke_button__superscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -96px !important;}.cke_button__underline_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -120px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -144px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -168px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -192px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -216px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -240px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -264px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -288px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -312px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -336px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -360px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -384px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -408px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -432px !important;}.cke_button__link_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -456px !important;}.cke_button__unlink_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -480px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -504px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -528px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -552px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -576px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -600px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -624px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -648px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -648px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/editor_iequirks.css b/js/ckeditor/skins/moono-lisa/editor_iequirks.css
deleted file mode 100644
index d3bce52df..000000000
--- a/js/ckeditor/skins/moono-lisa/editor_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__bold_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -0px !important;}.cke_button__italic_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -24px !important;}.cke_button__strike_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -48px !important;}.cke_button__subscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -72px !important;}.cke_button__superscript_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -96px !important;}.cke_button__underline_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -120px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -144px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -168px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -192px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -216px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -240px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -264px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -288px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -312px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -336px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -360px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -384px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -408px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -432px !important;}.cke_button__link_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -456px !important;}.cke_button__unlink_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -480px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -504px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -528px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -552px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -576px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -600px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -624px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=c9b79c9) no-repeat 0 -648px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=c9b79c9) no-repeat 0 -648px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/moono-lisa/icons.png b/js/ckeditor/skins/moono-lisa/icons.png
deleted file mode 100644
index ad22906e8..000000000
Binary files a/js/ckeditor/skins/moono-lisa/icons.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/icons_hidpi.png b/js/ckeditor/skins/moono-lisa/icons_hidpi.png
deleted file mode 100644
index 7c76e52e8..000000000
Binary files a/js/ckeditor/skins/moono-lisa/icons_hidpi.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/arrow.png b/js/ckeditor/skins/moono-lisa/images/arrow.png
deleted file mode 100644
index d72b5f3b8..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/arrow.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/close.png b/js/ckeditor/skins/moono-lisa/images/close.png
deleted file mode 100644
index 40caa6ddf..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/close.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/hidpi/close.png b/js/ckeditor/skins/moono-lisa/images/hidpi/close.png
deleted file mode 100644
index fa00f4fce..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/hidpi/close.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png b/js/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png
deleted file mode 100644
index c89978907..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/hidpi/lock-open.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/hidpi/lock.png b/js/ckeditor/skins/moono-lisa/images/hidpi/lock.png
deleted file mode 100644
index 25ad0f4a3..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/hidpi/lock.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/hidpi/refresh.png b/js/ckeditor/skins/moono-lisa/images/hidpi/refresh.png
deleted file mode 100644
index 117a2d4a4..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/hidpi/refresh.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/lock-open.png b/js/ckeditor/skins/moono-lisa/images/lock-open.png
deleted file mode 100644
index 42df5f411..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/lock-open.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/lock.png b/js/ckeditor/skins/moono-lisa/images/lock.png
deleted file mode 100644
index bde67727d..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/lock.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/refresh.png b/js/ckeditor/skins/moono-lisa/images/refresh.png
deleted file mode 100644
index e363764e3..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/refresh.png and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/images/spinner.gif b/js/ckeditor/skins/moono-lisa/images/spinner.gif
deleted file mode 100644
index d898d41fa..000000000
Binary files a/js/ckeditor/skins/moono-lisa/images/spinner.gif and /dev/null differ
diff --git a/js/ckeditor/skins/moono-lisa/readme.md b/js/ckeditor/skins/moono-lisa/readme.md
deleted file mode 100644
index d4c68119d..000000000
--- a/js/ckeditor/skins/moono-lisa/readme.md
+++ /dev/null
@@ -1,46 +0,0 @@
-"Moono-lisa" Skin
-=================
-
-This skin has been made a **default skin** starting from CKEditor 4.6.0 and is maintained by the core developers.
-
-For more information about skins, please check the [CKEditor Skin SDK](http://docs.cksource.com/CKEditor_4.x/Skin_SDK)
-documentation.
-
-Features
--------------------
-"Moono-lisa" is a monochromatic skin, which offers a modern, flat and minimalistic look which blends very well in modern design.
-It comes with the following features:
-
-- Chameleon feature with brightness.
-- High-contrast compatibility.
-- Graphics source provided in SVG.
-
-Directory Structure
--------------------
-
-CSS parts:
-- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
-- **mainui.css**: the file contains styles of entire editor outline structures,
-- **toolbar.css**: the file contains styles of the editor toolbar space (top),
-- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
-- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
-until the first panel open up,
-- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
-- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
-it's not loaded until the first menu open up,
-- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
-- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
-- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
-- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
-
-Other parts:
-- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
-- **images/**: contains a fill general used images,
-- **dev/**: contains SVG and PNG source of the skin icons.
-
-License
--------
-
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-
-For licensing, see LICENSE.md or [http://ckeditor.com/license](http://ckeditor.com/license)
diff --git a/js/ckeditor/styles.js b/js/ckeditor/styles.js
deleted file mode 100644
index 025715e99..000000000
--- a/js/ckeditor/styles.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-// This file contains style definitions that can be used by CKEditor plugins.
-//
-// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
-// list containing all styles in the editor toolbar. Other plugins, like
-// the "div" plugin, use a subset of the styles for their features.
-//
-// If you do not have plugins that depend on this file in your editor build, you can simply
-// ignore it. Otherwise it is strongly recommended to customize this file to match your
-// website requirements and design properly.
-//
-// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
-
-CKEDITOR.stylesSet.add( 'default', [
-	/* Block styles */
-
-	// These styles are already available in the "Format" drop-down list ("format" plugin),
-	// so they are not needed here by default. You may enable them to avoid
-	// placing the "Format" combo in the toolbar, maintaining the same features.
-	/*
-	{ name: 'Paragraph',		element: 'p' },
-	{ name: 'Heading 1',		element: 'h1' },
-	{ name: 'Heading 2',		element: 'h2' },
-	{ name: 'Heading 3',		element: 'h3' },
-	{ name: 'Heading 4',		element: 'h4' },
-	{ name: 'Heading 5',		element: 'h5' },
-	{ name: 'Heading 6',		element: 'h6' },
-	{ name: 'Preformatted Text',element: 'pre' },
-	{ name: 'Address',			element: 'address' },
-	*/
-
-	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
-	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
-	{
-		name: 'Special Container',
-		element: 'div',
-		styles: {
-			padding: '5px 10px',
-			background: '#eee',
-			border: '1px solid #ccc'
-		}
-	},
-
-	/* Inline styles */
-
-	// These are core styles available as toolbar buttons. You may opt enabling
-	// some of them in the Styles drop-down list, removing them from the toolbar.
-	// (This requires the "stylescombo" plugin.)
-	/*
-	{ name: 'Strong',			element: 'strong', overrides: 'b' },
-	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
-	{ name: 'Underline',		element: 'u' },
-	{ name: 'Strikethrough',	element: 'strike' },
-	{ name: 'Subscript',		element: 'sub' },
-	{ name: 'Superscript',		element: 'sup' },
-	*/
-
-	{ name: 'Marker',			element: 'span', attributes: { 'class': 'marker' } },
-
-	{ name: 'Big',				element: 'big' },
-	{ name: 'Small',			element: 'small' },
-	{ name: 'Typewriter',		element: 'tt' },
-
-	{ name: 'Computer Code',	element: 'code' },
-	{ name: 'Keyboard Phrase',	element: 'kbd' },
-	{ name: 'Sample Text',		element: 'samp' },
-	{ name: 'Variable',			element: 'var' },
-
-	{ name: 'Deleted Text',		element: 'del' },
-	{ name: 'Inserted Text',	element: 'ins' },
-
-	{ name: 'Cited Work',		element: 'cite' },
-	{ name: 'Inline Quotation',	element: 'q' },
-
-	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
-	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
-
-	/* Object styles */
-
-	{
-		name: 'Styled Image (left)',
-		element: 'img',
-		attributes: { 'class': 'left' }
-	},
-
-	{
-		name: 'Styled Image (right)',
-		element: 'img',
-		attributes: { 'class': 'right' }
-	},
-
-	{
-		name: 'Compact Table',
-		element: 'table',
-		attributes: {
-			cellpadding: '5',
-			cellspacing: '0',
-			border: '1',
-			bordercolor: '#ccc'
-		},
-		styles: {
-			'border-collapse': 'collapse'
-		}
-	},
-
-	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
-	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
-
-	/* Widget styles */
-
-	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
-	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
-
-	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
-
-	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
-
-	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
-
-	// Adding space after the style name is an intended workaround. For now, there
-	// is no option to create two styles with the same name for different widget types. See http://dev.ckeditor.com/ticket/16664.
-	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
-
-] );
-
diff --git a/js/ckeditor5/ckeditor.d.ts b/js/ckeditor5/ckeditor.d.ts
new file mode 100644
index 000000000..b16db3506
--- /dev/null
+++ b/js/ckeditor5/ckeditor.d.ts
@@ -0,0 +1,22 @@
+/**
+ * @license Copyright (c) 2014-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
+import { Bold, Italic, Strikethrough, Subscript, Superscript, Underline } from '@ckeditor/ckeditor5-basic-styles';
+import { Essentials } from '@ckeditor/ckeditor5-essentials';
+import { HorizontalLine } from '@ckeditor/ckeditor5-horizontal-line';
+import { List } from '@ckeditor/ckeditor5-list';
+import { Paragraph } from '@ckeditor/ckeditor5-paragraph';
+import { RemoveFormat } from '@ckeditor/ckeditor5-remove-format';
+import { SourceEditing } from '@ckeditor/ckeditor5-source-editing';
+declare class Editor extends ClassicEditor {
+    static builtinPlugins: (typeof Bold | typeof Essentials | typeof HorizontalLine | typeof Italic | typeof List | typeof Paragraph | typeof RemoveFormat | typeof SourceEditing | typeof Strikethrough | typeof Subscript | typeof Superscript | typeof Underline)[];
+    static defaultConfig: {
+        toolbar: {
+            items: string[];
+        };
+        language: string;
+    };
+}
+export default Editor;
diff --git a/js/ckeditor5/ckeditor.js b/js/ckeditor5/ckeditor.js
new file mode 100644
index 000000000..fd3b72642
--- /dev/null
+++ b/js/ckeditor5/ckeditor.js
@@ -0,0 +1,6 @@
+(function(t){const e=t["en"]=t["en"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"Accept",Aquamarine:"Aquamarine",Black:"Black",Blue:"Blue",Bold:"Bold","Bulleted List":"Bulleted List","Bulleted list styles toolbar":"Bulleted list styles toolbar",Cancel:"Cancel",Circle:"Circle",Code:"Code",Decimal:"Decimal","Decimal with leading zero":"Decimal with leading zero","Dim grey":"Dim grey",Disc:"Disc","Dropdown toolbar":"Dropdown toolbar","Edit block":"Edit block","Editor block content toolbar":"Editor block content toolbar","Editor contextual toolbar":"Editor contextual toolbar","Editor editing area: %0":"Editor editing area: %0","Editor toolbar":"Editor toolbar",Green:"Green",Grey:"Grey",HEX:"HEX","Horizontal line":"Horizontal line","Insert paragraph after block":"Insert paragraph after block","Insert paragraph before block":"Insert paragraph before block",Italic:"Italic","Light blue":"Light blue","Light green":"Light green","Light grey":"Light grey","List properties":"List properties","Lower-latin":"Lower-latin","Lower–roman":"Lower–roman",Next:"Next","Numbered List":"Numbered List","Numbered list styles toolbar":"Numbered list styles toolbar",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Press Enter to type after or press Shift + Enter to type before the widget",Previous:"Previous",Purple:"Purple",Red:"Red",Redo:"Redo","Remove Format":"Remove Format","Reversed order":"Reversed order","Rich Text Editor":"Rich Text Editor","Select all":"Select all","Show more items":"Show more items",Source:"Source",Square:"Square","Start at":"Start at","Start index must be greater than 0.":"Start index must be greater than 0.",Strikethrough:"Strikethrough",Subscript:"Subscript",Superscript:"Superscript","To-do List":"To-do List","Toggle the circle list style":"Toggle the circle list style","Toggle the decimal list style":"Toggle the decimal list style","Toggle the decimal with leading zero list style":"Toggle the decimal with leading zero list style","Toggle the disc list style":"Toggle the disc list style","Toggle the lower–latin list style":"Toggle the lower–latin list style","Toggle the lower–roman list style":"Toggle the lower–roman list style","Toggle the square list style":"Toggle the square list style","Toggle the upper–latin list style":"Toggle the upper–latin list style","Toggle the upper–roman list style":"Toggle the upper–roman list style",Turquoise:"Turquoise",Underline:"Underline",Undo:"Undo","Upper-latin":"Upper-latin","Upper-roman":"Upper-roman",White:"White","Widget toolbar":"Widget toolbar",Yellow:"Yellow"})})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
+/*!
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */(function t(e,n){if(typeof exports==="object"&&typeof module==="object")module.exports=n();else if(typeof define==="function"&&define.amd)define([],n);else if(typeof exports==="object")exports["ClassicEditor"]=n();else e["ClassicEditor"]=n()})(self,(()=>(()=>{var t={168:(t,e,n)=>{const o=n(874);const i={};for(const t of Object.keys(o)){i[o[t]]=t}const r={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};t.exports=r;for(const t of Object.keys(r)){if(!("channels"in r[t])){throw new Error("missing channels property: "+t)}if(!("labels"in r[t])){throw new Error("missing channel labels property: "+t)}if(r[t].labels.length!==r[t].channels){throw new Error("channel and label counts mismatch: "+t)}const{channels:e,labels:n}=r[t];delete r[t].channels;delete r[t].labels;Object.defineProperty(r[t],"channels",{value:e});Object.defineProperty(r[t],"labels",{value:n})}r.rgb.hsl=function(t){const e=t[0]/255;const n=t[1]/255;const o=t[2]/255;const i=Math.min(e,n,o);const r=Math.max(e,n,o);const s=r-i;let a;let c;if(r===i){a=0}else if(e===r){a=(n-o)/s}else if(n===r){a=2+(o-e)/s}else if(o===r){a=4+(e-n)/s}a=Math.min(a*60,360);if(a<0){a+=360}const l=(i+r)/2;if(r===i){c=0}else if(l<=.5){c=s/(r+i)}else{c=s/(2-r-i)}return[a,c*100,l*100]};r.rgb.hsv=function(t){let e;let n;let o;let i;let r;const s=t[0]/255;const a=t[1]/255;const c=t[2]/255;const l=Math.max(s,a,c);const d=l-Math.min(s,a,c);const u=function(t){return(l-t)/6/d+1/2};if(d===0){i=0;r=0}else{r=d/l;e=u(s);n=u(a);o=u(c);if(s===l){i=o-n}else if(a===l){i=1/3+e-o}else if(c===l){i=2/3+n-e}if(i<0){i+=1}else if(i>1){i-=1}}return[i*360,r*100,l*100]};r.rgb.hwb=function(t){const e=t[0];const n=t[1];let o=t[2];const i=r.rgb.hsl(t)[0];const s=1/255*Math.min(e,Math.min(n,o));o=1-1/255*Math.max(e,Math.max(n,o));return[i,s*100,o*100]};r.rgb.cmyk=function(t){const e=t[0]/255;const n=t[1]/255;const o=t[2]/255;const i=Math.min(1-e,1-n,1-o);const r=(1-e-i)/(1-i)||0;const s=(1-n-i)/(1-i)||0;const a=(1-o-i)/(1-i)||0;return[r*100,s*100,a*100,i*100]};function s(t,e){return(t[0]-e[0])**2+(t[1]-e[1])**2+(t[2]-e[2])**2}r.rgb.keyword=function(t){const e=i[t];if(e){return e}let n=Infinity;let r;for(const e of Object.keys(o)){const i=o[e];const a=s(t,i);if(a<n){n=a;r=e}}return r};r.keyword.rgb=function(t){return o[t]};r.rgb.xyz=function(t){let e=t[0]/255;let n=t[1]/255;let o=t[2]/255;e=e>.04045?((e+.055)/1.055)**2.4:e/12.92;n=n>.04045?((n+.055)/1.055)**2.4:n/12.92;o=o>.04045?((o+.055)/1.055)**2.4:o/12.92;const i=e*.4124+n*.3576+o*.1805;const r=e*.2126+n*.7152+o*.0722;const s=e*.0193+n*.1192+o*.9505;return[i*100,r*100,s*100]};r.rgb.lab=function(t){const e=r.rgb.xyz(t);let n=e[0];let o=e[1];let i=e[2];n/=95.047;o/=100;i/=108.883;n=n>.008856?n**(1/3):7.787*n+16/116;o=o>.008856?o**(1/3):7.787*o+16/116;i=i>.008856?i**(1/3):7.787*i+16/116;const s=116*o-16;const a=500*(n-o);const c=200*(o-i);return[s,a,c]};r.hsl.rgb=function(t){const e=t[0]/360;const n=t[1]/100;const o=t[2]/100;let i;let r;let s;if(n===0){s=o*255;return[s,s,s]}if(o<.5){i=o*(1+n)}else{i=o+n-o*n}const a=2*o-i;const c=[0,0,0];for(let t=0;t<3;t++){r=e+1/3*-(t-1);if(r<0){r++}if(r>1){r--}if(6*r<1){s=a+(i-a)*6*r}else if(2*r<1){s=i}else if(3*r<2){s=a+(i-a)*(2/3-r)*6}else{s=a}c[t]=s*255}return c};r.hsl.hsv=function(t){const e=t[0];let n=t[1]/100;let o=t[2]/100;let i=n;const r=Math.max(o,.01);o*=2;n*=o<=1?o:2-o;i*=r<=1?r:2-r;const s=(o+n)/2;const a=o===0?2*i/(r+i):2*n/(o+n);return[e,a*100,s*100]};r.hsv.rgb=function(t){const e=t[0]/60;const n=t[1]/100;let o=t[2]/100;const i=Math.floor(e)%6;const r=e-Math.floor(e);const s=255*o*(1-n);const a=255*o*(1-n*r);const c=255*o*(1-n*(1-r));o*=255;switch(i){case 0:return[o,c,s];case 1:return[a,o,s];case 2:return[s,o,c];case 3:return[s,a,o];case 4:return[c,s,o];case 5:return[o,s,a]}};r.hsv.hsl=function(t){const e=t[0];const n=t[1]/100;const o=t[2]/100;const i=Math.max(o,.01);let r;let s;s=(2-n)*o;const a=(2-n)*i;r=n*i;r/=a<=1?a:2-a;r=r||0;s/=2;return[e,r*100,s*100]};r.hwb.rgb=function(t){const e=t[0]/360;let n=t[1]/100;let o=t[2]/100;const i=n+o;let r;if(i>1){n/=i;o/=i}const s=Math.floor(6*e);const a=1-o;r=6*e-s;if((s&1)!==0){r=1-r}const c=n+r*(a-n);let l;let d;let u;switch(s){default:case 6:case 0:l=a;d=c;u=n;break;case 1:l=c;d=a;u=n;break;case 2:l=n;d=a;u=c;break;case 3:l=n;d=c;u=a;break;case 4:l=c;d=n;u=a;break;case 5:l=a;d=n;u=c;break}return[l*255,d*255,u*255]};r.cmyk.rgb=function(t){const e=t[0]/100;const n=t[1]/100;const o=t[2]/100;const i=t[3]/100;const r=1-Math.min(1,e*(1-i)+i);const s=1-Math.min(1,n*(1-i)+i);const a=1-Math.min(1,o*(1-i)+i);return[r*255,s*255,a*255]};r.xyz.rgb=function(t){const e=t[0]/100;const n=t[1]/100;const o=t[2]/100;let i;let r;let s;i=e*3.2406+n*-1.5372+o*-.4986;r=e*-.9689+n*1.8758+o*.0415;s=e*.0557+n*-.204+o*1.057;i=i>.0031308?1.055*i**(1/2.4)-.055:i*12.92;r=r>.0031308?1.055*r**(1/2.4)-.055:r*12.92;s=s>.0031308?1.055*s**(1/2.4)-.055:s*12.92;i=Math.min(Math.max(0,i),1);r=Math.min(Math.max(0,r),1);s=Math.min(Math.max(0,s),1);return[i*255,r*255,s*255]};r.xyz.lab=function(t){let e=t[0];let n=t[1];let o=t[2];e/=95.047;n/=100;o/=108.883;e=e>.008856?e**(1/3):7.787*e+16/116;n=n>.008856?n**(1/3):7.787*n+16/116;o=o>.008856?o**(1/3):7.787*o+16/116;const i=116*n-16;const r=500*(e-n);const s=200*(n-o);return[i,r,s]};r.lab.xyz=function(t){const e=t[0];const n=t[1];const o=t[2];let i;let r;let s;r=(e+16)/116;i=n/500+r;s=r-o/200;const a=r**3;const c=i**3;const l=s**3;r=a>.008856?a:(r-16/116)/7.787;i=c>.008856?c:(i-16/116)/7.787;s=l>.008856?l:(s-16/116)/7.787;i*=95.047;r*=100;s*=108.883;return[i,r,s]};r.lab.lch=function(t){const e=t[0];const n=t[1];const o=t[2];let i;const r=Math.atan2(o,n);i=r*360/2/Math.PI;if(i<0){i+=360}const s=Math.sqrt(n*n+o*o);return[e,s,i]};r.lch.lab=function(t){const e=t[0];const n=t[1];const o=t[2];const i=o/360*2*Math.PI;const r=n*Math.cos(i);const s=n*Math.sin(i);return[e,r,s]};r.rgb.ansi16=function(t,e=null){const[n,o,i]=t;let s=e===null?r.rgb.hsv(t)[2]:e;s=Math.round(s/50);if(s===0){return 30}let a=30+(Math.round(i/255)<<2|Math.round(o/255)<<1|Math.round(n/255));if(s===2){a+=60}return a};r.hsv.ansi16=function(t){return r.rgb.ansi16(r.hsv.rgb(t),t[2])};r.rgb.ansi256=function(t){const e=t[0];const n=t[1];const o=t[2];if(e===n&&n===o){if(e<8){return 16}if(e>248){return 231}return Math.round((e-8)/247*24)+232}const i=16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(o/255*5);return i};r.ansi16.rgb=function(t){let e=t%10;if(e===0||e===7){if(t>50){e+=3.5}e=e/10.5*255;return[e,e,e]}const n=(~~(t>50)+1)*.5;const o=(e&1)*n*255;const i=(e>>1&1)*n*255;const r=(e>>2&1)*n*255;return[o,i,r]};r.ansi256.rgb=function(t){if(t>=232){const e=(t-232)*10+8;return[e,e,e]}t-=16;let e;const n=Math.floor(t/36)/5*255;const o=Math.floor((e=t%36)/6)/5*255;const i=e%6/5*255;return[n,o,i]};r.rgb.hex=function(t){const e=((Math.round(t[0])&255)<<16)+((Math.round(t[1])&255)<<8)+(Math.round(t[2])&255);const n=e.toString(16).toUpperCase();return"000000".substring(n.length)+n};r.hex.rgb=function(t){const e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e){return[0,0,0]}let n=e[0];if(e[0].length===3){n=n.split("").map((t=>t+t)).join("")}const o=parseInt(n,16);const i=o>>16&255;const r=o>>8&255;const s=o&255;return[i,r,s]};r.rgb.hcg=function(t){const e=t[0]/255;const n=t[1]/255;const o=t[2]/255;const i=Math.max(Math.max(e,n),o);const r=Math.min(Math.min(e,n),o);const s=i-r;let a;let c;if(s<1){a=r/(1-s)}else{a=0}if(s<=0){c=0}else if(i===e){c=(n-o)/s%6}else if(i===n){c=2+(o-e)/s}else{c=4+(e-n)/s}c/=6;c%=1;return[c*360,s*100,a*100]};r.hsl.hcg=function(t){const e=t[1]/100;const n=t[2]/100;const o=n<.5?2*e*n:2*e*(1-n);let i=0;if(o<1){i=(n-.5*o)/(1-o)}return[t[0],o*100,i*100]};r.hsv.hcg=function(t){const e=t[1]/100;const n=t[2]/100;const o=e*n;let i=0;if(o<1){i=(n-o)/(1-o)}return[t[0],o*100,i*100]};r.hcg.rgb=function(t){const e=t[0]/360;const n=t[1]/100;const o=t[2]/100;if(n===0){return[o*255,o*255,o*255]}const i=[0,0,0];const r=e%1*6;const s=r%1;const a=1-s;let c=0;switch(Math.floor(r)){case 0:i[0]=1;i[1]=s;i[2]=0;break;case 1:i[0]=a;i[1]=1;i[2]=0;break;case 2:i[0]=0;i[1]=1;i[2]=s;break;case 3:i[0]=0;i[1]=a;i[2]=1;break;case 4:i[0]=s;i[1]=0;i[2]=1;break;default:i[0]=1;i[1]=0;i[2]=a}c=(1-n)*o;return[(n*i[0]+c)*255,(n*i[1]+c)*255,(n*i[2]+c)*255]};r.hcg.hsv=function(t){const e=t[1]/100;const n=t[2]/100;const o=e+n*(1-e);let i=0;if(o>0){i=e/o}return[t[0],i*100,o*100]};r.hcg.hsl=function(t){const e=t[1]/100;const n=t[2]/100;const o=n*(1-e)+.5*e;let i=0;if(o>0&&o<.5){i=e/(2*o)}else if(o>=.5&&o<1){i=e/(2*(1-o))}return[t[0],i*100,o*100]};r.hcg.hwb=function(t){const e=t[1]/100;const n=t[2]/100;const o=e+n*(1-e);return[t[0],(o-e)*100,(1-o)*100]};r.hwb.hcg=function(t){const e=t[1]/100;const n=t[2]/100;const o=1-n;const i=o-e;let r=0;if(i<1){r=(o-i)/(1-i)}return[t[0],i*100,r*100]};r.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]};r.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]};r.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]};r.gray.hsl=function(t){return[0,0,t[0]]};r.gray.hsv=r.gray.hsl;r.gray.hwb=function(t){return[0,100,t[0]]};r.gray.cmyk=function(t){return[0,0,0,t[0]]};r.gray.lab=function(t){return[t[0],0,0]};r.gray.hex=function(t){const e=Math.round(t[0]/100*255)&255;const n=(e<<16)+(e<<8)+e;const o=n.toString(16).toUpperCase();return"000000".substring(o.length)+o};r.rgb.gray=function(t){const e=(t[0]+t[1]+t[2])/3;return[e/255*100]}},85:(t,e,n)=>{const o=n(168);const i=n(111);const r={};const s=Object.keys(o);function a(t){const e=function(...e){const n=e[0];if(n===undefined||n===null){return n}if(n.length>1){e=n}return t(e)};if("conversion"in t){e.conversion=t.conversion}return e}function c(t){const e=function(...e){const n=e[0];if(n===undefined||n===null){return n}if(n.length>1){e=n}const o=t(e);if(typeof o==="object"){for(let t=o.length,e=0;e<t;e++){o[e]=Math.round(o[e])}}return o};if("conversion"in t){e.conversion=t.conversion}return e}s.forEach((t=>{r[t]={};Object.defineProperty(r[t],"channels",{value:o[t].channels});Object.defineProperty(r[t],"labels",{value:o[t].labels});const e=i(t);const n=Object.keys(e);n.forEach((n=>{const o=e[n];r[t][n]=c(o);r[t][n].raw=a(o)}))}));t.exports=r},111:(t,e,n)=>{const o=n(168);function i(){const t={};const e=Object.keys(o);for(let n=e.length,o=0;o<n;o++){t[e[o]]={distance:-1,parent:null}}return t}function r(t){const e=i();const n=[t];e[t].distance=0;while(n.length){const t=n.pop();const i=Object.keys(o[t]);for(let o=i.length,r=0;r<o;r++){const o=i[r];const s=e[o];if(s.distance===-1){s.distance=e[t].distance+1;s.parent=t;n.unshift(o)}}}return e}function s(t,e){return function(n){return e(t(n))}}function a(t,e){const n=[e[t].parent,t];let i=o[e[t].parent][t];let r=e[t].parent;while(e[r].parent){n.unshift(e[r].parent);i=s(o[e[r].parent][r],i);r=e[r].parent}i.conversion=n;return i}t.exports=function(t){const e=r(t);const n={};const o=Object.keys(e);for(let t=o.length,i=0;i<t;i++){const t=o[i];const r=e[t];if(r.parent===null){continue}n[t]=a(t,e)}return n}},874:t=>{"use strict";t.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},363:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck-content code{background-color:hsla(0,0%,78%,.3);border-radius:2px;padding:.15em}.ck.ck-editor__editable .ck-code_selected{background-color:hsla(0,0%,78%,.5)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-basic-styles/theme/code.css"],names:[],mappings:"AAKA,iBACC,kCAAuC,CAEvC,iBAAkB,CADlB,aAED,CAEA,0CACC,kCACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck-content code {\n\tbackground-color: hsla(0, 0%, 78%, 0.3);\n\tpadding: .15em;\n\tborder-radius: 2px;\n}\n\n.ck.ck-editor__editable .ck-code_selected  {\n\tbackground-color: hsla(0, 0%, 78%, 0.5);\n}\n"],sourceRoot:""}]);const c=a},799:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,'.ck.ck-editor__editable .ck.ck-clipboard-drop-target-position{display:inline;pointer-events:none;position:relative}.ck.ck-editor__editable .ck.ck-clipboard-drop-target-position span{position:absolute;width:0}.ck.ck-editor__editable .ck-widget:-webkit-drag>.ck-widget__selection-handle,.ck.ck-editor__editable .ck-widget:-webkit-drag>.ck-widget__type-around{display:none}.ck.ck-clipboard-drop-target-line{pointer-events:none;position:absolute}:root{--ck-clipboard-drop-target-dot-width:12px;--ck-clipboard-drop-target-dot-height:8px;--ck-clipboard-drop-target-color:var(--ck-color-focus-border)}.ck.ck-editor__editable .ck.ck-clipboard-drop-target-position span{background:var(--ck-clipboard-drop-target-color);border:1px solid var(--ck-clipboard-drop-target-color);bottom:calc(var(--ck-clipboard-drop-target-dot-height)*-.5);margin-left:-1px;top:calc(var(--ck-clipboard-drop-target-dot-height)*-.5)}.ck.ck-editor__editable .ck.ck-clipboard-drop-target-position span:after{border-color:var(--ck-clipboard-drop-target-color) transparent transparent transparent;border-style:solid;border-width:calc(var(--ck-clipboard-drop-target-dot-height)) calc(var(--ck-clipboard-drop-target-dot-width)*.5) 0 calc(var(--ck-clipboard-drop-target-dot-width)*.5);content:"";display:block;height:0;left:50%;position:absolute;top:calc(var(--ck-clipboard-drop-target-dot-height)*-.5);transform:translateX(-50%);width:0}.ck.ck-editor__editable .ck-widget.ck-clipboard-drop-target-range{outline:var(--ck-widget-outline-thickness) solid var(--ck-clipboard-drop-target-color)!important}.ck.ck-editor__editable .ck-widget:-webkit-drag{zoom:.6;outline:none!important}.ck.ck-clipboard-drop-target-line{background:var(--ck-clipboard-drop-target-color);border:1px solid var(--ck-clipboard-drop-target-color);height:0;margin-top:-1px}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-clipboard/theme/clipboard.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-clipboard/clipboard.css"],names:[],mappings:"AASC,8DACC,cAAe,CAEf,mBAAoB,CADpB,iBAOD,CAJC,mEACC,iBAAkB,CAClB,OACD,CAWA,qJACC,YACD,CAIF,kCAEC,mBAAoB,CADpB,iBAED,CChCA,MACC,yCAA0C,CAC1C,yCAA0C,CAC1C,6DACD,CAOE,mEAIC,gDAAiD,CADjD,sDAAuD,CAFvD,2DAA8D,CAI9D,gBAAiB,CAHjB,wDAqBD,CAfC,yEAWC,sFAAuF,CAEvF,kBAAmB,CADnB,qKAA0K,CAX1K,UAAW,CAIX,aAAc,CAFd,QAAS,CAIT,QAAS,CADT,iBAAkB,CAElB,wDAA2D,CAE3D,0BAA2B,CAR3B,OAYD,CAOF,kEACC,gGACD,CAKA,gDACC,OAAS,CACT,sBACD,CAGD,kCAGC,gDAAiD,CADjD,sDAAuD,CADvD,QAAS,CAGT,eACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-editor__editable {\n\t/*\n\t * Vertical drop target (in text).\n\t */\n\t& .ck.ck-clipboard-drop-target-position {\n\t\tdisplay: inline;\n\t\tposition: relative;\n\t\tpointer-events: none;\n\n\t\t& span {\n\t\t\tposition: absolute;\n\t\t\twidth: 0;\n\t\t}\n\t}\n\n\t/*\n\t * Styles of the widget being dragged (its preview).\n\t */\n\t& .ck-widget:-webkit-drag {\n\t\t& > .ck-widget__selection-handle {\n\t\t\tdisplay: none;\n\t\t}\n\n\t\t& > .ck-widget__type-around {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n}\n\n.ck.ck-clipboard-drop-target-line {\n\tposition: absolute;\n\tpointer-events: none;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-clipboard-drop-target-dot-width: 12px;\n\t--ck-clipboard-drop-target-dot-height: 8px;\n\t--ck-clipboard-drop-target-color: var(--ck-color-focus-border)\n}\n\n.ck.ck-editor__editable {\n\t/*\n\t * Vertical drop target (in text).\n\t */\n\t& .ck.ck-clipboard-drop-target-position {\n\t\t& span {\n\t\t\tbottom: calc(-.5 * var(--ck-clipboard-drop-target-dot-height));\n\t\t\ttop: calc(-.5 * var(--ck-clipboard-drop-target-dot-height));\n\t\t\tborder: 1px solid var(--ck-clipboard-drop-target-color);\n\t\t\tbackground: var(--ck-clipboard-drop-target-color);\n\t\t\tmargin-left: -1px;\n\n\t\t\t/* The triangle above the marker */\n\t\t\t&::after {\n\t\t\t\tcontent: "";\n\t\t\t\twidth: 0;\n\t\t\t\theight: 0;\n\n\t\t\t\tdisplay: block;\n\t\t\t\tposition: absolute;\n\t\t\t\tleft: 50%;\n\t\t\t\ttop: calc(var(--ck-clipboard-drop-target-dot-height) * -.5);\n\n\t\t\t\ttransform: translateX(-50%);\n\t\t\t\tborder-color: var(--ck-clipboard-drop-target-color) transparent transparent transparent;\n\t\t\t\tborder-width: calc(var(--ck-clipboard-drop-target-dot-height)) calc(.5 * var(--ck-clipboard-drop-target-dot-width)) 0 calc(.5 * var(--ck-clipboard-drop-target-dot-width));\n\t\t\t\tborder-style: solid;\n\t\t\t}\n\t\t}\n\t}\n\n\t/*\n\t * Styles of the widget that it a drop target.\n\t */\n\t& .ck-widget.ck-clipboard-drop-target-range {\n\t\toutline: var(--ck-widget-outline-thickness) solid var(--ck-clipboard-drop-target-color) !important;\n\t}\n\n\t/*\n\t * Styles of the widget being dragged (its preview).\n\t */\n\t& .ck-widget:-webkit-drag {\n\t\tzoom: 0.6;\n\t\toutline: none !important;\n\t}\n}\n\n.ck.ck-clipboard-drop-target-line {\n\theight: 0;\n\tborder: 1px solid var(--ck-clipboard-drop-target-color);\n\tbackground: var(--ck-clipboard-drop-target-color);\n\tmargin-top: -1px;\n}\n'],sourceRoot:""}]);const c=a},624:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-editor{position:relative}.ck.ck-editor .ck-editor__top .ck-sticky-panel .ck-toolbar{z-index:var(--ck-z-modal)}.ck.ck-editor__top .ck-sticky-panel .ck-toolbar{border-radius:0}.ck-rounded-corners .ck.ck-editor__top .ck-sticky-panel .ck-toolbar,.ck.ck-editor__top .ck-sticky-panel .ck-toolbar.ck-rounded-corners{border-radius:var(--ck-border-radius);border-bottom-left-radius:0;border-bottom-right-radius:0}.ck.ck-editor__top .ck-sticky-panel .ck-toolbar{border-bottom-width:0}.ck.ck-editor__top .ck-sticky-panel .ck-sticky-panel__content_sticky .ck-toolbar{border-bottom-width:1px;border-radius:0}.ck-rounded-corners .ck.ck-editor__top .ck-sticky-panel .ck-sticky-panel__content_sticky .ck-toolbar,.ck.ck-editor__top .ck-sticky-panel .ck-sticky-panel__content_sticky .ck-toolbar.ck-rounded-corners{border-radius:var(--ck-border-radius);border-radius:0}.ck.ck-editor__main>.ck-editor__editable{background:var(--ck-color-base-background);border-radius:0}.ck-rounded-corners .ck.ck-editor__main>.ck-editor__editable,.ck.ck-editor__main>.ck-editor__editable.ck-rounded-corners{border-radius:var(--ck-border-radius);border-top-left-radius:0;border-top-right-radius:0}.ck.ck-editor__main>.ck-editor__editable:not(.ck-focused){border-color:var(--ck-color-base-border)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-editor-classic/theme/classiceditor.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-editor-classic/classiceditor.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAKA,cAIC,iBAMD,CAJC,2DAEC,yBACD,CCLC,gDCED,eDKC,CAPA,uICMA,qCAAsC,CDJpC,2BAA4B,CAC5B,4BAIF,CAPA,gDAMC,qBACD,CAEA,iFACC,uBAAwB,CCR1B,eDaC,CANA,yMCHA,qCAAsC,CDOpC,eAEF,CAKF,yCAEC,0CAA2C,CCpB3C,eD8BD,CAZA,yHCdE,qCAAsC,CDmBtC,wBAAyB,CACzB,yBAMF,CAHC,0DACC,wCACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-editor {\n\t/* All the elements within `.ck-editor` are positioned relatively to it.\n\t If any element needs to be positioned with respect to the <body>, etc.,\n\t it must land outside of the `.ck-editor` in DOM. */\n\tposition: relative;\n\n\t& .ck-editor__top .ck-sticky-panel .ck-toolbar {\n\t\t/* https://github.com/ckeditor/ckeditor5-editor-classic/issues/62 */\n\t\tz-index: var(--ck-z-modal);\n\t}\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../mixins/_rounded.css";\n\n.ck.ck-editor__top {\n\t& .ck-sticky-panel {\n\t\t& .ck-toolbar {\n\t\t\t@mixin ck-rounded-corners {\n\t\t\t\tborder-bottom-left-radius: 0;\n\t\t\t\tborder-bottom-right-radius: 0;\n\t\t\t}\n\n\t\t\tborder-bottom-width: 0;\n\t\t}\n\n\t\t& .ck-sticky-panel__content_sticky .ck-toolbar {\n\t\t\tborder-bottom-width: 1px;\n\n\t\t\t@mixin ck-rounded-corners {\n\t\t\t\tborder-radius: 0;\n\t\t\t}\n\t\t}\n\t}\n}\n\n/* Note: Use ck-editor__main to make sure these styles don\'t apply to other editor types */\n.ck.ck-editor__main > .ck-editor__editable {\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/113 */\n\tbackground: var(--ck-color-base-background);\n\n\t@mixin ck-rounded-corners {\n\t\tborder-top-left-radius: 0;\n\t\tborder-top-right-radius: 0;\n\t}\n\n\t&:not(.ck-focused) {\n\t\tborder-color: var(--ck-color-base-border);\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},372:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck .ck-placeholder,.ck.ck-placeholder{position:relative}.ck .ck-placeholder:before,.ck.ck-placeholder:before{content:attr(data-placeholder);left:0;pointer-events:none;position:absolute;right:0}.ck.ck-read-only .ck-placeholder:before{display:none}.ck.ck-reset_all .ck-placeholder{position:relative}.ck .ck-placeholder:before,.ck.ck-placeholder:before{color:var(--ck-color-engine-placeholder-text);cursor:text}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-engine/theme/placeholder.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-engine/placeholder.css"],names:[],mappings:"AAMA,uCAEC,iBAWD,CATC,qDAIC,8BAA+B,CAF/B,MAAO,CAKP,mBAAoB,CANpB,iBAAkB,CAElB,OAKD,CAKA,wCACC,YACD,CAQD,iCACC,iBACD,CC5BC,qDAEC,6CAA8C,CAD9C,WAED",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/* See ckeditor/ckeditor5#936. */\n.ck.ck-placeholder,\n.ck .ck-placeholder {\n\tposition: relative;\n\n\t&::before {\n\t\tposition: absolute;\n\t\tleft: 0;\n\t\tright: 0;\n\t\tcontent: attr(data-placeholder);\n\n\t\t/* See ckeditor/ckeditor5#469. */\n\t\tpointer-events: none;\n\t}\n}\n\n/* See ckeditor/ckeditor5#1987. */\n.ck.ck-read-only .ck-placeholder {\n\t&::before {\n\t\tdisplay: none;\n\t}\n}\n\n/*\n * Rules for the `ck-placeholder` are loaded before the rules for `ck-reset_all` in the base CKEditor 5 DLL build.\n * This fix overwrites the incorrectly set `position: static` from `ck-reset_all`.\n * See https://github.com/ckeditor/ckeditor5/issues/11418.\n */\n.ck.ck-reset_all .ck-placeholder {\n\tposition: relative;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/* See ckeditor/ckeditor5#936. */\n.ck.ck-placeholder, .ck .ck-placeholder {\n\t&::before {\n\t\tcursor: text;\n\t\tcolor: var(--ck-color-engine-placeholder-text);\n\t}\n}\n"],sourceRoot:""}]);const c=a},37:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-editor__editable span[data-ck-unsafe-element]{display:none}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-engine/theme/renderer.css"],names:[],mappings:"AAMA,qDACC,YACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/* Elements marked by the Renderer as hidden should be invisible in the editor. */\n.ck.ck-editor__editable span[data-ck-unsafe-element] {\n\tdisplay: none;\n}\n"],sourceRoot:""}]);const c=a},893:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck-editor__editable .ck-horizontal-line{display:flow-root}.ck-content hr{background:#dedede;border:0;height:4px;margin:15px 0}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-horizontal-line/theme/horizontalline.css"],names:[],mappings:"AAMA,yCAEC,iBACD,CAEA,eAGC,kBAA2B,CAC3B,QAAS,CAFT,UAAW,CADX,aAID",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n\n.ck-editor__editable .ck-horizontal-line {\n\t/* Necessary to render properly next to floated objects, e.g. side image case. */\n\tdisplay: flow-root;\n}\n\n.ck-content hr {\n\tmargin: 15px 0;\n\theight: 4px;\n\tbackground: hsl(0, 0%, 87%);\n\tborder: 0;\n}\n"],sourceRoot:""}]);const c=a},782:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-collapsible.ck-collapsible_collapsed>.ck-collapsible__children{display:none}:root{--ck-collapsible-arrow-size:calc(var(--ck-icon-size)*0.5)}.ck.ck-collapsible>.ck.ck-button{border-radius:0;color:inherit;font-weight:700;padding:var(--ck-spacing-medium) var(--ck-spacing-large);width:100%}.ck.ck-collapsible>.ck.ck-button:focus{background:transparent}.ck.ck-collapsible>.ck.ck-button:active,.ck.ck-collapsible>.ck.ck-button:hover:not(:focus),.ck.ck-collapsible>.ck.ck-button:not(:focus){background:transparent;border-color:transparent;box-shadow:none}.ck.ck-collapsible>.ck.ck-button>.ck-icon{margin-right:var(--ck-spacing-medium);width:var(--ck-collapsible-arrow-size)}.ck.ck-collapsible>.ck-collapsible__children{padding:0 var(--ck-spacing-large) var(--ck-spacing-large)}.ck.ck-collapsible.ck-collapsible_collapsed>.ck.ck-button .ck-icon{transform:rotate(-90deg)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-list/theme/collapsible.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-list/collapsible.css"],names:[],mappings:"AAMC,sEACC,YACD,CCHD,MACC,yDACD,CAGC,iCAIC,eAAgB,CAChB,aAAc,CAHd,eAAiB,CACjB,wDAAyD,CAFzD,UAoBD,CAdC,uCACC,sBACD,CAEA,wIACC,sBAAuB,CACvB,wBAAyB,CACzB,eACD,CAEA,0CACC,qCAAsC,CACtC,sCACD,CAGD,6CACC,yDACD,CAGC,mEACC,wBACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-collapsible.ck-collapsible_collapsed {\n\t& > .ck-collapsible__children {\n\t\tdisplay: none;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-collapsible-arrow-size: calc(0.5 * var(--ck-icon-size));\n}\n\n.ck.ck-collapsible {\n\t& > .ck.ck-button {\n\t\twidth: 100%;\n\t\tfont-weight: bold;\n\t\tpadding: var(--ck-spacing-medium) var(--ck-spacing-large);\n\t\tborder-radius: 0;\n\t\tcolor: inherit;\n\n\t\t&:focus {\n\t\t\tbackground: transparent;\n\t\t}\n\n\t\t&:active, &:not(:focus), &:hover:not(:focus) {\n\t\t\tbackground: transparent;\n\t\t\tborder-color: transparent;\n\t\t\tbox-shadow: none;\n\t\t}\n\n\t\t& > .ck-icon {\n\t\t\tmargin-right: var(--ck-spacing-medium);\n\t\t\twidth: var(--ck-collapsible-arrow-size);\n\t\t}\n\t}\n\n\t& > .ck-collapsible__children {\n\t\tpadding: 0 var(--ck-spacing-large) var(--ck-spacing-large);\n\t}\n\n\t&.ck-collapsible_collapsed {\n\t\t& > .ck.ck-button .ck-icon {\n\t\t\ttransform: rotate(-90deg);\n\t\t}\n\t}\n}\n"],sourceRoot:""}]);const c=a},190:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck-editor__editable .ck-list-bogus-paragraph{display:block}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-list/theme/documentlist.css"],names:[],mappings:"AAKA,8CACC,aACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck-editor__editable .ck-list-bogus-paragraph {\n\tdisplay: block;\n}\n"],sourceRoot:""}]);const c=a},784:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck-content ol{list-style-type:decimal}.ck-content ol ol{list-style-type:lower-latin}.ck-content ol ol ol{list-style-type:lower-roman}.ck-content ol ol ol ol{list-style-type:upper-latin}.ck-content ol ol ol ol ol{list-style-type:upper-roman}.ck-content ul{list-style-type:disc}.ck-content ul ul{list-style-type:circle}.ck-content ul ul ul,.ck-content ul ul ul ul{list-style-type:square}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-list/theme/list.css"],names:[],mappings:"AAKA,eACC,uBAiBD,CAfC,kBACC,2BAaD,CAXC,qBACC,2BASD,CAPC,wBACC,2BAKD,CAHC,2BACC,2BACD,CAMJ,eACC,oBAaD,CAXC,kBACC,sBASD,CAJE,6CACC,sBACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck-content ol {\n\tlist-style-type: decimal;\n\n\t& ol {\n\t\tlist-style-type: lower-latin;\n\n\t\t& ol {\n\t\t\tlist-style-type: lower-roman;\n\n\t\t\t& ol {\n\t\t\t\tlist-style-type: upper-latin;\n\n\t\t\t\t& ol {\n\t\t\t\t\tlist-style-type: upper-roman;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n\n.ck-content ul {\n\tlist-style-type: disc;\n\n\t& ul {\n\t\tlist-style-type: circle;\n\n\t\t& ul {\n\t\t\tlist-style-type: square;\n\n\t\t\t& ul {\n\t\t\t\tlist-style-type: square;\n\t\t\t}\n\t\t}\n\t}\n}\n"],sourceRoot:""}]);const c=a},938:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-list-properties.ck-list-properties_without-styles{padding:var(--ck-spacing-large)}.ck.ck-list-properties.ck-list-properties_without-styles>*{min-width:14em}.ck.ck-list-properties.ck-list-properties_without-styles>*+*{margin-top:var(--ck-spacing-standard)}.ck.ck-list-properties.ck-list-properties_with-numbered-properties>.ck-list-styles-list{grid-template-columns:repeat(4,auto)}.ck.ck-list-properties.ck-list-properties_with-numbered-properties>.ck-collapsible{border-top:1px solid var(--ck-color-base-border)}.ck.ck-list-properties.ck-list-properties_with-numbered-properties>.ck-collapsible>.ck-collapsible__children>*{width:100%}.ck.ck-list-properties.ck-list-properties_with-numbered-properties>.ck-collapsible>.ck-collapsible__children>*+*{margin-top:var(--ck-spacing-standard)}.ck.ck-list-properties .ck.ck-numbered-list-properties__start-index .ck-input{min-width:auto;width:100%}.ck.ck-list-properties .ck.ck-numbered-list-properties__reversed-order{background:transparent;margin-bottom:calc(var(--ck-spacing-tiny)*-1);padding-left:0;padding-right:0}.ck.ck-list-properties .ck.ck-numbered-list-properties__reversed-order:active,.ck.ck-list-properties .ck.ck-numbered-list-properties__reversed-order:hover{background:none;border-color:transparent;box-shadow:none}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-list/listproperties.css"],names:[],mappings:"AAOC,yDACC,+BASD,CAPC,2DACC,cAKD,CAHC,6DACC,qCACD,CASD,wFACC,oCACD,CAGA,mFACC,gDAWD,CARE,+GACC,UAKD,CAHC,iHACC,qCACD,CAMJ,8EACC,cAAe,CACf,UACD,CAEA,uEACC,sBAAuB,CAGvB,6CAAgD,CAFhD,cAAe,CACf,eAQD,CALC,2JAGC,eAAgB,CADhB,wBAAyB,CADzB,eAGD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-list-properties {\n\t/* When there are no list styles and there is no collapsible. */\n\t&.ck-list-properties_without-styles {\n\t\tpadding: var(--ck-spacing-large);\n\n\t\t& > * {\n\t\t\tmin-width: 14em;\n\n\t\t\t& + * {\n\t\t\t\tmargin-top: var(--ck-spacing-standard);\n\t\t\t}\n\t\t}\n\t}\n\n\t/*\n\t * When the numbered list property fields (start at, reversed) should be displayed,\n\t * more horizontal space is needed. Reconfigure the style grid to create that space.\n\t */\n\t&.ck-list-properties_with-numbered-properties {\n\t\t& > .ck-list-styles-list {\n\t\t\tgrid-template-columns: repeat( 4, auto );\n\t\t}\n\n\t\t/* When list styles are rendered and property fields are in a collapsible. */\n\t\t& > .ck-collapsible {\n\t\t\tborder-top: 1px solid var(--ck-color-base-border);\n\n\t\t\t& > .ck-collapsible__children {\n\t\t\t\t& > * {\n\t\t\t\t\twidth: 100%;\n\n\t\t\t\t\t& + * {\n\t\t\t\t\t\tmargin-top: var(--ck-spacing-standard);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t& .ck.ck-numbered-list-properties__start-index .ck-input {\n\t\tmin-width: auto;\n\t\twidth: 100%;\n\t}\n\n\t& .ck.ck-numbered-list-properties__reversed-order {\n\t\tbackground: transparent;\n\t\tpadding-left: 0;\n\t\tpadding-right: 0;\n\t\tmargin-bottom: calc(-1 * var(--ck-spacing-tiny));\n\n\t\t&:active, &:hover {\n\t\t\tbox-shadow: none;\n\t\t\tborder-color: transparent;\n\t\t\tbackground: none;\n\t\t}\n\t}\n}\n"],sourceRoot:""}]);const c=a},591:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-list-styles-list{display:grid}:root{--ck-list-style-button-size:44px}.ck.ck-list-styles-list{column-gap:var(--ck-spacing-medium);grid-template-columns:repeat(3,auto);padding:var(--ck-spacing-large);row-gap:var(--ck-spacing-medium)}.ck.ck-list-styles-list .ck-button{box-sizing:content-box;margin:0;padding:0}.ck.ck-list-styles-list .ck-button,.ck.ck-list-styles-list .ck-button .ck-icon{height:var(--ck-list-style-button-size);width:var(--ck-list-style-button-size)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-list/theme/liststyles.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-list/liststyles.css"],names:[],mappings:"AAKA,wBACC,YACD,CCFA,MACC,gCACD,CAEA,wBAGC,mCAAoC,CAFpC,oCAAwC,CAGxC,+BAAgC,CAFhC,gCA4BD,CAxBC,mCAiBC,sBAAuB,CAPvB,QAAS,CANT,SAmBD,CAJC,+EAhBA,uCAAwC,CADxC,sCAoBA",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-list-styles-list {\n\tdisplay: grid;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-list-style-button-size: 44px;\n}\n\n.ck.ck-list-styles-list {\n\tgrid-template-columns: repeat( 3, auto );\n\trow-gap: var(--ck-spacing-medium);\n\tcolumn-gap: var(--ck-spacing-medium);\n\tpadding: var(--ck-spacing-large);\n\n\t& .ck-button {\n\t\t/* Make the button look like a thumbnail (the icon "takes it all"). */\n\t\twidth: var(--ck-list-style-button-size);\n\t\theight: var(--ck-list-style-button-size);\n\t\tpadding: 0;\n\n\t\t/*\n\t\t * Buttons are aligned by the grid so disable default button margins to not collide with the\n\t\t * gaps in the grid.\n\t\t */\n\t\tmargin: 0;\n\n\t\t/*\n\t\t * Make sure the button border (which is displayed on focus, BTW) does not steal pixels\n\t\t * from the button dimensions and, as a result, decrease the size of the icon\n\t\t * (which becomes blurry as it scales down).\n\t\t */\n\t\tbox-sizing: content-box;\n\n\t\t& .ck-icon {\n\t\t\twidth: var(--ck-list-style-button-size);\n\t\t\theight: var(--ck-list-style-button-size);\n\t\t}\n\t}\n}\n'],sourceRoot:""}]);const c=a},292:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,':root{--ck-todo-list-checkmark-size:16px}.ck-content .todo-list{list-style:none}.ck-content .todo-list li{margin-bottom:5px}.ck-content .todo-list li .todo-list{margin-top:5px}.ck-content .todo-list .todo-list__label>input{-webkit-appearance:none;border:0;display:inline-block;height:var(--ck-todo-list-checkmark-size);left:-25px;margin-left:0;margin-right:-15px;position:relative;right:0;vertical-align:middle;width:var(--ck-todo-list-checkmark-size)}.ck-content .todo-list .todo-list__label>input:before{border:1px solid #333;border-radius:2px;box-sizing:border-box;content:"";display:block;height:100%;position:absolute;transition:box-shadow .25s ease-in-out,background .25s ease-in-out,border .25s ease-in-out;width:100%}.ck-content .todo-list .todo-list__label>input:after{border-color:transparent;border-style:solid;border-width:0 calc(var(--ck-todo-list-checkmark-size)/8) calc(var(--ck-todo-list-checkmark-size)/8) 0;box-sizing:content-box;content:"";display:block;height:calc(var(--ck-todo-list-checkmark-size)/2.6);left:calc(var(--ck-todo-list-checkmark-size)/3);pointer-events:none;position:absolute;top:calc(var(--ck-todo-list-checkmark-size)/5.3);transform:rotate(45deg);width:calc(var(--ck-todo-list-checkmark-size)/5.3)}.ck-content .todo-list .todo-list__label>input[checked]:before{background:#26ab33;border-color:#26ab33}.ck-content .todo-list .todo-list__label>input[checked]:after{border-color:#fff}.ck-content .todo-list .todo-list__label .todo-list__label__description{vertical-align:middle}[dir=rtl] .todo-list .todo-list__label>input{left:0;margin-left:-15px;margin-right:0;right:-25px}.ck-editor__editable .todo-list .todo-list__label>input{cursor:pointer}.ck-editor__editable .todo-list .todo-list__label>input:hover:before{box-shadow:0 0 0 5px rgba(0,0,0,.1)}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-list/theme/todolist.css"],names:[],mappings:"AAKA,MACC,kCACD,CAEA,uBACC,eA0ED,CAxEC,0BACC,iBAKD,CAHC,qCACC,cACD,CAIA,+CACC,uBAAwB,CAQxB,QAAS,CAPT,oBAAqB,CAGrB,yCAA0C,CAO1C,UAAW,CAGX,aAAc,CAFd,kBAAmB,CAVnB,iBAAkB,CAWlB,OAAQ,CARR,qBAAsB,CAFtB,wCAqDD,CAxCC,sDAOC,qBAAiC,CACjC,iBAAkB,CALlB,qBAAsB,CACtB,UAAW,CAHX,aAAc,CAKd,WAAY,CAJZ,iBAAkB,CAOlB,0FAAgG,CAJhG,UAKD,CAEA,qDAaC,wBAAyB,CADzB,kBAAmB,CAEnB,sGAA+G,CAX/G,sBAAuB,CAEvB,UAAW,CAJX,aAAc,CAUd,mDAAwD,CAHxD,+CAAoD,CAJpD,mBAAoB,CAFpB,iBAAkB,CAOlB,gDAAqD,CAMrD,uBAAwB,CALxB,kDAMD,CAGC,+DACC,kBAA8B,CAC9B,oBACD,CAEA,8DACC,iBACD,CAIF,wEACC,qBACD,CAKF,6CACC,MAAO,CAGP,iBAAkB,CAFlB,cAAe,CACf,WAED,CAMA,wDACC,cAKD,CAHC,qEACC,mCACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-todo-list-checkmark-size: 16px;\n}\n\n.ck-content .todo-list {\n\tlist-style: none;\n\n\t& li {\n\t\tmargin-bottom: 5px;\n\n\t\t& .todo-list {\n\t\t\tmargin-top: 5px;\n\t\t}\n\t}\n\n\t& .todo-list__label {\n\t\t& > input {\n\t\t\t-webkit-appearance: none;\n\t\t\tdisplay: inline-block;\n\t\t\tposition: relative;\n\t\t\twidth: var(--ck-todo-list-checkmark-size);\n\t\t\theight: var(--ck-todo-list-checkmark-size);\n\t\t\tvertical-align: middle;\n\n\t\t\t/* Needed on iOS */\n\t\t\tborder: 0;\n\n\t\t\t/* LTR styles */\n\t\t\tleft: -25px;\n\t\t\tmargin-right: -15px;\n\t\t\tright: 0;\n\t\t\tmargin-left: 0;\n\n\t\t\t&::before {\n\t\t\t\tdisplay: block;\n\t\t\t\tposition: absolute;\n\t\t\t\tbox-sizing: border-box;\n\t\t\t\tcontent: '';\n\t\t\t\twidth: 100%;\n\t\t\t\theight: 100%;\n\t\t\t\tborder: 1px solid hsl(0, 0%, 20%);\n\t\t\t\tborder-radius: 2px;\n\t\t\t\ttransition: 250ms ease-in-out box-shadow, 250ms ease-in-out background, 250ms ease-in-out border;\n\t\t\t}\n\n\t\t\t&::after {\n\t\t\t\tdisplay: block;\n\t\t\t\tposition: absolute;\n\t\t\t\tbox-sizing: content-box;\n\t\t\t\tpointer-events: none;\n\t\t\t\tcontent: '';\n\n\t\t\t\t/* Calculate tick position, size and border-width proportional to the checkmark size. */\n\t\t\t\tleft: calc( var(--ck-todo-list-checkmark-size) / 3 );\n\t\t\t\ttop: calc( var(--ck-todo-list-checkmark-size) / 5.3 );\n\t\t\t\twidth: calc( var(--ck-todo-list-checkmark-size) / 5.3 );\n\t\t\t\theight: calc( var(--ck-todo-list-checkmark-size) / 2.6 );\n\t\t\t\tborder-style: solid;\n\t\t\t\tborder-color: transparent;\n\t\t\t\tborder-width: 0 calc( var(--ck-todo-list-checkmark-size) / 8 ) calc( var(--ck-todo-list-checkmark-size) / 8 ) 0;\n\t\t\t\ttransform: rotate(45deg);\n\t\t\t}\n\n\t\t\t&[checked] {\n\t\t\t\t&::before {\n\t\t\t\t\tbackground: hsl(126, 64%, 41%);\n\t\t\t\t\tborder-color: hsl(126, 64%, 41%);\n\t\t\t\t}\n\n\t\t\t\t&::after {\n\t\t\t\t\tborder-color: hsl(0, 0%, 100%);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t& .todo-list__label__description {\n\t\t\tvertical-align: middle;\n\t\t}\n\t}\n}\n\n/* RTL styles */\n[dir=\"rtl\"] .todo-list .todo-list__label > input {\n\tleft: 0;\n\tmargin-right: 0;\n\tright: -25px;\n\tmargin-left: -15px;\n}\n\n/*\n * To-do list should be interactive only during the editing\n * (https://github.com/ckeditor/ckeditor5/issues/2090).\n */\n.ck-editor__editable .todo-list .todo-list__label > input {\n\tcursor: pointer;\n\n\t&:hover::before {\n\t\tbox-shadow: 0 0 0 5px hsla(0, 0%, 0%, 0.1);\n\t}\n}\n"],sourceRoot:""}]);const c=a},420:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,'.ck-source-editing-area{overflow:hidden;position:relative}.ck-source-editing-area textarea,.ck-source-editing-area:after{border:1px solid transparent;font-family:monospace;font-size:var(--ck-font-size-normal);line-height:var(--ck-line-height-base);margin:0;padding:var(--ck-spacing-large);white-space:pre-wrap}.ck-source-editing-area:after{content:attr(data-value) " ";display:block;visibility:hidden}.ck-source-editing-area textarea{border-color:var(--ck-color-base-border);border-radius:0;box-sizing:border-box;height:100%;outline:none;overflow:hidden;position:absolute;resize:none;width:100%}.ck-rounded-corners .ck-source-editing-area textarea,.ck-source-editing-area textarea.ck-rounded-corners{border-radius:var(--ck-border-radius);border-top-left-radius:0;border-top-right-radius:0}.ck-source-editing-area textarea:not([readonly]):focus{border:var(--ck-focus-ring);box-shadow:var(--ck-inner-shadow),0 0;outline:none}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-source-editing/theme/sourceediting.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AASA,wBAEC,eAAgB,CADhB,iBAED,CAEA,+DAIC,4BAA6B,CAG7B,qBAAsB,CADtB,oCAAqC,CADrC,sCAAuC,CAFvC,QAAS,CADT,+BAAgC,CAMhC,oBACD,CAEA,8BACC,4BAA6B,CAE7B,aAAc,CADd,iBAED,CAEA,iCASC,wCAAyC,CC7BzC,eAAgB,CD2BhB,qBAAsB,CAJtB,WAAY,CAEZ,YAAa,CACb,eAAgB,CALhB,iBAAkB,CAGlB,WAAY,CAFZ,UAkBD,CApBA,yGChBE,qCAAsC,CD4BtC,wBAAyB,CACzB,yBAOF,CAJC,uDEpCA,2BAA2B,CCF3B,qCAA8B,CDC9B,YFwCA",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css";\n@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css";\n@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css";\n\n.ck-source-editing-area {\n\tposition: relative;\n\toverflow: hidden;\n}\n\n.ck-source-editing-area::after,\n.ck-source-editing-area textarea {\n\tpadding: var(--ck-spacing-large);\n\tmargin: 0;\n\tborder: 1px solid transparent;\n\tline-height: var(--ck-line-height-base);\n\tfont-size: var(--ck-font-size-normal);\n\tfont-family: monospace;\n\twhite-space: pre-wrap;\n}\n\n.ck-source-editing-area::after {\n\tcontent: attr(data-value) " ";\n\tvisibility: hidden;\n\tdisplay: block;\n}\n\n.ck-source-editing-area textarea {\n\tposition: absolute;\n\twidth: 100%;\n\theight: 100%;\n\tresize: none;\n\toutline: none;\n\toverflow: hidden;\n\tbox-sizing: border-box;\n\n\tborder-color: var(--ck-color-base-border);\n\n\t@mixin ck-rounded-corners {\n\t\tborder-top-left-radius: 0;\n\t\tborder-top-right-radius: 0;\n\t}\n\n\t&:not([readonly]):focus {\n\t\t@mixin ck-focus-ring;\n\t\t@mixin ck-box-shadow var(--ck-inner-shadow);\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A visual style of focused element's border.\n */\n@define-mixin ck-focus-ring {\n\t/* Disable native outline. */\n\toutline: none;\n\tborder: var(--ck-focus-ring)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},971:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-button,a.ck.ck-button{align-items:center;display:inline-flex;justify-content:left;position:relative;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.ck.ck-button .ck-button__label,a.ck.ck-button .ck-button__label{display:none}.ck.ck-button.ck-button_with-text .ck-button__label,a.ck.ck-button.ck-button_with-text .ck-button__label{display:inline-block}.ck.ck-button:not(.ck-button_with-text),a.ck.ck-button:not(.ck-button_with-text){justify-content:center}.ck.ck-button,a.ck.ck-button{background:var(--ck-color-button-default-background)}.ck.ck-button:not(.ck-disabled):hover,a.ck.ck-button:not(.ck-disabled):hover{background:var(--ck-color-button-default-hover-background)}.ck.ck-button:not(.ck-disabled):active,a.ck.ck-button:not(.ck-disabled):active{background:var(--ck-color-button-default-active-background)}.ck.ck-button.ck-disabled,a.ck.ck-button.ck-disabled{background:var(--ck-color-button-default-disabled-background)}.ck.ck-button,a.ck.ck-button{border-radius:0}.ck-rounded-corners .ck.ck-button,.ck-rounded-corners a.ck.ck-button,.ck.ck-button.ck-rounded-corners,a.ck.ck-button.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-button,a.ck.ck-button{-webkit-appearance:none;border:1px solid transparent;cursor:default;font-size:inherit;line-height:1;min-height:var(--ck-ui-component-min-height);min-width:var(--ck-ui-component-min-height);padding:var(--ck-spacing-tiny);text-align:center;transition:box-shadow .2s ease-in-out,border .2s ease-in-out;vertical-align:middle;white-space:nowrap}.ck.ck-button:active,.ck.ck-button:focus,a.ck.ck-button:active,a.ck.ck-button:focus{border:var(--ck-focus-ring);box-shadow:var(--ck-focus-outer-shadow),0 0;outline:none}.ck.ck-button .ck-button__icon use,.ck.ck-button .ck-button__icon use *,a.ck.ck-button .ck-button__icon use,a.ck.ck-button .ck-button__icon use *{color:inherit}.ck.ck-button .ck-button__label,a.ck.ck-button .ck-button__label{color:inherit;cursor:inherit;font-size:inherit;font-weight:inherit;vertical-align:middle}[dir=ltr] .ck.ck-button .ck-button__label,[dir=ltr] a.ck.ck-button .ck-button__label{text-align:left}[dir=rtl] .ck.ck-button .ck-button__label,[dir=rtl] a.ck.ck-button .ck-button__label{text-align:right}.ck.ck-button .ck-button__keystroke,a.ck.ck-button .ck-button__keystroke{color:inherit}[dir=ltr] .ck.ck-button .ck-button__keystroke,[dir=ltr] a.ck.ck-button .ck-button__keystroke{margin-left:var(--ck-spacing-large)}[dir=rtl] .ck.ck-button .ck-button__keystroke,[dir=rtl] a.ck.ck-button .ck-button__keystroke{margin-right:var(--ck-spacing-large)}.ck.ck-button .ck-button__keystroke,a.ck.ck-button .ck-button__keystroke{font-weight:700;opacity:.7}.ck.ck-button.ck-disabled:active,.ck.ck-button.ck-disabled:focus,a.ck.ck-button.ck-disabled:active,a.ck.ck-button.ck-disabled:focus{box-shadow:var(--ck-focus-disabled-outer-shadow),0 0}.ck.ck-button.ck-disabled .ck-button__icon,.ck.ck-button.ck-disabled .ck-button__label,a.ck.ck-button.ck-disabled .ck-button__icon,a.ck.ck-button.ck-disabled .ck-button__label{opacity:var(--ck-disabled-opacity)}.ck.ck-button.ck-disabled .ck-button__keystroke,a.ck.ck-button.ck-disabled .ck-button__keystroke{opacity:.3}.ck.ck-button.ck-button_with-text,a.ck.ck-button.ck-button_with-text{padding:var(--ck-spacing-tiny) var(--ck-spacing-standard)}[dir=ltr] .ck.ck-button.ck-button_with-text .ck-button__icon,[dir=ltr] a.ck.ck-button.ck-button_with-text .ck-button__icon{margin-left:calc(var(--ck-spacing-small)*-1);margin-right:var(--ck-spacing-small)}[dir=rtl] .ck.ck-button.ck-button_with-text .ck-button__icon,[dir=rtl] a.ck.ck-button.ck-button_with-text .ck-button__icon{margin-left:var(--ck-spacing-small);margin-right:calc(var(--ck-spacing-small)*-1)}.ck.ck-button.ck-button_with-keystroke .ck-button__label,a.ck.ck-button.ck-button_with-keystroke .ck-button__label{flex-grow:1}.ck.ck-button.ck-on,a.ck.ck-button.ck-on{background:var(--ck-color-button-on-background)}.ck.ck-button.ck-on:not(.ck-disabled):hover,a.ck.ck-button.ck-on:not(.ck-disabled):hover{background:var(--ck-color-button-on-hover-background)}.ck.ck-button.ck-on:not(.ck-disabled):active,a.ck.ck-button.ck-on:not(.ck-disabled):active{background:var(--ck-color-button-on-active-background)}.ck.ck-button.ck-on.ck-disabled,a.ck.ck-button.ck-on.ck-disabled{background:var(--ck-color-button-on-disabled-background)}.ck.ck-button.ck-on,a.ck.ck-button.ck-on{color:var(--ck-color-button-on-color)}.ck.ck-button.ck-button-save,a.ck.ck-button.ck-button-save{color:var(--ck-color-button-save)}.ck.ck-button.ck-button-cancel,a.ck.ck-button.ck-button-cancel{color:var(--ck-color-button-cancel)}.ck.ck-button-action,a.ck.ck-button-action{background:var(--ck-color-button-action-background)}.ck.ck-button-action:not(.ck-disabled):hover,a.ck.ck-button-action:not(.ck-disabled):hover{background:var(--ck-color-button-action-hover-background)}.ck.ck-button-action:not(.ck-disabled):active,a.ck.ck-button-action:not(.ck-disabled):active{background:var(--ck-color-button-action-active-background)}.ck.ck-button-action.ck-disabled,a.ck.ck-button-action.ck-disabled{background:var(--ck-color-button-action-disabled-background)}.ck.ck-button-action,a.ck.ck-button-action{color:var(--ck-color-button-action-text)}.ck.ck-button-bold,a.ck.ck-button-bold{font-weight:700}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/button/button.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/mixins/_unselectable.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/button/button.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/mixins/_button.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_disabled.css"],names:[],mappings:"AAOA,6BAMC,kBAAmB,CADnB,mBAAoB,CAEpB,oBAAqB,CAHrB,iBAAkB,CCFlB,qBAAsB,CACtB,wBAAyB,CACzB,oBAAqB,CACrB,gBDkBD,CAdC,iEACC,YACD,CAGC,yGACC,oBACD,CAID,iFACC,sBACD,CEjBD,6BCAC,oDD4ID,CCzIE,6EACC,0DACD,CAEA,+EACC,2DACD,CAID,qDACC,6DACD,CDfD,6BEDC,eF6ID,CA5IA,wIEGE,qCFyIF,CA5IA,6BA6BC,uBAAwB,CANxB,4BAA6B,CAjB7B,cAAe,CAcf,iBAAkB,CAHlB,aAAc,CAJd,4CAA6C,CAD7C,2CAA4C,CAJ5C,8BAA+B,CAC/B,iBAAkB,CAiBlB,4DAA8D,CAnB9D,qBAAsB,CAFtB,kBAuID,CA7GC,oFGhCA,2BAA2B,CCF3B,2CAA8B,CDC9B,YHqCA,CAIC,kJAEC,aACD,CAGD,iEAIC,aAAc,CACd,cAAe,CAHf,iBAAkB,CAClB,mBAAoB,CAMpB,qBASD,CAlBA,qFAYE,eAMF,CAlBA,qFAgBE,gBAEF,CAEA,yEACC,aAYD,CAbA,6FAIE,mCASF,CAbA,6FAQE,oCAKF,CAbA,yEAWC,eAAiB,CACjB,UACD,CAIC,oIIrFD,oDJyFC,CAOA,gLKhGD,kCLkGC,CAEA,iGACC,UACD,CAGD,qEACC,yDAcD,CAXC,2HAEE,4CAA+C,CAC/C,oCAOF,CAVA,2HAQE,mCAAoC,CADpC,6CAGF,CAKA,mHACC,WACD,CAID,yCC/HA,+CDmIA,CChIC,yFACC,qDACD,CAEA,2FACC,sDACD,CAID,iEACC,wDACD,CDgHA,yCAGC,qCACD,CAEA,2DACC,iCACD,CAEA,+DACC,mCACD,CAID,2CC/IC,mDDoJD,CCjJE,2FACC,yDACD,CAEA,6FACC,0DACD,CAID,mEACC,4DACD,CDgID,2CAIC,wCACD,CAEA,uCAEC,eACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../mixins/_unselectable.css";\n\n.ck.ck-button,\na.ck.ck-button {\n\t@mixin ck-unselectable;\n\n\tposition: relative;\n\tdisplay: inline-flex;\n\talign-items: center;\n\tjustify-content: left;\n\n\t& .ck-button__label {\n\t\tdisplay: none;\n\t}\n\n\t&.ck-button_with-text {\n\t\t& .ck-button__label {\n\t\t\tdisplay: inline-block;\n\t\t}\n\t}\n\n\t/* Center the icon horizontally in a button without text. */\n\t&:not(.ck-button_with-text)  {\n\t\tjustify-content: center;\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Makes element unselectable.\n */\n@define-mixin ck-unselectable {\n\t-moz-user-select: none;\n\t-webkit-user-select: none;\n\t-ms-user-select: none;\n\tuser-select: none\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_focus.css";\n@import "../../../mixins/_shadow.css";\n@import "../../../mixins/_disabled.css";\n@import "../../../mixins/_rounded.css";\n@import "../../mixins/_button.css";\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n.ck.ck-button,\na.ck.ck-button {\n\t@mixin ck-button-colors --ck-color-button-default;\n\t@mixin ck-rounded-corners;\n\n\twhite-space: nowrap;\n\tcursor: default;\n\tvertical-align: middle;\n\tpadding: var(--ck-spacing-tiny);\n\ttext-align: center;\n\n\t/* A very important piece of styling. Go to variable declaration to learn more. */\n\tmin-width: var(--ck-ui-component-min-height);\n\tmin-height: var(--ck-ui-component-min-height);\n\n\t/* Normalize the height of the line. Removing this will break consistent height\n\tamong text and text-less buttons (with icons). */\n\tline-height: 1;\n\n\t/* Enable font size inheritance, which allows fluid UI scaling. */\n\tfont-size: inherit;\n\n\t/* Avoid flickering when the foucs border shows up. */\n\tborder: 1px solid transparent;\n\n\t/* Apply some smooth transition to the box-shadow and border. */\n\ttransition: box-shadow .2s ease-in-out, border .2s ease-in-out;\n\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/189 */\n\t-webkit-appearance: none;\n\n\t&:active,\n\t&:focus {\n\t\t@mixin ck-focus-ring;\n\t\t@mixin ck-box-shadow var(--ck-focus-outer-shadow);\n\t}\n\n\t/* Allow icon coloring using the text "color" property. */\n\t& .ck-button__icon {\n\t\t& use,\n\t\t& use * {\n\t\t\tcolor: inherit;\n\t\t}\n\t}\n\n\t& .ck-button__label {\n\t\t/* Enable font size inheritance, which allows fluid UI scaling. */\n\t\tfont-size: inherit;\n\t\tfont-weight: inherit;\n\t\tcolor: inherit;\n\t\tcursor: inherit;\n\n\t\t/* Must be consistent with .ck-icon\'s vertical align. Otherwise, buttons with and\n\t\twithout labels (but with icons) have different sizes in Chrome */\n\t\tvertical-align: middle;\n\n\t\t@mixin ck-dir ltr {\n\t\t\ttext-align: left;\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\ttext-align: right;\n\t\t}\n\t}\n\n\t& .ck-button__keystroke {\n\t\tcolor: inherit;\n\n\t\t@mixin ck-dir ltr {\n\t\t\tmargin-left: var(--ck-spacing-large);\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\tmargin-right: var(--ck-spacing-large);\n\t\t}\n\n\t\tfont-weight: bold;\n\t\topacity: .7;\n\t}\n\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */\n\t&.ck-disabled {\n\t\t&:active,\n\t\t&:focus {\n\t\t\t/* The disabled button should have a slightly less visible shadow when focused. */\n\t\t\t@mixin ck-box-shadow var(--ck-focus-disabled-outer-shadow);\n\t\t}\n\n\t\t& .ck-button__icon {\n\t\t\t@mixin ck-disabled;\n\t\t}\n\n\t\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/98 */\n\t\t& .ck-button__label {\n\t\t\t@mixin ck-disabled;\n\t\t}\n\n\t\t& .ck-button__keystroke {\n\t\t\topacity: .3;\n\t\t}\n\t}\n\n\t&.ck-button_with-text {\n\t\tpadding: var(--ck-spacing-tiny) var(--ck-spacing-standard);\n\n\t\t/* stylelint-disable-next-line no-descending-specificity */\n\t\t& .ck-button__icon {\n\t\t\t@mixin ck-dir ltr {\n\t\t\t\tmargin-left: calc(-1 * var(--ck-spacing-small));\n\t\t\t\tmargin-right: var(--ck-spacing-small);\n\t\t\t}\n\n\t\t\t@mixin ck-dir rtl {\n\t\t\t\tmargin-right: calc(-1 * var(--ck-spacing-small));\n\t\t\t\tmargin-left: var(--ck-spacing-small);\n\t\t\t}\n\t\t}\n\t}\n\n\t&.ck-button_with-keystroke {\n\t\t/* stylelint-disable-next-line no-descending-specificity */\n\t\t& .ck-button__label {\n\t\t\tflex-grow: 1;\n\t\t}\n\t}\n\n\t/* A style of the button which is currently on, e.g. its feature is active. */\n\t&.ck-on {\n\t\t@mixin ck-button-colors --ck-color-button-on;\n\n\t\tcolor: var(--ck-color-button-on-color);\n\t}\n\n\t&.ck-button-save {\n\t\tcolor: var(--ck-color-button-save);\n\t}\n\n\t&.ck-button-cancel {\n\t\tcolor: var(--ck-color-button-cancel);\n\t}\n}\n\n/* A style of the button which handles the primary action. */\n.ck.ck-button-action,\na.ck.ck-button-action {\n\t@mixin ck-button-colors --ck-color-button-action;\n\n\tcolor: var(--ck-color-button-action-text);\n}\n\n.ck.ck-button-bold,\na.ck.ck-button-bold {\n\tfont-weight: bold;\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements a button of given background color.\n *\n * @param {String} $background - Background color of the button.\n * @param {String} $border - Border color of the button.\n */\n@define-mixin ck-button-colors $prefix {\n\tbackground: var($(prefix)-background);\n\n\t&:not(.ck-disabled) {\n\t\t&:hover {\n\t\t\tbackground: var($(prefix)-hover-background);\n\t\t}\n\n\t\t&:active {\n\t\t\tbackground: var($(prefix)-active-background);\n\t\t}\n\t}\n\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/98 */\n\t&.ck-disabled {\n\t\tbackground: var($(prefix)-disabled-background);\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A visual style of focused element's border.\n */\n@define-mixin ck-focus-ring {\n\t/* Disable native outline. */\n\toutline: none;\n\tborder: var(--ck-focus-ring)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A class which indicates that an element holding it is disabled.\n */\n@define-mixin ck-disabled {\n\topacity: var(--ck-disabled-opacity);\n}\n"],sourceRoot:""}]);const c=a},258:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-button.ck-switchbutton .ck-button__toggle,.ck.ck-button.ck-switchbutton .ck-button__toggle .ck-button__toggle__inner{display:block}:root{--ck-switch-button-toggle-width:2.6153846154em;--ck-switch-button-toggle-inner-size:calc(1.07692em + 1px);--ck-switch-button-translation:calc(var(--ck-switch-button-toggle-width) - var(--ck-switch-button-toggle-inner-size) - 2px);--ck-switch-button-inner-hover-shadow:0 0 0 5px var(--ck-color-switch-button-inner-shadow)}.ck.ck-button.ck-switchbutton,.ck.ck-button.ck-switchbutton.ck-on:active,.ck.ck-button.ck-switchbutton.ck-on:focus,.ck.ck-button.ck-switchbutton.ck-on:hover,.ck.ck-button.ck-switchbutton:active,.ck.ck-button.ck-switchbutton:focus,.ck.ck-button.ck-switchbutton:hover{background:transparent;color:inherit}[dir=ltr] .ck.ck-button.ck-switchbutton .ck-button__label{margin-right:calc(var(--ck-spacing-large)*2)}[dir=rtl] .ck.ck-button.ck-switchbutton .ck-button__label{margin-left:calc(var(--ck-spacing-large)*2)}.ck.ck-button.ck-switchbutton .ck-button__toggle{border-radius:0}.ck-rounded-corners .ck.ck-button.ck-switchbutton .ck-button__toggle,.ck.ck-button.ck-switchbutton .ck-button__toggle.ck-rounded-corners{border-radius:var(--ck-border-radius)}[dir=ltr] .ck.ck-button.ck-switchbutton .ck-button__toggle{margin-left:auto}[dir=rtl] .ck.ck-button.ck-switchbutton .ck-button__toggle{margin-right:auto}.ck.ck-button.ck-switchbutton .ck-button__toggle{background:var(--ck-color-switch-button-off-background);border:1px solid transparent;transition:background .4s ease,box-shadow .2s ease-in-out,outline .2s ease-in-out;width:var(--ck-switch-button-toggle-width)}.ck.ck-button.ck-switchbutton .ck-button__toggle .ck-button__toggle__inner{border-radius:0}.ck-rounded-corners .ck.ck-button.ck-switchbutton .ck-button__toggle .ck-button__toggle__inner,.ck.ck-button.ck-switchbutton .ck-button__toggle .ck-button__toggle__inner.ck-rounded-corners{border-radius:var(--ck-border-radius);border-radius:calc(var(--ck-border-radius)*.5)}.ck.ck-button.ck-switchbutton .ck-button__toggle .ck-button__toggle__inner{background:var(--ck-color-switch-button-inner-background);height:var(--ck-switch-button-toggle-inner-size);transition:all .3s ease;width:var(--ck-switch-button-toggle-inner-size)}.ck.ck-button.ck-switchbutton .ck-button__toggle:hover{background:var(--ck-color-switch-button-off-hover-background)}.ck.ck-button.ck-switchbutton .ck-button__toggle:hover .ck-button__toggle__inner{box-shadow:var(--ck-switch-button-inner-hover-shadow)}.ck.ck-button.ck-switchbutton.ck-disabled .ck-button__toggle{opacity:var(--ck-disabled-opacity)}.ck.ck-button.ck-switchbutton:focus{border-color:transparent;box-shadow:none;outline:none}.ck.ck-button.ck-switchbutton:focus .ck-button__toggle{box-shadow:0 0 0 1px var(--ck-color-base-background),0 0 0 5px var(--ck-color-focus-outer-shadow);outline:var(--ck-focus-ring);outline-offset:1px}.ck.ck-button.ck-switchbutton.ck-on .ck-button__toggle{background:var(--ck-color-switch-button-on-background)}.ck.ck-button.ck-switchbutton.ck-on .ck-button__toggle:hover{background:var(--ck-color-switch-button-on-hover-background)}[dir=ltr] .ck.ck-button.ck-switchbutton.ck-on .ck-button__toggle .ck-button__toggle__inner{transform:translateX(var( --ck-switch-button-translation ))}[dir=rtl] .ck.ck-button.ck-switchbutton.ck-on .ck-button__toggle .ck-button__toggle__inner{transform:translateX(calc(var( --ck-switch-button-translation )*-1))}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/button/switchbutton.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/button/switchbutton.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_disabled.css"],names:[],mappings:"AASE,4HACC,aACD,CCCF,MAEC,8CAA+C,CAE/C,0DAAgE,CAChE,2HAIC,CACD,0FACD,CAOC,0QAEC,sBAAuB,CADvB,aAED,CAEA,0DAGE,4CAOF,CAVA,0DAQE,2CAEF,CAEA,iDCpCA,eD4EA,CAxCA,yIChCC,qCDwED,CAxCA,2DAKE,gBAmCF,CAxCA,2DAUE,iBA8BF,CAxCA,iDAkBC,uDAAwD,CAFxD,4BAA6B,CAD7B,iFAAsF,CAEtF,0CAuBD,CApBC,2ECxDD,eDmEC,CAXA,6LCpDA,qCAAsC,CDsDpC,8CASF,CAXA,2EAOC,yDAA0D,CAD1D,gDAAiD,CAIjD,uBAA0B,CAL1B,+CAMD,CAEA,uDACC,6DAKD,CAHC,iFACC,qDACD,CAIF,6DEhFA,kCFkFA,CAGA,oCACC,wBAAyB,CAEzB,eAAgB,CADhB,YAQD,CALC,uDACC,iGAAmG,CAEnG,4BAA6B,CAD7B,kBAED,CAKA,uDACC,sDAkBD,CAhBC,6DACC,4DACD,CAEA,2FAKE,2DAMF,CAXA,2FASE,oEAEF",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-button.ck-switchbutton {\n\t& .ck-button__toggle {\n\t\tdisplay: block;\n\n\t\t& .ck-button__toggle__inner {\n\t\t\tdisplay: block;\n\t\t}\n\t}\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_disabled.css";\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n/* Note: To avoid rendering issues (aliasing) but to preserve the responsive nature\nof the component, floating–point numbers have been used which, for the default font size\n(see: --ck-font-size-base), will generate simple integers. */\n:root {\n\t/* 34px at 13px font-size */\n\t--ck-switch-button-toggle-width: 2.6153846154em;\n\t/* 14px at 13px font-size */\n\t--ck-switch-button-toggle-inner-size: calc(1.0769230769em + 1px);\n\t--ck-switch-button-translation: calc(\n\t\tvar(--ck-switch-button-toggle-width) -\n\t\tvar(--ck-switch-button-toggle-inner-size) -\n\t\t2px /* Border */\n\t);\n\t--ck-switch-button-inner-hover-shadow: 0 0 0 5px var(--ck-color-switch-button-inner-shadow);\n}\n\n.ck.ck-button.ck-switchbutton {\n\t/* Unlike a regular button, the switch button text color and background should never change.\n\t * Changing toggle switch (background, outline) is enough to carry the information about the\n\t * state of the entire component (https://github.com/ckeditor/ckeditor5/issues/12519)\n\t */\n\t&, &:hover, &:focus, &:active, &.ck-on:hover, &.ck-on:focus, &.ck-on:active {\n\t\tcolor: inherit;\n\t\tbackground: transparent;\n\t}\n\n\t& .ck-button__label {\n\t\t@mixin ck-dir ltr {\n\t\t\t/* Separate the label from the switch */\n\t\t\tmargin-right: calc(2 * var(--ck-spacing-large));\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\t/* Separate the label from the switch */\n\t\t\tmargin-left: calc(2 * var(--ck-spacing-large));\n\t\t}\n\t}\n\n\t& .ck-button__toggle {\n\t\t@mixin ck-rounded-corners;\n\n\t\t@mixin ck-dir ltr {\n\t\t\t/* Make sure the toggle is always to the right as far as possible. */\n\t\t\tmargin-left: auto;\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\t/* Make sure the toggle is always to the left as far as possible. */\n\t\t\tmargin-right: auto;\n\t\t}\n\n\t\t/* Apply some smooth transition to the box-shadow and border. */\n\t\t/* Gently animate the background color of the toggle switch */\n\t\ttransition: background 400ms ease, box-shadow .2s ease-in-out, outline .2s ease-in-out;\n\t\tborder: 1px solid transparent;\n\t\twidth: var(--ck-switch-button-toggle-width);\n\t\tbackground: var(--ck-color-switch-button-off-background);\n\n\t\t& .ck-button__toggle__inner {\n\t\t\t@mixin ck-rounded-corners {\n\t\t\t\tborder-radius: calc(.5 * var(--ck-border-radius));\n\t\t\t}\n\n\t\t\twidth: var(--ck-switch-button-toggle-inner-size);\n\t\t\theight: var(--ck-switch-button-toggle-inner-size);\n\t\t\tbackground: var(--ck-color-switch-button-inner-background);\n\n\t\t\t/* Gently animate the inner part of the toggle switch */\n\t\t\ttransition: all 300ms ease;\n\t\t}\n\n\t\t&:hover {\n\t\t\tbackground: var(--ck-color-switch-button-off-hover-background);\n\n\t\t\t& .ck-button__toggle__inner {\n\t\t\t\tbox-shadow: var(--ck-switch-button-inner-hover-shadow);\n\t\t\t}\n\t\t}\n\t}\n\n\t&.ck-disabled .ck-button__toggle {\n\t\t@mixin ck-disabled;\n\t}\n\n\t/* Overriding default .ck-button:focus styles + an outline around the toogle */\n\t&:focus {\n\t\tborder-color: transparent;\n\t\toutline: none;\n\t\tbox-shadow: none;\n\n\t\t& .ck-button__toggle {\n\t\t\tbox-shadow: 0 0 0 1px var(--ck-color-base-background), 0 0 0 5px var(--ck-color-focus-outer-shadow);\n\t\t\toutline-offset: 1px;\n\t\t\toutline: var(--ck-focus-ring);\n\t\t}\n\t}\n\n\t/* stylelint-disable-next-line no-descending-specificity */\n\t&.ck-on {\n\t\t& .ck-button__toggle {\n\t\t\tbackground: var(--ck-color-switch-button-on-background);\n\n\t\t\t&:hover {\n\t\t\t\tbackground: var(--ck-color-switch-button-on-hover-background);\n\t\t\t}\n\n\t\t\t& .ck-button__toggle__inner {\n\t\t\t\t/*\n\t\t\t\t* Move the toggle switch to the right. It will be animated.\n\t\t\t\t*/\n\t\t\t\t@mixin ck-dir ltr {\n\t\t\t\t\ttransform: translateX( var( --ck-switch-button-translation ) );\n\t\t\t\t}\n\n\t\t\t\t@mixin ck-dir rtl {\n\t\t\t\t\ttransform: translateX( calc( -1 * var( --ck-switch-button-translation ) ) );\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A class which indicates that an element holding it is disabled.\n */\n@define-mixin ck-disabled {\n\topacity: var(--ck-disabled-opacity);\n}\n"],sourceRoot:""}]);const c=a},923:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-color-grid{display:grid}:root{--ck-color-grid-tile-size:24px;--ck-color-color-grid-check-icon:#166fd4}.ck.ck-color-grid{grid-gap:5px;padding:8px}.ck.ck-color-grid__tile{border:0;height:var(--ck-color-grid-tile-size);min-height:var(--ck-color-grid-tile-size);min-width:var(--ck-color-grid-tile-size);padding:0;transition:box-shadow .2s ease;width:var(--ck-color-grid-tile-size)}.ck.ck-color-grid__tile.ck-disabled{cursor:unset;transition:unset}.ck.ck-color-grid__tile.ck-color-selector__color-tile_bordered{box-shadow:0 0 0 1px var(--ck-color-base-border)}.ck.ck-color-grid__tile .ck.ck-icon{color:var(--ck-color-color-grid-check-icon);display:none}.ck.ck-color-grid__tile.ck-on{box-shadow:inset 0 0 0 1px var(--ck-color-base-background),0 0 0 2px var(--ck-color-base-text)}.ck.ck-color-grid__tile.ck-on .ck.ck-icon{display:block}.ck.ck-color-grid__tile.ck-on,.ck.ck-color-grid__tile:focus:not(.ck-disabled),.ck.ck-color-grid__tile:hover:not(.ck-disabled){border:0}.ck.ck-color-grid__tile:focus:not(.ck-disabled),.ck.ck-color-grid__tile:hover:not(.ck-disabled){box-shadow:inset 0 0 0 1px var(--ck-color-base-background),0 0 0 2px var(--ck-color-focus-border)}.ck.ck-color-grid__label{padding:0 var(--ck-spacing-standard)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/colorgrid/colorgrid.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/colorgrid/colorgrid.css"],names:[],mappings:"AAKA,kBACC,YACD,CCAA,MACC,8BAA+B,CAK/B,wCACD,CAEA,kBACC,YAAa,CACb,WACD,CAEA,wBAOC,QAAS,CALT,qCAAsC,CAEtC,yCAA0C,CAD1C,wCAAyC,CAEzC,SAAU,CACV,8BAA+B,CAL/B,oCAyCD,CAjCC,oCACC,YAAa,CACb,gBACD,CAEA,+DACC,gDACD,CAEA,oCAEC,2CAA4C,CAD5C,YAED,CAEA,8BACC,8FAKD,CAHC,0CACC,aACD,CAGD,8HAIC,QACD,CAEA,gGAEC,iGACD,CAGD,yBACC,oCACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-color-grid {\n\tdisplay: grid;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n\n:root {\n\t--ck-color-grid-tile-size: 24px;\n\n\t/* Not using global colors here because these may change but some colors in a pallette\n\t * require special treatment. For instance, this ensures no matter what the UI text color is,\n\t * the check icon will look good on the black color tile. */\n\t--ck-color-color-grid-check-icon: hsl(212, 81%, 46%);\n}\n\n.ck.ck-color-grid {\n\tgrid-gap: 5px;\n\tpadding: 8px;\n}\n\n.ck.ck-color-grid__tile {\n\twidth: var(--ck-color-grid-tile-size);\n\theight: var(--ck-color-grid-tile-size);\n\tmin-width: var(--ck-color-grid-tile-size);\n\tmin-height: var(--ck-color-grid-tile-size);\n\tpadding: 0;\n\ttransition: .2s ease box-shadow;\n\tborder: 0;\n\n\t&.ck-disabled {\n\t\tcursor: unset;\n\t\ttransition: unset;\n\t}\n\n\t&.ck-color-selector__color-tile_bordered {\n\t\tbox-shadow: 0 0 0 1px var(--ck-color-base-border);\n\t}\n\n\t& .ck.ck-icon {\n\t\tdisplay: none;\n\t\tcolor: var(--ck-color-color-grid-check-icon);\n\t}\n\n\t&.ck-on {\n\t\tbox-shadow: inset 0 0 0 1px var(--ck-color-base-background), 0 0 0 2px var(--ck-color-base-text);\n\n\t\t& .ck.ck-icon {\n\t\t\tdisplay: block;\n\t\t}\n\t}\n\n\t&.ck-on,\n\t&:focus:not( .ck-disabled ),\n\t&:hover:not( .ck-disabled ) {\n\t\t/* Disable the default .ck-button\'s border ring. */\n\t\tborder: 0;\n\t}\n\n\t&:focus:not( .ck-disabled ),\n\t&:hover:not( .ck-disabled ) {\n\t\tbox-shadow: inset 0 0 0 1px var(--ck-color-base-background), 0 0 0 2px var(--ck-color-focus-border);\n\t}\n}\n\n.ck.ck-color-grid__label {\n\tpadding: 0 var(--ck-spacing-standard);\n}\n'],sourceRoot:""}]);const c=a},257:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".color-picker-hex-input{width:max-content}.color-picker-hex-input .ck.ck-input{min-width:unset}.ck.ck-color-picker__row{display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:space-between;margin:var(--ck-spacing-large) 0 0;width:unset}.ck.ck-color-picker__row .ck.ck-labeled-field-view{padding-top:unset}.ck.ck-color-picker__row .ck.ck-input-text{width:unset}.ck.ck-color-picker__row .ck-color-picker__hash-view{padding-right:var(--ck-spacing-medium);padding-top:var(--ck-spacing-tiny)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/colorpicker/colorpicker.css"],names:[],mappings:"AAKA,wBACC,iBAKD,CAHC,qCACC,eACD,CAGD,yBACC,YAAa,CACb,kBAAmB,CACnB,gBAAiB,CACjB,6BAA8B,CAC9B,kCAAmC,CACnC,WAcD,CAZC,mDACC,iBACD,CAEA,2CACC,WACD,CAEA,qDAEC,sCAAuC,CADvC,kCAED",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.color-picker-hex-input {\n\twidth: max-content;\n\n\t& .ck.ck-input {\n\t\tmin-width: unset;\n\t}\n}\n\n.ck.ck-color-picker__row {\n\tdisplay: flex;\n\tflex-direction: row;\n\tflex-wrap: nowrap;\n\tjustify-content: space-between;\n\tmargin: var(--ck-spacing-large) 0 0;\n\twidth: unset;\n\n\t& .ck.ck-labeled-field-view {\n\t\tpadding-top: unset;\n\t}\n\n\t& .ck.ck-input-text {\n\t\twidth: unset;\n\t}\n\n\t& .ck-color-picker__hash-view {\n\t\tpadding-top: var(--ck-spacing-tiny);\n\t\tpadding-right: var(--ck-spacing-medium);\n\t}\n}\n"],sourceRoot:""}]);const c=a},306:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker,.ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__remove-color{align-items:center;display:flex}[dir=rtl] .ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker,[dir=rtl] .ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__remove-color{justify-content:flex-start}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-selector_action-bar{display:flex;flex-direction:row;justify-content:space-around}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-selector_action-bar .ck-button-cancel,.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-selector_action-bar .ck-button-save{flex:1}.ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker,.ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__remove-color{width:100%}.ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker{border-bottom-left-radius:0;border-bottom-right-radius:0;padding:calc(var(--ck-spacing-standard)/2) var(--ck-spacing-standard)}.ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker:not(:focus){border-top:1px solid var(--ck-color-base-border)}[dir=ltr] .ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker .ck.ck-icon{margin-right:var(--ck-spacing-standard)}[dir=rtl] .ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker .ck.ck-icon{margin-left:var(--ck-spacing-standard)}.ck.ck-color-selector .ck-color-grids-fragment label.ck.ck-color-grid__label{font-weight:unset}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker{padding:8px}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker .hex-color-picker{height:100px;min-width:180px}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker .hex-color-picker::part(saturation){border-radius:var(--ck-border-radius) var(--ck-border-radius) 0 0}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker .hex-color-picker::part(hue){border-radius:0 0 var(--ck-border-radius) var(--ck-border-radius)}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker .hex-color-picker::part(hue-pointer),.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-picker .hex-color-picker::part(saturation-pointer){height:15px;width:15px}.ck.ck-color-selector .ck-color-picker-fragment .ck.ck-color-selector_action-bar{padding:0 8px 8px}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/colorselector/colorselector.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/colorselector/colorselector.css"],names:[],mappings:"AAUE,oLAGC,kBAAmB,CADnB,YAMD,CARA,wMAME,0BAEF,CAKA,iFACC,YAAa,CACb,kBAAmB,CACnB,4BAMD,CAJC,oMAEC,MACD,CCrBD,oLAEC,UACD,CAEA,0FAEC,2BAA4B,CAC5B,4BAA6B,CAF7B,qEAiBD,CAbC,sGACC,gDACD,CAEA,gHAEE,uCAMF,CARA,gHAME,sCAEF,CAGD,6EACC,iBACD,CAKA,oEACC,WAoBD,CAlBC,sFACC,YAAa,CACb,eAeD,CAbC,wGACC,iEACD,CAEA,iGACC,iEACD,CAEA,yNAGC,WAAY,CADZ,UAED,CAIF,iFACC,iBACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n.ck.ck-color-selector {\n\t/* View fragment with color grids. */\n\t& .ck-color-grids-fragment {\n\t\t& .ck-button.ck-color-selector__remove-color,\n\t\t& .ck-button.ck-color-selector__color-picker {\n\t\t\tdisplay: flex;\n\t\t\talign-items: center;\n\n\t\t\t@mixin ck-dir rtl {\n\t\t\t\tjustify-content: flex-start;\n\t\t\t}\n\t\t}\n\t}\n\n\t/* View fragment with a color picker. */\n\t& .ck-color-picker-fragment {\n\t\t& .ck.ck-color-selector_action-bar {\n\t\t\tdisplay: flex;\n\t\t\tflex-direction: row;\n\t\t\tjustify-content: space-around;\n\n\t\t\t& .ck-button-save,\n\t\t\t& .ck-button-cancel {\n\t\t\t\tflex: 1\n\t\t\t}\n\t\t}\n\t}\n}\n','/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n.ck.ck-color-selector {\n\t/* View fragment with color grids. */\n\t& .ck-color-grids-fragment {\n\t\t& .ck-button.ck-color-selector__remove-color,\n\t\t& .ck-button.ck-color-selector__color-picker {\n\t\t\twidth: 100%;\n\t\t}\n\n\t\t& .ck-button.ck-color-selector__color-picker {\n\t\t\tpadding: calc(var(--ck-spacing-standard) / 2) var(--ck-spacing-standard);\n\t\t\tborder-bottom-left-radius: 0;\n\t\t\tborder-bottom-right-radius: 0;\n\n\t\t\t&:not(:focus) {\n\t\t\t\tborder-top: 1px solid var(--ck-color-base-border);\n\t\t\t}\n\n\t\t\t& .ck.ck-icon {\n\t\t\t\t@mixin ck-dir ltr {\n\t\t\t\t\tmargin-right: var(--ck-spacing-standard);\n\t\t\t\t}\n\n\t\t\t\t@mixin ck-dir rtl {\n\t\t\t\t\tmargin-left: var(--ck-spacing-standard);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t& label.ck.ck-color-grid__label {\n\t\t\tfont-weight: unset;\n\t\t}\n\t}\n\n\t/* View fragment with a color picker. */\n\t& .ck-color-picker-fragment {\n\t\t& .ck.ck-color-picker {\n\t\t\tpadding: 8px;\n\n\t\t\t& .hex-color-picker {\n\t\t\t\theight: 100px;\n\t\t\t\tmin-width: 180px;\n\n\t\t\t\t&::part(saturation) {\n\t\t\t\t\tborder-radius: var(--ck-border-radius) var(--ck-border-radius) 0 0;\n\t\t\t\t}\n\n\t\t\t\t&::part(hue) {\n\t\t\t\t\tborder-radius: 0 0 var(--ck-border-radius) var(--ck-border-radius);\n\t\t\t\t}\n\n\t\t\t\t&::part(saturation-pointer),\n\t\t\t\t&::part(hue-pointer) {\n\t\t\t\t\twidth: 15px;\n\t\t\t\t\theight: 15px;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t& .ck.ck-color-selector_action-bar {\n\t\t\tpadding: 0 8px 8px;\n\t\t}\n\t}\n}\n'],sourceRoot:""}]);const c=a},62:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,":root{--ck-dropdown-max-width:75vw}.ck.ck-dropdown{display:inline-block;position:relative}.ck.ck-dropdown .ck-dropdown__arrow{pointer-events:none;z-index:var(--ck-z-default)}.ck.ck-dropdown .ck-button.ck-dropdown__button{width:100%}.ck.ck-dropdown .ck-dropdown__panel{display:none;max-width:var(--ck-dropdown-max-width);position:absolute;z-index:var(--ck-z-modal)}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel-visible{display:inline-block}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_n,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_ne,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nme,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nmw,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nw{bottom:100%}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_s,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_se,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sme,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_smw,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw{bottom:auto;top:100%}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_ne,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_se{left:0}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nw,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw{right:0}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_n,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_s{left:50%;transform:translateX(-50%)}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nmw,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_smw{left:75%;transform:translateX(-75%)}.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_nme,.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sme{left:25%;transform:translateX(-25%)}.ck.ck-toolbar .ck-dropdown__panel{z-index:calc(var(--ck-z-modal) + 1)}:root{--ck-dropdown-arrow-size:calc(var(--ck-icon-size)*0.5)}.ck.ck-dropdown{font-size:inherit}.ck.ck-dropdown .ck-dropdown__arrow{width:var(--ck-dropdown-arrow-size)}[dir=ltr] .ck.ck-dropdown .ck-dropdown__arrow{margin-left:var(--ck-spacing-standard);right:var(--ck-spacing-standard)}[dir=rtl] .ck.ck-dropdown .ck-dropdown__arrow{left:var(--ck-spacing-standard);margin-right:var(--ck-spacing-small)}.ck.ck-dropdown.ck-disabled .ck-dropdown__arrow{opacity:var(--ck-disabled-opacity)}[dir=ltr] .ck.ck-dropdown .ck-button.ck-dropdown__button:not(.ck-button_with-text){padding-left:var(--ck-spacing-small)}[dir=rtl] .ck.ck-dropdown .ck-button.ck-dropdown__button:not(.ck-button_with-text){padding-right:var(--ck-spacing-small)}.ck.ck-dropdown .ck-button.ck-dropdown__button .ck-button__label{overflow:hidden;text-overflow:ellipsis;width:7em}.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-disabled .ck-button__label{opacity:var(--ck-disabled-opacity)}.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-on{border-bottom-left-radius:0;border-bottom-right-radius:0}.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-dropdown__button_label-width_auto .ck-button__label{width:auto}.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-off:active,.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-on:active{box-shadow:none}.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-off:active:focus,.ck.ck-dropdown .ck-button.ck-dropdown__button.ck-on:active:focus{box-shadow:var(--ck-focus-outer-shadow),0 0}.ck.ck-dropdown__panel{border-radius:0}.ck-rounded-corners .ck.ck-dropdown__panel,.ck.ck-dropdown__panel.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-dropdown__panel{background:var(--ck-color-dropdown-panel-background);border:1px solid var(--ck-color-dropdown-panel-border);bottom:0;box-shadow:var(--ck-drop-shadow),0 0;min-width:100%}.ck.ck-dropdown__panel.ck-dropdown__panel_se{border-top-left-radius:0}.ck.ck-dropdown__panel.ck-dropdown__panel_sw{border-top-right-radius:0}.ck.ck-dropdown__panel.ck-dropdown__panel_ne{border-bottom-left-radius:0}.ck.ck-dropdown__panel.ck-dropdown__panel_nw{border-bottom-right-radius:0}.ck.ck-dropdown__panel:focus{outline:none}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/dropdown/dropdown.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/dropdown.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_disabled.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAKA,MACC,4BACD,CAEA,gBACC,oBAAqB,CACrB,iBA2ED,CAzEC,oCACC,mBAAoB,CACpB,2BACD,CAGA,+CACC,UACD,CAEA,oCACC,YAAa,CAEb,sCAAuC,CAEvC,iBAAkB,CAHlB,yBA4DD,CAvDC,+DACC,oBACD,CAEA,mSAKC,WACD,CAEA,mSAUC,WAAY,CADZ,QAED,CAEA,oHAEC,MACD,CAEA,oHAEC,OACD,CAEA,kHAGC,QAAS,CACT,0BACD,CAEA,sHAGC,QAAS,CACT,0BACD,CAEA,sHAGC,QAAS,CACT,0BACD,CAQF,mCACC,mCACD,CCpFA,MACC,sDACD,CAEA,gBAEC,iBA2ED,CAzEC,oCACC,mCACD,CAGC,8CAIC,sCAAuC,CAHvC,gCAID,CAIA,8CACC,+BAAgC,CAGhC,oCACD,CAGD,gDC/BA,kCDiCA,CAIE,mFAEC,oCACD,CAIA,mFAEC,qCACD,CAID,iEAEC,eAAgB,CAChB,sBAAuB,CAFvB,SAGD,CAGA,6EC1DD,kCD4DC,CAGA,qDACC,2BAA4B,CAC5B,4BACD,CAEA,sGACC,UACD,CAGA,yHAEC,eAKD,CAHC,qIE7EF,2CF+EE,CAKH,uBGlFC,eHkHD,CAhCA,qFG9EE,qCH8GF,CAhCA,uBAIC,oDAAqD,CACrD,sDAAuD,CACvD,QAAS,CE1FT,oCAA8B,CF6F9B,cAuBD,CAnBC,6CACC,wBACD,CAEA,6CACC,yBACD,CAEA,6CACC,2BACD,CAEA,6CACC,4BACD,CAEA,6BACC,YACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-dropdown-max-width: 75vw;\n}\n\n.ck.ck-dropdown {\n\tdisplay: inline-block;\n\tposition: relative;\n\n\t& .ck-dropdown__arrow {\n\t\tpointer-events: none;\n\t\tz-index: var(--ck-z-default);\n\t}\n\n\t/* Dropdown button should span horizontally, e.g. in vertical toolbars */\n\t& .ck-button.ck-dropdown__button {\n\t\twidth: 100%;\n\t}\n\n\t& .ck-dropdown__panel {\n\t\tdisplay: none;\n\t\tz-index: var(--ck-z-modal);\n\t\tmax-width: var(--ck-dropdown-max-width);\n\n\t\tposition: absolute;\n\n\t\t&.ck-dropdown__panel-visible {\n\t\t\tdisplay: inline-block;\n\t\t}\n\n\t\t&.ck-dropdown__panel_ne,\n\t\t&.ck-dropdown__panel_nw,\n\t\t&.ck-dropdown__panel_n,\n\t\t&.ck-dropdown__panel_nmw,\n\t\t&.ck-dropdown__panel_nme {\n\t\t\tbottom: 100%;\n\t\t}\n\n\t\t&.ck-dropdown__panel_se,\n\t\t&.ck-dropdown__panel_sw,\n\t\t&.ck-dropdown__panel_smw,\n\t\t&.ck-dropdown__panel_sme,\n\t\t&.ck-dropdown__panel_s {\n\t\t\t/*\n\t\t\t * Using transform: translate3d( 0, 100%, 0 ) causes blurry dropdown on Chrome 67-78+ on non-retina displays.\n\t\t\t * See https://github.com/ckeditor/ckeditor5/issues/1053.\n\t\t\t */\n\t\t\ttop: 100%;\n\t\t\tbottom: auto;\n\t\t}\n\n\t\t&.ck-dropdown__panel_ne,\n\t\t&.ck-dropdown__panel_se {\n\t\t\tleft: 0px;\n\t\t}\n\n\t\t&.ck-dropdown__panel_nw,\n\t\t&.ck-dropdown__panel_sw {\n\t\t\tright: 0px;\n\t\t}\n\n\t\t&.ck-dropdown__panel_s,\n\t\t&.ck-dropdown__panel_n {\n\t\t\t/* Positioning panels relative to the center of the button */\n\t\t\tleft: 50%;\n\t\t\ttransform: translateX(-50%);\n\t\t}\n\n\t\t&.ck-dropdown__panel_nmw,\n\t\t&.ck-dropdown__panel_smw {\n\t\t\t/* Positioning panels relative to the middle-west of the button */\n\t\t\tleft: 75%;\n\t\t\ttransform: translateX(-75%);\n\t\t}\n\n\t\t&.ck-dropdown__panel_nme,\n\t\t&.ck-dropdown__panel_sme {\n\t\t\t/* Positioning panels relative to the middle-east of the button */\n\t\t\tleft: 25%;\n\t\t\ttransform: translateX(-25%);\n\t\t}\n\t}\n}\n\n/*\n * Toolbar dropdown panels should be always above the UI (eg. other dropdown panels) from the editor's content.\n * See https://github.com/ckeditor/ckeditor5/issues/7874\n */\n.ck.ck-toolbar .ck-dropdown__panel {\n\tz-index: calc( var(--ck-z-modal) + 1 );\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_disabled.css";\n@import "../../../mixins/_shadow.css";\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n:root {\n\t--ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));\n}\n\n.ck.ck-dropdown {\n\t/* Enable font size inheritance, which allows fluid UI scaling. */\n\tfont-size: inherit;\n\n\t& .ck-dropdown__arrow {\n\t\twidth: var(--ck-dropdown-arrow-size);\n\t}\n\n\t@mixin ck-dir ltr {\n\t\t& .ck-dropdown__arrow {\n\t\t\tright: var(--ck-spacing-standard);\n\n\t\t\t/* A space to accommodate the triangle. */\n\t\t\tmargin-left: var(--ck-spacing-standard);\n\t\t}\n\t}\n\n\t@mixin ck-dir rtl {\n\t\t& .ck-dropdown__arrow {\n\t\t\tleft: var(--ck-spacing-standard);\n\n\t\t\t/* A space to accommodate the triangle. */\n\t\t\tmargin-right: var(--ck-spacing-small);\n\t\t}\n\t}\n\n\t&.ck-disabled .ck-dropdown__arrow {\n\t\t@mixin ck-disabled;\n\t}\n\n\t& .ck-button.ck-dropdown__button {\n\t\t@mixin ck-dir ltr {\n\t\t\t&:not(.ck-button_with-text) {\n\t\t\t\t/* Make sure dropdowns with just an icon have the right inner spacing */\n\t\t\t\tpadding-left: var(--ck-spacing-small);\n\t\t\t}\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\t&:not(.ck-button_with-text) {\n\t\t\t\t/* Make sure dropdowns with just an icon have the right inner spacing */\n\t\t\t\tpadding-right: var(--ck-spacing-small);\n\t\t\t}\n\t\t}\n\n\t\t/* #23 */\n\t\t& .ck-button__label {\n\t\t\twidth: 7em;\n\t\t\toverflow: hidden;\n\t\t\ttext-overflow: ellipsis;\n\t\t}\n\n\t\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */\n\t\t&.ck-disabled .ck-button__label {\n\t\t\t@mixin ck-disabled;\n\t\t}\n\n\t\t/* https://github.com/ckeditor/ckeditor5/issues/816 */\n\t\t&.ck-on {\n\t\t\tborder-bottom-left-radius: 0;\n\t\t\tborder-bottom-right-radius: 0;\n\t\t}\n\n\t\t&.ck-dropdown__button_label-width_auto .ck-button__label {\n\t\t\twidth: auto;\n\t\t}\n\n\t\t/* https://github.com/ckeditor/ckeditor5/issues/8699 */\n\t\t&.ck-off:active,\n\t\t&.ck-on:active {\n\t\t\tbox-shadow: none;\n\n\t\t\t&:focus {\n\t\t\t\t@mixin ck-box-shadow var(--ck-focus-outer-shadow);\n\t\t\t}\n\t\t}\n\t}\n}\n\n.ck.ck-dropdown__panel {\n\t@mixin ck-rounded-corners;\n\t@mixin ck-drop-shadow;\n\n\tbackground: var(--ck-color-dropdown-panel-background);\n\tborder: 1px solid var(--ck-color-dropdown-panel-border);\n\tbottom: 0;\n\n\t/* Make sure the panel is at least as wide as the drop-down\'s button. */\n\tmin-width: 100%;\n\n\t/* Disabled corner border radius to be consistent with the .dropdown__button\n\thttps://github.com/ckeditor/ckeditor5/issues/816 */\n\t&.ck-dropdown__panel_se {\n\t\tborder-top-left-radius: 0;\n\t}\n\n\t&.ck-dropdown__panel_sw {\n\t\tborder-top-right-radius: 0;\n\t}\n\n\t&.ck-dropdown__panel_ne {\n\t\tborder-bottom-left-radius: 0;\n\t}\n\n\t&.ck-dropdown__panel_nw {\n\t\tborder-bottom-right-radius: 0;\n\t}\n\n\t&:focus {\n\t\toutline: none;\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A class which indicates that an element holding it is disabled.\n */\n@define-mixin ck-disabled {\n\topacity: var(--ck-disabled-opacity);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},883:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-dropdown .ck-dropdown__panel .ck-list{border-radius:0}.ck-rounded-corners .ck.ck-dropdown .ck-dropdown__panel .ck-list,.ck.ck-dropdown .ck-dropdown__panel .ck-list.ck-rounded-corners{border-radius:var(--ck-border-radius);border-top-left-radius:0}.ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:first-child .ck-button{border-radius:0}.ck-rounded-corners .ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:first-child .ck-button,.ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:first-child .ck-button.ck-rounded-corners{border-radius:var(--ck-border-radius);border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:0}.ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:last-child .ck-button{border-radius:0}.ck-rounded-corners .ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:last-child .ck-button,.ck.ck-dropdown .ck-dropdown__panel .ck-list .ck-list__item:last-child .ck-button.ck-rounded-corners{border-radius:var(--ck-border-radius);border-top-left-radius:0;border-top-right-radius:0}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/listdropdown.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAOA,6CCIC,eDqBD,CAzBA,iICQE,qCAAsC,CDJtC,wBAqBF,CAfE,mFCND,eDYC,CANA,6MCFA,qCAAsC,CDKpC,2BAA4B,CAC5B,4BAA6B,CAF7B,wBAIF,CAEA,kFCdD,eDmBC,CALA,2MCVA,qCAAsC,CDYpC,wBAAyB,CACzB,yBAEF",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n\n.ck.ck-dropdown .ck-dropdown__panel .ck-list {\n\t/* Disabled radius of top-left border to be consistent with .dropdown__button\n\thttps://github.com/ckeditor/ckeditor5/issues/816 */\n\t@mixin ck-rounded-corners {\n\t\tborder-top-left-radius: 0;\n\t}\n\n\t/* Make sure the button belonging to the first/last child of the list goes well with the\n\tborder radius of the entire panel. */\n\t& .ck-list__item {\n\t\t&:first-child .ck-button {\n\t\t\t@mixin ck-rounded-corners {\n\t\t\t\tborder-top-left-radius: 0;\n\t\t\t\tborder-bottom-left-radius: 0;\n\t\t\t\tborder-bottom-right-radius: 0;\n\t\t\t}\n\t\t}\n\n\t\t&:last-child .ck-button {\n\t\t\t@mixin ck-rounded-corners {\n\t\t\t\tborder-top-left-radius: 0;\n\t\t\t\tborder-top-right-radius: 0;\n\t\t\t}\n\t\t}\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},791:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,'.ck.ck-splitbutton{font-size:inherit}.ck.ck-splitbutton .ck-splitbutton__action:focus{z-index:calc(var(--ck-z-default) + 1)}:root{--ck-color-split-button-hover-background:#ebebeb;--ck-color-split-button-hover-border:#b3b3b3}[dir=ltr] .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__action,[dir=ltr] .ck.ck-splitbutton:hover>.ck-splitbutton__action{border-bottom-right-radius:unset;border-top-right-radius:unset}[dir=rtl] .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__action,[dir=rtl] .ck.ck-splitbutton:hover>.ck-splitbutton__action{border-bottom-left-radius:unset;border-top-left-radius:unset}.ck.ck-splitbutton>.ck-splitbutton__arrow{min-width:unset}[dir=ltr] .ck.ck-splitbutton>.ck-splitbutton__arrow{border-bottom-left-radius:unset;border-top-left-radius:unset}[dir=rtl] .ck.ck-splitbutton>.ck-splitbutton__arrow{border-bottom-right-radius:unset;border-top-right-radius:unset}.ck.ck-splitbutton>.ck-splitbutton__arrow svg{width:var(--ck-dropdown-arrow-size)}.ck.ck-splitbutton>.ck-splitbutton__arrow:not(:focus){border-bottom-width:0;border-top-width:0}.ck.ck-splitbutton.ck-splitbutton_open>.ck-button:not(.ck-on):not(.ck-disabled):not(:hover),.ck.ck-splitbutton:hover>.ck-button:not(.ck-on):not(.ck-disabled):not(:hover){background:var(--ck-color-split-button-hover-background)}.ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__arrow:not(.ck-disabled):after,.ck.ck-splitbutton:hover>.ck-splitbutton__arrow:not(.ck-disabled):after{background-color:var(--ck-color-split-button-hover-border);content:"";height:100%;position:absolute;width:1px}.ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__arrow:focus:after,.ck.ck-splitbutton:hover>.ck-splitbutton__arrow:focus:after{--ck-color-split-button-hover-border:var(--ck-color-focus-border)}[dir=ltr] .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__arrow:not(.ck-disabled):after,[dir=ltr] .ck.ck-splitbutton:hover>.ck-splitbutton__arrow:not(.ck-disabled):after{left:-1px}[dir=rtl] .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__arrow:not(.ck-disabled):after,[dir=rtl] .ck.ck-splitbutton:hover>.ck-splitbutton__arrow:not(.ck-disabled):after{right:-1px}.ck.ck-splitbutton.ck-splitbutton_open{border-radius:0}.ck-rounded-corners .ck.ck-splitbutton.ck-splitbutton_open,.ck.ck-splitbutton.ck-splitbutton_open.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck-rounded-corners .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__action,.ck.ck-splitbutton.ck-splitbutton_open.ck-rounded-corners>.ck-splitbutton__action{border-bottom-left-radius:0}.ck-rounded-corners .ck.ck-splitbutton.ck-splitbutton_open>.ck-splitbutton__arrow,.ck.ck-splitbutton.ck-splitbutton_open.ck-rounded-corners>.ck-splitbutton__arrow{border-bottom-right-radius:0}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/dropdown/splitbutton.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/splitbutton.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAKA,mBAEC,iBAKD,CAHC,iDACC,qCACD,CCJD,MACC,gDAAyD,CACzD,4CACD,CAMC,oIAKE,gCAAiC,CADjC,6BASF,CAbA,oIAWE,+BAAgC,CADhC,4BAGF,CAEA,0CAGC,eAiBD,CApBA,oDAQE,+BAAgC,CADhC,4BAaF,CApBA,oDAcE,gCAAiC,CADjC,6BAOF,CAHC,8CACC,mCACD,CAKD,sDAEC,qBAAwB,CADxB,kBAED,CAQC,0KACC,wDACD,CAIA,8JAKC,0DAA2D,CAJ3D,UAAW,CAGX,WAAY,CAFZ,iBAAkB,CAClB,SAGD,CAGA,sIACC,iEACD,CAGC,kLACC,SACD,CAIA,kLACC,UACD,CAMF,uCCzFA,eDmGA,CAVA,qHCrFC,qCD+FD,CARE,qKACC,2BACD,CAEA,mKACC,4BACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-splitbutton {\n\t/* Enable font size inheritance, which allows fluid UI scaling. */\n\tfont-size: inherit;\n\n\t& .ck-splitbutton__action:focus {\n\t\tz-index: calc(var(--ck-z-default) + 1);\n\t}\n}\n\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n\n:root {\n\t--ck-color-split-button-hover-background: hsl(0, 0%, 92%);\n\t--ck-color-split-button-hover-border: hsl(0, 0%, 70%);\n}\n\n.ck.ck-splitbutton {\n\t/*\n\t * Note: ck-rounded and ck-dir mixins don\'t go together (because they both use @nest).\n\t */\n\t&:hover > .ck-splitbutton__action,\n\t&.ck-splitbutton_open > .ck-splitbutton__action {\n\t\t@nest [dir="ltr"] & {\n\t\t\t/* Don\'t round the action button on the right side */\n\t\t\tborder-top-right-radius: unset;\n\t\t\tborder-bottom-right-radius: unset;\n\t\t}\n\n\t\t@nest [dir="rtl"] & {\n\t\t\t/* Don\'t round the action button on the left side */\n\t\t\tborder-top-left-radius: unset;\n\t\t\tborder-bottom-left-radius: unset;\n\t\t}\n\t}\n\n\t& > .ck-splitbutton__arrow {\n\t\t/* It\'s a text-less button and since the icon is positioned absolutely in such situation,\n\t\tit must get some arbitrary min-width. */\n\t\tmin-width: unset;\n\n\t\t@nest [dir="ltr"] & {\n\t\t\t/* Don\'t round the arrow button on the left side */\n\t\t\tborder-top-left-radius: unset;\n\t\t\tborder-bottom-left-radius: unset;\n\t\t}\n\n\t\t@nest [dir="rtl"] & {\n\t\t\t/* Don\'t round the arrow button on the right side */\n\t\t\tborder-top-right-radius: unset;\n\t\t\tborder-bottom-right-radius: unset;\n\t\t}\n\n\t\t& svg {\n\t\t\twidth: var(--ck-dropdown-arrow-size);\n\t\t}\n\t}\n\n\t/* Make sure the divider stretches 100% height of the button\n\thttps://github.com/ckeditor/ckeditor5/issues/10936 */\n\t& > .ck-splitbutton__arrow:not(:focus) {\n\t\tborder-top-width: 0px;\n\t\tborder-bottom-width: 0px;\n\t}\n\n\t/* When the split button is "open" (the arrow is on) or being hovered, it should get some styling\n\tas a whole. The background of both buttons should stand out and there should be a visual\n\tseparation between both buttons. */\n\t&.ck-splitbutton_open,\n\t&:hover {\n\t\t/* When the split button hovered as a whole, not as individual buttons. */\n\t\t& > .ck-button:not(.ck-on):not(.ck-disabled):not(:hover) {\n\t\t\tbackground: var(--ck-color-split-button-hover-background);\n\t\t}\n\n\t\t/* Splitbutton separator needs to be set with the ::after pseudoselector\n\t\tto display properly the borders on focus */\n\t\t& > .ck-splitbutton__arrow:not(.ck-disabled)::after {\n\t\t\tcontent: \'\';\n\t\t\tposition: absolute;\n\t\t\twidth: 1px;\n\t\t\theight: 100%;\n\t\t\tbackground-color: var(--ck-color-split-button-hover-border);\n\t\t}\n\n\t\t/* Make sure the divider between the buttons looks fine when the button is focused */\n\t\t& > .ck-splitbutton__arrow:focus::after {\n\t\t\t--ck-color-split-button-hover-border: var(--ck-color-focus-border);\n\t\t}\n\n\t\t@nest [dir="ltr"] & {\n\t\t\t& > .ck-splitbutton__arrow:not(.ck-disabled)::after {\n\t\t\t\tleft: -1px;\n\t\t\t}\n\t\t}\n\n\t\t@nest [dir="rtl"] & {\n\t\t\t& > .ck-splitbutton__arrow:not(.ck-disabled)::after {\n\t\t\t\tright: -1px;\n\t\t\t}\n\t\t}\n\t}\n\n\t/* Don\'t round the bottom left and right corners of the buttons when "open"\n\thttps://github.com/ckeditor/ckeditor5/issues/816 */\n\t&.ck-splitbutton_open {\n\t\t@mixin ck-rounded-corners {\n\t\t\t& > .ck-splitbutton__action {\n\t\t\t\tborder-bottom-left-radius: 0;\n\t\t\t}\n\n\t\t\t& > .ck-splitbutton__arrow {\n\t\t\t\tborder-bottom-right-radius: 0;\n\t\t\t}\n\t\t}\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},704:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,":root{--ck-toolbar-dropdown-max-width:60vw}.ck.ck-toolbar-dropdown>.ck-dropdown__panel{max-width:var(--ck-toolbar-dropdown-max-width);width:max-content}.ck.ck-toolbar-dropdown>.ck-dropdown__panel .ck-button:focus{z-index:calc(var(--ck-z-default) + 1)}.ck.ck-toolbar-dropdown .ck-toolbar{border:0}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/dropdown/toolbardropdown.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/toolbardropdown.css"],names:[],mappings:"AAKA,MACC,oCACD,CAEA,4CAGC,8CAA+C,CAD/C,iBAQD,CAJE,6DACC,qCACD,CCZF,oCACC,QACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-toolbar-dropdown-max-width: 60vw;\n}\n\n.ck.ck-toolbar-dropdown > .ck-dropdown__panel {\n\t/* https://github.com/ckeditor/ckeditor5/issues/5586 */\n\twidth: max-content;\n\tmax-width: var(--ck-toolbar-dropdown-max-width);\n\n\t& .ck-button {\n\t\t&:focus {\n\t\t\tz-index: calc(var(--ck-z-default) + 1);\n\t\t}\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-toolbar-dropdown .ck-toolbar {\n\tborder: 0;\n}\n"],sourceRoot:""}]);const c=a},847:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,":root{--ck-color-editable-blur-selection:#d9d9d9}.ck.ck-editor__editable:not(.ck-editor__nested-editable){border-radius:0}.ck-rounded-corners .ck.ck-editor__editable:not(.ck-editor__nested-editable),.ck.ck-editor__editable.ck-rounded-corners:not(.ck-editor__nested-editable){border-radius:var(--ck-border-radius)}.ck.ck-editor__editable.ck-focused:not(.ck-editor__nested-editable){border:var(--ck-focus-ring);box-shadow:var(--ck-inner-shadow),0 0;outline:none}.ck.ck-editor__editable_inline{border:1px solid transparent;overflow:auto;padding:0 var(--ck-spacing-standard)}.ck.ck-editor__editable_inline[dir=ltr]{text-align:left}.ck.ck-editor__editable_inline[dir=rtl]{text-align:right}.ck.ck-editor__editable_inline>:first-child{margin-top:var(--ck-spacing-large)}.ck.ck-editor__editable_inline>:last-child{margin-bottom:var(--ck-spacing-large)}.ck.ck-editor__editable_inline.ck-blurred ::selection{background:var(--ck-color-editable-blur-selection)}.ck.ck-balloon-panel.ck-toolbar-container[class*=arrow_n]:after{border-bottom-color:var(--ck-color-panel-background)}.ck.ck-balloon-panel.ck-toolbar-container[class*=arrow_s]:after{border-top-color:var(--ck-color-panel-background)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/editorui/editorui.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AAWA,MACC,0CACD,CAEA,yDCJC,eDWD,CAPA,yJCAE,qCDOF,CAJC,oEEPA,2BAA2B,CCF3B,qCAA8B,CDC9B,YFWA,CAGD,+BAGC,4BAA6B,CAF7B,aAAc,CACd,oCA6BD,CA1BC,wCACC,eACD,CAEA,wCACC,gBACD,CAGA,4CACC,kCACD,CAGA,2CAKC,qCACD,CAGA,sDACC,kDACD,CAKA,gEACC,oDACD,CAIA,gEACC,iDACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_disabled.css";\n@import "../../../mixins/_shadow.css";\n@import "../../../mixins/_focus.css";\n@import "../../mixins/_button.css";\n\n:root {\n\t--ck-color-editable-blur-selection: hsl(0, 0%, 85%);\n}\n\n.ck.ck-editor__editable:not(.ck-editor__nested-editable) {\n\t@mixin ck-rounded-corners;\n\n\t&.ck-focused {\n\t\t@mixin ck-focus-ring;\n\t\t@mixin ck-box-shadow var(--ck-inner-shadow);\n\t}\n}\n\n.ck.ck-editor__editable_inline {\n\toverflow: auto;\n\tpadding: 0 var(--ck-spacing-standard);\n\tborder: 1px solid transparent;\n\n\t&[dir="ltr"] {\n\t\ttext-align: left;\n\t}\n\n\t&[dir="rtl"] {\n\t\ttext-align: right;\n\t}\n\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/116 */\n\t& > *:first-child {\n\t\tmargin-top: var(--ck-spacing-large);\n\t}\n\n\t/* https://github.com/ckeditor/ckeditor5/issues/847 */\n\t& > *:last-child {\n\t\t/*\n\t\t * This value should match with the default margins of the block elements (like .media or .image)\n\t\t * to avoid a content jumping when the fake selection container shows up (See https://github.com/ckeditor/ckeditor5/issues/9825).\n\t\t */\n\t\tmargin-bottom: var(--ck-spacing-large);\n\t}\n\n\t/* https://github.com/ckeditor/ckeditor5/issues/6517 */\n\t&.ck-blurred ::selection {\n\t\tbackground: var(--ck-color-editable-blur-selection);\n\t}\n}\n\n/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/111 */\n.ck.ck-balloon-panel.ck-toolbar-container[class*="arrow_n"] {\n\t&::after {\n\t\tborder-bottom-color: var(--ck-color-panel-background);\n\t}\n}\n\n.ck.ck-balloon-panel.ck-toolbar-container[class*="arrow_s"] {\n\t&::after {\n\t\tborder-top-color: var(--ck-color-panel-background);\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A visual style of focused element's border.\n */\n@define-mixin ck-focus-ring {\n\t/* Disable native outline. */\n\toutline: none;\n\tborder: var(--ck-focus-ring)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},668:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-form__header{align-items:center;display:flex;flex-direction:row;flex-wrap:nowrap;justify-content:space-between}:root{--ck-form-header-height:38px}.ck.ck-form__header{border-bottom:1px solid var(--ck-color-base-border);height:var(--ck-form-header-height);line-height:var(--ck-form-header-height);padding:var(--ck-spacing-small) var(--ck-spacing-large)}.ck.ck-form__header .ck-form__header__label{font-weight:700}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/formheader/formheader.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/formheader/formheader.css"],names:[],mappings:"AAKA,oBAIC,kBAAmB,CAHnB,YAAa,CACb,kBAAmB,CACnB,gBAAiB,CAEjB,6BACD,CCNA,MACC,4BACD,CAEA,oBAIC,mDAAoD,CAFpD,mCAAoC,CACpC,wCAAyC,CAFzC,uDAQD,CAHC,4CACC,eACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-form__header {\n\tdisplay: flex;\n\tflex-direction: row;\n\tflex-wrap: nowrap;\n\talign-items: center;\n\tjustify-content: space-between;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-form-header-height: 38px;\n}\n\n.ck.ck-form__header {\n\tpadding: var(--ck-spacing-small) var(--ck-spacing-large);\n\theight: var(--ck-form-header-height);\n\tline-height: var(--ck-form-header-height);\n\tborder-bottom: 1px solid var(--ck-color-base-border);\n\n\t& .ck-form__header__label {\n\t\tfont-weight: bold;\n\t}\n}\n"],sourceRoot:""}]);const c=a},977:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-icon{vertical-align:middle}:root{--ck-icon-size:calc(var(--ck-line-height-base)*var(--ck-font-size-normal))}.ck.ck-icon{font-size:.8333350694em;height:var(--ck-icon-size);width:var(--ck-icon-size);will-change:transform}.ck.ck-icon,.ck.ck-icon *{cursor:inherit}.ck.ck-icon.ck-icon_inherit-color,.ck.ck-icon.ck-icon_inherit-color *{color:inherit}.ck.ck-icon.ck-icon_inherit-color :not([fill]){fill:currentColor}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/icon/icon.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/icon/icon.css"],names:[],mappings:"AAKA,YACC,qBACD,CCFA,MACC,0EACD,CAEA,YAKC,uBAAwB,CAHxB,0BAA2B,CAD3B,yBAA0B,CAU1B,qBAoBD,CAlBC,0BALA,cAQA,CAMC,sEACC,aAMD,CAJC,+CAEC,iBACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-icon {\n\tvertical-align: middle;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-icon-size: calc(var(--ck-line-height-base) * var(--ck-font-size-normal));\n}\n\n.ck.ck-icon {\n\twidth: var(--ck-icon-size);\n\theight: var(--ck-icon-size);\n\n\t/* Multiplied by the height of the line in "px" should give SVG "viewport" dimensions */\n\tfont-size: .8333350694em;\n\n\t/* Inherit cursor style (#5). */\n\tcursor: inherit;\n\n\t/* This will prevent blurry icons on Firefox. See #340. */\n\twill-change: transform;\n\n\t& * {\n\t\t/* Inherit cursor style (#5). */\n\t\tcursor: inherit;\n\t}\n\n\t/* Allows dynamic coloring of an icon by inheriting its color from the parent. */\n\t&.ck-icon_inherit-color {\n\t\tcolor: inherit;\n\n\t\t& * {\n\t\t\tcolor: inherit;\n\n\t\t\t&:not([fill]) {\n\t\t\t\t/* Needed by FF. */\n\t\t\t\tfill: currentColor;\n\t\t\t}\n\t\t}\n\t}\n}\n'],sourceRoot:""}]);const c=a},470:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,":root{--ck-input-width:18em;--ck-input-text-width:var(--ck-input-width)}.ck.ck-input{border-radius:0}.ck-rounded-corners .ck.ck-input,.ck.ck-input.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-input{background:var(--ck-color-input-background);border:1px solid var(--ck-color-input-border);min-height:var(--ck-ui-component-min-height);min-width:var(--ck-input-width);padding:var(--ck-spacing-extra-tiny) var(--ck-spacing-medium);transition:box-shadow .1s ease-in-out,border .1s ease-in-out}.ck.ck-input:focus{border:var(--ck-focus-ring);box-shadow:var(--ck-focus-outer-shadow),0 0;outline:none}.ck.ck-input[readonly]{background:var(--ck-color-input-disabled-background);border:1px solid var(--ck-color-input-disabled-border);color:var(--ck-color-input-disabled-text)}.ck.ck-input[readonly]:focus{box-shadow:var(--ck-focus-disabled-outer-shadow),0 0}.ck.ck-input.ck-error{animation:ck-input-shake .3s ease both;border-color:var(--ck-color-input-error-border)}.ck.ck-input.ck-error:focus{box-shadow:var(--ck-focus-error-outer-shadow),0 0}@keyframes ck-input-shake{20%{transform:translateX(-2px)}40%{transform:translateX(2px)}60%{transform:translateX(-1px)}80%{transform:translateX(1px)}}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/input/input.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AASA,MACC,qBAAsB,CAGtB,2CACD,CAEA,aCLC,eD2CD,CAtCA,iECDE,qCDuCF,CAtCA,aAGC,2CAA4C,CAC5C,6CAA8C,CAK9C,4CAA6C,CAH7C,+BAAgC,CADhC,6DAA8D,CAO9D,4DA0BD,CAxBC,mBEnBA,2BAA2B,CCF3B,2CAA8B,CDC9B,YFuBA,CAEA,uBAEC,oDAAqD,CADrD,sDAAuD,CAEvD,yCAMD,CAJC,6BG/BD,oDHkCC,CAGD,sBAEC,sCAAuC,CADvC,+CAMD,CAHC,4BGzCD,iDH2CC,CAIF,0BACC,IACC,0BACD,CAEA,IACC,yBACD,CAEA,IACC,0BACD,CAEA,IACC,yBACD,CACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_focus.css";\n@import "../../../mixins/_shadow.css";\n\n:root {\n\t--ck-input-width: 18em;\n\n\t/* Backward compatibility. */\n\t--ck-input-text-width: var(--ck-input-width);\n}\n\n.ck.ck-input {\n\t@mixin ck-rounded-corners;\n\n\tbackground: var(--ck-color-input-background);\n\tborder: 1px solid var(--ck-color-input-border);\n\tpadding: var(--ck-spacing-extra-tiny) var(--ck-spacing-medium);\n\tmin-width: var(--ck-input-width);\n\n\t/* This is important to stay of the same height as surrounding buttons */\n\tmin-height: var(--ck-ui-component-min-height);\n\n\t/* Apply some smooth transition to the box-shadow and border. */\n\ttransition: box-shadow .1s ease-in-out, border .1s ease-in-out;\n\n\t&:focus {\n\t\t@mixin ck-focus-ring;\n\t\t@mixin ck-box-shadow var(--ck-focus-outer-shadow);\n\t}\n\n\t&[readonly] {\n\t\tborder: 1px solid var(--ck-color-input-disabled-border);\n\t\tbackground: var(--ck-color-input-disabled-background);\n\t\tcolor: var(--ck-color-input-disabled-text);\n\n\t\t&:focus {\n\t\t\t/* The read-only input should have a slightly less visible shadow when focused. */\n\t\t\t@mixin ck-box-shadow var(--ck-focus-disabled-outer-shadow);\n\t\t}\n\t}\n\n\t&.ck-error {\n\t\tborder-color: var(--ck-color-input-error-border);\n\t\tanimation: ck-input-shake .3s ease both;\n\n\t\t&:focus {\n\t\t\t@mixin ck-box-shadow var(--ck-focus-error-outer-shadow);\n\t\t}\n\t}\n}\n\n@keyframes ck-input-shake {\n\t20% {\n\t\ttransform: translateX(-2px);\n\t}\n\n\t40% {\n\t\ttransform: translateX(2px);\n\t}\n\n\t60% {\n\t\ttransform: translateX(-1px);\n\t}\n\n\t80% {\n\t\ttransform: translateX(1px);\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A visual style of focused element's border.\n */\n@define-mixin ck-focus-ring {\n\t/* Disable native outline. */\n\toutline: none;\n\tborder: var(--ck-focus-ring)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},525:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-label{display:block}.ck.ck-voice-label{display:none}.ck.ck-label{font-weight:700}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/label/label.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/label/label.css"],names:[],mappings:"AAKA,aACC,aACD,CAEA,mBACC,YACD,CCNA,aACC,eACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-label {\n\tdisplay: block;\n}\n\n.ck.ck-voice-label {\n\tdisplay: none;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-label {\n\tfont-weight: bold;\n}\n"],sourceRoot:""}]);const c=a},933:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper{display:flex;position:relative}.ck.ck-labeled-field-view .ck.ck-label{display:block;position:absolute}:root{--ck-labeled-field-view-transition:.1s cubic-bezier(0,0,0.24,0.95);--ck-labeled-field-empty-unfocused-max-width:100% - 2 * var(--ck-spacing-medium);--ck-labeled-field-label-default-position-x:var(--ck-spacing-medium);--ck-labeled-field-label-default-position-y:calc(var(--ck-font-size-base)*0.6);--ck-color-labeled-field-label-background:var(--ck-color-base-background)}.ck.ck-labeled-field-view{border-radius:0}.ck-rounded-corners .ck.ck-labeled-field-view,.ck.ck-labeled-field-view.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper{width:100%}.ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{top:0}[dir=ltr] .ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{left:0}[dir=rtl] .ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{right:0}.ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{background:var(--ck-color-labeled-field-label-background);font-weight:400;line-height:normal;max-width:100%;overflow:hidden;padding:0 calc(var(--ck-font-size-tiny)*.5);pointer-events:none;text-overflow:ellipsis;transform:translate(var(--ck-spacing-medium),-6px) scale(.75);transform-origin:0 0;transition:transform var(--ck-labeled-field-view-transition),padding var(--ck-labeled-field-view-transition),background var(--ck-labeled-field-view-transition)}.ck.ck-labeled-field-view.ck-error .ck-input:not([readonly])+.ck.ck-label,.ck.ck-labeled-field-view.ck-error>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{color:var(--ck-color-base-error)}.ck.ck-labeled-field-view .ck-labeled-field-view__status{font-size:var(--ck-font-size-small);margin-top:var(--ck-spacing-small);white-space:normal}.ck.ck-labeled-field-view .ck-labeled-field-view__status.ck-labeled-field-view__status_error{color:var(--ck-color-base-error)}.ck.ck-labeled-field-view.ck-disabled>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label,.ck.ck-labeled-field-view.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused)>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{color:var(--ck-color-input-disabled-text)}[dir=ltr] .ck.ck-labeled-field-view.ck-disabled.ck-labeled-field-view_empty>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label,[dir=ltr] .ck.ck-labeled-field-view.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder)>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{transform:translate(var(--ck-labeled-field-label-default-position-x),var(--ck-labeled-field-label-default-position-y)) scale(1)}[dir=rtl] .ck.ck-labeled-field-view.ck-disabled.ck-labeled-field-view_empty>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label,[dir=rtl] .ck.ck-labeled-field-view.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder)>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{transform:translate(calc(var(--ck-labeled-field-label-default-position-x)*-1),var(--ck-labeled-field-label-default-position-y)) scale(1)}.ck.ck-labeled-field-view.ck-disabled.ck-labeled-field-view_empty>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label,.ck.ck-labeled-field-view.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder)>.ck.ck-labeled-field-view__input-wrapper>.ck.ck-label{background:transparent;max-width:calc(var(--ck-labeled-field-empty-unfocused-max-width));padding:0}.ck.ck-labeled-field-view>.ck.ck-labeled-field-view__input-wrapper>.ck-dropdown>.ck.ck-button{background:transparent}.ck.ck-labeled-field-view.ck-labeled-field-view_empty>.ck.ck-labeled-field-view__input-wrapper>.ck-dropdown>.ck-button>.ck-button__label{opacity:0}.ck.ck-labeled-field-view.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder)>.ck.ck-labeled-field-view__input-wrapper>.ck-dropdown+.ck-label{max-width:calc(var(--ck-labeled-field-empty-unfocused-max-width) - var(--ck-dropdown-arrow-size) - var(--ck-spacing-standard))}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/labeledfield/labeledfieldview.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/labeledfield/labeledfieldview.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAMC,mEACC,YAAa,CACb,iBACD,CAEA,uCACC,aAAc,CACd,iBACD,CCND,MACC,kEAAsE,CACtE,gFAAiF,CACjF,oEAAqE,CACrE,8EAAiF,CACjF,yEACD,CAEA,0BCLC,eD8GD,CAzGA,2FCDE,qCD0GF,CAtGC,mEACC,UAmCD,CAjCC,gFACC,KA+BD,CAhCA,0FAIE,MA4BF,CAhCA,0FAQE,OAwBF,CAhCA,gFAiBC,yDAA0D,CAG1D,eAAmB,CADnB,kBAAoB,CAOpB,cAAe,CAFf,eAAgB,CANhB,2CAA8C,CAP9C,mBAAoB,CAYpB,sBAAuB,CARvB,6DAA+D,CAH/D,oBAAqB,CAgBrB,+JAID,CAQA,mKACC,gCACD,CAGD,yDACC,mCAAoC,CACpC,kCAAmC,CAInC,kBAKD,CAHC,6FACC,gCACD,CAID,4OAEC,yCACD,CAIA,oUAGE,+HAYF,CAfA,oUAOE,wIAQF,CAfA,gTAaC,sBAAuB,CAFvB,iEAAkE,CAGlE,SACD,CAKA,8FACC,sBACD,CAGA,yIACC,SACD,CAGA,kMACC,8HACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-labeled-field-view {\n\t& > .ck.ck-labeled-field-view__input-wrapper {\n\t\tdisplay: flex;\n\t\tposition: relative;\n\t}\n\n\t& .ck.ck-label {\n\t\tdisplay: block;\n\t\tposition: absolute;\n\t}\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n@import "../../../mixins/_rounded.css";\n\n:root {\n\t--ck-labeled-field-view-transition: .1s cubic-bezier(0, 0, 0.24, 0.95);\n\t--ck-labeled-field-empty-unfocused-max-width: 100% - 2 * var(--ck-spacing-medium);\n\t--ck-labeled-field-label-default-position-x: var(--ck-spacing-medium);\n\t--ck-labeled-field-label-default-position-y: calc(0.6 * var(--ck-font-size-base));\n\t--ck-color-labeled-field-label-background: var(--ck-color-base-background);\n}\n\n.ck.ck-labeled-field-view {\n\t@mixin ck-rounded-corners;\n\n\t& > .ck.ck-labeled-field-view__input-wrapper {\n\t\twidth: 100%;\n\n\t\t& > .ck.ck-label {\n\t\t\ttop: 0px;\n\n\t\t\t@mixin ck-dir ltr {\n\t\t\t\tleft: 0px;\n\t\t\t}\n\n\t\t\t@mixin ck-dir rtl {\n\t\t\t\tright: 0px;\n\t\t\t}\n\n\t\t\tpointer-events: none;\n\t\t\ttransform-origin: 0 0;\n\n\t\t\t/* By default, display the label scaled down above the field. */\n\t\t\ttransform: translate(var(--ck-spacing-medium), -6px) scale(.75);\n\n\t\t\tbackground: var(--ck-color-labeled-field-label-background);\n\t\t\tpadding: 0 calc(.5 * var(--ck-font-size-tiny));\n\t\t\tline-height: initial;\n\t\t\tfont-weight: normal;\n\n\t\t\t/* Prevent overflow when the label is longer than the input */\n\t\t\ttext-overflow: ellipsis;\n\t\t\toverflow: hidden;\n\n\t\t\tmax-width: 100%;\n\n\t\t\ttransition:\n\t\t\t\ttransform var(--ck-labeled-field-view-transition),\n\t\t\t\tpadding var(--ck-labeled-field-view-transition),\n\t\t\t\tbackground var(--ck-labeled-field-view-transition);\n\t\t}\n\t}\n\n\t&.ck-error {\n\t\t& > .ck.ck-labeled-field-view__input-wrapper > .ck.ck-label {\n\t\t\tcolor: var(--ck-color-base-error);\n\t\t}\n\n\t\t& .ck-input:not([readonly]) + .ck.ck-label {\n\t\t\tcolor: var(--ck-color-base-error);\n\t\t}\n\t}\n\n\t& .ck-labeled-field-view__status {\n\t\tfont-size: var(--ck-font-size-small);\n\t\tmargin-top: var(--ck-spacing-small);\n\n\t\t/* Let the info wrap to the next line to avoid stretching the layout horizontally.\n\t\tThe status could be very long. */\n\t\twhite-space: normal;\n\n\t\t&.ck-labeled-field-view__status_error {\n\t\t\tcolor: var(--ck-color-base-error);\n\t\t}\n\t}\n\n\t/* Disabled fields and fields that have no focus should fade out. */\n\t&.ck-disabled > .ck.ck-labeled-field-view__input-wrapper > .ck.ck-label,\n\t&.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused) > .ck.ck-labeled-field-view__input-wrapper > .ck.ck-label {\n\t\tcolor: var(--ck-color-input-disabled-text);\n\t}\n\n\t/* Fields that are disabled or not focused and without a placeholder should have full-sized labels. */\n\t/* stylelint-disable-next-line no-descending-specificity */\n\t&.ck-disabled.ck-labeled-field-view_empty > .ck.ck-labeled-field-view__input-wrapper > .ck.ck-label,\n\t&.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder) > .ck.ck-labeled-field-view__input-wrapper > .ck.ck-label {\n\t\t@mixin ck-dir ltr {\n\t\t\ttransform: translate(var(--ck-labeled-field-label-default-position-x), var(--ck-labeled-field-label-default-position-y)) scale(1);\n\t\t}\n\n\t\t@mixin ck-dir rtl {\n\t\t\ttransform: translate(calc(-1 * var(--ck-labeled-field-label-default-position-x)), var(--ck-labeled-field-label-default-position-y)) scale(1);\n\t\t}\n\n\t\t/* Compensate for the default translate position. */\n\t\tmax-width: calc(var(--ck-labeled-field-empty-unfocused-max-width));\n\n\t\tbackground: transparent;\n\t\tpadding: 0;\n\t}\n\n\t/*------ DropdownView integration ----------------------------------------------------------------------------------- */\n\n\t/* Make sure dropdown\' background color in any of dropdown\'s state does not collide with labeled field. */\n\t& > .ck.ck-labeled-field-view__input-wrapper > .ck-dropdown > .ck.ck-button {\n\t\tbackground: transparent;\n\t}\n\n\t/* When the dropdown is "empty", the labeled field label replaces its label. */\n\t&.ck-labeled-field-view_empty > .ck.ck-labeled-field-view__input-wrapper > .ck-dropdown > .ck-button > .ck-button__label {\n\t\topacity: 0;\n\t}\n\n\t/* Make sure the label of the empty, unfocused input does not cover the dropdown arrow. */\n\t&.ck-labeled-field-view_empty:not(.ck-labeled-field-view_focused):not(.ck-labeled-field-view_placeholder) > .ck.ck-labeled-field-view__input-wrapper > .ck-dropdown + .ck-label {\n\t\tmax-width: calc(var(--ck-labeled-field-empty-unfocused-max-width) - var(--ck-dropdown-arrow-size) - var(--ck-spacing-standard));\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},179:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-list{display:flex;flex-direction:column;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.ck.ck-list .ck-list__item,.ck.ck-list .ck-list__separator{display:block}.ck.ck-list .ck-list__item>:focus{position:relative;z-index:var(--ck-z-default)}.ck.ck-list{border-radius:0}.ck-rounded-corners .ck.ck-list,.ck.ck-list.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-list{background:var(--ck-color-list-background);list-style-type:none}.ck.ck-list__item{cursor:default;min-width:12em}.ck.ck-list__item .ck-button{border-radius:0;min-height:unset;padding:calc(var(--ck-line-height-base)*.2*var(--ck-font-size-base)) calc(var(--ck-line-height-base)*.4*var(--ck-font-size-base));text-align:left;width:100%}.ck.ck-list__item .ck-button .ck-button__label{line-height:calc(var(--ck-line-height-base)*1.2*var(--ck-font-size-base))}.ck.ck-list__item .ck-button:active{box-shadow:none}.ck.ck-list__item .ck-button.ck-on{background:var(--ck-color-list-button-on-background);color:var(--ck-color-list-button-on-text)}.ck.ck-list__item .ck-button.ck-on:active{box-shadow:none}.ck.ck-list__item .ck-button.ck-on:hover:not(.ck-disabled){background:var(--ck-color-list-button-on-background-focus)}.ck.ck-list__item .ck-button.ck-on:focus:not(.ck-switchbutton):not(.ck-disabled){border-color:var(--ck-color-base-background)}.ck.ck-list__item .ck-button:hover:not(.ck-disabled){background:var(--ck-color-list-button-hover-background)}.ck.ck-list__item .ck-switchbutton.ck-on{background:var(--ck-color-list-background);color:inherit}.ck.ck-list__item .ck-switchbutton.ck-on:hover:not(.ck-disabled){background:var(--ck-color-list-button-hover-background);color:inherit}.ck.ck-list__separator{background:var(--ck-color-base-border);height:1px;width:100%}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/list/list.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/mixins/_unselectable.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAOA,YAGC,YAAa,CACb,qBAAsB,CCFtB,qBAAsB,CACtB,wBAAyB,CACzB,oBAAqB,CACrB,gBDaD,CAZC,2DAEC,aACD,CAKA,kCACC,iBAAkB,CAClB,2BACD,CEfD,YCEC,eDGD,CALA,+DCME,qCDDF,CALA,YAIC,0CAA2C,CAD3C,oBAED,CAEA,kBACC,cAAe,CACf,cA2DD,CAzDC,6BAIC,eAAgB,CAHhB,gBAAiB,CAQjB,iIAEiE,CARjE,eAAgB,CADhB,UAwCD,CA7BC,+CAEC,yEACD,CAEA,oCACC,eACD,CAEA,mCACC,oDAAqD,CACrD,yCAaD,CAXC,0CACC,eACD,CAEA,2DACC,0DACD,CAEA,iFACC,4CACD,CAGD,qDACC,uDACD,CAMA,yCACC,0CAA2C,CAC3C,aAMD,CAJC,iEACC,uDAAwD,CACxD,aACD,CAKH,uBAGC,sCAAuC,CAFvC,UAAW,CACX,UAED",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../mixins/_unselectable.css";\n\n.ck.ck-list {\n\t@mixin ck-unselectable;\n\n\tdisplay: flex;\n\tflex-direction: column;\n\n\t& .ck-list__item,\n\t& .ck-list__separator {\n\t\tdisplay: block;\n\t}\n\n\t/* Make sure that whatever child of the list item gets focus, it remains on the\n\ttop. Thanks to that, styles like box-shadow, outline, etc. are not masked by\n\tadjacent list items. */\n\t& .ck-list__item > *:focus {\n\t\tposition: relative;\n\t\tz-index: var(--ck-z-default);\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Makes element unselectable.\n */\n@define-mixin ck-unselectable {\n\t-moz-user-select: none;\n\t-webkit-user-select: none;\n\t-ms-user-select: none;\n\tuser-select: none\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_disabled.css";\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_shadow.css";\n\n.ck.ck-list {\n\t@mixin ck-rounded-corners;\n\n\tlist-style-type: none;\n\tbackground: var(--ck-color-list-background);\n}\n\n.ck.ck-list__item {\n\tcursor: default;\n\tmin-width: 12em;\n\n\t& .ck-button {\n\t\tmin-height: unset;\n\t\twidth: 100%;\n\t\ttext-align: left;\n\t\tborder-radius: 0;\n\n\t\t/* List items should have the same height. Use absolute units to make sure it is so\n\t\t   because e.g. different heading styles may have different height\n\t\t   https://github.com/ckeditor/ckeditor5-heading/issues/63 */\n\t\tpadding:\n\t\t\tcalc(.2 * var(--ck-line-height-base) * var(--ck-font-size-base))\n\t\t\tcalc(.4 * var(--ck-line-height-base) * var(--ck-font-size-base));\n\n\t\t& .ck-button__label {\n\t\t\t/* https://github.com/ckeditor/ckeditor5-heading/issues/63 */\n\t\t\tline-height: calc(1.2 * var(--ck-line-height-base) * var(--ck-font-size-base));\n\t\t}\n\n\t\t&:active {\n\t\t\tbox-shadow: none;\n\t\t}\n\n\t\t&.ck-on {\n\t\t\tbackground: var(--ck-color-list-button-on-background);\n\t\t\tcolor: var(--ck-color-list-button-on-text);\n\n\t\t\t&:active {\n\t\t\t\tbox-shadow: none;\n\t\t\t}\n\n\t\t\t&:hover:not(.ck-disabled) {\n\t\t\t\tbackground: var(--ck-color-list-button-on-background-focus);\n\t\t\t}\n\n\t\t\t&:focus:not(.ck-switchbutton):not(.ck-disabled) {\n\t\t\t\tborder-color: var(--ck-color-base-background);\n\t\t\t}\n\t\t}\n\n\t\t&:hover:not(.ck-disabled) {\n\t\t\tbackground: var(--ck-color-list-button-hover-background);\n\t\t}\n\t}\n\n\t/* It\'s unnecessary to change the background/text of a switch toggle; it has different ways\n\tof conveying its state (like the switcher) */\n\t& .ck-switchbutton {\n\t\t&.ck-on {\n\t\t\tbackground: var(--ck-color-list-background);\n\t\t\tcolor: inherit;\n\n\t\t\t&:hover:not(.ck-disabled) {\n\t\t\t\tbackground: var(--ck-color-list-button-hover-background);\n\t\t\t\tcolor: inherit;\n\t\t\t}\n\t\t}\n\t}\n}\n\n.ck.ck-list__separator {\n\theight: 1px;\n\twidth: 100%;\n\tbackground: var(--ck-color-base-border);\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},460:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,':root{--ck-balloon-panel-arrow-z-index:calc(var(--ck-z-default) - 3)}.ck.ck-balloon-panel{display:none;position:absolute;z-index:var(--ck-z-modal)}.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:after,.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:before{content:"";position:absolute}.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:before{z-index:var(--ck-balloon-panel-arrow-z-index)}.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:after{z-index:calc(var(--ck-balloon-panel-arrow-z-index) + 1)}.ck.ck-balloon-panel[class*=arrow_n]:before{z-index:var(--ck-balloon-panel-arrow-z-index)}.ck.ck-balloon-panel[class*=arrow_n]:after{z-index:calc(var(--ck-balloon-panel-arrow-z-index) + 1)}.ck.ck-balloon-panel[class*=arrow_s]:before{z-index:var(--ck-balloon-panel-arrow-z-index)}.ck.ck-balloon-panel[class*=arrow_s]:after{z-index:calc(var(--ck-balloon-panel-arrow-z-index) + 1)}.ck.ck-balloon-panel.ck-balloon-panel_visible{display:block}:root{--ck-balloon-border-width:1px;--ck-balloon-arrow-offset:2px;--ck-balloon-arrow-height:10px;--ck-balloon-arrow-half-width:8px;--ck-balloon-arrow-drop-shadow:0 2px 2px var(--ck-color-shadow-drop)}.ck.ck-balloon-panel{border-radius:0}.ck-rounded-corners .ck.ck-balloon-panel,.ck.ck-balloon-panel.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-balloon-panel{background:var(--ck-color-panel-background);border:var(--ck-balloon-border-width) solid var(--ck-color-panel-border);box-shadow:var(--ck-drop-shadow),0 0;min-height:15px}.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:after,.ck.ck-balloon-panel.ck-balloon-panel_with-arrow:before{border-style:solid;height:0;width:0}.ck.ck-balloon-panel[class*=arrow_n]:after,.ck.ck-balloon-panel[class*=arrow_n]:before{border-width:0 var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width)}.ck.ck-balloon-panel[class*=arrow_n]:before{border-color:transparent transparent var(--ck-color-panel-border) transparent;margin-top:calc(var(--ck-balloon-border-width)*-1)}.ck.ck-balloon-panel[class*=arrow_n]:after{border-color:transparent transparent var(--ck-color-panel-background) transparent;margin-top:calc(var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width))}.ck.ck-balloon-panel[class*=arrow_s]:after,.ck.ck-balloon-panel[class*=arrow_s]:before{border-width:var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width) 0 var(--ck-balloon-arrow-half-width)}.ck.ck-balloon-panel[class*=arrow_s]:before{border-color:var(--ck-color-panel-border) transparent transparent;filter:drop-shadow(var(--ck-balloon-arrow-drop-shadow));margin-bottom:calc(var(--ck-balloon-border-width)*-1)}.ck.ck-balloon-panel[class*=arrow_s]:after{border-color:var(--ck-color-panel-background) transparent transparent transparent;margin-bottom:calc(var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width))}.ck.ck-balloon-panel[class*=arrow_e]:after,.ck.ck-balloon-panel[class*=arrow_e]:before{border-width:var(--ck-balloon-arrow-half-width) 0 var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height)}.ck.ck-balloon-panel[class*=arrow_e]:before{border-color:transparent transparent transparent var(--ck-color-panel-border);margin-right:calc(var(--ck-balloon-border-width)*-1)}.ck.ck-balloon-panel[class*=arrow_e]:after{border-color:transparent transparent transparent var(--ck-color-panel-background);margin-right:calc(var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width))}.ck.ck-balloon-panel[class*=arrow_w]:after,.ck.ck-balloon-panel[class*=arrow_w]:before{border-width:var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width) 0}.ck.ck-balloon-panel[class*=arrow_w]:before{border-color:transparent var(--ck-color-panel-border) transparent transparent;margin-left:calc(var(--ck-balloon-border-width)*-1)}.ck.ck-balloon-panel[class*=arrow_w]:after{border-color:transparent var(--ck-color-panel-background) transparent transparent;margin-left:calc(var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width))}.ck.ck-balloon-panel.ck-balloon-panel_arrow_n:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_n:before{left:50%;margin-left:calc(var(--ck-balloon-arrow-half-width)*-1);top:calc(var(--ck-balloon-arrow-height)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_nw:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_nw:before{left:calc(var(--ck-balloon-arrow-half-width)*2);top:calc(var(--ck-balloon-arrow-height)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_ne:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_ne:before{right:calc(var(--ck-balloon-arrow-half-width)*2);top:calc(var(--ck-balloon-arrow-height)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_s:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_s:before{bottom:calc(var(--ck-balloon-arrow-height)*-1);left:50%;margin-left:calc(var(--ck-balloon-arrow-half-width)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_sw:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_sw:before{bottom:calc(var(--ck-balloon-arrow-height)*-1);left:calc(var(--ck-balloon-arrow-half-width)*2)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_se:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_se:before{bottom:calc(var(--ck-balloon-arrow-height)*-1);right:calc(var(--ck-balloon-arrow-half-width)*2)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_sme:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_sme:before{bottom:calc(var(--ck-balloon-arrow-height)*-1);margin-right:calc(var(--ck-balloon-arrow-half-width)*2);right:25%}.ck.ck-balloon-panel.ck-balloon-panel_arrow_smw:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_smw:before{bottom:calc(var(--ck-balloon-arrow-height)*-1);left:25%;margin-left:calc(var(--ck-balloon-arrow-half-width)*2)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_nme:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_nme:before{margin-right:calc(var(--ck-balloon-arrow-half-width)*2);right:25%;top:calc(var(--ck-balloon-arrow-height)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_nmw:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_nmw:before{left:25%;margin-left:calc(var(--ck-balloon-arrow-half-width)*2);top:calc(var(--ck-balloon-arrow-height)*-1)}.ck.ck-balloon-panel.ck-balloon-panel_arrow_e:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_e:before{margin-top:calc(var(--ck-balloon-arrow-half-width)*-1);right:calc(var(--ck-balloon-arrow-height)*-1);top:50%}.ck.ck-balloon-panel.ck-balloon-panel_arrow_w:after,.ck.ck-balloon-panel.ck-balloon-panel_arrow_w:before{left:calc(var(--ck-balloon-arrow-height)*-1);margin-top:calc(var(--ck-balloon-arrow-half-width)*-1);top:50%}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/panel/balloonpanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/panel/balloonpanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AAKA,MAEC,8DACD,CAEA,qBACC,YAAa,CACb,iBAAkB,CAElB,yBAyCD,CAtCE,+GAEC,UAAW,CACX,iBACD,CAEA,wDACC,6CACD,CAEA,uDACC,uDACD,CAIA,4CACC,6CACD,CAEA,2CACC,uDACD,CAIA,4CACC,6CACD,CAEA,2CACC,uDACD,CAGD,8CACC,aACD,CC9CD,MACC,6BAA8B,CAC9B,6BAA8B,CAC9B,8BAA+B,CAC/B,iCAAkC,CAClC,oEACD,CAEA,qBCLC,eDmMD,CA9LA,iFCDE,qCD+LF,CA9LA,qBAMC,2CAA4C,CAC5C,wEAAyE,CEdzE,oCAA8B,CFW9B,eA0LD,CApLE,+GAIC,kBAAmB,CADnB,QAAS,CADT,OAGD,CAIA,uFAEC,mHACD,CAEA,4CACC,6EAA8E,CAC9E,kDACD,CAEA,2CACC,iFAAkF,CAClF,gFACD,CAIA,uFAEC,mHACD,CAEA,4CACC,iEAAkE,CAClE,uDAAwD,CACxD,qDACD,CAEA,2CACC,iFAAkF,CAClF,mFACD,CAIA,uFAEC,mHACD,CAEA,4CACC,6EAA8E,CAC9E,oDACD,CAEA,2CACC,iFAAkF,CAClF,kFACD,CAIA,uFAEC,mHACD,CAEA,4CACC,6EAA8E,CAC9E,mDACD,CAEA,2CACC,iFAAkF,CAClF,iFACD,CAIA,yGAEC,QAAS,CACT,uDAA0D,CAC1D,2CACD,CAIA,2GAEC,+CAAkD,CAClD,2CACD,CAIA,2GAEC,gDAAmD,CACnD,2CACD,CAIA,yGAIC,8CAAiD,CAFjD,QAAS,CACT,uDAED,CAIA,2GAGC,8CAAiD,CADjD,+CAED,CAIA,2GAGC,8CAAiD,CADjD,gDAED,CAIA,6GAIC,8CAAiD,CADjD,uDAA0D,CAD1D,SAGD,CAIA,6GAIC,8CAAiD,CAFjD,QAAS,CACT,sDAED,CAIA,6GAGC,uDAA0D,CAD1D,SAAU,CAEV,2CACD,CAIA,6GAEC,QAAS,CACT,sDAAyD,CACzD,2CACD,CAIA,yGAGC,sDAAyD,CADzD,6CAAgD,CAEhD,OACD,CAIA,yGAEC,4CAA+C,CAC/C,sDAAyD,CACzD,OACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t/* Make sure the balloon arrow does not float over its children. */\n\t--ck-balloon-panel-arrow-z-index: calc(var(--ck-z-default) - 3);\n}\n\n.ck.ck-balloon-panel {\n\tdisplay: none;\n\tposition: absolute;\n\n\tz-index: var(--ck-z-modal);\n\n\t&.ck-balloon-panel_with-arrow {\n\t\t&::before,\n\t\t&::after {\n\t\t\tcontent: "";\n\t\t\tposition: absolute;\n\t\t}\n\n\t\t&::before {\n\t\t\tz-index: var(--ck-balloon-panel-arrow-z-index);\n\t\t}\n\n\t\t&::after {\n\t\t\tz-index: calc(var(--ck-balloon-panel-arrow-z-index) + 1);\n\t\t}\n\t}\n\n\t&[class*="arrow_n"] {\n\t\t&::before {\n\t\t\tz-index: var(--ck-balloon-panel-arrow-z-index);\n\t\t}\n\n\t\t&::after {\n\t\t\tz-index: calc(var(--ck-balloon-panel-arrow-z-index) + 1);\n\t\t}\n\t}\n\n\t&[class*="arrow_s"] {\n\t\t&::before {\n\t\t\tz-index: var(--ck-balloon-panel-arrow-z-index);\n\t\t}\n\n\t\t&::after {\n\t\t\tz-index: calc(var(--ck-balloon-panel-arrow-z-index) + 1);\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_visible {\n\t\tdisplay: block;\n\t}\n}\n','/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "../../../mixins/_shadow.css";\n\n:root {\n\t--ck-balloon-border-width: 1px;\n\t--ck-balloon-arrow-offset: 2px;\n\t--ck-balloon-arrow-height: 10px;\n\t--ck-balloon-arrow-half-width: 8px;\n\t--ck-balloon-arrow-drop-shadow: 0 2px 2px var(--ck-color-shadow-drop);\n}\n\n.ck.ck-balloon-panel {\n\t@mixin ck-rounded-corners;\n\t@mixin ck-drop-shadow;\n\n\tmin-height: 15px;\n\n\tbackground: var(--ck-color-panel-background);\n\tborder: var(--ck-balloon-border-width) solid var(--ck-color-panel-border);\n\n\t&.ck-balloon-panel_with-arrow {\n\t\t&::before,\n\t\t&::after {\n\t\t\twidth: 0;\n\t\t\theight: 0;\n\t\t\tborder-style: solid;\n\t\t}\n\t}\n\n\t&[class*="arrow_n"] {\n\t\t&::before,\n\t\t&::after {\n\t\t\tborder-width: 0 var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width);\n\t\t}\n\n\t\t&::before {\n\t\t\tborder-color: transparent transparent var(--ck-color-panel-border) transparent;\n\t\t\tmargin-top: calc( -1 * var(--ck-balloon-border-width) );\n\t\t}\n\n\t\t&::after {\n\t\t\tborder-color: transparent transparent var(--ck-color-panel-background) transparent;\n\t\t\tmargin-top: calc( var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width) );\n\t\t}\n\t}\n\n\t&[class*="arrow_s"] {\n\t\t&::before,\n\t\t&::after {\n\t\t\tborder-width: var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width) 0 var(--ck-balloon-arrow-half-width);\n\t\t}\n\n\t\t&::before {\n\t\t\tborder-color: var(--ck-color-panel-border) transparent transparent;\n\t\t\tfilter: drop-shadow(var(--ck-balloon-arrow-drop-shadow));\n\t\t\tmargin-bottom: calc( -1 * var(--ck-balloon-border-width) );\n\t\t}\n\n\t\t&::after {\n\t\t\tborder-color: var(--ck-color-panel-background) transparent transparent transparent;\n\t\t\tmargin-bottom: calc( var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width) );\n\t\t}\n\t}\n\n\t&[class*="arrow_e"] {\n\t\t&::before,\n\t\t&::after {\n\t\t\tborder-width: var(--ck-balloon-arrow-half-width) 0 var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height);\n\t\t}\n\n\t\t&::before {\n\t\t\tborder-color: transparent transparent transparent var(--ck-color-panel-border);\n\t\t\tmargin-right: calc( -1 * var(--ck-balloon-border-width) );\n\t\t}\n\n\t\t&::after {\n\t\t\tborder-color: transparent transparent transparent var(--ck-color-panel-background);\n\t\t\tmargin-right: calc( var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width) );\n\t\t}\n\t}\n\n\t&[class*="arrow_w"] {\n\t\t&::before,\n\t\t&::after {\n\t\t\tborder-width: var(--ck-balloon-arrow-half-width) var(--ck-balloon-arrow-height) var(--ck-balloon-arrow-half-width) 0;\n\t\t}\n\n\t\t&::before {\n\t\t\tborder-color: transparent var(--ck-color-panel-border) transparent transparent;\n\t\t\tmargin-left: calc( -1 * var(--ck-balloon-border-width) );\n\t\t}\n\n\t\t&::after {\n\t\t\tborder-color: transparent var(--ck-color-panel-background) transparent transparent;\n\t\t\tmargin-left: calc( var(--ck-balloon-arrow-offset) - var(--ck-balloon-border-width) );\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_n {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: 50%;\n\t\t\tmargin-left: calc(-1 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_nw {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_ne {\n\t\t&::before,\n\t\t&::after {\n\t\t\tright: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_s {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: 50%;\n\t\t\tmargin-left: calc(-1 * var(--ck-balloon-arrow-half-width));\n\t\t\tbottom: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_sw {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\tbottom: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_se {\n\t\t&::before,\n\t\t&::after {\n\t\t\tright: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\tbottom: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_sme {\n\t\t&::before,\n\t\t&::after {\n\t\t\tright: 25%;\n\t\t\tmargin-right: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\tbottom: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_smw {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: 25%;\n\t\t\tmargin-left: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\tbottom: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_nme {\n\t\t&::before,\n\t\t&::after {\n\t\t\tright: 25%;\n\t\t\tmargin-right: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_nmw {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: 25%;\n\t\t\tmargin-left: calc(2 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_e {\n\t\t&::before,\n\t\t&::after {\n\t\t\tright: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t\tmargin-top: calc(-1 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: 50%;\n\t\t}\n\t}\n\n\t&.ck-balloon-panel_arrow_w {\n\t\t&::before,\n\t\t&::after {\n\t\t\tleft: calc(-1 * var(--ck-balloon-arrow-height));\n\t\t\tmargin-top: calc(-1 * var(--ck-balloon-arrow-half-width));\n\t\t\ttop: 50%;\n\t\t}\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},592:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck .ck-balloon-rotator__navigation{align-items:center;display:flex;justify-content:center}.ck .ck-balloon-rotator__content .ck-toolbar{justify-content:center}.ck .ck-balloon-rotator__navigation{background:var(--ck-color-toolbar-background);border-bottom:1px solid var(--ck-color-toolbar-border);padding:0 var(--ck-spacing-small)}.ck .ck-balloon-rotator__navigation>*{margin-bottom:var(--ck-spacing-small);margin-right:var(--ck-spacing-small);margin-top:var(--ck-spacing-small)}.ck .ck-balloon-rotator__navigation .ck-balloon-rotator__counter{margin-left:var(--ck-spacing-small);margin-right:var(--ck-spacing-standard)}.ck .ck-balloon-rotator__content .ck.ck-annotation-wrapper{box-shadow:none}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/panel/balloonrotator.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/panel/balloonrotator.css"],names:[],mappings:"AAKA,oCAEC,kBAAmB,CADnB,YAAa,CAEb,sBACD,CAKA,6CACC,sBACD,CCXA,oCACC,6CAA8C,CAC9C,sDAAuD,CACvD,iCAgBD,CAbC,sCAGC,qCAAsC,CAFtC,oCAAqC,CACrC,kCAED,CAGA,iEAIC,mCAAoC,CAHpC,uCAID,CAMA,2DACC,eACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck .ck-balloon-rotator__navigation {\n\tdisplay: flex;\n\talign-items: center;\n\tjustify-content: center;\n}\n\n/* Buttons inside a toolbar should be centered when rotator bar is wider.\n * See: https://github.com/ckeditor/ckeditor5-ui/issues/495\n */\n.ck .ck-balloon-rotator__content .ck-toolbar {\n\tjustify-content: center;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck .ck-balloon-rotator__navigation {\n\tbackground: var(--ck-color-toolbar-background);\n\tborder-bottom: 1px solid var(--ck-color-toolbar-border);\n\tpadding: 0 var(--ck-spacing-small);\n\n\t/* Let's keep similar appearance to `ck-toolbar`. */\n\t& > * {\n\t\tmargin-right: var(--ck-spacing-small);\n\t\tmargin-top: var(--ck-spacing-small);\n\t\tmargin-bottom: var(--ck-spacing-small);\n\t}\n\n\t/* Gives counter more breath than buttons. */\n\t& .ck-balloon-rotator__counter {\n\t\tmargin-right: var(--ck-spacing-standard);\n\n\t\t/* We need to use smaller margin because of previous button's right margin. */\n\t\tmargin-left: var(--ck-spacing-small);\n\t}\n}\n\n.ck .ck-balloon-rotator__content {\n\n\t/* Disable default annotation shadow inside rotator with fake panels. */\n\t& .ck.ck-annotation-wrapper {\n\t\tbox-shadow: none;\n\t}\n}\n"],sourceRoot:""}]);const c=a},356:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck .ck-fake-panel{position:absolute;z-index:calc(var(--ck-z-modal) - 1)}.ck .ck-fake-panel div{position:absolute}.ck .ck-fake-panel div:first-child{z-index:2}.ck .ck-fake-panel div:nth-child(2){z-index:1}:root{--ck-balloon-fake-panel-offset-horizontal:6px;--ck-balloon-fake-panel-offset-vertical:6px}.ck .ck-fake-panel div{background:var(--ck-color-panel-background);border:1px solid var(--ck-color-panel-border);border-radius:var(--ck-border-radius);box-shadow:var(--ck-drop-shadow),0 0;height:100%;min-height:15px;width:100%}.ck .ck-fake-panel div:first-child{margin-left:var(--ck-balloon-fake-panel-offset-horizontal);margin-top:var(--ck-balloon-fake-panel-offset-vertical)}.ck .ck-fake-panel div:nth-child(2){margin-left:calc(var(--ck-balloon-fake-panel-offset-horizontal)*2);margin-top:calc(var(--ck-balloon-fake-panel-offset-vertical)*2)}.ck .ck-fake-panel div:nth-child(3){margin-left:calc(var(--ck-balloon-fake-panel-offset-horizontal)*3);margin-top:calc(var(--ck-balloon-fake-panel-offset-vertical)*3)}.ck .ck-balloon-panel_arrow_s+.ck-fake-panel,.ck .ck-balloon-panel_arrow_se+.ck-fake-panel,.ck .ck-balloon-panel_arrow_sw+.ck-fake-panel{--ck-balloon-fake-panel-offset-vertical:-6px}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/panel/fakepanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/panel/fakepanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AAKA,mBACC,iBAAkB,CAGlB,mCACD,CAEA,uBACC,iBACD,CAEA,mCACC,SACD,CAEA,oCACC,SACD,CCfA,MACC,6CAA8C,CAC9C,2CACD,CAGA,uBAKC,2CAA4C,CAC5C,6CAA8C,CAC9C,qCAAsC,CCXtC,oCAA8B,CDc9B,WAAY,CAPZ,eAAgB,CAMhB,UAED,CAEA,mCACC,0DAA2D,CAC3D,uDACD,CAEA,oCACC,kEAAqE,CACrE,+DACD,CACA,oCACC,kEAAqE,CACrE,+DACD,CAGA,yIAGC,4CACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck .ck-fake-panel {\n\tposition: absolute;\n\n\t/* Fake panels should be placed under main balloon content. */\n\tz-index: calc(var(--ck-z-modal) - 1);\n}\n\n.ck .ck-fake-panel div {\n\tposition: absolute;\n}\n\n.ck .ck-fake-panel div:nth-child( 1 ) {\n\tz-index: 2;\n}\n\n.ck .ck-fake-panel div:nth-child( 2 ) {\n\tz-index: 1;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_shadow.css";\n\n:root {\n\t--ck-balloon-fake-panel-offset-horizontal: 6px;\n\t--ck-balloon-fake-panel-offset-vertical: 6px;\n}\n\n/* Let\'s use `.ck-balloon-panel` appearance. See: balloonpanel.css. */\n.ck .ck-fake-panel div {\n\t@mixin ck-drop-shadow;\n\n\tmin-height: 15px;\n\n\tbackground: var(--ck-color-panel-background);\n\tborder: 1px solid var(--ck-color-panel-border);\n\tborder-radius: var(--ck-border-radius);\n\n\twidth: 100%;\n\theight: 100%;\n}\n\n.ck .ck-fake-panel div:nth-child( 1 ) {\n\tmargin-left: var(--ck-balloon-fake-panel-offset-horizontal);\n\tmargin-top: var(--ck-balloon-fake-panel-offset-vertical);\n}\n\n.ck .ck-fake-panel div:nth-child( 2 ) {\n\tmargin-left: calc(var(--ck-balloon-fake-panel-offset-horizontal) * 2);\n\tmargin-top: calc(var(--ck-balloon-fake-panel-offset-vertical) * 2);\n}\n.ck .ck-fake-panel div:nth-child( 3 ) {\n\tmargin-left: calc(var(--ck-balloon-fake-panel-offset-horizontal) * 3);\n\tmargin-top: calc(var(--ck-balloon-fake-panel-offset-vertical) * 3);\n}\n\n/* If balloon is positioned above element, we need to move fake panel to the top. */\n.ck .ck-balloon-panel_arrow_s + .ck-fake-panel,\n.ck .ck-balloon-panel_arrow_se + .ck-fake-panel,\n.ck .ck-balloon-panel_arrow_sw + .ck-fake-panel {\n\t--ck-balloon-fake-panel-offset-vertical: -6px;\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},707:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-sticky-panel .ck-sticky-panel__content_sticky{position:fixed;top:0;z-index:var(--ck-z-modal)}.ck.ck-sticky-panel .ck-sticky-panel__content_sticky_bottom-limit{position:absolute;top:auto}.ck.ck-sticky-panel .ck-sticky-panel__content_sticky{border-top-left-radius:0;border-top-right-radius:0;border-width:0 1px 1px;box-shadow:var(--ck-drop-shadow),0 0}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/panel/stickypanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/panel/stickypanel.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AAMC,qDAEC,cAAe,CACf,KAAM,CAFN,yBAGD,CAEA,kEAEC,iBAAkB,CADlB,QAED,CCPA,qDAIC,wBAAyB,CACzB,yBAA0B,CAF1B,sBAAuB,CCFxB,oCDKA",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-sticky-panel {\n\t& .ck-sticky-panel__content_sticky {\n\t\tz-index: var(--ck-z-modal); /* #315 */\n\t\tposition: fixed;\n\t\ttop: 0;\n\t}\n\n\t& .ck-sticky-panel__content_sticky_bottom-limit {\n\t\ttop: auto;\n\t\tposition: absolute;\n\t}\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_shadow.css";\n\n.ck.ck-sticky-panel {\n\t& .ck-sticky-panel__content_sticky {\n\t\t@mixin ck-drop-shadow;\n\n\t\tborder-width: 0 1px 1px;\n\t\tborder-top-left-radius: 0;\n\t\tborder-top-right-radius: 0;\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},176:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-block-toolbar-button{position:absolute;z-index:var(--ck-z-default)}:root{--ck-color-block-toolbar-button:var(--ck-color-text);--ck-block-toolbar-button-size:var(--ck-font-size-normal)}.ck.ck-block-toolbar-button{color:var(--ck-color-block-toolbar-button);font-size:var(--ck-block-toolbar-size)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/toolbar/blocktoolbar.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/toolbar/blocktoolbar.css"],names:[],mappings:"AAKA,4BACC,iBAAkB,CAClB,2BACD,CCHA,MACC,oDAAqD,CACrD,yDACD,CAEA,4BACC,0CAA2C,CAC3C,sCACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-block-toolbar-button {\n\tposition: absolute;\n\tz-index: var(--ck-z-default);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-color-block-toolbar-button: var(--ck-color-text);\n\t--ck-block-toolbar-button-size: var(--ck-font-size-normal);\n}\n\n.ck.ck-block-toolbar-button {\n\tcolor: var(--ck-color-block-toolbar-button);\n\tfont-size: var(--ck-block-toolbar-size);\n}\n"],sourceRoot:""}]);const c=a},768:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-toolbar{align-items:center;display:flex;flex-flow:row nowrap;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.ck.ck-toolbar>.ck-toolbar__items{align-items:center;display:flex;flex-flow:row wrap;flex-grow:1}.ck.ck-toolbar .ck.ck-toolbar__separator{display:inline-block}.ck.ck-toolbar .ck.ck-toolbar__separator:first-child,.ck.ck-toolbar .ck.ck-toolbar__separator:last-child{display:none}.ck.ck-toolbar .ck-toolbar__line-break{flex-basis:100%}.ck.ck-toolbar.ck-toolbar_grouping>.ck-toolbar__items{flex-wrap:nowrap}.ck.ck-toolbar.ck-toolbar_vertical>.ck-toolbar__items{flex-direction:column}.ck.ck-toolbar.ck-toolbar_floating>.ck-toolbar__items{flex-wrap:nowrap}.ck.ck-toolbar>.ck.ck-toolbar__grouped-dropdown>.ck-dropdown__button .ck-dropdown__arrow{display:none}.ck.ck-toolbar{border-radius:0}.ck-rounded-corners .ck.ck-toolbar,.ck.ck-toolbar.ck-rounded-corners{border-radius:var(--ck-border-radius)}.ck.ck-toolbar{background:var(--ck-color-toolbar-background);border:1px solid var(--ck-color-toolbar-border);padding:0 var(--ck-spacing-small)}.ck.ck-toolbar .ck.ck-toolbar__separator{align-self:stretch;background:var(--ck-color-toolbar-border);margin-bottom:var(--ck-spacing-small);margin-top:var(--ck-spacing-small);min-width:1px;width:1px}.ck.ck-toolbar .ck-toolbar__line-break{height:0}.ck.ck-toolbar>.ck-toolbar__items>:not(.ck-toolbar__line-break){margin-right:var(--ck-spacing-small)}.ck.ck-toolbar>.ck-toolbar__items:empty+.ck.ck-toolbar__separator{display:none}.ck.ck-toolbar>.ck-toolbar__items>:not(.ck-toolbar__line-break),.ck.ck-toolbar>.ck.ck-toolbar__grouped-dropdown{margin-bottom:var(--ck-spacing-small);margin-top:var(--ck-spacing-small)}.ck.ck-toolbar.ck-toolbar_vertical{padding:0}.ck.ck-toolbar.ck-toolbar_vertical>.ck-toolbar__items>.ck{border-radius:0;margin:0;width:100%}.ck.ck-toolbar.ck-toolbar_compact{padding:0}.ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>*{margin:0}.ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>:not(:first-child):not(:last-child){border-radius:0}.ck.ck-toolbar>.ck.ck-toolbar__grouped-dropdown>.ck.ck-button.ck-dropdown__button{padding-left:var(--ck-spacing-tiny)}.ck.ck-toolbar .ck-toolbar__nested-toolbar-dropdown>.ck-dropdown__panel{min-width:auto}.ck.ck-toolbar .ck-toolbar__nested-toolbar-dropdown>.ck-button>.ck-button__label{max-width:7em;width:auto}.ck.ck-toolbar:focus{outline:none}.ck-toolbar-container .ck.ck-toolbar{border:0}.ck.ck-toolbar[dir=rtl]>.ck-toolbar__items>.ck,[dir=rtl] .ck.ck-toolbar>.ck-toolbar__items>.ck{margin-right:0}.ck.ck-toolbar[dir=rtl]:not(.ck-toolbar_compact)>.ck-toolbar__items>.ck,[dir=rtl] .ck.ck-toolbar:not(.ck-toolbar_compact)>.ck-toolbar__items>.ck{margin-left:var(--ck-spacing-small)}.ck.ck-toolbar[dir=rtl]>.ck-toolbar__items>.ck:last-child,[dir=rtl] .ck.ck-toolbar>.ck-toolbar__items>.ck:last-child{margin-left:0}.ck.ck-toolbar.ck-toolbar_compact[dir=rtl]>.ck-toolbar__items>.ck:first-child,[dir=rtl] .ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>.ck:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.ck.ck-toolbar.ck-toolbar_compact[dir=rtl]>.ck-toolbar__items>.ck:last-child,[dir=rtl] .ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>.ck:last-child{border-bottom-right-radius:0;border-top-right-radius:0}.ck.ck-toolbar.ck-toolbar_grouping[dir=rtl]>.ck-toolbar__items:not(:empty):not(:only-child),.ck.ck-toolbar[dir=rtl]>.ck.ck-toolbar__separator,[dir=rtl] .ck.ck-toolbar.ck-toolbar_grouping>.ck-toolbar__items:not(:empty):not(:only-child),[dir=rtl] .ck.ck-toolbar>.ck.ck-toolbar__separator{margin-left:var(--ck-spacing-small)}.ck.ck-toolbar[dir=ltr]>.ck-toolbar__items>.ck:last-child,[dir=ltr] .ck.ck-toolbar>.ck-toolbar__items>.ck:last-child{margin-right:0}.ck.ck-toolbar.ck-toolbar_compact[dir=ltr]>.ck-toolbar__items>.ck:first-child,[dir=ltr] .ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>.ck:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.ck.ck-toolbar.ck-toolbar_compact[dir=ltr]>.ck-toolbar__items>.ck:last-child,[dir=ltr] .ck.ck-toolbar.ck-toolbar_compact>.ck-toolbar__items>.ck:last-child{border-bottom-left-radius:0;border-top-left-radius:0}.ck.ck-toolbar.ck-toolbar_grouping[dir=ltr]>.ck-toolbar__items:not(:empty):not(:only-child),.ck.ck-toolbar[dir=ltr]>.ck.ck-toolbar__separator,[dir=ltr] .ck.ck-toolbar.ck-toolbar_grouping>.ck-toolbar__items:not(:empty):not(:only-child),[dir=ltr] .ck.ck-toolbar>.ck.ck-toolbar__separator{margin-right:var(--ck-spacing-small)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/toolbar/toolbar.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/mixins/_unselectable.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/toolbar/toolbar.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css"],names:[],mappings:"AAOA,eAKC,kBAAmB,CAFnB,YAAa,CACb,oBAAqB,CCFrB,qBAAsB,CACtB,wBAAyB,CACzB,oBAAqB,CACrB,gBD6CD,CA3CC,kCAGC,kBAAmB,CAFnB,YAAa,CACb,kBAAmB,CAEnB,WAED,CAEA,yCACC,oBAWD,CAJC,yGAEC,YACD,CAGD,uCACC,eACD,CAEA,sDACC,gBACD,CAEA,sDACC,qBACD,CAEA,sDACC,gBACD,CAGC,yFACC,YACD,CE/CF,eCGC,eDwGD,CA3GA,qECOE,qCDoGF,CA3GA,eAGC,6CAA8C,CAE9C,+CAAgD,CADhD,iCAuGD,CApGC,yCACC,kBAAmB,CAGnB,yCAA0C,CAO1C,qCAAsC,CADtC,kCAAmC,CAPnC,aAAc,CADd,SAUD,CAEA,uCACC,QACD,CAGC,gEAEC,oCACD,CAIA,kEACC,YACD,CAGD,gHAIC,qCAAsC,CADtC,kCAED,CAEA,mCAEC,SAaD,CAVC,0DAQC,eAAgB,CAHhB,QAAS,CAHT,UAOD,CAGD,kCAEC,SAWD,CATC,uDAEC,QAMD,CAHC,yFACC,eACD,CASD,kFACC,mCACD,CAMA,wEACC,cACD,CAEA,iFACC,aAAc,CACd,UACD,CAGD,qBACC,YACD,CAtGD,qCAyGE,QAEF,CAYC,+FACC,cACD,CAEA,iJAEC,mCACD,CAEA,qHACC,aACD,CAIC,6JAEC,2BAA4B,CAD5B,wBAED,CAGA,2JAEC,4BAA6B,CAD7B,yBAED,CASD,8RACC,mCACD,CAWA,qHACC,cACD,CAIC,6JAEC,4BAA6B,CAD7B,yBAED,CAGA,2JAEC,2BAA4B,CAD5B,wBAED,CASD,8RACC,oCACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../mixins/_unselectable.css";\n\n.ck.ck-toolbar {\n\t@mixin ck-unselectable;\n\n\tdisplay: flex;\n\tflex-flow: row nowrap;\n\talign-items: center;\n\n\t& > .ck-toolbar__items {\n\t\tdisplay: flex;\n\t\tflex-flow: row wrap;\n\t\talign-items: center;\n\t\tflex-grow: 1;\n\n\t}\n\n\t& .ck.ck-toolbar__separator {\n\t\tdisplay: inline-block;\n\n\t\t/*\n\t\t * A leading or trailing separator makes no sense (separates from nothing on one side).\n\t\t * For instance, it can happen when toolbar items (also separators) are getting grouped one by one and\n\t\t * moved to another toolbar in the dropdown.\n\t\t */\n\t\t&:first-child,\n\t\t&:last-child {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n\n\t& .ck-toolbar__line-break {\n\t\tflex-basis: 100%;\n\t}\n\n\t&.ck-toolbar_grouping > .ck-toolbar__items {\n\t\tflex-wrap: nowrap;\n\t}\n\n\t&.ck-toolbar_vertical > .ck-toolbar__items {\n\t\tflex-direction: column;\n\t}\n\n\t&.ck-toolbar_floating > .ck-toolbar__items {\n\t\tflex-wrap: nowrap;\n\t}\n\n\t& > .ck.ck-toolbar__grouped-dropdown {\n\t\t& > .ck-dropdown__button .ck-dropdown__arrow {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Makes element unselectable.\n */\n@define-mixin ck-unselectable {\n\t-moz-user-select: none;\n\t-webkit-user-select: none;\n\t-ms-user-select: none;\n\tuser-select: none\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n@import "@ckeditor/ckeditor5-ui/theme/mixins/_dir.css";\n\n.ck.ck-toolbar {\n\t@mixin ck-rounded-corners;\n\n\tbackground: var(--ck-color-toolbar-background);\n\tpadding: 0 var(--ck-spacing-small);\n\tborder: 1px solid var(--ck-color-toolbar-border);\n\n\t& .ck.ck-toolbar__separator {\n\t\talign-self: stretch;\n\t\twidth: 1px;\n\t\tmin-width: 1px;\n\t\tbackground: var(--ck-color-toolbar-border);\n\n\t\t/*\n\t\t * These margins make the separators look better in balloon toolbars (when aligned with the "tip").\n\t\t * See https://github.com/ckeditor/ckeditor5/issues/7493.\n\t\t */\n\t\tmargin-top: var(--ck-spacing-small);\n\t\tmargin-bottom: var(--ck-spacing-small);\n\t}\n\n\t& .ck-toolbar__line-break {\n\t\theight: 0;\n\t}\n\n\t& > .ck-toolbar__items {\n\t\t& > *:not(.ck-toolbar__line-break) {\n\t\t\t/* (#11) Separate toolbar items. */\n\t\t\tmargin-right: var(--ck-spacing-small);\n\t\t}\n\n\t\t/* Don\'t display a separator after an empty items container, for instance,\n\t\twhen all items were grouped */\n\t\t&:empty + .ck.ck-toolbar__separator {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n\n\t& > .ck-toolbar__items > *:not(.ck-toolbar__line-break),\n\t& > .ck.ck-toolbar__grouped-dropdown {\n\t\t/* Make sure items wrapped to the next line have v-spacing */\n\t\tmargin-top: var(--ck-spacing-small);\n\t\tmargin-bottom: var(--ck-spacing-small);\n\t}\n\n\t&.ck-toolbar_vertical {\n\t\t/* Items in a vertical toolbar span the entire width. */\n\t\tpadding: 0;\n\n\t\t/* Specificity matters here. See https://github.com/ckeditor/ckeditor5-theme-lark/issues/168. */\n\t\t& > .ck-toolbar__items > .ck {\n\t\t\t/* Items in a vertical toolbar should span the horizontal space. */\n\t\t\twidth: 100%;\n\n\t\t\t/* Items in a vertical toolbar should have no margin. */\n\t\t\tmargin: 0;\n\n\t\t\t/* Items in a vertical toolbar span the entire width so rounded corners are pointless. */\n\t\t\tborder-radius: 0;\n\t\t}\n\t}\n\n\t&.ck-toolbar_compact {\n\t\t/* No spacing around items. */\n\t\tpadding: 0;\n\n\t\t& > .ck-toolbar__items > * {\n\t\t\t/* Compact toolbar items have no spacing between them. */\n\t\t\tmargin: 0;\n\n\t\t\t/* "Middle" children should have no rounded corners. */\n\t\t\t&:not(:first-child):not(:last-child) {\n\t\t\t\tborder-radius: 0;\n\t\t\t}\n\t\t}\n\t}\n\n\t& > .ck.ck-toolbar__grouped-dropdown {\n\t\t/*\n\t\t * Dropdown button has asymmetric padding to fit the arrow.\n\t\t * This button has no arrow so let\'s revert that padding back to normal.\n\t\t */\n\t\t& > .ck.ck-button.ck-dropdown__button {\n\t\t\tpadding-left: var(--ck-spacing-tiny);\n\t\t}\n\t}\n\n\t/* A drop-down containing the nested toolbar with configured items. */\n\t& .ck-toolbar__nested-toolbar-dropdown {\n\t\t/* Prevent empty space in the panel when the dropdown label is visible and long but the toolbar has few items. */\n\t\t& > .ck-dropdown__panel {\n\t\t\tmin-width: auto;\n\t\t}\n\n\t\t& > .ck-button > .ck-button__label {\n\t\t\tmax-width: 7em;\n\t\t\twidth: auto;\n\t\t}\n\t}\n\n\t&:focus {\n\t\toutline: none;\n\t}\n\n\t@nest .ck-toolbar-container & {\n\t\tborder: 0;\n\t}\n}\n\n/* stylelint-disable */\n\n/*\n * Styles for RTL toolbars.\n *\n * Note: In some cases (e.g. a decoupled editor), the toolbar has its own "dir"\n * because its parent is not controlled by the editor framework.\n */\n[dir="rtl"] .ck.ck-toolbar,\n.ck.ck-toolbar[dir="rtl"] {\n\t& > .ck-toolbar__items > .ck {\n\t\tmargin-right: 0;\n\t}\n\n\t&:not(.ck-toolbar_compact) > .ck-toolbar__items > .ck {\n\t\t/* (#11) Separate toolbar items. */\n\t\tmargin-left: var(--ck-spacing-small);\n\t}\n\n\t& > .ck-toolbar__items > .ck:last-child {\n\t\tmargin-left: 0;\n\t}\n\n\t&.ck-toolbar_compact > .ck-toolbar__items > .ck {\n\t\t/* No rounded corners on the right side of the first child. */\n\t\t&:first-child {\n\t\t\tborder-top-left-radius: 0;\n\t\t\tborder-bottom-left-radius: 0;\n\t\t}\n\n\t\t/* No rounded corners on the left side of the last child. */\n\t\t&:last-child {\n\t\t\tborder-top-right-radius: 0;\n\t\t\tborder-bottom-right-radius: 0;\n\t\t}\n\t}\n\n\t/* Separate the the separator form the grouping dropdown when some items are grouped. */\n\t& > .ck.ck-toolbar__separator {\n\t\tmargin-left: var(--ck-spacing-small);\n\t}\n\n\t/* Some spacing between the items and the separator before the grouped items dropdown. */\n\t&.ck-toolbar_grouping > .ck-toolbar__items:not(:empty):not(:only-child) {\n\t\tmargin-left: var(--ck-spacing-small);\n\t}\n}\n\n/*\n * Styles for LTR toolbars.\n *\n * Note: In some cases (e.g. a decoupled editor), the toolbar has its own "dir"\n * because its parent is not controlled by the editor framework.\n */\n[dir="ltr"] .ck.ck-toolbar,\n.ck.ck-toolbar[dir="ltr"] {\n\t& > .ck-toolbar__items > .ck:last-child {\n\t\tmargin-right: 0;\n\t}\n\n\t&.ck-toolbar_compact > .ck-toolbar__items > .ck {\n\t\t/* No rounded corners on the right side of the first child. */\n\t\t&:first-child {\n\t\t\tborder-top-right-radius: 0;\n\t\t\tborder-bottom-right-radius: 0;\n\t\t}\n\n\t\t/* No rounded corners on the left side of the last child. */\n\t\t&:last-child {\n\t\t\tborder-top-left-radius: 0;\n\t\t\tborder-bottom-left-radius: 0;\n\t\t}\n\t}\n\n\t/* Separate the the separator form the grouping dropdown when some items are grouped. */\n\t& > .ck.ck-toolbar__separator {\n\t\tmargin-right: var(--ck-spacing-small);\n\t}\n\n\t/* Some spacing between the items and the separator before the grouped items dropdown. */\n\t&.ck-toolbar_grouping > .ck-toolbar__items:not(:empty):not(:only-child) {\n\t\tmargin-right: var(--ck-spacing-small);\n\t}\n}\n\n/* stylelint-enable */\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Implements rounded corner interface for .ck-rounded-corners class.\n *\n * @see $ck-border-radius\n */\n@define-mixin ck-rounded-corners {\n\tborder-radius: 0;\n\n\t@nest .ck-rounded-corners &,\n\t&.ck-rounded-corners {\n\t\tborder-radius: var(--ck-border-radius);\n\t\t@mixin-content;\n\t}\n}\n"],sourceRoot:""}]);const c=a},888:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck.ck-balloon-panel.ck-tooltip{--ck-balloon-border-width:0px;--ck-balloon-arrow-offset:0px;--ck-balloon-arrow-half-width:4px;--ck-balloon-arrow-height:4px;--ck-color-panel-background:var(--ck-color-tooltip-background);padding:0 var(--ck-spacing-medium);pointer-events:none;z-index:calc(var(--ck-z-modal) + 100)}.ck.ck-balloon-panel.ck-tooltip .ck-tooltip__text{color:var(--ck-color-tooltip-text);font-size:.9em;line-height:1.5}.ck.ck-balloon-panel.ck-tooltip{box-shadow:none}.ck.ck-balloon-panel.ck-tooltip:before{display:none}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/components/tooltip/tooltip.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/components/tooltip/tooltip.css"],names:[],mappings:"AAKA,gCCGC,6BAA8B,CAC9B,6BAA8B,CAC9B,iCAAkC,CAClC,6BAA8B,CAC9B,8DAA+D,CAE/D,kCAAmC,CDPnC,mBAAoB,CAEpB,qCACD,CCMC,kDAGC,kCAAmC,CAFnC,cAAe,CACf,eAED,CAbD,gCAgBC,eAMD,CAHC,uCACC,YACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-balloon-panel.ck-tooltip {\n\t/* Keep tooltips transparent for any interactions. */\n\tpointer-events: none;\n\n\tz-index: calc( var(--ck-z-modal) + 100 );\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../../../mixins/_rounded.css";\n\n.ck.ck-balloon-panel.ck-tooltip {\n\t--ck-balloon-border-width: 0px;\n\t--ck-balloon-arrow-offset: 0px;\n\t--ck-balloon-arrow-half-width: 4px;\n\t--ck-balloon-arrow-height: 4px;\n\t--ck-color-panel-background: var(--ck-color-tooltip-background);\n\n\tpadding: 0 var(--ck-spacing-medium);\n\n\t& .ck-tooltip__text {\n\t\tfont-size: .9em;\n\t\tline-height: 1.5;\n\t\tcolor: var(--ck-color-tooltip-text);\n\t}\n\n\t/* Reset balloon panel styles */\n\tbox-shadow: none;\n\n\t/* Hide the default shadow of the .ck-balloon-panel tip */\n\t&::before {\n\t\tdisplay: none;\n\t}\n}\n'],sourceRoot:""}]);const c=a},167:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck-hidden{display:none!important}.ck-reset_all :not(.ck-reset_all-excluded *),.ck.ck-reset,.ck.ck-reset_all{box-sizing:border-box;height:auto;position:static;width:auto}:root{--ck-z-default:1;--ck-z-modal:calc(var(--ck-z-default) + 999)}.ck-transitions-disabled,.ck-transitions-disabled *{transition:none!important}:root{--ck-powered-by-line-height:10px;--ck-powered-by-padding-vertical:2px;--ck-powered-by-padding-horizontal:4px;--ck-powered-by-text-color:#4f4f4f;--ck-powered-by-border-radius:var(--ck-border-radius);--ck-powered-by-background:#fff;--ck-powered-by-border-color:var(--ck-color-focus-border)}.ck.ck-balloon-panel.ck-powered-by-balloon{--ck-border-radius:var(--ck-powered-by-border-radius);background:var(--ck-powered-by-background);box-shadow:none;min-height:unset;z-index:calc(var(--ck-z-modal) - 1)}.ck.ck-balloon-panel.ck-powered-by-balloon .ck.ck-powered-by{line-height:var(--ck-powered-by-line-height)}.ck.ck-balloon-panel.ck-powered-by-balloon .ck.ck-powered-by a{align-items:center;cursor:pointer;display:flex;filter:grayscale(80%);line-height:var(--ck-powered-by-line-height);opacity:.66;padding:var(--ck-powered-by-padding-vertical) var(--ck-powered-by-padding-horizontal)}.ck.ck-balloon-panel.ck-powered-by-balloon .ck.ck-powered-by .ck-powered-by__label{color:var(--ck-powered-by-text-color);cursor:pointer;font-size:7.5px;font-weight:700;letter-spacing:-.2px;line-height:normal;margin-right:4px;padding-left:2px;text-transform:uppercase}.ck.ck-balloon-panel.ck-powered-by-balloon .ck.ck-powered-by .ck-icon{cursor:pointer;display:block}.ck.ck-balloon-panel.ck-powered-by-balloon .ck.ck-powered-by:hover a{filter:grayscale(0);opacity:1}.ck.ck-balloon-panel.ck-powered-by-balloon[class*=position_inside]{border-color:transparent}.ck.ck-balloon-panel.ck-powered-by-balloon[class*=position_border]{border:var(--ck-focus-ring);border-color:var(--ck-powered-by-border-color)}:root{--ck-color-base-foreground:#fafafa;--ck-color-base-background:#fff;--ck-color-base-border:#ccced1;--ck-color-base-action:#53a336;--ck-color-base-focus:#6cb5f9;--ck-color-base-text:#333;--ck-color-base-active:#2977ff;--ck-color-base-active-focus:#0d65ff;--ck-color-base-error:#db3700;--ck-color-focus-border-coordinates:218,81.8%,56.9%;--ck-color-focus-border:hsl(var(--ck-color-focus-border-coordinates));--ck-color-focus-outer-shadow:#cae1fc;--ck-color-focus-disabled-shadow:rgba(119,186,248,.3);--ck-color-focus-error-shadow:rgba(255,64,31,.3);--ck-color-text:var(--ck-color-base-text);--ck-color-shadow-drop:rgba(0,0,0,.15);--ck-color-shadow-drop-active:rgba(0,0,0,.2);--ck-color-shadow-inner:rgba(0,0,0,.1);--ck-color-button-default-background:transparent;--ck-color-button-default-hover-background:#f0f0f0;--ck-color-button-default-active-background:#f0f0f0;--ck-color-button-default-disabled-background:transparent;--ck-color-button-on-background:#f0f7ff;--ck-color-button-on-hover-background:#dbecff;--ck-color-button-on-active-background:#dbecff;--ck-color-button-on-disabled-background:#f0f2f4;--ck-color-button-on-color:#2977ff;--ck-color-button-action-background:var(--ck-color-base-action);--ck-color-button-action-hover-background:#4d9d30;--ck-color-button-action-active-background:#4d9d30;--ck-color-button-action-disabled-background:#7ec365;--ck-color-button-action-text:var(--ck-color-base-background);--ck-color-button-save:#008a00;--ck-color-button-cancel:#db3700;--ck-color-switch-button-off-background:#939393;--ck-color-switch-button-off-hover-background:#7d7d7d;--ck-color-switch-button-on-background:var(--ck-color-button-action-background);--ck-color-switch-button-on-hover-background:#4d9d30;--ck-color-switch-button-inner-background:var(--ck-color-base-background);--ck-color-switch-button-inner-shadow:rgba(0,0,0,.1);--ck-color-dropdown-panel-background:var(--ck-color-base-background);--ck-color-dropdown-panel-border:var(--ck-color-base-border);--ck-color-input-background:var(--ck-color-base-background);--ck-color-input-border:var(--ck-color-base-border);--ck-color-input-error-border:var(--ck-color-base-error);--ck-color-input-text:var(--ck-color-base-text);--ck-color-input-disabled-background:#f2f2f2;--ck-color-input-disabled-border:var(--ck-color-base-border);--ck-color-input-disabled-text:#757575;--ck-color-list-background:var(--ck-color-base-background);--ck-color-list-button-hover-background:var(--ck-color-button-default-hover-background);--ck-color-list-button-on-background:var(--ck-color-button-on-color);--ck-color-list-button-on-background-focus:var(--ck-color-button-on-color);--ck-color-list-button-on-text:var(--ck-color-base-background);--ck-color-panel-background:var(--ck-color-base-background);--ck-color-panel-border:var(--ck-color-base-border);--ck-color-toolbar-background:var(--ck-color-base-background);--ck-color-toolbar-border:var(--ck-color-base-border);--ck-color-tooltip-background:var(--ck-color-base-text);--ck-color-tooltip-text:var(--ck-color-base-background);--ck-color-engine-placeholder-text:#707070;--ck-color-upload-bar-background:#6cb5f9;--ck-color-link-default:#0000f0;--ck-color-link-selected-background:rgba(31,176,255,.1);--ck-color-link-fake-selection:rgba(31,176,255,.3);--ck-color-highlight-background:#ff0;--ck-disabled-opacity:.5;--ck-focus-outer-shadow-geometry:0 0 0 3px;--ck-focus-outer-shadow:var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-outer-shadow);--ck-focus-disabled-outer-shadow:var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-disabled-shadow);--ck-focus-error-outer-shadow:var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-error-shadow);--ck-focus-ring:1px solid var(--ck-color-focus-border);--ck-font-size-base:13px;--ck-line-height-base:1.84615;--ck-font-face:Helvetica,Arial,Tahoma,Verdana,Sans-Serif;--ck-font-size-tiny:0.7em;--ck-font-size-small:0.75em;--ck-font-size-normal:1em;--ck-font-size-big:1.4em;--ck-font-size-large:1.8em;--ck-ui-component-min-height:2.3em}.ck-reset_all :not(.ck-reset_all-excluded *),.ck.ck-reset,.ck.ck-reset_all{word-wrap:break-word;background:transparent;border:0;margin:0;padding:0;text-decoration:none;transition:none;vertical-align:middle}.ck-reset_all :not(.ck-reset_all-excluded *),.ck.ck-reset_all{border-collapse:collapse;color:var(--ck-color-text);cursor:auto;float:none;font:normal normal normal var(--ck-font-size-base)/var(--ck-line-height-base) var(--ck-font-face);text-align:left;white-space:nowrap}.ck-reset_all .ck-rtl :not(.ck-reset_all-excluded *){text-align:right}.ck-reset_all iframe:not(.ck-reset_all-excluded *){vertical-align:inherit}.ck-reset_all textarea:not(.ck-reset_all-excluded *){white-space:pre-wrap}.ck-reset_all input[type=password]:not(.ck-reset_all-excluded *),.ck-reset_all input[type=text]:not(.ck-reset_all-excluded *),.ck-reset_all textarea:not(.ck-reset_all-excluded *){cursor:text}.ck-reset_all input[type=password][disabled]:not(.ck-reset_all-excluded *),.ck-reset_all input[type=text][disabled]:not(.ck-reset_all-excluded *),.ck-reset_all textarea[disabled]:not(.ck-reset_all-excluded *){cursor:default}.ck-reset_all fieldset:not(.ck-reset_all-excluded *){border:2px groove #dfdee3;padding:10px}.ck-reset_all button:not(.ck-reset_all-excluded *)::-moz-focus-inner{border:0;padding:0}.ck[dir=rtl],.ck[dir=rtl] .ck{text-align:right}:root{--ck-border-radius:2px;--ck-inner-shadow:2px 2px 3px var(--ck-color-shadow-inner) inset;--ck-drop-shadow:0 1px 2px 1px var(--ck-color-shadow-drop);--ck-drop-shadow-active:0 3px 6px 1px var(--ck-color-shadow-drop-active);--ck-spacing-unit:0.6em;--ck-spacing-large:calc(var(--ck-spacing-unit)*1.5);--ck-spacing-standard:var(--ck-spacing-unit);--ck-spacing-medium:calc(var(--ck-spacing-unit)*0.8);--ck-spacing-small:calc(var(--ck-spacing-unit)*0.5);--ck-spacing-tiny:calc(var(--ck-spacing-unit)*0.3);--ck-spacing-extra-tiny:calc(var(--ck-spacing-unit)*0.16)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/globals/_hidden.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/globals/_reset.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/globals/_zindex.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/globals/_transition.css","webpack://./node_modules/@ckeditor/ckeditor5-ui/theme/globals/_poweredby.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_colors.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_disabled.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_fonts.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_reset.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_rounded.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_shadow.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_spacing.css"],names:[],mappings:"AAQA,WAGC,sBACD,CCPA,2EAGC,qBAAsB,CAEtB,WAAY,CACZ,eAAgB,CAFhB,UAGD,CCPA,MACC,gBAAiB,CACjB,4CACD,CCAA,oDAEC,yBACD,CCNA,MACC,gCAAiC,CACjC,oCAAqC,CACrC,sCAAuC,CACvC,kCAA2C,CAC3C,qDAAsD,CACtD,+BAA4C,CAC5C,yDACD,CAEA,2CACC,qDAAsD,CAGtD,0CAA2C,CAD3C,eAAgB,CAEhB,gBAAiB,CACjB,mCAiDD,CA/CC,6DACC,4CAoCD,CAlCC,+DAGC,kBAAmB,CAFnB,cAAe,CACf,YAAa,CAGb,qBAAsB,CACtB,4CAA6C,CAF7C,WAAY,CAGZ,qFACD,CAEA,mFASC,qCAAsC,CAFtC,cAAe,CANf,eAAgB,CAIhB,eAAiB,CAHjB,oBAAqB,CAMrB,kBAAmB,CAFnB,gBAAiB,CAHjB,gBAAiB,CACjB,wBAOD,CAEA,sEAEC,cAAe,CADf,aAED,CAGC,qEACC,mBAAqB,CACrB,SACD,CAIF,mEACC,wBACD,CAEA,mEACC,2BAA4B,CAC5B,8CACD,CChED,MACC,kCAAmD,CACnD,+BAAoD,CACpD,8BAAkD,CAClD,8BAAuD,CACvD,6BAAmD,CACnD,yBAA+C,CAC/C,8BAAsD,CACtD,oCAA4D,CAC5D,6BAAkD,CAIlD,mDAA4D,CAC5D,qEAA+E,CAC/E,qCAA4D,CAC5D,qDAA8D,CAC9D,gDAAyD,CACzD,yCAAqD,CACrD,sCAAsD,CACtD,4CAA0D,CAC1D,sCAAsD,CAItD,gDAAuD,CACvD,kDAAiE,CACjE,mDAAkE,CAClE,yDAA8D,CAE9D,uCAA6D,CAC7D,6CAAoE,CACpE,8CAAoE,CACpE,gDAAiE,CACjE,kCAAyD,CAGzD,+DAAsE,CACtE,iDAAsE,CACtE,kDAAsE,CACtE,oDAAoE,CACpE,6DAAsE,CAEtE,8BAAoD,CACpD,gCAAqD,CAErD,+CAA8D,CAC9D,qDAAiE,CACjE,+EAAqF,CACrF,oDAAuE,CACvE,yEAA8E,CAC9E,oDAAgE,CAIhE,oEAA2E,CAC3E,4DAAoE,CAIpE,2DAAoE,CACpE,mDAA6D,CAC7D,wDAAgE,CAChE,+CAA0D,CAC1D,4CAA2D,CAC3D,4DAAoE,CACpE,sCAAsD,CAItD,0DAAmE,CACnE,uFAA6F,CAC7F,oEAA2E,CAC3E,0EAA+E,CAC/E,8DAAsE,CAItE,2DAAoE,CACpE,mDAA6D,CAI7D,6DAAsE,CACtE,qDAA+D,CAI/D,uDAAgE,CAChE,uDAAiE,CAIjE,0CAAyD,CAIzD,wCAA2D,CAI3D,+BAAoD,CACpD,uDAAmE,CACnE,kDAAgE,CAIhE,oCAAwD,CCvGxD,wBAAyB,CCAzB,0CAA2C,CAK3C,gGAAiG,CAKjG,4GAA6G,CAK7G,sGAAuG,CAKvG,sDAAuD,CCvBvD,wBAAyB,CACzB,6BAA8B,CAC9B,wDAA6D,CAE7D,yBAA0B,CAC1B,2BAA4B,CAC5B,yBAA0B,CAC1B,wBAAyB,CACzB,0BAA2B,CCJ3B,kCJuGD,CIjGA,2EAaC,oBAAqB,CANrB,sBAAuB,CADvB,QAAS,CAFT,QAAS,CACT,SAAU,CAGV,oBAAqB,CAErB,eAAgB,CADhB,qBAKD,CAKA,8DAGC,wBAAyB,CAEzB,0BAA2B,CAG3B,WAAY,CACZ,UAAW,CALX,iGAAkG,CAElG,eAAgB,CAChB,kBAGD,CAGC,qDACC,gBACD,CAEA,mDAEC,sBACD,CAEA,qDACC,oBACD,CAEA,mLAGC,WACD,CAEA,iNAGC,cACD,CAEA,qDAEC,yBAAoC,CADpC,YAED,CAEA,qEAGC,QAAQ,CADR,SAED,CAMD,8BAEC,gBACD,CCnFA,MACC,sBAAuB,CCAvB,gEAAiE,CAKjE,0DAA2D,CAK3D,wEAAyE,CCbzE,uBAA8B,CAC9B,mDAA2D,CAC3D,4CAAkD,CAClD,oDAA4D,CAC5D,mDAA2D,CAC3D,kDAA2D,CAC3D,yDFFD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A class which hides an element in DOM.\n */\n.ck-hidden {\n\t/* Override selector specificity. Otherwise, all elements with some display\n\tstyle defined will override this one, which is not a desired result. */\n\tdisplay: none !important;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck.ck-reset,\n.ck.ck-reset_all,\n.ck-reset_all *:not(.ck-reset_all-excluded *) {\n\tbox-sizing: border-box;\n\twidth: auto;\n\theight: auto;\n\tposition: static;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-z-default: 1;\n\t--ck-z-modal: calc( var(--ck-z-default) + 999 );\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A class that disables all transitions of the element and its children.\n */\n.ck-transitions-disabled,\n.ck-transitions-disabled * {\n\ttransition: none !important;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-powered-by-line-height: 10px;\n\t--ck-powered-by-padding-vertical: 2px;\n\t--ck-powered-by-padding-horizontal: 4px;\n\t--ck-powered-by-text-color: hsl(0, 0%, 31%);\n\t--ck-powered-by-border-radius: var(--ck-border-radius);\n\t--ck-powered-by-background: hsl(0, 0%, 100%);\n\t--ck-powered-by-border-color: var(--ck-color-focus-border);\n}\n\n.ck.ck-balloon-panel.ck-powered-by-balloon {\n\t--ck-border-radius: var(--ck-powered-by-border-radius);\n\n\tbox-shadow: none;\n\tbackground: var(--ck-powered-by-background);\n\tmin-height: unset;\n\tz-index: calc( var(--ck-z-modal) - 1 );\n\n\t& .ck.ck-powered-by {\n\t\tline-height: var(--ck-powered-by-line-height);\n\n\t\t& a {\n\t\t\tcursor: pointer;\n\t\t\tdisplay: flex;\n\t\t\talign-items: center;\n\t\t\topacity: .66;\n\t\t\tfilter: grayscale(80%);\n\t\t\tline-height: var(--ck-powered-by-line-height);\n\t\t\tpadding: var(--ck-powered-by-padding-vertical) var(--ck-powered-by-padding-horizontal);\n\t\t}\n\n\t\t& .ck-powered-by__label {\n\t\t\tfont-size: 7.5px;\n\t\t\tletter-spacing: -.2px;\n\t\t\tpadding-left: 2px;\n\t\t\ttext-transform: uppercase;\n\t\t\tfont-weight: bold;\n\t\t\tmargin-right: 4px;\n\t\t\tcursor: pointer;\n\t\t\tline-height: normal;\n\t\t\tcolor: var(--ck-powered-by-text-color);\n\n\t\t}\n\n\t\t& .ck-icon {\n\t\t\tdisplay: block;\n\t\t\tcursor: pointer;\n\t\t}\n\n\t\t&:hover {\n\t\t\t& a {\n\t\t\t\tfilter: grayscale(0%);\n\t\t\t\topacity: 1;\n\t\t\t}\n\t\t}\n\t}\n\n\t&[class*="position_inside"] {\n\t\tborder-color: transparent;\n\t}\n\n\t&[class*="position_border"] {\n\t\tborder: var(--ck-focus-ring);\n\t\tborder-color: var(--ck-powered-by-border-color);\n\t}\n}\n\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-color-base-foreground: \t\t\t\t\t\t\t\thsl(0, 0%, 98%);\n\t--ck-color-base-background: \t\t\t\t\t\t\t\thsl(0, 0%, 100%);\n\t--ck-color-base-border: \t\t\t\t\t\t\t\t\thsl(220, 6%, 81%);\n\t--ck-color-base-action: \t\t\t\t\t\t\t\t\thsl(104, 50.2%, 42.5%);\n\t--ck-color-base-focus: \t\t\t\t\t\t\t\t\t\thsl(209, 92%, 70%);\n\t--ck-color-base-text: \t\t\t\t\t\t\t\t\t\thsl(0, 0%, 20%);\n\t--ck-color-base-active: \t\t\t\t\t\t\t\t\thsl(218.1, 100%, 58%);\n\t--ck-color-base-active-focus:\t\t\t\t\t\t\t\thsl(218.2, 100%, 52.5%);\n\t--ck-color-base-error:\t\t\t\t\t\t\t\t\t\thsl(15, 100%, 43%);\n\n\t/* -- Generic colors ------------------------------------------------------------------------ */\n\n\t--ck-color-focus-border-coordinates: \t\t\t\t\t\t218, 81.8%, 56.9%;\n\t--ck-color-focus-border: \t\t\t\t\t\t\t\t\thsl(var(--ck-color-focus-border-coordinates));\n\t--ck-color-focus-outer-shadow:\t\t\t\t\t\t\t\thsl(212.4, 89.3%, 89%);\n\t--ck-color-focus-disabled-shadow:\t\t\t\t\t\t\thsla(209, 90%, 72%,.3);\n\t--ck-color-focus-error-shadow:\t\t\t\t\t\t\t\thsla(9,100%,56%,.3);\n\t--ck-color-text: \t\t\t\t\t\t\t\t\t\t\tvar(--ck-color-base-text);\n\t--ck-color-shadow-drop: \t\t\t\t\t\t\t\t\thsla(0, 0%, 0%, 0.15);\n\t--ck-color-shadow-drop-active:\t\t\t\t\t\t\t\thsla(0, 0%, 0%, 0.2);\n\t--ck-color-shadow-inner: \t\t\t\t\t\t\t\t\thsla(0, 0%, 0%, 0.1);\n\n\t/* -- Buttons ------------------------------------------------------------------------------- */\n\n\t--ck-color-button-default-background: \t\t\t\t\t\ttransparent;\n\t--ck-color-button-default-hover-background: \t\t\t\thsl(0, 0%, 94.1%);\n\t--ck-color-button-default-active-background: \t\t\t\thsl(0, 0%, 94.1%);\n\t--ck-color-button-default-disabled-background: \t\t\t\ttransparent;\n\n\t--ck-color-button-on-background: \t\t\t\t\t\t\thsl(212, 100%, 97.1%);\n\t--ck-color-button-on-hover-background: \t\t\t\t\t\thsl(211.7, 100%, 92.9%);\n\t--ck-color-button-on-active-background: \t\t\t\t\thsl(211.7, 100%, 92.9%);\n\t--ck-color-button-on-disabled-background: \t\t\t\t\thsl(211, 15%, 95%);\n\t--ck-color-button-on-color:\t\t\t\t\t\t\t\t\thsl(218.1, 100%, 58%);\n\n\n\t--ck-color-button-action-background: \t\t\t\t\t\tvar(--ck-color-base-action);\n\t--ck-color-button-action-hover-background: \t\t\t\t\thsl(104, 53.2%, 40.2%);\n\t--ck-color-button-action-active-background: \t\t\t\thsl(104, 53.2%, 40.2%);\n\t--ck-color-button-action-disabled-background: \t\t\t\thsl(104, 44%, 58%);\n\t--ck-color-button-action-text: \t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\n\t--ck-color-button-save: \t\t\t\t\t\t\t\t\thsl(120, 100%, 27%);\n\t--ck-color-button-cancel: \t\t\t\t\t\t\t\t\thsl(15, 100%, 43%);\n\n\t--ck-color-switch-button-off-background:\t\t\t\t\thsl(0, 0%, 57.6%);\n\t--ck-color-switch-button-off-hover-background:\t\t\t\thsl(0, 0%, 49%);\n\t--ck-color-switch-button-on-background:\t\t\t\t\t\tvar(--ck-color-button-action-background);\n\t--ck-color-switch-button-on-hover-background:\t\t\t\thsl(104, 53.2%, 40.2%);\n\t--ck-color-switch-button-inner-background:\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-switch-button-inner-shadow:\t\t\t\t\t\thsla(0, 0%, 0%, 0.1);\n\n\t/* -- Dropdown ------------------------------------------------------------------------------ */\n\n\t--ck-color-dropdown-panel-background: \t\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-dropdown-panel-border: \t\t\t\t\t\t\tvar(--ck-color-base-border);\n\n\t/* -- Input --------------------------------------------------------------------------------- */\n\n\t--ck-color-input-background: \t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-input-border: \t\t\t\t\t\t\t\t\tvar(--ck-color-base-border);\n\t--ck-color-input-error-border:\t\t\t\t\t\t\t\tvar(--ck-color-base-error);\n\t--ck-color-input-text: \t\t\t\t\t\t\t\t\t\tvar(--ck-color-base-text);\n\t--ck-color-input-disabled-background: \t\t\t\t\t\thsl(0, 0%, 95%);\n\t--ck-color-input-disabled-border: \t\t\t\t\t\t\tvar(--ck-color-base-border);\n\t--ck-color-input-disabled-text: \t\t\t\t\t\t\thsl(0, 0%, 46%);\n\n\t/* -- List ---------------------------------------------------------------------------------- */\n\n\t--ck-color-list-background: \t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-list-button-hover-background: \t\t\t\t\tvar(--ck-color-button-default-hover-background);\n\t--ck-color-list-button-on-background: \t\t\t\t\t\tvar(--ck-color-button-on-color);\n\t--ck-color-list-button-on-background-focus: \t\t\t\tvar(--ck-color-button-on-color);\n\t--ck-color-list-button-on-text:\t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\n\t/* -- Panel --------------------------------------------------------------------------------- */\n\n\t--ck-color-panel-background: \t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-panel-border: \t\t\t\t\t\t\t\t\tvar(--ck-color-base-border);\n\n\t/* -- Toolbar ------------------------------------------------------------------------------- */\n\n\t--ck-color-toolbar-background: \t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\t--ck-color-toolbar-border: \t\t\t\t\t\t\t\t\tvar(--ck-color-base-border);\n\n\t/* -- Tooltip ------------------------------------------------------------------------------- */\n\n\t--ck-color-tooltip-background: \t\t\t\t\t\t\t\tvar(--ck-color-base-text);\n\t--ck-color-tooltip-text: \t\t\t\t\t\t\t\t\tvar(--ck-color-base-background);\n\n\t/* -- Engine -------------------------------------------------------------------------------- */\n\n\t--ck-color-engine-placeholder-text: \t\t\t\t\t\thsl(0, 0%, 44%);\n\n\t/* -- Upload -------------------------------------------------------------------------------- */\n\n\t--ck-color-upload-bar-background:\t\t \t\t\t\t\thsl(209, 92%, 70%);\n\n\t/* -- Link -------------------------------------------------------------------------------- */\n\n\t--ck-color-link-default:\t\t\t\t\t\t\t\t\thsl(240, 100%, 47%);\n\t--ck-color-link-selected-background:\t\t\t\t\t\thsla(201, 100%, 56%, 0.1);\n\t--ck-color-link-fake-selection:\t\t\t\t\t\t\t\thsla(201, 100%, 56%, 0.3);\n\n\t/* -- Search result highlight ---------------------------------------------------------------- */\n\n\t--ck-color-highlight-background:\t\t\t\t\t\t\thsl(60, 100%, 50%)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t/**\n\t * An opacity value of disabled UI item.\n\t */\n\t--ck-disabled-opacity: .5;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t/**\n\t * The geometry of the of focused element's outer shadow.\n\t */\n\t--ck-focus-outer-shadow-geometry: 0 0 0 3px;\n\n\t/**\n\t * A visual style of focused element's outer shadow.\n\t */\n\t--ck-focus-outer-shadow: var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-outer-shadow);\n\n\t/**\n\t * A visual style of focused element's outer shadow (when disabled).\n\t */\n\t--ck-focus-disabled-outer-shadow: var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-disabled-shadow);\n\n\t/**\n\t * A visual style of focused element's outer shadow (when has errors).\n\t */\n\t--ck-focus-error-outer-shadow: var(--ck-focus-outer-shadow-geometry) var(--ck-color-focus-error-shadow);\n\n\t/**\n\t * A visual style of focused element's border or outline.\n\t */\n\t--ck-focus-ring: 1px solid var(--ck-color-focus-border);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-font-size-base: 13px;\n\t--ck-line-height-base: 1.84615;\n\t--ck-font-face: Helvetica, Arial, Tahoma, Verdana, Sans-Serif;\n\n\t--ck-font-size-tiny: 0.7em;\n\t--ck-font-size-small: 0.75em;\n\t--ck-font-size-normal: 1em;\n\t--ck-font-size-big: 1.4em;\n\t--ck-font-size-large: 1.8em;\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t/* This is super-important. This is **manually** adjusted so a button without an icon\n\tis never smaller than a button with icon, additionally making sure that text-less buttons\n\tare perfect squares. The value is also shared by other components which should stay "in-line"\n\twith buttons. */\n\t--ck-ui-component-min-height: 2.3em;\n}\n\n/**\n * Resets an element, ignoring its children.\n */\n.ck.ck-reset,\n.ck.ck-reset_all,\n.ck-reset_all *:not(.ck-reset_all-excluded *) {\n\t/* Do not include inheritable rules here. */\n\tmargin: 0;\n\tpadding: 0;\n\tborder: 0;\n\tbackground: transparent;\n\ttext-decoration: none;\n\tvertical-align: middle;\n\ttransition: none;\n\n\t/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/105 */\n\tword-wrap: break-word;\n}\n\n/**\n * Resets an element AND its children.\n */\n.ck.ck-reset_all,\n.ck-reset_all *:not(.ck-reset_all-excluded *) {\n\t/* These are rule inherited by all children elements. */\n\tborder-collapse: collapse;\n\tfont: normal normal normal var(--ck-font-size-base)/var(--ck-line-height-base) var(--ck-font-face);\n\tcolor: var(--ck-color-text);\n\ttext-align: left;\n\twhite-space: nowrap;\n\tcursor: auto;\n\tfloat: none;\n}\n\n.ck-reset_all {\n\t& .ck-rtl *:not(.ck-reset_all-excluded *) {\n\t\ttext-align: right;\n\t}\n\n\t& iframe:not(.ck-reset_all-excluded *) {\n\t\t/* For IE */\n\t\tvertical-align: inherit;\n\t}\n\n\t& textarea:not(.ck-reset_all-excluded *) {\n\t\twhite-space: pre-wrap;\n\t}\n\n\t& textarea:not(.ck-reset_all-excluded *),\n\t& input[type="text"]:not(.ck-reset_all-excluded *),\n\t& input[type="password"]:not(.ck-reset_all-excluded *) {\n\t\tcursor: text;\n\t}\n\n\t& textarea[disabled]:not(.ck-reset_all-excluded *),\n\t& input[type="text"][disabled]:not(.ck-reset_all-excluded *),\n\t& input[type="password"][disabled]:not(.ck-reset_all-excluded *) {\n\t\tcursor: default;\n\t}\n\n\t& fieldset:not(.ck-reset_all-excluded *) {\n\t\tpadding: 10px;\n\t\tborder: 2px groove hsl(255, 7%, 88%);\n\t}\n\n\t& button:not(.ck-reset_all-excluded *)::-moz-focus-inner {\n\t\t/* See http://stackoverflow.com/questions/5517744/remove-extra-button-spacing-padding-in-firefox */\n\t\tpadding: 0;\n\t\tborder: 0\n\t}\n}\n\n/**\n * Default UI rules for RTL languages.\n */\n.ck[dir="rtl"],\n.ck[dir="rtl"] .ck {\n\ttext-align: right;\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * Default border-radius value.\n */\n:root{\n\t--ck-border-radius: 2px;\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t/**\n\t * A visual style of element's inner shadow (i.e. input).\n\t */\n\t--ck-inner-shadow: 2px 2px 3px var(--ck-color-shadow-inner) inset;\n\n\t/**\n\t * A visual style of element's drop shadow (i.e. panel).\n\t */\n\t--ck-drop-shadow: 0 1px 2px 1px var(--ck-color-shadow-drop);\n\n\t/**\n\t * A visual style of element's active shadow (i.e. comment or suggestion).\n\t */\n\t--ck-drop-shadow-active: 0 3px 6px 1px var(--ck-color-shadow-drop-active);\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-spacing-unit: \t\t\t\t\t\t0.6em;\n\t--ck-spacing-large: \t\t\t\t\tcalc(var(--ck-spacing-unit) * 1.5);\n\t--ck-spacing-standard: \t\t\t\t\tvar(--ck-spacing-unit);\n\t--ck-spacing-medium: \t\t\t\t\tcalc(var(--ck-spacing-unit) * 0.8);\n\t--ck-spacing-small: \t\t\t\t\tcalc(var(--ck-spacing-unit) * 0.5);\n\t--ck-spacing-tiny: \t\t\t\t\t\tcalc(var(--ck-spacing-unit) * 0.3);\n\t--ck-spacing-extra-tiny: \t\t\t\tcalc(var(--ck-spacing-unit) * 0.16);\n}\n"],sourceRoot:""}]);const c=a},153:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,":root{--ck-color-resizer:var(--ck-color-focus-border);--ck-color-resizer-tooltip-background:#262626;--ck-color-resizer-tooltip-text:#f2f2f2;--ck-resizer-border-radius:var(--ck-border-radius);--ck-resizer-tooltip-offset:10px;--ck-resizer-tooltip-height:calc(var(--ck-spacing-small)*2 + 10px)}.ck .ck-widget,.ck .ck-widget.ck-widget_with-selection-handle{position:relative}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle{position:absolute}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle .ck-icon{display:block}.ck .ck-widget.ck-widget_with-selection-handle.ck-widget_selected>.ck-widget__selection-handle,.ck .ck-widget.ck-widget_with-selection-handle:hover>.ck-widget__selection-handle{visibility:visible}.ck .ck-size-view{background:var(--ck-color-resizer-tooltip-background);border:1px solid var(--ck-color-resizer-tooltip-text);border-radius:var(--ck-resizer-border-radius);color:var(--ck-color-resizer-tooltip-text);display:block;font-size:var(--ck-font-size-tiny);height:var(--ck-resizer-tooltip-height);line-height:var(--ck-resizer-tooltip-height);padding:0 var(--ck-spacing-small)}.ck .ck-size-view.ck-orientation-above-center,.ck .ck-size-view.ck-orientation-bottom-left,.ck .ck-size-view.ck-orientation-bottom-right,.ck .ck-size-view.ck-orientation-top-left,.ck .ck-size-view.ck-orientation-top-right{position:absolute}.ck .ck-size-view.ck-orientation-top-left{left:var(--ck-resizer-tooltip-offset);top:var(--ck-resizer-tooltip-offset)}.ck .ck-size-view.ck-orientation-top-right{right:var(--ck-resizer-tooltip-offset);top:var(--ck-resizer-tooltip-offset)}.ck .ck-size-view.ck-orientation-bottom-right{bottom:var(--ck-resizer-tooltip-offset);right:var(--ck-resizer-tooltip-offset)}.ck .ck-size-view.ck-orientation-bottom-left{bottom:var(--ck-resizer-tooltip-offset);left:var(--ck-resizer-tooltip-offset)}.ck .ck-size-view.ck-orientation-above-center{left:50%;top:calc(var(--ck-resizer-tooltip-height)*-1);transform:translate(-50%)}:root{--ck-widget-outline-thickness:3px;--ck-widget-handler-icon-size:16px;--ck-widget-handler-animation-duration:200ms;--ck-widget-handler-animation-curve:ease;--ck-color-widget-blurred-border:#dedede;--ck-color-widget-hover-border:#ffc83d;--ck-color-widget-editable-focus-background:var(--ck-color-base-background);--ck-color-widget-drag-handler-icon-color:var(--ck-color-base-background)}.ck .ck-widget{outline-color:transparent;outline-style:solid;outline-width:var(--ck-widget-outline-thickness);transition:outline-color var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve)}.ck .ck-widget.ck-widget_selected,.ck .ck-widget.ck-widget_selected:hover{outline:var(--ck-widget-outline-thickness) solid var(--ck-color-focus-border)}.ck .ck-widget:hover{outline-color:var(--ck-color-widget-hover-border)}.ck .ck-editor__nested-editable{border:1px solid transparent}.ck .ck-editor__nested-editable.ck-editor__nested-editable_focused,.ck .ck-editor__nested-editable:focus{background-color:var(--ck-color-widget-editable-focus-background);border:var(--ck-focus-ring);box-shadow:var(--ck-inner-shadow),0 0;outline:none}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle{background-color:transparent;border-radius:var(--ck-border-radius) var(--ck-border-radius) 0 0;box-sizing:border-box;left:calc(0px - var(--ck-widget-outline-thickness));opacity:0;padding:4px;top:0;transform:translateY(-100%);transition:background-color var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve),visibility var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve),opacity var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve)}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle .ck-icon{color:var(--ck-color-widget-drag-handler-icon-color);height:var(--ck-widget-handler-icon-size);width:var(--ck-widget-handler-icon-size)}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle .ck-icon .ck-icon__selected-indicator{opacity:0;transition:opacity .3s var(--ck-widget-handler-animation-curve)}.ck .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle:hover .ck-icon .ck-icon__selected-indicator{opacity:1}.ck .ck-widget.ck-widget_with-selection-handle:hover>.ck-widget__selection-handle{background-color:var(--ck-color-widget-hover-border);opacity:1}.ck .ck-widget.ck-widget_with-selection-handle.ck-widget_selected:hover>.ck-widget__selection-handle,.ck .ck-widget.ck-widget_with-selection-handle.ck-widget_selected>.ck-widget__selection-handle{background-color:var(--ck-color-focus-border);opacity:1}.ck .ck-widget.ck-widget_with-selection-handle.ck-widget_selected:hover>.ck-widget__selection-handle .ck-icon .ck-icon__selected-indicator,.ck .ck-widget.ck-widget_with-selection-handle.ck-widget_selected>.ck-widget__selection-handle .ck-icon .ck-icon__selected-indicator{opacity:1}.ck[dir=rtl] .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle{left:auto;right:calc(0px - var(--ck-widget-outline-thickness))}.ck.ck-editor__editable.ck-read-only .ck-widget{transition:none}.ck.ck-editor__editable.ck-read-only .ck-widget:not(.ck-widget_selected){--ck-widget-outline-thickness:0px}.ck.ck-editor__editable.ck-read-only .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle,.ck.ck-editor__editable.ck-read-only .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle:hover{background:var(--ck-color-widget-blurred-border)}.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected,.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected:hover{outline-color:var(--ck-color-widget-blurred-border)}.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected.ck-widget_with-selection-handle:hover>.ck-widget__selection-handle,.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected.ck-widget_with-selection-handle:hover>.ck-widget__selection-handle:hover,.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected.ck-widget_with-selection-handle>.ck-widget__selection-handle,.ck.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected.ck-widget_with-selection-handle>.ck-widget__selection-handle:hover{background:var(--ck-color-widget-blurred-border)}.ck.ck-editor__editable blockquote>.ck-widget.ck-widget_with-selection-handle:first-child,.ck.ck-editor__editable>.ck-widget.ck-widget_with-selection-handle:first-child{margin-top:calc(1em + var(--ck-widget-handler-icon-size))}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-widget/theme/widget.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-widget/widget.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css"],names:[],mappings:"AAKA,MACC,+CAAgD,CAChD,6CAAsD,CACtD,uCAAgD,CAEhD,kDAAmD,CACnD,gCAAiC,CACjC,kEACD,CAOA,8DAEC,iBAqBD,CAnBC,4EACC,iBAOD,CALC,qFAGC,aACD,CASD,iLACC,kBACD,CAGD,kBACC,qDAAsD,CAEtD,qDAAsD,CACtD,6CAA8C,CAF9C,0CAA2C,CAI3C,aAAc,CADd,kCAAmC,CAGnC,uCAAwC,CACxC,4CAA6C,CAF7C,iCAsCD,CAlCC,8NAKC,iBACD,CAEA,0CAEC,qCAAsC,CADtC,oCAED,CAEA,2CAEC,sCAAuC,CADvC,oCAED,CAEA,8CACC,uCAAwC,CACxC,sCACD,CAEA,6CACC,uCAAwC,CACxC,qCACD,CAGA,8CAEC,QAAS,CADT,6CAAgD,CAEhD,yBACD,CCjFD,MACC,iCAAkC,CAClC,kCAAmC,CACnC,4CAA6C,CAC7C,wCAAyC,CAEzC,wCAAiD,CACjD,sCAAkD,CAClD,2EAA4E,CAC5E,yEACD,CAEA,eAGC,yBAA0B,CAD1B,mBAAoB,CADpB,gDAAiD,CAGjD,6GAUD,CARC,0EAEC,6EACD,CAEA,qBACC,iDACD,CAGD,gCACC,4BAWD,CAPC,yGAKC,iEAAkE,CCnCnE,2BAA2B,CCF3B,qCAA8B,CDC9B,YDqCA,CAIA,4EAKC,4BAA6B,CAa7B,iEAAkE,CAhBlE,qBAAsB,CAoBtB,mDAAoD,CAhBpD,SAAU,CALV,WAAY,CAsBZ,KAAM,CAFN,2BAA4B,CAT5B,6SAgCD,CAnBC,qFAIC,oDAAqD,CADrD,yCAA0C,CAD1C,wCAWD,CANC,kHACC,SAAU,CAGV,+DACD,CAID,wHACC,SACD,CAID,kFAEC,oDAAqD,CADrD,SAED,CAKC,oMAEC,6CAA8C,CAD9C,SAOD,CAHC,gRACC,SACD,CAOH,qFACC,SAAU,CACV,oDACD,CAGA,gDAEC,eAkBD,CAhBC,yEAOC,iCACD,CAGC,gOAEC,gDACD,CAOD,wIAEC,mDAQD,CALE,ghBAEC,gDACD,CAKH,yKAOC,yDACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-color-resizer: var(--ck-color-focus-border);\n\t--ck-color-resizer-tooltip-background: hsl(0, 0%, 15%);\n\t--ck-color-resizer-tooltip-text: hsl(0, 0%, 95%);\n\n\t--ck-resizer-border-radius: var(--ck-border-radius);\n\t--ck-resizer-tooltip-offset: 10px;\n\t--ck-resizer-tooltip-height: calc(var(--ck-spacing-small) * 2 + 10px);\n}\n\n.ck .ck-widget {\n\t/* This is neccessary for type around UI to be positioned properly. */\n\tposition: relative;\n}\n\n.ck .ck-widget.ck-widget_with-selection-handle {\n\t/* Make the widget wrapper a relative positioning container for the drag handle. */\n\tposition: relative;\n\n\t& .ck-widget__selection-handle {\n\t\tposition: absolute;\n\n\t\t& .ck-icon {\n\t\t\t/* Make sure the icon in not a subject to font-size or line-height to avoid\n\t\t\tunnecessary spacing around it. */\n\t\t\tdisplay: block;\n\t\t}\n\t}\n\n\t/* Show the selection handle on mouse hover over the widget, but not for nested widgets. */\n\t&:hover > .ck-widget__selection-handle {\n\t\tvisibility: visible;\n\t}\n\n\t/* Show the selection handle when the widget is selected, but not for nested widgets. */\n\t&.ck-widget_selected > .ck-widget__selection-handle {\n\t\tvisibility: visible;\n\t}\n}\n\n.ck .ck-size-view {\n\tbackground: var(--ck-color-resizer-tooltip-background);\n\tcolor: var(--ck-color-resizer-tooltip-text);\n\tborder: 1px solid var(--ck-color-resizer-tooltip-text);\n\tborder-radius: var(--ck-resizer-border-radius);\n\tfont-size: var(--ck-font-size-tiny);\n\tdisplay: block;\n\tpadding: 0 var(--ck-spacing-small);\n\theight: var(--ck-resizer-tooltip-height);\n\tline-height: var(--ck-resizer-tooltip-height);\n\n\t&.ck-orientation-top-left,\n\t&.ck-orientation-top-right,\n\t&.ck-orientation-bottom-right,\n\t&.ck-orientation-bottom-left,\n\t&.ck-orientation-above-center {\n\t\tposition: absolute;\n\t}\n\n\t&.ck-orientation-top-left {\n\t\ttop: var(--ck-resizer-tooltip-offset);\n\t\tleft: var(--ck-resizer-tooltip-offset);\n\t}\n\n\t&.ck-orientation-top-right {\n\t\ttop: var(--ck-resizer-tooltip-offset);\n\t\tright: var(--ck-resizer-tooltip-offset);\n\t}\n\n\t&.ck-orientation-bottom-right {\n\t\tbottom: var(--ck-resizer-tooltip-offset);\n\t\tright: var(--ck-resizer-tooltip-offset);\n\t}\n\n\t&.ck-orientation-bottom-left {\n\t\tbottom: var(--ck-resizer-tooltip-offset);\n\t\tleft: var(--ck-resizer-tooltip-offset);\n\t}\n\n\t/* Class applied if the widget is too small to contain the size label */\n\t&.ck-orientation-above-center {\n\t\ttop: calc(var(--ck-resizer-tooltip-height) * -1);\n\t\tleft: 50%;\n\t\ttransform: translate(-50%);\n\t}\n}\n",'/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n@import "../mixins/_focus.css";\n@import "../mixins/_shadow.css";\n\n:root {\n\t--ck-widget-outline-thickness: 3px;\n\t--ck-widget-handler-icon-size: 16px;\n\t--ck-widget-handler-animation-duration: 200ms;\n\t--ck-widget-handler-animation-curve: ease;\n\n\t--ck-color-widget-blurred-border: hsl(0, 0%, 87%);\n\t--ck-color-widget-hover-border: hsl(43, 100%, 62%);\n\t--ck-color-widget-editable-focus-background: var(--ck-color-base-background);\n\t--ck-color-widget-drag-handler-icon-color: var(--ck-color-base-background);\n}\n\n.ck .ck-widget {\n\toutline-width: var(--ck-widget-outline-thickness);\n\toutline-style: solid;\n\toutline-color: transparent;\n\ttransition: outline-color var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve);\n\n\t&.ck-widget_selected,\n\t&.ck-widget_selected:hover {\n\t\toutline: var(--ck-widget-outline-thickness) solid var(--ck-color-focus-border);\n\t}\n\n\t&:hover {\n\t\toutline-color: var(--ck-color-widget-hover-border);\n\t}\n}\n\n.ck .ck-editor__nested-editable {\n\tborder: 1px solid transparent;\n\n\t/* The :focus style is applied before .ck-editor__nested-editable_focused class is rendered in the view.\n\tThese styles show a different border for a blink of an eye, so `:focus` need to have same styles applied. */\n\t&.ck-editor__nested-editable_focused,\n\t&:focus {\n\t\t@mixin ck-focus-ring;\n\t\t@mixin ck-box-shadow var(--ck-inner-shadow);\n\n\t\tbackground-color: var(--ck-color-widget-editable-focus-background);\n\t}\n}\n\n.ck .ck-widget.ck-widget_with-selection-handle {\n\t& .ck-widget__selection-handle {\n\t\tpadding: 4px;\n\t\tbox-sizing: border-box;\n\n\t\t/* Background and opacity will be animated as the handler shows up or the widget gets selected. */\n\t\tbackground-color: transparent;\n\t\topacity: 0;\n\n\t\t/* Transition:\n\t\t   * background-color for the .ck-widget_selected state change,\n\t\t   * visibility for hiding the handler,\n\t\t   * opacity for the proper look of the icon when the handler disappears. */\n\t\ttransition:\n\t\t\tbackground-color var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve),\n\t\t\tvisibility var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve),\n\t\t\topacity var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve);\n\n\t\t/* Make only top corners round. */\n\t\tborder-radius: var(--ck-border-radius) var(--ck-border-radius) 0 0;\n\n\t\t/* Place the drag handler outside the widget wrapper. */\n\t\ttransform: translateY(-100%);\n\t\tleft: calc(0px - var(--ck-widget-outline-thickness));\n\t\ttop: 0;\n\n\t\t& .ck-icon {\n\t\t\t/* Make sure the dimensions of the icon are independent of the fon-size of the content. */\n\t\t\twidth: var(--ck-widget-handler-icon-size);\n\t\t\theight: var(--ck-widget-handler-icon-size);\n\t\t\tcolor: var(--ck-color-widget-drag-handler-icon-color);\n\n\t\t\t/* The "selected" part of the icon is invisible by default */\n\t\t\t& .ck-icon__selected-indicator {\n\t\t\t\topacity: 0;\n\n\t\t\t\t/* Note: The animation is longer on purpose. Simply feels better. */\n\t\t\t\ttransition: opacity 300ms var(--ck-widget-handler-animation-curve);\n\t\t\t}\n\t\t}\n\n\t\t/* Advertise using the look of the icon that once clicked the handler, the widget will be selected. */\n\t\t&:hover .ck-icon .ck-icon__selected-indicator {\n\t\t\topacity: 1;\n\t\t}\n\t}\n\n\t/* Show the selection handler on mouse hover over the widget, but not for nested widgets. */\n\t&:hover > .ck-widget__selection-handle {\n\t\topacity: 1;\n\t\tbackground-color: var(--ck-color-widget-hover-border);\n\t}\n\n\t/* Show the selection handler when the widget is selected, but not for nested widgets. */\n\t&.ck-widget_selected,\n\t&.ck-widget_selected:hover {\n\t\t& > .ck-widget__selection-handle {\n\t\t\topacity: 1;\n\t\t\tbackground-color: var(--ck-color-focus-border);\n\n\t\t\t/* When the widget is selected, notify the user using the proper look of the icon. */\n\t\t\t& .ck-icon .ck-icon__selected-indicator {\n\t\t\t\topacity: 1;\n\t\t\t}\n\t\t}\n\t}\n}\n\n/* In a RTL environment, align the selection handler to the right side of the widget */\n/* stylelint-disable-next-line no-descending-specificity */\n.ck[dir="rtl"] .ck-widget.ck-widget_with-selection-handle .ck-widget__selection-handle {\n\tleft: auto;\n\tright: calc(0px - var(--ck-widget-outline-thickness));\n}\n\n/* https://github.com/ckeditor/ckeditor5/issues/6415 */\n.ck.ck-editor__editable.ck-read-only .ck-widget {\n\t/* Prevent the :hover outline from showing up because of the used outline-color transition. */\n\ttransition: none;\n\n\t&:not(.ck-widget_selected) {\n\t\t/* Disable visual effects of hover/active widget when CKEditor is in readOnly mode.\n\t\t * See: https://github.com/ckeditor/ckeditor5/issues/1261\n\t\t *\n\t\t * Leave the unit because this custom property is used in calc() by other features.\n\t\t * See: https://github.com/ckeditor/ckeditor5/issues/6775\n\t\t */\n\t\t--ck-widget-outline-thickness: 0px;\n\t}\n\n\t&.ck-widget_with-selection-handle {\n\t\t& .ck-widget__selection-handle,\n\t\t& .ck-widget__selection-handle:hover {\n\t\t\tbackground: var(--ck-color-widget-blurred-border);\n\t\t}\n\t}\n}\n\n/* Style the widget when it\'s selected but the editable it belongs to lost focus. */\n/* stylelint-disable-next-line no-descending-specificity */\n.ck.ck-editor__editable.ck-blurred .ck-widget {\n\t&.ck-widget_selected,\n\t&.ck-widget_selected:hover {\n\t\toutline-color: var(--ck-color-widget-blurred-border);\n\n\t\t&.ck-widget_with-selection-handle {\n\t\t\t& > .ck-widget__selection-handle,\n\t\t\t& > .ck-widget__selection-handle:hover {\n\t\t\t\tbackground: var(--ck-color-widget-blurred-border);\n\t\t\t}\n\t\t}\n\t}\n}\n\n.ck.ck-editor__editable > .ck-widget.ck-widget_with-selection-handle:first-child,\n.ck.ck-editor__editable blockquote > .ck-widget.ck-widget_with-selection-handle:first-child {\n\t/* Do not crop selection handler if a widget is a first-child in the blockquote or in the root editable.\n\tIn fact, anything with overflow: hidden.\n\thttps://github.com/ckeditor/ckeditor5-block-quote/issues/28\n\thttps://github.com/ckeditor/ckeditor5-widget/issues/44\n\thttps://github.com/ckeditor/ckeditor5-widget/issues/66 */\n\tmargin-top: calc(1em + var(--ck-widget-handler-icon-size));\n}\n',"/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A visual style of focused element's border.\n */\n@define-mixin ck-focus-ring {\n\t/* Disable native outline. */\n\toutline: none;\n\tborder: var(--ck-focus-ring)\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n/**\n * A helper to combine multiple shadows.\n */\n@define-mixin ck-box-shadow $shadowA, $shadowB: 0 0 {\n\tbox-shadow: $shadowA, $shadowB;\n}\n\n/**\n * Gives an element a drop shadow so it looks like a floating panel.\n */\n@define-mixin ck-drop-shadow {\n\t@mixin ck-box-shadow var(--ck-drop-shadow);\n}\n"],sourceRoot:""}]);const c=a},875:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,".ck .ck-widget_with-resizer{position:relative}.ck .ck-widget__resizer{display:none;left:0;pointer-events:none;position:absolute;top:0}.ck-focused .ck-widget_with-resizer.ck-widget_selected>.ck-widget__resizer{display:block}.ck .ck-widget__resizer__handle{pointer-events:all;position:absolute}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-bottom-right,.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-top-left{cursor:nwse-resize}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-bottom-left,.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-top-right{cursor:nesw-resize}:root{--ck-resizer-size:10px;--ck-resizer-offset:calc(var(--ck-resizer-size)/-2 - 2px);--ck-resizer-border-width:1px}.ck .ck-widget__resizer{outline:1px solid var(--ck-color-resizer)}.ck .ck-widget__resizer__handle{background:var(--ck-color-focus-border);border:var(--ck-resizer-border-width) solid #fff;border-radius:var(--ck-resizer-border-radius);height:var(--ck-resizer-size);width:var(--ck-resizer-size)}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-top-left{left:var(--ck-resizer-offset);top:var(--ck-resizer-offset)}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-top-right{right:var(--ck-resizer-offset);top:var(--ck-resizer-offset)}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-bottom-right{bottom:var(--ck-resizer-offset);right:var(--ck-resizer-offset)}.ck .ck-widget__resizer__handle.ck-widget__resizer__handle-bottom-left{bottom:var(--ck-resizer-offset);left:var(--ck-resizer-offset)}","",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-widget/theme/widgetresize.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-widget/widgetresize.css"],names:[],mappings:"AAKA,4BAEC,iBACD,CAEA,wBACC,YAAa,CAMb,MAAO,CAFP,mBAAoB,CAHpB,iBAAkB,CAMlB,KACD,CAGC,2EACC,aACD,CAGD,gCAIC,kBAAmB,CAHnB,iBAcD,CATC,4IAEC,kBACD,CAEA,4IAEC,kBACD,CCpCD,MACC,sBAAuB,CAGvB,yDAAiE,CACjE,6BACD,CAEA,wBACC,yCACD,CAEA,gCAGC,uCAAwC,CACxC,gDAA6D,CAC7D,6CAA8C,CAH9C,6BAA8B,CAD9B,4BAyBD,CAnBC,oEAEC,6BAA8B,CAD9B,4BAED,CAEA,qEAEC,8BAA+B,CAD/B,4BAED,CAEA,wEACC,+BAAgC,CAChC,8BACD,CAEA,uEACC,+BAAgC,CAChC,6BACD",sourcesContent:["/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck .ck-widget_with-resizer {\n\t/* Make the widget wrapper a relative positioning container for the drag handle. */\n\tposition: relative;\n}\n\n.ck .ck-widget__resizer {\n\tdisplay: none;\n\tposition: absolute;\n\n\t/* The wrapper itself should not interfere with the pointer device, only the handles should. */\n\tpointer-events: none;\n\n\tleft: 0;\n\ttop: 0;\n}\n\n.ck-focused .ck-widget_with-resizer.ck-widget_selected {\n\t& > .ck-widget__resizer {\n\t\tdisplay: block;\n\t}\n}\n\n.ck .ck-widget__resizer__handle {\n\tposition: absolute;\n\n\t/* Resizers are the only UI elements that should interfere with a pointer device. */\n\tpointer-events: all;\n\n\t&.ck-widget__resizer__handle-top-left,\n\t&.ck-widget__resizer__handle-bottom-right {\n\t\tcursor: nwse-resize;\n\t}\n\n\t&.ck-widget__resizer__handle-top-right,\n\t&.ck-widget__resizer__handle-bottom-left {\n\t\tcursor: nesw-resize;\n\t}\n}\n","/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-resizer-size: 10px;\n\n\t/* Set the resizer with a 50% offset. */\n\t--ck-resizer-offset: calc( ( var(--ck-resizer-size) / -2 ) - 2px);\n\t--ck-resizer-border-width: 1px;\n}\n\n.ck .ck-widget__resizer {\n\toutline: 1px solid var(--ck-color-resizer);\n}\n\n.ck .ck-widget__resizer__handle {\n\twidth: var(--ck-resizer-size);\n\theight: var(--ck-resizer-size);\n\tbackground: var(--ck-color-focus-border);\n\tborder: var(--ck-resizer-border-width) solid hsl(0, 0%, 100%);\n\tborder-radius: var(--ck-resizer-border-radius);\n\n\t&.ck-widget__resizer__handle-top-left {\n\t\ttop: var(--ck-resizer-offset);\n\t\tleft: var(--ck-resizer-offset);\n\t}\n\n\t&.ck-widget__resizer__handle-top-right {\n\t\ttop: var(--ck-resizer-offset);\n\t\tright: var(--ck-resizer-offset);\n\t}\n\n\t&.ck-widget__resizer__handle-bottom-right {\n\t\tbottom: var(--ck-resizer-offset);\n\t\tright: var(--ck-resizer-offset);\n\t}\n\n\t&.ck-widget__resizer__handle-bottom-left {\n\t\tbottom: var(--ck-resizer-offset);\n\t\tleft: var(--ck-resizer-offset);\n\t}\n}\n"],sourceRoot:""}]);const c=a},347:(t,e,n)=>{"use strict";n.d(e,{Z:()=>c});var o=n(15);var i=n.n(o);var r=n(645);var s=n.n(r);var a=s()(i());a.push([t.id,'.ck .ck-widget .ck-widget__type-around__button{display:block;overflow:hidden;position:absolute;z-index:var(--ck-z-default)}.ck .ck-widget .ck-widget__type-around__button svg{left:50%;position:absolute;top:50%;z-index:calc(var(--ck-z-default) + 2)}.ck .ck-widget .ck-widget__type-around__button.ck-widget__type-around__button_before{left:min(10%,30px);top:calc(var(--ck-widget-outline-thickness)*-.5);transform:translateY(-50%)}.ck .ck-widget .ck-widget__type-around__button.ck-widget__type-around__button_after{bottom:calc(var(--ck-widget-outline-thickness)*-.5);right:min(10%,30px);transform:translateY(50%)}.ck .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button:after,.ck .ck-widget>.ck-widget__type-around>.ck-widget__type-around__button:hover:after{content:"";display:block;left:1px;position:absolute;top:1px;z-index:calc(var(--ck-z-default) + 1)}.ck .ck-widget>.ck-widget__type-around>.ck-widget__type-around__fake-caret{display:none;left:0;position:absolute;right:0}.ck .ck-widget:hover>.ck-widget__type-around>.ck-widget__type-around__fake-caret{left:calc(var(--ck-widget-outline-thickness)*-1);right:calc(var(--ck-widget-outline-thickness)*-1)}.ck .ck-widget.ck-widget_type-around_show-fake-caret_before>.ck-widget__type-around>.ck-widget__type-around__fake-caret{display:block;top:calc(var(--ck-widget-outline-thickness)*-1 - 1px)}.ck .ck-widget.ck-widget_type-around_show-fake-caret_after>.ck-widget__type-around>.ck-widget__type-around__fake-caret{bottom:calc(var(--ck-widget-outline-thickness)*-1 - 1px);display:block}.ck.ck-editor__editable.ck-read-only .ck-widget__type-around,.ck.ck-editor__editable.ck-restricted-editing_mode_restricted .ck-widget__type-around,.ck.ck-editor__editable.ck-widget__type-around_disabled .ck-widget__type-around{display:none}:root{--ck-widget-type-around-button-size:20px;--ck-color-widget-type-around-button-active:var(--ck-color-focus-border);--ck-color-widget-type-around-button-hover:var(--ck-color-widget-hover-border);--ck-color-widget-type-around-button-blurred-editable:var(--ck-color-widget-blurred-border);--ck-color-widget-type-around-button-radar-start-alpha:0;--ck-color-widget-type-around-button-radar-end-alpha:.3;--ck-color-widget-type-around-button-icon:var(--ck-color-base-background)}.ck .ck-widget .ck-widget__type-around__button{background:var(--ck-color-widget-type-around-button);border-radius:100px;height:var(--ck-widget-type-around-button-size);opacity:0;pointer-events:none;transition:opacity var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve),background var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve);width:var(--ck-widget-type-around-button-size)}.ck .ck-widget .ck-widget__type-around__button svg{height:8px;margin-top:1px;transform:translate(-50%,-50%);transition:transform .5s ease;width:10px}.ck .ck-widget .ck-widget__type-around__button svg *{stroke-dasharray:10;stroke-dashoffset:0;fill:none;stroke:var(--ck-color-widget-type-around-button-icon);stroke-width:1.5px;stroke-linecap:round;stroke-linejoin:round}.ck .ck-widget .ck-widget__type-around__button svg line{stroke-dasharray:7}.ck .ck-widget .ck-widget__type-around__button:hover{animation:ck-widget-type-around-button-sonar 1s ease infinite}.ck .ck-widget .ck-widget__type-around__button:hover svg polyline{animation:ck-widget-type-around-arrow-dash 2s linear}.ck .ck-widget .ck-widget__type-around__button:hover svg line{animation:ck-widget-type-around-arrow-tip-dash 2s linear}.ck .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button,.ck .ck-widget:hover>.ck-widget__type-around>.ck-widget__type-around__button{opacity:1;pointer-events:auto}.ck .ck-widget:not(.ck-widget_selected)>.ck-widget__type-around>.ck-widget__type-around__button{background:var(--ck-color-widget-type-around-button-hover)}.ck .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button,.ck .ck-widget>.ck-widget__type-around>.ck-widget__type-around__button:hover{background:var(--ck-color-widget-type-around-button-active)}.ck .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button:after,.ck .ck-widget>.ck-widget__type-around>.ck-widget__type-around__button:hover:after{background:linear-gradient(135deg,hsla(0,0%,100%,0),hsla(0,0%,100%,.3));border-radius:100px;height:calc(var(--ck-widget-type-around-button-size) - 2px);width:calc(var(--ck-widget-type-around-button-size) - 2px)}.ck .ck-widget.ck-widget_with-selection-handle>.ck-widget__type-around>.ck-widget__type-around__button_before{margin-left:20px}.ck .ck-widget .ck-widget__type-around__fake-caret{animation:ck-widget-type-around-fake-caret-pulse 1s linear infinite normal forwards;background:var(--ck-color-base-text);height:1px;outline:1px solid hsla(0,0%,100%,.5);pointer-events:none}.ck .ck-widget.ck-widget_selected.ck-widget_type-around_show-fake-caret_after,.ck .ck-widget.ck-widget_selected.ck-widget_type-around_show-fake-caret_before{outline-color:transparent}.ck .ck-widget.ck-widget_type-around_show-fake-caret_after.ck-widget_selected:hover,.ck .ck-widget.ck-widget_type-around_show-fake-caret_before.ck-widget_selected:hover{outline-color:var(--ck-color-widget-hover-border)}.ck .ck-widget.ck-widget_type-around_show-fake-caret_after>.ck-widget__type-around>.ck-widget__type-around__button,.ck .ck-widget.ck-widget_type-around_show-fake-caret_before>.ck-widget__type-around>.ck-widget__type-around__button{opacity:0;pointer-events:none}.ck .ck-widget.ck-widget_type-around_show-fake-caret_after.ck-widget_selected.ck-widget_with-resizer>.ck-widget__resizer,.ck .ck-widget.ck-widget_type-around_show-fake-caret_after.ck-widget_with-selection-handle.ck-widget_selected:hover>.ck-widget__selection-handle,.ck .ck-widget.ck-widget_type-around_show-fake-caret_after.ck-widget_with-selection-handle.ck-widget_selected>.ck-widget__selection-handle,.ck .ck-widget.ck-widget_type-around_show-fake-caret_before.ck-widget_selected.ck-widget_with-resizer>.ck-widget__resizer,.ck .ck-widget.ck-widget_type-around_show-fake-caret_before.ck-widget_with-selection-handle.ck-widget_selected:hover>.ck-widget__selection-handle,.ck .ck-widget.ck-widget_type-around_show-fake-caret_before.ck-widget_with-selection-handle.ck-widget_selected>.ck-widget__selection-handle{opacity:0}.ck[dir=rtl] .ck-widget.ck-widget_with-selection-handle .ck-widget__type-around>.ck-widget__type-around__button_before{margin-left:0;margin-right:20px}.ck-editor__nested-editable.ck-editor__editable_selected .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button,.ck-editor__nested-editable.ck-editor__editable_selected .ck-widget:hover>.ck-widget__type-around>.ck-widget__type-around__button{opacity:0;pointer-events:none}.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button:not(:hover){background:var(--ck-color-widget-type-around-button-blurred-editable)}.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected>.ck-widget__type-around>.ck-widget__type-around__button:not(:hover) svg *{stroke:#999}@keyframes ck-widget-type-around-arrow-dash{0%{stroke-dashoffset:10}20%,to{stroke-dashoffset:0}}@keyframes ck-widget-type-around-arrow-tip-dash{0%,20%{stroke-dashoffset:7}40%,to{stroke-dashoffset:0}}@keyframes ck-widget-type-around-button-sonar{0%{box-shadow:0 0 0 0 hsla(var(--ck-color-focus-border-coordinates),var(--ck-color-widget-type-around-button-radar-start-alpha))}50%{box-shadow:0 0 0 5px hsla(var(--ck-color-focus-border-coordinates),var(--ck-color-widget-type-around-button-radar-end-alpha))}to{box-shadow:0 0 0 5px hsla(var(--ck-color-focus-border-coordinates),var(--ck-color-widget-type-around-button-radar-start-alpha))}}@keyframes ck-widget-type-around-fake-caret-pulse{0%{opacity:1}49%{opacity:1}50%{opacity:0}99%{opacity:0}to{opacity:1}}',"",{version:3,sources:["webpack://./node_modules/@ckeditor/ckeditor5-widget/theme/widgettypearound.css","webpack://./node_modules/@ckeditor/ckeditor5-theme-lark/theme/ckeditor5-widget/widgettypearound.css"],names:[],mappings:"AASC,+CACC,aAAc,CAEd,eAAgB,CADhB,iBAAkB,CAElB,2BAwBD,CAtBC,mDAGC,QAAS,CAFT,iBAAkB,CAClB,OAAQ,CAER,qCACD,CAEA,qFAGC,kBAAoB,CADpB,gDAAoD,CAGpD,0BACD,CAEA,oFAEC,mDAAuD,CACvD,mBAAqB,CAErB,yBACD,CAUA,mLACC,UAAW,CACX,aAAc,CAGd,QAAS,CAFT,iBAAkB,CAClB,OAAQ,CAER,qCACD,CAMD,2EACC,YAAa,CAEb,MAAO,CADP,iBAAkB,CAElB,OACD,CAOA,iFACC,gDAAqD,CACrD,iDACD,CAKA,wHAEC,aAAc,CADd,qDAED,CAKA,uHACC,wDAA6D,CAC7D,aACD,CAoBD,mOACC,YACD,CC3GA,MACC,wCAAyC,CACzC,wEAAyE,CACzE,8EAA+E,CAC/E,2FAA4F,CAC5F,wDAAyD,CACzD,uDAAwD,CACxD,yEACD,CAgBC,+CAGC,oDAAqD,CACrD,mBAAoB,CAFpB,+CAAgD,CAVjD,SAAU,CACV,mBAAoB,CAYnB,uMAAyM,CAJzM,8CAkDD,CA1CC,mDAEC,UAAW,CAGX,cAAe,CAFf,8BAA+B,CAC/B,6BAA8B,CAH9B,UAoBD,CAdC,qDACC,mBAAoB,CACpB,mBAAoB,CAEpB,SAAU,CACV,qDAAsD,CACtD,kBAAmB,CACnB,oBAAqB,CACrB,qBACD,CAEA,wDACC,kBACD,CAGD,qDAIC,6DAcD,CARE,kEACC,oDACD,CAEA,8DACC,wDACD,CAUF,uKAvED,SAAU,CACV,mBAwEC,CAOD,gGACC,0DACD,CAOA,uKAEC,2DAQD,CANC,mLAIC,uEAAkF,CADlF,mBAAoB,CADpB,2DAA4D,CAD5D,0DAID,CAOD,8GACC,gBACD,CAKA,mDAGC,mFAAoF,CAOpF,oCAAqC,CARrC,UAAW,CAOX,oCAAwC,CARxC,mBAUD,CAOC,6JAEC,yBACD,CAUA,yKACC,iDACD,CAMA,uOAlJD,SAAU,CACV,mBAmJC,CAoBA,6yBACC,SACD,CASF,uHACC,aAAc,CACd,iBACD,CAYG,iRAlMF,SAAU,CACV,mBAmME,CAQH,kIACC,qEAKD,CAHC,wIACC,WACD,CAGD,4CACC,GACC,oBACD,CACA,OACC,mBACD,CACD,CAEA,gDACC,OACC,mBACD,CACA,OACC,mBACD,CACD,CAEA,8CACC,GACC,6HACD,CACA,IACC,6HACD,CACA,GACC,+HACD,CACD,CAEA,kDACC,GACC,SACD,CACA,IACC,SACD,CACA,IACC,SACD,CACA,IACC,SACD,CACA,GACC,SACD,CACD",sourcesContent:['/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n.ck .ck-widget {\n\t/*\n\t * Styles of the type around buttons\n\t */\n\t& .ck-widget__type-around__button {\n\t\tdisplay: block;\n\t\tposition: absolute;\n\t\toverflow: hidden;\n\t\tz-index: var(--ck-z-default);\n\n\t\t& svg {\n\t\t\tposition: absolute;\n\t\t\ttop: 50%;\n\t\t\tleft: 50%;\n\t\t\tz-index: calc(var(--ck-z-default) + 2);\n\t\t}\n\n\t\t&.ck-widget__type-around__button_before {\n\t\t\t/* Place it in the middle of the outline */\n\t\t\ttop: calc(-0.5 * var(--ck-widget-outline-thickness));\n\t\t\tleft: min(10%, 30px);\n\n\t\t\ttransform: translateY(-50%);\n\t\t}\n\n\t\t&.ck-widget__type-around__button_after {\n\t\t\t/* Place it in the middle of the outline */\n\t\t\tbottom: calc(-0.5 * var(--ck-widget-outline-thickness));\n\t\t\tright: min(10%, 30px);\n\n\t\t\ttransform: translateY(50%);\n\t\t}\n\t}\n\n\t/*\n\t * Styles for the buttons when:\n\t * - the widget is selected,\n\t * - or the button is being hovered (regardless of the widget state).\n\t */\n\t&.ck-widget_selected > .ck-widget__type-around > .ck-widget__type-around__button,\n\t& > .ck-widget__type-around > .ck-widget__type-around__button:hover {\n\t\t&::after {\n\t\t\tcontent: "";\n\t\t\tdisplay: block;\n\t\t\tposition: absolute;\n\t\t\ttop: 1px;\n\t\t\tleft: 1px;\n\t\t\tz-index: calc(var(--ck-z-default) + 1);\n\t\t}\n\t}\n\n\t/*\n\t * Styles for the horizontal "fake caret" which is displayed when the user navigates using the keyboard.\n\t */\n\t& > .ck-widget__type-around > .ck-widget__type-around__fake-caret {\n\t\tdisplay: none;\n\t\tposition: absolute;\n\t\tleft: 0;\n\t\tright: 0;\n\t}\n\n\t/*\n\t * When the widget is hovered the "fake caret" would normally be narrower than the\n\t * extra outline displayed around the widget. Let\'s extend the "fake caret" to match\n\t * the full width of the widget.\n\t */\n\t&:hover > .ck-widget__type-around > .ck-widget__type-around__fake-caret {\n\t\tleft: calc( -1 * var(--ck-widget-outline-thickness) );\n\t\tright: calc( -1 * var(--ck-widget-outline-thickness) );\n\t}\n\n\t/*\n\t * Styles for the horizontal "fake caret" when it should be displayed before the widget (backward keyboard navigation).\n\t */\n\t&.ck-widget_type-around_show-fake-caret_before > .ck-widget__type-around > .ck-widget__type-around__fake-caret {\n\t\ttop: calc( -1 * var(--ck-widget-outline-thickness) - 1px );\n\t\tdisplay: block;\n\t}\n\n\t/*\n\t * Styles for the horizontal "fake caret" when it should be displayed after the widget (forward keyboard navigation).\n\t */\n\t&.ck-widget_type-around_show-fake-caret_after > .ck-widget__type-around > .ck-widget__type-around__fake-caret {\n\t\tbottom: calc( -1 * var(--ck-widget-outline-thickness) - 1px );\n\t\tdisplay: block;\n\t}\n}\n\n/*\n * Integration with the read-only mode of the editor.\n */\n.ck.ck-editor__editable.ck-read-only .ck-widget__type-around {\n\tdisplay: none;\n}\n\n/*\n * Integration with the restricted editing mode (feature) of the editor.\n */\n.ck.ck-editor__editable.ck-restricted-editing_mode_restricted .ck-widget__type-around {\n\tdisplay: none;\n}\n\n/*\n * Integration with the #isEnabled property of the WidgetTypeAround plugin.\n */\n.ck.ck-editor__editable.ck-widget__type-around_disabled .ck-widget__type-around {\n\tdisplay: none;\n}\n','/*\n * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.\n * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license\n */\n\n:root {\n\t--ck-widget-type-around-button-size: 20px;\n\t--ck-color-widget-type-around-button-active: var(--ck-color-focus-border);\n\t--ck-color-widget-type-around-button-hover: var(--ck-color-widget-hover-border);\n\t--ck-color-widget-type-around-button-blurred-editable: var(--ck-color-widget-blurred-border);\n\t--ck-color-widget-type-around-button-radar-start-alpha: 0;\n\t--ck-color-widget-type-around-button-radar-end-alpha: .3;\n\t--ck-color-widget-type-around-button-icon: var(--ck-color-base-background);\n}\n\n@define-mixin ck-widget-type-around-button-visible {\n\topacity: 1;\n\tpointer-events: auto;\n}\n\n@define-mixin ck-widget-type-around-button-hidden {\n\topacity: 0;\n\tpointer-events: none;\n}\n\n.ck .ck-widget {\n\t/*\n\t * Styles of the type around buttons\n\t */\n\t& .ck-widget__type-around__button {\n\t\twidth: var(--ck-widget-type-around-button-size);\n\t\theight: var(--ck-widget-type-around-button-size);\n\t\tbackground: var(--ck-color-widget-type-around-button);\n\t\tborder-radius: 100px;\n\t\ttransition: opacity var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve), background var(--ck-widget-handler-animation-duration) var(--ck-widget-handler-animation-curve);\n\n\t\t@mixin ck-widget-type-around-button-hidden;\n\n\t\t& svg {\n\t\t\twidth: 10px;\n\t\t\theight: 8px;\n\t\t\ttransform: translate(-50%,-50%);\n\t\t\ttransition: transform .5s ease;\n\t\t\tmargin-top: 1px;\n\n\t\t\t& * {\n\t\t\t\tstroke-dasharray: 10;\n\t\t\t\tstroke-dashoffset: 0;\n\n\t\t\t\tfill: none;\n\t\t\t\tstroke: var(--ck-color-widget-type-around-button-icon);\n\t\t\t\tstroke-width: 1.5px;\n\t\t\t\tstroke-linecap: round;\n\t\t\t\tstroke-linejoin: round;\n\t\t\t}\n\n\t\t\t& line {\n\t\t\t\tstroke-dasharray: 7;\n\t\t\t}\n\t\t}\n\n\t\t&:hover {\n\t\t\t/*\n\t\t\t * Display the "sonar" around the button when hovered.\n\t\t\t */\n\t\t\tanimation: ck-widget-type-around-button-sonar 1s ease infinite;\n\n\t\t\t/*\n\t\t\t * Animate active button\'s icon.\n\t\t\t */\n\t\t\t& svg {\n\t\t\t\t& polyline {\n\t\t\t\t\tanimation: ck-widget-type-around-arrow-dash 2s linear;\n\t\t\t\t}\n\n\t\t\t\t& line {\n\t\t\t\t\tanimation: ck-widget-type-around-arrow-tip-dash 2s linear;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t/*\n\t * Show type around buttons when the widget gets selected or being hovered.\n\t */\n\t&.ck-widget_selected,\n\t&:hover {\n\t\t& > .ck-widget__type-around > .ck-widget__type-around__button {\n\t\t\t@mixin ck-widget-type-around-button-visible;\n\t\t}\n\t}\n\n\t/*\n\t * Styles for the buttons when the widget is NOT selected (but the buttons are visible\n\t * and still can be hovered).\n\t */\n\t&:not(.ck-widget_selected) > .ck-widget__type-around > .ck-widget__type-around__button {\n\t\tbackground: var(--ck-color-widget-type-around-button-hover);\n\t}\n\n\t/*\n\t * Styles for the buttons when:\n\t * - the widget is selected,\n\t * - or the button is being hovered (regardless of the widget state).\n\t */\n\t&.ck-widget_selected > .ck-widget__type-around > .ck-widget__type-around__button,\n\t& > .ck-widget__type-around > .ck-widget__type-around__button:hover {\n\t\tbackground: var(--ck-color-widget-type-around-button-active);\n\n\t\t&::after {\n\t\t\twidth: calc(var(--ck-widget-type-around-button-size) - 2px);\n\t\t\theight: calc(var(--ck-widget-type-around-button-size) - 2px);\n\t\t\tborder-radius: 100px;\n\t\t\tbackground: linear-gradient(135deg, hsla(0,0%,100%,0) 0%, hsla(0,0%,100%,.3) 100%);\n\t\t}\n\t}\n\n\t/*\n\t * Styles for the "before" button when the widget has a selection handle. Because some space\n\t * is consumed by the handle, the button must be moved slightly to the right to let it breathe.\n\t */\n\t&.ck-widget_with-selection-handle > .ck-widget__type-around > .ck-widget__type-around__button_before {\n\t\tmargin-left: 20px;\n\t}\n\n\t/*\n\t * Styles for the horizontal "fake caret" which is displayed when the user navigates using the keyboard.\n\t */\n\t& .ck-widget__type-around__fake-caret {\n\t\tpointer-events: none;\n\t\theight: 1px;\n\t\tanimation: ck-widget-type-around-fake-caret-pulse linear 1s infinite normal forwards;\n\n\t\t/*\n\t\t * The semi-transparent-outline+background combo improves the contrast\n\t\t * when the background underneath the fake caret is dark.\n\t\t */\n\t\toutline: solid 1px hsla(0, 0%, 100%, .5);\n\t\tbackground: var(--ck-color-base-text);\n\t}\n\n\t/*\n\t * Styles of the widget when the "fake caret" is blinking (e.g. upon keyboard navigation).\n\t * Despite the widget being physically selected in the model, its outline should disappear.\n\t */\n\t&.ck-widget_selected {\n\t\t&.ck-widget_type-around_show-fake-caret_before,\n\t\t&.ck-widget_type-around_show-fake-caret_after {\n\t\t\toutline-color: transparent;\n\t\t}\n\t}\n\n\t&.ck-widget_type-around_show-fake-caret_before,\n\t&.ck-widget_type-around_show-fake-caret_after {\n\t\t/*\n\t\t * When the "fake caret" is visible we simulate that the widget is not selected\n\t\t * (despite being physically selected), so the outline color should be for the\n\t\t * unselected widget.\n\t\t */\n\t\t&.ck-widget_selected:hover {\n\t\t\toutline-color: var(--ck-color-widget-hover-border);\n\t\t}\n\n\t\t/*\n\t\t * Styles of the type around buttons when the "fake caret" is blinking (e.g. upon keyboard navigation).\n\t\t * In this state, the type around buttons would collide with the fake carets so they should disappear.\n\t\t */\n\t\t& > .ck-widget__type-around > .ck-widget__type-around__button {\n\t\t\t@mixin ck-widget-type-around-button-hidden;\n\t\t}\n\n\t\t/*\n\t\t * Fake horizontal caret integration with the selection handle. When the caret is visible, simply\n\t\t * hide the handle because it intersects with the caret (and does not make much sense anyway).\n\t\t */\n\t\t&.ck-widget_with-selection-handle {\n\t\t\t&.ck-widget_selected,\n\t\t\t&.ck-widget_selected:hover {\n\t\t\t\t& > .ck-widget__selection-handle {\n\t\t\t\t\topacity: 0\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t/*\n\t\t * Fake horizontal caret integration with the resize UI. When the caret is visible, simply\n\t\t * hide the resize UI because it creates too much noise. It can be visible when the user\n\t\t * hovers the widget, though.\n\t\t */\n\t\t&.ck-widget_selected.ck-widget_with-resizer > .ck-widget__resizer {\n\t\t\topacity: 0\n\t\t}\n\t}\n}\n\n/*\n * Styles for the "before" button when the widget has a selection handle in an RTL environment.\n * The selection handler is aligned to the right side of the widget so there is no need to create\n * additional space for it next to the "before" button.\n */\n.ck[dir="rtl"] .ck-widget.ck-widget_with-selection-handle .ck-widget__type-around > .ck-widget__type-around__button_before {\n\tmargin-left: 0;\n\tmargin-right: 20px;\n}\n\n/*\n * Hide type around buttons when the widget is selected as a child of a selected\n * nested editable (e.g. mulit-cell table selection).\n *\n * See https://github.com/ckeditor/ckeditor5/issues/7263.\n */\n.ck-editor__nested-editable.ck-editor__editable_selected {\n\t& .ck-widget {\n\t\t&.ck-widget_selected,\n\t\t&:hover {\n\t\t\t& > .ck-widget__type-around > .ck-widget__type-around__button {\n\t\t\t\t@mixin ck-widget-type-around-button-hidden;\n\t\t\t}\n\t\t}\n\t}\n}\n\n/*\n * Styles for the buttons when the widget is selected but the user clicked outside of the editor (blurred the editor).\n */\n.ck-editor__editable.ck-blurred .ck-widget.ck-widget_selected > .ck-widget__type-around > .ck-widget__type-around__button:not(:hover) {\n\tbackground: var(--ck-color-widget-type-around-button-blurred-editable);\n\n\t& svg * {\n\t\tstroke: hsl(0,0%,60%);\n\t}\n}\n\n@keyframes ck-widget-type-around-arrow-dash {\n\t0% {\n\t\tstroke-dashoffset: 10;\n\t}\n\t20%, 100% {\n\t\tstroke-dashoffset: 0;\n\t}\n}\n\n@keyframes ck-widget-type-around-arrow-tip-dash {\n\t0%, 20% {\n\t\tstroke-dashoffset: 7;\n\t}\n\t40%, 100% {\n\t\tstroke-dashoffset: 0;\n\t}\n}\n\n@keyframes ck-widget-type-around-button-sonar {\n\t0% {\n\t\tbox-shadow: 0 0 0 0 hsla(var(--ck-color-focus-border-coordinates), var(--ck-color-widget-type-around-button-radar-start-alpha));\n\t}\n\t50% {\n\t\tbox-shadow: 0 0 0 5px hsla(var(--ck-color-focus-border-coordinates), var(--ck-color-widget-type-around-button-radar-end-alpha));\n\t}\n\t100% {\n\t\tbox-shadow: 0 0 0 5px hsla(var(--ck-color-focus-border-coordinates), var(--ck-color-widget-type-around-button-radar-start-alpha));\n\t}\n}\n\n@keyframes ck-widget-type-around-fake-caret-pulse {\n\t0% {\n\t\topacity: 1;\n\t}\n\t49% {\n\t\topacity: 1;\n\t}\n\t50% {\n\t\topacity: 0;\n\t}\n\t99% {\n\t\topacity: 0;\n\t}\n\t100% {\n\t\topacity: 1;\n\t}\n}\n'],sourceRoot:""}]);const c=a},645:t=>{"use strict";t.exports=function(t){var e=[];e.toString=function e(){return this.map((function(e){var n=t(e);if(e[2]){return"@media ".concat(e[2]," {").concat(n,"}")}return n})).join("")};e.i=function(t,n,o){if(typeof t==="string"){t=[[null,t,""]]}var i={};if(o){for(var r=0;r<this.length;r++){var s=this[r][0];if(s!=null){i[s]=true}}}for(var a=0;a<t.length;a++){var c=[].concat(t[a]);if(o&&i[c[0]]){continue}if(n){if(!c[2]){c[2]=n}else{c[2]="".concat(n," and ").concat(c[2])}}e.push(c)}};return e}},15:t=>{"use strict";function e(t,e){return s(t)||r(t,e)||o(t,e)||n()}function n(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function o(t,e){if(!t)return;if(typeof t==="string")return i(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);if(n==="Object"&&t.constructor)n=t.constructor.name;if(n==="Map"||n==="Set")return Array.from(t);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return i(t,e)}function i(t,e){if(e==null||e>t.length)e=t.length;for(var n=0,o=new Array(e);n<e;n++){o[n]=t[n]}return o}function r(t,e){var n=t&&(typeof Symbol!=="undefined"&&t[Symbol.iterator]||t["@@iterator"]);if(n==null)return;var o=[];var i=true;var r=false;var s,a;try{for(n=n.call(t);!(i=(s=n.next()).done);i=true){o.push(s.value);if(e&&o.length===e)break}}catch(t){r=true;a=t}finally{try{if(!i&&n["return"]!=null)n["return"]()}finally{if(r)throw a}}return o}function s(t){if(Array.isArray(t))return t}t.exports=function t(n){var o=e(n,4),i=o[1],r=o[3];if(!r){return i}if(typeof btoa==="function"){var s=btoa(unescape(encodeURIComponent(JSON.stringify(r))));var a="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(s);var c="/*# ".concat(a," */");var l=r.sources.map((function(t){return"/*# sourceURL=".concat(r.sourceRoot||"").concat(t," */")}));return[i].concat(l).concat([c]).join("\n")}return[i].join("\n")}},379:(t,e,n)=>{"use strict";var o=function t(){var e;return function t(){if(typeof e==="undefined"){e=Boolean(window&&document&&document.all&&!window.atob)}return e}}();var i=function t(){var e={};return function t(n){if(typeof e[n]==="undefined"){var o=document.querySelector(n);if(window.HTMLIFrameElement&&o instanceof window.HTMLIFrameElement){try{o=o.contentDocument.head}catch(t){o=null}}e[n]=o}return e[n]}}();var r=[];function s(t){var e=-1;for(var n=0;n<r.length;n++){if(r[n].identifier===t){e=n;break}}return e}function a(t,e){var n={};var o=[];for(var i=0;i<t.length;i++){var a=t[i];var c=e.base?a[0]+e.base:a[0];var l=n[c]||0;var d="".concat(c," ").concat(l);n[c]=l+1;var u=s(d);var h={css:a[1],media:a[2],sourceMap:a[3]};if(u!==-1){r[u].references++;r[u].updater(h)}else{r.push({identifier:d,updater:g(h,e),references:1})}o.push(d)}return o}function c(t){var e=document.createElement("style");var o=t.attributes||{};if(typeof o.nonce==="undefined"){var r=true?n.nc:0;if(r){o.nonce=r}}Object.keys(o).forEach((function(t){e.setAttribute(t,o[t])}));if(typeof t.insert==="function"){t.insert(e)}else{var s=i(t.insert||"head");if(!s){throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.")}s.appendChild(e)}return e}function l(t){if(t.parentNode===null){return false}t.parentNode.removeChild(t)}var d=function t(){var e=[];return function t(n,o){e[n]=o;return e.filter(Boolean).join("\n")}}();function u(t,e,n,o){var i=n?"":o.media?"@media ".concat(o.media," {").concat(o.css,"}"):o.css;if(t.styleSheet){t.styleSheet.cssText=d(e,i)}else{var r=document.createTextNode(i);var s=t.childNodes;if(s[e]){t.removeChild(s[e])}if(s.length){t.insertBefore(r,s[e])}else{t.appendChild(r)}}}function h(t,e,n){var o=n.css;var i=n.media;var r=n.sourceMap;if(i){t.setAttribute("media",i)}else{t.removeAttribute("media")}if(r&&typeof btoa!=="undefined"){o+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(r))))," */")}if(t.styleSheet){t.styleSheet.cssText=o}else{while(t.firstChild){t.removeChild(t.firstChild)}t.appendChild(document.createTextNode(o))}}var f=null;var p=0;function g(t,e){var n;var o;var i;if(e.singleton){var r=p++;n=f||(f=c(e));o=u.bind(null,n,r,false);i=u.bind(null,n,r,true)}else{n=c(e);o=h.bind(null,n,e);i=function t(){l(n)}}o(t);return function e(n){if(n){if(n.css===t.css&&n.media===t.media&&n.sourceMap===t.sourceMap){return}o(t=n)}else{i()}}}t.exports=function(t,e){e=e||{};if(!e.singleton&&typeof e.singleton!=="boolean"){e.singleton=o()}t=t||[];var n=a(t,e);return function t(o){o=o||[];if(Object.prototype.toString.call(o)!=="[object Array]"){return}for(var i=0;i<n.length;i++){var c=n[i];var l=s(c);r[l].references--}var d=a(o,e);for(var u=0;u<n.length;u++){var h=n[u];var f=s(h);if(r[f].references===0){r[f].updater();r.splice(f,1)}}n=d}}}};var e={};function n(o){var i=e[o];if(i!==undefined){return i.exports}var r=e[o]={id:o,exports:{}};t[o](r,r.exports,n);return r.exports}(()=>{n.n=t=>{var e=t&&t.__esModule?()=>t["default"]:()=>t;n.d(e,{a:e});return e}})();(()=>{n.d=(t,e)=>{for(var o in e){if(n.o(e,o)&&!n.o(t,o)){Object.defineProperty(t,o,{enumerable:true,get:e[o]})}}}})();(()=>{n.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e)})();(()=>{n.nc=undefined})();var o={};(()=>{"use strict";n.d(o,{default:()=>HM});function t(){try{return navigator.userAgent.toLowerCase()}catch(t){return""}}const e=t();const i={isMac:s(e),isWindows:a(e),isGecko:c(e),isSafari:l(e),isiOS:d(e),isAndroid:u(e),isBlink:h(e),features:{isRegExpUnicodePropertySupported:f()}};const r=i;function s(t){return t.indexOf("macintosh")>-1}function a(t){return t.indexOf("windows")>-1}function c(t){return!!t.match(/gecko\/\d+/)}function l(t){return t.indexOf(" applewebkit/")>-1&&t.indexOf("chrome")===-1}function d(t){return!!t.match(/iphone|ipad/i)||s(t)&&navigator.maxTouchPoints>0}function u(t){return t.indexOf("android")>-1}function h(t){return t.indexOf("chrome/")>-1&&t.indexOf("edge/")<0}function f(){let t=false;try{t="ć".search(new RegExp("[\\p{L}]","u"))===0}catch(t){}return t}function p(t,e,n,o){n=n||function(t,e){return t===e};const i=Array.isArray(t)?t:Array.prototype.slice.call(t);const r=Array.isArray(e)?e:Array.prototype.slice.call(e);const s=g(i,r,n);const a=o?w(s,r.length):k(r,s);return a}function g(t,e,n){const o=m(t,e,n);if(o===-1){return{firstIndex:-1,lastIndexOld:-1,lastIndexNew:-1}}const i=b(t,o);const r=b(e,o);const s=m(i,r,n);const a=t.length-s;const c=e.length-s;return{firstIndex:o,lastIndexOld:a,lastIndexNew:c}}function m(t,e,n){for(let o=0;o<Math.max(t.length,e.length);o++){if(t[o]===undefined||e[o]===undefined||!n(t[o],e[o])){return o}}return-1}function b(t,e){return t.slice(e).reverse()}function k(t,e){const n=[];const{firstIndex:o,lastIndexOld:i,lastIndexNew:r}=e;if(r-o>0){n.push({index:o,type:"insert",values:t.slice(o,r)})}if(i-o>0){n.push({index:o+(r-o),type:"delete",howMany:i-o})}return n}function w(t,e){const{firstIndex:n,lastIndexOld:o,lastIndexNew:i}=t;if(n===-1){return Array(e).fill("equal")}let r=[];if(n>0){r=r.concat(Array(n).fill("equal"))}if(i-n>0){r=r.concat(Array(i-n).fill("insert"))}if(o-n>0){r=r.concat(Array(o-n).fill("delete"))}if(i<e){r=r.concat(Array(e-i).fill("equal"))}return r}function _(t,e,n){n=n||function(t,e){return t===e};const o=t.length;const i=e.length;if(o>200||i>200||o+i>300){return _.fastDiff(t,e,n,true)}let r,s;if(i<o){const n=t;t=e;e=n;r="delete";s="insert"}else{r="insert";s="delete"}const a=t.length;const c=e.length;const l=c-a;const d={};const u={};function h(o){const i=(u[o-1]!==undefined?u[o-1]:-1)+1;const l=u[o+1]!==undefined?u[o+1]:-1;const h=i>l?-1:1;if(d[o+h]){d[o]=d[o+h].slice(0)}if(!d[o]){d[o]=[]}d[o].push(i>l?r:s);let f=Math.max(i,l);let p=f-o;while(p<a&&f<c&&n(t[p],e[f])){p++;f++;d[o].push("equal")}return f}let f=0;let p;do{for(p=-f;p<l;p++){u[p]=h(p)}for(p=l+f;p>l;p--){u[p]=h(p)}u[l]=h(l);f++}while(u[l]!==c);return d[l].slice(1)}_.fastDiff=p;function v(){return function t(){t.called=true}}const A=v;class C{constructor(t,e){this.source=t;this.name=e;this.path=[];this.stop=A();this.off=A()}}const y=new Array(256).fill("").map(((t,e)=>("0"+e.toString(16)).slice(-2)));function x(){const t=Math.random()*4294967296>>>0;const e=Math.random()*4294967296>>>0;const n=Math.random()*4294967296>>>0;const o=Math.random()*4294967296>>>0;return"e"+y[t>>0&255]+y[t>>8&255]+y[t>>16&255]+y[t>>24&255]+y[e>>0&255]+y[e>>8&255]+y[e>>16&255]+y[e>>24&255]+y[n>>0&255]+y[n>>8&255]+y[n>>16&255]+y[n>>24&255]+y[o>>0&255]+y[o>>8&255]+y[o>>16&255]+y[o>>24&255]}const E={get(t="normal"){if(typeof t!="number"){return this[t]||this.normal}else{return t}},highest:1e5,high:1e3,normal:0,low:-1e3,lowest:-1e5};const S=E;function D(t,e){const n=S.get(e.priority);for(let o=0;o<t.length;o++){if(S.get(t[o].priority)<n){t.splice(o,0,e);return}}t.push(e)}const T="https://ckeditor.com/docs/ckeditor5/latest/support/error-codes.html";class P extends Error{constructor(t,e,n){super(O(t,n));this.name="CKEditorError";this.context=e;this.data=n}is(t){return t==="CKEditorError"}static rethrowUnexpectedError(t,e){if(t.is&&t.is("CKEditorError")){throw t}const n=new P(t.message,e);n.stack=t.stack;throw n}}function B(t,e){console.warn(...M(t,e))}function I(t,e){console.error(...M(t,e))}function R(t){return`\nRead more: ${T}#error-${t}`}function O(t,e){const n=new WeakSet;const o=(t,e)=>{if(typeof e==="object"&&e!==null){if(n.has(e)){return`[object ${e.constructor.name}]`}n.add(e)}return e};const i=e?` ${JSON.stringify(e,o)}`:"";const r=R(t);return t+i+r}function M(t,e){const n=R(t);return e?[t,e,n]:[t,n]}const V="39.0.2";const z=null&&V;const F=new Date(2023,8,6);if(globalThis.CKEDITOR_VERSION){throw new P("ckeditor-duplicated-modules",null)}else{globalThis.CKEDITOR_VERSION=V}const N=Symbol("listeningTo");const L=Symbol("emitterId");const H=Symbol("delegations");const j=q(Object);function q(t){if(!t){return j}class e extends t{on(t,e,n){this.listenTo(this,t,e,n)}once(t,e,n){let o=false;const i=(t,...n)=>{if(!o){o=true;t.off();e.call(this,t,...n)}};this.listenTo(this,t,i,n)}off(t,e){this.stopListening(this,t,e)}listenTo(t,e,n,o={}){let i,r;if(!this[N]){this[N]={}}const s=this[N];if(!G(t)){W(t)}const a=G(t);if(!(i=s[a])){i=s[a]={emitter:t,callbacks:{}}}if(!(r=i.callbacks[e])){r=i.callbacks[e]=[]}r.push(n);X(this,t,e,n,o)}stopListening(t,e,n){const o=this[N];let i=t&&G(t);const r=o&&i?o[i]:undefined;const s=r&&e?r.callbacks[e]:undefined;if(!o||t&&!r||e&&!s){return}if(n){tt(this,t,e,n);const o=s.indexOf(n);if(o!==-1){if(s.length===1){delete r.callbacks[e]}else{tt(this,t,e,n)}}}else if(s){while(n=s.pop()){tt(this,t,e,n)}delete r.callbacks[e]}else if(r){for(e in r.callbacks){this.stopListening(t,e)}delete o[i]}else{for(i in o){this.stopListening(o[i].emitter)}delete this[N]}}fire(t,...e){try{const n=t instanceof C?t:new C(this,t);const o=n.name;let i=Y(this,o);n.path.push(this);if(i){const t=[n,...e];i=Array.from(i);for(let e=0;e<i.length;e++){i[e].callback.apply(this,t);if(n.off.called){delete n.off.called;this._removeEventListener(o,i[e].callback)}if(n.stop.called){break}}}const r=this[H];if(r){const t=r.get(o);const i=r.get("*");if(t){Q(t,n,e)}if(i){Q(i,n,e)}}return n.return}catch(t){P.rethrowUnexpectedError(t,this)}}delegate(...t){return{to:(e,n)=>{if(!this[H]){this[H]=new Map}t.forEach((t=>{const o=this[H].get(t);if(!o){this[H].set(t,new Map([[e,n]]))}else{o.set(e,n)}}))}}}stopDelegating(t,e){if(!this[H]){return}if(!t){this[H].clear()}else if(!e){this[H].delete(t)}else{const n=this[H].get(t);if(n){n.delete(e)}}}_addEventListener(t,e,n){Z(this,t);const o=J(this,t);const i=S.get(n.priority);const r={callback:e,priority:i};for(const t of o){D(t,r)}}_removeEventListener(t,e){const n=J(this,t);for(const t of n){for(let n=0;n<t.length;n++){if(t[n].callback==e){t.splice(n,1);n--}}}}}return e}["on","once","off","listenTo","stopListening","fire","delegate","stopDelegating","_addEventListener","_removeEventListener"].forEach((t=>{q[t]=j.prototype[t]}));function $(t,e){const n=t[N];if(n&&n[e]){return n[e].emitter}return null}function W(t,e){if(!t[L]){t[L]=e||x()}}function G(t){return t[L]}function K(t){if(!t._events){Object.defineProperty(t,"_events",{value:{}})}return t._events}function U(){return{callbacks:[],childEvents:[]}}function Z(t,e){const n=K(t);if(n[e]){return}let o=e;let i=null;const r=[];while(o!==""){if(n[o]){break}n[o]=U();r.push(n[o]);if(i){n[o].childEvents.push(i)}i=o;o=o.substr(0,o.lastIndexOf(":"))}if(o!==""){for(const t of r){t.callbacks=n[o].callbacks.slice()}n[o].childEvents.push(i)}}function J(t,e){const n=K(t)[e];if(!n){return[]}let o=[n.callbacks];for(let e=0;e<n.childEvents.length;e++){const i=J(t,n.childEvents[e]);o=o.concat(i)}return o}function Y(t,e){let n;if(!t._events||!(n=t._events[e])||!n.callbacks.length){if(e.indexOf(":")>-1){return Y(t,e.substr(0,e.lastIndexOf(":")))}else{return null}}return n.callbacks}function Q(t,e,n){for(let[o,i]of t){if(!i){i=e.name}else if(typeof i=="function"){i=i(e.name)}const t=new C(e.source,i);t.path=[...e.path];o.fire(t,...n)}}function X(t,e,n,o,i){if(e._addEventListener){e._addEventListener(n,o,i)}else{t._addEventListener.call(e,n,o,i)}}function tt(t,e,n,o){if(e._removeEventListener){e._removeEventListener(n,o)}else{t._removeEventListener.call(e,n,o)}}function et(t){var e=typeof t;return t!=null&&(e=="object"||e=="function")}const nt=et;const ot=Symbol("observableProperties");const it=Symbol("boundObservables");const rt=Symbol("boundProperties");const st=Symbol("decoratedMethods");const at=Symbol("decoratedOriginal");const ct=lt(q());function lt(t){if(!t){return ct}class e extends t{set(t,e){if(nt(t)){Object.keys(t).forEach((e=>{this.set(e,t[e])}),this);return}dt(this);const n=this[ot];if(t in this&&!n.has(t)){throw new P("observable-set-cannot-override",this)}Object.defineProperty(this,t,{enumerable:true,configurable:true,get(){return n.get(t)},set(e){const o=n.get(t);let i=this.fire(`set:${t}`,t,e,o);if(i===undefined){i=e}if(o!==i||!n.has(t)){n.set(t,i);this.fire(`change:${t}`,t,i,o)}}});this[t]=e}bind(...t){if(!t.length||!pt(t)){throw new P("observable-bind-wrong-properties",this)}if(new Set(t).size!==t.length){throw new P("observable-bind-duplicate-properties",this)}dt(this);const e=this[rt];t.forEach((t=>{if(e.has(t)){throw new P("observable-bind-rebind",this)}}));const n=new Map;t.forEach((t=>{const o={property:t,to:[]};e.set(t,o);n.set(t,o)}));return{to:ut,toMany:ht,_observable:this,_bindProperties:t,_to:[],_bindings:n}}unbind(...t){if(!this[ot]){return}const e=this[rt];const n=this[it];if(t.length){if(!pt(t)){throw new P("observable-unbind-wrong-properties",this)}t.forEach((t=>{const o=e.get(t);if(!o){return}o.to.forEach((([t,e])=>{const i=n.get(t);const r=i[e];r.delete(o);if(!r.size){delete i[e]}if(!Object.keys(i).length){n.delete(t);this.stopListening(t,"change")}}));e.delete(t)}))}else{n.forEach(((t,e)=>{this.stopListening(e,"change")}));n.clear();e.clear()}}decorate(t){dt(this);const e=this[t];if(!e){throw new P("observablemixin-cannot-decorate-undefined",this,{object:this,methodName:t})}this.on(t,((t,n)=>{t.return=e.apply(this,n)}));this[t]=function(...e){return this.fire(t,e)};this[t][at]=e;if(!this[st]){this[st]=[]}this[st].push(t)}stopListening(t,e,n){if(!t&&this[st]){for(const t of this[st]){this[t]=this[t][at]}delete this[st]}super.stopListening(t,e,n)}}return e}["set","bind","unbind","decorate","on","once","off","listenTo","stopListening","fire","delegate","stopDelegating","_addEventListener","_removeEventListener"].forEach((t=>{lt[t]=ct.prototype[t]}));function dt(t){if(t[ot]){return}Object.defineProperty(t,ot,{value:new Map});Object.defineProperty(t,it,{value:new Map});Object.defineProperty(t,rt,{value:new Map})}function ut(...t){const e=gt(...t);const n=Array.from(this._bindings.keys());const o=n.length;if(!e.callback&&e.to.length>1){throw new P("observable-bind-to-no-callback",this)}if(o>1&&e.callback){throw new P("observable-bind-to-extra-callback",this)}e.to.forEach((t=>{if(t.properties.length&&t.properties.length!==o){throw new P("observable-bind-to-properties-length",this)}if(!t.properties.length){t.properties=this._bindProperties}}));this._to=e.to;if(e.callback){this._bindings.get(n[0]).callback=e.callback}wt(this._observable,this._to);bt(this);this._bindProperties.forEach((t=>{kt(this._observable,t)}))}function ht(t,e,n){if(this._bindings.size>1){throw new P("observable-bind-to-many-not-one-binding",this)}this.to(...ft(t,e),n)}function ft(t,e){const n=t.map((t=>[t,e]));return Array.prototype.concat.apply([],n)}function pt(t){return t.every((t=>typeof t=="string"))}function gt(...t){if(!t.length){throw new P("observable-bind-to-parse-error",null)}const e={to:[]};let n;if(typeof t[t.length-1]=="function"){e.callback=t.pop()}t.forEach((t=>{if(typeof t=="string"){n.properties.push(t)}else if(typeof t=="object"){n={observable:t,properties:[]};e.to.push(n)}else{throw new P("observable-bind-to-parse-error",null)}}));return e}function mt(t,e,n,o){const i=t[it];const r=i.get(n);const s=r||{};if(!s[o]){s[o]=new Set}s[o].add(e);if(!r){i.set(n,s)}}function bt(t){let e;t._bindings.forEach(((n,o)=>{t._to.forEach((i=>{e=i.properties[n.callback?0:t._bindProperties.indexOf(o)];n.to.push([i.observable,e]);mt(t._observable,n,i.observable,e)}))}))}function kt(t,e){const n=t[rt];const o=n.get(e);let i;if(o.callback){i=o.callback.apply(t,o.to.map((t=>t[0][t[1]])))}else{i=o.to[0];i=i[0][i[1]]}if(Object.prototype.hasOwnProperty.call(t,e)){t[e]=i}else{t.set(e,i)}}function wt(t,e){e.forEach((e=>{const n=t[it];let o;if(!n.get(e.observable)){t.listenTo(e.observable,"change",((i,r)=>{o=n.get(e.observable)[r];if(o){o.forEach((e=>{kt(t,e.property)}))}}))}}))}class _t{constructor(){this._replacedElements=[]}replace(t,e){this._replacedElements.push({element:t,newElement:e});t.style.display="none";if(e){t.parentNode.insertBefore(e,t.nextSibling)}}restore(){this._replacedElements.forEach((({element:t,newElement:e})=>{t.style.display="";if(e){e.remove()}}));this._replacedElements=[]}}function vt(t){let e=0;for(const n of t){e++}return e}function At(t,e){const n=Math.min(t.length,e.length);for(let o=0;o<n;o++){if(t[o]!=e[o]){return o}}if(t.length==e.length){return"same"}else if(t.length<e.length){return"prefix"}else{return"extension"}}function Ct(t){return!!(t&&t[Symbol.iterator])}var yt=typeof global=="object"&&global&&global.Object===Object&&global;const xt=yt;var Et=typeof self=="object"&&self&&self.Object===Object&&self;var St=xt||Et||Function("return this")();const Dt=St;var Tt=Dt.Symbol;const Pt=Tt;var Bt=Object.prototype;var It=Bt.hasOwnProperty;var Rt=Bt.toString;var Ot=Pt?Pt.toStringTag:undefined;function Mt(t){var e=It.call(t,Ot),n=t[Ot];try{t[Ot]=undefined;var o=true}catch(t){}var i=Rt.call(t);if(o){if(e){t[Ot]=n}else{delete t[Ot]}}return i}const Vt=Mt;var zt=Object.prototype;var Ft=zt.toString;function Nt(t){return Ft.call(t)}const Lt=Nt;var Ht="[object Null]",jt="[object Undefined]";var qt=Pt?Pt.toStringTag:undefined;function $t(t){if(t==null){return t===undefined?jt:Ht}return qt&&qt in Object(t)?Vt(t):Lt(t)}const Wt=$t;var Gt=Array.isArray;const Kt=Gt;function Ut(t){return t!=null&&typeof t=="object"}const Zt=Ut;var Jt="[object String]";function Yt(t){return typeof t=="string"||!Kt(t)&&Zt(t)&&Wt(t)==Jt}const Qt=Yt;function Xt(t,e,n={},o=[]){const i=n&&n.xmlns;const r=i?t.createElementNS(i,e):t.createElement(e);for(const t in n){r.setAttribute(t,n[t])}if(Qt(o)||!Ct(o)){o=[o]}for(let e of o){if(Qt(e)){e=t.createTextNode(e)}r.appendChild(e)}return r}function te(t,e){return function(n){return t(e(n))}}const ee=te;var ne=ee(Object.getPrototypeOf,Object);const oe=ne;var ie="[object Object]";var re=Function.prototype,se=Object.prototype;var ae=re.toString;var ce=se.hasOwnProperty;var le=ae.call(Object);function de(t){if(!Zt(t)||Wt(t)!=ie){return false}var e=oe(t);if(e===null){return true}var n=ce.call(e,"constructor")&&e.constructor;return typeof n=="function"&&n instanceof n&&ae.call(n)==le}const ue=de;function he(){this.__data__=[];this.size=0}const fe=he;function pe(t,e){return t===e||t!==t&&e!==e}const ge=pe;function me(t,e){var n=t.length;while(n--){if(ge(t[n][0],e)){return n}}return-1}const be=me;var ke=Array.prototype;var we=ke.splice;function _e(t){var e=this.__data__,n=be(e,t);if(n<0){return false}var o=e.length-1;if(n==o){e.pop()}else{we.call(e,n,1)}--this.size;return true}const ve=_e;function Ae(t){var e=this.__data__,n=be(e,t);return n<0?undefined:e[n][1]}const Ce=Ae;function ye(t){return be(this.__data__,t)>-1}const xe=ye;function Ee(t,e){var n=this.__data__,o=be(n,t);if(o<0){++this.size;n.push([t,e])}else{n[o][1]=e}return this}const Se=Ee;function De(t){var e=-1,n=t==null?0:t.length;this.clear();while(++e<n){var o=t[e];this.set(o[0],o[1])}}De.prototype.clear=fe;De.prototype["delete"]=ve;De.prototype.get=Ce;De.prototype.has=xe;De.prototype.set=Se;const Te=De;function Pe(){this.__data__=new Te;this.size=0}const Be=Pe;function Ie(t){var e=this.__data__,n=e["delete"](t);this.size=e.size;return n}const Re=Ie;function Oe(t){return this.__data__.get(t)}const Me=Oe;function Ve(t){return this.__data__.has(t)}const ze=Ve;var Fe="[object AsyncFunction]",Ne="[object Function]",Le="[object GeneratorFunction]",He="[object Proxy]";function je(t){if(!nt(t)){return false}var e=Wt(t);return e==Ne||e==Le||e==Fe||e==He}const qe=je;var $e=Dt["__core-js_shared__"];const We=$e;var Ge=function(){var t=/[^.]+$/.exec(We&&We.keys&&We.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();function Ke(t){return!!Ge&&Ge in t}const Ue=Ke;var Ze=Function.prototype;var Je=Ze.toString;function Ye(t){if(t!=null){try{return Je.call(t)}catch(t){}try{return t+""}catch(t){}}return""}const Qe=Ye;var Xe=/[\\^$.*+?()[\]{}|]/g;var tn=/^\[object .+?Constructor\]$/;var en=Function.prototype,nn=Object.prototype;var on=en.toString;var rn=nn.hasOwnProperty;var sn=RegExp("^"+on.call(rn).replace(Xe,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function an(t){if(!nt(t)||Ue(t)){return false}var e=qe(t)?sn:tn;return e.test(Qe(t))}const cn=an;function ln(t,e){return t==null?undefined:t[e]}const dn=ln;function un(t,e){var n=dn(t,e);return cn(n)?n:undefined}const hn=un;var fn=hn(Dt,"Map");const pn=fn;var gn=hn(Object,"create");const mn=gn;function bn(){this.__data__=mn?mn(null):{};this.size=0}const kn=bn;function wn(t){var e=this.has(t)&&delete this.__data__[t];this.size-=e?1:0;return e}const _n=wn;var vn="__lodash_hash_undefined__";var An=Object.prototype;var Cn=An.hasOwnProperty;function yn(t){var e=this.__data__;if(mn){var n=e[t];return n===vn?undefined:n}return Cn.call(e,t)?e[t]:undefined}const xn=yn;var En=Object.prototype;var Sn=En.hasOwnProperty;function Dn(t){var e=this.__data__;return mn?e[t]!==undefined:Sn.call(e,t)}const Tn=Dn;var Pn="__lodash_hash_undefined__";function Bn(t,e){var n=this.__data__;this.size+=this.has(t)?0:1;n[t]=mn&&e===undefined?Pn:e;return this}const In=Bn;function Rn(t){var e=-1,n=t==null?0:t.length;this.clear();while(++e<n){var o=t[e];this.set(o[0],o[1])}}Rn.prototype.clear=kn;Rn.prototype["delete"]=_n;Rn.prototype.get=xn;Rn.prototype.has=Tn;Rn.prototype.set=In;const On=Rn;function Mn(){this.size=0;this.__data__={hash:new On,map:new(pn||Te),string:new On}}const Vn=Mn;function zn(t){var e=typeof t;return e=="string"||e=="number"||e=="symbol"||e=="boolean"?t!=="__proto__":t===null}const Fn=zn;function Nn(t,e){var n=t.__data__;return Fn(e)?n[typeof e=="string"?"string":"hash"]:n.map}const Ln=Nn;function Hn(t){var e=Ln(this,t)["delete"](t);this.size-=e?1:0;return e}const jn=Hn;function qn(t){return Ln(this,t).get(t)}const $n=qn;function Wn(t){return Ln(this,t).has(t)}const Gn=Wn;function Kn(t,e){var n=Ln(this,t),o=n.size;n.set(t,e);this.size+=n.size==o?0:1;return this}const Un=Kn;function Zn(t){var e=-1,n=t==null?0:t.length;this.clear();while(++e<n){var o=t[e];this.set(o[0],o[1])}}Zn.prototype.clear=Vn;Zn.prototype["delete"]=jn;Zn.prototype.get=$n;Zn.prototype.has=Gn;Zn.prototype.set=Un;const Jn=Zn;var Yn=200;function Qn(t,e){var n=this.__data__;if(n instanceof Te){var o=n.__data__;if(!pn||o.length<Yn-1){o.push([t,e]);this.size=++n.size;return this}n=this.__data__=new Jn(o)}n.set(t,e);this.size=n.size;return this}const Xn=Qn;function to(t){var e=this.__data__=new Te(t);this.size=e.size}to.prototype.clear=Be;to.prototype["delete"]=Re;to.prototype.get=Me;to.prototype.has=ze;to.prototype.set=Xn;const eo=to;function no(t,e){var n=-1,o=t==null?0:t.length;while(++n<o){if(e(t[n],n,t)===false){break}}return t}const oo=no;var io=function(){try{var t=hn(Object,"defineProperty");t({},"",{});return t}catch(t){}}();const ro=io;function so(t,e,n){if(e=="__proto__"&&ro){ro(t,e,{configurable:true,enumerable:true,value:n,writable:true})}else{t[e]=n}}const ao=so;var co=Object.prototype;var lo=co.hasOwnProperty;function uo(t,e,n){var o=t[e];if(!(lo.call(t,e)&&ge(o,n))||n===undefined&&!(e in t)){ao(t,e,n)}}const ho=uo;function fo(t,e,n,o){var i=!n;n||(n={});var r=-1,s=e.length;while(++r<s){var a=e[r];var c=o?o(n[a],t[a],a,n,t):undefined;if(c===undefined){c=t[a]}if(i){ao(n,a,c)}else{ho(n,a,c)}}return n}const po=fo;function go(t,e){var n=-1,o=Array(t);while(++n<t){o[n]=e(n)}return o}const mo=go;var bo="[object Arguments]";function ko(t){return Zt(t)&&Wt(t)==bo}const wo=ko;var _o=Object.prototype;var vo=_o.hasOwnProperty;var Ao=_o.propertyIsEnumerable;var Co=wo(function(){return arguments}())?wo:function(t){return Zt(t)&&vo.call(t,"callee")&&!Ao.call(t,"callee")};const yo=Co;function xo(){return false}const Eo=xo;var So=typeof exports=="object"&&exports&&!exports.nodeType&&exports;var Do=So&&typeof module=="object"&&module&&!module.nodeType&&module;var To=Do&&Do.exports===So;var Po=To?Dt.Buffer:undefined;var Bo=Po?Po.isBuffer:undefined;var Io=Bo||Eo;const Ro=Io;var Oo=9007199254740991;var Mo=/^(?:0|[1-9]\d*)$/;function Vo(t,e){var n=typeof t;e=e==null?Oo:e;return!!e&&(n=="number"||n!="symbol"&&Mo.test(t))&&(t>-1&&t%1==0&&t<e)}const zo=Vo;var Fo=9007199254740991;function No(t){return typeof t=="number"&&t>-1&&t%1==0&&t<=Fo}const Lo=No;var Ho="[object Arguments]",jo="[object Array]",qo="[object Boolean]",$o="[object Date]",Wo="[object Error]",Go="[object Function]",Ko="[object Map]",Uo="[object Number]",Zo="[object Object]",Jo="[object RegExp]",Yo="[object Set]",Qo="[object String]",Xo="[object WeakMap]";var ti="[object ArrayBuffer]",ei="[object DataView]",ni="[object Float32Array]",oi="[object Float64Array]",ii="[object Int8Array]",ri="[object Int16Array]",si="[object Int32Array]",ai="[object Uint8Array]",ci="[object Uint8ClampedArray]",li="[object Uint16Array]",di="[object Uint32Array]";var ui={};ui[ni]=ui[oi]=ui[ii]=ui[ri]=ui[si]=ui[ai]=ui[ci]=ui[li]=ui[di]=true;ui[Ho]=ui[jo]=ui[ti]=ui[qo]=ui[ei]=ui[$o]=ui[Wo]=ui[Go]=ui[Ko]=ui[Uo]=ui[Zo]=ui[Jo]=ui[Yo]=ui[Qo]=ui[Xo]=false;function hi(t){return Zt(t)&&Lo(t.length)&&!!ui[Wt(t)]}const fi=hi;function pi(t){return function(e){return t(e)}}const gi=pi;var mi=typeof exports=="object"&&exports&&!exports.nodeType&&exports;var bi=mi&&typeof module=="object"&&module&&!module.nodeType&&module;var ki=bi&&bi.exports===mi;var wi=ki&&xt.process;var _i=function(){try{var t=bi&&bi.require&&bi.require("util").types;if(t){return t}return wi&&wi.binding&&wi.binding("util")}catch(t){}}();const vi=_i;var Ai=vi&&vi.isTypedArray;var Ci=Ai?gi(Ai):fi;const yi=Ci;var xi=Object.prototype;var Ei=xi.hasOwnProperty;function Si(t,e){var n=Kt(t),o=!n&&yo(t),i=!n&&!o&&Ro(t),r=!n&&!o&&!i&&yi(t),s=n||o||i||r,a=s?mo(t.length,String):[],c=a.length;for(var l in t){if((e||Ei.call(t,l))&&!(s&&(l=="length"||i&&(l=="offset"||l=="parent")||r&&(l=="buffer"||l=="byteLength"||l=="byteOffset")||zo(l,c)))){a.push(l)}}return a}const Di=Si;var Ti=Object.prototype;function Pi(t){var e=t&&t.constructor,n=typeof e=="function"&&e.prototype||Ti;return t===n}const Bi=Pi;var Ii=ee(Object.keys,Object);const Ri=Ii;var Oi=Object.prototype;var Mi=Oi.hasOwnProperty;function Vi(t){if(!Bi(t)){return Ri(t)}var e=[];for(var n in Object(t)){if(Mi.call(t,n)&&n!="constructor"){e.push(n)}}return e}const zi=Vi;function Fi(t){return t!=null&&Lo(t.length)&&!qe(t)}const Ni=Fi;function Li(t){return Ni(t)?Di(t):zi(t)}const Hi=Li;function ji(t,e){return t&&po(e,Hi(e),t)}const qi=ji;function $i(t){var e=[];if(t!=null){for(var n in Object(t)){e.push(n)}}return e}const Wi=$i;var Gi=Object.prototype;var Ki=Gi.hasOwnProperty;function Ui(t){if(!nt(t)){return Wi(t)}var e=Bi(t),n=[];for(var o in t){if(!(o=="constructor"&&(e||!Ki.call(t,o)))){n.push(o)}}return n}const Zi=Ui;function Ji(t){return Ni(t)?Di(t,true):Zi(t)}const Yi=Ji;function Qi(t,e){return t&&po(e,Yi(e),t)}const Xi=Qi;var tr=typeof exports=="object"&&exports&&!exports.nodeType&&exports;var er=tr&&typeof module=="object"&&module&&!module.nodeType&&module;var nr=er&&er.exports===tr;var or=nr?Dt.Buffer:undefined,ir=or?or.allocUnsafe:undefined;function rr(t,e){if(e){return t.slice()}var n=t.length,o=ir?ir(n):new t.constructor(n);t.copy(o);return o}const sr=rr;function ar(t,e){var n=-1,o=t.length;e||(e=Array(o));while(++n<o){e[n]=t[n]}return e}const cr=ar;function lr(t,e){var n=-1,o=t==null?0:t.length,i=0,r=[];while(++n<o){var s=t[n];if(e(s,n,t)){r[i++]=s}}return r}const dr=lr;function ur(){return[]}const hr=ur;var fr=Object.prototype;var pr=fr.propertyIsEnumerable;var gr=Object.getOwnPropertySymbols;var mr=!gr?hr:function(t){if(t==null){return[]}t=Object(t);return dr(gr(t),(function(e){return pr.call(t,e)}))};const br=mr;function kr(t,e){return po(t,br(t),e)}const wr=kr;function _r(t,e){var n=-1,o=e.length,i=t.length;while(++n<o){t[i+n]=e[n]}return t}const vr=_r;var Ar=Object.getOwnPropertySymbols;var Cr=!Ar?hr:function(t){var e=[];while(t){vr(e,br(t));t=oe(t)}return e};const yr=Cr;function xr(t,e){return po(t,yr(t),e)}const Er=xr;function Sr(t,e,n){var o=e(t);return Kt(t)?o:vr(o,n(t))}const Dr=Sr;function Tr(t){return Dr(t,Hi,br)}const Pr=Tr;function Br(t){return Dr(t,Yi,yr)}const Ir=Br;var Rr=hn(Dt,"DataView");const Or=Rr;var Mr=hn(Dt,"Promise");const Vr=Mr;var zr=hn(Dt,"Set");const Fr=zr;var Nr=hn(Dt,"WeakMap");const Lr=Nr;var Hr="[object Map]",jr="[object Object]",qr="[object Promise]",$r="[object Set]",Wr="[object WeakMap]";var Gr="[object DataView]";var Kr=Qe(Or),Ur=Qe(pn),Zr=Qe(Vr),Jr=Qe(Fr),Yr=Qe(Lr);var Qr=Wt;if(Or&&Qr(new Or(new ArrayBuffer(1)))!=Gr||pn&&Qr(new pn)!=Hr||Vr&&Qr(Vr.resolve())!=qr||Fr&&Qr(new Fr)!=$r||Lr&&Qr(new Lr)!=Wr){Qr=function(t){var e=Wt(t),n=e==jr?t.constructor:undefined,o=n?Qe(n):"";if(o){switch(o){case Kr:return Gr;case Ur:return Hr;case Zr:return qr;case Jr:return $r;case Yr:return Wr}}return e}}const Xr=Qr;var ts=Object.prototype;var es=ts.hasOwnProperty;function ns(t){var e=t.length,n=new t.constructor(e);if(e&&typeof t[0]=="string"&&es.call(t,"index")){n.index=t.index;n.input=t.input}return n}const os=ns;var is=Dt.Uint8Array;const rs=is;function ss(t){var e=new t.constructor(t.byteLength);new rs(e).set(new rs(t));return e}const as=ss;function cs(t,e){var n=e?as(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.byteLength)}const ls=cs;var ds=/\w*$/;function us(t){var e=new t.constructor(t.source,ds.exec(t));e.lastIndex=t.lastIndex;return e}const hs=us;var fs=Pt?Pt.prototype:undefined,ps=fs?fs.valueOf:undefined;function gs(t){return ps?Object(ps.call(t)):{}}const ms=gs;function bs(t,e){var n=e?as(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}const ks=bs;var ws="[object Boolean]",_s="[object Date]",vs="[object Map]",As="[object Number]",Cs="[object RegExp]",ys="[object Set]",xs="[object String]",Es="[object Symbol]";var Ss="[object ArrayBuffer]",Ds="[object DataView]",Ts="[object Float32Array]",Ps="[object Float64Array]",Bs="[object Int8Array]",Is="[object Int16Array]",Rs="[object Int32Array]",Os="[object Uint8Array]",Ms="[object Uint8ClampedArray]",Vs="[object Uint16Array]",zs="[object Uint32Array]";function Fs(t,e,n){var o=t.constructor;switch(e){case Ss:return as(t);case ws:case _s:return new o(+t);case Ds:return ls(t,n);case Ts:case Ps:case Bs:case Is:case Rs:case Os:case Ms:case Vs:case zs:return ks(t,n);case vs:return new o;case As:case xs:return new o(t);case Cs:return hs(t);case ys:return new o;case Es:return ms(t)}}const Ns=Fs;var Ls=Object.create;var Hs=function(){function t(){}return function(e){if(!nt(e)){return{}}if(Ls){return Ls(e)}t.prototype=e;var n=new t;t.prototype=undefined;return n}}();const js=Hs;function qs(t){return typeof t.constructor=="function"&&!Bi(t)?js(oe(t)):{}}const $s=qs;var Ws="[object Map]";function Gs(t){return Zt(t)&&Xr(t)==Ws}const Ks=Gs;var Us=vi&&vi.isMap;var Zs=Us?gi(Us):Ks;const Js=Zs;var Ys="[object Set]";function Qs(t){return Zt(t)&&Xr(t)==Ys}const Xs=Qs;var ta=vi&&vi.isSet;var ea=ta?gi(ta):Xs;const na=ea;var oa=1,ia=2,ra=4;var sa="[object Arguments]",aa="[object Array]",ca="[object Boolean]",la="[object Date]",da="[object Error]",ua="[object Function]",ha="[object GeneratorFunction]",fa="[object Map]",pa="[object Number]",ga="[object Object]",ma="[object RegExp]",ba="[object Set]",ka="[object String]",wa="[object Symbol]",_a="[object WeakMap]";var va="[object ArrayBuffer]",Aa="[object DataView]",Ca="[object Float32Array]",ya="[object Float64Array]",xa="[object Int8Array]",Ea="[object Int16Array]",Sa="[object Int32Array]",Da="[object Uint8Array]",Ta="[object Uint8ClampedArray]",Pa="[object Uint16Array]",Ba="[object Uint32Array]";var Ia={};Ia[sa]=Ia[aa]=Ia[va]=Ia[Aa]=Ia[ca]=Ia[la]=Ia[Ca]=Ia[ya]=Ia[xa]=Ia[Ea]=Ia[Sa]=Ia[fa]=Ia[pa]=Ia[ga]=Ia[ma]=Ia[ba]=Ia[ka]=Ia[wa]=Ia[Da]=Ia[Ta]=Ia[Pa]=Ia[Ba]=true;Ia[da]=Ia[ua]=Ia[_a]=false;function Ra(t,e,n,o,i,r){var s,a=e&oa,c=e&ia,l=e&ra;if(n){s=i?n(t,o,i,r):n(t)}if(s!==undefined){return s}if(!nt(t)){return t}var d=Kt(t);if(d){s=os(t);if(!a){return cr(t,s)}}else{var u=Xr(t),h=u==ua||u==ha;if(Ro(t)){return sr(t,a)}if(u==ga||u==sa||h&&!i){s=c||h?{}:$s(t);if(!a){return c?Er(t,Xi(s,t)):wr(t,qi(s,t))}}else{if(!Ia[u]){return i?t:{}}s=Ns(t,u,a)}}r||(r=new eo);var f=r.get(t);if(f){return f}r.set(t,s);if(na(t)){t.forEach((function(o){s.add(Ra(o,e,n,o,t,r))}))}else if(Js(t)){t.forEach((function(o,i){s.set(i,Ra(o,e,n,i,t,r))}))}var p=l?c?Ir:Pr:c?Yi:Hi;var g=d?undefined:p(t);oo(g||t,(function(o,i){if(g){i=o;o=t[i]}ho(s,i,Ra(o,e,n,i,t,r))}));return s}const Oa=Ra;var Ma=1,Va=4;function za(t,e){e=typeof e=="function"?e:undefined;return Oa(t,Ma|Va,e)}const Fa=za;function Na(t){return Zt(t)&&t.nodeType===1&&!ue(t)}const La=Na;class Ha{constructor(t,e){this._config={};if(e){this.define(ja(e))}if(t){this._setObjectToTarget(this._config,t)}}set(t,e){this._setToTarget(this._config,t,e)}define(t,e){const n=true;this._setToTarget(this._config,t,e,n)}get(t){return this._getFromSource(this._config,t)}*names(){for(const t of Object.keys(this._config)){yield t}}_setToTarget(t,e,n,o=false){if(ue(e)){this._setObjectToTarget(t,e,o);return}const i=e.split(".");e=i.pop();for(const e of i){if(!ue(t[e])){t[e]={}}t=t[e]}if(ue(n)){if(!ue(t[e])){t[e]={}}t=t[e];this._setObjectToTarget(t,n,o);return}if(o&&typeof t[e]!="undefined"){return}t[e]=n}_getFromSource(t,e){const n=e.split(".");e=n.pop();for(const e of n){if(!ue(t[e])){t=null;break}t=t[e]}return t?ja(t[e]):undefined}_setObjectToTarget(t,e,n){Object.keys(e).forEach((o=>{this._setToTarget(t,o,e[o],n)}))}}function ja(t){return Fa(t,qa)}function qa(t){return La(t)?t:undefined}function $a(t){if(t){if(t.defaultView){return t instanceof t.defaultView.Document}else if(t.ownerDocument&&t.ownerDocument.defaultView){return t instanceof t.ownerDocument.defaultView.Node}}return false}function Wa(t){const e=Object.prototype.toString.apply(t);if(e=="[object Window]"){return true}if(e=="[object global]"){return true}return false}const Ga=Ka(q());function Ka(t){if(!t){return Ga}class e extends t{listenTo(t,e,n,o={}){if($a(t)||Wa(t)){const i={capture:!!o.useCapture,passive:!!o.usePassive};const r=this._getProxyEmitter(t,i)||new Ua(t,i);this.listenTo(r,e,n,o)}else{super.listenTo(t,e,n,o)}}stopListening(t,e,n){if($a(t)||Wa(t)){const o=this._getAllProxyEmitters(t);for(const t of o){this.stopListening(t,e,n)}}else{super.stopListening(t,e,n)}}_getProxyEmitter(t,e){return $(this,Ja(t,e))}_getAllProxyEmitters(t){return[{capture:false,passive:false},{capture:false,passive:true},{capture:true,passive:false},{capture:true,passive:true}].map((e=>this._getProxyEmitter(t,e))).filter((t=>!!t))}}return e}["_getProxyEmitter","_getAllProxyEmitters","on","once","off","listenTo","stopListening","fire","delegate","stopDelegating","_addEventListener","_removeEventListener"].forEach((t=>{Ka[t]=Ga.prototype[t]}));class Ua extends(q()){constructor(t,e){super();W(this,Ja(t,e));this._domNode=t;this._options=e}attach(t){if(this._domListeners&&this._domListeners[t]){return}const e=this._createDomListener(t);this._domNode.addEventListener(t,e,this._options);if(!this._domListeners){this._domListeners={}}this._domListeners[t]=e}detach(t){let e;if(this._domListeners[t]&&(!(e=this._events[t])||!e.callbacks.length)){this._domListeners[t].removeListener()}}_addEventListener(t,e,n){this.attach(t);q().prototype._addEventListener.call(this,t,e,n)}_removeEventListener(t,e){q().prototype._removeEventListener.call(this,t,e);this.detach(t)}_createDomListener(t){const e=e=>{this.fire(t,e)};e.removeListener=()=>{this._domNode.removeEventListener(t,e,this._options);delete this._domListeners[t]};return e}}function Za(t){return t["data-ck-expando"]||(t["data-ck-expando"]=x())}function Ja(t,e){let n=Za(t);for(const t of Object.keys(e).sort()){if(e[t]){n+="-"+t}}return n}let Ya;try{Ya={window,document}}catch(t){Ya={window:{},document:{}}}const Qa=Ya;function Xa(t){let e=t.parentElement;if(!e){return null}while(e.tagName!="BODY"){const t=e.style.overflowY||Qa.window.getComputedStyle(e).overflowY;if(t==="auto"||t==="scroll"){break}e=e.parentElement;if(!e){return null}}return e}function tc(t){const e=[];let n=t;while(n&&n.nodeType!=Node.DOCUMENT_NODE){e.unshift(n);n=n.parentNode}return e}function ec(t){return Object.prototype.toString.apply(t)=="[object Range]"}function nc(t){const e=t.ownerDocument.defaultView.getComputedStyle(t);return{top:parseInt(e.borderTopWidth,10),right:parseInt(e.borderRightWidth,10),bottom:parseInt(e.borderBottomWidth,10),left:parseInt(e.borderLeftWidth,10)}}function oc(t){return Object.prototype.toString.call(t)=="[object Text]"}const ic=["top","right","bottom","left","width","height"];class rc{constructor(t){const e=ec(t);Object.defineProperty(this,"_source",{value:t._source||t,writable:true,enumerable:false});if(cc(t)||e){if(e){const e=rc.getDomRangeRects(t);sc(this,rc.getBoundingRect(e))}else{sc(this,t.getBoundingClientRect())}}else if(Wa(t)){const{innerWidth:e,innerHeight:n}=t;sc(this,{top:0,right:e,bottom:n,left:0,width:e,height:n})}else{sc(this,t)}}clone(){return new rc(this)}moveTo(t,e){this.top=e;this.right=t+this.width;this.bottom=e+this.height;this.left=t;return this}moveBy(t,e){this.top+=e;this.right+=t;this.left+=t;this.bottom+=e;return this}getIntersection(t){const e={top:Math.max(this.top,t.top),right:Math.min(this.right,t.right),bottom:Math.min(this.bottom,t.bottom),left:Math.max(this.left,t.left),width:0,height:0};e.width=e.right-e.left;e.height=e.bottom-e.top;if(e.width<0||e.height<0){return null}else{return new rc(e)}}getIntersectionArea(t){const e=this.getIntersection(t);if(e){return e.getArea()}else{return 0}}getArea(){return this.width*this.height}getVisible(){const t=this._source;let e=this.clone();if(ac(t)){return e}let n=t;let o=t.parentNode||t.commonAncestorContainer;let i;while(o&&!ac(o)){if(n instanceof HTMLElement&&lc(n)==="absolute"){i=n}if(i&&(lc(o)!=="relative"||dc(o)==="visible")){n=o;o=o.parentNode;continue}const t=new rc(o);const r=e.getIntersection(t);if(r){if(r.getArea()<e.getArea()){e=r}}else{return null}n=o;o=o.parentNode}return e}isEqual(t){for(const e of ic){if(this[e]!==t[e]){return false}}return true}contains(t){const e=this.getIntersection(t);return!!(e&&e.isEqual(t))}excludeScrollbarsAndBorders(){const t=this._source;let e,n,o;if(Wa(t)){e=t.innerWidth-t.document.documentElement.clientWidth;n=t.innerHeight-t.document.documentElement.clientHeight;o=t.getComputedStyle(t.document.documentElement).direction}else{const i=nc(t);e=t.offsetWidth-t.clientWidth-i.left-i.right;n=t.offsetHeight-t.clientHeight-i.top-i.bottom;o=t.ownerDocument.defaultView.getComputedStyle(t).direction;this.left+=i.left;this.top+=i.top;this.right-=i.right;this.bottom-=i.bottom;this.width=this.right-this.left;this.height=this.bottom-this.top}this.width-=e;if(o==="ltr"){this.right-=e}else{this.left+=e}this.height-=n;this.bottom-=n;return this}static getDomRangeRects(t){const e=[];const n=Array.from(t.getClientRects());if(n.length){for(const t of n){e.push(new rc(t))}}else{let n=t.startContainer;if(oc(n)){n=n.parentNode}const o=new rc(n.getBoundingClientRect());o.right=o.left;o.width=0;e.push(o)}return e}static getBoundingRect(t){const e={left:Number.POSITIVE_INFINITY,top:Number.POSITIVE_INFINITY,right:Number.NEGATIVE_INFINITY,bottom:Number.NEGATIVE_INFINITY,width:0,height:0};let n=0;for(const o of t){n++;e.left=Math.min(e.left,o.left);e.top=Math.min(e.top,o.top);e.right=Math.max(e.right,o.right);e.bottom=Math.max(e.bottom,o.bottom)}if(n==0){return null}e.width=e.right-e.left;e.height=e.bottom-e.top;return new rc(e)}}function sc(t,e){for(const n of ic){t[n]=e[n]}}function ac(t){if(!cc(t)){return false}return t===t.ownerDocument.body}function cc(t){return t!==null&&typeof t==="object"&&t.nodeType===1&&typeof t.getBoundingClientRect==="function"}function lc(t){return t.ownerDocument.defaultView.getComputedStyle(t).position}function dc(t){return t.ownerDocument.defaultView.getComputedStyle(t).overflow}function uc(t,e=0){const n=t.map((t=>{if(t instanceof Document){const t=new rc(Qa.window);t.top+=e;t.height-=e;return t}else{return new rc(t)}}));let o=n[0];for(const t of n.slice(1)){if(o){o=o.getIntersection(t)}}return o}function hc(t){const e=[];let n=Xa(t);while(n&&n!==Qa.document.body){e.push(n);n=Xa(n)}e.push(Qa.document);return e}function fc(t){if(t instanceof HTMLTextAreaElement){return t.value}return t.innerHTML}class pc{constructor(t,e){if(!pc._observerInstance){pc._createObserver()}this._element=t;this._callback=e;pc._addElementCallback(t,e);pc._observerInstance.observe(t)}get element(){return this._element}destroy(){pc._deleteElementCallback(this._element,this._callback)}static _addElementCallback(t,e){if(!pc._elementCallbacks){pc._elementCallbacks=new Map}let n=pc._elementCallbacks.get(t);if(!n){n=new Set;pc._elementCallbacks.set(t,n)}n.add(e)}static _deleteElementCallback(t,e){const n=pc._getElementCallbacks(t);if(n){n.delete(e);if(!n.size){pc._elementCallbacks.delete(t);pc._observerInstance.unobserve(t)}}if(pc._elementCallbacks&&!pc._elementCallbacks.size){pc._observerInstance=null;pc._elementCallbacks=null}}static _getElementCallbacks(t){if(!pc._elementCallbacks){return null}return pc._elementCallbacks.get(t)}static _createObserver(){pc._observerInstance=new Qa.window.ResizeObserver((t=>{for(const e of t){const t=pc._getElementCallbacks(e.target);if(t){for(const n of t){n(e)}}}}))}}pc._observerInstance=null;pc._elementCallbacks=null;function gc(t,e){if(t instanceof HTMLTextAreaElement){t.value=e}t.innerHTML=e}function mc(t){return e=>e+t}function bc(t){let e=0;while(t.previousSibling){t=t.previousSibling;e++}return e}function kc(t,e,n){t.insertBefore(n,t.childNodes[e]||null)}function wc(t){return t&&t.nodeType===Node.COMMENT_NODE}function _c(t){try{Qa.document.createAttribute(t)}catch(t){return false}return true}function vc(t){return!!(t&&t.getClientRects&&t.getClientRects().length)}function Ac(t){if(!t||!t.parentNode){return null}if(t.offsetParent===Qa.document.body){return null}return t.offsetParent}function Cc({element:t,target:e,positions:n,limiter:o,fitInViewport:i,viewportOffsetConfig:r}){if(qe(e)){e=e()}if(qe(o)){o=o()}const s=Ac(t);const a=new rc(t);const c=new rc(e);let l;const d=i&&yc(r)||null;const u={targetRect:c,elementRect:a,positionedElementAncestor:s,viewportRect:d};if(!o&&!i){l=new Dc(n[0],u)}else{const t=o&&new rc(o).getVisible();Object.assign(u,{limiterRect:t,viewportRect:d});l=xc(n,u)||new Dc(n[0],u)}return l}function yc(t){t=Object.assign({top:0,bottom:0,left:0,right:0},t);const e=new rc(Qa.window);e.top+=t.top;e.height-=t.top;e.bottom-=t.bottom;e.height-=t.bottom;return e}function xc(t,e){const{elementRect:n}=e;const o=n.getArea();const i=t.map((t=>new Dc(t,e))).filter((t=>!!t.name));let r=0;let s=null;for(const t of i){const{limiterIntersectionArea:e,viewportIntersectionArea:n}=t;if(e===o){return t}const i=n**2+e**2;if(i>r){r=i;s=t}}return s}function Ec(t,e){const n=Sc(new rc(e));const o=nc(e);let i=0;let r=0;i-=n.left;r-=n.top;i+=e.scrollLeft;r+=e.scrollTop;i-=o.left;r-=o.top;t.moveBy(i,r)}function Sc(t){const{scrollX:e,scrollY:n}=Qa.window;return t.clone().moveBy(e,n)}class Dc{constructor(t,e){const n=t(e.targetRect,e.elementRect,e.viewportRect);if(!n){return}const{left:o,top:i,name:r,config:s}=n;this.name=r;this.config=s;this._positioningFunctionCorrdinates={left:o,top:i};this._options=e}get left(){return this._absoluteRect.left}get top(){return this._absoluteRect.top}get limiterIntersectionArea(){const t=this._options.limiterRect;if(t){const e=this._options.viewportRect;if(e){const n=t.getIntersection(e);if(n){return n.getIntersectionArea(this._rect)}}else{return t.getIntersectionArea(this._rect)}}return 0}get viewportIntersectionArea(){const t=this._options.viewportRect;if(t){return t.getIntersectionArea(this._rect)}return 0}get _rect(){if(this._cachedRect){return this._cachedRect}this._cachedRect=this._options.elementRect.clone().moveTo(this._positioningFunctionCorrdinates.left,this._positioningFunctionCorrdinates.top);return this._cachedRect}get _absoluteRect(){if(this._cachedAbsoluteRect){return this._cachedAbsoluteRect}this._cachedAbsoluteRect=Sc(this._rect);if(this._options.positionedElementAncestor){Ec(this._cachedAbsoluteRect,this._options.positionedElementAncestor)}return this._cachedAbsoluteRect}}function Tc(t){const e=t.parentNode;if(e){e.removeChild(t)}}function Pc({target:t,viewportOffset:e=0,ancestorOffset:n=0,alignToTop:o,forceScroll:i}){const r=Fc(t);let s=r;let a=null;e=Hc(e);while(s){let c;if(s==r){c=Nc(t)}else{c=Nc(a)}Rc({parent:c,getRect:()=>Lc(t,s),alignToTop:o,ancestorOffset:n,forceScroll:i});const l=Lc(t,s);Ic({window:s,rect:l,viewportOffset:e,alignToTop:o,forceScroll:i});if(s.parent!=s){a=s.frameElement;s=s.parent;if(!a){return}}else{s=null}}}function Bc(t,e,n){const o=Nc(t);Rc({parent:o,getRect:()=>new Rect(t),ancestorOffset:e,limiterElement:n})}function Ic({window:t,rect:e,alignToTop:n,forceScroll:o,viewportOffset:i}){const r=e.clone().moveBy(0,i.bottom);const s=e.clone().moveBy(0,-i.top);const a=new rc(t).excludeScrollbarsAndBorders();const c=[s,r];const l=n&&o;const d=c.every((t=>a.contains(t)));let{scrollX:u,scrollY:h}=t;const f=u;const p=h;if(l){h-=a.top-e.top+i.top}else if(!d){if(Mc(s,a)){h-=a.top-e.top+i.top}else if(Oc(r,a)){if(n){h+=e.top-a.top-i.top}else{h+=e.bottom-a.bottom+i.bottom}}}if(!d){if(Vc(e,a)){u-=a.left-e.left+i.left}else if(zc(e,a)){u+=e.right-a.right+i.right}}if(u!=f||h!==p){t.scrollTo(u,h)}}function Rc({parent:t,getRect:e,alignToTop:n,forceScroll:o,ancestorOffset:i=0,limiterElement:r}){const s=Fc(t);const a=n&&o;let c,l,d;const u=r||s.document.body;while(t!=u){l=e();c=new rc(t).excludeScrollbarsAndBorders();d=c.contains(l);if(a){t.scrollTop-=c.top-l.top+i}else if(!d){if(Mc(l,c)){t.scrollTop-=c.top-l.top+i}else if(Oc(l,c)){if(n){t.scrollTop+=l.top-c.top-i}else{t.scrollTop+=l.bottom-c.bottom+i}}}if(!d){if(Vc(l,c)){t.scrollLeft-=c.left-l.left+i}else if(zc(l,c)){t.scrollLeft+=l.right-c.right+i}}t=t.parentNode}}function Oc(t,e){return t.bottom>e.bottom}function Mc(t,e){return t.top<e.top}function Vc(t,e){return t.left<e.left}function zc(t,e){return t.right>e.right}function Fc(t){if(ec(t)){return t.startContainer.ownerDocument.defaultView}else{return t.ownerDocument.defaultView}}function Nc(t){if(ec(t)){let e=t.commonAncestorContainer;if(oc(e)){e=e.parentNode}return e}else{return t.parentNode}}function Lc(t,e){const n=Fc(t);const o=new rc(t);if(n===e){return o}else{let t=n;while(t!=e){const e=t.frameElement;const n=new rc(e).excludeScrollbarsAndBorders();o.moveBy(n.left,n.top);t=t.parent}}return o}function Hc(t){if(typeof t==="number"){return{top:t,bottom:t,left:t,right:t}}return t}const jc={ctrl:"⌃",cmd:"⌘",alt:"⌥",shift:"⇧"};const qc={ctrl:"Ctrl+",alt:"Alt+",shift:"Shift+"};const $c=Xc();const Wc=Object.fromEntries(Object.entries($c).map((([t,e])=>[e,t.charAt(0).toUpperCase()+t.slice(1)])));function Gc(t){let e;if(typeof t=="string"){e=$c[t.toLowerCase()];if(!e){throw new P("keyboard-unknown-key",null,{key:t})}}else{e=t.keyCode+(t.altKey?$c.alt:0)+(t.ctrlKey?$c.ctrl:0)+(t.shiftKey?$c.shift:0)+(t.metaKey?$c.cmd:0)}return e}function Kc(t){if(typeof t=="string"){t=tl(t)}return t.map((t=>typeof t=="string"?Yc(t):t)).reduce(((t,e)=>e+t),0)}function Uc(t){let e=Kc(t);const n=Object.entries(r.isMac?jc:qc);const o=n.reduce(((t,[n,o])=>{if((e&$c[n])!=0){e&=~$c[n];t+=o}return t}),"");return o+(e?Wc[e]:"")}function Zc(t){return t==$c.arrowright||t==$c.arrowleft||t==$c.arrowup||t==$c.arrowdown}function Jc(t,e){const n=e==="ltr";switch(t){case $c.arrowleft:return n?"left":"right";case $c.arrowright:return n?"right":"left";case $c.arrowup:return"up";case $c.arrowdown:return"down"}}function Yc(t){if(t.endsWith("!")){return Gc(t.slice(0,-1))}const e=Gc(t);return r.isMac&&e==$c.ctrl?$c.cmd:e}function Qc(t,e){const n=Jc(t,e);return n==="down"||n==="right"}function Xc(){const t={arrowleft:37,arrowup:38,arrowright:39,arrowdown:40,backspace:8,delete:46,enter:13,space:32,esc:27,tab:9,ctrl:1114112,shift:2228224,alt:4456448,cmd:8912896};for(let e=65;e<=90;e++){const n=String.fromCharCode(e);t[n.toLowerCase()]=e}for(let e=48;e<=57;e++){t[e-48]=e}for(let e=112;e<=123;e++){t["f"+(e-111)]=e}for(const e of"`-=[];',./\\"){t[e]=e.charCodeAt(0)}return t}function tl(t){return t.split("+").map((t=>t.trim()))}function el(t){return Array.isArray(t)?t:[t]}if(!Qa.window.CKEDITOR_TRANSLATIONS){Qa.window.CKEDITOR_TRANSLATIONS={}}function nl(t,e,n){if(!global.window.CKEDITOR_TRANSLATIONS[t]){global.window.CKEDITOR_TRANSLATIONS[t]={}}const o=global.window.CKEDITOR_TRANSLATIONS[t];o.dictionary=o.dictionary||{};o.getPluralForm=n||o.getPluralForm;Object.assign(o.dictionary,e)}function ol(t,e,n=1){if(typeof n!=="number"){throw new P("translation-service-quantity-not-a-number",null,{quantity:n})}const o=sl();if(o===1){t=Object.keys(Qa.window.CKEDITOR_TRANSLATIONS)[0]}const i=e.id||e.string;if(o===0||!rl(t,i)){if(n!==1){return e.plural}return e.string}const r=Qa.window.CKEDITOR_TRANSLATIONS[t].dictionary;const s=Qa.window.CKEDITOR_TRANSLATIONS[t].getPluralForm||(t=>t===1?0:1);const a=r[i];if(typeof a==="string"){return a}const c=Number(s(n));return a[c]}function il(){global.window.CKEDITOR_TRANSLATIONS={}}function rl(t,e){return!!Qa.window.CKEDITOR_TRANSLATIONS[t]&&!!Qa.window.CKEDITOR_TRANSLATIONS[t].dictionary[e]}function sl(){return Object.keys(Qa.window.CKEDITOR_TRANSLATIONS).length}const al=["ar","ara","fa","per","fas","he","heb","ku","kur","ug","uig"];function cl(t){return al.includes(t)?"rtl":"ltr"}class ll{constructor({uiLanguage:t="en",contentLanguage:e}={}){this.uiLanguage=t;this.contentLanguage=e||this.uiLanguage;this.uiLanguageDirection=cl(this.uiLanguage);this.contentLanguageDirection=cl(this.contentLanguage);this.t=(t,e)=>this._t(t,e)}get language(){console.warn("locale-deprecated-language-property: "+"The Locale#language property has been deprecated and will be removed in the near future. "+"Please use #uiLanguage and #contentLanguage properties instead.");return this.uiLanguage}_t(t,e=[]){e=el(e);if(typeof t==="string"){t={string:t}}const n=!!t.plural;const o=n?e[0]:1;const i=ol(this.uiLanguage,t,o);return dl(i,e)}}function dl(t,e){return t.replace(/%(\d+)/g,((t,n)=>n<e.length?e[n]:t))}class ul extends(q()){constructor(t={},e={}){super();const n=Ct(t);if(!n){e=t}this._items=[];this._itemMap=new Map;this._idProperty=e.idProperty||"id";this._bindToExternalToInternalMap=new WeakMap;this._bindToInternalToExternalMap=new WeakMap;this._skippedIndexesFromExternal=[];if(n){for(const e of t){this._items.push(e);this._itemMap.set(this._getItemIdBeforeAdding(e),e)}}}get length(){return this._items.length}get first(){return this._items[0]||null}get last(){return this._items[this.length-1]||null}add(t,e){return this.addMany([t],e)}addMany(t,e){if(e===undefined){e=this._items.length}else if(e>this._items.length||e<0){throw new P("collection-add-item-invalid-index",this)}let n=0;for(const o of t){const t=this._getItemIdBeforeAdding(o);const i=e+n;this._items.splice(i,0,o);this._itemMap.set(t,o);this.fire("add",o,i);n++}this.fire("change",{added:t,removed:[],index:e});return this}get(t){let e;if(typeof t=="string"){e=this._itemMap.get(t)}else if(typeof t=="number"){e=this._items[t]}else{throw new P("collection-get-invalid-arg",this)}return e||null}has(t){if(typeof t=="string"){return this._itemMap.has(t)}else{const e=this._idProperty;const n=t[e];return n&&this._itemMap.has(n)}}getIndex(t){let e;if(typeof t=="string"){e=this._itemMap.get(t)}else{e=t}return e?this._items.indexOf(e):-1}remove(t){const[e,n]=this._remove(t);this.fire("change",{added:[],removed:[e],index:n});return e}map(t,e){return this._items.map(t,e)}find(t,e){return this._items.find(t,e)}filter(t,e){return this._items.filter(t,e)}clear(){if(this._bindToCollection){this.stopListening(this._bindToCollection);this._bindToCollection=null}const t=Array.from(this._items);while(this.length){this._remove(0)}this.fire("change",{added:[],removed:t,index:0})}bindTo(t){if(this._bindToCollection){throw new P("collection-bind-to-rebind",this)}this._bindToCollection=t;return{as:t=>{this._setUpBindToBinding((e=>new t(e)))},using:t=>{if(typeof t=="function"){this._setUpBindToBinding(t)}else{this._setUpBindToBinding((e=>e[t]))}}}}_setUpBindToBinding(t){const e=this._bindToCollection;const n=(n,o,i)=>{const r=e._bindToCollection==this;const s=e._bindToInternalToExternalMap.get(o);if(r&&s){this._bindToExternalToInternalMap.set(o,s);this._bindToInternalToExternalMap.set(s,o)}else{const n=t(o);if(!n){this._skippedIndexesFromExternal.push(i);return}let r=i;for(const t of this._skippedIndexesFromExternal){if(i>t){r--}}for(const t of e._skippedIndexesFromExternal){if(r>=t){r++}}this._bindToExternalToInternalMap.set(o,n);this._bindToInternalToExternalMap.set(n,o);this.add(n,r);for(let t=0;t<e._skippedIndexesFromExternal.length;t++){if(r<=e._skippedIndexesFromExternal[t]){e._skippedIndexesFromExternal[t]++}}}};for(const t of e){n(null,t,e.getIndex(t))}this.listenTo(e,"add",n);this.listenTo(e,"remove",((t,e,n)=>{const o=this._bindToExternalToInternalMap.get(e);if(o){this.remove(o)}this._skippedIndexesFromExternal=this._skippedIndexesFromExternal.reduce(((t,e)=>{if(n<e){t.push(e-1)}if(n>e){t.push(e)}return t}),[])}))}_getItemIdBeforeAdding(t){const e=this._idProperty;let n;if(e in t){n=t[e];if(typeof n!="string"){throw new P("collection-add-invalid-id",this)}if(this.get(n)){throw new P("collection-add-item-already-exists",this)}}else{t[e]=n=x()}return n}_remove(t){let e,n,o;let i=false;const r=this._idProperty;if(typeof t=="string"){n=t;o=this._itemMap.get(n);i=!o;if(o){e=this._items.indexOf(o)}}else if(typeof t=="number"){e=t;o=this._items[e];i=!o;if(o){n=o[r]}}else{o=t;n=o[r];e=this._items.indexOf(o);i=e==-1||!this._itemMap.get(n)}if(i){throw new P("collection-remove-404",this)}this._items.splice(e,1);this._itemMap.delete(n);const s=this._bindToInternalToExternalMap.get(o);this._bindToInternalToExternalMap.delete(o);this._bindToExternalToInternalMap.delete(s);this.fire("remove",o,e);return[o,e]}[Symbol.iterator](){return this._items[Symbol.iterator]()}}function hl(t){const e=t.next();if(e.done){return null}return e.value}class fl extends(Ka(lt())){constructor(){super();this._elements=new Set;this._nextEventLoopTimeout=null;this.set("isFocused",false);this.set("focusedElement",null)}add(t){if(this._elements.has(t)){throw new P("focustracker-add-element-already-exist",this)}this.listenTo(t,"focus",(()=>this._focus(t)),{useCapture:true});this.listenTo(t,"blur",(()=>this._blur()),{useCapture:true});this._elements.add(t)}remove(t){if(t===this.focusedElement){this._blur()}if(this._elements.has(t)){this.stopListening(t);this._elements.delete(t)}}destroy(){this.stopListening()}_focus(t){clearTimeout(this._nextEventLoopTimeout);this.focusedElement=t;this.isFocused=true}_blur(){clearTimeout(this._nextEventLoopTimeout);this._nextEventLoopTimeout=setTimeout((()=>{this.focusedElement=null;this.isFocused=false}),0)}}class pl{constructor(){this._listener=new(Ka())}listenTo(t){this._listener.listenTo(t,"keydown",((t,e)=>{this._listener.fire("_keydown:"+Gc(e),e)}))}set(t,e,n={}){const o=Kc(t);const i=n.priority;this._listener.listenTo(this._listener,"_keydown:"+o,((t,n)=>{e(n,(()=>{n.preventDefault();n.stopPropagation();t.stop()}));t.return=true}),{priority:i})}press(t){return!!this._listener.fire("_keydown:"+Gc(t),t)}stopListening(t){this._listener.stopListening(t)}destroy(){this.stopListening()}}function gl(t){const e=new Map;for(const n in t){e.set(n,t[n])}return e}function ml(t){if(Ct(t)){return new Map(t)}else{return gl(t)}}const bl=1e4;function kl(t,e,n,o){if(Math.max(e.length,t.length)>bl){return t.slice(0,n).concat(e).concat(t.slice(n+o,t.length))}else{const i=Array.from(t);i.splice(n,o,...e);return i}}function wl(t,e){let n;function o(...i){o.cancel();n=setTimeout((()=>t(...i)),e)}o.cancel=()=>{clearTimeout(n)};return o}function _l(t){function e(t){if(t.length>=40&&t.length<=255){return"VALID"}else{return"INVALID"}}if(!t){return"INVALID"}let n="";try{n=atob(t)}catch(t){return"INVALID"}const o=n.split("-");const i=o[0];const r=o[1];if(!r){return e(t)}try{atob(r)}catch(n){try{atob(i);if(!atob(i).length){return e(t)}}catch(n){return e(t)}}if(i.length<40||i.length>255){return"INVALID"}let s="";try{atob(i);s=atob(r)}catch(t){return"INVALID"}if(s.length!==8){return"INVALID"}const a=Number(s.substring(0,4));const c=Number(s.substring(4,6))-1;const l=Number(s.substring(6,8));const d=new Date(a,c,l);if(d<F||isNaN(Number(d))){return"INVALID"}return"VALID"}function vl(t){return!!t&&t.length==1&&/[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/.test(t)}function Al(t){return!!t&&t.length==1&&/[\ud800-\udbff]/.test(t)}function Cl(t){return!!t&&t.length==1&&/[\udc00-\udfff]/.test(t)}function yl(t,e){return Al(t.charAt(e-1))&&Cl(t.charAt(e))}function xl(t,e){return vl(t.charAt(e))}const El=Dl();function Sl(t,e){const n=String(t).matchAll(El);return Array.from(n).some((t=>t.index<e&&e<t.index+t[0].length))}function Dl(){const t=[/\p{Emoji}[\u{E0020}-\u{E007E}]+\u{E007F}/u,/\p{Emoji}\u{FE0F}?\u{20E3}/u,/\p{Emoji}\u{FE0F}/u,/(?=\p{General_Category=Other_Symbol})\p{Emoji}\p{Emoji_Modifier}*/u];const e=/\p{Regional_Indicator}{2}/u.source;const n="(?:"+t.map((t=>t.source)).join("|")+")";const o=`${e}|${n}(?:‍${n})*`;return new RegExp(o,"ug")}class Tl extends ul{constructor(t=[]){super(t,{idProperty:"viewUid"});this.on("add",((t,e,n)=>{this._renderViewIntoCollectionParent(e,n)}));this.on("remove",((t,e)=>{if(e.element&&this._parentElement){e.element.remove()}}));this._parentElement=null}destroy(){this.map((t=>t.destroy()))}setParent(t){this._parentElement=t;for(const t of this){this._renderViewIntoCollectionParent(t)}}delegate(...t){if(!t.length||!Pl(t)){throw new P("ui-viewcollection-delegate-wrong-events",this)}return{to:e=>{for(const n of this){for(const o of t){n.delegate(o).to(e)}}this.on("add",((n,o)=>{for(const n of t){o.delegate(n).to(e)}}));this.on("remove",((n,o)=>{for(const n of t){o.stopDelegating(n,e)}}))}}}_renderViewIntoCollectionParent(t,e){if(!t.isRendered){t.render()}if(t.element&&this._parentElement){this._parentElement.insertBefore(t.element,this._parentElement.children[e])}}remove(t){return super.remove(t)}}function Pl(t){return t.every((t=>typeof t=="string"))}var Bl=n(379);var Il=n.n(Bl);var Rl=n(167);var Ol={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Ol.insert="head";Ol.singleton=true;var Ml=Il()(Rl.Z,Ol);const Vl=Rl.Z.locals||{};class zl extends(Ka(lt())){constructor(t){super();this.element=null;this.isRendered=false;this.locale=t;this.t=t&&t.t;this._viewCollections=new ul;this._unboundChildren=this.createCollection();this._viewCollections.on("add",((e,n)=>{n.locale=t;n.t=t&&t.t}));this.decorate("render")}get bindTemplate(){if(this._bindTemplate){return this._bindTemplate}return this._bindTemplate=Nl.bind(this,this)}createCollection(t){const e=new Tl(t);this._viewCollections.add(e);return e}registerChild(t){if(!Ct(t)){t=[t]}for(const e of t){this._unboundChildren.add(e)}}deregisterChild(t){if(!Ct(t)){t=[t]}for(const e of t){this._unboundChildren.remove(e)}}setTemplate(t){this.template=new Nl(t)}extendTemplate(t){Nl.extend(this.template,t)}render(){if(this.isRendered){throw new P("ui-view-render-already-rendered",this)}if(this.template){this.element=this.template.render();this.registerChild(this.template.getViews())}this.isRendered=true}destroy(){this.stopListening();this._viewCollections.map((t=>t.destroy()));if(this.template&&this.template._revertData){this.template.revert(this.element)}}}const Fl="http://www.w3.org/1999/xhtml";class Nl extends(q()){constructor(t){super();Object.assign(this,Jl(Zl(t)));this._isRendered=false;this._revertData=null}render(){const t=this._renderNode({intoFragment:true});this._isRendered=true;return t}apply(t){this._revertData=dd();this._renderNode({node:t,intoFragment:false,isApplying:true,revertData:this._revertData});return t}revert(t){if(!this._revertData){throw new P("ui-template-revert-not-applied",[this,t])}this._revertTemplateFromNode(t,this._revertData)}*getViews(){function*t(e){if(e.children){for(const n of e.children){if(sd(n)){yield n}else if(ad(n)){yield*t(n)}}}}yield*t(this)}static bind(t,e){return{to(n,o){return new Hl({eventNameOrFunction:n,attribute:n,observable:t,emitter:e,callback:o})},if(n,o,i){return new jl({observable:t,emitter:e,attribute:n,valueIfTrue:o,callback:i})}}}static extend(t,e){if(t._isRendered){throw new P("template-extend-render",[this,t])}id(t,Jl(Zl(e)))}_renderNode(t){let e;if(t.node){e=this.tag&&this.text}else{e=this.tag?this.text:!this.text}if(e){throw new P("ui-template-wrong-syntax",this)}if(this.text){return this._renderText(t)}else{return this._renderElement(t)}}_renderElement(t){let e=t.node;if(!e){e=t.node=document.createElementNS(this.ns||Fl,this.tag)}this._renderAttributes(t);this._renderElementChildren(t);this._setUpListeners(t);return e}_renderText(t){let e=t.node;if(e){t.revertData.text=e.textContent}else{e=t.node=document.createTextNode("")}if(ql(this.text)){this._bindToObservable({schema:this.text,updater:Gl(e),data:t})}else{e.textContent=this.text.join("")}return e}_renderAttributes(t){if(!this.attributes){return}const e=t.node;const n=t.revertData;for(const o in this.attributes){const i=e.getAttribute(o);const r=this.attributes[o];if(n){n.attributes[o]=i}const s=ld(r)?r[0].ns:null;if(ql(r)){const a=ld(r)?r[0].value:r;if(n&&ud(o)){a.unshift(i)}this._bindToObservable({schema:a,updater:Kl(e,o,s),data:t})}else if(o=="style"&&typeof r[0]!=="string"){this._renderStyleAttribute(r[0],t)}else{if(n&&i&&ud(o)){r.unshift(i)}const t=r.map((t=>t?t.value||t:t)).reduce(((t,e)=>t.concat(e)),[]).reduce(nd,"");if(!rd(t)){e.setAttributeNS(s,o,t)}}}}_renderStyleAttribute(t,e){const n=e.node;for(const o in t){const i=t[o];if(ql(i)){this._bindToObservable({schema:[i],updater:Ul(n,o),data:e})}else{n.style[o]=i}}}_renderElementChildren(t){const e=t.node;const n=t.intoFragment?document.createDocumentFragment():e;const o=t.isApplying;let i=0;for(const r of this.children){if(cd(r)){if(!o){r.setParent(e);for(const t of r){n.appendChild(t.element)}}}else if(sd(r)){if(!o){if(!r.isRendered){r.render()}n.appendChild(r.element)}}else if($a(r)){n.appendChild(r)}else{if(o){const e=t.revertData;const o=dd();e.children.push(o);r._renderNode({intoFragment:false,node:n.childNodes[i++],isApplying:true,revertData:o})}else{n.appendChild(r.render())}}}if(t.intoFragment){e.appendChild(n)}}_setUpListeners(t){if(!this.eventListeners){return}for(const e in this.eventListeners){const n=this.eventListeners[e].map((n=>{const[o,i]=e.split("@");return n.activateDomEventListener(o,i,t)}));if(t.revertData){t.revertData.bindings.push(n)}}}_bindToObservable({schema:t,updater:e,data:n}){const o=n.revertData;Wl(t,e,n);const i=t.filter((t=>!rd(t))).filter((t=>t.observable)).map((o=>o.activateAttributeListener(t,e,n)));if(o){o.bindings.push(i)}}_revertTemplateFromNode(t,e){for(const t of e.bindings){for(const e of t){e()}}if(e.text){t.textContent=e.text;return}const n=t;for(const t in e.attributes){const o=e.attributes[t];if(o===null){n.removeAttribute(t)}else{n.setAttribute(t,o)}}for(let t=0;t<e.children.length;++t){this._revertTemplateFromNode(n.childNodes[t],e.children[t])}}}class Ll{constructor(t){this.attribute=t.attribute;this.observable=t.observable;this.emitter=t.emitter;this.callback=t.callback}getValue(t){const e=this.observable[this.attribute];return this.callback?this.callback(e,t):e}activateAttributeListener(t,e,n){const o=()=>Wl(t,e,n);this.emitter.listenTo(this.observable,`change:${this.attribute}`,o);return()=>{this.emitter.stopListening(this.observable,`change:${this.attribute}`,o)}}}class Hl extends Ll{constructor(t){super(t);this.eventNameOrFunction=t.eventNameOrFunction}activateDomEventListener(t,e,n){const o=(t,n)=>{if(!e||n.target.matches(e)){if(typeof this.eventNameOrFunction=="function"){this.eventNameOrFunction(n)}else{this.observable.fire(this.eventNameOrFunction,n)}}};this.emitter.listenTo(n.node,t,o);return()=>{this.emitter.stopListening(n.node,t,o)}}}class jl extends Ll{constructor(t){super(t);this.valueIfTrue=t.valueIfTrue}getValue(t){const e=super.getValue(t);return rd(e)?false:this.valueIfTrue||true}}function ql(t){if(!t){return false}if(t.value){t=t.value}if(Array.isArray(t)){return t.some(ql)}else if(t instanceof Ll){return true}return false}function $l(t,e){return t.map((t=>{if(t instanceof Ll){return t.getValue(e)}return t}))}function Wl(t,e,{node:n}){const o=$l(t,n);let i;if(t.length==1&&t[0]instanceof jl){i=o[0]}else{i=o.reduce(nd,"")}if(rd(i)){e.remove()}else{e.set(i)}}function Gl(t){return{set(e){t.textContent=e},remove(){t.textContent=""}}}function Kl(t,e,n){return{set(o){t.setAttributeNS(n,e,o)},remove(){t.removeAttributeNS(n,e)}}}function Ul(t,e){return{set(n){t.style[e]=n},remove(){t.style[e]=null}}}function Zl(t){const e=Fa(t,(t=>{if(t&&(t instanceof Ll||ad(t)||sd(t)||cd(t))){return t}}));return e}function Jl(t){if(typeof t=="string"){t=Xl(t)}else if(t.text){td(t)}if(t.on){t.eventListeners=Ql(t.on);delete t.on}if(!t.text){if(t.attributes){Yl(t.attributes)}const e=[];if(t.children){if(cd(t.children)){e.push(t.children)}else{for(const n of t.children){if(ad(n)||sd(n)||$a(n)){e.push(n)}else{e.push(new Nl(n))}}}}t.children=e}return t}function Yl(t){for(const e in t){if(t[e].value){t[e].value=el(t[e].value)}ed(t,e)}}function Ql(t){for(const e in t){ed(t,e)}return t}function Xl(t){return{text:[t]}}function td(t){t.text=el(t.text)}function ed(t,e){t[e]=el(t[e])}function nd(t,e){if(rd(e)){return t}else if(rd(t)){return e}else{return`${t} ${e}`}}function od(t,e){for(const n in e){if(t[n]){t[n].push(...e[n])}else{t[n]=e[n]}}}function id(t,e){if(e.attributes){if(!t.attributes){t.attributes={}}od(t.attributes,e.attributes)}if(e.eventListeners){if(!t.eventListeners){t.eventListeners={}}od(t.eventListeners,e.eventListeners)}if(e.text){t.text.push(...e.text)}if(e.children&&e.children.length){if(t.children.length!=e.children.length){throw new P("ui-template-extend-children-mismatch",t)}let n=0;for(const o of e.children){id(t.children[n++],o)}}}function rd(t){return!t&&t!==0}function sd(t){return t instanceof zl}function ad(t){return t instanceof Nl}function cd(t){return t instanceof Tl}function ld(t){return nt(t[0])&&t[0].ns}function dd(){return{children:[],bindings:[],attributes:{}}}function ud(t){return t=="class"||t=="style"}class hd extends Tl{constructor(t,e=[]){super(e);this.locale=t}get bodyCollectionContainer(){return this._bodyCollectionContainer}attachToDom(){this._bodyCollectionContainer=new Nl({tag:"div",attributes:{class:["ck","ck-reset_all","ck-body","ck-rounded-corners"],dir:this.locale.uiLanguageDirection},children:this}).render();let t=document.querySelector(".ck-body-wrapper");if(!t){t=Xt(document,"div",{class:"ck-body-wrapper"});document.body.appendChild(t)}t.appendChild(this._bodyCollectionContainer)}detachFromDom(){super.destroy();if(this._bodyCollectionContainer){this._bodyCollectionContainer.remove()}const t=document.querySelector(".ck-body-wrapper");if(t&&t.childElementCount==0){t.remove()}}}var fd=n(977);var pd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};pd.insert="head";pd.singleton=true;var gd=Il()(fd.Z,pd);const md=fd.Z.locals||{};class bd extends zl{constructor(){super();const t=this.bindTemplate;this.set("content","");this.set("viewBox","0 0 20 20");this.set("fillColor","");this.set("isColorInherited",true);this.setTemplate({tag:"svg",ns:"http://www.w3.org/2000/svg",attributes:{class:["ck","ck-icon","ck-reset_all-excluded",t.if("isColorInherited","ck-icon_inherit-color")],viewBox:t.to("viewBox")}})}render(){super.render();this._updateXMLContent();this._colorFillPaths();this.on("change:content",(()=>{this._updateXMLContent();this._colorFillPaths()}));this.on("change:fillColor",(()=>{this._colorFillPaths()}))}_updateXMLContent(){if(this.content){const t=(new DOMParser).parseFromString(this.content.trim(),"image/svg+xml");const e=t.querySelector("svg");const n=e.getAttribute("viewBox");if(n){this.viewBox=n}for(const{name:t,value:n}of Array.from(e.attributes)){if(bd.presentationalAttributeNames.includes(t)){this.element.setAttribute(t,n)}}while(this.element.firstChild){this.element.removeChild(this.element.firstChild)}while(e.childNodes.length>0){this.element.appendChild(e.childNodes[0])}}}_colorFillPaths(){if(this.fillColor){this.element.querySelectorAll(".ck-icon__fill").forEach((t=>{t.style.fill=this.fillColor}))}}}bd.presentationalAttributeNames=["alignment-baseline","baseline-shift","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-rendering","cursor","direction","display","dominant-baseline","fill","fill-opacity","fill-rule","filter","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","image-rendering","letter-spacing","lighting-color","marker-end","marker-mid","marker-start","mask","opacity","overflow","paint-order","pointer-events","shape-rendering","stop-color","stop-opacity","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-anchor","text-decoration","text-overflow","text-rendering","transform","unicode-bidi","vector-effect","visibility","white-space","word-spacing","writing-mode"];var kd=n(971);var wd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};wd.insert="head";wd.singleton=true;var _d=Il()(kd.Z,wd);const vd=kd.Z.locals||{};class Ad extends zl{constructor(t){super(t);this._focusDelayed=null;const e=this.bindTemplate;const n=x();this.set("ariaChecked",undefined);this.set("ariaLabel",undefined);this.set("ariaLabelledBy",`ck-editor__aria-label_${n}`);this.set("class",undefined);this.set("labelStyle",undefined);this.set("icon",undefined);this.set("isEnabled",true);this.set("isOn",false);this.set("isVisible",true);this.set("isToggleable",false);this.set("keystroke",undefined);this.set("label",undefined);this.set("role",undefined);this.set("tabindex",-1);this.set("tooltip",false);this.set("tooltipPosition","s");this.set("type","button");this.set("withText",false);this.set("withKeystroke",false);this.children=this.createCollection();this.labelView=this._createLabelView();this.iconView=new bd;this.iconView.extendTemplate({attributes:{class:"ck-button__icon"}});this.keystrokeView=this._createKeystrokeView();this.bind("_tooltipString").to(this,"tooltip",this,"label",this,"keystroke",this._getTooltipString.bind(this));const o={tag:"button",attributes:{class:["ck","ck-button",e.to("class"),e.if("isEnabled","ck-disabled",(t=>!t)),e.if("isVisible","ck-hidden",(t=>!t)),e.to("isOn",(t=>t?"ck-on":"ck-off")),e.if("withText","ck-button_with-text"),e.if("withKeystroke","ck-button_with-keystroke")],role:e.to("role"),type:e.to("type",(t=>t?t:"button")),tabindex:e.to("tabindex"),"aria-label":e.to("ariaLabel"),"aria-labelledby":e.to("ariaLabelledBy"),"aria-disabled":e.if("isEnabled",true,(t=>!t)),"aria-checked":e.to("isOn"),"aria-pressed":e.to("isOn",(t=>this.isToggleable?String(!!t):false)),"data-cke-tooltip-text":e.to("_tooltipString"),"data-cke-tooltip-position":e.to("tooltipPosition")},children:this.children,on:{click:e.to((t=>{if(this.isEnabled){this.fire("execute")}else{t.preventDefault()}}))}};if(r.isSafari){if(!this._focusDelayed){this._focusDelayed=wl((()=>this.focus()),0)}o.on.mousedown=e.to((()=>{this._focusDelayed()}));o.on.mouseup=e.to((()=>{this._focusDelayed.cancel()}))}this.setTemplate(o)}render(){super.render();if(this.icon){this.iconView.bind("content").to(this,"icon");this.children.add(this.iconView)}this.children.add(this.labelView);if(this.withKeystroke&&this.keystroke){this.children.add(this.keystrokeView)}}focus(){this.element.focus()}destroy(){if(this._focusDelayed){this._focusDelayed.cancel()}super.destroy()}_createLabelView(){const t=new zl;const e=this.bindTemplate;t.setTemplate({tag:"span",attributes:{class:["ck","ck-button__label"],style:e.to("labelStyle"),id:this.ariaLabelledBy},children:[{text:e.to("label")}]});return t}_createKeystrokeView(){const t=new zl;t.setTemplate({tag:"span",attributes:{class:["ck","ck-button__keystroke"]},children:[{text:this.bindTemplate.to("keystroke",(t=>Uc(t)))}]});return t}_getTooltipString(t,e,n){if(t){if(typeof t=="string"){return t}else{if(n){n=Uc(n)}if(t instanceof Function){return t(e,n)}else{return`${e}${n?` (${n})`:""}`}}}return""}}var Cd=n(258);var yd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};yd.insert="head";yd.singleton=true;var xd=Il()(Cd.Z,yd);const Ed=Cd.Z.locals||{};class Sd extends Ad{constructor(t){super(t);this.isToggleable=true;this.toggleSwitchView=this._createToggleView();this.extendTemplate({attributes:{class:"ck-switchbutton"}})}render(){super.render();this.children.add(this.toggleSwitchView)}_createToggleView(){const t=new zl;t.setTemplate({tag:"span",attributes:{class:["ck","ck-button__toggle"]},children:[{tag:"span",attributes:{class:["ck","ck-button__toggle__inner"]}}]});return t}}class Dd extends(null&&ButtonView){constructor(t){super(t);const e=this.bindTemplate;this.set("color",undefined);this.set("hasBorder",false);this.icon=checkIcon;this.extendTemplate({attributes:{style:{backgroundColor:e.to("color")},class:["ck","ck-color-grid__tile",e.if("hasBorder","ck-color-selector__color-tile_bordered")]}})}render(){super.render();this.iconView.fillColor="hsl(0, 0%, 100%)"}}var Td=n(923);var Pd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Pd.insert="head";Pd.singleton=true;var Bd=Il()(Td.Z,Pd);const Id=Td.Z.locals||{};class Rd extends(null&&View){constructor(t,e){super(t);const n=e&&e.colorDefinitions?e.colorDefinitions:[];this.columns=e&&e.columns?e.columns:5;const o={gridTemplateColumns:`repeat( ${this.columns}, 1fr)`};this.set("selectedColor",undefined);this.items=this.createCollection();this.focusTracker=new FocusTracker;this.keystrokes=new KeystrokeHandler;this.items.on("add",((t,e)=>{e.isOn=e.color===this.selectedColor}));n.forEach((t=>{const e=new ColorTileView;e.set({color:t.color,label:t.label,tooltip:true,hasBorder:t.options.hasBorder});e.on("execute",(()=>{this.fire("execute",{value:t.color,hasBorder:t.options.hasBorder,label:t.label})}));this.items.add(e)}));this.setTemplate({tag:"div",children:this.items,attributes:{class:["ck","ck-color-grid"],style:o}});this.on("change:selectedColor",((t,e,n)=>{for(const t of this.items){t.isOn=t.color===n}}))}focus(){if(this.items.length){this.items.first.focus()}}focusLast(){if(this.items.length){this.items.last.focus()}}render(){super.render();for(const t of this.items){this.focusTracker.add(t.element)}this.items.on("add",((t,e)=>{this.focusTracker.add(e.element)}));this.items.on("remove",((t,e)=>{this.focusTracker.remove(e.element)}));this.keystrokes.listenTo(this.element);addKeyboardHandlingForGrid({keystrokeHandler:this.keystrokes,focusTracker:this.focusTracker,gridItems:this.items,numberOfColumns:this.columns,uiLanguageDirection:this.locale&&this.locale.uiLanguageDirection})}destroy(){super.destroy();this.focusTracker.destroy();this.keystrokes.destroy()}}var Od=n(874);const Md=null&&zd;var Vd={red:0,orange:60,yellow:120,green:180,blue:240,purple:300};function zd(t){var e,n=[],o=1,i;if(typeof t==="string"){if(names[t]){n=names[t].slice();i="rgb"}else if(t==="transparent"){o=0;i="rgb";n=[0,0,0]}else if(/^#[A-Fa-f0-9]+$/.test(t)){var r=t.slice(1);var s=r.length;var a=s<=4;o=1;if(a){n=[parseInt(r[0]+r[0],16),parseInt(r[1]+r[1],16),parseInt(r[2]+r[2],16)];if(s===4){o=parseInt(r[3]+r[3],16)/255}}else{n=[parseInt(r[0]+r[1],16),parseInt(r[2]+r[3],16),parseInt(r[4]+r[5],16)];if(s===8){o=parseInt(r[6]+r[7],16)/255}}if(!n[0])n[0]=0;if(!n[1])n[1]=0;if(!n[2])n[2]=0;i="rgb"}else if(e=/^((?:rgb|hs[lvb]|hwb|cmyk?|xy[zy]|gray|lab|lchu?v?|[ly]uv|lms)a?)\s*\(([^\)]*)\)/.exec(t)){var c=e[1];var l=c==="rgb";var r=c.replace(/a$/,"");i=r;var s=r==="cmyk"?4:r==="gray"?1:3;n=e[2].trim().split(/\s*[,\/]\s*|\s+/).map((function(t,e){if(/%$/.test(t)){if(e===s)return parseFloat(t)/100;if(r==="rgb")return parseFloat(t)*255/100;return parseFloat(t)}else if(r[e]==="h"){if(/deg$/.test(t)){return parseFloat(t)}else if(Vd[t]!==undefined){return Vd[t]}}return parseFloat(t)}));if(c===r)n.push(1);o=l?1:n[s]===undefined?1:n[s];n=n.slice(0,s)}else if(t.length>10&&/[0-9](?:\s|\/)/.test(t)){n=t.match(/([0-9]+)/g).map((function(t){return parseFloat(t)}));i=t.match(/([a-z])/gi).join("").toLowerCase()}}else if(!isNaN(t)){i="rgb";n=[t>>>16,(t&65280)>>>8,t&255]}else if(Array.isArray(t)||t.length){n=[t[0],t[1],t[2]];i="rgb";o=t.length===4?t[3]:1}else if(t instanceof Object){if(t.r!=null||t.red!=null||t.R!=null){i="rgb";n=[t.r||t.red||t.R||0,t.g||t.green||t.G||0,t.b||t.blue||t.B||0]}else{i="hsl";n=[t.h||t.hue||t.H||0,t.s||t.saturation||t.S||0,t.l||t.lightness||t.L||t.b||t.brightness]}o=t.a||t.alpha||t.opacity||1;if(t.opacity!=null)o/=100}return{space:i,values:n,alpha:o}}var Fd=n(85);function Nd(t,e){if(!t){return""}const n=jd(t);if(!n){return""}if(n.space===e){return t}if(!qd(n)){return""}const o=convert[n.space];const i=o[e];if(!i){return""}const r=i(n.space==="hex"?n.hexValue:n.values);return Hd(r,e)}function Ld(t){if(!t){return""}const e=jd(t);if(!e){return"#000"}if(e.space==="hex"){return e.hexValue}return Nd(t,"hex")}function Hd(t,e){switch(e){case"hex":return`#${t}`;case"rgb":return`rgb( ${t[0]}, ${t[1]}, ${t[2]} )`;case"hsl":return`hsl( ${t[0]}, ${t[1]}%, ${t[2]}% )`;case"hwb":return`hwb( ${t[0]}, ${t[1]}, ${t[2]} )`;case"lab":return`lab( ${t[0]}% ${t[1]} ${t[2]} )`;case"lch":return`lch( ${t[0]}% ${t[1]} ${t[2]} )`;default:return""}}function jd(t){if(t.startsWith("#")){const e=parse(t);return{space:"hex",values:e.values,hexValue:t,alpha:e.alpha}}const e=parse(t);if(!e.space){return null}return e}function qd(t){return Object.keys(convert).includes(t.space)}var $d=n(525);var Wd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Wd.insert="head";Wd.singleton=true;var Gd=Il()($d.Z,Wd);const Kd=$d.Z.locals||{};class Ud extends zl{constructor(t){super(t);this.set("text",undefined);this.set("for",undefined);this.id=`ck-editor__label_${x()}`;const e=this.bindTemplate;this.setTemplate({tag:"label",attributes:{class:["ck","ck-label"],id:this.id,for:e.to("for")},children:[{text:e.to("text")}]})}}var Zd=n(933);var Jd={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Jd.insert="head";Jd.singleton=true;var Yd=Il()(Zd.Z,Jd);const Qd=Zd.Z.locals||{};class Xd extends(null&&View){constructor(t,e){super(t);const n=`ck-labeled-field-view-${uid()}`;const o=`ck-labeled-field-view-status-${uid()}`;this.fieldView=e(this,n,o);this.set("label",undefined);this.set("isEnabled",true);this.set("isEmpty",true);this.set("isFocused",false);this.set("errorText",null);this.set("infoText",null);this.set("class",undefined);this.set("placeholder",undefined);this.labelView=this._createLabelView(n);this.statusView=this._createStatusView(o);this.fieldWrapperChildren=this.createCollection([this.fieldView,this.labelView]);this.bind("_statusText").to(this,"errorText",this,"infoText",((t,e)=>t||e));const i=this.bindTemplate;this.setTemplate({tag:"div",attributes:{class:["ck","ck-labeled-field-view",i.to("class"),i.if("isEnabled","ck-disabled",(t=>!t)),i.if("isEmpty","ck-labeled-field-view_empty"),i.if("isFocused","ck-labeled-field-view_focused"),i.if("placeholder","ck-labeled-field-view_placeholder"),i.if("errorText","ck-error")]},children:[{tag:"div",attributes:{class:["ck","ck-labeled-field-view__input-wrapper"]},children:this.fieldWrapperChildren},this.statusView]})}_createLabelView(t){const e=new LabelView(this.locale);e.for=t;e.bind("text").to(this,"label");return e}_createStatusView(t){const e=new View(this.locale);const n=this.bindTemplate;e.setTemplate({tag:"div",attributes:{class:["ck","ck-labeled-field-view__status",n.if("errorText","ck-labeled-field-view__status_error"),n.if("_statusText","ck-hidden",(t=>!t))],id:t,role:n.if("errorText","alert")},children:[{text:n.to("_statusText")}]});return e}focus(){this.fieldView.focus()}}var tu=n(470);var eu={injectType:"singletonStyleTag",attributes:{"data-cke":true}};eu.insert="head";eu.singleton=true;var nu=Il()(tu.Z,eu);const ou=tu.Z.locals||{};class iu extends(null&&View){constructor(t){super(t);this.set("value",undefined);this.set("id",undefined);this.set("placeholder",undefined);this.set("isReadOnly",false);this.set("hasError",false);this.set("ariaDescribedById",undefined);this.focusTracker=new FocusTracker;this.bind("isFocused").to(this.focusTracker);this.set("isEmpty",true);this.set("inputMode","text");const e=this.bindTemplate;this.setTemplate({tag:"input",attributes:{class:["ck","ck-input",e.if("isFocused","ck-input_focused"),e.if("isEmpty","ck-input-text_empty"),e.if("hasError","ck-error")],id:e.to("id"),placeholder:e.to("placeholder"),readonly:e.to("isReadOnly"),inputmode:e.to("inputMode"),"aria-invalid":e.if("hasError",true),"aria-describedby":e.to("ariaDescribedById")},on:{input:e.to(((...t)=>{this.fire("input",...t);this._updateIsEmpty()})),change:e.to(this._updateIsEmpty.bind(this))}})}render(){super.render();this.focusTracker.add(this.element);this._setDomElementValue(this.value);this._updateIsEmpty();this.on("change:value",((t,e,n)=>{this._setDomElementValue(n);this._updateIsEmpty()}))}destroy(){super.destroy();this.focusTracker.destroy()}select(){this.element.select()}focus(){this.element.focus()}_updateIsEmpty(){this.isEmpty=ru(this.element)}_setDomElementValue(t){this.element.value=!t&&t!==0?"":t}}function ru(t){return!t.value}class su extends(null&&InputView){constructor(t){super(t);this.extendTemplate({attributes:{type:"text",class:["ck-input-text"]}})}}class au extends(null&&InputView){constructor(t,{min:e,max:n,step:o}={}){super(t);const i=this.bindTemplate;this.set("min",e);this.set("max",n);this.set("step",o);this.extendTemplate({attributes:{type:"number",class:["ck-input-number"],min:i.to("min"),max:i.to("max"),step:i.to("step")}})}}class cu extends zl{constructor(t){super(t);const e=this.bindTemplate;this.set("isVisible",false);this.set("position","se");this.children=this.createCollection();this.setTemplate({tag:"div",attributes:{class:["ck","ck-reset","ck-dropdown__panel",e.to("position",(t=>`ck-dropdown__panel_${t}`)),e.if("isVisible","ck-dropdown__panel-visible")],tabindex:"-1"},children:this.children,on:{selectstart:e.to((t=>{if(t.target.tagName.toLocaleLowerCase()==="input"){return}t.preventDefault()}))}})}focus(){if(this.children.length){const t=this.children.first;if(typeof t.focus==="function"){t.focus()}else{B("ui-dropdown-panel-focus-child-missing-focus",{childView:this.children.first,dropdownPanel:this})}}}focusLast(){if(this.children.length){const t=this.children.last;if(typeof t.focusLast==="function"){t.focusLast()}else{t.focus()}}}}var lu=n(62);var du={injectType:"singletonStyleTag",attributes:{"data-cke":true}};du.insert="head";du.singleton=true;var uu=Il()(lu.Z,du);const hu=lu.Z.locals||{};class fu extends zl{constructor(t,e,n){super(t);const o=this.bindTemplate;this.buttonView=e;this.panelView=n;this.set("isOpen",false);this.set("isEnabled",true);this.set("class",undefined);this.set("id",undefined);this.set("panelPosition","auto");this.keystrokes=new pl;this.focusTracker=new fl;this.setTemplate({tag:"div",attributes:{class:["ck","ck-dropdown",o.to("class"),o.if("isEnabled","ck-disabled",(t=>!t))],id:o.to("id"),"aria-describedby":o.to("ariaDescribedById")},children:[e,n]});e.extendTemplate({attributes:{class:["ck-dropdown__button"],"data-cke-tooltip-disabled":o.to("isOpen")}})}render(){super.render();this.focusTracker.add(this.buttonView.element);this.focusTracker.add(this.panelView.element);this.listenTo(this.buttonView,"open",(()=>{this.isOpen=!this.isOpen}));this.panelView.bind("isVisible").to(this,"isOpen");this.on("change:isOpen",((t,e,n)=>{if(!n){return}if(this.panelPosition==="auto"){this.panelView.position=fu._getOptimalPosition({element:this.panelView.element,target:this.buttonView.element,fitInViewport:true,positions:this._panelPositions}).name}else{this.panelView.position=this.panelPosition}}));this.keystrokes.listenTo(this.element);const t=(t,e)=>{if(this.isOpen){this.isOpen=false;e()}};this.keystrokes.set("arrowdown",((t,e)=>{if(this.buttonView.isEnabled&&!this.isOpen){this.isOpen=true;e()}}));this.keystrokes.set("arrowright",((t,e)=>{if(this.isOpen){e()}}));this.keystrokes.set("arrowleft",t);this.keystrokes.set("esc",t)}focus(){this.buttonView.focus()}get _panelPositions(){const{south:t,north:e,southEast:n,southWest:o,northEast:i,northWest:r,southMiddleEast:s,southMiddleWest:a,northMiddleEast:c,northMiddleWest:l}=fu.defaultPanelPositions;if(this.locale.uiLanguageDirection!=="rtl"){return[n,o,s,a,t,i,r,c,l,e]}else{return[o,n,a,s,t,r,i,l,c,e]}}}fu.defaultPanelPositions={south:(t,e)=>({top:t.bottom,left:t.left-(e.width-t.width)/2,name:"s"}),southEast:t=>({top:t.bottom,left:t.left,name:"se"}),southWest:(t,e)=>({top:t.bottom,left:t.left-e.width+t.width,name:"sw"}),southMiddleEast:(t,e)=>({top:t.bottom,left:t.left-(e.width-t.width)/4,name:"sme"}),southMiddleWest:(t,e)=>({top:t.bottom,left:t.left-(e.width-t.width)*3/4,name:"smw"}),north:(t,e)=>({top:t.top-e.height,left:t.left-(e.width-t.width)/2,name:"n"}),northEast:(t,e)=>({top:t.top-e.height,left:t.left,name:"ne"}),northWest:(t,e)=>({top:t.top-e.height,left:t.left-e.width+t.width,name:"nw"}),northMiddleEast:(t,e)=>({top:t.top-e.height,left:t.left-(e.width-t.width)/4,name:"nme"}),northMiddleWest:(t,e)=>({top:t.top-e.height,left:t.left-(e.width-t.width)*3/4,name:"nmw"})};fu._getOptimalPosition=Cc;const pu='<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg"><path d="M.941 4.523a.75.75 0 1 1 1.06-1.06l3.006 3.005 3.005-3.005a.75.75 0 1 1 1.06 1.06l-3.549 3.55a.75.75 0 0 1-1.168-.136L.941 4.523z"/></svg>';class gu extends Ad{constructor(t){super(t);this.arrowView=this._createArrowView();this.extendTemplate({attributes:{"aria-haspopup":true,"aria-expanded":this.bindTemplate.to("isOn",(t=>String(t)))}});this.delegate("execute").to(this,"open")}render(){super.render();this.children.add(this.arrowView)}_createArrowView(){const t=new bd;t.content=pu;t.extendTemplate({attributes:{class:"ck-dropdown__arrow"}});return t}}class mu{constructor(t){this.focusables=t.focusables;this.focusTracker=t.focusTracker;this.keystrokeHandler=t.keystrokeHandler;this.actions=t.actions;if(t.actions&&t.keystrokeHandler){for(const e in t.actions){let n=t.actions[e];if(typeof n=="string"){n=[n]}for(const o of n){t.keystrokeHandler.set(o,((t,n)=>{this[e]();n()}))}}}}get first(){return this.focusables.find(bu)||null}get last(){return this.focusables.filter(bu).slice(-1)[0]||null}get next(){return this._getFocusableItem(1)}get previous(){return this._getFocusableItem(-1)}get current(){let t=null;if(this.focusTracker.focusedElement===null){return null}this.focusables.find(((e,n)=>{const o=e.element===this.focusTracker.focusedElement;if(o){t=n}return o}));return t}focusFirst(){this._focus(this.first)}focusLast(){this._focus(this.last)}focusNext(){this._focus(this.next)}focusPrevious(){this._focus(this.previous)}_focus(t){if(t){t.focus()}}_getFocusableItem(t){const e=this.current;const n=this.focusables.length;if(!n){return null}if(e===null){return this[t===1?"first":"last"]}let o=(e+n+t)%n;do{const e=this.focusables.get(o);if(bu(e)){return e}o=(o+n+t)%n}while(o!==e);return null}}function bu(t){return!!(t.focus&&vc(t.element))}class ku extends zl{constructor(t){super(t);this.setTemplate({tag:"span",attributes:{class:["ck","ck-toolbar__separator"]}})}}class wu extends zl{constructor(t){super(t);this.setTemplate({tag:"span",attributes:{class:["ck","ck-toolbar__line-break"]}})}}function _u(t){return t.bindTemplate.to((e=>{if(e.target===t.element){e.preventDefault()}}))}function vu(t){if(Array.isArray(t)){return{items:t,removeItems:[]}}if(!t){return{items:[],removeItems:[]}}return Object.assign({items:[],removeItems:[]},t)}class Au extends(lt()){constructor(t){super();this._disableStack=new Set;this.editor=t;this.set("isEnabled",true)}forceDisabled(t){this._disableStack.add(t);if(this._disableStack.size==1){this.on("set:isEnabled",Cu,{priority:"highest"});this.isEnabled=false}}clearForceDisabled(t){this._disableStack.delete(t);if(this._disableStack.size==0){this.off("set:isEnabled",Cu);this.isEnabled=true}}destroy(){this.stopListening()}static get isContextPlugin(){return false}}function Cu(t){t.return=false;t.stop()}class yu extends(lt()){constructor(t){super();this.editor=t;this.set("value",undefined);this.set("isEnabled",false);this._affectsData=true;this._isEnabledBasedOnSelection=true;this._disableStack=new Set;this.decorate("execute");this.listenTo(this.editor.model.document,"change",(()=>{this.refresh()}));this.listenTo(t,"change:isReadOnly",(()=>{this.refresh()}));this.on("set:isEnabled",(e=>{if(!this.affectsData){return}const n=t.model.document.selection;const o=n.getFirstPosition().root.rootName=="$graveyard";const i=!o&&t.model.canEditAt(n);if(t.isReadOnly||this._isEnabledBasedOnSelection&&!i){e.return=false;e.stop()}}),{priority:"highest"});this.on("execute",(t=>{if(!this.isEnabled){t.stop()}}),{priority:"high"})}get affectsData(){return this._affectsData}set affectsData(t){this._affectsData=t}refresh(){this.isEnabled=true}forceDisabled(t){this._disableStack.add(t);if(this._disableStack.size==1){this.on("set:isEnabled",xu,{priority:"highest"});this.isEnabled=false}}clearForceDisabled(t){this._disableStack.delete(t);if(this._disableStack.size==0){this.off("set:isEnabled",xu);this.refresh()}}execute(...t){return undefined}destroy(){this.stopListening()}}function xu(t){t.return=false;t.stop()}class Eu extends(null&&Command){constructor(){super(...arguments);this._childCommandsDefinitions=[]}refresh(){}execute(...t){const e=this._getFirstEnabledCommand();return!!e&&e.execute(t)}registerChildCommand(t,e={}){insertToPriorityArray(this._childCommandsDefinitions,{command:t,priority:e.priority||"normal"});t.on("change:isEnabled",(()=>this._checkEnabled()));this._checkEnabled()}_checkEnabled(){this.isEnabled=!!this._getFirstEnabledCommand()}_getFirstEnabledCommand(){const t=this._childCommandsDefinitions.find((({command:t})=>t.isEnabled));return t&&t.command}}class Su extends(q()){constructor(t,e=[],n=[]){super();this._plugins=new Map;this._context=t;this._availablePlugins=new Map;for(const t of e){if(t.pluginName){this._availablePlugins.set(t.pluginName,t)}}this._contextPlugins=new Map;for(const[t,e]of n){this._contextPlugins.set(t,e);this._contextPlugins.set(e,t);if(t.pluginName){this._availablePlugins.set(t.pluginName,t)}}}*[Symbol.iterator](){for(const t of this._plugins){if(typeof t[0]=="function"){yield t}}}get(t){const e=this._plugins.get(t);if(!e){let e=t;if(typeof t=="function"){e=t.pluginName||t.name}throw new P("plugincollection-plugin-not-loaded",this._context,{plugin:e})}return e}has(t){return this._plugins.has(t)}init(t,e=[],n=[]){const o=this;const i=this._context;h(t);p(t);const r=t.filter((t=>!d(t,e)));const s=[...f(r)];_(s,n);const a=k(s);return w(a,"init").then((()=>w(a,"afterInit"))).then((()=>a));function c(t){return typeof t==="function"}function l(t){return c(t)&&!!t.isContextPlugin}function d(t,e){return e.some((e=>{if(e===t){return true}if(u(t)===e){return true}if(u(e)===t){return true}return false}))}function u(t){return c(t)?t.pluginName||t.name:t}function h(t,e=new Set){t.forEach((t=>{if(!c(t)){return}if(e.has(t)){return}e.add(t);if(t.pluginName&&!o._availablePlugins.has(t.pluginName)){o._availablePlugins.set(t.pluginName,t)}if(t.requires){h(t.requires,e)}}))}function f(t,e=new Set){return t.map((t=>c(t)?t:o._availablePlugins.get(t))).reduce(((t,n)=>{if(e.has(n)){return t}e.add(n);if(n.requires){p(n.requires,n);f(n.requires,e).forEach((e=>t.add(e)))}return t.add(n)}),new Set)}function p(t,e=null){t.map((t=>c(t)?t:o._availablePlugins.get(t)||t)).forEach((t=>{g(t,e);m(t,e);b(t,e)}))}function g(t,e){if(c(t)){return}if(e){throw new P("plugincollection-soft-required",i,{missingPlugin:t,requiredBy:u(e)})}throw new P("plugincollection-plugin-not-found",i,{plugin:t})}function m(t,e){if(!l(e)){return}if(l(t)){return}throw new P("plugincollection-context-required",i,{plugin:u(t),requiredBy:u(e)})}function b(t,n){if(!n){return}if(!d(t,e)){return}throw new P("plugincollection-required",i,{plugin:u(t),requiredBy:u(n)})}function k(t){return t.map((t=>{let e=o._contextPlugins.get(t);e=e||new t(i);o._add(t,e);return e}))}function w(t,e){return t.reduce(((t,n)=>{if(!n[e]){return t}if(o._contextPlugins.has(n)){return t}return t.then(n[e].bind(n))}),Promise.resolve())}function _(t,e){for(const n of e){if(typeof n!="function"){throw new P("plugincollection-replace-plugin-invalid-type",null,{pluginItem:n})}const e=n.pluginName;if(!e){throw new P("plugincollection-replace-plugin-missing-name",null,{pluginItem:n})}if(n.requires&&n.requires.length){throw new P("plugincollection-plugin-for-replacing-cannot-have-dependencies",null,{pluginName:e})}const i=o._availablePlugins.get(e);if(!i){throw new P("plugincollection-plugin-for-replacing-not-exist",null,{pluginName:e})}const r=t.indexOf(i);if(r===-1){if(o._contextPlugins.has(i)){return}throw new P("plugincollection-plugin-for-replacing-not-loaded",null,{pluginName:e})}if(i.requires&&i.requires.length){throw new P("plugincollection-replaced-plugin-cannot-have-dependencies",null,{pluginName:e})}t.splice(r,1,n);o._availablePlugins.set(e,n)}}}destroy(){const t=[];for(const[,e]of this){if(typeof e.destroy=="function"&&!this._contextPlugins.has(e)){t.push(e.destroy())}}return Promise.all(t)}_add(t,e){this._plugins.set(t,e);const n=t.pluginName;if(!n){return}if(this._plugins.has(n)){throw new P("plugincollection-plugin-name-conflict",null,{pluginName:n,plugin1:this._plugins.get(n).constructor,plugin2:t})}this._plugins.set(n,e)}}class Du{constructor(t){this._contextOwner=null;this.config=new Ha(t,this.constructor.defaultConfig);const e=this.constructor.builtinPlugins;this.config.define("plugins",e);this.plugins=new Su(this,e);const n=this.config.get("language")||{};this.locale=new ll({uiLanguage:typeof n==="string"?n:n.ui,contentLanguage:this.config.get("language.content")});this.t=this.locale.t;this.editors=new ul}initPlugins(){const t=this.config.get("plugins")||[];const e=this.config.get("substitutePlugins")||[];for(const n of t.concat(e)){if(typeof n!="function"){throw new P("context-initplugins-constructor-only",null,{Plugin:n})}if(n.isContextPlugin!==true){throw new P("context-initplugins-invalid-plugin",null,{Plugin:n})}}return this.plugins.init(t,[],e)}destroy(){return Promise.all(Array.from(this.editors,(t=>t.destroy()))).then((()=>this.plugins.destroy()))}_addEditor(t,e){if(this._contextOwner){throw new P("context-addeditor-private-context")}this.editors.add(t);if(e){this._contextOwner=t}}_removeEditor(t){if(this.editors.has(t)){this.editors.remove(t)}if(this._contextOwner===t){return this.destroy()}return Promise.resolve()}_getEditorConfig(){const t={};for(const e of this.config.names()){if(!["plugins","removePlugins","extraPlugins"].includes(e)){t[e]=this.config.get(e)}}return t}static create(t){return new Promise((e=>{const n=new this(t);e(n.initPlugins().then((()=>n)))}))}}class Tu extends(lt()){constructor(t){super();this.context=t}destroy(){this.stopListening()}static get isContextPlugin(){return true}}var Pu=n(372);var Bu={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Bu.insert="head";Bu.singleton=true;var Iu=Il()(Pu.Z,Bu);const Ru=Pu.Z.locals||{};const Ou=new WeakMap;let Mu=false;function Vu({view:t,element:e,text:n,isDirectHost:o=true,keepOnFocus:i=false}){const r=t.document;if(!Ou.has(r)){Ou.set(r,new Map);r.registerPostFixer((t=>Hu(r,t)));r.on("change:isComposing",(()=>{t.change((t=>Hu(r,t)))}),{priority:"high"})}if(e.is("editableElement")){e.on("change:placeholder",((t,e,n)=>{s(n)}))}if(e.placeholder){s(e.placeholder)}else if(n){s(n)}if(n){$u()}function s(n){Ou.get(r).set(e,{text:n,isDirectHost:o,keepOnFocus:i,hostElement:o?e:null});t.change((t=>Hu(r,t)))}}function zu(t,e){const n=e.document;if(!Ou.has(n)){return}t.change((t=>{const o=Ou.get(n);const i=o.get(e);t.removeAttribute("data-placeholder",i.hostElement);Nu(t,i.hostElement);o.delete(e)}))}function Fu(t,e){if(!e.hasClass("ck-placeholder")){t.addClass("ck-placeholder",e);return true}return false}function Nu(t,e){if(e.hasClass("ck-placeholder")){t.removeClass("ck-placeholder",e);return true}return false}function Lu(t,e){if(!t.isAttached()){return false}const n=Array.from(t.getChildren()).some((t=>!t.is("uiElement")));if(n){return false}const o=t.document;const i=o.selection;const r=i.anchor;if(o.isComposing&&r&&r.parent===t){return false}if(e){return true}if(!o.isFocused){return true}return!!r&&r.parent!==t}function Hu(t,e){const n=Ou.get(t);const o=[];let i=false;for(const[t,r]of n){if(r.isDirectHost){o.push(t);if(ju(e,t,r)){i=true}}}for(const[t,r]of n){if(r.isDirectHost){continue}const n=qu(t);if(!n){continue}if(o.includes(n)){continue}r.hostElement=n;if(ju(e,t,r)){i=true}}return i}function ju(t,e,n){const{text:o,isDirectHost:i,hostElement:r}=n;let s=false;if(r.getAttribute("data-placeholder")!==o){t.setAttribute("data-placeholder",o,r);s=true}const a=i||e.childCount==1;if(a&&Lu(r,n.keepOnFocus)){if(Fu(t,r)){s=true}}else if(Nu(t,r)){s=true}return s}function qu(t){if(t.childCount){const e=t.getChild(0);if(e.is("element")&&!e.is("uiElement")&&!e.is("attributeElement")){return e}}return null}function $u(){if(!Mu){B("enableplaceholder-deprecated-text-option")}Mu=true}class Wu{is(){throw new Error("is() method is abstract")}}var Gu=4;function Ku(t){return Oa(t,Gu)}const Uu=Ku;class Zu extends(q(Wu)){constructor(t){super();this.document=t;this.parent=null}get index(){let t;if(!this.parent){return null}if((t=this.parent.getChildIndex(this))==-1){throw new P("view-node-not-found-in-parent",this)}return t}get nextSibling(){const t=this.index;return t!==null&&this.parent.getChild(t+1)||null}get previousSibling(){const t=this.index;return t!==null&&this.parent.getChild(t-1)||null}get root(){let t=this;while(t.parent){t=t.parent}return t}isAttached(){return this.root.is("rootElement")}getPath(){const t=[];let e=this;while(e.parent){t.unshift(e.index);e=e.parent}return t}getAncestors(t={}){const e=[];let n=t.includeSelf?this:this.parent;while(n){e[t.parentFirst?"push":"unshift"](n);n=n.parent}return e}getCommonAncestor(t,e={}){const n=this.getAncestors(e);const o=t.getAncestors(e);let i=0;while(n[i]==o[i]&&n[i]){i++}return i===0?null:n[i-1]}isBefore(t){if(this==t){return false}if(this.root!==t.root){return false}const e=this.getPath();const n=t.getPath();const o=At(e,n);switch(o){case"prefix":return true;case"extension":return false;default:return e[o]<n[o]}}isAfter(t){if(this==t){return false}if(this.root!==t.root){return false}return!this.isBefore(t)}_remove(){this.parent._removeChildren(this.index)}_fireChange(t,e){this.fire(`change:${t}`,e);if(this.parent){this.parent._fireChange(t,e)}}toJSON(){const t=Uu(this);delete t.parent;return t}}Zu.prototype.is=function(t){return t==="node"||t==="view:node"};class Ju extends Zu{constructor(t,e){super(t);this._textData=e}get data(){return this._textData}get _data(){return this.data}set _data(t){this._fireChange("text",this);this._textData=t}isSimilar(t){if(!(t instanceof Ju)){return false}return this===t||this.data===t.data}_clone(){return new Ju(this.document,this.data)}}Ju.prototype.is=function(t){return t==="$text"||t==="view:$text"||t==="text"||t==="view:text"||t==="node"||t==="view:node"};class Yu extends Wu{constructor(t,e,n){super();this.textNode=t;if(e<0||e>t.data.length){throw new P("view-textproxy-wrong-offsetintext",this)}if(n<0||e+n>t.data.length){throw new P("view-textproxy-wrong-length",this)}this.data=t.data.substring(e,e+n);this.offsetInText=e}get offsetSize(){return this.data.length}get isPartial(){return this.data.length!==this.textNode.data.length}get parent(){return this.textNode.parent}get root(){return this.textNode.root}get document(){return this.textNode.document}getAncestors(t={}){const e=[];let n=t.includeSelf?this.textNode:this.parent;while(n!==null){e[t.parentFirst?"push":"unshift"](n);n=n.parent}return e}}Yu.prototype.is=function(t){return t==="$textProxy"||t==="view:$textProxy"||t==="textProxy"||t==="view:textProxy"};class Qu{constructor(...t){this._patterns=[];this.add(...t)}add(...t){for(let e of t){if(typeof e=="string"||e instanceof RegExp){e={name:e}}this._patterns.push(e)}}match(...t){for(const e of t){for(const t of this._patterns){const n=Xu(e,t);if(n){return{element:e,pattern:t,match:n}}}}return null}matchAll(...t){const e=[];for(const n of t){for(const t of this._patterns){const o=Xu(n,t);if(o){e.push({element:n,pattern:t,match:o})}}}return e.length>0?e:null}getElementName(){if(this._patterns.length!==1){return null}const t=this._patterns[0];const e=t.name;return typeof t!="function"&&e&&!(e instanceof RegExp)?e:null}}function Xu(t,e){if(typeof e=="function"){return e(t)}const n={};if(e.name){n.name=th(e.name,t.name);if(!n.name){return null}}if(e.attributes){n.attributes=rh(e.attributes,t);if(!n.attributes){return null}}if(e.classes){n.classes=sh(e.classes,t);if(!n.classes){return null}}if(e.styles){n.styles=ah(e.styles,t);if(!n.styles){return null}}return n}function th(t,e){if(t instanceof RegExp){return!!e.match(t)}return t===e}function eh(t,e,n){const o=nh(t);const i=Array.from(e);const r=[];o.forEach((([t,e])=>{i.forEach((o=>{if(oh(t,o)&&ih(e,o,n)){r.push(o)}}))}));if(!o.length||r.length<o.length){return undefined}return r}function nh(t){if(Array.isArray(t)){return t.map((t=>{if(ue(t)){if(t.key===undefined||t.value===undefined){B("matcher-pattern-missing-key-or-value",t)}return[t.key,t.value]}return[t,true]}))}if(ue(t)){return Object.entries(t)}return[[t,true]]}function oh(t,e){return t===true||t===e||t instanceof RegExp&&e.match(t)}function ih(t,e,n){if(t===true){return true}const o=n(e);return t===o||t instanceof RegExp&&!!String(o).match(t)}function rh(t,e){const n=new Set(e.getAttributeKeys());if(ue(t)){if(t.style!==undefined){B("matcher-pattern-deprecated-attributes-style-key",t)}if(t.class!==undefined){B("matcher-pattern-deprecated-attributes-class-key",t)}}else{n.delete("style");n.delete("class")}return eh(t,n,(t=>e.getAttribute(t)))}function sh(t,e){return eh(t,e.getClassNames(),(()=>{}))}function ah(t,e){return eh(t,e.getStyleNames(true),(t=>e.getStyle(t)))}var ch="[object Symbol]";function lh(t){return typeof t=="symbol"||Zt(t)&&Wt(t)==ch}const dh=lh;var uh=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,hh=/^\w*$/;function fh(t,e){if(Kt(t)){return false}var n=typeof t;if(n=="number"||n=="symbol"||n=="boolean"||t==null||dh(t)){return true}return hh.test(t)||!uh.test(t)||e!=null&&t in Object(e)}const ph=fh;var gh="Expected a function";function mh(t,e){if(typeof t!="function"||e!=null&&typeof e!="function"){throw new TypeError(gh)}var n=function(){var o=arguments,i=e?e.apply(this,o):o[0],r=n.cache;if(r.has(i)){return r.get(i)}var s=t.apply(this,o);n.cache=r.set(i,s)||r;return s};n.cache=new(mh.Cache||Jn);return n}mh.Cache=Jn;const bh=mh;var kh=500;function wh(t){var e=bh(t,(function(t){if(n.size===kh){n.clear()}return t}));var n=e.cache;return e}const _h=wh;var vh=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;var Ah=/\\(\\)?/g;var Ch=_h((function(t){var e=[];if(t.charCodeAt(0)===46){e.push("")}t.replace(vh,(function(t,n,o,i){e.push(o?i.replace(Ah,"$1"):n||t)}));return e}));const yh=Ch;function xh(t,e){var n=-1,o=t==null?0:t.length,i=Array(o);while(++n<o){i[n]=e(t[n],n,t)}return i}const Eh=xh;var Sh=1/0;var Dh=Pt?Pt.prototype:undefined,Th=Dh?Dh.toString:undefined;function Ph(t){if(typeof t=="string"){return t}if(Kt(t)){return Eh(t,Ph)+""}if(dh(t)){return Th?Th.call(t):""}var e=t+"";return e=="0"&&1/t==-Sh?"-0":e}const Bh=Ph;function Ih(t){return t==null?"":Bh(t)}const Rh=Ih;function Oh(t,e){if(Kt(t)){return t}return ph(t,e)?[t]:yh(Rh(t))}const Mh=Oh;function Vh(t){var e=t==null?0:t.length;return e?t[e-1]:undefined}const zh=Vh;var Fh=1/0;function Nh(t){if(typeof t=="string"||dh(t)){return t}var e=t+"";return e=="0"&&1/t==-Fh?"-0":e}const Lh=Nh;function Hh(t,e){e=Mh(e,t);var n=0,o=e.length;while(t!=null&&n<o){t=t[Lh(e[n++])]}return n&&n==o?t:undefined}const jh=Hh;function qh(t,e,n){var o=-1,i=t.length;if(e<0){e=-e>i?0:i+e}n=n>i?i:n;if(n<0){n+=i}i=e>n?0:n-e>>>0;e>>>=0;var r=Array(i);while(++o<i){r[o]=t[o+e]}return r}const $h=qh;function Wh(t,e){return e.length<2?t:jh(t,$h(e,0,-1))}const Gh=Wh;function Kh(t,e){e=Mh(e,t);t=Gh(t,e);return t==null||delete t[Lh(zh(e))]}const Uh=Kh;function Zh(t,e){return t==null?true:Uh(t,e)}const Jh=Zh;function Yh(t,e,n){var o=t==null?undefined:jh(t,e);return o===undefined?n:o}const Qh=Yh;function Xh(t,e,n){if(n!==undefined&&!ge(t[e],n)||n===undefined&&!(e in t)){ao(t,e,n)}}const tf=Xh;function ef(t){return function(e,n,o){var i=-1,r=Object(e),s=o(e),a=s.length;while(a--){var c=s[t?a:++i];if(n(r[c],c,r)===false){break}}return e}}const nf=ef;var of=nf();const rf=of;function sf(t){return Zt(t)&&Ni(t)}const af=sf;function cf(t,e){if(e==="constructor"&&typeof t[e]==="function"){return}if(e=="__proto__"){return}return t[e]}const lf=cf;function df(t){return po(t,Yi(t))}const uf=df;function hf(t,e,n,o,i,r,s){var a=lf(t,n),c=lf(e,n),l=s.get(c);if(l){tf(t,n,l);return}var d=r?r(a,c,n+"",t,e,s):undefined;var u=d===undefined;if(u){var h=Kt(c),f=!h&&Ro(c),p=!h&&!f&&yi(c);d=c;if(h||f||p){if(Kt(a)){d=a}else if(af(a)){d=cr(a)}else if(f){u=false;d=sr(c,true)}else if(p){u=false;d=ks(c,true)}else{d=[]}}else if(ue(c)||yo(c)){d=a;if(yo(a)){d=uf(a)}else if(!nt(a)||qe(a)){d=$s(c)}}else{u=false}}if(u){s.set(c,d);i(d,c,o,r,s);s["delete"](c)}tf(t,n,d)}const ff=hf;function pf(t,e,n,o,i){if(t===e){return}rf(e,(function(r,s){i||(i=new eo);if(nt(r)){ff(t,e,s,n,pf,o,i)}else{var a=o?o(lf(t,s),r,s+"",t,e,i):undefined;if(a===undefined){a=r}tf(t,s,a)}}),Yi)}const gf=pf;function mf(t){return t}const bf=mf;function kf(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}const wf=kf;var _f=Math.max;function vf(t,e,n){e=_f(e===undefined?t.length-1:e,0);return function(){var o=arguments,i=-1,r=_f(o.length-e,0),s=Array(r);while(++i<r){s[i]=o[e+i]}i=-1;var a=Array(e+1);while(++i<e){a[i]=o[i]}a[e]=n(s);return wf(t,this,a)}}const Af=vf;function Cf(t){return function(){return t}}const yf=Cf;var xf=!ro?bf:function(t,e){return ro(t,"toString",{configurable:true,enumerable:false,value:yf(e),writable:true})};const Ef=xf;var Sf=800,Df=16;var Tf=Date.now;function Pf(t){var e=0,n=0;return function(){var o=Tf(),i=Df-(o-n);n=o;if(i>0){if(++e>=Sf){return arguments[0]}}else{e=0}return t.apply(undefined,arguments)}}const Bf=Pf;var If=Bf(Ef);const Rf=If;function Of(t,e){return Rf(Af(t,e,bf),t+"")}const Mf=Of;function Vf(t,e,n){if(!nt(n)){return false}var o=typeof e;if(o=="number"?Ni(n)&&zo(e,n.length):o=="string"&&e in n){return ge(n[e],t)}return false}const zf=Vf;function Ff(t){return Mf((function(e,n){var o=-1,i=n.length,r=i>1?n[i-1]:undefined,s=i>2?n[2]:undefined;r=t.length>3&&typeof r=="function"?(i--,r):undefined;if(s&&zf(n[0],n[1],s)){r=i<3?undefined:r;i=1}e=Object(e);while(++o<i){var a=n[o];if(a){t(e,a,o,r)}}return e}))}const Nf=Ff;var Lf=Nf((function(t,e,n){gf(t,e,n)}));const Hf=Lf;function jf(t,e,n,o){if(!nt(t)){return t}e=Mh(e,t);var i=-1,r=e.length,s=r-1,a=t;while(a!=null&&++i<r){var c=Lh(e[i]),l=n;if(c==="__proto__"||c==="constructor"||c==="prototype"){return t}if(i!=s){var d=a[c];l=o?o(d,c,a):undefined;if(l===undefined){l=nt(d)?d:zo(e[i+1])?[]:{}}}ho(a,c,l);a=a[c]}return t}const qf=jf;function $f(t,e,n){return t==null?t:qf(t,e,n)}const Wf=$f;class Gf{constructor(t){this._styles={};this._styleProcessor=t}get isEmpty(){const t=Object.entries(this._styles);const e=Array.from(t);return!e.length}get size(){if(this.isEmpty){return 0}return this.getStyleNames().length}setTo(t){this.clear();const e=Array.from(Uf(t).entries());for(const[t,n]of e){this._styleProcessor.toNormalizedForm(t,n,this._styles)}}has(t){if(this.isEmpty){return false}const e=this._styleProcessor.getReducedForm(t,this._styles);const n=e.find((([e])=>e===t));return Array.isArray(n)}set(t,e){if(nt(t)){for(const[e,n]of Object.entries(t)){this._styleProcessor.toNormalizedForm(e,n,this._styles)}}else{this._styleProcessor.toNormalizedForm(t,e,this._styles)}}remove(t){const e=Zf(t);Jh(this._styles,e);delete this._styles[t];this._cleanEmptyObjectsOnPath(e)}getNormalized(t){return this._styleProcessor.getNormalized(t,this._styles)}toString(){if(this.isEmpty){return""}return this._getStylesEntries().map((t=>t.join(":"))).sort().join(";")+";"}getAsString(t){if(this.isEmpty){return}if(this._styles[t]&&!nt(this._styles[t])){return this._styles[t]}const e=this._styleProcessor.getReducedForm(t,this._styles);const n=e.find((([e])=>e===t));if(Array.isArray(n)){return n[1]}}getStyleNames(t=false){if(this.isEmpty){return[]}if(t){return this._styleProcessor.getStyleNames(this._styles)}const e=this._getStylesEntries();return e.map((([t])=>t))}clear(){this._styles={}}_getStylesEntries(){const t=[];const e=Object.keys(this._styles);for(const n of e){t.push(...this._styleProcessor.getReducedForm(n,this._styles))}return t}_cleanEmptyObjectsOnPath(t){const e=t.split(".");const n=e.length>1;if(!n){return}const o=e.splice(0,e.length-1).join(".");const i=Qh(this._styles,o);if(!i){return}const r=!Array.from(Object.keys(i)).length;if(r){this.remove(o)}}}class Kf{constructor(){this._normalizers=new Map;this._extractors=new Map;this._reducers=new Map;this._consumables=new Map}toNormalizedForm(t,e,n){if(nt(e)){Jf(n,Zf(t),e);return}if(this._normalizers.has(t)){const o=this._normalizers.get(t);const{path:i,value:r}=o(e);Jf(n,i,r)}else{Jf(n,t,e)}}getNormalized(t,e){if(!t){return Hf({},e)}if(e[t]!==undefined){return e[t]}if(this._extractors.has(t)){const n=this._extractors.get(t);if(typeof n==="string"){return Qh(e,n)}const o=n(t,e);if(o){return o}}return Qh(e,Zf(t))}getReducedForm(t,e){const n=this.getNormalized(t,e);if(n===undefined){return[]}if(this._reducers.has(t)){const e=this._reducers.get(t);return e(n)}return[[t,n]]}getStyleNames(t){const e=Array.from(this._consumables.keys()).filter((e=>{const n=this.getNormalized(e,t);if(n&&typeof n=="object"){return Object.keys(n).length}return n}));const n=new Set([...e,...Object.keys(t)]);return Array.from(n.values())}getRelatedStyles(t){return this._consumables.get(t)||[]}setNormalizer(t,e){this._normalizers.set(t,e)}setExtractor(t,e){this._extractors.set(t,e)}setReducer(t,e){this._reducers.set(t,e)}setStyleRelation(t,e){this._mapStyleNames(t,e);for(const n of e){this._mapStyleNames(n,[t])}}_mapStyleNames(t,e){if(!this._consumables.has(t)){this._consumables.set(t,[])}this._consumables.get(t).push(...e)}}function Uf(t){let e=null;let n=0;let o=0;let i=null;const r=new Map;if(t===""){return r}if(t.charAt(t.length-1)!=";"){t=t+";"}for(let s=0;s<t.length;s++){const a=t.charAt(s);if(e===null){switch(a){case":":if(!i){i=t.substr(n,s-n);o=s+1}break;case'"':case"'":e=a;break;case";":{const e=t.substr(o,s-o);if(i){r.set(i.trim(),e.trim())}i=null;n=s+1;break}}}else if(a===e){e=null}}return r}function Zf(t){return t.replace("-",".")}function Jf(t,e,n){let o=n;if(nt(n)){o=Hf({},Qh(t,e),n)}Wf(t,e,o)}class Yf extends Zu{constructor(t,e,n,o){super(t);this._unsafeAttributesToRender=[];this._customProperties=new Map;this.name=e;this._attrs=Qf(n);this._children=[];if(o){this._insertChild(0,o)}this._classes=new Set;if(this._attrs.has("class")){const t=this._attrs.get("class");Xf(this._classes,t);this._attrs.delete("class")}this._styles=new Gf(this.document.stylesProcessor);if(this._attrs.has("style")){this._styles.setTo(this._attrs.get("style"));this._attrs.delete("style")}}get childCount(){return this._children.length}get isEmpty(){return this._children.length===0}getChild(t){return this._children[t]}getChildIndex(t){return this._children.indexOf(t)}getChildren(){return this._children[Symbol.iterator]()}*getAttributeKeys(){if(this._classes.size>0){yield"class"}if(!this._styles.isEmpty){yield"style"}yield*this._attrs.keys()}*getAttributes(){yield*this._attrs.entries();if(this._classes.size>0){yield["class",this.getAttribute("class")]}if(!this._styles.isEmpty){yield["style",this.getAttribute("style")]}}getAttribute(t){if(t=="class"){if(this._classes.size>0){return[...this._classes].join(" ")}return undefined}if(t=="style"){const t=this._styles.toString();return t==""?undefined:t}return this._attrs.get(t)}hasAttribute(t){if(t=="class"){return this._classes.size>0}if(t=="style"){return!this._styles.isEmpty}return this._attrs.has(t)}isSimilar(t){if(!(t instanceof Yf)){return false}if(this===t){return true}if(this.name!=t.name){return false}if(this._attrs.size!==t._attrs.size||this._classes.size!==t._classes.size||this._styles.size!==t._styles.size){return false}for(const[e,n]of this._attrs){if(!t._attrs.has(e)||t._attrs.get(e)!==n){return false}}for(const e of this._classes){if(!t._classes.has(e)){return false}}for(const e of this._styles.getStyleNames()){if(!t._styles.has(e)||t._styles.getAsString(e)!==this._styles.getAsString(e)){return false}}return true}hasClass(...t){for(const e of t){if(!this._classes.has(e)){return false}}return true}getClassNames(){return this._classes.keys()}getStyle(t){return this._styles.getAsString(t)}getNormalizedStyle(t){return this._styles.getNormalized(t)}getStyleNames(t){return this._styles.getStyleNames(t)}hasStyle(...t){for(const e of t){if(!this._styles.has(e)){return false}}return true}findAncestor(...t){const e=new Qu(...t);let n=this.parent;while(n&&!n.is("documentFragment")){if(e.match(n)){return n}n=n.parent}return null}getCustomProperty(t){return this._customProperties.get(t)}*getCustomProperties(){yield*this._customProperties.entries()}getIdentity(){const t=Array.from(this._classes).sort().join(",");const e=this._styles.toString();const n=Array.from(this._attrs).map((t=>`${t[0]}="${t[1]}"`)).sort().join(" ");return this.name+(t==""?"":` class="${t}"`)+(!e?"":` style="${e}"`)+(n==""?"":` ${n}`)}shouldRenderUnsafeAttribute(t){return this._unsafeAttributesToRender.includes(t)}_clone(t=false){const e=[];if(t){for(const n of this.getChildren()){e.push(n._clone(t))}}const n=new this.constructor(this.document,this.name,this._attrs,e);n._classes=new Set(this._classes);n._styles.set(this._styles.getNormalized());n._customProperties=new Map(this._customProperties);n.getFillerOffset=this.getFillerOffset;n._unsafeAttributesToRender=this._unsafeAttributesToRender;return n}_appendChild(t){return this._insertChild(this.childCount,t)}_insertChild(t,e){this._fireChange("children",this);let n=0;const o=tp(this.document,e);for(const e of o){if(e.parent!==null){e._remove()}e.parent=this;e.document=this.document;this._children.splice(t,0,e);t++;n++}return n}_removeChildren(t,e=1){this._fireChange("children",this);for(let n=t;n<t+e;n++){this._children[n].parent=null}return this._children.splice(t,e)}_setAttribute(t,e){const n=String(e);this._fireChange("attributes",this);if(t=="class"){Xf(this._classes,n)}else if(t=="style"){this._styles.setTo(n)}else{this._attrs.set(t,n)}}_removeAttribute(t){this._fireChange("attributes",this);if(t=="class"){if(this._classes.size>0){this._classes.clear();return true}return false}if(t=="style"){if(!this._styles.isEmpty){this._styles.clear();return true}return false}return this._attrs.delete(t)}_addClass(t){this._fireChange("attributes",this);for(const e of el(t)){this._classes.add(e)}}_removeClass(t){this._fireChange("attributes",this);for(const e of el(t)){this._classes.delete(e)}}_setStyle(t,e){this._fireChange("attributes",this);if(typeof t!="string"){this._styles.set(t)}else{this._styles.set(t,e)}}_removeStyle(t){this._fireChange("attributes",this);for(const e of el(t)){this._styles.remove(e)}}_setCustomProperty(t,e){this._customProperties.set(t,e)}_removeCustomProperty(t){return this._customProperties.delete(t)}}Yf.prototype.is=function(t,e){if(!e){return t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="element"||t==="view:element")}};function Qf(t){const e=ml(t);for(const[t,n]of e){if(n===null){e.delete(t)}else if(typeof n!="string"){e.set(t,String(n))}}return e}function Xf(t,e){const n=e.split(/\s+/);t.clear();n.forEach((e=>t.add(e)))}function tp(t,e){if(typeof e=="string"){return[new Ju(t,e)]}if(!Ct(e)){e=[e]}return Array.from(e).map((e=>{if(typeof e=="string"){return new Ju(t,e)}if(e instanceof Yu){return new Ju(t,e.data)}return e}))}class ep extends Yf{constructor(t,e,n,o){super(t,e,n,o);this.getFillerOffset=np}}ep.prototype.is=function(t,e){if(!e){return t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element")}};function np(){const t=[...this.getChildren()];const e=t[this.childCount-1];if(e&&e.is("element","br")){return this.childCount}for(const e of t){if(!e.is("uiElement")){return null}}return this.childCount}class op extends(lt(ep)){constructor(t,e,n,o){super(t,e,n,o);this.set("isReadOnly",false);this.set("isFocused",false);this.set("placeholder",undefined);this.bind("isReadOnly").to(t);this.bind("isFocused").to(t,"isFocused",(e=>e&&t.selection.editableElement==this));this.listenTo(t.selection,"change",(()=>{this.isFocused=t.isFocused&&t.selection.editableElement==this}))}destroy(){this.stopListening()}}op.prototype.is=function(t,e){if(!e){return t==="editableElement"||t==="view:editableElement"||t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="editableElement"||t==="view:editableElement"||t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element")}};const ip=Symbol("rootName");class rp extends op{constructor(t,e){super(t,e);this.rootName="main"}get rootName(){return this.getCustomProperty(ip)}set rootName(t){this._setCustomProperty(ip,t)}set _name(t){this.name=t}}rp.prototype.is=function(t,e){if(!e){return t==="rootElement"||t==="view:rootElement"||t==="editableElement"||t==="view:editableElement"||t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="rootElement"||t==="view:rootElement"||t==="editableElement"||t==="view:editableElement"||t==="containerElement"||t==="view:containerElement"||t==="element"||t==="view:element")}};class sp{constructor(t={}){if(!t.boundaries&&!t.startPosition){throw new P("view-tree-walker-no-start-position",null)}if(t.direction&&t.direction!="forward"&&t.direction!="backward"){throw new P("view-tree-walker-unknown-direction",t.startPosition,{direction:t.direction})}this.boundaries=t.boundaries||null;if(t.startPosition){this._position=ap._createAt(t.startPosition)}else{this._position=ap._createAt(t.boundaries[t.direction=="backward"?"end":"start"])}this.direction=t.direction||"forward";this.singleCharacters=!!t.singleCharacters;this.shallow=!!t.shallow;this.ignoreElementEnd=!!t.ignoreElementEnd;this._boundaryStartParent=this.boundaries?this.boundaries.start.parent:null;this._boundaryEndParent=this.boundaries?this.boundaries.end.parent:null}[Symbol.iterator](){return this}get position(){return this._position}skip(t){let e;let n;do{n=this.position;e=this.next()}while(!e.done&&t(e.value));if(!e.done){this._position=n}}next(){if(this.direction=="forward"){return this._next()}else{return this._previous()}}_next(){let t=this.position.clone();const e=this.position;const n=t.parent;if(n.parent===null&&t.offset===n.childCount){return{done:true,value:undefined}}if(n===this._boundaryEndParent&&t.offset==this.boundaries.end.offset){return{done:true,value:undefined}}let o;if(n instanceof Ju){if(t.isAtEnd){this._position=ap._createAfter(n);return this._next()}o=n.data[t.offset]}else{o=n.getChild(t.offset)}if(o instanceof Yf){if(!this.shallow){t=new ap(o,0)}else{if(this.boundaries&&this.boundaries.end.isBefore(t)){return{done:true,value:undefined}}t.offset++}this._position=t;return this._formatReturnValue("elementStart",o,e,t,1)}if(o instanceof Ju){if(this.singleCharacters){t=new ap(o,0);this._position=t;return this._next()}let n=o.data.length;let i;if(o==this._boundaryEndParent){n=this.boundaries.end.offset;i=new Yu(o,0,n);t=ap._createAfter(i)}else{i=new Yu(o,0,o.data.length);t.offset++}this._position=t;return this._formatReturnValue("text",i,e,t,n)}if(typeof o=="string"){let o;if(this.singleCharacters){o=1}else{const e=n===this._boundaryEndParent?this.boundaries.end.offset:n.data.length;o=e-t.offset}const i=new Yu(n,t.offset,o);t.offset+=o;this._position=t;return this._formatReturnValue("text",i,e,t,o)}t=ap._createAfter(n);this._position=t;if(this.ignoreElementEnd){return this._next()}return this._formatReturnValue("elementEnd",n,e,t)}_previous(){let t=this.position.clone();const e=this.position;const n=t.parent;if(n.parent===null&&t.offset===0){return{done:true,value:undefined}}if(n==this._boundaryStartParent&&t.offset==this.boundaries.start.offset){return{done:true,value:undefined}}let o;if(n instanceof Ju){if(t.isAtStart){this._position=ap._createBefore(n);return this._previous()}o=n.data[t.offset-1]}else{o=n.getChild(t.offset-1)}if(o instanceof Yf){if(this.shallow){t.offset--;this._position=t;return this._formatReturnValue("elementStart",o,e,t,1)}t=new ap(o,o.childCount);this._position=t;if(this.ignoreElementEnd){return this._previous()}return this._formatReturnValue("elementEnd",o,e,t)}if(o instanceof Ju){if(this.singleCharacters){t=new ap(o,o.data.length);this._position=t;return this._previous()}let n=o.data.length;let i;if(o==this._boundaryStartParent){const e=this.boundaries.start.offset;i=new Yu(o,e,o.data.length-e);n=i.data.length;t=ap._createBefore(i)}else{i=new Yu(o,0,o.data.length);t.offset--}this._position=t;return this._formatReturnValue("text",i,e,t,n)}if(typeof o=="string"){let o;if(!this.singleCharacters){const e=n===this._boundaryStartParent?this.boundaries.start.offset:0;o=t.offset-e}else{o=1}t.offset-=o;const i=new Yu(n,t.offset,o);this._position=t;return this._formatReturnValue("text",i,e,t,o)}t=ap._createBefore(n);this._position=t;return this._formatReturnValue("elementStart",n,e,t,1)}_formatReturnValue(t,e,n,o,i){if(e instanceof Yu){if(e.offsetInText+e.data.length==e.textNode.data.length){if(this.direction=="forward"&&!(this.boundaries&&this.boundaries.end.isEqual(this.position))){o=ap._createAfter(e.textNode);this._position=o}else{n=ap._createAfter(e.textNode)}}if(e.offsetInText===0){if(this.direction=="backward"&&!(this.boundaries&&this.boundaries.start.isEqual(this.position))){o=ap._createBefore(e.textNode);this._position=o}else{n=ap._createBefore(e.textNode)}}}return{done:false,value:{type:t,item:e,previousPosition:n,nextPosition:o,length:i}}}}class ap extends Wu{constructor(t,e){super();this.parent=t;this.offset=e}get nodeAfter(){if(this.parent.is("$text")){return null}return this.parent.getChild(this.offset)||null}get nodeBefore(){if(this.parent.is("$text")){return null}return this.parent.getChild(this.offset-1)||null}get isAtStart(){return this.offset===0}get isAtEnd(){const t=this.parent.is("$text")?this.parent.data.length:this.parent.childCount;return this.offset===t}get root(){return this.parent.root}get editableElement(){let t=this.parent;while(!(t instanceof op)){if(t.parent){t=t.parent}else{return null}}return t}getShiftedBy(t){const e=ap._createAt(this);const n=e.offset+t;e.offset=n<0?0:n;return e}getLastMatchingPosition(t,e={}){e.startPosition=this;const n=new sp(e);n.skip(t);return n.position}getAncestors(){if(this.parent.is("documentFragment")){return[this.parent]}else{return this.parent.getAncestors({includeSelf:true})}}getCommonAncestor(t){const e=this.getAncestors();const n=t.getAncestors();let o=0;while(e[o]==n[o]&&e[o]){o++}return o===0?null:e[o-1]}isEqual(t){return this.parent==t.parent&&this.offset==t.offset}isBefore(t){return this.compareWith(t)=="before"}isAfter(t){return this.compareWith(t)=="after"}compareWith(t){if(this.root!==t.root){return"different"}if(this.isEqual(t)){return"same"}const e=this.parent.is("node")?this.parent.getPath():[];const n=t.parent.is("node")?t.parent.getPath():[];e.push(this.offset);n.push(t.offset);const o=At(e,n);switch(o){case"prefix":return"before";case"extension":return"after";default:return e[o]<n[o]?"before":"after"}}getWalker(t={}){t.startPosition=this;return new sp(t)}clone(){return new ap(this.parent,this.offset)}static _createAt(t,e){if(t instanceof ap){return new this(t.parent,t.offset)}else{const n=t;if(e=="end"){e=n.is("$text")?n.data.length:n.childCount}else if(e=="before"){return this._createBefore(n)}else if(e=="after"){return this._createAfter(n)}else if(e!==0&&!e){throw new P("view-createpositionat-offset-required",n)}return new ap(n,e)}}static _createAfter(t){if(t.is("$textProxy")){return new ap(t.textNode,t.offsetInText+t.data.length)}if(!t.parent){throw new P("view-position-after-root",t,{root:t})}return new ap(t.parent,t.index+1)}static _createBefore(t){if(t.is("$textProxy")){return new ap(t.textNode,t.offsetInText)}if(!t.parent){throw new P("view-position-before-root",t,{root:t})}return new ap(t.parent,t.index)}}ap.prototype.is=function(t){return t==="position"||t==="view:position"};class cp extends Wu{constructor(t,e=null){super();this.start=t.clone();this.end=e?e.clone():t.clone()}*[Symbol.iterator](){yield*new sp({boundaries:this,ignoreElementEnd:true})}get isCollapsed(){return this.start.isEqual(this.end)}get isFlat(){return this.start.parent===this.end.parent}get root(){return this.start.root}getEnlarged(){let t=this.start.getLastMatchingPosition(lp,{direction:"backward"});let e=this.end.getLastMatchingPosition(lp);if(t.parent.is("$text")&&t.isAtStart){t=ap._createBefore(t.parent)}if(e.parent.is("$text")&&e.isAtEnd){e=ap._createAfter(e.parent)}return new cp(t,e)}getTrimmed(){let t=this.start.getLastMatchingPosition(lp);if(t.isAfter(this.end)||t.isEqual(this.end)){return new cp(t,t)}let e=this.end.getLastMatchingPosition(lp,{direction:"backward"});const n=t.nodeAfter;const o=e.nodeBefore;if(n&&n.is("$text")){t=new ap(n,0)}if(o&&o.is("$text")){e=new ap(o,o.data.length)}return new cp(t,e)}isEqual(t){return this==t||this.start.isEqual(t.start)&&this.end.isEqual(t.end)}containsPosition(t){return t.isAfter(this.start)&&t.isBefore(this.end)}containsRange(t,e=false){if(t.isCollapsed){e=false}const n=this.containsPosition(t.start)||e&&this.start.isEqual(t.start);const o=this.containsPosition(t.end)||e&&this.end.isEqual(t.end);return n&&o}getDifference(t){const e=[];if(this.isIntersecting(t)){if(this.containsPosition(t.start)){e.push(new cp(this.start,t.start))}if(this.containsPosition(t.end)){e.push(new cp(t.end,this.end))}}else{e.push(this.clone())}return e}getIntersection(t){if(this.isIntersecting(t)){let e=this.start;let n=this.end;if(this.containsPosition(t.start)){e=t.start}if(this.containsPosition(t.end)){n=t.end}return new cp(e,n)}return null}getWalker(t={}){t.boundaries=this;return new sp(t)}getCommonAncestor(){return this.start.getCommonAncestor(this.end)}getContainedElement(){if(this.isCollapsed){return null}let t=this.start.nodeAfter;let e=this.end.nodeBefore;if(this.start.parent.is("$text")&&this.start.isAtEnd&&this.start.parent.nextSibling){t=this.start.parent.nextSibling}if(this.end.parent.is("$text")&&this.end.isAtStart&&this.end.parent.previousSibling){e=this.end.parent.previousSibling}if(t&&t.is("element")&&t===e){return t}return null}clone(){return new cp(this.start,this.end)}*getItems(t={}){t.boundaries=this;t.ignoreElementEnd=true;const e=new sp(t);for(const t of e){yield t.item}}*getPositions(t={}){t.boundaries=this;const e=new sp(t);yield e.position;for(const t of e){yield t.nextPosition}}isIntersecting(t){return this.start.isBefore(t.end)&&this.end.isAfter(t.start)}static _createFromParentsAndOffsets(t,e,n,o){return new this(new ap(t,e),new ap(n,o))}static _createFromPositionAndShift(t,e){const n=t;const o=t.getShiftedBy(e);return e>0?new this(n,o):new this(o,n)}static _createIn(t){return this._createFromParentsAndOffsets(t,0,t,t.childCount)}static _createOn(t){const e=t.is("$textProxy")?t.offsetSize:1;return this._createFromPositionAndShift(ap._createBefore(t),e)}}cp.prototype.is=function(t){return t==="range"||t==="view:range"};function lp(t){if(t.item.is("attributeElement")||t.item.is("uiElement")){return true}return false}class dp extends(q(Wu)){constructor(...t){super();this._ranges=[];this._lastRangeBackward=false;this._isFake=false;this._fakeSelectionLabel="";if(t.length){this.setTo(...t)}}get isFake(){return this._isFake}get fakeSelectionLabel(){return this._fakeSelectionLabel}get anchor(){if(!this._ranges.length){return null}const t=this._ranges[this._ranges.length-1];const e=this._lastRangeBackward?t.end:t.start;return e.clone()}get focus(){if(!this._ranges.length){return null}const t=this._ranges[this._ranges.length-1];const e=this._lastRangeBackward?t.start:t.end;return e.clone()}get isCollapsed(){return this.rangeCount===1&&this._ranges[0].isCollapsed}get rangeCount(){return this._ranges.length}get isBackward(){return!this.isCollapsed&&this._lastRangeBackward}get editableElement(){if(this.anchor){return this.anchor.editableElement}return null}*getRanges(){for(const t of this._ranges){yield t.clone()}}getFirstRange(){let t=null;for(const e of this._ranges){if(!t||e.start.isBefore(t.start)){t=e}}return t?t.clone():null}getLastRange(){let t=null;for(const e of this._ranges){if(!t||e.end.isAfter(t.end)){t=e}}return t?t.clone():null}getFirstPosition(){const t=this.getFirstRange();return t?t.start.clone():null}getLastPosition(){const t=this.getLastRange();return t?t.end.clone():null}isEqual(t){if(this.isFake!=t.isFake){return false}if(this.isFake&&this.fakeSelectionLabel!=t.fakeSelectionLabel){return false}if(this.rangeCount!=t.rangeCount){return false}else if(this.rangeCount===0){return true}if(!this.anchor.isEqual(t.anchor)||!this.focus.isEqual(t.focus)){return false}for(const e of this._ranges){let n=false;for(const o of t._ranges){if(e.isEqual(o)){n=true;break}}if(!n){return false}}return true}isSimilar(t){if(this.isBackward!=t.isBackward){return false}const e=vt(this.getRanges());const n=vt(t.getRanges());if(e!=n){return false}if(e==0){return true}for(let e of this.getRanges()){e=e.getTrimmed();let n=false;for(let o of t.getRanges()){o=o.getTrimmed();if(e.start.isEqual(o.start)&&e.end.isEqual(o.end)){n=true;break}}if(!n){return false}}return true}getSelectedElement(){if(this.rangeCount!==1){return null}return this.getFirstRange().getContainedElement()}setTo(...t){let[e,n,o]=t;if(typeof n=="object"){o=n;n=undefined}if(e===null){this._setRanges([]);this._setFakeOptions(o)}else if(e instanceof dp||e instanceof up){this._setRanges(e.getRanges(),e.isBackward);this._setFakeOptions({fake:e.isFake,label:e.fakeSelectionLabel})}else if(e instanceof cp){this._setRanges([e],o&&o.backward);this._setFakeOptions(o)}else if(e instanceof ap){this._setRanges([new cp(e)]);this._setFakeOptions(o)}else if(e instanceof Zu){const t=!!o&&!!o.backward;let i;if(n===undefined){throw new P("view-selection-setto-required-second-parameter",this)}else if(n=="in"){i=cp._createIn(e)}else if(n=="on"){i=cp._createOn(e)}else{i=new cp(ap._createAt(e,n))}this._setRanges([i],t);this._setFakeOptions(o)}else if(Ct(e)){this._setRanges(e,o&&o.backward);this._setFakeOptions(o)}else{throw new P("view-selection-setto-not-selectable",this)}this.fire("change")}setFocus(t,e){if(this.anchor===null){throw new P("view-selection-setfocus-no-ranges",this)}const n=ap._createAt(t,e);if(n.compareWith(this.focus)=="same"){return}const o=this.anchor;this._ranges.pop();if(n.compareWith(o)=="before"){this._addRange(new cp(n,o),true)}else{this._addRange(new cp(o,n))}this.fire("change")}_setRanges(t,e=false){t=Array.from(t);this._ranges=[];for(const e of t){this._addRange(e)}this._lastRangeBackward=!!e}_setFakeOptions(t={}){this._isFake=!!t.fake;this._fakeSelectionLabel=t.fake?t.label||"":""}_addRange(t,e=false){if(!(t instanceof cp)){throw new P("view-selection-add-range-not-range",this)}this._pushRange(t);this._lastRangeBackward=!!e}_pushRange(t){for(const e of this._ranges){if(t.isIntersecting(e)){throw new P("view-selection-range-intersects",this,{addedRange:t,intersectingRange:e})}}this._ranges.push(new cp(t.start,t.end))}}dp.prototype.is=function(t){return t==="selection"||t==="view:selection"};class up extends(q(Wu)){constructor(...t){super();this._selection=new dp;this._selection.delegate("change").to(this);if(t.length){this._selection.setTo(...t)}}get isFake(){return this._selection.isFake}get fakeSelectionLabel(){return this._selection.fakeSelectionLabel}get anchor(){return this._selection.anchor}get focus(){return this._selection.focus}get isCollapsed(){return this._selection.isCollapsed}get rangeCount(){return this._selection.rangeCount}get isBackward(){return this._selection.isBackward}get editableElement(){return this._selection.editableElement}get _ranges(){return this._selection._ranges}*getRanges(){yield*this._selection.getRanges()}getFirstRange(){return this._selection.getFirstRange()}getLastRange(){return this._selection.getLastRange()}getFirstPosition(){return this._selection.getFirstPosition()}getLastPosition(){return this._selection.getLastPosition()}getSelectedElement(){return this._selection.getSelectedElement()}isEqual(t){return this._selection.isEqual(t)}isSimilar(t){return this._selection.isSimilar(t)}_setTo(...t){this._selection.setTo(...t)}_setFocus(t,e){this._selection.setFocus(t,e)}}up.prototype.is=function(t){return t==="selection"||t=="documentSelection"||t=="view:selection"||t=="view:documentSelection"};class hp extends C{constructor(t,e,n){super(t,e);this.startRange=n;this._eventPhase="none";this._currentTarget=null}get eventPhase(){return this._eventPhase}get currentTarget(){return this._currentTarget}}const fp=Symbol("bubbling contexts");function pp(t){class e extends t{fire(t,...e){try{const n=t instanceof C?t:new C(this,t);const o=kp(this);if(!o.size){return}gp(n,"capturing",this);if(mp(o,"$capture",n,...e)){return n.return}const i=n.startRange||this.selection.getFirstRange();const r=i?i.getContainedElement():null;const s=r?Boolean(bp(o,r)):false;let a=r||wp(i);gp(n,"atTarget",a);if(!s){if(mp(o,"$text",n,...e)){return n.return}gp(n,"bubbling",a)}while(a){if(a.is("rootElement")){if(mp(o,"$root",n,...e)){return n.return}}else if(a.is("element")){if(mp(o,a.name,n,...e)){return n.return}}if(mp(o,a,n,...e)){return n.return}a=a.parent;gp(n,"bubbling",a)}gp(n,"bubbling",this);mp(o,"$document",n,...e);return n.return}catch(t){P.rethrowUnexpectedError(t,this)}}_addEventListener(t,e,n){const o=el(n.context||"$document");const i=kp(this);for(const r of o){let o=i.get(r);if(!o){o=new(q());i.set(r,o)}this.listenTo(o,t,e,n)}}_removeEventListener(t,e){const n=kp(this);for(const o of n.values()){this.stopListening(o,t,e)}}}return e}{const t=pp(Object);["fire","_addEventListener","_removeEventListener"].forEach((e=>{pp[e]=t.prototype[e]}))}function gp(t,e,n){if(t instanceof hp){t._eventPhase=e;t._currentTarget=n}}function mp(t,e,n,...o){const i=typeof e=="string"?t.get(e):bp(t,e);if(!i){return false}i.fire(n,...o);return n.stop.called}function bp(t,e){for(const[n,o]of t){if(typeof n=="function"&&n(e)){return o}}return null}function kp(t){if(!t[fp]){t[fp]=new Map}return t[fp]}function wp(t){if(!t){return null}const e=t.start.parent;const n=t.end.parent;const o=e.getPath();const i=n.getPath();return o.length>i.length?e:n}class _p extends(pp(lt())){constructor(t){super();this._postFixers=new Set;this.selection=new up;this.roots=new ul({idProperty:"rootName"});this.stylesProcessor=t;this.set("isReadOnly",false);this.set("isFocused",false);this.set("isSelecting",false);this.set("isComposing",false)}getRoot(t="main"){return this.roots.get(t)}registerPostFixer(t){this._postFixers.add(t)}destroy(){this.roots.map((t=>t.destroy()));this.stopListening()}_callPostFixers(t){let e=false;do{for(const n of this._postFixers){e=n(t);if(e){break}}}while(e)}}const vp=10;class Ap extends Yf{constructor(t,e,n,o){super(t,e,n,o);this._priority=vp;this._id=null;this._clonesGroup=null;this.getFillerOffset=Cp}get priority(){return this._priority}get id(){return this._id}getElementsWithSameId(){if(this.id===null){throw new P("attribute-element-get-elements-with-same-id-no-id",this)}return new Set(this._clonesGroup)}isSimilar(t){if(this.id!==null||t.id!==null){return this.id===t.id}return super.isSimilar(t)&&this.priority==t.priority}_clone(t=false){const e=super._clone(t);e._priority=this._priority;e._id=this._id;return e}}Ap.DEFAULT_PRIORITY=vp;Ap.prototype.is=function(t,e){if(!e){return t==="attributeElement"||t==="view:attributeElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="attributeElement"||t==="view:attributeElement"||t==="element"||t==="view:element")}};function Cp(){if(yp(this)){return null}let t=this.parent;while(t&&t.is("attributeElement")){if(yp(t)>1){return null}t=t.parent}if(!t||yp(t)>1){return null}return this.childCount}function yp(t){return Array.from(t.getChildren()).filter((t=>!t.is("uiElement"))).length}class xp extends Yf{constructor(t,e,n,o){super(t,e,n,o);this.getFillerOffset=Ep}_insertChild(t,e){if(e&&(e instanceof Zu||Array.from(e).length>0)){throw new P("view-emptyelement-cannot-add",[this,e])}return 0}}xp.prototype.is=function(t,e){if(!e){return t==="emptyElement"||t==="view:emptyElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="emptyElement"||t==="view:emptyElement"||t==="element"||t==="view:element")}};function Ep(){return null}class Sp extends Yf{constructor(t,e,n,o){super(t,e,n,o);this.getFillerOffset=Tp}_insertChild(t,e){if(e&&(e instanceof Zu||Array.from(e).length>0)){throw new P("view-uielement-cannot-add",[this,e])}return 0}render(t,e){return this.toDomElement(t)}toDomElement(t){const e=t.createElement(this.name);for(const t of this.getAttributeKeys()){e.setAttribute(t,this.getAttribute(t))}return e}}Sp.prototype.is=function(t,e){if(!e){return t==="uiElement"||t==="view:uiElement"||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="uiElement"||t==="view:uiElement"||t==="element"||t==="view:element")}};function Dp(t){t.document.on("arrowKey",((e,n)=>Pp(e,n,t.domConverter)),{priority:"low"})}function Tp(){return null}function Pp(t,e,n){if(e.keyCode==$c.arrowright){const t=e.domTarget.ownerDocument.defaultView.getSelection();const o=t.rangeCount==1&&t.getRangeAt(0).collapsed;if(o||e.shiftKey){const e=t.focusNode;const i=t.focusOffset;const r=n.domPositionToView(e,i);if(r===null){return}let s=false;const a=r.getLastMatchingPosition((t=>{if(t.item.is("uiElement")){s=true}if(t.item.is("uiElement")||t.item.is("attributeElement")){return true}return false}));if(s){const e=n.viewPositionToDom(a);if(o){t.collapse(e.parent,e.offset)}else{t.extend(e.parent,e.offset)}}}}}class Bp extends Yf{constructor(t,e,n,o){super(t,e,n,o);this.getFillerOffset=Ip}_insertChild(t,e){if(e&&(e instanceof Zu||Array.from(e).length>0)){throw new P("view-rawelement-cannot-add",[this,e])}return 0}render(t,e){}}Bp.prototype.is=function(t,e){if(!e){return t==="rawElement"||t==="view:rawElement"||t===this.name||t==="view:"+this.name||t==="element"||t==="view:element"||t==="node"||t==="view:node"}else{return e===this.name&&(t==="rawElement"||t==="view:rawElement"||t==="element"||t==="view:element")}};function Ip(){return null}class Rp extends(q(Wu)){constructor(t,e){super();this._children=[];this._customProperties=new Map;this.document=t;if(e){this._insertChild(0,e)}}[Symbol.iterator](){return this._children[Symbol.iterator]()}get childCount(){return this._children.length}get isEmpty(){return this.childCount===0}get root(){return this}get parent(){return null}get name(){return undefined}getCustomProperty(t){return this._customProperties.get(t)}*getCustomProperties(){yield*this._customProperties.entries()}_appendChild(t){return this._insertChild(this.childCount,t)}getChild(t){return this._children[t]}getChildIndex(t){return this._children.indexOf(t)}getChildren(){return this._children[Symbol.iterator]()}_insertChild(t,e){this._fireChange("children",this);let n=0;const o=Op(this.document,e);for(const e of o){if(e.parent!==null){e._remove()}e.parent=this;this._children.splice(t,0,e);t++;n++}return n}_removeChildren(t,e=1){this._fireChange("children",this);for(let n=t;n<t+e;n++){this._children[n].parent=null}return this._children.splice(t,e)}_fireChange(t,e){this.fire("change:"+t,e)}_setCustomProperty(t,e){this._customProperties.set(t,e)}_removeCustomProperty(t){return this._customProperties.delete(t)}}Rp.prototype.is=function(t){return t==="documentFragment"||t==="view:documentFragment"};function Op(t,e){if(typeof e=="string"){return[new Ju(t,e)]}if(!Ct(e)){e=[e]}return Array.from(e).map((e=>{if(typeof e=="string"){return new Ju(t,e)}if(e instanceof Yu){return new Ju(t,e.data)}return e}))}class Mp{constructor(t){this._cloneGroups=new Map;this._slotFactory=null;this.document=t}setSelection(...t){this.document.selection._setTo(...t)}setSelectionFocus(t,e){this.document.selection._setFocus(t,e)}createDocumentFragment(t){return new Rp(this.document,t)}createText(t){return new Ju(this.document,t)}createAttributeElement(t,e,n={}){const o=new Ap(this.document,t,e);if(typeof n.priority==="number"){o._priority=n.priority}if(n.id){o._id=n.id}if(n.renderUnsafeAttributes){o._unsafeAttributesToRender.push(...n.renderUnsafeAttributes)}return o}createContainerElement(t,e,n={},o={}){let i=null;if(ue(n)){o=n}else{i=n}const r=new ep(this.document,t,e,i);if(o.renderUnsafeAttributes){r._unsafeAttributesToRender.push(...o.renderUnsafeAttributes)}return r}createEditableElement(t,e,n={}){const o=new op(this.document,t,e);if(n.renderUnsafeAttributes){o._unsafeAttributesToRender.push(...n.renderUnsafeAttributes)}return o}createEmptyElement(t,e,n={}){const o=new xp(this.document,t,e);if(n.renderUnsafeAttributes){o._unsafeAttributesToRender.push(...n.renderUnsafeAttributes)}return o}createUIElement(t,e,n){const o=new Sp(this.document,t,e);if(n){o.render=n}return o}createRawElement(t,e,n,o={}){const i=new Bp(this.document,t,e);if(n){i.render=n}if(o.renderUnsafeAttributes){i._unsafeAttributesToRender.push(...o.renderUnsafeAttributes)}return i}setAttribute(t,e,n){n._setAttribute(t,e)}removeAttribute(t,e){e._removeAttribute(t)}addClass(t,e){e._addClass(t)}removeClass(t,e){e._removeClass(t)}setStyle(t,e,n){if(ue(t)&&n===undefined){e._setStyle(t)}else{n._setStyle(t,e)}}removeStyle(t,e){e._removeStyle(t)}setCustomProperty(t,e,n){n._setCustomProperty(t,e)}removeCustomProperty(t,e){return e._removeCustomProperty(t)}breakAttributes(t){if(t instanceof ap){return this._breakAttributes(t)}else{return this._breakAttributesRange(t)}}breakContainer(t){const e=t.parent;if(!e.is("containerElement")){throw new P("view-writer-break-non-container-element",this.document)}if(!e.parent){throw new P("view-writer-break-root",this.document)}if(t.isAtStart){return ap._createBefore(e)}else if(!t.isAtEnd){const n=e._clone(false);this.insert(ap._createAfter(e),n);const o=new cp(t,ap._createAt(e,"end"));const i=new ap(n,0);this.move(o,i)}return ap._createAfter(e)}mergeAttributes(t){const e=t.offset;const n=t.parent;if(n.is("$text")){return t}if(n.is("attributeElement")&&n.childCount===0){const t=n.parent;const e=n.index;n._remove();this._removeFromClonedElementsGroup(n);return this.mergeAttributes(new ap(t,e))}const o=n.getChild(e-1);const i=n.getChild(e);if(!o||!i){return t}if(o.is("$text")&&i.is("$text")){return Hp(o,i)}else if(o.is("attributeElement")&&i.is("attributeElement")&&o.isSimilar(i)){const t=o.childCount;o._appendChild(i.getChildren());i._remove();this._removeFromClonedElementsGroup(i);return this.mergeAttributes(new ap(o,t))}return t}mergeContainers(t){const e=t.nodeBefore;const n=t.nodeAfter;if(!e||!n||!e.is("containerElement")||!n.is("containerElement")){throw new P("view-writer-merge-containers-invalid-position",this.document)}const o=e.getChild(e.childCount-1);const i=o instanceof Ju?ap._createAt(o,"end"):ap._createAt(e,"end");this.move(cp._createIn(n),ap._createAt(e,"end"));this.remove(cp._createOn(n));return i}insert(t,e){e=Ct(e)?[...e]:[e];qp(e,this.document);const n=e.reduce(((t,e)=>{const n=t[t.length-1];const o=!e.is("uiElement");if(!n||n.breakAttributes!=o){t.push({breakAttributes:o,nodes:[e]})}else{n.nodes.push(e)}return t}),[]);let o=null;let i=t;for(const{nodes:t,breakAttributes:e}of n){const n=this._insertNodes(i,t,e);if(!o){o=n.start}i=n.end}if(!o){return new cp(t)}return new cp(o,i)}remove(t){const e=t instanceof cp?t:cp._createOn(t);Wp(e,this.document);if(e.isCollapsed){return new Rp(this.document)}const{start:n,end:o}=this._breakAttributesRange(e,true);const i=n.parent;const r=o.offset-n.offset;const s=i._removeChildren(n.offset,r);for(const t of s){this._removeFromClonedElementsGroup(t)}const a=this.mergeAttributes(n);e.start=a;e.end=a.clone();return new Rp(this.document,s)}clear(t,e){Wp(t,this.document);const n=t.getWalker({direction:"backward",ignoreElementEnd:true});for(const o of n){const n=o.item;let i;if(n.is("element")&&e.isSimilar(n)){i=cp._createOn(n)}else if(!o.nextPosition.isAfter(t.start)&&n.is("$textProxy")){const t=n.getAncestors().find((t=>t.is("element")&&e.isSimilar(t)));if(t){i=cp._createIn(t)}}if(i){if(i.end.isAfter(t.end)){i.end=t.end}if(i.start.isBefore(t.start)){i.start=t.start}this.remove(i)}}}move(t,e){let n;if(e.isAfter(t.end)){e=this._breakAttributes(e,true);const o=e.parent;const i=o.childCount;t=this._breakAttributesRange(t,true);n=this.remove(t);e.offset+=o.childCount-i}else{n=this.remove(t)}return this.insert(e,n)}wrap(t,e){if(!(e instanceof Ap)){throw new P("view-writer-wrap-invalid-attribute",this.document)}Wp(t,this.document);if(!t.isCollapsed){return this._wrapRange(t,e)}else{let n=t.start;if(n.parent.is("element")&&!Vp(n.parent)){n=n.getLastMatchingPosition((t=>t.item.is("uiElement")))}n=this._wrapPosition(n,e);const o=this.document.selection;if(o.isCollapsed&&o.getFirstPosition().isEqual(t.start)){this.setSelection(n)}return new cp(n)}}unwrap(t,e){if(!(e instanceof Ap)){throw new P("view-writer-unwrap-invalid-attribute",this.document)}Wp(t,this.document);if(t.isCollapsed){return t}const{start:n,end:o}=this._breakAttributesRange(t,true);const i=n.parent;const r=this._unwrapChildren(i,n.offset,o.offset,e);const s=this.mergeAttributes(r.start);if(!s.isEqual(r.start)){r.end.offset--}const a=this.mergeAttributes(r.end);return new cp(s,a)}rename(t,e){const n=new ep(this.document,t,e.getAttributes());this.insert(ap._createAfter(e),n);this.move(cp._createIn(e),ap._createAt(n,0));this.remove(cp._createOn(e));return n}clearClonedElementsGroup(t){this._cloneGroups.delete(t)}createPositionAt(t,e){return ap._createAt(t,e)}createPositionAfter(t){return ap._createAfter(t)}createPositionBefore(t){return ap._createBefore(t)}createRange(t,e){return new cp(t,e)}createRangeOn(t){return cp._createOn(t)}createRangeIn(t){return cp._createIn(t)}createSelection(...t){return new dp(...t)}createSlot(t="children"){if(!this._slotFactory){throw new P("view-writer-invalid-create-slot-context",this.document)}return this._slotFactory(this,t)}_registerSlotFactory(t){this._slotFactory=t}_clearSlotFactory(){this._slotFactory=null}_insertNodes(t,e,n){let o;if(n){o=zp(t)}else{o=t.parent.is("$text")?t.parent.parent:t.parent}if(!o){throw new P("view-writer-invalid-position-container",this.document)}let i;if(n){i=this._breakAttributes(t,true)}else{i=t.parent.is("$text")?Lp(t):t}const r=o._insertChild(i.offset,e);for(const t of e){this._addToClonedElementsGroup(t)}const s=i.getShiftedBy(r);const a=this.mergeAttributes(i);if(!a.isEqual(i)){s.offset--}const c=this.mergeAttributes(s);return new cp(a,c)}_wrapChildren(t,e,n,o){let i=e;const r=[];while(i<n){const e=t.getChild(i);const n=e.is("$text");const s=e.is("attributeElement");if(s&&this._wrapAttributeElement(o,e)){r.push(new ap(t,i))}else if(n||!s||Fp(o,e)){const n=o._clone();e._remove();n._appendChild(e);t._insertChild(i,n);this._addToClonedElementsGroup(n);r.push(new ap(t,i))}else{this._wrapChildren(e,0,e.childCount,o)}i++}let s=0;for(const t of r){t.offset-=s;if(t.offset==e){continue}const o=this.mergeAttributes(t);if(!o.isEqual(t)){s++;n--}}return cp._createFromParentsAndOffsets(t,e,t,n)}_unwrapChildren(t,e,n,o){let i=e;const r=[];while(i<n){const e=t.getChild(i);if(!e.is("attributeElement")){i++;continue}if(e.isSimilar(o)){const o=e.getChildren();const s=e.childCount;e._remove();t._insertChild(i,o);this._removeFromClonedElementsGroup(e);r.push(new ap(t,i),new ap(t,i+s));i+=s;n+=s-1;continue}if(this._unwrapAttributeElement(o,e)){r.push(new ap(t,i),new ap(t,i+1));i++;continue}this._unwrapChildren(e,0,e.childCount,o);i++}let s=0;for(const t of r){t.offset-=s;if(t.offset==e||t.offset==n){continue}const o=this.mergeAttributes(t);if(!o.isEqual(t)){s++;n--}}return cp._createFromParentsAndOffsets(t,e,t,n)}_wrapRange(t,e){const{start:n,end:o}=this._breakAttributesRange(t,true);const i=n.parent;const r=this._wrapChildren(i,n.offset,o.offset,e);const s=this.mergeAttributes(r.start);if(!s.isEqual(r.start)){r.end.offset--}const a=this.mergeAttributes(r.end);return new cp(s,a)}_wrapPosition(t,e){if(e.isSimilar(t.parent)){return Np(t.clone())}if(t.parent.is("$text")){t=Lp(t)}const n=this.createAttributeElement("_wrapPosition-fake-element");n._priority=Number.POSITIVE_INFINITY;n.isSimilar=()=>false;t.parent._insertChild(t.offset,n);const o=new cp(t,t.getShiftedBy(1));this.wrap(o,e);const i=new ap(n.parent,n.index);n._remove();const r=i.nodeBefore;const s=i.nodeAfter;if(r instanceof Ju&&s instanceof Ju){return Hp(r,s)}return Np(i)}_wrapAttributeElement(t,e){if(!Gp(t,e)){return false}if(t.name!==e.name||t.priority!==e.priority){return false}for(const n of t.getAttributeKeys()){if(n==="class"||n==="style"){continue}if(e.hasAttribute(n)&&e.getAttribute(n)!==t.getAttribute(n)){return false}}for(const n of t.getStyleNames()){if(e.hasStyle(n)&&e.getStyle(n)!==t.getStyle(n)){return false}}for(const n of t.getAttributeKeys()){if(n==="class"||n==="style"){continue}if(!e.hasAttribute(n)){this.setAttribute(n,t.getAttribute(n),e)}}for(const n of t.getStyleNames()){if(!e.hasStyle(n)){this.setStyle(n,t.getStyle(n),e)}}for(const n of t.getClassNames()){if(!e.hasClass(n)){this.addClass(n,e)}}return true}_unwrapAttributeElement(t,e){if(!Gp(t,e)){return false}if(t.name!==e.name||t.priority!==e.priority){return false}for(const n of t.getAttributeKeys()){if(n==="class"||n==="style"){continue}if(!e.hasAttribute(n)||e.getAttribute(n)!==t.getAttribute(n)){return false}}if(!e.hasClass(...t.getClassNames())){return false}for(const n of t.getStyleNames()){if(!e.hasStyle(n)||e.getStyle(n)!==t.getStyle(n)){return false}}for(const n of t.getAttributeKeys()){if(n==="class"||n==="style"){continue}this.removeAttribute(n,e)}this.removeClass(Array.from(t.getClassNames()),e);this.removeStyle(Array.from(t.getStyleNames()),e);return true}_breakAttributesRange(t,e=false){const n=t.start;const o=t.end;Wp(t,this.document);if(t.isCollapsed){const n=this._breakAttributes(t.start,e);return new cp(n,n)}const i=this._breakAttributes(o,e);const r=i.parent.childCount;const s=this._breakAttributes(n,e);i.offset+=i.parent.childCount-r;return new cp(s,i)}_breakAttributes(t,e=false){const n=t.offset;const o=t.parent;if(t.parent.is("emptyElement")){throw new P("view-writer-cannot-break-empty-element",this.document)}if(t.parent.is("uiElement")){throw new P("view-writer-cannot-break-ui-element",this.document)}if(t.parent.is("rawElement")){throw new P("view-writer-cannot-break-raw-element",this.document)}if(!e&&o.is("$text")&&$p(o.parent)){return t.clone()}if($p(o)){return t.clone()}if(o.is("$text")){return this._breakAttributes(Lp(t),e)}const i=o.childCount;if(n==i){const t=new ap(o.parent,o.index+1);return this._breakAttributes(t,e)}else{if(n===0){const t=new ap(o.parent,o.index);return this._breakAttributes(t,e)}else{const t=o.index+1;const i=o._clone();o.parent._insertChild(t,i);this._addToClonedElementsGroup(i);const r=o.childCount-n;const s=o._removeChildren(n,r);i._appendChild(s);const a=new ap(o.parent,t);return this._breakAttributes(a,e)}}}_addToClonedElementsGroup(t){if(!t.root.is("rootElement")){return}if(t.is("element")){for(const e of t.getChildren()){this._addToClonedElementsGroup(e)}}const e=t.id;if(!e){return}let n=this._cloneGroups.get(e);if(!n){n=new Set;this._cloneGroups.set(e,n)}n.add(t);t._clonesGroup=n}_removeFromClonedElementsGroup(t){if(t.is("element")){for(const e of t.getChildren()){this._removeFromClonedElementsGroup(e)}}const e=t.id;if(!e){return}const n=this._cloneGroups.get(e);if(!n){return}n.delete(t)}}function Vp(t){return Array.from(t.getChildren()).some((t=>!t.is("uiElement")))}function zp(t){let e=t.parent;while(!$p(e)){if(!e){return undefined}e=e.parent}return e}function Fp(t,e){if(t.priority<e.priority){return true}else if(t.priority>e.priority){return false}return t.getIdentity()<e.getIdentity()}function Np(t){const e=t.nodeBefore;if(e&&e.is("$text")){return new ap(e,e.data.length)}const n=t.nodeAfter;if(n&&n.is("$text")){return new ap(n,0)}return t}function Lp(t){if(t.offset==t.parent.data.length){return new ap(t.parent.parent,t.parent.index+1)}if(t.offset===0){return new ap(t.parent.parent,t.parent.index)}const e=t.parent.data.slice(t.offset);t.parent._data=t.parent.data.slice(0,t.offset);t.parent.parent._insertChild(t.parent.index+1,new Ju(t.root.document,e));return new ap(t.parent.parent,t.parent.index+1)}function Hp(t,e){const n=t.data.length;t._data+=e.data;e._remove();return new ap(t,n)}const jp=[Ju,Ap,ep,xp,Bp,Sp];function qp(t,e){for(const n of t){if(!jp.some((t=>n instanceof t))){throw new P("view-writer-insert-invalid-node-type",e)}if(!n.is("$text")){qp(n.getChildren(),e)}}}function $p(t){return t&&(t.is("containerElement")||t.is("documentFragment"))}function Wp(t,e){const n=zp(t.start);const o=zp(t.end);if(!n||!o||n!==o){throw new P("view-writer-invalid-range-container",e)}}function Gp(t,e){return t.id===null&&e.id===null}const Kp=t=>t.createTextNode(" ");const Up=t=>{const e=t.createElement("span");e.dataset.ckeFiller="true";e.innerText=" ";return e};const Zp=t=>{const e=t.createElement("br");e.dataset.ckeFiller="true";return e};const Jp=7;const Yp="⁠".repeat(Jp);function Qp(t){if(typeof t=="string"){return t.substr(0,Jp)===Yp}return oc(t)&&t.data.substr(0,Jp)===Yp}function Xp(t){return t.data.length==Jp&&Qp(t)}function tg(t){const e=typeof t=="string"?t:t.data;if(Qp(t)){return e.slice(Jp)}return e}function eg(t){t.document.on("arrowKey",ng,{priority:"low"})}function ng(t,e){if(e.keyCode==$c.arrowleft){const t=e.domTarget.ownerDocument.defaultView.getSelection();if(t.rangeCount==1&&t.getRangeAt(0).collapsed){const e=t.getRangeAt(0).startContainer;const n=t.getRangeAt(0).startOffset;if(Qp(e)&&n<=Jp){t.collapse(e,0)}}}}var og=n(37);var ig={injectType:"singletonStyleTag",attributes:{"data-cke":true}};ig.insert="head";ig.singleton=true;var rg=Il()(og.Z,ig);const sg=og.Z.locals||{};class ag extends(lt()){constructor(t,e){super();this.domDocuments=new Set;this.markedAttributes=new Set;this.markedChildren=new Set;this.markedTexts=new Set;this._inlineFiller=null;this._fakeSelectionContainer=null;this.domConverter=t;this.selection=e;this.set("isFocused",false);this.set("isSelecting",false);if(r.isBlink&&!r.isAndroid){this.on("change:isSelecting",(()=>{if(!this.isSelecting){this.render()}}))}this.set("isComposing",false);this.on("change:isComposing",(()=>{if(!this.isComposing){this.render()}}))}markToSync(t,e){if(t==="text"){if(this.domConverter.mapViewToDom(e.parent)){this.markedTexts.add(e)}}else{if(!this.domConverter.mapViewToDom(e)){return}if(t==="attributes"){this.markedAttributes.add(e)}else if(t==="children"){this.markedChildren.add(e)}else{const e=t;throw new P("view-renderer-unknown-type",this)}}}render(){if(this.isComposing&&!r.isAndroid){return}let t=null;const e=r.isBlink&&!r.isAndroid?!this.isSelecting:true;for(const t of this.markedChildren){this._updateChildrenMappings(t)}if(e){if(this._inlineFiller&&!this._isSelectionInInlineFiller()){this._removeInlineFiller()}if(this._inlineFiller){t=this._getInlineFillerPosition()}else if(this._needsInlineFillerAtSelection()){t=this.selection.getFirstPosition();this.markedChildren.add(t.parent)}}else if(this._inlineFiller&&this._inlineFiller.parentNode){t=this.domConverter.domPositionToView(this._inlineFiller);if(t&&t.parent.is("$text")){t=ap._createBefore(t.parent)}}for(const t of this.markedAttributes){this._updateAttrs(t)}for(const e of this.markedChildren){this._updateChildren(e,{inlineFillerPosition:t})}for(const e of this.markedTexts){if(!this.markedChildren.has(e.parent)&&this.domConverter.mapViewToDom(e.parent)){this._updateText(e,{inlineFillerPosition:t})}}if(e){if(t){const e=this.domConverter.viewPositionToDom(t);const n=e.parent.ownerDocument;if(!Qp(e.parent)){this._inlineFiller=lg(n,e.parent,e.offset)}else{this._inlineFiller=e.parent}}else{this._inlineFiller=null}}this._updateFocus();this._updateSelection();this.markedTexts.clear();this.markedAttributes.clear();this.markedChildren.clear()}_updateChildrenMappings(t){const e=this.domConverter.mapViewToDom(t);if(!e){return}const n=Array.from(this.domConverter.mapViewToDom(t).childNodes);const o=Array.from(this.domConverter.viewChildrenToDom(t,{withChildren:false}));const i=this._diffNodeLists(n,o);const r=this._findUpdateActions(i,n,o,dg);if(r.indexOf("update")!==-1){const e={equal:0,insert:0,delete:0};for(const i of r){if(i==="update"){const i=e.equal+e.insert;const r=e.equal+e.delete;const s=t.getChild(i);if(s&&!(s.is("uiElement")||s.is("rawElement"))){this._updateElementMappings(s,n[r])}Tc(o[i]);e.equal++}else{e[i]++}}}}_updateElementMappings(t,e){this.domConverter.unbindDomElement(e);this.domConverter.bindElements(e,t);this.markedChildren.add(t);this.markedAttributes.add(t)}_getInlineFillerPosition(){const t=this.selection.getFirstPosition();if(t.parent.is("$text")){return ap._createBefore(t.parent)}else{return t}}_isSelectionInInlineFiller(){if(this.selection.rangeCount!=1||!this.selection.isCollapsed){return false}const t=this.selection.getFirstPosition();const e=this.domConverter.viewPositionToDom(t);if(e&&oc(e.parent)&&Qp(e.parent)){return true}return false}_removeInlineFiller(){const t=this._inlineFiller;if(!Qp(t)){throw new P("view-renderer-filler-was-lost",this)}if(Xp(t)){t.remove()}else{t.data=t.data.substr(Jp)}this._inlineFiller=null}_needsInlineFillerAtSelection(){if(this.selection.rangeCount!=1||!this.selection.isCollapsed){return false}const t=this.selection.getFirstPosition();const e=t.parent;const n=t.offset;if(!this.domConverter.mapViewToDom(e.root)){return false}if(!e.is("element")){return false}if(!cg(e)){return false}if(n===e.getFillerOffset()){return false}const o=t.nodeBefore;const i=t.nodeAfter;if(o instanceof Ju||i instanceof Ju){return false}if(r.isAndroid&&(o||i)){return false}return true}_updateText(t,e){const n=this.domConverter.findCorrespondingDomText(t);const o=this.domConverter.viewToDom(t);let i=o.data;const r=e.inlineFillerPosition;if(r&&r.parent==t.parent&&r.offset==t.index){i=Yp+i}mg(n,i)}_updateAttrs(t){const e=this.domConverter.mapViewToDom(t);if(!e){return}const n=Array.from(e.attributes).map((t=>t.name));const o=t.getAttributeKeys();for(const n of o){this.domConverter.setDomElementAttribute(e,n,t.getAttribute(n),t)}for(const o of n){if(!t.hasAttribute(o)){this.domConverter.removeDomElementAttribute(e,o)}}}_updateChildren(t,e){const n=this.domConverter.mapViewToDom(t);if(!n){return}if(r.isAndroid){let t=null;for(const e of Array.from(n.childNodes)){if(t&&oc(t)&&oc(e)){n.normalize();break}t=e}}const o=e.inlineFillerPosition;const i=n.childNodes;const s=Array.from(this.domConverter.viewChildrenToDom(t,{bind:true}));if(o&&o.parent===t){lg(n.ownerDocument,s,o.offset)}const a=this._diffNodeLists(i,s);const c=this._findUpdateActions(a,i,s,ug);let l=0;const d=new Set;for(const t of c){if(t==="delete"){d.add(i[l]);Tc(i[l])}else if(t==="equal"||t==="update"){l++}}l=0;for(const t of c){if(t==="insert"){kc(n,l,s[l]);l++}else if(t==="update"){mg(i[l],s[l].data);l++}else if(t==="equal"){this._markDescendantTextToSync(this.domConverter.domToView(s[l]));l++}}for(const t of d){if(!t.parentNode){this.domConverter.unbindDomElement(t)}}}_diffNodeLists(t,e){t=pg(t,this._fakeSelectionContainer);return _(t,e,hg.bind(null,this.domConverter))}_findUpdateActions(t,e,n,o){if(t.indexOf("insert")===-1||t.indexOf("delete")===-1){return t}let i=[];let r=[];let s=[];const a={equal:0,insert:0,delete:0};for(const c of t){if(c==="insert"){s.push(n[a.equal+a.insert])}else if(c==="delete"){r.push(e[a.equal+a.delete])}else{i=i.concat(_(r,s,o).map((t=>t==="equal"?"update":t)));i.push("equal");r=[];s=[]}a[c]++}return i.concat(_(r,s,o).map((t=>t==="equal"?"update":t)))}_markDescendantTextToSync(t){if(!t){return}if(t.is("$text")){this.markedTexts.add(t)}else if(t.is("element")){for(const e of t.getChildren()){this._markDescendantTextToSync(e)}}}_updateSelection(){if(r.isBlink&&!r.isAndroid&&this.isSelecting&&!this.markedChildren.size){return}if(this.selection.rangeCount===0){this._removeDomSelection();this._removeFakeSelection();return}const t=this.domConverter.mapViewToDom(this.selection.editableElement);if(!this.isFocused||!t){return}if(this.selection.isFake){this._updateFakeSelection(t)}else if(this._fakeSelectionContainer&&this._fakeSelectionContainer.isConnected){this._removeFakeSelection();this._updateDomSelection(t)}else if(!(this.isComposing&&r.isAndroid)){this._updateDomSelection(t)}}_updateFakeSelection(t){const e=t.ownerDocument;if(!this._fakeSelectionContainer){this._fakeSelectionContainer=gg(e)}const n=this._fakeSelectionContainer;this.domConverter.bindFakeSelection(n,this.selection);if(!this._fakeSelectionNeedsUpdate(t)){return}if(!n.parentElement||n.parentElement!=t){t.appendChild(n)}n.textContent=this.selection.fakeSelectionLabel||" ";const o=e.getSelection();const i=e.createRange();o.removeAllRanges();i.selectNodeContents(n);o.addRange(i)}_updateDomSelection(t){const e=t.ownerDocument.defaultView.getSelection();if(!this._domSelectionNeedsUpdate(e)){return}const n=this.domConverter.viewPositionToDom(this.selection.anchor);const o=this.domConverter.viewPositionToDom(this.selection.focus);e.setBaseAndExtent(n.parent,n.offset,o.parent,o.offset);if(r.isGecko){fg(o,e)}}_domSelectionNeedsUpdate(t){if(!this.domConverter.isDomSelectionCorrect(t)){return true}const e=t&&this.domConverter.domSelectionToView(t);if(e&&this.selection.isEqual(e)){return false}if(!this.selection.isCollapsed&&this.selection.isSimilar(e)){return false}return true}_fakeSelectionNeedsUpdate(t){const e=this._fakeSelectionContainer;const n=t.ownerDocument.getSelection();if(!e||e.parentElement!==t){return true}if(n.anchorNode!==e&&!e.contains(n.anchorNode)){return true}return e.textContent!==this.selection.fakeSelectionLabel}_removeDomSelection(){for(const t of this.domDocuments){const e=t.getSelection();if(e.rangeCount){const n=t.activeElement;const o=this.domConverter.mapDomToView(n);if(n&&o){e.removeAllRanges()}}}}_removeFakeSelection(){const t=this._fakeSelectionContainer;if(t){t.remove()}}_updateFocus(){if(this.isFocused){const t=this.selection.editableElement;if(t){this.domConverter.focus(t)}}}}function cg(t){if(t.getAttribute("contenteditable")=="false"){return false}const e=t.findAncestor((t=>t.hasAttribute("contenteditable")));return!e||e.getAttribute("contenteditable")=="true"}function lg(t,e,n){const o=e instanceof Array?e:e.childNodes;const i=o[n];if(oc(i)){i.data=Yp+i.data;return i}else{const i=t.createTextNode(Yp);if(Array.isArray(e)){o.splice(n,0,i)}else{kc(e,n,i)}return i}}function dg(t,e){return $a(t)&&$a(e)&&!oc(t)&&!oc(e)&&!wc(t)&&!wc(e)&&t.tagName.toLowerCase()===e.tagName.toLowerCase()}function ug(t,e){return $a(t)&&$a(e)&&oc(t)&&oc(e)}function hg(t,e,n){if(e===n){return true}else if(oc(e)&&oc(n)){return e.data===n.data}else if(t.isBlockFiller(e)&&t.isBlockFiller(n)){return true}return false}function fg(t,e){const n=t.parent;if(n.nodeType!=Node.ELEMENT_NODE||t.offset!=n.childNodes.length-1){return}const o=n.childNodes[t.offset];if(o&&o.tagName=="BR"){e.addRange(e.getRangeAt(0))}}function pg(t,e){const n=Array.from(t);if(n.length==0||!e){return n}const o=n[n.length-1];if(o==e){n.pop()}return n}function gg(t){const e=t.createElement("div");e.className="ck-fake-selection-container";Object.assign(e.style,{position:"fixed",top:0,left:"-9999px",width:"42px"});e.textContent=" ";return e}function mg(t,e){const n=t.data;if(n==e){return}const o=p(n,e);for(const e of o){if(e.type==="insert"){t.insertData(e.index,e.values.join(""))}else{t.deleteData(e.index,e.howMany)}}}const bg=Zp(Qa.document);const kg=Kp(Qa.document);const wg=Up(Qa.document);const _g="data-ck-unsafe-attribute-";const vg="data-ck-unsafe-element";class Ag{constructor(t,{blockFillerMode:e,renderingMode:n="editing"}={}){this._domToViewMapping=new WeakMap;this._viewToDomMapping=new WeakMap;this._fakeSelectionMapping=new WeakMap;this._rawContentElementMatcher=new Qu;this._inlineObjectElementMatcher=new Qu;this.document=t;this.renderingMode=n;this.blockFillerMode=e||(n==="editing"?"br":"nbsp");this.preElements=["pre"];this.blockElements=["address","article","aside","blockquote","caption","center","dd","details","dir","div","dl","dt","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","legend","li","main","menu","nav","ol","p","pre","section","summary","table","tbody","td","tfoot","th","thead","tr","ul"];this.inlineObjectElements=["object","iframe","input","button","textarea","select","option","video","embed","audio","img","canvas"];this.unsafeElements=["script","style"];this._domDocument=this.renderingMode==="editing"?Qa.document:Qa.document.implementation.createHTMLDocument("")}bindFakeSelection(t,e){this._fakeSelectionMapping.set(t,new dp(e))}fakeSelectionToView(t){return this._fakeSelectionMapping.get(t)}bindElements(t,e){this._domToViewMapping.set(t,e);this._viewToDomMapping.set(e,t)}unbindDomElement(t){const e=this._domToViewMapping.get(t);if(e){this._domToViewMapping.delete(t);this._viewToDomMapping.delete(e);for(const e of Array.from(t.children)){this.unbindDomElement(e)}}}bindDocumentFragments(t,e){this._domToViewMapping.set(t,e);this._viewToDomMapping.set(e,t)}shouldRenderAttribute(t,e,n){if(this.renderingMode==="data"){return true}t=t.toLowerCase();if(t.startsWith("on")){return false}if(t==="srcdoc"&&e.match(/\bon\S+\s*=|javascript:|<\s*\/*script/i)){return false}if(n==="img"&&(t==="src"||t==="srcset")){return true}if(n==="source"&&t==="srcset"){return true}if(e.match(/^\s*(javascript:|data:(image\/svg|text\/x?html))/i)){return false}return true}setContentOf(t,e){if(this.renderingMode==="data"){t.innerHTML=e;return}const n=(new DOMParser).parseFromString(e,"text/html");const o=n.createDocumentFragment();const i=n.body.childNodes;while(i.length>0){o.appendChild(i[0])}const r=n.createTreeWalker(o,NodeFilter.SHOW_ELEMENT);const s=[];let a;while(a=r.nextNode()){s.push(a)}for(const t of s){for(const e of t.getAttributeNames()){this.setDomElementAttribute(t,e,t.getAttribute(e))}const e=t.tagName.toLowerCase();if(this._shouldRenameElement(e)){Sg(e);t.replaceWith(this._createReplacementDomElement(e,t))}}while(t.firstChild){t.firstChild.remove()}t.append(o)}viewToDom(t,e={}){if(t.is("$text")){const e=this._processDataFromViewText(t);return this._domDocument.createTextNode(e)}else{if(this.mapViewToDom(t)){return this.mapViewToDom(t)}let n;if(t.is("documentFragment")){n=this._domDocument.createDocumentFragment();if(e.bind){this.bindDocumentFragments(n,t)}}else if(t.is("uiElement")){if(t.name==="$comment"){n=this._domDocument.createComment(t.getCustomProperty("$rawContent"))}else{n=t.render(this._domDocument,this)}if(e.bind){this.bindElements(n,t)}return n}else{if(this._shouldRenameElement(t.name)){Sg(t.name);n=this._createReplacementDomElement(t.name)}else if(t.hasAttribute("xmlns")){n=this._domDocument.createElementNS(t.getAttribute("xmlns"),t.name)}else{n=this._domDocument.createElement(t.name)}if(t.is("rawElement")){t.render(n,this)}if(e.bind){this.bindElements(n,t)}for(const e of t.getAttributeKeys()){this.setDomElementAttribute(n,e,t.getAttribute(e),t)}}if(e.withChildren!==false){for(const o of this.viewChildrenToDom(t,e)){n.appendChild(o)}}return n}}setDomElementAttribute(t,e,n,o){const i=this.shouldRenderAttribute(e,n,t.tagName.toLowerCase())||o&&o.shouldRenderUnsafeAttribute(e);if(!i){B("domconverter-unsafe-attribute-detected",{domElement:t,key:e,value:n})}if(!_c(e)){B("domconverter-invalid-attribute-detected",{domElement:t,key:e,value:n});return}if(t.hasAttribute(e)&&!i){t.removeAttribute(e)}else if(t.hasAttribute(_g+e)&&i){t.removeAttribute(_g+e)}t.setAttribute(i?e:_g+e,n)}removeDomElementAttribute(t,e){if(e==vg){return}t.removeAttribute(e);t.removeAttribute(_g+e)}*viewChildrenToDom(t,e={}){const n=t.getFillerOffset&&t.getFillerOffset();let o=0;for(const i of t.getChildren()){if(n===o){yield this._getBlockFiller()}const t=i.is("element")&&!!i.getCustomProperty("dataPipeline:transparentRendering")&&!hl(i.getAttributes());if(t&&this.renderingMode=="data"){yield*this.viewChildrenToDom(i,e)}else{if(t){B("domconverter-transparent-rendering-unsupported-in-editing-pipeline",{viewElement:i})}yield this.viewToDom(i,e)}o++}if(n===o){yield this._getBlockFiller()}}viewRangeToDom(t){const e=this.viewPositionToDom(t.start);const n=this.viewPositionToDom(t.end);const o=this._domDocument.createRange();o.setStart(e.parent,e.offset);o.setEnd(n.parent,n.offset);return o}viewPositionToDom(t){const e=t.parent;if(e.is("$text")){const n=this.findCorrespondingDomText(e);if(!n){return null}let o=t.offset;if(Qp(n)){o+=Jp}return{parent:n,offset:o}}else{let n,o,i;if(t.offset===0){n=this.mapViewToDom(e);if(!n){return null}i=n.childNodes[0]}else{const e=t.nodeBefore;o=e.is("$text")?this.findCorrespondingDomText(e):this.mapViewToDom(e);if(!o){return null}n=o.parentNode;i=o.nextSibling}if(oc(i)&&Qp(i)){return{parent:i,offset:Jp}}const r=o?bc(o)+1:0;return{parent:n,offset:r}}}domToView(t,e={}){const n=[];const o=this._domToView(t,e,n);const i=o.next().value;if(!i){return null}o.next();this._processDomInlineNodes(null,n,e);if(i.is("$text")&&i.data.length==0){return null}return i}*domChildrenToView(t,e={},n=[]){for(let o=0;o<t.childNodes.length;o++){const i=t.childNodes[o];const r=this._domToView(i,e,n);const s=r.next().value;if(s!==null){if(this._isBlockViewElement(s)){this._processDomInlineNodes(t,n,e)}yield s;r.next()}}this._processDomInlineNodes(t,n,e)}domSelectionToView(t){if(t.rangeCount===1){let e=t.getRangeAt(0).startContainer;if(oc(e)){e=e.parentNode}const n=this.fakeSelectionToView(e);if(n){return n}}const e=this.isDomSelectionBackward(t);const n=[];for(let e=0;e<t.rangeCount;e++){const o=t.getRangeAt(e);const i=this.domRangeToView(o);if(i){n.push(i)}}return new dp(n,{backward:e})}domRangeToView(t){const e=this.domPositionToView(t.startContainer,t.startOffset);const n=this.domPositionToView(t.endContainer,t.endOffset);if(e&&n){return new cp(e,n)}return null}domPositionToView(t,e=0){if(this.isBlockFiller(t)){return this.domPositionToView(t.parentNode,bc(t))}const n=this.mapDomToView(t);if(n&&(n.is("uiElement")||n.is("rawElement"))){return ap._createBefore(n)}if(oc(t)){if(Xp(t)){return this.domPositionToView(t.parentNode,bc(t))}const n=this.findCorrespondingViewText(t);let o=e;if(!n){return null}if(Qp(t)){o-=Jp;o=o<0?0:o}return new ap(n,o)}else{if(e===0){const e=this.mapDomToView(t);if(e){return new ap(e,0)}}else{const n=t.childNodes[e-1];if(oc(n)&&Xp(n)||n&&this.isBlockFiller(n)){return this.domPositionToView(n.parentNode,bc(n))}const o=oc(n)?this.findCorrespondingViewText(n):this.mapDomToView(n);if(o&&o.parent){return new ap(o.parent,o.index+1)}}return null}}mapDomToView(t){const e=this.getHostViewElement(t);return e||this._domToViewMapping.get(t)}findCorrespondingViewText(t){if(Xp(t)){return null}const e=this.getHostViewElement(t);if(e){return e}const n=t.previousSibling;if(n){if(!this.isElement(n)){return null}const t=this.mapDomToView(n);if(t){const e=t.nextSibling;if(e instanceof Ju){return e}else{return null}}}else{const e=this.mapDomToView(t.parentNode);if(e){const t=e.getChild(0);if(t instanceof Ju){return t}else{return null}}}return null}mapViewToDom(t){return this._viewToDomMapping.get(t)}findCorrespondingDomText(t){const e=t.previousSibling;if(e&&this.mapViewToDom(e)){return this.mapViewToDom(e).nextSibling}if(!e&&t.parent&&this.mapViewToDom(t.parent)){return this.mapViewToDom(t.parent).childNodes[0]}return null}focus(t){const e=this.mapViewToDom(t);if(e&&e.ownerDocument.activeElement!==e){const{scrollX:t,scrollY:n}=Qa.window;const o=[];yg(e,(t=>{const{scrollLeft:e,scrollTop:n}=t;o.push([e,n])}));e.focus();yg(e,(t=>{const[e,n]=o.shift();t.scrollLeft=e;t.scrollTop=n}));Qa.window.scrollTo(t,n)}}_clearDomSelection(){const t=this.mapViewToDom(this.document.selection.editableElement);if(!t){return}const e=t.ownerDocument.defaultView.getSelection();const n=this.domSelectionToView(e);const o=n&&n.rangeCount>0;if(o){e.removeAllRanges()}}isElement(t){return t&&t.nodeType==Node.ELEMENT_NODE}isDocumentFragment(t){return t&&t.nodeType==Node.DOCUMENT_FRAGMENT_NODE}isBlockFiller(t){if(this.blockFillerMode=="br"){return t.isEqualNode(bg)}if(t.tagName==="BR"&&Eg(t,this.blockElements)&&t.parentNode.childNodes.length===1){return true}return t.isEqualNode(wg)||xg(t,this.blockElements)}isDomSelectionBackward(t){if(t.isCollapsed){return false}const e=this._domDocument.createRange();try{e.setStart(t.anchorNode,t.anchorOffset);e.setEnd(t.focusNode,t.focusOffset)}catch(t){return false}const n=e.collapsed;e.detach();return n}getHostViewElement(t){const e=tc(t);e.pop();while(e.length){const t=e.pop();const n=this._domToViewMapping.get(t);if(n&&(n.is("uiElement")||n.is("rawElement"))){return n}}return null}isDomSelectionCorrect(t){return this._isDomSelectionPositionCorrect(t.anchorNode,t.anchorOffset)&&this._isDomSelectionPositionCorrect(t.focusNode,t.focusOffset)}registerRawContentMatcher(t){this._rawContentElementMatcher.add(t)}registerInlineObjectMatcher(t){this._inlineObjectElementMatcher.add(t)}_getBlockFiller(){switch(this.blockFillerMode){case"nbsp":return Kp(this._domDocument);case"markedNbsp":return Up(this._domDocument);case"br":return Zp(this._domDocument)}}_isDomSelectionPositionCorrect(t,e){if(oc(t)&&Qp(t)&&e<Jp){return false}if(this.isElement(t)&&Qp(t.childNodes[e])){return false}const n=this.mapDomToView(t);if(n&&(n.is("uiElement")||n.is("rawElement"))){return false}return true}*_domToView(t,e,n){if(this.isBlockFiller(t)){return null}const o=this.getHostViewElement(t);if(o){return o}if(wc(t)&&e.skipComments){return null}if(oc(t)){if(Xp(t)){return null}else{const e=t.data;if(e===""){return null}const o=new Ju(this.document,e);n.push(o);return o}}else{let o=this.mapDomToView(t);if(o){if(this._isInlineObjectElement(o)){n.push(o)}return o}if(this.isDocumentFragment(t)){o=new Rp(this.document);if(e.bind){this.bindDocumentFragments(t,o)}}else{o=this._createViewElement(t,e);if(e.bind){this.bindElements(t,o)}const i=t.attributes;if(i){for(let t=i.length,e=0;e<t;e++){o._setAttribute(i[e].name,i[e].value)}}if(this._isViewElementWithRawContent(o,e)){o._setCustomProperty("$rawContent",t.innerHTML);if(!this._isBlockViewElement(o)){n.push(o)}return o}if(wc(t)){o._setCustomProperty("$rawContent",t.data);return o}}yield o;const i=[];if(e.withChildren!==false){for(const n of this.domChildrenToView(t,e,i)){o._appendChild(n)}}if(this._isInlineObjectElement(o)){n.push(o)}else{for(const t of i){n.push(t)}}}}_processDomInlineNodes(t,e,n){if(!e.length){return}if(t&&!this.isDocumentFragment(t)&&!this._isBlockDomElement(t)){return}let o=false;for(let t=0;t<e.length;t++){const i=e[t];if(!i.is("$text")){o=false;continue}let r;let s=false;if(Cg(i,this.preElements)){r=tg(i.data)}else{r=i.data.replace(/[ \n\t\r]{1,}/g," ");s=/[^\S\u00A0]/.test(r.charAt(r.length-1));const a=t>0?e[t-1]:null;const c=t+1<e.length?e[t+1]:null;const l=!a||a.is("element")&&a.name=="br"||o;const d=c?false:!Qp(i.data);if(n.withChildren!==false){if(l){r=r.replace(/^ /,"")}if(d){r=r.replace(/ $/,"")}}r=tg(r);r=r.replace(/ \u00A0/g,"  ");const u=c&&c.is("element")&&c.name!="br";const h=c&&c.is("$text")&&c.data.charAt(0)==" ";if(/[ \u00A0]\u00A0$/.test(r)||!c||u||h){r=r.replace(/\u00A0$/," ")}if(l||a&&a.is("element")&&a.name!="br"){r=r.replace(/^\u00A0/," ")}}if(r.length==0&&i.parent){i._remove();e.splice(t,1);t--}else{i._data=r;o=s}}e.length=0}_processDataFromViewText(t){let e=t.data;if(t.getAncestors().some((t=>this.preElements.includes(t.name)))){return e}if(e.charAt(0)==" "){const n=this._getTouchingInlineViewNode(t,false);const o=n&&n.is("$textProxy")&&this._nodeEndsWithSpace(n);if(o||!n){e=" "+e.substr(1)}}if(e.charAt(e.length-1)==" "){const n=this._getTouchingInlineViewNode(t,true);const o=n&&n.is("$textProxy")&&n.data.charAt(0)==" ";if(e.charAt(e.length-2)==" "||!n||o){e=e.substr(0,e.length-1)+" "}}return e.replace(/ {2}/g,"  ")}_nodeEndsWithSpace(t){if(t.getAncestors().some((t=>this.preElements.includes(t.name)))){return false}const e=this._processDataFromViewText(t);return e.charAt(e.length-1)==" "}_getTouchingInlineViewNode(t,e){const n=new sp({startPosition:e?ap._createAfter(t):ap._createBefore(t),direction:e?"forward":"backward"});for(const t of n){if(t.item.is("element","br")){return null}else if(this._isInlineObjectElement(t.item)){return t.item}else if(t.item.is("containerElement")){return null}else if(t.item.is("$textProxy")){return t.item}}return null}_isBlockDomElement(t){return this.isElement(t)&&this.blockElements.includes(t.tagName.toLowerCase())}_isBlockViewElement(t){return t.is("element")&&this.blockElements.includes(t.name)}_isInlineObjectElement(t){if(!t.is("element")){return false}return t.name=="br"||this.inlineObjectElements.includes(t.name)||!!this._inlineObjectElementMatcher.match(t)}_createViewElement(t,e){if(wc(t)){return new Sp(this.document,"$comment")}const n=e.keepOriginalCase?t.tagName:t.tagName.toLowerCase();return new Yf(this.document,n)}_isViewElementWithRawContent(t,e){return e.withChildren!==false&&t.is("element")&&!!this._rawContentElementMatcher.match(t)}_shouldRenameElement(t){const e=t.toLowerCase();return this.renderingMode==="editing"&&this.unsafeElements.includes(e)}_createReplacementDomElement(t,e){const n=this._domDocument.createElement("span");n.setAttribute(vg,t);if(e){while(e.firstChild){n.appendChild(e.firstChild)}for(const t of e.getAttributeNames()){n.setAttribute(t,e.getAttribute(t))}}return n}}function Cg(t,e){return t.getAncestors().some((t=>t.is("element")&&e.includes(t.name)))}function yg(t,e){let n=t;while(n){e(n);n=n.parentElement}}function xg(t,e){const n=t.isEqualNode(kg);return n&&Eg(t,e)&&t.parentNode.childNodes.length===1}function Eg(t,e){const n=t.parentNode;return!!n&&!!n.tagName&&e.includes(n.tagName.toLowerCase())}function Sg(t){if(t==="script"){B("domconverter-unsafe-script-element-detected")}if(t==="style"){B("domconverter-unsafe-style-element-detected")}}class Dg extends(Ka()){constructor(t){super();this._isEnabled=false;this.view=t;this.document=t.document}get isEnabled(){return this._isEnabled}enable(){this._isEnabled=true}disable(){this._isEnabled=false}destroy(){this.disable();this.stopListening()}checkShouldIgnoreEventFromTarget(t){if(t&&t.nodeType===3){t=t.parentNode}if(!t||t.nodeType!==1){return false}return t.matches("[data-cke-ignore-events], [data-cke-ignore-events] *")}}var Tg=Nf((function(t,e){po(e,Yi(e),t)}));const Pg=Tg;class Bg{constructor(t,e,n){this.view=t;this.document=t.document;this.domEvent=e;this.domTarget=e.target;Pg(this,n)}get target(){return this.view.domConverter.mapDomToView(this.domTarget)}preventDefault(){this.domEvent.preventDefault()}stopPropagation(){this.domEvent.stopPropagation()}}class Ig extends Dg{constructor(){super(...arguments);this.useCapture=false}observe(t){const e=typeof this.domEventType=="string"?[this.domEventType]:this.domEventType;e.forEach((e=>{this.listenTo(t,e,((t,e)=>{if(this.isEnabled&&!this.checkShouldIgnoreEventFromTarget(e.target)){this.onDomEvent(e)}}),{useCapture:this.useCapture})}))}stopObserving(t){this.stopListening(t)}fire(t,e,n){if(this.isEnabled){this.document.fire(t,new Bg(this.view,e,n))}}}class Rg extends Ig{constructor(){super(...arguments);this.domEventType=["keydown","keyup"]}onDomEvent(t){const e={keyCode:t.keyCode,altKey:t.altKey,ctrlKey:t.ctrlKey,shiftKey:t.shiftKey,metaKey:t.metaKey,get keystroke(){return Gc(this)}};this.fire(t.type,t,e)}}var Og=function(){return Dt.Date.now()};const Mg=Og;var Vg=/\s/;function zg(t){var e=t.length;while(e--&&Vg.test(t.charAt(e))){}return e}const Fg=zg;var Ng=/^\s+/;function Lg(t){return t?t.slice(0,Fg(t)+1).replace(Ng,""):t}const Hg=Lg;var jg=0/0;var qg=/^[-+]0x[0-9a-f]+$/i;var $g=/^0b[01]+$/i;var Wg=/^0o[0-7]+$/i;var Gg=parseInt;function Kg(t){if(typeof t=="number"){return t}if(dh(t)){return jg}if(nt(t)){var e=typeof t.valueOf=="function"?t.valueOf():t;t=nt(e)?e+"":e}if(typeof t!="string"){return t===0?t:+t}t=Hg(t);var n=$g.test(t);return n||Wg.test(t)?Gg(t.slice(2),n?2:8):qg.test(t)?jg:+t}const Ug=Kg;var Zg="Expected a function";var Jg=Math.max,Yg=Math.min;function Qg(t,e,n){var o,i,r,s,a,c,l=0,d=false,u=false,h=true;if(typeof t!="function"){throw new TypeError(Zg)}e=Ug(e)||0;if(nt(n)){d=!!n.leading;u="maxWait"in n;r=u?Jg(Ug(n.maxWait)||0,e):r;h="trailing"in n?!!n.trailing:h}function f(e){var n=o,r=i;o=i=undefined;l=e;s=t.apply(r,n);return s}function p(t){l=t;a=setTimeout(b,e);return d?f(t):s}function g(t){var n=t-c,o=t-l,i=e-n;return u?Yg(i,r-o):i}function m(t){var n=t-c,o=t-l;return c===undefined||n>=e||n<0||u&&o>=r}function b(){var t=Mg();if(m(t)){return k(t)}a=setTimeout(b,g(t))}function k(t){a=undefined;if(h&&o){return f(t)}o=i=undefined;return s}function w(){if(a!==undefined){clearTimeout(a)}l=0;o=c=i=a=undefined}function _(){return a===undefined?s:k(Mg())}function v(){var t=Mg(),n=m(t);o=arguments;i=this;c=t;if(n){if(a===undefined){return p(c)}if(u){clearTimeout(a);a=setTimeout(b,e);return f(c)}}if(a===undefined){a=setTimeout(b,e)}return s}v.cancel=w;v.flush=_;return v}const Xg=Qg;class tm extends Dg{constructor(t){super(t);this._fireSelectionChangeDoneDebounced=Xg((t=>{this.document.fire("selectionChangeDone",t)}),200)}observe(){const t=this.document;t.on("arrowKey",((e,n)=>{const o=t.selection;if(o.isFake&&this.isEnabled){n.preventDefault()}}),{context:"$capture"});t.on("arrowKey",((e,n)=>{const o=t.selection;if(o.isFake&&this.isEnabled){this._handleSelectionMove(n.keyCode)}}),{priority:"lowest"})}stopObserving(){}destroy(){super.destroy();this._fireSelectionChangeDoneDebounced.cancel()}_handleSelectionMove(t){const e=this.document.selection;const n=new dp(e.getRanges(),{backward:e.isBackward,fake:false});if(t==$c.arrowleft||t==$c.arrowup){n.setTo(n.getFirstPosition())}if(t==$c.arrowright||t==$c.arrowdown){n.setTo(n.getLastPosition())}const o={oldSelection:e,newSelection:n,domSelection:null};this.document.fire("selectionChange",o);this._fireSelectionChangeDoneDebounced(o)}}var em="__lodash_hash_undefined__";function nm(t){this.__data__.set(t,em);return this}const om=nm;function im(t){return this.__data__.has(t)}const rm=im;function sm(t){var e=-1,n=t==null?0:t.length;this.__data__=new Jn;while(++e<n){this.add(t[e])}}sm.prototype.add=sm.prototype.push=om;sm.prototype.has=rm;const am=sm;function cm(t,e){var n=-1,o=t==null?0:t.length;while(++n<o){if(e(t[n],n,t)){return true}}return false}const lm=cm;function dm(t,e){return t.has(e)}const um=dm;var hm=1,fm=2;function pm(t,e,n,o,i,r){var s=n&hm,a=t.length,c=e.length;if(a!=c&&!(s&&c>a)){return false}var l=r.get(t);var d=r.get(e);if(l&&d){return l==e&&d==t}var u=-1,h=true,f=n&fm?new am:undefined;r.set(t,e);r.set(e,t);while(++u<a){var p=t[u],g=e[u];if(o){var m=s?o(g,p,u,e,t,r):o(p,g,u,t,e,r)}if(m!==undefined){if(m){continue}h=false;break}if(f){if(!lm(e,(function(t,e){if(!um(f,e)&&(p===t||i(p,t,n,o,r))){return f.push(e)}}))){h=false;break}}else if(!(p===g||i(p,g,n,o,r))){h=false;break}}r["delete"](t);r["delete"](e);return h}const gm=pm;function mm(t){var e=-1,n=Array(t.size);t.forEach((function(t,o){n[++e]=[o,t]}));return n}const bm=mm;function km(t){var e=-1,n=Array(t.size);t.forEach((function(t){n[++e]=t}));return n}const wm=km;var _m=1,vm=2;var Am="[object Boolean]",Cm="[object Date]",ym="[object Error]",xm="[object Map]",Em="[object Number]",Sm="[object RegExp]",Dm="[object Set]",Tm="[object String]",Pm="[object Symbol]";var Bm="[object ArrayBuffer]",Im="[object DataView]";var Rm=Pt?Pt.prototype:undefined,Om=Rm?Rm.valueOf:undefined;function Mm(t,e,n,o,i,r,s){switch(n){case Im:if(t.byteLength!=e.byteLength||t.byteOffset!=e.byteOffset){return false}t=t.buffer;e=e.buffer;case Bm:if(t.byteLength!=e.byteLength||!r(new rs(t),new rs(e))){return false}return true;case Am:case Cm:case Em:return ge(+t,+e);case ym:return t.name==e.name&&t.message==e.message;case Sm:case Tm:return t==e+"";case xm:var a=bm;case Dm:var c=o&_m;a||(a=wm);if(t.size!=e.size&&!c){return false}var l=s.get(t);if(l){return l==e}o|=vm;s.set(t,e);var d=gm(a(t),a(e),o,i,r,s);s["delete"](t);return d;case Pm:if(Om){return Om.call(t)==Om.call(e)}}return false}const Vm=Mm;var zm=1;var Fm=Object.prototype;var Nm=Fm.hasOwnProperty;function Lm(t,e,n,o,i,r){var s=n&zm,a=Pr(t),c=a.length,l=Pr(e),d=l.length;if(c!=d&&!s){return false}var u=c;while(u--){var h=a[u];if(!(s?h in e:Nm.call(e,h))){return false}}var f=r.get(t);var p=r.get(e);if(f&&p){return f==e&&p==t}var g=true;r.set(t,e);r.set(e,t);var m=s;while(++u<c){h=a[u];var b=t[h],k=e[h];if(o){var w=s?o(k,b,h,e,t,r):o(b,k,h,t,e,r)}if(!(w===undefined?b===k||i(b,k,n,o,r):w)){g=false;break}m||(m=h=="constructor")}if(g&&!m){var _=t.constructor,v=e.constructor;if(_!=v&&("constructor"in t&&"constructor"in e)&&!(typeof _=="function"&&_ instanceof _&&typeof v=="function"&&v instanceof v)){g=false}}r["delete"](t);r["delete"](e);return g}const Hm=Lm;var jm=1;var qm="[object Arguments]",$m="[object Array]",Wm="[object Object]";var Gm=Object.prototype;var Km=Gm.hasOwnProperty;function Um(t,e,n,o,i,r){var s=Kt(t),a=Kt(e),c=s?$m:Xr(t),l=a?$m:Xr(e);c=c==qm?Wm:c;l=l==qm?Wm:l;var d=c==Wm,u=l==Wm,h=c==l;if(h&&Ro(t)){if(!Ro(e)){return false}s=true;d=false}if(h&&!d){r||(r=new eo);return s||yi(t)?gm(t,e,n,o,i,r):Vm(t,e,c,n,o,i,r)}if(!(n&jm)){var f=d&&Km.call(t,"__wrapped__"),p=u&&Km.call(e,"__wrapped__");if(f||p){var g=f?t.value():t,m=p?e.value():e;r||(r=new eo);return i(g,m,n,o,r)}}if(!h){return false}r||(r=new eo);return Hm(t,e,n,o,i,r)}const Zm=Um;function Jm(t,e,n,o,i){if(t===e){return true}if(t==null||e==null||!Zt(t)&&!Zt(e)){return t!==t&&e!==e}return Zm(t,e,n,o,Jm,i)}const Ym=Jm;function Qm(t,e,n){n=typeof n=="function"?n:undefined;var o=n?n(t,e):undefined;return o===undefined?Ym(t,e,undefined,n):!!o}const Xm=Qm;class tb extends Dg{constructor(t){super(t);this._config={childList:true,characterData:true,subtree:true};this.domConverter=t.domConverter;this.renderer=t._renderer;this._domElements=new Set;this._mutationObserver=new window.MutationObserver(this._onMutations.bind(this))}flush(){this._onMutations(this._mutationObserver.takeRecords())}observe(t){this._domElements.add(t);if(this.isEnabled){this._mutationObserver.observe(t,this._config)}}stopObserving(t){this._domElements.delete(t);if(this.isEnabled){this._mutationObserver.disconnect();for(const t of this._domElements){this._mutationObserver.observe(t,this._config)}}}enable(){super.enable();for(const t of this._domElements){this._mutationObserver.observe(t,this._config)}}disable(){super.disable();this._mutationObserver.disconnect()}destroy(){super.destroy();this._mutationObserver.disconnect()}_onMutations(t){if(t.length===0){return}const e=this.domConverter;const n=new Set;const o=new Set;for(const n of t){const t=e.mapDomToView(n.target);if(!t){continue}if(t.is("uiElement")||t.is("rawElement")){continue}if(n.type==="childList"&&!this._isBogusBrMutation(n)){o.add(t)}}for(const i of t){const t=e.mapDomToView(i.target);if(t&&(t.is("uiElement")||t.is("rawElement"))){continue}if(i.type==="characterData"){const t=e.findCorrespondingViewText(i.target);if(t&&!o.has(t.parent)){n.add(t)}else if(!t&&Qp(i.target)){o.add(e.mapDomToView(i.target.parentNode))}}}let i=false;for(const t of n){i=true;this.renderer.markToSync("text",t)}for(const t of o){const n=e.mapViewToDom(t);const o=Array.from(t.getChildren());const r=Array.from(e.domChildrenToView(n,{withChildren:false}));if(!Xm(o,r,eb)){i=true;this.renderer.markToSync("children",t)}}if(i){this.view.forceRender()}}_isBogusBrMutation(t){let e=null;if(t.nextSibling===null&&t.removedNodes.length===0&&t.addedNodes.length==1){e=this.domConverter.domToView(t.addedNodes[0],{withChildren:false})}return e&&e.is("element","br")}}function eb(t,e){if(Array.isArray(t)){return}if(t===e){return true}else if(t.is("$text")&&e.is("$text")){return t.data===e.data}return false}class nb extends Ig{constructor(t){super(t);this._isFocusChanging=false;this.domEventType=["focus","blur"];this.useCapture=true;const e=this.document;e.on("focus",(()=>{this._isFocusChanging=true;this._renderTimeoutId=setTimeout((()=>{this.flush();t.change((()=>{}))}),50)}));e.on("blur",((n,o)=>{const i=e.selection.editableElement;if(i===null||i===o.target){e.isFocused=false;this._isFocusChanging=false;t.change((()=>{}))}}))}flush(){if(this._isFocusChanging){this._isFocusChanging=false;this.document.isFocused=true}}onDomEvent(t){this.fire(t.type,t)}destroy(){if(this._renderTimeoutId){clearTimeout(this._renderTimeoutId)}super.destroy()}}class ob extends Dg{constructor(t){super(t);this.mutationObserver=t.getObserver(tb);this.focusObserver=t.getObserver(nb);this.selection=this.document.selection;this.domConverter=t.domConverter;this._documents=new WeakSet;this._fireSelectionChangeDoneDebounced=Xg((t=>{this.document.fire("selectionChangeDone",t)}),200);this._clearInfiniteLoopInterval=setInterval((()=>this._clearInfiniteLoop()),1e3);this._documentIsSelectingInactivityTimeoutDebounced=Xg((()=>this.document.isSelecting=false),5e3);this._loopbackCounter=0}observe(t){const e=t.ownerDocument;const n=()=>{this.document.isSelecting=true;this._documentIsSelectingInactivityTimeoutDebounced()};const o=()=>{if(!this.document.isSelecting){return}this._handleSelectionChange(null,e);this.document.isSelecting=false;this._documentIsSelectingInactivityTimeoutDebounced.cancel()};this.listenTo(t,"selectstart",n,{priority:"highest"});this.listenTo(t,"keydown",o,{priority:"highest",useCapture:true});this.listenTo(t,"keyup",o,{priority:"highest",useCapture:true});if(this._documents.has(e)){return}this.listenTo(e,"mouseup",o,{priority:"highest",useCapture:true});this.listenTo(e,"selectionchange",((t,n)=>{if(this.document.isComposing&&!r.isAndroid){return}this._handleSelectionChange(n,e);this._documentIsSelectingInactivityTimeoutDebounced()}));this._documents.add(e)}stopObserving(t){this.stopListening(t)}destroy(){super.destroy();clearInterval(this._clearInfiniteLoopInterval);this._fireSelectionChangeDoneDebounced.cancel();this._documentIsSelectingInactivityTimeoutDebounced.cancel()}_reportInfiniteLoop(){}_handleSelectionChange(t,e){if(!this.isEnabled){return}const n=e.defaultView.getSelection();if(this.checkShouldIgnoreEventFromTarget(n.anchorNode)){return}this.mutationObserver.flush();const o=this.domConverter.domSelectionToView(n);if(o.rangeCount==0){this.view.hasDomSelection=false;return}this.view.hasDomSelection=true;this.focusObserver.flush();if(this.selection.isEqual(o)&&this.domConverter.isDomSelectionCorrect(n)){return}if(++this._loopbackCounter>60){this._reportInfiniteLoop();return}if(this.selection.isSimilar(o)){this.view.forceRender()}else{const t={oldSelection:this.selection,newSelection:o,domSelection:n};this.document.fire("selectionChange",t);this._fireSelectionChangeDoneDebounced(t)}}_clearInfiniteLoop(){this._loopbackCounter=0}}class ib extends Ig{constructor(t){super(t);this.domEventType=["compositionstart","compositionupdate","compositionend"];const e=this.document;e.on("compositionstart",(()=>{e.isComposing=true}),{priority:"low"});e.on("compositionend",(()=>{e.isComposing=false}),{priority:"low"})}onDomEvent(t){this.fire(t.type,t,{data:t.data})}}class rb{constructor(t,e={}){this._files=e.cacheFiles?sb(t):null;this._native=t}get files(){if(!this._files){this._files=sb(this._native)}return this._files}get types(){return this._native.types}getData(t){return this._native.getData(t)}setData(t,e){this._native.setData(t,e)}set effectAllowed(t){this._native.effectAllowed=t}get effectAllowed(){return this._native.effectAllowed}set dropEffect(t){this._native.dropEffect=t}get dropEffect(){return this._native.dropEffect}setDragImage(t,e,n){this._native.setDragImage(t,e,n)}get isCanceled(){return this._native.dropEffect=="none"||!!this._native.mozUserCancelled}}function sb(t){const e=Array.from(t.files||[]);const n=Array.from(t.items||[]);if(e.length){return e}return n.filter((t=>t.kind==="file")).map((t=>t.getAsFile()))}class ab extends Ig{constructor(){super(...arguments);this.domEventType="beforeinput"}onDomEvent(t){const e=t.getTargetRanges();const n=this.view;const o=n.document;let i=null;let s=null;let a=[];if(t.dataTransfer){i=new rb(t.dataTransfer)}if(t.data!==null){s=t.data}else if(i){s=i.getData("text/plain")}if(o.selection.isFake){a=Array.from(o.selection.getRanges())}else if(e.length){a=e.map((t=>{const e=n.domConverter.domPositionToView(t.startContainer,t.startOffset);const o=n.domConverter.domPositionToView(t.endContainer,t.endOffset);if(e){return n.createRange(e,o)}else if(o){return n.createRange(o)}})).filter((t=>!!t))}else if(r.isAndroid){const e=t.target.ownerDocument.defaultView.getSelection();a=Array.from(n.domConverter.domSelectionToView(e).getRanges())}if(r.isAndroid&&t.inputType=="insertCompositionText"&&s&&s.endsWith("\n")){this.fire(t.type,t,{inputType:"insertParagraph",targetRanges:[n.createRange(a[0].end)]});return}if(t.inputType=="insertText"&&s&&s.includes("\n")){const e=s.split(/\n{1,2}/g);let n=a;for(let r=0;r<e.length;r++){const s=e[r];if(s!=""){this.fire(t.type,t,{data:s,dataTransfer:i,targetRanges:n,inputType:t.inputType,isComposing:t.isComposing});n=[o.selection.getFirstRange()]}if(r+1<e.length){this.fire(t.type,t,{inputType:"insertParagraph",targetRanges:n});n=[o.selection.getFirstRange()]}}return}this.fire(t.type,t,{data:s,dataTransfer:i,targetRanges:a,inputType:t.inputType,isComposing:t.isComposing})}}class cb extends Dg{constructor(t){super(t);this.document.on("keydown",((t,e)=>{if(this.isEnabled&&Zc(e.keyCode)){const n=new hp(this.document,"arrowKey",this.document.selection.getFirstRange());this.document.fire(n,e);if(n.stop.called){t.stop()}}}))}observe(){}stopObserving(){}}class lb extends Dg{constructor(t){super(t);const e=this.document;e.on("keydown",((t,n)=>{if(!this.isEnabled||n.keyCode!=$c.tab||n.ctrlKey){return}const o=new hp(e,"tab",e.selection.getFirstRange());e.fire(o,n);if(o.stop.called){t.stop()}}))}observe(){}stopObserving(){}}var db=1,ub=4;function hb(t){return Oa(t,db|ub)}const fb=hb;class pb extends(lt()){constructor(t){super();this.domRoots=new Map;this._initialDomRootAttributes=new WeakMap;this._observers=new Map;this._ongoingChange=false;this._postFixersInProgress=false;this._renderingDisabled=false;this._hasChangedSinceTheLastRendering=false;this.document=new _p(t);this.domConverter=new Ag(this.document);this.set("isRenderingInProgress",false);this.set("hasDomSelection",false);this._renderer=new ag(this.domConverter,this.document.selection);this._renderer.bind("isFocused","isSelecting","isComposing").to(this.document,"isFocused","isSelecting","isComposing");this._writer=new Mp(this.document);this.addObserver(tb);this.addObserver(nb);this.addObserver(ob);this.addObserver(Rg);this.addObserver(tm);this.addObserver(ib);this.addObserver(cb);this.addObserver(ab);this.addObserver(lb);eg(this);Dp(this);this.on("render",(()=>{this._render();this.document.fire("layoutChanged");this._hasChangedSinceTheLastRendering=false}));this.listenTo(this.document.selection,"change",(()=>{this._hasChangedSinceTheLastRendering=true}));this.listenTo(this.document,"change:isFocused",(()=>{this._hasChangedSinceTheLastRendering=true}));if(r.isiOS){this.listenTo(this.document,"blur",((t,e)=>{const n=this.domConverter.mapDomToView(e.domEvent.relatedTarget);if(!n){this.domConverter._clearDomSelection()}}))}}attachDomRoot(t,e="main"){const n=this.document.getRoot(e);n._name=t.tagName.toLowerCase();const o={};for(const{name:e,value:i}of Array.from(t.attributes)){o[e]=i;if(e==="class"){this._writer.addClass(i.split(" "),n)}else{this._writer.setAttribute(e,i,n)}}this._initialDomRootAttributes.set(t,o);const i=()=>{this._writer.setAttribute("contenteditable",(!n.isReadOnly).toString(),n);if(n.isReadOnly){this._writer.addClass("ck-read-only",n)}else{this._writer.removeClass("ck-read-only",n)}};i();this.domRoots.set(e,t);this.domConverter.bindElements(t,n);this._renderer.markToSync("children",n);this._renderer.markToSync("attributes",n);this._renderer.domDocuments.add(t.ownerDocument);n.on("change:children",((t,e)=>this._renderer.markToSync("children",e)));n.on("change:attributes",((t,e)=>this._renderer.markToSync("attributes",e)));n.on("change:text",((t,e)=>this._renderer.markToSync("text",e)));n.on("change:isReadOnly",(()=>this.change(i)));n.on("change",(()=>{this._hasChangedSinceTheLastRendering=true}));for(const n of this._observers.values()){n.observe(t,e)}}detachDomRoot(t){const e=this.domRoots.get(t);Array.from(e.attributes).forEach((({name:t})=>e.removeAttribute(t)));const n=this._initialDomRootAttributes.get(e);for(const t in n){e.setAttribute(t,n[t])}this.domRoots.delete(t);this.domConverter.unbindDomElement(e);for(const t of this._observers.values()){t.stopObserving(e)}}getDomRoot(t="main"){return this.domRoots.get(t)}addObserver(t){let e=this._observers.get(t);if(e){return e}e=new t(this);this._observers.set(t,e);for(const[t,n]of this.domRoots){e.observe(n,t)}e.enable();return e}getObserver(t){return this._observers.get(t)}disableObservers(){for(const t of this._observers.values()){t.disable()}}enableObservers(){for(const t of this._observers.values()){t.enable()}}scrollToTheSelection({alignToTop:t,forceScroll:e,viewportOffset:n=20,ancestorOffset:o=20}={}){const i=this.document.selection.getFirstRange();if(!i){return}const r=fb({alignToTop:t,forceScroll:e,viewportOffset:n,ancestorOffset:o});if(typeof n==="number"){n={top:n,bottom:n,left:n,right:n}}const s={target:this.domConverter.viewRangeToDom(i),viewportOffset:n,ancestorOffset:o,alignToTop:t,forceScroll:e};this.fire("scrollToTheSelection",s,r);Pc(s)}focus(){if(!this.document.isFocused){const t=this.document.selection.editableElement;if(t){this.domConverter.focus(t);this.forceRender()}else{}}}change(t){if(this.isRenderingInProgress||this._postFixersInProgress){throw new P("cannot-change-view-tree",this)}try{if(this._ongoingChange){return t(this._writer)}this._ongoingChange=true;const e=t(this._writer);this._ongoingChange=false;if(!this._renderingDisabled&&this._hasChangedSinceTheLastRendering){this._postFixersInProgress=true;this.document._callPostFixers(this._writer);this._postFixersInProgress=false;this.fire("render")}return e}catch(t){P.rethrowUnexpectedError(t,this)}}forceRender(){this._hasChangedSinceTheLastRendering=true;this.getObserver(nb).flush();this.change((()=>{}))}destroy(){for(const t of this._observers.values()){t.destroy()}this.document.destroy();this.stopListening()}createPositionAt(t,e){return ap._createAt(t,e)}createPositionAfter(t){return ap._createAfter(t)}createPositionBefore(t){return ap._createBefore(t)}createRange(t,e){return new cp(t,e)}createRangeOn(t){return cp._createOn(t)}createRangeIn(t){return cp._createIn(t)}createSelection(...t){return new dp(...t)}_disableRendering(t){this._renderingDisabled=t;if(t==false){this.change((()=>{}))}}_render(){this.isRenderingInProgress=true;this.disableObservers();this._renderer.render();this.enableObservers();this.isRenderingInProgress=false}}class gb{is(){throw new Error("is() method is abstract")}}class mb extends gb{constructor(t){super();this.parent=null;this._attrs=ml(t)}get document(){return null}get index(){let t;if(!this.parent){return null}if((t=this.parent.getChildIndex(this))===null){throw new P("model-node-not-found-in-parent",this)}return t}get startOffset(){let t;if(!this.parent){return null}if((t=this.parent.getChildStartOffset(this))===null){throw new P("model-node-not-found-in-parent",this)}return t}get offsetSize(){return 1}get endOffset(){if(!this.parent){return null}return this.startOffset+this.offsetSize}get nextSibling(){const t=this.index;return t!==null&&this.parent.getChild(t+1)||null}get previousSibling(){const t=this.index;return t!==null&&this.parent.getChild(t-1)||null}get root(){let t=this;while(t.parent){t=t.parent}return t}isAttached(){return this.parent===null?false:this.root.isAttached()}getPath(){const t=[];let e=this;while(e.parent){t.unshift(e.startOffset);e=e.parent}return t}getAncestors(t={}){const e=[];let n=t.includeSelf?this:this.parent;while(n){e[t.parentFirst?"push":"unshift"](n);n=n.parent}return e}getCommonAncestor(t,e={}){const n=this.getAncestors(e);const o=t.getAncestors(e);let i=0;while(n[i]==o[i]&&n[i]){i++}return i===0?null:n[i-1]}isBefore(t){if(this==t){return false}if(this.root!==t.root){return false}const e=this.getPath();const n=t.getPath();const o=At(e,n);switch(o){case"prefix":return true;case"extension":return false;default:return e[o]<n[o]}}isAfter(t){if(this==t){return false}if(this.root!==t.root){return false}return!this.isBefore(t)}hasAttribute(t){return this._attrs.has(t)}getAttribute(t){return this._attrs.get(t)}getAttributes(){return this._attrs.entries()}getAttributeKeys(){return this._attrs.keys()}toJSON(){const t={};if(this._attrs.size){t.attributes=Array.from(this._attrs).reduce(((t,e)=>{t[e[0]]=e[1];return t}),{})}return t}_clone(t){return new this.constructor(this._attrs)}_remove(){this.parent._removeChildren(this.index)}_setAttribute(t,e){this._attrs.set(t,e)}_setAttributesTo(t){this._attrs=ml(t)}_removeAttribute(t){return this._attrs.delete(t)}_clearAttributes(){this._attrs.clear()}}mb.prototype.is=function(t){return t==="node"||t==="model:node"};class bb{constructor(t){this._nodes=[];if(t){this._insertNodes(0,t)}}[Symbol.iterator](){return this._nodes[Symbol.iterator]()}get length(){return this._nodes.length}get maxOffset(){return this._nodes.reduce(((t,e)=>t+e.offsetSize),0)}getNode(t){return this._nodes[t]||null}getNodeIndex(t){const e=this._nodes.indexOf(t);return e==-1?null:e}getNodeStartOffset(t){const e=this.getNodeIndex(t);return e===null?null:this._nodes.slice(0,e).reduce(((t,e)=>t+e.offsetSize),0)}indexToOffset(t){if(t==this._nodes.length){return this.maxOffset}const e=this._nodes[t];if(!e){throw new P("model-nodelist-index-out-of-bounds",this)}return this.getNodeStartOffset(e)}offsetToIndex(t){let e=0;for(const n of this._nodes){if(t>=e&&t<e+n.offsetSize){return this.getNodeIndex(n)}e+=n.offsetSize}if(e!=t){throw new P("model-nodelist-offset-out-of-bounds",this,{offset:t,nodeList:this})}return this.length}_insertNodes(t,e){for(const t of e){if(!(t instanceof mb)){throw new P("model-nodelist-insertnodes-not-node",this)}}this._nodes=kl(this._nodes,Array.from(e),t,0)}_removeNodes(t,e=1){return this._nodes.splice(t,e)}toJSON(){return this._nodes.map((t=>t.toJSON()))}}class kb extends mb{constructor(t,e){super(e);this._data=t||""}get offsetSize(){return this.data.length}get data(){return this._data}toJSON(){const t=super.toJSON();t.data=this.data;return t}_clone(){return new kb(this.data,this.getAttributes())}static fromJSON(t){return new kb(t.data,t.attributes)}}kb.prototype.is=function(t){return t==="$text"||t==="model:$text"||t==="text"||t==="model:text"||t==="node"||t==="model:node"};class wb extends gb{constructor(t,e,n){super();this.textNode=t;if(e<0||e>t.offsetSize){throw new P("model-textproxy-wrong-offsetintext",this)}if(n<0||e+n>t.offsetSize){throw new P("model-textproxy-wrong-length",this)}this.data=t.data.substring(e,e+n);this.offsetInText=e}get startOffset(){return this.textNode.startOffset!==null?this.textNode.startOffset+this.offsetInText:null}get offsetSize(){return this.data.length}get endOffset(){return this.startOffset!==null?this.startOffset+this.offsetSize:null}get isPartial(){return this.offsetSize!==this.textNode.offsetSize}get parent(){return this.textNode.parent}get root(){return this.textNode.root}getPath(){const t=this.textNode.getPath();if(t.length>0){t[t.length-1]+=this.offsetInText}return t}getAncestors(t={}){const e=[];let n=t.includeSelf?this:this.parent;while(n){e[t.parentFirst?"push":"unshift"](n);n=n.parent}return e}hasAttribute(t){return this.textNode.hasAttribute(t)}getAttribute(t){return this.textNode.getAttribute(t)}getAttributes(){return this.textNode.getAttributes()}getAttributeKeys(){return this.textNode.getAttributeKeys()}}wb.prototype.is=function(t){return t==="$textProxy"||t==="model:$textProxy"||t==="textProxy"||t==="model:textProxy"};class _b extends mb{constructor(t,e,n){super(e);this._children=new bb;this.name=t;if(n){this._insertChild(0,n)}}get childCount(){return this._children.length}get maxOffset(){return this._children.maxOffset}get isEmpty(){return this.childCount===0}getChild(t){return this._children.getNode(t)}getChildren(){return this._children[Symbol.iterator]()}getChildIndex(t){return this._children.getNodeIndex(t)}getChildStartOffset(t){return this._children.getNodeStartOffset(t)}offsetToIndex(t){return this._children.offsetToIndex(t)}getNodeByPath(t){let e=this;for(const n of t){e=e.getChild(e.offsetToIndex(n))}return e}findAncestor(t,e={}){let n=e.includeSelf?this:this.parent;while(n){if(n.name===t){return n}n=n.parent}return null}toJSON(){const t=super.toJSON();t.name=this.name;if(this._children.length>0){t.children=[];for(const e of this._children){t.children.push(e.toJSON())}}return t}_clone(t=false){const e=t?Array.from(this._children).map((t=>t._clone(true))):undefined;return new _b(this.name,this.getAttributes(),e)}_appendChild(t){this._insertChild(this.childCount,t)}_insertChild(t,e){const n=vb(e);for(const t of n){if(t.parent!==null){t._remove()}t.parent=this}this._children._insertNodes(t,n)}_removeChildren(t,e=1){const n=this._children._removeNodes(t,e);for(const t of n){t.parent=null}return n}static fromJSON(t){let e;if(t.children){e=[];for(const n of t.children){if(n.name){e.push(_b.fromJSON(n))}else{e.push(kb.fromJSON(n))}}}return new _b(t.name,t.attributes,e)}}_b.prototype.is=function(t,e){if(!e){return t==="element"||t==="model:element"||t==="node"||t==="model:node"}return e===this.name&&(t==="element"||t==="model:element")};function vb(t){if(typeof t=="string"){return[new kb(t)]}if(!Ct(t)){t=[t]}return Array.from(t).map((t=>{if(typeof t=="string"){return new kb(t)}if(t instanceof wb){return new kb(t.data,t.getAttributes())}return t}))}class Ab{constructor(t){if(!t||!t.boundaries&&!t.startPosition){throw new P("model-tree-walker-no-start-position",null)}const e=t.direction||"forward";if(e!="forward"&&e!="backward"){throw new P("model-tree-walker-unknown-direction",t,{direction:e})}this.direction=e;this.boundaries=t.boundaries||null;if(t.startPosition){this._position=t.startPosition.clone()}else{this._position=yb._createAt(this.boundaries[this.direction=="backward"?"end":"start"])}this.position.stickiness="toNone";this.singleCharacters=!!t.singleCharacters;this.shallow=!!t.shallow;this.ignoreElementEnd=!!t.ignoreElementEnd;this._boundaryStartParent=this.boundaries?this.boundaries.start.parent:null;this._boundaryEndParent=this.boundaries?this.boundaries.end.parent:null;this._visitedParent=this.position.parent}[Symbol.iterator](){return this}get position(){return this._position}skip(t){let e,n,o,i;do{o=this.position;i=this._visitedParent;({done:e,value:n}=this.next())}while(!e&&t(n));if(!e){this._position=o;this._visitedParent=i}}next(){if(this.direction=="forward"){return this._next()}else{return this._previous()}}_next(){const t=this.position;const e=this.position.clone();const n=this._visitedParent;if(n.parent===null&&e.offset===n.maxOffset){return{done:true,value:undefined}}if(n===this._boundaryEndParent&&e.offset==this.boundaries.end.offset){return{done:true,value:undefined}}const o=xb(e,n);const i=o||Eb(e,n,o);if(i instanceof _b){if(!this.shallow){e.path.push(0);this._visitedParent=i}else{if(this.boundaries&&this.boundaries.end.isBefore(e)){return{done:true,value:undefined}}e.offset++}this._position=e;return Cb("elementStart",i,t,e,1)}if(i instanceof kb){let o;if(this.singleCharacters){o=1}else{let t=i.endOffset;if(this._boundaryEndParent==n&&this.boundaries.end.offset<t){t=this.boundaries.end.offset}o=t-e.offset}const r=e.offset-i.startOffset;const s=new wb(i,r,o);e.offset+=o;this._position=e;return Cb("text",s,t,e,o)}e.path.pop();e.offset++;this._position=e;this._visitedParent=n.parent;if(this.ignoreElementEnd){return this._next()}return Cb("elementEnd",n,t,e)}_previous(){const t=this.position;const e=this.position.clone();const n=this._visitedParent;if(n.parent===null&&e.offset===0){return{done:true,value:undefined}}if(n==this._boundaryStartParent&&e.offset==this.boundaries.start.offset){return{done:true,value:undefined}}const o=e.parent;const i=xb(e,o);const r=i||Sb(e,o,i);if(r instanceof _b){e.offset--;if(this.shallow){this._position=e;return Cb("elementStart",r,t,e,1)}e.path.push(r.maxOffset);this._position=e;this._visitedParent=r;if(this.ignoreElementEnd){return this._previous()}return Cb("elementEnd",r,t,e)}if(r instanceof kb){let o;if(this.singleCharacters){o=1}else{let t=r.startOffset;if(this._boundaryStartParent==n&&this.boundaries.start.offset>t){t=this.boundaries.start.offset}o=e.offset-t}const i=e.offset-r.startOffset;const s=new wb(r,i-o,o);e.offset-=o;this._position=e;return Cb("text",s,t,e,o)}e.path.pop();this._position=e;this._visitedParent=n.parent;return Cb("elementStart",n,t,e,1)}}function Cb(t,e,n,o,i){return{done:false,value:{type:t,item:e,previousPosition:n,nextPosition:o,length:i}}}class yb extends gb{constructor(t,e,n="toNone"){super();if(!t.is("element")&&!t.is("documentFragment")){throw new P("model-position-root-invalid",t)}if(!(e instanceof Array)||e.length===0){throw new P("model-position-path-incorrect-format",t,{path:e})}if(t.is("rootElement")){e=e.slice()}else{e=[...t.getPath(),...e];t=t.root}this.root=t;this.path=e;this.stickiness=n}get offset(){return this.path[this.path.length-1]}set offset(t){this.path[this.path.length-1]=t}get parent(){let t=this.root;for(let e=0;e<this.path.length-1;e++){t=t.getChild(t.offsetToIndex(this.path[e]));if(!t){throw new P("model-position-path-incorrect",this,{position:this})}}if(t.is("$text")){throw new P("model-position-path-incorrect",this,{position:this})}return t}get index(){return this.parent.offsetToIndex(this.offset)}get textNode(){return xb(this,this.parent)}get nodeAfter(){const t=this.parent;return Eb(this,t,xb(this,t))}get nodeBefore(){const t=this.parent;return Sb(this,t,xb(this,t))}get isAtStart(){return this.offset===0}get isAtEnd(){return this.offset==this.parent.maxOffset}compareWith(t){if(this.root!=t.root){return"different"}const e=At(this.path,t.path);switch(e){case"same":return"same";case"prefix":return"before";case"extension":return"after";default:return this.path[e]<t.path[e]?"before":"after"}}getLastMatchingPosition(t,e={}){e.startPosition=this;const n=new Ab(e);n.skip(t);return n.position}getParentPath(){return this.path.slice(0,-1)}getAncestors(){const t=this.parent;if(t.is("documentFragment")){return[t]}else{return t.getAncestors({includeSelf:true})}}findAncestor(t){const e=this.parent;if(e.is("element")){return e.findAncestor(t,{includeSelf:true})}return null}getCommonPath(t){if(this.root!=t.root){return[]}const e=At(this.path,t.path);const n=typeof e=="string"?Math.min(this.path.length,t.path.length):e;return this.path.slice(0,n)}getCommonAncestor(t){const e=this.getAncestors();const n=t.getAncestors();let o=0;while(e[o]==n[o]&&e[o]){o++}return o===0?null:e[o-1]}getShiftedBy(t){const e=this.clone();const n=e.offset+t;e.offset=n<0?0:n;return e}isAfter(t){return this.compareWith(t)=="after"}isBefore(t){return this.compareWith(t)=="before"}isEqual(t){return this.compareWith(t)=="same"}isTouching(t){if(this.root!==t.root){return false}const e=Math.min(this.path.length,t.path.length);for(let n=0;n<e;n++){const e=this.path[n]-t.path[n];if(e<-1||e>1){return false}else if(e===1){return Db(t,this,n)}else if(e===-1){return Db(this,t,n)}}if(this.path.length===t.path.length){return true}else if(this.path.length>t.path.length){return Tb(this.path,e)}else{return Tb(t.path,e)}}hasSameParentAs(t){if(this.root!==t.root){return false}const e=this.getParentPath();const n=t.getParentPath();return At(e,n)=="same"}getTransformedByOperation(t){let e;switch(t.type){case"insert":e=this._getTransformedByInsertOperation(t);break;case"move":case"remove":case"reinsert":e=this._getTransformedByMoveOperation(t);break;case"split":e=this._getTransformedBySplitOperation(t);break;case"merge":e=this._getTransformedByMergeOperation(t);break;default:e=yb._createAt(this);break}return e}_getTransformedByInsertOperation(t){return this._getTransformedByInsertion(t.position,t.howMany)}_getTransformedByMoveOperation(t){return this._getTransformedByMove(t.sourcePosition,t.targetPosition,t.howMany)}_getTransformedBySplitOperation(t){const e=t.movedRange;const n=e.containsPosition(this)||e.start.isEqual(this)&&this.stickiness=="toNext";if(n){return this._getCombined(t.splitPosition,t.moveTargetPosition)}else{if(t.graveyardPosition){return this._getTransformedByMove(t.graveyardPosition,t.insertionPosition,1)}else{return this._getTransformedByInsertion(t.insertionPosition,1)}}}_getTransformedByMergeOperation(t){const e=t.movedRange;const n=e.containsPosition(this)||e.start.isEqual(this);let o;if(n){o=this._getCombined(t.sourcePosition,t.targetPosition);if(t.sourcePosition.isBefore(t.targetPosition)){o=o._getTransformedByDeletion(t.deletionPosition,1)}}else if(this.isEqual(t.deletionPosition)){o=yb._createAt(t.deletionPosition)}else{o=this._getTransformedByMove(t.deletionPosition,t.graveyardPosition,1)}return o}_getTransformedByDeletion(t,e){const n=yb._createAt(this);if(this.root!=t.root){return n}if(At(t.getParentPath(),this.getParentPath())=="same"){if(t.offset<this.offset){if(t.offset+e>this.offset){return null}else{n.offset-=e}}}else if(At(t.getParentPath(),this.getParentPath())=="prefix"){const o=t.path.length-1;if(t.offset<=this.path[o]){if(t.offset+e>this.path[o]){return null}else{n.path[o]-=e}}}return n}_getTransformedByInsertion(t,e){const n=yb._createAt(this);if(this.root!=t.root){return n}if(At(t.getParentPath(),this.getParentPath())=="same"){if(t.offset<this.offset||t.offset==this.offset&&this.stickiness!="toPrevious"){n.offset+=e}}else if(At(t.getParentPath(),this.getParentPath())=="prefix"){const o=t.path.length-1;if(t.offset<=this.path[o]){n.path[o]+=e}}return n}_getTransformedByMove(t,e,n){e=e._getTransformedByDeletion(t,n);if(t.isEqual(e)){return yb._createAt(this)}const o=this._getTransformedByDeletion(t,n);const i=o===null||t.isEqual(this)&&this.stickiness=="toNext"||t.getShiftedBy(n).isEqual(this)&&this.stickiness=="toPrevious";if(i){return this._getCombined(t,e)}else{return o._getTransformedByInsertion(e,n)}}_getCombined(t,e){const n=t.path.length-1;const o=yb._createAt(e);o.stickiness=this.stickiness;o.offset=o.offset+this.path[n]-t.offset;o.path=[...o.path,...this.path.slice(n+1)];return o}toJSON(){return{root:this.root.toJSON(),path:Array.from(this.path),stickiness:this.stickiness}}clone(){return new this.constructor(this.root,this.path,this.stickiness)}static _createAt(t,e,n="toNone"){if(t instanceof yb){return new yb(t.root,t.path,t.stickiness)}else{const o=t;if(e=="end"){e=o.maxOffset}else if(e=="before"){return this._createBefore(o,n)}else if(e=="after"){return this._createAfter(o,n)}else if(e!==0&&!e){throw new P("model-createpositionat-offset-required",[this,t])}if(!o.is("element")&&!o.is("documentFragment")){throw new P("model-position-parent-incorrect",[this,t])}const i=o.getPath();i.push(e);return new this(o.root,i,n)}}static _createAfter(t,e){if(!t.parent){throw new P("model-position-after-root",[this,t],{root:t})}return this._createAt(t.parent,t.endOffset,e)}static _createBefore(t,e){if(!t.parent){throw new P("model-position-before-root",t,{root:t})}return this._createAt(t.parent,t.startOffset,e)}static fromJSON(t,e){if(t.root==="$graveyard"){const n=new yb(e.graveyard,t.path);n.stickiness=t.stickiness;return n}if(!e.getRoot(t.root)){throw new P("model-position-fromjson-no-root",e,{rootName:t.root})}return new yb(e.getRoot(t.root),t.path,t.stickiness)}}yb.prototype.is=function(t){return t==="position"||t==="model:position"};function xb(t,e){const n=e.getChild(e.offsetToIndex(t.offset));if(n&&n.is("$text")&&n.startOffset<t.offset){return n}return null}function Eb(t,e,n){if(n!==null){return null}return e.getChild(e.offsetToIndex(t.offset))}function Sb(t,e,n){if(n!==null){return null}return e.getChild(e.offsetToIndex(t.offset)-1)}function Db(t,e,n){if(n+1===t.path.length){return false}if(!Tb(e.path,n+1)){return false}if(!Pb(t,n+1)){return false}return true}function Tb(t,e){while(e<t.length){if(t[e]!==0){return false}e++}return true}function Pb(t,e){let n=t.parent;let o=t.path.length-1;let i=0;while(o>=e){if(t.path[o]+i!==n.maxOffset){return false}i=1;o--;n=n.parent}return true}class Bb extends gb{constructor(t,e){super();this.start=yb._createAt(t);this.end=e?yb._createAt(e):yb._createAt(t);this.start.stickiness=this.isCollapsed?"toNone":"toNext";this.end.stickiness=this.isCollapsed?"toNone":"toPrevious"}*[Symbol.iterator](){yield*new Ab({boundaries:this,ignoreElementEnd:true})}get isCollapsed(){return this.start.isEqual(this.end)}get isFlat(){const t=this.start.getParentPath();const e=this.end.getParentPath();return At(t,e)=="same"}get root(){return this.start.root}containsPosition(t){return t.isAfter(this.start)&&t.isBefore(this.end)}containsRange(t,e=false){if(t.isCollapsed){e=false}const n=this.containsPosition(t.start)||e&&this.start.isEqual(t.start);const o=this.containsPosition(t.end)||e&&this.end.isEqual(t.end);return n&&o}containsItem(t){const e=yb._createBefore(t);return this.containsPosition(e)||this.start.isEqual(e)}isEqual(t){return this.start.isEqual(t.start)&&this.end.isEqual(t.end)}isIntersecting(t){return this.start.isBefore(t.end)&&this.end.isAfter(t.start)}getDifference(t){const e=[];if(this.isIntersecting(t)){if(this.containsPosition(t.start)){e.push(new Bb(this.start,t.start))}if(this.containsPosition(t.end)){e.push(new Bb(t.end,this.end))}}else{e.push(new Bb(this.start,this.end))}return e}getIntersection(t){if(this.isIntersecting(t)){let e=this.start;let n=this.end;if(this.containsPosition(t.start)){e=t.start}if(this.containsPosition(t.end)){n=t.end}return new Bb(e,n)}return null}getJoined(t,e=false){let n=this.isIntersecting(t);if(!n){if(this.start.isBefore(t.start)){n=e?this.end.isTouching(t.start):this.end.isEqual(t.start)}else{n=e?t.end.isTouching(this.start):t.end.isEqual(this.start)}}if(!n){return null}let o=this.start;let i=this.end;if(t.start.isBefore(o)){o=t.start}if(t.end.isAfter(i)){i=t.end}return new Bb(o,i)}getMinimalFlatRanges(){const t=[];const e=this.start.getCommonPath(this.end).length;const n=yb._createAt(this.start);let o=n.parent;while(n.path.length>e+1){const e=o.maxOffset-n.offset;if(e!==0){t.push(new Bb(n,n.getShiftedBy(e)))}n.path=n.path.slice(0,-1);n.offset++;o=o.parent}while(n.path.length<=this.end.path.length){const e=this.end.path[n.path.length-1];const o=e-n.offset;if(o!==0){t.push(new Bb(n,n.getShiftedBy(o)))}n.offset=e;n.path.push(0)}return t}getWalker(t={}){t.boundaries=this;return new Ab(t)}*getItems(t={}){t.boundaries=this;t.ignoreElementEnd=true;const e=new Ab(t);for(const t of e){yield t.item}}*getPositions(t={}){t.boundaries=this;const e=new Ab(t);yield e.position;for(const t of e){yield t.nextPosition}}getTransformedByOperation(t){switch(t.type){case"insert":return this._getTransformedByInsertOperation(t);case"move":case"remove":case"reinsert":return this._getTransformedByMoveOperation(t);case"split":return[this._getTransformedBySplitOperation(t)];case"merge":return[this._getTransformedByMergeOperation(t)]}return[new Bb(this.start,this.end)]}getTransformedByOperations(t){const e=[new Bb(this.start,this.end)];for(const n of t){for(let t=0;t<e.length;t++){const o=e[t].getTransformedByOperation(n);e.splice(t,1,...o);t+=o.length-1}}for(let t=0;t<e.length;t++){const n=e[t];for(let o=t+1;o<e.length;o++){const t=e[o];if(n.containsRange(t)||t.containsRange(n)||n.isEqual(t)){e.splice(o,1)}}}return e}getCommonAncestor(){return this.start.getCommonAncestor(this.end)}getContainedElement(){if(this.isCollapsed){return null}const t=this.start.nodeAfter;const e=this.end.nodeBefore;if(t&&t.is("element")&&t===e){return t}return null}toJSON(){return{start:this.start.toJSON(),end:this.end.toJSON()}}clone(){return new this.constructor(this.start,this.end)}_getTransformedByInsertOperation(t,e=false){return this._getTransformedByInsertion(t.position,t.howMany,e)}_getTransformedByMoveOperation(t,e=false){const n=t.sourcePosition;const o=t.howMany;const i=t.targetPosition;return this._getTransformedByMove(n,i,o,e)}_getTransformedBySplitOperation(t){const e=this.start._getTransformedBySplitOperation(t);let n=this.end._getTransformedBySplitOperation(t);if(this.end.isEqual(t.insertionPosition)){n=this.end.getShiftedBy(1)}if(e.root!=n.root){n=this.end.getShiftedBy(-1)}return new Bb(e,n)}_getTransformedByMergeOperation(t){if(this.start.isEqual(t.targetPosition)&&this.end.isEqual(t.deletionPosition)){return new Bb(this.start)}let e=this.start._getTransformedByMergeOperation(t);let n=this.end._getTransformedByMergeOperation(t);if(e.root!=n.root){n=this.end.getShiftedBy(-1)}if(e.isAfter(n)){if(t.sourcePosition.isBefore(t.targetPosition)){e=yb._createAt(n);e.offset=0}else{if(!t.deletionPosition.isEqual(e)){n=t.deletionPosition}e=t.targetPosition}return new Bb(e,n)}return new Bb(e,n)}_getTransformedByInsertion(t,e,n=false){if(n&&this.containsPosition(t)){return[new Bb(this.start,t),new Bb(t.getShiftedBy(e),this.end._getTransformedByInsertion(t,e))]}else{const n=new Bb(this.start,this.end);n.start=n.start._getTransformedByInsertion(t,e);n.end=n.end._getTransformedByInsertion(t,e);return[n]}}_getTransformedByMove(t,e,n,o=false){if(this.isCollapsed){const o=this.start._getTransformedByMove(t,e,n);return[new Bb(o)]}const i=Bb._createFromPositionAndShift(t,n);const r=e._getTransformedByDeletion(t,n);if(this.containsPosition(e)&&!o){if(i.containsPosition(this.start)||i.containsPosition(this.end)){const o=this.start._getTransformedByMove(t,e,n);const i=this.end._getTransformedByMove(t,e,n);return[new Bb(o,i)]}}let s;const a=this.getDifference(i);let c=null;const l=this.getIntersection(i);if(a.length==1){c=new Bb(a[0].start._getTransformedByDeletion(t,n),a[0].end._getTransformedByDeletion(t,n))}else if(a.length==2){c=new Bb(this.start,this.end._getTransformedByDeletion(t,n))}if(c){s=c._getTransformedByInsertion(r,n,l!==null||o)}else{s=[]}if(l){const t=new Bb(l.start._getCombined(i.start,r),l.end._getCombined(i.start,r));if(s.length==2){s.splice(1,0,t)}else{s.push(t)}}return s}_getTransformedByDeletion(t,e){let n=this.start._getTransformedByDeletion(t,e);let o=this.end._getTransformedByDeletion(t,e);if(n==null&&o==null){return null}if(n==null){n=t}if(o==null){o=t}return new Bb(n,o)}static _createFromPositionAndShift(t,e){const n=t;const o=t.getShiftedBy(e);return e>0?new this(n,o):new this(o,n)}static _createIn(t){return new this(yb._createAt(t,0),yb._createAt(t,t.maxOffset))}static _createOn(t){return this._createFromPositionAndShift(yb._createBefore(t),t.offsetSize)}static _createFromRanges(t){if(t.length===0){throw new P("range-create-from-ranges-empty-array",null)}else if(t.length==1){return t[0].clone()}const e=t[0];t.sort(((t,e)=>t.start.isAfter(e.start)?1:-1));const n=t.indexOf(e);const o=new this(e.start,e.end);if(n>0){for(let e=n-1;true;e++){if(t[e].end.isEqual(o.start)){o.start=yb._createAt(t[e].start)}else{break}}}for(let e=n+1;e<t.length;e++){if(t[e].start.isEqual(o.end)){o.end=yb._createAt(t[e].end)}else{break}}return o}static fromJSON(t,e){return new this(yb.fromJSON(t.start,e),yb.fromJSON(t.end,e))}}Bb.prototype.is=function(t){return t==="range"||t==="model:range"};class Ib extends(q()){constructor(){super();this._modelToViewMapping=new WeakMap;this._viewToModelMapping=new WeakMap;this._viewToModelLengthCallbacks=new Map;this._markerNameToElements=new Map;this._elementToMarkerNames=new Map;this._deferredBindingRemovals=new Map;this._unboundMarkerNames=new Set;this.on("modelToViewPosition",((t,e)=>{if(e.viewPosition){return}const n=this._modelToViewMapping.get(e.modelPosition.parent);if(!n){throw new P("mapping-model-position-view-parent-not-found",this,{modelPosition:e.modelPosition})}e.viewPosition=this.findPositionIn(n,e.modelPosition.offset)}),{priority:"low"});this.on("viewToModelPosition",((t,e)=>{if(e.modelPosition){return}const n=this.findMappedViewAncestor(e.viewPosition);const o=this._viewToModelMapping.get(n);const i=this._toModelOffset(e.viewPosition.parent,e.viewPosition.offset,n);e.modelPosition=yb._createAt(o,i)}),{priority:"low"})}bindElements(t,e){this._modelToViewMapping.set(t,e);this._viewToModelMapping.set(e,t)}unbindViewElement(t,e={}){const n=this.toModelElement(t);if(this._elementToMarkerNames.has(t)){for(const e of this._elementToMarkerNames.get(t)){this._unboundMarkerNames.add(e)}}if(e.defer){this._deferredBindingRemovals.set(t,t.root)}else{this._viewToModelMapping.delete(t);if(this._modelToViewMapping.get(n)==t){this._modelToViewMapping.delete(n)}}}unbindModelElement(t){const e=this.toViewElement(t);this._modelToViewMapping.delete(t);if(this._viewToModelMapping.get(e)==t){this._viewToModelMapping.delete(e)}}bindElementToMarker(t,e){const n=this._markerNameToElements.get(e)||new Set;n.add(t);const o=this._elementToMarkerNames.get(t)||new Set;o.add(e);this._markerNameToElements.set(e,n);this._elementToMarkerNames.set(t,o)}unbindElementFromMarkerName(t,e){const n=this._markerNameToElements.get(e);if(n){n.delete(t);if(n.size==0){this._markerNameToElements.delete(e)}}const o=this._elementToMarkerNames.get(t);if(o){o.delete(e);if(o.size==0){this._elementToMarkerNames.delete(t)}}}flushUnboundMarkerNames(){const t=Array.from(this._unboundMarkerNames);this._unboundMarkerNames.clear();return t}flushDeferredBindings(){for(const[t,e]of this._deferredBindingRemovals){if(t.root==e){this.unbindViewElement(t)}}this._deferredBindingRemovals=new Map}clearBindings(){this._modelToViewMapping=new WeakMap;this._viewToModelMapping=new WeakMap;this._markerNameToElements=new Map;this._elementToMarkerNames=new Map;this._unboundMarkerNames=new Set;this._deferredBindingRemovals=new Map}toModelElement(t){return this._viewToModelMapping.get(t)}toViewElement(t){return this._modelToViewMapping.get(t)}toModelRange(t){return new Bb(this.toModelPosition(t.start),this.toModelPosition(t.end))}toViewRange(t){return new cp(this.toViewPosition(t.start),this.toViewPosition(t.end))}toModelPosition(t){const e={viewPosition:t,mapper:this};this.fire("viewToModelPosition",e);return e.modelPosition}toViewPosition(t,e={}){const n={modelPosition:t,mapper:this,isPhantom:e.isPhantom};this.fire("modelToViewPosition",n);return n.viewPosition}markerNameToElements(t){const e=this._markerNameToElements.get(t);if(!e){return null}const n=new Set;for(const t of e){if(t.is("attributeElement")){for(const e of t.getElementsWithSameId()){n.add(e)}}else{n.add(t)}}return n}registerViewToModelLength(t,e){this._viewToModelLengthCallbacks.set(t,e)}findMappedViewAncestor(t){let e=t.parent;while(!this._viewToModelMapping.has(e)){e=e.parent}return e}_toModelOffset(t,e,n){if(n!=t){const o=this._toModelOffset(t.parent,t.index,n);const i=this._toModelOffset(t,e,t);return o+i}if(t.is("$text")){return e}let o=0;for(let n=0;n<e;n++){o+=this.getModelLength(t.getChild(n))}return o}getModelLength(t){if(this._viewToModelLengthCallbacks.get(t.name)){const e=this._viewToModelLengthCallbacks.get(t.name);return e(t)}else if(this._viewToModelMapping.has(t)){return 1}else if(t.is("$text")){return t.data.length}else if(t.is("uiElement")){return 0}else{let e=0;for(const n of t.getChildren()){e+=this.getModelLength(n)}return e}}findPositionIn(t,e){let n;let o=0;let i=0;let r=0;if(t.is("$text")){return new ap(t,e)}while(i<e){n=t.getChild(r);o=this.getModelLength(n);i+=o;r++}if(i==e){return this._moveViewPositionToTextNode(new ap(t,r))}else{return this.findPositionIn(n,e-(i-o))}}_moveViewPositionToTextNode(t){const e=t.nodeBefore;const n=t.nodeAfter;if(e instanceof Ju){return new ap(e,e.data.length)}else if(n instanceof Ju){return new ap(n,0)}return t}}class Rb{constructor(){this._consumable=new Map;this._textProxyRegistry=new Map}add(t,e){e=Ob(e);if(t instanceof wb){t=this._getSymbolForTextProxy(t)}if(!this._consumable.has(t)){this._consumable.set(t,new Map)}this._consumable.get(t).set(e,true)}consume(t,e){e=Ob(e);if(t instanceof wb){t=this._getSymbolForTextProxy(t)}if(this.test(t,e)){this._consumable.get(t).set(e,false);return true}else{return false}}test(t,e){e=Ob(e);if(t instanceof wb){t=this._getSymbolForTextProxy(t)}const n=this._consumable.get(t);if(n===undefined){return null}const o=n.get(e);if(o===undefined){return null}return o}revert(t,e){e=Ob(e);if(t instanceof wb){t=this._getSymbolForTextProxy(t)}const n=this.test(t,e);if(n===false){this._consumable.get(t).set(e,true);return true}else if(n===true){return false}return null}verifyAllConsumed(t){const e=[];for(const[n,o]of this._consumable){for(const[i,r]of o){const o=i.split(":")[0];if(r&&t==o){e.push({event:i,item:n.name||n.description})}}}if(e.length){throw new P("conversion-model-consumable-not-consumed",null,{items:e})}}_getSymbolForTextProxy(t){let e=null;const n=this._textProxyRegistry.get(t.startOffset);if(n){const o=n.get(t.endOffset);if(o){e=o.get(t.parent)}}if(!e){e=this._addSymbolForTextProxy(t)}return e}_addSymbolForTextProxy(t){const e=t.startOffset;const n=t.endOffset;const o=t.parent;const i=Symbol("$textProxy:"+t.data);let r;let s;r=this._textProxyRegistry.get(e);if(!r){r=new Map;this._textProxyRegistry.set(e,r)}s=r.get(n);if(!s){s=new Map;r.set(n,s)}s.set(o,i);return i}}function Ob(t){const e=t.split(":");if(e[0]=="insert"){return e[0]}if(e[0]=="addMarker"||e[0]=="removeMarker"){return t}return e.length>1?e[0]+":"+e[1]:e[0]}class Mb extends(q()){constructor(t){super();this._conversionApi={dispatcher:this,...t};this._firedEventsMap=new WeakMap}convertChanges(t,e,n){const o=this._createConversionApi(n,t.getRefreshedItems());for(const e of t.getMarkersToRemove()){this._convertMarkerRemove(e.name,e.range,o)}const i=this._reduceChanges(t.getChanges());for(const t of i){if(t.type==="insert"){this._convertInsert(Bb._createFromPositionAndShift(t.position,t.length),o)}else if(t.type==="reinsert"){this._convertReinsert(Bb._createFromPositionAndShift(t.position,t.length),o)}else if(t.type==="remove"){this._convertRemove(t.position,t.length,t.name,o)}else{this._convertAttribute(t.range,t.attributeKey,t.attributeOldValue,t.attributeNewValue,o)}}for(const t of o.mapper.flushUnboundMarkerNames()){const n=e.get(t).getRange();this._convertMarkerRemove(t,n,o);this._convertMarkerAdd(t,n,o)}for(const e of t.getMarkersToAdd()){this._convertMarkerAdd(e.name,e.range,o)}o.mapper.flushDeferredBindings();o.consumable.verifyAllConsumed("insert")}convert(t,e,n,o={}){const i=this._createConversionApi(n,undefined,o);this._convertInsert(t,i);for(const[t,n]of e){this._convertMarkerAdd(t,n,i)}i.consumable.verifyAllConsumed("insert")}convertSelection(t,e,n){const o=this._createConversionApi(n);this.fire("cleanSelection",{selection:t},o);const i=t.getFirstPosition().root;if(!o.mapper.toViewElement(i)){return}const r=Array.from(e.getMarkersAtPosition(t.getFirstPosition()));this._addConsumablesForSelection(o.consumable,t,r);this.fire("selection",{selection:t},o);if(!t.isCollapsed){return}for(const e of r){if(o.consumable.test(t,"addMarker:"+e.name)){const n=e.getRange();if(!Vb(t.getFirstPosition(),e,o.mapper)){continue}const i={item:t,markerName:e.name,markerRange:n};this.fire(`addMarker:${e.name}`,i,o)}}for(const e of t.getAttributeKeys()){if(o.consumable.test(t,"attribute:"+e)){const n={item:t,range:t.getFirstRange(),attributeKey:e,attributeOldValue:null,attributeNewValue:t.getAttribute(e)};this.fire(`attribute:${e}:$text`,n,o)}}}_convertInsert(t,e,n={}){if(!n.doNotAddConsumables){this._addConsumablesForInsert(e.consumable,Array.from(t))}for(const n of Array.from(t.getWalker({shallow:true})).map(Fb)){this._testAndFire("insert",n,e)}}_convertRemove(t,e,n,o){this.fire(`remove:${n}`,{position:t,length:e},o)}_convertAttribute(t,e,n,o,i){this._addConsumablesForRange(i.consumable,t,`attribute:${e}`);for(const r of t){const t={item:r.item,range:Bb._createFromPositionAndShift(r.previousPosition,r.length),attributeKey:e,attributeOldValue:n,attributeNewValue:o};this._testAndFire(`attribute:${e}`,t,i)}}_convertReinsert(t,e){const n=Array.from(t.getWalker({shallow:true}));this._addConsumablesForInsert(e.consumable,n);for(const t of n.map(Fb)){this._testAndFire("insert",{...t,reconversion:true},e)}}_convertMarkerAdd(t,e,n){if(e.root.rootName=="$graveyard"){return}const o=`addMarker:${t}`;n.consumable.add(e,o);this.fire(o,{markerName:t,markerRange:e},n);if(!n.consumable.consume(e,o)){return}this._addConsumablesForRange(n.consumable,e,o);for(const i of e.getItems()){if(!n.consumable.test(i,o)){continue}const r={item:i,range:Bb._createOn(i),markerName:t,markerRange:e};this.fire(o,r,n)}}_convertMarkerRemove(t,e,n){if(e.root.rootName=="$graveyard"){return}this.fire(`removeMarker:${t}`,{markerName:t,markerRange:e},n)}_reduceChanges(t){const e={changes:t};this.fire("reduceChanges",e);return e.changes}_addConsumablesForInsert(t,e){for(const n of e){const e=n.item;if(t.test(e,"insert")===null){t.add(e,"insert");for(const n of e.getAttributeKeys()){t.add(e,"attribute:"+n)}}}return t}_addConsumablesForRange(t,e,n){for(const o of e.getItems()){t.add(o,n)}return t}_addConsumablesForSelection(t,e,n){t.add(e,"selection");for(const o of n){t.add(e,"addMarker:"+o.name)}for(const n of e.getAttributeKeys()){t.add(e,"attribute:"+n)}return t}_testAndFire(t,e,n){const o=zb(t,e);const i=e.item.is("$textProxy")?n.consumable._getSymbolForTextProxy(e.item):e.item;const r=this._firedEventsMap.get(n);const s=r.get(i);if(!s){r.set(i,new Set([o]))}else if(!s.has(o)){s.add(o)}else{return}this.fire(o,e,n)}_testAndFireAddAttributes(t,e){const n={item:t,range:Bb._createOn(t)};for(const t of n.item.getAttributeKeys()){n.attributeKey=t;n.attributeOldValue=null;n.attributeNewValue=n.item.getAttribute(t);this._testAndFire(`attribute:${t}`,n,e)}}_createConversionApi(t,e=new Set,n={}){const o={...this._conversionApi,consumable:new Rb,writer:t,options:n,convertItem:t=>this._convertInsert(Bb._createOn(t),o),convertChildren:t=>this._convertInsert(Bb._createIn(t),o,{doNotAddConsumables:true}),convertAttributes:t=>this._testAndFireAddAttributes(t,o),canReuseView:t=>!e.has(o.mapper.toModelElement(t))};this._firedEventsMap.set(o,new Map);return o}}function Vb(t,e,n){const o=e.getRange();const i=Array.from(t.getAncestors());i.shift();i.reverse();const r=i.some((t=>{if(o.containsItem(t)){const e=n.toViewElement(t);return!!e.getCustomProperty("addHighlight")}}));return!r}function zb(t,e){const n=e.item.is("element")?e.item.name:"$text";return`${t}:${n}`}function Fb(t){const e=t.item;const n=Bb._createFromPositionAndShift(t.previousPosition,t.length);return{item:e,range:n}}class Nb extends(q(gb)){constructor(...t){super();this._lastRangeBackward=false;this._attrs=new Map;this._ranges=[];if(t.length){this.setTo(...t)}}get anchor(){if(this._ranges.length>0){const t=this._ranges[this._ranges.length-1];return this._lastRangeBackward?t.end:t.start}return null}get focus(){if(this._ranges.length>0){const t=this._ranges[this._ranges.length-1];return this._lastRangeBackward?t.start:t.end}return null}get isCollapsed(){const t=this._ranges.length;if(t===1){return this._ranges[0].isCollapsed}else{return false}}get rangeCount(){return this._ranges.length}get isBackward(){return!this.isCollapsed&&this._lastRangeBackward}isEqual(t){if(this.rangeCount!=t.rangeCount){return false}else if(this.rangeCount===0){return true}if(!this.anchor.isEqual(t.anchor)||!this.focus.isEqual(t.focus)){return false}for(const e of this._ranges){let n=false;for(const o of t._ranges){if(e.isEqual(o)){n=true;break}}if(!n){return false}}return true}*getRanges(){for(const t of this._ranges){yield new Bb(t.start,t.end)}}getFirstRange(){let t=null;for(const e of this._ranges){if(!t||e.start.isBefore(t.start)){t=e}}return t?new Bb(t.start,t.end):null}getLastRange(){let t=null;for(const e of this._ranges){if(!t||e.end.isAfter(t.end)){t=e}}return t?new Bb(t.start,t.end):null}getFirstPosition(){const t=this.getFirstRange();return t?t.start.clone():null}getLastPosition(){const t=this.getLastRange();return t?t.end.clone():null}setTo(...t){let[e,n,o]=t;if(typeof n=="object"){o=n;n=undefined}if(e===null){this._setRanges([])}else if(e instanceof Nb){this._setRanges(e.getRanges(),e.isBackward)}else if(e&&typeof e.getRanges=="function"){this._setRanges(e.getRanges(),e.isBackward)}else if(e instanceof Bb){this._setRanges([e],!!o&&!!o.backward)}else if(e instanceof yb){this._setRanges([new Bb(e)])}else if(e instanceof mb){const t=!!o&&!!o.backward;let i;if(n=="in"){i=Bb._createIn(e)}else if(n=="on"){i=Bb._createOn(e)}else if(n!==undefined){i=new Bb(yb._createAt(e,n))}else{throw new P("model-selection-setto-required-second-parameter",[this,e])}this._setRanges([i],t)}else if(Ct(e)){this._setRanges(e,o&&!!o.backward)}else{throw new P("model-selection-setto-not-selectable",[this,e])}}_setRanges(t,e=false){const n=Array.from(t);const o=n.some((e=>{if(!(e instanceof Bb)){throw new P("model-selection-set-ranges-not-range",[this,t])}return this._ranges.every((t=>!t.isEqual(e)))}));if(n.length===this._ranges.length&&!o){return}this._replaceAllRanges(n);this._lastRangeBackward=!!e;this.fire("change:range",{directChange:true})}setFocus(t,e){if(this.anchor===null){throw new P("model-selection-setfocus-no-ranges",[this,t])}const n=yb._createAt(t,e);if(n.compareWith(this.focus)=="same"){return}const o=this.anchor;if(this._ranges.length){this._popRange()}if(n.compareWith(o)=="before"){this._pushRange(new Bb(n,o));this._lastRangeBackward=true}else{this._pushRange(new Bb(o,n));this._lastRangeBackward=false}this.fire("change:range",{directChange:true})}getAttribute(t){return this._attrs.get(t)}getAttributes(){return this._attrs.entries()}getAttributeKeys(){return this._attrs.keys()}hasAttribute(t){return this._attrs.has(t)}removeAttribute(t){if(this.hasAttribute(t)){this._attrs.delete(t);this.fire("change:attribute",{attributeKeys:[t],directChange:true})}}setAttribute(t,e){if(this.getAttribute(t)!==e){this._attrs.set(t,e);this.fire("change:attribute",{attributeKeys:[t],directChange:true})}}getSelectedElement(){if(this.rangeCount!==1){return null}return this.getFirstRange().getContainedElement()}*getSelectedBlocks(){const t=new WeakSet;for(const e of this.getRanges()){const n=jb(e.start,t);if($b(n,e)){yield n}for(const n of e.getWalker()){const o=n.item;if(n.type=="elementEnd"&&Hb(o,t,e)){yield o}}const o=jb(e.end,t);if(Wb(o,e)){yield o}}}containsEntireContent(t=this.anchor.root){const e=yb._createAt(t,0);const n=yb._createAt(t,"end");return e.isTouching(this.getFirstPosition())&&n.isTouching(this.getLastPosition())}_pushRange(t){this._checkRange(t);this._ranges.push(new Bb(t.start,t.end))}_checkRange(t){for(let e=0;e<this._ranges.length;e++){if(t.isIntersecting(this._ranges[e])){throw new P("model-selection-range-intersects",[this,t],{addedRange:t,intersectingRange:this._ranges[e]})}}}_replaceAllRanges(t){this._removeAllRanges();for(const e of t){this._pushRange(e)}}_removeAllRanges(){while(this._ranges.length>0){this._popRange()}}_popRange(){this._ranges.pop()}}Nb.prototype.is=function(t){return t==="selection"||t==="model:selection"};function Lb(t,e){if(e.has(t)){return false}e.add(t);return t.root.document.model.schema.isBlock(t)&&!!t.parent}function Hb(t,e,n){return Lb(t,e)&&qb(t,n)}function jb(t,e){const n=t.parent;const o=n.root.document.model.schema;const i=t.parent.getAncestors({parentFirst:true,includeSelf:true});let r=false;const s=i.find((t=>{if(r){return false}r=o.isLimit(t);return!r&&Lb(t,e)}));i.forEach((t=>e.add(t)));return s}function qb(t,e){const n=Gb(t);if(!n){return true}const o=e.containsRange(Bb._createOn(n),true);return!o}function $b(t,e){if(!t){return false}if(e.isCollapsed||t.isEmpty){return true}if(e.start.isTouching(yb._createAt(t,t.maxOffset))){return false}return qb(t,e)}function Wb(t,e){if(!t){return false}if(e.isCollapsed||t.isEmpty){return true}if(e.end.isTouching(yb._createAt(t,0))){return false}return qb(t,e)}function Gb(t){const e=t.root.document.model.schema;let n=t.parent;while(n){if(e.isBlock(n)){return n}n=n.parent}}class Kb extends(q(Bb)){constructor(t,e){super(t,e);Ub.call(this)}detach(){this.stopListening()}toRange(){return new Bb(this.start,this.end)}static fromRange(t){return new Kb(t.start,t.end)}}Kb.prototype.is=function(t){return t==="liveRange"||t==="model:liveRange"||t=="range"||t==="model:range"};function Ub(){this.listenTo(this.root.document.model,"applyOperation",((t,e)=>{const n=e[0];if(!n.isDocumentOperation){return}Zb.call(this,n)}),{priority:"low"})}function Zb(t){const e=this.getTransformedByOperation(t);const n=Bb._createFromRanges(e);const o=!n.isEqual(this);const i=Jb(this,t);let r=null;if(o){if(n.root.rootName=="$graveyard"){if(t.type=="remove"){r=t.sourcePosition}else{r=t.deletionPosition}}const e=this.toRange();this.start=n.start;this.end=n.end;this.fire("change:range",e,{deletionPosition:r})}else if(i){this.fire("change:content",this.toRange(),{deletionPosition:r})}}function Jb(t,e){switch(e.type){case"insert":return t.containsPosition(e.position);case"move":case"remove":case"reinsert":case"merge":return t.containsPosition(e.sourcePosition)||t.start.isEqual(e.sourcePosition)||t.containsPosition(e.targetPosition);case"split":return t.containsPosition(e.splitPosition)||t.containsPosition(e.insertionPosition)}return false}const Yb="selection:";class Qb extends(q(gb)){constructor(t){super();this._selection=new Xb(t);this._selection.delegate("change:range").to(this);this._selection.delegate("change:attribute").to(this);this._selection.delegate("change:marker").to(this)}get isCollapsed(){return this._selection.isCollapsed}get anchor(){return this._selection.anchor}get focus(){return this._selection.focus}get rangeCount(){return this._selection.rangeCount}get hasOwnRange(){return this._selection.hasOwnRange}get isBackward(){return this._selection.isBackward}get isGravityOverridden(){return this._selection.isGravityOverridden}get markers(){return this._selection.markers}get _ranges(){return this._selection._ranges}getRanges(){return this._selection.getRanges()}getFirstPosition(){return this._selection.getFirstPosition()}getLastPosition(){return this._selection.getLastPosition()}getFirstRange(){return this._selection.getFirstRange()}getLastRange(){return this._selection.getLastRange()}getSelectedBlocks(){return this._selection.getSelectedBlocks()}getSelectedElement(){return this._selection.getSelectedElement()}containsEntireContent(t){return this._selection.containsEntireContent(t)}destroy(){this._selection.destroy()}getAttributeKeys(){return this._selection.getAttributeKeys()}getAttributes(){return this._selection.getAttributes()}getAttribute(t){return this._selection.getAttribute(t)}hasAttribute(t){return this._selection.hasAttribute(t)}refresh(){this._selection.updateMarkers();this._selection._updateAttributes(false)}observeMarkers(t){this._selection.observeMarkers(t)}_setFocus(t,e){this._selection.setFocus(t,e)}_setTo(...t){this._selection.setTo(...t)}_setAttribute(t,e){this._selection.setAttribute(t,e)}_removeAttribute(t){this._selection.removeAttribute(t)}_getStoredAttributes(){return this._selection.getStoredAttributes()}_overrideGravity(){return this._selection.overrideGravity()}_restoreGravity(t){this._selection.restoreGravity(t)}static _getStoreAttributeKey(t){return Yb+t}static _isStoreAttributeKey(t){return t.startsWith(Yb)}}Qb.prototype.is=function(t){return t==="selection"||t=="model:selection"||t=="documentSelection"||t=="model:documentSelection"};class Xb extends Nb{constructor(t){super();this.markers=new ul({idProperty:"name"});this._attributePriority=new Map;this._selectionRestorePosition=null;this._hasChangedRange=false;this._overriddenGravityRegister=new Set;this._observedMarkers=new Set;this._model=t.model;this._document=t;this.listenTo(this._model,"applyOperation",((t,e)=>{const n=e[0];if(!n.isDocumentOperation||n.type=="marker"||n.type=="rename"||n.type=="noop"){return}if(this._ranges.length==0&&this._selectionRestorePosition){this._fixGraveyardSelection(this._selectionRestorePosition)}this._selectionRestorePosition=null;if(this._hasChangedRange){this._hasChangedRange=false;this.fire("change:range",{directChange:false})}}),{priority:"lowest"});this.on("change:range",(()=>{this._validateSelectionRanges(this.getRanges())}));this.listenTo(this._model.markers,"update",((t,e,n,o)=>{this._updateMarker(e,o)}));this.listenTo(this._document,"change",((t,e)=>{ek(this._model,e)}))}get isCollapsed(){const t=this._ranges.length;return t===0?this._document._getDefaultRange().isCollapsed:super.isCollapsed}get anchor(){return super.anchor||this._document._getDefaultRange().start}get focus(){return super.focus||this._document._getDefaultRange().end}get rangeCount(){return this._ranges.length?this._ranges.length:1}get hasOwnRange(){return this._ranges.length>0}get isGravityOverridden(){return!!this._overriddenGravityRegister.size}destroy(){for(let t=0;t<this._ranges.length;t++){this._ranges[t].detach()}this.stopListening()}*getRanges(){if(this._ranges.length){yield*super.getRanges()}else{yield this._document._getDefaultRange()}}getFirstRange(){return super.getFirstRange()||this._document._getDefaultRange()}getLastRange(){return super.getLastRange()||this._document._getDefaultRange()}setTo(...t){super.setTo(...t);this._updateAttributes(true);this.updateMarkers()}setFocus(t,e){super.setFocus(t,e);this._updateAttributes(true);this.updateMarkers()}setAttribute(t,e){if(this._setAttribute(t,e)){const e=[t];this.fire("change:attribute",{attributeKeys:e,directChange:true})}}removeAttribute(t){if(this._removeAttribute(t)){const e=[t];this.fire("change:attribute",{attributeKeys:e,directChange:true})}}overrideGravity(){const t=x();this._overriddenGravityRegister.add(t);if(this._overriddenGravityRegister.size===1){this._updateAttributes(true)}return t}restoreGravity(t){if(!this._overriddenGravityRegister.has(t)){throw new P("document-selection-gravity-wrong-restore",this,{uid:t})}this._overriddenGravityRegister.delete(t);if(!this.isGravityOverridden){this._updateAttributes(true)}}observeMarkers(t){this._observedMarkers.add(t);this.updateMarkers()}_replaceAllRanges(t){this._validateSelectionRanges(t);super._replaceAllRanges(t)}_popRange(){this._ranges.pop().detach()}_pushRange(t){const e=this._prepareRange(t);if(e){this._ranges.push(e)}}_validateSelectionRanges(t){for(const e of t){if(!this._document._validateSelectionRange(e)){throw new P("document-selection-wrong-position",this,{range:e})}}}_prepareRange(t){this._checkRange(t);if(t.root==this._document.graveyard){return}const e=Kb.fromRange(t);e.on("change:range",((t,n,o)=>{this._hasChangedRange=true;if(e.root==this._document.graveyard){this._selectionRestorePosition=o.deletionPosition;const t=this._ranges.indexOf(e);this._ranges.splice(t,1);e.detach()}}));return e}updateMarkers(){if(!this._observedMarkers.size){return}const t=[];let e=false;for(const e of this._model.markers){const n=e.name.split(":",1)[0];if(!this._observedMarkers.has(n)){continue}const o=e.getRange();for(const n of this.getRanges()){if(o.containsRange(n,!n.isCollapsed)){t.push(e)}}}const n=Array.from(this.markers);for(const n of t){if(!this.markers.has(n)){this.markers.add(n);e=true}}for(const n of Array.from(this.markers)){if(!t.includes(n)){this.markers.remove(n);e=true}}if(e){this.fire("change:marker",{oldMarkers:n,directChange:false})}}_updateMarker(t,e){const n=t.name.split(":",1)[0];if(!this._observedMarkers.has(n)){return}let o=false;const i=Array.from(this.markers);const r=this.markers.has(t);if(!e){if(r){this.markers.remove(t);o=true}}else{let n=false;for(const t of this.getRanges()){if(e.containsRange(t,!t.isCollapsed)){n=true;break}}if(n&&!r){this.markers.add(t);o=true}else if(!n&&r){this.markers.remove(t);o=true}}if(o){this.fire("change:marker",{oldMarkers:i,directChange:false})}}_updateAttributes(t){const e=ml(this._getSurroundingAttributes());const n=ml(this.getAttributes());if(t){this._attributePriority=new Map;this._attrs=new Map}else{for(const[t,e]of this._attributePriority){if(e=="low"){this._attrs.delete(t);this._attributePriority.delete(t)}}}this._setAttributesTo(e);const o=[];for(const[t,e]of this.getAttributes()){if(!n.has(t)||n.get(t)!==e){o.push(t)}}for(const[t]of n){if(!this.hasAttribute(t)){o.push(t)}}if(o.length>0){this.fire("change:attribute",{attributeKeys:o,directChange:false})}}_setAttribute(t,e,n=true){const o=n?"normal":"low";if(o=="low"&&this._attributePriority.get(t)=="normal"){return false}const i=super.getAttribute(t);if(i===e){return false}this._attrs.set(t,e);this._attributePriority.set(t,o);return true}_removeAttribute(t,e=true){const n=e?"normal":"low";if(n=="low"&&this._attributePriority.get(t)=="normal"){return false}this._attributePriority.set(t,n);if(!super.hasAttribute(t)){return false}this._attrs.delete(t);return true}_setAttributesTo(t){const e=new Set;for(const[e,n]of this.getAttributes()){if(t.get(e)===n){continue}this._removeAttribute(e,false)}for(const[n,o]of t){const t=this._setAttribute(n,o,false);if(t){e.add(n)}}return e}*getStoredAttributes(){const t=this.getFirstPosition().parent;if(this.isCollapsed&&t.isEmpty){for(const e of t.getAttributeKeys()){if(e.startsWith(Yb)){const n=e.substr(Yb.length);yield[n,t.getAttribute(e)]}}}}_getSurroundingAttributes(){const t=this.getFirstPosition();const e=this._model.schema;if(t.root.rootName=="$graveyard"){return null}let n=null;if(!this.isCollapsed){const t=this.getFirstRange();for(const o of t){if(o.item.is("element")&&e.isObject(o.item)){n=tk(o.item,e);break}if(o.type=="text"){n=o.item.getAttributes();break}}}else{const o=t.textNode?t.textNode:t.nodeBefore;const i=t.textNode?t.textNode:t.nodeAfter;if(!this.isGravityOverridden){n=tk(o,e)}if(!n){n=tk(i,e)}if(!this.isGravityOverridden&&!n){let t=o;while(t&&!n){t=t.previousSibling;n=tk(t,e)}}if(!n){let t=i;while(t&&!n){t=t.nextSibling;n=tk(t,e)}}if(!n){n=this.getStoredAttributes()}}return n}_fixGraveyardSelection(t){const e=this._model.schema.getNearestSelectionRange(t);if(e){this._pushRange(e)}}}function tk(t,e){if(!t){return null}if(t instanceof wb||t instanceof kb){return t.getAttributes()}if(!e.isInline(t)){return null}if(!e.isObject(t)){return[]}const n=[];for(const[o,i]of t.getAttributes()){if(e.checkAttribute("$text",o)&&e.getAttributeProperties(o).copyFromObject!==false){n.push([o,i])}}return n}function ek(t,e){const n=t.document.differ;for(const o of n.getChanges()){if(o.type!="insert"){continue}const n=o.position.parent;const i=o.length===n.maxOffset;if(i){t.enqueueChange(e,(t=>{const e=Array.from(n.getAttributeKeys()).filter((t=>t.startsWith(Yb)));for(const o of e){t.removeAttribute(o,n)}}))}}}class nk{constructor(t){this._dispatchers=t}add(t){for(const e of this._dispatchers){t(e)}return this}}class ok extends nk{elementToElement(t){return this.add(xk(t))}elementToStructure(t){return this.add(Ek(t))}attributeToElement(t){return this.add(Sk(t))}attributeToAttribute(t){return this.add(Dk(t))}markerToElement(t){return this.add(Tk(t))}markerToHighlight(t){return this.add(Bk(t))}markerToData(t){return this.add(Pk(t))}}function ik(){return(t,e,n)=>{if(!n.consumable.consume(e.item,t.name)){return}const o=n.writer;const i=n.mapper.toViewPosition(e.range.start);const r=o.createText(e.item.data);o.insert(i,r)}}function rk(){return(t,e,n)=>{n.convertAttributes(e.item);if(!e.reconversion&&e.item.is("element")&&!e.item.isEmpty){n.convertChildren(e.item)}}}function sk(){return(t,e,n)=>{const o=n.mapper.toViewPosition(e.position);const i=e.position.getShiftedBy(e.length);const r=n.mapper.toViewPosition(i,{isPhantom:true});const s=n.writer.createRange(o,r);const a=n.writer.remove(s.getTrimmed());for(const t of n.writer.createRangeIn(a).getItems()){n.mapper.unbindViewElement(t,{defer:true})}}}function ak(t,e){const n=t.createAttributeElement("span",e.attributes);if(e.classes){n._addClass(e.classes)}if(typeof e.priority==="number"){n._priority=e.priority}n._id=e.id;return n}function ck(){return(t,e,n)=>{const o=e.selection;if(o.isCollapsed){return}if(!n.consumable.consume(o,"selection")){return}const i=[];for(const t of o.getRanges()){i.push(n.mapper.toViewRange(t))}n.writer.setSelection(i,{backward:o.isBackward})}}function lk(){return(t,e,n)=>{const o=e.selection;if(!o.isCollapsed){return}if(!n.consumable.consume(o,"selection")){return}const i=n.writer;const r=o.getFirstPosition();const s=n.mapper.toViewPosition(r);const a=i.breakAttributes(s);i.setSelection(a)}}function dk(){return(t,e,n)=>{const o=n.writer;const i=o.document.selection;for(const t of i.getRanges()){if(t.isCollapsed){if(t.end.parent.isAttached()){n.writer.mergeAttributes(t.start)}}}o.setSelection(null)}}function uk(t){return(e,n,o)=>{if(!o.consumable.test(n.item,e.name)){return}const i=t(n.attributeOldValue,o,n);const r=t(n.attributeNewValue,o,n);if(!i&&!r){return}o.consumable.consume(n.item,e.name);const s=o.writer;const a=s.document.selection;if(n.item instanceof Nb||n.item instanceof Qb){s.wrap(a.getFirstRange(),r)}else{let t=o.mapper.toViewRange(n.range);if(n.attributeOldValue!==null&&i){t=s.unwrap(t,i)}if(n.attributeNewValue!==null&&r){s.wrap(t,r)}}}}function hk(t,e=Gk){return(n,o,i)=>{if(!e(o.item,i.consumable,{preflight:true})){return}const r=t(o.item,i,o);if(!r){return}e(o.item,i.consumable);const s=i.mapper.toViewPosition(o.range.start);i.mapper.bindElements(o.item,r);i.writer.insert(s,r);i.convertAttributes(o.item);$k(r,o.item.getChildren(),i,{reconversion:o.reconversion})}}function fk(t,e){return(n,o,i)=>{if(!e(o.item,i.consumable,{preflight:true})){return}const r=new Map;i.writer._registerSlotFactory(Hk(o.item,r,i));const s=t(o.item,i,o);i.writer._clearSlotFactory();if(!s){return}jk(o.item,r,i);e(o.item,i.consumable);const a=i.mapper.toViewPosition(o.range.start);i.mapper.bindElements(o.item,s);i.writer.insert(a,s);i.convertAttributes(o.item);qk(s,r,i,{reconversion:o.reconversion})}}function pk(t){return(e,n,o)=>{n.isOpening=true;const i=t(n,o);n.isOpening=false;const r=t(n,o);if(!i||!r){return}const s=n.markerRange;if(s.isCollapsed&&!o.consumable.consume(s,e.name)){return}for(const t of s){if(!o.consumable.consume(t.item,e.name)){return}}const a=o.mapper;const c=o.writer;c.insert(a.toViewPosition(s.start),i);o.mapper.bindElementToMarker(i,n.markerName);if(!s.isCollapsed){c.insert(a.toViewPosition(s.end),r);o.mapper.bindElementToMarker(r,n.markerName)}e.stop()}}function gk(){return(t,e,n)=>{const o=n.mapper.markerNameToElements(e.markerName);if(!o){return}for(const t of o){n.mapper.unbindElementFromMarkerName(t,e.markerName);n.writer.clear(n.writer.createRangeOn(t),t)}n.writer.clearClonedElementsGroup(e.markerName);t.stop()}}function mk(t){return(e,n,o)=>{const i=t(n.markerName,o);if(!i){return}const r=n.markerRange;if(!o.consumable.consume(r,e.name)){return}bk(r,false,o,n,i);bk(r,true,o,n,i);e.stop()}}function bk(t,e,n,o,i){const r=e?t.start:t.end;const s=r.nodeAfter&&r.nodeAfter.is("element")?r.nodeAfter:null;const a=r.nodeBefore&&r.nodeBefore.is("element")?r.nodeBefore:null;if(s||a){let t;let r;if(e&&s||!e&&!a){t=s;r=true}else{t=a;r=false}const c=n.mapper.toViewElement(t);if(c){kk(c,e,r,n,o,i);return}}const c=n.mapper.toViewPosition(r);wk(c,e,n,o,i)}function kk(t,e,n,o,i,r){const s=`data-${r.group}-${e?"start":"end"}-${n?"before":"after"}`;const a=t.hasAttribute(s)?t.getAttribute(s).split(","):[];a.unshift(r.name);o.writer.setAttribute(s,a.join(","),t);o.mapper.bindElementToMarker(t,i.markerName)}function wk(t,e,n,o,i){const r=`${i.group}-${e?"start":"end"}`;const s=i.name?{name:i.name}:null;const a=n.writer.createUIElement(r,s);n.writer.insert(t,a);n.mapper.bindElementToMarker(a,o.markerName)}function _k(t){return(e,n,o)=>{const i=t(n.markerName,o);if(!i){return}const r=o.mapper.markerNameToElements(n.markerName);if(!r){return}for(const t of r){o.mapper.unbindElementFromMarkerName(t,n.markerName);if(t.is("containerElement")){s(`data-${i.group}-start-before`,t);s(`data-${i.group}-start-after`,t);s(`data-${i.group}-end-before`,t);s(`data-${i.group}-end-after`,t)}else{o.writer.clear(o.writer.createRangeOn(t),t)}}o.writer.clearClonedElementsGroup(n.markerName);e.stop();function s(t,e){if(e.hasAttribute(t)){const n=new Set(e.getAttribute(t).split(","));n.delete(i.name);if(n.size==0){o.writer.removeAttribute(t,e)}else{o.writer.setAttribute(t,Array.from(n).join(","),e)}}}}}function vk(t){return(e,n,o)=>{if(!o.consumable.test(n.item,e.name)){return}const i=t(n.attributeOldValue,o,n);const r=t(n.attributeNewValue,o,n);if(!i&&!r){return}o.consumable.consume(n.item,e.name);const s=o.mapper.toViewElement(n.item);const a=o.writer;if(!s){throw new P("conversion-attribute-to-attribute-on-text",o.dispatcher,n)}if(n.attributeOldValue!==null&&i){if(i.key=="class"){const t=el(i.value);for(const e of t){a.removeClass(e,s)}}else if(i.key=="style"){const t=Object.keys(i.value);for(const e of t){a.removeStyle(e,s)}}else{a.removeAttribute(i.key,s)}}if(n.attributeNewValue!==null&&r){if(r.key=="class"){const t=el(r.value);for(const e of t){a.addClass(e,s)}}else if(r.key=="style"){const t=Object.keys(r.value);for(const e of t){a.setStyle(e,r.value[e],s)}}else{a.setAttribute(r.key,r.value,s)}}}}function Ak(t){return(e,n,o)=>{if(!n.item){return}if(!(n.item instanceof Nb||n.item instanceof Qb)&&!n.item.is("$textProxy")){return}const i=zk(t,n,o);if(!i){return}if(!o.consumable.consume(n.item,e.name)){return}const r=o.writer;const s=ak(r,i);const a=r.document.selection;if(n.item instanceof Nb||n.item instanceof Qb){r.wrap(a.getFirstRange(),s)}else{const t=o.mapper.toViewRange(n.range);const e=r.wrap(t,s);for(const t of e.getItems()){if(t.is("attributeElement")&&t.isSimilar(s)){o.mapper.bindElementToMarker(t,n.markerName);break}}}}}function Ck(t){return(e,n,o)=>{if(!n.item){return}if(!(n.item instanceof _b)){return}const i=zk(t,n,o);if(!i){return}if(!o.consumable.test(n.item,e.name)){return}const r=o.mapper.toViewElement(n.item);if(r&&r.getCustomProperty("addHighlight")){o.consumable.consume(n.item,e.name);for(const t of Bb._createIn(n.item)){o.consumable.consume(t.item,e.name)}const t=r.getCustomProperty("addHighlight");t(r,i,o.writer);o.mapper.bindElementToMarker(r,n.markerName)}}}function yk(t){return(e,n,o)=>{if(n.markerRange.isCollapsed){return}const i=zk(t,n,o);if(!i){return}const r=ak(o.writer,i);const s=o.mapper.markerNameToElements(n.markerName);if(!s){return}for(const t of s){o.mapper.unbindElementFromMarkerName(t,n.markerName);if(t.is("attributeElement")){o.writer.unwrap(o.writer.createRangeOn(t),r)}else{const e=t.getCustomProperty("removeHighlight");e(t,i.id,o.writer)}}o.writer.clearClonedElementsGroup(n.markerName);e.stop()}}function xk(t){const e=Ik(t.model);const n=Rk(t.view,"container");if(e.attributes.length){e.children=true}return o=>{o.on(`insert:${e.name}`,hk(n,Lk(e)),{priority:t.converterPriority||"normal"});if(e.children||e.attributes.length){o.on("reduceChanges",Nk(e),{priority:"low"})}}}function Ek(t){const e=Ik(t.model);const n=Rk(t.view,"container");e.children=true;return o=>{if(o._conversionApi.schema.checkChild(e.name,"$text")){throw new P("conversion-element-to-structure-disallowed-text",o,{elementName:e.name})}o.on(`insert:${e.name}`,fk(n,Lk(e)),{priority:t.converterPriority||"normal"});o.on("reduceChanges",Nk(e),{priority:"low"})}}function Sk(t){t=fb(t);let e=t.model;if(typeof e=="string"){e={key:e}}let n=`attribute:${e.key}`;if(e.name){n+=":"+e.name}if(e.values){for(const n of e.values){t.view[n]=Rk(t.view[n],"attribute")}}else{t.view=Rk(t.view,"attribute")}const o=Mk(t);return e=>{e.on(n,uk(o),{priority:t.converterPriority||"normal"})}}function Dk(t){t=fb(t);let e=t.model;if(typeof e=="string"){e={key:e}}let n=`attribute:${e.key}`;if(e.name){n+=":"+e.name}if(e.values){for(const n of e.values){t.view[n]=Vk(t.view[n])}}else{t.view=Vk(t.view)}const o=Mk(t);return e=>{e.on(n,vk(o),{priority:t.converterPriority||"normal"})}}function Tk(t){const e=Rk(t.view,"ui");return n=>{n.on(`addMarker:${t.model}`,pk(e),{priority:t.converterPriority||"normal"});n.on(`removeMarker:${t.model}`,gk(),{priority:t.converterPriority||"normal"})}}function Pk(t){t=fb(t);const e=t.model;let n=t.view;if(!n){n=n=>({group:e,name:n.substr(t.model.length+1)})}return o=>{o.on(`addMarker:${e}`,mk(n),{priority:t.converterPriority||"normal"});o.on(`removeMarker:${e}`,_k(n),{priority:t.converterPriority||"normal"})}}function Bk(t){return e=>{e.on(`addMarker:${t.model}`,Ak(t.view),{priority:t.converterPriority||"normal"});e.on(`addMarker:${t.model}`,Ck(t.view),{priority:t.converterPriority||"normal"});e.on(`removeMarker:${t.model}`,yk(t.view),{priority:t.converterPriority||"normal"})}}function Ik(t){if(typeof t=="string"){t={name:t}}if(!t.attributes){t.attributes=[]}else if(!Array.isArray(t.attributes)){t.attributes=[t.attributes]}t.children=!!t.children;return t}function Rk(t,e){if(typeof t=="function"){return t}return(n,o)=>Ok(t,o,e)}function Ok(t,e,n){if(typeof t=="string"){t={name:t}}let o;const i=e.writer;const r=Object.assign({},t.attributes);if(n=="container"){o=i.createContainerElement(t.name,r)}else if(n=="attribute"){const e={priority:t.priority||Ap.DEFAULT_PRIORITY};o=i.createAttributeElement(t.name,r,e)}else{o=i.createUIElement(t.name,r)}if(t.styles){const e=Object.keys(t.styles);for(const n of e){i.setStyle(n,t.styles[n],o)}}if(t.classes){const e=t.classes;if(typeof e=="string"){i.addClass(e,o)}else{for(const t of e){i.addClass(t,o)}}}return o}function Mk(t){if(t.model.values){return(e,n,o)=>{const i=t.view[e];if(i){return i(e,n,o)}return null}}else{return t.view}}function Vk(t){if(typeof t=="string"){return e=>({key:t,value:e})}else if(typeof t=="object"){if(t.value){return()=>t}else{return e=>({key:t.key,value:e})}}else{return t}}function zk(t,e,n){const o=typeof t=="function"?t(e,n):t;if(!o){return null}if(!o.priority){o.priority=10}if(!o.id){o.id=e.markerName}return o}function Fk(t){return(e,n)=>{if(!e.is("element",t.name)){return false}if(n.type=="attribute"){if(t.attributes.includes(n.attributeKey)){return true}}else{if(t.children){return true}}return false}}function Nk(t){const e=Fk(t);return(t,n)=>{const o=[];if(!n.reconvertedElements){n.reconvertedElements=new Set}for(const t of n.changes){const i=t.type=="attribute"?t.range.start.nodeAfter:t.position.parent;if(!i||!e(i,t)){o.push(t);continue}if(!n.reconvertedElements.has(i)){n.reconvertedElements.add(i);const t=yb._createBefore(i);let e=o.length;for(let n=o.length-1;n>=0;n--){const i=o[n];const r=i.type=="attribute"?i.range.start:i.position;const s=r.compareWith(t);if(s=="before"||i.type=="remove"&&s=="same"){break}e=n}o.splice(e,0,{type:"remove",name:i.name,position:t,length:1},{type:"reinsert",name:i.name,position:t,length:1})}}n.changes=o}}function Lk(t){return(e,n,o={})=>{const i=["insert"];for(const n of t.attributes){if(e.hasAttribute(n)){i.push(`attribute:${n}`)}}if(!i.every((t=>n.test(e,t)))){return false}if(!o.preflight){i.forEach((t=>n.consume(e,t)))}return true}}function Hk(t,e,n){return(o,i)=>{const r=o.createContainerElement("$slot");let s=null;if(i==="children"){s=Array.from(t.getChildren())}else if(typeof i=="function"){s=Array.from(t.getChildren()).filter((t=>i(t)))}else{throw new P("conversion-slot-mode-unknown",n.dispatcher,{modeOrFilter:i})}e.set(r,s);return r}}function jk(t,e,n){const o=Array.from(e.values()).flat();const i=new Set(o);if(i.size!=o.length){throw new P("conversion-slot-filter-overlap",n.dispatcher,{element:t})}if(i.size!=t.childCount){throw new P("conversion-slot-filter-incomplete",n.dispatcher,{element:t})}}function qk(t,e,n,o){n.mapper.on("modelToViewPosition",s,{priority:"highest"});let i=null;let r=null;for([i,r]of e){$k(t,r,n,o);n.writer.move(n.writer.createRangeIn(i),n.writer.createPositionBefore(i));n.writer.remove(i)}n.mapper.off("modelToViewPosition",s);function s(t,e){const n=e.modelPosition.nodeAfter;const o=r.indexOf(n);if(o<0){return}e.viewPosition=e.mapper.findPositionIn(i,o)}}function $k(t,e,n,o){for(const i of e){if(!Wk(t.root,i,n,o)){n.convertItem(i)}}}function Wk(t,e,n,o){const{writer:i,mapper:r}=n;if(!o.reconversion){return false}const s=r.toViewElement(e);if(!s||s.root==t){return false}if(!n.canReuseView(s)){return false}i.move(i.createRangeOn(s),r.toViewPosition(yb._createBefore(e)));return true}function Gk(t,e,{preflight:n}={}){if(n){return e.test(t,"insert")}else{return e.consume(t,"insert")}}function Kk(t){const{schema:e,document:n}=t.model;for(const o of n.getRoots()){if(o.isEmpty&&!e.checkChild(o,"$text")){if(e.checkChild(o,"paragraph")){t.insertElement("paragraph",o);return true}}}return false}function Uk(t,e,n){const o=n.createContext(t);if(!n.checkChild(o,"paragraph")){return false}if(!n.checkChild(o.push("paragraph"),e)){return false}return true}function Zk(t,e){const n=e.createElement("paragraph");e.insert(n,t);return e.createPositionAt(n,0)}class Jk extends nk{elementToElement(t){return this.add(tw(t))}elementToAttribute(t){return this.add(ew(t))}attributeToAttribute(t){return this.add(nw(t))}elementToMarker(t){return this.add(ow(t))}dataToMarker(t){return this.add(iw(t))}}function Yk(){return(t,e,n)=>{if(!e.modelRange&&n.consumable.consume(e.viewItem,{name:true})){const{modelRange:t,modelCursor:o}=n.convertChildren(e.viewItem,e.modelCursor);e.modelRange=t;e.modelCursor=o}}}function Qk(){return(t,e,{schema:n,consumable:o,writer:i})=>{let r=e.modelCursor;if(!o.test(e.viewItem)){return}if(!n.checkChild(r,"$text")){if(!Uk(r,"$text",n)){return}if(e.viewItem.data.trim().length==0){return}const t=r.nodeBefore;r=Zk(r,i);if(t&&t.is("element","$marker")){i.move(i.createRangeOn(t),r);r=i.createPositionAfter(t)}}o.consume(e.viewItem);const s=i.createText(e.viewItem.data);i.insert(s,r);e.modelRange=i.createRange(r,r.getShiftedBy(s.offsetSize));e.modelCursor=e.modelRange.end}}function Xk(t,e){return(n,o)=>{const i=o.newSelection;const r=[];for(const t of i.getRanges()){r.push(e.toModelRange(t))}const s=t.createSelection(r,{backward:i.isBackward});if(!s.isEqual(t.document.selection)){t.change((t=>{t.setSelection(s)}))}}}function tw(t){t=fb(t);const e=aw(t);const n=sw(t.view);const o=n?`element:${n}`:"element";return n=>{n.on(o,e,{priority:t.converterPriority||"normal"})}}function ew(t){t=fb(t);dw(t);const e=uw(t,false);const n=sw(t.view);const o=n?`element:${n}`:"element";return n=>{n.on(o,e,{priority:t.converterPriority||"low"})}}function nw(t){t=fb(t);let e=null;if(typeof t.view=="string"||t.view.key){e=lw(t)}dw(t,e);const n=uw(t,true);return e=>{e.on("element",n,{priority:t.converterPriority||"low"})}}function ow(t){const e=pw(t.model);return tw({...t,model:e})}function iw(t){t=fb(t);if(!t.model){t.model=e=>e?t.view+":"+e:t.view}const e={view:t.view,model:t.model};const n=aw(gw(e,"start"));const o=aw(gw(e,"end"));return i=>{i.on(`element:${t.view}-start`,n,{priority:t.converterPriority||"normal"});i.on(`element:${t.view}-end`,o,{priority:t.converterPriority||"normal"});const r=S.low;const s=S.highest;const a=S.get(t.converterPriority)/s;i.on("element",rw(e),{priority:r+a})}}function rw(t){return(e,n,o)=>{const i=`data-${t.view}`;if(!o.consumable.test(n.viewItem,{attributes:i+"-end-after"})&&!o.consumable.test(n.viewItem,{attributes:i+"-start-after"})&&!o.consumable.test(n.viewItem,{attributes:i+"-end-before"})&&!o.consumable.test(n.viewItem,{attributes:i+"-start-before"})){return}if(!n.modelRange){Object.assign(n,o.convertChildren(n.viewItem,n.modelCursor))}if(o.consumable.consume(n.viewItem,{attributes:i+"-end-after"})){r(n.modelRange.end,n.viewItem.getAttribute(i+"-end-after").split(","))}if(o.consumable.consume(n.viewItem,{attributes:i+"-start-after"})){r(n.modelRange.end,n.viewItem.getAttribute(i+"-start-after").split(","))}if(o.consumable.consume(n.viewItem,{attributes:i+"-end-before"})){r(n.modelRange.start,n.viewItem.getAttribute(i+"-end-before").split(","))}if(o.consumable.consume(n.viewItem,{attributes:i+"-start-before"})){r(n.modelRange.start,n.viewItem.getAttribute(i+"-start-before").split(","))}function r(e,i){for(const r of i){const i=t.model(r,o);const s=o.writer.createElement("$marker",{"data-name":i});o.writer.insert(s,e);if(n.modelCursor.isEqual(e)){n.modelCursor=n.modelCursor.getShiftedBy(1)}else{n.modelCursor=n.modelCursor._getTransformedByInsertion(e,1)}n.modelRange=n.modelRange._getTransformedByInsertion(e,1)[0]}}}}function sw(t){if(typeof t=="string"){return t}if(typeof t=="object"&&typeof t.name=="string"){return t.name}return null}function aw(t){const e=new Qu(t.view);return(n,o,i)=>{const r=e.match(o.viewItem);if(!r){return}const s=r.match;s.name=true;if(!i.consumable.test(o.viewItem,s)){return}const a=cw(t.model,o.viewItem,i);if(!a){return}if(!i.safeInsert(a,o.modelCursor)){return}i.consumable.consume(o.viewItem,s);i.convertChildren(o.viewItem,a);i.updateConversionResult(a,o)}}function cw(t,e,n){if(t instanceof Function){return t(e,n)}else{return n.writer.createElement(t)}}function lw(t){if(typeof t.view=="string"){t.view={key:t.view}}const e=t.view.key;let n;if(e=="class"||e=="style"){const o=e=="class"?"classes":"styles";n={[o]:t.view.value}}else{const o=typeof t.view.value=="undefined"?/[\s\S]*/:t.view.value;n={attributes:{[e]:o}}}if(t.view.name){n.name=t.view.name}t.view=n;return e}function dw(t,e=null){const n=e===null?true:t=>t.getAttribute(e);const o=typeof t.model!="object"?t.model:t.model.key;const i=typeof t.model!="object"||typeof t.model.value=="undefined"?n:t.model.value;t.model={key:o,value:i}}function uw(t,e){const n=new Qu(t.view);return(o,i,r)=>{if(!i.modelRange&&e){return}const s=n.match(i.viewItem);if(!s){return}if(hw(t.view,i.viewItem)){s.match.name=true}else{delete s.match.name}if(!r.consumable.test(i.viewItem,s.match)){return}const a=t.model.key;const c=typeof t.model.value=="function"?t.model.value(i.viewItem,r):t.model.value;if(c===null){return}if(!i.modelRange){Object.assign(i,r.convertChildren(i.viewItem,i.modelCursor))}const l=fw(i.modelRange,{key:a,value:c},e,r);if(l){if(r.consumable.test(i.viewItem,{name:true})){s.match.name=true}r.consumable.consume(i.viewItem,s.match)}}}function hw(t,e){const n=typeof t=="function"?t(e):t;if(typeof n=="object"&&!sw(n)){return false}return!n.classes&&!n.attributes&&!n.styles}function fw(t,e,n,o){let i=false;for(const r of Array.from(t.getItems({shallow:n}))){if(!o.schema.checkAttribute(r,e.key)){continue}i=true;if(r.hasAttribute(e.key)){continue}o.writer.setAttribute(e.key,e.value,r)}return i}function pw(t){return(e,n)=>{const o=typeof t=="string"?t:t(e,n);return n.writer.createElement("$marker",{"data-name":o})}}function gw(t,e){const n=(e,n)=>{const o=e.getAttribute("name");const i=t.model(o,n);return n.writer.createElement("$marker",{"data-name":i})};return{view:`${t.view}-${e}`,model:n}}function mw(t){t.document.registerPostFixer((e=>bw(e,t)))}function bw(t,e){const n=e.document.selection;const o=e.schema;const i=[];let r=false;for(const t of n.getRanges()){const e=kw(t,o);if(e&&!e.isEqual(t)){i.push(e);r=true}else{i.push(t)}}if(r){t.setSelection(Cw(i),{backward:n.isBackward})}return false}function kw(t,e){if(t.isCollapsed){return ww(t,e)}return _w(t,e)}function ww(t,e){const n=t.start;const o=e.getNearestSelectionRange(n);if(!o){const t=n.getAncestors().reverse().find((t=>e.isObject(t)));if(t){return Bb._createOn(t)}return null}if(!o.isCollapsed){return o}const i=o.start;if(n.isEqual(i)){return null}return new Bb(i)}function _w(t,e){const{start:n,end:o}=t;const i=e.checkChild(n,"$text");const r=e.checkChild(o,"$text");const s=e.getLimitElement(n);const a=e.getLimitElement(o);if(s===a){if(i&&r){return null}if(Aw(n,o,e)){const t=n.nodeAfter&&e.isSelectable(n.nodeAfter);const i=t?null:e.getNearestSelectionRange(n,"forward");const r=o.nodeBefore&&e.isSelectable(o.nodeBefore);const s=r?null:e.getNearestSelectionRange(o,"backward");const a=i?i.start:n;const c=s?s.end:o;return new Bb(a,c)}}const c=s&&!s.is("rootElement");const l=a&&!a.is("rootElement");if(c||l){const t=n.nodeAfter&&o.nodeBefore&&n.nodeAfter.parent===o.nodeBefore.parent;const i=c&&(!t||!yw(n.nodeAfter,e));const r=l&&(!t||!yw(o.nodeBefore,e));let d=n;let u=o;if(i){d=yb._createBefore(vw(s,e))}if(r){u=yb._createAfter(vw(a,e))}return new Bb(d,u)}return null}function vw(t,e){let n=t;let o=n;while(e.isLimit(o)&&o.parent){n=o;o=o.parent}return n}function Aw(t,e,n){const o=t.nodeAfter&&!n.isLimit(t.nodeAfter)||n.checkChild(t,"$text");const i=e.nodeBefore&&!n.isLimit(e.nodeBefore)||n.checkChild(e,"$text");return o||i}function Cw(t){const e=[...t];const n=new Set;let o=1;while(o<e.length){const t=e[o];const i=e.slice(0,o);for(const[r,s]of i.entries()){if(n.has(r)){continue}if(t.isEqual(s)){n.add(r)}else if(t.isIntersecting(s)){n.add(r);n.add(o);const i=t.getJoined(s);e.push(i)}}o++}const i=e.filter(((t,e)=>!n.has(e)));return i}function yw(t,e){return t&&e.isSelectable(t)}class xw extends(lt()){constructor(t,e){super();this.model=t;this.view=new pb(e);this.mapper=new Ib;this.downcastDispatcher=new Mb({mapper:this.mapper,schema:t.schema});const n=this.model.document;const o=n.selection;const i=this.model.markers;this.listenTo(this.model,"_beforeChanges",(()=>{this.view._disableRendering(true)}),{priority:"highest"});this.listenTo(this.model,"_afterChanges",(()=>{this.view._disableRendering(false)}),{priority:"lowest"});this.listenTo(n,"change",(()=>{this.view.change((t=>{this.downcastDispatcher.convertChanges(n.differ,i,t);this.downcastDispatcher.convertSelection(o,i,t)}))}),{priority:"low"});this.listenTo(this.view.document,"selectionChange",Xk(this.model,this.mapper));this.listenTo(this.view.document,"beforeinput",Ew(this.mapper,this.model.schema,this.view),{priority:"high"});this.downcastDispatcher.on("insert:$text",ik(),{priority:"lowest"});this.downcastDispatcher.on("insert",rk(),{priority:"lowest"});this.downcastDispatcher.on("remove",sk(),{priority:"low"});this.downcastDispatcher.on("cleanSelection",dk());this.downcastDispatcher.on("selection",ck(),{priority:"low"});this.downcastDispatcher.on("selection",lk(),{priority:"low"});this.view.document.roots.bindTo(this.model.document.roots).using((t=>{if(t.rootName=="$graveyard"){return null}const e=new rp(this.view.document,t.name);e.rootName=t.rootName;this.mapper.bindElements(t,e);return e}))}destroy(){this.view.destroy();this.stopListening()}reconvertMarker(t){const e=typeof t=="string"?t:t.name;const n=this.model.markers.get(e);if(!n){throw new P("editingcontroller-reconvertmarker-marker-not-exist",this,{markerName:e})}this.model.change((()=>{this.model.markers._refresh(n)}))}reconvertItem(t){this.model.change((()=>{this.model.document.differ._refreshItem(t)}))}}function Ew(t,e,n){return(o,i)=>{if(n.document.isComposing&&!r.isAndroid){return}for(let n=0;n<i.targetRanges.length;n++){const o=i.targetRanges[n];const r=t.toModelRange(o);const s=kw(r,e);if(!s||s.isEqual(r)){continue}i.targetRanges[n]=t.toViewRange(s)}}}class Sw{constructor(){this._consumables=new Map}add(t,e){let n;if(t.is("$text")||t.is("documentFragment")){this._consumables.set(t,true);return}if(!this._consumables.has(t)){n=new Tw(t);this._consumables.set(t,n)}else{n=this._consumables.get(t)}n.add(e)}test(t,e){const n=this._consumables.get(t);if(n===undefined){return null}if(t.is("$text")||t.is("documentFragment")){return n}return n.test(e)}consume(t,e){if(this.test(t,e)){if(t.is("$text")||t.is("documentFragment")){this._consumables.set(t,false)}else{this._consumables.get(t).consume(e)}return true}return false}revert(t,e){const n=this._consumables.get(t);if(n!==undefined){if(t.is("$text")||t.is("documentFragment")){this._consumables.set(t,true)}else{n.revert(e)}}}static consumablesFromElement(t){const e={element:t,name:true,attributes:[],classes:[],styles:[]};const n=t.getAttributeKeys();for(const t of n){if(t=="style"||t=="class"){continue}e.attributes.push(t)}const o=t.getClassNames();for(const t of o){e.classes.push(t)}const i=t.getStyleNames();for(const t of i){e.styles.push(t)}return e}static createFrom(t,e){if(!e){e=new Sw}if(t.is("$text")){e.add(t);return e}if(t.is("element")){e.add(t,Sw.consumablesFromElement(t))}if(t.is("documentFragment")){e.add(t)}for(const n of t.getChildren()){e=Sw.createFrom(n,e)}return e}}const Dw=["attributes","classes","styles"];class Tw{constructor(t){this.element=t;this._canConsumeName=null;this._consumables={attributes:new Map,styles:new Map,classes:new Map}}add(t){if(t.name){this._canConsumeName=true}for(const e of Dw){if(e in t){this._add(e,t[e])}}}test(t){if(t.name&&!this._canConsumeName){return this._canConsumeName}for(const e of Dw){if(e in t){const n=this._test(e,t[e]);if(n!==true){return n}}}return true}consume(t){if(t.name){this._canConsumeName=false}for(const e of Dw){if(e in t){this._consume(e,t[e])}}}revert(t){if(t.name){this._canConsumeName=true}for(const e of Dw){if(e in t){this._revert(e,t[e])}}}_add(t,e){const n=Kt(e)?e:[e];const o=this._consumables[t];for(const e of n){if(t==="attributes"&&(e==="class"||e==="style")){throw new P("viewconsumable-invalid-attribute",this)}o.set(e,true);if(t==="styles"){for(const t of this.element.document.stylesProcessor.getRelatedStyles(e)){o.set(t,true)}}}}_test(t,e){const n=Kt(e)?e:[e];const o=this._consumables[t];for(const e of n){if(t==="attributes"&&(e==="class"||e==="style")){const t=e=="class"?"classes":"styles";const n=this._test(t,[...this._consumables[t].keys()]);if(n!==true){return n}}else{const t=o.get(e);if(t===undefined){return null}if(!t){return false}}}return true}_consume(t,e){const n=Kt(e)?e:[e];const o=this._consumables[t];for(const e of n){if(t==="attributes"&&(e==="class"||e==="style")){const t=e=="class"?"classes":"styles";this._consume(t,[...this._consumables[t].keys()])}else{o.set(e,false);if(t=="styles"){for(const t of this.element.document.stylesProcessor.getRelatedStyles(e)){o.set(t,false)}}}}}_revert(t,e){const n=Kt(e)?e:[e];const o=this._consumables[t];for(const e of n){if(t==="attributes"&&(e==="class"||e==="style")){const t=e=="class"?"classes":"styles";this._revert(t,[...this._consumables[t].keys()])}else{const t=o.get(e);if(t===false){o.set(e,true)}}}}}class Pw extends(lt()){constructor(){super();this._sourceDefinitions={};this._attributeProperties={};this.decorate("checkChild");this.decorate("checkAttribute");this.on("checkAttribute",((t,e)=>{e[0]=new Bw(e[0])}),{priority:"highest"});this.on("checkChild",((t,e)=>{e[0]=new Bw(e[0]);e[1]=this.getDefinition(e[1])}),{priority:"highest"})}register(t,e){if(this._sourceDefinitions[t]){throw new P("schema-cannot-register-item-twice",this,{itemName:t})}this._sourceDefinitions[t]=[Object.assign({},e)];this._clearCache()}extend(t,e){if(!this._sourceDefinitions[t]){throw new P("schema-cannot-extend-missing-item",this,{itemName:t})}this._sourceDefinitions[t].push(Object.assign({},e));this._clearCache()}getDefinitions(){if(!this._compiledDefinitions){this._compile()}return this._compiledDefinitions}getDefinition(t){let e;if(typeof t=="string"){e=t}else if("is"in t&&(t.is("$text")||t.is("$textProxy"))){e="$text"}else{e=t.name}return this.getDefinitions()[e]}isRegistered(t){return!!this.getDefinition(t)}isBlock(t){const e=this.getDefinition(t);return!!(e&&e.isBlock)}isLimit(t){const e=this.getDefinition(t);if(!e){return false}return!!(e.isLimit||e.isObject)}isObject(t){const e=this.getDefinition(t);if(!e){return false}return!!(e.isObject||e.isLimit&&e.isSelectable&&e.isContent)}isInline(t){const e=this.getDefinition(t);return!!(e&&e.isInline)}isSelectable(t){const e=this.getDefinition(t);if(!e){return false}return!!(e.isSelectable||e.isObject)}isContent(t){const e=this.getDefinition(t);if(!e){return false}return!!(e.isContent||e.isObject)}checkChild(t,e){if(!e){return false}return this._checkContextMatch(e,t)}checkAttribute(t,e){const n=this.getDefinition(t.last);if(!n){return false}return n.allowAttributes.includes(e)}checkMerge(t,e){if(t instanceof yb){const e=t.nodeBefore;const n=t.nodeAfter;if(!(e instanceof _b)){throw new P("schema-check-merge-no-element-before",this)}if(!(n instanceof _b)){throw new P("schema-check-merge-no-element-after",this)}return this.checkMerge(e,n)}for(const n of e.getChildren()){if(!this.checkChild(t,n)){return false}}return true}addChildCheck(t){this.on("checkChild",((e,[n,o])=>{if(!o){return}const i=t(n,o);if(typeof i=="boolean"){e.stop();e.return=i}}),{priority:"high"})}addAttributeCheck(t){this.on("checkAttribute",((e,[n,o])=>{const i=t(n,o);if(typeof i=="boolean"){e.stop();e.return=i}}),{priority:"high"})}setAttributeProperties(t,e){this._attributeProperties[t]=Object.assign(this.getAttributeProperties(t),e)}getAttributeProperties(t){return this._attributeProperties[t]||{}}getLimitElement(t){let e;if(t instanceof yb){e=t.parent}else{const n=t instanceof Bb?[t]:Array.from(t.getRanges());e=n.reduce(((t,e)=>{const n=e.getCommonAncestor();if(!t){return n}return t.getCommonAncestor(n,{includeSelf:true})}),null)}while(!this.isLimit(e)){if(e.parent){e=e.parent}else{break}}return e}checkAttributeInSelection(t,e){if(t.isCollapsed){const n=t.getFirstPosition();const o=[...n.getAncestors(),new kb("",t.getAttributes())];return this.checkAttribute(o,e)}else{const n=t.getRanges();for(const t of n){for(const n of t){if(this.checkAttribute(n.item,e)){return true}}}}return false}*getValidRanges(t,e){t=Uw(t);for(const n of t){yield*this._getValidRangesForRange(n,e)}}getNearestSelectionRange(t,e="both"){if(t.root.rootName=="$graveyard"){return null}if(this.checkChild(t,"$text")){return new Bb(t)}let n,o;const i=t.getAncestors().reverse().find((t=>this.isLimit(t)))||t.root;if(e=="both"||e=="backward"){n=new Ab({boundaries:Bb._createIn(i),startPosition:t,direction:"backward"})}if(e=="both"||e=="forward"){o=new Ab({boundaries:Bb._createIn(i),startPosition:t})}for(const t of Kw(n,o)){const e=t.walker==n?"elementEnd":"elementStart";const o=t.value;if(o.type==e&&this.isObject(o.item)){return Bb._createOn(o.item)}if(this.checkChild(o.nextPosition,"$text")){return new Bb(o.nextPosition)}}return null}findAllowedParent(t,e){let n=t.parent;while(n){if(this.checkChild(n,e)){return n}if(this.isLimit(n)){return null}n=n.parent}return null}setAllowedAttributes(t,e,n){const o=n.model;for(const[i,r]of Object.entries(e)){if(o.schema.checkAttribute(t,i)){n.setAttribute(i,r,t)}}}removeDisallowedAttributes(t,e){for(const n of t){if(n.is("$text")){Zw(this,n,e)}else{const t=Bb._createIn(n);const o=t.getPositions();for(const t of o){const n=t.nodeBefore||t.parent;Zw(this,n,e)}}}}getAttributesWithProperty(t,e,n){const o={};for(const[i,r]of t.getAttributes()){const t=this.getAttributeProperties(i);if(t[e]===undefined){continue}if(n===undefined||n===t[e]){o[i]=r}}return o}createContext(t){return new Bw(t)}_clearCache(){this._compiledDefinitions=null}_compile(){const t={};const e=this._sourceDefinitions;const n=Object.keys(e);for(const o of n){t[o]=Iw(e[o],o)}for(const e of n){Rw(t,e)}for(const e of n){Ow(t,e)}for(const e of n){Mw(t,e)}for(const e of n){Vw(t,e);zw(t,e)}for(const e of n){Fw(t,e);Nw(t,e);Lw(t,e)}this._compiledDefinitions=t}_checkContextMatch(t,e,n=e.length-1){const o=e.getItem(n);if(t.allowIn.includes(o.name)){if(n==0){return true}else{const t=this.getDefinition(o);return this._checkContextMatch(t,e,n-1)}}else{return false}}*_getValidRangesForRange(t,e){let n=t.start;let o=t.start;for(const i of t.getItems({shallow:true})){if(i.is("element")){yield*this._getValidRangesForRange(Bb._createIn(i),e)}if(!this.checkAttribute(i,e)){if(!n.isEqual(o)){yield new Bb(n,o)}n=yb._createAfter(i)}o=yb._createAfter(i)}if(!n.isEqual(o)){yield new Bb(n,o)}}}class Bw{constructor(t){if(t instanceof Bw){return t}let e;if(typeof t=="string"){e=[t]}else if(!Array.isArray(t)){e=t.getAncestors({includeSelf:true})}else{e=t}this._items=e.map(Gw)}get length(){return this._items.length}get last(){return this._items[this._items.length-1]}[Symbol.iterator](){return this._items[Symbol.iterator]()}push(t){const e=new Bw([t]);e._items=[...this._items,...e._items];return e}getItem(t){return this._items[t]}*getNames(){yield*this._items.map((t=>t.name))}endsWith(t){return Array.from(this.getNames()).join(" ").endsWith(t)}startsWith(t){return Array.from(this.getNames()).join(" ").startsWith(t)}}function Iw(t,e){const n={name:e,allowIn:[],allowContentOf:[],allowWhere:[],allowAttributes:[],allowAttributesOf:[],allowChildren:[],inheritTypesFrom:[]};Hw(t,n);jw(t,n,"allowIn");jw(t,n,"allowContentOf");jw(t,n,"allowWhere");jw(t,n,"allowAttributes");jw(t,n,"allowAttributesOf");jw(t,n,"allowChildren");jw(t,n,"inheritTypesFrom");qw(t,n);return n}function Rw(t,e){const n=t[e];for(const o of n.allowChildren){const n=t[o];if(!n){continue}n.allowIn.push(e)}n.allowChildren.length=0}function Ow(t,e){for(const n of t[e].allowContentOf){if(t[n]){const o=$w(t,n);o.forEach((t=>{t.allowIn.push(e)}))}}delete t[e].allowContentOf}function Mw(t,e){for(const n of t[e].allowWhere){const o=t[n];if(o){const n=o.allowIn;t[e].allowIn.push(...n)}}delete t[e].allowWhere}function Vw(t,e){for(const n of t[e].allowAttributesOf){const o=t[n];if(o){const n=o.allowAttributes;t[e].allowAttributes.push(...n)}}delete t[e].allowAttributesOf}function zw(t,e){const n=t[e];for(const e of n.inheritTypesFrom){const o=t[e];if(o){const t=Object.keys(o).filter((t=>t.startsWith("is")));for(const e of t){if(!(e in n)){n[e]=o[e]}}}}delete n.inheritTypesFrom}function Fw(t,e){const n=t[e];const o=n.allowIn.filter((e=>t[e]));n.allowIn=Array.from(new Set(o))}function Nw(t,e){const n=t[e];for(const o of n.allowIn){const n=t[o];n.allowChildren.push(e)}}function Lw(t,e){const n=t[e];n.allowAttributes=Array.from(new Set(n.allowAttributes))}function Hw(t,e){for(const n of t){const t=Object.keys(n).filter((t=>t.startsWith("is")));for(const o of t){e[o]=!!n[o]}}}function jw(t,e,n){for(const o of t){const t=o[n];if(typeof t=="string"){e[n].push(t)}else if(Array.isArray(t)){e[n].push(...t)}}}function qw(t,e){for(const n of t){const t=n.inheritAllFrom;if(t){e.allowContentOf.push(t);e.allowWhere.push(t);e.allowAttributesOf.push(t);e.inheritTypesFrom.push(t)}}}function $w(t,e){const n=t[e];return Ww(t).filter((t=>t.allowIn.includes(n.name)))}function Ww(t){return Object.keys(t).map((e=>t[e]))}function Gw(t){if(typeof t=="string"||t.is("documentFragment")){return{name:typeof t=="string"?t:"$documentFragment",*getAttributeKeys(){},getAttribute(){}}}else{return{name:t.is("element")?t.name:"$text",*getAttributeKeys(){yield*t.getAttributeKeys()},getAttribute(e){return t.getAttribute(e)}}}}function*Kw(t,e){let n=false;while(!n){n=true;if(t){const e=t.next();if(!e.done){n=false;yield{walker:t,value:e.value}}}if(e){const t=e.next();if(!t.done){n=false;yield{walker:e,value:t.value}}}}}function*Uw(t){for(const e of t){yield*e.getMinimalFlatRanges()}}function Zw(t,e,n){for(const o of e.getAttributeKeys()){if(!t.checkAttribute(e,o)){n.removeAttribute(o,e)}}}class Jw extends(q()){constructor(t){super();this._splitParts=new Map;this._cursorParents=new Map;this._modelCursor=null;this._emptyElementsToKeep=new Set;this.conversionApi={...t,consumable:null,writer:null,store:null,convertItem:(t,e)=>this._convertItem(t,e),convertChildren:(t,e)=>this._convertChildren(t,e),safeInsert:(t,e)=>this._safeInsert(t,e),updateConversionResult:(t,e)=>this._updateConversionResult(t,e),splitToAllowedParent:(t,e)=>this._splitToAllowedParent(t,e),getSplitParts:t=>this._getSplitParts(t),keepEmptyElement:t=>this._keepEmptyElement(t)}}convert(t,e,n=["$root"]){this.fire("viewCleanup",t);this._modelCursor=Qw(n,e);this.conversionApi.writer=e;this.conversionApi.consumable=Sw.createFrom(t);this.conversionApi.store={};const{modelRange:o}=this._convertItem(t,this._modelCursor);const i=e.createDocumentFragment();if(o){this._removeEmptyElements();for(const t of Array.from(this._modelCursor.parent.getChildren())){e.append(t,i)}i.markers=Yw(i,e)}this._modelCursor=null;this._splitParts.clear();this._cursorParents.clear();this._emptyElementsToKeep.clear();this.conversionApi.writer=null;this.conversionApi.store=null;return i}_convertItem(t,e){const n={viewItem:t,modelCursor:e,modelRange:null};if(t.is("element")){this.fire(`element:${t.name}`,n,this.conversionApi)}else if(t.is("$text")){this.fire("text",n,this.conversionApi)}else{this.fire("documentFragment",n,this.conversionApi)}if(n.modelRange&&!(n.modelRange instanceof Bb)){throw new P("view-conversion-dispatcher-incorrect-result",this)}return{modelRange:n.modelRange,modelCursor:n.modelCursor}}_convertChildren(t,e){let n=e.is("position")?e:yb._createAt(e,0);const o=new Bb(n);for(const e of Array.from(t.getChildren())){const t=this._convertItem(e,n);if(t.modelRange instanceof Bb){o.end=t.modelRange.end;n=t.modelCursor}}return{modelRange:o,modelCursor:n}}_safeInsert(t,e){const n=this._splitToAllowedParent(t,e);if(!n){return false}this.conversionApi.writer.insert(t,n.position);return true}_updateConversionResult(t,e){const n=this._getSplitParts(t);const o=this.conversionApi.writer;if(!e.modelRange){e.modelRange=o.createRange(o.createPositionBefore(t),o.createPositionAfter(n[n.length-1]))}const i=this._cursorParents.get(t);if(i){e.modelCursor=o.createPositionAt(i,0)}else{e.modelCursor=e.modelRange.end}}_splitToAllowedParent(t,e){const{schema:n,writer:o}=this.conversionApi;let i=n.findAllowedParent(e,t);if(i){if(i===e.parent){return{position:e}}if(this._modelCursor.parent.getAncestors().includes(i)){i=null}}if(!i){if(!Uk(e,t,n)){return null}return{position:Zk(e,o)}}const r=this.conversionApi.writer.split(e,i);const s=[];for(const t of r.range.getWalker()){if(t.type=="elementEnd"){s.push(t.item)}else{const e=s.pop();const n=t.item;this._registerSplitPair(e,n)}}const a=r.range.end.parent;this._cursorParents.set(t,a);return{position:r.position,cursorParent:a}}_registerSplitPair(t,e){if(!this._splitParts.has(t)){this._splitParts.set(t,[t])}const n=this._splitParts.get(t);this._splitParts.set(e,n);n.push(e)}_getSplitParts(t){let e;if(!this._splitParts.has(t)){e=[t]}else{e=this._splitParts.get(t)}return e}_keepEmptyElement(t){this._emptyElementsToKeep.add(t)}_removeEmptyElements(){let t=false;for(const e of this._splitParts.keys()){if(e.isEmpty&&!this._emptyElementsToKeep.has(e)){this.conversionApi.writer.remove(e);this._splitParts.delete(e);t=true}}if(t){this._removeEmptyElements()}}}function Yw(t,e){const n=new Set;const o=new Map;const i=Bb._createIn(t).getItems();for(const t of i){if(t.is("element","$marker")){n.add(t)}}for(const t of n){const n=t.getAttribute("data-name");const i=e.createPositionBefore(t);if(!o.has(n)){o.set(n,new Bb(i.clone()))}else{o.get(n).end=i.clone()}e.remove(t)}return o}function Qw(t,e){let n;for(const o of new Bw(t)){const t={};for(const e of o.getAttributeKeys()){t[e]=o.getAttribute(e)}const i=e.createElement(o.name,t);if(n){e.insert(i,n)}n=yb._createAt(i,0)}return n}class Xw{getHtml(t){const e=document.implementation.createHTMLDocument("");const n=e.createElement("div");n.appendChild(t);return n.innerHTML}}class t_{constructor(t){this.skipComments=true;this.domParser=new DOMParser;this.domConverter=new Ag(t,{renderingMode:"data"});this.htmlWriter=new Xw}toData(t){const e=this.domConverter.viewToDom(t);return this.htmlWriter.getHtml(e)}toView(t){const e=this._toDom(t);return this.domConverter.domToView(e,{skipComments:this.skipComments})}registerRawContentMatcher(t){this.domConverter.registerRawContentMatcher(t)}useFillerType(t){this.domConverter.blockFillerMode=t=="marked"?"markedNbsp":"nbsp"}_toDom(t){if(!t.match(/<(?:html|body|head|meta)(?:\s[^>]*)?>/i)){t=`<body>${t}</body>`}const e=this.domParser.parseFromString(t,"text/html");const n=e.createDocumentFragment();const o=e.body.childNodes;while(o.length>0){n.appendChild(o[0])}return n}}class e_ extends(q()){constructor(t,e){super();this.model=t;this.mapper=new Ib;this.downcastDispatcher=new Mb({mapper:this.mapper,schema:t.schema});this.downcastDispatcher.on("insert:$text",ik(),{priority:"lowest"});this.downcastDispatcher.on("insert",rk(),{priority:"lowest"});this.upcastDispatcher=new Jw({schema:t.schema});this.viewDocument=new _p(e);this.stylesProcessor=e;this.htmlProcessor=new t_(this.viewDocument);this.processor=this.htmlProcessor;this._viewWriter=new Mp(this.viewDocument);this.upcastDispatcher.on("text",Qk(),{priority:"lowest"});this.upcastDispatcher.on("element",Yk(),{priority:"lowest"});this.upcastDispatcher.on("documentFragment",Yk(),{priority:"lowest"});lt().prototype.decorate.call(this,"init");lt().prototype.decorate.call(this,"set");lt().prototype.decorate.call(this,"get");lt().prototype.decorate.call(this,"toView");lt().prototype.decorate.call(this,"toModel");this.on("init",(()=>{this.fire("ready")}),{priority:"lowest"});this.on("ready",(()=>{this.model.enqueueChange({isUndoable:false},Kk)}),{priority:"lowest"})}get(t={}){const{rootName:e="main",trim:n="empty"}=t;if(!this._checkIfRootsExists([e])){throw new P("datacontroller-get-non-existent-root",this)}const o=this.model.document.getRoot(e);if(!o.isAttached()){B("datacontroller-get-detached-root",this)}if(n==="empty"&&!this.model.hasContent(o,{ignoreWhitespaces:true})){return""}return this.stringify(o,t)}stringify(t,e={}){const n=this.toView(t,e);return this.processor.toData(n)}toView(t,e={}){const n=this.viewDocument;const o=this._viewWriter;this.mapper.clearBindings();const i=Bb._createIn(t);const r=new Rp(n);this.mapper.bindElements(t,r);const s=t.is("documentFragment")?t.markers:n_(t);this.downcastDispatcher.convert(i,s,o,e);return r}init(t){if(this.model.document.version){throw new P("datacontroller-init-document-not-empty",this)}let e={};if(typeof t==="string"){e.main=t}else{e=t}if(!this._checkIfRootsExists(Object.keys(e))){throw new P("datacontroller-init-non-existent-root",this)}this.model.enqueueChange({isUndoable:false},(t=>{for(const n of Object.keys(e)){const o=this.model.document.getRoot(n);t.insert(this.parse(e[n],o),o,0)}}));return Promise.resolve()}set(t,e={}){let n={};if(typeof t==="string"){n.main=t}else{n=t}if(!this._checkIfRootsExists(Object.keys(n))){throw new P("datacontroller-set-non-existent-root",this)}this.model.enqueueChange(e.batchType||{},(t=>{t.setSelection(null);t.removeSelectionAttribute(this.model.document.selection.getAttributeKeys());for(const e of Object.keys(n)){const o=this.model.document.getRoot(e);t.remove(t.createRangeIn(o));t.insert(this.parse(n[e],o),o,0)}}))}parse(t,e="$root"){const n=this.processor.toView(t);return this.toModel(n,e)}toModel(t,e="$root"){return this.model.change((n=>this.upcastDispatcher.convert(t,n,e)))}addStyleProcessorRules(t){t(this.stylesProcessor)}registerRawContentMatcher(t){if(this.processor&&this.processor!==this.htmlProcessor){this.processor.registerRawContentMatcher(t)}this.htmlProcessor.registerRawContentMatcher(t)}destroy(){this.stopListening()}_checkIfRootsExists(t){for(const e of t){if(!this.model.document.getRoot(e)){return false}}return true}}function n_(t){const e=[];const n=t.root.document;if(!n){return new Map}const o=Bb._createIn(t);for(const t of n.model.markers){const n=t.getRange();const i=n.isCollapsed;const r=n.start.isEqual(o.start)||n.end.isEqual(o.end);if(i&&r){e.push([t.name,n])}else{const i=o.getIntersection(n);if(i){e.push([t.name,i])}}}e.sort((([t,e],[n,o])=>{if(e.end.compareWith(o.start)!=="after"){return 1}else if(e.start.compareWith(o.end)!=="before"){return-1}else{switch(e.start.compareWith(o.start)){case"before":return 1;case"after":return-1;default:switch(e.end.compareWith(o.end)){case"before":return 1;case"after":return-1;default:return n.localeCompare(t)}}}}));return new Map(e)}class o_{constructor(t,e){this._helpers=new Map;this._downcast=el(t);this._createConversionHelpers({name:"downcast",dispatchers:this._downcast,isDowncast:true});this._upcast=el(e);this._createConversionHelpers({name:"upcast",dispatchers:this._upcast,isDowncast:false})}addAlias(t,e){const n=this._downcast.includes(e);const o=this._upcast.includes(e);if(!o&&!n){throw new P("conversion-add-alias-dispatcher-not-registered",this)}this._createConversionHelpers({name:t,dispatchers:[e],isDowncast:n})}for(t){if(!this._helpers.has(t)){throw new P("conversion-for-unknown-group",this)}return this._helpers.get(t)}elementToElement(t){this.for("downcast").elementToElement(t);for(const{model:e,view:n}of i_(t)){this.for("upcast").elementToElement({model:e,view:n,converterPriority:t.converterPriority})}}attributeToElement(t){this.for("downcast").attributeToElement(t);for(const{model:e,view:n}of i_(t)){this.for("upcast").elementToAttribute({view:n,model:e,converterPriority:t.converterPriority})}}attributeToAttribute(t){this.for("downcast").attributeToAttribute(t);for(const{model:e,view:n}of i_(t)){this.for("upcast").attributeToAttribute({view:n,model:e})}}_createConversionHelpers({name:t,dispatchers:e,isDowncast:n}){if(this._helpers.has(t)){throw new P("conversion-group-exists",this)}const o=n?new ok(e):new Jk(e);this._helpers.set(t,o)}}function*i_(t){if(t.model.values){for(const e of t.model.values){const n={key:t.model.key,value:e};const o=t.view[e];const i=t.upcastAlso?t.upcastAlso[e]:undefined;yield*r_(n,o,i)}}else{yield*r_(t.model,t.view,t.upcastAlso)}}function*r_(t,e,n){yield{model:t,view:e};if(n){for(const e of el(n)){yield{model:t,view:e}}}}class s_{constructor(t){this.baseVersion=t;this.isDocumentOperation=this.baseVersion!==null;this.batch=null}_validate(){}toJSON(){const t=Object.assign({},this);t.__className=this.constructor.className;delete t.batch;delete t.isDocumentOperation;return t}static get className(){return"Operation"}static fromJSON(t,e){return new this(t.baseVersion)}}function a_(t,e){const n=u_(e);const o=n.reduce(((t,e)=>t+e.offsetSize),0);const i=t.parent;f_(t);const r=t.index;i._insertChild(r,n);h_(i,r+n.length);h_(i,r);return new Bb(t,t.getShiftedBy(o))}function c_(t){if(!t.isFlat){throw new P("operation-utils-remove-range-not-flat",this)}const e=t.start.parent;f_(t.start);f_(t.end);const n=e._removeChildren(t.start.index,t.end.index-t.start.index);h_(e,t.start.index);return n}function l_(t,e){if(!t.isFlat){throw new P("operation-utils-move-range-not-flat",this)}const n=c_(t);e=e._getTransformedByDeletion(t.start,t.end.offset-t.start.offset);return a_(e,n)}function d_(t,e,n){f_(t.start);f_(t.end);for(const o of t.getItems({shallow:true})){const t=o.is("$textProxy")?o.textNode:o;if(n!==null){t._setAttribute(e,n)}else{t._removeAttribute(e)}h_(t.parent,t.index)}h_(t.end.parent,t.end.index)}function u_(t){const e=[];function n(t){if(typeof t=="string"){e.push(new kb(t))}else if(t instanceof wb){e.push(new kb(t.data,t.getAttributes()))}else if(t instanceof mb){e.push(t)}else if(Ct(t)){for(const e of t){n(e)}}}n(t);for(let t=1;t<e.length;t++){const n=e[t];const o=e[t-1];if(n instanceof kb&&o instanceof kb&&p_(n,o)){e.splice(t-1,2,new kb(o.data+n.data,o.getAttributes()));t--}}return e}function h_(t,e){const n=t.getChild(e-1);const o=t.getChild(e);if(n&&o&&n.is("$text")&&o.is("$text")&&p_(n,o)){const i=new kb(n.data+o.data,n.getAttributes());t._removeChildren(e-1,2);t._insertChild(e-1,i)}}function f_(t){const e=t.textNode;const n=t.parent;if(e){const o=t.offset-e.startOffset;const i=e.index;n._removeChildren(i,1);const r=new kb(e.data.substr(0,o),e.getAttributes());const s=new kb(e.data.substr(o),e.getAttributes());n._insertChild(i,[r,s])}}function p_(t,e){const n=t.getAttributes();const o=e.getAttributes();for(const t of n){if(t[1]!==e.getAttribute(t[0])){return false}o.next()}return o.next().done}class g_ extends s_{constructor(t,e,n,o){super(o);this.sourcePosition=t.clone();this.sourcePosition.stickiness="toNext";this.howMany=e;this.targetPosition=n.clone();this.targetPosition.stickiness="toNone"}get type(){if(this.targetPosition.root.rootName=="$graveyard"){return"remove"}else if(this.sourcePosition.root.rootName=="$graveyard"){return"reinsert"}return"move"}get affectedSelectable(){return[Bb._createFromPositionAndShift(this.sourcePosition,this.howMany),Bb._createFromPositionAndShift(this.targetPosition,0)]}clone(){return new g_(this.sourcePosition,this.howMany,this.targetPosition,this.baseVersion)}getMovedRangeStart(){return this.targetPosition._getTransformedByDeletion(this.sourcePosition,this.howMany)}getReversed(){const t=this.sourcePosition._getTransformedByInsertion(this.targetPosition,this.howMany);return new g_(this.getMovedRangeStart(),this.howMany,t,this.baseVersion+1)}_validate(){const t=this.sourcePosition.parent;const e=this.targetPosition.parent;const n=this.sourcePosition.offset;const o=this.targetPosition.offset;if(n+this.howMany>t.maxOffset){throw new P("move-operation-nodes-do-not-exist",this)}else if(t===e&&n<o&&o<n+this.howMany){throw new P("move-operation-range-into-itself",this)}else if(this.sourcePosition.root==this.targetPosition.root){if(At(this.sourcePosition.getParentPath(),this.targetPosition.getParentPath())=="prefix"){const t=this.sourcePosition.path.length-1;if(this.targetPosition.path[t]>=n&&this.targetPosition.path[t]<n+this.howMany){throw new P("move-operation-node-into-itself",this)}}}}_execute(){l_(Bb._createFromPositionAndShift(this.sourcePosition,this.howMany),this.targetPosition)}toJSON(){const t=super.toJSON();t.sourcePosition=this.sourcePosition.toJSON();t.targetPosition=this.targetPosition.toJSON();return t}static get className(){return"MoveOperation"}static fromJSON(t,e){const n=yb.fromJSON(t.sourcePosition,e);const o=yb.fromJSON(t.targetPosition,e);return new this(n,t.howMany,o,t.baseVersion)}}class m_ extends s_{constructor(t,e,n){super(n);this.position=t.clone();this.position.stickiness="toNone";this.nodes=new bb(u_(e));this.shouldReceiveAttributes=false}get type(){return"insert"}get howMany(){return this.nodes.maxOffset}get affectedSelectable(){return this.position.clone()}clone(){const t=new bb([...this.nodes].map((t=>t._clone(true))));const e=new m_(this.position,t,this.baseVersion);e.shouldReceiveAttributes=this.shouldReceiveAttributes;return e}getReversed(){const t=this.position.root.document.graveyard;const e=new yb(t,[0]);return new g_(this.position,this.nodes.maxOffset,e,this.baseVersion+1)}_validate(){const t=this.position.parent;if(!t||t.maxOffset<this.position.offset){throw new P("insert-operation-position-invalid",this)}}_execute(){const t=this.nodes;this.nodes=new bb([...t].map((t=>t._clone(true))));a_(this.position,t)}toJSON(){const t=super.toJSON();t.position=this.position.toJSON();t.nodes=this.nodes.toJSON();return t}static get className(){return"InsertOperation"}static fromJSON(t,e){const n=[];for(const e of t.nodes){if(e.name){n.push(_b.fromJSON(e))}else{n.push(kb.fromJSON(e))}}const o=new m_(yb.fromJSON(t.position,e),n,t.baseVersion);o.shouldReceiveAttributes=t.shouldReceiveAttributes;return o}}class b_ extends s_{constructor(t,e,n,o,i){super(i);this.splitPosition=t.clone();this.splitPosition.stickiness="toNext";this.howMany=e;this.insertionPosition=n;this.graveyardPosition=o?o.clone():null;if(this.graveyardPosition){this.graveyardPosition.stickiness="toNext"}}get type(){return"split"}get moveTargetPosition(){const t=this.insertionPosition.path.slice();t.push(0);return new yb(this.insertionPosition.root,t)}get movedRange(){const t=this.splitPosition.getShiftedBy(Number.POSITIVE_INFINITY);return new Bb(this.splitPosition,t)}get affectedSelectable(){const t=[Bb._createFromPositionAndShift(this.splitPosition,0),Bb._createFromPositionAndShift(this.insertionPosition,0)];if(this.graveyardPosition){t.push(Bb._createFromPositionAndShift(this.graveyardPosition,0))}return t}clone(){return new b_(this.splitPosition,this.howMany,this.insertionPosition,this.graveyardPosition,this.baseVersion)}getReversed(){const t=this.splitPosition.root.document.graveyard;const e=new yb(t,[0]);return new k_(this.moveTargetPosition,this.howMany,this.splitPosition,e,this.baseVersion+1)}_validate(){const t=this.splitPosition.parent;const e=this.splitPosition.offset;if(!t||t.maxOffset<e){throw new P("split-operation-position-invalid",this)}else if(!t.parent){throw new P("split-operation-split-in-root",this)}else if(this.howMany!=t.maxOffset-this.splitPosition.offset){throw new P("split-operation-how-many-invalid",this)}else if(this.graveyardPosition&&!this.graveyardPosition.nodeAfter){throw new P("split-operation-graveyard-position-invalid",this)}}_execute(){const t=this.splitPosition.parent;if(this.graveyardPosition){l_(Bb._createFromPositionAndShift(this.graveyardPosition,1),this.insertionPosition)}else{const e=t._clone();a_(this.insertionPosition,e)}const e=new Bb(yb._createAt(t,this.splitPosition.offset),yb._createAt(t,t.maxOffset));l_(e,this.moveTargetPosition)}toJSON(){const t=super.toJSON();t.splitPosition=this.splitPosition.toJSON();t.insertionPosition=this.insertionPosition.toJSON();if(this.graveyardPosition){t.graveyardPosition=this.graveyardPosition.toJSON()}return t}static get className(){return"SplitOperation"}static getInsertionPosition(t){const e=t.path.slice(0,-1);e[e.length-1]++;return new yb(t.root,e,"toPrevious")}static fromJSON(t,e){const n=yb.fromJSON(t.splitPosition,e);const o=yb.fromJSON(t.insertionPosition,e);const i=t.graveyardPosition?yb.fromJSON(t.graveyardPosition,e):null;return new this(n,t.howMany,o,i,t.baseVersion)}}class k_ extends s_{constructor(t,e,n,o,i){super(i);this.sourcePosition=t.clone();this.sourcePosition.stickiness="toPrevious";this.howMany=e;this.targetPosition=n.clone();this.targetPosition.stickiness="toNext";this.graveyardPosition=o.clone()}get type(){return"merge"}get deletionPosition(){return new yb(this.sourcePosition.root,this.sourcePosition.path.slice(0,-1))}get movedRange(){const t=this.sourcePosition.getShiftedBy(Number.POSITIVE_INFINITY);return new Bb(this.sourcePosition,t)}get affectedSelectable(){const t=this.sourcePosition.parent;return[Bb._createOn(t),Bb._createFromPositionAndShift(this.targetPosition,0),Bb._createFromPositionAndShift(this.graveyardPosition,0)]}clone(){return new k_(this.sourcePosition,this.howMany,this.targetPosition,this.graveyardPosition,this.baseVersion)}getReversed(){const t=this.targetPosition._getTransformedByMergeOperation(this);const e=this.sourcePosition.path.slice(0,-1);const n=new yb(this.sourcePosition.root,e)._getTransformedByMergeOperation(this);return new b_(t,this.howMany,n,this.graveyardPosition,this.baseVersion+1)}_validate(){const t=this.sourcePosition.parent;const e=this.targetPosition.parent;if(!t.parent){throw new P("merge-operation-source-position-invalid",this)}else if(!e.parent){throw new P("merge-operation-target-position-invalid",this)}else if(this.howMany!=t.maxOffset){throw new P("merge-operation-how-many-invalid",this)}}_execute(){const t=this.sourcePosition.parent;const e=Bb._createIn(t);l_(e,this.targetPosition);l_(Bb._createOn(t),this.graveyardPosition)}toJSON(){const t=super.toJSON();t.sourcePosition=t.sourcePosition.toJSON();t.targetPosition=t.targetPosition.toJSON();t.graveyardPosition=t.graveyardPosition.toJSON();return t}static get className(){return"MergeOperation"}static fromJSON(t,e){const n=yb.fromJSON(t.sourcePosition,e);const o=yb.fromJSON(t.targetPosition,e);const i=yb.fromJSON(t.graveyardPosition,e);return new this(n,t.howMany,o,i,t.baseVersion)}}class w_ extends s_{constructor(t,e,n,o,i,r){super(r);this.name=t;this.oldRange=e?e.clone():null;this.newRange=n?n.clone():null;this.affectsData=i;this._markers=o}get type(){return"marker"}get affectedSelectable(){const t=[];if(this.oldRange){t.push(this.oldRange.clone())}if(this.newRange){if(this.oldRange){t.push(...this.newRange.getDifference(this.oldRange))}else{t.push(this.newRange.clone())}}return t}clone(){return new w_(this.name,this.oldRange,this.newRange,this._markers,this.affectsData,this.baseVersion)}getReversed(){return new w_(this.name,this.newRange,this.oldRange,this._markers,this.affectsData,this.baseVersion+1)}_execute(){if(this.newRange){this._markers._set(this.name,this.newRange,true,this.affectsData)}else{this._markers._remove(this.name)}}toJSON(){const t=super.toJSON();if(this.oldRange){t.oldRange=this.oldRange.toJSON()}if(this.newRange){t.newRange=this.newRange.toJSON()}delete t._markers;return t}static get className(){return"MarkerOperation"}static fromJSON(t,e){return new w_(t.name,t.oldRange?Bb.fromJSON(t.oldRange,e):null,t.newRange?Bb.fromJSON(t.newRange,e):null,e.model.markers,t.affectsData,t.baseVersion)}}function __(t,e){return Ym(t,e)}const v_=__;class A_ extends s_{constructor(t,e,n,o,i){super(i);this.range=t.clone();this.key=e;this.oldValue=n===undefined?null:n;this.newValue=o===undefined?null:o}get type(){if(this.oldValue===null){return"addAttribute"}else if(this.newValue===null){return"removeAttribute"}else{return"changeAttribute"}}get affectedSelectable(){return this.range.clone()}clone(){return new A_(this.range,this.key,this.oldValue,this.newValue,this.baseVersion)}getReversed(){return new A_(this.range,this.key,this.newValue,this.oldValue,this.baseVersion+1)}toJSON(){const t=super.toJSON();t.range=this.range.toJSON();return t}_validate(){if(!this.range.isFlat){throw new P("attribute-operation-range-not-flat",this)}for(const t of this.range.getItems({shallow:true})){if(this.oldValue!==null&&!v_(t.getAttribute(this.key),this.oldValue)){throw new P("attribute-operation-wrong-old-value",this,{item:t,key:this.key,value:this.oldValue})}if(this.oldValue===null&&this.newValue!==null&&t.hasAttribute(this.key)){throw new P("attribute-operation-attribute-exists",this,{node:t,key:this.key})}}}_execute(){if(!v_(this.oldValue,this.newValue)){d_(this.range,this.key,this.newValue)}}static get className(){return"AttributeOperation"}static fromJSON(t,e){return new A_(Bb.fromJSON(t.range,e),t.key,t.oldValue,t.newValue,t.baseVersion)}}class C_ extends s_{get type(){return"noop"}get affectedSelectable(){return null}clone(){return new C_(this.baseVersion)}getReversed(){return new C_(this.baseVersion+1)}_execute(){}static get className(){return"NoOperation"}}class y_ extends s_{constructor(t,e,n,o){super(o);this.position=t;this.position.stickiness="toNext";this.oldName=e;this.newName=n}get type(){return"rename"}get affectedSelectable(){return this.position.nodeAfter}clone(){return new y_(this.position.clone(),this.oldName,this.newName,this.baseVersion)}getReversed(){return new y_(this.position.clone(),this.newName,this.oldName,this.baseVersion+1)}_validate(){const t=this.position.nodeAfter;if(!(t instanceof _b)){throw new P("rename-operation-wrong-position",this)}else if(t.name!==this.oldName){throw new P("rename-operation-wrong-name",this)}}_execute(){const t=this.position.nodeAfter;t.name=this.newName}toJSON(){const t=super.toJSON();t.position=this.position.toJSON();return t}static get className(){return"RenameOperation"}static fromJSON(t,e){return new y_(yb.fromJSON(t.position,e),t.oldName,t.newName,t.baseVersion)}}class x_ extends s_{constructor(t,e,n,o,i){super(i);this.root=t;this.key=e;this.oldValue=n===undefined?null:n;this.newValue=o===undefined?null:o}get type(){if(this.oldValue===null){return"addRootAttribute"}else if(this.newValue===null){return"removeRootAttribute"}else{return"changeRootAttribute"}}get affectedSelectable(){return this.root}clone(){return new x_(this.root,this.key,this.oldValue,this.newValue,this.baseVersion)}getReversed(){return new x_(this.root,this.key,this.newValue,this.oldValue,this.baseVersion+1)}_validate(){if(this.root!=this.root.root||this.root.is("documentFragment")){throw new P("rootattribute-operation-not-a-root",this,{root:this.root,key:this.key})}if(this.oldValue!==null&&this.root.getAttribute(this.key)!==this.oldValue){throw new P("rootattribute-operation-wrong-old-value",this,{root:this.root,key:this.key})}if(this.oldValue===null&&this.newValue!==null&&this.root.hasAttribute(this.key)){throw new P("rootattribute-operation-attribute-exists",this,{root:this.root,key:this.key})}}_execute(){if(this.newValue!==null){this.root._setAttribute(this.key,this.newValue)}else{this.root._removeAttribute(this.key)}}toJSON(){const t=super.toJSON();t.root=this.root.toJSON();return t}static get className(){return"RootAttributeOperation"}static fromJSON(t,e){if(!e.getRoot(t.root)){throw new P("rootattribute-operation-fromjson-no-root",this,{rootName:t.root})}return new x_(e.getRoot(t.root),t.key,t.oldValue,t.newValue,t.baseVersion)}}class E_ extends s_{constructor(t,e,n,o,i){super(i);this.rootName=t;this.elementName=e;this.isAdd=n;this._document=o;if(!this._document.getRoot(this.rootName)){const t=this._document.createRoot(this.elementName,this.rootName);t._isAttached=false}}get type(){return this.isAdd?"addRoot":"detachRoot"}get affectedSelectable(){return this._document.getRoot(this.rootName)}clone(){return new E_(this.rootName,this.elementName,this.isAdd,this._document,this.baseVersion)}getReversed(){return new E_(this.rootName,this.elementName,!this.isAdd,this._document,this.baseVersion+1)}_execute(){this._document.getRoot(this.rootName)._isAttached=this.isAdd}toJSON(){const t=super.toJSON();delete t._document;return t}static get className(){return"RootOperation"}static fromJSON(t,e){return new E_(t.rootName,t.elementName,t.isAdd,e,t.baseVersion)}}const S_={};S_[A_.className]=A_;S_[m_.className]=m_;S_[w_.className]=w_;S_[g_.className]=g_;S_[C_.className]=C_;S_[s_.className]=s_;S_[y_.className]=y_;S_[x_.className]=x_;S_[E_.className]=E_;S_[b_.className]=b_;S_[k_.className]=k_;class D_{static fromJSON(t,e){return S_[t.__className].fromJSON(t,e)}}const T_=new Map;function P_(t,e,n){let o=T_.get(t);if(!o){o=new Map;T_.set(t,o)}o.set(e,n)}function B_(t,e){const n=T_.get(t);if(n&&n.has(e)){return n.get(e)}return I_}function I_(t){return[t]}function R_(t,e,n={}){const o=B_(t.constructor,e.constructor);try{t=t.clone();return o(t,e,n)}catch(t){throw t}}function O_(t,e,n){t=t.slice();e=e.slice();const o=new M_(n.document,n.useRelations,n.forceWeakRemove);o.setOriginalOperations(t);o.setOriginalOperations(e);const i=o.originalOperations;if(t.length==0||e.length==0){return{operationsA:t,operationsB:e,originalOperations:i}}const r=new WeakMap;for(const e of t){r.set(e,0)}const s={nextBaseVersionA:t[t.length-1].baseVersion+1,nextBaseVersionB:e[e.length-1].baseVersion+1,originalOperationsACount:t.length,originalOperationsBCount:e.length};let a=0;while(a<t.length){const n=t[a];const i=r.get(n);if(i==e.length){a++;continue}const s=e[i];const c=R_(n,s,o.getContext(n,s,true));const l=R_(s,n,o.getContext(s,n,false));o.updateRelation(n,s);o.setOriginalOperations(c,n);o.setOriginalOperations(l,s);for(const t of c){r.set(t,i+l.length)}t.splice(a,1,...c);e.splice(i,1,...l)}if(n.padWithNoOps){const n=t.length-s.originalOperationsACount;const o=e.length-s.originalOperationsBCount;z_(t,o-n);z_(e,n-o)}V_(t,s.nextBaseVersionB);V_(e,s.nextBaseVersionA);return{operationsA:t,operationsB:e,originalOperations:i}}class M_{constructor(t,e,n=false){this.originalOperations=new Map;this._history=t.history;this._useRelations=e;this._forceWeakRemove=!!n;this._relations=new Map}setOriginalOperations(t,e=null){const n=e?this.originalOperations.get(e):null;for(const e of t){this.originalOperations.set(e,n||e)}}updateRelation(t,e){if(t instanceof g_){if(e instanceof k_){if(t.targetPosition.isEqual(e.sourcePosition)||e.movedRange.containsPosition(t.targetPosition)){this._setRelation(t,e,"insertAtSource")}else if(t.targetPosition.isEqual(e.deletionPosition)){this._setRelation(t,e,"insertBetween")}else if(t.targetPosition.isAfter(e.sourcePosition)){this._setRelation(t,e,"moveTargetAfter")}}else if(e instanceof g_){if(t.targetPosition.isEqual(e.sourcePosition)||t.targetPosition.isBefore(e.sourcePosition)){this._setRelation(t,e,"insertBefore")}else{this._setRelation(t,e,"insertAfter")}}}else if(t instanceof b_){if(e instanceof k_){if(t.splitPosition.isBefore(e.sourcePosition)){this._setRelation(t,e,"splitBefore")}}else if(e instanceof g_){if(t.splitPosition.isEqual(e.sourcePosition)||t.splitPosition.isBefore(e.sourcePosition)){this._setRelation(t,e,"splitBefore")}else{const n=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);if(t.splitPosition.hasSameParentAs(e.sourcePosition)&&n.containsPosition(t.splitPosition)){const o=n.end.offset-t.splitPosition.offset;const i=t.splitPosition.offset-n.start.offset;this._setRelation(t,e,{howMany:o,offset:i})}}}}else if(t instanceof k_){if(e instanceof k_){if(!t.targetPosition.isEqual(e.sourcePosition)){this._setRelation(t,e,"mergeTargetNotMoved")}if(t.sourcePosition.isEqual(e.targetPosition)){this._setRelation(t,e,"mergeSourceNotMoved")}if(t.sourcePosition.isEqual(e.sourcePosition)){this._setRelation(t,e,"mergeSameElement")}}else if(e instanceof b_){if(t.sourcePosition.isEqual(e.splitPosition)){this._setRelation(t,e,"splitAtSource")}}}else if(t instanceof w_){const n=t.newRange;if(!n){return}if(e instanceof g_){const o=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);const i=o.containsPosition(n.start)||o.start.isEqual(n.start);const r=o.containsPosition(n.end)||o.end.isEqual(n.end);if((i||r)&&!o.containsRange(n)){this._setRelation(t,e,{side:i?"left":"right",path:i?n.start.path.slice():n.end.path.slice()})}}else if(e instanceof k_){const o=n.start.isEqual(e.targetPosition);const i=n.start.isEqual(e.deletionPosition);const r=n.end.isEqual(e.deletionPosition);const s=n.end.isEqual(e.sourcePosition);if(o||i||r||s){this._setRelation(t,e,{wasInLeftElement:o,wasStartBeforeMergedElement:i,wasEndBeforeMergedElement:r,wasInRightElement:s})}}}}getContext(t,e,n){return{aIsStrong:n,aWasUndone:this._wasUndone(t),bWasUndone:this._wasUndone(e),abRelation:this._useRelations?this._getRelation(t,e):null,baRelation:this._useRelations?this._getRelation(e,t):null,forceWeakRemove:this._forceWeakRemove}}_wasUndone(t){const e=this.originalOperations.get(t);return e.wasUndone||this._history.isUndoneOperation(e)}_getRelation(t,e){const n=this.originalOperations.get(e);const o=this._history.getUndoneOperation(n);if(!o){return null}const i=this.originalOperations.get(t);const r=this._relations.get(i);if(r){return r.get(o)||null}return null}_setRelation(t,e,n){const o=this.originalOperations.get(t);const i=this.originalOperations.get(e);let r=this._relations.get(o);if(!r){r=new Map;this._relations.set(o,r)}r.set(i,n)}}function V_(t,e){for(const n of t){n.baseVersion=e++}}function z_(t,e){for(let n=0;n<e;n++){t.push(new C_(0))}}P_(A_,A_,((t,e,n)=>{if(t.key===e.key&&t.range.start.hasSameParentAs(e.range.start)){const o=t.range.getDifference(e.range).map((e=>new A_(e,t.key,t.oldValue,t.newValue,0)));const i=t.range.getIntersection(e.range);if(i){if(n.aIsStrong){o.push(new A_(i,e.key,e.newValue,t.newValue,0))}}if(o.length==0){return[new C_(0)]}return o}else{return[t]}}));P_(A_,m_,((t,e)=>{if(t.range.start.hasSameParentAs(e.position)&&t.range.containsPosition(e.position)){const n=t.range._getTransformedByInsertion(e.position,e.howMany,!e.shouldReceiveAttributes);const o=n.map((e=>new A_(e,t.key,t.oldValue,t.newValue,t.baseVersion)));if(e.shouldReceiveAttributes){const n=F_(e,t.key,t.oldValue);if(n){o.unshift(n)}}return o}t.range=t.range._getTransformedByInsertion(e.position,e.howMany,false)[0];return[t]}));function F_(t,e,n){const o=t.nodes;const i=o.getNode(0).getAttribute(e);if(i==n){return null}const r=new Bb(t.position,t.position.getShiftedBy(t.howMany));return new A_(r,e,i,n,0)}P_(A_,k_,((t,e)=>{const n=[];if(t.range.start.hasSameParentAs(e.deletionPosition)){if(t.range.containsPosition(e.deletionPosition)||t.range.start.isEqual(e.deletionPosition)){n.push(Bb._createFromPositionAndShift(e.graveyardPosition,1))}}const o=t.range._getTransformedByMergeOperation(e);if(!o.isCollapsed){n.push(o)}return n.map((e=>new A_(e,t.key,t.oldValue,t.newValue,t.baseVersion)))}));P_(A_,g_,((t,e)=>{const n=N_(t.range,e);return n.map((e=>new A_(e,t.key,t.oldValue,t.newValue,t.baseVersion)))}));function N_(t,e){const n=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);let o=null;let i=[];if(n.containsRange(t,true)){o=t}else if(t.start.hasSameParentAs(n.start)){i=t.getDifference(n);o=t.getIntersection(n)}else{i=[t]}const r=[];for(let t of i){t=t._getTransformedByDeletion(e.sourcePosition,e.howMany);const n=e.getMovedRangeStart();const o=t.start.hasSameParentAs(n);const i=t._getTransformedByInsertion(n,e.howMany,o);r.push(...i)}if(o){r.push(o._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany,false)[0])}return r}P_(A_,b_,((t,e)=>{if(t.range.end.isEqual(e.insertionPosition)){if(!e.graveyardPosition){t.range.end.offset++}return[t]}if(t.range.start.hasSameParentAs(e.splitPosition)&&t.range.containsPosition(e.splitPosition)){const n=t.clone();n.range=new Bb(e.moveTargetPosition.clone(),t.range.end._getCombined(e.splitPosition,e.moveTargetPosition));t.range.end=e.splitPosition.clone();t.range.end.stickiness="toPrevious";return[t,n]}t.range=t.range._getTransformedBySplitOperation(e);return[t]}));P_(m_,A_,((t,e)=>{const n=[t];if(t.shouldReceiveAttributes&&t.position.hasSameParentAs(e.range.start)&&e.range.containsPosition(t.position)){const o=F_(t,e.key,e.newValue);if(o){n.push(o)}}return n}));P_(m_,m_,((t,e,n)=>{if(t.position.isEqual(e.position)&&n.aIsStrong){return[t]}t.position=t.position._getTransformedByInsertOperation(e);return[t]}));P_(m_,g_,((t,e)=>{t.position=t.position._getTransformedByMoveOperation(e);return[t]}));P_(m_,b_,((t,e)=>{t.position=t.position._getTransformedBySplitOperation(e);return[t]}));P_(m_,k_,((t,e)=>{t.position=t.position._getTransformedByMergeOperation(e);return[t]}));P_(w_,m_,((t,e)=>{if(t.oldRange){t.oldRange=t.oldRange._getTransformedByInsertOperation(e)[0]}if(t.newRange){t.newRange=t.newRange._getTransformedByInsertOperation(e)[0]}return[t]}));P_(w_,w_,((t,e,n)=>{if(t.name==e.name){if(n.aIsStrong){t.oldRange=e.newRange?e.newRange.clone():null}else{return[new C_(0)]}}return[t]}));P_(w_,k_,((t,e)=>{if(t.oldRange){t.oldRange=t.oldRange._getTransformedByMergeOperation(e)}if(t.newRange){t.newRange=t.newRange._getTransformedByMergeOperation(e)}return[t]}));P_(w_,g_,((t,e,n)=>{if(t.oldRange){t.oldRange=Bb._createFromRanges(t.oldRange._getTransformedByMoveOperation(e))}if(t.newRange){if(n.abRelation){const o=Bb._createFromRanges(t.newRange._getTransformedByMoveOperation(e));if(n.abRelation.side=="left"&&e.targetPosition.isEqual(t.newRange.start)){t.newRange.end=o.end;t.newRange.start.path=n.abRelation.path;return[t]}else if(n.abRelation.side=="right"&&e.targetPosition.isEqual(t.newRange.end)){t.newRange.start=o.start;t.newRange.end.path=n.abRelation.path;return[t]}}t.newRange=Bb._createFromRanges(t.newRange._getTransformedByMoveOperation(e))}return[t]}));P_(w_,b_,((t,e,n)=>{if(t.oldRange){t.oldRange=t.oldRange._getTransformedBySplitOperation(e)}if(t.newRange){if(n.abRelation){const o=t.newRange._getTransformedBySplitOperation(e);if(t.newRange.start.isEqual(e.splitPosition)&&n.abRelation.wasStartBeforeMergedElement){t.newRange.start=yb._createAt(e.insertionPosition)}else if(t.newRange.start.isEqual(e.splitPosition)&&!n.abRelation.wasInLeftElement){t.newRange.start=yb._createAt(e.moveTargetPosition)}if(t.newRange.end.isEqual(e.splitPosition)&&n.abRelation.wasInRightElement){t.newRange.end=yb._createAt(e.moveTargetPosition)}else if(t.newRange.end.isEqual(e.splitPosition)&&n.abRelation.wasEndBeforeMergedElement){t.newRange.end=yb._createAt(e.insertionPosition)}else{t.newRange.end=o.end}return[t]}t.newRange=t.newRange._getTransformedBySplitOperation(e)}return[t]}));P_(k_,m_,((t,e)=>{if(t.sourcePosition.hasSameParentAs(e.position)){t.howMany+=e.howMany}t.sourcePosition=t.sourcePosition._getTransformedByInsertOperation(e);t.targetPosition=t.targetPosition._getTransformedByInsertOperation(e);return[t]}));P_(k_,k_,((t,e,n)=>{if(t.sourcePosition.isEqual(e.sourcePosition)&&t.targetPosition.isEqual(e.targetPosition)){if(!n.bWasUndone){return[new C_(0)]}else{const n=e.graveyardPosition.path.slice();n.push(0);t.sourcePosition=new yb(e.graveyardPosition.root,n);t.howMany=0;return[t]}}if(t.sourcePosition.isEqual(e.sourcePosition)&&!t.targetPosition.isEqual(e.targetPosition)&&!n.bWasUndone&&n.abRelation!="splitAtSource"){const o=t.targetPosition.root.rootName=="$graveyard";const i=e.targetPosition.root.rootName=="$graveyard";const r=o&&!i;const s=i&&!o;const a=s||!r&&n.aIsStrong;if(a){const n=e.targetPosition._getTransformedByMergeOperation(e);const o=t.targetPosition._getTransformedByMergeOperation(e);return[new g_(n,t.howMany,o,0)]}else{return[new C_(0)]}}if(t.sourcePosition.hasSameParentAs(e.targetPosition)){t.howMany+=e.howMany}t.sourcePosition=t.sourcePosition._getTransformedByMergeOperation(e);t.targetPosition=t.targetPosition._getTransformedByMergeOperation(e);if(!t.graveyardPosition.isEqual(e.graveyardPosition)||!n.aIsStrong){t.graveyardPosition=t.graveyardPosition._getTransformedByMergeOperation(e)}return[t]}));P_(k_,g_,((t,e,n)=>{const o=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);if(e.type=="remove"&&!n.bWasUndone&&!n.forceWeakRemove){if(t.deletionPosition.hasSameParentAs(e.sourcePosition)&&o.containsPosition(t.sourcePosition)){return[new C_(0)]}}if(t.sourcePosition.hasSameParentAs(e.targetPosition)){t.howMany+=e.howMany}if(t.sourcePosition.hasSameParentAs(e.sourcePosition)){t.howMany-=e.howMany}t.sourcePosition=t.sourcePosition._getTransformedByMoveOperation(e);t.targetPosition=t.targetPosition._getTransformedByMoveOperation(e);if(!t.graveyardPosition.isEqual(e.targetPosition)){t.graveyardPosition=t.graveyardPosition._getTransformedByMoveOperation(e)}return[t]}));P_(k_,b_,((t,e,n)=>{if(e.graveyardPosition){t.graveyardPosition=t.graveyardPosition._getTransformedByDeletion(e.graveyardPosition,1);if(t.deletionPosition.isEqual(e.graveyardPosition)){t.howMany=e.howMany}}if(t.targetPosition.isEqual(e.splitPosition)){const o=e.howMany!=0;const i=e.graveyardPosition&&t.deletionPosition.isEqual(e.graveyardPosition);if(o||i||n.abRelation=="mergeTargetNotMoved"){t.sourcePosition=t.sourcePosition._getTransformedBySplitOperation(e);return[t]}}if(t.sourcePosition.isEqual(e.splitPosition)){if(n.abRelation=="mergeSourceNotMoved"){t.howMany=0;t.targetPosition=t.targetPosition._getTransformedBySplitOperation(e);return[t]}if(n.abRelation=="mergeSameElement"||t.sourcePosition.offset>0){t.sourcePosition=e.moveTargetPosition.clone();t.targetPosition=t.targetPosition._getTransformedBySplitOperation(e);return[t]}}if(t.sourcePosition.hasSameParentAs(e.splitPosition)){t.howMany=e.splitPosition.offset}t.sourcePosition=t.sourcePosition._getTransformedBySplitOperation(e);t.targetPosition=t.targetPosition._getTransformedBySplitOperation(e);return[t]}));P_(g_,m_,((t,e)=>{const n=Bb._createFromPositionAndShift(t.sourcePosition,t.howMany);const o=n._getTransformedByInsertOperation(e,false)[0];t.sourcePosition=o.start;t.howMany=o.end.offset-o.start.offset;if(!t.targetPosition.isEqual(e.position)){t.targetPosition=t.targetPosition._getTransformedByInsertOperation(e)}return[t]}));P_(g_,g_,((t,e,n)=>{const o=Bb._createFromPositionAndShift(t.sourcePosition,t.howMany);const i=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);let r=n.aIsStrong;let s=!n.aIsStrong;if(n.abRelation=="insertBefore"||n.baRelation=="insertAfter"){s=true}else if(n.abRelation=="insertAfter"||n.baRelation=="insertBefore"){s=false}let a;if(t.targetPosition.isEqual(e.targetPosition)&&s){a=t.targetPosition._getTransformedByDeletion(e.sourcePosition,e.howMany)}else{a=t.targetPosition._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany)}if(L_(t,e)&&L_(e,t)){return[e.getReversed()]}const c=o.containsPosition(e.targetPosition);if(c&&o.containsRange(i,true)){o.start=o.start._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany);o.end=o.end._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany);return H_([o],a)}const l=i.containsPosition(t.targetPosition);if(l&&i.containsRange(o,true)){o.start=o.start._getCombined(e.sourcePosition,e.getMovedRangeStart());o.end=o.end._getCombined(e.sourcePosition,e.getMovedRangeStart());return H_([o],a)}const d=At(t.sourcePosition.getParentPath(),e.sourcePosition.getParentPath());if(d=="prefix"||d=="extension"){o.start=o.start._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany);o.end=o.end._getTransformedByMove(e.sourcePosition,e.targetPosition,e.howMany);return H_([o],a)}if(t.type=="remove"&&e.type!="remove"&&!n.aWasUndone&&!n.forceWeakRemove){r=true}else if(t.type!="remove"&&e.type=="remove"&&!n.bWasUndone&&!n.forceWeakRemove){r=false}const u=[];const h=o.getDifference(i);for(const t of h){t.start=t.start._getTransformedByDeletion(e.sourcePosition,e.howMany);t.end=t.end._getTransformedByDeletion(e.sourcePosition,e.howMany);const n=At(t.start.getParentPath(),e.getMovedRangeStart().getParentPath())=="same";const o=t._getTransformedByInsertion(e.getMovedRangeStart(),e.howMany,n);u.push(...o)}const f=o.getIntersection(i);if(f!==null&&r){f.start=f.start._getCombined(e.sourcePosition,e.getMovedRangeStart());f.end=f.end._getCombined(e.sourcePosition,e.getMovedRangeStart());if(u.length===0){u.push(f)}else if(u.length==1){if(i.start.isBefore(o.start)||i.start.isEqual(o.start)){u.unshift(f)}else{u.push(f)}}else{u.splice(1,0,f)}}if(u.length===0){return[new C_(t.baseVersion)]}return H_(u,a)}));P_(g_,b_,((t,e,n)=>{let o=t.targetPosition.clone();if(!t.targetPosition.isEqual(e.insertionPosition)||!e.graveyardPosition||n.abRelation=="moveTargetAfter"){o=t.targetPosition._getTransformedBySplitOperation(e)}const i=Bb._createFromPositionAndShift(t.sourcePosition,t.howMany);if(i.end.isEqual(e.insertionPosition)){if(!e.graveyardPosition){t.howMany++}t.targetPosition=o;return[t]}if(i.start.hasSameParentAs(e.splitPosition)&&i.containsPosition(e.splitPosition)){let t=new Bb(e.splitPosition,i.end);t=t._getTransformedBySplitOperation(e);const n=[new Bb(i.start,e.splitPosition),t];return H_(n,o)}if(t.targetPosition.isEqual(e.splitPosition)&&n.abRelation=="insertAtSource"){o=e.moveTargetPosition}if(t.targetPosition.isEqual(e.insertionPosition)&&n.abRelation=="insertBetween"){o=t.targetPosition}const r=i._getTransformedBySplitOperation(e);const s=[r];if(e.graveyardPosition){const o=i.start.isEqual(e.graveyardPosition)||i.containsPosition(e.graveyardPosition);if(t.howMany>1&&o&&!n.aWasUndone){s.push(Bb._createFromPositionAndShift(e.insertionPosition,1))}}return H_(s,o)}));P_(g_,k_,((t,e,n)=>{const o=Bb._createFromPositionAndShift(t.sourcePosition,t.howMany);if(e.deletionPosition.hasSameParentAs(t.sourcePosition)&&o.containsPosition(e.sourcePosition)){if(t.type=="remove"&&!n.forceWeakRemove){if(!n.aWasUndone){const n=[];let o=e.graveyardPosition.clone();let i=e.targetPosition._getTransformedByMergeOperation(e);if(t.howMany>1){n.push(new g_(t.sourcePosition,t.howMany-1,t.targetPosition,0));o=o._getTransformedByMove(t.sourcePosition,t.targetPosition,t.howMany-1);i=i._getTransformedByMove(t.sourcePosition,t.targetPosition,t.howMany-1)}const r=e.deletionPosition._getCombined(t.sourcePosition,t.targetPosition);const s=new g_(o,1,r,0);const a=s.getMovedRangeStart().path.slice();a.push(0);const c=new yb(s.targetPosition.root,a);i=i._getTransformedByMove(o,r,1);const l=new g_(i,e.howMany,c,0);n.push(s);n.push(l);return n}}else{if(t.howMany==1){if(!n.bWasUndone){return[new C_(0)]}else{t.sourcePosition=e.graveyardPosition.clone();t.targetPosition=t.targetPosition._getTransformedByMergeOperation(e);return[t]}}}}const i=Bb._createFromPositionAndShift(t.sourcePosition,t.howMany);const r=i._getTransformedByMergeOperation(e);t.sourcePosition=r.start;t.howMany=r.end.offset-r.start.offset;t.targetPosition=t.targetPosition._getTransformedByMergeOperation(e);return[t]}));P_(y_,m_,((t,e)=>{t.position=t.position._getTransformedByInsertOperation(e);return[t]}));P_(y_,k_,((t,e)=>{if(t.position.isEqual(e.deletionPosition)){t.position=e.graveyardPosition.clone();t.position.stickiness="toNext";return[t]}t.position=t.position._getTransformedByMergeOperation(e);return[t]}));P_(y_,g_,((t,e)=>{t.position=t.position._getTransformedByMoveOperation(e);return[t]}));P_(y_,y_,((t,e,n)=>{if(t.position.isEqual(e.position)){if(n.aIsStrong){t.oldName=e.newName}else{return[new C_(0)]}}return[t]}));P_(y_,b_,((t,e)=>{const n=t.position.path;const o=e.splitPosition.getParentPath();if(At(n,o)=="same"&&!e.graveyardPosition){const e=new y_(t.position.getShiftedBy(1),t.oldName,t.newName,0);return[t,e]}t.position=t.position._getTransformedBySplitOperation(e);return[t]}));P_(x_,x_,((t,e,n)=>{if(t.root===e.root&&t.key===e.key){if(!n.aIsStrong||t.newValue===e.newValue){return[new C_(0)]}else{t.oldValue=e.newValue}}return[t]}));P_(E_,E_,((t,e)=>{if(t.rootName===e.rootName&&t.isAdd===e.isAdd){return[new C_(0)]}return[t]}));P_(b_,m_,((t,e)=>{if(t.splitPosition.hasSameParentAs(e.position)&&t.splitPosition.offset<e.position.offset){t.howMany+=e.howMany}t.splitPosition=t.splitPosition._getTransformedByInsertOperation(e);t.insertionPosition=t.insertionPosition._getTransformedByInsertOperation(e);return[t]}));P_(b_,k_,((t,e,n)=>{if(!t.graveyardPosition&&!n.bWasUndone&&t.splitPosition.hasSameParentAs(e.sourcePosition)){const n=e.graveyardPosition.path.slice();n.push(0);const o=new yb(e.graveyardPosition.root,n);const i=b_.getInsertionPosition(new yb(e.graveyardPosition.root,n));const r=new b_(o,0,i,null,0);t.splitPosition=t.splitPosition._getTransformedByMergeOperation(e);t.insertionPosition=b_.getInsertionPosition(t.splitPosition);t.graveyardPosition=r.insertionPosition.clone();t.graveyardPosition.stickiness="toNext";return[r,t]}if(t.splitPosition.hasSameParentAs(e.deletionPosition)&&!t.splitPosition.isAfter(e.deletionPosition)){t.howMany--}if(t.splitPosition.hasSameParentAs(e.targetPosition)){t.howMany+=e.howMany}t.splitPosition=t.splitPosition._getTransformedByMergeOperation(e);t.insertionPosition=b_.getInsertionPosition(t.splitPosition);if(t.graveyardPosition){t.graveyardPosition=t.graveyardPosition._getTransformedByMergeOperation(e)}return[t]}));P_(b_,g_,((t,e,n)=>{const o=Bb._createFromPositionAndShift(e.sourcePosition,e.howMany);if(t.graveyardPosition){const i=o.start.isEqual(t.graveyardPosition)||o.containsPosition(t.graveyardPosition);if(!n.bWasUndone&&i){const n=t.splitPosition._getTransformedByMoveOperation(e);const o=t.graveyardPosition._getTransformedByMoveOperation(e);const i=o.path.slice();i.push(0);const r=new yb(o.root,i);const s=new g_(n,t.howMany,r,0);return[s]}t.graveyardPosition=t.graveyardPosition._getTransformedByMoveOperation(e)}const i=t.splitPosition.isEqual(e.targetPosition);if(i&&(n.baRelation=="insertAtSource"||n.abRelation=="splitBefore")){t.howMany+=e.howMany;t.splitPosition=t.splitPosition._getTransformedByDeletion(e.sourcePosition,e.howMany);t.insertionPosition=b_.getInsertionPosition(t.splitPosition);return[t]}if(i&&n.abRelation&&n.abRelation.howMany){const{howMany:e,offset:o}=n.abRelation;t.howMany+=e;t.splitPosition=t.splitPosition.getShiftedBy(o);return[t]}if(t.splitPosition.hasSameParentAs(e.sourcePosition)&&o.containsPosition(t.splitPosition)){const n=e.howMany-(t.splitPosition.offset-e.sourcePosition.offset);t.howMany-=n;if(t.splitPosition.hasSameParentAs(e.targetPosition)&&t.splitPosition.offset<e.targetPosition.offset){t.howMany+=e.howMany}t.splitPosition=e.sourcePosition.clone();t.insertionPosition=b_.getInsertionPosition(t.splitPosition);return[t]}if(!e.sourcePosition.isEqual(e.targetPosition)){if(t.splitPosition.hasSameParentAs(e.sourcePosition)&&t.splitPosition.offset<=e.sourcePosition.offset){t.howMany-=e.howMany}if(t.splitPosition.hasSameParentAs(e.targetPosition)&&t.splitPosition.offset<e.targetPosition.offset){t.howMany+=e.howMany}}t.splitPosition.stickiness="toNone";t.splitPosition=t.splitPosition._getTransformedByMoveOperation(e);t.splitPosition.stickiness="toNext";if(t.graveyardPosition){t.insertionPosition=t.insertionPosition._getTransformedByMoveOperation(e)}else{t.insertionPosition=b_.getInsertionPosition(t.splitPosition)}return[t]}));P_(b_,b_,((t,e,n)=>{if(t.splitPosition.isEqual(e.splitPosition)){if(!t.graveyardPosition&&!e.graveyardPosition){return[new C_(0)]}if(t.graveyardPosition&&e.graveyardPosition&&t.graveyardPosition.isEqual(e.graveyardPosition)){return[new C_(0)]}if(n.abRelation=="splitBefore"){t.howMany=0;t.graveyardPosition=t.graveyardPosition._getTransformedBySplitOperation(e);return[t]}}if(t.graveyardPosition&&e.graveyardPosition&&t.graveyardPosition.isEqual(e.graveyardPosition)){const o=t.splitPosition.root.rootName=="$graveyard";const i=e.splitPosition.root.rootName=="$graveyard";const r=o&&!i;const s=i&&!o;const a=s||!r&&n.aIsStrong;if(a){const n=[];if(e.howMany){n.push(new g_(e.moveTargetPosition,e.howMany,e.splitPosition,0))}if(t.howMany){n.push(new g_(t.splitPosition,t.howMany,t.moveTargetPosition,0))}return n}else{return[new C_(0)]}}if(t.graveyardPosition){t.graveyardPosition=t.graveyardPosition._getTransformedBySplitOperation(e)}if(t.splitPosition.isEqual(e.insertionPosition)&&n.abRelation=="splitBefore"){t.howMany++;return[t]}if(e.splitPosition.isEqual(t.insertionPosition)&&n.baRelation=="splitBefore"){const n=e.insertionPosition.path.slice();n.push(0);const o=new yb(e.insertionPosition.root,n);const i=new g_(t.insertionPosition,1,o,0);return[t,i]}if(t.splitPosition.hasSameParentAs(e.splitPosition)&&t.splitPosition.offset<e.splitPosition.offset){t.howMany-=e.howMany}t.splitPosition=t.splitPosition._getTransformedBySplitOperation(e);t.insertionPosition=b_.getInsertionPosition(t.splitPosition);return[t]}));function L_(t,e){return t.targetPosition._getTransformedByDeletion(e.sourcePosition,e.howMany)===null}function H_(t,e){const n=[];for(let o=0;o<t.length;o++){const i=t[o];const r=new g_(i.start,i.end.offset-i.start.offset,e,0);n.push(r);for(let e=o+1;e<t.length;e++){t[e]=t[e]._getTransformedByMove(r.sourcePosition,r.targetPosition,r.howMany)[0]}e=e._getTransformedByMove(r.sourcePosition,r.targetPosition,r.howMany)}return n}class j_ extends(q(yb)){constructor(t,e,n="toNone"){super(t,e,n);if(!this.root.is("rootElement")){throw new P("model-liveposition-root-not-rootelement",t)}q_.call(this)}detach(){this.stopListening()}toPosition(){return new yb(this.root,this.path.slice(),this.stickiness)}static fromPosition(t,e){return new this(t.root,t.path.slice(),e?e:t.stickiness)}}j_.prototype.is=function(t){return t==="livePosition"||t==="model:livePosition"||t=="position"||t==="model:position"};function q_(){this.listenTo(this.root.document.model,"applyOperation",((t,e)=>{const n=e[0];if(!n.isDocumentOperation){return}$_.call(this,n)}),{priority:"low"})}function $_(t){const e=this.getTransformedByOperation(t);if(!this.isEqual(e)){const t=this.toPosition();this.path=e.path;this.root=e.root;this.fire("change",t)}}class W_{constructor(t={}){if(typeof t==="string"){t=t==="transparent"?{isUndoable:false}:{};B("batch-constructor-deprecated-string-type")}const{isUndoable:e=true,isLocal:n=true,isUndo:o=false,isTyping:i=false}=t;this.operations=[];this.isUndoable=e;this.isLocal=n;this.isUndo=o;this.isTyping=i}get type(){B("batch-type-deprecated");return"default"}get baseVersion(){for(const t of this.operations){if(t.baseVersion!==null){return t.baseVersion}}return null}addOperation(t){t.batch=this;this.operations.push(t);return t}}class G_{constructor(t){this._changesInElement=new Map;this._elementSnapshots=new Map;this._changedMarkers=new Map;this._changedRoots=new Map;this._changeCount=0;this._cachedChanges=null;this._cachedChangesWithGraveyard=null;this._refreshedItems=new Set;this._markerCollection=t}get isEmpty(){return this._changesInElement.size==0&&this._changedMarkers.size==0&&this._changedRoots.size==0}bufferOperation(t){const e=t;switch(e.type){case"insert":{if(this._isInInsertedElement(e.position.parent)){return}this._markInsert(e.position.parent,e.position.offset,e.nodes.maxOffset);break}case"addAttribute":case"removeAttribute":case"changeAttribute":{for(const t of e.range.getItems({shallow:true})){if(this._isInInsertedElement(t.parent)){continue}this._markAttribute(t)}break}case"remove":case"move":case"reinsert":{if(e.sourcePosition.isEqual(e.targetPosition)||e.sourcePosition.getShiftedBy(e.howMany).isEqual(e.targetPosition)){return}const t=this._isInInsertedElement(e.sourcePosition.parent);const n=this._isInInsertedElement(e.targetPosition.parent);if(!t){this._markRemove(e.sourcePosition.parent,e.sourcePosition.offset,e.howMany)}if(!n){this._markInsert(e.targetPosition.parent,e.getMovedRangeStart().offset,e.howMany)}break}case"rename":{if(this._isInInsertedElement(e.position.parent)){return}this._markRemove(e.position.parent,e.position.offset,1);this._markInsert(e.position.parent,e.position.offset,1);const t=Bb._createFromPositionAndShift(e.position,1);for(const e of this._markerCollection.getMarkersIntersectingRange(t)){const t=e.getData();this.bufferMarkerChange(e.name,t,t)}break}case"split":{const t=e.splitPosition.parent;if(!this._isInInsertedElement(t)){this._markRemove(t,e.splitPosition.offset,e.howMany)}if(!this._isInInsertedElement(e.insertionPosition.parent)){this._markInsert(e.insertionPosition.parent,e.insertionPosition.offset,1)}if(e.graveyardPosition){this._markRemove(e.graveyardPosition.parent,e.graveyardPosition.offset,1)}break}case"merge":{const t=e.sourcePosition.parent;if(!this._isInInsertedElement(t.parent)){this._markRemove(t.parent,t.startOffset,1)}const n=e.graveyardPosition.parent;this._markInsert(n,e.graveyardPosition.offset,1);const o=e.targetPosition.parent;if(!this._isInInsertedElement(o)){this._markInsert(o,e.targetPosition.offset,t.maxOffset)}break}case"detachRoot":case"addRoot":{const t=e.affectedSelectable;if(!t._isLoaded){return}if(t.isAttached()==e.isAdd){return}this._bufferRootStateChange(e.rootName,e.isAdd);break}case"addRootAttribute":case"removeRootAttribute":case"changeRootAttribute":{if(!e.root._isLoaded){return}const t=e.root.rootName;this._bufferRootAttributeChange(t,e.key,e.oldValue,e.newValue);break}}this._cachedChanges=null}bufferMarkerChange(t,e,n){if(e.range&&e.range.root.is("rootElement")&&!e.range.root._isLoaded){e.range=null}if(n.range&&n.range.root.is("rootElement")&&!n.range.root._isLoaded){n.range=null}let o=this._changedMarkers.get(t);if(!o){o={newMarkerData:n,oldMarkerData:e};this._changedMarkers.set(t,o)}else{o.newMarkerData=n}if(o.oldMarkerData.range==null&&n.range==null){this._changedMarkers.delete(t)}}getMarkersToRemove(){const t=[];for(const[e,n]of this._changedMarkers){if(n.oldMarkerData.range!=null){t.push({name:e,range:n.oldMarkerData.range})}}return t}getMarkersToAdd(){const t=[];for(const[e,n]of this._changedMarkers){if(n.newMarkerData.range!=null){t.push({name:e,range:n.newMarkerData.range})}}return t}getChangedMarkers(){return Array.from(this._changedMarkers).map((([t,e])=>({name:t,data:{oldRange:e.oldMarkerData.range,newRange:e.newMarkerData.range}})))}hasDataChanges(){if(this._changesInElement.size>0){return true}if(this._changedRoots.size>0){return true}for(const{newMarkerData:t,oldMarkerData:e}of this._changedMarkers.values()){if(t.affectsData!==e.affectsData){return true}if(t.affectsData){const n=t.range&&!e.range;const o=!t.range&&e.range;const i=t.range&&e.range&&!t.range.isEqual(e.range);if(n||o||i){return true}}}return false}getChanges(t={}){if(this._cachedChanges){if(t.includeChangesInGraveyard){return this._cachedChangesWithGraveyard.slice()}else{return this._cachedChanges.slice()}}let e=[];for(const t of this._changesInElement.keys()){const n=this._changesInElement.get(t).sort(((t,e)=>{if(t.offset===e.offset){if(t.type!=e.type){return t.type=="remove"?-1:1}return 0}return t.offset<e.offset?-1:1}));const o=this._elementSnapshots.get(t);const i=K_(t.getChildren());const r=U_(o.length,n);let s=0;let a=0;for(const n of r){if(n==="i"){e.push(this._getInsertDiff(t,s,i[s]));s++}else if(n==="r"){e.push(this._getRemoveDiff(t,s,o[a]));a++}else if(n==="a"){const n=i[s].attributes;const r=o[a].attributes;let c;if(i[s].name=="$text"){c=new Bb(yb._createAt(t,s),yb._createAt(t,s+1))}else{const e=t.offsetToIndex(s);c=new Bb(yb._createAt(t,s),yb._createAt(t.getChild(e),0))}e.push(...this._getAttributesDiff(c,r,n));s++;a++}else{s++;a++}}}e.sort(((t,e)=>{if(t.position.root!=e.position.root){return t.position.root.rootName<e.position.root.rootName?-1:1}if(t.position.isEqual(e.position)){return t.changeCount-e.changeCount}return t.position.isBefore(e.position)?-1:1}));for(let t=1,n=0;t<e.length;t++){const o=e[n];const i=e[t];const r=o.type=="remove"&&i.type=="remove"&&o.name=="$text"&&i.name=="$text"&&o.position.isEqual(i.position);const s=o.type=="insert"&&i.type=="insert"&&o.name=="$text"&&i.name=="$text"&&o.position.parent==i.position.parent&&o.position.offset+o.length==i.position.offset;const a=o.type=="attribute"&&i.type=="attribute"&&o.position.parent==i.position.parent&&o.range.isFlat&&i.range.isFlat&&o.position.offset+o.length==i.position.offset&&o.attributeKey==i.attributeKey&&o.attributeOldValue==i.attributeOldValue&&o.attributeNewValue==i.attributeNewValue;if(r||s||a){o.length++;if(a){o.range.end=o.range.end.getShiftedBy(1)}e[t]=null}else{n=t}}e=e.filter((t=>t));for(const t of e){delete t.changeCount;if(t.type=="attribute"){delete t.position;delete t.length}}this._changeCount=0;this._cachedChangesWithGraveyard=e;this._cachedChanges=e.filter(Z_);if(t.includeChangesInGraveyard){return this._cachedChangesWithGraveyard.slice()}else{return this._cachedChanges.slice()}}getChangedRoots(){return Array.from(this._changedRoots.values()).map((t=>{const e={...t};if(e.state!==undefined){delete e.attributes}return e}))}getRefreshedItems(){return new Set(this._refreshedItems)}reset(){this._changesInElement.clear();this._elementSnapshots.clear();this._changedMarkers.clear();this._changedRoots.clear();this._refreshedItems=new Set;this._cachedChanges=null}_bufferRootStateChange(t,e){if(!this._changedRoots.has(t)){this._changedRoots.set(t,{name:t,state:e?"attached":"detached"});return}const n=this._changedRoots.get(t);if(n.state!==undefined){delete n.state;if(n.attributes===undefined){this._changedRoots.delete(t)}}else{n.state=e?"attached":"detached"}}_bufferRootAttributeChange(t,e,n,o){const i=this._changedRoots.get(t)||{name:t};const r=i.attributes||{};if(r[e]){const t=r[e];if(o===t.oldValue){delete r[e]}else{t.newValue=o}}else{r[e]={oldValue:n,newValue:o}}if(Object.entries(r).length===0){delete i.attributes;if(i.state===undefined){this._changedRoots.delete(t)}}else{i.attributes=r;this._changedRoots.set(t,i)}}_refreshItem(t){if(this._isInInsertedElement(t.parent)){return}this._markRemove(t.parent,t.startOffset,t.offsetSize);this._markInsert(t.parent,t.startOffset,t.offsetSize);this._refreshedItems.add(t);const e=Bb._createOn(t);for(const t of this._markerCollection.getMarkersIntersectingRange(e)){const e=t.getData();this.bufferMarkerChange(t.name,e,e)}this._cachedChanges=null}_bufferRootLoad(t){if(!t.isAttached()){return}this._bufferRootStateChange(t.rootName,true);this._markInsert(t,0,t.maxOffset);for(const e of t.getAttributeKeys()){this._bufferRootAttributeChange(t.rootName,e,null,t.getAttribute(e))}for(const e of this._markerCollection){if(e.getRange().root==t){const t=e.getData();this.bufferMarkerChange(e.name,{...t,range:null},t)}}}_markInsert(t,e,n){if(t.root.is("rootElement")&&!t.root._isLoaded){return}const o={type:"insert",offset:e,howMany:n,count:this._changeCount++};this._markChange(t,o)}_markRemove(t,e,n){if(t.root.is("rootElement")&&!t.root._isLoaded){return}const o={type:"remove",offset:e,howMany:n,count:this._changeCount++};this._markChange(t,o);this._removeAllNestedChanges(t,e,n)}_markAttribute(t){if(t.root.is("rootElement")&&!t.root._isLoaded){return}const e={type:"attribute",offset:t.startOffset,howMany:t.offsetSize,count:this._changeCount++};this._markChange(t.parent,e)}_markChange(t,e){this._makeSnapshot(t);const n=this._getChangesForElement(t);this._handleChange(e,n);n.push(e);for(let t=0;t<n.length;t++){if(n[t].howMany<1){n.splice(t,1);t--}}}_getChangesForElement(t){let e;if(this._changesInElement.has(t)){e=this._changesInElement.get(t)}else{e=[];this._changesInElement.set(t,e)}return e}_makeSnapshot(t){if(!this._elementSnapshots.has(t)){this._elementSnapshots.set(t,K_(t.getChildren()))}}_handleChange(t,e){t.nodesToHandle=t.howMany;for(const n of e){const o=t.offset+t.howMany;const i=n.offset+n.howMany;if(t.type=="insert"){if(n.type=="insert"){if(t.offset<=n.offset){n.offset+=t.howMany}else if(t.offset<i){n.howMany+=t.nodesToHandle;t.nodesToHandle=0}}if(n.type=="remove"){if(t.offset<n.offset){n.offset+=t.howMany}}if(n.type=="attribute"){if(t.offset<=n.offset){n.offset+=t.howMany}else if(t.offset<i){const i=n.howMany;n.howMany=t.offset-n.offset;e.unshift({type:"attribute",offset:o,howMany:i-n.howMany,count:this._changeCount++})}}}if(t.type=="remove"){if(n.type=="insert"){if(o<=n.offset){n.offset-=t.howMany}else if(o<=i){if(t.offset<n.offset){const e=o-n.offset;n.offset=t.offset;n.howMany-=e;t.nodesToHandle-=e}else{n.howMany-=t.nodesToHandle;t.nodesToHandle=0}}else{if(t.offset<=n.offset){t.nodesToHandle-=n.howMany;n.howMany=0}else if(t.offset<i){const e=i-t.offset;n.howMany-=e;t.nodesToHandle-=e}}}if(n.type=="remove"){if(o<=n.offset){n.offset-=t.howMany}else if(t.offset<n.offset){t.nodesToHandle+=n.howMany;n.howMany=0}}if(n.type=="attribute"){if(o<=n.offset){n.offset-=t.howMany}else if(t.offset<n.offset){const e=o-n.offset;n.offset=t.offset;n.howMany-=e}else if(t.offset<i){if(o<=i){const o=n.howMany;n.howMany=t.offset-n.offset;const i=o-n.howMany-t.nodesToHandle;e.unshift({type:"attribute",offset:t.offset,howMany:i,count:this._changeCount++})}else{n.howMany-=i-t.offset}}}}if(t.type=="attribute"){if(n.type=="insert"){if(t.offset<n.offset&&o>n.offset){if(o>i){const t={type:"attribute",offset:i,howMany:o-i,count:this._changeCount++};this._handleChange(t,e);e.push(t)}t.nodesToHandle=n.offset-t.offset;t.howMany=t.nodesToHandle}else if(t.offset>=n.offset&&t.offset<i){if(o>i){t.nodesToHandle=o-i;t.offset=i}else{t.nodesToHandle=0}}}if(n.type=="remove"){if(t.offset<n.offset&&o>n.offset){const i={type:"attribute",offset:n.offset,howMany:o-n.offset,count:this._changeCount++};this._handleChange(i,e);e.push(i);t.nodesToHandle=n.offset-t.offset;t.howMany=t.nodesToHandle}}if(n.type=="attribute"){if(t.offset>=n.offset&&o<=i){t.nodesToHandle=0;t.howMany=0;t.offset=0}else if(t.offset<=n.offset&&o>=i){n.howMany=0}}}}t.howMany=t.nodesToHandle;delete t.nodesToHandle}_getInsertDiff(t,e,n){return{type:"insert",position:yb._createAt(t,e),name:n.name,attributes:new Map(n.attributes),length:1,changeCount:this._changeCount++}}_getRemoveDiff(t,e,n){return{type:"remove",position:yb._createAt(t,e),name:n.name,attributes:new Map(n.attributes),length:1,changeCount:this._changeCount++}}_getAttributesDiff(t,e,n){const o=[];n=new Map(n);for(const[i,r]of e){const e=n.has(i)?n.get(i):null;if(e!==r){o.push({type:"attribute",position:t.start,range:t.clone(),length:1,attributeKey:i,attributeOldValue:r,attributeNewValue:e,changeCount:this._changeCount++})}n.delete(i)}for(const[e,i]of n){o.push({type:"attribute",position:t.start,range:t.clone(),length:1,attributeKey:e,attributeOldValue:null,attributeNewValue:i,changeCount:this._changeCount++})}return o}_isInInsertedElement(t){const e=t.parent;if(!e){return false}const n=this._changesInElement.get(e);const o=t.startOffset;if(n){for(const t of n){if(t.type=="insert"&&o>=t.offset&&o<t.offset+t.howMany){return true}}}return this._isInInsertedElement(e)}_removeAllNestedChanges(t,e,n){const o=new Bb(yb._createAt(t,e),yb._createAt(t,e+n));for(const t of o.getItems({shallow:true})){if(t.is("element")){this._elementSnapshots.delete(t);this._changesInElement.delete(t);this._removeAllNestedChanges(t,0,t.maxOffset)}}}}function K_(t){const e=[];for(const n of t){if(n.is("$text")){for(let t=0;t<n.data.length;t++){e.push({name:"$text",attributes:new Map(n.getAttributes())})}}else{e.push({name:n.name,attributes:new Map(n.getAttributes())})}}return e}function U_(t,e){const n=[];let o=0;let i=0;for(const t of e){if(t.offset>o){for(let e=0;e<t.offset-o;e++){n.push("e")}i+=t.offset-o}if(t.type=="insert"){for(let e=0;e<t.howMany;e++){n.push("i")}o=t.offset+t.howMany}else if(t.type=="remove"){for(let e=0;e<t.howMany;e++){n.push("r")}o=t.offset;i+=t.howMany}else{n.push(..."a".repeat(t.howMany).split(""));o=t.offset+t.howMany;i+=t.howMany}}if(i<t){for(let e=0;e<t-i-o;e++){n.push("e")}}return n}function Z_(t){const e="position"in t&&t.position.root.rootName=="$graveyard";const n="range"in t&&t.range.root.rootName=="$graveyard";return!e&&!n}class J_{constructor(){this._operations=[];this._undoPairs=new Map;this._undoneOperations=new Set;this._baseVersionToOperationIndex=new Map;this._version=0;this._gaps=new Map}get version(){return this._version}set version(t){if(this._operations.length&&t>this._version+1){this._gaps.set(this._version,t)}this._version=t}get lastOperation(){return this._operations[this._operations.length-1]}addOperation(t){if(t.baseVersion!==this.version){throw new P("model-document-history-addoperation-incorrect-version",this,{operation:t,historyVersion:this.version})}this._operations.push(t);this._version++;this._baseVersionToOperationIndex.set(t.baseVersion,this._operations.length-1)}getOperations(t,e=this.version){if(!this._operations.length){return[]}const n=this._operations[0];if(t===undefined){t=n.baseVersion}let o=e-1;for(const[e,n]of this._gaps){if(t>e&&t<n){t=n}if(o>e&&o<n){o=e-1}}if(o<n.baseVersion||t>this.lastOperation.baseVersion){return[]}let i=this._baseVersionToOperationIndex.get(t);if(i===undefined){i=0}let r=this._baseVersionToOperationIndex.get(o);if(r===undefined){r=this._operations.length-1}return this._operations.slice(i,r+1)}getOperation(t){const e=this._baseVersionToOperationIndex.get(t);if(e===undefined){return}return this._operations[e]}setOperationAsUndone(t,e){this._undoPairs.set(e,t);this._undoneOperations.add(t)}isUndoingOperation(t){return this._undoPairs.has(t)}isUndoneOperation(t){return this._undoneOperations.has(t)}getUndoneOperation(t){return this._undoPairs.get(t)}reset(){this._version=0;this._undoPairs=new Map;this._operations=[];this._undoneOperations=new Set;this._gaps=new Map;this._baseVersionToOperationIndex=new Map}}class Y_ extends _b{constructor(t,e,n="main"){super(e);this._isAttached=true;this._isLoaded=true;this._document=t;this.rootName=n}get document(){return this._document}isAttached(){return this._isAttached}toJSON(){return this.rootName}}Y_.prototype.is=function(t,e){if(!e){return t==="rootElement"||t==="model:rootElement"||t==="element"||t==="model:element"||t==="node"||t==="model:node"}return e===this.name&&(t==="rootElement"||t==="model:rootElement"||t==="element"||t==="model:element")};const Q_="$graveyard";class X_ extends(q()){constructor(t){super();this.model=t;this.history=new J_;this.selection=new Qb(this);this.roots=new ul({idProperty:"rootName"});this.differ=new G_(t.markers);this.isReadOnly=false;this._postFixers=new Set;this._hasSelectionChangedFromTheLastChangeBlock=false;this.createRoot("$root",Q_);this.listenTo(t,"applyOperation",((t,e)=>{const n=e[0];if(n.isDocumentOperation){this.differ.bufferOperation(n)}}),{priority:"high"});this.listenTo(t,"applyOperation",((t,e)=>{const n=e[0];if(n.isDocumentOperation){this.history.addOperation(n)}}),{priority:"low"});this.listenTo(this.selection,"change",(()=>{this._hasSelectionChangedFromTheLastChangeBlock=true}));this.listenTo(t.markers,"update",((t,e,n,o,i)=>{const r={...e.getData(),range:o};this.differ.bufferMarkerChange(e.name,i,r);if(n===null){e.on("change",((t,n)=>{const o=e.getData();this.differ.bufferMarkerChange(e.name,{...o,range:n},o)}))}}));this.registerPostFixer((t=>{let e=false;for(const n of this.roots){if(!n.isAttached()&&!n.isEmpty){t.remove(t.createRangeIn(n));e=true}}for(const n of this.model.markers){if(!n.getRange().root.isAttached()){t.removeMarker(n);e=true}}return e}))}get version(){return this.history.version}set version(t){this.history.version=t}get graveyard(){return this.getRoot(Q_)}createRoot(t="$root",e="main"){if(this.roots.get(e)){throw new P("model-document-createroot-name-exists",this,{name:e})}const n=new Y_(this,t,e);this.roots.add(n);return n}destroy(){this.selection.destroy();this.stopListening()}getRoot(t="main"){return this.roots.get(t)}getRootNames(t=false){return this.getRoots(t).map((t=>t.rootName))}getRoots(t=false){return Array.from(this.roots).filter((e=>e!=this.graveyard&&(t||e.isAttached())&&e._isLoaded))}registerPostFixer(t){this._postFixers.add(t)}toJSON(){const t=Uu(this);t.selection="[engine.model.DocumentSelection]";t.model="[engine.model.Model]";return t}_handleChangeBlock(t){if(this._hasDocumentChangedFromTheLastChangeBlock()){this._callPostFixers(t);this.selection.refresh();if(this.differ.hasDataChanges()){this.fire("change:data",t.batch)}else{this.fire("change",t.batch)}this.selection.refresh();this.differ.reset()}this._hasSelectionChangedFromTheLastChangeBlock=false}_hasDocumentChangedFromTheLastChangeBlock(){return!this.differ.isEmpty||this._hasSelectionChangedFromTheLastChangeBlock}_getDefaultRoot(){const t=this.getRoots();return t.length?t[0]:this.graveyard}_getDefaultRange(){const t=this._getDefaultRoot();const e=this.model;const n=e.schema;const o=e.createPositionFromPath(t,[0]);const i=n.getNearestSelectionRange(o);return i||e.createRange(o)}_validateSelectionRange(t){return tv(t.start)&&tv(t.end)}_callPostFixers(t){let e=false;do{for(const n of this._postFixers){this.selection.refresh();e=n(t);if(e){break}}}while(e)}}function tv(t){const e=t.textNode;if(e){const n=e.data;const o=t.offset-e.startOffset;return!yl(n,o)&&!xl(n,o)}return true}class ev extends(q()){constructor(){super(...arguments);this._markers=new Map}[Symbol.iterator](){return this._markers.values()}has(t){const e=t instanceof nv?t.name:t;return this._markers.has(e)}get(t){return this._markers.get(t)||null}_set(t,e,n=false,o=false){const i=t instanceof nv?t.name:t;if(i.includes(",")){throw new P("markercollection-incorrect-marker-name",this)}const r=this._markers.get(i);if(r){const t=r.getData();const s=r.getRange();let a=false;if(!s.isEqual(e)){r._attachLiveRange(Kb.fromRange(e));a=true}if(n!=r.managedUsingOperations){r._managedUsingOperations=n;a=true}if(typeof o==="boolean"&&o!=r.affectsData){r._affectsData=o;a=true}if(a){this.fire(`update:${i}`,r,s,e,t)}return r}const s=Kb.fromRange(e);const a=new nv(i,s,n,o);this._markers.set(i,a);this.fire(`update:${i}`,a,null,e,{...a.getData(),range:null});return a}_remove(t){const e=t instanceof nv?t.name:t;const n=this._markers.get(e);if(n){this._markers.delete(e);this.fire(`update:${e}`,n,n.getRange(),null,n.getData());this._destroyMarker(n);return true}return false}_refresh(t){const e=t instanceof nv?t.name:t;const n=this._markers.get(e);if(!n){throw new P("markercollection-refresh-marker-not-exists",this)}const o=n.getRange();this.fire(`update:${e}`,n,o,o,n.getData())}*getMarkersAtPosition(t){for(const e of this){if(e.getRange().containsPosition(t)){yield e}}}*getMarkersIntersectingRange(t){for(const e of this){if(e.getRange().getIntersection(t)!==null){yield e}}}destroy(){for(const t of this._markers.values()){this._destroyMarker(t)}this._markers=null;this.stopListening()}*getMarkersGroup(t){for(const e of this._markers.values()){if(e.name.startsWith(t+":")){yield e}}}_destroyMarker(t){t.stopListening();t._detachLiveRange()}}class nv extends(q(gb)){constructor(t,e,n,o){super();this.name=t;this._liveRange=this._attachLiveRange(e);this._managedUsingOperations=n;this._affectsData=o}get managedUsingOperations(){if(!this._liveRange){throw new P("marker-destroyed",this)}return this._managedUsingOperations}get affectsData(){if(!this._liveRange){throw new P("marker-destroyed",this)}return this._affectsData}getData(){return{range:this.getRange(),affectsData:this.affectsData,managedUsingOperations:this.managedUsingOperations}}getStart(){if(!this._liveRange){throw new P("marker-destroyed",this)}return this._liveRange.start.clone()}getEnd(){if(!this._liveRange){throw new P("marker-destroyed",this)}return this._liveRange.end.clone()}getRange(){if(!this._liveRange){throw new P("marker-destroyed",this)}return this._liveRange.toRange()}_attachLiveRange(t){if(this._liveRange){this._detachLiveRange()}t.delegate("change:range").to(this);t.delegate("change:content").to(this);this._liveRange=t;return t}_detachLiveRange(){this._liveRange.stopDelegating("change:range",this);this._liveRange.stopDelegating("change:content",this);this._liveRange.detach();this._liveRange=null}}nv.prototype.is=function(t){return t==="marker"||t==="model:marker"};class ov extends s_{constructor(t,e){super(null);this.sourcePosition=t.clone();this.howMany=e}get type(){return"detach"}get affectedSelectable(){return null}toJSON(){const t=super.toJSON();t.sourcePosition=this.sourcePosition.toJSON();return t}_validate(){if(this.sourcePosition.root.document){throw new P("detach-operation-on-document-node",this)}}_execute(){c_(Bb._createFromPositionAndShift(this.sourcePosition,this.howMany))}static get className(){return"DetachOperation"}}class iv extends gb{constructor(t){super();this.markers=new Map;this._children=new bb;if(t){this._insertChild(0,t)}}[Symbol.iterator](){return this.getChildren()}get childCount(){return this._children.length}get maxOffset(){return this._children.maxOffset}get isEmpty(){return this.childCount===0}get nextSibling(){return null}get previousSibling(){return null}get root(){return this}get parent(){return null}get document(){return null}isAttached(){return false}getAncestors(){return[]}getChild(t){return this._children.getNode(t)}getChildren(){return this._children[Symbol.iterator]()}getChildIndex(t){return this._children.getNodeIndex(t)}getChildStartOffset(t){return this._children.getNodeStartOffset(t)}getPath(){return[]}getNodeByPath(t){let e=this;for(const n of t){e=e.getChild(e.offsetToIndex(n))}return e}offsetToIndex(t){return this._children.offsetToIndex(t)}toJSON(){const t=[];for(const e of this._children){t.push(e.toJSON())}return t}static fromJSON(t){const e=[];for(const n of t){if(n.name){e.push(_b.fromJSON(n))}else{e.push(kb.fromJSON(n))}}return new iv(e)}_appendChild(t){this._insertChild(this.childCount,t)}_insertChild(t,e){const n=rv(e);for(const t of n){if(t.parent!==null){t._remove()}t.parent=this}this._children._insertNodes(t,n)}_removeChildren(t,e=1){const n=this._children._removeNodes(t,e);for(const t of n){t.parent=null}return n}}iv.prototype.is=function(t){return t==="documentFragment"||t==="model:documentFragment"};function rv(t){if(typeof t=="string"){return[new kb(t)]}if(!Ct(t)){t=[t]}return Array.from(t).map((t=>{if(typeof t=="string"){return new kb(t)}if(t instanceof wb){return new kb(t.data,t.getAttributes())}return t}))}class sv{constructor(t,e){this.model=t;this.batch=e}createText(t,e){return new kb(t,e)}createElement(t,e){return new _b(t,e)}createDocumentFragment(){return new iv}cloneElement(t,e=true){return t._clone(e)}insert(t,e,n=0){this._assertWriterUsedCorrectly();if(t instanceof kb&&t.data==""){return}const o=yb._createAt(e,n);if(t.parent){if(uv(t.root,o.root)){this.move(Bb._createOn(t),o);return}else{if(t.root.document){throw new P("model-writer-insert-forbidden-move",this)}else{this.remove(t)}}}const i=o.root.document?o.root.document.version:null;const r=new m_(o,t,i);if(t instanceof kb){r.shouldReceiveAttributes=true}this.batch.addOperation(r);this.model.applyOperation(r);if(t instanceof iv){for(const[e,n]of t.markers){const t=yb._createAt(n.root,0);const i=new Bb(n.start._getCombined(t,o),n.end._getCombined(t,o));const r={range:i,usingOperation:true,affectsData:true};if(this.model.markers.has(e)){this.updateMarker(e,r)}else{this.addMarker(e,r)}}}}insertText(t,e,n,o){if(e instanceof iv||e instanceof _b||e instanceof yb){this.insert(this.createText(t),e,n)}else{this.insert(this.createText(t,e),n,o)}}insertElement(t,e,n,o){if(e instanceof iv||e instanceof _b||e instanceof yb){this.insert(this.createElement(t),e,n)}else{this.insert(this.createElement(t,e),n,o)}}append(t,e){this.insert(t,e,"end")}appendText(t,e,n){if(e instanceof iv||e instanceof _b){this.insert(this.createText(t),e,"end")}else{this.insert(this.createText(t,e),n,"end")}}appendElement(t,e,n){if(e instanceof iv||e instanceof _b){this.insert(this.createElement(t),e,"end")}else{this.insert(this.createElement(t,e),n,"end")}}setAttribute(t,e,n){this._assertWriterUsedCorrectly();if(n instanceof Bb){const o=n.getMinimalFlatRanges();for(const n of o){av(this,t,e,n)}}else{cv(this,t,e,n)}}setAttributes(t,e){for(const[n,o]of ml(t)){this.setAttribute(n,o,e)}}removeAttribute(t,e){this._assertWriterUsedCorrectly();if(e instanceof Bb){const n=e.getMinimalFlatRanges();for(const e of n){av(this,t,null,e)}}else{cv(this,t,null,e)}}clearAttributes(t){this._assertWriterUsedCorrectly();const e=t=>{for(const e of t.getAttributeKeys()){this.removeAttribute(e,t)}};if(!(t instanceof Bb)){e(t)}else{for(const n of t.getItems()){e(n)}}}move(t,e,n){this._assertWriterUsedCorrectly();if(!(t instanceof Bb)){throw new P("writer-move-invalid-range",this)}if(!t.isFlat){throw new P("writer-move-range-not-flat",this)}const o=yb._createAt(e,n);if(o.isEqual(t.start)){return}this._addOperationForAffectedMarkers("move",t);if(!uv(t.root,o.root)){throw new P("writer-move-different-document",this)}const i=t.root.document?t.root.document.version:null;const r=new g_(t.start,t.end.offset-t.start.offset,o,i);this.batch.addOperation(r);this.model.applyOperation(r)}remove(t){this._assertWriterUsedCorrectly();const e=t instanceof Bb?t:Bb._createOn(t);const n=e.getMinimalFlatRanges().reverse();for(const t of n){this._addOperationForAffectedMarkers("move",t);dv(t.start,t.end.offset-t.start.offset,this.batch,this.model)}}merge(t){this._assertWriterUsedCorrectly();const e=t.nodeBefore;const n=t.nodeAfter;this._addOperationForAffectedMarkers("merge",t);if(!(e instanceof _b)){throw new P("writer-merge-no-element-before",this)}if(!(n instanceof _b)){throw new P("writer-merge-no-element-after",this)}if(!t.root.document){this._mergeDetached(t)}else{this._merge(t)}}createPositionFromPath(t,e,n){return this.model.createPositionFromPath(t,e,n)}createPositionAt(t,e){return this.model.createPositionAt(t,e)}createPositionAfter(t){return this.model.createPositionAfter(t)}createPositionBefore(t){return this.model.createPositionBefore(t)}createRange(t,e){return this.model.createRange(t,e)}createRangeIn(t){return this.model.createRangeIn(t)}createRangeOn(t){return this.model.createRangeOn(t)}createSelection(...t){return this.model.createSelection(...t)}_mergeDetached(t){const e=t.nodeBefore;const n=t.nodeAfter;this.move(Bb._createIn(n),yb._createAt(e,"end"));this.remove(n)}_merge(t){const e=yb._createAt(t.nodeBefore,"end");const n=yb._createAt(t.nodeAfter,0);const o=t.root.document.graveyard;const i=new yb(o,[0]);const r=t.root.document.version;const s=new k_(n,t.nodeAfter.maxOffset,e,i,r);this.batch.addOperation(s);this.model.applyOperation(s)}rename(t,e){this._assertWriterUsedCorrectly();if(!(t instanceof _b)){throw new P("writer-rename-not-element-instance",this)}const n=t.root.document?t.root.document.version:null;const o=new y_(yb._createBefore(t),t.name,e,n);this.batch.addOperation(o);this.model.applyOperation(o)}split(t,e){this._assertWriterUsedCorrectly();let n=t.parent;if(!n.parent){throw new P("writer-split-element-no-parent",this)}if(!e){e=n.parent}if(!t.parent.getAncestors({includeSelf:true}).includes(e)){throw new P("writer-split-invalid-limit-element",this)}let o;let i;do{const e=n.root.document?n.root.document.version:null;const r=n.maxOffset-t.offset;const s=b_.getInsertionPosition(t);const a=new b_(t,r,s,null,e);this.batch.addOperation(a);this.model.applyOperation(a);if(!o&&!i){o=n;i=t.parent.nextSibling}t=this.createPositionAfter(t.parent);n=t.parent}while(n!==e);return{position:t,range:new Bb(yb._createAt(o,"end"),yb._createAt(i,0))}}wrap(t,e){this._assertWriterUsedCorrectly();if(!t.isFlat){throw new P("writer-wrap-range-not-flat",this)}const n=e instanceof _b?e:new _b(e);if(n.childCount>0){throw new P("writer-wrap-element-not-empty",this)}if(n.parent!==null){throw new P("writer-wrap-element-attached",this)}this.insert(n,t.start);const o=new Bb(t.start.getShiftedBy(1),t.end.getShiftedBy(1));this.move(o,yb._createAt(n,0))}unwrap(t){this._assertWriterUsedCorrectly();if(t.parent===null){throw new P("writer-unwrap-element-no-parent",this)}this.move(Bb._createIn(t),this.createPositionAfter(t));this.remove(t)}addMarker(t,e){this._assertWriterUsedCorrectly();if(!e||typeof e.usingOperation!="boolean"){throw new P("writer-addmarker-no-usingoperation",this)}const n=e.usingOperation;const o=e.range;const i=e.affectsData===undefined?false:e.affectsData;if(this.model.markers.has(t)){throw new P("writer-addmarker-marker-exists",this)}if(!o){throw new P("writer-addmarker-no-range",this)}if(!n){return this.model.markers._set(t,o,n,i)}lv(this,t,null,o,i);return this.model.markers.get(t)}updateMarker(t,e){this._assertWriterUsedCorrectly();const n=typeof t=="string"?t:t.name;const o=this.model.markers.get(n);if(!o){throw new P("writer-updatemarker-marker-not-exists",this)}if(!e){B("writer-updatemarker-reconvert-using-editingcontroller",{markerName:n});this.model.markers._refresh(o);return}const i=typeof e.usingOperation=="boolean";const r=typeof e.affectsData=="boolean";const s=r?e.affectsData:o.affectsData;if(!i&&!e.range&&!r){throw new P("writer-updatemarker-wrong-options",this)}const a=o.getRange();const c=e.range?e.range:a;if(i&&e.usingOperation!==o.managedUsingOperations){if(e.usingOperation){lv(this,n,null,c,s)}else{lv(this,n,a,null,s);this.model.markers._set(n,c,undefined,s)}return}if(o.managedUsingOperations){lv(this,n,a,c,s)}else{this.model.markers._set(n,c,undefined,s)}}removeMarker(t){this._assertWriterUsedCorrectly();const e=typeof t=="string"?t:t.name;if(!this.model.markers.has(e)){throw new P("writer-removemarker-no-marker",this)}const n=this.model.markers.get(e);if(!n.managedUsingOperations){this.model.markers._remove(e);return}const o=n.getRange();lv(this,e,o,null,n.affectsData)}addRoot(t,e="$root"){this._assertWriterUsedCorrectly();const n=this.model.document.getRoot(t);if(n&&n.isAttached()){throw new P("writer-addroot-root-exists",this)}const o=this.model.document;const i=new E_(t,e,true,o,o.version);this.batch.addOperation(i);this.model.applyOperation(i);return this.model.document.getRoot(t)}detachRoot(t){this._assertWriterUsedCorrectly();const e=typeof t=="string"?this.model.document.getRoot(t):t;if(!e||!e.isAttached()){throw new P("writer-detachroot-no-root",this)}for(const t of this.model.markers){if(t.getRange().root===e){this.removeMarker(t)}}for(const t of e.getAttributeKeys()){this.removeAttribute(t,e)}this.remove(this.createRangeIn(e));const n=this.model.document;const o=new E_(e.rootName,e.name,false,n,n.version);this.batch.addOperation(o);this.model.applyOperation(o)}setSelection(...t){this._assertWriterUsedCorrectly();this.model.document.selection._setTo(...t)}setSelectionFocus(t,e){this._assertWriterUsedCorrectly();this.model.document.selection._setFocus(t,e)}setSelectionAttribute(t,e){this._assertWriterUsedCorrectly();if(typeof t==="string"){this._setSelectionAttribute(t,e)}else{for(const[e,n]of ml(t)){this._setSelectionAttribute(e,n)}}}removeSelectionAttribute(t){this._assertWriterUsedCorrectly();if(typeof t==="string"){this._removeSelectionAttribute(t)}else{for(const e of t){this._removeSelectionAttribute(e)}}}overrideSelectionGravity(){return this.model.document.selection._overrideGravity()}restoreSelectionGravity(t){this.model.document.selection._restoreGravity(t)}_setSelectionAttribute(t,e){const n=this.model.document.selection;if(n.isCollapsed&&n.anchor.parent.isEmpty){const o=Qb._getStoreAttributeKey(t);this.setAttribute(o,e,n.anchor.parent)}n._setAttribute(t,e)}_removeSelectionAttribute(t){const e=this.model.document.selection;if(e.isCollapsed&&e.anchor.parent.isEmpty){const n=Qb._getStoreAttributeKey(t);this.removeAttribute(n,e.anchor.parent)}e._removeAttribute(t)}_assertWriterUsedCorrectly(){if(this.model._currentWriter!==this){throw new P("writer-incorrect-use",this)}}_addOperationForAffectedMarkers(t,e){for(const n of this.model.markers){if(!n.managedUsingOperations){continue}const o=n.getRange();let i=false;if(t==="move"){const t=e;i=t.containsPosition(o.start)||t.start.isEqual(o.start)||t.containsPosition(o.end)||t.end.isEqual(o.end)}else{const t=e;const n=t.nodeBefore;const r=t.nodeAfter;const s=o.start.parent==n&&o.start.isAtEnd;const a=o.end.parent==r&&o.end.offset==0;const c=o.end.nodeAfter==r;const l=o.start.nodeAfter==r;i=s||a||c||l}if(i){this.updateMarker(n.name,{range:o})}}}}function av(t,e,n,o){const i=t.model;const r=i.document;let s=o.start;let a;let c;let l;for(const t of o.getWalker({shallow:true})){l=t.item.getAttribute(e);if(a&&c!=l){if(c!=n){d()}s=a}a=t.nextPosition;c=l}if(a instanceof yb&&a!=s&&c!=n){d()}function d(){const o=new Bb(s,a);const l=o.root.document?r.version:null;const d=new A_(o,e,c,n,l);t.batch.addOperation(d);i.applyOperation(d)}}function cv(t,e,n,o){const i=t.model;const r=i.document;const s=o.getAttribute(e);let a,c;if(s!=n){const l=o.root===o;if(l){const t=o.document?r.version:null;c=new x_(o,e,s,n,t)}else{a=new Bb(yb._createBefore(o),t.createPositionAfter(o));const i=a.root.document?r.version:null;c=new A_(a,e,s,n,i)}t.batch.addOperation(c);i.applyOperation(c)}}function lv(t,e,n,o,i){const r=t.model;const s=r.document;const a=new w_(e,n,o,r.markers,!!i,s.version);t.batch.addOperation(a);r.applyOperation(a)}function dv(t,e,n,o){let i;if(t.root.document){const n=o.document;const r=new yb(n.graveyard,[0]);i=new g_(t,e,r,n.version)}else{i=new ov(t,e)}n.addOperation(i);o.applyOperation(i)}function uv(t,e){if(t===e){return true}if(t instanceof Y_&&e instanceof Y_){return true}return false}function hv(t,e,n={}){if(e.isCollapsed){return}const o=e.getFirstRange();if(o.root.rootName=="$graveyard"){return}const i=t.schema;t.change((t=>{if(!n.doNotResetEntireContent&&xv(i,e)){yv(t,e);return}const r={};if(!n.doNotAutoparagraph){const t=e.getSelectedElement();if(t){Object.assign(r,i.getAttributesWithProperty(t,"copyOnReplace",true))}}const[s,a]=fv(o);if(!s.isTouching(a)){t.remove(t.createRange(s,a))}if(!n.leaveUnmerged){gv(t,s,a);i.removeDisallowedAttributes(s.parent.getChildren(),t)}Ev(t,e,s);if(!n.doNotAutoparagraph&&vv(i,s)){Cv(t,s,e,r)}s.detach();a.detach()}))}function fv(t){const e=t.root.document.model;const n=t.start;let o=t.end;if(e.hasContent(t,{ignoreMarkers:true})){const n=pv(o);if(n&&o.isTouching(e.createPositionAt(n,0))){const n=e.createSelection(t);e.modifySelection(n,{direction:"backward"});const i=n.getLastPosition();const r=e.createRange(i,o);if(!e.hasContent(r,{ignoreMarkers:true})){o=i}}}return[j_.fromPosition(n,"toPrevious"),j_.fromPosition(o,"toNext")]}function pv(t){const e=t.parent;const n=e.root.document.model.schema;const o=e.getAncestors({parentFirst:true,includeSelf:true});for(const t of o){if(n.isLimit(t)){return null}if(n.isBlock(t)){return t}}}function gv(t,e,n){const o=t.model;if(!wv(t.model.schema,e,n)){return}const[i,r]=_v(e,n);if(!i||!r){return}if(!o.hasContent(i,{ignoreMarkers:true})&&o.hasContent(r,{ignoreMarkers:true})){bv(t,e,n,i.parent)}else{mv(t,e,n,i.parent)}}function mv(t,e,n,o){const i=e.parent;const r=n.parent;if(i==o||r==o){return}e=t.createPositionAfter(i);n=t.createPositionBefore(r);if(!n.isEqual(e)){t.insert(r,e)}t.merge(e);while(n.parent.isEmpty){const e=n.parent;n=t.createPositionBefore(e);t.remove(e)}if(!wv(t.model.schema,e,n)){return}mv(t,e,n,o)}function bv(t,e,n,o){const i=e.parent;const r=n.parent;if(i==o||r==o){return}e=t.createPositionAfter(i);n=t.createPositionBefore(r);if(!n.isEqual(e)){t.insert(i,n)}while(e.parent.isEmpty){const n=e.parent;e=t.createPositionBefore(n);t.remove(n)}n=t.createPositionBefore(r);kv(t,n);if(!wv(t.model.schema,e,n)){return}bv(t,e,n,o)}function kv(t,e){const n=e.nodeBefore;const o=e.nodeAfter;if(n.name!=o.name){t.rename(n,o.name)}t.clearAttributes(n);t.setAttributes(Object.fromEntries(o.getAttributes()),n);t.merge(e)}function wv(t,e,n){const o=e.parent;const i=n.parent;if(o==i){return false}if(t.isLimit(o)||t.isLimit(i)){return false}return Av(e,n,t)}function _v(t,e){const n=t.getAncestors();const o=e.getAncestors();let i=0;while(n[i]&&n[i]==o[i]){i++}return[n[i],o[i]]}function vv(t,e){const n=t.checkChild(e,"$text");const o=t.checkChild(e,"paragraph");return!n&&o}function Av(t,e,n){const o=new Bb(t,e);for(const t of o.getWalker()){if(n.isLimit(t.item)){return false}}return true}function Cv(t,e,n,o={}){const i=t.createElement("paragraph");t.model.schema.setAllowedAttributes(i,o,t);t.insert(i,e);Ev(t,n,t.createPositionAt(i,0))}function yv(t,e){const n=t.model.schema.getLimitElement(e);t.remove(t.createRangeIn(n));Cv(t,t.createPositionAt(n,0),e)}function xv(t,e){const n=t.getLimitElement(e);if(!e.containsEntireContent(n)){return false}const o=e.getFirstRange();if(o.start.parent==o.end.parent){return false}return t.checkChild(n,"paragraph")}function Ev(t,e,n){if(e instanceof Qb){t.setSelection(n)}else{e.setTo(n)}}function Sv(t,e){return t.change((t=>{const n=t.createDocumentFragment();const o=e.getFirstRange();if(!o||o.isCollapsed){return n}const i=o.start.root;const r=o.start.getCommonPath(o.end);const s=i.getNodeByPath(r);let a;if(o.start.parent==o.end.parent){a=o}else{a=t.createRange(t.createPositionAt(s,o.start.path[r.length]),t.createPositionAt(s,o.end.path[r.length]+1))}const c=a.end.offset-a.start.offset;for(const e of a.getItems({shallow:true})){if(e.is("$textProxy")){t.appendText(e.data,e.getAttributes(),n)}else{t.append(t.cloneElement(e,true),n)}}if(a!=o){const e=o._getTransformedByMove(a.start,t.createPositionAt(n,0),c)[0];const i=t.createRange(t.createPositionAt(n,0),e.start);const r=t.createRange(e.end,t.createPositionAt(n,"end"));Dv(r,t);Dv(i,t)}return n}))}function Dv(t,e){const n=[];Array.from(t.getItems({direction:"backward"})).map((t=>e.createRangeOn(t))).filter((e=>{const n=(e.start.isAfter(t.start)||e.start.isEqual(t.start))&&(e.end.isBefore(t.end)||e.end.isEqual(t.end));return n})).forEach((t=>{n.push(t.start.parent);e.remove(t)}));n.forEach((t=>{let n=t;while(n.parent&&n.isEmpty){const t=e.createRangeOn(n);n=n.parent;e.remove(t)}}))}function Tv(t,e,n){return t.change((o=>{const i=n?n:t.document.selection;if(!i.isCollapsed){t.deleteContent(i,{doNotAutoparagraph:true})}const r=new Pv(t,o,i.anchor);const s=[];let a;if(e.is("documentFragment")){if(e.markers.size){const t=[];for(const[n,o]of e.markers){const{start:e,end:i}=o;const r=e.isEqual(i);t.push({position:e,name:n,isCollapsed:r},{position:i,name:n,isCollapsed:r})}t.sort((({position:t},{position:e})=>t.isBefore(e)?1:-1));for(const{position:n,name:i,isCollapsed:r}of t){let t=null;let a=null;const c=n.parent===e&&n.isAtStart;const l=n.parent===e&&n.isAtEnd;if(!c&&!l){t=o.createElement("$marker");o.insert(t,n)}else if(r){a=c?"start":"end"}s.push({name:i,element:t,collapsed:a})}}a=e.getChildren()}else{a=[e]}r.handleNodes(a);let c=r.getSelectionRange();if(e.is("documentFragment")&&s.length){const t=c?Kb.fromRange(c):null;const e={};for(let t=s.length-1;t>=0;t--){const{name:n,element:i,collapsed:a}=s[t];const c=!e[n];if(c){e[n]=[]}if(i){const t=o.createPositionAt(i,"before");e[n].push(t);o.remove(i)}else{const t=r.getAffectedRange();if(!t){if(a){e[n].push(r.position)}continue}if(a){e[n].push(t[a])}else{e[n].push(c?t.start:t.end)}}}for(const[t,[n,i]]of Object.entries(e)){if(n&&i&&n.root===i.root){o.addMarker(t,{usingOperation:true,affectsData:true,range:new Bb(n,i)})}}if(t){c=t.toRange();t.detach()}}if(c){if(i instanceof Qb){o.setSelection(c)}else{i.setTo(c)}}else{}const l=r.getAffectedRange()||t.createRange(i.anchor);r.destroy();return l}))}class Pv{constructor(t,e,n){this._firstNode=null;this._lastNode=null;this._lastAutoParagraph=null;this._filterAttributesOf=[];this._affectedStart=null;this._affectedEnd=null;this._nodeToSelect=null;this.model=t;this.writer=e;this.position=n;this.canMergeWith=new Set([this.position.parent]);this.schema=t.schema;this._documentFragment=e.createDocumentFragment();this._documentFragmentPosition=e.createPositionAt(this._documentFragment,0)}handleNodes(t){for(const e of Array.from(t)){this._handleNode(e)}this._insertPartialFragment();if(this._lastAutoParagraph){this._updateLastNodeFromAutoParagraph(this._lastAutoParagraph)}this._mergeOnRight();this.schema.removeDisallowedAttributes(this._filterAttributesOf,this.writer);this._filterAttributesOf=[]}_updateLastNodeFromAutoParagraph(t){const e=this.writer.createPositionAfter(this._lastNode);const n=this.writer.createPositionAfter(t);if(n.isAfter(e)){this._lastNode=t;if(this.position.parent!=t||!this.position.isAtEnd){throw new P("insertcontent-invalid-insertion-position",this)}this.position=n;this._setAffectedBoundaries(this.position)}}getSelectionRange(){if(this._nodeToSelect){return Bb._createOn(this._nodeToSelect)}return this.model.schema.getNearestSelectionRange(this.position)}getAffectedRange(){if(!this._affectedStart){return null}return new Bb(this._affectedStart,this._affectedEnd)}destroy(){if(this._affectedStart){this._affectedStart.detach()}if(this._affectedEnd){this._affectedEnd.detach()}}_handleNode(t){if(this.schema.isObject(t)){this._handleObject(t);return}let e=this._checkAndAutoParagraphToAllowedPosition(t);if(!e){e=this._checkAndSplitToAllowedPosition(t);if(!e){this._handleDisallowedNode(t);return}}this._appendToFragment(t);if(!this._firstNode){this._firstNode=t}this._lastNode=t}_insertPartialFragment(){if(this._documentFragment.isEmpty){return}const t=j_.fromPosition(this.position,"toNext");this._setAffectedBoundaries(this.position);if(this._documentFragment.getChild(0)==this._firstNode){this.writer.insert(this._firstNode,this.position);this._mergeOnLeft();this.position=t.toPosition()}if(!this._documentFragment.isEmpty){this.writer.insert(this._documentFragment,this.position)}this._documentFragmentPosition=this.writer.createPositionAt(this._documentFragment,0);this.position=t.toPosition();t.detach()}_handleObject(t){if(this._checkAndSplitToAllowedPosition(t)){this._appendToFragment(t)}else{this._tryAutoparagraphing(t)}}_handleDisallowedNode(t){if(t.is("element")){this.handleNodes(t.getChildren())}else{this._tryAutoparagraphing(t)}}_appendToFragment(t){if(!this.schema.checkChild(this.position,t)){throw new P("insertcontent-wrong-position",this,{node:t,position:this.position})}this.writer.insert(t,this._documentFragmentPosition);this._documentFragmentPosition=this._documentFragmentPosition.getShiftedBy(t.offsetSize);if(this.schema.isObject(t)&&!this.schema.checkChild(this.position,"$text")){this._nodeToSelect=t}else{this._nodeToSelect=null}this._filterAttributesOf.push(t)}_setAffectedBoundaries(t){if(!this._affectedStart){this._affectedStart=j_.fromPosition(t,"toPrevious")}if(!this._affectedEnd||this._affectedEnd.isBefore(t)){if(this._affectedEnd){this._affectedEnd.detach()}this._affectedEnd=j_.fromPosition(t,"toNext")}}_mergeOnLeft(){const t=this._firstNode;if(!(t instanceof _b)){return}if(!this._canMergeLeft(t)){return}const e=j_._createBefore(t);e.stickiness="toNext";const n=j_.fromPosition(this.position,"toNext");if(this._affectedStart.isEqual(e)){this._affectedStart.detach();this._affectedStart=j_._createAt(e.nodeBefore,"end","toPrevious")}if(this._firstNode===this._lastNode){this._firstNode=e.nodeBefore;this._lastNode=e.nodeBefore}this.writer.merge(e);if(e.isEqual(this._affectedEnd)&&this._firstNode===this._lastNode){this._affectedEnd.detach();this._affectedEnd=j_._createAt(e.nodeBefore,"end","toNext")}this.position=n.toPosition();n.detach();this._filterAttributesOf.push(this.position.parent);e.detach()}_mergeOnRight(){const t=this._lastNode;if(!(t instanceof _b)){return}if(!this._canMergeRight(t)){return}const e=j_._createAfter(t);e.stickiness="toNext";if(!this.position.isEqual(e)){throw new P("insertcontent-invalid-insertion-position",this)}this.position=yb._createAt(e.nodeBefore,"end");const n=j_.fromPosition(this.position,"toPrevious");if(this._affectedEnd.isEqual(e)){this._affectedEnd.detach();this._affectedEnd=j_._createAt(e.nodeBefore,"end","toNext")}if(this._firstNode===this._lastNode){this._firstNode=e.nodeBefore;this._lastNode=e.nodeBefore}this.writer.merge(e);if(e.getShiftedBy(-1).isEqual(this._affectedStart)&&this._firstNode===this._lastNode){this._affectedStart.detach();this._affectedStart=j_._createAt(e.nodeBefore,0,"toPrevious")}this.position=n.toPosition();n.detach();this._filterAttributesOf.push(this.position.parent);e.detach()}_canMergeLeft(t){const e=t.previousSibling;return e instanceof _b&&this.canMergeWith.has(e)&&this.model.schema.checkMerge(e,t)}_canMergeRight(t){const e=t.nextSibling;return e instanceof _b&&this.canMergeWith.has(e)&&this.model.schema.checkMerge(t,e)}_tryAutoparagraphing(t){const e=this.writer.createElement("paragraph");if(this._getAllowedIn(this.position.parent,e)&&this.schema.checkChild(e,t)){e._appendChild(t);this._handleNode(e)}}_checkAndAutoParagraphToAllowedPosition(t){if(this.schema.checkChild(this.position.parent,t)){return true}if(!this.schema.checkChild(this.position.parent,"paragraph")||!this.schema.checkChild("paragraph",t)){return false}this._insertPartialFragment();const e=this.writer.createElement("paragraph");this.writer.insert(e,this.position);this._setAffectedBoundaries(this.position);this._lastAutoParagraph=e;this.position=this.writer.createPositionAt(e,0);return true}_checkAndSplitToAllowedPosition(t){const e=this._getAllowedIn(this.position.parent,t);if(!e){return false}if(e!=this.position.parent){this._insertPartialFragment()}while(e!=this.position.parent){if(this.position.isAtStart){const t=this.position.parent;this.position=this.writer.createPositionBefore(t);if(t.isEmpty&&t.parent===e){this.writer.remove(t)}}else if(this.position.isAtEnd){this.position=this.writer.createPositionAfter(this.position.parent)}else{const t=this.writer.createPositionAfter(this.position.parent);this._setAffectedBoundaries(this.position);this.writer.split(this.position);this.position=t;this.canMergeWith.add(this.position.nodeAfter)}}return true}_getAllowedIn(t,e){if(this.schema.checkChild(t,e)){return t}if(this.schema.isLimit(t)){return null}return this._getAllowedIn(t.parent,e)}}function Bv(t,e,n="auto"){const o=t.getSelectedElement();if(o&&e.schema.isObject(o)&&!e.schema.isInline(o)){if(n=="before"||n=="after"){return e.createRange(e.createPositionAt(o,n))}return e.createRangeOn(o)}const i=hl(t.getSelectedBlocks());if(!i){return e.createRange(t.focus)}if(i.isEmpty){return e.createRange(e.createPositionAt(i,0))}const r=e.createPositionAfter(i);if(t.focus.isTouching(r)){return e.createRange(r)}return e.createRange(e.createPositionBefore(i))}function Iv(t,e,n,o={}){if(!t.schema.isObject(e)){throw new P("insertobject-element-not-an-object",t,{object:e})}const i=n?n:t.document.selection;let r=i;if(o.findOptimalPosition&&t.schema.isBlock(e)){r=t.createSelection(Bv(i,t,o.findOptimalPosition))}const s=hl(i.getSelectedBlocks());const a={};if(s){Object.assign(a,t.schema.getAttributesWithProperty(s,"copyOnReplace",true))}return t.change((n=>{if(!r.isCollapsed){t.deleteContent(r,{doNotAutoparagraph:true})}let i=e;const s=r.anchor.parent;if(!t.schema.checkChild(s,e)&&t.schema.checkChild(s,"paragraph")&&t.schema.checkChild("paragraph",e)){i=n.createElement("paragraph");n.insert(e,i)}t.schema.setAllowedAttributes(i,a,n);const c=t.insertContent(i,r);if(c.isCollapsed){return c}if(o.setSelection){Rv(n,e,o.setSelection,a)}return c}))}function Rv(t,e,n,o){const i=t.model;if(n=="on"){t.setSelection(e,"on");return}if(n!="after"){throw new P("insertobject-invalid-place-parameter-value",i)}let r=e.nextSibling;if(i.schema.isInline(e)){t.setSelection(e,"after");return}const s=r&&i.schema.checkChild(r,"$text");if(!s&&i.schema.checkChild(e.parent,"paragraph")){r=t.createElement("paragraph");i.schema.setAllowedAttributes(r,o,t);i.insertContent(r,t.createPositionAfter(e))}if(r){t.setSelection(r,0)}}const Ov=' ,.?!:;"-()';function Mv(t,e,n={}){const o=t.schema;const i=n.direction!="backward";const r=n.unit?n.unit:"character";const s=!!n.treatEmojiAsSingleUnit;const a=e.focus;const c=new Ab({boundaries:Nv(a,i),singleCharacters:true,direction:i?"forward":"backward"});const l={walker:c,schema:o,isForward:i,unit:r,treatEmojiAsSingleUnit:s};let d;while(d=c.next()){if(d.done){return}const n=Vv(l,d.value);if(n){if(e instanceof Qb){t.change((t=>{t.setSelectionFocus(n)}))}else{e.setFocus(n)}return}}}function Vv(t,e){const{isForward:n,walker:o,unit:i,schema:r,treatEmojiAsSingleUnit:s}=t;const{type:a,item:c,nextPosition:l}=e;if(a=="text"){if(t.unit==="word"){return Fv(o,n)}return zv(o,i,s)}if(a==(n?"elementStart":"elementEnd")){if(r.isSelectable(c)){return yb._createAt(c,n?"after":"before")}if(r.checkChild(l,"$text")){return l}}else{if(r.isLimit(c)){o.skip((()=>true));return}if(r.checkChild(l,"$text")){return l}}}function zv(t,e,n){const o=t.position.textNode;if(o){const i=o.data;let r=t.position.offset-o.startOffset;while(yl(i,r)||e=="character"&&xl(i,r)||n&&Sl(i,r)){t.next();r=t.position.offset-o.startOffset}}return t.position}function Fv(t,e){let n=t.position.textNode;if(!n){n=e?t.position.nodeAfter:t.position.nodeBefore}while(n&&n.is("$text")){const o=t.position.offset-n.startOffset;if(Hv(n,o,e)){n=e?t.position.nodeAfter:t.position.nodeBefore}else if(Lv(n.data,o,e)){break}else{t.next()}}return t.position}function Nv(t,e){const n=t.root;const o=yb._createAt(n,e?"end":0);if(e){return new Bb(t,o)}else{return new Bb(o,t)}}function Lv(t,e,n){const o=e+(n?0:-1);return Ov.includes(t.charAt(o))}function Hv(t,e,n){return e===(n?t.offsetSize:0)}class jv extends(lt()){constructor(){super();this.markers=new ev;this.document=new X_(this);this.schema=new Pw;this._pendingChanges=[];this._currentWriter=null;["deleteContent","modifySelection","getSelectedContent","applyOperation"].forEach((t=>this.decorate(t)));this.on("applyOperation",((t,e)=>{const n=e[0];n._validate()}),{priority:"highest"});this.schema.register("$root",{isLimit:true});this.schema.register("$container",{allowIn:["$root","$container"]});this.schema.register("$block",{allowIn:["$root","$container"],isBlock:true});this.schema.register("$blockObject",{allowWhere:"$block",isBlock:true,isObject:true});this.schema.register("$inlineObject",{allowWhere:"$text",allowAttributesOf:"$text",isInline:true,isObject:true});this.schema.register("$text",{allowIn:"$block",isInline:true,isContent:true});this.schema.register("$clipboardHolder",{allowContentOf:"$root",allowChildren:"$text",isLimit:true});this.schema.register("$documentFragment",{allowContentOf:"$root",allowChildren:"$text",isLimit:true});this.schema.register("$marker");this.schema.addChildCheck(((t,e)=>{if(e.name==="$marker"){return true}}));mw(this);this.document.registerPostFixer(Kk);this.on("insertContent",((t,[e,n])=>{t.return=Tv(this,e,n)}));this.on("insertObject",((t,[e,n,o])=>{t.return=Iv(this,e,n,o)}));this.on("canEditAt",(t=>{const e=!this.document.isReadOnly;t.return=e;if(!e){t.stop()}}))}change(t){try{if(this._pendingChanges.length===0){this._pendingChanges.push({batch:new W_,callback:t});return this._runPendingChanges()[0]}else{return t(this._currentWriter)}}catch(t){P.rethrowUnexpectedError(t,this)}}enqueueChange(t,e){try{if(!t){t=new W_}else if(typeof t==="function"){e=t;t=new W_}else if(!(t instanceof W_)){t=new W_(t)}this._pendingChanges.push({batch:t,callback:e});if(this._pendingChanges.length==1){this._runPendingChanges()}}catch(t){P.rethrowUnexpectedError(t,this)}}applyOperation(t){t._execute()}insertContent(t,e,n,...o){const i=qv(e,n);return this.fire("insertContent",[t,i,n,...o])}insertObject(t,e,n,o,...i){const r=qv(e,n);return this.fire("insertObject",[t,r,o,o,...i])}deleteContent(t,e){hv(this,t,e)}modifySelection(t,e){Mv(this,t,e)}getSelectedContent(t){return Sv(this,t)}hasContent(t,e={}){const n=t instanceof Bb?t:Bb._createIn(t);if(n.isCollapsed){return false}const{ignoreWhitespaces:o=false,ignoreMarkers:i=false}=e;if(!i){for(const t of this.markers.getMarkersIntersectingRange(n)){if(t.affectsData){return true}}}for(const t of n.getItems()){if(this.schema.isContent(t)){if(t.is("$textProxy")){if(!o){return true}else if(t.data.search(/\S/)!==-1){return true}}else{return true}}}return false}canEditAt(t){const e=qv(t);return this.fire("canEditAt",[e])}createPositionFromPath(t,e,n){return new yb(t,e,n)}createPositionAt(t,e){return yb._createAt(t,e)}createPositionAfter(t){return yb._createAfter(t)}createPositionBefore(t){return yb._createBefore(t)}createRange(t,e){return new Bb(t,e)}createRangeIn(t){return Bb._createIn(t)}createRangeOn(t){return Bb._createOn(t)}createSelection(...t){return new Nb(...t)}createBatch(t){return new W_(t)}createOperationFromJSON(t){return D_.fromJSON(t,this.document)}destroy(){this.document.destroy();this.stopListening()}_runPendingChanges(){const t=[];this.fire("_beforeChanges");try{while(this._pendingChanges.length){const e=this._pendingChanges[0].batch;this._currentWriter=new sv(this,e);const n=this._pendingChanges[0].callback(this._currentWriter);t.push(n);this.document._handleChangeBlock(this._currentWriter);this._pendingChanges.shift();this._currentWriter=null}}finally{this._pendingChanges.length=0;this._currentWriter=null;this.fire("_afterChanges")}return t}}function qv(t,e){if(!t){return}if(t instanceof Nb||t instanceof Qb){return t}if(t instanceof mb){if(e||e===0){return new Nb(t,e)}else if(t.is("rootElement")){return new Nb(t,"in")}else{return new Nb(t,"on")}}return new Nb(t)}class $v extends(null&&DomEventObserver){constructor(){super(...arguments);this.domEventType="click"}onDomEvent(t){this.fire(t.type,t)}}class Wv extends Ig{constructor(){super(...arguments);this.domEventType=["mousedown","mouseup","mouseover","mouseout"]}onDomEvent(t){this.fire(t.type,t)}}class Gv{constructor(t){this.document=t}createDocumentFragment(t){return new DocumentFragment(this.document,t)}createElement(t,e,n){return new Element(this.document,t,e,n)}createText(t){return new Text(this.document,t)}clone(t,e=false){return t._clone(e)}appendChild(t,e){return e._appendChild(t)}insertChild(t,e,n){return n._insertChild(t,e)}removeChildren(t,e,n){return n._removeChildren(t,e)}remove(t){const e=t.parent;if(e){return this.removeChildren(e.getChildIndex(t),1,e)}return[]}replace(t,e){const n=t.parent;if(n){const o=n.getChildIndex(t);this.removeChildren(o,1,n);this.insertChild(o,e,n);return true}return false}unwrapElement(t){const e=t.parent;if(e){const n=e.getChildIndex(t);this.remove(t);this.insertChild(n,t.getChildren(),e)}}rename(t,e){const n=new Element(this.document,t,e.getAttributes(),e.getChildren());return this.replace(e,n)?n:null}setAttribute(t,e,n){n._setAttribute(t,e)}removeAttribute(t,e){e._removeAttribute(t)}addClass(t,e){e._addClass(t)}removeClass(t,e){e._removeClass(t)}setStyle(t,e,n){if(isPlainObject(t)&&n===undefined){e._setStyle(t)}else{n._setStyle(t,e)}}removeStyle(t,e){e._removeStyle(t)}setCustomProperty(t,e,n){n._setCustomProperty(t,e)}removeCustomProperty(t,e){return e._removeCustomProperty(t)}createPositionAt(t,e){return Position._createAt(t,e)}createPositionAfter(t){return Position._createAfter(t)}createPositionBefore(t){return Position._createBefore(t)}createRange(t,e){return new Range(t,e)}createRangeOn(t){return Range._createOn(t)}createRangeIn(t){return Range._createIn(t)}createSelection(...t){return new Selection(...t)}}const Kv=/^#([0-9a-f]{3,4}|[0-9a-f]{6}|[0-9a-f]{8})$/i;const Uv=/^rgb\([ ]?([0-9]{1,3}[ %]?,[ ]?){2,3}[0-9]{1,3}[ %]?\)$/i;const Zv=/^rgba\([ ]?([0-9]{1,3}[ %]?,[ ]?){3}(1|[0-9]+%|[0]?\.?[0-9]+)\)$/i;const Jv=/^hsl\([ ]?([0-9]{1,3}[ %]?[,]?[ ]*){3}(1|[0-9]+%|[0]?\.?[0-9]+)?\)$/i;const Yv=/^hsla\([ ]?([0-9]{1,3}[ %]?,[ ]?){2,3}(1|[0-9]+%|[0]?\.?[0-9]+)\)$/i;const Qv=/\w+\((?:[^()]|\([^()]*\))*\)|\S+/gi;const Xv=new Set(["black","silver","gray","white","maroon","red","purple","fuchsia","green","lime","olive","yellow","navy","blue","teal","aqua","orange","aliceblue","antiquewhite","aquamarine","azure","beige","bisque","blanchedalmond","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkgrey","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkslategrey","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dimgrey","dodgerblue","firebrick","floralwhite","forestgreen","gainsboro","ghostwhite","gold","goldenrod","greenyellow","grey","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightgrey","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightslategrey","lightsteelblue","lightyellow","limegreen","linen","magenta","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","oldlace","olivedrab","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","skyblue","slateblue","slategray","slategrey","snow","springgreen","steelblue","tan","thistle","tomato","turquoise","violet","wheat","whitesmoke","yellowgreen","activeborder","activecaption","appworkspace","background","buttonface","buttonhighlight","buttonshadow","buttontext","captiontext","graytext","highlight","highlighttext","inactiveborder","inactivecaption","inactivecaptiontext","infobackground","infotext","menu","menutext","scrollbar","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","window","windowframe","windowtext","rebeccapurple","currentcolor","transparent"]);function tA(t){if(t.startsWith("#")){return Kv.test(t)}if(t.startsWith("rgb")){return Uv.test(t)||Zv.test(t)}if(t.startsWith("hsl")){return Jv.test(t)||Yv.test(t)}return Xv.has(t.toLowerCase())}const eA=null&&["none","hidden","dotted","dashed","solid","double","groove","ridge","inset","outset"];function nA(t){return eA.includes(t)}const oA=/^([+-]?[0-9]*([.][0-9]+)?(px|cm|mm|in|pc|pt|ch|em|ex|rem|vh|vw|vmin|vmax)|0)$/;function iA(t){return oA.test(t)}const rA=/^[+-]?[0-9]*([.][0-9]+)?%$/;function sA(t){return rA.test(t)}const aA=null&&["repeat-x","repeat-y","repeat","space","round","no-repeat"];function cA(t){return aA.includes(t)}const lA=null&&["center","top","bottom","left","right"];function dA(t){return lA.includes(t)}const uA=null&&["fixed","scroll","local"];function hA(t){return uA.includes(t)}const fA=/^url\(/;function pA(t){return fA.test(t)}function gA(t=""){if(t===""){return{top:undefined,right:undefined,bottom:undefined,left:undefined}}const e=wA(t);const n=e[0];const o=e[2]||n;const i=e[1]||n;const r=e[3]||i;return{top:n,bottom:o,right:i,left:r}}function mA(t){return e=>{const{top:n,right:o,bottom:i,left:r}=e;const s=[];if(![n,o,r,i].every((t=>!!t))){if(n){s.push([t+"-top",n])}if(o){s.push([t+"-right",o])}if(i){s.push([t+"-bottom",i])}if(r){s.push([t+"-left",r])}}else{s.push([t,bA(e)])}return s}}function bA({top:t,right:e,bottom:n,left:o}){const i=[];if(o!==e){i.push(t,e,n,o)}else if(n!==t){i.push(t,e,n)}else if(e!==t){i.push(t,e)}else{i.push(t)}return i.join(" ")}function kA(t){return e=>({path:t,value:gA(e)})}function wA(t){const e=t.matchAll(Qv);return Array.from(e).map((t=>t[0]))}function _A(t){t.setNormalizer("background",vA());t.setNormalizer("background-color",AA());t.setReducer("background",CA());t.setStyleRelation("background",["background-color"])}function vA(){return t=>{const e={};const n=getShorthandValues(t);for(const t of n){if(isRepeat(t)){e.repeat=e.repeat||[];e.repeat.push(t)}else if(isPosition(t)){e.position=e.position||[];e.position.push(t)}else if(isAttachment(t)){e.attachment=t}else if(isColor(t)){e.color=t}else if(isURL(t)){e.image=t}}return{path:"background",value:e}}}function AA(){return t=>({path:"background.color",value:t})}function CA(){return t=>{const e=[];e.push(["background-color",t.color]);return e}}function yA(t){t.setNormalizer("border",xA());t.setNormalizer("border-top",EA("top"));t.setNormalizer("border-right",EA("right"));t.setNormalizer("border-bottom",EA("bottom"));t.setNormalizer("border-left",EA("left"));t.setNormalizer("border-color",SA("color"));t.setNormalizer("border-width",SA("width"));t.setNormalizer("border-style",SA("style"));t.setNormalizer("border-top-color",TA("color","top"));t.setNormalizer("border-top-style",TA("style","top"));t.setNormalizer("border-top-width",TA("width","top"));t.setNormalizer("border-right-color",TA("color","right"));t.setNormalizer("border-right-style",TA("style","right"));t.setNormalizer("border-right-width",TA("width","right"));t.setNormalizer("border-bottom-color",TA("color","bottom"));t.setNormalizer("border-bottom-style",TA("style","bottom"));t.setNormalizer("border-bottom-width",TA("width","bottom"));t.setNormalizer("border-left-color",TA("color","left"));t.setNormalizer("border-left-style",TA("style","left"));t.setNormalizer("border-left-width",TA("width","left"));t.setExtractor("border-top",PA("top"));t.setExtractor("border-right",PA("right"));t.setExtractor("border-bottom",PA("bottom"));t.setExtractor("border-left",PA("left"));t.setExtractor("border-top-color","border.color.top");t.setExtractor("border-right-color","border.color.right");t.setExtractor("border-bottom-color","border.color.bottom");t.setExtractor("border-left-color","border.color.left");t.setExtractor("border-top-width","border.width.top");t.setExtractor("border-right-width","border.width.right");t.setExtractor("border-bottom-width","border.width.bottom");t.setExtractor("border-left-width","border.width.left");t.setExtractor("border-top-style","border.style.top");t.setExtractor("border-right-style","border.style.right");t.setExtractor("border-bottom-style","border.style.bottom");t.setExtractor("border-left-style","border.style.left");t.setReducer("border-color",getBoxSidesValueReducer("border-color"));t.setReducer("border-style",getBoxSidesValueReducer("border-style"));t.setReducer("border-width",getBoxSidesValueReducer("border-width"));t.setReducer("border-top",OA("top"));t.setReducer("border-right",OA("right"));t.setReducer("border-bottom",OA("bottom"));t.setReducer("border-left",OA("left"));t.setReducer("border",RA());t.setStyleRelation("border",["border-color","border-style","border-width","border-top","border-right","border-bottom","border-left","border-top-color","border-right-color","border-bottom-color","border-left-color","border-top-style","border-right-style","border-bottom-style","border-left-style","border-top-width","border-right-width","border-bottom-width","border-left-width"]);t.setStyleRelation("border-color",["border-top-color","border-right-color","border-bottom-color","border-left-color"]);t.setStyleRelation("border-style",["border-top-style","border-right-style","border-bottom-style","border-left-style"]);t.setStyleRelation("border-width",["border-top-width","border-right-width","border-bottom-width","border-left-width"]);t.setStyleRelation("border-top",["border-top-color","border-top-style","border-top-width"]);t.setStyleRelation("border-right",["border-right-color","border-right-style","border-right-width"]);t.setStyleRelation("border-bottom",["border-bottom-color","border-bottom-style","border-bottom-width"]);t.setStyleRelation("border-left",["border-left-color","border-left-style","border-left-width"])}function xA(){return t=>{const{color:e,style:n,width:o}=IA(t);return{path:"border",value:{color:getBoxSidesValues(e),style:getBoxSidesValues(n),width:getBoxSidesValues(o)}}}}function EA(t){return e=>{const{color:n,style:o,width:i}=IA(e);const r={};if(n!==undefined){r.color={[t]:n}}if(o!==undefined){r.style={[t]:o}}if(i!==undefined){r.width={[t]:i}}return{path:"border",value:r}}}function SA(t){return e=>({path:"border",value:DA(e,t)})}function DA(t,e){return{[e]:getBoxSidesValues(t)}}function TA(t,e){return n=>({path:"border",value:{[t]:{[e]:n}}})}function PA(t){return(e,n)=>{if(n.border){return BA(n.border,t)}}}function BA(t,e){const n={};if(t.width&&t.width[e]){n.width=t.width[e]}if(t.style&&t.style[e]){n.style=t.style[e]}if(t.color&&t.color[e]){n.color=t.color[e]}return n}function IA(t){const e={};const n=getShorthandValues(t);for(const t of n){if(isLength(t)||/thin|medium|thick/.test(t)){e.width=t}else if(isLineStyle(t)){e.style=t}else{e.color=t}}return e}function RA(){return e=>{const n=BA(e,"top");const o=BA(e,"right");const i=BA(e,"bottom");const r=BA(e,"left");const s=[n,o,i,r];const a={width:t(s,"width"),style:t(s,"style"),color:t(s,"color")};const c=MA(a,"all");if(c.length){return c}const l=Object.entries(a).reduce(((t,[e,n])=>{if(n){t.push([`border-${e}`,n]);s.forEach((t=>delete t[e]))}return t}),[]);return[...l,...MA(n,"top"),...MA(o,"right"),...MA(i,"bottom"),...MA(r,"left")]};function t(t,e){return t.map((t=>t[e])).reduce(((t,e)=>t==e?t:null))}}function OA(t){return e=>MA(e,t)}function MA(t,e){const n=[];if(t&&t.width){n.push("width")}if(t&&t.style){n.push("style")}if(t&&t.color){n.push("color")}if(n.length==3){const o=n.map((e=>t[e])).join(" ");return[e=="all"?["border",o]:[`border-${e}`,o]]}if(e=="all"){return[]}return n.map((n=>[`border-${e}-${n}`,t[n]]))}function VA(t){t.setNormalizer("margin",getPositionShorthandNormalizer("margin"));t.setNormalizer("margin-top",(t=>({path:"margin.top",value:t})));t.setNormalizer("margin-right",(t=>({path:"margin.right",value:t})));t.setNormalizer("margin-bottom",(t=>({path:"margin.bottom",value:t})));t.setNormalizer("margin-left",(t=>({path:"margin.left",value:t})));t.setReducer("margin",getBoxSidesValueReducer("margin"));t.setStyleRelation("margin",["margin-top","margin-right","margin-bottom","margin-left"])}function zA(t){t.setNormalizer("padding",getPositionShorthandNormalizer("padding"));t.setNormalizer("padding-top",(t=>({path:"padding.top",value:t})));t.setNormalizer("padding-right",(t=>({path:"padding.right",value:t})));t.setNormalizer("padding-bottom",(t=>({path:"padding.bottom",value:t})));t.setNormalizer("padding-left",(t=>({path:"padding.left",value:t})));t.setReducer("padding",getBoxSidesValueReducer("padding"));t.setStyleRelation("padding",["padding-top","padding-right","padding-bottom","padding-left"])}class FA{constructor(){this._commands=new Map}add(t,e){this._commands.set(t,e)}get(t){return this._commands.get(t)}execute(t,...e){const n=this.get(t);if(!n){throw new P("commandcollection-command-not-found",this,{commandName:t})}return n.execute(...e)}*names(){yield*this._commands.keys()}*commands(){yield*this._commands.values()}[Symbol.iterator](){return this._commands[Symbol.iterator]()}destroy(){for(const t of this.commands()){t.destroy()}}}class NA extends pl{constructor(t){super();this.editor=t}set(t,e,n={}){if(typeof e=="string"){const t=e;e=(e,n)=>{this.editor.execute(t);n()}}super.set(t,e,n)}}class LA extends(lt()){constructor(t={}){super();const e=this.constructor;const n=t.language||e.defaultConfig&&e.defaultConfig.language;this._context=t.context||new Du({language:n});this._context._addEditor(this,!t.context);const o=Array.from(e.builtinPlugins||[]);this.config=new Ha(t,e.defaultConfig);this.config.define("plugins",o);this.config.define(this._context._getEditorConfig());this.plugins=new Su(this,o,this._context.plugins);this.locale=this._context.locale;this.t=this.locale.t;this._readOnlyLocks=new Set;this.commands=new FA;this.set("state","initializing");this.once("ready",(()=>this.state="ready"),{priority:"high"});this.once("destroy",(()=>this.state="destroyed"),{priority:"high"});this.model=new jv;this.on("change:isReadOnly",(()=>{this.model.document.isReadOnly=this.isReadOnly}));const i=new Kf;this.data=new e_(this.model,i);this.editing=new xw(this.model,i);this.editing.view.document.bind("isReadOnly").to(this);this.conversion=new o_([this.editing.downcastDispatcher,this.data.downcastDispatcher],this.data.upcastDispatcher);this.conversion.addAlias("dataDowncast",this.data.downcastDispatcher);this.conversion.addAlias("editingDowncast",this.editing.downcastDispatcher);this.keystrokes=new NA(this);this.keystrokes.listenTo(this.editing.view.document)}get isReadOnly(){return this._readOnlyLocks.size>0}set isReadOnly(t){throw new P("editor-isreadonly-has-no-setter")}enableReadOnlyMode(t){if(typeof t!=="string"&&typeof t!=="symbol"){throw new P("editor-read-only-lock-id-invalid",null,{lockId:t})}if(this._readOnlyLocks.has(t)){return}this._readOnlyLocks.add(t);if(this._readOnlyLocks.size===1){this.fire("change:isReadOnly","isReadOnly",true,false)}}disableReadOnlyMode(t){if(typeof t!=="string"&&typeof t!=="symbol"){throw new P("editor-read-only-lock-id-invalid",null,{lockId:t})}if(!this._readOnlyLocks.has(t)){return}this._readOnlyLocks.delete(t);if(this._readOnlyLocks.size===0){this.fire("change:isReadOnly","isReadOnly",false,true)}}initPlugins(){const t=this.config;const e=t.get("plugins");const n=t.get("removePlugins")||[];const o=t.get("extraPlugins")||[];const i=t.get("substitutePlugins")||[];return this.plugins.init(e.concat(o),n,i)}destroy(){let t=Promise.resolve();if(this.state=="initializing"){t=new Promise((t=>this.once("ready",t)))}return t.then((()=>{this.fire("destroy");this.stopListening();this.commands.destroy()})).then((()=>this.plugins.destroy())).then((()=>{this.model.destroy();this.data.destroy();this.editing.destroy();this.keystrokes.destroy()})).then((()=>this._context._removeEditor(this)))}execute(t,...e){try{return this.commands.execute(t,...e)}catch(t){P.rethrowUnexpectedError(t,this)}}focus(){this.editing.view.focus()}static create(...t){throw new Error("This is an abstract method.")}}function HA(t){if(!qe(t.updateSourceElement)){throw new P("attachtoform-missing-elementapi-interface",t)}const e=t.sourceElement;if(jA(e)&&e.form){let n;const o=e.form;const i=()=>t.updateSourceElement();if(qe(o.submit)){n=o.submit;o.submit=()=>{i();n.apply(o)}}o.addEventListener("submit",i);t.on("destroy",(()=>{o.removeEventListener("submit",i);if(n){o.submit=n}}))}}function jA(t){return!!t&&t.tagName.toLowerCase()==="textarea"}function qA(t){class e extends t{setData(t){this.data.set(t)}getData(t){return this.data.get(t)}}return e}{const t=qA(Object);qA.setData=t.prototype.setData;qA.getData=t.prototype.getData}function $A(t){class e extends t{updateSourceElement(t=this.data.get()){if(!this.sourceElement){throw new P("editor-missing-sourceelement",this)}const e=this.config.get("updateSourceElementOnDestroy");const n=this.sourceElement instanceof HTMLTextAreaElement;if(!e&&!n){gc(this.sourceElement,"");return}gc(this.sourceElement,t)}}return e}$A.updateSourceElement=$A(Object).prototype.updateSourceElement;function WA(t,e){if(e.ckeditorInstance){throw new CKEditorError("editor-source-element-already-used",t)}e.ckeditorInstance=t;t.once("destroy",(()=>{delete e.ckeditorInstance}))}class GA extends Tu{static get pluginName(){return"PendingActions"}init(){this.set("hasAny",false);this._actions=new ul({idProperty:"_id"});this._actions.delegate("add","remove").to(this)}add(t){if(typeof t!=="string"){throw new P("pendingactions-add-invalid-message",this)}const e=new(lt());e.set("message",t);this._actions.add(e);this.hasAny=true;return e}remove(t){this._actions.remove(t);this.hasAny=!!this._actions.length}get first(){return this._actions.get(0)}[Symbol.iterator](){return this._actions[Symbol.iterator]()}}const KA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m11.591 10.177 4.243 4.242a1 1 0 0 1-1.415 1.415l-4.242-4.243-4.243 4.243a1 1 0 0 1-1.414-1.415l4.243-4.242L4.52 5.934A1 1 0 0 1 5.934 4.52l4.243 4.243 4.242-4.243a1 1 0 1 1 1.415 1.414l-4.243 4.243z"/></svg>';const UA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 16h9a1 1 0 0 1 0 2H2a1 1 0 0 1 0-2z"/><path d="M17 1a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h14zm0 1.5H3a.5.5 0 0 0-.492.41L2.5 3v9a.5.5 0 0 0 .41.492L3 12.5h14a.5.5 0 0 0 .492-.41L17.5 12V3a.5.5 0 0 0-.41-.492L17 2.5z" fill-opacity=".6"/></svg>';const ZA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M6.972 16.615a.997.997 0 0 1-.744-.292l-4.596-4.596a1 1 0 1 1 1.414-1.414l3.926 3.926 9.937-9.937a1 1 0 0 1 1.414 1.415L7.717 16.323a.997.997 0 0 1-.745.292z"/></svg>';const JA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m11.333 2 .19 2.263a5.899 5.899 0 0 1 1.458.604L14.714 3.4 16.6 5.286l-1.467 1.733c.263.452.468.942.605 1.46L18 8.666v2.666l-2.263.19a5.899 5.899 0 0 1-.604 1.458l1.467 1.733-1.886 1.886-1.733-1.467a5.899 5.899 0 0 1-1.46.605L11.334 18H8.667l-.19-2.263a5.899 5.899 0 0 1-1.458-.604L5.286 16.6 3.4 14.714l1.467-1.733a5.899 5.899 0 0 1-.604-1.458L2 11.333V8.667l2.262-.189a5.899 5.899 0 0 1 .605-1.459L3.4 5.286 5.286 3.4l1.733 1.467a5.899 5.899 0 0 1 1.46-.605L8.666 2h2.666zM10 6.267a3.733 3.733 0 1 0 0 7.466 3.733 3.733 0 0 0 0-7.466z"/></svg>';const YA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m8.636 9.531-2.758 3.94a.5.5 0 0 0 .122.696l3.224 2.284h1.314l2.636-3.736L8.636 9.53zm.288 8.451L5.14 15.396a2 2 0 0 1-.491-2.786l6.673-9.53a2 2 0 0 1 2.785-.49l3.742 2.62a2 2 0 0 1 .491 2.785l-7.269 10.053-2.147-.066z"/><path d="M4 18h5.523v-1H4zm-2 0h1v-1H2z"/></svg>';const QA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M5.085 6.22 2.943 4.078a.75.75 0 1 1 1.06-1.06l2.592 2.59A11.094 11.094 0 0 1 10 5.068c4.738 0 8.578 3.101 8.578 5.083 0 1.197-1.401 2.803-3.555 3.887l1.714 1.713a.75.75 0 0 1-.09 1.138.488.488 0 0 1-.15.084.75.75 0 0 1-.821-.16L6.17 7.304c-.258.11-.51.233-.757.365l6.239 6.24-.006.005.78.78c-.388.094-.78.166-1.174.215l-1.11-1.11h.011L4.55 8.197a7.2 7.2 0 0 0-.665.514l-.112.098 4.897 4.897-.005.006 1.276 1.276a10.164 10.164 0 0 1-1.477-.117l-.479-.479-.009.009-4.863-4.863-.022.031a2.563 2.563 0 0 0-.124.2c-.043.077-.08.158-.108.241a.534.534 0 0 0-.028.133.29.29 0 0 0 .008.072.927.927 0 0 0 .082.226c.067.133.145.26.234.379l3.242 3.365.025.01.59.623c-3.265-.918-5.59-3.155-5.59-4.668 0-1.194 1.448-2.838 3.663-3.93zm7.07.531a4.632 4.632 0 0 1 1.108 5.992l.345.344.046-.018a9.313 9.313 0 0 0 2-1.112c.256-.187.5-.392.727-.613.137-.134.27-.277.392-.431.072-.091.141-.185.203-.286.057-.093.107-.19.148-.292a.72.72 0 0 0 .036-.12.29.29 0 0 0 .008-.072.492.492 0 0 0-.028-.133.999.999 0 0 0-.036-.096 2.165 2.165 0 0 0-.071-.145 2.917 2.917 0 0 0-.125-.2 3.592 3.592 0 0 0-.263-.335 5.444 5.444 0 0 0-.53-.523 7.955 7.955 0 0 0-1.054-.768 9.766 9.766 0 0 0-1.879-.891c-.337-.118-.68-.219-1.027-.301zm-2.85.21-.069.002a.508.508 0 0 0-.254.097.496.496 0 0 0-.104.679.498.498 0 0 0 .326.199l.045.005c.091.003.181.003.272.012a2.45 2.45 0 0 1 2.017 1.513c.024.061.043.125.069.185a.494.494 0 0 0 .45.287h.008a.496.496 0 0 0 .35-.158.482.482 0 0 0 .13-.335.638.638 0 0 0-.048-.219 3.379 3.379 0 0 0-.36-.723 3.438 3.438 0 0 0-2.791-1.543l-.028-.001h-.013z"/></svg>';const XA='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M6.91 10.54c.26-.23.64-.21.88.03l3.36 3.14 2.23-2.06a.64.64 0 0 1 .87 0l2.52 2.97V4.5H3.2v10.12l3.71-4.08zm10.27-7.51c.6 0 1.09.47 1.09 1.05v11.84c0 .59-.49 1.06-1.09 1.06H2.79c-.6 0-1.09-.47-1.09-1.06V4.08c0-.58.49-1.05 1.1-1.05h14.38zm-5.22 5.56a1.96 1.96 0 1 1 3.4-1.96 1.96 1.96 0 0 1-3.4 1.96z"/></svg>';const tC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m9.239 13.938-2.88-1.663a.75.75 0 0 1 .75-1.3L9 12.067V4.75a.75.75 0 1 1 1.5 0v7.318l1.89-1.093a.75.75 0 0 1 .75 1.3l-2.879 1.663a.752.752 0 0 1-.511.187.752.752 0 0 1-.511-.187zM4.25 17a.75.75 0 1 1 0-1.5h10.5a.75.75 0 0 1 0 1.5H4.25z"/></svg>';const eC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M9.75 11.875a.752.752 0 0 1 .508.184l2.883 1.666a.75.75 0 0 1-.659 1.344l-.091-.044-1.892-1.093.001 4.318a.75.75 0 1 1-1.5 0v-4.317l-1.89 1.092a.75.75 0 0 1-.75-1.3l2.879-1.663a.752.752 0 0 1 .51-.187zM15.25 9a.75.75 0 1 1 0 1.5H4.75a.75.75 0 1 1 0-1.5h10.5zM9.75.375a.75.75 0 0 1 .75.75v4.318l1.89-1.093.092-.045a.75.75 0 0 1 .659 1.344l-2.883 1.667a.752.752 0 0 1-.508.184.752.752 0 0 1-.511-.187L6.359 5.65a.75.75 0 0 1 .75-1.299L9 5.442V1.125a.75.75 0 0 1 .75-.75z"/></svg>';const nC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m10.261 7.062 2.88 1.663a.75.75 0 0 1-.75 1.3L10.5 8.933v7.317a.75.75 0 1 1-1.5 0V8.932l-1.89 1.093a.75.75 0 0 1-.75-1.3l2.879-1.663a.752.752 0 0 1 .511-.187.752.752 0 0 1 .511.187zM15.25 4a.75.75 0 1 1 0 1.5H4.75a.75.75 0 0 1 0-1.5h10.5z"/></svg>';const oC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 3.75c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0 8c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0 4c0 .414.336.75.75.75h9.929a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0-8c0 .414.336.75.75.75h9.929a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75z"/></svg>';const iC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 3.75c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0 8c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm2.286 4c0 .414.336.75.75.75h9.928a.75.75 0 1 0 0-1.5H5.036a.75.75 0 0 0-.75.75zm0-8c0 .414.336.75.75.75h9.928a.75.75 0 1 0 0-1.5H5.036a.75.75 0 0 0-.75.75z"/></svg>';const rC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M18 3.75a.75.75 0 0 1-.75.75H2.75a.75.75 0 1 1 0-1.5h14.5a.75.75 0 0 1 .75.75zm0 8a.75.75 0 0 1-.75.75H2.75a.75.75 0 1 1 0-1.5h14.5a.75.75 0 0 1 .75.75zm0 4a.75.75 0 0 1-.75.75H7.321a.75.75 0 1 1 0-1.5h9.929a.75.75 0 0 1 .75.75zm0-8a.75.75 0 0 1-.75.75H7.321a.75.75 0 1 1 0-1.5h9.929a.75.75 0 0 1 .75.75z"/></svg>';const sC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 3.75c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0 8c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0 4c0 .414.336.75.75.75h9.929a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75zm0-8c0 .414.336.75.75.75h14.5a.75.75 0 1 0 0-1.5H2.75a.75.75 0 0 0-.75.75z"/></svg>';const aC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm0 12h16v1.5H2z"/><path d="M12.003 7v5.5a1 1 0 0 1-1 1H2.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H3.5V12h6.997V7.5z"/></svg>';const cC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm0 12h16v1.5H2z"/><path d="M15.003 7v5.5a1 1 0 0 1-1 1H5.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H6.5V12h6.997V7.5z"/></svg>';const lC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm0 12h16v1.5H2z"/><path d="M18.003 7v5.5a1 1 0 0 1-1 1H8.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H9.5V12h6.997V7.5z"/></svg>';const dC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm0 12h16v1.5H2z"/><path d="M18 7v5.5a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1zm-1.505.5H3.504V12h12.991V7.5z"/></svg>';const uC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm11.5 9H18v1.5h-4.5zM2 15h16v1.5H2z"/><path d="M12.003 7v5.5a1 1 0 0 1-1 1H2.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H3.5V12h6.997V7.5z"/></svg>';const hC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm11.5 9H18v1.5h-4.5zm0-3H18v1.5h-4.5zm0-3H18v1.5h-4.5zM2 15h16v1.5H2z"/><path d="M12.003 7v5.5a1 1 0 0 1-1 1H2.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H3.5V12h6.997V7.5z"/></svg>';const fC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path opacity=".5" d="M2 3h16v1.5H2zm0 12h16v1.5H2zm0-9h5v1.5H2zm0 3h5v1.5H2zm0 3h5v1.5H2z"/><path d="M18.003 7v5.5a1 1 0 0 1-1 1H8.996a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h8.007a1 1 0 0 1 1 1zm-1.506.5H9.5V12h6.997V7.5z"/></svg>';const pC='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M2.5 17v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zM1 15.5v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm0-2v1h-1v-1h1zm-19 0v1H0v-1h1zM14.5 2v1h-1V2h1zm2 0v1h-1V2h1zm2 0v1h-1V2h1zm-8 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm8 0v1h-1V2h1zm-10 0v1h-1V2h1z"/><path d="M18.095 2H1.905C.853 2 0 2.895 0 4v12c0 1.105.853 2 1.905 2h16.19C19.147 18 20 17.105 20 16V4c0-1.105-.853-2-1.905-2zm0 1.5c.263 0 .476.224.476.5v12c0 .276-.213.5-.476.5H1.905a.489.489 0 0 1-.476-.5V4c0-.276.213-.5.476-.5h16.19z"/></svg>';const gC='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M2.5 17v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zM1 15.5v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm0-2v1h-1v-1h1zm-19 0v1H0v-1h1zM14.5 2v1h-1V2h1zm2 0v1h-1V2h1zm2 0v1h-1V2h1zm-8 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm8 0v1h-1V2h1zm-10 0v1h-1V2h1z"/><path d="M13 6H2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h11a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2zm0 1.5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5V8a.5.5 0 0 1 .5-.5h11z"/></svg>';const mC='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M2.5 17v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zM1 15.5v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm0-2v1h-1v-1h1zm-19 0v1H0v-1h1zM14.5 2v1h-1V2h1zm2 0v1h-1V2h1zm2 0v1h-1V2h1zm-8 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm8 0v1h-1V2h1zm-10 0v1h-1V2h1z"/><path d="M7 10H2a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2zm0 1.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5h5z"/></svg>';const bC='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M2.5 17v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zm2 0v1h-1v-1h1zM1 15.5v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm-19-2v1H0v-1h1zm19 0v1h-1v-1h1zm0-2v1h-1v-1h1zm-19 0v1H0v-1h1zM14.5 2v1h-1V2h1zm2 0v1h-1V2h1zm2 0v1h-1V2h1zm-8 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm-2 0v1h-1V2h1zm8 0v1h-1V2h1zm-10 0v1h-1V2h1z"/><path d="M10 8H2a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2zm0 1.5a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-.5.5H2a.5.5 0 0 1-.5-.5v-6a.5.5 0 0 1 .5-.5h8z"/></svg>';const kC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m7.3 17.37-.061.088a1.518 1.518 0 0 1-.934.535l-4.178.663-.806-4.153a1.495 1.495 0 0 1 .187-1.058l.056-.086L8.77 2.639c.958-1.351 2.803-1.076 4.296-.03 1.497 1.047 2.387 2.693 1.433 4.055L7.3 17.37zM9.14 4.728l-5.545 8.346 3.277 2.294 5.544-8.346L9.14 4.728zM6.07 16.512l-3.276-2.295.53 2.73 2.746-.435zM9.994 3.506 13.271 5.8c.316-.452-.16-1.333-1.065-1.966-.905-.634-1.895-.78-2.212-.328zM8 18.5 9.375 17H19v1.5H8z"/></svg>';const wC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M6.999 2H15a1 1 0 0 1 0 2h-1.004v13a1 1 0 1 1-2 0V4H8.999v13a1 1 0 1 1-2 0v-7A4 4 0 0 1 3 6a4 4 0 0 1 3.999-4z"/></svg>';const _C='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M3 10.423a6.5 6.5 0 0 1 6.056-6.408l.038.67C6.448 5.423 5.354 7.663 5.22 10H9c.552 0 .5.432.5.986v4.511c0 .554-.448.503-1 .503h-5c-.552 0-.5-.449-.5-1.003v-4.574zm8 0a6.5 6.5 0 0 1 6.056-6.408l.038.67c-2.646.739-3.74 2.979-3.873 5.315H17c.552 0 .5.432.5.986v4.511c0 .554-.448.503-1 .503h-5c-.552 0-.5-.449-.5-1.003v-4.574z"/></svg>';const vC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><circle cx="9.5" cy="4.5" r="1.5"/><circle cx="9.5" cy="10.5" r="1.5"/><circle cx="9.5" cy="16.5" r="1.5"/></svg>';const AC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10.187 17H5.773c-.637 0-1.092-.138-1.364-.415-.273-.277-.409-.718-.409-1.323V4.738c0-.617.14-1.062.419-1.332.279-.27.73-.406 1.354-.406h4.68c.69 0 1.288.041 1.793.124.506.083.96.242 1.36.478.341.197.644.447.906.75a3.262 3.262 0 0 1 .808 2.162c0 1.401-.722 2.426-2.167 3.075C15.05 10.175 16 11.315 16 13.01a3.756 3.756 0 0 1-2.296 3.504 6.1 6.1 0 0 1-1.517.377c-.571.073-1.238.11-2 .11zm-.217-6.217H7v4.087h3.069c1.977 0 2.965-.69 2.965-2.072 0-.707-.256-1.22-.768-1.537-.512-.319-1.277-.478-2.296-.478zM7 5.13v3.619h2.606c.729 0 1.292-.067 1.69-.2a1.6 1.6 0 0 0 .91-.765c.165-.267.247-.566.247-.897 0-.707-.26-1.176-.778-1.409-.519-.232-1.31-.348-2.375-.348H7z"/></svg>';const CC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10.5 5.5H7v5h3.5a2.5 2.5 0 1 0 0-5zM5 3h6.5v.025a5 5 0 0 1 0 9.95V13H7v4a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z"/></svg>';const yC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 0 0-1 1v6H3a1 1 0 1 0 0 2h6v6a1 1 0 1 0 2 0v-6h6a1 1 0 1 0 0-2h-6V3a1 1 0 0 0-1-1Z"/></svg>';const xC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M9.816 11.5 7.038 4.785 4.261 11.5h5.555Zm.62 1.5H3.641l-1.666 4.028H.312l5.789-14h1.875l5.789 14h-1.663L10.436 13Z"/><path d="m12.09 17-.534-1.292.848-1.971.545 1.319L12.113 17h-.023Zm1.142-5.187.545 1.319L15.5 9.13l1.858 4.316h-3.45l.398.965h3.467L18.887 17H20l-3.873-9h-1.254l-1.641 3.813Z"/></svg>';const EC='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M19 4.5 14 0H3v12.673l.868-1.041c.185-.222.4-.402.632-.54V1.5h8v5h5v7.626a2.24 2.24 0 0 1 1.5.822V4.5ZM14 5V2l3.3 3H14Zm-3.692 12.5c.062.105.133.206.213.303L11.52 19H8v-.876a2.243 2.243 0 0 0 1.82-.624h.488Zm7.518-.657a.75.75 0 0 0-1.152-.96L15.5 17.29V12H14v5.29l-1.174-1.408a.75.75 0 0 0-1.152.96l2.346 2.816a.95.95 0 0 0 1.46 0l2.346-2.815Zm-15.056-.38a.75.75 0 0 1-.096-1.056l2.346-2.815a.95.95 0 0 1 1.46 0l2.346 2.815a.75.75 0 1 1-1.152.96L6.5 14.96V20H5v-5.04l-1.174 1.408a.75.75 0 0 1-1.056.096Z"/></svg>';const SC={bold:AC,cancel:KA,caption:UA,check:ZA,cog:JA,eraser:YA,image:XA,lowVision:QA,importExport:EC,paragraph:CC,plus:yC,text:xC,alignBottom:tC,alignMiddle:eC,alignTop:nC,alignLeft:oC,alignCenter:iC,alignRight:rC,alignJustify:sC,objectLeft:hC,objectCenter:cC,objectRight:fC,objectFullWidth:dC,objectInline:uC,objectBlockLeft:aC,objectBlockRight:lC,objectSizeFull:pC,objectSizeLarge:gC,objectSizeSmall:mC,objectSizeMedium:bC,pencil:kC,pilcrow:wC,quote:_C,threeVerticalDots:vC};var DC=n(768);var TC={injectType:"singletonStyleTag",attributes:{"data-cke":true}};TC.insert="head";TC.singleton=true;var PC=Il()(DC.Z,TC);const BC=DC.Z.locals||{};const{threeVerticalDots:IC}=SC;const RC={alignLeft:SC.alignLeft,bold:SC.bold,importExport:SC.importExport,paragraph:SC.paragraph,plus:SC.plus,text:SC.text,threeVerticalDots:SC.threeVerticalDots};class OC extends zl{constructor(t,e){super(t);const n=this.bindTemplate;const o=this.t;this.options=e||{};this.set("ariaLabel",o("Editor toolbar"));this.set("maxWidth","auto");this.items=this.createCollection();this.focusTracker=new fl;this.keystrokes=new pl;this.set("class",undefined);this.set("isCompact",false);this.itemsView=new MC(t);this.children=this.createCollection();this.children.add(this.itemsView);this.focusables=this.createCollection();const i=t.uiLanguageDirection==="rtl";this._focusCycler=new mu({focusables:this.focusables,focusTracker:this.focusTracker,keystrokeHandler:this.keystrokes,actions:{focusPrevious:[i?"arrowright":"arrowleft","arrowup"],focusNext:[i?"arrowleft":"arrowright","arrowdown"]}});const r=["ck","ck-toolbar",n.to("class"),n.if("isCompact","ck-toolbar_compact")];if(this.options.shouldGroupWhenFull&&this.options.isFloating){r.push("ck-toolbar_floating")}this.setTemplate({tag:"div",attributes:{class:r,role:"toolbar","aria-label":n.to("ariaLabel"),style:{maxWidth:n.to("maxWidth")},tabindex:-1},children:this.children,on:{mousedown:_u(this)}});this._behavior=this.options.shouldGroupWhenFull?new zC(this):new VC(this)}render(){super.render();this.focusTracker.add(this.element);for(const t of this.items){this.focusTracker.add(t.element)}this.items.on("add",((t,e)=>{this.focusTracker.add(e.element)}));this.items.on("remove",((t,e)=>{this.focusTracker.remove(e.element)}));this.keystrokes.listenTo(this.element);this._behavior.render(this)}destroy(){this._behavior.destroy();this.focusTracker.destroy();this.keystrokes.destroy();return super.destroy()}focus(){this._focusCycler.focusFirst()}focusLast(){this._focusCycler.focusLast()}fillFromConfig(t,e,n){this.items.addMany(this._buildItemsFromConfig(t,e,n))}_buildItemsFromConfig(t,e,n){const o=vu(t);const i=n||o.removeItems;const r=this._cleanItemsConfiguration(o.items,e,i).map((t=>{if(nt(t)){return this._createNestedToolbarDropdown(t,e,i)}else if(t==="|"){return new ku}else if(t==="-"){return new wu}return e.create(t)})).filter((t=>!!t));return r}_cleanItemsConfiguration(t,e,n){const o=t.filter(((t,o,i)=>{if(t==="|"){return true}if(n.indexOf(t)!==-1){return false}if(t==="-"){if(this.options.shouldGroupWhenFull){B("toolbarview-line-break-ignored-when-grouping-items",i);return false}return true}if(!nt(t)&&!e.has(t)){B("toolbarview-item-unavailable",{item:t});return false}return true}));return this._cleanSeparatorsAndLineBreaks(o)}_cleanSeparatorsAndLineBreaks(t){const e=t=>t!=="-"&&t!=="|";const n=t.length;const o=t.findIndex(e);if(o===-1){return[]}const i=n-t.slice().reverse().findIndex(e);return t.slice(o,i).filter(((t,n,o)=>{if(e(t)){return true}const i=n>0&&o[n-1]===t;return!i}))}_createNestedToolbarDropdown(t,e,n){let{label:o,icon:i,items:r,tooltip:s=true,withText:a=false}=t;r=this._cleanItemsConfiguration(r,e,n);if(!r.length){return null}const c=this.locale;const l=ry(c);if(!o){B("toolbarview-nested-toolbar-dropdown-missing-label",t)}l.class="ck-toolbar__nested-toolbar-dropdown";l.buttonView.set({label:o,tooltip:s,withText:!!a});if(i!==false){l.buttonView.icon=RC[i]||i||IC}else{l.buttonView.withText=true}sy(l,(()=>l.toolbarView._buildItemsFromConfig(r,e,n)));return l}}class MC extends zl{constructor(t){super(t);this.children=this.createCollection();this.setTemplate({tag:"div",attributes:{class:["ck","ck-toolbar__items"]},children:this.children})}}class VC{constructor(t){const e=t.bindTemplate;t.set("isVertical",false);t.itemsView.children.bindTo(t.items).using((t=>t));t.focusables.bindTo(t.items).using((t=>t));t.extendTemplate({attributes:{class:[e.if("isVertical","ck-toolbar_vertical")]}})}render(){}destroy(){}}class zC{constructor(t){this.resizeObserver=null;this.cachedPadding=null;this.shouldUpdateGroupingOnNextResize=false;this.view=t;this.viewChildren=t.children;this.viewFocusables=t.focusables;this.viewItemsView=t.itemsView;this.viewFocusTracker=t.focusTracker;this.viewLocale=t.locale;this.ungroupedItems=t.createCollection();this.groupedItems=t.createCollection();this.groupedItemsDropdown=this._createGroupedItemsDropdown();t.itemsView.children.bindTo(this.ungroupedItems).using((t=>t));this.ungroupedItems.on("change",this._updateFocusCycleableItems.bind(this));t.children.on("change",this._updateFocusCycleableItems.bind(this));t.items.on("change",((t,e)=>{const n=e.index;const o=Array.from(e.added);for(const t of e.removed){if(n>=this.ungroupedItems.length){this.groupedItems.remove(t)}else{this.ungroupedItems.remove(t)}}for(let t=n;t<n+o.length;t++){const e=o[t-n];if(t>this.ungroupedItems.length){this.groupedItems.add(e,t-this.ungroupedItems.length)}else{this.ungroupedItems.add(e,t)}}this._updateGrouping()}));t.extendTemplate({attributes:{class:["ck-toolbar_grouping"]}})}render(t){this.viewElement=t.element;this._enableGroupingOnResize();this._enableGroupingOnMaxWidthChange(t)}destroy(){this.groupedItemsDropdown.destroy();this.resizeObserver.destroy()}_updateGrouping(){if(!this.viewElement.ownerDocument.body.contains(this.viewElement)){return}if(!vc(this.viewElement)){this.shouldUpdateGroupingOnNextResize=true;return}const t=this.groupedItems.length;let e;while(this._areItemsOverflowing){this._groupLastItem();e=true}if(!e&&this.groupedItems.length){while(this.groupedItems.length&&!this._areItemsOverflowing){this._ungroupFirstItem()}if(this._areItemsOverflowing){this._groupLastItem()}}if(this.groupedItems.length!==t){this.view.fire("groupedItemsUpdate")}}get _areItemsOverflowing(){if(!this.ungroupedItems.length){return false}const t=this.viewElement;const e=this.viewLocale.uiLanguageDirection;const n=new rc(t.lastChild);const o=new rc(t);if(!this.cachedPadding){const n=Qa.window.getComputedStyle(t);const o=e==="ltr"?"paddingRight":"paddingLeft";this.cachedPadding=Number.parseInt(n[o])}if(e==="ltr"){return n.right>o.right-this.cachedPadding}else{return n.left<o.left+this.cachedPadding}}_enableGroupingOnResize(){let t;this.resizeObserver=new pc(this.viewElement,(e=>{if(!t||t!==e.contentRect.width||this.shouldUpdateGroupingOnNextResize){this.shouldUpdateGroupingOnNextResize=false;this._updateGrouping();t=e.contentRect.width}}));this._updateGrouping()}_enableGroupingOnMaxWidthChange(t){t.on("change:maxWidth",(()=>{this._updateGrouping()}))}_groupLastItem(){if(!this.groupedItems.length){this.viewChildren.add(new ku);this.viewChildren.add(this.groupedItemsDropdown);this.viewFocusTracker.add(this.groupedItemsDropdown.element)}this.groupedItems.add(this.ungroupedItems.remove(this.ungroupedItems.last),0)}_ungroupFirstItem(){this.ungroupedItems.add(this.groupedItems.remove(this.groupedItems.first));if(!this.groupedItems.length){this.viewChildren.remove(this.groupedItemsDropdown);this.viewChildren.remove(this.viewChildren.last);this.viewFocusTracker.remove(this.groupedItemsDropdown.element)}}_createGroupedItemsDropdown(){const t=this.viewLocale;const e=t.t;const n=ry(t);n.class="ck-toolbar__grouped-dropdown";n.panelPosition=t.uiLanguageDirection==="ltr"?"sw":"se";sy(n,this.groupedItems);n.buttonView.set({label:e("Show more items"),tooltip:true,tooltipPosition:t.uiLanguageDirection==="rtl"?"se":"sw",icon:IC});return n}_updateFocusCycleableItems(){this.viewFocusables.clear();this.ungroupedItems.map((t=>{this.viewFocusables.add(t)}));if(this.groupedItems.length){this.viewFocusables.add(this.groupedItemsDropdown)}}}var FC=n(179);var NC={injectType:"singletonStyleTag",attributes:{"data-cke":true}};NC.insert="head";NC.singleton=true;var LC=Il()(FC.Z,NC);const HC=FC.Z.locals||{};class jC extends(null&&View){constructor(t){super(t);const e=this.bindTemplate;this.items=this.createCollection();this.focusTracker=new FocusTracker;this.keystrokes=new KeystrokeHandler;this._focusCycler=new FocusCycler({focusables:this.items,focusTracker:this.focusTracker,keystrokeHandler:this.keystrokes,actions:{focusPrevious:"arrowup",focusNext:"arrowdown"}});this.set("ariaLabel",undefined);this.set("role",undefined);this.setTemplate({tag:"ul",attributes:{class:["ck","ck-reset","ck-list"],role:e.to("role"),"aria-label":e.to("ariaLabel")},children:this.items})}render(){super.render();for(const t of this.items){this.focusTracker.add(t.element)}this.items.on("add",((t,e)=>{this.focusTracker.add(e.element)}));this.items.on("remove",((t,e)=>{this.focusTracker.remove(e.element)}));this.keystrokes.listenTo(this.element)}destroy(){super.destroy();this.focusTracker.destroy();this.keystrokes.destroy()}focus(){this._focusCycler.focusFirst()}focusLast(){this._focusCycler.focusLast()}}class qC extends(null&&View){constructor(t){super(t);const e=this.bindTemplate;this.set("isVisible",true);this.children=this.createCollection();this.setTemplate({tag:"li",attributes:{class:["ck","ck-list__item",e.if("isVisible","ck-hidden",(t=>!t))],role:"presentation"},children:this.children})}focus(){this.children.first.focus()}}class $C extends(null&&View){constructor(t){super(t);this.setTemplate({tag:"li",attributes:{class:["ck","ck-list__separator"]}})}}var WC=n(791);var GC={injectType:"singletonStyleTag",attributes:{"data-cke":true}};GC.insert="head";GC.singleton=true;var KC=Il()(WC.Z,GC);const UC=WC.Z.locals||{};class ZC extends zl{constructor(t){super(t);const e=this.bindTemplate;this.set("class",undefined);this.set("labelStyle",undefined);this.set("icon",undefined);this.set("isEnabled",true);this.set("isOn",false);this.set("isToggleable",false);this.set("isVisible",true);this.set("keystroke",undefined);this.set("withKeystroke",false);this.set("label",undefined);this.set("tabindex",-1);this.set("tooltip",false);this.set("tooltipPosition","s");this.set("type","button");this.set("withText",false);this.children=this.createCollection();this.actionView=this._createActionView();this.arrowView=this._createArrowView();this.keystrokes=new pl;this.focusTracker=new fl;this.setTemplate({tag:"div",attributes:{class:["ck","ck-splitbutton",e.to("class"),e.if("isVisible","ck-hidden",(t=>!t)),this.arrowView.bindTemplate.if("isOn","ck-splitbutton_open")]},children:this.children})}render(){super.render();this.children.add(this.actionView);this.children.add(this.arrowView);this.focusTracker.add(this.actionView.element);this.focusTracker.add(this.arrowView.element);this.keystrokes.listenTo(this.element);this.keystrokes.set("arrowright",((t,e)=>{if(this.focusTracker.focusedElement===this.actionView.element){this.arrowView.focus();e()}}));this.keystrokes.set("arrowleft",((t,e)=>{if(this.focusTracker.focusedElement===this.arrowView.element){this.actionView.focus();e()}}))}destroy(){super.destroy();this.focusTracker.destroy();this.keystrokes.destroy()}focus(){this.actionView.focus()}_createActionView(){const t=new Ad;t.bind("icon","isEnabled","isOn","isToggleable","keystroke","label","tabindex","tooltip","tooltipPosition","type","withText").to(this);t.extendTemplate({attributes:{class:"ck-splitbutton__action"}});t.delegate("execute").to(this);return t}_createArrowView(){const t=new Ad;const e=t.bindTemplate;t.icon=pu;t.extendTemplate({attributes:{class:["ck-splitbutton__arrow"],"data-cke-tooltip-disabled":e.to("isOn"),"aria-haspopup":true,"aria-expanded":e.to("isOn",(t=>String(t)))}});t.bind("isEnabled").to(this);t.bind("label").to(this);t.bind("tooltip").to(this);t.delegate("execute").to(this,"open");return t}}function JC({emitter:t,activator:e,callback:n,contextElements:o}){t.listenTo(document,"mousedown",((t,i)=>{if(!e()){return}const r=typeof i.composedPath=="function"?i.composedPath():[];const s=typeof o=="function"?o():o;for(const t of s){if(t.contains(i.target)||r.includes(t)){return}}n()}))}var YC=n(704);var QC={injectType:"singletonStyleTag",attributes:{"data-cke":true}};QC.insert="head";QC.singleton=true;var XC=Il()(YC.Z,QC);const ty=YC.Z.locals||{};var ey=n(883);var ny={injectType:"singletonStyleTag",attributes:{"data-cke":true}};ny.insert="head";ny.singleton=true;var oy=Il()(ey.Z,ny);const iy=ey.Z.locals||{};function ry(t,e=gu){const n=new e(t);const o=new cu(t);const i=new fu(t,n,o);n.bind("isEnabled").to(i);if(n instanceof ZC){n.arrowView.bind("isOn").to(i,"isOpen")}else{n.bind("isOn").to(i,"isOpen")}uy(i);return i}function sy(t,e,n={}){t.extendTemplate({attributes:{class:["ck-toolbar-dropdown"]}});if(t.isOpen){ay(t,e,n)}else{t.once("change:isOpen",(()=>ay(t,e,n)),{priority:"highest"})}if(n.enableActiveItemFocusOnDropdownOpen){dy(t,(()=>t.toolbarView.items.find((t=>t.isOn))))}}function ay(t,e,n){const o=t.locale;const i=o.t;const r=t.toolbarView=new OC(o);const s=typeof e=="function"?e():e;r.ariaLabel=n.ariaLabel||i("Dropdown toolbar");if(n.maxWidth){r.maxWidth=n.maxWidth}if(n.class){r.class=n.class}if(n.isCompact){r.isCompact=n.isCompact}if(n.isVertical){r.isVertical=true}if(s instanceof Tl){r.items.bindTo(s).using((t=>t))}else{r.items.addMany(s)}t.panelView.children.add(r);r.items.delegate("execute").to(t)}function cy(t,e,n={}){if(t.isOpen){ly(t,e,n)}else{t.once("change:isOpen",(()=>ly(t,e,n)),{priority:"highest"})}dy(t,(()=>t.listView.items.find((t=>{if(t instanceof ListItemView){return t.children.first.isOn}return false}))))}function ly(t,e,n){const o=t.locale;const i=t.listView=new ListView(o);const r=typeof e=="function"?e():e;i.ariaLabel=n.ariaLabel;i.role=n.role;i.items.bindTo(r).using((t=>{if(t.type==="separator"){return new ListSeparatorView(o)}else if(t.type==="button"||t.type==="switchbutton"){const e=new ListItemView(o);let n;if(t.type==="button"){n=new ButtonView(o)}else{n=new SwitchButtonView(o)}n.bind(...Object.keys(t.model)).to(t.model);n.delegate("execute").to(e);e.children.add(n);return e}return null}));t.panelView.children.add(i);i.items.delegate("execute").to(t)}function dy(t,e){t.on("change:isOpen",(()=>{if(!t.isOpen){return}const n=e();if(!n){return}if(typeof n.focus==="function"){n.focus()}else{B("ui-dropdown-focus-child-on-open-child-missing-focus",{view:n})}}),{priority:S.low-10})}function uy(t){hy(t);fy(t);py(t);gy(t);my(t);by(t)}function hy(t){t.on("render",(()=>{JC({emitter:t,activator:()=>t.isOpen,callback:()=>{t.isOpen=false},contextElements:()=>[t.element,...t.focusTracker._elements]})}))}function fy(t){t.on("execute",(e=>{if(e.source instanceof Sd){return}t.isOpen=false}))}function py(t){t.focusTracker.on("change:isFocused",((e,n,o)=>{if(t.isOpen&&!o){t.isOpen=false}}))}function gy(t){t.keystrokes.set("arrowdown",((e,n)=>{if(t.isOpen){t.panelView.focus();n()}}));t.keystrokes.set("arrowup",((e,n)=>{if(t.isOpen){t.panelView.focusLast();n()}}))}function my(t){t.on("change:isOpen",((e,n,o)=>{if(o){return}const i=t.panelView.element;if(i&&i.contains(Qa.document.activeElement)){t.buttonView.focus()}}))}function by(t){t.on("change:isOpen",((e,n,o)=>{if(!o){return}t.panelView.focus()}),{priority:"low"})}function ky(t,e,n){const o=new InputTextView(t.locale);o.set({id:e,ariaDescribedById:n});o.bind("isReadOnly").to(t,"isEnabled",(t=>!t));o.bind("hasError").to(t,"errorText",(t=>!!t));o.on("input",(()=>{t.errorText=null}));t.bind("isEmpty","isFocused","placeholder").to(o);return o}function wy(t,e,n){const o=new InputNumberView(t.locale);o.set({id:e,ariaDescribedById:n,inputMode:"numeric"});o.bind("isReadOnly").to(t,"isEnabled",(t=>!t));o.bind("hasError").to(t,"errorText",(t=>!!t));o.on("input",(()=>{t.errorText=null}));t.bind("isEmpty","isFocused","placeholder").to(o);return o}function _y(t,e,n){const o=createDropdown(t.locale);o.set({id:e,ariaDescribedById:n});o.bind("isEnabled").to(t);return o}const vy=(t,e=0,n=1)=>t>n?n:t<e?e:t;const Ay=(t,e=0,n=Math.pow(10,e))=>Math.round(n*t)/n;const Cy={grad:360/400,turn:360,rad:360/(Math.PI*2)};const yy=t=>Wy(xy(t));const xy=t=>{if(t[0]==="#")t=t.substring(1);if(t.length<6){return{r:parseInt(t[0]+t[0],16),g:parseInt(t[1]+t[1],16),b:parseInt(t[2]+t[2],16),a:t.length===4?Ay(parseInt(t[3]+t[3],16)/255,2):1}}return{r:parseInt(t.substring(0,2),16),g:parseInt(t.substring(2,4),16),b:parseInt(t.substring(4,6),16),a:t.length===8?Ay(parseInt(t.substring(6,8),16)/255,2):1}};const Ey=(t,e="deg")=>Number(t)*(Cy[e]||1);const Sy=t=>{const e=/hsla?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i;const n=e.exec(t);if(!n)return{h:0,s:0,v:0,a:1};return Ty({h:Ey(n[1],n[2]),s:Number(n[3]),l:Number(n[4]),a:n[5]===undefined?1:Number(n[5])/(n[6]?100:1)})};const Dy=null&&Sy;const Ty=({h:t,s:e,l:n,a:o})=>{e*=(n<50?n:100-n)/100;return{h:t,s:e>0?2*e/(n+e)*100:0,v:n+e,a:o}};const Py=t=>$y(Vy(t));const By=({h:t,s:e,v:n,a:o})=>{const i=(200-e)*n/100;return{h:Ay(t),s:Ay(i>0&&i<200?e*n/100/(i<=100?i:200-i)*100:0),l:Ay(i/2),a:Ay(o,2)}};const Iy=t=>{const{h:e,s:n,v:o}=Gy(t);return`hsv(${e}, ${n}%, ${o}%)`};const Ry=t=>{const{h:e,s:n,v:o,a:i}=Gy(t);return`hsva(${e}, ${n}%, ${o}%, ${i})`};const Oy=t=>{const{h:e,s:n,l:o}=By(t);return`hsl(${e}, ${n}%, ${o}%)`};const My=t=>{const{h:e,s:n,l:o,a:i}=By(t);return`hsla(${e}, ${n}%, ${o}%, ${i})`};const Vy=({h:t,s:e,v:n,a:o})=>{t=t/360*6;e=e/100;n=n/100;const i=Math.floor(t),r=n*(1-e),s=n*(1-(t-i)*e),a=n*(1-(1-t+i)*e),c=i%6;return{r:Ay([n,s,r,r,a,n][c]*255),g:Ay([a,n,n,s,r,r][c]*255),b:Ay([r,r,a,n,n,s][c]*255),a:Ay(o,2)}};const zy=t=>{const{r:e,g:n,b:o}=Vy(t);return`rgb(${e}, ${n}, ${o})`};const Fy=t=>{const{r:e,g:n,b:o,a:i}=Vy(t);return`rgba(${e}, ${n}, ${o}, ${i})`};const Ny=t=>{const e=/hsva?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i;const n=e.exec(t);if(!n)return{h:0,s:0,v:0,a:1};return Gy({h:Ey(n[1],n[2]),s:Number(n[3]),v:Number(n[4]),a:n[5]===undefined?1:Number(n[5])/(n[6]?100:1)})};const Ly=null&&Ny;const Hy=t=>{const e=/rgba?\(?\s*(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i;const n=e.exec(t);if(!n)return{h:0,s:0,v:0,a:1};return Wy({r:Number(n[1])/(n[2]?100/255:1),g:Number(n[3])/(n[4]?100/255:1),b:Number(n[5])/(n[6]?100/255:1),a:n[7]===undefined?1:Number(n[7])/(n[8]?100:1)})};const jy=null&&Hy;const qy=t=>{const e=t.toString(16);return e.length<2?"0"+e:e};const $y=({r:t,g:e,b:n,a:o})=>{const i=o<1?qy(Ay(o*255)):"";return"#"+qy(t)+qy(e)+qy(n)+i};const Wy=({r:t,g:e,b:n,a:o})=>{const i=Math.max(t,e,n);const r=i-Math.min(t,e,n);const s=r?i===t?(e-n)/r:i===e?2+(n-t)/r:4+(t-e)/r:0;return{h:Ay(60*(s<0?s+6:s)),s:Ay(i?r/i*100:0),v:Ay(i/255*100),a:o}};const Gy=t=>({h:round(t.h),s:round(t.s),v:round(t.v),a:round(t.a,2)});const Ky=({r:t,g:e,b:n})=>({r:t,g:e,b:n});const Uy=({h:t,s:e,l:n})=>({h:t,s:e,l:n});const Zy=t=>{const{h:e,s:n,v:o}=Gy(t);return{h:e,s:n,v:o}};const Jy=(t,e)=>{if(t===e)return true;for(const n in t){if(t[n]!==e[n])return false}return true};const Yy=(t,e)=>t.replace(/\s/g,"")===e.replace(/\s/g,"");const Qy=(t,e)=>{if(t.toLowerCase()===e.toLowerCase())return true;return Jy(xy(t),xy(e))};const Xy={};const tx=t=>{let e=Xy[t];if(!e){e=document.createElement("template");e.innerHTML=t;Xy[t]=e}return e};const ex=(t,e,n)=>{t.dispatchEvent(new CustomEvent(e,{bubbles:true,detail:n}))};let nx=false;const ox=t=>"touches"in t;const ix=t=>{if(nx&&!ox(t))return false;if(!nx)nx=ox(t);return true};const rx=(t,e)=>{const n=ox(e)?e.touches[0]:e;const o=t.el.getBoundingClientRect();ex(t.el,"move",t.getMove({x:vy((n.pageX-(o.left+window.pageXOffset))/o.width),y:vy((n.pageY-(o.top+window.pageYOffset))/o.height)}))};const sx=(t,e)=>{const n=e.keyCode;if(n>40||t.xy&&n<37||n<33)return;e.preventDefault();ex(t.el,"move",t.getMove({x:n===39?.01:n===37?-.01:n===34?.05:n===33?-.05:n===35?1:n===36?-1:0,y:n===40?.01:n===38?-.01:0},true))};class ax{constructor(t,e,n,o){const i=tx(`<div role="slider" tabindex="0" part="${e}" ${n}><div part="${e}-pointer"></div></div>`);t.appendChild(i.content.cloneNode(true));const r=t.querySelector(`[part=${e}]`);r.addEventListener("mousedown",this);r.addEventListener("touchstart",this);r.addEventListener("keydown",this);this.el=r;this.xy=o;this.nodes=[r.firstChild,r]}set dragging(t){const e=t?document.addEventListener:document.removeEventListener;e(nx?"touchmove":"mousemove",this);e(nx?"touchend":"mouseup",this)}handleEvent(t){switch(t.type){case"mousedown":case"touchstart":t.preventDefault();if(!ix(t)||!nx&&t.button!=0)return;this.el.focus();rx(this,t);this.dragging=true;break;case"mousemove":case"touchmove":t.preventDefault();rx(this,t);break;case"mouseup":case"touchend":this.dragging=false;break;case"keydown":sx(this,t);break}}style(t){t.forEach(((t,e)=>{for(const n in t){this.nodes[e].style.setProperty(n,t[n])}}))}}class cx extends ax{constructor(t){super(t,"hue",'aria-label="Hue" aria-valuemin="0" aria-valuemax="360"',false)}update({h:t}){this.h=t;this.style([{left:`${t/360*100}%`,color:Oy({h:t,s:100,v:100,a:1})}]);this.el.setAttribute("aria-valuenow",`${Ay(t)}`)}getMove(t,e){return{h:e?vy(this.h+t.x*360,0,360):360*t.x}}}class lx extends ax{constructor(t){super(t,"saturation",'aria-label="Color"',true)}update(t){this.hsva=t;this.style([{top:`${100-t.v}%`,left:`${t.s}%`,color:Oy(t)},{"background-color":Oy({h:t.h,s:100,v:100,a:1})}]);this.el.setAttribute("aria-valuetext",`Saturation ${Ay(t.s)}%, Brightness ${Ay(t.v)}%`)}getMove(t,e){return{s:e?vy(this.hsva.s+t.x*100,0,100):t.x*100,v:e?vy(this.hsva.v-t.y*100,0,100):Math.round(100-t.y*100)}}}const dx=`:host{display:flex;flex-direction:column;position:relative;width:200px;height:200px;user-select:none;-webkit-user-select:none;cursor:default}:host([hidden]){display:none!important}[role=slider]{position:relative;touch-action:none;user-select:none;-webkit-user-select:none;outline:0}[role=slider]:last-child{border-radius:0 0 8px 8px}[part$=pointer]{position:absolute;z-index:1;box-sizing:border-box;width:28px;height:28px;display:flex;place-content:center center;transform:translate(-50%,-50%);background-color:#fff;border:2px solid #fff;border-radius:50%;box-shadow:0 2px 4px rgba(0,0,0,.2)}[part$=pointer]::after{content:"";width:100%;height:100%;border-radius:inherit;background-color:currentColor}[role=slider]:focus [part$=pointer]{transform:translate(-50%,-50%) scale(1.1)}`;const ux=`[part=hue]{flex:0 0 24px;background:linear-gradient(to right,red 0,#ff0 17%,#0f0 33%,#0ff 50%,#00f 67%,#f0f 83%,red 100%)}[part=hue-pointer]{top:50%;z-index:2}`;const hx=`[part=saturation]{flex-grow:1;border-color:transparent;border-bottom:12px solid #000;border-radius:8px 8px 0 0;background-image:linear-gradient(to top,#000,transparent),linear-gradient(to right,#fff,rgba(255,255,255,0));box-shadow:inset 0 0 0 1px rgba(0,0,0,.05)}[part=saturation-pointer]{z-index:3}`;const fx=Symbol("same");const px=Symbol("color");const gx=Symbol("hsva");const mx=Symbol("update");const bx=Symbol("parts");const kx=Symbol("css");const wx=Symbol("sliders");class _x extends HTMLElement{static get observedAttributes(){return["color"]}get[kx](){return[dx,ux,hx]}get[wx](){return[lx,cx]}get color(){return this[px]}set color(t){if(!this[fx](t)){const e=this.colorModel.toHsva(t);this[mx](e);this[px]=t}}constructor(){super();const t=tx(`<style>${this[kx].join("")}</style>`);const e=this.attachShadow({mode:"open"});e.appendChild(t.content.cloneNode(true));e.addEventListener("move",this);this[bx]=this[wx].map((t=>new t(e)))}connectedCallback(){if(this.hasOwnProperty("color")){const t=this.color;delete this["color"];this.color=t}else if(!this.color){this.color=this.colorModel.defaultColor}}attributeChangedCallback(t,e,n){const o=this.colorModel.fromAttr(n);if(!this[fx](o)){this.color=o}}handleEvent(t){const e=this[gx];const n={...e,...t.detail};this[mx](n);let o;if(!Jy(n,e)&&!this[fx](o=this.colorModel.fromHsva(n))){this[px]=o;ex(this,"color-changed",{value:o})}}[fx](t){return this.color&&this.colorModel.equal(t,this.color)}[mx](t){this[gx]=t;this[bx].forEach((e=>e.update(t)))}}const vx={defaultColor:"#000",toHsva:yy,fromHsva:({h:t,s:e,v:n})=>Py({h:t,s:e,v:n,a:1}),equal:Qy,fromAttr:t=>t};class Ax extends _x{get colorModel(){return vx}}class Cx extends Ax{}customElements.define("hex-color-picker",Cx);var yx=n(257);var xx={injectType:"singletonStyleTag",attributes:{"data-cke":true}};xx.insert="head";xx.singleton=true;var Ex=Il()(yx.Z,xx);const Sx=yx.Z.locals||{};const Dx=150;class Tx extends(null&&View){constructor(t,e={}){super(t);this.set({color:"",_hexColor:""});this.hexInputRow=this._createInputRow();const n=this.createCollection();if(!e.hideInput){n.add(this.hexInputRow)}this.setTemplate({tag:"div",attributes:{class:["ck","ck-color-picker"],tabindex:-1},children:n});this._config=e;this._debounceColorPickerEvent=debounce((t=>{this.set("color",t);this.fire("colorSelected",{color:this.color})}),Dx,{leading:true});this.on("set:color",((t,e,n)=>{t.return=convertColor(n,this._config.format||"hsl")}));this.on("change:color",(()=>{this._hexColor=Px(this.color)}));this.on("change:_hexColor",(()=>{if(document.activeElement!==this.picker){this.picker.setAttribute("color",this._hexColor)}if(Px(this.color)!=Px(this._hexColor)){this.color=this._hexColor}}))}render(){super.render();this.picker=global.document.createElement("hex-color-picker");this.picker.setAttribute("class","hex-color-picker");this.picker.setAttribute("tabindex","-1");this._createSlidersView();if(this.element){if(this.hexInputRow.element){this.element.insertBefore(this.picker,this.hexInputRow.element)}else{this.element.appendChild(this.picker)}const t=document.createElement("style");t.textContent='[role="slider"]:focus [part$="pointer"] {'+"border: 1px solid #fff;"+"outline: 1px solid var(--ck-color-focus-border);"+"box-shadow: 0 0 0 2px #fff;"+"}";this.picker.shadowRoot.appendChild(t)}this.picker.addEventListener("color-changed",(t=>{const e=t;const n=e.detail.value;this._debounceColorPickerEvent(n)}))}focus(){if(!this._config.hideInput&&(env.isGecko||env.isiOS||env.isSafari)){const t=this.hexInputRow.children.get(1);t.focus()}const t=this.slidersView.first;t.focus()}_createSlidersView(){const t=[...this.picker.shadowRoot.children];const e=t.filter((t=>t.getAttribute("role")==="slider"));const n=e.map((t=>{const e=new Bx(t);return e}));this.slidersView=this.createCollection();n.forEach((t=>{this.slidersView.add(t)}))}_createInputRow(){const t=new Ix;const e=this._createColorInput();return new Rx(this.locale,[t,e])}_createColorInput(){const t=new LabeledFieldView(this.locale,createLabeledInputText);const{t:e}=this.locale;t.set({label:e("HEX"),class:"color-picker-hex-input"});t.fieldView.bind("value").to(this,"_hexColor",(e=>{if(t.isFocused){return t.fieldView.value}else{return e.startsWith("#")?e.substring(1):e}}));t.fieldView.on("input",(()=>{const e=t.fieldView.element.value;if(e){const t=e.trim();const n=t.startsWith("#")?t.substring(1):t;const o=[3,4,6,8].includes(n.length)&&/(([0-9a-fA-F]{2}){3,4}|([0-9a-fA-F]){3,4})/.test(n);if(o){this._debounceColorPickerEvent("#"+n)}}}));return t}}function Px(t){let e=convertToHex(t);if(!e){e="#000"}if(e.length===4){e="#"+[e[1],e[1],e[2],e[2],e[3],e[3]].join("")}return e.toLowerCase()}class Bx extends(null&&View){constructor(t){super();this.element=t}focus(){this.element.focus()}}class Ix extends(null&&View){constructor(t){super(t);this.setTemplate({tag:"div",attributes:{class:["ck","ck-color-picker__hash-view"]},children:"#"})}}class Rx extends(null&&View){constructor(t,e){super(t);this.children=this.createCollection(e);this.setTemplate({tag:"div",attributes:{class:["ck","ck-color-picker__row"]},children:this.children})}}class Ox extends(lt(ul)){constructor(t){super(t);this.set("isEmpty",true);this.on("change",(()=>{this.set("isEmpty",this.length===0)}))}add(t,e){if(this.find((e=>e.color===t.color))){return this}return super.add(t,e)}hasColor(t){return!!this.find((e=>e.color===t))}}class Mx extends(null&&View){constructor(t,{colors:e,columns:n,removeButtonLabel:o,documentColorsLabel:i,documentColorsCount:r,colorPickerLabel:s,focusTracker:a,focusables:c}){super(t);const l=this.bindTemplate;this.set("isVisible",true);this.focusTracker=a;this.items=this.createCollection();this.colorDefinitions=e;this.columns=n;this.documentColors=new DocumentColorCollection;this.documentColorsCount=r;this._focusables=c;this._removeButtonLabel=o;this._colorPickerLabel=s;this._documentColorsLabel=i;this.setTemplate({tag:"div",attributes:{class:["ck-color-grids-fragment",l.if("isVisible","ck-hidden",(t=>!t))]},children:this.items});this.removeColorButtonView=this._createRemoveColorButton();this.items.add(this.removeColorButtonView)}updateDocumentColors(t,e){const n=t.document;const o=this.documentColorsCount;this.documentColors.clear();for(const i of n.getRoots()){const n=t.createRangeIn(i);for(const t of n.getItems()){if(t.is("$textProxy")&&t.hasAttribute(e)){this._addColorToDocumentColors(t.getAttribute(e));if(this.documentColors.length>=o){return}}}}}updateSelectedColors(){const t=this.documentColorsGrid;const e=this.staticColorsGrid;const n=this.selectedColor;e.selectedColor=n;if(t){t.selectedColor=n}}render(){super.render();this.staticColorsGrid=this._createStaticColorsGrid();this.items.add(this.staticColorsGrid);if(this.documentColorsCount){const t=Template.bind(this.documentColors,this.documentColors);const e=new LabelView(this.locale);e.text=this._documentColorsLabel;e.extendTemplate({attributes:{class:["ck","ck-color-grid__label",t.if("isEmpty","ck-hidden")]}});this.items.add(e);this.documentColorsGrid=this._createDocumentColorsGrid();this.items.add(this.documentColorsGrid)}this._createColorPickerButton();this._addColorSelectorElementsToFocusTracker();this.focus()}focus(){this.removeColorButtonView.focus()}destroy(){super.destroy()}addColorPickerButton(){if(this.colorPickerButtonView){this.items.add(this.colorPickerButtonView);this.focusTracker.add(this.colorPickerButtonView.element);this._focusables.add(this.colorPickerButtonView)}}_addColorSelectorElementsToFocusTracker(){this.focusTracker.add(this.removeColorButtonView.element);this._focusables.add(this.removeColorButtonView);if(this.staticColorsGrid){this.focusTracker.add(this.staticColorsGrid.element);this._focusables.add(this.staticColorsGrid)}if(this.documentColorsGrid){this.focusTracker.add(this.documentColorsGrid.element);this._focusables.add(this.documentColorsGrid)}}_createColorPickerButton(){this.colorPickerButtonView=new ButtonView;this.colorPickerButtonView.set({label:this._colorPickerLabel,withText:true,icon:colorPaletteIcon,class:"ck-color-selector__color-picker"});this.colorPickerButtonView.on("execute",(()=>{this.fire("colorPicker:show")}))}_createRemoveColorButton(){const t=new ButtonView;t.set({withText:true,icon:removeButtonIcon,label:this._removeButtonLabel});t.class="ck-color-selector__remove-color";t.on("execute",(()=>{this.fire("execute",{value:null,source:"removeColorButton"})}));t.render();return t}_createStaticColorsGrid(){const t=new ColorGridView(this.locale,{colorDefinitions:this.colorDefinitions,columns:this.columns});t.on("execute",((t,e)=>{this.fire("execute",{value:e.value,source:"staticColorsGrid"})}));return t}_createDocumentColorsGrid(){const t=Template.bind(this.documentColors,this.documentColors);const e=new ColorGridView(this.locale,{columns:this.columns});e.extendTemplate({attributes:{class:t.if("isEmpty","ck-hidden")}});e.items.bindTo(this.documentColors).using((t=>{const e=new ColorTileView;e.set({color:t.color,hasBorder:t.options&&t.options.hasBorder});if(t.label){e.set({label:t.label,tooltip:true})}e.on("execute",(()=>{this.fire("execute",{value:t.color,source:"documentColorsGrid"})}));return e}));this.documentColors.on("change:isEmpty",((t,n,o)=>{if(o){e.selectedColor=null}}));return e}_addColorToDocumentColors(t){const e=this.colorDefinitions.find((e=>e.color===t));if(!e){this.documentColors.add({color:t,label:t,options:{hasBorder:false}})}else{this.documentColors.add(Object.assign({},e))}}}class Vx extends(null&&View){constructor(t,{focusTracker:e,focusables:n,keystrokes:o,colorPickerViewConfig:i}){super(t);this.items=this.createCollection();this.focusTracker=e;this.keystrokes=o;this.set("isVisible",false);this.set("selectedColor",undefined);this._focusables=n;this._colorPickerViewConfig=i;const r=this.bindTemplate;const{saveButtonView:s,cancelButtonView:a}=this._createActionButtons();this.saveButtonView=s;this.cancelButtonView=a;this.actionBarView=this._createActionBarView({saveButtonView:s,cancelButtonView:a});this.setTemplate({tag:"div",attributes:{class:["ck-color-picker-fragment",r.if("isVisible","ck-hidden",(t=>!t))]},children:this.items})}render(){super.render();const t=new ColorPickerView(this.locale,{...this._colorPickerViewConfig});this.colorPickerView=t;this.colorPickerView.render();if(this.selectedColor){t.color=this.selectedColor}this.listenTo(this,"change:selectedColor",((e,n,o)=>{t.color=o}));this.items.add(this.colorPickerView);this.items.add(this.actionBarView);this._addColorPickersElementsToFocusTracker();this._stopPropagationOnArrowsKeys();this._executeOnEnterPress();this._executeUponColorChange()}destroy(){super.destroy()}focus(){this.colorPickerView.focus()}_executeOnEnterPress(){this.keystrokes.set("enter",(t=>{if(this.isVisible&&this.focusTracker.focusedElement!==this.cancelButtonView.element){this.fire("execute",{value:this.selectedColor});t.stopPropagation();t.preventDefault()}}))}_stopPropagationOnArrowsKeys(){const t=t=>t.stopPropagation();this.keystrokes.set("arrowright",t);this.keystrokes.set("arrowleft",t);this.keystrokes.set("arrowup",t);this.keystrokes.set("arrowdown",t)}_addColorPickersElementsToFocusTracker(){for(const t of this.colorPickerView.slidersView){this.focusTracker.add(t.element);this._focusables.add(t)}const t=this.colorPickerView.hexInputRow.children.get(1);if(t.element){this.focusTracker.add(t.element);this._focusables.add(t)}this.focusTracker.add(this.saveButtonView.element);this._focusables.add(this.saveButtonView);this.focusTracker.add(this.cancelButtonView.element);this._focusables.add(this.cancelButtonView)}_createActionBarView({saveButtonView:t,cancelButtonView:e}){const n=new View;const o=this.createCollection();o.add(t);o.add(e);n.setTemplate({tag:"div",attributes:{class:["ck","ck-color-selector_action-bar"]},children:o});return n}_createActionButtons(){const t=this.locale;const e=t.t;const n=new ButtonView(t);const o=new ButtonView(t);n.set({icon:checkButtonIcon,class:"ck-button-save",type:"button",withText:false,label:e("Accept")});o.set({icon:cancelButtonIcon,class:"ck-button-cancel",type:"button",withText:false,label:e("Cancel")});n.on("execute",(()=>{this.fire("execute",{source:"colorPickerSaveButton",value:this.selectedColor})}));o.on("execute",(()=>{this.fire("colorPicker:cancel")}));return{saveButtonView:n,cancelButtonView:o}}_executeUponColorChange(){this.colorPickerView.on("colorSelected",((t,e)=>{this.fire("execute",{value:e.color,source:"colorPicker"});this.set("selectedColor",e.color)}))}}var zx=n(306);var Fx={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Fx.insert="head";Fx.singleton=true;var Nx=Il()(zx.Z,Fx);const Lx=zx.Z.locals||{};class Hx extends(null&&View){constructor(t,{colors:e,columns:n,removeButtonLabel:o,documentColorsLabel:i,documentColorsCount:r,colorPickerLabel:s,colorPickerViewConfig:a}){super(t);this.items=this.createCollection();this.focusTracker=new FocusTracker;this.keystrokes=new KeystrokeHandler;this._focusables=new ViewCollection;this._colorPickerViewConfig=a;this._focusCycler=new FocusCycler({focusables:this._focusables,focusTracker:this.focusTracker,keystrokeHandler:this.keystrokes,actions:{focusPrevious:"shift + tab",focusNext:"tab"}});this.colorGridsFragmentView=new ColorGridsFragmentView(t,{colors:e,columns:n,removeButtonLabel:o,documentColorsLabel:i,documentColorsCount:r,colorPickerLabel:s,focusTracker:this.focusTracker,focusables:this._focusables});this.colorPickerFragmentView=new ColorPickerFragmentView(t,{focusables:this._focusables,focusTracker:this.focusTracker,keystrokes:this.keystrokes,colorPickerViewConfig:a});this.set("_isColorGridsFragmentVisible",true);this.set("_isColorPickerFragmentVisible",false);this.set("selectedColor",undefined);this.colorGridsFragmentView.bind("isVisible").to(this,"_isColorGridsFragmentVisible");this.colorPickerFragmentView.bind("isVisible").to(this,"_isColorPickerFragmentVisible");this.on("change:selectedColor",((t,e,n)=>{this.colorGridsFragmentView.set("selectedColor",n);this.colorPickerFragmentView.set("selectedColor",n)}));this.colorGridsFragmentView.on("change:selectedColor",((t,e,n)=>{this.set("selectedColor",n)}));this.colorPickerFragmentView.on("change:selectedColor",((t,e,n)=>{this.set("selectedColor",n)}));this.setTemplate({tag:"div",attributes:{class:["ck","ck-color-selector"]},children:this.items})}render(){super.render();this.keystrokes.listenTo(this.element)}destroy(){super.destroy();this.focusTracker.destroy();this.keystrokes.destroy()}appendUI(){this._appendColorGridsFragment();if(this._colorPickerViewConfig){this._appendColorPickerFragment()}}showColorPickerFragment(){if(!this.colorPickerFragmentView.colorPickerView||this._isColorPickerFragmentVisible){return}this._isColorPickerFragmentVisible=true;this.colorPickerFragmentView.focus();this._isColorGridsFragmentVisible=false}showColorGridsFragment(){if(this._isColorGridsFragmentVisible){return}this._isColorGridsFragmentVisible=true;this.colorGridsFragmentView.focus();this._isColorPickerFragmentVisible=false}focus(){this._focusCycler.focusFirst()}focusLast(){this._focusCycler.focusLast()}updateDocumentColors(t,e){this.colorGridsFragmentView.updateDocumentColors(t,e)}updateSelectedColors(){this.colorGridsFragmentView.updateSelectedColors()}_appendColorGridsFragment(){if(this.items.length){return}this.items.add(this.colorGridsFragmentView);this.colorGridsFragmentView.delegate("execute").to(this);this.colorGridsFragmentView.delegate("colorPicker:show").to(this)}_appendColorPickerFragment(){if(this.items.length===2){return}this.items.add(this.colorPickerFragmentView);if(this.colorGridsFragmentView.colorPickerButtonView){this.colorGridsFragmentView.colorPickerButtonView.on("execute",(()=>{this.showColorPickerFragment()}))}this.colorGridsFragmentView.addColorPickerButton();this.colorPickerFragmentView.delegate("execute").to(this);this.colorPickerFragmentView.delegate("colorPicker:cancel").to(this)}}class jx{constructor(t){this._components=new Map;this.editor=t}*names(){for(const t of this._components.values()){yield t.originalName}}add(t,e){this._components.set(qx(t),{callback:e,originalName:t})}create(t){if(!this.has(t)){throw new P("componentfactory-item-missing",this,{name:t})}return this._components.get(qx(t)).callback(this.editor.locale)}has(t){return this._components.has(qx(t))}}function qx(t){return String(t).toLowerCase()}var $x=n(460);var Wx={injectType:"singletonStyleTag",attributes:{"data-cke":true}};Wx.insert="head";Wx.singleton=true;var Gx=Il()($x.Z,Wx);const Kx=$x.Z.locals||{};const Ux=mc("px");const Zx=Qa.document.body;class Jx extends zl{constructor(t){super(t);const e=this.bindTemplate;this.set("top",0);this.set("left",0);this.set("position","arrow_nw");this.set("isVisible",false);this.set("withArrow",true);this.set("class",undefined);this._pinWhenIsVisibleCallback=null;this.content=this.createCollection();this.setTemplate({tag:"div",attributes:{class:["ck","ck-balloon-panel",e.to("position",(t=>`ck-balloon-panel_${t}`)),e.if("isVisible","ck-balloon-panel_visible"),e.if("withArrow","ck-balloon-panel_with-arrow"),e.to("class")],style:{top:e.to("top",Ux),left:e.to("left",Ux)}},children:this.content})}show(){this.isVisible=true}hide(){this.isVisible=false}attachTo(t){this.show();const e=Jx.defaultPositions;const n=Object.assign({},{element:this.element,positions:[e.southArrowNorth,e.southArrowNorthMiddleWest,e.southArrowNorthMiddleEast,e.southArrowNorthWest,e.southArrowNorthEast,e.northArrowSouth,e.northArrowSouthMiddleWest,e.northArrowSouthMiddleEast,e.northArrowSouthWest,e.northArrowSouthEast,e.viewportStickyNorth],limiter:Zx,fitInViewport:true},t);const o=Jx._getOptimalPosition(n);const i=parseInt(o.left);const r=parseInt(o.top);const s=o.name;const a=o.config||{};const{withArrow:c=true}=a;this.top=r;this.left=i;this.position=s;this.withArrow=c}pin(t){this.unpin();this._pinWhenIsVisibleCallback=()=>{if(this.isVisible){this._startPinning(t)}else{this._stopPinning()}};this._startPinning(t);this.listenTo(this,"change:isVisible",this._pinWhenIsVisibleCallback)}unpin(){if(this._pinWhenIsVisibleCallback){this._stopPinning();this.stopListening(this,"change:isVisible",this._pinWhenIsVisibleCallback);this._pinWhenIsVisibleCallback=null;this.hide()}}_startPinning(t){this.attachTo(t);const e=Yx(t.target);const n=t.limiter?Yx(t.limiter):Zx;this.listenTo(Qa.document,"scroll",((o,i)=>{const r=i.target;const s=e&&r.contains(e);const a=n&&r.contains(n);if(s||a||!e||!n){this.attachTo(t)}}),{useCapture:true});this.listenTo(Qa.window,"resize",(()=>{this.attachTo(t)}))}_stopPinning(){this.stopListening(Qa.document,"scroll");this.stopListening(Qa.window,"resize")}}Jx.arrowSideOffset=25;Jx.arrowHeightOffset=10;Jx.stickyVerticalOffset=20;Jx._getOptimalPosition=Cc;Jx.defaultPositions=Qx();function Yx(t){if(La(t)){return t}if(ec(t)){return t.commonAncestorContainer}if(typeof t=="function"){return Yx(t())}return null}function Qx(t={}){const{sideOffset:e=Jx.arrowSideOffset,heightOffset:n=Jx.arrowHeightOffset,stickyVerticalOffset:o=Jx.stickyVerticalOffset,config:i}=t;return{northWestArrowSouthWest:(t,n)=>({top:r(t,n),left:t.left-e,name:"arrow_sw",...i&&{config:i}}),northWestArrowSouthMiddleWest:(t,n)=>({top:r(t,n),left:t.left-n.width*.25-e,name:"arrow_smw",...i&&{config:i}}),northWestArrowSouth:(t,e)=>({top:r(t,e),left:t.left-e.width/2,name:"arrow_s",...i&&{config:i}}),northWestArrowSouthMiddleEast:(t,n)=>({top:r(t,n),left:t.left-n.width*.75+e,name:"arrow_sme",...i&&{config:i}}),northWestArrowSouthEast:(t,n)=>({top:r(t,n),left:t.left-n.width+e,name:"arrow_se",...i&&{config:i}}),northArrowSouthWest:(t,n)=>({top:r(t,n),left:t.left+t.width/2-e,name:"arrow_sw",...i&&{config:i}}),northArrowSouthMiddleWest:(t,n)=>({top:r(t,n),left:t.left+t.width/2-n.width*.25-e,name:"arrow_smw",...i&&{config:i}}),northArrowSouth:(t,e)=>({top:r(t,e),left:t.left+t.width/2-e.width/2,name:"arrow_s",...i&&{config:i}}),northArrowSouthMiddleEast:(t,n)=>({top:r(t,n),left:t.left+t.width/2-n.width*.75+e,name:"arrow_sme",...i&&{config:i}}),northArrowSouthEast:(t,n)=>({top:r(t,n),left:t.left+t.width/2-n.width+e,name:"arrow_se",...i&&{config:i}}),northEastArrowSouthWest:(t,n)=>({top:r(t,n),left:t.right-e,name:"arrow_sw",...i&&{config:i}}),northEastArrowSouthMiddleWest:(t,n)=>({top:r(t,n),left:t.right-n.width*.25-e,name:"arrow_smw",...i&&{config:i}}),northEastArrowSouth:(t,e)=>({top:r(t,e),left:t.right-e.width/2,name:"arrow_s",...i&&{config:i}}),northEastArrowSouthMiddleEast:(t,n)=>({top:r(t,n),left:t.right-n.width*.75+e,name:"arrow_sme",...i&&{config:i}}),northEastArrowSouthEast:(t,n)=>({top:r(t,n),left:t.right-n.width+e,name:"arrow_se",...i&&{config:i}}),southWestArrowNorthWest:t=>({top:s(t),left:t.left-e,name:"arrow_nw",...i&&{config:i}}),southWestArrowNorthMiddleWest:(t,n)=>({top:s(t),left:t.left-n.width*.25-e,name:"arrow_nmw",...i&&{config:i}}),southWestArrowNorth:(t,e)=>({top:s(t),left:t.left-e.width/2,name:"arrow_n",...i&&{config:i}}),southWestArrowNorthMiddleEast:(t,n)=>({top:s(t),left:t.left-n.width*.75+e,name:"arrow_nme",...i&&{config:i}}),southWestArrowNorthEast:(t,n)=>({top:s(t),left:t.left-n.width+e,name:"arrow_ne",...i&&{config:i}}),southArrowNorthWest:t=>({top:s(t),left:t.left+t.width/2-e,name:"arrow_nw",...i&&{config:i}}),southArrowNorthMiddleWest:(t,n)=>({top:s(t),left:t.left+t.width/2-n.width*.25-e,name:"arrow_nmw",...i&&{config:i}}),southArrowNorth:(t,e)=>({top:s(t),left:t.left+t.width/2-e.width/2,name:"arrow_n",...i&&{config:i}}),southArrowNorthMiddleEast:(t,n)=>({top:s(t),left:t.left+t.width/2-n.width*.75+e,name:"arrow_nme",...i&&{config:i}}),southArrowNorthEast:(t,n)=>({top:s(t),left:t.left+t.width/2-n.width+e,name:"arrow_ne",...i&&{config:i}}),southEastArrowNorthWest:t=>({top:s(t),left:t.right-e,name:"arrow_nw",...i&&{config:i}}),southEastArrowNorthMiddleWest:(t,n)=>({top:s(t),left:t.right-n.width*.25-e,name:"arrow_nmw",...i&&{config:i}}),southEastArrowNorth:(t,e)=>({top:s(t),left:t.right-e.width/2,name:"arrow_n",...i&&{config:i}}),southEastArrowNorthMiddleEast:(t,n)=>({top:s(t),left:t.right-n.width*.75+e,name:"arrow_nme",...i&&{config:i}}),southEastArrowNorthEast:(t,n)=>({top:s(t),left:t.right-n.width+e,name:"arrow_ne",...i&&{config:i}}),westArrowEast:(t,e)=>({top:t.top+t.height/2-e.height/2,left:t.left-e.width-n,name:"arrow_e",...i&&{config:i}}),eastArrowWest:(t,e)=>({top:t.top+t.height/2-e.height/2,left:t.right+n,name:"arrow_w",...i&&{config:i}}),viewportStickyNorth:(t,e,n)=>{if(!t.getIntersection(n)){return null}return{top:n.top+o,left:t.left+t.width/2-e.width/2,name:"arrowless",config:{withArrow:false,...i}}}};function r(t,e){return t.top-e.height-n}function s(t){return t.bottom+n}}var Xx=n(888);var tE={injectType:"singletonStyleTag",attributes:{"data-cke":true}};tE.insert="head";tE.singleton=true;var eE=Il()(Xx.Z,tE);const nE=Xx.Z.locals||{};const oE="ck-tooltip";class iE extends(Ka()){constructor(t){super();this._currentElementWithTooltip=null;this._currentTooltipPosition=null;this._resizeObserver=null;iE._editors.add(t);if(iE._instance){return iE._instance}iE._instance=this;this.tooltipTextView=new zl(t.locale);this.tooltipTextView.set("text","");this.tooltipTextView.setTemplate({tag:"span",attributes:{class:["ck","ck-tooltip__text"]},children:[{text:this.tooltipTextView.bindTemplate.to("text")}]});this.balloonPanelView=new Jx(t.locale);this.balloonPanelView.class=oE;this.balloonPanelView.content.add(this.tooltipTextView);this._pinTooltipDebounced=Xg(this._pinTooltip,600);this.listenTo(Qa.document,"mouseenter",this._onEnterOrFocus.bind(this),{useCapture:true});this.listenTo(Qa.document,"mouseleave",this._onLeaveOrBlur.bind(this),{useCapture:true});this.listenTo(Qa.document,"focus",this._onEnterOrFocus.bind(this),{useCapture:true});this.listenTo(Qa.document,"blur",this._onLeaveOrBlur.bind(this),{useCapture:true});this.listenTo(Qa.document,"scroll",this._onScroll.bind(this),{useCapture:true});this._watchdogExcluded=true}destroy(t){const e=t.ui.view&&t.ui.view.body;iE._editors.delete(t);this.stopListening(t.ui);if(e&&e.has(this.balloonPanelView)){e.remove(this.balloonPanelView)}if(!iE._editors.size){this._unpinTooltip();this.balloonPanelView.destroy();this.stopListening();iE._instance=null}}static getPositioningFunctions(t){const e=iE.defaultBalloonPositions;return{s:[e.southArrowNorth,e.southArrowNorthEast,e.southArrowNorthWest],n:[e.northArrowSouth],e:[e.eastArrowWest],w:[e.westArrowEast],sw:[e.southArrowNorthEast],se:[e.southArrowNorthWest]}[t]}_onEnterOrFocus(t,{target:e}){const n=rE(e);if(!n){return}if(n===this._currentElementWithTooltip){return}this._unpinTooltip();this._pinTooltipDebounced(n,sE(n))}_onLeaveOrBlur(t,{target:e,relatedTarget:n}){if(t.name==="mouseleave"){if(!La(e)){return}if(this._currentElementWithTooltip&&e!==this._currentElementWithTooltip){return}const t=rE(e);const o=rE(n);if(t&&t!==o){this._unpinTooltip()}}else{if(this._currentElementWithTooltip&&e!==this._currentElementWithTooltip){return}this._unpinTooltip()}}_onScroll(t,{target:e}){if(!this._currentElementWithTooltip){return}if(e.contains(this.balloonPanelView.element)&&e.contains(this._currentElementWithTooltip)){return}this._unpinTooltip()}_pinTooltip(t,{text:e,position:n,cssClass:o}){const i=hl(iE._editors.values()).ui.view.body;if(!i.has(this.balloonPanelView)){i.add(this.balloonPanelView)}this.tooltipTextView.text=e;this.balloonPanelView.pin({target:t,positions:iE.getPositioningFunctions(n)});this._resizeObserver=new pc(t,(()=>{if(!vc(t)){this._unpinTooltip()}}));this.balloonPanelView.class=[oE,o].filter((t=>t)).join(" ");for(const t of iE._editors){this.listenTo(t.ui,"update",this._updateTooltipPosition.bind(this),{priority:"low"})}this._currentElementWithTooltip=t;this._currentTooltipPosition=n}_unpinTooltip(){this._pinTooltipDebounced.cancel();this.balloonPanelView.unpin();for(const t of iE._editors){this.stopListening(t.ui,"update")}this._currentElementWithTooltip=null;this._currentTooltipPosition=null;if(this._resizeObserver){this._resizeObserver.destroy()}}_updateTooltipPosition(){if(!vc(this._currentElementWithTooltip)){this._unpinTooltip();return}this.balloonPanelView.pin({target:this._currentElementWithTooltip,positions:iE.getPositioningFunctions(this._currentTooltipPosition)})}}iE.defaultBalloonPositions=Qx({heightOffset:5,sideOffset:13});iE._editors=new Set;iE._instance=null;function rE(t){if(!La(t)){return null}return t.closest("[data-cke-tooltip-text]:not([data-cke-tooltip-disabled])")}function sE(t){return{text:t.dataset.ckeTooltipText,position:t.dataset.ckeTooltipPosition||"s",cssClass:t.dataset.ckeTooltipClass||""}}var aE="Expected a function";function cE(t,e,n){var o=true,i=true;if(typeof t!="function"){throw new TypeError(aE)}if(nt(n)){o="leading"in n?!!n.leading:o;i="trailing"in n?!!n.trailing:i}return Xg(t,e,{leading:o,maxWait:e,trailing:i})}const lE=cE;const dE='<svg xmlns="http://www.w3.org/2000/svg" width="53" height="10" viewBox="0 0 53 10"><path fill="#1C2331" d="M31.724 1.492a15.139 15.139 0 0 0 .045 1.16 2.434 2.434 0 0 0-.687-.34 3.68 3.68 0 0 0-1.103-.166 2.332 2.332 0 0 0-1.14.255 1.549 1.549 0 0 0-.686.87c-.15.41-.225.98-.225 1.712 0 .939.148 1.659.444 2.161.297.503.792.754 1.487.754.452.015.9-.094 1.294-.316.296-.174.557-.4.771-.669l.14.852h1.282V.007h-1.623v1.485ZM31 6.496a1.77 1.77 0 0 1-.494.061.964.964 0 0 1-.521-.127.758.758 0 0 1-.296-.466 3.984 3.984 0 0 1-.093-.992 4.208 4.208 0 0 1 .098-1.052.753.753 0 0 1 .307-.477 1.08 1.08 0 0 1 .55-.122c.233-.004.466.026.69.089l.483.144v2.553c-.11.076-.213.143-.307.2a1.73 1.73 0 0 1-.417.189ZM35.68 0l-.702.004c-.322.002-.482.168-.48.497l.004.581c.002.33.164.493.486.49l.702-.004c.322-.002.481-.167.48-.496L36.165.49c-.002-.33-.164-.493-.486-.491ZM36.145 2.313l-1.612.01.034 5.482 1.613-.01-.035-5.482ZM39.623.79 37.989.8 38 2.306l-.946.056.006 1.009.949-.006.024 2.983c.003.476.143.844.419 1.106.275.26.658.39 1.148.387.132 0 .293-.01.483-.03.19-.02.38-.046.57-.08.163-.028.324-.068.482-.119l-.183-1.095-.702.004a.664.664 0 0 1-.456-.123.553.553 0 0 1-.14-.422l-.016-2.621 1.513-.01-.006-1.064-1.514.01-.01-1.503ZM46.226 2.388c-.41-.184-.956-.274-1.636-.27-.673.004-1.215.101-1.627.29-.402.179-.72.505-.888.91-.18.419-.268.979-.264 1.68.004.688.1 1.24.285 1.655.172.404.495.724.9.894.414.18.957.268 1.63.264.68-.004 1.224-.099 1.632-.284.4-.176.714-.501.878-.905.176-.418.263-.971.258-1.658-.004-.702-.097-1.261-.28-1.677a1.696 1.696 0 0 0-.888-.9Zm-.613 3.607a.77.77 0 0 1-.337.501 1.649 1.649 0 0 1-1.317.009.776.776 0 0 1-.343-.497 4.066 4.066 0 0 1-.105-1.02 4.136 4.136 0 0 1 .092-1.03.786.786 0 0 1 .337-.507 1.59 1.59 0 0 1 1.316-.008.79.79 0 0 1 .344.502c.078.337.113.683.105 1.03.012.343-.019.685-.092 1.02ZM52.114 2.07a2.67 2.67 0 0 0-1.128.278c-.39.191-.752.437-1.072.73l-.157-.846-1.273.008.036 5.572 1.623-.01-.024-3.78c.35-.124.646-.22.887-.286.26-.075.53-.114.8-.118l.45-.003.144-1.546-.286.001ZM22.083 7.426l-1.576-2.532a2.137 2.137 0 0 0-.172-.253 1.95 1.95 0 0 0-.304-.29.138.138 0 0 1 .042-.04 1.7 1.7 0 0 0 .328-.374l1.75-2.71c.01-.015.025-.028.024-.048-.01-.01-.021-.007-.031-.007L20.49 1.17a.078.078 0 0 0-.075.045l-.868 1.384c-.23.366-.46.732-.688 1.099a.108.108 0 0 1-.112.06c-.098-.005-.196-.001-.294-.002-.018 0-.038.006-.055-.007.002-.02.002-.039.005-.058a4.6 4.6 0 0 0 .046-.701V1.203c0-.02-.009-.032-.03-.03h-.033L16.93 1.17c-.084 0-.073-.01-.073.076v6.491c-.001.018.006.028.025.027h1.494c.083 0 .072.007.072-.071v-2.19c0-.055-.003-.11-.004-.166a3.366 3.366 0 0 0-.05-.417h.06c.104 0 .209.002.313-.002a.082.082 0 0 1 .084.05c.535.913 1.07 1.824 1.607 2.736a.104.104 0 0 0 .103.062c.554-.003 1.107-.002 1.66-.002l.069-.003-.019-.032-.188-.304ZM27.112 6.555c-.005-.08-.004-.08-.082-.08h-2.414c-.053 0-.106-.003-.159-.011a.279.279 0 0 1-.246-.209.558.558 0 0 1-.022-.15c0-.382 0-.762-.002-1.143 0-.032.007-.049.042-.044h2.504c.029.003.037-.012.034-.038V3.814c0-.089.013-.078-.076-.078h-2.44c-.07 0-.062.003-.062-.06v-.837c0-.047.004-.093.013-.14a.283.283 0 0 1 .241-.246.717.717 0 0 1 .146-.011h2.484c.024.002.035-.009.036-.033l.003-.038.03-.496c.01-.183.024-.365.034-.548.005-.085.003-.087-.082-.094-.218-.018-.437-.038-.655-.05a17.845 17.845 0 0 0-.657-.026 72.994 72.994 0 0 0-1.756-.016 1.7 1.7 0 0 0-.471.064 1.286 1.286 0 0 0-.817.655c-.099.196-.149.413-.145.633v3.875c0 .072.003.144.011.216a1.27 1.27 0 0 0 .711 1.029c.228.113.48.167.734.158.757-.005 1.515.002 2.272-.042.274-.016.548-.034.82-.053.03-.002.043-.008.04-.041-.008-.104-.012-.208-.019-.312a69.964 69.964 0 0 1-.05-.768ZM16.14 7.415l-.127-1.075c-.004-.03-.014-.04-.044-.037a13.125 13.125 0 0 1-.998.073c-.336.01-.672.02-1.008.016-.116-.001-.233-.014-.347-.039a.746.746 0 0 1-.45-.262c-.075-.1-.132-.211-.167-.33a3.324 3.324 0 0 1-.126-.773 9.113 9.113 0 0 1-.015-.749c0-.285.022-.57.065-.852.023-.158.066-.312.127-.46a.728.728 0 0 1 .518-.443 1.64 1.64 0 0 1 .397-.048c.628-.001 1.255.003 1.882.05.022.001.033-.006.036-.026l.003-.031.06-.55c.019-.177.036-.355.057-.532.004-.034-.005-.046-.04-.056a5.595 5.595 0 0 0-1.213-.21 10.783 10.783 0 0 0-.708-.02c-.24-.003-.48.01-.719.041a3.477 3.477 0 0 0-.625.14 1.912 1.912 0 0 0-.807.497c-.185.2-.33.433-.424.688a4.311 4.311 0 0 0-.24 1.096c-.031.286-.045.572-.042.86-.006.43.024.86.091 1.286.04.25.104.497.193.734.098.279.26.53.473.734.214.205.473.358.756.446.344.11.702.17 1.063.177a8.505 8.505 0 0 0 1.578-.083 6.11 6.11 0 0 0 .766-.18c.03-.008.047-.023.037-.057a.157.157 0 0 1-.003-.025Z"/><path fill="#AFE229" d="M6.016 6.69a1.592 1.592 0 0 0-.614.21c-.23.132-.422.32-.56.546-.044.072-.287.539-.287.539l-.836 1.528.009.006c.038.025.08.046.123.063.127.046.26.07.395.073.505.023 1.011-.007 1.517-.003.29.009.58.002.869-.022a.886.886 0 0 0 .395-.116.962.962 0 0 0 .312-.286c.056-.083.114-.163.164-.249.24-.408.48-.816.718-1.226.075-.128.148-.257.222-.386l.112-.192a1.07 1.07 0 0 0 .153-.518l-1.304.023s-1.258-.005-1.388.01Z"/><path fill="#771BFF" d="m2.848 9.044.76-1.39.184-.352c-.124-.067-.245-.14-.367-.21-.346-.204-.706-.384-1.045-.6a.984.984 0 0 1-.244-.207c-.108-.134-.136-.294-.144-.46-.021-.409-.002-.818-.009-1.227-.003-.195 0-.39.003-.585.004-.322.153-.553.427-.713l.833-.488c.22-.13.44-.257.662-.385.05-.029.105-.052.158-.077.272-.128.519-.047.76.085l.044.028c.123.06.242.125.358.196.318.178.635.357.952.537.095.056.187.117.275.184.194.144.254.35.266.578.016.284.007.569.006.853-.001.28.004.558 0 .838.592-.003 1.259 0 1.259 0l.723-.013c-.003-.292-.007-.584-.007-.876 0-.524.015-1.048-.016-1.571-.024-.42-.135-.8-.492-1.067a5.02 5.02 0 0 0-.506-.339A400.52 400.52 0 0 0 5.94.787C5.722.664 5.513.524 5.282.423 5.255.406 5.228.388 5.2.373 4.758.126 4.305-.026 3.807.21c-.097.046-.197.087-.29.14A699.896 699.896 0 0 0 .783 1.948c-.501.294-.773.717-.778 1.31-.004.36-.009.718-.001 1.077.016.754-.017 1.508.024 2.261.016.304.07.6.269.848.127.15.279.28.448.382.622.4 1.283.734 1.92 1.11l.183.109Z"/></svg>\n';const uE=53;const hE=10;const fE=50;const pE=350;const gE="Powered by";const mE={top:-99999,left:-99999,name:"invalid",config:{withArrow:false}};class bE extends(Ka()){constructor(t){super();this.editor=t;this._balloonView=null;this._lastFocusedEditableElement=null;this._showBalloonThrottled=lE(this._showBalloon.bind(this),50,{leading:true});t.on("ready",this._handleEditorReady.bind(this))}destroy(){const t=this._balloonView;if(t){t.unpin();this._balloonView=null}this._showBalloonThrottled.cancel();this.stopListening()}_handleEditorReady(){const t=this.editor;const e=!!t.config.get("ui.poweredBy.forceVisible");if(!e&&_l(t.config.get("licenseKey"))==="VALID"){return}if(!t.ui.view){return}t.ui.focusTracker.on("change:isFocused",((t,e,n)=>{this._updateLastFocusedEditableElement();if(n){this._showBalloon()}else{this._hideBalloon()}}));t.ui.focusTracker.on("change:focusedElement",((t,e,n)=>{this._updateLastFocusedEditableElement();if(n){this._showBalloon()}}));t.ui.on("update",(()=>{this._showBalloonThrottled()}))}_createBalloonView(){const t=this.editor;const e=this._balloonView=new Jx;const n=CE(t);const o=new kE(t.locale,n.label);e.content.add(o);e.set({class:"ck-powered-by-balloon"});t.ui.view.body.add(e);t.ui.focusTracker.add(e.element);this._balloonView=e}_showBalloon(){if(!this._lastFocusedEditableElement){return}const t=wE(this.editor,this._lastFocusedEditableElement);if(t){if(!this._balloonView){this._createBalloonView()}this._balloonView.pin(t)}}_hideBalloon(){if(this._balloonView){this._balloonView.unpin()}}_updateLastFocusedEditableElement(){const t=this.editor;const e=t.ui.focusTracker.isFocused;const n=t.ui.focusTracker.focusedElement;if(!e||!n){this._lastFocusedEditableElement=null;return}const o=Array.from(t.ui.getEditableElementsNames()).map((e=>t.ui.getEditableElement(e)));if(o.includes(n)){this._lastFocusedEditableElement=n}else{this._lastFocusedEditableElement=o[0]}}}class kE extends zl{constructor(t,e){super(t);const n=new bd;const o=this.bindTemplate;n.set({content:dE,isColorInherited:false});n.extendTemplate({attributes:{style:{width:uE+"px",height:hE+"px"}}});this.setTemplate({tag:"div",attributes:{class:["ck","ck-powered-by"],"aria-hidden":true},children:[{tag:"a",attributes:{href:"https://ckeditor.com/?utm_source=ckeditor&"+"utm_medium=referral&utm_campaign=701Dn000000hVgmIAE_powered_by_ckeditor_logo",target:"_blank",tabindex:"-1"},children:[...e?[{tag:"span",attributes:{class:["ck","ck-powered-by__label"]},children:[e]}]:[],n],on:{dragstart:o.to((t=>t.preventDefault()))}}]})}}function wE(t,e){const n=CE(t);const o=n.side==="right"?_E(e,n):vE(e,n);return{target:e,positions:[o]}}function _E(t,e){return AE(t,e,((t,n)=>t.left+t.width-n.width-e.horizontalOffset))}function vE(t,e){return AE(t,e,(t=>t.left+e.horizontalOffset))}function AE(t,e,n){return(o,i)=>{const r=o.getVisible();if(!r){return mE}if(o.width<pE||o.height<fE){return mE}let s;if(e.position==="inside"){s=o.bottom-i.height}else{s=o.bottom-i.height/2}s-=e.verticalOffset;const a=n(o,i);if(e.position==="inside"){const t=i.clone().moveTo(a,s);if(t.getIntersectionArea(r)<t.getArea()){return mE}}else{const n=Xa(t);if(n){const t=new rc(n);const s=r.bottom+i.height/2>t.bottom;const a=e.side==="left"?o.left<t.left:o.right>t.right;if(s||a){return mE}}}return{top:s,left:a,name:`position_${e.position}-side_${e.side}`,config:{withArrow:false}}}}function CE(t){const e=t.config.get("ui.poweredBy");const n=e&&e.position||"border";return{position:n,label:gE,verticalOffset:n==="inside"?5:0,horizontalOffset:5,side:t.locale.contentLanguageDirection==="ltr"?"right":"left",...e}}class yE extends(lt()){constructor(t){super();this.isReady=false;this._editableElementsMap=new Map;this._focusableToolbarDefinitions=[];const e=t.editing.view;this.editor=t;this.componentFactory=new jx(t);this.focusTracker=new fl;this.tooltipManager=new iE(t);this.poweredBy=new bE(t);this.set("viewportOffset",this._readViewportOffsetFromConfig());this.once("ready",(()=>{this.isReady=true}));this.listenTo(e.document,"layoutChanged",this.update.bind(this));this.listenTo(e,"scrollToTheSelection",this._handleScrollToTheSelection.bind(this));this._initFocusTracking()}get element(){return null}update(){this.fire("update")}destroy(){this.stopListening();this.focusTracker.destroy();this.tooltipManager.destroy(this.editor);this.poweredBy.destroy();for(const t of this._editableElementsMap.values()){t.ckeditorInstance=null;this.editor.keystrokes.stopListening(t)}this._editableElementsMap=new Map;this._focusableToolbarDefinitions=[]}setEditableElement(t,e){this._editableElementsMap.set(t,e);if(!e.ckeditorInstance){e.ckeditorInstance=this.editor}this.focusTracker.add(e);const n=()=>{if(this.editor.editing.view.getDomRoot(t)){return}this.editor.keystrokes.listenTo(e)};if(this.isReady){n()}else{this.once("ready",n)}}removeEditableElement(t){const e=this._editableElementsMap.get(t);if(!e){return}this._editableElementsMap.delete(t);this.editor.keystrokes.stopListening(e);this.focusTracker.remove(e);e.ckeditorInstance=null}getEditableElement(t="main"){return this._editableElementsMap.get(t)}getEditableElementsNames(){return this._editableElementsMap.keys()}addToolbar(t,e={}){if(t.isRendered){this.focusTracker.add(t.element);this.editor.keystrokes.listenTo(t.element)}else{t.once("render",(()=>{this.focusTracker.add(t.element);this.editor.keystrokes.listenTo(t.element)}))}this._focusableToolbarDefinitions.push({toolbarView:t,options:e})}get _editableElements(){console.warn("editor-ui-deprecated-editable-elements: "+"The EditorUI#_editableElements property has been deprecated and will be removed in the near future.",{editorUI:this});return this._editableElementsMap}_readViewportOffsetFromConfig(){const t=this.editor;const e=t.config.get("ui.viewportOffset");if(e){return e}const n=t.config.get("toolbar.viewportTopOffset");if(n){console.warn("editor-ui-deprecated-viewport-offset-config: "+"The `toolbar.vieportTopOffset` configuration option is deprecated. "+"It will be removed from future CKEditor versions. Use `ui.viewportOffset.top` instead.");return{top:n}}return{top:0}}_initFocusTracking(){const t=this.editor;const e=t.editing.view;let n;let o;t.keystrokes.set("Alt+F10",((t,i)=>{const r=this.focusTracker.focusedElement;if(Array.from(this._editableElementsMap.values()).includes(r)&&!Array.from(e.domRoots.values()).includes(r)){n=r}const s=this._getCurrentFocusedToolbarDefinition();if(!s||!o){o=this._getFocusableCandidateToolbarDefinitions()}for(let t=0;t<o.length;t++){const t=o.shift();o.push(t);if(t!==s&&this._focusFocusableCandidateToolbar(t)){if(s&&s.options.afterBlur){s.options.afterBlur()}break}}i()}));t.keystrokes.set("Esc",((e,o)=>{const i=this._getCurrentFocusedToolbarDefinition();if(!i){return}if(n){n.focus();n=null}else{t.editing.view.focus()}if(i.options.afterBlur){i.options.afterBlur()}o()}))}_getFocusableCandidateToolbarDefinitions(){const t=[];for(const e of this._focusableToolbarDefinitions){const{toolbarView:n,options:o}=e;if(vc(n.element)||o.beforeFocus){t.push(e)}}t.sort(((t,e)=>xE(t)-xE(e)));return t}_getCurrentFocusedToolbarDefinition(){for(const t of this._focusableToolbarDefinitions){if(t.toolbarView.element&&t.toolbarView.element.contains(this.focusTracker.focusedElement)){return t}}return null}_focusFocusableCandidateToolbar(t){const{toolbarView:e,options:{beforeFocus:n}}=t;if(n){n()}if(!vc(e.element)){return false}e.focus();return true}_handleScrollToTheSelection(t,e){const n={top:0,bottom:0,left:0,right:0,...this.viewportOffset};e.viewportOffset.top+=n.top;e.viewportOffset.bottom+=n.bottom;e.viewportOffset.left+=n.left;e.viewportOffset.right+=n.right}}function xE(t){const{toolbarView:e,options:n}=t;let o=10;if(vc(e.element)){o--}if(n.isContextual){o--}return o}var EE=n(847);var SE={injectType:"singletonStyleTag",attributes:{"data-cke":true}};SE.insert="head";SE.singleton=true;var DE=Il()(EE.Z,SE);const TE=EE.Z.locals||{};class PE extends zl{constructor(t){super(t);this.body=new hd(t)}render(){super.render();this.body.attachToDom()}destroy(){this.body.detachFromDom();return super.destroy()}}class BE extends PE{constructor(t){super(t);this.top=this.createCollection();this.main=this.createCollection();this._voiceLabelView=this._createVoiceLabel();this.setTemplate({tag:"div",attributes:{class:["ck","ck-reset","ck-editor","ck-rounded-corners"],role:"application",dir:t.uiLanguageDirection,lang:t.uiLanguage,"aria-labelledby":this._voiceLabelView.id},children:[this._voiceLabelView,{tag:"div",attributes:{class:["ck","ck-editor__top","ck-reset_all"],role:"presentation"},children:this.top},{tag:"div",attributes:{class:["ck","ck-editor__main"],role:"presentation"},children:this.main}]})}_createVoiceLabel(){const t=this.t;const e=new Ud;e.text=t("Rich Text Editor");e.extendTemplate({attributes:{class:"ck-voice-label"}});return e}}class IE extends zl{constructor(t,e,n){super(t);this.name=null;this.setTemplate({tag:"div",attributes:{class:["ck","ck-content","ck-editor__editable","ck-rounded-corners"],lang:t.contentLanguage,dir:t.contentLanguageDirection}});this.set("isFocused",false);this._editableElement=n;this._hasExternalElement=!!this._editableElement;this._editingView=e}render(){super.render();if(this._hasExternalElement){this.template.apply(this.element=this._editableElement)}else{this._editableElement=this.element}this.on("change:isFocused",(()=>this._updateIsFocusedClasses()));this._updateIsFocusedClasses()}destroy(){if(this._hasExternalElement){this.template.revert(this._editableElement)}super.destroy()}get hasExternalElement(){return this._hasExternalElement}_updateIsFocusedClasses(){const t=this._editingView;if(t.isRenderingInProgress){n(this)}else{e(this)}function e(e){t.change((n=>{const o=t.document.getRoot(e.name);n.addClass(e.isFocused?"ck-focused":"ck-blurred",o);n.removeClass(e.isFocused?"ck-blurred":"ck-focused",o)}))}function n(o){t.once("change:isRenderingInProgress",((t,i,r)=>{if(!r){e(o)}else{n(o)}}))}}}class RE extends IE{constructor(t,e,n,o={}){super(t,e,n);const i=t.t;this.extendTemplate({attributes:{role:"textbox",class:"ck-editor__editable_inline"}});this._generateLabel=o.label||(()=>i("Editor editing area: %0",this.name))}render(){super.render();const t=this._editingView;t.change((e=>{const n=t.document.getRoot(this.name);e.setAttribute("aria-label",this._generateLabel(this),n)}))}}var OE=n(668);var ME={injectType:"singletonStyleTag",attributes:{"data-cke":true}};ME.insert="head";ME.singleton=true;var VE=Il()(OE.Z,ME);const zE=OE.Z.locals||{};class FE extends(null&&View){constructor(t,e={}){super(t);const n=this.bindTemplate;this.set("label",e.label||"");this.set("class",e.class||null);this.children=this.createCollection();this.setTemplate({tag:"div",attributes:{class:["ck","ck-form__header",n.to("class")]},children:this.children});const o=new View(t);o.setTemplate({tag:"h2",attributes:{class:["ck","ck-form__header__label"]},children:[{text:n.to("label")}]});this.children.add(o)}}class NE extends(null&&View){constructor(t){super(t);const e=this.bindTemplate;this.setTemplate({tag:"iframe",attributes:{class:["ck","ck-reset_all"],sandbox:"allow-same-origin allow-scripts"},on:{load:e.to("loaded")}})}render(){return new Promise((t=>{this.on("loaded",t);return super.render()}))}}class LE extends(null&&ContextPlugin){static get pluginName(){return"Notification"}init(){this.on("show:warning",((t,e)=>{window.alert(e.message)}),{priority:"lowest"})}showSuccess(t,e={}){this._showNotification({message:t,type:"success",namespace:e.namespace,title:e.title})}showInfo(t,e={}){this._showNotification({message:t,type:"info",namespace:e.namespace,title:e.title})}showWarning(t,e={}){this._showNotification({message:t,type:"warning",namespace:e.namespace,title:e.title})}_showNotification(t){const e=t.namespace?`show:${t.type}:${t.namespace}`:`show:${t.type}`;this.fire(e,{message:t.message,type:t.type,title:t.title||""})}}class HE extends(lt()){constructor(t,e){super();if(e){Pg(this,e)}if(t){this.set(t)}}}var jE=n(592);var qE={injectType:"singletonStyleTag",attributes:{"data-cke":true}};qE.insert="head";qE.singleton=true;var $E=Il()(jE.Z,qE);const WE=jE.Z.locals||{};var GE=n(356);var KE={injectType:"singletonStyleTag",attributes:{"data-cke":true}};KE.insert="head";KE.singleton=true;var UE=Il()(GE.Z,KE);const ZE=GE.Z.locals||{};const JE=mc("px");class YE extends(null&&Plugin){static get pluginName(){return"ContextualBalloon"}constructor(t){super(t);this._viewToStack=new Map;this._idToStack=new Map;this._view=null;this._rotatorView=null;this._fakePanelsView=null;this.positionLimiter=()=>{const t=this.editor.editing.view;const e=t.document;const n=e.selection.editableElement;if(n){return t.domConverter.mapViewToDom(n.root)}return null};this.set("visibleView",null);this.set("_numberOfStacks",0);this.set("_singleViewMode",false)}destroy(){super.destroy();if(this._view){this._view.destroy()}if(this._rotatorView){this._rotatorView.destroy()}if(this._fakePanelsView){this._fakePanelsView.destroy()}}get view(){if(!this._view){this._createPanelView()}return this._view}hasView(t){return Array.from(this._viewToStack.keys()).includes(t)}add(t){if(!this._view){this._createPanelView()}if(this.hasView(t.view)){throw new CKEditorError("contextualballoon-add-view-exist",[this,t])}const e=t.stackId||"main";if(!this._idToStack.has(e)){this._idToStack.set(e,new Map([[t.view,t]]));this._viewToStack.set(t.view,this._idToStack.get(e));this._numberOfStacks=this._idToStack.size;if(!this._visibleStack||t.singleViewMode){this.showStack(e)}return}const n=this._idToStack.get(e);if(t.singleViewMode){this.showStack(e)}n.set(t.view,t);this._viewToStack.set(t.view,n);if(n===this._visibleStack){this._showView(t)}}remove(t){if(!this.hasView(t)){throw new CKEditorError("contextualballoon-remove-view-not-exist",[this,t])}const e=this._viewToStack.get(t);if(this._singleViewMode&&this.visibleView===t){this._singleViewMode=false}if(this.visibleView===t){if(e.size===1){if(this._idToStack.size>1){this._showNextStack()}else{this.view.hide();this.visibleView=null;this._rotatorView.hideView()}}else{this._showView(Array.from(e.values())[e.size-2])}}if(e.size===1){this._idToStack.delete(this._getStackId(e));this._numberOfStacks=this._idToStack.size}else{e.delete(t)}this._viewToStack.delete(t)}updatePosition(t){if(t){this._visibleStack.get(this.visibleView).position=t}this.view.pin(this._getBalloonPosition());this._fakePanelsView.updatePosition()}showStack(t){this.visibleStack=t;const e=this._idToStack.get(t);if(!e){throw new CKEditorError("contextualballoon-showstack-stack-not-exist",this)}if(this._visibleStack===e){return}this._showView(Array.from(e.values()).pop())}_createPanelView(){this._view=new BalloonPanelView(this.editor.locale);this.editor.ui.view.body.add(this._view);this.editor.ui.focusTracker.add(this._view.element);this._rotatorView=this._createRotatorView();this._fakePanelsView=this._createFakePanelsView()}get _visibleStack(){return this._viewToStack.get(this.visibleView)}_getStackId(t){const e=Array.from(this._idToStack.entries()).find((e=>e[1]===t));return e[0]}_showNextStack(){const t=Array.from(this._idToStack.values());let e=t.indexOf(this._visibleStack)+1;if(!t[e]){e=0}this.showStack(this._getStackId(t[e]))}_showPrevStack(){const t=Array.from(this._idToStack.values());let e=t.indexOf(this._visibleStack)-1;if(!t[e]){e=t.length-1}this.showStack(this._getStackId(t[e]))}_createRotatorView(){const t=new QE(this.editor.locale);const e=this.editor.locale.t;this.view.content.add(t);t.bind("isNavigationVisible").to(this,"_numberOfStacks",this,"_singleViewMode",((t,e)=>!e&&t>1));t.on("change:isNavigationVisible",(()=>this.updatePosition()),{priority:"low"});t.bind("counter").to(this,"visibleView",this,"_numberOfStacks",((t,n)=>{if(n<2){return""}const o=Array.from(this._idToStack.values()).indexOf(this._visibleStack)+1;return e("%0 of %1",[o,n])}));t.buttonNextView.on("execute",(()=>{if(t.focusTracker.isFocused){this.editor.editing.view.focus()}this._showNextStack()}));t.buttonPrevView.on("execute",(()=>{if(t.focusTracker.isFocused){this.editor.editing.view.focus()}this._showPrevStack()}));return t}_createFakePanelsView(){const t=new XE(this.editor.locale,this.view);t.bind("numberOfPanels").to(this,"_numberOfStacks",this,"_singleViewMode",((t,e)=>{const n=!e&&t>=2;return n?Math.min(t-1,2):0}));t.listenTo(this.view,"change:top",(()=>t.updatePosition()));t.listenTo(this.view,"change:left",(()=>t.updatePosition()));this.editor.ui.view.body.add(t);return t}_showView({view:t,balloonClassName:e="",withArrow:n=true,singleViewMode:o=false}){this.view.class=e;this.view.withArrow=n;this._rotatorView.showView(t);this.visibleView=t;this.view.pin(this._getBalloonPosition());this._fakePanelsView.updatePosition();if(o){this._singleViewMode=true}}_getBalloonPosition(){let t=Array.from(this._visibleStack.values()).pop().position;if(t){if(!t.limiter){t=Object.assign({},t,{limiter:this.positionLimiter})}t=Object.assign({},t,{viewportOffsetConfig:this.editor.ui.viewportOffset})}return t}}class QE extends(null&&View){constructor(t){super(t);const e=t.t;const n=this.bindTemplate;this.set("isNavigationVisible",true);this.focusTracker=new FocusTracker;this.buttonPrevView=this._createButtonView(e("Previous"),prevIcon);this.buttonNextView=this._createButtonView(e("Next"),nextIcon);this.content=this.createCollection();this.setTemplate({tag:"div",attributes:{class:["ck","ck-balloon-rotator"],"z-index":"-1"},children:[{tag:"div",attributes:{class:["ck-balloon-rotator__navigation",n.to("isNavigationVisible",(t=>t?"":"ck-hidden"))]},children:[this.buttonPrevView,{tag:"span",attributes:{class:["ck-balloon-rotator__counter"]},children:[{text:n.to("counter")}]},this.buttonNextView]},{tag:"div",attributes:{class:"ck-balloon-rotator__content"},children:this.content}]})}render(){super.render();this.focusTracker.add(this.element)}destroy(){super.destroy();this.focusTracker.destroy()}showView(t){this.hideView();this.content.add(t)}hideView(){this.content.clear()}_createButtonView(t,e){const n=new ButtonView(this.locale);n.set({label:t,icon:e,tooltip:true});return n}}class XE extends(null&&View){constructor(t,e){super(t);const n=this.bindTemplate;this.set("top",0);this.set("left",0);this.set("height",0);this.set("width",0);this.set("numberOfPanels",0);this.content=this.createCollection();this._balloonPanelView=e;this.setTemplate({tag:"div",attributes:{class:["ck-fake-panel",n.to("numberOfPanels",(t=>t?"":"ck-hidden"))],style:{top:n.to("top",JE),left:n.to("left",JE),width:n.to("width",JE),height:n.to("height",JE)}},children:this.content});this.on("change:numberOfPanels",((t,e,n,o)=>{if(n>o){this._addPanels(n-o)}else{this._removePanels(o-n)}this.updatePosition()}))}_addPanels(t){while(t--){const t=new View;t.setTemplate({tag:"div"});this.content.add(t);this.registerChild(t)}}_removePanels(t){while(t--){const t=this.content.last;this.content.remove(t);this.deregisterChild(t);t.destroy()}}updatePosition(){if(this.numberOfPanels){const{top:t,left:e}=this._balloonPanelView;const{width:n,height:o}=new Rect(this._balloonPanelView.element);Object.assign(this,{top:t,left:e,width:n,height:o})}}}var tS=n(707);var eS={injectType:"singletonStyleTag",attributes:{"data-cke":true}};eS.insert="head";eS.singleton=true;var nS=Il()(tS.Z,eS);const oS=tS.Z.locals||{};const iS=mc("px");class rS extends zl{constructor(t){super(t);const e=this.bindTemplate;this.set("isActive",false);this.set("isSticky",false);this.set("limiterElement",null);this.set("limiterBottomOffset",50);this.set("viewportTopOffset",0);this.set("_marginLeft",null);this.set("_isStickyToTheBottomOfLimiter",false);this.set("_stickyTopOffset",null);this.set("_stickyBottomOffset",null);this.content=this.createCollection();this._contentPanelPlaceholder=new Nl({tag:"div",attributes:{class:["ck","ck-sticky-panel__placeholder"],style:{display:e.to("isSticky",(t=>t?"block":"none")),height:e.to("isSticky",(t=>t?iS(this._contentPanelRect.height):null))}}}).render();this._contentPanel=new Nl({tag:"div",attributes:{class:["ck","ck-sticky-panel__content",e.if("isSticky","ck-sticky-panel__content_sticky"),e.if("_isStickyToTheBottomOfLimiter","ck-sticky-panel__content_sticky_bottom-limit")],style:{width:e.to("isSticky",(t=>t?iS(this._contentPanelPlaceholder.getBoundingClientRect().width):null)),top:e.to("_stickyTopOffset",(t=>t?iS(t):t)),bottom:e.to("_stickyBottomOffset",(t=>t?iS(t):t)),marginLeft:e.to("_marginLeft")}},children:this.content}).render();this.setTemplate({tag:"div",attributes:{class:["ck","ck-sticky-panel"]},children:[this._contentPanelPlaceholder,this._contentPanel]})}render(){super.render();this.checkIfShouldBeSticky();this.listenTo(Qa.document,"scroll",((t,e)=>{this.checkIfShouldBeSticky(e.target)}),{useCapture:true});this.listenTo(this,"change:isActive",(()=>{this.checkIfShouldBeSticky()}))}checkIfShouldBeSticky(t){if(!this.limiterElement||!this.isActive){this._unstick();return}const e=hc(this.limiterElement);if(t&&!e.includes(t)){return}const n=uc(e,this.viewportTopOffset);const o=new rc(this.limiterElement);if(n&&o.top<n.top){const t=o.getIntersection(n);if(t){const e=n.top;if(e+this._contentPanelRect.height+this.limiterBottomOffset>t.bottom){const t=Math.max(o.bottom-n.bottom,0)+this.limiterBottomOffset;if(o.bottom-t>o.top+this._contentPanelRect.height){this._stickToBottomOfLimiter(t)}else{this._unstick()}}else{if(this._contentPanelRect.height+this.limiterBottomOffset<o.height){this._stickToTopOfAncestors(e)}else{this._unstick()}}}else{this._unstick()}}else{this._unstick()}}_stickToTopOfAncestors(t){this.isSticky=true;this._isStickyToTheBottomOfLimiter=false;this._stickyTopOffset=t;this._stickyBottomOffset=null;this._marginLeft=iS(-Qa.window.scrollX)}_stickToBottomOfLimiter(t){this.isSticky=true;this._isStickyToTheBottomOfLimiter=true;this._stickyTopOffset=null;this._stickyBottomOffset=t;this._marginLeft=iS(-Qa.window.scrollX)}_unstick(){this.isSticky=false;this._isStickyToTheBottomOfLimiter=false;this._stickyTopOffset=null;this._stickyBottomOffset=null;this._marginLeft=null}get _contentPanelRect(){return new rc(this._contentPanel)}}const sS=mc("px");class aS extends(null&&Plugin){static get pluginName(){return"BalloonToolbar"}static get requires(){return[ContextualBalloon]}constructor(t){super(t);this._resizeObserver=null;this._balloonConfig=normalizeToolbarConfig(t.config.get("balloonToolbar"));this.toolbarView=this._createToolbarView();this.focusTracker=new FocusTracker;t.ui.once("ready",(()=>{this.focusTracker.add(t.ui.getEditableElement());this.focusTracker.add(this.toolbarView.element)}));t.ui.addToolbar(this.toolbarView,{beforeFocus:()=>this.show(true),afterBlur:()=>this.hide(),isContextual:true});this._balloon=t.plugins.get(ContextualBalloon);this._fireSelectionChangeDebounced=debounce((()=>this.fire("_selectionChangeDebounced")),200);this.decorate("show")}init(){const t=this.editor;const e=t.model.document.selection;this.listenTo(this.focusTracker,"change:isFocused",((t,e,n)=>{const o=this._balloon.visibleView===this.toolbarView;if(!n&&o){this.hide()}else if(n){this.show()}}));this.listenTo(e,"change:range",((t,n)=>{if(n.directChange||e.isCollapsed){this.hide()}this._fireSelectionChangeDebounced()}));this.listenTo(this,"_selectionChangeDebounced",(()=>{if(this.editor.editing.view.document.isFocused){this.show()}}));if(!this._balloonConfig.shouldNotGroupWhenFull){this.listenTo(t,"ready",(()=>{const e=t.ui.view.editable.element;this._resizeObserver=new ResizeObserver(e,(t=>{this.toolbarView.maxWidth=sS(t.contentRect.width*.9)}))}))}this.listenTo(this.toolbarView,"groupedItemsUpdate",(()=>{this._updatePosition()}))}afterInit(){const t=this.editor.ui.componentFactory;this.toolbarView.fillFromConfig(this._balloonConfig,t)}_createToolbarView(){const t=this.editor.locale.t;const e=!this._balloonConfig.shouldNotGroupWhenFull;const n=new ToolbarView(this.editor.locale,{shouldGroupWhenFull:e,isFloating:true});n.ariaLabel=t("Editor contextual toolbar");n.render();return n}show(t=false){const e=this.editor;const n=e.model.document.selection;const o=e.model.schema;if(this._balloon.hasView(this.toolbarView)){return}if(n.isCollapsed&&!t){return}if(cS(n,o)){return}if(Array.from(this.toolbarView.items).every((t=>t.isEnabled!==undefined&&!t.isEnabled))){return}this.listenTo(this.editor.ui,"update",(()=>{this._updatePosition()}));this._balloon.add({view:this.toolbarView,position:this._getBalloonPositionData(),balloonClassName:"ck-toolbar-container"})}hide(){if(this._balloon.hasView(this.toolbarView)){this.stopListening(this.editor.ui,"update");this._balloon.remove(this.toolbarView)}}_getBalloonPositionData(){const t=this.editor;const e=t.editing.view;const n=e.document;const o=n.selection;const i=n.selection.isBackward;return{target:()=>{const t=i?o.getFirstRange():o.getLastRange();const n=Rect.getDomRangeRects(e.domConverter.viewRangeToDom(t));if(i){return n[0]}else{if(n.length>1&&n[n.length-1].width===0){n.pop()}return n[n.length-1]}},positions:this._getBalloonPositions(i)}}_updatePosition(){this._balloon.updatePosition(this._getBalloonPositionData())}destroy(){super.destroy();this.stopListening();this._fireSelectionChangeDebounced.cancel();this.toolbarView.destroy();this.focusTracker.destroy();if(this._resizeObserver){this._resizeObserver.destroy()}}_getBalloonPositions(t){const e=env.isSafari&&env.isiOS;const n=e?generatePositions({heightOffset:Math.max(BalloonPanelView.arrowHeightOffset,Math.round(20/global.window.visualViewport.scale))}):BalloonPanelView.defaultPositions;return t?[n.northWestArrowSouth,n.northWestArrowSouthWest,n.northWestArrowSouthEast,n.northWestArrowSouthMiddleEast,n.northWestArrowSouthMiddleWest,n.southWestArrowNorth,n.southWestArrowNorthWest,n.southWestArrowNorthEast,n.southWestArrowNorthMiddleWest,n.southWestArrowNorthMiddleEast]:[n.southEastArrowNorth,n.southEastArrowNorthEast,n.southEastArrowNorthWest,n.southEastArrowNorthMiddleEast,n.southEastArrowNorthMiddleWest,n.northEastArrowSouth,n.northEastArrowSouthEast,n.northEastArrowSouthWest,n.northEastArrowSouthMiddleEast,n.northEastArrowSouthMiddleWest]}}function cS(t,e){if(t.rangeCount===1){return false}return[...t.getRanges()].every((t=>{const n=t.getContainedElement();return n&&e.isSelectable(n)}))}var lS=n(176);var dS={injectType:"singletonStyleTag",attributes:{"data-cke":true}};dS.insert="head";dS.singleton=true;var uS=Il()(lS.Z,dS);const hS=lS.Z.locals||{};const fS=mc("px");class pS extends(null&&ButtonView){constructor(t){super(t);const e=this.bindTemplate;this.isVisible=false;this.isToggleable=true;this.set("top",0);this.set("left",0);this.extendTemplate({attributes:{class:"ck-block-toolbar-button",style:{top:e.to("top",(t=>fS(t))),left:e.to("left",(t=>fS(t)))}}})}}const gS=mc("px");const{pilcrow:mS}=SC;class bS extends(null&&Plugin){static get pluginName(){return"BlockToolbar"}constructor(t){super(t);this._resizeObserver=null;this._blockToolbarConfig=normalizeToolbarConfig(this.editor.config.get("blockToolbar"));this.toolbarView=this._createToolbarView();this.panelView=this._createPanelView();this.buttonView=this._createButtonView();clickOutsideHandler({emitter:this.panelView,contextElements:[this.panelView.element,this.buttonView.element],activator:()=>this.panelView.isVisible,callback:()=>this._hidePanel()})}init(){const t=this.editor;this.listenTo(t.model.document.selection,"change:range",((t,e)=>{if(e.directChange){this._hidePanel()}}));this.listenTo(t.ui,"update",(()=>this._updateButton()));this.listenTo(t,"change:isReadOnly",(()=>this._updateButton()),{priority:"low"});this.listenTo(t.ui.focusTracker,"change:isFocused",(()=>this._updateButton()));this.listenTo(this.buttonView,"change:isVisible",((t,e,n)=>{if(n){this.buttonView.listenTo(window,"resize",(()=>this._updateButton()))}else{this.buttonView.stopListening(window,"resize");this._hidePanel()}}));t.ui.addToolbar(this.toolbarView,{beforeFocus:()=>this._showPanel(),afterBlur:()=>this._hidePanel()})}afterInit(){this.toolbarView.fillFromConfig(this._blockToolbarConfig,this.editor.ui.componentFactory);for(const t of this.toolbarView.items){t.on("execute",(()=>this._hidePanel(true)),{priority:"high"})}}destroy(){super.destroy();this.panelView.destroy();this.buttonView.destroy();this.toolbarView.destroy();if(this._resizeObserver){this._resizeObserver.destroy()}}_createToolbarView(){const t=this.editor.locale.t;const e=!this._blockToolbarConfig.shouldNotGroupWhenFull;const n=new ToolbarView(this.editor.locale,{shouldGroupWhenFull:e,isFloating:true});n.ariaLabel=t("Editor block content toolbar");return n}_createPanelView(){const t=this.editor;const e=new BalloonPanelView(t.locale);e.content.add(this.toolbarView);e.class="ck-toolbar-container";t.ui.view.body.add(e);t.ui.focusTracker.add(e.element);this.toolbarView.keystrokes.set("Esc",((t,e)=>{this._hidePanel(true);e()}));return e}_createButtonView(){const t=this.editor;const e=t.t;const n=new BlockButtonView(t.locale);n.set({label:e("Edit block"),icon:mS,withText:false});n.bind("isOn").to(this.panelView,"isVisible");n.bind("tooltip").to(this.panelView,"isVisible",(t=>!t));this.listenTo(n,"execute",(()=>{if(!this.panelView.isVisible){this._showPanel()}else{this._hidePanel(true)}}));t.ui.view.body.add(n);t.ui.focusTracker.add(n.element);return n}_updateButton(){const t=this.editor;const e=t.model;const n=t.editing.view;if(!t.ui.focusTracker.isFocused){this._hideButton();return}if(!t.model.canEditAt(t.model.document.selection)){this._hideButton();return}const o=Array.from(e.document.selection.getSelectedBlocks())[0];if(!o||Array.from(this.toolbarView.items).every((t=>!t.isEnabled))){this._hideButton();return}const i=n.domConverter.mapViewToDom(t.editing.mapper.toViewElement(o));this.buttonView.isVisible=true;this._setupToolbarResize();this._attachButtonToElement(i);if(this.panelView.isVisible){this._showPanel()}}_hideButton(){this.buttonView.isVisible=false}_showPanel(){if(!this.buttonView.isVisible){return}const t=this.panelView.isVisible;this.panelView.show();const e=this._getSelectedEditableElement();this.toolbarView.maxWidth=this._getToolbarMaxWidth(e);this.panelView.pin({target:this.buttonView.element,limiter:e});if(!t){this.toolbarView.items.get(0).focus()}}_getSelectedEditableElement(){const t=this.editor.model.document.selection.getFirstRange().root.rootName;return this.editor.ui.getEditableElement(t)}_hidePanel(t){this.panelView.isVisible=false;if(t){this.editor.editing.view.focus()}}_attachButtonToElement(t){const e=window.getComputedStyle(t);const n=new Rect(this._getSelectedEditableElement());const o=parseInt(e.paddingTop,10);const i=parseInt(e.lineHeight,10)||parseInt(e.fontSize,10)*1.2;const r=getOptimalPosition({element:this.buttonView.element,target:t,positions:[(t,e)=>{let r;if(this.editor.locale.uiLanguageDirection==="ltr"){r=n.left-e.width}else{r=n.right}return{top:t.top+o+(i-e.height)/2,left:r}}]});this.buttonView.top=r.top;this.buttonView.left=r.left}_setupToolbarResize(){const t=this._getSelectedEditableElement();if(!this._blockToolbarConfig.shouldNotGroupWhenFull){if(this._resizeObserver&&this._resizeObserver.element!==t){this._resizeObserver.destroy();this._resizeObserver=null}if(!this._resizeObserver){this._resizeObserver=new ResizeObserver(t,(()=>{this.toolbarView.maxWidth=this._getToolbarMaxWidth(t)}))}}}_getToolbarMaxWidth(t){const e=new Rect(t);const n=new Rect(this.buttonView.element);const o=this.editor.locale.uiLanguageDirection==="rtl";const i=o?n.left-e.right+n.width:e.left-n.left;return gS(e.width+i)}}const kS='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10.209 18.717A8.5 8.5 0 1 1 18.686 9.6h-.008l.002.12a3 3 0 0 1-2.866 2.997h-.268l-.046-.002v.002h-4.791a2 2 0 1 0 0 4 1 1 0 1 1-.128 1.992 8.665 8.665 0 0 1-.372.008Zm-3.918-7.01a1.25 1.25 0 1 0-2.415-.648 1.25 1.25 0 0 0 2.415.647ZM5.723 8.18a1.25 1.25 0 1 0 .647-2.414 1.25 1.25 0 0 0-.647 2.414ZM9.76 6.155a1.25 1.25 0 1 0 .647-2.415 1.25 1.25 0 0 0-.647 2.415Zm4.028 1.759a1.25 1.25 0 1 0 .647-2.415 1.25 1.25 0 0 0-.647 2.415Z"/></svg>';const wS={colorPaletteIcon:kS};class _S extends yE{constructor(t,e){super(t);this.view=e;this._toolbarConfig=vu(t.config.get("toolbar"));this._elementReplacer=new _t;this.listenTo(t.editing.view,"scrollToTheSelection",this._handleScrollToTheSelectionWithStickyPanel.bind(this))}get element(){return this.view.element}init(t){const e=this.editor;const n=this.view;const o=e.editing.view;const i=n.editable;const r=o.document.getRoot();i.name=r.rootName;n.render();const s=i.element;this.setEditableElement(i.name,s);n.editable.bind("isFocused").to(this.focusTracker);o.attachDomRoot(s);if(t){this._elementReplacer.replace(t,this.element)}this._initPlaceholder();this._initToolbar();this.fire("ready")}destroy(){super.destroy();const t=this.view;const e=this.editor.editing.view;this._elementReplacer.restore();e.detachDomRoot(t.editable.name);t.destroy()}_initToolbar(){const t=this.view;t.stickyPanel.bind("isActive").to(this.focusTracker,"isFocused");t.stickyPanel.limiterElement=t.element;t.stickyPanel.bind("viewportTopOffset").to(this,"viewportOffset",(({top:t})=>t||0));t.toolbar.fillFromConfig(this._toolbarConfig,this.componentFactory);this.addToolbar(t.toolbar)}_initPlaceholder(){const t=this.editor;const e=t.editing.view;const n=e.document.getRoot();const o=t.sourceElement;let i;const r=t.config.get("placeholder");if(r){i=typeof r==="string"?r:r[this.view.editable.name]}if(!i&&o&&o.tagName.toLowerCase()==="textarea"){i=o.getAttribute("placeholder")}if(i){n.placeholder=i}Vu({view:e,element:n,isDirectHost:false,keepOnFocus:true})}_handleScrollToTheSelectionWithStickyPanel(t,e,n){const o=this.view.stickyPanel;if(o.isSticky){const t=new rc(o.element).height;e.viewportOffset.top+=t}else{const t=()=>{this.editor.editing.view.scrollToTheSelection(n)};this.listenTo(o,"change:isSticky",t);setTimeout((()=>{this.stopListening(o,"change:isSticky",t)}),20)}}}var vS=n(624);var AS={injectType:"singletonStyleTag",attributes:{"data-cke":true}};AS.insert="head";AS.singleton=true;var CS=Il()(vS.Z,AS);const yS=vS.Z.locals||{};class xS extends BE{constructor(t,e,n={}){super(t);this.stickyPanel=new rS(t);this.toolbar=new OC(t,{shouldGroupWhenFull:n.shouldToolbarGroupWhenFull});this.editable=new RE(t,e)}render(){super.render();this.stickyPanel.content.add(this.toolbar);this.top.add(this.stickyPanel);this.main.add(this.editable)}}class ES{constructor(t){this.crashes=[];this.state="initializing";this._now=Date.now;this.crashes=[];this._crashNumberLimit=typeof t.crashNumberLimit==="number"?t.crashNumberLimit:3;this._minimumNonErrorTimePeriod=typeof t.minimumNonErrorTimePeriod==="number"?t.minimumNonErrorTimePeriod:5e3;this._boundErrorHandler=t=>{const e="error"in t?t.error:t.reason;if(e instanceof Error){this._handleError(e,t)}};this._listeners={};if(!this._restart){throw new Error("The Watchdog class was split into the abstract `Watchdog` class and the `EditorWatchdog` class. "+"Please, use `EditorWatchdog` if you have used the `Watchdog` class previously.")}}destroy(){this._stopErrorHandling();this._listeners={}}on(t,e){if(!this._listeners[t]){this._listeners[t]=[]}this._listeners[t].push(e)}off(t,e){this._listeners[t]=this._listeners[t].filter((t=>t!==e))}_fire(t,...e){const n=this._listeners[t]||[];for(const t of n){t.apply(this,[null,...e])}}_startErrorHandling(){window.addEventListener("error",this._boundErrorHandler);window.addEventListener("unhandledrejection",this._boundErrorHandler)}_stopErrorHandling(){window.removeEventListener("error",this._boundErrorHandler);window.removeEventListener("unhandledrejection",this._boundErrorHandler)}_handleError(t,e){if(this._shouldReactToError(t)){this.crashes.push({message:t.message,stack:t.stack,filename:e instanceof ErrorEvent?e.filename:undefined,lineno:e instanceof ErrorEvent?e.lineno:undefined,colno:e instanceof ErrorEvent?e.colno:undefined,date:this._now()});const n=this._shouldRestart();this.state="crashed";this._fire("stateChange");this._fire("error",{error:t,causesRestart:n});if(n){this._restart()}else{this.state="crashedPermanently";this._fire("stateChange")}}}_shouldReactToError(t){return t.is&&t.is("CKEditorError")&&t.context!==undefined&&t.context!==null&&this.state==="ready"&&this._isErrorComingFromThisItem(t)}_shouldRestart(){if(this.crashes.length<=this._crashNumberLimit){return true}const t=this.crashes[this.crashes.length-1].date;const e=this.crashes[this.crashes.length-1-this._crashNumberLimit].date;const n=(t-e)/this._crashNumberLimit;return n>this._minimumNonErrorTimePeriod}}function SS(t,e=new Set){const n=[t];const o=new Set;let i=0;while(n.length>i){const t=n[i++];if(o.has(t)||!DS(t)||e.has(t)){continue}o.add(t);if(Symbol.iterator in t){try{for(const e of t){n.push(e)}}catch(t){}}else{for(const e in t){if(e==="defaultValue"){continue}n.push(t[e])}}}return o}function DS(t){const e=Object.prototype.toString.call(t);const n=typeof t;return!(n==="number"||n==="boolean"||n==="string"||n==="symbol"||n==="function"||e==="[object Date]"||e==="[object RegExp]"||e==="[object Module]"||t===undefined||t===null||t._watchdogExcluded||t instanceof EventTarget||t instanceof Event)}function TS(t,e,n=new Set){if(t===e&&BS(t)){return true}const o=SS(t,n);const i=SS(e,n);for(const t of o){if(i.has(t)){return true}}return false}function PS(t,e,n){const{subNodes:o,prevNodeMap:i}=getSubNodes(t,n.subNodes);const{subNodes:r,prevNodeMap:s}=getSubNodes(e,n.subNodes);for(const n of o){if(r.has(n)){const o=[];o.push(n);let r=i.get(n);while(r&&r!==t){o.push(r);r=i.get(r)}r=s.get(n);while(r&&r!==e){o.unshift(r);r=s.get(r)}console.log("--------");console.log({target1:t});console.log({sharedNode:n});console.log({target2:e});console.log({connection:o});return true}}return false}function BS(t){return typeof t==="object"&&t!==null}class IS extends ES{constructor(t,e={}){super(e);this._editor=null;this._initUsingData=true;this._editables={};this._throttledSave=lE(this._save.bind(this),typeof e.saveInterval==="number"?e.saveInterval:5e3);if(t){this._creator=(e,n)=>t.create(e,n)}this._destructor=t=>t.destroy()}get editor(){return this._editor}get _item(){return this._editor}setCreator(t){this._creator=t}setDestructor(t){this._destructor=t}_restart(){return Promise.resolve().then((()=>{this.state="initializing";this._fire("stateChange");return this._destroy()})).catch((t=>{console.error("An error happened during the editor destroying.",t)})).then((()=>{const t={};const e=[];const n=this._config.rootsAttributes||{};const o={};for(const[i,r]of Object.entries(this._data.roots)){if(r.isLoaded){t[i]="";o[i]=n[i]||{}}else{e.push(i)}}const i={...this._config,extraPlugins:this._config.extraPlugins||[],lazyRoots:e,rootsAttributes:o,_watchdogInitialData:this._data};delete i.initialData;i.extraPlugins.push(RS);if(this._initUsingData){return this.create(t,i,i.context)}else{if(La(this._elementOrData)){return this.create(this._elementOrData,i,i.context)}else{return this.create(this._editables,i,i.context)}}})).then((()=>{this._fire("restart")}))}create(t=this._elementOrData,e=this._config,n){return Promise.resolve().then((()=>{super._startErrorHandling();this._elementOrData=t;this._initUsingData=typeof t=="string"||Object.keys(t).length>0&&typeof Object.values(t)[0]=="string";this._config=this._cloneEditorConfiguration(e)||{};this._config.context=n;return this._creator(t,this._config)})).then((t=>{this._editor=t;t.model.document.on("change:data",this._throttledSave);this._lastDocumentVersion=t.model.document.version;this._data=this._getData();if(!this._initUsingData){this._editables=this._getEditables()}this.state="ready";this._fire("stateChange")}))}destroy(){return Promise.resolve().then((()=>{this.state="destroyed";this._fire("stateChange");super.destroy();return this._destroy()}))}_destroy(){return Promise.resolve().then((()=>{this._stopErrorHandling();this._throttledSave.cancel();const t=this._editor;this._editor=null;t.model.document.off("change:data",this._throttledSave);return this._destructor(t)}))}_save(){const t=this._editor.model.document.version;try{this._data=this._getData();if(!this._initUsingData){this._editables=this._getEditables()}this._lastDocumentVersion=t}catch(t){console.error(t,"An error happened during restoring editor data. "+"Editor will be restored from the previously saved data.")}}_setExcludedProperties(t){this._excludedProps=t}_getData(){const t=this._editor;const e=t.model.document.roots.filter((t=>t.isAttached()&&t.rootName!="$graveyard"));const{plugins:n}=t;const o=n.has("CommentsRepository")&&n.get("CommentsRepository");const i=n.has("TrackChanges")&&n.get("TrackChanges");const r={roots:{},markers:{},commentThreads:JSON.stringify([]),suggestions:JSON.stringify([])};e.forEach((t=>{r.roots[t.rootName]={content:JSON.stringify(Array.from(t.getChildren())),attributes:JSON.stringify(Array.from(t.getAttributes())),isLoaded:t._isLoaded}}));for(const e of t.model.markers){if(!e._affectsData){continue}r.markers[e.name]={rangeJSON:e.getRange().toJSON(),usingOperation:e._managedUsingOperations,affectsData:e._affectsData}}if(o){r.commentThreads=JSON.stringify(o.getCommentThreads({toJSON:true,skipNotAttached:true}))}if(i){r.suggestions=JSON.stringify(i.getSuggestions({toJSON:true,skipNotAttached:true}))}return r}_getEditables(){const t={};for(const e of this.editor.model.document.getRootNames()){const n=this.editor.ui.getEditableElement(e);if(n){t[e]=n}}return t}_isErrorComingFromThisItem(t){return TS(this._editor,t.context,this._excludedProps)}_cloneEditorConfiguration(t){return Fa(t,((t,e)=>{if(La(t)){return t}if(e==="context"){return t}}))}}class RS{constructor(t){this.editor=t;this._data=t.config.get("_watchdogInitialData")}init(){this.editor.data.on("init",(t=>{t.stop();this.editor.model.enqueueChange({isUndoable:false},(t=>{this._restoreCollaborationData();this._restoreEditorData(t)}));this.editor.data.fire("ready")}),{priority:1e3-1})}_createNode(t,e){if("name"in e){const n=t.createElement(e.name,e.attributes);if(e.children){for(const o of e.children){n._appendChild(this._createNode(t,o))}}return n}else{return t.createText(e.data,e.attributes)}}_restoreEditorData(t){const e=this.editor;Object.entries(this._data.roots).forEach((([n,{content:o,attributes:i}])=>{const r=JSON.parse(o);const s=JSON.parse(i);const a=e.model.document.getRoot(n);for(const[e,n]of s){t.setAttribute(e,n,a)}for(const e of r){const n=this._createNode(t,e);t.insert(n,a,"end")}}));Object.entries(this._data.markers).forEach((([n,o])=>{const{document:i}=e.model;const{rangeJSON:{start:r,end:s},...a}=o;const c=i.getRoot(r.root);const l=t.createPositionFromPath(c,r.path,r.stickiness);const d=t.createPositionFromPath(c,s.path,s.stickiness);const u=t.createRange(l,d);t.addMarker(n,{range:u,...a})}))}_restoreCollaborationData(){const t=JSON.parse(this._data.commentThreads);const e=JSON.parse(this._data.suggestions);t.forEach((t=>{const e=this.editor.config.get("collaboration.channelId");const n=this.editor.plugins.get("CommentsRepository");if(n.hasCommentThread(t.threadId)){const e=n.getCommentThread(t.threadId);e.remove()}n.addCommentThread({channelId:e,...t})}));e.forEach((t=>{const e=this.editor.plugins.get("TrackChangesEditing");if(e.hasSuggestion(t.id)){const n=e.getSuggestion(t.id);n.attributes=t.attributes}else{e.addSuggestionData(t)}}))}}const OS=Symbol("MainQueueId");class MS extends ES{constructor(t,e={}){super(e);this._watchdogs=new Map;this._context=null;this._contextProps=new Set;this._actionQueues=new VS;this._watchdogConfig=e;this._creator=e=>t.create(e);this._destructor=t=>t.destroy();this._actionQueues.onEmpty((()=>{if(this.state==="initializing"){this.state="ready";this._fire("stateChange")}}))}setCreator(t){this._creator=t}setDestructor(t){this._destructor=t}get context(){return this._context}create(t={}){return this._actionQueues.enqueue(OS,(()=>{this._contextConfig=t;return this._create()}))}getItem(t){const e=this._getWatchdog(t);return e._item}getItemState(t){const e=this._getWatchdog(t);return e.state}add(t){const e=zS(t);return Promise.all(e.map((t=>this._actionQueues.enqueue(t.id,(()=>{if(this.state==="destroyed"){throw new Error("Cannot add items to destroyed watchdog.")}if(!this._context){throw new Error("Context was not created yet. You should call the `ContextWatchdog#create()` method first.")}let e;if(this._watchdogs.has(t.id)){throw new Error(`Item with the given id is already added: '${t.id}'.`)}if(t.type==="editor"){e=new IS(null,this._watchdogConfig);e.setCreator(t.creator);e._setExcludedProperties(this._contextProps);if(t.destructor){e.setDestructor(t.destructor)}this._watchdogs.set(t.id,e);e.on("error",((n,{error:o,causesRestart:i})=>{this._fire("itemError",{itemId:t.id,error:o});if(!i){return}this._actionQueues.enqueue(t.id,(()=>new Promise((n=>{const o=()=>{e.off("restart",o);this._fire("itemRestart",{itemId:t.id});n()};e.on("restart",o)}))))}));return e.create(t.sourceElementOrData,t.config,this._context)}else{throw new Error(`Not supported item type: '${t.type}'.`)}})))))}remove(t){const e=zS(t);return Promise.all(e.map((t=>this._actionQueues.enqueue(t,(()=>{const e=this._getWatchdog(t);this._watchdogs.delete(t);return e.destroy()})))))}destroy(){return this._actionQueues.enqueue(OS,(()=>{this.state="destroyed";this._fire("stateChange");super.destroy();return this._destroy()}))}_restart(){return this._actionQueues.enqueue(OS,(()=>{this.state="initializing";this._fire("stateChange");return this._destroy().catch((t=>{console.error("An error happened during destroying the context or items.",t)})).then((()=>this._create())).then((()=>this._fire("restart")))}))}_create(){return Promise.resolve().then((()=>{this._startErrorHandling();return this._creator(this._contextConfig)})).then((t=>{this._context=t;this._contextProps=SS(this._context);return Promise.all(Array.from(this._watchdogs.values()).map((t=>{t._setExcludedProperties(this._contextProps);return t.create(undefined,undefined,this._context)})))}))}_destroy(){return Promise.resolve().then((()=>{this._stopErrorHandling();const t=this._context;this._context=null;this._contextProps=new Set;return Promise.all(Array.from(this._watchdogs.values()).map((t=>t.destroy()))).then((()=>this._destructor(t)))}))}_getWatchdog(t){const e=this._watchdogs.get(t);if(!e){throw new Error(`Item with the given id was not registered: ${t}.`)}return e}_isErrorComingFromThisItem(t){for(const e of this._watchdogs.values()){if(e._isErrorComingFromThisItem(t)){return false}}return TS(this._context,t.context)}}class VS{constructor(){this._onEmptyCallbacks=[];this._queues=new Map;this._activeActions=0}onEmpty(t){this._onEmptyCallbacks.push(t)}enqueue(t,e){const n=t===OS;this._activeActions++;if(!this._queues.get(t)){this._queues.set(t,Promise.resolve())}const o=n?Promise.all(this._queues.values()):Promise.all([this._queues.get(OS),this._queues.get(t)]);const i=o.then(e);const r=i.catch((()=>{}));this._queues.set(t,r);return i.finally((()=>{this._activeActions--;if(this._queues.get(t)===r&&this._activeActions===0){this._onEmptyCallbacks.forEach((t=>t()))}}))}}function zS(t){return Array.isArray(t)?t:[t]}class FS extends(qA($A(LA))){constructor(t,e={}){if(!LS(t)&&e.initialData!==undefined){throw new P("editor-create-initial-data",null)}super(e);if(this.config.get("initialData")===undefined){this.config.set("initialData",NS(t))}if(LS(t)){this.sourceElement=t}this.model.document.createRoot();const n=!this.config.get("toolbar.shouldNotGroupWhenFull");const o=new xS(this.locale,this.editing.view,{shouldToolbarGroupWhenFull:n});this.ui=new _S(this,o);HA(this)}destroy(){if(this.sourceElement){this.updateSourceElement()}this.ui.destroy();return super.destroy()}static create(t,e={}){return new Promise((n=>{const o=new this(t,e);n(o.initPlugins().then((()=>o.ui.init(LS(t)?t:null))).then((()=>o.data.init(o.config.get("initialData")))).then((()=>o.fire("ready"))).then((()=>o)))}))}}FS.Context=Du;FS.EditorWatchdog=IS;FS.ContextWatchdog=MS;function NS(t){return LS(t)?fc(t):t}function LS(t){return La(t)}class HS extends yu{constructor(t,e){super(t);this.attributeKey=e}refresh(){const t=this.editor.model;const e=t.document;this.value=this._getValueFromFirstAllowedNode();this.isEnabled=t.schema.checkAttributeInSelection(e.selection,this.attributeKey)}execute(t={}){const e=this.editor.model;const n=e.document;const o=n.selection;const i=t.forceValue===undefined?!this.value:t.forceValue;e.change((t=>{if(o.isCollapsed){if(i){t.setSelectionAttribute(this.attributeKey,true)}else{t.removeSelectionAttribute(this.attributeKey)}}else{const n=e.schema.getValidRanges(o.getRanges(),this.attributeKey);for(const e of n){if(i){t.setAttribute(this.attributeKey,i,e)}else{t.removeAttribute(this.attributeKey,e)}}}}))}_getValueFromFirstAllowedNode(){const t=this.editor.model;const e=t.schema;const n=t.document.selection;if(n.isCollapsed){return n.hasAttribute(this.attributeKey)}for(const t of n.getRanges()){for(const n of t.getItems()){if(e.checkAttribute(n,this.attributeKey)){return n.hasAttribute(this.attributeKey)}}}return false}}const jS="bold";class qS extends Au{static get pluginName(){return"BoldEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:jS});t.model.schema.setAttributeProperties(jS,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:jS,view:"strong",upcastAlso:["b",t=>{const e=t.getStyle("font-weight");if(!e){return null}if(e=="bold"||Number(e)>=600){return{name:true,styles:["font-weight"]}}return null}]});t.commands.add(jS,new HS(t,jS));t.keystrokes.set("CTRL+B",jS)}}const $S="bold";class WS extends Au{static get pluginName(){return"BoldUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add($S,(n=>{const o=t.commands.get($S);const i=new Ad(n);i.set({label:e("Bold"),icon:SC.bold,keystroke:"CTRL+B",tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute($S);t.editing.view.focus()}));return i}))}}class GS extends Au{static get requires(){return[qS,WS]}static get pluginName(){return"Bold"}}class KS{constructor(t,e=20){this._batch=null;this.model=t;this._size=0;this.limit=e;this._isLocked=false;this._changeCallback=(t,e)=>{if(e.isLocal&&e.isUndoable&&e!==this._batch){this._reset(true)}};this._selectionChangeCallback=()=>{this._reset()};this.model.document.on("change",this._changeCallback);this.model.document.selection.on("change:range",this._selectionChangeCallback);this.model.document.selection.on("change:attribute",this._selectionChangeCallback)}get batch(){if(!this._batch){this._batch=this.model.createBatch({isTyping:true})}return this._batch}get size(){return this._size}input(t){this._size+=t;if(this._size>=this.limit){this._reset(true)}}get isLocked(){return this._isLocked}lock(){this._isLocked=true}unlock(){this._isLocked=false}destroy(){this.model.document.off("change",this._changeCallback);this.model.document.selection.off("change:range",this._selectionChangeCallback);this.model.document.selection.off("change:attribute",this._selectionChangeCallback)}_reset(t=false){if(!this.isLocked||t){this._batch=null;this._size=0}}}class US extends yu{constructor(t,e){super(t);this._buffer=new KS(t.model,e);this._isEnabledBasedOnSelection=false}get buffer(){return this._buffer}destroy(){super.destroy();this._buffer.destroy()}execute(t={}){const e=this.editor.model;const n=e.document;const o=t.text||"";const i=o.length;let r=n.selection;if(t.selection){r=t.selection}else if(t.range){r=e.createSelection(t.range)}if(!e.canEditAt(r)){return}const s=t.resultRange;e.enqueueChange(this._buffer.batch,(t=>{this._buffer.lock();e.deleteContent(r);if(o){e.insertContent(t.createText(o,n.selection.getAttributes()),r)}if(s){t.setSelection(s)}else if(!r.is("documentSelection")){t.setSelection(r)}this._buffer.unlock();this._buffer.input(i)}))}}const ZS=["insertText","insertReplacementText"];class JS extends Dg{constructor(t){super(t);this.focusObserver=t.getObserver(nb);if(r.isAndroid){ZS.push("insertCompositionText")}const e=t.document;e.on("beforeinput",((n,o)=>{if(!this.isEnabled){return}const{data:i,targetRanges:r,inputType:s,domEvent:a}=o;if(!ZS.includes(s)){return}this.focusObserver.flush();const c=new C(e,"insertText");e.fire(c,new Bg(t,a,{text:i,selection:t.createSelection(r)}));if(c.stop.called){n.stop()}}));e.on("compositionend",((n,{data:o,domEvent:i})=>{if(!this.isEnabled||r.isAndroid){return}if(!o){return}e.fire("insertText",new Bg(t,i,{text:o,selection:e.selection}))}),{priority:"lowest"})}observe(){}stopObserving(){}}class YS extends Au{static get pluginName(){return"Input"}init(){const t=this.editor;const e=t.model;const n=t.editing.view;const o=e.document.selection;n.addObserver(JS);const i=new US(t,t.config.get("typing.undoStep")||20);t.commands.add("insertText",i);t.commands.add("input",i);this.listenTo(n.document,"insertText",((o,i)=>{if(!n.document.isComposing){i.preventDefault()}const{text:s,selection:a,resultRange:c}=i;const l=Array.from(a.getRanges()).map((e=>t.editing.mapper.toModelRange(e)));let d=s;if(r.isAndroid){const t=Array.from(l[0].getItems()).reduce(((t,e)=>t+(e.is("$textProxy")?e.data:"")),"");if(t){if(t.length<=d.length){if(d.startsWith(t)){d=d.substring(t.length);l[0].start=l[0].start.getShiftedBy(t.length)}}else{if(t.startsWith(d)){l[0].start=l[0].start.getShiftedBy(d.length);d=""}}}}const u={text:d,selection:e.createSelection(l)};if(c){u.resultRange=t.editing.mapper.toModelRange(c)}t.execute("insertText",u);n.scrollToTheSelection()}));if(r.isAndroid){this.listenTo(n.document,"keydown",((t,r)=>{if(o.isCollapsed||r.keyCode!=229||!n.document.isComposing){return}QS(e,i)}))}else{this.listenTo(n.document,"compositionstart",(()=>{if(o.isCollapsed){return}QS(e,i)}))}}}function QS(t,e){if(!e.isEnabled){return}const n=e.buffer;n.lock();t.enqueueChange(n.batch,(()=>{t.deleteContent(t.document.selection)}));n.unlock()}class XS extends yu{constructor(t,e){super(t);this.direction=e;this._buffer=new KS(t.model,t.config.get("typing.undoStep"));this._isEnabledBasedOnSelection=false}get buffer(){return this._buffer}execute(t={}){const e=this.editor.model;const n=e.document;e.enqueueChange(this._buffer.batch,(o=>{this._buffer.lock();const i=o.createSelection(t.selection||n.selection);if(!e.canEditAt(i)){return}const r=t.sequence||1;const s=i.isCollapsed;if(i.isCollapsed){e.modifySelection(i,{direction:this.direction,unit:t.unit,treatEmojiAsSingleUnit:true})}if(this._shouldEntireContentBeReplacedWithParagraph(r)){this._replaceEntireContentWithParagraph(o);return}if(this._shouldReplaceFirstBlockWithParagraph(i,r)){this.editor.execute("paragraph",{selection:i});return}if(i.isCollapsed){return}let a=0;i.getFirstRange().getMinimalFlatRanges().forEach((t=>{a+=vt(t.getWalker({singleCharacters:true,ignoreElementEnd:true,shallow:true}))}));e.deleteContent(i,{doNotResetEntireContent:s,direction:this.direction});this._buffer.input(a);o.setSelection(i);this._buffer.unlock()}))}_shouldEntireContentBeReplacedWithParagraph(t){if(t>1){return false}const e=this.editor.model;const n=e.document;const o=n.selection;const i=e.schema.getLimitElement(o);const r=o.isCollapsed&&o.containsEntireContent(i);if(!r){return false}if(!e.schema.checkChild(i,"paragraph")){return false}const s=i.getChild(0);if(s&&s.is("element","paragraph")){return false}return true}_replaceEntireContentWithParagraph(t){const e=this.editor.model;const n=e.document;const o=n.selection;const i=e.schema.getLimitElement(o);const r=t.createElement("paragraph");t.remove(t.createRangeIn(i));t.insert(r,i);t.setSelection(r,0)}_shouldReplaceFirstBlockWithParagraph(t,e){const n=this.editor.model;if(e>1||this.direction!="backward"){return false}if(!t.isCollapsed){return false}const o=t.getFirstPosition();const i=n.schema.getLimitElement(o);const r=i.getChild(0);if(o.parent!=r){return false}if(!t.containsEntireContent(r)){return false}if(!n.schema.checkChild(i,"paragraph")){return false}if(r.name=="paragraph"){return false}return true}}const tD="character";const eD="word";const nD="codePoint";const oD="selection";const iD="backward";const rD="forward";const sD={deleteContent:{unit:oD,direction:iD},deleteContentBackward:{unit:nD,direction:iD},deleteWordBackward:{unit:eD,direction:iD},deleteHardLineBackward:{unit:oD,direction:iD},deleteSoftLineBackward:{unit:oD,direction:iD},deleteContentForward:{unit:tD,direction:rD},deleteWordForward:{unit:eD,direction:rD},deleteHardLineForward:{unit:oD,direction:rD},deleteSoftLineForward:{unit:oD,direction:rD}};class aD extends Dg{constructor(t){super(t);const e=t.document;let n=0;e.on("keydown",(()=>{n++}));e.on("keyup",(()=>{n=0}));e.on("beforeinput",((o,i)=>{if(!this.isEnabled){return}const{targetRanges:s,domEvent:a,inputType:c}=i;const l=sD[c];if(!l){return}const d={direction:l.direction,unit:l.unit,sequence:n};if(d.unit==oD){d.selectionToRemove=t.createSelection(s[0])}if(c==="deleteContentBackward"){if(r.isAndroid){d.sequence=1}if(lD(s)){d.unit=oD;d.selectionToRemove=t.createSelection(s)}}const u=new hp(e,"delete",s[0]);e.fire(u,new Bg(t,a,d));if(u.stop.called){o.stop()}}));if(r.isBlink){cD(this)}}observe(){}stopObserving(){}}function cD(t){const e=t.view;const n=e.document;let o=null;let i=false;n.on("keydown",((t,{keyCode:e})=>{o=e;i=false}));n.on("keyup",((a,{keyCode:c,domEvent:l})=>{const d=n.selection;const u=t.isEnabled&&c==o&&r(c)&&!d.isCollapsed&&!i;o=null;if(u){const t=d.getFirstRange();const o=new hp(n,"delete",t);const i={unit:oD,direction:s(c),selectionToRemove:d};n.fire(o,new Bg(e,l,i))}}));n.on("beforeinput",((t,{inputType:e})=>{const n=sD[e];const a=r(o)&&n&&n.direction==s(o);if(a){i=true}}),{priority:"high"});n.on("beforeinput",((t,{inputType:e,data:n})=>{const i=o==$c.delete&&e=="insertText"&&n=="";if(i){t.stop()}}),{priority:"high"});function r(t){return t==$c.backspace||t==$c.delete}function s(t){return t==$c.backspace?iD:rD}}function lD(t){if(t.length!=1||t[0].isCollapsed){return false}const e=t[0].getWalker({direction:"backward",singleCharacters:true,ignoreElementEnd:true});let n=0;for(const{nextPosition:t}of e){if(!t.parent.is("$text")){n++}else{const e=t.parent.data;const o=t.offset;if(yl(e,o)||xl(e,o)||Sl(e,o)){continue}n++}if(n>1){return true}}return false}class dD extends Au{static get pluginName(){return"Delete"}init(){const t=this.editor;const e=t.editing.view;const n=e.document;const o=t.model.document;e.addObserver(aD);this._undoOnBackspace=false;const i=new XS(t,"forward");t.commands.add("deleteForward",i);t.commands.add("forwardDelete",i);t.commands.add("delete",new XS(t,"backward"));this.listenTo(n,"delete",((o,i)=>{if(!n.isComposing){i.preventDefault()}const{direction:r,sequence:s,selectionToRemove:a,unit:c}=i;const l=r==="forward"?"deleteForward":"delete";const d={sequence:s};if(c=="selection"){const e=Array.from(a.getRanges()).map((e=>t.editing.mapper.toModelRange(e)));d.selection=t.model.createSelection(e)}else{d.unit=c}t.execute(l,d);e.scrollToTheSelection()}),{priority:"low"});if(this.editor.plugins.has("UndoEditing")){this.listenTo(n,"delete",((e,n)=>{if(this._undoOnBackspace&&n.direction=="backward"&&n.sequence==1&&n.unit=="codePoint"){this._undoOnBackspace=false;t.execute("undo");n.preventDefault();e.stop()}}),{context:"$capture"});this.listenTo(o,"change",(()=>{this._undoOnBackspace=false}))}}requestUndoOnBackspace(){if(this.editor.plugins.has("UndoEditing")){this._undoOnBackspace=true}}}class uD extends Au{static get requires(){return[YS,dD]}static get pluginName(){return"Typing"}}function hD(t,e){let n=t.start;const o=Array.from(t.getWalker({ignoreElementEnd:false})).reduce(((t,{item:o})=>{if(!(o.is("$text")||o.is("$textProxy"))){n=e.createPositionAfter(o);return""}return t+o.data}),"");return{text:o,range:e.createRange(n,t.end)}}class fD extends(lt()){constructor(t,e){super();this.model=t;this.testCallback=e;this._hasMatch=false;this.set("isEnabled",true);this.on("change:isEnabled",(()=>{if(this.isEnabled){this._startListening()}else{this.stopListening(t.document.selection);this.stopListening(t.document)}}));this._startListening()}get hasMatch(){return this._hasMatch}_startListening(){const t=this.model;const e=t.document;this.listenTo(e.selection,"change:range",((t,{directChange:n})=>{if(!n){return}if(!e.selection.isCollapsed){if(this.hasMatch){this.fire("unmatched");this._hasMatch=false}return}this._evaluateTextBeforeSelection("selection")}));this.listenTo(e,"change:data",((t,e)=>{if(e.isUndo||!e.isLocal){return}this._evaluateTextBeforeSelection("data",{batch:e})}))}_evaluateTextBeforeSelection(t,e={}){const n=this.model;const o=n.document;const i=o.selection;const r=n.createRange(n.createPositionAt(i.focus.parent,0),i.focus);const{text:s,range:a}=hD(r,n);const c=this.testCallback(s);if(!c&&this.hasMatch){this.fire("unmatched")}this._hasMatch=!!c;if(c){const n=Object.assign(e,{text:s,range:a});if(typeof c=="object"){Object.assign(n,c)}this.fire(`matched:${t}`,n)}}}class pD extends(null&&Plugin){static get pluginName(){return"TwoStepCaretMovement"}constructor(t){super(t);this.attributes=new Set;this._overrideUid=null}init(){const t=this.editor;const e=t.model;const n=t.editing.view;const o=t.locale;const i=e.document.selection;this.listenTo(n.document,"arrowKey",((t,e)=>{if(!i.isCollapsed){return}if(e.shiftKey||e.altKey||e.ctrlKey){return}const n=e.keyCode==keyCodes.arrowright;const r=e.keyCode==keyCodes.arrowleft;if(!n&&!r){return}const s=o.contentLanguageDirection;let a=false;if(s==="ltr"&&n||s==="rtl"&&r){a=this._handleForwardMovement(e)}else{a=this._handleBackwardMovement(e)}if(a===true){t.stop()}}),{context:"$text",priority:"highest"});this._isNextGravityRestorationSkipped=false;this.listenTo(i,"change:range",((t,e)=>{if(this._isNextGravityRestorationSkipped){this._isNextGravityRestorationSkipped=false;return}if(!this._isGravityOverridden){return}if(!e.directChange&&wD(i.getFirstPosition(),this.attributes)){return}this._restoreGravity()}))}registerAttribute(t){this.attributes.add(t)}_handleForwardMovement(t){const e=this.attributes;const n=this.editor.model;const o=n.document.selection;const i=o.getFirstPosition();if(this._isGravityOverridden){return false}if(i.isAtStart&&gD(o,e)){return false}if(wD(i,e)){bD(t);this._overrideGravity();return true}return false}_handleBackwardMovement(t){const e=this.attributes;const n=this.editor.model;const o=n.document.selection;const i=o.getFirstPosition();if(this._isGravityOverridden){bD(t);this._restoreGravity();mD(n,e,i);return true}else{if(i.isAtStart){if(gD(o,e)){bD(t);mD(n,e,i);return true}return false}if(kD(i,e)){if(i.isAtEnd&&!gD(o,e)&&wD(i,e)){bD(t);mD(n,e,i);return true}this._isNextGravityRestorationSkipped=true;this._overrideGravity();return false}}return false}get _isGravityOverridden(){return!!this._overrideUid}_overrideGravity(){this._overrideUid=this.editor.model.change((t=>t.overrideSelectionGravity()))}_restoreGravity(){this.editor.model.change((t=>{t.restoreSelectionGravity(this._overrideUid);this._overrideUid=null}))}}function gD(t,e){for(const n of e){if(t.hasAttribute(n)){return true}}return false}function mD(t,e,n){const o=n.nodeBefore;t.change((n=>{if(o){const e=[];const i=t.schema.isObject(o)&&t.schema.isInline(o);for(const[n,r]of o.getAttributes()){if(t.schema.checkAttribute("$text",n)&&(!i||t.schema.getAttributeProperties(n).copyFromObject!==false)){e.push([n,r])}}n.setSelectionAttribute(e)}else{n.removeSelectionAttribute(e)}}))}function bD(t){t.preventDefault()}function kD(t,e){const n=t.getShiftedBy(-1);return wD(n,e)}function wD(t,e){const{nodeBefore:n,nodeAfter:o}=t;for(const t of e){const e=n?n.getAttribute(t):undefined;const i=o?o.getAttribute(t):undefined;if(i!==e){return true}}return false}const _D={copyright:{from:"(c)",to:"©"},registeredTrademark:{from:"(r)",to:"®"},trademark:{from:"(tm)",to:"™"},oneHalf:{from:/(^|[^/a-z0-9])(1\/2)([^/a-z0-9])$/i,to:[null,"½",null]},oneThird:{from:/(^|[^/a-z0-9])(1\/3)([^/a-z0-9])$/i,to:[null,"⅓",null]},twoThirds:{from:/(^|[^/a-z0-9])(2\/3)([^/a-z0-9])$/i,to:[null,"⅔",null]},oneForth:{from:/(^|[^/a-z0-9])(1\/4)([^/a-z0-9])$/i,to:[null,"¼",null]},threeQuarters:{from:/(^|[^/a-z0-9])(3\/4)([^/a-z0-9])$/i,to:[null,"¾",null]},lessThanOrEqual:{from:"<=",to:"≤"},greaterThanOrEqual:{from:">=",to:"≥"},notEqual:{from:"!=",to:"≠"},arrowLeft:{from:"<-",to:"←"},arrowRight:{from:"->",to:"→"},horizontalEllipsis:{from:"...",to:"…"},enDash:{from:/(^| )(--)( )$/,to:[null,"–",null]},emDash:{from:/(^| )(---)( )$/,to:[null,"—",null]},quotesPrimary:{from:SD('"'),to:[null,"“",null,"”"]},quotesSecondary:{from:SD("'"),to:[null,"‘",null,"’"]},quotesPrimaryEnGb:{from:SD("'"),to:[null,"‘",null,"’"]},quotesSecondaryEnGb:{from:SD('"'),to:[null,"“",null,"”"]},quotesPrimaryPl:{from:SD('"'),to:[null,"„",null,"”"]},quotesSecondaryPl:{from:SD("'"),to:[null,"‚",null,"’"]}};const vD={symbols:["copyright","registeredTrademark","trademark"],mathematical:["oneHalf","oneThird","twoThirds","oneForth","threeQuarters","lessThanOrEqual","greaterThanOrEqual","notEqual","arrowLeft","arrowRight"],typography:["horizontalEllipsis","enDash","emDash"],quotes:["quotesPrimary","quotesSecondary"]};const AD=null&&["symbols","mathematical","typography","quotes"];class CD extends(null&&Plugin){static get requires(){return["Delete","Input"]}static get pluginName(){return"TextTransformation"}constructor(t){super(t);t.config.define("typing",{transformations:{include:AD}})}init(){const t=this.editor.model;const e=t.document.selection;e.on("change:range",(()=>{this.isEnabled=!e.anchor.parent.is("element","codeBlock")}));this._enableTransformationWatchers()}_enableTransformationWatchers(){const t=this.editor;const e=t.model;const n=t.plugins.get("Delete");const o=DD(t.config.get("typing.transformations"));const i=t=>{for(const e of o){const n=e.from;const o=n.test(t);if(o){return{normalizedTransformation:e}}}};const r=new TextWatcher(t.model,i);r.on("matched:data",((t,o)=>{if(!o.batch.isTyping){return}const{from:i,to:r}=o.normalizedTransformation;const s=i.exec(o.text);const a=r(s.slice(1));const c=o.range;let l=s.index;e.enqueueChange((t=>{for(let n=1;n<s.length;n++){const o=s[n];const i=a[n-1];if(i==null){l+=o.length;continue}const r=c.start.getShiftedBy(l);const d=e.createRange(r,r.getShiftedBy(o.length));const u=ED(r);e.insertContent(t.createText(i,u),d);l+=i.length}e.enqueueChange((()=>{n.requestUndoOnBackspace()}))}))}));r.bind("isEnabled").to(this)}}function yD(t){if(typeof t=="string"){return new RegExp(`(${escapeRegExp(t)})$`)}return t}function xD(t){if(typeof t=="string"){return()=>[t]}else if(t instanceof Array){return()=>t}return t}function ED(t){const e=t.textNode?t.textNode:t.nodeAfter;return e.getAttributes()}function SD(t){return new RegExp(`(^|\\s)(${t})([^${t}]*)(${t})$`)}function DD(t){const e=t.extra||[];const n=t.remove||[];const o=t=>!n.includes(t);const i=t.include.concat(e).filter(o);return TD(i).filter(o).map((t=>typeof t=="string"&&_D[t]?_D[t]:t)).filter((t=>typeof t==="object")).map((t=>({from:yD(t.from),to:xD(t.to)})))}function TD(t){const e=new Set;for(const n of t){if(typeof n=="string"&&vD[n]){for(const t of vD[n]){e.add(t)}}else{e.add(n)}}return Array.from(e)}const PD="code";const BD="ck-code_selected";class ID extends(null&&Plugin){static get pluginName(){return"CodeEditing"}static get requires(){return[TwoStepCaretMovement]}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:PD});t.model.schema.setAttributeProperties(PD,{isFormatting:true,copyOnEnter:false});t.conversion.attributeToElement({model:PD,view:"code",upcastAlso:{styles:{"word-wrap":"break-word"}}});t.commands.add(PD,new AttributeCommand(t,PD));t.plugins.get(TwoStepCaretMovement).registerAttribute(PD);inlineHighlight(t,PD,"code",BD)}}var RD=n(363);var OD={injectType:"singletonStyleTag",attributes:{"data-cke":true}};OD.insert="head";OD.singleton=true;var MD=Il()(RD.Z,OD);const VD=RD.Z.locals||{};const zD="code";class FD extends(null&&Plugin){static get pluginName(){return"CodeUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(zD,(n=>{const o=t.commands.get(zD);const i=new ButtonView(n);i.set({label:e("Code"),icon:codeIcon,tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(zD);t.editing.view.focus()}));return i}))}}class ND extends(null&&Plugin){static get requires(){return[CodeEditing,CodeUI]}static get pluginName(){return"Code"}}const LD="italic";class HD extends Au{static get pluginName(){return"ItalicEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:LD});t.model.schema.setAttributeProperties(LD,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:LD,view:"i",upcastAlso:["em",{styles:{"font-style":"italic"}}]});t.commands.add(LD,new HS(t,LD));t.keystrokes.set("CTRL+I",LD)}}const jD='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m9.586 14.633.021.004c-.036.335.095.655.393.962.082.083.173.15.274.201h1.474a.6.6 0 1 1 0 1.2H5.304a.6.6 0 0 1 0-1.2h1.15c.474-.07.809-.182 1.005-.334.157-.122.291-.32.404-.597l2.416-9.55a1.053 1.053 0 0 0-.281-.823 1.12 1.12 0 0 0-.442-.296H8.15a.6.6 0 0 1 0-1.2h6.443a.6.6 0 1 1 0 1.2h-1.195c-.376.056-.65.155-.823.296-.215.175-.423.439-.623.79l-2.366 9.347z"/></svg>';const qD="italic";class $D extends Au{static get pluginName(){return"ItalicUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(qD,(n=>{const o=t.commands.get(qD);const i=new Ad(n);i.set({label:e("Italic"),icon:jD,keystroke:"CTRL+I",tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(qD);t.editing.view.focus()}));return i}))}}class WD extends Au{static get requires(){return[HD,$D]}static get pluginName(){return"Italic"}}const GD="strikethrough";class KD extends Au{static get pluginName(){return"StrikethroughEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:GD});t.model.schema.setAttributeProperties(GD,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:GD,view:"s",upcastAlso:["del","strike",{styles:{"text-decoration":"line-through"}}]});t.commands.add(GD,new HS(t,GD));t.keystrokes.set("CTRL+SHIFT+X","strikethrough")}}const UD='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M7 16.4c-.8-.4-1.5-.9-2.2-1.5a.6.6 0 0 1-.2-.5l.3-.6h1c1 1.2 2.1 1.7 3.7 1.7 1 0 1.8-.3 2.3-.6.6-.4.6-1.2.6-1.3.2-1.2-.9-2.1-.9-2.1h2.1c.3.7.4 1.2.4 1.7v.8l-.6 1.2c-.6.8-1.1 1-1.6 1.2a6 6 0 0 1-2.4.6c-1 0-1.8-.3-2.5-.6zM6.8 9 6 8.3c-.4-.5-.5-.8-.5-1.6 0-.7.1-1.3.5-1.8.4-.6 1-1 1.6-1.3a6.3 6.3 0 0 1 4.7 0 4 4 0 0 1 1.7 1l.3.7c0 .1.2.4-.2.7-.4.2-.9.1-1 0a3 3 0 0 0-1.2-1c-.4-.2-1-.3-2-.4-.7 0-1.4.2-2 .6-.8.6-1 .8-1 1.5 0 .8.5 1 1.2 1.5.6.4 1.1.7 1.9 1H6.8z"/><path d="M3 10.5V9h14v1.5z"/></svg>';const ZD="strikethrough";class JD extends Au{static get pluginName(){return"StrikethroughUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(ZD,(n=>{const o=t.commands.get(ZD);const i=new Ad(n);i.set({label:e("Strikethrough"),icon:UD,keystroke:"CTRL+SHIFT+X",tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(ZD);t.editing.view.focus()}));return i}))}}class YD extends Au{static get requires(){return[KD,JD]}static get pluginName(){return"Strikethrough"}}const QD="subscript";class XD extends Au{static get pluginName(){return"SubscriptEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:QD});t.model.schema.setAttributeProperties(QD,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:QD,view:"sub",upcastAlso:[{styles:{"vertical-align":"sub"}}]});t.commands.add(QD,new HS(t,QD))}}const tT='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m7.03 10.349 3.818-3.819a.8.8 0 1 1 1.132 1.132L8.16 11.48l3.819 3.818a.8.8 0 1 1-1.132 1.132L7.03 12.61l-3.818 3.82a.8.8 0 1 1-1.132-1.132L5.9 11.48 2.08 7.662A.8.8 0 1 1 3.212 6.53l3.818 3.82zm8.147 7.829h2.549c.254 0 .447.05.58.152a.49.49 0 0 1 .201.413.54.54 0 0 1-.159.393c-.105.108-.266.162-.48.162h-3.594c-.245 0-.435-.066-.572-.197a.621.621 0 0 1-.205-.463c0-.114.044-.265.132-.453a1.62 1.62 0 0 1 .288-.444c.433-.436.824-.81 1.172-1.122.348-.312.597-.517.747-.615.267-.183.49-.368.667-.553.177-.185.312-.375.405-.57.093-.194.139-.384.139-.57a1.008 1.008 0 0 0-.554-.917 1.197 1.197 0 0 0-.56-.133c-.426 0-.761.182-1.005.546a2.332 2.332 0 0 0-.164.39 1.609 1.609 0 0 1-.258.488c-.096.114-.237.17-.423.17a.558.558 0 0 1-.405-.156.568.568 0 0 1-.161-.427c0-.218.05-.446.151-.683.101-.238.252-.453.452-.646s.454-.349.762-.467a2.998 2.998 0 0 1 1.081-.178c.498 0 .923.076 1.274.228a1.916 1.916 0 0 1 1.004 1.032 1.984 1.984 0 0 1-.156 1.794c-.2.32-.405.572-.613.754-.208.182-.558.468-1.048.857-.49.39-.826.691-1.008.906a2.703 2.703 0 0 0-.24.309z"/></svg>';const eT="subscript";class nT extends Au{static get pluginName(){return"SubscriptUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(eT,(n=>{const o=t.commands.get(eT);const i=new Ad(n);i.set({label:e("Subscript"),icon:tT,tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(eT);t.editing.view.focus()}));return i}))}}class oT extends Au{static get requires(){return[XD,nT]}static get pluginName(){return"Subscript"}}const iT="superscript";class rT extends Au{static get pluginName(){return"SuperscriptEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:iT});t.model.schema.setAttributeProperties(iT,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:iT,view:"sup",upcastAlso:[{styles:{"vertical-align":"super"}}]});t.commands.add(iT,new HS(t,iT))}}const sT='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M15.677 8.678h2.549c.254 0 .447.05.58.152a.49.49 0 0 1 .201.413.54.54 0 0 1-.159.393c-.105.108-.266.162-.48.162h-3.594c-.245 0-.435-.066-.572-.197a.621.621 0 0 1-.205-.463c0-.114.044-.265.132-.453a1.62 1.62 0 0 1 .288-.444c.433-.436.824-.81 1.172-1.122.348-.312.597-.517.747-.615.267-.183.49-.368.667-.553.177-.185.312-.375.405-.57.093-.194.139-.384.139-.57a1.008 1.008 0 0 0-.554-.917 1.197 1.197 0 0 0-.56-.133c-.426 0-.761.182-1.005.546a2.332 2.332 0 0 0-.164.39 1.609 1.609 0 0 1-.258.488c-.096.114-.237.17-.423.17a.558.558 0 0 1-.405-.156.568.568 0 0 1-.161-.427c0-.218.05-.446.151-.683.101-.238.252-.453.452-.646s.454-.349.762-.467a2.998 2.998 0 0 1 1.081-.178c.498 0 .923.076 1.274.228a1.916 1.916 0 0 1 1.004 1.032 1.984 1.984 0 0 1-.156 1.794c-.2.32-.405.572-.613.754-.208.182-.558.468-1.048.857-.49.39-.826.691-1.008.906a2.703 2.703 0 0 0-.24.309zM7.03 10.349l3.818-3.819a.8.8 0 1 1 1.132 1.132L8.16 11.48l3.819 3.818a.8.8 0 1 1-1.132 1.132L7.03 12.61l-3.818 3.82a.8.8 0 1 1-1.132-1.132L5.9 11.48 2.08 7.662A.8.8 0 1 1 3.212 6.53l3.818 3.82z"/></svg>';const aT="superscript";class cT extends Au{static get pluginName(){return"SuperscriptUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(aT,(n=>{const o=t.commands.get(aT);const i=new Ad(n);i.set({label:e("Superscript"),icon:sT,tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(aT);t.editing.view.focus()}));return i}))}}class lT extends Au{static get requires(){return[rT,cT]}static get pluginName(){return"Superscript"}}const dT="underline";class uT extends Au{static get pluginName(){return"UnderlineEditing"}init(){const t=this.editor;t.model.schema.extend("$text",{allowAttributes:dT});t.model.schema.setAttributeProperties(dT,{isFormatting:true,copyOnEnter:true});t.conversion.attributeToElement({model:dT,view:"u",upcastAlso:{styles:{"text-decoration":"underline"}}});t.commands.add(dT,new HS(t,dT));t.keystrokes.set("CTRL+U","underline")}}const hT='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M3 18v-1.5h14V18zm2.2-8V3.6c0-.4.4-.6.8-.6.3 0 .7.2.7.6v6.2c0 2 1.3 2.8 3.2 2.8 1.9 0 3.4-.9 3.4-2.9V3.6c0-.3.4-.5.8-.5.3 0 .7.2.7.5V10c0 2.7-2.2 4-4.9 4-2.6 0-4.7-1.2-4.7-4z"/></svg>';const fT="underline";class pT extends Au{static get pluginName(){return"UnderlineUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(fT,(n=>{const o=t.commands.get(fT);const i=new Ad(n);i.set({label:e("Underline"),icon:hT,keystroke:"CTRL+U",tooltip:true,isToggleable:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(fT);t.editing.view.focus()}));return i}))}}class gT extends Au{static get requires(){return[uT,pT]}static get pluginName(){return"Underline"}}class mT extends Ig{constructor(t){super(t);this.domEventType=["paste","copy","cut","drop","dragover","dragstart","dragend","dragenter","dragleave"];const e=this.document;this.listenTo(e,"paste",n("clipboardInput"),{priority:"low"});this.listenTo(e,"drop",n("clipboardInput"),{priority:"low"});this.listenTo(e,"dragover",n("dragging"),{priority:"low"});function n(t){return(n,o)=>{o.preventDefault();const i=o.dropRange?[o.dropRange]:null;const r=new C(e,t);e.fire(r,{dataTransfer:o.dataTransfer,method:n.name,targetRanges:i,target:o.target,domEvent:o.domEvent});if(r.stop.called){o.stopPropagation()}}}}onDomEvent(t){const e="clipboardData"in t?t.clipboardData:t.dataTransfer;const n=t.type=="drop"||t.type=="paste";const o={dataTransfer:new rb(e,{cacheFiles:n})};if(t.type=="drop"||t.type=="dragover"){o.dropRange=bT(this.view,t)}this.fire(t.type,t,o)}}function bT(t,e){const n=e.target.ownerDocument;const o=e.clientX;const i=e.clientY;let r;if(n.caretRangeFromPoint&&n.caretRangeFromPoint(o,i)){r=n.caretRangeFromPoint(o,i)}else if(e.rangeParent){r=n.createRange();r.setStart(e.rangeParent,e.rangeOffset);r.collapse(true)}if(r){return t.domConverter.domRangeToView(r)}return null}function kT(t){t=t.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br>").replace(/\t/g,"&nbsp;&nbsp;&nbsp;&nbsp;").replace(/^\s/,"&nbsp;").replace(/\s$/,"&nbsp;").replace(/\s\s/g," &nbsp;");if(t.includes("</p><p>")||t.includes("<br>")){t=`<p>${t}</p>`}return t}function wT(t){return t.replace(/<span(?: class="Apple-converted-space"|)>(\s+)<\/span>/g,((t,e)=>{if(e.length==1){return" "}return e})).replace(/<!--[\s\S]*?-->/g,"")}const _T=["figcaption","li"];function vT(t){let e="";if(t.is("$text")||t.is("$textProxy")){e=t.data}else if(t.is("element","img")&&t.hasAttribute("alt")){e=t.getAttribute("alt")}else if(t.is("element","br")){e="\n"}else{let n=null;for(const o of t.getChildren()){const t=vT(o);if(n&&(n.is("containerElement")||o.is("containerElement"))){if(_T.includes(n.name)||_T.includes(o.name)){e+="\n"}else{e+="\n\n"}}e+=t;n=o}}return e}class AT extends Au{static get pluginName(){return"ClipboardPipeline"}init(){const t=this.editor;const e=t.editing.view;e.addObserver(mT);this._setupPasteDrop();this._setupCopyCut()}_setupPasteDrop(){const t=this.editor;const e=t.model;const n=t.editing.view;const o=n.document;this.listenTo(o,"clipboardInput",((e,n)=>{if(n.method=="paste"&&!t.model.canEditAt(t.model.document.selection)){e.stop()}}),{priority:"highest"});this.listenTo(o,"clipboardInput",((t,e)=>{const o=e.dataTransfer;let i;if(e.content){i=e.content}else{let t="";if(o.getData("text/html")){t=wT(o.getData("text/html"))}else if(o.getData("text/plain")){t=kT(o.getData("text/plain"))}i=this.editor.data.htmlProcessor.toView(t)}const r=new C(this,"inputTransformation");this.fire(r,{content:i,dataTransfer:o,targetRanges:e.targetRanges,method:e.method});if(r.stop.called){t.stop()}n.scrollToTheSelection()}),{priority:"low"});this.listenTo(this,"inputTransformation",((t,n)=>{if(n.content.isEmpty){return}const o=this.editor.data;const i=o.toModel(n.content,"$clipboardHolder");if(i.childCount==0){return}t.stop();e.change((()=>{this.fire("contentInsertion",{content:i,method:n.method,dataTransfer:n.dataTransfer,targetRanges:n.targetRanges})}))}),{priority:"low"});this.listenTo(this,"contentInsertion",((t,n)=>{n.resultRange=e.insertContent(n.content)}),{priority:"low"})}_setupCopyCut(){const t=this.editor;const e=t.model.document;const n=t.editing.view;const o=n.document;const i=(n,i)=>{const r=i.dataTransfer;i.preventDefault();const s=t.data.toView(t.model.getSelectedContent(e.selection));o.fire("clipboardOutput",{dataTransfer:r,content:s,method:n.name})};this.listenTo(o,"copy",i,{priority:"low"});this.listenTo(o,"cut",((e,n)=>{if(!t.model.canEditAt(t.model.document.selection)){n.preventDefault()}else{i(e,n)}}),{priority:"low"});this.listenTo(o,"clipboardOutput",((n,o)=>{if(!o.content.isEmpty){o.dataTransfer.setData("text/html",this.editor.data.htmlProcessor.toData(o.content));o.dataTransfer.setData("text/plain",vT(o.content))}if(o.method=="cut"){t.model.deleteContent(e.selection)}}),{priority:"low"})}}function*CT(t,e){for(const n of e){if(n&&t.getAttributeProperties(n[0]).copyOnEnter){yield n}}}class yT extends yu{execute(){this.editor.model.change((t=>{this.enterBlock(t);this.fire("afterExecute",{writer:t})}))}enterBlock(t){const e=this.editor.model;const n=e.document.selection;const o=e.schema;const i=n.isCollapsed;const r=n.getFirstRange();const s=r.start.parent;const a=r.end.parent;if(o.isLimit(s)||o.isLimit(a)){if(!i&&s==a){e.deleteContent(n)}return false}if(i){const e=CT(t.model.schema,n.getAttributes());xT(t,r.start);t.setSelectionAttribute(e);return true}else{const o=!(r.start.isAtStart&&r.end.isAtEnd);const i=s==a;e.deleteContent(n,{leaveUnmerged:o});if(o){if(i){xT(t,n.focus);return true}else{t.setSelection(a,0)}}}return false}}function xT(t,e){t.split(e);t.setSelection(e.parent.nextSibling,0)}const ET={insertParagraph:{isSoft:false},insertLineBreak:{isSoft:true}};class ST extends Dg{constructor(t){super(t);const e=this.document;let n=false;e.on("keydown",((t,e)=>{n=e.shiftKey}));e.on("beforeinput",((o,i)=>{if(!this.isEnabled){return}let s=i.inputType;if(r.isSafari&&n&&s=="insertParagraph"){s="insertLineBreak"}const a=i.domEvent;const c=ET[s];if(!c){return}const l=new hp(e,"enter",i.targetRanges[0]);e.fire(l,new Bg(t,a,{isSoft:c.isSoft}));if(l.stop.called){o.stop()}}))}observe(){}stopObserving(){}}class DT extends Au{static get pluginName(){return"Enter"}init(){const t=this.editor;const e=t.editing.view;const n=e.document;e.addObserver(ST);t.commands.add("enter",new yT(t));this.listenTo(n,"enter",((o,i)=>{if(!n.isComposing){i.preventDefault()}if(i.isSoft){return}t.execute("enter");e.scrollToTheSelection()}),{priority:"low"})}}class TT extends yu{execute(){const t=this.editor.model;const e=t.document;t.change((n=>{BT(t,n,e.selection);this.fire("afterExecute",{writer:n})}))}refresh(){const t=this.editor.model;const e=t.document;this.isEnabled=PT(t.schema,e.selection)}}function PT(t,e){if(e.rangeCount>1){return false}const n=e.anchor;if(!n||!t.checkChild(n,"softBreak")){return false}const o=e.getFirstRange();const i=o.start.parent;const r=o.end.parent;if((RT(i,t)||RT(r,t))&&i!==r){return false}return true}function BT(t,e,n){const o=n.isCollapsed;const i=n.getFirstRange();const r=i.start.parent;const s=i.end.parent;const a=r==s;if(o){const o=CT(t.schema,n.getAttributes());IT(t,e,i.end);e.removeSelectionAttribute(n.getAttributeKeys());e.setSelectionAttribute(o)}else{const o=!(i.start.isAtStart&&i.end.isAtEnd);t.deleteContent(n,{leaveUnmerged:o});if(a){IT(t,e,n.focus)}else{if(o){e.setSelection(s,0)}}}}function IT(t,e,n){const o=e.createElement("softBreak");t.insertContent(o,n);e.setSelection(o,"after")}function RT(t,e){if(t.is("rootElement")){return false}return e.isLimit(t)||RT(t.parent,e)}class OT extends Au{static get pluginName(){return"ShiftEnter"}init(){const t=this.editor;const e=t.model.schema;const n=t.conversion;const o=t.editing.view;const i=o.document;e.register("softBreak",{allowWhere:"$text",isInline:true});n.for("upcast").elementToElement({model:"softBreak",view:"br"});n.for("downcast").elementToElement({model:"softBreak",view:(t,{writer:e})=>e.createEmptyElement("br")});o.addObserver(ST);t.commands.add("shiftEnter",new TT(t));this.listenTo(i,"enter",((e,n)=>{if(!i.isComposing){n.preventDefault()}if(!n.isSoft){return}t.execute("shiftEnter");o.scrollToTheSelection()}),{priority:"low"})}}class MT extends(q()){constructor(){super(...arguments);this._stack=[]}add(t,e){const n=this._stack;const o=n[0];this._insertDescriptor(t);const i=n[0];if(o!==i&&!VT(o,i)){this.fire("change:top",{oldDescriptor:o,newDescriptor:i,writer:e})}}remove(t,e){const n=this._stack;const o=n[0];this._removeDescriptor(t);const i=n[0];if(o!==i&&!VT(o,i)){this.fire("change:top",{oldDescriptor:o,newDescriptor:i,writer:e})}}_insertDescriptor(t){const e=this._stack;const n=e.findIndex((e=>e.id===t.id));if(VT(t,e[n])){return}if(n>-1){e.splice(n,1)}let o=0;while(e[o]&&zT(e[o],t)){o++}e.splice(o,0,t)}_removeDescriptor(t){const e=this._stack;const n=e.findIndex((e=>e.id===t));if(n>-1){e.splice(n,1)}}}function VT(t,e){return t&&e&&t.priority==e.priority&&FT(t.classes)==FT(e.classes)}function zT(t,e){if(t.priority>e.priority){return true}else if(t.priority<e.priority){return false}return FT(t.classes)>FT(e.classes)}function FT(t){return Array.isArray(t)?t.sort().join(","):t}const NT='<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M4 0v1H1v3H0V.5A.5.5 0 0 1 .5 0H4zm8 0h3.5a.5.5 0 0 1 .5.5V4h-1V1h-3V0zM4 16H.5a.5.5 0 0 1-.5-.5V12h1v3h3v1zm8 0v-1h3v-3h1v3.5a.5.5 0 0 1-.5.5H12z"/><path fill-opacity=".256" d="M1 1h14v14H1z"/><g class="ck-icon__selected-indicator"><path d="M7 0h2v1H7V0zM0 7h1v2H0V7zm15 0h1v2h-1V7zm-8 8h2v1H7v-1z"/><path fill-opacity=".254" d="M1 1h14v14H1z"/></g></svg>';const LT="ck-widget";const HT="ck-widget_selected";function jT(t){if(!t.is("element")){return false}return!!t.getCustomProperty("widget")}function qT(t,e,n={}){if(!t.is("containerElement")){throw new P("widget-to-widget-wrong-element-type",null,{element:t})}e.setAttribute("contenteditable","false",t);e.addClass(LT,t);e.setCustomProperty("widget",true,t);t.getFillerOffset=QT;e.setCustomProperty("widgetLabel",[],t);if(n.label){KT(t,n.label)}if(n.hasSelectionHandle){XT(t,e)}GT(t,e);return t}function $T(t,e,n){if(e.classes){n.addClass(el(e.classes),t)}if(e.attributes){for(const o in e.attributes){n.setAttribute(o,e.attributes[o],t)}}}function WT(t,e,n){if(e.classes){n.removeClass(el(e.classes),t)}if(e.attributes){for(const o in e.attributes){n.removeAttribute(o,t)}}}function GT(t,e,n=$T,o=WT){const i=new MT;i.on("change:top",((e,i)=>{if(i.oldDescriptor){o(t,i.oldDescriptor,i.writer)}if(i.newDescriptor){n(t,i.newDescriptor,i.writer)}}));const r=(t,e,n)=>i.add(e,n);const s=(t,e,n)=>i.remove(e,n);e.setCustomProperty("addHighlight",r,t);e.setCustomProperty("removeHighlight",s,t)}function KT(t,e){const n=t.getCustomProperty("widgetLabel");n.push(e)}function UT(t){const e=t.getCustomProperty("widgetLabel");return e.reduce(((t,e)=>{if(typeof e==="function"){return t?t+". "+e():e()}else{return t?t+". "+e:e}}),"")}function ZT(t,e,n={}){e.addClass(["ck-editor__editable","ck-editor__nested-editable"],t);e.setAttribute("role","textbox",t);if(n.label){e.setAttribute("aria-label",n.label,t)}e.setAttribute("contenteditable",t.isReadOnly?"false":"true",t);t.on("change:isReadOnly",((n,o,i)=>{e.setAttribute("contenteditable",i?"false":"true",t)}));t.on("change:isFocused",((n,o,i)=>{if(i){e.addClass("ck-editor__nested-editable_focused",t)}else{e.removeClass("ck-editor__nested-editable_focused",t)}}));GT(t,e);return t}function JT(t,e){const n=t.getSelectedElement();if(n){const o=rP(t);if(o){return e.createRange(e.createPositionAt(n,o))}}return Bv(t,e)}function YT(t,e){return(n,o)=>{const{mapper:i,viewPosition:r}=o;const s=i.findMappedViewAncestor(r);if(!e(s)){return}const a=i.toModelElement(s);o.modelPosition=t.createPositionAt(a,r.isAtStart?"before":"after")}}function QT(){return null}function XT(t,e){const n=e.createUIElement("div",{class:"ck ck-widget__selection-handle"},(function(t){const e=this.toDomElement(t);const n=new bd;n.set("content",NT);n.render();e.appendChild(n.element);return e}));e.insert(e.createPositionAt(t,0),n);e.addClass(["ck-widget_with-selection-handle"],t)}const tP="widget-type-around";function eP(t,e,n){return!!t&&jT(t)&&!n.isInline(e)}function nP(t){return t.closest(".ck-widget__type-around__button")}function oP(t){return t.classList.contains("ck-widget__type-around__button_before")?"before":"after"}function iP(t,e){const n=t.closest(".ck-widget");return e.mapDomToView(n)}function rP(t){return t.getAttribute(tP)}const sP='<svg viewBox="0 0 10 8" xmlns="http://www.w3.org/2000/svg"><path d="M9.055.263v3.972h-6.77M1 4.216l2-2.038m-2 2 2 2.038"/></svg>';var aP=n(347);var cP={injectType:"singletonStyleTag",attributes:{"data-cke":true}};cP.insert="head";cP.singleton=true;var lP=Il()(aP.Z,cP);const dP=aP.Z.locals||{};const uP=["before","after"];const hP=(new DOMParser).parseFromString(sP,"image/svg+xml").firstChild;const fP="ck-widget__type-around_disabled";class pP extends Au{constructor(){super(...arguments);this._currentFakeCaretModelElement=null}static get pluginName(){return"WidgetTypeAround"}static get requires(){return[DT,dD]}init(){const t=this.editor;const e=t.editing.view;this.on("change:isEnabled",((n,o,i)=>{e.change((t=>{for(const n of e.document.roots){if(i){t.removeClass(fP,n)}else{t.addClass(fP,n)}}}));if(!i){t.model.change((t=>{t.removeSelectionAttribute(tP)}))}}));this._enableTypeAroundUIInjection();this._enableInsertingParagraphsOnButtonClick();this._enableInsertingParagraphsOnEnterKeypress();this._enableInsertingParagraphsOnTypingKeystroke();this._enableTypeAroundFakeCaretActivationUsingKeyboardArrows();this._enableDeleteIntegration();this._enableInsertContentIntegration();this._enableInsertObjectIntegration();this._enableDeleteContentIntegration()}destroy(){super.destroy();this._currentFakeCaretModelElement=null}_insertParagraph(t,e){const n=this.editor;const o=n.editing.view;const i=n.model.schema.getAttributesWithProperty(t,"copyOnReplace",true);n.execute("insertParagraph",{position:n.model.createPositionAt(t,e),attributes:i});o.focus();o.scrollToTheSelection()}_listenToIfEnabled(t,e,n,o){this.listenTo(t,e,((...t)=>{if(this.isEnabled){n(...t)}}),o)}_insertParagraphAccordingToFakeCaretPosition(){const t=this.editor;const e=t.model;const n=e.document.selection;const o=rP(n);if(!o){return false}const i=n.getSelectedElement();this._insertParagraph(i,o);return true}_enableTypeAroundUIInjection(){const t=this.editor;const e=t.model.schema;const n=t.locale.t;const o={before:n("Insert paragraph before block"),after:n("Insert paragraph after block")};t.editing.downcastDispatcher.on("insert",((t,i,r)=>{const s=r.mapper.toViewElement(i.item);if(!s){return}if(eP(s,i.item,e)){gP(r.writer,o,s);const t=s.getCustomProperty("widgetLabel");t.push((()=>this.isEnabled?n("Press Enter to type after or press Shift + Enter to type before the widget"):""))}}),{priority:"low"})}_enableTypeAroundFakeCaretActivationUsingKeyboardArrows(){const t=this.editor;const e=t.model;const n=e.document.selection;const o=e.schema;const i=t.editing.view;this._listenToIfEnabled(i.document,"arrowKey",((t,e)=>{this._handleArrowKeyPress(t,e)}),{context:[jT,"$text"],priority:"high"});this._listenToIfEnabled(n,"change:range",((e,n)=>{if(!n.directChange){return}t.model.change((t=>{t.removeSelectionAttribute(tP)}))}));this._listenToIfEnabled(e.document,"change:data",(()=>{const e=n.getSelectedElement();if(e){const n=t.editing.mapper.toViewElement(e);if(eP(n,e,o)){return}}t.model.change((t=>{t.removeSelectionAttribute(tP)}))}));this._listenToIfEnabled(t.editing.downcastDispatcher,"selection",((t,e,n)=>{const i=n.writer;if(this._currentFakeCaretModelElement){const t=n.mapper.toViewElement(this._currentFakeCaretModelElement);if(t){i.removeClass(uP.map(r),t);this._currentFakeCaretModelElement=null}}const s=e.selection.getSelectedElement();if(!s){return}const a=n.mapper.toViewElement(s);if(!eP(a,s,o)){return}const c=rP(e.selection);if(!c){return}i.addClass(r(c),a);this._currentFakeCaretModelElement=s}));this._listenToIfEnabled(t.ui.focusTracker,"change:isFocused",((e,n,o)=>{if(!o){t.model.change((t=>{t.removeSelectionAttribute(tP)}))}}));function r(t){return`ck-widget_type-around_show-fake-caret_${t}`}}_handleArrowKeyPress(t,e){const n=this.editor;const o=n.model;const i=o.document.selection;const r=o.schema;const s=n.editing.view;const a=e.keyCode;const c=Qc(a,n.locale.contentLanguageDirection);const l=s.document.selection.getSelectedElement();const d=n.editing.mapper.toModelElement(l);let u;if(eP(l,d,r)){u=this._handleArrowKeyPressOnSelectedWidget(c)}else if(i.isCollapsed){u=this._handleArrowKeyPressWhenSelectionNextToAWidget(c)}else if(!e.shiftKey){u=this._handleArrowKeyPressWhenNonCollapsedSelection(c)}if(u){e.preventDefault();t.stop()}}_handleArrowKeyPressOnSelectedWidget(t){const e=this.editor;const n=e.model;const o=n.document.selection;const i=rP(o);return n.change((e=>{if(i){const n=i===(t?"after":"before");if(!n){e.removeSelectionAttribute(tP);return true}}else{e.setSelectionAttribute(tP,t?"after":"before");return true}return false}))}_handleArrowKeyPressWhenSelectionNextToAWidget(t){const e=this.editor;const n=e.model;const o=n.schema;const i=e.plugins.get("Widget");const r=i._getObjectElementNextToSelection(t);const s=e.editing.mapper.toViewElement(r);if(eP(s,r,o)){n.change((e=>{i._setSelectionOverElement(r);e.setSelectionAttribute(tP,t?"before":"after")}));return true}return false}_handleArrowKeyPressWhenNonCollapsedSelection(t){const e=this.editor;const n=e.model;const o=n.schema;const i=e.editing.mapper;const r=n.document.selection;const s=t?r.getLastPosition().nodeBefore:r.getFirstPosition().nodeAfter;const a=i.toViewElement(s);if(eP(a,s,o)){n.change((e=>{e.setSelection(s,"on");e.setSelectionAttribute(tP,t?"after":"before")}));return true}return false}_enableInsertingParagraphsOnButtonClick(){const t=this.editor;const e=t.editing.view;this._listenToIfEnabled(e.document,"mousedown",((n,o)=>{const i=nP(o.domTarget);if(!i){return}const r=oP(i);const s=iP(i,e.domConverter);const a=t.editing.mapper.toModelElement(s);this._insertParagraph(a,r);o.preventDefault();n.stop()}))}_enableInsertingParagraphsOnEnterKeypress(){const t=this.editor;const e=t.model.document.selection;const n=t.editing.view;this._listenToIfEnabled(n.document,"enter",((n,o)=>{if(n.eventPhase!="atTarget"){return}const i=e.getSelectedElement();const r=t.editing.mapper.toViewElement(i);const s=t.model.schema;let a;if(this._insertParagraphAccordingToFakeCaretPosition()){a=true}else if(eP(r,i,s)){this._insertParagraph(i,o.isSoft?"before":"after");a=true}if(a){o.preventDefault();n.stop()}}),{context:jT})}_enableInsertingParagraphsOnTypingKeystroke(){const t=this.editor;const e=t.editing.view.document;this._listenToIfEnabled(e,"insertText",((t,n)=>{if(this._insertParagraphAccordingToFakeCaretPosition()){n.selection=e.selection}}),{priority:"high"});if(r.isAndroid){this._listenToIfEnabled(e,"keydown",((t,e)=>{if(e.keyCode==229){this._insertParagraphAccordingToFakeCaretPosition()}}))}else{this._listenToIfEnabled(e,"compositionstart",(()=>{this._insertParagraphAccordingToFakeCaretPosition()}),{priority:"high"})}}_enableDeleteIntegration(){const t=this.editor;const e=t.editing.view;const n=t.model;const o=n.schema;this._listenToIfEnabled(e.document,"delete",((e,i)=>{if(e.eventPhase!="atTarget"){return}const r=rP(n.document.selection);if(!r){return}const s=i.direction;const a=n.document.selection.getSelectedElement();const c=r==="before";const l=s=="forward";const d=c===l;if(d){t.execute("delete",{selection:n.createSelection(a,"on")})}else{const e=o.getNearestSelectionRange(n.createPositionAt(a,r),s);if(e){if(!e.isCollapsed){n.change((n=>{n.setSelection(e);t.execute(l?"deleteForward":"delete")}))}else{const i=n.createSelection(e.start);n.modifySelection(i,{direction:s});if(!i.focus.isEqual(e.start)){n.change((n=>{n.setSelection(e);t.execute(l?"deleteForward":"delete")}))}else{const t=kP(o,e.start.parent);n.deleteContent(n.createSelection(t,"on"),{doNotAutoparagraph:true})}}}}i.preventDefault();e.stop()}),{context:jT})}_enableInsertContentIntegration(){const t=this.editor;const e=this.editor.model;const n=e.document.selection;this._listenToIfEnabled(t.model,"insertContent",((t,[o,i])=>{if(i&&!i.is("documentSelection")){return}const r=rP(n);if(!r){return}t.stop();return e.change((t=>{const i=n.getSelectedElement();const s=e.createPositionAt(i,r);const a=t.createSelection(s);const c=e.insertContent(o,a);t.setSelection(a);return c}))}),{priority:"high"})}_enableInsertObjectIntegration(){const t=this.editor;const e=this.editor.model;const n=e.document.selection;this._listenToIfEnabled(t.model,"insertObject",((t,e)=>{const[,o,i={}]=e;if(o&&!o.is("documentSelection")){return}const r=rP(n);if(!r){return}i.findOptimalPosition=r;e[3]=i}),{priority:"high"})}_enableDeleteContentIntegration(){const t=this.editor;const e=this.editor.model;const n=e.document.selection;this._listenToIfEnabled(t.model,"deleteContent",((t,[e])=>{if(e&&!e.is("documentSelection")){return}const o=rP(n);if(o){t.stop()}}),{priority:"high"})}}function gP(t,e,n){const o=t.createUIElement("div",{class:"ck ck-reset_all ck-widget__type-around"},(function(t){const n=this.toDomElement(t);mP(n,e);bP(n);return n}));t.insert(t.createPositionAt(n,"end"),o)}function mP(t,e){for(const n of uP){const o=new Nl({tag:"div",attributes:{class:["ck","ck-widget__type-around__button",`ck-widget__type-around__button_${n}`],title:e[n],"aria-hidden":"true"},children:[t.ownerDocument.importNode(hP,true)]});t.appendChild(o.render())}}function bP(t){const e=new Nl({tag:"div",attributes:{class:["ck","ck-widget__type-around__fake-caret"]}});t.appendChild(e.render())}function kP(t,e){let n=e;for(const o of e.getAncestors({parentFirst:true})){if(o.childCount>1||t.isLimit(o)){break}n=o}return n}function wP(t){const e=t.model;return(n,o)=>{const i=o.keyCode==$c.arrowup;const r=o.keyCode==$c.arrowdown;const s=o.shiftKey;const a=e.document.selection;if(!i&&!r){return}const c=r;if(s&&yP(a,c)){return}const l=_P(t,a,c);if(!l){return}if(l.isCollapsed){if(a.isCollapsed){return}else if(s){return}}if(l.isCollapsed||CP(t,l,c)){e.change((t=>{const n=c?l.end:l.start;if(s){const o=e.createSelection(a.anchor);o.setFocus(n);t.setSelection(o)}else{t.setSelection(n)}}));n.stop();o.preventDefault();o.stopPropagation()}}}function _P(t,e,n){const o=t.model;if(n){const t=e.isCollapsed?e.focus:e.getLastPosition();const n=vP(o,t,"forward");if(!n){return null}const i=o.createRange(t,n);const r=AP(o.schema,i,"backward");if(r){return o.createRange(t,r)}return null}else{const t=e.isCollapsed?e.focus:e.getFirstPosition();const n=vP(o,t,"backward");if(!n){return null}const i=o.createRange(n,t);const r=AP(o.schema,i,"forward");if(r){return o.createRange(r,t)}return null}}function vP(t,e,n){const o=t.schema;const i=t.createRangeIn(e.root);const r=n=="forward"?"elementStart":"elementEnd";for(const{previousPosition:t,item:s,type:a}of i.getWalker({startPosition:e,direction:n})){if(o.isLimit(s)&&!o.isInline(s)){return t}if(a==r&&o.isBlock(s)){return null}}return null}function AP(t,e,n){const o=n=="backward"?e.end:e.start;if(t.checkChild(o,"$text")){return o}for(const{nextPosition:o}of e.getWalker({direction:n})){if(t.checkChild(o,"$text")){return o}}return null}function CP(t,e,n){const o=t.model;const i=t.view.domConverter;if(n){const t=o.createSelection(e.start);o.modifySelection(t);if(!t.focus.isAtEnd&&!e.start.isEqual(t.focus)){e=o.createRange(t.focus,e.end)}}const r=t.mapper.toViewRange(e);const s=i.viewRangeToDom(r);const a=rc.getDomRangeRects(s);let c;for(const t of a){if(c===undefined){c=Math.round(t.bottom);continue}if(Math.round(t.top)>=c){return false}c=Math.max(c,Math.round(t.bottom))}return true}function yP(t,e){return!t.isCollapsed&&t.isBackward==e}var xP=n(153);var EP={injectType:"singletonStyleTag",attributes:{"data-cke":true}};EP.insert="head";EP.singleton=true;var SP=Il()(xP.Z,EP);const DP=xP.Z.locals||{};class TP extends Au{constructor(){super(...arguments);this._previouslySelected=new Set}static get pluginName(){return"Widget"}static get requires(){return[pP,dD]}init(){const t=this.editor;const e=t.editing.view;const n=e.document;this.editor.editing.downcastDispatcher.on("selection",((e,n,o)=>{const i=o.writer;const r=n.selection;if(r.isCollapsed){return}const s=r.getSelectedElement();if(!s){return}const a=t.editing.mapper.toViewElement(s);if(!jT(a)){return}if(!o.consumable.consume(r,"selection")){return}i.setSelection(i.createRangeOn(a),{fake:true,label:UT(a)})}));this.editor.editing.downcastDispatcher.on("selection",((t,e,n)=>{this._clearPreviouslySelectedWidgets(n.writer);const o=n.writer;const i=o.document.selection;let r=null;for(const t of i.getRanges()){for(const e of t){const t=e.item;if(jT(t)&&!BP(t,r)){o.addClass(HT,t);this._previouslySelected.add(t);r=t}}}}),{priority:"low"});e.addObserver(Wv);this.listenTo(n,"mousedown",((...t)=>this._onMousedown(...t)));this.listenTo(n,"arrowKey",((...t)=>{this._handleSelectionChangeOnArrowKeyPress(...t)}),{context:[jT,"$text"]});this.listenTo(n,"arrowKey",((...t)=>{this._preventDefaultOnArrowKeyPress(...t)}),{context:"$root"});this.listenTo(n,"arrowKey",wP(this.editor.editing),{context:"$text"});this.listenTo(n,"delete",((t,e)=>{if(this._handleDelete(e.direction=="forward")){e.preventDefault();t.stop()}}),{context:"$root"})}_onMousedown(t,e){const n=this.editor;const o=n.editing.view;const i=o.document;let s=e.target;if(PP(s)){if((r.isSafari||r.isGecko)&&e.domEvent.detail>=3){const t=n.editing.mapper;const o=s.is("attributeElement")?s.findAncestor((t=>!t.is("attributeElement"))):s;const i=t.toModelElement(o);e.preventDefault();this.editor.model.change((t=>{t.setSelection(i,"in")}))}return}if(!jT(s)){s=s.findAncestor(jT);if(!s){return}}if(r.isAndroid){e.preventDefault()}if(!i.isFocused){o.focus()}const a=n.editing.mapper.toModelElement(s);this._setSelectionOverElement(a)}_handleSelectionChangeOnArrowKeyPress(t,e){const n=e.keyCode;const o=this.editor.model;const i=o.schema;const r=o.document.selection;const s=r.getSelectedElement();const a=Jc(n,this.editor.locale.contentLanguageDirection);const c=a=="down"||a=="right";const l=a=="up"||a=="down";if(s&&i.isObject(s)){const n=c?r.getLastPosition():r.getFirstPosition();const s=i.getNearestSelectionRange(n,c?"forward":"backward");if(s){o.change((t=>{t.setSelection(s)}));e.preventDefault();t.stop()}return}if(!r.isCollapsed&&!e.shiftKey){const n=r.getFirstPosition();const s=r.getLastPosition();const a=n.nodeAfter;const l=s.nodeBefore;if(a&&i.isObject(a)||l&&i.isObject(l)){o.change((t=>{t.setSelection(c?s:n)}));e.preventDefault();t.stop()}return}if(!r.isCollapsed){return}const d=this._getObjectElementNextToSelection(c);if(d&&i.isObject(d)){if(i.isInline(d)&&l){return}this._setSelectionOverElement(d);e.preventDefault();t.stop()}}_preventDefaultOnArrowKeyPress(t,e){const n=this.editor.model;const o=n.schema;const i=n.document.selection.getSelectedElement();if(i&&o.isObject(i)){e.preventDefault();t.stop()}}_handleDelete(t){const e=this.editor.model.document;const n=e.selection;if(!this.editor.model.canEditAt(n)){return}if(!n.isCollapsed){return}const o=this._getObjectElementNextToSelection(t);if(o){this.editor.model.change((t=>{let e=n.anchor.parent;while(e.isEmpty){const n=e;e=n.parent;t.remove(n)}this._setSelectionOverElement(o)}));return true}}_setSelectionOverElement(t){this.editor.model.change((e=>{e.setSelection(e.createRangeOn(t))}))}_getObjectElementNextToSelection(t){const e=this.editor.model;const n=e.schema;const o=e.document.selection;const i=e.createSelection(o);e.modifySelection(i,{direction:t?"forward":"backward"});if(i.isEqual(o)){return null}const r=t?i.focus.nodeBefore:i.focus.nodeAfter;if(!!r&&n.isObject(r)){return r}return null}_clearPreviouslySelectedWidgets(t){for(const e of this._previouslySelected){t.removeClass(HT,e)}this._previouslySelected.clear()}}function PP(t){let e=t;while(e){if(e.is("editableElement")&&!e.is("rootElement")){return true}if(jT(e)){return false}e=e.parent}return false}function BP(t,e){if(!e){return false}return Array.from(t.getAncestors()).includes(e)}class IP extends(null&&Plugin){constructor(){super(...arguments);this._toolbarDefinitions=new Map}static get requires(){return[ContextualBalloon]}static get pluginName(){return"WidgetToolbarRepository"}init(){const t=this.editor;if(t.plugins.has("BalloonToolbar")){const e=t.plugins.get("BalloonToolbar");this.listenTo(e,"show",(e=>{if(MP(t.editing.view.document.selection)){e.stop()}}),{priority:"high"})}this._balloon=this.editor.plugins.get("ContextualBalloon");this.on("change:isEnabled",(()=>{this._updateToolbarsVisibility()}));this.listenTo(t.ui,"update",(()=>{this._updateToolbarsVisibility()}));this.listenTo(t.ui.focusTracker,"change:isFocused",(()=>{this._updateToolbarsVisibility()}),{priority:"low"})}destroy(){super.destroy();for(const t of this._toolbarDefinitions.values()){t.view.destroy()}}register(t,{ariaLabel:e,items:n,getRelatedElement:o,balloonClassName:i="ck-toolbar-container"}){if(!n.length){logWarning("widget-toolbar-no-items",{toolbarId:t});return}const r=this.editor;const s=r.t;const a=new ToolbarView(r.locale);a.ariaLabel=e||s("Widget toolbar");if(this._toolbarDefinitions.has(t)){throw new CKEditorError("widget-toolbar-duplicated",this,{toolbarId:t})}const c={view:a,getRelatedElement:o,balloonClassName:i,itemsConfig:n,initialized:false};r.ui.addToolbar(a,{isContextual:true,beforeFocus:()=>{const t=o(r.editing.view.document.selection);if(t){this._showToolbar(c,t)}},afterBlur:()=>{this._hideToolbar(c)}});this._toolbarDefinitions.set(t,c)}_updateToolbarsVisibility(){let t=0;let e=null;let n=null;for(const o of this._toolbarDefinitions.values()){const i=o.getRelatedElement(this.editor.editing.view.document.selection);if(!this.isEnabled||!i){if(this._isToolbarInBalloon(o)){this._hideToolbar(o)}}else if(!this.editor.ui.focusTracker.isFocused){if(this._isToolbarVisible(o)){this._hideToolbar(o)}}else{const r=i.getAncestors().length;if(r>t){t=r;e=i;n=o}}}if(n){this._showToolbar(n,e)}}_hideToolbar(t){this._balloon.remove(t.view);this.stopListening(this._balloon,"change:visibleView")}_showToolbar(t,e){if(this._isToolbarVisible(t)){RP(this.editor,e)}else if(!this._isToolbarInBalloon(t)){if(!t.initialized){t.initialized=true;t.view.fillFromConfig(t.itemsConfig,this.editor.ui.componentFactory)}this._balloon.add({view:t.view,position:OP(this.editor,e),balloonClassName:t.balloonClassName});this.listenTo(this._balloon,"change:visibleView",(()=>{for(const t of this._toolbarDefinitions.values()){if(this._isToolbarVisible(t)){const e=t.getRelatedElement(this.editor.editing.view.document.selection);RP(this.editor,e)}}}))}}_isToolbarVisible(t){return this._balloon.visibleView===t.view}_isToolbarInBalloon(t){return this._balloon.hasView(t.view)}}function RP(t,e){const n=t.plugins.get("ContextualBalloon");const o=OP(t,e);n.updatePosition(o)}function OP(t,e){const n=t.editing.view;const o=BalloonPanelView.defaultPositions;return{target:n.domConverter.mapViewToDom(e),positions:[o.northArrowSouth,o.northArrowSouthWest,o.northArrowSouthEast,o.southArrowNorth,o.southArrowNorthWest,o.southArrowNorthEast,o.viewportStickyNorth]}}function MP(t){const e=t.getSelectedElement();return!!(e&&isWidget(e))}class VP extends(lt()){constructor(t){super();this.set("activeHandlePosition",null);this.set("proposedWidthPercents",null);this.set("proposedWidth",null);this.set("proposedHeight",null);this.set("proposedHandleHostWidth",null);this.set("proposedHandleHostHeight",null);this._options=t;this._referenceCoordinates=null}get originalWidth(){return this._originalWidth}get originalHeight(){return this._originalHeight}get originalWidthPercents(){return this._originalWidthPercents}get aspectRatio(){return this._aspectRatio}begin(t,e,n){const o=new rc(e);this.activeHandlePosition=LP(t);this._referenceCoordinates=FP(e,HP(this.activeHandlePosition));this._originalWidth=o.width;this._originalHeight=o.height;this._aspectRatio=o.width/o.height;const i=n.style.width;if(i&&i.match(/^\d+(\.\d*)?%$/)){this._originalWidthPercents=parseFloat(i)}else{this._originalWidthPercents=zP(n,o)}}update(t){this.proposedWidth=t.width;this.proposedHeight=t.height;this.proposedWidthPercents=t.widthPercents;this.proposedHandleHostWidth=t.handleHostWidth;this.proposedHandleHostHeight=t.handleHostHeight}}function zP(t,e){const n=t.parentElement;let o=parseFloat(n.ownerDocument.defaultView.getComputedStyle(n).width);const i=5;let r=0;let s=n;while(isNaN(o)){s=s.parentElement;if(++r>i){return 0}o=parseFloat(n.ownerDocument.defaultView.getComputedStyle(s).width)}return e.width/o*100}function FP(t,e){const n=new rc(t);const o=e.split("-");const i={x:o[1]=="right"?n.right:n.left,y:o[0]=="bottom"?n.bottom:n.top};i.x+=t.ownerDocument.defaultView.scrollX;i.y+=t.ownerDocument.defaultView.scrollY;return i}function NP(t){return`ck-widget__resizer__handle-${t}`}function LP(t){const e=["top-left","top-right","bottom-right","bottom-left"];for(const n of e){if(t.classList.contains(NP(n))){return n}}}function HP(t){const e=t.split("-");const n={top:"bottom",bottom:"top",left:"right",right:"left"};return`${n[e[0]]}-${n[e[1]]}`}class jP extends zl{constructor(){super();const t=this.bindTemplate;this.setTemplate({tag:"div",attributes:{class:["ck","ck-size-view",t.to("_viewPosition",(t=>t?`ck-orientation-${t}`:""))],style:{display:t.if("_isVisible","none",(t=>!t))}},children:[{text:t.to("_label")}]})}_bindToState(t,e){this.bind("_isVisible").to(e,"proposedWidth",e,"proposedHeight",((t,e)=>t!==null&&e!==null));this.bind("_label").to(e,"proposedHandleHostWidth",e,"proposedHandleHostHeight",e,"proposedWidthPercents",((e,n,o)=>{if(t.unit==="px"){return`${e}×${n}`}else{return`${o}%`}}));this.bind("_viewPosition").to(e,"activeHandlePosition",e,"proposedHandleHostWidth",e,"proposedHandleHostHeight",((t,e,n)=>e<50||n<50?"above-center":t))}_dismiss(){this.unbind();this._isVisible=false}}class qP extends(lt()){constructor(t){super();this._viewResizerWrapper=null;this._options=t;this.set("isEnabled",true);this.set("isSelected",false);this.bind("isVisible").to(this,"isEnabled",this,"isSelected",((t,e)=>t&&e));this.decorate("begin");this.decorate("cancel");this.decorate("commit");this.decorate("updateSize");this.on("commit",(t=>{if(!this.state.proposedWidth&&!this.state.proposedWidthPercents){this._cleanup();t.stop()}}),{priority:"high"})}get state(){return this._state}show(){const t=this._options.editor.editing.view;t.change((t=>{t.removeClass("ck-hidden",this._viewResizerWrapper)}))}hide(){const t=this._options.editor.editing.view;t.change((t=>{t.addClass("ck-hidden",this._viewResizerWrapper)}))}attach(){const t=this;const e=this._options.viewElement;const n=this._options.editor.editing.view;n.change((n=>{const o=n.createUIElement("div",{class:"ck ck-reset_all ck-widget__resizer"},(function(e){const n=this.toDomElement(e);t._appendHandles(n);t._appendSizeUI(n);return n}));n.insert(n.createPositionAt(e,"end"),o);n.addClass("ck-widget_with-resizer",e);this._viewResizerWrapper=o;if(!this.isVisible){this.hide()}}));this.on("change:isVisible",(()=>{if(this.isVisible){this.show();this.redraw()}else{this.hide()}}))}begin(t){this._state=new VP(this._options);this._sizeView._bindToState(this._options,this.state);this._initialViewWidth=this._options.viewElement.getStyle("width");this.state.begin(t,this._getHandleHost(),this._getResizeHost())}updateSize(t){const e=this._proposeNewSize(t);const n=this._options.editor.editing.view;n.change((t=>{const n=this._options.unit||"%";const o=(n==="%"?e.widthPercents:e.width)+n;t.setStyle("width",o,this._options.viewElement)}));const o=this._getHandleHost();const i=new rc(o);const r=Math.round(i.width);const s=Math.round(i.height);const a=new rc(o);e.width=Math.round(a.width);e.height=Math.round(a.height);this.redraw(i);this.state.update({...e,handleHostWidth:r,handleHostHeight:s})}commit(){const t=this._options.unit||"%";const e=(t==="%"?this.state.proposedWidthPercents:this.state.proposedWidth)+t;this._options.editor.editing.view.change((()=>{this._cleanup();this._options.onCommit(e)}))}cancel(){this._cleanup()}destroy(){this.cancel()}redraw(t){const e=this._domResizerWrapper;if(!GP(e)){return}const n=e.parentElement;const o=this._getHandleHost();const i=this._viewResizerWrapper;const r=[i.getStyle("width"),i.getStyle("height"),i.getStyle("left"),i.getStyle("top")];let s;if(n.isSameNode(o)){const e=t||new rc(o);s=[e.width+"px",e.height+"px",undefined,undefined]}else{s=[o.offsetWidth+"px",o.offsetHeight+"px",o.offsetLeft+"px",o.offsetTop+"px"]}if(At(r,s)!=="same"){this._options.editor.editing.view.change((t=>{t.setStyle({width:s[0],height:s[1],left:s[2],top:s[3]},i)}))}}containsHandle(t){return this._domResizerWrapper.contains(t)}static isResizeHandle(t){return t.classList.contains("ck-widget__resizer__handle")}_cleanup(){this._sizeView._dismiss();const t=this._options.editor.editing.view;t.change((t=>{t.setStyle("width",this._initialViewWidth,this._options.viewElement)}))}_proposeNewSize(t){const e=this.state;const n=WP(t);const o=this._options.isCentered?this._options.isCentered(this):true;const i={x:e._referenceCoordinates.x-(n.x+e.originalWidth),y:n.y-e.originalHeight-e._referenceCoordinates.y};if(o&&e.activeHandlePosition.endsWith("-right")){i.x=n.x-(e._referenceCoordinates.x+e.originalWidth)}if(o){i.x*=2}let r=Math.abs(e.originalWidth+i.x);let s=Math.abs(e.originalHeight+i.y);const a=r/e.aspectRatio>s?"width":"height";if(a=="width"){s=r/e.aspectRatio}else{r=s*e.aspectRatio}return{width:Math.round(r),height:Math.round(s),widthPercents:Math.min(Math.round(e.originalWidthPercents/e.originalWidth*r*100)/100,100)}}_getResizeHost(){const t=this._domResizerWrapper.parentElement;return this._options.getResizeHost(t)}_getHandleHost(){const t=this._domResizerWrapper.parentElement;return this._options.getHandleHost(t)}get _domResizerWrapper(){return this._options.editor.editing.view.domConverter.mapViewToDom(this._viewResizerWrapper)}_appendHandles(t){const e=["top-left","top-right","bottom-right","bottom-left"];for(const n of e){t.appendChild(new Nl({tag:"div",attributes:{class:`ck-widget__resizer__handle ${$P(n)}`}}).render())}}_appendSizeUI(t){this._sizeView=new jP;this._sizeView.render();t.appendChild(this._sizeView.element)}}function $P(t){return`ck-widget__resizer__handle-${t}`}function WP(t){return{x:t.pageX,y:t.pageY}}function GP(t){return t&&t.ownerDocument&&t.ownerDocument.contains(t)}var KP=n(875);var UP={injectType:"singletonStyleTag",attributes:{"data-cke":true}};UP.insert="head";UP.singleton=true;var ZP=Il()(KP.Z,UP);const JP=KP.Z.locals||{};class YP extends(null&&Plugin){constructor(){super(...arguments);this._resizers=new Map}static get pluginName(){return"WidgetResize"}init(){const t=this.editor.editing;const e=global.window.document;this.set("selectedResizer",null);this.set("_activeResizer",null);t.view.addObserver(MouseObserver);this._observer=new(DomEmitterMixin());this.listenTo(t.view.document,"mousedown",this._mouseDownListener.bind(this),{priority:"high"});this._observer.listenTo(e,"mousemove",this._mouseMoveListener.bind(this));this._observer.listenTo(e,"mouseup",this._mouseUpListener.bind(this));this._redrawSelectedResizerThrottled=throttle((()=>this.redrawSelectedResizer()),200);this.editor.ui.on("update",this._redrawSelectedResizerThrottled);this.editor.model.document.on("change",(()=>{for(const[t,e]of this._resizers){if(!t.isAttached()){this._resizers.delete(t);e.destroy()}}}),{priority:"lowest"});this._observer.listenTo(global.window,"resize",this._redrawSelectedResizerThrottled);const n=this.editor.editing.view.document.selection;n.on("change",(()=>{const t=n.getSelectedElement();const e=this.getResizerByViewElement(t)||null;if(e){this.select(e)}else{this.deselect()}}))}redrawSelectedResizer(){if(this.selectedResizer&&this.selectedResizer.isVisible){this.selectedResizer.redraw()}}destroy(){super.destroy();this._observer.stopListening();for(const t of this._resizers.values()){t.destroy()}this._redrawSelectedResizerThrottled.cancel()}select(t){this.deselect();this.selectedResizer=t;this.selectedResizer.isSelected=true}deselect(){if(this.selectedResizer){this.selectedResizer.isSelected=false}this.selectedResizer=null}attachTo(t){const e=new Resizer(t);const n=this.editor.plugins;e.attach();if(n.has("WidgetToolbarRepository")){const t=n.get("WidgetToolbarRepository");e.on("begin",(()=>{t.forceDisabled("resize")}),{priority:"lowest"});e.on("cancel",(()=>{t.clearForceDisabled("resize")}),{priority:"highest"});e.on("commit",(()=>{t.clearForceDisabled("resize")}),{priority:"highest"})}this._resizers.set(t.viewElement,e);const o=this.editor.editing.view.document.selection;const i=o.getSelectedElement();if(this.getResizerByViewElement(i)==e){this.select(e)}return e}getResizerByViewElement(t){return this._resizers.get(t)}_getResizerByHandle(t){for(const e of this._resizers.values()){if(e.containsHandle(t)){return e}}}_mouseDownListener(t,e){const n=e.domTarget;if(!Resizer.isResizeHandle(n)){return}this._activeResizer=this._getResizerByHandle(n)||null;if(this._activeResizer){this._activeResizer.begin(n);t.stop();e.preventDefault()}}_mouseMoveListener(t,e){if(this._activeResizer){this._activeResizer.updateSize(e)}}_mouseUpListener(){if(this._activeResizer){this._activeResizer.commit();this._activeResizer=null}}}var QP=n(799);var XP={injectType:"singletonStyleTag",attributes:{"data-cke":true}};XP.insert="head";XP.singleton=true;var tB=Il()(QP.Z,XP);const eB=QP.Z.locals||{};class nB extends Au{static get pluginName(){return"DragDrop"}static get requires(){return[AT,TP]}init(){const t=this.editor;const e=t.editing.view;this._draggedRange=null;this._draggingUid="";this._draggableElement=null;this._updateDropMarkerThrottled=lE((t=>this._updateDropMarker(t)),40);this._removeDropMarkerDelayed=wl((()=>this._removeDropMarker()),40);this._clearDraggableAttributesDelayed=wl((()=>this._clearDraggableAttributes()),40);if(t.plugins.has("DragDropExperimental")){this.forceDisabled("DragDropExperimental");return}e.addObserver(mT);e.addObserver(Wv);this._setupDragging();this._setupContentInsertionIntegration();this._setupClipboardInputIntegration();this._setupDropMarker();this._setupDraggableAttributeHandling();this.listenTo(t,"change:isReadOnly",((t,e,n)=>{if(n){this.forceDisabled("readOnlyMode")}else{this.clearForceDisabled("readOnlyMode")}}));this.on("change:isEnabled",((t,e,n)=>{if(!n){this._finalizeDragging(false)}}));if(r.isAndroid){this.forceDisabled("noAndroidSupport")}}destroy(){if(this._draggedRange){this._draggedRange.detach();this._draggedRange=null}this._updateDropMarkerThrottled.cancel();this._removeDropMarkerDelayed.cancel();this._clearDraggableAttributesDelayed.cancel();return super.destroy()}_setupDragging(){const t=this.editor;const e=t.model;const n=e.document;const o=t.editing.view;const i=o.document;this.listenTo(i,"dragstart",((o,r)=>{const s=n.selection;if(r.target&&r.target.is("editableElement")){r.preventDefault();return}const a=r.target?dB(r.target):null;if(a){const n=t.editing.mapper.toModelElement(a);this._draggedRange=Kb.fromRange(e.createRangeOn(n));if(t.plugins.has("WidgetToolbarRepository")){const e=t.plugins.get("WidgetToolbarRepository");e.forceDisabled("dragDrop")}}else if(!i.selection.isCollapsed){const t=i.selection.getSelectedElement();if(!t||!jT(t)){this._draggedRange=Kb.fromRange(s.getFirstRange())}}if(!this._draggedRange){r.preventDefault();return}this._draggingUid=x();const c=this.isEnabled&&t.model.canEditAt(this._draggedRange);r.dataTransfer.effectAllowed=c?"copyMove":"copy";r.dataTransfer.setData("application/ckeditor5-dragging-uid",this._draggingUid);const l=e.createSelection(this._draggedRange.toRange());const d=t.data.toView(e.getSelectedContent(l));i.fire("clipboardOutput",{dataTransfer:r.dataTransfer,content:d,method:"dragstart"});if(!c){this._draggedRange.detach();this._draggedRange=null;this._draggingUid=""}}),{priority:"low"});this.listenTo(i,"dragend",((t,e)=>{this._finalizeDragging(!e.dataTransfer.isCanceled&&e.dataTransfer.dropEffect=="move")}),{priority:"low"});this.listenTo(i,"dragenter",(()=>{if(!this.isEnabled){return}o.focus()}));this.listenTo(i,"dragleave",(()=>{this._removeDropMarkerDelayed()}));this.listenTo(i,"dragging",((e,n)=>{if(!this.isEnabled){n.dataTransfer.dropEffect="none";return}this._removeDropMarkerDelayed.cancel();const o=oB(t,n.targetRanges,n.target);if(!t.model.canEditAt(o)){n.dataTransfer.dropEffect="none";return}if(!this._draggedRange){n.dataTransfer.dropEffect="copy"}if(!r.isGecko){if(n.dataTransfer.effectAllowed=="copy"){n.dataTransfer.dropEffect="copy"}else if(["all","copyMove"].includes(n.dataTransfer.effectAllowed)){n.dataTransfer.dropEffect="move"}}if(o){this._updateDropMarkerThrottled(o)}}),{priority:"low"})}_setupClipboardInputIntegration(){const t=this.editor;const e=t.editing.view;const n=e.document;this.listenTo(n,"clipboardInput",((e,n)=>{if(n.method!="drop"){return}const o=oB(t,n.targetRanges,n.target);this._removeDropMarker();if(!o||!t.model.canEditAt(o)){this._finalizeDragging(false);e.stop();return}if(this._draggedRange&&this._draggingUid!=n.dataTransfer.getData("application/ckeditor5-dragging-uid")){this._draggedRange.detach();this._draggedRange=null;this._draggingUid=""}const i=lB(n.dataTransfer)=="move";if(i&&this._draggedRange&&this._draggedRange.containsRange(o,true)){this._finalizeDragging(false);e.stop();return}n.targetRanges=[t.editing.mapper.toViewRange(o)]}),{priority:"high"})}_setupContentInsertionIntegration(){const t=this.editor.plugins.get(AT);t.on("contentInsertion",((t,e)=>{if(!this.isEnabled||e.method!=="drop"){return}const n=e.targetRanges.map((t=>this.editor.editing.mapper.toModelRange(t)));this.editor.model.change((t=>t.setSelection(n)))}),{priority:"high"});t.on("contentInsertion",((t,e)=>{if(!this.isEnabled||e.method!=="drop"){return}const n=lB(e.dataTransfer)=="move";const o=!e.resultRange||!e.resultRange.isCollapsed;this._finalizeDragging(o&&n)}),{priority:"lowest"})}_setupDraggableAttributeHandling(){const t=this.editor;const e=t.editing.view;const n=e.document;this.listenTo(n,"mousedown",((o,i)=>{if(r.isAndroid||!i){return}this._clearDraggableAttributesDelayed.cancel();let s=dB(i.target);if(r.isBlink&&!s&&!n.selection.isCollapsed){const t=n.selection.getSelectedElement();if(!t||!jT(t)){const t=n.selection.editableElement;if(t&&!t.isReadOnly){s=t}}}if(s){e.change((t=>{t.setAttribute("draggable","true",s)}));this._draggableElement=t.editing.mapper.toModelElement(s)}}));this.listenTo(n,"mouseup",(()=>{if(!r.isAndroid){this._clearDraggableAttributesDelayed()}}))}_clearDraggableAttributes(){const t=this.editor.editing;t.view.change((e=>{if(this._draggableElement&&this._draggableElement.root.rootName!="$graveyard"){e.removeAttribute("draggable",t.mapper.toViewElement(this._draggableElement))}this._draggableElement=null}))}_setupDropMarker(){const t=this.editor;t.conversion.for("editingDowncast").markerToHighlight({model:"drop-target",view:{classes:["ck-clipboard-drop-target-range"]}});t.conversion.for("editingDowncast").markerToElement({model:"drop-target",view:(e,{writer:n})=>{const o=t.model.schema.checkChild(e.markerRange.start,"$text");if(!o){return}return n.createUIElement("span",{class:"ck ck-clipboard-drop-target-position"},(function(t){const e=this.toDomElement(t);e.append("⁠",t.createElement("span"),"⁠");return e}))}})}_updateDropMarker(t){const e=this.editor;const n=e.model.markers;e.model.change((e=>{if(n.has("drop-target")){if(!n.get("drop-target").getRange().isEqual(t)){e.updateMarker("drop-target",{range:t})}}else{e.addMarker("drop-target",{range:t,usingOperation:false,affectsData:false})}}))}_removeDropMarker(){const t=this.editor.model;this._removeDropMarkerDelayed.cancel();this._updateDropMarkerThrottled.cancel();if(t.markers.has("drop-target")){t.change((t=>{t.removeMarker("drop-target")}))}}_finalizeDragging(t){const e=this.editor;const n=e.model;this._removeDropMarker();this._clearDraggableAttributes();if(e.plugins.has("WidgetToolbarRepository")){const t=e.plugins.get("WidgetToolbarRepository");t.clearForceDisabled("dragDrop")}this._draggingUid="";if(!this._draggedRange){return}if(t&&this.isEnabled){n.deleteContent(n.createSelection(this._draggedRange),{doNotAutoparagraph:true})}this._draggedRange.detach();this._draggedRange=null}}function oB(t,e,n){const o=t.model;const i=t.editing.mapper;let s=null;const a=e?e[0].start:null;if(n.is("uiElement")){n=n.parent}s=iB(t,n);if(s){return s}const c=cB(t,n);const l=a?i.toModelPosition(a):null;if(!l){return rB(t,c)}s=sB(t,l,c);if(s){return s}s=o.schema.getNearestSelectionRange(l,r.isGecko?"forward":"backward");if(s){return s}return aB(t,l.parent)}function iB(t,e){const n=t.model;const o=t.editing.mapper;if(jT(e)){return n.createRangeOn(o.toModelElement(e))}if(!e.is("editableElement")){const t=e.findAncestor((t=>jT(t)||t.is("editableElement")));if(jT(t)){return n.createRangeOn(o.toModelElement(t))}}return null}function rB(t,e){const n=t.model;const o=n.schema;const i=n.createPositionAt(e,0);return o.getNearestSelectionRange(i,"forward")}function sB(t,e,n){const o=t.model;if(!o.schema.checkChild(n,"$block")){return null}const i=o.createPositionAt(n,0);const r=e.path.slice(0,i.path.length);const s=o.createPositionFromPath(e.root,r);const a=s.nodeAfter;if(a&&o.schema.isObject(a)){return o.createRangeOn(a)}return null}function aB(t,e){const n=t.model;let o=e;while(o){if(n.schema.isObject(o)){return n.createRangeOn(o)}o=o.parent}return null}function cB(t,e){const n=t.editing.mapper;const o=t.editing.view;const i=n.toModelElement(e);if(i){return i}const r=o.createPositionBefore(e);const s=n.findMappedViewAncestor(r);return n.toModelElement(s)}function lB(t){if(r.isGecko){return t.dropEffect}return["all","copyMove"].includes(t.effectAllowed)?"move":"copy"}function dB(t){if(t.is("editableElement")){return null}if(t.hasClass("ck-widget__selection-handle")){return t.findAncestor(jT)}if(jT(t)){return t}const e=t.findAncestor((t=>jT(t)||t.is("editableElement")));if(jT(e)){return e}return null}class uB extends Au{static get pluginName(){return"PastePlainText"}static get requires(){return[AT]}init(){const t=this.editor;const e=t.model;const n=t.editing.view;const o=n.document;const i=e.document.selection;let r=false;n.addObserver(mT);this.listenTo(o,"keydown",((t,e)=>{r=e.shiftKey}));t.plugins.get(AT).on("contentInsertion",((t,n)=>{if(!r&&!hB(n.content,e.schema)){return}e.change((t=>{const o=Array.from(i.getAttributes()).filter((([t])=>e.schema.getAttributeProperties(t).isFormatting));if(!i.isCollapsed){e.deleteContent(i,{doNotAutoparagraph:true})}o.push(...i.getAttributes());const r=t.createRangeIn(n.content);for(const e of r.getItems()){if(e.is("$textProxy")){t.setAttributes(o,e)}}}))}))}}function hB(t,e){if(t.childCount>1){return false}const n=t.getChild(0);if(e.isObject(n)){return false}return Array.from(n.getAttributeKeys()).length==0}class fB extends Au{static get pluginName(){return"Clipboard"}static get requires(){return[AT,nB,uB]}}const pB=mc("px");class gB extends(null&&View){constructor(){super();const t=this.bindTemplate;this.set({isVisible:false,left:null,top:null,width:null});this.setTemplate({tag:"div",attributes:{class:["ck","ck-clipboard-drop-target-line",t.if("isVisible","ck-hidden",(t=>!t))],style:{left:t.to("left",(t=>pB(t))),top:t.to("top",(t=>pB(t))),width:t.to("width",(t=>pB(t)))}}})}}class mB extends(null&&Plugin){constructor(){super(...arguments);this.removeDropMarkerDelayed=delay((()=>this.removeDropMarker()),40);this._updateDropMarkerThrottled=throttle((t=>this._updateDropMarker(t)),40);this._reconvertMarkerThrottled=throttle((()=>{if(this.editor.model.markers.has("drop-target")){this.editor.editing.reconvertMarker("drop-target")}}),0);this._dropTargetLineView=new LineView;this._domEmitter=new(DomEmitterMixin());this._scrollables=new Map}static get pluginName(){return"DragDropTarget"}init(){this._setupDropMarker()}destroy(){this._domEmitter.stopListening();for(const{resizeObserver:t}of this._scrollables.values()){t.destroy()}this._updateDropMarkerThrottled.cancel();this.removeDropMarkerDelayed.cancel();this._reconvertMarkerThrottled.cancel();return super.destroy()}updateDropMarker(t,e,n,o,i){this.removeDropMarkerDelayed.cancel();const r=bB(this.editor,t,e,n,o,i);if(r){this._updateDropMarkerThrottled(r)}}getFinalDropRange(t,e,n,o,i){const r=bB(this.editor,t,e,n,o,i);this.removeDropMarker();return r}removeDropMarker(){const t=this.editor.model;this.removeDropMarkerDelayed.cancel();this._updateDropMarkerThrottled.cancel();this._dropTargetLineView.isVisible=false;if(t.markers.has("drop-target")){t.change((t=>{t.removeMarker("drop-target")}))}}_setupDropMarker(){const t=this.editor;t.ui.view.body.add(this._dropTargetLineView);t.conversion.for("editingDowncast").markerToHighlight({model:"drop-target",view:{classes:["ck-clipboard-drop-target-range"]}});t.conversion.for("editingDowncast").markerToElement({model:"drop-target",view:(e,{writer:n})=>{if(t.model.schema.checkChild(e.markerRange.start,"$text")){this._dropTargetLineView.isVisible=false;return this._createDropTargetPosition(n)}else{if(e.markerRange.isCollapsed){this._updateDropTargetLine(e.markerRange)}else{this._dropTargetLineView.isVisible=false}}}})}_updateDropMarker(t){const e=this.editor;const n=e.model.markers;e.model.change((e=>{if(n.has("drop-target")){if(!n.get("drop-target").getRange().isEqual(t)){e.updateMarker("drop-target",{range:t})}}else{e.addMarker("drop-target",{range:t,usingOperation:false,affectsData:false})}}))}_createDropTargetPosition(t){return t.createUIElement("span",{class:"ck ck-clipboard-drop-target-position"},(function(t){const e=this.toDomElement(t);e.append("⁠",t.createElement("span"),"⁠");return e}))}_updateDropTargetLine(t){const e=this.editor.editing;const n=t.start.nodeBefore;const o=t.start.nodeAfter;const i=t.start.parent;const r=n?e.mapper.toViewElement(n):null;const s=r?e.view.domConverter.mapViewToDom(r):null;const a=o?e.mapper.toViewElement(o):null;const c=a?e.view.domConverter.mapViewToDom(a):null;const l=e.mapper.toViewElement(i);const d=e.view.domConverter.mapViewToDom(l);const u=this._getScrollableRect(l);const{scrollX:h,scrollY:f}=global.window;const p=s?new Rect(s):null;const g=c?new Rect(c):null;const m=new Rect(d).excludeScrollbarsAndBorders();const b=p?p.bottom:m.top;const k=g?g.top:m.bottom;const w=global.window.getComputedStyle(d);const _=b<=k?(b+k)/2:k;if(u.top<_&&_<u.bottom){const t=m.left+parseFloat(w.paddingLeft);const e=m.right-parseFloat(w.paddingRight);const n=Math.max(t+h,u.left);const o=Math.min(e+h,u.right);this._dropTargetLineView.set({isVisible:true,left:n,top:_+f,width:o-n})}else{this._dropTargetLineView.isVisible=false}}_getScrollableRect(t){const e=t.root.rootName;let n;if(this._scrollables.has(e)){n=this._scrollables.get(e).domElement}else{const o=this.editor.editing.view.domConverter.mapViewToDom(t);n=AB(o);this._domEmitter.listenTo(n,"scroll",this._reconvertMarkerThrottled,{usePassive:true});const i=new ResizeObserver(n,this._reconvertMarkerThrottled);this._scrollables.set(e,{domElement:n,resizeObserver:i})}return new Rect(n).excludeScrollbarsAndBorders()}}function bB(t,e,n,o,i,r){const s=t.model;const a=t.editing.mapper;const c=vB(t,e);let l=c;while(l){if(!r){if(s.schema.checkChild(l,"$text")){const e=n?n[0].start:null;const r=e?a.toModelPosition(e):null;if(r){if(s.schema.checkChild(r,"$text")){return s.createRange(r)}else if(e){return wB(t,vB(t,e.parent),o,i)}}}else if(s.schema.isInline(l)){return wB(t,l,o,i)}}if(s.schema.isBlock(l)){return wB(t,l,o,i)}else if(s.schema.checkChild(l,"$block")){const e=Array.from(l.getChildren()).filter((e=>e.is("element")&&!kB(t,e)));let n=0;let r=e.length;while(n<r-1){const s=Math.floor((n+r)/2);const a=_B(t,e[s],o,i);if(a=="before"){r=s}else{n=s}}return wB(t,e[n],o,i)}l=l.parent}console.warn("none:",c.name);return null}function kB(t,e){const n=t.editing.mapper;const o=t.editing.view.domConverter;const i=n.toViewElement(e);const r=o.mapViewToDom(i);return global.window.getComputedStyle(r).float!="none"}function wB(t,e,n,o){const i=t.model;return i.createRange(i.createPositionAt(e,_B(t,e,n,o)))}function _B(t,e,n,o){const i=t.editing.mapper;const r=t.editing.view.domConverter;const s=i.toViewElement(e);const a=r.mapViewToDom(s);const c=new Rect(a);if(t.model.schema.isInline(e)){return n<(c.left+c.right)/2?"before":"after"}else{return o<(c.top+c.bottom)/2?"before":"after"}}function vB(t,e){const n=t.editing.mapper;const o=t.editing.view;const i=n.toModelElement(e);if(i){return i}const r=o.createPositionBefore(e);const s=n.findMappedViewAncestor(r);return n.toModelElement(s)}function AB(t){let e=t;do{e=e.parentElement;const t=global.window.getComputedStyle(e).overflowY;if(t=="auto"||t=="scroll"){break}}while(e.tagName!="BODY");return e}class CB extends(null&&Plugin){constructor(){super(...arguments);this._clearDraggableAttributesDelayed=delay((()=>this._clearDraggableAttributes()),40);this._blockMode=false;this._domEmitter=new(DomEmitterMixin())}static get pluginName(){return"DragDropExperimental"}static get requires(){return[ClipboardPipeline,Widget,DragDropTarget]}init(){const t=this.editor;const e=t.editing.view;this._draggedRange=null;this._draggingUid="";this._draggableElement=null;e.addObserver(ClipboardObserver);e.addObserver(MouseObserver);this._setupDragging();this._setupContentInsertionIntegration();this._setupClipboardInputIntegration();this._setupDraggableAttributeHandling();this.listenTo(t,"change:isReadOnly",((t,e,n)=>{if(n){this.forceDisabled("readOnlyMode")}else{this.clearForceDisabled("readOnlyMode")}}));this.on("change:isEnabled",((t,e,n)=>{if(!n){this._finalizeDragging(false)}}));if(env.isAndroid){this.forceDisabled("noAndroidSupport")}}destroy(){if(this._draggedRange){this._draggedRange.detach();this._draggedRange=null}if(this._previewContainer){this._previewContainer.remove()}this._domEmitter.stopListening();this._clearDraggableAttributesDelayed.cancel();return super.destroy()}_setupDragging(){const t=this.editor;const e=t.model;const n=t.editing.view;const o=n.document;const i=t.plugins.get(DragDropTarget);this.listenTo(o,"dragstart",((n,i)=>{if(i.target&&i.target.is("editableElement")){i.preventDefault();return}this._prepareDraggedRange(i.target);if(!this._draggedRange){i.preventDefault();return}this._draggingUid=uid();i.dataTransfer.effectAllowed=this.isEnabled?"copyMove":"copy";i.dataTransfer.setData("application/ckeditor5-dragging-uid",this._draggingUid);const r=e.createSelection(this._draggedRange.toRange());const s=t.data.toView(e.getSelectedContent(r));o.fire("clipboardOutput",{dataTransfer:i.dataTransfer,content:s,method:"dragstart"});this._updatePreview(i.dataTransfer);i.stopPropagation();if(!this.isEnabled){this._draggedRange.detach();this._draggedRange=null;this._draggingUid=""}}),{priority:"low"});this.listenTo(o,"dragend",((t,e)=>{this._finalizeDragging(!e.dataTransfer.isCanceled&&e.dataTransfer.dropEffect=="move")}),{priority:"low"});this._domEmitter.listenTo(global.document,"dragend",(()=>{this._blockMode=false}),{useCapture:true});this.listenTo(o,"dragenter",(()=>{if(!this.isEnabled){return}n.focus()}));this.listenTo(o,"dragleave",(()=>{i.removeDropMarkerDelayed()}));this.listenTo(o,"dragging",((t,e)=>{if(!this.isEnabled){e.dataTransfer.dropEffect="none";return}const{clientX:n,clientY:o}=e.domEvent;i.updateDropMarker(e.target,e.targetRanges,n,o,this._blockMode);if(!this._draggedRange){e.dataTransfer.dropEffect="copy"}if(!env.isGecko){if(e.dataTransfer.effectAllowed=="copy"){e.dataTransfer.dropEffect="copy"}else if(["all","copyMove"].includes(e.dataTransfer.effectAllowed)){e.dataTransfer.dropEffect="move"}}t.stop()}),{priority:"low"})}_setupClipboardInputIntegration(){const t=this.editor;const e=t.editing.view;const n=e.document;const o=t.plugins.get(DragDropTarget);this.listenTo(n,"clipboardInput",((e,n)=>{if(n.method!="drop"){return}const{clientX:i,clientY:r}=n.domEvent;const s=o.getFinalDropRange(n.target,n.targetRanges,i,r,this._blockMode);if(!s){this._finalizeDragging(false);e.stop();return}if(this._draggedRange&&this._draggingUid!=n.dataTransfer.getData("application/ckeditor5-dragging-uid")){this._draggedRange.detach();this._draggedRange=null;this._draggingUid=""}const a=yB(n.dataTransfer)=="move";if(a&&this._draggedRange&&this._draggedRange.containsRange(s,true)){this._finalizeDragging(false);e.stop();return}n.targetRanges=[t.editing.mapper.toViewRange(s)]}),{priority:"high"})}_setupContentInsertionIntegration(){const t=this.editor.plugins.get(ClipboardPipeline);t.on("contentInsertion",((t,e)=>{if(!this.isEnabled||e.method!=="drop"){return}const n=e.targetRanges.map((t=>this.editor.editing.mapper.toModelRange(t)));this.editor.model.change((t=>t.setSelection(n)))}),{priority:"high"});t.on("contentInsertion",((t,e)=>{if(!this.isEnabled||e.method!=="drop"){return}const n=yB(e.dataTransfer)=="move";const o=!e.resultRange||!e.resultRange.isCollapsed;this._finalizeDragging(o&&n)}),{priority:"lowest"})}_setupDraggableAttributeHandling(){const t=this.editor;const e=t.editing.view;const n=e.document;this.listenTo(n,"mousedown",((o,i)=>{if(env.isAndroid||!i){return}this._clearDraggableAttributesDelayed.cancel();let r=xB(i.target);if(env.isBlink&&!t.isReadOnly&&!r&&!n.selection.isCollapsed){const t=n.selection.getSelectedElement();if(!t||!isWidget(t)){r=n.selection.editableElement}}if(r){e.change((t=>{t.setAttribute("draggable","true",r)}));this._draggableElement=t.editing.mapper.toModelElement(r)}}));this.listenTo(n,"mouseup",(()=>{if(!env.isAndroid){this._clearDraggableAttributesDelayed()}}))}_clearDraggableAttributes(){const t=this.editor.editing;t.view.change((e=>{if(this._draggableElement&&this._draggableElement.root.rootName!="$graveyard"){e.removeAttribute("draggable",t.mapper.toViewElement(this._draggableElement))}this._draggableElement=null}))}_finalizeDragging(t){const e=this.editor;const n=e.model;const o=e.plugins.get(DragDropTarget);o.removeDropMarker();this._clearDraggableAttributes();if(e.plugins.has("WidgetToolbarRepository")){const t=e.plugins.get("WidgetToolbarRepository");t.clearForceDisabled("dragDrop")}this._draggingUid="";if(this._previewContainer){this._previewContainer.remove();this._previewContainer=undefined}if(!this._draggedRange){return}if(t&&this.isEnabled){n.deleteContent(n.createSelection(this._draggedRange),{doNotAutoparagraph:true})}this._draggedRange.detach();this._draggedRange=null}_prepareDraggedRange(t){const e=this.editor;const n=e.model;const o=n.document.selection;const i=t?xB(t):null;if(i){const t=e.editing.mapper.toModelElement(i);this._draggedRange=LiveRange.fromRange(n.createRangeOn(t));this._blockMode=n.schema.isBlock(t);if(e.plugins.has("WidgetToolbarRepository")){const t=e.plugins.get("WidgetToolbarRepository");t.forceDisabled("dragDrop")}}else if(!o.isCollapsed||o.getFirstPosition().parent.isEmpty){const t=Array.from(o.getSelectedBlocks());if(t.length>1){this._draggedRange=LiveRange.fromRange(n.createRange(n.createPositionBefore(t[0]),n.createPositionAfter(t[t.length-1])));n.change((t=>t.setSelection(this._draggedRange.toRange())));this._blockMode=true}else if(t.length==1){const e=o.getFirstRange();const i=n.createRange(n.createPositionBefore(t[0]),n.createPositionAfter(t[0]));if(e.start.isTouching(i.start)&&e.end.isTouching(i.end)){this._draggedRange=LiveRange.fromRange(i);this._blockMode=true}else{this._draggedRange=LiveRange.fromRange(o.getFirstRange());this._blockMode=false}}}}_updatePreview(t){const e=this.editor.editing.view;const n=e.document.selection.editableElement;const o=e.domConverter.mapViewToDom(n);const i=global.window.getComputedStyle(o);if(!this._previewContainer){this._previewContainer=createElement(global.document,"div",{style:"position: fixed; left: -999999px;"});global.document.body.appendChild(this._previewContainer)}else{this._previewContainer.removeChild(this._previewContainer.firstElementChild)}const r=createElement(global.document,"div");r.className="ck ck-content";r.style.width=i.width;r.innerHTML=t.getData("text/html");t.setDragImage(r,0,0);this._previewContainer.appendChild(r)}}function yB(t){if(env.isGecko){return t.dropEffect}return["all","copyMove"].includes(t.effectAllowed)?"move":"copy"}function xB(t){if(t.is("editableElement")){return null}if(t.hasClass("ck-widget__selection-handle")){return t.findAncestor(isWidget)}if(isWidget(t)){return t}const e=t.findAncestor((t=>isWidget(t)||t.is("editableElement")));if(isWidget(e)){return e}return null}class EB extends(null&&Plugin){constructor(){super(...arguments);this._isBlockDragging=false;this._domEmitter=new(DomEmitterMixin())}static get pluginName(){return"DragDropBlockToolbar"}init(){const t=this.editor;this.listenTo(t,"change:isReadOnly",((t,e,n)=>{if(n){this.forceDisabled("readOnlyMode");this._isBlockDragging=false}else{this.clearForceDisabled("readOnlyMode")}}));if(env.isAndroid){this.forceDisabled("noAndroidSupport")}if(t.plugins.has("BlockToolbar")){const e=t.plugins.get("BlockToolbar");const n=e.buttonView.element;n.setAttribute("draggable","true");this._domEmitter.listenTo(n,"dragstart",((t,e)=>this._handleBlockDragStart(e)));this._domEmitter.listenTo(global.document,"dragover",((t,e)=>this._handleBlockDragging(e)));this._domEmitter.listenTo(global.document,"drop",((t,e)=>this._handleBlockDragging(e)));this._domEmitter.listenTo(global.document,"dragend",(()=>this._handleBlockDragEnd()),{useCapture:true})}}destroy(){this._domEmitter.stopListening();return super.destroy()}_handleBlockDragStart(t){if(!this.isEnabled){return}const e=this.editor.model;const n=e.document.selection;const o=Array.from(n.getSelectedBlocks());const i=e.createRange(e.createPositionBefore(o[0]),e.createPositionAfter(o[o.length-1]));e.change((t=>t.setSelection(i)));this._isBlockDragging=true;this.editor.editing.view.getObserver(ClipboardObserver).onDomEvent(t)}_handleBlockDragging(t){if(!this.isEnabled||!this._isBlockDragging){return}const e=t.clientX+100;const n=t.clientY;const o=document.elementFromPoint(e,n);if(!o||!o.closest(".ck-editor__editable")){return}this.editor.editing.view.getObserver(ClipboardObserver).onDomEvent({...t,type:t.type,dataTransfer:t.dataTransfer,target:o,clientX:e,clientY:n,preventDefault:()=>t.preventDefault(),stopPropagation:()=>t.stopPropagation()})}_handleBlockDragEnd(){this._isBlockDragging=false}}class SB extends yu{constructor(t){super(t);this.affectsData=false}execute(){const t=this.editor.model;const e=t.document.selection;let n=t.schema.getLimitElement(e);if(e.containsEntireContent(n)||!DB(t.schema,n)){do{n=n.parent;if(!n){return}}while(!DB(t.schema,n))}t.change((t=>{t.setSelection(n,"in")}))}}function DB(t,e){return t.isLimit(e)&&(t.checkChild(e,"$text")||t.checkChild(e,"paragraph"))}const TB=Kc("Ctrl+A");class PB extends Au{static get pluginName(){return"SelectAllEditing"}init(){const t=this.editor;const e=t.editing.view;const n=e.document;t.commands.add("selectAll",new SB(t));this.listenTo(n,"keydown",((e,n)=>{if(Gc(n)===TB){t.execute("selectAll");n.preventDefault()}}))}}const BB='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M.75 15.5a.75.75 0 0 1 .75.75V18l.008.09A.5.5 0 0 0 2 18.5h1.75a.75.75 0 1 1 0 1.5H1.5l-.144-.007a1.5 1.5 0 0 1-1.35-1.349L0 18.5v-2.25a.75.75 0 0 1 .75-.75zm18.5 0a.75.75 0 0 1 .75.75v2.25l-.007.144a1.5 1.5 0 0 1-1.349 1.35L18.5 20h-2.25a.75.75 0 1 1 0-1.5H18a.5.5 0 0 0 .492-.41L18.5 18v-1.75a.75.75 0 0 1 .75-.75zm-10.45 3c.11 0 .2.09.2.2v1.1a.2.2 0 0 1-.2.2H7.2a.2.2 0 0 1-.2-.2v-1.1c0-.11.09-.2.2-.2h1.6zm4 0c.11 0 .2.09.2.2v1.1a.2.2 0 0 1-.2.2h-1.6a.2.2 0 0 1-.2-.2v-1.1c0-.11.09-.2.2-.2h1.6zm.45-5.5a.75.75 0 1 1 0 1.5h-8.5a.75.75 0 1 1 0-1.5h8.5zM1.3 11c.11 0 .2.09.2.2v1.6a.2.2 0 0 1-.2.2H.2a.2.2 0 0 1-.2-.2v-1.6c0-.11.09-.2.2-.2h1.1zm18.5 0c.11 0 .2.09.2.2v1.6a.2.2 0 0 1-.2.2h-1.1a.2.2 0 0 1-.2-.2v-1.6c0-.11.09-.2.2-.2h1.1zm-4.55-2a.75.75 0 1 1 0 1.5H4.75a.75.75 0 1 1 0-1.5h10.5zM1.3 7c.11 0 .2.09.2.2v1.6a.2.2 0 0 1-.2.2H.2a.2.2 0 0 1-.2-.2V7.2c0-.11.09-.2.2-.2h1.1zm18.5 0c.11 0 .2.09.2.2v1.6a.2.2 0 0 1-.2.2h-1.1a.2.2 0 0 1-.2-.2V7.2c0-.11.09-.2.2-.2h1.1zm-4.55-2a.75.75 0 1 1 0 1.5h-2.5a.75.75 0 1 1 0-1.5h2.5zm-5 0a.75.75 0 1 1 0 1.5h-5.5a.75.75 0 0 1 0-1.5h5.5zm-6.5-5a.75.75 0 0 1 0 1.5H2a.5.5 0 0 0-.492.41L1.5 2v1.75a.75.75 0 0 1-1.5 0V1.5l.007-.144A1.5 1.5 0 0 1 1.356.006L1.5 0h2.25zM18.5 0l.144.007a1.5 1.5 0 0 1 1.35 1.349L20 1.5v2.25a.75.75 0 1 1-1.5 0V2l-.008-.09A.5.5 0 0 0 18 1.5h-1.75a.75.75 0 1 1 0-1.5h2.25zM8.8 0c.11 0 .2.09.2.2v1.1a.2.2 0 0 1-.2.2H7.2a.2.2 0 0 1-.2-.2V.2c0-.11.09-.2.2-.2h1.6zm4 0c.11 0 .2.09.2.2v1.1a.2.2 0 0 1-.2.2h-1.6a.2.2 0 0 1-.2-.2V.2c0-.11.09-.2.2-.2h1.6z"/></svg>';class IB extends Au{static get pluginName(){return"SelectAllUI"}init(){const t=this.editor;t.ui.componentFactory.add("selectAll",(e=>{const n=t.commands.get("selectAll");const o=new Ad(e);const i=e.t;o.set({label:i("Select all"),icon:BB,keystroke:"Ctrl+A",tooltip:true});o.bind("isEnabled").to(n,"isEnabled");this.listenTo(o,"execute",(()=>{t.execute("selectAll");t.editing.view.focus()}));return o}))}}class RB extends Au{static get requires(){return[PB,IB]}static get pluginName(){return"SelectAll"}}class OB extends yu{constructor(t){super(t);this._stack=[];this._createdBatches=new WeakSet;this.refresh();this._isEnabledBasedOnSelection=false;this.listenTo(t.data,"set",((t,e)=>{e[1]={...e[1]};const n=e[1];if(!n.batchType){n.batchType={isUndoable:false}}}),{priority:"high"});this.listenTo(t.data,"set",((t,e)=>{const n=e[1];if(!n.batchType.isUndoable){this.clearStack()}}))}refresh(){this.isEnabled=this._stack.length>0}get createdBatches(){return this._createdBatches}addBatch(t){const e=this.editor.model.document.selection;const n={ranges:e.hasOwnRange?Array.from(e.getRanges()):[],isBackward:e.isBackward};this._stack.push({batch:t,selection:n});this.refresh()}clearStack(){this._stack=[];this.refresh()}_restoreSelection(t,e,n){const o=this.editor.model;const i=o.document;const r=[];const s=t.map((t=>t.getTransformedByOperations(n)));const a=s.flat();for(const t of s){const e=t.filter((t=>t.root!=i.graveyard)).filter((t=>!VB(t,a)));if(!e.length){continue}MB(e);r.push(e[0])}if(r.length){o.change((t=>{t.setSelection(r,{backward:e})}))}}_undo(t,e){const n=this.editor.model;const o=n.document;this._createdBatches.add(e);const i=t.operations.slice().filter((t=>t.isDocumentOperation));i.reverse();for(const t of i){const i=t.baseVersion+1;const r=Array.from(o.history.getOperations(i));const s=O_([t.getReversed()],r,{useRelations:true,document:this.editor.model.document,padWithNoOps:false,forceWeakRemove:true});const a=s.operationsA;for(let i of a){const r=i.affectedSelectable;if(r&&!n.canEditAt(r)){i=new C_(i.baseVersion)}e.addOperation(i);n.applyOperation(i);o.history.setOperationAsUndone(t,i)}}}}function MB(t){t.sort(((t,e)=>t.start.isBefore(e.start)?-1:1));for(let e=1;e<t.length;e++){const n=t[e-1];const o=n.getJoined(t[e],true);if(o){e--;t.splice(e,2,o)}}}function VB(t,e){return e.some((e=>e!==t&&e.containsRange(t,true)))}class zB extends OB{execute(t=null){const e=t?this._stack.findIndex((e=>e.batch==t)):this._stack.length-1;const n=this._stack.splice(e,1)[0];const o=this.editor.model.createBatch({isUndo:true});this.editor.model.enqueueChange(o,(()=>{this._undo(n.batch,o);const t=this.editor.model.document.history.getOperations(n.batch.baseVersion);this._restoreSelection(n.selection.ranges,n.selection.isBackward,t)}));this.fire("revert",n.batch,o);this.refresh()}}class FB extends OB{execute(){const t=this._stack.pop();const e=this.editor.model.createBatch({isUndo:true});this.editor.model.enqueueChange(e,(()=>{const n=t.batch.operations[t.batch.operations.length-1];const o=n.baseVersion+1;const i=this.editor.model.document.history.getOperations(o);this._restoreSelection(t.selection.ranges,t.selection.isBackward,i);this._undo(t.batch,e)}));this.refresh()}}class NB extends Au{constructor(){super(...arguments);this._batchRegistry=new WeakSet}static get pluginName(){return"UndoEditing"}init(){const t=this.editor;this._undoCommand=new zB(t);this._redoCommand=new FB(t);t.commands.add("undo",this._undoCommand);t.commands.add("redo",this._redoCommand);this.listenTo(t.model,"applyOperation",((t,e)=>{const n=e[0];if(!n.isDocumentOperation){return}const o=n.batch;const i=this._redoCommand.createdBatches.has(o);const r=this._undoCommand.createdBatches.has(o);const s=this._batchRegistry.has(o);if(s){return}this._batchRegistry.add(o);if(!o.isUndoable){return}if(i){this._undoCommand.addBatch(o)}else if(!r){this._undoCommand.addBatch(o);this._redoCommand.clearStack()}}),{priority:"highest"});this.listenTo(this._undoCommand,"revert",((t,e,n)=>{this._redoCommand.addBatch(n)}));t.keystrokes.set("CTRL+Z","undo");t.keystrokes.set("CTRL+Y","redo");t.keystrokes.set("CTRL+SHIFT+Z","redo")}}const LB='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m5.042 9.367 2.189 1.837a.75.75 0 0 1-.965 1.149l-3.788-3.18a.747.747 0 0 1-.21-.284.75.75 0 0 1 .17-.945L6.23 4.762a.75.75 0 1 1 .964 1.15L4.863 7.866h8.917A.75.75 0 0 1 14 7.9a4 4 0 1 1-1.477 7.718l.344-1.489a2.5 2.5 0 1 0 1.094-4.73l.008-.032H5.042z"/></svg>';const HB='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m14.958 9.367-2.189 1.837a.75.75 0 0 0 .965 1.149l3.788-3.18a.747.747 0 0 0 .21-.284.75.75 0 0 0-.17-.945L13.77 4.762a.75.75 0 1 0-.964 1.15l2.331 1.955H6.22A.75.75 0 0 0 6 7.9a4 4 0 1 0 1.477 7.718l-.344-1.489A2.5 2.5 0 1 1 6.039 9.4l-.008-.032h8.927z"/></svg>';class jB extends Au{static get pluginName(){return"UndoUI"}init(){const t=this.editor;const e=t.locale;const n=t.t;const o=e.uiLanguageDirection=="ltr"?LB:HB;const i=e.uiLanguageDirection=="ltr"?HB:LB;this._addButton("undo",n("Undo"),"CTRL+Z",o);this._addButton("redo",n("Redo"),"CTRL+Y",i)}_addButton(t,e,n,o){const i=this.editor;i.ui.componentFactory.add(t,(r=>{const s=i.commands.get(t);const a=new Ad(r);a.set({label:e,icon:o,keystroke:n,tooltip:true});a.bind("isEnabled").to(s,"isEnabled");this.listenTo(a,"execute",(()=>{i.execute(t);i.editing.view.focus()}));return a}))}}class qB extends Au{static get requires(){return[NB,jB]}static get pluginName(){return"Undo"}}class $B extends Au{static get requires(){return[fB,DT,RB,OT,uD,qB]}static get pluginName(){return"Essentials"}}class WB extends yu{refresh(){const t=this.editor.model;const e=t.schema;const n=t.document.selection;this.isEnabled=GB(n,e,t)}execute(){const t=this.editor.model;t.change((e=>{const n=e.createElement("horizontalLine");t.insertObject(n,null,null,{setSelection:"after"})}))}}function GB(t,e,n){const o=KB(t,n);return e.checkChild(o,"horizontalLine")}function KB(t,e){const n=JT(t,e);const o=n.start.parent;if(o.isEmpty&&!o.is("element","$root")){return o.parent}return o}var UB=n(893);var ZB={injectType:"singletonStyleTag",attributes:{"data-cke":true}};ZB.insert="head";ZB.singleton=true;var JB=Il()(UB.Z,ZB);const YB=UB.Z.locals||{};class QB extends Au{static get pluginName(){return"HorizontalLineEditing"}init(){const t=this.editor;const e=t.model.schema;const n=t.t;const o=t.conversion;e.register("horizontalLine",{inheritAllFrom:"$blockObject"});o.for("dataDowncast").elementToElement({model:"horizontalLine",view:(t,{writer:e})=>e.createEmptyElement("hr")});o.for("editingDowncast").elementToStructure({model:"horizontalLine",view:(t,{writer:e})=>{const o=n("Horizontal line");const i=e.createContainerElement("div",null,e.createEmptyElement("hr"));e.addClass("ck-horizontal-line",i);e.setCustomProperty("hr",true,i);return XB(i,e,o)}});o.for("upcast").elementToElement({view:"hr",model:"horizontalLine"});t.commands.add("horizontalLine",new WB(t))}}function XB(t,e,n){e.setCustomProperty("horizontalLine",true,t);return qT(t,e,{label:n})}const tI='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M2 9h16v2H2z"/></svg>';class eI extends Au{static get pluginName(){return"HorizontalLineUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add("horizontalLine",(n=>{const o=t.commands.get("horizontalLine");const i=new Ad(n);i.set({label:e("Horizontal line"),icon:tI,tooltip:true});i.bind("isEnabled").to(o,"isEnabled");this.listenTo(i,"execute",(()=>{t.execute("horizontalLine");t.editing.view.focus()}));return i}))}}class nI extends Au{static get requires(){return[QB,eI,TP]}static get pluginName(){return"HorizontalLine"}}class oI{constructor(t,e){this._startElement=t;this._referenceIndent=t.getAttribute("listIndent");this._isForward=e.direction=="forward";this._includeSelf=!!e.includeSelf;this._sameAttributes=el(e.sameAttributes||[]);this._sameIndent=!!e.sameIndent;this._lowerIndent=!!e.lowerIndent;this._higherIndent=!!e.higherIndent}static first(t,e){const n=new this(t,e);const o=n[Symbol.iterator]();return hl(o)}*[Symbol.iterator](){const t=[];for(const{node:e}of iI(this._getStartNode(),this._isForward?"forward":"backward")){const n=e.getAttribute("listIndent");if(n<this._referenceIndent){if(!this._lowerIndent){break}this._referenceIndent=n}else if(n>this._referenceIndent){if(!this._higherIndent){continue}if(!this._isForward){t.push(e);continue}}else{if(!this._sameIndent){if(this._higherIndent){if(t.length){yield*t;t.length=0}break}continue}if(this._sameAttributes.some((t=>e.getAttribute(t)!==this._startElement.getAttribute(t)))){break}}if(t.length){yield*t;t.length=0}yield e}}_getStartNode(){if(this._includeSelf){return this._startElement}return this._isForward?this._startElement.nextSibling:this._startElement.previousSibling}}function*iI(t,e="forward"){const n=e=="forward";let o=null;while(aI(t)){yield{node:t,previous:o};o=t;t=n?t.nextSibling:t.previousSibling}}class rI{constructor(t){this._listHead=t}[Symbol.iterator](){return iI(this._listHead,"forward")}}class sI{static next(){return uid()}}function aI(t){return!!t&&t.is("element")&&t.hasAttribute("listItemId")}function cI(t,e={}){return[...lI(t,{...e,direction:"backward"}),...lI(t,{...e,direction:"forward"})]}function lI(t,e={}){const n=e.direction=="forward";const o=Array.from(new ListWalker(t,{...e,includeSelf:n,sameIndent:true,sameAttributes:"listItemId"}));return n?o:o.reverse()}function dI(t){return Array.from(new ListWalker(t,{direction:"forward",higherIndent:true}))}function uI(t){const e=new ListWalker(t,{sameIndent:true,sameAttributes:"listType"});const n=new ListWalker(t,{sameIndent:true,sameAttributes:"listType",includeSelf:true,direction:"forward"});return[...Array.from(e).reverse(),...n]}function hI(t){const e=ListWalker.first(t,{sameIndent:true,sameAttributes:"listItemId"});if(!e){return true}return false}function fI(t){const e=ListWalker.first(t,{direction:"forward",sameIndent:true,sameAttributes:"listItemId"});if(!e){return true}return false}function pI(t,e={}){t=toArray(t);const n=e.withNested!==false;const o=new Set;for(const e of t){for(const t of cI(e,{higherIndent:n})){o.add(t)}}return CI(o)}function gI(t){t=toArray(t);const e=new Set;for(const n of t){for(const t of uI(n)){e.add(t)}}return CI(e)}function mI(t,e){const n=lI(t,{direction:"forward"});const o=sI.next();for(const t of n){e.setAttribute("listItemId",o,t)}return n}function bI(t,e,n){const o={};for(const[t,n]of e.getAttributes()){if(t.startsWith("list")){o[t]=n}}const i=lI(t,{direction:"forward"});for(const t of i){n.setAttributes(o,t)}return i}function kI(t,e,{expand:n,indentBy:o=1}={}){t=toArray(t);const i=n?pI(t):t;for(const t of i){const n=t.getAttribute("listIndent")+o;if(n<0){_I(t,e)}else{e.setAttribute("listIndent",n,t)}}return i}function wI(t,e){t=toArray(t);const n=pI(t);const o=new Set;const i=Math.min(...n.map((t=>t.getAttribute("listIndent"))));const r=new Map;for(const t of n){r.set(t,ListWalker.first(t,{lowerIndent:true}))}for(const t of n){if(o.has(t)){continue}o.add(t);const n=t.getAttribute("listIndent")-1;if(n<0){_I(t,e);continue}if(t.getAttribute("listIndent")==i){const n=xI(t,r.get(t),e);for(const t of n){o.add(t)}if(n.length){continue}}e.setAttribute("listIndent",n,t)}return CI(o)}function _I(t,e){t=toArray(t);for(const n of t){for(const t of n.getAttributeKeys()){if(t.startsWith("list")){e.removeAttribute(t,n)}}}return t}function vI(t){if(!t.length){return false}const e=t[0].getAttribute("listItemId");if(!e){return false}return!t.some((t=>t.getAttribute("listItemId")!=e))}function AI(t,e){const n=[];let o=Number.POSITIVE_INFINITY;for(const{node:i}of iterateSiblingListBlocks(t.nextSibling,"forward")){const t=i.getAttribute("listIndent");if(t==0){break}if(t<o){o=t}const r=t-o;e.setAttribute("listIndent",r,i);n.push(i)}return n}function CI(t){return Array.from(t).filter((t=>t.root.rootName!=="$graveyard")).sort(((t,e)=>t.index-e.index))}function yI(t){const e=t.document.selection.getSelectedElement();if(!e){return null}if(t.schema.isObject(e)&&t.schema.isBlock(e)){return e}return null}function xI(t,e,n){const o=lI(e,{direction:"forward"});if(o.pop().index>t.index){return bI(t,e,n)}return[]}class EI extends(null&&Command){constructor(t,e){super(t);this._direction=e}refresh(){this.isEnabled=this._checkEnabled()}execute(){const t=this.editor.model;const e=SI(t.document.selection);t.change((t=>{const n=[];if(isSingleListItem(e)&&!isFirstBlockOfListItem(e[0])){if(this._direction=="forward"){n.push(...indentBlocks(e,t))}n.push(...splitListItemBefore(e[0],t))}else{if(this._direction=="forward"){n.push(...indentBlocks(e,t,{expand:true}))}else{n.push(...outdentBlocksWithMerge(e,t))}}for(const e of n){if(!e.hasAttribute("listType")){continue}const n=ListWalker.first(e,{sameIndent:true});if(n){t.setAttribute("listType",n.getAttribute("listType"),e)}}this._fireAfterExecute(n)}))}_fireAfterExecute(t){this.fire("afterExecute",sortBlocks(new Set(t)))}_checkEnabled(){let t=SI(this.editor.model.document.selection);let e=t[0];if(!e){return false}if(this._direction=="backward"){return true}if(isSingleListItem(t)&&!isFirstBlockOfListItem(t[0])){return true}t=expandListBlocksToCompleteItems(t);e=t[0];const n=ListWalker.first(e,{sameIndent:true});if(!n){return false}if(n.getAttribute("listType")==e.getAttribute("listType")){return true}return false}}function SI(t){const e=Array.from(t.getSelectedBlocks());const n=e.findIndex((t=>!isListItemBlock(t)));if(n!=-1){e.length=n}return e}class DI extends(null&&Command){constructor(t,e){super(t);this.type=e}refresh(){this.value=this._getValue();this.isEnabled=this._checkEnabled()}execute(t={}){const e=this.editor.model;const n=e.document;const o=getSelectedBlockObject(e);const i=Array.from(n.selection.getSelectedBlocks()).filter((t=>e.schema.checkAttribute(t,"listType")));const r=t.forceValue!==undefined?!t.forceValue:this.value;e.change((t=>{if(r){const e=i[i.length-1];const n=getListItemBlocks(e,{direction:"forward"});const o=[];if(n.length>1){o.push(...splitListItemBefore(n[1],t))}o.push(...removeListAttributes(i,t));o.push(...outdentFollowingItems(e,t));this._fireAfterExecute(o)}else if((o||n.selection.isCollapsed)&&isListItemBlock(i[0])){const e=getListItems(o||i[0]);for(const n of e){t.setAttribute("listType",this.type,n)}this._fireAfterExecute(e)}else{const e=[];for(const n of i){if(!n.hasAttribute("listType")){t.setAttributes({listIndent:0,listItemId:ListItemUid.next(),listType:this.type},n);e.push(n)}else{for(const o of expandListBlocksToCompleteItems(n,{withNested:false})){if(o.getAttribute("listType")!=this.type){t.setAttribute("listType",this.type,o);e.push(o)}}}}this._fireAfterExecute(e)}}))}_fireAfterExecute(t){this.fire("afterExecute",sortBlocks(new Set(t)))}_getValue(){const t=this.editor.model.document.selection;const e=Array.from(t.getSelectedBlocks());if(!e.length){return false}for(const t of e){if(t.getAttribute("listType")!=this.type){return false}}return true}_checkEnabled(){const t=this.editor.model.document.selection;const e=this.editor.model.schema;const n=Array.from(t.getSelectedBlocks());if(!n.length){return false}if(this.value){return true}for(const t of n){if(e.checkAttribute(t,"listType")){return true}}return false}}class TI extends(null&&Command){constructor(t,e){super(t);this._direction=e}refresh(){this.isEnabled=this._checkEnabled()}execute({shouldMergeOnBlocksContentLevel:t=false}={}){const e=this.editor.model;const n=e.document.selection;const o=[];e.change((i=>{const{firstElement:r,lastElement:s}=this._getMergeSubjectElements(n,t);const a=r.getAttribute("listIndent")||0;const c=s.getAttribute("listIndent");const l=s.getAttribute("listItemId");if(a!=c){const t=getNestedListBlocks(s);o.push(...indentBlocks([s,...t],i,{indentBy:a-c,expand:a<c}))}if(t){let t=n;if(n.isCollapsed){t=i.createSelection(i.createRange(i.createPositionAt(r,"end"),i.createPositionAt(s,0)))}e.deleteContent(t,{doNotResetEntireContent:n.isCollapsed});const a=t.getLastPosition().parent;const c=a.nextSibling;o.push(a);if(c&&c!==s&&c.getAttribute("listItemId")==l){o.push(...mergeListItemBefore(c,a,i))}}else{o.push(...mergeListItemBefore(s,r,i))}this._fireAfterExecute(o)}))}_fireAfterExecute(t){this.fire("afterExecute",sortBlocks(new Set(t)))}_checkEnabled(){const t=this.editor.model;const e=t.document.selection;const n=getSelectedBlockObject(t);if(e.isCollapsed||n){const t=n||e.getFirstPosition().parent;if(!isListItemBlock(t)){return false}const o=this._direction=="backward"?t.previousSibling:t.nextSibling;if(!o){return false}if(isSingleListItem([t,o])){return false}}else{const t=e.getLastPosition();const n=e.getFirstPosition();if(t.parent===n.parent){return false}if(!isListItemBlock(t.parent)){return false}}return true}_getMergeSubjectElements(t,e){const n=this.editor.model;const o=getSelectedBlockObject(n);let i,r;if(t.isCollapsed||o){const n=o||t.getFirstPosition().parent;const s=isFirstBlockOfListItem(n);if(this._direction=="backward"){r=n;if(s&&!e){i=ListWalker.first(n,{sameIndent:true,lowerIndent:true})}else{i=n.previousSibling}}else{i=n;r=n.nextSibling}}else{i=t.getFirstPosition().parent;r=t.getLastPosition().parent}return{firstElement:i,lastElement:r}}}class PI extends(null&&Command){constructor(t,e){super(t);this._direction=e}refresh(){this.isEnabled=this._checkEnabled()}execute(){const t=this.editor;t.model.change((t=>{const e=splitListItemBefore(this._getStartBlock(),t);this._fireAfterExecute(e)}))}_fireAfterExecute(t){this.fire("afterExecute",sortBlocks(new Set(t)))}_checkEnabled(){const t=this.editor.model.document.selection;const e=this._getStartBlock();return t.isCollapsed&&isListItemBlock(e)&&!isFirstBlockOfListItem(e)}_getStartBlock(){const t=this.editor.model.document;const e=t.selection.getFirstPosition().parent;return this._direction=="before"?e:e.nextSibling}}class BI extends(null&&Plugin){static get pluginName(){return"DocumentListUtils"}expandListBlocksToCompleteList(t){return expandListBlocksToCompleteList(t)}isFirstBlockOfListItem(t){return isFirstBlockOfListItem(t)}isListItemBlock(t){return isListItemBlock(t)}expandListBlocksToCompleteItems(t,e={}){return expandListBlocksToCompleteItems(t,e)}}function II(t,e){const n=t.nodeBefore;if(!isListItemBlock(n)){const n=t.nodeAfter;if(isListItemBlock(n)){e.set(n,n)}}else{let t=n;for(const{node:n}of iterateSiblingListBlocks(t,"backward")){t=n;if(e.has(t)){return}}e.set(n,t)}}function RI(t,e){let n=0;let o=-1;let i=null;let r=false;for(const{node:s}of t){const t=s.getAttribute("listIndent");if(t>n){let a;if(i===null){i=t-n;a=n}else{if(i>t){i=t}a=t-i}if(a>o+1){a=o+1}e.setAttribute("listIndent",a,s);r=true;o=a}else{i=null;n=t+1;o=t}}return r}function OI(t,e,n){const o=new Set;let i=false;for(const{node:r}of t){if(o.has(r)){continue}let t=r.getAttribute("listType");let s=r.getAttribute("listItemId");if(e.has(s)){s=ListItemUid.next()}e.add(s);for(const e of getListItemBlocks(r,{direction:"forward"})){o.add(e);if(e.getAttribute("listType")!=t){s=ListItemUid.next();t=e.getAttribute("listType")}if(e.getAttribute("listItemId")!=s){n.setAttribute("listItemId",s,e);i=true}}}return i}function MI(){return(t,e,n)=>{const{writer:o,schema:i}=n;if(!e.modelRange){return}const r=Array.from(e.modelRange.getItems({shallow:true})).filter((t=>i.checkAttribute(t,"listItemId")));if(!r.length){return}const s={listItemId:ListItemUid.next(),listIndent:getIndent(e.viewItem),listType:e.viewItem.parent&&e.viewItem.parent.is("element","ol")?"numbered":"bulleted"};for(const t of r){if(!isListItemBlock(t)){o.setAttributes(s,t)}}if(r.length>1){if(r[1].getAttribute("listItemId")!=s.listItemId){n.keepEmptyElement(r[0])}}}}function VI(){return(t,e,n)=>{if(!n.consumable.test(e.viewItem,{name:true})){return}const o=new UpcastWriter(e.viewItem.document);for(const t of Array.from(e.viewItem.getChildren())){if(!isListItemView(t)&&!isListView(t)){o.remove(t)}}}}function zI(t,e,n,o){return()=>{const o=t.document.differ.getChanges();const s=[];const a=new Map;const c=new Set;for(const t of o){if(t.type=="insert"&&t.name!="$text"){findAndAddListHeadToMap(t.position,a);if(!t.attributes.has("listItemId")){findAndAddListHeadToMap(t.position.getShiftedBy(t.length),a)}else{c.add(t.position.nodeAfter)}}else if(t.type=="remove"&&t.attributes.has("listItemId")){findAndAddListHeadToMap(t.position,a)}else if(t.type=="attribute"){const e=t.range.start.nodeAfter;if(n.includes(t.attributeKey)){findAndAddListHeadToMap(t.range.start,a);if(t.attributeNewValue===null){findAndAddListHeadToMap(t.range.start.getShiftedBy(1),a);if(r(e)){s.push(e)}}else{c.add(e)}}else if(isListItemBlock(e)){if(r(e)){s.push(e)}}}}for(const t of a.values()){s.push(...i(t,c))}for(const t of new Set(s)){e.reconvertItem(t)}};function i(t,e){const o=[];const i=new Set;const a=[];for(const{node:c,previous:l}of iterateSiblingListBlocks(t,"forward")){if(i.has(c)){continue}const t=c.getAttribute("listIndent");if(l&&t<l.getAttribute("listIndent")){a.length=t+1}a[t]=Object.fromEntries(Array.from(c.getAttributes()).filter((([t])=>n.includes(t))));const d=getListItemBlocks(c,{direction:"forward"});for(const t of d){i.add(t);if(r(t,d)){o.push(t)}else if(s(t,a,e)){o.push(t)}}}return o}function r(t,o){if(!t.is("element","paragraph")){return false}const i=e.mapper.toViewElement(t);if(!i){return false}const r=$I(t,n,o);if(r&&i.is("element","p")){return true}else if(!r&&i.is("element","span")){return true}return false}function s(t,n,i){if(i.has(t)){return false}const r=e.mapper.toViewElement(t);let s=n.length-1;for(let t=r.parent;!t.is("editableElement");t=t.parent){const e=isListItemView(t);const i=isListView(t);if(!i&&!e){continue}const r=`checkAttributes:${e?"item":"list"}`;const a=o.fire(r,{viewElement:t,modelAttributes:n[s]});if(a){break}if(i){s--;if(s<0){return false}}}return true}}function FI(t,e,n){const o=qI(t);return(i,r,s)=>{const{writer:a,mapper:c,consumable:l}=s;const d=r.item;if(!t.includes(r.attributeKey)){return}if(!o(d,l)){return}const u=LI(d,c,n);HI(u,a);jI(d,a.createRangeOn(u),e,a)}}function NI(t,{dataPipeline:e}={}){return(n,{writer:o})=>{if(!$I(n,t)){return null}if(!e){return o.createContainerElement("span",{class:"ck-list-bogus-paragraph"})}const i=o.createContainerElement("p");o.setCustomProperty("dataPipeline:transparentRendering",true,i);return i}}function LI(t,e,n){const o=n.createRangeOn(t);const i=e.toViewRange(o).getTrimmed();return i.getContainedElement()}function HI(t,e){let n=t.parent;while(n.is("attributeElement")&&["ul","ol","li"].includes(n.name)){const o=n.parent;e.unwrap(e.createRangeOn(t),n);n=o}}function jI(t,e,n,o){if(!t.hasAttribute("listIndent")){return}const i=t.getAttribute("listIndent");let r=t;for(let t=i;t>=0;t--){const i=createListItemElement(o,t,r.getAttribute("listItemId"));const s=createListElement(o,t,r.getAttribute("listType"));for(const t of n){if(r.hasAttribute(t.attributeName)){t.setAttributeOnDowncast(o,r.getAttribute(t.attributeName),t.scope=="list"?s:i)}}e=o.wrap(e,i);e=o.wrap(e,s);if(t==0){break}r=ListWalker.first(r,{lowerIndent:true});if(!r){break}}}function qI(t){return(e,n)=>{const o=[];for(const n of t){if(e.hasAttribute(n)){o.push(`attribute:${n}`)}}if(!o.every((t=>n.test(e,t)!==false))){return false}o.forEach((t=>n.consume(e,t)));return true}}function $I(t,e,n=getAllListItemBlocks(t)){if(!isListItemBlock(t)){return false}for(const n of t.getAttributeKeys()){if(n.startsWith("selection:")){continue}if(!e.includes(n)){return false}}return n.length<2}var WI=n(190);var GI={injectType:"singletonStyleTag",attributes:{"data-cke":true}};GI.insert="head";GI.singleton=true;var KI=Il()(WI.Z,GI);const UI=WI.Z.locals||{};var ZI=n(784);var JI={injectType:"singletonStyleTag",attributes:{"data-cke":true}};JI.insert="head";JI.singleton=true;var YI=Il()(ZI.Z,JI);const QI=ZI.Z.locals||{};const XI=null&&["listType","listIndent","listItemId"];class tR extends(null&&Plugin){constructor(){super(...arguments);this._downcastStrategies=[]}static get pluginName(){return"DocumentListEditing"}static get requires(){return[Enter,Delete,DocumentListUtils]}init(){const t=this.editor;const e=t.model;if(t.plugins.has("ListEditing")){throw new CKEditorError("document-list-feature-conflict",this,{conflictPlugin:"ListEditing"})}e.schema.extend("$container",{allowAttributes:XI});e.schema.extend("$block",{allowAttributes:XI});e.schema.extend("$blockObject",{allowAttributes:XI});for(const t of XI){e.schema.setAttributeProperties(t,{copyOnReplace:true})}t.commands.add("numberedList",new DocumentListCommand(t,"numbered"));t.commands.add("bulletedList",new DocumentListCommand(t,"bulleted"));t.commands.add("indentList",new DocumentListIndentCommand(t,"forward"));t.commands.add("outdentList",new DocumentListIndentCommand(t,"backward"));t.commands.add("mergeListItemBackward",new DocumentListMergeCommand(t,"backward"));t.commands.add("mergeListItemForward",new DocumentListMergeCommand(t,"forward"));t.commands.add("splitListItemBefore",new DocumentListSplitCommand(t,"before"));t.commands.add("splitListItemAfter",new DocumentListSplitCommand(t,"after"));this._setupDeleteIntegration();this._setupEnterIntegration();this._setupTabIntegration();this._setupClipboardIntegration()}afterInit(){const t=this.editor;const e=t.commands;const n=e.get("indent");const o=e.get("outdent");if(n){n.registerChildCommand(e.get("indentList"),{priority:"high"})}if(o){o.registerChildCommand(e.get("outdentList"),{priority:"lowest"})}this._setupModelPostFixing();this._setupConversion()}registerDowncastStrategy(t){this._downcastStrategies.push(t)}_getListAttributeNames(){return[...XI,...this._downcastStrategies.map((t=>t.attributeName))]}_setupDeleteIntegration(){const t=this.editor;const e=t.commands.get("mergeListItemBackward");const n=t.commands.get("mergeListItemForward");this.listenTo(t.editing.view.document,"delete",((o,i)=>{const r=t.model.document.selection;if(getSelectedBlockObject(t.model)){return}t.model.change((()=>{const s=r.getFirstPosition();if(r.isCollapsed&&i.direction=="backward"){if(!s.isAtStart){return}const n=s.parent;if(!isListItemBlock(n)){return}const r=ListWalker.first(n,{sameAttributes:"listType",sameIndent:true});if(!r&&n.getAttribute("listIndent")===0){if(!isLastBlockOfListItem(n)){t.execute("splitListItemAfter")}t.execute("outdentList")}else{if(!e.isEnabled){return}e.execute({shouldMergeOnBlocksContentLevel:oR(t.model,"backward")})}i.preventDefault();o.stop()}else{if(r.isCollapsed&&!r.getLastPosition().isAtEnd){return}if(!n.isEnabled){return}n.execute({shouldMergeOnBlocksContentLevel:oR(t.model,"forward")});i.preventDefault();o.stop()}}))}),{context:"li"})}_setupEnterIntegration(){const t=this.editor;const e=t.model;const n=t.commands;const o=n.get("enter");this.listenTo(t.editing.view.document,"enter",((n,o)=>{const i=e.document;const r=i.selection.getFirstPosition().parent;if(i.selection.isCollapsed&&isListItemBlock(r)&&r.isEmpty&&!o.isSoft){const e=isFirstBlockOfListItem(r);const i=isLastBlockOfListItem(r);if(e&&i){t.execute("outdentList");o.preventDefault();n.stop()}else if(e&&!i){t.execute("splitListItemAfter");o.preventDefault();n.stop()}else if(i){t.execute("splitListItemBefore");o.preventDefault();n.stop()}}}),{context:"li"});this.listenTo(o,"afterExecute",(()=>{const e=n.get("splitListItemBefore");e.refresh();if(!e.isEnabled){return}const o=t.model.document;const i=o.selection.getLastPosition().parent;const r=getAllListItemBlocks(i);if(r.length===2){e.execute()}}))}_setupTabIntegration(){const t=this.editor;this.listenTo(t.editing.view.document,"tab",((e,n)=>{const o=n.shiftKey?"outdentList":"indentList";const i=this.editor.commands.get(o);if(i.isEnabled){t.execute(o);n.stopPropagation();n.preventDefault();e.stop()}}),{context:"li"})}_setupConversion(){const t=this.editor;const e=t.model;const n=this._getListAttributeNames();t.conversion.for("upcast").elementToElement({view:"li",model:"paragraph"}).add((t=>{t.on("element:li",listItemUpcastConverter());t.on("element:ul",listUpcastCleanList(),{priority:"high"});t.on("element:ol",listUpcastCleanList(),{priority:"high"})}));t.conversion.for("editingDowncast").elementToElement({model:"paragraph",view:bogusParagraphCreator(n),converterPriority:"high"});t.conversion.for("dataDowncast").elementToElement({model:"paragraph",view:bogusParagraphCreator(n,{dataPipeline:true}),converterPriority:"high"});t.conversion.for("downcast").add((t=>{t.on("attribute",listItemDowncastConverter(n,this._downcastStrategies,e))}));this.listenTo(e.document,"change:data",reconvertItemsOnDataChange(e,t.editing,n,this),{priority:"high"});this.on("checkAttributes:item",((t,{viewElement:e,modelAttributes:n})=>{if(e.id!=n.listItemId){t.return=true;t.stop()}}));this.on("checkAttributes:list",((t,{viewElement:e,modelAttributes:n})=>{if(e.name!=getViewElementNameForListType(n.listType)||e.id!=getViewElementIdForListType(n.listType,n.listIndent)){t.return=true;t.stop()}}))}_setupModelPostFixing(){const t=this.editor.model;const e=this._getListAttributeNames();t.document.registerPostFixer((n=>eR(t,n,e,this)));this.on("postFixer",((t,{listNodes:e,writer:n})=>{t.return=fixListIndents(e,n)||t.return}),{priority:"high"});this.on("postFixer",((t,{listNodes:e,writer:n,seenIds:o})=>{t.return=fixListItemIds(e,o,n)||t.return}),{priority:"high"})}_setupClipboardIntegration(){const t=this.editor.model;this.listenTo(t,"insertContent",nR(t),{priority:"high"});this.listenTo(t,"getSelectedContent",((e,[n])=>{const o=isSingleListItem(Array.from(n.getSelectedBlocks()));if(o){t.change((t=>removeListAttributes(Array.from(e.return.getChildren()),t)))}}))}}function eR(t,e,n,o){const i=t.document.differ.getChanges();const r=new Map;let s=false;for(const o of i){if(o.type=="insert"&&o.name!="$text"){const i=o.position.nodeAfter;if(!t.schema.checkAttribute(i,"listItemId")){for(const t of Array.from(i.getAttributeKeys())){if(n.includes(t)){e.removeAttribute(t,i);s=true}}}findAndAddListHeadToMap(o.position,r);if(!o.attributes.has("listItemId")){findAndAddListHeadToMap(o.position.getShiftedBy(o.length),r)}for(const{item:e,previousPosition:n}of t.createRangeIn(i)){if(isListItemBlock(e)){findAndAddListHeadToMap(n,r)}}}else if(o.type=="remove"){findAndAddListHeadToMap(o.position,r)}else if(o.type=="attribute"&&n.includes(o.attributeKey)){findAndAddListHeadToMap(o.range.start,r);if(o.attributeNewValue===null){findAndAddListHeadToMap(o.range.start.getShiftedBy(1),r)}}}const a=new Set;for(const t of r.values()){s=o.fire("postFixer",{listNodes:new ListBlocksIterable(t),listHead:t,writer:e,seenIds:a})||s}return s}function nR(t){return(e,[n,o])=>{const i=n.is("documentFragment")?n.getChild(0):n;if(!isListItemBlock(i)){return}let r;if(!o){r=t.document.selection}else{r=t.createSelection(o)}const s=r.getFirstPosition();let a=null;if(isListItemBlock(s.parent)){a=s.parent}else if(isListItemBlock(s.nodeBefore)){a=s.nodeBefore}if(!a){return}const c=a.getAttribute("listIndent")-i.getAttribute("listIndent");if(c<=0){return}t.change((t=>{for(const{node:e}of iterateSiblingListBlocks(i,"forward")){t.setAttribute("listIndent",e.getAttribute("listIndent")+c,e)}}))}}function oR(t,e){const n=t.document.selection;if(!n.isCollapsed){return!getSelectedBlockObject(t)}if(e==="forward"){return true}const o=n.getFirstPosition();const i=o.parent;const r=i.previousSibling;if(t.schema.isObject(r)){return false}if(r.isEmpty){return true}return isSingleListItem([i,r])}function iR(t){const e=t.createContainerElement("li");e.getFillerOffset=bR;return e}function rR(t,e){const n=e.mapper;const o=e.writer;const i=t.getAttribute("listType")=="numbered"?"ol":"ul";const r=iR(o);const s=o.createContainerElement(i,null);o.insert(o.createPositionAt(s,0),r);n.bindElements(t,r);return r}function sR(t,e,n,o){const i=e.parent;const r=n.mapper;const s=n.writer;let a=r.toViewPosition(o.createPositionBefore(t));const c=lR(t.previousSibling,{sameIndent:true,smallerIndent:true,listIndent:t.getAttribute("listIndent")});const l=t.previousSibling;if(c&&c.getAttribute("listIndent")==t.getAttribute("listIndent")){const t=r.toViewElement(c);a=s.breakContainer(s.createPositionAfter(t))}else{if(l&&l.name=="listItem"){a=r.toViewPosition(o.createPositionAt(l,"end"));const t=r.findMappedViewAncestor(a);const e=uR(t);if(e){a=s.createPositionBefore(e)}else{a=s.createPositionAt(t,"end")}}else{a=r.toViewPosition(o.createPositionBefore(t))}}a=cR(a);s.insert(a,i);if(l&&l.name=="listItem"){const t=r.toViewElement(l);const n=s.createRange(s.createPositionAt(t,0),a);const o=n.getWalker({ignoreElementEnd:true});for(const t of o){if(t.item.is("element","li")){const n=s.breakContainer(s.createPositionBefore(t.item));const i=t.item.parent;const r=s.createPositionAt(e,"end");aR(s,r.nodeBefore,r.nodeAfter);s.move(s.createRangeOn(i),r);o._position=n}}}else{const n=i.nextSibling;if(n&&(n.is("element","ul")||n.is("element","ol"))){let o=null;for(const e of n.getChildren()){const n=r.toModelElement(e);if(n&&n.getAttribute("listIndent")>t.getAttribute("listIndent")){o=e}else{break}}if(o){s.breakContainer(s.createPositionAfter(o));s.move(s.createRangeOn(o.parent),s.createPositionAt(e,"end"))}}}aR(s,i,i.nextSibling);aR(s,i.previousSibling,i)}function aR(t,e,n){if(!e||!n||e.name!="ul"&&e.name!="ol"){return null}if(e.name!=n.name||e.getAttribute("class")!==n.getAttribute("class")){return null}return t.mergeContainers(t.createPositionAfter(e))}function cR(t){return t.getLastMatchingPosition((t=>t.item.is("uiElement")))}function lR(t,e){const n=!!e.sameIndent;const o=!!e.smallerIndent;const i=e.listIndent;let r=t;while(r&&r.name=="listItem"){const t=r.getAttribute("listIndent");if(n&&i==t||o&&i>t){return r}if(e.direction==="forward"){r=r.nextSibling}else{r=r.previousSibling}}return null}function dR(t,e,n,o){t.ui.componentFactory.add(e,(i=>{const r=t.commands.get(e);const s=new Ad(i);s.set({label:n,icon:o,tooltip:true,isToggleable:true});s.bind("isOn","isEnabled").to(r,"value","isEnabled");s.on("execute",(()=>{t.execute(e);t.editing.view.focus()}));return s}))}function uR(t){for(const e of t.getChildren()){if(e.name=="ul"||e.name=="ol"){return e}}return null}function hR(t,e){const n=[];const o=t.parent;const i={ignoreElementEnd:false,startPosition:t,shallow:true,direction:e};const r=o.getAttribute("listIndent");const s=[...new Ab(i)].filter((t=>t.item.is("element"))).map((t=>t.item));for(const t of s){if(!t.is("element","listItem")){break}if(t.getAttribute("listIndent")<r){break}if(t.getAttribute("listIndent")>r){continue}if(t.getAttribute("listType")!==o.getAttribute("listType")){break}if(t.getAttribute("listStyle")!==o.getAttribute("listStyle")){break}if(t.getAttribute("listReversed")!==o.getAttribute("listReversed")){break}if(t.getAttribute("listStart")!==o.getAttribute("listStart")){break}if(e==="backward"){n.unshift(t)}else{n.push(t)}}return n}function fR(t){const e=t.document;let n=[...e.selection.getSelectedBlocks()].filter((t=>t.is("element","listItem"))).map((e=>{const n=t.change((t=>t.createPositionAt(e,0)));return[...hR(n,"backward"),...hR(n,"forward")]})).flat();n=[...new Set(n)];return n}const pR=["disc","circle","square"];const gR=["decimal","decimal-leading-zero","lower-roman","upper-roman","lower-latin","upper-latin"];function mR(t){if(pR.includes(t)){return"bulleted"}if(gR.includes(t)){return"numbered"}return null}function bR(){const t=!this.isEmpty&&(this.getChild(0).name=="ul"||this.getChild(0).name=="ol");if(this.isEmpty||t){return 0}return np.call(this)}const kR='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M7 5.75c0 .414.336.75.75.75h9.5a.75.75 0 1 0 0-1.5h-9.5a.75.75 0 0 0-.75.75zM3.5 3v5H2V3.7H1v-1h2.5V3zM.343 17.857l2.59-3.257H2.92a.6.6 0 1 0-1.04 0H.302a2 2 0 1 1 3.995 0h-.001c-.048.405-.16.734-.333.988-.175.254-.59.692-1.244 1.312H4.3v1h-4l.043-.043zM7 14.75a.75.75 0 0 1 .75-.75h9.5a.75.75 0 1 1 0 1.5h-9.5a.75.75 0 0 1-.75-.75z"/></svg>';const wR='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M7 5.75c0 .414.336.75.75.75h9.5a.75.75 0 1 0 0-1.5h-9.5a.75.75 0 0 0-.75.75zm-6 0C1 4.784 1.777 4 2.75 4c.966 0 1.75.777 1.75 1.75 0 .966-.777 1.75-1.75 1.75C1.784 7.5 1 6.723 1 5.75zm6 9c0 .414.336.75.75.75h9.5a.75.75 0 1 0 0-1.5h-9.5a.75.75 0 0 0-.75.75zm-6 0c0-.966.777-1.75 1.75-1.75.966 0 1.75.777 1.75 1.75 0 .966-.777 1.75-1.75 1.75-.966 0-1.75-.777-1.75-1.75z"/></svg>';class _R extends Au{static get pluginName(){return"ListUI"}init(){const t=this.editor.t;dR(this.editor,"numberedList",t("Numbered List"),kR);dR(this.editor,"bulletedList",t("Bulleted List"),wR)}}class vR extends(null&&Plugin){static get requires(){return[DocumentListEditing,ListUI]}static get pluginName(){return"DocumentList"}}class AR extends(null&&Plugin){static get pluginName(){return"AdjacentListsSupport"}init(){const t=this.editor;const e=t.model;e.schema.register("listSeparator",{allowWhere:"$block",isBlock:true});t.conversion.for("upcast").add((t=>{t.on("element:ol",CR());t.on("element:ul",CR())})).elementToElement({model:"listSeparator",view:"ck-list-separator"});t.conversion.for("editingDowncast").elementToElement({model:"listSeparator",view:{name:"div",classes:["ck-list-separator","ck-hidden"]}});t.conversion.for("dataDowncast").elementToElement({model:"listSeparator",view:(t,e)=>{const n=e.writer.createContainerElement("ck-list-separator");e.writer.setCustomProperty("dataPipeline:transparentRendering",true,n);n.getFillerOffset=()=>null;return n}})}}function CR(){return(t,e,n)=>{const o=e.viewItem;const i=o.nextSibling;if(!i){return}if(o.name!==i.name){return}if(!e.modelRange){Object.assign(e,n.convertChildren(e.viewItem,e.modelCursor))}const r=n.writer;const s=r.createElement("listSeparator");if(!n.safeInsert(s,e.modelCursor)){return}const a=n.getSplitParts(s);e.modelRange=r.createRange(e.modelRange.start,r.createPositionAfter(a[a.length-1]));n.updateConversionResult(s,e)}}class yR extends(null&&Command){refresh(){const t=this._getValue();this.value=t;this.isEnabled=t!=null}execute({startIndex:t=1}={}){const e=this.editor.model;const n=e.document;let o=Array.from(n.selection.getSelectedBlocks()).filter((t=>isListItemBlock(t)&&t.getAttribute("listType")=="numbered"));o=expandListBlocksToCompleteList(o);e.change((e=>{for(const n of o){e.setAttribute("listStart",t>=0?t:1,n)}}))}_getValue(){const t=this.editor.model;const e=t.document;const n=first(e.selection.getSelectedBlocks());if(n&&isListItemBlock(n)&&n.getAttribute("listType")=="numbered"){return n.getAttribute("listStart")}return null}}const xR={};const ER={};const SR={};const DR=[{listStyle:"disc",typeAttribute:"disc",listType:"bulleted"},{listStyle:"circle",typeAttribute:"circle",listType:"bulleted"},{listStyle:"square",typeAttribute:"square",listType:"bulleted"},{listStyle:"decimal",typeAttribute:"1",listType:"numbered"},{listStyle:"decimal-leading-zero",typeAttribute:null,listType:"numbered"},{listStyle:"lower-roman",typeAttribute:"i",listType:"numbered"},{listStyle:"upper-roman",typeAttribute:"I",listType:"numbered"},{listStyle:"lower-alpha",typeAttribute:"a",listType:"numbered"},{listStyle:"upper-alpha",typeAttribute:"A",listType:"numbered"},{listStyle:"lower-latin",typeAttribute:"a",listType:"numbered"},{listStyle:"upper-latin",typeAttribute:"A",listType:"numbered"}];for(const{listStyle:t,typeAttribute:e,listType:n}of DR){xR[t]=n;ER[t]=e;if(e){SR[e]=t}}function TR(){return DR.map((t=>t.listStyle))}function PR(t){return xR[t]||null}function BR(t){return SR[t]||null}function IR(t){return ER[t]||null}class RR extends(null&&Command){constructor(t,e,n){super(t);this.defaultType=e;this._supportedTypes=n}refresh(){this.value=this._getValue();this.isEnabled=this._checkEnabled()}execute(t={}){const e=this.editor.model;const n=e.document;e.change((e=>{this._tryToConvertItemsToList(t);let o=Array.from(n.selection.getSelectedBlocks()).filter((t=>t.hasAttribute("listType")));if(!o.length){return}o=expandListBlocksToCompleteList(o);for(const n of o){e.setAttribute("listStyle",t.type||this.defaultType,n)}}))}isStyleTypeSupported(t){if(!this._supportedTypes){return true}return this._supportedTypes.includes(t)}_getValue(){const t=first(this.editor.model.document.selection.getSelectedBlocks());if(isListItemBlock(t)){return t.getAttribute("listStyle")}return null}_checkEnabled(){const t=this.editor;const e=t.commands.get("numberedList");const n=t.commands.get("bulletedList");return e.isEnabled||n.isEnabled}_tryToConvertItemsToList(t){if(!t.type){return}const e=getListTypeFromListStyleType(t.type);if(!e){return}const n=this.editor;const o=`${e}List`;const i=n.commands.get(o);if(!i.value){n.execute(o)}}}class OR extends(null&&Command){refresh(){const t=this._getValue();this.value=t;this.isEnabled=t!=null}execute(t={}){const e=this.editor.model;const n=e.document;let o=Array.from(n.selection.getSelectedBlocks()).filter((t=>isListItemBlock(t)&&t.getAttribute("listType")=="numbered"));o=expandListBlocksToCompleteList(o);e.change((e=>{for(const n of o){e.setAttribute("listReversed",!!t.reversed,n)}}))}_getValue(){const t=this.editor.model;const e=t.document;const n=first(e.selection.getSelectedBlocks());if(isListItemBlock(n)&&n.getAttribute("listType")=="numbered"){return n.getAttribute("listReversed")}return null}}class MR extends(null&&Plugin){static get pluginName(){return"DocumentListPropertiesUtils"}getAllSupportedStyleTypes(){return getAllSupportedStyleTypes()}getListTypeFromListStyleType(t){return getListTypeFromListStyleType(t)}getListStyleTypeFromTypeAttribute(t){return getListStyleTypeFromTypeAttribute(t)}getTypeAttributeFromListStyleType(t){return getTypeAttributeFromListStyleType(t)}}const VR="default";class zR extends(null&&Plugin){static get requires(){return[DocumentListEditing,DocumentListPropertiesUtils]}static get pluginName(){return"DocumentListPropertiesEditing"}constructor(t){super(t);t.config.define("list",{properties:{styles:true,startIndex:false,reversed:false}})}init(){const t=this.editor;const e=t.model;const n=t.plugins.get(DocumentListEditing);const o=t.config.get("list.properties");const i=FR(o);for(const o of i){o.addCommand(t);e.schema.extend("$container",{allowAttributes:o.attributeName});e.schema.extend("$block",{allowAttributes:o.attributeName});e.schema.extend("$blockObject",{allowAttributes:o.attributeName});n.registerDowncastStrategy({scope:"list",attributeName:o.attributeName,setAttributeOnDowncast(t,e,n){o.setAttributeOnDowncast(t,e,n)}})}t.conversion.for("upcast").add((t=>{for(const e of i){t.on("element:ol",listPropertiesUpcastConverter(e));t.on("element:ul",listPropertiesUpcastConverter(e))}}));n.on("checkAttributes:list",((t,{viewElement:e,modelAttributes:n})=>{for(const o of i){if(o.getAttributeOnUpcast(e)!=n[o.attributeName]){t.return=true;t.stop()}}}));this.listenTo(t.commands.get("indentList"),"afterExecute",((t,n)=>{e.change((t=>{for(const e of n){for(const n of i){if(n.appliesToListItem(e)){t.setAttribute(n.attributeName,n.defaultValue,e)}}}}))}));n.on("postFixer",((t,{listNodes:e,writer:n})=>{for(const{node:o}of e){for(const e of i){if(e.hasValidAttribute(o)){continue}if(e.appliesToListItem(o)){n.setAttribute(e.attributeName,e.defaultValue,o)}else{n.removeAttribute(e.attributeName,o)}t.return=true}}}));n.on("postFixer",((t,{listNodes:e,writer:n})=>{const o=[];for(const{node:r,previous:s}of e){if(!s){continue}const e=r.getAttribute("listIndent");const a=s.getAttribute("listIndent");let c=null;if(e>a){o[a]=s}else if(e<a){c=o[e];o.length=e}else{c=s}if(!c){continue}if(c.getAttribute("listType")!=r.getAttribute("listType")){continue}for(const e of i){const{attributeName:o}=e;if(!e.appliesToListItem(r)){continue}const i=c.getAttribute(o);if(r.getAttribute(o)!=i){n.setAttribute(o,i,r);t.return=true}}}}))}}function FR(t){const e=[];if(t.styles){const n=typeof t.styles=="object"&&t.styles.useAttribute;e.push({attributeName:"listStyle",defaultValue:VR,viewConsumables:{styles:"list-style-type"},addCommand(t){let e=getAllSupportedStyleTypes();if(n){e=e.filter((t=>!!getTypeAttributeFromListStyleType(t)))}t.commands.add("listStyle",new DocumentListStyleCommand(t,VR,e))},appliesToListItem(){return true},hasValidAttribute(t){if(!t.hasAttribute("listStyle")){return false}const e=t.getAttribute("listStyle");if(e==VR){return true}return getListTypeFromListStyleType(e)==t.getAttribute("listType")},setAttributeOnDowncast(t,e,o){if(e&&e!==VR){if(n){const n=getTypeAttributeFromListStyleType(e);if(n){t.setAttribute("type",n,o);return}}else{t.setStyle("list-style-type",e,o);return}}t.removeStyle("list-style-type",o);t.removeAttribute("type",o)},getAttributeOnUpcast(t){const e=t.getStyle("list-style-type");if(e){return e}const n=t.getAttribute("type");if(n){return getListStyleTypeFromTypeAttribute(n)}return VR}})}if(t.reversed){e.push({attributeName:"listReversed",defaultValue:false,viewConsumables:{attributes:"reversed"},addCommand(t){t.commands.add("listReversed",new DocumentListReversedCommand(t))},appliesToListItem(t){return t.getAttribute("listType")=="numbered"},hasValidAttribute(t){return this.appliesToListItem(t)==t.hasAttribute("listReversed")},setAttributeOnDowncast(t,e,n){if(e){t.setAttribute("reversed","reversed",n)}else{t.removeAttribute("reversed",n)}},getAttributeOnUpcast(t){return t.hasAttribute("reversed")}})}if(t.startIndex){e.push({attributeName:"listStart",defaultValue:1,viewConsumables:{attributes:"start"},addCommand(t){t.commands.add("listStart",new DocumentListStartCommand(t))},appliesToListItem(t){return t.getAttribute("listType")=="numbered"},hasValidAttribute(t){return this.appliesToListItem(t)==t.hasAttribute("listStart")},setAttributeOnDowncast(t,e,n){if(e==0||e>1){t.setAttribute("start",e,n)}else{t.removeAttribute("start",n)}},getAttributeOnUpcast(t){const e=t.getAttribute("start");return e>=0?e:1}})}return e}var NR=n(782);var LR={injectType:"singletonStyleTag",attributes:{"data-cke":true}};LR.insert="head";LR.singleton=true;var HR=Il()(NR.Z,LR);const jR=NR.Z.locals||{};class qR extends(null&&View){constructor(t,e){super(t);const n=this.bindTemplate;this.set("isCollapsed",false);this.set("label","");this.buttonView=this._createButtonView();this.children=this.createCollection();this.set("_collapsibleAriaLabelUid",undefined);if(e){this.children.addMany(e)}this.setTemplate({tag:"div",attributes:{class:["ck","ck-collapsible",n.if("isCollapsed","ck-collapsible_collapsed")]},children:[this.buttonView,{tag:"div",attributes:{class:["ck","ck-collapsible__children"],role:"region",hidden:n.if("isCollapsed","hidden"),"aria-labelledby":n.to("_collapsibleAriaLabelUid")},children:this.children}]})}render(){super.render();this._collapsibleAriaLabelUid=this.buttonView.labelView.element.id}_createButtonView(){const t=new ButtonView(this.locale);const e=t.bindTemplate;t.set({withText:true,icon:dropdownArrowIcon});t.extendTemplate({attributes:{"aria-expanded":e.to("isOn",(t=>String(t)))}});t.bind("label").to(this);t.bind("isOn").to(this,"isCollapsed",(t=>!t));t.on("execute",(()=>{this.isCollapsed=!this.isCollapsed}));return t}}var $R=n(938);var WR={injectType:"singletonStyleTag",attributes:{"data-cke":true}};WR.insert="head";WR.singleton=true;var GR=Il()($R.Z,WR);const KR=$R.Z.locals||{};class UR extends(null&&View){constructor(t,{enabledProperties:e,styleButtonViews:n,styleGridAriaLabel:o}){super(t);this.stylesView=null;this.additionalPropertiesCollapsibleView=null;this.startIndexFieldView=null;this.reversedSwitchButtonView=null;this.focusTracker=new FocusTracker;this.keystrokes=new KeystrokeHandler;this.focusables=new ViewCollection;const i=["ck","ck-list-properties"];this.children=this.createCollection();this.focusCycler=new FocusCycler({focusables:this.focusables,focusTracker:this.focusTracker,keystrokeHandler:this.keystrokes,actions:{focusPrevious:"shift + tab",focusNext:"tab"}});if(e.styles){this.stylesView=this._createStylesView(n,o);this.children.add(this.stylesView)}else{i.push("ck-list-properties_without-styles")}if(e.startIndex||e.reversed){this._addNumberedListPropertyViews(e);i.push("ck-list-properties_with-numbered-properties")}this.setTemplate({tag:"div",attributes:{class:i},children:this.children})}render(){super.render();if(this.stylesView){this.focusables.add(this.stylesView);this.focusTracker.add(this.stylesView.element);if(this.startIndexFieldView||this.reversedSwitchButtonView){this.focusables.add(this.children.last.buttonView);this.focusTracker.add(this.children.last.buttonView.element)}for(const t of this.stylesView.children){this.stylesView.focusTracker.add(t.element)}addKeyboardHandlingForGrid({keystrokeHandler:this.stylesView.keystrokes,focusTracker:this.stylesView.focusTracker,gridItems:this.stylesView.children,numberOfColumns:()=>global.window.getComputedStyle(this.stylesView.element).getPropertyValue("grid-template-columns").split(" ").length,uiLanguageDirection:this.locale&&this.locale.uiLanguageDirection})}if(this.startIndexFieldView){this.focusables.add(this.startIndexFieldView);this.focusTracker.add(this.startIndexFieldView.element);const t=t=>t.stopPropagation();this.keystrokes.set("arrowright",t);this.keystrokes.set("arrowleft",t);this.keystrokes.set("arrowup",t);this.keystrokes.set("arrowdown",t)}if(this.reversedSwitchButtonView){this.focusables.add(this.reversedSwitchButtonView);this.focusTracker.add(this.reversedSwitchButtonView.element)}this.keystrokes.listenTo(this.element)}focus(){this.focusCycler.focusFirst()}focusLast(){this.focusCycler.focusLast()}destroy(){super.destroy();this.focusTracker.destroy();this.keystrokes.destroy()}_createStylesView(t,e){const n=new View(this.locale);n.children=n.createCollection();n.children.addMany(t);n.setTemplate({tag:"div",attributes:{"aria-label":e,class:["ck","ck-list-styles-list"]},children:n.children});n.children.delegate("execute").to(this);n.focus=function(){this.children.first.focus()};n.focusTracker=new FocusTracker;n.keystrokes=new KeystrokeHandler;n.render();n.keystrokes.listenTo(n.element);return n}_addNumberedListPropertyViews(t){const e=this.locale.t;const n=[];if(t.startIndex){this.startIndexFieldView=this._createStartIndexField();n.push(this.startIndexFieldView)}if(t.reversed){this.reversedSwitchButtonView=this._createReversedSwitchButton();n.push(this.reversedSwitchButtonView)}if(t.styles){this.additionalPropertiesCollapsibleView=new CollapsibleView(this.locale,n);this.additionalPropertiesCollapsibleView.set({label:e("List properties"),isCollapsed:true});this.additionalPropertiesCollapsibleView.buttonView.bind("isEnabled").toMany(n,"isEnabled",((...t)=>t.some((t=>t))));this.additionalPropertiesCollapsibleView.buttonView.on("change:isEnabled",((t,e,n)=>{if(!n){this.additionalPropertiesCollapsibleView.isCollapsed=true}}));this.children.add(this.additionalPropertiesCollapsibleView)}else{this.children.addMany(n)}}_createStartIndexField(){const t=this.locale.t;const e=new LabeledFieldView(this.locale,createLabeledInputNumber);e.set({label:t("Start at"),class:"ck-numbered-list-properties__start-index"});e.fieldView.set({min:0,step:1,value:1,inputMode:"numeric"});e.fieldView.on("input",(()=>{const n=e.fieldView.element;const o=n.valueAsNumber;if(Number.isNaN(o)){return}if(!n.checkValidity()){e.errorText=t("Start index must be greater than 0.")}else{this.fire("listStart",{startIndex:o})}}));return e}_createReversedSwitchButton(){const t=this.locale.t;const e=new SwitchButtonView(this.locale);e.set({withText:true,label:t("Reversed order"),class:"ck-numbered-list-properties__reversed-order"});e.delegate("execute").to(this,"listReversed");return e}}var ZR=n(591);var JR={injectType:"singletonStyleTag",attributes:{"data-cke":true}};JR.insert="head";JR.singleton=true;var YR=Il()(ZR.Z,JR);const QR=ZR.Z.locals||{};class XR extends(null&&Plugin){static get pluginName(){return"ListPropertiesUI"}init(){const t=this.editor;const e=t.locale.t;const n=t.config.get("list.properties");if(n.styles){t.ui.componentFactory.add("bulletedList",tO({editor:t,parentCommandName:"bulletedList",buttonLabel:e("Bulleted List"),buttonIcon:bulletedListIcon,styleGridAriaLabel:e("Bulleted list styles toolbar"),styleDefinitions:[{label:e("Toggle the disc list style"),tooltip:e("Disc"),type:"disc",icon:listStyleDiscIcon},{label:e("Toggle the circle list style"),tooltip:e("Circle"),type:"circle",icon:listStyleCircleIcon},{label:e("Toggle the square list style"),tooltip:e("Square"),type:"square",icon:listStyleSquareIcon}]}))}if(n.styles||n.startIndex||n.reversed){t.ui.componentFactory.add("numberedList",tO({editor:t,parentCommandName:"numberedList",buttonLabel:e("Numbered List"),buttonIcon:numberedListIcon,styleGridAriaLabel:e("Numbered list styles toolbar"),styleDefinitions:[{label:e("Toggle the decimal list style"),tooltip:e("Decimal"),type:"decimal",icon:listStyleDecimalIcon},{label:e("Toggle the decimal with leading zero list style"),tooltip:e("Decimal with leading zero"),type:"decimal-leading-zero",icon:listStyleDecimalWithLeadingZeroIcon},{label:e("Toggle the lower–roman list style"),tooltip:e("Lower–roman"),type:"lower-roman",icon:listStyleLowerRomanIcon},{label:e("Toggle the upper–roman list style"),tooltip:e("Upper-roman"),type:"upper-roman",icon:listStyleUpperRomanIcon},{label:e("Toggle the lower–latin list style"),tooltip:e("Lower-latin"),type:"lower-latin",icon:listStyleLowerLatinIcon},{label:e("Toggle the upper–latin list style"),tooltip:e("Upper-latin"),type:"upper-latin",icon:listStyleUpperLatinIcon}]}))}}}function tO({editor:t,parentCommandName:e,buttonLabel:n,buttonIcon:o,styleGridAriaLabel:i,styleDefinitions:r}){const s=t.commands.get(e);return a=>{const c=createDropdown(a,SplitButtonView);const l=c.buttonView;c.bind("isEnabled").to(s);c.class="ck-list-styles-dropdown";l.on("execute",(()=>{t.execute(e);t.editing.view.focus()}));l.set({label:n,icon:o,tooltip:true,isToggleable:true});l.bind("isOn").to(s,"value",(t=>!!t));c.once("change:isOpen",(()=>{const n=nO({editor:t,dropdownView:c,parentCommandName:e,styleGridAriaLabel:i,styleDefinitions:r});c.panelView.children.add(n)}));c.on("execute",(()=>{t.editing.view.focus()}));return c}}function eO({editor:t,listStyleCommand:e,parentCommandName:n}){const o=t.locale;const i=t.commands.get(n);return({label:n,type:r,icon:s,tooltip:a})=>{const c=new ButtonView(o);c.set({label:n,icon:s,tooltip:a});e.on("change:value",(()=>{c.isOn=e.value===r}));c.on("execute",(()=>{if(i.value){if(e.value!==r){t.execute("listStyle",{type:r})}else{t.execute("listStyle",{type:e.defaultType})}}else{t.model.change((()=>{t.execute("listStyle",{type:r})}))}}));return c}}function nO({editor:t,dropdownView:e,parentCommandName:n,styleDefinitions:o,styleGridAriaLabel:i}){const r=t.locale;const s=t.config.get("list.properties");let a=null;if(n!="numberedList"){s.startIndex=false;s.reversed=false}if(s.styles){const e=t.commands.get("listStyle");const i=eO({editor:t,parentCommandName:n,listStyleCommand:e});const r=typeof e.isStyleTypeSupported=="function"?t=>e.isStyleTypeSupported(t.type):()=>true;a=o.filter(r).map(i)}const c=new ListPropertiesView(r,{styleGridAriaLabel:i,enabledProperties:s,styleButtonViews:a});if(s.styles){focusChildOnDropdownOpen(e,(()=>c.stylesView.children.find((t=>t.isOn))))}if(s.startIndex){const e=t.commands.get("listStart");c.startIndexFieldView.bind("isEnabled").to(e);c.startIndexFieldView.fieldView.bind("value").to(e);c.on("listStart",((e,n)=>t.execute("listStart",n)))}if(s.reversed){const e=t.commands.get("listReversed");c.reversedSwitchButtonView.bind("isEnabled").to(e);c.reversedSwitchButtonView.bind("isOn").to(e,"value",(t=>!!t));c.on("listReversed",(()=>{const n=e.value;t.execute("listReversed",{reversed:!n})}))}c.delegate("execute").to(e);return c}class oO extends(null&&Plugin){static get requires(){return[DocumentListPropertiesEditing,ListPropertiesUI]}static get pluginName(){return"DocumentListProperties"}}class iO extends yu{constructor(t,e){super(t);this._indentBy=e=="forward"?1:-1}refresh(){this.isEnabled=this._checkEnabled()}execute(){const t=this.editor.model;const e=t.document;let n=Array.from(e.selection.getSelectedBlocks());t.change((t=>{const e=n[n.length-1];let o=e.nextSibling;while(o&&o.name=="listItem"&&o.getAttribute("listIndent")>e.getAttribute("listIndent")){n.push(o);o=o.nextSibling}if(this._indentBy<0){n=n.reverse()}for(const e of n){const n=e.getAttribute("listIndent")+this._indentBy;if(n<0){t.rename(e,"paragraph")}else{t.setAttribute("listIndent",n,e)}}this.fire("_executeCleanup",n)}))}_checkEnabled(){const t=hl(this.editor.model.document.selection.getSelectedBlocks());if(!t||!t.is("element","listItem")){return false}if(this._indentBy>0){const e=t.getAttribute("listIndent");const n=t.getAttribute("listType");let o=t.previousSibling;while(o&&o.is("element","listItem")&&o.getAttribute("listIndent")>=e){if(o.getAttribute("listIndent")==e){return o.getAttribute("listType")==n}o=o.previousSibling}return false}return true}}class rO extends yu{constructor(t,e){super(t);this.type=e}refresh(){this.value=this._getValue();this.isEnabled=this._checkEnabled()}execute(t={}){const e=this.editor.model;const n=e.document;const o=Array.from(n.selection.getSelectedBlocks()).filter((t=>aO(t,e.schema)));const i=t.forceValue!==undefined?!t.forceValue:this.value;e.change((t=>{if(i){let e=o[o.length-1].nextSibling;let n=Number.POSITIVE_INFINITY;let i=[];while(e&&e.name=="listItem"&&e.getAttribute("listIndent")!==0){const t=e.getAttribute("listIndent");if(t<n){n=t}const o=t-n;i.push({element:e,listIndent:o});e=e.nextSibling}i=i.reverse();for(const e of i){t.setAttribute("listIndent",e.listIndent,e.element)}}if(!i){let t=Number.POSITIVE_INFINITY;for(const e of o){if(e.is("element","listItem")&&e.getAttribute("listIndent")<t){t=e.getAttribute("listIndent")}}t=t===0?1:t;sO(o,true,t);sO(o,false,t)}for(const e of o.reverse()){if(i&&e.name=="listItem"){t.rename(e,"paragraph")}else if(!i&&e.name!="listItem"){t.setAttributes({listType:this.type,listIndent:0},e);t.rename(e,"listItem")}else if(!i&&e.name=="listItem"&&e.getAttribute("listType")!=this.type){t.setAttribute("listType",this.type,e)}}this.fire("_executeCleanup",o)}))}_getValue(){const t=hl(this.editor.model.document.selection.getSelectedBlocks());return!!t&&t.is("element","listItem")&&t.getAttribute("listType")==this.type}_checkEnabled(){if(this.value){return true}const t=this.editor.model.document.selection;const e=this.editor.model.schema;const n=hl(t.getSelectedBlocks());if(!n){return false}return aO(n,e)}}function sO(t,e,n){const o=e?t[0]:t[t.length-1];if(o.is("element","listItem")){let i=o[e?"previousSibling":"nextSibling"];let r=o.getAttribute("listIndent");while(i&&i.is("element","listItem")&&i.getAttribute("listIndent")>=n){if(r>i.getAttribute("listIndent")){r=i.getAttribute("listIndent")}if(i.getAttribute("listIndent")==r){t[e?"unshift":"push"](i)}i=i[e?"previousSibling":"nextSibling"]}}}function aO(t,e){return e.checkChild(t.parent,"listItem")&&!e.isObject(t)}class cO extends Au{static get pluginName(){return"ListUtils"}getListTypeFromListStyleType(t){return mR(t)}getSelectedListItems(t){return fR(t)}getSiblingNodes(t,e){return hR(t,e)}}function lO(t){return(e,n,o)=>{const i=o.consumable;if(!i.test(n.item,"insert")||!i.test(n.item,"attribute:listType")||!i.test(n.item,"attribute:listIndent")){return}i.consume(n.item,"insert");i.consume(n.item,"attribute:listType");i.consume(n.item,"attribute:listIndent");const r=n.item;const s=rR(r,o);sR(r,s,o,t)}}function dO(t){return(e,n,o)=>{const i=o.mapper.toViewPosition(n.position);const r=i.getLastMatchingPosition((t=>!t.item.is("element","li")));const s=r.nodeAfter;const a=o.writer;a.breakContainer(a.createPositionBefore(s));a.breakContainer(a.createPositionAfter(s));const c=s.parent;const l=c.previousSibling;const d=a.createRangeOn(c);const u=a.remove(d);if(l&&l.nextSibling){aR(a,l,l.nextSibling)}const h=o.mapper.toModelElement(s);xO(h.getAttribute("listIndent")+1,n.position,d.start,s,o,t);for(const t of a.createRangeIn(u).getItems()){o.mapper.unbindViewElement(t)}e.stop()}}const uO=(t,e,n)=>{if(!n.consumable.test(e.item,t.name)){return}const o=n.mapper.toViewElement(e.item);const i=n.writer;i.breakContainer(i.createPositionBefore(o));i.breakContainer(i.createPositionAfter(o));const r=o.parent;const s=e.attributeNewValue=="numbered"?"ol":"ul";i.rename(s,r)};const hO=(t,e,n)=>{n.consumable.consume(e.item,t.name);const o=n.mapper.toViewElement(e.item);const i=o.parent;const r=n.writer;aR(r,i,i.nextSibling);aR(r,i.previousSibling,i)};function fO(t){return(e,n,o)=>{if(!o.consumable.consume(n.item,"attribute:listIndent")){return}const i=o.mapper.toViewElement(n.item);const r=o.writer;r.breakContainer(r.createPositionBefore(i));r.breakContainer(r.createPositionAfter(i));const s=i.parent;const a=s.previousSibling;const c=r.createRangeOn(s);r.remove(c);if(a&&a.nextSibling){aR(r,a,a.nextSibling)}xO(n.attributeOldValue+1,n.range.start,c.start,i,o,t);sR(n.item,i,o,t);for(const t of n.item.getChildren()){o.consumable.consume(t,"insert")}}}const pO=(t,e,n)=>{if(!n.consumable.test(e.item,t.name)){return}if(e.item.name!="listItem"){let t=n.mapper.toViewPosition(e.range.start);const o=n.writer;const i=[];while(t.parent.name=="ul"||t.parent.name=="ol"){t=o.breakContainer(t);if(t.parent.name!="li"){break}const e=t;const n=o.createPositionAt(t.parent,"end");if(!e.isEqual(n)){const t=o.remove(o.createRange(e,n));i.push(t)}t=o.createPositionAfter(t.parent)}if(i.length>0){for(let e=0;e<i.length;e++){const n=t.nodeBefore;const r=o.insert(t,i[e]);t=r.end;if(e>0){const e=aR(o,n,n.nextSibling);if(e&&e.parent==n){t.offset--}}}aR(o,t.nodeBefore,t.nodeAfter)}}};const gO=(t,e,n)=>{const o=n.mapper.toViewPosition(e.position);const i=o.nodeBefore;const r=o.nodeAfter;aR(n.writer,i,r)};const mO=(t,e,n)=>{if(n.consumable.consume(e.viewItem,{name:true})){const t=n.writer;const o=t.createElement("listItem");const i=SO(e.viewItem);t.setAttribute("listIndent",i,o);const r=e.viewItem.parent&&e.viewItem.parent.name=="ol"?"numbered":"bulleted";t.setAttribute("listType",r,o);if(!n.safeInsert(o,e.modelCursor)){return}const s=CO(o,e.viewItem.getChildren(),n);e.modelRange=t.createRange(e.modelCursor,s);n.updateConversionResult(o,e)}};const bO=(t,e,n)=>{if(n.consumable.test(e.viewItem,{name:true})){const t=Array.from(e.viewItem.getChildren());for(const e of t){const t=!(e.is("element","li")||EO(e));if(t){e._remove()}}}};const kO=(t,e,n)=>{if(n.consumable.test(e.viewItem,{name:true})){if(e.viewItem.childCount===0){return}const t=[...e.viewItem.getChildren()];let n=false;for(const e of t){if(n&&!EO(e)){e._remove()}if(EO(e)){n=true}}}};function wO(t){return(e,n)=>{if(n.isPhantom){return}const o=n.modelPosition.nodeBefore;if(o&&o.is("element","listItem")){const e=n.mapper.toViewElement(o);const i=e.getAncestors().find(EO);const r=t.createPositionAt(e,0).getWalker();for(const t of r){if(t.type=="elementStart"&&t.item.is("element","li")){n.viewPosition=t.previousPosition;break}else if(t.type=="elementEnd"&&t.item==i){n.viewPosition=t.nextPosition;break}}}}}function _O(t){return(e,n)=>{const o=n.viewPosition;const i=o.parent;const r=n.mapper;if(i.name=="ul"||i.name=="ol"){if(!o.isAtEnd){const e=r.toModelElement(o.nodeAfter);n.modelPosition=t.createPositionBefore(e)}else{const e=r.toModelElement(o.nodeBefore);const i=r.getModelLength(o.nodeBefore);n.modelPosition=t.createPositionBefore(e).getShiftedBy(i)}e.stop()}else if(i.name=="li"&&o.nodeBefore&&(o.nodeBefore.name=="ul"||o.nodeBefore.name=="ol")){const s=r.toModelElement(i);let a=1;let c=o.nodeBefore;while(c&&EO(c)){a+=r.getModelLength(c);c=c.previousSibling}n.modelPosition=t.createPositionBefore(s).getShiftedBy(a);e.stop()}}}function vO(t,e){const n=t.document.differ.getChanges();const o=new Map;let i=false;for(const o of n){if(o.type=="insert"&&o.name=="listItem"){r(o.position)}else if(o.type=="insert"&&o.name!="listItem"){if(o.name!="$text"){const n=o.position.nodeAfter;if(n.hasAttribute("listIndent")){e.removeAttribute("listIndent",n);i=true}if(n.hasAttribute("listType")){e.removeAttribute("listType",n);i=true}if(n.hasAttribute("listStyle")){e.removeAttribute("listStyle",n);i=true}if(n.hasAttribute("listReversed")){e.removeAttribute("listReversed",n);i=true}if(n.hasAttribute("listStart")){e.removeAttribute("listStart",n);i=true}for(const e of Array.from(t.createRangeIn(n)).filter((t=>t.item.is("element","listItem")))){r(e.previousPosition)}}const n=o.position.getShiftedBy(o.length);r(n)}else if(o.type=="remove"&&o.name=="listItem"){r(o.position)}else if(o.type=="attribute"&&o.attributeKey=="listIndent"){r(o.range.start)}else if(o.type=="attribute"&&o.attributeKey=="listType"){r(o.range.start)}}for(const t of o.values()){s(t);a(t)}return i;function r(t){const e=t.nodeBefore;if(!e||!e.is("element","listItem")){const e=t.nodeAfter;if(e&&e.is("element","listItem")){o.set(e,e)}}else{let t=e;if(o.has(t)){return}for(let e=t.previousSibling;e&&e.is("element","listItem");e=t.previousSibling){t=e;if(o.has(t)){return}}o.set(e,t)}}function s(t){let n=0;let o=null;while(t&&t.is("element","listItem")){const r=t.getAttribute("listIndent");if(r>n){let s;if(o===null){o=r-n;s=n}else{if(o>r){o=r}s=r-o}e.setAttribute("listIndent",s,t);i=true}else{o=null;n=t.getAttribute("listIndent")+1}t=t.nextSibling}}function a(t){let n=[];let o=null;while(t&&t.is("element","listItem")){const r=t.getAttribute("listIndent");if(o&&o.getAttribute("listIndent")>r){n=n.slice(0,r+1)}if(r!=0){if(n[r]){const o=n[r];if(t.getAttribute("listType")!=o){e.setAttribute("listType",o,t);i=true}}else{n[r]=t.getAttribute("listType")}}o=t;t=t.nextSibling}}}const AO=function(t,[e,n]){const o=this;let i=e.is("documentFragment")?e.getChild(0):e;let r;if(!n){r=o.document.selection}else{r=o.createSelection(n)}if(i&&i.is("element","listItem")){const t=r.getFirstPosition();let e=null;if(t.parent.is("element","listItem")){e=t.parent}else if(t.nodeBefore&&t.nodeBefore.is("element","listItem")){e=t.nodeBefore}if(e){const t=e.getAttribute("listIndent");if(t>0){while(i&&i.is("element","listItem")){i._setAttribute("listIndent",i.getAttribute("listIndent")+t);i=i.nextSibling}}}}};function CO(t,e,n){const{writer:o,schema:i}=n;let r=o.createPositionAfter(t);for(const s of e){if(s.name=="ul"||s.name=="ol"){r=n.convertItem(s,r).modelCursor}else{const e=n.convertItem(s,o.createPositionAt(t,"end"));const a=e.modelRange.start.nodeAfter;const c=a&&a.is("element")&&!i.checkChild(t,a.name);if(c){if(e.modelCursor.parent.is("element","listItem")){t=e.modelCursor.parent}else{t=yO(e.modelCursor)}r=o.createPositionAfter(t)}}}return r}function yO(t){const e=new Ab({startPosition:t});let n;do{n=e.next()}while(!n.value.item.is("element","listItem"));return n.value.item}function xO(t,e,n,o,i,r){const s=lR(e.nodeBefore,{sameIndent:true,smallerIndent:true,listIndent:t});const a=i.mapper;const c=i.writer;const l=s?s.getAttribute("listIndent"):null;let d;if(!s){d=n}else if(l==t){const t=a.toViewElement(s).parent;d=c.createPositionAfter(t)}else{const t=r.createPositionAt(s,"end");d=a.toViewPosition(t)}d=cR(d);for(const t of[...o.getChildren()]){if(EO(t)){d=c.move(c.createRangeOn(t),d).end;aR(c,t,t.nextSibling);aR(c,t.previousSibling,t)}}}function EO(t){return t.is("element","ol")||t.is("element","ul")}function SO(t){let e=0;let n=t.parent;while(n){if(n.is("element","li")){e++}else{const t=n.previousSibling;if(t&&t.is("element","li")){e++}}n=n.parent}return e}class DO extends Au{static get pluginName(){return"ListEditing"}static get requires(){return[DT,dD,cO]}init(){const t=this.editor;t.model.schema.register("listItem",{inheritAllFrom:"$block",allowAttributes:["listType","listIndent"]});const e=t.data;const n=t.editing;t.model.document.registerPostFixer((e=>vO(t.model,e)));n.mapper.registerViewToModelLength("li",TO);e.mapper.registerViewToModelLength("li",TO);n.mapper.on("modelToViewPosition",wO(n.view));n.mapper.on("viewToModelPosition",_O(t.model));e.mapper.on("modelToViewPosition",wO(n.view));t.conversion.for("editingDowncast").add((e=>{e.on("insert",pO,{priority:"high"});e.on("insert:listItem",lO(t.model));e.on("attribute:listType:listItem",uO,{priority:"high"});e.on("attribute:listType:listItem",hO,{priority:"low"});e.on("attribute:listIndent:listItem",fO(t.model));e.on("remove:listItem",dO(t.model));e.on("remove",gO,{priority:"low"})}));t.conversion.for("dataDowncast").add((e=>{e.on("insert",pO,{priority:"high"});e.on("insert:listItem",lO(t.model))}));t.conversion.for("upcast").add((t=>{t.on("element:ul",bO,{priority:"high"});t.on("element:ol",bO,{priority:"high"});t.on("element:li",kO,{priority:"high"});t.on("element:li",mO)}));t.model.on("insertContent",AO,{priority:"high"});t.commands.add("numberedList",new rO(t,"numbered"));t.commands.add("bulletedList",new rO(t,"bulleted"));t.commands.add("indentList",new iO(t,"forward"));t.commands.add("outdentList",new iO(t,"backward"));const o=n.view.document;this.listenTo(o,"enter",((t,e)=>{const n=this.editor.model.document;const o=n.selection.getLastPosition().parent;if(n.selection.isCollapsed&&o.name=="listItem"&&o.isEmpty){this.editor.execute("outdentList");e.preventDefault();t.stop()}}),{context:"li"});this.listenTo(o,"delete",((t,e)=>{if(e.direction!=="backward"){return}const n=this.editor.model.document.selection;if(!n.isCollapsed){return}const o=n.getFirstPosition();if(!o.isAtStart){return}const i=o.parent;if(i.name!=="listItem"){return}const r=i.previousSibling&&i.previousSibling.name==="listItem";if(r){return}this.editor.execute("outdentList");e.preventDefault();t.stop()}),{context:"li"});this.listenTo(t.editing.view.document,"tab",((e,n)=>{const o=n.shiftKey?"outdentList":"indentList";const i=this.editor.commands.get(o);if(i.isEnabled){t.execute(o);n.stopPropagation();n.preventDefault();e.stop()}}),{context:"li"})}afterInit(){const t=this.editor.commands;const e=t.get("indent");const n=t.get("outdent");if(e){e.registerChildCommand(t.get("indentList"))}if(n){n.registerChildCommand(t.get("outdentList"))}}}function TO(t){let e=1;for(const n of t.getChildren()){if(n.name=="ul"||n.name=="ol"){for(const t of n.getChildren()){e+=TO(t)}}}return e}class PO extends Au{static get requires(){return[DO,_R]}static get pluginName(){return"List"}}class BO extends(null&&Command){constructor(t,e){super(t);this.defaultType=e}refresh(){this.value=this._getValue();this.isEnabled=this._checkEnabled()}execute(t={}){this._tryToConvertItemsToList(t);const e=this.editor.model;const n=getSelectedListItems(e);if(!n.length){return}e.change((e=>{for(const o of n){e.setAttribute("listStyle",t.type||this.defaultType,o)}}))}_getValue(){const t=this.editor.model.document.selection.getFirstPosition().parent;if(t&&t.is("element","listItem")){return t.getAttribute("listStyle")}return null}_checkEnabled(){const t=this.editor;const e=t.commands.get("numberedList");const n=t.commands.get("bulletedList");return e.isEnabled||n.isEnabled}_tryToConvertItemsToList(t){if(!t.type){return}const e=getListTypeFromListStyleType(t.type);if(!e){return}const n=this.editor;const o=`${e}List`;const i=n.commands.get(o);if(!i.value){n.execute(o)}}}class IO extends(null&&Command){refresh(){const t=this._getValue();this.value=t;this.isEnabled=t!=null}execute(t={}){const e=this.editor.model;const n=getSelectedListItems(e).filter((t=>t.getAttribute("listType")=="numbered"));e.change((e=>{for(const o of n){e.setAttribute("listReversed",!!t.reversed,o)}}))}_getValue(){const t=this.editor.model.document.selection.getFirstPosition().parent;if(t&&t.is("element","listItem")&&t.getAttribute("listType")=="numbered"){return t.getAttribute("listReversed")}return null}}class RO extends(null&&Command){refresh(){const t=this._getValue();this.value=t;this.isEnabled=t!=null}execute({startIndex:t=1}={}){const e=this.editor.model;const n=getSelectedListItems(e).filter((t=>t.getAttribute("listType")=="numbered"));e.change((e=>{for(const o of n){e.setAttribute("listStart",t>=0?t:1,o)}}))}_getValue(){const t=this.editor.model.document.selection.getFirstPosition().parent;if(t&&t.is("element","listItem")&&t.getAttribute("listType")=="numbered"){return t.getAttribute("listStart")}return null}}const OO="default";class MO extends(null&&Plugin){static get requires(){return[ListEditing]}static get pluginName(){return"ListPropertiesEditing"}constructor(t){super(t);t.config.define("list",{properties:{styles:true,startIndex:false,reversed:false}})}init(){const t=this.editor;const e=t.model;const n=t.config.get("list.properties");const o=VO(n);e.schema.extend("listItem",{allowAttributes:o.map((t=>t.attributeName))});for(const e of o){e.addCommand(t)}this.listenTo(t.commands.get("indentList"),"_executeCleanup",NO(t,o));this.listenTo(t.commands.get("outdentList"),"_executeCleanup",LO(t,o));this.listenTo(t.commands.get("bulletedList"),"_executeCleanup",WO(t));this.listenTo(t.commands.get("numberedList"),"_executeCleanup",WO(t));e.document.registerPostFixer(HO(t,o));t.conversion.for("upcast").add(zO(o));t.conversion.for("downcast").add(FO(o));this._mergeListAttributesWhileMergingLists(o)}afterInit(){const t=this.editor;if(t.commands.get("todoList")){t.model.document.registerPostFixer($O(t))}}_mergeListAttributesWhileMergingLists(t){const e=this.editor;const n=e.model;let o;this.listenTo(n,"deleteContent",((t,[e])=>{const n=e.getFirstPosition();const i=e.getLastPosition();if(n.parent===i.parent){return}if(!n.parent.is("element","listItem")){return}const r=i.parent.nextSibling;if(!r||!r.is("element","listItem")){return}const s=getSiblingListItem(n.parent,{sameIndent:true,listIndent:r.getAttribute("listIndent")});if(!s){return}if(s.getAttribute("listType")===r.getAttribute("listType")){o=s}}),{priority:"high"});this.listenTo(n,"deleteContent",(()=>{if(!o){return}n.change((e=>{const n=getSiblingListItem(o.nextSibling,{sameIndent:true,listIndent:o.getAttribute("listIndent"),direction:"forward"});if(!n){o=null;return}const i=[n,...getSiblingNodes(e.createPositionAt(n,0),"forward")];for(const n of i){for(const i of t){if(i.appliesToListItem(n)){const t=i.attributeName;const r=o.getAttribute(t);e.setAttribute(t,r,n)}}}}));o=null}),{priority:"low"})}}function VO(t){const e=[];if(t.styles){e.push({attributeName:"listStyle",defaultValue:OO,addCommand(t){t.commands.add("listStyle",new ListStyleCommand(t,OO))},appliesToListItem(){return true},setAttributeOnDowncast(t,e,n){if(e&&e!==OO){t.setStyle("list-style-type",e,n)}else{t.removeStyle("list-style-type",n)}},getAttributeOnUpcast(t){return t.getStyle("list-style-type")||OO}})}if(t.reversed){e.push({attributeName:"listReversed",defaultValue:false,addCommand(t){t.commands.add("listReversed",new ListReversedCommand(t))},appliesToListItem(t){return t.getAttribute("listType")=="numbered"},setAttributeOnDowncast(t,e,n){if(e){t.setAttribute("reversed","reversed",n)}else{t.removeAttribute("reversed",n)}},getAttributeOnUpcast(t){return t.hasAttribute("reversed")}})}if(t.startIndex){e.push({attributeName:"listStart",defaultValue:1,addCommand(t){t.commands.add("listStart",new ListStartCommand(t))},appliesToListItem(t){return t.getAttribute("listType")=="numbered"},setAttributeOnDowncast(t,e,n){if(e==0||e>1){t.setAttribute("start",e,n)}else{t.removeAttribute("start",n)}},getAttributeOnUpcast(t){const e=t.getAttribute("start");return e>=0?e:1}})}return e}function zO(t){return e=>{e.on("element:li",((e,n,o)=>{if(!n.modelRange){return}const i=n.viewItem.parent;const r=n.modelRange.start.nodeAfter||n.modelRange.end.nodeBefore;for(const e of t){if(e.appliesToListItem(r)){const t=e.getAttributeOnUpcast(i);o.writer.setAttribute(e.attributeName,t,r)}}}),{priority:"low"})}}function FO(t){return n=>{for(const o of t){n.on(`attribute:${o.attributeName}:listItem`,((t,n,i)=>{const r=i.writer;const s=n.item;const a=getSiblingListItem(s.previousSibling,{sameIndent:true,listIndent:s.getAttribute("listIndent"),direction:"backward"});const c=i.mapper.toViewElement(s);if(!e(s,a)){r.breakContainer(r.createPositionBefore(c))}o.setAttributeOnDowncast(r,n.attributeNewValue,c.parent)}),{priority:"low"})}};function e(t,e){return e&&t.getAttribute("listType")===e.getAttribute("listType")&&t.getAttribute("listIndent")===e.getAttribute("listIndent")&&t.getAttribute("listStyle")===e.getAttribute("listStyle")&&t.getAttribute("listReversed")===e.getAttribute("listReversed")&&t.getAttribute("listStart")===e.getAttribute("listStart")}}function NO(t,e){return(n,o)=>{const i=o[0];const r=i.getAttribute("listIndent");const s=o.filter((t=>t.getAttribute("listIndent")===r));let a=null;if(i.previousSibling.getAttribute("listIndent")+1!==r){a=getSiblingListItem(i.previousSibling,{sameIndent:true,direction:"backward",listIndent:r})}t.model.change((t=>{for(const n of s){for(const o of e){if(o.appliesToListItem(n)){const e=a==null?o.defaultValue:a.getAttribute(o.attributeName);t.setAttribute(o.attributeName,e,n)}}}}))}}function LO(t,e){return(n,o)=>{o=o.reverse().filter((t=>t.is("element","listItem")));if(!o.length){return}const i=o[0].getAttribute("listIndent");const r=o[0].getAttribute("listType");let s=o[0].previousSibling;if(s.is("element","listItem")){while(s.getAttribute("listIndent")!==i){s=s.previousSibling}}else{s=null}if(!s){s=o[o.length-1].nextSibling}if(!s||!s.is("element","listItem")){return}if(s.getAttribute("listType")!==r){return}t.model.change((t=>{const n=o.filter((t=>t.getAttribute("listIndent")===i));for(const o of n){for(const n of e){if(n.appliesToListItem(o)){const e=n.attributeName;const i=s.getAttribute(e);t.setAttribute(e,i,o)}}}}))}}function HO(t,e){return n=>{let o=false;const i=GO(t.model.document.differ.getChanges()).filter((t=>t.getAttribute("listType")!=="todo"));if(!i.length){return o}let r=i[i.length-1].nextSibling;if(!r||!r.is("element","listItem")){r=i[0].previousSibling;if(r){const t=i[0].getAttribute("listIndent");while(r.is("element","listItem")&&r.getAttribute("listIndent")!==t){r=r.previousSibling;if(!r){break}}}}for(const t of e){const e=t.attributeName;for(const s of i){if(!t.appliesToListItem(s)){n.removeAttribute(e,s);continue}if(!s.hasAttribute(e)){if(jO(r,s,t)){n.setAttribute(e,r.getAttribute(e),s)}else{n.setAttribute(e,t.defaultValue,s)}o=true}else{const i=s.previousSibling;if(qO(i,s,t.attributeName)){n.setAttribute(e,i.getAttribute(e),s);o=true}}}}return o}}function jO(t,e,n){if(!t){return false}const o=t.getAttribute(n.attributeName);if(!o){return false}if(o==n.defaultValue){return false}if(t.getAttribute("listType")!==e.getAttribute("listType")){return false}return true}function qO(t,e,n){if(!t||!t.is("element","listItem")){return false}if(e.getAttribute("listType")!==t.getAttribute("listType")){return false}const o=t.getAttribute("listIndent");if(o<1||o!==e.getAttribute("listIndent")){return false}const i=t.getAttribute(n);if(!i||i===e.getAttribute(n)){return false}return true}function $O(t){return e=>{const n=GO(t.model.document.differ.getChanges()).filter((t=>t.getAttribute("listType")==="todo"&&(t.hasAttribute("listStyle")||t.hasAttribute("listReversed")||t.hasAttribute("listStart"))));if(!n.length){return false}for(const t of n){e.removeAttribute("listStyle",t);e.removeAttribute("listReversed",t);e.removeAttribute("listStart",t)}return true}}function WO(t){return(e,n)=>{n=n.filter((t=>t.is("element","listItem")));t.model.change((t=>{for(const e of n){t.removeAttribute("listStyle",e)}}))}}function GO(t){const e=[];for(const n of t){const t=KO(n);if(t&&t.is("element","listItem")){e.push(t)}}return e}function KO(t){if(t.type==="attribute"){return t.range.start.nodeAfter}if(t.type==="insert"){return t.position.nodeAfter}return null}class UO extends(null&&Plugin){static get requires(){return[ListPropertiesEditing,ListPropertiesUI]}static get pluginName(){return"ListProperties"}}const ZO="todoListChecked";class JO extends(null&&Command){constructor(t){super(t);this._selectedElements=[];this.on("execute",(()=>{this.refresh()}),{priority:"highest"})}refresh(){this._selectedElements=this._getSelectedItems();this.value=this._selectedElements.every((t=>!!t.getAttribute(ZO)));this.isEnabled=!!this._selectedElements.length}_getSelectedItems(){const t=this.editor.model;const e=t.schema;const n=t.document.selection.getFirstRange();const o=n.start.parent;const i=[];if(e.checkAttribute(o,ZO)){i.push(o)}for(const t of n.getItems()){if(e.checkAttribute(t,ZO)&&!i.includes(t)){i.push(t)}}return i}execute(t={}){this.editor.model.change((e=>{for(const n of this._selectedElements){const o=t.forceValue===undefined?!this.value:t.forceValue;if(o){e.setAttribute(ZO,true,n)}else{e.removeAttribute(ZO,n)}}}))}}function YO(t,e){return(n,o,i)=>{const r=i.consumable;if(!r.test(o.item,"insert")||!r.test(o.item,"attribute:listType")||!r.test(o.item,"attribute:listIndent")){return}if(o.item.getAttribute("listType")!="todo"){return}const s=o.item;r.consume(s,"insert");r.consume(s,"attribute:listType");r.consume(s,"attribute:listIndent");r.consume(s,"attribute:todoListChecked");const a=i.writer;const c=generateLiInUl(s,i);const l=!!s.getAttribute("todoListChecked");const d=oM(s,a,l,e);const u=a.createContainerElement("span",{class:"todo-list__label__description"});a.addClass("todo-list",c.parent);a.insert(a.createPositionAt(c,0),d);a.insert(a.createPositionAfter(d),u);injectViewList(s,c,i,t)}}function QO(t){return(e,n,o)=>{const i=o.consumable;if(!i.test(n.item,"insert")||!i.test(n.item,"attribute:listType")||!i.test(n.item,"attribute:listIndent")){return}if(n.item.getAttribute("listType")!="todo"){return}const r=n.item;i.consume(r,"insert");i.consume(r,"attribute:listType");i.consume(r,"attribute:listIndent");i.consume(r,"attribute:todoListChecked");const s=o.writer;const a=generateLiInUl(r,o);s.addClass("todo-list",a.parent);const c=s.createContainerElement("label",{class:"todo-list__label"});const l=s.createEmptyElement("input",{type:"checkbox",disabled:"disabled"});const d=s.createContainerElement("span",{class:"todo-list__label__description"});if(r.getAttribute("todoListChecked")){s.setAttribute("checked","checked",l)}s.insert(s.createPositionAt(a,0),c);s.insert(s.createPositionAt(c,0),l);s.insert(s.createPositionAfter(l),d);injectViewList(r,a,o,t)}}const XO=(t,e,n)=>{const o=e.modelCursor;const i=o.parent;const r=e.viewItem;if(r.getAttribute("type")!="checkbox"||i.name!="listItem"||!o.isAtStart){return}if(!n.consumable.consume(r,{name:true})){return}const s=n.writer;s.setAttribute("listType","todo",i);if(e.viewItem.hasAttribute("checked")){s.setAttribute("todoListChecked",true,i)}e.modelRange=s.createRange(o)};function tM(t,e){return(n,o,i)=>{if(!i.consumable.consume(o.item,n.name)){return}const r=i.mapper.toViewElement(o.item);const s=i.writer;const a=iM(r,e);if(o.attributeNewValue=="todo"){const e=!!o.item.getAttribute("todoListChecked");const n=oM(o.item,s,e,t);const i=s.createContainerElement("span",{class:"todo-list__label__description"});const a=s.createRangeIn(r);const c=findNestedList(r);const l=positionAfterUiElements(a.start);const d=c?s.createPositionBefore(c):a.end;const u=s.createRange(l,d);s.addClass("todo-list",r.parent);s.move(u,s.createPositionAt(i,0));s.insert(s.createPositionAt(r,0),n);s.insert(s.createPositionAfter(n),i)}else if(o.attributeOldValue=="todo"){const t=rM(r,e);s.removeClass("todo-list",r.parent);s.remove(a);s.move(s.createRangeIn(t),s.createPositionBefore(t));s.remove(t)}}}function eM(t){return(e,n,o)=>{if(n.item.getAttribute("listType")!="todo"){return}if(!o.consumable.consume(n.item,"attribute:todoListChecked")){return}const{mapper:i,writer:r}=o;const s=!!n.item.getAttribute("todoListChecked");const a=i.toViewElement(n.item);const c=a.getChild(0);const l=oM(n.item,r,s,t);r.insert(r.createPositionAfter(c),l);r.remove(c)}}function nM(t){return(e,n)=>{const o=n.modelPosition;const i=o.parent;if(!i.is("element","listItem")||i.getAttribute("listType")!="todo"){return}const r=n.mapper.toViewElement(i);const s=rM(r,t);if(s){n.viewPosition=n.mapper.findPositionIn(s,o.offset)}}}function oM(t,e,n,o){const i=e.createUIElement("label",{class:"todo-list__label",contenteditable:false},(function(e){const i=createElement(document,"input",{type:"checkbox",tabindex:"-1"});if(n){i.setAttribute("checked","checked")}i.addEventListener("change",(()=>o(t)));const r=this.toDomElement(e);r.appendChild(i);return r}));return i}function iM(t,e){const n=e.createRangeIn(t);for(const t of n){if(t.item.is("uiElement","label")){return t.item}}}function rM(t,e){const n=e.createRangeIn(t);for(const t of n){if(t.item.is("containerElement","span")&&t.item.hasClass("todo-list__label__description")){return t.item}}}const sM=Kc("Ctrl+Enter");class aM extends(null&&Plugin){static get pluginName(){return"TodoListEditing"}static get requires(){return[ListEditing]}init(){const t=this.editor;const{editing:e,data:n,model:o}=t;o.schema.extend("listItem",{allowAttributes:["todoListChecked"]});o.schema.addAttributeCheck(((t,e)=>{const n=t.last;if(e=="todoListChecked"&&n.name=="listItem"&&n.getAttribute("listType")!="todo"){return false}}));t.commands.add("todoList",new ListCommand(t,"todo"));const i=new CheckTodoListCommand(t);t.commands.add("checkTodoList",i);t.commands.add("todoListCheck",i);n.downcastDispatcher.on("insert:listItem",dataModelViewInsertion(o),{priority:"high"});n.upcastDispatcher.on("element:input",dataViewModelCheckmarkInsertion,{priority:"high"});e.downcastDispatcher.on("insert:listItem",modelViewInsertion(o,(t=>this._handleCheckmarkChange(t))),{priority:"high"});e.downcastDispatcher.on("attribute:listType:listItem",modelViewChangeType((t=>this._handleCheckmarkChange(t)),e.view));e.downcastDispatcher.on("attribute:todoListChecked:listItem",modelViewChangeChecked((t=>this._handleCheckmarkChange(t))));e.mapper.on("modelToViewPosition",mapModelToViewPosition(e.view));n.mapper.on("modelToViewPosition",mapModelToViewPosition(e.view));this.listenTo(e.view.document,"arrowKey",cM(o,t.locale),{context:"li"});this.listenTo(e.view.document,"keydown",((e,n)=>{if(getCode(n)===sM){t.execute("checkTodoList");e.stop()}}),{priority:"high"});const r=new Set;this.listenTo(o,"applyOperation",((t,e)=>{const n=e[0];if(n.type=="rename"&&n.oldName=="listItem"){const t=n.position.nodeAfter;if(t.hasAttribute("todoListChecked")){r.add(t)}}else if(n.type=="changeAttribute"&&n.key=="listType"&&n.oldValue==="todo"){for(const t of n.range.getItems()){if(t.hasAttribute("todoListChecked")&&t.getAttribute("listType")!=="todo"){r.add(t)}}}}));o.document.registerPostFixer((t=>{let e=false;for(const n of r){t.removeAttribute("todoListChecked",n);e=true}r.clear();return e}))}_handleCheckmarkChange(t){const e=this.editor;const n=e.model;const o=Array.from(n.document.selection.getRanges());n.change((n=>{n.setSelection(t,"end");e.execute("checkTodoList");n.setSelection(o)}))}}function cM(t,e){return(n,o)=>{const i=getLocalizedArrowKeyCodeDirection(o.keyCode,e.contentLanguageDirection);if(i!="left"){return}const r=t.schema;const s=t.document.selection;if(!s.isCollapsed){return}const a=s.getFirstPosition();const c=a.parent;if(c.name==="listItem"&&c.getAttribute("listType")=="todo"&&a.isAtStart){const e=r.getNearestSelectionRange(t.createPositionBefore(c),"backward");if(e){t.change((t=>t.setSelection(e)))}o.preventDefault();o.stopPropagation();n.stop()}}}class lM extends(null&&Plugin){static get pluginName(){return"TodoListUI"}init(){const t=this.editor.t;createUIComponent(this.editor,"todoList",t("To-do List"),todoListIcon)}}var dM=n(292);var uM={injectType:"singletonStyleTag",attributes:{"data-cke":true}};uM.insert="head";uM.singleton=true;var hM=Il()(dM.Z,uM);const fM=dM.Z.locals||{};class pM extends(null&&Plugin){static get requires(){return[TodoListEditing,TodoListUI]}static get pluginName(){return"TodoList"}}class gM extends yu{constructor(t){super(t);this._isEnabledBasedOnSelection=false}refresh(){const t=this.editor.model;const e=t.document;const n=hl(e.selection.getSelectedBlocks());this.value=!!n&&n.is("element","paragraph");this.isEnabled=!!n&&mM(n,t.schema)}execute(t={}){const e=this.editor.model;const n=e.document;const o=t.selection||n.selection;if(!e.canEditAt(o)){return}e.change((t=>{const n=o.getSelectedBlocks();for(const o of n){if(!o.is("element","paragraph")&&mM(o,e.schema)){t.rename(o,"paragraph")}}}))}}function mM(t,e){return e.checkChild(t.parent,"paragraph")&&!e.isObject(t)}class bM extends yu{constructor(t){super(t);this._isEnabledBasedOnSelection=false}execute(t){const e=this.editor.model;const n=t.attributes;let o=t.position;if(!e.canEditAt(o)){return}e.change((t=>{o=this._findPositionToInsertParagraph(o,t);if(!o){return}const i=t.createElement("paragraph");if(n){e.schema.setAllowedAttributes(i,n,t)}e.insertContent(i,o);t.setSelection(i,"in")}))}_findPositionToInsertParagraph(t,e){const n=this.editor.model;if(n.schema.checkChild(t,"paragraph")){return t}const o=n.schema.findAllowedParent(t,"paragraph");if(!o){return null}const i=t.parent;const r=n.schema.checkChild(i,"$text");if(i.isEmpty||r&&t.isAtEnd){return n.createPositionAfter(i)}if(!i.isEmpty&&r&&t.isAtStart){return n.createPositionBefore(i)}return e.split(t,o).position}}class kM extends Au{static get pluginName(){return"Paragraph"}init(){const t=this.editor;const e=t.model;t.commands.add("paragraph",new gM(t));t.commands.add("insertParagraph",new bM(t));e.schema.register("paragraph",{inheritAllFrom:"$block"});t.conversion.elementToElement({model:"paragraph",view:"p"});t.conversion.for("upcast").elementToElement({model:(t,{writer:e})=>{if(!kM.paragraphLikeElements.has(t.name)){return null}if(t.isEmpty){return null}return e.createElement("paragraph")},view:/.+/,converterPriority:"low"})}}kM.paragraphLikeElements=new Set(["blockquote","dd","div","dt","h1","h2","h3","h4","h5","h6","li","p","td","th"]);const wM=SC.paragraph;class _M extends(null&&Plugin){static get requires(){return[Paragraph]}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add("paragraph",(n=>{const o=new ButtonView(n);const i=t.commands.get("paragraph");o.label=e("Paragraph");o.icon=wM;o.tooltip=true;o.isToggleable=true;o.bind("isEnabled").to(i);o.bind("isOn").to(i,"value");o.on("execute",(()=>{t.execute("paragraph")}));return o}))}}const vM='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M8.69 14.915c.053.052.173.083.36.093a.366.366 0 0 1 .345.485l-.003.01a.738.738 0 0 1-.697.497h-2.67a.374.374 0 0 1-.353-.496l.013-.038a.681.681 0 0 1 .644-.458c.197-.012.325-.043.386-.093a.28.28 0 0 0 .072-.11L9.592 4.5H6.269c-.359-.017-.609.013-.75.09-.142.078-.289.265-.442.563-.192.29-.516.464-.864.464H4.17a.43.43 0 0 1-.407-.569L4.46 3h13.08l-.62 2.043a.81.81 0 0 1-.775.574h-.114a.486.486 0 0 1-.486-.486c.001-.284-.054-.464-.167-.54-.112-.076-.367-.106-.766-.091h-3.28l-2.68 10.257c-.006.074.007.127.038.158zM3 17h8a.5.5 0 1 1 0 1H3a.5.5 0 1 1 0-1zm11.299 1.17a.75.75 0 1 1-1.06-1.06l1.414-1.415-1.415-1.414a.75.75 0 0 1 1.06-1.06l1.415 1.414 1.414-1.415a.75.75 0 1 1 1.06 1.06l-1.413 1.415 1.414 1.415a.75.75 0 0 1-1.06 1.06l-1.415-1.414-1.414 1.414z"/></svg>';const AM="removeFormat";class CM extends Au{static get pluginName(){return"RemoveFormatUI"}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add(AM,(n=>{const o=t.commands.get(AM);const i=new Ad(n);i.set({label:e("Remove Format"),icon:vM,tooltip:true});i.bind("isOn","isEnabled").to(o,"value","isEnabled");this.listenTo(i,"execute",(()=>{t.execute(AM);t.editing.view.focus()}));return i}))}}class yM extends yu{refresh(){const t=this.editor.model;this.isEnabled=!!hl(this._getFormattingItems(t.document.selection,t.schema))}execute(){const t=this.editor.model;const e=t.schema;t.change((n=>{for(const o of this._getFormattingItems(t.document.selection,e)){if(o.is("selection")){for(const t of this._getFormattingAttributes(o,e)){n.removeSelectionAttribute(t)}}else{const t=n.createRangeOn(o);for(const i of this._getFormattingAttributes(o,e)){n.removeAttribute(i,t)}}}}))}*_getFormattingItems(t,e){const n=t=>!!hl(this._getFormattingAttributes(t,e));for(const o of t.getRanges()){for(const t of o.getItems()){if(!e.isBlock(t)&&n(t)){yield t}}}for(const e of t.getSelectedBlocks()){if(n(e)){yield e}}if(n(t)){yield t}}*_getFormattingAttributes(t,e){for(const[n]of t.getAttributes()){const t=e.getAttributeProperties(n);if(t&&t.isFormatting){yield n}}}}class xM extends Au{static get pluginName(){return"RemoveFormatEditing"}init(){const t=this.editor;t.commands.add("removeFormat",new yM(t))}}class EM extends Au{static get requires(){return[xM,CM]}static get pluginName(){return"RemoveFormat"}}function SM(t){const e=[{name:"address",isVoid:false},{name:"article",isVoid:false},{name:"aside",isVoid:false},{name:"blockquote",isVoid:false},{name:"details",isVoid:false},{name:"dialog",isVoid:false},{name:"dd",isVoid:false},{name:"div",isVoid:false},{name:"dl",isVoid:false},{name:"dt",isVoid:false},{name:"fieldset",isVoid:false},{name:"figcaption",isVoid:false},{name:"figure",isVoid:false},{name:"footer",isVoid:false},{name:"form",isVoid:false},{name:"h1",isVoid:false},{name:"h2",isVoid:false},{name:"h3",isVoid:false},{name:"h4",isVoid:false},{name:"h5",isVoid:false},{name:"h6",isVoid:false},{name:"header",isVoid:false},{name:"hgroup",isVoid:false},{name:"hr",isVoid:true},{name:"input",isVoid:true},{name:"li",isVoid:false},{name:"main",isVoid:false},{name:"nav",isVoid:false},{name:"ol",isVoid:false},{name:"p",isVoid:false},{name:"section",isVoid:false},{name:"table",isVoid:false},{name:"tbody",isVoid:false},{name:"td",isVoid:false},{name:"textarea",isVoid:false},{name:"th",isVoid:false},{name:"thead",isVoid:false},{name:"tr",isVoid:false},{name:"ul",isVoid:false}];const n=e.map((t=>t.name)).join("|");const o=t.replace(new RegExp(`</?(${n})( .*?)?>`,"g"),"\n$&\n").replace(/<br[^>]*>/g,"$&\n").split("\n");let i=0;return o.filter((t=>t.length)).map((t=>{if(DM(t,e)){return PM(t,i++)}if(TM(t,e)){return PM(t,--i)}return PM(t,i)})).join("\n")}function DM(t,e){return e.some((e=>{if(e.isVoid){return false}if(!new RegExp(`<${e.name}( .*?)?>`).test(t)){return false}return true}))}function TM(t,e){return e.some((e=>new RegExp(`</${e.name}>`).test(t)))}function PM(t,e,n="    "){return`${n.repeat(Math.max(0,e))}${t}`}var BM=n(420);var IM={injectType:"singletonStyleTag",attributes:{"data-cke":true}};IM.insert="head";IM.singleton=true;var RM=Il()(BM.Z,IM);const OM=BM.Z.locals||{};const MM='<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m12.5 0 5 4.5v15.003h-16V0h11zM3 1.5v3.25l-1.497 1-.003 8 1.5 1v3.254L7.685 18l-.001 1.504H17.5V8.002L16 9.428l-.004-4.22-4.222-3.692L3 1.5z"/><path d="M4.06 6.64a.75.75 0 0 1 .958 1.15l-.085.07L2.29 9.75l2.646 1.89c.302.216.4.62.232.951l-.058.095a.75.75 0 0 1-.951.232l-.095-.058-3.5-2.5V9.14l3.496-2.5zm4.194 6.22a.75.75 0 0 1-.958-1.149l.085-.07 2.643-1.89-2.646-1.89a.75.75 0 0 1-.232-.952l.058-.095a.75.75 0 0 1 .95-.232l.096.058 3.5 2.5v1.22l-3.496 2.5zm7.644-.836 2.122 2.122-5.825 5.809-2.125-.005.003-2.116zm2.539-1.847 1.414 1.414a.5.5 0 0 1 0 .707l-1.06 1.06-2.122-2.12 1.061-1.061a.5.5 0 0 1 .707 0z"/></svg>';const VM="SourceEditingMode";class zM extends Au{static get pluginName(){return"SourceEditing"}static get requires(){return[GA]}constructor(t){super(t);this.set("isSourceEditingMode",false);this._elementReplacer=new _t;this._replacedRoots=new Map;this._dataFromRoots=new Map}init(){const t=this.editor;const e=t.t;t.ui.componentFactory.add("sourceEditing",(n=>{const o=new Ad(n);o.set({label:e("Source"),icon:MM,tooltip:true,withText:true,class:"ck-source-editing-button"});o.bind("isOn").to(this,"isSourceEditingMode");o.bind("isEnabled").to(this,"isEnabled",t,"isReadOnly",t.plugins.get(GA),"hasAny",((t,e,n)=>{if(!t){return false}if(e){return false}if(n){return false}return true}));this.listenTo(o,"execute",(()=>{this.isSourceEditingMode=!this.isSourceEditingMode}));return o}));if(this._isAllowedToHandleSourceEditingMode()){this.on("change:isSourceEditingMode",((t,e,n)=>{if(n){this._showSourceEditing();this._disableCommands()}else{this._hideSourceEditing();this._enableCommands()}}));this.on("change:isEnabled",((t,e,n)=>this._handleReadOnlyMode(!n)));this.listenTo(t,"change:isReadOnly",((t,e,n)=>this._handleReadOnlyMode(n)))}t.data.on("get",(()=>{if(this.isSourceEditingMode){this.updateEditorData()}}),{priority:"high"})}afterInit(){const t=this.editor;const e=["RealTimeCollaborativeEditing","CommentsEditing","TrackChangesEditing","RevisionHistory"];if(e.some((e=>t.plugins.has(e)))){console.warn("You initialized the editor with the source editing feature and at least one of the collaboration features. "+"Please be advised that the source editing feature may not work, and be careful when editing document source "+"that contains markers created by the collaboration features.")}if(t.plugins.has("RestrictedEditingModeEditing")){console.warn("You initialized the editor with the source editing feature and restricted editing feature. "+"Please be advised that the source editing feature may not work, and be careful when editing document source "+"that contains markers created by the restricted editing feature.")}}updateEditorData(){const t=this.editor;const e={};for(const[t,n]of this._replacedRoots){const o=this._dataFromRoots.get(t);const i=n.dataset.value;if(o!==i){e[t]=i;this._dataFromRoots.set(t,i)}}if(Object.keys(e).length){t.data.set(e,{batchType:{isUndoable:true}})}}_showSourceEditing(){const t=this.editor;const e=t.editing.view;const n=t.model;n.change((t=>{t.setSelection(null);t.removeSelectionAttribute(n.document.selection.getAttributeKeys())}));for(const[n,o]of e.domRoots){const i=FM(t.data.get({rootName:n}));const r=Xt(o.ownerDocument,"textarea",{rows:"1","aria-label":"Source code editing area"});const s=Xt(o.ownerDocument,"div",{class:"ck-source-editing-area","data-value":i},[r]);r.value=i;r.setSelectionRange(0,0);r.addEventListener("input",(()=>{s.dataset.value=r.value;t.ui.update()}));e.change((t=>{const o=e.document.getRoot(n);t.addClass("ck-hidden",o)}));t.ui.setEditableElement("sourceEditing:"+n,r);this._replacedRoots.set(n,s);this._elementReplacer.replace(o,s);this._dataFromRoots.set(n,i)}this._focusSourceEditing()}_hideSourceEditing(){const t=this.editor;const e=t.editing.view;this.updateEditorData();e.change((t=>{for(const[n]of this._replacedRoots){t.removeClass("ck-hidden",e.document.getRoot(n))}}));this._elementReplacer.restore();this._replacedRoots.clear();this._dataFromRoots.clear();e.focus()}_focusSourceEditing(){const t=this.editor;const[e]=this._replacedRoots.values();const n=e.querySelector("textarea");t.editing.view.document.isFocused=false;n.focus()}_disableCommands(){const t=this.editor;for(const e of t.commands.commands()){e.forceDisabled(VM)}}_enableCommands(){const t=this.editor;for(const e of t.commands.commands()){e.clearForceDisabled(VM)}}_handleReadOnlyMode(t){if(!this.isSourceEditingMode){return}for(const[,e]of this._replacedRoots){e.querySelector("textarea").readOnly=t}}_isAllowedToHandleSourceEditingMode(){const t=this.editor;const e=t.ui.view.editable;return e&&!e.hasExternalElement}}function FM(t){if(!NM(t)){return t}return SM(t)}function NM(t){return t.startsWith("<")}class LM extends FS{}LM.builtinPlugins=[GS,$B,nI,WD,PO,kM,EM,zM,YD,oT,lT,gT];LM.defaultConfig={toolbar:{items:["bold","italic","underline","strikethrough","subscript","superscript","|","bulletedList","numberedList","|","undo","redo","removeFormat","sourceEditing"]},language:"en"};const HM=LM})();o=o["default"];return o})()));
+//# sourceMappingURL=ckeditor.js.map
\ No newline at end of file
diff --git a/js/ckeditor5/ckeditor.js.map b/js/ckeditor5/ckeditor.js.map
new file mode 100644
index 000000000..dd448933e
--- /dev/null
+++ b/js/ckeditor5/ckeditor.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"ckeditor.js","mappings":";;;;AAAA","sources":["webpack://ClassicEditor/webpack/universalModuleDefinition"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine([], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"ClassicEditor\"] = factory();\n\telse\n\t\troot[\"ClassicEditor\"] = factory();\n})(self, () => {\nreturn "],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/js/ckeditor5/translations/af.js b/js/ckeditor5/translations/af.js
new file mode 100644
index 000000000..7d208257d
--- /dev/null
+++ b/js/ckeditor5/translations/af.js
@@ -0,0 +1 @@
+(function(e){const r=e["af"]=e["af"]||{};r.dictionary=Object.assign(r.dictionary||{},{"%0 of %1":"%0 van %1",Bold:"Vet",Cancel:"Kanselleer",Code:"Bronkode",Italic:"Kursief","Remove Format":"Verwyder formatering","Show more items":"Wys meer items",Strikethrough:"Deurstreep",Subscript:"Onderskrif",Superscript:"Boskrif",Underline:"Onderstreep"});r.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ar.js b/js/ckeditor5/translations/ar.js
new file mode 100644
index 000000000..a28440950
--- /dev/null
+++ b/js/ckeditor5/translations/ar.js
@@ -0,0 +1 @@
+(function(e){const t=e["ar"]=e["ar"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 من %1",Accept:"قبول",Aquamarine:"أخضر زبرجد",Black:"أسود","Block styles":"أنماط الكتل",Blue:"أزرق",Bold:"عريض","Bulleted List":"قائمة نقطية","Bulleted list styles toolbar":"شريط أدوات أنماط قوائم التعداد النقطي",Cancel:"إلغاء",Circle:"دائرة",Code:"شفرة برمجية",Decimal:"رقم عشري","Decimal with leading zero":"رقم عشري مع البدء بصفر ","Dim grey":"رمادي خافت",Disc:"قرص","Dropdown toolbar":"شريط أدوات القائمة المنسدلة","Edit block":"كتلة التحرير","Editor block content toolbar":"شريط المحرر لأدوات كتلة المحتوى","Editor contextual toolbar":"شريط المحرر للأدوات السياقية","Editor editing area: %0":"منطقة تحرير المحرر: %0","Editor toolbar":"شريط أدوات المحرر",Green:"أخضر",Grey:"رمادي",HEX:"لون سداسي عشري","HTML object":"عنصر HTML","Insert paragraph after block":"إدراج فقرة بعد الكتلة","Insert paragraph before block":"إدراج فقرة قبل الكتلة",Italic:"مائل","Light blue":"أزرق فاتح","Light green":"أخضر فاتح","Light grey":"رمادي فاتح","List properties":"خصائص القائمة","Lower-latin":"حرف لاتيني صغير","Lower–roman":"رقم روماني صغير","Multiple styles":"أنماط متعددة",Next:"التالي","Numbered List":"قائمة رقمية","Numbered list styles toolbar":"شريط أدوات أنماط القوائم المرقمة",Orange:"برتقالي","Press Enter to type after or press Shift + Enter to type before the widget":"اضغط على Enter للكتابة بعد ذلك أو اضغط على Shift + Enter للكتابة قبل الأداة",Previous:"السابق",Purple:"أرجواني",Red:"أحمر",Redo:"إعادة","Remove Format":"إزالة التنسيق","Reversed order":"عكس اتجاه الترتيب","Rich Text Editor":"معالج نصوص","Select all":"تحديد الكل","Show more items":"عرض المزيد من العناصر",Square:"مربع","Start at":"البدء من","Start index must be greater than 0.":"يجب أن تكون قيمة البداية في الفهرس أكبر من 0.",Strikethrough:"يتوسطه خط",Styles:"الأنماط",Subscript:"حرف منخفض",Superscript:"حرف مرتفع","Text styles":"أنماط النصوص","To-do List":"قائمة المهام","Toggle the circle list style":"تبديل نمط قائمة الدوائر","Toggle the decimal list style":"تبديل نمط قائمة الأرقام العشرية","Toggle the decimal with leading zero list style":"تبديل الأرقام العشرية بنمط قائمة الأصفار البادئة","Toggle the disc list style":"تبديل نمط قائمة الأقراص","Toggle the lower–latin list style":"تبديل نمط قائمة الأحرف اللاتينية الصغيرة","Toggle the lower–roman list style":"تبديل نمط قائمة الأرقام الرومانية الصغيرة","Toggle the square list style":"تبديل نمط قائمة المربعات","Toggle the upper–latin list style":"تبديل نمط قائمة الأحرف اللاتينية الكبيرة","Toggle the upper–roman list style":"تبديل نمط قائمة الأرقام الرومانية الكبيرة",Turquoise:"فيروزي",Underline:"تحته خط",Undo:"تراجع","Upper-latin":"حرف لاتيني كبير","Upper-roman":"رقم روماني كبير",White:"أبيض","Widget toolbar":"شريط أدوات الواجهة",Yellow:"أصفر"});t.getPluralForm=function(e){return e==0?0:e==1?1:e==2?2:e%100>=3&&e%100<=10?3:e%100>=11&&e%100<=99?4:5}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ast.js b/js/ckeditor5/translations/ast.js
new file mode 100644
index 000000000..b59d45926
--- /dev/null
+++ b/js/ckeditor5/translations/ast.js
@@ -0,0 +1 @@
+(function(e){const t=e["ast"]=e["ast"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"Negrina","Bulleted List":"Llista con viñetes","Bulleted list styles toolbar":"",Cancel:"Encaboxar",Circle:"",Code:"",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"Cursiva","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"Llista numberada","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"Refacer","Reversed order":"","Rich Text Editor":"Editor de testu arriquecíu","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"",Undo:"Desfacer","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/az.js b/js/ckeditor5/translations/az.js
new file mode 100644
index 000000000..cb4464b9c
--- /dev/null
+++ b/js/ckeditor5/translations/az.js
@@ -0,0 +1 @@
+(function(e){const t=e["az"]=e["az"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%1-dən %0",Accept:"",Aquamarine:"Akvamarin",Black:"Qara",Blue:"Mavi",Bold:"Yarıqalın","Bulleted List":"Markerlənmiş siyahı","Bulleted list styles toolbar":"",Cancel:"İmtina et",Circle:"",Code:"Kod",Decimal:"","Decimal with leading zero":"","Dim grey":"Tünd boz",Disc:"","Dropdown toolbar":"Açılan paneli","Edit block":"Redaktə etmək bloku","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"Redaktorun paneli",Green:"Yaşıl",Grey:"Boz",HEX:"","Insert paragraph after block":"","Insert paragraph before block":"",Italic:"Maili","Light blue":"Açıq mavi","Light green":"Açıq yaşıl","Light grey":"Açıq boz","List properties":"","Lower-latin":"","Lower–roman":"",Next:"Növbəti","Numbered List":"Nömrələnmiş siyahı","Numbered list styles toolbar":"",Orange:"Narıncı","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"Əvvəlki",Purple:"Bənövşəyi",Red:"Qırmızı",Redo:"Təkrar et","Remove Format":"Formatı Ləğv Et","Reversed order":"","Rich Text Editor":"Rich Text Redaktoru","Show more items":"Daha çox əşyanı göstərin",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Qaralanmış",Subscript:"Alt yazı",Superscript:"Üst yazı","To-do List":"To-do siyahı","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"Firuzəyi",Underline:"Altdan xətt",Undo:"İmtina et","Upper-latin":"","Upper-roman":"",White:"Ağ","Widget toolbar":"Vidgetin paneli",Yellow:"Sarı"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/bg.js b/js/ckeditor5/translations/bg.js
new file mode 100644
index 000000000..6773d2571
--- /dev/null
+++ b/js/ckeditor5/translations/bg.js
@@ -0,0 +1 @@
+(function(e){const t=e["bg"]=e["bg"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 от %1",Accept:"Приемане",Aquamarine:"Аквамарин",Black:"Черен","Block styles":"Блокови стилове",Blue:"Син",Bold:"Удебелен","Bulleted List":"Водещи символи","Bulleted list styles toolbar":"Лента със стилове за подточки",Cancel:"Отказ",Circle:"Кръг",Code:"Код",Decimal:"Десетичен","Decimal with leading zero":"Десетичен с водеща нула","Dim grey":"Тъмно сив",Disc:"Диск","Dropdown toolbar":"Лента с падащо меню","Edit block":"Редактирай блок","Editor block content toolbar":"Лента с инструменти за блокиране на съдържанието на редактора","Editor contextual toolbar":"Контекстна лента с инструменти на редактора","Editor editing area: %0":"Зона за редактиране на редактора: %0","Editor toolbar":"Лента за редакция",Green:"Зелен",Grey:"Сив",HEX:"НЕХ","HTML object":"HTML обект","Insert paragraph after block":"Въведи параграф след блока","Insert paragraph before block":"Въведи параграф преди блока",Italic:"Курсив","Light blue":"Светло син","Light green":"Светло зелен","Light grey":"Светло сив","List properties":"Свойства на списъка","Lower-latin":"Долен-латински","Lower–roman":"Долен-римски","Multiple styles":"Множество стилове",Next:"Следващ","Numbered List":"Номериране","Numbered list styles toolbar":"Лента със стилове за номерация",Orange:"Оранжев","Press Enter to type after or press Shift + Enter to type before the widget":"Натиснете Enter за въвеждане или натиснете Shift + Enter за въвеждане преди изпълнимия модул",Previous:"Предишен",Purple:"Лилав",Red:"Червен",Redo:"Повтори","Remove Format":"Премахни форматиране","Reversed order":"Обърнат ред","Rich Text Editor":"Богат текстов редактор","Select all":"Избери всички","Show more items":"Покажи повече единици",Square:"Квадрат","Start at":"Започни с","Start index must be greater than 0.":"Стартовия индекс трябва да е по-голям от 0.",Strikethrough:"Зачертаване",Styles:"Стилове",Subscript:"Долен индекс",Superscript:"Горен индекс","Text styles":"Текстови стилове","To-do List":"Списък със задачи","Toggle the circle list style":"Превключи между стиловете на кръговия списък","Toggle the decimal list style":"Превключи между стиловете на десетичния списък","Toggle the decimal with leading zero list style":"Превключи между стиловете на десетичния списък с начало нула","Toggle the disc list style":"Превключи между стиловете на дисковия списък ","Toggle the lower–latin list style":"Превключи между стиловете на долен-латиснки списък","Toggle the lower–roman list style":"Превключи между стиловете на долен-римски списък","Toggle the square list style":"Превключи между стиловете на квадратния списък","Toggle the upper–latin list style":"Превключи между стиловете на горен-латински списък","Toggle the upper–roman list style":"Превключи между стиловете на горен-римски списък",Turquoise:"Тюркоазен",Underline:"Подчертаване",Undo:"Отмени","Upper-latin":"Горен-латински","Upper-roman":"Горен-римски",White:"Бял","Widget toolbar":"Лента с помощни средства",Yellow:"Жълт"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/bn.js b/js/ckeditor5/translations/bn.js
new file mode 100644
index 000000000..493072acc
--- /dev/null
+++ b/js/ckeditor5/translations/bn.js
@@ -0,0 +1 @@
+(function(e){const t=e["bn"]=e["bn"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 এর %1",Accept:"গ্রহণ করুন",Aquamarine:"ফেকাশে সবুজবর্ণ",Black:"কালো","Block styles":"ব্লক স্টাইল",Blue:"নীল ",Bold:"বোল্ড","Bulleted List":"বুলেটযুক্ত তালিকা","Bulleted list styles toolbar":"বুলেটেড তালিকা স্টাইল টুলবার",Cancel:"বাতিল করুন",Circle:"বৃত্ত",Code:"কোড",Decimal:"দশমিক","Decimal with leading zero":"অগ্রণী 0 সহ দশমিক ","Dim grey":"আবছা ধূসর",Disc:"ডিস্ক","Dropdown toolbar":"ড্রপডাউন টুলবার","Edit block":"এডিট ব্লক","Editor block content toolbar":"সম্পাদক ব্লক কন্টেন্ট টুলবার","Editor contextual toolbar":"সম্পাদক প্রাসঙ্গিক টুলবার","Editor editing area: %0":"সম্পাদক সম্পাদনার ক্ষেত্র: %0","Editor toolbar":"সম্পাদক টুলবার",Green:"সবুজ",Grey:"ধূসর",HEX:"HEX","HTML object":"HTML অবজেক্ট","Insert paragraph after block":"ব্লকের পর অনুচ্ছেদ ঢোকান","Insert paragraph before block":"ব্লক করার আগে অনুচ্ছেদ ঢোকান",Italic:"ইটালিক","Light blue":"হালকা নীল","Light green":"হালকা সবুজ","Light grey":"হালকা ধূসর","List properties":"বৈশিষ্ট্য তালিকাভুক্ত করুন","Lower-latin":"নিম্ন-ল্যাটিন","Lower–roman":"নিম্ন-রোমান","Multiple styles":"একাধিক স্টাইল",Next:"পরবর্তী","Numbered List":"সংখ্যাযুক্ত তালিকা","Numbered list styles toolbar":"সংখ্যাযুক্ত তালিকা স্টাইল টুলবার",Orange:"কমলা","Press Enter to type after or press Shift + Enter to type before the widget":"পরে টাইপ করতে এন্টার চাপুন বা উইজেটের আগে টাইপ করতে Shift + এন্টার চাপুন",Previous:"পূর্ববর্তী",Purple:"বেগুনি",Red:"লাল",Redo:"রেডো","Remove Format":"ফরম্যাট মুছে ফেলুন","Reversed order":"উল্টো ক্রম","Rich Text Editor":"রিচ টেক্সট এডিটর","Select all":"সব নির্বাচন করুন","Show more items":"আরও আইটেম দেখান",Square:"বর্গক্ষেত্র","Start at":"শুরু হবে","Start index must be greater than 0.":"স্টার্ট ইনডেক্স অবশ্যই 0-এর বেশি হতে হবে।",Strikethrough:"স্ট্রাইকথ্রু",Styles:"স্টাইলস",Subscript:"সাবস্ক্রিপ্ট",Superscript:"সুপারস্ক্রিপ্ট","Text styles":"টেস্কট স্টাইল","To-do List":"তালিকা তৈরি","Toggle the circle list style":"বৃত্ত তালিকা স্টাইল টগল করুন","Toggle the decimal list style":"দশমিক তালিকা স্টাইল টগল করুন","Toggle the decimal with leading zero list style":"অগ্রণী 0 তালিকা স্টাইল সহ দশমিক টগল করুন","Toggle the disc list style":"ডিস্ক তালিকা স্টাইল টগল করুন","Toggle the lower–latin list style":"নিম্ন-ল্যাটিন তালিকা স্টাইল টগল করুন","Toggle the lower–roman list style":"নিম্ন-রোমান তালিকা স্টাইল টগল করুন","Toggle the square list style":"বর্গাকার তালিকা স্টাইল টগল করুন","Toggle the upper–latin list style":"উপরের-ল্যাটিন তালিকা স্টাইল টগল করুন","Toggle the upper–roman list style":"উপরের-রোমান তালিকা স্টাইল টগল করুন",Turquoise:"ফিরোজা",Underline:"আন্ডারলাইন",Undo:"পূর্বাবস্থায় ফেরান","Upper-latin":"উচ্চ-ল্যাটিন","Upper-roman":"উচ্চ-রোমান",White:"সাদা","Widget toolbar":"উইজেট টুলবার",Yellow:"হলুদ "});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/bs.js b/js/ckeditor5/translations/bs.js
new file mode 100644
index 000000000..9e9448f46
--- /dev/null
+++ b/js/ckeditor5/translations/bs.js
@@ -0,0 +1 @@
+(function(o){const i=o["bs"]=o["bs"]||{};i.dictionary=Object.assign(i.dictionary||{},{"%0 of %1":"%0 od %1",Bold:"Podebljano",Cancel:"Poništi",Code:"Kod",Italic:"Zakrivljeno","Show more items":"Prikaži više stavki",Strikethrough:"Precrtano",Subscript:"",Superscript:"",Underline:"Podcrtano"});i.getPluralForm=function(o){return o%10==1&&o%100!=11?0:o%10>=2&&o%10<=4&&(o%100<10||o%100>=20)?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ca.js b/js/ckeditor5/translations/ca.js
new file mode 100644
index 000000000..0fead0f67
--- /dev/null
+++ b/js/ckeditor5/translations/ca.js
@@ -0,0 +1 @@
+(function(e){const l=e["ca"]=e["ca"]||{};l.dictionary=Object.assign(l.dictionary||{},{"%0 of %1":"%0 de %1",Accept:"Accepta",Aquamarine:"Aiguamarina",Black:"Negre","Block styles":"Estils de bloc",Blue:"Blau",Bold:"Negreta","Bulleted List":"Llista amb vinyetes","Bulleted list styles toolbar":"Barra d'eines d'estils de llista amb vinyetes",Cancel:"Cancel·lar",Circle:"Cercle",Code:"Codi",Decimal:"Decimal","Decimal with leading zero":"Decimal amb un zero al davant","Dim grey":"Gris fosc",Disc:"Disc","Dropdown toolbar":"Barra d'eines desplegable","Edit block":"Editar bloc","Editor block content toolbar":"Barra d'eines de contingut del bloc de l'editor","Editor contextual toolbar":"Barra d'eines contextual de l'editor","Editor editing area: %0":"Àrea d'edició d'editor: %0","Editor toolbar":"Barra d'eines de l'editor",Green:"Verd",Grey:"Gris",HEX:"HEX","HTML object":"Objecte HTML","Insert paragraph after block":"Inserir un paràgraf després del bloc","Insert paragraph before block":"Inserir un paràgraf abans del bloc",Italic:"Cursiva","Light blue":"Blau clar","Light green":"Verd clar","Light grey":"Gris clar","List properties":"Llista de propietats","Lower-latin":"Lletres llatines en minúscules","Lower–roman":"Numerals romans en minúscules","Multiple styles":"Estils múltiples",Next:"Següent","Numbered List":"Llista numerada","Numbered list styles toolbar":"Barra d'eines d'estils de llista numerada",Orange:"Taronja","Press Enter to type after or press Shift + Enter to type before the widget":"Premeu Retorn per escriure després o premeu Maj + Retorn per escriure abans del giny",Previous:"Anterior",Purple:"Lila",Red:"Vermell",Redo:"Refer","Remove Format":"Esborrar el format","Reversed order":"Ordre invertit","Rich Text Editor":"Editor de text enriquit","Select all":"Seleccionar-ho tot","Show more items":"Mostrar més elements",Square:"Quadrat","Start at":"Començar a","Start index must be greater than 0.":"L'índex inicial ha de ser superior a 0.",Strikethrough:"Marcat",Styles:"Estils",Subscript:"Subíndex",Superscript:"Superíndex","Text styles":"Estils de text","To-do List":"Llista de tasques pendents","Toggle the circle list style":"Canviar l'estil de llista de cercles","Toggle the decimal list style":"Canviar l'estil de llista decimal","Toggle the decimal with leading zero list style":"Commutar l'estil de la llista de decimals amb un zero al davant","Toggle the disc list style":"Canviar l'estil de llista de discs","Toggle the lower–latin list style":"Canviar l'estil de la llista a lletres llatines en minúscules","Toggle the lower–roman list style":"Canviar l'estil de la llista a numerals romans en minúscules","Toggle the square list style":"Canviar l'estil de llista quadrada","Toggle the upper–latin list style":"Canviar l'estil de la llista a lletres llatines en majúscules","Toggle the upper–roman list style":"Canviar l'estil de la llista a numerals romans en majúscules",Turquoise:"Turquesa",Underline:"Subrallat",Undo:"Desfer","Upper-latin":"Lletres llatines en majúscules","Upper-roman":"Numerals romans en majúscules",White:"Blanc","Widget toolbar":"Barra d'eines de ginys",Yellow:"Groc"});l.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/cs.js b/js/ckeditor5/translations/cs.js
new file mode 100644
index 000000000..ea9b987c9
--- /dev/null
+++ b/js/ckeditor5/translations/cs.js
@@ -0,0 +1 @@
+(function(e){const t=e["cs"]=e["cs"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 z %1",Accept:"Přijmout",Aquamarine:"Akvamarínová",Black:"Černá","Block styles":"Styly bloků",Blue:"Modrá",Bold:"Tučné","Bulleted List":"Odrážky","Bulleted list styles toolbar":"Panel seznamu s odrážkami",Cancel:"Zrušit",Circle:"Kruh",Code:"Kódový blok",Decimal:"Čísla","Decimal with leading zero":"Čísla s nulou na začátku","Dim grey":"Tmavě šedá",Disc:"Plný kruh","Dropdown toolbar":"Rozbalovací panel nástrojů","Edit block":"Upravit blok","Editor block content toolbar":"Panel nástrojů obsahu bloku editoru","Editor contextual toolbar":"Kontextový panel nástrojů editoru","Editor editing area: %0":"Editační oblast editoru: %0","Editor toolbar":"Panel nástrojů editoru",Green:"Zelená",Grey:"Šedá",HEX:"HEX","HTML object":"HTML objekt","Insert paragraph after block":"Vložte odstavec za blok","Insert paragraph before block":"Vložte odstavec před blok",Italic:"Kurzíva","Light blue":"Světle modrá","Light green":"Světle zelená","Light grey":"Světle šedá","List properties":"Vlastnosti seznamu","Lower-latin":"Malá písmena","Lower–roman":"Malé římské čísla","Multiple styles":"Více stylů",Next:"Další","Numbered List":"Číslování","Numbered list styles toolbar":"Panel se styly číslovaného seznamu",Orange:"Oranžová","Press Enter to type after or press Shift + Enter to type before the widget":"Stisknutím klávesy Enter můžete psát za widgetem a stisknutím Shift + Enter před ním",Previous:"Předchozí",Purple:"Fialová",Red:"Červená",Redo:"Znovu","Remove Format":"Odstranit formátování","Reversed order":"Obrácené pořadí","Rich Text Editor":"Textový editor","Select all":"Vybrat vše","Show more items":"Zobrazit další položky",Square:"Čtverec","Start at":"Začít na","Start index must be greater than 0.":"Počátek musí být větší jak 0.",Strikethrough:"Přeškrtnuté",Styles:"Styly",Subscript:"Dolní index",Superscript:"Horní index","Text styles":"Styly textu","To-do List":"Seznam úkolů","Toggle the circle list style":"Přepnout na seznam s kruhovým označením","Toggle the decimal list style":"Přepnout na číselný seznam","Toggle the decimal with leading zero list style":"Přepnout na číselný seznam s nulou na začátku","Toggle the disc list style":"Přepnout na seznam s označením plného kruhu","Toggle the lower–latin list style":"Přepnout na seznam s malými písmeny","Toggle the lower–roman list style":"Přepnout na seznam s malými římskými čísly","Toggle the square list style":"Přepnout na seznam se čtvercovým označením","Toggle the upper–latin list style":"Přepnout na seznam s velkými písmeny","Toggle the upper–roman list style":"Přepnout na seznam s velkými římskými čísly",Turquoise:"Tyrkysová",Underline:"Podtržené",Undo:"Zpět","Upper-latin":"Velká písmena","Upper-roman":"Velké římské čísla",White:"Bílá","Widget toolbar":"Panel nástrojů ovládacího prvku",Yellow:"Žlutá"});t.getPluralForm=function(e){return e==1&&e%1==0?0:e>=2&&e<=4&&e%1==0?1:e%1!=0?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/da.js b/js/ckeditor5/translations/da.js
new file mode 100644
index 000000000..1e4996624
--- /dev/null
+++ b/js/ckeditor5/translations/da.js
@@ -0,0 +1 @@
+(function(e){const t=e["da"]=e["da"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 af %1",Accept:"Accepter",Aquamarine:"Marineblå",Black:"Sort","Block styles":"Blokstile",Blue:"Blå",Bold:"Fed","Bulleted List":"Punktopstilling","Bulleted list styles toolbar":"Værktøjslinje til punktopdelt liste",Cancel:"Annullér",Circle:"Cirkel",Code:"Kode",Decimal:"Decimal","Decimal with leading zero":"Decimal med nul i starten","Dim grey":"Dunkel grå",Disc:"Disk","Dropdown toolbar":"Dropdown værktøjslinje","Edit block":"Redigér blok","Editor block content toolbar":"Redigeringskasse indholdsværktøjslinje","Editor contextual toolbar":"Kontekstuel værktøjslinje til redigeringsprogram","Editor editing area: %0":"Redigeringsområde: %0","Editor toolbar":"Editor værktøjslinje",Green:"Grøn",Grey:"Grå",HEX:"Hex","HTML object":"HTML-objekt","Insert paragraph after block":"Indsæt paragraf efter blok","Insert paragraph before block":"Indsæt paragraf før blok",Italic:"Kursiv","Light blue":"Lys blå","Light green":"Lys grøn","Light grey":"Lys grå","List properties":"Listeegenskaber","Lower-latin":"Latinsk med små bogstaver","Lower–roman":"Romertal med små bogstaver","Multiple styles":"Flere stile",Next:"Næste","Numbered List":"Opstilling med tal","Numbered list styles toolbar":"Værktøjslinje til nummereret listestil",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Tryk på Enter for at skrive efter, eller tryk på Shift + Enter for at skrive før widgetten",Previous:"Forrige",Purple:"Lilla",Red:"Rød",Redo:"Gentag","Remove Format":"Fjern format","Reversed order":"Omvendt rækkefølge","Rich Text Editor":"Wysiwyg editor","Select all":"Vælg alt","Show more items":"Vis flere emner",Square:"Firkant","Start at":"Start ved","Start index must be greater than 0.":"Startindeks skal være større end 0.",Strikethrough:"Gennemstreg",Styles:"Stile",Subscript:"Sænket skrift",Superscript:"Hævet skrift","Text styles":"Tekststile","To-do List":"To-do liste","Toggle the circle list style":"Slå listestilen cirkel til og fra","Toggle the decimal list style":"Slå listestilen decimal til og fra","Toggle the decimal with leading zero list style":"Slå listestilen decimal med nul i starten til og fra","Toggle the disc list style":"Slå listestilen disk til og fra","Toggle the lower–latin list style":"Slå listestilen latinsk med små bogstaver til","Toggle the lower–roman list style":"Slå listestilen romertal med små bogstaver til","Toggle the square list style":"Slå listestilen firkantet til og fra","Toggle the upper–latin list style":"Slå listestilen latinsk med store bogstaver til","Toggle the upper–roman list style":"Slå listestilen romertal med store bogstaver til",Turquoise:"Turkis",Underline:"Understreget",Undo:"Fortryd","Upper-latin":"Latinsk med store bogstaver","Upper-roman":"Romertal med store bogstaver",White:"Hvid","Widget toolbar":"Widget værktøjslinje",Yellow:"Gyl"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/de-ch.js b/js/ckeditor5/translations/de-ch.js
new file mode 100644
index 000000000..6e954cc8e
--- /dev/null
+++ b/js/ckeditor5/translations/de-ch.js
@@ -0,0 +1 @@
+(function(e){const t=e["de-ch"]=e["de-ch"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"Fett","Bulleted List":"Aufzählungsliste","Bulleted list styles toolbar":"Darstellung der ungeordneten Liste",Cancel:"Abbrechen",Circle:"Leerer Kreis",Code:"Code",Decimal:"Dezimalzahlen","Decimal with leading zero":"Dezimalzahlen mit vorangestellten Nullen","Dim grey":"",Disc:"Gefüllter Kreis","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"","Insert paragraph after block":"Absatz nach Block einfügen","Insert paragraph before block":"Absatz vor Block einfügen",Italic:"Kursiv","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"Kleingeschriebene lateinische Buchstaben","Lower–roman":"Kleingeschriebene römische Zahlen",Next:"","Numbered List":"Nummerierte Liste","Numbered list styles toolbar":"Darstellung der nummerierten Liste",Orange:"","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"",Purple:"",Red:"",Redo:"Wiederherstellen","Remove Format":"Formatierung entfernen","Reversed order":"","Rich Text Editor":"Rich-Text-Edito","Select all":"Alles auswählen","Show more items":"",Square:"Quadrat","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Durchgestrichen",Subscript:"Tiefgestellt",Superscript:"Hochgestellt","To-do List":"Aufgabenliste","Toggle the circle list style":"Leeren Kreis einstellen","Toggle the decimal list style":"Dezimalzahlen einstellen","Toggle the decimal with leading zero list style":"Dezimalzahlen mit vorangestellten Nullen einstellen","Toggle the disc list style":"Gefüllten Kreis einstellen","Toggle the lower–latin list style":"Kleingeschriebene lateinische Buchstaben einstellen","Toggle the lower–roman list style":"Kleingeschriebene römische Zahlen einstellen","Toggle the square list style":"Quadrat einstellen","Toggle the upper–latin list style":"Grossgeschriebene lateinische Buchstaben einstellen","Toggle the upper–roman list style":"Grossgeschriebene römische Zahlen einstellen",Turquoise:"",Underline:"Unterstrichen",Undo:"Rückgängig","Upper-latin":"Grossgeschriebene lateinische Buchstaben","Upper-roman":"Grossgeschriebene römische Zahlen",White:"","Widget toolbar":"Widget Werkzeugleiste",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/de.js b/js/ckeditor5/translations/de.js
new file mode 100644
index 000000000..b724d3c34
--- /dev/null
+++ b/js/ckeditor5/translations/de.js
@@ -0,0 +1 @@
+(function(e){const t=e["de"]=e["de"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 von %1",Accept:"Akzeptieren",Aquamarine:"Aquamarinblau",Black:"Schwarz","Block styles":"Block-Stile",Blue:"Blau",Bold:"Fett","Bulleted List":"Aufzählungsliste","Bulleted list styles toolbar":"Darstellung der ungeordneten Liste",Cancel:"Abbrechen",Circle:"Leerer Kreis",Code:"Code",Decimal:"Dezimalzahlen","Decimal with leading zero":"Dezimalzahlen mit vorangestellten Nullen","Dim grey":"Dunkelgrau",Disc:"Gefüllter Kreis","Dropdown toolbar":"Dropdown-Liste Werkzeugleiste","Edit block":"Absatz bearbeiten","Editor block content toolbar":"Editor Blockinhalt-Toolbar","Editor contextual toolbar":"Editor kontextuelle Toolbar","Editor editing area: %0":"Bearbeitungsbereich des Editors: %0","Editor toolbar":"Editor Werkzeugleiste",Green:"Grün",Grey:"Grau",HEX:"HEX","HTML object":"HTML-Objekt","Insert paragraph after block":"Absatz nach Block einfügen","Insert paragraph before block":"Absatz vor Block einfügen",Italic:"Kursiv","Light blue":"Hellblau","Light green":"Hellgrün","Light grey":"Hellgrau","List properties":"Listeneigenschaften","Lower-latin":"Kleingeschriebene lateinische Buchstaben","Lower–roman":"Kleingeschriebene römische Zahlen","Multiple styles":"Mehrere Stile",Next:"Nächste","Numbered List":"Nummerierte Liste","Numbered list styles toolbar":"Darstellung der geordneten Liste",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Drücken Sie die Eingabetaste, um nach dem Widget zu tippen oder Shift + Eingabetaste, um vor dem Widget zu tippen.",Previous:"vorherige",Purple:"Violett",Red:"Rot",Redo:"Wiederherstellen","Remove Format":"Formatierung entfernen","Reversed order":"Umgekehrte Reihenfolge","Rich Text Editor":"Rich Text Editor","Select all":"Alles auswählen","Show more items":"Mehr anzeigen",Square:"Quadrat","Start at":"Beginnen mit","Start index must be greater than 0.":"Der Startwert muss größer als 0 sein.",Strikethrough:"Durchgestrichen",Styles:"Stile",Subscript:"Tiefgestellt",Superscript:"Hochgestellt","Text styles":"Text-Stile","To-do List":"Aufgabenliste","Toggle the circle list style":"Leeren Kreis einstellen","Toggle the decimal list style":"Dezimalzahlen einstellen","Toggle the decimal with leading zero list style":"Dezimalzahlen mit vorangestellten Nullen einstellen","Toggle the disc list style":"Gefüllten Kreis einstellen","Toggle the lower–latin list style":"Kleingeschriebene lateinische Buchstaben einstellen","Toggle the lower–roman list style":"Kleingeschriebene römische Zahlen einstellen","Toggle the square list style":"Quadrat einstellen","Toggle the upper–latin list style":"Großgeschriebene lateinische Buchstaben einstellen","Toggle the upper–roman list style":"Großgeschriebene römische Zahlen einstellen",Turquoise:"Türkis",Underline:"Unterstrichen",Undo:"Rückgängig","Upper-latin":"Großgeschriebene lateinische Buchstaben","Upper-roman":"Großgeschriebene römische Zahlen",White:"Weiß","Widget toolbar":"Widget Werkzeugleiste",Yellow:"Gelb"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/el.js b/js/ckeditor5/translations/el.js
new file mode 100644
index 000000000..fcbb3e0d1
--- /dev/null
+++ b/js/ckeditor5/translations/el.js
@@ -0,0 +1 @@
+(function(e){const t=e["el"]=e["el"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 από %1",Accept:"Αποδοχή",Aquamarine:"Ακουαμαρίνα",Black:"Μαύρο","Block styles":"Στυλ για μπλοκ",Blue:"Μπλε",Bold:"Έντονα","Bulleted List":"Λίστα με κουκκίδες","Bulleted list styles toolbar":"Γραμμή εργαλείων στυλ λιστών με κουκίδες",Cancel:"Ακύρωση",Circle:"Κύκλος",Code:"Κώδικας",Decimal:"Δεκαδικό","Decimal with leading zero":"Δεκαδικό με μηδενικά","Dim grey":"Θολό γκρι",Disc:"Δίσκος","Dropdown toolbar":"Γραμμή εργαλείων αναδυόμενου μενού","Edit block":"Επεξεργασία τμήματος","Editor block content toolbar":"Γραμμή εργαλείων επεξεργασίας περιεχομένου αποκλεισμού","Editor contextual toolbar":"Γραμμή εργαλείων επεξεργασίας συμφραζομένων","Editor editing area: %0":"Περιοχή επεξεργασίας προγράμματος επεξεργασίας: %0","Editor toolbar":"Γραμμή εργαλείων επεξεργαστή",Green:"Πράσινο",Grey:"Γκρι",HEX:"Δεκαεξαδική μορφή χρωμάτων","HTML object":"Αντικείμενο HTML","Insert paragraph after block":"Εισαγωγή παραγράφου μετά το τμήμα","Insert paragraph before block":"Εισαγωγή παραγράφου πριν το τμήμα",Italic:"Πλάγια","Light blue":"Φωτινό μπλε","Light green":"Φωτινό πράσινο","Light grey":"Φωτινό γκρι","List properties":"Ιδιότητες λίστας","Lower-latin":"Μικρά λατινικά","Lower–roman":"Μικρά ρωμαϊκά","Multiple styles":"Πολλαπλά στυλ",Next:"Επόμενο","Numbered List":"Λίστα με αριθμούς","Numbered list styles toolbar":"Γραμμή εργαλείων στυλ λιστών με αριθμούς",Orange:"Πορτοκαλί","Press Enter to type after or press Shift + Enter to type before the widget":"Πατήστε Enter για να πληκτρολογήσετε μετά ή πατήστε Shift + Enter για να πληκτρολογήσετε πριν από το γραφικό στοιχείο",Previous:"Προηγούμενο",Purple:"Πορφυρό",Red:"Κόκκινο",Redo:"Επανάληψη","Remove Format":"Απομάκρυνση μορφοποίησης","Reversed order":"Αντίστροφη σειρά","Rich Text Editor":"Επεξεργαστής εμπλουτισμένου κειμένου","Select all":"Επιλογή όλων","Show more items":"Προβολή περισσότερων αντικειμένων",Square:"Τετράγωνο","Start at":"Εναρξη από","Start index must be greater than 0.":"Ο αριθμός έναρξης πρέπει να είναι μεγαλύτερος από 0.",Strikethrough:"Διακριτή διαγραφή",Styles:"Στυλ",Subscript:"Δείκτης",Superscript:"Εκθέτης","Text styles":"Στυλ για κείμενο","To-do List":"Λίστα προγραμματισμένων ενεργειών","Toggle the circle list style":"Εναλλαγή του στυλ λίστας με κύκλο","Toggle the decimal list style":"Εναλλαγή του στυλ λίστας με δεκαδικά","Toggle the decimal with leading zero list style":"Εναλλαγή του στυλ λίστας δεκαδικών με μηδενικά","Toggle the disc list style":"Εναλλαγή του στυλ λίστας με δίσκο","Toggle the lower–latin list style":"Εναλλαγή του στυλ λίστας με μικρά λατινικά","Toggle the lower–roman list style":"Εναλλαγή του στυλ λίστας με μικρά ρωμαϊκά","Toggle the square list style":"Εναλαγή του στυλ λίστας με τετράγωνο","Toggle the upper–latin list style":"Εναλλαγή του στυλ λίστας με κεφαλαία λατινικά","Toggle the upper–roman list style":"Εναλλαγή του στυλ λίστας με κεφαλαία ρωμαϊκά",Turquoise:"Τιρκουάζ",Underline:"Υπογράμμιση",Undo:"Αναίρεση","Upper-latin":"Κεφαλαία λατινικά","Upper-roman":"Κεφαλαία ρωμαϊκά",White:"Λευκό","Widget toolbar":"Γραμμή εργαλείων γραφικού στοιχείου",Yellow:"Κίτρινο"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/en-au.js b/js/ckeditor5/translations/en-au.js
new file mode 100644
index 000000000..0558483b5
--- /dev/null
+++ b/js/ckeditor5/translations/en-au.js
@@ -0,0 +1 @@
+(function(e){const t=e["en-au"]=e["en-au"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"",Aquamarine:"Aquamarine",Black:"Black","Block styles":"Block styles",Blue:"Blue",Bold:"Bold","Bulleted List":"Bulleted List","Bulleted list styles toolbar":"Bulleted list styles toolbar",Cancel:"Cancel",Circle:"Circle",Code:"Code",Decimal:"Decimal","Decimal with leading zero":"Decimal with leading zero","Dim grey":"Dim grey",Disc:"Disc","Dropdown toolbar":"Dropdown toolbar","Edit block":"Edit block","Editor block content toolbar":"Editor block content toolbar","Editor contextual toolbar":"Editor contextual toolbar","Editor editing area: %0":"Editor editing area: %0","Editor toolbar":"Editor toolbar",Green:"Green",Grey:"Grey",HEX:"","HTML object":"HTML object","Insert paragraph after block":"Insert paragraph after block","Insert paragraph before block":"Insert paragraph before block",Italic:"Italic","Light blue":"Light blue","Light green":"Light green","Light grey":"Light grey","List properties":"List properties","Lower-latin":"Lower-latin","Lower–roman":"Lower–roman","Multiple styles":"Multiple styles",Next:"Next","Numbered List":"Numbered List","Numbered list styles toolbar":"Numbered list styles toolbar",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Press Enter to type after or press Shift + Enter to type before the widget",Previous:"Previous",Purple:"Purple",Red:"Red",Redo:"Redo","Remove Format":"Remove Format","Reversed order":"Reversed order","Rich Text Editor":"Rich Text Editor","Select all":"Select all","Show more items":"Show more items",Square:"Square","Start at":"Start at","Start index must be greater than 0.":"Start index must be greater than 0.",Strikethrough:"Strikethrough",Styles:"Styles",Subscript:"Subscript",Superscript:"Superscript","Text styles":"Text styles","To-do List":"To-do List","Toggle the circle list style":"Toggle the circle list style","Toggle the decimal list style":"Toggle the decimal list style","Toggle the decimal with leading zero list style":"Toggle the decimal with leading zero list style","Toggle the disc list style":"Toggle the disc list style","Toggle the lower–latin list style":"Toggle the lower–latin list style","Toggle the lower–roman list style":"Toggle the lower–roman list style","Toggle the square list style":"Toggle the square list style","Toggle the upper–latin list style":"Toggle the upper–latin list style","Toggle the upper–roman list style":"Toggle the upper–roman list style",Turquoise:"Turquoise",Underline:"Underline",Undo:"Undo","Upper-latin":"Upper-latin","Upper-roman":"Upper-roman",White:"White","Widget toolbar":"Widget toolbar",Yellow:"Yellow"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/en.js b/js/ckeditor5/translations/en.js
new file mode 100644
index 000000000..9a4df93af
--- /dev/null
+++ b/js/ckeditor5/translations/en.js
@@ -0,0 +1 @@
+(function(e){const t=e["en"]=e["en"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"Accept",Aquamarine:"Aquamarine",Black:"Black","Block styles":"Block styles",Blue:"Blue",Bold:"Bold","Bulleted List":"Bulleted List","Bulleted list styles toolbar":"Bulleted list styles toolbar",Cancel:"Cancel",Circle:"Circle",Code:"Code",Decimal:"Decimal","Decimal with leading zero":"Decimal with leading zero","Dim grey":"Dim grey",Disc:"Disc","Dropdown toolbar":"Dropdown toolbar","Edit block":"Edit block","Editor block content toolbar":"Editor block content toolbar","Editor contextual toolbar":"Editor contextual toolbar","Editor editing area: %0":"Editor editing area: %0","Editor toolbar":"Editor toolbar",Green:"Green",Grey:"Grey",HEX:"HEX","HTML object":"HTML object","Insert paragraph after block":"Insert paragraph after block","Insert paragraph before block":"Insert paragraph before block",Italic:"Italic","Light blue":"Light blue","Light green":"Light green","Light grey":"Light grey","List properties":"List properties","Lower-latin":"Lower-latin","Lower–roman":"Lower–roman","Multiple styles":"Multiple styles",Next:"Next","Numbered List":"Numbered List","Numbered list styles toolbar":"Numbered list styles toolbar",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Press Enter to type after or press Shift + Enter to type before the widget",Previous:"Previous",Purple:"Purple",Red:"Red",Redo:"Redo","Remove Format":"Remove Format","Reversed order":"Reversed order","Rich Text Editor":"Rich Text Editor","Select all":"Select all","Show more items":"Show more items",Square:"Square","Start at":"Start at","Start index must be greater than 0.":"Start index must be greater than 0.",Strikethrough:"Strikethrough",Styles:"Styles",Subscript:"Subscript",Superscript:"Superscript","Text styles":"Text styles","To-do List":"To-do List","Toggle the circle list style":"Toggle the circle list style","Toggle the decimal list style":"Toggle the decimal list style","Toggle the decimal with leading zero list style":"Toggle the decimal with leading zero list style","Toggle the disc list style":"Toggle the disc list style","Toggle the lower–latin list style":"Toggle the lower–latin list style","Toggle the lower–roman list style":"Toggle the lower–roman list style","Toggle the square list style":"Toggle the square list style","Toggle the upper–latin list style":"Toggle the upper–latin list style","Toggle the upper–roman list style":"Toggle the upper–roman list style",Turquoise:"Turquoise",Underline:"Underline",Undo:"Undo","Upper-latin":"Upper-latin","Upper-roman":"Upper-roman",White:"White","Widget toolbar":"Widget toolbar",Yellow:"Yellow"})})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/eo.js b/js/ckeditor5/translations/eo.js
new file mode 100644
index 000000000..ca27edcf7
--- /dev/null
+++ b/js/ckeditor5/translations/eo.js
@@ -0,0 +1 @@
+(function(e){const t=e["eo"]=e["eo"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"grasa","Bulleted List":"Bula Listo","Bulleted list styles toolbar":"",Cancel:"Nuligi",Circle:"",Code:"",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"kursiva","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"Numerita Listo","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"Refari","Reversed order":"","Rich Text Editor":"Redaktilo de Riĉa Teksto","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"",Undo:"Malfari","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/es-co.js b/js/ckeditor5/translations/es-co.js
new file mode 100644
index 000000000..c2f119a6b
--- /dev/null
+++ b/js/ckeditor5/translations/es-co.js
@@ -0,0 +1 @@
+(function(e){const o=e["es-co"]=e["es-co"]||{};o.dictionary=Object.assign(o.dictionary||{},{"%0 of %1":"%0 de %1",Bold:"Negrita",Cancel:"Cancelar",Code:"Código",Italic:"Cursiva","Show more items":"Mostrar más elementos",Strikethrough:"Tachado",Subscript:"Subíndice",Superscript:"Superíndice",Underline:"Subrayado"});o.getPluralForm=function(e){return e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/es.js b/js/ckeditor5/translations/es.js
new file mode 100644
index 000000000..8235fb4de
--- /dev/null
+++ b/js/ckeditor5/translations/es.js
@@ -0,0 +1 @@
+(function(e){const a=e["es"]=e["es"]||{};a.dictionary=Object.assign(a.dictionary||{},{"%0 of %1":"%0 de %1",Accept:"Aceptar",Aquamarine:"Aguamarina",Black:"Negro","Block styles":"Estilos de bloque",Blue:"Azul",Bold:"Negrita","Bulleted List":"Lista con viñetas","Bulleted list styles toolbar":"Estilos de lista con viñetas",Cancel:"Cancelar",Circle:"Círculo",Code:"Código",Decimal:"Decimal","Decimal with leading zero":"Decimal con cero","Dim grey":"Gris Oscuro",Disc:"Disco","Dropdown toolbar":"Barra de herramientas desplegable","Edit block":"Cuadro de edición","Editor block content toolbar":"Barra de herramientas de contenido del bloque del editor","Editor contextual toolbar":"Barra de herramientas contextual del editor","Editor editing area: %0":"Área de edición del editor: %0","Editor toolbar":"Barra de herramientas de edición",Green:"Verde",Grey:"Gris",HEX:"HEX","HTML object":"Objeto HTML","Insert paragraph after block":"Insertar párrafo después del bloque","Insert paragraph before block":"Insertar párrafo antes del bloque",Italic:"Cursiva","Light blue":"Azul Claro","Light green":"Verde Claro","Light grey":"Gris Claro","List properties":"Propiedades de la lista","Lower-latin":"Latinos minúsculas","Lower–roman":"Romanos minúsculas","Multiple styles":"Múltiples estilos",Next:"Siguiente","Numbered List":"Lista numerada","Numbered list styles toolbar":"Estilos de lista numerada",Orange:"Anaranjado","Press Enter to type after or press Shift + Enter to type before the widget":"Pulse Intro para escribir después o pulse Mayús + Intro para escribir antes del «widget».",Previous:"Anterior",Purple:"Morado",Red:"Rojo",Redo:"Rehacer","Remove Format":"Quitar Formato","Reversed order":"Orden inverso","Rich Text Editor":"Editor de Texto Enriquecido","Select all":"Seleccionar todo","Show more items":"Mostrar más elementos",Square:"Cuadrado","Start at":"Empezar en","Start index must be greater than 0.":"El número de inicio debe ser mayor que 0.",Strikethrough:"Tachado",Styles:"Estilos",Subscript:"Subíndice",Superscript:"Superíndice","Text styles":"Estilos de texto","To-do List":"Lista de tareas","Toggle the circle list style":"Cambiar estilo de viñeta a círculo","Toggle the decimal list style":"Cambiar estilo de lista a decimal","Toggle the decimal with leading zero list style":"Cambiar estilo de lista decimal empezando con cero","Toggle the disc list style":"Cambiar estilo de viñeta a disco","Toggle the lower–latin list style":"Cambiar estilo de lista a números latinos en minúsculas","Toggle the lower–roman list style":"Cambiar estilo de lista a números romanos en minúsculas","Toggle the square list style":"Cambiar estilo de viñeta a cuadrado","Toggle the upper–latin list style":"Cambiar estilo de lista a números latinos en mayúsculas","Toggle the upper–roman list style":"Cambiar estilo de lista a números roanos en mayúsculas",Turquoise:"Turquesa",Underline:"Subrayado",Undo:"Deshacer","Upper-latin":"Latinos minúsculas","Upper-roman":"Romanos mayúscula",White:"Blanco","Widget toolbar":"Barra de herramientas del widget",Yellow:"Amarillo"});a.getPluralForm=function(e){return e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/et.js b/js/ckeditor5/translations/et.js
new file mode 100644
index 000000000..09f0d2b6f
--- /dev/null
+++ b/js/ckeditor5/translations/et.js
@@ -0,0 +1 @@
+(function(i){const e=i["et"]=i["et"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 / %1",Accept:"Nõustu",Aquamarine:"Akvamariin",Black:"Must","Block styles":"Ploki stiilid",Blue:"Sinine",Bold:"Rasvane","Bulleted List":"Punktidega loetelu","Bulleted list styles toolbar":"Täpploendi stiili tööriistariba",Cancel:"Loobu",Circle:"Ring",Code:"Kood",Decimal:"Kümnend","Decimal with leading zero":"Nulliga kümnendsüsteem","Dim grey":"Tumehall",Disc:"Ketas","Dropdown toolbar":"Avatav tööriistariba","Edit block":"Muuda plokki","Editor block content toolbar":"Redigeerija ploki sisu tööriistariba","Editor contextual toolbar":"Redigeerija kontekstuaalne tööriistariba","Editor editing area: %0":"Redaktori redigeerimisala: %0","Editor toolbar":"Redaktori tööriistariba",Green:"Roheline",Grey:"Hall",HEX:"HEX","HTML object":"HTML objekt","Insert paragraph after block":"Sisesta lõik pärast plokki","Insert paragraph before block":"Sisesta lõik enne plokki",Italic:"Kaldkiri","Light blue":"Helesinine","Light green":"Heleroheline","Light grey":"Helehall","List properties":"Loendi atribuudid","Lower-latin":"Ladina väiketähe","Lower–roman":"Väikse rooma numbri","Multiple styles":"Mitu stiili",Next:"Järgmine","Numbered List":"Nummerdatud loetelu","Numbered list styles toolbar":"Numbriloendi stiilide tööriistariba",Orange:"Oranž","Press Enter to type after or press Shift + Enter to type before the widget":"Vajutage Enter, et tippida pärast, või Shift + Enter, et tippida enne vidinat",Previous:"Eelmine",Purple:"Lilla",Red:"Punane",Redo:"Tee uuesti","Remove Format":"Eemalda vorming","Reversed order":"Vastupidine järjekord","Rich Text Editor":"Tekstiredaktor","Select all":"Vali kõik","Show more items":"Näita veel",Square:"Ruut","Start at":"Alusta alates","Start index must be greater than 0.":"Algindeks peab olema suurem kui 0.",Strikethrough:"Läbijoonitud",Styles:"Stiilid",Subscript:"Alaindeks",Superscript:"Ülaindeks","Text styles":"Teksti stiilid","To-do List":"Tööde nimekiri","Toggle the circle list style":"Lülita ringi loendistiili sisse-välja","Toggle the decimal list style":"Lülita kümnendsüsteemi loendistiili sisse-välja","Toggle the decimal with leading zero list style":"Lülita nulliga kümnendsüsteemi loendistiili sisse-välja","Toggle the disc list style":"Lülita ketta loendistiili sisse-välja","Toggle the lower–latin list style":"Lülita ladina väiketähe loendistiili sisse-välja","Toggle the lower–roman list style":"Lülita väikse rooma numbri loendistiili sisse-välja","Toggle the square list style":"Lülita ruudu loendistiili sisse-välja","Toggle the upper–latin list style":"Lülita ladina suurtähe loendistiili sisse-välja","Toggle the upper–roman list style":"Lülita suure rooma numbri loendistiili sisse-välja",Turquoise:"Türkiis",Underline:"Allajoonitud",Undo:"Võta tagasi","Upper-latin":"Ladina suurtähe","Upper-roman":"Suure rooma numbri",White:"Valge","Widget toolbar":"Vidinate tööriistariba",Yellow:"Kollane"});e.getPluralForm=function(i){return i!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/eu.js b/js/ckeditor5/translations/eu.js
new file mode 100644
index 000000000..2fa94b49f
--- /dev/null
+++ b/js/ckeditor5/translations/eu.js
@@ -0,0 +1 @@
+(function(e){const t=e["eu"]=e["eu"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"Lodia","Bulleted List":"Buletdun zerrenda","Bulleted list styles toolbar":"",Cancel:"Utzi",Circle:"",Code:"Kodea",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"Etzana","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"Zenbakidun zerrenda","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"Berregin","Reversed order":"","Rich Text Editor":"Testu aberastuaren editorea","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"Azpimarra",Undo:"Desegin","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/fa.js b/js/ckeditor5/translations/fa.js
new file mode 100644
index 000000000..30f9f922e
--- /dev/null
+++ b/js/ckeditor5/translations/fa.js
@@ -0,0 +1 @@
+(function(e){const t=e["fa"]=e["fa"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 از %1",Accept:"",Aquamarine:"زمرد کبود",Black:"سیاه",Blue:"آبی",Bold:"درشت","Bulleted List":"لیست نشانه‌دار","Bulleted list styles toolbar":"",Cancel:"لغو",Circle:"",Code:"کد",Decimal:"","Decimal with leading zero":"","Dim grey":"خاکستری تیره",Disc:"","Dropdown toolbar":"نوارابزار کشویی","Edit block":"ویرایش قطعه","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"نوارابزار ویرایشگر",Green:"سبز",Grey:"خاکستری",HEX:"","Insert paragraph after block":"درج پاراگراف بعد از بلوک","Insert paragraph before block":"درج پاراگراف قبل از بلوک",Italic:"کج","Light blue":"آبی روشن","Light green":"سبز روشن","Light grey":"خاکستری روشن","List properties":"","Lower-latin":"","Lower–roman":"",Next:"بعدی","Numbered List":"لیست عددی","Numbered list styles toolbar":"",Orange:"نارنجی","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"قبلی",Purple:"بنفش",Red:"قرمز",Redo:"باز انجام","Remove Format":"حذف کردن قالب","Reversed order":"","Rich Text Editor":"ویرایشگر متن غنی","Select all":"انتخاب همه","Show more items":"نمایش گزینه‌های بیشتر",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"خط خورده",Subscript:"پایین نویس",Superscript:"بالانویس","To-do List":"لیست انجام کار","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"فیروزه ای",Underline:"خط زیر",Undo:"بازگردانی","Upper-latin":"","Upper-roman":"",White:"سفید","Widget toolbar":"نوار ابزار ویجت",Yellow:"زرد"});t.getPluralForm=function(e){return e>1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/fi.js b/js/ckeditor5/translations/fi.js
new file mode 100644
index 000000000..b9f469f2d
--- /dev/null
+++ b/js/ckeditor5/translations/fi.js
@@ -0,0 +1 @@
+(function(i){const e=i["fi"]=i["fi"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 / %1",Accept:"Hyväksy",Aquamarine:"Akvamariini",Black:"Musta","Block styles":"Lohkotyylit",Blue:"Sininen",Bold:"Lihavointi","Bulleted List":"Lista","Bulleted list styles toolbar":"Luetelmalistan työkalupalkki",Cancel:"Peruuta",Circle:"Ympyrä",Code:"Koodi",Decimal:"Desimaali","Decimal with leading zero":"Nolla alussa -desimaali","Dim grey":"Vaaleanharmaa",Disc:"Levy","Dropdown toolbar":"Pudotusvalikon työkalupalkki","Edit block":"Muokkaa lohkoa","Editor block content toolbar":"Editorin lohkon sisällön työkalupalkki","Editor contextual toolbar":"Editorin kontekstuaalinen työkalupalkki","Editor editing area: %0":"Editorin muokkausalue: %0","Editor toolbar":"Editorin työkalupalkki",Green:"Vihreä",Grey:"Harmaa",HEX:"HEX","HTML object":"HMTL-kohde","Insert paragraph after block":"Liitä kappale lohkon jälkeen","Insert paragraph before block":"Liitä kappale ennen lohkoa",Italic:"Kursivointi","Light blue":"Vaaleansininen","Light green":"Vaaleanvihreä","Light grey":"Vaaleanharmaa","List properties":"Listaominaisuudet","Lower-latin":"Pienet latinalaiset aakkoset","Lower–roman":"Pienet roomalaiset numerot","Multiple styles":"Useita tyylejä",Next:"Seuraava","Numbered List":"Numeroitu lista","Numbered list styles toolbar":"Numerolistan työkalupalkki",Orange:"Oranssi","Press Enter to type after or press Shift + Enter to type before the widget":"Paina enter-näppäintä kirjoittaaksesi tai paina shift + enter kirjoittaaksesi ennen widget-sovellusta",Previous:"Edellinen",Purple:"Purppura",Red:"Punainen",Redo:"Tee uudelleen","Remove Format":"Poista muotoilu","Reversed order":"Päinvastainen järjestys","Rich Text Editor":"Rikas tekstieditori","Select all":"Valitse kaikki","Show more items":"Näytä lisää toimintoja",Square:"Neliö","Start at":"Alkaa","Start index must be greater than 0.":"Aloitusindeksi ei saa olla suurempi kuin 0.",Strikethrough:"Yliviivaus",Styles:"Tyylit",Subscript:"Alaindeksi",Superscript:"Yläindeksi","Text styles":"Tekstityylit","To-do List":"Tehtävälista","Toggle the circle list style":"Ympyrälistatyylin vaihdin","Toggle the decimal list style":"Desimaalilistatyylin vaihdin","Toggle the decimal with leading zero list style":"Nolla alussa -desimaalilistatyylin vaihdin","Toggle the disc list style":"Levylistatyylin vaihdin","Toggle the lower–latin list style":"Pienet latinalaiset aakkoset -listatyylin vaihdin","Toggle the lower–roman list style":"Pienet roomalaiset numerot -listatyylin vaihdin","Toggle the square list style":"Neliölistatyylin vaihdin","Toggle the upper–latin list style":"Isot latinalaiset aakkoset -listatyylin vaihdin","Toggle the upper–roman list style":"Isot roomalaiset numerot -listatyylin vaihdin",Turquoise:"Turkoosi",Underline:"Alleviivaus",Undo:"Peru","Upper-latin":"Isot latinalaiset aakkoset","Upper-roman":"Isot roomalaiset numerot",White:"Valkoinen","Widget toolbar":"Widget-työkalupalkki",Yellow:"Keltainen"});e.getPluralForm=function(i){return i!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/fr.js b/js/ckeditor5/translations/fr.js
new file mode 100644
index 000000000..642c15e2b
--- /dev/null
+++ b/js/ckeditor5/translations/fr.js
@@ -0,0 +1 @@
+(function(e){const t=e["fr"]=e["fr"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 sur %1",Accept:"Accepter",Aquamarine:"Bleu vert",Black:"Noir","Block styles":"Styles de bloc",Blue:"Bleu",Bold:"Gras","Bulleted List":"Liste à puces","Bulleted list styles toolbar":"Barre d'outils des styles de liste à puce",Cancel:"Annuler",Circle:"Cercle",Code:"Code",Decimal:"Chiffres","Decimal with leading zero":"Chiffres avec des zéros supplémentaire","Dim grey":"Gris pâle",Disc:"Disque","Dropdown toolbar":"Barre d'outils dans un menu déroulant","Edit block":"Modifier le bloc","Editor block content toolbar":"Barre d'outils du contenu du bloc éditeur","Editor contextual toolbar":"Barre d'outils contextuelle de l'éditeur","Editor editing area: %0":"Zone d'édition de l'éditeur : %0","Editor toolbar":"Barre d'outils de l'éditeur",Green:"Vert",Grey:"Gris",HEX:"HEX","HTML object":"Objet HTML","Insert paragraph after block":"Insérer du texte après ce bloc","Insert paragraph before block":"Insérer du texte avant ce bloc",Italic:"Italique","Light blue":"Bleu clair","Light green":"Vert clair","Light grey":"Gris clair","List properties":"Liste des propriétés","Lower-latin":"Lettres minuscules","Lower–roman":"Chiffres romains en minuscules","Multiple styles":"Styles multiples",Next:"Suivant","Numbered List":"Liste numérotée","Numbered list styles toolbar":"Barre d'outils des styles de liste numérotée",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Appuyez sur la touche Entrée pour taper après ou sur Maj + Entrée pour taper avant le widget.",Previous:"Précedent",Purple:"Violet",Red:"Rouge",Redo:"Restaurer","Remove Format":"Enlever le format","Reversed order":"Ordre inversé","Rich Text Editor":"Éditeur de texte enrichi","Select all":"Sélectionner tout","Show more items":"Montrer plus d'éléments",Square:"Carré","Start at":"Commencer à","Start index must be greater than 0.":"L'indice de départ doit être supérieur à 0.",Strikethrough:"Barré",Styles:"Styles",Subscript:"Indice",Superscript:"Exposant","Text styles":"Styles de texte","To-do List":"Liste de tâches","Toggle the circle list style":'Activer / désactiver le style de liste "cercle"',"Toggle the decimal list style":'Activer / désactiver le style de liste "chiffres"',"Toggle the decimal with leading zero list style":'Activer / désactiver le style de liste "chiffres de mêmes longueurs"',"Toggle the disc list style":'Activer / désactiver le style de liste "disque"',"Toggle the lower–latin list style":'Activer / désactiver le style de liste "lettres minuscules"',"Toggle the lower–roman list style":'Activer / désactiver le style de liste "chiffres romains en minuscules"',"Toggle the square list style":'Activer / désactiver le style de liste "carré"',"Toggle the upper–latin list style":'Activer / désactiver le style de liste "lettres majuscules"',"Toggle the upper–roman list style":'Activer / désactiver le style de liste "chiffres romains en majuscules"',Turquoise:"Turquoise",Underline:"Souligné",Undo:"Annuler","Upper-latin":"Lettres majuscules","Upper-roman":"Chiffres romains en majuscules",White:"Blanc","Widget toolbar":"Barre d'outils du widget",Yellow:"Jaune"});t.getPluralForm=function(e){return e==0||e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/gl.js b/js/ckeditor5/translations/gl.js
new file mode 100644
index 000000000..485e0d6b8
--- /dev/null
+++ b/js/ckeditor5/translations/gl.js
@@ -0,0 +1 @@
+(function(e){const r=e["gl"]=e["gl"]||{};r.dictionary=Object.assign(r.dictionary||{},{"%0 of %1":"%0 de %1",Accept:"Aceptar",Aquamarine:"Augamariña",Black:"Negro","Block styles":"Estilos de bloque",Blue:"Azul",Bold:"Negra","Bulleted List":"Lista con viñetas","Bulleted list styles toolbar":"Barra de ferramentas de estilos de lista con viñetas",Cancel:"Cancelar",Circle:"Círculos",Code:"Código",Decimal:"Decimais","Decimal with leading zero":"Decimais con cero á esquerda","Dim grey":"Gris fume",Disc:"Discos","Dropdown toolbar":"Barra de ferramentas despregábel","Edit block":"Editar bloque","Editor block content toolbar":"Barra de ferramentas de contido do bloque do editor","Editor contextual toolbar":"Barra de ferramentas contextual do editor","Editor editing area: %0":"Área de edición do editor: %0","Editor toolbar":"Barra de ferramentas do editor",Green:"Verde",Grey:"Gris",HEX:"HEX","HTML object":"Obxecto HTML","Insert paragraph after block":"Inserir parágrafo após o bloque","Insert paragraph before block":"Inserir parágrafo antes do bloque",Italic:"Itálica","Light blue":"Azul claro","Light green":"Verde claro","Light grey":"Gris claro","List properties":"Lista de propiedades","Lower-latin":"Letras minúsculas","Lower–roman":"Núm, romanos en minúscula","Multiple styles":"Múltiples estilos",Next:"Seguinte","Numbered List":"Lista numerada","Numbered list styles toolbar":"Barra de ferramentas de estilos de lista numerada",Orange:"Laranxa","Press Enter to type after or press Shift + Enter to type before the widget":"Prema Intro para escribir após ou prema Maiús + Intro para escribir antes do trebello",Previous:"Anterior",Purple:"Púrpura",Red:"Vermello",Redo:"Refacer","Remove Format":"Retirar o formato","Reversed order":"Orde inversa","Rich Text Editor":"Editor de texto mellorado","Select all":"Seleccionar todo","Show more items":"Amosar máis elementos",Square:"Cadrados","Start at":"Comezar en","Start index must be greater than 0.":"O índice de inicio debe ser maior que 0.",Strikethrough:"Riscado",Styles:"Estilos",Subscript:"Subíndice",Superscript:"Superíndice","Text styles":"Estilos de texto","To-do List":"Lista de cousas por facer","Toggle the circle list style":"Alternar o estilo da lista «círculos»","Toggle the decimal list style":"Alternar o estilo da lista «decimais»","Toggle the decimal with leading zero list style":"Activar/desactivar o estilo «decimais con cero á esquerda»","Toggle the disc list style":"Alternar o estilo da lista «discos»","Toggle the lower–latin list style":"Activar/desactivar o estilo da lista «letras minúsculas»","Toggle the lower–roman list style":"Activar/desactivar o estilo da lista «núm. romanos en minúscula»","Toggle the square list style":"Alternar o estilo da lista «cadrados»","Toggle the upper–latin list style":"Activar/desactivar o estilo da lista «letras maiúsculas»","Toggle the upper–roman list style":"Activar/desactivar o estilo da lista «núm. romanos en maiúscula»",Turquoise:"Turquesa",Underline:"Subliñado",Undo:"Desfacer","Upper-latin":"Letras maiúsculas","Upper-roman":"Núm, romanos en maiúscula",White:"Branco","Widget toolbar":"Barra de ferramentas de trebellos",Yellow:"Amarelo"});r.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/gu.js b/js/ckeditor5/translations/gu.js
new file mode 100644
index 000000000..7f229a47d
--- /dev/null
+++ b/js/ckeditor5/translations/gu.js
@@ -0,0 +1 @@
+(function(i){const n=i["gu"]=i["gu"]||{};n.dictionary=Object.assign(n.dictionary||{},{"%0 of %1":"",Bold:"ઘાટુ - બોલ્ડ્",Cancel:"",Code:"",Italic:"ત્રાંસુ - ઇટલિક્","Show more items":"",Strikethrough:"",Subscript:"",Superscript:"",Underline:"નીચે લિટી - અન્ડરલાઇન્"});n.getPluralForm=function(i){return i!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/he.js b/js/ckeditor5/translations/he.js
new file mode 100644
index 000000000..4197e9523
--- /dev/null
+++ b/js/ckeditor5/translations/he.js
@@ -0,0 +1 @@
+(function(e){const t=e["he"]=e["he"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 מתוך %1",Accept:"קבל",Aquamarine:"ירוק-כחלחל",Black:"שחור","Block styles":"סגנונות בלוקים",Blue:"כחול",Bold:"מודגש","Bulleted List":"רשימה מנוקדת","Bulleted list styles toolbar":"סרגל כלים של סגנונות רשימה עם תבליטים",Cancel:"ביטול",Circle:"עיגול",Code:"קוד",Decimal:"עשרונית","Decimal with leading zero":"עשרונית עם אפס מוביל","Dim grey":"אפור עמום",Disc:"עיגול מלא","Dropdown toolbar":"סרגל כלים נפתח","Edit block":"הגדרות בלוק","Editor block content toolbar":"סרגל כלים של תוכן בלוק של העורך","Editor contextual toolbar":"סרגל כלים הקשרי של העורך","Editor editing area: %0":"אזור עריכה של העורך: %0","Editor toolbar":"סרגל הכלים",Green:"ירוק",Grey:"אפור",HEX:"HEX","HTML object":"אובייקט HTML","Insert paragraph after block":"הוספת פסקה מתחת","Insert paragraph before block":"הוספת פסקה מעל",Italic:"נטוי","Light blue":"כחול בהיר","Light green":"ירוק בהיר","Light grey":"אפור בהיר","List properties":"אפשרויות רשימה","Lower-latin":"אותיות לטיניות קטנות","Lower–roman":"אותיות רומיות קטנות","Multiple styles":"סגנונות מרובים",Next:"הבא","Numbered List":"רשימה ממוספרת","Numbered list styles toolbar":"סרגל כלים של סגנונות רשימה ממוספרת",Orange:"כתום","Press Enter to type after or press Shift + Enter to type before the widget":"לחץ Enter כדי להקליד לפני היישומון או Shift + Enter כדי להקליד אחריו",Previous:"הקודם",Purple:"סגול",Red:"אדום",Redo:"ביצוע מחדש","Remove Format":"הסרת עיצוב","Reversed order":"סדר הפוך","Rich Text Editor":"עורך טקסט עשיר","Select all":"בחר הכל","Show more items":"הצג פריטים נוספים",Square:"ריבוע","Start at":"התחל ב-","Start index must be greater than 0.":"אינדקס ההתחלה חייב להיות גדול מ-0.",Strikethrough:"קו חוצה",Styles:"סגנונות",Subscript:"כתב תחתי",Superscript:"כתב עילי","Text styles":"עיצוב טקסט","To-do List":"רשימת מטלות","Toggle the circle list style":"החלף מצב סגנון רשימת מעגלים","Toggle the decimal list style":"החלף מצב סגנון רשימה עשרונית","Toggle the decimal with leading zero list style":"החלף מצב סגנון רשימה עשרונית עם אפס מוביל","Toggle the disc list style":"החלף מצב סגנון רשימת דיסקות","Toggle the lower–latin list style":"החלף מצב סגנון רשימה עם אותיות לטיניות קטנות","Toggle the lower–roman list style":"החלף מצב סגנון רשימה עם ספרות רומיות קטנות","Toggle the square list style":"החלף מצב סגנון רשימת ריבועים","Toggle the upper–latin list style":"החלף מצב סגנון רשימה עם אותיות לטיניות גדולות","Toggle the upper–roman list style":"החלף מצב סגנון רשימה עם ספרות רומיות גדולות",Turquoise:"טורקיז",Underline:"קו תחתון",Undo:"ביטול","Upper-latin":"אותיות לטיניות גדולות","Upper-roman":"אותיות רומיות גדולות",White:"לבן","Widget toolbar":"סרגל יישומון",Yellow:"צהוב"});t.getPluralForm=function(e){return e==1&&e%1==0?0:e==2&&e%1==0?1:e%10==0&&e%1==0&&e>10?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/hi.js b/js/ckeditor5/translations/hi.js
new file mode 100644
index 000000000..06dd4dfe0
--- /dev/null
+++ b/js/ckeditor5/translations/hi.js
@@ -0,0 +1 @@
+(function(e){const t=e["hi"]=e["hi"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"स्वीकार करें",Aquamarine:"Aquamarine",Black:"Black","Block styles":"ब्लॉक स्टाइल्स",Blue:"Blue",Bold:"Bold","Bulleted List":"Bulleted List","Bulleted list styles toolbar":"Bulleted list styles toolbar",Cancel:"Cancel",Circle:"Circle",Code:"Code",Decimal:"Decimal","Decimal with leading zero":"Decimal with leading zero","Dim grey":"Dim grey",Disc:"Disc","Dropdown toolbar":"Dropdown toolbar","Edit block":"Edit block","Editor block content toolbar":"एडीटर ब्लॉक कंटेंट टूलबार","Editor contextual toolbar":"एडीटर कॉन्टेक्स्टूअल टूलबार","Editor editing area: %0":"संपादक संपादन क्षेत्र: %0","Editor toolbar":"Editor toolbar",Green:"Green",Grey:"Grey",HEX:"HEX","HTML object":"एचटीएमएल वस्तु","Insert paragraph after block":"Insert paragraph after block","Insert paragraph before block":"Insert paragraph before block",Italic:"Italic","Light blue":"Light blue","Light green":"Light green","Light grey":"Light grey","List properties":"प्रॉपर्टीज़ को लिस्ट करें","Lower-latin":"Lower-latin","Lower–roman":"Lower–roman","Multiple styles":"कई स्टाइल्स",Next:"Next","Numbered List":"Numbered List","Numbered list styles toolbar":"Numbered list styles toolbar",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"विजेट के बाद टाइप करने के लिए एंटर  दबाएं या पहले टाइप करने के लिए शिफ्ट+एंटर दबाएं",Previous:"Previous",Purple:"Purple",Red:"Red",Redo:"Redo","Remove Format":"Remove Format","Reversed order":"रिवर्स किया गया क्रम","Rich Text Editor":"Rich Text Editor","Select all":"Select all","Show more items":"Show more items",Square:"Square","Start at":"शुरू करे इस पर","Start index must be greater than 0.":"स्टार्ट इंडेक्स 0 से अधिक होना चाहिए.",Strikethrough:"Strikethrough",Styles:"स्टाइल्स",Subscript:"Subscript",Superscript:"Superscript","Text styles":"टेक्स्ट स्टाइल्स","To-do List":"To-do List","Toggle the circle list style":"Toggle the circle list style","Toggle the decimal list style":"Toggle the decimal list style","Toggle the decimal with leading zero list style":"Toggle the decimal with leading zero list style","Toggle the disc list style":"Toggle the disc list style","Toggle the lower–latin list style":"Toggle the lower–latin list style","Toggle the lower–roman list style":"Toggle the lower–roman list style","Toggle the square list style":"Toggle the square list style","Toggle the upper–latin list style":"Toggle the upper–latin list style","Toggle the upper–roman list style":"Toggle the upper–roman list style",Turquoise:"Turquoise",Underline:"Underline",Undo:"Undo","Upper-latin":"Upper-latin","Upper-roman":"Upper-roman",White:"White","Widget toolbar":"Widget toolbar",Yellow:"Yellow"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/hr.js b/js/ckeditor5/translations/hr.js
new file mode 100644
index 000000000..423d2eae5
--- /dev/null
+++ b/js/ckeditor5/translations/hr.js
@@ -0,0 +1 @@
+(function(e){const i=e["hr"]=e["hr"]||{};i.dictionary=Object.assign(i.dictionary||{},{"%0 of %1":"%0 od %1",Accept:"Prihvati",Aquamarine:"Akvamarin",Black:"Crna","Block styles":"Blok stilovi",Blue:"Plava",Bold:"Podebljano","Bulleted List":"Obična lista","Bulleted list styles toolbar":"Alatna traka za stilove obične liste",Cancel:"Poništi",Circle:"Krug",Code:"Kod",Decimal:"Decimalni","Decimal with leading zero":"Decimalni s vodećom nulom","Dim grey":"Tamnosiva",Disc:"Disk","Dropdown toolbar":"Traka padajućeg izbornika","Edit block":"Uredi blok","Editor block content toolbar":"Alatna traka sadržaja uređivača blokova","Editor contextual toolbar":"Kontekstualna alatna traka uređivača","Editor editing area: %0":"Područje Editora: %0","Editor toolbar":"Traka uređivača",Green:"Zelena",Grey:"Siva",HEX:"","HTML object":"HTML objekt","Insert paragraph after block":"Umetni odlomak poslije bloka","Insert paragraph before block":"Umetni odlomak prije bloka",Italic:"Ukošeno","Light blue":"Svijetloplava","Light green":"Svijetlozelena","Light grey":"Svijetlosiva","List properties":"Svojstva liste","Lower-latin":"Mala slova","Lower–roman":"Mali rimski brojevi","Multiple styles":"Više stilova",Next:"Sljedeći","Numbered List":"Brojčana lista","Numbered list styles toolbar":"Alatna traka za stilove brojčane liste",Orange:"Narančasta","Press Enter to type after or press Shift + Enter to type before the widget":"Pritisnite Enter za upisivanje nakon ili pritisnite Shift + Enter za upisivanje prije widgeta",Previous:"Prethodni",Purple:"Ljubičasta",Red:"Crvena",Redo:"Ponovi","Remove Format":"Ukloni format","Reversed order":"Obrnuti redoslijed","Rich Text Editor":"Rich Text Editor","Select all":"Odaberi sve","Show more items":"Prikaži više stavaka",Square:"Kvadrat","Start at":"Počni sa","Start index must be greater than 0.":"Početni indeks mora biti veći od 0.",Strikethrough:"Precrtano",Styles:"Stilovi",Subscript:"Indeks",Superscript:"Eksponent","Text styles":"Tekstualni stilovi","To-do List":"Lista zadataka","Toggle the circle list style":"Primjeni krug stil","Toggle the decimal list style":"Primjeni decimalni stil","Toggle the decimal with leading zero list style":"Primjeni decimalni stil s vodećom nulom","Toggle the disc list style":"Primjeni disk stil","Toggle the lower–latin list style":"Primjeni mala slova stil","Toggle the lower–roman list style":"Primjeni rimske brojeve mala slova stil","Toggle the square list style":"Primjeni kvadrat stil","Toggle the upper–latin list style":"Primjeni velika slova stil","Toggle the upper–roman list style":"Primjeni rimske brojeve velika slova stil",Turquoise:"Tirkizna",Underline:"Podcrtavanje",Undo:"Poništi","Upper-latin":"Velika slova","Upper-roman":"Veliki rimski brojevi",White:"Bijela","Widget toolbar":"Traka sa spravicama",Yellow:"Žuta"});i.getPluralForm=function(e){return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/hu.js b/js/ckeditor5/translations/hu.js
new file mode 100644
index 000000000..4b1cbd98d
--- /dev/null
+++ b/js/ckeditor5/translations/hu.js
@@ -0,0 +1 @@
+(function(e){const t=e["hu"]=e["hu"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 / %1",Accept:"Elfogad",Aquamarine:"Kékeszöld",Black:"Fekete","Block styles":"Blokkstílusok",Blue:"Kék",Bold:"Félkövér","Bulleted List":"Pontozott lista","Bulleted list styles toolbar":"Felsorolásos lista stílusú eszköztár",Cancel:"Mégsem",Circle:"Kör",Code:"Forráskód",Decimal:"Szám","Decimal with leading zero":"Nullával kezdődő szám","Dim grey":"Halvány szürke",Disc:"Korong","Dropdown toolbar":"Lenyíló eszköztár","Edit block":"Blokk szerkesztése","Editor block content toolbar":"Szerkesztő - tartalomblokk  eszköztár","Editor contextual toolbar":"Szerkesztő - szövegre vonatkozó eszköztár","Editor editing area: %0":"Szerkesztő szerkesztési területe: %0","Editor toolbar":"Szerkesztő eszköztár",Green:"Zöld",Grey:"Szürke",HEX:"HEX színkód","HTML object":"HTML objektum","Insert paragraph after block":"Bekezdés beszúrása utána","Insert paragraph before block":"Bekezdés beszúrása elé",Italic:"Dőlt","Light blue":"Világoskék","Light green":"Világoszöld","Light grey":"Világosszürke","List properties":"Lista tulajdonságai","Lower-latin":"Kisbetűs latin szám","Lower–roman":"Kisbetűs római szám","Multiple styles":"Többféle stílus",Next:"Következő","Numbered List":"Számozott lista","Numbered list styles toolbar":"Számozott lista stílusú eszköztár",Orange:"Narancs","Press Enter to type after or press Shift + Enter to type before the widget":"Az Enter billentyű megnyomásával a widget után, a Shift + Enter kombinációval pedig a widget előtt írhatja be a szöveget",Previous:"Előző",Purple:"Lila",Red:"Piros",Redo:"Újra","Remove Format":"Formázás eltávolítása","Reversed order":"Fordított sorrend","Rich Text Editor":"Bővített szövegszerkesztő","Select all":"Mindet kijelöl","Show more items":"További elemek",Square:"Négyzet","Start at":"Kezdőpont","Start index must be greater than 0.":"A kezdő index nagyobb kell legyen mint 0.",Strikethrough:"Áthúzott",Styles:"Stílusok",Subscript:"Alsó index",Superscript:"Felső index","Text styles":"Szövegstílusok","To-do List":"Tennivaló lista","Toggle the circle list style":"Kör stílusú lista bekapcsolása","Toggle the decimal list style":"Tizedesjegy stílusú lista bekapcsolása","Toggle the decimal with leading zero list style":"Zéróval kezdődő tizedesjegy stílusú lista bekapcsolása","Toggle the disc list style":"Korong stílusú lista bekapcsolása","Toggle the lower–latin list style":"Kis latin betűs stílusú lista bekapcsolása","Toggle the lower–roman list style":"Kis római számok stílusú lista bekapcsolása","Toggle the square list style":"Négyzet stílusú lista bekapcsolása","Toggle the upper–latin list style":"Nagy latin betűs stílusú lista bekapcsolása","Toggle the upper–roman list style":"Nagy római számok stílusú lista bekapcsolása",Turquoise:"Türkiz",Underline:"Aláhúzott",Undo:"Visszavonás","Upper-latin":"Nagybetűs latin szám","Upper-roman":"Nagybetűs római szám",White:"Fehér","Widget toolbar":"Widget eszköztár",Yellow:"Sárga"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/id.js b/js/ckeditor5/translations/id.js
new file mode 100644
index 000000000..01479fa2f
--- /dev/null
+++ b/js/ckeditor5/translations/id.js
@@ -0,0 +1 @@
+(function(a){const e=a["id"]=a["id"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 dari %1",Accept:"Setuju",Aquamarine:"Biru laut",Black:"Hitam","Block styles":"Gaya blok",Blue:"Biru",Bold:"Tebal","Bulleted List":"Daftar Tak Berangka","Bulleted list styles toolbar":"Bilah alat gaya daftar bullet",Cancel:"Batal",Circle:"Lingkaran",Code:"Kode",Decimal:"Desimal","Decimal with leading zero":"Desimal dengan awalan nol","Dim grey":"Kelabu gelap",Disc:"Disk","Dropdown toolbar":"Alat dropdown","Edit block":"Sunting blok","Editor block content toolbar":"Bilah alat konten blok editor","Editor contextual toolbar":"Bilah alat kontekstual editor","Editor editing area: %0":"Area edit editor: %0","Editor toolbar":"Alat editor",Green:"Hijau",Grey:"Kelabu",HEX:"HEX","HTML object":"Objek HTML","Insert paragraph after block":"Tambahkan paragraf setelah blok","Insert paragraph before block":"Tambahkan paragraf sebelum blok",Italic:"Miring","Light blue":"Biru terang","Light green":"Hijau terang","Light grey":"Kelabu terang","List properties":"Properti daftar","Lower-latin":"Lower-latin","Lower–roman":"Lower–roman","Multiple styles":"Banyak gaya",Next:"Berikutnya","Numbered List":"Daftar Berangka","Numbered list styles toolbar":"Bilah alat gaya daftar angka",Orange:"Jingga","Press Enter to type after or press Shift + Enter to type before the widget":"Tekan Enter untuk mengetik setelah atau tekan Shift + Enter untuk mengetik sebelum widget",Previous:"Sebelumnya",Purple:"Ungu",Red:"Merah",Redo:"Lakukan lagi","Remove Format":"Hapus Format","Reversed order":"Urutan terbalik","Rich Text Editor":"Editor Teks Kaya","Select all":"Pilih semua","Show more items":"Tampilkan lebih banyak item",Square:"Kotak","Start at":"Mulai dari","Start index must be greater than 0.":"Indeks awal harus lebih besar dari 0.",Strikethrough:"Coret",Styles:"Gaya",Subscript:"Subskrip",Superscript:"Superskrip","Text styles":"Gaya teks","To-do List":"Daftar untuk-dikerjakan","Toggle the circle list style":"Alihkan gaya daftar circle","Toggle the decimal list style":"Alihkan gaya daftar decimal","Toggle the decimal with leading zero list style":"Alihkan gaya daftar decimal with leading zero","Toggle the disc list style":"Alihkan gaya daftar disc","Toggle the lower–latin list style":"Alihkan gaya daftar lower–latin","Toggle the lower–roman list style":"Alihkan gaya daftar lower–roman","Toggle the square list style":"Alihkan gaya daftar square","Toggle the upper–latin list style":"Alihkan gaya daftar upper–latin","Toggle the upper–roman list style":"Alihkan gaya daftar upper–roman",Turquoise:"Turkish",Underline:"Garis bawah",Undo:"Batal","Upper-latin":"Upper-latin","Upper-roman":"Upper-roman",White:"Putih","Widget toolbar":"Alat widget",Yellow:"Kuning"});e.getPluralForm=function(a){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/it.js b/js/ckeditor5/translations/it.js
new file mode 100644
index 000000000..cfdf0f359
--- /dev/null
+++ b/js/ckeditor5/translations/it.js
@@ -0,0 +1 @@
+(function(e){const i=e["it"]=e["it"]||{};i.dictionary=Object.assign(i.dictionary||{},{"%0 of %1":"%0 di %1",Accept:"Accetta",Aquamarine:"Aquamarina",Black:"Nero","Block styles":"Stili per blocchi",Blue:"Blu",Bold:"Grassetto","Bulleted List":"Elenco puntato","Bulleted list styles toolbar":"Barra degli strumenti con gli stili degli elenchi puntati",Cancel:"Annulla",Circle:"Cerchio",Code:"Codice",Decimal:"Numero","Decimal with leading zero":"Numero con zero anteposto","Dim grey":"Grigio tenue",Disc:"Disco","Dropdown toolbar":"Barra degli strumenti del menu a discesa","Edit block":"Modifica blocco","Editor block content toolbar":"Barra degli strumenti contestuale dell'editor del blocco","Editor contextual toolbar":"Barra degli strumenti contestuale dell'editor","Editor editing area: %0":"Area di modifica dell'editor: %0","Editor toolbar":"Barra degli strumenti dell'editor",Green:"Verde",Grey:"Grigio",HEX:"HEX","HTML object":"Oggetto HTML","Insert paragraph after block":"Inserisci paragrafo dopo blocco","Insert paragraph before block":"Inserisci paragrafo prima di blocco",Italic:"Corsivo","Light blue":"Azzurro","Light green":"Verde chiaro","Light grey":"Grigio chiaro","List properties":"Proprietà elenco","Lower-latin":"Lettera minuscola","Lower–roman":"Numero romano minuscolo","Multiple styles":"Stili multipli",Next:"Avanti","Numbered List":"Elenco numerato","Numbered list styles toolbar":"Barra degli strumenti con gli stili degli elenchi numerati",Orange:"Arancio","Press Enter to type after or press Shift + Enter to type before the widget":"Premere Invio per inserire dopo il widget o premere Maiusc + Invio per inserire prima del widget",Previous:"Indietro",Purple:"Porpora",Red:"Rosso",Redo:"Ripristina","Remove Format":"Rimuovi formato","Reversed order":"Ordine inverso","Rich Text Editor":"Editor di testo formattato","Select all":"Seleziona tutto","Show more items":"Mostra più elementi",Square:"Quadrato","Start at":"Inizia da","Start index must be greater than 0.":"L'indice iniziale deve essere maggiore di 0.",Strikethrough:"Barrato",Styles:"Stili",Subscript:"Pedice",Superscript:"Apice","Text styles":"Stili per testi","To-do List":"Elenco cose da fare","Toggle the circle list style":"Attiva/disattiva lo stile degli elenchi con cerchi","Toggle the decimal list style":"Attiva/disattiva lo stile degli elenchi con numeri","Toggle the decimal with leading zero list style":"Attiva/disattiva lo stile degli elenchi con numeri con zero anteposto","Toggle the disc list style":"Attiva/disattiva lo stile degli elenchi con dischi","Toggle the lower–latin list style":"Attiva/disattiva lo stile degli elenchi con lettere minuscole","Toggle the lower–roman list style":"Attiva/disattiva lo stile degli elenchi con numeri romani minuscoli","Toggle the square list style":"Attiva/disattiva lo stile degli elenchi con quadrati","Toggle the upper–latin list style":"Attiva/disattiva lo stile degli elenchi con lettere maiuscole","Toggle the upper–roman list style":"Attiva/disattiva lo stile degli elenchi con numeri romani maiuscoli",Turquoise:"Turchese",Underline:"Sottolineato",Undo:"Annulla","Upper-latin":"Lettera maiuscola","Upper-roman":"Numero romano maiuscolo",White:"Bianco","Widget toolbar":"Barra degli strumenti del widget",Yellow:"Giallo"});i.getPluralForm=function(e){return e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ja.js b/js/ckeditor5/translations/ja.js
new file mode 100644
index 000000000..0811392f8
--- /dev/null
+++ b/js/ckeditor5/translations/ja.js
@@ -0,0 +1 @@
+(function(e){const t=e["ja"]=e["ja"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0/%1",Accept:"同意します",Aquamarine:"薄い青緑",Black:"黒","Block styles":"ブロックスタイル",Blue:"青",Bold:"ボールド","Bulleted List":"箇条書きリスト","Bulleted list styles toolbar":"箇条書きリストスタイルのツールバー",Cancel:"キャンセル",Circle:"白い丸",Code:"コード",Decimal:"10進数の数値","Decimal with leading zero":"10進数の数値の前に0がつく","Dim grey":"暗い灰色",Disc:"黒い丸","Dropdown toolbar":"ドロップダウンツールバー","Edit block":"ブロックを編集","Editor block content toolbar":"エディター ブロック コンテンツ ツールバー","Editor contextual toolbar":"エディター コンテクスト ツールバー","Editor editing area: %0":"エディタ編集エリア：%0","Editor toolbar":"エディタツールバー",Green:"緑",Grey:"灰色",HEX:"HEX","HTML object":"HTMLオブジェクト","Insert paragraph after block":"ブロックの後にパラグラフを挿入","Insert paragraph before block":"ブロックの前にパラグラフを挿入",Italic:"イタリック","Light blue":"明るい青","Light green":"明るい緑","Light grey":"明るい灰色","List properties":"リストのプロパティ","Lower-latin":"小文字アルファベット","Lower–roman":"小文字ローマ数字","Multiple styles":"複数のスタイル",Next:"次へ","Numbered List":"番号付きリスト","Numbered list styles toolbar":"番号付きリストスタイルのツールバー",Orange:"オレンジ","Press Enter to type after or press Shift + Enter to type before the widget":"Enterを押してウィジェットの後に入力するか、Shift + Enterを押してウィジェットの前に入力してください",Previous:"前へ",Purple:"紫",Red:"赤",Redo:"やり直し","Remove Format":"フォーマットの削除","Reversed order":"逆順","Rich Text Editor":"リッチテキストエディター","Select all":"すべて選択","Show more items":"他の項目を表示",Square:"黒い四角","Start at":"開始数字","Start index must be greater than 0.":"開始インデックスは0より大きくなければいけません。",Strikethrough:"取り消し線",Styles:"スタイル",Subscript:"下付き文字",Superscript:"上付き文字","Text styles":"テキストスタイル","To-do List":"やることリスト","Toggle the circle list style":"白い丸リストスタイルを切り替える","Toggle the decimal list style":"10進数リストスタイルを切り替える","Toggle the decimal with leading zero list style":"10進数の数値の前に0がつくリストスタイルを切り替える","Toggle the disc list style":"黒い丸リストスタイルを切り替える","Toggle the lower–latin list style":"小文字アルファベットリストスタイルを切り替える","Toggle the lower–roman list style":"小文字ローマ数字リストスタイルを切り替える","Toggle the square list style":"黒い四角リストスタイルを切り替える","Toggle the upper–latin list style":"大文字アルファベットリストスタイルを切り替える","Toggle the upper–roman list style":"大文字ローマ数字リストスタイルを切り替える",Turquoise:"水色",Underline:"アンダーライン",Undo:"元に戻す","Upper-latin":"大文字アルファベット","Upper-roman":"大文字ローマ数字",White:"白","Widget toolbar":"ウィジェットツールバー",Yellow:"黄"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/jv.js b/js/ckeditor5/translations/jv.js
new file mode 100644
index 000000000..01ededd7f
--- /dev/null
+++ b/js/ckeditor5/translations/jv.js
@@ -0,0 +1 @@
+(function(e){const t=e["jv"]=e["jv"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 saking %1",Bold:"Kandhel","Bulleted List":"","Bulleted list styles toolbar":"",Cancel:"Batal",Circle:"Bunder",Code:"Kode",Decimal:"","Decimal with leading zero":"",Disc:"Kaset","HTML object":"Obyek HTML",Italic:"Miring","List properties":"","Lower-latin":"","Lower–roman":"","Numbered List":"","Numbered list styles toolbar":"","Reversed order":"Dipunwangsul","Show more items":"Tampilaken langkung kathah",Square:"Kotak","Start at":"Wiwit saking","Start index must be greater than 0.":"",Strikethrough:"Seratan dicoret",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Underline:"Garis ngandhap","Upper-latin":"","Upper-roman":""});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/km.js b/js/ckeditor5/translations/km.js
new file mode 100644
index 000000000..e9f6d5366
--- /dev/null
+++ b/js/ckeditor5/translations/km.js
@@ -0,0 +1 @@
+(function(e){const t=e["km"]=e["km"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"ដិត","Bulleted List":"បញ្ជី​ជា​ចំណុច","Bulleted list styles toolbar":"",Cancel:"បោះបង់",Circle:"",Code:"កូដ",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"ទ្រេត","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"បញ្ជី​ជា​លេខ","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"ធ្វើ​វិញ","Reversed order":"","Rich Text Editor":"កម្មវិធី​កែសម្រួល​អត្ថបទ​សម្បូរបែប","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"ឆូតកណ្ដាល",Subscript:"អក្សរ​តូចក្រោម",Superscript:"អក្សរ​តូចលើ","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"គូស​បន្ទាត់​ក្រោម",Undo:"លែង​ធ្វើ​វិញ","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/kn.js b/js/ckeditor5/translations/kn.js
new file mode 100644
index 000000000..b86eea748
--- /dev/null
+++ b/js/ckeditor5/translations/kn.js
@@ -0,0 +1 @@
+(function(e){const t=e["kn"]=e["kn"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"‍‍ದಪ್ಪ","Bulleted List":"‍‍ಬುಲೆಟ್ ಪಟ್ಟಿ","Bulleted list styles toolbar":"",Cancel:"ರದ್ದುಮಾಡು",Circle:"",Code:"",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"‍ಇಟಾಲಿಕ್","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"‍ಸಂಖ್ಯೆಯ ಪಟ್ಟಿ‍","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"‍ಮತ್ತೆ ಮಾಡು","Reversed order":"","Rich Text Editor":"‍ಸಮೃದ್ಧ ಪಠ್ಯ ಸಂಪಾದಕ‍‍","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"",Undo:"‍‍ರದ್ದು","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e>1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ko.js b/js/ckeditor5/translations/ko.js
new file mode 100644
index 000000000..2091eb9b1
--- /dev/null
+++ b/js/ckeditor5/translations/ko.js
@@ -0,0 +1 @@
+(function(e){const t=e["ko"]=e["ko"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 / %1",Accept:"수락",Aquamarine:"연한 청록색",Black:"검은색","Block styles":"블록 스타일",Blue:"파랑색",Bold:"굵게","Bulleted List":"불릿 목록","Bulleted list styles toolbar":"글머리 기호 목록 스타일 도구 모음",Cancel:"취소",Circle:"흰 원형",Code:"코드",Decimal:"십진수","Decimal with leading zero":"앞에 0이 붙는 십진수","Dim grey":"진한 회색",Disc:"검은 원형","Dropdown toolbar":"드롭다운 툴바","Edit block":"편집 영역","Editor block content toolbar":"편집기 영역 내용 툴바","Editor contextual toolbar":"편집기 문맥 툴바","Editor editing area: %0":"편집기 편집 영역: %0","Editor toolbar":"편집기 툴바",Green:"초록색",Grey:"회색",HEX:"HEX","HTML object":"HTML 오브젝트","Insert paragraph after block":"블록 뒤에 단락 삽입","Insert paragraph before block":"블록 앞에 단락 삽입",Italic:"기울임꼴","Light blue":"연한 파랑색","Light green":"연한 초록색","Light grey":"밝은 회색","List properties":"목록 속성","Lower-latin":"소문자 알파벳","Lower–roman":"소문자 로마자","Multiple styles":"다중 스타일",Next:"다음","Numbered List":"번호 목록","Numbered list styles toolbar":"번호 목록 스타일 도구 모음",Orange:"주황색","Press Enter to type after or press Shift + Enter to type before the widget":"엔터를 눌러서 위젯 뒤에 입력하거나 시프트 + 엔터를 눌러서 위젯 앞에 입력하세요",Previous:"이전",Purple:"보라색",Red:"빨간색",Redo:"다시 실행","Remove Format":"서식 지우기","Reversed order":"역순","Rich Text Editor":"서식 있는 텍스트 편집기","Select all":"전체 선택","Show more items":"더보기",Square:"검은 사각형","Start at":"시작 번호","Start index must be greater than 0.":"시작 번호는 0보다 커야 합니다.",Strikethrough:"취소선",Styles:"스타일",Subscript:"아래 첨자",Superscript:"위 첨자","Text styles":"텍스트 스타일","To-do List":"확인 목록","Toggle the circle list style":"검은 원형 목록 스타일 전환","Toggle the decimal list style":"십진수 목록 스타일 전환","Toggle the decimal with leading zero list style":"앞에 0이 붙는 십진수 목록 스타일 전환","Toggle the disc list style":"흰 원형 목록 스타일 전환","Toggle the lower–latin list style":"소문자 알파벳 목록 스타일 전환","Toggle the lower–roman list style":"소문자 로마자 목록 스타일 전환","Toggle the square list style":"검은 사각형 목록 스타일 전환","Toggle the upper–latin list style":"대문자 알파벳 목록 스타일 전환","Toggle the upper–roman list style":"대문자 로마자 목록 스타일 전환",Turquoise:"청록색",Underline:"밑줄",Undo:"실행 취소","Upper-latin":"대문자 알파벳","Upper-roman":"대문자 로마자",White:"흰색","Widget toolbar":"위젯 툴바",Yellow:"노랑색"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ku.js b/js/ckeditor5/translations/ku.js
new file mode 100644
index 000000000..cb4126d0c
--- /dev/null
+++ b/js/ckeditor5/translations/ku.js
@@ -0,0 +1 @@
+(function(e){const t=e["ku"]=e["ku"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 لە %1",Accept:"",Aquamarine:"شینی دەریایی",Black:"ڕەش",Blue:"شین",Bold:"قەڵەو","Bulleted List":"لیستەی خاڵەیی","Bulleted list styles toolbar":"",Cancel:"هەڵوەشاندنەوە",Circle:"",Code:"کۆد",Decimal:"","Decimal with leading zero":"","Dim grey":"ڕەساسی تاریک",Disc:"","Dropdown toolbar":"تووڵامرازی لیستەیی","Edit block":"دەستکاری بلۆک","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"تووڵامرازی دەسکاریکەر",Green:"سەوز",Grey:"ڕەساسی",HEX:"","Insert paragraph after block":"","Insert paragraph before block":"",Italic:"لار","Light blue":"شینی ڕووناک","Light green":"سەوزی ڕووناک","Light grey":"ڕەساسی ڕووناک","List properties":"","Lower-latin":"","Lower–roman":"",Next:"دواتر","Numbered List":"لیستەی ژمارەیی","Numbered list styles toolbar":"",Orange:"پرتەقاڵی","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"پێشتر",Purple:"مۆر",Red:"سور",Redo:"هەلگەڕاندنەوە","Remove Format":"لابردنی شێواز","Reversed order":"","Rich Text Editor":"سەرنوسەری دەقی بەپیت","Show more items":"بڕگەی زیاتر نیشانبدە",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"هێڵ بەسەرداهاتوو",Subscript:"ژێرنووس",Superscript:"سەرنووس","To-do List":"لیستەی کردن","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"شینی ئاسمانی",Underline:"ژێرهێڵ",Undo:"وەک خۆی لێ بکەوە","Upper-latin":"","Upper-roman":"",White:"سپی","Widget toolbar":"تووڵامرازی ویدجێت",Yellow:"زەرد"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/lt.js b/js/ckeditor5/translations/lt.js
new file mode 100644
index 000000000..80bc0ca2b
--- /dev/null
+++ b/js/ckeditor5/translations/lt.js
@@ -0,0 +1 @@
+(function(i){const t=i["lt"]=i["lt"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 iš %1",Accept:"Priimti",Aquamarine:"Aquamarine",Black:"Juoda","Block styles":"Blokuoti stilius",Blue:"Mėlyna",Bold:"Paryškintas","Bulleted List":"Sąrašas","Bulleted list styles toolbar":"Ženklinto sąrašo stilių įrankių juosta",Cancel:"Atšaukti",Circle:"Apskritimas",Code:"Kodas",Decimal:"Dešimtainis","Decimal with leading zero":"Dešimtainis su nuliu priekyje","Dim grey":"Pilkšva",Disc:"Diskas","Dropdown toolbar":"Įrankių juosta pasirenkamajame sąraše","Edit block":"Redaguoti bloką","Editor block content toolbar":"Redaktoriaus bloko turinio įrankių juosta","Editor contextual toolbar":"Redaktoriaus kontekstinė įrankių juosta","Editor editing area: %0":"Redaktoriaus redagavimo sritis: %0","Editor toolbar":"Redaktoriaus įrankių juosta",Green:"Žalia",Grey:"Pilka",HEX:"Šešioliktainė reikšmė (angl. HEX)","HTML object":"HTML object","Insert paragraph after block":"Įkelti pastraipą po bloko","Insert paragraph before block":"Įkelti pastraipą prieš bloką",Italic:"Kursyvas","Light blue":"Šviesiai mėlyna","Light green":"Šviesiai žalia","Light grey":"Šviesiai pilka","List properties":"Vardyti ypatybes","Lower-latin":"žemesnysis-lotyniškas","Lower–roman":"žemesnysis-romėniškas","Multiple styles":"Daug stilių",Next:"Kitas","Numbered List":"Numeruotas rąrašas","Numbered list styles toolbar":"Numeruoto sąrašo stilių įrankių juosta",Orange:"Oranžinė","Press Enter to type after or press Shift + Enter to type before the widget":"Paspauskite Enter, jei norite rašyti po valdiklio, arba paspauskite Shift + Enter, jei norite rašyti prieš valdiklį.",Previous:"Buvęs",Purple:"Violetinė",Red:"Raudona",Redo:"Pirmyn","Remove Format":"Naikinti formatavimą","Reversed order":"Atvirkštinė tvarka","Rich Text Editor":"Raiškiojo teksto redaktorius","Select all":"Pasirinkti viską","Show more items":"Rodyti daugiau elementų",Square:"Kvadratas","Start at":"Pradėti nuo","Start index must be greater than 0.":"Pradžios indeksas turi būti didesnis nei 0.",Strikethrough:"Perbrauktas",Styles:"Stiliai",Subscript:"Žemiau",Superscript:"Aukščiau","Text styles":"Teksto stiliai","To-do List":"Užduočių sąrašas","Toggle the circle list style":"Perjungti ovalų sąrašo stilių","Toggle the decimal list style":"Perjungti dešimtainį sąrašo stilių","Toggle the decimal with leading zero list style":"Perjungti dešimtainį sąrašo su nuliu priekyje stilių","Toggle the disc list style":"Perjungti diskinį sąrašo stilių","Toggle the lower–latin list style":"Perjungti žemesnįjį lotyniško stiliaus sąrašą","Toggle the lower–roman list style":"Perjungti žemesnįjį romėniško stiliaus sąrašą","Toggle the square list style":"Perjungti kvadratinį sąrašo stilių","Toggle the upper–latin list style":"Perjungti aukštesnįjį lotyniško stiliaus sąrašą","Toggle the upper–roman list style":"Perjungti aukštesnįjį romėniško stiliaus sąrašą",Turquoise:"Turkio",Underline:"Pabrauktas",Undo:"Atgal","Upper-latin":"Viršutinis romėniškas","Upper-roman":"Viršutinis romėniškas",White:"Balta","Widget toolbar":"Valdiklių įrankių juosta",Yellow:"Geltona"});t.getPluralForm=function(i){return i%10==1&&(i%100>19||i%100<11)?0:i%10>=2&&i%10<=9&&(i%100>19||i%100<11)?1:i%1!=0?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/lv.js b/js/ckeditor5/translations/lv.js
new file mode 100644
index 000000000..1bae92916
--- /dev/null
+++ b/js/ckeditor5/translations/lv.js
@@ -0,0 +1 @@
+(function(t){const e=t["lv"]=t["lv"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 no %1",Accept:"Apstiprināt",Aquamarine:"Akvamarīns",Black:"Melns","Block styles":"Bloka stili",Blue:"Zils",Bold:"Trekns","Bulleted List":"Nenumurēts Saraksts","Bulleted list styles toolbar":"Nenumurēta saraksta stili",Cancel:"Atcelt",Circle:"Aplis",Code:"Kods",Decimal:"Cipari","Decimal with leading zero":"Decimālskaitļi sākot ar nulli","Dim grey":"Blāvi pelēks",Disc:"Disks","Dropdown toolbar":"Papildus izvēlnes rīkjosla","Edit block":"Labot bloku","Editor block content toolbar":"Rediģēšanas bloka satura rīkjosla","Editor contextual toolbar":"Redaktora konteksta rīkjosla","Editor editing area: %0":"Redaktora rediģēšanas zona: %0","Editor toolbar":"Redaktora rīkjosla",Green:"Zaļš",Grey:"Pelēks",HEX:"HEX Krāsu kods","HTML object":"HTML objekts","Insert paragraph after block":"Ievietot paragrāfu aiz bloka","Insert paragraph before block":"Ievietot paragrāfu pirms bloka",Italic:"Kursīvs","Light blue":"Gaiši zils","Light green":"Gaiši zaļš","Light grey":"Gaiši pelēks","List properties":"saraksta detaļas","Lower-latin":"mazie latīņu burti","Lower–roman":"mazie romiešu burti","Multiple styles":"Vairāki stili",Next:"Nākamā","Numbered List":"Numurēts Saraksts","Numbered list styles toolbar":"Numurēta saraksta stili",Orange:"Oranžs","Press Enter to type after or press Shift + Enter to type before the widget":"Nospiediet taustiņu Enter, lai rakstītu aiz logrīka, vai nospiediet taustiņu Shift + Enter, lai rakstītu pirms logrīka",Previous:"Iepriekšējā",Purple:"Violets",Red:"Sarkans",Redo:"Uz priekšu","Remove Format":"Noņemt formatējumu","Reversed order":"Pretēja secība","Rich Text Editor":"Bagātinātais Teksta Redaktors","Select all":"Izvēlēties visu","Show more items":"Parādīt vairāk vienumus",Square:"Kvadrāts","Start at":"Sākt no","Start index must be greater than 0.":"Indeksam jābūt lielākam par 0",Strikethrough:"Nosvītrots",Styles:"Stili",Subscript:"Apakšraksts",Superscript:"Augšraksts","Text styles":"Teksta stili","To-do List":"To-do Saraksts","Toggle the circle list style":"Pārslēgt apļveida saraksta stilu","Toggle the decimal list style":"Pārslēgt decimālskaitļu saraksta stilu","Toggle the decimal with leading zero list style":"Pārslēgt decimālskaitļu sākot ar nulli saraksta stilu","Toggle the disc list style":"Pārslēgt diskveida saraksta stilu","Toggle the lower–latin list style":"Pārslēgt mazo latīņu burtu saraksta stilu","Toggle the lower–roman list style":"Pārslēgt mazo romiešu burtu saraksta stilu","Toggle the square list style":"Pārslēgt kvadrātveida saraksta stilu","Toggle the upper–latin list style":"Pārslēgt lielo latīņu burtu saraksta stilu","Toggle the upper–roman list style":"Pārslēgt lielo romiešu burtu saraksta stilu",Turquoise:"Tirkīza",Underline:"Pasvītrots",Undo:"Atsaukt","Upper-latin":"lielie latīņu burti","Upper-roman":"lielie romiešu burti",White:"Balts","Widget toolbar":"Sīkrīku rīkjosla",Yellow:"Dzeltens"});e.getPluralForm=function(t){return t%10==1&&t%100!=11?0:t!=0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ms.js b/js/ckeditor5/translations/ms.js
new file mode 100644
index 000000000..2c6e3bb45
--- /dev/null
+++ b/js/ckeditor5/translations/ms.js
@@ -0,0 +1 @@
+(function(a){const e=a["ms"]=a["ms"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"%0 daripada %1",Accept:"Terima",Aquamarine:"Akuamarin",Black:"Hitam","Block styles":"Gaya blok",Blue:"Biru",Bold:"Tebal","Bulleted List":"Senarai Berbulet","Bulleted list styles toolbar":"Bar capaian gaya senarai berbulet",Cancel:"Batal",Circle:"Bula",Code:"Kod",Decimal:"Perpuluhan","Decimal with leading zero":"Perpuluhan dengan kosong pendahulu","Dim grey":"Kelabu malap",Disc:"Cakera","Dropdown toolbar":"Bar alat capaian tetingkap","Edit block":"Sunting blok","Editor block content toolbar":"Bar alat sekat kandungan editor","Editor contextual toolbar":"Bar alat kontekstual editor","Editor editing area: %0":"Ruang suntingan editor: %0","Editor toolbar":"Bar alat capaian suntingan",Green:"Hijau",Grey:"Kelabu",HEX:"HEX","HTML object":"Objek HTML","Insert paragraph after block":"Masukkan perenggan sebelum blok","Insert paragraph before block":"Masukkan perenggan sebelum blok",Italic:"Italik","Light blue":"Biru cerah","Light green":"Hijau cerah","Light grey":"Kelabu cerah","List properties":"Senarai sifat","Lower-latin":"Latin bawah","Lower–roman":"Roman bawah","Multiple styles":"Gaya berbilang",Next:"Seterusnya","Numbered List":"Senarai Bernombor","Numbered list styles toolbar":"Bar alat capaian gaya senarai bernombor",Orange:"Oren","Press Enter to type after or press Shift + Enter to type before the widget":"Tekan Enter untuk menaip selepas atau tekan Shift + Enter untuk menaip sebelum widget",Previous:"Sebelumnya",Purple:"Ungu",Red:"Merah",Redo:"Buat semula","Remove Format":"Buang Format","Reversed order":"Susunan terbalik","Rich Text Editor":"Penyunting Teks Kaya","Select all":"Pilih seterusnya","Show more items":"Tunjukkan item lain",Square:"Petak","Start at":"Mula pada","Start index must be greater than 0.":"Indeks mula hendaklah lebih besar daripada 0.",Strikethrough:"Garis lorek",Styles:"Gaya",Subscript:"Subskrip",Superscript:"Superskrip","Text styles":"Gaya teks","To-do List":"Senarai Untuk Dilakukan","Toggle the circle list style":"Buka gaya senarai bulatan","Toggle the decimal list style":"Buka gaya senarai titik perpuluhan","Toggle the decimal with leading zero list style":"Buka titik perpuluhan dengan gaya senarai kosong pendahulu","Toggle the disc list style":"Buka gaya senarai cakera","Toggle the lower–latin list style":"Buka gaya senarai latin bawah","Toggle the lower–roman list style":"Buka gaya senarai roman bawah","Toggle the square list style":"Buka gaya senarai petak","Toggle the upper–latin list style":"Buka gaya senarai latin atas","Toggle the upper–roman list style":"Buka gaya senarai roman atas",Turquoise:"Firus",Underline:"Garis bawah",Undo:"Buat asal","Upper-latin":"Latin atas","Upper-roman":"Roman atas",White:"Putih","Widget toolbar":"Bar alat capaian widget",Yellow:"Kuning"});e.getPluralForm=function(a){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/nb.js b/js/ckeditor5/translations/nb.js
new file mode 100644
index 000000000..2106419e4
--- /dev/null
+++ b/js/ckeditor5/translations/nb.js
@@ -0,0 +1 @@
+(function(e){const t=e["nb"]=e["nb"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"",Blue:"",Bold:"Fet","Bulleted List":"Punktmerket liste","Bulleted list styles toolbar":"",Cancel:"Avbryt",Circle:"",Code:"Kode",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"",Italic:"Kursiv","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"Nummerert liste","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"Gjør om","Reversed order":"","Rich Text Editor":"Rikteksteditor","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Gjennomstreking",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"Understreking",Undo:"Angre","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ne.js b/js/ckeditor5/translations/ne.js
new file mode 100644
index 000000000..e1a2b2322
--- /dev/null
+++ b/js/ckeditor5/translations/ne.js
@@ -0,0 +1 @@
+(function(e){const t=e["ne"]=e["ne"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 मध्ये %1",Accept:"",Aquamarine:"अव्कवामरिन",Black:"कालो",Blue:"निलो",Bold:"बोल्ड","Bulleted List":"गोली चिन्ह अङ्कित सूची","Bulleted list styles toolbar":"",Cancel:"रद्द गर्नुहोस्",Circle:"",Code:"कोड",Decimal:"","Decimal with leading zero":"","Dim grey":"धमिलो खैरो",Disc:"","Dropdown toolbar":"","Edit block":"ब्लक सम्पादन गर्न","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"हरियो",Grey:"खैरो",HEX:"",Italic:"इटालिक","Light blue":"हल्का निलो","Light green":"हल्का हरियो","Light grey":"हल्का खैरो","List properties":"","Lower-latin":"","Lower–roman":"",Next:"अर्को","Numbered List":"सूचीबद्ध सूची","Numbered list styles toolbar":"",Orange:"सुन्तला रंग",Previous:"अघिल्लो",Purple:"बैंगनी रंग",Red:"रातो",Redo:"रिडु","Remove Format":"ढाँचा हटाउनुहोस्","Reversed order":"","Rich Text Editor":"धनी पाठ सम्पादक","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"स्ट्राइकथ्रू",Subscript:"सबस्क्रिप्ट",Superscript:"सुपरस्क्रिप्ट","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"त्रकोइस",Underline:"रेखांकन",Undo:"पूर्ववत","Upper-latin":"","Upper-roman":"",White:"सेतो",Yellow:"पहेंलो"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/nl.js b/js/ckeditor5/translations/nl.js
new file mode 100644
index 000000000..b8eb45c48
--- /dev/null
+++ b/js/ckeditor5/translations/nl.js
@@ -0,0 +1 @@
+(function(e){const t=e["nl"]=e["nl"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 van %1",Accept:"Accepteren",Aquamarine:"Aquamarijn",Black:"Zwart","Block styles":"Blok stijlen",Blue:"Blauw",Bold:"Vet","Bulleted List":"Ongenummerde lijst","Bulleted list styles toolbar":"Toolbar voor stijlen van opsommingslijsten",Cancel:"Annuleren",Circle:"Cirkel",Code:"Code",Decimal:"Decimaal","Decimal with leading zero":"Decimaal voorafgegaan door een nul","Dim grey":"Gedimd grijs",Disc:"Schijf","Dropdown toolbar":"Drop-down werkbalk","Edit block":"Blok aanpassen","Editor block content toolbar":"Inhoud werkbalk voor editorblok","Editor contextual toolbar":"Contextuele werkbalk van editor","Editor editing area: %0":"Bewerkingsgebied: %0","Editor toolbar":"Editor welkbalk",Green:"Groen",Grey:"Grijs",HEX:"HEX","HTML object":"HTML object","Insert paragraph after block":"Voeg paragraaf toe na blok","Insert paragraph before block":"Voeg paragraaf toe voor blok",Italic:"Cursief","Light blue":"Lichtblauw","Light green":"Lichtgroen","Light grey":"Lichtgrijs","List properties":"Lijsteigenschappen","Lower-latin":"Kleine Latijnse letters","Lower–roman":"Kleine Romeinse cijfers","Multiple styles":"Meerdere stijlen",Next:"Volgende","Numbered List":"Genummerde lijst","Numbered list styles toolbar":"Toolbar voor stijlen van genummerde lijsten",Orange:"Oranje","Press Enter to type after or press Shift + Enter to type before the widget":"Druk op Enter om na de widget te typen of druk op Shift + Enter om vóór de widget te typen",Previous:"Vorige",Purple:"Paars",Red:"Rood",Redo:"Opnieuw","Remove Format":"Verwijder opmaak","Reversed order":"Omgekeerde volgorde","Rich Text Editor":"Tekstbewerker","Select all":"Selecteer alles","Show more items":"Meer items weergeven",Square:"Vierkant","Start at":"Begin op","Start index must be greater than 0.":"Begin van index moet groter zijn dan 0.",Strikethrough:"Doorhalen",Styles:"Stijlen",Subscript:"Subscript",Superscript:"Superscript","Text styles":"Tekst stijlen","To-do List":"To-do lijst","Toggle the circle list style":"Schakel de stijl van lijsten met cirkel in","Toggle the decimal list style":"Schakel de stijl van lijsten met cijfers in","Toggle the decimal with leading zero list style":"Schakel de stijl van lijsten met cijfers voorafgegaan door een nul in","Toggle the disc list style":"Schakel de stijl van lijsten met bulletpoint in","Toggle the lower–latin list style":"Schakel de stijl van lijsten met kleine Latijnse letters in","Toggle the lower–roman list style":"Schakel de stijl van lijsten met kleine Romeinse cijfers in","Toggle the square list style":"Schakel de stijl van lijsten met vierkant in","Toggle the upper–latin list style":"Schakel de stijl van lijsten met Latijnse hoofdletters in","Toggle the upper–roman list style":"Schakel de stijl van lijsten met grote Romeinse cijfers in",Turquoise:"Turquoise",Underline:"Onderlijnen",Undo:"Ongedaan maken","Upper-latin":"Latijnse hoofdletters","Upper-roman":"Grote Romeinse cijfers",White:"Wit","Widget toolbar":"Widget werkbalk",Yellow:"Geel"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/no.js b/js/ckeditor5/translations/no.js
new file mode 100644
index 000000000..bb5be5072
--- /dev/null
+++ b/js/ckeditor5/translations/no.js
@@ -0,0 +1 @@
+(function(e){const t=e["no"]=e["no"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 av %1",Accept:"Godta",Aquamarine:"Akvamarin",Black:"Svart","Block styles":"Blokkstiler",Blue:"Blå",Bold:"Fet","Bulleted List":"Punktliste","Bulleted list styles toolbar":"Verktøylinje for punktlistestiler",Cancel:"Avbryt",Circle:"Sirkel",Code:"Kode",Decimal:"Nummer","Decimal with leading zero":"Nummer med foranstilt null","Dim grey":"Svak grå",Disc:"Disk","Dropdown toolbar":"Verktøylinje for nedtrekksliste","Edit block":"Rediger blokk","Editor block content toolbar":"Verktøylinje for blokkinnhold i redigeringsverktøy","Editor contextual toolbar":"Verktøylinje for kontekst i redigeringsverktøy","Editor editing area: %0":"Redigeringsområde for redigeringsverktøyet: %0","Editor toolbar":"Verktøylinje for redigeringsverktøy",Green:"Grønn",Grey:"Grå",HEX:"HEX","HTML object":"HTML-objekt","Insert paragraph after block":"Sett inn paragraf etter blokk","Insert paragraph before block":"Sett inn paragraf foran blokk",Italic:"Kursiv","Light blue":"Lyseblå","Light green":"Lysegrønn","Light grey":"Lysegrå","List properties":"Listeegenskaper","Lower-latin":"Små latinske tegn","Lower–roman":"Små romertall","Multiple styles":"Multiple stiler",Next:"Neste","Numbered List":"Nummerert liste","Numbered list styles toolbar":"Verktøylinje for stiler for nummererte lister",Orange:"Oransje","Press Enter to type after or press Shift + Enter to type before the widget":"Trykk Enter for å skrive etter eller trykk Shift + Enter for å skrive før widgeten",Previous:"Forrige",Purple:"Lilla",Red:"Rød",Redo:"Gjør om","Remove Format":"Fjern formatering","Reversed order":"Motsatt rekkefølge","Rich Text Editor":"Tekstredigeringsverktøy for rik tekst","Select all":"Velg alt ","Show more items":"Vis flere elementer",Square:"Firkant","Start at":"Start ved","Start index must be greater than 0.":"Startindeks må være større enn 0.",Strikethrough:"Gjennomstreket",Styles:"Stiler",Subscript:"Senket skrift",Superscript:"Hevet skrift","Text styles":"Tekststiler","To-do List":"Oppgaveliste","Toggle the circle list style":"Veksle sirkellistestil","Toggle the decimal list style":"Veksle nummerlistestil","Toggle the decimal with leading zero list style":"Veksle listestilen med nummer med foranstilt null","Toggle the disc list style":"Veksle disklistestil","Toggle the lower–latin list style":"Veksle listestilen med små latinske tegn","Toggle the lower–roman list style":"Veksle listestilen med små romertall","Toggle the square list style":"Veksle firkantlistestil","Toggle the upper–latin list style":"Veksle listestilen med store latinske tegn","Toggle the upper–roman list style":"Veksle listestilen med store romertall",Turquoise:"Turkis",Underline:"Understreket",Undo:"Angre","Upper-latin":"Store latinske tegn","Upper-roman":"Store romertall",White:"Hvit","Widget toolbar":"Widget verktøylinje ",Yellow:"Gul"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/oc.js b/js/ckeditor5/translations/oc.js
new file mode 100644
index 000000000..527911d43
--- /dev/null
+++ b/js/ckeditor5/translations/oc.js
@@ -0,0 +1 @@
+(function(i){const o=i["oc"]=i["oc"]||{};o.dictionary=Object.assign(o.dictionary||{},{"%0 of %1":"",Bold:"Gras",Cancel:"Anullar",Code:"",Italic:"Italica","Show more items":"",Strikethrough:"",Subscript:"",Superscript:"",Underline:""});o.getPluralForm=function(i){return i>1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/pl.js b/js/ckeditor5/translations/pl.js
new file mode 100644
index 000000000..99d0671c6
--- /dev/null
+++ b/js/ckeditor5/translations/pl.js
@@ -0,0 +1 @@
+(function(e){const t=e["pl"]=e["pl"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 z %1",Accept:"Zaakceptuj",Aquamarine:"Akwamaryna",Black:"Czarny","Block styles":"Style tekstu blokowego",Blue:"Niebieski",Bold:"Pogrubienie","Bulleted List":"Lista wypunktowana","Bulleted list styles toolbar":"Pasek z narzędziami: style listy z punktorami",Cancel:"Anuluj",Circle:"Kółko",Code:"Kod",Decimal:"Dziesiętne","Decimal with leading zero":"Dziesiętne z zerem wiodącym","Dim grey":"Ciemnoszary",Disc:"Dysk","Dropdown toolbar":"Rozwijany pasek narzędzi","Edit block":"Edytuj blok","Editor block content toolbar":"Pasek zadań treści blokowej edytora","Editor contextual toolbar":"Kontekstowy pasek zadań edytora","Editor editing area: %0":"Obszar edycji edytora: %0","Editor toolbar":"Pasek narzędzi edytora",Green:"Zielony",Grey:"Szary",HEX:"SZESNASTKOWY","HTML object":"Obiekt HTML","Insert paragraph after block":"Wstaw akapit po bloku","Insert paragraph before block":"Wstaw akapit przed blokiem",Italic:"Kursywa","Light blue":"Jasnoniebieski","Light green":"Jasnozielony","Light grey":"Jasnoszary","List properties":"Właściwości listy","Lower-latin":"Alfabet łaciński – małe litery","Lower–roman":"Małe cyfry rzymskie","Multiple styles":"Wiele stylów",Next:"Następny","Numbered List":"Lista numerowana","Numbered list styles toolbar":"Pasek z narzędziami: style listy numerowanej",Orange:"Pomarańczowy","Press Enter to type after or press Shift + Enter to type before the widget":"Naciśnij Enter, aby pisać po widżecie, lub Shift + Enter, aby pisać przed widżetem",Previous:"Poprzedni",Purple:"Purpurowy",Red:"Czerwony",Redo:"Ponów","Remove Format":"Usuń formatowanie","Reversed order":"Odwrócona kolejność","Rich Text Editor":"Edytor tekstu sformatowanego","Select all":"Zaznacz wszystko","Show more items":"Pokaż więcej",Square:"Kwadrat","Start at":"Zacznij od","Start index must be greater than 0.":"Wartość początkowa musi być większa niż 0.",Strikethrough:"Przekreślenie",Styles:"Style",Subscript:"Indeks dolny",Superscript:"Indeks górny","Text styles":"Style tekstu","To-do List":"Lista rzeczy do zrobienia","Toggle the circle list style":"Włącz/wyłącz listę w stylu „kółko”","Toggle the decimal list style":"Włącz/wyłącz listę w stylu „dziesiętne”","Toggle the decimal with leading zero list style":"Włącz/wyłącz listę w stylu „dziesiętne z zerem wiodącym”","Toggle the disc list style":"Włącz/wyłącz listę w stylu „dysk”","Toggle the lower–latin list style":"Włącz/wyłącz listę w stylu „alfabet łaciński – małe litery”","Toggle the lower–roman list style":"Włącz/wyłącz listę w stylu „małe cyfry rzymskie”","Toggle the square list style":"Włącz/wyłącz listę w stylu „kwadrat”","Toggle the upper–latin list style":"Włącz/wyłącz listę w stylu „alfabet łaciński – wielkie litery”","Toggle the upper–roman list style":"Włącz/wyłącz listę w stylu „wielkie cyfry rzymskie”",Turquoise:"Turkusowy",Underline:"Podkreślenie",Undo:"Cofnij","Upper-latin":"Alfabet łaciński – wielkie litery","Upper-roman":"Wielkie cyfry rzymskie",White:"Biały","Widget toolbar":"Pasek widgetów",Yellow:"Żółty"});t.getPluralForm=function(e){return e==1?0:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?1:e!=1&&(e%10>=0&&e%10<=1)||e%10>=5&&e%10<=9||e%100>=12&&e%100<=14?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/pt-br.js b/js/ckeditor5/translations/pt-br.js
new file mode 100644
index 000000000..1bd876d8b
--- /dev/null
+++ b/js/ckeditor5/translations/pt-br.js
@@ -0,0 +1 @@
+(function(e){const r=e["pt-br"]=e["pt-br"]||{};r.dictionary=Object.assign(r.dictionary||{},{"%0 of %1":"%0 de %1",Accept:"Aceitar",Aquamarine:"Água-marinha",Black:"Preto","Block styles":"Estilos de bloco",Blue:"Azul",Bold:"Negrito","Bulleted List":"Lista com marcadores","Bulleted list styles toolbar":"Barra de ferramentas de estilos de lista com marcador",Cancel:"Cancelar",Circle:"Círculo",Code:"Código",Decimal:"Decimal","Decimal with leading zero":"Decimal com zero à esquerda","Dim grey":"Cinza escuro",Disc:"Disco","Dropdown toolbar":"Barra de Ferramentas da Lista Suspensa","Edit block":"Editor de bloco","Editor block content toolbar":"Barra de ferramentas de bloco do Editor","Editor contextual toolbar":"Barra de ferramentas contextuais do Editor","Editor editing area: %0":"Área de edição do editor: %0","Editor toolbar":"Ferramentas do Editor",Green:"Verde",Grey:"Cinza",HEX:"Hexadecimal","HTML object":"Objeto HTML","Insert paragraph after block":"Inserir parágrafo após o bloco","Insert paragraph before block":"Inserir parágrafo antes do bloco",Italic:"Itálico","Light blue":"Azul claro","Light green":"Verde claro","Light grey":"Cinza claro","List properties":"Propriedades da lista","Lower-latin":"Latim inferior","Lower–roman":"Romano inferior","Multiple styles":"Múltiplos estilos",Next:"Próximo","Numbered List":"Lista numerada","Numbered list styles toolbar":"Barra de ferramentas de estilos de lista numerada",Orange:"Laranja","Press Enter to type after or press Shift + Enter to type before the widget":"Pressione Enter para digitar depois ou pressione Shift + Enter para digitar antes do widget",Previous:"Anterior",Purple:"Púrpura",Red:"Vermelho",Redo:"Refazer","Remove Format":"Remover Formatação","Reversed order":"Ordem reversa","Rich Text Editor":"Editor de Formatação","Select all":"Selecionar tudo","Show more items":"Exibir mais itens",Square:"Quadrado","Start at":"Iniciar em","Start index must be greater than 0.":"O índice inicial deve ser maior que 0.",Strikethrough:"Tachado",Styles:"Estilos",Subscript:"Subscrito",Superscript:"Sobrescrito","Text styles":"Estilos de texto","To-do List":"Lista de Tarefas","Toggle the circle list style":"Alternar o estilo da lista de círculo","Toggle the decimal list style":"Alternar o estilo de lista decimal","Toggle the decimal with leading zero list style":"Alternar o decimal com estilo de lista zero à esquerda","Toggle the disc list style":"Alternar o estilo da lista de disco","Toggle the lower–latin list style":"Alternar o estilo de lista latina inferior","Toggle the lower–roman list style":"Alternar o estilo de lista romana inferior","Toggle the square list style":"Alternar o estilo de lista quadrada","Toggle the upper–latin list style":"Alternar o estilo de lista latino superior","Toggle the upper–roman list style":"Alternar o estilo de lista romana superior",Turquoise:"Turquesa",Underline:"Sublinhado",Undo:"Desfazer","Upper-latin":"Latim superior","Upper-roman":"Romano superior",White:"Branco","Widget toolbar":"Ferramentas de Widgets",Yellow:"Amarelo"});r.getPluralForm=function(e){return e==0||e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/pt.js b/js/ckeditor5/translations/pt.js
new file mode 100644
index 000000000..012e23faa
--- /dev/null
+++ b/js/ckeditor5/translations/pt.js
@@ -0,0 +1 @@
+(function(e){const o=e["pt"]=e["pt"]||{};o.dictionary=Object.assign(o.dictionary||{},{"%0 of %1":"%0 de %1",Accept:"Aceitar",Aquamarine:"Verde-azulado",Black:"Preto","Block styles":"Estilos de blocos",Blue:"Azul",Bold:"Negrito","Bulleted List":"Lista não ordenada","Bulleted list styles toolbar":"Barra de ferramentas de estilos de lista de itens",Cancel:"Cancelar",Circle:"Círculo",Code:"Código",Decimal:"Decimal","Decimal with leading zero":"Decimal com zero inicial","Dim grey":"Cinzento-escuro",Disc:"Disco","Dropdown toolbar":"Barra de ferramentas do dropdown","Edit block":"Editar bloco","Editor block content toolbar":"Barra de ferramentas de edição do conteúdo de blocos","Editor contextual toolbar":"Barra de ferramentas contextual de edição","Editor editing area: %0":"Área de edição do editor: %0","Editor toolbar":"Barra de ferramentas do editor",Green:"Verde",Grey:"Cinzento",HEX:"HEX","HTML object":"Objeto HTML","Insert paragraph after block":"Inserir parágrafo após o bloco","Insert paragraph before block":"Inserir parágrafo antes do bloco",Italic:"Itálico","Light blue":"Azul-claro","Light green":"Verde-claro","Light grey":"Cinzento-claro","List properties":"Propriedades da lista","Lower-latin":"Latim minúsculo","Lower–roman":"Romano minúsculo","Multiple styles":"Vários estilos",Next:"Seguinte","Numbered List":"Lista ordenada","Numbered list styles toolbar":"Barra de ferramentas de estilos de lista numerada",Orange:"Laranja","Press Enter to type after or press Shift + Enter to type before the widget":"Prima Enter para escrever depois ou Shift + Enter para escrever antes do widget",Previous:"Anterior",Purple:"Roxo",Red:"Vermelho",Redo:"Refazer","Remove Format":"Remover formatação","Reversed order":"Ordem invertida","Rich Text Editor":"Editor de texto avançado","Select all":"Selecionar todos","Show more items":"Mostrar mais itens",Square:"Quadrado","Start at":"Começa em","Start index must be greater than 0.":"O índice inicial tem de ser superior a 0.",Strikethrough:"Riscado",Styles:"Estilos",Subscript:"Subscrito",Superscript:"Sobrescrito","Text styles":"Estilos de texto","To-do List":"Lista de Afazeres","Toggle the circle list style":"Ativar o estilo de lista de círculos","Toggle the decimal list style":"Ativar o estilo de lista decimal","Toggle the decimal with leading zero list style":"Ativar o estilo de lista decimal com zero inicial","Toggle the disc list style":"Ativar o estilo de lista de discos","Toggle the lower–latin list style":"Ativar o estilo de lista de latim minúsculo","Toggle the lower–roman list style":"Ativar o estilo de lista de números romanos minúsculos","Toggle the square list style":"Ativar o estilo de lista de quadrados","Toggle the upper–latin list style":"Ativar o estilo de lista de latim maiúsculo","Toggle the upper–roman list style":"Ativar o estilo de lista de números romanos maiúsculos",Turquoise:"Turquesa",Underline:"Sublinhado",Undo:"Desfazer","Upper-latin":"Latim maiúsculo","Upper-roman":"Romano maiúsculo",White:"Branco","Widget toolbar":"Barra de ferramentas do widget",Yellow:"Amarelo"});o.getPluralForm=function(e){return e==0||e==1?0:e!=0&&e%1e6==0?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ro.js b/js/ckeditor5/translations/ro.js
new file mode 100644
index 000000000..42469fe51
--- /dev/null
+++ b/js/ckeditor5/translations/ro.js
@@ -0,0 +1 @@
+(function(e){const t=e["ro"]=e["ro"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 din %1",Accept:"Acceptă",Aquamarine:"Acvamarin",Black:"Negru","Block styles":"Stiluri pentru blocuri",Blue:"Albastru",Bold:"Îngroșat","Bulleted List":"Listă cu puncte","Bulleted list styles toolbar":"Toolbar Listă cu puncte",Cancel:"Anulare",Circle:"Cerc",Code:"Cod",Decimal:"Număr","Decimal with leading zero":"Număr cu zero la început ","Dim grey":"Gri slab",Disc:"Disc","Dropdown toolbar":"Bară listă opțiuni","Edit block":"Editează bloc","Editor block content toolbar":"Bară de instrumente editor pentru blocuri de conținut","Editor contextual toolbar":"Bară contextuală de instrumente editor","Editor editing area: %0":"Zonă editare editor: %0","Editor toolbar":"Bară editor",Green:"Verde",Grey:"Gri",HEX:"HEX","HTML object":"Obiect HTML","Insert paragraph after block":"Inserează un paragraf după bloc","Insert paragraph before block":"Inserează un paragraf înaintea blocului",Italic:"Cursiv","Light blue":"Albastru deschis","Light green":"Verde deschis","Light grey":"Gri deschis","List properties":"Proprietăți listă","Lower-latin":"Litere mici latine","Lower–roman":"Litere mici romane","Multiple styles":"Stiluri multiple",Next:"Înainte","Numbered List":"Listă numerotată","Numbered list styles toolbar":"Toolbar Listă numerotată",Orange:"Portocaliu","Press Enter to type after or press Shift + Enter to type before the widget":"Apăsați Enter pentru a scrie după widget sau Shift+Enter pentru a scrie înaintea acestuia",Previous:"Înapoi",Purple:"Violet",Red:"Roșu",Redo:"Revenire","Remove Format":"Șterge formatare","Reversed order":"Ordine inversată","Rich Text Editor":"Editor de text","Select all":"Selectează-le pe toate","Show more items":"Arată mai multe elemente",Square:"Pătrat","Start at":"Începe de la","Start index must be greater than 0.":"Indexul de pornire trebuie să fie mai mare de 0.",Strikethrough:"Tăiere text cu o linie",Styles:"Stiluri",Subscript:"Indice",Superscript:"Exponent","Text styles":"Stiluri pentru text","To-do List":"Listă cu activități","Toggle the circle list style":"Comutați stilul la lista cu cercuri","Toggle the decimal list style":"Comutați stilul la lista cu numere","Toggle the decimal with leading zero list style":"Comutați stilul la lista cu numere cu zero la început","Toggle the disc list style":"Comutați stilul la lista cu discuri","Toggle the lower–latin list style":"Comutați stilul la lista cu litere mici latine","Toggle the lower–roman list style":"Comutați stilul la lista cu litere mici romane","Toggle the square list style":"Comutați stilul la lista cu pătrate","Toggle the upper–latin list style":"Comutați stilul la lista cu litere mari latine","Toggle the upper–roman list style":"Comutați stilul la lista cu litere mari romane",Turquoise:"Turcoaz",Underline:"Subliniat",Undo:"Anulare","Upper-latin":"Litere mari latine","Upper-roman":"Litere mari romane",White:"Alb","Widget toolbar":"Bară widget",Yellow:"Galben"});t.getPluralForm=function(e){return e==1?0:e%100>19||e%100==0&&e!=0?2:1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ru.js b/js/ckeditor5/translations/ru.js
new file mode 100644
index 000000000..6e8bd4515
--- /dev/null
+++ b/js/ckeditor5/translations/ru.js
@@ -0,0 +1 @@
+(function(e){const t=e["ru"]=e["ru"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 из %1",Accept:"Принять",Aquamarine:"Аквамариновый",Black:"Чёрный","Block styles":"Блочные стили",Blue:"Синий",Bold:"Жирный","Bulleted List":"Маркированный список","Bulleted list styles toolbar":"Стили маркированного списка",Cancel:"Отмена",Circle:"Окружность",Code:"Исходный код",Decimal:"Десятичный","Decimal with leading zero":"Десятичный с ведущим нулем","Dim grey":"Тёмно-серый",Disc:"Диск","Dropdown toolbar":"Выпадающая панель инструментов","Edit block":"Редактировать блок","Editor block content toolbar":"Панель инструментов редактора","Editor contextual toolbar":"Контекстуальная панель инструментов редактора","Editor editing area: %0":"Область редактирования редактора: %0","Editor toolbar":"Панель инструментов редактора",Green:"Зелёный",Grey:"Серый",HEX:"HEX","HTML object":"HTML объект","Insert paragraph after block":"Вставить параграф после блока","Insert paragraph before block":"Вставить параграф перед блоком",Italic:"Курсив","Light blue":"Голубой","Light green":"Салатовый","Light grey":"Светло-серый","List properties":"Свойства списка","Lower-latin":"Малые латинские","Lower–roman":"Малые римские","Multiple styles":"Несколько стилей",Next:"Следующий","Numbered List":"Нумерованный список","Numbered list styles toolbar":"Стили нумерованного списка",Orange:"Оранжевый","Press Enter to type after or press Shift + Enter to type before the widget":"Нажмите Enter для ввода текста после виджета или нажмите Shift + Enter для ввода текста перед виджетом",Previous:"Предыдущий",Purple:"Фиолетовый",Red:"Красный",Redo:"Повторить","Remove Format":"Убрать форматирование","Reversed order":"Обратный порядок","Rich Text Editor":"Редактор","Select all":"Выбрать все","Show more items":"Другие инструменты",Square:"Квадрат","Start at":"Начать с","Start index must be greater than 0.":"Начальный индекс должен быть больше 0.",Strikethrough:"Зачеркнутый",Styles:"Стили",Subscript:"Подстрочный",Superscript:"Надстрочный","Text styles":"Стиль текста","To-do List":"Список задач","Toggle the circle list style":"Переключить на стиль списка с маркерами в виде незакрашенного кружка","Toggle the decimal list style":"Переключить на стиль списка с цифровыми маркерами","Toggle the decimal with leading zero list style":"Переключить на стиль списка с маркерами в виде цифр с нулем в начале","Toggle the disc list style":"Переключить на стиль списка с маркерами в виде закрашенного кружка","Toggle the lower–latin list style":"Переключить на стиль списка с маркерами в виде строчных латинских букв","Toggle the lower–roman list style":"Переключить на стиль списка с маркерами в виде строчных римских цифр","Toggle the square list style":"Переключить на стиль списка с квадратными маркерами","Toggle the upper–latin list style":"Переключить на стиль списка с маркерами в виде заглавных латинских букв","Toggle the upper–roman list style":"Переключить на стиль списка с маркерами в виде заглавных римских цифр",Turquoise:"Бирюзовый",Underline:"Подчеркнутый",Undo:"Отменить","Upper-latin":"Большие латинские","Upper-roman":"Большие римские",White:"Белый","Widget toolbar":"Панель инструментов виджета",Yellow:"Жёлтый"});t.getPluralForm=function(e){return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?1:e%10==0||e%10>=5&&e%10<=9||e%100>=11&&e%100<=14?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/si.js b/js/ckeditor5/translations/si.js
new file mode 100644
index 000000000..849bbe367
--- /dev/null
+++ b/js/ckeditor5/translations/si.js
@@ -0,0 +1 @@
+(function(e){const t=e["si"]=e["si"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Bold:"තදකුරු","Bulleted List":"බුලටිත ලැයිස්තුව","Bulleted list styles toolbar":"",Cancel:"",Circle:"",Code:"",Decimal:"","Decimal with leading zero":"",Disc:"",Italic:"ඇලකුරු","List properties":"","Lower-latin":"","Lower–roman":"","Numbered List":"අංකිත ලැයිස්තුව","Numbered list styles toolbar":"",Redo:"නැවත කරන්න","Reversed order":"","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Underline:"",Undo:"අහෝසි කරන්න","Upper-latin":"","Upper-roman":""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sk.js b/js/ckeditor5/translations/sk.js
new file mode 100644
index 000000000..71f1231d0
--- /dev/null
+++ b/js/ckeditor5/translations/sk.js
@@ -0,0 +1 @@
+(function(e){const o=e["sk"]=e["sk"]||{};o.dictionary=Object.assign(o.dictionary||{},{"%0 of %1":"%0 z %1",Accept:"Potvrdiť",Aquamarine:"Akvamarínová",Black:"Čierna","Block styles":"Štýly bloku",Blue:"Modrá",Bold:"Tučné","Bulleted List":"Zoznam s odrážkami","Bulleted list styles toolbar":"Panel zoznamu s odrážkami",Cancel:"Zrušiť",Circle:"Kruh",Code:"Kód",Decimal:"Čísla","Decimal with leading zero":"Čísla s nulou na začiatku","Dim grey":"Tmavosivá",Disc:"Plný kruh","Dropdown toolbar":"Panel nástrojov roletového menu","Edit block":"Upraviť odsek","Editor block content toolbar":"Panel s nástrojmi obsahu bloku editora","Editor contextual toolbar":"Kontextový panel nástrojov editora","Editor editing area: %0":"Oblasť úprav editora: %0","Editor toolbar":"Panel nástrojov editora",Green:"Zelená",Grey:"Sivá",HEX:"HEX","HTML object":"HTML objekt","Insert paragraph after block":"Vložiť odstavec za blok","Insert paragraph before block":"Vložiť odstavec pred blok",Italic:"Kurzíva","Light blue":"Bledomodrá","Light green":"Bledozelená","Light grey":"Bledosivá","List properties":"Vlastnosti zoznamu","Lower-latin":"Malé písmená","Lower–roman":"Malé rímske čísla","Multiple styles":"Viacero štýlov",Next:"Ďalšie","Numbered List":"Číslovaný zoznam","Numbered list styles toolbar":"Panel so štýlmi číslovaného zoznamu",Orange:"Oranžová","Press Enter to type after or press Shift + Enter to type before the widget":"Stlačte Enter, ak chcete písať po miniaplikácii, alebo stlačte Shift + Enter, ak chcete písať pred miniaplikáciou",Previous:"Predchádzajúce",Purple:"Fialová",Red:"Červená",Redo:"Znova","Remove Format":"Vyčistiť formátovanie","Reversed order":"Obrátene poradie","Rich Text Editor":"Editor s formátovaním","Select all":"Označiť všetko","Show more items":"Zobraziť viac položiek",Square:"Štvorec","Start at":"Prvá položka","Start index must be greater than 0.":"Prvá položka musí mať index väčší ako 0.",Strikethrough:"Preškrtnuté",Styles:"Štýly",Subscript:"Dolný index",Superscript:"Horný index","Text styles":"Štýly textu","To-do List":"To-do zoznam","Toggle the circle list style":"Prepnúť na zoznam s kruhovým označením","Toggle the decimal list style":"Prepnúť na číselný zoznam","Toggle the decimal with leading zero list style":"Prepnúť na číselný zoznam s nulou na začiatku","Toggle the disc list style":"Prepnúť na zoznam s označením plného kruhu","Toggle the lower–latin list style":"Prepnúť na zoznam s malými písmenami","Toggle the lower–roman list style":"Prepnúť na zoznam s malými rímskymi číslami","Toggle the square list style":"Prepnúť na zoznam so štvorcovým označením","Toggle the upper–latin list style":"Prepnúť na zoznam s veľkými písmenami","Toggle the upper–roman list style":"Prepnúť na zoznam s veľkými rímskymi číslami",Turquoise:"Tyrkysová",Underline:"Podčiarknuté",Undo:"Späť","Upper-latin":"Veľké písmená","Upper-roman":"Veľké rímske čísla",White:"Biela","Widget toolbar":"Panel nástrojov ovládacieho prvku",Yellow:"Žltá"});o.getPluralForm=function(e){return e%1==0&&e==1?0:e%1==0&&e>=2&&e<=4?1:e%1!=0?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sl.js b/js/ckeditor5/translations/sl.js
new file mode 100644
index 000000000..617eb9d48
--- /dev/null
+++ b/js/ckeditor5/translations/sl.js
@@ -0,0 +1 @@
+(function(e){const o=e["sl"]=e["sl"]||{};o.dictionary=Object.assign(o.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"Akvamarin",Black:"Črna",Blue:"Modra",Bold:"Krepko",Cancel:"Prekliči",Code:"Koda","Dim grey":"Temno siva","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"Zelena",Grey:"Siva",HEX:"",Italic:"Poševno","Light blue":"Svetlo modra","Light green":"Svetlo zelena","Light grey":"Svetlo siva",Next:"",Orange:"Oranžna",Previous:"",Purple:"Vijolična",Red:"Rdeča","Rich Text Editor":"","Show more items":"",Strikethrough:"Prečrtano",Subscript:"Naročnik",Superscript:"Nadpis",Turquoise:"Turkizna",Underline:"Podčrtaj",White:"Bela",Yellow:"Rumena"});o.getPluralForm=function(e){return e%100==1?0:e%100==2?1:e%100==3||e%100==4?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sq.js b/js/ckeditor5/translations/sq.js
new file mode 100644
index 000000000..b690ae155
--- /dev/null
+++ b/js/ckeditor5/translations/sq.js
@@ -0,0 +1 @@
+(function(e){const t=e["sq"]=e["sq"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"",Black:"E zezë",Blue:"E kaltër",Bold:"Trash","Bulleted List":"Listë me Pika","Bulleted list styles toolbar":"",Cancel:"Anulo",Circle:"",Code:"Kod",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"Zgjero kokështrirjen","Edit block":"Redakto bllokun","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"Kokështrirja e redaktuesit",Green:"E gjelbër",Grey:"Ngjyrë hiri",HEX:"","Insert paragraph after block":"","Insert paragraph before block":"",Italic:"Pjerrtë","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"",Next:"E radhës","Numbered List":"Listë me Numra","Numbered list styles toolbar":"",Orange:"Ngjyrë portokalli","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"Paraprake",Purple:"",Red:"E kuqe",Redo:"Ribëj","Remove Format":"Largo formatimin","Reversed order":"","Rich Text Editor":"Redaktues i Tekstit të Pasur","Select all":"Përzgjidh të gjitha","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Vi në mes",Subscript:"Abonohu",Superscript:"Mbishkrim","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"Nënvizuar",Undo:"Rikthe","Upper-latin":"","Upper-roman":"",White:"E bardhë","Widget toolbar":"Kokështrirja e shtesës",Yellow:"E verdhë"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sr-latn.js b/js/ckeditor5/translations/sr-latn.js
new file mode 100644
index 000000000..fbbc458f3
--- /dev/null
+++ b/js/ckeditor5/translations/sr-latn.js
@@ -0,0 +1 @@
+(function(e){const t=e["sr-latn"]=e["sr-latn"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"",Aquamarine:"Zelenkastoplava",Black:"Crna","Block styles":"Blok stilovi",Blue:"Plava",Bold:"Podebljano","Bulleted List":"Nabrajane liste","Bulleted list styles toolbar":"Traka sa alatkama za nabrajane liste",Cancel:"Odustani",Circle:"Krug",Code:"Kod",Decimal:"Decimala","Decimal with leading zero":"Decimalni broj sa nulom na početku","Dim grey":"Bledo siva",Disc:"Disk","Dropdown toolbar":"Padajuća traka sa alatkama","Edit block":"Blok uređivač","Editor block content toolbar":"Traka sa alatkama za blokiranje sadržaja uređivača","Editor contextual toolbar":"Kontekstualna traka sa alatkama Editor","Editor editing area: %0":"Oblast za uređivanje urednika: %0","Editor toolbar":"Uređivač traka sa alatkama",Green:"Zelena",Grey:"Siva",HEX:"","HTML object":"HTML objеkat","Insert paragraph after block":"Уметните одломак после блока","Insert paragraph before block":"Уметните одломак пре блока",Italic:"Kurziv","Light blue":"Svetloplava","Light green":"Svetlo zelena","Light grey":"Svetlo siva","List properties":"Navedite svojstva","Lower-latin":"Donji - latinski","Lower–roman":"Donji - rimski","Multiple styles":"Više stilova",Next:"Sledeći","Numbered List":"Lista sa brojevima","Numbered list styles toolbar":"Traka sa altakama za liste sa brojevima",Orange:"Narandžasta","Press Enter to type after or press Shift + Enter to type before the widget":"Pritisnite Enter da kucate posle ili pritisnite Shift + Enter da kucate pre vidžeta",Previous:"Prethodni",Purple:"Ljubičasta",Red:"Crvena",Redo:"Ponovo","Remove Format":"Ukloni formatiranje","Reversed order":"Obrnuti redosled","Rich Text Editor":"Prošireni uređivač teksta","Select all":"Označi sve","Show more items":"Prikaži još stavki",Square:"Kvadrat","Start at":"Početi u","Start index must be greater than 0.":"Početni indeks mora biti veći od 0.",Strikethrough:"Precrtan",Styles:"Stilovi",Subscript:"Index dole",Superscript:"Index gore","Text styles":"Stilovi teksta","To-do List":"Lista obaveza","Toggle the circle list style":"Uključite / isključite stil liste krugova","Toggle the decimal list style":"Uključi / isključi stil dekadne liste","Toggle the decimal with leading zero list style":"Prebaci decimalni znak sa vodećim stilom liste nula","Toggle the disc list style":"Uključite / isključite stil liste diskova","Toggle the lower–latin list style":"Uključite / isključite stil donje liste latinice","Toggle the lower–roman list style":"Uključite / isključite stil donje rimske liste","Toggle the square list style":"Uključite / isključite stil liste kvadrata","Toggle the upper–latin list style":"Uključite / isključite stil gornje liste latinice","Toggle the upper–roman list style":"Uključite / isključite stil gornje rimske liste",Turquoise:"Tirkizna",Underline:"Podvučen",Undo:"Povlačenje","Upper-latin":"Gornji - latinski","Upper-roman":"Gornji - rimski",White:"Bela","Widget toolbar":"Видгет трака са алаткама",Yellow:"Žuta"});t.getPluralForm=function(e){return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sr.js b/js/ckeditor5/translations/sr.js
new file mode 100644
index 000000000..b525fd4e7
--- /dev/null
+++ b/js/ckeditor5/translations/sr.js
@@ -0,0 +1 @@
+(function(e){const t=e["sr"]=e["sr"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 of %1",Accept:"Prihvati",Aquamarine:"Зеленкастоплава",Black:"Црна","Block styles":"Блок стилови",Blue:"Плава",Bold:"Подебљано","Bulleted List":"Набрајане листе","Bulleted list styles toolbar":"Трака са алаткама за набрајане листе",Cancel:"Одустани",Circle:"Круг",Code:"Код",Decimal:"Децимала","Decimal with leading zero":"Децимала са нулом на почетку","Dim grey":"Бледо сива",Disc:"Диск","Dropdown toolbar":"Падајућа трака са алаткама","Edit block":"Блок уређивач","Editor block content toolbar":"Трака са алаткама за блокирање садржаја уређивача","Editor contextual toolbar":"Контекстуална трака са алаткама Едитор","Editor editing area: %0":"Област за уређивање уредника: %0","Editor toolbar":"Уређивач трака са алаткама",Green:"Зелена",Grey:"Сива",HEX:"HEX","HTML object":"ХТМЛ објекат ","Insert paragraph after block":"Umetnite odlomak posle bloka","Insert paragraph before block":"Umetnite odlomak pre bloka",Italic:"Курзив","Light blue":"Светлоплава","Light green":"Светлозелена","Light grey":"Светло сива","List properties":"Наведите својства ","Lower-latin":"Доњи - латински","Lower–roman":"Доњи - римски","Multiple styles":"Више стилова",Next:"Следећи","Numbered List":"Листа са бројевима","Numbered list styles toolbar":"Трака са алаткама за листе са бројевима",Orange:"Нараџаста","Press Enter to type after or press Shift + Enter to type before the widget":"Притисните Ентер да куцате после или притисните Схифт + Ентер да куцате пре виџета",Previous:"Претходни",Purple:"Љубичаста",Red:"Црвена",Redo:"Поново","Remove Format":"Уклони форматирање","Reversed order":"Обрнути редослед ","Rich Text Editor":"Проширен уређивач текста","Select all":"Означи све.","Show more items":"Прикажи још ставки",Square:"Квадрат","Start at":"Почети у","Start index must be greater than 0.":"Почетни индекс мора бити већи од 0. ",Strikethrough:"Прецртан",Styles:"Стилови",Subscript:"Индекс доле",Superscript:"Индекс горе","Text styles":"Стилови текста","To-do List":"Листа обавеза","Toggle the circle list style":"Укључи / искључи стил листе кругова","Toggle the decimal list style":"Укључи / искључи стил декадне листе","Toggle the decimal with leading zero list style":"Пребаци децимални знак са водећим стилом листе нула","Toggle the disc list style":"Укључите / искључите стил листе дискова","Toggle the lower–latin list style":"Укључите / искључите стил доње листе латинице","Toggle the lower–roman list style":"Укључите/ искључите стил доње римске листе","Toggle the square list style":"Укључи / искључи стил листе квадрата","Toggle the upper–latin list style":"Укључите / искључите стил горње листе латинице","Toggle the upper–roman list style":"Укључите / искључите стил горње римске листе",Turquoise:"Тиркизна",Underline:"Подвучен",Undo:"Повлачење","Upper-latin":"Горњи - латински","Upper-roman":"Горњи - римски",White:"Бела","Widget toolbar":"Widget traka sa alatkama",Yellow:"Жута"});t.getPluralForm=function(e){return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/sv.js b/js/ckeditor5/translations/sv.js
new file mode 100644
index 000000000..341bbd063
--- /dev/null
+++ b/js/ckeditor5/translations/sv.js
@@ -0,0 +1 @@
+(function(e){const t=e["sv"]=e["sv"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 av %1",Accept:"Acceptera",Aquamarine:"Akvamarin",Black:"Svart","Block styles":"Blockstilar",Blue:"Blå",Bold:"Fet","Bulleted List":"Punktlista","Bulleted list styles toolbar":"Verktygsfält för punktlistor",Cancel:"Avbryt",Circle:"Cirkel",Code:"Kod",Decimal:"Decimal","Decimal with leading zero":"Decimal med inledande nolla","Dim grey":"Dunkelgrå",Disc:"Disk","Dropdown toolbar":"Rullgardinsverktygsfält","Edit block":"Redigera block","Editor block content toolbar":"Verktygsfält vid block av innehåll","Editor contextual toolbar":"Ordbehandlarens kontextuella verktygsfält","Editor editing area: %0":"Ordbehandlares redigeringsområde: %0","Editor toolbar":"Redigeringsverktygsfält",Green:"Grön",Grey:"Grå",HEX:"HEX","HTML object":"HTML-objekt","Insert paragraph after block":"Infoga stycke efter block","Insert paragraph before block":"Infoga stycke före block",Italic:"Kursiv","Light blue":"Ljusblå","Light green":"Ljusgrön","Light grey":"Ljusgrå","List properties":"Listegenskaper","Lower-latin":"Latinska gemener","Lower–roman":"Romerska gemener","Multiple styles":"Flera stilar",Next:"Nästa","Numbered List":"Numrerad lista","Numbered list styles toolbar":"Verktygsfält för numrerade listor",Orange:"Orange","Press Enter to type after or press Shift + Enter to type before the widget":"Tryck på retur för att skriva efter eller på skift + retur för att skriva före widgeten.",Previous:"Föregående",Purple:"Lila",Red:"Röd",Redo:"Gör om","Remove Format":"Radera formatering","Reversed order":"Byt riktning","Rich Text Editor":"Rich Text-editor","Select all":"Välj alla","Show more items":"Visa fler objekt",Square:"Fyrkant","Start at":"Börja på","Start index must be greater than 0.":"Startindex måste vara större än 0.",Strikethrough:"Genomstruken",Styles:"Stilar",Subscript:"Nedsänkta tecken",Superscript:"Upphöjda tecken","Text styles":"Texttyper","To-do List":"Att-göra-lista","Toggle the circle list style":"Växla till cirkellisttypen","Toggle the decimal list style":"Växla till decimallisttypen","Toggle the decimal with leading zero list style":"Växla till listtypen decimal-med-inledande-nolla","Toggle the disc list style":"Växla till disklisttypen","Toggle the lower–latin list style":"Växla till listtypen latinska gemener","Toggle the lower–roman list style":"Växla till listtypen romerska gemener","Toggle the square list style":"Växla till fyrkantslisttypen","Toggle the upper–latin list style":"Växla till listtypen latinska versaler ","Toggle the upper–roman list style":"Växla till listtypen romerska versaler",Turquoise:"Turkos",Underline:"Understrykning",Undo:"Ångra","Upper-latin":"Latinska versaler","Upper-roman":"Romerska versaler",White:"Vit","Widget toolbar":"Widgetverktygsfält",Yellow:"Gul"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/th.js b/js/ckeditor5/translations/th.js
new file mode 100644
index 000000000..a3aa07e3c
--- /dev/null
+++ b/js/ckeditor5/translations/th.js
@@ -0,0 +1 @@
+(function(e){const t=e["th"]=e["th"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 จาก %1",Accept:"ยอมรับ",Aquamarine:"พลอยสีฟ้า",Black:"สีดำ","Block styles":"รูปแบบบล็อก",Blue:"สีน้ำเงิน",Bold:"ตัวหนา","Bulleted List":"รายการสัญลักษณ์แสดงหัวข้อย่อย","Bulleted list styles toolbar":"แถบเครื่องมือรูปแบบรายการสัญลักษณ์แสดงหัวข้อย่อย",Cancel:"ยกเลิก",Circle:"วงกลม",Code:"โค้ด",Decimal:"ทศนิยม","Decimal with leading zero":"ทศนิยมที่มีศูนย์นำหน้า","Dim grey":"สีเทาเข้ม",Disc:"ดิสก์","Dropdown toolbar":"แถบเครื่องมือแบบเลื่อนลง","Edit block":"แก้ไขบล็อก","Editor block content toolbar":"แถบเครื่องมือแก้ไขบล็อกเนื้อหา","Editor contextual toolbar":"แถบเครื่องมือแก้ไขข้อความ","Editor editing area: %0":"พื้นที่แก้ไขของตัวแก้ไข: %0","Editor toolbar":"แถบเครื่องมือแก้ไข",Green:"สีเขียว",Grey:"สีเทา",HEX:"HEX","HTML object":"วัตถุ HTML","Insert paragraph after block":"แทรกย่อหน้าหลังบล็อก","Insert paragraph before block":"แทรกย่อหน้าก่อนบล็อก",Italic:"ตัวเอียง","Light blue":"สีฟ้า","Light green":"สีเขียวอ่อน","Light grey":"สีเทาอ่อน","List properties":"คุณสมบัติของรายการ","Lower-latin":"อักษรลาตินตัวพิมพ์เล็ก","Lower–roman":"อักษรโรมันตัวพิมพ์เล็ก","Multiple styles":"มีหลายรูปแบบ",Next:"ถัดไป","Numbered List":"รายการลำดับเลข","Numbered list styles toolbar":"แถบเครื่องมือรูปแบบรายการแบบตัวเลข",Orange:"สีส้ม","Press Enter to type after or press Shift + Enter to type before the widget":"กด Enter เพื่อพิมพ์หลังจาก หรือกด Shift + Enter เพื่อพิมพ์ก่อนหน้าวิดเจ็ต",Previous:"ก่อนหน้า",Purple:"สีม่วง",Red:"สีแดง",Redo:"ทำซ้ำ","Remove Format":"ลบรูปแบบ","Reversed order":"ลำดับที่ย้อนกลับ","Rich Text Editor":"โปรแกรมแก้ไข Rich Text","Select all":"เลือกทั้งหมด","Show more items":"แสดงรายการเพิ่มเติม",Square:"สี่เหลี่ยม","Start at":"เริ่มต้นที่","Start index must be greater than 0.":"ดัชนีเริ่มต้นต้องมากกว่า 0",Strikethrough:"ขีดทับ",Styles:"รูปแบบ",Subscript:"ตัวห้อย",Superscript:"ตัวยก","Text styles":"รูปแบบข้อความ","To-do List":"รายการสิ่งที่จะทำ","Toggle the circle list style":"สลับรูปแบบรายการวงกลม","Toggle the decimal list style":"สลับรูปแบบรายการทศนิยม","Toggle the decimal with leading zero list style":"สลับทศนิยมด้วยรูปแบบรายการศูนย์นำหน้า","Toggle the disc list style":"สลับรูปแบบรายการดิสก์","Toggle the lower–latin list style":"สลับรูปแบบรายการอักษรลาตินตัวพิมพ์เล็ก","Toggle the lower–roman list style":"สลับรูปแบบรายการอักษรโรมันตัวพิมพ์เล็ก","Toggle the square list style":"สลับรูปแบบรายการสี่เหลี่ยม","Toggle the upper–latin list style":"สลับรูปแบบรายการอักษรลาตินตัวพิมพ์ใหญ่","Toggle the upper–roman list style":"สลับรูปแบบรายการอักษรโรมันตัวพิมพ์ใหญ่",Turquoise:"สีเขียวขุ่น",Underline:"ขีดเส้นใต้",Undo:"ย้อนกลับ","Upper-latin":"อักษรลาตินตัวพิมพ์ใหญ่","Upper-roman":"อักษรโรมันตัวพิมพ์ใหญ่",White:"สีขาว","Widget toolbar":"แถมเครื่องมือวิดเจ็ต",Yellow:"สีเหลือง"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/tk.js b/js/ckeditor5/translations/tk.js
new file mode 100644
index 000000000..3c9a4e320
--- /dev/null
+++ b/js/ckeditor5/translations/tk.js
@@ -0,0 +1 @@
+(function(e){const t=e["tk"]=e["tk"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%1-iň %0-i",Accept:"",Aquamarine:"Akuamarin",Black:"Gara",Blue:"Gök",Bold:"Galyň","Bulleted List":"Bullet sanawy","Bulleted list styles toolbar":"",Cancel:"Ýatyr",Circle:"",Code:"Kod",Decimal:"","Decimal with leading zero":"","Dim grey":"Goýy çal",Disc:"","Dropdown toolbar":"Açylýan gurallar paneli","Edit block":"Bloky redaktirläň","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"Redaktor gurallar paneli",Green:"Ýaşyl",Grey:"Çal",HEX:"","Insert paragraph after block":"Blokdan soň abzas goýuň","Insert paragraph before block":"Blokdan öň abzas goýuň",Italic:"Italik","Light blue":"Açyk gök","Light green":"Açyk ýaşyl","Light grey":"Açyk çal","List properties":"","Lower-latin":"","Lower–roman":"",Next:"Indiki","Numbered List":"Sanly sanaw","Numbered list styles toolbar":"",Orange:"Mämişi","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"Öňki",Purple:"Gyrmyzy",Red:"Gyzyl",Redo:"Öňe gaýtar","Remove Format":"Formaty aýyryň","Reversed order":"","Rich Text Editor":"Baý Tekst Redaktory","Select all":"Ählisini saýla","Show more items":"Has köp zady görkeziň",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Üsti çyzykly",Subscript:"Aşaky ýazgy",Superscript:"Üst ýazgy","To-do List":"Edilmeli işleriň sanawy","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"Turkuaz",Underline:"Aşagy çyzykly",Undo:"Yza gaýtar","Upper-latin":"","Upper-roman":"",White:"Ak","Widget toolbar":"Widget gurallar paneli",Yellow:"Sary"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/tr.js b/js/ckeditor5/translations/tr.js
new file mode 100644
index 000000000..a497fc429
--- /dev/null
+++ b/js/ckeditor5/translations/tr.js
@@ -0,0 +1 @@
+(function(e){const i=e["tr"]=e["tr"]||{};i.dictionary=Object.assign(i.dictionary||{},{"%0 of %1":"%0/%1",Accept:"Kabul et",Aquamarine:"Su Yeşili",Black:"Siyah","Block styles":"Blok stilleri",Blue:"Mavi",Bold:"Kalın","Bulleted List":"Simgeli Liste","Bulleted list styles toolbar":"Madde işaretli liste stilleri araç çubuğu",Cancel:"İptal",Circle:"Çember",Code:"Kod",Decimal:"Ondalık","Decimal with leading zero":"0'la başlayan ondalık","Dim grey":"Koyu Gri",Disc:"Disk","Dropdown toolbar":"Açılır araç çubuğu","Edit block":"Bloğu Düzenle","Editor block content toolbar":"Düzenleyici engelleme içerik araç çubuğu","Editor contextual toolbar":"Düzenleyici içeriksel araç çubuğu","Editor editing area: %0":"Editör düzenleme alanı: %0","Editor toolbar":"Düzenleme araç çubuğu",Green:"Yeşil",Grey:"Gri",HEX:"ONALTILIK","HTML object":"HTML nesnesi","Insert paragraph after block":"Bloktan sonra paragraf ekle","Insert paragraph before block":"Bloktan önce paragraf ekle",Italic:"İtalik","Light blue":"Açık Mavi","Light green":"Açık Yeşil","Light grey":"Açık Gri","List properties":"Liste özellikleri","Lower-latin":"Küçük Latin harfleri","Lower–roman":"Küçük Roma rakamları","Multiple styles":"Birden fazla stil",Next:"Sonraki","Numbered List":"Numaralı Liste","Numbered list styles toolbar":"Numaralandırılmış liste stilleri araç çubuğu",Orange:"Turuncu","Press Enter to type after or press Shift + Enter to type before the widget":"Görsel bileşenden sonra yazmak için Enter'a basın ya da görsel bileşenden önce yazmak için Shift + Enter'a basın",Previous:"Önceki",Purple:"Mor",Red:"Kırmızı",Redo:"Tekrar yap","Remove Format":"Biçimlendirmeyi Kaldır","Reversed order":"Ters sıralama","Rich Text Editor":"Zengin İçerik Editörü","Select all":"Hepsini seç","Show more items":"Daha fazla öğe göster",Square:"Kare","Start at":"Şununla başla","Start index must be greater than 0.":"Başlangıç dizini 0'dan büyük olmalıdır.",Strikethrough:"Üstü çizili",Styles:"Stiller",Subscript:"Alt Simge",Superscript:"Üst Simge","Text styles":"Metin stilleri","To-do List":"Yapılacaklar Listesi","Toggle the circle list style":"Çember liste stilini değiştir","Toggle the decimal list style":"Ondalık liste stilini değiştir","Toggle the decimal with leading zero list style":"0'la başlayan ondalık liste stilini değiştir","Toggle the disc list style":"Disk liste stilini değiştir","Toggle the lower–latin list style":"Küçük Latin harfleri liste stilini değiştir","Toggle the lower–roman list style":"Küçük Roma rakamları liste stilini değiştir","Toggle the square list style":"Kare liste stilini değiştir","Toggle the upper–latin list style":"Büyük Latin harfleri liste stilini değiştir","Toggle the upper–roman list style":"Büyük Roma rakamları liste stilini değiştir",Turquoise:"Turkuaz",Underline:"Altı Çizgili",Undo:"Geri al","Upper-latin":"Büyük Latin harfleri","Upper-roman":"Büyük Roma rakamları",White:"Beyaz","Widget toolbar":"Bileşen araç çubuğu",Yellow:"Sarı"});i.getPluralForm=function(e){return e>1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/tt.js b/js/ckeditor5/translations/tt.js
new file mode 100644
index 000000000..cbbd653c9
--- /dev/null
+++ b/js/ckeditor5/translations/tt.js
@@ -0,0 +1 @@
+(function(e){const t=e["tt"]=e["tt"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"Аквамарин",Black:"Кара",Blue:"Зәңгәр",Bold:"Калын","Bulleted List":"","Bulleted list styles toolbar":"",Cancel:"Баш тарт",Circle:"Түгәрәк",Code:"Код",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"Диск","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"Яшел",Grey:"Соры",HEX:"",Italic:"","Light blue":"Ачык зәңгәр","Light green":"Ачык яшел","Light grey":"Ачык соры","List properties":"","Lower-latin":"","Lower–roman":"",Next:"","Numbered List":"","Numbered list styles toolbar":"",Orange:"Кызгылт",Previous:"",Purple:"Шәмәхә",Red:"Кызыл",Redo:"Кабатла","Reversed order":"","Rich Text Editor":"","Show more items":"",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"",Subscript:"",Superscript:"","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"Фервоз",Underline:"",Undo:"","Upper-latin":"","Upper-roman":"",White:"Ак",Yellow:"Сары"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ug.js b/js/ckeditor5/translations/ug.js
new file mode 100644
index 000000000..c2a835cf9
--- /dev/null
+++ b/js/ckeditor5/translations/ug.js
@@ -0,0 +1 @@
+(function(e){const t=e["ug"]=e["ug"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 / %1",Accept:"قوشۇل",Aquamarine:"",Black:"","Block styles":"بۆلەك ئۇسلۇبى",Blue:"",Bold:"توم","Bulleted List":"بەلگە تىزىملىك","Bulleted list styles toolbar":"",Cancel:"ۋاز كەچ",Circle:"",Code:"كود",Decimal:"","Decimal with leading zero":"","Dim grey":"",Disc:"","Dropdown toolbar":"","Edit block":"","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"",Green:"",Grey:"",HEX:"","HTML object":"HTML جىسىم",Italic:"يانتۇ","Light blue":"","Light green":"","Light grey":"","List properties":"","Lower-latin":"","Lower–roman":"","Multiple styles":"كۆپ ئۇسلۇب",Next:"","Numbered List":"نومۇرلۇق تىزىملىك","Numbered list styles toolbar":"",Orange:"",Previous:"",Purple:"",Red:"",Redo:"تەكرارلاش","Remove Format":"پىچىمنى چىقىرىۋەت","Reversed order":"","Rich Text Editor":"تېكىست تەھرىرلىگۈچ","Select all":"ھەممىنى تاللا","Show more items":"تېخىمۇ كۆپ تۈرنى كۆرسەت",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"ئۆچۈرۈش سىزىقى",Styles:"ئۇسلۇب",Subscript:"ئاستبەلگە",Superscript:"ئۈستبەلگە","Text styles":"تېكىست ئۇسلۇبى","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"",Underline:"ئاستى سىزىق",Undo:"يېنىۋېلىش","Upper-latin":"","Upper-roman":"",White:"",Yellow:""});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/uk.js b/js/ckeditor5/translations/uk.js
new file mode 100644
index 000000000..2e8d74021
--- /dev/null
+++ b/js/ckeditor5/translations/uk.js
@@ -0,0 +1 @@
+(function(e){const t=e["uk"]=e["uk"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0 із %1",Accept:"Прийняти",Aquamarine:"Аквамариновий",Black:"Чорний","Block styles":"Стилі блоку",Blue:"Синій",Bold:"Жирний","Bulleted List":"Маркерний список","Bulleted list styles toolbar":"Панель маркерних списків",Cancel:"Відміна",Circle:"Коло",Code:"Код",Decimal:"Цифри","Decimal with leading zero":"Цифри із провідним нулем","Dim grey":"Темно-сірий",Disc:"Круг","Dropdown toolbar":"Випадаюча панель інструментів","Edit block":"Редагувати блок","Editor block content toolbar":"Панель інструментів вмісту блоку редактора","Editor contextual toolbar":"Контекстна панель інструментів редактора","Editor editing area: %0":"Область редагування редактора: %0","Editor toolbar":"Панель інструментів редактора",Green:"Зелений",Grey:"Сірий",HEX:"Шістнадцятковий","HTML object":"HTML об'єкт","Insert paragraph after block":"Додати абзац після блока","Insert paragraph before block":"Додати абзац перед блоком",Italic:"Курсив","Light blue":"Світло-синій","Light green":"Світло-зелений","Light grey":"Світло-сірий","List properties":"Список властивостей","Lower-latin":"Нижній латинський","Lower–roman":"Нижньо-римський","Multiple styles":"Кілька стилів",Next:"Наступний","Numbered List":"Нумерований список","Numbered list styles toolbar":"Панель нумерованих списків",Orange:"Помаранчевий","Press Enter to type after or press Shift + Enter to type before the widget":"Натисніть Enter, щоб друкувати після або натисніть Shift + Enter, щоб друкувати перед віджетом",Previous:"Попередній",Purple:"Фіолетовий",Red:"Червоний",Redo:"Повтор","Remove Format":"Видалити форматування","Reversed order":"Зворотний порядок","Rich Text Editor":"Розширений текстовий редактор","Select all":"Вибрати все","Show more items":"Показати більше",Square:"Квадрат","Start at":"Початок при","Start index must be greater than 0.":"Початковий індекс має бути більше 0.",Strikethrough:"Закреслений",Styles:"Стилі",Subscript:"Нижній індекс",Superscript:"Верхній індекс","Text styles":"Стилі тексту","To-do List":"Список справ","Toggle the circle list style":"Перемкнути круговий стиль списку","Toggle the decimal list style":"Перемкнути десятковий стиль списку","Toggle the decimal with leading zero list style":"Перемкнути десятковий стиль списку з нулем на початку","Toggle the disc list style":"Перемкнути дисковий стиль списку ","Toggle the lower–latin list style":"Перемкнути нижній латинський стиль списку","Toggle the lower–roman list style":"Перемкнути нижньо-римський стиль списку","Toggle the square list style":"Перемкнути квадратний стиль списку","Toggle the upper–latin list style":"Перемкнути верхній латинський стиль списку","Toggle the upper–roman list style":"Перемкнути верхньо-римський стиль списку",Turquoise:"Бірюзовий",Underline:"Підкреслений",Undo:"Відміна","Upper-latin":"Верхній латинський ","Upper-roman":"Верхньо-римський",White:"Білий","Widget toolbar":"Панель інструментів віджетів",Yellow:"Жовтий"});t.getPluralForm=function(e){return e%1==0&&e%10==1&&e%100!=11?0:e%1==0&&e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?1:e%1==0&&(e%10==0||e%10>=5&&e%10<=9||e%100>=11&&e%100<=14)?2:3}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/ur.js b/js/ckeditor5/translations/ur.js
new file mode 100644
index 000000000..73825e71a
--- /dev/null
+++ b/js/ckeditor5/translations/ur.js
@@ -0,0 +1 @@
+(function(e){const t=e["ur"]=e["ur"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"0% میں سے 1%",Accept:"",Aquamarine:"نیلگوں بلور",Black:"سیاہ","Block styles":"خانہ کے انداز",Blue:"نیلا",Bold:"جلّی","Bulleted List":"غیر ہندسی فہرست","Bulleted list styles toolbar":"",Cancel:"منسوخ",Circle:"",Code:"کوڈ",Decimal:"","Decimal with leading zero":"","Dim grey":"پھیکا سرمئی",Disc:"","Dropdown toolbar":"آلہ جات برائے فہرست ","Edit block":"خانہ کی تدوین","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"رقبہ خانۂ ترمیم: 0%","Editor toolbar":"ایڈیٹر آلہ جات",Green:"سبز",Grey:"سرمئی",HEX:"","HTML object":"ایچ ٹی ایم ایل آبجیکٹ","Insert paragraph after block":"پیراگراف کے بعد کوڈ خانہ نصب کریں","Insert paragraph before block":"پیراگراف سے پہلے کوڈ خانہ نصب کریں",Italic:"ترچھا","Light blue":"ہلکا نیلا","Light green":"ہلکا سبز","Light grey":"ہلکا سرمئی","List properties":"","Lower-latin":"","Lower–roman":"","Multiple styles":"متعدد انداز",Next:"اگلا","Numbered List":"ہندسی فہرست","Numbered list styles toolbar":"",Orange:"نارنجی","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"پچھلا",Purple:"ارغوانی",Red:"سرخ",Redo:"پھر سے کریں","Remove Format":"فارمیٹ ہٹائیں","Reversed order":"","Rich Text Editor":"خانۂ ترمیم","Select all":"سب منتخب کریں","Show more items":"مزید مواد کی نمائش کریں",Square:"","Start at":"","Start index must be greater than 0.":"",Strikethrough:"خط کشیدہ",Styles:"انداز",Subscript:"زير نوشت",Superscript:"بالا نوشت","Text styles":"متن کے انداز","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"فیروزی",Underline:"ترچھا",Undo:"رد ترمیم","Upper-latin":"","Upper-roman":"",White:"سفید","Widget toolbar":"آلہ جات برائے وجٹ",Yellow:"پیلا"});t.getPluralForm=function(e){return e!=1}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/uz.js b/js/ckeditor5/translations/uz.js
new file mode 100644
index 000000000..37b57dabc
--- /dev/null
+++ b/js/ckeditor5/translations/uz.js
@@ -0,0 +1 @@
+(function(i){const e=i["uz"]=i["uz"]||{};e.dictionary=Object.assign(e.dictionary||{},{"%0 of %1":"",Accept:"",Aquamarine:"Akuamarin",Black:"Qora",Blue:"Ko'k",Bold:"Qalin","Bulleted List":"Belgilangan roʻyxat","Bulleted list styles toolbar":"Belgilangan ro'yxat uslublari",Cancel:"Bekor qilish",Circle:"Doira",Code:"Manba kodi",Decimal:"O'nlik","Decimal with leading zero":"Boshlovchi nol bilan oʻnlik","Dim grey":"To'q kulrang",Disc:"Disk","Dropdown toolbar":"Ochiladigan asboblar paneli","Edit block":"Blokni tahrirlash","Editor block content toolbar":"","Editor contextual toolbar":"","Editor editing area: %0":"","Editor toolbar":"Tahrirlovchi asboblar paneli",Green:"Yashil",Grey:"Kulrang",HEX:"","Insert paragraph after block":"Вblokdan keyin paragraf qo'yish","Insert paragraph before block":"Blokdan oldin paragrafni kiritish",Italic:"Kursiv","Light blue":"Moviy","Light green":"Och yashil","Light grey":"Och kulrang","List properties":"","Lower-latin":"Kichik lotincha","Lower–roman":"Kichik rim",Next:"Keyingi","Numbered List":"Raqamlangan ro'yxat","Numbered list styles toolbar":"Raqamlangan ro'yxat uslublari",Orange:"To'q sariq","Press Enter to type after or press Shift + Enter to type before the widget":"",Previous:"Oldingi",Purple:"Siyohrang",Red:"Qizil",Redo:"Takrorlash","Remove Format":"Formatlashni olib tashlash","Reversed order":"","Rich Text Editor":"Tahrirlovchi","Select all":"Hammasini tanlash","Show more items":"",Square:"Kvadrat","Start at":"","Start index must be greater than 0.":"",Strikethrough:"Chizilgan",Subscript:"Pastki yozuv",Superscript:"Yuqori yozuv","To-do List":"","Toggle the circle list style":"","Toggle the decimal list style":"","Toggle the decimal with leading zero list style":"","Toggle the disc list style":"","Toggle the lower–latin list style":"","Toggle the lower–roman list style":"","Toggle the square list style":"","Toggle the upper–latin list style":"","Toggle the upper–roman list style":"",Turquoise:"Turkuaz",Underline:"Tagi chizilgan",Undo:"Bekor qilish","Upper-latin":"Katta lotincha","Upper-roman":"Katta rim",White:"Oq","Widget toolbar":"Vidjet asboblar paneli",Yellow:"Sariq"});e.getPluralForm=function(i){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/vi.js b/js/ckeditor5/translations/vi.js
new file mode 100644
index 000000000..f6c032486
--- /dev/null
+++ b/js/ckeditor5/translations/vi.js
@@ -0,0 +1 @@
+(function(t){const n=t["vi"]=t["vi"]||{};n.dictionary=Object.assign(n.dictionary||{},{"%0 of %1":"%0 đến %1",Accept:"Chấp nhận",Aquamarine:"Xanh ngọc biển",Black:"Đen","Block styles":"Kiểu của khối",Blue:"Xanh biển",Bold:"Đậm","Bulleted List":"Danh sách đánh ký hiệu","Bulleted list styles toolbar":"Thanh công cụ kiểu danh sách có dấu đầu dòng",Cancel:"Hủy",Circle:"Tròn",Code:"Code",Decimal:"Thập phân","Decimal with leading zero":"Thập phân bắt đầu bằng số 0","Dim grey":"Xám mờ",Disc:"Đĩa","Dropdown toolbar":"Thanh công cụ danh mục","Edit block":"Chỉnh sửa đoạn","Editor block content toolbar":"Thanh công cụ chỉnh sửa khối nội dung","Editor contextual toolbar":"Thanh công cụ chỉnh sửa theo ngữ cảnh","Editor editing area: %0":"Vùng chỉnh sửa của trình chỉnh sửa: %0","Editor toolbar":"Thanh công cụ biên tập",Green:"Xanh lá",Grey:"Xám",HEX:"HEX","HTML object":"Đối tượng HTML","Insert paragraph after block":"Chèn đoạn sau khối","Insert paragraph before block":"Chèn đoạn trước khối",Italic:"Nghiêng","Light blue":"Xanh dương","Light green":"Xanh lá nhạt","Light grey":"Xám nhạt","List properties":"Thuộc tính danh sách","Lower-latin":"Chữ cái Latinh viết thường","Lower–roman":"Chữ số La Mã viết thường","Multiple styles":"Nhiều kiểu",Next:"Tiếp theo","Numbered List":"Danh sách đánh số","Numbered list styles toolbar":"Thanh công cụ kiểu danh sách được đánh số",Orange:"Cam","Press Enter to type after or press Shift + Enter to type before the widget":"Nhấn Enter để nhập vào sau hoặc nhấn Shift + Enter để nhập vào trước tiện ích",Previous:"Quay lại",Purple:"Tím",Red:"Đỏ",Redo:"Tiếp tục","Remove Format":"Xóa định dang","Reversed order":"Thứ tự đảo ngược","Rich Text Editor":"Trình soạn thảo văn bản","Select all":"Chọn tất cả","Show more items":"Xem thêm",Square:"Vuông","Start at":"Bắt đầu tại","Start index must be greater than 0.":"Chỉ mục bắt đầu phải lớn hơn 0.",Strikethrough:"Gạch ngang",Styles:"Kiểu",Subscript:"Chữ nhỏ dưới",Superscript:"Chữ nhỏ trên","Text styles":"Kiểu văn bản","To-do List":"Danh sách cần làm","Toggle the circle list style":"Bật/tắt kiểu danh sách dạng vòng tròn","Toggle the decimal list style":"Bật/tắt kiểu danh sách dạng thập phân","Toggle the decimal with leading zero list style":"Bật/tắt kiểu danh sách dạng thập phân bắt đầu bằng số 0","Toggle the disc list style":"Bật/tắt kiểu danh sách dạng đĩa","Toggle the lower–latin list style":"Bật/tắt kiểu danh sách chữ cái Latinh viết thường","Toggle the lower–roman list style":"Bật/tắt kiểu danh sách chữ số La Mã viết thường","Toggle the square list style":"Bật/tắt kiểu danh sách dạng vuông","Toggle the upper–latin list style":"Bật/tắt kiểu danh sách chữ cái Latinh viết hoa","Toggle the upper–roman list style":"Bật/tắt kiểu danh sách chữ số La Mã viết hoa",Turquoise:"Xanh ngọc bích",Underline:"Gạch dưới",Undo:"Hoàn tác","Upper-latin":"Chữ cái Latinh viết hoa","Upper-roman":"Chữ số La Mã viết hoa",White:"Trắng","Widget toolbar":"Thanh công cụ tiện ích",Yellow:"Vàng"});n.getPluralForm=function(t){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/zh-cn.js b/js/ckeditor5/translations/zh-cn.js
new file mode 100644
index 000000000..5ce653a54
--- /dev/null
+++ b/js/ckeditor5/translations/zh-cn.js
@@ -0,0 +1 @@
+(function(e){const t=e["zh-cn"]=e["zh-cn"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"第 %0 步，共 %1 步",Accept:"接受",Aquamarine:"海蓝色",Black:"黑色","Block styles":"块级样式",Blue:"蓝色",Bold:"加粗","Bulleted List":"项目符号列表","Bulleted list styles toolbar":"项目符号列表样式工具条",Cancel:"取消",Circle:"空心圆点",Code:"代码",Decimal:"阿拉伯数字","Decimal with leading zero":"前导零阿拉伯数字","Dim grey":"暗灰色",Disc:"实心圆点","Dropdown toolbar":"下拉工具栏","Edit block":"编辑框","Editor block content toolbar":"编辑器块内容工具栏","Editor contextual toolbar":"编辑器上下文工具栏","Editor editing area: %0":"编辑器编辑区域：%0","Editor toolbar":"编辑器工具栏",Green:"绿色",Grey:"灰色",HEX:"十六进制","HTML object":"HTML对象","Insert paragraph after block":"在后面插入段落","Insert paragraph before block":"在前面插入段落",Italic:"倾斜","Light blue":"浅蓝色","Light green":"浅绿色","Light grey":"浅灰色","List properties":"列表属性","Lower-latin":"小写拉丁字母","Lower–roman":"小写罗马数字","Multiple styles":"多样式",Next:"下一步","Numbered List":"项目编号列表","Numbered list styles toolbar":"项目编号列表样式工具条",Orange:"橙色","Press Enter to type after or press Shift + Enter to type before the widget":"按下“Enter”键，在小组件后输入；按下“Shift+Enter”键，在小组件前输入",Previous:"上一步",Purple:"紫色",Red:"红色",Redo:"重做","Remove Format":"移除格式","Reversed order":"顺序反转","Rich Text Editor":"富文本编辑器","Select all":"全选","Show more items":"显示更多",Square:"实心方块","Start at":"起始编号","Start index must be greater than 0.":"起始编号必须大于0。",Strikethrough:"删除线",Styles:"样式",Subscript:"下标",Superscript:"上标","Text styles":"文本样式","To-do List":"待办列表","Toggle the circle list style":"切换空心原点列表样式","Toggle the decimal list style":"切换阿拉伯数字列表样式","Toggle the decimal with leading zero list style":"切换前导零阿拉伯数字列表样式","Toggle the disc list style":"切换实心原点列表样式","Toggle the lower–latin list style":"切换小写拉丁字母列表样式","Toggle the lower–roman list style":"切换小写罗马数字列表样式","Toggle the square list style":"切换实心方块列表样式","Toggle the upper–latin list style":"切换大写拉丁字母列表样式","Toggle the upper–roman list style":"切换大写罗马数字列表样式",Turquoise:"青色",Underline:"下划线",Undo:"撤销","Upper-latin":"大写拉丁字母","Upper-roman":"大写罗马数字",White:"白色","Widget toolbar":"小部件工具栏",Yellow:"黄色"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/ckeditor5/translations/zh.js b/js/ckeditor5/translations/zh.js
new file mode 100644
index 000000000..365186717
--- /dev/null
+++ b/js/ckeditor5/translations/zh.js
@@ -0,0 +1 @@
+(function(e){const t=e["zh"]=e["zh"]||{};t.dictionary=Object.assign(t.dictionary||{},{"%0 of %1":"%0/%1",Accept:"接受",Aquamarine:"淺綠色",Black:"黑色","Block styles":"區塊樣式",Blue:"藍色",Bold:"粗體","Bulleted List":"符號清單","Bulleted list styles toolbar":"無序清單工具列",Cancel:"取消",Circle:"空心圓點",Code:"代碼",Decimal:"數字","Decimal with leading zero":"0開頭的數字","Dim grey":"淡灰色",Disc:"實心圓點","Dropdown toolbar":"下拉選單","Edit block":"編輯區塊","Editor block content toolbar":"編輯器區塊內容工具列","Editor contextual toolbar":"編輯器關聯式工具列","Editor editing area: %0":"編輯器編輯區：%0","Editor toolbar":"編輯器工具",Green:"綠色",Grey:"灰色",HEX:"十六進位","HTML object":"HTML 物件","Insert paragraph after block":"在這個區塊後面插入一個段落","Insert paragraph before block":"在這個區塊前面插入一個段落",Italic:"斜體","Light blue":"亮藍色","Light green":"亮綠色","Light grey":"亮灰色","List properties":"清單屬性","Lower-latin":"小寫拉丁字母","Lower–roman":"小寫羅馬數字","Multiple styles":"多重樣式",Next:"下一","Numbered List":"有序清單","Numbered list styles toolbar":"有序清單工具列",Orange:"橘色","Press Enter to type after or press Shift + Enter to type before the widget":"按下 Enter 在小工具後輸入，或按下 Shift + Enter 在小工具前輸入",Previous:"上一",Purple:"紫色",Red:"紅色",Redo:"重做","Remove Format":"移除格式","Reversed order":"反轉順序","Rich Text Editor":"富文本編輯器","Select all":"選取全部","Show more items":"顯示更多",Square:"方形","Start at":"起始於","Start index must be greater than 0.":"起始索引須大於 0。",Strikethrough:"刪除線",Styles:"樣式",Subscript:"下標",Superscript:"上標","Text styles":"文字樣式","To-do List":"代辦清單","Toggle the circle list style":"切換為空心圓點標示","Toggle the decimal list style":"切換為數字標示","Toggle the decimal with leading zero list style":"切換為0開頭的數字標示","Toggle the disc list style":"切換為實心圓點標示","Toggle the lower–latin list style":"切換為小寫拉丁文字標示","Toggle the lower–roman list style":"切換為小寫羅馬數字標示","Toggle the square list style":"切換為方形標示","Toggle the upper–latin list style":"切換為大寫拉丁文字標示","Toggle the upper–roman list style":"切換為大寫羅馬數字標示",Turquoise:"藍綠色",Underline:"底線",Undo:"取消","Upper-latin":"大寫拉丁字母","Upper-roman":"大寫羅馬數字",White:"白色","Widget toolbar":"小工具",Yellow:"黃色"});t.getPluralForm=function(e){return 0}})(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
\ No newline at end of file
diff --git a/js/follow_up.js b/js/follow_up.js
index 83132ac58..d8941b1f2 100644
--- a/js/follow_up.js
+++ b/js/follow_up.js
@@ -30,3 +30,12 @@ function follow_up_window() {
   //alert(url);
   window.open(url, "_new_generic", parm);
 }
+
+function follow_up_do_select(target) {
+  let ids = ($(target).data('ids')+'').split(',');
+  $('.employee_check').each(function(check_idx, check_elt) {
+    if (ids.indexOf($(check_elt).val()) !== -1) {
+      $(check_elt).prop('checked', true);
+    }
+  });
+}
diff --git a/js/html5-qrcode.js b/js/html5-qrcode.js
new file mode 120000
index 000000000..a09c32c1d
--- /dev/null
+++ b/js/html5-qrcode.js
@@ -0,0 +1 @@
+html5-qrcode/html5-qrcode-2.3.7.min.js
\ No newline at end of file
diff --git a/js/html5-qrcode/html5-qrcode-2.3.7.min.js b/js/html5-qrcode/html5-qrcode-2.3.7.min.js
new file mode 100644
index 000000000..54fcb8d47
--- /dev/null
+++ b/js/html5-qrcode/html5-qrcode-2.3.7.min.js
@@ -0,0 +1,19 @@
+/*!
+ * Html5-QRCode
+ * Version 2.3.7
+ *
+ * Copyright [2020] [MINHAZ <minhazav@gmail.com>]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+  */
+var __Html5QrcodeLibrary__;(()=>{var t={449:function(t,e,r){!function(t){"use strict";function e(t){return null==t}var n=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};var i,o=function(t){function e(e){var r,n,i,o=this.constructor,s=t.call(this,e)||this;return Object.defineProperty(s,"name",{value:o.name,enumerable:!1}),r=s,n=o.prototype,(i=Object.setPrototypeOf)?i(r,n):r.__proto__=n,function(t,e){void 0===e&&(e=t.constructor);var r=Error.captureStackTrace;r&&r(t,e)}(s),s}return function(t,e){function r(){this.constructor=t}n(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}(e,t),e}(Error);class s extends o{constructor(t){super(t),this.message=t}getKind(){return this.constructor.kind}}s.kind="Exception";class a extends s{}a.kind="ArgumentException";class l extends s{}l.kind="IllegalArgumentException";class c{constructor(t){if(this.binarizer=t,null===t)throw new l("Binarizer must be non-null.")}getWidth(){return this.binarizer.getWidth()}getHeight(){return this.binarizer.getHeight()}getBlackRow(t,e){return this.binarizer.getBlackRow(t,e)}getBlackMatrix(){return null!==this.matrix&&void 0!==this.matrix||(this.matrix=this.binarizer.getBlackMatrix()),this.matrix}isCropSupported(){return this.binarizer.getLuminanceSource().isCropSupported()}crop(t,e,r,n){const i=this.binarizer.getLuminanceSource().crop(t,e,r,n);return new c(this.binarizer.createBinarizer(i))}isRotateSupported(){return this.binarizer.getLuminanceSource().isRotateSupported()}rotateCounterClockwise(){const t=this.binarizer.getLuminanceSource().rotateCounterClockwise();return new c(this.binarizer.createBinarizer(t))}rotateCounterClockwise45(){const t=this.binarizer.getLuminanceSource().rotateCounterClockwise45();return new c(this.binarizer.createBinarizer(t))}toString(){try{return this.getBlackMatrix().toString()}catch(t){return""}}}class h extends s{static getChecksumInstance(){return new h}}h.kind="ChecksumException";class u{constructor(t){this.source=t}getLuminanceSource(){return this.source}getWidth(){return this.source.getWidth()}getHeight(){return this.source.getHeight()}}class d{static arraycopy(t,e,r,n,i){for(;i--;)r[n++]=t[e++]}static currentTimeMillis(){return Date.now()}}class f extends s{}f.kind="IndexOutOfBoundsException";class g extends f{constructor(t,e){super(e),this.index=t,this.message=e}}g.kind="ArrayIndexOutOfBoundsException";class w{static fill(t,e){for(let r=0,n=t.length;r<n;r++)t[r]=e}static fillWithin(t,e,r,n){w.rangeCheck(t.length,e,r);for(let i=e;i<r;i++)t[i]=n}static rangeCheck(t,e,r){if(e>r)throw new l("fromIndex("+e+") > toIndex("+r+")");if(e<0)throw new g(e);if(r>t)throw new g(r)}static asList(...t){return t}static create(t,e,r){return Array.from({length:t}).map((t=>Array.from({length:e}).fill(r)))}static createInt32Array(t,e,r){return Array.from({length:t}).map((t=>Int32Array.from({length:e}).fill(r)))}static equals(t,e){if(!t)return!1;if(!e)return!1;if(!t.length)return!1;if(!e.length)return!1;if(t.length!==e.length)return!1;for(let r=0,n=t.length;r<n;r++)if(t[r]!==e[r])return!1;return!0}static hashCode(t){if(null===t)return 0;let e=1;for(const r of t)e=31*e+r;return e}static fillUint8Array(t,e){for(let r=0;r!==t.length;r++)t[r]=e}static copyOf(t,e){return t.slice(0,e)}static copyOfUint8Array(t,e){if(t.length<=e){const r=new Uint8Array(e);return r.set(t),r}return t.slice(0,e)}static copyOfRange(t,e,r){const n=r-e,i=new Int32Array(n);return d.arraycopy(t,e,i,0,n),i}static binarySearch(t,e,r){void 0===r&&(r=w.numberComparator);let n=0,i=t.length-1;for(;n<=i;){const o=i+n>>1,s=r(e,t[o]);if(s>0)n=o+1;else{if(!(s<0))return o;i=o-1}}return-n-1}static numberComparator(t,e){return t-e}}class m{static numberOfTrailingZeros(t){let e;if(0===t)return 32;let r=31;return e=t<<16,0!==e&&(r-=16,t=e),e=t<<8,0!==e&&(r-=8,t=e),e=t<<4,0!==e&&(r-=4,t=e),e=t<<2,0!==e&&(r-=2,t=e),r-(t<<1>>>31)}static numberOfLeadingZeros(t){if(0===t)return 32;let e=1;return t>>>16==0&&(e+=16,t<<=16),t>>>24==0&&(e+=8,t<<=8),t>>>28==0&&(e+=4,t<<=4),t>>>30==0&&(e+=2,t<<=2),e-=t>>>31,e}static toHexString(t){return t.toString(16)}static toBinaryString(t){return String(parseInt(String(t),2))}static bitCount(t){return t=(t=(858993459&(t-=t>>>1&1431655765))+(t>>>2&858993459))+(t>>>4)&252645135,63&(t+=t>>>8)+(t>>>16)}static truncDivision(t,e){return Math.trunc(t/e)}static parseInt(t,e){return parseInt(t,e)}}m.MIN_VALUE_32_BITS=-2147483648,m.MAX_VALUE=Number.MAX_SAFE_INTEGER;class p{constructor(t,e){void 0===t?(this.size=0,this.bits=new Int32Array(1)):(this.size=t,this.bits=null==e?p.makeArray(t):e)}getSize(){return this.size}getSizeInBytes(){return Math.floor((this.size+7)/8)}ensureCapacity(t){if(t>32*this.bits.length){const e=p.makeArray(t);d.arraycopy(this.bits,0,e,0,this.bits.length),this.bits=e}}get(t){return 0!=(this.bits[Math.floor(t/32)]&1<<(31&t))}set(t){this.bits[Math.floor(t/32)]|=1<<(31&t)}flip(t){this.bits[Math.floor(t/32)]^=1<<(31&t)}getNextSet(t){const e=this.size;if(t>=e)return e;const r=this.bits;let n=Math.floor(t/32),i=r[n];i&=~((1<<(31&t))-1);const o=r.length;for(;0===i;){if(++n===o)return e;i=r[n]}const s=32*n+m.numberOfTrailingZeros(i);return s>e?e:s}getNextUnset(t){const e=this.size;if(t>=e)return e;const r=this.bits;let n=Math.floor(t/32),i=~r[n];i&=~((1<<(31&t))-1);const o=r.length;for(;0===i;){if(++n===o)return e;i=~r[n]}const s=32*n+m.numberOfTrailingZeros(i);return s>e?e:s}setBulk(t,e){this.bits[Math.floor(t/32)]=e}setRange(t,e){if(e<t||t<0||e>this.size)throw new l;if(e===t)return;e--;const r=Math.floor(t/32),n=Math.floor(e/32),i=this.bits;for(let o=r;o<=n;o++){const s=(2<<(o<n?31:31&e))-(1<<(o>r?0:31&t));i[o]|=s}}clear(){const t=this.bits.length,e=this.bits;for(let r=0;r<t;r++)e[r]=0}isRange(t,e,r){if(e<t||t<0||e>this.size)throw new l;if(e===t)return!0;e--;const n=Math.floor(t/32),i=Math.floor(e/32),o=this.bits;for(let s=n;s<=i;s++){const a=(2<<(s<i?31:31&e))-(1<<(s>n?0:31&t))&4294967295;if((o[s]&a)!==(r?a:0))return!1}return!0}appendBit(t){this.ensureCapacity(this.size+1),t&&(this.bits[Math.floor(this.size/32)]|=1<<(31&this.size)),this.size++}appendBits(t,e){if(e<0||e>32)throw new l("Num bits must be between 0 and 32");this.ensureCapacity(this.size+e);for(let r=e;r>0;r--)this.appendBit(1==(t>>r-1&1))}appendBitArray(t){const e=t.size;this.ensureCapacity(this.size+e);for(let r=0;r<e;r++)this.appendBit(t.get(r))}xor(t){if(this.size!==t.size)throw new l("Sizes don't match");const e=this.bits;for(let r=0,n=e.length;r<n;r++)e[r]^=t.bits[r]}toBytes(t,e,r,n){for(let i=0;i<n;i++){let n=0;for(let e=0;e<8;e++)this.get(t)&&(n|=1<<7-e),t++;e[r+i]=n}}getBitArray(){return this.bits}reverse(){const t=new Int32Array(this.bits.length),e=Math.floor((this.size-1)/32),r=e+1,n=this.bits;for(let i=0;i<r;i++){let r=n[i];r=r>>1&1431655765|(1431655765&r)<<1,r=r>>2&858993459|(858993459&r)<<2,r=r>>4&252645135|(252645135&r)<<4,r=r>>8&16711935|(16711935&r)<<8,r=r>>16&65535|(65535&r)<<16,t[e-i]=r}if(this.size!==32*r){const e=32*r-this.size;let n=t[0]>>>e;for(let i=1;i<r;i++){const r=t[i];n|=r<<32-e,t[i-1]=n,n=r>>>e}t[r-1]=n}this.bits=t}static makeArray(t){return new Int32Array(Math.floor((t+31)/32))}equals(t){if(!(t instanceof p))return!1;const e=t;return this.size===e.size&&w.equals(this.bits,e.bits)}hashCode(){return 31*this.size+w.hashCode(this.bits)}toString(){let t="";for(let e=0,r=this.size;e<r;e++)0==(7&e)&&(t+=" "),t+=this.get(e)?"X":".";return t}clone(){return new p(this.size,this.bits.slice())}}!function(t){t[t.OTHER=0]="OTHER",t[t.PURE_BARCODE=1]="PURE_BARCODE",t[t.POSSIBLE_FORMATS=2]="POSSIBLE_FORMATS",t[t.TRY_HARDER=3]="TRY_HARDER",t[t.CHARACTER_SET=4]="CHARACTER_SET",t[t.ALLOWED_LENGTHS=5]="ALLOWED_LENGTHS",t[t.ASSUME_CODE_39_CHECK_DIGIT=6]="ASSUME_CODE_39_CHECK_DIGIT",t[t.ASSUME_GS1=7]="ASSUME_GS1",t[t.RETURN_CODABAR_START_END=8]="RETURN_CODABAR_START_END",t[t.NEED_RESULT_POINT_CALLBACK=9]="NEED_RESULT_POINT_CALLBACK",t[t.ALLOWED_EAN_EXTENSIONS=10]="ALLOWED_EAN_EXTENSIONS"}(i||(i={}));var A,C=i;class E extends s{static getFormatInstance(){return new E}}E.kind="FormatException",function(t){t[t.Cp437=0]="Cp437",t[t.ISO8859_1=1]="ISO8859_1",t[t.ISO8859_2=2]="ISO8859_2",t[t.ISO8859_3=3]="ISO8859_3",t[t.ISO8859_4=4]="ISO8859_4",t[t.ISO8859_5=5]="ISO8859_5",t[t.ISO8859_6=6]="ISO8859_6",t[t.ISO8859_7=7]="ISO8859_7",t[t.ISO8859_8=8]="ISO8859_8",t[t.ISO8859_9=9]="ISO8859_9",t[t.ISO8859_10=10]="ISO8859_10",t[t.ISO8859_11=11]="ISO8859_11",t[t.ISO8859_13=12]="ISO8859_13",t[t.ISO8859_14=13]="ISO8859_14",t[t.ISO8859_15=14]="ISO8859_15",t[t.ISO8859_16=15]="ISO8859_16",t[t.SJIS=16]="SJIS",t[t.Cp1250=17]="Cp1250",t[t.Cp1251=18]="Cp1251",t[t.Cp1252=19]="Cp1252",t[t.Cp1256=20]="Cp1256",t[t.UnicodeBigUnmarked=21]="UnicodeBigUnmarked",t[t.UTF8=22]="UTF8",t[t.ASCII=23]="ASCII",t[t.Big5=24]="Big5",t[t.GB18030=25]="GB18030",t[t.EUC_KR=26]="EUC_KR"}(A||(A={}));class I{constructor(t,e,r,...n){this.valueIdentifier=t,this.name=r,this.values="number"==typeof e?Int32Array.from([e]):e,this.otherEncodingNames=n,I.VALUE_IDENTIFIER_TO_ECI.set(t,this),I.NAME_TO_ECI.set(r,this);const i=this.values;for(let t=0,e=i.length;t!==e;t++){const e=i[t];I.VALUES_TO_ECI.set(e,this)}for(const t of n)I.NAME_TO_ECI.set(t,this)}getValueIdentifier(){return this.valueIdentifier}getName(){return this.name}getValue(){return this.values[0]}static getCharacterSetECIByValue(t){if(t<0||t>=900)throw new E("incorect value");const e=I.VALUES_TO_ECI.get(t);if(void 0===e)throw new E("incorect value");return e}static getCharacterSetECIByName(t){const e=I.NAME_TO_ECI.get(t);if(void 0===e)throw new E("incorect value");return e}equals(t){if(!(t instanceof I))return!1;const e=t;return this.getName()===e.getName()}}I.VALUE_IDENTIFIER_TO_ECI=new Map,I.VALUES_TO_ECI=new Map,I.NAME_TO_ECI=new Map,I.Cp437=new I(A.Cp437,Int32Array.from([0,2]),"Cp437"),I.ISO8859_1=new I(A.ISO8859_1,Int32Array.from([1,3]),"ISO-8859-1","ISO88591","ISO8859_1"),I.ISO8859_2=new I(A.ISO8859_2,4,"ISO-8859-2","ISO88592","ISO8859_2"),I.ISO8859_3=new I(A.ISO8859_3,5,"ISO-8859-3","ISO88593","ISO8859_3"),I.ISO8859_4=new I(A.ISO8859_4,6,"ISO-8859-4","ISO88594","ISO8859_4"),I.ISO8859_5=new I(A.ISO8859_5,7,"ISO-8859-5","ISO88595","ISO8859_5"),I.ISO8859_6=new I(A.ISO8859_6,8,"ISO-8859-6","ISO88596","ISO8859_6"),I.ISO8859_7=new I(A.ISO8859_7,9,"ISO-8859-7","ISO88597","ISO8859_7"),I.ISO8859_8=new I(A.ISO8859_8,10,"ISO-8859-8","ISO88598","ISO8859_8"),I.ISO8859_9=new I(A.ISO8859_9,11,"ISO-8859-9","ISO88599","ISO8859_9"),I.ISO8859_10=new I(A.ISO8859_10,12,"ISO-8859-10","ISO885910","ISO8859_10"),I.ISO8859_11=new I(A.ISO8859_11,13,"ISO-8859-11","ISO885911","ISO8859_11"),I.ISO8859_13=new I(A.ISO8859_13,15,"ISO-8859-13","ISO885913","ISO8859_13"),I.ISO8859_14=new I(A.ISO8859_14,16,"ISO-8859-14","ISO885914","ISO8859_14"),I.ISO8859_15=new I(A.ISO8859_15,17,"ISO-8859-15","ISO885915","ISO8859_15"),I.ISO8859_16=new I(A.ISO8859_16,18,"ISO-8859-16","ISO885916","ISO8859_16"),I.SJIS=new I(A.SJIS,20,"SJIS","Shift_JIS"),I.Cp1250=new I(A.Cp1250,21,"Cp1250","windows-1250"),I.Cp1251=new I(A.Cp1251,22,"Cp1251","windows-1251"),I.Cp1252=new I(A.Cp1252,23,"Cp1252","windows-1252"),I.Cp1256=new I(A.Cp1256,24,"Cp1256","windows-1256"),I.UnicodeBigUnmarked=new I(A.UnicodeBigUnmarked,25,"UnicodeBigUnmarked","UTF-16BE","UnicodeBig"),I.UTF8=new I(A.UTF8,26,"UTF8","UTF-8"),I.ASCII=new I(A.ASCII,Int32Array.from([27,170]),"ASCII","US-ASCII"),I.Big5=new I(A.Big5,28,"Big5"),I.GB18030=new I(A.GB18030,29,"GB18030","GB2312","EUC_CN","GBK"),I.EUC_KR=new I(A.EUC_KR,30,"EUC_KR","EUC-KR");class S extends s{}S.kind="UnsupportedOperationException";class _{static decode(t,e){const r=this.encodingName(e);return this.customDecoder?this.customDecoder(t,r):"undefined"==typeof TextDecoder||this.shouldDecodeOnFallback(r)?this.decodeFallback(t,r):new TextDecoder(r).decode(t)}static shouldDecodeOnFallback(t){return!_.isBrowser()&&"ISO-8859-1"===t}static encode(t,e){const r=this.encodingName(e);return this.customEncoder?this.customEncoder(t,r):"undefined"==typeof TextEncoder?this.encodeFallback(t):(new TextEncoder).encode(t)}static isBrowser(){return"undefined"!=typeof window&&"[object Window]"==={}.toString.call(window)}static encodingName(t){return"string"==typeof t?t:t.getName()}static encodingCharacterSet(t){return t instanceof I?t:I.getCharacterSetECIByName(t)}static decodeFallback(t,e){const r=this.encodingCharacterSet(e);if(_.isDecodeFallbackSupported(r)){let e="";for(let r=0,n=t.length;r<n;r++){let n=t[r].toString(16);n.length<2&&(n="0"+n),e+="%"+n}return decodeURIComponent(e)}if(r.equals(I.UnicodeBigUnmarked))return String.fromCharCode.apply(null,new Uint16Array(t.buffer));throw new S(`Encoding ${this.encodingName(e)} not supported by fallback.`)}static isDecodeFallbackSupported(t){return t.equals(I.UTF8)||t.equals(I.ISO8859_1)||t.equals(I.ASCII)}static encodeFallback(t){const e=btoa(unescape(encodeURIComponent(t))).split(""),r=[];for(let t=0;t<e.length;t++)r.push(e[t].charCodeAt(0));return new Uint8Array(r)}}class T{static castAsNonUtf8Char(t,e=null){const r=e?e.getName():this.ISO88591;return _.decode(new Uint8Array([t]),r)}static guessEncoding(t,e){if(null!=e&&void 0!==e.get(C.CHARACTER_SET))return e.get(C.CHARACTER_SET).toString();const r=t.length;let n=!0,i=!0,o=!0,s=0,a=0,l=0,c=0,h=0,u=0,d=0,f=0,g=0,w=0,m=0;const p=t.length>3&&239===t[0]&&187===t[1]&&191===t[2];for(let e=0;e<r&&(n||i||o);e++){const r=255&t[e];o&&(s>0?0==(128&r)?o=!1:s--:0!=(128&r)&&(0==(64&r)?o=!1:(s++,0==(32&r)?a++:(s++,0==(16&r)?l++:(s++,0==(8&r)?c++:o=!1))))),n&&(r>127&&r<160?n=!1:r>159&&(r<192||215===r||247===r)&&m++),i&&(h>0?r<64||127===r||r>252?i=!1:h--:128===r||160===r||r>239?i=!1:r>160&&r<224?(u++,f=0,d++,d>g&&(g=d)):r>127?(h++,d=0,f++,f>w&&(w=f)):(d=0,f=0))}return o&&s>0&&(o=!1),i&&h>0&&(i=!1),o&&(p||a+l+c>0)?T.UTF8:i&&(T.ASSUME_SHIFT_JIS||g>=3||w>=3)?T.SHIFT_JIS:n&&i?2===g&&2===u||10*m>=r?T.SHIFT_JIS:T.ISO88591:n?T.ISO88591:i?T.SHIFT_JIS:o?T.UTF8:T.PLATFORM_DEFAULT_ENCODING}static format(t,...e){let r=-1;return t.replace(/%(-)?(0?[0-9]+)?([.][0-9]+)?([#][0-9]+)?([scfpexd%])/g,(function(t,n,i,o,s,a){if("%%"===t)return"%";if(void 0===e[++r])return;t=o?parseInt(o.substr(1)):void 0;let l,c=s?parseInt(s.substr(1)):void 0;switch(a){case"s":l=e[r];break;case"c":l=e[r][0];break;case"f":l=parseFloat(e[r]).toFixed(t);break;case"p":l=parseFloat(e[r]).toPrecision(t);break;case"e":l=parseFloat(e[r]).toExponential(t);break;case"x":l=parseInt(e[r]).toString(c||16);break;case"d":l=parseFloat(parseInt(e[r],c||10).toPrecision(t)).toFixed(0)}l="object"==typeof l?JSON.stringify(l):(+l).toString(c);let h=parseInt(i),u=i&&i[0]+""=="0"?"0":" ";for(;l.length<h;)l=void 0!==n?l+u:u+l;return l}))}static getBytes(t,e){return _.encode(t,e)}static getCharCode(t,e=0){return t.charCodeAt(e)}static getCharAt(t){return String.fromCharCode(t)}}T.SHIFT_JIS=I.SJIS.getName(),T.GB2312="GB2312",T.ISO88591=I.ISO8859_1.getName(),T.EUC_JP="EUC_JP",T.UTF8=I.UTF8.getName(),T.PLATFORM_DEFAULT_ENCODING=T.UTF8,T.ASSUME_SHIFT_JIS=!1;class y{constructor(t=""){this.value=t}enableDecoding(t){return this.encoding=t,this}append(t){return"string"==typeof t?this.value+=t.toString():this.encoding?this.value+=T.castAsNonUtf8Char(t,this.encoding):this.value+=String.fromCharCode(t),this}appendChars(t,e,r){for(let n=e;e<e+r;n++)this.append(t[n]);return this}length(){return this.value.length}charAt(t){return this.value.charAt(t)}deleteCharAt(t){this.value=this.value.substr(0,t)+this.value.substring(t+1)}setCharAt(t,e){this.value=this.value.substr(0,t)+e+this.value.substr(t+1)}substring(t,e){return this.value.substring(t,e)}setLengthToZero(){this.value=""}toString(){return this.value}insert(t,e){this.value=this.value.substr(0,t)+e+this.value.substr(t+e.length)}}class N{constructor(t,e,r,n){if(this.width=t,this.height=e,this.rowSize=r,this.bits=n,null==e&&(e=t),this.height=e,t<1||e<1)throw new l("Both dimensions must be greater than 0");null==r&&(r=Math.floor((t+31)/32)),this.rowSize=r,null==n&&(this.bits=new Int32Array(this.rowSize*this.height))}static parseFromBooleanArray(t){const e=t.length,r=t[0].length,n=new N(r,e);for(let i=0;i<e;i++){const e=t[i];for(let t=0;t<r;t++)e[t]&&n.set(t,i)}return n}static parseFromString(t,e,r){if(null===t)throw new l("stringRepresentation cannot be null");const n=new Array(t.length);let i=0,o=0,s=-1,a=0,c=0;for(;c<t.length;)if("\n"===t.charAt(c)||"\r"===t.charAt(c)){if(i>o){if(-1===s)s=i-o;else if(i-o!==s)throw new l("row lengths do not match");o=i,a++}c++}else if(t.substring(c,c+e.length)===e)c+=e.length,n[i]=!0,i++;else{if(t.substring(c,c+r.length)!==r)throw new l("illegal character encountered: "+t.substring(c));c+=r.length,n[i]=!1,i++}if(i>o){if(-1===s)s=i-o;else if(i-o!==s)throw new l("row lengths do not match");a++}const h=new N(s,a);for(let t=0;t<i;t++)n[t]&&h.set(Math.floor(t%s),Math.floor(t/s));return h}get(t,e){const r=e*this.rowSize+Math.floor(t/32);return 0!=(this.bits[r]>>>(31&t)&1)}set(t,e){const r=e*this.rowSize+Math.floor(t/32);this.bits[r]|=1<<(31&t)&4294967295}unset(t,e){const r=e*this.rowSize+Math.floor(t/32);this.bits[r]&=~(1<<(31&t)&4294967295)}flip(t,e){const r=e*this.rowSize+Math.floor(t/32);this.bits[r]^=1<<(31&t)&4294967295}xor(t){if(this.width!==t.getWidth()||this.height!==t.getHeight()||this.rowSize!==t.getRowSize())throw new l("input matrix dimensions do not match");const e=new p(Math.floor(this.width/32)+1),r=this.rowSize,n=this.bits;for(let i=0,o=this.height;i<o;i++){const o=i*r,s=t.getRow(i,e).getBitArray();for(let t=0;t<r;t++)n[o+t]^=s[t]}}clear(){const t=this.bits,e=t.length;for(let r=0;r<e;r++)t[r]=0}setRegion(t,e,r,n){if(e<0||t<0)throw new l("Left and top must be nonnegative");if(n<1||r<1)throw new l("Height and width must be at least 1");const i=t+r,o=e+n;if(o>this.height||i>this.width)throw new l("The region must fit inside the matrix");const s=this.rowSize,a=this.bits;for(let r=e;r<o;r++){const e=r*s;for(let r=t;r<i;r++)a[e+Math.floor(r/32)]|=1<<(31&r)&4294967295}}getRow(t,e){null==e||e.getSize()<this.width?e=new p(this.width):e.clear();const r=this.rowSize,n=this.bits,i=t*r;for(let t=0;t<r;t++)e.setBulk(32*t,n[i+t]);return e}setRow(t,e){d.arraycopy(e.getBitArray(),0,this.bits,t*this.rowSize,this.rowSize)}rotate180(){const t=this.getWidth(),e=this.getHeight();let r=new p(t),n=new p(t);for(let t=0,i=Math.floor((e+1)/2);t<i;t++)r=this.getRow(t,r),n=this.getRow(e-1-t,n),r.reverse(),n.reverse(),this.setRow(t,n),this.setRow(e-1-t,r)}getEnclosingRectangle(){const t=this.width,e=this.height,r=this.rowSize,n=this.bits;let i=t,o=e,s=-1,a=-1;for(let t=0;t<e;t++)for(let e=0;e<r;e++){const l=n[t*r+e];if(0!==l){if(t<o&&(o=t),t>a&&(a=t),32*e<i){let t=0;for(;0==(l<<31-t&4294967295);)t++;32*e+t<i&&(i=32*e+t)}if(32*e+31>s){let t=31;for(;l>>>t==0;)t--;32*e+t>s&&(s=32*e+t)}}}return s<i||a<o?null:Int32Array.from([i,o,s-i+1,a-o+1])}getTopLeftOnBit(){const t=this.rowSize,e=this.bits;let r=0;for(;r<e.length&&0===e[r];)r++;if(r===e.length)return null;const n=r/t;let i=r%t*32;const o=e[r];let s=0;for(;0==(o<<31-s&4294967295);)s++;return i+=s,Int32Array.from([i,n])}getBottomRightOnBit(){const t=this.rowSize,e=this.bits;let r=e.length-1;for(;r>=0&&0===e[r];)r--;if(r<0)return null;const n=Math.floor(r/t);let i=32*Math.floor(r%t);const o=e[r];let s=31;for(;o>>>s==0;)s--;return i+=s,Int32Array.from([i,n])}getWidth(){return this.width}getHeight(){return this.height}getRowSize(){return this.rowSize}equals(t){if(!(t instanceof N))return!1;const e=t;return this.width===e.width&&this.height===e.height&&this.rowSize===e.rowSize&&w.equals(this.bits,e.bits)}hashCode(){let t=this.width;return t=31*t+this.width,t=31*t+this.height,t=31*t+this.rowSize,t=31*t+w.hashCode(this.bits),t}toString(t="X ",e="  ",r="\n"){return this.buildToString(t,e,r)}buildToString(t,e,r){let n=new y;for(let i=0,o=this.height;i<o;i++){for(let r=0,o=this.width;r<o;r++)n.append(this.get(r,i)?t:e);n.append(r)}return n.toString()}clone(){return new N(this.width,this.height,this.rowSize,this.bits.slice())}}class D extends s{static getNotFoundInstance(){return new D}}D.kind="NotFoundException";class M extends u{constructor(t){super(t),this.luminances=M.EMPTY,this.buckets=new Int32Array(M.LUMINANCE_BUCKETS)}getBlackRow(t,e){const r=this.getLuminanceSource(),n=r.getWidth();null==e||e.getSize()<n?e=new p(n):e.clear(),this.initArrays(n);const i=r.getRow(t,this.luminances),o=this.buckets;for(let t=0;t<n;t++)o[(255&i[t])>>M.LUMINANCE_SHIFT]++;const s=M.estimateBlackPoint(o);if(n<3)for(let t=0;t<n;t++)(255&i[t])<s&&e.set(t);else{let t=255&i[0],r=255&i[1];for(let o=1;o<n-1;o++){const n=255&i[o+1];(4*r-t-n)/2<s&&e.set(o),t=r,r=n}}return e}getBlackMatrix(){const t=this.getLuminanceSource(),e=t.getWidth(),r=t.getHeight(),n=new N(e,r);this.initArrays(e);const i=this.buckets;for(let n=1;n<5;n++){const o=Math.floor(r*n/5),s=t.getRow(o,this.luminances),a=Math.floor(4*e/5);for(let t=Math.floor(e/5);t<a;t++)i[(255&s[t])>>M.LUMINANCE_SHIFT]++}const o=M.estimateBlackPoint(i),s=t.getMatrix();for(let t=0;t<r;t++){const r=t*e;for(let i=0;i<e;i++)(255&s[r+i])<o&&n.set(i,t)}return n}createBinarizer(t){return new M(t)}initArrays(t){this.luminances.length<t&&(this.luminances=new Uint8ClampedArray(t));const e=this.buckets;for(let t=0;t<M.LUMINANCE_BUCKETS;t++)e[t]=0}static estimateBlackPoint(t){const e=t.length;let r=0,n=0,i=0;for(let o=0;o<e;o++)t[o]>i&&(n=o,i=t[o]),t[o]>r&&(r=t[o]);let o=0,s=0;for(let r=0;r<e;r++){const e=r-n,i=t[r]*e*e;i>s&&(o=r,s=i)}if(n>o){const t=n;n=o,o=t}if(o-n<=e/16)throw new D;let a=o-1,l=-1;for(let e=o-1;e>n;e--){const i=e-n,s=i*i*(o-e)*(r-t[e]);s>l&&(a=e,l=s)}return a<<M.LUMINANCE_SHIFT}}M.LUMINANCE_BITS=5,M.LUMINANCE_SHIFT=8-M.LUMINANCE_BITS,M.LUMINANCE_BUCKETS=1<<M.LUMINANCE_BITS,M.EMPTY=Uint8ClampedArray.from([0]);class R extends M{constructor(t){super(t),this.matrix=null}getBlackMatrix(){if(null!==this.matrix)return this.matrix;const t=this.getLuminanceSource(),e=t.getWidth(),r=t.getHeight();if(e>=R.MINIMUM_DIMENSION&&r>=R.MINIMUM_DIMENSION){const n=t.getMatrix();let i=e>>R.BLOCK_SIZE_POWER;0!=(e&R.BLOCK_SIZE_MASK)&&i++;let o=r>>R.BLOCK_SIZE_POWER;0!=(r&R.BLOCK_SIZE_MASK)&&o++;const s=R.calculateBlackPoints(n,i,o,e,r),a=new N(e,r);R.calculateThresholdForBlock(n,i,o,e,r,s,a),this.matrix=a}else this.matrix=super.getBlackMatrix();return this.matrix}createBinarizer(t){return new R(t)}static calculateThresholdForBlock(t,e,r,n,i,o,s){const a=i-R.BLOCK_SIZE,l=n-R.BLOCK_SIZE;for(let i=0;i<r;i++){let c=i<<R.BLOCK_SIZE_POWER;c>a&&(c=a);const h=R.cap(i,2,r-3);for(let r=0;r<e;r++){let i=r<<R.BLOCK_SIZE_POWER;i>l&&(i=l);const a=R.cap(r,2,e-3);let u=0;for(let t=-2;t<=2;t++){const e=o[h+t];u+=e[a-2]+e[a-1]+e[a]+e[a+1]+e[a+2]}const d=u/25;R.thresholdBlock(t,i,c,d,n,s)}}}static cap(t,e,r){return t<e?e:t>r?r:t}static thresholdBlock(t,e,r,n,i,o){for(let s=0,a=r*i+e;s<R.BLOCK_SIZE;s++,a+=i)for(let i=0;i<R.BLOCK_SIZE;i++)(255&t[a+i])<=n&&o.set(e+i,r+s)}static calculateBlackPoints(t,e,r,n,i){const o=i-R.BLOCK_SIZE,s=n-R.BLOCK_SIZE,a=new Array(r);for(let i=0;i<r;i++){a[i]=new Int32Array(e);let r=i<<R.BLOCK_SIZE_POWER;r>o&&(r=o);for(let o=0;o<e;o++){let e=o<<R.BLOCK_SIZE_POWER;e>s&&(e=s);let l=0,c=255,h=0;for(let i=0,o=r*n+e;i<R.BLOCK_SIZE;i++,o+=n){for(let e=0;e<R.BLOCK_SIZE;e++){const r=255&t[o+e];l+=r,r<c&&(c=r),r>h&&(h=r)}if(h-c>R.MIN_DYNAMIC_RANGE)for(i++,o+=n;i<R.BLOCK_SIZE;i++,o+=n)for(let e=0;e<R.BLOCK_SIZE;e++)l+=255&t[o+e]}let u=l>>2*R.BLOCK_SIZE_POWER;if(h-c<=R.MIN_DYNAMIC_RANGE&&(u=c/2,i>0&&o>0)){const t=(a[i-1][o]+2*a[i][o-1]+a[i-1][o-1])/4;c<t&&(u=t)}a[i][o]=u}}return a}}R.BLOCK_SIZE_POWER=3,R.BLOCK_SIZE=1<<R.BLOCK_SIZE_POWER,R.BLOCK_SIZE_MASK=R.BLOCK_SIZE-1,R.MINIMUM_DIMENSION=5*R.BLOCK_SIZE,R.MIN_DYNAMIC_RANGE=24;class O{constructor(t,e){this.width=t,this.height=e}getWidth(){return this.width}getHeight(){return this.height}isCropSupported(){return!1}crop(t,e,r,n){throw new S("This luminance source does not support cropping.")}isRotateSupported(){return!1}rotateCounterClockwise(){throw new S("This luminance source does not support rotation by 90 degrees.")}rotateCounterClockwise45(){throw new S("This luminance source does not support rotation by 45 degrees.")}toString(){const t=new Uint8ClampedArray(this.width);let e=new y;for(let r=0;r<this.height;r++){const n=this.getRow(r,t);for(let t=0;t<this.width;t++){const r=255&n[t];let i;i=r<64?"#":r<128?"+":r<192?".":" ",e.append(i)}e.append("\n")}return e.toString()}}class b extends O{constructor(t){super(t.getWidth(),t.getHeight()),this.delegate=t}getRow(t,e){const r=this.delegate.getRow(t,e),n=this.getWidth();for(let t=0;t<n;t++)r[t]=255-(255&r[t]);return r}getMatrix(){const t=this.delegate.getMatrix(),e=this.getWidth()*this.getHeight(),r=new Uint8ClampedArray(e);for(let n=0;n<e;n++)r[n]=255-(255&t[n]);return r}isCropSupported(){return this.delegate.isCropSupported()}crop(t,e,r,n){return new b(this.delegate.crop(t,e,r,n))}isRotateSupported(){return this.delegate.isRotateSupported()}invert(){return this.delegate}rotateCounterClockwise(){return new b(this.delegate.rotateCounterClockwise())}rotateCounterClockwise45(){return new b(this.delegate.rotateCounterClockwise45())}}class B extends O{constructor(t){super(t.width,t.height),this.canvas=t,this.tempCanvasElement=null,this.buffer=B.makeBufferFromCanvasImageData(t)}static makeBufferFromCanvasImageData(t){const e=t.getContext("2d").getImageData(0,0,t.width,t.height);return B.toGrayscaleBuffer(e.data,t.width,t.height)}static toGrayscaleBuffer(t,e,r){const n=new Uint8ClampedArray(e*r);for(let e=0,r=0,i=t.length;e<i;e+=4,r++){let i;i=0===t[e+3]?255:306*t[e]+601*t[e+1]+117*t[e+2]+512>>10,n[r]=i}return n}getRow(t,e){if(t<0||t>=this.getHeight())throw new l("Requested row is outside the image: "+t);const r=this.getWidth(),n=t*r;return null===e?e=this.buffer.slice(n,n+r):(e.length<r&&(e=new Uint8ClampedArray(r)),e.set(this.buffer.slice(n,n+r))),e}getMatrix(){return this.buffer}isCropSupported(){return!0}crop(t,e,r,n){return super.crop(t,e,r,n),this}isRotateSupported(){return!0}rotateCounterClockwise(){return this.rotate(-90),this}rotateCounterClockwise45(){return this.rotate(-45),this}getTempCanvasElement(){if(null===this.tempCanvasElement){const t=this.canvas.ownerDocument.createElement("canvas");t.width=this.canvas.width,t.height=this.canvas.height,this.tempCanvasElement=t}return this.tempCanvasElement}rotate(t){const e=this.getTempCanvasElement(),r=e.getContext("2d"),n=t*B.DEGREE_TO_RADIANS,i=this.canvas.width,o=this.canvas.height,s=Math.ceil(Math.abs(Math.cos(n))*i+Math.abs(Math.sin(n))*o),a=Math.ceil(Math.abs(Math.sin(n))*i+Math.abs(Math.cos(n))*o);return e.width=s,e.height=a,r.translate(s/2,a/2),r.rotate(n),r.drawImage(this.canvas,i/-2,o/-2),this.buffer=B.makeBufferFromCanvasImageData(e),this}invert(){return new b(this)}}B.DEGREE_TO_RADIANS=Math.PI/180;class L{constructor(t,e,r){this.deviceId=t,this.label=e,this.kind="videoinput",this.groupId=r||void 0}toJSON(){return{kind:this.kind,groupId:this.groupId,deviceId:this.deviceId,label:this.label}}}var P,v=(globalThis||r.g||self||window?(globalThis||r.g||self||window||void 0).__awaiter:void 0)||function(t,e,r,n){return new(r||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}))};class F{constructor(t,e=500,r){this.reader=t,this.timeBetweenScansMillis=e,this._hints=r,this._stopContinuousDecode=!1,this._stopAsyncDecode=!1,this._timeBetweenDecodingAttempts=0}get hasNavigator(){return"undefined"!=typeof navigator}get isMediaDevicesSuported(){return this.hasNavigator&&!!navigator.mediaDevices}get canEnumerateDevices(){return!(!this.isMediaDevicesSuported||!navigator.mediaDevices.enumerateDevices)}get timeBetweenDecodingAttempts(){return this._timeBetweenDecodingAttempts}set timeBetweenDecodingAttempts(t){this._timeBetweenDecodingAttempts=t<0?0:t}set hints(t){this._hints=t||null}get hints(){return this._hints}listVideoInputDevices(){return v(this,void 0,void 0,(function*(){if(!this.hasNavigator)throw new Error("Can't enumerate devices, navigator is not present.");if(!this.canEnumerateDevices)throw new Error("Can't enumerate devices, method not supported.");const t=yield navigator.mediaDevices.enumerateDevices(),e=[];for(const r of t){const t="video"===r.kind?"videoinput":r.kind;if("videoinput"!==t)continue;const n={deviceId:r.deviceId||r.id,label:r.label||`Video device ${e.length+1}`,kind:t,groupId:r.groupId};e.push(n)}return e}))}getVideoInputDevices(){return v(this,void 0,void 0,(function*(){return(yield this.listVideoInputDevices()).map((t=>new L(t.deviceId,t.label)))}))}findDeviceById(t){return v(this,void 0,void 0,(function*(){const e=yield this.listVideoInputDevices();return e?e.find((e=>e.deviceId===t)):null}))}decodeFromInputVideoDevice(t,e){return v(this,void 0,void 0,(function*(){return yield this.decodeOnceFromVideoDevice(t,e)}))}decodeOnceFromVideoDevice(t,e){return v(this,void 0,void 0,(function*(){let r;this.reset(),r=t?{deviceId:{exact:t}}:{facingMode:"environment"};const n={video:r};return yield this.decodeOnceFromConstraints(n,e)}))}decodeOnceFromConstraints(t,e){return v(this,void 0,void 0,(function*(){const r=yield navigator.mediaDevices.getUserMedia(t);return yield this.decodeOnceFromStream(r,e)}))}decodeOnceFromStream(t,e){return v(this,void 0,void 0,(function*(){this.reset();const r=yield this.attachStreamToVideo(t,e);return yield this.decodeOnce(r)}))}decodeFromInputVideoDeviceContinuously(t,e,r){return v(this,void 0,void 0,(function*(){return yield this.decodeFromVideoDevice(t,e,r)}))}decodeFromVideoDevice(t,e,r){return v(this,void 0,void 0,(function*(){let n;n=t?{deviceId:{exact:t}}:{facingMode:"environment"};const i={video:n};return yield this.decodeFromConstraints(i,e,r)}))}decodeFromConstraints(t,e,r){return v(this,void 0,void 0,(function*(){const n=yield navigator.mediaDevices.getUserMedia(t);return yield this.decodeFromStream(n,e,r)}))}decodeFromStream(t,e,r){return v(this,void 0,void 0,(function*(){this.reset();const n=yield this.attachStreamToVideo(t,e);return yield this.decodeContinuously(n,r)}))}stopAsyncDecode(){this._stopAsyncDecode=!0}stopContinuousDecode(){this._stopContinuousDecode=!0}attachStreamToVideo(t,e){return v(this,void 0,void 0,(function*(){const r=this.prepareVideoElement(e);return this.addVideoSource(r,t),this.videoElement=r,this.stream=t,yield this.playVideoOnLoadAsync(r),r}))}playVideoOnLoadAsync(t){return new Promise(((e,r)=>this.playVideoOnLoad(t,(()=>e()))))}playVideoOnLoad(t,e){this.videoEndedListener=()=>this.stopStreams(),this.videoCanPlayListener=()=>this.tryPlayVideo(t),t.addEventListener("ended",this.videoEndedListener),t.addEventListener("canplay",this.videoCanPlayListener),t.addEventListener("playing",e),this.tryPlayVideo(t)}isVideoPlaying(t){return t.currentTime>0&&!t.paused&&!t.ended&&t.readyState>2}tryPlayVideo(t){return v(this,void 0,void 0,(function*(){if(this.isVideoPlaying(t))console.warn("Trying to play video that is already playing.");else try{yield t.play()}catch(t){console.warn("It was not possible to play the video.")}}))}getMediaElement(t,e){const r=document.getElementById(t);if(!r)throw new a(`element with id '${t}' not found`);if(r.nodeName.toLowerCase()!==e.toLowerCase())throw new a(`element with id '${t}' must be an ${e} element`);return r}decodeFromImage(t,e){if(!t&&!e)throw new a("either imageElement with a src set or an url must be provided");return e&&!t?this.decodeFromImageUrl(e):this.decodeFromImageElement(t)}decodeFromVideo(t,e){if(!t&&!e)throw new a("Either an element with a src set or an URL must be provided");return e&&!t?this.decodeFromVideoUrl(e):this.decodeFromVideoElement(t)}decodeFromVideoContinuously(t,e,r){if(void 0===t&&void 0===e)throw new a("Either an element with a src set or an URL must be provided");return e&&!t?this.decodeFromVideoUrlContinuously(e,r):this.decodeFromVideoElementContinuously(t,r)}decodeFromImageElement(t){if(!t)throw new a("An image element must be provided.");this.reset();const e=this.prepareImageElement(t);let r;return this.imageElement=e,r=this.isImageLoaded(e)?this.decodeOnce(e,!1,!0):this._decodeOnLoadImage(e),r}decodeFromVideoElement(t){const e=this._decodeFromVideoElementSetup(t);return this._decodeOnLoadVideo(e)}decodeFromVideoElementContinuously(t,e){const r=this._decodeFromVideoElementSetup(t);return this._decodeOnLoadVideoContinuously(r,e)}_decodeFromVideoElementSetup(t){if(!t)throw new a("A video element must be provided.");this.reset();const e=this.prepareVideoElement(t);return this.videoElement=e,e}decodeFromImageUrl(t){if(!t)throw new a("An URL must be provided.");this.reset();const e=this.prepareImageElement();this.imageElement=e;const r=this._decodeOnLoadImage(e);return e.src=t,r}decodeFromVideoUrl(t){if(!t)throw new a("An URL must be provided.");this.reset();const e=this.prepareVideoElement(),r=this.decodeFromVideoElement(e);return e.src=t,r}decodeFromVideoUrlContinuously(t,e){if(!t)throw new a("An URL must be provided.");this.reset();const r=this.prepareVideoElement(),n=this.decodeFromVideoElementContinuously(r,e);return r.src=t,n}_decodeOnLoadImage(t){return new Promise(((e,r)=>{this.imageLoadedListener=()=>this.decodeOnce(t,!1,!0).then(e,r),t.addEventListener("load",this.imageLoadedListener)}))}_decodeOnLoadVideo(t){return v(this,void 0,void 0,(function*(){return yield this.playVideoOnLoadAsync(t),yield this.decodeOnce(t)}))}_decodeOnLoadVideoContinuously(t,e){return v(this,void 0,void 0,(function*(){yield this.playVideoOnLoadAsync(t),this.decodeContinuously(t,e)}))}isImageLoaded(t){return!!t.complete&&0!==t.naturalWidth}prepareImageElement(t){let e;return void 0===t&&(e=document.createElement("img"),e.width=200,e.height=200),"string"==typeof t&&(e=this.getMediaElement(t,"img")),t instanceof HTMLImageElement&&(e=t),e}prepareVideoElement(t){let e;return t||"undefined"==typeof document||(e=document.createElement("video"),e.width=200,e.height=200),"string"==typeof t&&(e=this.getMediaElement(t,"video")),t instanceof HTMLVideoElement&&(e=t),e.setAttribute("autoplay","true"),e.setAttribute("muted","true"),e.setAttribute("playsinline","true"),e}decodeOnce(t,e=!0,r=!0){this._stopAsyncDecode=!1;const n=(i,o)=>{if(this._stopAsyncDecode)return o(new D("Video stream has ended before any code could be detected.")),void(this._stopAsyncDecode=void 0);try{i(this.decode(t))}catch(t){const s=(t instanceof h||t instanceof E)&&r;if(e&&t instanceof D||s)return setTimeout(n,this._timeBetweenDecodingAttempts,i,o);o(t)}};return new Promise(((t,e)=>n(t,e)))}decodeContinuously(t,e){this._stopContinuousDecode=!1;const r=()=>{if(this._stopContinuousDecode)this._stopContinuousDecode=void 0;else try{const n=this.decode(t);e(n,null),setTimeout(r,this.timeBetweenScansMillis)}catch(t){e(null,t);const n=t instanceof D;(t instanceof h||t instanceof E||n)&&setTimeout(r,this._timeBetweenDecodingAttempts)}};r()}decode(t){const e=this.createBinaryBitmap(t);return this.decodeBitmap(e)}_isHTMLVideoElement(t){return 0!==t.videoWidth}drawFrameOnCanvas(t,e,r){e||(e={sx:0,sy:0,sWidth:t.videoWidth,sHeight:t.videoHeight,dx:0,dy:0,dWidth:t.videoWidth,dHeight:t.videoHeight}),r||(r=this.captureCanvasContext),r.drawImage(t,e.sx,e.sy,e.sWidth,e.sHeight,e.dx,e.dy,e.dWidth,e.dHeight)}drawImageOnCanvas(t,e,r=this.captureCanvasContext){e||(e={sx:0,sy:0,sWidth:t.naturalWidth,sHeight:t.naturalHeight,dx:0,dy:0,dWidth:t.naturalWidth,dHeight:t.naturalHeight}),r||(r=this.captureCanvasContext),r.drawImage(t,e.sx,e.sy,e.sWidth,e.sHeight,e.dx,e.dy,e.dWidth,e.dHeight)}createBinaryBitmap(t){this.getCaptureCanvasContext(t),this._isHTMLVideoElement(t)?this.drawFrameOnCanvas(t):this.drawImageOnCanvas(t);const e=this.getCaptureCanvas(t),r=new B(e),n=new R(r);return new c(n)}getCaptureCanvasContext(t){if(!this.captureCanvasContext){const e=this.getCaptureCanvas(t).getContext("2d");this.captureCanvasContext=e}return this.captureCanvasContext}getCaptureCanvas(t){if(!this.captureCanvas){const e=this.createCaptureCanvas(t);this.captureCanvas=e}return this.captureCanvas}decodeBitmap(t){return this.reader.decode(t,this._hints)}createCaptureCanvas(t){if("undefined"==typeof document)return this._destroyCaptureCanvas(),null;const e=document.createElement("canvas");let r,n;return void 0!==t&&(t instanceof HTMLVideoElement?(r=t.videoWidth,n=t.videoHeight):t instanceof HTMLImageElement&&(r=t.naturalWidth||t.width,n=t.naturalHeight||t.height)),e.style.width=r+"px",e.style.height=n+"px",e.width=r,e.height=n,e}stopStreams(){this.stream&&(this.stream.getVideoTracks().forEach((t=>t.stop())),this.stream=void 0),!1===this._stopAsyncDecode&&this.stopAsyncDecode(),!1===this._stopContinuousDecode&&this.stopContinuousDecode()}reset(){this.stopStreams(),this._destroyVideoElement(),this._destroyImageElement(),this._destroyCaptureCanvas()}_destroyVideoElement(){this.videoElement&&(void 0!==this.videoEndedListener&&this.videoElement.removeEventListener("ended",this.videoEndedListener),void 0!==this.videoPlayingEventListener&&this.videoElement.removeEventListener("playing",this.videoPlayingEventListener),void 0!==this.videoCanPlayListener&&this.videoElement.removeEventListener("loadedmetadata",this.videoCanPlayListener),this.cleanVideoSource(this.videoElement),this.videoElement=void 0)}_destroyImageElement(){this.imageElement&&(void 0!==this.imageLoadedListener&&this.imageElement.removeEventListener("load",this.imageLoadedListener),this.imageElement.src=void 0,this.imageElement.removeAttribute("src"),this.imageElement=void 0)}_destroyCaptureCanvas(){this.captureCanvasContext=void 0,this.captureCanvas=void 0}addVideoSource(t,e){try{t.srcObject=e}catch(r){t.src=URL.createObjectURL(e)}}cleanVideoSource(t){try{t.srcObject=null}catch(e){t.src=""}this.videoElement.removeAttribute("src")}}class x{constructor(t,e,r=(null==e?0:8*e.length),n,i,o=d.currentTimeMillis()){this.text=t,this.rawBytes=e,this.numBits=r,this.resultPoints=n,this.format=i,this.timestamp=o,this.text=t,this.rawBytes=e,this.numBits=null==r?null==e?0:8*e.length:r,this.resultPoints=n,this.format=i,this.resultMetadata=null,this.timestamp=null==o?d.currentTimeMillis():o}getText(){return this.text}getRawBytes(){return this.rawBytes}getNumBits(){return this.numBits}getResultPoints(){return this.resultPoints}getBarcodeFormat(){return this.format}getResultMetadata(){return this.resultMetadata}putMetadata(t,e){null===this.resultMetadata&&(this.resultMetadata=new Map),this.resultMetadata.set(t,e)}putAllMetadata(t){null!==t&&(null===this.resultMetadata?this.resultMetadata=t:this.resultMetadata=new Map(t))}addResultPoints(t){const e=this.resultPoints;if(null===e)this.resultPoints=t;else if(null!==t&&t.length>0){const r=new Array(e.length+t.length);d.arraycopy(e,0,r,0,e.length),d.arraycopy(t,0,r,e.length,t.length),this.resultPoints=r}}getTimestamp(){return this.timestamp}toString(){return this.text}}!function(t){t[t.AZTEC=0]="AZTEC",t[t.CODABAR=1]="CODABAR",t[t.CODE_39=2]="CODE_39",t[t.CODE_93=3]="CODE_93",t[t.CODE_128=4]="CODE_128",t[t.DATA_MATRIX=5]="DATA_MATRIX",t[t.EAN_8=6]="EAN_8",t[t.EAN_13=7]="EAN_13",t[t.ITF=8]="ITF",t[t.MAXICODE=9]="MAXICODE",t[t.PDF_417=10]="PDF_417",t[t.QR_CODE=11]="QR_CODE",t[t.RSS_14=12]="RSS_14",t[t.RSS_EXPANDED=13]="RSS_EXPANDED",t[t.UPC_A=14]="UPC_A",t[t.UPC_E=15]="UPC_E",t[t.UPC_EAN_EXTENSION=16]="UPC_EAN_EXTENSION"}(P||(P={}));var k,U=P;!function(t){t[t.OTHER=0]="OTHER",t[t.ORIENTATION=1]="ORIENTATION",t[t.BYTE_SEGMENTS=2]="BYTE_SEGMENTS",t[t.ERROR_CORRECTION_LEVEL=3]="ERROR_CORRECTION_LEVEL",t[t.ISSUE_NUMBER=4]="ISSUE_NUMBER",t[t.SUGGESTED_PRICE=5]="SUGGESTED_PRICE",t[t.POSSIBLE_COUNTRY=6]="POSSIBLE_COUNTRY",t[t.UPC_EAN_EXTENSION=7]="UPC_EAN_EXTENSION",t[t.PDF417_EXTRA_METADATA=8]="PDF417_EXTRA_METADATA",t[t.STRUCTURED_APPEND_SEQUENCE=9]="STRUCTURED_APPEND_SEQUENCE",t[t.STRUCTURED_APPEND_PARITY=10]="STRUCTURED_APPEND_PARITY"}(k||(k={}));var H,V,z,G,Y,X,W=k;class j{constructor(t,e,r,n,i=-1,o=-1){this.rawBytes=t,this.text=e,this.byteSegments=r,this.ecLevel=n,this.structuredAppendSequenceNumber=i,this.structuredAppendParity=o,this.numBits=null==t?0:8*t.length}getRawBytes(){return this.rawBytes}getNumBits(){return this.numBits}setNumBits(t){this.numBits=t}getText(){return this.text}getByteSegments(){return this.byteSegments}getECLevel(){return this.ecLevel}getErrorsCorrected(){return this.errorsCorrected}setErrorsCorrected(t){this.errorsCorrected=t}getErasures(){return this.erasures}setErasures(t){this.erasures=t}getOther(){return this.other}setOther(t){this.other=t}hasStructuredAppend(){return this.structuredAppendParity>=0&&this.structuredAppendSequenceNumber>=0}getStructuredAppendParity(){return this.structuredAppendParity}getStructuredAppendSequenceNumber(){return this.structuredAppendSequenceNumber}}class Z{exp(t){return this.expTable[t]}log(t){if(0===t)throw new l;return this.logTable[t]}static addOrSubtract(t,e){return t^e}}class Q{constructor(t,e){if(0===e.length)throw new l;this.field=t;const r=e.length;if(r>1&&0===e[0]){let t=1;for(;t<r&&0===e[t];)t++;t===r?this.coefficients=Int32Array.from([0]):(this.coefficients=new Int32Array(r-t),d.arraycopy(e,t,this.coefficients,0,this.coefficients.length))}else this.coefficients=e}getCoefficients(){return this.coefficients}getDegree(){return this.coefficients.length-1}isZero(){return 0===this.coefficients[0]}getCoefficient(t){return this.coefficients[this.coefficients.length-1-t]}evaluateAt(t){if(0===t)return this.getCoefficient(0);const e=this.coefficients;let r;if(1===t){r=0;for(let t=0,n=e.length;t!==n;t++){const n=e[t];r=Z.addOrSubtract(r,n)}return r}r=e[0];const n=e.length,i=this.field;for(let o=1;o<n;o++)r=Z.addOrSubtract(i.multiply(t,r),e[o]);return r}addOrSubtract(t){if(!this.field.equals(t.field))throw new l("GenericGFPolys do not have same GenericGF field");if(this.isZero())return t;if(t.isZero())return this;let e=this.coefficients,r=t.coefficients;if(e.length>r.length){const t=e;e=r,r=t}let n=new Int32Array(r.length);const i=r.length-e.length;d.arraycopy(r,0,n,0,i);for(let t=i;t<r.length;t++)n[t]=Z.addOrSubtract(e[t-i],r[t]);return new Q(this.field,n)}multiply(t){if(!this.field.equals(t.field))throw new l("GenericGFPolys do not have same GenericGF field");if(this.isZero()||t.isZero())return this.field.getZero();const e=this.coefficients,r=e.length,n=t.coefficients,i=n.length,o=new Int32Array(r+i-1),s=this.field;for(let t=0;t<r;t++){const r=e[t];for(let e=0;e<i;e++)o[t+e]=Z.addOrSubtract(o[t+e],s.multiply(r,n[e]))}return new Q(s,o)}multiplyScalar(t){if(0===t)return this.field.getZero();if(1===t)return this;const e=this.coefficients.length,r=this.field,n=new Int32Array(e),i=this.coefficients;for(let o=0;o<e;o++)n[o]=r.multiply(i[o],t);return new Q(r,n)}multiplyByMonomial(t,e){if(t<0)throw new l;if(0===e)return this.field.getZero();const r=this.coefficients,n=r.length,i=new Int32Array(n+t),o=this.field;for(let t=0;t<n;t++)i[t]=o.multiply(r[t],e);return new Q(o,i)}divide(t){if(!this.field.equals(t.field))throw new l("GenericGFPolys do not have same GenericGF field");if(t.isZero())throw new l("Divide by 0");const e=this.field;let r=e.getZero(),n=this;const i=t.getCoefficient(t.getDegree()),o=e.inverse(i);for(;n.getDegree()>=t.getDegree()&&!n.isZero();){const i=n.getDegree()-t.getDegree(),s=e.multiply(n.getCoefficient(n.getDegree()),o),a=t.multiplyByMonomial(i,s),l=e.buildMonomial(i,s);r=r.addOrSubtract(l),n=n.addOrSubtract(a)}return[r,n]}toString(){let t="";for(let e=this.getDegree();e>=0;e--){let r=this.getCoefficient(e);if(0!==r){if(r<0?(t+=" - ",r=-r):t.length>0&&(t+=" + "),0===e||1!==r){const e=this.field.log(r);0===e?t+="1":1===e?t+="a":(t+="a^",t+=e)}0!==e&&(1===e?t+="x":(t+="x^",t+=e))}}return t}}class K extends s{}K.kind="ArithmeticException";class q extends Z{constructor(t,e,r){super(),this.primitive=t,this.size=e,this.generatorBase=r;const n=new Int32Array(e);let i=1;for(let r=0;r<e;r++)n[r]=i,i*=2,i>=e&&(i^=t,i&=e-1);this.expTable=n;const o=new Int32Array(e);for(let t=0;t<e-1;t++)o[n[t]]=t;this.logTable=o,this.zero=new Q(this,Int32Array.from([0])),this.one=new Q(this,Int32Array.from([1]))}getZero(){return this.zero}getOne(){return this.one}buildMonomial(t,e){if(t<0)throw new l;if(0===e)return this.zero;const r=new Int32Array(t+1);return r[0]=e,new Q(this,r)}inverse(t){if(0===t)throw new K;return this.expTable[this.size-this.logTable[t]-1]}multiply(t,e){return 0===t||0===e?0:this.expTable[(this.logTable[t]+this.logTable[e])%(this.size-1)]}getSize(){return this.size}getGeneratorBase(){return this.generatorBase}toString(){return"GF(0x"+m.toHexString(this.primitive)+","+this.size+")"}equals(t){return t===this}}q.AZTEC_DATA_12=new q(4201,4096,1),q.AZTEC_DATA_10=new q(1033,1024,1),q.AZTEC_DATA_6=new q(67,64,1),q.AZTEC_PARAM=new q(19,16,1),q.QR_CODE_FIELD_256=new q(285,256,0),q.DATA_MATRIX_FIELD_256=new q(301,256,1),q.AZTEC_DATA_8=q.DATA_MATRIX_FIELD_256,q.MAXICODE_FIELD_64=q.AZTEC_DATA_6;class J extends s{}J.kind="ReedSolomonException";class $ extends s{}$.kind="IllegalStateException";class tt{constructor(t){this.field=t}decode(t,e){const r=this.field,n=new Q(r,t),i=new Int32Array(e);let o=!0;for(let t=0;t<e;t++){const e=n.evaluateAt(r.exp(t+r.getGeneratorBase()));i[i.length-1-t]=e,0!==e&&(o=!1)}if(o)return;const s=new Q(r,i),a=this.runEuclideanAlgorithm(r.buildMonomial(e,1),s,e),l=a[0],c=a[1],h=this.findErrorLocations(l),u=this.findErrorMagnitudes(c,h);for(let e=0;e<h.length;e++){const n=t.length-1-r.log(h[e]);if(n<0)throw new J("Bad error location");t[n]=q.addOrSubtract(t[n],u[e])}}runEuclideanAlgorithm(t,e,r){if(t.getDegree()<e.getDegree()){const r=t;t=e,e=r}const n=this.field;let i=t,o=e,s=n.getZero(),a=n.getOne();for(;o.getDegree()>=(r/2|0);){let t=i,e=s;if(i=o,s=a,i.isZero())throw new J("r_{i-1} was zero");o=t;let r=n.getZero();const l=i.getCoefficient(i.getDegree()),c=n.inverse(l);for(;o.getDegree()>=i.getDegree()&&!o.isZero();){const t=o.getDegree()-i.getDegree(),e=n.multiply(o.getCoefficient(o.getDegree()),c);r=r.addOrSubtract(n.buildMonomial(t,e)),o=o.addOrSubtract(i.multiplyByMonomial(t,e))}if(a=r.multiply(s).addOrSubtract(e),o.getDegree()>=i.getDegree())throw new $("Division algorithm failed to reduce polynomial?")}const l=a.getCoefficient(0);if(0===l)throw new J("sigmaTilde(0) was zero");const c=n.inverse(l);return[a.multiplyScalar(c),o.multiplyScalar(c)]}findErrorLocations(t){const e=t.getDegree();if(1===e)return Int32Array.from([t.getCoefficient(1)]);const r=new Int32Array(e);let n=0;const i=this.field;for(let o=1;o<i.getSize()&&n<e;o++)0===t.evaluateAt(o)&&(r[n]=i.inverse(o),n++);if(n!==e)throw new J("Error locator degree does not match number of roots");return r}findErrorMagnitudes(t,e){const r=e.length,n=new Int32Array(r),i=this.field;for(let o=0;o<r;o++){const s=i.inverse(e[o]);let a=1;for(let t=0;t<r;t++)if(o!==t){const r=i.multiply(e[t],s),n=0==(1&r)?1|r:-2&r;a=i.multiply(a,n)}n[o]=i.multiply(t.evaluateAt(s),i.inverse(a)),0!==i.getGeneratorBase()&&(n[o]=i.multiply(n[o],s))}return n}}!function(t){t[t.UPPER=0]="UPPER",t[t.LOWER=1]="LOWER",t[t.MIXED=2]="MIXED",t[t.DIGIT=3]="DIGIT",t[t.PUNCT=4]="PUNCT",t[t.BINARY=5]="BINARY"}(H||(H={}));class et{decode(t){this.ddata=t;let e=t.getBits(),r=this.extractBits(e),n=this.correctBits(r),i=et.convertBoolArrayToByteArray(n),o=et.getEncodedData(n),s=new j(i,o,null,null);return s.setNumBits(n.length),s}static highLevelDecode(t){return this.getEncodedData(t)}static getEncodedData(t){let e=t.length,r=H.UPPER,n=H.UPPER,i="",o=0;for(;o<e;)if(n===H.BINARY){if(e-o<5)break;let s=et.readCode(t,o,5);if(o+=5,0===s){if(e-o<11)break;s=et.readCode(t,o,11)+31,o+=11}for(let r=0;r<s;r++){if(e-o<8){o=e;break}const r=et.readCode(t,o,8);i+=T.castAsNonUtf8Char(r),o+=8}n=r}else{let s=n===H.DIGIT?4:5;if(e-o<s)break;let a=et.readCode(t,o,s);o+=s;let l=et.getCharacter(n,a);l.startsWith("CTRL_")?(r=n,n=et.getTable(l.charAt(5)),"L"===l.charAt(6)&&(r=n)):(i+=l,n=r)}return i}static getTable(t){switch(t){case"L":return H.LOWER;case"P":return H.PUNCT;case"M":return H.MIXED;case"D":return H.DIGIT;case"B":return H.BINARY;default:return H.UPPER}}static getCharacter(t,e){switch(t){case H.UPPER:return et.UPPER_TABLE[e];case H.LOWER:return et.LOWER_TABLE[e];case H.MIXED:return et.MIXED_TABLE[e];case H.PUNCT:return et.PUNCT_TABLE[e];case H.DIGIT:return et.DIGIT_TABLE[e];default:throw new $("Bad table")}}correctBits(t){let e,r;this.ddata.getNbLayers()<=2?(r=6,e=q.AZTEC_DATA_6):this.ddata.getNbLayers()<=8?(r=8,e=q.AZTEC_DATA_8):this.ddata.getNbLayers()<=22?(r=10,e=q.AZTEC_DATA_10):(r=12,e=q.AZTEC_DATA_12);let n=this.ddata.getNbDatablocks(),i=t.length/r;if(i<n)throw new E;let o=t.length%r,s=new Int32Array(i);for(let e=0;e<i;e++,o+=r)s[e]=et.readCode(t,o,r);try{new tt(e).decode(s,i-n)}catch(t){throw new E(t)}let a=(1<<r)-1,l=0;for(let t=0;t<n;t++){let e=s[t];if(0===e||e===a)throw new E;1!==e&&e!==a-1||l++}let c=new Array(n*r-l),h=0;for(let t=0;t<n;t++){let e=s[t];if(1===e||e===a-1)c.fill(e>1,h,h+r-1),h+=r-1;else for(let t=r-1;t>=0;--t)c[h++]=0!=(e&1<<t)}return c}extractBits(t){let e=this.ddata.isCompact(),r=this.ddata.getNbLayers(),n=(e?11:14)+4*r,i=new Int32Array(n),o=new Array(this.totalBitsInLayer(r,e));if(e)for(let t=0;t<i.length;t++)i[t]=t;else{let t=n+1+2*m.truncDivision(m.truncDivision(n,2)-1,15),e=n/2,r=m.truncDivision(t,2);for(let t=0;t<e;t++){let n=t+m.truncDivision(t,15);i[e-t-1]=r-n-1,i[e+t]=r+n+1}}for(let s=0,a=0;s<r;s++){let l=4*(r-s)+(e?9:12),c=2*s,h=n-1-c;for(let e=0;e<l;e++){let r=2*e;for(let n=0;n<2;n++)o[a+r+n]=t.get(i[c+n],i[c+e]),o[a+2*l+r+n]=t.get(i[c+e],i[h-n]),o[a+4*l+r+n]=t.get(i[h-n],i[h-e]),o[a+6*l+r+n]=t.get(i[h-e],i[c+n])}a+=8*l}return o}static readCode(t,e,r){let n=0;for(let i=e;i<e+r;i++)n<<=1,t[i]&&(n|=1);return n}static readByte(t,e){let r=t.length-e;return r>=8?et.readCode(t,e,8):et.readCode(t,e,r)<<8-r}static convertBoolArrayToByteArray(t){let e=new Uint8Array((t.length+7)/8);for(let r=0;r<e.length;r++)e[r]=et.readByte(t,8*r);return e}totalBitsInLayer(t,e){return((e?88:112)+16*t)*t}}et.UPPER_TABLE=["CTRL_PS"," ","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","CTRL_LL","CTRL_ML","CTRL_DL","CTRL_BS"],et.LOWER_TABLE=["CTRL_PS"," ","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","CTRL_US","CTRL_ML","CTRL_DL","CTRL_BS"],et.MIXED_TABLE=["CTRL_PS"," ","\\1","\\2","\\3","\\4","\\5","\\6","\\7","\b","\t","\n","\\13","\f","\r","\\33","\\34","\\35","\\36","\\37","@","\\","^","_","`","|","~","\\177","CTRL_LL","CTRL_UL","CTRL_PL","CTRL_BS"],et.PUNCT_TABLE=["","\r","\r\n",". ",", ",": ","!",'"',"#","$","%","&","'","(",")","*","+",",","-",".","/",":",";","<","=",">","?","[","]","{","}","CTRL_UL"],et.DIGIT_TABLE=["CTRL_PS"," ","0","1","2","3","4","5","6","7","8","9",",",".","CTRL_UL","CTRL_US"];class rt{constructor(){}static round(t){return NaN===t?0:t<=Number.MIN_SAFE_INTEGER?Number.MIN_SAFE_INTEGER:t>=Number.MAX_SAFE_INTEGER?Number.MAX_SAFE_INTEGER:t+(t<0?-.5:.5)|0}static distance(t,e,r,n){const i=t-r,o=e-n;return Math.sqrt(i*i+o*o)}static sum(t){let e=0;for(let r=0,n=t.length;r!==n;r++)e+=t[r];return e}}class nt{static floatToIntBits(t){return t}}nt.MAX_VALUE=Number.MAX_SAFE_INTEGER;class it{constructor(t,e){this.x=t,this.y=e}getX(){return this.x}getY(){return this.y}equals(t){if(t instanceof it){const e=t;return this.x===e.x&&this.y===e.y}return!1}hashCode(){return 31*nt.floatToIntBits(this.x)+nt.floatToIntBits(this.y)}toString(){return"("+this.x+","+this.y+")"}static orderBestPatterns(t){const e=this.distance(t[0],t[1]),r=this.distance(t[1],t[2]),n=this.distance(t[0],t[2]);let i,o,s;if(r>=e&&r>=n?(o=t[0],i=t[1],s=t[2]):n>=r&&n>=e?(o=t[1],i=t[0],s=t[2]):(o=t[2],i=t[0],s=t[1]),this.crossProductZ(i,o,s)<0){const t=i;i=s,s=t}t[0]=i,t[1]=o,t[2]=s}static distance(t,e){return rt.distance(t.x,t.y,e.x,e.y)}static crossProductZ(t,e,r){const n=e.x,i=e.y;return(r.x-n)*(t.y-i)-(r.y-i)*(t.x-n)}}class ot{constructor(t,e){this.bits=t,this.points=e}getBits(){return this.bits}getPoints(){return this.points}}class st extends ot{constructor(t,e,r,n,i){super(t,e),this.compact=r,this.nbDatablocks=n,this.nbLayers=i}getNbLayers(){return this.nbLayers}getNbDatablocks(){return this.nbDatablocks}isCompact(){return this.compact}}class at{constructor(t,e,r,n){this.image=t,this.height=t.getHeight(),this.width=t.getWidth(),null==e&&(e=at.INIT_SIZE),null==r&&(r=t.getWidth()/2|0),null==n&&(n=t.getHeight()/2|0);const i=e/2|0;if(this.leftInit=r-i,this.rightInit=r+i,this.upInit=n-i,this.downInit=n+i,this.upInit<0||this.leftInit<0||this.downInit>=this.height||this.rightInit>=this.width)throw new D}detect(){let t=this.leftInit,e=this.rightInit,r=this.upInit,n=this.downInit,i=!1,o=!0,s=!1,a=!1,l=!1,c=!1,h=!1;const u=this.width,d=this.height;for(;o;){o=!1;let f=!0;for(;(f||!a)&&e<u;)f=this.containsBlackPoint(r,n,e,!1),f?(e++,o=!0,a=!0):a||e++;if(e>=u){i=!0;break}let g=!0;for(;(g||!l)&&n<d;)g=this.containsBlackPoint(t,e,n,!0),g?(n++,o=!0,l=!0):l||n++;if(n>=d){i=!0;break}let w=!0;for(;(w||!c)&&t>=0;)w=this.containsBlackPoint(r,n,t,!1),w?(t--,o=!0,c=!0):c||t--;if(t<0){i=!0;break}let m=!0;for(;(m||!h)&&r>=0;)m=this.containsBlackPoint(t,e,r,!0),m?(r--,o=!0,h=!0):h||r--;if(r<0){i=!0;break}o&&(s=!0)}if(!i&&s){const i=e-t;let o=null;for(let e=1;null===o&&e<i;e++)o=this.getBlackPointOnSegment(t,n-e,t+e,n);if(null==o)throw new D;let s=null;for(let e=1;null===s&&e<i;e++)s=this.getBlackPointOnSegment(t,r+e,t+e,r);if(null==s)throw new D;let a=null;for(let t=1;null===a&&t<i;t++)a=this.getBlackPointOnSegment(e,r+t,e-t,r);if(null==a)throw new D;let l=null;for(let t=1;null===l&&t<i;t++)l=this.getBlackPointOnSegment(e,n-t,e-t,n);if(null==l)throw new D;return this.centerEdges(l,o,a,s)}throw new D}getBlackPointOnSegment(t,e,r,n){const i=rt.round(rt.distance(t,e,r,n)),o=(r-t)/i,s=(n-e)/i,a=this.image;for(let r=0;r<i;r++){const n=rt.round(t+r*o),i=rt.round(e+r*s);if(a.get(n,i))return new it(n,i)}return null}centerEdges(t,e,r,n){const i=t.getX(),o=t.getY(),s=e.getX(),a=e.getY(),l=r.getX(),c=r.getY(),h=n.getX(),u=n.getY(),d=at.CORR;return i<this.width/2?[new it(h-d,u+d),new it(s+d,a+d),new it(l-d,c-d),new it(i+d,o-d)]:[new it(h+d,u+d),new it(s+d,a-d),new it(l-d,c+d),new it(i-d,o-d)]}containsBlackPoint(t,e,r,n){const i=this.image;if(n){for(let n=t;n<=e;n++)if(i.get(n,r))return!0}else for(let n=t;n<=e;n++)if(i.get(r,n))return!0;return!1}}at.INIT_SIZE=10,at.CORR=1;class lt{static checkAndNudgePoints(t,e){const r=t.getWidth(),n=t.getHeight();let i=!0;for(let t=0;t<e.length&&i;t+=2){const o=Math.floor(e[t]),s=Math.floor(e[t+1]);if(o<-1||o>r||s<-1||s>n)throw new D;i=!1,-1===o?(e[t]=0,i=!0):o===r&&(e[t]=r-1,i=!0),-1===s?(e[t+1]=0,i=!0):s===n&&(e[t+1]=n-1,i=!0)}i=!0;for(let t=e.length-2;t>=0&&i;t-=2){const o=Math.floor(e[t]),s=Math.floor(e[t+1]);if(o<-1||o>r||s<-1||s>n)throw new D;i=!1,-1===o?(e[t]=0,i=!0):o===r&&(e[t]=r-1,i=!0),-1===s?(e[t+1]=0,i=!0):s===n&&(e[t+1]=n-1,i=!0)}}}class ct{constructor(t,e,r,n,i,o,s,a,l){this.a11=t,this.a21=e,this.a31=r,this.a12=n,this.a22=i,this.a32=o,this.a13=s,this.a23=a,this.a33=l}static quadrilateralToQuadrilateral(t,e,r,n,i,o,s,a,l,c,h,u,d,f,g,w){const m=ct.quadrilateralToSquare(t,e,r,n,i,o,s,a);return ct.squareToQuadrilateral(l,c,h,u,d,f,g,w).times(m)}transformPoints(t){const e=t.length,r=this.a11,n=this.a12,i=this.a13,o=this.a21,s=this.a22,a=this.a23,l=this.a31,c=this.a32,h=this.a33;for(let u=0;u<e;u+=2){const e=t[u],d=t[u+1],f=i*e+a*d+h;t[u]=(r*e+o*d+l)/f,t[u+1]=(n*e+s*d+c)/f}}transformPointsWithValues(t,e){const r=this.a11,n=this.a12,i=this.a13,o=this.a21,s=this.a22,a=this.a23,l=this.a31,c=this.a32,h=this.a33,u=t.length;for(let d=0;d<u;d++){const u=t[d],f=e[d],g=i*u+a*f+h;t[d]=(r*u+o*f+l)/g,e[d]=(n*u+s*f+c)/g}}static squareToQuadrilateral(t,e,r,n,i,o,s,a){const l=t-r+i-s,c=e-n+o-a;if(0===l&&0===c)return new ct(r-t,i-r,t,n-e,o-n,e,0,0,1);{const h=r-i,u=s-i,d=n-o,f=a-o,g=h*f-u*d,w=(l*f-u*c)/g,m=(h*c-l*d)/g;return new ct(r-t+w*r,s-t+m*s,t,n-e+w*n,a-e+m*a,e,w,m,1)}}static quadrilateralToSquare(t,e,r,n,i,o,s,a){return ct.squareToQuadrilateral(t,e,r,n,i,o,s,a).buildAdjoint()}buildAdjoint(){return new ct(this.a22*this.a33-this.a23*this.a32,this.a23*this.a31-this.a21*this.a33,this.a21*this.a32-this.a22*this.a31,this.a13*this.a32-this.a12*this.a33,this.a11*this.a33-this.a13*this.a31,this.a12*this.a31-this.a11*this.a32,this.a12*this.a23-this.a13*this.a22,this.a13*this.a21-this.a11*this.a23,this.a11*this.a22-this.a12*this.a21)}times(t){return new ct(this.a11*t.a11+this.a21*t.a12+this.a31*t.a13,this.a11*t.a21+this.a21*t.a22+this.a31*t.a23,this.a11*t.a31+this.a21*t.a32+this.a31*t.a33,this.a12*t.a11+this.a22*t.a12+this.a32*t.a13,this.a12*t.a21+this.a22*t.a22+this.a32*t.a23,this.a12*t.a31+this.a22*t.a32+this.a32*t.a33,this.a13*t.a11+this.a23*t.a12+this.a33*t.a13,this.a13*t.a21+this.a23*t.a22+this.a33*t.a23,this.a13*t.a31+this.a23*t.a32+this.a33*t.a33)}}class ht extends lt{sampleGrid(t,e,r,n,i,o,s,a,l,c,h,u,d,f,g,w,m,p,A){const C=ct.quadrilateralToQuadrilateral(n,i,o,s,a,l,c,h,u,d,f,g,w,m,p,A);return this.sampleGridWithTransform(t,e,r,C)}sampleGridWithTransform(t,e,r,n){if(e<=0||r<=0)throw new D;const i=new N(e,r),o=new Float32Array(2*e);for(let e=0;e<r;e++){const r=o.length,s=e+.5;for(let t=0;t<r;t+=2)o[t]=t/2+.5,o[t+1]=s;n.transformPoints(o),lt.checkAndNudgePoints(t,o);try{for(let n=0;n<r;n+=2)t.get(Math.floor(o[n]),Math.floor(o[n+1]))&&i.set(n/2,e)}catch(t){throw new D}}return i}}class ut{static setGridSampler(t){ut.gridSampler=t}static getInstance(){return ut.gridSampler}}ut.gridSampler=new ht;class dt{constructor(t,e){this.x=t,this.y=e}toResultPoint(){return new it(this.getX(),this.getY())}getX(){return this.x}getY(){return this.y}}class ft{constructor(t){this.EXPECTED_CORNER_BITS=new Int32Array([3808,476,2107,1799]),this.image=t}detect(){return this.detectMirror(!1)}detectMirror(t){let e=this.getMatrixCenter(),r=this.getBullsEyeCorners(e);if(t){let t=r[0];r[0]=r[2],r[2]=t}this.extractParameters(r);let n=this.sampleGrid(this.image,r[this.shift%4],r[(this.shift+1)%4],r[(this.shift+2)%4],r[(this.shift+3)%4]),i=this.getMatrixCornerPoints(r);return new st(n,i,this.compact,this.nbDataBlocks,this.nbLayers)}extractParameters(t){if(!(this.isValidPoint(t[0])&&this.isValidPoint(t[1])&&this.isValidPoint(t[2])&&this.isValidPoint(t[3])))throw new D;let e=2*this.nbCenterLayers,r=new Int32Array([this.sampleLine(t[0],t[1],e),this.sampleLine(t[1],t[2],e),this.sampleLine(t[2],t[3],e),this.sampleLine(t[3],t[0],e)]);this.shift=this.getRotation(r,e);let n=0;for(let t=0;t<4;t++){let e=r[(this.shift+t)%4];this.compact?(n<<=7,n+=e>>1&127):(n<<=10,n+=(e>>2&992)+(e>>1&31))}let i=this.getCorrectedParameterData(n,this.compact);this.compact?(this.nbLayers=1+(i>>6),this.nbDataBlocks=1+(63&i)):(this.nbLayers=1+(i>>11),this.nbDataBlocks=1+(2047&i))}getRotation(t,e){let r=0;t.forEach(((t,n,i)=>{r=(t>>e-2<<1)+(1&t)+(r<<3)})),r=((1&r)<<11)+(r>>1);for(let t=0;t<4;t++)if(m.bitCount(r^this.EXPECTED_CORNER_BITS[t])<=2)return t;throw new D}getCorrectedParameterData(t,e){let r,n;e?(r=7,n=2):(r=10,n=4);let i=r-n,o=new Int32Array(r);for(let e=r-1;e>=0;--e)o[e]=15&t,t>>=4;try{new tt(q.AZTEC_PARAM).decode(o,i)}catch(t){throw new D}let s=0;for(let t=0;t<n;t++)s=(s<<4)+o[t];return s}getBullsEyeCorners(t){let e=t,r=t,n=t,i=t,o=!0;for(this.nbCenterLayers=1;this.nbCenterLayers<9;this.nbCenterLayers++){let t=this.getFirstDifferent(e,o,1,-1),s=this.getFirstDifferent(r,o,1,1),a=this.getFirstDifferent(n,o,-1,1),l=this.getFirstDifferent(i,o,-1,-1);if(this.nbCenterLayers>2){let r=this.distancePoint(l,t)*this.nbCenterLayers/(this.distancePoint(i,e)*(this.nbCenterLayers+2));if(r<.75||r>1.25||!this.isWhiteOrBlackRectangle(t,s,a,l))break}e=t,r=s,n=a,i=l,o=!o}if(5!==this.nbCenterLayers&&7!==this.nbCenterLayers)throw new D;this.compact=5===this.nbCenterLayers;let s=new it(e.getX()+.5,e.getY()-.5),a=new it(r.getX()+.5,r.getY()+.5),l=new it(n.getX()-.5,n.getY()+.5),c=new it(i.getX()-.5,i.getY()-.5);return this.expandSquare([s,a,l,c],2*this.nbCenterLayers-3,2*this.nbCenterLayers)}getMatrixCenter(){let t,e,r,n;try{let i=new at(this.image).detect();t=i[0],e=i[1],r=i[2],n=i[3]}catch(i){let o=this.image.getWidth()/2,s=this.image.getHeight()/2;t=this.getFirstDifferent(new dt(o+7,s-7),!1,1,-1).toResultPoint(),e=this.getFirstDifferent(new dt(o+7,s+7),!1,1,1).toResultPoint(),r=this.getFirstDifferent(new dt(o-7,s+7),!1,-1,1).toResultPoint(),n=this.getFirstDifferent(new dt(o-7,s-7),!1,-1,-1).toResultPoint()}let i=rt.round((t.getX()+n.getX()+e.getX()+r.getX())/4),o=rt.round((t.getY()+n.getY()+e.getY()+r.getY())/4);try{let s=new at(this.image,15,i,o).detect();t=s[0],e=s[1],r=s[2],n=s[3]}catch(s){t=this.getFirstDifferent(new dt(i+7,o-7),!1,1,-1).toResultPoint(),e=this.getFirstDifferent(new dt(i+7,o+7),!1,1,1).toResultPoint(),r=this.getFirstDifferent(new dt(i-7,o+7),!1,-1,1).toResultPoint(),n=this.getFirstDifferent(new dt(i-7,o-7),!1,-1,-1).toResultPoint()}return i=rt.round((t.getX()+n.getX()+e.getX()+r.getX())/4),o=rt.round((t.getY()+n.getY()+e.getY()+r.getY())/4),new dt(i,o)}getMatrixCornerPoints(t){return this.expandSquare(t,2*this.nbCenterLayers,this.getDimension())}sampleGrid(t,e,r,n,i){let o=ut.getInstance(),s=this.getDimension(),a=s/2-this.nbCenterLayers,l=s/2+this.nbCenterLayers;return o.sampleGrid(t,s,s,a,a,l,a,l,l,a,l,e.getX(),e.getY(),r.getX(),r.getY(),n.getX(),n.getY(),i.getX(),i.getY())}sampleLine(t,e,r){let n=0,i=this.distanceResultPoint(t,e),o=i/r,s=t.getX(),a=t.getY(),l=o*(e.getX()-t.getX())/i,c=o*(e.getY()-t.getY())/i;for(let t=0;t<r;t++)this.image.get(rt.round(s+t*l),rt.round(a+t*c))&&(n|=1<<r-t-1);return n}isWhiteOrBlackRectangle(t,e,r,n){t=new dt(t.getX()-3,t.getY()+3),e=new dt(e.getX()-3,e.getY()-3),r=new dt(r.getX()+3,r.getY()-3),n=new dt(n.getX()+3,n.getY()+3);let i=this.getColor(n,t);if(0===i)return!1;let o=this.getColor(t,e);return o===i&&(o=this.getColor(e,r),o===i&&(o=this.getColor(r,n),o===i))}getColor(t,e){let r=this.distancePoint(t,e),n=(e.getX()-t.getX())/r,i=(e.getY()-t.getY())/r,o=0,s=t.getX(),a=t.getY(),l=this.image.get(t.getX(),t.getY()),c=Math.ceil(r);for(let t=0;t<c;t++)s+=n,a+=i,this.image.get(rt.round(s),rt.round(a))!==l&&o++;let h=o/r;return h>.1&&h<.9?0:h<=.1===l?1:-1}getFirstDifferent(t,e,r,n){let i=t.getX()+r,o=t.getY()+n;for(;this.isValid(i,o)&&this.image.get(i,o)===e;)i+=r,o+=n;for(i-=r,o-=n;this.isValid(i,o)&&this.image.get(i,o)===e;)i+=r;for(i-=r;this.isValid(i,o)&&this.image.get(i,o)===e;)o+=n;return o-=n,new dt(i,o)}expandSquare(t,e,r){let n=r/(2*e),i=t[0].getX()-t[2].getX(),o=t[0].getY()-t[2].getY(),s=(t[0].getX()+t[2].getX())/2,a=(t[0].getY()+t[2].getY())/2,l=new it(s+n*i,a+n*o),c=new it(s-n*i,a-n*o);return i=t[1].getX()-t[3].getX(),o=t[1].getY()-t[3].getY(),s=(t[1].getX()+t[3].getX())/2,a=(t[1].getY()+t[3].getY())/2,[l,new it(s+n*i,a+n*o),c,new it(s-n*i,a-n*o)]}isValid(t,e){return t>=0&&t<this.image.getWidth()&&e>0&&e<this.image.getHeight()}isValidPoint(t){let e=rt.round(t.getX()),r=rt.round(t.getY());return this.isValid(e,r)}distancePoint(t,e){return rt.distance(t.getX(),t.getY(),e.getX(),e.getY())}distanceResultPoint(t,e){return rt.distance(t.getX(),t.getY(),e.getX(),e.getY())}getDimension(){return this.compact?4*this.nbLayers+11:this.nbLayers<=4?4*this.nbLayers+15:4*this.nbLayers+2*(m.truncDivision(this.nbLayers-4,8)+1)+15}}class gt{decode(t,e=null){let r=null,n=new ft(t.getBlackMatrix()),i=null,o=null;try{let t=n.detectMirror(!1);i=t.getPoints(),this.reportFoundResultPoints(e,i),o=(new et).decode(t)}catch(t){r=t}if(null==o)try{let t=n.detectMirror(!0);i=t.getPoints(),this.reportFoundResultPoints(e,i),o=(new et).decode(t)}catch(t){if(null!=r)throw r;throw t}let s=new x(o.getText(),o.getRawBytes(),o.getNumBits(),i,U.AZTEC,d.currentTimeMillis()),a=o.getByteSegments();null!=a&&s.putMetadata(W.BYTE_SEGMENTS,a);let l=o.getECLevel();return null!=l&&s.putMetadata(W.ERROR_CORRECTION_LEVEL,l),s}reportFoundResultPoints(t,e){if(null!=t){let r=t.get(C.NEED_RESULT_POINT_CALLBACK);null!=r&&e.forEach(((t,e,n)=>{r.foundPossibleResultPoint(t)}))}}reset(){}}class wt{decode(t,e){try{return this.doDecode(t,e)}catch(r){if(e&&!0===e.get(C.TRY_HARDER)&&t.isRotateSupported()){const r=t.rotateCounterClockwise(),n=this.doDecode(r,e),i=n.getResultMetadata();let o=270;null!==i&&!0===i.get(W.ORIENTATION)&&(o+=i.get(W.ORIENTATION)%360),n.putMetadata(W.ORIENTATION,o);const s=n.getResultPoints();if(null!==s){const t=r.getHeight();for(let e=0;e<s.length;e++)s[e]=new it(t-s[e].getY()-1,s[e].getX())}return n}throw new D}}reset(){}doDecode(t,e){const r=t.getWidth(),n=t.getHeight();let i=new p(r);const o=e&&!0===e.get(C.TRY_HARDER),s=Math.max(1,n>>(o?8:5));let a;a=o?n:15;const l=Math.trunc(n/2);for(let o=0;o<a;o++){const a=Math.trunc((o+1)/2),c=l+s*(0==(1&o)?a:-a);if(c<0||c>=n)break;try{i=t.getBlackRow(c,i)}catch(t){continue}for(let t=0;t<2;t++){if(1===t&&(i.reverse(),e&&!0===e.get(C.NEED_RESULT_POINT_CALLBACK))){const t=new Map;e.forEach(((e,r)=>t.set(r,e))),t.delete(C.NEED_RESULT_POINT_CALLBACK),e=t}try{const n=this.decodeRow(c,i,e);if(1===t){n.putMetadata(W.ORIENTATION,180);const t=n.getResultPoints();null!==t&&(t[0]=new it(r-t[0].getX()-1,t[0].getY()),t[1]=new it(r-t[1].getX()-1,t[1].getY()))}return n}catch(t){}}}throw new D}static recordPattern(t,e,r){const n=r.length;for(let t=0;t<n;t++)r[t]=0;const i=t.getSize();if(e>=i)throw new D;let o=!t.get(e),s=0,a=e;for(;a<i;){if(t.get(a)!==o)r[s]++;else{if(++s===n)break;r[s]=1,o=!o}a++}if(s!==n&&(s!==n-1||a!==i))throw new D}static recordPatternInReverse(t,e,r){let n=r.length,i=t.get(e);for(;e>0&&n>=0;)t.get(--e)!==i&&(n--,i=!i);if(n>=0)throw new D;wt.recordPattern(t,e+1,r)}static patternMatchVariance(t,e,r){const n=t.length;let i=0,o=0;for(let r=0;r<n;r++)i+=t[r],o+=e[r];if(i<o)return Number.POSITIVE_INFINITY;const s=i/o;r*=s;let a=0;for(let i=0;i<n;i++){const n=t[i],o=e[i]*s,l=n>o?n-o:o-n;if(l>r)return Number.POSITIVE_INFINITY;a+=l}return a/i}}class mt extends wt{static findStartPattern(t){const e=t.getSize(),r=t.getNextSet(0);let n=0,i=Int32Array.from([0,0,0,0,0,0]),o=r,s=!1;for(let a=r;a<e;a++)if(t.get(a)!==s)i[n]++;else{if(5===n){let e=mt.MAX_AVG_VARIANCE,r=-1;for(let t=mt.CODE_START_A;t<=mt.CODE_START_C;t++){const n=wt.patternMatchVariance(i,mt.CODE_PATTERNS[t],mt.MAX_INDIVIDUAL_VARIANCE);n<e&&(e=n,r=t)}if(r>=0&&t.isRange(Math.max(0,o-(a-o)/2),o,!1))return Int32Array.from([o,a,r]);o+=i[0]+i[1],i=i.slice(2,i.length-1),i[n-1]=0,i[n]=0,n--}else n++;i[n]=1,s=!s}throw new D}static decodeCode(t,e,r){wt.recordPattern(t,r,e);let n=mt.MAX_AVG_VARIANCE,i=-1;for(let t=0;t<mt.CODE_PATTERNS.length;t++){const r=mt.CODE_PATTERNS[t],o=this.patternMatchVariance(e,r,mt.MAX_INDIVIDUAL_VARIANCE);o<n&&(n=o,i=t)}if(i>=0)return i;throw new D}decodeRow(t,e,r){const n=r&&!0===r.get(C.ASSUME_GS1),i=mt.findStartPattern(e),o=i[2];let s=0;const a=new Uint8Array(20);let l;switch(a[s++]=o,o){case mt.CODE_START_A:l=mt.CODE_CODE_A;break;case mt.CODE_START_B:l=mt.CODE_CODE_B;break;case mt.CODE_START_C:l=mt.CODE_CODE_C;break;default:throw new E}let c=!1,u=!1,d="",f=i[0],g=i[1];const w=Int32Array.from([0,0,0,0,0,0]);let m=0,p=0,A=o,I=0,S=!0,_=!1,T=!1;for(;!c;){const t=u;switch(u=!1,m=p,p=mt.decodeCode(e,w,g),a[s++]=p,p!==mt.CODE_STOP&&(S=!0),p!==mt.CODE_STOP&&(I++,A+=I*p),f=g,g+=w.reduce(((t,e)=>t+e),0),p){case mt.CODE_START_A:case mt.CODE_START_B:case mt.CODE_START_C:throw new E}switch(l){case mt.CODE_CODE_A:if(p<64)d+=T===_?String.fromCharCode(" ".charCodeAt(0)+p):String.fromCharCode(" ".charCodeAt(0)+p+128),T=!1;else if(p<96)d+=T===_?String.fromCharCode(p-64):String.fromCharCode(p+64),T=!1;else switch(p!==mt.CODE_STOP&&(S=!1),p){case mt.CODE_FNC_1:n&&(0===d.length?d+="]C1":d+=String.fromCharCode(29));break;case mt.CODE_FNC_2:case mt.CODE_FNC_3:break;case mt.CODE_FNC_4_A:!_&&T?(_=!0,T=!1):_&&T?(_=!1,T=!1):T=!0;break;case mt.CODE_SHIFT:u=!0,l=mt.CODE_CODE_B;break;case mt.CODE_CODE_B:l=mt.CODE_CODE_B;break;case mt.CODE_CODE_C:l=mt.CODE_CODE_C;break;case mt.CODE_STOP:c=!0}break;case mt.CODE_CODE_B:if(p<96)d+=T===_?String.fromCharCode(" ".charCodeAt(0)+p):String.fromCharCode(" ".charCodeAt(0)+p+128),T=!1;else switch(p!==mt.CODE_STOP&&(S=!1),p){case mt.CODE_FNC_1:n&&(0===d.length?d+="]C1":d+=String.fromCharCode(29));break;case mt.CODE_FNC_2:case mt.CODE_FNC_3:break;case mt.CODE_FNC_4_B:!_&&T?(_=!0,T=!1):_&&T?(_=!1,T=!1):T=!0;break;case mt.CODE_SHIFT:u=!0,l=mt.CODE_CODE_A;break;case mt.CODE_CODE_A:l=mt.CODE_CODE_A;break;case mt.CODE_CODE_C:l=mt.CODE_CODE_C;break;case mt.CODE_STOP:c=!0}break;case mt.CODE_CODE_C:if(p<100)p<10&&(d+="0"),d+=p;else switch(p!==mt.CODE_STOP&&(S=!1),p){case mt.CODE_FNC_1:n&&(0===d.length?d+="]C1":d+=String.fromCharCode(29));break;case mt.CODE_CODE_A:l=mt.CODE_CODE_A;break;case mt.CODE_CODE_B:l=mt.CODE_CODE_B;break;case mt.CODE_STOP:c=!0}}t&&(l=l===mt.CODE_CODE_A?mt.CODE_CODE_B:mt.CODE_CODE_A)}const y=g-f;if(g=e.getNextUnset(g),!e.isRange(g,Math.min(e.getSize(),g+(g-f)/2),!1))throw new D;if(A-=I*m,A%103!==m)throw new h;const N=d.length;if(0===N)throw new D;N>0&&S&&(d=l===mt.CODE_CODE_C?d.substring(0,N-2):d.substring(0,N-1));const M=(i[1]+i[0])/2,R=f+y/2,O=a.length,b=new Uint8Array(O);for(let t=0;t<O;t++)b[t]=a[t];const B=[new it(M,t),new it(R,t)];return new x(d,b,0,B,U.CODE_128,(new Date).getTime())}}mt.CODE_PATTERNS=[Int32Array.from([2,1,2,2,2,2]),Int32Array.from([2,2,2,1,2,2]),Int32Array.from([2,2,2,2,2,1]),Int32Array.from([1,2,1,2,2,3]),Int32Array.from([1,2,1,3,2,2]),Int32Array.from([1,3,1,2,2,2]),Int32Array.from([1,2,2,2,1,3]),Int32Array.from([1,2,2,3,1,2]),Int32Array.from([1,3,2,2,1,2]),Int32Array.from([2,2,1,2,1,3]),Int32Array.from([2,2,1,3,1,2]),Int32Array.from([2,3,1,2,1,2]),Int32Array.from([1,1,2,2,3,2]),Int32Array.from([1,2,2,1,3,2]),Int32Array.from([1,2,2,2,3,1]),Int32Array.from([1,1,3,2,2,2]),Int32Array.from([1,2,3,1,2,2]),Int32Array.from([1,2,3,2,2,1]),Int32Array.from([2,2,3,2,1,1]),Int32Array.from([2,2,1,1,3,2]),Int32Array.from([2,2,1,2,3,1]),Int32Array.from([2,1,3,2,1,2]),Int32Array.from([2,2,3,1,1,2]),Int32Array.from([3,1,2,1,3,1]),Int32Array.from([3,1,1,2,2,2]),Int32Array.from([3,2,1,1,2,2]),Int32Array.from([3,2,1,2,2,1]),Int32Array.from([3,1,2,2,1,2]),Int32Array.from([3,2,2,1,1,2]),Int32Array.from([3,2,2,2,1,1]),Int32Array.from([2,1,2,1,2,3]),Int32Array.from([2,1,2,3,2,1]),Int32Array.from([2,3,2,1,2,1]),Int32Array.from([1,1,1,3,2,3]),Int32Array.from([1,3,1,1,2,3]),Int32Array.from([1,3,1,3,2,1]),Int32Array.from([1,1,2,3,1,3]),Int32Array.from([1,3,2,1,1,3]),Int32Array.from([1,3,2,3,1,1]),Int32Array.from([2,1,1,3,1,3]),Int32Array.from([2,3,1,1,1,3]),Int32Array.from([2,3,1,3,1,1]),Int32Array.from([1,1,2,1,3,3]),Int32Array.from([1,1,2,3,3,1]),Int32Array.from([1,3,2,1,3,1]),Int32Array.from([1,1,3,1,2,3]),Int32Array.from([1,1,3,3,2,1]),Int32Array.from([1,3,3,1,2,1]),Int32Array.from([3,1,3,1,2,1]),Int32Array.from([2,1,1,3,3,1]),Int32Array.from([2,3,1,1,3,1]),Int32Array.from([2,1,3,1,1,3]),Int32Array.from([2,1,3,3,1,1]),Int32Array.from([2,1,3,1,3,1]),Int32Array.from([3,1,1,1,2,3]),Int32Array.from([3,1,1,3,2,1]),Int32Array.from([3,3,1,1,2,1]),Int32Array.from([3,1,2,1,1,3]),Int32Array.from([3,1,2,3,1,1]),Int32Array.from([3,3,2,1,1,1]),Int32Array.from([3,1,4,1,1,1]),Int32Array.from([2,2,1,4,1,1]),Int32Array.from([4,3,1,1,1,1]),Int32Array.from([1,1,1,2,2,4]),Int32Array.from([1,1,1,4,2,2]),Int32Array.from([1,2,1,1,2,4]),Int32Array.from([1,2,1,4,2,1]),Int32Array.from([1,4,1,1,2,2]),Int32Array.from([1,4,1,2,2,1]),Int32Array.from([1,1,2,2,1,4]),Int32Array.from([1,1,2,4,1,2]),Int32Array.from([1,2,2,1,1,4]),Int32Array.from([1,2,2,4,1,1]),Int32Array.from([1,4,2,1,1,2]),Int32Array.from([1,4,2,2,1,1]),Int32Array.from([2,4,1,2,1,1]),Int32Array.from([2,2,1,1,1,4]),Int32Array.from([4,1,3,1,1,1]),Int32Array.from([2,4,1,1,1,2]),Int32Array.from([1,3,4,1,1,1]),Int32Array.from([1,1,1,2,4,2]),Int32Array.from([1,2,1,1,4,2]),Int32Array.from([1,2,1,2,4,1]),Int32Array.from([1,1,4,2,1,2]),Int32Array.from([1,2,4,1,1,2]),Int32Array.from([1,2,4,2,1,1]),Int32Array.from([4,1,1,2,1,2]),Int32Array.from([4,2,1,1,1,2]),Int32Array.from([4,2,1,2,1,1]),Int32Array.from([2,1,2,1,4,1]),Int32Array.from([2,1,4,1,2,1]),Int32Array.from([4,1,2,1,2,1]),Int32Array.from([1,1,1,1,4,3]),Int32Array.from([1,1,1,3,4,1]),Int32Array.from([1,3,1,1,4,1]),Int32Array.from([1,1,4,1,1,3]),Int32Array.from([1,1,4,3,1,1]),Int32Array.from([4,1,1,1,1,3]),Int32Array.from([4,1,1,3,1,1]),Int32Array.from([1,1,3,1,4,1]),Int32Array.from([1,1,4,1,3,1]),Int32Array.from([3,1,1,1,4,1]),Int32Array.from([4,1,1,1,3,1]),Int32Array.from([2,1,1,4,1,2]),Int32Array.from([2,1,1,2,1,4]),Int32Array.from([2,1,1,2,3,2]),Int32Array.from([2,3,3,1,1,1,2])],mt.MAX_AVG_VARIANCE=.25,mt.MAX_INDIVIDUAL_VARIANCE=.7,mt.CODE_SHIFT=98,mt.CODE_CODE_C=99,mt.CODE_CODE_B=100,mt.CODE_CODE_A=101,mt.CODE_FNC_1=102,mt.CODE_FNC_2=97,mt.CODE_FNC_3=96,mt.CODE_FNC_4_A=101,mt.CODE_FNC_4_B=100,mt.CODE_START_A=103,mt.CODE_START_B=104,mt.CODE_START_C=105,mt.CODE_STOP=106;class pt extends wt{constructor(t=!1,e=!1){super(),this.usingCheckDigit=t,this.extendedMode=e,this.decodeRowResult="",this.counters=new Int32Array(9)}decodeRow(t,e,r){let n=this.counters;n.fill(0),this.decodeRowResult="";let i,o,s=pt.findAsteriskPattern(e,n),a=e.getNextSet(s[1]),l=e.getSize();do{pt.recordPattern(e,a,n);let t=pt.toNarrowWidePattern(n);if(t<0)throw new D;i=pt.patternToChar(t),this.decodeRowResult+=i,o=a;for(let t of n)a+=t;a=e.getNextSet(a)}while("*"!==i);this.decodeRowResult=this.decodeRowResult.substring(0,this.decodeRowResult.length-1);let c,u=0;for(let t of n)u+=t;if(a!==l&&2*(a-o-u)<u)throw new D;if(this.usingCheckDigit){let t=this.decodeRowResult.length-1,e=0;for(let r=0;r<t;r++)e+=pt.ALPHABET_STRING.indexOf(this.decodeRowResult.charAt(r));if(this.decodeRowResult.charAt(t)!==pt.ALPHABET_STRING.charAt(e%43))throw new h;this.decodeRowResult=this.decodeRowResult.substring(0,t)}if(0===this.decodeRowResult.length)throw new D;c=this.extendedMode?pt.decodeExtended(this.decodeRowResult):this.decodeRowResult;let d=(s[1]+s[0])/2,f=o+u/2;return new x(c,null,0,[new it(d,t),new it(f,t)],U.CODE_39,(new Date).getTime())}static findAsteriskPattern(t,e){let r=t.getSize(),n=t.getNextSet(0),i=0,o=n,s=!1,a=e.length;for(let l=n;l<r;l++)if(t.get(l)!==s)e[i]++;else{if(i===a-1){if(this.toNarrowWidePattern(e)===pt.ASTERISK_ENCODING&&t.isRange(Math.max(0,o-Math.floor((l-o)/2)),o,!1))return[o,l];o+=e[0]+e[1],e.copyWithin(0,2,2+i-1),e[i-1]=0,e[i]=0,i--}else i++;e[i]=1,s=!s}throw new D}static toNarrowWidePattern(t){let e,r=t.length,n=0;do{let i=2147483647;for(let e of t)e<i&&e>n&&(i=e);n=i,e=0;let o=0,s=0;for(let i=0;i<r;i++){let a=t[i];a>n&&(s|=1<<r-1-i,e++,o+=a)}if(3===e){for(let i=0;i<r&&e>0;i++){let r=t[i];if(r>n&&(e--,2*r>=o))return-1}return s}}while(e>3);return-1}static patternToChar(t){for(let e=0;e<pt.CHARACTER_ENCODINGS.length;e++)if(pt.CHARACTER_ENCODINGS[e]===t)return pt.ALPHABET_STRING.charAt(e);if(t===pt.ASTERISK_ENCODING)return"*";throw new D}static decodeExtended(t){let e=t.length,r="";for(let n=0;n<e;n++){let e=t.charAt(n);if("+"===e||"$"===e||"%"===e||"/"===e){let i=t.charAt(n+1),o="\0";switch(e){case"+":if(!(i>="A"&&i<="Z"))throw new E;o=String.fromCharCode(i.charCodeAt(0)+32);break;case"$":if(!(i>="A"&&i<="Z"))throw new E;o=String.fromCharCode(i.charCodeAt(0)-64);break;case"%":if(i>="A"&&i<="E")o=String.fromCharCode(i.charCodeAt(0)-38);else if(i>="F"&&i<="J")o=String.fromCharCode(i.charCodeAt(0)-11);else if(i>="K"&&i<="O")o=String.fromCharCode(i.charCodeAt(0)+16);else if(i>="P"&&i<="T")o=String.fromCharCode(i.charCodeAt(0)+43);else if("U"===i)o="\0";else if("V"===i)o="@";else if("W"===i)o="`";else{if("X"!==i&&"Y"!==i&&"Z"!==i)throw new E;o=""}break;case"/":if(i>="A"&&i<="O")o=String.fromCharCode(i.charCodeAt(0)-32);else{if("Z"!==i)throw new E;o=":"}}r+=o,n++}else r+=e}return r}}pt.ALPHABET_STRING="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%",pt.CHARACTER_ENCODINGS=[52,289,97,352,49,304,112,37,292,100,265,73,328,25,280,88,13,268,76,28,259,67,322,19,274,82,7,262,70,22,385,193,448,145,400,208,133,388,196,168,162,138,42],pt.ASTERISK_ENCODING=148;class At extends wt{constructor(){super(...arguments),this.narrowLineWidth=-1}decodeRow(t,e,r){let n=this.decodeStart(e),i=this.decodeEnd(e),o=new y;At.decodeMiddle(e,n[1],i[0],o);let s=o.toString(),a=null;null!=r&&(a=r.get(C.ALLOWED_LENGTHS)),null==a&&(a=At.DEFAULT_ALLOWED_LENGTHS);let l=s.length,c=!1,h=0;for(let t of a){if(l===t){c=!0;break}t>h&&(h=t)}if(!c&&l>h&&(c=!0),!c)throw new E;const u=[new it(n[1],t),new it(i[0],t)];return new x(s,null,0,u,U.ITF,(new Date).getTime())}static decodeMiddle(t,e,r,n){let i=new Int32Array(10),o=new Int32Array(5),s=new Int32Array(5);for(i.fill(0),o.fill(0),s.fill(0);e<r;){wt.recordPattern(t,e,i);for(let t=0;t<5;t++){let e=2*t;o[t]=i[e],s[t]=i[e+1]}let r=At.decodeDigit(o);n.append(r.toString()),r=this.decodeDigit(s),n.append(r.toString()),i.forEach((function(t){e+=t}))}}decodeStart(t){let e=At.skipWhiteSpace(t),r=At.findGuardPattern(t,e,At.START_PATTERN);return this.narrowLineWidth=(r[1]-r[0])/4,this.validateQuietZone(t,r[0]),r}validateQuietZone(t,e){let r=10*this.narrowLineWidth;r=r<e?r:e;for(let n=e-1;r>0&&n>=0&&!t.get(n);n--)r--;if(0!==r)throw new D}static skipWhiteSpace(t){const e=t.getSize(),r=t.getNextSet(0);if(r===e)throw new D;return r}decodeEnd(t){t.reverse();try{let e,r=At.skipWhiteSpace(t);try{e=At.findGuardPattern(t,r,At.END_PATTERN_REVERSED[0])}catch(n){n instanceof D&&(e=At.findGuardPattern(t,r,At.END_PATTERN_REVERSED[1]))}this.validateQuietZone(t,e[0]);let n=e[0];return e[0]=t.getSize()-e[1],e[1]=t.getSize()-n,e}finally{t.reverse()}}static findGuardPattern(t,e,r){let n=r.length,i=new Int32Array(n),o=t.getSize(),s=!1,a=0,l=e;i.fill(0);for(let c=e;c<o;c++)if(t.get(c)!==s)i[a]++;else{if(a===n-1){if(wt.patternMatchVariance(i,r,At.MAX_INDIVIDUAL_VARIANCE)<At.MAX_AVG_VARIANCE)return[l,c];l+=i[0]+i[1],d.arraycopy(i,2,i,0,a-1),i[a-1]=0,i[a]=0,a--}else a++;i[a]=1,s=!s}throw new D}static decodeDigit(t){let e=At.MAX_AVG_VARIANCE,r=-1,n=At.PATTERNS.length;for(let i=0;i<n;i++){let n=At.PATTERNS[i],o=wt.patternMatchVariance(t,n,At.MAX_INDIVIDUAL_VARIANCE);o<e?(e=o,r=i):o===e&&(r=-1)}if(r>=0)return r%10;throw new D}}At.PATTERNS=[Int32Array.from([1,1,2,2,1]),Int32Array.from([2,1,1,1,2]),Int32Array.from([1,2,1,1,2]),Int32Array.from([2,2,1,1,1]),Int32Array.from([1,1,2,1,2]),Int32Array.from([2,1,2,1,1]),Int32Array.from([1,2,2,1,1]),Int32Array.from([1,1,1,2,2]),Int32Array.from([2,1,1,2,1]),Int32Array.from([1,2,1,2,1]),Int32Array.from([1,1,3,3,1]),Int32Array.from([3,1,1,1,3]),Int32Array.from([1,3,1,1,3]),Int32Array.from([3,3,1,1,1]),Int32Array.from([1,1,3,1,3]),Int32Array.from([3,1,3,1,1]),Int32Array.from([1,3,3,1,1]),Int32Array.from([1,1,1,3,3]),Int32Array.from([3,1,1,3,1]),Int32Array.from([1,3,1,3,1])],At.MAX_AVG_VARIANCE=.38,At.MAX_INDIVIDUAL_VARIANCE=.5,At.DEFAULT_ALLOWED_LENGTHS=[6,8,10,12,14],At.START_PATTERN=Int32Array.from([1,1,1,1]),At.END_PATTERN_REVERSED=[Int32Array.from([1,1,2]),Int32Array.from([1,1,3])];class Ct extends wt{constructor(){super(...arguments),this.decodeRowStringBuffer=""}static findStartGuardPattern(t){let e,r=!1,n=0,i=Int32Array.from([0,0,0]);for(;!r;){i=Int32Array.from([0,0,0]),e=Ct.findGuardPattern(t,n,!1,this.START_END_PATTERN,i);let o=e[0];n=e[1];let s=o-(n-o);s>=0&&(r=t.isRange(s,o,!1))}return e}static checkChecksum(t){return Ct.checkStandardUPCEANChecksum(t)}static checkStandardUPCEANChecksum(t){let e=t.length;if(0===e)return!1;let r=parseInt(t.charAt(e-1),10);return Ct.getStandardUPCEANChecksum(t.substring(0,e-1))===r}static getStandardUPCEANChecksum(t){let e=t.length,r=0;for(let n=e-1;n>=0;n-=2){let e=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);if(e<0||e>9)throw new E;r+=e}r*=3;for(let n=e-2;n>=0;n-=2){let e=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);if(e<0||e>9)throw new E;r+=e}return(1e3-r)%10}static decodeEnd(t,e){return Ct.findGuardPattern(t,e,!1,Ct.START_END_PATTERN,new Int32Array(Ct.START_END_PATTERN.length).fill(0))}static findGuardPatternWithoutCounters(t,e,r,n){return this.findGuardPattern(t,e,r,n,new Int32Array(n.length))}static findGuardPattern(t,e,r,n,i){let o=t.getSize(),s=0,a=e=r?t.getNextUnset(e):t.getNextSet(e),l=n.length,c=r;for(let r=e;r<o;r++)if(t.get(r)!==c)i[s]++;else{if(s===l-1){if(wt.patternMatchVariance(i,n,Ct.MAX_INDIVIDUAL_VARIANCE)<Ct.MAX_AVG_VARIANCE)return Int32Array.from([a,r]);a+=i[0]+i[1];let t=i.slice(2,i.length-1);for(let e=0;e<s-1;e++)i[e]=t[e];i[s-1]=0,i[s]=0,s--}else s++;i[s]=1,c=!c}throw new D}static decodeDigit(t,e,r,n){this.recordPattern(t,r,e);let i=this.MAX_AVG_VARIANCE,o=-1,s=n.length;for(let t=0;t<s;t++){let r=n[t],s=wt.patternMatchVariance(e,r,Ct.MAX_INDIVIDUAL_VARIANCE);s<i&&(i=s,o=t)}if(o>=0)return o;throw new D}}Ct.MAX_AVG_VARIANCE=.48,Ct.MAX_INDIVIDUAL_VARIANCE=.7,Ct.START_END_PATTERN=Int32Array.from([1,1,1]),Ct.MIDDLE_PATTERN=Int32Array.from([1,1,1,1,1]),Ct.END_PATTERN=Int32Array.from([1,1,1,1,1,1]),Ct.L_PATTERNS=[Int32Array.from([3,2,1,1]),Int32Array.from([2,2,2,1]),Int32Array.from([2,1,2,2]),Int32Array.from([1,4,1,1]),Int32Array.from([1,1,3,2]),Int32Array.from([1,2,3,1]),Int32Array.from([1,1,1,4]),Int32Array.from([1,3,1,2]),Int32Array.from([1,2,1,3]),Int32Array.from([3,1,1,2])];class Et{constructor(){this.CHECK_DIGIT_ENCODINGS=[24,20,18,17,12,6,3,10,9,5],this.decodeMiddleCounters=Int32Array.from([0,0,0,0]),this.decodeRowStringBuffer=""}decodeRow(t,e,r){let n=this.decodeRowStringBuffer,i=this.decodeMiddle(e,r,n),o=n.toString(),s=Et.parseExtensionString(o),a=[new it((r[0]+r[1])/2,t),new it(i,t)],l=new x(o,null,0,a,U.UPC_EAN_EXTENSION,(new Date).getTime());return null!=s&&l.putAllMetadata(s),l}decodeMiddle(t,e,r){let n=this.decodeMiddleCounters;n[0]=0,n[1]=0,n[2]=0,n[3]=0;let i=t.getSize(),o=e[1],s=0;for(let e=0;e<5&&o<i;e++){let i=Ct.decodeDigit(t,n,o,Ct.L_AND_G_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+i%10);for(let t of n)o+=t;i>=10&&(s|=1<<4-e),4!==e&&(o=t.getNextSet(o),o=t.getNextUnset(o))}if(5!==r.length)throw new D;let a=this.determineCheckDigit(s);if(Et.extensionChecksum(r.toString())!==a)throw new D;return o}static extensionChecksum(t){let e=t.length,r=0;for(let n=e-2;n>=0;n-=2)r+=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);r*=3;for(let n=e-1;n>=0;n-=2)r+=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);return r*=3,r%10}determineCheckDigit(t){for(let e=0;e<10;e++)if(t===this.CHECK_DIGIT_ENCODINGS[e])return e;throw new D}static parseExtensionString(t){if(5!==t.length)return null;let e=Et.parseExtension5String(t);return null==e?null:new Map([[W.SUGGESTED_PRICE,e]])}static parseExtension5String(t){let e;switch(t.charAt(0)){case"0":e="£";break;case"5":e="$";break;case"9":switch(t){case"90000":return null;case"99991":return"0.00";case"99990":return"Used"}e="";break;default:e=""}let r=parseInt(t.substring(1)),n=r%100;return e+(r/100).toString()+"."+(n<10?"0"+n:n.toString())}}class It{constructor(){this.decodeMiddleCounters=Int32Array.from([0,0,0,0]),this.decodeRowStringBuffer=""}decodeRow(t,e,r){let n=this.decodeRowStringBuffer,i=this.decodeMiddle(e,r,n),o=n.toString(),s=It.parseExtensionString(o),a=[new it((r[0]+r[1])/2,t),new it(i,t)],l=new x(o,null,0,a,U.UPC_EAN_EXTENSION,(new Date).getTime());return null!=s&&l.putAllMetadata(s),l}decodeMiddle(t,e,r){let n=this.decodeMiddleCounters;n[0]=0,n[1]=0,n[2]=0,n[3]=0;let i=t.getSize(),o=e[1],s=0;for(let e=0;e<2&&o<i;e++){let i=Ct.decodeDigit(t,n,o,Ct.L_AND_G_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+i%10);for(let t of n)o+=t;i>=10&&(s|=1<<1-e),1!==e&&(o=t.getNextSet(o),o=t.getNextUnset(o))}if(2!==r.length)throw new D;if(parseInt(r.toString())%4!==s)throw new D;return o}static parseExtensionString(t){return 2!==t.length?null:new Map([[W.ISSUE_NUMBER,parseInt(t)]])}}class St{static decodeRow(t,e,r){let n=Ct.findGuardPattern(e,r,!1,this.EXTENSION_START_PATTERN,new Int32Array(this.EXTENSION_START_PATTERN.length).fill(0));try{return(new Et).decodeRow(t,e,n)}catch(r){return(new It).decodeRow(t,e,n)}}}St.EXTENSION_START_PATTERN=Int32Array.from([1,1,2]);class _t extends Ct{constructor(){super(),this.decodeRowStringBuffer="",_t.L_AND_G_PATTERNS=_t.L_PATTERNS.map((t=>Int32Array.from(t)));for(let t=10;t<20;t++){let e=_t.L_PATTERNS[t-10],r=new Int32Array(e.length);for(let t=0;t<e.length;t++)r[t]=e[e.length-t-1];_t.L_AND_G_PATTERNS[t]=r}}decodeRow(t,e,r){let n=_t.findStartGuardPattern(e),i=null==r?null:r.get(C.NEED_RESULT_POINT_CALLBACK);if(null!=i){const e=new it((n[0]+n[1])/2,t);i.foundPossibleResultPoint(e)}let o=this.decodeMiddle(e,n,this.decodeRowStringBuffer),s=o.rowOffset,a=o.resultString;if(null!=i){const e=new it(s,t);i.foundPossibleResultPoint(e)}let l=this.decodeEnd(e,s);if(null!=i){const e=new it((l[0]+l[1])/2,t);i.foundPossibleResultPoint(e)}let c=l[1],u=c+(c-l[0]);if(u>=e.getSize()||!e.isRange(c,u,!1))throw new D;let d=a.toString();if(d.length<8)throw new E;if(!_t.checkChecksum(d))throw new h;let f=(n[1]+n[0])/2,g=(l[1]+l[0])/2,w=this.getBarcodeFormat(),m=[new it(f,t),new it(g,t)],p=new x(d,null,0,m,w,(new Date).getTime()),A=0;try{let r=St.decodeRow(t,e,l[1]);p.putMetadata(W.UPC_EAN_EXTENSION,r.getText()),p.putAllMetadata(r.getResultMetadata()),p.addResultPoints(r.getResultPoints()),A=r.getText().length}catch(t){}let I=null==r?null:r.get(C.ALLOWED_EAN_EXTENSIONS);if(null!=I){let t=!1;for(let e in I)if(A.toString()===e){t=!0;break}if(!t)throw new D}return p}decodeEnd(t,e){return _t.findGuardPattern(t,e,!1,_t.START_END_PATTERN,new Int32Array(_t.START_END_PATTERN.length).fill(0))}static checkChecksum(t){return _t.checkStandardUPCEANChecksum(t)}static checkStandardUPCEANChecksum(t){let e=t.length;if(0===e)return!1;let r=parseInt(t.charAt(e-1),10);return _t.getStandardUPCEANChecksum(t.substring(0,e-1))===r}static getStandardUPCEANChecksum(t){let e=t.length,r=0;for(let n=e-1;n>=0;n-=2){let e=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);if(e<0||e>9)throw new E;r+=e}r*=3;for(let n=e-2;n>=0;n-=2){let e=t.charAt(n).charCodeAt(0)-"0".charCodeAt(0);if(e<0||e>9)throw new E;r+=e}return(1e3-r)%10}}class Tt extends _t{constructor(){super(),this.decodeMiddleCounters=Int32Array.from([0,0,0,0])}decodeMiddle(t,e,r){let n=this.decodeMiddleCounters;n[0]=0,n[1]=0,n[2]=0,n[3]=0;let i=t.getSize(),o=e[1],s=0;for(let e=0;e<6&&o<i;e++){let i=_t.decodeDigit(t,n,o,_t.L_AND_G_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+i%10);for(let t of n)o+=t;i>=10&&(s|=1<<5-e)}r=Tt.determineFirstDigit(r,s),o=_t.findGuardPattern(t,o,!0,_t.MIDDLE_PATTERN,new Int32Array(_t.MIDDLE_PATTERN.length).fill(0))[1];for(let e=0;e<6&&o<i;e++){let e=_t.decodeDigit(t,n,o,_t.L_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+e);for(let t of n)o+=t}return{rowOffset:o,resultString:r}}getBarcodeFormat(){return U.EAN_13}static determineFirstDigit(t,e){for(let r=0;r<10;r++)if(e===this.FIRST_DIGIT_ENCODINGS[r])return String.fromCharCode("0".charCodeAt(0)+r)+t;throw new D}}Tt.FIRST_DIGIT_ENCODINGS=[0,11,13,14,19,25,28,21,22,26];class yt extends _t{constructor(){super(),this.decodeMiddleCounters=Int32Array.from([0,0,0,0])}decodeMiddle(t,e,r){const n=this.decodeMiddleCounters;n[0]=0,n[1]=0,n[2]=0,n[3]=0;let i=t.getSize(),o=e[1];for(let e=0;e<4&&o<i;e++){let e=_t.decodeDigit(t,n,o,_t.L_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+e);for(let t of n)o+=t}o=_t.findGuardPattern(t,o,!0,_t.MIDDLE_PATTERN,new Int32Array(_t.MIDDLE_PATTERN.length).fill(0))[1];for(let e=0;e<4&&o<i;e++){let e=_t.decodeDigit(t,n,o,_t.L_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+e);for(let t of n)o+=t}return{rowOffset:o,resultString:r}}getBarcodeFormat(){return U.EAN_8}}class Nt extends _t{constructor(){super(...arguments),this.ean13Reader=new Tt}getBarcodeFormat(){return U.UPC_A}decode(t,e){return this.maybeReturnResult(this.ean13Reader.decode(t))}decodeRow(t,e,r){return this.maybeReturnResult(this.ean13Reader.decodeRow(t,e,r))}decodeMiddle(t,e,r){return this.ean13Reader.decodeMiddle(t,e,r)}maybeReturnResult(t){let e=t.getText();if("0"===e.charAt(0)){let r=new x(e.substring(1),null,null,t.getResultPoints(),U.UPC_A);return null!=t.getResultMetadata()&&r.putAllMetadata(t.getResultMetadata()),r}throw new D}reset(){this.ean13Reader.reset()}}class Dt extends _t{constructor(){super(),this.decodeMiddleCounters=new Int32Array(4)}decodeMiddle(t,e,r){const n=this.decodeMiddleCounters.map((t=>t));n[0]=0,n[1]=0,n[2]=0,n[3]=0;const i=t.getSize();let o=e[1],s=0;for(let e=0;e<6&&o<i;e++){const i=Dt.decodeDigit(t,n,o,Dt.L_AND_G_PATTERNS);r+=String.fromCharCode("0".charCodeAt(0)+i%10);for(let t of n)o+=t;i>=10&&(s|=1<<5-e)}return{rowOffset:o,resultString:Dt.determineNumSysAndCheckDigit(r,s)}}decodeEnd(t,e){return Dt.findGuardPatternWithoutCounters(t,e,!0,Dt.MIDDLE_END_PATTERN)}checkChecksum(t){return _t.checkChecksum(Dt.convertUPCEtoUPCA(t))}static determineNumSysAndCheckDigit(t,e){for(let r=0;r<=1;r++)for(let n=0;n<10;n++)if(e===this.NUMSYS_AND_CHECK_DIGIT_PATTERNS[r][n])return String.fromCharCode("0".charCodeAt(0)+r)+t+String.fromCharCode("0".charCodeAt(0)+n);throw D.getNotFoundInstance()}getBarcodeFormat(){return U.UPC_E}static convertUPCEtoUPCA(t){const e=t.slice(1,7).split("").map((t=>t.charCodeAt(0))),r=new y;r.append(t.charAt(0));let n=e[5];switch(n){case 0:case 1:case 2:r.appendChars(e,0,2),r.append(n),r.append("0000"),r.appendChars(e,2,3);break;case 3:r.appendChars(e,0,3),r.append("00000"),r.appendChars(e,3,2);break;case 4:r.appendChars(e,0,4),r.append("00000"),r.append(e[4]);break;default:r.appendChars(e,0,5),r.append("0000"),r.append(n)}return t.length>=8&&r.append(t.charAt(7)),r.toString()}}Dt.MIDDLE_END_PATTERN=Int32Array.from([1,1,1,1,1,1]),Dt.NUMSYS_AND_CHECK_DIGIT_PATTERNS=[Int32Array.from([56,52,50,49,44,38,35,42,41,37]),Int32Array.from([7,11,13,14,19,25,28,21,22,26])];class Mt extends wt{constructor(t){super();let r=null==t?null:t.get(C.POSSIBLE_FORMATS),n=[];e(r)?(n.push(new Tt),n.push(new Nt),n.push(new yt),n.push(new Dt)):(r.indexOf(U.EAN_13)>-1&&n.push(new Tt),r.indexOf(U.UPC_A)>-1&&n.push(new Nt),r.indexOf(U.EAN_8)>-1&&n.push(new yt),r.indexOf(U.UPC_E)>-1&&n.push(new Dt)),this.readers=n}decodeRow(t,e,r){for(let n of this.readers)try{const i=n.decodeRow(t,e,r),o=i.getBarcodeFormat()===U.EAN_13&&"0"===i.getText().charAt(0),s=null==r?null:r.get(C.POSSIBLE_FORMATS),a=null==s||s.includes(U.UPC_A);if(o&&a){const t=i.getRawBytes(),e=new x(i.getText().substring(1),t,t?t.length:null,i.getResultPoints(),U.UPC_A);return e.putAllMetadata(i.getResultMetadata()),e}return i}catch(t){}throw new D}reset(){for(let t of this.readers)t.reset()}}class Rt extends wt{constructor(){super(),this.decodeFinderCounters=new Int32Array(4),this.dataCharacterCounters=new Int32Array(8),this.oddRoundingErrors=new Array(4),this.evenRoundingErrors=new Array(4),this.oddCounts=new Array(this.dataCharacterCounters.length/2),this.evenCounts=new Array(this.dataCharacterCounters.length/2)}getDecodeFinderCounters(){return this.decodeFinderCounters}getDataCharacterCounters(){return this.dataCharacterCounters}getOddRoundingErrors(){return this.oddRoundingErrors}getEvenRoundingErrors(){return this.evenRoundingErrors}getOddCounts(){return this.oddCounts}getEvenCounts(){return this.evenCounts}parseFinderValue(t,e){for(let r=0;r<e.length;r++)if(wt.patternMatchVariance(t,e[r],Rt.MAX_INDIVIDUAL_VARIANCE)<Rt.MAX_AVG_VARIANCE)return r;throw new D}static count(t){return rt.sum(new Int32Array(t))}static increment(t,e){let r=0,n=e[0];for(let i=1;i<t.length;i++)e[i]>n&&(n=e[i],r=i);t[r]++}static decrement(t,e){let r=0,n=e[0];for(let i=1;i<t.length;i++)e[i]<n&&(n=e[i],r=i);t[r]--}static isFinderPattern(t){let e=t[0]+t[1],r=e/(e+t[2]+t[3]);if(r>=Rt.MIN_FINDER_PATTERN_RATIO&&r<=Rt.MAX_FINDER_PATTERN_RATIO){let e=Number.MAX_SAFE_INTEGER,r=Number.MIN_SAFE_INTEGER;for(let n of t)n>r&&(r=n),n<e&&(e=n);return r<10*e}return!1}}Rt.MAX_AVG_VARIANCE=.2,Rt.MAX_INDIVIDUAL_VARIANCE=.45,Rt.MIN_FINDER_PATTERN_RATIO=9.5/12,Rt.MAX_FINDER_PATTERN_RATIO=12.5/14;class Ot{constructor(t,e){this.value=t,this.checksumPortion=e}getValue(){return this.value}getChecksumPortion(){return this.checksumPortion}toString(){return this.value+"("+this.checksumPortion+")"}equals(t){if(!(t instanceof Ot))return!1;const e=t;return this.value===e.value&&this.checksumPortion===e.checksumPortion}hashCode(){return this.value^this.checksumPortion}}class bt{constructor(t,e,r,n,i){this.value=t,this.startEnd=e,this.value=t,this.startEnd=e,this.resultPoints=new Array,this.resultPoints.push(new it(r,i)),this.resultPoints.push(new it(n,i))}getValue(){return this.value}getStartEnd(){return this.startEnd}getResultPoints(){return this.resultPoints}equals(t){if(!(t instanceof bt))return!1;const e=t;return this.value===e.value}hashCode(){return this.value}}class Bt{constructor(){}static getRSSvalue(t,e,r){let n=0;for(let e of t)n+=e;let i=0,o=0,s=t.length;for(let a=0;a<s-1;a++){let l;for(l=1,o|=1<<a;l<t[a];l++,o&=~(1<<a)){let t=Bt.combins(n-l-1,s-a-2);if(r&&0===o&&n-l-(s-a-1)>=s-a-1&&(t-=Bt.combins(n-l-(s-a),s-a-2)),s-a-1>1){let r=0;for(let t=n-l-(s-a-2);t>e;t--)r+=Bt.combins(n-l-t-1,s-a-3);t-=r*(s-1-a)}else n-l>e&&t--;i+=t}n-=l}return i}static combins(t,e){let r,n;t-e>e?(n=e,r=t-e):(n=t-e,r=e);let i=1,o=1;for(let e=t;e>r;e--)i*=e,o<=n&&(i/=o,o++);for(;o<=n;)i/=o,o++;return i}}class Lt{static buildBitArray(t){let e=2*t.length-1;null==t[t.length-1].getRightChar()&&(e-=1);let r=new p(12*e),n=0,i=t[0].getRightChar().getValue();for(let t=11;t>=0;--t)0!=(i&1<<t)&&r.set(n),n++;for(let e=1;e<t.length;++e){let i=t[e],o=i.getLeftChar().getValue();for(let t=11;t>=0;--t)0!=(o&1<<t)&&r.set(n),n++;if(null!=i.getRightChar()){let t=i.getRightChar().getValue();for(let e=11;e>=0;--e)0!=(t&1<<e)&&r.set(n),n++}}return r}}class Pt{constructor(t,e){e?this.decodedInformation=null:(this.finished=t,this.decodedInformation=e)}getDecodedInformation(){return this.decodedInformation}isFinished(){return this.finished}}class vt{constructor(t){this.newPosition=t}getNewPosition(){return this.newPosition}}class Ft extends vt{constructor(t,e){super(t),this.value=e}getValue(){return this.value}isFNC1(){return this.value===Ft.FNC1}}Ft.FNC1="$";class xt extends vt{constructor(t,e,r){super(t),r?(this.remaining=!0,this.remainingValue=this.remainingValue):(this.remaining=!1,this.remainingValue=0),this.newString=e}getNewString(){return this.newString}isRemaining(){return this.remaining}getRemainingValue(){return this.remainingValue}}class kt extends vt{constructor(t,e,r){if(super(t),e<0||e>10||r<0||r>10)throw new E;this.firstDigit=e,this.secondDigit=r}getFirstDigit(){return this.firstDigit}getSecondDigit(){return this.secondDigit}getValue(){return 10*this.firstDigit+this.secondDigit}isFirstDigitFNC1(){return this.firstDigit===kt.FNC1}isSecondDigitFNC1(){return this.secondDigit===kt.FNC1}isAnyFNC1(){return this.firstDigit===kt.FNC1||this.secondDigit===kt.FNC1}}kt.FNC1=10;class Ut{constructor(){}static parseFieldsInGeneralPurpose(t){if(!t)return null;if(t.length<2)throw new D;let e=t.substring(0,2);for(let r of Ut.TWO_DIGIT_DATA_LENGTH)if(r[0]===e)return r[1]===Ut.VARIABLE_LENGTH?Ut.processVariableAI(2,r[2],t):Ut.processFixedAI(2,r[1],t);if(t.length<3)throw new D;let r=t.substring(0,3);for(let e of Ut.THREE_DIGIT_DATA_LENGTH)if(e[0]===r)return e[1]===Ut.VARIABLE_LENGTH?Ut.processVariableAI(3,e[2],t):Ut.processFixedAI(3,e[1],t);for(let e of Ut.THREE_DIGIT_PLUS_DIGIT_DATA_LENGTH)if(e[0]===r)return e[1]===Ut.VARIABLE_LENGTH?Ut.processVariableAI(4,e[2],t):Ut.processFixedAI(4,e[1],t);if(t.length<4)throw new D;let n=t.substring(0,4);for(let e of Ut.FOUR_DIGIT_DATA_LENGTH)if(e[0]===n)return e[1]===Ut.VARIABLE_LENGTH?Ut.processVariableAI(4,e[2],t):Ut.processFixedAI(4,e[1],t);throw new D}static processFixedAI(t,e,r){if(r.length<t)throw new D;let n=r.substring(0,t);if(r.length<t+e)throw new D;let i=r.substring(t,t+e),o=r.substring(t+e),s="("+n+")"+i,a=Ut.parseFieldsInGeneralPurpose(o);return null==a?s:s+a}static processVariableAI(t,e,r){let n,i=r.substring(0,t);n=r.length<t+e?r.length:t+e;let o=r.substring(t,n),s=r.substring(n),a="("+i+")"+o,l=Ut.parseFieldsInGeneralPurpose(s);return null==l?a:a+l}}Ut.VARIABLE_LENGTH=[],Ut.TWO_DIGIT_DATA_LENGTH=[["00",18],["01",14],["02",14],["10",Ut.VARIABLE_LENGTH,20],["11",6],["12",6],["13",6],["15",6],["17",6],["20",2],["21",Ut.VARIABLE_LENGTH,20],["22",Ut.VARIABLE_LENGTH,29],["30",Ut.VARIABLE_LENGTH,8],["37",Ut.VARIABLE_LENGTH,8],["90",Ut.VARIABLE_LENGTH,30],["91",Ut.VARIABLE_LENGTH,30],["92",Ut.VARIABLE_LENGTH,30],["93",Ut.VARIABLE_LENGTH,30],["94",Ut.VARIABLE_LENGTH,30],["95",Ut.VARIABLE_LENGTH,30],["96",Ut.VARIABLE_LENGTH,30],["97",Ut.VARIABLE_LENGTH,3],["98",Ut.VARIABLE_LENGTH,30],["99",Ut.VARIABLE_LENGTH,30]],Ut.THREE_DIGIT_DATA_LENGTH=[["240",Ut.VARIABLE_LENGTH,30],["241",Ut.VARIABLE_LENGTH,30],["242",Ut.VARIABLE_LENGTH,6],["250",Ut.VARIABLE_LENGTH,30],["251",Ut.VARIABLE_LENGTH,30],["253",Ut.VARIABLE_LENGTH,17],["254",Ut.VARIABLE_LENGTH,20],["400",Ut.VARIABLE_LENGTH,30],["401",Ut.VARIABLE_LENGTH,30],["402",17],["403",Ut.VARIABLE_LENGTH,30],["410",13],["411",13],["412",13],["413",13],["414",13],["420",Ut.VARIABLE_LENGTH,20],["421",Ut.VARIABLE_LENGTH,15],["422",3],["423",Ut.VARIABLE_LENGTH,15],["424",3],["425",3],["426",3]],Ut.THREE_DIGIT_PLUS_DIGIT_DATA_LENGTH=[["310",6],["311",6],["312",6],["313",6],["314",6],["315",6],["316",6],["320",6],["321",6],["322",6],["323",6],["324",6],["325",6],["326",6],["327",6],["328",6],["329",6],["330",6],["331",6],["332",6],["333",6],["334",6],["335",6],["336",6],["340",6],["341",6],["342",6],["343",6],["344",6],["345",6],["346",6],["347",6],["348",6],["349",6],["350",6],["351",6],["352",6],["353",6],["354",6],["355",6],["356",6],["357",6],["360",6],["361",6],["362",6],["363",6],["364",6],["365",6],["366",6],["367",6],["368",6],["369",6],["390",Ut.VARIABLE_LENGTH,15],["391",Ut.VARIABLE_LENGTH,18],["392",Ut.VARIABLE_LENGTH,15],["393",Ut.VARIABLE_LENGTH,18],["703",Ut.VARIABLE_LENGTH,30]],Ut.FOUR_DIGIT_DATA_LENGTH=[["7001",13],["7002",Ut.VARIABLE_LENGTH,30],["7003",10],["8001",14],["8002",Ut.VARIABLE_LENGTH,20],["8003",Ut.VARIABLE_LENGTH,30],["8004",Ut.VARIABLE_LENGTH,30],["8005",6],["8006",18],["8007",Ut.VARIABLE_LENGTH,30],["8008",Ut.VARIABLE_LENGTH,12],["8018",18],["8020",Ut.VARIABLE_LENGTH,25],["8100",6],["8101",10],["8102",2],["8110",Ut.VARIABLE_LENGTH,70],["8200",Ut.VARIABLE_LENGTH,70]];class Ht{constructor(t){this.buffer=new y,this.information=t}decodeAllCodes(t,e){let r=e,n=null;for(;;){let e=this.decodeGeneralPurposeField(r,n),i=Ut.parseFieldsInGeneralPurpose(e.getNewString());if(null!=i&&t.append(i),n=e.isRemaining()?""+e.getRemainingValue():null,r===e.getNewPosition())break;r=e.getNewPosition()}return t.toString()}isStillNumeric(t){if(t+7>this.information.getSize())return t+4<=this.information.getSize();for(let e=t;e<t+3;++e)if(this.information.get(e))return!0;return this.information.get(t+3)}decodeNumeric(t){if(t+7>this.information.getSize()){let e=this.extractNumericValueFromBitArray(t,4);return new kt(this.information.getSize(),0===e?kt.FNC1:e-1,kt.FNC1)}let e=this.extractNumericValueFromBitArray(t,7);return new kt(t+7,(e-8)/11,(e-8)%11)}extractNumericValueFromBitArray(t,e){return Ht.extractNumericValueFromBitArray(this.information,t,e)}static extractNumericValueFromBitArray(t,e,r){let n=0;for(let i=0;i<r;++i)t.get(e+i)&&(n|=1<<r-i-1);return n}decodeGeneralPurposeField(t,e){this.buffer.setLengthToZero(),null!=e&&this.buffer.append(e),this.current.setPosition(t);let r=this.parseBlocks();return null!=r&&r.isRemaining()?new xt(this.current.getPosition(),this.buffer.toString(),r.getRemainingValue()):new xt(this.current.getPosition(),this.buffer.toString())}parseBlocks(){let t,e;do{let r=this.current.getPosition();if(this.current.isAlpha()?(e=this.parseAlphaBlock(),t=e.isFinished()):this.current.isIsoIec646()?(e=this.parseIsoIec646Block(),t=e.isFinished()):(e=this.parseNumericBlock(),t=e.isFinished()),r===this.current.getPosition()&&!t)break}while(!t);return e.getDecodedInformation()}parseNumericBlock(){for(;this.isStillNumeric(this.current.getPosition());){let t=this.decodeNumeric(this.current.getPosition());if(this.current.setPosition(t.getNewPosition()),t.isFirstDigitFNC1()){let e;return e=t.isSecondDigitFNC1()?new xt(this.current.getPosition(),this.buffer.toString()):new xt(this.current.getPosition(),this.buffer.toString(),t.getSecondDigit()),new Pt(!0,e)}if(this.buffer.append(t.getFirstDigit()),t.isSecondDigitFNC1()){let t=new xt(this.current.getPosition(),this.buffer.toString());return new Pt(!0,t)}this.buffer.append(t.getSecondDigit())}return this.isNumericToAlphaNumericLatch(this.current.getPosition())&&(this.current.setAlpha(),this.current.incrementPosition(4)),new Pt(!1)}parseIsoIec646Block(){for(;this.isStillIsoIec646(this.current.getPosition());){let t=this.decodeIsoIec646(this.current.getPosition());if(this.current.setPosition(t.getNewPosition()),t.isFNC1()){let t=new xt(this.current.getPosition(),this.buffer.toString());return new Pt(!0,t)}this.buffer.append(t.getValue())}return this.isAlphaOr646ToNumericLatch(this.current.getPosition())?(this.current.incrementPosition(3),this.current.setNumeric()):this.isAlphaTo646ToAlphaLatch(this.current.getPosition())&&(this.current.getPosition()+5<this.information.getSize()?this.current.incrementPosition(5):this.current.setPosition(this.information.getSize()),this.current.setAlpha()),new Pt(!1)}parseAlphaBlock(){for(;this.isStillAlpha(this.current.getPosition());){let t=this.decodeAlphanumeric(this.current.getPosition());if(this.current.setPosition(t.getNewPosition()),t.isFNC1()){let t=new xt(this.current.getPosition(),this.buffer.toString());return new Pt(!0,t)}this.buffer.append(t.getValue())}return this.isAlphaOr646ToNumericLatch(this.current.getPosition())?(this.current.incrementPosition(3),this.current.setNumeric()):this.isAlphaTo646ToAlphaLatch(this.current.getPosition())&&(this.current.getPosition()+5<this.information.getSize()?this.current.incrementPosition(5):this.current.setPosition(this.information.getSize()),this.current.setIsoIec646()),new Pt(!1)}isStillIsoIec646(t){if(t+5>this.information.getSize())return!1;let e=this.extractNumericValueFromBitArray(t,5);if(e>=5&&e<16)return!0;if(t+7>this.information.getSize())return!1;let r=this.extractNumericValueFromBitArray(t,7);if(r>=64&&r<116)return!0;if(t+8>this.information.getSize())return!1;let n=this.extractNumericValueFromBitArray(t,8);return n>=232&&n<253}decodeIsoIec646(t){let e=this.extractNumericValueFromBitArray(t,5);if(15===e)return new Ft(t+5,Ft.FNC1);if(e>=5&&e<15)return new Ft(t+5,"0"+(e-5));let r,n=this.extractNumericValueFromBitArray(t,7);if(n>=64&&n<90)return new Ft(t+7,""+(n+1));if(n>=90&&n<116)return new Ft(t+7,""+(n+7));switch(this.extractNumericValueFromBitArray(t,8)){case 232:r="!";break;case 233:r='"';break;case 234:r="%";break;case 235:r="&";break;case 236:r="'";break;case 237:r="(";break;case 238:r=")";break;case 239:r="*";break;case 240:r="+";break;case 241:r=",";break;case 242:r="-";break;case 243:r=".";break;case 244:r="/";break;case 245:r=":";break;case 246:r=";";break;case 247:r="<";break;case 248:r="=";break;case 249:r=">";break;case 250:r="?";break;case 251:r="_";break;case 252:r=" ";break;default:throw new E}return new Ft(t+8,r)}isStillAlpha(t){if(t+5>this.information.getSize())return!1;let e=this.extractNumericValueFromBitArray(t,5);if(e>=5&&e<16)return!0;if(t+6>this.information.getSize())return!1;let r=this.extractNumericValueFromBitArray(t,6);return r>=16&&r<63}decodeAlphanumeric(t){let e=this.extractNumericValueFromBitArray(t,5);if(15===e)return new Ft(t+5,Ft.FNC1);if(e>=5&&e<15)return new Ft(t+5,"0"+(e-5));let r,n=this.extractNumericValueFromBitArray(t,6);if(n>=32&&n<58)return new Ft(t+6,""+(n+33));switch(n){case 58:r="*";break;case 59:r=",";break;case 60:r="-";break;case 61:r=".";break;case 62:r="/";break;default:throw new $("Decoding invalid alphanumeric value: "+n)}return new Ft(t+6,r)}isAlphaTo646ToAlphaLatch(t){if(t+1>this.information.getSize())return!1;for(let e=0;e<5&&e+t<this.information.getSize();++e)if(2===e){if(!this.information.get(t+2))return!1}else if(this.information.get(t+e))return!1;return!0}isAlphaOr646ToNumericLatch(t){if(t+3>this.information.getSize())return!1;for(let e=t;e<t+3;++e)if(this.information.get(e))return!1;return!0}isNumericToAlphaNumericLatch(t){if(t+1>this.information.getSize())return!1;for(let e=0;e<4&&e+t<this.information.getSize();++e)if(this.information.get(t+e))return!1;return!0}}class Vt{constructor(t){this.information=t,this.generalDecoder=new Ht(t)}getInformation(){return this.information}getGeneralDecoder(){return this.generalDecoder}}class zt extends Vt{constructor(t){super(t)}encodeCompressedGtin(t,e){t.append("(01)");let r=t.length();t.append("9"),this.encodeCompressedGtinWithoutAI(t,e,r)}encodeCompressedGtinWithoutAI(t,e,r){for(let r=0;r<4;++r){let n=this.getGeneralDecoder().extractNumericValueFromBitArray(e+10*r,10);n/100==0&&t.append("0"),n/10==0&&t.append("0"),t.append(n)}zt.appendCheckDigit(t,r)}static appendCheckDigit(t,e){let r=0;for(let n=0;n<13;n++){let i=t.charAt(n+e).charCodeAt(0)-"0".charCodeAt(0);r+=0==(1&n)?3*i:i}r=10-r%10,10===r&&(r=0),t.append(r)}}zt.GTIN_SIZE=40;class Gt extends zt{constructor(t){super(t)}parseInformation(){let t=new y;t.append("(01)");let e=t.length(),r=this.getGeneralDecoder().extractNumericValueFromBitArray(Gt.HEADER_SIZE,4);return t.append(r),this.encodeCompressedGtinWithoutAI(t,Gt.HEADER_SIZE+4,e),this.getGeneralDecoder().decodeAllCodes(t,Gt.HEADER_SIZE+44)}}Gt.HEADER_SIZE=4;class Yt extends Vt{constructor(t){super(t)}parseInformation(){let t=new y;return this.getGeneralDecoder().decodeAllCodes(t,Yt.HEADER_SIZE)}}Yt.HEADER_SIZE=5;class Xt extends zt{constructor(t){super(t)}encodeCompressedWeight(t,e,r){let n=this.getGeneralDecoder().extractNumericValueFromBitArray(e,r);this.addWeightCode(t,n);let i=this.checkWeight(n),o=1e5;for(let e=0;e<5;++e)i/o==0&&t.append("0"),o/=10;t.append(i)}}class Wt extends Xt{constructor(t){super(t)}parseInformation(){if(this.getInformation().getSize()!=Wt.HEADER_SIZE+Xt.GTIN_SIZE+Wt.WEIGHT_SIZE)throw new D;let t=new y;return this.encodeCompressedGtin(t,Wt.HEADER_SIZE),this.encodeCompressedWeight(t,Wt.HEADER_SIZE+Xt.GTIN_SIZE,Wt.WEIGHT_SIZE),t.toString()}}Wt.HEADER_SIZE=5,Wt.WEIGHT_SIZE=15;class jt extends Wt{constructor(t){super(t)}addWeightCode(t,e){t.append("(3103)")}checkWeight(t){return t}}class Zt extends Wt{constructor(t){super(t)}addWeightCode(t,e){e<1e4?t.append("(3202)"):t.append("(3203)")}checkWeight(t){return t<1e4?t:t-1e4}}class Qt extends zt{constructor(t){super(t)}parseInformation(){if(this.getInformation().getSize()<Qt.HEADER_SIZE+zt.GTIN_SIZE)throw new D;let t=new y;this.encodeCompressedGtin(t,Qt.HEADER_SIZE);let e=this.getGeneralDecoder().extractNumericValueFromBitArray(Qt.HEADER_SIZE+zt.GTIN_SIZE,Qt.LAST_DIGIT_SIZE);t.append("(392"),t.append(e),t.append(")");let r=this.getGeneralDecoder().decodeGeneralPurposeField(Qt.HEADER_SIZE+zt.GTIN_SIZE+Qt.LAST_DIGIT_SIZE,null);return t.append(r.getNewString()),t.toString()}}Qt.HEADER_SIZE=8,Qt.LAST_DIGIT_SIZE=2;class Kt extends zt{constructor(t){super(t)}parseInformation(){if(this.getInformation().getSize()<Kt.HEADER_SIZE+zt.GTIN_SIZE)throw new D;let t=new y;this.encodeCompressedGtin(t,Kt.HEADER_SIZE);let e=this.getGeneralDecoder().extractNumericValueFromBitArray(Kt.HEADER_SIZE+zt.GTIN_SIZE,Kt.LAST_DIGIT_SIZE);t.append("(393"),t.append(e),t.append(")");let r=this.getGeneralDecoder().extractNumericValueFromBitArray(Kt.HEADER_SIZE+zt.GTIN_SIZE+Kt.LAST_DIGIT_SIZE,Kt.FIRST_THREE_DIGITS_SIZE);r/100==0&&t.append("0"),r/10==0&&t.append("0"),t.append(r);let n=this.getGeneralDecoder().decodeGeneralPurposeField(Kt.HEADER_SIZE+zt.GTIN_SIZE+Kt.LAST_DIGIT_SIZE+Kt.FIRST_THREE_DIGITS_SIZE,null);return t.append(n.getNewString()),t.toString()}}Kt.HEADER_SIZE=8,Kt.LAST_DIGIT_SIZE=2,Kt.FIRST_THREE_DIGITS_SIZE=10;class qt extends Xt{constructor(t,e,r){super(t),this.dateCode=r,this.firstAIdigits=e}parseInformation(){if(this.getInformation().getSize()!=qt.HEADER_SIZE+qt.GTIN_SIZE+qt.WEIGHT_SIZE+qt.DATE_SIZE)throw new D;let t=new y;return this.encodeCompressedGtin(t,qt.HEADER_SIZE),this.encodeCompressedWeight(t,qt.HEADER_SIZE+qt.GTIN_SIZE,qt.WEIGHT_SIZE),this.encodeCompressedDate(t,qt.HEADER_SIZE+qt.GTIN_SIZE+qt.WEIGHT_SIZE),t.toString()}encodeCompressedDate(t,e){let r=this.getGeneralDecoder().extractNumericValueFromBitArray(e,qt.DATE_SIZE);if(38400==r)return;t.append("("),t.append(this.dateCode),t.append(")");let n=r%32;r/=32;let i=r%12+1;r/=12;let o=r;o/10==0&&t.append("0"),t.append(o),i/10==0&&t.append("0"),t.append(i),n/10==0&&t.append("0"),t.append(n)}addWeightCode(t,e){t.append("("),t.append(this.firstAIdigits),t.append(e/1e5),t.append(")")}checkWeight(t){return t%1e5}}function Jt(t){try{if(t.get(1))return new Gt(t);if(!t.get(2))return new Yt(t);switch(Ht.extractNumericValueFromBitArray(t,1,4)){case 4:return new jt(t);case 5:return new Zt(t)}switch(Ht.extractNumericValueFromBitArray(t,1,5)){case 12:return new Qt(t);case 13:return new Kt(t)}switch(Ht.extractNumericValueFromBitArray(t,1,7)){case 56:return new qt(t,"310","11");case 57:return new qt(t,"320","11");case 58:return new qt(t,"310","13");case 59:return new qt(t,"320","13");case 60:return new qt(t,"310","15");case 61:return new qt(t,"320","15");case 62:return new qt(t,"310","17");case 63:return new qt(t,"320","17")}}catch(e){throw console.log(e),new $("unknown decoder: "+t)}}qt.HEADER_SIZE=8,qt.WEIGHT_SIZE=20,qt.DATE_SIZE=16;class $t{constructor(t,e,r,n){this.leftchar=t,this.rightchar=e,this.finderpattern=r,this.maybeLast=n}mayBeLast(){return this.maybeLast}getLeftChar(){return this.leftchar}getRightChar(){return this.rightchar}getFinderPattern(){return this.finderpattern}mustBeLast(){return null==this.rightchar}toString(){return"[ "+this.leftchar+", "+this.rightchar+" : "+(null==this.finderpattern?"null":this.finderpattern.getValue())+" ]"}static equals(t,e){return t instanceof $t&&$t.equalsOrNull(t.leftchar,e.leftchar)&&$t.equalsOrNull(t.rightchar,e.rightchar)&&$t.equalsOrNull(t.finderpattern,e.finderpattern)}static equalsOrNull(t,e){return null===t?null===e:$t.equals(t,e)}hashCode(){return this.leftchar.getValue()^this.rightchar.getValue()^this.finderpattern.getValue()}}class te{constructor(t,e,r){this.pairs=t,this.rowNumber=e,this.wasReversed=r}getPairs(){return this.pairs}getRowNumber(){return this.rowNumber}isReversed(){return this.wasReversed}isEquivalent(t){return this.checkEqualitity(this,t)}toString(){return"{ "+this.pairs+" }"}equals(t,e){return t instanceof te&&this.checkEqualitity(t,e)&&t.wasReversed===e.wasReversed}checkEqualitity(t,e){if(!t||!e)return;let r;return t.forEach(((t,n)=>{e.forEach((e=>{t.getLeftChar().getValue()===e.getLeftChar().getValue()&&t.getRightChar().getValue()===e.getRightChar().getValue()&&t.getFinderPatter().getValue()===e.getFinderPatter().getValue()&&(r=!0)}))})),r}}class ee extends Rt{constructor(t){super(...arguments),this.pairs=new Array(ee.MAX_PAIRS),this.rows=new Array,this.startEnd=[2],this.verbose=!0===t}decodeRow(t,e,r){this.pairs.length=0,this.startFromEven=!1;try{return ee.constructResult(this.decodeRow2pairs(t,e))}catch(t){this.verbose&&console.log(t)}return this.pairs.length=0,this.startFromEven=!0,ee.constructResult(this.decodeRow2pairs(t,e))}reset(){this.pairs.length=0,this.rows.length=0}decodeRow2pairs(t,e){let r,n=!1;for(;!n;)try{this.pairs.push(this.retrieveNextPair(e,this.pairs,t))}catch(t){if(t instanceof D){if(!this.pairs.length)throw new D;n=!0}}if(this.checkChecksum())return this.pairs;if(r=!!this.rows.length,this.storeRow(t,!1),r){let t=this.checkRowsBoolean(!1);if(null!=t)return t;if(t=this.checkRowsBoolean(!0),null!=t)return t}throw new D}checkRowsBoolean(t){if(this.rows.length>25)return this.rows.length=0,null;this.pairs.length=0,t&&(this.rows=this.rows.reverse());let e=null;try{e=this.checkRows(new Array,0)}catch(t){this.verbose&&console.log(t)}return t&&(this.rows=this.rows.reverse()),e}checkRows(t,e){for(let r=e;r<this.rows.length;r++){let e=this.rows[r];this.pairs.length=0;for(let e of t)this.pairs.push(e.getPairs());if(this.pairs.push(e.getPairs()),!ee.isValidSequence(this.pairs))continue;if(this.checkChecksum())return this.pairs;let n=new Array(t);n.push(e);try{return this.checkRows(n,r+1)}catch(t){this.verbose&&console.log(t)}}throw new D}static isValidSequence(t){for(let e of ee.FINDER_PATTERN_SEQUENCES){if(t.length>e.length)continue;let r=!0;for(let n=0;n<t.length;n++)if(t[n].getFinderPattern().getValue()!=e[n]){r=!1;break}if(r)return!0}return!1}storeRow(t,e){let r=0,n=!1,i=!1;for(;r<this.rows.length;){let e=this.rows[r];if(e.getRowNumber()>t){i=e.isEquivalent(this.pairs);break}n=e.isEquivalent(this.pairs),r++}i||n||ee.isPartialRow(this.pairs,this.rows)||(this.rows.push(r,new te(this.pairs,t,e)),this.removePartialRows(this.pairs,this.rows))}removePartialRows(t,e){for(let r of e)if(r.getPairs().length!==t.length)for(let e of r.getPairs())for(let r of t)if($t.equals(e,r))break}static isPartialRow(t,e){for(let r of e){let e=!0;for(let n of t){let t=!1;for(let e of r.getPairs())if(n.equals(e)){t=!0;break}if(!t){e=!1;break}}if(e)return!0}return!1}getRows(){return this.rows}static constructResult(t){let e=Jt(Lt.buildBitArray(t)).parseInformation(),r=t[0].getFinderPattern().getResultPoints(),n=t[t.length-1].getFinderPattern().getResultPoints(),i=[r[0],r[1],n[0],n[1]];return new x(e,null,null,i,U.RSS_EXPANDED,null)}checkChecksum(){let t=this.pairs.get(0),e=t.getLeftChar(),r=t.getRightChar();if(null==r)return!1;let n=r.getChecksumPortion(),i=2;for(let t=1;t<this.pairs.size();++t){let e=this.pairs.get(t);n+=e.getLeftChar().getChecksumPortion(),i++;let r=e.getRightChar();null!=r&&(n+=r.getChecksumPortion(),i++)}return n%=211,211*(i-4)+n==e.getValue()}static getNextSecondBar(t,e){let r;return t.get(e)?(r=t.getNextUnset(e),r=t.getNextSet(r)):(r=t.getNextSet(e),r=t.getNextUnset(r)),r}retrieveNextPair(t,e,r){let n,i=e.length%2==0;this.startFromEven&&(i=!i);let o=!0,s=-1;do{this.findNextPair(t,e,s),n=this.parseFoundFinderPattern(t,r,i),null==n?s=ee.getNextSecondBar(t,this.startEnd[0]):o=!1}while(o);let a,l=this.decodeDataCharacter(t,n,i,!0);if(!this.isEmptyPair(e)&&e[e.length-1].mustBeLast())throw new D;try{a=this.decodeDataCharacter(t,n,i,!1)}catch(t){a=null,this.verbose&&console.log(t)}return new $t(l,a,n,!0)}isEmptyPair(t){return 0===t.length}findNextPair(t,e,r){let n=this.getDecodeFinderCounters();n[0]=0,n[1]=0,n[2]=0,n[3]=0;let i,o=t.getSize();i=r>=0?r:this.isEmptyPair(e)?0:e[e.length-1].getFinderPattern().getStartEnd()[1];let s=e.length%2!=0;this.startFromEven&&(s=!s);let a=!1;for(;i<o&&(a=!t.get(i),a);)i++;let l=0,c=i;for(let e=i;e<o;e++)if(t.get(e)!=a)n[l]++;else{if(3==l){if(s&&ee.reverseCounters(n),ee.isFinderPattern(n))return this.startEnd[0]=c,void(this.startEnd[1]=e);s&&ee.reverseCounters(n),c+=n[0]+n[1],n[0]=n[2],n[1]=n[3],n[2]=0,n[3]=0,l--}else l++;n[l]=1,a=!a}throw new D}static reverseCounters(t){let e=t.length;for(let r=0;r<e/2;++r){let n=t[r];t[r]=t[e-r-1],t[e-r-1]=n}}parseFoundFinderPattern(t,e,r){let n,i,o;if(r){let e=this.startEnd[0]-1;for(;e>=0&&!t.get(e);)e--;e++,n=this.startEnd[0]-e,i=e,o=this.startEnd[1]}else i=this.startEnd[0],o=t.getNextUnset(this.startEnd[1]+1),n=o-this.startEnd[1];let s,a=this.getDecodeFinderCounters();d.arraycopy(a,0,a,1,a.length-1),a[0]=n;try{s=this.parseFinderValue(a,ee.FINDER_PATTERNS)}catch(t){return null}return new bt(s,[i,o],i,o,e)}decodeDataCharacter(t,e,r,n){let i=this.getDataCharacterCounters();for(let t=0;t<i.length;t++)i[t]=0;if(n)ee.recordPatternInReverse(t,e.getStartEnd()[0],i);else{ee.recordPattern(t,e.getStartEnd()[1],i);for(let t=0,e=i.length-1;t<e;t++,e--){let r=i[t];i[t]=i[e],i[e]=r}}let o=rt.sum(new Int32Array(i))/17,s=(e.getStartEnd()[1]-e.getStartEnd()[0])/15;if(Math.abs(o-s)/s>.3)throw new D;let a=this.getOddCounts(),l=this.getEvenCounts(),c=this.getOddRoundingErrors(),h=this.getEvenRoundingErrors();for(let t=0;t<i.length;t++){let e=1*i[t]/o,r=e+.5;if(r<1){if(e<.3)throw new D;r=1}else if(r>8){if(e>8.7)throw new D;r=8}let n=t/2;0==(1&t)?(a[n]=r,c[n]=e-r):(l[n]=r,h[n]=e-r)}this.adjustOddEvenCounts(17);let u=4*e.getValue()+(r?0:2)+(n?0:1)-1,d=0,f=0;for(let t=a.length-1;t>=0;t--){if(ee.isNotA1left(e,r,n)){let e=ee.WEIGHTS[u][2*t];f+=a[t]*e}d+=a[t]}let g=0;for(let t=l.length-1;t>=0;t--)if(ee.isNotA1left(e,r,n)){let e=ee.WEIGHTS[u][2*t+1];g+=l[t]*e}let w=f+g;if(0!=(1&d)||d>13||d<4)throw new D;let m=(13-d)/2,p=ee.SYMBOL_WIDEST[m],A=9-p,C=Bt.getRSSvalue(a,p,!0),E=Bt.getRSSvalue(l,A,!1),I=ee.EVEN_TOTAL_SUBSET[m],S=ee.GSUM[m];return new Ot(C*I+E+S,w)}static isNotA1left(t,e,r){return!(0==t.getValue()&&e&&r)}adjustOddEvenCounts(t){let e=rt.sum(new Int32Array(this.getOddCounts())),r=rt.sum(new Int32Array(this.getEvenCounts())),n=!1,i=!1;e>13?i=!0:e<4&&(n=!0);let o=!1,s=!1;r>13?s=!0:r<4&&(o=!0);let a=e+r-t,l=1==(1&e),c=0==(1&r);if(1==a)if(l){if(c)throw new D;i=!0}else{if(!c)throw new D;s=!0}else if(-1==a)if(l){if(c)throw new D;n=!0}else{if(!c)throw new D;o=!0}else{if(0!=a)throw new D;if(l){if(!c)throw new D;e<r?(n=!0,s=!0):(i=!0,o=!0)}else if(c)throw new D}if(n){if(i)throw new D;ee.increment(this.getOddCounts(),this.getOddRoundingErrors())}if(i&&ee.decrement(this.getOddCounts(),this.getOddRoundingErrors()),o){if(s)throw new D;ee.increment(this.getEvenCounts(),this.getOddRoundingErrors())}s&&ee.decrement(this.getEvenCounts(),this.getEvenRoundingErrors())}}ee.SYMBOL_WIDEST=[7,5,4,3,1],ee.EVEN_TOTAL_SUBSET=[4,20,52,104,204],ee.GSUM=[0,348,1388,2948,3988],ee.FINDER_PATTERNS=[Int32Array.from([1,8,4,1]),Int32Array.from([3,6,4,1]),Int32Array.from([3,4,6,1]),Int32Array.from([3,2,8,1]),Int32Array.from([2,6,5,1]),Int32Array.from([2,2,9,1])],ee.WEIGHTS=[[1,3,9,27,81,32,96,77],[20,60,180,118,143,7,21,63],[189,145,13,39,117,140,209,205],[193,157,49,147,19,57,171,91],[62,186,136,197,169,85,44,132],[185,133,188,142,4,12,36,108],[113,128,173,97,80,29,87,50],[150,28,84,41,123,158,52,156],[46,138,203,187,139,206,196,166],[76,17,51,153,37,111,122,155],[43,129,176,106,107,110,119,146],[16,48,144,10,30,90,59,177],[109,116,137,200,178,112,125,164],[70,210,208,202,184,130,179,115],[134,191,151,31,93,68,204,190],[148,22,66,198,172,94,71,2],[6,18,54,162,64,192,154,40],[120,149,25,75,14,42,126,167],[79,26,78,23,69,207,199,175],[103,98,83,38,114,131,182,124],[161,61,183,127,170,88,53,159],[55,165,73,8,24,72,5,15],[45,135,194,160,58,174,100,89]],ee.FINDER_PAT_A=0,ee.FINDER_PAT_B=1,ee.FINDER_PAT_C=2,ee.FINDER_PAT_D=3,ee.FINDER_PAT_E=4,ee.FINDER_PAT_F=5,ee.FINDER_PATTERN_SEQUENCES=[[ee.FINDER_PAT_A,ee.FINDER_PAT_A],[ee.FINDER_PAT_A,ee.FINDER_PAT_B,ee.FINDER_PAT_B],[ee.FINDER_PAT_A,ee.FINDER_PAT_C,ee.FINDER_PAT_B,ee.FINDER_PAT_D],[ee.FINDER_PAT_A,ee.FINDER_PAT_E,ee.FINDER_PAT_B,ee.FINDER_PAT_D,ee.FINDER_PAT_C],[ee.FINDER_PAT_A,ee.FINDER_PAT_E,ee.FINDER_PAT_B,ee.FINDER_PAT_D,ee.FINDER_PAT_D,ee.FINDER_PAT_F],[ee.FINDER_PAT_A,ee.FINDER_PAT_E,ee.FINDER_PAT_B,ee.FINDER_PAT_D,ee.FINDER_PAT_E,ee.FINDER_PAT_F,ee.FINDER_PAT_F],[ee.FINDER_PAT_A,ee.FINDER_PAT_A,ee.FINDER_PAT_B,ee.FINDER_PAT_B,ee.FINDER_PAT_C,ee.FINDER_PAT_C,ee.FINDER_PAT_D,ee.FINDER_PAT_D],[ee.FINDER_PAT_A,ee.FINDER_PAT_A,ee.FINDER_PAT_B,ee.FINDER_PAT_B,ee.FINDER_PAT_C,ee.FINDER_PAT_C,ee.FINDER_PAT_D,ee.FINDER_PAT_E,ee.FINDER_PAT_E],[ee.FINDER_PAT_A,ee.FINDER_PAT_A,ee.FINDER_PAT_B,ee.FINDER_PAT_B,ee.FINDER_PAT_C,ee.FINDER_PAT_C,ee.FINDER_PAT_D,ee.FINDER_PAT_E,ee.FINDER_PAT_F,ee.FINDER_PAT_F],[ee.FINDER_PAT_A,ee.FINDER_PAT_A,ee.FINDER_PAT_B,ee.FINDER_PAT_B,ee.FINDER_PAT_C,ee.FINDER_PAT_D,ee.FINDER_PAT_D,ee.FINDER_PAT_E,ee.FINDER_PAT_E,ee.FINDER_PAT_F,ee.FINDER_PAT_F]],ee.MAX_PAIRS=11;class re extends Ot{constructor(t,e,r){super(t,e),this.count=0,this.finderPattern=r}getFinderPattern(){return this.finderPattern}getCount(){return this.count}incrementCount(){this.count++}}class ne extends Rt{constructor(){super(...arguments),this.possibleLeftPairs=[],this.possibleRightPairs=[]}decodeRow(t,e,r){const n=this.decodePair(e,!1,t,r);ne.addOrTally(this.possibleLeftPairs,n),e.reverse();let i=this.decodePair(e,!0,t,r);ne.addOrTally(this.possibleRightPairs,i),e.reverse();for(let t of this.possibleLeftPairs)if(t.getCount()>1)for(let e of this.possibleRightPairs)if(e.getCount()>1&&ne.checkChecksum(t,e))return ne.constructResult(t,e);throw new D}static addOrTally(t,e){if(null==e)return;let r=!1;for(let n of t)if(n.getValue()===e.getValue()){n.incrementCount(),r=!0;break}r||t.push(e)}reset(){this.possibleLeftPairs.length=0,this.possibleRightPairs.length=0}static constructResult(t,e){let r=4537077*t.getValue()+e.getValue(),n=new String(r).toString(),i=new y;for(let t=13-n.length;t>0;t--)i.append("0");i.append(n);let o=0;for(let t=0;t<13;t++){let e=i.charAt(t).charCodeAt(0)-"0".charCodeAt(0);o+=0==(1&t)?3*e:e}o=10-o%10,10===o&&(o=0),i.append(o.toString());let s=t.getFinderPattern().getResultPoints(),a=e.getFinderPattern().getResultPoints();return new x(i.toString(),null,0,[s[0],s[1],a[0],a[1]],U.RSS_14,(new Date).getTime())}static checkChecksum(t,e){let r=(t.getChecksumPortion()+16*e.getChecksumPortion())%79,n=9*t.getFinderPattern().getValue()+e.getFinderPattern().getValue();return n>72&&n--,n>8&&n--,r===n}decodePair(t,e,r,n){try{let i=this.findFinderPattern(t,e),o=this.parseFoundFinderPattern(t,r,e,i),s=null==n?null:n.get(C.NEED_RESULT_POINT_CALLBACK);if(null!=s){let n=(i[0]+i[1])/2;e&&(n=t.getSize()-1-n),s.foundPossibleResultPoint(new it(n,r))}let a=this.decodeDataCharacter(t,o,!0),l=this.decodeDataCharacter(t,o,!1);return new re(1597*a.getValue()+l.getValue(),a.getChecksumPortion()+4*l.getChecksumPortion(),o)}catch(t){return null}}decodeDataCharacter(t,e,r){let n=this.getDataCharacterCounters();for(let t=0;t<n.length;t++)n[t]=0;if(r)wt.recordPatternInReverse(t,e.getStartEnd()[0],n);else{wt.recordPattern(t,e.getStartEnd()[1]+1,n);for(let t=0,e=n.length-1;t<e;t++,e--){let r=n[t];n[t]=n[e],n[e]=r}}let i=r?16:15,o=rt.sum(new Int32Array(n))/i,s=this.getOddCounts(),a=this.getEvenCounts(),l=this.getOddRoundingErrors(),c=this.getEvenRoundingErrors();for(let t=0;t<n.length;t++){let e=n[t]/o,r=Math.floor(e+.5);r<1?r=1:r>8&&(r=8);let i=Math.floor(t/2);0==(1&t)?(s[i]=r,l[i]=e-r):(a[i]=r,c[i]=e-r)}this.adjustOddEvenCounts(r,i);let h=0,u=0;for(let t=s.length-1;t>=0;t--)u*=9,u+=s[t],h+=s[t];let d=0,f=0;for(let t=a.length-1;t>=0;t--)d*=9,d+=a[t],f+=a[t];let g=u+3*d;if(r){if(0!=(1&h)||h>12||h<4)throw new D;let t=(12-h)/2,e=ne.OUTSIDE_ODD_WIDEST[t],r=9-e,n=Bt.getRSSvalue(s,e,!1),i=Bt.getRSSvalue(a,r,!0),o=ne.OUTSIDE_EVEN_TOTAL_SUBSET[t],l=ne.OUTSIDE_GSUM[t];return new Ot(n*o+i+l,g)}{if(0!=(1&f)||f>10||f<4)throw new D;let t=(10-f)/2,e=ne.INSIDE_ODD_WIDEST[t],r=9-e,n=Bt.getRSSvalue(s,e,!0),i=Bt.getRSSvalue(a,r,!1),o=ne.INSIDE_ODD_TOTAL_SUBSET[t],l=ne.INSIDE_GSUM[t];return new Ot(i*o+n+l,g)}}findFinderPattern(t,e){let r=this.getDecodeFinderCounters();r[0]=0,r[1]=0,r[2]=0,r[3]=0;let n=t.getSize(),i=!1,o=0;for(;o<n&&(i=!t.get(o),e!==i);)o++;let s=0,a=o;for(let e=o;e<n;e++)if(t.get(e)!==i)r[s]++;else{if(3===s){if(Rt.isFinderPattern(r))return[a,e];a+=r[0]+r[1],r[0]=r[2],r[1]=r[3],r[2]=0,r[3]=0,s--}else s++;r[s]=1,i=!i}throw new D}parseFoundFinderPattern(t,e,r,n){let i=t.get(n[0]),o=n[0]-1;for(;o>=0&&i!==t.get(o);)o--;o++;const s=n[0]-o,a=this.getDecodeFinderCounters(),l=new Int32Array(a.length);d.arraycopy(a,0,l,1,a.length-1),l[0]=s;const c=this.parseFinderValue(l,ne.FINDER_PATTERNS);let h=o,u=n[1];return r&&(h=t.getSize()-1-h,u=t.getSize()-1-u),new bt(c,[o,n[1]],h,u,e)}adjustOddEvenCounts(t,e){let r=rt.sum(new Int32Array(this.getOddCounts())),n=rt.sum(new Int32Array(this.getEvenCounts())),i=!1,o=!1,s=!1,a=!1;t?(r>12?o=!0:r<4&&(i=!0),n>12?a=!0:n<4&&(s=!0)):(r>11?o=!0:r<5&&(i=!0),n>10?a=!0:n<4&&(s=!0));let l=r+n-e,c=(1&r)==(t?1:0),h=1==(1&n);if(1===l)if(c){if(h)throw new D;o=!0}else{if(!h)throw new D;a=!0}else if(-1===l)if(c){if(h)throw new D;i=!0}else{if(!h)throw new D;s=!0}else{if(0!==l)throw new D;if(c){if(!h)throw new D;r<n?(i=!0,a=!0):(o=!0,s=!0)}else if(h)throw new D}if(i){if(o)throw new D;Rt.increment(this.getOddCounts(),this.getOddRoundingErrors())}if(o&&Rt.decrement(this.getOddCounts(),this.getOddRoundingErrors()),s){if(a)throw new D;Rt.increment(this.getEvenCounts(),this.getOddRoundingErrors())}a&&Rt.decrement(this.getEvenCounts(),this.getEvenRoundingErrors())}}ne.OUTSIDE_EVEN_TOTAL_SUBSET=[1,10,34,70,126],ne.INSIDE_ODD_TOTAL_SUBSET=[4,20,48,81],ne.OUTSIDE_GSUM=[0,161,961,2015,2715],ne.INSIDE_GSUM=[0,336,1036,1516],ne.OUTSIDE_ODD_WIDEST=[8,6,4,3,1],ne.INSIDE_ODD_WIDEST=[2,4,6,8],ne.FINDER_PATTERNS=[Int32Array.from([3,8,2,1]),Int32Array.from([3,5,5,1]),Int32Array.from([3,3,7,1]),Int32Array.from([3,1,9,1]),Int32Array.from([2,7,4,1]),Int32Array.from([2,5,6,1]),Int32Array.from([2,3,8,1]),Int32Array.from([1,5,7,1]),Int32Array.from([1,3,9,1])];class ie extends wt{constructor(t,e){super(),this.readers=[],this.verbose=!0===e;const r=t?t.get(C.POSSIBLE_FORMATS):null,n=t&&void 0!==t.get(C.ASSUME_CODE_39_CHECK_DIGIT);r?((r.includes(U.EAN_13)||r.includes(U.UPC_A)||r.includes(U.EAN_8)||r.includes(U.UPC_E))&&this.readers.push(new Mt(t)),r.includes(U.CODE_39)&&this.readers.push(new pt(n)),r.includes(U.CODE_128)&&this.readers.push(new mt),r.includes(U.ITF)&&this.readers.push(new At),r.includes(U.RSS_14)&&this.readers.push(new ne),r.includes(U.RSS_EXPANDED)&&this.readers.push(new ee(this.verbose))):(this.readers.push(new Mt(t)),this.readers.push(new pt),this.readers.push(new Mt(t)),this.readers.push(new mt),this.readers.push(new At),this.readers.push(new ne),this.readers.push(new ee(this.verbose)))}decodeRow(t,e,r){for(let n=0;n<this.readers.length;n++)try{return this.readers[n].decodeRow(t,e,r)}catch(t){}throw new D}reset(){this.readers.forEach((t=>t.reset()))}}class oe{constructor(t,e,r){this.ecCodewords=t,this.ecBlocks=[e],r&&this.ecBlocks.push(r)}getECCodewords(){return this.ecCodewords}getECBlocks(){return this.ecBlocks}}class se{constructor(t,e){this.count=t,this.dataCodewords=e}getCount(){return this.count}getDataCodewords(){return this.dataCodewords}}class ae{constructor(t,e,r,n,i,o){this.versionNumber=t,this.symbolSizeRows=e,this.symbolSizeColumns=r,this.dataRegionSizeRows=n,this.dataRegionSizeColumns=i,this.ecBlocks=o;let s=0;const a=o.getECCodewords(),l=o.getECBlocks();for(let t of l)s+=t.getCount()*(t.getDataCodewords()+a);this.totalCodewords=s}getVersionNumber(){return this.versionNumber}getSymbolSizeRows(){return this.symbolSizeRows}getSymbolSizeColumns(){return this.symbolSizeColumns}getDataRegionSizeRows(){return this.dataRegionSizeRows}getDataRegionSizeColumns(){return this.dataRegionSizeColumns}getTotalCodewords(){return this.totalCodewords}getECBlocks(){return this.ecBlocks}static getVersionForDimensions(t,e){if(0!=(1&t)||0!=(1&e))throw new E;for(let r of ae.VERSIONS)if(r.symbolSizeRows===t&&r.symbolSizeColumns===e)return r;throw new E}toString(){return""+this.versionNumber}static buildVersions(){return[new ae(1,10,10,8,8,new oe(5,new se(1,3))),new ae(2,12,12,10,10,new oe(7,new se(1,5))),new ae(3,14,14,12,12,new oe(10,new se(1,8))),new ae(4,16,16,14,14,new oe(12,new se(1,12))),new ae(5,18,18,16,16,new oe(14,new se(1,18))),new ae(6,20,20,18,18,new oe(18,new se(1,22))),new ae(7,22,22,20,20,new oe(20,new se(1,30))),new ae(8,24,24,22,22,new oe(24,new se(1,36))),new ae(9,26,26,24,24,new oe(28,new se(1,44))),new ae(10,32,32,14,14,new oe(36,new se(1,62))),new ae(11,36,36,16,16,new oe(42,new se(1,86))),new ae(12,40,40,18,18,new oe(48,new se(1,114))),new ae(13,44,44,20,20,new oe(56,new se(1,144))),new ae(14,48,48,22,22,new oe(68,new se(1,174))),new ae(15,52,52,24,24,new oe(42,new se(2,102))),new ae(16,64,64,14,14,new oe(56,new se(2,140))),new ae(17,72,72,16,16,new oe(36,new se(4,92))),new ae(18,80,80,18,18,new oe(48,new se(4,114))),new ae(19,88,88,20,20,new oe(56,new se(4,144))),new ae(20,96,96,22,22,new oe(68,new se(4,174))),new ae(21,104,104,24,24,new oe(56,new se(6,136))),new ae(22,120,120,18,18,new oe(68,new se(6,175))),new ae(23,132,132,20,20,new oe(62,new se(8,163))),new ae(24,144,144,22,22,new oe(62,new se(8,156),new se(2,155))),new ae(25,8,18,6,16,new oe(7,new se(1,5))),new ae(26,8,32,6,14,new oe(11,new se(1,10))),new ae(27,12,26,10,24,new oe(14,new se(1,16))),new ae(28,12,36,10,16,new oe(18,new se(1,22))),new ae(29,16,36,14,16,new oe(24,new se(1,32))),new ae(30,16,48,14,22,new oe(28,new se(1,49)))]}}ae.VERSIONS=ae.buildVersions();class le{constructor(t){const e=t.getHeight();if(e<8||e>144||0!=(1&e))throw new E;this.version=le.readVersion(t),this.mappingBitMatrix=this.extractDataRegion(t),this.readMappingMatrix=new N(this.mappingBitMatrix.getWidth(),this.mappingBitMatrix.getHeight())}getVersion(){return this.version}static readVersion(t){const e=t.getHeight(),r=t.getWidth();return ae.getVersionForDimensions(e,r)}readCodewords(){const t=new Int8Array(this.version.getTotalCodewords());let e=0,r=4,n=0;const i=this.mappingBitMatrix.getHeight(),o=this.mappingBitMatrix.getWidth();let s=!1,a=!1,l=!1,c=!1;do{if(r!==i||0!==n||s)if(r!==i-2||0!==n||0==(3&o)||a)if(r!==i+4||2!==n||0!=(7&o)||l)if(r!==i-2||0!==n||4!=(7&o)||c){do{r<i&&n>=0&&!this.readMappingMatrix.get(n,r)&&(t[e++]=255&this.readUtah(r,n,i,o)),r-=2,n+=2}while(r>=0&&n<o);r+=1,n+=3;do{r>=0&&n<o&&!this.readMappingMatrix.get(n,r)&&(t[e++]=255&this.readUtah(r,n,i,o)),r+=2,n-=2}while(r<i&&n>=0);r+=3,n+=1}else t[e++]=255&this.readCorner4(i,o),r-=2,n+=2,c=!0;else t[e++]=255&this.readCorner3(i,o),r-=2,n+=2,l=!0;else t[e++]=255&this.readCorner2(i,o),r-=2,n+=2,a=!0;else t[e++]=255&this.readCorner1(i,o),r-=2,n+=2,s=!0}while(r<i||n<o);if(e!==this.version.getTotalCodewords())throw new E;return t}readModule(t,e,r,n){return t<0&&(t+=r,e+=4-(r+4&7)),e<0&&(e+=n,t+=4-(n+4&7)),this.readMappingMatrix.set(e,t),this.mappingBitMatrix.get(e,t)}readUtah(t,e,r,n){let i=0;return this.readModule(t-2,e-2,r,n)&&(i|=1),i<<=1,this.readModule(t-2,e-1,r,n)&&(i|=1),i<<=1,this.readModule(t-1,e-2,r,n)&&(i|=1),i<<=1,this.readModule(t-1,e-1,r,n)&&(i|=1),i<<=1,this.readModule(t-1,e,r,n)&&(i|=1),i<<=1,this.readModule(t,e-2,r,n)&&(i|=1),i<<=1,this.readModule(t,e-1,r,n)&&(i|=1),i<<=1,this.readModule(t,e,r,n)&&(i|=1),i}readCorner1(t,e){let r=0;return this.readModule(t-1,0,t,e)&&(r|=1),r<<=1,this.readModule(t-1,1,t,e)&&(r|=1),r<<=1,this.readModule(t-1,2,t,e)&&(r|=1),r<<=1,this.readModule(0,e-2,t,e)&&(r|=1),r<<=1,this.readModule(0,e-1,t,e)&&(r|=1),r<<=1,this.readModule(1,e-1,t,e)&&(r|=1),r<<=1,this.readModule(2,e-1,t,e)&&(r|=1),r<<=1,this.readModule(3,e-1,t,e)&&(r|=1),r}readCorner2(t,e){let r=0;return this.readModule(t-3,0,t,e)&&(r|=1),r<<=1,this.readModule(t-2,0,t,e)&&(r|=1),r<<=1,this.readModule(t-1,0,t,e)&&(r|=1),r<<=1,this.readModule(0,e-4,t,e)&&(r|=1),r<<=1,this.readModule(0,e-3,t,e)&&(r|=1),r<<=1,this.readModule(0,e-2,t,e)&&(r|=1),r<<=1,this.readModule(0,e-1,t,e)&&(r|=1),r<<=1,this.readModule(1,e-1,t,e)&&(r|=1),r}readCorner3(t,e){let r=0;return this.readModule(t-1,0,t,e)&&(r|=1),r<<=1,this.readModule(t-1,e-1,t,e)&&(r|=1),r<<=1,this.readModule(0,e-3,t,e)&&(r|=1),r<<=1,this.readModule(0,e-2,t,e)&&(r|=1),r<<=1,this.readModule(0,e-1,t,e)&&(r|=1),r<<=1,this.readModule(1,e-3,t,e)&&(r|=1),r<<=1,this.readModule(1,e-2,t,e)&&(r|=1),r<<=1,this.readModule(1,e-1,t,e)&&(r|=1),r}readCorner4(t,e){let r=0;return this.readModule(t-3,0,t,e)&&(r|=1),r<<=1,this.readModule(t-2,0,t,e)&&(r|=1),r<<=1,this.readModule(t-1,0,t,e)&&(r|=1),r<<=1,this.readModule(0,e-2,t,e)&&(r|=1),r<<=1,this.readModule(0,e-1,t,e)&&(r|=1),r<<=1,this.readModule(1,e-1,t,e)&&(r|=1),r<<=1,this.readModule(2,e-1,t,e)&&(r|=1),r<<=1,this.readModule(3,e-1,t,e)&&(r|=1),r}extractDataRegion(t){const e=this.version.getSymbolSizeRows(),r=this.version.getSymbolSizeColumns();if(t.getHeight()!==e)throw new l("Dimension of bitMatrix must match the version size");const n=this.version.getDataRegionSizeRows(),i=this.version.getDataRegionSizeColumns(),o=e/n|0,s=r/i|0,a=new N(s*i,o*n);for(let e=0;e<o;++e){const r=e*n;for(let o=0;o<s;++o){const s=o*i;for(let l=0;l<n;++l){const c=e*(n+2)+1+l,h=r+l;for(let e=0;e<i;++e){const r=o*(i+2)+1+e;if(t.get(r,c)){const t=s+e;a.set(t,h)}}}}}return a}}class ce{constructor(t,e){this.numDataCodewords=t,this.codewords=e}static getDataBlocks(t,e){const r=e.getECBlocks();let n=0;const i=r.getECBlocks();for(let t of i)n+=t.getCount();const o=new Array(n);let s=0;for(let t of i)for(let e=0;e<t.getCount();e++){const e=t.getDataCodewords(),n=r.getECCodewords()+e;o[s++]=new ce(e,new Uint8Array(n))}const a=o[0].codewords.length-r.getECCodewords(),c=a-1;let h=0;for(let e=0;e<c;e++)for(let r=0;r<s;r++)o[r].codewords[e]=t[h++];const u=24===e.getVersionNumber(),d=u?8:s;for(let e=0;e<d;e++)o[e].codewords[a-1]=t[h++];const f=o[0].codewords.length;for(let e=a;e<f;e++)for(let r=0;r<s;r++){const n=u?(r+8)%s:r,i=u&&n>7?e-1:e;o[n].codewords[i]=t[h++]}if(h!==t.length)throw new l;return o}getNumDataCodewords(){return this.numDataCodewords}getCodewords(){return this.codewords}}class he{constructor(t){this.bytes=t,this.byteOffset=0,this.bitOffset=0}getBitOffset(){return this.bitOffset}getByteOffset(){return this.byteOffset}readBits(t){if(t<1||t>32||t>this.available())throw new l(""+t);let e=0,r=this.bitOffset,n=this.byteOffset;const i=this.bytes;if(r>0){const o=8-r,s=t<o?t:o,a=o-s,l=255>>8-s<<a;e=(i[n]&l)>>a,t-=s,r+=s,8===r&&(r=0,n++)}if(t>0){for(;t>=8;)e=e<<8|255&i[n],n++,t-=8;if(t>0){const o=8-t,s=255>>o<<o;e=e<<t|(i[n]&s)>>o,r+=t}}return this.bitOffset=r,this.byteOffset=n,e}available(){return 8*(this.bytes.length-this.byteOffset)-this.bitOffset}}!function(t){t[t.PAD_ENCODE=0]="PAD_ENCODE",t[t.ASCII_ENCODE=1]="ASCII_ENCODE",t[t.C40_ENCODE=2]="C40_ENCODE",t[t.TEXT_ENCODE=3]="TEXT_ENCODE",t[t.ANSIX12_ENCODE=4]="ANSIX12_ENCODE",t[t.EDIFACT_ENCODE=5]="EDIFACT_ENCODE",t[t.BASE256_ENCODE=6]="BASE256_ENCODE"}(V||(V={}));class ue{static decode(t){const e=new he(t),r=new y,n=new y,i=new Array;let o=V.ASCII_ENCODE;do{if(o===V.ASCII_ENCODE)o=this.decodeAsciiSegment(e,r,n);else{switch(o){case V.C40_ENCODE:this.decodeC40Segment(e,r);break;case V.TEXT_ENCODE:this.decodeTextSegment(e,r);break;case V.ANSIX12_ENCODE:this.decodeAnsiX12Segment(e,r);break;case V.EDIFACT_ENCODE:this.decodeEdifactSegment(e,r);break;case V.BASE256_ENCODE:this.decodeBase256Segment(e,r,i);break;default:throw new E}o=V.ASCII_ENCODE}}while(o!==V.PAD_ENCODE&&e.available()>0);return n.length()>0&&r.append(n.toString()),new j(t,r.toString(),0===i.length?null:i,null)}static decodeAsciiSegment(t,e,r){let n=!1;do{let i=t.readBits(8);if(0===i)throw new E;if(i<=128)return n&&(i+=128),e.append(String.fromCharCode(i-1)),V.ASCII_ENCODE;if(129===i)return V.PAD_ENCODE;if(i<=229){const t=i-130;t<10&&e.append("0"),e.append(""+t)}else switch(i){case 230:return V.C40_ENCODE;case 231:return V.BASE256_ENCODE;case 232:e.append(String.fromCharCode(29));break;case 233:case 234:case 241:break;case 235:n=!0;break;case 236:e.append("[)>05"),r.insert(0,"");break;case 237:e.append("[)>06"),r.insert(0,"");break;case 238:return V.ANSIX12_ENCODE;case 239:return V.TEXT_ENCODE;case 240:return V.EDIFACT_ENCODE;default:if(254!==i||0!==t.available())throw new E}}while(t.available()>0);return V.ASCII_ENCODE}static decodeC40Segment(t,e){let r=!1;const n=[];let i=0;do{if(8===t.available())return;const o=t.readBits(8);if(254===o)return;this.parseTwoBytes(o,t.readBits(8),n);for(let t=0;t<3;t++){const o=n[t];switch(i){case 0:if(o<3)i=o+1;else{if(!(o<this.C40_BASIC_SET_CHARS.length))throw new E;{const t=this.C40_BASIC_SET_CHARS[o];r?(e.append(String.fromCharCode(t.charCodeAt(0)+128)),r=!1):e.append(t)}}break;case 1:r?(e.append(String.fromCharCode(o+128)),r=!1):e.append(String.fromCharCode(o)),i=0;break;case 2:if(o<this.C40_SHIFT2_SET_CHARS.length){const t=this.C40_SHIFT2_SET_CHARS[o];r?(e.append(String.fromCharCode(t.charCodeAt(0)+128)),r=!1):e.append(t)}else switch(o){case 27:e.append(String.fromCharCode(29));break;case 30:r=!0;break;default:throw new E}i=0;break;case 3:r?(e.append(String.fromCharCode(o+224)),r=!1):e.append(String.fromCharCode(o+96)),i=0;break;default:throw new E}}}while(t.available()>0)}static decodeTextSegment(t,e){let r=!1,n=[],i=0;do{if(8===t.available())return;const o=t.readBits(8);if(254===o)return;this.parseTwoBytes(o,t.readBits(8),n);for(let t=0;t<3;t++){const o=n[t];switch(i){case 0:if(o<3)i=o+1;else{if(!(o<this.TEXT_BASIC_SET_CHARS.length))throw new E;{const t=this.TEXT_BASIC_SET_CHARS[o];r?(e.append(String.fromCharCode(t.charCodeAt(0)+128)),r=!1):e.append(t)}}break;case 1:r?(e.append(String.fromCharCode(o+128)),r=!1):e.append(String.fromCharCode(o)),i=0;break;case 2:if(o<this.TEXT_SHIFT2_SET_CHARS.length){const t=this.TEXT_SHIFT2_SET_CHARS[o];r?(e.append(String.fromCharCode(t.charCodeAt(0)+128)),r=!1):e.append(t)}else switch(o){case 27:e.append(String.fromCharCode(29));break;case 30:r=!0;break;default:throw new E}i=0;break;case 3:if(!(o<this.TEXT_SHIFT3_SET_CHARS.length))throw new E;{const t=this.TEXT_SHIFT3_SET_CHARS[o];r?(e.append(String.fromCharCode(t.charCodeAt(0)+128)),r=!1):e.append(t),i=0}break;default:throw new E}}}while(t.available()>0)}static decodeAnsiX12Segment(t,e){const r=[];do{if(8===t.available())return;const n=t.readBits(8);if(254===n)return;this.parseTwoBytes(n,t.readBits(8),r);for(let t=0;t<3;t++){const n=r[t];switch(n){case 0:e.append("\r");break;case 1:e.append("*");break;case 2:e.append(">");break;case 3:e.append(" ");break;default:if(n<14)e.append(String.fromCharCode(n+44));else{if(!(n<40))throw new E;e.append(String.fromCharCode(n+51))}}}}while(t.available()>0)}static parseTwoBytes(t,e,r){let n=(t<<8)+e-1,i=Math.floor(n/1600);r[0]=i,n-=1600*i,i=Math.floor(n/40),r[1]=i,r[2]=n-40*i}static decodeEdifactSegment(t,e){do{if(t.available()<=16)return;for(let r=0;r<4;r++){let r=t.readBits(6);if(31===r){const e=8-t.getBitOffset();return void(8!==e&&t.readBits(e))}0==(32&r)&&(r|=64),e.append(String.fromCharCode(r))}}while(t.available()>0)}static decodeBase256Segment(t,e,r){let n=1+t.getByteOffset();const i=this.unrandomize255State(t.readBits(8),n++);let o;if(o=0===i?t.available()/8|0:i<250?i:250*(i-249)+this.unrandomize255State(t.readBits(8),n++),o<0)throw new E;const s=new Uint8Array(o);for(let e=0;e<o;e++){if(t.available()<8)throw new E;s[e]=this.unrandomize255State(t.readBits(8),n++)}r.push(s);try{e.append(_.decode(s,T.ISO88591))}catch(t){throw new $("Platform does not support required encoding: "+t.message)}}static unrandomize255State(t,e){const r=t-(149*e%255+1);return r>=0?r:r+256}}ue.C40_BASIC_SET_CHARS=["*","*","*"," ","0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],ue.C40_SHIFT2_SET_CHARS=["!",'"',"#","$","%","&","'","(",")","*","+",",","-",".","/",":",";","<","=",">","?","@","[","\\","]","^","_"],ue.TEXT_BASIC_SET_CHARS=["*","*","*"," ","0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"],ue.TEXT_SHIFT2_SET_CHARS=ue.C40_SHIFT2_SET_CHARS,ue.TEXT_SHIFT3_SET_CHARS=["`","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","{","|","}","~",String.fromCharCode(127)];class de{constructor(){this.rsDecoder=new tt(q.DATA_MATRIX_FIELD_256)}decode(t){const e=new le(t),r=e.getVersion(),n=e.readCodewords(),i=ce.getDataBlocks(n,r);let o=0;for(let t of i)o+=t.getNumDataCodewords();const s=new Uint8Array(o),a=i.length;for(let t=0;t<a;t++){const e=i[t],r=e.getCodewords(),n=e.getNumDataCodewords();this.correctErrors(r,n);for(let e=0;e<n;e++)s[e*a+t]=r[e]}return ue.decode(s)}correctErrors(t,e){const r=new Int32Array(t);try{this.rsDecoder.decode(r,t.length-e)}catch(t){throw new h}for(let n=0;n<e;n++)t[n]=r[n]}}class fe{constructor(t){this.image=t,this.rectangleDetector=new at(this.image)}detect(){const t=this.rectangleDetector.detect();let e=this.detectSolid1(t);if(e=this.detectSolid2(e),e[3]=this.correctTopRight(e),!e[3])throw new D;e=this.shiftToModuleCenter(e);const r=e[0],n=e[1],i=e[2],o=e[3];let s=this.transitionsBetween(r,o)+1,a=this.transitionsBetween(i,o)+1;1==(1&s)&&(s+=1),1==(1&a)&&(a+=1),4*s<7*a&&4*a<7*s&&(s=a=Math.max(s,a));let l=fe.sampleGrid(this.image,r,n,i,o,s,a);return new ot(l,[r,n,i,o])}static shiftPoint(t,e,r){let n=(e.getX()-t.getX())/(r+1),i=(e.getY()-t.getY())/(r+1);return new it(t.getX()+n,t.getY()+i)}static moveAway(t,e,r){let n=t.getX(),i=t.getY();return n<e?n-=1:n+=1,i<r?i-=1:i+=1,new it(n,i)}detectSolid1(t){let e=t[0],r=t[1],n=t[3],i=t[2],o=this.transitionsBetween(e,r),s=this.transitionsBetween(r,n),a=this.transitionsBetween(n,i),l=this.transitionsBetween(i,e),c=o,h=[i,e,r,n];return c>s&&(c=s,h[0]=e,h[1]=r,h[2]=n,h[3]=i),c>a&&(c=a,h[0]=r,h[1]=n,h[2]=i,h[3]=e),c>l&&(h[0]=n,h[1]=i,h[2]=e,h[3]=r),h}detectSolid2(t){let e=t[0],r=t[1],n=t[2],i=t[3],o=this.transitionsBetween(e,i),s=fe.shiftPoint(r,n,4*(o+1)),a=fe.shiftPoint(n,r,4*(o+1));return this.transitionsBetween(s,e)<this.transitionsBetween(a,i)?(t[0]=e,t[1]=r,t[2]=n,t[3]=i):(t[0]=r,t[1]=n,t[2]=i,t[3]=e),t}correctTopRight(t){let e=t[0],r=t[1],n=t[2],i=t[3],o=this.transitionsBetween(e,i),s=this.transitionsBetween(r,i),a=fe.shiftPoint(e,r,4*(s+1)),l=fe.shiftPoint(n,r,4*(o+1));o=this.transitionsBetween(a,i),s=this.transitionsBetween(l,i);let c=new it(i.getX()+(n.getX()-r.getX())/(o+1),i.getY()+(n.getY()-r.getY())/(o+1)),h=new it(i.getX()+(e.getX()-r.getX())/(s+1),i.getY()+(e.getY()-r.getY())/(s+1));return this.isValid(c)?this.isValid(h)?this.transitionsBetween(a,c)+this.transitionsBetween(l,c)>this.transitionsBetween(a,h)+this.transitionsBetween(l,h)?c:h:c:this.isValid(h)?h:null}shiftToModuleCenter(t){let e=t[0],r=t[1],n=t[2],i=t[3],o=this.transitionsBetween(e,i)+1,s=this.transitionsBetween(n,i)+1,a=fe.shiftPoint(e,r,4*s),l=fe.shiftPoint(n,r,4*o);o=this.transitionsBetween(a,i)+1,s=this.transitionsBetween(l,i)+1,1==(1&o)&&(o+=1),1==(1&s)&&(s+=1);let c,h,u=(e.getX()+r.getX()+n.getX()+i.getX())/4,d=(e.getY()+r.getY()+n.getY()+i.getY())/4;return e=fe.moveAway(e,u,d),r=fe.moveAway(r,u,d),n=fe.moveAway(n,u,d),i=fe.moveAway(i,u,d),a=fe.shiftPoint(e,r,4*s),a=fe.shiftPoint(a,i,4*o),c=fe.shiftPoint(r,e,4*s),c=fe.shiftPoint(c,n,4*o),l=fe.shiftPoint(n,i,4*s),l=fe.shiftPoint(l,r,4*o),h=fe.shiftPoint(i,n,4*s),h=fe.shiftPoint(h,e,4*o),[a,c,l,h]}isValid(t){return t.getX()>=0&&t.getX()<this.image.getWidth()&&t.getY()>0&&t.getY()<this.image.getHeight()}static sampleGrid(t,e,r,n,i,o,s){return ut.getInstance().sampleGrid(t,o,s,.5,.5,o-.5,.5,o-.5,s-.5,.5,s-.5,e.getX(),e.getY(),i.getX(),i.getY(),n.getX(),n.getY(),r.getX(),r.getY())}transitionsBetween(t,e){let r=Math.trunc(t.getX()),n=Math.trunc(t.getY()),i=Math.trunc(e.getX()),o=Math.trunc(e.getY()),s=Math.abs(o-n)>Math.abs(i-r);if(s){let t=r;r=n,n=t,t=i,i=o,o=t}let a=Math.abs(i-r),l=Math.abs(o-n),c=-a/2,h=n<o?1:-1,u=r<i?1:-1,d=0,f=this.image.get(s?n:r,s?r:n);for(let t=r,e=n;t!==i;t+=u){let r=this.image.get(s?e:t,s?t:e);if(r!==f&&(d++,f=r),c+=l,c>0){if(e===o)break;e+=h,c-=a}}return d}}class ge{constructor(){this.decoder=new de}decode(t,e=null){let r,n;if(null!=e&&e.has(C.PURE_BARCODE)){const e=ge.extractPureBits(t.getBlackMatrix());r=this.decoder.decode(e),n=ge.NO_POINTS}else{const e=new fe(t.getBlackMatrix()).detect();r=this.decoder.decode(e.getBits()),n=e.getPoints()}const i=r.getRawBytes(),o=new x(r.getText(),i,8*i.length,n,U.DATA_MATRIX,d.currentTimeMillis()),s=r.getByteSegments();null!=s&&o.putMetadata(W.BYTE_SEGMENTS,s);const a=r.getECLevel();return null!=a&&o.putMetadata(W.ERROR_CORRECTION_LEVEL,a),o}reset(){}static extractPureBits(t){const e=t.getTopLeftOnBit(),r=t.getBottomRightOnBit();if(null==e||null==r)throw new D;const n=this.moduleSize(e,t);let i=e[1];const o=r[1];let s=e[0];const a=(r[0]-s+1)/n,l=(o-i+1)/n;if(a<=0||l<=0)throw new D;const c=n/2;i+=c,s+=c;const h=new N(a,l);for(let e=0;e<l;e++){const r=i+e*n;for(let i=0;i<a;i++)t.get(s+i*n,r)&&h.set(i,e)}return h}static moduleSize(t,e){const r=e.getWidth();let n=t[0];const i=t[1];for(;n<r&&e.get(n,i);)n++;if(n===r)throw new D;const o=n-t[0];if(0===o)throw new D;return o}}ge.NO_POINTS=[];!function(t){t[t.L=0]="L",t[t.M=1]="M",t[t.Q=2]="Q",t[t.H=3]="H"}(z||(z={}));class we{constructor(t,e,r){this.value=t,this.stringValue=e,this.bits=r,we.FOR_BITS.set(r,this),we.FOR_VALUE.set(t,this)}getValue(){return this.value}getBits(){return this.bits}static fromString(t){switch(t){case"L":return we.L;case"M":return we.M;case"Q":return we.Q;case"H":return we.H;default:throw new a(t+"not available")}}toString(){return this.stringValue}equals(t){if(!(t instanceof we))return!1;const e=t;return this.value===e.value}static forBits(t){if(t<0||t>=we.FOR_BITS.size)throw new l;return we.FOR_BITS.get(t)}}we.FOR_BITS=new Map,we.FOR_VALUE=new Map,we.L=new we(z.L,"L",1),we.M=new we(z.M,"M",0),we.Q=new we(z.Q,"Q",3),we.H=new we(z.H,"H",2);class me{constructor(t){this.errorCorrectionLevel=we.forBits(t>>3&3),this.dataMask=7&t}static numBitsDiffering(t,e){return m.bitCount(t^e)}static decodeFormatInformation(t,e){const r=me.doDecodeFormatInformation(t,e);return null!==r?r:me.doDecodeFormatInformation(t^me.FORMAT_INFO_MASK_QR,e^me.FORMAT_INFO_MASK_QR)}static doDecodeFormatInformation(t,e){let r=Number.MAX_SAFE_INTEGER,n=0;for(const i of me.FORMAT_INFO_DECODE_LOOKUP){const o=i[0];if(o===t||o===e)return new me(i[1]);let s=me.numBitsDiffering(t,o);s<r&&(n=i[1],r=s),t!==e&&(s=me.numBitsDiffering(e,o),s<r&&(n=i[1],r=s))}return r<=3?new me(n):null}getErrorCorrectionLevel(){return this.errorCorrectionLevel}getDataMask(){return this.dataMask}hashCode(){return this.errorCorrectionLevel.getBits()<<3|this.dataMask}equals(t){if(!(t instanceof me))return!1;const e=t;return this.errorCorrectionLevel===e.errorCorrectionLevel&&this.dataMask===e.dataMask}}me.FORMAT_INFO_MASK_QR=21522,me.FORMAT_INFO_DECODE_LOOKUP=[Int32Array.from([21522,0]),Int32Array.from([20773,1]),Int32Array.from([24188,2]),Int32Array.from([23371,3]),Int32Array.from([17913,4]),Int32Array.from([16590,5]),Int32Array.from([20375,6]),Int32Array.from([19104,7]),Int32Array.from([30660,8]),Int32Array.from([29427,9]),Int32Array.from([32170,10]),Int32Array.from([30877,11]),Int32Array.from([26159,12]),Int32Array.from([25368,13]),Int32Array.from([27713,14]),Int32Array.from([26998,15]),Int32Array.from([5769,16]),Int32Array.from([5054,17]),Int32Array.from([7399,18]),Int32Array.from([6608,19]),Int32Array.from([1890,20]),Int32Array.from([597,21]),Int32Array.from([3340,22]),Int32Array.from([2107,23]),Int32Array.from([13663,24]),Int32Array.from([12392,25]),Int32Array.from([16177,26]),Int32Array.from([14854,27]),Int32Array.from([9396,28]),Int32Array.from([8579,29]),Int32Array.from([11994,30]),Int32Array.from([11245,31])];class pe{constructor(t,...e){this.ecCodewordsPerBlock=t,this.ecBlocks=e}getECCodewordsPerBlock(){return this.ecCodewordsPerBlock}getNumBlocks(){let t=0;const e=this.ecBlocks;for(const r of e)t+=r.getCount();return t}getTotalECCodewords(){return this.ecCodewordsPerBlock*this.getNumBlocks()}getECBlocks(){return this.ecBlocks}}class Ae{constructor(t,e){this.count=t,this.dataCodewords=e}getCount(){return this.count}getDataCodewords(){return this.dataCodewords}}class Ce{constructor(t,e,...r){this.versionNumber=t,this.alignmentPatternCenters=e,this.ecBlocks=r;let n=0;const i=r[0].getECCodewordsPerBlock(),o=r[0].getECBlocks();for(const t of o)n+=t.getCount()*(t.getDataCodewords()+i);this.totalCodewords=n}getVersionNumber(){return this.versionNumber}getAlignmentPatternCenters(){return this.alignmentPatternCenters}getTotalCodewords(){return this.totalCodewords}getDimensionForVersion(){return 17+4*this.versionNumber}getECBlocksForLevel(t){return this.ecBlocks[t.getValue()]}static getProvisionalVersionForDimension(t){if(t%4!=1)throw new E;try{return this.getVersionForNumber((t-17)/4)}catch(t){throw new E}}static getVersionForNumber(t){if(t<1||t>40)throw new l;return Ce.VERSIONS[t-1]}static decodeVersionInformation(t){let e=Number.MAX_SAFE_INTEGER,r=0;for(let n=0;n<Ce.VERSION_DECODE_INFO.length;n++){const i=Ce.VERSION_DECODE_INFO[n];if(i===t)return Ce.getVersionForNumber(n+7);const o=me.numBitsDiffering(t,i);o<e&&(r=n+7,e=o)}return e<=3?Ce.getVersionForNumber(r):null}buildFunctionPattern(){const t=this.getDimensionForVersion(),e=new N(t);e.setRegion(0,0,9,9),e.setRegion(t-8,0,8,9),e.setRegion(0,t-8,9,8);const r=this.alignmentPatternCenters.length;for(let t=0;t<r;t++){const n=this.alignmentPatternCenters[t]-2;for(let i=0;i<r;i++)0===t&&(0===i||i===r-1)||t===r-1&&0===i||e.setRegion(this.alignmentPatternCenters[i]-2,n,5,5)}return e.setRegion(6,9,1,t-17),e.setRegion(9,6,t-17,1),this.versionNumber>6&&(e.setRegion(t-11,0,3,6),e.setRegion(0,t-11,6,3)),e}toString(){return""+this.versionNumber}}Ce.VERSION_DECODE_INFO=Int32Array.from([31892,34236,39577,42195,48118,51042,55367,58893,63784,68472,70749,76311,79154,84390,87683,92361,96236,102084,102881,110507,110734,117786,119615,126325,127568,133589,136944,141498,145311,150283,152622,158308,161089,167017]),Ce.VERSIONS=[new Ce(1,new Int32Array(0),new pe(7,new Ae(1,19)),new pe(10,new Ae(1,16)),new pe(13,new Ae(1,13)),new pe(17,new Ae(1,9))),new Ce(2,Int32Array.from([6,18]),new pe(10,new Ae(1,34)),new pe(16,new Ae(1,28)),new pe(22,new Ae(1,22)),new pe(28,new Ae(1,16))),new Ce(3,Int32Array.from([6,22]),new pe(15,new Ae(1,55)),new pe(26,new Ae(1,44)),new pe(18,new Ae(2,17)),new pe(22,new Ae(2,13))),new Ce(4,Int32Array.from([6,26]),new pe(20,new Ae(1,80)),new pe(18,new Ae(2,32)),new pe(26,new Ae(2,24)),new pe(16,new Ae(4,9))),new Ce(5,Int32Array.from([6,30]),new pe(26,new Ae(1,108)),new pe(24,new Ae(2,43)),new pe(18,new Ae(2,15),new Ae(2,16)),new pe(22,new Ae(2,11),new Ae(2,12))),new Ce(6,Int32Array.from([6,34]),new pe(18,new Ae(2,68)),new pe(16,new Ae(4,27)),new pe(24,new Ae(4,19)),new pe(28,new Ae(4,15))),new Ce(7,Int32Array.from([6,22,38]),new pe(20,new Ae(2,78)),new pe(18,new Ae(4,31)),new pe(18,new Ae(2,14),new Ae(4,15)),new pe(26,new Ae(4,13),new Ae(1,14))),new Ce(8,Int32Array.from([6,24,42]),new pe(24,new Ae(2,97)),new pe(22,new Ae(2,38),new Ae(2,39)),new pe(22,new Ae(4,18),new Ae(2,19)),new pe(26,new Ae(4,14),new Ae(2,15))),new Ce(9,Int32Array.from([6,26,46]),new pe(30,new Ae(2,116)),new pe(22,new Ae(3,36),new Ae(2,37)),new pe(20,new Ae(4,16),new Ae(4,17)),new pe(24,new Ae(4,12),new Ae(4,13))),new Ce(10,Int32Array.from([6,28,50]),new pe(18,new Ae(2,68),new Ae(2,69)),new pe(26,new Ae(4,43),new Ae(1,44)),new pe(24,new Ae(6,19),new Ae(2,20)),new pe(28,new Ae(6,15),new Ae(2,16))),new Ce(11,Int32Array.from([6,30,54]),new pe(20,new Ae(4,81)),new pe(30,new Ae(1,50),new Ae(4,51)),new pe(28,new Ae(4,22),new Ae(4,23)),new pe(24,new Ae(3,12),new Ae(8,13))),new Ce(12,Int32Array.from([6,32,58]),new pe(24,new Ae(2,92),new Ae(2,93)),new pe(22,new Ae(6,36),new Ae(2,37)),new pe(26,new Ae(4,20),new Ae(6,21)),new pe(28,new Ae(7,14),new Ae(4,15))),new Ce(13,Int32Array.from([6,34,62]),new pe(26,new Ae(4,107)),new pe(22,new Ae(8,37),new Ae(1,38)),new pe(24,new Ae(8,20),new Ae(4,21)),new pe(22,new Ae(12,11),new Ae(4,12))),new Ce(14,Int32Array.from([6,26,46,66]),new pe(30,new Ae(3,115),new Ae(1,116)),new pe(24,new Ae(4,40),new Ae(5,41)),new pe(20,new Ae(11,16),new Ae(5,17)),new pe(24,new Ae(11,12),new Ae(5,13))),new Ce(15,Int32Array.from([6,26,48,70]),new pe(22,new Ae(5,87),new Ae(1,88)),new pe(24,new Ae(5,41),new Ae(5,42)),new pe(30,new Ae(5,24),new Ae(7,25)),new pe(24,new Ae(11,12),new Ae(7,13))),new Ce(16,Int32Array.from([6,26,50,74]),new pe(24,new Ae(5,98),new Ae(1,99)),new pe(28,new Ae(7,45),new Ae(3,46)),new pe(24,new Ae(15,19),new Ae(2,20)),new pe(30,new Ae(3,15),new Ae(13,16))),new Ce(17,Int32Array.from([6,30,54,78]),new pe(28,new Ae(1,107),new Ae(5,108)),new pe(28,new Ae(10,46),new Ae(1,47)),new pe(28,new Ae(1,22),new Ae(15,23)),new pe(28,new Ae(2,14),new Ae(17,15))),new Ce(18,Int32Array.from([6,30,56,82]),new pe(30,new Ae(5,120),new Ae(1,121)),new pe(26,new Ae(9,43),new Ae(4,44)),new pe(28,new Ae(17,22),new Ae(1,23)),new pe(28,new Ae(2,14),new Ae(19,15))),new Ce(19,Int32Array.from([6,30,58,86]),new pe(28,new Ae(3,113),new Ae(4,114)),new pe(26,new Ae(3,44),new Ae(11,45)),new pe(26,new Ae(17,21),new Ae(4,22)),new pe(26,new Ae(9,13),new Ae(16,14))),new Ce(20,Int32Array.from([6,34,62,90]),new pe(28,new Ae(3,107),new Ae(5,108)),new pe(26,new Ae(3,41),new Ae(13,42)),new pe(30,new Ae(15,24),new Ae(5,25)),new pe(28,new Ae(15,15),new Ae(10,16))),new Ce(21,Int32Array.from([6,28,50,72,94]),new pe(28,new Ae(4,116),new Ae(4,117)),new pe(26,new Ae(17,42)),new pe(28,new Ae(17,22),new Ae(6,23)),new pe(30,new Ae(19,16),new Ae(6,17))),new Ce(22,Int32Array.from([6,26,50,74,98]),new pe(28,new Ae(2,111),new Ae(7,112)),new pe(28,new Ae(17,46)),new pe(30,new Ae(7,24),new Ae(16,25)),new pe(24,new Ae(34,13))),new Ce(23,Int32Array.from([6,30,54,78,102]),new pe(30,new Ae(4,121),new Ae(5,122)),new pe(28,new Ae(4,47),new Ae(14,48)),new pe(30,new Ae(11,24),new Ae(14,25)),new pe(30,new Ae(16,15),new Ae(14,16))),new Ce(24,Int32Array.from([6,28,54,80,106]),new pe(30,new Ae(6,117),new Ae(4,118)),new pe(28,new Ae(6,45),new Ae(14,46)),new pe(30,new Ae(11,24),new Ae(16,25)),new pe(30,new Ae(30,16),new Ae(2,17))),new Ce(25,Int32Array.from([6,32,58,84,110]),new pe(26,new Ae(8,106),new Ae(4,107)),new pe(28,new Ae(8,47),new Ae(13,48)),new pe(30,new Ae(7,24),new Ae(22,25)),new pe(30,new Ae(22,15),new Ae(13,16))),new Ce(26,Int32Array.from([6,30,58,86,114]),new pe(28,new Ae(10,114),new Ae(2,115)),new pe(28,new Ae(19,46),new Ae(4,47)),new pe(28,new Ae(28,22),new Ae(6,23)),new pe(30,new Ae(33,16),new Ae(4,17))),new Ce(27,Int32Array.from([6,34,62,90,118]),new pe(30,new Ae(8,122),new Ae(4,123)),new pe(28,new Ae(22,45),new Ae(3,46)),new pe(30,new Ae(8,23),new Ae(26,24)),new pe(30,new Ae(12,15),new Ae(28,16))),new Ce(28,Int32Array.from([6,26,50,74,98,122]),new pe(30,new Ae(3,117),new Ae(10,118)),new pe(28,new Ae(3,45),new Ae(23,46)),new pe(30,new Ae(4,24),new Ae(31,25)),new pe(30,new Ae(11,15),new Ae(31,16))),new Ce(29,Int32Array.from([6,30,54,78,102,126]),new pe(30,new Ae(7,116),new Ae(7,117)),new pe(28,new Ae(21,45),new Ae(7,46)),new pe(30,new Ae(1,23),new Ae(37,24)),new pe(30,new Ae(19,15),new Ae(26,16))),new Ce(30,Int32Array.from([6,26,52,78,104,130]),new pe(30,new Ae(5,115),new Ae(10,116)),new pe(28,new Ae(19,47),new Ae(10,48)),new pe(30,new Ae(15,24),new Ae(25,25)),new pe(30,new Ae(23,15),new Ae(25,16))),new Ce(31,Int32Array.from([6,30,56,82,108,134]),new pe(30,new Ae(13,115),new Ae(3,116)),new pe(28,new Ae(2,46),new Ae(29,47)),new pe(30,new Ae(42,24),new Ae(1,25)),new pe(30,new Ae(23,15),new Ae(28,16))),new Ce(32,Int32Array.from([6,34,60,86,112,138]),new pe(30,new Ae(17,115)),new pe(28,new Ae(10,46),new Ae(23,47)),new pe(30,new Ae(10,24),new Ae(35,25)),new pe(30,new Ae(19,15),new Ae(35,16))),new Ce(33,Int32Array.from([6,30,58,86,114,142]),new pe(30,new Ae(17,115),new Ae(1,116)),new pe(28,new Ae(14,46),new Ae(21,47)),new pe(30,new Ae(29,24),new Ae(19,25)),new pe(30,new Ae(11,15),new Ae(46,16))),new Ce(34,Int32Array.from([6,34,62,90,118,146]),new pe(30,new Ae(13,115),new Ae(6,116)),new pe(28,new Ae(14,46),new Ae(23,47)),new pe(30,new Ae(44,24),new Ae(7,25)),new pe(30,new Ae(59,16),new Ae(1,17))),new Ce(35,Int32Array.from([6,30,54,78,102,126,150]),new pe(30,new Ae(12,121),new Ae(7,122)),new pe(28,new Ae(12,47),new Ae(26,48)),new pe(30,new Ae(39,24),new Ae(14,25)),new pe(30,new Ae(22,15),new Ae(41,16))),new Ce(36,Int32Array.from([6,24,50,76,102,128,154]),new pe(30,new Ae(6,121),new Ae(14,122)),new pe(28,new Ae(6,47),new Ae(34,48)),new pe(30,new Ae(46,24),new Ae(10,25)),new pe(30,new Ae(2,15),new Ae(64,16))),new Ce(37,Int32Array.from([6,28,54,80,106,132,158]),new pe(30,new Ae(17,122),new Ae(4,123)),new pe(28,new Ae(29,46),new Ae(14,47)),new pe(30,new Ae(49,24),new Ae(10,25)),new pe(30,new Ae(24,15),new Ae(46,16))),new Ce(38,Int32Array.from([6,32,58,84,110,136,162]),new pe(30,new Ae(4,122),new Ae(18,123)),new pe(28,new Ae(13,46),new Ae(32,47)),new pe(30,new Ae(48,24),new Ae(14,25)),new pe(30,new Ae(42,15),new Ae(32,16))),new Ce(39,Int32Array.from([6,26,54,82,110,138,166]),new pe(30,new Ae(20,117),new Ae(4,118)),new pe(28,new Ae(40,47),new Ae(7,48)),new pe(30,new Ae(43,24),new Ae(22,25)),new pe(30,new Ae(10,15),new Ae(67,16))),new Ce(40,Int32Array.from([6,30,58,86,114,142,170]),new pe(30,new Ae(19,118),new Ae(6,119)),new pe(28,new Ae(18,47),new Ae(31,48)),new pe(30,new Ae(34,24),new Ae(34,25)),new pe(30,new Ae(20,15),new Ae(61,16)))],function(t){t[t.DATA_MASK_000=0]="DATA_MASK_000",t[t.DATA_MASK_001=1]="DATA_MASK_001",t[t.DATA_MASK_010=2]="DATA_MASK_010",t[t.DATA_MASK_011=3]="DATA_MASK_011",t[t.DATA_MASK_100=4]="DATA_MASK_100",t[t.DATA_MASK_101=5]="DATA_MASK_101",t[t.DATA_MASK_110=6]="DATA_MASK_110",t[t.DATA_MASK_111=7]="DATA_MASK_111"}(G||(G={}));class Ee{constructor(t,e){this.value=t,this.isMasked=e}unmaskBitMatrix(t,e){for(let r=0;r<e;r++)for(let n=0;n<e;n++)this.isMasked(r,n)&&t.flip(n,r)}}Ee.values=new Map([[G.DATA_MASK_000,new Ee(G.DATA_MASK_000,((t,e)=>0==(t+e&1)))],[G.DATA_MASK_001,new Ee(G.DATA_MASK_001,((t,e)=>0==(1&t)))],[G.DATA_MASK_010,new Ee(G.DATA_MASK_010,((t,e)=>e%3==0))],[G.DATA_MASK_011,new Ee(G.DATA_MASK_011,((t,e)=>(t+e)%3==0))],[G.DATA_MASK_100,new Ee(G.DATA_MASK_100,((t,e)=>0==(Math.floor(t/2)+Math.floor(e/3)&1)))],[G.DATA_MASK_101,new Ee(G.DATA_MASK_101,((t,e)=>t*e%6==0))],[G.DATA_MASK_110,new Ee(G.DATA_MASK_110,((t,e)=>t*e%6<3))],[G.DATA_MASK_111,new Ee(G.DATA_MASK_111,((t,e)=>0==(t+e+t*e%3&1)))]]);class Ie{constructor(t){const e=t.getHeight();if(e<21||1!=(3&e))throw new E;this.bitMatrix=t}readFormatInformation(){if(null!==this.parsedFormatInfo&&void 0!==this.parsedFormatInfo)return this.parsedFormatInfo;let t=0;for(let e=0;e<6;e++)t=this.copyBit(e,8,t);t=this.copyBit(7,8,t),t=this.copyBit(8,8,t),t=this.copyBit(8,7,t);for(let e=5;e>=0;e--)t=this.copyBit(8,e,t);const e=this.bitMatrix.getHeight();let r=0;const n=e-7;for(let t=e-1;t>=n;t--)r=this.copyBit(8,t,r);for(let t=e-8;t<e;t++)r=this.copyBit(t,8,r);if(this.parsedFormatInfo=me.decodeFormatInformation(t,r),null!==this.parsedFormatInfo)return this.parsedFormatInfo;throw new E}readVersion(){if(null!==this.parsedVersion&&void 0!==this.parsedVersion)return this.parsedVersion;const t=this.bitMatrix.getHeight(),e=Math.floor((t-17)/4);if(e<=6)return Ce.getVersionForNumber(e);let r=0;const n=t-11;for(let e=5;e>=0;e--)for(let i=t-9;i>=n;i--)r=this.copyBit(i,e,r);let i=Ce.decodeVersionInformation(r);if(null!==i&&i.getDimensionForVersion()===t)return this.parsedVersion=i,i;r=0;for(let e=5;e>=0;e--)for(let i=t-9;i>=n;i--)r=this.copyBit(e,i,r);if(i=Ce.decodeVersionInformation(r),null!==i&&i.getDimensionForVersion()===t)return this.parsedVersion=i,i;throw new E}copyBit(t,e,r){return(this.isMirror?this.bitMatrix.get(e,t):this.bitMatrix.get(t,e))?r<<1|1:r<<1}readCodewords(){const t=this.readFormatInformation(),e=this.readVersion(),r=Ee.values.get(t.getDataMask()),n=this.bitMatrix.getHeight();r.unmaskBitMatrix(this.bitMatrix,n);const i=e.buildFunctionPattern();let o=!0;const s=new Uint8Array(e.getTotalCodewords());let a=0,l=0,c=0;for(let t=n-1;t>0;t-=2){6===t&&t--;for(let e=0;e<n;e++){const r=o?n-1-e:e;for(let e=0;e<2;e++)i.get(t-e,r)||(c++,l<<=1,this.bitMatrix.get(t-e,r)&&(l|=1),8===c&&(s[a++]=l,c=0,l=0))}o=!o}if(a!==e.getTotalCodewords())throw new E;return s}remask(){if(null===this.parsedFormatInfo)return;const t=Ee.values[this.parsedFormatInfo.getDataMask()],e=this.bitMatrix.getHeight();t.unmaskBitMatrix(this.bitMatrix,e)}setMirror(t){this.parsedVersion=null,this.parsedFormatInfo=null,this.isMirror=t}mirror(){const t=this.bitMatrix;for(let e=0,r=t.getWidth();e<r;e++)for(let r=e+1,n=t.getHeight();r<n;r++)t.get(e,r)!==t.get(r,e)&&(t.flip(r,e),t.flip(e,r))}}class Se{constructor(t,e){this.numDataCodewords=t,this.codewords=e}static getDataBlocks(t,e,r){if(t.length!==e.getTotalCodewords())throw new l;const n=e.getECBlocksForLevel(r);let i=0;const o=n.getECBlocks();for(const t of o)i+=t.getCount();const s=new Array(i);let a=0;for(const t of o)for(let e=0;e<t.getCount();e++){const e=t.getDataCodewords(),r=n.getECCodewordsPerBlock()+e;s[a++]=new Se(e,new Uint8Array(r))}const c=s[0].codewords.length;let h=s.length-1;for(;h>=0&&s[h].codewords.length!==c;)h--;h++;const u=c-n.getECCodewordsPerBlock();let d=0;for(let e=0;e<u;e++)for(let r=0;r<a;r++)s[r].codewords[e]=t[d++];for(let e=h;e<a;e++)s[e].codewords[u]=t[d++];const f=s[0].codewords.length;for(let e=u;e<f;e++)for(let r=0;r<a;r++){const n=r<h?e:e+1;s[r].codewords[n]=t[d++]}return s}getNumDataCodewords(){return this.numDataCodewords}getCodewords(){return this.codewords}}!function(t){t[t.TERMINATOR=0]="TERMINATOR",t[t.NUMERIC=1]="NUMERIC",t[t.ALPHANUMERIC=2]="ALPHANUMERIC",t[t.STRUCTURED_APPEND=3]="STRUCTURED_APPEND",t[t.BYTE=4]="BYTE",t[t.ECI=5]="ECI",t[t.KANJI=6]="KANJI",t[t.FNC1_FIRST_POSITION=7]="FNC1_FIRST_POSITION",t[t.FNC1_SECOND_POSITION=8]="FNC1_SECOND_POSITION",t[t.HANZI=9]="HANZI"}(Y||(Y={}));class _e{constructor(t,e,r,n){this.value=t,this.stringValue=e,this.characterCountBitsForVersions=r,this.bits=n,_e.FOR_BITS.set(n,this),_e.FOR_VALUE.set(t,this)}static forBits(t){const e=_e.FOR_BITS.get(t);if(void 0===e)throw new l;return e}getCharacterCountBits(t){const e=t.getVersionNumber();let r;return r=e<=9?0:e<=26?1:2,this.characterCountBitsForVersions[r]}getValue(){return this.value}getBits(){return this.bits}equals(t){if(!(t instanceof _e))return!1;const e=t;return this.value===e.value}toString(){return this.stringValue}}_e.FOR_BITS=new Map,_e.FOR_VALUE=new Map,_e.TERMINATOR=new _e(Y.TERMINATOR,"TERMINATOR",Int32Array.from([0,0,0]),0),_e.NUMERIC=new _e(Y.NUMERIC,"NUMERIC",Int32Array.from([10,12,14]),1),_e.ALPHANUMERIC=new _e(Y.ALPHANUMERIC,"ALPHANUMERIC",Int32Array.from([9,11,13]),2),_e.STRUCTURED_APPEND=new _e(Y.STRUCTURED_APPEND,"STRUCTURED_APPEND",Int32Array.from([0,0,0]),3),_e.BYTE=new _e(Y.BYTE,"BYTE",Int32Array.from([8,16,16]),4),_e.ECI=new _e(Y.ECI,"ECI",Int32Array.from([0,0,0]),7),_e.KANJI=new _e(Y.KANJI,"KANJI",Int32Array.from([8,10,12]),8),_e.FNC1_FIRST_POSITION=new _e(Y.FNC1_FIRST_POSITION,"FNC1_FIRST_POSITION",Int32Array.from([0,0,0]),5),_e.FNC1_SECOND_POSITION=new _e(Y.FNC1_SECOND_POSITION,"FNC1_SECOND_POSITION",Int32Array.from([0,0,0]),9),_e.HANZI=new _e(Y.HANZI,"HANZI",Int32Array.from([8,10,12]),13);class Te{static decode(t,e,r,n){const i=new he(t);let o=new y;const s=new Array;let a=-1,l=-1;try{let t,r=null,c=!1;do{if(i.available()<4)t=_e.TERMINATOR;else{const e=i.readBits(4);t=_e.forBits(e)}switch(t){case _e.TERMINATOR:break;case _e.FNC1_FIRST_POSITION:case _e.FNC1_SECOND_POSITION:c=!0;break;case _e.STRUCTURED_APPEND:if(i.available()<16)throw new E;a=i.readBits(8),l=i.readBits(8);break;case _e.ECI:const h=Te.parseECIValue(i);if(r=I.getCharacterSetECIByValue(h),null===r)throw new E;break;case _e.HANZI:const u=i.readBits(4),d=i.readBits(t.getCharacterCountBits(e));u===Te.GB2312_SUBSET&&Te.decodeHanziSegment(i,o,d);break;default:const f=i.readBits(t.getCharacterCountBits(e));switch(t){case _e.NUMERIC:Te.decodeNumericSegment(i,o,f);break;case _e.ALPHANUMERIC:Te.decodeAlphanumericSegment(i,o,f,c);break;case _e.BYTE:Te.decodeByteSegment(i,o,f,r,s,n);break;case _e.KANJI:Te.decodeKanjiSegment(i,o,f);break;default:throw new E}}}while(t!==_e.TERMINATOR)}catch(t){throw new E}return new j(t,o.toString(),0===s.length?null:s,null===r?null:r.toString(),a,l)}static decodeHanziSegment(t,e,r){if(13*r>t.available())throw new E;const n=new Uint8Array(2*r);let i=0;for(;r>0;){const e=t.readBits(13);let o=e/96<<8&4294967295|e%96;o+=o<959?41377:42657,n[i]=o>>8&255,n[i+1]=255&o,i+=2,r--}try{e.append(_.decode(n,T.GB2312))}catch(t){throw new E(t)}}static decodeKanjiSegment(t,e,r){if(13*r>t.available())throw new E;const n=new Uint8Array(2*r);let i=0;for(;r>0;){const e=t.readBits(13);let o=e/192<<8&4294967295|e%192;o+=o<7936?33088:49472,n[i]=o>>8,n[i+1]=o,i+=2,r--}try{e.append(_.decode(n,T.SHIFT_JIS))}catch(t){throw new E(t)}}static decodeByteSegment(t,e,r,n,i,o){if(8*r>t.available())throw new E;const s=new Uint8Array(r);for(let e=0;e<r;e++)s[e]=t.readBits(8);let a;a=null===n?T.guessEncoding(s,o):n.getName();try{e.append(_.decode(s,a))}catch(t){throw new E(t)}i.push(s)}static toAlphaNumericChar(t){if(t>=Te.ALPHANUMERIC_CHARS.length)throw new E;return Te.ALPHANUMERIC_CHARS[t]}static decodeAlphanumericSegment(t,e,r,n){const i=e.length();for(;r>1;){if(t.available()<11)throw new E;const n=t.readBits(11);e.append(Te.toAlphaNumericChar(Math.floor(n/45))),e.append(Te.toAlphaNumericChar(n%45)),r-=2}if(1===r){if(t.available()<6)throw new E;e.append(Te.toAlphaNumericChar(t.readBits(6)))}if(n)for(let t=i;t<e.length();t++)"%"===e.charAt(t)&&(t<e.length()-1&&"%"===e.charAt(t+1)?e.deleteCharAt(t+1):e.setCharAt(t,String.fromCharCode(29)))}static decodeNumericSegment(t,e,r){for(;r>=3;){if(t.available()<10)throw new E;const n=t.readBits(10);if(n>=1e3)throw new E;e.append(Te.toAlphaNumericChar(Math.floor(n/100))),e.append(Te.toAlphaNumericChar(Math.floor(n/10)%10)),e.append(Te.toAlphaNumericChar(n%10)),r-=3}if(2===r){if(t.available()<7)throw new E;const r=t.readBits(7);if(r>=100)throw new E;e.append(Te.toAlphaNumericChar(Math.floor(r/10))),e.append(Te.toAlphaNumericChar(r%10))}else if(1===r){if(t.available()<4)throw new E;const r=t.readBits(4);if(r>=10)throw new E;e.append(Te.toAlphaNumericChar(r))}}static parseECIValue(t){const e=t.readBits(8);if(0==(128&e))return 127&e;if(128==(192&e))return(63&e)<<8&4294967295|t.readBits(8);if(192==(224&e))return(31&e)<<16&4294967295|t.readBits(16);throw new E}}Te.ALPHANUMERIC_CHARS="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:",Te.GB2312_SUBSET=1;class ye{constructor(t){this.mirrored=t}isMirrored(){return this.mirrored}applyMirroredCorrection(t){if(!this.mirrored||null===t||t.length<3)return;const e=t[0];t[0]=t[2],t[2]=e}}class Ne{constructor(){this.rsDecoder=new tt(q.QR_CODE_FIELD_256)}decodeBooleanArray(t,e){return this.decodeBitMatrix(N.parseFromBooleanArray(t),e)}decodeBitMatrix(t,e){const r=new Ie(t);let n=null;try{return this.decodeBitMatrixParser(r,e)}catch(t){n=t}try{r.remask(),r.setMirror(!0),r.readVersion(),r.readFormatInformation(),r.mirror();const t=this.decodeBitMatrixParser(r,e);return t.setOther(new ye(!0)),t}catch(t){if(null!==n)throw n;throw t}}decodeBitMatrixParser(t,e){const r=t.readVersion(),n=t.readFormatInformation().getErrorCorrectionLevel(),i=t.readCodewords(),o=Se.getDataBlocks(i,r,n);let s=0;for(const t of o)s+=t.getNumDataCodewords();const a=new Uint8Array(s);let l=0;for(const t of o){const e=t.getCodewords(),r=t.getNumDataCodewords();this.correctErrors(e,r);for(let t=0;t<r;t++)a[l++]=e[t]}return Te.decode(a,r,n,e)}correctErrors(t,e){const r=new Int32Array(t);try{this.rsDecoder.decode(r,t.length-e)}catch(t){throw new h}for(let n=0;n<e;n++)t[n]=r[n]}}class De extends it{constructor(t,e,r){super(t,e),this.estimatedModuleSize=r}aboutEquals(t,e,r){if(Math.abs(e-this.getY())<=t&&Math.abs(r-this.getX())<=t){const e=Math.abs(t-this.estimatedModuleSize);return e<=1||e<=this.estimatedModuleSize}return!1}combineEstimate(t,e,r){const n=(this.getX()+e)/2,i=(this.getY()+t)/2,o=(this.estimatedModuleSize+r)/2;return new De(n,i,o)}}class Me{constructor(t,e,r,n,i,o,s){this.image=t,this.startX=e,this.startY=r,this.width=n,this.height=i,this.moduleSize=o,this.resultPointCallback=s,this.possibleCenters=[],this.crossCheckStateCount=new Int32Array(3)}find(){const t=this.startX,e=this.height,r=t+this.width,n=this.startY+e/2,i=new Int32Array(3),o=this.image;for(let s=0;s<e;s++){const e=n+(0==(1&s)?Math.floor((s+1)/2):-Math.floor((s+1)/2));i[0]=0,i[1]=0,i[2]=0;let a=t;for(;a<r&&!o.get(a,e);)a++;let l=0;for(;a<r;){if(o.get(a,e))if(1===l)i[1]++;else if(2===l){if(this.foundPatternCross(i)){const t=this.handlePossibleCenter(i,e,a);if(null!==t)return t}i[0]=i[2],i[1]=1,i[2]=0,l=1}else i[++l]++;else 1===l&&l++,i[l]++;a++}if(this.foundPatternCross(i)){const t=this.handlePossibleCenter(i,e,r);if(null!==t)return t}}if(0!==this.possibleCenters.length)return this.possibleCenters[0];throw new D}static centerFromEnd(t,e){return e-t[2]-t[1]/2}foundPatternCross(t){const e=this.moduleSize,r=e/2;for(let n=0;n<3;n++)if(Math.abs(e-t[n])>=r)return!1;return!0}crossCheckVertical(t,e,r,n){const i=this.image,o=i.getHeight(),s=this.crossCheckStateCount;s[0]=0,s[1]=0,s[2]=0;let a=t;for(;a>=0&&i.get(e,a)&&s[1]<=r;)s[1]++,a--;if(a<0||s[1]>r)return NaN;for(;a>=0&&!i.get(e,a)&&s[0]<=r;)s[0]++,a--;if(s[0]>r)return NaN;for(a=t+1;a<o&&i.get(e,a)&&s[1]<=r;)s[1]++,a++;if(a===o||s[1]>r)return NaN;for(;a<o&&!i.get(e,a)&&s[2]<=r;)s[2]++,a++;if(s[2]>r)return NaN;const l=s[0]+s[1]+s[2];return 5*Math.abs(l-n)>=2*n?NaN:this.foundPatternCross(s)?Me.centerFromEnd(s,a):NaN}handlePossibleCenter(t,e,r){const n=t[0]+t[1]+t[2],i=Me.centerFromEnd(t,r),o=this.crossCheckVertical(e,i,2*t[1],n);if(!isNaN(o)){const e=(t[0]+t[1]+t[2])/3;for(const t of this.possibleCenters)if(t.aboutEquals(e,o,i))return t.combineEstimate(o,i,e);const r=new De(i,o,e);this.possibleCenters.push(r),null!==this.resultPointCallback&&void 0!==this.resultPointCallback&&this.resultPointCallback.foundPossibleResultPoint(r)}return null}}class Re extends it{constructor(t,e,r,n){super(t,e),this.estimatedModuleSize=r,this.count=n,void 0===n&&(this.count=1)}getEstimatedModuleSize(){return this.estimatedModuleSize}getCount(){return this.count}aboutEquals(t,e,r){if(Math.abs(e-this.getY())<=t&&Math.abs(r-this.getX())<=t){const e=Math.abs(t-this.estimatedModuleSize);return e<=1||e<=this.estimatedModuleSize}return!1}combineEstimate(t,e,r){const n=this.count+1,i=(this.count*this.getX()+e)/n,o=(this.count*this.getY()+t)/n,s=(this.count*this.estimatedModuleSize+r)/n;return new Re(i,o,s,n)}}class Oe{constructor(t){this.bottomLeft=t[0],this.topLeft=t[1],this.topRight=t[2]}getBottomLeft(){return this.bottomLeft}getTopLeft(){return this.topLeft}getTopRight(){return this.topRight}}class be{constructor(t,e){this.image=t,this.resultPointCallback=e,this.possibleCenters=[],this.crossCheckStateCount=new Int32Array(5),this.resultPointCallback=e}getImage(){return this.image}getPossibleCenters(){return this.possibleCenters}find(t){const e=null!=t&&void 0!==t.get(C.TRY_HARDER),r=null!=t&&void 0!==t.get(C.PURE_BARCODE),n=this.image,i=n.getHeight(),o=n.getWidth();let s=Math.floor(3*i/(4*be.MAX_MODULES));(s<be.MIN_SKIP||e)&&(s=be.MIN_SKIP);let a=!1;const l=new Int32Array(5);for(let t=s-1;t<i&&!a;t+=s){l[0]=0,l[1]=0,l[2]=0,l[3]=0,l[4]=0;let e=0;for(let i=0;i<o;i++)if(n.get(i,t))1==(1&e)&&e++,l[e]++;else if(0==(1&e))if(4===e)if(be.foundPatternCross(l)){if(!0!==this.handlePossibleCenter(l,t,i,r)){l[0]=l[2],l[1]=l[3],l[2]=l[4],l[3]=1,l[4]=0,e=3;continue}if(s=2,!0===this.hasSkipped)a=this.haveMultiplyConfirmedCenters();else{const e=this.findRowSkip();e>l[2]&&(t+=e-l[2]-s,i=o-1)}e=0,l[0]=0,l[1]=0,l[2]=0,l[3]=0,l[4]=0}else l[0]=l[2],l[1]=l[3],l[2]=l[4],l[3]=1,l[4]=0,e=3;else l[++e]++;else l[e]++;be.foundPatternCross(l)&&!0===this.handlePossibleCenter(l,t,o,r)&&(s=l[0],this.hasSkipped&&(a=this.haveMultiplyConfirmedCenters()))}const c=this.selectBestPatterns();return it.orderBestPatterns(c),new Oe(c)}static centerFromEnd(t,e){return e-t[4]-t[3]-t[2]/2}static foundPatternCross(t){let e=0;for(let r=0;r<5;r++){const n=t[r];if(0===n)return!1;e+=n}if(e<7)return!1;const r=e/7,n=r/2;return Math.abs(r-t[0])<n&&Math.abs(r-t[1])<n&&Math.abs(3*r-t[2])<3*n&&Math.abs(r-t[3])<n&&Math.abs(r-t[4])<n}getCrossCheckStateCount(){const t=this.crossCheckStateCount;return t[0]=0,t[1]=0,t[2]=0,t[3]=0,t[4]=0,t}crossCheckDiagonal(t,e,r,n){const i=this.getCrossCheckStateCount();let o=0;const s=this.image;for(;t>=o&&e>=o&&s.get(e-o,t-o);)i[2]++,o++;if(t<o||e<o)return!1;for(;t>=o&&e>=o&&!s.get(e-o,t-o)&&i[1]<=r;)i[1]++,o++;if(t<o||e<o||i[1]>r)return!1;for(;t>=o&&e>=o&&s.get(e-o,t-o)&&i[0]<=r;)i[0]++,o++;if(i[0]>r)return!1;const a=s.getHeight(),l=s.getWidth();for(o=1;t+o<a&&e+o<l&&s.get(e+o,t+o);)i[2]++,o++;if(t+o>=a||e+o>=l)return!1;for(;t+o<a&&e+o<l&&!s.get(e+o,t+o)&&i[3]<r;)i[3]++,o++;if(t+o>=a||e+o>=l||i[3]>=r)return!1;for(;t+o<a&&e+o<l&&s.get(e+o,t+o)&&i[4]<r;)i[4]++,o++;if(i[4]>=r)return!1;const c=i[0]+i[1]+i[2]+i[3]+i[4];return Math.abs(c-n)<2*n&&be.foundPatternCross(i)}crossCheckVertical(t,e,r,n){const i=this.image,o=i.getHeight(),s=this.getCrossCheckStateCount();let a=t;for(;a>=0&&i.get(e,a);)s[2]++,a--;if(a<0)return NaN;for(;a>=0&&!i.get(e,a)&&s[1]<=r;)s[1]++,a--;if(a<0||s[1]>r)return NaN;for(;a>=0&&i.get(e,a)&&s[0]<=r;)s[0]++,a--;if(s[0]>r)return NaN;for(a=t+1;a<o&&i.get(e,a);)s[2]++,a++;if(a===o)return NaN;for(;a<o&&!i.get(e,a)&&s[3]<r;)s[3]++,a++;if(a===o||s[3]>=r)return NaN;for(;a<o&&i.get(e,a)&&s[4]<r;)s[4]++,a++;if(s[4]>=r)return NaN;const l=s[0]+s[1]+s[2]+s[3]+s[4];return 5*Math.abs(l-n)>=2*n?NaN:be.foundPatternCross(s)?be.centerFromEnd(s,a):NaN}crossCheckHorizontal(t,e,r,n){const i=this.image,o=i.getWidth(),s=this.getCrossCheckStateCount();let a=t;for(;a>=0&&i.get(a,e);)s[2]++,a--;if(a<0)return NaN;for(;a>=0&&!i.get(a,e)&&s[1]<=r;)s[1]++,a--;if(a<0||s[1]>r)return NaN;for(;a>=0&&i.get(a,e)&&s[0]<=r;)s[0]++,a--;if(s[0]>r)return NaN;for(a=t+1;a<o&&i.get(a,e);)s[2]++,a++;if(a===o)return NaN;for(;a<o&&!i.get(a,e)&&s[3]<r;)s[3]++,a++;if(a===o||s[3]>=r)return NaN;for(;a<o&&i.get(a,e)&&s[4]<r;)s[4]++,a++;if(s[4]>=r)return NaN;const l=s[0]+s[1]+s[2]+s[3]+s[4];return 5*Math.abs(l-n)>=n?NaN:be.foundPatternCross(s)?be.centerFromEnd(s,a):NaN}handlePossibleCenter(t,e,r,n){const i=t[0]+t[1]+t[2]+t[3]+t[4];let o=be.centerFromEnd(t,r),s=this.crossCheckVertical(e,Math.floor(o),t[2],i);if(!isNaN(s)&&(o=this.crossCheckHorizontal(Math.floor(o),Math.floor(s),t[2],i),!isNaN(o)&&(!n||this.crossCheckDiagonal(Math.floor(s),Math.floor(o),t[2],i)))){const t=i/7;let e=!1;const r=this.possibleCenters;for(let n=0,i=r.length;n<i;n++){const i=r[n];if(i.aboutEquals(t,s,o)){r[n]=i.combineEstimate(s,o,t),e=!0;break}}if(!e){const e=new Re(o,s,t);r.push(e),null!==this.resultPointCallback&&void 0!==this.resultPointCallback&&this.resultPointCallback.foundPossibleResultPoint(e)}return!0}return!1}findRowSkip(){if(this.possibleCenters.length<=1)return 0;let t=null;for(const e of this.possibleCenters)if(e.getCount()>=be.CENTER_QUORUM){if(null!=t)return this.hasSkipped=!0,Math.floor((Math.abs(t.getX()-e.getX())-Math.abs(t.getY()-e.getY()))/2);t=e}return 0}haveMultiplyConfirmedCenters(){let t=0,e=0;const r=this.possibleCenters.length;for(const r of this.possibleCenters)r.getCount()>=be.CENTER_QUORUM&&(t++,e+=r.getEstimatedModuleSize());if(t<3)return!1;const n=e/r;let i=0;for(const t of this.possibleCenters)i+=Math.abs(t.getEstimatedModuleSize()-n);return i<=.05*e}selectBestPatterns(){const t=this.possibleCenters.length;if(t<3)throw new D;const e=this.possibleCenters;let r;if(t>3){let n=0,i=0;for(const t of this.possibleCenters){const e=t.getEstimatedModuleSize();n+=e,i+=e*e}r=n/t;let o=Math.sqrt(i/t-r*r);e.sort(((t,e)=>{const n=Math.abs(e.getEstimatedModuleSize()-r),i=Math.abs(t.getEstimatedModuleSize()-r);return n<i?-1:n>i?1:0}));const s=Math.max(.2*r,o);for(let t=0;t<e.length&&e.length>3;t++){const n=e[t];Math.abs(n.getEstimatedModuleSize()-r)>s&&(e.splice(t,1),t--)}}if(e.length>3){let t=0;for(const r of e)t+=r.getEstimatedModuleSize();r=t/e.length,e.sort(((t,e)=>{if(e.getCount()===t.getCount()){const n=Math.abs(e.getEstimatedModuleSize()-r),i=Math.abs(t.getEstimatedModuleSize()-r);return n<i?1:n>i?-1:0}return e.getCount()-t.getCount()})),e.splice(3)}return[e[0],e[1],e[2]]}}be.CENTER_QUORUM=2,be.MIN_SKIP=3,be.MAX_MODULES=57;class Be{constructor(t){this.image=t}getImage(){return this.image}getResultPointCallback(){return this.resultPointCallback}detect(t){this.resultPointCallback=null==t?null:t.get(C.NEED_RESULT_POINT_CALLBACK);const e=new be(this.image,this.resultPointCallback).find(t);return this.processFinderPatternInfo(e)}processFinderPatternInfo(t){const e=t.getTopLeft(),r=t.getTopRight(),n=t.getBottomLeft(),i=this.calculateModuleSize(e,r,n);if(i<1)throw new D("No pattern found in proccess finder.");const o=Be.computeDimension(e,r,n,i),s=Ce.getProvisionalVersionForDimension(o),a=s.getDimensionForVersion()-7;let l=null;if(s.getAlignmentPatternCenters().length>0){const t=r.getX()-e.getX()+n.getX(),o=r.getY()-e.getY()+n.getY(),s=1-3/a,c=Math.floor(e.getX()+s*(t-e.getX())),h=Math.floor(e.getY()+s*(o-e.getY()));for(let t=4;t<=16;t<<=1)try{l=this.findAlignmentInRegion(i,c,h,t);break}catch(t){if(!(t instanceof D))throw t}}const c=Be.createTransform(e,r,n,l,o),h=Be.sampleGrid(this.image,c,o);let u;return u=null===l?[n,e,r]:[n,e,r,l],new ot(h,u)}static createTransform(t,e,r,n,i){const o=i-3.5;let s,a,l,c;return null!==n?(s=n.getX(),a=n.getY(),l=o-3,c=l):(s=e.getX()-t.getX()+r.getX(),a=e.getY()-t.getY()+r.getY(),l=o,c=o),ct.quadrilateralToQuadrilateral(3.5,3.5,o,3.5,l,c,3.5,o,t.getX(),t.getY(),e.getX(),e.getY(),s,a,r.getX(),r.getY())}static sampleGrid(t,e,r){return ut.getInstance().sampleGridWithTransform(t,r,r,e)}static computeDimension(t,e,r,n){const i=rt.round(it.distance(t,e)/n),o=rt.round(it.distance(t,r)/n);let s=Math.floor((i+o)/2)+7;switch(3&s){case 0:s++;break;case 2:s--;break;case 3:throw new D("Dimensions could be not found.")}return s}calculateModuleSize(t,e,r){return(this.calculateModuleSizeOneWay(t,e)+this.calculateModuleSizeOneWay(t,r))/2}calculateModuleSizeOneWay(t,e){const r=this.sizeOfBlackWhiteBlackRunBothWays(Math.floor(t.getX()),Math.floor(t.getY()),Math.floor(e.getX()),Math.floor(e.getY())),n=this.sizeOfBlackWhiteBlackRunBothWays(Math.floor(e.getX()),Math.floor(e.getY()),Math.floor(t.getX()),Math.floor(t.getY()));return isNaN(r)?n/7:isNaN(n)?r/7:(r+n)/14}sizeOfBlackWhiteBlackRunBothWays(t,e,r,n){let i=this.sizeOfBlackWhiteBlackRun(t,e,r,n),o=1,s=t-(r-t);s<0?(o=t/(t-s),s=0):s>=this.image.getWidth()&&(o=(this.image.getWidth()-1-t)/(s-t),s=this.image.getWidth()-1);let a=Math.floor(e-(n-e)*o);return o=1,a<0?(o=e/(e-a),a=0):a>=this.image.getHeight()&&(o=(this.image.getHeight()-1-e)/(a-e),a=this.image.getHeight()-1),s=Math.floor(t+(s-t)*o),i+=this.sizeOfBlackWhiteBlackRun(t,e,s,a),i-1}sizeOfBlackWhiteBlackRun(t,e,r,n){const i=Math.abs(n-e)>Math.abs(r-t);if(i){let i=t;t=e,e=i,i=r,r=n,n=i}const o=Math.abs(r-t),s=Math.abs(n-e);let a=-o/2;const l=t<r?1:-1,c=e<n?1:-1;let h=0;const u=r+l;for(let r=t,d=e;r!==u;r+=l){const l=i?d:r,u=i?r:d;if(1===h===this.image.get(l,u)){if(2===h)return rt.distance(r,d,t,e);h++}if(a+=s,a>0){if(d===n)break;d+=c,a-=o}}return 2===h?rt.distance(r+l,n,t,e):NaN}findAlignmentInRegion(t,e,r,n){const i=Math.floor(n*t),o=Math.max(0,e-i),s=Math.min(this.image.getWidth()-1,e+i);if(s-o<3*t)throw new D("Alignment top exceeds estimated module size.");const a=Math.max(0,r-i),l=Math.min(this.image.getHeight()-1,r+i);if(l-a<3*t)throw new D("Alignment bottom exceeds estimated module size.");return new Me(this.image,o,a,s-o,l-a,t,this.resultPointCallback).find()}}class Le{constructor(){this.decoder=new Ne}getDecoder(){return this.decoder}decode(t,e){let r,n;if(null!=e&&void 0!==e.get(C.PURE_BARCODE)){const i=Le.extractPureBits(t.getBlackMatrix());r=this.decoder.decodeBitMatrix(i,e),n=Le.NO_POINTS}else{const i=new Be(t.getBlackMatrix()).detect(e);r=this.decoder.decodeBitMatrix(i.getBits(),e),n=i.getPoints()}r.getOther()instanceof ye&&r.getOther().applyMirroredCorrection(n);const i=new x(r.getText(),r.getRawBytes(),void 0,n,U.QR_CODE,void 0),o=r.getByteSegments();null!==o&&i.putMetadata(W.BYTE_SEGMENTS,o);const s=r.getECLevel();return null!==s&&i.putMetadata(W.ERROR_CORRECTION_LEVEL,s),r.hasStructuredAppend()&&(i.putMetadata(W.STRUCTURED_APPEND_SEQUENCE,r.getStructuredAppendSequenceNumber()),i.putMetadata(W.STRUCTURED_APPEND_PARITY,r.getStructuredAppendParity())),i}reset(){}static extractPureBits(t){const e=t.getTopLeftOnBit(),r=t.getBottomRightOnBit();if(null===e||null===r)throw new D;const n=this.moduleSize(e,t);let i=e[1],o=r[1],s=e[0],a=r[0];if(s>=a||i>=o)throw new D;if(o-i!=a-s&&(a=s+(o-i),a>=t.getWidth()))throw new D;const l=Math.round((a-s+1)/n),c=Math.round((o-i+1)/n);if(l<=0||c<=0)throw new D;if(c!==l)throw new D;const h=Math.floor(n/2);i+=h,s+=h;const u=s+Math.floor((l-1)*n)-a;if(u>0){if(u>h)throw new D;s-=u}const d=i+Math.floor((c-1)*n)-o;if(d>0){if(d>h)throw new D;i-=d}const f=new N(l,c);for(let e=0;e<c;e++){const r=i+Math.floor(e*n);for(let i=0;i<l;i++)t.get(s+Math.floor(i*n),r)&&f.set(i,e)}return f}static moduleSize(t,e){const r=e.getHeight(),n=e.getWidth();let i=t[0],o=t[1],s=!0,a=0;for(;i<n&&o<r;){if(s!==e.get(i,o)){if(5==++a)break;s=!s}i++,o++}if(i===n||o===r)throw new D;return(i-t[0])/7}}Le.NO_POINTS=new Array;class Pe{PDF417Common(){}static getBitCountSum(t){return rt.sum(t)}static toIntArray(t){if(null==t||!t.length)return Pe.EMPTY_INT_ARRAY;const e=new Int32Array(t.length);let r=0;for(const n of t)e[r++]=n;return e}static getCodeword(t){const e=w.binarySearch(Pe.SYMBOL_TABLE,262143&t);return e<0?-1:(Pe.CODEWORD_TABLE[e]-1)%Pe.NUMBER_OF_CODEWORDS}}Pe.NUMBER_OF_CODEWORDS=929,Pe.MAX_CODEWORDS_IN_BARCODE=Pe.NUMBER_OF_CODEWORDS-1,Pe.MIN_ROWS_IN_BARCODE=3,Pe.MAX_ROWS_IN_BARCODE=90,Pe.MODULES_IN_CODEWORD=17,Pe.MODULES_IN_STOP_PATTERN=18,Pe.BARS_IN_MODULE=8,Pe.EMPTY_INT_ARRAY=new Int32Array([]),Pe.SYMBOL_TABLE=Int32Array.from([66142,66170,66206,66236,66290,66292,66350,66382,66396,66454,66470,66476,66594,66600,66614,66626,66628,66632,66640,66654,66662,66668,66682,66690,66718,66720,66748,66758,66776,66798,66802,66804,66820,66824,66832,66846,66848,66876,66880,66936,66950,66956,66968,66992,67006,67022,67036,67042,67044,67048,67062,67118,67150,67164,67214,67228,67256,67294,67322,67350,67366,67372,67398,67404,67416,67438,67474,67476,67490,67492,67496,67510,67618,67624,67650,67656,67664,67678,67686,67692,67706,67714,67716,67728,67742,67744,67772,67782,67788,67800,67822,67826,67828,67842,67848,67870,67872,67900,67904,67960,67974,67992,68016,68030,68046,68060,68066,68068,68072,68086,68104,68112,68126,68128,68156,68160,68216,68336,68358,68364,68376,68400,68414,68448,68476,68494,68508,68536,68546,68548,68552,68560,68574,68582,68588,68654,68686,68700,68706,68708,68712,68726,68750,68764,68792,68802,68804,68808,68816,68830,68838,68844,68858,68878,68892,68920,68976,68990,68994,68996,69e3,69008,69022,69024,69052,69062,69068,69080,69102,69106,69108,69142,69158,69164,69190,69208,69230,69254,69260,69272,69296,69310,69326,69340,69386,69394,69396,69410,69416,69430,69442,69444,69448,69456,69470,69478,69484,69554,69556,69666,69672,69698,69704,69712,69726,69754,69762,69764,69776,69790,69792,69820,69830,69836,69848,69870,69874,69876,69890,69918,69920,69948,69952,70008,70022,70040,70064,70078,70094,70108,70114,70116,70120,70134,70152,70174,70176,70264,70384,70412,70448,70462,70496,70524,70542,70556,70584,70594,70600,70608,70622,70630,70636,70664,70672,70686,70688,70716,70720,70776,70896,71136,71180,71192,71216,71230,71264,71292,71360,71416,71452,71480,71536,71550,71554,71556,71560,71568,71582,71584,71612,71622,71628,71640,71662,71726,71732,71758,71772,71778,71780,71784,71798,71822,71836,71864,71874,71880,71888,71902,71910,71916,71930,71950,71964,71992,72048,72062,72066,72068,72080,72094,72096,72124,72134,72140,72152,72174,72178,72180,72206,72220,72248,72304,72318,72416,72444,72456,72464,72478,72480,72508,72512,72568,72588,72600,72624,72638,72654,72668,72674,72676,72680,72694,72726,72742,72748,72774,72780,72792,72814,72838,72856,72880,72894,72910,72924,72930,72932,72936,72950,72966,72972,72984,73008,73022,73056,73084,73102,73116,73144,73156,73160,73168,73182,73190,73196,73210,73226,73234,73236,73250,73252,73256,73270,73282,73284,73296,73310,73318,73324,73346,73348,73352,73360,73374,73376,73404,73414,73420,73432,73454,73498,73518,73522,73524,73550,73564,73570,73572,73576,73590,73800,73822,73858,73860,73872,73886,73888,73916,73944,73970,73972,73992,74014,74016,74044,74048,74104,74118,74136,74160,74174,74210,74212,74216,74230,74244,74256,74270,74272,74360,74480,74502,74508,74544,74558,74592,74620,74638,74652,74680,74690,74696,74704,74726,74732,74782,74784,74812,74992,75232,75288,75326,75360,75388,75456,75512,75576,75632,75646,75650,75652,75664,75678,75680,75708,75718,75724,75736,75758,75808,75836,75840,75896,76016,76256,76736,76824,76848,76862,76896,76924,76992,77048,77296,77340,77368,77424,77438,77536,77564,77572,77576,77584,77600,77628,77632,77688,77702,77708,77720,77744,77758,77774,77788,77870,77902,77916,77922,77928,77966,77980,78008,78018,78024,78032,78046,78060,78074,78094,78136,78192,78206,78210,78212,78224,78238,78240,78268,78278,78284,78296,78322,78324,78350,78364,78448,78462,78560,78588,78600,78622,78624,78652,78656,78712,78726,78744,78768,78782,78798,78812,78818,78820,78824,78838,78862,78876,78904,78960,78974,79072,79100,79296,79352,79368,79376,79390,79392,79420,79424,79480,79600,79628,79640,79664,79678,79712,79740,79772,79800,79810,79812,79816,79824,79838,79846,79852,79894,79910,79916,79942,79948,79960,79982,79988,80006,80024,80048,80062,80078,80092,80098,80100,80104,80134,80140,80176,80190,80224,80252,80270,80284,80312,80328,80336,80350,80358,80364,80378,80390,80396,80408,80432,80446,80480,80508,80576,80632,80654,80668,80696,80752,80766,80776,80784,80798,80800,80828,80844,80856,80878,80882,80884,80914,80916,80930,80932,80936,80950,80962,80968,80976,80990,80998,81004,81026,81028,81040,81054,81056,81084,81094,81100,81112,81134,81154,81156,81160,81168,81182,81184,81212,81216,81272,81286,81292,81304,81328,81342,81358,81372,81380,81384,81398,81434,81454,81458,81460,81486,81500,81506,81508,81512,81526,81550,81564,81592,81602,81604,81608,81616,81630,81638,81644,81702,81708,81722,81734,81740,81752,81774,81778,81780,82050,82078,82080,82108,82180,82184,82192,82206,82208,82236,82240,82296,82316,82328,82352,82366,82402,82404,82408,82440,82448,82462,82464,82492,82496,82552,82672,82694,82700,82712,82736,82750,82784,82812,82830,82882,82884,82888,82896,82918,82924,82952,82960,82974,82976,83004,83008,83064,83184,83424,83468,83480,83504,83518,83552,83580,83648,83704,83740,83768,83824,83838,83842,83844,83848,83856,83872,83900,83910,83916,83928,83950,83984,84e3,84028,84032,84088,84208,84448,84928,85040,85054,85088,85116,85184,85240,85488,85560,85616,85630,85728,85756,85764,85768,85776,85790,85792,85820,85824,85880,85894,85900,85912,85936,85966,85980,86048,86080,86136,86256,86496,86976,88160,88188,88256,88312,88560,89056,89200,89214,89312,89340,89536,89592,89608,89616,89632,89664,89720,89840,89868,89880,89904,89952,89980,89998,90012,90040,90190,90204,90254,90268,90296,90306,90308,90312,90334,90382,90396,90424,90480,90494,90500,90504,90512,90526,90528,90556,90566,90572,90584,90610,90612,90638,90652,90680,90736,90750,90848,90876,90884,90888,90896,90910,90912,90940,90944,91e3,91014,91020,91032,91056,91070,91086,91100,91106,91108,91112,91126,91150,91164,91192,91248,91262,91360,91388,91584,91640,91664,91678,91680,91708,91712,91768,91888,91928,91952,91966,92e3,92028,92046,92060,92088,92098,92100,92104,92112,92126,92134,92140,92188,92216,92272,92384,92412,92608,92664,93168,93200,93214,93216,93244,93248,93304,93424,93664,93720,93744,93758,93792,93820,93888,93944,93980,94008,94064,94078,94084,94088,94096,94110,94112,94140,94150,94156,94168,94246,94252,94278,94284,94296,94318,94342,94348,94360,94384,94398,94414,94428,94440,94470,94476,94488,94512,94526,94560,94588,94606,94620,94648,94658,94660,94664,94672,94686,94694,94700,94714,94726,94732,94744,94768,94782,94816,94844,94912,94968,94990,95004,95032,95088,95102,95112,95120,95134,95136,95164,95180,95192,95214,95218,95220,95244,95256,95280,95294,95328,95356,95424,95480,95728,95758,95772,95800,95856,95870,95968,95996,96008,96016,96030,96032,96060,96064,96120,96152,96176,96190,96220,96226,96228,96232,96290,96292,96296,96310,96322,96324,96328,96336,96350,96358,96364,96386,96388,96392,96400,96414,96416,96444,96454,96460,96472,96494,96498,96500,96514,96516,96520,96528,96542,96544,96572,96576,96632,96646,96652,96664,96688,96702,96718,96732,96738,96740,96744,96758,96772,96776,96784,96798,96800,96828,96832,96888,97008,97030,97036,97048,97072,97086,97120,97148,97166,97180,97208,97220,97224,97232,97246,97254,97260,97326,97330,97332,97358,97372,97378,97380,97384,97398,97422,97436,97464,97474,97476,97480,97488,97502,97510,97516,97550,97564,97592,97648,97666,97668,97672,97680,97694,97696,97724,97734,97740,97752,97774,97830,97836,97850,97862,97868,97880,97902,97906,97908,97926,97932,97944,97968,97998,98012,98018,98020,98024,98038,98618,98674,98676,98838,98854,98874,98892,98904,98926,98930,98932,98968,99006,99042,99044,99048,99062,99166,99194,99246,99286,99350,99366,99372,99386,99398,99416,99438,99442,99444,99462,99504,99518,99534,99548,99554,99556,99560,99574,99590,99596,99608,99632,99646,99680,99708,99726,99740,99768,99778,99780,99784,99792,99806,99814,99820,99834,99858,99860,99874,99880,99894,99906,99920,99934,99962,99970,99972,99976,99984,99998,1e5,100028,100038,100044,100056,100078,100082,100084,100142,100174,100188,100246,100262,100268,100306,100308,100390,100396,100410,100422,100428,100440,100462,100466,100468,100486,100504,100528,100542,100558,100572,100578,100580,100584,100598,100620,100656,100670,100704,100732,100750,100792,100802,100808,100816,100830,100838,100844,100858,100888,100912,100926,100960,100988,101056,101112,101148,101176,101232,101246,101250,101252,101256,101264,101278,101280,101308,101318,101324,101336,101358,101362,101364,101410,101412,101416,101430,101442,101448,101456,101470,101478,101498,101506,101508,101520,101534,101536,101564,101580,101618,101620,101636,101640,101648,101662,101664,101692,101696,101752,101766,101784,101838,101858,101860,101864,101934,101938,101940,101966,101980,101986,101988,101992,102030,102044,102072,102082,102084,102088,102096,102138,102166,102182,102188,102214,102220,102232,102254,102282,102290,102292,102306,102308,102312,102326,102444,102458,102470,102476,102488,102514,102516,102534,102552,102576,102590,102606,102620,102626,102632,102646,102662,102668,102704,102718,102752,102780,102798,102812,102840,102850,102856,102864,102878,102886,102892,102906,102936,102974,103008,103036,103104,103160,103224,103280,103294,103298,103300,103312,103326,103328,103356,103366,103372,103384,103406,103410,103412,103472,103486,103520,103548,103616,103672,103920,103992,104048,104062,104160,104188,104194,104196,104200,104208,104224,104252,104256,104312,104326,104332,104344,104368,104382,104398,104412,104418,104420,104424,104482,104484,104514,104520,104528,104542,104550,104570,104578,104580,104592,104606,104608,104636,104652,104690,104692,104706,104712,104734,104736,104764,104768,104824,104838,104856,104910,104930,104932,104936,104968,104976,104990,104992,105020,105024,105080,105200,105240,105278,105312,105372,105410,105412,105416,105424,105446,105518,105524,105550,105564,105570,105572,105576,105614,105628,105656,105666,105672,105680,105702,105722,105742,105756,105784,105840,105854,105858,105860,105864,105872,105888,105932,105970,105972,106006,106022,106028,106054,106060,106072,106100,106118,106124,106136,106160,106174,106190,106210,106212,106216,106250,106258,106260,106274,106276,106280,106306,106308,106312,106320,106334,106348,106394,106414,106418,106420,106566,106572,106610,106612,106630,106636,106648,106672,106686,106722,106724,106728,106742,106758,106764,106776,106800,106814,106848,106876,106894,106908,106936,106946,106948,106952,106960,106974,106982,106988,107032,107056,107070,107104,107132,107200,107256,107292,107320,107376,107390,107394,107396,107400,107408,107422,107424,107452,107462,107468,107480,107502,107506,107508,107544,107568,107582,107616,107644,107712,107768,108016,108060,108088,108144,108158,108256,108284,108290,108292,108296,108304,108318,108320,108348,108352,108408,108422,108428,108440,108464,108478,108494,108508,108514,108516,108520,108592,108640,108668,108736,108792,109040,109536,109680,109694,109792,109820,110016,110072,110084,110088,110096,110112,110140,110144,110200,110320,110342,110348,110360,110384,110398,110432,110460,110478,110492,110520,110532,110536,110544,110558,110658,110686,110714,110722,110724,110728,110736,110750,110752,110780,110796,110834,110836,110850,110852,110856,110864,110878,110880,110908,110912,110968,110982,111e3,111054,111074,111076,111080,111108,111112,111120,111134,111136,111164,111168,111224,111344,111372,111422,111456,111516,111554,111556,111560,111568,111590,111632,111646,111648,111676,111680,111736,111856,112096,112152,112224,112252,112320,112440,112514,112516,112520,112528,112542,112544,112588,112686,112718,112732,112782,112796,112824,112834,112836,112840,112848,112870,112890,112910,112924,112952,113008,113022,113026,113028,113032,113040,113054,113056,113100,113138,113140,113166,113180,113208,113264,113278,113376,113404,113416,113424,113440,113468,113472,113560,113614,113634,113636,113640,113686,113702,113708,113734,113740,113752,113778,113780,113798,113804,113816,113840,113854,113870,113890,113892,113896,113926,113932,113944,113968,113982,114016,114044,114076,114114,114116,114120,114128,114150,114170,114194,114196,114210,114212,114216,114242,114244,114248,114256,114270,114278,114306,114308,114312,114320,114334,114336,114364,114380,114420,114458,114478,114482,114484,114510,114524,114530,114532,114536,114842,114866,114868,114970,114994,114996,115042,115044,115048,115062,115130,115226,115250,115252,115278,115292,115298,115300,115304,115318,115342,115394,115396,115400,115408,115422,115430,115436,115450,115478,115494,115514,115526,115532,115570,115572,115738,115758,115762,115764,115790,115804,115810,115812,115816,115830,115854,115868,115896,115906,115912,115920,115934,115942,115948,115962,115996,116024,116080,116094,116098,116100,116104,116112,116126,116128,116156,116166,116172,116184,116206,116210,116212,116246,116262,116268,116282,116294,116300,116312,116334,116338,116340,116358,116364,116376,116400,116414,116430,116444,116450,116452,116456,116498,116500,116514,116520,116534,116546,116548,116552,116560,116574,116582,116588,116602,116654,116694,116714,116762,116782,116786,116788,116814,116828,116834,116836,116840,116854,116878,116892,116920,116930,116936,116944,116958,116966,116972,116986,117006,117048,117104,117118,117122,117124,117136,117150,117152,117180,117190,117196,117208,117230,117234,117236,117304,117360,117374,117472,117500,117506,117508,117512,117520,117536,117564,117568,117624,117638,117644,117656,117680,117694,117710,117724,117730,117732,117736,117750,117782,117798,117804,117818,117830,117848,117874,117876,117894,117936,117950,117966,117986,117988,117992,118022,118028,118040,118064,118078,118112,118140,118172,118210,118212,118216,118224,118238,118246,118266,118306,118312,118338,118352,118366,118374,118394,118402,118404,118408,118416,118430,118432,118460,118476,118514,118516,118574,118578,118580,118606,118620,118626,118628,118632,118678,118694,118700,118730,118738,118740,118830,118834,118836,118862,118876,118882,118884,118888,118902,118926,118940,118968,118978,118980,118984,118992,119006,119014,119020,119034,119068,119096,119152,119166,119170,119172,119176,119184,119198,119200,119228,119238,119244,119256,119278,119282,119284,119324,119352,119408,119422,119520,119548,119554,119556,119560,119568,119582,119584,119612,119616,119672,119686,119692,119704,119728,119742,119758,119772,119778,119780,119784,119798,119920,119934,120032,120060,120256,120312,120324,120328,120336,120352,120384,120440,120560,120582,120588,120600,120624,120638,120672,120700,120718,120732,120760,120770,120772,120776,120784,120798,120806,120812,120870,120876,120890,120902,120908,120920,120946,120948,120966,120972,120984,121008,121022,121038,121058,121060,121064,121078,121100,121112,121136,121150,121184,121212,121244,121282,121284,121288,121296,121318,121338,121356,121368,121392,121406,121440,121468,121536,121592,121656,121730,121732,121736,121744,121758,121760,121804,121842,121844,121890,121922,121924,121928,121936,121950,121958,121978,121986,121988,121992,122e3,122014,122016,122044,122060,122098,122100,122116,122120,122128,122142,122144,122172,122176,122232,122246,122264,122318,122338,122340,122344,122414,122418,122420,122446,122460,122466,122468,122472,122510,122524,122552,122562,122564,122568,122576,122598,122618,122646,122662,122668,122694,122700,122712,122738,122740,122762,122770,122772,122786,122788,122792,123018,123026,123028,123042,123044,123048,123062,123098,123146,123154,123156,123170,123172,123176,123190,123202,123204,123208,123216,123238,123244,123258,123290,123314,123316,123402,123410,123412,123426,123428,123432,123446,123458,123464,123472,123486,123494,123500,123514,123522,123524,123528,123536,123552,123580,123590,123596,123608,123630,123634,123636,123674,123698,123700,123740,123746,123748,123752,123834,123914,123922,123924,123938,123944,123958,123970,123976,123984,123998,124006,124012,124026,124034,124036,124048,124062,124064,124092,124102,124108,124120,124142,124146,124148,124162,124164,124168,124176,124190,124192,124220,124224,124280,124294,124300,124312,124336,124350,124366,124380,124386,124388,124392,124406,124442,124462,124466,124468,124494,124508,124514,124520,124558,124572,124600,124610,124612,124616,124624,124646,124666,124694,124710,124716,124730,124742,124748,124760,124786,124788,124818,124820,124834,124836,124840,124854,124946,124948,124962,124964,124968,124982,124994,124996,125e3,125008,125022,125030,125036,125050,125058,125060,125064,125072,125086,125088,125116,125126,125132,125144,125166,125170,125172,125186,125188,125192,125200,125216,125244,125248,125304,125318,125324,125336,125360,125374,125390,125404,125410,125412,125416,125430,125444,125448,125456,125472,125504,125560,125680,125702,125708,125720,125744,125758,125792,125820,125838,125852,125880,125890,125892,125896,125904,125918,125926,125932,125978,125998,126002,126004,126030,126044,126050,126052,126056,126094,126108,126136,126146,126148,126152,126160,126182,126202,126222,126236,126264,126320,126334,126338,126340,126344,126352,126366,126368,126412,126450,126452,126486,126502,126508,126522,126534,126540,126552,126574,126578,126580,126598,126604,126616,126640,126654,126670,126684,126690,126692,126696,126738,126754,126756,126760,126774,126786,126788,126792,126800,126814,126822,126828,126842,126894,126898,126900,126934,127126,127142,127148,127162,127178,127186,127188,127254,127270,127276,127290,127302,127308,127320,127342,127346,127348,127370,127378,127380,127394,127396,127400,127450,127510,127526,127532,127546,127558,127576,127598,127602,127604,127622,127628,127640,127664,127678,127694,127708,127714,127716,127720,127734,127754,127762,127764,127778,127784,127810,127812,127816,127824,127838,127846,127866,127898,127918,127922,127924,128022,128038,128044,128058,128070,128076,128088,128110,128114,128116,128134,128140,128152,128176,128190,128206,128220,128226,128228,128232,128246,128262,128268,128280,128304,128318,128352,128380,128398,128412,128440,128450,128452,128456,128464,128478,128486,128492,128506,128522,128530,128532,128546,128548,128552,128566,128578,128580,128584,128592,128606,128614,128634,128642,128644,128648,128656,128670,128672,128700,128716,128754,128756,128794,128814,128818,128820,128846,128860,128866,128868,128872,128886,128918,128934,128940,128954,128978,128980,129178,129198,129202,129204,129238,129258,129306,129326,129330,129332,129358,129372,129378,129380,129384,129398,129430,129446,129452,129466,129482,129490,129492,129562,129582,129586,129588,129614,129628,129634,129636,129640,129654,129678,129692,129720,129730,129732,129736,129744,129758,129766,129772,129814,129830,129836,129850,129862,129868,129880,129902,129906,129908,129930,129938,129940,129954,129956,129960,129974,130010]),Pe.CODEWORD_TABLE=Int32Array.from([2627,1819,2622,2621,1813,1812,2729,2724,2723,2779,2774,2773,902,896,908,868,865,861,859,2511,873,871,1780,835,2493,825,2491,842,837,844,1764,1762,811,810,809,2483,807,2482,806,2480,815,814,813,812,2484,817,816,1745,1744,1742,1746,2655,2637,2635,2626,2625,2623,2628,1820,2752,2739,2737,2728,2727,2725,2730,2785,2783,2778,2777,2775,2780,787,781,747,739,736,2413,754,752,1719,692,689,681,2371,678,2369,700,697,694,703,1688,1686,642,638,2343,631,2341,627,2338,651,646,643,2345,654,652,1652,1650,1647,1654,601,599,2322,596,2321,594,2319,2317,611,610,608,606,2324,603,2323,615,614,612,1617,1616,1614,1612,616,1619,1618,2575,2538,2536,905,901,898,909,2509,2507,2504,870,867,864,860,2512,875,872,1781,2490,2489,2487,2485,1748,836,834,832,830,2494,827,2492,843,841,839,845,1765,1763,2701,2676,2674,2653,2648,2656,2634,2633,2631,2629,1821,2638,2636,2770,2763,2761,2750,2745,2753,2736,2735,2733,2731,1848,2740,2738,2786,2784,591,588,576,569,566,2296,1590,537,534,526,2276,522,2274,545,542,539,548,1572,1570,481,2245,466,2242,462,2239,492,485,482,2249,496,494,1534,1531,1528,1538,413,2196,406,2191,2188,425,419,2202,415,2199,432,430,427,1472,1467,1464,433,1476,1474,368,367,2160,365,2159,362,2157,2155,2152,378,377,375,2166,372,2165,369,2162,383,381,379,2168,1419,1418,1416,1414,385,1411,384,1423,1422,1420,1424,2461,802,2441,2439,790,786,783,794,2409,2406,2403,750,742,738,2414,756,753,1720,2367,2365,2362,2359,1663,693,691,684,2373,680,2370,702,699,696,704,1690,1687,2337,2336,2334,2332,1624,2329,1622,640,637,2344,634,2342,630,2340,650,648,645,2346,655,653,1653,1651,1649,1655,2612,2597,2595,2571,2568,2565,2576,2534,2529,2526,1787,2540,2537,907,904,900,910,2503,2502,2500,2498,1768,2495,1767,2510,2508,2506,869,866,863,2513,876,874,1782,2720,2713,2711,2697,2694,2691,2702,2672,2670,2664,1828,2678,2675,2647,2646,2644,2642,1823,2639,1822,2654,2652,2650,2657,2771,1855,2765,2762,1850,1849,2751,2749,2747,2754,353,2148,344,342,336,2142,332,2140,345,1375,1373,306,2130,299,2128,295,2125,319,314,311,2132,1354,1352,1349,1356,262,257,2101,253,2096,2093,274,273,267,2107,263,2104,280,278,275,1316,1311,1308,1320,1318,2052,202,2050,2044,2040,219,2063,212,2060,208,2055,224,221,2066,1260,1258,1252,231,1248,229,1266,1264,1261,1268,155,1998,153,1996,1994,1991,1988,165,164,2007,162,2006,159,2003,2e3,172,171,169,2012,166,2010,1186,1184,1182,1179,175,1176,173,1192,1191,1189,1187,176,1194,1193,2313,2307,2305,592,589,2294,2292,2289,578,572,568,2297,580,1591,2272,2267,2264,1547,538,536,529,2278,525,2275,547,544,541,1574,1571,2237,2235,2229,1493,2225,1489,478,2247,470,2244,465,2241,493,488,484,2250,498,495,1536,1533,1530,1539,2187,2186,2184,2182,1432,2179,1430,2176,1427,414,412,2197,409,2195,405,2193,2190,426,424,421,2203,418,2201,431,429,1473,1471,1469,1466,434,1477,1475,2478,2472,2470,2459,2457,2454,2462,803,2437,2432,2429,1726,2443,2440,792,789,785,2401,2399,2393,1702,2389,1699,2411,2408,2405,745,741,2415,758,755,1721,2358,2357,2355,2353,1661,2350,1660,2347,1657,2368,2366,2364,2361,1666,690,687,2374,683,2372,701,698,705,1691,1689,2619,2617,2610,2608,2605,2613,2593,2588,2585,1803,2599,2596,2563,2561,2555,1797,2551,1795,2573,2570,2567,2577,2525,2524,2522,2520,1786,2517,1785,2514,1783,2535,2533,2531,2528,1788,2541,2539,906,903,911,2721,1844,2715,2712,1838,1836,2699,2696,2693,2703,1827,1826,1824,2673,2671,2669,2666,1829,2679,2677,1858,1857,2772,1854,1853,1851,1856,2766,2764,143,1987,139,1986,135,133,131,1984,128,1983,125,1981,138,137,136,1985,1133,1132,1130,112,110,1974,107,1973,104,1971,1969,122,121,119,117,1977,114,1976,124,1115,1114,1112,1110,1117,1116,84,83,1953,81,1952,78,1950,1948,1945,94,93,91,1959,88,1958,85,1955,99,97,95,1961,1086,1085,1083,1081,1078,100,1090,1089,1087,1091,49,47,1917,44,1915,1913,1910,1907,59,1926,56,1925,53,1922,1919,66,64,1931,61,1929,1042,1040,1038,71,1035,70,1032,68,1048,1047,1045,1043,1050,1049,12,10,1869,1867,1864,1861,21,1880,19,1877,1874,1871,28,1888,25,1886,22,1883,982,980,977,974,32,30,991,989,987,984,34,995,994,992,2151,2150,2147,2146,2144,356,355,354,2149,2139,2138,2136,2134,1359,343,341,338,2143,335,2141,348,347,346,1376,1374,2124,2123,2121,2119,1326,2116,1324,310,308,305,2131,302,2129,298,2127,320,318,316,313,2133,322,321,1355,1353,1351,1357,2092,2091,2089,2087,1276,2084,1274,2081,1271,259,2102,256,2100,252,2098,2095,272,269,2108,266,2106,281,279,277,1317,1315,1313,1310,282,1321,1319,2039,2037,2035,2032,1203,2029,1200,1197,207,2053,205,2051,201,2049,2046,2043,220,218,2064,215,2062,211,2059,228,226,223,2069,1259,1257,1254,232,1251,230,1267,1265,1263,2316,2315,2312,2311,2309,2314,2304,2303,2301,2299,1593,2308,2306,590,2288,2287,2285,2283,1578,2280,1577,2295,2293,2291,579,577,574,571,2298,582,581,1592,2263,2262,2260,2258,1545,2255,1544,2252,1541,2273,2271,2269,2266,1550,535,532,2279,528,2277,546,543,549,1575,1573,2224,2222,2220,1486,2217,1485,2214,1482,1479,2238,2236,2234,2231,1496,2228,1492,480,477,2248,473,2246,469,2243,490,487,2251,497,1537,1535,1532,2477,2476,2474,2479,2469,2468,2466,2464,1730,2473,2471,2453,2452,2450,2448,1729,2445,1728,2460,2458,2456,2463,805,804,2428,2427,2425,2423,1725,2420,1724,2417,1722,2438,2436,2434,2431,1727,2444,2442,793,791,788,795,2388,2386,2384,1697,2381,1696,2378,1694,1692,2402,2400,2398,2395,1703,2392,1701,2412,2410,2407,751,748,744,2416,759,757,1807,2620,2618,1806,1805,2611,2609,2607,2614,1802,1801,1799,2594,2592,2590,2587,1804,2600,2598,1794,1793,1791,1789,2564,2562,2560,2557,1798,2554,1796,2574,2572,2569,2578,1847,1846,2722,1843,1842,1840,1845,2716,2714,1835,1834,1832,1830,1839,1837,2700,2698,2695,2704,1817,1811,1810,897,862,1777,829,826,838,1760,1758,808,2481,1741,1740,1738,1743,2624,1818,2726,2776,782,740,737,1715,686,679,695,1682,1680,639,628,2339,647,644,1645,1643,1640,1648,602,600,597,595,2320,593,2318,609,607,604,1611,1610,1608,1606,613,1615,1613,2328,926,924,892,886,899,857,850,2505,1778,824,823,821,819,2488,818,2486,833,831,828,840,1761,1759,2649,2632,2630,2746,2734,2732,2782,2781,570,567,1587,531,527,523,540,1566,1564,476,467,463,2240,486,483,1524,1521,1518,1529,411,403,2192,399,2189,423,416,1462,1457,1454,428,1468,1465,2210,366,363,2158,360,2156,357,2153,376,373,370,2163,1410,1409,1407,1405,382,1402,380,1417,1415,1412,1421,2175,2174,777,774,771,784,732,725,722,2404,743,1716,676,674,668,2363,665,2360,685,1684,1681,626,624,622,2335,620,2333,617,2330,641,635,649,1646,1644,1642,2566,928,925,2530,2527,894,891,888,2501,2499,2496,858,856,854,851,1779,2692,2668,2665,2645,2643,2640,2651,2768,2759,2757,2744,2743,2741,2748,352,1382,340,337,333,1371,1369,307,300,296,2126,315,312,1347,1342,1350,261,258,250,2097,246,2094,271,268,264,1306,1301,1298,276,1312,1309,2115,203,2048,195,2045,191,2041,213,209,2056,1246,1244,1238,225,1234,222,1256,1253,1249,1262,2080,2079,154,1997,150,1995,147,1992,1989,163,160,2004,156,2001,1175,1174,1172,1170,1167,170,1164,167,1185,1183,1180,1177,174,1190,1188,2025,2024,2022,587,586,564,559,556,2290,573,1588,520,518,512,2268,508,2265,530,1568,1565,461,457,2233,450,2230,446,2226,479,471,489,1526,1523,1520,397,395,2185,392,2183,389,2180,2177,410,2194,402,422,1463,1461,1459,1456,1470,2455,799,2433,2430,779,776,773,2397,2394,2390,734,728,724,746,1717,2356,2354,2351,2348,1658,677,675,673,670,667,688,1685,1683,2606,2589,2586,2559,2556,2552,927,2523,2521,2518,2515,1784,2532,895,893,890,2718,2709,2707,2689,2687,2684,2663,2662,2660,2658,1825,2667,2769,1852,2760,2758,142,141,1139,1138,134,132,129,126,1982,1129,1128,1126,1131,113,111,108,105,1972,101,1970,120,118,115,1109,1108,1106,1104,123,1113,1111,82,79,1951,75,1949,72,1946,92,89,86,1956,1077,1076,1074,1072,98,1069,96,1084,1082,1079,1088,1968,1967,48,45,1916,42,1914,39,1911,1908,60,57,54,1923,50,1920,1031,1030,1028,1026,67,1023,65,1020,62,1041,1039,1036,1033,69,1046,1044,1944,1943,1941,11,9,1868,7,1865,1862,1859,20,1878,16,1875,13,1872,970,968,966,963,29,960,26,23,983,981,978,975,33,971,31,990,988,985,1906,1904,1902,993,351,2145,1383,331,330,328,326,2137,323,2135,339,1372,1370,294,293,291,289,2122,286,2120,283,2117,309,303,317,1348,1346,1344,245,244,242,2090,239,2088,236,2085,2082,260,2099,249,270,1307,1305,1303,1300,1314,189,2038,186,2036,183,2033,2030,2026,206,198,2047,194,216,1247,1245,1243,1240,227,1237,1255,2310,2302,2300,2286,2284,2281,565,563,561,558,575,1589,2261,2259,2256,2253,1542,521,519,517,514,2270,511,533,1569,1567,2223,2221,2218,2215,1483,2211,1480,459,456,453,2232,449,474,491,1527,1525,1522,2475,2467,2465,2451,2449,2446,801,800,2426,2424,2421,2418,1723,2435,780,778,775,2387,2385,2382,2379,1695,2375,1693,2396,735,733,730,727,749,1718,2616,2615,2604,2603,2601,2584,2583,2581,2579,1800,2591,2550,2549,2547,2545,1792,2542,1790,2558,929,2719,1841,2710,2708,1833,1831,2690,2688,2686,1815,1809,1808,1774,1756,1754,1737,1736,1734,1739,1816,1711,1676,1674,633,629,1638,1636,1633,1641,598,1605,1604,1602,1600,605,1609,1607,2327,887,853,1775,822,820,1757,1755,1584,524,1560,1558,468,464,1514,1511,1508,1519,408,404,400,1452,1447,1444,417,1458,1455,2208,364,361,358,2154,1401,1400,1398,1396,374,1393,371,1408,1406,1403,1413,2173,2172,772,726,723,1712,672,669,666,682,1678,1675,625,623,621,618,2331,636,632,1639,1637,1635,920,918,884,880,889,849,848,847,846,2497,855,852,1776,2641,2742,2787,1380,334,1367,1365,301,297,1340,1338,1335,1343,255,251,247,1296,1291,1288,265,1302,1299,2113,204,196,192,2042,1232,1230,1224,214,1220,210,1242,1239,1235,1250,2077,2075,151,148,1993,144,1990,1163,1162,1160,1158,1155,161,1152,157,1173,1171,1168,1165,168,1181,1178,2021,2020,2018,2023,585,560,557,1585,516,509,1562,1559,458,447,2227,472,1516,1513,1510,398,396,393,390,2181,386,2178,407,1453,1451,1449,1446,420,1460,2209,769,764,720,712,2391,729,1713,664,663,661,659,2352,656,2349,671,1679,1677,2553,922,919,2519,2516,885,883,881,2685,2661,2659,2767,2756,2755,140,1137,1136,130,127,1125,1124,1122,1127,109,106,102,1103,1102,1100,1098,116,1107,1105,1980,80,76,73,1947,1068,1067,1065,1063,90,1060,87,1075,1073,1070,1080,1966,1965,46,43,40,1912,36,1909,1019,1018,1016,1014,58,1011,55,1008,51,1029,1027,1024,1021,63,1037,1034,1940,1939,1937,1942,8,1866,4,1863,1,1860,956,954,952,949,946,17,14,969,967,964,961,27,957,24,979,976,972,1901,1900,1898,1896,986,1905,1903,350,349,1381,329,327,324,1368,1366,292,290,287,284,2118,304,1341,1339,1337,1345,243,240,237,2086,233,2083,254,1297,1295,1293,1290,1304,2114,190,187,184,2034,180,2031,177,2027,199,1233,1231,1229,1226,217,1223,1241,2078,2076,584,555,554,552,550,2282,562,1586,507,506,504,502,2257,499,2254,515,1563,1561,445,443,441,2219,438,2216,435,2212,460,454,475,1517,1515,1512,2447,798,797,2422,2419,770,768,766,2383,2380,2376,721,719,717,714,731,1714,2602,2582,2580,2548,2546,2543,923,921,2717,2706,2705,2683,2682,2680,1771,1752,1750,1733,1732,1731,1735,1814,1707,1670,1668,1631,1629,1626,1634,1599,1598,1596,1594,1603,1601,2326,1772,1753,1751,1581,1554,1552,1504,1501,1498,1509,1442,1437,1434,401,1448,1445,2206,1392,1391,1389,1387,1384,359,1399,1397,1394,1404,2171,2170,1708,1672,1669,619,1632,1630,1628,1773,1378,1363,1361,1333,1328,1336,1286,1281,1278,248,1292,1289,2111,1218,1216,1210,197,1206,193,1228,1225,1221,1236,2073,2071,1151,1150,1148,1146,152,1143,149,1140,145,1161,1159,1156,1153,158,1169,1166,2017,2016,2014,2019,1582,510,1556,1553,452,448,1506,1500,394,391,387,1443,1441,1439,1436,1450,2207,765,716,713,1709,662,660,657,1673,1671,916,914,879,878,877,882,1135,1134,1121,1120,1118,1123,1097,1096,1094,1092,103,1101,1099,1979,1059,1058,1056,1054,77,1051,74,1066,1064,1061,1071,1964,1963,1007,1006,1004,1002,999,41,996,37,1017,1015,1012,1009,52,1025,1022,1936,1935,1933,1938,942,940,938,935,932,5,2,955,953,950,947,18,943,15,965,962,958,1895,1894,1892,1890,973,1899,1897,1379,325,1364,1362,288,285,1334,1332,1330,241,238,234,1287,1285,1283,1280,1294,2112,188,185,181,178,2028,1219,1217,1215,1212,200,1209,1227,2074,2072,583,553,551,1583,505,503,500,513,1557,1555,444,442,439,436,2213,455,451,1507,1505,1502,796,763,762,760,767,711,710,708,706,2377,718,715,1710,2544,917,915,2681,1627,1597,1595,2325,1769,1749,1747,1499,1438,1435,2204,1390,1388,1385,1395,2169,2167,1704,1665,1662,1625,1623,1620,1770,1329,1282,1279,2109,1214,1207,1222,2068,2065,1149,1147,1144,1141,146,1157,1154,2013,2011,2008,2015,1579,1549,1546,1495,1487,1433,1431,1428,1425,388,1440,2205,1705,658,1667,1664,1119,1095,1093,1978,1057,1055,1052,1062,1962,1960,1005,1003,1e3,997,38,1013,1010,1932,1930,1927,1934,941,939,936,933,6,930,3,951,948,944,1889,1887,1884,1881,959,1893,1891,35,1377,1360,1358,1327,1325,1322,1331,1277,1275,1272,1269,235,1284,2110,1205,1204,1201,1198,182,1195,179,1213,2070,2067,1580,501,1551,1548,440,437,1497,1494,1490,1503,761,709,707,1706,913,912,2198,1386,2164,2161,1621,1766,2103,1208,2058,2054,1145,1142,2005,2002,1999,2009,1488,1429,1426,2200,1698,1659,1656,1975,1053,1957,1954,1001,998,1924,1921,1918,1928,937,934,931,1879,1876,1873,1870,945,1885,1882,1323,1273,1270,2105,1202,1199,1196,1211,2061,2057,1576,1543,1540,1484,1481,1478,1491,1700]);class ve{constructor(t,e){this.bits=t,this.points=e}getBits(){return this.bits}getPoints(){return this.points}}class Fe{static detectMultiple(t,e,r){let n=t.getBlackMatrix(),i=Fe.detect(r,n);return i.length||(n=n.clone(),n.rotate180(),i=Fe.detect(r,n)),new ve(n,i)}static detect(t,e){const r=new Array;let n=0,i=0,o=!1;for(;n<e.getHeight();){const s=Fe.findVertices(e,n,i);if(null!=s[0]||null!=s[3]){if(o=!0,r.push(s),!t)break;null!=s[2]?(i=Math.trunc(s[2].getX()),n=Math.trunc(s[2].getY())):(i=Math.trunc(s[4].getX()),n=Math.trunc(s[4].getY()))}else{if(!o)break;o=!1,i=0;for(const t of r)null!=t[1]&&(n=Math.trunc(Math.max(n,t[1].getY()))),null!=t[3]&&(n=Math.max(n,Math.trunc(t[3].getY())));n+=Fe.ROW_STEP}}return r}static findVertices(t,e,r){const n=t.getHeight(),i=t.getWidth(),o=new Array(8);return Fe.copyToResult(o,Fe.findRowsWithPattern(t,n,i,e,r,Fe.START_PATTERN),Fe.INDEXES_START_PATTERN),null!=o[4]&&(r=Math.trunc(o[4].getX()),e=Math.trunc(o[4].getY())),Fe.copyToResult(o,Fe.findRowsWithPattern(t,n,i,e,r,Fe.STOP_PATTERN),Fe.INDEXES_STOP_PATTERN),o}static copyToResult(t,e,r){for(let n=0;n<r.length;n++)t[r[n]]=e[n]}static findRowsWithPattern(t,e,r,n,i,o){const s=new Array(4);let a=!1;const l=new Int32Array(o.length);for(;n<e;n+=Fe.ROW_STEP){let e=Fe.findGuardPattern(t,i,n,r,!1,o,l);if(null!=e){for(;n>0;){const s=Fe.findGuardPattern(t,i,--n,r,!1,o,l);if(null==s){n++;break}e=s}s[0]=new it(e[0],n),s[1]=new it(e[1],n),a=!0;break}}let c=n+1;if(a){let n=0,i=Int32Array.from([Math.trunc(s[0].getX()),Math.trunc(s[1].getX())]);for(;c<e;c++){const e=Fe.findGuardPattern(t,i[0],c,r,!1,o,l);if(null!=e&&Math.abs(i[0]-e[0])<Fe.MAX_PATTERN_DRIFT&&Math.abs(i[1]-e[1])<Fe.MAX_PATTERN_DRIFT)i=e,n=0;else{if(n>Fe.SKIPPED_ROW_COUNT_MAX)break;n++}}c-=n+1,s[2]=new it(i[0],c),s[3]=new it(i[1],c)}return c-n<Fe.BARCODE_MIN_HEIGHT&&w.fill(s,null),s}static findGuardPattern(t,e,r,n,i,o,s){w.fillWithin(s,0,s.length,0);let a=e,l=0;for(;t.get(a,r)&&a>0&&l++<Fe.MAX_PIXEL_DRIFT;)a--;let c=a,h=0,u=o.length;for(let e=i;c<n;c++)if(t.get(c,r)!==e)s[h]++;else{if(h===u-1){if(Fe.patternMatchVariance(s,o,Fe.MAX_INDIVIDUAL_VARIANCE)<Fe.MAX_AVG_VARIANCE)return new Int32Array([a,c]);a+=s[0]+s[1],d.arraycopy(s,2,s,0,h-1),s[h-1]=0,s[h]=0,h--}else h++;s[h]=1,e=!e}return h===u-1&&Fe.patternMatchVariance(s,o,Fe.MAX_INDIVIDUAL_VARIANCE)<Fe.MAX_AVG_VARIANCE?new Int32Array([a,c-1]):null}static patternMatchVariance(t,e,r){let n=t.length,i=0,o=0;for(let r=0;r<n;r++)i+=t[r],o+=e[r];if(i<o)return 1/0;let s=i/o;r*=s;let a=0;for(let i=0;i<n;i++){let n=t[i],o=e[i]*s,l=n>o?n-o:o-n;if(l>r)return 1/0;a+=l}return a/i}}Fe.INDEXES_START_PATTERN=Int32Array.from([0,4,1,5]),Fe.INDEXES_STOP_PATTERN=Int32Array.from([6,2,7,3]),Fe.MAX_AVG_VARIANCE=.42,Fe.MAX_INDIVIDUAL_VARIANCE=.8,Fe.START_PATTERN=Int32Array.from([8,1,1,1,1,1,1,3]),Fe.STOP_PATTERN=Int32Array.from([7,1,1,3,1,1,1,2,1]),Fe.MAX_PIXEL_DRIFT=3,Fe.MAX_PATTERN_DRIFT=5,Fe.SKIPPED_ROW_COUNT_MAX=25,Fe.ROW_STEP=5,Fe.BARCODE_MIN_HEIGHT=10;class xe{constructor(t,e){if(0===e.length)throw new l;this.field=t;let r=e.length;if(r>1&&0===e[0]){let t=1;for(;t<r&&0===e[t];)t++;t===r?this.coefficients=new Int32Array([0]):(this.coefficients=new Int32Array(r-t),d.arraycopy(e,t,this.coefficients,0,this.coefficients.length))}else this.coefficients=e}getCoefficients(){return this.coefficients}getDegree(){return this.coefficients.length-1}isZero(){return 0===this.coefficients[0]}getCoefficient(t){return this.coefficients[this.coefficients.length-1-t]}evaluateAt(t){if(0===t)return this.getCoefficient(0);if(1===t){let t=0;for(let e of this.coefficients)t=this.field.add(t,e);return t}let e=this.coefficients[0],r=this.coefficients.length;for(let n=1;n<r;n++)e=this.field.add(this.field.multiply(t,e),this.coefficients[n]);return e}add(t){if(!this.field.equals(t.field))throw new l("ModulusPolys do not have same ModulusGF field");if(this.isZero())return t;if(t.isZero())return this;let e=this.coefficients,r=t.coefficients;if(e.length>r.length){let t=e;e=r,r=t}let n=new Int32Array(r.length),i=r.length-e.length;d.arraycopy(r,0,n,0,i);for(let t=i;t<r.length;t++)n[t]=this.field.add(e[t-i],r[t]);return new xe(this.field,n)}subtract(t){if(!this.field.equals(t.field))throw new l("ModulusPolys do not have same ModulusGF field");return t.isZero()?this:this.add(t.negative())}multiply(t){return t instanceof xe?this.multiplyOther(t):this.multiplyScalar(t)}multiplyOther(t){if(!this.field.equals(t.field))throw new l("ModulusPolys do not have same ModulusGF field");if(this.isZero()||t.isZero())return new xe(this.field,new Int32Array([0]));let e=this.coefficients,r=e.length,n=t.coefficients,i=n.length,o=new Int32Array(r+i-1);for(let t=0;t<r;t++){let r=e[t];for(let e=0;e<i;e++)o[t+e]=this.field.add(o[t+e],this.field.multiply(r,n[e]))}return new xe(this.field,o)}negative(){let t=this.coefficients.length,e=new Int32Array(t);for(let r=0;r<t;r++)e[r]=this.field.subtract(0,this.coefficients[r]);return new xe(this.field,e)}multiplyScalar(t){if(0===t)return new xe(this.field,new Int32Array([0]));if(1===t)return this;let e=this.coefficients.length,r=new Int32Array(e);for(let n=0;n<e;n++)r[n]=this.field.multiply(this.coefficients[n],t);return new xe(this.field,r)}multiplyByMonomial(t,e){if(t<0)throw new l;if(0===e)return new xe(this.field,new Int32Array([0]));let r=this.coefficients.length,n=new Int32Array(r+t);for(let t=0;t<r;t++)n[t]=this.field.multiply(this.coefficients[t],e);return new xe(this.field,n)}toString(){let t=new y;for(let e=this.getDegree();e>=0;e--){let r=this.getCoefficient(e);0!==r&&(r<0?(t.append(" - "),r=-r):t.length()>0&&t.append(" + "),0!==e&&1===r||t.append(r),0!==e&&(1===e?t.append("x"):(t.append("x^"),t.append(e))))}return t.toString()}}class ke{add(t,e){return(t+e)%this.modulus}subtract(t,e){return(this.modulus+t-e)%this.modulus}exp(t){return this.expTable[t]}log(t){if(0===t)throw new l;return this.logTable[t]}inverse(t){if(0===t)throw new K;return this.expTable[this.modulus-this.logTable[t]-1]}multiply(t,e){return 0===t||0===e?0:this.expTable[(this.logTable[t]+this.logTable[e])%(this.modulus-1)]}getSize(){return this.modulus}equals(t){return t===this}}class Ue extends ke{constructor(t,e){super(),this.modulus=t,this.expTable=new Int32Array(t),this.logTable=new Int32Array(t);let r=1;for(let n=0;n<t;n++)this.expTable[n]=r,r=r*e%t;for(let e=0;e<t-1;e++)this.logTable[this.expTable[e]]=e;this.zero=new xe(this,new Int32Array([0])),this.one=new xe(this,new Int32Array([1]))}getZero(){return this.zero}getOne(){return this.one}buildMonomial(t,e){if(t<0)throw new l;if(0===e)return this.zero;let r=new Int32Array(t+1);return r[0]=e,new xe(this,r)}}Ue.PDF417_GF=new Ue(Pe.NUMBER_OF_CODEWORDS,3);class He{constructor(){this.field=Ue.PDF417_GF}decode(t,e,r){let n=new xe(this.field,t),i=new Int32Array(e),o=!1;for(let t=e;t>0;t--){let r=n.evaluateAt(this.field.exp(t));i[e-t]=r,0!==r&&(o=!0)}if(!o)return 0;let s=this.field.getOne();if(null!=r)for(const e of r){let r=this.field.exp(t.length-1-e),n=new xe(this.field,new Int32Array([this.field.subtract(0,r),1]));s=s.multiply(n)}let a=new xe(this.field,i),l=this.runEuclideanAlgorithm(this.field.buildMonomial(e,1),a,e),c=l[0],u=l[1],d=this.findErrorLocations(c),f=this.findErrorMagnitudes(u,c,d);for(let e=0;e<d.length;e++){let r=t.length-1-this.field.log(d[e]);if(r<0)throw h.getChecksumInstance();t[r]=this.field.subtract(t[r],f[e])}return d.length}runEuclideanAlgorithm(t,e,r){if(t.getDegree()<e.getDegree()){let r=t;t=e,e=r}let n=t,i=e,o=this.field.getZero(),s=this.field.getOne();for(;i.getDegree()>=Math.round(r/2);){let t=n,e=o;if(n=i,o=s,n.isZero())throw h.getChecksumInstance();i=t;let r=this.field.getZero(),a=n.getCoefficient(n.getDegree()),l=this.field.inverse(a);for(;i.getDegree()>=n.getDegree()&&!i.isZero();){let t=i.getDegree()-n.getDegree(),e=this.field.multiply(i.getCoefficient(i.getDegree()),l);r=r.add(this.field.buildMonomial(t,e)),i=i.subtract(n.multiplyByMonomial(t,e))}s=r.multiply(o).subtract(e).negative()}let a=s.getCoefficient(0);if(0===a)throw h.getChecksumInstance();let l=this.field.inverse(a);return[s.multiply(l),i.multiply(l)]}findErrorLocations(t){let e=t.getDegree(),r=new Int32Array(e),n=0;for(let i=1;i<this.field.getSize()&&n<e;i++)0===t.evaluateAt(i)&&(r[n]=this.field.inverse(i),n++);if(n!==e)throw h.getChecksumInstance();return r}findErrorMagnitudes(t,e,r){let n=e.getDegree(),i=new Int32Array(n);for(let t=1;t<=n;t++)i[n-t]=this.field.multiply(t,e.getCoefficient(t));let o=new xe(this.field,i),s=r.length,a=new Int32Array(s);for(let e=0;e<s;e++){let n=this.field.inverse(r[e]),i=this.field.subtract(0,t.evaluateAt(n)),s=this.field.inverse(o.evaluateAt(n));a[e]=this.field.multiply(i,s)}return a}}class Ve{constructor(t,e,r,n,i){t instanceof Ve?this.constructor_2(t):this.constructor_1(t,e,r,n,i)}constructor_1(t,e,r,n,i){const o=null==e||null==r,s=null==n||null==i;if(o&&s)throw new D;o?(e=new it(0,n.getY()),r=new it(0,i.getY())):s&&(n=new it(t.getWidth()-1,e.getY()),i=new it(t.getWidth()-1,r.getY())),this.image=t,this.topLeft=e,this.bottomLeft=r,this.topRight=n,this.bottomRight=i,this.minX=Math.trunc(Math.min(e.getX(),r.getX())),this.maxX=Math.trunc(Math.max(n.getX(),i.getX())),this.minY=Math.trunc(Math.min(e.getY(),n.getY())),this.maxY=Math.trunc(Math.max(r.getY(),i.getY()))}constructor_2(t){this.image=t.image,this.topLeft=t.getTopLeft(),this.bottomLeft=t.getBottomLeft(),this.topRight=t.getTopRight(),this.bottomRight=t.getBottomRight(),this.minX=t.getMinX(),this.maxX=t.getMaxX(),this.minY=t.getMinY(),this.maxY=t.getMaxY()}static merge(t,e){return null==t?e:null==e?t:new Ve(t.image,t.topLeft,t.bottomLeft,e.topRight,e.bottomRight)}addMissingRows(t,e,r){let n=this.topLeft,i=this.bottomLeft,o=this.topRight,s=this.bottomRight;if(t>0){let e=r?this.topLeft:this.topRight,i=Math.trunc(e.getY()-t);i<0&&(i=0);let s=new it(e.getX(),i);r?n=s:o=s}if(e>0){let t=r?this.bottomLeft:this.bottomRight,n=Math.trunc(t.getY()+e);n>=this.image.getHeight()&&(n=this.image.getHeight()-1);let o=new it(t.getX(),n);r?i=o:s=o}return new Ve(this.image,n,i,o,s)}getMinX(){return this.minX}getMaxX(){return this.maxX}getMinY(){return this.minY}getMaxY(){return this.maxY}getTopLeft(){return this.topLeft}getTopRight(){return this.topRight}getBottomLeft(){return this.bottomLeft}getBottomRight(){return this.bottomRight}}class ze{constructor(t,e,r,n){this.columnCount=t,this.errorCorrectionLevel=n,this.rowCountUpperPart=e,this.rowCountLowerPart=r,this.rowCount=e+r}getColumnCount(){return this.columnCount}getErrorCorrectionLevel(){return this.errorCorrectionLevel}getRowCount(){return this.rowCount}getRowCountUpperPart(){return this.rowCountUpperPart}getRowCountLowerPart(){return this.rowCountLowerPart}}class Ge{constructor(){this.buffer=""}static form(t,e){let r=-1;return t.replace(/%(-)?(0?[0-9]+)?([.][0-9]+)?([#][0-9]+)?([scfpexd%])/g,(function(t,n,i,o,s,a){if("%%"===t)return"%";if(void 0===e[++r])return;t=o?parseInt(o.substr(1)):void 0;let l,c=s?parseInt(s.substr(1)):void 0;switch(a){case"s":l=e[r];break;case"c":l=e[r][0];break;case"f":l=parseFloat(e[r]).toFixed(t);break;case"p":l=parseFloat(e[r]).toPrecision(t);break;case"e":l=parseFloat(e[r]).toExponential(t);break;case"x":l=parseInt(e[r]).toString(c||16);break;case"d":l=parseFloat(parseInt(e[r],c||10).toPrecision(t)).toFixed(0)}l="object"==typeof l?JSON.stringify(l):(+l).toString(c);let h=parseInt(i),u=i&&i[0]+""=="0"?"0":" ";for(;l.length<h;)l=void 0!==n?l+u:u+l;return l}))}format(t,...e){this.buffer+=Ge.form(t,e)}toString(){return this.buffer}}class Ye{constructor(t){this.boundingBox=new Ve(t),this.codewords=new Array(t.getMaxY()-t.getMinY()+1)}getCodewordNearby(t){let e=this.getCodeword(t);if(null!=e)return e;for(let r=1;r<Ye.MAX_NEARBY_DISTANCE;r++){let n=this.imageRowToCodewordIndex(t)-r;if(n>=0&&(e=this.codewords[n],null!=e))return e;if(n=this.imageRowToCodewordIndex(t)+r,n<this.codewords.length&&(e=this.codewords[n],null!=e))return e}return null}imageRowToCodewordIndex(t){return t-this.boundingBox.getMinY()}setCodeword(t,e){this.codewords[this.imageRowToCodewordIndex(t)]=e}getCodeword(t){return this.codewords[this.imageRowToCodewordIndex(t)]}getBoundingBox(){return this.boundingBox}getCodewords(){return this.codewords}toString(){const t=new Ge;let e=0;for(const r of this.codewords)null!=r?t.format("%3d: %3d|%3d%n",e++,r.getRowNumber(),r.getValue()):t.format("%3d:    |   %n",e++);return t.toString()}}Ye.MAX_NEARBY_DISTANCE=5;class Xe{constructor(){this.values=new Map}setValue(t){t=Math.trunc(t);let e=this.values.get(t);null==e&&(e=0),e++,this.values.set(t,e)}getValue(){let t=-1,e=new Array;for(const[r,n]of this.values.entries()){const i={getKey:()=>r,getValue:()=>n};i.getValue()>t?(t=i.getValue(),e=[],e.push(i.getKey())):i.getValue()===t&&e.push(i.getKey())}return Pe.toIntArray(e)}getConfidence(t){return this.values.get(t)}}class We extends Ye{constructor(t,e){super(t),this._isLeft=e}setRowNumbers(){for(let t of this.getCodewords())null!=t&&t.setRowNumberAsRowIndicatorColumn()}adjustCompleteIndicatorColumnRowNumbers(t){let e=this.getCodewords();this.setRowNumbers(),this.removeIncorrectCodewords(e,t);let r=this.getBoundingBox(),n=this._isLeft?r.getTopLeft():r.getTopRight(),i=this._isLeft?r.getBottomLeft():r.getBottomRight(),o=this.imageRowToCodewordIndex(Math.trunc(n.getY())),s=this.imageRowToCodewordIndex(Math.trunc(i.getY())),a=-1,l=1,c=0;for(let r=o;r<s;r++){if(null==e[r])continue;let n=e[r],i=n.getRowNumber()-a;if(0===i)c++;else if(1===i)l=Math.max(l,c),c=1,a=n.getRowNumber();else if(i<0||n.getRowNumber()>=t.getRowCount()||i>r)e[r]=null;else{let t;t=l>2?(l-2)*i:i;let o=t>=r;for(let n=1;n<=t&&!o;n++)o=null!=e[r-n];o?e[r]=null:(a=n.getRowNumber(),c=1)}}}getRowHeights(){let t=this.getBarcodeMetadata();if(null==t)return null;this.adjustIncompleteIndicatorColumnRowNumbers(t);let e=new Int32Array(t.getRowCount());for(let t of this.getCodewords())if(null!=t){let r=t.getRowNumber();if(r>=e.length)continue;e[r]++}return e}adjustIncompleteIndicatorColumnRowNumbers(t){let e=this.getBoundingBox(),r=this._isLeft?e.getTopLeft():e.getTopRight(),n=this._isLeft?e.getBottomLeft():e.getBottomRight(),i=this.imageRowToCodewordIndex(Math.trunc(r.getY())),o=this.imageRowToCodewordIndex(Math.trunc(n.getY())),s=this.getCodewords(),a=-1;for(let e=i;e<o;e++){if(null==s[e])continue;let r=s[e];r.setRowNumberAsRowIndicatorColumn();let n=r.getRowNumber()-a;0===n||(1===n?a=r.getRowNumber():r.getRowNumber()>=t.getRowCount()?s[e]=null:a=r.getRowNumber())}}getBarcodeMetadata(){let t=this.getCodewords(),e=new Xe,r=new Xe,n=new Xe,i=new Xe;for(let o of t){if(null==o)continue;o.setRowNumberAsRowIndicatorColumn();let t=o.getValue()%30,s=o.getRowNumber();switch(this._isLeft||(s+=2),s%3){case 0:r.setValue(3*t+1);break;case 1:i.setValue(t/3),n.setValue(t%3);break;case 2:e.setValue(t+1)}}if(0===e.getValue().length||0===r.getValue().length||0===n.getValue().length||0===i.getValue().length||e.getValue()[0]<1||r.getValue()[0]+n.getValue()[0]<Pe.MIN_ROWS_IN_BARCODE||r.getValue()[0]+n.getValue()[0]>Pe.MAX_ROWS_IN_BARCODE)return null;let o=new ze(e.getValue()[0],r.getValue()[0],n.getValue()[0],i.getValue()[0]);return this.removeIncorrectCodewords(t,o),o}removeIncorrectCodewords(t,e){for(let r=0;r<t.length;r++){let n=t[r];if(null==t[r])continue;let i=n.getValue()%30,o=n.getRowNumber();if(o>e.getRowCount())t[r]=null;else switch(this._isLeft||(o+=2),o%3){case 0:3*i+1!==e.getRowCountUpperPart()&&(t[r]=null);break;case 1:Math.trunc(i/3)===e.getErrorCorrectionLevel()&&i%3===e.getRowCountLowerPart()||(t[r]=null);break;case 2:i+1!==e.getColumnCount()&&(t[r]=null)}}}isLeft(){return this._isLeft}toString(){return"IsLeft: "+this._isLeft+"\n"+super.toString()}}class je{constructor(t,e){this.ADJUST_ROW_NUMBER_SKIP=2,this.barcodeMetadata=t,this.barcodeColumnCount=t.getColumnCount(),this.boundingBox=e,this.detectionResultColumns=new Array(this.barcodeColumnCount+2)}getDetectionResultColumns(){this.adjustIndicatorColumnRowNumbers(this.detectionResultColumns[0]),this.adjustIndicatorColumnRowNumbers(this.detectionResultColumns[this.barcodeColumnCount+1]);let t,e=Pe.MAX_CODEWORDS_IN_BARCODE;do{t=e,e=this.adjustRowNumbersAndGetCount()}while(e>0&&e<t);return this.detectionResultColumns}adjustIndicatorColumnRowNumbers(t){null!=t&&t.adjustCompleteIndicatorColumnRowNumbers(this.barcodeMetadata)}adjustRowNumbersAndGetCount(){let t=this.adjustRowNumbersByRow();if(0===t)return 0;for(let t=1;t<this.barcodeColumnCount+1;t++){let e=this.detectionResultColumns[t].getCodewords();for(let r=0;r<e.length;r++)null!=e[r]&&(e[r].hasValidRowNumber()||this.adjustRowNumbers(t,r,e))}return t}adjustRowNumbersByRow(){return this.adjustRowNumbersFromBothRI(),this.adjustRowNumbersFromLRI()+this.adjustRowNumbersFromRRI()}adjustRowNumbersFromBothRI(){if(null==this.detectionResultColumns[0]||null==this.detectionResultColumns[this.barcodeColumnCount+1])return;let t=this.detectionResultColumns[0].getCodewords(),e=this.detectionResultColumns[this.barcodeColumnCount+1].getCodewords();for(let r=0;r<t.length;r++)if(null!=t[r]&&null!=e[r]&&t[r].getRowNumber()===e[r].getRowNumber())for(let e=1;e<=this.barcodeColumnCount;e++){let n=this.detectionResultColumns[e].getCodewords()[r];null!=n&&(n.setRowNumber(t[r].getRowNumber()),n.hasValidRowNumber()||(this.detectionResultColumns[e].getCodewords()[r]=null))}}adjustRowNumbersFromRRI(){if(null==this.detectionResultColumns[this.barcodeColumnCount+1])return 0;let t=0,e=this.detectionResultColumns[this.barcodeColumnCount+1].getCodewords();for(let r=0;r<e.length;r++){if(null==e[r])continue;let n=e[r].getRowNumber(),i=0;for(let e=this.barcodeColumnCount+1;e>0&&i<this.ADJUST_ROW_NUMBER_SKIP;e--){let o=this.detectionResultColumns[e].getCodewords()[r];null!=o&&(i=je.adjustRowNumberIfValid(n,i,o),o.hasValidRowNumber()||t++)}}return t}adjustRowNumbersFromLRI(){if(null==this.detectionResultColumns[0])return 0;let t=0,e=this.detectionResultColumns[0].getCodewords();for(let r=0;r<e.length;r++){if(null==e[r])continue;let n=e[r].getRowNumber(),i=0;for(let e=1;e<this.barcodeColumnCount+1&&i<this.ADJUST_ROW_NUMBER_SKIP;e++){let o=this.detectionResultColumns[e].getCodewords()[r];null!=o&&(i=je.adjustRowNumberIfValid(n,i,o),o.hasValidRowNumber()||t++)}}return t}static adjustRowNumberIfValid(t,e,r){return null==r||r.hasValidRowNumber()||(r.isValidRowNumber(t)?(r.setRowNumber(t),e=0):++e),e}adjustRowNumbers(t,e,r){if(!this.detectionResultColumns[t-1])return;let n=r[e],i=this.detectionResultColumns[t-1].getCodewords(),o=i;null!=this.detectionResultColumns[t+1]&&(o=this.detectionResultColumns[t+1].getCodewords());let s=new Array(14);s[2]=i[e],s[3]=o[e],e>0&&(s[0]=r[e-1],s[4]=i[e-1],s[5]=o[e-1]),e>1&&(s[8]=r[e-2],s[10]=i[e-2],s[11]=o[e-2]),e<r.length-1&&(s[1]=r[e+1],s[6]=i[e+1],s[7]=o[e+1]),e<r.length-2&&(s[9]=r[e+2],s[12]=i[e+2],s[13]=o[e+2]);for(let t of s)if(je.adjustRowNumber(n,t))return}static adjustRowNumber(t,e){return!(null==e||!e.hasValidRowNumber()||e.getBucket()!==t.getBucket()||(t.setRowNumber(e.getRowNumber()),0))}getBarcodeColumnCount(){return this.barcodeColumnCount}getBarcodeRowCount(){return this.barcodeMetadata.getRowCount()}getBarcodeECLevel(){return this.barcodeMetadata.getErrorCorrectionLevel()}setBoundingBox(t){this.boundingBox=t}getBoundingBox(){return this.boundingBox}setDetectionResultColumn(t,e){this.detectionResultColumns[t]=e}getDetectionResultColumn(t){return this.detectionResultColumns[t]}toString(){let t=this.detectionResultColumns[0];null==t&&(t=this.detectionResultColumns[this.barcodeColumnCount+1]);let e=new Ge;for(let r=0;r<t.getCodewords().length;r++){e.format("CW %3d:",r);for(let t=0;t<this.barcodeColumnCount+2;t++){if(null==this.detectionResultColumns[t]){e.format("    |   ");continue}let n=this.detectionResultColumns[t].getCodewords()[r];null!=n?e.format(" %3d|%3d",n.getRowNumber(),n.getValue()):e.format("    |   ")}e.format("%n")}return e.toString()}}class Ze{constructor(t,e,r,n){this.rowNumber=Ze.BARCODE_ROW_UNKNOWN,this.startX=Math.trunc(t),this.endX=Math.trunc(e),this.bucket=Math.trunc(r),this.value=Math.trunc(n)}hasValidRowNumber(){return this.isValidRowNumber(this.rowNumber)}isValidRowNumber(t){return t!==Ze.BARCODE_ROW_UNKNOWN&&this.bucket===t%3*3}setRowNumberAsRowIndicatorColumn(){this.rowNumber=Math.trunc(3*Math.trunc(this.value/30)+Math.trunc(this.bucket/3))}getWidth(){return this.endX-this.startX}getStartX(){return this.startX}getEndX(){return this.endX}getBucket(){return this.bucket}getValue(){return this.value}getRowNumber(){return this.rowNumber}setRowNumber(t){this.rowNumber=t}toString(){return this.rowNumber+"|"+this.value}}Ze.BARCODE_ROW_UNKNOWN=-1;class Qe{static initialize(){for(let t=0;t<Pe.SYMBOL_TABLE.length;t++){let e=Pe.SYMBOL_TABLE[t],r=1&e;for(let n=0;n<Pe.BARS_IN_MODULE;n++){let i=0;for(;(1&e)===r;)i+=1,e>>=1;r=1&e,Qe.RATIOS_TABLE[t]||(Qe.RATIOS_TABLE[t]=new Array(Pe.BARS_IN_MODULE)),Qe.RATIOS_TABLE[t][Pe.BARS_IN_MODULE-n-1]=Math.fround(i/Pe.MODULES_IN_CODEWORD)}}this.bSymbolTableReady=!0}static getDecodedValue(t){let e=Qe.getDecodedCodewordValue(Qe.sampleBitCounts(t));return-1!==e?e:Qe.getClosestDecodedValue(t)}static sampleBitCounts(t){let e=rt.sum(t),r=new Int32Array(Pe.BARS_IN_MODULE),n=0,i=0;for(let o=0;o<Pe.MODULES_IN_CODEWORD;o++){let s=e/(2*Pe.MODULES_IN_CODEWORD)+o*e/Pe.MODULES_IN_CODEWORD;i+t[n]<=s&&(i+=t[n],n++),r[n]++}return r}static getDecodedCodewordValue(t){let e=Qe.getBitValue(t);return-1===Pe.getCodeword(e)?-1:e}static getBitValue(t){let e=0;for(let r=0;r<t.length;r++)for(let n=0;n<t[r];n++)e=e<<1|(r%2==0?1:0);return Math.trunc(e)}static getClosestDecodedValue(t){let e=rt.sum(t),r=new Array(Pe.BARS_IN_MODULE);if(e>1)for(let n=0;n<r.length;n++)r[n]=Math.fround(t[n]/e);let n=nt.MAX_VALUE,i=-1;this.bSymbolTableReady||Qe.initialize();for(let t=0;t<Qe.RATIOS_TABLE.length;t++){let e=0,o=Qe.RATIOS_TABLE[t];for(let t=0;t<Pe.BARS_IN_MODULE;t++){let i=Math.fround(o[t]-r[t]);if(e+=Math.fround(i*i),e>=n)break}e<n&&(n=e,i=Pe.SYMBOL_TABLE[t])}return i}}Qe.bSymbolTableReady=!1,Qe.RATIOS_TABLE=new Array(Pe.SYMBOL_TABLE.length).map((t=>new Array(Pe.BARS_IN_MODULE)));class Ke{constructor(){this.segmentCount=-1,this.fileSize=-1,this.timestamp=-1,this.checksum=-1}getSegmentIndex(){return this.segmentIndex}setSegmentIndex(t){this.segmentIndex=t}getFileId(){return this.fileId}setFileId(t){this.fileId=t}getOptionalData(){return this.optionalData}setOptionalData(t){this.optionalData=t}isLastSegment(){return this.lastSegment}setLastSegment(t){this.lastSegment=t}getSegmentCount(){return this.segmentCount}setSegmentCount(t){this.segmentCount=t}getSender(){return this.sender||null}setSender(t){this.sender=t}getAddressee(){return this.addressee||null}setAddressee(t){this.addressee=t}getFileName(){return this.fileName}setFileName(t){this.fileName=t}getFileSize(){return this.fileSize}setFileSize(t){this.fileSize=t}getChecksum(){return this.checksum}setChecksum(t){this.checksum=t}getTimestamp(){return this.timestamp}setTimestamp(t){this.timestamp=t}}class qe{static parseLong(t,e){return parseInt(t,e)}}class Je extends s{}Je.kind="NullPointerException";class $e{writeBytes(t){this.writeBytesOffset(t,0,t.length)}writeBytesOffset(t,e,r){if(null==t)throw new Je;if(e<0||e>t.length||r<0||e+r>t.length||e+r<0)throw new f;if(0!==r)for(let n=0;n<r;n++)this.write(t[e+n])}flush(){}close(){}}class tr extends s{}class er extends $e{constructor(t=32){if(super(),this.count=0,t<0)throw new l("Negative initial size: "+t);this.buf=new Uint8Array(t)}ensureCapacity(t){t-this.buf.length>0&&this.grow(t)}grow(t){let e=this.buf.length<<1;if(e-t<0&&(e=t),e<0){if(t<0)throw new tr;e=m.MAX_VALUE}this.buf=w.copyOfUint8Array(this.buf,e)}write(t){this.ensureCapacity(this.count+1),this.buf[this.count]=t,this.count+=1}writeBytesOffset(t,e,r){if(e<0||e>t.length||r<0||e+r-t.length>0)throw new f;this.ensureCapacity(this.count+r),d.arraycopy(t,e,this.buf,this.count,r),this.count+=r}writeTo(t){t.writeBytesOffset(this.buf,0,this.count)}reset(){this.count=0}toByteArray(){return w.copyOfUint8Array(this.buf,this.count)}size(){return this.count}toString(t){return t?"string"==typeof t?this.toString_string(t):this.toString_number(t):this.toString_void()}toString_void(){return new String(this.buf).toString()}toString_string(t){return new String(this.buf).toString()}toString_number(t){return new String(this.buf).toString()}close(){}}function rr(){if("undefined"!=typeof window)return window.BigInt||null;if(void 0!==r.g)return r.g.BigInt||null;if("undefined"!=typeof self)return self.BigInt||null;throw new Error("Can't search globals for BigInt!")}let nr;function ir(t){if(void 0===nr&&(nr=rr()),null===nr)throw new Error("BigInt is not supported!");return nr(t)}!function(t){t[t.ALPHA=0]="ALPHA",t[t.LOWER=1]="LOWER",t[t.MIXED=2]="MIXED",t[t.PUNCT=3]="PUNCT",t[t.ALPHA_SHIFT=4]="ALPHA_SHIFT",t[t.PUNCT_SHIFT=5]="PUNCT_SHIFT"}(X||(X={}));class or{static decode(t,e){let r=new y(""),n=I.ISO8859_1;r.enableDecoding(n);let i=1,o=t[i++],s=new Ke;for(;i<t[0];){switch(o){case or.TEXT_COMPACTION_MODE_LATCH:i=or.textCompaction(t,i,r);break;case or.BYTE_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH_6:i=or.byteCompaction(o,t,n,i,r);break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:r.append(t[i++]);break;case or.NUMERIC_COMPACTION_MODE_LATCH:i=or.numericCompaction(t,i,r);break;case or.ECI_CHARSET:I.getCharacterSetECIByValue(t[i++]);break;case or.ECI_GENERAL_PURPOSE:i+=2;break;case or.ECI_USER_DEFINED:i++;break;case or.BEGIN_MACRO_PDF417_CONTROL_BLOCK:i=or.decodeMacroBlock(t,i,s);break;case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:case or.MACRO_PDF417_TERMINATOR:throw new E;default:i--,i=or.textCompaction(t,i,r)}if(!(i<t.length))throw E.getFormatInstance();o=t[i++]}if(0===r.length())throw E.getFormatInstance();let a=new j(null,r.toString(),null,e);return a.setOther(s),a}static decodeMacroBlock(t,e,r){if(e+or.NUMBER_OF_SEQUENCE_CODEWORDS>t[0])throw E.getFormatInstance();let n=new Int32Array(or.NUMBER_OF_SEQUENCE_CODEWORDS);for(let r=0;r<or.NUMBER_OF_SEQUENCE_CODEWORDS;r++,e++)n[r]=t[e];r.setSegmentIndex(m.parseInt(or.decodeBase900toBase10(n,or.NUMBER_OF_SEQUENCE_CODEWORDS)));let i=new y;e=or.textCompaction(t,e,i),r.setFileId(i.toString());let o=-1;for(t[e]===or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD&&(o=e+1);e<t[0];)switch(t[e]){case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:switch(t[++e]){case or.MACRO_PDF417_OPTIONAL_FIELD_FILE_NAME:let n=new y;e=or.textCompaction(t,e+1,n),r.setFileName(n.toString());break;case or.MACRO_PDF417_OPTIONAL_FIELD_SENDER:let i=new y;e=or.textCompaction(t,e+1,i),r.setSender(i.toString());break;case or.MACRO_PDF417_OPTIONAL_FIELD_ADDRESSEE:let o=new y;e=or.textCompaction(t,e+1,o),r.setAddressee(o.toString());break;case or.MACRO_PDF417_OPTIONAL_FIELD_SEGMENT_COUNT:let s=new y;e=or.numericCompaction(t,e+1,s),r.setSegmentCount(m.parseInt(s.toString()));break;case or.MACRO_PDF417_OPTIONAL_FIELD_TIME_STAMP:let a=new y;e=or.numericCompaction(t,e+1,a),r.setTimestamp(qe.parseLong(a.toString()));break;case or.MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM:let l=new y;e=or.numericCompaction(t,e+1,l),r.setChecksum(m.parseInt(l.toString()));break;case or.MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE:let c=new y;e=or.numericCompaction(t,e+1,c),r.setFileSize(qe.parseLong(c.toString()));break;default:throw E.getFormatInstance()}break;case or.MACRO_PDF417_TERMINATOR:e++,r.setLastSegment(!0);break;default:throw E.getFormatInstance()}if(-1!==o){let n=e-o;r.isLastSegment()&&n--,r.setOptionalData(w.copyOfRange(t,o,o+n))}return e}static textCompaction(t,e,r){let n=new Int32Array(2*(t[0]-e)),i=new Int32Array(2*(t[0]-e)),o=0,s=!1;for(;e<t[0]&&!s;){let r=t[e++];if(r<or.TEXT_COMPACTION_MODE_LATCH)n[o]=r/30,n[o+1]=r%30,o+=2;else switch(r){case or.TEXT_COMPACTION_MODE_LATCH:n[o++]=or.TEXT_COMPACTION_MODE_LATCH;break;case or.BYTE_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH_6:case or.NUMERIC_COMPACTION_MODE_LATCH:case or.BEGIN_MACRO_PDF417_CONTROL_BLOCK:case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:case or.MACRO_PDF417_TERMINATOR:e--,s=!0;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n[o]=or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE,r=t[e++],i[o]=r,o++}}return or.decodeTextCompaction(n,i,o,r),e}static decodeTextCompaction(t,e,r,n){let i=X.ALPHA,o=X.ALPHA,s=0;for(;s<r;){let r=t[s],a="";switch(i){case X.ALPHA:if(r<26)a=String.fromCharCode(65+r);else switch(r){case 26:a=" ";break;case or.LL:i=X.LOWER;break;case or.ML:i=X.MIXED;break;case or.PS:o=i,i=X.PUNCT_SHIFT;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n.append(e[s]);break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}break;case X.LOWER:if(r<26)a=String.fromCharCode(97+r);else switch(r){case 26:a=" ";break;case or.AS:o=i,i=X.ALPHA_SHIFT;break;case or.ML:i=X.MIXED;break;case or.PS:o=i,i=X.PUNCT_SHIFT;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n.append(e[s]);break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}break;case X.MIXED:if(r<or.PL)a=or.MIXED_CHARS[r];else switch(r){case or.PL:i=X.PUNCT;break;case 26:a=" ";break;case or.LL:i=X.LOWER;break;case or.AL:i=X.ALPHA;break;case or.PS:o=i,i=X.PUNCT_SHIFT;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n.append(e[s]);break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}break;case X.PUNCT:if(r<or.PAL)a=or.PUNCT_CHARS[r];else switch(r){case or.PAL:i=X.ALPHA;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n.append(e[s]);break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}break;case X.ALPHA_SHIFT:if(i=o,r<26)a=String.fromCharCode(65+r);else switch(r){case 26:a=" ";break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}break;case X.PUNCT_SHIFT:if(i=o,r<or.PAL)a=or.PUNCT_CHARS[r];else switch(r){case or.PAL:i=X.ALPHA;break;case or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE:n.append(e[s]);break;case or.TEXT_COMPACTION_MODE_LATCH:i=X.ALPHA}}""!==a&&n.append(a),s++}}static byteCompaction(t,e,r,n,i){let o=new er,s=0,a=0,l=!1;switch(t){case or.BYTE_COMPACTION_MODE_LATCH:let t=new Int32Array(6),r=e[n++];for(;n<e[0]&&!l;)switch(t[s++]=r,a=900*a+r,r=e[n++],r){case or.TEXT_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH:case or.NUMERIC_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH_6:case or.BEGIN_MACRO_PDF417_CONTROL_BLOCK:case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:case or.MACRO_PDF417_TERMINATOR:n--,l=!0;break;default:if(s%5==0&&s>0){for(let t=0;t<6;++t)o.write(Number(ir(a)>>ir(8*(5-t))));a=0,s=0}}n===e[0]&&r<or.TEXT_COMPACTION_MODE_LATCH&&(t[s++]=r);for(let e=0;e<s;e++)o.write(t[e]);break;case or.BYTE_COMPACTION_MODE_LATCH_6:for(;n<e[0]&&!l;){let t=e[n++];if(t<or.TEXT_COMPACTION_MODE_LATCH)s++,a=900*a+t;else switch(t){case or.TEXT_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH:case or.NUMERIC_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH_6:case or.BEGIN_MACRO_PDF417_CONTROL_BLOCK:case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:case or.MACRO_PDF417_TERMINATOR:n--,l=!0}if(s%5==0&&s>0){for(let t=0;t<6;++t)o.write(Number(ir(a)>>ir(8*(5-t))));a=0,s=0}}}return i.append(_.decode(o.toByteArray(),r)),n}static numericCompaction(t,e,r){let n=0,i=!1,o=new Int32Array(or.MAX_NUMERIC_CODEWORDS);for(;e<t[0]&&!i;){let s=t[e++];if(e===t[0]&&(i=!0),s<or.TEXT_COMPACTION_MODE_LATCH)o[n]=s,n++;else switch(s){case or.TEXT_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH:case or.BYTE_COMPACTION_MODE_LATCH_6:case or.BEGIN_MACRO_PDF417_CONTROL_BLOCK:case or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD:case or.MACRO_PDF417_TERMINATOR:e--,i=!0}(n%or.MAX_NUMERIC_CODEWORDS==0||s===or.NUMERIC_COMPACTION_MODE_LATCH||i)&&n>0&&(r.append(or.decodeBase900toBase10(o,n)),n=0)}return e}static decodeBase900toBase10(t,e){let r=ir(0);for(let n=0;n<e;n++)r+=or.EXP900[e-n-1]*ir(t[n]);let n=r.toString();if("1"!==n.charAt(0))throw new E;return n.substring(1)}}or.TEXT_COMPACTION_MODE_LATCH=900,or.BYTE_COMPACTION_MODE_LATCH=901,or.NUMERIC_COMPACTION_MODE_LATCH=902,or.BYTE_COMPACTION_MODE_LATCH_6=924,or.ECI_USER_DEFINED=925,or.ECI_GENERAL_PURPOSE=926,or.ECI_CHARSET=927,or.BEGIN_MACRO_PDF417_CONTROL_BLOCK=928,or.BEGIN_MACRO_PDF417_OPTIONAL_FIELD=923,or.MACRO_PDF417_TERMINATOR=922,or.MODE_SHIFT_TO_BYTE_COMPACTION_MODE=913,or.MAX_NUMERIC_CODEWORDS=15,or.MACRO_PDF417_OPTIONAL_FIELD_FILE_NAME=0,or.MACRO_PDF417_OPTIONAL_FIELD_SEGMENT_COUNT=1,or.MACRO_PDF417_OPTIONAL_FIELD_TIME_STAMP=2,or.MACRO_PDF417_OPTIONAL_FIELD_SENDER=3,or.MACRO_PDF417_OPTIONAL_FIELD_ADDRESSEE=4,or.MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE=5,or.MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM=6,or.PL=25,or.LL=27,or.AS=27,or.ML=28,or.AL=28,or.PS=29,or.PAL=29,or.PUNCT_CHARS=";<>@[\\]_`~!\r\t,:\n-.$/\"|*()?{}'",or.MIXED_CHARS="0123456789&\r\t,:#-.$/+%*=^",or.EXP900=rr()?function(){let t=[];t[0]=ir(1);let e=ir(900);t[1]=e;for(let r=2;r<16;r++)t[r]=t[r-1]*e;return t}():[],or.NUMBER_OF_SEQUENCE_CODEWORDS=2;class sr{constructor(){}static decode(t,e,r,n,i,o,s){let a,l=new Ve(t,e,r,n,i),c=null,h=null;for(let r=!0;;r=!1){if(null!=e&&(c=sr.getRowIndicatorColumn(t,l,e,!0,o,s)),null!=n&&(h=sr.getRowIndicatorColumn(t,l,n,!1,o,s)),a=sr.merge(c,h),null==a)throw D.getNotFoundInstance();let i=a.getBoundingBox();if(!r||null==i||!(i.getMinY()<l.getMinY()||i.getMaxY()>l.getMaxY()))break;l=i}a.setBoundingBox(l);let u=a.getBarcodeColumnCount()+1;a.setDetectionResultColumn(0,c),a.setDetectionResultColumn(u,h);let d=null!=c;for(let e=1;e<=u;e++){let r,n=d?e:u-e;if(void 0!==a.getDetectionResultColumn(n))continue;r=0===n||n===u?new We(l,0===n):new Ye(l),a.setDetectionResultColumn(n,r);let i=-1,c=i;for(let e=l.getMinY();e<=l.getMaxY();e++){if(i=sr.getStartColumn(a,n,e,d),i<0||i>l.getMaxX()){if(-1===c)continue;i=c}let h=sr.detectCodeword(t,l.getMinX(),l.getMaxX(),d,i,e,o,s);null!=h&&(r.setCodeword(e,h),c=i,o=Math.min(o,h.getWidth()),s=Math.max(s,h.getWidth()))}}return sr.createDecoderResult(a)}static merge(t,e){if(null==t&&null==e)return null;let r=sr.getBarcodeMetadata(t,e);if(null==r)return null;let n=Ve.merge(sr.adjustBoundingBox(t),sr.adjustBoundingBox(e));return new je(r,n)}static adjustBoundingBox(t){if(null==t)return null;let e=t.getRowHeights();if(null==e)return null;let r=sr.getMax(e),n=0;for(let t of e)if(n+=r-t,t>0)break;let i=t.getCodewords();for(let t=0;n>0&&null==i[t];t++)n--;let o=0;for(let t=e.length-1;t>=0&&(o+=r-e[t],!(e[t]>0));t--);for(let t=i.length-1;o>0&&null==i[t];t--)o--;return t.getBoundingBox().addMissingRows(n,o,t.isLeft())}static getMax(t){let e=-1;for(let r of t)e=Math.max(e,r);return e}static getBarcodeMetadata(t,e){let r,n;return null==t||null==(r=t.getBarcodeMetadata())?null==e?null:e.getBarcodeMetadata():null==e||null==(n=e.getBarcodeMetadata())?r:r.getColumnCount()!==n.getColumnCount()&&r.getErrorCorrectionLevel()!==n.getErrorCorrectionLevel()&&r.getRowCount()!==n.getRowCount()?null:r}static getRowIndicatorColumn(t,e,r,n,i,o){let s=new We(e,n);for(let a=0;a<2;a++){let l=0===a?1:-1,c=Math.trunc(Math.trunc(r.getX()));for(let a=Math.trunc(Math.trunc(r.getY()));a<=e.getMaxY()&&a>=e.getMinY();a+=l){let e=sr.detectCodeword(t,0,t.getWidth(),n,c,a,i,o);null!=e&&(s.setCodeword(a,e),c=n?e.getStartX():e.getEndX())}}return s}static adjustCodewordCount(t,e){let r=e[0][1],n=r.getValue(),i=t.getBarcodeColumnCount()*t.getBarcodeRowCount()-sr.getNumberOfECCodeWords(t.getBarcodeECLevel());if(0===n.length){if(i<1||i>Pe.MAX_CODEWORDS_IN_BARCODE)throw D.getNotFoundInstance();r.setValue(i)}else n[0]!==i&&r.setValue(i)}static createDecoderResult(t){let e=sr.createBarcodeMatrix(t);sr.adjustCodewordCount(t,e);let r=new Array,n=new Int32Array(t.getBarcodeRowCount()*t.getBarcodeColumnCount()),i=[],o=new Array;for(let s=0;s<t.getBarcodeRowCount();s++)for(let a=0;a<t.getBarcodeColumnCount();a++){let l=e[s][a+1].getValue(),c=s*t.getBarcodeColumnCount()+a;0===l.length?r.push(c):1===l.length?n[c]=l[0]:(o.push(c),i.push(l))}let s=new Array(i.length);for(let t=0;t<s.length;t++)s[t]=i[t];return sr.createDecoderResultFromAmbiguousValues(t.getBarcodeECLevel(),n,Pe.toIntArray(r),Pe.toIntArray(o),s)}static createDecoderResultFromAmbiguousValues(t,e,r,n,i){let o=new Int32Array(n.length),s=100;for(;s-- >0;){for(let t=0;t<o.length;t++)e[n[t]]=i[t][o[t]];try{return sr.decodeCodewords(e,t,r)}catch(t){if(!(t instanceof h))throw t}if(0===o.length)throw h.getChecksumInstance();for(let t=0;t<o.length;t++){if(o[t]<i[t].length-1){o[t]++;break}if(o[t]=0,t===o.length-1)throw h.getChecksumInstance()}}throw h.getChecksumInstance()}static createBarcodeMatrix(t){let e=Array.from({length:t.getBarcodeRowCount()},(()=>new Array(t.getBarcodeColumnCount()+2)));for(let t=0;t<e.length;t++)for(let r=0;r<e[t].length;r++)e[t][r]=new Xe;let r=0;for(let n of t.getDetectionResultColumns()){if(null!=n)for(let t of n.getCodewords())if(null!=t){let n=t.getRowNumber();if(n>=0){if(n>=e.length)continue;e[n][r].setValue(t.getValue())}}r++}return e}static isValidBarcodeColumn(t,e){return e>=0&&e<=t.getBarcodeColumnCount()+1}static getStartColumn(t,e,r,n){let i=n?1:-1,o=null;if(sr.isValidBarcodeColumn(t,e-i)&&(o=t.getDetectionResultColumn(e-i).getCodeword(r)),null!=o)return n?o.getEndX():o.getStartX();if(o=t.getDetectionResultColumn(e).getCodewordNearby(r),null!=o)return n?o.getStartX():o.getEndX();if(sr.isValidBarcodeColumn(t,e-i)&&(o=t.getDetectionResultColumn(e-i).getCodewordNearby(r)),null!=o)return n?o.getEndX():o.getStartX();let s=0;for(;sr.isValidBarcodeColumn(t,e-i);){e-=i;for(let r of t.getDetectionResultColumn(e).getCodewords())if(null!=r)return(n?r.getEndX():r.getStartX())+i*s*(r.getEndX()-r.getStartX());s++}return n?t.getBoundingBox().getMinX():t.getBoundingBox().getMaxX()}static detectCodeword(t,e,r,n,i,o,s,a){i=sr.adjustCodewordStartColumn(t,e,r,n,i,o);let l,c=sr.getModuleBitCount(t,e,r,n,i,o);if(null==c)return null;let h=rt.sum(c);if(n)l=i+h;else{for(let t=0;t<c.length/2;t++){let e=c[t];c[t]=c[c.length-1-t],c[c.length-1-t]=e}l=i,i=l-h}if(!sr.checkCodewordSkew(h,s,a))return null;let u=Qe.getDecodedValue(c),d=Pe.getCodeword(u);return-1===d?null:new Ze(i,l,sr.getCodewordBucketNumber(u),d)}static getModuleBitCount(t,e,r,n,i,o){let s=i,a=new Int32Array(8),l=0,c=n?1:-1,h=n;for(;(n?s<r:s>=e)&&l<a.length;)t.get(s,o)===h?(a[l]++,s+=c):(l++,h=!h);return l===a.length||s===(n?r:e)&&l===a.length-1?a:null}static getNumberOfECCodeWords(t){return 2<<t}static adjustCodewordStartColumn(t,e,r,n,i,o){let s=i,a=n?-1:1;for(let l=0;l<2;l++){for(;(n?s>=e:s<r)&&n===t.get(s,o);){if(Math.abs(i-s)>sr.CODEWORD_SKEW_SIZE)return i;s+=a}a=-a,n=!n}return s}static checkCodewordSkew(t,e,r){return e-sr.CODEWORD_SKEW_SIZE<=t&&t<=r+sr.CODEWORD_SKEW_SIZE}static decodeCodewords(t,e,r){if(0===t.length)throw E.getFormatInstance();let n=1<<e+1,i=sr.correctErrors(t,r,n);sr.verifyCodewordCount(t,n);let o=or.decode(t,""+e);return o.setErrorsCorrected(i),o.setErasures(r.length),o}static correctErrors(t,e,r){if(null!=e&&e.length>r/2+sr.MAX_ERRORS||r<0||r>sr.MAX_EC_CODEWORDS)throw h.getChecksumInstance();return sr.errorCorrection.decode(t,r,e)}static verifyCodewordCount(t,e){if(t.length<4)throw E.getFormatInstance();let r=t[0];if(r>t.length)throw E.getFormatInstance();if(0===r){if(!(e<t.length))throw E.getFormatInstance();t[0]=t.length-e}}static getBitCountForCodeword(t){let e=new Int32Array(8),r=0,n=e.length-1;for(;!((1&t)!==r&&(r=1&t,n--,n<0));)e[n]++,t>>=1;return e}static getCodewordBucketNumber(t){return t instanceof Int32Array?this.getCodewordBucketNumber_Int32Array(t):this.getCodewordBucketNumber_number(t)}static getCodewordBucketNumber_number(t){return sr.getCodewordBucketNumber(sr.getBitCountForCodeword(t))}static getCodewordBucketNumber_Int32Array(t){return(t[0]-t[2]+t[4]-t[6]+9)%9}static toString(t){let e=new Ge;for(let r=0;r<t.length;r++){e.format("Row %2d: ",r);for(let n=0;n<t[r].length;n++){let i=t[r][n];0===i.getValue().length?e.format("        ",null):e.format("%4d(%2d)",i.getValue()[0],i.getConfidence(i.getValue()[0]))}e.format("%n")}return e.toString()}}sr.CODEWORD_SKEW_SIZE=2,sr.MAX_ERRORS=3,sr.MAX_EC_CODEWORDS=512,sr.errorCorrection=new He;class ar{decode(t,e=null){let r=ar.decode(t,e,!1);if(null==r||0===r.length||null==r[0])throw D.getNotFoundInstance();return r[0]}decodeMultiple(t,e=null){try{return ar.decode(t,e,!0)}catch(t){if(t instanceof E||t instanceof h)throw D.getNotFoundInstance();throw t}}static decode(t,e,r){const n=new Array,i=Fe.detectMultiple(t,e,r);for(const t of i.getPoints()){const e=sr.decode(i.getBits(),t[4],t[5],t[6],t[7],ar.getMinCodewordWidth(t),ar.getMaxCodewordWidth(t)),r=new x(e.getText(),e.getRawBytes(),void 0,t,U.PDF_417);r.putMetadata(W.ERROR_CORRECTION_LEVEL,e.getECLevel());const o=e.getOther();null!=o&&r.putMetadata(W.PDF417_EXTRA_METADATA,o),n.push(r)}return n.map((t=>t))}static getMaxWidth(t,e){return null==t||null==e?0:Math.trunc(Math.abs(t.getX()-e.getX()))}static getMinWidth(t,e){return null==t||null==e?m.MAX_VALUE:Math.trunc(Math.abs(t.getX()-e.getX()))}static getMaxCodewordWidth(t){return Math.floor(Math.max(Math.max(ar.getMaxWidth(t[0],t[4]),ar.getMaxWidth(t[6],t[2])*Pe.MODULES_IN_CODEWORD/Pe.MODULES_IN_STOP_PATTERN),Math.max(ar.getMaxWidth(t[1],t[5]),ar.getMaxWidth(t[7],t[3])*Pe.MODULES_IN_CODEWORD/Pe.MODULES_IN_STOP_PATTERN)))}static getMinCodewordWidth(t){return Math.floor(Math.min(Math.min(ar.getMinWidth(t[0],t[4]),ar.getMinWidth(t[6],t[2])*Pe.MODULES_IN_CODEWORD/Pe.MODULES_IN_STOP_PATTERN),Math.min(ar.getMinWidth(t[1],t[5]),ar.getMinWidth(t[7],t[3])*Pe.MODULES_IN_CODEWORD/Pe.MODULES_IN_STOP_PATTERN)))}reset(){}}class lr extends s{}lr.kind="ReaderException";class cr{constructor(t,e){this.verbose=!0===t,e&&this.setHints(e)}decode(t,e){return e&&this.setHints(e),this.decodeInternal(t)}decodeWithState(t){return null!==this.readers&&void 0!==this.readers||this.setHints(null),this.decodeInternal(t)}setHints(t){this.hints=t;const r=!e(t)&&!0===t.get(C.TRY_HARDER),n=e(t)?null:t.get(C.POSSIBLE_FORMATS),i=new Array;if(!e(n)){const e=n.some((t=>t===U.UPC_A||t===U.UPC_E||t===U.EAN_13||t===U.EAN_8||t===U.CODABAR||t===U.CODE_39||t===U.CODE_93||t===U.CODE_128||t===U.ITF||t===U.RSS_14||t===U.RSS_EXPANDED));e&&!r&&i.push(new ie(t,this.verbose)),n.includes(U.QR_CODE)&&i.push(new Le),n.includes(U.DATA_MATRIX)&&i.push(new ge),n.includes(U.AZTEC)&&i.push(new gt),n.includes(U.PDF_417)&&i.push(new ar),e&&r&&i.push(new ie(t,this.verbose))}0===i.length&&(r||i.push(new ie(t,this.verbose)),i.push(new Le),i.push(new ge),i.push(new gt),i.push(new ar),r&&i.push(new ie(t,this.verbose))),this.readers=i}reset(){if(null!==this.readers)for(const t of this.readers)t.reset()}decodeInternal(t){if(null===this.readers)throw new lr("No readers where selected, nothing can be read.");for(const e of this.readers)try{return e.decode(t,this.hints)}catch(t){if(t instanceof lr)continue}throw new D("No MultiFormat Readers were able to detect the code.")}}var hr;!function(t){t[t.ERROR_CORRECTION=0]="ERROR_CORRECTION",t[t.CHARACTER_SET=1]="CHARACTER_SET",t[t.DATA_MATRIX_SHAPE=2]="DATA_MATRIX_SHAPE",t[t.MIN_SIZE=3]="MIN_SIZE",t[t.MAX_SIZE=4]="MAX_SIZE",t[t.MARGIN=5]="MARGIN",t[t.PDF417_COMPACT=6]="PDF417_COMPACT",t[t.PDF417_COMPACTION=7]="PDF417_COMPACTION",t[t.PDF417_DIMENSIONS=8]="PDF417_DIMENSIONS",t[t.AZTEC_LAYERS=9]="AZTEC_LAYERS",t[t.QR_VERSION=10]="QR_VERSION"}(hr||(hr={}));var ur=hr;class dr{constructor(t){this.field=t,this.cachedGenerators=[],this.cachedGenerators.push(new Q(t,Int32Array.from([1])))}buildGenerator(t){const e=this.cachedGenerators;if(t>=e.length){let r=e[e.length-1];const n=this.field;for(let i=e.length;i<=t;i++){const t=r.multiply(new Q(n,Int32Array.from([1,n.exp(i-1+n.getGeneratorBase())])));e.push(t),r=t}}return e[t]}encode(t,e){if(0===e)throw new l("No error correction bytes");const r=t.length-e;if(r<=0)throw new l("No data bytes provided");const n=this.buildGenerator(e),i=new Int32Array(r);d.arraycopy(t,0,i,0,r);let o=new Q(this.field,i);o=o.multiplyByMonomial(e,1);const s=o.divide(n)[1].getCoefficients(),a=e-s.length;for(let e=0;e<a;e++)t[r+e]=0;d.arraycopy(s,0,t,r+a,s.length)}}class fr{constructor(){}static applyMaskPenaltyRule1(t){return fr.applyMaskPenaltyRule1Internal(t,!0)+fr.applyMaskPenaltyRule1Internal(t,!1)}static applyMaskPenaltyRule2(t){let e=0;const r=t.getArray(),n=t.getWidth(),i=t.getHeight();for(let t=0;t<i-1;t++){const i=r[t];for(let o=0;o<n-1;o++){const n=i[o];n===i[o+1]&&n===r[t+1][o]&&n===r[t+1][o+1]&&e++}}return fr.N2*e}static applyMaskPenaltyRule3(t){let e=0;const r=t.getArray(),n=t.getWidth(),i=t.getHeight();for(let t=0;t<i;t++)for(let o=0;o<n;o++){const s=r[t];o+6<n&&1===s[o]&&0===s[o+1]&&1===s[o+2]&&1===s[o+3]&&1===s[o+4]&&0===s[o+5]&&1===s[o+6]&&(fr.isWhiteHorizontal(s,o-4,o)||fr.isWhiteHorizontal(s,o+7,o+11))&&e++,t+6<i&&1===r[t][o]&&0===r[t+1][o]&&1===r[t+2][o]&&1===r[t+3][o]&&1===r[t+4][o]&&0===r[t+5][o]&&1===r[t+6][o]&&(fr.isWhiteVertical(r,o,t-4,t)||fr.isWhiteVertical(r,o,t+7,t+11))&&e++}return e*fr.N3}static isWhiteHorizontal(t,e,r){e=Math.max(e,0),r=Math.min(r,t.length);for(let n=e;n<r;n++)if(1===t[n])return!1;return!0}static isWhiteVertical(t,e,r,n){r=Math.max(r,0),n=Math.min(n,t.length);for(let i=r;i<n;i++)if(1===t[i][e])return!1;return!0}static applyMaskPenaltyRule4(t){let e=0;const r=t.getArray(),n=t.getWidth(),i=t.getHeight();for(let t=0;t<i;t++){const i=r[t];for(let t=0;t<n;t++)1===i[t]&&e++}const o=t.getHeight()*t.getWidth();return Math.floor(10*Math.abs(2*e-o)/o)*fr.N4}static getDataMaskBit(t,e,r){let n,i;switch(t){case 0:n=r+e&1;break;case 1:n=1&r;break;case 2:n=e%3;break;case 3:n=(r+e)%3;break;case 4:n=Math.floor(r/2)+Math.floor(e/3)&1;break;case 5:i=r*e,n=(1&i)+i%3;break;case 6:i=r*e,n=(1&i)+i%3&1;break;case 7:i=r*e,n=i%3+(r+e&1)&1;break;default:throw new l("Invalid mask pattern: "+t)}return 0===n}static applyMaskPenaltyRule1Internal(t,e){let r=0;const n=e?t.getHeight():t.getWidth(),i=e?t.getWidth():t.getHeight(),o=t.getArray();for(let t=0;t<n;t++){let n=0,s=-1;for(let a=0;a<i;a++){const i=e?o[t][a]:o[a][t];i===s?n++:(n>=5&&(r+=fr.N1+(n-5)),n=1,s=i)}n>=5&&(r+=fr.N1+(n-5))}return r}}fr.N1=3,fr.N2=3,fr.N3=40,fr.N4=10;class gr{constructor(t,e){this.width=t,this.height=e;const r=new Array(e);for(let n=0;n!==e;n++)r[n]=new Uint8Array(t);this.bytes=r}getHeight(){return this.height}getWidth(){return this.width}get(t,e){return this.bytes[e][t]}getArray(){return this.bytes}setNumber(t,e,r){this.bytes[e][t]=r}setBoolean(t,e,r){this.bytes[e][t]=r?1:0}clear(t){for(const e of this.bytes)w.fill(e,t)}equals(t){if(!(t instanceof gr))return!1;const e=t;if(this.width!==e.width)return!1;if(this.height!==e.height)return!1;for(let t=0,r=this.height;t<r;++t){const r=this.bytes[t],n=e.bytes[t];for(let t=0,e=this.width;t<e;++t)if(r[t]!==n[t])return!1}return!0}toString(){const t=new y;for(let e=0,r=this.height;e<r;++e){const r=this.bytes[e];for(let e=0,n=this.width;e<n;++e)switch(r[e]){case 0:t.append(" 0");break;case 1:t.append(" 1");break;default:t.append("  ")}t.append("\n")}return t.toString()}}class wr{constructor(){this.maskPattern=-1}getMode(){return this.mode}getECLevel(){return this.ecLevel}getVersion(){return this.version}getMaskPattern(){return this.maskPattern}getMatrix(){return this.matrix}toString(){const t=new y;return t.append("<<\n"),t.append(" mode: "),t.append(this.mode?this.mode.toString():"null"),t.append("\n ecLevel: "),t.append(this.ecLevel?this.ecLevel.toString():"null"),t.append("\n version: "),t.append(this.version?this.version.toString():"null"),t.append("\n maskPattern: "),t.append(this.maskPattern.toString()),this.matrix?(t.append("\n matrix:\n"),t.append(this.matrix.toString())):t.append("\n matrix: null\n"),t.append(">>\n"),t.toString()}setMode(t){this.mode=t}setECLevel(t){this.ecLevel=t}setVersion(t){this.version=t}setMaskPattern(t){this.maskPattern=t}setMatrix(t){this.matrix=t}static isValidMaskPattern(t){return t>=0&&t<wr.NUM_MASK_PATTERNS}}wr.NUM_MASK_PATTERNS=8;class mr extends s{}mr.kind="WriterException";class pr{constructor(){}static clearMatrix(t){t.clear(255)}static buildMatrix(t,e,r,n,i){pr.clearMatrix(i),pr.embedBasicPatterns(r,i),pr.embedTypeInfo(e,n,i),pr.maybeEmbedVersionInfo(r,i),pr.embedDataBits(t,n,i)}static embedBasicPatterns(t,e){pr.embedPositionDetectionPatternsAndSeparators(e),pr.embedDarkDotAtLeftBottomCorner(e),pr.maybeEmbedPositionAdjustmentPatterns(t,e),pr.embedTimingPatterns(e)}static embedTypeInfo(t,e,r){const n=new p;pr.makeTypeInfoBits(t,e,n);for(let t=0,e=n.getSize();t<e;++t){const e=n.get(n.getSize()-1-t),i=pr.TYPE_INFO_COORDINATES[t],o=i[0],s=i[1];if(r.setBoolean(o,s,e),t<8){const n=r.getWidth()-t-1,i=8;r.setBoolean(n,i,e)}else{const n=8,i=r.getHeight()-7+(t-8);r.setBoolean(n,i,e)}}}static maybeEmbedVersionInfo(t,e){if(t.getVersionNumber()<7)return;const r=new p;pr.makeVersionInfoBits(t,r);let n=17;for(let t=0;t<6;++t)for(let i=0;i<3;++i){const o=r.get(n);n--,e.setBoolean(t,e.getHeight()-11+i,o),e.setBoolean(e.getHeight()-11+i,t,o)}}static embedDataBits(t,e,r){let n=0,i=-1,o=r.getWidth()-1,s=r.getHeight()-1;for(;o>0;){for(6===o&&(o-=1);s>=0&&s<r.getHeight();){for(let i=0;i<2;++i){const a=o-i;if(!pr.isEmpty(r.get(a,s)))continue;let l;n<t.getSize()?(l=t.get(n),++n):l=!1,255!==e&&fr.getDataMaskBit(e,a,s)&&(l=!l),r.setBoolean(a,s,l)}s+=i}i=-i,s+=i,o-=2}if(n!==t.getSize())throw new mr("Not all bits consumed: "+n+"/"+t.getSize())}static findMSBSet(t){return 32-m.numberOfLeadingZeros(t)}static calculateBCHCode(t,e){if(0===e)throw new l("0 polynomial");const r=pr.findMSBSet(e);for(t<<=r-1;pr.findMSBSet(t)>=r;)t^=e<<pr.findMSBSet(t)-r;return t}static makeTypeInfoBits(t,e,r){if(!wr.isValidMaskPattern(e))throw new mr("Invalid mask pattern");const n=t.getBits()<<3|e;r.appendBits(n,5);const i=pr.calculateBCHCode(n,pr.TYPE_INFO_POLY);r.appendBits(i,10);const o=new p;if(o.appendBits(pr.TYPE_INFO_MASK_PATTERN,15),r.xor(o),15!==r.getSize())throw new mr("should not happen but we got: "+r.getSize())}static makeVersionInfoBits(t,e){e.appendBits(t.getVersionNumber(),6);const r=pr.calculateBCHCode(t.getVersionNumber(),pr.VERSION_INFO_POLY);if(e.appendBits(r,12),18!==e.getSize())throw new mr("should not happen but we got: "+e.getSize())}static isEmpty(t){return 255===t}static embedTimingPatterns(t){for(let e=8;e<t.getWidth()-8;++e){const r=(e+1)%2;pr.isEmpty(t.get(e,6))&&t.setNumber(e,6,r),pr.isEmpty(t.get(6,e))&&t.setNumber(6,e,r)}}static embedDarkDotAtLeftBottomCorner(t){if(0===t.get(8,t.getHeight()-8))throw new mr;t.setNumber(8,t.getHeight()-8,1)}static embedHorizontalSeparationPattern(t,e,r){for(let n=0;n<8;++n){if(!pr.isEmpty(r.get(t+n,e)))throw new mr;r.setNumber(t+n,e,0)}}static embedVerticalSeparationPattern(t,e,r){for(let n=0;n<7;++n){if(!pr.isEmpty(r.get(t,e+n)))throw new mr;r.setNumber(t,e+n,0)}}static embedPositionAdjustmentPattern(t,e,r){for(let n=0;n<5;++n){const i=pr.POSITION_ADJUSTMENT_PATTERN[n];for(let o=0;o<5;++o)r.setNumber(t+o,e+n,i[o])}}static embedPositionDetectionPattern(t,e,r){for(let n=0;n<7;++n){const i=pr.POSITION_DETECTION_PATTERN[n];for(let o=0;o<7;++o)r.setNumber(t+o,e+n,i[o])}}static embedPositionDetectionPatternsAndSeparators(t){const e=pr.POSITION_DETECTION_PATTERN[0].length;pr.embedPositionDetectionPattern(0,0,t),pr.embedPositionDetectionPattern(t.getWidth()-e,0,t),pr.embedPositionDetectionPattern(0,t.getWidth()-e,t);pr.embedHorizontalSeparationPattern(0,7,t),pr.embedHorizontalSeparationPattern(t.getWidth()-8,7,t),pr.embedHorizontalSeparationPattern(0,t.getWidth()-8,t);pr.embedVerticalSeparationPattern(7,0,t),pr.embedVerticalSeparationPattern(t.getHeight()-7-1,0,t),pr.embedVerticalSeparationPattern(7,t.getHeight()-7,t)}static maybeEmbedPositionAdjustmentPatterns(t,e){if(t.getVersionNumber()<2)return;const r=t.getVersionNumber()-1,n=pr.POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[r];for(let t=0,r=n.length;t!==r;t++){const i=n[t];if(i>=0)for(let t=0;t!==r;t++){const r=n[t];r>=0&&pr.isEmpty(e.get(r,i))&&pr.embedPositionAdjustmentPattern(r-2,i-2,e)}}}}pr.POSITION_DETECTION_PATTERN=Array.from([Int32Array.from([1,1,1,1,1,1,1]),Int32Array.from([1,0,0,0,0,0,1]),Int32Array.from([1,0,1,1,1,0,1]),Int32Array.from([1,0,1,1,1,0,1]),Int32Array.from([1,0,1,1,1,0,1]),Int32Array.from([1,0,0,0,0,0,1]),Int32Array.from([1,1,1,1,1,1,1])]),pr.POSITION_ADJUSTMENT_PATTERN=Array.from([Int32Array.from([1,1,1,1,1]),Int32Array.from([1,0,0,0,1]),Int32Array.from([1,0,1,0,1]),Int32Array.from([1,0,0,0,1]),Int32Array.from([1,1,1,1,1])]),pr.POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE=Array.from([Int32Array.from([-1,-1,-1,-1,-1,-1,-1]),Int32Array.from([6,18,-1,-1,-1,-1,-1]),Int32Array.from([6,22,-1,-1,-1,-1,-1]),Int32Array.from([6,26,-1,-1,-1,-1,-1]),Int32Array.from([6,30,-1,-1,-1,-1,-1]),Int32Array.from([6,34,-1,-1,-1,-1,-1]),Int32Array.from([6,22,38,-1,-1,-1,-1]),Int32Array.from([6,24,42,-1,-1,-1,-1]),Int32Array.from([6,26,46,-1,-1,-1,-1]),Int32Array.from([6,28,50,-1,-1,-1,-1]),Int32Array.from([6,30,54,-1,-1,-1,-1]),Int32Array.from([6,32,58,-1,-1,-1,-1]),Int32Array.from([6,34,62,-1,-1,-1,-1]),Int32Array.from([6,26,46,66,-1,-1,-1]),Int32Array.from([6,26,48,70,-1,-1,-1]),Int32Array.from([6,26,50,74,-1,-1,-1]),Int32Array.from([6,30,54,78,-1,-1,-1]),Int32Array.from([6,30,56,82,-1,-1,-1]),Int32Array.from([6,30,58,86,-1,-1,-1]),Int32Array.from([6,34,62,90,-1,-1,-1]),Int32Array.from([6,28,50,72,94,-1,-1]),Int32Array.from([6,26,50,74,98,-1,-1]),Int32Array.from([6,30,54,78,102,-1,-1]),Int32Array.from([6,28,54,80,106,-1,-1]),Int32Array.from([6,32,58,84,110,-1,-1]),Int32Array.from([6,30,58,86,114,-1,-1]),Int32Array.from([6,34,62,90,118,-1,-1]),Int32Array.from([6,26,50,74,98,122,-1]),Int32Array.from([6,30,54,78,102,126,-1]),Int32Array.from([6,26,52,78,104,130,-1]),Int32Array.from([6,30,56,82,108,134,-1]),Int32Array.from([6,34,60,86,112,138,-1]),Int32Array.from([6,30,58,86,114,142,-1]),Int32Array.from([6,34,62,90,118,146,-1]),Int32Array.from([6,30,54,78,102,126,150]),Int32Array.from([6,24,50,76,102,128,154]),Int32Array.from([6,28,54,80,106,132,158]),Int32Array.from([6,32,58,84,110,136,162]),Int32Array.from([6,26,54,82,110,138,166]),Int32Array.from([6,30,58,86,114,142,170])]),pr.TYPE_INFO_COORDINATES=Array.from([Int32Array.from([8,0]),Int32Array.from([8,1]),Int32Array.from([8,2]),Int32Array.from([8,3]),Int32Array.from([8,4]),Int32Array.from([8,5]),Int32Array.from([8,7]),Int32Array.from([8,8]),Int32Array.from([7,8]),Int32Array.from([5,8]),Int32Array.from([4,8]),Int32Array.from([3,8]),Int32Array.from([2,8]),Int32Array.from([1,8]),Int32Array.from([0,8])]),pr.VERSION_INFO_POLY=7973,pr.TYPE_INFO_POLY=1335,pr.TYPE_INFO_MASK_PATTERN=21522;class Ar{constructor(t,e){this.dataBytes=t,this.errorCorrectionBytes=e}getDataBytes(){return this.dataBytes}getErrorCorrectionBytes(){return this.errorCorrectionBytes}}class Cr{constructor(){}static calculateMaskPenalty(t){return fr.applyMaskPenaltyRule1(t)+fr.applyMaskPenaltyRule2(t)+fr.applyMaskPenaltyRule3(t)+fr.applyMaskPenaltyRule4(t)}static encode(t,e,r=null){let n=Cr.DEFAULT_BYTE_MODE_ENCODING;const i=null!==r&&void 0!==r.get(ur.CHARACTER_SET);i&&(n=r.get(ur.CHARACTER_SET).toString());const o=this.chooseMode(t,n),s=new p;if(o===_e.BYTE&&(i||Cr.DEFAULT_BYTE_MODE_ENCODING!==n)){const t=I.getCharacterSetECIByName(n);void 0!==t&&this.appendECI(t,s)}this.appendModeInfo(o,s);const a=new p;let l;if(this.appendBytes(t,o,a,n),null!==r&&void 0!==r.get(ur.QR_VERSION)){const t=Number.parseInt(r.get(ur.QR_VERSION).toString(),10);l=Ce.getVersionForNumber(t);const n=this.calculateBitsNeeded(o,s,a,l);if(!this.willFit(n,l,e))throw new mr("Data too big for requested version")}else l=this.recommendVersion(e,o,s,a);const c=new p;c.appendBitArray(s);const h=o===_e.BYTE?a.getSizeInBytes():t.length;this.appendLengthInfo(h,l,o,c),c.appendBitArray(a);const u=l.getECBlocksForLevel(e),d=l.getTotalCodewords()-u.getTotalECCodewords();this.terminateBits(d,c);const f=this.interleaveWithECBytes(c,l.getTotalCodewords(),d,u.getNumBlocks()),g=new wr;g.setECLevel(e),g.setMode(o),g.setVersion(l);const w=l.getDimensionForVersion(),m=new gr(w,w),A=this.chooseMaskPattern(f,e,l,m);return g.setMaskPattern(A),pr.buildMatrix(f,e,l,A,m),g.setMatrix(m),g}static recommendVersion(t,e,r,n){const i=this.calculateBitsNeeded(e,r,n,Ce.getVersionForNumber(1)),o=this.chooseVersion(i,t),s=this.calculateBitsNeeded(e,r,n,o);return this.chooseVersion(s,t)}static calculateBitsNeeded(t,e,r,n){return e.getSize()+t.getCharacterCountBits(n)+r.getSize()}static getAlphanumericCode(t){return t<Cr.ALPHANUMERIC_TABLE.length?Cr.ALPHANUMERIC_TABLE[t]:-1}static chooseMode(t,e=null){if(I.SJIS.getName()===e&&this.isOnlyDoubleByteKanji(t))return _e.KANJI;let r=!1,n=!1;for(let e=0,i=t.length;e<i;++e){const i=t.charAt(e);if(Cr.isDigit(i))r=!0;else{if(-1===this.getAlphanumericCode(i.charCodeAt(0)))return _e.BYTE;n=!0}}return n?_e.ALPHANUMERIC:r?_e.NUMERIC:_e.BYTE}static isOnlyDoubleByteKanji(t){let e;try{e=_.encode(t,I.SJIS)}catch(t){return!1}const r=e.length;if(r%2!=0)return!1;for(let t=0;t<r;t+=2){const r=255&e[t];if((r<129||r>159)&&(r<224||r>235))return!1}return!0}static chooseMaskPattern(t,e,r,n){let i=Number.MAX_SAFE_INTEGER,o=-1;for(let s=0;s<wr.NUM_MASK_PATTERNS;s++){pr.buildMatrix(t,e,r,s,n);let a=this.calculateMaskPenalty(n);a<i&&(i=a,o=s)}return o}static chooseVersion(t,e){for(let r=1;r<=40;r++){const n=Ce.getVersionForNumber(r);if(Cr.willFit(t,n,e))return n}throw new mr("Data too big")}static willFit(t,e,r){return e.getTotalCodewords()-e.getECBlocksForLevel(r).getTotalECCodewords()>=(t+7)/8}static terminateBits(t,e){const r=8*t;if(e.getSize()>r)throw new mr("data bits cannot fit in the QR Code"+e.getSize()+" > "+r);for(let t=0;t<4&&e.getSize()<r;++t)e.appendBit(!1);const n=7&e.getSize();if(n>0)for(let t=n;t<8;t++)e.appendBit(!1);const i=t-e.getSizeInBytes();for(let t=0;t<i;++t)e.appendBits(0==(1&t)?236:17,8);if(e.getSize()!==r)throw new mr("Bits size does not equal capacity")}static getNumDataBytesAndNumECBytesForBlockID(t,e,r,n,i,o){if(n>=r)throw new mr("Block ID too large");const s=t%r,a=r-s,l=Math.floor(t/r),c=l+1,h=Math.floor(e/r),u=h+1,d=l-h,f=c-u;if(d!==f)throw new mr("EC bytes mismatch");if(r!==a+s)throw new mr("RS blocks mismatch");if(t!==(h+d)*a+(u+f)*s)throw new mr("Total bytes mismatch");n<a?(i[0]=h,o[0]=d):(i[0]=u,o[0]=f)}static interleaveWithECBytes(t,e,r,n){if(t.getSizeInBytes()!==r)throw new mr("Number of bits and data bytes does not match");let i=0,o=0,s=0;const a=new Array;for(let l=0;l<n;++l){const c=new Int32Array(1),h=new Int32Array(1);Cr.getNumDataBytesAndNumECBytesForBlockID(e,r,n,l,c,h);const u=c[0],d=new Uint8Array(u);t.toBytes(8*i,d,0,u);const f=Cr.generateECBytes(d,h[0]);a.push(new Ar(d,f)),o=Math.max(o,u),s=Math.max(s,f.length),i+=c[0]}if(r!==i)throw new mr("Data bytes does not match offset");const l=new p;for(let t=0;t<o;++t)for(const e of a){const r=e.getDataBytes();t<r.length&&l.appendBits(r[t],8)}for(let t=0;t<s;++t)for(const e of a){const r=e.getErrorCorrectionBytes();t<r.length&&l.appendBits(r[t],8)}if(e!==l.getSizeInBytes())throw new mr("Interleaving error: "+e+" and "+l.getSizeInBytes()+" differ.");return l}static generateECBytes(t,e){const r=t.length,n=new Int32Array(r+e);for(let e=0;e<r;e++)n[e]=255&t[e];new dr(q.QR_CODE_FIELD_256).encode(n,e);const i=new Uint8Array(e);for(let t=0;t<e;t++)i[t]=n[r+t];return i}static appendModeInfo(t,e){e.appendBits(t.getBits(),4)}static appendLengthInfo(t,e,r,n){const i=r.getCharacterCountBits(e);if(t>=1<<i)throw new mr(t+" is bigger than "+((1<<i)-1));n.appendBits(t,i)}static appendBytes(t,e,r,n){switch(e){case _e.NUMERIC:Cr.appendNumericBytes(t,r);break;case _e.ALPHANUMERIC:Cr.appendAlphanumericBytes(t,r);break;case _e.BYTE:Cr.append8BitBytes(t,r,n);break;case _e.KANJI:Cr.appendKanjiBytes(t,r);break;default:throw new mr("Invalid mode: "+e)}}static getDigit(t){return t.charCodeAt(0)-48}static isDigit(t){const e=Cr.getDigit(t);return e>=0&&e<=9}static appendNumericBytes(t,e){const r=t.length;let n=0;for(;n<r;){const i=Cr.getDigit(t.charAt(n));if(n+2<r){const r=Cr.getDigit(t.charAt(n+1)),o=Cr.getDigit(t.charAt(n+2));e.appendBits(100*i+10*r+o,10),n+=3}else if(n+1<r){const r=Cr.getDigit(t.charAt(n+1));e.appendBits(10*i+r,7),n+=2}else e.appendBits(i,4),n++}}static appendAlphanumericBytes(t,e){const r=t.length;let n=0;for(;n<r;){const i=Cr.getAlphanumericCode(t.charCodeAt(n));if(-1===i)throw new mr;if(n+1<r){const r=Cr.getAlphanumericCode(t.charCodeAt(n+1));if(-1===r)throw new mr;e.appendBits(45*i+r,11),n+=2}else e.appendBits(i,6),n++}}static append8BitBytes(t,e,r){let n;try{n=_.encode(t,r)}catch(t){throw new mr(t)}for(let t=0,r=n.length;t!==r;t++){const r=n[t];e.appendBits(r,8)}}static appendKanjiBytes(t,e){let r;try{r=_.encode(t,I.SJIS)}catch(t){throw new mr(t)}const n=r.length;for(let t=0;t<n;t+=2){const n=(255&r[t])<<8&4294967295|255&r[t+1];let i=-1;if(n>=33088&&n<=40956?i=n-33088:n>=57408&&n<=60351&&(i=n-49472),-1===i)throw new mr("Invalid byte sequence");const o=192*(i>>8)+(255&i);e.appendBits(o,13)}}static appendECI(t,e){e.appendBits(_e.ECI.getBits(),4),e.appendBits(t.getValue(),8)}}Cr.ALPHANUMERIC_TABLE=Int32Array.from([-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,36,-1,-1,-1,37,38,-1,-1,-1,-1,39,40,-1,41,42,43,0,1,2,3,4,5,6,7,8,9,44,-1,-1,-1,-1,-1,-1,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,-1,-1,-1,-1,-1]),Cr.DEFAULT_BYTE_MODE_ENCODING=I.UTF8.getName();class Er{write(t,e,r,n=null){if(0===t.length)throw new l("Found empty contents");if(e<0||r<0)throw new l("Requested dimensions are too small: "+e+"x"+r);let i=we.L,o=Er.QUIET_ZONE_SIZE;null!==n&&(void 0!==n.get(ur.ERROR_CORRECTION)&&(i=we.fromString(n.get(ur.ERROR_CORRECTION).toString())),void 0!==n.get(ur.MARGIN)&&(o=Number.parseInt(n.get(ur.MARGIN).toString(),10)));const s=Cr.encode(t,i,n);return this.renderResult(s,e,r,o)}writeToDom(t,e,r,n,i=null){"string"==typeof t&&(t=document.querySelector(t));const o=this.write(e,r,n,i);t&&t.appendChild(o)}renderResult(t,e,r,n){const i=t.getMatrix();if(null===i)throw new $;const o=i.getWidth(),s=i.getHeight(),a=o+2*n,l=s+2*n,c=Math.max(e,a),h=Math.max(r,l),u=Math.min(Math.floor(c/a),Math.floor(h/l)),d=Math.floor((c-o*u)/2),f=Math.floor((h-s*u)/2),g=this.createSVGElement(c,h);for(let t=0,e=f;t<s;t++,e+=u)for(let r=0,n=d;r<o;r++,n+=u)if(1===i.get(r,t)){const t=this.createSvgRectElement(n,e,u,u);g.appendChild(t)}return g}createSVGElement(t,e){const r=document.createElementNS(Er.SVG_NS,"svg");return r.setAttributeNS(null,"height",t.toString()),r.setAttributeNS(null,"width",e.toString()),r}createSvgRectElement(t,e,r,n){const i=document.createElementNS(Er.SVG_NS,"rect");return i.setAttributeNS(null,"x",t.toString()),i.setAttributeNS(null,"y",e.toString()),i.setAttributeNS(null,"height",r.toString()),i.setAttributeNS(null,"width",n.toString()),i.setAttributeNS(null,"fill","#000000"),i}}Er.QUIET_ZONE_SIZE=4,Er.SVG_NS="http://www.w3.org/2000/svg";class Ir{encode(t,e,r,n,i){if(0===t.length)throw new l("Found empty contents");if(e!==U.QR_CODE)throw new l("Can only encode QR_CODE, but got "+e);if(r<0||n<0)throw new l(`Requested dimensions are too small: ${r}x${n}`);let o=we.L,s=Ir.QUIET_ZONE_SIZE;null!==i&&(void 0!==i.get(ur.ERROR_CORRECTION)&&(o=we.fromString(i.get(ur.ERROR_CORRECTION).toString())),void 0!==i.get(ur.MARGIN)&&(s=Number.parseInt(i.get(ur.MARGIN).toString(),10)));const a=Cr.encode(t,o,i);return Ir.renderResult(a,r,n,s)}static renderResult(t,e,r,n){const i=t.getMatrix();if(null===i)throw new $;const o=i.getWidth(),s=i.getHeight(),a=o+2*n,l=s+2*n,c=Math.max(e,a),h=Math.max(r,l),u=Math.min(Math.floor(c/a),Math.floor(h/l)),d=Math.floor((c-o*u)/2),f=Math.floor((h-s*u)/2),g=new N(c,h);for(let t=0,e=f;t<s;t++,e+=u)for(let r=0,n=d;r<o;r++,n+=u)1===i.get(r,t)&&g.setRegion(n,e,u,u);return g}}Ir.QUIET_ZONE_SIZE=4;class Sr extends O{constructor(t,e,r,n,i,o,s,a){if(super(o,s),this.yuvData=t,this.dataWidth=e,this.dataHeight=r,this.left=n,this.top=i,n+o>e||i+s>r)throw new l("Crop rectangle does not fit within image data.");a&&this.reverseHorizontal(o,s)}getRow(t,e){if(t<0||t>=this.getHeight())throw new l("Requested row is outside the image: "+t);const r=this.getWidth();(null==e||e.length<r)&&(e=new Uint8ClampedArray(r));const n=(t+this.top)*this.dataWidth+this.left;return d.arraycopy(this.yuvData,n,e,0,r),e}getMatrix(){const t=this.getWidth(),e=this.getHeight();if(t===this.dataWidth&&e===this.dataHeight)return this.yuvData;const r=t*e,n=new Uint8ClampedArray(r);let i=this.top*this.dataWidth+this.left;if(t===this.dataWidth)return d.arraycopy(this.yuvData,i,n,0,r),n;for(let r=0;r<e;r++){const e=r*t;d.arraycopy(this.yuvData,i,n,e,t),i+=this.dataWidth}return n}isCropSupported(){return!0}crop(t,e,r,n){return new Sr(this.yuvData,this.dataWidth,this.dataHeight,this.left+t,this.top+e,r,n,!1)}renderThumbnail(){const t=this.getWidth()/Sr.THUMBNAIL_SCALE_FACTOR,e=this.getHeight()/Sr.THUMBNAIL_SCALE_FACTOR,r=new Int32Array(t*e),n=this.yuvData;let i=this.top*this.dataWidth+this.left;for(let o=0;o<e;o++){const e=o*t;for(let o=0;o<t;o++){const t=255&n[i+o*Sr.THUMBNAIL_SCALE_FACTOR];r[e+o]=4278190080|65793*t}i+=this.dataWidth*Sr.THUMBNAIL_SCALE_FACTOR}return r}getThumbnailWidth(){return this.getWidth()/Sr.THUMBNAIL_SCALE_FACTOR}getThumbnailHeight(){return this.getHeight()/Sr.THUMBNAIL_SCALE_FACTOR}reverseHorizontal(t,e){const r=this.yuvData;for(let n=0,i=this.top*this.dataWidth+this.left;n<e;n++,i+=this.dataWidth){const e=i+t/2;for(let n=i,o=i+t-1;n<e;n++,o--){const t=r[n];r[n]=r[o],r[o]=t}}}invert(){return new b(this)}}Sr.THUMBNAIL_SCALE_FACTOR=2;class _r extends O{constructor(t,e,r,n,i,o,s){if(super(e,r),this.dataWidth=n,this.dataHeight=i,this.left=o,this.top=s,4===t.BYTES_PER_ELEMENT){const n=e*r,i=new Uint8ClampedArray(n);for(let e=0;e<n;e++){const r=t[e],n=r>>16&255,o=r>>7&510,s=255&r;i[e]=(n+o+s)/4&255}this.luminances=i}else this.luminances=t;if(void 0===n&&(this.dataWidth=e),void 0===i&&(this.dataHeight=r),void 0===o&&(this.left=0),void 0===s&&(this.top=0),this.left+e>this.dataWidth||this.top+r>this.dataHeight)throw new l("Crop rectangle does not fit within image data.")}getRow(t,e){if(t<0||t>=this.getHeight())throw new l("Requested row is outside the image: "+t);const r=this.getWidth();(null==e||e.length<r)&&(e=new Uint8ClampedArray(r));const n=(t+this.top)*this.dataWidth+this.left;return d.arraycopy(this.luminances,n,e,0,r),e}getMatrix(){const t=this.getWidth(),e=this.getHeight();if(t===this.dataWidth&&e===this.dataHeight)return this.luminances;const r=t*e,n=new Uint8ClampedArray(r);let i=this.top*this.dataWidth+this.left;if(t===this.dataWidth)return d.arraycopy(this.luminances,i,n,0,r),n;for(let r=0;r<e;r++){const e=r*t;d.arraycopy(this.luminances,i,n,e,t),i+=this.dataWidth}return n}isCropSupported(){return!0}crop(t,e,r,n){return new _r(this.luminances,r,n,this.dataWidth,this.dataHeight,this.left+t,this.top+e)}invert(){return new b(this)}}class Tr extends I{static forName(t){return this.getCharacterSetECIByName(t)}}class yr{}yr.ISO_8859_1=I.ISO8859_1;class Nr{isCompact(){return this.compact}setCompact(t){this.compact=t}getSize(){return this.size}setSize(t){this.size=t}getLayers(){return this.layers}setLayers(t){this.layers=t}getCodeWords(){return this.codeWords}setCodeWords(t){this.codeWords=t}getMatrix(){return this.matrix}setMatrix(t){this.matrix=t}}class Dr{static singletonList(t){return[t]}static min(t,e){return t.sort(e)[0]}}class Mr{constructor(t){this.previous=t}getPrevious(){return this.previous}}class Rr extends Mr{constructor(t,e,r){super(t),this.value=e,this.bitCount=r}appendTo(t,e){t.appendBits(this.value,this.bitCount)}add(t,e){return new Rr(this,t,e)}addBinaryShift(t,e){return console.warn("addBinaryShift on SimpleToken, this simply returns a copy of this token"),new Rr(this,t,e)}toString(){let t=this.value&(1<<this.bitCount)-1;return t|=1<<this.bitCount,"<"+m.toBinaryString(t|1<<this.bitCount).substring(1)+">"}}class Or extends Rr{constructor(t,e,r){super(t,0,0),this.binaryShiftStart=e,this.binaryShiftByteCount=r}appendTo(t,e){for(let r=0;r<this.binaryShiftByteCount;r++)(0===r||31===r&&this.binaryShiftByteCount<=62)&&(t.appendBits(31,5),this.binaryShiftByteCount>62?t.appendBits(this.binaryShiftByteCount-31,16):0===r?t.appendBits(Math.min(this.binaryShiftByteCount,31),5):t.appendBits(this.binaryShiftByteCount-31,5)),t.appendBits(e[this.binaryShiftStart+r],8)}addBinaryShift(t,e){return new Or(this,t,e)}toString(){return"<"+this.binaryShiftStart+"::"+(this.binaryShiftStart+this.binaryShiftByteCount-1)+">"}}function br(t,e,r){return new Rr(t,e,r)}const Br=["UPPER","LOWER","DIGIT","MIXED","PUNCT"],Lr=new Rr(null,0,0),Pr=[Int32Array.from([0,327708,327710,327709,656318]),Int32Array.from([590318,0,327710,327709,656318]),Int32Array.from([262158,590300,0,590301,932798]),Int32Array.from([327709,327708,656318,0,327710]),Int32Array.from([327711,656380,656382,656381,0])];const vr=function(t){for(let e of t)w.fill(e,-1);return t[0][4]=0,t[1][4]=0,t[1][0]=28,t[3][4]=0,t[2][4]=0,t[2][0]=15,t}(w.createInt32Array(6,6));class Fr{constructor(t,e,r,n){this.token=t,this.mode=e,this.binaryShiftByteCount=r,this.bitCount=n}getMode(){return this.mode}getToken(){return this.token}getBinaryShiftByteCount(){return this.binaryShiftByteCount}getBitCount(){return this.bitCount}latchAndAppend(t,e){let r=this.bitCount,n=this.token;if(t!==this.mode){let e=Pr[this.mode][t];n=br(n,65535&e,e>>16),r+=e>>16}let i=2===t?4:5;return n=br(n,e,i),new Fr(n,t,0,r+i)}shiftAndAppend(t,e){let r=this.token,n=2===this.mode?4:5;return r=br(r,vr[this.mode][t],n),r=br(r,e,5),new Fr(r,this.mode,0,this.bitCount+n+5)}addBinaryShiftChar(t){let e=this.token,r=this.mode,n=this.bitCount;if(4===this.mode||2===this.mode){let t=Pr[r][0];e=br(e,65535&t,t>>16),n+=t>>16,r=0}let i=0===this.binaryShiftByteCount||31===this.binaryShiftByteCount?18:62===this.binaryShiftByteCount?9:8,o=new Fr(e,r,this.binaryShiftByteCount+1,n+i);return 2078===o.binaryShiftByteCount&&(o=o.endBinaryShift(t+1)),o}endBinaryShift(t){if(0===this.binaryShiftByteCount)return this;let e=this.token;return e=function(t,e,r){return new Or(t,e,r)}(e,t-this.binaryShiftByteCount,this.binaryShiftByteCount),new Fr(e,this.mode,0,this.bitCount)}isBetterThanOrEqualTo(t){let e=this.bitCount+(Pr[this.mode][t.mode]>>16);return this.binaryShiftByteCount<t.binaryShiftByteCount?e+=Fr.calculateBinaryShiftCost(t)-Fr.calculateBinaryShiftCost(this):this.binaryShiftByteCount>t.binaryShiftByteCount&&t.binaryShiftByteCount>0&&(e+=10),e<=t.bitCount}toBitArray(t){let e=[];for(let r=this.endBinaryShift(t.length).token;null!==r;r=r.getPrevious())e.unshift(r);let r=new p;for(const n of e)n.appendTo(r,t);return r}toString(){return T.format("%s bits=%d bytes=%d",Br[this.mode],this.bitCount,this.binaryShiftByteCount)}static calculateBinaryShiftCost(t){return t.binaryShiftByteCount>62?21:t.binaryShiftByteCount>31?20:t.binaryShiftByteCount>0?10:0}}Fr.INITIAL_STATE=new Fr(Lr,0,0,0);const xr=function(t){const e=T.getCharCode(" "),r=T.getCharCode("."),n=T.getCharCode(",");t[0][e]=1;const i=T.getCharCode("Z"),o=T.getCharCode("A");for(let e=o;e<=i;e++)t[0][e]=e-o+2;t[1][e]=1;const s=T.getCharCode("z"),a=T.getCharCode("a");for(let e=a;e<=s;e++)t[1][e]=e-a+2;t[2][e]=1;const l=T.getCharCode("9"),c=T.getCharCode("0");for(let e=c;e<=l;e++)t[2][e]=e-c+2;t[2][n]=12,t[2][r]=13;const h=["\0"," ","
","","","","","","","\b","\t","\n","\v","\f","\r","","","","","","@","\\","^","_","`","|","~",""];for(let e=0;e<h.length;e++)t[3][T.getCharCode(h[e])]=e;const u=["\0","\r","\0","\0","\0","\0","!","'","#","$","%","&","'","(",")","*","+",",","-",".","/",":",";","<","=",">","?","[","]","{","}"];for(let e=0;e<u.length;e++)T.getCharCode(u[e])>0&&(t[4][T.getCharCode(u[e])]=e);return t}(w.createInt32Array(5,256));class kr{constructor(t){this.text=t}encode(){const t=T.getCharCode(" "),e=T.getCharCode("\n");let r=Dr.singletonList(Fr.INITIAL_STATE);for(let n=0;n<this.text.length;n++){let i,o=n+1<this.text.length?this.text[n+1]:0;switch(this.text[n]){case T.getCharCode("\r"):i=o===e?2:0;break;case T.getCharCode("."):i=o===t?3:0;break;case T.getCharCode(","):i=o===t?4:0;break;case T.getCharCode(":"):i=o===t?5:0;break;default:i=0}i>0?(r=kr.updateStateListForPair(r,n,i),n++):r=this.updateStateListForChar(r,n)}return Dr.min(r,((t,e)=>t.getBitCount()-e.getBitCount())).toBitArray(this.text)}updateStateListForChar(t,e){const r=[];for(let n of t)this.updateStateForChar(n,e,r);return kr.simplifyStates(r)}updateStateForChar(t,e,r){let n=255&this.text[e],i=xr[t.getMode()][n]>0,o=null;for(let s=0;s<=4;s++){let a=xr[s][n];if(a>0){if(null==o&&(o=t.endBinaryShift(e)),!i||s===t.getMode()||2===s){const t=o.latchAndAppend(s,a);r.push(t)}if(!i&&vr[t.getMode()][s]>=0){const t=o.shiftAndAppend(s,a);r.push(t)}}}if(t.getBinaryShiftByteCount()>0||0===xr[t.getMode()][n]){let n=t.addBinaryShiftChar(e);r.push(n)}}static updateStateListForPair(t,e,r){const n=[];for(let i of t)this.updateStateForPair(i,e,r,n);return this.simplifyStates(n)}static updateStateForPair(t,e,r,n){let i=t.endBinaryShift(e);if(n.push(i.latchAndAppend(4,r)),4!==t.getMode()&&n.push(i.shiftAndAppend(4,r)),3===r||4===r){let t=i.latchAndAppend(2,16-r).latchAndAppend(2,1);n.push(t)}if(t.getBinaryShiftByteCount()>0){let r=t.addBinaryShiftChar(e).addBinaryShiftChar(e+1);n.push(r)}}static simplifyStates(t){let e=[];for(const r of t){let t=!0;for(const n of e){if(n.isBetterThanOrEqualTo(r)){t=!1;break}r.isBetterThanOrEqualTo(n)&&(e=e.filter((t=>t!==n)))}t&&e.push(r)}return e}}class Ur{constructor(){}static encodeBytes(t){return Ur.encode(t,Ur.DEFAULT_EC_PERCENT,Ur.DEFAULT_AZTEC_LAYERS)}static encode(t,e,r){let n,i,o,s,a,c=new kr(t).encode(),h=m.truncDivision(c.getSize()*e,100)+11,u=c.getSize()+h;if(r!==Ur.DEFAULT_AZTEC_LAYERS){if(n=r<0,i=Math.abs(r),i>(n?Ur.MAX_NB_BITS_COMPACT:Ur.MAX_NB_BITS))throw new l(T.format("Illegal value %s for layers",r));o=Ur.totalBitsInLayer(i,n),s=Ur.WORD_SIZE[i];let t=o-o%s;if(a=Ur.stuffBits(c,s),a.getSize()+h>t)throw new l("Data to large for user specified layer");if(n&&a.getSize()>64*s)throw new l("Data to large for user specified layer")}else{s=0,a=null;for(let t=0;;t++){if(t>Ur.MAX_NB_BITS)throw new l("Data too large for an Aztec code");if(n=t<=3,i=n?t+1:t,o=Ur.totalBitsInLayer(i,n),u>o)continue;null!=a&&s===Ur.WORD_SIZE[i]||(s=Ur.WORD_SIZE[i],a=Ur.stuffBits(c,s));let e=o-o%s;if(!(n&&a.getSize()>64*s)&&a.getSize()+h<=e)break}}let d,f=Ur.generateCheckWords(a,o,s),g=a.getSize()/s,w=Ur.generateModeMessage(n,i,g),p=(n?11:14)+4*i,A=new Int32Array(p);if(n){d=p;for(let t=0;t<A.length;t++)A[t]=t}else{d=p+1+2*m.truncDivision(m.truncDivision(p,2)-1,15);let t=m.truncDivision(p,2),e=m.truncDivision(d,2);for(let r=0;r<t;r++){let n=r+m.truncDivision(r,15);A[t-r-1]=e-n-1,A[t+r]=e+n+1}}let C=new N(d);for(let t=0,e=0;t<i;t++){let r=4*(i-t)+(n?9:12);for(let n=0;n<r;n++){let i=2*n;for(let o=0;o<2;o++)f.get(e+i+o)&&C.set(A[2*t+o],A[2*t+n]),f.get(e+2*r+i+o)&&C.set(A[2*t+n],A[p-1-2*t-o]),f.get(e+4*r+i+o)&&C.set(A[p-1-2*t-o],A[p-1-2*t-n]),f.get(e+6*r+i+o)&&C.set(A[p-1-2*t-n],A[2*t+o])}e+=8*r}if(Ur.drawModeMessage(C,n,d,w),n)Ur.drawBullsEye(C,m.truncDivision(d,2),5);else{Ur.drawBullsEye(C,m.truncDivision(d,2),7);for(let t=0,e=0;t<m.truncDivision(p,2)-1;t+=15,e+=16)for(let t=1&m.truncDivision(d,2);t<d;t+=2)C.set(m.truncDivision(d,2)-e,t),C.set(m.truncDivision(d,2)+e,t),C.set(t,m.truncDivision(d,2)-e),C.set(t,m.truncDivision(d,2)+e)}let E=new Nr;return E.setCompact(n),E.setSize(d),E.setLayers(i),E.setCodeWords(g),E.setMatrix(C),E}static drawBullsEye(t,e,r){for(let n=0;n<r;n+=2)for(let r=e-n;r<=e+n;r++)t.set(r,e-n),t.set(r,e+n),t.set(e-n,r),t.set(e+n,r);t.set(e-r,e-r),t.set(e-r+1,e-r),t.set(e-r,e-r+1),t.set(e+r,e-r),t.set(e+r,e-r+1),t.set(e+r,e+r-1)}static generateModeMessage(t,e,r){let n=new p;return t?(n.appendBits(e-1,2),n.appendBits(r-1,6),n=Ur.generateCheckWords(n,28,4)):(n.appendBits(e-1,5),n.appendBits(r-1,11),n=Ur.generateCheckWords(n,40,4)),n}static drawModeMessage(t,e,r,n){let i=m.truncDivision(r,2);if(e)for(let e=0;e<7;e++){let r=i-3+e;n.get(e)&&t.set(r,i-5),n.get(e+7)&&t.set(i+5,r),n.get(20-e)&&t.set(r,i+5),n.get(27-e)&&t.set(i-5,r)}else for(let e=0;e<10;e++){let r=i-5+e+m.truncDivision(e,5);n.get(e)&&t.set(r,i-7),n.get(e+10)&&t.set(i+7,r),n.get(29-e)&&t.set(r,i+7),n.get(39-e)&&t.set(i-7,r)}}static generateCheckWords(t,e,r){let n=t.getSize()/r,i=new dr(Ur.getGF(r)),o=m.truncDivision(e,r),s=Ur.bitsToWords(t,r,o);i.encode(s,o-n);let a=e%r,l=new p;l.appendBits(0,a);for(const t of Array.from(s))l.appendBits(t,r);return l}static bitsToWords(t,e,r){let n,i,o=new Int32Array(r);for(n=0,i=t.getSize()/e;n<i;n++){let r=0;for(let i=0;i<e;i++)r|=t.get(n*e+i)?1<<e-i-1:0;o[n]=r}return o}static getGF(t){switch(t){case 4:return q.AZTEC_PARAM;case 6:return q.AZTEC_DATA_6;case 8:return q.AZTEC_DATA_8;case 10:return q.AZTEC_DATA_10;case 12:return q.AZTEC_DATA_12;default:throw new l("Unsupported word size "+t)}}static stuffBits(t,e){let r=new p,n=t.getSize(),i=(1<<e)-2;for(let o=0;o<n;o+=e){let s=0;for(let r=0;r<e;r++)(o+r>=n||t.get(o+r))&&(s|=1<<e-1-r);(s&i)===i?(r.appendBits(s&i,e),o--):0==(s&i)?(r.appendBits(1|s,e),o--):r.appendBits(s,e)}return r}static totalBitsInLayer(t,e){return((e?88:112)+16*t)*t}}Ur.DEFAULT_EC_PERCENT=33,Ur.DEFAULT_AZTEC_LAYERS=0,Ur.MAX_NB_BITS=32,Ur.MAX_NB_BITS_COMPACT=4,Ur.WORD_SIZE=Int32Array.from([4,6,6,8,8,8,8,8,8,10,10,10,10,10,10,10,10,10,10,10,10,10,10,12,12,12,12,12,12,12,12,12,12]);class Hr{encode(t,e,r,n){return this.encodeWithHints(t,e,r,n,null)}encodeWithHints(t,e,r,n,i){let o=yr.ISO_8859_1,s=Ur.DEFAULT_EC_PERCENT,a=Ur.DEFAULT_AZTEC_LAYERS;return null!=i&&(i.has(ur.CHARACTER_SET)&&(o=Tr.forName(i.get(ur.CHARACTER_SET).toString())),i.has(ur.ERROR_CORRECTION)&&(s=m.parseInt(i.get(ur.ERROR_CORRECTION).toString())),i.has(ur.AZTEC_LAYERS)&&(a=m.parseInt(i.get(ur.AZTEC_LAYERS).toString()))),Hr.encodeLayers(t,e,r,n,o,s,a)}static encodeLayers(t,e,r,n,i,o,s){if(e!==U.AZTEC)throw new l("Can only encode AZTEC, but got "+e);let a=Ur.encode(T.getBytes(t,i),o,s);return Hr.renderResult(a,r,n)}static renderResult(t,e,r){let n=t.getMatrix();if(null==n)throw new $;let i=n.getWidth(),o=n.getHeight(),s=Math.max(e,i),a=Math.max(r,o),l=Math.min(s/i,a/o),c=(s-i*l)/2,h=(a-o*l)/2,u=new N(s,a);for(let t=0,e=h;t<o;t++,e+=l)for(let r=0,o=c;r<i;r++,o+=l)n.get(r,t)&&u.setRegion(o,e,l,l);return u}}t.AbstractExpandedDecoder=Vt,t.ArgumentException=a,t.ArithmeticException=K,t.AztecCode=Nr,t.AztecCodeReader=gt,t.AztecCodeWriter=Hr,t.AztecDecoder=et,t.AztecDetector=ft,t.AztecDetectorResult=st,t.AztecEncoder=Ur,t.AztecHighLevelEncoder=kr,t.AztecPoint=dt,t.BarcodeFormat=U,t.Binarizer=u,t.BinaryBitmap=c,t.BitArray=p,t.BitMatrix=N,t.BitSource=he,t.BrowserAztecCodeReader=class extends F{constructor(t=500){super(new gt,t)}},t.BrowserBarcodeReader=class extends F{constructor(t=500,e){super(new ie(e),t,e)}},t.BrowserCodeReader=F,t.BrowserDatamatrixCodeReader=class extends F{constructor(t=500){super(new ge,t)}},t.BrowserMultiFormatReader=class extends F{constructor(t=null,e=500){const r=new cr;r.setHints(t),super(r,e)}decodeBitmap(t){return this.reader.decodeWithState(t)}},t.BrowserPDF417Reader=class extends F{constructor(t=500){super(new ar,t)}},t.BrowserQRCodeReader=class extends F{constructor(t=500){super(new Le,t)}},t.BrowserQRCodeSvgWriter=Er,t.CharacterSetECI=I,t.ChecksumException=h,t.Code128Reader=mt,t.Code39Reader=pt,t.DataMatrixDecodedBitStreamParser=ue,t.DataMatrixReader=ge,t.DecodeHintType=C,t.DecoderResult=j,t.DefaultGridSampler=ht,t.DetectorResult=ot,t.EAN13Reader=Tt,t.EncodeHintType=ur,t.Exception=s,t.FormatException=E,t.GenericGF=q,t.GenericGFPoly=Q,t.GlobalHistogramBinarizer=M,t.GridSampler=lt,t.GridSamplerInstance=ut,t.HTMLCanvasElementLuminanceSource=B,t.HybridBinarizer=R,t.ITFReader=At,t.IllegalArgumentException=l,t.IllegalStateException=$,t.InvertedLuminanceSource=b,t.LuminanceSource=O,t.MathUtils=rt,t.MultiFormatOneDReader=ie,t.MultiFormatReader=cr,t.MultiFormatWriter=class{encode(t,e,r,n,i){let o;if(e!==U.QR_CODE)throw new l("No encoder available for format "+e);return o=new Ir,o.encode(t,e,r,n,i)}},t.NotFoundException=D,t.OneDReader=wt,t.PDF417DecodedBitStreamParser=or,t.PDF417DecoderErrorCorrection=He,t.PDF417Reader=ar,t.PDF417ResultMetadata=Ke,t.PerspectiveTransform=ct,t.PlanarYUVLuminanceSource=Sr,t.QRCodeByteMatrix=gr,t.QRCodeDataMask=Ee,t.QRCodeDecodedBitStreamParser=Te,t.QRCodeDecoderErrorCorrectionLevel=we,t.QRCodeDecoderFormatInformation=me,t.QRCodeEncoder=Cr,t.QRCodeEncoderQRCode=wr,t.QRCodeMaskUtil=fr,t.QRCodeMatrixUtil=pr,t.QRCodeMode=_e,t.QRCodeReader=Le,t.QRCodeVersion=Ce,t.QRCodeWriter=Ir,t.RGBLuminanceSource=_r,t.RSS14Reader=ne,t.RSSExpandedReader=ee,t.ReaderException=lr,t.ReedSolomonDecoder=tt,t.ReedSolomonEncoder=dr,t.ReedSolomonException=J,t.Result=x,t.ResultMetadataType=W,t.ResultPoint=it,t.StringUtils=T,t.UnsupportedOperationException=S,t.VideoInputDevice=L,t.WhiteRectangleDetector=at,t.WriterException=mr,t.ZXingArrays=w,t.ZXingCharset=Tr,t.ZXingInteger=m,t.ZXingStandardCharsets=yr,t.ZXingStringBuilder=y,t.ZXingStringEncoding=_,t.ZXingSystem=d,t.createAbstractExpandedDecoder=Jt,Object.defineProperty(t,"__esModule",{value:!0})}(e)}},e={};function r(n){var i=e[n];if(void 0!==i)return i.exports;var o=e[n]={exports:{}};return t[n].call(o.exports,o,o.exports,r),o.exports}r.d=(t,e)=>{for(var n in e)r.o(e,n)&&!r.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},r.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(t){if("object"==typeof window)return window}}(),r.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})};var n={};(()=>{"use strict";var t;r.r(n),r.d(n,{Html5Qrcode:()=>W,Html5QrcodeScanType:()=>i,Html5QrcodeScanner:()=>ht,Html5QrcodeScannerState:()=>w,Html5QrcodeSupportedFormats:()=>t}),function(t){t[t.QR_CODE=0]="QR_CODE",t[t.AZTEC=1]="AZTEC",t[t.CODABAR=2]="CODABAR",t[t.CODE_39=3]="CODE_39",t[t.CODE_93=4]="CODE_93",t[t.CODE_128=5]="CODE_128",t[t.DATA_MATRIX=6]="DATA_MATRIX",t[t.MAXICODE=7]="MAXICODE",t[t.ITF=8]="ITF",t[t.EAN_13=9]="EAN_13",t[t.EAN_8=10]="EAN_8",t[t.PDF_417=11]="PDF_417",t[t.RSS_14=12]="RSS_14",t[t.RSS_EXPANDED=13]="RSS_EXPANDED",t[t.UPC_A=14]="UPC_A",t[t.UPC_E=15]="UPC_E",t[t.UPC_EAN_EXTENSION=16]="UPC_EAN_EXTENSION"}(t||(t={}));var e,i,o=new Map([[t.QR_CODE,"QR_CODE"],[t.AZTEC,"AZTEC"],[t.CODABAR,"CODABAR"],[t.CODE_39,"CODE_39"],[t.CODE_93,"CODE_93"],[t.CODE_128,"CODE_128"],[t.DATA_MATRIX,"DATA_MATRIX"],[t.MAXICODE,"MAXICODE"],[t.ITF,"ITF"],[t.EAN_13,"EAN_13"],[t.EAN_8,"EAN_8"],[t.PDF_417,"PDF_417"],[t.RSS_14,"RSS_14"],[t.RSS_EXPANDED,"RSS_EXPANDED"],[t.UPC_A,"UPC_A"],[t.UPC_E,"UPC_E"],[t.UPC_EAN_EXTENSION,"UPC_EAN_EXTENSION"]]);function s(e){return Object.values(t).includes(e)}!function(t){t[t.UNKNOWN=0]="UNKNOWN",t[t.URL=1]="URL"}(e||(e={})),function(t){t[t.SCAN_TYPE_CAMERA=0]="SCAN_TYPE_CAMERA",t[t.SCAN_TYPE_FILE=1]="SCAN_TYPE_FILE"}(i||(i={}));var a,l=function(){function t(){}return t.GITHUB_PROJECT_URL="https://github.com/mebjas/html5-qrcode",t.SCAN_DEFAULT_FPS=2,t.DEFAULT_DISABLE_FLIP=!1,t.DEFAULT_REMEMBER_LAST_CAMERA_USED=!0,t.DEFAULT_SUPPORTED_SCAN_TYPE=[i.SCAN_TYPE_CAMERA,i.SCAN_TYPE_FILE],t}(),c=function(){function t(t,e){this.format=t,this.formatName=e}return t.prototype.toString=function(){return this.formatName},t.create=function(e){if(!o.has(e))throw e+" not in html5QrcodeSupportedFormatsTextMap";return new t(e,o.get(e))},t}(),h=function(){function t(){}return t.createFromText=function(t){return{decodedText:t,result:{text:t}}},t.createFromQrcodeResult=function(t){return{decodedText:t.text,result:t}},t}();!function(t){t[t.UNKWOWN_ERROR=0]="UNKWOWN_ERROR",t[t.IMPLEMENTATION_ERROR=1]="IMPLEMENTATION_ERROR",t[t.NO_CODE_FOUND_ERROR=2]="NO_CODE_FOUND_ERROR"}(a||(a={}));var u=function(){function t(){}return t.createFrom=function(t){return{errorMessage:t,type:a.UNKWOWN_ERROR}},t}(),d=function(){function t(t){this.verbose=t}return t.prototype.log=function(t){this.verbose&&console.log(t)},t.prototype.warn=function(t){this.verbose&&console.warn(t)},t.prototype.logError=function(t,e){(this.verbose||!0===e)&&console.error(t)},t.prototype.logErrors=function(t){if(0===t.length)throw"Logger#logError called without arguments";this.verbose&&console.error(t)},t}();function f(t){return null==t}var g,w,m=function(){function t(){}return t.codeParseError=function(t){return"QR code parse error, error = "+t},t.errorGettingUserMedia=function(t){return"Error getting userMedia, error = "+t},t.onlyDeviceSupportedError=function(){return"The device doesn't support navigator.mediaDevices , only supported cameraIdOrConfig in this case is deviceId parameter (string)."},t.cameraStreamingNotSupported=function(){return"Camera streaming not supported by the browser."},t.unableToQuerySupportedDevices=function(){return"Unable to query supported devices, unknown error."},t.insecureContextCameraQueryError=function(){return"Camera access is only supported in secure context like https or localhost."},t}(),p=function(){function t(){}return t.scanningStatus=function(){return"Scanning"},t.idleStatus=function(){return"Idle"},t.errorStatus=function(){return"Error"},t.permissionStatus=function(){return"Permission"},t.noCameraFoundErrorStatus=function(){return"No Cameras"},t.lastMatch=function(t){return"Last Match: "+t},t.codeScannerTitle=function(){return"Code Scanner"},t.cameraPermissionTitle=function(){return"Request Camera Permissions"},t.cameraPermissionRequesting=function(){return"Requesting camera permissions..."},t.noCameraFound=function(){return"No camera found"},t.scanButtonStopScanningText=function(){return"Stop Scanning"},t.scanButtonStartScanningText=function(){return"Start Scanning"},t.torchOnButton=function(){return"Switch On Torch"},t.torchOffButton=function(){return"Switch Off Torch"},t.torchOnFailedMessage=function(){return"Failed to turn on torch"},t.torchOffFailedMessage=function(){return"Failed to turn off torch"},t.scanButtonScanningStarting=function(){return"Launching Camera..."},t.textIfCameraScanSelected=function(){return"Scan an Image File"},t.textIfFileScanSelected=function(){return"Scan using camera directly"},t.selectCamera=function(){return"Select Camera"},t.fileSelectionChooseImage=function(){return"Choose Image"},t.fileSelectionChooseAnother=function(){return"Choose Another"},t.fileSelectionNoImageSelected=function(){return"No image choosen"},t.anonymousCameraPrefix=function(){return"Anonymous Camera"},t.dragAndDropMessage=function(){return"Or drop an image to scan"},t.dragAndDropMessageOnlyImages=function(){return"Or drop an image to scan (other files not supported)"},t.zoom=function(){return"zoom"},t.loadingImage=function(){return"Loading image..."},t.cameraScanAltText=function(){return"Camera based scan"},t.fileScanAltText=function(){return"Fule based scan"},t}(),A=function(){function t(){}return t.poweredBy=function(){return"Powered by "},t.reportIssues=function(){return"Report issues"},t}(),C=function(){function t(){}return t.isMediaStreamConstraintsValid=function(t,e){if("object"!=typeof t){var r=typeof t;return e.logError("videoConstraints should be of type object, the object passed is of type "+r+".",!0),!1}for(var n=new Set(["autoGainControl","channelCount","echoCancellation","latency","noiseSuppression","sampleRate","sampleSize","volume"]),i=0,o=Object.keys(t);i<o.length;i++){var s=o[i];if(n.has(s))return e.logError(s+" is not supported videoConstaints.",!0),!1}return!0},t}(),E=r(449),I=function(){function e(e,r,n){if(this.formatMap=new Map([[t.QR_CODE,E.BarcodeFormat.QR_CODE],[t.AZTEC,E.BarcodeFormat.AZTEC],[t.CODABAR,E.BarcodeFormat.CODABAR],[t.CODE_39,E.BarcodeFormat.CODE_39],[t.CODE_93,E.BarcodeFormat.CODE_93],[t.CODE_128,E.BarcodeFormat.CODE_128],[t.DATA_MATRIX,E.BarcodeFormat.DATA_MATRIX],[t.MAXICODE,E.BarcodeFormat.MAXICODE],[t.ITF,E.BarcodeFormat.ITF],[t.EAN_13,E.BarcodeFormat.EAN_13],[t.EAN_8,E.BarcodeFormat.EAN_8],[t.PDF_417,E.BarcodeFormat.PDF_417],[t.RSS_14,E.BarcodeFormat.RSS_14],[t.RSS_EXPANDED,E.BarcodeFormat.RSS_EXPANDED],[t.UPC_A,E.BarcodeFormat.UPC_A],[t.UPC_E,E.BarcodeFormat.UPC_E],[t.UPC_EAN_EXTENSION,E.BarcodeFormat.UPC_EAN_EXTENSION]]),this.reverseFormatMap=this.createReverseFormatMap(),!E)throw"Use html5qrcode.min.js without edit, ZXing not found.";this.verbose=r,this.logger=n;var i=this.createZXingFormats(e),o=new Map;o.set(E.DecodeHintType.POSSIBLE_FORMATS,i),o.set(E.DecodeHintType.TRY_HARDER,!1),this.hints=o}return e.prototype.decodeAsync=function(t){var e=this;return new Promise((function(r,n){try{r(e.decode(t))}catch(t){n(t)}}))},e.prototype.decode=function(t){var e=new E.MultiFormatReader(this.verbose,this.hints),r=new E.HTMLCanvasElementLuminanceSource(t),n=new E.BinaryBitmap(new E.HybridBinarizer(r)),i=e.decode(n);return{text:i.text,format:c.create(this.toHtml5QrcodeSupportedFormats(i.format)),debugData:this.createDebugData()}},e.prototype.createReverseFormatMap=function(){var t=new Map;return this.formatMap.forEach((function(e,r,n){t.set(e,r)})),t},e.prototype.toHtml5QrcodeSupportedFormats=function(t){if(!this.reverseFormatMap.has(t))throw"reverseFormatMap doesn't have "+t;return this.reverseFormatMap.get(t)},e.prototype.createZXingFormats=function(t){for(var e=[],r=0,n=t;r<n.length;r++){var i=n[r];this.formatMap.has(i)?e.push(this.formatMap.get(i)):this.logger.logError(i+" is not supported byZXingHtml5QrcodeShim")}return e},e.prototype.createDebugData=function(){return{decoderName:"zxing-js"}},e}(),S=function(){function e(r,n,i){if(this.formatMap=new Map([[t.QR_CODE,"qr_code"],[t.AZTEC,"aztec"],[t.CODABAR,"codabar"],[t.CODE_39,"code_39"],[t.CODE_93,"code_93"],[t.CODE_128,"code_128"],[t.DATA_MATRIX,"data_matrix"],[t.ITF,"itf"],[t.EAN_13,"ean_13"],[t.EAN_8,"ean_8"],[t.PDF_417,"pdf417"],[t.UPC_A,"upc_a"],[t.UPC_E,"upc_e"]]),this.reverseFormatMap=this.createReverseFormatMap(),!e.isSupported())throw"Use html5qrcode.min.js without edit, Use BarcodeDetectorDelegate only if it isSupported();";this.verbose=n,this.logger=i;var o=this.createBarcodeDetectorFormats(r);if(this.detector=new BarcodeDetector(o),!this.detector)throw"BarcodeDetector detector not supported"}return e.isSupported=function(){return"BarcodeDetector"in window&&void 0!==new BarcodeDetector({formats:["qr_code"]})},e.prototype.decodeAsync=function(t){return e=this,r=void 0,i=function(){var e,r;return function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}(this,(function(n){switch(n.label){case 0:return[4,this.detector.detect(t)];case 1:if(!(e=n.sent())||0===e.length)throw"No barcode or QR code detected.";return[2,{text:(r=this.selectLargestBarcode(e)).rawValue,format:c.create(this.toHtml5QrcodeSupportedFormats(r.format)),debugData:this.createDebugData()}]}}))},new((n=void 0)||(n=Promise))((function(t,o){function s(t){try{l(i.next(t))}catch(t){o(t)}}function a(t){try{l(i.throw(t))}catch(t){o(t)}}function l(e){var r;e.done?t(e.value):(r=e.value,r instanceof n?r:new n((function(t){t(r)}))).then(s,a)}l((i=i.apply(e,r||[])).next())}));var e,r,n,i},e.prototype.selectLargestBarcode=function(t){for(var e=null,r=0,n=0,i=t;n<i.length;n++){var o=i[n],s=o.boundingBox.width*o.boundingBox.height;s>r&&(r=s,e=o)}if(!e)throw"No largest barcode found";return e},e.prototype.createBarcodeDetectorFormats=function(t){for(var e=[],r=0,n=t;r<n.length;r++){var i=n[r];this.formatMap.has(i)?e.push(this.formatMap.get(i)):this.logger.warn(i+" is not supported byBarcodeDetectorDelegate")}return{formats:e}},e.prototype.toHtml5QrcodeSupportedFormats=function(t){if(!this.reverseFormatMap.has(t))throw"reverseFormatMap doesn't have "+t;return this.reverseFormatMap.get(t)},e.prototype.createReverseFormatMap=function(){var t=new Map;return this.formatMap.forEach((function(e,r,n){t.set(e,r)})),t},e.prototype.createDebugData=function(){return{decoderName:"BarcodeDetector"}},e}(),_=function(t,e,r,n){return new(r||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}))},T=function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},y=function(){function t(t,e,r,n){this.EXECUTIONS_TO_REPORT_PERFORMANCE=100,this.executions=0,this.executionResults=[],this.wasPrimaryDecoderUsedInLastDecode=!1,this.verbose=r,e&&S.isSupported()?(this.primaryDecoder=new S(t,r,n),this.secondaryDecoder=new I(t,r,n)):this.primaryDecoder=new I(t,r,n)}return t.prototype.decodeAsync=function(t){return _(this,void 0,void 0,(function(){var e;return T(this,(function(r){switch(r.label){case 0:e=performance.now(),r.label=1;case 1:return r.trys.push([1,,3,4]),[4,this.getDecoder().decodeAsync(t)];case 2:return[2,r.sent()];case 3:return this.possiblyLogPerformance(e),[7];case 4:return[2]}}))}))},t.prototype.decodeRobustlyAsync=function(t){return _(this,void 0,void 0,(function(){var e,r;return T(this,(function(n){switch(n.label){case 0:e=performance.now(),n.label=1;case 1:return n.trys.push([1,3,4,5]),[4,this.primaryDecoder.decodeAsync(t)];case 2:return[2,n.sent()];case 3:if(r=n.sent(),this.secondaryDecoder)return[2,this.secondaryDecoder.decodeAsync(t)];throw r;case 4:return this.possiblyLogPerformance(e),[7];case 5:return[2]}}))}))},t.prototype.getDecoder=function(){return this.secondaryDecoder?!1===this.wasPrimaryDecoderUsedInLastDecode?(this.wasPrimaryDecoderUsedInLastDecode=!0,this.primaryDecoder):(this.wasPrimaryDecoderUsedInLastDecode=!1,this.secondaryDecoder):this.primaryDecoder},t.prototype.possiblyLogPerformance=function(t){if(this.verbose){var e=performance.now()-t;this.executionResults.push(e),this.executions++,this.possiblyFlushPerformanceReport()}},t.prototype.possiblyFlushPerformanceReport=function(){if(!(this.executions<this.EXECUTIONS_TO_REPORT_PERFORMANCE)){for(var t=0,e=0,r=this.executionResults;e<r.length;e++)t+=r[e];var n=t/this.executionResults.length;console.log(n+" ms for "+this.executionResults.length+" last runs."),this.executions=0,this.executionResults=[]}},t}(),N=(g=function(t,e){return g=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])},g(t,e)},function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function r(){this.constructor=t}g(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}),D=function(t,e,r,n){return new(r||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}))},M=function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},R=function(){function t(t,e){this.name=t,this.track=e}return t.prototype.isSupported=function(){return!!this.track.getCapabilities&&this.name in this.track.getCapabilities()},t.prototype.apply=function(t){var e={};e[this.name]=t;var r={advanced:[e]};return this.track.applyConstraints(r)},t.prototype.value=function(){var t=this.track.getSettings();return this.name in t?t[this.name]:null},t}(),O=function(t){function e(e){return t.call(this,"zoom",e)||this}return N(e,t),e}(function(t){function e(e,r){return t.call(this,e,r)||this}return N(e,t),e.prototype.min=function(){return this.getCapabilities().min},e.prototype.max=function(){return this.getCapabilities().max},e.prototype.step=function(){return this.getCapabilities().step},e.prototype.apply=function(t){var e={};e[this.name]=t;var r={advanced:[e]};return this.track.applyConstraints(r)},e.prototype.getCapabilities=function(){this.failIfNotSupported();var t=this.track.getCapabilities()[this.name];return{min:t.min,max:t.max,step:t.step}},e.prototype.failIfNotSupported=function(){if(!this.isSupported())throw new Error(this.name+" capability not supported")},e}(R)),b=function(t){function e(e){return t.call(this,"torch",e)||this}return N(e,t),e}(R),B=function(){function t(t){this.track=t}return t.prototype.zoomFeature=function(){return new O(this.track)},t.prototype.torchFeature=function(){return new b(this.track)},t}(),L=function(){function t(t,e,r){this.isClosed=!1,this.parentElement=t,this.mediaStream=e,this.callbacks=r,this.surface=this.createVideoElement(this.parentElement.clientWidth),t.append(this.surface)}return t.prototype.createVideoElement=function(t){var e=document.createElement("video");return e.style.width=t+"px",e.style.display="block",e.muted=!0,e.setAttribute("muted","true"),e.playsInline=!0,e},t.prototype.setupSurface=function(){var t=this;this.surface.onabort=function(){throw"RenderedCameraImpl video surface onabort() called"},this.surface.onerror=function(){throw"RenderedCameraImpl video surface onerror() called"};var e=function(){var r=t.surface.clientWidth,n=t.surface.clientHeight;t.callbacks.onRenderSurfaceReady(r,n),t.surface.removeEventListener("playing",e)};this.surface.addEventListener("playing",e),this.surface.srcObject=this.mediaStream,this.surface.play()},t.create=function(e,r,n,i){return D(this,void 0,void 0,(function(){var o,s;return M(this,(function(a){switch(a.label){case 0:return o=new t(e,r,i),n.aspectRatio?(s={aspectRatio:n.aspectRatio},[4,o.getFirstTrackOrFail().applyConstraints(s)]):[3,2];case 1:a.sent(),a.label=2;case 2:return o.setupSurface(),[2,o]}}))}))},t.prototype.failIfClosed=function(){if(this.isClosed)throw"The RenderedCamera has already been closed."},t.prototype.getFirstTrackOrFail=function(){if(this.failIfClosed(),0===this.mediaStream.getVideoTracks().length)throw"No video tracks found";return this.mediaStream.getVideoTracks()[0]},t.prototype.pause=function(){this.failIfClosed(),this.surface.pause()},t.prototype.resume=function(t){this.failIfClosed();var e=this,r=function(){setTimeout(t,200),e.surface.removeEventListener("playing",r)};this.surface.addEventListener("playing",r),this.surface.play()},t.prototype.isPaused=function(){return this.failIfClosed(),this.surface.paused},t.prototype.getSurface=function(){return this.failIfClosed(),this.surface},t.prototype.getRunningTrackCapabilities=function(){return this.getFirstTrackOrFail().getCapabilities()},t.prototype.getRunningTrackSettings=function(){return this.getFirstTrackOrFail().getSettings()},t.prototype.applyVideoConstraints=function(t){return D(this,void 0,void 0,(function(){return M(this,(function(e){if("aspectRatio"in t)throw"Changing 'aspectRatio' in run-time is not yet supported.";return[2,this.getFirstTrackOrFail().applyConstraints(t)]}))}))},t.prototype.close=function(){if(this.isClosed)return Promise.resolve();var t=this;return new Promise((function(e,r){var n=t.mediaStream.getVideoTracks().length,i=0;t.mediaStream.getVideoTracks().forEach((function(r){t.mediaStream.removeTrack(r),r.stop(),++i>=n&&(t.isClosed=!0,t.parentElement.removeChild(t.surface),e())}))}))},t.prototype.getCapabilities=function(){return new B(this.getFirstTrackOrFail())},t}(),P=function(){function t(t){this.mediaStream=t}return t.prototype.render=function(t,e,r){return D(this,void 0,void 0,(function(){return M(this,(function(n){return[2,L.create(t,this.mediaStream,e,r)]}))}))},t.create=function(e){return D(this,void 0,void 0,(function(){var r;return M(this,(function(n){switch(n.label){case 0:if(!navigator.mediaDevices)throw"navigator.mediaDevices not supported";return r={audio:!1,video:e},[4,navigator.mediaDevices.getUserMedia(r)];case 1:return[2,new t(n.sent())]}}))}))},t}(),v=function(t,e,r,n){return new(r||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}))},F=function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},x=function(){function t(){}return t.failIfNotSupported=function(){return v(this,void 0,void 0,(function(){return F(this,(function(e){if(!navigator.mediaDevices)throw"navigator.mediaDevices not supported";return[2,new t]}))}))},t.prototype.create=function(t){return v(this,void 0,void 0,(function(){return F(this,(function(e){return[2,P.create(t)]}))}))},t}(),k=function(){function t(){}return t.retrieve=function(){if(navigator.mediaDevices)return t.getCamerasFromMediaDevices();var e=MediaStreamTrack;return MediaStreamTrack&&e.getSources?t.getCamerasFromMediaStreamTrack():t.rejectWithError()},t.rejectWithError=function(){var e=m.unableToQuerySupportedDevices();return t.isHttpsOrLocalhost()||(e=m.insecureContextCameraQueryError()),Promise.reject(e)},t.isHttpsOrLocalhost=function(){if("https:"===location.protocol)return!0;var t=location.host.split(":")[0];return"127.0.0.1"===t||"localhost"===t},t.getCamerasFromMediaDevices=function(){return t=this,e=void 0,n=function(){var t,e,r,n,i,o,s;return function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}(this,(function(a){switch(a.label){case 0:return t=function(t){for(var e=0,r=t.getVideoTracks();e<r.length;e++){var n=r[e];n.enabled=!1,n.stop(),t.removeTrack(n)}},[4,navigator.mediaDevices.getUserMedia({audio:!1,video:!0})];case 1:return e=a.sent(),[4,navigator.mediaDevices.enumerateDevices()];case 2:for(r=a.sent(),n=[],i=0,o=r;i<o.length;i++)"videoinput"===(s=o[i]).kind&&n.push({id:s.deviceId,label:s.label});return t(e),[2,n]}}))},new((r=void 0)||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}));var t,e,r,n},t.getCamerasFromMediaStreamTrack=function(){return new Promise((function(t,e){MediaStreamTrack.getSources((function(e){for(var r=[],n=0,i=e;n<i.length;n++){var o=i[n];"video"===o.kind&&r.push({id:o.id,label:o.label})}t(r)}))}))},t}();!function(t){t[t.UNKNOWN=0]="UNKNOWN",t[t.NOT_STARTED=1]="NOT_STARTED",t[t.SCANNING=2]="SCANNING",t[t.PAUSED=3]="PAUSED"}(w||(w={}));var U,H=function(){function t(){this.state=w.NOT_STARTED,this.onGoingTransactionNewState=w.UNKNOWN}return t.prototype.directTransition=function(t){this.failIfTransitionOngoing(),this.validateTransition(t),this.state=t},t.prototype.startTransition=function(t){return this.failIfTransitionOngoing(),this.validateTransition(t),this.onGoingTransactionNewState=t,this},t.prototype.execute=function(){if(this.onGoingTransactionNewState===w.UNKNOWN)throw"Transaction is already cancelled, cannot execute().";var t=this.onGoingTransactionNewState;this.onGoingTransactionNewState=w.UNKNOWN,this.directTransition(t)},t.prototype.cancel=function(){if(this.onGoingTransactionNewState===w.UNKNOWN)throw"Transaction is already cancelled, cannot cancel().";this.onGoingTransactionNewState=w.UNKNOWN},t.prototype.getState=function(){return this.state},t.prototype.failIfTransitionOngoing=function(){if(this.onGoingTransactionNewState!==w.UNKNOWN)throw"Cannot transition to a new state, already under transition"},t.prototype.validateTransition=function(t){switch(this.state){case w.UNKNOWN:throw"Transition from unknown is not allowed";case w.NOT_STARTED:this.failIfNewStateIs(t,[w.PAUSED]);case w.SCANNING:case w.PAUSED:}},t.prototype.failIfNewStateIs=function(t,e){for(var r=0,n=e;r<n.length;r++)if(t===n[r])throw"Cannot transition from "+this.state+" to "+t},t}(),V=function(){function t(t){this.stateManager=t}return t.prototype.startTransition=function(t){return this.stateManager.startTransition(t)},t.prototype.directTransition=function(t){this.stateManager.directTransition(t)},t.prototype.getState=function(){return this.stateManager.getState()},t.prototype.canScanFile=function(){return this.stateManager.getState()===w.NOT_STARTED},t.prototype.isScanning=function(){return this.stateManager.getState()!==w.NOT_STARTED},t.prototype.isStrictlyScanning=function(){return this.stateManager.getState()===w.SCANNING},t.prototype.isPaused=function(){return this.stateManager.getState()===w.PAUSED},t}(),z=function(){function t(){}return t.create=function(){return new V(new H)},t}(),G=function(){var t=function(e,r){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])},t(e,r)};return function(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Class extends value "+String(r)+" is not a constructor or null");function n(){this.constructor=e}t(e,r),e.prototype=null===r?Object.create(r):(n.prototype=r.prototype,new n)}}(),Y=function(t){function e(){return null!==t&&t.apply(this,arguments)||this}return G(e,t),e.DEFAULT_WIDTH=300,e.DEFAULT_WIDTH_OFFSET=2,e.FILE_SCAN_MIN_HEIGHT=300,e.FILE_SCAN_HIDDEN_CANVAS_PADDING=100,e.MIN_QR_BOX_SIZE=50,e.SHADED_LEFT=1,e.SHADED_RIGHT=2,e.SHADED_TOP=3,e.SHADED_BOTTOM=4,e.SHADED_REGION_ELEMENT_ID="qr-shaded-region",e.VERBOSE=!1,e.BORDER_SHADER_DEFAULT_COLOR="#ffffff",e.BORDER_SHADER_MATCH_COLOR="rgb(90, 193, 56)",e}(l),X=function(){function t(t,e){this.logger=e,this.fps=Y.SCAN_DEFAULT_FPS,t?(t.fps&&(this.fps=t.fps),this.disableFlip=!0===t.disableFlip,this.qrbox=t.qrbox,this.aspectRatio=t.aspectRatio,this.videoConstraints=t.videoConstraints):this.disableFlip=Y.DEFAULT_DISABLE_FLIP}return t.prototype.isMediaStreamConstraintsValid=function(){return this.videoConstraints?C.isMediaStreamConstraintsValid(this.videoConstraints,this.logger):(this.logger.logError("Empty videoConstraints",!0),!1)},t.prototype.isShadedBoxEnabled=function(){return!f(this.qrbox)},t.create=function(e,r){return new t(e,r)},t}(),W=function(){function e(t,e){if(this.element=null,this.canvasElement=null,this.scannerPausedUiElement=null,this.hasBorderShaders=null,this.borderShaders=null,this.qrMatch=null,this.renderedCamera=null,this.qrRegion=null,this.context=null,this.lastScanImageFile=null,this.isScanning=!1,!document.getElementById(t))throw"HTML Element with id="+t+" not found";var r;this.elementId=t,this.verbose=!1,"boolean"==typeof e?this.verbose=!0===e:e&&(r=e,this.verbose=!0===r.verbose,r.experimentalFeatures),this.logger=new d(this.verbose),this.qrcode=new y(this.getSupportedFormats(e),this.getUseBarCodeDetectorIfSupported(r),this.verbose,this.logger),this.foreverScanTimeout,this.shouldScan=!0,this.stateManagerProxy=z.create()}return e.prototype.start=function(t,e,r,n){var i,o=this;if(!t)throw"cameraIdOrConfig is required";if(!r||"function"!=typeof r)throw"qrCodeSuccessCallback is required and should be a function.";i=n||(this.verbose?this.logger.log:function(){});var s=X.create(e,this.logger);this.clearElement();var a=!1;s.videoConstraints&&(s.isMediaStreamConstraintsValid()?a=!0:this.logger.logError("'videoConstraints' is not valid 'MediaStreamConstraints, it will be ignored.'",!0));var l=a,c=document.getElementById(this.elementId);c.clientWidth?c.clientWidth:Y.DEFAULT_WIDTH,c.style.position="relative",this.shouldScan=!0,this.element=c;var h=this,u=this.stateManagerProxy.startTransition(w.SCANNING);return new Promise((function(e,n){var a=l?s.videoConstraints:h.createVideoConstraints(t);if(!a)return u.cancel(),void n("videoConstraints should be defined");var c={};l&&!s.aspectRatio||(c.aspectRatio=s.aspectRatio);var d={onRenderSurfaceReady:function(t,e){h.setupUi(t,e,s),h.isScanning=!0,h.foreverScan(s,r,i)}};x.failIfNotSupported().then((function(t){t.create(a).then((function(t){return t.render(o.element,c,d).then((function(t){h.renderedCamera=t,u.execute(),e(null)})).catch((function(t){u.cancel(),n(t)}))})).catch((function(t){u.cancel(),n(m.errorGettingUserMedia(t))}))})).catch((function(t){u.cancel(),n(m.cameraStreamingNotSupported())}))}))},e.prototype.pause=function(t){if(!this.stateManagerProxy.isStrictlyScanning())throw"Cannot pause, scanner is not scanning.";this.stateManagerProxy.directTransition(w.PAUSED),this.showPausedState(),(f(t)||!0!==t)&&(t=!1),t&&this.renderedCamera&&this.renderedCamera.pause()},e.prototype.resume=function(){if(!this.stateManagerProxy.isPaused())throw"Cannot result, scanner is not paused.";if(!this.renderedCamera)throw"renderedCamera doesn't exist while trying resume()";var t=this,e=function(){t.stateManagerProxy.directTransition(w.SCANNING),t.hidePausedState()};this.renderedCamera.isPaused()?this.renderedCamera.resume((function(){e()})):e()},e.prototype.getState=function(){return this.stateManagerProxy.getState()},e.prototype.stop=function(){var t=this;if(!this.stateManagerProxy.isScanning())throw"Cannot stop, scanner is not running or paused.";var e=this.stateManagerProxy.startTransition(w.NOT_STARTED);this.shouldScan=!1,this.foreverScanTimeout&&clearTimeout(this.foreverScanTimeout);var r=this;return this.renderedCamera.close().then((function(){return r.renderedCamera=null,r.element&&(r.element.removeChild(r.canvasElement),r.canvasElement=null),function(){if(t.element){var e=document.getElementById(Y.SHADED_REGION_ELEMENT_ID);e&&t.element.removeChild(e)}}(),r.qrRegion&&(r.qrRegion=null),r.context&&(r.context=null),e.execute(),r.hidePausedState(),r.isScanning=!1,Promise.resolve()}))},e.prototype.scanFile=function(t,e){return this.scanFileV2(t,e).then((function(t){return t.decodedText}))},e.prototype.scanFileV2=function(t,e){var r=this;if(!(t&&t instanceof File))throw"imageFile argument is mandatory and should be instance of File. Use 'event.target.files[0]'.";if(f(e)&&(e=!0),!this.stateManagerProxy.canScanFile())throw"Cannot start file scan - ongoing camera scan";return new Promise((function(n,i){r.possiblyCloseLastScanImageFile(),r.clearElement(),r.lastScanImageFile=URL.createObjectURL(t);var o=new Image;o.onload=function(){var t=o.width,s=o.height,a=document.getElementById(r.elementId),l=a.clientWidth?a.clientWidth:Y.DEFAULT_WIDTH,c=Math.max(a.clientHeight?a.clientHeight:s,Y.FILE_SCAN_MIN_HEIGHT),u=r.computeCanvasDrawConfig(t,s,l,c);if(e){var d=r.createCanvasElement(l,c,"qr-canvas-visible");d.style.display="inline-block",a.appendChild(d);var f=d.getContext("2d");if(!f)throw"Unable to get 2d context from canvas";f.canvas.width=l,f.canvas.height=c,f.drawImage(o,0,0,t,s,u.x,u.y,u.width,u.height)}var g=Y.FILE_SCAN_HIDDEN_CANVAS_PADDING,w=Math.max(o.width,u.width),m=Math.max(o.height,u.height),p=w+2*g,A=m+2*g,C=r.createCanvasElement(p,A);a.appendChild(C);var E=C.getContext("2d");if(!E)throw"Unable to get 2d context from canvas";E.canvas.width=p,E.canvas.height=A,E.drawImage(o,0,0,t,s,g,g,w,m);try{r.qrcode.decodeRobustlyAsync(C).then((function(t){n(h.createFromQrcodeResult(t))})).catch(i)}catch(t){i("QR code parse error, error = "+t)}},o.onerror=i,o.onabort=i,o.onstalled=i,o.onsuspend=i,o.src=URL.createObjectURL(t)}))},e.prototype.clear=function(){this.clearElement()},e.getCameras=function(){return k.retrieve()},e.prototype.getRunningTrackCapabilities=function(){return this.getRenderedCameraOrFail().getRunningTrackCapabilities()},e.prototype.getRunningTrackSettings=function(){return this.getRenderedCameraOrFail().getRunningTrackSettings()},e.prototype.getRunningTrackCameraCapabilities=function(){return this.getRenderedCameraOrFail().getCapabilities()},e.prototype.applyVideoConstraints=function(t){if(!t)throw"videoConstaints is required argument.";if(!C.isMediaStreamConstraintsValid(t,this.logger))throw"invalid videoConstaints passed, check logs for more details";return this.getRenderedCameraOrFail().applyVideoConstraints(t)},e.prototype.getRenderedCameraOrFail=function(){if(null==this.renderedCamera)throw"Scanning is not in running state, call this API only when QR code scanning using camera is in running state.";return this.renderedCamera},e.prototype.getSupportedFormats=function(e){var r=[t.QR_CODE,t.AZTEC,t.CODABAR,t.CODE_39,t.CODE_93,t.CODE_128,t.DATA_MATRIX,t.MAXICODE,t.ITF,t.EAN_13,t.EAN_8,t.PDF_417,t.RSS_14,t.RSS_EXPANDED,t.UPC_A,t.UPC_E,t.UPC_EAN_EXTENSION];if(!e||"boolean"==typeof e)return r;if(!e.formatsToSupport)return r;if(!Array.isArray(e.formatsToSupport))throw"configOrVerbosityFlag.formatsToSupport should be undefined or an array.";if(0===e.formatsToSupport.length)throw"Atleast 1 formatsToSupport is needed.";for(var n=[],i=0,o=e.formatsToSupport;i<o.length;i++){var a=o[i];s(a)?n.push(a):this.logger.warn("Invalid format: "+a+" passed in config, ignoring.")}if(0===n.length)throw"None of formatsToSupport match supported values.";return n},e.prototype.getUseBarCodeDetectorIfSupported=function(t){if(f(t))return!0;if(!f(t.useBarCodeDetectorIfSupported))return!1!==t.useBarCodeDetectorIfSupported;if(f(t.experimentalFeatures))return!0;var e=t.experimentalFeatures;return!!f(e.useBarCodeDetectorIfSupported)||!1!==e.useBarCodeDetectorIfSupported},e.prototype.validateQrboxSize=function(t,e,r){var n=r.qrbox;this.validateQrboxConfig(n);var i,o=this.toQrdimensions(t,e,n),s=function(t){if(t<Y.MIN_QR_BOX_SIZE)throw"minimum size of 'config.qrbox' dimension value is "+Y.MIN_QR_BOX_SIZE+"px."};s(o.width),s(o.height),o.width=((i=o.width)>t&&(this.logger.warn("`qrbox.width` or `qrbox` is larger than the width of the root element. The width will be truncated to the width of root element."),i=t),i)},e.prototype.validateQrboxConfig=function(t){if("number"!=typeof t&&"function"!=typeof t&&(void 0===t.width||void 0===t.height))throw"Invalid instance of QrDimensions passed for 'config.qrbox'. Both 'width' and 'height' should be set."},e.prototype.toQrdimensions=function(t,e,r){if("number"==typeof r)return{width:r,height:r};if("function"==typeof r)try{return r(t,e)}catch(t){throw new Error("qrbox config was passed as a function but it failed with unknown error"+t)}return r},e.prototype.setupUi=function(t,e,r){r.isShadedBoxEnabled()&&this.validateQrboxSize(t,e,r);var n=f(r.qrbox)?{width:t,height:e}:r.qrbox;this.validateQrboxConfig(n);var i=this.toQrdimensions(t,e,n);i.height>e&&this.logger.warn("[Html5Qrcode] config.qrbox has height that isgreater than the height of the video stream. Shading will be ignored");var o=r.isShadedBoxEnabled()&&i.height<=e,s={x:0,y:0,width:t,height:e},a=o?this.getShadedRegionBounds(t,e,i):s,l=this.createCanvasElement(a.width,a.height),c=l.getContext("2d",{willReadFrequently:!0});c.canvas.width=a.width,c.canvas.height=a.height,this.element.append(l),o&&this.possiblyInsertShadingElement(this.element,t,e,i),this.createScannerPausedUiElement(this.element),this.qrRegion=a,this.context=c,this.canvasElement=l},e.prototype.createScannerPausedUiElement=function(t){var e=document.createElement("div");e.innerText="Scanner paused",e.style.display="none",e.style.position="absolute",e.style.top="0px",e.style.zIndex="1",e.style.background="yellow",e.style.textAlign="center",e.style.width="100%",t.appendChild(e),this.scannerPausedUiElement=e},e.prototype.scanContext=function(t,e){var r=this;return this.stateManagerProxy.isPaused()?Promise.resolve(!1):this.qrcode.decodeAsync(this.canvasElement).then((function(e){return t(e.text,h.createFromQrcodeResult(e)),r.possiblyUpdateShaders(!0),!0})).catch((function(t){r.possiblyUpdateShaders(!1);var n=m.codeParseError(t);return e(n,u.createFrom(n)),!1}))},e.prototype.foreverScan=function(t,e,r){var n=this;if(this.shouldScan&&this.renderedCamera){var i=this.renderedCamera.getSurface(),o=i.videoWidth/i.clientWidth,s=i.videoHeight/i.clientHeight;if(!this.qrRegion)throw"qrRegion undefined when localMediaStream is ready.";var a=this.qrRegion.width*o,l=this.qrRegion.height*s,c=this.qrRegion.x*o,h=this.qrRegion.y*s;this.context.drawImage(i,c,h,a,l,0,0,this.qrRegion.width,this.qrRegion.height);var u=function(){n.foreverScanTimeout=setTimeout((function(){n.foreverScan(t,e,r)}),n.getTimeoutFps(t.fps))};this.scanContext(e,r).then((function(i){i||!0===t.disableFlip?u():(n.context.translate(n.context.canvas.width,0),n.context.scale(-1,1),n.scanContext(e,r).finally((function(){u()})))})).catch((function(t){n.logger.logError("Error happend while scanning context",t),u()}))}},e.prototype.createVideoConstraints=function(t){if("string"==typeof t)return{deviceId:{exact:t}};if("object"==typeof t){var e="facingMode",r={user:!0,environment:!0},n="exact",i=function(t){if(t in r)return!0;throw"config has invalid 'facingMode' value = '"+t+"'"},o=Object.keys(t);if(1!==o.length)throw"'cameraIdOrConfig' object should have exactly 1 key, if passed as an object, found "+o.length+" keys";var s=Object.keys(t)[0];if(s!==e&&"deviceId"!==s)throw"Only 'facingMode' and 'deviceId'  are supported for 'cameraIdOrConfig'";if(s!==e){var a=t.deviceId;if("string"==typeof a)return{deviceId:a};if("object"==typeof a){if(n in a)return{deviceId:{exact:a.exact}};throw"'deviceId' should be string or object with exact as key."}throw"Invalid type of 'deviceId' = "+typeof a}var l=t.facingMode;if("string"==typeof l){if(i(l))return{facingMode:l}}else{if("object"!=typeof l)throw"Invalid type of 'facingMode' = "+typeof l;if(!(n in l))throw"'facingMode' should be string or object with exact as key.";if(i(l.exact))return{facingMode:{exact:l.exact}}}}throw"Invalid type of 'cameraIdOrConfig' = "+typeof t},e.prototype.computeCanvasDrawConfig=function(t,e,r,n){if(t<=r&&e<=n)return{x:(r-t)/2,y:(n-e)/2,width:t,height:e};var i=t,o=e;return t>r&&(e*=r/t,t=r),e>n&&(t*=n/e,e=n),this.logger.log("Image downsampled from "+i+"X"+o+" to "+t+"X"+e+"."),this.computeCanvasDrawConfig(t,e,r,n)},e.prototype.clearElement=function(){if(this.stateManagerProxy.isScanning())throw"Cannot clear while scan is ongoing, close it first.";var t=document.getElementById(this.elementId);t&&(t.innerHTML="")},e.prototype.possiblyUpdateShaders=function(t){this.qrMatch!==t&&(this.hasBorderShaders&&this.borderShaders&&this.borderShaders.length&&this.borderShaders.forEach((function(e){e.style.backgroundColor=t?Y.BORDER_SHADER_MATCH_COLOR:Y.BORDER_SHADER_DEFAULT_COLOR})),this.qrMatch=t)},e.prototype.possiblyCloseLastScanImageFile=function(){this.lastScanImageFile&&(URL.revokeObjectURL(this.lastScanImageFile),this.lastScanImageFile=null)},e.prototype.createCanvasElement=function(t,e,r){var n=t,i=e,o=document.createElement("canvas");return o.style.width=n+"px",o.style.height=i+"px",o.style.display="none",o.id=f(r)?"qr-canvas":r,o},e.prototype.getShadedRegionBounds=function(t,e,r){if(r.width>t||r.height>e)throw"'config.qrbox' dimensions should not be greater than the dimensions of the root HTML element.";return{x:(t-r.width)/2,y:(e-r.height)/2,width:r.width,height:r.height}},e.prototype.possiblyInsertShadingElement=function(t,e,r,n){if(!(e-n.width<1||r-n.height<1)){var i=document.createElement("div");i.style.position="absolute";var o=(e-n.width)/2,s=(r-n.height)/2;if(i.style.borderLeft=o+"px solid rgba(0, 0, 0, 0.48)",i.style.borderRight=o+"px solid rgba(0, 0, 0, 0.48)",i.style.borderTop=s+"px solid rgba(0, 0, 0, 0.48)",i.style.borderBottom=s+"px solid rgba(0, 0, 0, 0.48)",i.style.boxSizing="border-box",i.style.top="0px",i.style.bottom="0px",i.style.left="0px",i.style.right="0px",i.id=""+Y.SHADED_REGION_ELEMENT_ID,e-n.width<11||r-n.height<11)this.hasBorderShaders=!1;else{this.insertShaderBorders(i,40,5,-5,null,0,!0),this.insertShaderBorders(i,40,5,-5,null,0,!1),this.insertShaderBorders(i,40,5,null,-5,0,!0),this.insertShaderBorders(i,40,5,null,-5,0,!1),this.insertShaderBorders(i,5,45,-5,null,-5,!0),this.insertShaderBorders(i,5,45,null,-5,-5,!0),this.insertShaderBorders(i,5,45,-5,null,-5,!1),this.insertShaderBorders(i,5,45,null,-5,-5,!1),this.hasBorderShaders=!0}t.append(i)}},e.prototype.insertShaderBorders=function(t,e,r,n,i,o,s){var a=document.createElement("div");a.style.position="absolute",a.style.backgroundColor=Y.BORDER_SHADER_DEFAULT_COLOR,a.style.width=e+"px",a.style.height=r+"px",null!==n&&(a.style.top=n+"px"),null!==i&&(a.style.bottom=i+"px"),s?a.style.left=o+"px":a.style.right=o+"px",this.borderShaders||(this.borderShaders=[]),this.borderShaders.push(a),t.appendChild(a)},e.prototype.showPausedState=function(){if(!this.scannerPausedUiElement)throw"[internal error] scanner paused UI element not found";this.scannerPausedUiElement.style.display="block"},e.prototype.hidePausedState=function(){if(!this.scannerPausedUiElement)throw"[internal error] scanner paused UI element not found";this.scannerPausedUiElement.style.display="none"},e.prototype.getTimeoutFps=function(t){return 1e3/t},e}(),j="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NjAgNDYwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA0NjAgNDYwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48cGF0aCBkPSJNMjMwIDBDMTAyLjk3NSAwIDAgMTAyLjk3NSAwIDIzMHMxMDIuOTc1IDIzMCAyMzAgMjMwIDIzMC0xMDIuOTc0IDIzMC0yMzBTMzU3LjAyNSAwIDIzMCAwem0zOC4zMzMgMzc3LjM2YzAgOC42NzYtNy4wMzQgMTUuNzEtMTUuNzEgMTUuNzFoLTQzLjEwMWMtOC42NzYgMC0xNS43MS03LjAzNC0xNS43MS0xNS43MVYyMDIuNDc3YzAtOC42NzYgNy4wMzMtMTUuNzEgMTUuNzEtMTUuNzFoNDMuMTAxYzguNjc2IDAgMTUuNzEgNy4wMzMgMTUuNzEgMTUuNzFWMzc3LjM2ek0yMzAgMTU3Yy0yMS41MzkgMC0zOS0xNy40NjEtMzktMzlzMTcuNDYxLTM5IDM5LTM5IDM5IDE3LjQ2MSAzOSAzOS0xNy40NjEgMzktMzkgMzl6Ii8+PC9zdmc+",Z=function(){function t(){}return t.createDefault=function(){return{hasPermission:!1,lastUsedCameraId:null}},t}(),Q=function(){function t(){this.data=Z.createDefault();var e=localStorage.getItem(t.LOCAL_STORAGE_KEY);e?this.data=JSON.parse(e):this.reset()}return t.prototype.hasCameraPermissions=function(){return this.data.hasPermission},t.prototype.getLastUsedCameraId=function(){return this.data.lastUsedCameraId},t.prototype.setHasPermission=function(t){this.data.hasPermission=t,this.flush()},t.prototype.setLastUsedCameraId=function(t){this.data.lastUsedCameraId=t,this.flush()},t.prototype.resetLastUsedCameraId=function(){this.data.lastUsedCameraId=null,this.flush()},t.prototype.reset=function(){this.data=Z.createDefault(),this.flush()},t.prototype.flush=function(){localStorage.setItem(t.LOCAL_STORAGE_KEY,JSON.stringify(this.data))},t.LOCAL_STORAGE_KEY="HTML5_QRCODE_DATA",t}(),K=function(){function t(){this.infoDiv=document.createElement("div")}return t.prototype.renderInto=function(t){this.infoDiv.style.position="absolute",this.infoDiv.style.top="10px",this.infoDiv.style.right="10px",this.infoDiv.style.zIndex="2",this.infoDiv.style.display="none",this.infoDiv.style.padding="5pt",this.infoDiv.style.border="1px solid #171717",this.infoDiv.style.fontSize="10pt",this.infoDiv.style.background="rgb(0 0 0 / 69%)",this.infoDiv.style.borderRadius="5px",this.infoDiv.style.textAlign="center",this.infoDiv.style.fontWeight="400",this.infoDiv.style.color="white",this.infoDiv.innerText=A.poweredBy();var e=document.createElement("a");e.innerText="ScanApp",e.href="https://scanapp.org",e.target="new",e.style.color="white",this.infoDiv.appendChild(e);var r=document.createElement("br"),n=document.createElement("br");this.infoDiv.appendChild(r),this.infoDiv.appendChild(n);var i=document.createElement("a");i.innerText=A.reportIssues(),i.href="https://github.com/mebjas/html5-qrcode/issues",i.target="new",i.style.color="white",this.infoDiv.appendChild(i),t.appendChild(this.infoDiv)},t.prototype.show=function(){this.infoDiv.style.display="block"},t.prototype.hide=function(){this.infoDiv.style.display="none"},t}(),q=function(){function t(t,e){this.isShowingInfoIcon=!0,this.onTapIn=t,this.onTapOut=e,this.infoIcon=document.createElement("img")}return t.prototype.renderInto=function(t){var e=this;this.infoIcon.alt="Info icon",this.infoIcon.src=j,this.infoIcon.style.position="absolute",this.infoIcon.style.top="4px",this.infoIcon.style.right="4px",this.infoIcon.style.opacity="0.6",this.infoIcon.style.cursor="pointer",this.infoIcon.style.zIndex="2",this.infoIcon.style.width="16px",this.infoIcon.style.height="16px",this.infoIcon.onmouseover=function(t){return e.onHoverIn()},this.infoIcon.onmouseout=function(t){return e.onHoverOut()},this.infoIcon.onclick=function(t){return e.onClick()},t.appendChild(this.infoIcon)},t.prototype.onHoverIn=function(){this.isShowingInfoIcon&&(this.infoIcon.style.opacity="1")},t.prototype.onHoverOut=function(){this.isShowingInfoIcon&&(this.infoIcon.style.opacity="0.6")},t.prototype.onClick=function(){this.isShowingInfoIcon?(this.isShowingInfoIcon=!1,this.onTapIn(),this.infoIcon.src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAQgAAAEIBarqQRAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE1SURBVDiNfdI7S0NBEAXgLya1otFgpbYSbISAgpXYi6CmiH9KCAiChaVga6OiWPgfRDQ+0itaGVNosXtluWwcuMzePfM4M3sq8lbHBubwg1dc4m1E/J/N4ghDPOIsfk/4xiEao5KX0McFljN4C9d4QTPXuY99jP3DsIoDPGM6BY5i5yI5R7O4q+ImFkJY2DCh3cAH2klyB+9J1xUMMAG7eCh1a+Mr+k48b5diXrFVwwLuS+BJ9MfR7+G0FHOHhTHhnXNWS87VDF4pcnfQK4Ep7XScNLmPTZgURNKKYENYWDpzW1BhscS1WHS8CDgURFJQrWcoF3c13KKbgg1BYQfy8xZWEzTTw1QZbAoKu8FqJnktdu5hcVSHmchiILzzuaDQvjBzV2m8yohCE1jHfPx/xhU+y4G/D75ELlRJsSYAAAAASUVORK5CYII=",this.infoIcon.style.opacity="1"):(this.isShowingInfoIcon=!0,this.onTapOut(),this.infoIcon.src=j,this.infoIcon.style.opacity="0.6")},t}(),J=function(){function t(){var t=this;this.infoDiv=new K,this.infoIcon=new q((function(){t.infoDiv.show()}),(function(){t.infoDiv.hide()}))}return t.prototype.renderInto=function(t){this.infoDiv.renderInto(t),this.infoIcon.renderInto(t)},t}(),$=function(){function t(){}return t.hasPermissions=function(){return t=this,e=void 0,n=function(){var t,e,r,n;return function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}(this,(function(i){switch(i.label){case 0:return[4,navigator.mediaDevices.enumerateDevices()];case 1:for(t=i.sent(),e=0,r=t;e<r.length;e++)if("videoinput"===(n=r[e]).kind&&n.label)return[2,!0];return[2,!1]}}))},new((r=void 0)||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}));var t,e,r,n},t}(),tt=function(){function t(t){this.supportedScanTypes=this.validateAndReturnScanTypes(t)}return t.prototype.getDefaultScanType=function(){return this.supportedScanTypes[0]},t.prototype.hasMoreThanOneScanType=function(){return this.supportedScanTypes.length>1},t.prototype.isCameraScanRequired=function(){for(var e=0,r=this.supportedScanTypes;e<r.length;e++){var n=r[e];if(t.isCameraScanType(n))return!0}return!1},t.isCameraScanType=function(t){return t===i.SCAN_TYPE_CAMERA},t.isFileScanType=function(t){return t===i.SCAN_TYPE_FILE},t.prototype.validateAndReturnScanTypes=function(t){if(!t||0===t.length)return l.DEFAULT_SUPPORTED_SCAN_TYPE;var e=l.DEFAULT_SUPPORTED_SCAN_TYPE.length;if(t.length>e)throw"Max "+e+" values expected for supportedScanTypes";for(var r=0,n=t;r<n.length;r++){var i=n[r];if(!l.DEFAULT_SUPPORTED_SCAN_TYPE.includes(i))throw"Unsupported scan type "+i}return t},t}(),et=function(){function t(){}return t.ALL_ELEMENT_CLASS="html5-qrcode-element",t.CAMERA_PERMISSION_BUTTON_ID="html5-qrcode-button-camera-permission",t.CAMERA_START_BUTTON_ID="html5-qrcode-button-camera-start",t.CAMERA_STOP_BUTTON_ID="html5-qrcode-button-camera-stop",t.TORCH_BUTTON_ID="html5-qrcode-button-torch",t.CAMERA_SELECTION_SELECT_ID="html5-qrcode-select-camera",t.FILE_SELECTION_BUTTON_ID="html5-qrcode-button-file-selection",t.ZOOM_SLIDER_ID="html5-qrcode-input-range-zoom",t.SCAN_TYPE_CHANGE_ANCHOR_ID="html5-qrcode-anchor-scan-type-change",t.TORCH_BUTTON_CLASS_TORCH_ON="html5-qrcode-button-torch-on",t.TORCH_BUTTON_CLASS_TORCH_OFF="html5-qrcode-button-torch-off",t}(),rt=function(){function t(){}return t.createElement=function(t,e){var r=document.createElement(t);return r.id=e,r.classList.add(et.ALL_ELEMENT_CLASS),"button"===t&&r.setAttribute("type","button"),r},t}(),nt=function(t,e,r,n){return new(r||(r=Promise))((function(i,o){function s(t){try{l(n.next(t))}catch(t){o(t)}}function a(t){try{l(n.throw(t))}catch(t){o(t)}}function l(t){var e;t.done?i(t.value):(e=t.value,e instanceof r?e:new r((function(t){t(e)}))).then(s,a)}l((n=n.apply(t,e||[])).next())}))},it=function(t,e){var r,n,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(r)throw new TypeError("Generator is already executing.");for(;s;)try{if(r=1,n&&(i=2&o[0]?n.return:o[0]?n.throw||((i=n.return)&&i.call(n),0):n.next)&&!(i=i.call(n,o[1])).done)return i;switch(n=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!((i=(i=s.trys).length>0&&i[i.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{r=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},ot=function(){function t(t,e,r){this.isTorchOn=!1,this.torchCapability=t,this.buttonController=e,this.onTorchActionFailureCallback=r}return t.prototype.isTorchEnabled=function(){return this.isTorchOn},t.prototype.flipState=function(){return nt(this,void 0,void 0,(function(){var t,e;return it(this,(function(r){switch(r.label){case 0:this.buttonController.disable(),t=!this.isTorchOn,r.label=1;case 1:return r.trys.push([1,3,,4]),[4,this.torchCapability.apply(t)];case 2:return r.sent(),this.updateUiBasedOnLatestSettings(this.torchCapability.value(),t),[3,4];case 3:return e=r.sent(),this.propagateFailure(t,e),this.buttonController.enable(),[3,4];case 4:return[2]}}))}))},t.prototype.updateUiBasedOnLatestSettings=function(t,e){t===e?(this.buttonController.setText(e?p.torchOffButton():p.torchOnButton()),this.isTorchOn=e):this.propagateFailure(e),this.buttonController.enable()},t.prototype.propagateFailure=function(t,e){var r=t?p.torchOnFailedMessage():p.torchOffFailedMessage();e&&(r+="; Error = "+e),this.onTorchActionFailureCallback(r)},t.prototype.reset=function(){this.isTorchOn=!1},t}(),st=function(){function t(t,e){this.onTorchActionFailureCallback=e,this.torchButton=rt.createElement("button",et.TORCH_BUTTON_ID),this.torchController=new ot(t,this,e)}return t.prototype.render=function(t,e){var r=this;this.torchButton.innerText=p.torchOnButton(),this.torchButton.style.display=e.display,this.torchButton.style.marginLeft=e.marginLeft;var n=this;this.torchButton.addEventListener("click",(function(t){return nt(r,void 0,void 0,(function(){return it(this,(function(t){switch(t.label){case 0:return[4,n.torchController.flipState()];case 1:return t.sent(),n.torchController.isTorchEnabled()?(n.torchButton.classList.remove(et.TORCH_BUTTON_CLASS_TORCH_OFF),n.torchButton.classList.add(et.TORCH_BUTTON_CLASS_TORCH_ON)):(n.torchButton.classList.remove(et.TORCH_BUTTON_CLASS_TORCH_ON),n.torchButton.classList.add(et.TORCH_BUTTON_CLASS_TORCH_OFF)),[2]}}))}))})),t.appendChild(this.torchButton)},t.prototype.updateTorchCapability=function(t){this.torchController=new ot(t,this,this.onTorchActionFailureCallback)},t.prototype.getTorchButton=function(){return this.torchButton},t.prototype.hide=function(){this.torchButton.style.display="none"},t.prototype.show=function(){this.torchButton.style.display="inline-block"},t.prototype.disable=function(){this.torchButton.disabled=!0},t.prototype.enable=function(){this.torchButton.disabled=!1},t.prototype.setText=function(t){this.torchButton.innerText=t},t.prototype.reset=function(){this.torchButton.innerText=p.torchOnButton(),this.torchController.reset()},t.create=function(e,r,n,i){var o=new t(r,i);return o.render(e,n),o},t}(),at=function(){function t(t,e,r){this.fileBasedScanRegion=this.createFileBasedScanRegion(),this.fileBasedScanRegion.style.display=e?"block":"none",t.appendChild(this.fileBasedScanRegion);var n=document.createElement("label");n.setAttribute("for",this.getFileScanInputId()),n.style.display="inline-block",this.fileBasedScanRegion.appendChild(n),this.fileSelectionButton=rt.createElement("button",et.FILE_SELECTION_BUTTON_ID),this.setInitialValueToButton(),this.fileSelectionButton.addEventListener("click",(function(t){n.click()})),n.append(this.fileSelectionButton),this.fileScanInput=rt.createElement("input",this.getFileScanInputId()),this.fileScanInput.type="file",this.fileScanInput.accept="image/*",this.fileScanInput.style.display="none",n.appendChild(this.fileScanInput);var i=this;this.fileScanInput.addEventListener("change",(function(t){if(null!=t&&null!=t.target){var e=t.target;if(!e.files||0!==e.files.length){var n=e.files[0],o=n.name;i.setImageNameToButton(o),r(n)}}}));var o=this.createDragAndDropMessage();this.fileBasedScanRegion.appendChild(o),this.fileBasedScanRegion.addEventListener("dragenter",(function(t){i.fileBasedScanRegion.style.border=i.fileBasedScanRegionActiveBorder(),t.stopPropagation(),t.preventDefault()})),this.fileBasedScanRegion.addEventListener("dragleave",(function(t){i.fileBasedScanRegion.style.border=i.fileBasedScanRegionDefaultBorder(),t.stopPropagation(),t.preventDefault()})),this.fileBasedScanRegion.addEventListener("dragover",(function(t){i.fileBasedScanRegion.style.border=i.fileBasedScanRegionActiveBorder(),t.stopPropagation(),t.preventDefault()})),this.fileBasedScanRegion.addEventListener("drop",(function(t){t.stopPropagation(),t.preventDefault(),i.fileBasedScanRegion.style.border=i.fileBasedScanRegionDefaultBorder();var e=t.dataTransfer;if(e){var n=e.files;if(!n||0===n.length)return;for(var s=!1,a=0;a<n.length;++a){var l=n.item(a);if(l&&l.type.match(/image.*/)){s=!0;var c=l.name;i.setImageNameToButton(c),r(l),o.innerText=p.dragAndDropMessage();break}}s||(o.innerText=p.dragAndDropMessageOnlyImages())}}))}return t.prototype.hide=function(){this.fileBasedScanRegion.style.display="none",this.fileScanInput.disabled=!0},t.prototype.show=function(){this.fileBasedScanRegion.style.display="block",this.fileScanInput.disabled=!1},t.prototype.isShowing=function(){return"block"===this.fileBasedScanRegion.style.display},t.prototype.resetValue=function(){this.fileScanInput.value="",this.setInitialValueToButton()},t.prototype.createFileBasedScanRegion=function(){var t=document.createElement("div");return t.style.textAlign="center",t.style.margin="auto",t.style.width="80%",t.style.maxWidth="600px",t.style.border=this.fileBasedScanRegionDefaultBorder(),t.style.padding="10px",t.style.marginBottom="10px",t},t.prototype.fileBasedScanRegionDefaultBorder=function(){return"6px dashed #ebebeb"},t.prototype.fileBasedScanRegionActiveBorder=function(){return"6px dashed rgb(153 151 151)"},t.prototype.createDragAndDropMessage=function(){var t=document.createElement("div");return t.innerText=p.dragAndDropMessage(),t.style.fontWeight="400",t},t.prototype.setImageNameToButton=function(t){if(t.length>20){var e=t.substring(0,8),r=t.length,n=t.substring(r-8,r);t=e+"...."+n}var i=p.fileSelectionChooseAnother()+" - "+t;this.fileSelectionButton.innerText=i},t.prototype.setInitialValueToButton=function(){var t=p.fileSelectionChooseImage()+" - "+p.fileSelectionNoImageSelected();this.fileSelectionButton.innerText=t},t.prototype.getFileScanInputId=function(){return"html5-qrcode-private-filescan-input"},t.create=function(e,r,n){return new t(e,r,n)},t}(),lt=function(){function t(t){this.selectElement=rt.createElement("select",et.CAMERA_SELECTION_SELECT_ID),this.cameras=t,this.options=[]}return t.prototype.render=function(t){var e=document.createElement("span");e.style.marginRight="10px";var r=this.cameras.length;if(0===r)throw new Error("No cameras found");if(1===r)e.style.display="none";else{var n=p.selectCamera();e.innerText=n+" ("+this.cameras.length+")  "}for(var i=1,o=0,s=this.cameras;o<s.length;o++){var a=s[o],l=a.id,c=null==a.label?l:a.label;c&&""!==c||(c=[p.anonymousCameraPrefix(),i++].join(" "));var h=document.createElement("option");h.value=l,h.innerText=c,this.options.push(h),this.selectElement.appendChild(h)}e.appendChild(this.selectElement),t.appendChild(e)},t.prototype.disable=function(){this.selectElement.disabled=!0},t.prototype.isDisabled=function(){return!0===this.selectElement.disabled},t.prototype.enable=function(){this.selectElement.disabled=!1},t.prototype.getValue=function(){return this.selectElement.value},t.prototype.hasValue=function(t){for(var e=0,r=this.options;e<r.length;e++)if(r[e].value===t)return!0;return!1},t.prototype.setValue=function(t){if(!this.hasValue(t))throw new Error(t+" is not present in the camera list.");this.selectElement.value=t},t.prototype.hasSingleItem=function(){return 1===this.cameras.length},t.prototype.numCameras=function(){return this.cameras.length},t.create=function(e,r){var n=new t(r);return n.render(e),n},t}(),ct=function(){function t(){this.onChangeCallback=null,this.zoomElementContainer=document.createElement("div"),this.rangeInput=rt.createElement("input",et.ZOOM_SLIDER_ID),this.rangeInput.type="range",this.rangeText=document.createElement("span"),this.rangeInput.min="1",this.rangeInput.max="5",this.rangeInput.value="1",this.rangeInput.step="0.1"}return t.prototype.render=function(t,e){this.zoomElementContainer.style.display=e?"block":"none",this.zoomElementContainer.style.padding="5px 10px",this.zoomElementContainer.style.textAlign="center",t.appendChild(this.zoomElementContainer),this.rangeInput.style.display="inline-block",this.rangeInput.style.width="50%",this.rangeInput.style.height="5px",this.rangeInput.style.background="#d3d3d3",this.rangeInput.style.outline="none",this.rangeInput.style.opacity="0.7";var r=p.zoom();this.rangeText.innerText=this.rangeInput.value+"x "+r,this.rangeText.style.marginRight="10px";var n=this;this.rangeInput.addEventListener("input",(function(){return n.onValueChange()})),this.rangeInput.addEventListener("change",(function(){return n.onValueChange()})),this.zoomElementContainer.appendChild(this.rangeInput),this.zoomElementContainer.appendChild(this.rangeText)},t.prototype.onValueChange=function(){var t=p.zoom();this.rangeText.innerText=this.rangeInput.value+"x "+t,this.onChangeCallback&&this.onChangeCallback(parseFloat(this.rangeInput.value))},t.prototype.setValues=function(t,e,r,n){this.rangeInput.min=t.toString(),this.rangeInput.max=e.toString(),this.rangeInput.step=n.toString(),this.rangeInput.value=r.toString(),this.onValueChange()},t.prototype.show=function(){this.zoomElementContainer.style.display="block"},t.prototype.hide=function(){this.zoomElementContainer.style.display="none"},t.prototype.setOnCameraZoomValueChangeCallback=function(t){this.onChangeCallback=t},t.prototype.removeOnCameraZoomValueChangeCallback=function(){this.onChangeCallback=null},t.create=function(e,r){var n=new t;return n.render(e,r),n},t}();!function(t){t[t.STATUS_DEFAULT=0]="STATUS_DEFAULT",t[t.STATUS_SUCCESS=1]="STATUS_SUCCESS",t[t.STATUS_WARNING=2]="STATUS_WARNING",t[t.STATUS_REQUESTING_PERMISSION=3]="STATUS_REQUESTING_PERMISSION"}(U||(U={}));var ht=function(){function t(t,e,r){if(this.lastMatchFound=null,this.cameraScanImage=null,this.fileScanImage=null,this.fileSelectionUi=null,this.elementId=t,this.config=this.createConfig(e),this.verbose=!0===r,!document.getElementById(t))throw"HTML Element with id="+t+" not found";this.scanTypeSelector=new tt(this.config.supportedScanTypes),this.currentScanType=this.scanTypeSelector.getDefaultScanType(),this.sectionSwapAllowed=!0,this.logger=new d(this.verbose),this.persistedDataManager=new Q,!0!==e.rememberLastUsedCamera&&this.persistedDataManager.reset()}return t.prototype.render=function(t,e){var r=this;this.lastMatchFound=null,this.qrCodeSuccessCallback=function(e,n){if(t)t(e,n);else{if(r.lastMatchFound===e)return;r.lastMatchFound=e,r.setHeaderMessage(p.lastMatch(e),U.STATUS_SUCCESS)}},this.qrCodeErrorCallback=function(t,r){e&&e(t,r)};var n,i,o=document.getElementById(this.elementId);if(!o)throw"HTML Element with id="+this.elementId+" not found";o.innerHTML="",this.createBasicLayout(o),this.html5Qrcode=new W(this.getScanRegionId(),(n=this.config,i=this.verbose,{formatsToSupport:n.formatsToSupport,useBarCodeDetectorIfSupported:n.useBarCodeDetectorIfSupported,experimentalFeatures:n.experimentalFeatures,verbose:i}))},t.prototype.pause=function(t){(f(t)||!0!==t)&&(t=!1),this.getHtml5QrcodeOrFail().pause(t)},t.prototype.resume=function(){this.getHtml5QrcodeOrFail().resume()},t.prototype.getState=function(){return this.getHtml5QrcodeOrFail().getState()},t.prototype.clear=function(){var t=this,e=function(){var e=document.getElementById(t.elementId);e&&(e.innerHTML="",t.resetBasicLayout(e))};return this.html5Qrcode?new Promise((function(r,n){t.html5Qrcode?t.html5Qrcode.isScanning?t.html5Qrcode.stop().then((function(n){t.html5Qrcode?(t.html5Qrcode.clear(),e(),r()):r()})).catch((function(e){t.verbose&&t.logger.logError("Unable to stop qrcode scanner",e),n(e)})):(t.html5Qrcode.clear(),e(),r()):r()})):Promise.resolve()},t.prototype.getRunningTrackCapabilities=function(){return this.getHtml5QrcodeOrFail().getRunningTrackCapabilities()},t.prototype.getRunningTrackSettings=function(){return this.getHtml5QrcodeOrFail().getRunningTrackSettings()},t.prototype.applyVideoConstraints=function(t){return this.getHtml5QrcodeOrFail().applyVideoConstraints(t)},t.prototype.getHtml5QrcodeOrFail=function(){if(!this.html5Qrcode)throw"Code scanner not initialized.";return this.html5Qrcode},t.prototype.createConfig=function(t){return t?(t.fps||(t.fps=l.SCAN_DEFAULT_FPS),t.rememberLastUsedCamera!==!l.DEFAULT_REMEMBER_LAST_CAMERA_USED&&(t.rememberLastUsedCamera=l.DEFAULT_REMEMBER_LAST_CAMERA_USED),t.supportedScanTypes||(t.supportedScanTypes=l.DEFAULT_SUPPORTED_SCAN_TYPE),t):{fps:l.SCAN_DEFAULT_FPS,rememberLastUsedCamera:l.DEFAULT_REMEMBER_LAST_CAMERA_USED,supportedScanTypes:l.DEFAULT_SUPPORTED_SCAN_TYPE}},t.prototype.createBasicLayout=function(t){t.style.position="relative",t.style.padding="0px",t.style.border="1px solid silver",this.createHeader(t);var e=document.createElement("div"),r=this.getScanRegionId();e.id=r,e.style.width="100%",e.style.minHeight="100px",e.style.textAlign="center",t.appendChild(e),tt.isCameraScanType(this.currentScanType)?this.insertCameraScanImageToScanRegion():this.insertFileScanImageToScanRegion();var n=document.createElement("div"),i=this.getDashboardId();n.id=i,n.style.width="100%",t.appendChild(n),this.setupInitialDashboard(n)},t.prototype.resetBasicLayout=function(t){t.style.border="none"},t.prototype.setupInitialDashboard=function(t){this.createSection(t),this.createSectionControlPanel(),this.scanTypeSelector.hasMoreThanOneScanType()&&this.createSectionSwap()},t.prototype.createHeader=function(t){var e=document.createElement("div");e.style.textAlign="left",e.style.margin="0px",t.appendChild(e),(new J).renderInto(e);var r=document.createElement("div");r.id=this.getHeaderMessageContainerId(),r.style.display="none",r.style.textAlign="center",r.style.fontSize="14px",r.style.padding="2px 10px",r.style.margin="4px",r.style.borderTop="1px solid #f6f6f6",e.appendChild(r)},t.prototype.createSection=function(t){var e=document.createElement("div");e.id=this.getDashboardSectionId(),e.style.width="100%",e.style.padding="10px 0px 10px 0px",e.style.textAlign="left",t.appendChild(e)},t.prototype.createCameraListUi=function(t,e,r){var n=this;n.showHideScanTypeSwapLink(!1),n.setHeaderMessage(p.cameraPermissionRequesting());var i=function(){r||n.createPermissionButton(t,e)};W.getCameras().then((function(r){n.persistedDataManager.setHasPermission(!0),n.showHideScanTypeSwapLink(!0),n.resetHeaderMessage(),r&&r.length>0?(t.removeChild(e),n.renderCameraSelection(r)):(n.setHeaderMessage(p.noCameraFound(),U.STATUS_WARNING),i())})).catch((function(t){n.persistedDataManager.setHasPermission(!1),r?r.disabled=!1:i(),n.setHeaderMessage(t,U.STATUS_WARNING),n.showHideScanTypeSwapLink(!0)}))},t.prototype.createPermissionButton=function(t,e){var r=this,n=rt.createElement("button",this.getCameraPermissionButtonId());n.innerText=p.cameraPermissionTitle(),n.addEventListener("click",(function(){n.disabled=!0,r.createCameraListUi(t,e,n)})),e.appendChild(n)},t.prototype.createPermissionsUi=function(t,e){var r=this;tt.isCameraScanType(this.currentScanType)&&this.persistedDataManager.hasCameraPermissions()?$.hasPermissions().then((function(n){n?r.createCameraListUi(t,e):(r.persistedDataManager.setHasPermission(!1),r.createPermissionButton(t,e))})).catch((function(n){r.persistedDataManager.setHasPermission(!1),r.createPermissionButton(t,e)})):this.createPermissionButton(t,e)},t.prototype.createSectionControlPanel=function(){var t=document.getElementById(this.getDashboardSectionId()),e=document.createElement("div");t.appendChild(e);var r=document.createElement("div");r.id=this.getDashboardSectionCameraScanRegionId(),r.style.display=tt.isCameraScanType(this.currentScanType)?"block":"none",e.appendChild(r);var n=document.createElement("div");n.style.textAlign="center",r.appendChild(n),this.scanTypeSelector.isCameraScanRequired()&&this.createPermissionsUi(r,n),this.renderFileScanUi(e)},t.prototype.renderFileScanUi=function(t){var e=tt.isFileScanType(this.currentScanType),r=this;this.fileSelectionUi=at.create(t,e,(function(t){if(!r.html5Qrcode)throw"html5Qrcode not defined";tt.isFileScanType(r.currentScanType)&&(r.setHeaderMessage(p.loadingImage()),r.html5Qrcode.scanFileV2(t,!0).then((function(t){r.resetHeaderMessage(),r.qrCodeSuccessCallback(t.decodedText,t)})).catch((function(t){r.setHeaderMessage(t,U.STATUS_WARNING),r.qrCodeErrorCallback(t,u.createFrom(t))})))}))},t.prototype.renderCameraSelection=function(t){var e=this,r=this,n=document.getElementById(this.getDashboardSectionCameraScanRegionId());n.style.textAlign="center";var i=ct.create(n,!1),o=lt.create(n,t),s=document.createElement("span"),a=rt.createElement("button",et.CAMERA_START_BUTTON_ID);a.innerText=p.scanButtonStartScanningText(),s.appendChild(a);var l,c=rt.createElement("button",et.CAMERA_STOP_BUTTON_ID);c.innerText=p.scanButtonStopScanningText(),c.style.display="none",c.disabled=!0,s.appendChild(c),n.appendChild(s);var h=function(t){t||(a.style.display="none"),a.innerText=p.scanButtonStartScanningText(),a.style.opacity="1",a.disabled=!1,t&&(a.style.display="inline-block")};if(a.addEventListener("click",(function(t){a.innerText=p.scanButtonScanningStarting(),o.disable(),a.disabled=!0,a.style.opacity="0.5",e.scanTypeSelector.hasMoreThanOneScanType()&&r.showHideScanTypeSwapLink(!1),r.resetHeaderMessage();var n,u=o.getValue();r.persistedDataManager.setLastUsedCameraId(u),r.html5Qrcode.start(u,(n=r.config,{fps:n.fps,qrbox:n.qrbox,aspectRatio:n.aspectRatio,disableFlip:n.disableFlip,videoConstraints:n.videoConstraints}),r.qrCodeSuccessCallback,r.qrCodeErrorCallback).then((function(t){c.disabled=!1,c.style.display="inline-block",h(!1);var n=r.html5Qrcode.getRunningTrackCameraCapabilities();!0===e.config.showTorchButtonIfSupported&&function(t){t.torchFeature().isSupported()?(l?l.updateTorchCapability(t.torchFeature()):l=st.create(s,t.torchFeature(),{display:"none",marginLeft:"5px"},(function(t){r.setHeaderMessage(t,U.STATUS_WARNING)})),l.show()):l&&l.hide()}(n),!0===e.config.showZoomSliderIfSupported&&function(t){var r=t.zoomFeature();if(r.isSupported()){i.setOnCameraZoomValueChangeCallback((function(t){r.apply(t)}));var n,o,s,a=1;e.config.defaultZoomValueIfSupported&&(a=e.config.defaultZoomValueIfSupported),n=a,o=r.min(),a=n>(s=r.max())?s:n<o?o:n,i.setValues(r.min(),r.max(),a,r.step()),i.show()}}(n)})).catch((function(t){r.showHideScanTypeSwapLink(!0),o.enable(),h(!0),r.setHeaderMessage(t,U.STATUS_WARNING)}))})),o.hasSingleItem()&&a.click(),c.addEventListener("click",(function(t){if(!r.html5Qrcode)throw"html5Qrcode not defined";c.disabled=!0,r.html5Qrcode.stop().then((function(t){e.scanTypeSelector.hasMoreThanOneScanType()&&r.showHideScanTypeSwapLink(!0),o.enable(),a.disabled=!1,c.style.display="none",a.style.display="inline-block",l&&(l.reset(),l.hide()),i.removeOnCameraZoomValueChangeCallback(),i.hide(),r.insertCameraScanImageToScanRegion()})).catch((function(t){c.disabled=!1,r.setHeaderMessage(t,U.STATUS_WARNING)}))})),r.persistedDataManager.getLastUsedCameraId()){var u=r.persistedDataManager.getLastUsedCameraId();o.hasValue(u)?(o.setValue(u),a.click()):r.persistedDataManager.resetLastUsedCameraId()}},t.prototype.createSectionSwap=function(){var t=this,e=p.textIfCameraScanSelected(),r=p.textIfFileScanSelected(),n=document.getElementById(this.getDashboardSectionId()),o=document.createElement("div");o.style.textAlign="center";var s=rt.createElement("span",this.getDashboardSectionSwapLinkId());s.style.textDecoration="underline",s.style.cursor="pointer",s.innerText=tt.isCameraScanType(this.currentScanType)?e:r,s.addEventListener("click",(function(){t.sectionSwapAllowed?(t.resetHeaderMessage(),t.fileSelectionUi.resetValue(),t.sectionSwapAllowed=!1,tt.isCameraScanType(t.currentScanType)?(t.clearScanRegion(),t.getCameraScanRegion().style.display="none",t.fileSelectionUi.show(),s.innerText=r,t.currentScanType=i.SCAN_TYPE_FILE,t.insertFileScanImageToScanRegion()):(t.clearScanRegion(),t.getCameraScanRegion().style.display="block",t.fileSelectionUi.hide(),s.innerText=e,t.currentScanType=i.SCAN_TYPE_CAMERA,t.insertCameraScanImageToScanRegion(),t.startCameraScanIfPermissionExistsOnSwap()),t.sectionSwapAllowed=!0):t.verbose&&t.logger.logError("Section swap called when not allowed")})),o.appendChild(s),n.appendChild(o)},t.prototype.startCameraScanIfPermissionExistsOnSwap=function(){var t=this,e=this;this.persistedDataManager.hasCameraPermissions()&&$.hasPermissions().then((function(r){if(r){var n=document.getElementById(e.getCameraPermissionButtonId());if(!n)throw t.logger.logError("Permission button not found, fail;"),"Permission button not found";n.click()}else e.persistedDataManager.setHasPermission(!1)})).catch((function(t){e.persistedDataManager.setHasPermission(!1)}))},t.prototype.resetHeaderMessage=function(){document.getElementById(this.getHeaderMessageContainerId()).style.display="none"},t.prototype.setHeaderMessage=function(t,e){e||(e=U.STATUS_DEFAULT);var r=this.getHeaderMessageDiv();switch(r.innerText=t,r.style.display="block",e){case U.STATUS_SUCCESS:r.style.background="rgba(106, 175, 80, 0.26)",r.style.color="#477735";break;case U.STATUS_WARNING:r.style.background="rgba(203, 36, 49, 0.14)",r.style.color="#cb2431";break;case U.STATUS_DEFAULT:default:r.style.background="rgba(0, 0, 0, 0)",r.style.color="rgb(17, 17, 17)"}},t.prototype.showHideScanTypeSwapLink=function(t){this.scanTypeSelector.hasMoreThanOneScanType()&&(!0!==t&&(t=!1),this.sectionSwapAllowed=t,this.getDashboardSectionSwapLink().style.display=t?"inline-block":"none")},t.prototype.insertCameraScanImageToScanRegion=function(){var t=this,e=document.getElementById(this.getScanRegionId());if(this.cameraScanImage)return e.innerHTML="<br>",void e.appendChild(this.cameraScanImage);this.cameraScanImage=new Image,this.cameraScanImage.onload=function(r){e.innerHTML="<br>",e.appendChild(t.cameraScanImage)},this.cameraScanImage.width=64,this.cameraScanImage.style.opacity="0.8",this.cameraScanImage.src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzNzEuNjQzIDM3MS42NDMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDM3MS42NDMgMzcxLjY0MyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZD0iTTEwNS4wODQgMzguMjcxaDE2My43Njh2MjBIMTA1LjA4NHoiLz48cGF0aCBkPSJNMzExLjU5NiAxOTAuMTg5Yy03LjQ0MS05LjM0Ny0xOC40MDMtMTYuMjA2LTMyLjc0My0yMC41MjJWMzBjMC0xNi41NDItMTMuNDU4LTMwLTMwLTMwSDEyNS4wODRjLTE2LjU0MiAwLTMwIDEzLjQ1OC0zMCAzMHYxMjAuMTQzaC04LjI5NmMtMTYuNTQyIDAtMzAgMTMuNDU4LTMwIDMwdjEuMzMzYTI5LjgwNCAyOS44MDQgMCAwIDAgNC42MDMgMTUuOTM5Yy03LjM0IDUuNDc0LTEyLjEwMyAxNC4yMjEtMTIuMTAzIDI0LjA2MXYxLjMzM2MwIDkuODQgNC43NjMgMTguNTg3IDEyLjEwMyAyNC4wNjJhMjkuODEgMjkuODEgMCAwIDAtNC42MDMgMTUuOTM4djEuMzMzYzAgMTYuNTQyIDEzLjQ1OCAzMCAzMCAzMGg4LjMyNGMuNDI3IDExLjYzMSA3LjUwMyAyMS41ODcgMTcuNTM0IDI2LjE3Ny45MzEgMTAuNTAzIDQuMDg0IDMwLjE4NyAxNC43NjggNDUuNTM3YTkuOTg4IDkuOTg4IDAgMCAwIDguMjE2IDQuMjg4IDkuOTU4IDkuOTU4IDAgMCAwIDUuNzA0LTEuNzkzYzQuNTMzLTMuMTU1IDUuNjUtOS4zODggMi40OTUtMTMuOTIxLTYuNzk4LTkuNzY3LTkuNjAyLTIyLjYwOC0xMC43Ni0zMS40aDgyLjY4NWMuMjcyLjQxNC41NDUuODE4LjgxNSAxLjIxIDMuMTQyIDQuNTQxIDkuMzcyIDUuNjc5IDEzLjkxMyAyLjUzNCA0LjU0Mi0zLjE0MiA1LjY3Ny05LjM3MSAyLjUzNS0xMy45MTMtMTEuOTE5LTE3LjIyOS04Ljc4Ny0zNS44ODQgOS41ODEtNTcuMDEyIDMuMDY3LTIuNjUyIDEyLjMwNy0xMS43MzIgMTEuMjE3LTI0LjAzMy0uODI4LTkuMzQzLTcuMTA5LTE3LjE5NC0xOC42NjktMjMuMzM3YTkuODU3IDkuODU3IDAgMCAwLTEuMDYxLS40ODZjLS40NjYtLjE4Mi0xMS40MDMtNC41NzktOS43NDEtMTUuNzA2IDEuMDA3LTYuNzM3IDE0Ljc2OC04LjI3MyAyMy43NjYtNy42NjYgMjMuMTU2IDEuNTY5IDM5LjY5OCA3LjgwMyA0Ny44MzYgMTguMDI2IDUuNzUyIDcuMjI1IDcuNjA3IDE2LjYyMyA1LjY3MyAyOC43MzMtLjQxMyAyLjU4NS0uODI0IDUuMjQxLTEuMjQ1IDcuOTU5LTUuNzU2IDM3LjE5NC0xMi45MTkgODMuNDgzLTQ5Ljg3IDExNC42NjEtNC4yMjEgMy41NjEtNC43NTYgOS44Ny0xLjE5NCAxNC4wOTJhOS45OCA5Ljk4IDAgMCAwIDcuNjQ4IDMuNTUxIDkuOTU1IDkuOTU1IDAgMCAwIDYuNDQ0LTIuMzU4YzQyLjY3Mi0zNi4wMDUgNTAuODAyLTg4LjUzMyA1Ni43MzctMTI2Ljg4OC40MTUtMi42ODQuODIxLTUuMzA5IDEuMjI5LTcuODYzIDIuODM0LTE3LjcyMS0uNDU1LTMyLjY0MS05Ljc3Mi00NC4zNDV6bS0yMzIuMzA4IDQyLjYyYy01LjUxNCAwLTEwLTQuNDg2LTEwLTEwdi0xLjMzM2MwLTUuNTE0IDQuNDg2LTEwIDEwLTEwaDE1djIxLjMzM2gtMTV6bS0yLjUtNTIuNjY2YzAtNS41MTQgNC40ODYtMTAgMTAtMTBoNy41djIxLjMzM2gtNy41Yy01LjUxNCAwLTEwLTQuNDg2LTEwLTEwdi0xLjMzM3ptMTcuNSA5My45OTloLTcuNWMtNS41MTQgMC0xMC00LjQ4Ni0xMC0xMHYtMS4zMzNjMC01LjUxNCA0LjQ4Ni0xMCAxMC0xMGg3LjV2MjEuMzMzem0zMC43OTYgMjguODg3Yy01LjUxNCAwLTEwLTQuNDg2LTEwLTEwdi04LjI3MWg5MS40NTdjLS44NTEgNi42NjgtLjQzNyAxMi43ODcuNzMxIDE4LjI3MWgtODIuMTg4em03OS40ODItMTEzLjY5OGMtMy4xMjQgMjAuOTA2IDEyLjQyNyAzMy4xODQgMjEuNjI1IDM3LjA0IDUuNDQxIDIuOTY4IDcuNTUxIDUuNjQ3IDcuNzAxIDcuMTg4LjIxIDIuMTUtMi41NTMgNS42ODQtNC40NzcgNy4yNTEtLjQ4Mi4zNzgtLjkyOS44LTEuMzM1IDEuMjYxLTYuOTg3IDcuOTM2LTExLjk4MiAxNS41Mi0xNS40MzIgMjIuNjg4aC05Ny41NjRWMzBjMC01LjUxNCA0LjQ4Ni0xMCAxMC0xMGgxMjMuNzY5YzUuNTE0IDAgMTAgNC40ODYgMTAgMTB2MTM1LjU3OWMtMy4wMzItLjM4MS02LjE1LS42OTQtOS4zODktLjkxNC0yNS4xNTktMS42OTQtNDIuMzcgNy43NDgtNDQuODk4IDI0LjY2NnoiLz48cGF0aCBkPSJNMTc5LjEyOSA4My4xNjdoLTI0LjA2YTUgNSAwIDAgMC01IDV2MjQuMDYxYTUgNSAwIDAgMCA1IDVoMjQuMDZhNSA1IDAgMCAwIDUtNVY4OC4xNjdhNSA1IDAgMCAwLTUtNXpNMTcyLjYyOSAxNDIuODZoLTEyLjU2VjEzMC44YTUgNSAwIDEgMC0xMCAwdjE3LjA2MWE1IDUgMCAwIDAgNSA1aDE3LjU2YTUgNSAwIDEgMCAwLTEwLjAwMXpNMjE2LjU2OCA4My4xNjdoLTI0LjA2YTUgNSAwIDAgMC01IDV2MjQuMDYxYTUgNSAwIDAgMCA1IDVoMjQuMDZhNSA1IDAgMCAwIDUtNVY4OC4xNjdhNSA1IDAgMCAwLTUtNXptLTUgMjQuMDYxaC0xNC4wNlY5My4xNjdoMTQuMDZ2MTQuMDYxek0yMTEuNjY5IDEyNS45MzZIMTk3LjQxYTUgNSAwIDAgMC01IDV2MTQuMjU3YTUgNSAwIDAgMCA1IDVoMTQuMjU5YTUgNSAwIDAgMCA1LTV2LTE0LjI1N2E1IDUgMCAwIDAtNS01eiIvPjwvc3ZnPg==",this.cameraScanImage.alt=p.cameraScanAltText()},t.prototype.insertFileScanImageToScanRegion=function(){var t=this,e=document.getElementById(this.getScanRegionId());if(this.fileScanImage)return e.innerHTML="<br>",void e.appendChild(this.fileScanImage);this.fileScanImage=new Image,this.fileScanImage.onload=function(r){e.innerHTML="<br>",e.appendChild(t.fileScanImage)},this.fileScanImage.width=64,this.fileScanImage.style.opacity="0.8",this.fileScanImage.src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1OS4wMTggNTkuMDE4IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1OS4wMTggNTkuMDE4IiB4bWw6c3BhY2U9InByZXNlcnZlIj48cGF0aCBkPSJtNTguNzQxIDU0LjgwOS01Ljk2OS02LjI0NGExMC43NCAxMC43NCAwIDAgMCAyLjgyLTcuMjVjMC01Ljk1My00Ljg0My0xMC43OTYtMTAuNzk2LTEwLjc5NlMzNCAzNS4zNjEgMzQgNDEuMzE0IDM4Ljg0MyA1Mi4xMSA0NC43OTYgNTIuMTFjMi40NDEgMCA0LjY4OC0uODI0IDYuNDk5LTIuMTk2bDYuMDAxIDYuMjc3YS45OTguOTk4IDAgMCAwIDEuNDE0LjAzMiAxIDEgMCAwIDAgLjAzMS0xLjQxNHpNMzYgNDEuMzE0YzAtNC44NSAzLjk0Ni04Ljc5NiA4Ljc5Ni04Ljc5NnM4Ljc5NiAzLjk0NiA4Ljc5NiA4Ljc5Ni0zLjk0NiA4Ljc5Ni04Ljc5NiA4Ljc5NlMzNiA0Ni4xNjQgMzYgNDEuMzE0ek0xMC40MzEgMTYuMDg4YzAgMy4wNyAyLjQ5OCA1LjU2OCA1LjU2OSA1LjU2OHM1LjU2OS0yLjQ5OCA1LjU2OS01LjU2OGMwLTMuMDcxLTIuNDk4LTUuNTY5LTUuNTY5LTUuNTY5cy01LjU2OSAyLjQ5OC01LjU2OSA1LjU2OXptOS4xMzggMGMwIDEuOTY4LTEuNjAyIDMuNTY4LTMuNTY5IDMuNTY4cy0zLjU2OS0xLjYwMS0zLjU2OS0zLjU2OCAxLjYwMi0zLjU2OSAzLjU2OS0zLjU2OSAzLjU2OSAxLjYwMSAzLjU2OSAzLjU2OXoiLz48cGF0aCBkPSJtMzAuODgyIDI4Ljk4NyA5LjE4LTEwLjA1NCAxMS4yNjIgMTAuMzIzYTEgMSAwIDAgMCAxLjM1MS0xLjQ3NWwtMTItMTFhMSAxIDAgMCAwLTEuNDE0LjA2M2wtOS43OTQgMTAuNzI3LTQuNzQzLTQuNzQzYTEuMDAzIDEuMDAzIDAgMCAwLTEuMzY4LS4wNDRMNi4zMzkgMzcuNzY4YTEgMSAwIDEgMCAxLjMyMiAxLjUwMWwxNi4zMTMtMTQuMzYyIDcuMzE5IDcuMzE4YS45OTkuOTk5IDAgMSAwIDEuNDE0LTEuNDE0bC0xLjgyNS0xLjgyNHoiLz48cGF0aCBkPSJNMzAgNDYuNTE4SDJ2LTQyaDU0djI4YTEgMSAwIDEgMCAyIDB2LTI5YTEgMSAwIDAgMC0xLTFIMWExIDEgMCAwIDAtMSAxdjQ0YTEgMSAwIDAgMCAxIDFoMjlhMSAxIDAgMSAwIDAtMnoiLz48L3N2Zz4=",this.fileScanImage.alt=p.fileScanAltText()},t.prototype.clearScanRegion=function(){document.getElementById(this.getScanRegionId()).innerHTML=""},t.prototype.getDashboardSectionId=function(){return this.elementId+"__dashboard_section"},t.prototype.getDashboardSectionCameraScanRegionId=function(){return this.elementId+"__dashboard_section_csr"},t.prototype.getDashboardSectionSwapLinkId=function(){return et.SCAN_TYPE_CHANGE_ANCHOR_ID},t.prototype.getScanRegionId=function(){return this.elementId+"__scan_region"},t.prototype.getDashboardId=function(){return this.elementId+"__dashboard"},t.prototype.getHeaderMessageContainerId=function(){return this.elementId+"__header_message"},t.prototype.getCameraPermissionButtonId=function(){return et.CAMERA_PERMISSION_BUTTON_ID},t.prototype.getCameraScanRegion=function(){return document.getElementById(this.getDashboardSectionCameraScanRegionId())},t.prototype.getDashboardSectionSwapLink=function(){return document.getElementById(this.getDashboardSectionSwapLinkId())},t.prototype.getHeaderMessageDiv=function(){return document.getElementById(this.getHeaderMessageContainerId())},t}()})(),__Html5QrcodeLibrary__=n})();if (window) { if (!Html5QrcodeScanner) { var Html5QrcodeScanner = window.__Html5QrcodeLibrary__.Html5QrcodeScanner; } if (!Html5Qrcode) { var Html5Qrcode = window.__Html5QrcodeLibrary__.Html5Qrcode; } if (!Html5QrcodeSupportedFormats) { var Html5QrcodeSupportedFormats = window.__Html5QrcodeLibrary__.Html5QrcodeSupportedFormats } if (!Html5QrcodeScannerState) { var Html5QrcodeScannerState = window.__Html5QrcodeLibrary__.Html5QrcodeScannerState; } if (!Html5QrcodeScanType) { var Html5QrcodeScanType = window.__Html5QrcodeLibrary__.Html5QrcodeScanType; }}
diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index dc1d35f2c..8139730ea 100644
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -94,6 +94,10 @@ namespace('kivi.ActionBar', function(k){
               || (e.target.tagName == 'SELECT')))
         return true;
 
+      // special case ckeditor: if the event originates from the editable area of the ckeditor, ignore it, otherwise we drown in Enter events
+      if (e.target.classList.contains('ck-content'))
+        return true;
+
       if ((target in kivi.ActionBar.Accesskeys.actions) && (accesskey in kivi.ActionBar.Accesskeys.actions[target])) {
         e.stopPropagation();
         kivi.ActionBar.Accesskeys.actions[target][accesskey].click();
diff --git a/js/kivi.ChartReport.js b/js/kivi.ChartReport.js
new file mode 100644
index 000000000..30bae4f82
--- /dev/null
+++ b/js/kivi.ChartReport.js
@@ -0,0 +1,81 @@
+namespace('kivi.ChartReport', function(ns) {
+  "use strict";
+
+  ns.data = undefined;
+
+  ns.background_colors = function() { return [
+    'rgba(255, 0, 0, 0.2)',
+    'rgba(63, 0, 0, 0.2)',
+    'rgba(0, 127, 0, 0.2)',
+    'rgba(0, 0, 191, 0.2)',
+    'rgba(191, 0, 0, 0.2)',
+    'rgba(0, 255, 0, 0.2)',
+    'rgba(0, 63, 0, 0.2)',
+    'rgba(0, 0, 127, 0.2)',
+    'rgba(127, 0, 0, 0.2)',
+    'rgba(0, 191, 0, 0.2)',
+    'rgba(0, 0, 255, 0.2)',
+    'rgba(0, 0, 63, 0.2)'
+  ]};
+
+  ns.border_colors = function() { return [
+    'rgba(255, 0, 0, 1.0)',
+    'rgba(63, 0, 0, 1.0)',
+    'rgba(0, 127, 0, 1.0)',
+    'rgba(0, 0, 191, 1.0)',
+    'rgba(191, 0, 0, 1.0)',
+    'rgba(0, 255, 0, 1.0)',
+    'rgba(0, 63, 0, 1.0)',
+    'rgba(0, 0, 127, 1.0)',
+    'rgba(127, 0, 0, 1.0)',
+    'rgba(0, 191, 0, 1.0)',
+    'rgba(0, 0, 255, 1.0)',
+    'rgba(0, 0, 63, 1.0)'
+  ]};
+
+  ns.chart = function() {
+    $(ns.data.datasets).each(function(idx, elt) {
+      $(elt).each(function(idx) {elt[idx] = kivi.parse_amount('' + elt[idx]);console.log(elt[idx]);});
+    });
+
+    const datasets = [];
+    for (let i = 0; i < ns.data.data_labels.length; i++) {
+      const set = [];
+      $(ns.data.datasets).each(function(idx, elt) {set.push(elt[i]);});
+      const colots = [];
+      datasets.push({label: ns.data.data_labels[i],
+                     data: set,
+                     backgroundColor: ns.background_colors()[i % ns.background_colors().length],
+                     borderColor: ns.border_colors()[i % ns.border_colors().length],
+                     borderWidth: 1
+                    });
+    }
+
+    const ctx = 'chart';
+    const chart = new Chart(ctx, {
+      type: 'bar',
+      data: {
+        labels: ns.data.labels,
+        datasets: datasets,
+      },
+      options: {
+        scales: {
+          y: {
+            beginAtZero: true
+          }
+        }
+      }
+    });
+  };
+
+  ns.debug = function() {
+    console.log("bb: labels: "); console.log(ns.data.labels);
+    console.log("bb: datasets: "); console.log(ns.data.datasets);
+    console.log("bb: data_labels: "); console.log(ns.data.data_labels);
+  };
+
+  $(function() {
+    kivi.ChartReport.debug();
+    kivi.ChartReport.chart();
+  });
+});
diff --git a/js/kivi.CustomerVendor.js b/js/kivi.CustomerVendor.js
index 02a2c2eb9..f3065a6bf 100644
--- a/js/kivi.CustomerVendor.js
+++ b/js/kivi.CustomerVendor.js
@@ -70,7 +70,7 @@ namespace('kivi.CustomerVendor', function(ns) {
         kivi.Part.Picker($ctrl).set_item({ id: cvar.id, name: cvar.value });
 
       else
-        $ctrl.val(cvar.value);
+        $ctrl.val(cvar.value).change();
     }
   };
 
@@ -168,7 +168,7 @@ namespace('kivi.CustomerVendor', function(ns) {
       $widgetWrapper = $(widgetWrapper);
 
       $widgetWrapper
-        .html('<img src="image/map.png" alt="'+ kivi.t8("Map") +'" title="'+ kivi.t8("Map") +'" />')
+        .html('<img class="icon-map" alt="'+ kivi.t8("Map") +'" title="'+ kivi.t8("Map") +'" />')
         .click(function() {
           showMap();
         });
@@ -508,6 +508,63 @@ namespace('kivi.CustomerVendor', function(ns) {
     });
   }
 
+  this.check_cv = function(cv_id, input_element_id, cv_type) {
+    if (cv_id === '' || $(input_element_id).val() === '') {
+      if (cv_type === 'customer') {
+        alert(kivi.t8('Please select a customer.'));
+      } else {
+        alert(kivi.t8('Please select a vendor.'));
+      }
+      return false;
+    }
+    return true;
+  };
+
+  this.show_cv_details_dialog = function(id_selector, cv_type) {
+
+    const input_element_id = `${id_selector}_name`;
+    const cv_id = $(id_selector).val();
+
+    if (!this.check_cv(cv_id, input_element_id, cv_type)) return;
+
+    kivi.popup_dialog({
+      url:    'controller.pl',
+      data:   { action: 'CustomerVendor/show_customer_vendor_details_dialog',
+                type  : $('#type').val(),
+                cv    : cv_type,
+                cv_id : cv_id
+              },
+      id:     'jq_customer_vendor_details_dialog',
+      dialog: {
+        title:  cv_type === 'customer' ? kivi.t8('Customer details') : kivi.t8('Vendor details'),
+        width:  800,
+        height: 650
+      }
+    });
+    return true;
+  };
+
+  this.contacts_update_email_fields = function() {
+    $('.update_email').each(function(idx, elt) {
+      let $link = $('#' + $(elt).attr('id') + '_link');
+      if ($(elt).val() !== '') {
+        $link.attr('href', 'mailto:' + $(elt).val());
+        $link.show();
+      } else {
+        $link.hide();
+      }
+    });
+  };
+
+  this.open_customervendor_tab = function(id_selector, cv_type) {
+    const input_element_id = `${id_selector}_name`;
+    const cv_id = $(id_selector).val();
+
+    if (!this.check_cv(cv_id, input_element_id, cv_type)) return;
+
+    window.open("controller.pl?action=CustomerVendor/edit&db=" + encodeURIComponent(cv_type) + "&id=" + encodeURIComponent(cv_id), '_blank');
+  };
+
   $(function(){
     ns.init();
     ns.price_list_init();
diff --git a/js/kivi.CustomerVendorTurnover.js b/js/kivi.CustomerVendorTurnover.js
index 62923bb12..170329d17 100644
--- a/js/kivi.CustomerVendorTurnover.js
+++ b/js/kivi.CustomerVendorTurnover.js
@@ -35,14 +35,147 @@ namespace('kivi.CustomerVendorTurnover', function(ns) {
     $('#mails').load(url);
   };
 
+  ns.show_turnover = function(period, year_for_month) {
+    ns.show_turnover_chart(period, year_for_month);
+    ns.show_turnover_stat(period);
+  };
+
   ns.show_turnover_stat = function(period) {
+    let mode = 'year';
+    if (period === 'm') mode = 'month';
+    const url = 'controller.pl?action=CustomerVendorTurnover/turnover&id=' + $('#cv_id').val() + '&db=' + $('#db').val() + '&mode=' + mode;
+    $('#turnovers').load(url);
+  };
+
+  ns.show_turnover_chart = function(period, year_for_month) {
+    let mode = "month";
     if (period === 'y') {
-      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_year&id=' + $('#cv_id').val() + '&db=' + $('#db').val();
-      $('#turnovers').load(url);
-    } else {
-      var url = 'controller.pl?action=CustomerVendorTurnover/turnover_by_month&id=' + $('#cv_id').val() + '&db=' + $('#db').val();
-      $('#turnovers').load(url);
+      mode    = "year";
+      year_for_month = undefined;
+    } else if (period === 'm') {
+      mode    = "month";
     }
+
+    const data = { action: 'CustomerVendorTurnover/turnover.json',
+                   id:   $('#cv_id').val(),
+                   db:   $('#db').val(),
+                   mode: mode,
+                   year: year_for_month
+                 };
+    $.getJSON('controller.pl', data, function( returned_data ) {
+      const html = '<canvas id="turnovers_chart" height="70vH"></canvas>';
+      $('#turnovers_chart_container').html(html);
+      ns.draw_chart(returned_data);
+    });
+  };
+
+  ns.draw_chart = function(data) {
+    $(data).each(function(idx, elt) {
+      elt.date_part = '' + elt.date_part;
+    });
+
+    ns.chart(data);
+  };
+
+  ns.background_colors = function() { return [
+    'rgba(255, 0, 0, 0.2)',
+    'rgba(191, 0, 0, 0.2)',
+    'rgba(127, 0, 0, 0.2)',
+    'rgba(63, 0, 0, 0.2)',
+    'rgba(0, 255, 0, 0.2)',
+    'rgba(0, 191, 0, 0.2)',
+    'rgba(0, 127, 0, 0.2)',
+    'rgba(0, 63, 0, 0.2)',
+    'rgba(0, 0, 255, 0.2)',
+    'rgba(0, 0, 191, 0.2)',
+    'rgba(0, 0, 127, 0.2)',
+    'rgba(0, 0, 63, 0.2)'
+  ]};
+
+  ns.border_colors = function() { return [
+    'rgba(255, 0, 0, 1)',
+    'rgba(191, 0, 0, 1)',
+    'rgba(127, 0, 0, 1)',
+    'rgba(63, 0, 0, 1)',
+    'rgba(0, 255, 0, 1)',
+    'rgba(0, 191, 0, 1)',
+    'rgba(0, 127, 0, 1)',
+    'rgba(0, 63, 0, 1)',
+    'rgba(0, 0, 255, 1)',
+    'rgba(0, 0, 191, 1)',
+    'rgba(0, 0, 127, 1)',
+    'rgba(0, 0, 63, 1)'
+  ]};
+
+  ns.chart = function(data) {
+    const ctx = 'turnovers_chart';
+    const chart = new Chart(ctx, {
+      type: 'bar',
+      data: {
+        datasets: [{
+          label: kivi.t8('Net.Turnover'),
+          data: data,
+          backgroundColor: ns.background_colors,
+          borderColor: ns.border_colors,
+          borderWidth: 1
+        },
+        {
+          label: kivi.t8('Overall Net.Turnover'),
+          data: data,
+          type: 'line',
+          backgroundColor: 'black',
+        }]
+      },
+      options: {
+        scales: {
+          y: {
+            beginAtZero: true
+          }
+        },
+        parsing: {
+          xAxisKey: 'date_part',
+          yAxisKey: ['netamount', 'overall_netamount']
+        },
+        onClick: (e) => {
+          const canvasPosition = Chart.helpers.getRelativePosition(e, chart);
+
+          // Substitute the appropriate scale IDs
+          const dataX = chart.scales.x.getValueForPixel(canvasPosition.x);
+          const dataY = chart.scales.y.getValueForPixel(canvasPosition.y);
+
+          if ((data[dataX].date_part || "").match(/^\d{1,4}$/)) {
+            ns.show_turnover('m', data[dataX].date_part);
+          } else {
+            ns.show_turnover('y');
+          }
+        }
+      }
+    });
+  };
+
+  ns.cv_tabs_init = function () {
+    $("#customer_vendor_tabs").on('tabsbeforeactivate', function(event, ui){
+      if (ui.newPanel.attr('id') == 'quotations') {
+        ns.get_sales_quotations();
+      }
+      if (ui.newPanel.attr('id') == 'turnover_stat') {
+        ns.show_turnover("y");
+      }
+      return 1;
+    });
+
+    $("#customer_vendor_tabs").on('tabscreate', function(event, ui){
+      if (ui.panel.attr('id') == 'quotations') {
+        ns.get_sales_quotations();
+      }
+      if (ui.panel.attr('id') == 'turnover_stat') {
+        ns.show_turnover("y");
+      }
+      return 1;
+    });
   };
 
+  $(function(){
+    ns.cv_tabs_init();
+  });
 });
diff --git a/js/kivi.DeliveryOrder.js b/js/kivi.DeliveryOrder.js
index 00a929450..5d5a67fd2 100644
--- a/js/kivi.DeliveryOrder.js
+++ b/js/kivi.DeliveryOrder.js
@@ -45,14 +45,30 @@ namespace('kivi.DeliveryOrder', function(ns) {
     }
   };
 
-  ns.save = function(action, warn_on_duplicates, warn_on_reqdate) {
+  ns.save = function(params) {
     if (!ns.check_cv()) return;
+
+    const action             = params.action;
+    const warn_on_duplicates = params.warn_on_duplicates;
+    const warn_on_reqdate    = params.warn_on_reqdate;
+    const form_params        = params.form_params;
+
     if (warn_on_duplicates && !ns.check_duplicate_parts()) return;
     if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'DeliveryOrder/' + action });
 
+    if (form_params) {
+      if (Array.isArray(form_params)) {
+        form_params.forEach(function(item) {
+          data.push(item);
+        });
+      } else {
+        data.push(form_params);
+      }
+    }
+
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
@@ -63,8 +79,26 @@ namespace('kivi.DeliveryOrder', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
-  ns.show_print_options = function(warn_on_duplicates, warn_on_reqdate) {
+  ns.close_order = function() {
+    let data = [];
+    let id = $("#id").val();
+
+    if (!id) {
+      alert(kivi.t8('This object has not been saved yet.'));
+      return;
+    }
+
+    data.push({ name: 'id', value: id });
+    data.push({ name: 'action', value: 'DeliveryOrder/close_order' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.show_print_options = function(params) {
     if (!ns.check_cv()) return;
+
+    const warn_on_duplicates = params.warn_on_duplicates;
+    const warn_on_reqdate    = params.warn_on_reqdate;
+
     if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
     if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
 
@@ -78,11 +112,31 @@ namespace('kivi.DeliveryOrder', function(ns) {
     });
   };
 
+  ns.stock_in_out_dialog_row_by_id = function(id) {
+    var $row = $("#row_table_id .row_entry").eq(id).find("tr").first().find("td").first();
+    return $row;
+  };
+
+  ns.next_stock_in_out_dialog = function(id) {
+    ns.save_updated_stock(false);
+
+    var $row = ns.stock_in_out_dialog_row_by_id(id);
+    var in_out = $("#stock_in_out_dialog").find("[name$=in_out]").val();
+
+    if ($row.length != 0)
+      ns.open_stock_in_out_dialog($row, in_out);
+  };
+
   ns.open_stock_in_out_dialog = function(clicked, in_out) {
     var $row = $(clicked).parents("tbody").first();
     var id = $row.find('[name="orderitem_ids[+]"]').val();
     $row.uniqueId();
 
+    var pos = $(clicked).parents('.row_entry').find('tr td div[name="position"]').text();
+
+    var $next_row = ns.stock_in_out_dialog_row_by_id(pos);
+    var next_button = ($next_row.length != 0);
+
     kivi.popup_dialog({
       id: "stock_in_out_dialog",
       url: "controller.pl?action=DeliveryOrder/stock_in_out_dialog",
@@ -95,20 +149,47 @@ namespace('kivi.DeliveryOrder', function(ns) {
         stock:         $row.find("[name$=stock_info]").val(),
         item_id:       id,
         row:           $row.attr("id"),
+        row_ui_id:     pos,
+        next_button:   next_button,
       },
       dialog: { title: kivi.t8('Transfer stock') }
     });
   };
 
-  ns.save_updated_stock = function() {
+  ns.add_stock_in_line_to_dialog = function() {
+    let qty_sum = 0;
+    let row_count = 0;
+    $("#stock-in-out-table tr.data-row").each((i,row) => {
+      let qty = kivi.parse_amount($(row).find(".data-qty").val());
+
+      row_count = row_count + 1;
+      if (qty === 0) return;
+      if (qty === null) return;
+      qty_sum = qty_sum + qty;
+    });
+
+    let data = [];
+    data.push(
+      { name: 'action', value: 'DeliveryOrder/add_stock_in_line_to_dialog' },
+      { name: 'type', value: $("#type").val()},
+      { name: 'qty_sum', value: qty_sum },
+      { name: 'row_count', value: row_count},
+      { name: 'parts_id', value: $("#parts_id").val()},
+      { name: 'do_qty', value:  $("#do_qty").val()},
+    );
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.save_updated_stock = function(close_dialog) {
     // stock information is saved in DOM as a yaml dump.
     // we don't want to do this in javascript so we do a tiny roundtrip to the backend
 
     let data = [];
-    $("#stock-in-out-table tr.listrow").each((i,row) => {
+    $("#stock-in-out-table tr.data-row").each((i,row) => {
       let qty = kivi.parse_amount($(row).find(".data-qty").val());
 
-      if (qty === 0) return;
+      if (qty === 0 || qty === null) return;
 
       data.push({
         qty:                           qty,
@@ -133,7 +214,9 @@ namespace('kivi.DeliveryOrder', function(ns) {
       (data) => {
         $("#" + row + " .data-stock-info").val(data.stock_info);
         $("#" + row + " .data-stock-qty").text(data.stock_qty)
-        $("#stock_in_out_dialog").dialog("close");
+        if (close_dialog) {
+          $("#stock_in_out_dialog").dialog("close");
+        }
       }
     );
   };
@@ -576,38 +659,6 @@ namespace('kivi.DeliveryOrder', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
-  ns.show_vc_details_dialog = function() {
-    if (!ns.check_cv()) return;
-    var vc;
-    var vc_id;
-    var title;
-    if ($('#order_customer_id').val()) {
-      vc    = 'customer';
-      vc_id = $('#order_customer_id').val();
-      title = kivi.t8('Customer details');
-    } else {
-      vc    = 'vendor';
-      vc_id = $('#order_vendor_id').val();
-      title = kivi.t8('Vendor details');
-    }
-
-    kivi.popup_dialog({
-      url:    'controller.pl',
-      data:   { action: 'DeliveryOrder/show_customer_vendor_details_dialog',
-                type  : $('#type').val(),
-                vc    : vc,
-                vc_id : vc_id
-              },
-      id:     'jq_customer_vendor_details_dialog',
-      dialog: {
-        title:  title,
-        width:  800,
-        height: 650
-      }
-    });
-    return true;
-  };
-
   ns.update_row_from_master_data = function(clicked) {
     var row = $(clicked).parents("tbody").first();
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
@@ -701,7 +752,7 @@ namespace('kivi.DeliveryOrder', function(ns) {
     $('#direct-delivery-dialog').remove();
 
     var text1 = kivi.t8('You have entered or selected the following shipping address for this customer:');
-    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?');
+    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?');
     var html  = '<div id="direct-delivery-dialog"><p>' + text1 + '</p><p>' + shipto + '</p><p>' + text2 + '</p>';
     html      = html + '<hr><p>';
     html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.DeliveryOrder.direct_delivery_callback(true)">';
@@ -720,17 +771,12 @@ namespace('kivi.DeliveryOrder', function(ns) {
     var id   = $('#id').val();
     var type = $('#type').val();
 
-    var number_info = '';
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
-      number_info = $('#order_ordnumber').val();
-    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') {
-      number_info = $('#order_quonumber').val();
-    }
+    var number_info = $('#order_donumber').val();
 
     var name_info = '';
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
+    if ($('#order_customer_id_name').val()) {
       name_info = $('#order_customer_id_name').val();
-    } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') {
+    } else if ($('#order_vendor_id_name').val()) {
       name_info = $('#order_vendor_id_name').val();
     }
 
@@ -738,7 +784,7 @@ namespace('kivi.DeliveryOrder', function(ns) {
     if (number_info !== '') { info += ' (' + number_info + ')' }
     if (name_info   !== '') { info += ' (' + name_info + ')' }
 
-    if (!$('#follow_up_rowcount').lenght) {
+    if (!$('#follow_up_rowcount').length) {
       $('<input type="hidden" name="follow_up_rowcount"        id="follow_up_rowcount">').appendTo('#order_form');
       $('<input type="hidden" name="follow_up_trans_id_1"      id="follow_up_trans_id_1">').appendTo('#order_form');
       $('<input type="hidden" name="follow_up_trans_type_1"    id="follow_up_trans_type_1">').appendTo('#order_form');
diff --git a/js/kivi.DispositionManager.js b/js/kivi.DispositionManager.js
new file mode 100644
index 000000000..88adbff23
--- /dev/null
+++ b/js/kivi.DispositionManager.js
@@ -0,0 +1,63 @@
+namespace('kivi.DispositionManager', function(ns) {
+  ns.sort_vendors = function() {
+    ns.display_vendor_parts($('#vendor_id').val());
+    $("#basket_items tr").each(function(_index) {
+      if(
+        $(this).find("select[name='vendor_ids[]']").val() != $('#vendor_id').val()
+        && $('#vendor_id').val() != ''
+      ) {
+        $(this).find("[name='ids[+]']").prop("checked", false);
+        this.style.display = "none";
+      } else {
+        this.style.removeProperty('display');
+      }
+    });
+  }
+
+  ns.display_vendor_parts = function(vendor_id) {
+    var url = 'controller.pl?action=DispositionManager/show_vendor_items&vendor_id=' + vendor_id;
+    $('#vendor_parts').load(url);
+  }
+
+  ns.create_purchase_order = function() {
+    var data = $('#purchasebasket').serializeArray();
+    data.push({ name: 'action', value: 'DispositionManager/transfer_to_purchase_order' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.delete_purchase_basket_items = function() {
+    var data = $('#purchasebasket').serializeArray();
+    data.push({
+      name:  'action',
+      value: 'DispositionManager/delete_purchase_basket_items' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.show_detail_dialog = function(part_id,partnumber) {
+    if ( part_id && partnumber ) {
+      var title  = kivi.t8('Details of article number "#1"',[partnumber]);
+      kivi.popup_dialog({
+        url:     'controller.pl',
+        data: {
+          action: 'Part/showdetails',
+          id    : part_id,
+        },
+        id:     'detail_menu',
+        dialog: {
+          title: title,
+          width:  900,
+          height: 600,
+          modal:  false
+        }
+      });
+    }
+    return true;
+  };
+});
+
+$(function() {
+ $('#vendor_id').change('set_item:CustomerVendorPicker', function(_e,_o) {
+   kivi.DispositionManager.sort_vendors();
+   $('#vendor_id_selected').val($('#vendor_id').val());
+ })
+});
diff --git a/js/kivi.EmailJournal.js b/js/kivi.EmailJournal.js
new file mode 100644
index 000000000..acd72e672
--- /dev/null
+++ b/js/kivi.EmailJournal.js
@@ -0,0 +1,75 @@
+namespace('kivi.EmailJournal', function(ns) {
+  'use strict';
+
+  ns.update_attachment_preview = function() {
+    let $form = $('#record_action_form');
+
+    let data = $form.serializeArray();
+    data.push({ name: 'action', value: 'EmailJournal/update_attachment_preview' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.update_email_workflow_options = function() {
+    let customer_vendor = $('#customer_vendor_selection').val();
+    let record_action = $('#action_selection').val();
+
+    // Hide all div
+    ['customer', 'vendor'].forEach(function(cv) {
+      $(`#${cv}_div`).hide();
+      ['workflow_record', 'template_record', 'linking_record', 'new_record'].forEach(function(action) {
+        $(`#${cv}_${action}_types_div`).hide();
+
+      });
+    });
+    $('#new_record_div').hide();
+    $('#template_record_div').hide();
+    $('#record_selection_div').hide();
+
+    // Enable needed div
+    $(`#${customer_vendor}_div`).show();
+    $(`#${customer_vendor}_${record_action}_types_div`).show();
+    if (record_action == 'new_record') {
+      $('#new_record_div').show();
+      $('#new_record_div').css('display','inline-block')
+    } else {
+      $('#record_selection_div').show();
+      kivi.EmailJournal.update_record_list();
+    }
+  }
+
+  ns.update_record_list = function() {
+    let $form = $('#record_action_form');
+
+    let data = $form.serializeArray();
+    data.push({ name: 'action', value: 'EmailJournal/update_record_list' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.apply_action_with_attachment = function(record_id, record_type) {
+    let data = $('#record_action_form').serializeArray();
+    data.push({ name: 'action', value: 'EmailJournal/apply_record_action' });
+    data.push({ name: 'record_id', value: record_id });
+    data.push({ name: 'record_type', value: record_type });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.ap_transaction_template_with_zugferd_import = function(record_id, record_type) {
+    let data = $('#record_action_form').serializeArray();
+    data.push({ name: 'action', value: 'EmailJournal/ap_transaction_template_with_zugferd_import' });
+    data.push({ name: 'record_id', value: record_id });
+    data.push({ name: 'record_type', value: record_type });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.toggle_obsolete = function(email_journal_id) {
+    let data = $('#record_action_form').serializeArray();
+    data.push({ name: 'action', value: 'EmailJournal/toggle_obsolete' });
+    data.push({ name: 'id', value: email_journal_id });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+});
diff --git a/js/kivi.File.js b/js/kivi.File.js
index 55aa4eab8..f23506f7b 100644
--- a/js/kivi.File.js
+++ b/js/kivi.File.js
@@ -14,11 +14,11 @@ namespace('kivi.File', function(ns) {
       alert(kivi.t8("More than one file selected, please set only one checkbox!"));
       return false;
     }
-    var file_id = checkboxes[0].value;
-    $('#newfilename_id_'+file_type).val($('#filename_'+file_id).text());
+    var file_guid = checkboxes[0].value;
+    $('#newfilename_id_'+file_type).val($('#filename_'+file_guid).text());
     $('#next_ids_id_'+file_type).val('');
     $('#is_global_id_'+file_type).val(is_global);
-    $('#rename_id_id_'+file_type).val(file_id);
+    $('#rename_id_id_'+file_type).val(file_guid);
     $('#sessionfile_id_'+file_type).val('');
     $('#rename_extra_text_'+file_type).html('');
     kivi.popup_dialog({
@@ -44,7 +44,7 @@ namespace('kivi.File', function(ns) {
     $("#rename_dialog_"+file_type).dialog('close');
     var data = {
       action:          'File/ajax_rename',
-      id:              $('#rename_id_id_'+file_type).val(),
+      id:              $('#rename_id_id_'+file_type).val(), //guid
       to:              $('#newfilename_id_'+file_type).val(),
       next_ids:        $('#next_ids_id_'+file_type).val(),
       is_global:       $('#is_global_id_'+file_type).val(),
@@ -54,9 +54,9 @@ namespace('kivi.File', function(ns) {
     return true;
   }
 
-  ns.askForRename = function(file_id,file_type,file_name,sessionfile,next_ids,is_global) {
+  ns.askForRename = function(file_guid,file_type,file_name,sessionfile,next_ids,is_global) {
     $('#newfilename_id_'+file_type).val(file_name);
-    $('#rename_id_id_'+file_type).val(file_id);
+    $('#rename_id_id_'+file_type).val(file_guid);
     $('#is_global_id_'+file_type).val(is_global);
     $('#next_ids_id_'+file_type).val(next_ids);
     $('#sessionfile_id_'+file_type).val(sessionfile);
diff --git a/js/kivi.Inventory.js b/js/kivi.Inventory.js
index 622199a8a..175f5bab2 100644
--- a/js/kivi.Inventory.js
+++ b/js/kivi.Inventory.js
@@ -53,7 +53,7 @@ namespace('kivi.Inventory', function(ns) {
   };
 
   ns.beep = function() {
-    var snd = new Audio("data:audio/wav;base64,//uQRAAAAWMSLwUIYAAsYkXgoQwAEaYLWfkWgAI0wWs/ItAAAGDgYtAgAyN+QWaAAihwMWm4G8QQRDiMcCBcH3Cc+CDv/7xA4Tvh9Rz/y8QADBwMWgQAZG/ILNAARQ4GLTcDeIIIhxGOBAuD7hOfBB3/94gcJ3w+o5/5eIAIAAAVwWgQAVQ2ORaIQwEMAJiDg95G4nQL7mQVWI6GwRcfsZAcsKkJvxgxEjzFUgfHoSQ9Qq7KNwqHwuB13MA4a1q/DmBrHgPcmjiGoh//EwC5nGPEmS4RcfkVKOhJf+WOgoxJclFz3kgn//dBA+ya1GhurNn8zb//9NNutNuhz31f////9vt///z+IdAEAAAK4LQIAKobHItEIYCGAExBwe8jcToF9zIKrEdDYIuP2MgOWFSE34wYiR5iqQPj0JIeoVdlG4VD4XA67mAcNa1fhzA1jwHuTRxDUQ//iYBczjHiTJcIuPyKlHQkv/LHQUYkuSi57yQT//uggfZNajQ3Vmz+Zt//+mm3Wm3Q576v////+32///5/EOgAAADVghQAAAAA//uQZAUAB1WI0PZugAAAAAoQwAAAEk3nRd2qAAAAACiDgAAAAAAABCqEEQRLCgwpBGMlJkIz8jKhGvj4k6jzRnqasNKIeoh5gI7BJaC1A1AoNBjJgbyApVS4IDlZgDU5WUAxEKDNmmALHzZp0Fkz1FMTmGFl1FMEyodIavcCAUHDWrKAIA4aa2oCgILEBupZgHvAhEBcZ6joQBxS76AgccrFlczBvKLC0QI2cBoCFvfTDAo7eoOQInqDPBtvrDEZBNYN5xwNwxQRfw8ZQ5wQVLvO8OYU+mHvFLlDh05Mdg7BT6YrRPpCBznMB2r//xKJjyyOh+cImr2/4doscwD6neZjuZR4AgAABYAAAABy1xcdQtxYBYYZdifkUDgzzXaXn98Z0oi9ILU5mBjFANmRwlVJ3/6jYDAmxaiDG3/6xjQQCCKkRb/6kg/wW+kSJ5//rLobkLSiKmqP/0ikJuDaSaSf/6JiLYLEYnW/+kXg1WRVJL/9EmQ1YZIsv/6Qzwy5qk7/+tEU0nkls3/zIUMPKNX/6yZLf+kFgAfgGyLFAUwY//uQZAUABcd5UiNPVXAAAApAAAAAE0VZQKw9ISAAACgAAAAAVQIygIElVrFkBS+Jhi+EAuu+lKAkYUEIsmEAEoMeDmCETMvfSHTGkF5RWH7kz/ESHWPAq/kcCRhqBtMdokPdM7vil7RG98A2sc7zO6ZvTdM7pmOUAZTnJW+NXxqmd41dqJ6mLTXxrPpnV8avaIf5SvL7pndPvPpndJR9Kuu8fePvuiuhorgWjp7Mf/PRjxcFCPDkW31srioCExivv9lcwKEaHsf/7ow2Fl1T/9RkXgEhYElAoCLFtMArxwivDJJ+bR1HTKJdlEoTELCIqgEwVGSQ+hIm0NbK8WXcTEI0UPoa2NbG4y2K00JEWbZavJXkYaqo9CRHS55FcZTjKEk3NKoCYUnSQ0rWxrZbFKbKIhOKPZe1cJKzZSaQrIyULHDZmV5K4xySsDRKWOruanGtjLJXFEmwaIbDLX0hIPBUQPVFVkQkDoUNfSoDgQGKPekoxeGzA4DUvnn4bxzcZrtJyipKfPNy5w+9lnXwgqsiyHNeSVpemw4bWb9psYeq//uQZBoABQt4yMVxYAIAAAkQoAAAHvYpL5m6AAgAACXDAAAAD59jblTirQe9upFsmZbpMudy7Lz1X1DYsxOOSWpfPqNX2WqktK0DMvuGwlbNj44TleLPQ+Gsfb+GOWOKJoIrWb3cIMeeON6lz2umTqMXV8Mj30yWPpjoSa9ujK8SyeJP5y5mOW1D6hvLepeveEAEDo0mgCRClOEgANv3B9a6fikgUSu/DmAMATrGx7nng5p5iimPNZsfQLYB2sDLIkzRKZOHGAaUyDcpFBSLG9MCQALgAIgQs2YunOszLSAyQYPVC2YdGGeHD2dTdJk1pAHGAWDjnkcLKFymS3RQZTInzySoBwMG0QueC3gMsCEYxUqlrcxK6k1LQQcsmyYeQPdC2YfuGPASCBkcVMQQqpVJshui1tkXQJQV0OXGAZMXSOEEBRirXbVRQW7ugq7IM7rPWSZyDlM3IuNEkxzCOJ0ny2ThNkyRai1b6ev//3dzNGzNb//4uAvHT5sURcZCFcuKLhOFs8mLAAEAt4UWAAIABAAAAAB4qbHo0tIjVkUU//uQZAwABfSFz3ZqQAAAAAngwAAAE1HjMp2qAAAAACZDgAAAD5UkTE1UgZEUExqYynN1qZvqIOREEFmBcJQkwdxiFtw0qEOkGYfRDifBui9MQg4QAHAqWtAWHoCxu1Yf4VfWLPIM2mHDFsbQEVGwyqQoQcwnfHeIkNt9YnkiaS1oizycqJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//8elePK/Lf//IInrOF/FvDoADYAGBMGb7FtErm5MXMlmPAJQVgWta7Zx2go+8xJ0UiCb8LHHdftWyLJE0QIAIsI+UbXu67dZMjmgDGCGl1H+vpF4NSDckSIkk7Vd+sxEhBQMRU8j/12UIRhzSaUdQ+rQU5kGeFxm+hb1oh6pWWmv3uvmReDl0UnvtapVaIzo1jZbf/pD6ElLqSX+rUmOQNpJFa/r+sa4e/pBlAABoAAAAA3CUgShLdGIxsY7AUABPRrgCABdDuQ5GC7DqPQCgbbJUAoRSUj+NIEig0YfyWUho1VBBBA//uQZB4ABZx5zfMakeAAAAmwAAAAF5F3P0w9GtAAACfAAAAAwLhMDmAYWMgVEG1U0FIGCBgXBXAtfMH10000EEEEEECUBYln03TTTdNBDZopopYvrTTdNa325mImNg3TTPV9q3pmY0xoO6bv3r00y+IDGid/9aaaZTGMuj9mpu9Mpio1dXrr5HERTZSmqU36A3CumzN/9Robv/Xx4v9ijkSRSNLQhAWumap82WRSBUqXStV/YcS+XVLnSS+WLDroqArFkMEsAS+eWmrUzrO0oEmE40RlMZ5+ODIkAyKAGUwZ3mVKmcamcJnMW26MRPgUw6j+LkhyHGVGYjSUUKNpuJUQoOIAyDvEyG8S5yfK6dhZc0Tx1KI/gviKL6qvvFs1+bWtaz58uUNnryq6kt5RzOCkPWlVqVX2a/EEBUdU1KrXLf40GoiiFXK///qpoiDXrOgqDR38JB0bw7SoL+ZB9o1RCkQjQ2CBYZKd/+VJxZRRZlqSkKiws0WFxUyCwsKiMy7hUVFhIaCrNQsKkTIsLivwKKigsj8XYlwt/WKi2N4d//uQRCSAAjURNIHpMZBGYiaQPSYyAAABLAAAAAAAACWAAAAApUF/Mg+0aohSIRobBAsMlO//Kk4soosy1JSFRYWaLC4qZBYWFRGZdwqKiwkNBVmoWFSJkWFxX4FFRQWR+LsS4W/rFRb/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////VEFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU291bmRib3kuZGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMjAwNGh0dHA6Ly93d3cuc291bmRib3kuZGUAAAAAAAAAACU=");  
+    var snd = new Audio("data:audio/wav;base64,//uQRAAAAWMSLwUIYAAsYkXgoQwAEaYLWfkWgAI0wWs/ItAAAGDgYtAgAyN+QWaAAihwMWm4G8QQRDiMcCBcH3Cc+CDv/7xA4Tvh9Rz/y8QADBwMWgQAZG/ILNAARQ4GLTcDeIIIhxGOBAuD7hOfBB3/94gcJ3w+o5/5eIAIAAAVwWgQAVQ2ORaIQwEMAJiDg95G4nQL7mQVWI6GwRcfsZAcsKkJvxgxEjzFUgfHoSQ9Qq7KNwqHwuB13MA4a1q/DmBrHgPcmjiGoh//EwC5nGPEmS4RcfkVKOhJf+WOgoxJclFz3kgn//dBA+ya1GhurNn8zb//9NNutNuhz31f////9vt///z+IdAEAAAK4LQIAKobHItEIYCGAExBwe8jcToF9zIKrEdDYIuP2MgOWFSE34wYiR5iqQPj0JIeoVdlG4VD4XA67mAcNa1fhzA1jwHuTRxDUQ//iYBczjHiTJcIuPyKlHQkv/LHQUYkuSi57yQT//uggfZNajQ3Vmz+Zt//+mm3Wm3Q576v////+32///5/EOgAAADVghQAAAAA//uQZAUAB1WI0PZugAAAAAoQwAAAEk3nRd2qAAAAACiDgAAAAAAABCqEEQRLCgwpBGMlJkIz8jKhGvj4k6jzRnqasNKIeoh5gI7BJaC1A1AoNBjJgbyApVS4IDlZgDU5WUAxEKDNmmALHzZp0Fkz1FMTmGFl1FMEyodIavcCAUHDWrKAIA4aa2oCgILEBupZgHvAhEBcZ6joQBxS76AgccrFlczBvKLC0QI2cBoCFvfTDAo7eoOQInqDPBtvrDEZBNYN5xwNwxQRfw8ZQ5wQVLvO8OYU+mHvFLlDh05Mdg7BT6YrRPpCBznMB2r//xKJjyyOh+cImr2/4doscwD6neZjuZR4AgAABYAAAABy1xcdQtxYBYYZdifkUDgzzXaXn98Z0oi9ILU5mBjFANmRwlVJ3/6jYDAmxaiDG3/6xjQQCCKkRb/6kg/wW+kSJ5//rLobkLSiKmqP/0ikJuDaSaSf/6JiLYLEYnW/+kXg1WRVJL/9EmQ1YZIsv/6Qzwy5qk7/+tEU0nkls3/zIUMPKNX/6yZLf+kFgAfgGyLFAUwY//uQZAUABcd5UiNPVXAAAApAAAAAE0VZQKw9ISAAACgAAAAAVQIygIElVrFkBS+Jhi+EAuu+lKAkYUEIsmEAEoMeDmCETMvfSHTGkF5RWH7kz/ESHWPAq/kcCRhqBtMdokPdM7vil7RG98A2sc7zO6ZvTdM7pmOUAZTnJW+NXxqmd41dqJ6mLTXxrPpnV8avaIf5SvL7pndPvPpndJR9Kuu8fePvuiuhorgWjp7Mf/PRjxcFCPDkW31srioCExivv9lcwKEaHsf/7ow2Fl1T/9RkXgEhYElAoCLFtMArxwivDJJ+bR1HTKJdlEoTELCIqgEwVGSQ+hIm0NbK8WXcTEI0UPoa2NbG4y2K00JEWbZavJXkYaqo9CRHS55FcZTjKEk3NKoCYUnSQ0rWxrZbFKbKIhOKPZe1cJKzZSaQrIyULHDZmV5K4xySsDRKWOruanGtjLJXFEmwaIbDLX0hIPBUQPVFVkQkDoUNfSoDgQGKPekoxeGzA4DUvnn4bxzcZrtJyipKfPNy5w+9lnXwgqsiyHNeSVpemw4bWb9psYeq//uQZBoABQt4yMVxYAIAAAkQoAAAHvYpL5m6AAgAACXDAAAAD59jblTirQe9upFsmZbpMudy7Lz1X1DYsxOOSWpfPqNX2WqktK0DMvuGwlbNj44TleLPQ+Gsfb+GOWOKJoIrWb3cIMeeON6lz2umTqMXV8Mj30yWPpjoSa9ujK8SyeJP5y5mOW1D6hvLepeveEAEDo0mgCRClOEgANv3B9a6fikgUSu/DmAMATrGx7nng5p5iimPNZsfQLYB2sDLIkzRKZOHGAaUyDcpFBSLG9MCQALgAIgQs2YunOszLSAyQYPVC2YdGGeHD2dTdJk1pAHGAWDjnkcLKFymS3RQZTInzySoBwMG0QueC3gMsCEYxUqlrcxK6k1LQQcsmyYeQPdC2YfuGPASCBkcVMQQqpVJshui1tkXQJQV0OXGAZMXSOEEBRirXbVRQW7ugq7IM7rPWSZyDlM3IuNEkxzCOJ0ny2ThNkyRai1b6ev//3dzNGzNb//4uAvHT5sURcZCFcuKLhOFs8mLAAEAt4UWAAIABAAAAAB4qbHo0tIjVkUU//uQZAwABfSFz3ZqQAAAAAngwAAAE1HjMp2qAAAAACZDgAAAD5UkTE1UgZEUExqYynN1qZvqIOREEFmBcJQkwdxiFtw0qEOkGYfRDifBui9MQg4QAHAqWtAWHoCxu1Yf4VfWLPIM2mHDFsbQEVGwyqQoQcwnfHeIkNt9YnkiaS1oizycqJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//8elePK/Lf//IInrOF/FvDoADYAGBMGb7FtErm5MXMlmPAJQVgWta7Zx2go+8xJ0UiCb8LHHdftWyLJE0QIAIsI+UbXu67dZMjmgDGCGl1H+vpF4NSDckSIkk7Vd+sxEhBQMRU8j/12UIRhzSaUdQ+rQU5kGeFxm+hb1oh6pWWmv3uvmReDl0UnvtapVaIzo1jZbf/pD6ElLqSX+rUmOQNpJFa/r+sa4e/pBlAABoAAAAA3CUgShLdGIxsY7AUABPRrgCABdDuQ5GC7DqPQCgbbJUAoRSUj+NIEig0YfyWUho1VBBBA//uQZB4ABZx5zfMakeAAAAmwAAAAF5F3P0w9GtAAACfAAAAAwLhMDmAYWMgVEG1U0FIGCBgXBXAtfMH10000EEEEEECUBYln03TTTdNBDZopopYvrTTdNa325mImNg3TTPV9q3pmY0xoO6bv3r00y+IDGid/9aaaZTGMuj9mpu9Mpio1dXrr5HERTZSmqU36A3CumzN/9Robv/Xx4v9ijkSRSNLQhAWumap82WRSBUqXStV/YcS+XVLnSS+WLDroqArFkMEsAS+eWmrUzrO0oEmE40RlMZ5+ODIkAyKAGUwZ3mVKmcamcJnMW26MRPgUw6j+LkhyHGVGYjSUUKNpuJUQoOIAyDvEyG8S5yfK6dhZc0Tx1KI/gviKL6qvvFs1+bWtaz58uUNnryq6kt5RzOCkPWlVqVX2a/EEBUdU1KrXLf40GoiiFXK///qpoiDXrOgqDR38JB0bw7SoL+ZB9o1RCkQjQ2CBYZKd/+VJxZRRZlqSkKiws0WFxUyCwsKiMy7hUVFhIaCrNQsKkTIsLivwKKigsj8XYlwt/WKi2N4d//uQRCSAAjURNIHpMZBGYiaQPSYyAAABLAAAAAAAACWAAAAApUF/Mg+0aohSIRobBAsMlO//Kk4soosy1JSFRYWaLC4qZBYWFRGZdwqKiwkNBVmoWFSJkWFxX4FFRQWR+LsS4W/rFRb/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////VEFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU291bmRib3kuZGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMjAwNGh0dHA6Ly93d3cuc291bmRib3kuZGUAAAAAAAAAACU=");
     snd.play();
   };
 
diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index 9ef6ef58d..e3d206062 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -1,6 +1,6 @@
 namespace('kivi.Order', function(ns) {
   ns.check_cv = function() {
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
+    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
       if ($('#order_customer_id').val() === '') {
         alert(kivi.t8('Please select a customer.'));
         return false;
@@ -45,15 +45,32 @@ namespace('kivi.Order', function(ns) {
     }
   };
 
-  ns.save = function(action, warn_on_duplicates, warn_on_reqdate, back_to_caller) {
+  ns.save = function(params) {
     if (!ns.check_cv()) return;
+
+    const action             = params.action;
+    const warn_on_duplicates = params.warn_on_duplicates;
+    const warn_on_reqdate    = params.warn_on_reqdate;
+    const form_params        = params.form_params;
+
     if (warn_on_duplicates && !ns.check_duplicate_parts()) return;
     if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/' + action });
 
-    if (back_to_caller) data.push({ name: 'back_to_caller', value: '1' });
+    if (form_params) {
+      if (Array.isArray(form_params)) {
+        form_params.forEach(function(item) {
+          data.push(item);
+        });
+      } else {
+        data.push(form_params);
+      }
+    }
+
+    if (params.data)
+      data = $.merge(data, params.data);
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
@@ -65,8 +82,12 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
-  ns.show_print_options = function(warn_on_duplicates, warn_on_reqdate) {
+  ns.show_print_options = function(params) {
     if (!ns.check_cv()) return;
+
+    const warn_on_duplicates = params.warn_on_duplicates;
+    const warn_on_reqdate    = params.warn_on_reqdate;
+
     if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
     if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
 
@@ -230,9 +251,11 @@ namespace('kivi.Order', function(ns) {
           } else {
             rate_input.val('');
           }
+          $('#order_exchangerate_as_null_number').data('validate', 'required');
           $('#exchangerate_settings').show();
         } else {
           rate_input.val('');
+          $('#order_exchangerate_as_null_number').data('validate', '');
           $('#exchangerate_settings').hide();
         }
         if ($('#order_currency_id').val() != $('#old_currency_id').val() ||
@@ -526,6 +549,23 @@ namespace('kivi.Order', function(ns) {
     $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
   };
 
+  ns.scroll_page_after_row_insert = function(id) {
+    // find row height and border spacing
+    const $id_input = $('input[name="orderitem_ids[+]"][value="'+id+'"]');
+    const $row = $id_input.closest('tr');
+    const table = $row.closest('table')[0];
+    const style = getComputedStyle(table);
+
+    const height = $row[0].offsetHeight + parseFloat(style.borderSpacing) || 0;
+
+    // if site is scrollable and scrolling can put it where it was before: do scroll
+    const max_scroll = document.documentElement.scrollHeight - window.innerHeight;
+
+    if (window.scrollY + height <= max_scroll) {
+      window.scrollBy(0, height)
+    }
+  }
+
   ns.show_longdescription_dialog = function(clicked) {
     var row                 = $(clicked).parents("tbody").first();
     var position            = $(row).find('[name="position"]').html();
@@ -697,38 +737,6 @@ namespace('kivi.Order', function(ns) {
     return true;
   };
 
-  ns.show_vc_details_dialog = function() {
-    if (!ns.check_cv()) return;
-    var vc;
-    var vc_id;
-    var title;
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
-      vc    = 'customer';
-      vc_id = $('#order_customer_id').val();
-      title = kivi.t8('Customer details');
-    } else {
-      vc    = 'vendor';
-      vc_id = $('#order_vendor_id').val();
-      title = kivi.t8('Vendor details');
-    }
-
-    kivi.popup_dialog({
-      url:    'controller.pl',
-      data:   { action: 'Order/show_customer_vendor_details_dialog',
-                type  : $('#type').val(),
-                vc    : vc,
-                vc_id : vc_id
-              },
-      id:     'jq_customer_vendor_details_dialog',
-      dialog: {
-        title:  title,
-        width:  800,
-        height: 650
-      }
-    });
-    return true;
-  };
-
   ns.update_row_from_master_data = function(clicked) {
     var row = $(clicked).parents("tbody").first();
     var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
@@ -772,9 +780,12 @@ namespace('kivi.Order', function(ns) {
     kivi.SalesPurchase.edit_custom_shipto();
   };
 
-  ns.purchase_order_check_for_direct_delivery = function() {
-    if ($('#type').val() != 'sales_order') {
-      kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order');
+  ns.purchase_check_for_direct_delivery = function(params) {
+    const to_type = params.to_type;
+
+    if ($('#type').val() != 'sales_quotation' && $('#type').val() != 'sales_order_intake' && $('#type').val() != 'sales_order') {
+      kivi.submit_ajax_form("controller.pl", '#order_form', {action: 'Order/save_and_order_workflow', to_type: to_type});
+      return;
     }
 
     var empty = true;
@@ -800,34 +811,33 @@ namespace('kivi.Order', function(ns) {
       shipto = shipto_elements.join('; ');
     }
 
-    var use_it = false;
     if (!empty) {
-      ns.direct_delivery_dialog(shipto);
+      ns.direct_delivery_dialog(shipto, to_type);
     } else {
-      kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order');
+      kivi.submit_ajax_form("controller.pl", '#order_form', {action: 'Order/save_and_order_workflow', to_type: to_type});
     }
   };
 
-  ns.direct_delivery_callback = function(accepted) {
+  ns.direct_delivery_callback = function(accepted, to_type) {
     $('#direct-delivery-dialog').dialog('close');
 
     if (accepted) {
       $('<input type="hidden" name="use_shipto">').appendTo('#order_form').val('1');
     }
 
-    kivi.submit_form_with_action($('#order_form'), 'Order/purchase_order');
+    kivi.submit_ajax_form("controller.pl", '#order_form', {action: 'Order/save_and_order_workflow', to_type: to_type});
   };
 
-  ns.direct_delivery_dialog = function(shipto) {
+  ns.direct_delivery_dialog = function(shipto, to_type) {
     $('#direct-delivery-dialog').remove();
 
     var text1 = kivi.t8('You have entered or selected the following shipping address for this customer:');
-    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?');
+    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?');
     var html  = '<div id="direct-delivery-dialog"><p>' + text1 + '</p><p>' + shipto + '</p><p>' + text2 + '</p>';
     html      = html + '<hr><p>';
-    html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.Order.direct_delivery_callback(true)">';
+    html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.Order.direct_delivery_callback(true,  \'' + to_type + '\')">';
     html      = html + '&nbsp;';
-    html      = html + '<input type="button" value="' + kivi.t8('No')  + '" size="30" onclick="kivi.Order.direct_delivery_callback(false)">';
+    html      = html + '<input type="button" value="' + kivi.t8('No')  + '" size="30" onclick="kivi.Order.direct_delivery_callback(false, \'' + to_type + '\')">';
     html      = html + '</p></div>';
     $(html).hide().appendTo('#order_form');
 
@@ -842,16 +852,16 @@ namespace('kivi.Order', function(ns) {
     var type = $('#type').val();
 
     var number_info = '';
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
+    if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order' || $('#type').val() == 'purchase_order_confirmation') {
       number_info = $('#order_ordnumber').val();
-    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') {
+    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation' || $('#type').val() == 'purchase_quotation_intake') {
       number_info = $('#order_quonumber').val();
     }
 
     var name_info = '';
-    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
+    if ($('#order_customer_id_name').val()) {
       name_info = $('#order_customer_id_name').val();
-    } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') {
+    } else if ($('#order_vendor_id_name').val()) {
       name_info = $('#order_vendor_id_name').val();
     }
 
@@ -909,7 +919,7 @@ namespace('kivi.Order', function(ns) {
     $('#phone_note_edit_text').html(kivi.t8('Edit note'));
     $('#phone_note_id').val(id);
     $('#phone_note_subject').val(subject);
-    $('#phone_note_body').val(body);
+    $('#phone_note_body').val(body).change();
     $('#phone_note_delete_button').show();
   };
 
@@ -917,7 +927,7 @@ namespace('kivi.Order', function(ns) {
     $('#phone_note_edit_text').html(kivi.t8('Add note'));
     $('#phone_note_id').val('');
     $('#phone_note_subject').val('');
-    $('#phone_note_body').val('');
+    $('#phone_note_body').val('').change();
     $('#phone_note_delete_button').hide();
   };
 
@@ -937,10 +947,50 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
+  ns.show_purchase_delivery_order_select_items = function(params) {
+    var data = $('#order_form').serializeArray();
+    data.push({ name: 'action', value: 'Order/show_conversion_to_purchase_delivery_order_item_selection' });
+
+    kivi.popup_dialog({
+      id:     "convert_to_purchase_delivery_order_item_position_selection",
+      url:    "controller.pl",
+      data:   data,
+      type:   "POST",
+      dialog: { title: kivi.t8("Select items for delivery order") },
+      load:   function() {
+        $("body").data("convert_to_purchase_delivery_order_item_position_selection_params", params);
+      }
+    });
+  };
+
+  ns.convert_to_purchase_delivery_order_item_selection = function() {
+    let params = $("body").data("convert_to_purchase_delivery_order_item_position_selection_params");
+
+    let $dialog = $("#convert_to_purchase_delivery_order_item_position_selection");
+    let selected_items = $dialog.find("tbody input.item_position_selection_checkall").serializeArray();
+    params.data = selected_items;
+
+    additional_param = { name: 'only_selected_item_positions', value: 1 };
+    if (params.form_params) {
+      if (Array.isArray(params.form_params)) {
+        params.form_params.push(additional_param);
+      } else {
+        params.form_params = [params.form_params];
+        params.form_params.push(additional_param);
+      }
+    } else {
+      params.form_params = [additional_param];
+    }
+
+    $dialog.dialog('close');
+    $dialog.remove();
+
+    kivi.Order.save(params);
+  };
 });
 
 $(function() {
-  if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
+  if ($('#type').val() == 'sales_order_intake' || $('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
     $('#order_customer_id').change(kivi.Order.reload_cv_dependent_selections);
   } else {
     $('#order_vendor_id').change(kivi.Order.reload_cv_dependent_selections);
diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index 6207569f6..9e6a756e8 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -22,6 +22,13 @@ namespace('kivi.Part', function(ns) {
     $('#ic').submit();
   };
 
+  ns.print_from_showdetail = function(part_id) {
+    var data = $('#print_options_form').serializeArray();
+    data.push({ name: 'action', value: 'Part/print_label' });
+    data.push({ name: 'part.id', value: part_id });
+  $.download("controller.pl", data);
+  };
+
   ns.delete = function() {
     var data = $('#ic').serializeArray();
     data.push({ name: 'action', value: 'Part/delete' });
@@ -264,6 +271,32 @@ namespace('kivi.Part', function(ns) {
     $("#makemodel_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
   };
 
+  // businessmodel
+  ns.businessmodel_renumber_positions = function() {
+    $('.businessmodel_row [name="position"]').each(function(idx, elt) {
+      $(elt).html(idx+1);
+    });
+  };
+
+  ns.delete_businessmodel_row = function(clicked) {
+    var row = $(clicked).closest('tr');
+    $(row).remove();
+
+    ns.businessmodel_renumber_positions();
+  };
+
+  ns.add_businessmodel_row = function() {
+    if ($('#add_businessmodel').val() === '') return;
+
+    var data = $('#businessmodel_table :input').serializeArray();
+    data.push({ name: 'action', value: 'Part/add_businessmodel_row' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.focus_last_businessmodel_input = function () {
+    $("#businessmodel_rows tr:last").find('input[type=text]').filter(':visible:first').focus();
+  };
 
   // customerprice
   ns.customerprice_renumber_positions = function() {
@@ -330,6 +363,7 @@ namespace('kivi.Part', function(ns) {
     this.last_real          = $real.val();
     this.$dummy             = $($real.siblings()[0]);
     this.autocomplete_open  = false;
+    this.menu_above         = false;
     this.state              = this.STATES.PICKED;
     this.last_dummy         = this.$dummy.val();
     this.timer              = undefined;
@@ -367,6 +401,11 @@ namespace('kivi.Part', function(ns) {
       if (this.o.convertible_unit)
         data['filter.unit_obj.convertible_to'] = this.o.convertible_unit;
 
+      if (this.o.order_locked)
+        data['filter.order_locked'] = 1;
+      if (this.o.not_order_locked)
+        data['filter.order_locked'] = 0;
+
       var filter_name = 'all';
       if (this.o.with_makemodel) {
         filter_name = 'all_with_makemodel';
@@ -465,6 +504,8 @@ namespace('kivi.Part', function(ns) {
     handle_keydown: function(event) {
       var self = this;
       if (event.which == KEY.ENTER || event.which == KEY.TAB) {
+        self.$dummy.autocomplete('close');
+
         // if string is empty assume they want to delete
         if (self.$dummy.val() === '') {
           self.set_item({});
@@ -531,6 +572,32 @@ namespace('kivi.Part', function(ns) {
             event.preventDefault();
         },
         open: function() {
+          const $widget = self.$dummy.autocomplete('widget');
+          const input_bound = self.$dummy[0].getBoundingClientRect();
+
+          // safe inner viewport height without scrollbars
+          const viewport_height = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
+
+          // logic:
+          // if the widget was already open, keep position
+          // if fits above but not below: render above
+          // else: render below
+          if (!self.autocomplete_open) {
+            if (input_bound.top > $widget.height() && input_bound.bottom + $widget.height() > viewport_height) {
+              $widget.position({ my: "left bottom", at: "left top", of: self.$dummy });
+              self.menu_above = true;
+            } else {
+              $widget.position({ my: "left top", at: "left bottom", of: self.$dummy });
+              self.menu_above = false;
+            }
+          } else {
+            if (self.menu_above) {
+              $widget.position({ my: "left bottom", at: "left top", of: self.$dummy });
+            } else {
+              $widget.position({ my: "left top", at: "left bottom", of: self.$dummy });
+            }
+          }
+
           self.autocomplete_open = true;
         },
         close: function() {
@@ -792,12 +859,23 @@ namespace('kivi.Part', function(ns) {
     kivi.run_once_for('#makemodel_rows', 'makemodel_row_sort_renumber', function(elt) {
       $(elt).on('sortstop', kivi.Part.makemodel_renumber_positions);
     });
+
+    kivi.run_once_for('#businessmodel_rows', 'businessmodel_row_sort_renumber', function(elt) {
+      $(elt).on('sortstop', kivi.Part.businessmodel_renumber_positions);
+    });
   };
 
   ns.init = function() {
     ns.reinit_widgets();
   };
 
+  ns.add_to_basket = function() {
+    var data = $('#ic').serializeArray();
+    data.push({ name: 'action', value: 'Part/add_to_basket' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
   $(function(){
     $('#ic').on('focusout', '.reformat_number', function(event) {
       ns.reformat_number(event);
diff --git a/js/kivi.Presenter.DatePeriodPicker.js b/js/kivi.Presenter.DatePeriodPicker.js
new file mode 100644
index 000000000..9dfc73881
--- /dev/null
+++ b/js/kivi.Presenter.DatePeriodPicker.js
@@ -0,0 +1,63 @@
+namespace('kivi.ReportPeriod', function(ns) {
+
+  ns.open_dialog = function(el) {
+
+    ns.current_id = el.parentNode.id;
+
+    ns.current_dialog = $(`#${ ns.current_id }_preset_dialog`).dialog({
+      title: kivi.t8('Select from preset'),
+      width:  340,
+      height: 330,
+      modal: true,
+    });
+  }
+
+  ns.apply_preset = function() {
+
+    const year = $(`#${ ns.current_id }_preset_dialog_year`).val();
+    const type = $(`input[name="${ ns.current_id }_preset_dialog_type"]:checked`).val();
+    const quarter = $(`#${ ns.current_id }_preset_dialog_quarter`).val();
+    const month = $(`#${ ns.current_id }_preset_dialog_month`).val();
+
+    let duetyp = 13; // (yearly)
+    if (type === 'quarterly') {
+      duetyp = quarter;
+    } else if (type === 'monthly') {
+      duetyp = month;
+    }
+    ns.set_from_to(duetyp, year);
+
+    $(`#${ ns.current_id }_selected_preset_year`).val(year);
+    $(`#${ ns.current_id }_selected_preset_type`).val(type);
+    $(`#${ ns.current_id }_selected_preset_quarter`).val(quarter);
+    $(`#${ ns.current_id }_selected_preset_month`).val(month);
+
+    ns.current_dialog.dialog('close');
+    $(`#${ ns.current_id }_preset_dialog_button`)
+  }
+
+  ns.set_from_to = function (duetyp, year) {
+    const date = {
+      1:  [ 1,  1, 1,  31 ],
+      2:  [ 2,  1, 2,  new Date(year, 1, 29).getMonth() == 1 ? 29 : 28 ],
+      3:  [ 3,  1, 3,  31 ],
+      4:  [ 4,  1, 4,  30 ],
+      5:  [ 5,  1, 5,  31 ],
+      6:  [ 6,  1, 6,  30 ],
+      7:  [ 7,  1, 7,  31 ],
+      8:  [ 8,  1, 8,  31 ],
+      9:  [ 9,  1, 9,  30 ],
+      10: [ 10, 1, 10, 31 ],
+      11: [ 11, 1, 11, 30 ],
+      12: [ 12, 1, 12, 31 ],
+      13: [  1, 1, 12, 31 ],
+      'A': [ 1,  1, 3,  31 ],
+      'B': [ 4,  1, 6,  30 ],
+      'C': [ 7,  1, 9,  30 ],
+      'D': [ 10, 1, 12, 31 ]
+    }[duetyp];
+
+    $(`#${ ns.current_id }_from_date`).val(kivi.format_date(new Date(year, date[0]-1, date[1])));
+    $(`#${ ns.current_id }_to_date`).val(kivi.format_date(new Date(year, date[2]-1, date[3])));
+  }
+});
\ No newline at end of file
diff --git a/js/kivi.PriceRule.js b/js/kivi.PriceRule.js
index aba59873c..bb324bb98 100644
--- a/js/kivi.PriceRule.js
+++ b/js/kivi.PriceRule.js
@@ -62,7 +62,7 @@ namespace('kivi.PriceRule', function(ns) {
       ns.add_new_row($('#price_rules_empty_item_select').val());
     });
     $('#price_rule_items').on('click', 'a.price_rule_remove_line', function(){
-      $(this).closest('div').remove();
+      $(this).closest('.price_rule_item').remove();
     })
     $('#price_rule_price_type_help').click(ns.open_price_type_help_popup);
     $('#price_rule_filter_type').change(ns.on_change_filter_type);
diff --git a/js/kivi.Reclamation.js b/js/kivi.Reclamation.js
new file mode 100644
index 000000000..5ca582627
--- /dev/null
+++ b/js/kivi.Reclamation.js
@@ -0,0 +1,928 @@
+namespace('kivi.Reclamation', function(ns) {
+  ns.check_cv = function() {
+    if ($('#type').val() == 'sales_reclamation') {
+      if ($('#reclamation_customer_id').val() === '') {
+        alert(kivi.t8('Please select a customer.'));
+        return false;
+      }
+    } else  {
+      if ($('#reclamation_vendor_id').val() === '') {
+        alert(kivi.t8('Please select a vendor.'));
+        return false;
+      }
+    }
+    return true;
+  };
+
+  ns.check_duplicate_parts = function(question) {
+    var id_arr = $('[name="reclamation.reclamation_items[].parts_id"]').map(function() { return this.value; }).get();
+
+    var i, obj = {}, pos = [];
+
+    for (i = 0; i < id_arr.length; i++) {
+      var id = id_arr[i];
+      if (obj.hasOwnProperty(id)) {
+        pos.push(i + 1);
+      }
+      obj[id] = 0;
+    }
+
+    if (pos.length > 0) {
+      question = question || kivi.t8("Do you really want to continue?");
+      return confirm(kivi.t8("There are duplicate parts at positions") + "\n"
+                     + pos.join(', ') + "\n"
+                     + question);
+    }
+    return true;
+  };
+
+  ns.check_valid_reqdate = function() {
+    if ($('#reclamation_reqdate_as_date').val() === '') {
+      alert(kivi.t8('Please select a deadline date.'));
+      return false;
+    } else {
+      return true;
+    }
+  };
+
+  ns.check_valid_reasons = function() {
+    var positions_with_empty = [];
+
+    $('.row_entry').each(function(idx, elt) {
+      if ($(elt).find('[name="reclamation.reclamation_items[].reason_id"]').val() == '') {
+        positions_with_empty.push(idx+1);
+      }
+    });
+
+    if (positions_with_empty.length > 0) {
+      alert(kivi.t8("There are parts with no reclamation reason at position:") + "\n"
+            + positions_with_empty.join(', ') );
+      return false;
+    } else {
+      return true;
+    }
+  };
+
+  ns.save = function(params) {
+    if (!ns.check_cv()) return;
+
+    const action             = params.action;
+    const warn_on_duplicates = params.warn_on_duplicates;
+    const warn_on_reqdate    = params.warn_on_reqdate;
+    const form_params        = params.form_params;
+
+    if (warn_on_duplicates && !ns.check_duplicate_parts()) return;
+    if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
+    if (!ns.check_valid_reasons())                     return;
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/' + action });
+    if (form_params) {
+      if (Array.isArray(form_params)) {
+        form_params.forEach(function(item) {
+          data.push(item);
+        });
+      } else {
+        data.push(form_params);
+      }
+    }
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.delete_reclamation = function() {
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/delete' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.show_print_options = function(warn_on_duplicates, warn_on_reqdate) {
+    if (!ns.check_cv()) return;
+    if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
+    if (warn_on_reqdate    && !ns.check_valid_reqdate())   return;
+
+    kivi.popup_dialog({
+      id: 'print_options',
+      dialog: {
+        title: kivi.t8('Print options'),
+        width:  800,
+        height: 300
+      }
+    });
+  };
+
+  ns.print = function() {
+    $('#print_options').dialog('close');
+
+    var data = $('#reclamation_form').serializeArray();
+    data = data.concat($('#print_options_form').serializeArray());
+    data.push({ name: 'action', value: 'Reclamation/print' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  var email_dialog;
+
+  ns.setup_send_email_dialog = function() {
+    kivi.SalesPurchase.show_all_print_options_elements();
+    kivi.SalesPurchase.show_print_options_elements([ 'sendmode', 'media', 'copies', 'remove_draft' ], false);
+
+    $('#print_options_form table').first().remove().appendTo('#email_form_print_options');
+
+    var to_focus = $('#email_form_to').val() === '' ? 'to' : 'subject';
+    $('#email_form_' + to_focus).focus();
+  };
+
+  ns.finish_send_email_dialog = function() {
+    kivi.SalesPurchase.show_all_print_options_elements();
+
+    $('#email_form_print_options table').first().remove().prependTo('#print_options_form');
+    return true;
+  };
+
+  ns.show_email_dialog = function(html) {
+    var id            = 'send_email_dialog';
+    var dialog_params = {
+      id:     id,
+      width:  800,
+      height: 600,
+      title:  kivi.t8('Send email'),
+      modal:  true,
+      beforeClose: kivi.Reclamation.finish_send_email_dialog,
+      close: function(event, ui) {
+        email_dialog.remove();
+      }
+    };
+
+    $('#' + id).remove();
+
+    email_dialog = $('<div style="display:none" id="' + id + '"></div>').appendTo('body');
+    email_dialog.html(html);
+    email_dialog.dialog(dialog_params);
+
+    kivi.Reclamation.setup_send_email_dialog();
+
+    $('.cancel').click(ns.close_email_dialog);
+
+    return true;
+  };
+
+  ns.send_email = function() {
+    // push button only once -> slow response from mail server
+    ns.email_dialog_disable_send();
+
+    var data = $('#reclamation_form').serializeArray();
+    data = data.concat($('[name^="email_form."]').serializeArray());
+    data = data.concat($('[name^="print_options."]').serializeArray());
+    data.push({ name: 'action', value: 'Reclamation/send_email' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.email_dialog_disable_send = function() {
+    // disable mail send event to prevent
+    // impatient users to send multiple times
+    $('#send_email').prop('disabled', true);
+  };
+
+  ns.close_email_dialog = function() {
+    email_dialog.dialog("close");
+  };
+
+  ns.set_number_in_title = function(elt) {
+    $('#nr_in_title').html($(elt).val());
+  };
+
+  ns.reload_cv_dependent_selections = function() {
+    $('#reclamation_shipto_id').val('');
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/customer_vendor_changed' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.reformat_number = function(event) {
+    $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2));
+  };
+
+  ns.reformat_number_as_null_number = function(event) {
+    if ($(event.target).val() === '') {
+      return;
+    }
+    ns.reformat_number(event);
+  };
+
+  ns.update_exchangerate = function(event) {
+    if (!ns.check_cv()) {
+      $('#reclamation_currency_id').val($('#old_currency_id').val());
+      return;
+    }
+
+    var rate_input = $('#reclamation_exchangerate_as_null_number');
+    // unset exchangerate if currency changed
+    if ($('#reclamation_currency_id').val() !== $('#old_currency_id').val()) {
+      rate_input.val('');
+    }
+
+    // only set exchangerate if unset
+    if (rate_input.val() !== '') {
+      return;
+    }
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/update_exchangerate' });
+
+    $.ajax({
+      url: 'controller.pl',
+      data: data,
+      method: 'POST',
+      dataType: 'json',
+      success: function(data){
+        if (!data.is_standard) {
+          $('#currency_name').text(data.currency_name);
+          if (data.exchangerate) {
+            rate_input.val(data.exchangerate);
+          } else {
+            rate_input.val('');
+          }
+          $('#reclamation_exchangerate_as_null_number').data('validate', 'required');
+          $('#exchangerate_settings').show();
+        } else {
+          rate_input.val('');
+          $('#reclamation_exchangerate_as_null_number').data('validate', '');
+          $('#exchangerate_settings').hide();
+        }
+        if ($('#reclamation_currency_id').val() != $('#old_currency_id').val() ||
+            !data.is_standard && data.exchangerate != $('#old_exchangerate').val()) {
+          kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
+        }
+        $('#old_currency_id').val($('#reclamation_currency_id').val());
+        $('#old_exchangerate').val(data.exchangerate);
+      }
+    });
+  };
+
+  ns.exchangerate_changed = function(event) {
+    if (kivi.parse_amount($('#reclamation_exchangerate_as_null_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) {
+      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
+      $('#old_exchangerate').val($('#reclamation_exchangerate_as_null_number').val());
+    }
+  };
+
+  ns.recalc_amounts_and_taxes = function() {
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/recalc_amounts_and_taxes' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.unit_change = function(event) {
+    var row           = $(event.target).parents("tbody").first();
+    var item_id_dom   = $(row).find('[name="reclamation_item_ids[+]"]');
+    var sellprice_dom = $(row).find('[name="reclamation.reclamation_items[].sellprice_as_number"]');
+    var select_elt    = $(row).find('[name="reclamation.reclamation_items[].unit"]');
+
+    var oldval = $(select_elt).data('oldval');
+    $(select_elt).data('oldval', $(select_elt).val());
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action',           value: 'Reclamation/unit_changed'     },
+              { name: 'item_id',          value: item_id_dom.val()        },
+              { name: 'old_unit',         value: oldval                   },
+              { name: 'sellprice_dom_id', value: sellprice_dom.attr('id') });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.update_sellprice = function(item_id, price_str) {
+    var row       = $('#item_' + item_id).parents("tbody").first();
+    var price_elt = $(row).find('[name="reclamation.reclamation_items[].sellprice_as_number"]');
+    var html_elt  = $(row).find('[name="sellprice_text"]');
+    price_elt.val(price_str);
+    html_elt.html(price_str);
+  };
+
+  ns.load_second_row = function(row) {
+    var item_id_dom = $(row).find('[name="reclamation_item_ids[+]"]');
+    var div_elt     = $(row).find('[name="second_row"]');
+
+    if ($(div_elt).data('loaded') == 1) {
+      return;
+    }
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action',     value: 'Reclamation/load_second_rows' },
+              { name: 'item_ids[]', value: item_id_dom.val()        });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.load_all_second_rows = function() {
+    var rows = $('.row_entry').filter(function(idx, elt) {
+      return $(elt).find('[name="second_row"]').data('loaded') != 1;
+    });
+
+    var item_ids = $.map(rows, function(elt) {
+      var item_id = $(elt).find('[name="reclamation_item_ids[+]"]').val();
+      return { name: 'item_ids[]', value: item_id };
+    });
+
+    if (item_ids.length == 0) {
+      return;
+    }
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/load_second_rows' });
+    data = data.concat(item_ids);
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.hide_second_row = function(row) {
+    $(row).children().not(':first').hide();
+    $(row).data('expanded', 0);
+    var elt = $(row).find('.expand');
+    elt.attr('src', "image/expand.svg");
+    elt.attr('alt', kivi.t8('Show details'));
+    elt.attr('title', kivi.t8('Show details'));
+  };
+
+  ns.show_second_row = function(row) {
+    $(row).children().not(':first').show();
+    $(row).data('expanded', 1);
+    var elt = $(row).find('.expand');
+    elt.attr('src', "image/collapse.svg");
+    elt.attr('alt', kivi.t8('Hide details'));
+    elt.attr('title', kivi.t8('Hide details'));
+  };
+
+  ns.toggle_second_row = function(row) {
+    if ($(row).data('expanded') == 1) {
+      ns.hide_second_row(row);
+    } else {
+      ns.show_second_row(row);
+    }
+  };
+
+  ns.init_row_handlers = function() {
+    kivi.run_once_for('.recalc', 'on_change_recalc', function(elt) {
+      $(elt).change(ns.recalc_amounts_and_taxes);
+    });
+
+    kivi.run_once_for('.reformat_number', 'on_change_reformat', function(elt) {
+      $(elt).change(ns.reformat_number);
+    });
+
+    kivi.run_once_for('.unitselect', 'on_change_unit_with_oldval', function(elt) {
+      $(elt).data('oldval', $(elt).val());
+      $(elt).change(ns.unit_change);
+    });
+
+    kivi.run_once_for('.row_entry', 'on_kbd_click_show_hide', function(elt) {
+      $(elt).keydown(function(event) {
+        var row;
+        if (event.keyCode == 40 && event.shiftKey === true) {
+          // shift arrow down
+          event.preventDefault();
+          row = $(event.target).parents(".row_entry").first();
+          ns.load_second_row(row);
+          ns.show_second_row(row);
+          return false;
+        }
+        if (event.keyCode == 38 && event.shiftKey === true) {
+          // shift arrow up
+          event.preventDefault();
+          row = $(event.target).parents(".row_entry").first();
+          ns.hide_second_row(row);
+          return false;
+        }
+      });
+    });
+
+    kivi.run_once_for('.expand', 'expand_second_row', function(elt) {
+      $(elt).click(function(event) {
+        event.preventDefault();
+        var row = $(event.target).parents(".row_entry").first();
+        ns.load_second_row(row);
+        ns.toggle_second_row(row);
+        return false;
+      })
+    });
+
+  };
+
+  ns.redisplay_line_values = function(is_sales, data) {
+    $('.row_entry').each(function(idx, elt) {
+      $(elt).find('[name="linetotal"]').html(data[idx][0]);
+      if (is_sales && $(elt).find('[name="second_row"]').data('loaded') == 1) {
+        var mt = data[idx][1];
+        var mp = data[idx][2];
+        var h  = '<span';
+        if (mt[0] === '-') h += ' class="plus0"';
+        h += '>' + mt + '&nbsp;&nbsp;' + mp + '%';
+        h += '</span>';
+        $(elt).find('[name="linemargin"]').html(h);
+      }
+    });
+  };
+
+  ns.redisplay_cvpartnumbers = function(data) {
+    $('.row_entry').each(function(idx, elt) {
+      $(elt).find('[name="cvpartnumber"]').html(data[idx][0]);
+    });
+  };
+
+  ns.renumber_positions = function() {
+    $('.row_entry [name="position"]').each(function(idx, elt) {
+      $(elt).html(idx+1);
+    });
+    $('.row_entry').each(function(idx, elt) {
+      $(elt).data("position", idx+1);
+    });
+  };
+
+  ns.reorder_items = function(order_by) {
+    var dir = $('#' + order_by + '_header_id a img').attr("data-sort-dir");
+    $('#row_table_id thead a img').remove();
+
+    var src;
+    if (dir == "1") {
+      dir = "0";
+      src = "image/up.png";
+    } else {
+      dir = "1";
+      src = "image/down.png";
+    }
+
+    $('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action',   value: 'Reclamation/reorder_items' },
+              { name: 'order_by', value: order_by              },
+              { name: 'sort_dir', value: dir                   });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.redisplay_items = function(data) {
+    var old_rows = $('.row_entry').detach();
+    var new_rows = [];
+    $(data).each(function(idx, elt) {
+      new_rows.push(old_rows[elt.old_pos - 1]);
+    });
+    $(new_rows).appendTo($('#row_table_id'));
+    ns.renumber_positions();
+  };
+
+  ns.get_insert_before_item_id = function(wanted_pos) {
+    if (wanted_pos === '') return;
+
+    var insert_before_item_id;
+    // selection by data does not seem to work if data is changed at runtime
+    // var elt = $('.row_entry [data-position="' + wanted_pos + '"]');
+    $('.row_entry').each(function(idx, elt) {
+      if ($(elt).data("position") == wanted_pos) {
+        insert_before_item_id = $(elt).find('[name="reclamation_item_ids[+]"]').val();
+        return false;
+      }
+    });
+
+    return insert_before_item_id;
+  };
+
+  ns.add_item = function() {
+    if ($('#add_item_parts_id').val() === '') return;
+    if (!ns.check_cv()) return;
+
+    $('#row_table_id thead a img').remove();
+
+    var insert_before_item_id = ns.get_insert_before_item_id($('#add_item_position').val());
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/add_item' },
+              { name: 'insert_before_item_id', value: insert_before_item_id });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.open_multi_items_dialog = function() {
+    if (!ns.check_cv()) return;
+
+    var pp = $("#add_item_parts_id").data("part_picker");
+    pp.o.multiple=1;
+    pp.open_dialog();
+  };
+
+  ns.add_multi_items = function(data) {
+    var insert_before_item_id = ns.get_insert_before_item_id($('#multi_items_position').val());
+    data = data.concat($('#reclamation_form').serializeArray());
+    data.push({ name: 'action', value: 'Reclamation/add_multi_items' },
+              { name: 'insert_before_item_id', value: insert_before_item_id });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.delete_reclamation_item_row = function(clicked) {
+    var row = $(clicked).parents("tbody").first();
+    $(row).remove();
+
+    ns.renumber_positions();
+    ns.recalc_amounts_and_taxes();
+  };
+
+  ns.row_table_scroll_down = function() {
+    $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
+  };
+
+  ns.show_longdescription_dialog = function(clicked) {
+    var row                 = $(clicked).parents("tbody").first();
+    var position            = $(row).find('[name="position"]').html();
+    var partnumber          = $(row).find('[name="partnumber"]').html();
+    var description_elt     = $(row).find('[name="reclamation.reclamation_items[].description"]');
+    var longdescription_elt = $(row).find('[name="reclamation.reclamation_items[].longdescription"]');
+
+    var params = {
+      runningnumber:           position,
+      partnumber:              partnumber,
+      description:             description_elt.val(),
+      default_longdescription: longdescription_elt.val(),
+      set_function:            function(val) {
+        longdescription_elt.val(val);
+      }
+    };
+
+    kivi.SalesPurchase.edit_longdescription_with_params(params);
+  };
+
+  ns.price_chooser_item_row = function(clicked) {
+    if (!ns.check_cv()) return;
+    var row         = $(clicked).parents("tbody").first();
+    var item_id_dom = $(row).find('[name="reclamation_item_ids[+]"]');
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action',  value: 'Reclamation/price_popup' },
+              { name: 'item_id', value: item_id_dom.val()   });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.update_price_source = function(item_id, source, descr, price_str, price_editable) {
+    var row        = $('#item_' + item_id).parents("tbody").first();
+    var source_elt = $(row).find('[name="reclamation.reclamation_items[].active_price_source"]');
+    var button_elt = $(row).find('[name="price_chooser_button"]');
+
+    button_elt.val(button_elt.val().replace(/.*\|/, descr + " |"));
+    source_elt.val(source);
+
+    var editable_div_elt     = $(row).find('[name="editable_price"]');
+    var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
+    if (price_editable == 1 && source === '') {
+      // editable
+      $(editable_div_elt).show();
+      $(not_editable_div_elt).hide();
+      $(editable_div_elt).find(':input').prop("disabled", false);
+      $(not_editable_div_elt).find(':input').prop("disabled", true);
+    } else {
+      // not editable
+      $(editable_div_elt).hide();
+      $(not_editable_div_elt).show();
+      $(editable_div_elt).find(':input').prop("disabled", true);
+      $(not_editable_div_elt).find(':input').prop("disabled", false);
+    }
+
+    if (price_str) {
+      var price_elt = $(row).find('[name="reclamation.reclamation_items[].sellprice_as_number"]');
+      var html_elt  = $(row).find('[name="sellprice_text"]');
+      price_elt.val(price_str);
+      html_elt.html(price_str);
+      ns.recalc_amounts_and_taxes();
+    }
+
+    kivi.io.close_dialog();
+  };
+
+  ns.update_discount_source = function(item_id, source, descr, discount_str, price_editable) {
+    var row        = $('#item_' + item_id).parents("tbody").first();
+    var source_elt = $(row).find('[name="reclamation.reclamation_items[].active_discount_source"]');
+    var button_elt = $(row).find('[name="price_chooser_button"]');
+
+    button_elt.val(button_elt.val().replace(/\|.*/, "| " + descr));
+    source_elt.val(source);
+
+    var editable_div_elt     = $(row).find('[name="editable_discount"]');
+    var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
+    if (price_editable == 1 && source === '') {
+      // editable
+      $(editable_div_elt).show();
+      $(not_editable_div_elt).hide();
+      $(editable_div_elt).find(':input').prop("disabled", false);
+      $(not_editable_div_elt).find(':input').prop("disabled", true);
+    } else {
+      // not editable
+      $(editable_div_elt).hide();
+      $(not_editable_div_elt).show();
+      $(editable_div_elt).find(':input').prop("disabled", true);
+      $(not_editable_div_elt).find(':input').prop("disabled", false);
+    }
+
+    if (discount_str) {
+      var discount_elt = $(row).find('[name="reclamation.reclamation_items[].discount_as_percent"]');
+      var html_elt     = $(row).find('[name="discount_text"]');
+      discount_elt.val(discount_str);
+      html_elt.html(discount_str);
+      ns.recalc_amounts_and_taxes();
+    }
+
+    kivi.io.close_dialog();
+  };
+
+  ns.update_row_from_master_data = function(clicked) {
+    var row = $(clicked).parents("tbody").first();
+    var item_id_dom = $(row).find('[name="reclamation_item_ids[+]"]');
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/update_row_from_master_data' });
+    data.push({ name: 'item_ids[]', value: item_id_dom.val() });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.update_all_rows_from_master_data = function() {
+    var item_ids = $.map($('.row_entry'), function(elt) {
+      var item_id = $(elt).find('[name="reclamation_item_ids[+]"]').val();
+      return { name: 'item_ids[]', value: item_id };
+    });
+
+    if (item_ids.length == 0) {
+      return;
+    }
+
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/update_row_from_master_data' });
+    data = data.concat(item_ids);
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.show_calculate_qty_dialog = function(clicked) {
+    var row        = $(clicked).parents("tbody").first();
+    var input_id   = $(row).find('[name="reclamation.reclamation_items[].qty_as_number"]').attr('id');
+    var formula_id = $(row).find('[name="formula[+]"]').attr('id');
+
+    calculate_qty_selection_dialog("", input_id, "", formula_id);
+    return true;
+  };
+
+  ns.edit_custom_shipto = function() {
+    if (!ns.check_cv()) return;
+
+    kivi.SalesPurchase.edit_custom_shipto();
+  };
+
+  ns.purchase_reclamation_check_for_direct_delivery = function(save_params) {
+    if ($('#type').val() != 'sales_reclamation') {
+      return alert(kivi.t8("Error: This is not a sales reclamation."));
+    }
+
+    var empty = true;
+    var shipto;
+    if ($('#reclamation_shipto_id').val() !== '') {
+      empty = false;
+      shipto = $('#reclamation_shipto_id option:selected').text();
+    } else {
+      $('#shipto_inputs [id^="shipto"]').each(function(_idx, elt) {
+        if (!empty)                                     return;
+        if (/^shipto_to_copy/.test($(elt).prop('id')))  return;
+        if (/^shiptocp_gender/.test($(elt).prop('id'))) return;
+        if (/^shiptocvar_/.test($(elt).prop('id')))     return;
+        if ($(elt).val() !== '') {
+          empty = false;
+          return;
+        }
+      });
+      var shipto_elements = [];
+      $([$('#shiptoname').val(), $('#shiptostreet').val(), $('#shiptozipcode').val(), $('#shiptocity').val()]).each(function(_idx, elt) {
+        if (elt !== '') shipto_elements.push(elt);
+      });
+      shipto = shipto_elements.join('; ');
+    }
+
+    if (!empty) {
+      ns.direct_delivery_dialog(shipto, save_params);
+    } else {
+      ns.save(save_params);
+    }
+  };
+
+  ns.direct_delivery_callback = function(accepted, save_params) {
+    $('#direct-delivery-dialog').dialog('close');
+
+    if (accepted) {
+      $('<input type="hidden" name="use_shipto">').appendTo('#reclamation_form').val('1');
+    }
+
+    ns.save(save_params);
+  };
+
+  ns.direct_delivery_dialog = function(shipto, save_params) {
+    $('#direct-delivery-dialog').remove();
+
+    var save_params_string = '{';
+    if (save_params) {
+      const action             = save_params.action;
+      const warn_on_duplicates = save_params.warn_on_duplicates;
+      const warn_on_reqdate    = save_params.warn_on_reqdate;
+      const form_params        = save_params.form_params;
+
+
+      console.log(form_params)
+      console.log(Array.isArray(form_params))
+      if (action)
+        save_params_string += `'action':'${action}',`;
+      if (warn_on_duplicates)
+        save_params_string += `'warn_on_duplicates':'${warn_on_duplicates}',`;
+      if (warn_on_reqdate)
+        save_params_string += `'warn_on_reqdate':'${warn_on_reqdate}',`;
+      if (Array.isArray(form_params)) {
+        save_params_string += 'form_params:['
+        form_params.forEach(function(item) {
+          save_params_string += `{'name':'${item.name}','value':'${item.value}'},`;
+        });
+        save_params_string += ']';
+      } else {
+        save_params_string += `'form_params':{'name':'${form_params.name}','value':'${form_params.value}'}`;
+      }
+    }
+    save_params_string += '}';
+
+    console.log(save_params_string);
+
+    var text1 = kivi.t8('You have entered or selected the following shipping address for this customer:');
+    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase reclamation so that the vendor can deliver the goods directly to your customer?');
+    var html  = '<div id="direct-delivery-dialog"><p>' + text1 + '</p><p>' + shipto + '</p><p>' + text2 + '</p>';
+    html      = html + '<hr><p>';
+    html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.Reclamation.direct_delivery_callback(true,' + save_params_string + ')">';
+    html      = html + '&nbsp;';
+    html      = html + '<input type="button" value="' + kivi.t8('No')  + '" size="30" onclick="kivi.Reclamation.direct_delivery_callback(false,' + save_params_string + ')">';
+    html      = html + '</p></div>';
+    $(html).hide().appendTo('#reclamation_form');
+
+    kivi.popup_dialog({id: 'direct-delivery-dialog',
+                       dialog: {title:  kivi.t8('Carry over shipping address'),
+                                height: 300,
+                                width:  500 }});
+  };
+
+  ns.follow_up_window = function() {
+    var id   = $('#id').val();
+    var type = $('#type').val();
+    var number_info = $('#reclamation_record_number').val();
+
+    var name_info = '';
+    if ($('#type').val() == 'sales_reclamation') {
+      name_info = $('#reclamation_customer_id_name').val();
+    } else if ($('#type').val() == 'purchase_reclamation') {
+      name_info = $('#reclamation_vendor_id_name').val();
+    }
+
+    var info = '';
+    if (number_info !== '') { info += ' (' + number_info + ')' }
+    if (name_info   !== '') { info += ' (' + name_info + ')' }
+
+    if (!$('#follow_up_rowcount').length) {
+      $('<input type="hidden" name="follow_up_rowcount"        id="follow_up_rowcount">').appendTo('#reclamation_form');
+      $('<input type="hidden" name="follow_up_trans_id_1"      id="follow_up_trans_id_1">').appendTo('#reclamation_form');
+      $('<input type="hidden" name="follow_up_trans_type_1"    id="follow_up_trans_type_1">').appendTo('#reclamation_form');
+      $('<input type="hidden" name="follow_up_trans_info_1"    id="follow_up_trans_info_1">').appendTo('#reclamation_form');
+      $('<input type="hidden" name="follow_up_trans_subject_1" id="follow_up_trans_subject_1">').appendTo('#reclamation_form');
+    }
+    $('#follow_up_rowcount').val(1);
+    $('#follow_up_trans_id_1').val(id);
+    $('#follow_up_trans_type_1').val(type);
+    $('#follow_up_trans_info_1').val(info);
+    $('#follow_up_trans_subject_1').val($('#reclamation_transaction_description').val());
+
+    follow_up_window();
+  };
+
+  ns.create_part = function() {
+    var data = $('#reclamation_form').serializeArray();
+    data.push({ name: 'action', value: 'Reclamation/create_part' });
+
+    $.post("controller.pl", data, kivi.eval_json_result);
+  };
+
+  ns.get_selected_rows = function() {
+    let selected_rows = [];
+    $('[name^="multi_id_"]').each( function() {
+      if (this.checked) {
+        selected_rows.push($(this).parents("tr").first());
+      }
+    });
+    return selected_rows;
+  }
+
+  ns.toggle_selected_rows = function() {
+    let selected_rows = [];
+    $('[name^="multi_id_"]').each( function() {
+      this.checked = !this.checked;
+    });
+    return selected_rows;
+  }
+
+  ns.delete_selected_rows = function() {
+    selected_rows = ns.get_selected_rows();
+    let row_count = selected_rows.length;
+    if (row_count == 0) {
+      alert(kivi.t8("No row selected."));
+      return;
+    }
+    if (!confirm(kivi.t8("Do you want delete #1 rows?", [row_count]))) {
+      return;
+    }
+    selected_rows.forEach(function(row) {
+      $(row.parents("tbody").first()).remove();
+    });
+    ns.renumber_positions();
+    ns.recalc_amounts_and_taxes();
+  };
+
+  ns.set_selected_to_value = function(value_name) {
+    let value = $('[name="' + value_name + '_for_selected"]').val();
+    let selected_rows = ns.get_selected_rows();
+    selected_rows.forEach(function(row) {
+      $(row).find(
+        '[name="reclamation.reclamation_items[].' + value_name  + '"]'
+      ).val(
+        value
+      );
+    });
+  };
+
+});
+
+$(function() {
+  if ($('#type').val() == 'sales_reclamation') {
+    $('#reclamation_customer_id').change(kivi.Reclamation.reload_cv_dependent_selections);
+  } else {
+    $('#reclamation_vendor_id').change(kivi.Reclamation.reload_cv_dependent_selections);
+  }
+
+  $('#reclamation_currency_id').change(kivi.Reclamation.update_exchangerate);
+  $('#reclamation_transdate_as_date').change(kivi.Reclamation.update_exchangerate);
+  $('#reclamation_exchangerate_as_null_number').change(kivi.Reclamation.exchangerate_changed);
+
+  if ($('#type').val() == 'sales_reclamation') {
+    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
+  } else {
+    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.lastcost, -2)) });
+  }
+  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
+  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
+
+  $('.add_item_input').keydown(function(event) {
+    if (event.keyCode == 13) {
+      event.preventDefault();
+      kivi.Reclamation.add_item();
+      return false;
+    }
+  });
+
+  kivi.Reclamation.init_row_handlers();
+
+  $('#row_table_id').on('sortstop', function(event, ui) {
+    $('#row_table_id thead a img').remove();
+    kivi.Reclamation.renumber_positions();
+  });
+
+  $('#expand_all').on('click', function(event) {
+    event.preventDefault();
+    if ($('#expand_all').data('expanded') == 1) {
+      $('#expand_all').data('expanded', 0);
+      $('#expand_all').attr('src', 'image/expand.svg');
+      $('#expand_all').attr('alt', kivi.t8('Show all details'));
+      $('#expand_all').attr('title', kivi.t8('Show all details'));
+      $('.row_entry').each(function(idx, elt) {
+        kivi.Reclamation.hide_second_row(elt);
+      });
+    } else {
+      $('#expand_all').data('expanded', 1);
+      $('#expand_all').attr('src', "image/collapse.svg");
+      $('#expand_all').attr('alt', kivi.t8('Hide all details'));
+      $('#expand_all').attr('title', kivi.t8('Hide all details'));
+      kivi.Reclamation.load_all_second_rows();
+      $('.row_entry').each(function(idx, elt) {
+        kivi.Reclamation.show_second_row(elt);
+      });
+    }
+    return false;
+  });
+
+  $('#select_all').click( function() {
+    var checked = this.checked
+    $('[name^="multi_id_"]').each(function() {
+      this.checked =  checked;
+    });
+  });
+
+  $('.reformat_number_as_null_number').change(kivi.Reclamation.reformat_number_as_null_number);
+
+});
diff --git a/js/kivi.SalesPurchase.js b/js/kivi.SalesPurchase.js
index 4dc390b16..3aed332c0 100644
--- a/js/kivi.SalesPurchase.js
+++ b/js/kivi.SalesPurchase.js
@@ -32,7 +32,7 @@ namespace('kivi.SalesPurchase', function(ns) {
     }
 
     var $container = $('#popup_edit_longdescription_input_container');
-    var $edit      = $('<textarea id="popup_edit_longdescription_input" class="texteditor-in-dialog texteditor-space-for-toolbar" wrap="soft" style="width: ' + textarea_width + 'px; height: ' + textarea_height + 'px;"></textarea>');
+    var $edit      = $('<textarea id="popup_edit_longdescription_input" class="texteditor-in-dialog texteditor-space-for-toolbar" style="width: ' + textarea_width + 'px; height: ' + textarea_height + 'px;"></textarea>');
 
     $container.children().remove();
     $container.append($edit);
@@ -298,24 +298,25 @@ namespace('kivi.SalesPurchase', function(ns) {
     var vc_id = $(vc_id_selector).val();
 
     var data = {
-      action:       'show_sales_purchase_email_dialog',
-      cp_id:        $('#cp_id').val(),
-      direct_debit: $('#direct_debit').prop('checked') ? 1 : 0,
-      donumber:     $('#donumber').val(),
-      format:       $('#format').val(),
-      formname:     $('#formname').val(),
-      id:           $('#id').val(),
-      invnumber:    $('#invnumber').val(),
-      language_id:  $('#language_id').val(),
-      media:        'email',
-      ordnumber:    $('#ordnumber').val(),
-      cusordnumber: $('#cusordnumber').val(),
-      rowcount:     $('#rowcount').val(),
-      quonumber:    $('#quonumber').val(),
-      type:         $('#type').val(),
-      vc:           vc,
-      vc_id:        vc_id,
-      project_id:  $('#globalproject_id').val(),
+      action:                  'show_sales_purchase_email_dialog',
+      cp_id:                   $('#cp_id').val(),
+      direct_debit:            $('#direct_debit').prop('checked') ? 1 : 0,
+      donumber:                $('#donumber').val(),
+      format:                  $('#format').val(),
+      formname:                $('#formname').val(),
+      id:                      $('#id').val(),
+      invnumber:               $('#invnumber').val(),
+      language_id:             $('#language_id').val(),
+      media:                   'email',
+      ordnumber:               $('#ordnumber').val(),
+      cusordnumber:            $('#cusordnumber').val(),
+      rowcount:                $('#rowcount').val(),
+      quonumber:               $('#quonumber').val(),
+      transaction_description: $('#transaction_description').val(),
+      type:                    $('#type').val(),
+      vc:                      vc,
+      vc_id:                   vc_id,
+      project_id:              $('#globalproject_id').val(),
     };
 
     $('[name^=id_],[name^=partnumber_]').each(function(idx, elt) {
diff --git a/js/kivi.ScanQRBill.js b/js/kivi.ScanQRBill.js
new file mode 100644
index 000000000..9da57c9be
--- /dev/null
+++ b/js/kivi.ScanQRBill.js
@@ -0,0 +1,52 @@
+namespace('kivi.ScanQRBill', function(ns) {
+
+  ns.onScanSuccess = async (decodedText, decodedResult) => {
+    // stop camera
+    await html5Qrcode.stop();
+
+    // send the scanned text to the server
+    const data = [];
+    data.push({ name: 'qrtext', value: decodedText });
+    data.push({ name: 'action', value: 'ScanQRBill/handle_scan_result' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  ns.onScanFailure = (error) => {
+    // handle scan failure, usually better to ignore and keep scanning.
+    //console.warn(`Code scan error = ${error}`);
+  }
+
+  ns.popupInvalidQRBill = (error) => {
+    console.warn('popupInvalidQRBill', error);
+    $('#qr_code_invalid_error').text(error);
+    $('#qr_code_invalid_modal').modal('open');
+  }
+
+  ns.popupVendorNotFound = (vn) => {
+    //console.warn('popupVendorNotFound', vn);
+    $('#vendor_name').text(vn);
+    $('#vendor_not_found_error').modal('open');
+  }
+
+  ns.sendTestCode = async (code) => {
+    // function to easily send code without scanning
+    // use for testing only
+    if (html5Qrcode.isScanning) {
+      // stop camera
+      await html5Qrcode.stop();
+    }
+    const data = [];
+    const codes = [
+      "SPC\r\n0200\r\n1\r\nCH4431999123000889012\r\nS\r\nMax Muster & Söhne\r\nMusterstrasse\r\n123\r\n8000\r\nSeldwyla\r\nCH\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n1949.75\r\nCHF\r\nS\r\nSimon Muster\r\nMusterstrasse\r\n1\r\n8000\r\nSeldwyla\r\nCH\r\nQRR\r\n210000000003139471430009017\r\nOrder from 15.10.2020\r\nEPD\r\n//S1/10/1234/11/201021/30/102673386/32/7.7/40/0:30\r\nName AV1: UV;UltraPay005;12345\r\nName AV2: XY;XYService;54321",
+      "SPC\n0200\n1\nCH5800791123000889012\nS\nMuster Krankenkasse\nMusterstrasse\n12\n8000\nSeldwyla\nCH\n\n\n\n\n\n\n\n211.00\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n8000\nSeldwyla\nCH\nSCOR\nRF240191230100405JSH0438\n\nEPD\n",
+      "SPC\n0200\n1\nCH5800791123000889012\nS\nMax Muster & Söhne\nMusterstrasse\n123\n8000\nSeldwyla\nCH\n\n\n\n\n\n\n\n199.95\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n78462\nKonstanz\nDE\nSCOR\nRF18539007547034\n\nEPD\n",
+      // for testing XSS
+      "SPC\r\n0200\r\n1\r\nCH4431999123000889012\r\nS\r\nMax Muster & Söhne\r\nMusterstrasse\r\n123\r\n8000\r\nSeldwyla\r\nCH\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n1949.75\r\nCHF\r\nS\r\nSimon Muster\r\nMusterstrasse\r\n1\r\n8000\r\nSeldwyla\r\nCH\r\nQRR\r\n210000000003139471430009017\r\nOrder from 15.10.2020\r\nEPD\r\n//S1/10/1234/11/201021/30/102673386/32/7.7/40/0:30<script>alert('XSS!');</script>\r\nName AV1: UV;UltraPay005;12345\r\nName AV2: XY;XYService;54321",
+      "<script>alert('XSS!');</script>",
+    ];
+    data.push({ name: 'qrtext', value: codes[code] });
+    data.push({ name: 'action', value: 'ScanQRBill/handle_scan_result' });
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+});
diff --git a/js/kivi.Validator.js b/js/kivi.Validator.js
index 4d03451b1..ba5d6be84 100644
--- a/js/kivi.Validator.js
+++ b/js/kivi.Validator.js
@@ -33,12 +33,13 @@ namespace("kivi.Validator", function(ns) {
   };
 
   ns.validate = function($e) {
+    /*
     var $e_annotate;
     if ($e.data('ckeditorInstance')) {
       $e_annotate = $($e.data('ckeditorInstance').editable().$);
       if ($e.data('title'))
         $e_annotate.data('title', $e.data('title'));
-    }
+    }*/
     var tests = $e.data('validate').split(/ +/);
 
     for (var test_idx in tests) {
@@ -47,7 +48,7 @@ namespace("kivi.Validator", function(ns) {
         continue;
 
       if (ns.checks[test]) {
-        if (!ns.checks[test]($e, $e_annotate))
+        if (!ns.checks[test]($e))
           return false;
       } else {
         var error = "kivi.validate_form: unknown test '" + test + "' for element ID '" + $e.prop('id') + "'";
@@ -60,11 +61,25 @@ namespace("kivi.Validator", function(ns) {
     return true;
   }
 
+  ns.val = function($e, data) {
+    if ($e.data('ckeditorInstance')) {
+      if (data === undefined)
+        return $e.data('ckeditorInstance').getData()
+      else
+        $e.data('ckeditorInstance').setData(data)
+    } else {
+      if (data === undefined)
+        return $e.val();
+      else
+        $e.val(data);
+    }
+  }
+
   ns.checks = {
     required: function($e, $e_annotate) {
       $e_annotate = $e_annotate || $e;
 
-      if ($e.val() === '') {
+      if (ns.val($e) === '') {
         ns.annotate($e_annotate, kivi.t8("This field must not be empty."));
         return false;
       } else {
@@ -75,12 +90,12 @@ namespace("kivi.Validator", function(ns) {
     number: function($e, $e_annotate) {
       $e_annotate = $e_annotate || $e;
 
-      var number_string = $e.val();
+      var number_string = ns.val($e);
 
       var parsed_number = kivi.parse_amount(number_string);
 
       if (parsed_number === null) {
-        $e.val('');
+        ns.val($e, '');
         ns.annotate($e_annotate);
         return true;
       } else
@@ -91,7 +106,7 @@ namespace("kivi.Validator", function(ns) {
       {
         var formatted_number = kivi.format_amount(parsed_number);
         if (formatted_number != number_string)
-          $e.val(formatted_number);
+          ns.val($e, formatted_number);
         ns.annotate($e_annotate);
         return true;
       }
@@ -99,12 +114,12 @@ namespace("kivi.Validator", function(ns) {
     date: function($e, $e_annotate) {
       $e_annotate = $e_annotate || $e;
 
-      var date_string = $e.val();
+      var date_string = ns.val($e);
 
       var parsed_date = kivi.parse_date(date_string);
 
       if (parsed_date === null) {
-        $e.val('');
+        ns.val($e, '');
         ns.annotate($e_annotate);
         return true;
       } else
@@ -115,7 +130,7 @@ namespace("kivi.Validator", function(ns) {
       {
         var formatted_date = kivi.format_date(parsed_date);
         if (formatted_date != date_string)
-          $e.val(formatted_date);
+          ns.val($e, formatted_date);
         ns.annotate($e_annotate);
         return true;
       }
@@ -123,11 +138,11 @@ namespace("kivi.Validator", function(ns) {
     time: function($e, $e_annotate) {
       $e_annotate = $e_annotate || $e;
 
-      var time_string = $e.val();
+      var time_string = ns.val($e);
 
       var parsed_time = kivi.parse_time(time_string);
       if (parsed_time === null) {
-        $e.val('');
+        ns.val($e, '');
         ns.annotate($e_annotate);
         return true;
       } else
@@ -138,7 +153,7 @@ namespace("kivi.Validator", function(ns) {
       {
         var formatted_time = kivi.format_time(parsed_time);
         if (formatted_time != time_string)
-          $e.val(formatted_time);
+          ns.val($e, formatted_time);
         ns.annotate($e_annotate);
         return true;
       }
@@ -146,13 +161,13 @@ namespace("kivi.Validator", function(ns) {
     trimmed_whitespaces: function($e, $e_annotate) {
       $e_annotate = $e_annotate || $e;
 
-      var string = $e.val();
+      var string = ns.val($e);
 
       if ($e.hasClass('tooltipstered'))
         $e.tooltipster('destroy');
 
       if (string.match(/^\s|\s$/)) {
-        $e.val(string.trim());
+        ns.val($e, string.trim());
 
         $e.tooltipster({
           content: kivi.t8("Leading and trailing whitespaces have been removed."),
@@ -166,6 +181,14 @@ namespace("kivi.Validator", function(ns) {
   };
 
   ns.annotate = function($e, error) {
+      // if element is ckeditor:
+    if ($e.data('ckeditorInstance')) {
+      const $orig_e = $e;
+      $e = $($orig_e.data('ckeditorInstance').ui.view.editable._editableElement);
+      if ($orig_e.data('title'))
+        $e.data('title', $orig_e.data('title'));
+    }
+
     if (error) {
       $e.addClass('kivi-validator-invalid');
       if ($e.hasClass('tooltipstered'))
diff --git a/js/kivi.ZUGFeRD.js b/js/kivi.ZUGFeRD.js
new file mode 100644
index 000000000..ee96cc9d0
--- /dev/null
+++ b/js/kivi.ZUGFeRD.js
@@ -0,0 +1,8 @@
+namespace('kivi.ZUGFeRD', function(ns) {
+  ns.update_file_name = function() {
+    let file = document.getElementById("file").files[0];
+    if (file) {
+      document.getElementById("file_name").value = file.name;
+    }
+  };
+});
diff --git a/js/kivi.io.js b/js/kivi.io.js
index 4758583e2..6b780f23a 100644
--- a/js/kivi.io.js
+++ b/js/kivi.io.js
@@ -49,4 +49,46 @@ namespace('kivi.io', function(ns) {
     if (discount_str) $('#discount_' + row).val(discount_str);
     $('#update_button').click();
   }
+
+  ns.update_taxzone = function() {
+    let expense_chart_ids = $('[name^="expense_chart_id_"]');
+    expense_chart_ids.each(function (_idx, element) {
+      element.value = null;
+    });
+    let tax_ids = $('[name^="tax_id_"]');
+    tax_ids.each(function (_idx, element) {
+      element.value = null;
+    });
+    let inventory_chart_ids = $('[name^="inventory_chart_id_"]');
+    inventory_chart_ids.each(function (_idx, element) {
+      element.value = null;
+    });
+    $('#update_button').click();
+  }
+
+  ns.update_tax_chart_picker = function(tax_chart_type, row_i) {
+    $('#expense_chart_span_'   + row_i)[0].style.display = 'none';
+    $('#inventory_chart_span_' + row_i)[0].style.display = 'none';
+
+    let current_chart_picker_span = $('#' + tax_chart_type + '_chart_span_' + row_i)[0];
+    current_chart_picker_span.style.display = 'inline';
+
+    kivi.io.update_tax_ids($('#' + tax_chart_type + '_chart_id_' + row_i)[0]);
+  }
+
+  ns.update_tax_ids = function(obj) {
+    var row = $(obj).attr('name').replace(/.*_/, '');
+
+    $.ajax({
+      url: 'io.pl?action=get_taxes_dropdown',
+      data: { chart_id:          $(obj).val(),
+              transdate:         $('#transdate').val(),
+              deliverydate:      $('#deliverydate').val() },
+              item_deliverydate: $("[name='reqdate_" + row + "']").val(), // has no id
+      dataType: 'html',
+      success: function (new_html) {
+        $("#tax_id_" + row).html(new_html);
+      }
+    });
+  };
 });
diff --git a/js/kivi.js b/js/kivi.js
index 5f9360f66..2050a3271 100644
--- a/js/kivi.js
+++ b/js/kivi.js
@@ -268,39 +268,17 @@ namespace("kivi", function(ns) {
   };
 
   ns.focus_ckeditor_when_ready = function(element) {
-    $(element).data('ckeditorInstance').on('instanceReady', function() { ns.focus_ckeditor(element); });
+    $(element).on('ckeditor-ready', () => ns.focus_ckeditor(element));
   };
 
   ns.focus_ckeditor = function(element) {
-    $(element).data('ckeditorInstance').focus();
-  };
-
-  ns.selectall_ckeditor = function(element) {
-    var editor   = $(element).ckeditorGet();
-    var editable = editor.editable();
-    if (editable.is('textarea')) {
-      var textarea = editable.$;
-
-      if (CKEDITOR.env.ie)
-        textarea.createTextRange().execCommand('SelectAll');
-      else {
-        textarea.selectionStart = 0;
-        textarea.selectionEnd   = textarea.value.length;
-      }
+    const editor = $(element).data('ckeditorInstance');
+    if (editor) {
+      editor.editing.view.focus();
     } else {
-      if (editable.is('body'))
-        editor.document.$.execCommand('SelectAll', false, null);
-
-      else {
-        var range = editor.createRange();
-        range.selectNodeContents(editable);
-        range.select();
-      }
-
-      editor.forceNextSelectionCheck();
-      editor.selectionChange();
+      ns.focus_ckeditor_when_ready(element);
     }
-  }
+  };
 
   ns.init_tabwidget = function(element) {
     var $element   = $(element);
@@ -322,41 +300,80 @@ namespace("kivi", function(ns) {
     $element.tabs(tabsParams);
   };
 
-  ns.init_text_editor = function(element) {
-    var layouts = {
-      all:     [ [ 'Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript' ], [ 'BulletedList', 'NumberedList' ], [ 'RemoveFormat' ] ],
-      default: [ [ 'Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript' ], [ 'BulletedList', 'NumberedList' ], [ 'RemoveFormat' ] ]
-    };
-
-    var $e      = $(element);
-    var buttons = layouts[ $e.data('texteditor-layout') || 'default' ] || layouts['default'];
-    var config  = {
-      entities:      false,
-      language:      'de',
-      removePlugins: 'resize',
-      extraPlugins:  'inline_resize',
-      toolbar:       buttons,
-      disableAutoInline: true,
-      title:         false,
-      disableNativeSpellChecker: false
-    };
-
-    config.height = $e.height();
-    config.width  = $e.width();
-
-    var editor = CKEDITOR.inline($e.get(0), config);
-    $e.data('ckeditorInstance', editor);
-
-    if ($e.hasClass('texteditor-space-for-toolbar'))
-      editor.on('instanceReady', function() {
-        var editor   = $e.ckeditorGet();
-        var editable = editor.editable();
-        $(editable.$).css("margin-top", "30px");
+  ns.init_text_editor5 = function($element) {
+    ClassicEditor
+    .create($element.get(0), {
+      toolbar: [
+        'bold', 'italic', 'underline', 'strikethrough',
+        '|',
+        'subscript', 'superscript',
+        '|',
+        'bulletedList', 'numberedList', 'horizontalLine',
+        '|',
+        'undo', 'redo', 'removeFormat',
+        '|',
+        'sourceEditing'
+      ],
+      language: {
+        ui: kivi.myconfig.countrycode,
+        content: kivi.myconfig.countrycode
+      }
+    })
+    .then(editor => {
+      // save instance in data
+      $element.data('ckeditorInstance', editor);
+
+      // sync data if javascript changes the underlying textarea
+      // make sure to actually send change! $e.val(data) does not trigger it!
+      $element.on('change', (e) => {
+        editor.setData($element.val())
       });
 
+      // handle auto focus
+      if ($element.hasClass('texteditor-autofocus'))
+        ns.focus_ckeditor($element);
+
+      // trigger delayed hooks on the editor
+      $element.trigger('ckeditor-ready');
 
-    if ($e.hasClass('texteditor-autofocus'))
-      editor.on('instanceReady', function() { ns.focus_ckeditor($e); });
+      // make sure blur events copy back to the textarea
+      // this catches most of the non-submit ways that ckeditor doesn't handle
+      // on its own. if you have any bugs, make sure to call updateSourceElement
+      // directly before serializing the form
+      editor.ui.focusTracker.on( 'change:isFocused', (evt, name, is_focused) => {
+        if (!is_focused) {
+          editor.updateSourceElement();
+        }
+      });
+
+      // handle inital disabled
+      if ($element.attr('disabled'))
+        editor.enableReadOnlyMode('disabled')
+
+      // handle initial height
+      const element = $element.get(0);
+      if (element.style.height || element.rows)
+        editor.editing.view.change((writer) => {
+          var height = element.style.height;
+
+          if (!height && element.rows) {
+            // ckeditor does not support height in rows, but ~30px is a good estimate.
+            // the correct way would be to either configure it, or to add a small dom
+            // element and get the line height at run-time, which is pretty overkill
+            // esp. since ckeditor itself has loads of spacing problems at high zoom
+            editor.editing.view.add
+            height = (element.rows * 30) + "px";
+          }
+          writer.setStyle(
+            "min-height",
+            height,
+            editor.editing.view.document.getRoot()
+          );
+        });
+    })
+    .catch(err => {
+      console.error(err);
+    });
   };
 
   ns.filter_select = function() {
@@ -415,7 +432,7 @@ namespace("kivi", function(ns) {
     });
 
     ns.run_once_for('.tabwidget', 'tabwidget', kivi.init_tabwidget);
-    ns.run_once_for('.texteditor', 'texteditor', kivi.init_text_editor);
+    ns.run_once_for('.texteditor', 'texteditor', kivi.init_text_editor5);
   };
 
   ns.submit_ajax_form = function(url, form_selector, additional_data) {
@@ -510,7 +527,7 @@ namespace("kivi", function(ns) {
       dialog =
         $('#' + id)
         .bind('dialogopen', function() {
-          ns.run_once_for('.texteditor-in-dialog,.texteditor-dialog', 'texteditor', kivi.init_text_editor);
+          ns.run_once_for('.texteditor-in-dialog,.texteditor-dialog', 'texteditor', kivi.init_text_editor5);
         })
         .dialog(dialog_params);
       return true;
diff --git a/js/locale/de.js b/js/locale/de.js
index c17b21397..da74b4a10 100644
--- a/js/locale/de.js
+++ b/js/locale/de.js
@@ -47,6 +47,7 @@ namespace("kivi").setupLocale({
 "Delete requirement spec":"Pflichtenheft löschen",
 "Delete template":"Vorlage löschen",
 "Delete text block":"Textblock löschen",
+"Details of article number \"#1\"":"Details von Artikel \"#1\"",
 "Do you really want to cancel?":"Möchten Sie wirklich abbrechen?",
 "Do you really want to continue?":"Möchten Sie wirklich fortfahren?",
 "Do you really want to delete the selected documents?":"Möchten Sie wirklich diese Dateien löschen?",
@@ -55,7 +56,9 @@ namespace("kivi").setupLocale({
 "Do you really want to print?":"Wollen Sie wirklich drucken?",
 "Do you really want to revert to this version?":"Möchten Sie wirklich auf diese Version zurücksetzen?",
 "Do you really want to unimport the selected documents?":"Möchten Sie wirklich diese Dateien an die Quelle zurückgeben?",
-"Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?":"Möchten Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?",
+"Do you want delete #1 rows?":"Wollen Sie #1 Zeilen löschen?",
+"Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?":"Möchten Sie diese Lieferadresse in den neuen Einkaufsbeleg übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?",
+"Do you want to carry this shipping address over to the new purchase reclamation so that the vendor can deliver the goods directly to your customer?":"Möchten Sie diese Lieferadresse in die neue Einkaufsreklamation übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?",
 "Do you want to set the account number \"#1\" to \"#2\" and the name \"#3\" to \"#4\"?":"Soll die Kontonummer \"#1\" zu \"#2\" und den Name \"#3\" zu \"#4\" geändert werden?",
 "Download picture":"Bild herunterladen",
 "Due Date missing!":"Fälligkeitsdatum fehlt!",
@@ -68,7 +71,9 @@ namespace("kivi").setupLocale({
 "Edit text block":"Textblock bearbeiten",
 "Edit the configuration for periodic invoices":"Konfiguration für wiederkehrende Rechnungen bearbeiten",
 "Enter longdescription":"Langtext eingeben",
+"Error: #1":"Fehler: #1",
 "Error: Name missing":"Fehler: Name fehlt",
+"Error: This is not a sales reclamation.":"Fehler: Dies ist keine Verkaufreklamaiton.",
 "Feb":"Feb",
 "February":"Februar",
 "File upload":"Datei Upload",
@@ -93,6 +98,7 @@ namespace("kivi").setupLocale({
 "June":"Juni",
 "Leading and trailing whitespaces have been removed.":"Leerzeichen wurden vorne und hinten entfernt",
 "Loading...":"Wird geladen...",
+"Login name was previously used":"Benutzername wurde schon mal verwendet",
 "Map":"Karte",
 "Mar":"März",
 "March":"März",
@@ -100,6 +106,7 @@ namespace("kivi").setupLocale({
 "Mon":"Mo",
 "Monday":"Montag",
 "More than one file selected, please set only one checkbox!":"Mehr als ein Element selektiert, bitte nur eine Box anklicken",
+"Net.Turnover":"Netto Umsatz",
 "Next month":"nächster Monat",
 "No":"Nein",
 "No article has been selected yet.":"Es wurde noch kein Artikel ausgewählt.",
@@ -107,17 +114,20 @@ namespace("kivi").setupLocale({
 "No entries have been selected.":"Es wurden keine Einträge ausgewählt.",
 "No file selected, please set one checkbox!":"Kein Element selektiert,bitte eine Box anklicken",
 "No invoices have been selected.":"Es wurden keine Rechnungen ausgewählt.",
+"No row selected.":"Keine Zeile ausgewählt.",
 "Nov":"Nov",
 "November":"November",
 "Oct":"Okt",
 "October":"Oktober",
 "Ok":"Ok",
+"Overall Net.Turnover":"Gesamter Netto-Umsatz",
 "Part picker":"Artikelauswahl",
 "Paste":"Einfügen",
 "Paste template":"Vorlage einfügen",
 "Please enter the new name:":"Bitte geben Sie den neuen Namen ein:",
 "Please enter values":"Bitte Werte eingeben",
 "Please select a customer.":"Bitte wählen Sie einen Kunden aus.",
+"Please select a deadline date.":"Bitte wählen Sie ein Datum für die Fristsetzung aus.",
 "Please select a delivery date.":"Bitte einen Liefertermin auswählen",
 "Please select a vendor.":"Bitte wählen Sie einen Lieferanten aus.",
 "Previous month":"vorheriger Monat",
@@ -139,6 +149,8 @@ namespace("kivi").setupLocale({
 "Save":"Speichern",
 "Save and keep open":"Speichern und geöffnet lassen",
 "Section/Function block actions":"Abschnitts-/Funktionsblockaktionen",
+"Select from preset":"Aus Voreinstellung wählen",
+"Select items for delivery order":"Positionen für Lieferschein auswählen",
 "Select template to paste":"Einzufügende Vorlage auswählen",
 "Send email":"E-Mail verschicken",
 "Sep":"Sep",
@@ -158,19 +170,22 @@ namespace("kivi").setupLocale({
 "The action can only be executed once.":"Die Aktion kann nur einmal ausgeführt werden.",
 "The customer order number is missing. Do you want to continue anyway?":"Die Kundenbestellnummer fehlt. Möchten Sie trotzdem fortfahren?",
 "The description is missing.":"Die Beschreibung fehlt.",
+"The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?":"Der eingegebene Benutzername war schon einmal vergeben. Sollen Belege des früheren Benutzers mit dem selben Benutzernamen dem neuen Benutzer zugewiesen werden?",
 "The name is missing.":"Der Name fehlt.",
 "The name must only consist of letters, numbers and underscores and start with a letter.":"Der Name darf nur aus Buchstaben (keine Umlaute), Ziffern und Unterstrichen bestehen und muss mit einem Buchstaben beginnen.",
 "The option field is empty.":"Das Optionsfeld ist leer.",
 "The port is missing.":"Port fehlt",
-"The recipient, subject or body is missing.":"Der Empfäger, der Betreff oder der Text ist leer.",
+"The recipient, subject or body is missing.":"Der Empfänger, der Betreff oder der Text ist leer.",
 "The selected database is still configured for client \"#1\". If you delete the database that client will stop working until you re-configure it. Do you still want to delete the database?":"Die auswählte Datenbank ist noch für Mandant \"#1\" konfiguriert. Wenn Sie die Datenbank löschen, wird der Mandanten nicht mehr funktionieren, bis er anders konfiguriert wurde. Möchten Sie die Datenbank trotzdem löschen?",
 "The transfer has been canceled by the user.":"Der Vorgang wurde durch den Benutzer abgebrochen.",
 "The transport cost article '#1' is missing. Do you want to continue anyway?":"Der Transportkostenartikel »#1« fehlt. Möchten Sie trotzdem fortfahren?",
 "The uploaded filename still exists.<br>If you not modify the name this is a new version of the file":"Der Dateiname existiert bereits.<br>Wenn Sie den Namen nicht ändern gibt dies eine neue Version der Datei",
 "There are duplicate parts at positions":"Es gibt doppelte Artikel bei den Positionen",
+"There are parts with no reclamation reason at position:":"Es gibt Artikel mit keinem Reklamationsgrund an Position:",
 "There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?":"Einige der Lagerbewegungen sind nicht vollständig und Lagerbewegungen können nachträglich nicht mehr verändert werden. Möchten Sie wirklich fortfahren?",
 "There is one or more sections for which no part has been assigned yet; therefore creating the new record is not possible yet.":"Es gibt einen oder mehrere Abschnitte ohne Artikelzuweisung; daher kann der neue Beleg noch nicht erstellt werden.",
 "This field must not be empty.":"Dieses Feld darf nicht leer sein.",
+"This object has not been saved yet.":"Das Objekt wurde noch nicht gespeichert.",
 "This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?":"Dieser Auftrag besitzt eine aktive Konfiguration für wiederkehrende Rechnungen. Wenn Sie jetzt speichern, so werden alle zukünftig hieraus erzeugten Rechnungen die Änderungen enthalten, nicht aber die bereits erzeugten Rechnungen. Möchten Sie speichern?",
 "This vendor has already a booking with this invoice number, do you really want to add the same invoice number again?":"Es gibt für diesen Lieferant schon einen Beleg mit dieser Rechnungsnummer. Möchten Sie wirklich eine weitere Buchung mit derselben Rechnungsnummer hinzufügen?",
 "Thu":"Do",
diff --git a/js/locale/en.js b/js/locale/en.js
index 4306694b5..c54db7046 100644
--- a/js/locale/en.js
+++ b/js/locale/en.js
@@ -47,6 +47,7 @@ namespace("kivi").setupLocale({
 "Delete requirement spec":"",
 "Delete template":"",
 "Delete text block":"",
+"Details of article number \"#1\"":"",
 "Do you really want to cancel?":"",
 "Do you really want to continue?":"",
 "Do you really want to delete the selected documents?":"",
@@ -55,7 +56,9 @@ namespace("kivi").setupLocale({
 "Do you really want to print?":"",
 "Do you really want to revert to this version?":"",
 "Do you really want to unimport the selected documents?":"",
-"Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?":"",
+"Do you want delete #1 rows?":"",
+"Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?":"",
+"Do you want to carry this shipping address over to the new purchase reclamation so that the vendor can deliver the goods directly to your customer?":"",
 "Do you want to set the account number \"#1\" to \"#2\" and the name \"#3\" to \"#4\"?":"",
 "Download picture":"",
 "Due Date missing!":"",
@@ -68,7 +71,9 @@ namespace("kivi").setupLocale({
 "Edit text block":"",
 "Edit the configuration for periodic invoices":"",
 "Enter longdescription":"",
+"Error: #1":"",
 "Error: Name missing":"",
+"Error: This is not a sales reclamation.":"",
 "Feb":"",
 "February":"",
 "File upload":"",
@@ -93,6 +98,7 @@ namespace("kivi").setupLocale({
 "June":"",
 "Leading and trailing whitespaces have been removed.":"",
 "Loading...":"",
+"Login name was previously used":"",
 "Map":"",
 "Mar":"",
 "March":"",
@@ -100,6 +106,7 @@ namespace("kivi").setupLocale({
 "Mon":"",
 "Monday":"",
 "More than one file selected, please set only one checkbox!":"",
+"Net.Turnover":"",
 "Next month":"",
 "No":"",
 "No article has been selected yet.":"",
@@ -107,17 +114,20 @@ namespace("kivi").setupLocale({
 "No entries have been selected.":"",
 "No file selected, please set one checkbox!":"",
 "No invoices have been selected.":"",
+"No row selected.":"",
 "Nov":"",
 "November":"",
 "Oct":"",
 "October":"",
 "Ok":"",
+"Overall Net.Turnover":"",
 "Part picker":"",
 "Paste":"",
 "Paste template":"",
 "Please enter the new name:":"",
 "Please enter values":"",
 "Please select a customer.":"",
+"Please select a deadline date.":"",
 "Please select a delivery date.":"",
 "Please select a vendor.":"",
 "Previous month":"",
@@ -139,6 +149,8 @@ namespace("kivi").setupLocale({
 "Save":"",
 "Save and keep open":"",
 "Section/Function block actions":"",
+"Select from preset":"",
+"Select items for delivery order":"",
 "Select template to paste":"",
 "Send email":"",
 "Sep":"",
@@ -158,6 +170,7 @@ namespace("kivi").setupLocale({
 "The action can only be executed once.":"",
 "The customer order number is missing. Do you want to continue anyway?":"",
 "The description is missing.":"",
+"The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?":"",
 "The name is missing.":"",
 "The name must only consist of letters, numbers and underscores and start with a letter.":"",
 "The option field is empty.":"",
@@ -168,9 +181,11 @@ namespace("kivi").setupLocale({
 "The transport cost article '#1' is missing. Do you want to continue anyway?":"",
 "The uploaded filename still exists.<br>If you not modify the name this is a new version of the file":"",
 "There are duplicate parts at positions":"",
+"There are parts with no reclamation reason at position:":"",
 "There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?":"",
 "There is one or more sections for which no part has been assigned yet; therefore creating the new record is not possible yet.":"",
 "This field must not be empty.":"",
+"This object has not been saved yet.":"",
 "This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?":"",
 "This vendor has already a booking with this invoice number, do you really want to add the same invoice number again?":"",
 "Thu":"",
diff --git a/locale/de/all b/locale/de/all
index e1480665f..3d799851c 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -12,7 +12,9 @@ use utf8;
 $self->{texts} = {
   ' Date missing!'              => ' Datum fehlt!',
   ' bytes, max='                => ' Bytes, Maximum=',
+  ' have been set to the state \'paid\'' => ' haben jetzt den Status \'bezahlt\'',
   ' missing!'                   => ' fehlt!',
+  ' would be set to the state \'paid\'' => ' würden den Status \'bezahlt\' haben',
   '"#1" seems to be a faulty list of email addresses. After extracing addresses (#2) too many characters are left.' => '"#1" scheint fehlerhaft zu sein. Es wurden E-Mail Adressen extrahiert (#2), aber es sind noch zu viele Zeichen übrig.',
   '"#1" seems to be a faulty list of email addresses. No addresses could be extracted.' => '"#1" scheint fehlerhaft zu sein. Es konnte keine E-Mail Adresse extrahiert werden',
   '#1 (custom variable)'        => '#1 (benutzerdefinierte Variable)',
@@ -20,15 +22,26 @@ $self->{texts} = {
   '#1 additional part(s)'       => '#1 zusätzliche(r) Artikel',
   '#1 bank transaction bookings undone.' => '#1 Bankbewegung(en) rückgängig gemacht',
   '#1 dunnings have been deleted' => '#1 Mahnung(en) wurden gelöscht',
+  '#1 equal or less than #2'    => '#1 gleich oder kleiner als #2',
+  '#1 equal or more than #2'    => '#1 gleich oder größer als #2',
+  '#1 equals #2'                => '#1 ist #2',
   '#1 h'                        => '#1 h',
   '#1 invoice(s) saved.'        => '#1 Rechnung(en) abgespeichert.',
+  '#1 is #2'                    => '#1 ist #2',
+  '#1 is after #2'              => '#1 nach #2',
+  '#1 is before #2'             => '#1 vor #2',
+  '#1 less than #2'             => '#1 weniger als #2',
+  '#1 more than #2'             => '#1 mehr als #2',
   '#1 prices were updated.'     => '#1 Preise wurden aktualisiert.',
   '#1 proposal(s) saved.'       => '#1 Vorschläge gespeichert.',
   '#1 proposal(s) with #2 invoice(s) saved.' => '#1 Vorschlag(e) mit #2 Rechnung(en) abgespeichert',
+  '#1 salses orders were converted to #2 delivery orders' => '#1 Auftragsbestätigungen wurden in #2 Lieferscheine umgewandelt',
   '#1 section(s)'               => '#1 Abschnitt(e)',
-  '#1 text block(s) back'       => '#1 Textlock/-blöcke vorne',
+  '#1 text block(s) back'       => '#1 Textblock/-blöcke vorne',
   '#1 text block(s) front'      => '#1 Textblock/-blöcke hinten',
   '%'                           => '%',
+  '(0 means fix values)'        => '(0 bedeutet feste Größe)',
+  '(0 means no scrollbar)'      => '(0 bedeutet kein Scrollbar)',
   '(recommended) Insert the used currencies in the system. You can simply change the name of the currencies by editing the textfields above. Do not use a name of a currency that is already in use.' => '(empfohlen) Fügen Sie die verwaisten Währungen in Ihr System ein. Sie können den Namen der Währung einfach ändern, indem Sie die Felder oben bearbeiten. Benutzen Sie keine Namen von Währungen, die Sie bereits benutzen.',
   '*/'                          => '*/',
   '+'                           => '+',
@@ -81,10 +94,13 @@ $self->{texts} = {
   'AP Transaction'              => 'Kreditorenbuchung',
   'AP Transaction (abbreviation)' => 'K',
   'AP Transaction Storno (one letter abbreviation)' => 'S',
+  'AP Transaction Template'     => 'Kreditorenbuchungsvorlage',
   'AP Transaction with Storno (abbreviation)' => 'K(S)',
+  'AP Transaction/AccTrans Item row names' => 'Namen der Rechnungs/Buchungszeilen',
   'AP Transactions'             => 'Kreditorenbuchungen',
   'AP template suggestions'     => 'Vorschlag Kreditorenbuchung',
   'AP transaction \'#1\' posted (ID: #2)' => 'Kreditorenbuchung \'#1\' verbucht (Buchungsnummer: #2)',
+  'AP transaction posted successfully' => 'Kreditorenbuchung erfolgreich gebucht',
   'AP transactions changeable'  => 'Änderbarkeit von Kreditorenbuchungen',
   'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' => 'Kreditorenbuchungen mit Umsatzsteuer-Steuerschlüsseln und/oder Debitorenbuchungen mit Vorsteuer-Steuerschlüsseln',
   'AP/AR Aging & Journal'       => 'Offene Forderungen/Verbindlichkeiten & Buchungsjournal',
@@ -92,9 +108,11 @@ $self->{texts} = {
   'AR Aging'                    => 'Offene Forderungen',
   'AR Transaction'              => 'Debitorenbuchung',
   'AR Transaction (abbreviation)' => 'D',
+  'AR Transaction Template'     => 'Debitorenbuchungsvorlage',
   'AR Transaction/AccTrans Item row names' => 'Namen der Rechnungs/Buchungszeilen',
   'AR Transactions'             => 'Debitorenbuchungen',
   'AR transaction \'#1\' posted (ID: #2)' => 'Debitorenbuchung \'#1\' verbucht (Buchungsnummer: #2)',
+  'AR transactions (Dunning Fees)' => 'Debitorenbuchen (Mahngebühren)',
   'AR transactions changeable'  => 'Änderbarkeit von Debitorenbuchungen',
   'ASSETS'                      => 'AKTIVA',
   'ATTENTION! If you enabled this feature you can not simply turn it off again without taking care that best_before fields are emptied in the database.' => 'ACHTUNG! Wenn Sie diese Einstellung aktivieren, dann können Sie sie später nicht ohne Weiteres deaktivieren, ohne dafür zu sorgen, dass die Felder der Mindeshaltbarkeitsdaten in der Datenbank leer gemacht werden.',
@@ -146,16 +164,17 @@ $self->{texts} = {
   'Account for interest'        => 'Konto für Zinsen',
   'Account for workflow from purchase order to ap transaction' => 'Konto für den Workflow von Lieferantenauftrag nach Kreditorenbuchung',
   'Account number'              => 'Kontonummer',
+  'Account number (database ID)' => 'Kontonummer (Datenbank-ID)',
   'Account number not unique!'  => 'Kontonummer bereits vorhanden!',
   'Account number of the goal/source' => 'Ziel- oder Quellkonto',
   'Account saved!'              => 'Konto gespeichert!',
   'Accounting desired'          => 'Verrechnung des Erstattungsbetrags erwünscht',
   'Accounting method'           => 'Versteuerungsart',
+  'Accounts & Sum'              => 'Konten & Summe',
   'Accrual'                     => 'Soll-Versteuerung',
   'Accrual accounting'          => 'Soll-Versteuerung',
   'Action'                      => 'Aktion',
   'Actions'                     => 'Aktionen',
-  'Activate kivitendo module'   => 'Modul aktivieren',
   'Active'                      => 'Aktiv',
   'Active shops:'               => 'Webshops aktiv',
   'Active?'                     => 'Aktiviert?',
@@ -171,6 +190,7 @@ $self->{texts} = {
   'Add Credit Note'             => 'Gutschrift erfassen',
   'Add Credit Note for this dunning level:' => 'Diese Gutschrift für untenstehende Mahnstufe anzeigen',
   'Add Customer'                => 'Kunde erfassen',
+  'Add Customer/Vendor Number'  => 'Kunden- Lieferantennummer Anhängen',
   'Add Customer/Vendor Number as a reference add-on for SEPA export.' => 'Kunden- Lieferantennummer im Verwendungszweck bei SEPA-Überweisungen anhängen',
   'Add Delivery Note'           => 'Lieferschein erfassen',
   'Add Delivery Order'          => 'Lieferschein erfassen',
@@ -180,14 +200,21 @@ $self->{texts} = {
   'Add Follow-Up'               => 'Wiedervorlage erstellen',
   'Add Follow-Up for #1'        => 'Wiedervorlage für #1 erstellen',
   'Add General Ledger Transaction' => 'Dialogbuchen',
+  'Add Invoice'                 => 'Rechnung erfassen',
   'Add Invoice for Advance Payment' => 'Anzahlungsrechnung erfassen',
   'Add Letter'                  => 'Brief hinzufügen',
   'Add Part'                    => 'Ware erfassen',
+  'Add Parts here!'             => 'Artikel hier hinzufügen!',
   'Add Price Factor'            => 'Preisfaktor erfassen',
   'Add Printer'                 => 'Drucker hinzufügen',
   'Add Project'                 => 'Projekt erfassen',
+  'Add Purchase Credit Note'    => 'Einkaufsgutschrift erfassen',
   'Add Purchase Delivery Order' => 'Lieferschein (Einkauf) erfassen',
+  'Add Purchase Invoice'        => 'Einkaufsrechnung erfassen',
   'Add Purchase Order'          => 'Lieferantenauftrag erfassen',
+  'Add Purchase Order Confirmation' => 'Lieferantenauftragsbestätigung erfassen',
+  'Add Purchase Quotation Intake' => 'Angebotseingang erfassen',
+  'Add Purchase Reclamation'    => 'Einkaufsreklamation erfassen',
   'Add Quotation'               => 'Angebot erfassen',
   'Add RFQ'                     => 'Preisanfrage erfassen',
   'Add RMA Delivery Order'      => 'Retouren-Lieferschein erfassen',
@@ -197,8 +224,13 @@ $self->{texts} = {
   'Add Sales Delivery Order'    => 'Lieferschein (Verkauf) erfassen',
   'Add Sales Invoice'           => 'Rechnung erfassen',
   'Add Sales Order'             => 'Auftrag erfassen',
+  'Add Sales Order Confirmation' => 'Auftragsbestätigung erfassen',
+  'Add Sales Order Intake'      => 'Auftragseingang erfassen',
+  'Add Sales Reclamation'       => 'Verkaufsreklamation erfassen',
   'Add Service'                 => 'Dienstleistung erfassen',
   'Add Storno Credit Note'      => 'Gutschrift Storno hinzufügen',
+  'Add Storno Invoice'          => 'Stornorechnung erfassen',
+  'Add Storno Invoice for Advance Payment' => 'Storno-Anzahlungsrechnung erfassen',
   'Add Supplier Delivery Order' => 'Beistell-Lieferschein erfassen',
   'Add Transaction'             => 'Dialogbuchen',
   'Add User'                    => 'Neuer Benutzer',
@@ -212,9 +244,10 @@ $self->{texts} = {
   'Add business'                => 'Kunden-/Lieferantentyp hinzufügen',
   'Add complexity'              => 'Komplexitätsgrad hinzufügen',
   'Add counted'                 => 'Hinzufügen',
-  'Add custom data export query' => 'Benutzerdefinierte Datenexport-Abfrage erfassen',
+  'Add custom report query'     => 'Benutzerdefinierte Berichts-Abfrage erfassen',
   'Add custom variable'         => 'Benutzerdefinierte Variable erfassen',
   'Add department'              => 'Abteilung hinzufügen',
+  'Add document for'            => 'Dokument hinzufügen für ',
   'Add document for AP transactions' => 'Dokumente für Kreditorenbuchung hinzufügen (benötigt DMS)',
   'Add document for AR transactions' => 'Dokumente für Debitorenbuchung hinzufügen (benötigt DMS)',
   'Add document for GL transactions' => 'Dokumente für Dialogbuchung hinzufügen (benötigt DMS)',
@@ -244,9 +277,12 @@ $self->{texts} = {
   'Add pricegroup'              => 'Preisgruppe hinzufügen',
   'Add project status'          => 'Projektstatus hinzufügen',
   'Add project type'            => 'Projekttypen hinzufügen',
+  'Add reclamation reason'      => 'Reklamationsgrund hinzufügen',
   'Add requirement spec status' => 'Pflichtenheftstatus hinzufügen',
   'Add requirement spec type'   => 'Pflichtenhefttypen hinzufügen',
+  'Add rfq/order status'        => 'Angebots-/Auftrags-Status hinzufügen',
   'Add risk level'              => 'Risikograd hinzufügen',
+  'Add row'                     => 'Zeile hinzufügen',
   'Add section'                 => 'Abschnitt hinzufügen',
   'Add shop'                    => 'Webshop hinzufügen',
   'Add sub function block'      => 'Unterfunktionsblock hinzufügen',
@@ -254,6 +290,8 @@ $self->{texts} = {
   'Add text block'              => 'Textblock erfassen',
   'Add time recording article'  => 'Artikel für Zeiterfassung erfassen',
   'Add title'                   => 'Titel hinzufügen',
+  'Add to basket'               => 'Einkaufen',
+  'Add to purchase basket'      => 'Markierte in den Warenkorb legen',
   'Add unit'                    => 'Einheit hinzufügen',
   'Added sections and function blocks: #1' => 'Hinzugefügte Abschnitte und Funktionsblöcke: #1',
   'Added text blocks: #1'       => 'Hinzugefügte Textblöcke: #1',
@@ -262,15 +300,16 @@ $self->{texts} = {
   'Additional Billing Addresses' => 'Zusätzliche Rechnungsadressen',
   'Additional articles'         => 'Zusätzliche Artikel',
   'Additional articles actions' => 'Aktionen zu zusätzlichen Artikeln',
-  'Additionally the invoice is marked for direct debit and would have been checked automatically had the bank information been entered.' => 'Weiterhin ist die Rechnung für Lastschrifteinzug vorgesehen und wäre standardmäßig ausgewählt, wenn die Bankinformationen eingetragen wären.',
-  'Additionally the invoice is not marked for direct debit and would have been checked automatically had the bank information been entered.' => 'Weiterhin ist die Rechnung nicht für Lastschrifteinzug vorgesehen und wäre standardmäßig ausgewählt, wenn die Bankinformationen eingetragen wären.',
+  'Additional errors:'          => 'Weitere Fehler:',
   'Address'                     => 'Adresse',
   'Address deleted.'            => 'Adresse gelöscht',
   'Address is in use and was flagged invalid.' => 'Adresse wurde benutzt und wird nur als ungültig markiert',
+  'Admin Login'                 => 'Login Administration',
   'Administration'              => 'Administration',
   'Administration area'         => 'Administration',
   'Advance turnover tax return' => 'Umsatzsteuervoranmeldung',
-  'Advance turnover tax return only valid for SKR03 or SKR04' => 'UstVA nur für Standardkontenrahmen SKR03 oder SKR04 möglich.',
+  'Advance turnover tax return only valid for SKR03 or SKR04' => 'UStVA nur für Standardkontenrahmen SKR03 oder SKR04 möglich.',
+  'After'                       => 'Nach',
   'After closed period'         => 'Ab geschlossenem Zeitraum',
   'Aktion'                      => 'Aktion',
   'All'                         => 'Alle',
@@ -283,6 +322,7 @@ $self->{texts} = {
   'All general ledger entries'  => 'Alle Hauptbucheinträge',
   'All groups'                  => 'Alle Gruppen',
   'All modules'                 => 'Alle Module',
+  'All parts of vendor odered by onhand' => 'Alle Artikel des Lieferanten sortiert nach Lagerbestand',
   'All partsgroups'             => 'Alle Warengruppen',
   'All pay postings successfully imported.' => 'Alle Lohnbuchungen erfolgreich importiert.',
   'All payments have already been posted.' => 'Es wurden bereits alle Zahlungen verbucht.',
@@ -295,14 +335,18 @@ $self->{texts} = {
   'All transactions'            => 'Alle Buchungen',
   'All units have either no or exactly one base unit of which they are multiples.' => 'Einheiten haben entweder keine oder genau eine Basiseinheit, von der sie ein Vielfaches sind.',
   'All users'                   => 'Alle BenutzerInnen',
+  'Allocate for Assembly'       => 'Erzeugnisbelegung',
+  'Allocations are not sufficient or overfulfilled' => 'Belegungen sind nicht ausreichend oder übererfüllt',
   'Allocations didn\'t pass constraints' => 'Keine Verfügbarkeit wegen Lagereinschränkung',
   'Allow access'                => 'Zugriff erlauben',
   'Allow conversion from sales orders to sales invoices' => 'Umwandlung von Verkaufsaufträgen in Verkaufsrechnungen zulassen',
   'Allow conversion from sales quotations to sales invoices' => 'Umwandlung von Verkaufsangeboten in Verkaufsrechnungen zulassen',
   'Allow direct creation of new purchase delivery orders' => 'Direktes Anlegen neuer Einkaufslieferscheine zulassen',
   'Allow direct creation of new purchase invoices' => 'Direktes Anlegen neuer Einkaufsrechnungen zulassen',
+  'Allow fuzzy skonto for payment bookings' => 'Unscharfes Skonto erlauben',
   'Allow the following users access to my follow-ups:' => 'Erlaube den folgenden Benutzern Zugriff auf meine Wiedervorlagen:',
   'Allow to delete generated printfiles' => 'Löschen von erzeugten Dokumenten erlaubt',
+  'Allowed skonto percentage deviation' => 'Erlaubte prozentuale Abweichung für unscharfes Skonto',
   'Already counted'             => 'Bereits erfasst',
   'Already imported entries (duplicates)' => 'Bereits importierte Einträge (Duplikate)',
   'Already imported: '          => 'Bereits importiert:',
@@ -320,6 +364,7 @@ $self->{texts} = {
   'Amount less skonto'          => 'Betrag abzgl. Skonto',
   'Amount payable'              => 'Noch zu bezahlender Betrag',
   'Amount payable less discount' => 'Noch zu bezahlender Betrag abzüglich Skonto',
+  'Amounts'                     => 'Beträge',
   'Amounts differ too much'     => 'Beträge weichen zu sehr voneinander ab.',
   'An error occurred while transferring the file.' => 'Bei Übertragung der Datei trat ein Fehler auf',
   'An error occurred. Letter could not be deleted.' => 'Es ist ein Fehler aufgetreten. Der Brief konnte nicht gelöscht werden.',
@@ -337,10 +382,12 @@ $self->{texts} = {
   'Apply to all parts'          => 'Bei allen Artikeln setzen',
   'Apply to all transfers'      => 'Bei allen Lagerbewegungen setzen',
   'Apply to parts without booking group' => 'Bei allen Artikeln ohne gültige Buchungsgruppe setzen',
+  'Apply to selected rows'      => 'Auf ausgewählte Zeilen anwenden',
   'Apply to transfers without bin' => 'Bei allen Lagerbewegungen ohne Lagerplatz setzen',
   'Apply to transfers without comment' => 'Bei allen Lagerbewegungen ohne Kommentar setzen',
   'Apply to transfers without warehouse' => 'Bei allen Lagerbewegungen ohne Lager setzen',
-  'Apply year-end bookings'     => 'Jahresabschlußbuchungen durchführen',
+  'Apply with Attachment'       => 'Mit Anhang anwenden',
+  'Apply year-end bookings'     => 'Jahresabschlussbuchungen durchführen',
   'Applying #1:'                => 'Führe #1 aus:',
   'Approximately #1 prices will be updated.' => 'Ungefähr #1 Preise werden aktualisiert.',
   'Apr'                         => 'Apr',
@@ -357,12 +404,17 @@ $self->{texts} = {
   'Article'                     => 'Artikel',
   'Article Code'                => 'Artikelkürzel',
   'Article classification'      => 'Artikel-Klassifizierung',
+  'Article data'                => 'Artikeldaten',
+  'Article details'             => 'Artikeldetails',
   'Article type'                => 'Artikeltyp',
   'Articles'                    => 'Artikel',
   'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' => 'Als Konsequenz können die gespeicherten Mengen entweder in ein Lager überführt werden, oder für eine frische Lagerverwaltung resettet werden.',
+  'As of version 3.7 most of the variables are also availabe as a print variable.' => 'Seit Version 3.7 stehen die meisten Felder auch als einzelne Druckvariable zu Verfügung.',
+  'As the view starts from sales orders, normally sales quotations are not included.' => 'Da die Anzeige von Verkaufsauftrag aus startet, sind Verkaufsangebote normalerweise nicht enthalten.',
   'Assemblies'                  => 'Erzeugnisse',
   'Assembly'                    => 'Erzeugnis',
   'Assembly (typeabbreviation)' => 'E',
+  'Assembly Item Number'        => 'Artikelnummer des Erzeugnisbestandteils',
   'Assembly Item Qty'           => 'Menge für Erzeugnis',
   'Assembly Last Cost'          => 'Erzeugnis-Einkaufspreis',
   'Assembly Number missing!'    => 'Erzeugnisnummer fehlt!',
@@ -405,14 +457,21 @@ $self->{texts} = {
   'Authentification tables creation' => 'Anlegen der Tabellen zur Benutzerauthentifizierung',
   'Author'                      => 'Verfasser/in',
   'Auto Send?'                  => 'Auto. Versand?',
+  'Automatic'                   => 'automatisch',
+  'Automatic Foreign Exchange Bank Fees' => 'Automatische Bankgebühren für Auslandsüberweisungen',
   'Automatic date calculation'  => 'Automatische Datumsberechnung',
   'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen im Kunden- oder Lieferantennamen',
   'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen in Artikelbeschreibungen und -bemerkungen. Betrifft auch den CSV-Import.',
   'Automatic skonto chart purchase' => 'Skontoautomatik Einkauf',
   'Automatic skonto chart sales' => 'Skontoautomatik Verkauf',
+  'Automatically assigned with bank transaction' => 'Automatisch beim Kontoauszug verbuchen angelegt',
+  'Automatically create new bins' => 'Automatisches Zuweisen der Lagerplätze',
   'Automatically created invoice for fee and interest for dunning %s' => 'Automatisch erzeugte Rechnung für Gebühren und Zinsen zu Mahnung %s',
+  'Automatically delete entries for missing files. Ensure that these files are no longer required!' => 'Einträge für fehlende Dateien automatisch löschen. Stellen Sie sicher, dass diese Dateien nicht mehr benötigt werden!',
   'Available'                   => 'Verfügbar',
   'Available Prices'            => 'Mögliche Preise',
+  'Available Stock'             => 'verfügbarer Bestand',
+  'Available amount'            => 'verfügbare Menge',
   'Available qty'               => 'Lagerbestand',
   'Available to all users'      => 'Für alle BenutzerInnen verfügbar',
   'BALANCE SHEET'               => 'BILANZ',
@@ -435,12 +494,14 @@ $self->{texts} = {
   'Balances'                    => 'Salden',
   'Balancing'                   => 'Bilanzierung',
   'Bank'                        => 'Bank',
+  'Bank Account'                => 'Bankkonto',
   'Bank Account Id Number (Swiss)' => 'Bankkonto Identifikationsnummer (Schweiz)',
   'Bank Code'                   => 'BLZ',
   'Bank Code (long)'            => 'Bankleitzahl (BLZ)',
   'Bank Code Number'            => 'Bankleitzahl',
   'Bank Connection Tax Office'  => 'Bankverbindung des Finanzamts',
   'Bank Connections'            => 'Bankverbindungen',
+  'Bank Fee Booking'            => 'Bankgebühr buchen',
   'Bank Import'                 => 'Kontoauszug importieren',
   'Bank Transaction'            => 'Bankkonto',
   'Bank Transaction is in a closed period.' => 'Die Bankbewegung befindet sich innerhalb eines geschlossenen Zeitraums.',
@@ -461,10 +522,13 @@ $self->{texts} = {
   'Bank transfer amount'        => 'Überweisungssumme',
   'Bank transfer payment list for export #1' => 'Überweisungszahlungsliste für SEPA-Export #1',
   'Bank transfer via SEPA'      => 'Überweisung via SEPA',
+  'Bank transfer via SEPA is blocked' => 'Überweisung via SEPA ist gesperrt',
+  'Bank transfer via SEPA is unblocked' => 'Überweisung via SEPA ist entsperrt',
   'Bank transfers via SEPA'     => 'Überweisungen via SEPA',
   'Base Transaction Value'      => 'Basisumsatz',
   'Base Transaction Value Currency Code' => 'WKZ Basisumsatz',
   'Base unit'                   => 'Basiseinheit',
+  'Basic Article Data'          => 'Grundlegende Artikeldaten',
   'Basic Data'                  => 'Basisdaten',
   'Basic Settings for the Requirement Spec' => 'Grundeinstellungen des Pflichtenheftes',
   'Basic Settings for the Requirement Spec Template' => 'Grundeinstellungen der Pflichtenheftvorlage',
@@ -475,6 +539,7 @@ $self->{texts} = {
   'Bcc'                         => 'Bcc',
   'Bcc E-mail'                  => 'BCC (E-Mail)',
   'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'Da die Benutzerfreundlichkeit durch doppelte Artikelnummern erheblich verschlechtert wird (zum Beispiel, wenn man einen Artikel für eine Rechnung sucht), sollten Artikelnummern eindeutig vergeben sein.',
+  'Before'                      => 'Vor',
   'Before saving a sales order, this article will be checked and a warning is generated.' => 'Vor dem Speichern eines Angebots oder Auftrags wird überprüft, ob die hier definierte Artikelnummer vorhanden ist (Versandkosten01, etc.) und eine entsprechende Hinweiswarnung angezeigt',
   'Belgium'                     => 'Belgien',
   'Beratername'                 => 'Beratername',
@@ -488,6 +553,7 @@ $self->{texts} = {
   'Billed extra expenses'       => 'Abgerechnete Nebenkosten',
   'Billing Address'             => 'Rechnungsadresse',
   'Billing Periodicity'         => 'Abrechnungsperiodizität',
+  'Billing/shipping address'    => 'Rechnungs-/Lieferadresse',
   'Billing/shipping address (GLN)' => 'Rechnungs-/Lieferadresse (GLN)',
   'Billing/shipping address (city)' => 'Rechnungs-/Lieferadresse (Stadt)',
   'Billing/shipping address (country)' => 'Rechnungs-/Lieferadresse (Land)',
@@ -507,9 +573,11 @@ $self->{texts} = {
   'Birthday (after conversion)' => 'Geburtstag (nach Umstellung)',
   'Birthday (before conversion)' => 'Geburtstag (vor Umstellung)',
   'Bis'                         => 'bis',
+  'Block Bank transfer via SEPA' => 'Überweisung via SEPA sperren',
   'Body'                        => 'Text',
   'Body:'                       => 'Text:',
   'Booked'                      => 'gebucht',
+  'Booking Date'                => 'Buchungsdatum',
   'Booking group'               => 'Buchungsgruppe',
   'Booking group #1 needs a valid expense account' => 'Buchungsgruppe #1 braucht ein gültiges Aufwandskonto',
   'Booking group #1 needs a valid income account' => 'Buchungsgruppe #1 braucht ein gültiges Erfolgskonto',
@@ -520,6 +588,7 @@ $self->{texts} = {
   'Booking needs at least one debit and one credit booking!' => 'Die Buchung benötigt mindestens eine Buchung im Soll eine im Haben!',
   'Bookinggroup/Tax'            => 'Buchungsgruppe/Steuer',
   'Books are open'              => 'Die Bücher sind geöffnet.',
+  'Books closed until:'         => 'Bücher abgeschlossen bis:',
   'Books closed up to'          => 'Bücher abgeschlossen bis zum',
   'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' => 'Ja/Nein-Variablen: Wenn der Standardwert nicht leer ist, so wird die Checkbox standardmäßig angehakt.',
   'Both'                        => 'Beide',
@@ -531,6 +600,7 @@ $self->{texts} = {
   'Business'                    => 'Kunden-/Lieferantentyp',
   'Business Discount'           => 'Kunden-/Lieferantentyp-Rabatt',
   'Business Number'             => 'Firmennummer',
+  'Business Type Model'         => 'Kunden-/Lieferantentyp-Art.-Nr.',
   'Business Volume'             => 'Geschäftsvolumen',
   'Business evaluation'         => 'Betriebswirtschaftliche Auswertung',
   'Business type (database ID)' => 'Kunden-/Lieferantentyp (Datenbank-ID)',
@@ -540,13 +610,17 @@ $self->{texts} = {
   'CB Transaction'              => 'SB-Buchung',
   'CB Transactions'             => 'SB-Buchungen',
   'CC to Employee'              => 'CC an Mitarbeiter',
+  'CKEditor5 Test'              => 'CKEditor5-Test',
   'CN'                          => 'Kd-Nr.',
   'CR'                          => 'H',
   'CSS style for pictures'      => 'CSS Style für Bilder',
+  'CSS-Documentation'           => 'CSS-Dokumentation',
   'CSV Export successful!'      => 'CSV-Export erfolgreich!',
+  'CSV File'                    => 'CSV-Datei',
   'CSV export'                  => 'CSV-Export',
   'CSV export -- options'       => 'CSV-Export -- Optionen',
   'CSV import: additional billing addresses' => 'CSV-Import: zusätzliche Rechnungsadressen',
+  'CSV import: ap transactions' => 'CSV Import: Kreditorenbuchungen',
   'CSV import: ar transactions' => 'CSV Import: Debitorenbuchungen',
   'CSV import: bank transactions' => 'CSV Import: Bankbewegungen',
   'CSV import: contacts'        => 'CSV-Import: Ansprechpersonen',
@@ -563,7 +637,10 @@ $self->{texts} = {
   'Calling #1 now'              => 'Wähle jetzt #1',
   'Can only delete the "Storno zu" part of the cancellation pair.' => 'Löschen von R(S) Rechnung nicht erlaubt. Löschen der entsprechenden "Storno zu" Gutschrift reaktiviert diese Rechnung wieder.',
   'Can only save template if amounts,i.e. 1 for debit and credit are set.' => 'Kann die Vorlage nicht speichern. Es wird mindestens ein Betrag im Soll und im Haben benötigt (bspw. 1), damit bspw. Beträge aus Kontoauszügen korrekt gesetzt werden können.',
+  'Can\'t change data of a linked item. Part: ' => 'Daten von verlinkten Artikeln sind unveränderbar. Artikel:',
+  'Can\'t change price of a linked item' => 'Preise von verlinkten Artikeln sind unveränderbar.',
   'Can\'t connect to shop. #1'  => 'Kann keine Verbindung zu Shop #1 herstellen.',
+  'Can\'t convert Purchase Reclamation to Credit Note' => 'Einkaufsreklamation ist nicht in eine Gutschrift umwandelbar.',
   'Can\'t load item without a valid part.id' => 'Kann Artikel ohne gültige part.id nicht laden',
   'Cancel'                      => 'Abbrechen',
   'Cancel Accounts Payables Transaction' => 'Kreditorenbuchung stornieren',
@@ -572,6 +649,7 @@ $self->{texts} = {
   'Cannot Post AP transaction with tax included!' => 'Kann diesen kreditorischen Beleg nicht mit "Steuer im Preis inbegriffen" verbuchen!',
   'Cannot add Booking, reason: #1 DB: #2 ' => 'Kann die Buchung nicht hinzufügen, Grund: #1 DB: #2',
   'Cannot allocate parts.'      => 'Es sind nicht genügend Artikel vorhanden',
+  'Cannot calculate Amount and Tax for this booking correctly, please check chart settings' => 'Kann nicht Betrag und Steuer für diese Buchung korrekt berechnen. Bitte prüfen Sie die entsprechenden Kontenkonfigurationen für diesen Beleg',
   'Cannot change transaction in a closed period!' => 'In einem bereits abgeschlossenen Zeitraum kann keine Buchung verändert werden!',
   'Cannot check correct WebDAV folder' => 'Kann nicht den richtigen WebDAV Pfad überprüfen',
   'Cannot convert date.'        => 'Kann das Datum nicht verarbeiten',
@@ -580,10 +658,11 @@ $self->{texts} = {
   'Cannot delete default account!' => 'Das Standard-Konto kann nicht gelöscht werden!',
   'Cannot delete delivery order!' => 'Lieferschein kann nicht gelöscht werden!',
   'Cannot delete invoice!'      => 'Rechnung kann nicht gelöscht werden!',
-  'Cannot delete order!'        => 'Auftrag kann nicht gelöscht werden!',
-  'Cannot delete quotation!'    => 'Angebot kann nicht gelöscht werden!',
   'Cannot delete transaction!'  => 'Buchung kann nicht gelöscht werden!',
   'Cannot delete vendor!'       => 'Lieferant kann nicht gelöscht werden!',
+  'Cannot export with documents because some transactions don\'t have a PDF document attached.' => 'Einige Buchungen haben kein Dokument hinterlegt. Kann den Export nicht vollständig durchführen.',
+  'Cannot find a single customer. Maybe there is no customer yet?' => 'Kann keinen einzigen Kunden finden. Vielleicht gibt es noch gar keine?',
+  'Cannot find a single vendor. Maybe there is no vendor yet?' => 'Kann keinen einzigen Lieferanten finden. Vielleicht gibt es noch keine Lieferanten?',
   'Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.' => 'Konnte keine passende Vorlage für diesen Druckauftrag finden. Bitte benachrichtigen Sie Ihren Vorlagenadministrator. Die folgenden Pfade wurden durchsucht: #1 ',
   'Cannot get shippingOrderAddressId for #1' => 'Finde das Feld shippingOrderAddressId für #1 nicht.',
   'Cannot have a value in both Debit and Credit!' => 'Es kann nicht gleichzeitig Soll und Haben gebucht werden!',
@@ -594,6 +673,7 @@ $self->{texts} = {
   'Cannot post invoice for a closed period!' => 'Das Rechnungsdatum fällt in einen abgeschlossen Zeitraum!',
   'Cannot post invoice for advance payment with more than one tax' => 'Anzahlungsrechnung mit mehr als einem Steuersatz kann nicht gebucht werden',
   'Cannot post invoice for advance payment with taxincluded' => 'Eine Anzahlungsrechnung mit Steuer im Preis inbegriffen kann nicht gebucht werden',
+  'Cannot post invoice with negative exchange rate' => 'Kann keinen Beleg mit einem negativen Wechselkurs verbuchen.',
   'Cannot post invoice!'        => 'Rechnung kann nicht gebucht werden!',
   'Cannot post payment for a closed period!' => 'Es können keine Zahlungen für abgeschlossene Bücher gebucht werden!',
   'Cannot post payment!'        => 'Zahlung kann nicht gebucht werden!',
@@ -603,14 +683,13 @@ $self->{texts} = {
   'Cannot post transaction with a debit and credit entry for the same account!' => 'Kann Soll und Haben nicht auf dasselbe Konto buchen!',
   'Cannot post transaction!'    => 'Rechnung kann nicht gebucht werden!',
   'Cannot process payment for a closed period!' => 'Es kann keine Zahlung in einem abgeschlossenen Zeitraum verbucht werden!',
+  'Cannot process this invoice: neither VAT ID nor tax ID present.' => 'Rechnung kann nicht verarbeitet werden: Weder Umsatzsteuer-ID noch Steuernummer vorhanden.',
   'Cannot remove files!'        => 'Dateien können nicht gelöscht werden!',
   'Cannot revert a versioned copy.' => 'Eine versionierte Kopie selber kann nicht zurückgesetzt werden.',
   'Cannot safely book imported bank transactions due to lax posting settings for payments' => 'Kann in diesem Mandanten die importierten Bankbewegungen nicht ordnungsgemäß verbuchen, da die Veränderbarkeit von Zahlungen nicht restriktiv genug gesetzt ist. Bitte wie gewohnt manuell ausbuchen oder die Veränderbarkeit von Zahlungen auf unveränderbar setzen.',
   'Cannot safely unlink bank transactions, please set the posting configuration for payments to unchangeable.' => 'Bankbewegungen können nicht rückgängig gemacht werden, da die Veränderbarkeit von Zahlungen möglich ist (s.a. Mandantenkonfiguration, Reiter Buchungskonfiguration).',
   'Cannot save account!'        => 'Konto kann nicht gespeichert werden!',
-  'Cannot save order!'          => 'Auftrag kann nicht gespeichert werden!',
   'Cannot save preferences!'    => 'Einstellungen können nicht gespeichert werden!',
-  'Cannot save quotation!'      => 'Angebot kann nicht gespeichert werden!',
   'Cannot send E-mail without customer given' => 'E-Mail kann nicht ohne Angabe eines Kunden versendet werden.',
   'Cannot send E-mail without vendor given' => 'E-Mail kann nicht ohne Angabe eines Lieferanten versendet werden.',
   'Cannot stock negative amounts' => 'Negative Mengen können nicht eingelagert werden!',
@@ -628,11 +707,13 @@ $self->{texts} = {
   'Cash'                        => 'Zahlungsverkehr',
   'Cash accounting'             => 'Ist-Versteuerung',
   'Cash basis accounting'       => 'Einnahmen-Überschuss-Rechnung',
+  'Catch-all'                   => 'Catch-All',
   'Category'                    => 'Artikelkategorie',
   'Cc'                          => 'Cc',
   'Cc E-mail'                   => 'CC (E-Mail)',
   'Change default bin for this parts' => 'Standardlagerplatz für diese Waren ändern',
   'Change kivitendo installation settings (most entries in the \'System\' menu)' => 'Verändern der kivitendo-Installationseinstellungen (die meisten Menüpunkte unterhalb von \'System\')',
+  'Changeable after posting'    => 'Änderbarkeit nach Buchung',
   'Changed sections and function blocks: #1' => 'Geänderte Abschnitte und Funktionsblöcke: #1',
   'Changed text blocks: #1'     => 'Geänderte Textblöcke: #1',
   'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' => 'Es ist nur sinnvoll Änderungen vorzunehmen, wenn das Konto KEIN Sammelkonto ist und wenn ein gültiger Steuerschlüssel für das Konto existiert. Gleichzeitig Haken bei Forderungen und Verbindlichkeiten zu setzen, macht auch NUR für den Zahlungsein- und Ausgang (bspw. Bank oder Kasse) Sinn.',
@@ -642,12 +723,17 @@ $self->{texts} = {
   'Charge'                      => 'Berechnen',
   'Charge Number'               => 'Chargennummer',
   'Charge number'               => 'Chargennummer',
+  'Chargenumber'                => 'Chargennummer',
   'Chargenumbers'               => 'Chargennummern',
   'Charset'                     => 'Zeichensatz',
   'Chart'                       => 'Buchungskonto',
+  'Chart Test'                  => 'Konten-Test',
   'Chart Type'                  => 'Kontentyp',
+  'Chart assignments'           => 'Chart-Zuordnungen',
   'Chart balance'               => 'Kontensaldo',
   'Chart configuration overview regarding reports' => 'Kontenkonfigurationsübersicht bezüglich Berichte',
+  'Chart export'                => 'Chart-Export',
+  'Chart export -- options'     => 'Chart-Export -- Optionen',
   'Chart list'                  => 'Kontenliste',
   'Chart of Accounts'           => 'Kontenübersicht',
   'Chart picker'                => 'Kontenauswahl',
@@ -665,12 +751,12 @@ $self->{texts} = {
   'Check on sales invoice'      => 'Prüfen bei Verkaufsrechnung',
   'Checks'                      => 'Schecks',
   'Choose "continue" if you want to use this value. Choose "cancel" otherwise.' => 'Wählen Sie "Ok" um diesen Wert zu übernehmen. Andernfalls wählen Sie "Abbrechen".',
-  'Choose Customer'             => 'Endkunde wählen:',
   'Choose Outputformat'         => 'Ausgabeformat auswählen...',
-  'Choose Vendor'               => 'Händler wählen',
   'Choose a Tax Number'         => 'Bitte eine Steuernummer angeben',
   'Choose bank account for reconciliation' => 'Wählen Sie das Bankkonto für den Kontenabgleich',
   'City'                        => 'Stadt',
+  'City (Shipping)'             => 'Stadt (Lieferung)',
+  'Classification'              => 'Klassifizierung',
   'Clear'                       => 'Löschen',
   'Clear fields'                => 'Felder leeren',
   'Cleared Balance'             => 'abgeschlossen',
@@ -687,38 +773,49 @@ $self->{texts} = {
   'Client name'                 => 'Mandantenname',
   'Client to assign the existing WebDAV folders to' => 'Mandant, dem bestehende WebDAV-Ordner zugewiesen werden',
   'Client to configure the printers for' => 'Mandant, für den Drucker konfiguriert werden',
+  'Clients'                     => 'Mandanten',
   'Clients this Group is valid for' => 'Mandanten, für die diese Gruppe gültig ist',
   'Clients this user has access to' => 'Mandanten, auf die Benutzer Zugriff hat',
   'Close Books up to'           => 'Die Bücher abschließen bis zum',
   'Close Details'               => 'Details schließen',
   'Close Flash'                 => 'Schließen',
+  'Close Quotations'            => 'Angebote/Preisanfragen schließen',
   'Close SEPA exports'          => 'SEPA-Export abschließen',
   'Close Window'                => 'Fenster Schließen',
   'Close window'                => 'Fenster schließen',
   'Closed'                      => 'Geschlossen',
-  'Closing Balance'             => 'Abschlußsaldo',
+  'Closing Balance'             => 'Abschlusssaldo',
+  'Closing the selected quotations failed: #1' => 'Das Schließen der Angebote/Preisanfragen schlug fehl: #1',
   'Collective Orders only work for orders from one customer!' => 'Sammelaufträge funktionieren nur für Aufträge von einem Kunden!',
   'Column name'                 => 'Spaltenname',
   'Comma'                       => 'Komma',
   'Comment'                     => 'Kommentar',
   'Commercial court'            => 'Amtsgericht',
+  'Communication'               => 'Kommunikation',
   'Company'                     => 'Firma',
   'Company Name'                => 'Firmenname',
   'Company name'                => 'Firmenname',
   'Company name and address'    => 'Firmenname und -adresse',
   'Company settings'            => 'Firmeneinstellungen',
   'Company\'s email signature'  => 'Firmen-E-Mail-Signatur',
+  'Company:'                    => 'Firma:',
   'Compare to'                  => 'Gegenüberstellen zu',
+  'Complete URL for WebDAV sync external, including port and folders, i.e.: https://foo.com:4433/owncloud/kivitendo' => 'Vollständige URL für externe WebDAV-Synchronisierung, inkl. Port und Verzeichnis ohne abschließenden Schrägstrich, z.B. https://foo.com:4433/remote.php/webdav/Alle Belege für Stb',
   'Complexities'                => 'Komplexitätsgrade',
   'Complexity'                  => 'Komplexität',
   'Component Test'              => 'Komponenten-Test',
+  'Conditions'                  => 'Bedingungen',
   'Configuration'               => 'Konfiguration',
   'Configuration of individual TODO items' => 'Konfiguration für die einzelnen Aufgabenlistenpunkte',
   'Configure'                   => 'Konfigurieren',
   'Confirm!'                    => 'Bestätigen Sie!',
   'Confirmation'                => 'Auftragsbestätigung',
+  'Confirmation Date'           => 'Bestätigungsdatum',
+  'Confirmation Number'         => 'Bestätigungsnummer',
+  'Consume average'             => 'Durchschnittsverbrauch',
   'Contact'                     => 'Kontakt',
   'Contact Departments'         => 'Abteilungen von Ansprechpersonen',
+  'Contact Name'                => 'Kontakt Name',
   'Contact Person'              => 'Ansprechperson',
   'Contact Person (database ID)' => 'Ansprechperson (Datenbank-ID)',
   'Contact Person (name)'       => 'Ansprechperson (Name)',
@@ -734,9 +831,12 @@ $self->{texts} = {
   'Contra'                      => 'gegen',
   'Contra Account'              => 'Gegenkonto',
   'Contrary to Reduced Master Data this will be shown as discount in records.' => 'Im Gegensatz zu Abschlag wird der Rabatt in Belegen ausgewiesen',
+  'Controls whether the default item input is above (default) or below the positions list in orders and quotations. Can be overridden by user preferences.' => 'Bestimmt ob die Artikeleingabeleiste in Aufträgen und Angeboten über (standard) oder unter der Positionsliste angezeigt wird. Kann in den Benutzereinstellungen überschrieben werden.',
   'Conversion of "birthday" contact person attribute' => 'Umstellung des Kontaktpersonenfeldes "Geburtstag"',
   'Conversion to PDF failed: #1' => 'Konvertierung zu PDF schlug fehl: #1',
   'Conversion:'                 => 'Konversion',
+  'Convert to delivery orders'  => 'In Lieferscheine umwandeln',
+  'Converted delivery orders'   => 'Umgewandelte Lieferscheine',
   'Converting to deliveryorder' => 'Konvertiere zu Lieferschein',
   'Copies'                      => 'Kopien',
   'Copy'                        => 'Kopieren',
@@ -751,6 +851,7 @@ $self->{texts} = {
   'Could not create new project #1' => 'Neues Projekt #1 kann nicht angelegt werden',
   'Could not extract Factur-X/ZUGFeRD data, data and error message:' => 'Konnte keine Factur-X-/ZUGFeRD-Daten extrahieren, folgende Fehlermeldung und das PDF:',
   'Could not find an entry for this part in the pricegroup.' => 'Konnte keinen Eintrag für diesen Artikel in der Preisgruppe finden.',
+  'Could not find email import(s): ' => 'Konnte folgende E-Mailimport(e) nicht finden: ',
   'Could not load class #1 (#2): "#3"' => 'Konnte Klasse #1 (#2) nicht laden: "#3"',
   'Could not load class #1, #2' => 'Konnte Klasse #1 nicht laden: "#2"',
   'Could not load employee'     => 'Konnte Benutzer nicht laden',
@@ -758,18 +859,27 @@ $self->{texts} = {
   'Could not load this customer' => 'Konnte diesen Kunden nicht laden',
   'Could not load this draft'   => 'Dieser Entwurf konnte nicht geladen werden',
   'Could not load this vendor'  => 'Konnte diesen Lieferanten nicht laden',
+  'Could not open ZUGFeRD file for reading: #1' => 'Die ZUGFeRD Datei konnte nicht zum Lesen geöffnet werden: #1',
+  'Could not parse PDF embedded attachment #1: #2' => 'Konnte PDF-Anhang #1 nicht verarbeiten: #2',
+  'Could not parse XML Invoice: unknown XML invoice type\nsupported: #1' => 'Konnte XML-Rechnung nicht verabeiten: unbekannter XML-Rechnungs-Typ\n(unterstützt: #1)',
   'Could not print dunning.'    => 'Die Mahnungen konnten nicht gedruckt werden.',
   'Could not reconcile chosen elements!' => 'Die gewählten Elemente konnten nicht ausgeglichen werden!',
   'Could not spawn ghostscript.' => 'Die Anwendung "ghostscript" konnte nicht gestartet werden.',
   'Could not spawn the printer command.' => 'Die Druckanwendung konnte nicht gestartet werden.',
   'Could not update prices!'    => 'Preise konnten nicht aktualisiert werden!',
+  'Count'                       => 'Anzahl',
   'Country'                     => 'Land',
+  'Country (Shipping)'          => 'Land (Lieferung)',
   'Create'                      => 'Anlegen',
   'Create Chart of Accounts'    => 'Zu verwendender Kontenplan',
   'Create Dataset'              => 'Neue Datenbank anlegen',
   'Create Date'                 => 'Erstelldatum',
   'Create HTML'                 => 'HTML erzeugen',
+  'Create Invoice'              => 'Rechnung erstellen',
   'Create PDF'                  => 'PDF erzeugen',
+  'Create Reclamation'          => 'Reklamation erstellen',
+  'Create Sub-Version'          => 'Unterversion erzeugen',
+  'Create a new article from line' => 'Einen neuen Artikel mit den Daten der Zeile anlegen',
   'Create a new background job' => 'Einen neuen Hintergrund-Job anlegen',
   'Create a new client'         => 'Einen neuen Mandanten anlegen',
   'Create a new delivery term'  => 'Neue Lieferbedingungen anlegen',
@@ -794,10 +904,12 @@ $self->{texts} = {
   'Create and edit projects'    => 'Projekte erfassen und bearbeiten',
   'Create and edit purchase delivery orders' => 'Lieferscheine von Lieferanten erfassen und bearbeiten',
   'Create and edit purchase orders' => 'Lieferantenaufträge erfassen und bearbeiten',
+  'Create and edit purchase reclamation' => 'Einkaufsreklamation erfassen und bearbeiten',
   'Create and edit requirement specs' => 'Pflichtenhefte erstellen und bearbeiten',
   'Create and edit sales delivery orders' => 'Lieferscheine für Kunden erfassen und bearbeiten',
   'Create and edit sales orders' => 'Auftragsbestätigungen erfassen und bearbeiten',
   'Create and edit sales quotations' => 'Angebote erfassen und bearbeiten',
+  'Create and edit sales reclamation' => 'Verkaufsreklamation erfassen und bearbeiten',
   'Create and edit shopparts'   => 'Webshopartikel anlegen und bearbeiten',
   'Create and edit vendor invoices' => 'Eingangsrechnungen erfassen und bearbeiten',
   'Create and edit webshops'    => 'Webshopeinstellungen bearbeiten',
@@ -812,7 +924,10 @@ $self->{texts} = {
   'Create bank transfer via SEPA XML' => 'Überweisung via SEPA XML erzeugen',
   'Create customers and vendors. Edit all vendors. Edit all customers' => 'Kunden und Lieferanten erfassen. Alle Lieferanten bearbeiten. Alle Kunden bearbeiten',
   'Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)' => 'Kunden und Lieferanten erfassen. Alle Lieferanten bearbeiten. Nur Kunden bearbeiten bei denen der Verkäufer gleich Bearbeiter (login) ist',
+  'Create delivery order'       => 'Lieferschein erstellen',
   'Create first invoice on'     => 'Erste Rechnung erzeugen am',
+  'Create from Record Template' => 'Neu erfassen mit Belegvorlage',
+  'Create from Workflow'        => 'Workflow weiterführen von',
   'Create invoice'              => 'Buchung erstellen',
   'Create invoice?'             => 'Rechnung erstellen?',
   'Create new'                  => 'Neu erfassen',
@@ -820,17 +935,20 @@ $self->{texts} = {
   'Create new quotation or order' => 'Neues Angebot oder neuen Auftrag anlegen',
   'Create new quotation/order'  => 'Neues Angebot/neuen Auftrag anlegen',
   'Create new qutoation/order'  => 'Neues Angebot/neuen Auftrag anlegen',
+  'Create new record.'          => 'Erstelle neuen Beleg.',
   'Create new templates from master templates' => 'Neue Druckvorlagen aus Vorlagensatz erstellen',
   'Create new version'          => 'Neue Version anlegen',
   'Create one from the context menu by right-clicking on this text.' => 'Erstellen Sie einen aus dem Kontextmenü, indem Sie auf diesen Text rechtsklicken.',
   'Create order'                => 'Auftrag erstellen',
+  'Create partial order'        => 'Teil-Auftrag erstellen',
+  'Create purchase order'       => 'Lieferauftrag erstellen',
   'Create sales invoices with Factur-X/ZUGFeRD data' => 'Verkaufsrechnungen mit Factur-X-/ZUGFeRD-Daten erzeugen',
   'Create sales invoices with Swiss QR-bill' => 'Verkaufsrechnungen mit Schweizer QR-Rechnung erzeugen',
   'Create tables'               => 'Tabellen anlegen',
   'Create variant IBAN without reference' => 'Variante IBAN ohne Referenz erzeugen',
   'Create variant QR-IBAN with QR reference' => 'Variante QR-IBAN mit QR-Referenz erzeugen',
-  'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\'' => 'Mit Profil »Factur-X 1.0.05/ZUGFeRD 2.1.1 extended«',
-  'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\' (test mode)' => 'Mit Profil »Factur-X 1.0.05/ZUGFeRD 2.1.1 extended« (Test-Modus)',
+  'Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\'' => 'Mit Profil »Factur-X 1.01.06/ZUGFeRD 2.2 extended«',
+  'Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\' (test mode)' => 'Mit Profil »Factur-X 1.01.06/ZUGFeRD 2.2 extended« (Test-Modus)',
   'Create with profile \'XRechnung 2.0.0\'' => 'Mit Profil »XRechnung 2.0.0«',
   'Create with profile \'XRechnung 2.0.0\' (test mode)' => 'Mit Profil »XRechnung 2.0.0« (Test-Modus)',
   'Create, edit and list time recordings' => 'Zeiterfassungen erfassen, bearbeiten und ansehen',
@@ -842,6 +960,7 @@ $self->{texts} = {
   'Creating invoices'           => 'Erzeuge Rechnungen',
   'Creating the PDF failed:'    => 'PDF-Erzeugung fehlgeschlagen:',
   'Creation Date'               => 'Erstelldatum',
+  'Creation Time'               => 'Erstellungszeit',
   'Credit'                      => 'Haben',
   'Credit (one letter abbreviation)' => 'H',
   'Credit Account'              => 'Habenkonto',
@@ -852,6 +971,7 @@ $self->{texts} = {
   'Credit Note'                 => 'Gutschrift',
   'Credit Note Date'            => 'Gutschriftdatum',
   'Credit Note Number'          => 'Gutschriftnummer',
+  'Credit Notes'                => 'Gutschriften',
   'Credit Starting Balance'     => 'EB Aktiva',
   'Credit Tax'                  => 'Umsatzsteuer',
   'Credit Tax (lit)'            => 'Habensteuer',
@@ -866,6 +986,7 @@ $self->{texts} = {
   'Currency name'               => 'Währungsname',
   'Currency names must be unique.' => 'Währungsnamen müssen eindeutig sein.',
   'Currency names must not be empty.' => 'Währungsnamen dürfen nicht leer sein.',
+  'Currency, Prices & Taxes'    => 'Währung, Preise & Steuern',
   'Current / Next Level'        => 'Aktuelles / Nächstes Mahnlevel',
   'Current Earnings'            => 'Gewinn',
   'Current Employee'            => 'Aktuelle Mitarbeiter',
@@ -882,11 +1003,16 @@ $self->{texts} = {
   'Currently #1 delivery orders can be converted into invoices and printed.' => 'Momentan können #1 Lieferscheine in Rechnungen umgewandelt werden.',
   'Custom Billing Address'      => 'Abweichende Rechnungsadresse',
   'Custom CSV format'           => 'Eigenes CSV-Format',
+  'Custom Variable'             => 'Benutzerdefinierte Variable',
   'Custom Variables'            => 'Benutzerdefinierte Variablen',
-  'Custom data export'          => 'Benutzerdefinierter Datenexport',
+  'Custom Variables (Abbreviation)' => '(BDV)',
+  'Custom report'               => 'Benutzerdefinierter Bericht',
   'Custom shipto'               => 'Individuelle Lieferadresse',
   'Custom variables for module' => 'Benutzerdefinierte Variablen für Modul',
   'Customer'                    => 'Kunde',
+  'Customer & Contact'          => 'Kunde & Kontakt',
+  'Customer & Order Information' => 'Kunden & Lieferinformation',
+  'Customer &amp; Order'        => 'Kunde &amp; Auftrag',
   'Customer (database ID)'      => 'Kunde (Datenbank-ID)',
   'Customer (name)'             => 'Kunde (Name)',
   'Customer Discount'           => 'Kundenrabatt',
@@ -898,12 +1024,13 @@ $self->{texts} = {
   'Customer Part Number'        => 'Kunden-Art-Nr.',
   'Customer Price'              => 'Kundenpreis',
   'Customer Proposals'          => 'Kundenvorschläge',
+  'Customer Record Number'      => 'Kundenbelegsnummer',
   'Customer deleted!'           => 'Kunde gelöscht!',
   'Customer details'            => 'Kundendetails',
   'Customer missing!'           => 'Kundenname fehlt!',
   'Customer must not be empty.' => 'Kunden darf nicht leer sein.',
   'Customer not found'          => 'Kunde nicht gefunden',
-  'Customer number invalid. Must be less then or equal to 6 digits after prefix.' => 'Kundennummer ungültig. (kleiner/gleich 6 Stellen nach Prefix)',
+  'Customer number invalid. Must be less then or equal to 6 digits after non-digits removed.' => 'Kundennummer ungültig. Muss kleiner/gleich 6 Stellen nach dem Entfernen von Nicht-Ziffern sein.',
   'Customer of assigned order must match customer.' => 'Kunde des zugeordneten Auftrags muss mit dem gewählten Kunden übereinstimmen.',
   'Customer of assigned project must match customer.' => 'Kunde des zugeordneten Projekts muss mit dem gewählten Kunden übereinstimmen.',
   'Customer saved'              => 'Kunde gespeichert',
@@ -919,6 +1046,7 @@ $self->{texts} = {
   'Customer\'s/vendor\'s account number' => 'Kontonummer des Kunden/Lieferanten',
   'Customer\'s/vendor\'s bank'  => 'Bank des Kunden/Lieferanten',
   'Customer\'s/vendor\'s bank code' => 'Bankleitzahl des Kunden/Lieferanten',
+  'Customer-Vendor Test'        => 'Kunden-/Lieferanten-Test',
   'Customer/Vendor'             => 'Kunde/Lieferant',
   'Customer/Vendor (database ID)' => 'Kunde/Lieferant (Datenbank-ID)',
   'Customer/Vendor Name'        => 'Kunde/Lieferant',
@@ -935,14 +1063,14 @@ $self->{texts} = {
   'Cutoff Date'                 => 'Stichtag',
   'Czech Republic'              => 'Tschechien',
   'DATEV'                       => 'DATEV',
+  'DATEV & UStVA'               => 'DATEV & UStVA',
   'DATEV - Export Assistent'    => 'DATEV-Exportassistent',
   'DATEV - Pay Postings Import' => 'DATEV - Lohnbuchungsimport',
   'DATEV Angaben'               => 'DATEV-Angaben',
   'DATEV Export'                => 'DATEV-Export',
   'DATEV check returned errors:' => 'Die DATEV Prüfung dieser Buchung ergab Fehler:',
   'DATEV configuration'         => 'Einstellungen für DATEV',
-  'DATEV expects the encoding to be Western Europe conform (LATIN-1, cp1252). By setting this to "Strict and halt" the DATEV export halts with a error if there is a single character in "Posting Text" which is not LATIN-1 encodeable. By setting this to "Strict but replace" kivitendo will replace the character with a similar one and the export will simply warn about those fields. By setting this to relaxed (UTF-8) the DATEV export encoding will be in kivitendo (UTF-8) encoded and the external import program has to handle this (this may work for DATEV deriviates or future versions of DATEV). Background details: For example turkish characters (Ç) are not valid cp1252 charactes and armenian characters like "Գեղարդ" are probably not replaceable in cp1252' => 'DATEV erwartet eine westeuropäische Zeichenkodierung (LATIN-1, cp1252). Die Einstellung "Strikt und Abbruch" erlaubt keine nicht kodierbaren Zeichen im DATEV-Export und bricht diesen mit einer Fehlermeldung ab. Die Einstellung "Strikt mit Ersetzungen" versucht ähnliche Zeichen (bspw. c statt ć) zu verwenden und gibt zusätzlich eine Warnung beim DATEV-Export aus. Die Einstellung "Lax (UTF-8)" ignoriert diese Anforderung und übergibt die Daten im kivitendo-konformen UTF-8 Format. Letzteres kann für zukünftige DATEV-Version oder DATEV-kompatible Alternativen interessant sein. Hintergrund-Info: Beispielsweise sind schon türkische Zeichen (Ç) nicht mehr im westeuropäischen Zeichensätz enthalten und armenische Zeiche wie "Գեղարդ" könnnen sicherlich überhaupt nicht mit Zeichen in cp1252 ersetzt werden.',
-  'DATEX - Export Assistent'    => 'DATEV-Exportassistent',
+  'DATEV expects the encoding to be Western Europe conform (LATIN-1, cp1252). By setting this to "Strict and halt" the DATEV export halts with a error if there is a single character in "Posting Text" which is not LATIN-1 encodeable. By setting this to "Strict but replace" kivitendo will replace the character with a similar one and the export will simply warn about those fields. By setting this to relaxed (UTF-8) the DATEV export encoding will be in kivitendo (UTF-8) encoded and the external import program has to handle this (this may work for DATEV deriviates or future versions of DATEV). Background details: For example turkish characters (Ç) are not valid cp1252 charactes and armenian characters like "Գեղարդ" are probably not replaceable in cp1252' => 'DATEV erwartet eine westeuropäische Zeichenkodierung (LATIN-1, cp1252). Die Einstellung "Strikt und Abbruch" erlaubt keine nicht kodierbaren Zeichen im DATEV-Export und bricht diesen mit einer Fehlermeldung ab. Die Einstellung "Strikt mit Ersetzungen" versucht ähnliche Zeichen (bspw. c statt ć) zu verwenden und gibt zusätzlich eine Warnung beim DATEV-Export aus. Die Einstellung "Lax (UTF-8)" ignoriert diese Anforderung und übergibt die Daten im kivitendo-konformen UTF-8 Format. Letzteres kann für zukünftige DATEV-Version oder DATEV-kompatible Alternativen interessant sein. Hintergrund-Info: Beispielsweise sind schon türkische Zeichen (Ç) nicht mehr im westeuropäischen Zeichensatz enthalten und armenische Zeichen wie "Գեղարդ" können sicherlich überhaupt nicht mit Zeichen in cp1252 ersetzt werden.',
   'DELETED'                     => 'Gelöscht',
   'DFV-Kennzeichen'             => 'DFV-Kennzeichen',
   'DR'                          => 'S',
@@ -980,10 +1108,13 @@ $self->{texts} = {
   'Date of Last Payment'        => 'Letzter Zahlungseingang',
   'Date the payment is due in full' => 'Das Datum, bis die Rechnung in voller Höhe bezahlt werden muss',
   'Date the payment is due with discount' => 'Das Datum, bis die Rechnung unter Abzug von Skonto bezahlt werden kann',
+  'Dates'                       => 'Daten',
+  'Dates & Numbers'             => 'Daten & Nummern',
   'Datev export encoding'       => 'DATEV-Export Kodierung',
   'Datevautomatik'              => 'Datev-Automatik',
   'Datum von'                   => 'Datum von',
   'Deactivate by default'       => 'Deaktiviert als Voreinstellung',
+  'Deadline'                    => 'Fristsetzung',
   'Dear Sir or Madam,'          => 'Sehr geehrte Damen und Herren,',
   'Debit'                       => 'Soll',
   'Debit (one letter abbreviation)' => 'S',
@@ -1007,7 +1138,7 @@ $self->{texts} = {
   'Default Bin'                 => 'Standard-Lagerplatz',
   'Default Bin with ignoring onhand' => 'Standard-Lagerplatz für Auslagern ohne Prüfung auf Bestand',
   'Default Client (unconfigured)' => 'Standardmandant (unkonfiguriert)',
-  'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
+  'Default Customer/Vendor Language' => 'Standard-Sprache Kunden- & Lieferanten',
   'Default Transfer'            => 'Ein- / Auslagern über Standardlagerplätze',
   'Default Transfer Out always succeed. The current part onhand is ignored and the inventory can have negative stocks (not recommended).' => 'Auslagern über Standardlagerplatz funktioniert immer (verfügbare Menge wird nicht geprüft). Die Lagerbewegung wird auf den unten konfigurierten Lagerplatz gebucht (nicht empfohlen).',
   'Default Transfer Out with negative inventory' => 'Standard-Auslagern ohne Prüfung auf Bestand',
@@ -1022,12 +1153,13 @@ $self->{texts} = {
   'Default currency'            => 'Standardwährung',
   'Default currency missing!'   => 'Standardwährung fehlt!',
   'Default hourly rate for new customers' => 'Standard-Stundensatz für neue Kunden',
+  'Default means "if no language selected then..."' => 'Standard bedeutet "wenn keine Sprache ausgewählt, dann..."',
   'Default output medium'       => 'Standardausgabekanal',
   'Default part for shipping costs' => 'Standardartikel für Lieferkosten',
   'Default printer'             => 'Standarddrucker',
   'Default taxzone'             => 'Standardsteuerzone',
   'Default template format'     => 'Standardvorlagenformat',
-  'Default transfer delivery order' => 'Standard-Auslagern über Lieferschein',
+  'Default transfer delivery order' => 'Standard-Ein-/Auslagern über Lieferschein',
   'Default transfer invoice'    => 'Standard-Auslagern über Rechnung',
   'Default transfer invoice with charge number' => 'Standard-Auslagern über Rechnung mit Chargennummer',
   'Default transport article number' => 'Standard Versand / Transport-Erinnerungs-Artikel',
@@ -1045,17 +1177,21 @@ $self->{texts} = {
   'Delete address'              => 'Adresse löschen',
   'Delete all'                  => 'Alle Löschen',
   'Delete for Customers'        => 'Bei Kunden löschen',
+  'Delete for customers & vendors' => 'Bei Kunden & Lieferanten löschen',
   'Delete links'                => 'Verknüpfungen löschen',
   'Delete picture'              => 'Bild löschen',
   'Delete printfiles'           => 'Dokumente löschen',
   'Delete profile'              => 'Profil löschen',
   'Delete quotation/order'      => 'Angebot/Auftrag löschen',
   'Delete requirement spec'     => 'Pflichtenheft löschen',
+  'Delete selected from purchase basket' => 'Lösche ausgewählte aus dem Einkaufskorb',
+  'Delete selected rows'        => 'Lösche ausgewählte Zeilen',
   'Delete shoporder'            => 'Shopbestellung löschen',
   'Delete template'             => 'Vorlage löschen',
   'Delete text block'           => 'Textblock löschen',
   'Delete transaction'          => 'Buchung löschen',
   'Deleted'                     => 'Gelöscht',
+  'Deleted email import(s): '   => 'Gelöschte E-Mailimport(e): ',
   'Deleting this type of record has been disabled in the configuration.' => 'Das Löschen von dieser Belegart ist in der Konfiguration deaktiviert.',
   'Delivered'                   => 'Geliefert',
   'Delivered amount'            => 'Gelieferter Betrag',
@@ -1084,10 +1220,14 @@ $self->{texts} = {
   'DeliveryOrder'               => 'Lieferschein',
   'Denmark'                     => 'Dänemark',
   'Department'                  => 'Abteilung',
-  'Department (database ID)'    => 'Abeilung (Datenbank-ID)',
+  'Department & Function'       => 'Abteilung & Funktion',
+  'Department (database ID)'    => 'Abteilung (Datenbank-ID)',
   'Department (description)'    => 'Abteilung (Beschreibung)',
   'Department 1'                => 'Abteilung (1)',
+  'Department 1 (Shipping)'     => 'Abteilung (1) (Lieferung)',
   'Department 2'                => 'Abteilung (2)',
+  'Department 2 (Shipping)'     => 'Abteilung (2) (Lieferung)',
+  'Department Description'      => 'Abteilungsbeschreibung',
   'Departments'                 => 'Abteilungen',
   'Dependencies'                => 'Abhängigkeiten',
   'Dependency loop detected:'   => 'Schleife in den Abhängigkeiten entdeckt:',
@@ -1098,15 +1238,18 @@ $self->{texts} = {
   'Description missing!'        => 'Beschreibung fehlt.',
   'Description must not be empty.' => 'Beschreibung darf nicht leer sein.',
   'Description of #1'           => 'Beschreibung von #1',
-  'Design custom data export queries' => 'Benutzerdefinierte Datenexport-Abfragen designen',
+  'Design custom report queries' => 'Benutzerdefinierte Berichts-Abfragen designen',
   'Destination BIC'             => 'Ziel-BIC',
   'Destination IBAN'            => 'Ziel-IBAN',
+  'Destination URL for sync'    => 'Ziel-URL für die Synchronisation',
   'Destination bin'             => 'Ziellagerplatz',
   'Destination warehouse'       => 'Ziellager',
   'Destination warehouse and bin' => 'Ziellager und -lagerplatz',
   'Detail view'                 => 'Detailanzeige',
+  'Detailed information about this contact' => 'Detaillierte Informationen über diesen Kontakt',
   'Details'                     => 'Details',
   'Details (one letter abbreviation)' => 'D',
+  'Details of article number "#1"' => 'Details von Artikel "#1"',
   'Details: #1'                 => 'Details: #1',
   'Developer Tools'             => 'Developer Tools',
   'Dial command missing in kivitendo configuration\'s [cti] section' => 'Wählbefehl fehlt im Abschnitt [cti] der kivitendo-Konfiguration',
@@ -1134,7 +1277,9 @@ $self->{texts} = {
   'Do not leave booking form?'  => 'Buchungsmaske nicht verlassen?',
   'Do not link to a project.'   => 'Nicht mit einem Projekt verknüpfen.',
   'Do not modify this position' => 'Diese Position nicht verändern',
+  'Do not order anymore'        => 'Nicht mehr bestellen',
   'Do not run the task server for this client' => 'Task-Server nicht für diesen Mandanten ausführen',
+  'Do not save any datasets on errors' => 'Bei Fehlern überhaupt keine Datensätze speichern',
   'Do not set default booking group' => 'Nie Standardbuchungsgruppe setzen',
   'Do not set this bin'         => 'Diesen Lagerplatz nicht setzen',
   'Do not set this comment'     => 'Diesen Kommentar nicht setzen',
@@ -1153,6 +1298,7 @@ $self->{texts} = {
   'Do you really want to delete the selected objects?' => 'Möchten Sie die ausgewählten Objekte wirklich löschen?',
   'Do you really want to delete this draft?' => 'Möchten Sie diesen Entwurf wirklich löschen?',
   'Do you really want to delete this object?' => 'Möchten Sie dieses Objekt wirklich löschen?',
+  'Do you really want to delete this reclamation reason?' => 'Möchten Sie diesen Reklamationsgrund wirklich löschen?',
   'Do you really want to delete this record template?' => 'Möchten Sie diese Belegvorlage wirklich löschen?',
   'Do you really want to mark the selected entries as booked?' => 'Möchten Sie die ausgewählten Einträge wirklich als gebucht markieren?',
   'Do you really want to print?' => 'Wollen Sie wirklich drucken?',
@@ -1160,11 +1306,15 @@ $self->{texts} = {
   'Do you really want to transfer the stock and set this order to delivered?' => 'Wollen Sie wirklich alle Lagerbewegungen durchführen?',
   'Do you really want to undo the selected SEPA exports? You have to reassign the export again.' => 'Möchten Sie wirklich die ausgewählten SEPA-Exports rückgängig machen? Der Export muss anschließend neu erzeugt werden.',
   'Do you really want to unimport the selected documents?' => 'Möchten Sie wirklich diese Dateien an die Quelle zurückgeben?',
+  'Do you really want undo transfers the stock and set this order to undelivered?' => 'Wollen sie wirklich die Lagerbewegung rückgängig machen und den Beleg als nicht geliefert setzen?',
+  'Do you want delete #1 rows?' => 'Wollen Sie #1 Zeilen löschen?',
   'Do you want to <b>limit</b> your search?' => 'Möchten Sie Ihre Suche <b>spezialisieren</b>?',
-  'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => 'Möchten Sie diese Lieferadresse in den neuen Lieferantenauftrag übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
+  'Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?' => 'Möchten Sie diese Lieferadresse in den neuen Einkaufsbeleg übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
+  'Do you want to carry this shipping address over to the new purchase reclamation so that the vendor can deliver the goods directly to your customer?' => 'Möchten Sie diese Lieferadresse in die neue Einkaufsreklamation übernehmen, damit der Händler die Waren direkt an Ihren Kunden liefern kann?',
   'Do you want to overwrite your current title?' => 'Möchten Sie den aktuellen Titel überschreiben?',
   'Do you want to set the account number "#1" to "#2" and the name "#3" to "#4"?' => 'Soll die Kontonummer "#1" zu "#2" und den Name "#3" zu "#4" geändert werden?',
   'Do you want to store the existing onhand values into a new warehouse?' => 'Möchten Sie die vorhandenen Mengendaten in ein Lager übertragen?',
+  'Doc Storage is not enabled'  => 'DMS Funktion ist nicht aktiviert',
   'Document'                    => 'Dokument',
   'Document Count'              => 'Anz. PDF Belege',
   'Document Project (database ID)' => 'Projektnummer des Belegs (Datenbank-ID)',
@@ -1174,14 +1324,18 @@ $self->{texts} = {
   'Document generating failed. Please check Templates an LateX !' => 'Das Dokument konnte nicht erzeugt werden. Bitte Vorlagen und LateX prüfen!',
   'Documentation'               => 'Dokumentation',
   'Documentation (in German)'   => 'Dokumentation',
+  'Documentation about periodic invoices in a new window/tab' => 'Dokumentation zu periodischen Rechnungen in neuem Fenster/Tab',
+  'Documentation about variables in a new window/tab' => 'Dokumentation zu Variablen in neuem Fenster/Tab',
   'Documents'                   => 'Dokumente',
   'Documents in the WebDAV repository' => 'Dokumente im WebDAV-Repository',
+  'Documents which are allowed to be saved with no positions' => 'Belege, die ohne Positionen gespeichert werden dürfen',
   'Don\'t include a printout of the record with the email' => 'Keinen Belegausdruck mit E-Mail schicken',
   'Don\'t include a printout of the record with the email, only selected files' => 'Keinen Belegausdruck mit E-Mail schicken, sondern nur ausgewählte Dateien',
   'Done'                        => 'Fertig',
   'Done.'                       => 'Fertig.',
   'Double partnumbers'          => 'Doppelte Artikelnummern',
   'Download'                    => 'Download',
+  'Download Documents for exported bookings' => 'Download hinterlegte PDFs zum aktuellen SEPA-Lauf',
   'Download PDF'                => 'PDF herunterladen',
   'Download PDF, do not print'  => 'Nicht drucken, sondern PDF herunterladen',
   'Download SEPA XML export file' => 'SEPA-XML-Exportdatei herunterladen',
@@ -1214,7 +1368,9 @@ $self->{texts} = {
   'Dunning Level missing in row ' => 'Mahnlevel fehlt in ',
   'Dunning Process Config saved!' => 'Mahnwesenkonfiguration gespeichert!',
   'Dunning Process started for selected invoices!' => 'Mahnprozess für selektierte Rechnungen gestartet',
+  'Dunning email'               => 'Mahnungsemail',
   'Dunning level'               => 'Mahnstufe',
+  'Dunning lock'                => 'Mahnsperre',
   'Dunning number'              => 'Mahnungsnummer',
   'Dunning overview'            => 'Mahnungsübersicht',
   'Dunning status'              => 'Mahnstatus',
@@ -1262,14 +1418,20 @@ $self->{texts} = {
   'Edit Follow-Up'              => 'Wiedervorlage bearbeiten',
   'Edit Follow-Up for #1'       => 'Wiedervorlage für #1 bearbeiten',
   'Edit General Ledger Transaction' => 'Buchung im Hauptbuch bearbeiten',
+  'Edit Invoice'                => 'Rechnung bearbeiten',
   'Edit Invoice for Advance Payment' => 'Anzahlungsrechnung bearbeiten',
   'Edit Letter'                 => 'Brief bearbeiten',
   'Edit Part'                   => 'Ware bearbeiten',
   'Edit Preferences for #1'     => 'Einstellungen von #1 bearbeiten',
   'Edit Price Factor'           => 'Preisfaktor bearbeiten',
   'Edit Printer'                => 'Drucker bearbeiten',
+  'Edit Purchase Credit Note'   => 'Einkaufsgutschrift bearbeiten',
   'Edit Purchase Delivery Order' => 'Lieferschein (Einkauf) bearbeiten',
+  'Edit Purchase Invoice'       => 'Einkaufsrechnung bearbeiten',
   'Edit Purchase Order'         => 'Lieferantenauftrag bearbeiten',
+  'Edit Purchase Order Confirmation' => 'Lieferantenauftragsbestätigung bearbeiten',
+  'Edit Purchase Quotation Intake' => 'Angebotseingang bearbeiten',
+  'Edit Purchase Reclamation'   => 'Einkaufsreklamation bearbeiten',
   'Edit Quotation'              => 'Angebot bearbeiten',
   'Edit RMA Delivery Order'     => 'Retouren-Lieferschein bearbeiten',
   'Edit Request for Quotation'  => 'Anfrage bearbeiten',
@@ -1277,6 +1439,8 @@ $self->{texts} = {
   'Edit Sales Delivery Order'   => 'Lieferschein (Verkauf) bearbeiten',
   'Edit Sales Invoice'          => 'Rechnung bearbeiten',
   'Edit Sales Order'            => 'Auftrag bearbeiten',
+  'Edit Sales Order Intake'     => 'Auftragseingang bearbeiten',
+  'Edit Sales Reclamation'      => 'Verkaufsreklamation bearbeiten',
   'Edit Service'                => 'Dienstleistung bearbeiten',
   'Edit Storno Credit Note'     => 'Storno Gutschrift bearbeiten',
   'Edit Storno Invoice'         => 'Stornorechnung bearbeiten',
@@ -1297,7 +1461,7 @@ $self->{texts} = {
   'Edit booking group'          => 'Buchungsgruppe bearbeiten',
   'Edit business'               => 'Kunden-/Lieferantentyp bearbeiten',
   'Edit complexity'             => 'Komplexitätsgrad bearbeiten',
-  'Edit custom data export query' => 'Benutzerdefinierte Datenexport-Abfrage bearbeiten',
+  'Edit custom report query'    => 'Benutzerdefinierte Berichts-Abfrage bearbeiten',
   'Edit custom shipto'          => 'Individuelle Lieferadresse bearbeiten',
   'Edit custom variable'        => 'Benutzerdefinierte Variable bearbeiten',
   'Edit delivery term'          => 'Lieferbedingungen bearbeiten',
@@ -1317,6 +1481,7 @@ $self->{texts} = {
   'Edit price rule'             => 'Preisregel bearbeiten',
   'Edit pricegroup'             => 'Preisgruppe bearbeiten',
   'Edit prices and discount (if not used, textfield is ONLY set readonly)' => 'Preise und Rabatt in Formularen frei anpassen (falls deaktiviert, wird allerdings NUR das textfield auf READONLY gesetzt / kann je nach Browserversion und technischen Fähigkeiten des Anwenders noch umgangen werden)',
+  'Edit prices for parts, services, assemblies' => 'Preise von Artikel, Dienstleistungen, Erzeugnisse bearbeiten',
   'Edit project'                => 'Projekt bearbeiten',
   'Edit project #1'             => 'Projekt #1 bearbeiten',
   'Edit project link'           => 'Projektverknüpfung bearbeiten',
@@ -1324,10 +1489,12 @@ $self->{texts} = {
   'Edit project type'           => 'Projekttypen bearbeiten',
   'Edit purchase letters'       => 'Einkaufsbrief erstellen',
   'Edit purchase price rule'    => 'Einkaufspreisregel bearbeiten',
+  'Edit reclamation reason'     => 'Reklamationsgrund bearbeiten',
   'Edit requirement spec'       => 'Pflichtenheft bearbeiten',
   'Edit requirement spec status' => 'Pflichtenheftstatus bearbeiten',
   'Edit requirement spec template' => 'Pflichtenheftvorlage bearbeiten',
   'Edit requirement spec type'  => 'Pflichtenhefttypen bearbeiten',
+  'Edit rfq/order status'       => 'Angebots-/Auftrags-Status bearbeiten',
   'Edit risk level'             => 'Risikograd bearbeiten',
   'Edit sales letters'          => 'Verkaufsbrief erstellen',
   'Edit sales price rule'       => 'Verkaufspreisregel bearbeiten',
@@ -1346,20 +1513,38 @@ $self->{texts} = {
   'Edit the sales_quotation'    => 'Bearbeiten des Angebots',
   'Edit time recording article' => 'Artikel für Zeiterfassung bearbeiten',
   'Edit time recordings of all staff members' => 'Zeiterfassungseinträge aller Mitarbeiter bearbeiten',
-  'Edit title'                  => 'Titiel bearbeiten',
+  'Edit title'                  => 'Titel bearbeiten',
   'Edit units'                  => 'Einheiten bearbeiten',
   'Editable'                    => 'Bearbeitbar',
   'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => 'Entweder gibt es keine offenen Rechnungen, oder es wurden bereits Überweisungen über die offenen Beträge aller offenen Rechnungen erstellt.',
   'Element disabled'            => 'Element deaktiviert',
   'Email'                       => 'E-Mail',
+  'Email Attachment Preview'    => 'E-Mail-Anhang-Vorschau',
+  'Email Details'               => 'E-Mail Details',
+  'Email Journal Workflow'      => 'E-Mail-Journal-Workflow',
+  'Email Sender Dunning'        => 'E-Mail-Absender für Mahnung',
+  'Email Sender Letter'         => 'E-Mail-Absender für Briefe',
+  'Email Sender Purchase Delivery Order' => 'E-Mail-Absender für Lieferantenlieferscheine',
+  'Email Sender Purchase Order' => 'E-Mail-Absender für Lieferantenaufträge',
+  'Email Sender Request Quotation' => 'E-Mail-Absender für Preisanfragen',
+  'Email Sender Sales Delivery Order' => 'E-Mail-Absender für Verkaufslieferscheine',
+  'Email Sender Sales Invoice'  => 'E-Mail-Absender für Verkaufsrechnungen',
+  'Email Sender Sales Order'    => 'E-Mail-Absender für Verkaufsaufträge',
+  'Email Sender Sales Purchase Invoice' => 'E-Mail-Absender für Einkaufsrechnungen',
+  'Email Sender Sales Quotation' => 'E-Mail-Absender für Angebote',
+  'Email Subject Transaction Description' => 'E-Mail-Betreff enthält Vorgangsbezeichnung',
   'Email address'               => 'E-Mail-Adresse',
   'Email journal'               => 'E-Mail-Journal',
+  'Email marked as not obsolete.' => 'E-Mail als gültig markiert.',
+  'Email marked as obsolete.'   => 'E-Mail als ungültig markiert.',
   'Email of the delivery order recipient' => 'E-Mail des Lieferscheinempfängers',
+  'Email of the dunning recipient' => 'E-Mail des Mahnungsempfängers',
   'Email of the invoice recipient' => 'E-Mail des Rechnungsempfängers',
   'Email signature'             => 'E-Mail-Signatur',
   'Employee'                    => 'Bearbeiter',
   'Employee #1 saved!'          => 'Benutzer #1 gespeichert!',
   'Employee (database ID)'      => 'Bearbeiter (Datenbank-ID)',
+  'Employee Name'               => 'Name des Bearbeiters',
   'Employee from the original invoice' => 'Mitarbeiter der Ursprungs-Rechnung',
   'Employee must not be empty.' => 'Bearbeiter darf nicht leer sein.',
   'Employees'                   => 'Benutzer',
@@ -1370,16 +1555,18 @@ $self->{texts} = {
   'Enabled modules'             => 'Aktivierte Module',
   'End'                         => 'Ende',
   'End date'                    => 'Enddatum',
+  'End to end ID'               => 'Ende-zu-Ende-ID',
   'Enter longdescription'       => 'Langtext eingeben',
   'Enter the requested execution date or leave empty for the quickest possible execution:' => 'Geben Sie das jeweils gewünschte Ausführungsdatum an, oder lassen Sie das Feld leer für die schnellstmögliche Ausführung:',
   'Entries for which automatic conversion failed:' => 'Einträge, für die die automatische Umstellung fehlschlug:',
   'Entries for which automatic conversion succeeded:' => 'Einträge, für die die automatische Umstellung erfolgreich war:',
   'Entries ready to import'     => 'Zu importierende Einträge',
   'Entries with errors'         => 'Einträge mit Fehlern',
-  'Entry overlaps with "#1".'   => 'Einträg überlappt sich mit "#1"',
+  'Entry overlaps with "#1".'   => 'Eintrag überlappt sich mit "#1"',
   'Equity'                      => 'Passiva',
   'Erfolgsrechnung'             => 'Erfolgsrechnung',
   'Error'                       => 'Fehler',
+  'Error Message'               => 'Fehlermeldung',
   'Error getting QR-Bill type.' => 'Fehler in QR-Rechnung Varianten Auswahl.',
   'Error handling'              => 'Fehlerbehandlung',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
@@ -1394,6 +1581,7 @@ $self->{texts} = {
   'Error when saving: #1'       => 'Fehler beim Speichern: #1',
   'Error while applying year-end bookings!' => 'Fehler beim Durchführen der Abschlußbuchungen!',
   'Error while creating project with project number of new order number, project number #1 already exists!' => 'Fehler beim Erstellen eines Projekts mit der Projektnummer der neuen Auftragsnummer, Projektnummer #1 existiert bereits!',
+  'Error while processing email journal (\'#1\') attachments with \'#2\': ' => 'Fehler beim Verarbeiten der E-Mail-Journals (\'#1\') Anhänge mit \'#2\': ',
   'Error while saving shop order #1. DB Error #2. Generic exception #3.' => 'Fehler beim Speichern der Shop-Bestellung #1. DB Fehler #2. Genereller Fehler #3.',
   'Error with default taxzone'  => 'Ungültige Standardsteuerzone',
   'Error!'                      => 'Fehler!',
@@ -1434,6 +1622,7 @@ $self->{texts} = {
   'Error: Invalid warehouse'    => 'Fehler: Ungültiges Lager',
   'Error: Invalid warehouse id' => 'Ungültige Lager-ID',
   'Error: Invalid warehouse name #1' => 'Ungültiger Lagername \'#1\'',
+  'Error: Invoice Number missing' => 'Fehler: Rechnungsnummer fehlt',
   'Error: More than one source order found' => 'Fehler: mehr als ein Quell-Auftrag gefunden',
   'Error: Name missing'         => 'Fehler: Name fehlt',
   'Error: Not enough parts in stock' => 'Fehler: Nicht genügend Artikel eingelagert',
@@ -1445,18 +1634,26 @@ $self->{texts} = {
   'Error: Stock problem'        => 'Fehler: Problem bei der Lagerbewegung',
   'Error: Stocking out would result in stock underrun' => 'Auslagern würde zu einem negativen Lagerbestand führen',
   'Error: Stocking out would result in stock underrun: #1' => 'Auslagern würde zu einem negativen Lagerbestand führen: #1',
+  'Error: This is not a sales reclamation.' => 'Fehler: Dies ist keine Verkaufreklamaiton.',
   'Error: Transfer would result in a negative target quantity.' => 'Fehler: Lagerbewegung würde zu einer negativen Zielmenge führen.',
   'Error: Unit missing or invalid' => 'Fehler: Einheit fehlt oder ungültig',
+  'Error: Vendor missing'       => 'Fehler: Lieferant fehlt',
   'Error: Warehouse not found'  => 'Fehler: Lager nicht gefunden',
   'Error: amount and netamount need to be numeric' => 'Fehler: amount und netamount müssen numerisch sein',
+  'Error: ap transaction doesn\'t validate' => 'Fehler: die Kreditorenbuchung ist nicht korrekt',
+  'Error: apchart isn\'t an AP chart' => 'Fehler: das Verbindlichkeitskonto ist nicht als Verbindlichkeitskonto definiert (link = AP)',
   'Error: ar transaction doesn\'t validate' => 'Fehler: die Debitorenbuchung ist nicht korrekt',
   'Error: archart isn\'t an AR chart' => 'Fehler: das Forderungskonto ist nicht als Forderungskonto definiert (link = AR)',
   'Error: booking group missing or invalid' => 'Fehler: Buchungsgruppe fehlt oder ungültig',
+  'Error: can\'t find ap chart with accno #1' => 'Fehler: kein Verbindlichkeitskonto mit Kontonummer #1',
   'Error: can\'t find ar chart with accno #1' => 'Fehler: kein Forderungskonto mit Kontonummer #1',
+  'Error: chart isn\'t an ap_amount chart' => 'Fehler: Konto ist kein Aufwandkonto',
   'Error: chart isn\'t an ar_amount chart' => 'Fehler: Konto ist kein Erlöskonto',
   'Error: chart missing'        => 'Fehler: Konto fehlt',
   'Error: chart not found'      => 'Fehler: Konto nicht gefunden',
+  'Error: invalid acc transactions for this ap row' => 'Fehler: ungültige Buchungszeilen für diese Rechnungzeile',
   'Error: invalid acc transactions for this ar row' => 'Fehler: ungültige Buchungszeilen für diese Rechnungzeile',
+  'Error: invalid ap row for this transaction' => 'Fehler: ungültige Rechnungszeile für diese Buchungszeile',
   'Error: invalid ar row for this transaction' => 'Ungültige Rechnungszeile für diese Buchungszeile',
   'Error: invalid chart'        => 'Fehler: ungültiges Konto',
   'Error: invalid chart (accno)' => 'Fehler: ungültiges Konto (accno)',
@@ -1465,7 +1662,9 @@ $self->{texts} = {
   'Error: invnumber already exists' => 'Fehler: Rechnungsnummer existiert schon',
   'Error: local bank account id doesn\'t match local bank account number' => 'Fehler: Bankkonto-ID stimmt nicht mit Kontonummer überein',
   'Error: local bank account id doesn\'t match local bank code' => 'Fehler: Bankkonto-ID stimmt nicht mit BLZ überein',
+  'Error: local bank account is not marked for bank import, check settings under System -> Bank Accounts' => 'Fehler: Lokales Bankkonto ist nicht für den Bankimport markiert, überprüfen Sie die Einstellungen unter System -> Bankkonten',
   'Error: need amount and netamount' => 'Fehler: amount und netamount werden benötigt',
+  'Error: neither apchart passed, no default payable chart configured' => 'Fehler: Verbindlichkeitskonto (apchart) fehlt, kein Standardforderungskonto definiert',
   'Error: neither archart passed, no default receivables chart configured' => 'Fehler: Forderungskonto (archart) fehlt, kein Standardforderungskonto definiert',
   'Error: taxincluded has to be t or f' => 'Fehler: Steuer im Preis inbegriffen muß t oder f sein',
   'Error: taxincluded wasn\'t set' => 'Fehler: Steuer im Preis inbegriffen nicht gesetzt (taxincluded)',
@@ -1477,6 +1676,8 @@ $self->{texts} = {
   'Errors during conversion:'   => 'Umwandlungsfehler:',
   'Errors during printing:'     => 'Druckfehler:',
   'Errors in GL transaction:'   => 'Fehler in Dialogbuchung:',
+  'Errors while deleting record:' => 'Fehler beim Speichern des Belegs:',
+  'Errors while processing: '   => 'Fehler bei Verarbeitung: ',
   'Errors: #1'                  => 'Fehler: #1',
   'Ertrag'                      => 'Ertrag',
   'Ertrag prozentual'           => 'Ertrag prozentual',
@@ -1493,9 +1694,12 @@ $self->{texts} = {
   'Exchangerate for payment missing!' => 'Es fehlt der Wechselkurs für die Bezahlung!',
   'Exchangerate missing!'       => 'Es fehlt der Wechselkurs!',
   'Execute'                     => 'Ausführen',
-  'Execute a custom data export query' => 'Benutzerdefinierte Datenexport-Abfrage ausführen',
-  'Execute custom data export \'#1\'' => 'Benutzerdefinierter Datenexport »#1« ausführen',
+  'Execute a custom report query' => 'Benutzerdefinierte Berichts-Abfrage ausführen',
+  'Execute custom report \'#1\'' => 'Benutzerdefinierten Bericht »#1« ausführen',
   'Executed'                    => 'Ausgeführt',
+  'Execution Date = Invoice Duedate' => 'Ausführungsdatum = Fälligkeitsdatum',
+  'Execution Date = Skonto Date' => 'Ausführungsdatum = Skonto-Datum',
+  'Execution Date Buffer'       => 'Ausführungsdatum Puffer',
   'Execution date'              => 'Ausführungsdatum',
   'Execution date from'         => 'Ausführungsdatum von',
   'Execution date to'           => 'Ausführungsdatum bis',
@@ -1520,7 +1724,10 @@ $self->{texts} = {
   'Expense/Asset'               => 'Aufwand/Anlagen',
   'Experimental Features'       => 'Experimentelle Features',
   'Export'                      => 'Export',
+  'Export Documents'            => 'Dokumente exportieren',
   'Export Number'               => 'Exportnummer',
+  'Export all accounts to CSV (ZIP file)' => 'Alle Konten als CSV exportieren (ZIP-Datei)',
+  'Export all accounts to PDF (ZIP file)' => 'Alle Konten als PDF exportieren (ZIP-Datei)',
   'Export as CSV'               => 'Als CSV exportieren',
   'Export as PDF'               => 'Als PDF exportieren',
   'Export date'                 => 'Exportdatum',
@@ -1528,6 +1735,7 @@ $self->{texts} = {
   'Export date to'              => 'Exportdatum bis',
   'Export error in transaction #1: Rounding error too large #2' => 'Exportfehler in Transaktion #1: Zu großer Rundungsfehler (#2)',
   'Export error in transaction #1: Unbalanced ledger before next transaction (#2)' => 'Exportfehler in Transaktion #1: Unausgeglichene Buchung',
+  'Export format'               => 'Export Format',
   'Export imported bookings'    => 'Importierte Buchungen exportieren',
   'Export with CV Charts'       => 'Mit Personenkonten exportieren',
   'Extend automatically by n months' => 'Automatische Verlängerung um x Monate',
@@ -1573,12 +1781,14 @@ $self->{texts} = {
   'Final Invoice'               => 'Schlussrechnung',
   'Final Invoice (one letter abbreviation)' => 'F',
   'Final Invoice, please use mark as paid manually' => 'Rechnungstyp Schlussrechnung, bitte den Beleg manuell als bezahlt markieren',
+  'Final Invoices'              => 'Schlussrechnung',
   'Financial Controlling'       => 'Finanzcontrolling',
   'Financial Controlling Report' => 'Finanzcontrollingbericht',
   'Financial Overview'          => 'Finanzübersicht',
   'Financial controlling report for open sales orders' => 'Finanzcontrollingbericht für offene Verkaufsaufträge',
   'Financial overview for #1'   => 'Finanzübersicht für #1',
   'Finish'                      => 'Abschließen',
+  'Finished'                    => 'Erledigt',
   'First 20 Lines'              => 'Nur erste 20 Datensätze',
   'Firstname'                   => 'Vorname',
   'Fix transaction'             => 'Buchung korrigieren',
@@ -1586,6 +1796,7 @@ $self->{texts} = {
   'Fixed value'                 => 'Fester Wert',
   'Focus position after update' => 'Eingabe-Fokus-Position nach Erneuern',
   'Folgekonto'                  => 'Folgekonto',
+  'Follow ups reminder sent.'   => 'Erinnerung an Wiedervorlagen versendet.',
   'Follow-Up'                   => 'Wiedervorlage',
   'Follow-Up Date'              => 'Wiedervorlagedatum',
   'Follow-Up On'                => 'Wiedervorlage am',
@@ -1595,13 +1806,19 @@ $self->{texts} = {
   'Follow-Up saved.'            => 'Wiedervorlage gespeichert.',
   'Follow-Ups'                  => 'Wiedervorlagen',
   'Follow-up for'               => 'Wiedervorlage für',
+  'Follow-up options'           => 'Wiedervorlageoptionen',
   'Following files are deleted:' => 'Folgende Dateien wurden gelöscht:',
   'Following files are unimported:' => 'Folgende Dateien sind zur Quelle exportiert:',
   'Following year'              => 'Folgendes Jahr',
   'Font'                        => 'Schriftart',
   'Font size'                   => 'Schriftgröße',
+  'For #1, #2 #3 are missing in bin #4' => 'Für #1 fehlen #2 #3 auf Lagerplatz #4',
+  'For #1, #2 #3 are missing of batch with chargenumber #4 and bestbefore date of #5 in bin #6' => 'Für #1 fehlen #2 #3 von Charge #4 mit Mindesthaltbarkeitsdatum #5 auf Lagerplatz #6',
+  'For #1, #2 #3 are missing of batch with chargenumber #4 in bin #5' => 'Für #1 fehlen #2 #3 von Charge #4 auf Lagerplatz #5',
+  'For #1, #2 #3 are missing with a bestbefore date of #4 in bin #5' => 'Für #1 fehlen #2 #3 mit Mindesthaltbarkeitsdatum #4 auf Lagerplatz #5',
   'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' => 'Bei Kreditorenbuchungen werden die Umsatzsteuer-Steuerschlüssel durch Vorsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.',
   'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' => 'Bei Debitorenbuchungen werden die Vorsteuer-Steuerschlüssel durch Umsatzsteuer-Steuerschlüssel mit demselben Steuersatz ersetzt.',
+  'For Record Type'             => 'Für Belegtyp',
   'For changeing goto USTVA Config' => 'Zum Verändern bitte zu den UStVa Einstellungen gehen',
   'For further information read this: ' => 'Für weitere Informationen zu diesem Thema lesen Sie bitte: ',
   'For part "#1" there are missing #2 #3 in the default warehouse/bin "#4/#5".' => 'Es fehlen #2 #3 des Artikels "#1" im Standardlager "#4/#5".',
@@ -1610,11 +1827,16 @@ $self->{texts} = {
   'For purchase delivery orders, warn on workflow to invoice if not stocked in' => 'Warnung in Einkaufslieferscheinen beim Workflow zur Rechnung ausgeben, wenn nicht eingelagert',
   'For sales delivery orders, warn on workflow to invoice if not stocked out' => 'Warnung in Verkaufslieferscheinen beim Workflow zur Rechnung ausgeben, wenn nicht ausgelagert',
   'For sales invoices, warn if invoice has no delivery order as a predecessor' => 'Bei Verkaufsrechnungen warnen, dass die Rechnung nicht aus einem Lieferschein generiert wurde.',
-  'For type "customer" the perl module JSON is required. Please check this on system level: $ ./scripts/installation_check.pl' => 'Für den Typ "Kunde" wird das Perl Module JSON benötigt. Überprüfbar im Installationspfad mit: $ ./scripts/installation_check.pl',
+  'For this invoice the bank tranfer via SEPA was blocked manually.' => 'Für diese Rechnung wurde die Überweisung via SEPA manuell gesperrt.',
+  'For type "customer" the perl module JSON is required. Please check this on system level: $ ./scripts/installation_check.pl' => 'Für den Typ "Kunde" wird das Perl Module JSON benötigt. Überprüfbar im Installationspfad mit:<br />
+$ ./scripts/installation_check.pl',
+  'Force a layout style'        => 'Einen Layout-Stil erzwingen',
+  'Forced Layout Style'         => 'Erzwungener Layout-Stil',
   'Foreign Exchange Gain'       => 'Wechselkurserträge',
   'Foreign Exchange Loss'       => 'Wechselkursaufwendungen',
   'Form details (second row)'   => 'Formulardetails (zweite Positionszeile)',
   'Format \'#1\' is not supported yet/anymore.' => 'Das Format \'#1\' wird noch nicht oder nicht mehr unterstützt.',
+  'Formats & Language'          => 'Formate & Sprachen',
   'Formula'                     => 'Formel',
   'France'                      => 'Frankreich',
   'Free report period'          => 'Freier Zeitraum',
@@ -1644,6 +1866,7 @@ $self->{texts} = {
   'Further Invoice for Advance Payment' => 'Weitere Anzahlungsrechnung',
   'GL Transaction'              => 'Dialogbuchung',
   'GL Transaction (abbreviation)' => 'DB',
+  'GL Transaction Template'     => 'Dialogbuchungsvorlage',
   'GL Transactions'             => 'Dialogbuchungen',
   'GL search'                   => 'FiBu Suche',
   'GL template suggestions'     => 'Vorschlag Dialogbuchung',
@@ -1662,6 +1885,8 @@ $self->{texts} = {
   'General settings'            => 'Allgemeine Einstellungen',
   'Generate and print sales delivery orders' => 'Erzeuge und drucke Lieferscheine',
   'Generating the document failed: #1' => 'Das Dokument konnte nicht erzeugt werden: #1',
+  'Generic Presenter Test'      => 'Generisch-Presenter-Test',
+  'Generic email send address for this record type.' => 'Generischer E-Mail-Absenderadresse für diesen Belegtyp.',
   'Germany'                     => 'Deutschland',
   'Get one order'               => 'Hole eine Bestellung',
   'Get one order by shopordernumber' => 'Hole eine Bestellung über Shopbestellnummer',
@@ -1680,13 +1905,18 @@ $self->{texts} = {
   'Group assignment'            => 'Gruppenzuordnung',
   'Group list'                  => 'Gruppenliste',
   'Group membership'            => 'Gruppenzugehörigkeit',
+  'Groups'                      => 'Gruppen',
   'Groups that are valid for this client for access rights' => 'Gruppen, die für diesen Mandanten gültig sind',
   'Groups this user is a member in' => 'Gruppen, in denen Benutzer Mitglied ist',
   'Groups valid for this client' => 'Für Mandanten gültige Gruppen',
   'HTML'                        => 'HTML',
   'HTML Templates'              => 'HTML-Vorlagen',
   'HTML field'                  => 'HTML-Feld',
+  'Handling'                    => 'Bearbeitung',
+  'Handling & Dates'            => 'Bearbeitung & Daten',
+  'Handling & Scope'            => 'Bearbeitung & Bereich',
   'Handling of WebDAV'          => 'Behandlung von WebDAV',
+  'Handling, Numbers & Dates'   => 'Bearbeitung, Nummern & Daten',
   'Hardcopy'                    => 'Seite drucken',
   'Has item type'               => 'Hat Regeltypen',
   'Has serial number'           => 'Hat eine Serienummer',
@@ -1697,7 +1927,9 @@ $self->{texts} = {
   'Here'                        => 'Hier',
   'Here you only provide the credentials for logging into the database.' => 'Hier geben Sie nur die Logindaten für die Anmeldung an der Datenbank ein.',
   'Here\'s an example command line:' => 'Hier ist eine Kommandozeile, die als Beispiel dient:',
+  'Hide Attachment'             => 'Anhang verbergen',
   'Hide Filter'                 => 'Filter verbergen',
+  'Hide Records'                => 'Belege verbergen',
   'Hide all details'            => 'Alle Details verbergen',
   'Hide buttons'                => 'Knöpfe verstecken',
   'Hide by default'             => 'Standardmäßig verstecken',
@@ -1709,11 +1941,13 @@ $self->{texts} = {
   'Hide mappings (csv_import)'  => 'Spaltenzuordnungen verbergen',
   'Hide settings'               => 'Einstellungen verbergen',
   'Highest Dunninglevel'        => 'Höchste Mahnstufe',
+  'Hint: DMS Feature has to be activated' => 'Hinweis: DMS Feature muss aktiviert sein',
   'Hint: Not all VC Numbers are personal accounts compliant' => 'Hinweis: Nicht alle Kunden-/Lieferantennummern sind DATEV-Personenkonten kompatibel.',
   'Hints'                       => 'Hinweise',
   'History'                     => 'Historie',
   'History Search'              => 'Historien Suche',
   'History Search Engine'       => 'Historien Suchmaschine',
+  'Home'                        => 'Startseite',
   'Homepage'                    => 'Homepage',
   'Host'                        => 'Datenbankcomputer',
   'Hourly Rate'                 => 'Stundensatz',
@@ -1726,6 +1960,7 @@ $self->{texts} = {
   'ID number'                   => 'ID-Nummer',
   'ID of own bank account'      => 'Datenbank-ID des Bankkontos',
   'ID/Acc_ID'                   => 'ID/Acc_ID',
+  'IDs & Dates'                 => 'IDs & Daten',
   'II'                          => 'II',
   'III'                         => 'III',
   'IMPORT'                      => 'Importiert',
@@ -1744,18 +1979,23 @@ $self->{texts} = {
   'If disabled sales quotations cannot be converted into sales invoices directly.' => 'Falls deaktiviert, so können Verkaufsangebote nicht direkt in Verkaufsrechnungen umgewandelt werden.',
   'If disabled, record numbers for sales records & purchase records produced by our side will always be auto-generated and cannot be changed later.' => 'Falls deaktiviert, werden Belegnummern in Verkaufs- und Einkaufsbelegen, die auf unserer Seite erzeugt wurden, immer automatisch vergeben und können anschließend nicht mehr geändert werden.',
   'If enabled Factur-X/ZUGFeRD conformant sales invoice PDFs will be created.' => 'Falls aktiviert, werden Factur-X-/ZUGFeRD-konforme PDFs für Verkaufsrechnungen erzeugt.',
+  'If enabled RFQs, Quotations and Orders can only be send once via email. By creating another subversion the current record gets a minor subversion and can be send again via email.' => 'Falls aktiviert werden Anfragen, Angebote und Aufträge nach dem E-Mail-Versand zum weiteren Bearbeiten gesperrt. Die Sperre kann über die Funktion "Unterversion erzeugen" aufgehoben werden und die Belegnummer bekommt einen Postfix mit der laufenden Unterversionsnummer.',
   'If enabled a column will be shown in sales and purchase orders that lists both the amount and the value not shipped yet for each item.' => 'Falls eingeschaltet, wird für jede Position in Auftragsbestätigungen und Lieferantenaufträgen eine Spalte mit noch nicht gelieferter Menge und Wert angezeigt.',
   'If enabled a warning will be shown if a sales invoices is created without having a sales delivery order as a predecessor.' => 'Falls aktiv, wird eine Warnung beim Buchen einer Verkaufsrechnung angezeigt, falls es keinen Lieferschein als Vorgänger gibt.',
   'If enabled a warning will be shown in purchase delivery orders on workflow to invoices if positions are not stocked in.' => 'Falls aktiviert, wird eine Warnung beim Workflow von Einkaufslieferscheinen zu Rechnungen ausgegeben, wenn die Positionen noch nicht eingelagert sind.',
   'If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).' => 'Falls eingeschaltet, wird eine Warnung angezeigt, wenn der Auftrag mehrere gleiche Artikel enthält (nur neuer Controller).',
   'If enabled a warning will be shown in sales and purchase orders if there the delivery date is empty.' => 'Falls aktiviert, Warnungen ausgeben sobald Aufträge (Einkauf- und Verkauf) keinen Liefertermin haben.',
+  'If enabled a warning will be shown in sales and purchase reclamations if there are two or more positions of the same part.' => 'Falls aktiviert, wird eine Warnung beim Speichern von (Einkaufs- und Verkaugs-) Reklamationen ausgegeben, wenn die Reklamation mehrere gleiche Artikel enthält.',
+  'If enabled a warning will be shown in sales and purchase reclamations if there the due date is empty.' => 'Falls aktiviert, wird eine Warnung beim Speichern von (Einkaufs- und Verkaugs-) Reklamationen ausgegeben, wenn das Fälligkeitsdatum fehlt.',
   'If enabled a warning will be shown in sales delivery orders if the customer order number is missing.' => 'Falls aktiviert, wird eine Warnung beim Speichern von Verkaufsaufträgen ausgegeben, wenn die Kundenbestellnummer fehlt.',
   'If enabled a warning will be shown in sales delivery orders on workflow to invoices if positions are not stocked out.' => 'Falls aktiviert, wird eine Warnung beim Workflow von Verkaufslieferscheinen zu Rechnungen ausgegeben, wenn die Positionen noch nicht ausgelagert sind.',
   'If enabled only those projects that are assigned to the currently selected customer are offered for selection in sales records.' => 'Wenn eingeschaltet, so werden in Verkaufsbelegen nur diejenigen Projekte zur Auswahl angeboten, die dem aktuell ausgewählten Kunden zugewiesen wurden.',
   'If enabled purchase and sales records cannot be saved if no transaction description has been entered.' => 'Wenn angeschaltet, so können Einkaufs- und Verkaufsbelege nicht gespeichert werden, solange keine Vorgangsbezeichnung eingegeben wurde.',
   'If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.' => 'Falls aktiviert, enthalten Rechnungen im OpenDocument/OASIS Format, Daten zur Schweizer QR-Rechnung.',
+  'If enabled the file ending for SEPA exports will be .xml instead of .cct or .cdd' => 'Falls aktiviert, wird die Dateiendung beim SEPA-XML Export immer auf .xml gesetzt anstatt .cct oder .cdd',
+  'If enabled the invoice number will be copied to the unstructured message upon booking. If there\'s a message already the invoice number will be appended to it.' => 'Falls aktiviert, wird die Rechnungsnummer beim Buchen automatisch in die unstrukturierte Mitteilung kopiert. Falls diese bereits eine Mitteilung enthält, wird die Rechnungsnummer an diese angehängt.',
   'If enabled the record links view starts always from the sales order including all sublevels' => 'Falls aktiv, werden die verknüpften Belege immer vom Verkaufsauftrag inkl. aller darunterliegenden Belege angezeigt',
-  'If enabled try to overrule the brower\'s back button to prevent double booking of sales invoices.' => 'Falls aktiviert, wird versucht, den Zurück-Knopf des Browsers auszuhebel, um doppeltes Buchen von Verkaufsrechnungen zu verhindern.',
+  'If enabled the tab Proposals will not be the default view for bank transaction bookings' => 'Falls aktiviert springt die Ansicht beim Kontoauszug verbuchen nicht direkt auf den Reiter Vorschläge, sondern zeigt immer Alle Buchungen an.',
   'If enabled, when saving parts the partsgroup must be not be empty.' => 'Falls aktiviert muß beim Speichern von Artikeln eine Warengruppe ausgewählt sein.',
   'If item not found, allow creation of new item' => 'Falls Artikel nicht gefunden, erlaube Erfassen eines Neuen',
   'If left empty the default sender from the kivitendo configuration will be used (key \'email_from\' in section \'periodic_invoices\'; current value: #1).' => 'Falls leer, so wird der Standardabsender aus der kivitendo-Konfiguration genutzt (Schlüssel »email_from« in Abschnitt »periodic_invoices«; aktueller Wert: #1).',
@@ -1764,12 +2004,15 @@ $self->{texts} = {
   'If searching a part from a document and no part is found then offer to create a new part.' => 'Wenn bei der Artikelsuche aus einem Dokument heraus kein Artikel gefunden wird, dann wird ermöglicht, von dort aus einen neuen Artikel anzulegen.',
   'If set to no the \'delivery date\' field for sales orders won\'t be set at all.' => 'Falls der Wert auf Nein gesetzt wird, wird überhaupt kein Lieferdatum in Verkaufsaufträgen gesetzt',
   'If set to no the \'valid until\' field for sales quotation won\'t be set at all.' => 'Falls der Wert auf Nein gesetzt wird, wird überhaupt kein Gültigkeitsdatum bei Verkaufs-Angeboten gesetzt',
+  'If set to yes a percentage deviation will be allowed for otherwise strict skonto bookings. The deviation will booked to the skonto chart and the allowed deviation is also configurable.' => 'Falls aktiviert, wird der Zahlungsbedinung Skonto nach ZB auch erlaubt, wenn es eine Abweichung innerhalb des prozentualen Abweichungsrahmen gibt. Bei 0,5% erlaubter Abweichung wären das bspw. 50 Cent brutto bei einer 100,- € brutto Rechnung.',
+  'If set to yes and an end-to-end id can be extracted from the transaction this will be used to detect duplicates instead of the transaction purpose.' => 'Falls aktiviert, wird die END-TO-END-ID zur Duplikatserkennung der Banktransaktion verwendet, insofern diese vorhanden ist. Anderfalls wird eine Erkennung über den Verwendungszweck ausgeführt.',
   'If the article type is set to \'mixed\' then a column called \'part_type\' or called \'pclass\' must be present.' => 'Falls der Artikeltyp auf \'mixed\' gesetzt ist muss entweder eine Spalte \'part_type\' oder \'pclass\' im Import vorhanden sein',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => 'Wenn das automatische Erstellen einer Rechnung über Mahngebühren und Zinsen für ein Mahnlevel aktiviert ist, so werden die folgenden Konten für die Rechnung benutzt.',
   'If the counted quantity differs more than this threshold from the quantity in the database, a warning will be shown. Set to 0 to switch of this feature.' => 'Wenn die gezählte Menge mehr als diesen Schwellenwert von der Menge in der Datenbank abweicht, wird eine Warnmeldung angezeigt. Setzen Sie den Schwellenwert auf 0, um dieses Feature abzuschalten.',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => 'Falls der oben genannte Datenbankbenutzer nicht die Berechtigung zum Anlegen neuer Datenbanken hat, so können Sie hier den Namen und das Passwort des Datenbankadministratoraccounts angeben:',
   'If the default transfer out always succeed use this bin for negative stock quantity.' => 'Standardlagerplatz für Auslagern ohne Prüfung auf Bestand',
   'If the test mode is enabled, the Factur-X/ZUGFeRD invoices will be flagged so that they\'re only fit to be used for testing purposes.' => 'Wenn der Testmodus aktiviert ist, werden Factur-X-/ZUGFeRD-Rechnungen so markiert, dass sie nur für Testzwecke dienen dürfen.',
+  'If this option is disabled, the bank import is not possible for this account anymore. In the case of invoices and accounts payable and receivable entries, incoming and outgoing payments can then be posted directly to the account manually.' => 'Wenn diese Option deaktiviert ist, ist der Bankimport für dieses Konto gesperrt. Bei Rechnungen sowie Kreditoren- und Debitorenbuchungen können dann direkt Zahlungsein- bzw. ausgänge manuell auf das Konto verbucht werden.',
   'If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.' => 'Wenn diese Option aktiviert ist, gelten Lieferscheinpositionen nur dann als geliefert wenn sie im Lieferschein ausgelagert wurden, und die Ware aus dem Lager ausgebucht wurde. Andernfalls gilt das Speichern des Lieferscheins als Lieferung.',
   'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => 'Wenn Sie für die Artikelnummer und / oder die Beschreibung etwas eingeben, so werden nur die Lagerplätze angezeigt, in denen Waren eingelagert sind, die Ihre Suchbegriffe enthalten.',
   'If you have not chosen for example the category revenue for a tax and you choose an revenue account to create a transfer in the general ledger, this tax will not be displayed in the tax dropdown.' => 'Wenn Sie z.B. die Kategory Erlös für eine Steuer nicht gewählt haben und ein Erlöskonto beim Erstellen einer Dialogbuchung wählen, wird diese Steuer auch nicht im Dropdown-Menü für die Steuern angezeigt.',
@@ -1780,11 +2023,13 @@ $self->{texts} = {
   'If you want to delete such a dataset you have to edit the client(s) that are using the dataset in question and have them use another dataset.' => 'Wenn Sie eine solche Datenbank löschen möchten, dann müssen Sie zuerst den/die Mandanten auf eine andere Datenbank umstellen, die die zu löschende Datenbank benutzen.',
   'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => 'Wenn Sie die Authentifizierungs-Datenbank selber einrichten wollen, so melden Sie sich im Administrationsbereich an. kivitendo wird dann die Datenbank und die erforderlichen Tabellen für Sie anlegen.',
   'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' => 'Falls die alte Lagerplatz-Beschreibung in Stammdaten genau mit einem Lagerplatz in einem vorhandenem Lager übereinstimmt, KLICK auf <b>LAGERPLÄTZE AUTOMATISCH ZUWEISEN</b>',
+  'Ignore Proposals for Bank Transactions' => 'Vorschläge für Bankverbuchungen nicht direkt anzeigen',
   'Ignore faulty positions'     => 'Fehlerhafte Artikel-Positionen ignorieren',
   'Ignore services for the purchase orders state of delivery' => 'Dienstleistungen werden bei der Statusänderung geliefert für Einkaufsaufträge ignoriert',
   'Ignore services for the sales orders state of delivery' => ' Dienstleistungen werden bei der Statusänderung geliefert für Verkaufsaufträge ignoriert',
   'Illegal characters have been removed from the following fields: #1' => 'Ungültige Zeichen wurden aus den folgenden Feldern entfernt: #1',
   'Illegal date'                => 'Ungültiges Datum',
+  'Illustrations'               => 'Illustrationen',
   'Image'                       => 'Grafik',
   'Image Upload'                => 'Bilder Upload',
   'ImagePreview'                => 'Bildvorschau',
@@ -1796,7 +2041,9 @@ $self->{texts} = {
   'Import Pay Postings'         => 'Lohnbuchungen importieren',
   'Import Status'               => 'Import Status',
   'Import a Factur-X/ZUGFeRD file:' => 'Eine Factur-X-/ZUGFeRD-Datei importieren',
+  'Import a File'               => 'Datei importieren',
   'Import a File:'              => 'Datei importieren:',
+  'Import a MT940 file:'        => 'Laden Sie eine MT940 Datei hoch:',
   'Import all'                  => 'Importiere Alle',
   'Import documents from #1'    => 'Importiere Dateien von Quelle \'#1\'',
   'Import file'                 => 'Import-Datei',
@@ -1812,20 +2059,27 @@ $self->{texts} = {
   'Imported Pay Postings'       => 'Importierte Lohnbuchungen',
   'Imported entries'            => 'Importierte Einträge',
   'In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.' => 'Der folgende Puffer in Tagen wird von den beiden obigen vorausberechneten Daten abgezogen.',
+  'In case the amount due is positive, either due date or payment term must be set.' => 'Wenn der fällige Betrag positiv ist, muss entweder ein Fälligkeitsdatum oder eine Zahlungsbedinung gesetzt sein.',
   'In order to do that hit the button "Delete transaction".' => 'Drücken Sie dafür auf den Button "Buchung löschen".',
   'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => 'Um die alte Ordnerstruktur in die neue Struktur zu migrieren, müssen Sie festlegen, welchem Mandanten die bisherige Struktur zugewiesen wird.',
   'In order to use kivitendo you have to create at least a client, a user and a group.' => 'Um kivitendo zu nutzen, müssen Sie mindestens einen Mandanten, einen Benutzer und eine Gruppe anlegen.',
+  'In the following new warehouse ' => 'Im folgenden neuen Lager',
   'In the latter case the tables needed by kivitendo will be created in that database.' => 'In letzterem Fall werden die von kivitendo benötigten Tabellen in dieser existierenden Datenbank angelegt.',
   'In-line'                     => 'im Text',
   'Inactive'                    => 'Inaktiv',
   'Include Exchangerate Difference' => 'Wechselkursunterschied einbeziehen',
+  'Include a link to the record itself' => 'Verknüpfung zum Beleg selber anzeigen',
   'Include column headings'     => 'Spaltenüberschriften erzeugen',
   'Include empty bins'          => 'Leere Lagerplätze anzeigen',
   'Include in Report'           => 'In Bericht aufnehmen',
   'Include in drop-down menus'  => 'In Aufklappmenü aufnehmen',
   'Include invalid warehouses ' => 'Ungültige Lager berücksichtigen',
   'Include invoices with direct debit' => 'Inklusive Rechnungen mit Lastschrifteinzug',
-  'Include original Invoices?'  => 'Original-Rechnung hinzufügen?',
+  'Include links to sales quotations' => 'Verknüpfungen zu Verkaufsangeboten anzeigen',
+  'Include original Invoices?'  => 'Ursprungs-Rechnungen hinzufügen?',
+  'Include sales quotations in the list of linked records, if the view for record links from sales order is enabled.' => 'Verkaufsangebote mit in die Liste der Verknüpfungen aufnehmen, wenn "Verknüpfte Belege immer vom Verkaufsauftrag ansehen" aktiv ist.',
+  'Include the record itself in the list of linked records, if the view for record links from sales order is enabled.' => 'Verknüpfung zum Beleg selber mit in die Liste der Verknüpfungen aufnehmen, wenn "Verknüpfte Belege immer vom Verkaufsauftrag ansehen" aktiv ist.',
+  'Include the transaction description in the preset email subject.' => 'Beim Verschicken von E-Mails wird die Vorgangsbezeichnung in den vorbelegten Betreff aufgenommen.',
   'Includeable in reports'      => 'In Berichten anzeigbar',
   'Included in reports by default' => 'In Berichten standardmäßig enthalten',
   'Including'                   => 'Enthaltene',
@@ -1838,10 +2092,11 @@ $self->{texts} = {
   'Increase'                    => 'Erhöhen',
   'Individual Items'            => 'Einzelteile',
   'Info'                        => 'Info',
+  'Info & Status'               => 'Info & Status',
   'Information'                 => 'Information',
   'Initial version.'            => 'Initiale Version.',
   'Input from string: #1'       => 'Eingabe Von-Zeichenkette: #1',
-  'Input to string: #1'         => 'Eingabe Bis-Zeichenkete: #1',
+  'Input to string: #1'         => 'Eingabe Bis-Zeichenkette: #1',
   'Insert'                      => 'Einfügen',
   'Insert Date'                 => 'Erfassungsdatum',
   'Insert new'                  => 'Hinzufügen',
@@ -1860,6 +2115,7 @@ $self->{texts} = {
   'Introduction of clients'     => 'Einführung von Mandanten',
   'Inv. Duedate'                => 'Rg. Fälligkeit',
   'Invalid'                     => 'Ungültig',
+  'Invalid YAML Configuration for this job. Reason: malformed YAML Data: #1. Please consult: Program -> Documentation -> HTML -> Configuration of Background-Jobs.' => 'Ungültige YAML-Konfiguration für diesen Job. Grund: #1. Bitte nutze die Dokumentation unter: Programm -> Dokumentation -> HTML -> Konfiguration der Hintergrund-Jobs -> ImportRecordEmails',
   'Invalid assembly'            => 'Ungültiges Erzeugnis',
   'Invalid bin'                 => 'Ungültiger Lagerplatz',
   'Invalid charge number: #1'   => 'Ungültige Chargennummer: #1',
@@ -1879,10 +2135,13 @@ $self->{texts} = {
   'Inventory quantity must be zero before you can set this assembly obsolete!' => 'Bevor dieses Erzeugnis als ungültig markiert werden kann, muß das Inventar auf Null sein!',
   'Inventory quantity must be zero before you can set this part obsolete!' => 'Bevor diese Ware als ungültig markiert werden kann, muß das Inventar Null sein!',
   'Inventory system'            => 'Warenbuchungsmethode',
+  'Inventory: #1 transactions executed to clear all inventory slots. Parts: #2' => 'Lager: #1 Buchungen ausgeführt, um alle Lagerplätze zu leeren. Artikel: #2',
+  'Inventory: #1 transactions not yet executed to clear all inventory slots. Parts: #2' => 'Lager: #1 Buchungen noch nicht ausgeführt, um alle Lagerplätze zu leeren. Artikel: #2',
   'Invno.'                      => 'Rg. Nr.',
   'Invnumber'                   => 'Rechnungsnummer',
   'Invnumber missing!'          => 'Rechnungsnummer fehlt!',
   'Invoice'                     => 'Rechnung',
+  'Invoice (No Dunning Fees)'   => 'Rechnungen (Keine Mahngebühren)',
   'Invoice (one letter abbreviation)' => 'R',
   'Invoice Copy'                => 'Rechnungskopie',
   'Invoice Date'                => 'Rechnungsdatum',
@@ -1902,14 +2161,16 @@ $self->{texts} = {
   'Invoice for Advance Payment with Storno (abbreviation)' => 'A(S)',
   'Invoice for fees'            => 'Rechnung über Gebühren',
   'Invoice has already been storno\'d!' => 'Diese Rechnung wurde bereits storniert.',
+  'Invoice items'               => 'Rechnungspositionen',
   'Invoice number'              => 'Rechnungsnummer',
-  'Invoice number invalid. Must be less then or equal to 7 digits after prefix.' => 'Rechnungsnummer ungültig. (kleiner/gleich 7 Stellen nach Prefix)',
+  'Invoice number invalid. Must be less then or equal to 14 digits after non-digits removed.' => 'Rechnungsnummer ungültig. Muss kleiner/gleich 14 Stellen nach dem Entfernen von Nicht-Ziffern sein.',
   'Invoice to:'                 => 'Rechnung an:',
   'Invoice total'               => 'Die Rechnungssumme',
   'Invoice total less discount' => 'Rechnungssumme abzüglich Skonto',
   'Invoice with Storno (abbreviation)' => 'R(S)',
   'Invoices'                    => 'Rechnungen',
   'Invoices can only be changed on the day they are posted.' => 'Rechnungen können nur am Buchungstag geändert werden.',
+  'Invoices for Advance Payment' => 'Rechnung für Anzahlung',
   'Invoices with payments cannot be canceled.' => 'Rechnungen mit Zahlungen können nicht storniert werden.',
   'Invoices, Credit Notes & AR Transactions' => 'Rechnungen, Gutschriften & Debitorenbuchungen',
   'Is Searchable'               => 'Durchsuchbar',
@@ -1921,17 +2182,22 @@ $self->{texts} = {
   'It will not be further modified by any other source, and will be offered in records like this.' => 'Er wird nicht weiter verändert werden und genau so im Beleg vorgeschlagen werden.',
   'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' => 'Es wird einfach die Steuerschlüssel auf  0 setzen, was "keine Steuer" bedeutet und für solche Warenbestandsbuchungen der richtige Wert ist.',
   'Italy'                       => 'Italien',
+  'Item & Sums'                 => 'Artikel & Summen',
   'Item does not exists in the database' => 'Den Artikel gibt es nicht',
+  'Item input position for quotations and orders' => 'Position der Artikeleingabe in Aufträgen und Angeboten',
   'Item mode'                   => 'Artikelmodus',
   'Item multi selection with qty' => 'Artikel-Mehrfachauswahl mit Menge',
   'Item values'                 => 'Artikelwerte',
   'Item variables'              => 'Artikelvariablen',
+  'JS Tests'                    => 'JS-Tests',
+  'Jahresverkehrszahlen alt'    => 'Jahresverkehrszahlen alt',
   'Jahresverkehrszahlen neu'    => 'Jahresverkehrszahlen neu',
   'Jan'                         => 'Jan',
   'January'                     => 'Januar',
   'Job history'                 => 'Jobverlauf',
   'Journal'                     => 'Buchungsjournal',
   'Journal of Last 10 Transfers' => 'Letzte 10 Lagertransaktionen',
+  'Journal of Last 20 Transfers' => 'Letzte 20 Lagertransaktionen',
   'Jul'                         => 'Jul',
   'July'                        => 'Juli',
   'Jump to'                     => 'Springe zu',
@@ -1949,6 +2215,7 @@ $self->{texts} = {
   'Language'                    => 'Sprache',
   'Language (database ID)'      => 'Sprache (Datenbank-ID)',
   'Language (name)'             => 'Sprache (Name)',
+  'Language Code'               => 'Sprachcode',
   'Language settings'           => 'Spracheinstellungen',
   'Languages'                   => 'Sprachen',
   'Languages and translations'  => 'Sprachen und Übersetzungen',
@@ -1960,17 +2227,26 @@ $self->{texts} = {
   'Last Customer Number'        => 'Letzte Kundennummer',
   'Last Dunning'                => 'Letzte Mahnung',
   'Last Invoice Number'         => 'Letzte Rechnungsnummer',
+  'Last Numbers / Prefixes'     => 'Letzte Nummern / Präfixe',
   'Last Purchase Delivery Order Number' => 'Letzte Lieferscheinnummer (Einkauf)',
+  'Last Purchase Order Confirmation Number' => 'Letzte Lieferantenauftragsbestätigungs-Nummer',
   'Last Purchase Order Number'  => 'Letzte Lieferantenauftragsnummer',
+  'Last Purchase Quotation Intake Number' => 'Letzte Angebotsseingangsnummer',
+  'Last Purchase Reclamation Number' => 'Letzte Einkaufsreklamationsnummer',
   'Last RFQ Number'             => 'Letzte Anfragenummer',
+  'Last RMA Delivery Order Number' => 'Letzte Retouren-Lieferscheinnummer',
   'Last Sales Delivery Order Number' => 'Letzte Lieferscheinnummer (Verkauf)',
+  'Last Sales Order Intake Number' => 'Letzte Auftragseingangsnummer',
   'Last Sales Order Number'     => 'Letzte Auftragsnummer',
   'Last Sales Quotation Number' => 'Letzte Angebotsnummer',
+  'Last Sales Reclamation Number' => 'Letzte Verkaufsreklamationsnummer',
   'Last Service Number'         => 'Letzte Dienstleistungsnr.',
+  'Last Supplier Delivery Order Number' => 'Letzte Beistell-Lieferscheinnummer',
   'Last Transaction'            => 'Letzte Buchung',
   'Last Vendor Number'          => 'Letzte Lieferantennummer',
   'Last command output'         => 'Ausgabe des letzten Befehls',
   'Last modification'           => 'Letzte Änderung',
+  'Last modification Time'      => 'Letzter Änderungszeitpunkt',
   'Last opening balance or all transactions' => 'Letzte Eröffnungsbuchung oder alle Buchungen',
   'Last opening balance or start of year' => 'Letzte Eröffnungsbuchung oder Jahresanfang',
   'Last ordernumber'            => 'letzte Bestellnummer',
@@ -1991,6 +2267,7 @@ $self->{texts} = {
   'Letter saved!'               => 'Brief gespeichert!',
   'Letternumber'                => 'Briefnummer',
   'Letters'                     => 'Briefe',
+  'Letzte Buchung'              => 'Letzte Buchung',
   'Liability'                   => 'Passiva/Mittelherkunft',
   'Limit part selection'        => 'Artikelauswahl eingrenzen',
   'Line Total'                  => 'Zeilensumme',
@@ -1999,9 +2276,15 @@ $self->{texts} = {
   'Link to'                     => 'Verknüpfen mit',
   'Link to invoice'             => 'Beleglink',
   'Link to the following project:' => 'Mit dem folgenden Projekt verknüpfen:',
+  'Linked'                      => 'Verknüpft',
   'Linked Records'              => 'Verknüpfte Belege',
+  'Linked email and attachment to ' => 'E-Mail und Anhang verknüpft mit ',
   'Linked invoices'             => 'Verknüpfte Rechnungen',
+  'Linked to'                   => 'Verknüpft mit',
+  'Linked to...'                => 'Verlinkt zu...',
+  'Linking to Record'           => 'Zum Beleg hinzufügen',
   'Liquidity projection'        => 'Liquiditätsübersicht',
+  'List'                        => 'Liste',
   'List Accounts'               => 'Konten anzeigen',
   'List Price'                  => 'Listenpreis',
   'List Printers'               => 'Drucker anzeigen',
@@ -2017,6 +2300,7 @@ $self->{texts} = {
   'List of jobs'                => 'Jobliste',
   'List of tax zones'           => 'Liste der Steuerzonen',
   'List open SEPA exports'      => 'Noch nicht ausgeführte SEPA-Exporte anzeigen',
+  'List short onhand'           => 'Meldebestand zeigen',
   'List time recordings of all staff members' => 'Zeiterfassungseinträge aller Mitarbeiter anzeigen',
   'Listprice'                   => 'Listenpreis',
   'Load'                        => 'Laden',
@@ -2031,6 +2315,7 @@ $self->{texts} = {
   'Local bank account'          => 'Lokales Bankkonto',
   'Local bank code'             => 'Lokale Bankleitzahl',
   'Lock'                        => 'Festschreibung',
+  'Lock RFQ/Quotation and Order Subversion' => 'Vorherige Unterversionen von Anfragen, Angeboten und Aufträgen sperren',
   'Lock System'                 => 'System sperren',
   'Lock and unlock installation' => 'Installation sperren/entsperren',
   'Lock bookings'               => 'Buchungen festschreiben',
@@ -2039,6 +2324,10 @@ $self->{texts} = {
   'Lockfile removed!'           => 'System entsperrt!',
   'Login'                       => 'Anmelden',
   'Login Name'                  => 'Benutzer',
+  'Login details'               => 'Zugangsdaten',
+  'Login for WebDAV sync external' => 'Login für externes WebDAV-Repository',
+  'Login for sync'              => 'Login für die Synchronisation',
+  'Login name was previously used' => 'Benutzername wurde schon mal verwendet',
   'Login of User'               => 'Login',
   'Logout'                      => 'Abmelden',
   'Logout now'                  => 'kivitendo jetzt verlassen',
@@ -2048,6 +2337,7 @@ $self->{texts} = {
   'Long Description (quotations & orders)' => 'Langtext (Angebote & Aufträge)',
   'Long Description for invoices' => 'Langtext für Rechnungen',
   'Long Description for quotations & orders' => 'Langtext für Angebote & Aufträge',
+  'Longdescription dialog size percentage from main window' => 'Prozentuale Größe des Langtext-Dialogs im Verhältnis zum Hauptfenster',
   'Longdescription dialog size percentage from main window (0 means fix values)' => 'Prozentuale Größe des Langtext-Dialogs im Verhältnis zum Hauptfenster (0 bedeutet feste Größe)',
   'Loss'                        => 'Verlust',
   'Loss carried forward account' => 'Verlustvortragskonto',
@@ -2059,6 +2349,7 @@ $self->{texts} = {
   'MT940 import'                => 'MT940 Import',
   'MT940 import preview'        => 'MT940-Import-Vorschau',
   'MT940 import result'         => 'MT940-Import-Ergebnis',
+  'Mailer error #1'             => 'Emailfehler: #1',
   'Mails'                       => 'E-Mails',
   'Main Contact Person'         => 'Hauptansprechperson',
   'Main Preferences'            => 'Grundeinstellungen',
@@ -2071,6 +2362,7 @@ $self->{texts} = {
   'Manage Custom Variables'     => 'Benutzerdefinierte Variablen',
   'Mandantennummer'             => 'Mandantennummer',
   'Mandate Date of Signature'   => 'Mandat-Unterschriftsdatum',
+  'Mandator'                    => 'Mandant',
   'Mandator ID'                 => 'Mandanten-ID',
   'Mandatory Departments'       => 'Benutzer muss Abteilungen vergeben',
   'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' => 'Diese Mailadresse wird automatisch in das BCC Feld bei Mailversand kopiert. Hat keine Auswirkungen für Mitarbeiter ohne das Recht BCC zu versenden, und ignoriert wenn Mails automatisch versendet werden.',
@@ -2098,6 +2390,7 @@ $self->{texts} = {
   'May'                         => 'Mai',
   'May '                        => 'Mai',
   'May set the BCC field when sending emails' => 'Beim Verschicken von E-Mails das Feld \'BCC\' setzen',
+  'May use Custom Data Report at all' => 'Benuzerdefinierte Berichte überhaupt nutzen',
   'Meaning'                     => 'Bedeutung',
   'Media \'#1\' is not supported yet/anymore.' => 'Das Medium \'#1\' wird noch nicht oder nicht mehr unterstützt.',
   'Medium Number'               => 'Datenträgernummer',
@@ -2109,18 +2402,24 @@ $self->{texts} = {
   'Meta tag keywords'           => 'Metatag Keywords',
   'Meta tag title'              => 'Metatag Titel',
   'Method'                      => 'Verfahren',
+  'Methods & Preferences'       => 'Methoden & Einstellungen',
   'Microfiche'                  => 'Mikrofilm',
+  'Minimize Panel'              => 'Panel minimieren',
   'Minimum Amount'              => 'Mindestbetrag',
+  'Minimum order quantity'      => 'Mindestbestellmenge',
   'Miscellaneous'               => 'Verschiedenes',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
+  'Missing Files'               => 'Fehlende Dateien',
   'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',
   'Missing Tax Authoritys Preferences' => 'Fehlende Angaben zum Finanzamt!',
   'Missing amount'              => 'Fehlbetrag',
   'Missing configuration section "authentication/#1" in "config/kivitendo.conf".' => 'Fehlender Konfigurationsabschnitt "authentication/#1" in "config/kivitendo.conf".',
   'Missing parameter #1 in call to sub #2.' => 'Fehlender Parameter \'#1\' in Funktionsaufruf \'#2\'.',
-  'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+  'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlender Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
   'Missing parameter for WebDAV file copy' => 'Fehlender Parameter für WebDAV Datei kopieren',
+  'Missing parts:\nPartnumber\t- Name\t- Onhand\t- ROP\n' => 'Fehlende Artikel:\nArtikelnummer\t- Beschreibung\t- Auf Lager\t- Mindestlagerbestand\n',
+  'Missing qty'                 => 'Fehlende Menge',
   'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschlüssel in Rechnungen mit Steuern',
   'Mitarbeiter'                 => 'Mitarbeiter',
   'Mixed (requires column "type" or "pclass")' => 'Gemischt (Spalte "type" oder "pclass" notwendig',
@@ -2146,15 +2445,18 @@ $self->{texts} = {
   'Multiple addresses can be entered separated by commas.' => 'Mehrere Adressen können durch Kommata getrennt angegeben werden.',
   'MwSt. inkl.'                 => 'MwSt. inkl.',
   'Name'                        => 'Name',
+  'Name (Shipping)'             => 'Name (Lieferung)',
   'Name 2'                      => 'Name 2',
   'Name 3'                      => 'Name 3',
+  'Name and Address'            => 'Name & Adresse',
   'Name and Street'             => 'Name und Straße',
   'Name does not make sense without any bsooqr options' => 'Option "Name in gewählten Belegen" wird ignoriert.',
   'Name in Selected Records'    => 'Name in gewählten Belegen',
   'Name of the goal/source (if field names remote_name and remote_name_1 exist they will be combined into field "remote_name")' => 'Name des Ziel- oder Quellkontos (wenn die Spalten remote_name und remote_name_1 existieren werden diese zu Feld "remote_name" zusammengefügt)',
   'Need a image title'          => 'Benötige einen Titel für das Bild',
   'Need a valid Shop Part for updating Part' => 'Benötige eine gültiges Shop Part Objekt, um den Artikel zu aktualisieren.',
-  'Need a workflow for Supplier Delivery Order' => 'Benötige zwingend einen Workflow-Vorgänger für den Beistell-Lieferschein',
+  'Need a workflow for RMA Delivery Order.' => 'Benötige zwingend einen Workflow-Vorgänger für den Retouren-Lieferschein',
+  'Need a workflow for Supplier Delivery Order' => 'Benötige zwingend einen Workflow-Vorgänger für den Beistell-Lieferschein.',
   'Need at least one original position for the workflow Order to Delivery Order!' => 'Benötige mindestens eine Position die aus dem Auftrag übernommen wurde, ansonsten ist der Workflow inkosistent.',
   'Need charge number!'         => 'Benötige Chargennummer!',
   'Negative reductions are possible to model price increases.' => 'Negative Abschläge sind möglich um Aufschläge zu modellieren.',
@@ -2171,6 +2473,7 @@ $self->{texts} = {
   'Net.Turnover'                => 'Netto Umsatz',
   'Netherlands'                 => 'Niederlande',
   'Netto Terms'                 => 'Zahlungsziel netto',
+  'New Bins'                    => 'Neue Lagerplätze',
   'New Password'                => 'Neues Passwort',
   'New Purchase Price Rule'     => 'Neue Einkaufspreisregel',
   'New Sales Price Rule'        => 'Neue Verkaufspreisregel',
@@ -2193,40 +2496,47 @@ $self->{texts} = {
   'Next run at'                 => 'Nächste Ausführung um',
   'No'                          => 'Nein',
   'No 1:n or n:1 relation'      => 'Keine 1:n oder n:1 Beziehung',
-  'No AP Record Template for this vendor found, please add one' => 'Konnte keine Kreditorenbuchungsvorlage für diesen Lieferanten finden, bitte legen Sie eine an.',
+  'No AP Record Template for vendor \'#1\' found.' => 'Keine Kreditorenbuchungsvorlage für Lieferant \'#1\' gefunden.',
   'No AP template was found.'   => 'Keine Kreditorenbuchungsvorlage gefunden.',
   'No Billing and ship to address, for Order Number #1 with ID Billing #2 and ID Shipping #3' => 'Keine Rechnungs- und Lieferadresse zur Bestellnummer #1 mit Rechnungs-ID #2 und Liefer-ID #3 gefunden',
   'No Company Address given'    => 'Keine Firmenadresse hinterlegt!',
   'No Company Name given'       => 'Kein Firmenname hinterlegt!',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
+  'No Dokument found for record \'#1\'. Please deselect it or create a document it.' => 'Kein Dokument gefunden für Beleg \'#1\'. Bitte wählen Sie diesen ab oder erstellen Sie ein Dokument für diesen.',
+  'No File Management enabled.' => 'Kein Dateimanagement aktiviert.',
   'No GL template was found.'   => 'Keine Dialogbuchungsvorlage gefunden.',
   'No Journal'                  => 'Kein Journal',
   'No Order Number'             => 'Keine Auftragsnummer',
   'No Order items fetched'      => 'Keine Auftragspositionen gefunden',
   'No Shopdescription'          => 'Keine Shop-Artikelbeschreibung',
   'No Shopimages'               => 'Keine Shop-Bilder',
-  'No VAT Info for this Factur-X/ZUGFeRD invoice, please ask your vendor to add this for his Factur-X/ZUGFeRD data.' => 'Konnte keine UST-ID für diese Factur-X-/ZUGFeRD-Rechnungen finden, bitte fragen Sie bei Ihren Lieferanten nach, ob dieses Feld im Factur-X-/ZUGFeRD-Datensatz gesetzt wird.',
+  'No Vendor'                   => 'Kein Lieferant',
   'No Vendor was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Händler gefunden',
+  'No account selected. Please select an account.' => 'Kein Konto ausgewählt. Bitte Konto auswählen.',
   'No action defined.'          => 'Keine Aktion definiert.',
   'No address selected to delete' => 'Keine Adresse zum Löschen ausgewählt',
   'No article has been selected yet.' => 'Es wurde noch kein Artikel ausgewählt.',
   'No articles have been added yet.' => 'Es wurden noch keine Artikel hinzugefügt.',
   'No assembly has been selected yet.' => 'Es wurde noch kein Erzeugnis ausgewahlt.',
+  'No attachment'               => 'Kein Anhang',
+  'No attachments.'             => 'Keine Anhänge',
   'No background job has been created yet.' => 'Es wurden noch keine Hintergrund-Jobs angelegt.',
   'No bank account chosen!'     => 'Kein Bankkonto ausgewählt!',
   'No bank account configured for bank code/BIC #1, account number/IBAN #2.' => 'Kein Bankkonto für BLZ/BIC #1, Kontonummer/IBAN #2 konfiguriert.',
   'No bank account flagged for Factur-X/ZUGFeRD usage was found.' => 'Es wurde kein Bankkonto gefunden, das für Nutzung mit Factur-X/ZUGFeRD markiert ist.',
   'No bank account flagged for QRBill usage was found.' => 'Kein Bankkonto markiert für QR-Rechnung gefunden.',
-  'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' => 'Für diesen Kunden wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Überweisungen für den Lieferanten anlegen.',
+  'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' => 'Für diesen Kunden wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Lastschriften für den Kunden anlegen.',
   'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' => 'Für diesen Lieferanten wurden in seinen Stammdaten keine Kontodaten hinterlegt. Solange dies nicht geschehen ist, können Sie keine Überweisungen für den Lieferanten anlegen.',
   'No billing city'             => 'Die Stadt für die Rechnungsadresse fehlt',
   'No bins have been added to this warehouse yet.' => 'Es wurden zu diesem Lager noch keine Lagerplätze angelegt.',
+  'No business selected or found!' => 'Kein Kunden-/Lieferantentyp ausgewählt oder gefunden!',
   'No carry-over chart configured!' => 'Kein Saldenvortragskonto konfiguriert!',
   'No changes since previous version.' => 'Keine Änderungen seit der letzten Version.',
+  'No city given.'              => 'Stadt fehlt.',
   'No clients have been created yet.' => 'Es wurden noch keine Mandanten angelegt.',
   'No contact selected to delete' => 'Keine Ansprechperson zum Löschen ausgewählt',
   'No contra account selected!' => 'Kein Gegenkonto ausgewählt!',
-  'No custom data exports have been created yet.' => 'Es wurden noch keine benutzerdefinierten Datenexporte angelegt.',
+  'No custom reports have been created yet.' => 'Es wurden noch keine benutzerdefinierten Berichte angelegt.',
   'No customer email'           => 'Die E-Mail-Adresse des Kunden fehlt',
   'No customer has been selected yet.' => 'Es wurde noch kein Kunde ausgewählt.',
   'No customer selected or found!' => 'Kein Kunde selektiert oder keinen gefunden!',
@@ -2239,6 +2549,7 @@ $self->{texts} = {
   'No email for current user #1 defined.' => 'Keine E-Mail-Adresse für den angemeldeten Benutzer #1 definiert.',
   'No email for user with login #1 defined.' => 'Keine E-Mail-Adresse für den Benutzer mit dem Login #1 definiert.',
   'No email recipient for customer #1 defined.' => 'Keine E-Mail-Adresse (Rechnungs- oder global) für den Kunden #1 definiert.',
+  'No email sender address given.' => 'Es ist keine E-Mail-Absender-Adresse angegeben.',
   'No end date given, setting to today' => 'Kein Enddatum gegeben, setze Enddatum auf heute',
   'No entries can be imported.' => 'Es können keine Einträge importiert werden.',
   'No entries have been imported yet.' => 'Es wurden noch keine Einträge importiert.',
@@ -2251,6 +2562,7 @@ $self->{texts} = {
   'No function blocks have been created yet.' => 'Es wurden noch keine Funktionsblöcke angelegt.',
   'No groups have been created yet.' => 'Es wurden noch keine Gruppen angelegt.',
   'No internal phone extensions have been configured yet.' => 'Es wurden noch keine internen Durchwahlen konfiguriert.',
+  'No invoice email found.'     => 'Keine Rechnungsmailadresse gefunden.',
   'No invoices have been selected.' => 'Es wurden keine Rechnungen ausgewählt.',
   'No part was selected.'       => 'Es wurde kein Artikel ausgewählt',
   'No payment term has been created yet.' => 'Es wurden noch keine Zahlungsbedingungen angelegt.',
@@ -2263,20 +2575,25 @@ $self->{texts} = {
   'No profit and loss carried forward chart configured!' => 'Kein Verlustvortragskonto konfiguriert!',
   'No profit carried forward chart configured!' => 'Kein Gewinnvortragskonto konfiguriert!',
   'No quotations or orders have been created yet.' => 'Es wurden noch keine Angebote oder Aufträge angelegt.',
+  'No record is selected.'      => 'Kein Beleg ausgewählt.',
+  'No record type is selected.' => 'Kein Belegtyp ausgewählt.',
   'No report with id #1'        => 'Es gibt keinen Report mit der Id #1',
   'No requirement spec templates have been created yet.' => 'Es wurden noch keine Pflichtenheftvorlagen angelegt.',
   'No results.'                 => 'Keine Artikel',
+  'No row selected.'            => 'Keine Zeile ausgewählt.',
   'No search results found!'    => 'Keine Suchergebnisse gefunden!',
   'No sections created yet'     => 'Keine Abschnitte erstellt',
   'No sections have been created so far.' => 'Bisher wurden noch keine Abschnitte angelegt.',
   'No sections have been created yet.' => 'Es wurden noch keine Abschnitte angelegt.',
   'No shipto city'              => 'Die Stadt für die Lieferadresse fehlt',
   'No shipto selected to delete' => 'Keine Lieferadresse zum Löschen ausgewählt',
+  'No standard bin set for #1.' => 'Kein Standard-Lagerplatz ausgewählt für #1.',
   'No start date given, setting to #1' => 'Kein Startdatum gegeben, setze Startdatum auf #1',
   'No stock to transfer'        => 'Keine Lagerbewegungen vorhanden',
   'No such job #1 in the database.' => 'Hintergrund-Job #1 existiert nicht mehr.',
   'No summary account'          => 'Kein Sammelkonto',
   'No superuser credentials were entered.' => 'Es wurden keine Super-Benutzer-Anmeldedaten eingegeben.',
+  'No tax found for chart #1'   => 'Keine Steuer für Konto #1 gefunden',
   'No template has been selected yet.' => 'Es wurde noch keine Vorlage ausgewählt.',
   'No text blocks have been created for this position.' => 'Für diese Position wurden noch keine Textblöcke angelegt.',
   'No text has been entered yet.' => 'Es wurde noch kein Text eingegeben.',
@@ -2287,9 +2604,13 @@ $self->{texts} = {
   'No transactions yet.'        => 'Bisher keine Buchungen.',
   'No transfers were executed in this export.' => 'In diesem SEPA-Export wurden keine Überweisungen ausgeführt.',
   'No users have been created yet.' => 'Es wurden noch keine Benutzer angelegt.',
+  'No vaild Factur-X/ZUGFeRD file' => 'Keine valide Factur-X/ZUGFeRD Datei',
+  'No valid invoice(s) found'   => 'Keine gültige(n) Rechnung(en) gefunden.',
   'No valid number entered for pricegroup "#1".' => 'Für Preisgruppe "#1" wurde keine gültige Nummer eingegeben.',
+  'No vendor available'         => 'Kein Lieferant verfügbar',
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'No vendor selected or found!' => 'Kein Lieferant ausgewählt oder gefunden!',
+  'No vendors to add to purchasebasket' => 'Kein Lieferant',
   'No warehouse has been created yet or the quantity of the bins is not configured yet.' => 'Es wurde noch kein Lager angelegt, bzw. die dazugehörigen Lagerplätze sind noch nicht konfiguriert.',
   'No year given for method year' => 'Für diese Exportmethode wird ein Jahr benötigt',
   'No.'                         => 'Position',
@@ -2303,9 +2624,14 @@ $self->{texts} = {
   'Normalize Customer / Vendor names' => 'Normalisierung Kunden- / Lieferantennamen',
   'Normalize part description and part notes' => 'Normalisierung Artikelbeschreibung und Artikellangtext (Bemerkung)',
   'Not Discountable'            => 'Nicht rabattierfähig',
+  'Not a PDF or XML file'       => 'Keine PDF oder XML Datei',
   'Not delivered'               => 'Nicht geliefert',
+  'Not delivered amount'        => 'nicht gelieferte Menge',
   'Not done yet'                => 'Noch nicht fertig',
   'Not enough in stock for the serial number #1' => 'Nicht genug auf Lager von der Seriennummer #1',
+  'Not enough on stock for one or more allocations' => 'Lagerbestand zu niedrig für eine oder mehrere Belegungen',
+  'Not implemented yet!'        => 'Noch nicht implementiert!',
+  'Not linked'                  => 'Nicht verknüpft',
   'Not obsolete'                => 'Gültig',
   'Not yet implemented'         => 'Noch nicht implementiert',
   'Note'                        => 'Hinweis',
@@ -2321,6 +2647,7 @@ $self->{texts} = {
   'Nothing selected!'           => 'Es wurde nichts ausgewählt!',
   'Nothing stocked yet.'        => 'Noch nichts eingelagert.',
   'Nothing will be created or deleted at this stage!' => 'In diesem Schritt wird nichts angelegt oder gelöscht!',
+  'Notify me by email for follow-ups' => 'Bei neuen Wiedervorlagen per Email benachrichtigen',
   'Nov'                         => 'Nov',
   'November'                    => 'November',
   'Number'                      => 'Nummer',
@@ -2344,6 +2671,9 @@ $self->{texts} = {
   'Number of orders created:'   => 'Anzahl Aufträge erstellt',
   'Number pages'                => 'Seiten nummerieren',
   'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => 'Zahlenvariablen: Mit \'PRECISION=n\' erzwingt man, dass Zahlen mit n Nachkommastellen formatiert werden.',
+  'Numbers'                     => 'Nummern',
+  'Numbers & Dates'             => 'Nummern & Daten',
+  'Numbers & IDs'               => 'Nummern & IDs',
   'OB Transaction'              => 'EB-Buchung',
   'Objects have been imported.' => 'Objekte wurden importiert.',
   'Obsolete'                    => 'Ungültig',
@@ -2360,6 +2690,7 @@ $self->{texts} = {
   'One of the columns "qty" or "target_qty" must be given. If "target_qty" is given, the quantity to transfer for each transfer will be calculate, so that the quantity for this part, warehouse and bin will result in the given "target_qty" after each transfer.' => 'Eine der Spalten "qty" oder "target_qty" muss angegeben werden. Wird "target_qty" angegeben, so wird die zu bewegende Menge für jede Lagerbewegung so berechnet, dass die Lagermenge für diesen Artikel, Lager und Lagerplatz nach jeder Lagerbewegung der angegebenen Zielmenge entspricht.',
   'One of the units used (#1) cannot be mapped to a known unit code from the UN/ECE Recommendation 20 list.' => 'Eine der verwendeten Einheiten (#1) kann keinem der bekannten Einheiten-Codes aus der Liste UN/ECE Recommendation 20 zugeordnet werden.',
   'One or more Perl modules missing' => 'Ein oder mehr Perl-Module fehlen',
+  'Onhand'                      => 'Auf Lager',
   'Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.' => 'Das Import-Feld Auf Lager setzt nur die Menge in den Stammdaten, nicht im Lagerbereich. Dies ist historisch gewachsen nur ein Informationsfeld was mit dem tatsächlichen Wert überschrieben wird, sobald eine wirkliche Lagerbewegung stattfindet (DB-Trigger).',
   'Only Lines with Notes or Errors' => 'Nur Zeilen mit Bemerkungen oder Fehlern',
   'Only Price'                  => 'Nur Preis',
@@ -2368,6 +2699,7 @@ $self->{texts} = {
   'Only due follow-ups'         => 'Nur fällige Wiedervorlagen',
   'Only groups that have been configured for the client the user logs in to will be considered.' => 'Allerdings werden nur diejenigen Gruppen herangezogen, die für den Mandanten konfiguriert sind.',
   'Only list customer\'s projects in sales records' => 'Nur Projekte des Kunden in Verkaufsbelegen anzeigen',
+  'Only open'                   => 'Nur offene',
   'Only run tests from this file:' => 'Nur Tests aus dieser Datei ausführen:',
   'Only shown in item mode'     => 'werden nur im Artikelmodus angezeigt',
   'Oops. No valid action found to dispatch. Please report this case to the kivitendo team.' => 'Ups. Es wurde keine gültige Funktion zum Aufrufen gefunden. Bitte berichten Sie diesen Fall den kivitendo-Entwicklern.',
@@ -2376,6 +2708,7 @@ $self->{texts} = {
   'Open Amount at Last Payment Date' => 'Offener Betrag zum letzten Zahlungseingang',
   'Open Items'                  => 'Offene Posten',
   'Open Orders'                 => 'Offene Aufträge',
+  'Open Panel'                  => 'Panel aufklappen',
   'Open a further kivitendo window or tab' => 'Weiteres kivitendo-Fenster/-Tab öffnen',
   'Open amount'                 => 'offener Betrag',
   'Open in new window'          => 'In neuem Fenster öffnen.',
@@ -2391,29 +2724,41 @@ $self->{texts} = {
   'Options'                     => 'Optionen',
   'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' => 'Oder laden Sie die komplette Installationsbeschreibung als PDF (350kB) herunter: ',
   'Order'                       => 'Auftrag',
+  'Order & Articles'            => 'Auftrag & Artikel',
+  'Order & Numbers'             => 'Auftrag & Nummern',
+  'Order Confirmation Number'   => 'Auftragsbestätigungsnummer',
   'Order Date'                  => 'Auftragsdatum',
   'Order Date missing!'         => 'Auftragsdatum fehlt!',
+  'Order Intake'                => 'Auftragseingang',
   'Order Number'                => 'Auftragsnummer',
   'Order Number missing!'       => 'Auftragsnummer fehlt!',
+  'Order Size'                  => 'Bestellmenge',
   'Order amount'                => 'Auftragswert',
-  'Order deleted!'              => 'Auftrag gelöscht!',
+  'Order data'                  => 'Auftragsinformationen',
   'Order item search'           => 'Auftragsartikelsuche',
-  'Order number invalid. Must be less then or equal to 7 digits after prefix.' => 'Auftragsnummer ungültig. (kleiner/gleich 7 Stellen nach Prefix)',
   'Order probability'           => 'Auftragswahrscheinlichkeit',
-  'Order probability & expected billing date' => 'Auftragswahrscheinlichkeit & vorrauss. Abrechnungsdatum',
+  'Order probability & expected billing date' => 'Auftragswahrscheinlichkeit & Voraussichtliches Abrechnungsdatum',
+  'Order quantity'              => 'Bestellmenge',
   'Order value periodicity'     => 'Auftragswert basiert auf Periodizität',
   'Order/Item row name'         => 'Name der Auftrag-/Positions-Zeilen',
   'Order/Item/Stock row name'   => 'Name der Auftrag-/Positions-/Lager-Zeilen',
   'Order/RFQ Number'            => 'Belegnummer',
   'OrderItem'                   => 'Position',
   'Ordered'                     => 'Von Kunden bestellt',
+  'Ordered purchase'            => 'Bestellte Menge',
+  'Ordered, but not delivered (purchase)' => 'Bestellt, nicht geliefert(EK)',
+  'Orderer'                     => 'BestellerIn',
   'Orders'                      => 'Aufträge',
   'Orders / Delivery Orders deleteable' => 'Aufträge / Lieferscheine löschbar',
+  'Orders in Webshop'           => 'Bestellungen in Webshop',
   'Orders to fetch'             => 'Anzahl Bestellungen holen',
   'Orders to fetch neeeds a positive Integer' => 'Die Anzahl der zu holenden Aufträge muss eine positive Ganzzahl sein',
+  'Orders with projectnumber'   => 'Aufträge mit Projektnummer',
   'Orientation'                 => 'Seitenformat',
   'Orig. Size w/h'              => 'Orig. Größe b/h',
   'Origin of personal data'     => 'Herkunft der personenbezogenen Daten',
+  'Original Invoice'            => 'Ursprungs-Rechnung',
+  'Original Invoices?'          => 'Ursprungs-Rechnungen?',
   'Orphaned'                    => 'Nie benutzt',
   'Orphaned currencies'         => 'Verwaiste Währungen',
   'Other Matches'               => 'Andere Treffer',
@@ -2428,12 +2773,12 @@ $self->{texts} = {
   'Out of balance transaction!' => 'Buchung ist nicht ausgeglichen!',
   'Out of balance!'             => 'Summen stimmen nicht überein!',
   'Output Number Format'        => 'Zahlenformat (Ausgabe)',
+  'Overall Net.Turnover'        => 'Gesamter Netto-Umsatz',
   'Overdue invoices'            => 'Überfällige Rechnungen',
   'Overdue sales quotations and requests for quotations' => 'Überfällige Angebote und Preisanfragen',
   'Override'                    => 'Override',
   'Override invoice language'   => 'Diese Sprache verwenden',
   'Overview'                    => 'Übersicht',
-  'Overview kivitendo modules'  => 'Modul-Übersicht',
   'Own bank account number or IBAN' => 'Eigene Kontonummer oder IBAN',
   'Own bank code'               => 'Eigene Bankleitzahl',
   'Owner of account'            => 'Kontoinhaber',
@@ -2443,7 +2788,8 @@ $self->{texts} = {
   'PDF export'                  => 'PDF-Export',
   'PDF export -- options'       => 'PDF-Export -- Optionen',
   'PDF export with attachments' => 'Als PDF mit Anhängen exportieren',
-  'PLZ Grosskunden'             => 'PLZ Grosskunden',
+  'PDF-Export'                  => 'PDF-Export',
+  'PLZ Grosskunden'             => 'PLZ Großkunden',
   'POSTED'                      => 'Gebucht',
   'POSTED AS NEW'               => 'Als neu gebucht',
   'PREVIEWED'                   => 'Druckvorschau',
@@ -2454,6 +2800,8 @@ $self->{texts} = {
   'Page #1/#2'                  => 'Seite #1/#2',
   'Paid'                        => 'bezahlt',
   'Paid amount'                 => 'Bezahlter Betrag',
+  'Parameter module must be given.' => 'Der Parameter "module" muss angegeben werden.',
+  'Parsing the XML data failed: #1' => 'Parsen der XML-Daten fehlgeschlagen: #1',
   'Parsing the XMP metadata failed.' => 'Parsen der XMP-Metadaten schlug fehl.',
   'Part'                        => 'Ware',
   'Part "#1" has chargenumber or best before date set. So it cannot be transfered automatically.' => 'Bei Artikel "#1" ist eine Chargenummer oder ein Mindesthaltbarkeitsdatum vergeben. Deshalb kann dieser Artikel nicht automatisch ausgelagert werden.',
@@ -2470,9 +2818,14 @@ $self->{texts} = {
   'Part Test'                   => 'Artikel-Test',
   'Part Type'                   => 'Artikel-Typ',
   'Part Unit'                   => 'Einheit',
+  'Part added to purchasebasket' => 'Zu Einkaufkorb hinzugefügt',
+  'Part already in purchasebasket' => 'Schon im Einkaufskorb',
+  'Part already in purchasebasket or has no vendor' => 'Artikel ist schon im Bestellwarenkorb oder hat keinen Lieferanten',
+  'Part already ordered'        => 'Artikel ist bestellt',
   'Part classifications'        => 'Artikel-Klassifizierungen',
   'Part marked as "Shop part"'  => 'Markiert als Shopartikel',
   'Part picker'                 => 'Artikelauswahl',
+  'Part picker search dialog (magnifying glass): "all as list" defaults to on' => 'Artikel-Such-Dialog (Lupe): "alle als Liste" voreinstellen',
   'Part successful counted'     => 'Der Artikel wurde gezählt',
   'Part with partnumber: #1 not found' => 'Artikel mit Artikelnummer #1 wurde nicht gefunden',
   'PartClassAbbreviation'       => 'Abkürzung der Artikel-Klassifizierung',
@@ -2493,15 +2846,19 @@ $self->{texts} = {
   'Partsgroups'                 => 'Warengruppen',
   'Partsgroups where variables are shown' => 'Warengruppen, bei denen Variablen angezeigt werden',
   'Password'                    => 'Passwort',
+  'Password for WebDAV sync external' => 'Passwort für externes WebDAV-Repository',
+  'Password for sync'           => 'Passwort für die Synchronisation',
   'Paste'                       => 'Einfügen',
   'Paste template'              => 'Vorlage einfügen',
   'Path'                        => 'Pfad',
   'Payable account'             => 'Verbindlichkeitskonto',
+  'Payable account (account number)' => 'Verbindlichkeitskonto (Kontonummer)',
   'Payables'                    => 'Verbindlichkeiten',
   'Payment'                     => 'Zahlungsausgang',
   'Payment / Delivery Options'  => 'Zahlungs- und Lieferoptionen',
   'Payment Date'                => 'Leistungsdatum',
   'Payment Reminder'            => 'Zahlungserinnerung',
+  'Payment Term'                => 'Zahlungsbedingung',
   'Payment Terms'               => 'Zahlungsbedingungen',
   'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ',
   'Payment bookings disallowed. After the booking this record may be suggested with the amount of \'#1\' or otherwise has to be choosen manually. No automatic payment booking will be done to chart \'#2\'.' => 'Zahlungsbuchungen nicht erlaubt. Nach der Verbuchung kann dieser Beleg in der Vorschlagsliste mit dem Zahlungs-Betrag von \'#1\' erscheinen, ansonsten muss dieser manuell verknüpft werden. Es wird nicht automatisch eine Zahlungsbuchung auf das Konto \'#2\' durchgeführt.',
@@ -2526,9 +2883,12 @@ $self->{texts} = {
   'Periodic Invoices'           => 'Wiederkehrende Rechnungen',
   'Periodic inventory'          => 'Aufwandsmethode',
   'Periodic invoices active'    => 'Wiederkehrende Rechnungen aktiv',
+  'Periodic invoices config set to inactive.' => 'Konfiguration der wiederkehrenden Rechnungen auf inaktiv gesetzt.',
   'Periodic invoices inactive'  => 'Wiederkehrende Rechnungen inaktiv',
+  'Periods'                     => 'Zeiträume',
   'Permissions for invoices'    => 'Ansehrechte für Rechnungen',
   'Perpetual inventory'         => 'Bestandsmethode',
+  'Personal details'            => 'Personalien',
   'Personal settings'           => 'Persönliche Einstellungen',
   'Phone'                       => 'Telefon',
   'Phone Notes'                 => 'Telefonnotizen',
@@ -2549,13 +2909,13 @@ $self->{texts} = {
   'Pictures for search parts'   => 'Bilder für Warensuche',
   'Please Check the bank information for each customer:' => 'Bitte überprüfen Sie die Bankinformationen der Kunden:',
   'Please Check the bank information for each vendor:' => 'Bitte überprüfen Sie die Kontoinformationen der Lieferanten:',
-  'Please add a valid VAT-ID for this vendor: #1' => 'Bitte fügen Sie für den folgenden Lieferanten eine gültige UStID-Nummer hinzu: #1',
   'Please ask your administrator to create warehouses and bins.' => 'Bitten Sie Ihren Administrator, dass er Lager und Lagerplätze anlegt.',
   'Please change the partnumber of the following parts and run the update again:' => 'Bitte ändern Sie daher die Artikelnummer folgender Artikel:',
   'Please choose a part.'       => 'Bitte wählen Sie einen Artikel aus.',
   'Please choose for which categories the taxes should be displayed (otherwise remove the ticks):' => 'Bitte wählen Sie für welche Kontoart die Steuer angezeigt werden soll (ansonsten einfach die Häkchen entfernen)',
   'Please choose the action to be processed for your target quantity:' => 'Bitte wählen Sie eine Aktion, die mit Ihrer gezählten Zielmenge durchgeführt werden soll:',
   'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' => 'Bitte konfigurieren Sie in der Mandantenkonfiguration das Saldenvortragskonto, das Gewinnvortragskonto und das Verlustvortragskonto!',
+  'Please configure the year-end closing and the profit or loss carried forward accounts for year-end closing in the client configuration!' => 'Bitte konfigurieren Sie in der Mandantenkonfiguration das Jahresabschluss-Konto und das Konto zum Verbuchen des Jahresgewinns oder -verlusts!',
   'Please contact your administrator or a service provider.' => 'Bitte kontaktieren Sie Ihren Administrator oder einen Dienstleister.',
   'Please contact your administrator.' => 'Bitte wenden Sie sich an Ihren Administrator.',
   'Please correct the settings and try again or deactivate that client.' => 'Bitte korrigieren Sie die Einstellungen und versuchen Sie es erneut, oder deaktivieren Sie diesen Mandanten.',
@@ -2577,8 +2937,10 @@ $self->{texts} = {
   'Please provide corresponding credentials.' => 'Bitte geben Sie entsprechende Logindaten an.',
   'Please re-run the analysis for broken general ledger entries by clicking this button:' => 'Bitte wiederholen Sie die Analyse der Hauptbucheinträge, indem Sie auf diesen Button klicken:',
   'Please read the file'        => 'Bitte lesen Sie die Datei',
+  'Please resolve the errors by deleting the invalid database entries or by adding the corresponding files to the expected paths.' => 'Bitte beheben Sie die Fehler, indem Sie die ungültigen Datenbankeinträge löschen oder die entsprechenden Dateien zu den erwarteten Pfaden hinzufügen.',
   'Please select a customer from the list below.' => 'Bitte einen Endkunden aus der Liste auswählen',
   'Please select a customer.'   => 'Bitte wählen Sie einen Kunden aus.',
+  'Please select a deadline date.' => 'Bitte wählen Sie ein Datum für die Fristsetzung aus.',
   'Please select a delivery date.' => 'Bitte einen Liefertermin auswählen',
   'Please select a vendor from the list below.' => 'Bitte einen Händler aus der Liste auswählen',
   'Please select a vendor.'     => 'Bitte wählen Sie einen Lieferanten aus.',
@@ -2588,6 +2950,7 @@ $self->{texts} = {
   'Please select which client configurations you want to create.' => 'Bitte wählen Sie aus, welche Mandanten mit welchen Einstellungen angelegt werden sollen.',
   'Please set another taxnumber for the following taxes and run the update again:' => 'Bitte wählen Sie ein anderes Steuerautomatik-Konto für die folgenden Steuern aus uns starten Sie dann das Update erneut.',
   'Please specify a description for the warehouse designated for these goods.' => 'Bitte geben Sie den Namen des Ziellagers für die übernommenen Daten ein.',
+  'Please wait!'                => 'Bitte warten!',
   'Plural'                      => 'Plural',
   'Poland'                      => 'Polen',
   'Port'                        => 'Port',
@@ -2599,6 +2962,7 @@ $self->{texts} = {
   'Positions'                   => 'Positionen',
   'Post'                        => 'Buchen',
   'Post Payment'                => 'Zahlung buchen',
+  'Post and Close'              => 'Buchen und schließen',
   'Post and new booking'        => 'Buchen und neue Buchung',
   'Post and upload document'    => 'Buchen und Dokument hochladen',
   'Post payments'               => 'Zahlungen buchen',
@@ -2632,14 +2996,19 @@ $self->{texts} = {
   'Preset email body for periodic invoices' => 'Vorbelegter E-Mail-Text für wiederkehrende Rechnungen',
   'Preset email strings'        => 'Vorbelegte E-Mail-Texte',
   'Preset email subject for periodic invoices' => 'Vorbelegter E-Mail-Betreff für wiederkehrende Rechnungen',
+  'Preset email text for credit notes' => 'Vorbelegter E-Mail-Text für Gutschriften',
   'Preset email text for purchase orders' => 'Vorbelegter E-Mail-Text für Einkaufsaufträge',
+  'Preset email text for purchase orders confirmations' => 'Vorbelegter E-Mail-Text für Lieferantenauftragsbestätigungen',
+  'Preset email text for purchase quotation intakes' => 'Vorbelegter E-Mail-Text für Angebotseingänge',
+  'Preset email text for purchase reclamations' => 'Vorbelegter E-Mail-Text für Einkaufsreklamation',
   'Preset email text for requests (rfq)' => 'Vorbelegter E-Mail-Text für Anfragen',
   'Preset email text for sales delivery orders' => 'Vorbelegter E-Mail-Text für Verkaufs-Lieferscheine',
   'Preset email text for sales invoices' => 'Vorbelegter E-Mail-Text für Rechnungen',
   'Preset email text for sales invoices with direct debit' => 'Vorbelegter E-Mail-Text für Rechnungen mit Bankeinzug',
+  'Preset email text for sales order intakes' => 'Vorbelegter E-Mail-Text für Auftragseingänge',
   'Preset email text for sales orders' => 'Vorbelegter E-Mail-Text für Aufträge',
   'Preset email text for sales quotations' => 'Vorbelegter E-Mail-Text für Angebote',
-  'Prevent browser\'s back button in sales invoices' => 'Browser-Zurück-Knopf bei Verkaufsrechnungen verhindern',
+  'Preset email text for sales reclamations' => 'Vorbelegter E-Mail-Text für Verkaufsreklamationen',
   'Preview'                     => 'Vorschau',
   'Preview Mode'                => 'Vorschaumodus',
   'Previous month'              => 'vorheriger Monat',
@@ -2673,6 +3042,7 @@ $self->{texts} = {
   'Pricegroup'                  => 'Preisgruppe',
   'Pricegroups'                 => 'Preisgruppen',
   'Prices'                      => 'Preise',
+  'Prices & Discounts'          => 'Preise & Rabatte',
   'Print'                       => 'Drucken',
   'Print and Post'              => 'Drucken und Buchen',
   'Print automatically'         => 'Automatisch ausdrucken',
@@ -2701,6 +3071,8 @@ $self->{texts} = {
   'Private E-mail'              => 'Private E-Mail',
   'Private Phone'               => 'Privates Tel.',
   'Problem'                     => 'Problem',
+  'Processed attachments with function \'#1\':' => 'Anhänge verarbeitet mit Funktion \'#1\':',
+  'Processed successfully: '    => 'Erfolgreich verarbeitet: ',
   'Produce'                     => 'Fertigen',
   'Produce Assembly'            => 'Erzeugnis fertigen',
   'Produce Assembly Configuration' => 'Konfiguration für Erzeugnis fertigen',
@@ -2714,6 +3086,7 @@ $self->{texts} = {
   'Profit and loss accounts'    => 'Erfolgskonten',
   'Profit carried forward account' => 'Gewinnvortragskonto',
   'Profit determination'        => 'Gewinnermittlung',
+  'Profit or loss carried forward account' => 'Konto zum Verbuchen des Jahresgewinns oder -verlusts',
   'Proforma Invoice'            => 'Proformarechnung',
   'Program'                     => 'Programm',
   'Project'                     => 'Projekt',
@@ -2725,6 +3098,7 @@ $self->{texts} = {
   'Project Number'              => 'Projektnummer',
   'Project Numbers'             => 'Projektnummern',
   'Project Status'              => 'Projektstatus',
+  'Project Test'                => 'Projekt-Test',
   'Project Transactions'        => 'Projektbuchungen',
   'Project Type'                => 'Projekttyp',
   'Project Types'               => 'Projekttypen',
@@ -2737,6 +3111,7 @@ $self->{texts} = {
   'Projects'                    => 'Projekte',
   'Projects: edit the list of employees allowed to view invoices' => 'Projekte: Liste der Angestellten bearbeiten, die Projektrechnungen ansehen dürfen',
   'Projecttransactions'         => 'Projektbuchungen',
+  'Promotion Code'              => 'Aktionscode',
   'Proposal'                    => 'Vorschlag',
   'Proposals'                   => 'Vorschläge',
   'Protocol'                    => 'Protokoll',
@@ -2744,29 +3119,45 @@ $self->{texts} = {
   'Prozentual/Absolut'          => 'Prozentual/Absolut',
   'Purchase'                    => 'Einkauf',
   'Purchase (typeabbreviation)' => 'E',
+  'Purchase Credit Note'        => 'Einkaufsgutschrift',
+  'Purchase Credit Notes'       => 'Einkaufsgutschriften',
   'Purchase Delivery Order'     => 'Einkaufslieferschein',
   'Purchase Delivery Orders'    => 'Einkaufslieferscheine',
   'Purchase Delivery Orders deleteable' => 'Einkaufslieferscheine löschbar',
   'Purchase Invoice'            => 'Einkaufsrechnung',
   'Purchase Invoices'           => 'Einkaufsrechnungen',
   'Purchase Order'              => 'Lieferantenauftrag',
+  'Purchase Order Confirmation' => 'Lieferantenauftragsbestätigung',
+  'Purchase Order Confirmations' => 'Lieferantenauftragsbestätigungen',
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Purchase Orders Services are deliverable' => 'Dienstleistungen im Einkaufsauftrag sind lieferbar',
   'Purchase Orders deleteable'  => 'Lieferantenaufträge löschbar',
   'Purchase Price Rules'        => 'Preisregeln Einkauf',
   'Purchase Price Rules '       => 'Preisregeln (Einkauf)',
+  'Purchase Quotation Intake'   => 'Angebotseingang',
+  'Purchase Quotation Intakes'  => 'Angebotseingänge',
+  'Purchase Reclamation'        => 'Einkaufsreklamation',
+  'Purchase Reclamations'       => 'Einkaufsreklamationen',
+  'Purchase Reclamations deleteable' => 'Einkaufsreklamationen löschbar',
+  'Purchase basket'             => 'Einkaufswarenkorb',
+  'Purchase basket item not existing any more for position(s): #1.' => 'Einkaufskorbartikel existiert nicht mehr für Position(en): #1.',
   'Purchase delivery order'     => 'Lieferschein (Einkauf)',
   'Purchase invoices'           => 'Einkaufsrechnungen',
   'Purchase invoices changeable' => 'Änderbarkeit von Einkaufsrechnunen',
   'Purchase net amount'         => 'EK-Betrag',
   'Purchase price'              => 'EK-Preis',
   'Purchase price total'        => 'EK-Betrag',
+  'Purchasebasket'              => 'In den Warenkorb',
   'Purchasing & Sales'          => 'Einkauf & Verkauf',
   'Purpose'                     => 'Verwendungszweck',
   'Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")' => 'Verwendungszweck (wenn die Spalten purpose, purpose1, purpose2 ... existieren werden diese zum Feld "purpose" zusammengefügt)',
   'Purpose/Reference'           => 'Verwendungszweck und Referenz',
+  'QR bill unstructured message' => 'QR-Rechnung unstrukturierte Mitteilung',
   'QR bill without amount'      => 'QR-Rechnung ohne Betrag',
-  'QR-Code placeholder image: QRCodePlaceholder not found in template.' => 'QR-Code Platzhalter Bild: QRCodePlaceholder nicht gefunden.',
+  'QR reference'                => 'QR-Referenz',
+  'QR-Code invalid'             => 'QR-Code ungültig',
+  'QR-Code placeholder image: QRCodePlaceholder not found in template.' => 'QR-Code Platzhalter Bild: QRCodePlaceholder nicht in Druckvorlage gefunden.',
+  'QR-IBAN (Swiss)'             => 'QR-IBAN (Schweiz)',
   'QR-Image generation failed: ' => 'QR-Code Erzeugung fehlgeschlagen: ',
   'QUEUED'                      => 'In Warteschlange',
   'Qty'                         => 'Menge',
@@ -2786,6 +3177,7 @@ $self->{texts} = {
   'Quartal'                     => 'Quartal',
   'Quarter'                     => 'Quartal',
   'Quarterly'                   => 'quartalsweise',
+  'Query Type'                  => 'Art der Abfrage',
   'Query parameters'            => 'Abfrageparameter',
   'Queue'                       => 'Warteschlange',
   'Quick Search'                => 'Schnellsuche',
@@ -2794,9 +3186,9 @@ $self->{texts} = {
   'Quotation'                   => 'Angebot',
   'Quotation Date'              => 'Angebotsdatum',
   'Quotation Date missing!'     => 'Angebotsdatum fehlt!',
+  'Quotation Intake'            => 'Angebotseingang',
   'Quotation Number'            => 'Angebotsnummer',
   'Quotation Number missing!'   => 'Angebotsnummer fehlt!',
-  'Quotation deleted!'          => 'Angebot wurde gelöscht.',
   'Quotation/Order Date'        => 'Angebots-/Auftragsdatum',
   'Quotations'                  => 'Angebote',
   'Quotations and orders'       => 'Angebote und Aufträge',
@@ -2808,6 +3200,8 @@ $self->{texts} = {
   'RFQ'                         => 'Anfrage',
   'RFQ Date'                    => 'Anfragedatum',
   'RFQ Number'                  => 'Anfragenummer',
+  'RFQ/Order Status'            => 'Angebots-/Auftrags-Status',
+  'RFQ/Order Statuses'          => 'Angebots-/Auftrags-Status',
   'RFQs'                        => 'Preisanfragen',
   'RMA Delivery Order'          => 'Retouren-Lieferschein',
   'RMA Delivery Orders'         => 'Retouren-Lieferscheine',
@@ -2816,9 +3210,13 @@ $self->{texts} = {
   'Ranges of numbers'           => 'Nummernkreise',
   'Re-numbering all sections and function blocks in the order they are currently shown cannot be undone.' => 'Das Neu-Nummerieren aller Abschnitte und Funktionsblöcke kann nicht rückgängig gemacht werden.',
   'Re-run analysis'             => 'Analyse wiederholen',
+  'Re-sending a final version was requested, but the latest version of the document could not be found' => 'Erneutes Senden einer finalen Version wurde gewünscht, aber die letzte Version des Belegausdrucks konnte nicht gefunden werden',
   'Read all employee e-mails'   => 'Ansehen der E-Mails aller Mitarbeiter',
   'Really cancel link?'         => 'Verknüpfung wirklich aufheben?',
   'Realm'                       => 'Realm',
+  'Reason'                      => 'Grund',
+  'Reason Description Extern'   => 'Grundbeschreibung extern',
+  'Reason Description Intern'   => 'Grundbeschreibung intern',
   'Receipt'                     => 'Zahlungseingang',
   'Receipt posted!'             => 'Beleg gebucht!',
   'Receipt, payment, reconciliation' => 'Zahlungseingang, Zahlungsausgang, Kontenabgleich',
@@ -2830,27 +3228,41 @@ $self->{texts} = {
   'Receivables account (account number)' => 'Forderungskonto (Kontonummer)',
   'Received payments can only be posted for sales invoices and purchase credit notes.' => 'Erhaltene Zahlungen können nur mit Verkaufsrechnungen und Einkaufsgutschriften verbucht werden.',
   'Recipients'                  => 'Empfänger',
+  'Reclamation'                 => 'Reklamation',
+  'Reclamation Date'            => 'Reklamationsdatum',
+  'Reclamation ID'              => 'Reklamationsid',
+  'Reclamation Number'          => 'Reklamationsnummer',
+  'Reclamation Reason'          => 'Reklamationsgrund',
+  'Reclamation Reasons'         => 'Reklamationsgründe',
   'Reconcile'                   => 'Abgleichen',
   'Reconciliation'              => 'Kontenabgleich',
   'Reconciliation with bank'    => 'Kontenabgleich mit Bank',
+  'Record IBAN #1 doesn\'t match vendor IBAN #2' => 'Beleg IBAN #1 stimmt nicht mit Lieferanten IBAN #2 überein',
   'Record Type'                 => 'Belegtyp',
+  'Record VAT ID #1 doesn\'t match vendor VAT ID #2' => 'Beleg USt-IdNr. #1 stimmt nicht mit Lieferanten USt-IdNr. #2 überein',
   'Record Vendor Invoice'       => 'Einkaufsrechnung erfassen',
   'Record in'                   => 'Buchen auf',
   'Record number'               => 'Belegnummer',
+  'Record numbers and dates'    => 'Belegnummern &amp; Datum',
   'Record numbers changeable'   => 'Änderbarkeit von Belegnummern',
+  'Record tax ID #1 doesn\'t match vendor tax ID #2' => 'Beleg Steuernummer #1 stimmt nicht mit Lieferanten Steuernummer #2 überein',
   'Record templates'            => 'Belegvorlagen',
   'Record type to create'       => 'Anzulegender Belegtyp',
   'Record\'s files'             => 'Belegdateien',
   'Recorded Tax'                => 'Gespeicherte Steuern',
   'Recorded taxkey'             => 'Gespeicherter Steuerschlüssel',
   'Records'                     => 'Belege',
+  'Recurring'                   => 'Wiederkehrend',
+  'Recurring billing'           => 'Wiederkehrende Abrechnung',
   'Reduced Master Data'         => 'Abschlag',
   'Reference'                   => 'Referenz',
   'Reference / Invoice Number'  => 'Referenz / Rechnungsnummer',
   'Reference day'               => 'Referenztag',
   'Reference missing!'          => 'Referenz fehlt!',
+  'Registration'                => 'Erfassung',
   'Relaxed (UTF-8)'             => 'Lax (UTF-8)',
   'Release From Stock'          => 'Lagerausgang',
+  'Reload'                      => 'Neu Laden',
   'Remaining'                   => 'Rest',
   'Remaining Amount'            => 'abzurechnender Betrag',
   'Remaining Net Amount'        => 'abzurechnender Nettobetrag',
@@ -2879,6 +3291,7 @@ $self->{texts} = {
   'Rename Images'               => 'Bilder umbenennen',
   'Rename attachment'           => 'Dateianhang umbenennen',
   'Renumber sections and function blocks' => 'Abschnitte/Funktionsblöcke neu nummerieren',
+  'Reorder Level List'          => 'Meldebestandsliste',
   'Replace the orphaned currencies by other not orphaned currencies. To do so, please delete the currency in the textfields above and replace it by another currency. You could loose or change unintentionally exchangerates. Go on very carefully since you could destroy transactions.' => 'Ersetze die Währungen durch andere gültige Währungen. Wenn Sie sich hierfür entscheiden, ersetzen Sie bitte alle Währungen, die oben angegeben sind, durch Währungen, die in Ihrem System ordnungsgemäß eingetragen sind. Alle eingetragenen Wechselkurse für die verwaiste Währung werden dabei gelöscht. Bitte gehen Sie sehr vorsichtig vor, denn die betroffenen Buchungen können unter Umständen kaputt gehen.',
   'Report Positions'            => 'Berichte',
   'Report about warehouse contents' => 'Lagerbestand anzeigen',
@@ -2886,6 +3299,7 @@ $self->{texts} = {
   'Report and misc. Preferences' => 'Sonstige Einstellungen',
   'Report configuration overview' => 'Berichtskonfigurationsübersicht',
   'Report date'                 => 'Berichtsdatum',
+  'Report date:'                => 'Bericht Datum:',
   'Report for'                  => 'Bericht für',
   'Report separately'           => 'Preis separat ausweisen',
   'Reports'                     => 'Berichte',
@@ -2901,6 +3315,8 @@ $self->{texts} = {
   'Request for Quotation Number' => 'Anfragenummer',
   'Request for Quotations'      => 'Anfragen',
   'Request quotation'           => 'Preisanfrage',
+  'Request quotations closed: #1 Sales quotations closed: #2' => 'Preisanfragen geschlossen: #1 Angebote geschlossen: #2',
+  'Request quotations not yet closed: #1 Sales quotations not yet closed: #2' => 'Preisanfragen noch nicht geschlossen: #1 Angebote noch nicht geschlossen: #2',
   'Requested execution date'    => 'Gewünschtes Ausführungsdatum',
   'Requested execution date from' => 'Gewünschtes Ausführungsdatum von',
   'Requested execution date to' => 'Gewünschtes Ausführungsdatum bis',
@@ -2909,6 +3325,7 @@ $self->{texts} = {
   'Require stock out to consider a delivery order position delivered?' => 'Muss eine Lieferscheinposition ausgelagert sein um als geliefert zu gelten?',
   'Required access right'       => 'Benötigtes Zugriffsrecht',
   'Required by'                 => 'Lieferdatum',
+  'Required qty'                => 'Erforderliche Menge',
   'Requirement Spec Status'     => 'Pflichtenheftstatus',
   'Requirement Spec Statuses'   => 'Pflichtenheftstatus',
   'Requirement Spec Templates'  => 'Pflichtenheftvorlagen',
@@ -2927,7 +3344,9 @@ $self->{texts} = {
   'Requirement spec template actions' => 'Pflichtenheftvorlagen-Aktionen',
   'Requirement spec text block "#1"; content: "#2"' => 'Pflichtenheft-Textblock "1"; Inhalt: "#2"',
   'Requirement specs'           => 'Pflichtenhefte',
+  'Rerun update'                => 'Wiederhole Update',
   'Reset'                       => 'Zurücksetzen',
+  'Reset Filter'                => 'Filter zurücksetzen',
   'Result'                      => 'Ergebnis',
   'Result of SQL query'         => 'Ergebnis einer SQL-Abfrage',
   'Results per page'            => 'Treffer pro Seite',
@@ -2940,11 +3359,13 @@ $self->{texts} = {
   'Risk'                        => 'Risiko',
   'Risk levels'                 => 'Risikograde',
   'Risks'                       => 'Risikograde',
+  'Rop'                         => 'Mindeslagebestand',
   'Rounding'                    => 'Rundung',
   'Rounding Gain'               => 'Rundungserträge',
   'Rounding Loss'               => 'Rundungsaufwendungen',
   'Row'                         => 'Zeile',
   'Row #1: amount has to be different from zero.' => 'Zeile #1: Der Wert darf nicht 0 sein.',
+  'Row is the record itself'    => 'Zeile ist der Beleg selbst',
   'Row number'                  => 'Zeilennummer',
   'Row was created from current record' => 'Zeile wurde aus aktuellem Beleg erstellt',
   'Row was linked to another record' => 'Zeile wurde über einen anderen Beleg verlinkt',
@@ -2961,16 +3382,23 @@ $self->{texts} = {
   'SAVED FOR DUNNING'           => 'Gespeichert zum Mahnen',
   'SCREENED'                    => 'Angezeigt',
   'SEPA'                        => 'SEPA',
+  'SEPA Transfer Amount'        => 'Betrag in offenen SEPA Exporten',
+  'SEPA XML Docs for Exports '  => 'SEPA-XML-Dokumente Export-Nummer',
   'SEPA XML download'           => 'SEPA-XML-Download',
+  'SEPA XML version'            => 'SEPA-XML-Version',
   'SEPA creditor ID'            => 'SEPA-Kreditoren-Identifikation',
   'SEPA exports'                => 'SEPA-Exporte',
   'SEPA message ID'             => 'SEPA-Nachrichten-ID',
   'SEPA message IDs'            => 'SEPA-Nachrichten-IDs',
   'SEPA strings'                => 'SEPA-Überweisungen',
+  'SEPA-XML File extension'     => 'SEPA-XML Dateiendung',
+  'SEPA/Bank'                   => 'SEPA/Bank',
   'SQL query'                   => 'SQL-Abfrage',
+  'SWIFT'                       => 'SWIFT',
   'SWIFT MT940 format'          => 'SWIFT-MT940-Format',
   'Saldo Credit'                => 'Saldo Haben',
   'Saldo Debit'                 => 'Saldo Soll',
+  'Saldo alt'                   => 'Saldo alt',
   'Saldo neu'                   => 'Saldo neu',
   'Saldo per'                   => 'Saldo per',
   'Sales'                       => 'Verkauf',
@@ -2981,6 +3409,9 @@ $self->{texts} = {
   'Sales Invoice'               => 'Rechnung',
   'Sales Invoices'              => 'Kundenrechnungen',
   'Sales Order'                 => 'Kundenauftrag',
+  'Sales Order Confirmations'   => 'Auftragsbestätigungen',
+  'Sales Order Intake'          => 'Auftragseingang',
+  'Sales Order Intakes'         => 'Auftragseingänge',
   'Sales Order delivery date interval' => 'Lieferdatumintervall',
   'Sales Orders'                => 'Aufträge',
   'Sales Orders Advance'        => 'Auftragsvorlauf',
@@ -2991,6 +3422,9 @@ $self->{texts} = {
   'Sales Price information'     => 'Verkaufspreisinformation',
   'Sales Quotation valid interval' => 'Angebotsgültigkeitsintervall',
   'Sales Quotations'            => 'Angebote',
+  'Sales Reclamation'           => 'Verkaufsreklamation',
+  'Sales Reclamations'          => 'Verkaufsreklamationen',
+  'Sales Reclamations deleteable' => 'Verkaufsreklamationen löschbar',
   'Sales Report'                => 'Verkaufsbericht',
   'Sales and purchase invoices with inventory transactions with taxkeys' => 'Einkaufs- und Verkaufsrechnungen mit Warenbestandsbuchungen mit Steuerschlüsseln',
   'Sales delivery order'        => 'Lieferschein (Verkauf)',
@@ -3012,6 +3446,7 @@ $self->{texts} = {
   'Salesman'                    => 'Verkäufer/in',
   'Salesman (database ID)'      => 'Verkäufer/in (Datenbank-ID)',
   'Salesman (login)'            => 'Verkäufer/in (Login)',
+  'Salesman Name'               => 'Verkäufer/in-name',
   'Salesperson'                 => 'Verkäufer',
   'Salutation female'           => 'Anrede weiblich',
   'Salutation general'          => 'Anrede anonym (personenlos)',
@@ -3029,17 +3464,28 @@ $self->{texts} = {
   'Save and AP Transaction'     => 'Speichern und Kreditorenbuchung erfassen',
   'Save and AR Transaction'     => 'Speichern und Debitorenbuchung erfassen',
   'Save and Close'              => 'Speichern und schließen',
-  'Save and Delivery Order'     => 'Speichern und Lieferschein',
+  'Save and Credit Note'        => 'Speichern und Gutschrift erfassen',
   'Save and E-mail'             => 'Speichern und E-Mail',
   'Save and Final Invoice'      => 'Speichern und Schlussrechnung',
   'Save and Further Invoice for Advance Payment' => 'Speichern und weitere Anzahlungsrechnung',
   'Save and Invoice'            => 'Speichern und Rechnung erfassen',
   'Save and Invoice for Advance Payment' => 'Speichern und Anzahlungsrechnung',
+  'Save and Next'               => 'Speichern und weiter',
   'Save and Order'              => 'Speichern und Auftrag erfassen',
+  'Save and Purchase Delivery Order' => 'Speichern und Lieferschein (Einkauf)',
+  'Save and Purchase Delivery Order with item selection' => 'Speichern und Lieferschein (Einkauf) mit Artikelauswahl',
   'Save and Purchase Order'     => 'Speichern und Lieferantenauftrag',
+  'Save and Purchase Order Confirmation' => 'Speichern und Lieferantenauftragsbestätigung',
+  'Save and Purchase Quotation Intake' => 'Speichern und Angebotseingang',
+  'Save and Purchase Reclamation' => 'Speichern und Einkaufsreklamation',
   'Save and Quotation'          => 'Speichern und Angebot',
   'Save and RFQ'                => 'Speichern und Lieferantenanfrage',
-  'Save and Sales Order'        => 'Speichern und Kundenauftrag',
+  'Save and RMA Delivery Order' => 'Speichern und Retourenlieferschein',
+  'Save and Reclamation'        => 'Speichern und Reklamation',
+  'Save and Sales Delivery Order' => 'Speichern und Lieferschein (Verkauf)',
+  'Save and Sales Order Confirmation' => 'Speichern und Auftragsbestätigung',
+  'Save and Sales Order Intake' => 'Speichern und Auftragseingang',
+  'Save and Sales Reclamation'  => 'Speichern und Verkaufsreklamation',
   'Save and Supplier Delivery Order' => 'Speichern und Beistelllieferschein',
   'Save and close'              => 'Speichern und schließen',
   'Save and execute'            => 'Speichern und ausführen',
@@ -3057,16 +3503,25 @@ $self->{texts} = {
   'Saving failed. Error message from the database: #1' => 'Speichern schlug fehl. Fehlermeldung der Datenbank: #1',
   'Saving failed. Error message from the server: #1' => 'Speichern schlug fehl. Fehlermeldung der Servers #1',
   'Saving the file \'%s\' failed. OS error message: %s' => 'Das Speichern der Datei \'%s\' schlug fehl. Fehlermeldung des Betriebssystems: %s',
+  'Saving the record failed: #1' => 'Speichern des Belegs schlug fehl: #1',
   'Saving the record template \'#1\' failed.' => 'Das Speichern der Belegvorlage »#1« schlug fehl.',
   'Saving the time recording entry failed: #1' => 'Speichern des Zeiterfassung-Eintrags schlug fehl: #1',
+  'Scan swiss QR bill'          => 'Schweizer QR-Rechnung scannen',
+  'Scope'                       => 'Bereich',
   'Score'                       => 'Punkte',
   'Screen'                      => 'Bildschirm',
+  'Scrollbar height percentage for form postion area' => 'Prozentuale Höhe des Scrollbereichs der Positionen in Belegen',
   'Scrollbar height percentage for form postion area (0 means no scrollbar)' => 'Prozentuale Höhe des Scrollbereichs der Positionen in Belegen (0 bedeutet kein Scrollbar)',
   'Search'                      => 'Suchen',
+  'Search & Add Article'        => 'Artikel suchen & hinzufügen',
+  'Search & Add Customer'       => 'Kunde suchen & hinzufügen',
+  'Search & Add Vendor'         => 'Lieferant suchen & hinzufügen',
+  'Search & Add Vendor by Name' => 'Lieferant über Namen suchen & hinzufügen',
   'Search AP Aging'             => 'Offene Verbindlichkeiten',
   'Search AR Aging'             => 'Offene Forderungen',
   'Search bank transactions'    => 'Filter für Bankbuchungen',
   'Search contacts'             => 'Personensuche',
+  'Search customer by name and add by selecting' => 'Kunde über Namen suchen und durch Auswählen hinzufügen',
   'Search for Items used in Assemblies' => 'Suche nach in Erzeugnissen verbauten Artikeln',
   'Search parts by customer partnumber in sales order forms' => 'Artikel nach Kunden-Art.-Nr. in Verkaufsbelegen suchen',
   'Search parts by vendor partnumber (model) in purchase order forms' => 'Artikel nach Lieferanten-Art.-Nr. in Einkaufsbelegen suchen',
@@ -3080,19 +3535,31 @@ $self->{texts} = {
   'Sections that are not assigned to any of the items above will be added as new positions.' => 'Abschnitte, die keiner der oben aufgeführten Positionen zugeordnet sind, werden als neue Positionen ergänzt.',
   'See various menu entries intended for developers' => 'Entwickler-Tools anzeigen',
   'Select'                      => 'auswählen',
+  'Select (with Factur-X/ZUGFeRD import)' => 'auswählen (mit Factur-X/ZUGFeRD-Import)',
+  'Select Chargenumbers'        => 'Chargen auswählen',
+  'Select Contact'              => 'Ansprechperson auswählen',
+  'Select Deliveries'           => 'Lieferungen auswählen',
   'Select Mulit-Item Options'   => 'Multi-Treffer Auswahlliste',
+  'Select Shipping Address'     => 'Lieferadresse auswählen',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a period'             => 'Bitte Zeitraum auswählen',
+  'Select article'              => 'Artikel auswählen',
   'Select federal state...'     => 'Bundesland auswählen...',
   'Select file to upload'       => 'Datei zum Hochladen auswählen',
   'Select from one of the items below' => 'Wählen Sie einen der untenstehenden Einträge',
+  'Select from preset'          => 'Aus Voreinstellung wählen',
+  'Select items for delivery order' => 'Positionen für Lieferschein auswählen',
   'Select postscript or PDF!'   => 'Postscript oder PDF auswählen!',
+  'Select record type'          => 'Belegtyp auswählen',
   'Select tax office...'        => 'Finanzamt auswählen...',
   'Select template to paste'    => 'Einzufügende Vorlage auswählen',
   'Select type of removal'      => 'Grund der Entnahme auswählen',
   'Select type of transfer'     => 'Grund der Umlagerung auswählen',
   'Select type of transfer in'  => 'Grund der Einlagerung auswählen:',
+  'Select/Deselect'             => 'Aus-/Abwählen',
+  'Select/Deselect all'         => 'Alle Aus-/Abwählen',
   'Selected'                    => 'Ausgewählt',
+  'Selected items deleted'      => 'Ausgewählte Positionen gelöscht',
   'Selection'                   => 'Auswahlbox',
   'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' => 'Auswahlboxen: Das Optionenfeld muss die für die Auswahl verfügbaren Einträge enthalten. Die Einträge werden mit \'##\' voneinander getrennt. Beispiel: \'Früh##Normal##Spät\'.',
   'Sell Price'                  => 'Verkaufspreis',
@@ -3107,6 +3574,7 @@ $self->{texts} = {
   'Send invoice via email'      => 'Rechnung via E-Mail verschicken',
   'Send printout of record'     => 'Belegausdruck mitschicken',
   'Send the last or create the first version for this record' => 'Den zuletzt erstellten oder neuen Belegausdruck verschicken',
+  'Send the last version for this record' => 'Den zuletzt erstellten Belegausdruck verschicken',
   'Sender'                      => 'AbsenderIn',
   'Sent emails can be optionally stored in the database with or without their attachments.' => 'Gesendete E-Mails können optional mit oder ohne ihre Anhänge in der Datenbank gespeichert werden.',
   'Sent on'                     => 'Verschickt am',
@@ -3188,9 +3656,11 @@ $self->{texts} = {
   'Shoporder deleted -- '       => 'ungültig',
   'Shoporder not found'         => 'Shopbestellung nicht gefunden',
   'Shoporderlock'               => 'Shopauftragssperre',
-  'Shoporders'                  => 'Shopbestellungen',
+  'Shoporders'                  => 'Shopbest.',
   'Shops'                       => 'Webshops',
   'Short'                       => 'Knapp',
+  'Short onhand'                => 'Geringe Lagermenge',
+  'Short onhand Ordered'        => 'Geringer Lagerbestand, aber bestellt',
   'Should VAT ID or taxnumber be unique for all vendors? This is checked when saving a vendor\'s master data. One of the fields is sufficient and required.' => 'Soll die UStID oder Steuernummer eindeutig über alle Lieferanten sein? Dies wird beim Speichern von Lieferantenstammdaten geprüft. Eines dieser Felder reicht aus und muss angegeben sein.',
   'Should VAT ID or taxnumber be unique for customers? This is checked when saving a customer\'s master data. One of the fields is sufficient and required.' => 'Soll die UStID oder Steuernummer eindeutig über alle Kunden sein? Dies wird beim Speichern von Kundenstammdaten geprüft. Eines dieser Felder reicht aus und muss angegeben sein.',
   'Should ap transactions be and when should they be changeable or deleteable after posting?' => 'Sollen Kreditorenbuchungen nach der Buchung zu ändern oder zu löschen sein?',
@@ -3204,15 +3674,18 @@ $self->{texts} = {
   'Should the "mark as paid" button showed in purchase invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Einkaufsrechnungen angezeigt werden?',
   'Should the "mark as paid" button showed on sales invoices?' => 'Soll der Knopf "als bezahlt markieren" bei Verkaufsrechnungen angezeigt werden?',
   'Show'                        => 'Zeigen',
+  'Show "mark as paid"'         => '"als bezahlt markiert" Anzeigen',
   'Show "mark as paid" in ap transactions' => '"als bezahlt markieren" bei Kreditorenbuchungen anzeigen',
   'Show "mark as paid" in ar transactions' => '"als bezahlt markieren" bei Debitorenbuchungen anzeigen',
   'Show "mark as paid" in purchase invoices' => '"als bezahlt markieren" bei Einkaufsrechnungen anzeigen',
   'Show "mark as paid" in sales invoices' => '"als bezahlt markieren" bei Verkaufsrechnungen anzeigen',
   'Show AP transactions as part of AP invoice report' => 'Kreditorenbuchungen zusammen mit Verkaufsrechnungen anzeigen',
   'Show AR transactions as part of AR invoice report' => 'Debitorenbuchungen zusammen mit Verkaufsrechnungen anzeigen',
+  'Show Attachment'             => 'Anhang anzeigen',
   'Show Bestbefore'             => 'Mindesthaltbarkeit anzeigen',
   'Show E-Mails'                => 'E-Mails anzeigen',
   'Show Filter'                 => 'Filter zeigen',
+  'Show Records'                => 'Belege anzeigen',
   'Show Salesman'               => 'Verkäufer anzeigen',
   'Show Stornos'                => 'Stornos anzeigen',
   'Show TODO list'              => 'Aufgabenliste anzeigen',
@@ -3221,15 +3694,19 @@ $self->{texts} = {
   'Show all details'            => 'Alle Details anzeigen',
   'Show all parts'              => 'Alle Artikel anzeigen',
   'Show by default'             => 'Standardmäßig anzeigen',
+  'Show certain sales and purchase documents' => 'Bestimmte Belege anzeigen',
   'Show chart list'             => 'Kontenliste zeigen',
   'Show charts'                 => 'Konten zeigen',
   'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
   'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',
   'Show delete button in purchase orders?' => 'Soll der "Löschen"-Knopf bei Lieferantenaufträgen angezeigt werden?',
+  'Show delete button in purchase reclamations?' => 'Soll der "Löschen"-Knopf bei Einkaufsreklamationen angezeigt werden?',
   'Show delete button in sales delivery orders?' => 'Soll der "Löschen"-Knopf bei Verkaufslieferscheinen angezeigt werden?',
   'Show delete button in sales orders?' => 'Soll der "Löschen"-Knopf bei Kundenaufträgen angezeigt werden?',
+  'Show delete button in sales reclamations?' => 'Soll der "Löschen"-Knopf bei Verkaufsreklamationen angezeigt werden?',
   'Show delivery plan'          => 'Lieferplan anzeigen',
   'Show delivery value report'  => 'Lieferwertbericht anzeigen',
+  'Show detail informationen'   => 'Detaillierte Informationen anzeigen',
   'Show details'                => 'Details anzeigen',
   'Show details and reports of parts, services, assemblies' => 'Details und Berichte von Waren, Dienstleistungen und Erzeugnissen anzeigen',
   'Show document tab after posting?' => 'Buchungsmaske nicht verlassen und Dokumenten-Reiter anzeigen?',
@@ -3239,6 +3716,7 @@ $self->{texts} = {
   'Show follow ups...'          => 'Zeige Wiedervorlagen...',
   'Show help text'              => 'Hilfetext anzeigen',
   'Show images'                 => 'Bilder zeigen',
+  'Show invoice for payment in advance and final invoice' => 'Anzahlungs- und Schluss-Rechnungen anzeigen',
   'Show items from invoices individually' => 'Artikel aus Rechnungen anzeigen',
   'Show mappings (csv_import)'  => 'Spaltenzuordnungen anzeigen',
   'Show old dunnings'           => 'Alte Mahnungen anzeigen',
@@ -3248,13 +3726,25 @@ $self->{texts} = {
   'Show overdue sales quotations and requests for quotations...' => 'Überfällige Angebote und Preisanfragen anzeigen...',
   'Show parts'                  => 'Artikel anzeigen',
   'Show parts longdescription (notes) in select list' => 'Langtext in Auswahlliste bei mehreren Treffern im Stammdaten-Bestand anzeigen',
+  'Show purchase basket'        => 'Einkaufswarenkorb zeigen',
   'Show purchase letters report' => 'Einkaufsbriefe zeigen',
+  'Show purchase order confirmation' => 'Lieferantenauftragsbestätigung anzeigen',
+  'Show purchase order reports with amounts (and links to open documents)' => 'Berichte Einkaufsaufträge mit Beträgen (und Links zum Öffnen der Belege)',
+  'Show purchase quotation intake' => 'Angebotseingang anzeigen',
+  'Show purchase reclamation'   => 'Einkaufsreklamation anzeigen',
   'Show record tab in customer' => 'Zeige Tab Belege in den Kundenstammdaten',
   'Show record tab in vendor'   => 'Zeige Tab Belege in den Lieferantenstammdaten',
   'Show requirement spec'       => 'Pflichtenheft anzeigen',
   'Show requirement spec template' => 'Pflichtenheftvorlage anzeigen',
+  'Show sales financial controlling' => 'Finanzcontrollingbericht anzeigen',
   'Show sales letters report'   => 'Verkaufsbrief anzeigen',
+  'Show sales order intake'     => 'Auftragseingang anzeigen',
+  'Show sales order item search' => 'Auftragsartikelsuche anzeigen',
+  'Show sales order reports with amounts (and links to open documents)' => 'Berichte Verkaufsaufträge mit Beträgen (und Links zum Öffnen der Belege)',
+  'Show sales reclamation'      => 'Verkaufsreklamation anzeigen',
+  'Show sales report'           => 'Verkaufsbericht anzeigen',
   'Show settings'               => 'Einstellungen anzeigen',
+  'Show subtotals'              => 'Zwischensummen anzeigen',
   'Show the picture in the part form' => 'Bild in Warenmaske anzeigen',
   'Show the pictures in the result for search parts' => 'Bilder in Suchergebnis für Stammdaten -> Berichte -> Waren anzeigen',
   'Show the weights of articles and the total weight in orders, invoices and delivery notes?' => 'Sollen Warengewichte und Gesamtgewicht in Aufträgen, Rechnungen und Lieferscheinen angezeigt werden?',
@@ -3266,6 +3756,7 @@ $self->{texts} = {
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => 'Da Lagerplätze kein Pflichtfeld sind, geben Sie bitte einen Lagerplatz an, in dem Waren ohne spezifizierten Lagerplatz eingelagert werden sollen.',
   'Single quotes'               => 'Einfache Anführungszeichen',
   'Single values in item mode, cumulated values in invoice mode' => 'Einzelwerte im Artikelmodus, kumulierte Werte im Rechnungsmodus',
+  'Singular'                    => 'Singular',
   'Size'                        => 'Größe',
   'Skip'                        => 'Überspringen',
   'Skip entry'                  => 'Eintrag überspringen',
@@ -3287,8 +3778,11 @@ $self->{texts} = {
   'Soldtotal does not make sense without any bsooqr options' => 'Option "Menge in gewählten Belegen" ohne gewählte Belege wird ignoriert.',
   'Solution'                    => 'Lösung',
   'Sorry, I am too stupid to figure out the default warehouse/bin and the sold qty. I drop the default warehouse/bin option.' => 'Entschuldigung, ich bin nicht in der Lage Standard-Lager und die Menge in gewählten Belegen gleichzeitig anzuzeigen. Ich lass die Standard-Lager weg.',
+  'Sort'                        => 'Sortieren',
   'Sort By'                     => 'Sortiert nach',
+  'Sort by'                     => 'Sortieren nach',
   'Sort order'                  => 'Sortierfolge',
+  'Sorting'                     => 'Sortierung',
   'Source'                      => 'Beleg',
   'Source BIC'                  => 'Quell-BIC',
   'Source IBAN'                 => 'Quell-IBAN',
@@ -3319,6 +3813,7 @@ $self->{texts} = {
   'Statement sent to'           => 'Gesendet an ',
   'Statements sent to printer!' => 'Sammelrechnungen an Drucker geschickt!',
   'Status'                      => 'Status',
+  'Status & Handling'           => 'Status & Bearbeitung',
   'Status Shoptransfer'         => 'Status Shoptransfer',
   'Status Shopupload'           => 'Status Shopupload',
   'Step #1/#2'                  => 'Schritt #1/#2',
@@ -3347,13 +3842,21 @@ $self->{texts} = {
   'Storage Type for shopimages' => 'Speichertyp für Shopbilder',
   'Storing PDF in storage backend failed: #1' => 'Speichern der PDF-Datei im Datei-Speicher fehlgeschlagen: #1',
   'Storing PDF to webdav folder failed: #1' => 'Speichern der PDF im WebDAV Ordner fehlgeschlagen: #1',
+  'Storing the ZUGFeRD file in the storage backend failed: #1' => 'Das Speichern der ZUGFeRD Datei im Datei-Speicher ist fehlgeschlagen: #1',
+  'Storing the ZUGFeRD file to the WebDAV folder failed: #1' => 'Das Speichern der ZUGFeRD Datei im WebDAV Ordner ist fehlgeschlagen: #1',
   'Storing the document in the storage backend failed: #1' => 'Das Ablegen des Dokuments im Dokumentenspeicher schlug fehl: #1',
   'Storing the document to the WebDAV folder failed: #1' => 'Das Ablegen des Dokuments im WebDAV-Ordner schlug fehl: #1',
   'Storing the emails in the journal is currently disabled in the client configuration.' => 'Das Speichern von versendeten E-Mails ist derzeit in der Mandantenkonfigurierung abgeschaltet.',
   'Storno'                      => 'Storno',
   'Storno (one letter abbreviation)' => 'S',
+  'Storno Credit Note'          => 'Stornogutschrift',
+  'Storno Credit Notes'         => 'Stornogutschriften',
   'Storno Invoice'              => 'Stornorechnung',
+  'Storno Invoice for Advance Payment' => 'Stornorechnung für Anzahlung',
+  'Storno Invoices'             => 'Stornorechnungen',
+  'Storno Invoices for Advance Payment' => 'Stornorechnung für Anzahlung',
   'Street'                      => 'Straße',
+  'Street (Shipping)'           => 'Straße (Lieferung)',
   'Street 1'                    => 'Straße 1',
   'Street 2'                    => 'Straße 2',
   'Strict and halt'             => 'Strikt und Abbruch',
@@ -3366,8 +3869,10 @@ $self->{texts} = {
   'Subtotal'                    => 'Zwischensumme',
   'Subtotal cannot distinguish betweens record types. Only one of the selected record types will be displayed: #1' => 'Zwischensummen können nicht zwischen den einzelnen Belegen unterscheiden, es wird nur "#1" angezeigt',
   'Subtotals per quarter'       => 'Zwischensummen pro Quartal',
+  'Subversions are not supported or disabled for this record type.' => 'Subversionen werden für diesen Belegtyp nicht unterstützt oder sind deaktiviert.',
   'Such entries cannot be exported into the DATEV format and have to be fixed as well.' => 'Solche Einträge sind aber nicht DATEV-exportiertbar und müssen ebenfalls korrigiert werden.',
   'Suggested invoice'           => 'Rechnungsvorschlag',
+  'Sum Amount'                  => 'Gesamtmenge',
   'Sum Credit'                  => 'Summe Haben',
   'Sum Debit'                   => 'Summe Soll',
   'Sum for'                     => 'Summe für',
@@ -3389,6 +3894,7 @@ $self->{texts} = {
   'Supplies'                    => 'Lieferungen',
   'Surname'                     => 'Nachname',
   'Switzerland'                 => 'Schweiz',
+  'Synchronize WebDAV with owncloud repository' => 'Internes WebDAV-Repository mit owncloud-Repository synchronisieren',
   'System'                      => 'System',
   'System currently down for maintenance!' => 'kivitendo ist momentan zwecks Wartungsarbeiten nicht zugänglich.',
   'TODO list'                   => 'Aufgabenliste',
@@ -3399,6 +3905,7 @@ $self->{texts} = {
   'Target Qty'                  => 'Zielmenge',
   'Target bank account'         => 'Zielkonto',
   'Target table'                => 'Zieltabelle',
+  'Tariff Code'                 => 'Zolltarifnummer',
   'Task Server is not running, starting it now. If this does not change, please check your task server config' => 'Der Taskserver läuft nicht, starte ihn jetzt. Das kann ein paar Sekunden dauern. Sollte das nicht funktionieren, prüfen Sie bitte die Taskserver-Konfiguration.',
   'Task server'                 => 'Task-Server',
   'Task server control'         => 'Task-Server-Steuerung',
@@ -3452,6 +3959,7 @@ $self->{texts} = {
   'Template database'           => 'Datenbankvorlage',
   'Template date'               => 'Vorlagendatum',
   'Templates'                   => 'Vorlagen',
+  'Terms'                       => 'Bedingungen',
   'Terms missing in row '       => '+Tage fehlen in Zeile ',
   'Test database connectivity'  => 'Datenbankverbindung testen',
   'Text'                        => 'Text',
@@ -3476,7 +3984,6 @@ $self->{texts} = {
   'The AR transaction #1 has been deleted.' => 'Die Debitorenbuchung #1 wurde gelöscht.',
   'The Bins in Inventory were only a information text field.' => 'Die Lagerplätze unter Stammdaten/Waren sind nur ein informatives Textfeld.',
   'The Bins in master data were only a information text field.' => 'Die Lagerplätze unter Stammdaten/Waren sind nur ein informatives Textfeld.',
-  'The Factur-X/ZUGFeRD XML invoice was not found.' => 'Die Factur-X-/ZUGFeRD-XML-Rechnungsdaten wurden nicht gefunden.',
   'The Factur-X/ZUGFeRD notes have been saved.' => 'Die Factur-X-/ZUGFeRD-Notizen wurden gespeichert.',
   'The Factur-X/ZUGFeRD version used is not supported.' => 'Die verwendete Factur-X-/ZUGFeRD-Version wird nicht unterstützt.',
   'The GL transaction #1 has been deleted.' => 'Die Dialogbuchung #1 wurde gelöscht.',
@@ -3493,7 +4000,7 @@ $self->{texts} = {
   'The PDF has been printed'    => 'Das PDF-Dokument wurde gedruckt.',
   'The Protocol for Host Name seems invalid (expected: http:// or https://)!' => 'Das Protokoll für den Server sieht falsch aus. Erwartet wird "http://" oder "https://".',
   'The Proxy Name seems invalid' => 'Der Hostname des Proxys sieht falsch aus',
-  'The SEPA export has been created.' => 'Der SEPA-Export wurde erstellt',
+  'The SEPA export has been created.' => 'Der SEPA-Export wurde erstellt.',
   'The SEPA strings have been saved.' => 'Die bei SEPA-Überweisungen verwendeten Begriffe wurden gespeichert.',
   'The SQL query can be parameterized with variables named as follows: <%name%>.' => 'Die SQL-Abfrage kann mittels Variablen wie folgt parametrisiert werden: <%Variablenname%>.',
   'The SQL query does not contain any parameter that need to be configured.' => 'Die SQL-Abfrage enthält keine Parameter, die angegeben werden müssten.',
@@ -3504,6 +4011,7 @@ $self->{texts} = {
   'The WebDAV feature has been used.' => 'Das WebDAV-Feature wurde benutzt.',
   'The XMP metadata does not declare the Factur-X/ZUGFeRD data.' => 'Die XMP-Metadaten enthalten keine Factur-X-/ZUGFeRD-Deklaration.',
   'The ZUGFeRD invoice data cannot be generated because the data validation failed.' => 'Die ZUGFeRD-Rechnungsdaten können nicht erzeugt werden, da die Validierung fehlschlug.',
+  'The ZUGFeRD/Factur-X invoice \'#1\' has been loaded.' => 'Die ZUGFeRD-/Factur-X-Rechnung \'#1\' wurde geladen.',
   'The abbreviation is missing.' => 'Abkürzung fehlt',
   'The access rights a user has within a client instance is still governed by his group membership.' => 'Welche Zugriffsrechte ein Benutzer innerhalb eines Mandanten hat, wird weiterhin über Gruppenmitgliedschaften geregelt.',
   'The access rights have been saved.' => 'Die Zugriffsrechte wurden gespeichert.',
@@ -3514,9 +4022,11 @@ $self->{texts} = {
   'The action is missing or invalid.' => 'Die action fehlt, oder sie ist ungültig.',
   'The action you\'ve chosen has not been executed because the document does not contain any item yet.' => 'Die von Ihnen ausgewählte Aktion wurde nicht ausgeführt, weil der Beleg noch keine Positionen enthält.',
   'The administration area is always accessible.' => 'Der Administrationsbereich ist immer zugänglich.',
+  'The allowed Skonto Percentage Deivation defaults to 0.5% of the invoice amount' => 'Erlaubte prozentuale Skonto-Abweichung',
   'The application "#1" was not found on the system.' => 'Die Anwendung "#1" wurde auf dem System nicht gefunden.',
   'The assembly \'#1\' cannot be a part from itself.' => 'Das Erzeugnis \'#1\' kann kein Teil von sich selbst sein.',
   'The assembly \'#1\' would make a loop in assembly tree.' => 'Das Erzeugnis \'#1\' würde eine Schleife im Erzeugnisbaum machen.',
+  'The assembly could not be produced.' => 'Das Erzeugnis konnte nicht produziert werden.',
   'The assembly doesn\'t have any items.' => 'Das Erzeugnis enthält keine Artikel.',
   'The assembly has been created.' => 'Das Erzeugnis wurde hergestellt.',
   'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => 'Der Korrekturassistent konnte kein Problem bei #1 feststellen. Eventuell wurde das Problem in der Zwischenzeit bereits behoben.',
@@ -3536,6 +4046,8 @@ $self->{texts} = {
   'The basic client tables have not been created for this client\'s database yet.' => 'Die grundlegenden Mandantentabellen wurden in der für diesen Mandanten konfigurierten Datenbank noch nicht angelegt.',
   'The billing period has already been locked.' => 'Die Buchungsperiode wurde bereits abgeschlossen.',
   'The body is missing.'        => 'Der Text fehlt',
+  'The booking group \'#1\' is obsolete and cannot be used with active articles.' => 'Die Buchungsgruppe "#1" ist ungültig und kann nicht für aktive Artikel genutzt werden.',
+  'The booking group cannot be marked obsolete while still being used by active parts.' => 'Die Buchungsgruppe kann nicht auf ungültig gesetzt werden, solange sie von gültigen Artikeln benutzt wird.',
   'The booking group has been created.' => 'Die Buchungsgruppe wurde erstellt.',
   'The booking group has been deleted.' => 'Die Buchungsgruppe wurde gelöscht.',
   'The booking group has been saved.' => 'Die Buchungsgruppe wurde gespeichert.',
@@ -3570,9 +4082,10 @@ $self->{texts} = {
   'The country from the customer\'s address cannot be mapped to an ISO 3166-1 alpha 2 code.' => 'Das Land aus der Kunden-Rechnungsadresse kann keinem der bekannten ISO 3166-1 Alpha 2-Codes zugeordnet werden.',
   'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:',
   'The credentials (username & password) for connecting database are wrong.' => 'Die Daten (Benutzername & Passwort) für das Login zur Datenbank sind falsch.',
+  'The credit note has been deleted' => 'Die Gutschrift wurde gelöscht',
   'The currency "#1" cannot be mapped to an ISO 4217 currency code.' => 'Die Währung "#1" kann keinem der bekannten ISO 4217-Codes zugeordnet werden.',
-  'The custom data export has been deleted.' => 'Der benutzerdefinierte Datenexport wurde gelöscht.',
-  'The custom data export has been saved.' => 'Der benutzerdefinierte Datenexport wurde gespeichert.',
+  'The custom report has been deleted.' => 'Der benutzerdefinierte Bericht wurde gelöscht.',
+  'The custom report has been saved.' => 'Der benutzerdefinierte Bericht wurde gespeichert.',
   'The custom variable has been created.' => 'Die benutzerdefinierte Variable wurde erfasst.',
   'The custom variable has been deleted.' => 'Die benutzerdefinierte Variable wurde gelöscht.',
   'The custom variable has been saved.' => 'Die benutzerdefinierte Variable wurde gespeichert.',
@@ -3611,6 +4124,7 @@ $self->{texts} = {
   'The document has been printed.' => 'Das Dokument wurde gedruckt.',
   'The documents have been sent to the printer \'#1\'.' => 'Die Dokumente sind zum Drucker \'#1\' geschickt',
   'The dunnings have been printed.' => 'Die Mahnung(en) wurden gedruckt.',
+  'The email entry for #1 looks invalid' => 'Die eingetragene E-Mail-Adresse für #1 sieht ungültig aus.',
   'The email has been sent.'    => 'Die E-Mail wurde verschickt.',
   'The email was not sent due to the following error: #1.' => 'Die E-Mail wurde aufgrund des folgenden Fehlers nicht verschickt: #1',
   'The employee is missing.'    => 'Der Bearbeiter fehlt.',
@@ -3626,8 +4140,12 @@ $self->{texts} = {
   'The file has been sent to the printer.' => 'Die Datei wurde an den Drucker geschickt.',
   'The file is available for download.' => 'Die Datei ist zum Herunterladen verfügbar.',
   'The file name is missing'    => 'Der Dateiname fehlt',
+  'The final invoice has been deleted' => 'Die Schlussrechnung wurde gelöscht',
   'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' => 'Der erste Grund war ein Fehler in kivitendo, der dazu führte, dass bei einer Transaktion, bei der zwei Buchungen mit unterschiedlichen Steuerschlüsseln auf dasselbe Konto durchgeführt wurden, die falschen Steuerschlüssel gespeichert wurden.',
   'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.',
+  'The following Shop Orders: ' => 'Die folgenden Shop-Aufträge: ',
+  'The following assembly items are ambigious. Please check the selection.' => 'Die folgenden Erzeugnisbestandteile sind nicht eindeutig. Bitte überprüfen Sie die Auswahl.',
+  'The following assembly items are unambigious and will be used for production.' => 'Die folgenden Erzeugnisbestandteile sind eindeutig und werden für die Fertigung verwendet.',
   'The following currencies have been used, but they are not defined:' => 'Die folgenden Währungen wurden benutzt, sind aber nicht ordnungsgemäß in der Datenbank eingetragen:',
   'The following delivery orders could not be processed because they are already closed: #1' => 'Die folgenden Lieferscheine konnten nicht verarbeitet werden, da sie bereits geschlossen sind: #1',
   'The following drafts have been saved and can be loaded.' => 'Die folgenden Entwürfe wurden gespeichert und können geladen werden.',
@@ -3636,15 +4154,20 @@ $self->{texts} = {
   'The following is only a preview.' => 'Das Folgende ist nur eine Vorschau.',
   'The following list has been generated automatically from existing users collapsing users with identical settings into a single entry.' => 'Die folgende Liste wurde automatisch aus den im System vorhandenen Benutzern zusammengestellt, wobei identische Einstellungen zu einem Eintrag zusammengefasst wurden.',
   'The following old files whose settings have to be merged manually into the new configuration file "config/kivitendo.conf" still exist:' => 'Es existieren noch die folgenden alten Dateien, deren Einstellungen manuell in die neue Konfiguratsdatei "config/kivitendo.conf" migriert werden müssen:',
+  'The following orders could not be converted to delivery orders:' => 'Folgende Aufträge konnten nicht in Lieferscheine konvertiert werden:',
+  'The following parts could not be allocated:' => 'Die folgenden Artikel konnten nicht für die Produktion belegt werden:',
   'The following transaction contains wrong taxes:' => 'Die folgende Buchung enthält falsche Steuern:',
   'The following transaction contains wrong taxkeys:' => 'Die folgende Buchung enthält falsche Steuerschlüssel:',
   'The following transactions are concerned:' => 'Die folgenden Buchungen sind betroffen:',
   'The following users are a member of this group' => 'Die folgenden Benutzer sind Mitglieder dieser Gruppe',
   'The following users will have access to this client' => 'Die folgenden Benutzer werden auf diesen Mandanten Zugriff haben',
+  'The form is not valid anymore.' => 'Das Formular ist nicht mehr gültig.',
   'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln müssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname = Variable Einheit;<br>Variablenname2 = Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Variablennamen und Einheiten dürfen nur aus alphanumerischen Zeichen bestehen.<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
   'The greetings have been saved.' => 'Die Anreden wurden gespeichert',
   'The installation is currently locked.' => 'Die Installation ist momentan gesperrt.',
   'The installation is currently unlocked.' => 'Die Installation ist momentan entsperrt.',
+  'The invoice for advance payment has been deleted' => 'Die Anzahlungsrechnung wurde gelöscht',
+  'The invoice has been deleted' => 'Die Rechnung wurde gelöscht',
   'The invoice is not linked with a sales delivery order. Post anyway?' => 'Diese Rechnung ist mit keinem Lieferschein verknüpft. Dennoch Buchen?',
   'The invoice recipient can either be a selected contact person (default) or the email adress set in the master data of the customer. Additionally a contact persons mail and the company\'s invoicing mail can be combined.' => 'Der E-Mail-Rechnungsempfänger ist entweder mit dem Ansprechpartner des Belegs vorbelegt (Standard) oder mit der E-Mail-Rechnungsadresse aus den Stammdaten. Alternativ können beide (Ansprechpartner in CC) vorbelegt werden.',
   'The invoices have been created. They\'re pre-selected below.' => 'Die Rechnungen wurden erzeugt. Sie sind unten vorausgewählt.',
@@ -3654,10 +4177,12 @@ $self->{texts} = {
   'The item has been deleted.'  => 'Der Artikel wurde gelöscht.',
   'The item has been saved.'    => 'Der Artikel wurde gespeichert.',
   'The items are imported accoring do their number "X" regardless of the column order inside the file.' => 'Die Einträge werden in der Reihenfolge ihrer Indizes "X" unabhängig von der Spaltenreihenfolge in der Datei importiert.',
+  'The layout style normally is choosen by the user agent string the browser sends. Here you can force the desktop or mobile version. Users can override this setting in their user preferences.' => 'Normalerweise wird der Layout-Stil durch den \'user agent string\' vom Browser bestimmt. Hier kann die Desktop- oder Mobil-Version erzwungen werden. Benutzer können diese Einstellung in ihren Benutzereinstellungen überschreiben.',
   'The link target to add has been created from the existing record.' => 'Das auszuwählende Verknüpfungsziel wurde aus dem bestehenden Beleg erstellt.',
   'The list has been printed.'  => 'Die Liste wurde ausgedruckt.',
   'The login is missing.'       => 'Der Loginname fehlt.',
   'The login is not unique.'    => 'Der Loginname ist nicht eindeutig.',
+  'The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?' => 'Der eingegebene Benutzername war schon einmal vergeben. Sollen Belege des früheren Benutzers mit dem selben Benutzernamen dem neuen Benutzer zugewiesen werden?',
   'The long description is missing.' => 'Der Langtext fehlt.',
   'The master templates where not found.' => 'Der Vorlagensatz wurde nicht gefunden.',
   'The maximum of uploadable filesize in Megabyte' => 'Die maximale Dateigröße in Megabytes, die hochladbar ist',
@@ -3679,8 +4204,12 @@ $self->{texts} = {
   'The object has not been saved yet.' => 'Das Objekt wurde noch nicht gespeichert.',
   'The object is in use and cannot be deleted.' => 'Das Objekt ist in Benutzung und kann nicht gelöscht werden.',
   'The option field is empty.'  => 'Das Optionsfeld ist leer.',
+  'The order confirmation has been deleted' => 'Die Auftragsbestätigung wurde gelöscht',
+  'The order confirmation has been saved' => 'Die Auftragsbestätigung wurde gespeichert',
   'The order has been deleted'  => 'Der Auftrag wurde gelöscht.',
   'The order has been saved'    => 'Der Auftrag wurde gespeichert.',
+  'The order intake has been deleted' => 'Der Auftragseingang wurde gelöscht',
+  'The order intake has been saved' => 'Der Auftragseingang wurde gespeichert',
   'The package name is invalid.' => 'Der Paketname ist ungültig.',
   'The partnumber already exists!' => 'Die Artikelnummer wird bereits verwendet.',
   'The partnumber already exists.' => 'Die Artikelnummer wird bereits verwendet.',
@@ -3696,6 +4225,7 @@ $self->{texts} = {
   'The password is too short (minimum length: #1).' => 'Das Password ist zu kurz (minimale Länge: #1).',
   'The password is weak (e.g. it can be found in a dictionary).' => 'Das Passwort ist schwach (z.B. wenn es in einem Wörterbuch steht).',
   'The path is missing.'        => 'Pfad fehlt',
+  'The payable chart isn\'t a valid chart.' => 'Das Verbindlichkeitskonto ist kein gültiges Konto.',
   'The payment term has been created.' => 'Die Zahlungsbedingungen wurden angelegt.',
   'The payment term has been deleted.' => 'Die Zahlungsbedingungen wurden gelöscht.',
   'The payment term has been saved.' => 'Die Zahlungsbedingungen wurden gespeichert.',
@@ -3725,15 +4255,26 @@ $self->{texts} = {
   'The project link has been updated.' => 'Die Projektverknüpfung wurde aktualisiert.',
   'The project number is already in use.' => 'Die Projektnummer wird bereits verwendet.',
   'The project number is missing.' => 'Die Projektnummer fehlt.',
+  'The purchase credit note has been deleted' => 'Die Einkaufsgutschrift wurde gelöscht',
+  'The purchase invoice has been deleted' => 'Die Einkaufsrechnung wurde gelöscht',
   'The query did not return any data.' => 'Die Abfrage lieferte keine Daten',
   'The quotation has been deleted' => 'Das Angebot wurde gelöscht',
   'The quotation has been saved' => 'Das Angebot wurde gespeichert',
+  'The quotation intake has been deleted' => 'Der Angebotseingang wurde gelöscht',
+  'The quotation intake has been saved' => 'Der Angebotseingang wurde gespeichert',
   'The receivables chart isn\'t a valid chart.' => 'Das Forderungskonto ist kein gültiges Konto',
-  'The recipient, subject or body is missing.' => 'Der Empfäger, der Betreff oder der Text ist leer.',
+  'The recipient, subject or body is missing.' => 'Der Empfänger, der Betreff oder der Text ist leer.',
+  'The reclamation has been deleted' => 'Die Reklamation wurde gelöscht.',
+  'The reclamation has been saved' => 'Die Reklamation wurde gespeichert.',
+  'The reclamation reason has been created.' => 'Der Reklamationsgrund wurde erstellt.',
+  'The reclamation reason has been deleted.' => 'Der Reklamationsgrund wurde gelöscht.',
+  'The reclamation reason has been saved.' => 'Der Reklamationsgrund wurde gespeichert.',
+  'The reclamation reason is in use and cannot be deleted.' => 'Der Reklamationsgrund ist in Benutzung und kann nicht gelöscht werden.',
+  'The record has been closed.' => 'Dieser Beleg wurde geschlossen.',
   'The record template \'#1\' has been loaded.' => 'Die Belegvorlage »#1« wurde geladen.',
   'The record template \'#1\' has been saved.' => 'Die Belegvorlage »#1« wurde gespeichert.',
   'The report doesn\'t contain entries.' => 'Der Bericht enthält keine Einträge.',
-  'The required information consists of the IBAN and the BIC.' => 'Die benötigten Informationen bestehen aus der IBAN und der BIC. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
+  'The required information consists of the IBAN and the BIC.' => 'Die benötigten Informationen bestehen aus der IBAN und der BIC.',
   'The required information consists of the IBAN, the BIC, the mandator ID and the mandate\'s date of signature.' => 'Die benötigten Informationen bestehen aus IBAN, BIC, Mandanten-ID und dem Unterschriftsdatum des Mandates. Zusätzlich wird die SEPA-Kreditoren-Identifikation aus der Mandantenkonfiguration benötigt.',
   'The requirement spec has been deleted.' => 'Das Pflichtenheft wurde gelöscht.',
   'The requirement spec has been reverted to version #1.' => 'Das Pflichtenheft wurde auf Version #1 zurückgesetzt.',
@@ -3742,6 +4283,7 @@ $self->{texts} = {
   'The requirement spec template has been saved.' => 'Die Pflichtenheftvorlage wurde gespeichert.',
   'The rfq has been deleted'    => 'Die Anfrage wurde gelöscht',
   'The rfq has been saved'      => 'Die Anfrage wurde gespeichert',
+  'The scanned code is not a valid QR bill.' => 'Der gescannte Code ist keine gültige QR-Rechnung.',
   'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' => 'Der zweite Grund war, dass kivitendo zuließ, dass die Benutzer beliebige, von den tatsächlichen Steuerschlüsseln unabhängige Steuerbeträge eintrugen.',
   'The second way is to use Perl\'s CPAN module and let it download and install the module for you.' => 'Die zweite Variante besteht darin, Perls CPAN-Modul zu benutzen und es das Modul für Sie installieren zu lassen.',
   'The selected bank account does not exist anymore.' => 'Das ausgewählte Bankkonto existiert nicht mehr.',
@@ -3749,7 +4291,8 @@ $self->{texts} = {
   'The selected currency'       => 'Die ausgewählte Währung',
   'The selected database is still configured for client "#1". If you delete the database that client will stop working until you re-configure it. Do you still want to delete the database?' => 'Die auswählte Datenbank ist noch für Mandant "#1" konfiguriert. Wenn Sie die Datenbank löschen, wird der Mandanten nicht mehr funktionieren, bis er anders konfiguriert wurde. Möchten Sie die Datenbank trotzdem löschen?',
   'The selected exports have been closed.' => 'Die ausgewählten Exporte wurden abgeschlossen.',
-  'The selected exports have been undone.' => 'Die ausgwählten Exporte wurden rückgängig gemacht.',
+  'The selected exports have been undone.' => 'Die ausgewählten Exporte wurden rückgängig gemacht.',
+  'The selected quotations where closed.' => 'Die ausgewählten Angebote/Preisanfragen wurden geschlossen.',
   'The selected warehouse does not exist.' => 'Das ausgewählte Lager existiert nicht.',
   'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => 'Das ausgewählte Lager ist leer, oder in ihm wurden keine zu den Sucheinstellungen passenden eingelagerten Artikel gefunden.',
   'The session has expired. Please log in again.' => 'Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.',
@@ -3765,7 +4308,11 @@ $self->{texts} = {
   'The shop part wasn\'t updated. #1' => 'Der Artikel ist nicht aktualisiert: #1',
   'The source warehouse does not contain any bins.' => 'Das Quelllager enthält keine Lagerplätze.',
   'The start date is missing.'  => 'Das Startdatum fehlt.',
+  'The stock is to low: #1.'    => 'Der Bestand ist zu niedrig: #1.',
   'The stock will be changed to your target quantity.' => 'Der Lagerbestand wird auf Ihre gezählte Zielmenge geändert.',
+  'The storno credit note has been deleted' => 'Die Stornogutschrift wurde gelöscht',
+  'The storno invoice has been deleted' => 'Die Stornorechnung wurde gelöscht',
+  'The strono invoice for advance payment has been deleted' => 'Die Storno-Anzahlungsrechnung wurde gelöscht',
   'The subject is missing.'     => 'Der Betreff fehlt.',
   'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' => 'Die Tabellen zum Speichern der Benutzerdaten und zur Benutzerauthentifizierung wurden nicht gefunden. Sie werden in der folgenden Datenbank angelegt:',
   'The tabulator character'     => 'Das Tabulator-Symbol',
@@ -3799,7 +4346,7 @@ $self->{texts} = {
   'The user can chose which client to connect to during login.' => 'Bei der Anmeldung kann der Benutzer auswählen, welchen Mandanten er benutzen möchte.',
   'The user cannot be deleted as it is used in the following clients: #1' => 'Die BenutzerIn kann nicht gelöscht werden, da sie für die folgenden Mandanten benötigt wird: #1',
   'The user could not be deleted.' => 'Der Benutzer konnte nicht gelöscht werden.',
-  'The user group could not be deleted.' => 'Die Benutzergurppe konnte nicht gelöscht werden.',
+  'The user group could not be deleted.' => 'Die Benutzergruppe konnte nicht gelöscht werden.',
   'The user group has been created.' => 'Die Benutzergruppe wurde erstellt.',
   'The user group has been deleted.' => 'Die Benutzergruppe wurde gelöscht.',
   'The user group has been saved.' => 'Die Benutzergruppe wurde gespeichert.',
@@ -3809,6 +4356,7 @@ $self->{texts} = {
   'The value \'#1\' is not a valid IBAN.' => 'Der Wert \'#1\' ist keine gültige IBAN.',
   'The value \'our routing id at customer\' must be set in the customer\'s master data for profile #1.' => 'Der Wert »unsere Leitweg-ID beim Kunden« muss in den Kundenstammdaten gesetzt sein für Profil #1.',
   'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' => 'Der Variablenname darf nur aus Zeichen (keine Umlaute), Ziffern und Unterstrichen bestehen. Er muss mit einem Buchstaben beginnen. Beispiel: weihnachtsgruss_verschicken',
+  'The vendor could not be found. Please register the vendor with the exact name from the QR bill as shown below.' => 'Der Lieferant konnte nicht gefunden werden. Bitte registrieren Sie den Lieferanten mit dem exakten Namen aus der QR-Rechnung wie unten angezeigt.',
   'The vendor name is missing.' => 'Der Liefeantenname fehlt.',
   'The version number is missing.' => 'Die Versionsnummer fehlt.',
   'The warehouse could not be deleted because it has already been used.' => 'Das Lager konnte nicht gelöscht werden, da es bereits in Benutzung war.',
@@ -3821,6 +4369,7 @@ $self->{texts} = {
   'Then go to the database administration and chose "create database".' => 'Dann gehen Sie in den Datenbankverwaltung, und wählen Sie dort "Datenbank anlegen" aus.',
   'There are #1 more open invoices for this customer with other currencies.' => 'Es gibt #1 weitere offene Rechnungen für diesen Kunden, die in anderen Währungen ausgestellt wurden.',
   'There are #1 more open invoices from this vendor with other currencies.' => 'Es gibt #1 weitere offene Rechnungen von diesem Lieferanten, die in anderen Währungen ausgestellt wurden.',
+  'There are #1 of "#2" missing from the bin #3 for transfer.' => 'Es fehlen #1 von "#2" auf dem Lagerplatz #3 zum Auslagern',
   'There are #1 unfinished follow-ups of which #2 are due.' => 'Es gibt #1 Wiedervorlage(n), von denen #2 fällig ist/sind.',
   'There are Bins defined in your Inventory.' => 'Unter Stammdaten/Waren sind Lagerplätze definiert.',
   'There are Bins defined in your master data.' => 'Unter Stammdaten/Waren sind Lagerplätze defininert',
@@ -3834,17 +4383,23 @@ $self->{texts} = {
   'There are entries in tax where taxkey is NULL.' => 'In der Datenbank sind Steuern ohne Steuerschlüssel vorhanden (in der Tabelle tax Spalte taxkey).',
   'There are invalid taxnumbers in use.' => 'Es werden ungültige Steuerautomatik-Konten benutzt.',
   'There are invalid transactions in your database.' => 'Sie haben ungültige Buchungen in Ihrer Datenbank.',
+  'There are mulitple vendors selected' => 'Es sind mehrere Lieferanten ausgewählt',
   'There are no documents in the WebDAV directory at the moment.' => 'Es befinden sich im WebDAV-Verzeichnis momentan keine Dokumente.',
   'There are no entries in the background job history.' => 'Es gibt keine Einträge im Hintergrund-Job-Verlauf.',
   'There are no entries that match the filter.' => 'Es gibt keine Einträge, auf die der Filter zutrifft.',
   'There are no items in stock.' => 'Dieser Artikel ist nicht eingelagert.',
   'There are no items on your TODO list at the moment.' => 'Ihre Aufgabenliste enthält momentan keine Einträge.',
+  'There are no items selected' => 'Es wurden keine Positionen ausgewählt',
+  'There are no orders for the selected time period.' => 'Es gibt für den ausgewählten Zeitraum keine Aufträge.',
   'There are no record templates yet.' => 'Es gibt noch keine Belegvorlagen.',
+  'There are parts with multiple chargenumbers or bestbefore dates set. This can\'t be decided automatically. Pleas transfer this delivery order manually. Can\'t decided for #1.' => 'Es gibt Waren mit mehreren Chargennummern oder Mindesthaltbarkeiten. Es kann nicht automatisch entscheiden werden. Bitte diesen Lieferschein mauell auslagern. Kann nicht entschieden werden für: #1',
+  'There are parts with no reclamation reason at position:' => 'Es gibt Artikel mit keinem Reklamationsgrund an Position:',
   'There are several options you can handle this problem, please select one:' => 'Bitte wählen Sie eine der folgenden Optionen, um mit dem Problem umzugehen:',
+  'There are some errors in the file and it was requested to not save any datasets on errors.' => 'Es sind Fehler aufgetreten und es sollen bei Fehlern überhaupt keine Datensätze gespeichert werden.',
   'There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?' => 'Einige der Lagerbewegungen sind nicht vollständig und Lagerbewegungen können nachträglich nicht mehr verändert werden. Möchten Sie wirklich fortfahren?',
   'There are undefined currencies in your system.' => 'In Ihrer Datenbank wurden Währungen benutzt, die nicht ordnungsgemäß in den Währungen eingetragen wurden.',
   'There are usually three ways to install Perl modules.' => 'Es gibt normalerweise drei Arten, ein Perlmodul zu installieren.',
-  'There is a better discount available' => 'Es is ein besserer Rabatt verfügbar',
+  'There is a better discount available' => 'Es ist ein besserer Rabatt verfügbar',
   'There is a better price available' => 'Es ist ein besserer Preis verfügbar',
   'There is already a taxkey 0 with tax rate not 0.' => 'Es existiert bereits ein Steuerschlüssel mit Steuersatz ungleich 0%.',
   'There is an inconsistancy in your database.' => 'In Ihrer Datenbank sind Unstimmigkeiten vorhanden.',
@@ -3858,6 +4413,7 @@ $self->{texts} = {
   'There is one or more sections for which no part has been assigned yet; therefore creating the new record is not possible yet.' => 'Es gibt einen oder mehrere Abschnitte ohne Artikelzuweisung; daher kann der neue Beleg noch nicht erstellt werden.',
   'There was an error deleting the draft' => 'Beim Löschen des Entwurfs ist ein Fehler aufgetretetn',
   'There was an error executing the background job.' => 'Bei der Ausführung des Hintergrund-Jobs trat ein Fehler auf.',
+  'There was an error parsing the csv file: #1' => 'Es gab einen Fehler beim Parsen der CSV Datei: "#1"',
   'There was an error parsing the csv file: #1 in line #2.' => 'Es gab einen Fehler beim Parsen der CSV Datei: "#1" in der Zeile "#2"',
   'There was an error saving the draft' => 'Beim Speichern des Entwurfs ist ein Fehler aufgetretetn',
   'There was an error saving the letter' => 'Ein Fehler ist aufgetreten. Der Brief konnte nicht gespeichert werden.',
@@ -3871,6 +4427,7 @@ $self->{texts} = {
   'This Price Rule is no longer valid' => 'Diese Preisregel ist nicht mehr gültig',
   'This also enables displaying a column with the customer partnumber (new order controller).' => 'Hiermit wird auch die Anzeige der Kunden-Art.-Nr. eingeschaltet (neuer Auftrags-Controller).',
   'This also enables displaying a column with the vendor partnumber (model) (new order controller).' => 'Hiermit wird auch die Anzeige der Lieferanten-Art.-Nr. eingeschaltet (neuer Auftrags-Controller).',
+  'This business has already been added.' => 'Dieser Kunden-/Lieferantentyp wurde bereits hinzugefügt.',
   'This can be done with the following query:' => 'Dies kann mit der folgenden Datenbankabfrage erreicht werden:',
   'This could have happened for two reasons:' => 'Dies kann aus zwei Gründen geschehen sein:',
   'This customer has already been added.' => 'Für diesen Kunden ist bereits ein Preis hinzugefügt.',
@@ -3901,9 +4458,12 @@ $self->{texts} = {
   'This invoice has been canceled already.' => 'Die Rechnung wurde bereits storniert.',
   'This invoice has been linked with a sepa export, undo this first.' => 'Diese Rechnung ist mit einem SEPA-Export verknüpft. Bitte diese Verknüpfung zuerst aufheben.',
   'This invoice has not been posted yet.' => 'Die Rechnung wurde noch nicht gebucht.',
+  'This invoice is marked for direct debit and cannot be selected for a SEPA Export.' => 'Diese Rechnung ist als Lastschrift erfasst worden und sollte vom Lieferanten eingezogen werden',
+  'This invoice is not marked for direct debit and cannot be selected for a SEPA Export.' => 'Diese Rechnung ist nicht als Lastschrift markiert und sollte vom Kunden überwiesen werden',
   'This invoice was added from an order. See there.' => 'Diese Rechnung wurde aus einem Auftrag erstellt. Siehe dort.',
   'This invoice\'s dunning level: #1' => 'Mahnstufe dieser Rechnung: #1',
   'This is a very critical problem.' => 'Dieses Problem ist sehr schwerwiegend.',
+  'This is helpful if you prefer a chronologic order of bank transactions, i.e. the tab all transactions meanwhile you are still able to use the quick add link for the suggested proposals' => 'Das ist nützlich, falls man eine rein chronologische Reihenfolge beim Kontoauszug verbuchen möchte, die Vorschläge werden ja dennoch generiert und sind über den anklickbaren Link auch direkt verfügbar.',
   'This is the client to be selected by default on the login screen.' => 'Dies ist derjenige Mandant, der im Loginbildschirm standardmäßig ausgewählt sein wird.',
   'This is the default bin for parts' => 'Standard-Lagerplatz für Stammdaten/Waren',
   'This is the default warehouse for ignoring onhand' => 'Standardlager für Auslagern ohne Prüfung auf Bestand.',
@@ -3917,24 +4477,30 @@ $self->{texts} = {
   'This option controls the inventory system.' => 'Dieser Parameter legt die Warenbuchungsmethode fest.',
   'This option controls the method used for determining the startdate for the balance report.' => 'Diese Option bestimmt, wie das Startdatum für den Bilanzbericht ermittelt wird',
   'This option controls the method used for profit determination.' => 'Dieser Parameter legt die Berechnungsmethode für die Gewinnermittlung fest.',
+  'This option controls the method used for the automated year-end bookings.' => 'Dieser Parameter legt die Methode für die automatischen Jahresabschluss-Buchungen fest.',
   'This option controls the posting and calculation behavior for the accounting method.' => 'Dieser Parameter steuert die Buchungs- und Berechnungsmethoden für die Versteuerungsart.',
   'This order has already a final invoice.' => 'Dieser Auftrag hat schon eine Schlussrechnung.',
   'This part has already been added.' => 'Dieser Artikel wurde schon hinzugefügt',
+  'This part should not be ordered any more.' => 'Dieser Artikel kann nicht mehr bestellt werden.',
   'This part was already counted for this bin:' => 'Dieser Artikel wurde für diesen Lagerplatz bereits erfasst:',
   'This price has since gone down' => 'Dieser Preis ist mittlerweile niedriger',
   'This price has since gone up' => 'Dieser Preis ist mittlerweile höher',
-  'This record containts obsolete items at position #1' => 'Dieser Beleg enthält ungültige Artikel an Position #1',
+  'This record contains not orderable items at position #1' => 'Dieser Beleg enthält nicht bestellbare Artikel an Position #1',
+  'This record contains obsolete items at position #1' => 'Dieser Beleg enthält ungültige Artikel an Position #1',
   'This record has already been closed.' => 'Dieser Beleg wurde bereits geschlossen.',
   'This record has already been delivered.' => 'Dieser Beleg wurde bereits geliefert.',
   'This record has not been saved yet.' => 'Der Beleg wurde noch nicht gespeichert.',
   'This record has not been stocked in. Proceed?' => 'Dieser Beleg wurde noch nicht eingelagert. Fortfahren?',
   'This record has not been stocked out. Proceed?' => 'Dieser Beleg wurde noch nicht ausgelagert. Fortfahren?',
+  'This record is the final version. Changes have not been saved' => 'Dies ist eine finale Version des Dokuments. Änderungen wurden nicht gespeichert',
+  'This record is the final version. Please create a new sub-version' => 'Diese Version ist nicht mehr bearbeitbar. Bitte erstellen Sie eine neue Unterversion',
   'This requirement spec is currently linked to the following project:' => 'Dieses Pflichtenheft ist mit dem folgenden Projekt verknüpft:',
   'This requirement spec is currently not linked to a project.' => 'Dieses Pflichtenheft ist noch nicht mit einem Projekt verknüpft.',
   'This requires you to manually correct entries for which an automatic conversion failed and to check those for which it succeeded.' => 'Dies erfordert, dass Sie diejenigen Einträge manuell korrigieren, für die die automatische Umstellung fehlschlug, sowie dass Sie diejenigen überprüfen, für die die Umstellung erfolgreich war.',
   'This resets the dunning process for the selected invoices. Posted dunning invoices will not be changed!' => 'Hiermit wird der Mahnprozess für die ausgewählten Rechnungen zurückgesetzt. Bereits gebuchte Rechnungen über Mahngebühren werden nicht geändert!',
   'This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?' => 'Dieser Auftrag besitzt eine aktive Konfiguration für wiederkehrende Rechnungen. Wenn Sie jetzt speichern, so werden alle zukünftig hieraus erzeugten Rechnungen die Änderungen enthalten, nicht aber die bereits erzeugten Rechnungen. Möchten Sie speichern?',
   'This status output will be refreshed every five seconds.' => 'Diese Statusausgabe wird alle fünf Sekunden aktualisiert.',
+  'This sub-version is not yet finalized' => 'Diese Version ist noch in Bearbeitung.',
   'This transaction has to be split into several transactions manually.' => 'Diese Buchung muss manuell in mehrere Buchungen aufgeteilt werden.',
   'This transaction is linked with a AP transaction. Please undo and redo the AP transaction booking if needed.' => 'Diese Buchung ist mit einer Kreditorenbuchung verknüpft. Bitte Löschen oder Ändern Sie die Kreditorenbuchung nötigenfalls.',
   'This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.' => 'Ein oder mehrere Zahlungen des Belegs sind über das Verbuchen von Kontoauszüge erstellt worden, falls notwendig kann eine Neuverbuchung über Zahlungsverkehr -> Bericht Bankbewegung möglich gemacht werden.',
@@ -3946,6 +4512,8 @@ $self->{texts} = {
   'This vendor has already a booking with this invoice number, do you really want to add the same invoice number again?' => 'Es gibt für diesen Lieferant schon einen Beleg mit dieser Rechnungsnummer. Möchten Sie wirklich eine weitere Buchung mit derselben Rechnungsnummer hinzufügen?',
   'This vendor has already been added.' => 'Der Lieferant wurde bereits hinzugefügt.',
   'This vendor number is already in use.' => 'Diese Lieferantennummer wird bereits verwendet.',
+  'This way you can get a similar list of linked records for every record in the same workflow.' => 'So kann eine ähnliche Liste für alle Belege eines Workflows angezeigt werden.',
+  'This will also remove these delivery terms for all customers & vendors.' => 'Damit werden auch alle verknüpften Lieferbedingungen im Kunden- & Lieferantenstamm gelöscht!',
   'This will also remove this pricegroup for all customers.' => 'Damit werden auch alle verknüpften Preisgruppen im Kundenstamm gelöscht!',
   'This will apply a 3% reduction to the master data price before entering it into the record item.' => 'Diese Zeile zieht vom Stammdatenpreis 3% ab, und schlägt den resultierenden Preis vor.',
   'This will be treated as a discount in percent points.' => 'Diese Option schlägt den Wert in Prozentpunkten als Rabatt vor.',
@@ -3980,6 +4548,7 @@ $self->{texts} = {
   'To user login'               => 'Zum Benutzerlogin',
   'Today'                       => 'heute',
   'Toggle marker'               => 'Markierung umschalten',
+  'Toggle selection'            => 'Auswahl umkehren',
   'Too many results (#1 from #2).' => 'Zu viele Artikel (#1 von #2)',
   'Too much recursions in assembly tree (>100)' => 'Zu tiefe Verschachtelung (>100) des Erzeugnisbaum',
   'Top'                         => 'Oben',
@@ -3989,6 +4558,7 @@ $self->{texts} = {
   'Total'                       => 'Summe',
   'Total Fees'                  => 'Kumulierte Gebühren',
   'Total Sales Orders Value'    => 'Auftragseingang',
+  'Total Stock'                 => 'Gesamtbestand',
   'Total number of entries'     => 'Gesamtzahl Einträge',
   'Total stock value'           => 'Gesamter Bestandswert',
   'Total sum'                   => 'Gesamtsumme',
@@ -4000,7 +4570,7 @@ $self->{texts} = {
   'Transaction'                 => 'Buchung',
   'Transaction %d cancelled.'   => 'Buchung %d erfolgreich storniert.',
   'Transaction Date missing!'   => 'Buchungsdatum fehlt!',
-  'Transaction Description is not yet implemented' => 'Vorgangsbezeichnung ist noch nicht implementiert',
+  'Transaction Details'         => 'Transaktionsdetails',
   'Transaction ID missing.'     => 'Die Buchungs-ID fehlt.',
   'Transaction Value'           => 'Umsatz',
   'Transaction Value Currency Code' => 'WKZ Umsatz',
@@ -4022,7 +4592,9 @@ $self->{texts} = {
   'Transdate to'                => 'Kontoauszugsdatum bis',
   'Transfer'                    => 'Umlagern',
   'Transfer Date'               => 'übernommen am',
+  'Transfer Out & Assembly Transfer' => 'Auslagern & Fertigen',
   'Transfer Quantity'           => 'Umlagermenge',
+  'Transfer Status'             => 'Lager Status',
   'Transfer To Stock'           => 'Lagereingang',
   'Transfer all marked'         => 'Markierte übernehmen',
   'Transfer data to Geierlein ELSTER application' => 'Daten in Geierlein ELSTER-Anwendung übernehmen',
@@ -4038,13 +4610,16 @@ $self->{texts} = {
   'Transfer services via default' => 'Falls Ein- /Auslagern über Standardlagerplatz aktiviert ist, auch die Dienstleistungen standardmässig Ein- und Auslagern',
   'Transfer stock'              => 'Lagerbewegungen',
   'Transfer successful'         => 'Lagervorgang erfolgreich',
+  'Transfer undone'             => 'Lagerbewegung rückgängig gemacht',
   'Transfer undone.'            => 'Zurücklagerung erfolgreich',
   'Transferred'                 => 'Übernommen',
+  'Transit Items account'       => 'Konto für durchlaufende Posten',
   'Translation'                 => 'Übersetzung',
   'Translations'                => 'Übersetzungen',
   'Transport and service costs reminder' => 'Transport- und Versandkosten-Erinnerung',
   'Trial Balance'               => 'Summen- und Saldenliste',
   'Trial balance between %s and %s' => 'Summen- und Saldenlisten vom %s bis zum %s',
+  'Try again'                   => 'Erneut versuchen',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Tue'                         => 'Di',
   'Tuesday'                     => 'Dienstag',
@@ -4077,6 +4652,7 @@ $self->{texts} = {
   'Unable to book transactions for bank purpose #1' => 'Konnte die Transaktion für den Bank-Verwendungszweck #1 nicht erfolgreich durchführen.',
   'Unable to reconcile, database transaction failure' => 'Abgleich konnte nicht durchgeführt werden: Datenbank-Transaktionsfehler',
   'Unbalanced Ledger'           => 'Bilanzfehler',
+  'Unblock Bank transfer via SEPA' => 'Überweisung via SEPA entsperren',
   'Unchecked custom variables will not appear in orders and invoices.' => 'Unmarkierte Variablen werden für diesen Artikel nicht in Aufträgen und Rechnungen angezeigt.',
   'Undo SEPA exports'           => 'SEPA-Exporte rückgängig machen',
   'Undo Transfer'               => 'Zurücklagern',
@@ -4084,7 +4660,7 @@ $self->{texts} = {
   'Unfinished follow-ups'       => 'Nicht erledigte Wiedervorlagen',
   'Unfortunately you have no warehouse defined.' => 'Leider, gibt es kein Lager in diesem Mandanten.',
   'Unimport all'                => 'Alle zurück zur Quelle',
-  'Unimport documents'          => 'Importierte Dokumente zurück zurQuelle',
+  'Unimport documents'          => 'Importierte Dokumente zurück zur Quelle',
   'Unit'                        => 'Einheit',
   'Unit (if missing or empty default unit will be used)' => 'Einheit (falls nicht vorhanden oder leer wird die Standardeinheit benutzt)',
   'Unit missing.'               => 'Die Einheit fehlt.',
@@ -4145,6 +4721,7 @@ $self->{texts} = {
   'Use As New'                  => 'Als neu verwenden',
   'Use Balance Sheet'           => 'Bilanz verwenden',
   'Use Datevautomatik'          => 'Datev-Automatik verwenden',
+  'Use END-TO-END-ID to detect duplicates in bank import transactions' => 'Verwende die SEPA END-TO-END-ID zur Duplikatserkennung beim Import der Banküberweisungen',
   'Use Erfolgsrechnung'         => 'Erfolgsrechnung verwenden',
   'Use File Storage backend'    => 'Verwende Dateisystem-Backend',
   'Use Filemanagement'          => 'Verwende Dateimanagement',
@@ -4164,6 +4741,8 @@ $self->{texts} = {
   'Use existing templates'      => 'Vorhandene Druckvorlagen verwenden',
   'Use for Factur-X/ZUGFeRD'    => 'Nutzung mit Factur-X/ZUGFeRD',
   'Use for Swiss QR-Bill'       => 'Nutzung mit Schweizer QR-Rechnung',
+  'Use last created record or create new.' => 'Nutze zuletzt erstellten Beleg oder erstelle einen neuen.',
+  'Use linked items'            => 'Verknüpfte Positionen verwenden',
   'Use master default bin for Default Transfer, if no default bin for the part is configured' => 'Standardlagerplatz für Ein- / Auslagern über Standard-Lagerplatz, falls für die Ware kein expliziter Lagerplatz konfiguriert ist',
   'Use settings from client configuration' => 'Einstellungen aus Mandantenkonfiguration folgen',
   'Use text field for department of contacts' => 'Textfeld für Abteilungen von Ansprechpersonen verwenden',
@@ -4172,6 +4751,7 @@ $self->{texts} = {
   'Use this storage backend for all generated PDF-Files' => 'Verwende dieses Backend für generierte PDF-Dateien',
   'Use this storage backend for all uploaded attachments' => 'Verwende dieses Backend für hochgeladene Dateien',
   'Use this storage backend for uploaded images' => 'Verwende dieses Backend für hochgeladene Bilder',
+  'Use with bank import'        => 'Nutzung mit Bankimport',
   'Useable for sections'        => 'Für Abschnitte nutzbar',
   'Useable for text blocks'     => 'Für Textblöcke nutzbar',
   'Useable for…'                => 'Benutzbar für…',
@@ -4179,6 +4759,7 @@ $self->{texts} = {
   'Used for Sale'               => 'im Verkauf verwenden',
   'Used for assembly #1 #2'     => 'Verwendet für Erzeugnis #1 #2',
   'User'                        => 'Benutzer',
+  'User & Communication'        => 'Benutzer & Kommunikation',
   'User Preferences'            => 'Benutzereinstellungen',
   'User access'                 => 'Benutzerzugriff',
   'User list'                   => 'Benutzerliste',
@@ -4197,10 +4778,14 @@ $self->{texts} = {
   'VN'                          => 'Kred.-Nr.',
   'Valid'                       => 'Gültig',
   'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' => 'Erlaubt sind ganzzahlige Werte und Kommawerte: Beispiel: 4,75h = 4 Stunden und 45 Minuten.',
+  'Valid for Purchase'          => 'Gültig für Einkauf',
+  'Valid for Sales'             => 'Gültig für Verkauf',
   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
   'Valid/Obsolete'              => 'Gültig/ungültig',
+  'Validity'                    => 'Gültigkeit',
   'Value'                       => 'Wert',
+  'Values & Prices'             => 'Werte & Preise',
   'Valutadate'                  => 'Valutadatum',
   'Valutadate from'             => 'Valutadatum von',
   'Valutadate to'               => 'Valutadatum bis',
@@ -4208,8 +4793,11 @@ $self->{texts} = {
   'Variable Description'        => 'Datenfeldbezeichnung',
   'Variable Name'               => 'Datenfeldname (intern)',
   'Vendor'                      => 'Lieferant',
+  'Vendor & Order'              => 'Lieferant & Bestellung',
+  'Vendor & Transaction'        => 'Lieferant & Buchung',
   'Vendor (database ID)'        => 'Lieferant (Datenbank-ID)',
   'Vendor (name)'               => 'Lieferant (Name)',
+  'Vendor Confirmation Number'  => 'Bestätigungsnummer des Lieferanten',
   'Vendor Discount'             => 'Lieferantenrabatt',
   'Vendor GLN'                  => 'GLN des Lieferanten',
   'Vendor Invoice'              => 'Einkaufsrechnung',
@@ -4218,12 +4806,17 @@ $self->{texts} = {
   'Vendor Name'                 => 'Lieferantenname',
   'Vendor Number'               => 'Lieferantennummer',
   'Vendor Order Number'         => 'Bestellnummer beim Lieferanten',
+  'Vendor Part Number'          => 'Lieferantenartikelnummer',
+  'Vendor Record Number'        => 'Lieferantenbelegsnummer',
+  'Vendor and Invoice Number'   => 'Lieferant und Rechnungsnummer',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor missing!'             => 'Lieferant fehlt!',
+  'Vendor not found'            => 'Lieferant nicht gefunden',
   'Vendor saved'                => 'Lieferant gespeichert',
   'Vendor saved!'               => 'Lieferant gespeichert!',
   'Vendor type'                 => 'Lieferantentyp',
+  'Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor #3 exists and whether it has the correct tax ID/VAT ID.' => 'Lieferant mit Umsatzsteuer-ID (#1) und/oder Steuernummer (#2) nicht gefunden. Bitte überprüfen ob der Lieferant #3 existiert und die korrekte Umsatzsteuer-ID/Steuernummer hat.',
   'Vendors'                     => 'Lieferanten',
   'Vendors: VAT ID / taxnumber unique' => 'Lieferanten: UStID / Steuernummer eindeutig',
   'Verrechnungseinheit'         => 'Verrechnungseinheit',
@@ -4234,6 +4827,9 @@ $self->{texts} = {
   'View RFQs'                   => 'Lieferantenanfragen ansehen',
   'View SEPA export'            => 'SEPA-Export-Details ansehen',
   'View background job execution result' => 'Verlauf der Hintergrund-Job-Ausführungen anzeigen',
+  'View contact person report'  => 'Liste der Ansprechpersonen (Bericht) aufrufen',
+  'View customer report'        => 'Kundenliste (Bericht) aufrufen',
+  'View email'                  => 'E-Mail anzeigen',
   'View purchase delivery orders' => 'Einkaufslieferscheine ansehen',
   'View purchase invoices'      => 'Einkaufsrechungen ansehen',
   'View purchase orders'        => 'Lieferantenaufträge ansehen',
@@ -4242,13 +4838,14 @@ $self->{texts} = {
   'View sales invoices and credit notes' => 'Rechnungen und Gutschriften ansehen',
   'View sales orders'           => 'Auftragsbestätigungen ansehen',
   'View sales quotations'       => 'Angebote ansehen',
-  'View sent email'             => 'Verschickte E-Mail anzeigen',
+  'View vendor report'          => 'Lieferantenliste (Bericht) aufrufen',
   'View warehouse content'      => 'Lagerbestand ansehen',
   'View/edit all employees purchase documents' => 'Bearbeiten/ansehen der Einkaufsdokumente aller Mitarbeiter',
   'View/edit all employees sales documents' => 'Bearbeiten/ansehen der Verkaufsdokumente aller Mitarbeiter',
   'WHJournal'                   => 'Lagerbuchungen',
   'WHUsage'                     => 'Lagerentnahme',
   'Warehouse'                   => 'Lager',
+  'Warehouse & Article'         => 'Lager & Artikel',
   'Warehouse (database ID)'     => 'Lager (database ID)',
   'Warehouse (name)'            => 'Lager (Name)',
   'Warehouse From'              => 'Quelllager',
@@ -4261,6 +4858,8 @@ $self->{texts} = {
   'Warehouses'                  => 'Lager',
   'Warn before saving orders with duplicate parts (new controller only)' => 'Beim Speichern warnen, wenn doppelte Artikel in einem Auftrag sind',
   'Warn before saving orders without a delivery date' => 'Warnung ausgeben, falls Aufträge kein Lieferdatum haben.',
+  'Warn before saving reclamations with duplicate parts' => 'Beim Speichern warnen, wenn doppelte Artikel in der Reklamation sind.',
+  'Warn before saving reclamations without a due date' => 'Beim Speichern warnen, wenn die Reklamation kein Fälligkeitsdatum besitzt.',
   'Warn before saving sales orders with missing customer order number (new controller only)' => 'Warnung ausgeben, falls Verkaufsaufträge keine Kundenbestellnummer haben',
   'Warning'                     => 'Warnung',
   'Warning! Loading a draft will discard unsaved data!' => 'Achtung! Beim Laden eines Entwurfs werden ungespeicherte Daten verworfen!',
@@ -4273,8 +4872,10 @@ $self->{texts} = {
   'We need a valid to date'     => 'Es wird ein gültiges bis Datum erwartet',
   'Web shops'                   => 'Webshops',
   'WebDAV'                      => 'WebDAV',
+  'WebDAV is not enabled.'      => 'WebDAV ist nicht aktiviert.',
   'WebDAV link'                 => 'WebDAV-Link',
   'WebDAV save documents'       => 'Belege in WebDAV-Ablage speichern',
+  'WebDAV sync extern'          => 'WebDAV Synchronisation extern',
   'Webserver interface'         => 'Webserverschnittstelle',
   'Webshop'                     => 'Webshop',
   'Webshop Import'              => 'Webshop Import',
@@ -4288,10 +4889,19 @@ $self->{texts} = {
   'What this template contains' => 'Was diese Vorlage enthält',
   'What type of item is this?'  => 'Was ist dieser Artikel?',
   'When converting a requirement spec into a quotation or an oder each section gets converted into a line position in the new record. This is the article used by default for this conversion.' => 'Wenn ein Pflichtenheft in ein Angebot oder Auftrag umgewandelt wird, wird für jeden Abschnitt eine Position im neuen Beleg angelegt. Dies ist der Artikel, der standardmäßig bei dieser Umwandlung genutzt wird.',
+  'When disabled, invoices for payment in advance and final invoices do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Anzahlungs- und Schluss-Rechnungen nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When disabled, purchase order confirmations do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Lieferantenauftragsbestätigungen nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When disabled, purchase quotation intakes do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Angebotseingänge nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When disabled, purchase reclamations do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Einkaufsreklamationen nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When disabled, sales order intakes do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Auftragseingänge nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When disabled, sales reclamations do not show up in the menu and in the workflow actions.' => 'Falls deaktiviert, werden Verkaufsreklamationen nicht im Menü und nicht bei den Workflows angezeigt.',
+  'When using Swiss QR-bill, copy the invoice number to the unstructured message automatically' => 'Bei Schweizer QR-Rechnungen Rechnungsnummer automatisch in die unstrukturierte Mitteilung kopieren',
   'Whether or not to replace variable placeholders such as "<%invdate%>" in texts in positions such as the part description by the record\'s actual value' => 'Ob Variablenplatzhalter wie z.B. <%invdate%> in Positionstexten wie der Artikelbeschreibung durch den tatsächlichen Wert aus dem Beleg ersetzt werden sollen',
   'Which is located at doc/kivitendo-Dokumentation.pdf. Click here: ' => 'Diese befindet sich unter doc/kivitendo-Dokumentation.pdf. Klicken Sie hier:',
   'With Attachments'            => 'Journal mit Anhängen',
   'With Extension Of Time'      => 'mit Dauerfristverlängerung',
+  'With Ignoring Onhand'        => 'Ohne Prüfung auf Bestand',
+  'With closed'                 => 'Mit geschlossenen',
   'With the introduction of clients each client gets its own WebDAV folder.' => 'Mit der Einführung von Mandanten erhält jeder Mandant sein eigenes WebDAV-Verzeichnis.',
   'Without Attachments'         => 'Journal ohne Anhänge',
   'Workflow'                    => 'Workflow',
@@ -4312,12 +4922,16 @@ $self->{texts} = {
   'Wrong taxes recorded'        => 'Gespeicherte Steuern passen nicht zum Steuerschlüssel',
   'Wrong time format (#1)'      => 'Falsches Zeitformat (#1)',
   'X'                           => 'X',
+  'X axis'                      => 'X-Achse',
+  'Y axis'                      => 'Y-Achse',
   'YYYY'                        => 'JJJJ',
   'Year'                        => 'Jahr',
   'Year-end bookings were successfully completed!' => 'Die Jahresabschlußbuchungen wurden erfolgreich durchgeführt!',
   'Year-end closing'            => 'Jahresabschluß',
+  'Year-end closing account'    => 'Jahresabschluss-Konto',
   'Year-end date'               => 'Jahresabschlußdatum',
   'Year-end date missing'       => 'Jahresabschlußdatum fehlt',
+  'Year-end method'             => 'Jahresabschluss-Methode',
   'Yearly'                      => 'jährlich',
   'Yearly taxreport not yet implemented' => 'Jährlicher Steuerreport für dieses Ausgabeformat noch nicht implementiert',
   'Yes'                         => 'Ja',
@@ -4342,7 +4956,7 @@ $self->{texts} = {
   'You cannot modify individual assigments from additional articles to line items.' => 'Eine individuelle Zuordnung der zusätzlichen Artikel zu Positionen kann nicht vorgenommen werden.',
   'You cannot paste function blocks or sub function blocks if there is no section.' => 'Sie können keine Funktionsblöcke oder Unterfunktionsblöcke einfügen, wenn es noch keinen Abschnitt gibt.',
   'You cannot use a negative amount with debit/credit!' => 'Sie dürfen für Soll/Haben keine negativen Werte benutzen!',
-  'You do not have access to any custom data export.' => 'Sie haben auf keine benutzerdefinierten Datenexporte Zugriff.',
+  'You do not have access to any custom report.' => 'Sie haben auf keine benutzerdefinierten Berichte Zugriff.',
   'You do not have permission to access this entry.' => 'Sie verfügen nicht über die Berechtigung, auf diesen Eintrag zuzugreifen.',
   'You do not have the permissions to access this function.' => 'Sie verfügen nicht über die notwendigen Rechte, um auf diese Funktion zuzugreifen.',
   'You don\'t have the rights to edit this customer.' => 'Sie verfügen nicht über die erforderlichen Rechte, um diesen Kunden zu bearbeiten.',
@@ -4380,29 +4994,36 @@ $self->{texts} = {
   'Your download does not exist anymore. Please re-run the DATEV export assistant.' => 'Ihr Download existiert nicht mehr. Bitte starten Sie den DATEV-Exportassistenten erneut.',
   'Your import is being processed.' => 'Ihr Import wird verarbeitet',
   'Your target quantity will be added to the stocked quantity.' => 'Ihre gezählte Zielmenge wird zum Lagerbestand hinzugezählt.',
+  'ZIPcode'                     => 'PLZ',
+  'ZUGFeRD Import. Type: #1'    => 'ZUGFeRD Import. Typ: #1',
   'Zeitraum'                    => 'Zeitraum',
   'Zero amount posting!'        => 'Buchung ohne Wert',
   'Zip'                         => 'PLZ',
   'Zip, City'                   => 'PLZ, Ort',
   'Zipcode'                     => 'PLZ',
+  'Zipcode (Shipping)'          => 'PLZ (Lieferung)',
   'Zipcode and city'            => 'PLZ und Stadt',
+  'Zipcode missing or wrong format.' => 'Postleitzahl fehlt oder falsches Format.',
   '[email]'                     => '[email]',
+  'above the positions'         => 'über den Positionen',
   'absolute'                    => 'absolut',
+  'account'                     => 'konto',
   'account_description'         => 'Beschreibung',
   'accrual'                     => 'Soll-Versteuerung',
   'action= not defined!'        => 'action= nicht definiert!',
   'active'                      => 'aktiv',
   'all'                         => 'Alle',
   'all entries'                 => 'alle Einträge',
+  'always'                      => 'immer',
   'and'                         => 'und',
   'ap_aging_list'               => 'liste_offene_verbindlichkeiten',
   'ar_aging_list'               => 'liste_offene_forderungen',
-  'ar_chart isn\'t a valid chart' => 'Das Forderungskonto ist kein gültiges Konto.',
   'article_list'                => 'article_list',
   'as at'                       => 'zum Stand',
   'assembled'                   => 'Gefertigt',
   'assembly'                    => 'Erzeugnis',
   'assembly_list'               => 'erzeugnisliste',
+  'at'                          => 'um',
   'averaged values, in invoice mode only useful when filtered by a part' => 'gemittelte Werte, im Rechnungsmodus nur sinnvoll wenn nach Artikel gefiltert wird',
   'averconsumed_br'             => 'Ø mtl.',
   'back'                        => 'zurück',
@@ -4410,24 +5031,28 @@ $self->{texts} = {
   'backend "#1" not enabled'    => 'Dateimanagement-Subsystem "#1" nicht aktiviert',
   'backend "#1" not found'      => 'Dateimanagement-Subsystem "#1" unbekannt',
   'balance'                     => 'Betriebsvermögensvergleich/Bilanzierung',
+  'bank transaction exchange rate' => 'Bankbuchungswechselkurs',
   'bank_collection_payment_list_#1' => 'bankeinzugszahlungsliste_#1',
   'bank_transfer_payment_list_#1' => 'ueberweisungszahlungsliste_#1',
   'banktransfers'               => 'ueberweisungen',
   'basis for stock value'       => 'Grundlage für Bestandswert',
+  'below the positions'         => 'unter den Positionen',
   'bestbefore #1'               => 'Mindesthaltbarkeit #1',
   'bin_list'                    => 'Lagerliste',
   'bis'                         => 'bis',
   'brutto'                      => 'brutto',
   'building data'               => 'Verarbeite Daten',
   'building report'             => 'Erstelle Bericht',
+  'by'                          => 'von',
   'can not allocate #1 units of #2, missing #3 units' => 'Kann keine #1 Einheiten von #2 belegen, es fehlen #3 Einheiten',
   'can not allocate enough resources for production' => 'Kann nicht genug Mengen für die Produktion belegen',
-  'can only parse a pdf file'   => 'Kann nur eine gültige PDF-Datei verwenden.',
+  'can only parse a pdf or xml file' => 'Kann nur eine gültige PDF- oder XML-Datei verwenden.',
   'cash'                        => 'Ist-Versteuerung',
   'chargenumber #1'             => 'Chargennummer #1',
   'chart_of_accounts'           => 'kontenuebersicht',
   'cleared'                     => 'Abgeglichen',
   'click here to edit cvars'    => 'Klicken Sie hier, um nach benutzerdefinierten Variablen zu suchen',
+  'click on a group to add the group\'s users' => 'auf eine Gruppe klicken, um alle Gruppenmitglieder auszuwählen',
   'close'                       => 'schließen',
   'closed'                      => 'geschlossen',
   'companylogo_subtitle'        => 'Lizenziert für',
@@ -4442,13 +5067,15 @@ $self->{texts} = {
   'cp_greeting to cp_gender migration' => 'Datenumwandlung von Titel nach Geschlecht (cp_greeting to cp_gender)',
   'customer_list'               => 'kundenliste',
   'dated'                       => 'datiert',
+  'default'                     => 'Standard',
+  'default exchange rate'       => 'Tageskurs',
   'delete'                      => 'Löschen',
   'delete item'                 => 'Position löschen',
   'delete order'                => 'Bestellung löschen',
   'deleted'                     => 'gelöscht',
   'delivered'                   => 'geliefert',
   'deliverydate'                => 'Lieferdatum',
-  'difference as skonto'        => 'Differenz als Skonto',
+  'desktop version'             => 'Desktop-Version',
   'direct debit'                => 'Lastschrifteinzug',
   'disposed'                    => 'Entsorgung',
   'disposed_br'                 => 'Entsgt.',
@@ -4498,7 +5125,8 @@ $self->{texts} = {
   'history search engine'       => 'Historien Suchmaschine',
   'http'                        => 'http',
   'https'                       => 'https',
-  'imported'                    => 'Importiert',
+  'imported'                    => 'importiert',
+  'in the time between'         => 'Im Zeitraum',
   'inactive'                    => 'inaktiv',
   'income'                      => 'Einnahmen-Überschuß-Rechnung',
   'internal error (see details)' => 'Interner Fehler (siehe Details)!',
@@ -4519,7 +5147,6 @@ $self->{texts} = {
   'kivitendo has found one or more problems in the general ledger.' => 'kivitendo hat ein oder mehrere Probleme im Hauptbuch gefunden.',
   'kivitendo is about to update the database [ #1 ].' => 'kivitendo wird gleich die Datenbank [ #1 ] aktualisieren.',
   'kivitendo is now able to manage warehouses instead of just tracking the amount of goods in your system.' => 'kivitendo enthält jetzt auch echte Lagerverwaultung anstatt reiner Mengenzählung.',
-  'kivitendo modules'           => 'Module',
   'kivitendo needs to update the authentication database before you can proceed.' => 'kivitendo muss die Authentifizierungsdatenbank aktualisieren, bevor Sie fortfahren können.',
   'kivitendo v#1'               => 'kivitendo v#1',
   'kivitendo v#1 administration' => 'kivitendo v#1 Administration',
@@ -4541,9 +5168,10 @@ $self->{texts} = {
   'monthly'                     => 'monatlich',
   'more'                        => 'mehr',
   'natural person'              => 'natürliche Person',
+  'needed qty'                  => 'benötigte Menge',
   'netto'                       => 'netto',
   'never'                       => 'niemals',
-  'new order controller'        => 'Neuer Auftrags-Controller',
+  'new'                         => 'neuer',
   'next'                        => 'vor',
   'no'                          => 'nein',
   'no article assigned yet'     => 'noch kein Artikel zugewiesen',
@@ -4551,9 +5179,11 @@ $self->{texts} = {
   'no bestbefore'               => 'keine Mindesthaltbarkeit',
   'no chargenumber'             => 'keine Chargennummer',
   'no execution for this client' => 'keine Ausführung für diesen Mandanten',
+  'no partsgroup'               => 'keine Warengruppe',
   'no shipping address'         => 'keine Lieferadresse',
   'no skonto_chart configured for taxkey #1 : #2 : #3' => 'Kein Skontokonto für Steuerschlüssel #1 : #2 : #3',
   'no tax_id in acc_trans'      => 'Keine tax_id in acc_trans',
+  'no undelivered items'        => 'keine ungelieferten Positionen',
   'not a valid DTVF file, expected field header start with \'Umsatz; (..) ;Konto;Gegenkonto\'' => 'Keine gültige DTVF-Datei, die erwartete Kopfzeile startet mit \'Umsatz; (..) ;Konto;Gegenkonto\'',
   'not a valid DTVF file, expected first field in A1 \'DTVF\'' => 'Keine gültige DTVF-Datei, der erwarte Feldwert in A1 ist \'DTVF\'',
   'not configured'              => 'nicht konfiguriert',
@@ -4571,6 +5201,7 @@ $self->{texts} = {
   'oe.pl::search called with unknown type' => 'oe.pl::search mit unbekanntem Typ aufgerufen',
   'old'                         => 'alt',
   'on the same day'             => 'am selben Tag',
+  'once'                        => 'einmalig',
   'one time'                    => 'einmalig',
   'one-time execution'          => 'einmalige Ausführung',
   'only OB Transactions'        => 'nur EB-Buchungen',
@@ -4581,6 +5212,8 @@ $self->{texts} = {
   'part'                        => 'Ware',
   'part \'#\'1 in bin \'#2\' only with qty #3 (need additional #4) and chargenumber \'#5\'.' => 'Artikel \'#1\' im \'#2\' nur mit der Menge #3 (noch #4 benötig) und Chargennummer \'#5\'.',
   'part_list'                   => 'Warenliste',
+  'pdf_records.zip'             => 'pdf_belege.zip',
+  'per month'                   => 'pro Monat',
   'percental'                   => 'prozentual',
   'periodic'                    => 'Aufwandsmethode',
   'perpetual'                   => 'Bestandsmethode',
@@ -4597,10 +5230,17 @@ $self->{texts} = {
   'prospective'                 => 'zukünftig',
   'purchase_delivery_order_list' => 'lieferscheinliste_einkauf',
   'purchase_order'              => 'Auftrag',
+  'purchase_order_confirmation' => 'Lieferantenauftragsbestätigung',
+  'purchase_order_confirmation_list' => 'lieferantenauftragsbestaetigungsliste',
   'purchase_order_list'         => 'lieferantenauftragsliste',
+  'purchase_quotation_intake'   => 'Angebotseingang',
+  'purchase_quotation_intake_list' => 'angebotseingangsliste',
   'qty (to transfer)'           => 'zu bewegende Menge',
   'quarter'                     => 'Vierteljährliche (quartalsweise) Abgabe',
   'quotation_list'              => 'angebotsliste',
+  'reclamation item'            => 'Reklamationsitem',
+  'reclamation reasons'         => 'Reklamationsgründe',
+  'record exchange rate'        => 'Beleg-Wechselkurs',
   'release_material'            => 'Materialausgabebe',
   'renew'                       => 'erneuern',
   'reorder item'                => 'Eintrag umsortieren',
@@ -4618,27 +5258,31 @@ $self->{texts} = {
   'sales_delivery_order_printer' => 'sales_delivery_order_printer',
   'sales_invoice_printer'       => 'Rechnungsdrucker',
   'sales_order'                 => 'Kundenauftrag',
+  'sales_order_intake'          => 'Auftragseingang',
+  'sales_order_intake_list'     => 'auftragseingangsliste',
   'sales_order_list'            => 'auftragsliste',
   'sales_quotation'             => 'Verkaufsangebot',
   'same as periodicity'         => 'stimmt mit Abrechnungsperiodizität überein',
   'saved'                       => 'gespeichert',
-  'saved!'                      => 'gespeichert',
   'saving data'                 => 'Speichere Daten',
   'searched part not for purchase' => 'Gesuchter Artikel ist nicht für den Einkauf',
   'searched part not for sale'  => 'Gesuchter Artikel ist nicht für den Verkauf',
   'semiannually'                => 'halbjährlich',
+  'send failed'                 => 'senden fehlgeschlagen',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'service'                     => 'Dienstleistung',
   'service_list'                => 'dienstleistungsliste',
   'shipped'                     => 'verschickt',
   'shipped_br'                  => 'Verschk.',
+  'simple'                      => 'Einfach',
   'singular first char'         => 'S',
   'sort items'                  => 'Positionen sortieren',
   'start upload'                => 'Hochladen beginnt',
   'stock'                       => 'Einlagerung',
   'stock_br'                    => 'Eingel.',
   'stocktaking'                 => 'Inventur',
+  'storno_invoice'              => 'Stornorechnung',
   'succeeded'                   => 'erfolgreich',
   'sum'                         => 'Summe',
   'supplier_delivery_order_list' => 'lieferscheinliste_beistell',
@@ -4686,7 +5330,9 @@ $self->{texts} = {
   'warehouse_usage_list'        => 'Lagerentnahmeliste',
   'will be set upon posting'    => 'wird beim Buchen vergeben',
   'will be set upon saving'     => 'wird beim Speichern vergeben',
+  'with fuzzy skonto acc. to pt' => 'unscharfes Skonto nach ZB',
   'with skonto acc. to pt'      => 'mit Skonto nach ZB',
+  'with_fuzzy_skonto_pt'        => 'unscharfes Skonto nach ZB',
   'with_skonto_pt'              => 'mit Skonto nach ZB',
   'without skonto'              => 'ohne Skonto',
   'without_skonto'              => 'ohne Skonto',
@@ -4695,6 +5341,7 @@ $self->{texts} = {
   'yes'                         => 'ja',
   'you can find professional help.' => 'finden Sie professionelle Hilfe.',
   '– all available test files –' => '– alle verfügbaren Testdateien –',
+  '✖'                           => '✖',
 };
 
 1;
diff --git a/locale/en/all b/locale/en/all
old mode 100644
new mode 100755
index 7db3e8a1b..930e41b61
--- a/locale/en/all
+++ b/locale/en/all
@@ -12,7 +12,9 @@ use utf8;
 $self->{texts} = {
   ' Date missing!'              => '',
   ' bytes, max='                => '',
+  ' have been set to the state \'paid\'' => '',
   ' missing!'                   => '',
+  ' would be set to the state \'paid\'' => '',
   '"#1" seems to be a faulty list of email addresses. After extracing addresses (#2) too many characters are left.' => '',
   '"#1" seems to be a faulty list of email addresses. No addresses could be extracted.' => '',
   '#1 (custom variable)'        => '',
@@ -20,15 +22,26 @@ $self->{texts} = {
   '#1 additional part(s)'       => '',
   '#1 bank transaction bookings undone.' => '',
   '#1 dunnings have been deleted' => '',
+  '#1 equal or less than #2'    => '',
+  '#1 equal or more than #2'    => '',
+  '#1 equals #2'                => '',
   '#1 h'                        => '',
   '#1 invoice(s) saved.'        => '',
+  '#1 is #2'                    => '',
+  '#1 is after #2'              => '',
+  '#1 is before #2'             => '',
+  '#1 less than #2'             => '',
+  '#1 more than #2'             => '',
   '#1 prices were updated.'     => '',
   '#1 proposal(s) saved.'       => '',
   '#1 proposal(s) with #2 invoice(s) saved.' => '',
+  '#1 salses orders were converted to #2 delivery orders' => '',
   '#1 section(s)'               => '',
   '#1 text block(s) back'       => '',
   '#1 text block(s) front'      => '',
   '%'                           => '',
+  '(0 means fix values)'        => '',
+  '(0 means no scrollbar)'      => '',
   '(recommended) Insert the used currencies in the system. You can simply change the name of the currencies by editing the textfields above. Do not use a name of a currency that is already in use.' => '',
   '*/'                          => '',
   '+'                           => '',
@@ -81,10 +94,13 @@ $self->{texts} = {
   'AP Transaction'              => 'Purchase Transaction',
   'AP Transaction (abbreviation)' => '',
   'AP Transaction Storno (one letter abbreviation)' => '',
+  'AP Transaction Template'     => '',
   'AP Transaction with Storno (abbreviation)' => '',
+  'AP Transaction/AccTrans Item row names' => '',
   'AP Transactions'             => 'Purchase Transactions',
   'AP template suggestions'     => '',
   'AP transaction \'#1\' posted (ID: #2)' => '',
+  'AP transaction posted successfully' => '',
   'AP transactions changeable'  => '',
   'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' => '',
   'AP/AR Aging & Journal'       => '',
@@ -92,9 +108,11 @@ $self->{texts} = {
   'AR Aging'                    => 'Debtor Aging',
   'AR Transaction'              => 'Sales Transaction',
   'AR Transaction (abbreviation)' => '',
+  'AR Transaction Template'     => '',
   'AR Transaction/AccTrans Item row names' => '',
   'AR Transactions'             => 'Sales Transactions',
   'AR transaction \'#1\' posted (ID: #2)' => '',
+  'AR transactions (Dunning Fees)' => '',
   'AR transactions changeable'  => '',
   'ASSETS'                      => '',
   'ATTENTION! If you enabled this feature you can not simply turn it off again without taking care that best_before fields are emptied in the database.' => '',
@@ -146,16 +164,17 @@ $self->{texts} = {
   'Account for interest'        => '',
   'Account for workflow from purchase order to ap transaction' => '',
   'Account number'              => '',
+  'Account number (database ID)' => '',
   'Account number not unique!'  => '',
   'Account number of the goal/source' => '',
   'Account saved!'              => '',
   'Accounting desired'          => '',
   'Accounting method'           => '',
+  'Accounts & Sum'              => '',
   'Accrual'                     => '',
   'Accrual accounting'          => '',
   'Action'                      => '',
   'Actions'                     => '',
-  'Activate kivitendo module'   => '',
   'Active'                      => '',
   'Active shops:'               => '',
   'Active?'                     => '',
@@ -171,6 +190,7 @@ $self->{texts} = {
   'Add Credit Note'             => '',
   'Add Credit Note for this dunning level:' => '',
   'Add Customer'                => '',
+  'Add Customer/Vendor Number'  => '',
   'Add Customer/Vendor Number as a reference add-on for SEPA export.' => '',
   'Add Delivery Note'           => '',
   'Add Delivery Order'          => '',
@@ -180,14 +200,21 @@ $self->{texts} = {
   'Add Follow-Up'               => '',
   'Add Follow-Up for #1'        => '',
   'Add General Ledger Transaction' => '',
+  'Add Invoice'                 => '',
   'Add Invoice for Advance Payment' => '',
   'Add Letter'                  => '',
   'Add Part'                    => '',
+  'Add Parts here!'             => '',
   'Add Price Factor'            => '',
   'Add Printer'                 => '',
   'Add Project'                 => '',
+  'Add Purchase Credit Note'    => '',
   'Add Purchase Delivery Order' => '',
+  'Add Purchase Invoice'        => '',
   'Add Purchase Order'          => '',
+  'Add Purchase Order Confirmation' => '',
+  'Add Purchase Quotation Intake' => '',
+  'Add Purchase Reclamation'    => '',
   'Add Quotation'               => '',
   'Add RFQ'                     => '',
   'Add RMA Delivery Order'      => '',
@@ -197,8 +224,13 @@ $self->{texts} = {
   'Add Sales Delivery Order'    => '',
   'Add Sales Invoice'           => '',
   'Add Sales Order'             => '',
+  'Add Sales Order Confirmation' => '',
+  'Add Sales Order Intake'      => '',
+  'Add Sales Reclamation'       => '',
   'Add Service'                 => '',
   'Add Storno Credit Note'      => '',
+  'Add Storno Invoice'          => '',
+  'Add Storno Invoice for Advance Payment' => '',
   'Add Supplier Delivery Order' => '',
   'Add Transaction'             => '',
   'Add User'                    => '',
@@ -212,9 +244,10 @@ $self->{texts} = {
   'Add business'                => '',
   'Add complexity'              => '',
   'Add counted'                 => '',
-  'Add custom data export query' => '',
+  'Add custom report query'     => '',
   'Add custom variable'         => '',
   'Add department'              => '',
+  'Add document for'            => '',
   'Add document for AP transactions' => '',
   'Add document for AR transactions' => '',
   'Add document for GL transactions' => '',
@@ -244,9 +277,12 @@ $self->{texts} = {
   'Add pricegroup'              => '',
   'Add project status'          => '',
   'Add project type'            => '',
+  'Add reclamation reason'      => '',
   'Add requirement spec status' => '',
   'Add requirement spec type'   => '',
+  'Add rfq/order status'        => '',
   'Add risk level'              => '',
+  'Add row'                     => '',
   'Add section'                 => '',
   'Add shop'                    => '',
   'Add sub function block'      => '',
@@ -254,6 +290,8 @@ $self->{texts} = {
   'Add text block'              => '',
   'Add time recording article'  => '',
   'Add title'                   => '',
+  'Add to basket'               => '',
+  'Add to purchase basket'      => '',
   'Add unit'                    => '',
   'Added sections and function blocks: #1' => '',
   'Added text blocks: #1'       => '',
@@ -262,15 +300,16 @@ $self->{texts} = {
   'Additional Billing Addresses' => '',
   'Additional articles'         => '',
   'Additional articles actions' => '',
-  'Additionally the invoice is marked for direct debit and would have been checked automatically had the bank information been entered.' => '',
-  'Additionally the invoice is not marked for direct debit and would have been checked automatically had the bank information been entered.' => '',
+  'Additional errors:'          => '',
   'Address'                     => '',
   'Address deleted.'            => '',
   'Address is in use and was flagged invalid.' => '',
+  'Admin Login'                 => '',
   'Administration'              => '',
   'Administration area'         => '',
   'Advance turnover tax return' => '',
   'Advance turnover tax return only valid for SKR03 or SKR04' => '',
+  'After'                       => '',
   'After closed period'         => '',
   'Aktion'                      => '',
   'All'                         => '',
@@ -283,6 +322,7 @@ $self->{texts} = {
   'All general ledger entries'  => '',
   'All groups'                  => '',
   'All modules'                 => '',
+  'All parts of vendor odered by onhand' => '',
   'All partsgroups'             => '',
   'All pay postings successfully imported.' => '',
   'All payments have already been posted.' => '',
@@ -295,14 +335,18 @@ $self->{texts} = {
   'All transactions'            => '',
   'All units have either no or exactly one base unit of which they are multiples.' => '',
   'All users'                   => '',
+  'Allocate for Assembly'       => '',
+  'Allocations are not sufficient or overfulfilled' => '',
   'Allocations didn\'t pass constraints' => '',
   'Allow access'                => '',
   'Allow conversion from sales orders to sales invoices' => '',
   'Allow conversion from sales quotations to sales invoices' => '',
   'Allow direct creation of new purchase delivery orders' => '',
   'Allow direct creation of new purchase invoices' => '',
+  'Allow fuzzy skonto for payment bookings' => '',
   'Allow the following users access to my follow-ups:' => '',
   'Allow to delete generated printfiles' => '',
+  'Allowed skonto percentage deviation' => '',
   'Already counted'             => '',
   'Already imported entries (duplicates)' => '',
   'Already imported: '          => '',
@@ -320,6 +364,7 @@ $self->{texts} = {
   'Amount less skonto'          => '',
   'Amount payable'              => '',
   'Amount payable less discount' => '',
+  'Amounts'                     => '',
   'Amounts differ too much'     => '',
   'An error occurred while transferring the file.' => '',
   'An error occurred. Letter could not be deleted.' => '',
@@ -337,9 +382,11 @@ $self->{texts} = {
   'Apply to all parts'          => '',
   'Apply to all transfers'      => '',
   'Apply to parts without booking group' => '',
+  'Apply to selected rows'      => '',
   'Apply to transfers without bin' => '',
   'Apply to transfers without comment' => '',
   'Apply to transfers without warehouse' => '',
+  'Apply with Attachment'       => '',
   'Apply year-end bookings'     => '',
   'Applying #1:'                => '',
   'Approximately #1 prices will be updated.' => '',
@@ -357,12 +404,17 @@ $self->{texts} = {
   'Article'                     => '',
   'Article Code'                => '',
   'Article classification'      => '',
+  'Article data'                => '',
+  'Article details'             => '',
   'Article type'                => '',
   'Articles'                    => '',
   'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' => '',
+  'As of version 3.7 most of the variables are also availabe as a print variable.' => '',
+  'As the view starts from sales orders, normally sales quotations are not included.' => '',
   'Assemblies'                  => '',
   'Assembly'                    => '',
   'Assembly (typeabbreviation)' => 'A',
+  'Assembly Item Number'        => '',
   'Assembly Item Qty'           => '',
   'Assembly Last Cost'          => '',
   'Assembly Number missing!'    => '',
@@ -405,14 +457,21 @@ $self->{texts} = {
   'Authentification tables creation' => '',
   'Author'                      => '',
   'Auto Send?'                  => '',
+  'Automatic'                   => '',
+  'Automatic Foreign Exchange Bank Fees' => '',
   'Automatic date calculation'  => '',
   'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => '',
   'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.' => '',
   'Automatic skonto chart purchase' => '',
   'Automatic skonto chart sales' => '',
+  'Automatically assigned with bank transaction' => '',
+  'Automatically create new bins' => '',
   'Automatically created invoice for fee and interest for dunning %s' => '',
+  'Automatically delete entries for missing files. Ensure that these files are no longer required!' => '',
   'Available'                   => '',
   'Available Prices'            => '',
+  'Available Stock'             => '',
+  'Available amount'            => '',
   'Available qty'               => '',
   'Available to all users'      => '',
   'BALANCE SHEET'               => '',
@@ -435,12 +494,14 @@ $self->{texts} = {
   'Balances'                    => '',
   'Balancing'                   => '',
   'Bank'                        => '',
+  'Bank Account'                => '',
   'Bank Account Id Number (Swiss)' => '',
   'Bank Code'                   => '',
   'Bank Code (long)'            => '',
   'Bank Code Number'            => '',
   'Bank Connection Tax Office'  => '',
   'Bank Connections'            => '',
+  'Bank Fee Booking'            => '',
   'Bank Import'                 => '',
   'Bank Transaction'            => '',
   'Bank Transaction is in a closed period.' => '',
@@ -461,10 +522,13 @@ $self->{texts} = {
   'Bank transfer amount'        => '',
   'Bank transfer payment list for export #1' => '',
   'Bank transfer via SEPA'      => '',
+  'Bank transfer via SEPA is blocked' => '',
+  'Bank transfer via SEPA is unblocked' => '',
   'Bank transfers via SEPA'     => '',
   'Base Transaction Value'      => '',
   'Base Transaction Value Currency Code' => '',
   'Base unit'                   => '',
+  'Basic Article Data'          => '',
   'Basic Data'                  => '',
   'Basic Settings for the Requirement Spec' => '',
   'Basic Settings for the Requirement Spec Template' => '',
@@ -475,6 +539,7 @@ $self->{texts} = {
   'Bcc'                         => '',
   'Bcc E-mail'                  => '',
   'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => '',
+  'Before'                      => '',
   'Before saving a sales order, this article will be checked and a warning is generated.' => '',
   'Belgium'                     => '',
   'Beratername'                 => '',
@@ -488,6 +553,7 @@ $self->{texts} = {
   'Billed extra expenses'       => '',
   'Billing Address'             => '',
   'Billing Periodicity'         => '',
+  'Billing/shipping address'    => '',
   'Billing/shipping address (GLN)' => '',
   'Billing/shipping address (city)' => '',
   'Billing/shipping address (country)' => '',
@@ -507,9 +573,11 @@ $self->{texts} = {
   'Birthday (after conversion)' => '',
   'Birthday (before conversion)' => '',
   'Bis'                         => '',
+  'Block Bank transfer via SEPA' => '',
   'Body'                        => '',
   'Body:'                       => '',
   'Booked'                      => '',
+  'Booking Date'                => '',
   'Booking group'               => '',
   'Booking group #1 needs a valid expense account' => '',
   'Booking group #1 needs a valid income account' => '',
@@ -520,6 +588,7 @@ $self->{texts} = {
   'Booking needs at least one debit and one credit booking!' => '',
   'Bookinggroup/Tax'            => '',
   'Books are open'              => '',
+  'Books closed until:'         => '',
   'Books closed up to'          => '',
   'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' => '',
   'Both'                        => '',
@@ -531,6 +600,7 @@ $self->{texts} = {
   'Business'                    => '',
   'Business Discount'           => '',
   'Business Number'             => '',
+  'Business Type Model'         => '',
   'Business Volume'             => '',
   'Business evaluation'         => '',
   'Business type (database ID)' => '',
@@ -540,13 +610,17 @@ $self->{texts} = {
   'CB Transaction'              => '',
   'CB Transactions'             => '',
   'CC to Employee'              => '',
+  'CKEditor5 Test'              => '',
   'CN'                          => '',
   'CR'                          => '',
   'CSS style for pictures'      => '',
+  'CSS-Documentation'           => '',
   'CSV Export successful!'      => '',
+  'CSV File'                    => '',
   'CSV export'                  => '',
   'CSV export -- options'       => '',
   'CSV import: additional billing addresses' => '',
+  'CSV import: ap transactions' => '',
   'CSV import: ar transactions' => '',
   'CSV import: bank transactions' => '',
   'CSV import: contacts'        => '',
@@ -563,7 +637,10 @@ $self->{texts} = {
   'Calling #1 now'              => '',
   'Can only delete the "Storno zu" part of the cancellation pair.' => '',
   'Can only save template if amounts,i.e. 1 for debit and credit are set.' => '',
+  'Can\'t change data of a linked item. Part: ' => '',
+  'Can\'t change price of a linked item' => '',
   'Can\'t connect to shop. #1'  => '',
+  'Can\'t convert Purchase Reclamation to Credit Note' => '',
   'Can\'t load item without a valid part.id' => '',
   'Cancel'                      => '',
   'Cancel Accounts Payables Transaction' => '',
@@ -572,6 +649,7 @@ $self->{texts} = {
   'Cannot Post AP transaction with tax included!' => '',
   'Cannot add Booking, reason: #1 DB: #2 ' => '',
   'Cannot allocate parts.'      => '',
+  'Cannot calculate Amount and Tax for this booking correctly, please check chart settings' => '',
   'Cannot change transaction in a closed period!' => '',
   'Cannot check correct WebDAV folder' => '',
   'Cannot convert date.'        => '',
@@ -580,10 +658,11 @@ $self->{texts} = {
   'Cannot delete default account!' => '',
   'Cannot delete delivery order!' => '',
   'Cannot delete invoice!'      => '',
-  'Cannot delete order!'        => '',
-  'Cannot delete quotation!'    => '',
   'Cannot delete transaction!'  => '',
   'Cannot delete vendor!'       => '',
+  'Cannot export with documents because some transactions don\'t have a PDF document attached.' => '',
+  'Cannot find a single customer. Maybe there is no customer yet?' => '',
+  'Cannot find a single vendor. Maybe there is no vendor yet?' => '',
   'Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.' => '',
   'Cannot get shippingOrderAddressId for #1' => '',
   'Cannot have a value in both Debit and Credit!' => '',
@@ -594,6 +673,7 @@ $self->{texts} = {
   'Cannot post invoice for a closed period!' => '',
   'Cannot post invoice for advance payment with more than one tax' => '',
   'Cannot post invoice for advance payment with taxincluded' => '',
+  'Cannot post invoice with negative exchange rate' => '',
   'Cannot post invoice!'        => '',
   'Cannot post payment for a closed period!' => '',
   'Cannot post payment!'        => '',
@@ -603,14 +683,13 @@ $self->{texts} = {
   'Cannot post transaction with a debit and credit entry for the same account!' => '',
   'Cannot post transaction!'    => '',
   'Cannot process payment for a closed period!' => '',
+  'Cannot process this invoice: neither VAT ID nor tax ID present.' => '',
   'Cannot remove files!'        => '',
   'Cannot revert a versioned copy.' => '',
   'Cannot safely book imported bank transactions due to lax posting settings for payments' => '',
   'Cannot safely unlink bank transactions, please set the posting configuration for payments to unchangeable.' => '',
   'Cannot save account!'        => '',
-  'Cannot save order!'          => '',
   'Cannot save preferences!'    => '',
-  'Cannot save quotation!'      => '',
   'Cannot send E-mail without customer given' => '',
   'Cannot send E-mail without vendor given' => '',
   'Cannot stock negative amounts' => '',
@@ -628,11 +707,13 @@ $self->{texts} = {
   'Cash'                        => '',
   'Cash accounting'             => '',
   'Cash basis accounting'       => '',
+  'Catch-all'                   => '',
   'Category'                    => '',
   'Cc'                          => '',
   'Cc E-mail'                   => '',
   'Change default bin for this parts' => '',
   'Change kivitendo installation settings (most entries in the \'System\' menu)' => '',
+  'Changeable after posting'    => '',
   'Changed sections and function blocks: #1' => '',
   'Changed text blocks: #1'     => '',
   'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' => '',
@@ -642,12 +723,17 @@ $self->{texts} = {
   'Charge'                      => '',
   'Charge Number'               => '',
   'Charge number'               => '',
+  'Chargenumber'                => '',
   'Chargenumbers'               => '',
   'Charset'                     => '',
   'Chart'                       => '',
+  'Chart Test'                  => '',
   'Chart Type'                  => '',
+  'Chart assignments'           => '',
   'Chart balance'               => '',
   'Chart configuration overview regarding reports' => '',
+  'Chart export'                => '',
+  'Chart export -- options'     => '',
   'Chart list'                  => '',
   'Chart of Accounts'           => '',
   'Chart picker'                => '',
@@ -665,12 +751,12 @@ $self->{texts} = {
   'Check on sales invoice'      => '',
   'Checks'                      => '',
   'Choose "continue" if you want to use this value. Choose "cancel" otherwise.' => '',
-  'Choose Customer'             => '',
   'Choose Outputformat'         => '',
-  'Choose Vendor'               => '',
   'Choose a Tax Number'         => '',
   'Choose bank account for reconciliation' => '',
   'City'                        => '',
+  'City (Shipping)'             => '',
+  'Classification'              => '',
   'Clear'                       => '',
   'Clear fields'                => '',
   'Cleared Balance'             => '',
@@ -687,38 +773,49 @@ $self->{texts} = {
   'Client name'                 => '',
   'Client to assign the existing WebDAV folders to' => '',
   'Client to configure the printers for' => '',
+  'Clients'                     => '',
   'Clients this Group is valid for' => '',
   'Clients this user has access to' => '',
   'Close Books up to'           => '',
   'Close Details'               => '',
   'Close Flash'                 => '',
+  'Close Quotations'            => '',
   'Close SEPA exports'          => '',
   'Close Window'                => '',
   'Close window'                => '',
   'Closed'                      => '',
   'Closing Balance'             => '',
+  'Closing the selected quotations failed: #1' => '',
   'Collective Orders only work for orders from one customer!' => '',
   'Column name'                 => '',
   'Comma'                       => '',
   'Comment'                     => '',
   'Commercial court'            => '',
+  'Communication'               => '',
   'Company'                     => '',
   'Company Name'                => '',
   'Company name'                => '',
   'Company name and address'    => '',
   'Company settings'            => '',
   'Company\'s email signature'  => '',
+  'Company:'                    => '',
   'Compare to'                  => '',
+  'Complete URL for WebDAV sync external, including port and folders, i.e.: https://foo.com:4433/owncloud/kivitendo' => '',
   'Complexities'                => '',
   'Complexity'                  => '',
   'Component Test'              => '',
+  'Conditions'                  => '',
   'Configuration'               => '',
   'Configuration of individual TODO items' => '',
   'Configure'                   => '',
   'Confirm!'                    => '',
   'Confirmation'                => '',
+  'Confirmation Date'           => '',
+  'Confirmation Number'         => '',
+  'Consume average'             => '',
   'Contact'                     => '',
   'Contact Departments'         => '',
+  'Contact Name'                => '',
   'Contact Person'              => '',
   'Contact Person (database ID)' => '',
   'Contact Person (name)'       => '',
@@ -734,9 +831,12 @@ $self->{texts} = {
   'Contra'                      => '',
   'Contra Account'              => '',
   'Contrary to Reduced Master Data this will be shown as discount in records.' => '',
+  'Controls whether the default item input is above (default) or below the positions list in orders and quotations. Can be overridden by user preferences.' => '',
   'Conversion of "birthday" contact person attribute' => '',
   'Conversion to PDF failed: #1' => '',
   'Conversion:'                 => '',
+  'Convert to delivery orders'  => '',
+  'Converted delivery orders'   => '',
   'Converting to deliveryorder' => '',
   'Copies'                      => '',
   'Copy'                        => '',
@@ -751,6 +851,7 @@ $self->{texts} = {
   'Could not create new project #1' => '',
   'Could not extract Factur-X/ZUGFeRD data, data and error message:' => '',
   'Could not find an entry for this part in the pricegroup.' => '',
+  'Could not find email import(s): ' => '',
   'Could not load class #1 (#2): "#3"' => '',
   'Could not load class #1, #2' => '',
   'Could not load employee'     => '',
@@ -758,18 +859,27 @@ $self->{texts} = {
   'Could not load this customer' => '',
   'Could not load this draft'   => '',
   'Could not load this vendor'  => '',
+  'Could not open ZUGFeRD file for reading: #1' => '',
+  'Could not parse PDF embedded attachment #1: #2' => '',
+  'Could not parse XML Invoice: unknown XML invoice type\nsupported: #1' => '',
   'Could not print dunning.'    => '',
   'Could not reconcile chosen elements!' => '',
   'Could not spawn ghostscript.' => '',
   'Could not spawn the printer command.' => '',
   'Could not update prices!'    => '',
+  'Count'                       => '',
   'Country'                     => '',
+  'Country (Shipping)'          => '',
   'Create'                      => '',
   'Create Chart of Accounts'    => '',
   'Create Dataset'              => '',
   'Create Date'                 => '',
   'Create HTML'                 => '',
+  'Create Invoice'              => '',
   'Create PDF'                  => '',
+  'Create Reclamation'          => '',
+  'Create Sub-Version'          => '',
+  'Create a new article from line' => '',
   'Create a new background job' => '',
   'Create a new client'         => '',
   'Create a new delivery term'  => '',
@@ -794,10 +904,12 @@ $self->{texts} = {
   'Create and edit projects'    => '',
   'Create and edit purchase delivery orders' => '',
   'Create and edit purchase orders' => '',
+  'Create and edit purchase reclamation' => '',
   'Create and edit requirement specs' => '',
   'Create and edit sales delivery orders' => '',
   'Create and edit sales orders' => '',
   'Create and edit sales quotations' => '',
+  'Create and edit sales reclamation' => '',
   'Create and edit shopparts'   => 'Create and edit the parts assigned to a web shop',
   'Create and edit vendor invoices' => '',
   'Create and edit webshops'    => '',
@@ -812,7 +924,10 @@ $self->{texts} = {
   'Create bank transfer via SEPA XML' => '',
   'Create customers and vendors. Edit all vendors. Edit all customers' => '',
   'Create customers and vendors. Edit all vendors. Edit only customers where salesman equals employee (login)' => '',
+  'Create delivery order'       => '',
   'Create first invoice on'     => '',
+  'Create from Record Template' => '',
+  'Create from Workflow'        => '',
   'Create invoice'              => '',
   'Create invoice?'             => '',
   'Create new'                  => '',
@@ -820,17 +935,20 @@ $self->{texts} = {
   'Create new quotation or order' => '',
   'Create new quotation/order'  => '',
   'Create new qutoation/order'  => '',
+  'Create new record.'          => '',
   'Create new templates from master templates' => '',
   'Create new version'          => '',
   'Create one from the context menu by right-clicking on this text.' => '',
   'Create order'                => '',
+  'Create partial order'        => '',
+  'Create purchase order'       => '',
   'Create sales invoices with Factur-X/ZUGFeRD data' => '',
   'Create sales invoices with Swiss QR-bill' => '',
   'Create tables'               => '',
   'Create variant IBAN without reference' => '',
   'Create variant QR-IBAN with QR reference' => '',
-  'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\'' => '',
-  'Create with profile \'Factur-X 1.0.05/ZUGFeRD 2.1.1 extended\' (test mode)' => '',
+  'Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\'' => '',
+  'Create with profile \'Factur-X 1.01.06/ZUGFeRD 2.2 extended\' (test mode)' => '',
   'Create with profile \'XRechnung 2.0.0\'' => '',
   'Create with profile \'XRechnung 2.0.0\' (test mode)' => '',
   'Create, edit and list time recordings' => '',
@@ -842,6 +960,7 @@ $self->{texts} = {
   'Creating invoices'           => '',
   'Creating the PDF failed:'    => '',
   'Creation Date'               => '',
+  'Creation Time'               => '',
   'Credit'                      => '',
   'Credit (one letter abbreviation)' => '',
   'Credit Account'              => '',
@@ -852,6 +971,7 @@ $self->{texts} = {
   'Credit Note'                 => '',
   'Credit Note Date'            => '',
   'Credit Note Number'          => '',
+  'Credit Notes'                => '',
   'Credit Starting Balance'     => '',
   'Credit Tax'                  => '',
   'Credit Tax (lit)'            => '',
@@ -866,6 +986,7 @@ $self->{texts} = {
   'Currency name'               => '',
   'Currency names must be unique.' => '',
   'Currency names must not be empty.' => '',
+  'Currency, Prices & Taxes'    => '',
   'Current / Next Level'        => '',
   'Current Earnings'            => '',
   'Current Employee'            => '',
@@ -882,11 +1003,16 @@ $self->{texts} = {
   'Currently #1 delivery orders can be converted into invoices and printed.' => '',
   'Custom Billing Address'      => '',
   'Custom CSV format'           => '',
+  'Custom Variable'             => '',
   'Custom Variables'            => '',
-  'Custom data export'          => '',
+  'Custom Variables (Abbreviation)' => '',
+  'Custom report'               => '',
   'Custom shipto'               => '',
   'Custom variables for module' => '',
   'Customer'                    => '',
+  'Customer & Contact'          => '',
+  'Customer & Order Information' => '',
+  'Customer &amp; Order'        => '',
   'Customer (database ID)'      => '',
   'Customer (name)'             => '',
   'Customer Discount'           => '',
@@ -898,12 +1024,13 @@ $self->{texts} = {
   'Customer Part Number'        => '',
   'Customer Price'              => '',
   'Customer Proposals'          => '',
+  'Customer Record Number'      => '',
   'Customer deleted!'           => '',
   'Customer details'            => '',
   'Customer missing!'           => '',
   'Customer must not be empty.' => '',
   'Customer not found'          => '',
-  'Customer number invalid. Must be less then or equal to 6 digits after prefix.' => '',
+  'Customer number invalid. Must be less then or equal to 6 digits after non-digits removed.' => '',
   'Customer of assigned order must match customer.' => '',
   'Customer of assigned project must match customer.' => '',
   'Customer saved'              => '',
@@ -919,6 +1046,7 @@ $self->{texts} = {
   'Customer\'s/vendor\'s account number' => '',
   'Customer\'s/vendor\'s bank'  => '',
   'Customer\'s/vendor\'s bank code' => '',
+  'Customer-Vendor Test'        => '',
   'Customer/Vendor'             => '',
   'Customer/Vendor (database ID)' => '',
   'Customer/Vendor Name'        => '',
@@ -935,6 +1063,7 @@ $self->{texts} = {
   'Cutoff Date'                 => '',
   'Czech Republic'              => '',
   'DATEV'                       => '',
+  'DATEV & UStVA'               => '',
   'DATEV - Export Assistent'    => '',
   'DATEV - Pay Postings Import' => '',
   'DATEV Angaben'               => '',
@@ -942,7 +1071,6 @@ $self->{texts} = {
   'DATEV check returned errors:' => '',
   'DATEV configuration'         => '',
   'DATEV expects the encoding to be Western Europe conform (LATIN-1, cp1252). By setting this to "Strict and halt" the DATEV export halts with a error if there is a single character in "Posting Text" which is not LATIN-1 encodeable. By setting this to "Strict but replace" kivitendo will replace the character with a similar one and the export will simply warn about those fields. By setting this to relaxed (UTF-8) the DATEV export encoding will be in kivitendo (UTF-8) encoded and the external import program has to handle this (this may work for DATEV deriviates or future versions of DATEV). Background details: For example turkish characters (Ç) are not valid cp1252 charactes and armenian characters like "Գեղարդ" are probably not replaceable in cp1252' => '',
-  'DATEX - Export Assistent'    => '',
   'DELETED'                     => '',
   'DFV-Kennzeichen'             => '',
   'DR'                          => '',
@@ -980,10 +1108,13 @@ $self->{texts} = {
   'Date of Last Payment'        => '',
   'Date the payment is due in full' => '',
   'Date the payment is due with discount' => '',
+  'Dates'                       => '',
+  'Dates & Numbers'             => '',
   'Datev export encoding'       => '',
   'Datevautomatik'              => '',
   'Datum von'                   => '',
   'Deactivate by default'       => '',
+  'Deadline'                    => '',
   'Dear Sir or Madam,'          => '',
   'Debit'                       => '',
   'Debit (one letter abbreviation)' => '',
@@ -1022,6 +1153,7 @@ $self->{texts} = {
   'Default currency'            => '',
   'Default currency missing!'   => '',
   'Default hourly rate for new customers' => '',
+  'Default means "if no language selected then..."' => '',
   'Default output medium'       => '',
   'Default part for shipping costs' => '',
   'Default printer'             => '',
@@ -1045,17 +1177,21 @@ $self->{texts} = {
   'Delete address'              => '',
   'Delete all'                  => '',
   'Delete for Customers'        => '',
+  'Delete for customers & vendors' => '',
   'Delete links'                => '',
   'Delete picture'              => '',
   'Delete printfiles'           => '',
   'Delete profile'              => '',
   'Delete quotation/order'      => '',
   'Delete requirement spec'     => '',
+  'Delete selected from purchase basket' => '',
+  'Delete selected rows'        => '',
   'Delete shoporder'            => '',
   'Delete template'             => '',
   'Delete text block'           => '',
   'Delete transaction'          => '',
   'Deleted'                     => '',
+  'Deleted email import(s): '   => '',
   'Deleting this type of record has been disabled in the configuration.' => '',
   'Delivered'                   => '',
   'Delivered amount'            => '',
@@ -1084,10 +1220,14 @@ $self->{texts} = {
   'DeliveryOrder'               => '',
   'Denmark'                     => '',
   'Department'                  => '',
+  'Department & Function'       => '',
   'Department (database ID)'    => '',
   'Department (description)'    => '',
   'Department 1'                => '',
+  'Department 1 (Shipping)'     => '',
   'Department 2'                => '',
+  'Department 2 (Shipping)'     => '',
+  'Department Description'      => '',
   'Departments'                 => '',
   'Dependencies'                => '',
   'Dependency loop detected:'   => '',
@@ -1098,15 +1238,18 @@ $self->{texts} = {
   'Description missing!'        => '',
   'Description must not be empty.' => '',
   'Description of #1'           => '',
-  'Design custom data export queries' => '',
+  'Design custom report queries' => '',
   'Destination BIC'             => '',
   'Destination IBAN'            => '',
+  'Destination URL for sync'    => '',
   'Destination bin'             => '',
   'Destination warehouse'       => '',
   'Destination warehouse and bin' => '',
   'Detail view'                 => '',
+  'Detailed information about this contact' => '',
   'Details'                     => '',
-  'Details (one letter abbreviation)' => '',
+  'Details (one letter abbreviation)' => 'D',
+  'Details of article number "#1"' => '',
   'Details: #1'                 => '',
   'Developer Tools'             => '',
   'Dial command missing in kivitendo configuration\'s [cti] section' => '',
@@ -1134,7 +1277,9 @@ $self->{texts} = {
   'Do not leave booking form?'  => '',
   'Do not link to a project.'   => '',
   'Do not modify this position' => '',
+  'Do not order anymore'        => '',
   'Do not run the task server for this client' => '',
+  'Do not save any datasets on errors' => '',
   'Do not set default booking group' => '',
   'Do not set this bin'         => '',
   'Do not set this comment'     => '',
@@ -1153,6 +1298,7 @@ $self->{texts} = {
   'Do you really want to delete the selected objects?' => '',
   'Do you really want to delete this draft?' => '',
   'Do you really want to delete this object?' => '',
+  'Do you really want to delete this reclamation reason?' => '',
   'Do you really want to delete this record template?' => '',
   'Do you really want to mark the selected entries as booked?' => '',
   'Do you really want to print?' => '',
@@ -1160,11 +1306,15 @@ $self->{texts} = {
   'Do you really want to transfer the stock and set this order to delivered?' => '',
   'Do you really want to undo the selected SEPA exports? You have to reassign the export again.' => '',
   'Do you really want to unimport the selected documents?' => '',
+  'Do you really want undo transfers the stock and set this order to undelivered?' => '',
+  'Do you want delete #1 rows?' => '',
   'Do you want to <b>limit</b> your search?' => '',
-  'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' => '',
+  'Do you want to carry this shipping address over to the new purchase document so that the vendor can deliver the goods directly to your customer?' => '',
+  'Do you want to carry this shipping address over to the new purchase reclamation so that the vendor can deliver the goods directly to your customer?' => '',
   'Do you want to overwrite your current title?' => '',
   'Do you want to set the account number "#1" to "#2" and the name "#3" to "#4"?' => '',
   'Do you want to store the existing onhand values into a new warehouse?' => '',
+  'Doc Storage is not enabled'  => '',
   'Document'                    => '',
   'Document Count'              => '',
   'Document Project (database ID)' => '',
@@ -1174,14 +1324,18 @@ $self->{texts} = {
   'Document generating failed. Please check Templates an LateX !' => '',
   'Documentation'               => '',
   'Documentation (in German)'   => '',
+  'Documentation about periodic invoices in a new window/tab' => '',
+  'Documentation about variables in a new window/tab' => '',
   'Documents'                   => '',
   'Documents in the WebDAV repository' => '',
+  'Documents which are allowed to be saved with no positions' => '',
   'Don\'t include a printout of the record with the email' => '',
   'Don\'t include a printout of the record with the email, only selected files' => '',
   'Done'                        => '',
   'Done.'                       => '',
   'Double partnumbers'          => '',
   'Download'                    => '',
+  'Download Documents for exported bookings' => '',
   'Download PDF'                => '',
   'Download PDF, do not print'  => '',
   'Download SEPA XML export file' => '',
@@ -1214,7 +1368,9 @@ $self->{texts} = {
   'Dunning Level missing in row ' => '',
   'Dunning Process Config saved!' => '',
   'Dunning Process started for selected invoices!' => '',
+  'Dunning email'               => '',
   'Dunning level'               => '',
+  'Dunning lock'                => '',
   'Dunning number'              => '',
   'Dunning overview'            => '',
   'Dunning status'              => '',
@@ -1262,14 +1418,20 @@ $self->{texts} = {
   'Edit Follow-Up'              => '',
   'Edit Follow-Up for #1'       => '',
   'Edit General Ledger Transaction' => '',
+  'Edit Invoice'                => '',
   'Edit Invoice for Advance Payment' => '',
   'Edit Letter'                 => '',
   'Edit Part'                   => '',
   'Edit Preferences for #1'     => '',
   'Edit Price Factor'           => '',
   'Edit Printer'                => '',
+  'Edit Purchase Credit Note'   => '',
   'Edit Purchase Delivery Order' => '',
+  'Edit Purchase Invoice'       => '',
   'Edit Purchase Order'         => '',
+  'Edit Purchase Order Confirmation' => '',
+  'Edit Purchase Quotation Intake' => '',
+  'Edit Purchase Reclamation'   => '',
   'Edit Quotation'              => '',
   'Edit RMA Delivery Order'     => '',
   'Edit Request for Quotation'  => '',
@@ -1277,6 +1439,8 @@ $self->{texts} = {
   'Edit Sales Delivery Order'   => '',
   'Edit Sales Invoice'          => '',
   'Edit Sales Order'            => '',
+  'Edit Sales Order Intake'     => '',
+  'Edit Sales Reclamation'      => '',
   'Edit Service'                => '',
   'Edit Storno Credit Note'     => '',
   'Edit Storno Invoice'         => '',
@@ -1297,7 +1461,7 @@ $self->{texts} = {
   'Edit booking group'          => '',
   'Edit business'               => '',
   'Edit complexity'             => '',
-  'Edit custom data export query' => '',
+  'Edit custom report query'    => '',
   'Edit custom shipto'          => '',
   'Edit custom variable'        => '',
   'Edit delivery term'          => '',
@@ -1317,6 +1481,7 @@ $self->{texts} = {
   'Edit price rule'             => '',
   'Edit pricegroup'             => '',
   'Edit prices and discount (if not used, textfield is ONLY set readonly)' => '',
+  'Edit prices for parts, services, assemblies' => '',
   'Edit project'                => '',
   'Edit project #1'             => '',
   'Edit project link'           => '',
@@ -1324,10 +1489,12 @@ $self->{texts} = {
   'Edit project type'           => '',
   'Edit purchase letters'       => '',
   'Edit purchase price rule'    => '',
+  'Edit reclamation reason'     => '',
   'Edit requirement spec'       => '',
   'Edit requirement spec status' => '',
   'Edit requirement spec template' => '',
   'Edit requirement spec type'  => '',
+  'Edit rfq/order status'       => '',
   'Edit risk level'             => '',
   'Edit sales letters'          => '',
   'Edit sales price rule'       => '',
@@ -1352,14 +1519,32 @@ $self->{texts} = {
   'Either there are no open invoices, or you have already initiated bank transfers with the open amounts for those that are still open.' => '',
   'Element disabled'            => '',
   'Email'                       => '',
+  'Email Attachment Preview'    => '',
+  'Email Details'               => '',
+  'Email Journal Workflow'      => '',
+  'Email Sender Dunning'        => '',
+  'Email Sender Letter'         => '',
+  'Email Sender Purchase Delivery Order' => '',
+  'Email Sender Purchase Order' => '',
+  'Email Sender Request Quotation' => '',
+  'Email Sender Sales Delivery Order' => '',
+  'Email Sender Sales Invoice'  => '',
+  'Email Sender Sales Order'    => '',
+  'Email Sender Sales Purchase Invoice' => '',
+  'Email Sender Sales Quotation' => '',
+  'Email Subject Transaction Description' => 'Email Subject includes Transaction Description',
   'Email address'               => '',
   'Email journal'               => '',
+  'Email marked as not obsolete.' => '',
+  'Email marked as obsolete.'   => '',
   'Email of the delivery order recipient' => '',
+  'Email of the dunning recipient' => '',
   'Email of the invoice recipient' => '',
   'Email signature'             => '',
   'Employee'                    => '',
   'Employee #1 saved!'          => '',
   'Employee (database ID)'      => '',
+  'Employee Name'               => '',
   'Employee from the original invoice' => '',
   'Employee must not be empty.' => '',
   'Employees'                   => '',
@@ -1370,6 +1555,7 @@ $self->{texts} = {
   'Enabled modules'             => '',
   'End'                         => '',
   'End date'                    => '',
+  'End to end ID'               => '',
   'Enter longdescription'       => '',
   'Enter the requested execution date or leave empty for the quickest possible execution:' => '',
   'Entries for which automatic conversion failed:' => '',
@@ -1380,6 +1566,7 @@ $self->{texts} = {
   'Equity'                      => '',
   'Erfolgsrechnung'             => '',
   'Error'                       => '',
+  'Error Message'               => '',
   'Error getting QR-Bill type.' => '',
   'Error handling'              => '',
   'Error in database control file \'%s\': %s' => '',
@@ -1394,6 +1581,7 @@ $self->{texts} = {
   'Error when saving: #1'       => '',
   'Error while applying year-end bookings!' => '',
   'Error while creating project with project number of new order number, project number #1 already exists!' => '',
+  'Error while processing email journal (\'#1\') attachments with \'#2\': ' => '',
   'Error while saving shop order #1. DB Error #2. Generic exception #3.' => '',
   'Error with default taxzone'  => '',
   'Error!'                      => '',
@@ -1434,6 +1622,7 @@ $self->{texts} = {
   'Error: Invalid warehouse'    => '',
   'Error: Invalid warehouse id' => '',
   'Error: Invalid warehouse name #1' => '',
+  'Error: Invoice Number missing' => '',
   'Error: More than one source order found' => '',
   'Error: Name missing'         => '',
   'Error: Not enough parts in stock' => '',
@@ -1445,18 +1634,26 @@ $self->{texts} = {
   'Error: Stock problem'        => '',
   'Error: Stocking out would result in stock underrun' => '',
   'Error: Stocking out would result in stock underrun: #1' => '',
+  'Error: This is not a sales reclamation.' => '',
   'Error: Transfer would result in a negative target quantity.' => '',
   'Error: Unit missing or invalid' => '',
+  'Error: Vendor missing'       => '',
   'Error: Warehouse not found'  => '',
   'Error: amount and netamount need to be numeric' => '',
+  'Error: ap transaction doesn\'t validate' => '',
+  'Error: apchart isn\'t an AP chart' => '',
   'Error: ar transaction doesn\'t validate' => '',
   'Error: archart isn\'t an AR chart' => '',
   'Error: booking group missing or invalid' => '',
+  'Error: can\'t find ap chart with accno #1' => '',
   'Error: can\'t find ar chart with accno #1' => '',
+  'Error: chart isn\'t an ap_amount chart' => '',
   'Error: chart isn\'t an ar_amount chart' => '',
   'Error: chart missing'        => '',
   'Error: chart not found'      => '',
+  'Error: invalid acc transactions for this ap row' => '',
   'Error: invalid acc transactions for this ar row' => '',
+  'Error: invalid ap row for this transaction' => '',
   'Error: invalid ar row for this transaction' => '',
   'Error: invalid chart'        => '',
   'Error: invalid chart (accno)' => '',
@@ -1465,7 +1662,9 @@ $self->{texts} = {
   'Error: invnumber already exists' => '',
   'Error: local bank account id doesn\'t match local bank account number' => '',
   'Error: local bank account id doesn\'t match local bank code' => '',
+  'Error: local bank account is not marked for bank import, check settings under System -> Bank Accounts' => '',
   'Error: need amount and netamount' => '',
+  'Error: neither apchart passed, no default payable chart configured' => '',
   'Error: neither archart passed, no default receivables chart configured' => '',
   'Error: taxincluded has to be t or f' => '',
   'Error: taxincluded wasn\'t set' => '',
@@ -1477,6 +1676,8 @@ $self->{texts} = {
   'Errors during conversion:'   => '',
   'Errors during printing:'     => '',
   'Errors in GL transaction:'   => '',
+  'Errors while deleting record:' => '',
+  'Errors while processing: '   => '',
   'Errors: #1'                  => '',
   'Ertrag'                      => '',
   'Ertrag prozentual'           => '',
@@ -1493,9 +1694,12 @@ $self->{texts} = {
   'Exchangerate for payment missing!' => '',
   'Exchangerate missing!'       => '',
   'Execute'                     => '',
-  'Execute a custom data export query' => '',
-  'Execute custom data export \'#1\'' => '',
+  'Execute a custom report query' => '',
+  'Execute custom report \'#1\'' => '',
   'Executed'                    => '',
+  'Execution Date = Invoice Duedate' => '',
+  'Execution Date = Skonto Date' => '',
+  'Execution Date Buffer'       => '',
   'Execution date'              => '',
   'Execution date from'         => '',
   'Execution date to'           => '',
@@ -1520,7 +1724,10 @@ $self->{texts} = {
   'Expense/Asset'               => '',
   'Experimental Features'       => '',
   'Export'                      => '',
+  'Export Documents'            => '',
   'Export Number'               => '',
+  'Export all accounts to CSV (ZIP file)' => '',
+  'Export all accounts to PDF (ZIP file)' => '',
   'Export as CSV'               => '',
   'Export as PDF'               => '',
   'Export date'                 => '',
@@ -1528,6 +1735,7 @@ $self->{texts} = {
   'Export date to'              => '',
   'Export error in transaction #1: Rounding error too large #2' => '',
   'Export error in transaction #1: Unbalanced ledger before next transaction (#2)' => '',
+  'Export format'               => '',
   'Export imported bookings'    => '',
   'Export with CV Charts'       => '',
   'Extend automatically by n months' => '',
@@ -1573,12 +1781,14 @@ $self->{texts} = {
   'Final Invoice'               => '',
   'Final Invoice (one letter abbreviation)' => '',
   'Final Invoice, please use mark as paid manually' => '',
+  'Final Invoices'              => '',
   'Financial Controlling'       => '',
   'Financial Controlling Report' => '',
   'Financial Overview'          => '',
   'Financial controlling report for open sales orders' => '',
   'Financial overview for #1'   => '',
   'Finish'                      => '',
+  'Finished'                    => '',
   'First 20 Lines'              => '',
   'Firstname'                   => '',
   'Fix transaction'             => '',
@@ -1586,6 +1796,7 @@ $self->{texts} = {
   'Fixed value'                 => '',
   'Focus position after update' => '',
   'Folgekonto'                  => '',
+  'Follow ups reminder sent.'   => '',
   'Follow-Up'                   => '',
   'Follow-Up Date'              => '',
   'Follow-Up On'                => '',
@@ -1595,13 +1806,19 @@ $self->{texts} = {
   'Follow-Up saved.'            => '',
   'Follow-Ups'                  => '',
   'Follow-up for'               => '',
+  'Follow-up options'           => '',
   'Following files are deleted:' => '',
   'Following files are unimported:' => '',
   'Following year'              => '',
   'Font'                        => '',
   'Font size'                   => '',
+  'For #1, #2 #3 are missing in bin #4' => '',
+  'For #1, #2 #3 are missing of batch with chargenumber #4 and bestbefore date of #5 in bin #6' => '',
+  'For #1, #2 #3 are missing of batch with chargenumber #4 in bin #5' => '',
+  'For #1, #2 #3 are missing with a bestbefore date of #4 in bin #5' => '',
   'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' => '',
   'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' => '',
+  'For Record Type'             => '',
   'For changeing goto USTVA Config' => '',
   'For further information read this: ' => '',
   'For part "#1" there are missing #2 #3 in the default warehouse/bin "#4/#5".' => '',
@@ -1610,11 +1827,15 @@ $self->{texts} = {
   'For purchase delivery orders, warn on workflow to invoice if not stocked in' => '',
   'For sales delivery orders, warn on workflow to invoice if not stocked out' => '',
   'For sales invoices, warn if invoice has no delivery order as a predecessor' => '',
+  'For this invoice the bank tranfer via SEPA was blocked manually.' => '',
   'For type "customer" the perl module JSON is required. Please check this on system level: $ ./scripts/installation_check.pl' => '',
+  'Force a layout style'        => '',
+  'Forced Layout Style'         => '',
   'Foreign Exchange Gain'       => '',
   'Foreign Exchange Loss'       => '',
   'Form details (second row)'   => '',
   'Format \'#1\' is not supported yet/anymore.' => '',
+  'Formats & Language'          => '',
   'Formula'                     => '',
   'France'                      => '',
   'Free report period'          => '',
@@ -1644,6 +1865,7 @@ $self->{texts} = {
   'Further Invoice for Advance Payment' => '',
   'GL Transaction'              => '',
   'GL Transaction (abbreviation)' => '',
+  'GL Transaction Template'     => '',
   'GL Transactions'             => '',
   'GL search'                   => '',
   'GL template suggestions'     => '',
@@ -1662,6 +1884,8 @@ $self->{texts} = {
   'General settings'            => '',
   'Generate and print sales delivery orders' => '',
   'Generating the document failed: #1' => '',
+  'Generic Presenter Test'      => '',
+  'Generic email send address for this record type.' => '',
   'Germany'                     => '',
   'Get one order'               => '',
   'Get one order by shopordernumber' => '',
@@ -1680,13 +1904,18 @@ $self->{texts} = {
   'Group assignment'            => '',
   'Group list'                  => '',
   'Group membership'            => '',
+  'Groups'                      => '',
   'Groups that are valid for this client for access rights' => '',
   'Groups this user is a member in' => '',
   'Groups valid for this client' => '',
   'HTML'                        => '',
   'HTML Templates'              => '',
   'HTML field'                  => '',
+  'Handling'                    => '',
+  'Handling & Dates'            => '',
+  'Handling & Scope'            => '',
   'Handling of WebDAV'          => '',
+  'Handling, Numbers & Dates'   => '',
   'Hardcopy'                    => '',
   'Has item type'               => '',
   'Has serial number'           => '',
@@ -1697,7 +1926,9 @@ $self->{texts} = {
   'Here'                        => '',
   'Here you only provide the credentials for logging into the database.' => '',
   'Here\'s an example command line:' => '',
+  'Hide Attachment'             => '',
   'Hide Filter'                 => '',
+  'Hide Records'                => '',
   'Hide all details'            => '',
   'Hide buttons'                => '',
   'Hide by default'             => '',
@@ -1709,11 +1940,13 @@ $self->{texts} = {
   'Hide mappings (csv_import)'  => '',
   'Hide settings'               => '',
   'Highest Dunninglevel'        => '',
+  'Hint: DMS Feature has to be activated' => '',
   'Hint: Not all VC Numbers are personal accounts compliant' => '',
   'Hints'                       => '',
   'History'                     => '',
   'History Search'              => '',
   'History Search Engine'       => '',
+  'Home'                        => '',
   'Homepage'                    => '',
   'Host'                        => '',
   'Hourly Rate'                 => '',
@@ -1726,6 +1959,7 @@ $self->{texts} = {
   'ID number'                   => '',
   'ID of own bank account'      => '',
   'ID/Acc_ID'                   => '',
+  'IDs & Dates'                 => '',
   'II'                          => '',
   'III'                         => '',
   'IMPORT'                      => '',
@@ -1744,18 +1978,23 @@ $self->{texts} = {
   'If disabled sales quotations cannot be converted into sales invoices directly.' => '',
   'If disabled, record numbers for sales records & purchase records produced by our side will always be auto-generated and cannot be changed later.' => '',
   'If enabled Factur-X/ZUGFeRD conformant sales invoice PDFs will be created.' => '',
+  'If enabled RFQs, Quotations and Orders can only be send once via email. By creating another subversion the current record gets a minor subversion and can be send again via email.' => '',
   'If enabled a column will be shown in sales and purchase orders that lists both the amount and the value not shipped yet for each item.' => '',
   'If enabled a warning will be shown if a sales invoices is created without having a sales delivery order as a predecessor.' => '',
   'If enabled a warning will be shown in purchase delivery orders on workflow to invoices if positions are not stocked in.' => '',
   'If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).' => '',
   'If enabled a warning will be shown in sales and purchase orders if there the delivery date is empty.' => '',
+  'If enabled a warning will be shown in sales and purchase reclamations if there are two or more positions of the same part.' => '',
+  'If enabled a warning will be shown in sales and purchase reclamations if there the due date is empty.' => '',
   'If enabled a warning will be shown in sales delivery orders if the customer order number is missing.' => '',
   'If enabled a warning will be shown in sales delivery orders on workflow to invoices if positions are not stocked out.' => '',
   'If enabled only those projects that are assigned to the currently selected customer are offered for selection in sales records.' => '',
   'If enabled purchase and sales records cannot be saved if no transaction description has been entered.' => '',
   'If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.' => '',
+  'If enabled the file ending for SEPA exports will be .xml instead of .cct or .cdd' => '',
+  'If enabled the invoice number will be copied to the unstructured message upon booking. If there\'s a message already the invoice number will be appended to it.' => '',
   'If enabled the record links view starts always from the sales order including all sublevels' => '',
-  'If enabled try to overrule the brower\'s back button to prevent double booking of sales invoices.' => '',
+  'If enabled the tab Proposals will not be the default view for bank transaction bookings' => '',
   'If enabled, when saving parts the partsgroup must be not be empty.' => '',
   'If item not found, allow creation of new item' => '',
   'If left empty the default sender from the kivitendo configuration will be used (key \'email_from\' in section \'periodic_invoices\'; current value: #1).' => '',
@@ -1764,12 +2003,15 @@ $self->{texts} = {
   'If searching a part from a document and no part is found then offer to create a new part.' => '',
   'If set to no the \'delivery date\' field for sales orders won\'t be set at all.' => '',
   'If set to no the \'valid until\' field for sales quotation won\'t be set at all.' => '',
+  'If set to yes a percentage deviation will be allowed for otherwise strict skonto bookings. The deviation will booked to the skonto chart and the allowed deviation is also configurable.' => '',
+  'If set to yes and an end-to-end id can be extracted from the transaction this will be used to detect duplicates instead of the transaction purpose.' => '',
   'If the article type is set to \'mixed\' then a column called \'part_type\' or called \'pclass\' must be present.' => '',
   'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' => '',
   'If the counted quantity differs more than this threshold from the quantity in the database, a warning will be shown. Set to 0 to switch of this feature.' => '',
   'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' => '',
   'If the default transfer out always succeed use this bin for negative stock quantity.' => '',
   'If the test mode is enabled, the Factur-X/ZUGFeRD invoices will be flagged so that they\'re only fit to be used for testing purposes.' => '',
+  'If this option is disabled, the bank import is not possible for this account anymore. In the case of invoices and accounts payable and receivable entries, incoming and outgoing payments can then be posted directly to the account manually.' => '',
   'If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.' => '',
   'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => '',
   'If you have not chosen for example the category revenue for a tax and you choose an revenue account to create a transfer in the general ledger, this tax will not be displayed in the tax dropdown.' => '',
@@ -1780,11 +2022,13 @@ $self->{texts} = {
   'If you want to delete such a dataset you have to edit the client(s) that are using the dataset in question and have them use another dataset.' => '',
   'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' => '',
   'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' => '',
+  'Ignore Proposals for Bank Transactions' => '',
   'Ignore faulty positions'     => '',
   'Ignore services for the purchase orders state of delivery' => '',
   'Ignore services for the sales orders state of delivery' => '',
   'Illegal characters have been removed from the following fields: #1' => '',
   'Illegal date'                => '',
+  'Illustrations'               => '',
   'Image'                       => '',
   'Image Upload'                => '',
   'ImagePreview'                => '',
@@ -1796,7 +2040,9 @@ $self->{texts} = {
   'Import Pay Postings'         => '',
   'Import Status'               => '',
   'Import a Factur-X/ZUGFeRD file:' => '',
+  'Import a File'               => '',
   'Import a File:'              => '',
+  'Import a MT940 file:'        => '',
   'Import all'                  => '',
   'Import documents from #1'    => '',
   'Import file'                 => '',
@@ -1812,20 +2058,27 @@ $self->{texts} = {
   'Imported Pay Postings'       => '',
   'Imported entries'            => '',
   'In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.' => '',
+  'In case the amount due is positive, either due date or payment term must be set.' => '',
   'In order to do that hit the button "Delete transaction".' => '',
   'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => '',
   'In order to use kivitendo you have to create at least a client, a user and a group.' => '',
+  'In the following new warehouse ' => '',
   'In the latter case the tables needed by kivitendo will be created in that database.' => '',
   'In-line'                     => '',
   'Inactive'                    => '',
   'Include Exchangerate Difference' => '',
+  'Include a link to the record itself' => '',
   'Include column headings'     => '',
   'Include empty bins'          => '',
   'Include in Report'           => '',
   'Include in drop-down menus'  => '',
   'Include invalid warehouses ' => '',
   'Include invoices with direct debit' => '',
+  'Include links to sales quotations' => '',
   'Include original Invoices?'  => '',
+  'Include sales quotations in the list of linked records, if the view for record links from sales order is enabled.' => '',
+  'Include the record itself in the list of linked records, if the view for record links from sales order is enabled.' => '',
+  'Include the transaction description in the preset email subject.' => 'When sending emails, the transaction description is included in the preset email subject.',
   'Includeable in reports'      => '',
   'Included in reports by default' => '',
   'Including'                   => '',
@@ -1838,6 +2091,7 @@ $self->{texts} = {
   'Increase'                    => '',
   'Individual Items'            => '',
   'Info'                        => '',
+  'Info & Status'               => '',
   'Information'                 => '',
   'Initial version.'            => '',
   'Input from string: #1'       => '',
@@ -1860,6 +2114,7 @@ $self->{texts} = {
   'Introduction of clients'     => '',
   'Inv. Duedate'                => '',
   'Invalid'                     => '',
+  'Invalid YAML Configuration for this job. Reason: malformed YAML Data: #1. Please consult: Program -> Documentation -> HTML -> Configuration of Background-Jobs.' => '',
   'Invalid assembly'            => '',
   'Invalid bin'                 => '',
   'Invalid charge number: #1'   => '',
@@ -1879,10 +2134,13 @@ $self->{texts} = {
   'Inventory quantity must be zero before you can set this assembly obsolete!' => '',
   'Inventory quantity must be zero before you can set this part obsolete!' => '',
   'Inventory system'            => '',
+  'Inventory: #1 transactions executed to clear all inventory slots. Parts: #2' => '',
+  'Inventory: #1 transactions not yet executed to clear all inventory slots. Parts: #2' => '',
   'Invno.'                      => '',
   'Invnumber'                   => '',
   'Invnumber missing!'          => '',
   'Invoice'                     => '',
+  'Invoice (No Dunning Fees)'   => '',
   'Invoice (one letter abbreviation)' => '',
   'Invoice Copy'                => '',
   'Invoice Date'                => '',
@@ -1902,14 +2160,16 @@ $self->{texts} = {
   'Invoice for Advance Payment with Storno (abbreviation)' => '',
   'Invoice for fees'            => '',
   'Invoice has already been storno\'d!' => '',
+  'Invoice items'               => '',
   'Invoice number'              => '',
-  'Invoice number invalid. Must be less then or equal to 7 digits after prefix.' => '',
+  'Invoice number invalid. Must be less then or equal to 14 digits after non-digits removed.' => '',
   'Invoice to:'                 => '',
   'Invoice total'               => '',
   'Invoice total less discount' => '',
   'Invoice with Storno (abbreviation)' => '',
   'Invoices'                    => '',
   'Invoices can only be changed on the day they are posted.' => '',
+  'Invoices for Advance Payment' => '',
   'Invoices with payments cannot be canceled.' => '',
   'Invoices, Credit Notes & AR Transactions' => '',
   'Is Searchable'               => '',
@@ -1921,17 +2181,22 @@ $self->{texts} = {
   'It will not be further modified by any other source, and will be offered in records like this.' => '',
   'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' => '',
   'Italy'                       => '',
+  'Item & Sums'                 => '',
   'Item does not exists in the database' => '',
+  'Item input position for quotations and orders' => '',
   'Item mode'                   => '',
   'Item multi selection with qty' => '',
   'Item values'                 => '',
   'Item variables'              => '',
+  'JS Tests'                    => '',
+  'Jahresverkehrszahlen alt'    => '',
   'Jahresverkehrszahlen neu'    => '',
   'Jan'                         => '',
   'January'                     => '',
   'Job history'                 => '',
   'Journal'                     => '',
   'Journal of Last 10 Transfers' => '',
+  'Journal of Last 20 Transfers' => '',
   'Jul'                         => '',
   'July'                        => '',
   'Jump to'                     => '',
@@ -1949,6 +2214,7 @@ $self->{texts} = {
   'Language'                    => '',
   'Language (database ID)'      => '',
   'Language (name)'             => '',
+  'Language Code'               => '',
   'Language settings'           => '',
   'Languages'                   => '',
   'Languages and translations'  => '',
@@ -1960,17 +2226,26 @@ $self->{texts} = {
   'Last Customer Number'        => '',
   'Last Dunning'                => '',
   'Last Invoice Number'         => '',
+  'Last Numbers / Prefixes'     => '',
   'Last Purchase Delivery Order Number' => '',
+  'Last Purchase Order Confirmation Number' => '',
   'Last Purchase Order Number'  => '',
+  'Last Purchase Quotation Intake Number' => '',
+  'Last Purchase Reclamation Number' => '',
   'Last RFQ Number'             => '',
+  'Last RMA Delivery Order Number' => '',
   'Last Sales Delivery Order Number' => '',
+  'Last Sales Order Intake Number' => '',
   'Last Sales Order Number'     => '',
   'Last Sales Quotation Number' => '',
+  'Last Sales Reclamation Number' => '',
   'Last Service Number'         => '',
+  'Last Supplier Delivery Order Number' => '',
   'Last Transaction'            => '',
   'Last Vendor Number'          => '',
   'Last command output'         => '',
   'Last modification'           => '',
+  'Last modification Time'      => '',
   'Last opening balance or all transactions' => '',
   'Last opening balance or start of year' => '',
   'Last ordernumber'            => '',
@@ -1991,6 +2266,7 @@ $self->{texts} = {
   'Letter saved!'               => '',
   'Letternumber'                => '',
   'Letters'                     => '',
+  'Letzte Buchung'              => '',
   'Liability'                   => '',
   'Limit part selection'        => '',
   'Line Total'                  => '',
@@ -1999,9 +2275,15 @@ $self->{texts} = {
   'Link to'                     => '',
   'Link to invoice'             => '',
   'Link to the following project:' => '',
+  'Linked'                      => '',
   'Linked Records'              => '',
+  'Linked email and attachment to ' => '',
   'Linked invoices'             => '',
+  'Linked to'                   => '',
+  'Linked to...'                => '',
+  'Linking to Record'           => '',
   'Liquidity projection'        => '',
+  'List'                        => '',
   'List Accounts'               => '',
   'List Price'                  => '',
   'List Printers'               => '',
@@ -2017,6 +2299,7 @@ $self->{texts} = {
   'List of jobs'                => '',
   'List of tax zones'           => '',
   'List open SEPA exports'      => '',
+  'List short onhand'           => '',
   'List time recordings of all staff members' => '',
   'Listprice'                   => '',
   'Load'                        => '',
@@ -2031,6 +2314,7 @@ $self->{texts} = {
   'Local bank account'          => '',
   'Local bank code'             => '',
   'Lock'                        => '',
+  'Lock RFQ/Quotation and Order Subversion' => '',
   'Lock System'                 => '',
   'Lock and unlock installation' => '',
   'Lock bookings'               => '',
@@ -2039,6 +2323,10 @@ $self->{texts} = {
   'Lockfile removed!'           => '',
   'Login'                       => '',
   'Login Name'                  => '',
+  'Login details'               => '',
+  'Login for WebDAV sync external' => '',
+  'Login for sync'              => '',
+  'Login name was previously used' => '',
   'Login of User'               => '',
   'Logout'                      => '',
   'Logout now'                  => '',
@@ -2048,6 +2336,7 @@ $self->{texts} = {
   'Long Description (quotations & orders)' => '',
   'Long Description for invoices' => '',
   'Long Description for quotations & orders' => '',
+  'Longdescription dialog size percentage from main window' => '',
   'Longdescription dialog size percentage from main window (0 means fix values)' => '',
   'Loss'                        => '',
   'Loss carried forward account' => '',
@@ -2059,6 +2348,7 @@ $self->{texts} = {
   'MT940 import'                => '',
   'MT940 import preview'        => '',
   'MT940 import result'         => '',
+  'Mailer error #1'             => '',
   'Mails'                       => '',
   'Main Contact Person'         => '',
   'Main Preferences'            => '',
@@ -2071,6 +2361,7 @@ $self->{texts} = {
   'Manage Custom Variables'     => '',
   'Mandantennummer'             => '',
   'Mandate Date of Signature'   => '',
+  'Mandator'                    => '',
   'Mandator ID'                 => '',
   'Mandatory Departments'       => '',
   'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' => '',
@@ -2098,6 +2389,7 @@ $self->{texts} = {
   'May'                         => '',
   'May '                        => '',
   'May set the BCC field when sending emails' => '',
+  'May use Custom Data Report at all' => '',
   'Meaning'                     => '',
   'Media \'#1\' is not supported yet/anymore.' => '',
   'Medium Number'               => '',
@@ -2109,11 +2401,15 @@ $self->{texts} = {
   'Meta tag keywords'           => '',
   'Meta tag title'              => '',
   'Method'                      => '',
+  'Methods & Preferences'       => '',
   'Microfiche'                  => '',
+  'Minimize Panel'              => '',
   'Minimum Amount'              => '',
+  'Minimum order quantity'      => '',
   'Miscellaneous'               => '',
   'Missing \'description\' field.' => '',
   'Missing \'tag\' field.'      => '',
+  'Missing Files'               => '',
   'Missing Method!'             => '',
   'Missing Tax Authoritys Preferences' => '',
   'Missing amount'              => '',
@@ -2121,6 +2417,8 @@ $self->{texts} = {
   'Missing parameter #1 in call to sub #2.' => '',
   'Missing parameter (at least one of #1) in call to sub #2.' => '',
   'Missing parameter for WebDAV file copy' => '',
+  'Missing parts:\nPartnumber\t- Name\t- Onhand\t- ROP\n' => '',
+  'Missing qty'                 => '',
   'Missing taxkeys in invoices with taxes.' => '',
   'Mitarbeiter'                 => '',
   'Mixed (requires column "type" or "pclass")' => '',
@@ -2146,14 +2444,17 @@ $self->{texts} = {
   'Multiple addresses can be entered separated by commas.' => '',
   'MwSt. inkl.'                 => '',
   'Name'                        => '',
+  'Name (Shipping)'             => '',
   'Name 2'                      => '',
   'Name 3'                      => '',
+  'Name and Address'            => '',
   'Name and Street'             => '',
   'Name does not make sense without any bsooqr options' => '',
   'Name in Selected Records'    => '',
   'Name of the goal/source (if field names remote_name and remote_name_1 exist they will be combined into field "remote_name")' => '',
   'Need a image title'          => '',
   'Need a valid Shop Part for updating Part' => '',
+  'Need a workflow for RMA Delivery Order.' => '',
   'Need a workflow for Supplier Delivery Order' => '',
   'Need at least one original position for the workflow Order to Delivery Order!' => '',
   'Need charge number!'         => '',
@@ -2171,6 +2472,7 @@ $self->{texts} = {
   'Net.Turnover'                => '',
   'Netherlands'                 => '',
   'Netto Terms'                 => '',
+  'New Bins'                    => '',
   'New Password'                => '',
   'New Purchase Price Rule'     => '',
   'New Sales Price Rule'        => '',
@@ -2193,25 +2495,30 @@ $self->{texts} = {
   'Next run at'                 => '',
   'No'                          => '',
   'No 1:n or n:1 relation'      => '',
-  'No AP Record Template for this vendor found, please add one' => '',
+  'No AP Record Template for vendor \'#1\' found.' => '',
   'No AP template was found.'   => '',
   'No Billing and ship to address, for Order Number #1 with ID Billing #2 and ID Shipping #3' => '',
   'No Company Address given'    => '',
   'No Company Name given'       => '',
   'No Customer was found matching the search parameters.' => '',
+  'No Dokument found for record \'#1\'. Please deselect it or create a document it.' => '',
+  'No File Management enabled.' => '',
   'No GL template was found.'   => '',
   'No Journal'                  => '',
   'No Order Number'             => '',
   'No Order items fetched'      => '',
   'No Shopdescription'          => '',
   'No Shopimages'               => '',
-  'No VAT Info for this Factur-X/ZUGFeRD invoice, please ask your vendor to add this for his Factur-X/ZUGFeRD data.' => '',
+  'No Vendor'                   => '',
   'No Vendor was found matching the search parameters.' => '',
+  'No account selected. Please select an account.' => '',
   'No action defined.'          => '',
   'No address selected to delete' => '',
   'No article has been selected yet.' => '',
   'No articles have been added yet.' => '',
   'No assembly has been selected yet.' => '',
+  'No attachment'               => '',
+  'No attachments.'             => '',
   'No background job has been created yet.' => '',
   'No bank account chosen!'     => '',
   'No bank account configured for bank code/BIC #1, account number/IBAN #2.' => '',
@@ -2221,12 +2528,14 @@ $self->{texts} = {
   'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' => '',
   'No billing city'             => '',
   'No bins have been added to this warehouse yet.' => '',
+  'No business selected or found!' => '',
   'No carry-over chart configured!' => '',
   'No changes since previous version.' => '',
+  'No city given.'              => '',
   'No clients have been created yet.' => '',
   'No contact selected to delete' => '',
   'No contra account selected!' => '',
-  'No custom data exports have been created yet.' => '',
+  'No custom reports have been created yet.' => '',
   'No customer email'           => '',
   'No customer has been selected yet.' => '',
   'No customer selected or found!' => '',
@@ -2239,6 +2548,7 @@ $self->{texts} = {
   'No email for current user #1 defined.' => '',
   'No email for user with login #1 defined.' => '',
   'No email recipient for customer #1 defined.' => '',
+  'No email sender address given.' => '',
   'No end date given, setting to today' => '',
   'No entries can be imported.' => '',
   'No entries have been imported yet.' => '',
@@ -2251,6 +2561,7 @@ $self->{texts} = {
   'No function blocks have been created yet.' => '',
   'No groups have been created yet.' => '',
   'No internal phone extensions have been configured yet.' => '',
+  'No invoice email found.'     => '',
   'No invoices have been selected.' => '',
   'No part was selected.'       => '',
   'No payment term has been created yet.' => '',
@@ -2263,20 +2574,25 @@ $self->{texts} = {
   'No profit and loss carried forward chart configured!' => '',
   'No profit carried forward chart configured!' => '',
   'No quotations or orders have been created yet.' => '',
+  'No record is selected.'      => '',
+  'No record type is selected.' => '',
   'No report with id #1'        => '',
   'No requirement spec templates have been created yet.' => '',
   'No results.'                 => '',
+  'No row selected.'            => '',
   'No search results found!'    => '',
   'No sections created yet'     => '',
   'No sections have been created so far.' => '',
   'No sections have been created yet.' => '',
   'No shipto city'              => '',
   'No shipto selected to delete' => '',
+  'No standard bin set for #1.' => '',
   'No start date given, setting to #1' => '',
   'No stock to transfer'        => '',
   'No such job #1 in the database.' => '',
   'No summary account'          => '',
   'No superuser credentials were entered.' => '',
+  'No tax found for chart #1'   => '',
   'No template has been selected yet.' => '',
   'No text blocks have been created for this position.' => '',
   'No text has been entered yet.' => '',
@@ -2287,9 +2603,13 @@ $self->{texts} = {
   'No transactions yet.'        => '',
   'No transfers were executed in this export.' => '',
   'No users have been created yet.' => '',
+  'No vaild Factur-X/ZUGFeRD file' => '',
+  'No valid invoice(s) found'   => '',
   'No valid number entered for pricegroup "#1".' => '',
+  'No vendor available'         => '',
   'No vendor has been selected yet.' => '',
   'No vendor selected or found!' => '',
+  'No vendors to add to purchasebasket' => '',
   'No warehouse has been created yet or the quantity of the bins is not configured yet.' => '',
   'No year given for method year' => '',
   'No.'                         => '',
@@ -2303,9 +2623,14 @@ $self->{texts} = {
   'Normalize Customer / Vendor names' => '',
   'Normalize part description and part notes' => '',
   'Not Discountable'            => '',
+  'Not a PDF or XML file'       => '',
   'Not delivered'               => '',
+  'Not delivered amount'        => '',
   'Not done yet'                => '',
   'Not enough in stock for the serial number #1' => '',
+  'Not enough on stock for one or more allocations' => '',
+  'Not implemented yet!'        => '',
+  'Not linked'                  => '',
   'Not obsolete'                => '',
   'Not yet implemented'         => '',
   'Note'                        => '',
@@ -2321,6 +2646,7 @@ $self->{texts} = {
   'Nothing selected!'           => '',
   'Nothing stocked yet.'        => '',
   'Nothing will be created or deleted at this stage!' => '',
+  'Notify me by email for follow-ups' => '',
   'Nov'                         => '',
   'November'                    => '',
   'Number'                      => '',
@@ -2344,6 +2670,9 @@ $self->{texts} = {
   'Number of orders created:'   => '',
   'Number pages'                => '',
   'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => '',
+  'Numbers'                     => '',
+  'Numbers & Dates'             => '',
+  'Numbers & IDs'               => '',
   'OB Transaction'              => '',
   'Objects have been imported.' => '',
   'Obsolete'                    => '',
@@ -2360,6 +2689,7 @@ $self->{texts} = {
   'One of the columns "qty" or "target_qty" must be given. If "target_qty" is given, the quantity to transfer for each transfer will be calculate, so that the quantity for this part, warehouse and bin will result in the given "target_qty" after each transfer.' => '',
   'One of the units used (#1) cannot be mapped to a known unit code from the UN/ECE Recommendation 20 list.' => '',
   'One or more Perl modules missing' => '',
+  'Onhand'                      => '',
   'Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.' => '',
   'Only Lines with Notes or Errors' => '',
   'Only Price'                  => '',
@@ -2368,6 +2698,7 @@ $self->{texts} = {
   'Only due follow-ups'         => '',
   'Only groups that have been configured for the client the user logs in to will be considered.' => '',
   'Only list customer\'s projects in sales records' => '',
+  'Only open'                   => '',
   'Only run tests from this file:' => '',
   'Only shown in item mode'     => '',
   'Oops. No valid action found to dispatch. Please report this case to the kivitendo team.' => '',
@@ -2376,6 +2707,7 @@ $self->{texts} = {
   'Open Amount at Last Payment Date' => '',
   'Open Items'                  => '',
   'Open Orders'                 => '',
+  'Open Panel'                  => '',
   'Open a further kivitendo window or tab' => '',
   'Open amount'                 => '',
   'Open in new window'          => '',
@@ -2391,29 +2723,41 @@ $self->{texts} = {
   'Options'                     => '',
   'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' => '',
   'Order'                       => '',
+  'Order & Articles'            => '',
+  'Order & Numbers'             => '',
+  'Order Confirmation Number'   => '',
   'Order Date'                  => '',
   'Order Date missing!'         => '',
+  'Order Intake'                => '',
   'Order Number'                => '',
   'Order Number missing!'       => '',
+  'Order Size'                  => '',
   'Order amount'                => '',
-  'Order deleted!'              => '',
+  'Order data'                  => '',
   'Order item search'           => '',
-  'Order number invalid. Must be less then or equal to 7 digits after prefix.' => '',
   'Order probability'           => '',
   'Order probability & expected billing date' => '',
+  'Order quantity'              => '',
   'Order value periodicity'     => '',
   'Order/Item row name'         => '',
   'Order/Item/Stock row name'   => '',
   'Order/RFQ Number'            => '',
   'OrderItem'                   => '',
   'Ordered'                     => '',
+  'Ordered purchase'            => '',
+  'Ordered, but not delivered (purchase)' => '',
+  'Orderer'                     => '',
   'Orders'                      => '',
   'Orders / Delivery Orders deleteable' => '',
+  'Orders in Webshop'           => '',
   'Orders to fetch'             => '',
   'Orders to fetch neeeds a positive Integer' => '',
+  'Orders with projectnumber'   => '',
   'Orientation'                 => '',
   'Orig. Size w/h'              => '',
   'Origin of personal data'     => '',
+  'Original Invoice'            => '',
+  'Original Invoices?'          => '',
   'Orphaned'                    => '',
   'Orphaned currencies'         => '',
   'Other Matches'               => '',
@@ -2428,12 +2772,12 @@ $self->{texts} = {
   'Out of balance transaction!' => '',
   'Out of balance!'             => '',
   'Output Number Format'        => '',
+  'Overall Net.Turnover'        => '',
   'Overdue invoices'            => '',
   'Overdue sales quotations and requests for quotations' => '',
   'Override'                    => '',
   'Override invoice language'   => '',
   'Overview'                    => '',
-  'Overview kivitendo modules'  => '',
   'Own bank account number or IBAN' => '',
   'Own bank code'               => '',
   'Owner of account'            => '',
@@ -2443,6 +2787,7 @@ $self->{texts} = {
   'PDF export'                  => '',
   'PDF export -- options'       => '',
   'PDF export with attachments' => '',
+  'PDF-Export'                  => '',
   'PLZ Grosskunden'             => '',
   'POSTED'                      => '',
   'POSTED AS NEW'               => '',
@@ -2454,6 +2799,8 @@ $self->{texts} = {
   'Page #1/#2'                  => '',
   'Paid'                        => '',
   'Paid amount'                 => '',
+  'Parameter module must be given.' => '',
+  'Parsing the XML data failed: #1' => '',
   'Parsing the XMP metadata failed.' => '',
   'Part'                        => '',
   'Part "#1" has chargenumber or best before date set. So it cannot be transfered automatically.' => '',
@@ -2470,9 +2817,14 @@ $self->{texts} = {
   'Part Test'                   => '',
   'Part Type'                   => '',
   'Part Unit'                   => '',
+  'Part added to purchasebasket' => '',
+  'Part already in purchasebasket' => '',
+  'Part already in purchasebasket or has no vendor' => '',
+  'Part already ordered'        => '',
   'Part classifications'        => '',
   'Part marked as "Shop part"'  => '',
   'Part picker'                 => '',
+  'Part picker search dialog (magnifying glass): "all as list" defaults to on' => '',
   'Part successful counted'     => '',
   'Part with partnumber: #1 not found' => '',
   'PartClassAbbreviation'       => '',
@@ -2493,15 +2845,19 @@ $self->{texts} = {
   'Partsgroups'                 => '',
   'Partsgroups where variables are shown' => '',
   'Password'                    => '',
+  'Password for WebDAV sync external' => '',
+  'Password for sync'           => '',
   'Paste'                       => '',
   'Paste template'              => '',
   'Path'                        => '',
   'Payable account'             => '',
+  'Payable account (account number)' => '',
   'Payables'                    => '',
   'Payment'                     => '',
   'Payment / Delivery Options'  => '',
   'Payment Date'                => '',
   'Payment Reminder'            => '',
+  'Payment Term'                => '',
   'Payment Terms'               => '',
   'Payment Terms missing in row ' => '',
   'Payment bookings disallowed. After the booking this record may be suggested with the amount of \'#1\' or otherwise has to be choosen manually. No automatic payment booking will be done to chart \'#2\'.' => '',
@@ -2526,9 +2882,12 @@ $self->{texts} = {
   'Periodic Invoices'           => '',
   'Periodic inventory'          => '',
   'Periodic invoices active'    => '',
+  'Periodic invoices config set to inactive.' => '',
   'Periodic invoices inactive'  => '',
+  'Periods'                     => '',
   'Permissions for invoices'    => '',
   'Perpetual inventory'         => '',
+  'Personal details'            => '',
   'Personal settings'           => '',
   'Phone'                       => '',
   'Phone Notes'                 => '',
@@ -2549,13 +2908,13 @@ $self->{texts} = {
   'Pictures for search parts'   => '',
   'Please Check the bank information for each customer:' => '',
   'Please Check the bank information for each vendor:' => '',
-  'Please add a valid VAT-ID for this vendor: #1' => '',
   'Please ask your administrator to create warehouses and bins.' => '',
   'Please change the partnumber of the following parts and run the update again:' => '',
   'Please choose a part.'       => '',
   'Please choose for which categories the taxes should be displayed (otherwise remove the ticks):' => '',
   'Please choose the action to be processed for your target quantity:' => '',
   'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' => '',
+  'Please configure the year-end closing and the profit or loss carried forward accounts for year-end closing in the client configuration!' => '',
   'Please contact your administrator or a service provider.' => '',
   'Please contact your administrator.' => '',
   'Please correct the settings and try again or deactivate that client.' => '',
@@ -2577,8 +2936,10 @@ $self->{texts} = {
   'Please provide corresponding credentials.' => '',
   'Please re-run the analysis for broken general ledger entries by clicking this button:' => '',
   'Please read the file'        => '',
+  'Please resolve the errors by deleting the invalid database entries or by adding the corresponding files to the expected paths.' => '',
   'Please select a customer from the list below.' => '',
   'Please select a customer.'   => '',
+  'Please select a deadline date.' => '',
   'Please select a delivery date.' => '',
   'Please select a vendor from the list below.' => '',
   'Please select a vendor.'     => '',
@@ -2588,6 +2949,7 @@ $self->{texts} = {
   'Please select which client configurations you want to create.' => '',
   'Please set another taxnumber for the following taxes and run the update again:' => '',
   'Please specify a description for the warehouse designated for these goods.' => '',
+  'Please wait!'                => '',
   'Plural'                      => '',
   'Poland'                      => '',
   'Port'                        => '',
@@ -2599,6 +2961,7 @@ $self->{texts} = {
   'Positions'                   => '',
   'Post'                        => '',
   'Post Payment'                => '',
+  'Post and Close'              => '',
   'Post and new booking'        => '',
   'Post and upload document'    => '',
   'Post payments'               => '',
@@ -2632,14 +2995,19 @@ $self->{texts} = {
   'Preset email body for periodic invoices' => '',
   'Preset email strings'        => '',
   'Preset email subject for periodic invoices' => '',
+  'Preset email text for credit notes' => '',
   'Preset email text for purchase orders' => '',
+  'Preset email text for purchase orders confirmations' => '',
+  'Preset email text for purchase quotation intakes' => '',
+  'Preset email text for purchase reclamations' => '',
   'Preset email text for requests (rfq)' => '',
   'Preset email text for sales delivery orders' => '',
   'Preset email text for sales invoices' => '',
   'Preset email text for sales invoices with direct debit' => '',
+  'Preset email text for sales order intakes' => '',
   'Preset email text for sales orders' => '',
   'Preset email text for sales quotations' => '',
-  'Prevent browser\'s back button in sales invoices' => '',
+  'Preset email text for sales reclamations' => '',
   'Preview'                     => '',
   'Preview Mode'                => '',
   'Previous month'              => '',
@@ -2673,6 +3041,7 @@ $self->{texts} = {
   'Pricegroup'                  => '',
   'Pricegroups'                 => '',
   'Prices'                      => '',
+  'Prices & Discounts'          => '',
   'Print'                       => '',
   'Print and Post'              => '',
   'Print automatically'         => '',
@@ -2701,6 +3070,8 @@ $self->{texts} = {
   'Private E-mail'              => '',
   'Private Phone'               => '',
   'Problem'                     => '',
+  'Processed attachments with function \'#1\':' => '',
+  'Processed successfully: '    => '',
   'Produce'                     => '',
   'Produce Assembly'            => '',
   'Produce Assembly Configuration' => '',
@@ -2714,6 +3085,7 @@ $self->{texts} = {
   'Profit and loss accounts'    => '',
   'Profit carried forward account' => '',
   'Profit determination'        => '',
+  'Profit or loss carried forward account' => '',
   'Proforma Invoice'            => '',
   'Program'                     => '',
   'Project'                     => '',
@@ -2725,6 +3097,7 @@ $self->{texts} = {
   'Project Number'              => '',
   'Project Numbers'             => '',
   'Project Status'              => '',
+  'Project Test'                => '',
   'Project Transactions'        => '',
   'Project Type'                => '',
   'Project Types'               => '',
@@ -2737,6 +3110,7 @@ $self->{texts} = {
   'Projects'                    => '',
   'Projects: edit the list of employees allowed to view invoices' => '',
   'Projecttransactions'         => '',
+  'Promotion Code'              => '',
   'Proposal'                    => '',
   'Proposals'                   => '',
   'Protocol'                    => '',
@@ -2744,29 +3118,45 @@ $self->{texts} = {
   'Prozentual/Absolut'          => '',
   'Purchase'                    => 'Purchase',
   'Purchase (typeabbreviation)' => 'P',
+  'Purchase Credit Note'        => '',
+  'Purchase Credit Notes'       => '',
   'Purchase Delivery Order'     => '',
   'Purchase Delivery Orders'    => '',
   'Purchase Delivery Orders deleteable' => '',
   'Purchase Invoice'            => '',
   'Purchase Invoices'           => '',
   'Purchase Order'              => '',
+  'Purchase Order Confirmation' => '',
+  'Purchase Order Confirmations' => '',
   'Purchase Orders'             => '',
   'Purchase Orders Services are deliverable' => '',
   'Purchase Orders deleteable'  => '',
   'Purchase Price Rules'        => '',
   'Purchase Price Rules '       => '',
+  'Purchase Quotation Intake'   => '',
+  'Purchase Quotation Intakes'  => '',
+  'Purchase Reclamation'        => '',
+  'Purchase Reclamations'       => '',
+  'Purchase Reclamations deleteable' => '',
+  'Purchase basket'             => '',
+  'Purchase basket item not existing any more for position(s): #1.' => '',
   'Purchase delivery order'     => '',
   'Purchase invoices'           => '',
   'Purchase invoices changeable' => '',
   'Purchase net amount'         => '',
   'Purchase price'              => '',
   'Purchase price total'        => '',
+  'Purchasebasket'              => '',
   'Purchasing & Sales'          => '',
   'Purpose'                     => '',
   'Purpose (if field names purpose, purpose1, purpose2 ... exist they will all combined into the field "purpose")' => '',
   'Purpose/Reference'           => '',
+  'QR bill unstructured message' => '',
   'QR bill without amount'      => '',
+  'QR reference'                => '',
+  'QR-Code invalid'             => '',
   'QR-Code placeholder image: QRCodePlaceholder not found in template.' => '',
+  'QR-IBAN (Swiss)'             => '',
   'QR-Image generation failed: ' => '',
   'QUEUED'                      => '',
   'Qty'                         => '',
@@ -2786,6 +3176,7 @@ $self->{texts} = {
   'Quartal'                     => '',
   'Quarter'                     => '',
   'Quarterly'                   => '',
+  'Query Type'                  => '',
   'Query parameters'            => '',
   'Queue'                       => '',
   'Quick Search'                => '',
@@ -2794,9 +3185,9 @@ $self->{texts} = {
   'Quotation'                   => '',
   'Quotation Date'              => '',
   'Quotation Date missing!'     => '',
+  'Quotation Intake'            => '',
   'Quotation Number'            => '',
   'Quotation Number missing!'   => '',
-  'Quotation deleted!'          => '',
   'Quotation/Order Date'        => '',
   'Quotations'                  => '',
   'Quotations and orders'       => '',
@@ -2808,6 +3199,8 @@ $self->{texts} = {
   'RFQ'                         => '',
   'RFQ Date'                    => '',
   'RFQ Number'                  => '',
+  'RFQ/Order Status'            => '',
+  'RFQ/Order Statuses'          => '',
   'RFQs'                        => '',
   'RMA Delivery Order'          => '',
   'RMA Delivery Orders'         => '',
@@ -2816,9 +3209,13 @@ $self->{texts} = {
   'Ranges of numbers'           => '',
   'Re-numbering all sections and function blocks in the order they are currently shown cannot be undone.' => '',
   'Re-run analysis'             => '',
+  'Re-sending a final version was requested, but the latest version of the document could not be found' => '',
   'Read all employee e-mails'   => '',
   'Really cancel link?'         => '',
   'Realm'                       => '',
+  'Reason'                      => '',
+  'Reason Description Extern'   => '',
+  'Reason Description Intern'   => '',
   'Receipt'                     => '',
   'Receipt posted!'             => '',
   'Receipt, payment, reconciliation' => '',
@@ -2830,27 +3227,41 @@ $self->{texts} = {
   'Receivables account (account number)' => '',
   'Received payments can only be posted for sales invoices and purchase credit notes.' => '',
   'Recipients'                  => '',
+  'Reclamation'                 => '',
+  'Reclamation Date'            => '',
+  'Reclamation ID'              => '',
+  'Reclamation Number'          => '',
+  'Reclamation Reason'          => '',
+  'Reclamation Reasons'         => '',
   'Reconcile'                   => '',
   'Reconciliation'              => '',
   'Reconciliation with bank'    => '',
+  'Record IBAN #1 doesn\'t match vendor IBAN #2' => '',
   'Record Type'                 => '',
+  'Record VAT ID #1 doesn\'t match vendor VAT ID #2' => '',
   'Record Vendor Invoice'       => '',
   'Record in'                   => '',
   'Record number'               => '',
+  'Record numbers and dates'    => '',
   'Record numbers changeable'   => '',
+  'Record tax ID #1 doesn\'t match vendor tax ID #2' => '',
   'Record templates'            => '',
   'Record type to create'       => '',
   'Record\'s files'             => '',
   'Recorded Tax'                => '',
   'Recorded taxkey'             => '',
   'Records'                     => '',
+  'Recurring'                   => '',
+  'Recurring billing'           => '',
   'Reduced Master Data'         => '',
   'Reference'                   => '',
   'Reference / Invoice Number'  => '',
   'Reference day'               => '',
   'Reference missing!'          => '',
+  'Registration'                => '',
   'Relaxed (UTF-8)'             => '',
   'Release From Stock'          => '',
+  'Reload'                      => '',
   'Remaining'                   => '',
   'Remaining Amount'            => '',
   'Remaining Net Amount'        => '',
@@ -2879,6 +3290,7 @@ $self->{texts} = {
   'Rename Images'               => '',
   'Rename attachment'           => '',
   'Renumber sections and function blocks' => '',
+  'Reorder Level List'          => '',
   'Replace the orphaned currencies by other not orphaned currencies. To do so, please delete the currency in the textfields above and replace it by another currency. You could loose or change unintentionally exchangerates. Go on very carefully since you could destroy transactions.' => '',
   'Report Positions'            => '',
   'Report about warehouse contents' => '',
@@ -2886,6 +3298,7 @@ $self->{texts} = {
   'Report and misc. Preferences' => '',
   'Report configuration overview' => '',
   'Report date'                 => '',
+  'Report date:'                => '',
   'Report for'                  => '',
   'Report separately'           => '',
   'Reports'                     => '',
@@ -2901,6 +3314,8 @@ $self->{texts} = {
   'Request for Quotation Number' => '',
   'Request for Quotations'      => '',
   'Request quotation'           => '',
+  'Request quotations closed: #1 Sales quotations closed: #2' => '',
+  'Request quotations not yet closed: #1 Sales quotations not yet closed: #2' => '',
   'Requested execution date'    => '',
   'Requested execution date from' => '',
   'Requested execution date to' => '',
@@ -2909,6 +3324,7 @@ $self->{texts} = {
   'Require stock out to consider a delivery order position delivered?' => '',
   'Required access right'       => '',
   'Required by'                 => '',
+  'Required qty'                => '',
   'Requirement Spec Status'     => '',
   'Requirement Spec Statuses'   => '',
   'Requirement Spec Templates'  => '',
@@ -2927,7 +3343,9 @@ $self->{texts} = {
   'Requirement spec template actions' => '',
   'Requirement spec text block "#1"; content: "#2"' => '',
   'Requirement specs'           => '',
+  'Rerun update'                => '',
   'Reset'                       => '',
+  'Reset Filter'                => '',
   'Result'                      => '',
   'Result of SQL query'         => '',
   'Results per page'            => '',
@@ -2940,11 +3358,13 @@ $self->{texts} = {
   'Risk'                        => '',
   'Risk levels'                 => '',
   'Risks'                       => '',
+  'Rop'                         => '',
   'Rounding'                    => '',
   'Rounding Gain'               => '',
   'Rounding Loss'               => '',
   'Row'                         => '',
   'Row #1: amount has to be different from zero.' => '',
+  'Row is the record itself'    => '',
   'Row number'                  => '',
   'Row was created from current record' => '',
   'Row was linked to another record' => '',
@@ -2961,16 +3381,23 @@ $self->{texts} = {
   'SAVED FOR DUNNING'           => '',
   'SCREENED'                    => '',
   'SEPA'                        => '',
+  'SEPA Transfer Amount'        => '',
+  'SEPA XML Docs for Exports '  => '',
   'SEPA XML download'           => '',
+  'SEPA XML version'            => '',
   'SEPA creditor ID'            => '',
   'SEPA exports'                => '',
   'SEPA message ID'             => '',
   'SEPA message IDs'            => '',
   'SEPA strings'                => '',
+  'SEPA-XML File extension'     => '',
+  'SEPA/Bank'                   => '',
   'SQL query'                   => '',
+  'SWIFT'                       => '',
   'SWIFT MT940 format'          => '',
   'Saldo Credit'                => '',
   'Saldo Debit'                 => '',
+  'Saldo alt'                   => '',
   'Saldo neu'                   => '',
   'Saldo per'                   => '',
   'Sales'                       => 'Sales',
@@ -2981,6 +3408,9 @@ $self->{texts} = {
   'Sales Invoice'               => '',
   'Sales Invoices'              => '',
   'Sales Order'                 => '',
+  'Sales Order Confirmations'   => '',
+  'Sales Order Intake'          => '',
+  'Sales Order Intakes'         => '',
   'Sales Order delivery date interval' => '',
   'Sales Orders'                => '',
   'Sales Orders Advance'        => '',
@@ -2991,6 +3421,9 @@ $self->{texts} = {
   'Sales Price information'     => '',
   'Sales Quotation valid interval' => '',
   'Sales Quotations'            => '',
+  'Sales Reclamation'           => '',
+  'Sales Reclamations'          => '',
+  'Sales Reclamations deleteable' => '',
   'Sales Report'                => '',
   'Sales and purchase invoices with inventory transactions with taxkeys' => '',
   'Sales delivery order'        => '',
@@ -3012,6 +3445,7 @@ $self->{texts} = {
   'Salesman'                    => '',
   'Salesman (database ID)'      => '',
   'Salesman (login)'            => '',
+  'Salesman Name'               => '',
   'Salesperson'                 => '',
   'Salutation female'           => '',
   'Salutation general'          => '',
@@ -3029,17 +3463,28 @@ $self->{texts} = {
   'Save and AP Transaction'     => '',
   'Save and AR Transaction'     => '',
   'Save and Close'              => '',
-  'Save and Delivery Order'     => '',
+  'Save and Credit Note'        => '',
   'Save and E-mail'             => '',
   'Save and Final Invoice'      => '',
   'Save and Further Invoice for Advance Payment' => '',
   'Save and Invoice'            => '',
   'Save and Invoice for Advance Payment' => '',
+  'Save and Next'               => '',
   'Save and Order'              => '',
+  'Save and Purchase Delivery Order' => '',
+  'Save and Purchase Delivery Order with item selection' => '',
   'Save and Purchase Order'     => '',
+  'Save and Purchase Order Confirmation' => '',
+  'Save and Purchase Quotation Intake' => '',
+  'Save and Purchase Reclamation' => '',
   'Save and Quotation'          => '',
   'Save and RFQ'                => '',
-  'Save and Sales Order'        => '',
+  'Save and RMA Delivery Order' => '',
+  'Save and Reclamation'        => '',
+  'Save and Sales Delivery Order' => '',
+  'Save and Sales Order Confirmation' => '',
+  'Save and Sales Order Intake' => '',
+  'Save and Sales Reclamation'  => '',
   'Save and Supplier Delivery Order' => '',
   'Save and close'              => '',
   'Save and execute'            => '',
@@ -3057,16 +3502,25 @@ $self->{texts} = {
   'Saving failed. Error message from the database: #1' => '',
   'Saving failed. Error message from the server: #1' => '',
   'Saving the file \'%s\' failed. OS error message: %s' => '',
+  'Saving the record failed: #1' => '',
   'Saving the record template \'#1\' failed.' => '',
   'Saving the time recording entry failed: #1' => '',
+  'Scan swiss QR bill'          => '',
+  'Scope'                       => '',
   'Score'                       => '',
   'Screen'                      => '',
+  'Scrollbar height percentage for form postion area' => '',
   'Scrollbar height percentage for form postion area (0 means no scrollbar)' => '',
   'Search'                      => '',
+  'Search & Add Article'        => '',
+  'Search & Add Customer'       => '',
+  'Search & Add Vendor'         => '',
+  'Search & Add Vendor by Name' => '',
   'Search AP Aging'             => '',
   'Search AR Aging'             => '',
   'Search bank transactions'    => '',
   'Search contacts'             => '',
+  'Search customer by name and add by selecting' => '',
   'Search for Items used in Assemblies' => '',
   'Search parts by customer partnumber in sales order forms' => '',
   'Search parts by vendor partnumber (model) in purchase order forms' => '',
@@ -3080,19 +3534,31 @@ $self->{texts} = {
   'Sections that are not assigned to any of the items above will be added as new positions.' => '',
   'See various menu entries intended for developers' => '',
   'Select'                      => '',
+  'Select (with Factur-X/ZUGFeRD import)' => '',
+  'Select Chargenumbers'        => '',
+  'Select Contact'              => '',
+  'Select Deliveries'           => '',
   'Select Mulit-Item Options'   => '',
+  'Select Shipping Address'     => '',
   'Select a Customer'           => '',
   'Select a period'             => '',
+  'Select article'              => '',
   'Select federal state...'     => '',
   'Select file to upload'       => '',
   'Select from one of the items below' => '',
+  'Select from preset'          => '',
+  'Select items for delivery order' => '',
   'Select postscript or PDF!'   => '',
+  'Select record type'          => '',
   'Select tax office...'        => '',
   'Select template to paste'    => '',
   'Select type of removal'      => '',
   'Select type of transfer'     => '',
   'Select type of transfer in'  => '',
+  'Select/Deselect'             => '',
+  'Select/Deselect all'         => '',
   'Selected'                    => '',
+  'Selected items deleted'      => '',
   'Selection'                   => '',
   'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' => '',
   'Sell Price'                  => '',
@@ -3107,6 +3573,7 @@ $self->{texts} = {
   'Send invoice via email'      => '',
   'Send printout of record'     => '',
   'Send the last or create the first version for this record' => '',
+  'Send the last version for this record' => '',
   'Sender'                      => '',
   'Sent emails can be optionally stored in the database with or without their attachments.' => '',
   'Sent on'                     => '',
@@ -3191,6 +3658,8 @@ $self->{texts} = {
   'Shoporders'                  => '',
   'Shops'                       => '',
   'Short'                       => '',
+  'Short onhand'                => '',
+  'Short onhand Ordered'        => '',
   'Should VAT ID or taxnumber be unique for all vendors? This is checked when saving a vendor\'s master data. One of the fields is sufficient and required.' => '',
   'Should VAT ID or taxnumber be unique for customers? This is checked when saving a customer\'s master data. One of the fields is sufficient and required.' => '',
   'Should ap transactions be and when should they be changeable or deleteable after posting?' => '',
@@ -3204,15 +3673,18 @@ $self->{texts} = {
   'Should the "mark as paid" button showed in purchase invoices?' => '',
   'Should the "mark as paid" button showed on sales invoices?' => '',
   'Show'                        => '',
+  'Show "mark as paid"'         => '',
   'Show "mark as paid" in ap transactions' => '',
   'Show "mark as paid" in ar transactions' => '',
   'Show "mark as paid" in purchase invoices' => '',
   'Show "mark as paid" in sales invoices' => '',
   'Show AP transactions as part of AP invoice report' => '',
   'Show AR transactions as part of AR invoice report' => '',
+  'Show Attachment'             => '',
   'Show Bestbefore'             => '',
   'Show E-Mails'                => '',
   'Show Filter'                 => '',
+  'Show Records'                => '',
   'Show Salesman'               => '',
   'Show Stornos'                => '',
   'Show TODO list'              => '',
@@ -3221,15 +3693,19 @@ $self->{texts} = {
   'Show all details'            => '',
   'Show all parts'              => '',
   'Show by default'             => '',
+  'Show certain sales and purchase documents' => '',
   'Show chart list'             => '',
   'Show charts'                 => '',
   'Show custom variable search inputs' => '',
   'Show delete button in purchase delivery orders?' => '',
   'Show delete button in purchase orders?' => '',
+  'Show delete button in purchase reclamations?' => '',
   'Show delete button in sales delivery orders?' => '',
   'Show delete button in sales orders?' => '',
+  'Show delete button in sales reclamations?' => '',
   'Show delivery plan'          => '',
   'Show delivery value report'  => '',
+  'Show detail informationen'   => '',
   'Show details'                => '',
   'Show details and reports of parts, services, assemblies' => '',
   'Show document tab after posting?' => '',
@@ -3239,6 +3715,7 @@ $self->{texts} = {
   'Show follow ups...'          => '',
   'Show help text'              => '',
   'Show images'                 => '',
+  'Show invoice for payment in advance and final invoice' => '',
   'Show items from invoices individually' => '',
   'Show mappings (csv_import)'  => '',
   'Show old dunnings'           => '',
@@ -3248,13 +3725,25 @@ $self->{texts} = {
   'Show overdue sales quotations and requests for quotations...' => '',
   'Show parts'                  => '',
   'Show parts longdescription (notes) in select list' => '',
+  'Show purchase basket'        => '',
   'Show purchase letters report' => '',
+  'Show purchase order confirmation' => '',
+  'Show purchase order reports with amounts (and links to open documents)' => '',
+  'Show purchase quotation intake' => '',
+  'Show purchase reclamation'   => '',
   'Show record tab in customer' => '',
   'Show record tab in vendor'   => '',
   'Show requirement spec'       => '',
   'Show requirement spec template' => '',
+  'Show sales financial controlling' => '',
   'Show sales letters report'   => '',
+  'Show sales order intake'     => '',
+  'Show sales order item search' => '',
+  'Show sales order reports with amounts (and links to open documents)' => '',
+  'Show sales reclamation'      => '',
+  'Show sales report'           => '',
   'Show settings'               => '',
+  'Show subtotals'              => '',
   'Show the picture in the part form' => '',
   'Show the pictures in the result for search parts' => '',
   'Show the weights of articles and the total weight in orders, invoices and delivery notes?' => '',
@@ -3266,6 +3755,7 @@ $self->{texts} = {
   'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' => '',
   'Single quotes'               => '',
   'Single values in item mode, cumulated values in invoice mode' => '',
+  'Singular'                    => '',
   'Size'                        => '',
   'Skip'                        => '',
   'Skip entry'                  => '',
@@ -3287,8 +3777,11 @@ $self->{texts} = {
   'Soldtotal does not make sense without any bsooqr options' => '',
   'Solution'                    => '',
   'Sorry, I am too stupid to figure out the default warehouse/bin and the sold qty. I drop the default warehouse/bin option.' => '',
+  'Sort'                        => '',
   'Sort By'                     => '',
+  'Sort by'                     => '',
   'Sort order'                  => '',
+  'Sorting'                     => '',
   'Source'                      => '',
   'Source BIC'                  => '',
   'Source IBAN'                 => '',
@@ -3319,6 +3812,7 @@ $self->{texts} = {
   'Statement sent to'           => '',
   'Statements sent to printer!' => '',
   'Status'                      => '',
+  'Status & Handling'           => '',
   'Status Shoptransfer'         => '',
   'Status Shopupload'           => '',
   'Step #1/#2'                  => '',
@@ -3347,13 +3841,21 @@ $self->{texts} = {
   'Storage Type for shopimages' => '',
   'Storing PDF in storage backend failed: #1' => '',
   'Storing PDF to webdav folder failed: #1' => '',
+  'Storing the ZUGFeRD file in the storage backend failed: #1' => '',
+  'Storing the ZUGFeRD file to the WebDAV folder failed: #1' => '',
   'Storing the document in the storage backend failed: #1' => '',
   'Storing the document to the WebDAV folder failed: #1' => '',
   'Storing the emails in the journal is currently disabled in the client configuration.' => '',
   'Storno'                      => '',
   'Storno (one letter abbreviation)' => '',
+  'Storno Credit Note'          => '',
+  'Storno Credit Notes'         => '',
   'Storno Invoice'              => '',
+  'Storno Invoice for Advance Payment' => '',
+  'Storno Invoices'             => '',
+  'Storno Invoices for Advance Payment' => '',
   'Street'                      => '',
+  'Street (Shipping)'           => '',
   'Street 1'                    => '',
   'Street 2'                    => '',
   'Strict and halt'             => '',
@@ -3366,8 +3868,10 @@ $self->{texts} = {
   'Subtotal'                    => '',
   'Subtotal cannot distinguish betweens record types. Only one of the selected record types will be displayed: #1' => '',
   'Subtotals per quarter'       => '',
+  'Subversions are not supported or disabled for this record type.' => '',
   'Such entries cannot be exported into the DATEV format and have to be fixed as well.' => '',
   'Suggested invoice'           => '',
+  'Sum Amount'                  => '',
   'Sum Credit'                  => '',
   'Sum Debit'                   => '',
   'Sum for'                     => '',
@@ -3389,6 +3893,7 @@ $self->{texts} = {
   'Supplies'                    => '',
   'Surname'                     => '',
   'Switzerland'                 => '',
+  'Synchronize WebDAV with owncloud repository' => '',
   'System'                      => '',
   'System currently down for maintenance!' => '',
   'TODO list'                   => '',
@@ -3399,6 +3904,7 @@ $self->{texts} = {
   'Target Qty'                  => '',
   'Target bank account'         => '',
   'Target table'                => '',
+  'Tariff Code'                 => 'Tariff code',
   'Task Server is not running, starting it now. If this does not change, please check your task server config' => '',
   'Task server'                 => '',
   'Task server control'         => '',
@@ -3451,6 +3957,7 @@ $self->{texts} = {
   'Template database'           => '',
   'Template date'               => '',
   'Templates'                   => '',
+  'Terms'                       => '',
   'Terms missing in row '       => '',
   'Test database connectivity'  => '',
   'Text'                        => '',
@@ -3475,7 +3982,6 @@ $self->{texts} = {
   'The AR transaction #1 has been deleted.' => '',
   'The Bins in Inventory were only a information text field.' => '',
   'The Bins in master data were only a information text field.' => '',
-  'The Factur-X/ZUGFeRD XML invoice was not found.' => '',
   'The Factur-X/ZUGFeRD notes have been saved.' => '',
   'The Factur-X/ZUGFeRD version used is not supported.' => '',
   'The GL transaction #1 has been deleted.' => '',
@@ -3503,6 +4009,7 @@ $self->{texts} = {
   'The WebDAV feature has been used.' => '',
   'The XMP metadata does not declare the Factur-X/ZUGFeRD data.' => '',
   'The ZUGFeRD invoice data cannot be generated because the data validation failed.' => '',
+  'The ZUGFeRD/Factur-X invoice \'#1\' has been loaded.' => '',
   'The abbreviation is missing.' => '',
   'The access rights a user has within a client instance is still governed by his group membership.' => '',
   'The access rights have been saved.' => '',
@@ -3513,9 +4020,11 @@ $self->{texts} = {
   'The action is missing or invalid.' => '',
   'The action you\'ve chosen has not been executed because the document does not contain any item yet.' => '',
   'The administration area is always accessible.' => '',
+  'The allowed Skonto Percentage Deivation defaults to 0.5% of the invoice amount' => '',
   'The application "#1" was not found on the system.' => '',
   'The assembly \'#1\' cannot be a part from itself.' => '',
   'The assembly \'#1\' would make a loop in assembly tree.' => '',
+  'The assembly could not be produced.' => '',
   'The assembly doesn\'t have any items.' => '',
   'The assembly has been created.' => '',
   'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '',
@@ -3535,6 +4044,8 @@ $self->{texts} = {
   'The basic client tables have not been created for this client\'s database yet.' => '',
   'The billing period has already been locked.' => '',
   'The body is missing.'        => '',
+  'The booking group \'#1\' is obsolete and cannot be used with active articles.' => '',
+  'The booking group cannot be marked obsolete while still being used by active parts.' => '',
   'The booking group has been created.' => '',
   'The booking group has been deleted.' => '',
   'The booking group has been saved.' => '',
@@ -3569,9 +4080,10 @@ $self->{texts} = {
   'The country from the customer\'s address cannot be mapped to an ISO 3166-1 alpha 2 code.' => '',
   'The creation of the authentication database failed:' => '',
   'The credentials (username & password) for connecting database are wrong.' => '',
+  'The credit note has been deleted' => '',
   'The currency "#1" cannot be mapped to an ISO 4217 currency code.' => '',
-  'The custom data export has been deleted.' => '',
-  'The custom data export has been saved.' => '',
+  'The custom report has been deleted.' => '',
+  'The custom report has been saved.' => '',
   'The custom variable has been created.' => '',
   'The custom variable has been deleted.' => '',
   'The custom variable has been saved.' => '',
@@ -3610,6 +4122,7 @@ $self->{texts} = {
   'The document has been printed.' => '',
   'The documents have been sent to the printer \'#1\'.' => '',
   'The dunnings have been printed.' => '',
+  'The email entry for #1 looks invalid' => '',
   'The email has been sent.'    => '',
   'The email was not sent due to the following error: #1.' => '',
   'The employee is missing.'    => '',
@@ -3625,8 +4138,12 @@ $self->{texts} = {
   'The file has been sent to the printer.' => '',
   'The file is available for download.' => '',
   'The file name is missing'    => '',
+  'The final invoice has been deleted' => '',
   'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' => '',
   'The follow-up date is missing.' => '',
+  'The following Shop Orders: ' => '',
+  'The following assembly items are ambigious. Please check the selection.' => '',
+  'The following assembly items are unambigious and will be used for production.' => '',
   'The following currencies have been used, but they are not defined:' => '',
   'The following delivery orders could not be processed because they are already closed: #1' => '',
   'The following drafts have been saved and can be loaded.' => '',
@@ -3635,15 +4152,20 @@ $self->{texts} = {
   'The following is only a preview.' => '',
   'The following list has been generated automatically from existing users collapsing users with identical settings into a single entry.' => '',
   'The following old files whose settings have to be merged manually into the new configuration file "config/kivitendo.conf" still exist:' => '',
+  'The following orders could not be converted to delivery orders:' => '',
+  'The following parts could not be allocated:' => '',
   'The following transaction contains wrong taxes:' => '',
   'The following transaction contains wrong taxkeys:' => '',
   'The following transactions are concerned:' => '',
   'The following users are a member of this group' => '',
   'The following users will have access to this client' => '',
+  'The form is not valid anymore.' => '',
   'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => '',
   'The greetings have been saved.' => '',
   'The installation is currently locked.' => '',
   'The installation is currently unlocked.' => '',
+  'The invoice for advance payment has been deleted' => '',
+  'The invoice has been deleted' => '',
   'The invoice is not linked with a sales delivery order. Post anyway?' => '',
   'The invoice recipient can either be a selected contact person (default) or the email adress set in the master data of the customer. Additionally a contact persons mail and the company\'s invoicing mail can be combined.' => '',
   'The invoices have been created. They\'re pre-selected below.' => '',
@@ -3653,10 +4175,12 @@ $self->{texts} = {
   'The item has been deleted.'  => '',
   'The item has been saved.'    => '',
   'The items are imported accoring do their number "X" regardless of the column order inside the file.' => '',
+  'The layout style normally is choosen by the user agent string the browser sends. Here you can force the desktop or mobile version. Users can override this setting in their user preferences.' => '',
   'The link target to add has been created from the existing record.' => '',
   'The list has been printed.'  => '',
   'The login is missing.'       => '',
   'The login is not unique.'    => '',
+  'The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?' => '',
   'The long description is missing.' => '',
   'The master templates where not found.' => '',
   'The maximum of uploadable filesize in Megabyte' => '',
@@ -3678,8 +4202,12 @@ $self->{texts} = {
   'The object has not been saved yet.' => '',
   'The object is in use and cannot be deleted.' => '',
   'The option field is empty.'  => '',
+  'The order confirmation has been deleted' => '',
+  'The order confirmation has been saved' => '',
   'The order has been deleted'  => '',
   'The order has been saved'    => '',
+  'The order intake has been deleted' => '',
+  'The order intake has been saved' => '',
   'The package name is invalid.' => '',
   'The partnumber already exists!' => '',
   'The partnumber already exists.' => '',
@@ -3695,6 +4223,7 @@ $self->{texts} = {
   'The password is too short (minimum length: #1).' => '',
   'The password is weak (e.g. it can be found in a dictionary).' => '',
   'The path is missing.'        => '',
+  'The payable chart isn\'t a valid chart.' => '',
   'The payment term has been created.' => '',
   'The payment term has been deleted.' => '',
   'The payment term has been saved.' => '',
@@ -3724,11 +4253,22 @@ $self->{texts} = {
   'The project link has been updated.' => '',
   'The project number is already in use.' => '',
   'The project number is missing.' => '',
+  'The purchase credit note has been deleted' => '',
+  'The purchase invoice has been deleted' => '',
   'The query did not return any data.' => '',
   'The quotation has been deleted' => '',
   'The quotation has been saved' => '',
+  'The quotation intake has been deleted' => '',
+  'The quotation intake has been saved' => '',
   'The receivables chart isn\'t a valid chart.' => '',
   'The recipient, subject or body is missing.' => '',
+  'The reclamation has been deleted' => '',
+  'The reclamation has been saved' => '',
+  'The reclamation reason has been created.' => '',
+  'The reclamation reason has been deleted.' => '',
+  'The reclamation reason has been saved.' => '',
+  'The reclamation reason is in use and cannot be deleted.' => '',
+  'The record has been closed.' => '',
   'The record template \'#1\' has been loaded.' => '',
   'The record template \'#1\' has been saved.' => '',
   'The report doesn\'t contain entries.' => '',
@@ -3741,6 +4281,7 @@ $self->{texts} = {
   'The requirement spec template has been saved.' => '',
   'The rfq has been deleted'    => '',
   'The rfq has been saved'      => '',
+  'The scanned code is not a valid QR bill.' => '',
   'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' => '',
   'The second way is to use Perl\'s CPAN module and let it download and install the module for you.' => '',
   'The selected bank account does not exist anymore.' => '',
@@ -3749,6 +4290,7 @@ $self->{texts} = {
   'The selected database is still configured for client "#1". If you delete the database that client will stop working until you re-configure it. Do you still want to delete the database?' => '',
   'The selected exports have been closed.' => '',
   'The selected exports have been undone.' => '',
+  'The selected quotations where closed.' => '',
   'The selected warehouse does not exist.' => '',
   'The selected warehouse is empty, or no stocked items where found that match the filter settings.' => '',
   'The session has expired. Please log in again.' => '',
@@ -3764,7 +4306,11 @@ $self->{texts} = {
   'The shop part wasn\'t updated. #1' => '',
   'The source warehouse does not contain any bins.' => '',
   'The start date is missing.'  => '',
+  'The stock is to low: #1.'    => '',
   'The stock will be changed to your target quantity.' => '',
+  'The storno credit note has been deleted' => '',
+  'The storno invoice has been deleted' => '',
+  'The strono invoice for advance payment has been deleted' => '',
   'The subject is missing.'     => '',
   'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' => '',
   'The tabulator character'     => '',
@@ -3808,6 +4354,7 @@ $self->{texts} = {
   'The value \'#1\' is not a valid IBAN.' => '',
   'The value \'our routing id at customer\' must be set in the customer\'s master data for profile #1.' => '',
   'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' => '',
+  'The vendor could not be found. Please register the vendor with the exact name from the QR bill as shown below.' => '',
   'The vendor name is missing.' => '',
   'The version number is missing.' => '',
   'The warehouse could not be deleted because it has already been used.' => '',
@@ -3820,6 +4367,7 @@ $self->{texts} = {
   'Then go to the database administration and chose "create database".' => '',
   'There are #1 more open invoices for this customer with other currencies.' => '',
   'There are #1 more open invoices from this vendor with other currencies.' => '',
+  'There are #1 of "#2" missing from the bin #3 for transfer.' => '',
   'There are #1 unfinished follow-ups of which #2 are due.' => '',
   'There are Bins defined in your Inventory.' => '',
   'There are Bins defined in your master data.' => '',
@@ -3833,13 +4381,19 @@ $self->{texts} = {
   'There are entries in tax where taxkey is NULL.' => '',
   'There are invalid taxnumbers in use.' => '',
   'There are invalid transactions in your database.' => '',
+  'There are mulitple vendors selected' => '',
   'There are no documents in the WebDAV directory at the moment.' => '',
   'There are no entries in the background job history.' => '',
   'There are no entries that match the filter.' => '',
   'There are no items in stock.' => '',
   'There are no items on your TODO list at the moment.' => '',
+  'There are no items selected' => '',
+  'There are no orders for the selected time period.' => '',
   'There are no record templates yet.' => '',
+  'There are parts with multiple chargenumbers or bestbefore dates set. This can\'t be decided automatically. Pleas transfer this delivery order manually. Can\'t decided for #1.' => '',
+  'There are parts with no reclamation reason at position:' => '',
   'There are several options you can handle this problem, please select one:' => '',
+  'There are some errors in the file and it was requested to not save any datasets on errors.' => '',
   'There are still transfers not matching the qty of the delivery order. Stock operations can not be changed later. Do you really want to proceed?' => '',
   'There are undefined currencies in your system.' => '',
   'There are usually three ways to install Perl modules.' => '',
@@ -3857,6 +4411,7 @@ $self->{texts} = {
   'There is one or more sections for which no part has been assigned yet; therefore creating the new record is not possible yet.' => '',
   'There was an error deleting the draft' => '',
   'There was an error executing the background job.' => '',
+  'There was an error parsing the csv file: #1' => '',
   'There was an error parsing the csv file: #1 in line #2.' => '',
   'There was an error saving the draft' => '',
   'There was an error saving the letter' => '',
@@ -3870,6 +4425,7 @@ $self->{texts} = {
   'This Price Rule is no longer valid' => '',
   'This also enables displaying a column with the customer partnumber (new order controller).' => '',
   'This also enables displaying a column with the vendor partnumber (model) (new order controller).' => '',
+  'This business has already been added.' => '',
   'This can be done with the following query:' => '',
   'This could have happened for two reasons:' => '',
   'This customer has already been added.' => '',
@@ -3900,9 +4456,12 @@ $self->{texts} = {
   'This invoice has been canceled already.' => '',
   'This invoice has been linked with a sepa export, undo this first.' => '',
   'This invoice has not been posted yet.' => '',
+  'This invoice is marked for direct debit and cannot be selected for a SEPA Export.' => '',
+  'This invoice is not marked for direct debit and cannot be selected for a SEPA Export.' => '',
   'This invoice was added from an order. See there.' => '',
   'This invoice\'s dunning level: #1' => '',
   'This is a very critical problem.' => '',
+  'This is helpful if you prefer a chronologic order of bank transactions, i.e. the tab all transactions meanwhile you are still able to use the quick add link for the suggested proposals' => '',
   'This is the client to be selected by default on the login screen.' => '',
   'This is the default bin for parts' => '',
   'This is the default warehouse for ignoring onhand' => '',
@@ -3916,24 +4475,30 @@ $self->{texts} = {
   'This option controls the inventory system.' => '',
   'This option controls the method used for determining the startdate for the balance report.' => '',
   'This option controls the method used for profit determination.' => '',
+  'This option controls the method used for the automated year-end bookings.' => '',
   'This option controls the posting and calculation behavior for the accounting method.' => '',
   'This order has already a final invoice.' => '',
   'This part has already been added.' => '',
+  'This part should not be ordered any more.' => '',
   'This part was already counted for this bin:' => '',
   'This price has since gone down' => '',
   'This price has since gone up' => '',
-  'This record containts obsolete items at position #1' => '',
+  'This record contains not orderable items at position #1' => '',
+  'This record contains obsolete items at position #1' => '',
   'This record has already been closed.' => '',
   'This record has already been delivered.' => '',
   'This record has not been saved yet.' => '',
   'This record has not been stocked in. Proceed?' => '',
   'This record has not been stocked out. Proceed?' => '',
+  'This record is the final version. Changes have not been saved' => '',
+  'This record is the final version. Please create a new sub-version' => '',
   'This requirement spec is currently linked to the following project:' => '',
   'This requirement spec is currently not linked to a project.' => '',
   'This requires you to manually correct entries for which an automatic conversion failed and to check those for which it succeeded.' => '',
   'This resets the dunning process for the selected invoices. Posted dunning invoices will not be changed!' => '',
   'This sales order has an active configuration for periodic invoices. If you save then all subsequently created invoices will contain those changes as well, but not those that have already been created. Do you want to continue?' => '',
   'This status output will be refreshed every five seconds.' => '',
+  'This sub-version is not yet finalized' => '',
   'This transaction has to be split into several transactions manually.' => '',
   'This transaction is linked with a AP transaction. Please undo and redo the AP transaction booking if needed.' => '',
   'This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.' => '',
@@ -3945,6 +4510,8 @@ $self->{texts} = {
   'This vendor has already a booking with this invoice number, do you really want to add the same invoice number again?' => '',
   'This vendor has already been added.' => '',
   'This vendor number is already in use.' => '',
+  'This way you can get a similar list of linked records for every record in the same workflow.' => '',
+  'This will also remove these delivery terms for all customers & vendors.' => '',
   'This will also remove this pricegroup for all customers.' => '',
   'This will apply a 3% reduction to the master data price before entering it into the record item.' => '',
   'This will be treated as a discount in percent points.' => '',
@@ -3979,6 +4546,7 @@ $self->{texts} = {
   'To user login'               => '',
   'Today'                       => '',
   'Toggle marker'               => '',
+  'Toggle selection'            => '',
   'Too many results (#1 from #2).' => '',
   'Too much recursions in assembly tree (>100)' => '',
   'Top'                         => '',
@@ -3988,6 +4556,7 @@ $self->{texts} = {
   'Total'                       => '',
   'Total Fees'                  => '',
   'Total Sales Orders Value'    => '',
+  'Total Stock'                 => '',
   'Total number of entries'     => '',
   'Total stock value'           => '',
   'Total sum'                   => '',
@@ -3999,7 +4568,7 @@ $self->{texts} = {
   'Transaction'                 => '',
   'Transaction %d cancelled.'   => '',
   'Transaction Date missing!'   => '',
-  'Transaction Description is not yet implemented' => '',
+  'Transaction Details'         => '',
   'Transaction ID missing.'     => '',
   'Transaction Value'           => '',
   'Transaction Value Currency Code' => '',
@@ -4021,7 +4590,9 @@ $self->{texts} = {
   'Transdate to'                => '',
   'Transfer'                    => '',
   'Transfer Date'               => '',
+  'Transfer Out & Assembly Transfer' => '',
   'Transfer Quantity'           => '',
+  'Transfer Status'             => '',
   'Transfer To Stock'           => '',
   'Transfer all marked'         => '',
   'Transfer data to Geierlein ELSTER application' => '',
@@ -4037,13 +4608,16 @@ $self->{texts} = {
   'Transfer services via default' => '',
   'Transfer stock'              => '',
   'Transfer successful'         => '',
+  'Transfer undone'             => '',
   'Transfer undone.'            => '',
   'Transferred'                 => '',
+  'Transit Items account'       => '',
   'Translation'                 => '',
   'Translations'                => '',
   'Transport and service costs reminder' => '',
   'Trial Balance'               => '',
   'Trial balance between %s and %s' => '',
+  'Try again'                   => '',
   'Trying to call a sub without a name' => '',
   'Tue'                         => '',
   'Tuesday'                     => '',
@@ -4076,6 +4650,7 @@ $self->{texts} = {
   'Unable to book transactions for bank purpose #1' => '',
   'Unable to reconcile, database transaction failure' => '',
   'Unbalanced Ledger'           => '',
+  'Unblock Bank transfer via SEPA' => '',
   'Unchecked custom variables will not appear in orders and invoices.' => '',
   'Undo SEPA exports'           => '',
   'Undo Transfer'               => '',
@@ -4144,6 +4719,7 @@ $self->{texts} = {
   'Use As New'                  => '',
   'Use Balance Sheet'           => '',
   'Use Datevautomatik'          => '',
+  'Use END-TO-END-ID to detect duplicates in bank import transactions' => '',
   'Use Erfolgsrechnung'         => '',
   'Use File Storage backend'    => '',
   'Use Filemanagement'          => '',
@@ -4163,6 +4739,8 @@ $self->{texts} = {
   'Use existing templates'      => '',
   'Use for Factur-X/ZUGFeRD'    => '',
   'Use for Swiss QR-Bill'       => '',
+  'Use last created record or create new.' => '',
+  'Use linked items'            => '',
   'Use master default bin for Default Transfer, if no default bin for the part is configured' => '',
   'Use settings from client configuration' => '',
   'Use text field for department of contacts' => '',
@@ -4171,6 +4749,7 @@ $self->{texts} = {
   'Use this storage backend for all generated PDF-Files' => '',
   'Use this storage backend for all uploaded attachments' => '',
   'Use this storage backend for uploaded images' => '',
+  'Use with bank import'        => '',
   'Useable for sections'        => '',
   'Useable for text blocks'     => '',
   'Useable for…'                => '',
@@ -4178,6 +4757,7 @@ $self->{texts} = {
   'Used for Sale'               => '',
   'Used for assembly #1 #2'     => '',
   'User'                        => '',
+  'User & Communication'        => '',
   'User Preferences'            => '',
   'User access'                 => '',
   'User list'                   => '',
@@ -4196,10 +4776,14 @@ $self->{texts} = {
   'VN'                          => '',
   'Valid'                       => '',
   'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' => '',
+  'Valid for Purchase'          => '',
+  'Valid for Sales'             => '',
   'Valid from'                  => '',
   'Valid until'                 => '',
   'Valid/Obsolete'              => '',
+  'Validity'                    => '',
   'Value'                       => '',
+  'Values & Prices'             => '',
   'Valutadate'                  => '',
   'Valutadate from'             => '',
   'Valutadate to'               => '',
@@ -4207,8 +4791,11 @@ $self->{texts} = {
   'Variable Description'        => '',
   'Variable Name'               => '',
   'Vendor'                      => '',
+  'Vendor & Order'              => '',
+  'Vendor & Transaction'        => '',
   'Vendor (database ID)'        => '',
   'Vendor (name)'               => '',
+  'Vendor Confirmation Number'  => '',
   'Vendor Discount'             => '',
   'Vendor GLN'                  => '',
   'Vendor Invoice'              => '',
@@ -4217,12 +4804,17 @@ $self->{texts} = {
   'Vendor Name'                 => '',
   'Vendor Number'               => '',
   'Vendor Order Number'         => '',
+  'Vendor Part Number'          => '',
+  'Vendor Record Number'        => '',
+  'Vendor and Invoice Number'   => '',
   'Vendor deleted!'             => '',
   'Vendor details'              => '',
   'Vendor missing!'             => '',
+  'Vendor not found'            => '',
   'Vendor saved'                => '',
   'Vendor saved!'               => '',
   'Vendor type'                 => '',
+  'Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor #3 exists and whether it has the correct tax ID/VAT ID.' => '',
   'Vendors'                     => '',
   'Vendors: VAT ID / taxnumber unique' => '',
   'Verrechnungseinheit'         => '',
@@ -4233,6 +4825,9 @@ $self->{texts} = {
   'View RFQs'                   => '',
   'View SEPA export'            => '',
   'View background job execution result' => '',
+  'View contact person report'  => '',
+  'View customer report'        => '',
+  'View email'                  => '',
   'View purchase delivery orders' => '',
   'View purchase invoices'      => '',
   'View purchase orders'        => '',
@@ -4241,13 +4836,14 @@ $self->{texts} = {
   'View sales invoices and credit notes' => '',
   'View sales orders'           => '',
   'View sales quotations'       => '',
-  'View sent email'             => '',
+  'View vendor report'          => '',
   'View warehouse content'      => '',
   'View/edit all employees purchase documents' => '',
   'View/edit all employees sales documents' => '',
   'WHJournal'                   => 'Warehouse journal',
   'WHUsage'                     => 'Warehouse withdrawal',
   'Warehouse'                   => '',
+  'Warehouse & Article'         => '',
   'Warehouse (database ID)'     => '',
   'Warehouse (name)'            => '',
   'Warehouse From'              => '',
@@ -4260,6 +4856,8 @@ $self->{texts} = {
   'Warehouses'                  => '',
   'Warn before saving orders with duplicate parts (new controller only)' => '',
   'Warn before saving orders without a delivery date' => '',
+  'Warn before saving reclamations with duplicate parts' => '',
+  'Warn before saving reclamations without a due date' => '',
   'Warn before saving sales orders with missing customer order number (new controller only)' => '',
   'Warning'                     => '',
   'Warning! Loading a draft will discard unsaved data!' => '',
@@ -4272,8 +4870,10 @@ $self->{texts} = {
   'We need a valid to date'     => '',
   'Web shops'                   => '',
   'WebDAV'                      => '',
+  'WebDAV is not enabled.'      => '',
   'WebDAV link'                 => '',
   'WebDAV save documents'       => '',
+  'WebDAV sync extern'          => '',
   'Webserver interface'         => '',
   'Webshop'                     => '',
   'Webshop Import'              => '',
@@ -4287,10 +4887,19 @@ $self->{texts} = {
   'What this template contains' => '',
   'What type of item is this?'  => '',
   'When converting a requirement spec into a quotation or an oder each section gets converted into a line position in the new record. This is the article used by default for this conversion.' => '',
+  'When disabled, invoices for payment in advance and final invoices do not show up in the menu and in the workflow actions.' => '',
+  'When disabled, purchase order confirmations do not show up in the menu and in the workflow actions.' => '',
+  'When disabled, purchase quotation intakes do not show up in the menu and in the workflow actions.' => '',
+  'When disabled, purchase reclamations do not show up in the menu and in the workflow actions.' => '',
+  'When disabled, sales order intakes do not show up in the menu and in the workflow actions.' => '',
+  'When disabled, sales reclamations do not show up in the menu and in the workflow actions.' => '',
+  'When using Swiss QR-bill, copy the invoice number to the unstructured message automatically' => '',
   'Whether or not to replace variable placeholders such as "<%invdate%>" in texts in positions such as the part description by the record\'s actual value' => '',
   'Which is located at doc/kivitendo-Dokumentation.pdf. Click here: ' => '',
   'With Attachments'            => '',
   'With Extension Of Time'      => '',
+  'With Ignoring Onhand'        => '',
+  'With closed'                 => '',
   'With the introduction of clients each client gets its own WebDAV folder.' => '',
   'Without Attachments'         => '',
   'Workflow'                    => '',
@@ -4311,12 +4920,16 @@ $self->{texts} = {
   'Wrong taxes recorded'        => '',
   'Wrong time format (#1)'      => '',
   'X'                           => '',
+  'X axis'                      => '',
+  'Y axis'                      => '',
   'YYYY'                        => '',
   'Year'                        => '',
   'Year-end bookings were successfully completed!' => '',
   'Year-end closing'            => '',
+  'Year-end closing account'    => '',
   'Year-end date'               => '',
   'Year-end date missing'       => '',
+  'Year-end method'             => '',
   'Yearly'                      => '',
   'Yearly taxreport not yet implemented' => '',
   'Yes'                         => '',
@@ -4341,7 +4954,7 @@ $self->{texts} = {
   'You cannot modify individual assigments from additional articles to line items.' => '',
   'You cannot paste function blocks or sub function blocks if there is no section.' => '',
   'You cannot use a negative amount with debit/credit!' => '',
-  'You do not have access to any custom data export.' => '',
+  'You do not have access to any custom report.' => '',
   'You do not have permission to access this entry.' => '',
   'You do not have the permissions to access this function.' => '',
   'You don\'t have the rights to edit this customer.' => '',
@@ -4379,29 +4992,36 @@ $self->{texts} = {
   'Your download does not exist anymore. Please re-run the DATEV export assistant.' => '',
   'Your import is being processed.' => '',
   'Your target quantity will be added to the stocked quantity.' => '',
+  'ZIPcode'                     => '',
+  'ZUGFeRD Import. Type: #1'    => '',
   'Zeitraum'                    => '',
   'Zero amount posting!'        => '',
   'Zip'                         => '',
   'Zip, City'                   => '',
   'Zipcode'                     => '',
+  'Zipcode (Shipping)'          => '',
   'Zipcode and city'            => '',
+  'Zipcode missing or wrong format.' => '',
   '[email]'                     => '',
+  'above the positions'         => '',
   'absolute'                    => '',
+  'account'                     => '',
   'account_description'         => '',
   'accrual'                     => '',
   'action= not defined!'        => '',
   'active'                      => '',
   'all'                         => '',
   'all entries'                 => '',
+  'always'                      => '',
   'and'                         => '',
   'ap_aging_list'               => '',
   'ar_aging_list'               => '',
-  'ar_chart isn\'t a valid chart' => '',
   'article_list'                => '',
   'as at'                       => '',
   'assembled'                   => '',
   'assembly'                    => '',
   'assembly_list'               => '',
+  'at'                          => '',
   'averaged values, in invoice mode only useful when filtered by a part' => '',
   'averconsumed_br'             => 'Ø monthly',
   'back'                        => '',
@@ -4409,24 +5029,28 @@ $self->{texts} = {
   'backend "#1" not enabled'    => '',
   'backend "#1" not found'      => '',
   'balance'                     => '',
+  'bank transaction exchange rate' => '',
   'bank_collection_payment_list_#1' => '',
   'bank_transfer_payment_list_#1' => '',
   'banktransfers'               => '',
   'basis for stock value'       => '',
+  'below the positions'         => '',
   'bestbefore #1'               => '',
   'bin_list'                    => '',
   'bis'                         => '',
   'brutto'                      => '',
   'building data'               => '',
   'building report'             => '',
+  'by'                          => '',
   'can not allocate #1 units of #2, missing #3 units' => '',
   'can not allocate enough resources for production' => '',
-  'can only parse a pdf file'   => '',
+  'can only parse a pdf or xml file' => '',
   'cash'                        => '',
   'chargenumber #1'             => '',
   'chart_of_accounts'           => '',
   'cleared'                     => '',
   'click here to edit cvars'    => '',
+  'click on a group to add the group\'s users' => '',
   'close'                       => '',
   'closed'                      => '',
   'companylogo_subtitle'        => '',
@@ -4441,13 +5065,15 @@ $self->{texts} = {
   'cp_greeting to cp_gender migration' => '',
   'customer_list'               => '',
   'dated'                       => '',
+  'default'                     => '',
+  'default exchange rate'       => '',
   'delete'                      => '',
   'delete item'                 => '',
   'delete order'                => '',
   'deleted'                     => '',
   'delivered'                   => '',
   'deliverydate'                => '',
-  'difference as skonto'        => '',
+  'desktop version'             => '',
   'direct debit'                => '',
   'disposed'                    => '',
   'disposed_br'                 => 'disposed',
@@ -4498,6 +5124,7 @@ $self->{texts} = {
   'http'                        => '',
   'https'                       => '',
   'imported'                    => '',
+  'in the time between'         => '',
   'inactive'                    => '',
   'income'                      => 'GUV and BWA',
   'internal error (see details)' => '',
@@ -4518,7 +5145,6 @@ $self->{texts} = {
   'kivitendo has found one or more problems in the general ledger.' => '',
   'kivitendo is about to update the database [ #1 ].' => '',
   'kivitendo is now able to manage warehouses instead of just tracking the amount of goods in your system.' => '',
-  'kivitendo modules'           => '',
   'kivitendo needs to update the authentication database before you can proceed.' => '',
   'kivitendo v#1'               => '',
   'kivitendo v#1 administration' => '',
@@ -4538,9 +5164,10 @@ $self->{texts} = {
   'monthly'                     => '',
   'more'                        => '',
   'natural person'              => '',
+  'needed qty'                  => '',
   'netto'                       => '',
   'never'                       => '',
-  'new order controller'        => '',
+  'new'                         => '',
   'next'                        => '',
   'no'                          => '',
   'no article assigned yet'     => '',
@@ -4548,9 +5175,11 @@ $self->{texts} = {
   'no bestbefore'               => '',
   'no chargenumber'             => '',
   'no execution for this client' => '',
+  'no partsgroup'               => '',
   'no shipping address'         => '',
   'no skonto_chart configured for taxkey #1 : #2 : #3' => '',
   'no tax_id in acc_trans'      => '',
+  'no undelivered items'        => '',
   'not a valid DTVF file, expected field header start with \'Umsatz; (..) ;Konto;Gegenkonto\'' => '',
   'not a valid DTVF file, expected first field in A1 \'DTVF\'' => '',
   'not configured'              => '',
@@ -4568,6 +5197,7 @@ $self->{texts} = {
   'oe.pl::search called with unknown type' => '',
   'old'                         => '',
   'on the same day'             => '',
+  'once'                        => '',
   'one time'                    => '',
   'one-time execution'          => '',
   'only OB Transactions'        => '',
@@ -4578,6 +5208,8 @@ $self->{texts} = {
   'part'                        => '',
   'part \'#\'1 in bin \'#2\' only with qty #3 (need additional #4) and chargenumber \'#5\'.' => '',
   'part_list'                   => '',
+  'pdf_records.zip'             => '',
+  'per month'                   => '',
   'percental'                   => '',
   'periodic'                    => '',
   'perpetual'                   => '',
@@ -4594,10 +5226,17 @@ $self->{texts} = {
   'prospective'                 => '',
   'purchase_delivery_order_list' => '',
   'purchase_order'              => '',
+  'purchase_order_confirmation' => '',
+  'purchase_order_confirmation_list' => '',
   'purchase_order_list'         => '',
+  'purchase_quotation_intake'   => '',
+  'purchase_quotation_intake_list' => '',
   'qty (to transfer)'           => '',
   'quarter'                     => '',
   'quotation_list'              => '',
+  'reclamation item'            => '',
+  'reclamation reasons'         => '',
+  'record exchange rate'        => '',
   'release_material'            => '',
   'renew'                       => '',
   'reorder item'                => '',
@@ -4615,27 +5254,31 @@ $self->{texts} = {
   'sales_delivery_order_printer' => '',
   'sales_invoice_printer'       => '',
   'sales_order'                 => '',
+  'sales_order_intake'          => '',
+  'sales_order_intake_list'     => '',
   'sales_order_list'            => '',
   'sales_quotation'             => '',
   'same as periodicity'         => '',
   'saved'                       => '',
-  'saved!'                      => '',
   'saving data'                 => '',
   'searched part not for purchase' => '',
   'searched part not for sale'  => '',
   'semiannually'                => '',
+  'send failed'                 => '',
   'sent'                        => '',
   'sent to printer'             => '',
   'service'                     => '',
   'service_list'                => '',
   'shipped'                     => '',
   'shipped_br'                  => 'shipped',
+  'simple'                      => '',
   'singular first char'         => '',
   'sort items'                  => '',
   'start upload'                => '',
   'stock'                       => '',
   'stock_br'                    => 'stock',
   'stocktaking'                 => '',
+  'storno_invoice'              => '',
   'succeeded'                   => '',
   'sum'                         => '',
   'supplier_delivery_order_list' => '',
@@ -4683,7 +5326,9 @@ $self->{texts} = {
   'warehouse_usage_list'        => '',
   'will be set upon posting'    => '',
   'will be set upon saving'     => '',
+  'with fuzzy skonto acc. to pt' => '',
   'with skonto acc. to pt'      => '',
+  'with_fuzzy_skonto_pt'        => '',
   'with_skonto_pt'              => '',
   'without skonto'              => '',
   'without_skonto'              => '',
@@ -4692,6 +5337,7 @@ $self->{texts} = {
   'yes'                         => '',
   'you can find professional help.' => '',
   '– all available test files –' => '',
+  '✖'                           => '',
 };
 
 1;
diff --git a/menus/admin/00-admin.yaml b/menus/admin/00-admin.yaml
index 86850271c..1a93d92c2 100644
--- a/menus/admin/00-admin.yaml
+++ b/menus/admin/00-admin.yaml
@@ -67,11 +67,21 @@
   params: 
     action: Admin/show_lock
 - parent: system
-  id: system_documentation_in_german_
+  id: program_documentation_in_german
   name: Documentation (in German)
   order: 200
+- parent: program_documentation_in_german
+  id: program_documentation_in_german_pdf
+  name: PDF
+  order: 100
   href: doc/kivitendo-Dokumentation.pdf
   target: _blank
+- parent: program_documentation_in_german
+  id: program_documentation_in_german_html
+  name: HTML
+  order: 200
+  href: doc/html/index.html
+  target: _blank
 - parent: system
   id: system_kivitendo_website_external_
   name: kivitendo website (external)
diff --git a/menus/mobile/00-erp.yaml b/menus/mobile/00-erp.yaml
index 448a5549b..4ab341e59 100644
--- a/menus/mobile/00-erp.yaml
+++ b/menus/mobile/00-erp.yaml
@@ -10,15 +10,21 @@
   params:
     action: ImageUpload/upload_image
     object_type: sales_delivery_order
+- id: scan_qrbill
+  name: Scan swiss QR bill
+  order: 200
+  access: ap_transactions
+  params:
+    action: ScanQRBill/scan_view
 - id: component_test
   name: Component Test
-  order: 200
+  order: 300
   access: developer
   params:
     action: MaterializeTest/components
 - id: modal_test
   name: Modal Test
-  order: 300
+  order: 400
   access: developer
   params:
     action: MaterializeTest/modal
diff --git a/menus/user/00-erp.yaml b/menus/user/00-erp.yaml
index 2a8777df2..dac842e4c 100644
--- a/menus/user/00-erp.yaml
+++ b/menus/user/00-erp.yaml
@@ -76,7 +76,7 @@
   name: Add Assortment
   icon: assortment_add
   order: 550
-  access: part_service_assembly_edit & client/feature_experimental_assortment
+  access: part_service_assembly_edit
   params:
     action: Part/add_assortment
 - parent: master_data
@@ -100,7 +100,7 @@
   name: Update Prices
   icon: prices_update
   order: 800
-  access: part_service_assembly_edit
+  access: part_service_assembly_edit & part_service_assembly_edit_prices
   params:
     action: PartsPriceUpdate/search_update_prices
 - parent: master_data
@@ -121,6 +121,7 @@
   name: Customers
   icon: customer_report
   order: 100
+  access: customer_report_view
   params:
     action: CustomerVendor/search
     db: customer
@@ -129,6 +130,7 @@
   name: Vendors
   icon: vendor_report
   order: 200
+  access: vendor_report_view
   params:
     action: CustomerVendor/search
     db: vendor
@@ -136,6 +138,7 @@
   id: master_data_reports_contacts
   name: Contacts
   order: 300
+  access: contact_person_report_view
   params:
     action: CustomerVendor/search_contact
     db: customer
@@ -178,36 +181,24 @@
   access: requirement_spec_edit
   params:
     action: RequirementSpec/new
-- parent: ar
-  id: ar_add_quotation
-  name: Add Quotation
-  icon: quotation_add
-  order: 200
-  access: sales_quotation_edit
-  module: oe.pl
-  params:
-    action: add
-    type: sales_quotation
-- parent: ar
-  id: ar_add_sales_order
-  name: Add Sales Order
-  icon: sales_order_add
-  order: 300
-  access: sales_order_edit
-  module: oe.pl
-  params:
-    action: add
-    type: sales_order
 - parent: ar
   id: ar_add_delivery_order
   name: Add Delivery Order
   icon: delivery_order_add
   order: 400
   access: sales_delivery_order_edit
-  module: do.pl
   params:
-    action: add
+    action: DeliveryOrder/add
     type: sales_delivery_order
+- parent: ar
+  id: ar_add_sales_reclamation
+  name: Add Sales Reclamation
+    #icon: reclamation_add TODO(Tamino): add icons
+  order: 450
+  access: sales_reclamation_edit & client/show_sales_reclamation
+  params:
+    action: Reclamation/add
+    type: sales_reclamation
 - parent: ar
   id: ar_add_sales_invoice
   name: Add Sales Invoice
@@ -300,11 +291,21 @@
   params:
     action: search
     type: sales_delivery_order
+- parent: ar_reports
+  id: ar_report_sales_reclamation
+  name: Sales Reclamation
+    #icon: reclamation_add TODO(Tamino): add icons
+  order: 450
+  access: sales_reclamation_edit & client/show_sales_reclamation
+  params:
+    action: Reclamation/list
+    type: sales_reclamation
 - parent: ar_reports
   id: ar_reports_invoices_credit_notes_ar_transactions
   name: Invoices, Credit Notes & AR Transactions
   icon: invoices_report
   order: 500
+  access: invoice_edit | sales_invoice_view | sales_all_edit | state/has_employee_project_invoices
   module: ar.pl
   params:
     action: search
@@ -313,7 +314,7 @@
   id: ar_reports_sales_report
   name: Sales Report
   order: 600
-  access: invoice_edit
+  access: sales_report
   module: vk.pl
   params:
     action: search_invoice
@@ -331,7 +332,7 @@
   id: ar_order_item_search
   name: Order item search
   order: 750
-  access: sales_order_edit
+  access: sales_order_item_search
   params:
     action: OrderItem/search
 - parent: ar_reports
@@ -354,7 +355,7 @@
   id: ar_reports_financial_controlling
   name: Financial Controlling
   order: 1000
-  access: sales_order_edit
+  access: sales_financial_controlling
   params:
     action: FinancialControllingReport/list
 - parent: ar_reports
@@ -390,35 +391,23 @@
   name: AP
   icon: ap
   order: 300
-- parent: ap
-  id: ap_add_rfq
-  name: Add RFQ
-  icon: rfq_add
-  order: 100
-  access: request_quotation_edit
-  module: oe.pl
-  params:
-    action: add
-    type: request_quotation
-- parent: ap
-  id: ap_add_purchase_order
-  name: Add Purchase Order
-  icon: purchase_order_add
-  order: 200
-  access: purchase_order_edit
-  module: oe.pl
-  params:
-    action: add
-    type: purchase_order
 - parent: ap
   id: ap_add_delivery_note
   name: Add Delivery Note
   order: 300
   access: client/allow_new_purchase_delivery_order & purchase_delivery_order_edit
-  module: do.pl
   params:
-    action: add
+    action: DeliveryOrder/add
     type: purchase_delivery_order
+- parent: ap
+  id: ap_add_purchase_reclamation
+  name: Add Purchase Reclamation
+    #icon: reclamation_add TODO(Tamino): add icons
+  order: 350
+  access: purchase_reclamation_edit & client/show_purchase_reclamation
+  params:
+    action: Reclamation/add
+    type: purchase_reclamation
 - parent: ap
   id: ap_add_vendor_invoice
   name: Add Vendor Invoice
@@ -479,10 +468,20 @@
   params:
     action: search
     type: supplier_delivery_order
+- parent: ap_reports
+  id: ap_report_purchase_reclamation
+  name: Purchase Reclamation
+    #icon: reclamation_add TODO(Tamino): add icons
+  order: 370
+  access: purchase_reclamation_edit & client/show_purchase_reclamation
+  params:
+    action: Reclamation/list
+    type: purchase_reclamation
 - parent: ap_reports
   id: ap_reports_vendor_invoices_ap_transactions
   name: Vendor Invoices & AP Transactions
   order: 400
+  access: vendor_invoice_edit | purchase_invoice_view | purchase_all_edit | state/has_employee_project_invoices
   module: ap.pl
   params:
     action: search
@@ -842,9 +841,15 @@
   icon: chart_of_accounts
   order: 100
   access: report
-  module: ca.pl
   params:
-    action: chart_of_accounts
+    action: ChartOfAccounts/list
+- parent: reports
+  id: reports_list_transactions
+  name: List Transactions
+  order: 150
+  access: report
+  params:
+    action: ListTransactions/report_settings
 - parent: reports
   id: reports_trial_balance
   name: Trial Balance
@@ -925,24 +930,6 @@
   access: report
   params:
     action: LiquidityProjection/show
-- id: mebil
-  name: Mebil
-  icon: wtg
-  order: 750
-- parent: mebil
-  id: mebil_showmap
-  name: Map anzeigen
-  order: 100
-  access: report
-  params:
-    action: Mebil/showmap
-- parent: mebil
-  id: mebil_calcmap
-  name: Map berechnen
-  order: 200
-  access: report
-  params:
-    action: Mebil/calcmap
 - id: batch_printing
   name: Batch Printing
   icon: printing
@@ -1197,6 +1184,14 @@
   params:
     action: SimpleSystemSetting/list
     type: price_factor
+- parent: system
+  id: system_reclamation_reasons
+  name: Reclamation Reasons
+  order: 1220
+  access: client/show_sales_reclamation | client/show_purchase_reclamation
+  params:
+    action: ReclamationReason/list
+    type: reclamation_reason
 - parent: system
   id: system_greetings
   name: Greetings
@@ -1232,6 +1227,13 @@
   params:
     action: SimpleSystemSetting/list
     type: contact_department
+- parent: system
+  id: system_order_statuses
+  name: RFQ/Order Statuses
+  order: 1500
+  params:
+    action: SimpleSystemSetting/list
+    type: order_status
 - parent: system
   id: system_project_types
   name: Project Types
@@ -1437,6 +1439,13 @@
   params:
     action: CsvImport/new
     profile.type: ar_transactions
+- parent: system_import_csv
+  id: system_import_csv_ap_transactions
+  name: AP Transactions
+  order: 820
+  params:
+    action: CsvImport/new
+    profile.type: ap_transactions
 - parent: system
   id: system_templates
   name: Templates
@@ -1537,22 +1546,6 @@
   params:
     action: company_logo
     no_todo_list: 1
-- parent: program
-  id: program_kivitendo_modul
-  name: kivitendo modules
-  order: 350
-- parent: program_kivitendo_modul
-  id: program_kivitendo_modul_overview
-  name: Overview kivitendo modules
-  order: 100
-  href: http://www.kivitendo-premium.de/module.shtml
-  target: _blank
-- parent: program_kivitendo_modul
-  id: program_kivitendo_modul_activate
-  name: Activate kivitendo module
-  order: 200
-  href: http://www.kivitendo-premium.de/modul-aktivieren.shtml
-  target: _blank
 - parent: program
   id: program_administration_area
   name: Administration area
@@ -1561,11 +1554,21 @@
   params:
     action: Admin/login
 - parent: program
-  id: program_documentation_in_german_
+  id: program_documentation_in_german
   name: Documentation (in German)
   order: 500
+- parent: program_documentation_in_german
+  id: program_documentation_in_german_pdf
+  name: PDF
+  order: 100
   href: doc/kivitendo-Dokumentation.pdf
   target: _blank
+- parent: program_documentation_in_german
+  id: program_documentation_in_german_html
+  name: HTML
+  order: 200
+  href: doc/html/index.html
+  target: _blank
 - parent: program
   id: program_kivitendo_website_external_
   name: kivitendo website (external)
@@ -1585,11 +1588,59 @@
   icon: developer
   order: 1200
   access: developer
+- parent: develop
+  id: generic_presenter_test
+  name: Generic Presenter Test
+  access: developer
+  order: 100
+  params:
+    action: GenericPresenterTest/show
 - parent: develop
   id: part_test
   name: Part Test
   access: developer
   icon: part
-  order: 100
+  order: 150
   params:
     action: Part/test_page
+- parent: develop
+  id: chart_test
+  name: Chart Test
+  access: developer
+  order: 200
+  params:
+    action: Chart/test_page
+- parent: develop
+  id: customervendor_test
+  name: Customer-Vendor Test
+  access: developer
+  order: 300
+  params:
+    action: CustomerVendor/test_page
+- parent: develop
+  id: project_test
+  name: Project Test
+  access: developer
+  order: 400
+  params:
+    action: Project/test_page
+- parent: develop
+  id: ckeditor_test
+  name: CKEditor5 Test
+  access: developer
+  order: 450
+  params:
+    action: Test/ckeditor_test_page
+- parent: develop
+  id: js_tests
+  name: JS Tests
+  access: developer
+  order: 500
+  params:
+    action: JSTests/run
+- parent: develop
+  id: css_documentation_in_german_html
+  name: CSS-Documentation
+  order: 600
+  href: css/design40/manual/index.html
+  target: _blank
diff --git a/menus/user/10-custom-data-export.yaml b/menus/user/10-custom-data-export.yaml
index bbe7e8b31..09870050f 100644
--- a/menus/user/10-custom-data-export.yaml
+++ b/menus/user/10-custom-data-export.yaml
@@ -1,13 +1,14 @@
 ---
 - parent: reports
   id: custom_data_export
-  name: Custom data export
+  name: Custom report
   order: 9000
+  access: custom_data_report
   params:
     action: CustomDataExport/list
 - parent: system
   id: custom_data_export_designer
-  name: Custom data export
+  name: Custom report
   order: 2250
   access: custom_data_export_designer
   params:
diff --git a/menus/user/10-disposition-manager.yaml b/menus/user/10-disposition-manager.yaml
new file mode 100644
index 000000000..c922c8839
--- /dev/null
+++ b/menus/user/10-disposition-manager.yaml
@@ -0,0 +1,15 @@
+---
+- parent: ap
+  id: ap_disp_manager_onhand
+  name: List short onhand
+  order: 160
+  access: request_quotation_edit
+  params:
+    action: DispositionManager/list_parts
+- parent: ap
+  id: ap_disp_manager_basket
+  name: Show purchase basket
+  order: 170
+  access: request_quotation_edit
+  params:
+    action: DispositionManager/show_basket
diff --git a/menus/user/10-mebil.yaml b/menus/user/10-mebil.yaml
new file mode 100644
index 000000000..27eedfb0f
--- /dev/null
+++ b/menus/user/10-mebil.yaml
@@ -0,0 +1,19 @@
+- id: mebil
+  name: Mebil
+  icon: wtg
+  order: 750
+- parent: mebil
+  id: mebil_showmap
+  name: Map anzeigen
+  order: 100
+  access: report
+  params:
+    action: Mebil/showmap
+- parent: mebil
+  id: mebil_calcmap
+  name: Map berechnen
+  order: 200
+  access: report
+  params:
+    action: Mebil/calcmap
+
diff --git a/menus/user/10-order-controller.yaml b/menus/user/10-order-controller.yaml
index f4ec4d10f..6a172d9a7 100644
--- a/menus/user/10-order-controller.yaml
+++ b/menus/user/10-order-controller.yaml
@@ -1,50 +1,37 @@
 - parent: ar
   id: ar_add_quotation
-  access: sales_quotation_edit & (!client/feature_experimental_order)
-- parent: ar
-  id: ar_add_sales_order
-  access: sales_order_edit & (!client/feature_experimental_order)
-- parent: ap
-  id: ap_add_rfq
-  access: request_quotation_edit & (!client/feature_experimental_order)
-- parent: ap
-  id: ap_add_purchase_order
-  access: purchase_order_edit & (!client/feature_experimental_order)
-
-- parent: ar
-  id: ar_add_quotation_experimental
   name: Add Quotation
   icon: quotation_add
   order: 250
-  access: sales_quotation_edit & client/feature_experimental_order
+  access: sales_quotation_edit
   params:
     action: Order/add
     type: sales_quotation
 - parent: ar
-  id: ar_add_sales_order_experimental
+  id: ar_add_sales_order
   name: Add Sales Order
   icon: sales_order_add
   order: 350
-  access: sales_order_edit & client/feature_experimental_order
+  access: sales_order_edit
   params:
     action: Order/add
     type: sales_order
 
 - parent: ap
-  id: ap_add_rfq_experimental
+  id: ap_add_rfq
   name: Add RFQ
   icon: rfq_add
   order: 150
-  access: request_quotation_edit & client/feature_experimental_order
+  access: request_quotation_edit
   params:
     action: Order/add
     type: request_quotation
 - parent: ap
-  id: ap_add_purchase_order_experimental
+  id: ap_add_purchase_order
   name: Add Purchase Order
   icon: purchase_order_add
   order: 250
-  access: purchase_order_edit & client/feature_experimental_order
+  access: purchase_order_edit
   params:
     action: Order/add
     type: purchase_order
diff --git a/menus/user/20-invoice-for-advance-payment.yaml b/menus/user/20-invoice-for-advance-payment.yaml
index b76dcadf7..3ee5d354e 100644
--- a/menus/user/20-invoice-for-advance-payment.yaml
+++ b/menus/user/20-invoice-for-advance-payment.yaml
@@ -3,7 +3,7 @@
   name: Add Invoice for Advance Payment
   icon: sales_invoice_add
   order: 550
-  access: invoice_edit
+  access: invoice_edit & client/show_invoice_for_advance_payment
   module: is.pl
   params:
     action: add
diff --git a/menus/user/90-purchase-order-confirmation.yaml b/menus/user/90-purchase-order-confirmation.yaml
new file mode 100644
index 000000000..9db787493
--- /dev/null
+++ b/menus/user/90-purchase-order-confirmation.yaml
@@ -0,0 +1,19 @@
+- parent: ap
+  id: ap_add_purchase_order_confirmation
+  name: Add Purchase Order Confirmation
+  icon: purchase_order_add
+  order: 250
+  access: purchase_order_edit & client/show_purchase_order_confirmation
+  params:
+    action: Order/add
+    type: purchase_order_confirmation
+- parent: ap_reports
+  id: ap_reports_purchase_order_confirmations
+  name: Purchase Order Confirmations
+  icon: purchase_order_report
+  order: 250
+  access: (purchase_order_edit | purchase_order_view) & client/show_purchase_order_confirmation
+  module: oe.pl
+  params:
+    action: search
+    type: purchase_order_confirmation
diff --git a/menus/user/90-purchase-quotation-intake.yaml b/menus/user/90-purchase-quotation-intake.yaml
new file mode 100644
index 000000000..3ea0046dd
--- /dev/null
+++ b/menus/user/90-purchase-quotation-intake.yaml
@@ -0,0 +1,19 @@
+- parent: ap
+  id: ap_add_purchase_quotation_intake
+  name: Add Purchase Quotation Intake
+  icon: rfq_add
+  order: 150
+  access: request_quotation_edit & client/show_purchase_quotation_intake
+  params:
+    action: Order/add
+    type: purchase_quotation_intake
+- parent: ap_reports
+  id: ap_reports_purchase_quotation_intakes
+  name: Purchase Quotation Intakes
+  icon: rfq_report
+  order: 150
+  access: (request_quotation_edit | request_quotation_view) & client/show_purchase_quotation_intake
+  module: oe.pl
+  params:
+    action: search
+    type: purchase_quotation_intake
diff --git a/menus/user/90-sales-order-intake.yaml b/menus/user/90-sales-order-intake.yaml
new file mode 100644
index 000000000..69d24cff2
--- /dev/null
+++ b/menus/user/90-sales-order-intake.yaml
@@ -0,0 +1,25 @@
+- parent: ar
+  id: ar_add_sales_order_intake
+  name: Add Sales Order Intake
+  icon: sales_order_add
+  order: 290
+  access: sales_order_edit & client/show_sales_order_intake
+  params:
+    action: Order/add
+    type: sales_order_intake
+- parent: ar
+  id: ar_add_sales_order
+  name: Add Sales Order Confirmation
+- parent: ar_reports
+  id: ar_reports_sales_order_intakes
+  name: Sales Order Intakes
+  icon: report_sales_orders
+  order: 280
+  access: (sales_order_edit | sales_order_view) & client/show_sales_order_intake
+  module: oe.pl
+  params:
+    action: search
+    type: sales_order_intake
+- parent: ar_reports
+  id: ar_reports_sales_orders
+  name: Sales Order Confirmations
diff --git a/scripts/build_doc.sh b/scripts/build_doc.sh
index 2efa9b991..0c4f48ef5 100755
--- a/scripts/build_doc.sh
+++ b/scripts/build_doc.sh
@@ -13,6 +13,13 @@ fi
 
 doc=${PWD}/doc
 
+if [[ ! -d doc/build/dobudish ]]; then
+  echo "  ERROR: looks like 'doc/build/dobudish' DIR is missing"
+  echo "   - You need to get 'dobudish-nojre-1.1.4.zip' from https://code.google.com/archive/p/dobudish/downloads"
+  echo "   - Download and unpack ( unzip dobudish-nojre-1.1.4.zip -d doc/build )"
+  echo "   - create dobudish symlink ( ln -sf dobudish-1.1.4 doc/build/dobudish )"
+fi
+
 html=1
 pdf=1
 images=1
@@ -36,14 +43,7 @@ if [[ ! -z $1 ]] ; then
   done
 fi
 
-dobudish=$(ls -d doc/build/dobudish* 2> /dev/null)
-
-if [[ -z $dobudish ]] || [[ ! -d ${dobudish} ]]; then
-  echo "There's no dobudish directory inside doc/build OR more than one file / dir starting with dobudish (hint: zip file downloaded there?)."
-  exit 1
-fi
-
-cd ${dobudish}
+cd doc/build/dobudish
 
 base=documents/dokumentation
 if [[ ! -d $base ]]; then
diff --git a/scripts/csv-import-from-shell.sh b/scripts/csv-import-from-shell.sh
index 94e44355d..70e3b953b 100755
--- a/scripts/csv-import-from-shell.sh
+++ b/scripts/csv-import-from-shell.sh
@@ -127,7 +127,7 @@ function do_curl {
     -X 'POST' \
     -H 'Content-Type:multipart/form-data' \
     --silent --insecure \
-    -F 'action=CsvImport/dispatch' \
+    -F 'action=CsvImport/import' \
     -F "${action}=1" \
     -F 'escape_char=quote' \
     -F 'profile.type=parts' \
diff --git a/scripts/find-use.pl b/scripts/find-use.pl
index b2a3c0daf..cad3d21a1 100755
--- a/scripts/find-use.pl
+++ b/scripts/find-use.pl
@@ -25,6 +25,12 @@ my (%uselines, %modules, %supplied, %requires);
     'DateTime::Duration'                 => 1,
     'DateTime::Infinite'                 => 1,
   },
+  'Exception::Class' => {
+    'Exception::Class::Base'             => 1,
+  },
+  'Rose::DB' => {
+    'Rose::DB::Cache'                    => 1,
+  },
   'Rose::DB::Object' => {
    'Rose::DB::Object::ConventionManager' => 1,
    'Rose::DB::Object::Manager'           => 1,
@@ -89,7 +95,7 @@ find(sub {
     next if /SL::/;
     next if /Support::Files/; # our own test support module
     next if /use (warnings|strict|vars|lib|constant|utf8)/;
-    next if /^use (with|the)/;
+    next if /^use (it|the|with)/;
 
     my ($useline) = m/^use\s+(.*?)$/;
 
diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index 33fd7ca73..643479ebe 100755
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -13,11 +13,11 @@ BEGIN {
 
 use strict;
 use Getopt::Long;
-use List::MoreUtils qw(uniq);
 use Pod::Usage;
 use Term::ANSIColor;
 use Text::Wrap;
 
+my $exit_code = 0;
 unless (eval { require Config::Std; 1 }){
   print STDERR <<EOL ;
 +------------------------------------------------------------------------------+
@@ -35,9 +35,30 @@ unless (eval { require Config::Std; 1 }){
 +------------------------------------------------------------------------------+
 EOL
 
-  exit 72;
+  $exit_code = 72;
 }
 
+
+unless (eval { require List::MoreUtils; 1 }){
+  print STDERR <<EOL ;
++------------------------------------------------------------------------------+
+  Perl Modul List::MoreUtils could not be loaded.
+
+  Debian: you may install the needed *.deb package with:
+    apt install liblist-moreutils-perl
+
+  Red Hat/Fedora/CentOS: you may install the needed *.rpm package with:
+    dnf install perl-List-MoreUtils
+
+
++------------------------------------------------------------------------------+
+EOL
+
+  $exit_code = 72;
+}
+
+exit $exit_code if $exit_code;
+
 use SL::InstallationCheck;
 use SL::LxOfficeConf;
 
@@ -149,24 +170,9 @@ sub check_latex {
   # no pdfx -> no zugferd possible
   my $ret = kpsewhich('template/print/', 'sty', 'pdfx');
   die "Cannot use pdfx. Please install this package first (debian: apt install texlive-latex-extra)"  if $ret;
-  # check version 2018
-  my $latex = $::lx_office_conf{applications}->{latex} || 'pdflatex';
-  my $pdfx = (system ${latex} . ' --interaction=batchmode "\documentclass{minimal} \RequirePackage{pdfx} \csname @ifpackagelater\endcsname{pdfx}{2018/12/22}{}{\show\relax} \begin{document} \end{document}"');
-
-  print_result ("Looking for pdfx version 2018 or higher", !$pdfx);
-  push @missing_modules, \(name => 'pdfx') if $pdfx;
-
   if ($res) {
     check_template_dir($_) for SL::InstallationCheck::template_dirs($master_templates);
   }
-  print STDERR <<EOL if $pdfx;
-+------------------------------------------------------------------------------+
-  Your pdfx version is too old. You cannot use ZuGFeRD or modern (2018+)
-  templates. Please consider using a more recent LaTeX environment.
-  Verify with:
-  pdflatex --interaction=batchmode "\RequirePackage{pdfx}[2018/12/22]"
-+------------------------------------------------------------------------------+
-EOL
 }
 
 sub check_template_dir {
@@ -176,7 +182,7 @@ sub check_template_dir {
   print_header("Checking LaTeX Dependencies for Master Templates '$dir'");
   kpsewhich($path, 'cls', $_) for SL::InstallationCheck::classes_from_latex($path, '\documentclass');
 
-  my @sty = sort { $a cmp $b } uniq (
+  my @sty = sort { $a cmp $b } List::MoreUtils::uniq (
     SL::InstallationCheck::classes_from_latex($path, '\usepackage'),
     qw(textcomp ulem embedfile)
   );
diff --git a/scripts/locales.pl b/scripts/locales.pl
index 1bf35df98..74356ebee 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -43,7 +43,8 @@ my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
 my @progdirs     = ( "$basedir/SL" );
 my @menufiles    = glob("${basedir}/menus/*/*");
-my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages', $basedir .'/templates/mobile_webpages');
+my @webpages     = qw(webpages mobile_webpages design40_webpages);
+my @javascript_dirs = ($basedir .'/js', map { $basedir .'/templates/' . $_ } @webpages);
 my $javascript_output_dir = $basedir .'/js';
 my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
 our $self        = {};
@@ -52,7 +53,7 @@ our @lost        = ();
 
 my %ignore_unused_templates = (
   map { $_ => 1 } qw(ct/testpage.html oe/periodic_invoices_email.txt part/testpage.html t/render.html t/render.js task_server/failure_notification_email.txt
-                     failed_background_jobs_report/email.txt)
+                     failed_background_jobs_report/email.txt presenter/items_list/items_list.txt)
 );
 
 my (%referenced_html_files, %locale, %htmllocale, %alllocales, %cached, %submit, %jslocale);
@@ -440,7 +441,7 @@ sub scanfile {
         }
 
         my $found_one = 0;
-        for my $space (qw(webpages mobile_webpages)) {
+        for my $space (@webpages) {
           for my $ext (qw(html js json)) {
             my $new_file = "$basedir/templates/$space/$new_file_name.$ext";
             if (-f $new_file) {
@@ -695,7 +696,7 @@ sub scan_javascript_file {
   close($fh);
 }
 sub search_unused_htmlfiles {
-  my @unscanned_dirs = ('../../templates/webpages', '../../templates/mobile_webpages');
+  my @unscanned_dirs = map {  '../../templates/' . $_ } @webpages;
 
   while (scalar @unscanned_dirs) {
     my $dir = shift @unscanned_dirs;
diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl
index 2ab34cb90..9db191d04 100755
--- a/scripts/rose_auto_create_model.pl
+++ b/scripts/rose_auto_create_model.pl
@@ -72,9 +72,10 @@ our %foreign_key_name_map     = (
     ap                        => { payment_id => 'payment_terms', },
 
     orderitems                => { parts_id => 'part', trans_id => 'order', },
+    reclamation_items         => { parts_id => 'part' },
     delivery_order_items      => { parts_id => 'part' },
     invoice                   => { parts_id => 'part' },
-    follow_ups                => { created_for_user => 'created_for_employee', created_by => 'created_by_employee', },
+    follow_ups                => { created_by => 'created_by_employee', },
     follow_up_access          => { who => 'with_access', what => 'to_follow_ups_by', },
 
     periodic_invoices_configs => { oe_id => 'order', email_recipient_contact_id => 'email_recipient_contact' },
diff --git a/scripts/xmlinvoice-cli.pl b/scripts/xmlinvoice-cli.pl
new file mode 100755
index 000000000..191f77ec2
--- /dev/null
+++ b/scripts/xmlinvoice-cli.pl
@@ -0,0 +1,50 @@
+#!/usr/bin/perl
+
+# Script for test driving SL::XMLInvoice. Use on extracted XML invoice payloads
+# (faktur-x.xml) from ZUGFeRD invoices or XRechnung invoices. PDF extraction is
+# not supported.
+
+BEGIN {
+  use FindBin;
+
+  unshift(@INC, $FindBin::Bin . '/../modules/override'); # Use our own versions of various modules (e.g. YAML).
+  push   (@INC, $FindBin::Bin . '/..');
+}
+
+use SL::XMLInvoice;
+
+use utf8;
+
+if ( scalar(@ARGV) == 0 )
+  {
+  die "usage: $0 <xml invoice file> [ ... <xml invoice file> ]\n";
+  }
+
+foreach my $xml_file ( @ARGV) {
+  my $xml_data = "";
+
+  open F, $xml_file or die "Couldn't open $xml_file for reading: $!\n";
+
+  while (my $line = <F> ) { $xml_data .= $line; }
+  close F;
+
+  my $parser = SL::XMLInvoice->new($xml_data);
+
+  if ( ${$parser}{'result'} != SL::XMLInvoice->RES_OK )
+    {
+    die "Parser creation failed: ${$parser}{'message'}\n";
+    }
+
+  foreach my $key ( keys %{$parser->metadata} )
+    {
+    print "$key: |" . $parser->metadata->{$key} . "|\n";
+    }
+
+  foreach my $item ( @{$parser->items} ) {
+    my %line_item = %{$item};
+      foreach my $field ( keys %line_item ) {
+        print "  $field: |$line_item{$field}|\n";
+      }
+    print "\n";
+  }
+}
diff --git a/sql/Pg-upgrade2-auth/release_3_7_0.sql b/sql/Pg-upgrade2-auth/release_3_7_0.sql
new file mode 100644
index 000000000..d711ca6bc
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/release_3_7_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_7_0
+-- @description: Abhängigkeitsscript für Release 3.7.0
+-- @depends: release_3_6_1
diff --git a/sql/Pg-upgrade2-auth/release_3_8_0.sql b/sql/Pg-upgrade2-auth/release_3_8_0.sql
new file mode 100644
index 000000000..d89dd733e
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/release_3_8_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_8_0
+-- @description: Abhängigkeitsscript für Release 3.8.0
+-- @depends: release_3_7_0 rights_for_reclamation
diff --git a/sql/Pg-upgrade2-auth/release_3_9_0.sql b/sql/Pg-upgrade2-auth/release_3_9_0.sql
new file mode 100644
index 000000000..8b8c8304f
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/release_3_9_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_0
+-- @description: Abhängigkeitsscript für Release 3.9.0
+-- @depends: release_3_8_0
diff --git a/sql/Pg-upgrade2-auth/release_3_9_1.sql b/sql/Pg-upgrade2-auth/release_3_9_1.sql
new file mode 100644
index 000000000..b890dc0fa
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/release_3_9_1.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_1
+-- @description: Abhängigkeitsscript für Release 3.9.1
+-- @depends: release_3_9_0 right_sales_order_item_search rights_view_cp_report rights_order_reports_amounts right_custom_data_report right_part_master_data_prices right_financial_controlling right_sales_report
diff --git a/sql/Pg-upgrade2-auth/release_3_9_2.sql b/sql/Pg-upgrade2-auth/release_3_9_2.sql
new file mode 100644
index 000000000..e731818e3
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/release_3_9_2.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_2
+-- @description: Abhängigkeitsscript für Release 3.9.2
+-- @depends: release_3_9_1 set_all_users_to_design40
diff --git a/sql/Pg-upgrade2-auth/right_custom_data_report.sql b/sql/Pg-upgrade2-auth/right_custom_data_report.sql
new file mode 100644
index 000000000..a05b74a09
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_custom_data_report.sql
@@ -0,0 +1,16 @@
+-- @tag: right_custom_data_report
+-- @description: Recht, um benutzerdef. Berichte überhaupt nutzen zu können
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: May use Custom Data Report at all
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 20 FROM auth.master_rights WHERE name = 'advance_turnover_tax_return'),
+          'custom_data_report',
+          'May use Custom Data Report at all',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'custom_data_report', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE "right" LIKE 'report';
diff --git a/sql/Pg-upgrade2-auth/right_financial_controlling.sql b/sql/Pg-upgrade2-auth/right_financial_controlling.sql
new file mode 100644
index 000000000..8d6d31f5c
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_financial_controlling.sql
@@ -0,0 +1,16 @@
+-- @tag: right_financial_controlling
+-- @description: eigenes Recht für Finanz-Controlling-Bericht
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: Show sales financial controlling
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position - 40 FROM auth.master_rights WHERE name = 'delivery_plan'),
+          'sales_financial_controlling',
+          'Show sales financial controlling',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'sales_financial_controlling', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE "right" LIKE 'sales_order_edit' AND granted IS TRUE;
diff --git a/sql/Pg-upgrade2-auth/right_part_master_data_prices.sql b/sql/Pg-upgrade2-auth/right_part_master_data_prices.sql
new file mode 100644
index 000000000..bed4ca644
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_part_master_data_prices.sql
@@ -0,0 +1,16 @@
+-- @tag: right_part_master_data_prices
+-- @description: Recht, um Preise in Artikelstammdaten zu bearbeiten
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: Edit prices for parts, services, assemblies
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 10 FROM auth.master_rights WHERE name = 'part_service_assembly_edit'),
+          'part_service_assembly_edit_prices',
+          'Edit prices for parts, services, assemblies',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'part_service_assembly_edit_prices', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE "right" LIKE 'part_service_assembly_edit';
diff --git a/sql/Pg-upgrade2-auth/right_sales_order_item_search.sql b/sql/Pg-upgrade2-auth/right_sales_order_item_search.sql
new file mode 100644
index 000000000..d5ed362da
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_sales_order_item_search.sql
@@ -0,0 +1,16 @@
+-- @tag: right_sales_order_item_search
+-- @description: eigenes Recht für Auftragsartikelsuche
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: Show sales order item search
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position - 50 FROM auth.master_rights WHERE name = 'delivery_plan'),
+          'sales_order_item_search',
+          'Show sales order item search',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'sales_order_item_search', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE "right" LIKE 'sales_order_edit' AND granted IS TRUE;
diff --git a/sql/Pg-upgrade2-auth/right_sales_report.sql b/sql/Pg-upgrade2-auth/right_sales_report.sql
new file mode 100644
index 000000000..d3b5648d3
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/right_sales_report.sql
@@ -0,0 +1,16 @@
+-- @tag: right_sales_report
+-- @description: eigenes Recht für Verkaufsbericht
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: Show sales report
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position - 30 FROM auth.master_rights WHERE name = 'delivery_plan'),
+          'sales_report',
+          'Show sales report',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'sales_report', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE "right" LIKE 'invoice_edit' AND granted IS TRUE;
diff --git a/sql/Pg-upgrade2-auth/rights_for_reclamation.sql b/sql/Pg-upgrade2-auth/rights_for_reclamation.sql
new file mode 100644
index 000000000..ca3e21c49
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/rights_for_reclamation.sql
@@ -0,0 +1,22 @@
+-- @tag: rights_for_reclamation
+-- @description: Add rights for reclamation
+-- @depends: release_3_5_7
+-- @locales: Create and edit sales reclamation
+-- @locales: Create and edit purchase reclamation
+
+INSERT INTO auth.master_rights (position, name, description, category)
+VALUES (1150, 'sales_reclamation_edit', 'Create and edit sales reclamation', false);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT id, 'sales_reclamation_edit', true
+  FROM auth.group
+  WHERE name = 'Vollzugriff';
+
+INSERT INTO auth.master_rights (position, name, description, category)
+VALUES (2450, 'purchase_reclamation_edit', 'Create and edit purchase reclamation', false);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT id, 'purchase_reclamation_edit', true
+  FROM auth.group
+  WHERE name = 'Vollzugriff';
+
diff --git a/sql/Pg-upgrade2-auth/rights_order_reports_amounts.sql b/sql/Pg-upgrade2-auth/rights_order_reports_amounts.sql
new file mode 100644
index 000000000..d71b3b737
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/rights_order_reports_amounts.sql
@@ -0,0 +1,31 @@
+-- @tag: rights_order_reports_amounts
+-- @description: Rechte, um Auftragslisten mit Preisen zu sehen
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: Show sales order reports with amounts (and links to open documents)
+-- @locales: Show purchase order reports with amounts (and links to open documents)
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 5 FROM auth.master_rights WHERE name = 'sales_order_view'),
+          'sales_order_reports_amounts',
+          'Show sales order reports with amounts (and links to open documents)',
+          FALSE);
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 5 FROM auth.master_rights WHERE name = 'purchase_order_view'),
+          'purchase_order_reports_amounts',
+          'Show purchase order reports with amounts (and links to open documents)',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'sales_order_reports_amounts', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE ("right" LIKE 'sales_order_edit' AND granted = TRUE)
+       OR ("right" LIKE 'sales_order_view' AND granted = TRUE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'purchase_order_reports_amounts', TRUE
+    FROM auth.group
+    LEFT JOIN auth.group_rights ON (auth.group.id = auth.group_rights.group_id)
+    WHERE ("right" LIKE 'purchase_order_edit' AND granted = TRUE)
+       OR ("right" LIKE 'purchase_order_view' AND granted = TRUE);
diff --git a/sql/Pg-upgrade2-auth/rights_view_cp_report.sql b/sql/Pg-upgrade2-auth/rights_view_cp_report.sql
new file mode 100644
index 000000000..2a6345fcf
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/rights_view_cp_report.sql
@@ -0,0 +1,14 @@
+-- @tag: rights_view_cp_report
+-- @description: Recht, um auf Ansprechpersonen-Bericht zugreifen zu können
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps rights_view_cv_report
+-- @locales: View contact person report
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 10 FROM auth.master_rights WHERE name = 'vendor_report_view'),
+          'contact_person_report_view',
+          'View contact person report',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'contact_person_report_view', TRUE
+    FROM auth.group;
diff --git a/sql/Pg-upgrade2-auth/rights_view_cv_report.sql b/sql/Pg-upgrade2-auth/rights_view_cv_report.sql
new file mode 100644
index 000000000..1c45cbdf8
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/rights_view_cv_report.sql
@@ -0,0 +1,25 @@
+-- @tag: rights_view_cv_report
+-- @description: Recht, um auf Kunden-/Lieferanten-Stammdaten-Bericht zugreifen zu können
+-- @depends: release_3_9_0 add_master_rights master_rights_position_gaps
+-- @locales: View customer report
+-- @locales: View vendor report
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 10 FROM auth.master_rights WHERE name = 'customer_vendor_all_edit'),
+          'customer_report_view',
+          'View customer report',
+          FALSE);
+
+INSERT INTO auth.master_rights (position, name, description, category)
+  VALUES ((SELECT position + 10 FROM auth.master_rights WHERE name = 'customer_report_view'),
+          'vendor_report_view',
+          'View vendor report',
+          FALSE);
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'customer_report_view', TRUE
+    FROM auth.group;
+
+INSERT INTO auth.group_rights (group_id, "right", granted)
+  SELECT DISTINCT(id), 'vendor_report_view', TRUE
+    FROM auth.group;
diff --git a/sql/Pg-upgrade2-auth/set_all_users_to_design40.sql b/sql/Pg-upgrade2-auth/set_all_users_to_design40.sql
new file mode 100644
index 000000000..82018021f
--- /dev/null
+++ b/sql/Pg-upgrade2-auth/set_all_users_to_design40.sql
@@ -0,0 +1,6 @@
+-- @tag: set_all_users_to_design40
+-- @description: Alle Benutzer werden einmalig auf die Stilvorlage design40.css gesetzt. (Die Einstellung kann manuell in den Benutzereinstellungen rückgängig gemacht werden.)
+-- @depends: release_3_9_1
+
+UPDATE auth.user_config SET cfg_value = 'design40.css'
+  WHERE cfg_key = 'stylesheet';
diff --git a/sql/Pg-upgrade2/add_business_models.sql b/sql/Pg-upgrade2/add_business_models.sql
new file mode 100644
index 000000000..511e1bb6f
--- /dev/null
+++ b/sql/Pg-upgrade2/add_business_models.sql
@@ -0,0 +1,22 @@
+-- @tag: add_business_models
+-- @description: Tabelle für Kunden-/Lieferantentyp-Artikelnummern und Beschreibung
+-- @depends: release_3_8_0
+
+CREATE TABLE business_models (
+  parts_id               integer NOT NULL,
+  business_id            integer NOT NULL,
+  model                  text,
+  part_description       text,
+  part_longdescription   text,
+
+  itime                  timestamp              DEFAULT now(),
+  mtime                  timestamp,
+
+  FOREIGN KEY (parts_id)    REFERENCES parts(id),
+  FOREIGN KEY (business_id) REFERENCES business(id),
+
+  PRIMARY KEY(parts_id, business_id)
+);
+
+CREATE TRIGGER mtime_business_models BEFORE UPDATE ON business_models
+    FOR EACH ROW EXECUTE PROCEDURE set_mtime();
diff --git a/sql/Pg-upgrade2/add_business_models_position.sql b/sql/Pg-upgrade2/add_business_models_position.sql
new file mode 100644
index 000000000..a61b4682d
--- /dev/null
+++ b/sql/Pg-upgrade2/add_business_models_position.sql
@@ -0,0 +1,5 @@
+-- @tag: add_business_models_position
+-- @description: Reihenfolge für Kunden-/Lieferantentyp-Artikelnummern
+-- @depends: add_business_models
+
+ALTER TABLE business_models ADD COLUMN position INTEGER;
diff --git a/sql/Pg-upgrade2/add_charts_and_taxkey_to_invoice_items.sql b/sql/Pg-upgrade2/add_charts_and_taxkey_to_invoice_items.sql
new file mode 100644
index 000000000..93ccc03e0
--- /dev/null
+++ b/sql/Pg-upgrade2/add_charts_and_taxkey_to_invoice_items.sql
@@ -0,0 +1,10 @@
+-- @tag: add_charts_and_tax_to_invoice_items
+-- @description: Einkaufsrechnungspositionen mit Steuer und Gegenkonto überlagern
+-- @depends: release_3_7_0
+
+ALTER TABLE invoice ADD COLUMN inventory_chart_id INTEGER;
+ALTER TABLE invoice ADD FOREIGN KEY (inventory_chart_id) REFERENCES chart(id);
+ALTER TABLE invoice ADD COLUMN expense_chart_id INTEGER;
+ALTER TABLE invoice ADD FOREIGN KEY (expense_chart_id) REFERENCES chart(id);
+ALTER TABLE invoice ADD COLUMN tax_id INTEGER;
+ALTER TABLE invoice ADD FOREIGN KEY (tax_id) REFERENCES tax(id);
diff --git a/sql/Pg-upgrade2/add_customer_dunning_lock.sql b/sql/Pg-upgrade2/add_customer_dunning_lock.sql
new file mode 100644
index 000000000..efa9746e4
--- /dev/null
+++ b/sql/Pg-upgrade2/add_customer_dunning_lock.sql
@@ -0,0 +1,5 @@
+-- @tag: add_customer_dunning_lock
+-- @description: Einführen von Mahnsperren für Kunden.
+-- @depends: release_3_7_0
+
+ALTER TABLE customer ADD COLUMN dunning_lock BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/add_description_to_backgroundjob_and_backgroundjobhistory.sql b/sql/Pg-upgrade2/add_description_to_backgroundjob_and_backgroundjobhistory.sql
new file mode 100644
index 000000000..d4d6723a1
--- /dev/null
+++ b/sql/Pg-upgrade2/add_description_to_backgroundjob_and_backgroundjobhistory.sql
@@ -0,0 +1,5 @@
+-- @tag: add_description_to_backgroundjob_and_backgroundjobhistory
+-- @description: Spalte 'description' in 'background_jobs' 'background_job_history
+-- @depends: release_3_9_0
+ALTER TABLE background_jobs ADD COLUMN description TEXT;
+ALTER TABLE background_job_histories ADD COLUMN description TEXT;
diff --git a/sql/Pg-upgrade2/add_file_version.pl b/sql/Pg-upgrade2/add_file_version.pl
new file mode 100644
index 000000000..954ca3496
--- /dev/null
+++ b/sql/Pg-upgrade2/add_file_version.pl
@@ -0,0 +1,180 @@
+# @tag: add_file_version
+# @description: Versionen für files in extra Tabelle erzeugen
+# @depends: release_3_8_0 file_version files_add_uid
+package SL::DBUpgrade2::add_file_version;
+
+use strict;
+use utf8;
+
+use SL::DB::File;
+use SL::File::Backend::Webdav;
+
+use SL::Locale::String qw(t8);
+use SL::System::Process;
+
+use UUID::Tiny ':std';
+
+use parent qw(SL::DBUpgrade2::Base);
+
+sub get_all_versions {
+  my ($dbfile) = @_;
+
+  my @versionobjs;
+  my $fileobj = SL::File::Object->new(
+    db_file => $dbfile,
+    id => $dbfile->id,
+    loaded => 1,
+  );
+
+  my $maxversion = $fileobj->backend eq 'Filesystem' ? $fileobj->db_file->backend_data : 1;
+  $fileobj->version($maxversion);
+  push @versionobjs, $fileobj;
+  if ($maxversion > 1) {
+    for my $version (2..$maxversion) {
+      my $clone = $fileobj->clone;
+      $clone->version($maxversion-$version+1);
+      $clone->newest(0);
+      push @versionobjs, $clone;
+    }
+  }
+
+  return @versionobjs;
+}
+
+sub get_filepath {
+  my ($file_obj) = @_;
+
+  my $file_id = $file_obj->id;
+  my $backend = $file_obj->backend
+    or die "File with ID '$file_id' has no backend specified.";
+  my $db_file   = $file_obj->db_file;
+  my $file_name = $file_obj->file_name;
+  my $version   = $file_obj->version;
+
+  my $path;
+  if ($backend eq 'Webdav') {
+    ($path) = $file_obj->backend_class->webdav_path($db_file);
+  } elsif ($backend eq 'Filesystem') {
+    # use filesystem with depth 3
+    my $iddir   = sprintf("%04d", $db_file->id % 1000);
+    my $base_path    = File::Spec->catdir($::lx_office_conf{paths}->{document_path}, $::auth->client->{id}, $iddir, $db_file->id);
+    $path = File::Spec->catdir($base_path, $db_file->id . '_' . $version);
+  } else {
+    die "Unknown backend '$backend' for file with ID '$file_id'.";
+  }
+
+  die "No file found at $path. Expected: $file_name, file.id: $file_id" if !-f $path;
+  return $path;
+}
+
+sub test_all_files_exists {
+  my @errors;
+
+  my $all_dbfiles = SL::DB::Manager::File->get_all;
+
+  foreach my $dbfile (@{$all_dbfiles}) {
+    my @versions = get_all_versions($dbfile);
+    foreach my $version (@versions) {
+      eval {
+        get_filepath($version);
+      } or do {
+        push @errors, $@;
+      }
+    }
+  }
+
+  return @errors;
+}
+
+sub print_errors {
+  my ($self, $errors) = @_;
+
+  print $::form->parse_html_template("dbupgrade/add_file_version_form", {
+      ERRORS => $errors
+    });
+}
+
+sub run {
+  my ($self) = @_;
+
+  my $query = <<SQL;
+SELECT f.id
+FROM files f
+FULL OUTER JOIN file_versions fv ON (f.id = fv.file_id)
+GROUP BY f.id
+HAVING count(fv.file_id) = 0
+SQL
+  my @file_ids_without_version = map {$_->[0]} @{$self->dbh->selectall_arrayref($query)};
+
+  unless ($::form->{delete_file_entries_of_missing_files}) {
+    my @errors = $self->test_all_files_exists();
+    if (scalar @errors) {
+      $self->print_errors(\@errors);
+      return 2;
+    }
+  }
+
+  SL::DB->client->with_transaction(sub {
+    my @errors;
+    my $all_dbfiles = SL::DB::Manager::File->get_all;
+    foreach my $dbfile (@$all_dbfiles) {
+      my $file_id = $dbfile->id;
+      my $backend = $dbfile->backend
+        or die "File with ID '$file_id' has no backend specified.";
+
+      my $doc_path;
+      if ($backend eq 'Webdav') {
+        $doc_path = SL::File::Backend::Webdav::get_rootdir();
+      } elsif ($backend eq 'Filesystem') {
+        $doc_path = $::lx_office_conf{paths}->{document_path};
+      } else {
+        die "Unknown backend '$backend' for file with ID '$file_id'.";
+      }
+
+      my @versions = get_all_versions($dbfile);
+      foreach my $version (@versions) {
+        my $tofile;
+        eval {
+          $tofile = get_filepath($version);
+        } or do {
+          next;
+        };
+        my $rel_file = $tofile;
+        $rel_file    =~ s/$doc_path//;
+
+        my $fv = SL::DB::FileVersion->new(
+          file_id       => $dbfile->id,
+          version       => $version->version || 1,
+          file_location => $rel_file,
+          doc_path      => $doc_path,
+          backend       => $dbfile->backend,
+          guid          => create_uuid_as_string(UUID_V4),
+        )->save;
+      }
+    }
+
+    my $query = <<SQL;
+SELECT f.id
+FROM files f
+FULL OUTER JOIN file_versions fv ON (f.id = fv.file_id)
+GROUP BY f.id
+HAVING count(fv.file_id) = 0
+SQL
+    my @file_ids_without_version =
+      map {$_->[0]}
+      @{SL::DB::->client->dbh->selectall_arrayref($query)};
+    if (scalar @file_ids_without_version) {
+      if ($::form->{delete_file_entries_of_missing_files}) {
+        SL::DB::Manager::File->delete_all(where => [id => \@file_ids_without_version]);
+      } else {
+        die "Files without versions: " . join(', ', @file_ids_without_version);
+      }
+    }
+
+    1;
+  }) or do { die SL::DB->client->error };
+
+  return 1;
+}
+
+1;
diff --git a/sql/Pg-upgrade2/add_link_for_fx_gain_loss_charts.sql b/sql/Pg-upgrade2/add_link_for_fx_gain_loss_charts.sql
new file mode 100644
index 000000000..a564df959
--- /dev/null
+++ b/sql/Pg-upgrade2/add_link_for_fx_gain_loss_charts.sql
@@ -0,0 +1,28 @@
+-- @tag: add_link_for_fx_gain_loss_charts
+-- @description: Kursdifferenzen am Beleg buchen benötigt Aufnahme in Zahlungs-Dropdown
+-- @depends: release_3_8_0
+
+
+DO $$
+BEGIN
+
+  IF ( SELECT coa FROM defaults ) = 'Germany-DATEV-SKR03EU' THEN
+    DECLARE
+      gain_chart text := '2660';
+      loss_chart text := '2150';
+
+    BEGIN
+        UPDATE chart set link ='AR_paid:AP_paid' where accno in (gain_chart, loss_chart);
+    END;
+  END IF;
+
+  IF ( SELECT coa FROM defaults ) = 'Germany-DATEV-SKR04EU' THEN
+    DECLARE
+      gain_chart text := '4840';
+      loss_chart text := '6880';
+    BEGIN
+        UPDATE chart set link ='AR_paid:AP_paid' where accno in (gain_chart, loss_chart);
+    END;
+  END IF;
+
+END $$;
diff --git a/sql/Pg-upgrade2/add_orderer.sql b/sql/Pg-upgrade2/add_orderer.sql
new file mode 100644
index 000000000..01d01c69a
--- /dev/null
+++ b/sql/Pg-upgrade2/add_orderer.sql
@@ -0,0 +1,7 @@
+-- @tag: add_orderer
+-- @description: Neue Spalte Besteller in Angebots- und Lieferscheinpositionen
+-- @depends: release_3_8_0
+-- @ignore: 0
+
+ALTER TABLE orderitems ADD COLUMN orderer_id INTEGER REFERENCES employee(id);
+ALTER TABLE delivery_order_items ADD COLUMN orderer_id INTEGER REFERENCES employee(id);
diff --git a/sql/Pg-upgrade2/add_parts_order_qty.sql b/sql/Pg-upgrade2/add_parts_order_qty.sql
new file mode 100644
index 000000000..6f5657493
--- /dev/null
+++ b/sql/Pg-upgrade2/add_parts_order_qty.sql
@@ -0,0 +1,7 @@
+-- @tag: add_parts_order_qty
+-- @description: Bestellmenge für Artikel
+-- @depends: release_3_8_0
+-- @ignore: 0
+
+ALTER TABLE parts ADD COLUMN
+  order_qty numeric(15, 5) NOT NULL DEFAULT 0;
diff --git a/sql/Pg-upgrade2/add_tax_chart_type_to_invoice_items.sql b/sql/Pg-upgrade2/add_tax_chart_type_to_invoice_items.sql
new file mode 100644
index 000000000..b49adbd92
--- /dev/null
+++ b/sql/Pg-upgrade2/add_tax_chart_type_to_invoice_items.sql
@@ -0,0 +1,5 @@
+-- @tag: add_tax_chart_type_to_invoice_items
+-- @description: Auswahl von Warenbuchungsmethode pro Einkaufrechnungszeile
+-- @depends: release_3_7_0
+
+ALTER TABLE invoice ADD COLUMN tax_chart_type VARCHAR(20);
diff --git a/sql/Pg-upgrade2/ap_add_qrbill_data.sql b/sql/Pg-upgrade2/ap_add_qrbill_data.sql
new file mode 100644
index 000000000..510ea28a5
--- /dev/null
+++ b/sql/Pg-upgrade2/ap_add_qrbill_data.sql
@@ -0,0 +1,4 @@
+-- @tag: ap_add_qrbill_data
+-- @description: Spalte für QR-Rechnungsdaten hinzufügen (Schweiz)
+-- @depends: release_3_7_0
+ALTER TABLE ap ADD COLUMN qrbill_data text;
diff --git a/sql/Pg-upgrade2/ap_is_sepa_blocked.sql b/sql/Pg-upgrade2/ap_is_sepa_blocked.sql
new file mode 100644
index 000000000..7b2a3e2b1
--- /dev/null
+++ b/sql/Pg-upgrade2/ap_is_sepa_blocked.sql
@@ -0,0 +1,5 @@
+-- @tag: ap_is_sepa_blocked
+-- @description: Flag, ob Überweisungen per SEPA gesperrt sind
+-- @depends: release_3_7_0
+
+ALTER TABLE ap ADD COLUMN is_sepa_blocked BOOLEAN DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/ar_add_qr_reference.sql b/sql/Pg-upgrade2/ar_add_qr_reference.sql
new file mode 100644
index 000000000..00bb550f7
--- /dev/null
+++ b/sql/Pg-upgrade2/ar_add_qr_reference.sql
@@ -0,0 +1,4 @@
+-- @tag: ar_add_qr_reference
+-- @description: Spalte für QR-Referenz
+-- @depends: release_3_6_1
+ALTER TABLE ar ADD COLUMN qr_reference text;
diff --git a/sql/Pg-upgrade2/ar_add_qr_unstructured_message.sql b/sql/Pg-upgrade2/ar_add_qr_unstructured_message.sql
new file mode 100644
index 000000000..d915bfdb5
--- /dev/null
+++ b/sql/Pg-upgrade2/ar_add_qr_unstructured_message.sql
@@ -0,0 +1,4 @@
+-- @tag: ar_add_qr_unstructured_message
+-- @description: Spalte für unstrukturierte Mitteilung bei schweizer QR-Rechnung hinzufügen
+-- @depends: release_3_7_0
+ALTER TABLE ar ADD COLUMN qr_unstructured_message text;
diff --git a/sql/Pg-upgrade2/bank_accounts_add_qr_iban.sql b/sql/Pg-upgrade2/bank_accounts_add_qr_iban.sql
new file mode 100644
index 000000000..d039f0676
--- /dev/null
+++ b/sql/Pg-upgrade2/bank_accounts_add_qr_iban.sql
@@ -0,0 +1,4 @@
+-- @tag: bank_accounts_add_qr_iban
+-- @description: Bankkonto Informationen Spalte für QR-IBAN hinzufügen
+-- @depends: release_3_9_0
+ALTER TABLE bank_accounts ADD COLUMN qr_iban TEXT;
diff --git a/sql/Pg-upgrade2/bank_accounts_flag_for_use_with_bank_import.sql b/sql/Pg-upgrade2/bank_accounts_flag_for_use_with_bank_import.sql
new file mode 100644
index 000000000..26b925ffa
--- /dev/null
+++ b/sql/Pg-upgrade2/bank_accounts_flag_for_use_with_bank_import.sql
@@ -0,0 +1,4 @@
+-- @tag: bank_accounts_flag_for_use_with_bank_import
+-- @description: Bankkonto für die Nutzung mit dem Bank Import markieren
+-- @depends: release_3_8_0
+ALTER TABLE bank_accounts ADD COLUMN use_with_bank_import BOOLEAN NOT NULL DEFAULT true;
diff --git a/sql/Pg-upgrade2/bank_transactions_add_end_to_end_id.sql b/sql/Pg-upgrade2/bank_transactions_add_end_to_end_id.sql
new file mode 100644
index 000000000..360afa498
--- /dev/null
+++ b/sql/Pg-upgrade2/bank_transactions_add_end_to_end_id.sql
@@ -0,0 +1,4 @@
+-- @tag: bank_transactions_add_end_to_end_id
+-- @description: Kontoauszüge: Spalte für Ende-zu-Ende-ID ergänzen
+-- @depends: release_3_9_0
+ALTER TABLE bank_transactions ADD COLUMN end_to_end_id TEXT;
diff --git a/sql/Pg-upgrade2/bank_transactions_add_qr_reference.sql b/sql/Pg-upgrade2/bank_transactions_add_qr_reference.sql
new file mode 100644
index 000000000..af573fa04
--- /dev/null
+++ b/sql/Pg-upgrade2/bank_transactions_add_qr_reference.sql
@@ -0,0 +1,4 @@
+-- @tag: bank_transactions_add_qr_reference
+-- @description: Erweitern der Tabelle bank_transactions mit Spalte für QR-Referenz.
+-- @depends: release_3_6_1
+ALTER TABLE bank_transactions ADD COLUMN qr_reference TEXT;
diff --git a/sql/Pg-upgrade2/booking_group_obsolete.sql b/sql/Pg-upgrade2/booking_group_obsolete.sql
new file mode 100644
index 000000000..c32b31087
--- /dev/null
+++ b/sql/Pg-upgrade2/booking_group_obsolete.sql
@@ -0,0 +1,12 @@
+-- @tag: booking_group_obsolete
+-- @description: Buchungsgruppen ungültig setzen können
+-- @depends: release_3_7_0
+ALTER TABLE buchungsgruppen
+ADD COLUMN obsolete BOOLEAN NOT NULL DEFAULT FALSE;
+
+UPDATE parts
+SET obsolete = FALSE
+WHERE obsolete IS NULL;
+
+ALTER TABLE parts
+ALTER COLUMN obsolete SET NOT NULL;
diff --git a/sql/Pg-upgrade2/change_file_backend_to_enum.sql b/sql/Pg-upgrade2/change_file_backend_to_enum.sql
new file mode 100644
index 000000000..44a47d40d
--- /dev/null
+++ b/sql/Pg-upgrade2/change_file_backend_to_enum.sql
@@ -0,0 +1,12 @@
+-- @tag: change_file_backend_to_enum
+-- @description: Backend für Dateien auf Type Enum setzen
+-- @depends: release_3_6_0
+
+CREATE TYPE files_backends AS ENUM ('Filesystem', 'Webdav');
+
+ALTER TABLE files ADD COLUMN backend_new files_backends;
+UPDATE files SET backend_new = 'Filesystem' WHERE backend = 'Filesystem';
+UPDATE files SET backend_new = 'Webdav'     WHERE backend = 'Webdav';
+ALTER TABLE files ALTER COLUMN backend_new SET NOT NULL;
+ALTER TABLE files DROP COLUMN backend;
+ALTER TABLE files RENAME COLUMN backend_new TO backend;
diff --git a/sql/Pg-upgrade2/clean_up_record_links_before_delete_trigger.sql b/sql/Pg-upgrade2/clean_up_record_links_before_delete_trigger.sql
new file mode 100644
index 000000000..0cc9e90f6
--- /dev/null
+++ b/sql/Pg-upgrade2/clean_up_record_links_before_delete_trigger.sql
@@ -0,0 +1,12 @@
+-- @tag: clean_up_record_links_before_delete_trigger
+-- @description: delete trigger for record_links clean up
+-- @depends: release_3_5_7
+
+CREATE OR REPLACE FUNCTION clean_up_record_links_before_delete() RETURNS trigger AS $$
+  BEGIN
+    DELETE FROM record_links
+      WHERE (from_table = TG_TABLE_NAME AND from_id = OLD.id)
+         OR (to_table   = TG_TABLE_NAME AND to_id   = OLD.id);
+    RETURN OLD;
+  END;
+$$ LANGUAGE plpgsql;
diff --git a/sql/Pg-upgrade2/customer_add_dunning_mail.sql b/sql/Pg-upgrade2/customer_add_dunning_mail.sql
new file mode 100644
index 000000000..ecd03e4b0
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_add_dunning_mail.sql
@@ -0,0 +1,5 @@
+-- @tag: customer_add_dunning_mail
+-- @description: Mahnungsadresse (E-Mail-Empfänger)
+-- @depends: release_3_6_0
+ALTER TABLE customer ADD COLUMN dunning_mail text;
+ALTER TABLE additional_billing_addresses ADD COLUMN dunning_mail text;
diff --git a/sql/Pg-upgrade2/defaults_add_layout_style.sql b/sql/Pg-upgrade2/defaults_add_layout_style.sql
new file mode 100644
index 000000000..4d06b8b1c
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_add_layout_style.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_add_layout_style
+-- @description: Mandantenkonfiguration für erzwungenen Layout-Stil (Desktop oder Mobil)
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD COLUMN layout_style TEXT;
diff --git a/sql/Pg-upgrade2/defaults_add_reclamation.sql b/sql/Pg-upgrade2/defaults_add_reclamation.sql
new file mode 100644
index 000000000..37c6d9d5a
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_add_reclamation.sql
@@ -0,0 +1,11 @@
+-- @tag: defaults_add_reclamations
+-- @description: Add defaults show_delete, always_project, warn_no_reqdate and warn_duplicate_parts for reclamations
+-- @depends: reclamations
+
+--show_delete
+ALTER TABLE defaults ADD COLUMN sales_reclamation_show_delete    boolean NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN purchase_reclamation_show_delete boolean NOT NULL DEFAULT TRUE;
+
+--warn
+ALTER TABLE defaults ADD COLUMN reclamation_warn_no_reqdate      boolean NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN reclamation_warn_duplicate_parts boolean NOT NULL DEFAULT TRUE;
diff --git a/sql/Pg-upgrade2/defaults_allowed_documents_with_no_positions.sql b/sql/Pg-upgrade2/defaults_allowed_documents_with_no_positions.sql
new file mode 100644
index 000000000..20ffb2449
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_allowed_documents_with_no_positions.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_allowed_documents_with_no_positions
+-- @description: Mandantenkonfiguration für Belege, die ohne Positionen gespeichert werden können
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD COLUMN allowed_documents_with_no_positions TEXT[];
diff --git a/sql/Pg-upgrade2/defaults_bank_config.sql b/sql/Pg-upgrade2/defaults_bank_config.sql
new file mode 100644
index 000000000..033a9463a
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_bank_config.sql
@@ -0,0 +1,6 @@
+
+-- @tag: defaults_bank_config
+-- @description: Konfigurierbare Werte für Bank
+-- @depends: release_3_9_0
+ALTER TABLE defaults ADD COLUMN sepa_export_xml boolean DEFAULT true;
+ALTER TABLE defaults ADD COLUMN no_bank_proposals boolean DEFAULT false;
diff --git a/sql/Pg-upgrade2/defaults_drop_feature_experimental_assortment.sql b/sql/Pg-upgrade2/defaults_drop_feature_experimental_assortment.sql
new file mode 100644
index 000000000..f9c291443
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_drop_feature_experimental_assortment.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_drop_feature_experimental_assortment
+-- @description: vormals experimentelles Feature Assortment ist jetzt der Standard
+-- @depends: release_3_9_1
+
+ALTER TABLE defaults DROP COLUMN feature_experimental_assortment;
diff --git a/sql/Pg-upgrade2/defaults_drop_feature_experimental_order.sql b/sql/Pg-upgrade2/defaults_drop_feature_experimental_order.sql
new file mode 100644
index 000000000..3d4a996de
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_drop_feature_experimental_order.sql
@@ -0,0 +1,6 @@
+-- @tag: defaults_drop_feature_experimental_order
+-- @description: vormals experimentelles Feature Order ist jetzt der Standard
+-- @depends: release_3_9_1
+
+ALTER TABLE defaults DROP COLUMN feature_experimental_order;
+
diff --git a/sql/Pg-upgrade2/defaults_email_subject_transaction_description.sql b/sql/Pg-upgrade2/defaults_email_subject_transaction_description.sql
new file mode 100644
index 000000000..8b19e039d
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_email_subject_transaction_description.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_email_subject_transaction_description
+-- @description: Einstellung, ob die Vorgangsbezeichnung im E-Mail Betreff vorbelegt wird
+-- @depends: release_3_9_1
+
+ALTER TABLE defaults ADD COLUMN email_subject_transaction_description boolean DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/defaults_endtoend.sql b/sql/Pg-upgrade2/defaults_endtoend.sql
new file mode 100644
index 000000000..76aea7c9d
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_endtoend.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_endtoend
+-- @description: Einstellung, ob die END-TO-END Id zur Duplikaterkennung für den Bankimport verwendet werden darf
+-- @depends: release_3_9_0
+
+ALTER TABLE defaults ADD COLUMN check_bt_duplicates_endtoend boolean DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/defaults_fuzzy_skonto.sql b/sql/Pg-upgrade2/defaults_fuzzy_skonto.sql
new file mode 100644
index 000000000..12e70a5e0
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_fuzzy_skonto.sql
@@ -0,0 +1,6 @@
+-- @tag: defaults_fuzzy_skonto
+-- @description: Einstellung, ob unscharfes Skonto erlaubt und wen ja mit welcher prozentualen Abweichung
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD COLUMN fuzzy_skonto boolean DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN fuzzy_skonto_percentage real DEFAULT 0.5;
diff --git a/sql/Pg-upgrade2/defaults_oe_subversion.sql b/sql/Pg-upgrade2/defaults_oe_subversion.sql
new file mode 100644
index 000000000..892f8a4d4
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_oe_subversion.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_oe_subversion
+-- @description: Konfigurations-Option, ob Unterversionen gesperrt werden
+-- @depends: release_3_6_1
+
+ALTER TABLE defaults ADD COLUMN lock_oe_subversions BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/defaults_order_item_input_position.sql b/sql/Pg-upgrade2/defaults_order_item_input_position.sql
new file mode 100644
index 000000000..17892b15a
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_order_item_input_position.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_order_item_input_position
+-- @description: Mandantenkonfiguration: Position der Artikeleingabe in Aufträgen
+-- @depends: release_3_9_1
+
+ALTER TABLE defaults ADD COLUMN order_item_input_position INTEGER NOT NULL DEFAULT 0;
diff --git a/sql/Pg-upgrade2/defaults_qrbill_copy_invnumber_to_message.sql b/sql/Pg-upgrade2/defaults_qrbill_copy_invnumber_to_message.sql
new file mode 100644
index 000000000..d5436404c
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_qrbill_copy_invnumber_to_message.sql
@@ -0,0 +1,4 @@
+-- @tag: defaults_qrbill_copy_invnumber_to_message
+-- @description: Schweizer QR-Rechnung Option Rechnungsnummer in Mitteilung kopieren
+-- @depends: release_3_7_0
+ALTER TABLE defaults ADD COLUMN qrbill_copy_invnumber boolean DEFAULT false;
\ No newline at end of file
diff --git a/sql/Pg-upgrade2/defaults_record_sender_emails.sql b/sql/Pg-upgrade2/defaults_record_sender_emails.sql
new file mode 100644
index 000000000..2dae5a3ac
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_record_sender_emails.sql
@@ -0,0 +1,15 @@
+-- @tag: defaults_record_sender_emails
+-- @description: Konfigurierbare E-Mail Absenderadresse je nach Belegtyp
+-- @depends: release_3_7_0
+
+ALTER TABLE defaults ADD COLUMN email_sender_sales_quotation TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_request_quotation TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_sales_order TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_purchase_order TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_invoice TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_purchase_invoice TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_letter TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_purchase_delivery_order TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_sales_delivery_order TEXT DEFAULT '';
+ALTER TABLE defaults ADD COLUMN email_sender_dunning TEXT DEFAULT '';
+
diff --git a/sql/Pg-upgrade2/defaults_remove_invoice_prevent_browser_back.sql b/sql/Pg-upgrade2/defaults_remove_invoice_prevent_browser_back.sql
new file mode 100644
index 000000000..edcb7ff7b
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_remove_invoice_prevent_browser_back.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_remove_invoice_prevent_browser_back
+-- @description: "Verhinderung Browser-Zurück-Knopf einstellbar in Mandantenkonfiguration" wieder raus
+-- @depends: defaults_invoice_prevent_browser_back
+
+ALTER TABLE defaults DROP COLUMN invoice_prevent_browser_back;
diff --git a/sql/Pg-upgrade2/defaults_set_ARAP.sql b/sql/Pg-upgrade2/defaults_set_ARAP.sql
new file mode 100644
index 000000000..f8528d2fb
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_set_ARAP.sql
@@ -0,0 +1,20 @@
+-- @tag: defaults_set_ARAP
+-- @description: Standardkonten für Forderungen und Verbindlichkeiten sind jetzt Pflichtfelder
+-- @depends: release_3_9_0
+DO $$
+BEGIN
+
+  IF (select 1 from defaults where ap_chart_id is null) THEN
+    BEGIN
+        UPDATE defaults set ap_chart_id = (select id from chart where link ='AP' order by id LIMIT 1);
+    END;
+  END IF;
+  IF (select 1 from defaults where ar_chart_id is null) THEN
+    BEGIN
+        UPDATE defaults set ar_chart_id = (select id from chart where link ='AR' order by id LIMIT 1);
+    END;
+  END IF;
+END $$;
+
+ALTER TABLE defaults ALTER COLUMN ap_chart_id set not null;
+ALTER TABLE defaults ALTER COLUMN ar_chart_id set not null;
diff --git a/sql/Pg-upgrade2/defaults_set_invoice_creation_mode_for_dunning_attachment.sql b/sql/Pg-upgrade2/defaults_set_invoice_creation_mode_for_dunning_attachment.sql
new file mode 100644
index 000000000..dafdf2b61
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_set_invoice_creation_mode_for_dunning_attachment.sql
@@ -0,0 +1,10 @@
+-- @tag: defaults_set_invoice_creation_mode_for_dunning_attachment
+-- @description: Ursprungs-Rechnung von Mahnung konfigurierbar machen
+-- @depends: release_3_7_0
+
+CREATE TYPE invoice_creation_mode AS
+  ENUM ('create_new', 'use_last_created_or_create_new');
+ALTER TABLE defaults
+  ADD COLUMN dunning_original_invoice_creation_mode invoice_creation_mode
+  default 'create_new';
+
diff --git a/sql/Pg-upgrade2/defaults_show_invoice_for_advance_payment.sql b/sql/Pg-upgrade2/defaults_show_invoice_for_advance_payment.sql
new file mode 100644
index 000000000..19d7ebfe5
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_show_invoice_for_advance_payment.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_show_invoice_for_advance_payment
+-- @description: Mandantenkonfiguration zum Anzeigen von Anzahlungs-/Schluss-Rechnungen (Menü/Workflows)
+-- @depends: release_3_9_0
+
+ALTER TABLE defaults ADD COLUMN show_invoice_for_advance_payment BOOLEAN NOT NULL DEFAULT TRUE;
diff --git a/sql/Pg-upgrade2/defaults_show_new_docs.sql b/sql/Pg-upgrade2/defaults_show_new_docs.sql
new file mode 100644
index 000000000..c51b555d4
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_show_new_docs.sql
@@ -0,0 +1,9 @@
+-- @tag: defaults_show_new_docs
+-- @description: Mandantenkonfiguration für Anzeigen von Angebots-/Auftrags-Eingängen, Lieferantenauftragsbestätigungen und Reklamationen
+-- @depends: release_3_9_0
+
+ALTER TABLE defaults ADD COLUMN show_sales_order_intake          BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN show_purchase_quotation_intake   BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN show_purchase_order_confirmation BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN show_sales_reclamation           BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE defaults ADD COLUMN show_purchase_reclamation        BOOLEAN NOT NULL DEFAULT TRUE;
diff --git a/sql/Pg-upgrade2/defaults_transit_items_account.sql b/sql/Pg-upgrade2/defaults_transit_items_account.sql
new file mode 100644
index 000000000..68223fe0d
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_transit_items_account.sql
@@ -0,0 +1,6 @@
+-- @tag: defaults_transit_items_account
+-- @description: Voreingestelltes Konto für Durchlaufende Posten
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD COLUMN transit_items_chart_id INTEGER;
+UPDATE defaults set transit_items_chart_id = (select id from chart where description='Durchlaufende Posten' LIMIT 1);
diff --git a/sql/Pg-upgrade2/defaults_view_record_links_options.sql b/sql/Pg-upgrade2/defaults_view_record_links_options.sql
new file mode 100644
index 000000000..d36be4f7a
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_view_record_links_options.sql
@@ -0,0 +1,6 @@
+-- @tag: defaults_view_record_links_options
+-- @description: Mandantenkonfiguration: Optionen für Sichtweise von record links immer vom Auftrag
+-- @depends: release_3_7_0
+
+ALTER TABLE defaults ADD COLUMN record_links_from_order_with_myself     BOOLEAN DEFAULT FALSE;
+ALTER TABLE defaults ADD COLUMN record_links_from_order_with_quotations BOOLEAN DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/defaults_webdav.sql b/sql/Pg-upgrade2/defaults_webdav.sql
new file mode 100644
index 000000000..e84ba2d52
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_webdav.sql
@@ -0,0 +1,7 @@
+-- @tag: defaults_webdav
+-- @description: Synchronisation mit externem WebDAV-Server
+-- @depends: release_3_8_0
+ALTER TABLE defaults ADD COLUMN webdav_sync_extern boolean DEFAULT false;
+ALTER TABLE defaults ADD COLUMN webdav_sync_extern_url text;
+ALTER TABLE defaults ADD COLUMN webdav_sync_extern_login text;
+ALTER TABLE defaults ADD COLUMN webdav_sync_extern_pass text;
diff --git a/sql/Pg-upgrade2/defaults_yearend_method.sql b/sql/Pg-upgrade2/defaults_yearend_method.sql
new file mode 100644
index 000000000..65c7ff521
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_yearend_method.sql
@@ -0,0 +1,5 @@
+-- @tag: defaults_yearend_method
+-- @description: method used for the automated year-end bookings
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD COLUMN yearend_method TEXT NOT NULL DEFAULT 'default';
diff --git a/sql/Pg-upgrade2/delete_cvars_on_trans_deletion_add_reclamation_items.sql b/sql/Pg-upgrade2/delete_cvars_on_trans_deletion_add_reclamation_items.sql
new file mode 100644
index 000000000..5d883549b
--- /dev/null
+++ b/sql/Pg-upgrade2/delete_cvars_on_trans_deletion_add_reclamation_items.sql
@@ -0,0 +1,38 @@
+-- @tag: delete_cvars_on_trans_deletion_add_reclamation_items
+-- @description: Add reclamation_items to trigger
+-- @depends: delete_cvars_on_trans_deletion_add_shipto reclamations
+
+CREATE OR REPLACE FUNCTION delete_custom_variables_trigger()
+RETURNS TRIGGER AS $$
+  BEGIN
+    IF (TG_TABLE_NAME IN ('orderitems', 'delivery_order_items', 'invoice', 'reclamation_items')) THEN
+      PERFORM delete_custom_variables_with_sub_module('IC', TG_TABLE_NAME, old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'parts') THEN
+      PERFORM delete_custom_variables_with_sub_module('IC', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME IN ('customer', 'vendor')) THEN
+      PERFORM delete_custom_variables_with_sub_module('CT', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'contacts') THEN
+      PERFORM delete_custom_variables_with_sub_module('Contacts', '', old.cp_id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'project') THEN
+      PERFORM delete_custom_variables_with_sub_module('Projects', '', old.id);
+    END IF;
+
+    IF (TG_TABLE_NAME = 'shipto') THEN
+      PERFORM delete_custom_variables_with_sub_module('ShipTo', '', old.shipto_id);
+    END IF;
+
+    RETURN old;
+  END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER reclamation_items_delete_custom_variables_after_deletion
+AFTER DELETE ON reclamation_items
+FOR EACH ROW EXECUTE PROCEDURE delete_custom_variables_trigger();
diff --git a/sql/Pg-upgrade2/delivery_order_remove_is_sales_in_db.sql b/sql/Pg-upgrade2/delivery_order_remove_is_sales_in_db.sql
new file mode 100644
index 000000000..f840bc306
--- /dev/null
+++ b/sql/Pg-upgrade2/delivery_order_remove_is_sales_in_db.sql
@@ -0,0 +1,6 @@
+-- @tag: delivery_order_remove_is_sales_in_db
+-- @description: Lösche 'is_sales' in delivery_orders Tabelle
+-- @depends: release_3_6_1
+
+ALTER TABLE delivery_orders
+  DROP COLUMN is_sales;
diff --git a/sql/Pg-upgrade2/delivery_terms_markable_as_obsolete.sql b/sql/Pg-upgrade2/delivery_terms_markable_as_obsolete.sql
new file mode 100644
index 000000000..2e1709d64
--- /dev/null
+++ b/sql/Pg-upgrade2/delivery_terms_markable_as_obsolete.sql
@@ -0,0 +1,5 @@
+-- @tag: delivery_terms_markable_as_obsolete
+-- @description: Lieferbedingungenals ungültig markierbar
+-- @depends: release_3_7_0
+ALTER TABLE delivery_terms
+ADD COLUMN obsolete BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/deliveryorder_type_to_record_type.sql b/sql/Pg-upgrade2/deliveryorder_type_to_record_type.sql
new file mode 100644
index 000000000..164496ab5
--- /dev/null
+++ b/sql/Pg-upgrade2/deliveryorder_type_to_record_type.sql
@@ -0,0 +1,24 @@
+-- @tag: deliveryorder_type_to_record_type
+-- @description: Convert deliveryorder_type to record_type enum
+-- @depends: deliveryorder_type
+
+CREATE TYPE delivery_order_types AS ENUM (
+  'sales_delivery_order',
+  'purchase_delivery_order',
+  'supplier_delivery_order',
+  'rma_delivery_order'
+);
+
+ALTER TABLE delivery_orders ADD COLUMN record_type delivery_order_types;
+
+UPDATE delivery_orders SET record_type = 'sales_delivery_order'
+  WHERE order_type = 'sales_delivery_order';
+UPDATE delivery_orders SET record_type = 'purchase_delivery_order'
+  WHERE order_type = 'purchase_delivery_order';
+UPDATE delivery_orders SET record_type = 'supplier_delivery_order'
+  WHERE order_type = 'supplier_delivery_order';
+UPDATE delivery_orders SET record_type = 'rma_delivery_order'
+  WHERE order_type = 'rma_delivery_order';
+
+ALTER TABLE delivery_orders ALTER COLUMN record_type SET NOT NULL;
+ALTER TABLE delivery_orders DROP COLUMN order_type;
diff --git a/sql/Pg-upgrade2/email_import.sql b/sql/Pg-upgrade2/email_import.sql
new file mode 100644
index 000000000..5b8ebcccb
--- /dev/null
+++ b/sql/Pg-upgrade2/email_import.sql
@@ -0,0 +1,27 @@
+-- @tag: email_import
+-- @description: Email Journal für importierte E-Mails erweitern
+-- @depends: release_3_8_0
+
+CREATE TABLE email_imports (
+  id              SERIAL    NOT NULL PRIMARY KEY,
+  host_name       TEXT      NOT NULL,
+  user_name       TEXT      NOT NULL,
+  folder          TEXT      NOT NULL,
+  itime           TIMESTAMP NOT NULL DEFAULT now()
+);
+
+ALTER TABLE email_journal ADD COLUMN email_import_id INTEGER REFERENCES email_imports(id);
+ALTER TABLE email_journal ADD COLUMN folder          TEXT;
+ALTER TABLE email_journal ADD COLUMN uid             INTEGER;
+CREATE INDEX email_journal_folder_uid_idx ON email_journal (folder, uid);
+-- NOTE: change status from text to enum and add 'imported'
+CREATE TYPE email_journal_status AS ENUM ('sent', 'send_failed', 'imported');
+ALTER TABLE email_journal DROP CONSTRAINT valid_status;
+ALTER TABLE email_journal RENAME COLUMN status TO old_status;
+ALTER TABLE email_journal ADD COLUMN status email_journal_status;
+UPDATE email_journal SET status = 'sent'        WHERE old_status = 'ok';
+UPDATE email_journal SET status = 'send_failed' WHERE old_status = 'failed';
+ALTER TABLE email_journal ALTER COLUMN status SET NOT NULL;
+ALTER TABLE email_journal DROP COLUMN old_status;
+
+
diff --git a/sql/Pg-upgrade2/email_journal_add_obsolete.sql b/sql/Pg-upgrade2/email_journal_add_obsolete.sql
new file mode 100644
index 000000000..1462ecb79
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_add_obsolete.sql
@@ -0,0 +1,5 @@
+-- @tag: email_journal_add_obsolete
+-- @description: E-Mail-Journal um obsolete erweitern
+-- @depends: release_3_8_0
+
+ALTER TABLE email_journal ADD COLUMN obsolete BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/sql/Pg-upgrade2/email_journal_add_uidvalidity.sql b/sql/Pg-upgrade2/email_journal_add_uidvalidity.sql
new file mode 100644
index 000000000..acbc260e0
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_add_uidvalidity.sql
@@ -0,0 +1,5 @@
+-- @tag: email_journal_add_uidvalidity
+-- @description: Ordner uidvalidity für importierte E-Mails
+-- @depends: release_3_8_0
+
+ALTER TABLE email_journal ADD COLUMN folder_uidvalidity TEXT;
diff --git a/sql/Pg-upgrade2/email_journal_extend_status.sql b/sql/Pg-upgrade2/email_journal_extend_status.sql
new file mode 100644
index 000000000..0eb2872de
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_extend_status.sql
@@ -0,0 +1,5 @@
+-- @tag: email_journal_extend_status
+-- @description: Zusätzlicher Status für E-Mail-Journal
+-- @depends: release_3_8_0 email_import email_journal_add_uidvalidity
+
+ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported';
diff --git a/sql/Pg-upgrade2/email_journal_record_import_types.sql b/sql/Pg-upgrade2/email_journal_record_import_types.sql
new file mode 100644
index 000000000..39de91fbc
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_record_import_types.sql
@@ -0,0 +1,36 @@
+-- @tag: email_journal_record_import_types
+-- @description: vorgesehener Beleg Typ seperat in E-Mail-Journal speichern
+-- @depends: release_3_8_0 email_journal_extend_status
+
+-- UNDO: ALTER TYPE email_journal_status ADD VALUE 'record_imported' AFTER 'imported';
+CREATE TYPE email_journal_status_new AS ENUM ('sent', 'send_failed', 'imported');
+ALTER TABLE email_journal ADD COLUMN status_new email_journal_status_new;
+UPDATE email_journal SET status_new = 'imported'    WHERE status = 'record_imported';
+UPDATE email_journal SET status_new = 'imported'    WHERE status = 'imported';
+UPDATE email_journal SET status_new = 'sent'        WHERE status = 'sent';
+UPDATE email_journal SET status_new = 'send_failed' WHERE status = 'send_failed';
+ALTER TABLE email_journal DROP COLUMN status;
+ALTER TABLE email_journal RENAME COLUMN status_new TO status;
+ALTER TABLE email_journal ALTER COLUMN status SET NOT NULL;
+DROP TYPE email_journal_status;
+ALTER TYPE email_journal_status_new RENAME TO email_journal_status;
+
+CREATE TYPE email_journal_record_type AS ENUM (
+  -- order
+  'sales_order', 'purchase_order', 'sales_quotation', 'request_quotation',
+  'purchase_quotation_intake', 'sales_order_intake',
+  -- delivery order
+  'sales_delivery_order', 'purchase_delivery_order',
+  'supplier_delivery_order', 'rma_delivery_order',
+  -- reclamation
+  'sales_reclamation', 'purchase_reclamation',
+  -- invoice
+  'invoice', 'invoice_for_advance_payment',
+  'invoice_for_advance_payment_storno', 'final_invoice', 'invoice_storno',
+  'credit_note', 'credit_note_storno',
+  -- purchase invoice
+  'purchase_invoice', 'purchase_credit_note',
+  --transaction
+  'ap_transaction', 'ar_transaction', 'gl_transaction'
+);
+ALTER TABLE email_journal ADD COLUMN record_type email_journal_record_type;
diff --git a/sql/Pg-upgrade2/email_journal_record_types_add_chatall.sql b/sql/Pg-upgrade2/email_journal_record_types_add_chatall.sql
new file mode 100644
index 000000000..5ecc522b6
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_record_types_add_chatall.sql
@@ -0,0 +1,5 @@
+-- @tag: email_journal_record_types_add_catch_all
+-- @description: E-Mail-Journal Beleg Type um generischen Type erweitern
+-- @depends: email_journal_record_import_types email_journal_record_types_add_purchase_order_confirmation
+
+ALTER TYPE email_journal_record_type ADD VALUE IF NOT EXISTS 'catch_all';
diff --git a/sql/Pg-upgrade2/email_journal_record_types_add_purchase_order_confirmation.sql b/sql/Pg-upgrade2/email_journal_record_types_add_purchase_order_confirmation.sql
new file mode 100644
index 000000000..4bb901b79
--- /dev/null
+++ b/sql/Pg-upgrade2/email_journal_record_types_add_purchase_order_confirmation.sql
@@ -0,0 +1,5 @@
+-- @tag: email_journal_record_types_add_purchase_order_confirmation
+-- @description: E-Mail-Journal Beleg Type um Lieferantenauftragsbestätigung erweitern
+-- @depends: email_journal_record_import_types
+
+ALTER TYPE email_journal_record_type ADD VALUE IF NOT EXISTS 'purchase_order_confirmation';
diff --git a/sql/Pg-upgrade2/exchangerate_in_arap.sql b/sql/Pg-upgrade2/exchangerate_in_arap.sql
new file mode 100644
index 000000000..d68c96d66
--- /dev/null
+++ b/sql/Pg-upgrade2/exchangerate_in_arap.sql
@@ -0,0 +1,7 @@
+-- @tag: exchangerate_in_arap
+-- @description: Wechselkurs optional in Belegen und Banktransaktionen speichern
+-- @depends: release_3_6_1
+
+ALTER TABLE ar                ADD COLUMN exchangerate NUMERIC(15,5);
+ALTER TABLE ap                ADD COLUMN exchangerate NUMERIC(15,5);
+ALTER TABLE bank_transactions ADD COLUMN exchangerate NUMERIC(15,5);
diff --git a/sql/Pg-upgrade2/file_object_type_as_enum.sql b/sql/Pg-upgrade2/file_object_type_as_enum.sql
new file mode 100644
index 000000000..259ae153c
--- /dev/null
+++ b/sql/Pg-upgrade2/file_object_type_as_enum.sql
@@ -0,0 +1,56 @@
+-- @tag: file_object_type_as_enum
+-- @description: Objekttype von Dateien in Enum ändern
+-- @depends: files file_storage_purchase_order_confirmation
+-- @ignore: 0
+
+
+CREATE TYPE file_object_types AS ENUM (
+  -- order
+ 'sales_quotation',
+ 'sales_order',
+ 'sales_order_intake',
+ 'request_quotation',
+ 'purchase_quotation_intake',
+ 'purchase_order',
+ 'purchase_order_confirmation',
+  -- delivery_order
+ 'sales_delivery_order',
+ 'supplier_delivery_order',
+ 'purchase_delivery_order',
+ 'rma_delivery_order',
+  -- invoice
+ 'invoice',
+ 'invoice_for_advance_payment',
+ 'final_invoice',
+ 'credit_note',
+ 'purchase_invoice',
+  -- reclamation
+ 'sales_reclamation',
+ 'purchase_reclamation',
+  -- dunning
+ 'dunning',
+ 'dunning1',
+ 'dunning2',
+ 'dunning3',
+ 'dunning_orig_invoice',
+ 'dunning_invoice',
+  -- cv
+ 'customer',
+ 'vendor',
+  -- other
+ 'gl_transaction',
+ 'part',
+ 'shop_image',
+ 'draft',
+ 'letter',
+ 'project',
+ 'statement'
+);
+
+ALTER TABLE files ADD    COLUMN object_type_new file_object_types;
+UPDATE files SET object_type_new = object_type::file_object_types;
+ALTER TABLE files ALTER  COLUMN object_type_new SET NOT NULL;
+ALTER TABLE files DROP   COLUMN object_type;
+ALTER TABLE files RENAME COLUMN object_type_new TO object_type;
+
+
diff --git a/sql/Pg-upgrade2/file_storage_purchase_order_confirmation.sql b/sql/Pg-upgrade2/file_storage_purchase_order_confirmation.sql
new file mode 100644
index 000000000..3bf73d1a6
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_purchase_order_confirmation.sql
@@ -0,0 +1,22 @@
+-- @tag: file_storage_purchase_order_confirmation
+-- @description: Dateispeicher auch für Lieferantenauftragsbestätigungen
+-- @depends: file_storage_purchase_quotation_intake
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                ) OR (object_type = 'invoice'                    )
+          OR (object_type = 'sales_order'                ) OR (object_type = 'sales_order_intake'         )
+          OR (object_type = 'sales_quotation'            ) OR (object_type = 'sales_delivery_order'       )
+          OR (object_type = 'request_quotation'          ) OR (object_type = 'purchase_quotation_intake'  )
+          OR (object_type = 'purchase_order'             ) OR (object_type = 'purchase_order_confirmation')
+          OR (object_type = 'purchase_delivery_order'    ) OR (object_type = 'purchase_invoice'           )
+          OR (object_type = 'vendor'                     ) OR (object_type = 'customer'                   ) OR (object_type = 'part'                   )
+          OR (object_type = 'gl_transaction'             ) OR (object_type = 'dunning'                    ) OR (object_type = 'dunning1'               )
+          OR (object_type = 'dunning2'                   ) OR (object_type = 'dunning3'                   ) OR (object_type = 'dunning_orig_invoice'   )
+          OR (object_type = 'dunning_invoice'            ) OR (object_type = 'draft'                      ) OR (object_type = 'statement'              )
+          OR (object_type = 'shop_image'                 ) OR (object_type = 'letter'                     ) OR (object_type = 'project'                )
+          OR (object_type = 'invoice_for_advance_payment') OR (object_type = 'final_invoice'              ) OR (object_type = 'supplier_delivery_order')
+          OR (object_type = 'sales_reclamation'          ) OR (object_type = 'purchase_reclamation'       ) OR (object_type = 'rma_delivery_order'     )
+  );
diff --git a/sql/Pg-upgrade2/file_storage_purchase_quotation_intake.sql b/sql/Pg-upgrade2/file_storage_purchase_quotation_intake.sql
new file mode 100644
index 000000000..b37c55804
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_purchase_quotation_intake.sql
@@ -0,0 +1,21 @@
+-- @tag: file_storage_purchase_quotation_intake
+-- @description: Dateispeicher auch für Angebotseingänge
+-- @depends: file_storage_sales_order_intake
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                 ) OR (object_type = 'invoice'                   )
+          OR (object_type = 'sales_order'                 ) OR (object_type = 'sales_order_intake'        )
+          OR (object_type = 'sales_quotation'             ) OR (object_type = 'sales_delivery_order'      )
+          OR (object_type = 'request_quotation'           ) OR (object_type = 'purchase_quotation_intake' ) OR (object_type = 'purchase_order'          )
+          OR (object_type = 'purchase_delivery_order'     ) OR (object_type = 'purchase_invoice'          )
+          OR (object_type = 'vendor'                      ) OR (object_type = 'customer'                  ) OR (object_type = 'part'                    )
+          OR (object_type = 'gl_transaction'              ) OR (object_type = 'dunning'                   ) OR (object_type = 'dunning1'                )
+          OR (object_type = 'dunning2'                    ) OR (object_type = 'dunning3'                  ) OR (object_type = 'dunning_orig_invoice'    )
+          OR (object_type = 'dunning_invoice'             ) OR (object_type = 'draft'                     ) OR (object_type = 'statement'               )
+          OR (object_type = 'shop_image'                  ) OR (object_type = 'letter'                    ) OR (object_type = 'project'                 )
+          OR (object_type = 'invoice_for_advance_payment' ) OR (object_type = 'final_invoice'             ) OR (object_type = 'supplier_delivery_order' )
+          OR (object_type = 'sales_reclamation'           ) OR (object_type = 'purchase_reclamation'      ) OR (object_type = 'rma_delivery_order'      )
+  );
diff --git a/sql/Pg-upgrade2/file_storage_reclamation.sql b/sql/Pg-upgrade2/file_storage_reclamation.sql
new file mode 100644
index 000000000..0eadffa44
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_reclamation.sql
@@ -0,0 +1,19 @@
+-- @tag: file_storage_reclamation
+-- @description: Dateispeicher auch für Reklamationen anbieten
+-- @depends: file_storage_supplier_delivery_order
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                 ) OR (object_type = 'invoice'                 ) OR (object_type = 'sales_order'             )
+          OR (object_type = 'sales_quotation'             ) OR (object_type = 'sales_delivery_order'    ) OR (object_type = 'request_quotation'       )
+          OR (object_type = 'purchase_order'              ) OR (object_type = 'purchase_delivery_order' ) OR (object_type = 'purchase_invoice'        )
+          OR (object_type = 'vendor'                      ) OR (object_type = 'customer'                ) OR (object_type = 'part'                    )
+          OR (object_type = 'gl_transaction'              ) OR (object_type = 'dunning'                 ) OR (object_type = 'dunning1'                )
+          OR (object_type = 'dunning2'                    ) OR (object_type = 'dunning3'                ) OR (object_type = 'dunning_orig_invoice'    )
+          OR (object_type = 'dunning_invoice'             ) OR (object_type = 'draft'                   ) OR (object_type = 'statement'               )
+          OR (object_type = 'shop_image'                  ) OR (object_type = 'letter'                  ) OR (object_type = 'project'                 )
+          OR (object_type = 'invoice_for_advance_payment' ) OR (object_type = 'final_invoice'           ) OR (object_type = 'supplier_delivery_order' )
+          OR (object_type = 'sales_reclamation'           ) OR (object_type = 'purchase_reclamation'    )
+  );
diff --git a/sql/Pg-upgrade2/file_storage_rma_delivery_order.sql b/sql/Pg-upgrade2/file_storage_rma_delivery_order.sql
new file mode 100644
index 000000000..dd66132be
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_rma_delivery_order.sql
@@ -0,0 +1,19 @@
+-- @tag: file_storage_rma_delivery_order
+-- @description: Dateispeicher auch für Retourenlieferschein anbieten
+-- @depends: file_storage_reclamation
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                 ) OR (object_type = 'invoice'                 ) OR (object_type = 'sales_order'             )
+          OR (object_type = 'sales_quotation'             ) OR (object_type = 'sales_delivery_order'    ) OR (object_type = 'request_quotation'       )
+          OR (object_type = 'purchase_order'              ) OR (object_type = 'purchase_delivery_order' ) OR (object_type = 'purchase_invoice'        )
+          OR (object_type = 'vendor'                      ) OR (object_type = 'customer'                ) OR (object_type = 'part'                    )
+          OR (object_type = 'gl_transaction'              ) OR (object_type = 'dunning'                 ) OR (object_type = 'dunning1'                )
+          OR (object_type = 'dunning2'                    ) OR (object_type = 'dunning3'                ) OR (object_type = 'dunning_orig_invoice'    )
+          OR (object_type = 'dunning_invoice'             ) OR (object_type = 'draft'                   ) OR (object_type = 'statement'               )
+          OR (object_type = 'shop_image'                  ) OR (object_type = 'letter'                  ) OR (object_type = 'project'                 )
+          OR (object_type = 'invoice_for_advance_payment' ) OR (object_type = 'final_invoice'           ) OR (object_type = 'supplier_delivery_order' )
+          OR (object_type = 'sales_reclamation'           ) OR (object_type = 'purchase_reclamation'    ) OR (object_type = 'rma_delivery_order'      )
+  );
diff --git a/sql/Pg-upgrade2/file_storage_sales_order_intake.sql b/sql/Pg-upgrade2/file_storage_sales_order_intake.sql
new file mode 100644
index 000000000..5d2eacc8a
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_sales_order_intake.sql
@@ -0,0 +1,20 @@
+-- @tag: file_storage_sales_order_intake
+-- @description: Dateispeicher auch für Auftragseingänge
+-- @depends: file_storage_rma_delivery_order
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                 ) OR (object_type = 'invoice'                 )
+          OR (object_type = 'sales_order'                 ) OR (object_type = 'sales_order_intake'      )
+          OR (object_type = 'sales_quotation'             ) OR (object_type = 'sales_delivery_order'    ) OR (object_type = 'request_quotation'       )
+          OR (object_type = 'purchase_order'              ) OR (object_type = 'purchase_delivery_order' ) OR (object_type = 'purchase_invoice'        )
+          OR (object_type = 'vendor'                      ) OR (object_type = 'customer'                ) OR (object_type = 'part'                    )
+          OR (object_type = 'gl_transaction'              ) OR (object_type = 'dunning'                 ) OR (object_type = 'dunning1'                )
+          OR (object_type = 'dunning2'                    ) OR (object_type = 'dunning3'                ) OR (object_type = 'dunning_orig_invoice'    )
+          OR (object_type = 'dunning_invoice'             ) OR (object_type = 'draft'                   ) OR (object_type = 'statement'               )
+          OR (object_type = 'shop_image'                  ) OR (object_type = 'letter'                  ) OR (object_type = 'project'                 )
+          OR (object_type = 'invoice_for_advance_payment' ) OR (object_type = 'final_invoice'           ) OR (object_type = 'supplier_delivery_order' )
+          OR (object_type = 'sales_reclamation'           ) OR (object_type = 'purchase_reclamation'    ) OR (object_type = 'rma_delivery_order'      )
+  );
diff --git a/sql/Pg-upgrade2/file_storage_supplier_delivery_order.sql b/sql/Pg-upgrade2/file_storage_supplier_delivery_order.sql
new file mode 100644
index 000000000..0bb12873d
--- /dev/null
+++ b/sql/Pg-upgrade2/file_storage_supplier_delivery_order.sql
@@ -0,0 +1,18 @@
+-- @tag: file_storage_supplier_delivery_order
+-- @description: Dateispeicher auch für Beistelllieferschein
+-- @depends: file_storage_partial_invoices
+
+ALTER TABLE files
+  DROP CONSTRAINT valid_type;
+ALTER TABLE files
+  ADD  CONSTRAINT valid_type CHECK (
+             (object_type = 'credit_note'                 ) OR (object_type = 'invoice'                 ) OR (object_type = 'sales_order'             )
+          OR (object_type = 'sales_quotation'             ) OR (object_type = 'sales_delivery_order'    ) OR (object_type = 'request_quotation'       )
+          OR (object_type = 'purchase_order'              ) OR (object_type = 'purchase_delivery_order' ) OR (object_type = 'purchase_invoice'        )
+          OR (object_type = 'vendor'                      ) OR (object_type = 'customer'                ) OR (object_type = 'part'                    )
+          OR (object_type = 'gl_transaction'              ) OR (object_type = 'dunning'                 ) OR (object_type = 'dunning1'                )
+          OR (object_type = 'dunning2'                    ) OR (object_type = 'dunning3'                ) OR (object_type = 'dunning_orig_invoice'    )
+          OR (object_type = 'dunning_invoice'             ) OR (object_type = 'draft'                   ) OR (object_type = 'statement'               )
+          OR (object_type = 'shop_image'                  ) OR (object_type = 'letter'                  ) OR (object_type = 'project'                 )
+          OR (object_type = 'invoice_for_advance_payment' ) OR (object_type = 'final_invoice'           ) OR (object_type = 'supplier_delivery_order' )
+  );
diff --git a/sql/Pg-upgrade2/file_version.sql b/sql/Pg-upgrade2/file_version.sql
new file mode 100644
index 000000000..3ed5bd957
--- /dev/null
+++ b/sql/Pg-upgrade2/file_version.sql
@@ -0,0 +1,17 @@
+-- @tag: file_version
+-- @description: Tabelle für Dokumentenversion
+-- @depends: release_3_8_0
+
+CREATE TABLE IF NOT EXISTS file_versions (
+   guid          TEXT,
+   file_id       INTEGER            NOT NULL REFERENCES files(id) ON DELETE CASCADE,
+   version       INTEGER            NOT NULL,
+   file_location TEXT               NOT NULL,
+   doc_path      TEXT               NOT NULL,
+   backend       TEXT               NOT NULL,
+   itime         TIMESTAMP          NOT NULL DEFAULT now(),
+   mtime         TIMESTAMP,
+   PRIMARY KEY (file_id, version)
+);
+
+CREATE TRIGGER mtime_file_version BEFORE UPDATE ON file_versions FOR EACH ROW EXECUTE PROCEDURE set_mtime();
diff --git a/sql/Pg-upgrade2/file_versions_guid_as_primary_key.sql b/sql/Pg-upgrade2/file_versions_guid_as_primary_key.sql
new file mode 100644
index 000000000..66defad67
--- /dev/null
+++ b/sql/Pg-upgrade2/file_versions_guid_as_primary_key.sql
@@ -0,0 +1,8 @@
+-- @tag: file_versions_guid_as_primary_key
+-- @description: guid-Spalte als Primärschlüssel
+-- @depends: release_3_6_0 file_version
+
+ALTER TABLE file_versions
+   DROP CONSTRAINT  file_versions_pkey,
+   ADD  UNIQUE      (guid),
+   ADD  PRIMARY KEY (guid);
diff --git a/sql/Pg-upgrade2/files_add_uid.sql b/sql/Pg-upgrade2/files_add_uid.sql
new file mode 100644
index 000000000..c82d89d0d
--- /dev/null
+++ b/sql/Pg-upgrade2/files_add_uid.sql
@@ -0,0 +1,5 @@
+-- @tag: files_add_uid
+-- @description: unique Identifier (UID) für DMS System
+-- @depends: release_3_8_0
+
+ALTER TABLE files ADD COLUMN uid text;
diff --git a/sql/Pg-upgrade2/follow_up_created_for_employees.sql b/sql/Pg-upgrade2/follow_up_created_for_employees.sql
new file mode 100644
index 000000000..896b0c275
--- /dev/null
+++ b/sql/Pg-upgrade2/follow_up_created_for_employees.sql
@@ -0,0 +1,14 @@
+-- @tag: follow_up_created_for_employees
+-- @description: Wiedervorlagen für mehrere Benutzer ermöglichen
+-- @depends: follow_ups
+
+CREATE TABLE follow_up_created_for_employees (
+       id            SERIAL   NOT NULL PRIMARY KEY,
+       follow_up_id  INTEGER  NOT NULL REFERENCES follow_ups(id) ON DELETE CASCADE,
+       employee_id   INTEGER  NOT NULL REFERENCES employee(id)
+);
+
+INSERT INTO follow_up_created_for_employees (follow_up_id, employee_id)
+  SELECT id, created_for_user FROM follow_ups;
+
+ALTER TABLE follow_ups DROP COLUMN created_for_user;
diff --git a/sql/Pg-upgrade2/follow_up_done.sql b/sql/Pg-upgrade2/follow_up_done.sql
new file mode 100644
index 000000000..da9e0c2a8
--- /dev/null
+++ b/sql/Pg-upgrade2/follow_up_done.sql
@@ -0,0 +1,15 @@
+-- @tag: follow_up_done
+-- @description: Wiedervorlagen: Tabelle für Infos über abgeschlossene WVs
+-- @depends: follow_ups
+
+CREATE TABLE follow_up_done (
+       id            SERIAL    NOT NULL PRIMARY KEY,
+       follow_up_id  INTEGER   NOT NULL UNIQUE REFERENCES follow_ups(id) ON DELETE CASCADE,
+       done_at       TIMESTAMP NOT NULL DEFAULT now(),
+       employee_id   INTEGER   REFERENCES employee(id)
+);
+
+INSERT INTO follow_up_done (follow_up_id, done_at)
+  SELECT id, COALESCE(mtime, itime) FROM follow_ups WHERE done IS TRUE;
+
+ALTER TABLE follow_ups DROP COLUMN done;
diff --git a/sql/Pg-upgrade2/follow_up_done_close_follow_ups_when_order_is_closed.sql b/sql/Pg-upgrade2/follow_up_done_close_follow_ups_when_order_is_closed.sql
new file mode 100644
index 000000000..80922c29d
--- /dev/null
+++ b/sql/Pg-upgrade2/follow_up_done_close_follow_ups_when_order_is_closed.sql
@@ -0,0 +1,25 @@
+-- @tag: follow_up_done_close_follow_ups_when_order_is_closed
+-- @description: Wiedervorlagen schließen, wenn dazugehörige Belege geschlossen werden (nach follow_up_done)
+-- @depends: delete_close_follow_ups_when_order_is_deleted_closed
+
+CREATE OR REPLACE FUNCTION follow_up_close_when_oe_closed_trigger()
+RETURNS TRIGGER AS $$
+  BEGIN
+    IF COALESCE(NEW.closed, FALSE) AND NOT COALESCE(OLD.closed, FALSE) THEN
+      INSERT INTO follow_up_done (follow_up_id)
+        SELECT follow_ups.id
+        FROM follow_ups
+        LEFT JOIN follow_up_done ON (follow_up_done.follow_up_id = follow_ups.id)
+        WHERE follow_up_done.id IS NULL
+          AND follow_ups.id IN (
+          SELECT follow_up_id
+          FROM follow_up_links
+          WHERE (trans_id   = NEW.id)
+            AND (trans_type IN ('sales_quotation',   'sales_order',    'sales_delivery_order',
+                                'request_quotation', 'purchase_order', 'purchase_delivery_order'))
+       );
+    END IF;
+
+    RETURN NEW;
+  END;
+$$ LANGUAGE plpgsql;
diff --git a/sql/Pg-upgrade2/index_for_record_types.sql b/sql/Pg-upgrade2/index_for_record_types.sql
new file mode 100644
index 000000000..403c5f534
--- /dev/null
+++ b/sql/Pg-upgrade2/index_for_record_types.sql
@@ -0,0 +1,12 @@
+-- @tag: index_for_record_types
+-- @description: Indexe für Belegtypen erstelllen
+-- @depends: deliveryorder_type_to_record_type reclamation_type order_type
+
+CREATE INDEX oe_record_type_key
+  ON oe (record_type);
+
+CREATE INDEX reclamations_record_type_key
+  ON reclamations (record_type);
+
+CREATE INDEX delivery_orders_record_type_key
+  ON delivery_orders (record_type);
diff --git a/sql/Pg-upgrade2/invalid_chart.sql b/sql/Pg-upgrade2/invalid_chart.sql
new file mode 100644
index 000000000..4e90502a7
--- /dev/null
+++ b/sql/Pg-upgrade2/invalid_chart.sql
@@ -0,0 +1,7 @@
+-- @tag: invalid_chart
+-- @description: Ungültigkeit für Chart
+-- @depends: release_3_8_0
+-- @ignore: 0
+
+ALTER TABLE chart add column invalid boolean DEFAULT FALSE;
+
diff --git a/sql/Pg-upgrade2/makemodel_add_longdescription.sql b/sql/Pg-upgrade2/makemodel_add_longdescription.sql
new file mode 100644
index 000000000..008950f54
--- /dev/null
+++ b/sql/Pg-upgrade2/makemodel_add_longdescription.sql
@@ -0,0 +1,5 @@
+-- @tag: makemodel_add_longdescription
+-- @description: lange Artikelbezeichnung zu jedem Lieferanten speichern können
+-- @depends: release_3_8_0
+
+ALTER TABLE makemodel ADD COLUMN part_longdescription TEXT;
diff --git a/sql/Pg-upgrade2/makemodel_add_part_description.sql b/sql/Pg-upgrade2/makemodel_add_part_description.sql
new file mode 100644
index 000000000..5c2588ad2
--- /dev/null
+++ b/sql/Pg-upgrade2/makemodel_add_part_description.sql
@@ -0,0 +1,5 @@
+-- @tag: makemodel_add_part_description
+-- @description: Artikelbezeichnung zu jedem Lieferanten speichern können
+-- @depends: release_3_7_0
+
+ALTER TABLE makemodel ADD COLUMN part_description TEXT;
diff --git a/sql/Pg-upgrade2/oe_add_order_status.sql b/sql/Pg-upgrade2/oe_add_order_status.sql
new file mode 100644
index 000000000..aca59f9ba
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_add_order_status.sql
@@ -0,0 +1,5 @@
+-- @tag: oe_add_order_status
+-- @description: Status für Angebote und Aufträge: Feld in Angebot/Auftrags-Tabelle
+-- @depends: order_statuses
+
+ALTER TABLE oe ADD COLUMN order_status_id INTEGER REFERENCES order_statuses(id);
diff --git a/sql/Pg-upgrade2/oe_delivery_orders_add_vendor_confirmation_number.sql b/sql/Pg-upgrade2/oe_delivery_orders_add_vendor_confirmation_number.sql
new file mode 100644
index 000000000..6f2b14198
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_delivery_orders_add_vendor_confirmation_number.sql
@@ -0,0 +1,6 @@
+-- @tag: oe_delivery_orders_add_vendor_confirmation_number
+-- @description: Auftragsbestätigungs-Nummer des Lieferanten für Aufträge und Lieferscheine
+-- @depends: release_3_8_0
+
+ALTER TABLE oe              ADD COLUMN vendor_confirmation_number TEXT;
+ALTER TABLE delivery_orders ADD COLUMN vendor_confirmation_number TEXT;
diff --git a/sql/Pg-upgrade2/oe_purchase_order_confirmation.sql b/sql/Pg-upgrade2/oe_purchase_order_confirmation.sql
new file mode 100644
index 000000000..8bbb02221
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_purchase_order_confirmation.sql
@@ -0,0 +1,5 @@
+-- @tag: oe_purchase_order_confirmation
+-- @description: Neuer Einkaufsbeleg: Lieferantenauftragsbesätigung (purchase_order_confirmation)
+-- @depends: release_3_8_0
+
+ALTER TABLE defaults ADD pocnumber TEXT;
diff --git a/sql/Pg-upgrade2/oe_purchase_order_confirmation_order_types.sql b/sql/Pg-upgrade2/oe_purchase_order_confirmation_order_types.sql
new file mode 100644
index 000000000..17349cf3d
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_purchase_order_confirmation_order_types.sql
@@ -0,0 +1,6 @@
+-- @tag: oe_purchase_order_confirmation_order_types
+-- @description: order_types-Eintrag für Lieferantenauftragsbesätigung (purchase_order_confirmation)
+-- @depends: order_type
+-- @ignore: 0
+
+ALTER TYPE order_types ADD VALUE IF NOT EXISTS 'purchase_order_confirmation';
diff --git a/sql/Pg-upgrade2/oe_purchase_quotation_intake.sql b/sql/Pg-upgrade2/oe_purchase_quotation_intake.sql
new file mode 100644
index 000000000..6091ecd36
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_purchase_quotation_intake.sql
@@ -0,0 +1,5 @@
+-- @tag: oe_purchase_quotation_intake
+-- @description: Neuer Einkaufsbeleg: Angebots-Eingang (purchase_quotation_intake)
+-- @depends: oe_sales_order_intake_type
+
+ALTER TABLE defaults ADD pqinumber TEXT;
diff --git a/sql/Pg-upgrade2/oe_sales_order_intake_type.sql b/sql/Pg-upgrade2/oe_sales_order_intake_type.sql
new file mode 100644
index 000000000..3d1b9a22f
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_sales_order_intake_type.sql
@@ -0,0 +1,6 @@
+-- @tag: oe_sales_order_intake_type
+-- @description: Neuer Auftragsbeleg: Auftrags-Eingang (sales_order_intake)
+-- @depends: release_3_6_0
+
+ALTER TABLE oe ADD COLUMN intake BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE defaults ADD soinumber TEXT;
diff --git a/sql/Pg-upgrade2/oe_version.sql b/sql/Pg-upgrade2/oe_version.sql
new file mode 100644
index 000000000..60201a479
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_version.sql
@@ -0,0 +1,18 @@
+-- @tag: oe_version
+-- @description: Hilfstabelle für Versionierungen von Angeboten und Aufträgen
+-- @depends: release_3_6_0
+-- @ignore: 0
+      CREATE TABLE oe_version (
+        oe_id                   integer,
+        version                 INTEGER NOT NULL,
+        final_version           BOOLEAN DEFAULT FALSE,
+        email_journal_id        integer,
+        file_id                 integer,
+        itime                   TIMESTAMP      DEFAULT now(),
+        mtime                   TIMESTAMP,
+        PRIMARY KEY (oe_id, version),
+        FOREIGN KEY (oe_id)                    REFERENCES oe (id),
+        FOREIGN KEY (email_journal_id)         REFERENCES email_journal (id),
+        FOREIGN KEY (file_id)                  REFERENCES files (id));
+
+CREATE TRIGGER mtime_oe_version BEFORE UPDATE ON oe_version FOR EACH ROW EXECUTE PROCEDURE set_mtime();
diff --git a/sql/Pg-upgrade2/oe_version_create_first.sql b/sql/Pg-upgrade2/oe_version_create_first.sql
new file mode 100644
index 000000000..ea8e5ab67
--- /dev/null
+++ b/sql/Pg-upgrade2/oe_version_create_first.sql
@@ -0,0 +1,7 @@
+-- @tag: oe_version_create_first_
+-- @description: Erste Version für Angebote direkt in der DB anlegen
+-- @depends: release_3_6_0 oe_version
+-- @ignore: 0
+
+INSERT INTO oe_version(oe_id, version) select id, 1 from oe where not id in (select oe_id from oe_version);
+
diff --git a/sql/Pg-upgrade2/on_delete_oe_version_trigger.sql b/sql/Pg-upgrade2/on_delete_oe_version_trigger.sql
new file mode 100644
index 000000000..132b89200
--- /dev/null
+++ b/sql/Pg-upgrade2/on_delete_oe_version_trigger.sql
@@ -0,0 +1,7 @@
+-- @tag: on_delete_oe_version_trigger
+-- @description: Löschen in OE muss auch das Löschen aller Unterversionen triggern
+-- @depends: oe_version
+
+ALTER TABLE oe_version
+DROP CONSTRAINT oe_version_oe_id_fkey,
+ADD CONSTRAINT oe_version_oe_id_fkey FOREIGN KEY (oe_id) REFERENCES oe(id) ON DELETE CASCADE;
diff --git a/sql/Pg-upgrade2/order_statuses.sql b/sql/Pg-upgrade2/order_statuses.sql
new file mode 100644
index 000000000..2cc2f3265
--- /dev/null
+++ b/sql/Pg-upgrade2/order_statuses.sql
@@ -0,0 +1,24 @@
+-- @tag: order_statuses
+-- @description: Status für Angebote und Aufträge
+-- @depends: release_3_6_1
+
+-- table
+CREATE TABLE order_statuses (
+       id            SERIAL         NOT NULL PRIMARY KEY,
+       name          TEXT           UNIQUE NOT NULL,
+       description   TEXT,
+       position      INTEGER        NOT NULL,
+       obsolete      BOOLEAN        NOT NULL DEFAULT FALSE,
+       itime         TIMESTAMP      DEFAULT now(),
+       mtime         TIMESTAMP
+);
+
+CREATE TRIGGER mtime_order_statuses
+    BEFORE UPDATE ON order_statuses
+    FOR EACH ROW
+    EXECUTE PROCEDURE set_mtime();
+
+
+-- default entry
+INSERT INTO order_statuses (name,         description,                           position)
+                    VALUES ('bestätigt',  'Auftrag von Kunde bestätigt',         1);
diff --git a/sql/Pg-upgrade2/order_type.sql b/sql/Pg-upgrade2/order_type.sql
new file mode 100644
index 000000000..b7de56d2d
--- /dev/null
+++ b/sql/Pg-upgrade2/order_type.sql
@@ -0,0 +1,35 @@
+-- @tag: order_type
+-- @description: Persistente Typen in Aufträgen
+-- @depends: release_3_7_0 oe_sales_order_intake_type
+
+CREATE TYPE order_types AS ENUM (
+  'request_quotation',
+  'sales_quotation',
+  'purchase_quotation_intake',
+  'purchase_order',
+  'sales_order_intake',
+  'sales_order'
+);
+
+ALTER TABLE oe ADD COLUMN record_type order_types;
+
+UPDATE oe SET record_type = 'sales_order'
+  WHERE customer_id IS NOT NULL and (quotation = FALSE or quotation is null) and intake = FALSE;
+UPDATE oe SET record_type = 'purchase_order'
+  WHERE vendor_id   IS NOT NULL and (quotation = FALSE or quotation is null) and intake = FALSE;
+
+UPDATE oe SET record_type = 'sales_quotation'
+  WHERE customer_id IS NOT NULL and quotation = TRUE and intake = FALSE;
+UPDATE oe SET record_type = 'request_quotation'
+  WHERE vendor_id   IS NOT NULL and quotation = TRUE and intake = FALSE;
+
+UPDATE oe SET record_type = 'sales_order_intake'
+  WHERE customer_id IS NOT NULL and (quotation = FALSE or quotation is null) and intake = TRUE;
+UPDATE oe SET record_type = 'purchase_quotation_intake'
+  WHERE vendor_id   IS NOT NULL and quotation = TRUE and intake = TRUE;
+
+
+ALTER TABLE oe ALTER COLUMN record_type SET NOT NULL;
+
+ALTER TABLE oe DROP COLUMN quotation;
+ALTER TABLE oe DROP COLUMN intake;
diff --git a/sql/Pg-upgrade2/part_customer_prices_add_description.sql b/sql/Pg-upgrade2/part_customer_prices_add_description.sql
new file mode 100644
index 000000000..2f22bad87
--- /dev/null
+++ b/sql/Pg-upgrade2/part_customer_prices_add_description.sql
@@ -0,0 +1,6 @@
+-- @tag: part_customer_prices_add_description
+-- @description: Kundenspezifischen Preisen Beschreibung und Bemerkungen/Langtext hinzufügen
+-- @depends: create_part_customerprices
+
+ALTER TABLE part_customer_prices ADD COLUMN part_description     TEXT;
+ALTER TABLE part_customer_prices ADD COLUMN part_longdescription TEXT;
diff --git a/sql/Pg-upgrade2/parts_add_order_locked.sql b/sql/Pg-upgrade2/parts_add_order_locked.sql
new file mode 100644
index 000000000..903be17ec
--- /dev/null
+++ b/sql/Pg-upgrade2/parts_add_order_locked.sql
@@ -0,0 +1,5 @@
+-- @tag: parts_add_order_locked
+-- @description: Spalte für auslaufenden Artikel (nicht mehr bestellbar)
+-- @depends: release_3_8_0
+
+ALTER TABLE parts ADD order_locked boolean DEFAULT false;
diff --git a/sql/Pg-upgrade2/parts_add_zolltarifnr.sql b/sql/Pg-upgrade2/parts_add_zolltarifnr.sql
new file mode 100644
index 000000000..b82109243
--- /dev/null
+++ b/sql/Pg-upgrade2/parts_add_zolltarifnr.sql
@@ -0,0 +1,5 @@
+-- @tag: parts_zolltarifnr
+-- @description: Neues Feld für Zolltarifnummer
+-- @depends: release_3_8_0
+ALTER TABLE parts ADD COLUMN tariff_code text;
+
diff --git a/sql/Pg-upgrade2/parts_delete_trigger_priceupdate.sql b/sql/Pg-upgrade2/parts_delete_trigger_priceupdate.sql
new file mode 100644
index 000000000..24fb820e2
--- /dev/null
+++ b/sql/Pg-upgrade2/parts_delete_trigger_priceupdate.sql
@@ -0,0 +1,6 @@
+-- @tag: parts_delete_trigger_priceupdate
+-- @description: Trigger und Funktion zum Preisupdate der Tabelle parts entfernen
+-- @depends: release_3_8_0
+
+DROP TRIGGER IF EXISTS priceupdate_parts ON parts;
+DROP FUNCTION set_priceupdate_parts;
diff --git a/sql/Pg-upgrade2/parts_price_history_add_price_factor.sql b/sql/Pg-upgrade2/parts_price_history_add_price_factor.sql
new file mode 100644
index 000000000..937532ba2
--- /dev/null
+++ b/sql/Pg-upgrade2/parts_price_history_add_price_factor.sql
@@ -0,0 +1,24 @@
+-- @tag: parts_price_history_add_price_factor
+-- @description: Preisfaktor für Entwicklung der Stammdatenpreise
+-- @depends: add_parts_price_history2
+
+ALTER TABLE parts_price_history ADD COLUMN price_factor NUMERIC(15, 5) DEFAULT 1;
+
+CREATE OR REPLACE FUNCTION add_parts_price_history_entry() RETURNS "trigger" AS $$
+  BEGIN
+    IF      (TG_OP = 'UPDATE')
+        AND ((OLD.lastcost        IS NULL AND NEW.lastcost        IS NULL) OR (OLD.lastcost     = NEW.lastcost))
+        AND ((OLD.listprice       IS NULL AND NEW.listprice       IS NULL) OR (OLD.listprice    = NEW.listprice))
+        AND ((OLD.sellprice       IS NULL AND NEW.sellprice       IS NULL) OR (OLD.sellprice    = NEW.sellprice))
+        AND ((OLD.price_factor_id IS NULL AND NEW.price_factor_id IS NULL) OR
+             ( (SELECT factor FROM price_factors WHERE price_factors.id = OLD.price_factor_id) = (SELECT factor FROM price_factors WHERE price_factors.id = NEW.price_factor_id) ))
+        THEN
+      RETURN NEW;
+    END IF;
+
+    INSERT INTO parts_price_history (part_id, lastcost, listprice, sellprice, price_factor, valid_from)
+    VALUES (NEW.id, NEW.lastcost, NEW.listprice, NEW.sellprice, COALESCE((SELECT factor FROM price_factors WHERE price_factors.id = NEW.price_factor_id), 1), now());
+
+    RETURN NEW;
+  END;
+$$ LANGUAGE plpgsql;
diff --git a/sql/Pg-upgrade2/phone_notes_convert_to_html.pl b/sql/Pg-upgrade2/phone_notes_convert_to_html.pl
new file mode 100644
index 000000000..6ec9ac2b8
--- /dev/null
+++ b/sql/Pg-upgrade2/phone_notes_convert_to_html.pl
@@ -0,0 +1,40 @@
+# @tag: phone_notes_convert_to_html
+# @description: Telefonnotizen zu html konvertieren
+# @depends: release_3_6_1
+package SL::DBUpgrade2::phone_notes_convert_to_html;
+
+use strict;
+use utf8;
+
+use parent qw(SL::DBUpgrade2::Base);
+
+use SL::HTML::Util;
+
+sub run {
+  my ($self) = @_;
+
+  my $q_fetch = <<SQL;
+    SELECT id, body FROM notes WHERE trans_module LIKE 'oe'
+SQL
+
+  my $q_update_column = <<SQL;
+    UPDATE notes SET body = ? WHERE id = ?
+SQL
+
+  my $h_fetch = $self->dbh->prepare($q_fetch);
+  $h_fetch->execute || $::form->dberror($q_fetch);
+
+  my $h_update_column = $self->dbh->prepare($q_update_column);
+
+  while (my $entry = $h_fetch->fetchrow_hashref) {
+    $entry->{body} //= '';
+    my $html_value = SL::HTML::Util->plain_text_to_html($entry->{body});
+    $h_update_column->execute($html_value, $entry->{id}) || $::form->dberror($q_update_column);
+  }
+  $h_update_column->finish;
+  $h_fetch->finish;
+
+  return 1;
+}
+
+1;
diff --git a/sql/Pg-upgrade2/purchase_basket_items.sql b/sql/Pg-upgrade2/purchase_basket_items.sql
new file mode 100644
index 000000000..9b8d412a5
--- /dev/null
+++ b/sql/Pg-upgrade2/purchase_basket_items.sql
@@ -0,0 +1,17 @@
+-- @tag: purchase_basket_items
+-- @description: Tabelle für den Dispositionsmanager
+-- @depends: release_3_8_0
+-- @ignore: 0
+
+CREATE TABLE purchase_basket_items (
+  id SERIAL   PRIMARY KEY,
+  part_id     INTEGER REFERENCES parts(id),
+  orderer_id  INTEGER REFERENCES employee(id),
+  qty         NUMERIC(15,5) NOT NULL,
+  cleared     BOOLEAN NOT NULL            DEFAULT FALSE,
+  itime       TIMESTAMP without time zone DEFAULT now(),
+  mtime       TIMESTAMP without time zone
+);
+CREATE TRIGGER mtime_purchase_basket_items
+  BEFORE UPDATE ON purchase_basket_items
+  FOR EACH ROW EXECUTE PROCEDURE set_mtime();
diff --git a/sql/Pg-upgrade2/reclamation_add_additional_billing_addresses.sql b/sql/Pg-upgrade2/reclamation_add_additional_billing_addresses.sql
new file mode 100644
index 000000000..bf95b44bb
--- /dev/null
+++ b/sql/Pg-upgrade2/reclamation_add_additional_billing_addresses.sql
@@ -0,0 +1,8 @@
+-- @tag: reclamation_add_additional_billing_addresses
+-- @description: Kundenstammdaten: zusätzliche Rechnungsadressen auch in Reclamation
+-- @depends: reclamations customer_additional_billing_addresses
+
+ALTER TABLE reclamations
+  ADD COLUMN billing_address_id INTEGER,
+  ADD FOREIGN KEY (billing_address_id)
+    REFERENCES additional_billing_addresses (id);
diff --git a/sql/Pg-upgrade2/reclamation_type.sql b/sql/Pg-upgrade2/reclamation_type.sql
new file mode 100644
index 000000000..0a7d4e6d2
--- /dev/null
+++ b/sql/Pg-upgrade2/reclamation_type.sql
@@ -0,0 +1,17 @@
+-- @tag: reclamation_type
+-- @description: Persistente Typen in Reklamationen
+-- @depends: release_3_7_0
+
+CREATE TYPE reclamation_types AS ENUM (
+  'sales_reclamation',
+  'purchase_reclamation'
+);
+
+ALTER TABLE reclamations ADD COLUMN record_type reclamation_types;
+
+UPDATE reclamations SET record_type = 'sales_reclamation' WHERE customer_id IS NOT NULL;
+UPDATE reclamations SET record_type = 'purchase_reclamation' WHERE vendor_id IS NOT NULL;
+
+ALTER TABLE reclamations ALTER COLUMN record_type SET NOT NULL;
+
+
diff --git a/sql/Pg-upgrade2/reclamations.sql b/sql/Pg-upgrade2/reclamations.sql
new file mode 100644
index 000000000..efedb293f
--- /dev/null
+++ b/sql/Pg-upgrade2/reclamations.sql
@@ -0,0 +1,109 @@
+-- @tag: reclamations
+-- @description: Add reclamations, reclamation_items and reclamation_reasons
+-- @depends: release_3_5_7
+-- @ignore: 0
+
+CREATE TABLE reclamation_reasons (
+  id                       SERIAL                      PRIMARY KEY,
+  name                     TEXT                        NOT NULL,
+  description              TEXT                        NOT NULL,
+  position                 INTEGER                     NOT NULL,
+  itime                    TIMESTAMP without time zone DEFAULT now(),
+  mtime                    TIMESTAMP without time zone,
+  valid_for_sales          BOOLEAN                     NOT NULL DEFAULT false,
+  valid_for_purchase       BOOLEAN                     NOT NULL DEFAULT false
+);
+CREATE TRIGGER mtime_reclamation_reasons
+  BEFORE UPDATE ON reclamation_reasons
+  FOR EACH ROW EXECUTE PROCEDURE set_mtime();
+
+CREATE TABLE reclamations (
+--basic
+  id                      INTEGER                     NOT NULL DEFAULT nextval('id'),
+  record_number           TEXT                        NOT NULL,
+  transdate               DATE                        DEFAULT now(),
+  itime                   TIMESTAMP without time zone DEFAULT now(),
+  mtime                   TIMESTAMP without time zone,
+  delivered               BOOLEAN                     NOT NULL DEFAULT false,
+  closed                  BOOLEAN                     NOT NULL DEFAULT false,
+--header
+  employee_id             INTEGER                     NOT NULL REFERENCES employee(id),
+  globalproject_id        INTEGER                     REFERENCES project(id),
+  delivery_term_id        INTEGER                     REFERENCES delivery_terms(id),
+  shipto_id               INTEGER                     REFERENCES shipto(shipto_id),
+  department_id           INTEGER                     REFERENCES department(id),
+  contact_id              INTEGER                     REFERENCES contacts(cp_id),
+  shipvia                 TEXT,
+  transaction_description TEXT,
+  shippingpoint           TEXT,
+  cv_record_number        TEXT,
+  reqdate                 DATE,
+--money/summery
+  amount                  NUMERIC(15,5),
+  netamount               NUMERIC(15,5),
+  payment_id              INTEGER                     REFERENCES payment_terms(id),
+  currency_id             INTEGER                     NOT NULL REFERENCES currencies(id),
+  taxincluded             BOOLEAN                     NOT NULL,
+  tax_point               DATE,
+  exchangerate            NUMERIC(15,5),
+  taxzone_id              INTEGER                     NOT NULL REFERENCES tax_zones(id),
+--other
+  notes                   TEXT,
+  intnotes                TEXT,
+  language_id             INTEGER                     REFERENCES language(id),
+
+  salesman_id             INTEGER                     REFERENCES employee(id),
+  customer_id             INTEGER                     REFERENCES customer(id),
+
+  vendor_id               INTEGER                     REFERENCES vendor(id),
+
+  CONSTRAINT reclamations_customervendor_check CHECK (
+       (customer_id IS NOT NULL AND vendor_id   IS NULL)
+    OR (vendor_id   IS NOT NULL AND customer_id IS NULL)
+  ),
+
+  PRIMARY KEY (id)
+);
+CREATE TRIGGER mtime_reclamations BEFORE UPDATE ON reclamations FOR EACH ROW EXECUTE PROCEDURE set_mtime();
+
+CREATE INDEX reclamations_record_number_key ON reclamations (record_number);
+CREATE INDEX reclamations_customer_id_key ON reclamations (customer_id);
+CREATE INDEX reclamations_vendor_id_key ON reclamations (vendor_id);
+
+
+ALTER TABLE defaults ADD COLUMN p_reclamation_record_number TEXT NOT NULL DEFAULT 0;
+ALTER TABLE defaults ADD COLUMN s_reclamation_record_number TEXT NOT NULL DEFAULT 0;
+
+CREATE TABLE reclamation_items (
+--base
+  id                         SERIAL                      PRIMARY KEY,
+  reclamation_id             INTEGER                     NOT NULL REFERENCES reclamations(id) ON DELETE CASCADE,
+  reason_id                  INTEGER                     NOT NULL REFERENCES reclamation_reasons(id),
+  reason_description_ext     TEXT,
+  reason_description_int     TEXT,
+  position                   INTEGER                     NOT NULL CHECK(position > 0),
+  itime                      TIMESTAMP without time zone DEFAULT now(),
+  mtime                      TIMESTAMP without time zone,
+--header
+  project_id                 INTEGER                     REFERENCES project(id) ON DELETE SET NULL,
+--part description
+  parts_id                   INTEGER                     NOT NULL REFERENCES parts(id),
+  description                TEXT,
+  longdescription            TEXT,
+  serialnumber               TEXT,
+  base_qty                   REAL,
+  qty                        REAL,
+  unit                       character varying(20)       REFERENCES units(name),
+--money
+  sellprice                  NUMERIC(15,5),
+  lastcost                   NUMERIC(15,5),
+  discount                   REAL,
+  pricegroup_id              INTEGER                     REFERENCES pricegroup(id),
+  price_factor_id            INTEGER                     REFERENCES price_factors(id),
+  price_factor               NUMERIC(15,5)               DEFAULT 1,
+  active_price_source        TEXT                        NOT NULL DEFAULT ''::text,
+  active_discount_source     TEXT                        NOT NULL DEFAULT ''::text,
+--other
+  reqdate                    DATE
+);
+CREATE TRIGGER mtime_reclamation_items BEFORE UPDATE ON reclamation_items FOR EACH ROW EXECUTE PROCEDURE set_mtime();
diff --git a/sql/Pg-upgrade2/record_links_delete_triggers__reclamations__reclamation_items.sql b/sql/Pg-upgrade2/record_links_delete_triggers__reclamations__reclamation_items.sql
new file mode 100644
index 000000000..61c0b9294
--- /dev/null
+++ b/sql/Pg-upgrade2/record_links_delete_triggers__reclamations__reclamation_items.sql
@@ -0,0 +1,11 @@
+-- @tag: record_links_delete_triggers__reclamations__reclamation_items
+-- @description: delete corresponding record_links if reclamation or reclamation_item is deleted
+-- @depends: clean_up_record_links_before_delete_trigger reclamations
+
+CREATE TRIGGER before_delete_reclamation_items_clean_up_record_linkes_trigger
+BEFORE DELETE ON reclamation_items FOR EACH ROW EXECUTE
+PROCEDURE clean_up_record_links_before_delete();
+
+CREATE TRIGGER before_delete_reclamations_clean_up_record_linkes_trigger
+BEFORE DELETE ON reclamations FOR EACH ROW EXECUTE
+PROCEDURE clean_up_record_links_before_delete();
diff --git a/sql/Pg-upgrade2/release_3_7_0.sql b/sql/Pg-upgrade2/release_3_7_0.sql
new file mode 100644
index 000000000..3f68498e9
--- /dev/null
+++ b/sql/Pg-upgrade2/release_3_7_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_7_0
+-- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.7.0 voraussetzt, um ein fest definiertes Schema zu definieren.
+-- @depends: release_3_6_1 bank_transactions_add_qr_reference follow_up_done_close_follow_ups_when_order_is_closed oe_add_order_status follow_up_created_for_employees defaults_oe_subversion on_delete_oe_version_trigger ar_add_qr_reference oe_version_create_first_ phone_notes_convert_to_html validity_tokens follow_up_done
diff --git a/sql/Pg-upgrade2/release_3_8_0.sql b/sql/Pg-upgrade2/release_3_8_0.sql
new file mode 100644
index 000000000..b1f04f409
--- /dev/null
+++ b/sql/Pg-upgrade2/release_3_8_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_8_0
+-- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.8.0 voraussetzt, um ein fest definiertes Schema zu definieren.
+-- @depends: release_3_7_0 sales_orders_recurring_billing_mode exchangerate_in_arap record_links_delete_triggers__reclamations__reclamation_items booking_group_obsolete file_storage_rma_delivery_order makemodel_add_part_description defaults_qrbill_copy_invnumber_to_message defaults_remove_invoice_prevent_browser_back reclamation_add_additional_billing_addresses add_charts_and_tax_to_invoice_items delivery_order_remove_is_sales_in_db ap_is_sepa_blocked delivery_terms_markable_as_obsolete add_tax_chart_type_to_invoice_items undo_delete_wrong_charts_for_taxkeys defaults_record_sender_emails defaults_add_reclamations ar_add_qr_unstructured_message delete_cvars_on_trans_deletion_add_reclamation_items customer_add_dunning_mail defaults_view_record_links_options
diff --git a/sql/Pg-upgrade2/release_3_9_0.sql b/sql/Pg-upgrade2/release_3_9_0.sql
new file mode 100644
index 000000000..e6e72ac1e
--- /dev/null
+++ b/sql/Pg-upgrade2/release_3_9_0.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_0
+-- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.9.0 voraussetzt, um ein fest definiertes Schema zu definieren.
+-- @depends: release_3_8_0 add_link_for_fx_gain_loss_charts add_parts_order_qty defaults_allowed_documents_with_no_positions email_journal_record_types_add_purchase_order_confirmation defaults_set_invoice_creation_mode_for_dunning_attachment invalid_chart defaults_webdav oe_purchase_order_confirmation_order_types email_journal_add_obsolete defaults_yearend_method email_journal_record_types_add_catch_all parts_delete_trigger_priceupdate defaults_add_layout_style defaults_transit_items_account oe_purchase_quotation_intake files_add_uid purchase_basket_items parts_price_history_add_price_factor bank_accounts_flag_for_use_with_bank_import file_storage_purchase_order_confirmation index_for_record_types shop_order_items_discount oe_purchase_order_confirmation add_orderer oe_delivery_orders_add_vendor_confirmation_number makemodel_add_longdescription parts_zolltarifnr add_customer_dunning_lock part_customer_prices_add_description ap_add_qrbill_data add_business_models_position parts_add_order_locked defaults_fuzzy_skonto
diff --git a/sql/Pg-upgrade2/release_3_9_1.sql b/sql/Pg-upgrade2/release_3_9_1.sql
new file mode 100644
index 000000000..89f6f381d
--- /dev/null
+++ b/sql/Pg-upgrade2/release_3_9_1.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_1
+-- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.9.1 voraussetzt, um ein fest definiertes Schema zu definieren.
+-- @depends: release_3_9_0 add_description_to_backgroundjob_and_backgroundjobhistory remove_trigger_assembly_purchase_price defaults_set_ARAP bank_transactions_add_end_to_end_id defaults_endtoend change_file_backend_to_enum defaults_bank_config defaults_show_new_docs file_object_type_as_enum file_versions_guid_as_primary_key shop_images_dont_skip_position defaults_show_invoice_for_advance_payment add_file_version
diff --git a/sql/Pg-upgrade2/release_3_9_2.sql b/sql/Pg-upgrade2/release_3_9_2.sql
new file mode 100644
index 000000000..ca5103272
--- /dev/null
+++ b/sql/Pg-upgrade2/release_3_9_2.sql
@@ -0,0 +1,3 @@
+-- @tag: release_3_9_2
+-- @description: Leeres Script, das alle Upgradescripte bis zum Release 3.9.2 voraussetzt, um ein fest definiertes Schema zu definieren.
+-- @depends: release_3_9_1 defaults_email_subject_transaction_description defaults_order_item_input_position bank_accounts_add_qr_iban defaults_drop_feature_experimental_order update_employee_base_data defaults_drop_feature_experimental_assortment
diff --git a/sql/Pg-upgrade2/remove_trigger_assembly_purchase_price.sql b/sql/Pg-upgrade2/remove_trigger_assembly_purchase_price.sql
new file mode 100644
index 000000000..15476371a
--- /dev/null
+++ b/sql/Pg-upgrade2/remove_trigger_assembly_purchase_price.sql
@@ -0,0 +1,6 @@
+-- @tag: remove_trigger_assembly_purchase_price
+-- @description: Trigger zum Aktualisieren des EK-Preises bei Erzeugnissen entfernen
+-- @depends: release_3_9_0
+
+DROP TRIGGER  IF EXISTS trig_assembly_purchase_price ON assembly;
+DROP FUNCTION IF EXISTS update_purchase_price();
diff --git a/sql/Pg-upgrade2/sales_orders_recurring_billing_mode.sql b/sql/Pg-upgrade2/sales_orders_recurring_billing_mode.sql
new file mode 100644
index 000000000..c4fdc3e6b
--- /dev/null
+++ b/sql/Pg-upgrade2/sales_orders_recurring_billing_mode.sql
@@ -0,0 +1,9 @@
+-- @tag: sales_orders_recurring_billing_mode
+-- @description: Verkaufsaufträge: Positionen wiederkehrender Rechnungen optional nur einmal oder gar nicht abrechnen
+-- @depends: release_3_6_0
+CREATE TYPE items_recurring_billing_mode AS ENUM ('never', 'once', 'always');
+
+ALTER TABLE orderitems
+  ADD COLUMN recurring_billing_mode items_recurring_billing_mode DEFAULT 'always' NOT NULL,
+  ADD COLUMN recurring_billing_invoice_id INTEGER,
+  ADD FOREIGN KEY (recurring_billing_invoice_id) REFERENCES ar (id) ON DELETE SET NULL;
diff --git a/sql/Pg-upgrade2/shop_images_dont_skip_positon.sql b/sql/Pg-upgrade2/shop_images_dont_skip_positon.sql
new file mode 100644
index 000000000..42bc89d5c
--- /dev/null
+++ b/sql/Pg-upgrade2/shop_images_dont_skip_positon.sql
@@ -0,0 +1,37 @@
+-- @tag: shop_images_dont_skip_position
+-- @description: Keine Lücken in Position bei Shopbilder
+-- @depends: release_3_9_0
+
+UPDATE shop_images
+SET position = reordered.new_position
+FROM (
+  SELECT id, rank() OVER (PARTITION BY object_id ORDER BY position ASC) AS new_position
+  FROM shop_images
+) reordered
+WHERE shop_images.id = reordered.id
+AND shop_images.position IS DISTINCT FROM reordered.new_position;
+
+CREATE OR REPLACE FUNCTION shop_images_reorder_position()
+RETURNS TRIGGER
+AS
+$$
+BEGIN
+  UPDATE shop_images
+  SET position = reordered.new_position
+  FROM (
+    SELECT id, rank() OVER (PARTITION BY object_id ORDER BY position ASC) AS new_position
+    FROM shop_images
+    WHERE shop_images.object_id = OLD.object_id
+  ) reordered
+  WHERE shop_images.id = reordered.id
+  AND shop_images.position IS DISTINCT FROM reordered.new_position;
+
+  RETURN OLD;
+END;
+$$
+LANGUAGE plpgsql;
+
+CREATE TRIGGER after_delete_shop_images_trigger
+AFTER DELETE ON shop_images
+FOR EACH ROW
+EXECUTE FUNCTION shop_images_reorder_position();
diff --git a/sql/Pg-upgrade2/shop_order_items_discount.sql b/sql/Pg-upgrade2/shop_order_items_discount.sql
new file mode 100644
index 000000000..23417ac39
--- /dev/null
+++ b/sql/Pg-upgrade2/shop_order_items_discount.sql
@@ -0,0 +1,9 @@
+-- @tag: shop_order_items_discount
+-- @description: shop_order_items haben einen identifier und referenzieren prozentualen rabatt
+-- @depends: shop_orders_update_4
+
+-- @ignore: 0
+
+ALTER TABLE shop_order_items ADD COLUMN discount      REAL;
+ALTER TABLE shop_order_items ADD COLUMN discount_code TEXT;
+ALTER TABLE shop_order_items ADD COLUMN identifier    TEXT;
diff --git a/sql/Pg-upgrade2/steuerfilterung.pl b/sql/Pg-upgrade2/steuerfilterung.pl
index b7be34167..8215271ef 100644
--- a/sql/Pg-upgrade2/steuerfilterung.pl
+++ b/sql/Pg-upgrade2/steuerfilterung.pl
@@ -60,11 +60,17 @@ sub run {
 
       # Swiss
       { taxkey => 2,  rate => 0.08,  taxdescription => qr{mwst}i,                                categories => 'I' },
+      { taxkey => 2,  rate => 0.081, taxdescription => qr{mwst}i,                                categories => 'I' },
       { taxkey => 3,  rate => 0.025, taxdescription => qr{mwst}i,                                categories => 'I' },
+      { taxkey => 3,  rate => 0.026, taxdescription => qr{mwst}i,                                categories => 'I' },
       { taxkey => 4,  rate => 0.08,  taxdescription => qr{mwst}i,                                categories => 'E' },
+      { taxkey => 4,  rate => 0.081, taxdescription => qr{mwst}i,                                categories => 'E' },
       { taxkey => 5,  rate => 0.025, taxdescription => qr{mwst}i,                                categories => 'E' },
+      { taxkey => 5,  rate => 0.026, taxdescription => qr{mwst}i,                                categories => 'E' },
       { taxkey => 6,  rate => 0.08,  taxdescription => qr{mwst}i,                                categories => 'E' },
+      { taxkey => 6,  rate => 0.081, taxdescription => qr{mwst}i,                                categories => 'E' },
       { taxkey => 7,  rate => 0.025, taxdescription => qr{mwst}i,                                categories => 'E' },
+      { taxkey => 7,  rate => 0.026, taxdescription => qr{mwst}i,                                categories => 'E' },
   );
 
   $query = qq|SELECT taxkey, taxdescription, rate, id AS tax_id FROM tax order by taxkey, rate;|;
diff --git a/sql/Pg-upgrade2/undo_delete_wrong_charts_for_taxkeys.sql b/sql/Pg-upgrade2/undo_delete_wrong_charts_for_taxkeys.sql
new file mode 100644
index 000000000..62ec8628f
--- /dev/null
+++ b/sql/Pg-upgrade2/undo_delete_wrong_charts_for_taxkeys.sql
@@ -0,0 +1,12 @@
+-- @tag: undo_delete_wrong_charts_for_taxkeys
+-- @description: chart_id kann doch mehrdeutig sein in der Tabelle für SKR04
+-- @depends: release_3_7_0 delete_wrong_charts_for_taxkeys delete_wrong_charts_for_taxkeys_04
+ALTER TABLE tax DROP CONSTRAINT IF EXISTS chart_id_unique_tax;
+-- skr04
+
+update tax set chart_id = (select chart_id from tax where chart_id is not null and taxkey=7 and rate=0.16) where chart_id is null
+AND taxkey=9 and rate=0.16 AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+
+update tax set chart_id = (select chart_id from tax where chart_id is not null and taxkey=5 and rate=0.16) where chart_id is null and taxkey=3 and rate=0.16
+AND EXISTS (SELECT * FROM defaults WHERE coa = 'Germany-DATEV-SKR04EU');
+
diff --git a/sql/Pg-upgrade2/update_employee_base_data.sql b/sql/Pg-upgrade2/update_employee_base_data.sql
new file mode 100644
index 000000000..40c7832f9
--- /dev/null
+++ b/sql/Pg-upgrade2/update_employee_base_data.sql
@@ -0,0 +1,5 @@
+-- @tag: update_employee_base_data
+-- @description: Hintergrundjob für regelmäßiges Aktualisieren der Employee-Basisdaten aus der Auth-Tabelle
+-- @depends: release_3_6_0
+INSERT INTO background_jobs (type, package_name, active, cron_spec, next_run_at)
+VALUES ('interval', 'UpdateEmployeeBaseData', true, '*/5 * * * *', current_timestamp);
diff --git a/sql/Pg-upgrade2/validity_tokens.sql b/sql/Pg-upgrade2/validity_tokens.sql
new file mode 100644
index 000000000..5714fbf05
--- /dev/null
+++ b/sql/Pg-upgrade2/validity_tokens.sql
@@ -0,0 +1,16 @@
+-- @tag: validity_tokens
+-- @description: Gültigkeits-Tokens z.B. für HTML-Formulare
+-- @depends: release_3_6_1
+CREATE TABLE validity_tokens (
+  id          SERIAL,
+  scope       TEXT      NOT NULL,
+  token       TEXT      NOT NULL,
+  itime       TIMESTAMP NOT NULL DEFAULT now(),
+  valid_until TIMESTAMP NOT NULL,
+
+  PRIMARY KEY (id),
+  UNIQUE (scope, token)
+);
+
+INSERT INTO background_jobs (type, package_name, cron_spec, next_run_at, active)
+VALUES ('interval', 'ValidityTokenCleanup', '0 3 * * *', now(), true);
diff --git a/sql/Switzerland-deutsch-MWST-2014-chart.sql b/sql/Switzerland-deutsch-MWST-2014-chart.sql
deleted file mode 100644
index 1724b5cb3..000000000
--- a/sql/Switzerland-deutsch-MWST-2014-chart.sql
+++ /dev/null
@@ -1,347 +0,0 @@
--- deutschsprachiger Kontenplan nach Schweizer Kontenrahmen KMU für Firmen in der Schweiz, die mehrwertsteuerpflichtig sind
--- Erstellt am 4.6.2014
--- Korrigiert: November 2015 und Juli 2017
--- Grundlage: Revision OR Stand 1.1.2013, insbesondere Art. 957a Abs. 2
--- Redaktion: revamp-it, http://www.revamp-it.ch
--- Copyright 2014,2015,2017
-
--- This file is part of kivitendo.
--- kivitendo 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.
--- 
--- kivitendo 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 kivitendo. If not, see <http://www.gnu.org/licenses/>.
-
--- Diese Datei ist Teil von kivitendo.
---
--- kivitendo ist Freie Software: Sie können es unter den Bedingungen
--- der GNU General Public License, wie von der Free Software Foundation,
--- Version 2 der Lizenz oder (nach Ihrer Wahl) jeder späteren
--- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
---
--- kivitendo wird in der Hoffnung, dass es nützlich sein wird, aber
--- OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite
--- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
--- Siehe die GNU General Public License für weitere Details.
---
--- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
--- Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
-
-DELETE FROM chart;
-
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
-('1',    'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('10',   'UMLAUFSVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('100',  'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1000', 'Kasse','A','A','AR_paid:AP_paid','1000',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1020', 'Postfinance oder Bank1','A','A','AR_paid:AP_paid','1020',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1021', 'Bank2','A','A','AR_paid:AP_paid','1021',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('106',  'Kurzfristig gehaltene Aktiven mit Börsenkurs','H','','','106',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('110',  'Forderungen aus Lieferungen und Leistungen','H','','','110',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1100', 'Forderungen aus Lieferungen und Leistungen','A','A','AR','1100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('114',  'Übrige kurzfristige Forderungen','H','','','114',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1140', 'Vorschüsse, kurzfristige Darlehen','A','A','AR','1140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1170', 'Vorsteuer auf Aufwand','A','A','AP_tax:IC_taxpart:IC_taxservice','1170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1171', 'Vorsteuer auf Investitionen','A','A','AP_tax:IC_taxpart:IC_taxservice','1171',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1176', 'Verrechnungssteuer','A','A','','1176',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('120',  'Vorräte und nicht fakturierte Dienstleistungen','H','','','120',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1200', 'Handelswaren','A','A','IC','1200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1210', 'Rohstoffe','A','A','IC','1210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1280', 'Nicht fakturierte Dienstleistungen','A','A','IC','1280',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1290', 'Angefangene Arbeiten','A','A','IC','1290',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('130',  'Aktive Rechnungsabgrenzungen','H','','','130',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1300', 'Aktive Rechnungsabgrenzungen','A','A','','1300',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('14',   'ANLAGEVERMÖGEN','H','','','14',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('140',  'Finanzanlagen','H','','','140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('148',  'Beteiligungen','H','','','148',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('150',  'Mobile Sachanlagen','H','','','150',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1500', 'Maschinen und Apparate','A','A','IC','1500',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1510', 'Mobiliar und Einrichtungen','A','A','IC','1510',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1520', 'Büromaschinen, Informatik','A','A','IC','1520',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1530', 'Fahrzeuge','A','A','IC','1530',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('1540', 'Werkzeuge und Geräte','A','A','IC','1540',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('160',  'Immobile Sachanlagen','H','','','160',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('170',  'Immaterielle Werte','H','','','170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('180',  'Nicht einbezahltes Grund- Gesellschafter- oder Stiftungskapital','H','','','180',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2',    'PASSIVEN','H','','','2',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('20',   'KURZFRISTIGES FREMDKAPITAL','H','','','20',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('200',  'Verbindlichkeiten aus Lieferungen und Leistungen','H','','','200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2000', 'Verbindlichkeiten aus Lieferungen und Leistungen','A','L','AP','2000',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2001', 'Übrige Kreditoren','A','L','AP','2001',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2030', 'Anzahlungen von Kundinnen und Kunden','A','L','AR_paid:AP_paid','2030',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('210',  'Kurzfristige verzinsliche Verbindlichkeiten','H','','','210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2100', 'Bankverbindlichkeiten','A','L','AR_paid:AP_paid','2100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2140', 'Übrige verzinsliche Verbindlichkeiten','A','L','AP','2140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('220',  'Übrige kurzfristige Verbindlichkeiten','H','','','220',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2200', 'Geschuldete MWST(8%)','A','L','AR_tax:IC_taxpart:IC_taxservice','2200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2201', 'Geschuldete MWST(2.5%)','A','L','AR_tax:IC_taxpart:IC_taxservice','2201',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2206', 'Verrechnungssteuer','A','L','AP','2206',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2210', 'Geschuldete Steuern','A','L','AP','2210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2250', 'Personalaufwand','A','L','AP','2250',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2270', 'Verbindlichkeiten Sozialversicherungen und Vorsorgeeinrichtungen','A','L','AP','2270',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('230',  'Passive Rechnungsabgrenzungen und kurzfristige Rückstellungen','H','','','230',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2300', 'Passive Rechnungsabgrenzungen','A','L','','2300',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2330', 'Kurzfristige Rückstellungen','A','L','','2330',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('24',   'LANGFRISTIGES FREMDKAPITAL','H','','','24',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('240',  'Langfristige verzinsliche Verbindlichkeiten','H','','','240',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2400', 'Bankverbindlichkeiten','A','L','','2400',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2450', 'Langfristige verzinsliche Darlehen','A','L','','2450',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('250',  'Übrige langfristige Verbindlichkeiten','H','','','250',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2500', 'Zinslose Darlehen','A','L','','2500',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('260',  'Rückstellungen sowie vom Gesetz vorgesehene ähnliche Positionen','H','','','260',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('28',   'EIGENKAPITAL','H','','','28',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('280',  'Grund-, Gesellschafter- oder Stiftungskapital','H','','','280',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2800', 'Stammkapital','A','Q','','2800',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('290',  'Reserven, Jahresgewinn oder Jahresverlust','H','','','290',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2900', 'Gesetzliche Kapitalreserve','A','Q','','2900',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2950', 'Gesetzliche Gewinnreserve','A','Q','','2950',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2960', 'Freiwillige Gewinnreserve','A','Q','','2960',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2970', 'Gewinn- oder Verlustvortrag','A','Q','','2970',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2979', 'Jahresgewinn oder -verlust','A','Q','','2979',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('2980', 'Eigene Kapitalanteile','A','Q','','2980',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3',    'BETRIEBLICHER ERTRAG AUS LIEFERUNGEN UND LEISTUNGEN','H','','','3',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('30',   'PRODUKTIONSERLÖSE','H','','','30',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3000', 'Produktionserlöse','A','I','AR_amount:IC_sale','3000',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('32',   'HANDELSERLÖSE','H','','','32',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3200', 'Handelserlöse 8%','A','I','AR_amount:IC_sale','3200',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('3201', 'Handelserlöse 2.5%','A','I','AR_amount:IC_sale','3201',3,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('3202', 'Handelserlöse 0%','A','I','AR_amount:IC_sale','3202',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('34',   'DIENSTLEISTUNGSERLÖSE','H','','','34',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3400', 'Dienstleistungserlöse','A','I','AR_amount:IC_income','3400',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('36',   'ÜBRIGE ERLÖSE AUS LIEFERUNGEN UND LEISTUNGEN','H','','','36',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3600', 'Übrige Erlöse aus Lieferungen und Leistungen','A','I','IC_sale:IC_income','3600',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('37',   'EIGENLEISTUNGEN UND EIGENVERBRAUCH','H','','','37',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3700', 'Eigenleistungen','A','I','','3700',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('38',   'ERLÖSMINDERUNGEN','H','','','38',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3800', 'Skonti','A','E','AR_paid','3800',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('3801', 'Rabatte, Preisnachlässe','A','E','AR_paid','3801',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('3805', 'Verluste aus Forderungen','A','E','AR_paid','3805',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('3809', 'MWST - nur Saldosteuersatz','A','E','AR_paid','3809',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('39',   'BESTANDESÄNDERUNGEN AN UNFERTIGEN UND FERTIGEN ERZEUGNISSEN SOWIE AN NICHT FAKTURIERTEN DIENSTLEISTUNGEN','H','','','39',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('3900', 'Bestandesänderungen','A','I','','3900',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('4',    'AUFWAND FÜR MATERIAL, HANDELSWAREN, DIENSTLEISTUNGEN UND ENERGIE','H','','','4',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('40',   'MATERIALAUFWAND','H','','','40',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4000', 'Materialeinkauf','A','E','AP_amount:IC_cogs','4000',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('42',   'HANDELSWARENAUFWAND','H','','','42',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4200', 'Einkauf Handelswaren 8%','A','E','AP_amount:IC_cogs','4200',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('4201', 'Einkauf Handelswaren 2.5%','A','E','AP_amount:IC_cogs','4201',5,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('4202', 'Einkauf Handelswaren 0%','A','E','AP_amount:IC_cogs','4202',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('4208', 'Bestandsänderungen Handelswaren','A','E','AP_amount:IC_cogs','4208',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('44',   'AUFWAND FÜR BEZOGENE DRITTLEISTUNGEN','H','','','44',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4400', 'Aufwand für Drittleistungen','A','E','AP_amount:IC_expense','4400',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('45',   'ENERGIEAUFWAND ZUR LEISTUNGSERSTELLUNG','H','','','45',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4500', 'Energieaufwand zur Leistungserstellung','A','E','AP_amount:IC_expense','4500',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('46',   'ÜBRIGER AUFWAND FÜR MATERIAL, HANDELSWAREN UND DIENSTLEISTUNGEN','H','','','46',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('47',   'DIREKTE EINKAUFSSPESEN','H','','','47',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4700', 'Einkaufsspesen','A','E','AP_amount:IC_expense','4700',4,NULL,NULL,NULL,6, FALSE,'2011-01-01 00:00:00.000000'),
-('48',   'BESTANDESÄNDERUNGEN UND MATERIAL-/WARENVERLUSTE','H','','','48',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4800', 'Bestandesänderungen','A','E','','4800',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('49',   'EINKAUFSPREISMINDERUNGEN','H','','','49',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('4900', 'Skonti, Rabatte, Preisnachlässe','A','I','AP_paid','4900',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5',    'PERSONALAUFWAND','H','','','5',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('500',  'Löhne und Gehälter','H','','','500',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('5000', 'Löhne und Gehälter','A','E','IC_expense','5000',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5001', 'Erfolgsbeteiligungen','A','E','IC_expense','5001',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5005', 'Leistungen von Sozialversicherungen','A','I','IC_income','5005',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('57',   'SOZIALVERSICHERUNGSAUFWAND','H','','','57',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('5700', 'AHV, IV, EO, ALV','A','E','AP_amount:IC_expense','5700',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5710', 'FAK','A','E','AP_amount:IC_expense','5710',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5720', 'Berufliche Vorsorge','A','E','AP_amount:IC_expense','5720',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5730', 'Unfallversicherung','A','E','AP_amount:IC_expense','5730',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5740', 'Krankentaggeldversicherung','A','E','AP_amount:IC_expense','5740',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5790', 'Quellensteuer','A','E','AP_amount:IC_expense','5790',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('58',   'ÜBRIGER PERSONALAUFWAND','H','','','58',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('5800', 'Aufwand für Personaleinstellung','A','E','IC_expense','5800',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5810', 'Weiterbildungskosten','A','E','IC_expense','5810',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5830', 'Spesen','A','E','IC_expense','5830',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('5880', 'Sonstiger Personalaufwand','A','E','IC_expense','5880',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('59',   'LEISTUNGEN DRITTER','H','','','59',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6',    'ÜBRIGER BETRIEBLICHER AUFWAND, ABSCHREIBUNGEN UND WERTBERICHTIGUNGEN SOWIE FINANZERGEBNIS','H','','','6',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('60',   'RAUMAUFWAND','H','','','60',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6000', 'Miete','A','E','AP_amount:IC_expense','6000',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6040', 'Reinigung','A','E','AP_amount:IC_expense','6040',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6050', 'Übriger Raumaufwand','A','E','AP_amount:IC_expense','6050',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('61',   'UNTERHALT, REPARATUREN, ERSATZ, LEASING, MOBILE SACHANLAGEN','H','','','61',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6100', 'Unterhalt','A','E','AP_amount:IC_expense','6100',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('62',   'FAHRZEUG- UND TRANSPORTAUFWAND','H','','','62',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6200', 'Fahrzeugaufwand','A','E','AP_amount:IC_expense','6200',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6201', 'Transportaufwand','A','E','AP_amount:IC_expense','6201',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('63',   'SACHVERSICHERUNGEN, ABGABEN, GEBÜHREN, BEWILLIGUNGEN','H','','','63',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6300', 'Betriebsversicherungen','A','E','AP_amount:IC_expense','6300',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6360', 'Abgaben, Gebühren und Bewilligungen','A','E','AP_amount:IC_expense','6360',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('64',   'ENERGIE- UND ENTSORGUNGSAUFWAND','H','','','64',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6400', 'Strom, Gas, Wasser','A','E','AP_amount:IC_expense','6400',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6460', 'Entsorgungsaufwand','A','E','AP_amount:IC_expense','6460',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('65',   'VERWALTUNGS- UND INFORMATIKAUFWAND','H','','','65',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6500', 'Büromaterial, Drucksachen','A','E','AP_amount:IC_expense','6500',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6503', 'Fachliteratur','A','E','AP_amount:IC_expense','6503',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6510', 'Telefon, Fax, Porti Internet','A','E','AP_amount:IC_expense','6510',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6520', 'Beiträge, Spenden','A','E','AP_amount:IC_expense','6520',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6530', 'Buchführungs- und Beratungsaufwand','A','E','AP_amount:IC_expense','6530',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6540', 'Verwaltungsrat, GV, Revision','A','E','AP_amount:IC_expense','6540',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6570', 'Informatikaufwand','A','E','AP_amount:IC_expense','6570',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6590', 'Übriger Verwaltungsaufwand','A','E','AP_amount:IC_expense','6590',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('66',   'WERBEAUFWAND','H','','','66',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6600', 'Werbeaufwand','A','E','AP_amount:IC_expense','6600',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('67',   'SONSTIGER BETRIEBLICHER AUFWAND','H','','','67',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6720', 'Forschung und Entwicklung','A','E','AP_amount:IC_expense','6720',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6790', 'Übriger Betriebsaufwand','A','E','AP_amount:IC_expense','6790',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('68',   'ABSCHREIBUNGEN UND WERTBERICHTIGUNGEN AUF POSITIONEN DES ANLAGEVERMÖGENS','H','','','68',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6800', 'Abschreibungen Finanzanlagen','A','E','','6800',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6810', 'Abschreibungen Beteiligungen','A','E','','6810',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6820', 'Abschreibungen mobile Sachanlagen','A','E','','6820',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6840', 'Abschreibungen immaterielle Anlagen','A','E','','6840',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('69',   'FINANZAUFWAND UND FINANZERTRAG','H','','','69',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('690',  'Finanzaufwand','H','','','690',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6900', 'Finanzaufwand','A','E','','6900',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6940', 'Bankspesen','A','E','','6940',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6942', 'Kursverluste','A','E','','6942',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('6943', 'Rundungsaufwand','A','E','AP_amount:IC_cogs:IC_expense','6943',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('695',  'Finanzertrag','H','','','695',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('6950', 'Finanzertrag','A','I','','6950',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('6952', 'Kursgewinne','A','I','','6952',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('6953', 'Rundungsertrag','A','I','AR_amount:IC_sale:IC_income','6953',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('6970', 'Mitgliederbeiträge','A','I','AR_amount:IC_income','6970',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('6980', 'Spenden','A','I','AR_amount:IC_income','6980',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('7',    'BETRIEBLICHER NEBENERFOLG','H','','','7',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('70',   'ERFOLG AUS NEBENBETRIEBEN','H','','','70',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('75',   'ERFOLG AUS BETRIEBLICHEN LIEGENSCHAFTEN','H','','','75',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('8',    'BETRIEBSFREMDER, AUSSERORDENTLICHER, EINMALIGER UND PERIODENFREMDER AUFWAND UND ERTRAG','H','','','8',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('80',   'BETRIEBSFREMDER AUFWAND UND BETRIEBSFREMDER ERTRAG','H','','','80',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('8000', 'Betriebsfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8000',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('8100', 'Betriebsfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8100',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('85',   'AUSSERORDENTLICHER, EINMALIGER AUFWAND UND ERTRAG','H','','','85',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('8500', 'Ausserordentlicher Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8500',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('8510', 'Ausserordentlicher Ertrag','A','I','AR_amount:IC_sale:IC_income','8510',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('87',   'PERIODENFREMDER AUFWAND UND ERTRAG','H','','','87',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('8700', 'Periodenfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8700',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('8710', 'Periodenfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8710',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
-('89',   'DIREKTE STEUERN','H','','','89',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('8900', 'Direkte Steuern','A','E','','8900',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
-('9',    'ABSCHLUSS','H','','','9',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('90',   'ERFOLGSRECHNUNG','H','','','90',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('91',   'BILANZ','H','','','91',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('9100', 'Eröffnungsbilanz','A','E','','9100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('92',   'GEWINNVERWENDUNG','H','','','92',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('95',   'JAHRESERGEBNISSE','H','','','95',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
-('99',   'HILFSKONTEN NEBENBÜCHER','H','','','99',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000');
-
-
-DELETE FROM buchungsgruppen;
-
-INSERT INTO buchungsgruppen (
-  description, inventory_accno_id,
-  income_accno_id_0, expense_accno_id_0,
-  income_accno_id_1, expense_accno_id_1,
-  income_accno_id_2, expense_accno_id_2,
-  income_accno_id_3, expense_accno_id_3
-) VALUES (
-  'Standard 8%',(SELECT id FROM chart WHERE accno = '1200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202')
-),(
-  'Standard 2.5%',(SELECT id FROM chart WHERE accno = '1200'),
-  (SELECT id FROM chart WHERE accno = '3201'), (SELECT id FROM chart WHERE accno = '4201'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
-  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202')
-);
-
-
-DELETE FROM tax_zones;
-
-INSERT INTO tax_zones (id, description) VALUES
-(0, 'Schweiz'), -- siehe auch Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql )=:
-(1, 'EU mit USt-ID Nummer'),
-(2, 'EU ohne USt-ID Nummer'),
-(3, 'Ausserhalb EU');
-
-
-DELETE FROM tax;
-
-INSERT INTO tax (taxkey, taxdescription, rate) VALUES
-(0, 'Keine Steuer', 0),
-(1, 'Mehrwertsteuerfrei', 0);
-
-INSERT INTO tax (taxkey, taxdescription, rate, taxnumber, chart_id) VALUES
-(2, 'MWST', 0.08000, '2200', (SELECT id FROM chart WHERE accno='2200')),
-(3, 'MWST', 0.02500, '2201', (SELECT id FROM chart WHERE accno='2201')),
-(4, 'MWST Aufwand', 0.08000, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(5, 'MWST Aufwand', 0.02500, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(6, 'MWST Investitionen', 0.08000, '1171', (SELECT id FROM chart WHERE accno='1171')),
-(7, 'MWST Investitionen', 0.02500, '1171', (SELECT id FROM chart WHERE accno='1171'));
-
-
-DELETE FROM taxkeys;
-
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 0, (SELECT tax.id FROM tax WHERE taxkey=0), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=0;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 1, (SELECT tax.id FROM tax WHERE taxkey=1), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=1;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 2, (SELECT tax.id FROM tax WHERE taxkey=2), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=2;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 3, (SELECT tax.id FROM tax WHERE taxkey=3), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=3;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 4, (SELECT tax.id FROM tax WHERE taxkey=4), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=4;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 5, (SELECT tax.id FROM tax WHERE taxkey=5), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=5;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 6, (SELECT tax.id FROM tax WHERE taxkey=6), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=6;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 7, (SELECT tax.id FROM tax WHERE taxkey=7), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=7;
-
-
-DELETE FROM units;
-
-INSERT INTO units (name, base_unit, factor, type) VALUES
-('Stck', NULL, 0.00000, 'dimension'),
-('mg', NULL, 0.00000, 'dimension'),
-('g', 'mg', 1000.00000, 'dimension'),
-('kg', 'g', 1000.00000, 'dimension'),
-('t', 'kg', 1000.00000, 'dimension'),
-('ml', NULL, 0.00000, 'dimension'),
-('L', 'ml', 1000.00000, 'dimension'),
-('pauschal', NULL, 0.00000, 'service'),
-('Min', NULL, 0.00000, 'service'),
-('Std', 'Min', 60.00000, 'service'),
-('Tag', 'Std', 8.00000, 'service'),
-('Wo', NULL, 0.00000, 'service'),
-('Mt', 'Wo', 4.00000, 'service'),
-('Jahr', 'Mt', 12.00000, 'service');
-
-
-DELETE FROM defaults;
-
-INSERT INTO defaults (
-  inventory_accno_id,
-  income_accno_id, expense_accno_id,
-  fxgain_accno_id, fxloss_accno_id,
-  invnumber, sonumber,
-  weightunit,
-  businessnumber,
-  version,
-  closedto,
-  revtrans,
-  ponumber, sqnumber, rfqnumber,
-  customernumber, vendornumber,
-  audittrail,
-  articlenumber, servicenumber,
-  rmanumber, cnnumber
-) VALUES (
-  (SELECT id FROM CHART WHERE accno='1200'),
-  (SELECT id FROM CHART WHERE accno='3200'), (SELECT id FROM CHART WHERE accno='4200'),
-  (SELECT id FROM CHART WHERE accno='6952'), (SELECT id FROM CHART WHERE accno='6942'),
-  0, 0,
-  'kg',
-  '',
-  '3.1.0 CH',
-  NULL,
-  FALSE,
-  0, 0, 0,
-  0, 0,
-  FALSE,
-  0, 0,
-  0, 0
-);
diff --git a/sql/Switzerland-deutsch-MWST-2024-chart.sql b/sql/Switzerland-deutsch-MWST-2024-chart.sql
new file mode 100644
index 000000000..a305b3e90
--- /dev/null
+++ b/sql/Switzerland-deutsch-MWST-2024-chart.sql
@@ -0,0 +1,348 @@
+-- deutschsprachiger Kontenplan nach Schweizer Kontenrahmen KMU für Firmen in der Schweiz, die mehrwertsteuerpflichtig sind
+-- Erstellt am 4.6.2014
+-- Korrigiert: November 2015, Juli 2017, Februar 2023, November 2023
+-- Grundlage: Revision OR Stand 1.1.2013, insbesondere Art. 957a Abs. 2
+-- MWST: 8.1% und 2.6%
+-- Redaktion: revamp-it, http://www.revamp-it.ch
+-- Copyright 2014,2015,2017,2023
+
+-- This file is part of kivitendo.
+-- kivitendo 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.
+-- 
+-- kivitendo 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 kivitendo. If not, see <http://www.gnu.org/licenses/>.
+
+-- Diese Datei ist Teil von kivitendo.
+--
+-- kivitendo ist Freie Software: Sie können es unter den Bedingungen
+-- der GNU General Public License, wie von der Free Software Foundation,
+-- Version 2 der Lizenz oder (nach Ihrer Wahl) jeder späteren
+-- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
+--
+-- kivitendo wird in der Hoffnung, dass es nützlich sein wird, aber
+-- OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite
+-- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
+-- Siehe die GNU General Public License für weitere Details.
+--
+-- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
+-- Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>.
+
+DELETE FROM chart;
+
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
+('1',    'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('10',   'UMLAUFSVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('100',  'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1000', 'Kasse','A','A','AR_paid:AP_paid','1000',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1020', 'Postfinance oder Bank1','A','A','AR_paid:AP_paid','1020',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1021', 'Bank2','A','A','AR_paid:AP_paid','1021',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('106',  'Kurzfristig gehaltene Aktiven mit Börsenkurs','H','','','106',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('110',  'Forderungen aus Lieferungen und Leistungen','H','','','110',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1100', 'Forderungen aus Lieferungen und Leistungen','A','A','AR','1100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('114',  'Übrige kurzfristige Forderungen','H','','','114',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1140', 'Vorschüsse, kurzfristige Darlehen','A','A','AR','1140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1170', 'Vorsteuer auf Aufwand','A','A','AP_tax:IC_taxpart:IC_taxservice','1170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1171', 'Vorsteuer auf Investitionen','A','A','AP_tax:IC_taxpart:IC_taxservice','1171',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1176', 'Verrechnungssteuer','A','A','','1176',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('120',  'Vorräte und nicht fakturierte Dienstleistungen','H','','','120',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1200', 'Handelswaren','A','A','IC','1200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1210', 'Rohstoffe','A','A','IC','1210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1280', 'Nicht fakturierte Dienstleistungen','A','A','IC','1280',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1290', 'Angefangene Arbeiten','A','A','IC','1290',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('130',  'Aktive Rechnungsabgrenzungen','H','','','130',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1300', 'Aktive Rechnungsabgrenzungen','A','A','','1300',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('14',   'ANLAGEVERMÖGEN','H','','','14',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('140',  'Finanzanlagen','H','','','140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('148',  'Beteiligungen','H','','','148',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('150',  'Mobile Sachanlagen','H','','','150',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1500', 'Maschinen und Apparate','A','A','IC','1500',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1510', 'Mobiliar und Einrichtungen','A','A','IC','1510',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1520', 'Büromaschinen, Informatik','A','A','IC','1520',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1530', 'Fahrzeuge','A','A','IC','1530',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('1540', 'Werkzeuge und Geräte','A','A','IC','1540',6,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('160',  'Immobile Sachanlagen','H','','','160',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('170',  'Immaterielle Werte','H','','','170',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('180',  'Nicht einbezahltes Grund- Gesellschafter- oder Stiftungskapital','H','','','180',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2',    'PASSIVEN','H','','','2',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('20',   'KURZFRISTIGES FREMDKAPITAL','H','','','20',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('200',  'Verbindlichkeiten aus Lieferungen und Leistungen','H','','','200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2000', 'Verbindlichkeiten aus Lieferungen und Leistungen','A','L','AP','2000',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2001', 'Übrige Kreditoren','A','L','AP','2001',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2030', 'Anzahlungen von Kundinnen und Kunden','A','L','AR_paid:AP_paid','2030',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('210',  'Kurzfristige verzinsliche Verbindlichkeiten','H','','','210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2100', 'Bankverbindlichkeiten','A','L','AR_paid:AP_paid','2100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2140', 'Übrige verzinsliche Verbindlichkeiten','A','L','AP','2140',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('220',  'Übrige kurzfristige Verbindlichkeiten','H','','','220',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2200', 'Geschuldete MWST(8.1%)','A','L','AR_tax:IC_taxpart:IC_taxservice','2200',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2201', 'Geschuldete MWST(2.6%)','A','L','AR_tax:IC_taxpart:IC_taxservice','2201',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2206', 'Verrechnungssteuer','A','L','AP','2206',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2210', 'Geschuldete Steuern','A','L','AP','2210',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2250', 'Personalaufwand','A','L','AP','2250',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2270', 'Verbindlichkeiten Sozialversicherungen und Vorsorgeeinrichtungen','A','L','AP','2270',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('230',  'Passive Rechnungsabgrenzungen und kurzfristige Rückstellungen','H','','','230',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2300', 'Passive Rechnungsabgrenzungen','A','L','','2300',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2330', 'Kurzfristige Rückstellungen','A','L','','2330',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('24',   'LANGFRISTIGES FREMDKAPITAL','H','','','24',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('240',  'Langfristige verzinsliche Verbindlichkeiten','H','','','240',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2400', 'Bankverbindlichkeiten','A','L','','2400',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2450', 'Langfristige verzinsliche Darlehen','A','L','','2450',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('250',  'Übrige langfristige Verbindlichkeiten','H','','','250',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2500', 'Zinslose Darlehen','A','L','','2500',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('260',  'Rückstellungen sowie vom Gesetz vorgesehene ähnliche Positionen','H','','','260',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('28',   'EIGENKAPITAL','H','','','28',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('280',  'Grund-, Gesellschafter- oder Stiftungskapital','H','','','280',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2800', 'Stammkapital','A','Q','','2800',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('290',  'Reserven, Jahresgewinn oder Jahresverlust','H','','','290',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2900', 'Gesetzliche Kapitalreserve','A','Q','','2900',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2950', 'Gesetzliche Gewinnreserve','A','Q','','2950',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2960', 'Freiwillige Gewinnreserve','A','Q','','2960',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2970', 'Gewinn- oder Verlustvortrag','A','Q','','2970',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2979', 'Jahresgewinn oder -verlust','A','Q','','2979',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('2980', 'Eigene Kapitalanteile','A','Q','','2980',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3',    'BETRIEBLICHER ERTRAG AUS LIEFERUNGEN UND LEISTUNGEN','H','','','3',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('30',   'PRODUKTIONSERLÖSE','H','','','30',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3000', 'Produktionserlöse','A','I','AR_amount:IC_sale','3000',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('32',   'HANDELSERLÖSE','H','','','32',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3200', 'Handelserlöse 8.1%','A','I','AR_amount:IC_sale','3200',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('3201', 'Handelserlöse 2.6%','A','I','AR_amount:IC_sale','3201',3,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('3202', 'Handelserlöse 0%','A','I','AR_amount:IC_sale','3202',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('34',   'DIENSTLEISTUNGSERLÖSE','H','','','34',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3400', 'Dienstleistungserlöse','A','I','AR_amount:IC_income','3400',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('36',   'ÜBRIGE ERLÖSE AUS LIEFERUNGEN UND LEISTUNGEN','H','','','36',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3600', 'Übrige Erlöse aus Lieferungen und Leistungen','A','I','IC_sale:IC_income','3600',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('37',   'EIGENLEISTUNGEN UND EIGENVERBRAUCH','H','','','37',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3700', 'Eigenleistungen','A','I','','3700',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('38',   'ERLÖSMINDERUNGEN','H','','','38',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3800', 'Skonti','A','E','AR_paid','3800',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('3801', 'Rabatte, Preisnachlässe','A','E','AR_paid','3801',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('3805', 'Verluste aus Forderungen','A','E','AR_paid','3805',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('3809', 'MWST - nur Saldosteuersatz','A','E','AR_paid','3809',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('39',   'BESTANDESÄNDERUNGEN AN UNFERTIGEN UND FERTIGEN ERZEUGNISSEN SOWIE AN NICHT FAKTURIERTEN DIENSTLEISTUNGEN','H','','','39',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('3900', 'Bestandesänderungen','A','I','','3900',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('4',    'AUFWAND FÜR MATERIAL, HANDELSWAREN, DIENSTLEISTUNGEN UND ENERGIE','H','','','4',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('40',   'MATERIALAUFWAND','H','','','40',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4000', 'Materialeinkauf','A','E','AP_amount:IC_cogs','4000',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('42',   'HANDELSWARENAUFWAND','H','','','42',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4200', 'Einkauf Handelswaren 8.1%','A','E','AP_amount:IC_cogs','4200',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('4201', 'Einkauf Handelswaren 2.6%','A','E','AP_amount:IC_cogs','4201',5,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('4202', 'Einkauf Handelswaren 0%','A','E','AP_amount:IC_cogs','4202',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('4208', 'Bestandsänderungen Handelswaren','A','E','AP_amount:IC_cogs','4208',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('44',   'AUFWAND FÜR BEZOGENE DRITTLEISTUNGEN','H','','','44',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4400', 'Aufwand für Drittleistungen','A','E','AP_amount:IC_expense','4400',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('45',   'ENERGIEAUFWAND ZUR LEISTUNGSERSTELLUNG','H','','','45',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4500', 'Energieaufwand zur Leistungserstellung','A','E','AP_amount:IC_expense','4500',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('46',   'ÜBRIGER AUFWAND FÜR MATERIAL, HANDELSWAREN UND DIENSTLEISTUNGEN','H','','','46',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('47',   'DIREKTE EINKAUFSSPESEN','H','','','47',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4700', 'Einkaufsspesen','A','E','AP_amount:IC_expense','4700',4,NULL,NULL,NULL,6, FALSE,'2011-01-01 00:00:00.000000'),
+('48',   'BESTANDESÄNDERUNGEN UND MATERIAL-/WARENVERLUSTE','H','','','48',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4800', 'Bestandesänderungen','A','E','','4800',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('49',   'EINKAUFSPREISMINDERUNGEN','H','','','49',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('4900', 'Skonti, Rabatte, Preisnachlässe','A','I','AP_paid','4900',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5',    'PERSONALAUFWAND','H','','','5',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('500',  'Löhne und Gehälter','H','','','500',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('5000', 'Löhne und Gehälter','A','E','IC_expense','5000',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5001', 'Erfolgsbeteiligungen','A','E','IC_expense','5001',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5005', 'Leistungen von Sozialversicherungen','A','I','IC_income','5005',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('57',   'SOZIALVERSICHERUNGSAUFWAND','H','','','57',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('5700', 'AHV, IV, EO, ALV','A','E','AP_amount:IC_expense','5700',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5710', 'FAK','A','E','AP_amount:IC_expense','5710',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5720', 'Berufliche Vorsorge','A','E','AP_amount:IC_expense','5720',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5730', 'Unfallversicherung','A','E','AP_amount:IC_expense','5730',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5740', 'Krankentaggeldversicherung','A','E','AP_amount:IC_expense','5740',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5790', 'Quellensteuer','A','E','AP_amount:IC_expense','5790',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('58',   'ÜBRIGER PERSONALAUFWAND','H','','','58',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('5800', 'Aufwand für Personaleinstellung','A','E','IC_expense','5800',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5810', 'Weiterbildungskosten','A','E','IC_expense','5810',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5830', 'Spesen','A','E','IC_expense','5830',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('5880', 'Sonstiger Personalaufwand','A','E','IC_expense','5880',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('59',   'LEISTUNGEN DRITTER','H','','','59',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6',    'ÜBRIGER BETRIEBLICHER AUFWAND, ABSCHREIBUNGEN UND WERTBERICHTIGUNGEN SOWIE FINANZERGEBNIS','H','','','6',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('60',   'RAUMAUFWAND','H','','','60',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6000', 'Miete','A','E','AP_amount:IC_expense','6000',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6040', 'Reinigung','A','E','AP_amount:IC_expense','6040',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6050', 'Übriger Raumaufwand','A','E','AP_amount:IC_expense','6050',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('61',   'UNTERHALT, REPARATUREN, ERSATZ, LEASING, MOBILE SACHANLAGEN','H','','','61',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6100', 'Unterhalt','A','E','AP_amount:IC_expense','6100',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('62',   'FAHRZEUG- UND TRANSPORTAUFWAND','H','','','62',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6200', 'Fahrzeugaufwand','A','E','AP_amount:IC_expense','6200',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6201', 'Transportaufwand','A','E','AP_amount:IC_expense','6201',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('63',   'SACHVERSICHERUNGEN, ABGABEN, GEBÜHREN, BEWILLIGUNGEN','H','','','63',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6300', 'Betriebsversicherungen','A','E','AP_amount:IC_expense','6300',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6360', 'Abgaben, Gebühren und Bewilligungen','A','E','AP_amount:IC_expense','6360',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('64',   'ENERGIE- UND ENTSORGUNGSAUFWAND','H','','','64',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6400', 'Strom, Gas, Wasser','A','E','AP_amount:IC_expense','6400',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6460', 'Entsorgungsaufwand','A','E','AP_amount:IC_expense','6460',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('65',   'VERWALTUNGS- UND INFORMATIKAUFWAND','H','','','65',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6500', 'Büromaterial, Drucksachen','A','E','AP_amount:IC_expense','6500',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6503', 'Fachliteratur','A','E','AP_amount:IC_expense','6503',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6510', 'Telefon, Fax, Porti Internet','A','E','AP_amount:IC_expense','6510',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6520', 'Beiträge, Spenden','A','E','AP_amount:IC_expense','6520',1,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6530', 'Buchführungs- und Beratungsaufwand','A','E','AP_amount:IC_expense','6530',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6540', 'Verwaltungsrat, GV, Revision','A','E','AP_amount:IC_expense','6540',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6570', 'Informatikaufwand','A','E','AP_amount:IC_expense','6570',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6590', 'Übriger Verwaltungsaufwand','A','E','AP_amount:IC_expense','6590',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('66',   'WERBEAUFWAND','H','','','66',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6600', 'Werbeaufwand','A','E','AP_amount:IC_expense','6600',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('67',   'SONSTIGER BETRIEBLICHER AUFWAND','H','','','67',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6720', 'Forschung und Entwicklung','A','E','AP_amount:IC_expense','6720',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6790', 'Übriger Betriebsaufwand','A','E','AP_amount:IC_expense','6790',6,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('68',   'ABSCHREIBUNGEN UND WERTBERICHTIGUNGEN AUF POSITIONEN DES ANLAGEVERMÖGENS','H','','','68',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6800', 'Abschreibungen Finanzanlagen','A','E','','6800',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6810', 'Abschreibungen Beteiligungen','A','E','','6810',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6820', 'Abschreibungen mobile Sachanlagen','A','E','','6820',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6840', 'Abschreibungen immaterielle Anlagen','A','E','','6840',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('69',   'FINANZAUFWAND UND FINANZERTRAG','H','','','69',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('690',  'Finanzaufwand','H','','','690',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6900', 'Finanzaufwand','A','E','','6900',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6940', 'Bankspesen','A','E','','6940',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6942', 'Kursverluste','A','E','','6942',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('6943', 'Rundungsaufwand','A','E','AP_amount:IC_cogs:IC_expense','6943',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('695',  'Finanzertrag','H','','','695',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('6950', 'Finanzertrag','A','I','','6950',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('6952', 'Kursgewinne','A','I','','6952',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('6953', 'Rundungsertrag','A','I','AR_amount:IC_sale:IC_income','6953',0,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('6970', 'Mitgliederbeiträge','A','I','AR_amount:IC_income','6970',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('6980', 'Spenden','A','I','AR_amount:IC_income','6980',1,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('7',    'BETRIEBLICHER NEBENERFOLG','H','','','7',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('70',   'ERFOLG AUS NEBENBETRIEBEN','H','','','70',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('75',   'ERFOLG AUS BETRIEBLICHEN LIEGENSCHAFTEN','H','','','75',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('8',    'BETRIEBSFREMDER, AUSSERORDENTLICHER, EINMALIGER UND PERIODENFREMDER AUFWAND UND ERTRAG','H','','','8',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('80',   'BETRIEBSFREMDER AUFWAND UND BETRIEBSFREMDER ERTRAG','H','','','80',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('8000', 'Betriebsfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8000',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('8100', 'Betriebsfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8100',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('85',   'AUSSERORDENTLICHER, EINMALIGER AUFWAND UND ERTRAG','H','','','85',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('8500', 'Ausserordentlicher Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8500',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('8510', 'Ausserordentlicher Ertrag','A','I','AR_amount:IC_sale:IC_income','8510',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('87',   'PERIODENFREMDER AUFWAND UND ERTRAG','H','','','87',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('8700', 'Periodenfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8700',4,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('8710', 'Periodenfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8710',2,NULL,NULL,NULL,1,FALSE,'2011-01-01 00:00:00.000000'),
+('89',   'DIREKTE STEUERN','H','','','89',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('8900', 'Direkte Steuern','A','E','','8900',0,NULL,NULL,NULL,6,FALSE,'2011-01-01 00:00:00.000000'),
+('9',    'ABSCHLUSS','H','','','9',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('90',   'ERFOLGSRECHNUNG','H','','','90',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('91',   'BILANZ','H','','','91',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('9100', 'Eröffnungsbilanz','A','E','','9100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('92',   'GEWINNVERWENDUNG','H','','','92',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('95',   'JAHRESERGEBNISSE','H','','','95',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
+('99',   'HILFSKONTEN NEBENBÜCHER','H','','','99',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000');
+
+
+DELETE FROM buchungsgruppen;
+
+INSERT INTO buchungsgruppen (
+  description, inventory_accno_id,
+  income_accno_id_0, expense_accno_id_0,
+  income_accno_id_1, expense_accno_id_1,
+  income_accno_id_2, expense_accno_id_2,
+  income_accno_id_3, expense_accno_id_3
+) VALUES (
+  'Standard 8.1%',(SELECT id FROM chart WHERE accno = '1200'),
+  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202')
+),(
+  'Standard 2.6%',(SELECT id FROM chart WHERE accno = '1200'),
+  (SELECT id FROM chart WHERE accno = '3201'), (SELECT id FROM chart WHERE accno = '4201'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202'),
+  (SELECT id FROM chart WHERE accno = '3202'), (SELECT id FROM chart WHERE accno = '4202')
+);
+
+
+DELETE FROM tax_zones;
+
+INSERT INTO tax_zones (id, description) VALUES
+(0, 'Schweiz'), -- siehe auch Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql )=:
+(1, 'EU mit USt-ID Nummer'),
+(2, 'EU ohne USt-ID Nummer'),
+(3, 'Ausserhalb EU');
+
+
+DELETE FROM tax;
+
+INSERT INTO tax (taxkey, taxdescription, rate) VALUES
+(0, 'Keine Steuer', 0),
+(1, 'Mehrwertsteuerfrei', 0);
+
+INSERT INTO tax (taxkey, taxdescription, rate, taxnumber, chart_id) VALUES
+(2, 'MWST', 0.08100, '2200', (SELECT id FROM chart WHERE accno='2200')),
+(3, 'MWST', 0.02600, '2201', (SELECT id FROM chart WHERE accno='2201')),
+(4, 'MWST Aufwand', 0.08100, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(5, 'MWST Aufwand', 0.02600, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(6, 'MWST Investitionen', 0.08100, '1171', (SELECT id FROM chart WHERE accno='1171')),
+(7, 'MWST Investitionen', 0.02600, '1171', (SELECT id FROM chart WHERE accno='1171'));
+
+
+DELETE FROM taxkeys;
+
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 0, (SELECT tax.id FROM tax WHERE taxkey=0), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=0;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 1, (SELECT tax.id FROM tax WHERE taxkey=1), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=1;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 2, (SELECT tax.id FROM tax WHERE taxkey=2), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=2;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 3, (SELECT tax.id FROM tax WHERE taxkey=3), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=3;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 4, (SELECT tax.id FROM tax WHERE taxkey=4), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=4;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 5, (SELECT tax.id FROM tax WHERE taxkey=5), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=5;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 6, (SELECT tax.id FROM tax WHERE taxkey=6), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=6;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 7, (SELECT tax.id FROM tax WHERE taxkey=7), chart.id, '2011-01-01' FROM chart WHERE taxkey_id=7;
+
+
+DELETE FROM units;
+
+INSERT INTO units (name, base_unit, factor, type) VALUES
+('Stck', NULL, 0.00000, 'dimension'),
+('mg', NULL, 0.00000, 'dimension'),
+('g', 'mg', 1000.00000, 'dimension'),
+('kg', 'g', 1000.00000, 'dimension'),
+('t', 'kg', 1000.00000, 'dimension'),
+('ml', NULL, 0.00000, 'dimension'),
+('L', 'ml', 1000.00000, 'dimension'),
+('pauschal', NULL, 0.00000, 'service'),
+('Min', NULL, 0.00000, 'service'),
+('Std', 'Min', 60.00000, 'service'),
+('Tag', 'Std', 8.00000, 'service'),
+('Wo', NULL, 0.00000, 'service'),
+('Mt', 'Wo', 4.00000, 'service'),
+('Jahr', 'Mt', 12.00000, 'service');
+
+
+DELETE FROM defaults;
+
+INSERT INTO defaults (
+  inventory_accno_id,
+  income_accno_id, expense_accno_id,
+  fxgain_accno_id, fxloss_accno_id,
+  invnumber, sonumber,
+  weightunit,
+  businessnumber,
+  version,
+  closedto,
+  revtrans,
+  ponumber, sqnumber, rfqnumber,
+  customernumber, vendornumber,
+  audittrail,
+  articlenumber, servicenumber,
+  rmanumber, cnnumber
+) VALUES (
+  (SELECT id FROM CHART WHERE accno='1200'),
+  (SELECT id FROM CHART WHERE accno='3200'), (SELECT id FROM CHART WHERE accno='4200'),
+  (SELECT id FROM CHART WHERE accno='6952'), (SELECT id FROM CHART WHERE accno='6942'),
+  0, 0,
+  'kg',
+  '',
+  '3.9.0 CH',
+  NULL,
+  FALSE,
+  0, 0, 0,
+  0, 0,
+  FALSE,
+  0, 0,
+  0, 0
+);
diff --git a/sql/Switzerland-deutsch-Verein-2017-chart.sql b/sql/Switzerland-deutsch-Verein-2017-chart.sql
deleted file mode 100644
index 936e580c3..000000000
--- a/sql/Switzerland-deutsch-Verein-2017-chart.sql
+++ /dev/null
@@ -1,372 +0,0 @@
--- deutschsprachiger Kontenplan nach Schweizer Kontenrahmen KMU spezifisch angepasst für mehrwertsteuerpflichtige Vereine in der Schweiz
--- für kivitendo aufbereitet am 11.4.2017, kleinere Korrekturen am 15.7.2017
--- Grundlage: Revision OR Stand 1.1.2013, insbesondere Art. 957a Abs. 2
--- Autor: Kurt Pfister, http://www.gotransparent.ch
--- Redaktion: Andreas Rudin, http://www.revamp-it.ch
--- Copyright 2014,2017 Kurt Pfister, Andreas Rudin
-
--- This file is part of kivitendo.
--- kivitendo 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.
--- 
--- kivitendo 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 kivitendo. If not, see <http://www.gnu.org/licenses/>.
-
--- Diese Datei ist Teil von kivitendo.
---
--- kivitendo ist Freie Software: Sie können es unter den Bedingungen
--- der GNU General Public License, wie von der Free Software Foundation,
--- Version 2 der Lizenz oder (nach Ihrer Wahl) jeder späteren
--- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
---
--- kivitendo wird in der Hoffnung, dass es nützlich sein wird, aber
--- OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite
--- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
--- Siehe die GNU General Public License für weitere Details.
---
--- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
--- Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>. 
-
-DELETE FROM chart;
-
-INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
-('1',    'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('10',   'UMLAUFVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('100',  'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1000', 'Kasse','A','A','AR_paid:AP_paid','1000',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1010', 'Postfinance','A','A','AR_paid:AP_paid','1010',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1020', 'Bank','A','A','AR_paid:AP_paid','1020',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('106',  'Kurzfristig gehaltene Aktiven mit Börsenkurs','H','','','106',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1060', 'Wertschriften','A','A','','1060',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('110',  'Forderungen aus Lieferungen und Leistungen','H','','','110',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1100', 'Debitoren CHF','A','A','AR','1100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1101', 'Debitoren EUR','A','A','AR','1101',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1107', 'Forderungen an Kreditkarten','A','A','','1107',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1109', 'Delkredere','A','A','','1109',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('114',  'Übrige kurzfristige Forderungen','H','','','114',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1140', 'Vorschüsse, kurzfristige Darlehen','A','A','','1140',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1160', 'Kontokorrent Mitglied/Vorstand/GL','A','A','','1160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1170', 'MWST Vorsteuer Material/Dienstleistungen','A','A','AP_tax:IC_taxpart:IC_taxservice','1170',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1171', 'MWST Vorsteuer Investitionen/übr. Betriebsaufwand','A','A','AP_tax:IC_taxpart:IC_taxservice','1171',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1176', 'Verrechnungssteuer','A','A','','1176',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1181', 'Familienzulagen','A','A','','1181',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1191', 'Kautionen','A','A','','1191',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1192', 'Geleistete Anzahlungen','A','A','','1192',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('120',  'Vorräte und nicht fakturierte Dienstleistungen','H','','','120',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1200', 'Handelswaren','A','A','IC','1200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1209', 'Wertberichtigung Handelswaren','A','A','','1209',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1210', 'Rohstoffe','A','A','IC','1210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1219', 'Wertberichtigung Rohstoffe','A','A','','1219',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1260', 'Fertige Erzeugnisse','A','A','IC','1260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1269', 'Wertberichtigung fertige Erzeugnisse','A','A','','1269',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1280', 'Nicht fakturierte Dienstleistungen','A','A','IC','1280',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('130',  'Aktive Rechnungsabgrenzung','H','','','130',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1300', 'Bezahlter Aufwand des Folgejahrs','A','A','','1300',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1301', 'Noch nicht erhaltener Ertrag','A','A','','1301',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('14',   'ANLAGEVERMÖGEN','H','','','14',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('140',  'Finanzanlagen','H','','','140',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1400', 'Wertschriften','A','A','IC','1400',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1411', 'Mietzinsdepot','A','A','IC','1411',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1440', 'Darlehen','A','A','IC','1440',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1460', 'Darlehen an Mitglied/Vorstand/GL','A','A','IC','1460',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('148',  'Beteiligungen','H','','','148',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1480', 'Beteiligung','A','A','IC','1480',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1489', 'Wertberichtigung Beteiligung','A','A','','1489',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('150',  'Mobile Sachanlagen','H','','','150',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1500', 'Maschinen und Apparate','A','A','IC','1500',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1509', 'Wertberichtigung Maschinen und Apparate','A','A','','1509',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1510', 'Mobiliar und Einrichtungen','A','A','IC','1510',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1519', 'Wertberichtigung Mobiliar und Einrichtungen','A','A','','1519',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1520', 'Informatik und Kommunikation','A','A','IC','1520',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1529', 'Wertberichtigung Informatik und Kommunikation','A','A','','1529',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1530', 'Fahrzeuge','A','A','IC','1530',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1539', 'Wertberichtigung Fahrzeuge','A','A','','1539',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1540', 'Werkzeug und Geräte','A','A','IC','1540',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1549', 'Wertberichtigung Werkzeug und Geräte','A','A','','1549',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('160',  'Immobile Sachanlagen','H','','','160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1600', 'Geschäftsliegenschaft','A','A','IC','1600',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1609', 'Wertberichtigung Geschäftsliegenschaft','A','A','','1609',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('170',  'Immaterielle Werte','H','','','170',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1700', 'Patent, Konzession, Rechte','A','A','IC','1700',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('1709', 'Wertberichtigung Patent, Konzession, Rechte','A','A','','1709',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2',    'PASSIVEN','H','','','2',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('20',   'KURZFRISTIGES FREMDKAPITAL','H','','','20',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('200',  'Verbindlichkeiten aus Lieferungen und Leistungen','H','','','200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2000', 'Kreditoren CHF','A','L','AP','2000',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2001', 'Kreditoren EUR','A','L','AP','2001',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2030', 'Erhaltene Anzahlungen von Kundinnen und Kunden','A','L','','2030',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('210',  'Kurzfristige verzinsliche Verbindlichkeiten','H','','','210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2100', 'Bank','A','L','AR_paid:AP_paid','2100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2160', 'Verzinsliche Verbindlichkeiten gegenüber Mitglied/Vorstand/GL','A','L','','2160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('220',  'Übrige kurzfristige Verbindlichkeiten','H','','','220',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2200', 'MWST Umsatzsteuer','A','L','AR_tax:IC_taxpart:IC_taxservice','2200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2201', 'MWST Abrechnungskonto','A','L','','2201',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2203', 'MWST Bezugssteuer','A','L','','2203',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2206', 'Verrechnungssteuer','A','L','','2206',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2208', 'Direkte Steuern','A','L','','2208',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2210', 'Übrige kurzfristige Verbindlichkeiten','A','L','','2210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2260', 'Verbindlichkeiten gegenüber Mitglied/Vorstand/GL','A','L','','2260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2270', 'Kontokorrent Berufliche Vorsorge','A','L','','2270',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2271', 'Kontokorrent AHV,IV,EO,ALV','A','L','','2271',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2272', 'Kontokorrent FAK','A','L','','2272',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2273', 'Kontokorrent Unfallversicherung','A','L','','2273',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2274', 'Kontokorrent Krankentaggeldversicherung','A','L','','2274',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2279', 'Kontokorrent Quellensteuer','A','L','','2279',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('230',  'Passive Rechnungsabgrenzung','H','','','230',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2300', 'Noch nicht bezahlter Aufwand','A','L','','2300',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2301', 'Erhaltener Ertrag des Folgejahrs','A','L','','2301',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('24',   'LANGFRISTIGES FREMDKAPITAL','H','','','24',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('240',  'Langfristige verzinsliche Verbindlichkeiten','H','','','240',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2401', 'Hypothek','A','L','','2401',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2450', 'Verzinsliche Darlehen','A','L','','2450',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('250',  'Übrige langfristige Verbindlichkeiten','H','','','250',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2500', 'Zinslose Darlehen','A','L','','2500',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2560', 'Darlehen von Mitglied/Vorstand/GL','A','L','','2560',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('260',  'Rückstellungen langfristig','H','','','260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2630', 'Rückstellung für Garantieverpflichtungen','A','L','','2630',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('28',   'EIGENKAPITAL','H','','','28',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('280',  'Organisationskapital','H','','','280',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2800', 'Vereinsvermögen','A','Q','','2800',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('290',  'Jahresgewinn oder Jahresverlust','H','','','290',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('2979', 'Jahresgewinn oder Jahresverlust','A','Q','','2979',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3',    'BETRIEBSERTRAG','H','','','3',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('30',   'PRODUKTIONSERLÖS','H','','','30',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3000', 'Produktionserlös','A','I','AR_amount:IC_sale','3000',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('32',   'HANDELSERLÖSE','H','','','32',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3200', 'Handelserlöse','A','I','AR_amount:IC_sale','3200',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('34',   'DIENSTLEISTUNGSERLÖSE','H','','','34',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3400', 'Dienstleistungserlöse','A','I','AR_amount:IC_income','3400',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('36',   'ÜBRIGE ERLÖSE','H','','','36',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3600', 'Spenden','A','I','AR_amount:IC_income','3600',1,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3660', 'Mitgliederbeiträge','A','I','AR_amount:IC_income','3660',1,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3680', 'Sonstige Erlöse','A','I','AR_amount:IC_sale:IC_income','3680',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('37',   'EIGENLEISTUNGEN UND EIGENVERBRAUCH','H','','','37',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3700', 'Eigenleistungen','A','I','','3700',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('38',   'ERLÖSMINDERUNGEN','H','','','38',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3800', 'Skonti','A','E','AR_paid','3800',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3801', 'Rabatte, Preisnachlässe','A','E','AR_paid','3801',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3805', 'Verluste aus Forderungen, Veränderungen Delkredere','A','E','AR_paid','3805',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3809', 'MWST Saldosteuersatz','A','E','AR_paid','3809',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('39',   'BESTANDESÄNDERUNGEN','H','','','39',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('3901', 'Bestandesänderung fertige Erzeugnisse','A','I','','3901',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('3940', 'Bestandesänderung nicht fakturierte Dienstleistungen','A','I','','3940',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('4',    'AUFWAND FÜR LEISTUNGSERSTELLUNG','H','','','4',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('40',   'MATERIALAUFWAND','H','','','40',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4000', 'Materialeinkauf','A','E','AP_amount:IC_cogs','4000',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('42',   'HANDELSWARENAUFWAND','H','','','42',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4200', 'Einkauf Handelswaren','A','E','AP_amount:IC_cogs','4200',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('44',   'AUFWAND FÜR BEZOGENE DRITTLEISTUNGEN','H','','','44',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4400', 'Aufwand für Drittleistungen','A','E','AP_amount:IC_expense','4400',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('45',   'ENERGIEAUFWAND ZUR LEISTUNGSERSTELLUNG','H','','','45',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4500', 'Energieaufwand zur Leistungserstellung','A','E','AP_amount:IC_expense','4500',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('48',   'BESTANDESÄNDERUNGEN','H','','','48',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4800', 'Bestandesänderungen','A','E','','4800',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('49',   'EINKAUFSPREISMINDERUNGEN','H','','','49',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('4900', 'Skonti, Rabatte, Preisnachlässe','A','I','AP_paid','4900',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5',    'PERSONALAUFWAND','H','','','5',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('50',   'LÖHNE UND GEHÄLTER','H','','','500',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('5000', 'Bruttolohn','A','E','IC_expense','5000',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5002', 'Erfolgsbeteiligung','A','E','IC_expense','5002',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5005', 'Leistungen von Sozialversicherungen','A','I','IC_income','5005',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('57',   'SOZIALVERSICHERUNGSAUFWAND','H','','','57',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('5700', 'AHV, IV, EO, ALV','A','E','AP_amount:IC_expense','5700',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5710', 'FAK','A','E','AP_amount:IC_expense','5710',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5720', 'Berufliche Vorsorge','A','E','AP_amount:IC_expense','5720',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5730', 'Unfallversicherung','A','E','AP_amount:IC_expense','5730',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5740', 'Krankentaggeldversicherung','A','E','AP_amount:IC_expense','5740',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5790', 'Quellensteuer','A','E','AP_amount:IC_expense','5790',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('58',   'ÜBRIGER PERSONALAUFWAND','H','','','58',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('5800', 'Aufwand für Personaleinstellung','A','E','IC_expense','5800',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5810', 'Aus- und Weiterbildung','A','E','IC_expense','5810',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5830', 'Spesenentschädigung','A','E','IC_expense','5830',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('5880', 'Sonstiger Personalaufwand','A','E','IC_expense','5880',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('59',   'LEISTUNGEN DRITTER','H','','','59',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('5900', 'Fremdarbeit, Temporärpersonal','A','E','IC_expense','5900',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6',    'ÜBRIGER BETRIEBSAUFWAND','H','','','6',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('60',   'RAUMAUFWAND','H','','','60',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6000', 'Miete','A','E','AP_amount:IC_expense','6000',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6040', 'Reinigung','A','E','AP_amount:IC_expense','6040',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6050', 'Übriger Raumaufwand','A','E','AP_amount:IC_expense','6050',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('61',   'UNTERHALT, REPARATUREN, ERSATZ, LEASING','H','','','61',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6100', 'Unterhalt Maschinen und Apparate','A','E','AP_amount:IC_expense','6100',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6110', 'Unterhalt Mobiliar und Einrichtungen','A','E','AP_amount:IC_expense','6110',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6120', 'Unterhalt Informatik und Kommunikation','A','E','AP_amount:IC_expense','6120',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6140', 'Unterhalt Werkzeug und Geräte','A','E','AP_amount:IC_expense','6140',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6150', 'Leasing','A','E','AP_amount:IC_expense','6150',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('62',   'FAHRZEUG- UND TRANSPORTAUFWAND','H','','','62',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6200', 'Fahrzeugaufwand','A','E','AP_amount:IC_expense','6200',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6201', 'Transportaufwand','A','E','AP_amount:IC_expense','6201',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('63',   'SACHVERSICHERUNGEN, ABGABEN, GEBÜHREN','H','','','63',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6300', 'Betriebsversicherung','A','E','AP_amount:IC_expense','6300',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6360', 'Abgaben, Gebühren und Bewilligungen','A','E','AP_amount:IC_expense','6360',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('64',   'ENERGIE- UND ENTSORGUNGSAUFWAND','H','','','64',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6400', 'Strom, Gas, Wasser','A','E','AP_amount:IC_expense','6400',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6460', 'Entsorgungsaufwand','A','E','AP_amount:IC_expense','6460',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('65',   'VERWALTUNGS- UND INFORMATIKAUFWAND','H','','','65',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6500', 'Büromaterial, Drucksachen, Fachliteratur','A','E','AP_amount:IC_expense','6500',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6510', 'Telefon, Porto, Internet','A','E','AP_amount:IC_expense','6510',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6520', 'Beiträge, Spenden','A','E','AP_amount:IC_expense','6520',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6530', 'Buchführungs- und Beratungsaufwand','A','E','AP_amount:IC_expense','6530',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6540', 'Vorstandsentschädigung, GV, Revision','A','E','AP_amount:IC_expense','6540',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6570', 'Informatikaufwand','A','E','AP_amount:IC_expense','6570',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6590', 'Übriger Verwaltungsaufwand','A','E','AP_amount:IC_expense','6590',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('66',   'WERBEAUFWAND','H','','','66',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6600', 'Inserate','A','E','AP_amount:IC_expense','6600',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6604', 'Website','A','E','AP_amount:IC_expense','6604',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6620', 'Schaufenster, Messen','A','E','AP_amount:IC_expense','6620',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6640', 'Reisespesen, Kundenbetreuung','A','E','AP_amount:IC_expense','6640',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6660', 'Sponsoring','A','E','AP_amount:IC_expense','6660',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('67',   'SONSTIGER BETRIEBLICHER AUFWAND','H','','','67',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6700', 'Wirtschaftsauskunft, Betreibung','A','E','AP_amount:IC_expense','6700',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6720', 'Forschung und Entwicklung','A','E','AP_amount:IC_expense','6720',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6791', 'Privatanteil Fahrzeug','A','E','AP_amount:IC_expense','6791',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('68',   'ABSCHREIBUNG UND WERTBERICHTIGUNG','H','','','68',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6800', 'Wertberichtigung Finanzanlagen','A','E','','6800',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6820', 'Abschreibung mobile Sachanlagen','A','E','','6820',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6830', 'Abschreibung immobile Sachanlagen','A','E','','6830',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6840', 'Abschreibung immaterielle Werte','A','E','','6840',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('69',   'FINANZAUFWAND UND FINANZERTRAG','H','','','69',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('690',  'Finanzaufwand','H','','','690',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6900', 'Zinsaufwand','A','E','','6900',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6940', 'Bankspesen','A','E','','6940',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6943', 'Rundungsaufwand','A','E','','6943',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('6949', 'Währungsverluste','A','E','','6949',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('695',  'Finanzertrag','H','','','695',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('6950', 'Zinsertrag','A','I','','6950',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('6953', 'Rundungsertrag','A','I','','6953',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('6999', 'Währungsgewinne','A','I','','6999',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('7',    'BETRIEBLICHER NEBENERFOLG','H','','','7',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('70',   'ERFOLG AUS NEBENBETRIEBEN','H','','','70',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('75',   'ERFOLG AUS BETRIEBLICHEN LIEGENSCHAFTEN','H','','','75',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('8',    'BETRIEBSFREMDER, AUSSERORDENTLICHER, EINMALIGER UND PERIODENFREMDER ERFOLG','H','','','8',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('80',   'BETRIEBSFREMDER ERFOLG','H','','','80',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('8000', 'Betriebsfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8000',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('8100', 'Betriebsfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8100',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('85',   'AUSSERORDENTLICHER, EINMALIGER ERFOLG','H','','','85',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('8500', 'Ausserordentlicher Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8500',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('8510', 'Ausserordentlicher Ertrag','A','I','AR_amount:IC_sale:IC_income','8510',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('87',   'PERIODENFREMDER ERFOLG','H','','','87',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('8700', 'Periodenfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8700',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('8710', 'Periodenfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8710',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
-('89',   'DIREKTE STEUERN','H','','','89',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('8900', 'Direkte Steuern','A','E','','8900',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
-('9',    'ABSCHLUSS','H','','','9',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('90',   'ERFOLGSRECHNUNG','H','','','90',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('91',   'BILANZ','H','','','91',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('9100', 'Eröffnungsbilanz','A','E','','9100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('92',   'GEWINNVERWENDUNG','H','','','92',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
-('95',   'JAHRESERGEBNISSE','H','','','95',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000');
-
-
-DELETE FROM buchungsgruppen;
-
-INSERT INTO buchungsgruppen (
-  description, inventory_accno_id,
-  income_accno_id_0, expense_accno_id_0,
-  income_accno_id_1, expense_accno_id_1,
-  income_accno_id_2, expense_accno_id_2,
-  income_accno_id_3, expense_accno_id_3
-) VALUES (
-  'Standard',(SELECT id FROM chart WHERE accno = '1200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
-  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200')
-);
-
-
-DELETE FROM tax_zones;
-
-INSERT INTO tax_zones (id, description) VALUES
-(0, 'Schweiz'), -- siehe auch Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql )=:
-(1, 'EU mit USt-ID Nummer'),
-(2, 'EU ohne USt-ID Nummer'),
-(3, 'Ausserhalb EU');
-
-
-DELETE FROM tax;
-
-INSERT INTO tax (taxkey, taxdescription, rate) VALUES
-(0, 'Keine Steuer', 0),
-(1, 'Mehrwertsteuerfrei', 0);
-
-INSERT INTO tax (taxkey, taxdescription, rate, taxnumber, chart_id) VALUES
-(2, 'MWST', 0.08000, '2200', (SELECT id FROM chart WHERE accno='2200')),
-(3, 'MWST', 0.02500, '2200', (SELECT id FROM chart WHERE accno='2200')),
-(4, 'MWST Aufwand', 0.08000, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(5, 'MWST Aufwand', 0.02500, '1170', (SELECT id FROM chart WHERE accno='1170')),
-(6, 'MWST Investitionen', 0.08000, '1171', (SELECT id FROM chart WHERE accno='1171')),
-(7, 'MWST Investitionen', 0.02500, '1171', (SELECT id FROM chart WHERE accno='1171'));
-
-
-DELETE FROM taxkeys;
-
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 0, (SELECT tax.id FROM tax WHERE taxkey=0), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=0;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 1, (SELECT tax.id FROM tax WHERE taxkey=1), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=1;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 2, (SELECT tax.id FROM tax WHERE taxkey=2), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=2;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 3, (SELECT tax.id FROM tax WHERE taxkey=3), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=3;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 4, (SELECT tax.id FROM tax WHERE taxkey=4), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=4;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 5, (SELECT tax.id FROM tax WHERE taxkey=5), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=5;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 6, (SELECT tax.id FROM tax WHERE taxkey=6), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=6;
-INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 7, (SELECT tax.id FROM tax WHERE taxkey=7), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=7;
-
-
-DELETE FROM units;
-
-INSERT INTO units (name, base_unit, factor, type) VALUES
-('Stck', NULL, 0.00000, 'dimension'),
-('mg', NULL, 0.00000, 'dimension'),
-('g', 'mg', 1000.00000, 'dimension'),
-('kg', 'g', 1000.00000, 'dimension'),
-('t', 'kg', 1000.00000, 'dimension'),
-('ml', NULL, 0.00000, 'dimension'),
-('L', 'ml', 1000.00000, 'dimension'),
-('pauschal', NULL, 0.00000, 'service'),
-('Min', NULL, 0.00000, 'service'),
-('Std', 'Min', 60.00000, 'service'),
-('Tag', 'Std', 8.00000, 'service'),
-('Wo', NULL, 0.00000, 'service'),
-('Mt', 'Wo', 4.00000, 'service'),
-('Jahr', 'Mt', 12.00000, 'service');
-
-
-DELETE FROM defaults;
-
-INSERT INTO defaults (
-  inventory_accno_id,
-  income_accno_id, expense_accno_id,
-  fxgain_accno_id, fxloss_accno_id,
-  invnumber, sonumber,
-  weightunit,
-  businessnumber,
-  version,
-  closedto,
-  revtrans,
-  ponumber, sqnumber, rfqnumber,
-  customernumber, vendornumber,
-  audittrail,
-  articlenumber, servicenumber,
-  rmanumber, cnnumber
-) VALUES (
-  (SELECT id FROM CHART WHERE accno='1200'),
-  (SELECT id FROM CHART WHERE accno='3200'), (SELECT id FROM CHART WHERE accno='4200'),
-  (SELECT id FROM CHART WHERE accno='6999'), (SELECT id FROM CHART WHERE accno='6949'),
-  0, 0,
-  'kg',
-  '',
-  '3.5.0 CH',
-  NULL,
-  FALSE,
-  0, 0, 0,
-  0, 0,
-  FALSE,
-  0, 0,
-  0, 0
-);
diff --git a/sql/Switzerland-deutsch-Verein-2024-chart.sql b/sql/Switzerland-deutsch-Verein-2024-chart.sql
new file mode 100644
index 000000000..b3949ac16
--- /dev/null
+++ b/sql/Switzerland-deutsch-Verein-2024-chart.sql
@@ -0,0 +1,373 @@
+-- deutschsprachiger Kontenplan nach Schweizer Kontenrahmen KMU spezifisch angepasst für mehrwertsteuerpflichtige Vereine in der Schweiz
+-- für kivitendo aufbereitet am 11.4.2017, kleinere Korrekturen am 15.7.2017, 19.2.2023 und 29.11.2023
+-- Grundlage: Revision OR Stand 1.1.2013, insbesondere Art. 957a Abs. 2
+-- MWST 8.1% und 2.6%
+-- Autor: Kurt Pfister, http://www.gotransparent.ch
+-- Redaktion: Andreas Rudin, http://www.revamp-it.ch
+-- Copyright 2014,2017,2023 Kurt Pfister, Andreas Rudin
+
+-- This file is part of kivitendo.
+-- kivitendo 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.
+-- 
+-- kivitendo 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 kivitendo. If not, see <http://www.gnu.org/licenses/>.
+
+-- Diese Datei ist Teil von kivitendo.
+--
+-- kivitendo ist Freie Software: Sie können es unter den Bedingungen
+-- der GNU General Public License, wie von der Free Software Foundation,
+-- Version 2 der Lizenz oder (nach Ihrer Wahl) jeder späteren
+-- veröffentlichten Version, weiterverbreiten und/oder modifizieren.
+--
+-- kivitendo wird in der Hoffnung, dass es nützlich sein wird, aber
+-- OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite
+-- Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.
+-- Siehe die GNU General Public License für weitere Details.
+--
+-- Sie sollten eine Kopie der GNU General Public License zusammen mit diesem
+-- Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>. 
+
+DELETE FROM chart;
+
+INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
+('1',    'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('10',   'UMLAUFVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('100',  'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1000', 'Kasse','A','A','AR_paid:AP_paid','1000',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1010', 'Postfinance','A','A','AR_paid:AP_paid','1010',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1020', 'Bank','A','A','AR_paid:AP_paid','1020',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('106',  'Kurzfristig gehaltene Aktiven mit Börsenkurs','H','','','106',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1060', 'Wertschriften','A','A','','1060',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('110',  'Forderungen aus Lieferungen und Leistungen','H','','','110',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1100', 'Debitoren CHF','A','A','AR','1100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1101', 'Debitoren EUR','A','A','AR','1101',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1107', 'Forderungen an Kreditkarten','A','A','','1107',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1109', 'Delkredere','A','A','','1109',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('114',  'Übrige kurzfristige Forderungen','H','','','114',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1140', 'Vorschüsse, kurzfristige Darlehen','A','A','','1140',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1160', 'Kontokorrent Mitglied/Vorstand/GL','A','A','','1160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1170', 'MWST Vorsteuer Material/Dienstleistungen','A','A','AP_tax:IC_taxpart:IC_taxservice','1170',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1171', 'MWST Vorsteuer Investitionen/übr. Betriebsaufwand','A','A','AP_tax:IC_taxpart:IC_taxservice','1171',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1176', 'Verrechnungssteuer','A','A','','1176',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1181', 'Familienzulagen','A','A','','1181',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1191', 'Kautionen','A','A','','1191',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1192', 'Geleistete Anzahlungen','A','A','','1192',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('120',  'Vorräte und nicht fakturierte Dienstleistungen','H','','','120',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1200', 'Handelswaren','A','A','IC','1200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1209', 'Wertberichtigung Handelswaren','A','A','','1209',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1210', 'Rohstoffe','A','A','IC','1210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1219', 'Wertberichtigung Rohstoffe','A','A','','1219',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1260', 'Fertige Erzeugnisse','A','A','IC','1260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1269', 'Wertberichtigung fertige Erzeugnisse','A','A','','1269',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1280', 'Nicht fakturierte Dienstleistungen','A','A','IC','1280',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('130',  'Aktive Rechnungsabgrenzung','H','','','130',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1300', 'Bezahlter Aufwand des Folgejahrs','A','A','','1300',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1301', 'Noch nicht erhaltener Ertrag','A','A','','1301',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('14',   'ANLAGEVERMÖGEN','H','','','14',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('140',  'Finanzanlagen','H','','','140',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1400', 'Wertschriften','A','A','IC','1400',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1411', 'Mietzinsdepot','A','A','IC','1411',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1440', 'Darlehen','A','A','IC','1440',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1460', 'Darlehen an Mitglied/Vorstand/GL','A','A','IC','1460',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('148',  'Beteiligungen','H','','','148',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1480', 'Beteiligung','A','A','IC','1480',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1489', 'Wertberichtigung Beteiligung','A','A','','1489',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('150',  'Mobile Sachanlagen','H','','','150',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1500', 'Maschinen und Apparate','A','A','IC','1500',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1509', 'Wertberichtigung Maschinen und Apparate','A','A','','1509',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1510', 'Mobiliar und Einrichtungen','A','A','IC','1510',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1519', 'Wertberichtigung Mobiliar und Einrichtungen','A','A','','1519',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1520', 'Informatik und Kommunikation','A','A','IC','1520',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1529', 'Wertberichtigung Informatik und Kommunikation','A','A','','1529',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1530', 'Fahrzeuge','A','A','IC','1530',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1539', 'Wertberichtigung Fahrzeuge','A','A','','1539',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1540', 'Werkzeug und Geräte','A','A','IC','1540',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1549', 'Wertberichtigung Werkzeug und Geräte','A','A','','1549',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('160',  'Immobile Sachanlagen','H','','','160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1600', 'Geschäftsliegenschaft','A','A','IC','1600',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1609', 'Wertberichtigung Geschäftsliegenschaft','A','A','','1609',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('170',  'Immaterielle Werte','H','','','170',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1700', 'Patent, Konzession, Rechte','A','A','IC','1700',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('1709', 'Wertberichtigung Patent, Konzession, Rechte','A','A','','1709',6,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2',    'PASSIVEN','H','','','2',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('20',   'KURZFRISTIGES FREMDKAPITAL','H','','','20',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('200',  'Verbindlichkeiten aus Lieferungen und Leistungen','H','','','200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2000', 'Kreditoren CHF','A','L','AP','2000',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2001', 'Kreditoren EUR','A','L','AP','2001',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2030', 'Erhaltene Anzahlungen von Kundinnen und Kunden','A','L','','2030',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('210',  'Kurzfristige verzinsliche Verbindlichkeiten','H','','','210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2100', 'Bank','A','L','AR_paid:AP_paid','2100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2160', 'Verzinsliche Verbindlichkeiten gegenüber Mitglied/Vorstand/GL','A','L','','2160',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('220',  'Übrige kurzfristige Verbindlichkeiten','H','','','220',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2200', 'MWST Umsatzsteuer','A','L','AR_tax:IC_taxpart:IC_taxservice','2200',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2201', 'MWST Abrechnungskonto','A','L','','2201',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2203', 'MWST Bezugssteuer','A','L','','2203',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2206', 'Verrechnungssteuer','A','L','','2206',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2208', 'Direkte Steuern','A','L','','2208',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2210', 'Übrige kurzfristige Verbindlichkeiten','A','L','','2210',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2260', 'Verbindlichkeiten gegenüber Mitglied/Vorstand/GL','A','L','','2260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2270', 'Kontokorrent Berufliche Vorsorge','A','L','','2270',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2271', 'Kontokorrent AHV,IV,EO,ALV','A','L','','2271',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2272', 'Kontokorrent FAK','A','L','','2272',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2273', 'Kontokorrent Unfallversicherung','A','L','','2273',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2274', 'Kontokorrent Krankentaggeldversicherung','A','L','','2274',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2279', 'Kontokorrent Quellensteuer','A','L','','2279',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('230',  'Passive Rechnungsabgrenzung','H','','','230',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2300', 'Noch nicht bezahlter Aufwand','A','L','','2300',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2301', 'Erhaltener Ertrag des Folgejahrs','A','L','','2301',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('24',   'LANGFRISTIGES FREMDKAPITAL','H','','','24',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('240',  'Langfristige verzinsliche Verbindlichkeiten','H','','','240',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2401', 'Hypothek','A','L','','2401',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2450', 'Verzinsliche Darlehen','A','L','','2450',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('250',  'Übrige langfristige Verbindlichkeiten','H','','','250',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2500', 'Zinslose Darlehen','A','L','','2500',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2560', 'Darlehen von Mitglied/Vorstand/GL','A','L','','2560',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('260',  'Rückstellungen langfristig','H','','','260',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2630', 'Rückstellung für Garantieverpflichtungen','A','L','','2630',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('28',   'EIGENKAPITAL','H','','','28',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('280',  'Organisationskapital','H','','','280',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2800', 'Vereinsvermögen','A','Q','','2800',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('290',  'Jahresgewinn oder Jahresverlust','H','','','290',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('2979', 'Jahresgewinn oder Jahresverlust','A','Q','','2979',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3',    'BETRIEBSERTRAG','H','','','3',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('30',   'PRODUKTIONSERLÖS','H','','','30',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3000', 'Produktionserlös','A','I','AR_amount:IC_sale','3000',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('32',   'HANDELSERLÖSE','H','','','32',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3200', 'Handelserlöse','A','I','AR_amount:IC_sale','3200',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('34',   'DIENSTLEISTUNGSERLÖSE','H','','','34',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3400', 'Dienstleistungserlöse','A','I','AR_amount:IC_income','3400',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('36',   'ÜBRIGE ERLÖSE','H','','','36',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3600', 'Spenden','A','I','AR_amount:IC_income','3600',1,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3660', 'Mitgliederbeiträge','A','I','AR_amount:IC_income','3660',1,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3680', 'Sonstige Erlöse','A','I','AR_amount:IC_sale:IC_income','3680',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('37',   'EIGENLEISTUNGEN UND EIGENVERBRAUCH','H','','','37',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3700', 'Eigenleistungen','A','I','','3700',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('38',   'ERLÖSMINDERUNGEN','H','','','38',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3800', 'Skonti','A','E','AR_paid','3800',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3801', 'Rabatte, Preisnachlässe','A','E','AR_paid','3801',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3805', 'Verluste aus Forderungen, Veränderungen Delkredere','A','E','AR_paid','3805',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3809', 'MWST Saldosteuersatz','A','E','AR_paid','3809',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('39',   'BESTANDESÄNDERUNGEN','H','','','39',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('3901', 'Bestandesänderung fertige Erzeugnisse','A','I','','3901',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('3940', 'Bestandesänderung nicht fakturierte Dienstleistungen','A','I','','3940',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('4',    'AUFWAND FÜR LEISTUNGSERSTELLUNG','H','','','4',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('40',   'MATERIALAUFWAND','H','','','40',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4000', 'Materialeinkauf','A','E','AP_amount:IC_cogs','4000',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('42',   'HANDELSWARENAUFWAND','H','','','42',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4200', 'Einkauf Handelswaren','A','E','AP_amount:IC_cogs','4200',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('44',   'AUFWAND FÜR BEZOGENE DRITTLEISTUNGEN','H','','','44',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4400', 'Aufwand für Drittleistungen','A','E','AP_amount:IC_expense','4400',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('45',   'ENERGIEAUFWAND ZUR LEISTUNGSERSTELLUNG','H','','','45',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4500', 'Energieaufwand zur Leistungserstellung','A','E','AP_amount:IC_expense','4500',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('48',   'BESTANDESÄNDERUNGEN','H','','','48',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4800', 'Bestandesänderungen','A','E','','4800',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('49',   'EINKAUFSPREISMINDERUNGEN','H','','','49',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('4900', 'Skonti, Rabatte, Preisnachlässe','A','I','AP_paid','4900',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5',    'PERSONALAUFWAND','H','','','5',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('50',   'LÖHNE UND GEHÄLTER','H','','','500',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('5000', 'Bruttolohn','A','E','IC_expense','5000',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5002', 'Erfolgsbeteiligung','A','E','IC_expense','5002',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5005', 'Leistungen von Sozialversicherungen','A','I','IC_income','5005',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('57',   'SOZIALVERSICHERUNGSAUFWAND','H','','','57',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('5700', 'AHV, IV, EO, ALV','A','E','AP_amount:IC_expense','5700',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5710', 'FAK','A','E','AP_amount:IC_expense','5710',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5720', 'Berufliche Vorsorge','A','E','AP_amount:IC_expense','5720',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5730', 'Unfallversicherung','A','E','AP_amount:IC_expense','5730',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5740', 'Krankentaggeldversicherung','A','E','AP_amount:IC_expense','5740',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5790', 'Quellensteuer','A','E','AP_amount:IC_expense','5790',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('58',   'ÜBRIGER PERSONALAUFWAND','H','','','58',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('5800', 'Aufwand für Personaleinstellung','A','E','IC_expense','5800',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5810', 'Aus- und Weiterbildung','A','E','IC_expense','5810',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5830', 'Spesenentschädigung','A','E','IC_expense','5830',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('5880', 'Sonstiger Personalaufwand','A','E','IC_expense','5880',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('59',   'LEISTUNGEN DRITTER','H','','','59',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('5900', 'Fremdarbeit, Temporärpersonal','A','E','IC_expense','5900',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6',    'ÜBRIGER BETRIEBSAUFWAND','H','','','6',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('60',   'RAUMAUFWAND','H','','','60',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6000', 'Miete','A','E','AP_amount:IC_expense','6000',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6040', 'Reinigung','A','E','AP_amount:IC_expense','6040',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6050', 'Übriger Raumaufwand','A','E','AP_amount:IC_expense','6050',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('61',   'UNTERHALT, REPARATUREN, ERSATZ, LEASING','H','','','61',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6100', 'Unterhalt Maschinen und Apparate','A','E','AP_amount:IC_expense','6100',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6110', 'Unterhalt Mobiliar und Einrichtungen','A','E','AP_amount:IC_expense','6110',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6120', 'Unterhalt Informatik und Kommunikation','A','E','AP_amount:IC_expense','6120',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6140', 'Unterhalt Werkzeug und Geräte','A','E','AP_amount:IC_expense','6140',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6150', 'Leasing','A','E','AP_amount:IC_expense','6150',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('62',   'FAHRZEUG- UND TRANSPORTAUFWAND','H','','','62',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6200', 'Fahrzeugaufwand','A','E','AP_amount:IC_expense','6200',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6201', 'Transportaufwand','A','E','AP_amount:IC_expense','6201',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('63',   'SACHVERSICHERUNGEN, ABGABEN, GEBÜHREN','H','','','63',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6300', 'Betriebsversicherung','A','E','AP_amount:IC_expense','6300',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6360', 'Abgaben, Gebühren und Bewilligungen','A','E','AP_amount:IC_expense','6360',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('64',   'ENERGIE- UND ENTSORGUNGSAUFWAND','H','','','64',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6400', 'Strom, Gas, Wasser','A','E','AP_amount:IC_expense','6400',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6460', 'Entsorgungsaufwand','A','E','AP_amount:IC_expense','6460',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('65',   'VERWALTUNGS- UND INFORMATIKAUFWAND','H','','','65',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6500', 'Büromaterial, Drucksachen, Fachliteratur','A','E','AP_amount:IC_expense','6500',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6510', 'Telefon, Porto, Internet','A','E','AP_amount:IC_expense','6510',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6520', 'Beiträge, Spenden','A','E','AP_amount:IC_expense','6520',1,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6530', 'Buchführungs- und Beratungsaufwand','A','E','AP_amount:IC_expense','6530',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6540', 'Vorstandsentschädigung, GV, Revision','A','E','AP_amount:IC_expense','6540',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6570', 'Informatikaufwand','A','E','AP_amount:IC_expense','6570',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6590', 'Übriger Verwaltungsaufwand','A','E','AP_amount:IC_expense','6590',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('66',   'WERBEAUFWAND','H','','','66',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6600', 'Inserate','A','E','AP_amount:IC_expense','6600',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6604', 'Website','A','E','AP_amount:IC_expense','6604',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6620', 'Schaufenster, Messen','A','E','AP_amount:IC_expense','6620',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6640', 'Reisespesen, Kundenbetreuung','A','E','AP_amount:IC_expense','6640',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6660', 'Sponsoring','A','E','AP_amount:IC_expense','6660',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('67',   'SONSTIGER BETRIEBLICHER AUFWAND','H','','','67',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6700', 'Wirtschaftsauskunft, Betreibung','A','E','AP_amount:IC_expense','6700',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6720', 'Forschung und Entwicklung','A','E','AP_amount:IC_expense','6720',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6791', 'Privatanteil Fahrzeug','A','E','AP_amount:IC_expense','6791',6,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('68',   'ABSCHREIBUNG UND WERTBERICHTIGUNG','H','','','68',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6800', 'Wertberichtigung Finanzanlagen','A','E','','6800',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6820', 'Abschreibung mobile Sachanlagen','A','E','','6820',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6830', 'Abschreibung immobile Sachanlagen','A','E','','6830',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6840', 'Abschreibung immaterielle Werte','A','E','','6840',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('69',   'FINANZAUFWAND UND FINANZERTRAG','H','','','69',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('690',  'Finanzaufwand','H','','','690',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6900', 'Zinsaufwand','A','E','','6900',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6940', 'Bankspesen','A','E','','6940',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6943', 'Rundungsaufwand','A','E','','6943',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('6949', 'Währungsverluste','A','E','','6949',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('695',  'Finanzertrag','H','','','695',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('6950', 'Zinsertrag','A','I','','6950',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('6953', 'Rundungsertrag','A','I','','6953',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('6999', 'Währungsgewinne','A','I','','6999',0,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('7',    'BETRIEBLICHER NEBENERFOLG','H','','','7',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('70',   'ERFOLG AUS NEBENBETRIEBEN','H','','','70',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('75',   'ERFOLG AUS BETRIEBLICHEN LIEGENSCHAFTEN','H','','','75',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('8',    'BETRIEBSFREMDER, AUSSERORDENTLICHER, EINMALIGER UND PERIODENFREMDER ERFOLG','H','','','8',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('80',   'BETRIEBSFREMDER ERFOLG','H','','','80',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('8000', 'Betriebsfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8000',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('8100', 'Betriebsfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8100',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('85',   'AUSSERORDENTLICHER, EINMALIGER ERFOLG','H','','','85',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('8500', 'Ausserordentlicher Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8500',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('8510', 'Ausserordentlicher Ertrag','A','I','AR_amount:IC_sale:IC_income','8510',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('87',   'PERIODENFREMDER ERFOLG','H','','','87',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('8700', 'Periodenfremder Aufwand','A','E','AP_amount:IC_cogs:IC_expense','8700',4,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('8710', 'Periodenfremder Ertrag','A','I','AR_amount:IC_sale:IC_income','8710',2,NULL,NULL,NULL,1,FALSE,'2017-01-01 00:00:00.000000'),
+('89',   'DIREKTE STEUERN','H','','','89',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('8900', 'Direkte Steuern','A','E','','8900',0,NULL,NULL,NULL,6,FALSE,'2017-01-01 00:00:00.000000'),
+('9',    'ABSCHLUSS','H','','','9',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('90',   'ERFOLGSRECHNUNG','H','','','90',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('91',   'BILANZ','H','','','91',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('9100', 'Eröffnungsbilanz','A','E','','9100',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('92',   'GEWINNVERWENDUNG','H','','','92',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000'),
+('95',   'JAHRESERGEBNISSE','H','','','95',0,NULL,NULL,NULL,NULL,FALSE,'2017-01-01 00:00:00.000000');
+
+
+DELETE FROM buchungsgruppen;
+
+INSERT INTO buchungsgruppen (
+  description, inventory_accno_id,
+  income_accno_id_0, expense_accno_id_0,
+  income_accno_id_1, expense_accno_id_1,
+  income_accno_id_2, expense_accno_id_2,
+  income_accno_id_3, expense_accno_id_3
+) VALUES (
+  'Standard',(SELECT id FROM chart WHERE accno = '1200'),
+  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
+  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
+  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200'),
+  (SELECT id FROM chart WHERE accno = '3200'), (SELECT id FROM chart WHERE accno = '4200')
+);
+
+
+DELETE FROM tax_zones;
+
+INSERT INTO tax_zones (id, description) VALUES
+(0, 'Schweiz'), -- siehe auch Pg-upgrade2/taxzone_id_in_oe_delivery_orders.sql )=:
+(1, 'EU mit USt-ID Nummer'),
+(2, 'EU ohne USt-ID Nummer'),
+(3, 'Ausserhalb EU');
+
+
+DELETE FROM tax;
+
+INSERT INTO tax (taxkey, taxdescription, rate) VALUES
+(0, 'Keine Steuer', 0),
+(1, 'Mehrwertsteuerfrei', 0);
+
+INSERT INTO tax (taxkey, taxdescription, rate, taxnumber, chart_id) VALUES
+(2, 'MWST', 0.08100, '2200', (SELECT id FROM chart WHERE accno='2200')),
+(3, 'MWST', 0.02600, '2200', (SELECT id FROM chart WHERE accno='2200')),
+(4, 'MWST Aufwand', 0.08100, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(5, 'MWST Aufwand', 0.02600, '1170', (SELECT id FROM chart WHERE accno='1170')),
+(6, 'MWST Investitionen', 0.08100, '1171', (SELECT id FROM chart WHERE accno='1171')),
+(7, 'MWST Investitionen', 0.02600, '1171', (SELECT id FROM chart WHERE accno='1171'));
+
+
+DELETE FROM taxkeys;
+
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 0, (SELECT tax.id FROM tax WHERE taxkey=0), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=0;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 1, (SELECT tax.id FROM tax WHERE taxkey=1), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=1;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 2, (SELECT tax.id FROM tax WHERE taxkey=2), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=2;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 3, (SELECT tax.id FROM tax WHERE taxkey=3), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=3;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 4, (SELECT tax.id FROM tax WHERE taxkey=4), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=4;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 5, (SELECT tax.id FROM tax WHERE taxkey=5), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=5;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 6, (SELECT tax.id FROM tax WHERE taxkey=6), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=6;
+INSERT INTO taxkeys (taxkey_id, tax_id, chart_id, startdate) SELECT 7, (SELECT tax.id FROM tax WHERE taxkey=7), chart.id, '2017-01-01' FROM chart WHERE taxkey_id=7;
+
+
+DELETE FROM units;
+
+INSERT INTO units (name, base_unit, factor, type) VALUES
+('Stck', NULL, 0.00000, 'dimension'),
+('mg', NULL, 0.00000, 'dimension'),
+('g', 'mg', 1000.00000, 'dimension'),
+('kg', 'g', 1000.00000, 'dimension'),
+('t', 'kg', 1000.00000, 'dimension'),
+('ml', NULL, 0.00000, 'dimension'),
+('L', 'ml', 1000.00000, 'dimension'),
+('pauschal', NULL, 0.00000, 'service'),
+('Min', NULL, 0.00000, 'service'),
+('Std', 'Min', 60.00000, 'service'),
+('Tag', 'Std', 8.00000, 'service'),
+('Wo', NULL, 0.00000, 'service'),
+('Mt', 'Wo', 4.00000, 'service'),
+('Jahr', 'Mt', 12.00000, 'service');
+
+
+DELETE FROM defaults;
+
+INSERT INTO defaults (
+  inventory_accno_id,
+  income_accno_id, expense_accno_id,
+  fxgain_accno_id, fxloss_accno_id,
+  invnumber, sonumber,
+  weightunit,
+  businessnumber,
+  version,
+  closedto,
+  revtrans,
+  ponumber, sqnumber, rfqnumber,
+  customernumber, vendornumber,
+  audittrail,
+  articlenumber, servicenumber,
+  rmanumber, cnnumber
+) VALUES (
+  (SELECT id FROM CHART WHERE accno='1200'),
+  (SELECT id FROM CHART WHERE accno='3200'), (SELECT id FROM CHART WHERE accno='4200'),
+  (SELECT id FROM CHART WHERE accno='6999'), (SELECT id FROM CHART WHERE accno='6949'),
+  0, 0,
+  'kg',
+  '',
+  '3.9.0 CH',
+  NULL,
+  FALSE,
+  0, 0, 0,
+  0, 0,
+  FALSE,
+  0, 0,
+  0, 0
+);
diff --git a/t/000setup_database.t b/t/000setup_database.t
index 4e739b72d..f3dce3248 100755
--- a/t/000setup_database.t
+++ b/t/000setup_database.t
@@ -4,6 +4,8 @@ use strict;
 
 use lib 't';
 
+use SL::DB::Helper::ALL;
+
 use Data::Dumper;
 use Test::More;
 
diff --git a/t/001compile.t b/t/001compile.t
index 044d60408..4b00aac75 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -75,13 +75,13 @@ sub test_compile_file {
 
   if ($loginfo =~ /syntax ok$/im) {
     if ($loginfo ne "$file syntax OK\n") {
-      ok(0,$file." --WARNING");
+      ok(0,$file." --WARNING\n" . ( split /\n/, $loginfo )[0]);
       print $fh $loginfo;
     } else {
       ok(1,$file);
     }
   } else {
-    ok(0,$file." --ERROR");
+    ok(0,$file." --ERROR\n" . ( split /\n/, $loginfo )[0]);
     print $fh $loginfo;
   }
 }
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index d8d236019..b7914924d 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
@@ -37,6 +37,8 @@ cofigur
 custemer
 databasa
 dependan
+errror
+errros
 execept
 existance
 existant
@@ -49,11 +51,14 @@ pirce
 postition
 primt
 puchase
+purcharse
 puhs
+saveing
 sekf
 seperat
 substract
 sucess
+sytle
 unkown
 varsion
 wether
diff --git a/t/Support/Integration.pm b/t/Support/Integration.pm
new file mode 100644
index 000000000..d22748b52
--- /dev/null
+++ b/t/Support/Integration.pm
@@ -0,0 +1,199 @@
+package Support::Integration;
+
+use strict;
+use Exporter qw(import);
+use HTML::Query;
+
+our @EXPORT = qw(make_request form_from_html);
+
+package MockDispatcher {
+  sub end_request { die "END_OF_MOCK_REQUEST" }
+};
+
+sub setup {
+  no warnings 'once';
+  $::dispatcher = bless { }, "MockDispatcher";
+}
+
+sub make_request {
+  my ($controller, $action, %form_vars) = @_;
+
+  my ($out, $err, @ret);
+
+  package main {
+    local $SIG{__WARN__} = sub {
+      # ignore spurious warnings, TAP::Harness calls this warnings enabled
+    };
+
+    open(my $out_fh, '>', \$out) or die;
+    open(my $err_fh, '>', \$err) or die;
+
+    local *STDOUT = $out_fh;
+    local *STDERR = $err_fh;
+
+    local $::form = Form->new;
+    $::form->{$_} = $form_vars{$_} for keys %form_vars;
+
+    no strict "refs";
+    eval {
+      if ($controller =~ /^[a-z]/) {
+        $::form->{script} = $controller.'.pl'; # usually set by dispatcher, needed for checks in update_exchangerate
+        local $ENV{REQUEST_URI} = "http://localhost/$controller.pl"; # needed for Form::redirect_header
+        require "bin/mozilla/$controller.pl";
+        no warnings;
+        @ret = &{ "::$action" }();
+      } else {
+        require "SL/Controller/$controller.pm";
+        no warnings;
+        @ret = "SL::Controller::$controller"->new->_run_action($action);
+      }
+      1;
+    } or do { my $err = $@;
+      die unless $err =~ /^END_OF_MOCK_REQUEST/;
+      @ret = (1);
+    }
+  }
+  return ($out, $err, @ret);
+}
+
+sub form_from_html {
+  my ($html, $form_selector) = @_;
+  $form_selector //= '#form';
+
+  my $q = HTML::Query->new(text => $html);
+
+  my %form;
+  for my $input ($q->query("$form_selector input")->get_elements()) {
+    next if !$input->attr('name') || $input->attr('disabled');
+    $form{ $input->attr('name') } = $input->attr('value') // "";
+  }
+  for my $select ($q->query("$form_selector select")->get_elements()) {
+    my $name = $select->attr('name');
+    my ($selected_option) = (
+      grep({ $_->tag eq 'option' && $_->attr('selected') } $select->content_list),
+      grep({ $_->tag eq 'option' } $select->content_list)
+    );
+
+    $form{ $name } = $selected_option->attr('value') // $selected_option->as_text
+      if $selected_option;
+  }
+
+  %form;
+}
+
+1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+Support::Integration - helper for simple frontend integration tests
+
+=head1 SYNOPSIS
+
+  # in tests
+  use Support::Integration qw(:all);
+
+  # before making any requests, setup mock dispatcher
+  Support::Integration::setup();
+  Support::TestSetup::login();
+
+  # then do a simple request: ar.pl?action=add&type=invoice
+  # returns the generated outputs and return values
+  # exceptions are bubbled through
+  my ($stdout, $strderr, @ret) = make_request('ar', 'add', type => 'invoice');
+
+  # generate form contents from html for the given form selector (defaults to '#form')
+  my %form = form_from_html($stdout, '#form');
+
+  # add values the user would enter
+  $form{partnumber} = "Part 1";
+
+  # there is no javascript emulation so you need to set ids like a picker would
+  $form{customer_id} = 14392;
+
+  # and do request again
+  ($stdout, $stderr, @ret) = make_request('ar', 'update', %form);
+
+  # also works with new controllers
+  ($stdout, $stderr, @ret) = make_request('Part', 'new', %form);
+
+=head1 DESCRIPTION
+
+This is intended as a simple way of testing user centric journeys spanning
+multiple requests.
+
+See synopsis for the intended usage. C<make_request> emulates most of the
+usual dispatching and routing and simply returns the html output of the action.
+C<form_from_html> extracts what would be submitted from a <form> element in the
+html.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item * setup
+
+Reigsters a mock dispatcher global so that C<$::dispatcher->end_request> works.
+Needs to be called before using L</make_request>
+
+=item * make_request CONTROLLER, ACTION, [ FORM_KEY => FORM_VALUE, .... ]
+
+Emulates a request. Supported are both old-style and new-style controllers.
+Since the routing code does not distinguish between verbs (GET/POST), this doesn't either.
+
+Returns stdout, stderr and the return values of the action.
+
+Exceptions are bubbled as is, with the exception of the graceful end_request.
+
+=item * form_from_html HTML_STRING, [ FORM_SELECTOR ]
+
+Parses the given html string into a dom, finds all inputs
+and selects within the given form selector
+and extracts their key values into a return hash.
+
+If ommited, form selector defaults to C<#form>.
+
+See L</CAVEATS> for limitations.
+
+=back
+
+=head1 CAVEATS
+
+=over 4
+
+=item * No authentication
+
+This is not intended to emulate the login process. It is expected that
+C<Support::TestSetup::login()> is called for any Requests that require user access.
+
+=item * No Javascript emulation
+
+This means: no pickers, no auto format, no auto update on change.
+No dynamic content like added rows or autocompletion.
+
+=item * Form extraction is stupid
+
+This simply gets all non-disabled inputs and selects within a form selector.
+The order of elements is strictly DOM order, which is important for checkbox_for_submit
+and ParseFilter serialization.
+
+=item * No network round-trips
+
+Requests will be emulated within the same process without a network roundtrip.
+This is not for full black box system tests.
+
+=item * Warnings are suppressed
+
+Test::Harness will sometimes enable warnings for all code, which then pollutes
+stderr. so warnings are suppressed for make_request.
+
+=back
+
+=head1 AUTHOR
+
+Sven Schöling E<lt>s.schoeling@linet-services.deE<gt>
+
+=cut
diff --git a/t/Support/TestRoutines.pm b/t/Support/TestRoutines.pm
new file mode 100644
index 000000000..9e40f9a72
--- /dev/null
+++ b/t/Support/TestRoutines.pm
@@ -0,0 +1,33 @@
+package Support::TestRoutines;
+
+use Test::More;
+use List::MoreUtils qw(any);
+
+require Exporter;
+our @ISA = qw(Exporter);
+
+our @EXPORT = qw(test_deeply);
+
+sub test_deeply {
+  my ($first, $second, $description, @ignore_keys) = @_;
+
+  my @first_keys = keys %{$first};
+  my @second_keys = keys %{$second};
+  foreach my $key (@first_keys) {
+    if (!any { $_ eq $key } @ignore_keys) {
+      if (!any { $_ eq $key } @second_keys) {
+        ok(0, $description . ": " . $key);
+      }
+    }
+  }
+  foreach my $key (@second_keys) {
+    if (!any { $_ eq $key } @ignore_keys) {
+      if (!any { $_ eq $key } @first_keys) {
+        ok(0, $description . ": " . $key);
+      } else {
+        is($first->{$key}, $second->{$key}, $description . ": " . $key);
+      }
+    }
+  }
+}
+
diff --git a/t/bank/bank_transactions.t b/t/bank/bank_transactions.t
index 92f9362e6..51ae72a04 100644
--- a/t/bank/bank_transactions.t
+++ b/t/bank/bank_transactions.t
@@ -1,4 +1,4 @@
-use Test::More tests => 293;
+use Test::More tests => 474;
 
 use strict;
 
@@ -16,6 +16,7 @@ use SL::DB::Buchungsgruppe;
 use SL::DB::Currency;
 use SL::DB::Customer;
 use SL::DB::Default;
+use SL::DB::Exchangerate;
 use SL::DB::Vendor;
 use SL::DB::Invoice;
 use SL::DB::Unit;
@@ -31,7 +32,7 @@ use SL::Dev::ALL qw(:ALL);
 use Data::Dumper;
 
 my ($customer, $vendor, $currency_id, $unit, $tax, $tax0, $tax7, $tax_9, $payment_terms, $bank_account);
-my ($currency);
+my ($currency, $currency_usd, $fxgain_chart, $fxloss_chart);
 my ($ar_chart,$bank,$ar_amount_chart, $ap_chart, $ap_amount_chart);
 my ($ar_transaction, $ap_transaction);
 my ($dt, $dt_5, $dt_10, $year);
@@ -40,6 +41,7 @@ sub clear_up {
 
   SL::DB::Manager::BankTransactionAccTrans->delete_all(all => 1);
   SL::DB::Manager::BankTransaction->delete_all(all => 1);
+  SL::DB::Manager::GLTransaction->delete_all(all => 1);
   SL::DB::Manager::InvoiceItem->delete_all(all => 1);
   SL::DB::Manager::InvoiceItem->delete_all(all => 1);
   SL::DB::Manager::Invoice->delete_all(all => 1);
@@ -51,7 +53,9 @@ sub clear_up {
   SL::DB::Manager::SepaExport->delete_all(all => 1);
   SL::DB::Manager::BankAccount->delete_all(all => 1);
   SL::DB::Manager::PaymentTerm->delete_all(all => 1);
+  SL::DB::Manager::Exchangerate->delete_all(all => 1);
   SL::DB::Manager::Currency->delete_all(where => [ name => 'CUR' ]);
+  SL::DB::Manager::Currency->delete_all(where => [ name => 'USD' ]);
   # SL::DB::Manager::Default->delete_all(all => 1);
 };
 
@@ -76,8 +80,19 @@ Support::TestSetup::login();
 clear_up();
 reset_state(); # initialise customers/vendors/bank/currency/...
 
-test1();
+negative_ap_transaction_fx_gain_fees();
+test_negative_ar_transaction_fx_loss();
+test_ar_transaction_fx_loss();
+test_ar_transaction_fx_gain();
+test_ar_transaction_fx_partial_payment();
+#test_neg_sales_invoice_fx();
+negative_ap_transaction_fx_gain_fees_error();
+
+ap_transaction_fx_gain_fees();
+ap_transaction_fx_gain_fees_two_payments();
+ap_transaction_fx_loss_fees();
 
+test1();
 test_overpayment_with_partialpayment();
 test_overpayment();
 reset_state();
@@ -85,9 +100,11 @@ test_skonto_exact();
 test_two_invoices();
 test_partial_payment();
 test_credit_note();
+test_credit_note_with_skonto();
 test_ap_transaction();
 test_neg_ap_transaction(invoice => 0);
 test_neg_ap_transaction(invoice => 1);
+test_neg_ap_transaction_skonto();
 test_ap_payment_transaction();
 test_ap_payment_part_transaction();
 test_neg_sales_invoice();
@@ -97,13 +114,16 @@ test_bt_error();
 test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo();
 reset_state();
 test_sepa_export();
-
 reset_state();
 test_bt_rule1();
 reset_state();
 test_two_banktransactions();
-# remove all created data at end of test
 test_closedto();
+test_fuzzy_skonto_pt();
+test_fuzzy_skonto_pt_not_in_range();
+reset_state();
+test_sepa_export_endtoend();
+# remove all created data at end of test
 clear_up();
 
 done_testing();
@@ -130,6 +150,17 @@ sub reset_state {
 
   $currency_id     = $::instance_conf->get_currency_id;
 
+  $currency_usd    = SL::DB::Currency->new(name => 'USD')->save;
+  $fxgain_chart = SL::DB::Manager::Chart->find_by(accno => '2660') or die "Can't find fxgain_chart in test";
+  $fxloss_chart = SL::DB::Manager::Chart->find_by(accno => '2150') or die "Can't find fxloss_chart in test";
+  $currency_usd->db->dbh->do('UPDATE defaults SET fxgain_accno_id = ' . $fxgain_chart->id);
+  $currency_usd->db->dbh->do('UPDATE defaults SET fxloss_accno_id = ' . $fxloss_chart->id);
+  $::instance_conf->reload->data;
+  is($fxgain_chart->id,  $::instance_conf->get_fxgain_accno_id, "fxgain_chart was updated in defaults");
+  is($fxloss_chart->id,  $::instance_conf->get_fxloss_accno_id, "fxloss_chart was updated in defaults");
+
+
+
   $bank_account     =  SL::DB::BankAccount->new(
     account_number  => '123',
     bank_code       => '123',
@@ -629,6 +660,20 @@ sub test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo {
   is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
        9, "$testname 9 acc_trans entries created");
 
+  # check for record link and skonto corrections
+  my $rl_skonto = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $ar_transaction_skonto->id, from_table => 'ar', to_table => 'gl' ]);
+  is (ref $rl_skonto->[0], 'SL::DB::RecordLink', "$testname record link skonto gl created");
+  my $acc_trans_skonto = SL::DB::Manager::AccTransaction->get_all(where => [trans_id => $rl_skonto->[0]->to_id]);
+  foreach my $entry (@{ $acc_trans_skonto }) {
+    if ($entry->chart_link =~ m/tax/) {
+      is($entry->amount, '-1.29000');
+    } elsif ($entry->chart_link =~ m/AR_paid/) {
+      is($entry->amount, '1.29000');
+    } else {
+      fail("invalid chart link state");
+    }
+  }
+
   # same loop as above, but only for the 3rd ar_id
   foreach my $acc_trans_id_entry (@{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [ar_id => $ar_transaction_skonto->id ] )}) {
     isnt($acc_trans_id_entry->ar_id, '', "$testname: bt linked with acc_trans and trans_id set");
@@ -679,7 +724,6 @@ sub test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo {
   is (ref $rl->[0], '', "$testname record link removed");
   # double safety and check ar.paid
   # load all three invoices and check for paid-link via acc_trans and paid in general
-
   $ar_transaction->load;
   $ar_transaction_2->load;
   $ar_transaction_skonto->load;
@@ -698,6 +742,10 @@ sub test_full_workflow_ar_multiple_inv_skonto_reconciliate_and_undo {
   is($ar_transaction_2->paid , '0.00000' , "$testname: 'salesinv 2 fully unpaid");
   is($ar_transaction_skonto->paid , '0.00000' , "$testname: 'salesinv skonto fully unpaid");
 
+  is($ar_transaction_skonto->datepaid, undef, "$testname: 'salesinv skonto no date paid");
+  is($ar_transaction_2->datepaid,      undef, "$testname: 'salesinv 2 no date paid");
+  is($ar_transaction->datepaid ,       undef, "$testname: 'salesinv no date paid");
+
   # whew. w(h)a(n)t a whole lotta test
 }
 
@@ -717,11 +765,55 @@ sub test_credit_note {
                       create_invoice_item(part => $part2, qty => 10, sellprice => 50),
                     ]
   );
+  is($credit_note->amount ,'-844.9' ,"$testname: amount before booking ok");
+  is($credit_note->paid   ,'0'      ,"$testname: paid before booking ok");
   my $bt            = create_bank_transaction(record        => $credit_note,
-                                                                amount        => $credit_note->amount,
-                                                                bank_chart_id => $bank->id,
-                                                                transdate     => $dt_10,
-                                                               );
+                                              amount        => abs($credit_note->amount),
+                                              bank_chart_id => $bank->id,
+                                              transdate     => $dt_10,
+                                             );
+  my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($credit_note);
+  is($agreement, 14, "points for credit note ok");
+  is($rule_matches, 'remote_account_number(3) exact_amount(4) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus14(2) ', "rules_matches for credit note ok");
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $credit_note->id ]
+  };
+
+  save_btcontroller_to_string();
+
+  $credit_note->load;
+  $bt->load;
+  is($credit_note->amount   , '-844.90000', "$testname: amount ok");
+  is($credit_note->netamount, '-710.00000', "$testname: netamount ok");
+  is($credit_note->paid     , '-844.90000', "$testname: paid ok");
+  is($bt->invoice_amount    , '-844.90000', "$testname: bt invoice amount for credit note was assigned");
+  is($bt->amount            , '-844.90000', "$testname: bt  amount for credit note was assigned");
+}
+
+sub test_credit_note_with_skonto {
+
+  my $testname = 'test_credit_note_with_skonto';
+
+  my $payment_terms = create_payment_terms(percent_skonto => 0.04, terms_skonto => 11);
+
+  my $part1 = new_part(   partnumber => 'T4255')->save;
+  my $credit_note = create_credit_note(
+    invnumber    => 'cn 2',
+    customer     => $customer,
+    transdate    => $dt,
+    taxincluded  => 0,
+    invoiceitems => [ create_invoice_item(part => $part1, qty => 1, sellprice => 710) ],
+    payment_id   => $payment_terms->id,
+  );
+  is($credit_note->amount ,'-844.9' ,"$testname: amount before booking ok");
+  is($credit_note->paid   ,'0'      ,"$testname: paid before booking ok");
+  my $bt = create_bank_transaction(
+    record        => $credit_note,
+    amount        => abs($credit_note->amount),
+    bank_chart_id => $bank->id,
+    transdate     => $dt_10,
+  );
   my ($agreement, $rule_matches) = $bt->get_agreement_with_invoice($credit_note);
   is($agreement, 14, "points for credit note ok");
   is($rule_matches, 'remote_account_number(3) exact_amount(4) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus14(2) ', "rules_matches for credit note ok");
@@ -730,6 +822,10 @@ sub test_credit_note {
     $bt->id => [ $credit_note->id ]
   };
 
+  $::form->{invoice_skontos} = {
+    $bt->id => [ 'with_skonto_pt' ]
+  };
+
   save_btcontroller_to_string();
 
   $credit_note->load;
@@ -737,6 +833,92 @@ sub test_credit_note {
   is($credit_note->amount   , '-844.90000', "$testname: amount ok");
   is($credit_note->netamount, '-710.00000', "$testname: netamount ok");
   is($credit_note->paid     , '-844.90000', "$testname: paid ok");
+  is($bt->invoice_amount    , '-811.10000', "$testname: bt invoice amount for credit note was assigned");
+  is($bt->amount            , '-844.90000', "$testname: bt  amount for credit note was assigned");
+
+  # Prüfe Soll- und Haben-Seite der USt-Korrekturbuchung
+  my $rl_skonto = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $credit_note->id, from_table => 'ar', to_table => 'gl' ]);
+  is (ref $rl_skonto->[0], 'SL::DB::RecordLink', "$testname record link skonto gl created");
+  my $acc_trans_skonto = SL::DB::Manager::AccTransaction->get_all(where => [trans_id => $rl_skonto->[0]->to_id]);
+  foreach my $entry (@{ $acc_trans_skonto }) {
+    if ($entry->chart_link =~ m/tax/) {
+      is($entry->amount, '5.40000');
+    } elsif ($entry->chart_link =~ m/AR_paid/) {
+      is($entry->amount, '-5.40000');
+    } else {
+      fail("invalid chart link state");
+    }
+  }
+}
+
+
+sub test_neg_ap_transaction_skonto {
+  my (%params) = @_;
+  my $testname = 'test_neg_ap_transaction invoice with skonto';
+  my $netamount = -840.34;
+  my $amount    = $::form->round_amount($netamount * 1.19, 2);
+  my $payment_skonto = create_payment_terms(percent_skonto => 0.04, terms_skonto => 11);
+  my $invoice   = SL::DB::PurchaseInvoice->new(
+    invoice      => 1,
+    invnumber    => 'test_neg_ap_transaction_with_negative_skonto',
+    amount       => $amount,
+    netamount    => $netamount,
+    transdate    => $dt,
+    taxincluded  => 0,
+    vendor_id    => $vendor->id,
+    taxzone_id   => $vendor->taxzone_id,
+    currency_id  => $currency_id,
+    transactions => [],
+    notes        => 'test_neg_ap_transaction_with_skonto',
+    payment_id   => $payment_skonto->id,
+  );
+  $invoice->add_ap_amount_row(
+    amount     => $invoice->netamount,
+    chart      => $ap_amount_chart,
+    tax_id     => $tax_9->id,
+  );
+
+  $invoice->create_ap_row(chart => $ap_chart);
+  $invoice->save;
+
+  is($invoice->amount, -1000, "$testname: amount ok");
+
+  my $bt            = create_bank_transaction(record        => $invoice,
+                                              amount        => 960,
+                                              bank_chart_id => $bank->id,
+                                              transdate     => $dt_10,
+                                                               );
+  $::form->{invoice_skontos} = {
+    $bt->id => [ 'with_skonto_pt' ]
+  };
+
+  is($bt->amount, 960, "$testname: bt  amount for ap was assigned");
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $invoice->id ]
+  };
+
+  my $ret = save_btcontroller_to_string();
+  $invoice->load;
+  $bt->load;
+  is($invoice->amount   , '-1000.00000', "$testname: amount ok");
+  is($invoice->netamount, '-840.34000', "$testname: netamount ok");
+  is($invoice->paid     , '-1000.00000', "$testname: paid ok");
+  is($bt->invoice_amount, '960.00000', "$testname: bt invoice amount for ap was assigned");
+  is($bt->amount,         '960.00000', "$testname: bt  amount for ap was assigned");
+
+  my $rl_skonto = SL::DB::Manager::RecordLink->get_all(where => [ from_id => $invoice->id, from_table => 'ap', to_table => 'gl' ]);
+  is (ref $rl_skonto->[0], 'SL::DB::RecordLink', "$testname record link skonto gl created");
+  my $acc_trans_skonto = SL::DB::Manager::AccTransaction->get_all(where => [trans_id => $rl_skonto->[0]->to_id]);
+  foreach my $entry (@{ $acc_trans_skonto }) {
+    if ($entry->chart_link =~ m/tax/) {
+      is($entry->amount, '-6.39000');
+    } elsif ($entry->chart_link =~ m/AP_paid/) {
+      is($entry->amount, '6.39000');
+    } else {
+      fail("invalid chart link state");
+    }
+  }
 }
 
 sub test_neg_ap_transaction {
@@ -770,7 +952,7 @@ sub test_neg_ap_transaction {
   is($invoice->amount   , -23.8, "$testname: amount ok");
 
   my $bt            = create_bank_transaction(record        => $invoice,
-                                              amount        => $invoice->amount,
+                                              amount        => abs($invoice->amount),
                                               bank_chart_id => $bank->id,
                                               transdate     => $dt_10,
                                                                );
@@ -853,7 +1035,7 @@ sub test_two_neg_ap_transaction {
 
 
   my $bt            = create_bank_transaction(record        => $invoice_two,
-                                              amount        => $invoice_two->amount + $invoice->amount,
+                                              amount        => abs($invoice_two->amount + $invoice->amount),
                                               bank_chart_id => $bank->id,
                                               transdate     => $dt_10,
                                                                );
@@ -1043,6 +1225,84 @@ sub test_neg_sales_invoice {
   is($bt->amount              , '-345.10000', "$testname: bt amount ok");
   is($bt->invoice_amount      , '-345.10000', "$testname: bt invoice_amount ok");
 }
+sub test_fuzzy_skonto_pt {
+
+  my $testname = 'test_fuzzy_skonto_pt';
+
+  $ar_transaction = test_ar_transaction(invnumber => 'salesinv fuzzy skonto',
+                                        payment_id => $payment_terms->id,
+                                       );
+  my $fuzzy_amount_within_threshold = $ar_transaction->amount_less_skonto - 0.57;
+  my $bt = create_bank_transaction(record        => $ar_transaction,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => $fuzzy_amount_within_threshold,
+                                  ) or die "Couldn't create bank_transaction";
+
+  my ($agreement1, $rule_matches1) = $bt->get_agreement_with_invoice($ar_transaction);
+  is($agreement1, 14, "bt1 14 points for ar_transaction_1 in $testname ok");
+  is($rule_matches1,
+     "remote_account_number(3) skonto_fuzzy_amount(3) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
+     "$testname: rule_matches ok");
+  my $skonto_type;
+  $skonto_type = 'with_fuzzy_skonto_pt' if $rule_matches1 =~ m/skonto_fuzzy_amount/;
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ar_transaction->id ]
+  };
+  $::form->{invoice_skontos} = {
+    $bt->id => [ $skonto_type ]
+  };
+
+  save_btcontroller_to_string();
+
+  $ar_transaction->load;
+  $bt->load;
+  is($ar_transaction->paid   , '119.00000' , "$testname: salesinv skonto was paid");
+  is($ar_transaction->closed , 1           , "$testname: salesinv skonto is closed");
+  is($bt->invoice_amount     , '112.48000' , "$testname: bt invoice amount was assigned");
+
+}
+
+sub test_fuzzy_skonto_pt_not_in_range {
+
+  my $testname = 'test_fuzzy_skonto_pt_not_in_range';
+
+  $ar_transaction = test_ar_transaction(invnumber => 'salesinv fuzzy skonto not in range',
+                                        payment_id => $payment_terms->id,
+                                       );
+  my $fuzzy_amount_within_threshold = $ar_transaction->amount_less_skonto - 0.7;
+  my $bt = create_bank_transaction(record        => $ar_transaction,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => $fuzzy_amount_within_threshold,
+                                  ) or die "Couldn't create bank_transaction";
+
+  my ($agreement1, $rule_matches1) = $bt->get_agreement_with_invoice($ar_transaction);
+  is($agreement1, 11, "bt1 14 points for ar_transaction_1 in $testname ok");
+  is($rule_matches1,
+     "remote_account_number(3) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) ",
+     "$testname: rule_matches ok");
+  my $skonto_type;
+  $skonto_type = 'with_fuzzy_skonto_pt' if $rule_matches1 =~ m/skonto_fuzzy_amount/;
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ar_transaction->id ]
+  };
+  $::form->{invoice_skontos} = {
+    $bt->id => [ $skonto_type ]
+  };
+
+  save_btcontroller_to_string();
+
+  $ar_transaction->load;
+  $bt->load;
+  is($ar_transaction->paid   , '112.35000' , "$testname: salesinv skonto was not paid");
+  is($ar_transaction->closed , ''          , "$testname: salesinv skonto is not closed");
+  is($bt->invoice_amount     , '112.35000' , "$testname: bt invoice amount was assigned");
+
+}
+
 
 sub test_bt_rule1 {
 
@@ -1118,6 +1378,57 @@ sub test_sepa_export {
      "remote_account_number(3) exact_amount(4) own_invoice_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) sepa_export_item(5) ",
      "$testname: rule_matches ok");
 };
+sub test_sepa_export_endtoend {
+
+  my $testname = 'test_sepa_export_endtoend';
+
+  $ar_transaction = test_ar_transaction(invnumber => 'sepa1', transdate => $dt);
+
+  my $bt  = create_bank_transaction(record => $ar_transaction, transdate => $dt,
+                                    end_to_end_id => "KIVITENDO202412101212"     )
+    or die "Couldn't create bank_transaction";
+
+  my $se  = create_sepa_export();
+  my $sei = create_sepa_export_item(
+    chart_id       => $bank->id,
+    ar_id          => $ar_transaction->id,
+    sepa_export_id => $se->id,
+    end_to_end_id  => "KIVITENDO202412101212",
+    vc_iban        => $customer->iban,
+    vc_bic         => $customer->bic,
+    vc_mandator_id => $customer->mandator_id,
+    vc_depositor   => $customer->depositor,
+    amount         => $ar_transaction->amount,
+  );
+  require SL::SEPA::XML;
+  my $sepa_xml   = SL::SEPA::XML->new('company'     => $customer->name,
+                                      'creditor_id' => "id",
+                                      'src_charset' => 'UTF-8',
+                                      'message_id'  => "test",
+                                      'grouped'     => 1,
+                                      'collection'  => 1,
+                                     );
+  is($sepa_xml->{company}    , 'Test Customer OLE S.L. Ardbaerg AB');
+
+  $ar_transaction->load;
+  $bt->load;
+  $sei->load;
+  is($ar_transaction->paid   , '0.00000' , "$testname: sepa1 not paid");
+  is($bt->invoice_amount     , '0.00000' , "$testname: bt invoice amount was not assigned");
+  is($bt->amount             , '119.00000' , "$testname: bt amount ok");
+  is($sei->amount            , '119.00000' , "$testname: sepa export amount ok");
+
+  my $bt_controller = SL::Controller::BankTransaction->new;
+  my ( $bt_transactions, $proposals ) = $bt_controller->gather_bank_transactions_and_proposals(bank_account => $bank_account);
+
+  is(scalar(@$bt_transactions)         , 1  , "$testname: one bank_transaction");
+  is($bt_transactions->[0]->{agreement}, 33 , "$testname: agreement == 33");
+  my $match = join ( ' ',@{$bt_transactions->[0]->{rule_matches}});
+  is($match,
+     "remote_account_number(3) exact_amount(4) own_invoice_in_purpose(5) depositor_matches(2) remote_name(2) payment_within_30_days(1) datebonus0(3) end_to_end_id(8) sepa_export_item(5) ",
+     "$testname: rule_matches ok");
+}
+
 
 sub test_two_banktransactions {
 
@@ -1270,5 +1581,769 @@ sub test_skonto_exact_ap_transaction {
   is($bt->invoice_amount     , '113.05000' , "$testname: bt invoice amount was assigned");
 
 };
+sub ap_transaction_fx_gain_fees {
+
+  my $testname     = 'ap_transaction_fx_gain_fees';
+  my $usd_amount   = 83300;
+  my $fx_rate      = 2;
+  my $fx_rate_bank = 1.75;
+  my $eur_amount   = $usd_amount * $fx_rate;
+
+  my $ap_transaction_fx = create_ap_fx_transaction (invnumber   => 'ap transaction fx amount',
+                                                    payment_id  => $payment_terms->id,
+                                                    fx_rate     => $fx_rate,
+                                                    netamount   => $eur_amount,
+                                                    invoice_set => 1,
+                                                    buysell     => 'sell',
+                                                   );
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'     , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 145949.93,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+#          'exchangerates' => [
+#                               '1.75'
+#                             ],
+#          'book_fx_bank_fees' => [
+#                                   '1'
+#                                 ],
+# book_fx_bank_fees   => [  map { $::form->{"book_fx_bank_fees_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "1,75"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  my $ret = save_btcontroller_to_string();
+  $ap_transaction_fx->load;
+  $bt->load;
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       5, "$testname 5 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 2, 'Two GL acc_trans bookings');
+
+  my $gl = SL::DB::Manager::GLTransaction->get_first(where => [ id => $gl_fee_booking->[0]->gl_id ]);
+  is (abs($gl->transactions->[0]->amount), '174.93', 'fee abs amount correct');
+
+  my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,   '20825.00000', "$testname: fx gain amount ok");
+
+
+  is($ap_transaction_fx->paid   , '166600.00000' , "$testname: ap transaction skonto was paid");
+  is($bt->invoice_amount        , '-145949.93000'   , "$testname: bt invoice amount was assigned");
+
+}
+sub ap_transaction_fx_gain_fees_two_payments {
+
+  my $testname     = 'ap_transaction_fx_gain_fees_two_payments';
+  my $usd_amount   = 11901.19;
+  my $fx_rate      = 2;
+  my $fx_rate_bank = 1.75;
+  my $eur_amount   = $usd_amount * $fx_rate;
+  my $ap_transaction_fx = create_ap_fx_transaction (invnumber   => 'ap transaction fx amount',
+                                                    payment_id  => $payment_terms->id,
+                                                    fx_rate     => $fx_rate,
+                                                    netamount   => $eur_amount,
+                                                    invoice_set => 0,
+                                                    buysell     => 'sell',
+                                                   );
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'     , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  is($ap_transaction_fx->amount           , 23802.38  , "$testname: record amount");
+  is($ap_transaction_fx->paid             , 0         , "$testname: record amount");
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 18698.25,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount        , '-18698.25'   , "$testname: bt amount ok");
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "1,75"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  my $ret = save_btcontroller_to_string();
+  $ap_transaction_fx->load;
+  $bt->load;
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 3 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,   '2671.18000', "$testname: fx gain amount ok");
+
+  is($ap_transaction_fx->paid, '21369.43000'    , "$testname: ap transaction fx two payment was paid");
+  is($bt->invoice_amount     , '-18698.25000'   , "$testname: bt invoice amount was assigned");
+
+  my $bt2 = create_bank_transaction(record        => $ap_transaction_fx,
+                                    bank_chart_id => $bank->id,
+                                    transdate     => $dt,
+                                    valutadate    => $dt,
+                                    amount        => 1264.20,
+                                    exchangerate  => 0.1,
+                                   ) or die "Couldn't create bank_transaction";
+
+  is($bt2->amount        , '-1264.2'   , "$testname: bt amount ok");
+
+  $::form->{invoice_ids} = {
+    $bt2->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt2->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt2->id . "_" . $ap_transaction_fx->id}  = "0,1"; # will be parsed
+  $::form->{"currency_id_"       . $bt2->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  $ret = save_btcontroller_to_string();
+
+  $ap_transaction_fx->load;
+  $bt2->load;
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  is($ap_transaction_fx->paid             , $ap_transaction_fx->amount , "$testname: paid equals amount");
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt2->id ] )},
+       5, "$testname 5 acc_trans entries created");
+
+  my $gl_fee_booking2 = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt2->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking2 }, 2, 'Two GL acc_trans bookings');
+
+  my $gl = SL::DB::Manager::GLTransaction->get_first(where => [ id => $gl_fee_booking2->[0]->gl_id ]);
+  is (abs($gl->transactions->[0]->amount), 1142.55, 'fee2 abs amount correct');
+
+  $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,   '2671.18000' ,"$testname: fx gain 1 amount ok");
+  is($fx_gain_transactions->[1]->amount,   '2311.30000' ,"$testname: fx gain 2 amount ok");
+
+
+  is($ap_transaction_fx->paid   , $ap_transaction_fx->amount, "$testname: paid equals amount");
+  is($bt2->invoice_amount       , '-1264.20000'             , "$testname: bt invoice amount was assigned");
+
+  # unlink bank transaction bt2 and reassign
+  $::form->{ids} = [ $bt2->id ];
+  my $bt_controller = SL::Controller::BankTransaction->new;
+  $bt_controller->action_unlink_bank_transaction('testcase' => 1);
+
+  $bt2->load;
+  $ap_transaction_fx->load;
+
+  # and check the cleared state of bt and the acc_transactions
+  is($bt2->cleared, '0' , "$testname: bt undo cleared");
+  is($bt2->invoice_amount, '0.00000' , "$testname: bt undo invoice amount");
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt2->id ] )},
+       0, "$testname 0 acc_trans entries there");
+
+  $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt2->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount, '2671.18000' , "$testname: fx gain amount ok");
+  is($ap_transaction_fx->paid          , '21369.43000', "$testname: ap transaction fx two payment was paid");
+
+
+}
+
+
+sub ap_transaction_fx_loss_fees {
+
+  my $testname     = 'ap_transaction_fx_loss_fees';
+  my $usd_amount   = 166600;
+  my $fx_rate      = 1.5;
+  my $fx_rate_bank = 3;
+  my $eur_amount   = $usd_amount * $fx_rate;
+  my $ap_transaction_fx = create_ap_fx_transaction (invnumber   => 'ap transaction fx amount',
+                                                    payment_id  => $payment_terms->id,
+                                                    fx_rate     => $fx_rate,
+                                                    netamount   => $eur_amount,
+                                                    invoice_set => 1,
+                                                    buysell     => 'sell',
+                                                   );
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'     , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '1.50000' , "$testname: fx rate record");
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 505797.60,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "3,00"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  my $ret = save_btcontroller_to_string();
+  $ap_transaction_fx->load;
+  $bt->load;
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       5, "$testname 2 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 2, 'One GL Booking');
+
+  my $gl = SL::DB::Manager::GLTransaction->get_first(where => [ id => $gl_fee_booking->[0]->gl_id ]);
+  is (abs($gl->transactions->[0]->amount), '5997.6', 'fee abs amount correct');
+
+  my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxloss_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_loss_transactions->[0]->amount,   '-249900.00000', "$testname: fx loss amount ok");
+
+
+  is($ap_transaction_fx->paid   , $ap_transaction_fx->amount , "$testname: paid equals amount");
+  is($ap_transaction_fx->paid   , '249900.00000'             , "$testname: ap transaction was paid");
+  is($bt->invoice_amount        , '-505797.60000'            , "$testname: bt invoice amount was assigned");
+
+}
+sub negative_ap_transaction_fx_gain_fees_error {
+
+  my $testname     = 'negative_ap_transaction_fx_gain_fees';
+  my $usd_amount   = -890.90;
+  my $fx_rate      = 0.545;
+  my $fx_rate_bank = 0.499;
+  my $eur_amount   = $usd_amount * $fx_rate;
+  my $ap_transaction_fx = create_ap_fx_transaction (invnumber   => 'ap transaction fx amount',
+                                                    payment_id  => $payment_terms->id,
+                                                    fx_rate     => $fx_rate,
+                                                    netamount   => $eur_amount,
+                                                    invoice_set => 0,
+                                                    buysell     => 'sell',
+                                                   );
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'       , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '0.54500'   , "$testname: fx rate record");
+  is($ap_transaction_fx->amount           , $eur_amount , "$testname: negative record amount");
+  is($ap_transaction_fx->invoice_type     , "purchase_credit_note" , "$testname: negative record amount");
+
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 4440,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '4440' , "$testname: positive bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "0,499"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+  my @bt_errors = @{ $bt_controller->problems };
+  is(substr($bt_errors[0]->{message},0,69), 'Bank Fees can only be added for AP transactions or Sales Credit Notes', "$testname: Fehlermeldung ok");
+  $bt->load;
+
+  is($bt->invoice_amount        , '0.00000'   , "$testname: bt invoice amount is not yet assigned");
+
+}
+sub negative_ap_transaction_fx_gain_fees {
+
+  my $testname     = 'negative_ap_transaction_fx_gain_fees';
+  my $usd_amount   = -890.90;
+  my $fx_rate      = 0.545;
+  my $fx_rate_bank = 0.499;
+  my $eur_amount   = $usd_amount * $fx_rate;
+  my $ap_transaction_fx = create_ap_fx_transaction (invnumber   => 'ap transaction fx amount',
+                                                    payment_id  => $payment_terms->id,
+                                                    fx_rate     => $fx_rate,
+                                                    netamount   => $eur_amount,
+                                                    invoice_set => 0,
+                                                    buysell     => 'sell',
+                                                   );
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'       , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '0.54500'   , "$testname: fx rate record");
+  is($ap_transaction_fx->amount           , $eur_amount , "$testname: negative record amount");
+  is($ap_transaction_fx->invoice_type     , "purchase_credit_note" , "$testname: negative record amount");
+
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 4440,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '4440' , "$testname: positive bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "0,499"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+
+  $ap_transaction_fx->load;
+  $bt->load;
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 5 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $ap_transaction_fx->id, chart_id => $fxloss_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_loss_transactions->[0]->amount,   '-40.98000', "$testname: fx loss amount ok");
+
+
+  is($ap_transaction_fx->paid   , '-485.54000' , "$testname: ap transaction skonto was paid");
+  is($bt->invoice_amount        , '444.56000'  , "$testname: bt invoice amount was assigned");
+
+}
+
+sub test_neg_sales_invoice_fx {
+
+  my $testname = 'test_neg_sales_invoice_fx';
+
+  my $part1 = new_part(   partnumber => 'Funkenhaube öhm')->save;
+  my $part2 = new_service(partnumber => 'Service-Pauschale Pasch!')->save;
+
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes(buy => 1.772);
+
+  my $neg_sales_inv = create_sales_invoice(
+    invnumber    => '20222201-USD',
+    customer     => $customer,
+    taxincluded  => 0,
+    currency_id  => $currency_usd->id,
+    transdate    => $dt,
+    invoiceitems => [ create_invoice_item(part => $part1, qty =>  3, sellprice => 70),
+                      create_invoice_item(part => $part2, qty => 10, sellprice => -50),
+                    ]
+  );
+  my $bt            = create_bank_transaction(record        => $neg_sales_inv,
+                                              amount        => $neg_sales_inv->amount,
+                                              bank_chart_id => $bank->id,
+                                              transdate     => $dt,
+                                              valutadate    => $dt,
+                                              exchangerate  => 2.11,
+                                             );
+
+  is($neg_sales_inv->amount   , '-611.52000', "$testname: amount ok");
+  is($neg_sales_inv->netamount, '-513.88000', "$testname: netamount ok");
+  is($neg_sales_inv->currency->name   , 'USD'     , "$testname: USD currency");
+  is($neg_sales_inv->get_exchangerate , '1.77200' , "$testname: fx rate record");
+  is($bt->exchangerate                , '2.11' , "$testname: bt fx rate record");
+
+  $::form->{invoice_ids} = {
+    $bt->id => [ $neg_sales_inv->id ]
+  };
+
+  save_btcontroller_to_string();
+
+  $neg_sales_inv->load;
+  $bt->load;
+  is($neg_sales_inv->paid     , '-611.52000', "$testname: paid ok");
+  is($bt->amount              , '-611.52000', "$testname: bt amount ok");
+  is($bt->invoice_amount      , '-611.52000', "$testname: bt invoice_amount ok");
+
+  my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $neg_sales_inv->id, chart_id => $fxloss_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_loss_transactions->[0]->amount,   '-116.64000', "$testname: fx loss amount ok");
+
+
+
+}
+sub test_negative_ar_transaction_fx_loss {
+  my (%params) = @_;
+  my $netamount = $::form->round_amount($params{amount}, 2) || 100 * 1.772 * -1;
+  my $amount    = $::form->round_amount($netamount * 1.19,2);
+  # set exchangerate
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes(buy => 1.772);
+
+  my $testname = 'test_negative_ar_transaction_fx_gain';
+
+  my $invoice   = SL::DB::Invoice->new(
+      invoice      => 0,
+      invnumber    => $params{invnumber} || undef, # let it use its own invnumber
+      amount       => $amount,
+      netamount    => $netamount,
+      transdate    => $dt,
+      taxincluded  => $params{taxincluded } || 0,
+      customer_id  => $customer->id,
+      taxzone_id   => $customer->taxzone_id,
+      currency_id  => $currency_usd->id,
+      transactions => [],
+      payment_id   => $params{payment_id} || undef,
+      notes        => 'test_ar_transaction',
+  );
+  $invoice->add_ar_amount_row(
+    amount => $invoice->netamount,
+    chart  => $ar_amount_chart,
+    tax_id => $params{tax_id} || $tax->id,
+  );
+
+  $invoice->create_ar_row(chart => $ar_chart);
+  $invoice->save;
+
+  is($invoice->currency_id , $currency_usd->id , 'currency_id has been saved');
+  is($invoice->netamount   , '-177.2'          , 'fx ar amount has been converted');
+  is($invoice->amount      , '-210.87'         , 'fx ar amount has been converted');
+  is($invoice->taxincluded , 0                 , 'fx ar transaction doesn\'t have taxincluded');
+
+  my $bt = create_bank_transaction(record        => $invoice,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => (119 + 178.38) * -1,
+                                   exchangerate  => 2.499,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '-297.38' , "$testname: negative bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $invoice->id ]
+  };
+  $::form->{"exchangerate_"      . $bt->id . "_" . $invoice->id}  = "2,499"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $invoice->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+
+  $invoice->load;
+  $bt->load;
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 3 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $fxloss_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_loss_transactions->[0]->amount,   '-86.51000', "$testname: fx gain amount ok");
+
+
+  is($invoice->paid       , '-210.87000' , "$testname: ar transaction was paid");
+  is($bt->invoice_amount  , '-297.38000' , "$testname: bt invoice amount was assigned");
+}
+
+sub test_ar_transaction_fx_partial_payment {
+  my (%params) = @_;
+  my $netamount = $::form->round_amount($params{amount}, 2) || 3674580*0.08613;
+  # set exchangerate
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes(buy => 0.08613);
+
+  my $testname = 'test_ar_transaction_fx_partial_payment';
+
+  my $invoice   = SL::DB::Invoice->new(
+      invoice      => 0,
+      invnumber    => $params{invnumber} || undef, # let it use its own invnumber
+      amount       => $netamount,
+      netamount    => $netamount,
+      transdate    => $dt,
+      taxincluded  => $params{taxincluded } || 0,
+      customer_id  => $customer->id,
+      taxzone_id   => $customer->taxzone_id,
+      currency_id  => $currency_usd->id,
+      transactions => [],
+      payment_id   => $params{payment_id} || undef,
+      notes        => 'test_ar_transaction_fx_partial_payment',
+  );
+  my $acno_8100 = SL::DB::Manager::Chart->find_by( accno => '8100' );
+  $invoice->add_ar_amount_row(
+    amount => $invoice->netamount,
+    chart  => $acno_8100, # Erlöse steuerfrei
+    tax_id => 0,
+  );
+  $invoice->create_ar_row(chart => $ar_chart);
+  $invoice->save;
+
+  is($invoice->currency_id , $currency_usd->id , 'currency_id has been saved');
+  is($invoice->netamount   , '316491.5754'           , 'fx ar amount has been converted');
+  is($invoice->taxincluded , 0                 , 'fx ar transaction doesn\'t have taxincluded');
+
+  my $bt = create_bank_transaction(record        => $invoice,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 315636.49,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '315636.49' , "$testname: positive bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $invoice->id ]
+  };
+  $::form->{"exchangerate_"      . $bt->id . "_" . $invoice->id}  = "0,08726"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $invoice->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+
+  $invoice->load;
+  $bt->load;
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 3 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,  '4087.43000', "$testname: fx gain amount ok");
+
+
+  is($invoice->paid       , '311549.06000' , "$testname: ar transaction was paid partially");
+  is($bt->invoice_amount  , '315636.49000' , "$testname: bt invoice amount was assigned");
+}
+
+sub test_ar_transaction_fx_gain {
+  my (%params) = @_;
+  my $netamount = $::form->round_amount($params{amount}, 2) || 100 * 1.772;
+  my $amount    = $::form->round_amount($netamount * 1.19,2);
+  # set exchangerate
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes(buy => 1.772);
+
+  my $testname = 'test_ar_transaction';
+
+  my $invoice   = SL::DB::Invoice->new(
+      invoice      => 0,
+      invnumber    => $params{invnumber} || undef, # let it use its own invnumber
+      amount       => $amount,
+      netamount    => $netamount,
+      transdate    => $dt,
+      taxincluded  => $params{taxincluded } || 0,
+      customer_id  => $customer->id,
+      taxzone_id   => $customer->taxzone_id,
+      currency_id  => $currency_usd->id,
+      transactions => [],
+      payment_id   => $params{payment_id} || undef,
+      notes        => 'test_ar_transaction',
+  );
+  $invoice->add_ar_amount_row(
+    amount => $invoice->netamount,
+    chart  => $ar_amount_chart,
+    tax_id => $params{tax_id} || $tax->id,
+  );
+
+  $invoice->create_ar_row(chart => $ar_chart);
+  $invoice->save;
+
+  is($invoice->currency_id , $currency_usd->id , 'currency_id has been saved');
+  is($invoice->netamount   , '177.2'           , 'fx ar amount has been converted');
+  is($invoice->amount      , '210.87'          , 'fx ar amount has been converted');
+  is($invoice->taxincluded , 0                 , 'fx ar transaction doesn\'t have taxincluded');
+
+  my $bt = create_bank_transaction(record        => $invoice,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 119 + 178.38,
+                                   exchangerate  => 2.499,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '297.38' , "$testname: positive bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $invoice->id ]
+  };
+  $::form->{"exchangerate_"      . $bt->id . "_" . $invoice->id}  = "2,499"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $invoice->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+
+  $invoice->load;
+  $bt->load;
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 3 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,   '86.51000', "$testname: fx gain amount ok");
+
+
+  is($invoice->paid       , '210.87000' , "$testname: ar transaction was paid");
+  is($bt->invoice_amount  , '297.38000' , "$testname: bt invoice amount was assigned");
+}
+
+sub test_ar_transaction_fx_loss {
+  my (%params) = @_;
+  my $netamount = $::form->round_amount($params{amount}, 2) || 100 * 1.772;
+  my $amount    = $::form->round_amount($netamount * 1.19,2);
+  # set exchangerate
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes(buy => 1.772);
+
+  my $testname = 'test_ar_transaction';
+
+  my $invoice   = SL::DB::Invoice->new(
+      invoice      => 0,
+      invnumber    => $params{invnumber} || undef, # let it use its own invnumber
+      amount       => $amount,
+      netamount    => $netamount,
+      transdate    => $dt,
+      taxincluded  => $params{taxincluded } || 0,
+      customer_id  => $customer->id,
+      taxzone_id   => $customer->taxzone_id,
+      currency_id  => $currency_usd->id,
+      transactions => [],
+      payment_id   => $params{payment_id} || undef,
+      notes        => 'test_ar_transaction',
+  );
+  $invoice->add_ar_amount_row(
+    amount => $invoice->netamount,
+    chart  => $ar_amount_chart,
+    tax_id => $params{tax_id} || $tax->id,
+  );
+
+  $invoice->create_ar_row(chart => $ar_chart);
+  $invoice->save;
+
+  is($invoice->currency_id , $currency_usd->id , 'currency_id has been saved');
+  is($invoice->netamount   , '177.2'           , 'fx ar amount has been converted');
+  is($invoice->amount      , '210.87'          , 'fx ar amount has been converted');
+  is($invoice->taxincluded , 0                 , 'fx ar transaction doesn\'t have taxincluded');
+
+  my $bt = create_bank_transaction(record        => $invoice,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => 210.87,
+                                   exchangerate  => 1.499,
+                                  ) or die "Couldn't create bank_transaction";
+
+  is($bt->amount           , '210.87' , "$testname: positive bt amount");
+  $::form->{invoice_ids} = {
+    $bt->id => [ $invoice->id ]
+  };
+  $::form->{"exchangerate_"      . $bt->id . "_" . $invoice->id}  = "1,499"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $invoice->id}  = $currency_usd->id;
+
+
+  save_btcontroller_to_string();
+
+  $invoice->load;
+  $bt->load;
+
+  is(scalar @{ SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id ] )},
+       3, "$testname 3 acc_trans entries created");
+
+  my $gl_fee_booking = SL::DB::Manager::BankTransactionAccTrans->get_all(where => [bank_transaction_id => $bt->id, '!gl_id' => undef ] );
+  is(scalar @{ $gl_fee_booking }, 0, 'Zero GL acc_trans bookings');
+
+  my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $fxloss_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_loss_transactions->[0]->amount,   '-32.49000', "$testname: fx loss amount ok");
+
+
+  is($invoice->paid       , '210.87000' , "$testname: ar transaction was paid");
+  is($bt->invoice_amount  , '178.38000' , "$testname: bt invoice amount was assigned");
+}
+
+sub create_ap_fx_transaction {
+  my (%params) = @_;
+
+  my $netamount     = $params{netamount};
+  my $amount        = $params{netamount};
+  my $invoice_set   = $params{invoice};
+  my $fx_rate       = $params{fx_rate};
+  my $buysell       = $params{buysell};
+
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $currency_usd->id,
+                                                  transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $currency_usd->id,
+                                                  transdate   => $dt);
+  $ex->update_attributes($buysell => $fx_rate);
+
+  my $invoice   = SL::DB::PurchaseInvoice->new(
+    invoice      => $invoice_set,
+    invnumber    => $params{invnumber} || '27ab',
+    amount       => $amount,
+    netamount    => $netamount,
+    transdate    => $dt,
+    taxincluded  => 0,
+    vendor_id    => $vendor->id,
+    taxzone_id   => $vendor->taxzone_id,
+    currency_id  => $currency_usd->id,
+    transactions => [],
+    notes        => 'ap_transaction_fx',
+  );
+  $invoice->add_ap_amount_row(
+    amount     => $netamount,
+    chart      => $ap_amount_chart,
+    tax_id     => 0,
+  );
+
+  $invoice->create_ap_row(chart => $ap_chart);
+  $invoice->save;
+  return $invoice;
+}
 
 1;
diff --git a/t/controllers/csvimport/aptransactions.t b/t/controllers/csvimport/aptransactions.t
new file mode 100644
index 000000000..ebb82cb77
--- /dev/null
+++ b/t/controllers/csvimport/aptransactions.t
@@ -0,0 +1,740 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+
+use Carp;
+use Support::TestSetup;
+use Test::Exception;
+
+use SL::Dev::ALL qw(:ALL);
+
+use SL::Controller::CsvImport;
+
+use_ok 'SL::Controller::CsvImport::APTransaction';
+
+use SL::DB::AccTransaction;
+use SL::DB::Buchungsgruppe;
+use SL::DB::Chart;
+use SL::DB::Currency;
+use SL::DB::Employee;
+use SL::DB::Invoice;
+use SL::DB::TaxZone;
+use SL::DB::Vendor;
+
+my ($vendor, $currency_id, $employee, $taxzone, $project, $department);
+my ($transdate, $transdate_string);
+
+sub clear_up {
+  SL::DB::Manager::AccTransaction->delete_all (all => 1);
+  SL::DB::Manager::PurchaseInvoice->delete_all(all => 1);
+  SL::DB::Manager::Vendor->delete_all         (all => 1);
+  SL::DB::Manager::Project->delete_all        (all => 1);
+  SL::DB::Manager::Department->delete_all     (all => 1);
+};
+
+sub reset_state {
+  # Create test data
+  my %params = @_;
+
+  $transdate = DateTime->today_local;
+  $transdate->set_year(2019) if $transdate->year == 2020; # hardcode for 2019 in 2020, because of tax rate change in Germany
+  $transdate_string = $transdate->to_kivitendo;
+
+  $params{$_} ||= {} for qw(buchungsgruppe vendor tax);
+
+  clear_up();
+  $employee    = SL::DB::Manager::Employee->current                          || croak "No employee";
+  $taxzone     = SL::DB::Manager::TaxZone->find_by( description => 'Inland') || croak "No taxzone";
+  $currency_id = $::instance_conf->get_currency_id;
+
+  $vendor      = new_vendor(
+    currency_id => $currency_id,
+    taxzone_id  => $taxzone->id,
+    %{ $params{vendor} },
+  )->save;
+
+  $project     = SL::DB::Project->new(
+    projectnumber  => 'P1',
+    description    => 'Project X',
+    project_type   => SL::DB::Manager::ProjectType->find_by(description => 'Standard'),
+    project_status => SL::DB::Manager::ProjectStatus->find_by(name => 'running'),
+  )->save;
+
+  $department  = SL::DB::Department->new(
+    description => 'Department 1',
+  )->save;
+}
+
+Support::TestSetup::login();
+
+reset_state(vendor => {vendornumber => 2});
+
+#####
+sub test_import {
+  my $file = shift;
+
+  my $controller = SL::Controller::CsvImport->new(
+    type => 'ap_transactions'
+  );
+  $controller->load_default_profile;
+  $controller->profile->set(
+    charset      => 'utf-8',
+    sep_char     => ',',
+    quote_char   => '"',
+    numberformat => $::myconfig{numberformat},
+    duplicates   => 'check_db',
+    duplicates_vendor_and_invnumber => 1,
+  );
+
+  my $csv_aptransactions_import = SL::Controller::CsvImport::APTransaction->new(
+    settings    => {'ap_column'          => 'Rechnung',
+                    'transaction_column' => 'AccTransaction',
+                    'max_amount_diff'    => 0.02
+                  },
+    controller => $controller,
+    file       => $file,
+  );
+
+  $csv_aptransactions_import->run(test => 0);
+
+  # don't try and save objects that have errors
+  $csv_aptransactions_import->save_objects unless scalar @{$csv_aptransactions_import->controller->data->[0]->{errors}};
+
+ return $csv_aptransactions_import->controller->data;
+}
+
+##### manually create an ap transaction from scratch, testing the methods
+$::myconfig{numberformat} = '1000.00';
+$::myconfig{dateformat}   = 'dd.mm.yyyy';
+my $old_locale = $::locale;
+# set locale to en so we can match errors
+$::locale = Locale->new('en');
+
+my $amount = 10;
+
+my $ap = SL::DB::PurchaseInvoice->new(
+  invoice      => 0,
+  invnumber    => 'manual invoice',
+  taxzone_id   => $taxzone->id,
+  currency_id  => $currency_id,
+  taxincluded  => 'f',
+  vendor_id    => $vendor->id,
+  transdate    => $transdate,
+  employee_id  => SL::DB::Manager::Employee->current->id,
+  transactions => [],
+);
+
+my $tax9 = SL::DB::Manager::Tax->find_by(rate => 0.19, taxkey => 9) || die "can't find tax with taxkey 9";
+my $income_chart = SL::DB::Manager::Chart->find_by(accno => '3400') || die "can't find expense chart";
+
+$ap->add_ap_amount_row(
+  amount => $amount,
+  chart  => $income_chart,
+  tax_id => $tax9->id,
+);
+
+$ap->recalculate_amounts; # set amount and netamount from transactions
+is $ap->amount, '10', 'amount of manual invoice is 10';
+is $ap->netamount, '8.4', 'netamount of manual invoice is 10';
+
+$ap->create_ap_row( chart => SL::DB::Manager::Chart->find_by(accno => '1600', link => 'AP') );
+my $result = $ap->validate_acc_trans();
+is $result, 1, 'manual $ap validates';
+
+$ap->save;
+is ${ $ap->transactions }[0]->chart->accno, '3400', 'assigned expense chart after save ok';
+is ${ $ap->transactions }[2]->chart->accno, '1600', 'assigned payable chart after save ok';
+is scalar @{$ap->transactions}, 3, 'manual invoice has 3 acc_trans entries';
+
+$ap->pay_invoice(  chart_id      => SL::DB::Manager::Chart->find_by(accno => '1200')->id, # bank
+                   amount        => $ap->open_amount,
+                   transdate     => $transdate,
+                   payment_type  => 'without_skonto',  # default if not specified
+                  );
+$result = $ap->validate_acc_trans();
+is $result, 1, 'manual invoice validates after payment';
+
+#####
+reset_state(vendor => {vendornumber => 2});
+
+my ($entries, $entry, $file);
+my $saved_invoices = 0;
+
+# starting test of csv imports
+# to debug errors in certain tests, run after test_import:
+#   $::lxdebug->dump(0, "entry 0 errors: ", $entry->{errors}->[0]);
+##### basic test
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 1",f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'basic test: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'basic test: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'basic test: acc_trans validates';
+is $entry->{object}->invnumber, 'invoice 1', 'basic test: invnumber ok';
+is $entry->{object}->vendor_id, $vendor->id, 'basic test: vendor_id ok';
+is scalar @{$entry->{object}->transactions}, 3, 'basic test: invoice 1 has 3 acc_trans entries';
+is $::form->round_amount($entry->{object}->transactions->[0]->amount, 2), -159.48, 'basic test: invoice 1 ap amount is -159.48';
+is $entry->{object}->direct_debit, '0', 'basic test: no direct debit';
+is $entry->{object}->taxincluded, '0', 'basic test: taxincluded is false';
+is $entry->{object}->amount, '189.78', 'basic test: ap amount tax not included is 189.78';
+is $entry->{object}->netamount, '159.48', 'basic test: ap netamount tax not included is 159.48';
+
+$saved_invoices++;
+
+##### test for duplicate invnumber for same vendor
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 1",f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+$entry = $entries->[0];
+is $entry->{errors}->[0], 'Duplicate in database', 'detects duplicate invnumer for same vendor';
+
+##### test for duplicate invnumber for different vendor
+my $different_vendor = new_vendor(
+  name         => 'anderer Testlieferant',
+  currency_id  => $currency_id,
+  taxzone_id   => $taxzone->id,
+  vendornumber => 777,
+)->save;
+
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",777,1,"invoice 1",f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'duplicate invnumber, different vendor: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'duplicate invnumber, different vendor: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->invnumber, 'invoice 1',           'duplicate invnumber, different vendor: invnumber ok';
+is $entry->{object}->vendor_id, $different_vendor->id, 'duplicate invnumber, different vendor: vendor_id ok';
+
+$saved_invoices++;
+
+##### test for no invnumber given
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+$entry = $entries->[0];
+$entry->{object}->validate_acc_trans;
+is $entry->{errors}->[0], 'Error: Invoice Number missing', 'detects missing invnubmer';
+
+
+##### basic test without amounts in Rechnung, only specified in AccTransaction
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 1 no amounts",f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'basic test no amounts: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'basic test no amounts: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'basic test no amounts: acc_trans validates';
+is $entry->{object}->invnumber, 'invoice 1 no amounts', 'basic test no amounts: invnumber ok';
+is $entry->{object}->vendor_id, $vendor->id, 'basic test no amounts: vendor_id ok';
+is scalar @{$entry->{object}->transactions}, 3, 'basic test no amounts: invoice 1 has 3 acc_trans entries';
+is $::form->round_amount($entry->{object}->amount, 2), '189.78', 'basic test no amounts: not taxincluded ap amount';
+is $::form->round_amount($entry->{object}->transactions->[0]->amount, 2), '-159.48', 'basic test no amounts: not taxincluded acc_trans netamount';
+is $::form->round_amount($entry->{object}->netamount, 2), 159.48, 'basic test no amounts: invoice 1 ap netamount is 159.48';
+
+$saved_invoices++;
+
+##### basic test: credit_note
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"credit note",f,1600,"$transdate_string"
+"AccTransaction",3400,-159.48,9
+EOL
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'basic test: credit_note: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'basic test: credit_note: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'basic test: credit_note: acc_trans validates';
+is $entry->{object}->invnumber, 'credit note', 'basic test: credit_note: invnumber ok';
+is scalar @{$entry->{object}->transactions}, 3, 'basic test: credit_note: credit note has 3 acc_trans entries';
+is $::form->round_amount($entry->{object}->amount, 2), '-189.78', 'basic test: credit_note: taxincluded ap amount';
+is $::form->round_amount($entry->{object}->netamount, 2), '-159.48', 'basic test: credit_note: taxincluded ap net amount';
+is $::form->round_amount($entry->{object}->transactions->[0]->amount, 2), 159.48, 'credit note ap amount is 159.48';
+
+$saved_invoices++;
+
+#### verify_amount differs: max_amount_diff = 0.02, 189.80 is ok, 189.81 is not
+$file = \<<"EOL";
+datatype,vendornumber,verify_amount,verify_netamount,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,189.81,159.48,1,"invoice amounts differing",f,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+$entries = test_import($file);
+
+$entry = $entries->[0];
+is $entry->{errors}->[0], 'Amounts differ too much', 'detects verify_amount differences';
+
+#####  direct debit
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,direct_debit,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice with direct debit",f,t,1600,"$transdate_string"
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'direct debit: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'direct debit: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'direct debit: acc_trans validates';
+is $entry->{object}->direct_debit, '1', 'direct debit';
+
+$saved_invoices++;
+
+#### tax included
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 1 tax included no amounts",t,1600,"$transdate_string"
+"AccTransaction",3400,189.78,9
+EOL
+
+$entries = test_import($file);
+$entry = $entries->[0];
+
+is $entry->{errors}->[0], undef, 'tax included: no errors in ap row';
+is $entry->{errors}->[1], undef, 'tax included: no errors in acc_trans row';
+
+is $entry->{object}->validate_acc_trans, 1, 'tax included: acc_trans validates';
+
+is $entry->{object}->taxincluded, '1', 'tax included: taxincluded is true';
+is $::form->round_amount($entry->{object}->amount, 2), '189.78', 'tax included: ap amount';
+is $::form->round_amount($entry->{object}->netamount, 2), '159.48', 'tax included: ap net amount';
+is $::form->round_amount($entry->{object}->transactions->[0]->amount, 2), '-159.48', 'tax included: acc_trans netamount';
+
+$saved_invoices++;
+
+#### multiple tax included
+$file = \<<"EOL";
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice multiple tax included",t,1600,"$transdate_string"
+"AccTransaction",3400,94.89,9
+"AccTransaction",3400,94.89,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'multiple tax included: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'multiple tax included: no errors in 1. acc_trans row';
+is $entries->[2]->{errors}->[0], undef, 'multiple tax included: no errors in 2. acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'multiple tax included: acc_trans validates';
+
+is $::form->round_amount($entry->{object}->amount, 2),    '189.78', 'multiple tax included: ap amount';
+is $::form->round_amount($entry->{object}->netamount, 2), '159.48', 'multiple tax included: ap netamount';
+is $::form->round_amount($entry->{object}->transactions->[0]->amount, 2), '-79.74', 'multiple tax included: amount';
+is $::form->round_amount($entry->{object}->transactions->[1]->amount, 2), '-15.15', 'multiple tax included: tax';
+
+$saved_invoices++;
+
+# different payable chart
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice mit apchart 1605",f,1605
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'different payable chart: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'different payable chart: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'different payable chart: acc_trans validates';
+is $entry->{object}->transactions->[2]->chart->accno, '1605', 'different payable chart: apchart set to 1605';
+
+$saved_invoices++;
+
+# missing vendor
+$file = \<<EOL;
+datatype,currency_id,invnumber,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung",1,"invoice missing vendor",f,1600
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+$entry = $entries->[0];
+is $entry->{errors}->[0], 'Error: Vendor missing', 'detects missing vendor';
+
+##### vendor by name
+$file = \<<EOL;
+datatype,vendor,currency_id,invnumber,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung","Testlieferant",1,"invoice vendor name",f,1600
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'vendor by name: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'vendor by name: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'vendor by name: acc_trans validates';
+is $entry->{object}->vendor->name, "Testlieferant", 'detects vendor by name';
+
+$saved_invoices++;
+
+##### detect missing chart
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,apchart
+datatype,amount,taxkey
+"Rechnung",1,"invoice missing chart","Testlieferant",1600
+"AccTransaction",4,9
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[1];
+is $entry->{errors}->[0], 'Error: chart missing', 'detects missing chart (chart_id or accno)';
+
+##### detect illegal chart by accno
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,apchart
+datatype,accno,amount,taxkey
+"Rechnung",1,"invoice illegal chart accno","Testlieferant",1600
+"AccTransaction",9999,4,9
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[1];
+is $entry->{errors}->[0], 'Error: invalid chart (accno)', 'detects invalid chart (chart_id or accno)';
+
+# ##### detect illegal apchart
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung",1,"invoice illegal apchart","Testlieferant",f,11600
+"AccTransaction",3400,159.48,9
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[0];
+is $entry->{errors}->[0], "Error: can't find ap chart with accno 11600", 'detects illegal payable chart (apchart)';
+
+##### detect chart by id
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,taxincluded,apchart
+datatype,amount,chart_id,taxkey
+"Rechnung",1,"invoice chart_id","Testlieferant",f,1600
+"AccTransaction",159.48,37,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'detect chart by id: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'detect chart by id: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'detect chart by id: acc_trans validates';
+
+$entry = $entries->[1]; # acc_trans entry is at entry array pos 1
+is $entry->{object}->chart->id, "37", 'detects chart by id';
+
+$saved_invoices++;
+
+##### detect chart by accno
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,taxincluded,apchart
+datatype,amount,accno,taxkey
+"Rechnung",1,"invoice by chart accno","Testlieferant",f,1600
+"AccTransaction",159.48,3400,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'detect chart by accno: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'detect chart by accno: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'detect chart by accno: acc_trans validates';
+
+$entry = $entries->[1];
+is $entry->{object}->chart->accno, "3400", 'detects chart by accno';
+
+$saved_invoices++;
+
+##### detect chart isn't an ap_chart
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,taxincluded,apchart
+datatype,amount,accno,taxkey
+"Rechnung",1,"invoice by chart accno","Testlieferant",f,1600
+"AccTransaction",159.48,1600,9
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[1];
+is $entry->{errors}->[0], 'Error: chart isn\'t an ap_amount chart', 'detects valid chart that is not an ap_amount chart';
+
+# missing taxkey
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,apchart
+datatype,amount,accno
+"Rechnung",1,"invoice missing taxkey chart accno","Testlieferant",1600
+"AccTransaction",159.48,3400
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[1];
+is $entry->{errors}->[0], 'Error: taxkey missing', 'detects missing taxkey (DATEV Steuerschlüssel)';
+
+# illegal taxkey
+$file = \<<EOL;
+datatype,currency_id,invnumber,vendor,apchart
+datatype,amount,accno,taxkey
+"Rechnung",1,"invoice illegal taxkey","Testlieferant",1600
+"AccTransaction",4,3400,123
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[1];
+is $entry->{errors}->[0], 'Error: invalid taxkey', 'detects invalid taxkey (DATEV Steuerschlüssel)';
+
+# taxkey
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,apchart,taxincluded
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice by taxkey",1600,1
+"AccTransaction",3400,4,9
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'taxkey: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'taxkey: no errors in acc_trans row';
+
+$entry = $entries->[1];
+is $entry->{object}->taxkey, 9, 'detects taxkey';
+
+$saved_invoices++;
+
+# acc_trans project
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,apchart,taxincluded
+datatype,accno,amount,taxkey,projectnumber
+"Rechnung",2,1,"invoice with acc_trans project",1600,f
+"AccTransaction",3400,159.48,9,P1
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'acc_trans project: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'acc_trans project: no errors in acc_trans row';
+
+$entry = $entries->[1];
+is $entry->{object}->project->projectnumber, 'P1', 'detects acc_trans project';
+
+$saved_invoices++;
+
+#####  various tests
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate,duedate,globalprojectnumber,department
+datatype,accno,amount,taxkey,projectnumber
+"Rechnung",2,1,"invoice various",t,1600,21.04.2016,30.04.2016,P1,Department 1
+"AccTransaction",3400,119,9,P1
+"AccTransaction",3300,107,8,P1
+"AccTransaction",3559,100,0,P1
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'various tests: errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'various tests: no errors in 1. acc_trans row';
+is $entries->[2]->{errors}->[0], undef, 'various tests: no errors in 2. acc_trans row';
+is $entries->[3]->{errors}->[0], undef, 'various tests: no errors in 3. acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans, 1, 'various tests: acc_trans validates';
+
+is $entry->{object}->duedate->to_kivitendo,      '30.04.2016',    'various tests: duedate';
+is $entry->{object}->transdate->to_kivitendo,    '21.04.2016',    'various tests: transdate';
+is $entry->{object}->globalproject->description, 'Project X',     'various tests: project';
+is $entry->{object}->department->description,    'Department 1',  'various tests: department';
+# 3300 is third entry after 3400 and tax for 3400
+is $::form->round_amount($entry->{object}->transactions->[2]->amount),     '-100',       '3300 net amount: -100';
+is $entry->{object}->transactions->[2]->taxkey,                            '8',          '3300 has taxkey 8';
+is $entry->{object}->transactions->[2]->project_id,                        $project->id, 'AccTrans project';
+
+$saved_invoices++;
+
+#####  ap amount test
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate,duedate,globalprojectnumber,department
+datatype,accno,amount,taxkey,projectnumber
+"Rechnung",2,1,"invoice various 1",t,1600,21.04.2016,30.04.2016,P1,Department 1
+"AccTransaction",3400,119,9,P1
+"AccTransaction",3300,107,8,P1
+"AccTransaction",3559,100,0,P1
+"Rechnung",2,1,"invoice various 2",t,1600,21.04.2016,30.04.2016,P1,Department 1
+"AccTransaction",3400,119,9,P1
+"AccTransaction",3400,107,8,P1
+"AccTransaction",3559,100,0,P1
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'ap amount test: no errors in 1. ap row';
+is $entries->[1]->{errors}->[0], undef, 'ap amount test: no errors in 1. acc_trans row (ap row 1)';
+is $entries->[2]->{errors}->[0], undef, 'ap amount test: no errors in 2. acc_trans row (ap row 1)';
+is $entries->[3]->{errors}->[0], undef, 'ap amount test: no errors in 3. acc_trans row (ap row 1)';
+is $entries->[4]->{errors}->[0], undef, 'ap amount test: no errors in 2. ap row';
+is $entries->[5]->{errors}->[0], undef, 'ap amount test: no errors in 1. acc_trans row (ap row 2)';
+is $entries->[6]->{errors}->[0], undef, 'ap amount test: no errors in 2. acc_trans row (ap row 2)';
+is $entries->[7]->{errors}->[0], undef, 'ap amount test: no errors in 3. acc_trans row (ap row 2)';
+
+$entry = $entries->[0];
+is $entry->{object}->validate_acc_trans,    1,               'ap amount test: acc_trans validates';
+is $entry->{object}->duedate->to_kivitendo, '30.04.2016',    'duedate';
+is $entry->{info_data}->{calc_amount},      '326.00',        "First calculated invoice amount displayed in info data";
+$entry = $entries->[4];
+is $entry->{info_data}->{calc_amount},      '326.00',        "Second calculated invoice amount displayed in info data";
+
+$saved_invoices++;
+$saved_invoices++;
+
+# multiple entries, taxincluded = f
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 4 acc_trans",f,1600
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"Rechnung",2,1,"invoice 4 acc_trans 2",f,1600
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"Rechnung",2,1,"invoice 4 acc_trans 3",f,1600
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"Rechnung",2,1,"invoice 4 acc_trans 4",f,1605
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+"AccTransaction",3400,39.87,9
+EOL
+
+$entries = test_import($file);
+
+my $i = 0;
+foreach my $entry ( @$entries ) {
+  next unless $entry->{object}->isa('SL::DB::PurchaseInvoice');
+  $i++;
+  is scalar @{$entry->{object}->transactions}, 9, "multiple entries: invoice $i: 'acc_trans' has 9 acc_trans entries";
+  $entry->{object}->validate_acc_trans;
+  is $entry->{object}->validate_acc_trans,     1, "multiple entries: invoice $i: 'acc_trans validates'";
+}
+
+$saved_invoices++;
+$saved_invoices++;
+$saved_invoices++;
+$saved_invoices++;
+
+##### missing acc_trans
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,transdate,duedate,globalprojectnumber,department
+datatype,accno,amount,taxkey,projectnumber
+"Rechnung",2,1,"invoice acc_trans missing",t,1600,21.04.2016,30.04.2016,P1,Department 1
+"Rechnung",2,1,"invoice various a",t,1600,21.04.2016,30.04.2016,P1,Department 1
+"AccTransaction",3400,119,9,P1
+"AccTransaction",3300,107,8,P1
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[0];
+is $entry->{errors}->[0], "Error: ap transaction doesn't validate", 'detects invalid ap, maybe acc_trans entry missing';
+
+##### taxkey differs from active_taxkey
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"invoice 2 tax included no amounts",t,1600
+"AccTransaction",3400,189.78,8
+EOL
+
+$entries = test_import($file);
+is $entries->[0]->{errors}->[0], undef, 'taxkey differs from active_taxkey: no errors in ap row';
+is $entries->[1]->{errors}->[0], undef, 'taxkey differs from active_taxkey: no errors in acc_trans row';
+
+$entry = $entries->[0];
+is $entry->{object}->transactions->[1]->taxkey, '8', 'taxkey differs from active_taxkey';
+
+$saved_invoices++;
+
+##### verify amounts, error only once
+$file = \<<EOL;
+datatype,vendornumber,currency_id,invnumber,taxincluded,apchart,verify_netamount,verify_amount
+datatype,accno,amount,taxkey
+"Rechnung",2,1,"first invoice",f,1600,39.87,47.44
+"AccTransaction",3400,39.87,9
+"Rechnung",2,1,"second invoice",f,1600,39.78,78.39
+"AccTransaction",3400,39.87,9
+EOL
+
+$entries = test_import($file);
+
+$entry = $entries->[0];
+is $entry->{errors}->[0], undef,                         'verify amounts, error only once: no error in first invoice';
+
+$entry = $entries->[2];
+is $entry->{errors}->[0], "Amounts differ too much",     'verify amounts, error only once: amount differs';
+is $entry->{errors}->[1], "Net amounts differ too much", 'verify amounts, error only once: netamount differs';
+is $entry->{errors}->[2], undef,                         'verify amounts, error only once: nothing else';
+
+$saved_invoices++;
+
+#####
+my $number_of_imported_invoices = SL::DB::Manager::PurchaseInvoice->get_all_count;
+is $number_of_imported_invoices, $saved_invoices, 'All invoices saved';
+
+#####
+clear_up(); # remove all data at end of tests
+
+# end of tests
+done_testing;
+
+1;
+
+#####
+# vim: ft=perl
+# set emacs to perl mode
+# Local Variables:
+# mode: perl
+# End:
diff --git a/t/controllers/csvimport/artransactions.t b/t/controllers/csvimport/artransactions.t
index 6c902c33e..101e71b4f 100644
--- a/t/controllers/csvimport/artransactions.t
+++ b/t/controllers/csvimport/artransactions.t
@@ -1,4 +1,4 @@
-use Test::More tests => 70;
+use Test::More tests => 74;
 
 use strict;
 
@@ -487,8 +487,8 @@ $entries = test_import($file);
 $entry = $entries->[0];
 $entry->{object}->validate_acc_trans;
 is $entry->{object}->duedate->to_kivitendo,      '30.04.2016',    'duedate';
-is $entry->{info_data}->{amount}, '326', "First invoice amount displayed in info data";
-is $entries->[4]->{info_data}->{amount}, '326', "Second invoice amount displayed in info data";
+is $entry->{info_data}->{calc_amount},           '326.00',        "First invoice amount displayed in info data";
+is $entries->[4]->{info_data}->{calc_amount},    '326.00',        "Second invoice amount displayed in info data";
 
 # multiple entries, taxincluded = f
 $file = \<<EOL;
@@ -539,8 +539,28 @@ $entries = test_import($file);
 $entry = $entries->[0];
 is $entry->{errors}->[0], "Error: ar transaction doesn't validate", 'detects invalid ar, maybe acc_trans entry missing';
 
+# verify amounts, error only once
+$file = \<<EOL;
+datatype,customer_id,taxzone_id,currency_id,invnumber,taxincluded,archart,verify_netamount,verify_amount
+datatype,accno,amount,taxkey
+"Rechnung",960,4,1,"first invoice",f,1400,39.87,47.44
+"AccTransaction",8400,39.87,3
+"Rechnung",960,4,1,"second invoice",f,1400,39.78,78.39
+"AccTransaction",8400,39.87,3
+EOL
+$entries = test_import($file);
+
+$entry = $entries->[0];
+is $entry->{errors}->[0], undef,                         'verify amounts, error only once: no error in first invoice';
+
+$entry = $entries->[2];
+is $entry->{errors}->[0], "Amounts differ too much",     'verify amounts, error only once: amount differs';
+is $entry->{errors}->[1], "Net amounts differ too much", 'verify amounts, error only once: netamount differs';
+is $entry->{errors}->[2], undef,                         'verify amounts, error only once: nothing else';
+
+#####
 my $number_of_imported_invoices = SL::DB::Manager::Invoice->get_all_count;
-is $number_of_imported_invoices, 19, 'All invoices saved';
+is $number_of_imported_invoices, 20, 'All invoices saved';
 
 #### taxkey differs from active_taxkey
 $file = \<<EOL;
diff --git a/t/controllers/disposition_manager/disposition_manager.t b/t/controllers/disposition_manager/disposition_manager.t
new file mode 100644
index 000000000..5991339db
--- /dev/null
+++ b/t/controllers/disposition_manager/disposition_manager.t
@@ -0,0 +1,162 @@
+use strict;
+use Test::More tests => 16;
+
+use lib 't';
+use Support::TestSetup;
+use Test::Exception;
+use SL::DB::Part;
+use SL::DB::Inventory;
+use SL::DB::MakeModel;
+use SL::DB::PurchaseBasketItem;
+use SL::DB::Order;
+use SL::Controller::DispositionManager;
+use DateTime;
+use Data::Dumper;
+use SL::Dev::Part qw(new_part);
+use SL::Dev::Inventory qw(create_warehouse_and_bins set_stock);
+use SL::Dev::CustomerVendor qw(new_vendor);
+
+use utf8;
+
+Support::TestSetup::login();
+clear_up();
+
+my ($wh, $bin) = create_warehouse_and_bins();
+my $vendor = new_vendor()->save;
+
+my $part1 = new_part(
+  partnumber   => 'TP 1',
+  description  => 'Testpart 1 rop no stock',
+  sellprice    => 5,
+  lastcost     => 3,
+  rop          => 20,
+  order_qty    => 1,
+  warehouse_id => $wh->id,
+  bin_id       => $bin->id,
+  makemodels   => [ _create_makemodel_for_vendor(vendor => $vendor) ],
+)->save;
+
+my $part2 = new_part(
+  partnumber   => 'TP 2',
+  description  => 'Testpart 2 norop',
+  rop          => 60,
+  order_qty    => 2,
+  makemodels   => [ _create_makemodel_for_vendor(vendor => $vendor) ],
+)->save;
+set_stock(part => $part2, bin_id => $bin->id, qty => 80);
+
+for my $i (1 .. 10) {
+  my $part = new_part(
+    partnumber   => "TPO $i",
+    description  => "Testpart onhand $i",
+    rop          => 50,
+    order_qty    => $i+2,
+    sellprice    => 5,
+    lastcost     => 3,
+    warehouse_id => $wh->id,
+    bin_id       => $bin->id,
+    makemodels   => [ _create_makemodel_for_vendor(vendor => $vendor) ],
+  )->save;
+  set_stock(part => $part, bin_id => $bin->id, qty => ($i * 10));
+}
+
+my $controller = SL::Controller::DispositionManager->new();
+my $reorder_parts = $controller->_get_parts;
+is(scalar @{$reorder_parts}, 5, "found 5 parts where onhand < rop");
+
+# die; # die here if you want to test making basket manually
+
+note('creating purchase basket items');
+$::form = Support::TestSetup->create_new_form;
+$::form->{ids} = [ map { $_->id } @{$reorder_parts} ];
+
+# call action_add_to_purchase_basket while redirecting rendered HTML output
+my $output;
+open(my $outputFH, '>', \$output) or die;
+my $oldFH = select $outputFH;
+$controller->action_add_to_purchase_basket;
+select $oldFH;
+close $outputFH;
+
+is(SL::DB::Manager::PurchaseBasketItem->get_all_count(), 5, "5 items in purchase basket ok");
+
+# die; # die here if you want to test creating purchase orders manually
+
+note('making purchase order from purchase basket items');
+my $purchase_basket_items = SL::DB::Manager::PurchaseBasketItem->get_all;
+$::form = Support::TestSetup->create_new_form;
+$::form->{ids}        = [ map { $_->id       } @{ $purchase_basket_items } ];
+$::form->{basket_ids} = [ map { $_->id       } @{ $purchase_basket_items } ];
+$::form->{vendor_ids} = [ map { $vendor->id  } @{ $purchase_basket_items } ];
+
+open($outputFH, '>', \$output) or die;
+$oldFH = select $outputFH;
+my $ret = $controller->action_transfer_to_purchase_order;
+select $oldFH;
+close $outputFH;
+is($ret, 1, "action_transfer_to_purchase_order ok");
+
+my @basket_item_ids = map { $_->id } @{ $purchase_basket_items } ;
+my $purchase_order = SL::DB::Order->create_from_purchase_basket(
+  \@basket_item_ids, [], $vendor->id
+);
+$purchase_order->save;
+
+is(SL::DB::Manager::Order->get_all_count( where => [ SL::DB::Manager::Order->type_filter('purchase_order') ] ), 1, "1 purchase order created ok");
+is(SL::DB::Manager::PurchaseBasketItem->get_all_count(), 0, "purchase basket empty after purchase order was created");
+
+is( scalar @{$purchase_order->items}, 5, "Purchase order has 5 item ok");
+my $first_item = $purchase_order->items_sorted->[0];
+is( $first_item->parts_id, $part1->id, "Purchase order: first item is part1");
+is( $first_item->qty, '20.00000', "Purchase order: first item has qty 20");
+cmp_ok( $purchase_order->netamount, '==', 240, "Purchase order: netamount ok");
+is( $first_item->active_price_source, 'makemodel/' . $part1->makemodels->[0]->id, "Purchase order: first item has correct active_price_source" . $first_item->part->partnumber);
+
+
+my @vendor_item_ids = ( $part1->id, $part2->id );
+
+my $purchase_order2 = SL::DB::Order->create_from_purchase_basket(
+  [], \@vendor_item_ids, $vendor->id
+);
+
+is( scalar @{$purchase_order2->items}, 2, "Purchase order 2 has 2 item ok");
+my $item_1 = $purchase_order2->items_sorted->[0];
+is( $item_1->parts_id, $part1->id, "Purchase order 2: first item is part1");
+my $item_2 = $purchase_order2->items_sorted->[1];
+is( $item_2->parts_id, $part2->id, "Purchase order 2: secound item is part2");
+is( $item_1->qty, '1.00000', "Purchase order 2: first item has qty 1");
+is( $item_2->qty, '2.00000', "Purchase order 2: secound item has qty 2");
+is( $item_1->active_price_source, 'makemodel/' . $part1->makemodels->[0]->id, "Purchase order 2: first item has correct active_price_source" . $first_item->part->partnumber);
+
+clear_up();
+done_testing();
+
+sub clear_up {
+  my %params = @_;
+  SL::DB::Manager::Inventory->delete_all(all => 1);
+  SL::DB::Manager::Order->delete_all(all => 1);
+  SL::DB::Manager::PurchaseBasketItem->delete_all(all => 1);
+  SL::DB::Manager::MakeModel->delete_all(all => 1);
+  SL::DB::Manager::Part->delete_all(all => 1);
+  SL::DB::Manager::Vendor->delete_all(all => 1);
+  SL::DB::Manager::Customer->delete_all(all => 1);
+  SL::DB::Manager::Bin->delete_all(all => 1);
+  SL::DB::Manager::Warehouse->delete_all(all => 1);
+};
+
+sub _create_makemodel_for_vendor {
+  my %params = @_;
+
+  my $vendor = delete $params{vendor};
+  die "no vendor" unless ref($vendor) eq 'SL::DB::Vendor';
+
+  my $mm = SL::DB::MakeModel->new(make          => $vendor->id,
+                                  model         => '',
+                                  lastcost      => 2,
+                                  sortorder     => 1,
+                                 );
+  $mm->assign_attributes( %params );
+  return $mm;
+}
+
+1;
diff --git a/t/datev/datev_format_2018.t b/t/datev/datev_format_2018.t
index 67889587d..8577a8482 100644
--- a/t/datev/datev_format_2018.t
+++ b/t/datev/datev_format_2018.t
@@ -173,7 +173,7 @@ cmp_deeply $sorted[0],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '',
-             '', '', '', '', '',
+             '',
            ],
            'invoice without deliverydate 19% tax export ok';
 cmp_deeply $sorted[2],
@@ -191,7 +191,7 @@ cmp_deeply $sorted[2],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '',
-             '', '', '', '', '',
+             '',
            ],
            'invoice without deliverydate 16% tax export ok';
 cmp_deeply $sorted[1],
@@ -209,7 +209,7 @@ cmp_deeply $sorted[1],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '',
-             '', '', '', '', '',
+             '',
            ],
            'invoice without deliverydate payment export ok';
 
@@ -265,7 +265,7 @@ cmp_deeply($data_csv[0],
              '', '', '', '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '', '', '', '', '',
-             '', '', '1', '', '', '', '', '', '',
+             '', '', '1', '', '',
            ],
            'gl datev export without delivery date ok');
 
@@ -306,7 +306,7 @@ cmp_deeply $sorted[0],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '18072017',
-             '', '', '', '', '',
+             '',
            ],
            'invoice with deliverydate 19% tax export ok';
 
@@ -325,7 +325,7 @@ cmp_deeply $sorted[2],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '18072017',
-             '', '', '', '', '',
+             '',
            ],
            'invoice with deliverydate 16% tax export ok';
 
@@ -344,7 +344,7 @@ cmp_deeply $sorted[1],
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '1', '',
-             '', '', '', '', '',
+             '',
            ],
            'invoice with deliverydate payment export ok';
 
@@ -378,7 +378,7 @@ cmp_deeply($sorted[0],
              '', '', '', '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', '', '', '', '', '', '',
-             '', '', '1', '18072017', '', '', '', '', '',
+             '', '', '1', '18072017', '',
            ],
           'testing gl transaction with delivery date datev export ok');
 
diff --git a/t/datev/invoices.t b/t/datev/invoices.t
index 3b2d4af57..5f387a17b 100644
--- a/t/datev/invoices.t
+++ b/t/datev/invoices.t
@@ -181,7 +181,7 @@ cmp_deeply($data_csv[1], [ '535', 'S', 'EUR', '', '', '', '1400', '8300', '', '0
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
-                     '', '', '1', '', '', '', '', '', '' ]
+                     '', '', '1', '', '', ]
        );
 
 cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '', '0101', "\x{de} sales \x{a5}& i",
@@ -193,7 +193,7 @@ cmp_deeply($data_csv[0], [ '249,9', 'S', 'EUR', '', '', '', '1400', '8400', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
-                     '', '', '1', '', '', '', '', '', '' ]
+                     '', '', '1', '', '', ]
        );
 cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '', '0501', "\x{de} sales \x{a5}& i",
                      '', '', 'Testcustomer', '', '', '', '', '', '', '', '',
@@ -204,7 +204,7 @@ cmp_deeply($data_csv[2], [ '784,9', 'S', 'EUR', '', '', '', '1200', '1400', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
                      '', '', '', '', '', '', '', '', '', '', '', '', '',
-                     '', '', '1', '', '', '', '', '', '' ]
+                     '', '', '1', '', '', ]
         );
 my $march_9 = DateTime->new(year => 2017, month =>  3, day => 9);
 my $invoice2 = create_sales_invoice(
diff --git a/t/db/delivery_order.t b/t/db/delivery_order.t
index 372cc872f..223137aa9 100644
--- a/t/db/delivery_order.t
+++ b/t/db/delivery_order.t
@@ -40,7 +40,7 @@ is $delivery_order->type, PURCHASE_DELIVERY_ORDER_TYPE, "new_from purchase order
 is scalar @{ $delivery_order->items }, 2, "purchase delivery order keeps items";
 is $delivery_order->vendor_id, $order1->vendor_id, "purchase delivery order keeps vendor";
 
-my $supplier_delivery_order = SL::DB::DeliveryOrder->new_from($order1, type => SUPPLIER_DELIVERY_ORDER_TYPE);
+my $supplier_delivery_order = SL::DB::DeliveryOrder->new_from($order1, destination_type => SUPPLIER_DELIVERY_ORDER_TYPE);
 
 is $supplier_delivery_order->type, SUPPLIER_DELIVERY_ORDER_TYPE, "new_from purchase order with given type gives supplier delivery order";
 is scalar @{ $supplier_delivery_order->items }, 0, "supplier delivery order ignores items";
diff --git a/t/db/price_rule.t b/t/db/price_rule.t
new file mode 100644
index 000000000..e88c2e827
--- /dev/null
+++ b/t/db/price_rule.t
@@ -0,0 +1,617 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Test::Exception;
+
+use SL::Controller::CustomVariableConfig;
+
+use SL::Dev::ALL qw(:ALL);
+use SL::DB::PriceRule;
+use SL::DB::Project;
+use SL::DB::CustomVariableConfig;
+
+Support::TestSetup::login();
+
+sub reset_db {
+  SL::DB::Manager::PriceRule->delete_all(all => 1);
+  SL::DB::Manager::CustomVariable->delete_all(all => 1);
+  SL::DB::Manager::CustomVariableConfig->delete_all(all => 1);
+  SL::DB::Manager::Order->delete_all(all => 1);
+  SL::DB::Manager::Shipto->delete_all(all => 1);
+
+  $::request->{_cache} = {};
+}
+
+{
+  reset_db();
+
+  # cvar price rules.
+  # a select cvar price rule for one specific value A
+  # and an order where the part has exactly that cvar set to first A and then B
+
+  my $cvar_config = SL::DB::CustomVariableConfig->new(
+    module      => 'IC',
+    name        => "test",
+    description => "test",
+    type        => "select",
+    options     => "A##B##C##D",
+    default_value => "D",
+    flags       => "editable=0",
+    searchable  => 0,
+    includeable => 0,
+    included_by_default => 0,
+  )->save->load;
+
+  my $name = "price for test A";
+
+  my $price_rule = SL::DB::PriceRule->new(
+    name  => $name,
+    price => 1,
+    type  => "customer",
+    items => [
+      SL::DB::PriceRuleItem->new(
+        custom_variable_configs => $cvar_config,
+        value_text              => "A",
+        type                    => "cvar",
+      ),
+    ],
+  )->save;
+
+  my $order = create_sales_order()->save->load;
+
+  $order->items_sorted->[0]->part->cvar_by_name('test')->value("A");
+  $order->items_sorted->[0]->part->cvar_by_name('test')->save;
+
+  ok(1 == grep({ $_->{name} eq $name } @{ SL::DB::Manager::PriceRule->get_all_matching(record => $order, record_item => $order->items_sorted->[0]) }), "editable=0 price rule matches");
+
+  $order->items_sorted->[0]->part->cvar_by_name('test')->value("B");
+  $order->items_sorted->[0]->part->cvar_by_name('test')->save;
+
+  ok(0 == grep({ $_->{name} eq $name } @{ SL::DB::Manager::PriceRule->get_all_matching(record => $order, record_item => $order->items_sorted->[0]) }), "editable=0 price rule does not match");
+}
+
+{
+  reset_db();
+
+  # now try the same, but with an editable cvar config
+
+  my $cvar_config = SL::DB::CustomVariableConfig->new(
+    module      => 'IC',
+    name        => "test",
+    description => "test2",
+    type        => "select",
+    options     => "A##B##C##D",
+    default_value => "D",
+    flags       => "editable=1",
+    searchable  => 0,
+    includeable => 0,
+    included_by_default => 0,
+  )->save->load;
+
+  my $name = "price for test A";
+
+  my $price_rule = SL::DB::PriceRule->new(
+    name  => $name,
+    price => 1,
+    type  => "customer",
+    items => [
+      SL::DB::PriceRuleItem->new(
+        custom_variable_configs => $cvar_config,
+        value_text              => "A",
+        type                    => "cvar",
+      ),
+    ],
+  )->save;
+
+  my $order = create_sales_order()->save->load;
+  my $item = $order->items_sorted->[0];
+
+  $item->cvar_by_name('test')->value("A");
+  $item->cvar_by_name('test')->save;
+
+  ok(1 == grep({ $_->{name} eq $name } @{ SL::DB::Manager::PriceRule->get_all_matching(record => $order, record_item => $item) }), "editable=1 price rule matches");
+
+  $item->cvar_by_name('test')->value("B");
+  $item->cvar_by_name('test')->save;
+
+  ok(0 == grep({ $_->{name} eq $name } @{ SL::DB::Manager::PriceRule->get_all_matching(record => $order, record_item => $item) }), "editable=1 price rule does not match");
+
+}
+
+# structural test: check whether the registered CVar types in SL::DB::Manager::PriceRuleItem have all the possible types of SL::Controller::CustomVariableConfigs
+for (@SL::Controller::CustomVariableConfig::types) {
+  ok(exists $SL::DB::Manager::PriceRuleItem::price_rule_type_by_cvar_type{$_}, "PriceRuleItem has cvar config type $_ registered");
+}
+
+# k, now for a more broad test:
+#
+# we can have these modules in cvars:
+#  - CT
+#  - Contact
+#  - IC
+#  - Project
+#  - ShipTo
+#
+# and the cvars themselves can have these types:
+#  - select
+#  - customer
+#  - vendor
+#  - part
+#  - integer
+#  - number
+#  - date
+#  - timestamp
+#
+#  ...with the numeric and date ones also having comparison ops
+#
+#
+# to be matched against all different record/record items
+#
+#
+# testing all of that is too much, so this will do some combinations:
+#   1. a cvar config
+#   2. a price_rule that uses both
+#   3. record + record item that either uses that or not
+#   4. expected behaviour
+{
+  sub test {
+    my ($price_rule, $record, $record_item, $comment, $expected_match) = @_;
+
+    # needed to clear cvar caches in price rule implementation
+    $::request->{_cache} = {};
+
+    my $matching_rules = SL::DB::Manager::PriceRule->get_all_matching(record => $record, record_item => $record_item);
+    my @does_match = grep { $_->{name} eq $price_rule->name } @$matching_rules;
+
+    if ($expected_match) {
+      ok(@does_match && $price_rule->name eq $does_match[0]->name, "$comment - expected match, got @does_match");
+    } else {
+      ok(!@does_match, "$comment - expected no match, got @does_match");
+    }
+  }
+
+  {
+    reset_db();
+
+    my $name = "before critical customer date";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'CT',
+      type => 'date',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_date              => DateTime->new(year => 2022, month => 12, day => 9),
+          op                      => "lt",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+
+    test($price_rule, $order, $item, $name, 0);
+
+    $order->customer->cvar_by_name($name)->value(DateTime->new(year => 2022, month => 12, day => 12));
+    $order->customer->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- too late", 0);
+
+    $order->customer->cvar_by_name($name)->value(DateTime->new(year => 2022, month => 12, day => 5));
+    $order->customer->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- early", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "contact number equals 1234";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'Contacts',
+      type => 'number',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_num               => 1234,
+          op                      => "eq",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+
+    test($price_rule, $order, $item, "$name -- no contact", 0);
+
+    $order->contact(SL::DB::Contact->new)->save;
+
+    test($price_rule, $order, $item, "$name -- null", 0);
+
+    $order->contact->cvar_by_name($name)->value(45);
+    $order->contact->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching", 0);
+
+    $order->contact->cvar_by_name($name)->value(1234);
+    $order->contact->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "project part matches";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'Projects',
+      type => 'part',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+    )->save->load;
+
+    my $part = new_part()->save;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_int               => $part->id,
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $project1 = SL::DB::Project->new(
+      project_type   => SL::DB::Manager::ProjectType->find_by(description => 'Standard'),
+      project_status => SL::DB::Manager::ProjectStatus->find_by(name => 'running'),
+    )->save->load;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+
+    test($price_rule, $order, $item, "$name -- no project", 0);
+
+    $order->globalproject($project1)->save;
+
+    test($price_rule, $order, $item, "$name -- global project, but no value", 0);
+
+    $order->globalproject->cvar_by_name($name)->value($item->part);
+    $order->globalproject->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- global project, not matching", 0);
+
+    $order->globalproject->cvar_by_name($name)->value($part);
+    $order->globalproject->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- global project, matching", 1);
+
+    my $project2 = SL::DB::Project->new(
+      project_type   => SL::DB::Manager::ProjectType->find_by(description => 'Standard'),
+      project_status => SL::DB::Manager::ProjectStatus->find_by(name => 'running'),
+    )->save->load;
+
+    $item->project($project2)->save;
+
+    test($price_rule, $order, $item, "$name -- item project, but no value", 0);
+
+    $item->project->cvar_by_name($name)->value($item->part);
+    $item->project->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- item project, not matching", 0);
+
+    $item->project->cvar_by_name($name)->value($part);
+    $item->project->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- item project, matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "part customer matches";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'IC',
+      type => 'customer',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $customer = new_customer()->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "vendor",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_int               => $customer->id,
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_purchase_order()->save->load;
+    my $item = $order->items_sorted->[0];
+
+    test($price_rule, $order, $item, "$name -- no value", 0);
+
+    $item->part->cvar_by_name($name)->value(new_customer());
+    $item->part->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching", 0);
+
+    $item->part->cvar_by_name($name)->value($customer);
+    $item->part->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "part number with default value 15 matches 15";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'IC',
+      type => 'number',
+      name => $name,
+      description => $name,
+      default_value => 15,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_num               => 15,
+          op                      => "eq",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+
+    test($price_rule, $order, $item, "$name -- default value", 1);
+
+    $item->part->cvar_by_name($name)->value(20);
+    $item->part->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching", 0);
+
+    $item->part->cvar_by_name($name)->value(15);
+    $item->part->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "shipto cvar and price rule matching that";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'ShipTo',
+      type => 'number',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_num               => 15,
+          op                      => "eq",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+    my $shipto = SL::DB::Shipto->new;
+    $order->shipto($shipto);
+    $order->save->load;
+
+    test($price_rule, $order, $item, "$name -- default value", 0);
+
+    $order->shipto->cvar_by_name($name)->value(20);
+    $order->shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching", 0);
+
+    $order->shipto->cvar_by_name($name)->value(15);
+    $order->shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "custom shipto cvar and price rule matching that";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'ShipTo',
+      type => 'number',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_num               => 15,
+          op                      => "eq",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+    my $shipto = SL::DB::Shipto->new(trans_id => $order->id, module => 'OE')->save;
+
+    ok(ref $order->custom_shipto eq 'SL::DB::Shipto', 'custom shipto is readable from order');
+
+    test($price_rule, $order, $item, "$name -- default value", 0);
+
+    $order->custom_shipto->cvar_by_name($name)->value(20);
+    $order->custom_shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching", 0);
+
+    $order->custom_shipto->cvar_by_name($name)->value(15);
+    $order->custom_shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "custom shipto cvar and price rule matching that";
+
+    my $config = SL::DB::CustomVariableConfig->new(
+      module => 'ShipTo',
+      type => 'number',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $price_rule = SL::DB::PriceRule->new(
+      name  => $name,
+      price => 1,
+      type  => "customer",
+      items => [
+        SL::DB::PriceRuleItem->new(
+          custom_variable_configs => $config,
+          value_num               => 15,
+          op                      => "eq",
+          type                    => "cvar",
+        ),
+      ],
+    )->save;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+    my $shipto1 = SL::DB::Shipto->new;
+    $order->shipto($shipto1);
+    my $shipto2 = SL::DB::Shipto->new(trans_id => $order->id, module => 'OE')->save;
+    $order->save->load;
+
+    test($price_rule, $order, $item, "$name -- default value", 0);
+
+    $order->custom_shipto->cvar_by_name($name)->value(20);
+    $order->custom_shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching custom", 0);
+
+    $order->shipto->cvar_by_name($name)->value(15);
+    $order->shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- not matching custom, matching shipto", 0);
+
+    $order->custom_shipto->cvar_by_name($name)->value(15);
+    $order->custom_shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching both", 1);
+
+    $order->shipto->cvar_by_name($name)->value(20);
+    $order->shipto->cvar_by_name($name)->save;
+    test($price_rule, $order, $item, "$name -- matching custom, not matching shipto", 1);
+  }
+
+  {
+    reset_db();
+
+    my $name = "no price rule, but cvars exist with module requirementsspecs or type text";
+
+    my $config1 = SL::DB::CustomVariableConfig->new(
+      module => 'RequirementSpecs',
+      type => 'number',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $config2 = SL::DB::CustomVariableConfig->new(
+      module => 'Customer',
+      type => 'text',
+      name => $name,
+      description => $name,
+      searchable  => 0,
+      includeable => 0,
+      included_by_default => 0,
+      flags => '',
+    )->save->load;
+
+    my $order = create_sales_order()->save->load;
+    my $item = $order->items_sorted->[0];
+    $order->save->load;
+
+    test(undef, $order, $item, "$name -- nothing to match", 0);
+  }
+}
+
+reset_db();
+
+done_testing();
diff --git a/t/db/time_recordig.t b/t/db/time_recordig.t
deleted file mode 100644
index 33b036484..000000000
--- a/t/db/time_recordig.t
+++ /dev/null
@@ -1,582 +0,0 @@
-use Test::More tests => 40;
-
-use strict;
-
-use lib 't';
-use utf8;
-
-use Support::TestSetup;
-use Test::Exception;
-use DateTime;
-
-use_ok 'SL::DB::TimeRecording';
-
-use SL::Dev::ALL qw(:ALL);
-
-Support::TestSetup::login();
-
-my @time_recordings;
-my ($s1, $e1, $s2, $e2);
-
-sub clear_up {
-  foreach (qw(TimeRecording Customer)) {
-    "SL::DB::Manager::${_}"->delete_all(all => 1);
-  }
-  SL::DB::Manager::Employee->delete_all(where => [ '!login' => 'unittests' ]);
-};
-
-########################################
-
-$s1 = DateTime->now_local;
-$e1 = $s1->clone;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1);
-
-ok( $time_recordings[0]->is_time_in_wrong_order, 'same start and end detected' );
-ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping if only one time recording entry in db' );
-
-###
-$time_recordings[0]->end_time(undef);
-ok( !$time_recordings[0]->is_time_in_wrong_order, 'order ok if no end' );
-
-########################################
-# ------------s1-----e1-----
-# --s2---e2-----------------
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 11, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
-
-ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: completely before 1' );
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: completely before 2' );
-
-
-# -------s1-----e1----------
-# --s2---e2-----------------
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
-
-ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: before 1' );
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: before 2' );
-
-# ---s1-----e1--------------
-# ---------------s2---e2----
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 13, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
-
-ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: completely after 1' );
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: completely after 2' );
-
-# ---s1-----e1--------------
-# ----------s2---e2---------
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
-
-ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: after 1' );
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: after 2' );
-
-# -------s1-----e1----------
-# ---s2-----e2--------------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour =>  9, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start before, end inbetween' );
-
-# -------s1-----e1----------
-# -----------s2-----e2------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start inbetween, end after' );
-
-# ---s1---------e1----------
-# ------s2---e2-------------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: completely inbetween' );
-
-
-# ------s1---e1-------------
-# ---s2---------e2----------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: completely oudside' );
-
-
-# ---s1---e1----------------
-# ---s2---------e2----------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: same start, end outside' );
-
-# ---s1------e1-------------
-# ------s2---e2-------------
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start after, same end' );
-
-# ---s1------e1-------------
-# ------s2------------------
-# e2 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start inbetween, no end' );
-
-# ---s1------e1-------------
-# ---s2---------------------
-# e2 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: same start, no end' );
-
-# -------s1------e1---------
-# ---s2---------------------
-# e2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: start before, no end' );
-
-# -------s1------e1---------
-# -------------------s2-----
-# e2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 16, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: start after, no end' );
-
-# -------s1------e1---------
-# ---------------s2---------
-# e2 undef
-# -> does not overlap
-
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: same start as other end, no end' );
-
-# -------s1------e1---------
-# -----------e2-------------
-# s2 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no start, end inbetween' );
-
-# -------s1------e1---------
-# ---------------e2---------
-# s2 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no start, same end' );
-
-# -------s1------e1---------
-# --e2----------------------
-# s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, end before' );
-
-# -------s1------e1---------
-# -------------------e2-----
-# s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, end after' );
-
-# -------s1------e1---------
-# -------e2-----------------
-# s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, same end as other start' );
-
-# ----s1--------------------
-# ----s2-----e2-------------
-# e1 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no end in db, same start' );
-
-# --------s1----------------
-# ----s2-----e2-------------
-# e1 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, enclosing' );
-
-# ---s1---------------------
-# ---------s2-----e2--------
-# e1 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, completely after' );
-
-# ---------s1---------------
-# --------------------------
-# e1, s2, e2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = undef;
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no times in object' );
-
-# ---------s1---------------
-# -----s2-------------------
-# e1, e2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, start before, no end in object' );
-
-# ---------s1---------------
-# -------------s2-----------
-# e1, e2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, start after, no end in object' );
-
-# ---------s1---------------
-# ---------s2---------------
-# e1, e2 undef
-# -> overlaps
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e2 = undef;
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no end in db, same start' );
-
-# ---------s1---------------
-# ---e2---------------------
-# e1, s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, end before' );
-
-# ---------s1---------------
-# ---------------e2---------
-# e1, s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, end after' );
-
-# ---------s1---------------
-# ---------e2---------------
-# e1, s2 undef
-# -> does not overlap
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-$e1 = undef;
-$s2 = undef;
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, same end' );
-
-########################################
-# not overlapping if different staff_member
-$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
-$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
-$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 11, minute => 0);
-$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
-
-clear_up;
-
-@time_recordings = ();
-push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
-push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
-
-ok( $time_recordings[1]->is_time_overlapping, 'overlapping if same staff member' );
-$time_recordings[1]->update_attributes(staff_member => SL::DB::Employee->new(
-                                         'login' => 'testuser',
-                                         'name'  => 'Test User',
-                                       )->save);
-ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping if different staff member' );
-
-clear_up;
-
-1;
-
-
-# set emacs to perl mode
-# Local Variables:
-# mode: perl
-# End:
diff --git a/t/db/time_recording.t b/t/db/time_recording.t
new file mode 100644
index 000000000..33b036484
--- /dev/null
+++ b/t/db/time_recording.t
@@ -0,0 +1,582 @@
+use Test::More tests => 40;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Support::TestSetup;
+use Test::Exception;
+use DateTime;
+
+use_ok 'SL::DB::TimeRecording';
+
+use SL::Dev::ALL qw(:ALL);
+
+Support::TestSetup::login();
+
+my @time_recordings;
+my ($s1, $e1, $s2, $e2);
+
+sub clear_up {
+  foreach (qw(TimeRecording Customer)) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::Employee->delete_all(where => [ '!login' => 'unittests' ]);
+};
+
+########################################
+
+$s1 = DateTime->now_local;
+$e1 = $s1->clone;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1);
+
+ok( $time_recordings[0]->is_time_in_wrong_order, 'same start and end detected' );
+ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping if only one time recording entry in db' );
+
+###
+$time_recordings[0]->end_time(undef);
+ok( !$time_recordings[0]->is_time_in_wrong_order, 'order ok if no end' );
+
+########################################
+# ------------s1-----e1-----
+# --s2---e2-----------------
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 11, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
+
+ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: completely before 1' );
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: completely before 2' );
+
+
+# -------s1-----e1----------
+# --s2---e2-----------------
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
+
+ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: before 1' );
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: before 2' );
+
+# ---s1-----e1--------------
+# ---------------s2---e2----
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 13, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
+
+ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: completely after 1' );
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: completely after 2' );
+
+# ---s1-----e1--------------
+# ----------s2---e2---------
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2)->save;
+
+ok( !$time_recordings[0]->is_time_overlapping, 'not overlapping: after 1' );
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: after 2' );
+
+# -------s1-----e1----------
+# ---s2-----e2--------------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour =>  9, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start before, end inbetween' );
+
+# -------s1-----e1----------
+# -----------s2-----e2------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start inbetween, end after' );
+
+# ---s1---------e1----------
+# ------s2---e2-------------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: completely inbetween' );
+
+
+# ------s1---e1-------------
+# ---s2---------e2----------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: completely oudside' );
+
+
+# ---s1---e1----------------
+# ---s2---------e2----------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: same start, end outside' );
+
+# ---s1------e1-------------
+# ------s2---e2-------------
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start after, same end' );
+
+# ---s1------e1-------------
+# ------s2------------------
+# e2 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: start inbetween, no end' );
+
+# ---s1------e1-------------
+# ---s2---------------------
+# e2 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: same start, no end' );
+
+# -------s1------e1---------
+# ---s2---------------------
+# e2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: start before, no end' );
+
+# -------s1------e1---------
+# -------------------s2-----
+# e2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 16, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: start after, no end' );
+
+# -------s1------e1---------
+# ---------------s2---------
+# e2 undef
+# -> does not overlap
+
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: same start as other end, no end' );
+
+# -------s1------e1---------
+# -----------e2-------------
+# s2 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no start, end inbetween' );
+
+# -------s1------e1---------
+# ---------------e2---------
+# s2 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no start, same end' );
+
+# -------s1------e1---------
+# --e2----------------------
+# s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, end before' );
+
+# -------s1------e1---------
+# -------------------e2-----
+# s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 17, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, end after' );
+
+# -------s1------e1---------
+# -------e2-----------------
+# s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no start, same end as other start' );
+
+# ----s1--------------------
+# ----s2-----e2-------------
+# e1 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no end in db, same start' );
+
+# --------s1----------------
+# ----s2-----e2-------------
+# e1 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, enclosing' );
+
+# ---s1---------------------
+# ---------s2-----e2--------
+# e1 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, completely after' );
+
+# ---------s1---------------
+# --------------------------
+# e1, s2, e2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = undef;
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no times in object' );
+
+# ---------s1---------------
+# -----s2-------------------
+# e1, e2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, start before, no end in object' );
+
+# ---------s1---------------
+# -------------s2-----------
+# e1, e2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, start after, no end in object' );
+
+# ---------s1---------------
+# ---------s2---------------
+# e1, e2 undef
+# -> overlaps
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e2 = undef;
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping: no end in db, same start' );
+
+# ---------s1---------------
+# ---e2---------------------
+# e1, s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, end before' );
+
+# ---------s1---------------
+# ---------------e2---------
+# e1, s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, end after' );
+
+# ---------s1---------------
+# ---------e2---------------
+# e1, s2 undef
+# -> does not overlap
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+$e1 = undef;
+$s2 = undef;
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 12, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping: no end in db, no start in object, same end' );
+
+########################################
+# not overlapping if different staff_member
+$s1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 10, minute => 0);
+$e1 = DateTime->new(year => 2020, month => 11, day => 15, hour => 15, minute => 0);
+$s2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 11, minute => 0);
+$e2 = DateTime->new(year => 2020, month => 11, day => 15, hour => 14, minute => 0);
+
+clear_up;
+
+@time_recordings = ();
+push @time_recordings, new_time_recording(start_time => $s1, end_time => $e1)->save;
+push @time_recordings, new_time_recording(start_time => $s2, end_time => $e2);
+
+ok( $time_recordings[1]->is_time_overlapping, 'overlapping if same staff member' );
+$time_recordings[1]->update_attributes(staff_member => SL::DB::Employee->new(
+                                         'login' => 'testuser',
+                                         'name'  => 'Test User',
+                                       )->save);
+ok( !$time_recordings[1]->is_time_overlapping, 'not overlapping if different staff member' );
+
+clear_up;
+
+1;
+
+
+# set emacs to perl mode
+# Local Variables:
+# mode: perl
+# End:
diff --git a/t/db_helper/payment.t b/t/db_helper/payment.t
index 154e48c29..55f50185e 100644
--- a/t/db_helper/payment.t
+++ b/t/db_helper/payment.t
@@ -1,5 +1,5 @@
 use strict;
-use Test::More tests => 197;
+use Test::More tests => 255;
 
 use strict;
 
@@ -41,7 +41,6 @@ my $ap_transaction_counter = 0; # used for generating purchase invnumber
 Support::TestSetup::login();
 
 init_state();
-
 # test cases: without_skonto
 test_default_invoice_one_item_19_without_skonto();
 test_default_invoice_two_items_19_7_tax_with_skonto();
@@ -82,7 +81,8 @@ test_ar_currency_tax_not_included_and_payment_2_credit_note();  # exchangerate 0
 test_ap_currency_tax_not_included_and_payment_2();             # two exchangerates, with fx_gain_loss
 test_ap_currency_tax_not_included_and_payment_2_credit_note(); # two exchangerates, with fx_gain_loss
 
-is(SL::DB::Manager::Invoice->get_all_count(), 21,  "number of invoices at end of tests ok");
+test_error_codes_within_skonto();
+is(SL::DB::Manager::Invoice->get_all_count(), 23,  "number of invoices at end of tests ok");
 TODO: {
   local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct";
   my ($acc_trans_sum)  = selectfirst_array_query($::form, $currency->db->dbh, 'SELECT SUM(amount) FROM acc_trans');
@@ -317,8 +317,6 @@ sub test_default_invoice_one_item_19_without_skonto {
     payment_id   => $payment_terms->id,
   );
 
-  my $ap_transaction = new_ap_transaction();
-
   # default values
   my %params = ( chart_id => $bank_account->chart_id,
                  transdate => $transdate1,
@@ -327,18 +325,20 @@ sub test_default_invoice_one_item_19_without_skonto {
   $params{amount} = '6.96';
   $params{payment_type} = 'without_skonto';
 
-  $invoice->pay_invoice( %params );
-
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
-
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
   is($invoice->netamount,   5.85,      "${title}: netamount");
   is($invoice->amount,      6.96,      "${title}: amount");
   is($paid_amount,         -6.96,      "${title}: paid amount");
   is($number_of_payments,      1,      "${title}: 1 AR_paid booking");
   is($invoice->paid,        6.96,      "${title}: paid");
   is($total,                   0,      "${title}: even balance");
-
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+  is($invoice->paid,  $bank_amount->{return_bank_amount},      "${title}: paid eq invoice_amount");
 }
 
 sub test_default_invoice_one_item_19_without_skonto_overpaid {
@@ -362,10 +362,23 @@ sub test_default_invoice_one_item_19_without_skonto_overpaid {
 
   $params{amount} = '16.96';
   $params{payment_type} = 'without_skonto';
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($exp_invoice_amount > 0,  1,     "${title}: bank invoice_amount is positive");
+  my $bt_invoice_amount = $exp_invoice_amount;
+
+  $params{amount} = -10.00;
+  @ret = $invoice->pay_invoice( %params );
+
+  $bank_amount = shift @ret;
+  $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($exp_invoice_amount < 0,  1,     "${title}: bank invoice_amount is negative");
+  $bt_invoice_amount += $exp_invoice_amount;
 
-  $params{amount} = '-10.00';
-  $invoice->pay_invoice( %params );
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -376,6 +389,7 @@ sub test_default_invoice_one_item_19_without_skonto_overpaid {
   is($number_of_payments,      2,      "${title}: 1 AR_paid booking");
   is($invoice->paid,        6.96,      "${title}: paid");
   is($total,                   0,      "${title}: even balance");
+  is($invoice->paid,        $bt_invoice_amount,      "${title}: invoice paid equals bt invoice_amount");
 
 }
 
@@ -402,7 +416,10 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto {
   $params{payment_type} = 'with_skonto_pt';
   $params{amount}       = $invoice->amount_less_skonto;
 
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -436,7 +453,11 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_tax_included {
   $params{payment_type} = 'with_skonto_pt';
   $params{amount}       = $invoice->amount_less_skonto;
 
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -446,6 +467,7 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_tax_included {
   is($paid_amount,               -17.51,   "${title}: paid amount");
   is($invoice->paid,              17.51,   "${title}: paid");
   is($number_of_payments,             3,   "${title}: 3 AR_paid bookings");
+  is($invoice->paid != $bank_amount->{return_bank_amount},   1,   "${title}: paid does not equal bank invoice_amount");
 
 TODO: {
   local $TODO = "currently this test fails because the code writing the invoice is buggy, the calculation of skonto is correct";
@@ -474,7 +496,11 @@ sub test_default_invoice_two_items_19_7_without_skonto {
   $params{amount} = '19.44'; # pass full amount
   $params{payment_type} = 'without_skonto';
 
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -485,6 +511,7 @@ sub test_default_invoice_two_items_19_7_without_skonto {
   is($invoice->paid,                 19.44,     "${title}: paid");
   is($number_of_payments,                1,     "${title}: 1 AR_paid bookings");
   is($total,                             0,     "${title}: even balance");
+  is($invoice->paid,  $bank_amount->{return_bank_amount},  "${title}: paid equals bt.invoice_amount");
 }
 
 # test 4
@@ -500,11 +527,15 @@ sub test_default_invoice_two_items_19_7_without_skonto_incomplete_payment {
     payment_id   => $payment_terms->id,
   );
 
-  $invoice->pay_invoice( amount       => '9.44',
-                         payment_type => 'without_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
-                       );
+  my @ret = $invoice->pay_invoice( amount       => '9.44',
+                                   payment_type => 'without_skonto',
+                                   chart_id     => $bank_account->chart_id,
+                                   transdate    => $transdate1,
+                                 );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? 9.44 : 9.44 * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -515,6 +546,7 @@ sub test_default_invoice_two_items_19_7_without_skonto_incomplete_payment {
   is($invoice->paid,             9.44,            "${title}: paid");
   is($number_of_payments,   1,                "${title}: 1 AR_paid bookings");
   is($total,                    0,                "${title}: even balance");
+  is($invoice->paid,  $bank_amount->{return_bank_amount},  "${title}: paid equals bt.invoice_amount");
 }
 
 # test 5
@@ -529,16 +561,28 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments {
     invoiceitems => [ $item1, $item2 ],
     payment_id   => $payment_terms->id,
   );
-
-  $invoice->pay_invoice( amount       => '9.44',
-                         payment_type => 'without_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
+  my @ret;
+  @ret = $invoice->pay_invoice( amount       => '9.44',
+                                payment_type => 'without_skonto',
+                                chart_id     => $bank_account->chart_id,
+                                transdate    => $transdate1,
                        );
-  $invoice->pay_invoice( amount       => '10.00',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
+
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? 9.44 : 9.44 * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+  my $bank_invoice_amount = $bank_amount->{return_bank_amount};
+
+  @ret = $invoice->pay_invoice( amount       => '10.00',
+                               chart_id     => $bank_account->chart_id,
+                               transdate    => $transdate1,
                        );
+  $bank_amount = shift @ret;
+  $exp_invoice_amount = $invoice->amount > 0 ? 10 : 10 * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+  $bank_invoice_amount += $bank_amount->{return_bank_amount};
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -549,6 +593,7 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments {
   is($invoice->paid,                    19.44,     "${title}: paid");
   is($number_of_payments,                   2,     "${title}: 2 AR_paid bookings");
   is($total,                                0,     "${title}: even balance");
+  is($invoice->paid,   $bank_invoice_amount,       "${title}: paid eq bank invoice_amount");
 
 }
 
@@ -565,28 +610,44 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin
     payment_id   => $payment_terms->id,
   );
 
-  $invoice->pay_invoice( amount       => '9.44',
-                         payment_type => 'without_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
-                       );
-  $invoice->pay_invoice( amount       => '8.73',
-                         payment_type => 'without_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
-                       );
+  my (@ret, $bank_amount, $exp_invoice_amount);
+  @ret = $invoice->pay_invoice( amount       => '9.44',
+                                payment_type => 'without_skonto',
+                                chart_id     => $bank_account->chart_id,
+                                transdate    => $transdate1,
+                              );
+  $bank_amount = shift @ret;
+  my $amount = 9.44;
+  $exp_invoice_amount = $invoice->amount > 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+
+  @ret = $invoice->pay_invoice( amount       => '8.73',
+                                payment_type => 'without_skonto',
+                                chart_id     => $bank_account->chart_id,
+                                transdate    => $transdate1,
+                              );
+  $bank_amount = shift @ret;
+  $amount = 8.73;
+  $exp_invoice_amount = $invoice->amount > 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+
   # free_skonto does:
   #  my $open_amount = $payment_type eq 'with_skonto_pt' ? $invoice->amount_less_skonto : $invoice->open_amount;
   #  $open_amount    = abs($open_amount);
   #  $open_amount   -= $free_skonto_amount if ($payment_type eq 'free_skonto');
 
-  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+  @ret = $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
                          amount        => 0,
                          payment_type  => 'free_skonto',
                          chart_id      => $bank_account->chart_id,
                          transdate     => $transdate1,
                          bt_id         => $bt->id,
                        );
+  $bank_amount = shift @ret;
+  $amount = 0;
+  $exp_invoice_amount = $invoice->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -618,18 +679,30 @@ sub  test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fi
     payment_id   => $payment_terms->id,
   );
 
-  $invoice->pay_invoice( amount       => '19.42',
-                         payment_type => 'without_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
-                       );
-  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
-                         amount       => 0,
-                         payment_type => 'free_skonto',
-                         chart_id     => $bank_account->chart_id,
-                         transdate    => $transdate1,
-                         bt_id        => $bt->id,
-                       );
+  my (@ret, $bank_amount, $exp_invoice_amount);
+  @ret = $invoice->pay_invoice( amount       => '19.42',
+                                payment_type => 'without_skonto',
+                                chart_id     => $bank_account->chart_id,
+                                transdate    => $transdate1,
+                              );
+  $bank_amount        = shift @ret;
+  my $amount          = 19.42;
+  $exp_invoice_amount = $invoice->amount > 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+
+  @ret = $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+                                amount       => 0,
+                                payment_type => 'free_skonto',
+                                chart_id     => $bank_account->chart_id,
+                                transdate    => $transdate1,
+                                bt_id        => $bt->id,
+                              );
+  $bank_amount        = shift @ret;
+  $amount             = 0;
+  $exp_invoice_amount = $invoice->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
 
@@ -654,18 +727,30 @@ sub test_default_invoice_two_items_19_7_tax_without_skonto_multiple_payments_fin
     payment_id   => $payment_terms->id,
   );
 
-  $invoice->pay_invoice( amount       => '19.42',
+  my (@ret, $bank_amount, $exp_invoice_amount);
+  @ret = $invoice->pay_invoice( amount       => '19.42',
                          payment_type => 'without_skonto',
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
                        );
-  $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
+  $bank_amount = shift @ret;
+  my $amount = 19.42;
+  $exp_invoice_amount = $invoice->amount > 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+
+  @ret = $invoice->pay_invoice( skonto_amount => $invoice->open_amount,
                          amount       => 0,
                          payment_type => 'free_skonto',
                          chart_id     => $bank_account->chart_id,
                          transdate    => $transdate1,
                          bt_id        => $bt->id,
                        );
+  $bank_amount = shift @ret;
+  $amount = 0;
+  $exp_invoice_amount = $invoice->amount > 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} == 0,  1,     "${title}: bank invoice_amount is zero");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -698,16 +783,32 @@ sub test_default_invoice_one_item_19_multiple_payment_final_free_skonto {
 
   $params{amount}       = '2.32';
   $params{payment_type} = 'without_skonto';
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+
 
   $params{amount}       = '3.81';
   $params{payment_type} = 'without_skonto';
-  $invoice->pay_invoice( %params );
+  @ret = $invoice->pay_invoice( %params );
+  $bank_amount = shift @ret;
+  $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
+
+
 
   $params{skonto_amount} = $invoice->open_amount; # set amount, otherwise previous 3.81 is used
   $params{amount}        = 0,
   $params{payment_type}  = 'free_skonto';
-  $invoice->pay_invoice( %params );
+  @ret = $invoice->pay_invoice( %params );
+  $bank_amount = shift @ret;
+  $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} == 0,  1,     "${title}: bank invoice_amount is zero");
+
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -740,12 +841,20 @@ sub test_default_invoice_one_item_19_multiple_payment_final_free_skonto_1cent {
 
   $params{amount}       = '6.95';
   $params{payment_type} = 'without_skonto';
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0,  1,     "${title}: bank invoice_amount is positive");
 
   $params{skonto_amount} = $invoice->open_amount;
   $params{amount}        = 0,
   $params{payment_type} = 'free_skonto';
-  $invoice->pay_invoice( %params );
+  @ret = $invoice->pay_invoice( %params );
+  $bank_amount = shift @ret;
+  $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -761,7 +870,7 @@ sub test_default_invoice_one_item_19_multiple_payment_final_free_skonto_1cent {
 
 # test 3 : two items, without skonto
 sub test_default_ap_transaction_two_charts_19_7_without_skonto {
-  my $title = 'default invoice, two items, 19/7% tax without skonto';
+  my $title = 'default ap_transaction, two items, 19/7% tax without skonto';
 
   my $ap_transaction = new_ap_transaction();
 
@@ -769,17 +878,22 @@ sub test_default_ap_transaction_two_charts_19_7_without_skonto {
                  transdate => $transdate1,
                );
 
-  $params{amount} = '226'; # pass full amount
+  $params{amount} = 226; # pass full amount
   $params{payment_type} = 'without_skonto';
 
-  $ap_transaction->pay_invoice( %params );
+  my @ret = $ap_transaction->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $ap_transaction->amount < 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0,  1,     "${title}: bank invoice_amount is negative");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($ap_transaction);
   my $total = total_amount($ap_transaction);
 
-  is($paid_amount,         226,     "${title}: paid amount");
-  is($number_of_payments,    1,     "${title}: 1 AP_paid bookings");
-  is($total,                 0,     "${title}: even balance");
+  is($paid_amount,            226,     "${title}: paid amount");
+  is($ap_transaction->paid,   226,     "${title}: ap.paid amount");
+  is($number_of_payments,       1,     "${title}: 1 AP_paid bookings");
+  is($total,                    0,     "${title}: even balance");
 
 }
 
@@ -798,14 +912,19 @@ sub test_default_ap_transaction_two_charts_19_7_with_skonto {
   $params{amount}       = $ap_transaction->amount_less_skonto; # pass calculated skonto amount
   $params{payment_type} = 'with_skonto_pt';
 
-  $ap_transaction->pay_invoice( %params );
+  my @ret = $ap_transaction->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $ap_transaction->amount < 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0,  1,     "${title}: bank invoice_amount is negative");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($ap_transaction);
   my $total = total_amount($ap_transaction);
 
-  is($paid_amount,         226,     "${title}: paid amount");
-  is($number_of_payments,    3,     "${title}: 1 AP_paid bookings");
-  is($total,                 0,     "${title}: even balance");
+  is($paid_amount,                  226,     "${title}: paid amount");
+  is($ap_transaction->paid,         226,     "${title}: paid amount");
+  is($number_of_payments,             3,     "${title}: 1 AP_paid bookings");
+  is($total,                          0,     "${title}: even balance");
 
 }
 
@@ -814,18 +933,26 @@ sub test_default_ap_transaction_two_charts_19_7_tax_partial_unrounded_payment_wi
 
   # check whether unrounded amounts passed via $params{amount} are rounded for without_skonto case
   my $ap_transaction = new_ap_transaction();
-  $ap_transaction->pay_invoice(
-                          amount       => ( $ap_transaction->amount / 3 * 2),
-                          payment_type => 'without_skonto',
-                          chart_id     => $bank_account->chart_id,
-                          transdate    => $transdate1,
-                         );
+  my @ret = $ap_transaction->pay_invoice(
+                                         amount       => ( $ap_transaction->amount / 3 * 2),
+                                         payment_type => 'without_skonto',
+                                         chart_id     => $bank_account->chart_id,
+                                         transdate    => $transdate1,
+                                        );
+  my $bank_amount = shift @ret;
+  my $amount      = $::form->round_amount( $ap_transaction->amount / 3 * 2, 2);
+  my $exp_invoice_amount = $ap_transaction->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0,  1,     "${title}: bank invoice_amount is negative");
+
+
   my ($number_of_payments, $paid_amount) = number_of_payments($ap_transaction);
   my $total = total_amount($ap_transaction);
 
-  is($paid_amount,         150.67,   "${title}: paid amount");
-  is($number_of_payments,       1,   "${title}: 1 AP_paid bookings");
-  is($total,                    0,   "${title}: even balance");
+  is($paid_amount,                  150.67,   "${title}: paid amount");
+  is($ap_transaction->paid,         150.67,   "${title}: paid amount");
+  is($number_of_payments,                1,   "${title}: 1 AP_paid bookings");
+  is($total,                             0,   "${title}: even balance");
 };
 
 
@@ -835,19 +962,31 @@ sub test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_paym
   my $ap_transaction = new_ap_transaction();
 
   # pay 2/3 and 1/5, leaves 3.83% to be used as Skonto
-  $ap_transaction->pay_invoice(
+  my @ret = $ap_transaction->pay_invoice(
                           amount       => ( $ap_transaction->amount / 3 * 2),
                           payment_type => 'without_skonto',
                           chart_id     => $bank_account->chart_id,
                           transdate    => $transdate1,
                          );
-  $ap_transaction->pay_invoice(
+  my $bank_amount = shift @ret;
+  my $amount      = $::form->round_amount( $ap_transaction->amount / 3 * 2, 2);
+  my $exp_invoice_amount = $ap_transaction->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0,  1,     "${title}: bank invoice_amount is negative");
+
+  @ret = $ap_transaction->pay_invoice(
                           amount       => ( $ap_transaction->amount / 5 ),
                           payment_type => 'without_skonto',
                           chart_id     => $bank_account->chart_id,
                           transdate    => $transdate1,
                          );
-  $ap_transaction->pay_invoice(
+  $bank_amount = shift @ret;
+  $amount      =  $ap_transaction->amount / 5;
+  $exp_invoice_amount = $ap_transaction->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0, 1,     "${title}: invoice_amount negative");
+
+  @ret = $ap_transaction->pay_invoice(
                           payment_type => 'free_skonto',
                           skonto_amount => $ap_transaction->open_amount,
                           amount       => 0,
@@ -855,13 +994,18 @@ sub test_default_ap_transaction_two_charts_19_7_tax_without_skonto_multiple_paym
                           transdate    => $transdate1,
                           bt_id        => $bt->id,
                          );
+  $bank_amount = shift @ret;
+  $amount      = 0;
+  $exp_invoice_amount = $ap_transaction->amount < 0 ? $amount : $amount * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($ap_transaction);
   my $total = total_amount($ap_transaction);
 
-  is($paid_amount,         226, "${title}: paid amount");
-  is($number_of_payments,    4, "${title}: 4 AP_paid bookings");
-  is($total,                 0, "${title}: even balance");
+  is($paid_amount,                  226, "${title}: paid amount");
+  is($ap_transaction->paid,         226, "${title}: ap.paid amount");
+  is($number_of_payments,             4, "${title}: 4 AP_paid bookings");
+  is($total,                          0, "${title}: even balance");
 
 }
 
@@ -887,7 +1031,11 @@ sub test_default_invoice_two_items_19_7_tax_with_skonto_50_50 {
   $params{amount} = $invoice->amount_less_skonto;
   $params{payment_type} = 'with_skonto_pt';
 
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+  my $exp_invoice_amount = $invoice->amount > 0 ? $params{amount} : $params{amount} * -1;
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} > 0, 1,     "${title}: invoice_amount positive");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -1018,7 +1166,7 @@ sub test_ar_currency_tax_not_included_and_payment {
   my $title = 'test_ar_currency_tax_not_included_and_payment_2';
 
   my $netamount = $::form->round_amount(75 * $exchangerate->sell,2); #  75 in CUR, 100.00 in EUR
-  my $amount    = $::form->round_amount($netamount * 1.19,2);        # 100 in CUR, 119.00 in EUR
+  my $amount    = $::form->round_amount($netamount * 1.19,2);        # 100 in EUR, 119.00 in EUR incl. tax
   my $invoice   = SL::DB::Invoice->new(
       invoice      => 0,
       amount       => $amount,
@@ -1047,24 +1195,27 @@ sub test_ar_currency_tax_not_included_and_payment {
   is($invoice->taxincluded ,   0           , 'ar transaction doesn\'t have taxincluded');
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_amount_chart->id, trans_id => $invoice->id)->amount, '100.00000', $ar_amount_chart->accno . ': has been converted for currency');
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_chart->id, trans_id => $invoice->id)->amount, '-119.00000', $ar_chart->accno . ': has been converted for currency');
-
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 50,
+                        amount     => 50,     # amount is in default currency -> should be 37.5 in CUR
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 39.25,
+                        amount     => 39.25,  # amount is in default currency -> should be 29.44 in CUR
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->sell,
                        );
-  # $invoice->pay_invoice(chart_id   => $bank->id,
-  #                       amount     => 30,
-  #                       transdate  => $transdate2->to_kivitendo,
-  #                      );
-  is(scalar @{$invoice->transactions}, 9, 'ar transaction has 9 transactions (incl. fxtransactions)');
+  $invoice->pay_invoice(chart_id   => $bank->id,
+                        amount     => 29.75,
+                        transdate  => $transdate1->to_kivitendo,
+                        currency   => 'CUR',
+                        exchangerate => $exchangerate->sell,
+                        );
+  is(scalar @{$invoice->transactions}, 9, 'ar transaction has 9 transactions');
   is($invoice->paid, $invoice->amount, 'ar transaction paid = amount in default currency');
-};
+}
 
 sub test_ar_currency_tax_included {
   my $title = 'test_ar_currency_tax_included';
@@ -1103,6 +1254,7 @@ sub test_ar_currency_tax_included {
                         amount     => 89.25,
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->sell,
                        );
 
 };
@@ -1145,15 +1297,43 @@ sub test_ap_currency_tax_not_included_and_payment {
                         amount     => 50,
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->buy,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
                         amount     => 39.25,
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->buy,
                        );
-  is(scalar @{$invoice->transactions}, 9, 'ap transaction has 9 transactions (incl. fxtransactions)');
+  is($invoice->paid, 89.25, 'ap transaction paid = amount in default currency');
+  $invoice->pay_invoice(chart_id   => $bank->id,
+                        amount     => 22.31 * $exchangerate2->buy,  # 22.31 in fx currency
+                        currency   => 'CUR',
+                        transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->buy,
+                       );
+
+  is(scalar @{$invoice->transactions}, 10, 'ap transaction has 10 transactions (including fx gain transaction)');
   is($invoice->paid, $invoice->amount, 'ap transaction paid = amount in default currency');
-};
+
+  # check last booking fx rate decreased to 0.8 from 1.33333
+  my $fxgain_chart         = SL::DB::Manager::Chart->find_by(accno => '2660') or die "Can't find fxgain_chart in test";
+  my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $fxgain_chart->id ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($fx_gain_transactions->[0]->amount,   '11.90000', "fx gain amount ok");
+
+  # check last bank transaction should be 22.31 * 0.8
+  my $last_bank_transaction = SL::DB::Manager::AccTransaction->get_all(where =>
+                                [ trans_id => $invoice->id, chart_id => $bank->id, transdate => $transdate2 ],
+                                  sort_by => ('acc_trans_id'));
+
+  is($last_bank_transaction->[0]->amount, '17.85000', "fx bank amount with fx gain ok");
+
+
+
+}
 
 sub test_ap_currency_tax_included {
   my $title = 'test_ap_currency_tax_included';
@@ -1193,6 +1373,7 @@ sub test_ap_currency_tax_included {
                         amount     => 89.25,
                         currency   => 'CUR',
                         transdate  => $transdate1->to_kivitendo,
+                        exchangerate => $exchangerate->sell,
                        );
 
 };
@@ -1232,29 +1413,30 @@ sub test_ar_currency_tax_not_included_and_payment_2 {
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_chart->id, trans_id => $invoice->id)->amount, '-119.00000', $title  . " " . $ar_chart->accno . ': has been converted for currency');
 
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 123.45,
+                        amount     => 123.45 * $exchangerate2->sell,
                         currency   => 'CUR',
                         transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 15.30,
+                        amount     => 15.30 * $exchangerate3->sell,
                         currency   => 'CUR',
                         transdate  => $transdate3->to_kivitendo,
+                        exchangerate => $exchangerate3->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 10.00,
+                        amount     => 10.00 * $exchangerate4->sell,
                         currency   => 'CUR',
                         transdate  => $transdate4->to_kivitendo,
+                        exchangerate => $exchangerate4->sell,
                        );
   # $invoice->pay_invoice(chart_id   => $bank->id,
   #                       amount     => 30,
   #                       transdate  => $transdate2->to_kivitendo,
   #                      );
-  my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
-  is(scalar @{$fx_transactions}, 3, "$title: ar transaction has 3 fx transactions");
-  is($fx_transactions->[0]->amount, '24.69000', "$title fx transactions 1: 123.45-(123.45*0.8) = 24.69");
+  my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 0 ], sort_by => ('acc_trans_id'));
+  is(scalar @{$fx_transactions}, 11, "$title: ar transaction has 11 transaction");
 
-  is(scalar @{$invoice->transactions}, 14, "$title ar transaction has 14 transactions (incl. fxtransactions and fx_gain)");
   is($invoice->paid, $invoice->amount, "$title ar transaction paid = amount in default currency");
 };
 
@@ -1293,20 +1475,22 @@ sub test_ar_currency_tax_not_included_and_payment_2_credit_note {
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ar_chart->id, trans_id => $invoice->id)->amount, '119.00000', $ar_chart->accno . ': has been converted for currency');
 
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => -123.45,
+                        amount     => -123.45 * $exchangerate2->sell,
                         currency   => 'CUR',
                         transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => -25.30,
+                        amount     => -25.30 * $exchangerate2->sell,
                         currency   => 'CUR',
                         transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->sell,
                        );
-  my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
-  is(scalar @{$fx_transactions}, 2, 'ar transaction has 2 fx transactions');
-  is($fx_transactions->[0]->amount, '-24.69000', 'fx transactions 1: 123.45-(123.45*0.8) = 24.69');
+  #my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
+  #is(scalar @{$fx_transactions}, 2, 'ar transaction has 2 fx transactions');
+  #is($fx_transactions->[0]->amount, '-24.69000', 'fx transactions 1: 123.45-(123.45*0.8) = 24.69');
 
-  is(scalar @{$invoice->transactions}, 9, 'ar transaction has 9 transactions (incl. fxtransactions)');
+  is(scalar @{$invoice->transactions}, 7, 'ar transaction has 7 transactions (no fxtransactions)');
   is($invoice->paid, $invoice->amount, 'ar transaction paid = amount in default currency');
 };
 
@@ -1345,32 +1529,35 @@ sub test_ap_currency_tax_not_included_and_payment_2 {
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ap_chart->id, trans_id => $invoice->id)->amount, '119.00000', $ap_chart->accno . ': has been converted for currency');
 
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 10,
+                        amount     => 10 * $exchangerate2->sell,
                         currency   => 'CUR',
                         transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 123.45,
+                        amount     => 123.45 * $exchangerate3->sell,
                         currency   => 'CUR',
                         transdate  => $transdate3->to_kivitendo,
+                        exchangerate => $exchangerate3->sell,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => 15.30,
+                        amount     => 15.30 * $exchangerate4->sell,
                         currency   => 'CUR',
                         transdate  => $transdate4->to_kivitendo,
+                        exchangerate => $exchangerate4->sell,
                        );
-  my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
-  is(scalar @{$fx_transactions}, 3, "$title: ap transaction has 3 fx transactions");
-  is($fx_transactions->[0]->amount,  '-2.00000', "$title: fx transaction 1:  10.00-( 10.00*0.80000) =   2.00000");
-  is($fx_transactions->[1]->amount,  '68.59000', "$title: fx transaction 2: 123.45-(123.45*1.55557) = -68.58511");
-  is($fx_transactions->[2]->amount,  '-3.40000', "$title: fx transaction 3:  15.30-(15.30 *0.77777) =   3.40012");
+  #my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
+  #is(scalar @{$fx_transactions}, 3, "$title: ap transaction has 3 fx transactions");
+  #is($fx_transactions->[0]->amount,  '-2.00000', "$title: fx transaction 1:  10.00-( 10.00*0.80000) =   2.00000");
+  #is($fx_transactions->[1]->amount,  '68.59000', "$title: fx transaction 2: 123.45-(123.45*1.55557) = -68.58511");
+  #is($fx_transactions->[2]->amount,  '-3.40000', "$title: fx transaction 3:  15.30-(15.30 *0.77777) =   3.40012");
 
   my $fx_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $fxloss_chart->id ], sort_by => ('acc_trans_id'));
   my $fx_gain_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $fxgain_chart->id ], sort_by => ('acc_trans_id'));
   is($fx_gain_transactions->[0]->amount,   '0.34000', "$title: fx gain amount ok");
   is($fx_loss_transactions->[0]->amount, '-93.28000', "$title: fx loss amount ok");
 
-  is(scalar @{$invoice->transactions}, 14, "$title: ap transaction has 14 transactions (incl. fxtransactions and gain_loss)");
+  is(scalar @{$invoice->transactions}, 11, "$title: ap transaction has 11 transactions (no fxtransactions and gain_loss)");
   is($invoice->paid, $invoice->amount, "$title: ap transaction paid = amount in default currency");
   is(total_amount($invoice), 0,   "$title: even balance");
 };
@@ -1378,7 +1565,7 @@ sub test_ap_currency_tax_not_included_and_payment_2 {
 sub test_ap_currency_tax_not_included_and_payment_2_credit_note {
   my $title = 'test_ap_currency_tax_not_included_and_payment_2_credit_note';
 
-  my $netamount = $::form->round_amount(-125 * $exchangerate2->sell,2); # 125.00 in CUR, 100.00 in EUR
+  my $netamount = $::form->round_amount(-125 * $exchangerate2->buy, 2); # 125.00 in CUR, 100.00 in EUR
   my $amount    = $::form->round_amount($netamount * 1.19,2);          # 148.75 in CUR, 119.00 in EUR
   my $invoice   = SL::DB::PurchaseInvoice->new(
       invoice      => 0,
@@ -1410,30 +1597,33 @@ sub test_ap_currency_tax_not_included_and_payment_2_credit_note {
   is(SL::DB::Manager::AccTransaction->find_by(chart_id => $ap_chart->id, trans_id => $invoice->id)->amount, '-119.00000', $ap_chart->accno . ': has been converted for currency');
 
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => -10,
+                        amount     => -10 * $exchangerate2->buy,
                         currency   => 'CUR',
                         transdate  => $transdate2->to_kivitendo,
+                        exchangerate => $exchangerate2->buy,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => -123.45,
+                        amount     => -123.45 * $exchangerate3->buy,
                         currency   => 'CUR',
                         transdate  => $transdate3->to_kivitendo,
+                        exchangerate => $exchangerate3->buy,
                        );
   $invoice->pay_invoice(chart_id   => $bank->id,
-                        amount     => -15.30,
+                        amount     => -15.30 * $exchangerate4->buy,
                         currency   => 'CUR',
                         transdate  => $transdate4->to_kivitendo,
+                        exchangerate => $exchangerate4->buy,
                        );
-  my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
-  is(scalar @{$fx_transactions}, 3, "$title: ap transaction has 3 fx transactions");
-  is($fx_transactions->[0]->amount,   '2.00000', "$title: fx transaction 1:  10.00-( 10.00*0.80000) =   2.00000");
-  is($fx_transactions->[1]->amount, '-68.59000', "$title: fx transaction 2: 123.45-(123.45*1.55557) = -68.58511");
-  is($fx_transactions->[2]->amount,   '3.40000', "$title: fx transaction 3:  15.30-(15.30 *0.77777) =   3.40012");
+  #my $fx_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, fx_transaction => 1 ], sort_by => ('acc_trans_id'));
+  #is(scalar @{$fx_transactions}, 3, "$title: ap transaction has 3 fx transactions");
+  #is($fx_transactions->[0]->amount,   '2.00000', "$title: fx transaction 1:  10.00-( 10.00*0.80000) =   2.00000");
+  #is($fx_transactions->[1]->amount, '-68.59000', "$title: fx transaction 2: 123.45-(123.45*1.55557) = -68.58511");
+  #is($fx_transactions->[2]->amount,   '3.40000', "$title: fx transaction 3:  15.30-(15.30 *0.77777) =   3.40012");
 
   my $fx_gain_loss_transactions = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $invoice->id, chart_id => $fxgain_chart->id ], sort_by => ('acc_trans_id'));
   is($fx_gain_loss_transactions->[0]->amount, '93.28000', "$title: fx gain loss amount ok");
 
-  is(scalar @{$invoice->transactions}, 14, "$title: ap transaction has 14 transactions (incl. fxtransactions and gain_loss)");
+  is(scalar @{$invoice->transactions}, 11, "$title: ap transaction has 11 transactions (no fxtransactions and gain_loss)");
   is($invoice->paid, $invoice->amount, "$title: ap transaction paid = amount in default currency");
   is(total_amount($invoice), 0,   "$title: even balance");
 };
@@ -1457,7 +1647,12 @@ sub test_credit_note_two_items_19_7_tax_tax_not_included {
 
   $params{amount}       = $invoice->amount,
 
-  $invoice->pay_invoice( %params );
+  my @ret = $invoice->pay_invoice( %params );
+  my $bank_amount = shift @ret;
+
+  my $exp_invoice_amount =  $params{amount};
+  is($bank_amount->{return_bank_amount}, $exp_invoice_amount,      "${title}: invoice_amount");
+  is($bank_amount->{return_bank_amount} < 0,  1,     "${title}: bank invoice_amount is negative (credit note)");
 
   my ($number_of_payments, $paid_amount) = number_of_payments($invoice);
   my $total = total_amount($invoice);
@@ -1470,4 +1665,41 @@ sub test_credit_note_two_items_19_7_tax_tax_not_included {
   is($total,                          0,   "${title}: even balance");
 }
 
+sub test_error_codes_within_skonto {
+  my $title   = 'test within_skonto_period';
+  my $item1   = create_invoice_item(part => $parts[0], qty => 2.5);
+  my $item2   = create_invoice_item(part => $parts[1], qty => 1.2);
+  # no skonto payment terms at all
+  my $invoice = create_sales_invoice(
+    transdate    => $transdate1,
+    taxincluded  => 1,
+    invoiceitems => [ $item1, $item2 ],
+  );
+  # has skonto payment terms
+  my $invoice2 = create_sales_invoice(
+    transdate    => $transdate1,
+    taxincluded  => 1,
+    invoiceitems => [ $item1, $item2 ],
+    payment_id   => $payment_terms->id,
+  );
+
+  throws_ok{
+    $invoice->within_skonto_period();
+   } qr/Mandatory parameter 'transdate' missing in call to SL::DB::Helper::Payment::within_skonto_period/, "call without parameter throws correct error message";
+
+  throws_ok{
+    $invoice->within_skonto_period(transdate => 'Kaese');
+   } qr/The 'transdate' parameter \("Kaese"\) to SL::DB::Helper::Payment::within_skonto_period was not a 'DateTime' \(it is a Kaese\)/, "call with parameter Käse throws correct error message";
+
+  throws_ok{
+    $invoice->within_skonto_period(transdate => DateTime->now());
+  } qr /The 'transdate' parameter .* to SL::DB::Helper::Payment::within_skonto_period did not pass the 'self has a skonto date' callback/, "call to invoice withount skonto throws correct error message";
+
+  is($invoice2->within_skonto_period(transdate => DateTime->now()->add(days => 1)), 1, "one day after invdate is skontoable");
+  is($invoice2->within_skonto_period(transdate => DateTime->now()->add(days => 4)), 1, "four days after invdate is skontoable");
+
+  is($invoice2->within_skonto_period(transdate => DateTime->now()->add(days => 6)), '', 'not within skonto period');
+
+}
+
 1;
diff --git a/t/db_helper/record_links.t b/t/db_helper/record_links.t
index 2c7ea4db6..3a21f58d8 100644
--- a/t/db_helper/record_links.t
+++ b/t/db_helper/record_links.t
@@ -18,6 +18,7 @@ use SL::DB::Customer;
 use SL::DB::Employee;
 use SL::DB::Invoice;
 use SL::DB::Order;
+use SL::DB::Order::TypeData qw(:types);
 use SL::DB::DeliveryOrder;
 use SL::DB::DeliveryOrder::TypeData qw(:types);
 use SL::DB::Part;
@@ -66,14 +67,16 @@ sub reset_state {
 
 sub new_order {
   my %params  = @_;
+  my $record_type = delete $params{record_type};
+  $record_type ||= SALES_ORDER_TYPE();
 
   return SL::DB::Order->new(
+    record_type => $record_type,
     customer_id => $customer->id,
     currency_id => $currency_id,
     employee_id => $employee->id,
     salesman_id => $employee->id,
     taxzone_id  => $taxzone->id,
-    quotation   => 0,
     %params,
   )->save;
 }
@@ -87,7 +90,7 @@ sub new_delivery_order {
     employee_id => $employee->id,
     salesman_id => $employee->id,
     taxzone_id  => $taxzone->id,
-    order_type => SALES_DELIVERY_ORDER_TYPE,
+    record_type => SALES_DELIVERY_ORDER_TYPE,
     %params,
   )->save;
 }
@@ -150,14 +153,14 @@ $links = $i->linked_records(direction => 'from', from => 'Order');
 is @$links, 0, 'no dangling link after delete';
 
 # can we distinguish between types?
-$o1 = new_order(quotation => 1);
+$o1 = new_order(record_type => SALES_QUOTATION_TYPE());
 $o2 = new_order();
 $o1->link_to_record($o2);
 
-$links = $o2->linked_records(direction => 'from', from => 'Order', query => [ quotation => 1 ]);
+$links = $o2->linked_records(direction => 'from', from => 'Order', query => [ record_type => SALES_QUOTATION_TYPE() ]);
 is $links->[0]->id, $o1->id, 'query restricted retrieve 1';
 
-$links = $o2->linked_records(direction => 'from', from => 'Order', query => [ quotation => 0 ]);
+$links = $o2->linked_records(direction => 'from', from => 'Order', query => [ record_type => SALES_ORDER_TYPE() ]);
 is @$links, 0, 'query restricted retrieve 2';
 
 # try bidirectional linking
@@ -222,7 +225,7 @@ $links = $o1->linked_records(direction => 'from', from => 'Order');
 is $links->[0]->{_record_link_direction}, 'from',  '_record_link_direction from';
 is $links->[0]->{_record_link}->to_id, $o1->id,  '_record_link from';
 
-# check if bidi returns an array of links even if aready existing
+# check if bidi returns an array of links even if already existing
 my @links = $d->link_to_record($o2, bidirectional => 1);
 # at this point the structure is:
 #
@@ -306,7 +309,7 @@ is_deeply $sorted, [$d, $o1, $i, $o2], 'sorting by transdate desc';
 $links = $o1->linked_records(direction => 'to', recursive => 1, save_path => 1);
 is @$links, 4, 'recursive finds all 4 (backlink to self because of bidi o1<->o2)';
 
-# because of the link o1->d the longest path should be legth 2. test that
+# because of the link o1->d the longest path should be length 2. test that
 is max(map { $_->{_record_link_depth} } @$links), 2, 'longest path is 2';
 
 $links = $o2->linked_records(direction => 'to', recursive => 1);
@@ -338,7 +341,9 @@ $o1->link_to_record($i1);
 $o2->link_to_record($i2);
 
 $links = $o1->linked_records(direction => 'to', to => 'Invoice', batch => [ $o1->id, $o2->id ]);
-is_deeply [ map { $_->id } @$links ], [ $i1->id , $i2->id ], "batch works";
+{ local $TODO = 'Check, if the helper should return links in the order of ids given to batch';
+  is_deeply [ map { $_->id } @$links ], [ $i1->id , $i2->id ], "batch works";
+}
 
 $links = $o1->linked_records(direction => 'to', recursive => 1, batch => [ $o1->id, $o2->id ]);
 cmp_bag [ map { $_->id } @$links ], [ $i1->id , $i2->id ], "batch works recursive";
diff --git a/t/fxtransaction/README.txt b/t/fxtransaction/README.txt
new file mode 100644
index 000000000..ae67e53c7
--- /dev/null
+++ b/t/fxtransaction/README.txt
@@ -0,0 +1,70 @@
+These tests are for handling of foreign currencies in the old bin/mozilla controllers.
+
+At the time of this writing, the problems are a combination of the following properties:
+
+
+1. The old controllers accumulate data on each roundtrip, and user intend often gets lost before even saving, especially with:
+  - tax included
+  - foreign exchange
+  - discounts/price
+  - payment details
+
+  These information must be processed and rendered both when coming from the user (freshly input) and when coming from the database (when loading a posted invoice)
+
+2. payment specifically has 3 paths that can create them:
+  - directly in the bin/mozilla form
+  - via bank import
+  - with the new Payment helper
+
+3. fx transactions are booked internally in the system currency, but displayed in the frontend in the foreign currency.
+
+4. exchangerates are saved independantly for post date and payment date, which can lead to gains/losses when converting to system currency
+
+   example
+     user buys for 1000$ (system currency €, exchangerate 1€ - 2$):
+     purchase invoice shows 1000$, but gets posted as 500€
+     customer pays 800$, which would be 80% of the invoice, 400€ at the initial exchangerate
+     but exchangerate at payment date is now 1€ = 1$, so the payment ist actually 800€
+     invoice still gets 400€ paid. the other 400€ get put into losses  from exchangerates
+
+
+5. a special case arises for invoices with foreign currency where the payment is exchanged by the bank and then imported in default currency into kivitendo:
+
+
+For a normal purchase invoice with foreign currency:
+
+  1. main transaction (in system currency)
+    - -500 chart
+    - +500 Verb.a.L.u.L.
+  2. payment proportional to stated value in foreign currency converted into system currency: 800$ ist 80% of 1000$, so 80% of 500€ get cleared
+    - -400 Verb.a.L.u.L. - payment clears 80% of the total amount
+    - +800 Kasse         - the stated amount in dollar, which happens to also be the euro amount
+    - -400 fxloss (fx_trasnaction) - the difference is lost
+
+With an exchangerate of 1€ = 1.6$ (500€ = 800$) at payment time, the listing would be:
+
+  1. main transaction (in system currency)
+    - -500 chart
+    - +500 Verb.a.L.u.L.
+  2. payment proportional to stated value in foreign currency converted into system currency: 800$ ist 80% of 1000$, so 80% of 500€ get cleared
+    - -400 Verb.a.L.u.L. - payment clears 80% of the total amount
+    - +800 Kasse         - the stated amount in dollar
+    - -300 Kasse (fx_transaction) - to bring the amount down to the real 500€
+    - -100 fxloss        - aghain, the difference is lost
+
+For a bank transaction the payment is instead exchanged _before_ being added into the purchase invoice, so there is no fx_transaction
+
+  1. main transaction (in system currency)
+    - -500 chart
+    - +500 Verb.a.L.u.L
+  2. payment proportional to stated value in foreign currency converted into system currency + fx correction
+    - -400 Verb.a.L.u.L.
+    - +400 Kasse
+
+in this case there are no fx_transctions.
+
+
+6. Old controllers now need to display both of these cases as they find them in the database and preserve them through update(), post() and post_payment()
+
+
+
diff --git a/t/fxtransaction/ap_transactions.t b/t/fxtransaction/ap_transactions.t
new file mode 100644
index 000000000..0c9066c78
--- /dev/null
+++ b/t/fxtransaction/ap_transactions.t
@@ -0,0 +1,280 @@
+use strict;
+
+use lib 't';
+
+use Test::More;
+
+use SL::Controller::BankTransaction;
+use SL::DB::AccTransaction;
+use SL::DB::BankTransaction;
+use SL::DB::BankTransactionAccTrans;
+use SL::DB::Chart;
+use SL::DB::Currency;
+use SL::DB::Employee;
+use SL::DB::Exchangerate;
+use SL::DB::InvoiceItem;
+use SL::DB::PurchaseInvoice;
+use SL::DB::TaxZone;
+use SL::DB::ValidityToken;
+use SL::Dev::CustomerVendor qw(:ALL);
+use SL::Dev::Part qw(:ALL);
+use SL::Dev::Payment qw(:ALL);
+use SL::Form;
+use SL::Helper::Number qw(_format_number);
+use SL::InstanceConfiguration;
+
+use HTML::Query;
+use Support::TestSetup;
+use Support::Integration;
+
+my $part;
+my $vendor;
+my $usd;
+my $taxzone;
+my $fxgain;
+my $fxloss;
+my $payment_terms;
+my $dt;
+
+sub reset_db {
+  SL::DB::Manager::BankTransactionAccTrans->delete_all(all => 1);
+  SL::DB::Manager::BankTransaction->delete_all(all => 1);
+  SL::DB::Manager::AccTransaction->delete_all(all => 1);
+  SL::DB::Manager::InvoiceItem->delete_all(all => 1);
+  SL::DB::Manager::PurchaseInvoice->delete_all(all => 1);
+  SL::DB::Manager::Exchangerate->delete_all(all => 1);
+  $usd->delete;
+  $vendor->delete;
+  $part->delete;
+  $payment_terms->delete;
+}
+
+sub init_db {
+  SL::DB::Manager::Exchangerate->delete_all(all => 1);
+  $vendor = new_vendor->save;
+  $part   = new_part->save;
+  $usd    = SL::DB::Manager::Currency->find_by(name => 'USD') // SL::DB::Currency->new(name => 'USD')->save;
+  $taxzone = SL::DB::Manager::TaxZone->find_by( description => 'Inland');
+  $fxgain = SL::DB::Manager::Chart->find_by(accno => '2660');
+  $fxloss = SL::DB::Manager::Chart->find_by(accno => '2150');
+  $payment_terms = create_payment_terms();
+  $dt    = DateTime->new(year => 1999, month => 1, day => 12);
+
+
+  SL::DB::Default->get->update_attributes(
+    fxgain_accno_id => $fxgain->id,
+    fxloss_accno_id => $fxloss->id,
+  )->load;
+  # reload
+  $::instance_conf = SL::InstanceConfiguration->new;
+
+}
+
+######## main test code #######
+
+Support::TestSetup::login();
+Support::Integration::setup();
+init_db();
+
+{
+  my $description = "simple purchase invoice";
+  #   vendor 1
+  #   part 1
+  my $currency = 'USD';
+  my $exchangerate = 2.5;
+  my $payment_exchangerate = 1.5;
+
+  my %form;
+
+  # make new invoice
+  my ($out, $err, @ret) = make_request('ir', 'add', type => 'invoice');
+  is $ret[0], 1, "new purchase invoice";
+  %form = form_from_html($out);
+
+  # set invnumber and currency
+  $form{invnumber}    = $description;
+  $form{currency}     = $currency;
+
+  # update
+  ($out, $err, @ret) = make_request('ir', 'update', %form);
+  is $ret[0], 1, "update purchase invoice with currency";
+  %form = form_from_html($out);
+
+  # set part and exchangerate
+  $form{exchangerate} = _format_number($exchangerate, -2);
+  $form{partnumber_1} = $part->partnumber;
+
+  # update
+  ($out, $err, @ret) = make_request('ir', 'update', %form);
+  is $ret[0], 1, "update purchase invoice with part and exchangerate";
+  %form = form_from_html($out);
+
+  # now set par, exchangerate and payments - this will cause the part to be loaded with the lastcost translated into USD
+  $form{paid_1}           = _format_number($part->lastcost / $exchangerate, -2);  # lastcost = 5€ = 2$
+  $form{exchangerate_1}   = _format_number($payment_exchangerate, -2);
+
+  ($out, $err, @ret) = make_request('ir', 'post', %form);
+  is $ret[0], 1, "posting '$description' does not generate error";
+  warn $err if $err;
+  ok $out =~ /ir\.pl\?action=edit&id=(\d+)/, "posting '$description' returns redirect to id";
+  my $id = $1;
+
+  ($out, $err, @ret) = make_request('ir', 'edit', id => $id );
+  is $ret[0], 1, "'$description' did not cause an error";
+  warn $err if $err;
+
+  my $q = HTML::Query->new(text => $out);
+  is $q->query('input[name=paid_1]')->size, 1, "out '$description' contains paid_1";
+  is $q->query('input[name=paid_1]')->first->attr('value'), '2,00', "out '$description' paid_1 is 2,00 (the dollar amount, not the internal 5.00€)";
+
+  is $q->query('#ui-tabs-basic-data tr.invtotal th')->first->as_text, 'Summe', "'$description' - total present";
+  is $q->query('#ui-tabs-basic-data tr.invtotal td')->first->as_text, '2,38', "'$description' - total should be 2.00 * 1.19 = 2.38";
+  is $q->query('#ui-tabs-basic-data input[name=oldtotalpaid]')->first->attr('value'), '2', "'$description' - totalpaid should be 2,00 in dollar, not the internal value";
+};
+
+{
+  my $description = "ap transaction from redmine #563";
+  #   20 on 4710 Verpackungsmaterial
+  #   20 payment on 1000 kasse
+  my $currency             = 'USD';
+  my $exchangerate         = 1.1;
+  my $payment_exchangerate = 1.3;
+  my $chart                = SL::DB::Manager::Chart->find_by(accno => '4710');
+  my %form;
+
+  # make new ap transaction
+  my ($out, $err, @ret) = make_request('ap', 'add');
+  is $ret[0], 1, "new ap transaction";
+  %form = form_from_html($out);
+
+  # set chart, amount, currency, invnumber
+  $form{AP_amount_chart_id_1} = $chart->id;
+  $form{amount_1}             = 20;
+  $form{currency}             = 'USD';
+  $form{invnumber} = $description;
+
+  # make new ap transaction
+  ($out, $err, @ret) = make_request('ap', 'update', %form);
+  is $ret[0], 1, "update ap transaction with currency";
+  %form = form_from_html($out);
+
+  # add exchangerate and payments
+  $form{paid_1}                = 20;
+  $form{exchangerate}    = _format_number($exchangerate, -2);
+  $form{exchangerate_1}   = _format_number($payment_exchangerate, -2);
+
+  ($out, $err, @ret) = make_request('ap', 'post', %form);
+  is $ret[0], 1, "posting '$description' did not cause an error";
+
+  my $invoice = SL::DB::Manager::PurchaseInvoice->find_by(invnumber => $description);
+  ok $invoice, "posting '$description' can be found in the database";
+
+  ($out, $err, @ret) = make_request('ap', 'edit', id => $invoice->id);
+  is $ret[0], 1, "loading '$description' did not cause an error";
+  warn $err if $err;
+
+  my $q = HTML::Query->new(text => $out);
+  is $q->query('input[name=paid_1]')->size, 1, "out '$description' contains paid_1";
+  is $q->query('input[name=paid_1]')->first->attr('value'), '20,00', "out '$description' paid_1 is 20 (the dollar amount, not the internal amount)";
+}
+
+{
+  my $testname     = 'ap_transaction_fx_gain_fees';
+  my $usd_amount   = 83300;
+  my $fx_rate      = 2;
+  my $fx_rate_bank = 1.75;
+  my $eur_amount   = $usd_amount * $fx_rate;
+
+  my $netamount     = $eur_amount;
+  my $amount        = $eur_amount;
+  my $buysell       = 'sell';
+  my $eur_payment   = $usd_amount * $fx_rate_bank;
+  my $usd_payment   = $eur_payment / $fx_rate_bank; # for rounding issues
+
+  my $bank              = SL::DB::Manager::Chart->find_by(description => 'Bank');
+  my $bank_account = SL::DB::Manager::BankAccount->find_by(chart_id => $bank->id) // SL::DB::BankAccount->new(
+    account_number => '123',
+    bank_code      => '123',
+    iban           => '123',
+    bic            => '123',
+    bank           => '123',
+    chart_id       => $bank->id,
+    name           => $bank->description,
+  )->save;
+
+  my $ex = SL::DB::Manager::Exchangerate->find_by(currency_id => $usd->id, transdate => $dt)
+        ||              SL::DB::Exchangerate->new(currency_id => $usd->id, transdate   => $dt);
+  $ex->update_attributes($buysell => $fx_rate);
+
+  my $ap_chart = SL::DB::Manager::Chart->get_first(query => [ link => 'AP' ], sort_by => 'accno');
+  my $ap_amount_chart = SL::DB::Manager::Chart->get_first(query => [ link => 'AP_amount' ], sort_by => 'accno');
+  my $invoice   = SL::DB::PurchaseInvoice->new(
+    invoice      => 0,
+    invnumber    => $testname,
+    amount       => $amount,
+    netamount    => $netamount,
+    transdate    => $dt,
+    taxincluded  => 0,
+    vendor_id    => $vendor->id,
+    taxzone_id   => $vendor->taxzone_id,
+    currency_id  => $usd->id,
+    transactions => [],
+    notes        => 'ap_transaction_fx',
+  );
+  $invoice->add_ap_amount_row(
+    amount     => $netamount,
+    chart      => $ap_amount_chart,
+    tax_id     => 0,
+  );
+
+  $invoice->create_ap_row(chart => $ap_chart);
+  $invoice->save;
+  my $ap_transaction_fx = $invoice;
+
+  # check exchangerate
+  is($ap_transaction_fx->currency->name   , 'USD'     , "$testname: USD currency");
+  is($ap_transaction_fx->get_exchangerate , '2.00000' , "$testname: fx rate record");
+  my $bt = create_bank_transaction(record        => $ap_transaction_fx,
+                                   bank_chart_id => $bank->id,
+                                   transdate     => $dt,
+                                   valutadate    => $dt,
+                                   amount        => $eur_payment,
+                                   exchangerate  => $fx_rate_bank,
+                                  ) or die "Couldn't create bank_transaction";
+
+  local $::form = Form->new;
+  $::form->{invoice_ids} = {
+    $bt->id => [ $ap_transaction_fx->id ]
+  };
+  $::form->{"book_fx_bank_fees_" . $bt->id . "_" . $ap_transaction_fx->id}  = 1;
+  $::form->{"exchangerate_"      . $bt->id . "_" . $ap_transaction_fx->id}  = "1,75"; # will be parsed
+  $::form->{"currency_id_"       . $bt->id . "_" . $ap_transaction_fx->id}  = $usd->id;
+
+  my ($stdout, $stderr, @result);
+  {
+    open(my $out_fh, '>', \$stdout) or die;
+    open(my $err_fh, '>', \$stderr) or die;
+
+    local *STDOUT = $out_fh;
+    local *STDERR = $err_fh;
+    my $bt_controller = SL::Controller::BankTransaction->new;
+    @result = $bt_controller->action_save_invoices;
+  };
+  ok !$stderr, "ap_transaction '$testname' can be booked with BackTransaction controller";
+
+  $invoice = SL::DB::Manager::PurchaseInvoice->find_by(invnumber => $testname);
+
+  # now load with old code
+  my ($out, $err, @ret) = make_request('ap', 'edit', id => $invoice->id);
+  is $ret[0], 1, "loading '$testname' did not cause an error";
+  warn $err if $err;
+
+  my $q = HTML::Query->new(text => $out);
+  is $q->query('input[name=paid_1]')->size, 1, "out '$testname' contains paid_1";
+  is $q->query('input[name=paid_1]')->first->attr('value'), _format_number($usd_payment, -2), "out '$testname' paid_1 is $usd_payment (the dollar amount, not the internal amount)";
+}
+
+reset_db();
+done_testing();
+
+1;
diff --git a/t/helper/qrbill.t b/t/helper/qrbill.t
new file mode 100644
index 000000000..2b3aa2795
--- /dev/null
+++ b/t/helper/qrbill.t
@@ -0,0 +1,45 @@
+use Test::More tests => 4;
+
+use strict;
+use constant true => 1;
+
+use lib 't';
+
+use File::Spec;
+use File::Temp qw(tempdir);
+
+use_ok 'SL::Helper::QrBill';
+
+my $amount = sprintf "%.2f", 1949.75;
+
+my @hrefs = (
+  { iban => 'CH4431999123000889012' },
+  { address_type => 'S',
+    company => 'Max Muster & Söhne',
+    street => 'Musterstrasse',
+    street_no => '123',
+    postalcode => '8000',
+    city => 'Seldwyla',
+    countrycode => 'CH' },
+  { amount => $amount,
+    currency => 'CHF' },
+  { address_type => 'K',
+    name => 'Simon Muster',
+    address_row1 => 'Musterstrasse 1',
+    address_row2 => '8000 Seldwyla',
+    countrycode => 'CH' },
+  { type => 'QRR',
+    ref_number => '210000000003139471430009017' },
+  { unstructured_message => 'Auftrag vom 15.10.2020' },
+);
+
+eval { SL::Helper::QrBill->new(@hrefs); };
+ok(!$@, 'new()');
+
+my $tmpdir   = tempdir(CLEANUP => true);
+my $out_file = File::Spec->catfile($tmpdir, 'out.png');
+
+eval { SL::Helper::QrBill->new(@hrefs)->generate($out_file); };
+ok(!$@, 'generate()');
+
+ok(-e $out_file && -s _, '$out_file written');
diff --git a/t/helper/qrbill_functions.t b/t/helper/qrbill_functions.t
new file mode 100644
index 000000000..40bdbf98b
--- /dev/null
+++ b/t/helper/qrbill_functions.t
@@ -0,0 +1,83 @@
+use Test::More tests => 38;
+
+use strict;
+
+use lib 't';
+use Support::TestSetup;
+
+use_ok('SL::Helper::QrBillFunctions', qw(
+  get_street_name_from_address_line
+  get_building_number_from_address_line
+  get_postal_code_from_address_line
+  get_town_name_from_address_line
+  assemble_ref_number
+  get_ref_number_formatted
+  get_iban_formatted
+  get_amount_formatted
+));
+
+Support::TestSetup::login();
+
+is(get_street_name_from_address_line('Musterstrasse 12'), 'Musterstrasse', 'get_street_name_from_address_line');
+is(get_street_name_from_address_line('Musterstrasse St. Jakob 22'), 'Musterstrasse St. Jakob', 'get_street_name_from_address_line_with_multi_word_street_name');
+is(get_street_name_from_address_line('Musterstrasse St. Jakob 22b'), 'Musterstrasse St. Jakob', 'get_street_name_from_address_line_with_multi_word_street_name_and_letter');
+is(get_street_name_from_address_line('Musterstrasse 12a'), 'Musterstrasse', 'get_street_name_from_address_line_with_building_number');
+is(get_street_name_from_address_line('Musterstrasse 12a 1234 Musterhausen'), 'Musterstrasse', 'get_street_name_from_address_line_with_building_number_and_zip');
+is(get_street_name_from_address_line('Musterstrasse'), 'Musterstrasse', 'get_street_name_from_address_line_without_building_number');
+
+is(get_building_number_from_address_line('Musterstrasse 12'), '12', 'get_building_number_from_address_line');
+is(get_building_number_from_address_line('Musterstrasse 12a'), '12a', 'get_building_number_from_address_line_with_building_number');
+is(get_building_number_from_address_line('Musterstrasse 12a 1234 Musterhausen'), '12a 1234 Musterhausen', 'get_building_number_from_address_line_with_building_number_and_zip');
+is(get_building_number_from_address_line('Musterstrasse'), '', 'get_building_number_from_address_line_without_building_number');
+
+is(get_postal_code_from_address_line('8000 Zürich'), '8000', 'get_postal_code_from_address_line');
+is(get_postal_code_from_address_line('8000 Zürich 1'), '8000', 'get_postal_code_from_address_line_with_zip_extension');
+is(get_postal_code_from_address_line('8000'), '8000', 'get_postal_code_from_address_line_without_town_name');
+
+is(get_town_name_from_address_line('8000 Zürich'), 'Zürich', 'get_town_name_from_address_line');
+is(get_town_name_from_address_line('8000 Zürich 1'), 'Zürich 1', 'get_town_name_from_address_line_with_zip_extension');
+is(get_town_name_from_address_line('8000'), '', 'get_town_name_from_address_line_without_town_name');
+
+# assemble_ref_number returns successfully
+is_deeply([ assemble_ref_number('123123', 'c1', 'R2022-02') ],
+          [ '123123000001000000002022027', undef ],
+          'assemble_ref_number_ok1');
+is_deeply([ assemble_ref_number('123123', 'c144', 'R5002') ],
+          [ '123123000144000000000050026', undef ],
+          'assemble_ref_number_ok2');
+
+# assemble_ref_number returns an error
+is_deeply([ assemble_ref_number('1231234', 'c1', 'R2022-02') ],
+          [ undef, $::locale->text('Bank account id number invalid. Must be 6 digits.') ],
+          'assemble_ref_number_err_bank_account_id_too_long ');
+is_deeply([ assemble_ref_number('123A12', 'c1', 'R2022-02') ],
+          [ undef, $::locale->text('Bank account id number invalid. Must be 6 digits.') ],
+          'assemble_ref_number_err_bank_account_id_with_letter');
+is_deeply([ assemble_ref_number('123123', 'c1234567', 'R2022-02') ],
+          [ undef, $::locale->text('Customer number invalid. Must be less then or equal to 6 digits after non-digits removed.') ],
+          'assemble_ref_number_err_customer_number_too_long');
+is_deeply([ assemble_ref_number('123123', 'c1', 'R2022-02-5000-3400-5') ],
+          [ undef, $::locale->text('Invoice number invalid. Must be less then or equal to 14 digits after non-digits removed.') ],
+          'assemble_ref_number_err_invoice_number_too_long');
+
+is(get_ref_number_formatted('123123000001000000002022027'),
+   '12 31230 00001 00000 00020 22027',
+   'get_ref_number_formatted');
+
+is(get_iban_formatted('CH4431999123000889012'),
+   'CH44 3199 9123 0008 8901 2',
+   'get_iban_formatted');
+
+is(get_amount_formatted('1000.00'), '1 000.00', 'get_amount_formatted_1000');
+is(get_amount_formatted('1.20'), '1.20', 'get_amount_formatted_1');
+is(get_amount_formatted('12.20'), '12.20', 'get_amount_formatted_12');
+is(get_amount_formatted('980.20'), '980.20', 'get_amount_formatted_980');
+is(get_amount_formatted('12500.30'), '12 500.30', 'get_amount_formatted_12500');
+is(get_amount_formatted('125400.22'), '125 400.22', 'get_amount_formatted_125400');
+is(get_amount_formatted('1255300.30'), '1 255 300.30', 'get_amount_formatted_1255300');
+is(get_amount_formatted('12553400.30'), '12 553 400.30', 'get_amount_formatted_12553400');
+is(get_amount_formatted('122.'), undef, 'get_amount_formatted_122err');
+is(get_amount_formatted('123'), undef, 'get_amount_formatted_123err');
+is(get_amount_formatted('12,4'), undef, 'get_amount_formatted_124err');
+is(get_amount_formatted('10 5'), undef, 'get_amount_formatted_105err');
+is(get_amount_formatted('10a'), undef, 'get_amount_formatted_10aerr');
diff --git a/t/helper/qrbill_parser.t b/t/helper/qrbill_parser.t
new file mode 100644
index 000000000..f9dc36bc1
--- /dev/null
+++ b/t/helper/qrbill_parser.t
@@ -0,0 +1,104 @@
+use Test::More tests => 40;
+
+use strict;
+
+use lib 't';
+use Support::TestSetup;
+
+use_ok('SL::Helper::QrBillParser');
+
+Support::TestSetup::login();
+
+{
+  my $code = "SPC\n0200\n1\nCH5204835012345671000\nS\nSample Foundation\nPO Box\n\n3001\nBern\nCH\n\n\n\n\n\n\n\n\nCHF\n\n\n\n\n\n\n\nNON\n\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code1valid');
+  is($obj->{creditor_information}->{iban}, "CH5204835012345671000", 'code1iban');
+  is($obj->{creditor}->{name}, "Sample Foundation", 'code1name');
+  is($obj->{payment_amount_information}->{amount}, "", 'code1amount');
+}
+
+{
+  my $code = "SPC\r\n0200\r\n1\r\nCH4431999123000889012\r\nS\r\nMax Muster & Söhne\r\nMusterstrasse\r\n123\r\n8000\r\nSeldwyla\r\nCH\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n1949.75\r\nCHF\r\nS\r\nSimon Muster\r\nMusterstrasse\r\n1\r\n8000\r\nSeldwyla\r\nCH\r\nQRR\r\n210000000003139471430009017\r\nOrder from 15.10.2020\r\nEPD\r\n//S1/10/1234/11/201021/30/102673386/32/7.7/40/0:30\r\nName AV1: UV;UltraPay005;12345\r\nName AV2: XY;XYService;54321";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code2valid');
+  is($obj->{creditor_information}->{iban}, "CH4431999123000889012", 'code2iban');
+  is($obj->{creditor}->{name}, "Max Muster & Söhne", 'code2name');
+  is($obj->{payment_amount_information}->{amount}, "1949.75", 'code2amount');
+  is($obj->{payment_reference}->{reference}, "210000000003139471430009017", 'code2reference');
+  is($obj->{additional_information}->{unstructured_message}, "Order from 15.10.2020", 'code2unstructured_message');
+
+  is($obj->get_creditor_street_name(), 'Musterstrasse', 'code2street_name');
+  is($obj->get_creditor_building_number(), '123', 'code2building_number');
+  is($obj->get_creditor_post_code(), '8000', 'code2post_code');
+  is($obj->get_creditor_town_name(), 'Seldwyla', 'code2town_name');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5800791123000889012\nS\nMuster Krankenkasse\nMusterstrasse\n12\n8000\nSeldwyla\nCH\n\n\n\n\n\n\n\n211.00\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n8000\nSeldwyla\nCH\nSCOR\nRF240191230100405JSH0438\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code3valid');
+  is($obj->{creditor_information}->{iban}, "CH5800791123000889012", 'code3iban');
+  is($obj->{creditor}->{name}, "Muster Krankenkasse", 'code3name');
+  is($obj->{payment_amount_information}->{amount}, "211.00", 'code3amount');
+  is($obj->{payment_reference}->{reference}, "RF240191230100405JSH0438", 'code3reference');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5800791123000889012\nS\nMax Muster & Söhne\nMusterstrasse\n123\n8000\nSeldwyla\nCH\n\n\n\n\n\n\n\n199.95\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n78462\nKonstanz\nDE\nSCOR\nRF18539007547034\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code4valid');
+  is($obj->{creditor_information}->{iban}, "CH5800791123000889012", 'code4iban');
+  is($obj->{creditor}->{name}, "Max Muster & Söhne", 'code4name');
+  is($obj->{payment_amount_information}->{amount}, "199.95", 'code4amount');
+  is($obj->{payment_reference}->{reference}, "RF18539007547034", 'code4reference');
+}
+
+{
+  my $code = "SP\n0200\n1\nCH5800791123000889012\nS\nMax Muster & Söhne\nMusterstrasse\n123\n8000\nSeldwyla\nCH\n\n\n\n\n\n199.95\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n78462\nKonstanz\nDE\nSCOR\nRF18539007547034\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 0, 'code5invalid');
+  is($obj->error, "Test failed: Section: 'header' Field: 'qrtype' Value: 'SP'", 'code5error');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5800791123889012\nS\nMax Muster & Söhne\nMusterstrasse\n123\n8000\nSeldwyla\nCH\n\n\n\n\n\n\n\n199.95\nCHF\nS\nSarah Beispiel\nMusterstrasse\n1\n78462\nKonstanz\nDE\nSCOR\nRF18539007547034\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 0, 'code6invalid');
+  is($obj->error, "Test failed: Section: 'creditor_information' Field: 'iban' Value: 'CH5800791123889012'", 'code6error');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5204835012345671000\nK\nSample Foundation\nMusterstrasse 55\n3005 Bern\n\n\nCH\n\n\n\n\n\n\n\n\nCHF\n\n\n\n\n\n\n\nNON\n\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code7valid');
+  is($obj->get_creditor_street_name(), 'Musterstrasse', 'code7street_name');
+  is($obj->get_creditor_building_number(), '55', 'code7building_number');
+  is($obj->get_creditor_post_code(), '3005', 'code7post_code');
+  is($obj->get_creditor_town_name(), 'Bern', 'code7town_name');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5204835012345671000\nK\nSample Foundation\nMusterstrasse 25b\n3005 Bern\n\n\nCH\n\n\n\n\n\n\n\n\nCHF\n\n\n\n\n\n\n\nNON\n\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code8valid');
+  is($obj->get_creditor_street_name(), 'Musterstrasse', 'code8street_name');
+  is($obj->get_creditor_building_number(), '25b', 'code8building_number');
+}
+
+{
+  my $code = "SPC\n0200\n1\nCH5204835012345671000\nK\nSample Foundation\nMusterstrasse 25 c\n3005 Bern\n\n\nCH\n\n\n\n\n\n\n\n\nCHF\n\n\n\n\n\n\n\nNON\n\n\nEPD\n";
+  my $obj = SL::Helper::QrBillParser->new($code);
+
+  is($obj->is_valid, 1, 'code9valid');
+  is($obj->get_creditor_street_name(), 'Musterstrasse', 'code9street_name');
+  is($obj->get_creditor_building_number(), '25 c', 'code9building_number');
+}
diff --git a/t/menu/parse_access_string.t b/t/menu/parse_access_string.t
index 521269995..d68adcffa 100644
--- a/t/menu/parse_access_string.t
+++ b/t/menu/parse_access_string.t
@@ -54,9 +54,6 @@ ok($menu->parse_access_string(\%node), 'parenthesis 1');
 $node{access} = '(no_such_right & sales_order_edit | (no_such_right & sales_order_edit))';
 ok(!$menu->parse_access_string(\%node), 'parenthesis 2');
 
-$node{access} = 'sales_quotation_edit & client/feature_experimental_order';
-ok($menu->parse_access_string(\%node), 'client');
-
 $node{access} = '!no_such_right';
 ok($menu->parse_access_string(\%node), 'simple negation 1');
 
@@ -72,9 +69,6 @@ ok($menu->parse_access_string(\%node), 'parenthesis with negation 1');
 $node{access} = '(no_such_right & sales_order_edit | (!no_such_right | !sales_order_edit))';
 ok($menu->parse_access_string(\%node), 'parenthesis with negation 2');
 
-$node{access} = 'sales_quotation_edit & !client/feature_experimental_order';
-ok(!$menu->parse_access_string(\%node), 'client negation');
-
 done_testing;
 
 1;
diff --git a/t/model/records.t b/t/model/records.t
new file mode 100644
index 000000000..3da3e2441
--- /dev/null
+++ b/t/model/records.t
@@ -0,0 +1,340 @@
+use Test::More;
+use Test::Exception;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Test::Exception;
+use List::Util qw(pairs);
+
+use SL::DB::PaymentTerm;
+use SL::DB::DeliveryTerm;
+use SL::DB::Employee;
+use SL::DB::ReclamationReason;
+use SL::Model::Record;
+
+use SL::Dev::ALL qw(:ALL);
+
+my ($customer, $vendor, $employee, $payment_term, $delivery_term, @parts, $reclamation_reason);
+my ($dbh);
+
+my ($sales_quotation1,    $sales_order1,    $sales_invoice1,    $sales_delivery_order1,    $sales_reclamation1);
+my ($purchase_quotation1, $purchase_order1, $purchase_invoice1, $purchase_delivery_order1, $purchase_reclamation1);
+
+Support::TestSetup::login();
+$dbh = SL::DB->client->dbh;
+
+# set locale to en so we can match errors
+local $::locale = Locale->new('en');
+
+note "testing deletions";
+reset_state();
+reset_basic_sales_records();
+reset_basic_purchase_records();
+
+is(SL::DB::Manager::Order->get_all_count(
+    where => [ or  => ['record_type'  => 'sales_quotation', 'record_type'  => 'request_quotation' ]]),
+  2, 'number of quotations before delete ok');
+is(SL::DB::Manager::Order->get_all_count(
+    where => [ and => ['!record_type' => 'sales_quotation', '!record_type' => 'request_quotation' ]]),
+  2, 'number of orders before delete ok');
+is(SL::DB::Manager::DeliveryOrder->get_all_count(), 2, 'number of delivery orders before delete ok');
+is(SL::DB::Manager::Reclamation->get_all_count(), 2, 'number of reclamations before delete ok');
+# is(SL::DB::Manager::Invoice->get_all_count(), 1, 'number of invoices before delete ok'); # no purchase_invoice was created
+
+foreach my $record ( ($sales_quotation1,
+                      $sales_order1,
+                      $sales_reclamation1,
+                      $purchase_quotation1,
+                      $purchase_order1,
+                      $purchase_reclamation1
+                     )
+                   ) {
+
+  my $delete_return  = SL::Model::Record->delete($record);
+  my $record_history = SL::DB::Manager::History->find_by(trans_id => $record->id, addition => 'DELETED');
+  # just test if snumbers contains "_", not whether it actually is correct
+  ok($record_history->snumbers =~ m/_/, "history snumbers of record " . $record_history->snumbers . " ok");
+};
+
+is(SL::DB::Manager::Order->get_all_count(
+    where => [ or  => ['record_type'  => 'sales_quotation', 'record_type'  => 'request_quotation' ]]),
+  0, 'number of quotations after delete ok');
+is(SL::DB::Manager::Order->get_all_count(
+    where => [ and => ['!record_type' => 'sales_quotation', '!record_type' => 'request_quotation' ]]),
+  0, 'number of orders after delete ok');
+# is(SL::DB::Manager::Invoice->get_all_count(), 0, 'number of invoices after delete ok');
+is(SL::DB::Manager::Reclamation->get_all_count(), 0, 'number of orders after delete ok');
+
+note "testing workflows";
+reset_state();
+reset_basic_sales_records();
+reset_basic_purchase_records();
+
+note "testing subversion of order";
+# make current version a final version, currently this is handled via frontend/controller
+is($sales_order1->ordnumber, "ord-01", "ordnumber before increment_subversion ok");
+SL::DB::OrderVersion->new(oe_id => $sales_order1->id, version => 1, final_version => 1)->save;
+# feature incrementing subversion disabled throws an error
+throws_ok {
+  local $::instance_conf->data->{lock_oe_subversions} = 0;
+  SL::Model::Record->increment_subversion($sales_order1);
+} qr{Subversions are not supported or disabled for this record type.}, 'feature subversion disabled throws error when trying to increment';
+{
+  local $::instance_conf->data->{lock_oe_subversions} = 1;
+  SL::Model::Record->increment_subversion($sales_order1);
+}
+is($sales_order1->ordnumber, "ord-01-2", "ordnumber after increment_subversion ok");
+is(SL::DB::Manager::Order->get_all_count(
+    where => [ and => ['!record_type' => 'sales_quotation', '!record_type' => 'request_quotation' ]]),
+  2, 'number of orders after incremented subversion ok');
+
+
+note "testing new_from_workflow for quotation";
+foreach my $target_record_type (qw(sales_order sales_delivery_order)) {
+  # TODO: invoice
+  note "  testing from quotation -> $target_record_type";
+  my $new_record = SL::Model::Record->new_from_workflow($sales_quotation1, $target_record_type);
+
+  is($new_record->closed, 0, "new quotation is open");
+  # in the future closing sales quotations should probably happen as an after-save hook of orders,
+  # but for now we copy the behaviour of the controller and pass the sales quotations as an argument
+  SL::Model::Record->save($new_record, objects_to_close => [ $sales_quotation1 ]);
+
+  $new_record->load;
+  cmp_ok($new_record->netamount, '==', 710, "converted $target_record_type netamount ok") if $new_record->can('netamount');
+
+  # test whether quotations get closed when sales_order is created
+  if ( $target_record_type eq 'sales_order' ) {
+    $sales_quotation1->load;
+    is($sales_quotation1->closed, 1, "quotation is closed after creating an order");
+  }
+
+  # TODO: test whether orders get closed when all items are deliverd
+
+  my $record_history = SL::DB::Manager::History->find_by(trans_id => $new_record->id, addition => 'SAVED');
+  ok($record_history->snumbers =~ m/_/, "history snumbers of record " . $record_history->snumbers . " ok");
+  test_record_links($new_record, "converted $target_record_type");
+};
+
+note "testing new_from_workflow for order";
+foreach my $target_record_type (qw(sales_delivery_order sales_reclamation)) {
+  # TODO: invoice
+  note "  testing from quotation -> $target_record_type";
+  my $new_record = SL::Model::Record->new_from_workflow($sales_order1, $target_record_type);
+  if ( 'SL::DB::Reclamation' eq ref($new_record) ) {
+    $_->reason($reclamation_reason) foreach @{ $new_record->items };
+  };
+  SL::Model::Record->save($new_record);
+  $new_record->load;
+  my $record_history = SL::DB::Manager::History->find_by(trans_id => $new_record->id, what_done => $target_record_type, addition => 'SAVED');
+
+  ok($record_history->snumbers =~ m/_/, "history snumbers of record " . $record_history->snumbers . " ok");
+
+  cmp_ok($new_record->netamount, '==', 710, "converted $target_record_type netamount ok") if $new_record->can('netamount');
+  test_record_links($new_record, "converted $target_record_type");
+};
+
+note ('testing multi');
+reset_state();
+reset_basic_sales_records();
+reset_basic_purchase_records();
+
+note('combining several sales orders to one combined order');
+my @sales_orders;
+push(@sales_orders, SL::Model::Record->new_from_workflow($sales_quotation1, 'sales_order')->save->load) for 1 .. 3;
+my $combined_order = SL::Model::Record->new_from_workflow_multi(\@sales_orders, 'sales_order', sort_sources_by => 'transdate');
+SL::Model::Record->save($combined_order);
+cmp_ok($combined_order->netamount, '==', 3*710, "netamount of combined order ok");
+
+
+note "testing get price and discount sources";
+reset_state();
+reset_basic_sales_records();
+reset_basic_purchase_records();
+
+$purchase_quotation1->items_sorted->[0]->part->sellprice(500);
+$purchase_quotation1->items_sorted->[0]->part->lastcost(300);
+$purchase_quotation1->vendor->discount(5.0);
+
+my ($price_source, $discount_source) = SL::Model::Record->get_best_price_and_discount_source($purchase_quotation1,
+                                                                                             $purchase_quotation1->items_sorted->[0],
+                                                                                             ignore_given => 1);
+is($price_source->source_description, 'Master Data', 'get price source right with ignore_given');
+is($price_source->price, 300, 'get price source purchase price right with ignore_given');
+is($discount_source->source_description, 'Vendor Discount', 'get discount source right with ignore_given');
+is($discount_source->discount, 5, 'get discount source purchase discount right with ignore_given');
+
+$purchase_quotation1->items_sorted->[0]->discount(3);
+
+($price_source, $discount_source)    = SL::Model::Record->get_best_price_and_discount_source($purchase_quotation1,
+                                                                                             $purchase_quotation1->items_sorted->[0],
+                                                                                             ignore_given => 0);
+is($price_source->source_description, 'None (PriceSource)', 'get price source right with given price');
+is($price_source->price, 70, 'get price source purchase price right with given price');
+is($discount_source->source_description, 'None (PriceSource Discount)', 'get price source right with given price');
+is($discount_source->discount, 3, 'get discount source purchase discount right with given price');
+
+clear_up();
+done_testing;
+
+sub test_record_links {
+  my $record = shift;
+  my $text = shift;
+
+  is(@{ $record->linked_records }, 1, "1 record link for $text created ok"); # just check if one exists, not if it is actually correct
+  my $number_of_item_record_links;
+  foreach my $item ( @{ $record->items } ) {
+    $number_of_item_record_links += scalar @{ $item->linked_records };
+  };
+  is($number_of_item_record_links, 2, "2 record links for $text items created ok"); # just check if they exist, not if they are actually correct
+}
+
+sub clear_up {
+  foreach (qw(InvoiceItem Invoice
+              DeliveryOrderItem DeliveryOrder
+              OrderItem Order OrderVersion
+              Reclamation ReclamationItem ReclamationReason
+              Part Customer Vendor PaymentTerm DeliveryTerm)
+          ) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::History->delete_all(all => 1);
+  SL::DB::Manager::Employee->delete_all(where => [ login => 'testuser' ]);
+};
+
+sub reset_basic_sales_records {
+  $dbh->do("UPDATE defaults SET sonumber = 'ord-00', sqnumber = 'quo-00', sdonumber = 'do-00', s_reclamation_record_number = 'srecl-00'");
+
+  $sales_quotation1 = create_sales_quotation(
+    save       => 1,
+    customer   => $customer,
+    orderitems => [ create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                  ]
+  );
+
+  $sales_order1 = create_sales_order(
+    save       => 1,
+    customer   => $customer,
+    orderitems => [ create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                  ]
+  );
+
+  $sales_delivery_order1 = create_sales_delivery_order(
+    save       => 1,
+    customer   => $customer,
+    orderitems => [ create_delivery_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_delivery_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                  ]
+  );
+
+  $sales_reclamation1 = create_sales_reclamation(
+    save              => 1,
+    employee          => $employee,
+    reclamation_items => [ create_reclamation_item(part => $parts[0], qty =>  3, sellprice => 70, reason => $reclamation_reason),
+                           create_reclamation_item(part => $parts[1], qty => 10, sellprice => 50, reason => $reclamation_reason),
+                         ]
+  );
+
+  # disabled sales_invoice
+  # $sales_invoice1 = create_sales_invoice(
+  #   save        => 1,
+  #   customer    => $customer,
+  #   invoiceitems => [ create_invoice_item(part => $parts[0], qty =>  3, sellprice => 70),
+  #                     create_invoice_item(part => $parts[1], qty => 10, sellprice => 50),
+  #                   ]
+  # );
+}
+
+sub reset_basic_purchase_records {
+  $dbh->do("UPDATE defaults SET rfqnumber = 'rfq-00', ponumber = 'po-00', pdonumber = 'pdo-00', p_reclamation_record_number = 'precl-00'");
+
+  $purchase_quotation1 = create_purchase_quotation (
+    save        => 1,
+    vendor      => $vendor,
+    orderitems  => [ create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                     create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                   ]
+  );
+
+  $purchase_order1 = create_purchase_order (
+    save        => 1,
+    vendor      => $vendor,
+    orderitems  => [ create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                     create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                   ]
+  );
+
+  $purchase_delivery_order1 = create_purchase_delivery_order(
+    save       => 1,
+    vendor     => $vendor,
+    orderitems => [ create_delivery_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_delivery_order_item(part => $parts[1], qty => 10, sellprice => 50),
+                  ]
+  );
+
+  $purchase_reclamation1 = create_purchase_reclamation(
+    save              => 1,
+    employee          => $employee,
+    reclamation_items => [ create_reclamation_item(part => $parts[0], qty =>  3, sellprice => 70, reason => $reclamation_reason),
+                           create_reclamation_item(part => $parts[1], qty => 10, sellprice => 50, reason => $reclamation_reason),
+                         ]
+  );
+}
+
+sub reset_state {
+  my %params = @_;
+
+  clear_up();
+
+  $customer = new_customer()->save;
+  $vendor   = new_vendor()->save;
+
+  $employee = SL::DB::Employee->new(
+    'login' => 'testuser',
+    'name'  => 'Test User',
+  )->save;
+
+  $payment_term = create_payment_terms(
+     'description'      => '14Tage 2%Skonto, 30Tage netto',
+     'description_long' => "Innerhalb von 14 Tagen abzüglich 2 % Skonto, innerhalb von 30 Tagen rein netto.|Bei einer Zahlung bis zum <%skonto_date%> gewähren wir 2 % Skonto (EUR <%skonto_amount%>) entspricht EUR <%total_wo_skonto%>.Bei einer Zahlung bis zum <%netto_date%> ist der fällige Betrag in Höhe von <%total%> <%currency%> zu überweisen.",
+     'percent_skonto'   => '0.02',
+     'terms_netto'      => 30,
+     'terms_skonto'     => 14
+  );
+
+  $delivery_term = SL::DB::DeliveryTerm->new(
+    'description'      => 'Test Delivey Term',
+    'description_long' => 'Test Delivey Term Test Delivey Term',
+  )->save;
+
+  # some parts/services
+  @parts = ();
+  push @parts, new_part(
+    partnumber => 'a',
+  )->save;
+  push @parts, new_part(
+    partnumber => 'b',
+  )->save;
+
+  $reclamation_reason = SL::DB::ReclamationReason->new(
+    name        => "test_reason",
+    description => "",
+    position    => 1,
+  );
+
+}
+
+1;
+
+# set emacs to perl mode
+# Local Variables:
+# mode: perl
+# End:
diff --git a/t/rdbo_consistency.t b/t/rdbo_consistency.t
index 635585f26..a5f553366 100644
--- a/t/rdbo_consistency.t
+++ b/t/rdbo_consistency.t
@@ -25,6 +25,7 @@ my @metasetups        = find_pms('SL/DB/MetaSetup');
 my %metasetup_content = map { ($_ => scalar(read_file("SL/DB/MetaSetup/$_"))) } @metasetups;
 my %db_content        = map { ($_ => scalar(read_file("SL/DB/$_")))           } @dbs;
 my $all_content       = read_file('SL/DB/Helper/ALL.pm');
+my $all_auth_content  = read_file('SL/DB/Helper/ALLAuth.pm');
 my $mapping_content   = read_file('SL/DB/Helper/Mappings.pm');
 
 sub test_db_has_metasetup {
@@ -48,6 +49,13 @@ sub test_db_included_in_all {
   }
 }
 
+sub test_auth_db_included_in_all_auth {
+  foreach my $pm (grep { m{^Auth} } @dbs) {
+    my $base = basename($pm, '.pm');
+    ok($all_auth_content =~ m/\nuse\s+SL::DB::${base};/, "$pm has entry in SL::DB::Helper::ALLAuth");
+  }
+}
+
 sub test_use_in_all_exists_as_db {
   foreach my $package (map { m/^use\s+(.+?);/; $1 } grep { '^use SL::DB::' } split m/\n/, $all_content) {
     next unless $package;
@@ -88,6 +96,7 @@ sub test_db_contains_meta_initialize {
 test_db_has_metasetup();
 test_metasetup_has_db();
 test_db_included_in_all();
+test_auth_db_included_in_all_auth();
 test_use_in_all_exists_as_db();
 test_metasetup_has_table_to_class_mapping();
 test_db_contains_meta_initialize();
diff --git a/t/wh/inventory.t b/t/wh/inventory.t
index 3c125a790..a835578d8 100644
--- a/t/wh/inventory.t
+++ b/t/wh/inventory.t
@@ -218,7 +218,7 @@ SL::Helper::Inventory::produce_assembly(
 );
 }, "producing for wrong warehouse dies");
 
-# same test, but check exception class
+# same test, but check exception class and error messages
 throws_ok{
 SL::Helper::Inventory::produce_assembly(
   part          => $assembly1,
@@ -228,19 +228,11 @@ SL::Helper::Inventory::produce_assembly(
   bin          => $bin_moon,
   chargenumber => "Lunar Dust inside",
 );
- } "SL::X::Inventory::Allocation", "producing for wrong warehouse throws correct error class";
-
-# same test, but check user feedback for the error message
-throws_ok{
-SL::Helper::Inventory::produce_assembly(
-  part          => $assembly1,
-  qty           => 1,
-  auto_allocate => 1,
-  # where to put it
-  bin          => $bin_moon,
-  chargenumber => "Lunar Dust inside",
-);
- } qr/Part ap (1|2) Testpart (1|2) exists in warehouse Warehouse, but not in warehouse Our warehouse location at the moon/, "producing for wrong warehouse throws correct error message";
+} "SL::X::Inventory::Allocation::Multi", "producing for wrong warehouse throws correct error class";
+my $e = $@;
+like $e, qr/multiple errors during allocation/, "producing for wrong warehouse throws correct error message for multiple errors";
+like $e->errors->[0]->message, qr/Part ap (1|2) Testpart (1|2) exists in warehouse Warehouse, but not in warehouse Our warehouse location at the moon/,
+  "producing for wrong warehouse throws correct error message";
 
 # try to produce without allocations dies
 
@@ -302,6 +294,36 @@ is(SL::Helper::Inventory::get_stock(part => $assembly_service), "1.00000", 'prod
 is(SL::Helper::Inventory::get_stock(part => $part1), "0.00000", 'and consumes...');
 is(SL::Helper::Inventory::get_stock(part => $part2), "0.00000", '..the materials');
 
+
+# check with own allocations
+set_stock(
+  part => $part1,
+  qty => 12,
+  bin => $bin2,
+);
+set_stock(
+  part => $part2,
+  qty => 6.34,
+  bin => $bin2,
+);
+@alloc1 = SL::Helper::Inventory::allocate(part => $part1, qty => 12);
+@alloc2 = SL::Helper::Inventory::allocate(part => $part2, qty => 6.34);
+
+lives_ok {
+  SL::Helper::Inventory::produce_assembly(
+    part          => $assembly_service,
+    qty           => 1,
+    allocations => [ @alloc1, @alloc2 ],
+
+    # where to put it
+    bin          => $bin1,
+  );
+} 'no exception on produce_assembly with own allocations (no service)';
+
+is(SL::Helper::Inventory::get_stock(part => $assembly_service), "2.00000", 'produce with own allocations works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "0.00000", 'and consumes...');
+is(SL::Helper::Inventory::get_stock(part => $part2), "0.00000", '..the materials');
+
 # check comments and warehouses
 $::form->{l_comment}        = 'Y';
 $::form->{l_warehouse_from} = 'Y';
@@ -324,6 +346,19 @@ cmp_deeply(\@contents,
                 'part_type'    => 'assembly',
                 'warehouse_to' => 'Warehouse'
               }),
+             ignore(), ignore(),
+              superhashof({
+                'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
+                'warehouse_from' => 'Warehouse'
+              }),
+              superhashof({
+                'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
+                'warehouse_from' => 'Warehouse'
+              }),
+              superhashof({
+                'part_type'    => 'assembly',
+                'warehouse_to' => 'Warehouse'
+              }),
            ],
           "Comments for assembly with service productions are ok"
 );
@@ -351,9 +386,13 @@ throws_ok{
     # where to put it
     bin          => $bin1,
   );
-} qr/can not allocate 1,2 units of service number 1 We really need this service, missing 1,2 units/, "producing assembly with services and unstocked service throws correct error message";
+} "SL::X::Inventory::Allocation::Multi", "producing assembly with services and unstocked service throws correct error class";
+$e = $@;
+like $e, qr/multiple errors during allocation/, "producing assembly with services and unstocked service throws correct error message for multiple errors";
+like $e->errors->[0]->message, qr/can not allocate 1,2 units of service number 1 We really need this service, missing 1,2 units/,
+  "producing assembly with services and unstocked service throws correct error message";
 
-is(SL::Helper::Inventory::get_stock(part => $assembly_service), "1.00000", 'produce without service does not work');
+is(SL::Helper::Inventory::get_stock(part => $assembly_service), "2.00000", 'produce without service does not work');
 is(SL::Helper::Inventory::get_stock(part => $part1), "12.00000", 'and does not consume...');
 is(SL::Helper::Inventory::get_stock(part => $part2), "6.34000", '..the materials');
 
@@ -374,7 +413,45 @@ SL::Helper::Inventory::produce_assembly(
   bin          => $bin1,
 );
 
-is(SL::Helper::Inventory::get_stock(part => $assembly_service), "2.00000", 'produce with service does work if services is needed and stocked');
+is(SL::Helper::Inventory::get_stock(part => $assembly_service), "3.00000", 'produce with service does work if services is needed and stocked');
+is(SL::Helper::Inventory::get_stock(part => $part1), "0.00000", 'and does consume...');
+is(SL::Helper::Inventory::get_stock(part => $part2), "0.00000", '..the materials');
+is(SL::Helper::Inventory::get_stock(part => $service1), "0.00000", '..and service');
+
+# check with own allocations
+set_stock(
+  part => $part1,
+  qty => 12,
+  bin => $bin2,
+);
+set_stock(
+  part => $part2,
+  qty => 6.34,
+  bin => $bin2,
+);
+is('SL::DB::Part', ref $service1);
+set_stock(
+  part => $service1,
+  qty => 1.2,
+  bin => $bin2,
+);
+
+@alloc1    = SL::Helper::Inventory::allocate(part => $part1,    qty => 12);
+@alloc2    = SL::Helper::Inventory::allocate(part => $part2,    qty => 6.34);
+my @alloc3 = SL::Helper::Inventory::allocate(part => $service1, qty => 1.2);
+
+lives_ok {
+  SL::Helper::Inventory::produce_assembly(
+    part          => $assembly_service,
+    qty           => 1,
+    allocations => [ @alloc1, @alloc2, @alloc3 ],
+
+    # where to put it
+    bin          => $bin1,
+  );
+} 'no exception on produce_assembly with own allocations (with service)';
+
+is(SL::Helper::Inventory::get_stock(part => $assembly_service), "4.00000", 'produce with own allocations and service does work if services is needed and stocked');
 is(SL::Helper::Inventory::get_stock(part => $part1), "0.00000", 'and does consume...');
 is(SL::Helper::Inventory::get_stock(part => $part2), "0.00000", '..the materials');
 is(SL::Helper::Inventory::get_stock(part => $service1), "0.00000", '..and service');
@@ -389,7 +466,7 @@ local $::instance_conf->data->{produce_assembly_same_warehouse} = 1;
 #use Data::Dumper;
 #diag("hier" . Dumper(@contents));
 cmp_deeply(\@contents,
-         [ ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(),
+           [ ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(), ignore(),
               superhashof({
                 'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
                 'warehouse_from' => 'Warehouse'
@@ -408,10 +485,79 @@ cmp_deeply(\@contents,
                 'part_type'    => 'assembly',
                 'warehouse_to' => 'Warehouse'
               }),
+             ignore(), ignore(), ignore(),
+             superhashof({
+                'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
+                'warehouse_from' => 'Warehouse'
+              }),
+              superhashof({
+                'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
+                'warehouse_from' => 'Warehouse'
+              }),
+              superhashof({
+                'comment'        => 'Used for assembly '. $assembly_service->partnumber .' Ein Erzeugnis mit Dienstleistungen',
+                'warehouse_from' => 'Warehouse',
+                'part_type'      => 'service',
+                'qty'            => '1.20000',
+              }),
+              superhashof({
+                'part_type'    => 'assembly',
+                'warehouse_to' => 'Warehouse'
+              }),
            ],
           "Comments for assembly with service productions are ok"
 );
 
+# check own allocations with more than one allocation per part
+reset_db();
+create_standard_stock();
+
+set_stock(
+  part => $part1,
+  qty => 5,
+  bin => $bin1,
+  # no chargenumber
+);
+set_stock(
+  part => $part1,
+  qty => 5,
+  bin => $bin1,
+  chargenumber => 'CH1',
+);
+set_stock(
+  part => $part1,
+  qty => 2,
+  bin => $bin1,
+  chargenumber => 'CH2',
+);
+set_stock(
+  part => $part2,
+  qty => 6.34,
+  bin => $bin1,
+);
+
+my @alloc1_1 = SL::Helper::Inventory::allocate(part => $part1, qty => 5);
+my @alloc1_2 = SL::Helper::Inventory::allocate(part => $part1, qty => 5, chargenumber => 'CH1');
+my @alloc1_3 = SL::Helper::Inventory::allocate(part => $part1, qty => 2, chargenumber => 'CH2');
+@alloc2      = SL::Helper::Inventory::allocate(part => $part2, qty => 6.34);
+
+local $::instance_conf->data->{produce_assembly_transfer_service} = 0;
+
+lives_ok {
+  SL::Helper::Inventory::produce_assembly(
+    part          => $assembly_service,
+    qty           => 1,
+    allocations => [ @alloc1_1, @alloc1_2, @alloc1_3, @alloc2 ],
+
+    # where to put it
+    bin          => $bin1,
+  );
+} 'no exception on produce_assembly with more than one own allocation per part';
+
+is(SL::Helper::Inventory::get_stock(part => $assembly_service), "1.00000", 'produce with own allocations works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "0.00000", 'and consumes...');
+is(SL::Helper::Inventory::get_stock(part => $part2), "0.00000", '..the materials');
+
 
 
 # bestbefore tests
@@ -464,6 +610,45 @@ is(SL::Helper::Inventory::get_stock(
 }
 
 
+# test DB backend function bins, bins_sorted and bins_sorted_naturally
+
+reset_db();
+create_standard_stock();
+
+$wh_moon->add_bins(SL::DB::Bin->new(description => "1A"));
+$wh_moon->add_bins(SL::DB::Bin->new(description => "HomeOffice"));
+$wh_moon->add_bins(SL::DB::Bin->new(description => "A2"));
+$wh_moon->add_bins(SL::DB::Bin->new(description => "Z3"));
+$wh_moon->add_bins(SL::DB::Bin->new(description => "a apple1"));
+$wh_moon->save();
+
+$wh_moon->load();
+
+my @bins                   = map  { $_->description } @{ $wh_moon->bins };        # id
+my @bins_sorted            = map  { $_->description } @{ $wh_moon->bins_sorted }; # id
+my @bins_sorted_naturally  = map  { $_->description } @{ $wh_moon->bins_sorted_naturally }; # description
+
+#diag explain @bins;
+#diag explain @bins_sorted;
+#diag explain @bins_sorted_naturally;
+cmp_deeply(\@bins,
+           ["Lunar crater 1", "Lunar crater 2", "Lunar crater 3", "Lunar crater 4",
+            "Lunar crater 5", "1A", "HomeOffice", "A2", "Z3", "a apple1"],
+           "Bins for warehouse moon sorted by default (default (id))"
+          );
+
+cmp_deeply(\@bins_sorted,
+           ["Lunar crater 1", "Lunar crater 2", "Lunar crater 3", "Lunar crater 4",
+            "Lunar crater 5", "1A", "HomeOffice", "A2", "Z3", "a apple1"],
+           "Bins for warehouse moon sorted by id"
+          );
+
+cmp_deeply(\@bins_sorted_naturally,
+           ["1A", "a apple1", "A2", "HomeOffice", "Lunar crater 1", "Lunar crater 2", "Lunar crater 3", "Lunar crater 4",
+            "Lunar crater 5", "Z3"],
+           "Bins for warehouse moon sorted naturally"
+          );
+
 sub reset_db {
   SL::DB::Manager::Order->delete_all(all => 1);
   SL::DB::Manager::Inventory->delete_all(all => 1);
diff --git a/t/workflow/delivery_order_reclamation.t b/t/workflow/delivery_order_reclamation.t
new file mode 100644
index 000000000..f36866879
--- /dev/null
+++ b/t/workflow/delivery_order_reclamation.t
@@ -0,0 +1,354 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Support::TestRoutines qw(test_deeply);
+use Test::Exception;
+use List::MoreUtils qw(pairwise);
+
+use SL::DB::DeliveryOrder;
+use SL::DB::Reclamation;
+use SL::DB::ReclamationReason;
+use SL::DB::Customer;
+use SL::DB::Vendor;
+use SL::DB::Department;
+use SL::DB::Currency;
+use SL::DB::PaymentTerm;
+use SL::DB::DeliveryTerm;
+use SL::DB::Employee;
+use SL::DB::Part;
+use SL::DB::Unit;
+use SL::Model::Record;
+
+use Rose::DB::Object::Helpers qw(clone);
+
+use SL::Dev::ALL qw(:ALL);
+
+my (
+  $customer, $vendor,
+  $employee,
+  $payment_term,
+  $delivery_term,
+  $unit,
+  @parts,
+  $department,
+  $reclamation_reason,
+);
+
+
+sub clear_up {
+  foreach (qw(
+    DeliveryOrder DeliveryOrderItem
+    Reclamation ReclamationItem
+    ReclamationReason
+    Part
+    Customer Vendor
+    Department PaymentTerm DeliveryTerm
+    )) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::Employee->delete_all(where => [ login => 'testuser' ]);
+};
+
+sub reset_state {
+  my %params = @_;
+
+  clear_up();
+
+  $unit     = SL::DB::Manager::Unit->find_by(name => 'kg') || die "Can't find unit 'kg'";
+
+  $employee = SL::DB::Employee->new(
+    'login' => 'testuser',
+    'name'  => 'Test User',
+  )->save;
+
+  $department = SL::DB::Department->new(
+    'description' => 'Test Department',
+  )->save;
+
+  $payment_term = create_payment_terms(
+     'description'      => '14Tage 2%Skonto, 30Tage netto',
+     'description_long' => "Innerhalb von 14 Tagen abzüglich 2 % Skonto, innerhalb von 30 Tagen rein netto.|Bei einer Zahlung bis zum <%skonto_date%> gewähren wir 2 % Skonto (EUR <%skonto_amount%>) entspricht EUR <%total_wo_skonto%>.Bei einer Zahlung bis zum <%netto_date%> ist der fällige Betrag in Höhe von <%total%> <%currency%> zu überweisen.",
+     'percent_skonto'   => '0.02',
+     'terms_netto'      => 30,
+     'terms_skonto'     => 14
+  );
+
+  $delivery_term = SL::DB::DeliveryTerm->new(
+    'description'      => 'Test Delivey Term',
+    'description_long' => 'Test Delivey Term Test Delivey Term',
+  )->save;
+
+  # some parts/services
+  @parts = ();
+  push @parts, new_part(
+    partnumber => 'Part_1_KG',
+    unit        => $unit->name,
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_1',
+  )->save;
+  push @parts, new_part(
+    partnumber => 'Part_2',
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_2'
+  )->save;
+
+  $reclamation_reason = SL::DB::ReclamationReason->new(
+    name => "test_reason",
+    description => "",
+    position => 1,
+  );
+}
+
+Support::TestSetup::login();
+
+reset_state();
+
+#####
+
+my $sales_reclamation = SL::Dev::Record::create_sales_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td1",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+my $purchase_reclamation = SL::Dev::Record::create_purchase_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td2",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+
+my $sales_delivery_order = SL::Dev::Record::create_sales_delivery_order(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td3",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  orderitems => [ SL::Dev::Record::create_delivery_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                  SL::Dev::Record::create_delivery_order_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+my $purchase_delivery_order = SL::Dev::Record::create_purchase_delivery_order(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td4",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  orderitems => [ SL::Dev::Record::create_delivery_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                  SL::Dev::Record::create_delivery_order_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+# convert order → reclamation
+my $converted_sales_reclamation = SL::Model::Record->new_from_workflow($sales_delivery_order, 'sales_reclamation');
+$converted_sales_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_sales_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_sales_reclamation->save->load;
+my $converted_purchase_reclamation = SL::Model::Record->new_from_workflow($purchase_delivery_order, 'purchase_reclamation');
+$converted_purchase_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_purchase_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_purchase_reclamation->save->load;
+
+# convert reclamation → order
+my $converted_sales_delivery_order = SL::Model::Record->new_from_workflow($sales_reclamation, 'rma_delivery_order')->save->load;
+my $converted_purchase_delivery_order = SL::Model::Record->new_from_workflow($purchase_reclamation, 'supplier_delivery_order')->save->load;
+
+
+#get items before strip
+my @purchase_reclamation_items              = @{$purchase_reclamation->items_sorted};
+my @sales_reclamation_items                 = @{$sales_reclamation->items_sorted};
+my @converted_purchase_reclamation_items    = @{$converted_purchase_reclamation->items_sorted};
+my @converted_sales_reclamation_items       = @{$converted_sales_reclamation->items_sorted};
+my @purchase_delivery_order_items           = @{$purchase_delivery_order->items_sorted};
+my @sales_delivery_order_items              = @{$sales_delivery_order->items_sorted};
+my @converted_purchase_delivery_order_items = @{$converted_purchase_delivery_order->items_sorted};
+my @converted_sales_delivery_order_items    = @{$converted_sales_delivery_order->items_sorted};
+
+
+### TESTS #####################################################################
+
+## created sales und purchase reclamation should be nearly the same
+my $sales_reclamation_tmp = clone($sales_reclamation);
+my $purchase_reclamation_tmp = clone($purchase_reclamation);
+# clean different values
+foreach (qw(
+  record_type customer_id vendor_id
+  id record_number
+  salesman_id
+  transaction_description
+  itime mtime
+  )) {
+  $sales_reclamation_tmp->$_(undef);
+  $purchase_reclamation_tmp->$_(undef);
+}
+pairwise  { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (qw(
+    id reclamation_id
+    itime mtime
+    )) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @sales_reclamation_items;
+is_deeply($purchase_reclamation_tmp->strip->as_tree, $sales_reclamation_tmp->strip->as_tree);
+
+## created sales und purchase delivery_order should be nearly the same
+my $sales_delivery_order_tmp = clone($sales_delivery_order);
+my $purchase_delivery_order_tmp = clone($purchase_delivery_order);
+# clean different values
+foreach (qw(
+  customer_id vendor_id
+  id record_type
+  donumber salesman_id
+  transaction_description
+  itime mtime
+  )) {
+  $sales_delivery_order_tmp->$_(undef);
+  $purchase_delivery_order_tmp->$_(undef);
+}
+pairwise  { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (qw(
+    id delivery_order_id
+    itime mtime
+    )) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_delivery_order_items, @sales_delivery_order_items;
+is_deeply($purchase_delivery_order_tmp->strip->as_tree, $sales_delivery_order_tmp->strip->as_tree);
+
+
+## converted have to be linked to parent
+# sales
+my $linked_sales_delivery_order = $converted_sales_reclamation->linked_records->[0];
+my $linked_sales_reclamation = $converted_sales_delivery_order->linked_records->[0];
+is_deeply($linked_sales_delivery_order->strip->as_tree, $sales_delivery_order->strip->as_tree);
+is_deeply($linked_sales_reclamation->strip->as_tree, $sales_reclamation->load->strip->as_tree);
+
+# purchase
+my $linked_purchase_delivery_order = $converted_purchase_reclamation->linked_records->[0];
+my $linked_purchase_reclamation = $converted_purchase_delivery_order->linked_records->[0];
+is_deeply($linked_purchase_delivery_order->strip->as_tree, $purchase_delivery_order->strip->as_tree);
+is_deeply($linked_purchase_reclamation->strip->as_tree, $purchase_reclamation->load->strip->as_tree);
+
+
+## converted should be nearly the same
+my @different_record_values = qw(
+    id employee_id itime mtime reqdate transdate
+    ordnumber oreqnumber
+    amount exchangerate netamount
+    record_type
+    cp_id contact_id
+    cusordnumber cv_record_number
+    donumber record_number
+    vendor_confirmation_number
+);
+my @different_record_item_values = qw(
+  id delivery_order_id reclamation_id itime mtime
+  cusordnumber marge_price_factor ordnumber transdate orderer_id
+  description reason_description_ext reason_description_int reason_id
+);
+
+# sales
+pairwise  {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "sales_delivery_order_items to sales_reclamation_items",
+    @different_record_item_values
+  );
+} @sales_delivery_order_items, @converted_sales_reclamation_items;
+test_deeply($sales_delivery_order->strip->as_tree, $converted_sales_reclamation->strip->as_tree,
+  "sales_delivery_order to sales_reclamation",
+  @different_record_values
+);
+
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "sales_reclamation_items to sales_delivery_order_items",
+    @different_record_item_values
+  );
+} @sales_reclamation_items, @converted_sales_delivery_order_items;
+test_deeply($sales_reclamation->strip->as_tree, $converted_sales_delivery_order->strip->as_tree,
+  "sales_reclamation to sales_delivery_order",
+  @different_record_values
+);
+
+
+# purchase
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "purchase_delivery_order_items to purchase_reclamation_items",
+    @different_record_item_values
+  );
+} @purchase_delivery_order_items, @converted_purchase_reclamation_items;
+test_deeply($purchase_delivery_order->strip->as_tree, $converted_purchase_reclamation->strip->as_tree,
+  "purchase_delivery_order to purchase_reclamation",
+  @different_record_values
+);
+
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "purchase_reclamation_items to purchase_delivery_order_items",
+    @different_record_item_values
+  );
+} @purchase_reclamation_items, @converted_purchase_delivery_order_items;
+test_deeply($purchase_reclamation->strip->as_tree, $converted_purchase_delivery_order->strip->as_tree,
+  "purchase_reclamation to purchase_delivery_order",
+  @different_record_values
+);
+
+
+
+#diag Dumper($purchase_reclamation->strip->as_tree);
+#diag Dumper($linked_purchase_reclamation->strip->as_tree);
+
+
+####
+clear_up();
+
+done_testing;
+
+1;
diff --git a/t/workflow/invoice_to_reclamation.t b/t/workflow/invoice_to_reclamation.t
new file mode 100644
index 000000000..a40e59e63
--- /dev/null
+++ b/t/workflow/invoice_to_reclamation.t
@@ -0,0 +1,291 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Support::TestRoutines qw(test_deeply);
+use Test::Exception;
+use List::MoreUtils qw(pairwise);
+
+use SL::DB::Order;
+use SL::DB::Reclamation;
+use SL::DB::ReclamationReason;
+use SL::DB::Customer;
+use SL::DB::Vendor;
+use SL::DB::Department;
+use SL::DB::Currency;
+use SL::DB::PaymentTerm;
+use SL::DB::DeliveryTerm;
+use SL::DB::Employee;
+use SL::DB::Part;
+use SL::DB::Unit;
+use SL::Model::Record;
+
+use Rose::DB::Object::Helpers qw(clone);
+
+use SL::Dev::ALL qw(:ALL);
+
+my (
+  $customer, $vendor,
+  $employee,
+  $payment_term,
+  $delivery_term,
+  $unit,
+  @parts,
+  $department,
+  $reclamation_reason,
+);
+
+
+sub clear_up {
+  foreach (qw(
+    Invoice PurchaseInvoice InvoiceItem
+    Reclamation ReclamationItem
+    ReclamationReason
+    Part
+    Customer Vendor
+    Department PaymentTerm DeliveryTerm
+    )) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::Employee->delete_all(where => [ login => 'testuser' ]);
+};
+
+sub reset_state {
+  my %params = @_;
+
+  clear_up();
+
+  $unit     = SL::DB::Manager::Unit->find_by(name => 'kg') || die "Can't find unit 'kg'";
+
+  $employee = SL::DB::Employee->new(
+    'login' => 'testuser',
+    'name'  => 'Test User',
+  )->save;
+
+  $department = SL::DB::Department->new(
+    'description' => 'Test Department',
+  )->save;
+
+  $payment_term = create_payment_terms(
+     'description'      => '14Tage 2%Skonto, 30Tage netto',
+     'description_long' => "Innerhalb von 14 Tagen abzüglich 2 % Skonto, innerhalb von 30 Tagen rein netto.|Bei einer Zahlung bis zum <%skonto_date%> gewähren wir 2 % Skonto (EUR <%skonto_amount%>) entspricht EUR <%total_wo_skonto%>.Bei einer Zahlung bis zum <%netto_date%> ist der fällige Betrag in Höhe von <%total%> <%currency%> zu überweisen.",
+     'percent_skonto'   => '0.02',
+     'terms_netto'      => 30,
+     'terms_skonto'     => 14
+  );
+
+  $delivery_term = SL::DB::DeliveryTerm->new(
+    'description'      => 'Test Delivey Term',
+    'description_long' => 'Test Delivey Term Test Delivey Term',
+  )->save;
+
+  # some parts/services
+  @parts = ();
+  push @parts, new_part(
+    partnumber => 'Part_1_KG',
+    unit        => $unit->name,
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_1',
+  )->save;
+  push @parts, new_part(
+    partnumber => 'Part_2',
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_2'
+  )->save;
+
+  $reclamation_reason = SL::DB::ReclamationReason->new(
+    name => "test_reason",
+    description => "",
+    position => 1,
+  );
+}
+
+Support::TestSetup::login();
+
+reset_state();
+
+#####
+
+my $sales_reclamation = create_sales_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td1",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+my $purchase_reclamation = create_purchase_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td2",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+
+my $sales_invoice = create_sales_invoice(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td3",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  invoiceitems => [ create_invoice_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_invoice_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+my $purchase_invoice = create_minimal_purchase_invoice(
+  save                    => 1,
+  employee                => $employee,
+  invnumber               => "t1",
+  transaction_description => "td4",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  invoiceitems => [ create_invoice_item(part => $parts[0], qty =>  3, sellprice => 70),
+                    create_invoice_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+# convert invoice → reclamation
+my $converted_sales_reclamation =SL::Model::Record->new_from_workflow($sales_invoice, "sales_reclamation");
+$converted_sales_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_sales_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_sales_reclamation->save->load;
+my $converted_purchase_reclamation = SL::Model::Record->new_from_workflow($purchase_invoice, "purchase_reclamation");
+$converted_purchase_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_purchase_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_purchase_reclamation->save->load;
+
+#get items before strip
+my @purchase_reclamation_items           = @{$purchase_reclamation->items_sorted};
+my @sales_reclamation_items              = @{$sales_reclamation->items_sorted};
+my @converted_purchase_reclamation_items = @{$converted_purchase_reclamation->items_sorted};
+my @converted_sales_reclamation_items    = @{$converted_sales_reclamation->items_sorted};
+my @purchase_invoice_items               = @{$purchase_invoice->items_sorted};
+my @sales_invoice_items                  = @{$sales_invoice->items_sorted};
+
+
+### TESTS #####################################################################
+
+## created sales und purchase reclamation should be nearly the same
+my $sales_reclamation_tmp = clone($sales_reclamation);
+my $purchase_reclamation_tmp = clone($purchase_reclamation);
+# clean different values
+foreach (qw(
+  record_type customer_id vendor_id
+  id record_number
+  salesman_id
+  transaction_description
+  itime mtime
+  )) {
+  $sales_reclamation_tmp->$_(undef);
+  $purchase_reclamation_tmp->$_(undef);
+}
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (qw(
+    id reclamation_id
+    itime mtime
+    )) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @sales_reclamation_items;
+is_deeply($purchase_reclamation_tmp->strip->as_tree, $sales_reclamation_tmp->strip->as_tree);
+
+## converted have to be linked to parent
+my $linked_sales_invoice = $converted_sales_reclamation->linked_records->[0];
+is_deeply($linked_sales_invoice->strip->as_tree, $sales_invoice->strip->as_tree);
+my $linked_purchase_invoice = $converted_purchase_reclamation->linked_records->[0];
+is_deeply($linked_purchase_invoice->strip->as_tree, $purchase_invoice->strip->as_tree);
+
+
+## converted should be nearly the same
+my @different_record_values = qw(
+  id employee_id itime mtime transdate
+  datepaid delivery_customer_id delivery_vendor_id deliverydate direct_debit donumber duedate dunning_config_id gldate invnumber_for_credit_note invoice marge_percent marge_total orddate ordnumber paid qr_reference qr_unstructured_message qrbill_without_amount quodate quonumber storno storno_id type
+  delivered closed exchangerate record_type reqdate vendor_id
+  cp_id contact_id
+  cusordnumber cv_record_number
+  invnumber record_number
+);
+my @different_record_item_values = qw(
+  id trans_id reclamation_id itime mtime
+  allocated assemblyitem cusordnumber deliverydate donumber fxsellprice marge_percent marge_price_factor marge_total optional ordnumber subtotal transdate expense_chart_id tax_id inventory_chart_id
+  reason_description_ext reason_description_int reason_id reqdate
+  tax_chart_type
+);
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "sales_invoice_items to sales_reclamation_items",
+    @different_record_item_values
+  );
+} @sales_invoice_items, @converted_sales_reclamation_items;
+test_deeply($sales_invoice->strip->as_tree, $converted_sales_reclamation->strip->as_tree,
+  "sales_invoice to sales_reclamation",
+  @different_record_values
+);
+
+
+my @different_record_values2 = qw(
+    id employee_id itime mtime transdate
+    datepaid deliverydate direct_debit duedate gldate invoice orddate ordnumber paid quodate quonumber storno storno_id type is_sepa_blocked
+    billing_address_id customer_id cv_record_number delivered closed exchangerate record_type reqdate salesman_id shippingpoint shipto_id
+    cp_id contact_id
+    invnumber record_number qrbill_data
+);
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "purchase_invoice_items to purchase_reclamation_items",
+    @different_record_item_values
+  );
+} @purchase_invoice_items, @converted_purchase_reclamation_items;
+test_deeply($purchase_invoice->strip->as_tree, $converted_purchase_reclamation->strip->as_tree,
+  "purchase_invoice to purchase_reclamation",
+  @different_record_values2
+);
+
+# diag Dumper($sales_invoice->strip->as_tree);
+# diag Dumper($converted_sales_reclamation->strip->as_tree);
+
+####
+clear_up();
+
+done_testing;
+
+1;
diff --git a/t/workflow/order_reclamation.t b/t/workflow/order_reclamation.t
new file mode 100644
index 000000000..5aa1c9953
--- /dev/null
+++ b/t/workflow/order_reclamation.t
@@ -0,0 +1,350 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Support::TestRoutines qw(test_deeply);
+use Test::Exception;
+use List::MoreUtils qw(pairwise);
+
+use SL::DB::Order;
+use SL::DB::Reclamation;
+use SL::DB::ReclamationReason;
+use SL::DB::Customer;
+use SL::DB::Vendor;
+use SL::DB::Department;
+use SL::DB::Currency;
+use SL::DB::PaymentTerm;
+use SL::DB::DeliveryTerm;
+use SL::DB::Employee;
+use SL::DB::Part;
+use SL::DB::Unit;
+use SL::Model::Record;
+
+use Rose::DB::Object::Helpers qw(clone);
+
+use SL::Dev::ALL qw(:ALL);
+
+my (
+  $customer, $vendor,
+  $employee,
+  $payment_term,
+  $delivery_term,
+  $unit,
+  @parts,
+  $department,
+  $reclamation_reason,
+);
+
+
+sub clear_up {
+  foreach (qw(
+    Order OrderItem
+    Reclamation ReclamationItem
+    ReclamationReason
+    Part
+    Customer Vendor
+    Department PaymentTerm DeliveryTerm
+    )) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::Employee->delete_all(where => [ login => 'testuser' ]);
+};
+
+sub reset_state {
+  my %params = @_;
+
+  clear_up();
+
+  $unit     = SL::DB::Manager::Unit->find_by(name => 'kg') || die "Can't find unit 'kg'";
+
+  $employee = SL::DB::Employee->new(
+    'login' => 'testuser',
+    'name'  => 'Test User',
+  )->save;
+
+  $department = SL::DB::Department->new(
+    'description' => 'Test Department',
+  )->save;
+
+  $payment_term = create_payment_terms(
+     'description'      => '14Tage 2%Skonto, 30Tage netto',
+     'description_long' => "Innerhalb von 14 Tagen abzüglich 2 % Skonto, innerhalb von 30 Tagen rein netto.|Bei einer Zahlung bis zum <%skonto_date%> gewähren wir 2 % Skonto (EUR <%skonto_amount%>) entspricht EUR <%total_wo_skonto%>.Bei einer Zahlung bis zum <%netto_date%> ist der fällige Betrag in Höhe von <%total%> <%currency%> zu überweisen.",
+     'percent_skonto'   => '0.02',
+     'terms_netto'      => 30,
+     'terms_skonto'     => 14
+  );
+
+  $delivery_term = SL::DB::DeliveryTerm->new(
+    'description'      => 'Test Delivey Term',
+    'description_long' => 'Test Delivey Term Test Delivey Term',
+  )->save;
+
+  # some parts/services
+  @parts = ();
+  push @parts, new_part(
+    partnumber => 'Part_1_KG',
+    unit        => $unit->name,
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_1',
+  )->save;
+  push @parts, new_part(
+    partnumber => 'Part_2',
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_2'
+  )->save;
+
+  $reclamation_reason = SL::DB::ReclamationReason->new(
+    name => "test_reason",
+    description => "",
+    position => 1,
+  );
+}
+
+Support::TestSetup::login();
+
+reset_state();
+
+#####
+
+my $sales_reclamation = SL::Dev::Record::create_sales_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td1",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+my $purchase_reclamation = SL::Dev::Record::create_purchase_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td2",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    SL::Dev::Record::create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+
+my $sales_order = SL::Dev::Record::create_sales_order(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td3",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  orderitems => [ SL::Dev::Record::create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                  SL::Dev::Record::create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+my $purchase_order = SL::Dev::Record::create_purchase_order(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td4",
+  payment_terms           => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  orderitems => [ SL::Dev::Record::create_order_item(part => $parts[0], qty =>  3, sellprice => 70),
+                  SL::Dev::Record::create_order_item(part => $parts[1], qty => 10, sellprice => 50),
+  ]
+)->load;
+
+# convert order → reclamation
+my $converted_sales_reclamation = SL::Model::Record->new_from_workflow($sales_order, "sales_reclamation");
+$converted_sales_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_sales_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_sales_reclamation->save->load;
+my $converted_purchase_reclamation = SL::Model::Record->new_from_workflow($purchase_order, "purchase_reclamation");
+$converted_purchase_reclamation->items_sorted->[0]->reason($reclamation_reason);
+$converted_purchase_reclamation->items_sorted->[1]->reason($reclamation_reason);
+$converted_purchase_reclamation->save->load;
+
+# convert reclamation → order
+my $converted_sales_order = SL::Model::Record->new_from_workflow($sales_reclamation, 'sales_order')->save->load;
+my $converted_purchase_order = SL::Model::Record->new_from_workflow($purchase_reclamation, 'purchase_order')->save->load;
+
+
+#get items before strip
+my @purchase_reclamation_items           = @{$purchase_reclamation->items_sorted};
+my @sales_reclamation_items              = @{$sales_reclamation->items_sorted};
+my @converted_purchase_reclamation_items = @{$converted_purchase_reclamation->items_sorted};
+my @converted_sales_reclamation_items    = @{$converted_sales_reclamation->items_sorted};
+my @purchase_order_items                 = @{$purchase_order->items_sorted};
+my @sales_order_items                    = @{$sales_order->items_sorted};
+my @converted_purchase_order_items       = @{$converted_purchase_order->items_sorted};
+my @converted_sales_order_items          = @{$converted_sales_order->items_sorted};
+
+
+### TESTS #####################################################################
+
+## created sales und purchase reclamation should be nearly the same
+my $sales_reclamation_tmp = clone($sales_reclamation);
+my $purchase_reclamation_tmp = clone($purchase_reclamation);
+# clean different values
+foreach (qw(
+  record_type customer_id vendor_id
+  id record_number
+  salesman_id
+  transaction_description
+  itime mtime
+  )) {
+  $sales_reclamation_tmp->$_(undef);
+  $purchase_reclamation_tmp->$_(undef);
+}
+
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (qw(
+    id reclamation_id
+    itime mtime
+    )) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @sales_reclamation_items;
+is_deeply($purchase_reclamation_tmp->strip->as_tree, $sales_reclamation_tmp->strip->as_tree);
+
+## created sales und purchase order should be nearly the same
+my $sales_order_tmp = clone($sales_order);
+my $purchase_order_tmp = clone($purchase_order);
+# clean different values
+foreach (qw(
+  record_type customer_id vendor_id
+  id
+  ordnumber salesman_id
+  transaction_description
+  itime mtime
+  )) {
+  $sales_order_tmp->$_(undef);
+  $purchase_order_tmp->$_(undef);
+}
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (qw(
+    id trans_id
+    itime mtime
+    )) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_order_items, @sales_order_items;
+is_deeply($purchase_order_tmp->strip->as_tree, $sales_order_tmp->strip->as_tree);
+
+
+## converted have to be linked to parent
+# sales
+my $linked_sales_order = $converted_sales_reclamation->linked_records->[0];
+my $linked_sales_reclamation = $converted_sales_order->linked_records->[0];
+is_deeply($linked_sales_order->strip->as_tree, $sales_order->strip->as_tree);
+is_deeply($linked_sales_reclamation->strip->as_tree, $sales_reclamation->load->strip->as_tree);
+
+# purchase
+my $linked_purchase_order = $converted_purchase_reclamation->linked_records->[0];
+my $linked_purchase_reclamation = $converted_purchase_order->linked_records->[0];
+is_deeply($linked_purchase_order->strip->as_tree, $purchase_order->strip->as_tree);
+is_deeply($linked_purchase_reclamation->strip->as_tree, $purchase_reclamation->load->strip->as_tree);
+
+
+## converted should be nealy the same
+my @different_record_values = qw(
+  id record_type employee_id itime mtime reqdate transdate
+  delivery_customer_id delivery_vendor_id expected_billing_date marge_percent marge_total order_probability order_status_id proforma quonumber quotation
+  cp_id contact_id
+  cusordnumber cv_record_number
+  ordnumber record_number
+  intake
+  vendor_confirmation_number
+);
+my @different_record_item_values = qw(
+  id trans_id reclamation_id itime mtime
+  cusordnumber marge_percent marge_price_factor marge_total optional ordnumber ship subtotal transdate orderer_id
+  reason_description_ext reason_description_int reason_id
+  recurring_billing_mode recurring_billing_invoice_id
+);
+# sales
+pairwise {
+  test_deeply( $a->strip->as_tree, $b->strip->as_tree,
+    "sales_order_items to sales_reclamation_items",
+    @different_record_item_values
+  );
+} @sales_order_items, @converted_sales_reclamation_items;
+test_deeply( $sales_order->strip->as_tree, $converted_sales_reclamation->strip->as_tree,
+  "sales_order to sales_reclamation",
+  @different_record_values
+);
+
+pairwise {
+  test_deeply( $a->strip->as_tree, $b->strip->as_tree,
+    "sales_reclamation_items to sales_order_items",
+    @different_record_item_values
+  );
+} @sales_reclamation_items, @converted_sales_order_items;
+test_deeply($sales_reclamation->strip->as_tree, $converted_sales_order->strip->as_tree,
+  "sales_reclamation to sales_order",
+  @different_record_values
+);
+
+# purchase
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "purchase_order_items to purchase_reclamation_items",
+    @different_record_item_values
+  );
+} @purchase_order_items, @converted_purchase_reclamation_items;
+test_deeply($purchase_order->strip->as_tree, $converted_purchase_reclamation->strip->as_tree,
+  "purchase_order to purchase_reclamation",
+  @different_record_values
+);
+
+pairwise {
+  test_deeply($a->strip->as_tree, $b->strip->as_tree,
+    "purchase_reclamation_items to purchase_order_items",
+    @different_record_item_values
+  );
+} @purchase_reclamation_items, @converted_purchase_order_items;
+test_deeply($purchase_reclamation->strip->as_tree, $converted_purchase_order->strip->as_tree,
+  "purchase_reclamation to purchase_order",
+  @different_record_values
+);
+
+# diag Dumper($sales_order->strip->as_tree);
+# diag Dumper($converted_sales_reclamation->strip->as_tree);
+
+####
+clear_up();
+
+done_testing;
+
+1;
diff --git a/t/workflow/reclamation_reclamation.t b/t/workflow/reclamation_reclamation.t
new file mode 100644
index 000000000..d16e66546
--- /dev/null
+++ b/t/workflow/reclamation_reclamation.t
@@ -0,0 +1,319 @@
+use Test::More;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use Carp;
+use Data::Dumper;
+use Support::TestSetup;
+use Test::Exception;
+use List::MoreUtils qw(pairwise);
+
+use SL::DB::Reclamation;
+use SL::DB::ReclamationReason;
+use SL::DB::Customer;
+use SL::DB::Vendor;
+use SL::DB::Department;
+use SL::DB::Currency;
+use SL::DB::PaymentTerm;
+use SL::DB::DeliveryTerm;
+use SL::DB::Employee;
+use SL::DB::Part;
+use SL::DB::Unit;
+use SL::Model::Record;
+
+use Rose::DB::Object::Helpers qw(clone);
+
+use SL::Dev::ALL qw(:ALL);
+
+my (
+  $customer, $vendor,
+  $employee,
+  $payment_term,
+  $delivery_term,
+  $unit,
+  @parts,
+  $department,
+  $reclamation_reason,
+);
+
+
+sub clear_up {
+  foreach (qw(
+    Reclamation ReclamationItem
+    ReclamationReason
+    Part
+    Customer Vendor
+    Department PaymentTerm DeliveryTerm
+    )) {
+    "SL::DB::Manager::${_}"->delete_all(all => 1);
+  }
+  SL::DB::Manager::Employee->delete_all(where => [ login => 'testuser' ]);
+};
+
+sub reset_state {
+  my %params = @_;
+
+  clear_up();
+
+  $unit     = SL::DB::Manager::Unit->find_by(name => 'kg') || die "Can't find unit 'kg'";
+
+  $employee = SL::DB::Employee->new(
+    'login' => 'testuser',
+    'name'  => 'Test User',
+  )->save;
+
+  $department = SL::DB::Department->new(
+    'description' => 'Test Department',
+  )->save;
+
+  $payment_term = create_payment_terms(
+    'description'      => '14Tage 2%Skonto, 30Tage netto',
+    'description_long' => "Innerhalb von 14 Tagen abzüglich 2 % Skonto, innerhalb von 30 Tagen rein netto.|Bei einer Zahlung bis zum <%skonto_date%> gewähren wir 2 % Skonto (EUR <%skonto_amount%>) entspricht EUR <%total_wo_skonto%>.Bei einer Zahlung bis zum <%netto_date%> ist der fällige Betrag in Höhe von <%total%> <%currency%> zu überweisen.",
+    'percent_skonto'   => '0.02',
+    'terms_netto'      => 30,
+    'terms_skonto'     => 14
+  );
+
+  $delivery_term = SL::DB::DeliveryTerm->new(
+    'description'      => 'Test Delivey Term',
+    'description_long' => 'Test Delivey Term Test Delivey Term',
+  )->save;
+
+  # some parts/services
+  @parts = ();
+  push @parts, new_part(
+    partnumber => 'Part_1_KG',
+    unit        => $unit->name,
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_1',
+  )->save;
+  push @parts, new_part(
+    partnumber => 'Part_2',
+  )->save;
+  push @parts, new_service(
+    partnumber => 'Serv_2'
+  )->save;
+
+  $reclamation_reason = SL::DB::ReclamationReason->new(
+    name => "test_reason",
+    description => "",
+    position => 1,
+  );
+}
+
+Support::TestSetup::login();
+
+reset_state();
+
+#####
+
+my $sales_reclamation = create_sales_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td1",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+my $purchase_reclamation = create_purchase_reclamation(
+  save                    => 1,
+  employee                => $employee,
+  shippingpoint           => "sp",
+  transaction_description => "td2",
+  payment                 => $payment_term,
+  delivery_term           => $delivery_term,
+  taxincluded             => 0,
+  reclamation_items       => [
+    create_reclamation_item(
+      part => $parts[0], qty =>  3, sellprice => 70,
+      reason => $reclamation_reason,
+    ),
+    create_reclamation_item(
+      part => $parts[1], qty => 10, sellprice => 50,
+      reason => $reclamation_reason,
+    ),
+  ],
+)->load;
+
+# new
+my $new_sales_reclamation = SL::Model::Record->new_from_workflow($sales_reclamation, 'sales_reclamation')->save->load;
+my $new_purchase_reclamation = SL::Model::Record->new_from_workflow($purchase_reclamation, 'purchase_reclamation')->save->load;
+
+# convert
+my $converted_purchase_reclamation = SL::Model::Record->new_from_workflow($sales_reclamation, 'purchase_reclamation');
+$converted_purchase_reclamation->vendor_id($purchase_reclamation->{vendor_id});
+$converted_purchase_reclamation->save->load;
+my $converted_sales_reclamation = SL::Model::Record->new_from_workflow($purchase_reclamation, 'sales_reclamation');
+$converted_sales_reclamation->customer_id($sales_reclamation->{customer_id});
+$converted_sales_reclamation->save->load;
+
+#get items before strip
+my @purchase_reclamation_items           = @{$purchase_reclamation->items_sorted};
+my @sales_reclamation_items              = @{$sales_reclamation->items_sorted};
+my @new_purchase_reclamation_items       = @{$new_purchase_reclamation->items_sorted};
+my @new_sales_reclamation_items          = @{$new_sales_reclamation->items_sorted};
+my @converted_purchase_reclamation_items = @{$converted_purchase_reclamation->items_sorted};
+my @converted_sales_reclamation_items    = @{$converted_sales_reclamation->items_sorted};
+
+
+### TESTS #####################################################################
+
+my @different_record_values = qw(
+  record_type customer_id vendor_id
+  id record_number transaction_description employee_id
+  transdate itime mtime
+);
+
+my @different_record_item_values = qw(
+  id reclamation_id
+  itime mtime
+);
+
+## created sales und purchase reclamation should be nearly the same
+my $sales_tmp = clone($sales_reclamation);
+my $purchase_tmp = clone($purchase_reclamation);
+# clean different values
+foreach (@different_record_values) {
+  $sales_tmp->$_(undef);
+  $purchase_tmp->$_(undef);
+}
+
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (@different_record_item_values) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @sales_reclamation_items;
+is_deeply($purchase_tmp->strip->as_tree, $sales_tmp->strip->as_tree);
+
+
+## converted have to be linked to parent
+# new
+my $linked_sales_reclamation_n = $new_sales_reclamation->linked_records->[0];
+my $linked_purchase_reclamation_n = $new_purchase_reclamation->linked_records->[0];
+is_deeply($linked_sales_reclamation_n->strip->as_tree, $sales_reclamation->load->strip->as_tree);
+is_deeply($linked_purchase_reclamation_n->strip->as_tree, $purchase_reclamation->load->strip->as_tree);
+
+# converted
+my $linked_sales_reclamation_c = $converted_purchase_reclamation->linked_records->[0];
+my $linked_purchase_reclamation_c = $converted_sales_reclamation->linked_records->[0];
+is_deeply($linked_sales_reclamation_c->strip->as_tree, $sales_reclamation->load->strip->as_tree);
+is_deeply($linked_purchase_reclamation_c->strip->as_tree, $purchase_reclamation->load->strip->as_tree);
+
+
+## new reclamations should be nearly the same
+my $new_sales_tmp = clone($new_sales_reclamation);
+my $sales_tmp2 = clone($sales_reclamation);
+my $new_purchase_tmp = clone($new_purchase_reclamation);
+my $purchase_tmp2 = clone($purchase_reclamation);
+# clean different values
+foreach (@different_record_values) {
+  $new_sales_tmp->$_(undef);
+  $sales_tmp2->$_(undef);
+  $new_purchase_tmp->$_(undef);
+  $purchase_tmp2->$_(undef);
+}
+
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (@different_record_item_values) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @sales_reclamation_items, @new_sales_reclamation_items;
+is_deeply($sales_tmp2->strip->as_tree, $new_sales_tmp->strip->as_tree);
+
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (@different_record_item_values) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @new_purchase_reclamation_items;
+is_deeply($purchase_tmp2->strip->as_tree, $new_purchase_tmp->strip->as_tree);
+
+
+## converted reclamation should be nearly the same
+my $sales_tmp3 = clone($sales_reclamation);
+my $converted_sales_tmp = clone($converted_sales_reclamation);
+my $purchase_tmp3 = clone($purchase_reclamation);
+my $converted_purchase_tmp = clone($converted_purchase_reclamation);
+
+my @different_converted_record_values = qw(
+  transdate
+  record_type
+  customer_id vendor_id
+  id record_number
+  employee_id reqdate
+  itime mtime
+
+  delivery_term_id
+  payment_id
+);
+
+my @different_converted_record_item_values = qw(
+  id reclamation_id
+  sellprice discount lastcost
+  itime mtime
+);
+
+# clean changing values
+foreach (@different_converted_record_values) {
+  $sales_tmp3->$_(undef);
+  $converted_sales_tmp->$_(undef);
+  $purchase_tmp3->$_(undef);
+  $converted_purchase_tmp->$_(undef);
+}
+
+# from sales to purchase
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (@different_converted_record_item_values) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @sales_reclamation_items, @converted_purchase_reclamation_items;
+is_deeply($sales_tmp3->strip->as_tree, $converted_purchase_tmp->strip->as_tree);
+
+
+# from purchase to sales
+pairwise { my $first_tmp = clone($a); my $second_tmp = clone($b);
+  foreach (@different_converted_record_item_values) {
+    $first_tmp->$_(undef);
+    $second_tmp->$_(undef);
+  }
+  is_deeply($first_tmp->strip->as_tree, $second_tmp->strip->as_tree);
+} @purchase_reclamation_items, @converted_sales_reclamation_items;
+is_deeply($purchase_tmp3->strip->as_tree, $converted_sales_tmp->strip->as_tree);
+
+#diag Dumper($first->strip->as_tree);
+#diag Dumper($second->strip->as_tree);
+
+####
+clear_up();
+
+done_testing;
+
+1;
+
+# set emacs to perl mode
+# Local Variables:
+# mode: perl
+# End:
diff --git a/t/xml_invoice/corpus/Avoir_FR_type381_BASIC.pdf b/t/xml_invoice/corpus/Avoir_FR_type381_BASIC.pdf
new file mode 100644
index 000000000..62cc568eb
--- /dev/null
+++ b/t/xml_invoice/corpus/Avoir_FR_type381_BASIC.pdf
@@ -0,0 +1,902 @@
+%PDF-1.6
+%âãÏÓ
+1 0 obj
+<<
+/Kids [ 3 0 R ]
+/Type /Pages
+/Count 1
+>>
+endobj
+2 0 obj
+<<
+/ModDate (D\07220180610203216\05300\04700\047)
+/Subject (Factur\055X Avoir AV\0552017\0550005 dated 2017\05511\05516 issued by Au bon moulin)
+/Producer (PyPDF2)
+/Title (Au bon moulin\072 Avoir AV\0552017\0550005 dated 2017\05511\05516)
+/Creator (factur\055x Python lib v0\0568 by Alexis de Lattre)
+/Keywords (Avoir\054 Factur\055X)
+/Author (Au bon moulin)
+/CreationDate (D\07220180610203216\05300\04700\047)
+>>
+endobj
+3 0 obj
+<<
+/Parent 1 0 R
+/Contents 11 0 R
+/Type /Page
+/Resources 12 0 R
+/StructParents 0
+/MediaBox [ 0 0 595 842 ]
+>>
+endobj
+4 0 obj
+<<
+/Length 7533
+/Type /EmbeddedFile
+/Params <<
+/Size 7533
+/ModDate (D\07220180610203216\05300\04700\047)
+/CheckSum (afac1e15fcc0b03e914a27cbe4950b95)
+>>
+/Subtype /text#2Fxml
+>>
+stream
+<?xml version='1.0' encoding='UTF-8'?>
+<rsm:CrossIndustryInvoice xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:basic</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>AV-2017-0005</ram:ID>
+    <ram:TypeCode>381</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20171116</udt:DateTimeString>
+    </ram:IssueDateTime>
+    <ram:IncludedNote>
+      <ram:Content>Avoir suite à bidon 10L d'huile d'olive percé et carton de nougat renversé</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:GlobalID schemeID="0160">3518370400049</ram:GlobalID>
+        <ram:Name>Nougat de l'Abbaye 250g</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount currencyID="EUR">4.10</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">5.000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>20.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount currencyID="EUR">20.48</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:Name>Huile d'olive à l'ancienne</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount currencyID="EUR">19.80</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="LTR">10.000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>5.50</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount currencyID="EUR">198.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:SellerTradeParty>
+        <ram:Name>Au bon moulin</ram:Name>
+        <ram:SpecifiedLegalOrganization>
+          <ram:ID schemeID="0002">99999999800010</ram:ID>
+        </ram:SpecifiedLegalOrganization>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>84340</ram:PostcodeCode>
+          <ram:LineOne>1242 chemin de l'olive</ram:LineOne>
+          <ram:CityName>Malaucène</ram:CityName>
+          <ram:CountryID>FR</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">FR11999999998</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>Ma jolie boutique</ram:Name>
+        <ram:SpecifiedLegalOrganization>
+          <ram:ID schemeID="0002">78787878400035</ram:ID>
+        </ram:SpecifiedLegalOrganization>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>69001</ram:PostcodeCode>
+          <ram:LineOne>35 rue de la République</ram:LineOne>
+          <ram:CityName>Lyon</ram:CityName>
+          <ram:CountryID>FR</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">FR19787878784</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>PO445</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+      <ram:ContractReferencedDocument>
+        <ram:IssuerAssignedID>MSPE2017</ram:IssuerAssignedID>
+      </ram:ContractReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery/>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:PaymentReference>AV-2017-0005</ram:PaymentReference>
+      <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount currencyID="EUR">4.10</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount currencyID="EUR">20.48</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>20.00</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount currencyID="EUR">10.89</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount currencyID="EUR">198.00</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:DueDateTypeCode>5</ram:DueDateTypeCode>
+        <ram:RateApplicablePercent>5.50</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:SpecifiedTradePaymentTerms>
+        <ram:DueDateDateTime>
+          <udt:DateTimeString format="102">20171116</udt:DateTimeString>
+        </ram:DueDateDateTime>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount currencyID="EUR">218.48</ram:LineTotalAmount>
+        <ram:TaxBasisTotalAmount currencyID="EUR">218.48</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="EUR">14.99</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount currencyID="EUR">233.47</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount currencyID="EUR">0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount currencyID="EUR">233.47</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+      <ram:InvoiceReferencedDocument>
+        <ram:IssuerAssignedID>FA-2017-0010</ram:IssuerAssignedID>
+        <ram:FormattedIssueDateTime>
+          <qdt:DateTimeString format="102">20171113</qdt:DateTimeString>
+        </ram:FormattedIssueDateTime>
+      </ram:InvoiceReferencedDocument>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>
+
+endstream
+endobj
+5 0 obj
+<<
+/Type /Filespec
+/AFRelationship /Data
+/F (factur\055x\056xml)
+/Desc (Factur\055X Invoice)
+/UF (factur\055x\056xml)
+/EF <<
+/F 4 0 R
+/UF 4 0 R
+>>
+>>
+endobj
+6 0 obj
+<<
+/Length 8486
+/N 3
+/Filter /FlateDecode
+>>
+stream
+xœ­šWTݲ¶g÷Ê,r΋œsÎ9K’sÎ’QÉQDI"(  Š¢ ¢ ‚
+*‚Š
+0Š?ßÞÿ{_œswê¢ë5«{ÖxߺlüÃý"â`""ãcíMôù\\Ýø0oà
3à>~qÑz¶¶–àÍ§ú'ÏJýó­ÿ½ï‚@œvŸ‹ü¢cã÷¹lŸ’â£ÿá}fööñßçû,»?à>ÿú§îû/†‰ÿpп™ïŽu´7ØgEøˆAÿžÿÅ~Á±û×èî÷ý{†CÜ?"ø&„„ÇK…DþgNFì	Ðß×Ä$€âÔ~þ¯¦ÿ‹ˆHŽÿ'[GñùEE§Ä†ÇKò%ÄðÆ„§üsöGÿîþöq
+òÿ*ADsPË{{?Ä
ÀÔ°stoïÏÙ½½s æ
)ûÏûQûZ«®ï×Oþ§&T%€þ¡ÿÔ|›
¸r¶E¿„ØÄÿ/Õ¿n0@Ôþ¾`ng€Ȁ²È˜ö7ˆX`€p
À»¯?B@ˆ1@â@b_Gi d<PŠ@	¨U ԁÐÚ@èîënÑ¾¦À˜K`¬
°ÛwÅ
8‚À¸Wà<€'ðÞÀgß'?àAÞ÷)lß±ˆ}·¢@ˆÝw3$‚$R@*Héà0ÈY ä€<pù ‚"pƒ“à(
¥ T€JPj@-¨õ 
œ
à,hÍ ´‚6Ð.€Ð	..Ð
z@/èýà
+¸
+®Apa0n‚QpŒqpÜà>x¦ÀC0
Yð<
s`<ÏÁx	Á+ð¼
oÁ;ð¬‚5ð
|ŸÁð|?ÀO°	¶À/°
þ€°ö ‚!$„‚0ÂCˆ‘!
+ÄQ!fˆ±BlÄ	qC¼$	B$Ñ!	H
+’†d!9H
R„”!UH
Ҁ4!mH҃ #È2…Ì!È
+²l!{È:9C®ä
yA!È
+€‚ `(
+‡"¡((Šƒ D(:¥A‡¡(ʁò £P
t*‚Š¡“P	TU@•P5TÕC
P#tj†Z¡óШºuA=P/Ô
@× ëÐ4B·¡qè.4
=€¦ ihz=…æ¡çд½†–¡wÐ
+´}„>C_ oÐhúmC¡]À0Œ„10&À$˜Saf˜fƒ9`n˜æ‡aaX‡%aiXV€•`UXքµa=Ø6‚Masضí`Ø	vÝ`OØöýá@8ƒ#àh8N€“à8
>gÁ9ð8.„Ã'Ḯ„kà:¸
n„›àø<|
¾wÁ—á>x„oÀ#ð(<߅'àIø!<?çàçðKx	~¿…Wàð'øüހ·àmxÞCÀ‹À#H‚†`Cp"x|A„‚ŽDH#䊄:B¡ƒÐG!Lk„Âá„pEx ¼¾ˆD0"‰ˆAÄ#’‡éˆLD6"‘(D#N!ÊUˆZÄiD#¢	ъhGt"º—ýˆ«ˆëˆaÄ(bqññ1ƒx‚˜G¼@,!Þ Þ!Vëˆïˆ
Ä/ÄÄ.F¢X$
IAR‘4$’ɋ@
+#éHI¤R
©ŒTCj!u‘H¤9Ò
+i‡tD:#ݑ^H_d2ŽŒBÆ!‘)Ètd&2yYˆ,F– ˑÕÈ:ää9d+²yٍìC ¯#‡‘·ãÈ	äòò	r¹€|…\F® ? בߑÈßÈ@!QX
EA1¡XP(”JEGI¡äPŠ(U”&Je€2AY lPö('”Êå‹
+D… "P1¨T
+*•…ÊE壊P'Qe¨*Têª	Նê@]B]F]A
¢†Q·PwP÷QQ³¨9ÔÔjµ‚úˆú‚ú‰ú…ú‹h$‹&¢ÐÌh64š-Œ¦£¥Ðrh%´Z­6F›£­Ñhg´;Úí‡F‡££Ññèt::‡>†.F— +ѵètº
݁îF÷¡¯¢‡Ð£èqô}ôCôcô<z
ýýý
½ŽþŽÞBÿÁƒÃ0T†Ëˆa¤0reŒ:Fc€1ÅXaì0N7Œ7ÆŒ‰ÀÄ`1©˜L.¦sS‚©ÄÔbÎ`š1ç11—1W0×171ã˜	ÌCÌcÌ3ÌKÌÌ
+ææf³ÙÃ"±8,	KŲb¹°üX¬V«ˆUÃjc
°¦X+¬=ÖëõÁbðÑØì!l6[€-Ɩb«°õسØVl¶ۏĎ`Ç°؇ØÇØgØ%ì[ìvûû»ƒCà°8ŽŠcÅqãp¢8IœN§‰ÓÃã,qv8'œ;ΈÃÅàq©¸,Ü\!î®W‹kĵà.àºqý¸ë¸›¸qÜÜ#Ün
÷·‚ûŒûŽû…ÛÁÃx,ž„g³ãyðBx:^¯ˆWÇëàðæx[¼ÞïƒćãcñIøt|>_Œ/ÃWãðÍøv|¾?‰ŸÅÏãñoñð_ðø?ˆ€!	T‡ D'È”=‚	ÁŠà@p%xü	¡„hB"!MÈ'Ê5„3„B¡‡0@"Ü&L¦	O	„7„5ÂÂá"bˆ$"‘ÈG!J剪Dm¢тhGt&zý‰¡Ähb"1˜C, ž Vëˆg‰mÄKÄ>â q”x—8E|B|A|M\%®7ˆH	K"“h$N?IŒ$MR"iôI¦$Ò
’ɗBŠ"%’ÒH9¤ÒIR©žÔDj'u“®†Hc¤û¤Ò3Òé=ééi›‘1d2™Fæ$éd²2Y‹lH6'ۑ]ÈÞä@r89Ž|ˆœEÎ'“ËÉuäsävr7y€<D#? ϒŸ“_“WÉ_țä
+’B P)ì>Š(Eš¢DѤPÌ)vŠ7%A‰§¤R²)”“”*J¥…ÒIé¥RF)”G”yÊå=å3eƒò—
Á€g 2°3ð1ˆ2È0(3h12X280¸1ø2„0D3$3d0a(f(g¨ghb¸Àp™áÃ(Ã=†i†y†%††u†M†F#‘‘™‘“QQœQžQQÑ”іљћ1ˆ1’1‘11ñ8cccãÆˌƒŒ£ŒŒ3ŒÏ_3®1~eüET,•Be¥òRE©ÒTeª6՘jM=@õ¤P#¨	Ôtj.µˆZF­£6Q;¨½ÔëÔÛÔÔÇÔÔeêGêê&‰‰‰“II‚IIƒÉÉ’ɑɃɟ)œ)ž))—©ˆ©Œ©ž©™©“©éÓÓ$ÓS¦E¦÷LëL›L{Ìf
+3+3³³,³*³³³³³/s(ss*sssss3s's?óó8óCæ9æWÌ«ÌߘÓ žF¥qÒi’4Eš͈fMs¦yӂiÑ´Zí­”VKk¢uÐúhC´qÚCÚ<ímö¶Í‚`!²0³p³ˆ°È°¨°è²˜±Ø³¸±ø±„³$°f9Âr‚¥Š¥‘¥å2Ë Ëm–I–§,K,«,ßX¶Y¬DVfVnVVVUV=VsVVÖÖHÖ$ÖLÖÖÖ:Öf֋¬WXGXï±Î°¾`}Ëú™u‹
°áبlœlBlÒl*lºlflöll
l‘lIlYlÇØJÙêØZØ.±
°²Ýg{̶ȶÂö•m›ÁNdgaçe§³Ë³k°±[³»°û°‡±Ç³f?Ê~Š½†½‰½“ý
+ûûû,ûKö÷ì_Ù·9$>q-c[7?ŽŽ$Ž,Žce§9Z9º99Æ8¦8æ9Þp|âØàØãÄq2qrsŠrÊrªsrZsºpúr†s&pfpp–rÖs¶rvsrŽq>ä|ƹÌù™s‹â"pѸx¹è\
+\Z\&\v\î\
\Ñ\‡¸r¹Š¹ª¸ÎrupõsÝäºÏõ„k‰kë'×.7–›ÊÍÅ-Ê-Ç­ÁmÄmËíÆíÏŝÃ]Ì]Å}–»“û
+÷MîÜO¹_säÞà
<x/8"6O0OO:O>O)O=OOÏ
ž;<3<<+<ßyþòbx©¼\¼¢¼ò¼š¼&¼ö¼¼A¼±¼i¼GyKxëy[y{xoðÞåá}É»Êûƒw—ËÇÄÇÃGçSäÓá3çsäóæåKàËä+ä«àkäëà»Â7Ê7É7Ï·Ì·Î÷›ÉOáçàæ—å×à7æ·ã÷àâå?Ì_À_ÆßÀßÎßÇ?Âÿ€Žÿ
ÿgþ_H
Š‡€°€¬€¦€‰€½€—@ˆ@¼@†@¡@…@£@§À€À-‡ÏÞ|ø+ˆdäTÔ´tôŒ<$xDð”`½`›`¯à°à}Á§‚oס„„¸„Ä„„t„,„œ„|…"…R„ò„N	Õ	µ	õ
+
ÝšZZÚFS…y„éÂJÂzÂV®Â
ÂÑÂiÂùÂeÂg„;„„oO/¯ÿÞ!ˆ°ŠŠÈˆhˆ˜ˆ8ˆx‹„‰$‰äŠœ©iéy 2/òVä«ÈŽ(N”&Ê/*%ª&j,j/ê%*š(š#zB´V´U´WtDôè3Ñw¢ßDwÄðb,b‚b2bb¦bŽbÅ"ÄRψ•ˆ» vEì¶Ø´ØK±5±M:L§Ð9ébtEº݊îF¢ÇÑ3éEôjz½‡>L@Ÿ§¿££ïŠÄÙąÄåĵÅÍŝÅýÅcÄÓŏ‰WŠ7‰w‹ßŸŸ+þM|W/Á*!$!'¡-a!á" +‘!Q$Q-Ñ,Ñ#1,ñ@â™Ä{‰’$Y’SRLRIR_ÒFÒC2D2Q2Gò¤äiÉ’’c’3’K’Ÿ%·¥0RÌRüR2RšRfRNRþR1R‡¥
+¥ª¥Z¤.Kݔš’z!µ&µ)”f”æ‘–”V“6‘v”ö‘Ž’N“>&])Ý,Ý#="=)ýBzUzS!Ã(Ã##)£.c"s@ÆW&Zæ°L¡LµL«L¯Ì¨Ì´ÌK™2¿eѲ̲²2²Z²²®²A²ñ²Ù²'eOËvÈ^•½#ûDvYö›ìžIŽCNLNYÎPÎ^î \¤\šÜ1¹*¹¹^¹Q¹i¹E¹OrÛòXyy!yyy]ykyùPùù£òåòçä»å‡å'åä?ÈÿR@+0+*È)è(X)x(„*$+Q(W8§Ð­0¢0¥° ðQá·"F‘EQHQAQOÑFÑK1\1U±@±J±E±Oñ–âŒâ+Å/Š;JD%%º’Š’±’£’ŸR¬R¦Ò	¥z¥¥A¥{JóJ+JÊHe&e~eYeekeå0åCÊʕÊ-Ê}Ê·•g•_+UÞS!«p«Hªh¨˜©¸¨©$ªä©”©œSéQ¹©2­²¤²®²£JTåTWUS5UuV
TMPÍU-U=«Ú­zSuZuIu]uG¨Æ©&¡¦®f¦æ¢¤–¤vD­\­I­Wí–ÚŒÚkµoê@¢Î«.­®¥n¥î¡¦žª~L½Fý¼ú€ú]õ9õõM
´MCXCQÃPÃAÃO#V#[ã”F£F—ƈƴƒÆ]M²&¦”¦–¦•¦‡f¸fšf¡f­æÍkššÏ5?hþÖÂi±kѵԴLµ\´‚µ’µòµª´Zµ®hÝњÓZÑÚÒÆh³j‹j«h›h;ki'iÕ®ÔnÕ¾¢}G{N{E{K£Ãª#ª£¢c¢ã¬¤“¬“¯S¥Ó¦3 sWç™ÎšÎo]œ.»®¸®º®¹®›n˜nªn¡nn‡îuÝIݗºŸuwõÈz<z2z:z6zõ¢õ²ôNéÕëÑ»¥7«÷Vï§>JŸ¦/¢¯¬o¢ï¬¬Ÿ¬_ _£ß®?¨_Aÿ³þŽ
ـ×@Æ@×ÀÎÀÇ Ö Ç Ì É Ï`Ü`Î`Åà—!ΐÃPÂPÃÐÒÐÓ0Ò0Ãð¤a£aá¨á¬á[Ã
#´«‘˜‘š‘¹‘»Q¸QºQ±QƒQ—ÑM££e£ŸÆ(cVc1c5cscwãpãtãÆgŒ»Ggßoš`LØLè&&–&ž&‘&™&§LΚôšŒ™<5Y5ùmŠ7å2•2Õ1µ5õ13Í5­0m5½j:aº`úÙtόÁLÀLÁÌÈÌÉ,ØìY¡Y½ÙE³³³e³
s´9›¹¸¹†¹•¹·yŒy¶y™y‹ùó{æ/Ì?›ïY0XX(Z[¸X„X¤Z·h°è¶¸eñÄbÅâ·%ޒËRÚR×ÒÞÒß2Ñ2߲ƲÃrÈrÚòåO+´»•„•–••UœUžU¥Õy«ëVSV¯¬¾[#­Y­éÖÖVÖÞÖ±Ö¹ÖÖç­­'­—¬¿Û mXlè66Ö6mbmòl*mÚm®ÛLÙ¼¶ùa‹¶e³•°Õ²µµõµM°=j[cÛi;l;cûÖvËgÇe'c§gçhd—bWd×`×mwÛnÎnÍî¯=Å^À^ÑÞÄÞÍ>Â>ӾľÙ~Àþ¾ý¢ý7¤‹ÝAÓÁÆÁ×!Á!ß¡Öá¢ÃM‡Ç+ێ$G>GGcGWÇpÇÇÇfÇ
ÇûŽ‹Žß °8 }Àî@Àä…Nè>0v`þÀÇ»NT'a'U''o§X§<§j§§a§Y§÷NÛÎ$g>gEggwçHçlçrçóÎם§—·\ð.<.r.F...á.™.¥.­.×\¦\Þ¸l¸â\¹]e]
]]\Ã\3\K][]¯¹N¹¾qÝtùq»É¹¹¹º…»eº•¹µ¹]w›v{ëö˝àÎë®ànâîîåžã^é~Á}Ø}Ö}ÅýÅCÐCÅÃÂã G¼G¾GG—ÇmyOž'͓î©åiçàyȳØó¬g¿ç}Ï%Ï^X/./Y/C/W¯¯l¯
+¯v¯a¯Y¯¯¿ÞÞÂÞjÞÖÞ¾ÞIޅÞg¼{½ïy¿ôþ~}ó ÌAÃ.#f¬8xáàðÁÇ×îøP}D}4|l}|ùûœóð™ôyí³éKðåóUò5óõòóÍ÷­÷íñ½ãûÂ÷«ʏÃOÆÏÐÏÕ/Ò/ǯʯÓoÔoÎï“?äÏâ/á¯ëÀ?Ô?ÿܿÝØÿ±ÿšÿnS=@;À! 8 = 4 -àFÀLÀjÀN 5P4P+Ð>0(0=°$°5ðFàLàjàN5H,H+È!(8èpPiÐù ¡ ÇAkA{ÁÌÁâÁ:Á‚Cƒ3ƒ+‚/ß~ü)a
‘
+1q	‰É
©¹2ò"äk(:”+T>Ô4Ô34.´ ´!´/t"ôUèf1L L5Ì:Ì?ìPØÉ°–°ëa3a«a»áÌáâáºáNáááÙáUáÃo‡?ÿŽàŠPˆ0‹ðŽHˆ(ŒhŒˆ˜Šx±É)©é™YÙy+òYä×(tW”B”YÔÁ¨Ä¨¢¨sQW£¦£ÞGíD3E‹GëF;GGDçF×DwG߉^ŒþCˆˆQ±‰	ŒI‹)i‰™‹YEÆrÆÊǚÆzÇ&ƏmŠ½û(v5v/Ž%N2Î Î-.&.?®!®?n2îmÜv<c¼X¼N¼S|D|n|m|Oü½øWñ[	ä‘­DŽ°„ì„ê„®„;	‹	›‰¤D¡DDûÄÐĬĪÄK‰w7’ˆIBIIöI¡IYIUI]Iw’“6“IÉÂɚɎÉaÉÙÉ5ÉÝÉ÷’_%ÿJ¡¤ˆ¦h§8¥D¦ä¥Ô§ô¦<HYNùsˆéø!ýCn‡bj<4phúÐj*HeM•I5IõNML-NmIJ}šºž†JãNSJ³JHKO+OëLK[Hû™NLJ×LwLOÏM¯KïMŸL—¾s˜vXê°ÑaÏÃ	‡n><tøéáõtO†J†MFPFFFeFWÆ݌W¿33é™z™n™±™Ç2Ïef>Îü”…ÌâÎRʲÎ
+ÌÊȪÌêʺ›õ:ëw65[<Û Û=;>»(»9{(ûiö—L_ŽZŽ]NhNNNmNoÎdλœÝ\Ö\Ù\Ó\ŸÜC¹¥¹¹·s_ænæQòÄòôòÜòbó
+óšònä=Íûr{„ÿˆú‡#áGòŽœ>råÈô‘µ£ðQӊG­ŽÍ<Z}´çèý£oîä³æËæ›åûæ§æ—ç_Ì¿“ÿ*»€©@²À¸À» ¹àTÁ…‚Û‹[ÇŽ‰38æy,ñ؉c珍[8¶QH)+Ô/t/L(,.l+-|Q¸QD.+Ò/r/J(:QÔV4Z´P´qœrœ~\ÿ¸ÇñÄã'Ÿ?~ëøËã[ŌÅņÅ^ÅÉÅ%ÅÅãůŠ·O0:arÂçDê‰ò—NÜ;±|bç$ëI¹“'Nfœ¬9Ù{rêäê)ø×)åS¶§ÂNåj8uõÔì©õl‰@‰f‰sILIaIKÉHÉ󒟥”Rz©a©WiriiigéÝÒ7¥ËXËäÊ,Ë˲ÊjËú˦Ë>–£ÊùÊ5Ê”G—+o.)^¾QA©¯0ªð®8TQ^ÑU1Qñ®TrV*UÚV†U©l¬¬|Zù­ŠX%Z¥_åY•TURÕYu·j¹j·š½Z±Ú¦:´:¯úLõ`õÓêo5ÄÑý¯š”š²šK55ïjA-W­J­}mDm~mSípíóڍ:Æ:É:“:¿ºÃuÕu}uÓuë1õõZõ®õñõ'ë/ԏ׿©ß9Í~Zñ´íé°ÓGOŸ==túùéÆÉÓ¿†Œ†Ú†þ†™†õ3¸3ÂgôÎxœI>Sv¦ëÌý3+ˆFÞFõF§ÆØÆâÆöÆñÆ׍;gÙÏ*µ;q¶àlóٛg_žý}ŽvNîœÕ¹syçÏÝ8÷ìÜFc“T“YS@SVÓé¦kMO›¾7“›Å›Mšýš3šk›š7m!¶Ð[ŒZ|Z·Ô´ô·Ì¶|i%´Šµ¶lMo­níoiýÒFhk3lóiKo«iëo›mûržxž~Þè¼ïùÃçkÏœ|þ[;¹]¼Ý¤Ý¿=³½¾ýZû\û¤.˜_ºsá̅ž_Øê`îí°êí8ÚÑÔq³c±ãO'[§R§}gTgQçùÎñÎå‹à"÷Eõ‹Îã/–\¼tñÁŵKèK‚—t/y]J½Tu©ïÒ쥯]¤.ñ.Ó®€®ì®†®]Ï»¶ºiÝòݶÝÝǺۺǺ—{@OFkObOYOwÏÞO—ñ—E/]ö½œyùôåÁËÏ.oö2÷Ê÷ÚôFôö¶õŽ÷¾íƒûxû´úÜûRú*úzûfú¾ö“û%ûÍúƒúóúÏõßì_êß¹ÂyEíŠó•„+¥Wº¯<¼òy€0@0Èhx9ðç*ûUÕ«NW㯖\íº:uõó5Â5ú5“k×r¯½6rméÚÎ ç ú Ë`â`ùàåÁGƒ_¯“¯K]·¸z=ÿzËõ±ëË7à|7tnxÞH»Q{ãêù›C´!…!û¡˜¡C‡&‡>ã‡éÃ&ÁÃyÃMãïGÀïˆöˆÇHêHÍÈՑù‘­›´›Š7nÆÞ<u³ëæÛ룤QÉQ‹ÑÐтѶÑ;£ïo¡n	Ý2¸å{+ë֙[#·–níÞæ¾­yÛývêíšÛWoÏßÞcS;0–0V6vylfìû8ã¸ì¸íxÔø‰ñ‹ã“ãŸïïHÞ±¸vç؝ö;÷î¬ÝÅÞ»kr7è-wÇî¾»‡º'tÏðžÿ½œ{çîݺ÷fž˜Ð›ð™Èšhœ™xuÜ绯{ßû~Æý†ûÃ÷—îï=à} óÀëÁá§=X|°;É3©=é5yxòôäÐäâäîï”Δ÷TÆTÃÔðÔÒÔÞC¾‡º>Ì|xæá͇¯§¡iþiýißéìé³Ó·¦—!	=2|ð(ïQó£ñGïg03¢3&3Á3ù3çgîÍ|˜ÅÏJÌZΆÏŸíœš]Ly,ûØöqÌã’Ç=gÿ|ÂüDé‰Ó“¤'•Ož<{²ý”ã©ÆS§éOO?~º4æøçôçüærçšçÆçVæ±óôyóù°ù¢ùÎù©ù/ÏžÉ=³÷¬ìYß³§Ï~=g®þÜýyÚóÓχŸ¿z
½xaø"àőm/î½ø°@XZ°^ˆZ8µÐ³ðxaã%ËK՗®/S_Ö½z¹´-
+,.,]l[œXü´DZ’Y²]Š]*[ê[š[úýŠã•æ+¯W¯_Ýzõî5úµØkó×ᯏ¿¾ôúÑëohoTÞ¸¾9ô¦îÍЛWËð²Ð²ñrðò±åŽå©å¯o©oß:½M~[óöúÛÅwÐ;ÁwFï‚Þ¼»ðnòÝ×÷Ô÷ŠïÞ§¼¯}ãýÒ
+¼"´b¼²R¸Ò¹2½ò}•yUeÕu5uõôêÈêòjMlÍ|-bíÄZÏÚãµ­ì4?x}ÈúÐôaüÃÚGÂGévã>V|¼úqáãî'þO†Ÿ?|êøôðÓ÷Ï̟U>»}Nÿ|æó­ÏïÖ±ëëÖë1ëeëW֟¯ï|áûbð%ðKÁ—Ž/¿|ÿJûªúÕýëᯍ_Ǿ®~#|“þf÷-þ[Õ·Áo‹ß¡ïBßM¿‡}/þÞýýÉ÷_?8èüðý‘÷ãü?¾þdú©üÓígúÏƟ·®n6d6ì77ª7nl¼ÚDnŠnZlFm–löo>ÛÜÙâß2Ü
+Þ*ÚêښÝÚúÅùKû—ï¯#¿ÚMýúö›ö[í·çï¬ßÍ¿ïýþ´Í°­¸í²¶}fûööêâÙ?Ž’ÿÔýùóö/ö¯ä_Û¿	«ÿÞøûzµC߱ډݩع¶³¸ïŠîZìFí–íì.ì=á=³½ˆ½’½þ½{{ÿþ‡b?ÿ<ÎÍ
à˜
+€å$Õ5ˆ@ñøH@^
+endstream
+endobj
+7 0 obj
+<<
+/S /GTS_PDFA1
+/Type /OutputIntent
+/OutputConditionIdentifier (sRGB IEC61966\0552\0561)
+/DestOutputProfile 6 0 R
+>>
+endobj
+8 0 obj
+<<
+/Length 4126
+/Type /Metadata
+/Subtype /XML
+>>
+stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?><x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/" rdf:about="">
+      <pdfaid:part>3</pdfaid:part>
+      <pdfaid:conformance>B</pdfaid:conformance>
+    </rdf:Description>
+    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+      <dc:title>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Au bon moulin: Avoir AV-2017-0005 dated 2017-11-16</rdf:li>
+        </rdf:Alt>
+      </dc:title>
+      <dc:creator>
+        <rdf:Seq>
+          <rdf:li>Au bon moulin</rdf:li>
+        </rdf:Seq>
+      </dc:creator>
+      <dc:description>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Factur-X Avoir AV-2017-0005 dated 2017-11-16 issued by Au bon moulin</rdf:li>
+        </rdf:Alt>
+      </dc:description>
+    </rdf:Description>
+    <rdf:Description xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
+      <pdf:Producer>PyPDF2</pdf:Producer>
+    </rdf:Description>
+    <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
+      <xmp:CreatorTool>factur-x python lib v0.8 by Alexis de Lattre</xmp:CreatorTool>
+      <xmp:CreateDate>2018-06-10T20:32:16+00:00</xmp:CreateDate>
+      <xmp:ModifyDate>2018-06-10T20:32:16+00:00</xmp:ModifyDate>
+    </rdf:Description>
+    <rdf:Description xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" rdf:about="">
+      <pdfaExtension:schemas>
+        <rdf:Bag>
+          <rdf:li rdf:parseType="Resource">
+            <pdfaSchema:schema>Factur-X PDFA Extension Schema</pdfaSchema:schema>
+            <pdfaSchema:namespaceURI>urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0#</pdfaSchema:namespaceURI>
+            <pdfaSchema:prefix>fx</pdfaSchema:prefix>
+            <pdfaSchema:property>
+              <rdf:Seq>
+                <rdf:li rdf:parseType="Resource">
+                  <pdfaProperty:name>DocumentFileName</pdfaProperty:name>
+                  <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                  <pdfaProperty:category>external</pdfaProperty:category>
+                  <pdfaProperty:description>name of the embedded XML invoice file</pdfaProperty:description>
+                </rdf:li>
+                <rdf:li rdf:parseType="Resource">
+                  <pdfaProperty:name>DocumentType</pdfaProperty:name>
+                  <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                  <pdfaProperty:category>external</pdfaProperty:category>
+                  <pdfaProperty:description>INVOICE</pdfaProperty:description>
+                </rdf:li>
+                <rdf:li rdf:parseType="Resource">
+                  <pdfaProperty:name>Version</pdfaProperty:name>
+                  <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                  <pdfaProperty:category>external</pdfaProperty:category>
+                  <pdfaProperty:description>The actual version of the Factur-X XML schema</pdfaProperty:description>
+                </rdf:li>
+                <rdf:li rdf:parseType="Resource">
+                  <pdfaProperty:name>ConformanceLevel</pdfaProperty:name>
+                  <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                  <pdfaProperty:category>external</pdfaProperty:category>
+                  <pdfaProperty:description>The conformance level of the embedded Factur-X data</pdfaProperty:description>
+                </rdf:li>
+              </rdf:Seq>
+            </pdfaSchema:property>
+          </rdf:li>
+        </rdf:Bag>
+      </pdfaExtension:schemas>
+    </rdf:Description>
+    <rdf:Description xmlns:fx="urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0#" rdf:about="">
+      <fx:DocumentType>INVOICE</fx:DocumentType>
+      <fx:DocumentFileName>factur-x.xml</fx:DocumentFileName>
+      <fx:Version>1.0</fx:Version>
+      <fx:ConformanceLevel>BASIC</fx:ConformanceLevel>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
+endstream
+endobj
+9 0 obj
+[ 5 0 R ]
+endobj
+10 0 obj
+<<
+/AF 9 0 R
+/Type /Catalog
+/Names <<
+/EmbeddedFiles <<
+/Names [ (factur\055x\056xml) 5 0 R ]
+>>
+>>
+/OutputIntents [ 7 0 R ]
+/Metadata 8 0 R
+/Pages 1 0 R
+/PageMode /UseAttachments
+>>
+endobj
+11 0 obj
+<<
+/Length 4163
+/Filter /FlateDecode
+>>
+stream
+xœ½\ݏ·¿¿B@ßܙß䧓Ԥh’УnrN]ølØ> ÿ~9ÃÏ]%ê”ÔtË%9üq83Βdw|óߛ7÷__>¼÷ëËf÷ãÃ͗
Û0ÿ^OúNlœâwnóõéæßm>Ý|þ²4»›¤ÿ·YÿýúûTËÔÝ´FÞé
·žÌæýwÉ}K†i_–6PV;7^Öòñ²Z—•v¼¬/5\–É¡²BޙÈ4¡F+?n#»³á|åni	ōò?§KOÆŒ¥Å9ÚJOw*A1çh+O;
7Î?žFâ´/§˜õ¿œ3ß·¾ÎéârBÞ¥âò\q+}™êÀr©tB~bt~Ú|Ùøâ|c­ÚHè!r&)ÝxgA+áý´AÊPô×ç›7?<ëÍþóæ§Ù¾*cžÿïu÷xÃ9´ïtîñ·Í›£Olß¿Ý2>«-ó­Ù29‹-S³Ҙ63¾¼ålËììÒk
¯Ý|ëO3ä™XÞ=$ºÃ"3Ÿ “ë-Û‘XîTŽP“³üˆ8Ÿ¹ÜrÄÄ%¾ÆÖ'¤gJ9K$舉ëY&¤áa=n"),¹ŸoU$bgD”\yœJ×ù½oœï
+Áøð¬™_VöˆáP(™ª¶œÿùø·›Ãã
5Êëqœ@Ž&å—ãˆÍ¡ÅЇD9Öå›0þ±ž«£Àz0RÿlZ‚ílš†–ÇIX
+=0}˜„rs%
+æ†à¡Hc?>âuh´¦° RøŸq(F^=<ÆÐÂ%82Æ^€Æ½º‹[Ma
ó#ÄB˸SÔÌð~ÐF
&ÿXÐÆü+ü¯›U¥ØÌà-ÚÁ¤ªK¸2.¡ˆ'â)M3*úBù¦Žò‰K4؁.rýØ͊ƒ:›À:lØÁ‹|˜•‚_Ékfž}ôÃOX6´÷â
žºØC!£_ø°9ÔÅdÃ#Nñq‰ÄB罈©Ñ@DÛ.Ž3þ¤6$‹`Û~uæ±ZN„åߘ(kA"Pøò¤‘èsµš!øxœ/³:Ê[bӊÂ%ê¥Ð!¤©á¸ä|º¢á ¾WA4’ì¥Kßóíö͏?ì7lžwû5‰@dv|¼sk‹èûpã(Òø+*u2ù¬5(¿‘0Ɨݳ{`Îÿ…ÿûWßýëãÓ_ûþéÝo>ýžÀqŽ›ü$’À±
ăið‹dž
ücx
åÔºzã=Š[ì‡E3žOöL$
+²ñ8æ‡ÏŸ^ž>½|K E´™DÍhï)Iz‰º'¶™ªñG†ÆQ–Ù۔A„Œn¥¯«òÛa¸²ׁS½‚ë Á¢«‡f[F¶eÝÌÅìJÝMo!<^M@"ÁÔ²ßûš¨uHõ;d¦†ÿ0MË`CAwetcRożJ›Y²Äv3E÷¡h×òvÌŒ\2†£ó<ÚuCµ§°=eš®Ç
<B›8¬+ÿWVÃŒÿ·‡ÆRh¼»d4‘ëu$QX?D×>rèDµ`D¯@ÊIÓê]4KŽ†8FK56Ԝ´Î‘c=Ž™4^'ÇìmÔ1Œ™´5œ	’%ã IçLßé¨ϼKžÔbίdN*+¬U)Q-´¼ƒ¨IíSó0R7¶'Î=6­Õ=ŒtèÙÙl“zS“Iv[gkݝ” ÏE_!¿„Ý	 ÁݹÿíëÓ·oO¹Ç¤iÂC'W<"ÎÓÌ{‹sÇÞ+螂>pt? W€0åûNò˜/ü¹Tée—X$MMéL‰4EŒGw8"‘Sl -hÕO·Á?°S/{%
Vg 	Ú,ø“+¾9 Êrƒ
Aê}bVW1»P˜íçó?‡ù?2¤È†’‰­·vŒ¯‚vC'_uÁ—Æu[€?ÐΡ€ók3S>wqÀ×3þºyÚéÍ+×+¬-ÓЕñä݉~åÚiƒµ²áÌkÏÒ1öcVù2Fú’ó^xÂfÆ bX¸ÆÒÜ¡G=èüÒ¶XÃ⫂Vì¬M£–Üs…þ—4éÍ1ûf¡t˚I´÷¥0ö+[&M¸äåÒ³D• hXÝø×qÐ[CÜWK†¸þØÅ¿ÒSä=' ÷*ÌeNÀ•}ð«eZlÃ0Ù‹ŒðG¢1Þz °«òy““L`±5—É!ă1蛅ï`™*HœšìEN’ §„ÈÏðÿ"´áGVé©aŒ.± Ä¢ó‹E¬ž§mdêì>Ì¿Iâ^Á+IN‘WáRöä}\"§•v×?Y±CÒöÙ¡D+9ÇøA öW°èBø¥æŽÇE;°¤HÎ`¯IÃ{]€,—ëì—ˆb™ü*¡};®…n¸ ÂjPD÷ue ëx†MÁ‹}øL4ȌÆ»ÂS-XqMÌ1ijÏ
+]­ ã¢òšÕuë1é„g®e’À8v`…PQ‘ølBxÊ&Î&]l¦å)3] U|ÂhG
ù’Ì\`FU©ÇÈcmƒB¹iƛo§(I‹©?|rKów~v˜’ÕÖñ5„Í¢HòQþðÔÉiÎëÆ^tšÒ¤‰äk
+å°.;F×w’¶ÌÑ8QùnƒaQÕ|MÜDѹ6¸Éc
hxÁ©h“«'ŠèhäDu¢Ê¯½¯ÁډJÂ÷-jL.ž(:Fh9äã¨iKå89p‡Oivä$H¦Œ£¦ÍƤÁÀvQ‡O©ìŠ]+ͤÖ*FIsžŒ(Mk`Ü:E¬b0æ}Î"„Š‹ Æ:«;ªË	4ÃÔ´êj°¿Y1h½4­ºÞƒ”W¡í„õÅń·Ñgg‡Ñ§U×
+°cW ¦UÖj’oƒ#9lÆ4­¹®’¶W¦§g7u¤¿Þ;3@½£¸ì:ù0¤Ê*&;òAïéR§PÂF@¢Mù¿|¥OFè¶ÀzίJ¥
ßµ{®K½âò¶ˆÉ‹ü*àZ²qяAV1Åot„9
+°OX›Z±öύû&qÖyNÛ"1õqóË"ýœ¶A–Ü*ýœ¶=æÜ:ýœ¶9–Ü*ý|£½‡Q×͛9m
…©
+TÊ5.î͌¹Uú¹Ú¹ikÈ1·ìÔ´5䔛wfÚr̍e„¬`cf†Œ©
+rÊ
Kn•ÎKn•ÎsnÎKn•Îe„,&¿Îɐ1UAN¹
bÉ­ÒrÉ­ÒrέÓrÉ­Òr¡¼¾©åðÅØ-»ÊLZÉ­ˁ]Ë⒇ë¡[ÊâZ}–þ–Ô%‡×»”Ôµr-…b-ÇKþgʵ\·ŠY‹P«õhµâ¶0É?¾ûð)®yŸ¾f»Ü
ßx„¨È­ae¡£0¹_…};¦΁P…Fà¦îR„³j:,Ç{Q,ºuÒCRõαôɯ´nbÌVð¢rç×»ž¬œ–Ì3äÌLƒ#ý+Åa'¶BÓ°(Çe͉¼;$Æ>»>Ýzgc„ÖPbrœK¿Ò¤›"}2Íè9%«QÈQ¼°3Rn;ú)þéïOï_2ځC1Ô¢|Ð;ºäƒo]Ƚï©ô¯<ã%s?{q¦˜â;ü’ˆ;Ð%;
+Æ'yF2®Ÿ?üþð²d°h;%`¥_žß}ü¸â¥—pĚʟm`Â!†»8ú`a?ì­ÛÊ#|‡´êŒtúkI·QI8sÐö—{î6ÜëeK¤!T
+|¼¶¥žS}¦
Ò¼)M÷f½åp°
ڈù“¡úqà“ê¬KÏ´CÚ#-Ù¶gG/ôœ3?a¼¦5ÒþÀÁª?pthãÍu£³Ð©vEfӖìŠYžr°*hO4sl‚c%LªbføŽÏۉcÔOǜ›x{L 
Œ¶``ÖQ|®01‘²l8	&†=dÃ_8칎ævão_icmcŽ;Ñe!¼ÛáŽ/Û:eeÚ¶^%ÇiÚx•q¤•ÑBÒ<Û׸õ|›^É7ÚÚýÿ£øÖ±1´¬ùFœŒ°ÿñùÆk+.+ Ny~¾ñª•së´_„0¹¨sŽKøHSá˜	åÜ:	çÜp°p²¸	„BªN¹PɭӉpÉ
„˜¸LSá˜	åÜ:	çÜ+*†7½©
+6€ª‚-é[2iÍýUOWLZÍjЗ^ÜŠK…ÁÕHS
1êOÛ¡[èÎîóËËçgÿð-ò¥×îÈÉwÓú™+͝2Zrï•Ë	Ö$
+ÎBu—"çÚ¤7§8Ø-F5™Î^Ý 99
+ó7Ñà}<”6òû¹Z
€”Aû=y"&–3'’pZKÚrZKz,
+8cæ©VÎqr•—+ˆÞ„9}§^?ÓÞN!3øu¸{Cõ¾èÑÂOäL,¼XŠ¶Opl
+—±p˜5B`ݏjÃÈ	ÚOù-[»ÓÌp[äD-„nZêMÒÃ-‘Óµ°èvЌ…µî4éî2nœœ»Å¤ÛƯg)9‡‹É¶ô¦.ô¯¿uO:W¼…?]E)Á®×?Ú N &DŸ¢@ƒ{‡fàz¡Í,ê`ãj‘ñÓAO
ÛÆ®UDo¡hMÔwê‹“‘³B\É`Îh+‡*ùgp˜6t¨•çyLÝÆÝãWOÞN._2²/”oò¨"ø,y;u:×͹åZ•ë†T©›rCݒ[îø¥.¦ªº17Ö͹KÌuï[TuٶݺlÛ_š“Ëþ®yµêQ¦\ó®…š;-Ÿëþ·œ\ˆßãç—w¿5Ngt,¬y>@ZÈ
+¾)W;…óf¼xÈþ\(9‰ò_Ð«Vk*$å£wÙŽœc4[ÂFËüµåRE­ÄÆBWÕûô»A3IÑïÙÏîXÒ{ŸˆœN댤¤GÒÖo…ÀœØÚï69EÁ_^#«G6ß#Àò Æ­¬=sÞm>µmýòA¥F†A%è_:¨ôI¥ڔ|¬÷"õö¥ëw¬û	ˆüüôq1GÑG+ƒ®R ¼d†èÕøÇÖ°¥ýá*8t€-q§û)q¬­Np
‡»mKÎE¾$ÞØõ|3Á®ƒë]%ƒiçUf¾ÙªTÄD©óbŜ¹¨X5ßT\¡©é´pšmâO_ýµ ÓÆã3š•p@½±žÉêäÎðö)NŸF…“¿²n«t
œÂ«öEñCº4+U{Ÿ¦puÍ­¨¯PË;B9.Òi§tMM.’%˜xâî-‰Û´¸Ž KsáBƒæÆݏ5õÝ
"]f"ÃÅ	^ou!‘ÆÓZ6ܑ’ŠÆ÷kØù¦…ĘpY¹B†S3»5íÜ/h0ñ\M¸j 5轘uŒçÄÍ#°÷r#ÊÉb—Ž	©x©‹Ü×7¹S†ËùTCÆkôV‰7.¶Øðþ¼Ýè"<ŽÃŸÃÍi¼Ï:á|ÃŸtÙ\ÞP÷އ»ìð
ªi¬¦ãuv|báB»Ÿ6ÿ\-q
+endstream
+endobj
+12 0 obj
+<<
+/XObject <<
+/Im5 13 0 R
+/Im190 14 0 R
+>>
+/Font 15 0 R
+/ProcSet [ /PDF /Text /ImageC /ImageI /ImageB ]
+>>
+endobj
+13 0 obj
+<<
+/Filter /DCTDecode
+/BitsPerComponent 8
+/Height 143
+/Length 7030
+/ColorSpace /DeviceRGB
+/Width 150
+/Type /XObject
+/Subtype /Image
+>>
+stream
+ÿØÿàJFIF


;;ÿÛC
+
+
+

ÿÛC
		

ÿ–
"

ÿÄ





	ÿÄ



ÿÚ

µ 1Wn_¹K=•vÙI=??¦¬GÑ=§¦ƒËµ¤cÉzEõ~÷Åë¿CÅvû+¸iš­HšU1|Dz™k&{yÞZ×ØõÐIÛÿÏëJB`
óè"ªÑwi‚Ùj©W‹>_IÖb:§q®Ä®“éŸÌýjHL9%{]þwS—E\šc/V~÷#ðÛíy-O{‹6®L"¹:“ÒÝU’û]2?õø3è—5^,̣䰋…Yí­y‹6ç¼mVÕª	l¥ò'ùçaæ}åmò^×Ïv¼<þLÎßò»~9³1ägý7Ÿ«—~ž\=IÚP
‡7
[%Zí*ùoAÑcçü©o]Ïó>ËׯÓh.?©óú}éu„€†&zùZ8ˆ›Ÿ^yŽ&Vo~ŒqËä‹we™åzçbóº³U‹ÓŠöîŸý•w¾Qìq¡G„m2lsrù­—íñ|÷	ül¼	Ýë&S×v~⫋(¼¡
ÿÄ(


 0!#3@ÿÚ


ú>Dbj»"HŽÅvo×y“í1‘AÆHü;KUaŸ]瀮ªÜáþK˜
×̵®ó'ÓU®4©wØvu±pncüéöÙã‡Ó‡Gya„¹¯°‚ÐMæ6I$Áî#Ñ‹âœUðMžØ|ȵ¶{Ûzš©Cì¢B¶¹¤Šh+þʞ<ÙãÓAz~à ²mŽ˜±¨tƒ$­TÜn ̋›Ì¶³+EÚm¥tø\$yøšß*}Õ<yµÅÁ¦;¢;m
 „WÞ$&]×öeÍ<lÁ{K1Eˆ!ö{YH'
…‹;[åOÄ¢¢ÇÒÕhdlÄ
+'øgWVäì§4›ÙoW†‡6;[åOÆêøZ@å"ß´·ë`[OÄÃë?˜ù‹¬	çñõÙþ"x'ãª×	š²’ϱ8kÆÓëá¤äô6Çð6òÀ}ÕËÖ'Š'£›øí6ÃfEÍdÔÆ66m»
”íĬ–YX6¼<ÍdA×î:í$L7b¾½ðÙ›÷—ýndu݉æO.Û±‘‰Ãû`:øeQïU=«a¯ùüµ”ôŽDeöëöZ¦GlVP,"8¾ß%’²-%Ùøž·Ž§¨o±ÊæötV
©°I-’Ø*9Ä؁`= ›<è4¶KãXx¿eOŽ”X‹DF7¶S­Xč—²úADÚ¤¿¡z¾«°‡õ*(ìm0Íþí¬ø:ú#».Þ¼67á2ø2y¾o²¸|LÄ.ám«„P…×±²gúܱ4Yú{Äú긫Åüv6«OC˜"zÎC¦kÛ&®¸ûóÁ—öv<‹8Q²bàwñ,ü<§pèÐRíi棅­a»²æ
+ËÜÍŸ²±ÙURYzÄ>»y뷊Cx“5ymÒH×öí"pîå	ŒŸ¶n_-o£#ÙjáÙY¢x"¯‚0ßFªÄŞN¿—Éw͋[u4¹2ÚÁo¨ç÷:¹x©¥w‰Žtz9œ´À?‰RyñAóʜ(%r‚:¶Œ‹¢g¦êÛ	ÇnPçr¢”Êc¥Žs9l…¿ha`ñÅÿÄ(


 1!Q"2AaqÑÿÚ


?
ù‹vVÐW(…HâŽÐV.:ˆÍ:~Ü~Ôñˆ¤ôû~Ÿ„\‰Úo¤ØSõ3*WÐ5\âÏÉl̍šiÍìŽÖ®0×3VNIˆèhOiäFЭ|5ž¢å–èĝÛed€üm@ m¡aKqӏu3±^íN*L–úlöÙJ
+“ADmªW±®¢V¸ü®¤~WV?(Èï+Q<•­ÞS3¤h£Ý·”r¥ªs³ÿÄ'

 !Q1AB‘"qÿÚ


?
öf´V¾ŒÚYo7C¯ìï|ê`v›‘9ÔÍhX˜kÑ1÷)Ã0í©ŒÝÌÆKó	‚—¨ÇhŽ>"½õž¯SôT˜ªÔ®­aü˜FdÆdcÜÂ
+¢êõªÕÌ¢àL:ã)®Dr–¢ÕêÕo7ƒ}—„ËžñæVyM¨¹EæuW™ÖNfc̹2æ_™ù;F¨Í¾ŸÿÄG
	
!1a"2AQq#0BRÑ 3±Áá$Sbr’²%4C‚ð@csƒ‘“¡ÂñÿÚ

?ú£GèXÅíæp[Ê9úó;źE}Ž
ü9ò¬¯Óp£¼œVïQô]¼†ÞŒa¸¾y÷Tw²ÜÝL:rû¿»_IèßE¤£é›¶Ÿyï£ÒQn9Ý´üë#ê™'l»}œ#¬ôò`¾¨%càˆ(h=(ZˆÛV&—úO¨ÕlGpŸe7w#ʞÒíW8’#íñQÜÛ8’'àk靘ï¢éºÇŹŽu±›éǤÞýáåÍoô·N=‰åOutçW=9[ªƒ¸|©m­SUÚǼյ¦Ž‡m¥µ^X¿§™«xî^u‰VFïloõ­ˆîSì¦îäySÙÞ#jgD}®b’âÝđ?+éݘ§ŒëÉÔ+føŠùN/{˜®5ª¸–õÇ£‹ñ4÷ײ6ȶd™¾áIomŽ$à}
¡s5ä‡QäÙä9לO‰t‹Ž“ûœ…cÔãtwIöS~•Igx©­‰b?x¯=I”Úêëm;©ïtp6Q–ÊÝñåR[ÜêÞ6¯¢’N þ5%õüŒa
™e<I÷E$ Ž$UZúBfk¹£Ëg!󭬸—H8éÉîrêäeTQ–f8 KÌ·1¶
Î0îç^o¶sjHg;‰­¶eïêœ֌ª7/ÔzEÍ£fmœÈ;ÇÜj=ú>¯$—¥(>ç[GÄ·Î=$Ý܅`z§¸¹”Eöö“Ü(Çl´4m¼ö|{Í"èø±yI]Žùynº1mUeSØ3¾¯ ºOì0TDXè•ç—»¤ô-Übky—\#rÿí;YÁ³gâìu›Â±êŒ³¶\ýœ#¬ô4Ž•fƒG)èF7g’üé ·b…V¼Þó­"ýHGgKus’iIÖZí­°á¼ýð¦TČhÂ,¶ ï4ï!Žá×R&n®MUû[·ŽÄò¯¦´ùfFß
í|…PFàe=‹»àÒvGùԗ’ì¨X–ß¼ù%›s2ËBm¢ÜÍsé$˜poT÷Ú2<³À¿zü©4v–s³£¸>Ï#ʁw‚8PjCúD¦Ti3ÕýÓáYÈÕ隣ÑO–;žáõùÔúsM¯B(̱Û?oñ|ªîñºÒ¾*%uwGš5e¬FwOzvˆÚÁη[y¨dÃK£›;X½¨NxŽ\©&…Ä‘¸Ê²öÓÞX [®/ݯáμÊÿ^K㭇ʣ–)±8ʺð>¡“¹Œf9÷Rh$i¥¨ŸðÒ^_qÄ/‹ó©£¥;¬_áV‰ÚWXüh*ɲuq"¶3‚)nÛHAÂ=–è{3žúXÖÇií¨YT¾¹'iº{Ö£¹¶KŒ†ÓB+Ð8öIã󦶸Gk]lKnÞÏ1QMkG"‡SÈú†¹KxRvã(A®~>M£‹£*Žb”eÀ’TC©ÇßSdž¸žl¸ˆAÒ=mÿ}C­œ®S¥ÇqÅG'ìäûêÒ÷TÏ¢¯1«ù:T\lù³î㾦ÒW-æ¶!µAå(Ƭq¨E½I«™zÑÛtGùw}þHš¢heYW_#¾šûVÊ7hv8éÇ9¥‰ŸhÙ$·y'5t	àžüÓ諨ľoÑdnÕ;Á¡±¿Õ°-“˜¨­áA1Œ*U{t‡}â;…=éMm¿”ÿz²Ö²xÄCÒ¢ÚÝ4Žp«³ÆkhÖQãÝÚdŠýT)çDÿå·P’þàøgY¾B§±Ï¢YF˜Põi;瘀ÿB­!ÇÆk-lšÝëÑûªòê5£lcÉϱ¦ßW6Çü6Ö_äÑWܲgàimî¯cŽSìï8ñÇ
+im'IÑN©dïòvùre94U¹®[Â?οUµ¸ÿÞAø×¢±‚5ìR¬M:ixYdV·^?֎ŽÙ$H#8ôœI&±äˆgyÉ>9¢3L¾üGÉm
›	fˆr8/Ƌ™„³õƟÌ&hu·­¹«-¥d_ùµ¿LKÿy«Xii
ÿŠÕ¬ÚnpvgŸ6à+û´Ë_Ý¢þZ†î¬ð£7yZÕئ9-a΢÷%=!àhí-n#l{ºÂ•\i«~Í|Z’â6ŠFÁ9À¯ÖîZEý”}­TP«Ü>ºÇê¢îýÿÄ)





!Q1Aaq¡±0‘ ÁÑðáñ@ÿÚ


?!û&N¸§\#Ú1š¹Ò—È1¾°t ¾üR1O½/нbBØl­`î÷óNÑéÜþÍ,¬(4¦¬a¹@zbÁz‹&DÝüÑÚ&ÎÁ?-![¾mñA)î}êLe3_qP嶓8w҂	HmNJ…ÊhÐöêTàD™6 $dú&®Ád|tV;„àqò Sx—Ì7iNF®Öhgo4ªa/Ÿ¼7)ÛºîPö®…†Ïœ;Ñ¿)ðœ<W6i܇’Š-é°~TÊÎÈ1zxÏ5–Vùû[<§/5œ„%?÷;P­WwÜË@cO@7)
+ƒméù”5Ç+Ç<o¹B[%Ln'qRñONæñ@Ò¡îòšzÞ§3ý£ÁPéõ@–`Noœì­Å»¸íw Ú='ˆÊÓö—H¾÷f—;Ý)Dô~
+*'@¬^7Jå¡lO#¼Ðv¡‰|\Ó®‡ãó½ÑéZn‰Ý ð5;hVèoÝ9ÛUºP°BûM7s暲>
+Ž‘±QƝȪxµB§Át(ˆX=‚[*‰»ø9­¢¤¡ƒ¤3ÔPK+›ôZ·Ìú>&‘«Ò“ó&<ÙÛ֜Ӯâ]˜±µ
„G¢°KP&,wÇåR¦ºD6“á7 ^pp¥+ð𦇹JH»›ý5 ¹n´D]Õ,p
+ƒã#ü‡ó¬‹×¸å巃þ2F3M3¥o›’Ñ·µ̈́Ýh¯ñI£øã4Ê»ˆ0‘á>íù!tw‚ïv‡0)•›
Ò¡ãñû´4¡	¥ld7ö_ÝRÑáH*ÿE`sÃΉë,Ù&÷w¤‘¤Ò?zI
G+݋/
@I¤i'X1[ÕËÿW/ŒÖ‡¬é2¤ÚG½®üÒî9-½-’Ú]ì9õ„—p²÷iýØmŽ'}4kñÒ¸k‹¡<\ñLÛWaì×?i2“ïhu!5eX/KÜ ‰â€ts¼l‹ÌM	H‘dFx¡D/„·|T\~~©²Ä+²pß­;Àÿ#jƒ–ecV¸†É’G¨­E5wì¿3ô»
31
¨"Jä`â^¡`ÃâA[Þ¯–Ô#̏d ÷ŸŠ‹<¶PÁ³Õ ö|G¥-Ÿž? ”,G@$ÎjÀ|?³S(¹ù¤9%—–HJ샬B‹141º1ðq†Ö߆)Kâ=¡ôÖ³†E^ô&‰ÊK暞¶åáS/AH#s›T°¬²ÿhïçéjÙ{5…6×ú5©à4d0®§ÅqPÐZÇZ–­ì§Ð]-”hbŽ-)‚]d§s£0«:ÔåS€–Ø(hX© Xr’ZHޒFÁNˆÖ•0%]¦5Ñ6«ßÁW*¥]ÿ‰ýRÅ.$x(¸yŠŒŽèÕÏð‘P³ñ`íGA!¥?Vƒé¶i\à´ÎÀ?4@qÒ cöÑNÄ@dê5†Àv¥~dž(óF¨ïZ¹5îAwÝ¡'Zx$üÿÚ
ó‹ýÓ̀óÏ</Ø ¼óÏ9H¢åóÏ8¹i‡Ï<ðôŒrwóÏ
+§åÂN<óˑ38?óÍh9?d.˜1MAÆ8?ÿÄ$


! 1AQaq‘¡Ñ±ÁðÿÚ


?ø¿Dt¸ÌøËLvέ½,güÃßERlßW!۝ú/K¯)*íWßÏLÔ«if›ØPÜ eìÒ³xY[ñ(*xJsÅä*%ßH¼Àsð7ë1fEoæ-Žùós¯t*cŽ÷,{Ïõ)Xƒ6“
T	Ûlz€3+_ƑlÇ¢oòX2틋”‰YÛilX«¿É~e:̘e*¦Ùn;{ċO³ö?×Á³C¯,wC
Ù{˜³å¼fèûýˆÆ¢ªÝÿÄ#


!1A a‘qÑQ±ðÿÚ


?ô¯ú­@_HÄ°C¥7ïŠéÂ2ÎÜ\:Ž¶ WHæ0L#à}Ë¢*k¦‚-(r•ç¶Õn«›»m^Պ„1â
äèK T¨<«ã¶<ÉQürÄV¬îió-n~zV‹„©Ù¾qï)¤7§ÜA0VïµJ› ZOl°™î%¯Ú¹ƒU1.gmýñ;ëGqéWHaŠ[qo/GÿÄ(




!1AQaq‘ 0¡±ÁÑðñ@ÿÚ


?ú&d­K ‡‡'iú’‡ž6)äÁ!¦y&ÀrHìäzúàMËÏAD¹g50î>µzÆ¢™Iõ K2Æ\¯„íÍRµzŒeéžñƒô†ã"EøpZ‰÷¤	_' @¯\G·G–'•úœØ€ÛÑ"òqÞý3ià’Õ:è~¹¦•n«FÎ6r=\Ê4Ó@³¡n#ªír[•cƒ‰~Êk곇›†‚Uý2i?C„)WMæ=àA`û±(əì¯JÃF·z ¹òƈÂåšV†…‹dV%³ø ˜œÈo™Ÿ­‰Hãp{ªí8Ùȋ€zôB«ѧ‡9†¯Ã`Ò¬LÑ'¬H°·$ñ¤±³M5€¹ö¹ÛÑ$Š;¥2{0SЪǃjŽR¨’‰jS0dLsûyM£jµÇÕ¶
+âæÁFuÞã»ù6hCóö
±G…­‡ºmO†ÎDÙYoJšÔ‚¢uµ*
6ìXdð£°Q&BæƒSŒr“M ‚‚ëd\V]E
+ªœ$"b¢©ƒ	š`û¼«kn4ç‡ÓAz¸ÅÊ»BÞ±xØPùóö[Æj 2æ³[ŒKDÄA8hìê
G¿0N‡% Cb`R1ÄÎU›Hr÷oã%ñŒÐ¨#°WUÞJ‘ÄY !†/9+@‚Û=¶å ~~ΰ§UŒñ¶Sˆõ œR&Ñrˆ˜ÑÙŨ¯˜šªX
Gu\¦›ìH±€ †‚ ȒÌβ=h£„ˆŒ'˜¹5ˆ„„¹ƒ¤»2É$øHágû È«Æ@ăÑÃÊ£Ë!«¤÷µHY^&(""ÿ•Ú¶¶á%‰W|‡!·Áxþ¶dÐ
+‚8üáë|\
"8ŒF¤F’ñ4¦:XŒöÈl¬d+/åöA•xÉXërè‚Å÷D b*qíê¼0í­˜õ‰€
+àÆÕÆ%œðþrÖ8òx€’Z¤Ëuú $6 ­À²½!¹ü¸{Ü1+œ²€c±>SëØÞ>ð–߯F°_²="@R%ý‰Óâ~LœM²ÝÁR,dauW#\Ìê"ç\†ef—>ã=2³Û!Zf•Ž£ÄɏÙñ…réD€…Üåh@²òɍE@D«<‚Ó#œ*T"§#þŒJ…¯o®pÚX1ÀXo©†XÌGWßs#Ö$#ÎB<ә9Ž#† ú¾ÛcK¹LÄ*8z?`òC˜ˆRÿÏ|¨Ÿ8†vþÀöÃX«.¤„–IƒÕaU»N¼|Þ
+%+.,Bš
ÜIâqHAȇÈl4ŽPýŒ€¸šdÑýræðÃrSKÏä$"pÂ}gŸ ÀþR»Iæ[ƀ„§—Î+”AÁŸÐo|*
7

ðcÃÉ\sUÞO°$QDK&L8ÐK QäöˬŸzAù0΀‚­ÏÉ—„tšiÊF×Êbñ*L+=f…˜ZÀæ/ñAðgn†ýé8o¹³ OqúÈR¢-ÁY%䀘¥„dÄ,Fhû
¦	0KŒh›RhˇKi±!’Þ×gÀÞ_
+$éäN9ºö¬ªÚªßÚ”,s
+öÁØA³32I¼¾SñxäßH¸"36¸ac‘8Ib^>—ð·lE—…þùÃó ËËÜàA~
+û+,`ɋ[ÄE¿•ÊogªÍõÁê¤å[‘¼ ZÛ·Bs¬nYÞE‰úð<L¨ŸG’ßÚĚC ˜;Ó½bQLn‰PÂR'c&'ßÓóï­“…¾ƒ81ïÂÿ¢œ}!90}$`sNÕ'Ò2WB‹¦Ö×°ebª1¸ôŽ}s‘óBz½à
Àk&ýÉþ?ͤw$¶àNÄ@ýœP*ÀZ¸Ç•à’všã]±=Íرon@lÀdig–GŒDS=ˆŒT‰¹'í‹6d(~2"ˆ‚ON¬e–¨ð ±îÃåœê…ý²œ–ˆƒª¬§H jãxO
3”Òü!gо¸ó‚³‡OǶ(nvkzùÆ+–Û/ƒ•lÌAKÃpu‡¿×‚L8k1êÇ×4£¢ªûÿãÿÙ
+endstream
+endobj
+14 0 obj
+<<
+/Filter /DCTDecode
+/BitsPerComponent 8
+/Height 94
+/Length 3954
+/ColorSpace /DeviceRGB
+/Width 94
+/Type /XObject
+/Subtype /Image
+>>
+stream
+ÿØÿàJFIF


	ì	ìÿÛC
+
+
+

ÿÛC
		

ÿÀ^^
"

ÿÄ







	
+ÿĵ

}
!1AQa"q2‘¡#B±ÁRÑð$3br‚	
+%&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyzƒ„…†‡ˆ‰Š’“”•–—˜™š¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚáâãäåæçèéêñòóôõö÷øùúÿÄ










	
+ÿĵ

w
!1AQaq"2B‘¡±Á	#3RðbrÑ
+$4á%ñ&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz‚ƒ„…†‡ˆ‰Š’“”•–—˜™š¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚâãäåæçèéêòóôõö÷øùúÿÚ
?ýQï֛ϭ-yí-ûKø[öbðx‡Ä.×W³–‹MÒ`p'¾˜í\ýÕœð
îHQ‹›åŽâm%vwþ8ñ÷‡¾xvë]ñ>³g¡éÃt—w’„Aì3ÔûšüóøçÿvŠÞæçMøUáÅ»D%»®©TcýèíÁ
w#ýÚøcö€ý¤|iûGxºmsŚû:16zTVÒÅ;*)ïêç“ëZ¾ý~5|IÑaÖ4‡z¼ú\ꫯ.ÑfSѐLȩ̂³
ƒØšöéàéÒ\՞¿É*²“´>ýµ¾6üGšCª|CÖm rOÙt™¾Ã˜‡i#ى¯!ÔµýSY¥Ô5+ËéO%înF'êÄÖïÄτÞ0ø9âÑ<káû¯j-îŠñ’@udfVdÕÉgŸþ½zŒ÷·‘ÎÛ¾¦îƒã¿xZe›Eñ­£Ê¿vKé`aô(½ßá·ü?ãŸÃ‰¡_øKäñ-”xÓÄ‹ ÃÓÌ8“ñÜkæ¼õÿ3þsD©Â¸)5³?_ÿg¯ø*‡þ$\ÛhÞ=²ÿ„Z”„K֓ÍÓ¦oO3ïDOûcíûzÎòûh®m§ŽâÞU±0du=#‚=ëù¡ÎsÅ}OûþÝþ'ý›5h4}]î<Eðþg>˜òn–Ë?òÖ؞˜ïÝocÍyUð
+ÜԾ㢺Hý¼üiFry¬xçDø“á-3ÄÞÔ"Õ4]J=µÔ'†SØúr<‚5¼
x4ìÎÃÇÞ7Ò~ø7YñF»r,ô*Ùî®fnÊ£8¤œ=H¯ÀßÚCö€×ÿi‰ú‡Šõ¹]-É0éº~wel	ۏSՏv&¾åÿ‚»|sžÚü)ÓnLqÜ
«êá.¡ˆ·ˆûnä²µùµáxŸFÐí¤H®uKë{¤—;å•cRØç¸'Ú½ü
{Ynÿ#Š´œŸ*>³ÿ‚dþÏÚ_Æ?‹ú§ˆüEg¡ xF®¤ê9ï$cä‡ÕB;ã¹Qš÷ïÛ/þ
+Gâ_…µ
ü;²Óh»bÔµMF1k‚¡šÓ €€IÎNq€2}·öý“¼Cû*h.±ñ&§¦j—ZÍõ½Äri›ð©2᷁ÎXâ¾møËÿ»ø—ñ7â׌<Ymâ¯
Åo­ê“ßƗ˜ªíŒãÒ¹ÝZ5qUº¶5åœi¥©ñoí
û@ø—ö‘ñ­·Š<UœZŒX*XFÑű˜¤œ\“Î+ÌóÍ^×´‰|?¯jšTî²O§ÝÍg#ǝ¬ÑÈÈÄg±*qTyÏZöâ”RQØâwoQsIš9æŽj‰óFy¤¼ç­>Èÿ‚s~Ö×?~!Ûø+_¾?ð‚ø†äG‰NRÂí°©2ÿuXá_þ{WìÚ°#5üÎ{‡¯jýËÿ‚||sŸãìë¤M©ÜŸè-ý‘¨HÇæ”Æ—)÷hʓî
x™…¿{™×FeŸ”_¶§äøûQüDÕC$ú¤šm¾N@Šß÷#Ä£7ü
+¼^ÊúãM½¶¼´™í®í¥Iáž#‡ŽD`ÊÊ{@ úŠ³¯jRë:棨JÅ¥»¹’w'©fbÇùÕšö!¨œ­ÝÜýnÿ‚TüLñoÄÏøöãž$ÔüIqk«ÛEºÁ™¢CªO@M|KûBþҟôŽÿtí;â7‰ll-5˨mí Ôc‰à*ŽÀWÖ¿ðGÿÂ
ñþÃVŸú%«à/ÚløhŸ‰ö0]ÿèuæф^&¢±Ó)?gήfºÔ.'¼œÍq,Ò4³\23ov9ffÆ2IÉúÔ¯¥¿aÚ'Oø/ñ]Å°[_|>ñVÛ-R+¸•ÖÖFùàdp0ŪÙê{χ¿à¶^
+ý¨µKÅÆ>ø~Øø™5;¦MĖKI¦©/ýèÕ¿]s®©IÆjݼ̔•ÑùäÑÉã‘t/(?LšnkÚ?k/Ú_Ú;âÕî»ml4ÿ
ÙæÏE°XÄ~]°9ÞÊߐüÍéòá¯#Óô}CWi…ÕñŒâÚ“h÷Ú+e;Cžziʤù)''äµûŠtgš)yÍhd&zWޟðIoŠ©áˆž7ðåäþ]†¡¥& ¡Û²Ã*ÆOÔ¬ãþù¯‚ùÈ®«áό¯<
®Íg#G,–Í
*ppYÿej~֛‡rã.V™KÇZžñ¿ˆtY†Ù´íFæÍÔöhåd?ªÖ¯¥?à¡ÿ
¤øoûVx¼,^U–·"k6ÄL3'×÷¢Lýkæ³þxª§.x).¤ÉY´~¤ÿÁä@øÿa«OýÕðí5ÿ'ñ/þÆ¿ý»ŸÙ{öÓñGì«£kšo‡ô#X‹V»ŠîWԚPÈÈ¥@]Œ8Áï^3ãÿÜüBñ¾½â{È"µ»Ö/d¾–2c²Bçœ}kš)F¼ê=™¬¤œ#kà§ÁÝoã׼Á:e®õ14åw%´ýlÏ쫟© w¯Ôí[ğ
¾8Ùø³öCÓ5ËØntMÞÒË]’é¤ûMݾ£ëûÏ(¬eԓ¸o
¯Î_Ùûö«ÖÿfÝÅÞðþúî¿‘'ˆnüƺ¶n"…1/ӖÚOÝå¾ñ®·à¿é¾*Ò5­|A§]­ôÙˉƒn,ÙûÛ²CÁAàÒ«Fu¥vím½{Ž3P^»‹ãok?<_«øcÄ6ma­iW
ku
ä^ê{© ÷ôÙ×þ>µîOú˜ÿ›T?´Ÿí{ûLxºËÄú¿†4Z†Ûì·KI‹´1™±år@#±ÁÎOû9·zéôŠ3úµyYã“Ë*9-tüÑ÷\oõ—m¯/ý"Goð—Å·V‚å4i¼¶€bô&¹[‹ym.$‚xÞ£b¯Œ2‘ØŠêôÿˆúóxÊU¯æy%¸Uh“Œ¶6méŒé?h]>oXÝF¡e¹¶ýî:’­€O¾8ü+jX¬U<T0ø•}6¹o£[§}ýtô0ÄåYf#*­˜å’šteÉO—ÞRÒ2VJÎëX»úž[ÜW§þÏ
+¯>/øÞóE²ˆÍ,:t—…G÷VX“?ùW—úWé'üóáÛ/¼{㛸3ōjì1’XK.áå^®"§²¦ä|D#Í$[ÿ‚¨þÏ3üHøWgãíÜÍ­xKqºŽ5ËM`äy˜õ1°ôßë_ÿŽkú^¼´‡PµžÖâ$šÞdhäŠA•u#Hî8¯ÄŸÛÃö=¾ý›<vú¾—õ©™ì.ÏØ¥<›YlrPÿû‚+ÎÀWVöRùևÚGËñ¤îzҚ9ɯdåΎýè4½è²øg?„ º¿>+ÌCýŸr±^¿0ù‹¦+cá?ô__ë²ÝÉ,pN¶@…‹Ì@>œּ֐חˆËéâUHԔ­;]_EnݯÔúœ¿ˆqd°ÓÃ҂•&¥Ë¬¹ô÷õµýÞÇ­ÙOðÆÛY]ynïÃùë¦<dªIצ9ÁíœWñÆRxãÄrj[Anª"‚&9*ƒ¹÷'$×7Íãڌ>_N…_lå)I+.g{/-߸ñüC_…x8R…*n\ÒP¹¥Ýݽº%d»l[Ò4›Ý{U³Ótëi/uɖÞÞÚ1óK#ª£Ü’+÷óöTøì÷ð?þ$Ôa‹í”è8–îOšSôíÊ+âïø&Oìcqg-—Æ?Ù´-áÝ:tÃF
ۃÓ#„q–ôÏéjñ\˜êêoÙÇdxTaeÌÄÇ5ƒãh_<-¨xsÄÚ]¾±¢ßÆb¸´¸\«Pz‚:†ƒÈ­üs֛zò“kTtŸŒ¿µ·ü›Å¿oïµÿÛÝø³À¹2)|ËÛþ쨣.£ûê> WÇî9ê
LLk揎ðOŸ„î®u9´†ðLj'%ŸTÐñ	•¿½$xØç܌û׳G0²å«÷œ³£Ö'á¡£¿OÖ¾õø©ÿ•ño„bž÷Þ8Ñu[ËÕ"šÖP£Þ51ü|kã/†Ú§µlõ	­%–6*M´ŽËú¨¯ZaQ^,å”\w9_^?ZOÃõ¯RøWû:ø›âþ¥–‹y¥[K!À7óʋÿŽÆÕö—Ãø#åÍߑw㏰³Ð-™˜ú6P?=‚¦¥zt•äÇ9l~si:Eö½©ÛiÚmÆ¡¨]>È--c2K+z*ŽI¯Ò¯ØÇþ	“%•íŸ>1Y#<Ef±ð«À7P÷DpqÚ!Æ~÷¡ûKà‡ì©ðÓö|¶ÿŠ?Ð[j¡fÕ®Ÿy(÷•¹Ùp=«ÖÂã½xõñÎk–žˆê…µØâHcHãEHÐTQ€à;S€äñF3Ži@äó^IÒÿÙ
+endstream
+endobj
+15 0 obj
+<<
+/F2 16 0 R
+/F3 20 0 R
+/F1 24 0 R
+/F4 28 0 R
+>>
+endobj
+16 0 obj
+<<
+/FirstChar 0
+/Widths [ 562 1000 250 1080 482 ]
+/Type /Font
+/BaseFont /CAAAAA+Symbola
+/LastChar 4
+/Subtype /TrueType
+/FontDescriptor 17 0 R
+/ToUnicode 19 0 R
+>>
+endobj
+17 0 obj
+<<
+/FontBBox [ -1000 -215 2991 784 ]
+/FontName /CAAAAA+Symbola
+/FontFile2 18 0 R
+/Descent -215
+/Flags 4
+/Type /FontDescriptor
+/StemV 80
+/Ascent 784
+/ItalicAngle 0
+/CapHeight 784
+>>
+endobj
+18 0 obj
+<<
+/Length 2486
+/Filter /FlateDecode
+/Length1 11156
+>>
+stream
+xœíZ{l[ÕÿÎ}úßÄÏ<¯órÒ¤¶ã8Γ<hš4”ÄÄMJ¢‚“¸±E§ŽÓµ¨l¥£aM[ŠØTØPג2©[[‰TìEl¨<¦2¶I…`R‡Ð`P$DãÛ}×½EiûgûcÒîýùÞóûžç;÷Üsì(7•œ‹‚
v

ícS‘ËPp€dmK‰Ï§v# ïï[f&¦B/P.x},“;¶L
 	
+>à>ŠE#ãcJ‹Ê`·JÝ@ŠP›JmQàD¹TŽŸLŒEö³Õ4ʆ©Èö™—©E‚r'Êâtd*úa—°–™ÄlÊ=Àªí²}&Y}ç«çQ~åËx„|r²LÑü?Òà•é§ØöÏp´Bzà4'¹ôu’þm¤Éyò¼Nñd¹™z›þ,€‡h©Cô1Èeªèêú(zÞM-Pò"Ù
ód=Ɂà}	³îU¡B…
+*T¨P¡B…
+*T¨P¡B…
+*T¨P¡BÅÆWŒ¯´¨Þ¶V|’.[[‰9Jbwu®f3ûÐÀƒDH¶ûˆËÕ^9Ù½`Ìb5<ÇR„eX¬lÏðÀ±<UÈ;hŠ!@éÚæ­w@[K[‹7mN·à‡xÓޖtKæL{<àÁ£ÆGzbK@ÀÕ‹<Ùjê—Àu兆áJ"¸hÁ%K)që®úZ‘¶p%Ååu`­ßƘ—îJßE5]tv[_“~íԐ^it»å“}çë_1ï\^EÞ|øÅ?=|÷òÏdKEc£üN¤#üIöX1¸‡ÛÈâbû18úÐïݑšÙ4Ø·¾£ÉSýðžïÅ·D‡ûz{|n+‚š}{÷îÃfÿ¾}û‹ôÄzu¬^/yÀc:kZ6½ÖÏuxn<”ñ[aqåøåñ³žË"()v—»KI9#¯Êpã
°ÛdX-‡Îj‘E‚g­]ZÉ5>PRÌ[ËÝ‚YÐ囝·‰õT‘bŪÄIFïÅÆçæj,W^E­Ÿ?i´X²4‚›ôµÍ¢ÒqéÖ7¶UöÞ²Jl$x“™r«kÂæ|WÅi8t€8
++Jó3י»×X_*-Ë&´o«ùY«©ÀËeW—ÕsYÍ=žSååulEŸ©;;Ûa7åÌóâš
9¶*[ÙF³ƒò8Wçö{¿d‹¢´~ëÎu?)hµU1æÕVg.eÊ«îè\Ÿ×ô6ùôcb”VOÆ<§3zû{Õ›vÖ6jLyÎ"1ë±҇¢Xª-ïÖÝæ°é#)í$l¨Ob)¶K_ÖÄùþ^žÒØÖw´•eßÂä2ög·Zn±Z[sQ¶«¸Öxt»v9Ää˜6üâÝâ®@µISÒéóÞtÏúL„¥.M˜ë=rA9TC-4B¬…õ†!-0³Ä.„Ìï»<	>6;-υäù™°y.Ö%[ cAÖ±.
yŽLåéڅªX9º>È
+²³ïÊ&ÁL›&œ>.
ICéãÔ9Nð*íþÒ\h79¦—–“oçŽ=ÐxüBmóüð)ê>sŠþ¥ÔËÝ~0I˜Ë±KÏÇw‡Hàä™0G?)­=u&ü*æ.-ï8˜”–õä)Ž|*uaUwêñ@ó¼ôÖÑS˜PzìvNêÕ&IbØYüyªke
éãD<Ñxæõ5éÓdŽ£ë¾z—|qñ¬–¤¿äyJO´g/öI›Þü¤Ÿ—7_øªgœضƛלKW1¾ÿ“7›¥Ÿc#•¢ê™F6Ú3.]’ÞMϓÑ7>éßÛǧ¿Ä$oPz¾ON{þ«Ò~é‹qéà3çÖl>
8Saé(½ÀY¡ÜP…3VÍЃ0w@¢Ç9Û
+s°î…û`ì…ðî%ÀâFåÂe['‚vܼjý¸På%jµ»ü6k™P‚W@pjçMž!¶®ÄjÇ3§.€Sá¸V‹]À5_ëòÓhqã){ÑJû]ܽ¢•3·º`3±óuåòn€«—^èõ¤_ôV–oìá‹išaȑÖpú°^¯!—Ó¤†¸ìôË´Žj[ZZúÌopY%ÍP‘±Â\²…ìš7-åž#G–®œ!ýKëÄËkygž~šÌèîà´f@—£†,‡íuïx°¶†Íí¹“qÝ·³E[¦Í¯mph‡Z!Zm ?‘Wžn§òÒõQ5œ>ÇGGwŽŒÐZ´>Öt«˜õõ3öJvApÖ_>1<¼í½÷þ
+‘M££Ÿ_!wŽŒ â"êú3Šd„øÈH<¢X.ªÓ…‚F]£ óޏ`Ó[ÃÉjù2#àñû#kÿ´âm˜««@”¢Â8®KêZñÊ¹á–Ù3˜m@Ñ<
aú®p€d橾ŸNf"XXÄçK>(캰&²•zOy#©ˆÜóM¾É=™¾‘(ä×|hä?R8ƒüеJ°‡'Ρþ7
+ç¡	^û¦î aN€'M
+§w(u
+g‡΂lT8‡úQ…óP@âE­\?™W8ÖO>W8ÖOÂ±~ʤp¬ŸÊW8ÖO­R8ÖOݬp¬ŸºMáÐP
+×B.õ°ÂuÐIT¸Z©ÏníQ¸جp´"„i\Óc€q\Ý"t!›†îË"îÏ	Hbہš1ôŠf,"l@)‰òLƯ5Ýh“}'29:‘Ï¡”P¬~ðA
ÔaÜÜ=FQ?‰{I}'ÐOæÉl×KÑ3‰¹â™ÚDhfôýÛ½å1L£,×,k¦2yÆð×Oõã(x§ãc‰ñ¨Ø•˜N͊[I±cz,N‰ƒñ™Ôl³ØM$'¢bgb.™@Ñï«©Û°cj41	G'æ&#IERšÑäl<1-6x|¾ë-b|VœN¤Äˆ8MŽÅ"ÓãñÙ¨GÌՅÚ(â»G±2÷l&·\Çf’=o¼‡°Ç«=È#ÇdÄP›Â{Ö^Ä\¦oyTÔÊßnWïƒ{O¢ýûØÖ௖:¼Ž£<…VÙ'…½4]gkÿ–øÿ¬/úڎŒ|ËѾÉëõxV¯®®®ªZµª²²¢Âí.//++--)).v¹D±¨¨°°  ??//7×ét8ìv›ÍjµXrr²³ÁlÎÊ2™ŒFƒA¯×é´Z†ahš¢îhäÀ³äʞµ±Îÿ…ÏS<~!UfYä§9¯ðOU¶
+endstream
+endobj
+19 0 obj
+<<
+/Length 240
+/Filter /FlateDecode
+>>
+stream
+xœ]PAnà ¼óŠ=¦‡ìäЃe©²ɇ&UÝ>ÃÚEª
a|ðï»à4•zÍ°3£ayÓµ5‘¿§zŒ0«.n
+aÀÉXV” Šw–o5KÏ8yûm‰8wvtUÅø;͖68¼h7àã· 1;Áá³é‰÷«÷ß8£ X]ƒÆ‘r^¥¿Êyv;Mc·#Yþ›G(3/ö*Êi\¼T¤UBÔP].5C«ÿÍλc՗¤,HÙ>ŸÚšpIXˆR$|Úߛ„Ï
åݝ)9}ý·1¨5j›÷“k¦‚Æâc…ÞùäÊçàxtÓ
+endstream
+endobj
+20 0 obj
+<<
+/FirstChar 0
+/Widths [ 750 722 556 610 277 389 277 666 333 556 556 556 556 556 610 556 556 277 556 610 722 333 333 556 610 722 610 889 237 556 610 722 277 610 722 399 610 777 666 556 722 722 833 556 277 556 556 ]
+/Type /Font
+/BaseFont /DAAAAA+Arial-BoldMT
+/LastChar 46
+/Subtype /TrueType
+/FontDescriptor 21 0 R
+/ToUnicode 23 0 R
+>>
+endobj
+21 0 obj
+<<
+/FontBBox [ -627 -376 2032 1047 ]
+/FontName /DAAAAA+Arial-BoldMT
+/FontFile2 22 0 R
+/Descent -211
+/Flags 4
+/Type /FontDescriptor
+/StemV 80
+/Ascent 905
+/ItalicAngle 0
+/CapHeight 1047
+>>
+endobj
+22 0 obj
+<<
+/Length 18798
+/Filter /FlateDecode
+/Length1 33288
+>>
+stream
+xœí½y|TE¶8^U÷Þ¾}{ïN¯Ùúv:é,,„@$7"Èf‚FÒ$
‰’…,,ŽB\QÜÐQ\ߝ¡Iè—ÑÑyŽ8.ƒÎÌ3o‘'ï=DGI÷ïTõ͂:ó÷¾¿?~ŸßÇîÔ­SUçT:çÔ©S÷Þ$½Ý}ad@ýˆCJs{¨+×Äe „þ!lkÞØ+ÿ×ÝÇÒ
EHœ±¶k]{ßIT‹äFH¸pÝú-k·ï{äM„LMU·†C-óWî0!¤<}Lo…Š­ÑëD(ÿÊé­í½›{/;„PÑÏ×w6‡>Oÿ
+ú¯òšöÐæ®ÿ¶× 4êÜj7xNßåj„
+ʺ:{z‹rbm¸š¶wu‡»²0=凲¬‡:_ú1¨¡eÂñ‚FÔJ:½Áh2[¬¶»Ãér{“’S¼²/͟žÈÌÊÎ	ææå ÿÿ}„#(™¥½(™ d„b'ÆS´-v‚¶Ñœü„•Oêg=‰~‹³°Œ†ðWȅ¾Ä<
-@<ú¬åC÷";ZŽvaJGN´-À<àÑmø¡ØÆØ'èt7z4ö¾.¶ÚïD¯ /ƒã1*C‹

+£O¸PCìA¤EۑÍBK±…Ð{ðýxø!ºý_ûFµ£ë ¿
+0žªØ±s(ÝÆïŽKO£»ÐQ¬‰5ÇÚP*JC;H0ö^ìC@
èÇèIà)ˆGøùȇ®D7¢û±‡{ {Ñc(Š
¤‘›+<#-@+Qڄv ýèulÃuÂqát챓HƒPðԆ>Á¥xyœ7ÄfÇ>@—¢Ãè—0_úá/å÷
+—F+cÿ{9Ð3X‡ŸÅ/EÂc×Ɖý,2€¦DÃ8kÐõèôúOô_d[lš–ÁÈ¿À)XÆ
ø{ÄC¶’­ÜÛ(fÛÜö¡Ý(9‚Ž¢ç@6¿C£è#lÇIx!^ƒïÂÿE¤…¼É=Ä=ŽÃcþ' o?Êõ¢ÇÑ!XÏo 7±ýâ:|îÄ÷áÁ£$B>%_ðZþzþk~LDG£_ÇÇ>Gn”ˆ.BW¡m Û£!ôú5zýúot[ð܊Á<Š?%I#KHÙE'?åswq/ð¥üþJþ
þá&áV1$FÏí‰þ0úÓè[±gboí˜ ÿª
‰^Vñ8z½
½¿þ€þHíúŸ…WáËa”|3¾ÿÿ¿…ÿ³Dì›Ff‘jµ“tƒœ®#?$÷ÀèoÂ÷ù€üü•|Î	\7ÛÀ=ÂE¸aî÷gÞÂø|~¿„_ÅÇ@3E…Â2aŸð„ð¢pZS¡iÑti>¯oÐþëXÎØ¿EQ´5‰íjÁ’®Iü=
+vÿèàuè¯ãQt´ˆ}8ø.Ç5¸/—àËp_‡·ã»ñýø!ü(þÌæ@Dà=HªÈ2"arÙNn'OÁ÷y¼GŽ“SÀ¹‹ósAn·€[Å]ÊuÀz¹­Ü
 Ù»¸ýܛÜÛÜIîcîhÍŧò}üUüü^þ)þ-á"¡¾
+Ï#Â[Â9ᜆh5ɚÍš}š?ŠqºX'Þ"¾#þ·¶'ãà\žê-ˆÖ`*ÙOìü6|
+*R0Ì0ó èa¬ŠÿF•\ôb¢íÀ›ƒxøJ©QøÐ÷⣨ÿmÓ<1?ŠñïÉ(ÿ¹½‹›°‡ßËu¯z¼ÑNò,9Šç §HYIæþïC½oF÷à+qzŸÂ3ñ5¸oCï'·߀*bKx
>€t-߂.ÿÇ^—£ß£O¢?âüÕàŸ†Ñ.Ðè“èCüôbŸ‚wãÀ…ÀËÜö~#¢^¯ÖÙ6Xð ë5o¢§èŽ"–ifóW¡ÓèoèáXÔð¤'£müø?ÅÊby°Â`•¡}°îZх°b>+yÊ´t¬tø’"XÕuhjA׀׻+‰=»>¶%։~´_á\ü€1è—𽽏o…uxáÿnˆ¶ ôìƸÖÃ)a£°SØ/<%ü\xC3
¤}z,ú`Í:˜A3zý}µ ÊE%Àï཭'
Üsh.ND]°f³ÀÏQgÒ½\Ò{Öós°6NƒŸ¸ýÇ»`FÍ0¾ú©9¯ì= ÁëñÔ´€×ÎA…y›ðÒã)ÐÓ.ðZ#ÀÓïџAÚ1ÆW.ø…j¼úú]‚Z`„é¨D5±Cà©£jî_AÞé؂æà4üÐ5Á
+5¡T.ü	”]›AÚ¸ç`‰Aýì^Iè¼
¸0Ã<Ɛ/A¥Ñ¥(WQ”ÊÙT̚Y>£¬´¤¸hZaA~^n0';+3‘îOóÉÞԔä¤DÛåtØlV‹Ùd4èu’VÔ<G0ʝç¯i’#¦ðϟŸGËþT„¦T4Ed¨ª9'"714ù|L0×~S‰c*˜Ø"W Š¼\yž_Ž¼Q헇ñª‹ë
¾½Úß GN1xƒw2Ø°Ïò<wkµÁMò¼HÍÆÖ󚪡»ƒzÝ\ÿÜ°./Ôé
Ôqù»b×lÌâš7ó AZ#0IôWϋxüՔƒ—1/Ô©»¸~^u’Ïא—Ás›ýk"È?'b24—
Ñ̍ˆl¹ÎÝ*ÌÙqÛ°­i
+Zü-¡Ëê#\¨Ža
¸Õ×U'ܓEèÜ6·~ûÔÖ$nÇ<w›L‹;vl—##×OmõÑkCô
´$£¦iG
}±v™£‘ê#øFR¦3¡³ŠÏ/ìŸGkš®#’Ž¿uÇM šÄ´t‹o01Q9E‰óäËëý¾He’¿!T|Ўv,Ý2äQdÏù-y¹-Ö¸`šÌ*`0NÂmbèª]:!YL9ò/ƒˆÈÍ2pRï‡9Í —ð´£y Á§
U¤4Ò‘æ6í°Ì¤õ”>"dXüòŽÏX€ÿÔ§çׄÔM†åsDAj'¦íãp$ŒääPç‚NÇÙ¬\š—»q˜L÷wYdÈ@|¨dj˜Yâ÷ù¨‚oVÐ(Dú/®—e´&i)Á†i¢-#ã-Ž´¥¼e‚¼É–ü;8"ÚÀďÙâL˜×:3‚ÿ 9o¯]毽xU½<oG“*ÛÚåç•âí3&ÚT(’0·žK"*D’8Ö
+FyÙ2-Ô"|üh˜Q·D80JVåšˆ¥i~üÚ óùþ.Í°¨B4;M©X6I¦r™<¿<ë¼òyÜvpÀ/ µËWíØ¡;¯­Ў5~¹fGӎÐp¬_¶øw&{ÉÞ]óšÆ:;rkR¤æ¶˜D+ž™!
•¶_ØaE4ç)‚£q˜T*	Hà£҉|#V#D	÷, 	K7r-g+Æ*[ÎT,«@•[ÎÁeZ¡Ïê³fÀÃf}NæFÎ)úÉüŒÅN<ÏÙFD:\t‰±ãŠTV^¢É‚‹8Q¤¬Ò(Wê|™Ð—l”ÃçYºÃT&T®@W0·VhÕ®Ó}̙j0ÑJ˜ÓI/J6iѱ€FâyYÐØA£Õ)‰)³ut}bJ‰.ƒpœ†—†ñ³ŠI#‡CÖàr%¢aRô^ÌBñ~Ìáa’®H^	Jý‘ŽtĆ$Xðè/ovA‹Æ<g7œiÜà[</\ýgH…¥¢²bÑ)«­¼ b,¬Ø.ä·_óòö|7ÍDKEÅö—_žVˆk#úeµ‘TPþaÄÅ¢ƒZ^w$ќ;¨ágÐOÞÐdŸƒ/ö%pœð|ôçýc‡¶D_!³pyÎë¯àEÑ!áȹD…%¤‡ènÄpzôŠCÈJ,(éEC/Zzá@ÀCóT&râ̒y¬áôZ­Î w`±q‰R¢.
åé_Õ˜¯’•"—萠·#Ž.ú4S¿Iz¤ãac•Á€¥r#íѝœU¢7z…FÅÈA°]¥n‰ŽÓ
“BEϓr=_	¡>Ç!…Çú³¡Ð¹Çðò€;衂
ºj<ekô0¹²2·¤k©°•c[y9ÈpC°5q\F ×ô²ée	>ŒŸ‰.Ǚ¿œéҘ,¯c_2öǧç9óòHê×€=.}Ì?ÈÏFFˆ£îSæŒOj¿HøÂÁ¿J>ˆÍ#x$Ò`Y™°ÒÙྏܯ¹_{ŸaXz—üNø½ô®á¤pRó±Ñ²Wû+ò¯š—´¯„>í-š´œu˜ôêô.È;/ÚËÅĦ¤®$’dò!Ob}³™E§[6œ¥³9UyjZ!ÚЈ7Ì­W¤6ËZÛZg››Ç
*JlӋ‹ÃŽüié»³¸hziIÀŸ¦YºcìáÿÄ%Ñ×>½;úÅ,ïêè¸÷ގŽ]$í6¬Ù}õ³ÿŒ¾tClߏöíxxß>ºþ~±ö“°þèZßtI ¨J«®R‘ê$Ò/E¤é˜ô™$x¥&i›4§Ápf„t¢55‚ËБ×1€™ùH¾ôÞ£­¬`3ª.~Ç7Tp‚…®†
+ª¨Æî`8é‡Ø=	'ŽC˜žûz!`ˆ·W± }JÖ}–Lx™°Vè¸[½©ÕÔeãu’Ùà5;
1©4,1Ã0Ù¤d‹"F:ŽhtYH²H…R—ÄK‰Ûl»mdµm›í€í˜·YPsÃ8[Ñҏ öõX+ãdÄßP±È¶^­qÃÙFÏ¢ÈÍfqªqCw9„˜¬lª¸`Á–‚=¨+š
*ò·sL¹DªÀĄ¹WV75\rá³–ðû®¬.ý<¿jô?ÁØcà—ƒ4è³!Äa-øëA[9,È~e9,Äí{ø=ò>ÿ¾ l$[øÍÂ}xy€¿_Ø­ÕrH¯)Ю#­|“v=È©ÉF
Ít¡æÐ)GˆŒ‘ƒ†¸	ßÇ
“5Š^ƒ´àå`‘ၓ¨ÍlƒUˆ·ñýü‡ü(ÏóÃX¯è¶qý܇Ü(Ç?#O‡¹#Xõz…c8ÅëÁ
+m<Ó˒®Jóy§Î÷tL덍pD
‚¨à$?D?vWá¼ÏûoáÈ×/ñ|UÚ¯ÂÛI++R|…à.ƒ°p2WU$£Bhöð¯§Lœh\dùs#*8Õ8­Vɂc=½×X>Ð ŒÀ)Ù¯¬~Ú}(ñpÒëü«îcîcžc‰Ú¹Is“禬ô<ÄßëÞÏïIÖje”¥)KœÏÏuÏõÌMÔ¦»Ó=鉜3À¯äov?œôpòÃ)û“÷§hm(Œ"§LK٘rCÊΔ÷R´)t8펒b1˜S(›„rª¯Ð4ds–ÀÎòÈÁó0^©ø½†0\ê
{é¸Ó	GŒ½æã–Mēúö‹q/qÜÄÙ
Ô2QåXpÃ	XSAXT°¯`kq°¢Ã(%62h-§<šY¦˜,å¼ÖR.h­[ËãÛG5áڋëŸCI
'CJ‰ªLc#¬Éé6ð›ªs3¦§ÁáI#jxXí†s™–Oœn¨oÕF?ö`í+ïyá¢âèٝXˆ~}–~w°ò’—‡¯øAòǯÿågÍCkªÎÔ¨ßY;ɛ@&Ë•Úͺ›u{ñ~q¿´×ôŒôKI»ÒÚàlH\é]gmu¶&®ójËI¹fº4ݸ€,Ð̓jŒ{¥_‘×4/K/ß'¿Ó¼#½c´Zܲ›¸éd3@Šî=Z£×\`&f*Só$¤_Âc>1Í~\ïñ‹“I“9Ýàšâ‹º¹œV‹¨ñ§!«¥lº¦¯±ZœÔՖM·Z
Rôîæ;wnz÷½èWp-®s¦”,)ŽgÂÈýOEWG›íÂðü£C»>©ZÞ…ÏJÕòõ`Âä…*Pí£`È
„V*ҕääVÂXsÙC«!–&—?£•Œ:ŠëAf˜4*F
ñ^^æ#°:=º#x/ˆ»ªÆŠE4þb^öLã)Ø™҈¥ÓÓˊ¹@ôäƒou`Rx‚÷ïœKí&º.õàö@LpÓap£Ê4³µD§OÔÏägèæ+õûõ?׿¡_¯ó鱞‘W_ 'úJý=§§rÕ¡‹?ùø^Դø~¨@Ä16)&²|E¢ÂEƒ*ï
+j»‹Î4ŽÅ÷ìSÌt1Øn#<Ý
+B\>›­ìî…Mg¯ÅÑÿO½Â?‚…í‹.Œ&¼ˆÉæ¿
•ï)Ø¢dkM²¡Ì6϶Àó€ñG¦ûl˜$›5Áæ³úm7Ú@dب3Œ6+lÄŠÓd´›LF›ÎNC:ˆ/êðNP
+¬Â§- ZBw°g`nüž$#ì$«£WW #::_Ý;íÎÙ^hWìœ}?¡Ø­V¯¥ÀB
+,•–%ÎBQ-t¬³Ùě-£âñc.¬¸°+ÑkÆ>Åf܄Ÿ=F÷ÐÝèu_©oƪª{<sì’
T¥&&¨²O/@hÔ±š®±¼Œ­åŠðÜkB†s"&3`7ã
µçôK±Û°qQýU[B[šNì$'Çþ#÷ò5G1ßvgôW1„·¤¬î¼sçöíWúÈ×Ñ¿ý­ zúý§ïx‘ÆFË!6
+Á.eFÉh§’gkÐ4èl++Ý
É÷‹H_JRWj*™É•f:J<¹jÃBGµç
I²ÓHÐ'ÒȤM= +Ûd`ºùšÍ(ñÎTœjñi=)õSÂ!˜Ç*þâaQ#L¢"c›¦M×qÑZw[²¦±Áç+ÕÄW«
ö]8mØ]“qŠ~]upÕ3ѯ£/^‡=c¶‚ê«B7ß°®eû×6àL¬Å&칇XÎuí¿¨ãñǞyd7Ì·
+æ›	‘‡%ãF–Ø—J¾ü
éAã.Ë>a¯î¨tÔ8œ¨ÕÚñ|r¡¦F·$uŸñæP⫺_ÞÓ7|)~a4&›“JRJ‰C1YK̎ço:8ÝÌ©•,7¹ '·+³ÉVgj2“Û†¡á'©ÛØf
q6ËÓ²ãy0/ž»“Y®˜Mæ’
zL¶Û«m6ó¯·¹©¸Óõ"òá‡o‰	›RW§v¦îNåSÍ>­b4—€ÀÛâñgJ¼ñl#Øu‡°(v·’e¯t+©f¸$Yà’l­dGåÛglÀ`Ø(3€ÄrÀ£ùà8*Ø3Ûl
‚[9ezÐE³È¤›ÍŠU¾Ê ¢ø'‚Ô°áM
+HÉD5ÑáM
+±NÙªNQ°çQϱ†ûX€œ(µ °vÎÇAB€.‹|…ÝÓ?9ýëmØþö)lӌ)Üu¡9«2¹Í+/«¨ÀxiÁƒ<}×À‚ÑW£Ï]së|¼þªmsçöPOY¶`
[È!ʏ4V_›é²ºü÷Ûî·ß—yoŽ$ÚkìÄvÔxØôªï#ÿ—Ƴišlã
+cØx¯þ>Û޴ñʯ¤WÖ¥µ¶Û¶ÛoJ»>]*ÌÓÔè—˜k|sÒÄ´ôÌ@™¡ÔWšVê/M5:Á*ùÜÆLCZZš_LOSr{›í[³ûrnvܐó ãޜ§Òžòûñ®ÛÜäü$'’«IŽýj(+§Ä§æPJM§åÑ!oz¼ìIde%	€+xzZMÚýÆ{Ò^N{'MãK3y>‘*åi°ATL­qȕW‰Uu±rZF	͕”D°AæFë0ßäӘCØ¥&Ì3Ì'`b¬t^͟ÿZ“¥w*е³Ø¥@¿.:u)¥e%.%˜—Œl¸@¿f—×µÚÕéâ]+•´ôs"®KŒ%’ÄšÑås*>‰SIö–xøC'vk}uwfŝR’‘˜KÙsÁa¦.æâ‚\œ›ê+´`K1ö±Õc–*Y(lI’±y‚›‡ér8V+a]ºƒgƒÔ¤QXôõ~"H‹g‚‰­6W¹jñAæÑø4Æã²ôØkŠ¤·Uš³àøô±Ü`7”SpÐPºùËA}93q8¼6 q_Nc°Ì@&Hi	¸r§Kˆ›µ¼OohƒëâD[Gs{Y†Ý± úä¥[?øèƒw²¢_XW×wÊÉ
üBCý™ÏÞÃÁ¥+²’d‡ÝZ;{å;ž½ãÖi³çxþTGòڅµ7Ýý›XüäÉpÙa$€x²é¹P¨H¿F„cÂg‚àš„mÂTp䐎p
ŒÆO€”먞ùŠãç=áDù-€Õ•«ËŠðb¥ULÔ&)ÎąIó“düÎò¡Ušî©ñ\XëY¸)p·ç‡‰{ t5ñ—IÆèpj<ÎLM¶£Á³‰ÜDöhžÖ¼¢1<_ò¾…¤¤M³æÓ©]¥+iYpñ¤”t¦ŸK'é5,..×yA
+¦ñ{$åo)|JJ..F
+Ԛ‘X[á£îÇGݏOqÓeCzŸæEƒQGíkÚrU§ÇrÀÈ¥^W±ëS§´ÙR–±ÁkØm ^Ž°A1A|Ÿ¸¤—4Œï Ç§âlßjþЅ—0cç\žbÕ#ƒM1l¤~9/ r<ö
ÂHíð„­¼,îµHpœ	ŽÖq9Ãég҃¨ÓéàìN—/FD·IjFô–H|{Ä
5%fg`i8þæÍg‡k¹¤Œè_ô‘›ÿXãcÏ­|èî_\T×Y»_>ý/éeõÕÍ+¶èÉó¼§á–g¢Ã·ÝxQr™G[S3xóªÛk“3ää‹ç͊þÆVäܘµ²(P–¦žô.ˆ9@×N´[q‹	®„UÚV-?Ìãm‰¥Z[mþÄ"h¨S¬¢É¨1èõ*p"EN/9§ez*ba¾|ÂN÷€›t¹O»ÉgnìÖ鈯²¹ÑHø4HÞãRmê”c=,mVÁ̓W'¢ŸKìï°²}qQ*qð
ѓé—/è
Ò3ý­o7>¸ÄKRŸϨ»a0êå?5·õ†Ð3Î=pª§ñ’i›Rœ%dé.t…ù°AÈq•»æ;œ­N¡Ü5=i{ÒÂ.½àµf`Dlf‹Ö“y€Ñ`Q’¾‚é۔„~–}…>â³Úd$[
+-"Ì[‡äiËÆc0¯Æ
ÌU±°•ìþ+5‚Æhœ6Ò¯ßûfQÙl6ῇ¤<ÓtípS^ÙÚEׯylìmœõ‡«Ë毮¨X¿löÓ‘äÀ‹Ñ“¿~úúæÚ/ÿâ¹R“må/öï?´Öf¢:õÆ>&w	ÿ‚<è
%˜Ã~]¶y¦i¡©Á,zÈÍ9ÈeK°c—Ø±›“DhpÓMÁŒ\®ˆ‹k‚llóƒLÃÅ!ä ÷!^4è¥]
Bx5Óy%ËÍ\¶ŽJûnû
;×dï·ï´³Ÿ¶Èn±ÓÀœ·{7Œ¯¢ÚHÙ²ÚÈ,vKÕ™ÑP±ˆÞ›™YÎxèMSì~5 ž at±>4ªÀ¿ÕÎü¯‹.T©Õ_Z\ša%Wè3“3º×\}ÑUåzéÚkq".¿.˜œôANñÅó¦Ý‹ß}û±è- 7˜ÃŸ…·Á懕¢é<Îáe‹lmàû݂–ÞMN+±ÛœVS‚YL	Yˆ]Қõxµ>¦'z*[ÍNƒ}ŽS- ÷Óе&Á®“Š+µK´uZN›e)°®¶+’Ñ” öÕhÀ9â$NQJ†§Çµù0i‹4‚âr8×¢ðÄonÁ9ƒÞ¢£›Zy‘*êHŠ©Ë¿¥åpƒhàxå~¸ü¾Í=¹³/(ýÍo¢'æu7Ý°,ýeKùŵ8÷·€ÚÇ
+ðæ=èߕ‹ëÍ
60}s›­Íy{‹ç>rŸáË+îßZÞs¢ùDûIÂ'Ž/5	3f8Ú:kÜ
†6ƒ8ÓVæ,ss›„MæíÂMæ[<ûl{‡m‡œ’‰ùݤ»=e/1ÓûÍCžÔ–ÉÖxóàCz›U@E
+à¡âà}`Œxh’]"¦µ)`ŒÌI¢Ï~Þ-Z Ϝ
+Bp¦ñøá±3tÛÆچF̶æ¸;^&¨‡ˆHü´è_MÍKÚ®ÙveÝZ0òà™7>‰þ;O½øù´hÙò»ö?÷ð¥? tqÆ^*»ÛAvËøØÎÊëë:ë.“4M©°Ö’ZëI"š©EXy½év0°‰€ÃèÉÊäd^3n8ÿÀkJÚ	w©Å§µX{¾»œê+‚óè7½ecüø€â‹/™éÓ)È-žù\ەû/ÂïÒÊùÝ9س{ŚË÷ï"Q÷hx֒¾xäëè<C±“Âå°FÑ;Ê¢›¤[ì·8w£û5¯Jïpïè?ç¤)ːe̶g;û„>é&A+BèJp¹²I—!ˆYB%^‚î“^ã~¡ñR}ò4øaã¹ã'&„xÃx•ârçñZ8OØJLµ«Íx‰›‡»Ä<Œ³”4[žŽ3fZ‰>CÐ%Á‰…É8ّ9 b³èEŽ:䡤­Ë&ŽëSNc4<7âÒi³Ðð~™Z‚Ov©ñ½£‚â+±wNôO£¿ÞŒ¯Â%ظ¯¥(ú»ÄÇ7þøW¿ظŸ$]zú|'^…;ð½»/Ôtßð—èWÑ¿|º‹î2·F×ó÷±ûãÉèA%FÂüb+áʍå	%IÕÜやꤿ%I+5+'NëgÅ¿%iÁw$²c¹HÝ­âÔë-f“˧M삓¸5Ûd2,v<×w¡~ɓR_â&`91þÀ‚ÍYlžÓÓùZÍÚ©§sðñ;âT`&™ô€>y>¿kŠvÅaL¢ç×ß¹6Vçk×\wSóº›aC­k‰þ[t,z6ú~͊±O¸ÃCOüËÐÞGwƒÍlEHs?Ì=Ï:Œ²Á€!F…%gphœ†"
+w‰¿šÌÓÎsWû
2W½LjÊîÏޝý˜f¯¸Çð´æiC$ûXöh¶	ed×AÃóÙfk²éé£Êý¬Q}¼˜˜âdOqDó¿¼h±Z3“’“™:¤Ù°Y•U¥MVÜiÅÖaR£˜“)ÉPיŒ›À€ î©ØC¨HÊT 4W¦ߙ€š©TAª€”žY’©Ì¼ ¤ óÍÌ39s¦7³?“C™rfaf,“Ïôdý©b|{‹6Æ£š³‚S?»¡18~CÝˆ·0-Ñ{m(~£¨;H;&°ÐÆéb"&`ÙÂac<î™¶bî֑µ»
+k½¬ïѬ”èɔ̋gµæGO¦VN¯j͋žäwýdùŠËW_V}ÿXYý£üŠù·îŠRóЪܚ;:»Œ;ˆï€¨H@³çMÂÑk…‡cáAÜ0Ö*zzoŽà×,š;þl
U.:UNùgÌoHàJ}î®R\”]Z¿ü2úŠÅâwm„·I™Á­ˆ(}Œš¦Xɨ|Z&²¼DV!v#Ïd-‘õYóƒˇI)ʦ%`Ýn(¥>é(¿N;oÃÁf®’€e›£Ëp”®ã0}A€ÑEø#Ø°1&¡gpzþ|õø­úFz“þT#½«&$øðÑxVô¿£ïÒî¦Ñ0HÉ• {q9.&Ŗ9xŽõßðß°$
+N!Ô[[­Æ$Ánµ%pv‚™ÇOáDI§³;tN„ôº€Vb®^Â1	KÏÕ#{Àé˜põ|ځßÕOœÚ˜ñ”—[]ìt¡_éÖxH|ž•Xñ7?zx	؇|ñ5Åѓ‘±vÏïºùα»È´½«J«o¹iìS˜4øpa³:}©\Wn^`¾D¼B…>	ð2—t­FçÒ:uÓM5¦³¨µHV»Én¶[¦›¦›/4÷™¶XÞÖé7K›=Sn–nöܔ¢‘œvÉ`6-3õ™n0Ýcú±I0ÉFƒNfƒÃèrf$Xì¸É>`'v;’} =£Éä@Z}
 -Fb|')s@ьhŽixÍö.?–ý…~â÷9dLŸäÀÆáwÚ´æÉð›=&<u¦ñÔøî8VÁÎf3»Ýžlœr¿V=g4Âa˜žÐìÑét%ø¸|â÷[­l-¡Ñ¹éüë»ý/¾ÐtÍCѽ׽üòµ¿{÷ŠŠ%óӟé.yýºÇ›<ã¦'¢ĕO4øÆæ§×ÏYx©A@ã'yì
+NWdDB
z¶¥sàÁZ×mœºÀ¦ªGóñgf÷…Þ’P·R©x!ÊÚBíóÚµ|v§–hµˆã©%¤+5K4D³”CPN”õ…¾òÒTé¦žWؾIŸÄÍlR\ì1ãÅácé>îÔØ,Ò2ö°päËèã_ŽÝEy»¬ÇOyÃ{“Äi´Î¥åmZÂqÃ14dÓWÒg–C—6җF”œeËK¸"QkEˆ•	9‰'D‚¯¯@;_¤y“=}¹Uñ(ú:}“žëÒ÷ëɀ~DOâóÑJj§{°¶lY‰TÄ&8BŸí±)öML‘¹åFXPgÕ›(³·ø°§¢sÙûý‡ô¥Ú~})cø‚Äüí2¸œ“+⎯án‘hµ'8ÍËܛÚ´ìkÚn
îævk¸Ú÷¼V}Âv¢³×gFcAQ	‘éE´—BÍ}ŠäË/!Ëá°kRe(ÁEKDÑM8—˜K2ÅY¤X\Lñ2²R”ì$I\D扊Oˆ¿"ÉIñoDŸI²Ä…âfñfñI¢Á0ÝñM)DêQè“>é‡ËýX&õ8!úÛ±ƒÂ‘syÜÛ_ÕpϞ«fϹäðºzäB3ƒrñ ùœ9¬¡™í=;W£Nt'}xâžØ$NaV|ì8Ý)‹ß+›l¬<zÃ
GiÚ³ª²rMü=7‰WÆË«¨må‚Ýfo&u+þ©/ê¤.©_Ú)‰,ž#"ÒJ.W"¿Z΃CšÛÚFMŠVÎTGºH?ÙIxâю=g²öâúƒD¡‡P°v
+®>¡.vç¦DTJ­]Äß]Ì¿øå—_φnbíšTeAÄzÍM)Û}¢í;vi6[®qm’oÒÝdºÙr³ý–$­&EÊHL²§Ø}žŒ+]W!m/Â
b+¨iKâ–Ô-òñë-‰7ɈêwY"r¾â|Ïi-Kª·¶‰mº«ÐQÃá‹Ðeh=âӝi™™éNqHÎ3s™Ã䢧KÒò$¢ž³È0^¦˜¹w$)ðz2IílSïaØè=¹0GÉiÊéÊéÏÈÑÈ9§sHŽ7sÀ€éû…Î@ãêì­/MÄÕã÷3NŒYËP%»,cÑxãb.´œ½(ühc†§ô×xœ¬vQ“1]Õ»ƒÛeÌ2§0­½¿}®bzfçèÏ¢×â~¼×à­¥YÑ#åå£O?ýïÿþ¤R¾ªqÙÝGç¿e÷‹?¨ÄwàV¼ßÝ}àç;;”¹?ÿAôëscÑXÌ1Ë÷“"jµ÷‚½|ɞŽ%¡MJ†F8l?ìæ.ð:á=Ø¬°Á $õ“f¤u~ëþŽÓ›R˜Ò”Ò•ÒŸ"¤XÌS]fòù·x&îð¨sò.,/8\P›§÷xü2¹‡Ü‹‡MK·î_sßâ+^{áÑç^>¿t@8âôýáÀöá6«cì·ü‹Ñ¦ü5Uu­FØ¿
æÓDßÃýÊ­Yâ/yr¿xÿ¿+ž6Âá+‘wk²4eh†v>nÀWã>QÀAq:ž)Öà…âýú/5_ŠRst%üLÝ\~±î%^{‘n9ß káÛu›ñ5º{ø]âÝ»üïuçtFŽ!žqò2Ÿ£+æ+u5¼äà=º™ºÅº+u{ùgø×tgy	dvzÈæ¦o©r¸h>ª8ÖÌëDvši‘¤¥[Àè¡ì¼’‡)¨˜é%\€€#’ ÑëÕæÓzLAÅÍúì°§h#­$éì탚b	2E¯
/1î6Ž9#G«I±žVÛNǽÅ7Ôðä»jÜÔyÀˆÏ2Ä£¸Ð'·Á
ãoÅÄ¡q£vQ£²(´ÓK1Æ><bÇð¶è]ø’g_Á£÷ã[¢{@ü„‹þ§G¥±·ð‚è3Ô{Ѹ*¬Q~¬dH¼ ãˆ¤Ëàm@ÒÐÛõDÔjõH+he͛ìý­Jšb¬36¹.c¿‘ÈÆBã€qÄȉ^>o3LÙßØ-Çøæ6qO€½‰WâÁÅFSè«L#ƒ‰,;˜@_>ißãÇ·ù‰ï.œEªqVôøącϓª¯jȵcÛ`h:§50§t.:®TnÊÁ­¦Í9æÏò¼äsHš¬\_†Óæu,qBÇ
q8ìþ´[‚V¶Ó[«I™]š~ˆNj³2°A]}Ôé(¾Â|%¿.¿)¿+¿?gþ@¾VÎ/Ì'ùö4É	…	$N<ï;ïµÆã½øíV+_Øı~˜¸#>qÈú''>åÙÓÌÞ“g4Ш:ÁGcjƲ¿Y;¾’9ˆã…†öÄöU«oÚÙøÈƅя¢FœõâOs.º¤vaî[û±m 8g™²åuáHÊe¬^÷d0óÙm-Ïm0j	ÿJô§‚tɅÕ+$aìpt³dh\<ç²õ½Ær6à'½žhzŽg‹¨_‘’g–è䙳hì3:¤æÊcÉùP¤ÕýIúTúÐéH2o‘¼:?Éåe©@G_RKWè6‘ÍücÒ~ÝÓÒÝYé+s7¿SÚ­{EzM÷[rœOz_w’|Ì$ýEgÜ$mÖ]On㯗nÓí$b½>L®à×I­:ú"œXMjùj©Vw‰ö©^'ºu¦2“/‘fé*M"G¼F’t’È»¨ã˜¥äq:Iæaaq¼ãx¢×éŠ8 „u°¸ 4èt„„^†³€qˆþvÈš…xÈ'°‡Š'
+E¢"nÓbísÛ@4Ïée½
€3¸L"L¢"/µ3èÆH—œ°Nƒ–Šÿ°T$z,cÆ6T$º-B…åƉæÀœÿÊ\YJÂ20+mlô ^¦¯h5²O<´Bp”§±¦+ƒ½Ü…bñ³ÑSÑ?Dÿý7²ÜÜÇ_Õð×}½•&Ðó¢ØI>I3ï[JÁíÎÛ]¯9¸$ߚLöp?öÚqG„CöÜðhvìӏ]	NŸ×h1è†qº")Æ;á˜dÄÎaL³7¡–	}ó%aO’pþë4J{Ÿ&Ó1ŒˆÁà´ßæ½Ó»Û{Àû¼WðŽŠÇ—¤ãôÄ ó¸k>Ž<9¯gQ_ЂEFזúʽÐ"»1ñòËøû/tM}¦Ì9ñ
+ÛlØéóR¶¸èû³‹°ÅØ}ñ%›º—N¯õvo®_0­>:–ÔþҖ7¯Y÷öÖû¢þͫѯð¾ÖŽº®¸Úñ×vÉÂú–¦Üw_zÃú›_èIzöÆ¢§?yöEãÇ1ý¼Ê§%­^£‡qª’¤yÏ3ëÆ
1}ʹË0qî:1vŠÅ¬cìXHCš[ù™Ó§—ùoޜ¾Ue+擛±çµ«nï’{“׬ GvèjПÑkJ¹A6–K!hXf¸ÒðGƒæ”kx'ŸÁgç/5î5>c|Å(a¢EQtz£ˆ£qÿLIŒ¯ºd`w#¼‰
+øþcP8Š³6Ö§!žmëŸîÔaU»Í"îŸ91Ñ\I¶B<¦#ø"<Ÿ=a8±Þ.gQ.ª¬´œ©kdΏ~XF͜‡±ú¼…¾´MC_\l¥Ï°“­cûÈ՟:==€3Ïr?>wùÑ÷I*þ<ªG86
+6\ñpÖ)b“ÉøÝdÌi“°8únLàŽ¯œV˜/T.Gëõ•ìMÀo%`.Õês›ð—°ÔuYbF–®^Gt:ÎáN].‘\Ž¼D#ÊÕblB˜ËËå,fIÑj
.Ø
].jÖŒ©ÄU`
™~¥/õÆÔwS¹KR÷¦.5+3k]!YZ¿Ûc¿7P¤„’€œYPñF[*Ü«/o,^ÝhùÅêÆÆDË¢±—‹,¯±Ûò^¢ç
Ž» ñwÞÃ{­å•c¯ÐŒþú@cÅ*,ïÁ9ùxuã´ÂÆ ”ÆF¸¬nÜ°ºsìåÑ'úè9éËPeVözL¦¿¬8PZRÙô²é¾"¾x֊ÿ8\î&
yìϘà19:ÃSÒ20Ò}ÝO£¿¶?ûy
&ײr®y—ìvEÿº¢oNóC®tà¡+/ظ1úëª_Þü«‡ÜIùþ‡^½éuÄ~a‡¼õ靿82sµ¹âs­GË~«ñÑ?ULü¶zl4º^s?h#IýŒNœ]ŒæNþ"è7~1²@U«`ù=HÏÿ	-%åè‡\
+Ú9VÆbd?ꁶbH+!=
+éH—îrÈ« RÈ@Ý]Ð×=@ã…䆺Pw;ԅ ¿ULA[ñIt¥ƒö£Pw7´íbôB÷
|?Wãü	åjÊQƒ°Ý¸ŠC“f?ºʋ¿ò@l”Ía:ú+ފϒÉar˜«áÚù"þ)þsa™Æ ¹AÜ!qR¹®@÷˜Þ£ÿ‰!Ûðªq–ñ·¦æójóæC–閏­¢u…M±]oûuÂCvÎþGÇENä<ãzØõŽ{¥'M•Z!*†˜É‰@lZ@ÿ„ƒf‘e=+#´š¿
+Ñßða¿lÊ®£Ó±…	‚ÍM…9T-*Ì#;nUa
¹ñÕ*¬
øÑËøIÖ¢éRa	í »TXÇ¿ÈÉ*¬GkÄ?ª°
­ÕV«°Qó”v¿
+›ÐeæË'ìa›ùˆ
+ƒ9XÊU˜ Þ2[…9”k™£Â<ÒY:TX@ËfÖ|ƒ
+‹he§
+kQ‚å¿TXBó¬‚
+ëHȺP…õhZ½¢8á÷*läVÙÍ*lBù®6àóTê&×}*Ì£D×ã ^çz^…yät½Æ`
Ôk\ª0l®,R½¸¾PaЅ+Æ`pÐÈàNPa¹Ý^KT¿î2ýzJUúñTª0è×s¡
+CŸžÝ*úõ©0è×ó+ýzþ¤Â ßĽ*úM|C…A¿I—¨0èWö¨0èWþ
+ƒ~åWaÐoæ½ÖQYeþ§
+ƒ¬2ãsÔC½-Ë£Â<JÍ
+2Ø@璵@…ÿ¬‹l¢–ŸVa%gõ1ØÂú¹K…i??fp•yÖ*2Ïz•ÁvÊOÖû*üdd°êíÙX…y$g;ì¤øÙ¥*øÙsìaø*Lñ708‰Ú@ö]*6ýƒS(?ÙUøÉ~†Á^†ÿš
+Sü·œNm ûÈþœÁ9T>9FùäÄùÌ£ž '[…ùqXËä?
ÿ9Ì~´l^9«0­_MaC‹
+ÓúífzÉyD…é¸?AËÑԅÂh-
+¡fÈeôHËQ+ƒ¡NÔ
©WŒa'èDÝÓkêÛ†5ë> jVú¿ì©`‚3-ƒ–õ¨o§ê@o*‡o!ÊS¡"V[ë!_
+4뀇^FµúëÔ6µ°º¡=˜sØ-ßâsæyk&ZÉzé™àšŽ:®2ʂ>ڀ·nh遴úÊþÎ^þ^“¸ySøZ>¥þgL²Tn-ÐG;äÝèJ¨££ýïe.Cm¤Õ<õ2Þ¨Œd(Sœ^µ× Õ1zb^:Þ"¸.±×2هŸÒ…¡W*íMŒ’ö–ÿ<ÅõÜ	ãRžºwËßÅ
+3û¢x›Wë&ÆmS­7i¹­Q¹^ÌZZ™CÀMîïݬ¥Yê2¸ö1®ã‰[ÕÅ\ÆI/“ò¸Üº°Bª-Æ-ªÉ¾…Yµ¹6ÖT½7«}…o”²õHùn…ñÛYqéˌë¯YÕF¼…rÝ£ê#Äæ§Û2¡ÿ6ÕÚ»T
†™lz˜5Æg7®¡ÊMf#Låj\óT6´¼‰õÝ:Å(n'ë+>öx}\Ú½ªDšUKíù^/ôfRiƒ<Þw³ZÓÇ$M-jÒ¦;ÙÊíf]Ïè)§TŸí*Õø͌~£:j›:Óøz¤=LJa-`ÒÞⵓrmS¥Û©Î¤á÷±Ò¤V{˜•®gÜ}·MŒû֞‰¹Ð¶vÖßdÔ_\©rRåß̼ž¬®Òq™µ°±×±Ú8=]amª[ÙºëRm¤®tEoT¥ïaÒۇ˜®âÖ!36«óocZ[ÏpºØڋ[c£ŒÏdªu·MX]ù›UÍ´3n¨mnT×VÜײַࣝ•&­·÷;RÏ7æ׬Ž±†õÐÇ$Ýržm†Ñ¨—,µí扮e¶-3ØÌdÛÃì®wŸĵNy¯÷^ÕkÄWSje“Þ3ÞÚÎ4BW1ú8×´ßfÖ:iiñÑ[˜´ºØ*Ù21‹ñ±;˜Ï¤í!&‰nuº†âRìeôã÷ÞÅl¨ùÍqÞòÙÞ×m3aO-€~é7ŸaMõ°ùÌ;µF+[Kë
j¨ƒi(ÌJ=h5³¸Æó'0ÿßa³˜8nxÊ(‹ÁÓ/‡}¿Ò\°<
+/ZºÔÀõ"V?j–Á•Ú慰̃ï"V»ٝó%mêúøfô3^_'q‰v©2Ÿ´Ñn›Ô̸G×óÖºðû&Ælžðmq{žÜ¦z˸ç˜ô£ñõÛ¦úÌuM¯c½„'|"]­
êhtuoT}隉Ý(>fï?Ì¸ïÜ4áÂêŠOØt7ó½êz^«ÚãwÉk|R‰…§ô2¹Š¿=^‹ºR\Ã<cœë5ªf:Ԟ¿KC™lVçK*mßyÜ·Q/b±hF]¯J»Gõ!ol*ýP3ég·|Ka5ʘsŽwˆqÔÅ$Û¦F:ÿŒÎeÕ;¦ø¶ñq©'ia’n›²‹tO‰•s'°»§ØíäÞý%E¹kgýÛUçyýmbú¿’isj:î'1;
7¡ö1‰Óþ['æçkªu·«5.ÿøªêRícÒóžoCÿhF“ö±€Íýۚ½èžV#´ølâñ^3ÓjÇ7tÐý
yOöÜâÕ>õÇ÷¡,6ڄ¦FWÿgí÷×­Æmê™ç»¢¸oë1.­Éˆµ™õùíu<®±Ð7d½öÄí¤”¿=Âùûýù…Õ(¶öžñèù¤
+ÅOY× 28Ép¥<8)–@*DôîÈ
+T«bBë4h)Qá2T‰RMG¥p ‰öþ?Ûëþ÷;ãx[Á7¤7±.ßÒ^jË?‘—·†åE½P%Ïíìîêìõ¶uvÈ]ë›óåêPoèÿ€T@;“—u®ï£5=ò‚ ›V^^˜—¢|¹jýzyiÛºÖÞyi¸'ܽ1ÜRÕÝZ?§s}ËxŸ3YL«f®w÷Ю‹ògÉY‹Úš»;{:×öfO¢LÅ`µy¬¯åÞ'/﵄ÛCÝWʝkÿ!çrwx][Oo¸;Ü"·uȽ€ºb™\ê•òòEò’µkóåPG‹^ßÞÔ
+hù=Áœ;×u‡ºZ·L­
+ËÕÝ¡Mmë(mˆ7O^Ú¹º^ÜÖÜÚ¹>ԓK{ïnknÉËB}-0Ռ¢¹½ávÊ[÷¹'RAµ­•[Â=më:råøܛ
+ԍíÝa¹µ¯=Ô
ìËÍ­¡îP3L
+mÍ=0P‡m[èüÛ@ì]0Áps¸§§†£
+Aÿ}Í­r›Ú|_GXÞÔÖÛÊÄÐÞÙÙB©)l÷#Í ÔžñºÞMáŽÞ¶0`7Ð×½%_f’îÜ{»Ã¡Þvh¢Í} ó:Õc¸›±°¶oýz¯0|{'ÒÖÑÒ×Ó˦ÚÓ»e}xª$¨µöÐQÂÝím£»óJè6ü7÷Á@q¶´…ÖuÒöM­ s¹5¼¾$Ò)¯kÛfÌìCòz‡ÜÙu´5z¨«+bìhà qq·QaÉáÍ0™öðú-2Ì­lg=í£½m=o¯ºzÔñšbMXîë
“bÒoè£Ìö5SùËk;aÊÐ#Lª·—Ú	L½;zïÓ5õ€È˜yB±=´.tU[tîm΍
È[ÚzºÖ‡¶Ð!(uGxSOW¨X”`±·­‡vLÑ»º;Û;Yoù­½½]3
+6mڔ߮l~sg{Akoûú‚ö^ú·žÚ{V‡èÄóiå?I°)¼jÌdñ’åjÌ­Z¾`ÉbyI|т¹ó/›'W]¸tÞ¼Eó/7êŒºå­ Öq©QS£0ƒ^&ÑïXbl2Ԑéœ×l‘·töQÊfjm g¶Žâf	ÆÁlô˯ÐCëºÃaj‰ùrµ†À:×Ðe”½ç1C­s5§0(.L%Ýnî=¯9NòEUع.ÌP˜Š'è@5`½kúz¡k`³VԔ	eöŒ3†<!Š	bjmòÆÐú¾Ð°°PXÈTê|yE³Ù-㳀9©žÌ;$÷t…›ÛÀé|{æ2H±ƒY¥
µ´´Q›«ìf^9—Vw3Ù²Õý
¦Ö·µ·Ñ	Á oSg÷•=q#eöÈ*;7Cí[³¾­§•Ž}ÅÅ݆
+üƒªº¶ÈqãU%tþ@LÖNNŽz¯
}á6ø½æpw‡:ƒn•o†ÜÓÚÙ·¾ÖÐƶ𦸻úÖô)h2 eÒÅMÌØbŽµ¹wRÇtb!•ëµßÝ-cy‚@]÷jG0N¨w&EX±¬
+6¬%eÙrÙ´y…%……’´¢*§M+)kYq™\6½´¼´Ü¨û;«î.FZ*PÙc뎫a5H¢¡ÎÔÛ,ç·ô¢>l„Ðà“óp&k×¢óosËjMzÓcj‹ZÇÝÌ=ǽÌ=׃SÛÏ«ÿþ±Á÷
¾lðýcƒï|ÿØàûÇß?6øþ±Á÷
¾lðýcƒï|ÿØàûÇÿ~l0qÿ 
ý½;ñ–‹ [k'«é;÷Û­2¯ÑsÖx]
úÊW¢³€ÿ	ԝ×áü¶qšñøªó;{œl]É ©8ñšù¬´‘Ýï8¿ýü–:u÷ícg¿N¶*§bWûTIuþ]vò^~6?‹ŸËOçgð
+
_˗OÅþÎöåßyGg²¶æ[ó‰×ÔÒž8SÛ&kkÕØôÊop<¥[Ñ9?Xɔö‰ºÖnþIÙüÓýý#»RߗG±Lô[ôŸç¸‘Ó?‡6ÂÝ?d±)ÃÜCæ„"¥ÊÂ݋ê á¡Hurw¡m ×æM+:L!©Èø·"R?$
À³²‰âß:”à¤Ý_?h¶2º–ā!‹»¨®ÊÎmF˜sȏ¼ÜVÈS!o†<ò5\ø	ʧ2d¶õÃx•€^É9À	y¹*ΉŠ ¯æQCë4ÅÇéÌÊ)ªÒqs97C1sFðF^NˉƒE^ù(§§
+w󐤧üÝ<hq=ÇÝȉÈXý€åòšŸãt¨Éò!ÉX´³ÊÀ-‡i.±x9úªþnvU¸ŽAèƛÇ%#'´]É¥ ä5\ê Ã;r”û!C»›öãÍÔÓlÈh*©’8úÛîøl´CE¨*Àe¡BH„º
 úûn@;@M;@5;@5;€‹Hz¿Zn
œî*ÔÅmB;!혇.ƒ ÁÃHÏ*:Ìy87HÂrd‡¡6qH2QÎ܃¶†æ2˜Š*ŸãzÐH˜ïr¹‹:r9l*¹Cî$JÐ5(@t®¸.€ÐIuð—Ì¥2I¤0	Dª¼PÆÈÌy&¯“cT:ämò.Õ/ý{,ÿ•š¿¡æ¿Žç±rlFQ†Éoh>Z•Lèo²­&@»
"ä(y	6/ù€S.Èûä0ª„ü8”[ ?y1äG}¿ô“á!Ȁ÷‡N:YòÒ`°@¼*àJR
›³¨*ƒ¼H^@ÉÐÅo!O‡ü2‚Ò r7ä#¤ýò§I)šùSjþ2y–Ú4y†‚ÓK†M”…È H³ƒšýlÅKuÞgÉÏÈ(P:H„Ú}Ct¯ù(ô‡Éã¤w0Åk«Ò‘Gp=>Hè8͑<:XF;Ù9ø¬ì=Lv’Š»LÉPò”=\aFa^áNΐóä2y\e!w 
„–Ü
+W؝	X$ÒNrË _©ƒ9ÑyÔ×
5Áµ‹A®–‰ÖÓª$7¢%ô±Ò6Hý®E<\¯‚ôHWCº†ÕôBꃴ	ÜGPt
EPt1Š. èŠ. èb]lô>H”¢	(š€¢	(šEP4
EP41
+ÊoP41Š: ¨Š: ¨cu@Qu@QÇ(ꀢ(ê…
+P(@¡0
+( P€Ba
+P(@¡0ŠB (ŠB (d…@Q…@QÈ(
+¢(
+…2PÈ@!3
+(d Bf2PÈ@!3
+PX€ÂFa

+PX€ÂÂ(,L?}(Å(PŒÅ(PŒ2ŠQ ŠQ e£@1
+£dÓAîXÕ/€ä’cŒä’c@rŒ‘’c@rLz/
³Ù
+i¤~H”vhG€vhGí3¯>H”6 ˆE„QD€" ˆ0ŠPD€"Â(€b(€b€QÅPÅ£`†Û‰Rüύò¬r-®×ÂæJúq6Ë·¡OY¾gù5è ˯F{Xþt˯Be,߄,‡þXދ¼Z<è-3W9Á,´R'¤Ý@z’È 7!})FJ•4Þ,.w‹ÄçEá€8*³f‰f·æ€æyp@3ª!rU12?
+®ÝÉ®Ûàú$ØDàZÉ JR㖀Ÿ-…o	)Q¬§äÏrð›9øù| ߙƒ«$r!晧ƒ8Ÿã¸^1f{C*dÎÏtÇ¡O]ÞÁÀtï0~6že+AÈ?…tÒH×A*ƒT)R$/«Ë
üz%MíòYH™|d:r:!¶±YµÊabÄ{†~aDôßd
ff
ÝÑÁÌBȆ3—@öÌ`æo•„¡Lá§AsO@~`Ð{šϞô…lß ·²ÆÁÌ|È.Ì|Ã[eÄ+—§¤ËÕ|̛æK½+
íâAo6dÁÁÌÅ΁2 5×£g¨Téñ‘üƒÞY¥
zË)¶eRÅc
Êcì	hÎ

CŸÆõ<VôÞSÞz?ò¿‚`Á<ޗ‡yÈÞÌ ÿ¥Eç}6ïG€\å¬ÒQ|تy„æO{÷dÜâ}ú‡¼xó½wä
k¡úvàû6Ä ÷:y˜<¡$xû½…ÞÞ¼ÞïBoÈ»Ôۘ
õƒÞ˼ÏR6Q®'OòÖA‡`ƒÞ3†‹5Þ-^śé-—Ÿ¥òE3âý–å=K%€Šâ£ç‚|s2†©¯(ÆV%G<-î/爳D¿˜&¦Š)¢]kÓZ´&­A«Ójµ-¯%Z¤µÓ¿ê¤¿\i×Xh¦áé•g°…Ð+a¿{‰Ö´E¸ZR»l®Œ4£Ú5räì2ÿ0Ö]¼*"øçàˆ­Õ.Ÿ™¬cK#eÁڈXwiýAŒïh€Ú¹y£åõÃ8F«nL¢ÿò F7ޞtaì¹ñö†ävn¬tWÚf[Ëkª¿ãÒ¤^ƒ“÷T0%²«vY}dJC¤ˆ±”†Úȵô?G&fbœW}˜˜hÖP˜ï"æyKi=ßUÝh'X³	ÐP&ÍM;É
üÉŠ:Šã€ð|4<^@gdx<¦xËóªÊ2ÃÉ@è8Ã9ž¦à€ÅmõÁ@€aùe\O±p½_fŒe³Ž¼^@Éó28·yYG^Ì‹L¢d¨(¥(¥l,Oâxã8ö¬q{àÿ/?á9A<4­oëKôŸq6ùç…!5EnÝØêŽô¯‘åƒ[ûÔÿÒhZÓÜJóP8ÒçWG¶ú«åƒÓ^úŽæ—hó4õAôÒ¼åõ_RÂՃӔióü¡ê†¡ÊŠúªóƺeb¬úŠï謂vVOǪ¬úŽæ*Ú\IǪ¢cUѱ*•J6Ö¼6j÷uõµhNÃÜËâùÑëÀ†›’|
sœ–®ÙÔ Ïò¹·&áއôÁ†ˆÁ?'b„D›òªòªh¬3Úd¢ÿqUmroåK:‚÷©M¨¶ú砉¿¯F‘èÿ«ø–­ª§¦QBß­³úaÍn4¯­~ ÜË|§b¢žïüô~ק¯¯¯‡^ú‚pF®ä,«L§ÑFa¨¦ê¨Ë¯ã8VwP’æ
ÇF 1Là^:…‚˜þŸE§.‘hDB
+½C‰)EÏÁ¾
œãȦÁv^&›†Ò2èù¥w¨ 4žÃù”惉¾"ú~ʀ”æñ\±æ
°3cgÞ⁌¼2
ýÓØ{ Ò»‡n¥ƒ{8Ô쀽
(þïK`¼G“SØÀ‚=8þX¾õÁãBŸlÚkë¾w\!ñúGŽ7ûƉúTÖØÇHü%ǨÇ
+endstream
+endobj
+23 0 obj
+<<
+/Length 428
+/Filter /FlateDecode
+>>
+stream
+xœ]“Ïnâ0‡ïy
+ÙJ<8N+¡H4€Äaÿ¨t $†F*Nd·_ÿf¼­Ôè³=ãù<šäÍa{ðÜÿ	cwt³:¾î6ÞCçÔÉ]ŸiRýÐÍiÅÿݵ²<æ·Ù]þ<®×YþÏnsx¨Å¦OîG–ÿ½ƒ¿¨Åßæ×Çû4}¸«ó³*²ºV½;Ç{~¶Ó¯öêrÎZúx<̏eLù
+x{LN¯µ¨tcïnSÛ¹Ðú‹ËÖEQ«õ~_gÎ÷ßΌ•”Ó¹{oCÕ1´(Œ®#seÁ+f»ágp)1¶ÌT€+æ’sŸd~f^qüF˜ã_„¹n#\·Â%x'u
x/Œ}]ˆÃ
+,þ¶
‹¿Å:ùïÀâopNþÌâoá¬Åßòâ_q-ñ7¼/þüµø[¼Q‹?Á_‹ÿ½ÒÉÿ	,þ%ú@âOp£Ô8øÞÿÔ"ñ/áLâ_â$þ%Lj…Z$þ†9ùs]ñ7p¦Ô¼‹’?zH©ÿ\þTl¤41)ÌüÿQUÝ=„8¦üað|b2ï>¿iœÅ¿hzÖé
+endstream
+endobj
+24 0 obj
+<<
+/FirstChar 0
+/Widths [ 750 666 556 277 556 556 556 833 222 222 666 722 556 333 556 556 556 500 556 556 556 190 500 556 556 556 833 556 556 610 333 583 556 556 556 277 556 277 277 722 277 277 610 666 277 666 666 556 722 277 556 222 556 556 500 500 1015 500 777 722 722 556 722 333 333 889 722 556 ]
+/Type /Font
+/BaseFont /BAAAAA+ArialMT
+/LastChar 67
+/Subtype /TrueType
+/FontDescriptor 25 0 R
+/ToUnicode 27 0 R
+>>
+endobj
+25 0 obj
+<<
+/FontBBox [ -664 -324 2027 1037 ]
+/FontName /BAAAAA+ArialMT
+/FontFile2 26 0 R
+/Descent -211
+/Flags 4
+/Type /FontDescriptor
+/StemV 80
+/Ascent 905
+/ItalicAngle 0
+/CapHeight 1037
+>>
+endobj
+26 0 obj
+<<
+/Length 21657
+/Filter /FlateDecode
+/Length1 35792
+>>
+stream
+xœí½y\TGÖZU÷ÞޗÛ½Ñtߦ¡A
YÄV"í‚KÅ5b$‚Ð
+
+‚,nш‰[Œ‰&311›f™D“8" A4£cœìŽf²ÌÄL¢™1ë‰3cœIÝïTuƒšd¾÷½å÷~¿ÐÔ­sk¯Sçœ:çT5´4µ†µ!«ê+§gV—"„ÞD«–µH÷ÿ¹å,Àç’e-h\XÓi„"BBûº•ìߟ:‚ö8Bc/ׄ*«FmÑ#4­ÚZ	÷‡o—ÃûExOª©oYñj„¦›¡M[]CUeÂìGg!4#ò﩯\ÑxRÕÎÃûQx—–TևJ_9u'¼ÿ!ÿ[
Í-;PZ¡¶všßØj|tåcx?ƒªÒ0|è@}'/Èä
+¥J­Ñêô¢Áh2ÇY¬6»#ÞérKžDoR²/%uPš?}pFf֐ìœÜ¼¡ÃÃGÜ0²08jô˜±Eèÿ×?B²CpÏ ;ïC6„"ŸAøœÆáÚÈç4ŸÆäK(ÜíAûp-ڇŽ¡ø"Ôڏ£.ô*²¢±è´ýmB24RîDÓà#@ú/±=҅2Ñã@K£SPö&têAl‹|Ö¢
ÜÛPkÒ¢D4
+•¢t7žiEsÑ9þ”&¡%¨·EfGî‰Üy
+ý
+æ^ô!5r *øœŠ|%ü)òg4j܏v¢sø>åA„^ڠ䣨	=ĕó8²0òŒÀƒ–ÃxT‚NáãÄ­‡Ðg؆Wsc •'#푓PʉÊQ
zõà<<žx„¹‘’È)d>V@«;Q:Ÿnô":‹5ÂÅÈS‘‹ÈŽÒÑD˜Oú=>΅ûօ)¢
KƒPrÐoÐ+èöâߒA#dAaUädFCÐLí3PóSüor|Ör/óã"£‘ðr/Å6úú;p&ž‚g‘A¤<Æ5!ô8>Õ¨ðý ´þöãCDCNsOòÏñWd	áó¬ˆ=ŒE¿ÅZ˜©„›ñíø=üW2†Ì#“¿p¿ä÷òW¬oAõènôú76âax*¾×àÕx¾ïħðü9EfÅäk®†[ʽȏ†Ït¾™¿CØ(Ü%û<<;|2üVøߑìÈF4èaŒþ~ôÌì0:Þ‡Ï9ô,`5ÖÁGÂ<ß
+ŸÛðÝø	¼ïÅ]ÐËüüþ'þ_!>2O<$>^ÒD–“_’GÈiøœ!'ßrV.‘ósy\
WÆ5À¨6qÛásû˜wð§ùà9[Ø!ìöÏ	'„‹2üvR¼ùý“}i}…QxsxG¸#ÜùÅÁ:nT£¯„Ï"Xï@qûÑÛX¸sà4<OÌÌËðR¼0¹?„ÅÆþk|°ôGü5ŒYKœlÌ$Œ&Sàs	‘¥d;¹t‘÷ÈwœœSsz.ŽKãÆså\ˆkáVr;¸vîMîCî/Üeî{øDxïæyïçÇóóøVþ1þ3þ3a®ð†ð‰L%«—m”uËþ!*)/•O•—Ë·ÉÉßQTu¾„¢®åy|ž[ÇqÑ=$‡·“ß“ß=ÏCÕ\	
J%{ðf²w‘$a…l'£‹¼pý2ÙE.“\	.ÆÓÑ"2$ښÌÌ?Q
ÿêåÂÜ~-¯iðmäk™u`DÐçï¸,ÞϽÎr簜}À«°÷’g¸R ‚ù‘ÂläáA¿æ–â5è 
¹ªº¢Ø
+t<?raÎÆÿá"ˆ#“Šò¹¿¢;Ðbò'Ô|¼=€«ù…蔃W£ÏÐÓÀƒ„%²4Y~Ôò[ˆ	w!Âï…Ùpæ3ZË¹‡d_“÷Q+:Í«ÐGÜó0úÓä×\	Q˜†k€Ö hidZ)Ìæÿ€"ÏBÉüyn«¹lÞñZ*sA¦îî
90Š+PÎ$ ‹™ !‚σ 'x  Zàñ›@ŠýuÉfn´PÐa:ño„§¡9‘§ÑÎÈB´$rò`Sd5´¸}‚¶¡=xCøVԈ\À9áIÂ8rZL¶÷Ét²ãúõl'cú>¿FãÐHáÚÂÿMG…‘­‘wºSAÂîDóэèÌò+èawå„'“‘q\#Ì÷šy&âÆ*T©CSÐQô+¹€*åþà¨QÁ‘7Œ–Ÿ—›“=$+3cpº?mPjŠ/9ɛè‘Ü®g¼Ãn³ZâÌ&£AÔë´µJ©Ëž#¥yÇUHí¾ŠvÞç0a0}÷VBBå5	í$»¾L»TÁŠIחBÉ?(Œ–”Ä¢T€
+§KE^©ýÔX¯ÔçL
ðÝc½eR{/ƒK¼ÁZ€=¨ ÙjÆJí¸B*j·¬fKQÅXhî€Z5Æ;&¤œŽ¨Ôª
j·z`ëHÌb-~€ …ÕîðŽ-j·{ÇÒ´sÉE•Õí¥Sg÷xʧ·ã1UÞùíÈ;º]ïgEÐÖM»lL»œu#ÕÒÙ »¤éÇ·líÑü
+¿¦Ú[]9wv;WYFû0ø¡ß±íÖUlW_¡qã˜Ù›®Íç¶Ùj%úºeË&©}÷ÔÙ×æz賬ڀº$y\ŖqÐõV@bñt	z#Êf·ã
Ð¥DgBg_È[DS*IíJïho͖E°4Ž-íhÚJO‡Ã<9EҖ³½žöÂxoYåXç
3Ú2me§=(ٯϜ~@4D{@§
íµ@h A¬8…Š§
`Óy'A´KUŒd¶æ4Œ>BÃЖªaP~Ê0Ôj¯†©mWŽ©Ø"§é´~»,z¥-ß  oï߯O©Œ¥È’Åo)ä÷Ãí~{Z%ùXSãHöž78}Y7ñzE	"@*ÜV–
Ïô{<tïê¢ùðÒÞ6uvô]Bóã;P0Ó_ÖN*hÎñþœ¸™4§­?g z…(¹‹)¿qí
+ßÀ¯^´˜Šj†·cËÿŠæO÷O3[*ÚRÃmñŒëÞ¢ùÃòbP»iÌl.žÄ ϱ\ ʹ…éËlM;Ÿ¿2FÔÕÝrP%KÁÒ¸v±bBôY¦òxþ—•º#i-]­fûpÿõï#®{¿nxš-6Áâs¶lQ]—¤ípb,ŠG3f{¤1íh&pf2üvGŽ£¡,¾=(CýE“b¯×ŒÁeðC©spú8t[¶ŒóJã¶Tl©ìŽ´Í÷J¢wËar‚œØÒXTÑO8ݑž»âÛÇm-\ÕàáƒÁLùh³r4º‹à2y7Ù4!¿À!•œ¿€‘]!.î(lêJPñ2Í/^.è+˜,^*(é+@…‹ßÃcH–Çà1$ÃÖö½Äÿ>( +HâÃæ
+Ú8ÊÀf#v«2Å,q¡¢FY!n涋¯	/ˎ‹EµB(íµT¬Q·‹ÿÒüKû/’×ðZ^ÇÁ>!ð<˜b
+™\®
X
jÌ@’k̐@8Nâ5f(¡t	‚Â%ãdݤ1¨D
+ÍA‚	éÁj„±:hÔH($禕‚æwŽç¶ó˜ïÆ8¨.Õ—ŸÓpÛ5XCßE½ü´œ¬•·É‰üú÷þ³¾T¾Ô
~m½b¯Ã.öö"[a£·ðBØ¿›„ÿñä¦°ÁMâɓº“'7	ÑxH.nWO/nw
iuñzN!ï
ÓEþ3~ÊpÓÒr/ÎÁ^ÎÙ<œ/E&çHÎ[dö‡Ïõ=üøûø;Ç%:s„žïÆá£á±dÞqxùÝw
Þùœ;Ïì´#GäxPgÍ%’É’«22šsý&œ¤0Y4ØdQːÊàäÔ(ǒl³s†æF¬ø¸[';€º‚q¹CsۤѱÛÑîˆ8x‡&YÉr èE%FJIyFy^É+'ÛǗR’(_êïáA‚¾¨°·°°  X’5feÐÁ‹:­^KÀ¤–)'yM<Ò*ñ` cZÚ:TŽý~¿'OæMôùR|y†ƒÙj±ädJa®põ»·<9ETw©
K¦N½gD×#]ê§ä5“ûú:ï2~êôm›IàÊY06F>çÝ@k"J@ïŸÇ‚FŸ$ä	E‚Pènw·Pèíltowˆ›
+,ŽI–IŽrE¹v¶¾Ür‹c‘¢N[£_bYâ8î~_sÖzÖþÓß­·ÿ5á¼;â¶KB¦>Ӝ%êƒÂ$}©°@8›ð
ÿ¨ãt¼Œ x§LŽUqNÚ–tFEuP]¡nSóêlÈA9\2!Ç1ގwãv|ón\6‡í®ñù6ÿdJgM%bߥb_ùÒ^†ÉÞBC€aÙh©Ç(š“í"q"ò&¦p€*ÀT^®Ï›(ßéj:0ÿÒ`øŸ/]LrgÞ»ìù_µ.{^èéûf۔m¯7‡¿¿÷(Þqlæ]§Þ8óò)ÀÙXÀY
+?ll;úm°Ü(WÙ5ãe³deŠ…²Z…"Wnnɳ‰ÅÆbK‘m®0W9M,7–[¦Ùê…zeµXo¬·Tۖã8¥LÐÞÌÍf¨nÖÔq!!¤ªÓ¨¬N^npªÕæ$9%$SRrn0°\”KrN>ä\<Ž§év—77`]
+B7*„Á
qäæ3"[ê/¿\ÅK/pÓÒr´Ä}P9]˜®œ/ÌWò¸¼Ì$ærPœYԄL櫸ûԝ¿û[nýÛ]罇;6mìèÜ°©̀”{–…?î;õ·Û±kß|ãÍ·~÷ÆëÀW›@<~
+x± 7ƒ&“™È±[ü+÷™é"wÙ$ã)s
QksWŠøAñŒí¼-bã%…Yg¶‚Ë,Z•V§Ñ%©“©1üª'ÛèL”Élm¤Ñ¶ÛÖn;nãmÀêq–dŒh¶‘rÝx%t‘:Ù*F™«àRA?§Ø¡"ÄÀ1N³ÈJ•B%W
ù2]<Ö«Œñ˜r™?mò—/Í1äÄ
†,ÐÅ
^C®â&ΰé‰Ö+/U]i‹'4?ÃûØ_ÔX’½¦¯™l\R?ê¾7ûŽFq"ó
N¼èåÃHùSp  ™¿À_P~lýDÞ.KĪ¼J[¼¤ä8¯Ë)‹ƒ¥¶yApªÎ$ãíÉ»“I²ÕêÐ%o7`C7.?hKÞN‰—íˆäx“ñ„·£ÝˆP"˜»”=)¹¯èôP‰ãŸ哾À0½—Êû&…Æ~
+¬QXPø!m°2
CŒNc6ùÌC<6jãb
| r?ÃE‡•>®E… ¨y<ûéEËpßöúcÏvzçŽlüe×ìêIë†ó¾û'ϛ?»gÿ¡¾òhݼá÷?Õ÷éX±¢ô¡{ûÞ§’¬®|FÚz	‘ãùÃrXáÎܼhœ5$'&³8˜’[/¸…]Â9Ÿ‹ç…6!"ð@*ÂEi„¶Ähő“—»áãè"0ËU‚áûEs“Ÿ’
*,~aoðs6ÜÑEw¨³ÆXÀÆ(Gk‚åS”Û•»•íÊãÊsʋJ9Rº•Ê6å®XÒyeD©rÃ.ö:á”2î6Œd‚ŒWÉäÉâwñ»ùvþ8ž—ç/òñÞx~²b`DÑñöF÷ItlMKMy9qmsWWÿ·Ó§¯Äñ¾+ԑŒæF>ãÿ&¼²P8øHWÅ7s-<Ÿœ’Çœc¸‰òI	Eî±IãR¦seò¹	7¥ÞiÒ¥j}I$‰KIªÏõŽM.ʜ#ÍòÎL®S/Ò.Ö-0‡l+Õ«´«ôkÄÖ¤æäÜõÚ-ú»Å
Iw$ߧݡßçJNÒiՂǙàŠ3¬TNNJ„4™àŠ¼Í½4XÄ.õ¾¤ºwãö`ò`—ËÂ	®ÁÊxŸãF¥
ƒÙŸûŒ3$˜}HÕÍQi_r
(u2 ¥¤÷RTªÜ§²ÿ’Áh
	Sä`©ô_
+ëgÊw¶+æÂ6™”âóååò²<Jµ°ð°sF¥_’oîÚy¯®ixvzéÜẩµoûç/Ÿüv£Ð£ß··ýñÀ0üþì¶U¯<úJø_;ñÅ%wß4ºylÑB¯µÒŸÿd¨á·Õµo®ÓÝuϺ›§ää,NqpYëéæ–/€jnP
%âIA½Q­ÃÆ¡Î9îŠz7oìŽü¥ÓèȅøbgbJ®¾'¤äŠ±X‹!ÿO	¾h>”c1Í6¬»Ñy£4]=×YïlR®Ð­ÔoPmÖ? Ý«ïÖ®ûL/ê4É 7zƒ^£4Əâ’
¢V#ؔJ‹ÕawY­È“èEÙlz½Náòé‘•KIImI\R¢MÂtQʽ#öD…ê¶bùeû,	Y±€*ºÆ@&$2T°X›t~
t=JºþþTN·#•"¨èÅáãpH+Ãt:Œt‘‚{Àh!è‚΀˜h†à†ˆµP–cðd³õ“ƒ|¶š¼\Iñy½HfËîõ<N¶œ|sÕëo—¤Îœ¹tb撛{Š?ƏoØ1ù'ÃYBϔWW>ò^BrÒäÖðR<dýÖajy_+—“¿r|ÍFÊM;âÓ`í”Ô`Âs.
)$ª
“g‚:9áb‘˜Ë8–ªùŸ–3u¤ž¸'È@€ük…»É"R$=ho$)Á%„`/"¡‘<ßx7Åí…rñS”Y[7b6åyâF‘A¸ûàA:ªs`*\Ž#jJ\PkÈ]̯%ÛÈNÿ<• e@ÞXCðëªè.é
u
±¡:4BP«ŠPM°$"ØÕ=¸o@Ñޗú£ÚjÔz)¤ÉDl TÉdò¼¡Cósȕ®QoÏxà/™-ü­#W»=þõyt|€59ŒÏ…>!ŒŽÉŽÈ_Q¼æ”OԔifèkªu«Œ«Lw?q|Ñ¡9¦~ÁDâE§˜ ºDÙo@ۗGÎ#ÄJP.•¨É^w:ÌN§Cátp˜(NNë»ÉSSØæh;¨u™äê&G‚zL4ªfëÛ0ž L!ë@ä‹xXPc8XH摲–ð¤‡$!7Þvà.¶|—zÅËþ‘
+º‚½ aŒˆQ*ÖÅ,Xj‡`ú ºfSrœÇ—ӟä)LÖPÙ"‡_^þ}>±&?ùÐ×{vÞzû#ø°é?o½}yÂ3'ž˜ëÚ·oTAÕñÛN~²`ñ/Ùb:ýþ—ûf?{ô©Í•C@v8“"П
+4ÎKÁ¡ÆٚÍCš½š×4Â$n’ö—<g< Œ“*5'GVû:Ǜ9Žç´ˆh´¼œ;BŽ ²»ƒ*ÄóP½®^ð‚ ¨‚	î\U7ÎjåÁDo®¼Í“'ß®'”:´Zs.""‘GêºñV†¤¿—¢üþK€¦OEF`â^.0D˜À¦?HÒëõ@-Œ™µ‘:Œ
mw䝠:'À%p|BB
ãàò¨0k‚ꀦ­4 	úšD'ă£\^†r¦Š‡×À0ÙÑ·ž<ú‹—_î
+çáy¿â}ã¯ÂÃ2Þ߷讬»^иèTp¼RƒÝÎ1¦1Öé¦éÖ
+S…õaò0÷ö)ñ)‡F¡µ«‘Zn‘ЪiÔ¶iŸÖTRÔh,šš¿N—8Oß _«çôÀ¯Ï'f¡ *E¨QMë<(J¤×«aqŒNµÜæäÕN=Ö'éãaIj¿îñDg\Òi9vËÁ>Ÿ{2º«‘•7ÅÜ&‡¦~ŠÞ¦K½MlWáidŠ°µ•_èßÊ°•)è†\#Ó¾ú÷/ª®s¾þõÙ𿛾¸sߟÝûíkçl~ö©õ‹îÁ¬/œÆ	Xõ<&ëö?¿¸î¥·ß;q{LW§ç’ftà0²Ð…M*™Ï㊸-ÏuGΓ¬ö\«Â 1˜9
#=¨èfµ
+l[¦+ñq%VN¶P±RíÜrÑB-»-했…·sL5û‘j7`S9	Ñ%ªœS͜Ynº¹N¦“'ëdšx¬UèûUPÐÇ1SÇØ&~ÎÙuÛñe¿.îj]\z7¨g}ÿ¼¯ü©Gúæ‘Ç7Ý:ýž5}G€ŠÁns
eā­ûQ°Úœqd&W.”+gªCÜb¡AR+D"I1¾/|g¾ì1·qŽ2–8F9§çÚ§9+õŽJç
+ي¸Ëä²MD¬×Z­¥–
+K£…³8õÛÅÝ"E>Þ©’#J8J|¿	ˆÃÔR„(SÒrÛµXëpS­4ٗKã`5åÜØmÉ“äÁ¤´\J.SÀس»rc–®ô÷É`Òù//õ—På§ï#Øn–0¶3Ƅ3^ÚÔO,"ÓÎ`–{˜s{@tq·ô¤uø‹ð×Øüçw±ÿ¹ªcCÕÖ¾³dªfج;Wïų¬Ova7XÚœþ(ü­(íï©Á÷oSó4l;hðØ9 ó<§"¼6Y›««òÌyΛÈÕ4ótçBR-„”Uæ
+çq÷;»¦ퟘ>1mý›ýæ°¸Ý~u);¨AžA’´–á$O[LŠ´ã̝7©fij?‘}fù_҉8ŽÓ©E=Š~3 Uœ“SÛr0J6è“EñŒ
‹† ¡ÂÐfà
-ƤcòÓòsòˆœ¿•¥1§A	õ¥`öô0÷¥½‚«nj'ǜ+y1v’ÃטÆÜ°Ðɵï¶.z玊™}Òó­Ë~µç֏o|lë•'wanËÔQD÷Ý8b|óõß¾|ö͓À
s¸NœÂ´_0	¾"ˆ['Lð"ÙÒgWЅÅQßÄQý~sÆ©,¨iüæ›ðWtç¦|Ëû
+ßòB°e¢! êMIk(ÁŒÎUÐHî/;!ƱJü)¨tyrQ*<àíó ,(d¼
LÍÈE<ôšA(UéSPžj¯š…g‘2Ålå¼€Ô*j•+Ðr¼œ¬T¬P.Wm›ÈFîNùfÅå£èA彪çѪÑòª×ÐïTgÑ»ª¿£¿ª® KªtT6dQ¥"Ÿ*_5UJ!h´ä
+A°‡Ur…"Y©2+•*Ä¢Ã²SP©J©P€f$“«”ÂB¦kÁ`,,¢ìÆñƒ`ê
  R"Aœ¨þò½{_y_¹ÃÖ{¡<ʁ
ÝÔ ÞÇMk˜÷"Xr¿ÖÜÍ*÷àظù¦Œ®ûͅd·Íÿ÷Ãá%¼¯oý†ËÈfjkqh:ØZvÐs¬`ãg¡sÁü<d™h™èûTóE– ÌÂkмšoQ,U7iZµ«¬w¡-x+¿Q±N½^³Q{·õMÃË&c"ˆÜ§ä ‘$eÒh°ä£rØ5HÒ —
iâ]»3p†Ñã’	©.£ÖÕ|dp7YýÍú "D‚ZÔ}7¾÷P¶­¹Ãäw$5Çõ«zR\0ŽÄmòÊ]1/Ñ¥ò^‘‰àK影ͧ<³7¶“ƒ@û¡'¨¡Ì„Šj5rªw#3r­ßˆ3[®q°-j¬ûôØñ/×oº;|ùý÷×qq͆;,Ü<|âöéëöì»}í3\ü í>{n÷‚¥ŸÜ|4;çñm¿Å3jÖß1¯jÓúï#%Û§<Ývû³{€fE>å-€q?z;˜*h-Ú"íF-_d¸É°,ž›f©™«-­Ú•æÚ-æ;ã¥U	ÛÑÔô~/Ç^­S…1ÁôJ‰çui4q¼­‡<…ì¤&˜çr
+¼kÖØ<OjˆÔ&oöQ2ˇ‘OôßöÁ¶n<¬Ãþ6îÁÃôª)zAI h{z7¾ïÀ†{£>ß~÷>Èd¦+L¯dxŽÊnSþUìÉó¯"2¦M^‹x߬.÷ý‹×îbMÎ$³QÝܽqQíVs—çË_¯x}ñ‚êÛ·‡?ï·|‡mç¦öÛW?n~Œ¬XSuûúõÒÁWvTÏ{$Ãõâ=ÇÃß|
+#ž	TlœR?ðÁ.™d`ŒvIýPÀ-Œô€Äù¼lÙ¬Þ¬M'(åj)2MŠ»Ñ>&~†inlñ‹å‹ÕU¦º¸ÅöŠø•d¹l™z•~“ìAùñ5ÛYòžì=õz‡ÃÅf—VkmV2¬R?¹<½ÝmhF´E¦k€V£xìwg–/EåhX¿n™¤¶ãD¢;Åg)ò"Å£læâ·w/ëh½èíÇßYyïὫWïÝ{ÛêËÉۘÇ7<?¯39‡_Ú÷àøÑð__Ä5xÑWµÌþ{!™žúÈqkp-"z…™Ä+øe %¾ªá”š‰š‰znŸ¬M×Íænæ—iWè6ij"(Ú¡º)¤˜+*J´£uªÉNn‡|‡b÷Œ\f$z.K fA 
+Ðس€
+Í4ý4Ą(è…:µV«Ó‰H¡$Æ6#1ö=@¬C:Iэ‡U¥J
+jÖª±º‡ÌB:¬†ҍÕA%ˆIßÊL7™õ‚$T€ ä„n²§Ó0¢Ìæ·σénŒÏìx¹PŽl……L^öboïäæÕ㙑&rµ÷‰¼ÇNgŠÛ5—ÊÔ[mä?t*š³Þ9ä	èÒ=Ì"8”Ðeç3ðà`Hiýþ²&ºƒaö3¦¢{@ßÃ^lx'ᛳ,vPÿ±p$<kx¶ÐsåŸ÷N(}˜ûþ»qüWòøóW$ª©Ü:Ÿt¾T”‚÷(µÊ4»Ö‘6H›–«—?<mbZ¹¶<m‘¶6­"k‹v㠇,;öj㞶?›zÈ~$õ¤ýtêâ>LUŒµ`·6ô´ÜHŸÈOHŸ¥(ó/PÔú—i65ö­ö[¿!?W‡y13)ךí1Ûæ
jD93u…ºmº]ºˆNØ¥Û¯ûZÇétNÎJµC‹í~0få¨(E•
úÌ J±%{’ºÉÍA1%HEäËòí÷	¾!
Ênª)ŽÈîX“m‰™IÇd§eÄ-+”ِa̶¸;_ê½TÐ÷É'”_.ô‹È]
+1s”bž2¦ð$S‘ùÇòÙ'/7%*vF’˜óŒ
«×ÇÉä:µ; WP}xÑþ£ã›'ä->»çm^»2¡Ý¶ä̝›Ÿ-•ÖÄ£Nëü“
s³ëkkžð%Ü1sÜs&¯›lÖiIɪ%ƒo([j[zWq°òƌ¯l¸aþ0Õ)¦–dN¨¸yÊ
Ë#‘¨Ö.œ >df”ƒ|ú!ä;@˜âlõAïƍ ;«Ð?ÁîÃ$:X€<àÞ2þYü–pvꊠšF
	ê
ÌÜ	/s
+[ì¹¥¸”#A®¥‰ •m ›LïÀa­è$v~éaœÉœ#—¢Ⱦr`
*Š˜ö€½\~ëÞÏþ
]Ú¨äØÆáJTL“	.…b›Ëåˆã™M!v5!5¯Œ9‘TԉÔïVc®ÎÔùËjÐ=<¦þ${¸¿ÿ„´÷•
+=ûÂÃ÷õ-€6Ù¿o@wGdš°Èc/ŸËá§óø^¦4(”
+¥ÖdPj§Àjz'E+u»+%6‘DõތãOXo`^j¢££G*~㉯mÒ1éPÞDy7z\ö*%&0Ô6<1²¶ðæ[FŽ=ⳋ÷=¾tÂðgRÆV4õ½Cqքzùáü!¤FÂn´DI¾UpK¹L¹DÅ«¾ð’B2…b×Ü4'æ¾TÐ[ ^((@™—è‰Ï¬dƒ'Ïcˆ¢‰àðR¼íY¼-¼´ß·‡Æ{ÂK ºãy„§‘}L(v¬Lؒ°ÃôŒé%Í{šâJ“M—æà”YB–ºv>v>ѤŠ3šL¯ëôfÉ¬ÓkA‡št*W\P·[Gt:}0ÇÅ9ÝäÈz¿Mõ‹nlzy—Sk˜'6ˆkÅm"/‚.ac»ž
#›h#¶í’ñ(ÎCz|?÷aºƒ?¥S¸¯×)®jˆ9©¢Ö 
66)¢þVȦÅ
›_«\k›C\ôôON¹æ‹q;ënïÚ·õ¦­©{ï!ï÷½0eý½Ç±¢åîK¯öá6qË]'Ÿx¨cJ¡…üãùð²¹áËo½roÇy*gK›q ?$ 4ÔLYlÇ°éōµ•ægH‹¹jyµb‘±ZjQ´:7(6:ßS¼c1ÈA)ëJ‘¼’‡jg†TWP[ª%Z­9¿=â1¥àŠ]f-m§ƒÉÍ"݈‘(‚¥½=]E‘偠ªÐ:ÏÚ`]kåA´&uúczCo?¦bêWyTöö£…ª]rfS7¥Vcì4ÔÀÎF-øZ…–»ÒiKŸ¸xÖ¨™óɨ£»ú–ŸYÿqø£w~¾ïþü)÷Lnzê‰[W=ËO×-Ê*Éù՟«*ÂÿþÖÞÛp1^÷þvωï?,¶¬û±÷ïG1ÍËÎü¤iè7ÁÜáŽI– ÷fËMÞ\¥Þ±Ð»Ê±ÆµÕq—ë!Ë^ÇQǗ–O¥Ë’éËc–}nø jI¡êÚ<’LJuMÑÍ£Ôè¬	øíÒ("»(
º{p©
†Ð_:ÅnE®a@ùcš¶û_ù¡Û{-¹õ#‘ù¨¢Ô5’ÀÖAÑ1ì
L!óáÜ««Æ}–Õ•ÓהÅCÔúË_ÞÖ{ëª<ñüYòƯZVtì]½æq<]\µdÒÚ?5jl³cşÎañ¡ð_Ãÿîüõ1.÷áC'ÙJqˆQRäŸ$MØ	6XÛa¤Áîõå²;£h³c„5ZæETúõ*™6Z½˜ˆ±Ö˜¬Á¹¢HYT!o”·É·Ëy$—ä»åíòãò3r™¼‡,B6<ôÀ‚¨Ø»tAì¥~«—
+˜ã ÌIØMsrÄ×¢'ÉÖ¨ßÀàÍË1ä3Ÿ%£":&̯K_¿¾óàA“?Õõø.qdè	RµËëÂwoíûEIºƒÒæp-ï
ùmŠ8ü•F,Þ ‹|¡Ô.·4HãMȎËNÐ(m—íÃão´Þ_¦¸Y3×:7~‘b±¦V¬·.Ž?.½mþÐö¡ãm×ó×y)"Y¼¼_ôÇåñÃÅqüâñõߢڠã,N¶
Xœ:5ÒٓΨ°¨
+ª*Tm s[°)‡ä“úÉ«îñù6üSw1ØeCàÚ«¦þÃc°_M¤¸kÇMO
¿¯fó™E­çn³-Ãðô²Ï=ÓÒ| \+¼¸eêÔ­‘Ÿ_¹kÒð¾+ÜS§N¾ñî¯ÿðu`#ïcç±Ã‚/ ™\Id<W€e¼ŠdÒ{to}\ñøƒÑËIltboÌkF}-ÔÕáð©S§¸²S§¾æÔ)ºïE>#
ámjå†-à£s€Po‹d<ÀaÂíâös„[†0ýª
ÁPNÅ}ŽÈçÀM{ÂÞß¹
+ú£G	"spPº|à,ç`¼w{x¶]øûw´$CHx
æb$‚¢ÞŒÓøA*r£áfÃ=Î@¯O(ݞ\љB©ûbpŸ;)——i”&Y¼ÒnxÄËÔJµNa‘‰3˝Šxu‚.	%ËÓ~].ʓWŒÐåÆ˂òE±zŒ~¼áFãÍúiÆÅ WÊVÉ[‡e=úCÆodW”©jC*JÕ¦èRõ)ÆLó0”o\®Ø¨x{@óÞCö¨ŸÖD‡d=ºWù÷dï+?ç?×f¼$ûNé4r`ÓÈärA©R)ԍJ4ôݑâN
¥îÈÄà•^'½d+$¹Áhôr°|ä:•F“¬Õ™ÁäQôz¿Ja†êHð!‚åF^¡7htZ•AÅsF­F£PÈåÔEdԃ9…TæË¢Wh©CŸÓvãg‚*iŠ
+7¨Öªˆª›Ì*§pƒa-ˆ6ú¦\Áî€m„Ÿ9ˆ/›./`j…½äRy¹
(~©3©Üö逩ß&Šž
+12°ç¦’k
¤ë#Ð7éērX@…i(nwOŸÝ¥•49
+bCÐEÎt¡,½d„]qÀýRVܞ;l'EäÌ
9•¹à
+‡XŠÈùr)šjŒ™dôõÌ!½DÛVtGÎtȳh‹hé‰ö4Ðø@=+«gˆœïTI¼Dë²þ#XjÆJ‡–Ú
S€Ý°ÌJ£3æ/3Y©ÓÌË¥p¸8|¤go!Ÿ³÷ð®¼íwÙ;菼¯ïá†×ɒ¾ß8E\9KVüþ4P°À&t
+¸(9h#xwj@kÑ~Äï†üÝ<ãßËå̏z00l0,å°
Hpªu]f%ÖÛ3íYö ½Ñþ°æí^­Â¡MնۏÛy;ÝRîÜ…–Óè*Güfρ¼ËŒÍS·&óˆ#÷áèՑ!±«#*§;w;ôõ¤Í~÷ ºŒU`€å§ç…@Àç½åT]/`'‡
Cô(Ã,dJ¹L
š¨4Æ#ƒLéM¾uë°l¯¦º[äåæ_ՔãâèÎѱk—ÉqDzIsã‡eO{ú4÷ÐÖ¥‹sÇÝd|T5®bþÖ奄Ÿr¦‡ÝÔ
+ÄÅsÔ°	¼²›4wJÑK›/È$L2©7ヘY4WqhgôĚÚb߅òOEvKª°ÿ’jS¡Má~K8^ÐîÛ÷Ý¿(¶• §Æ±Éo‚2œ†R¹dU¦&KS¡¹Sq§r»æ¸æ¢F-iJ5„'jQ)•’B0+‚Þ‰`&DPb"|!©BRàQP«S¥
+ܦخ€wŒƒZL
Ì#xÙ:?M1HB©@²„
+a»p\¸(B7ÙÜ©®Øõi,¥§Ö4ØĨÐuØ{mQÁ{Í}Ó¨ßÂÄށôªîÈ?:”FL#…äûW1–€b©Pl(ã	DOè˜Ó©œ9‡£‰LFõ½ú¼&Ý8o}¹ï„Ðsåm+Vðƒ¾˜:èZÇnýò µø»¾4ì†è5¦œÜh<8+§ŠÆÞèõ¦ÎW4¶9¢gõ™Z1W‚‰ï8Ny¸
íFíˆÏd'“çÐE$%HÜÝ=Á¿WÆÖ˜·£
°^^Fo
x¹£WœèQÚ±ìfFO%Ñ3A5º9ǬÕ
SU¥t©ªèœ¢1W>ƒ»QRIZ¢rh,W͈›`¹^ºàž¡GÍ×Z¯ž¸'ø¤ïãüß¿Ë­§láóaí>ª=#郑h‘
ÝÌ›I±Xl¾Y¼ÙÌ«5.*é­¶¨
mô)’ïæ
Å~õ&Ædqiùez^Ö?ˆ¾‚è)½8buPD<v[„Ýòz#ƒî+©»¯ì«ðkáÍøÖ£•O²>|§Ð£3†Õ	÷õ=Ïá­kçÞ§…®*a¤áicPwR‹yø%
+^Éi½€E0¯Ôh›9ŽP…{
+»rÀ‡^Ѭüš‚çáy„+„¨
¯Å<¶ëb6S§
+J.ÑËNôþ…›=tKÙ}âdrïP£1¿’;¸5Ü[<T˜»ý_wòßíÛzؾÒýÁ>ü%~åʵ"Ÿ	Ë@F& î`EY”ZQ¶¶
+5¢–„6´>a;zHxŽû•ö0×¥}E{]HøW‚AgL0$$pi²TCšSr×Î2ß7Ë^#,N¸Õx—ñ!n§î!çüÙcxWgBfäÍ¢ƒ§jRGjSŠII
ˆz„ùx“KÃÅ»x¥èÓ߈|ÆØá¶ú$VØ]U1·GÉõ÷»Ì7î÷—Sg/¦çš¼71	,cRN6;‡E4R-’ï:qCø¥OzÃ|x?sâÏ8}ıœ¿Øû×¹õŸn|ò/„ùúÊoñ’?|‚g8ÿÆàÝ÷=þúÞ#á/¶Ð›šÏ†?ÂwÀî£B“ª@™|N֍Kƒ>Ì€v¡Ât;ùY€dÃäç èÆ´	h·:¦U2ӀJOú¤g‹½Ñ¥¢Û”™¹ïó*½);0”;ujé]¾{åÍ°_ûo:¬J&úMç‚éÝ©5äò4Vè]/´èœ¹ƒýÈg•´Ú-—Yîë&Ó»ےq2uV¹õ.ˆ‚:·ÛŒ\~Îì²+µ¢RÆ뤤^ís'RþQs«gdX‡$»Ô¾ÄÌÞw
+Ä÷
+@2s€MrØUCkTœè:0Ή²µž
?õ,Ø(ÀÈ_ŽÁ|†Gî¡×ê ²Ð{Öùq2¯ÄùR¼ù9>Øá 2&Gw9β§ilþ0y6¾¯c²ÞÙ·/mwóÆ#µk쒬;µ¾ÃÙ2ŸèY›ºJ<5köÍÓ6ƙJô?©(šÿûáxŤºiCÌqñ¸{fOí	!y"<g2׈vKx!YÁçÁª5“ç	/˜Öª	gÖðA-§·2Õ2¹Ó ß€ÕêÐh´É*Õv5v«ÕSԜÚn2ï»z™–Ú9 YØ5ZTXÂzwvà‚&„›DEAô"ƒBÔû¢*+uòè~z—–š8z¾C¯ïSÿËÆ®pMâPwþЮœQLä¿xë­ooÝ©›x?÷Êî“%ÕT2N×rçÁ:‘ý&ø šøIšm)&+5²Â¸B{±}»k·KÈ5åƺƚÆÆO7M¯2UÅW¸Ú\ïÈÞ5~*ûBó¥MD5þ¸ÉÓL$ã4sH-y_óí¯–/ìŸÆOô Ç̧Z®“™<˜„V]¢gìz,êƒú
+}›ž×·~âŒ=ÁÕâÉíGS옽ÚÊ?´ÑRlˆ]haZOÞØÓÓ˜ùbø놷oûÝÒ'ú<ϯh~zÿ²Ö'õD1b2ÎÀòÝá;ž¾ç»1ܾS§^zå÷^A?á+ÎG ® ø Žœ÷\ôOÔEì¹ê"Σrñ#þY2…yˆCô&ΫÔ-L®uûX‹ÛÈ9Ì5pkÑZŽk@
˜LÁ¥„ ĉ`néÝM*:uO?ˆìüûÏDýÄ}—ú˜Ÿ˜y‰™ŸØdÊá>Úð÷?S/qøs:Ox*÷Ø}¼©SïÄzjc>å¤šgé÷«¸ 6¨'z)5+W¤¹Fi´hmÆuŠ&E;T3T›§ÛiP§SM,eÆ2SY\­±ÖT·R¶L»Ò°Ê¼*nƒv‹a«q«éNóƒª=ê£âCùKÕgæo´}â·æˆÓƓFKL…8»ÙdJ6ªÌð¢×€©•¬V™Õj•ÉhÔhÔ2Îi×#§è$™ÎcNâì&…õ¦ 1hî&3‚êBcÐH揉±>¤Ç‰¨(^E³ŒzIJ !NÑp¥šˆ†h Dg¦&K
+»â¥Õ`v9ìbýҐÃƎ¡lâ¥vz
±×
Úƒ:]¨’J5:UéÐét1G'T
+°©t ·Ù@o;‚4‘Ï‘:ò9¾Æ’1G>:”P%ætݑÏÆ±û¤eôÆ#3~àΔè
G>Uòú/Ðk|Þĵæ鬟 ןøПèöÿµ+\7*)kõ¬Üð½bjRüb}ŸÚ·³uÝêedñ•W÷.›N×¹0ò9w¸7¿¼•O4'WÞ¨›4+1”¸Zyr}ÒÓ¦çÒOpZ¥Õa³f§¿gâÉLBÄl¬²ÍUÌUÎUÍUÏÕÌÕ.R,R.R-R/Ò,ÒvùºRôôvsÒ ¡IsTeêj_uj‹·%©-éªG4÷¥>~ÖSª½š'SžJíôýÎgI ôetæ(R’5*Þ!ùâxuF‚ƒžG9ÝöBûû<û~ûi»LowÛìçì¼Û¾ÍNìGÈLbèÙ (Ò3JŸ
Œ•P~1[rنïÒr1Θ›P—@œqrޙ¡vƒ~–dšl¹önrs‡<)
J¾àœIÃiŽlÆe)i¹ÙdzIav[6ÉA=HBR’>ñÂôK
هô_†ZZB}*M“Ù1½uÉ»:·6'،–617TӅèYW쨤q0e°Ë+˜Ó}Ñ(šDN–¨•â‘2U…Áðp™áÕ£óÆ£D¯V£b;5E©’ùùxäèE4êÒ)ˆ>èÆçOó¯[Go¦-¥W$®ºØS|) ¨ÍÿэsøPœ¸vèï¼uõŠ¼ä_¼¼sʨai÷N_óâC»¦¹võ"‹%3~ý±fÕ¾¼æôûøçâ¦Ðؼ¶äì‰ë&_™êöO¸u¡mÚÜiù^g‚I•”3jõÜ9»nzžî
á©òw…wÑxtúwð&Þ#J'9O›£+ÒM´õŒK7qü¬ºUƒt–äAاLKð
Ês
ŒIže+K¸Ù3kЬ‰e³B¶Pò‚AË«š’6ØÖ;¶&ÜåÙä³ëÄRâ¦SW¥OÉR—ª‰Zn9B& 1¨˜é3œS¹é1Èp,ùýÄ߃KP
+9r(sB’^ŽåÝ䎠^,‰’Œ»õIYb£HļœǺ
+‡¥%Ay%ò’Ç‚J)çÙgß´µ_;ì£G彗úèúö¢L0¸éñ&PCaù…^cÿ×èè=Ѹ•ŸÃE½ÏùCy¹$ɛÈSőϑ’òsdL¯LJ¡:Šy@µ´Ä‰ìL$ÅÇö%êՆõÓþÎQO-ÛSûä?›nz,Ø¹Ý5(!oVӆçÂûN}^óî»øß`ž?û`ÎÂÏþã£ðáÿŒ™Q½
+ÿÿƒïjª|óПŠfšµaËí3†­^:aSepé¢à“Å7×üiÝ.\¸ûæò‡û*·êãSn(ÅÚmÏàÄ_^øå7áÇö¶ßV{vmÓ'÷¿øÁ¥±Ko¼¶ïðG¿ž–bǓî|pÌú7lÞ1jû賓ÑþôØQD¼ü½ëí
åúCöÀý~‡Ôvýqá¸ì¸ü
½R´œI§uˆyx¸z¾G­È4ÞėÉËÔ³uàUª_ ݚWÕ¯ëÞÏrï*ßÒ~ ~¢2e2N®P*±L¦xŽSëõ¢N«Åz½VTc¤$Z5§U2ØÀTâËèe%“‘ÒŒ’#ڗµX›¬
%Lé”J°‘d¢V«Ñ Õ#6NÔÞ¦ITé+eÊۂªnÿBPV*kc_VÔIÜm$q
+Lt¢aõÉصmvçöññR/»€Õ]Ç<¯1g\yl·èõ›Ì	}B$gHAt§èÒÙjŠ5uB@“h
pè{‡' 2‡P\'zÊ ³ÿët
Ià‡$ã+Ý8ò
òr)°bëÃ;?~2ٞÜùÇð½ø®ÏARqøÛñY£s®„5}¿Ç7–…Ë)ÿV­ö¡ðÒ¡x´6XáÐc³h6Ç[ããy^äÍj«:žßk=¤{YÇY­¶x"%
SLS¬AÇla¶ò&q¦ažiŽužm–ã¦ø»¬;‰hwqœÑ¥VÆù$à?G[NÐûØ·kœ×š^åÔöºö‚
^&‘2„,ef{åG/•æ`T…7ã¡oàqÏu…;îÙó*Nøã8~å÷þ>üGò:®ÇžÿêÏ绾Šçü&üïðiœ‹ã;±úáOb¶¾0´u=Ø¥ëƒ>ɍÇ(œ	Ô¶7ˆ.=R€¨ÄJ‡;AŒ÷®k¾fÁ.LÆ<L¼åâ£ßšå¼Ìns؈L­Ò¨´*à}‹Ùb²p²xÎêÁF<l
+§[T½r~Öá¨cd4°Žx“=Ù±+ýÌ;€¿}nÎme-͓WÝ{jCøÜû«!E%ÔMÞ~Sè‰K˜4?|úä3áðÞÊì}C‡}ñô§ÿNsQŽ\p³»_0ª)ùä™ârôÛØr…Y.W9Ç)”<!J¹‚ç$™L(—ÔXÙZ¡nT·©µB)EÏå5P3v[ êä‰Ý¥¾TÀnã:˜ 6ñÑ«:ØO	Z í¡q
E0;
+fä ¨½²Až˜iª7zØ¡öä:3}¿tÈ`BL0Ž‚ÿ90ð»AûvNëƋ
¼Â‘žW¾=WÖñk¿Ç·]iƒÕ
šï— ÑÓϋÁ
+µ¶fu²y’ºÈ,S&ØÒÕ>sº7 j¾Q=Î<K>[]£þNõMœ.۞2Ò;2eRÊöôÝéò¡ž¡ƒ
+ÓÇ©ÇyŠÍðÌT+¯òT
ªHoK?›ò¹ç+ï×)«E×Mt¥:Mrv£_”P»Ï߆Ž£3ˆÞÖ^%8zUQ¢S£²Äå$稒m¶3V,ZƒÖ
+k›•·¶èq2Jt'ӟ֟ÓGô¼[_¨Ÿ¢çôvúu¶Ï%zϚ?.S§À…Ø©é…‚k-µZ™‰ä•=.5Æ,¡¨jpíÊûÕÙcZÖl¶éð²ö..yëž}°û7_î|zÍê=ûV­Ø3Û159»zN~û]¸àÃ1Þú`Û÷‹þszÅs\Ú[Ǐ½ùÒË/Ñ30+‰ìÞÿҠʧŸÍÏV¼¦àÙ5~U.?B1Ž¿Q±Lÿ´ð¹^®Aô˜äHÐ)Sš}¤\²`ÉRj!ôª{›…³h}’
+«Ø­v¨«*£Ô’Ä_Þ["‚à¸%l¾~ؑabQÂ,^¦&øŠÕá+ïü>ü]ã‰ñûÖ¼wHèùþÀ‡ák¿à¦|ßqìàüì|
­O%ÂÛ`ûÞT¥è1r…(vãœN´K§€8hïÒÝB-2‰ã¸ç
neÜÑw¹W¼=£CÁ>bÈÅ>‡º+dq hž»ÿ÷%sŽ®[™rƒè7<õ(þÖ}u¶ïʙ²-;Ž¼v‡¥ô¯I%©"QªDŒŒJ:Õ.ÓèÑ.î½Î­#ºç?Ý¿ÉÒ´C_J½V%’¾uÀ4‰7¤¬ZwtNÉéðT||ôðŽ-sþp¥ïìWá†H@Ë#¯ËvAïjd…=!å`yPµÝ¾ÝAjŽøønòPPo³›m6»->Nowñ’]H‰CHCv՜Ãnçp¼Í–œJÓݐžAvu$«GÉC`#4„<ԙø|žŒ¾ÇÁ»šT҉·æÒ»6TØÒ;Q×\_ïÀæÚÛwõ›©›˜Ÿ}H–
dñ4œ3Èåw£iˆö
”™–èÝÈÊǹ±AI
PZBªg{à‘ž’áFY^xè°Æ-<DµÑÌrx ÿõR&êI鿐L/ôß0¶áèùêÉ[þ؎-_ظ
ø˜²9£ÇBàïûþcüÉc@Æ&ÈN‹ÊæðsýóïŽõ¼ö2þ]ËÃw7·<tOówÍ2å·ÿÆ÷<ö
ÍxŸlyxkÍd=r>‘yÑkèMÇãÁà
žs)U»UgTD%¢VÀ%Éå²ò6Ѐˆ:º±±WP•k$-–´¥ZzŒÉSž*_*^ö³
¯üò€ˆ”ÇœÙì1ô¾“žO ߝ8Ñ'zúž&s¾G:ûJ"‘è=H扏ݢû.æÙø:@NõŒ®óŒ ö·lÈ[ïZ+qž¾àE¼‚ýe¬'þš’ÖÿW²¨·Y ÒÅþ.$«'žƺšrÝÏ8$	³"}|3ºƒþm3ˆ7Ba“ìY´	¿‚Y˜…æ
+¯ Ç!}y‚ø„¡RZB1„qxši€§C˜a&´õ Ä7Ò2P¿Œÿ+ÚñþyÔDó!”ÐƐDۂø0ô)ƒ¸‚	êdÁ8”ƒø	AÙJ(³Òžå›#ð+‘' mB¬Ÿ`…
+7j€X/ *(ÿ„G Ìh:'(·šyZïOÑqn†¢Oq®#2rçä:y¿I„°Ì'›(Û))WQ£ø‹r“Ê£«Öª_Ö4jÂÚ?ë^Ô}¨×ÏÔÔ!n76œ6æO¯˜rÌæ3q%q›,NK“å«Æ:ßúÛ`Û{ö±ö·í_92ã½ÎÙ	³]Ã\ûÜ÷óRµtÂC<£ã+o­Ü84$P
â`ÇQ&
ë¥Qõ±wÈå&#úMúfOŽÕS±7
+`fEæÐ-؃y¤Â-1X@6|[–Aù1XŽNâ§b°ùHMV¢-䞬âOp¶¬Fóågc°-PÄ`­¬KñDÖ¡¹úY4¹V߃$Å!1˜ ¹84s(S¼!óP¦.H#.Á2(¿&ËÑ|q}V “øiV¢"ñÛ¬"•†‘1X†˜v
üUÕә¬å昹¬CÖr	æ)Ö5Ö»,б>À`K†Ár–ÞÉ`ƒ_b°’®‘õíkd{+ÃÙ>ˆÁ°F¶/b0¬‘}|†5²OÁ°FöÚkd_ƒa#b0¬‘£2Ã9þƒaÜûb0¬‘¤Á°FRk†5JÄ`WÊ«é\Rîe°†¥?Î`ƒ£mŠt.)‡lؘò
+ƒÍ¬ÌûŽcí|Â`Kÿ†ÁvZ738ž–IŽ-–Iu3ØÍ`?ƒ“Xù|§1¸ˆÁƒ)g¤N§°‚?³¾RçQXM_Ì`6—ÔåhZ	
+i-@•¨
+b	í…0Õ0¸5 %Zb¥$°
¨	`ú¬„ôZVB‚”:¨Ÿ
ÐX–^ùÿ°¥Ì‘Ih:äԡց2͐6âhCP>YhpÊf©£ FÄÓ ÎBC«5
Úk†Ð„–Á³J5A~%”¤9¡:xkúÑh‡_SRúAÙáhk±y`tÃà)¡Th©ÆÙ9Í@‹ƒ®ië¿Õ¼Z¢ðpõí×£_ÕP³žõ¿ÒhËÿ÷q-A*Q-Œ¤…ˆâF‚wZ¦%ÖêLX	•²úò±þJà9ú^Àp^	åi½´J±¼œÕ¤­eüĘ¢ëÛýÒ15BٕÿµTˆÑ-·œjá@¿µ1ªÌÖ¥
͏z2Ë©a”S	£I{Ë©e:ž­lÔÑuˆR]1l$-Ëýxk‚±HPª2FƒQJªe¸¯f”Eim	ëëZz©ŠµUÉÆFkÖ³é¸k ÿzÖbûu%ë¯*¶Ñ:êæØzT²9Fë­XÿÚ•7ÆV0ÄpÓÌ(/:»þªŒ¿•õ&±®UÿÊSÜÐ÷å¬íšk¨–m`mEûîOb»%†‘ª¥6ÿ¨\´bX©…8ÚvU,¥•ašRÔUšn`ÛÄ0ZÇêӑÒõ¬ÕêÕ_ëµ66Ó(ïÑ®ba
ãáºXêU¼ÖÆ°Û›I-+ßÊÞ®®j3£Ò:6ºŸ¦‰~™Ú<0šWÏÚ»Ú•
‹c£­Œá¿ŠI;)Æ¥ý8«f}/d©Ñú”ÃjckXÃø®1F#
ð¤½,†íhW¥|%[«(uH‡U±ùײU«ceïE©q	«ÉµÔ];@Y”óWÄV¦ž†Òæ²oEåNÝÀ8êÙÛUêmùÁNÔüƒùUÅú˜ÏZhe˜®¾Ž6Ch)¤÷c¶•ý}ñþ.`´-1XÁpÛÌè®e@žDWŽ=Êï-1©å¦æ•]•žÑÜz¶"•h«5m·Šå^¥´hïÕ[ŒKVÌ¢¿ï%LfÒüJ†‰¦X”‡¢XlaõûGÜßz#£¡z&7ûǖÁö¼È{i&´K?¬Ôµ6ƒI§z(QÃx© z€–°
+±·f4Ñ@tÅ3Jþ¿ÛÃrF1Ѳ¡kz™’~ì÷㠌
Ê£ðH¥;À8xNbéE2ž”6ÇÃNPŸ–:iÙ_2Q1YRãj=ýéQ>‰b´1†ó«4ú¿ÛÅ®®L¿Dî_çù,w%”oè³j@¶Eéùê~t­´ŒJŽ«r4Ê¿µ1™Ùã酬•Ð€L¤ÜZër÷²˜,?°Eûlù0Ó/;—H§PŒãB4ÝÄäGKŒŸÄèñ§ðÕυc¡kZ¹ÊÅ?î¯:¶R
+œÏ$ctÔóc+³$ÖòO­P
+›Õõ˜ŠJäSŏ{î—mTŠU2´z­‹a»9&Cþ[ßû3!媜]ù£µÅ´Œku®¨ô®d#jd˜­i:ÿ›5—b´¸äÙÖß/•$ÕÓµ×ì"M×èÈ饛®¡Û«{÷ÿŒ):ºzÖ~?]5\×Þr¶þ‹Ùj^«‡öËÇ«% lTCme§í×Ì':®k©»>&Q£ørUcŒ>®JÞëièšÑUú˜Èæþã•ë׽螊ihÑÙDõ½*¶ªK~°M?À÷Ֆ›™¶J5’êØ>´ŒéFËѵÚÕÿùê÷·×Óÿjc¶ÎOiq?^Ç(¶®j¬U¬ÍóqÿŠUþ×þ/ö*–ÜÃõûýõ#
+Å´ØØ{ú[ öÉ(µRA‡ÏEù`kIðoƒÁB̅…¨—`&*Ž•Ìbÿƒ#>Q8å@ µ†¢<°h ­ÿ_ÛëþïïŒýy™?ÀÞÀ~8cechAeUHÚ+ͨ	I%
KZ IÓÐÔØÐTÙRÛ°Dj¬«ÊÆV¶TþŸʤIÓêZiJ³4q	Ôd
†Gv†4ª®NšV»°¦¥Yšj5-Ujª­¬›ZØZWÙÔßìp–(ÅR‡Ï
+55Ó²3†eK©%µUM
Í
Z±R×f²„’,Ú#Íhª¬ÕW6-–ü£–šBk›[BM¡j©v‰ÔEgN—J+[$Ÿ4£Dš²`A†T¹¤Z
+Õ5‡–×@±Œ–`¾
›*kV^›’Æ6U.¯]²Ö­Ô–¦5̇¦'×VÕ4ÔU6§Ó֛j«j+¥é•­Kªa€¦aÙc–´„êéؚVJ͕€A@Rí©:Ô\»pIºÅK”ª¬…Ìú†¦TÓZ_¹†/UÕT6UVÁ4ॶªæQ¹D‚¼•tþµ€òF˜`¨*ÔÜÜÝÑ	UBû­U5Rm¬):ùÖ%!iymK
CC}CC5­Mav¤
+Úܟֲ<´¤¥6¥«hmZ™!1L7,5UÂZ·4…*[ê!‹V¨j…õn¦ÑÕ5±!,h­«º¯o€Nj—T·6·°©6·¬¬]‹	J©Í´—PS}íV¢©a14[	ã¯j…Ž¢X][¹°æ/¯
œK5¡ºFÀHƒ´°vYˆ`$_)Õ
:¤úànIm¯ll
—T… “(ºk)²¤Ð
+˜L}¨n¥skÚ©£mÔ×Ö1ô¶Ä˜¨9Ö_Ԙ’Z›¤6CK[é`[«(þ¥
0eh&ÕÒBé¦Þ‚uo
Ҁej”1ò„×úʅ•«j—@Ó¡–ªô(Ò zumsc]åJÚ­½$´¼¹±²†Eªaˆ-µÍ´aZ¼±©¡¾µ–QÓÒÒ8<3sùòåõ1‚ͨj¨Ï¬i©¯Ë¬o¡ÿK+³¾y^%xMü_VXªƒÔ«2yʌ‰ã&Ž5câ”ÉҔqÒ¤‰cŠ&O/’FŸVTTR4y†V¥Uͨ
´öc¢˜®	fÐÂ0ú,Æ&C	™ÎyþJieC+­YE©
ðÌø(J–@ŒFa}ý–@ñʅM¡¥Ä©ªÕT4̧l5[®¥Î唜B°p!Šé¦PU¬óÀãÕqÑ%lXbEØԃ¥
êßÚMÃ0€£®™PJsÿ €P1P™R›´¬²®µr>PXe3Pȵµ3¤™KÍ®ìŸÌ)&¹€¼+¥æÆPU-Ï\,.aÔFëVVW×Ršªlb9&71Ü2îþÁ êjëk鄠VnyCÓâæ(‘2zd‰
ËA ¶Î¯«m®¡ý@[QtסÂøa©WJQâaèúŽ>&.¸:9*½–¶†šY7 ÷ªBMKb3hŠ›n®ih­«ZVZW?š>-+	P}UÄ
̆ÅkUËÕ5¦«ŒzÁO7ˆ<P!Æ÷±† ŸÊ–á´ÀÌé£`H–›?HÊ2lpVnV–R9³³†Éͅg~N¾”?4/Ъþ×ýÌHß2cÃc|¦j3ò¨RNM´•Xÿ"P¾`jCÞt¦Q#‘*mÕÜCÜ
îEî„Ã\÷üÏ.ýŸ]úèg—þÏ.ýŸ]ú?»ôvéÿìÒÿÙ¥ÿ³Kÿg—þÏ.ýŸ]ú?»ôvéÿÐ¥å®då*ïãÔ	]ç`^ÿÒf£ðkÞy?„/æÇó7À3p]Tÿ·V&3ž¡²':û܎çã‹ÿ^ç§á»¼(’Bÿ÷͏Fy‘ž³¢¯!D pÈ
ÏLS ̃°
Â.2VŽ¦4@Xá„‹,'ÈY;îË	vCt‹:Õe³×ÊèëÜröÚySY4.™ÇNŒ-6$7šœ1:§¤GccrvUÚìã£,œáèåËFxbré1Fn´›‹Cí'‹¥9cg’/{×1ŽG˜#œº#Ç9Ü¡5dR‘ù‘›|Ez£9¤·SgÈÞ5êFò´Â1ù|>&£µä<ý6&<!ì‚pÂi_C‘óð9ŸÈGPêC”	¡Â<» ƒð59ùž"ù3½
̞.„@ȟá)’`ZÀSOÎt–œ…¡½Ý‘È>Ìfp'Çk|0Z²»É:¾äî&í”üîÝ£²È;¨ÎށÆßA„R!Èz ÷P„ívCh‡ ƒ:ïA÷ Îëބðʂ„P
+AAÎt@7Ýät‡o´{”…üž¼‚¬€ÔSäU¿I^fñäw,~
bį“—;\n4J
ùꈋgB¾@~ۙdtGFÈ1@ž™
+!L0Â62rŒ$vT»ÐÈôºAÉô‹ŸFO(Pp‘;è4&чoø
Ác—´ËG‚¾;á•>|÷Ü}øÖoˆ>|«Ö
D¾ºeч¯z@ôá›3 úðM™
<ºÉc/$¥¸ó§,ÆÒ(=YXZXZXZŽx²œ~з<ÛÃiinú%ÿ 4w[n;ŠÛ¦á¶'p[·Ý†ÛÖá¶Üvnóã6'nsᶠn;‚‡
*Úp°ëº×@ІÛ^Çmûp[3nóá¶dܖ„Û$œì&žŽ‰9,*bQç(ÊWß02[côF=@Ö`ûcð<
!ÂނPHJŒ¶»hœØ™V}ÏžÝ0jy	*¾Ëð:‡z	Èè%h„ÞN×óÂ<Ç!|
!A¥aàÛØSÏL…æAXák26œ¯!Ôâ~6°ÌØ §Ð7ò|áã!ž`‚èýân›ë]xŠ+â"ùÈB¿`4(ÝX{èßÚÿü[‹”£”ä²
%ÀBlÅÛ:¾Mpwã;|GÜ£âðÈÅÕáòádˆ‡¡föž‡œ
+ç"'yâìç,¨¦ïð¥»{°ŽÖ:äþÖyÁý…³›ø¹óˆûR7;ÜïBÊs‡Üï8ït¿–Ù­€”£¾nQÄŠvsï{]u¸o£Ñ!÷çx÷b'ËE3ni†· Þ=Í7Ç=
Úëœï6C›‡Ü…Î[ÜÑRy´Î!wÁÓ`°ƒœ¬S¯‹583¿×Óå;ä³åSäCåÙòt¹Gî–'Èãåf…Q!*t
+B¥P(d
+^AHa¦Ü×O¿\a–‰ì¯\òôÉ3X¤k›}‹„ýyGA7¢vWLŠ§ÆÅíÇ«Pñ|©ýòto7VMÓ.xGãvc1*ž1º}˜¿¸[™Öžï/n——Þ<ûÆ÷”Aj;Ù܍ьÙÝ8B“6ÄÓÝ~alØpw<S7Ü]V†l–e…¶BãHC`Ü؟xTĞ×üSÛupBûŽâé³ÛŸM(kϦ@$¡¬¸ýô»ÆÿÄ‹ÆÆÿ QÙìÃÜHüÏ¢i49¶¬¬¸Ïb各ÿ
å€bþÁÊ)\H¢å¤pEË=-—õ¡\ œR‰’Y¹d¥’•ã1-w 9©h쁤$VÆ
+ª'+Ól•®-óz2”INfe,mèuVæuK-Ó>’q:¡ˆËɊ`r²"Nì`Ef]-’+rç@‘;YO¾ZÆ-£=ß_F{Êøÿ·?¡Ñ~?îQV5·(ä-ªð… T´ßµ¬ÆÖÞ6_’T•Ñ©óU̯ª¡qe¨½ÌÛ^å+1÷'²çÒìÞ±ÐÜ¢³Ì
†ÆvŒŽ(òVŽ-ë_š›]_wô•[ú•ÒÆri_ãó";Ÿf§}åÓ¾òi_ãƒãY_ˆÑxéì
+4ºlÌÜhÜIÔ* ×ŠxOÙh‹Ø8’ïí¶øPHö µ¿¬]ãÝ®…@³<Šf
OÑ,$ëcY¶ÛFxâ{ðžX–ÉïhäoimnE¶¢Ú±Ñßfø¤–VŠðèÓßüß~ ¯¨=X9¶¹¡âö´éÅí…SçÌ> —CjRûðþ4µº¨;r<š˜
‰Ãi"Ç
¤i4M©Œüñú·Æböw{ÚȑNta0êʸvWñ¢`Fì¿Ì÷€ºD·‡æ2˜`3öãæþ6Ø°c_Et¾ý¡¥5ÅðЋ£µ Js?:~ ˆªÿÞʓb
+endstream
+endobj
+27 0 obj
+<<
+/Length 514
+/Filter /FlateDecode
+>>
+stream
+xœ]”ËŽ›@E÷|ËÉbTµaF²,yü¼ÈCñä0´=Hc@/ü÷é[·“HYØ:@uõ鋊lsØúnÎ~LCsôszîúvò·á>5>=ùK×'…¤m×ÌñÊþ›k=&YX{|Üf=ôça¹L²ŸáÙmžéÓºNþK’}ŸZ?uý%}úµ9†ëã}?ýÕ÷sš'«UÚúsèóµ¿ÕWŸÙªçCwóã9,ùWðþ}*v]P¥ZëÆOuñÉ2ÏWér¿_%¾oÿ{VV\r:7õJ‹Pšç®Xãj
VcÉÁθð‚¼—ä¸"oÁ/ä
ø•ü
+^/üF¶ž:Xý–ûZŸ±šÛžŒú"';0ýKô,è_¾€é_â,Eô·zúK¦U‚鯶–þj=é¯È¡ ¿ƒ[Aÿnýw¶–þÎzÒ¿2gúË[`‰þpú+ê…þŠ¬„þœ…þ„þºÓ_ð.„þÎ%ô¼‰ù[ÿ˜¿õŒùÛý˜¿íý͍þÛ7æþJ‡|”þ‚w§ð—|mó‡§Fd¥ôßa/ùGëI‡}•þ²Õ˜?Ϋôw8‹FœWé_šgôÇY4æ>Žþ‚}]ôGcþÎjè¿Ëmˆâ´`œ0ïÆ4mîÓFÔ>
+6›˜Ê®÷¿ã0b•ý~/êP
+endstream
+endobj
+28 0 obj
+<<
+/FirstChar 0
+/Widths [ 600 837 ]
+/Type /Font
+/BaseFont /EAAAAA+DejaVuSans
+/LastChar 1
+/Subtype /TrueType
+/FontDescriptor 29 0 R
+/ToUnicode 31 0 R
+>>
+endobj
+29 0 obj
+<<
+/FontBBox [ -1020 -462 1792 1232 ]
+/FontName /EAAAAA+DejaVuSans
+/FontFile2 30 0 R
+/Descent -235
+/Flags 4
+/Type /FontDescriptor
+/StemV 80
+/Ascent 928
+/ItalicAngle 0
+/CapHeight 1232
+>>
+endobj
+30 0 obj
+<<
+/Length 5935
+/Filter /FlateDecode
+/Length1 18552
+>>
+stream
+xϒ<
x\U•÷åÌKқ¦MÒ´R¡x›he’”Ô	àv’LÒi“L˜™ôG—ݾ̼ÉL;3oœ÷&i`+(TÅâªQ
‘Uµ¨ÛeªÕuý_»»
+õ[×D@W—Ut5,·{î}ïÍO2	é¿Ý¼fæþœ{þϹ睬\^'‹ÉõÈæhZË6+
+ÁŸo¢4EÇ-ÖuNâK8þþòxv,=1Ñ#pNîKMÆÕvs5!žwàü7	]‹ýü}?ÙDˆz=Î7%pñL
Ώàü‚DÚÚ÷såÍçßÇymʈj-äªOâGuZۗ}¢êJΟÆ9Ëhi=ÿ…Ün-&äŠÇ³†i½ž¼ù!ÝψýlNÏƟñ|—ž<“À5…HöQ"¢TËùÿñe#9BÆç‹ä¹S¹gq\~#®Ü]u?9@ò¸òeåaåæª6\»—<CAțÈÃpÈC”­d®ò]µŠüF‰ÇeJ³rYMµ‡x†<xBž#žŸzŽ‘K=¦ç˜g·ÇT6À‡Õíê½ø{|µª‰|ƒ¼ŠQ#&ù,ü6Àç<½ž%ä18‡ÈSHí4’{ȵÈK³bëª®­
+áÊ×Õcäv|Ü?¦Ü¥<‚Ü}V¹'ïOÕr—råz˜<Kn€HÕuè—ªâÈÿ××1<;1=D=®P«.Æ5äiÊÏUЦ—Ï3ä:¤!÷T©n®YƒT„ÆîU¾¬<]ýnr7yþÞßSxÖx>æÙBÚ€Ýä â¾]œ©Ž+“(»x®Ø«&<»•CägžÝ5£ˆû«B"¤ù@U%Š“ÏáïDuÊt¹rnFNÅî*r¬f«§Ï#†šý(5!l${pt-ù¹Ÿ´Á9ˆ˜¤¼Õ—ªÏâÉ;=£Ì•[«ž%Ç —¬#qÏ/Pפ™)Bª©V=P¥/k8\ÕˆÞ|ÕNö»V·ygLYC
;L†×O²#'Nïôœ«î:¬žwZk{Z×<>×æãmÞmÃ;Ùáçý½Vÿî^\ïÄ¡˜á2®û{åž zXmÅ?Ý‡Y4Áni¸eM×-
zWªÄù”'®ÞƒÙ¨†¼róbÏs¤ú9¥V½®ÊC:¾òèӗ†GŸ~ôéõËW7¶®n\÷ÿ1áÜÿyŠOÕ,ùý¯sÕëˆJn$߯^ïù©G´ >ñ"eµ²éR|:_±¥QY±¼YÅÅê|Z.º\¼pãkÄÏ*GžÛ©©©]uÁšÐš‹WÔv(Ÿâ!àâ}žñ¾ê¹~ÁªšKxXù$<ÿkõP¼üÑEµç5,]ºlå¢Cü‡U·ò46-ÛËQÚjkÄzÃy5‡”–çMeõ²eMÏ?æYõÜv†ªÚõ;oLÿó¥Wü–¼ªVÆí·nüÝ9Å(æSÕëQ+˜3‹>’æ«JC}FèWaTÆ«@}b§YI‹´£Žä>i =Ë«V෈ÃW*¯+ày
§Bêp¦8§<ä#Îpý£Î؃ãû±Šù÷óθšPÌö¸–4btÚã:ô÷'q}Ó7s/!¯Yv—3n u˾팉gِ¢âY„­_ö¸3VȊåÎ¸ŠÔ.¿È®w8cŽýÎX%ç,ƒ3®&ÍËMg\KZ–ßäŒëH×ò;ãúÖ®åO8ã%$qù*gÜ@V\~À7’ÚËïè1²“¹äXÂbk£ëXçúõØè$ëNZ¦•Óµ´—2ÑvæK¥XH@™,¤›zn\µÓYG7‰£m<½ÇȌ±n-1ÇÁ^}¶=a¤eÆt“i9%3,›M%£,f¤µdƅ	k³Û0ö–LK†Ûõœ™42¬³}ÃF{¹ ndª…B$,+ÛÕÑÃõñ|»iäsQ=näÆôöŒnõI0Áƒ¢ 8[kê:ÕSÆĺv¶ŽÛYj2›0Y25r–cñœ‘f¾œ>î°âҐÊÛ*%Ci‘:J¦1›µ‚šiÛ¼?t¶AlK6ƒrÒ¤³rZLOk¹½ÌˆÏÄB鰞K'M©þ¤ÉzNGZc9-ƒ¢{Qv¡ÆPÏ^fLËL²,£j,‰*ÐX™¦i%tWOѨ‘Î"¸°ˆµ¬gLÔ^‹TIË:DcšiѤ†ôḧæÓzÆÒ,ÁO<™B#­å
6âÖª¿eä°œËGu‰&–DÁ’£yK<в^4s4•	N&’VÂÈ[ÈL:ér¶*mÞDx!Ž—¥u!5•b&¼%4¼‚f‡‘c¦Žv@è$²êˆ?ƒ´`Ñf…¢-j«NšH cÍ: ÌÏç2HP—c3
/3ó£{ô¨%V„|q#…Î&Š™XRÈavQAtÚ¨1®K	l/’œ cXhÓ^VÉ=ÀÞcfBK¥è¨îh
ÙÀ(ÑÊä42è9–6rzE±™5™Õãj·™*ßMk“-x<–Œ'…£i)]ˆT‹Å¤ä¶êD€j9ä+ŸÒrTŠéfr,#Ù³c	Õ¢ˆÄ'\~̙”JŠ¤Â´TeǏ"6d/“šdÉ7§Bœœ.Þ$¬˜B‘Â.nxèèszNš0r1“µâ°EÐv7h‹Û©2´Ì€/£:F’ÀšGŒÉcú>#†iÙ,†—6šÒņ-;bZ4JB³XB3£ž)Ӊðº¢wÇX>s.²J%s¶„óYÕ4R"ª¥Ù„‘4–ÙcÅÌjѽÚ
+†q˜1¨pՓsª2R˜°E=Lmñ³¾àP„…ƒ}‘¾ŸÂl8Üèõ÷²_ç-^¶#Ù‰0„ù†"»X°ù†v±m¡^/óïùÃa±Ààð@Àk¡ž‘ÞÀP?ëÆsCÁ"ˆ4”GT
X ô‡z¶àÔ×Dvyi_ 2„8‘¹ó±a_(èð…ØðHh8ö#Ž^D;ê!ÿ …@D=Áá]¡@ÿ–ˆEpÑK#!_¯ÐÚæeˆ,ˆ"‡˜iG.óo‡Ã[|¬;	GB~ß €Úé
+úi_pd¨×	‡X·EñuømÞP”ž
_`ÐËz}ƒ¾~!ŽKD€ÙâÕAŁ~ÿ?äð²ð°¿' ¨Ç@Èß‘¨{ÔĀd·'8ö_5‚ç’ðÒ[ü’
+àÃ?=’3)þŠ+ðD‚¡H•°ßË|¡@XX¤/Dv…=ƒ}ÒFPŸÂxC¿ÂFbm¶w ”8íØë÷
 °`h,z—_TÏZ·à¶S£L£vîôJ¯µ“ºp×^“C¼–0²ä­cg·â…-®c¯zeú@ïƛÈN½±q3 )R‰‘£†H&ISF:^iþ󘩥žQ$¡0Wj)<fØ,(ê^†Ù\Lä’&¦åq5—¼Æ¹†sÎ5%%`E	•br°ùÏéfo©ä¸žšlG؜¸Ë$'ÉÖjiGt©¾¨Õå–
+“Èc†E±¢kg”ÊŠë´K§…Ö²g¦¢vÄN¥¢Å:ˆbDg×AN’JL¦{gT(P‹=Z‰¹µ}yÔJԶËV+Q;`O«V¢g°V¢ÅZ‰b­DËê‚S¨•è\µ[x­DKj¥Òð-+—ð>Ç$q¦Ê%ê”Kì´Ê%ZÆ®|o<Ó%Íì´K&zFK&ê”LìÔK&:³db§R2ъ%;™’‰F|Û·Û¾-§TÑ¢ä§SQ·:b§SÑÒꈝRuD+VGìtª#á¬eR(|蜅;‰Â‡Î_ø°>T>åµÃ4–¿Y
´¿Úçí\uL$÷&;’˜AöµgÙ'Í蜑b,™$9’$c$A,ÂÈZ%ë𻓬ÇgŽF‚‘n„±ˆ‰¿9¢¤‰W$ƒðí8ò‘>Œ„
+¸L9Óñ[Ç3ãøCHºª›
+T#Hii‰¿2È ´àCÃ3'G±G{ðÜv’Gˆ(Âj›.OhR"†X2ø™E˜QěD8†ç
¤®É½™x‹‰øìc·òêvÉ¡‰x
IµùÜ@6–AWÆ—'lY-ÇBv9ï"øÄøq„oG8¿s(.Ïæ¤ÜíˆCÇ3}%Ø\=¸¶˜mq±'t«Kûè¨%ƒL ¬°Æ™Ñ±Àԏ;““'“¸—•|[ҞB9yBx€À:>C+3å(úP¾Ì‡æ’†âSIvÛfŽJµ6ۛ)i;‡.(BÎ|\V¶wQæ$îP9²äŠð²´Ôõ^\3Ð/ċlXâKKlEïOJžrOwä“T2ŽÕ½ŽÝmkÙÔl³ýÙ+ù2¤õ3ò|։0›‚X-ÇǒŽh‡­iêà´$3ý)*á„ÚØ]ÚæÝöe]Æ«í{-%^Ò"-'ÎÆä·)ùŠâ͑Ê(ˆ¢‡¦%Kî¸ú‰ã(åDÒڏE
+"¯þ-ô_ÛûÅ¢NÄJVFM)Dåi—›˜”À’¾6Š»–ܵiÐy(xhŽ"gy‰ÅÖɄô„Ì:–£™´\+•È•!Wæ•6·y©Co‰uÄ8-íiۚ–dO{çÃ[³Cf&1Ûñ`ãN:Z-·þüR»š³¹Í<ڒ|½®(фÔGzAÜhˆË¬q$ÔK(Æ䧠á•ßB{"*ñÙ0®ý„§œÌæZ(*iÇ$ÇI‡Ó.‡;
123mPš‹Š˜	2o9Ñ`–Áº±RÔXi(=Ǥ̚äœÊÜ\îk¶6ì»D›Çž†¼å˜cû´ü.揅Ø’7‘¸95G¢ö2MÍwVèdÒ¹[lêBçqÉcÌñ¤”ôÓ\aÅæTè4VbóR¯soPMވI™3RrFÅ$§Â^™mŒ•Ý«6%7‡jÒ{lßuiÌԏù‚2¹\RG‚¢‡iÒF砜ÎL}TâÍëØ;%Ï%çÈæ´`œÌ³šÌ+E¼îŠYðH7^fÞº“çt)…KiBJ“ç[*܇-¹gž ¸çÞ¶-%^fÇÌÀŒûeTÆ»QÂkމ×OÆq7YAc:Ù'õœq"9‹}{i2£ê…¥v·yvWhÅHIÈÏä·éð¨KOšËOÜ\W)wÇäM‘v/ÕW%­Ò͕ÚðTcՔYÓ½«‹ÑæF’¨R…Ú#çœ(ǘ•½?Ç‹Ù÷¡ð*ZȪ/f¦š[ªQ'F,ç>Œ4µ…ø% ™ ÄY„ìÀ:2$÷¸Æ°ŽáÎvœõâj¯´‹Oîˆý;p,0ɈÄeãá§À½Wn&çb¶
ᇗ8ë';%
?b#gA܃¸:€ß~NœèÁ•œ‹q?U¨MoOEdìˆs‚›Ó®©–s]ÎqBü[œ]âH|‚¯¬ÄxÈáÓÖ\Hb:˜Îäh@ÎÄê~#\XêÓ'e¶¹’2ôá¾-‹_r`[Â樿‡‘¶€èG¾"R‚RāôJ;
+yzåyAu›„²9:Vã"–vG—6BÿÛ”ÃRþ
|˜”?‚+iâwñº¾Ó/1¾©Ôƈ”Ï'õ”º%œÐ¢Ðç@ÁãB%Vé‘úvœ÷JJ>©‘pEI\l¥Ö©ä´@¡_Ê痚ÐaÔ£á…ÛRÖG×6NÛïmŸ(Ñn”QXö*¤êw|Ê'uW.…°ÓÉQ
+Û>糧DgEë9Öuù‰Hʑ
+ZÙ!cÑ/¡|ÒÖáBŒôÉøt8)xX1Œ8þ,pV®_7Ž\¸…ä—K»Ü‚½ÒŸÃmØt¼vîò㽕ï9V!o—ßÜ¥Uc±-­;½%¹¶´°³p¿„Mπ+®ÚoKöU|×)­Ý*½a»oÇv-ïV½ÅêÃÎÝö;QiÕ“õ¹]š…ªÄu Q¨L&änñNÏ:½£ì=OPÖäÝï-Ðrï¢".»®Ôdµ ¨™´9÷
Eg½få}oS™cË©L„|yV¬_3ãmØíÿ̶
«hW–J•C©þsÒÞYç]*)5,êÉvoŽ¸ïeE
Ø}µô«½O`ë"3»
+Bc%œÇ¤®)±{t‚&•ùÊíq½ô]§3ݗ}9õƒhY?hfåõâõƒhÅ~;Ëý º ~Py%-á©Øëp!ÖA­Ôa¡/Y_‰Íê+Ñÿï+•ô•Š†?ξ-»a_º¾­ð¶örè+ъ}¥¢Dg§¯Dç霝¾%'ÛW*þ­Ó™ì+ã­¼¯4×í;wwÉ~?·+‰—[w‰’òîRåîÆÙé.Ñy´ËJ4øòî2Qéc³«™³ße¢/ã.Ñe*¾ëžÍ.}Á.;k]&z]&ö¢u™¨ÔÁvĺUrkkۇûg¯wD+Úü¥êÑY½#ö’õŽèœ½£bèÅïѓè͇÷Åí¹™uîevLJžBǧ´Ks&;>ô´:>³ßÙN­ãCK:>óõÎD‡Æš…3)v¨¤#fí§ño®:¤^öâo‡ä-&«¦vY¿fq­¼›ÿߜÉÿfYþœxy}¥ÿ_‘ªë7ŸxŽÃt3ü¡~ß	¿›‚g—Ào9ü†Ã·Â¯—À¯¦à™Vøå->õ—~1ÿ5OOÃNÃÏ9ü¬þ£~Êá'ðԓaõ©)x
ŸÃ?îPŸ˜†wÀã~Äá±Nøa3ü`
+¾Ïá{Mðïûá»Gáß8|Á¿³Ž?گߏöÃ#ß>W}„÷υoqøWÿÂáŸ9›‚o>|¾úMŸÿÔ	ßàðµê×΃¯®€¯pø2‡/qø"‡àðÏáó>Çá(‡Ï6ÂgÞÚª~†Ã‘‡ŽªG8<ôàÕêCGá¡ë=~ºU}ðêÍ'àÁ͞O·Âþn
+îçð·søŸŠÁ'—À'îkU?ƒû5©÷µÂ¡&ø82ýñiø‡r¸—Ã_7Á=>òá%êG:áÃKà¯bp7‚Ü=âp׫wqøàb¸óŽ•ê1¸ãöõŽ•p{|€Âû9¼oª^}‡©zx/zï¼çÝKÔ÷¬…w/¿œ†wÝvT}‡Û^­Þvn»Þsð­êÁ«áàfÏ;[áVïx{»úoo‡[PÌ[|póÛêԛ›ámup.܃·¢¦ÞÚ
+áF7¼¥Q½Ã[áÍ®çp‡Í'Þ´¿ú&û÷Ã_ÄàÚÈrõÚV¸†Ã$‡}K`b1ŒSÈs°¦Áœ†Ü4¼q²©Õ°—ÞÆnuO’ûa'q:‡‡(‡QZ잆?[Wsx‡×sص“ª»¦a'…+Vª;:a;‡¤<Ò
‘åVÔð9j†«¶.S¯â0\ACƒ
ê‡Áà°
w¶qØhP·.ƒÀªz5Ð[ꡟCßø§ —COU›Ú3
ÝGÁ·
6sø¯»²I}]3\yÅRõÊ&¸âòzõŠÍ'–ÂåõÐÅá2¯½´Y}í4\º©A½´6m¬S75ÀÆ:xÍù°¡:/©S;9\Rë;êÔõõÐQím‹Ôöh[ÞN¸øÕ­êÅ1xõº&õÕ­°®	Ö^Ôª®õÁE­pakzáRh­ƒ8¬áвV£œ«›€ÅàUÓp>Šp~VÕÃy¨Áó8œ;
¯ì†•8YÉ᜼5õ
++ðЊ•°œC3‡eš ‰C#ÊÚØ

ûai–p¨_¼B­ç°¡¯€:´
q¨E°Z5ÍPnzЖ®‡*œWµÒ„ƒrD‰¸U¹øá‡¼ÔÌû³ê
ª‹%
+endstream
+endobj
+31 0 obj
+<<
+/Length 223
+/Filter /FlateDecode
+>>
+stream
+xœ]ÁjÃ0DïúŠ=¦‡ ۗ0†’ð¡M‰Û¥µ+¨Wb-ü÷]«n=H0šyÒ¬ô¥}jÉ'ýÊÁv˜`ðäç°°Eèqô¤Ê
+œ·iWy·“‰JÛ­s©¥!ÔµÒwñæÄ+]èñAé;dO#Þ/èn‰ñ'¤…jp8È=Ï&¾˜	u¦Ž­Û§õ(È_àmUÖåwÎÑXdC#ªº(¨¯×F!¹ÞNôƒý0,ÉR’Õ©8çì~ºQÛX?mÀ.ÌÒ$Ϟ+l{Âßï‰!nT^_‚m…
+endstream
+endobj
+xref
+0 32
+0000000000 65535 f 
+0000000015 00000 n 
+0000000074 00000 n 
+0000000503 00000 n 
+0000000628 00000 n 
+0000008371 00000 n 
+0000008536 00000 n 
+0000017100 00000 n 
+0000017233 00000 n 
+0000021441 00000 n 
+0000021466 00000 n 
+0000021665 00000 n 
+0000025902 00000 n 
+0000026026 00000 n 
+0000033225 00000 n 
+0000037346 00000 n 
+0000037412 00000 n 
+0000037591 00000 n 
+0000037788 00000 n 
+0000040363 00000 n 
+0000040676 00000 n 
+0000041027 00000 n 
+0000041230 00000 n 
+0000060118 00000 n 
+0000060619 00000 n 
+0000061050 00000 n 
+0000061248 00000 n 
+0000082995 00000 n 
+0000083582 00000 n 
+0000083750 00000 n 
+0000083952 00000 n 
+0000089976 00000 n 
+trailer
+<<
+/Size 32
+/Root 10 0 R
+/ID [ <84f21d3084bab863423fe1632b61677f> <84f21d3084bab863423fe1632b61677f> ]
+/Info 2 0 R
+>>
+startxref
+90272
+%%EOF
diff --git a/t/xml_invoice/corpus/EN16931_1_Teilrechnung.cii.xml b/t/xml_invoice/corpus/EN16931_1_Teilrechnung.cii.xml
new file mode 100644
index 000000000..7e8837160
--- /dev/null
+++ b/t/xml_invoice/corpus/EN16931_1_Teilrechnung.cii.xml
@@ -0,0 +1,372 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!-- English disclaimer below.-->
+<!--Nutzungsrechte 
+ZUGFeRD Datenformat Version 2.2.0, 14.02.2022
+Beispiel Version 14.02.2022
+ 
+Zweck des Forums elektronisch Rechnung Deutschland, welches am 31. März 2010 unter der Arbeitsgemeinschaft für 
+wirtschaftliche Verwaltung e. V. gegründet wurde, ist u. a. die Schaffung und Spezifizierung eines offenen Datenformats 
+für strukturierten elektronischen Datenaustausch auf der Grundlage offener und nicht diskriminierender, standardisierter 
+Technologien („ZUGFeRD Datenformat“).
+ 
+Das ZUGFeRD Datenformat wird nach Maßgabe des FeRD sowohl Unternehmen als auch der öffentlichen Verwaltung 
+frei zugänglich gemacht. Hierfür bietet FeRD allen Unternehmen und Organisationen der öffentlichen Verwaltung eine 
+Lizenz für die Nutzung des urheberrechtlich geschützten ZUGFeRD-Datenformats zu fairen, sachgerechten und nicht 
+diskriminierenden Bedingungen an.
+ 
+Die Spezifikation des FeRD zur Implementierung des ZUGFeRD Datenformats ist in ihrer jeweils geltenden Fassung 
+abrufbar unter www.ferd-net.de.
+ 
+Im Einzelnen schließt die Nutzungsgewährung ein: 
+=====================================
+ 
+FeRD räumt eine Lizenz für die Nutzung des urheberrechtlich geschützten ZUGFeRD Datenformats in der jeweils 
+geltenden und akzeptierten Fassung (www.ferd-net.de) ein. 
+Die Lizenz beinhaltet ein unwiderrufliches Nutzungsrecht einschließlich des Rechts der Weiterentwicklung, 
+Weiterbearbeitung und Verbindung mit anderen Produkten.
+Die Lizenz gilt insbesondere für die Entwicklung, die Gestaltung, die Herstellung, den Verkauf, die Nutzung oder 
+anderweitige Verwendung des ZUGFeRD Datenformats für Hardware- und/oder Softwareprodukte sowie sonstige 
+Anwendungen und Dienste. 
+Diese Lizenz schließt nicht die wesentlichen Patente der Mitglieder von FeRD ein. Als wesentliche Patente sind Patente 
+und Patentanmeldungen weltweit zu verstehen, die einen oder mehrere Patentansprüche beinhalten, bei denen es sich um 
+notwendige Ansprüche handelt. Notwendige Ansprüche sind lediglich jene Ansprüche der Wesentlichen Patente, die durch 
+die Implementierung des ZUGFeRD Datenformats notwendigerweise verletzt würden. 
+Der Lizenznehmer ist berechtigt, seinen jeweiligen Konzerngesellschaften ein unbefristetes, weltweites, nicht übertragbares, 
+unwiderrufliches Nutzungsrecht einschließlich des Rechts der Weiterentwicklung, Weiterbearbeitung und Verbindung mit 
+anderen Produkten einzuräumen. 
+ 
+Die Lizenz wird kostenfrei zur Verfügung gestellt. 
+ 
+Außer im Falle vorsätzlichen Verschuldens oder grober Fahrlässigkeit haftet FeRD weder für Nutzungsausfall, entgangenen 
+Gewinn, Datenverlust, Kommunikationsverlust, Einnahmeausfall, Vertragseinbußen, Geschäftsausfall oder für Kosten, 
+Schäden, Verluste oder Haftpflichten im Zusammenhang mit einer Unterbrechung der Geschäftstätigkeit, noch für konkrete, 
+beiläufig entstandene, mittelbare Schäden, Straf- oder Folgeschäden und zwar auch dann nicht, wenn die Möglichkeit der 
+Kosten, Verluste bzw. Schäden hätte normalerweise vorhergesehen werden können.-->
+ 
+ <!--Right of use 
+ZUGFeRD Data format version 2.2.0, February 14th, 2022
+ 
+The purpose of the Forum elektronische Rechnung Deutschland (FeRD), which was founded on March 31, 2010 under the 
+umbrella of Arbeitsgemeinschaft für wirtschaftliche Verwaltung e. V., is, among other things, to create and specify an 
+open data format for structured electronic data exchange on the basis of open and non discriminatory, standardised 
+technologies ("ZUGFeRD data format").
+ 
+The ZUGFeRD data format is used by both companies and public administration according to the FeRD 
+made freely accessible. For this purpose FeRD offers all companies and organisations of the public administration a 
+License to use the copyrighted ZUGFeRD data format in a fair, appropriate and non 
+discriminatory conditions.
+ 
+The specification of the FeRD for the implementation of the ZUGFeRD data format is, in its currently valid version 
+available at www.ferd-net.de.
+ 
+In detail, the grant of use includes 
+=====================================
+ 
+FeRD grants a license for the use of the copyrighted ZUGFeRD data format in the respective 
+valid and accepted version (www.ferd-net.de). 
+The license includes an irrevocable right of use including the right of further development, 
+Further processing and connection with other products.
+The license applies in particular to the development, design, production, sale, use or 
+other use of the ZUGFeRD data format for hardware and/or software products and other 
+applications and services. 
+This license does not include the essential patents of the members of FeRD. The essential patents are patents 
+and patent applications worldwide which contain one or more claims that are 
+necessary claims. Necessary claims are only those claims of the essential patents which are 
+the implementation of the ZUGFeRD data format would necessarily be violated. 
+The Licensee is entitled to provide its respective group companies with an unlimited, worldwide, non-transferable, 
+irrevocable right of use including the right of further development, further processing and connection with 
+other products. 
+ 
+The license is provided free of charge. 
+ 
+Except in the case of intentional fault or gross negligence, FeRD is not liable for loss of use, loss of 
+Profit, loss of data, loss of communication, loss of revenue, loss of contracts, loss of business or for costs 
+damages, losses or liabilities in connection with an interruption of business, nor for concrete, 
+incidental, indirect, punitive or consequential damages, even if the possibility of 
+costs, losses or damages could normally have been foreseen.-->
+
+<rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>471102</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20180605</udt:DateTimeString>
+    </ram:IssueDateTime>
+    <ram:IncludedNote>
+      <ram:Content>Rechnung gemäß Bestellung Nr. 2018-471331 vom 01.03.2018.</ram:Content>
+    </ram:IncludedNote>
+    <ram:IncludedNote>
+      <ram:Content>Es bestehen Rabatt- und Bonusvereinbarungen.</ram:Content>
+      <ram:SubjectCode>AAK</ram:SubjectCode>
+    </ram:IncludedNote>
+    <ram:IncludedNote>
+      <ram:Content>Lieferant GmbH				
+Lieferantenstraße 20				
+80333 München				
+Deutschland				
+Geschäftsführer: Hans Muster
+Handelsregisternummer: H A 123
+      </ram:Content>
+      <ram:SubjectCode>REG</ram:SubjectCode>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+		  <ram:IncludedNote>
+          <ram:Content>Wir erlauben uns Ihnen folgende Positionen aus der Lieferung Nr. 2018-51112 in Rechnung zu stellen:</ram:Content>
+        </ram:IncludedNote>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:GlobalID schemeID="0160">4012345001235</ram:GlobalID>
+        <ram:SellerAssignedID>KR3M</ram:SellerAssignedID>
+        <ram:BuyerAssignedID/>
+        <ram:Name>Kunstrasen grün 3m breit</ram:Name>
+        <ram:Description>300cm x 100 cm</ram:Description>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>4.0000</ram:ChargeAmount>
+          <ram:AppliedTradeAllowanceCharge>
+			<ram:ChargeIndicator>
+              <udt:Indicator>false</udt:Indicator>
+			</ram:ChargeIndicator>
+			<ram:ActualAmount>0.6667</ram:ActualAmount>
+          </ram:AppliedTradeAllowanceCharge>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>3.3333</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="MTK">3.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>10.00</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+        <ram:IncludedNote>
+          <ram:Content>Bestellt wurden 5 kg Schweinesteak. Mit dieser Rechnung werden nur die bereits gelieferten Steaks berechnet. Die noch offenen 4 kg Schweinesteak werden separat geliefert und berechnet.</ram:Content>
+        </ram:IncludedNote>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:GlobalID schemeID="0160">4000050986428</ram:GlobalID>
+        <ram:SellerAssignedID>SFK5</ram:SellerAssignedID>
+        <ram:BuyerAssignedID/>
+        <ram:Name>Schweinesteak</ram:Name>
+        <ram:Description>Schweinesteak aus Deutschland</ram:Description>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>5.5000</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>5.5000</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="KGM">1.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>5.50</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>3</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:GlobalID schemeID="0160">4000001234561</ram:GlobalID>
+        <ram:SellerAssignedID>GTRWA5</ram:SellerAssignedID>
+        <ram:BuyerAssignedID/>
+        <ram:Name>Mineralwasser Medium 
+12 x 1,0l PET
+        </ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>5.4900</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>5.4900</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="H87">20.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>109.80</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>4</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:GlobalID schemeID="0160">4000001234578</ram:GlobalID>
+        <ram:SellerAssignedID>PFA5</ram:SellerAssignedID>
+        <ram:BuyerAssignedID/>
+        <ram:Name>Pfand</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>2.7700</ram:ChargeAmount>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>2.7700</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="C62">20.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>55.46</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:SellerTradeParty>
+		<ram:ID>549910</ram:ID>
+        <ram:GlobalID schemeID="0088">4000001123452</ram:GlobalID>
+        <ram:Name>Lieferant GmbH</ram:Name>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>80333</ram:PostcodeCode>
+          <ram:LineOne>Lieferantenstraße 20</ram:LineOne>
+          <ram:CityName>München</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="FC">201/113/40209</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE123456789</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:ID>GE2020211</ram:ID>
+        <ram:Name>Kunden AG Mitte</ram:Name>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>69876</ram:PostcodeCode>
+          <ram:LineOne>Kundenstraße 15</ram:LineOne>
+          <ram:CityName>Frankfurt</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:BuyerTradeParty>
+      <ram:BuyerOrderReferencedDocument>
+        <ram:IssuerAssignedID>2018-471331</ram:IssuerAssignedID>
+      </ram:BuyerOrderReferencedDocument>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20180603</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>7.91</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>113.03</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>12.25</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>64.46</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:SpecifiedTradeAllowanceCharge>
+        <ram:ChargeIndicator>
+          <udt:Indicator>false</udt:Indicator>
+        </ram:ChargeIndicator>
+        <ram:BasisAmount>10.00</ram:BasisAmount>
+        <ram:ActualAmount>1.00</ram:ActualAmount>
+        <ram:Reason>Sondernachlass</ram:Reason>
+        <ram:CategoryTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:CategoryTradeTax>
+      </ram:SpecifiedTradeAllowanceCharge>
+      <ram:SpecifiedTradeAllowanceCharge>
+        <ram:ChargeIndicator>
+          <udt:Indicator>false</udt:Indicator>
+        </ram:ChargeIndicator>
+        <ram:BasisAmount>115.30</ram:BasisAmount>
+        <ram:ActualAmount>8.07</ram:ActualAmount>
+        <ram:Reason>Sondernachlass</ram:Reason>
+        <ram:CategoryTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>
+        </ram:CategoryTradeTax>
+      </ram:SpecifiedTradeAllowanceCharge>
+	    <ram:SpecifiedTradeAllowanceCharge>
+        <ram:ChargeIndicator>
+          <udt:Indicator>true</udt:Indicator>
+        </ram:ChargeIndicator>
+        <ram:BasisAmount>115.30</ram:BasisAmount>
+        <ram:ActualAmount>5.80</ram:ActualAmount>
+        <ram:Reason>Versandkosten</ram:Reason>
+        <ram:CategoryTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>7.00</ram:RateApplicablePercent>
+        </ram:CategoryTradeTax>
+      </ram:SpecifiedTradeAllowanceCharge>
+      <ram:SpecifiedTradePaymentTerms>
+        <ram:Description>Zahlbar innerhalb 30 Tagen netto bis 04.07.2018, 3% Skonto innerhalb 10 Tagen bis 15.06.2018</ram:Description>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>180.76</ram:LineTotalAmount>
+        <ram:ChargeTotalAmount>5.80</ram:ChargeTotalAmount>
+        <ram:AllowanceTotalAmount>9.07</ram:AllowanceTotalAmount>
+        <ram:TaxBasisTotalAmount>177.49</ram:TaxBasisTotalAmount>
+		<ram:TaxTotalAmount currencyID="EUR">20.16</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>197.65</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>50.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>147.65</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>
\ No newline at end of file
diff --git a/t/xml_invoice/corpus/EN16931_2_Teilrechnung.pdf b/t/xml_invoice/corpus/EN16931_2_Teilrechnung.pdf
new file mode 100644
index 000000000..fcec2d782
--- /dev/null
+++ b/t/xml_invoice/corpus/EN16931_2_Teilrechnung.pdf
@@ -0,0 +1,1113 @@
+%PDF-1.4
+%öäüß
+1 0 obj
+<<
+/CreationDate (D:20220218171346+01'00')
+/Producer (jPod intarsys consulting pdf library)
+/Creator (PDFA Live 7.1)
+/ModDate (D:20220218171346+01'00')
+>>
+endobj
+3 0 obj
+<<
+/Widths [506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 226 325 438 498 506 729 704 233
+311 311 498 498 257 306 267 429 506 506
+506 506 506 506 506 506 506 506 275 275
+498 498 498 463 898 605 560 529 630 487
+458 637 630 266 331 546 422 874 658 676
+532 686 562 472 495 652 591 906 550 519
+478 324 429 324 498 498 300 493 536 418
+536 503 316 474 536 245 255 479 245 813
+536 537 536 536 355 398 346 536 473 745
+459 473 397 343 475 343 498 498 506 506
+257 498 435 711 498 498 401 1061 472 344
+874 506 478 506 506 257 257 435 435 498
+498 905 444 720 398 344 842 506 397 519
+226 325 498 506 498 506 498 498 414 834
+416 538 498 306 506 390 342 498 337 335
+300 563 597 267 303 252 435 538 657 690
+701 463 605 605 605 605 605 605 775 529
+487 487 487 487 266 266 266 266 639 658
+676 676 676 676 676 498 680 652 652 652
+652 519 532 554 493 493 493 493 493 493
+774 418 503 503 503 503 245 245 245 245
+536 536 537 537 537 537 537 498 543 536
+536 536 536 473 536 473]
+/Type /Font
+/BaseFont /Calibri-Bold
+/LastChar 255
+/Encoding /WinAnsiEncoding
+/Subtype /TrueType
+/FirstChar 0
+/FontDescriptor 20 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 7561
+>>
+
+stream
+[]
+ 0 d 0.827 0.827 0.827 RG 0.827 0.827 0.827 rg 538 808 m 57 808 l 57 810 l 538 810 l h f* 0 0 0 RG 0 0 0 rg BT /F1 7 Tf 1 0 0 1 57 820 Tm (Beispiel-Rechnungen für ZUGFeRD 2.2, \(c\) FeRD 2022) Tj 1 0 0 1 494 13 Tm (Seite ) Tj 1 0 0 1 513 13 Tm (    von   ) Tj 1 0 0 1 509 13 Tm (2) Tj 1 0 0 1 534 13 Tm (2) Tj []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg ET 65 757 m 547 757 l 547 756 l 65 756 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 752 m 69 712 l 116 712 l 116 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 752 m 116 752 l 116 751 l 69 751 l h f* []
+ 0 d 116 712 m 69 712 l 69 713 l 116 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 118 752 m 118 712 l 188 712 l 188 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 118 752 m 188 752 l 188 751 l 118 751 l h f* []
+ 0 d 188 712 m 118 712 l 118 713 l 188 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 190 752 m 190 712 l 328 712 l 328 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 190 752 m 328 752 l 328 751 l 190 751 l h f* []
+ 0 d 328 712 m 190 712 l 190 713 l 328 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 330 752 m 330 712 l 376 712 l 376 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 330 752 m 376 752 l 376 751 l 330 751 l h f* []
+ 0 d 376 712 m 330 712 l 330 713 l 376 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 378 752 m 378 712 l 424 712 l 424 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 378 752 m 424 752 l 424 751 l 378 751 l h f* []
+ 0 d 424 712 m 378 712 l 378 713 l 424 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 426 752 m 426 712 l 472 712 l 472 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 426 752 m 472 752 l 472 751 l 426 751 l h f* []
+ 0 d 472 712 m 426 712 l 426 713 l 472 713 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 474 752 m 474 712 l 538 712 l 538 752 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 474 752 m 543 752 l 543 751 l 474 751 l h f* []
+ 0 d 543 712 m 474 712 l 474 713 l 543 713 l h f* []
+ 0 d 69 710 m 116 710 l 116 709 l 69 709 l h f* []
+ 0 d 116 679 m 69 679 l 69 680 l 116 680 l h f* []
+ 0 d 118 710 m 188 710 l 188 709 l 118 709 l h f* []
+ 0 d 188 679 m 118 679 l 118 680 l 188 680 l h f* []
+ 0 d 190 710 m 328 710 l 328 709 l 190 709 l h f* []
+ 0 d 328 679 m 190 679 l 190 680 l 328 680 l h f* []
+ 0 d 330 710 m 376 710 l 376 709 l 330 709 l h f* []
+ 0 d 376 679 m 330 679 l 330 680 l 376 680 l h f* []
+ 0 d 378 710 m 424 710 l 424 709 l 378 709 l h f* []
+ 0 d 424 679 m 378 679 l 378 680 l 424 680 l h f* []
+ 0 d 426 710 m 472 710 l 472 709 l 426 709 l h f* []
+ 0 d 472 679 m 426 679 l 426 680 l 472 680 l h f* []
+ 0 d 474 710 m 543 710 l 543 709 l 474 709 l h f* []
+ 0 d 543 679 m 474 679 l 474 680 l 543 680 l h f* []
+ 0 d 69 677 m 116 677 l 116 676 l 69 676 l h f* []
+ 0 d 116 655 m 69 655 l 69 656 l 116 656 l h f* []
+ 0 d 118 677 m 188 677 l 188 676 l 118 676 l h f* []
+ 0 d 188 655 m 118 655 l 118 656 l 188 656 l h f* []
+ 0 d 190 677 m 472 677 l 472 676 l 190 676 l h f* []
+ 0 d 472 655 m 190 655 l 190 656 l 472 656 l h f* []
+ 0 d 474 677 m 543 677 l 543 676 l 474 676 l h f* []
+ 0 d 543 655 m 474 655 l 474 656 l 543 656 l h f* []
+ 0 d 69 653 m 188 653 l 188 652 l 69 652 l h f* []
+ 0 d 188 640 m 69 640 l 69 641 l 188 641 l h f* []
+ 0 d 190 653 m 424 653 l 424 652 l 190 652 l h f* []
+ 0 d 424 640 m 190 640 l 190 641 l 424 641 l h f* []
+ 0 d 69 638 m 188 638 l 188 637 l 69 637 l h f* []
+ 0 d 188 634 m 69 634 l 69 635 l 188 635 l h f* []
+ 0 d 190 638 m 424 638 l 424 637 l 190 637 l h f* []
+ 0 d 424 634 m 190 634 l 190 635 l 424 635 l h f* []
+ 0 d 69 632 m 188 632 l 188 631 l 69 631 l h f* []
+ 0 d 188 619 m 69 619 l 69 620 l 188 620 l h f* []
+ 0 d 190 632 m 424 632 l 424 631 l 190 631 l h f* []
+ 0 d 424 619 m 190 619 l 190 620 l 424 620 l h f* []
+ 0 d 426 632 m 543 632 l 543 631 l 426 631 l h f* []
+ 0 d 543 619 m 426 619 l 426 620 l 543 620 l h f* []
+ 0 d 69 617 m 543 617 l 543 616 l 69 616 l h f* []
+ 0 d 543 604 m 69 604 l 69 605 l 543 605 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 554 m 69 527 l 185 527 l 185 554 l h f* 187 554 m 187 527 l 256 527 l 256 554 l h f* 258 554 m 258 527 l 327 527 l 327 554 l h f* 329 554 m 329 527 l 399 527 l 399 554 l h f* 401 554 m 401 527 l 471 527 l 471 554 l h f* 473 554 m 473 527 l 538 527 l 538 554 l h f* []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg 353 417 m 212 417 l 212 418 l 353 418 l h f* []
+ 0 d 543 417 m 355 417 l 355 418 l 543 418 l h f* []
+ 0 d 353 396 m 212 396 l 212 397 l 353 397 l h f* []
+ 0 d 543 396 m 355 396 l 355 397 l 543 397 l h f* []
+ 0 d 353 375 m 212 375 l 212 376 l 353 376 l h f* []
+ 0 d 543 375 m 355 375 l 355 376 l 543 376 l h f* []
+ 0 d 353 345 m 212 345 l 212 346 l 353 346 l h f* []
+ 0 d 543 345 m 355 345 l 355 346 l 543 346 l h f* []
+ 0 d 353 315 m 212 315 l 212 316 l 353 316 l h f* []
+ 0 d 543 315 m 355 315 l 355 316 l 543 316 l h f* []
+ 0 d 353 265 m 212 265 l 212 266 l 353 266 l h f* []
+ 0 d 543 265 m 355 265 l 355 266 l 543 266 l h f* []
+ 0 d 353 235 m 212 235 l 212 236 l 353 236 l h f* []
+ 0 d 543 235 m 355 235 l 355 236 l 543 236 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 185 m 69 171 l 399 171 l 399 185 l h f* 401 185 m 401 171 l 471 171 l 471 185 l h f* 473 185 m 473 171 l 538 171 l 538 185 l h f* 0 0 0 RG 0 0 0 rg BT /F2 12 Tf 1 0 0 1 65 761 Tm (Positionsdaten) Tj /F3 8 Tf 1 0 0 1 70 730 Tm (Pos) Tj 1 0 0 1 119 743 Tm (Art-Nr-Kunde) Tj 1 0 0 1 119 734 Tm (Art-Nr-Lief.) Tj 1 0 0 1 119 725 Tm (Art-Nr) Tj 1 0 0 1 119 716 Tm (\(Art\)) Tj 1 0 0 1 191 730 Tm (Beschreibung) Tj 1 0 0 1 340 730 Tm (Nettopreis) Tj 1 0 0 1 400 730 Tm (Menge) Tj 1 0 0 1 437 730 Tm (Steuersatz) Tj 1 0 0 1 494 730 Tm (Nettobetrag) Tj 1 0 0 1 119 701 Tm (SFK5) Tj 1 0 0 1 119 692 Tm (4000050986428) Tj 1 0 0 1 119 683 Tm ( \(GTIN\)) Tj 1 0 0 1 191 701 Tm (Schweinesteak) Tj 1 0 0 1 353 701 Tm (5,5000) Tj 1 0 0 1 410 701 Tm (4) Tj 1 0 0 1 414 701 Tm ( ) Tj 1 0 0 1 416 701 Tm (kg) Tj 1 0 0 1 459 701 Tm (7) Tj 1 0 0 1 463 701 Tm ( %) Tj 1 0 0 1 516 693 Tm (22,00) Tj 1 0 0 1 70 668 Tm (1) Tj 1 0 0 1 191 668 Tm (Bestellt wurden 5 kg Schweinesteak. Mit dieser Rechnung werden die ) Tj 1 0 0 1 191 659 Tm (nachgelieferten 4 kg Steaks berechnet.) Tj 1 0 0 1 191 644 Tm (getLineTradeAgreementBruttopreis : 5,5000) Tj 1 0 0 1 191 623 Tm (Schweinesteak aus Deutschland) Tj 1 0 0 1 70 608 Tm ( ) Tj /F2 12 Tf 1 0 0 1 65 562 Tm (Umsatzsteueraufschlüsselung) Tj /F3 8 Tf 1 0 0 1 70 538 Tm (Art \(Kategorie\)) Tj 1 0 0 1 218 538 Tm (Warenwert) Tj 1 0 0 1 284 538 Tm (Zu-/Abschlag) Tj 1 0 0 1 361 538 Tm (Basisbetrag) Tj 1 0 0 1 424 538 Tm (Steuersatz [%]) Tj 1 0 0 1 491 538 Tm (Steuerbetrag) Tj /F3 10 Tf 1 0 0 1 70 508 Tm (Umsatzsteuer ) Tj 1 0 0 1 134 508 Tm (S) Tj 1 0 0 1 129 507 Tm ( ) Tj 1 0 0 1 131 507 Tm (\() Tj 1 0 0 1 139 508 Tm (\)) Tj 1 0 0 1 375 507 Tm (22,00) Tj 1 0 0 1 465 507 Tm (7) Tj 1 0 0 1 516 507 Tm (1,54) Tj /F2 12 Tf 1 0 0 1 65 453 Tm (Belegsummen) Tj /F3 8 Tf 1 0 0 1 213 429 Tm (Positionssumme) Tj 1 0 0 1 516 429 Tm (22,00) Tj 1 0 0 1 213 404 Tm (Gesamtbetrag der Zuschläge) Tj 1 0 0 1 213 383 Tm (Gesamtbetrag der Abschläge) Tj /F2 8 Tf 1 0 0 1 213 357 Tm (Rechnungssumme ohne USt.) Tj 1 0 0 1 516 357 Tm (22,00) Tj /F3 8 Tf 1 0 0 1 213 327 Tm (Steuerbetrag) Tj 1 0 0 1 520 327 Tm (1,54) Tj /F2 8 Tf 1 0 0 1 213 297 Tm (Bruttosumme) Tj 1 0 0 1 516 297 Tm (23,54) Tj /F3 8 Tf 1 0 0 1 213 273 Tm (Erhaltene Anzahlungen) Tj /F2 8 Tf 1 0 0 1 213 247 Tm (Zahlbetrag) Tj 1 0 0 1 516 247 Tm (23,54) Tj /F2 12 Tf 1 0 0 1 65 193 Tm (Zahlungsbedingungen) Tj /F3 10 Tf 1 0 0 1 70 175 Tm (Beschreibung) Tj 1 0 0 1 402 175 Tm (Fälligkeit) Tj 1 0 0 1 474 175 Tm (Teilzahlung) Tj /F3 8 Tf 1 0 0 1 70 161 Tm (Zahlbar innerhalb 30 Tagen netto bis 04.07.2018, 3% Skonto innerhalb 10 Tagen bis 15.06.2018) Tj ET 
+endstream
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Count 2
+/Kids [10 0 R 18 0 R]
+>>
+endobj
+5 0 obj
+<<
+/Filter /FlateDecode
+/Length 36838
+/Length1 67180
+>>
+
+stream
+xœÔ½|\ŵ?>3÷Þ-÷n_mï]«]íJ»j+«¬ªUmËr‘‹l¹bº
cc°iL
=”„<d¹°`8¤€S‰SIhｐ 	¢ÕïÌÝ¢bAH^~¿ÿ篕öÞ9wï9sæœ3gW#„h/bPzá`<qÞÛþ
+”áodùë¶^Øù›_!„£ÉÞØ°}›;øN|5B¼!î½Í[Ï8÷‹l}!
‹\Æ9—lnlv^‹ÅŒÐÃÛ¶lZ·ñµÆo_‚ÐÓ7Âój¶AùŒÐåPöo9wÛÎoÜõų¡ü„´WŸsþ†uø¬ï-Aè'ç@ùºs×íܪEúòÚ{Pß}Þºs7Ýrøƽ^‚ªj녛¶jŸýŸ‡z§!ƒ1l€G’qwsIèµ3wd~Œž$H†ˆZJ–eû "I#÷¥(ÿÓ?èv#x}ÄJPáÒûIЍÐôó§¢­B¨øgG7$ù5”°Xf%OÁq7JCû
èr¼߆'‰|—|Ÿ¼Ì°ŒŒQ0:ÆÀ”2íÌÅÌåÌ~æFæ‹ÌÙµìöbösÎkœukÜ·Õít{ÝAw…»ÞÝènwoußì~ÔÃyô“Çíñz‚ž˜g­çn/ñJ¼j¯Îkõ:½o—wÄ»)ðƒØÉI±¯Bë3yZÿ%ƒ	Ë­¡õmÐúÕÐúÍ̗XÄ®g/douîu¾­ëÝf·Ýí[Oå[ߖoÝXl}Ðsk¾u­×Rl}#´ŽÄÖ±åPl/à;éȾï+&c“>„²4ëçõõųäüë‘×õ¯¿ñú>àû‡¯¾^Ç+_ÛT;­ñZïk=¯‰O~-öšïՏ^}íÕ×w1ڍ¡.ydGÀ\Å«ÈCkîéÈ%ãeº˜ûÙÕìv#»™ÝŠ»•ÝÆîdwOï»-|¨Hù{8öû쌺t<ÓÃÜÉ<Î<¦˜»˜;ã=ÌÍl#³”¹bÎaÞbƙ?3aÞfÞaÞeþʼÇüYÎ,cÛÙ¶ƒégîE,Ò"2ƒ,QEQՃ$5¡vԁzÑr´­DkÐF´]„¶¡KÐ.´‡ÙËle®`>ÏìÂã˜`5Ö`+vâR¼¯ÄÃøL|>_Œ·ãËðõø|#¾߃àgð·ñóø»øEæJæ<æ*ævè}/óuæQæËÌcÌùÌ爔¹ÿ˜ÙÂvCï$J”Næ˜ð»ìbæ6f7)cÞÇ?aÎd£l›`€ÌK¦˜t‰™9‘yPªD	T…l¨õ¡~´-D‹Øf´‰ÎBg£saÆá»0ƒYÌa	–b+±
»°{°¯Ákñ^øLçÔ^|¾’Mã}ø(~gð“øûx?~
ñX†,G*¬@z¬E%X‡Œ¸°Y°
Y±y±ùpùqp¹±•â
ƋQD¼•ãU(†W£$^‡ªñTƒ7¢:¼	ÕâÍ(…Ï@óðÙ¨Ÿ‹ÏCÍx+jÁ¢4¾µám¨_„:ñԍw¡ùx'¾õàÝh_…ã«Ñ ¾-ÃסUø&4ŒoA«ñÍh-þÁ·¡õøóh>€6ã/ Mø^t¾ƒŸ@çácè||mÅßBà§Ð…øi´Ÿ@—á ËÑ^|]‰„®À?Äw#%«ÐR|-ڀo§ÏÂï㏉Žø‰‰D	!.ü6þèŽhˆ”X‰4TŒDH9¹‡|T’ûI
I‘ÒC‘+II$©"Õ¤–Ô‘z24‘f’&-¤•´‘ÒIæ“.ÒMúH?Y@’FÒK."—Ýd/9@.$ÛÈv²ƒì$»È¥ä2²‡\E®&א}äZr=¹ÜHn&7‘[È­äóär'¹‹\An#ûÉçÈÝäQò
òsòù)y–"‡Éò9NN‘ÇÉùù
ù2ù
+y˜|•|üù&yŒŒ’ƒä(ɐ'É1ò-ò4y†|›<GN€îýè¿ȋä$ù!ùù1ù	ùy	4±’Q3¦ôƒ…±26ÆÎxýXʔ1Q¦œ‰3•LSÍÔ0uLŠ©gæ1
L#ÓĤ™ÆʙVFË431Æɸ7ãgBLh“`jÉ/˜vò&Ï3Iò5F‡.ÆÏ¢íø9´]Š¿x;³“YɬbÖ3k˜µÌææVæRæCæ#æcf‚É2“ ™1KXX®ð+,ÇJX)+cå,Ï
+¬‚U²*VÍjX-«cõÌQæ
6ÂV°ål%›d«Ù[ÃÆÙ*¶–­cÃì2vˆ]ήm·–]Å®½7Ì.a›˜ÝìBÁ1<×á^$!<Uhn]›öƒ—¨ÖgkíÓj¢ÿßëA$j0h¯.´Z‰
½$ÍăVrƒ^¢Zi-è%ª•.
t9è¤+A+=	ôpòK¢&ýðó6|ó s?óEü.‘²­ —°}l';Ÿíbc³ýÀ‰Ar»ÿÿ„Í·YÀô²ÝìBæl»ˆÙœɬlМ ADÙ¡2Òæ٥ û.gK™‡™Ì&ÊM£Ý UØzÐÇ.ÐÊÐÅ9\!ê_z˜jÞ3ñfü>èe^G”‰â’Þ+ôi|½^_@ÿŽ 'Ñ·ÑÐÏÐ_1FÐ5èiô:ú#z}„`dÀvþ2òOüd¯âÎEJæƒ	l‡'ßÌ~mòM°;UÓ( dbƒS”IÝäølZö@6“ý¡4¤x¯†¼Ô·ñø䇤™–'kh™\KÏÅ;ޖޟ},ûÀŒîlE¢‹ÑNQÞ.E—ރ®Bûеè:t=`±Îo@7¢›ÐÍèt+úº
@ŸG·£;Нè.t7ºÝ8އî»2w–ï‡×âUzå!ô0úzŽ_B_F_A_E@ùë€þ£è›@ËQråoåAôE >TZ‹Òƒ×(:ˆÆÐ!tx–+Jô:Š‡ãÀÍcè8úz
+øøpöY‘F)…ò'×̽?‡N ï çÑwÑ÷Ð÷A2^¿á$ú!úÑ¿tå;E
+-ýýýdí%ôst
+ýý
+ýýý½‚^©{ë´ë¿„¿†:/çk½
+µþ½	5Ç¡f®^®ÎoÅ«ŸðÜû
+z¬‡¿a‚À€…3ʽ;DÝ-ò‘rrçË"ďA™rè«EÞ|0þð“–èù=yn|êø͍ÚóÜÉá}êP,蕓y,¾›ç}ÎSÅ{_¯‰÷=[|ꢹþ|:¿†á¢ÿ‘É¡—»:…­ñÔ¡(ÓgÌÄö5¸7‡>½—Ò§ßC¯ýÊo‚vx¦Ç?‰œøúïâù篏£?£¿ ¿‰ïo£w@Ÿü½å¿åm(NMy^ÿƒ>@?FÓJ³®L€{7	Ú
+Ã*Á ìÔÙUü+X£2,ͯͬWé¬+BñŠö´+Š9®ÉEŠëq	èK6Ã:e½é€ÕŠ®-Þi×,Å+9[؏ùkFñNKñ^j-›¦Õ
ã
+¼Þéú‡óJ\…«q-N
¥Ê	(×õ
+ñؚî\»fxõª•+†–.\<°há‚þ¾Þžî®ùím­-éæ¦Æ†yõ©ºÚšêx¬<Zø}^—¹D«Q+^.“J8pª1Švø:GÜ£Á‘Q6èëê*§eß: ¬›Fu©sfQ÷ˆXÍ=³fjnžU3«™.ÖÄwj(º;|îѓí>w¯‚ó›Ú}+Ü£ãây¿xÎł
+Üáî0oiwâwÇhçö-û;FÚáy¾Í׶‰/¢ƒ¼§œ–ú¶Ä¥MX<!¥õ	’)i³£L cÝÆÑECí6g…HCmâ³F%m£RñYî3iŸÑ
îƒÑgöߘѠõ#ÅFßÆu«‡F™upÓ~¦cÿþkGµ‘Ñ°¯}4¼ë
3yÓhÔ×Þ1ñÁÃzÀ£\@ãsïÿ‚ÎûÆߚIY—§Hš¿!zJ‡X„	®Îô
zãóxh_nȤÑz(ŒîʕÝh½m¥ã‘£d„^y¦pÅ°”^Ù[¸R¼}Ä硬êÉÿnßbÝ»Þ]ôÅßüÂu÷(Y¿a=®Û´ß×ޞÃmÉÐhºNÒëòcí8X‡úëF`gR†Fã¾­£%¾Ö\ ¸)ÎoÉß6ZÒ6ŠF6äïw´Ó~¹;ö´ç:HŸåz%'_9Xå¶J‚‘´‚öcÔØL	vìÚ¸yÔ5bÛò¹Ù=dóŒ¦W|+|C›VP.ù4£áW 9Ø¢xŒmVíBe:ri@æ"6fåܝðækm€`—X¤mmp×Z¨­äkгρh뢗zk[—ͳ“ûù”.Ùò}⣲iÏҡا\;ŸØµ\mÚ¡°»cSû´Îx(—ï`þis÷“P,ò
Ã2ÊήÂ%&3h#’(ÍîQ´È=äÛä[áJ/¢c£X‹üíôõ¬¹—’%3J¹ëu¹Ò(òÀåB´vFl¶Šåùb¹Xìšu¹»pÙ½_æëÜOîË?¹aÁ %Áîu7Ôéª`jv‚vóu®ó¹5îÎýë2“{×ï?˜NïßÚ1²¥ž>Ã×½q¿op¨Á&öuñÐe¶]´)êŽKZË£ {ZúðuÓøºÁ•CO€Ýê¾nÉÐÁ¤m¤uÅA?\zPZ¤J¥DZpÓ}Òb(ÈÄú¶'Òí¯²"A,oÈ`$ÒdF2$GÓhhlŽ–iô˜dÞƒºípo¤ìÙ½bËþ‘tr!#°~ñ(ö5¡Qâk:ˆ‰D1Êû6µŽ
+¾VJo¦ôæ]BéRX÷ª“öø@O@
!Ή"CéÎLN.òœ´¯ð€¨­†¿•C£òè~.ÐõæÓ¿ ÏÝ»aíZ:D7¬±-<ªtÊá	òü F§xG¸ið(Þ¿
+£{WŒ®ˆÐF‡Î\!Š³fuùêí¹grAÚP|Å~/!ÎM˜
+|àZzCßÐàPŽbƒ"4¶"’T
=ßàƒKF܀6‹6‚¨çt)oËQ6Jdƒ›Ä?ޖ¿ˆè°˜€ äGå1x üÒs!F§$®X‘ë¼Xº6_
Ú֌
+Уà4(ó7:p©›ö~¯…®Òªß¦Ƞž Yh§Å'Iáò¨2н”î~
(¾ºÂÍ2ª#„ü3Nä¨R:ràΖd&¿ê»Ä3í§<꣋Ld{­Ø?›0º*R•Í¦*Eòþý2åÜ7äð’)‹G ‚›	èEÌoÀcdÀ“N‰¾ó’ãH‰ï·²¿p¸½]V.}
+Š¹Á—ùx_ZÏ¥ÍÖ쫖ÜÈh»›¥7’%¨yâw/?o'u©øIyüÔ¸fâym*>þÒxeÖz´â_‰ŠH¥‰Ï#Õ¡`M2™h"ÕUAŸWEDZUMm“L8	SR 4ZÆÌo>^ÈtLøÉ%žyƒ•ŽL.½LƸœÊ@Ò­îí÷ՔZ9V&a8™4TÓê[º£ÇûCÞ²;BfŽ;'žåT¾Ë©>Zζtœü!5Ôä—\¢'—ÝWê4ø+퍽Jµ’SÙLV»T¦Uñe]ë&î¶L<o
+Xí
ú¬ÀÄ<@Ä4ù!ûW‚¼(ˆ^…iܶÖYÿäjÜçËLþ!í¤g
…ÒgV"#VƒïóòÈÍú°ÖdpYڙë…"äðû|N^iD>¯Yªs,Ö-å–"sss³Î”ªÓ&µ€,Ø°Ikÿx[âk†­æ“‰äeמ8Í'ÖçN++P$b›Ù#ôäÓZeE$²"`4æøb<Rãóƒ5µ8Ç,“ÔÇx؃
+‰±®2™r*ØåYëbV騎ĪJ$
+|‹DãkJÎëi%ÏâÇñùëýeŽ‘k”˜PéVb*ó±»µa£þù‰_ONæЕÜM‚0ù’â¿€—Šæ ¿‡/“þ
x¯SôËt‚‡;EßY¤óàËNÑU¤[0ݑ!“?›ü;3¥	µ¢½iu‹ H+¬
+‹Å”n壩¹5­à@‚g)ÝÉàؘ«¥õ#
Eq$­«SX´‚µÎ%Ô	uZ׀vi
+ê”ÀÔÐS©x0‡ß”f\3ž€ßŽŸ0
9>qBó’åyàI2¡É19@g‡Ç¬®Îñ"7s(7<ÀƒxU;ë¼+Œ€WÉ'vx¢Ù]Û%wM¹;j%©—éMIòs¹šç8^-Ï&ñ>>wÎgwáŸÊU<7ÁrÙãê3`>	¡èóo«ô<Kd*AðØØm:ƒ‚á-!'L2!û\aÚeïÌ!æøÄCtGñ&„Ø@Љ"¨=P˜1.ràˆU0”!_‹“rɘ`
e0s¨²RêÏäEٟÁ´\3Pe¦¥ª¥¥K@dAD#ÍãØñŽ'âã vt)P;¶ƒÿâc*+V€ªbEˆµU5ET¥NWňϧ¥ŠK?uÊÖۆ·îY}ÄS^îÁ;¾rAƒ9Ö©î(Í>j®èn¼æ@ª½ÜØæ¬_Ùõ…§j{k]øꎭ˚Jõ¡(»%*ؽ$>Ø^¥áÏ¿5…ÙQ[¼yâƒòùÖì­¦ò6}^8ù'VÁù@WߐÃo̎"O‘ï"2ãuȃ‚ùa3xdL?Ȃ£øxu…8֊^?––/Ç:yi¼™¾
b/Dَÿ«¬@s*½JWS
+AbÈkoª×
%NB!¢Š‚U0ÞؼêâökNݱhèþ—¯©Ù¸´ÝÆKäRëÞÔÙÉÒh|ù¥ý›»ãJ^!cOX|Éï1.þÒ{}£o®Ô9‚6=hw–Y¾ˆ¯ù⇷\øÕsª=¥n™9"¢”= ¢´­9Ž¬øçpbÄ¿L+ÔÌx¹Êmƒ½
4ZˆW¢NԂ׶ú—,¨ñê*[NçæŒS—šÈ!•JÐÒ©ª9	“´²‚3óCeaÂjV‹Y(cþ!@—H¬Ózë”Gú*
rV]²Íáà¥Þe]?ð©Ð´méÉA#‚Ù×çm
ÕÛb­e…Š×XŒ¥.‹QáÔô½w~:`î0̟Ãשe`M£s”æè›rö4ғ{AZÉmHŽÌyñ0ƒòJËU6Q2l¼d,ÍM›F8·ðÃRôYïÈÍ92cÎqÓfØ3ÃßüàÑìâüêûÆ;_Y–};²ööK®¹þœÏo¨$÷ŒM<؛›JüñK«ïßÖòñ­u<cRØ~crÁ¬é8\^¹í‘׸AãB#(‰Èa>™äTmÛª¡s9Q3ƒ>H‚i\órb<
ª̙b?‹&Jò´.ç•o¾÷?~Lì}ô¬‚Š=+êÁý¾ãøKdÍÛ¯ýNáÂw®?çÀԈðÊM¥NGÈÄãÌÔئ©Ø»è(1ås#Œ2ŠFs|£ºÜ–VËõn½8g5+
w듰"Á?ªÄýÁ ÄRP‹‘;ʁÈÅ!-™©#”«qq¥ÒP£ÀvôßñȜú §©ÚÓ0 3±JÙGW$º˜eøÚâªu	¬Tpž_¢¨0פ‚	šøì
X“èJßL-ºÂKð_š)õ¦Tj_ÄÑ\µ?k÷‹Ô*áû©þ¹iòCfð"„žÈóBªÏÏ§Jr:¤¥jÜ/5+”¸OªàôI¼é'ß>
+çz½E’™|åԐˆ8ªpŸ$ƒWN{,¢}FÁËC¡ü}$2#­ý7>·8§ó `‘¸Cÿø&¹JàÄó‹®D(˜t*Cë(•}È6+²_æÍ¥Ng©UÈ: ‘À{{4$XÊ­îÉ?²÷r~@ø79´Ùíj3Èî
+©‘»QÕ!´ëfèú!¥x|û‚qè°×›Š7.qˆÏK#KËSƒ%¢ä•dðÚ±t|YAòè¢EÍÛ€°úÑ9^PUÿwš)à9c!¨©õµ‡ˆ²–ZS. È•reýÈ5Ckî:§~ÞY·¯Œ.üMWBÅÑXô¼¡eäŒ3«ïýÛ×WŽŒ~p÷’ýg´Ûl‡£ÌÂûËü-;¾ºéü¯]X_R‚£å5ö IŒ®’‰	g¹Õ^¯øÚ_ïy`âà“'hOæd–ÝÞLý¨`™ÅsÈŽ?òG>Dp<GŸ"CŒ™üÀÏ0•-ö‹Àøá
àˆ*À!*¡eµÂ¥ 
+ðAfx¢»‘£Ê6¡Éùôǖ–ÿËÏ*¨Qp§Ëp~Zá”Ý£t&‚¡¤C™µ+œ99V:“ÁP©Ào(ÉP0áTúy
/‘À&þV8gŸ/œeø7…óªøv@ՀÊ
+¨"òù#i^³8×Y‡n‚ð*ft¸Ð5|»²Ð!W‚vhªSMƒ>š\IÛµT<ç5M®µWpòC²¡H—à÷‚´v;P/VûšÍô@ß*jµxÎ7š¤{ê1“oŒ¦­˜6šÃ•o±<ƒ7?®7›ó+ý&Xۧى §è ÇþQ½©y")8þb„ ±yî]ãœWéWÈ$„‘*y¹ÙYj³…m*¥£*L¸”xËÐMªä*ReòZ½q› T)Ձ¦J撂G“×ÑlŒ%‰Öìœ
+òy0€yrØå%ÏŠF
òy1­J#Ch±‡×Øk¦d,Eå˜G§¸f"AǗæªVäh0ÂsH`މ6”H¤l“àª	·¤,Òì%§‰á¥Òw"TZåRè,ÙûðUFyHÐ
+žºy➢n}NÈɄ0
Ž¬R˳@åµþP6>ñxؖ·–Àè­¨·ÀI,P’«Dæ2xxúzã'Å!~b…™yqzхb	}â1Oy~J|'eÅyΰM
Ëô	þè/‚%œãäX?Яr½Kʊ
+S<ÎÇÌfk†l<ì¯T(x8yùk,
+Á|—ƒ^ˆM¾}Xã#}• ¹ÓnzfÒÐweîݯ¨ŒI\¥®¥EeAãTÉÐ@G"‘Ó=Ú¤†¾iSq0ì’0ì#ÿÞVfLrιð!웱Ɗ‘œ¤â!b)¹@pTüvÉ^Ïê\^o…KÇdï ‚3t‡PSþh¬µÂ­Àf{•®p]à -d™¦+½
ÒÀpTFì½^¤_‘¬QûReO0¸¬Þ¯VÁ]…9’át¨ÉñáhHÍÇÔê’©sÆp8Œœu‹Ã:HúÂ¥1¯BCÏ‚DÁ—=51bp>%-âÄ7=¡
)×æàû7<³€qZ˜{>pÖNXïdLÉà4‘e3[@¿Õ—Œ”Z²OÙëM„e[Ìï‹YùÚқ‚Ua¿þcc¤4¨Ã£°Çüޘ…_m‚õIhNášËæuÝÒ7±ŠÏMFž½!W:«CÙPdppQiç]d-¯QpœBÃS{“b,Ƨ:òñ©_ÒxZ4ù&gáHVdÑ+!4)×	ï<²L™Ù«aVú̹€•Ü²¹<±ÏzÇ4k¥ …E¯fšËYÝÿæÝw¾zG/ï9ðêýÙ·Üý{GÖ]¹ÈãîÛ»ŽÉ_Ì^øЇÿqßG£k<ôþÑÍ_ÝÑÒ½ëK«ÎúÚÎæ®Ý_Ñ‹£W Þ|”ïq½šMŸœ“þ
zsýòPŸFßY¤óˆfþ3@÷p^î¿P%Èv7Úu´ª¹®‹Mtfȝiµ¥¤»ÉÃzõ²šêr6
++€0¦·$Ž‘;àN/ÒêhÌ-5°ÈRÓ]ÝĦZ2xiš—•”{X.äLeðò1ÀÙ|b¼ùLûq­)òmJ9®y‰µ@ÖГ¼+é
†òa¼ÚZ; ˜MùH¸Têd¸*X:ŒFŠ<æa4qށþtOõºÐZVc+µûË
D²½viʱè?Ý[µ*¾
+Èa»?jĒ‹(9û÷ÒHöZs•gã¾Å¾·ÍÕÞMû¼ÁhŽOJų2…”•©K”ïϺᱳ)ӔÊã2A&ß
+½ÿëçm|¨ñ㬜Ÿù׉ç»/{xxË×rÒ*ù"Hë<ԇV×PÏSÙg‘÷yã}}q/ƒÚÐjQŽª®–”RgÐ>Ð‚8f즨XV3Ï{Þ4撋j“IÑ",,1¡ü&B«šOsq
²œÕ
¥~侯¤îÖÁ‚÷\W!wéÉÎi~åu²œ½ ËîÌù•¸êÂö‚ˆÏߑýL­Áéêè£oÜ÷Ñckœ&­ò“¢ Wù|]»¾´òì¯ïlé§3ŸUΎÂhoÞOôKŽù¡Eòí´iâ
d5‰DáË£ú8r8mP=7Ñσ9ÏüŸ»±0á}³}<vz†i¿ò[{ÏÉ¢ŠÊR\ܶcI4;^ÑÙÞº½yi¹æÜG.jÈn(®,7ÆãRSÓÚ=ëۇʄl··q©8ò÷aäFë«a,æÈ:H¾=†´Îc8‚ÊQGÓ¼¤^
+Óbèo>FNƒãùq&ò³Çg8ͦ2P™ÈMà}¡ÿmW<¹ó’BÿySäªØ’²žƒ0ŠÖVSÒ~áµ5‹ªläñó`/‘²ôíÇËñ1©LÕ£éÛ¬—±ÙoÃҜ®6r@úC ÿ7å}XÞ£+͐gǐ–Égë<¼²¼À†rª€Ó`€­ùT+ª`eA¿tRŒŽ¤
+ÎiŠúÿÂýÀV.͌éRˆesx¶V? U¨dž³w_Q»jQaf|î÷w/4EÓᦑ–‘Ï^8[Ï_ꏚ¥þ¶u͆â<XðÅ¿?²üî+Ï	×Ôٕ†$ù妇w´¤¿k÷Ãyéïé¯Aíè¾f‡51m˜?FžE[Kî7k©Gii
+×dpàP:mj,38|4í0­¢L‹[
/‹>8ðà¿ö”i–Zˆ‰1§M*fù
“ÉhÄ3$®_æ¬O”%
+v›¡´2]¶¸ |å¼0Ùj[pÙò˜'½¦Á‘,/՟«æ³ß¨o-I–oßW·¤Îî¨ô	ZöTö%­Y}qNÝ
±ŒP³|GËÙKšôªÒTwl2èc6¦‡tœ$û9[e;µÞš'ßdn©ìFÇ
+6~¹óˆ?áO(lt¯)bÔ ­E<.?ª­…—±¡IC—§-6.<he̘ÁCÓÍjlE´Ó§¤8?ÇÅ­„Ø¿é±S–;ì*ú‡³ìæƾ+¿¹¡í¢¡yV¥­J.:¿»¢¯Ú^Ñ¿~ËúþŠŽ‹X[½¨©DÊQÿQ*:W×FÒC|áÆ-Tà«7ßsF•ÑåµVÆ\eVÁSê1•5£Í•‘ŠÆ¥Û†oŽ©ÌΕÉgu”ZvÍ¨rDr×/›ÃGqm”5¢¯õQn(&?dþòîEKóºI2äó‡ÌZ‰®€ŽNŒÈ9¦©gº8q’Šï§ÖšŠ×MÅ:
+Ó]ôÀþ(†GSÿ‹ú“Ùã|n™ã™[éÂÆ>ä[EL¯°„Î2‹@CtÐû'ßd¿
þb-Ïõþ8r“[axFr ­àƒ‹5‹‹qýÕÓùÙ\0?Ó§TšnqNùŽ%³½ö×}ïÊ]Ïî›/ÆA{çohlZß Ú<X	òk;Ž_ÙÞ¸û‰ÝLq¾L°ýô‚Ýg·3´XInL"Ÿ¶ämϜ9›þ>>'ýú	Ò"}g6æ/Äh‰4ÜÀ™
æ÷ꐜ×þ£i¿Å­°˜hDXH+-®ÅfN—þèRÍØ7çâ
+VÍËV8xÏªCµ’h0²Ô³wš
+®bÂh”H-§ñ7%JS¥­œÍîQp–†šX•]àð<Œ«Y…£&KꥊÝtǬL¡U²—Ò]y–/Qle^Õâ¶<Œ#2ù¡´Æрöä½qyœW †Š
+,mýi¾Aa2+>ŸÂ›!·§ui³¢vqÙâ
+ŸÀÌÊ+hž68K<•Ò¥Ìš—Äs]*§¥ÓêO¼µ8fPÄ>¦à2G¯OêóÉù3Š÷{‰¡¬5™ê(Õq?"'8]¨­¶
+’ì¯åĒJÆkí<ó:~‹UºjÊ+R.ûyáíUñh¥‘‘·™jŽS;ÌLÕÇ/šñœ=Ó6rŒ`Ðìa~©7+9Vi.ù¸”ù­Æ¤ä8c$˜y€÷íb4uOa¾xÉç‘ùÉ¢43Åcfx!e¤‚›Ï!‡·Ï'„û­c±vF¬ÉOÆ­fˆþñ¼\¤Ä͘œš„é5×]³©¼
¦˜¶1
¶"V˜
éss]¼Æ¥âþú®Dåª-¯J•(ô¸&ûŠNijJÅkÝJÉë/K”°^%ꍂ6ûÊ_™QÂÊ5
+ü³l¹B#g%Æ2©&zd	èÙ%øQJçŒeþ‰·

 cdÊPaU2‘Ûǔ
+7Ý÷/³!:-ø´"°Ø&Ñ-–gEÜÚ?‘zy\sŠŽöñYW©þ˜R}ÓFg4š’55µÅA’»r!(—"{¿^05ÕÆjÝj魆°èKõ7sjgU$ÕlRè🲩‚²Àß%ß„a<‚N•}6¶¹®fs7hô
+–3”ùAˆc5î¼ÆX&j†}gž.!üRª觵• Œ®*  !ÿyÔm„
+fÈÇä^mAÙkEïÒ6 (î¢-Ÿ¶mšh—ˆñ“¹“®ÿÔ­Ócvt±¨ÅӖ
£A4l0œA©ËĕF8…I‹ÿžU)´tËG« /„CœÒ¨ÍêˆC_²ÅQjácÑh‰Ç[jg삹Ôî[ø²`¥-Ù>þK â¤ãÑړ[Ô†ž«ævæ€N‡óúRnªÊU‡Q(„ê3¤#­Ñ2&üW6eUøã*\•™|&-§^UU±–²6§m¯x1s™÷&/I{yG¼ŒÚëòëõ²ŽÌä+i• p˜5¸ßña¬‡Z€i9ßH+úYdŽb ‘Ü&ÂððÚaq'2|ÁøðÔMÑÝϜ®úÿ¸7"÷èä÷¦øÉê¼]Ÿ§°ââ)͇
¨Ìl/‰”•‡µµ7-›¿cyEã%‡w,׆Z*š7ô%5b@ÙÞ¹æüygÞ>}¤qYe~sõŠ˜K¥‘J5ªùóZÝçt-¸¨×_SÖ\Vb÷ÚUÖ ÉåwøœúðÒ}«­ó'=uéš*:D¾r»I‘ÛãçŸN•âwqÍUûý-”Z+RG
+TBj§ê¶©ÒåSԃ…'zLŒø{
äk)Aç£;yúGØN+6VnlÙ¨×ola"ˎ‘V¨|ˆšñ¬ëgì«ÞXÔÓN9YÙ`þ»ª
^çÖ~Ø­l¨$•¾eÉedÙsэ
ÉF7[Á–
võœûF°_þ½?Çf]¼`ü‚Äšñ¢YÛ<®3‰Þ=ŠÁ
*Rb4HâóÌÊuw!É듸kÊ)<C¨&wMʀLL1œ{-ìŸxÕÖ°¶-½¾«R%WÈXÂIUõ+.Jw_¼ªÃêY°l¸r¶$T«-Ÿ—„yk{ëJ*î^ö=›*þŠåñÊùqùo^¶&/ëñ‡±hj¸Å«7é¥:Åè2ªUf“Ö®„ëKu 2óÎ)2wÜѐnÝþàOõ’z·¿q0žý¹­Ç““"]º,,Äm…5£ݑ×
¼§æA!W§åÈÀ×T{X®¢ ü*2¸7­öØ:5})Qÿ¥2¸ô_Ñè¤N²šÏOè£ÿê3¦™¯¡Óƒڜ]R¡Jµ¹@‹ªÖß²ª|Áü?ÙNèI…£"¨p(¼íí]¥ö//Í~¤-kKZ*’5ÎêuՕíå%ø­OíëÒëÃë„\tBà|…PsVï­p©î;tqê¬Å•*oMiö—íó‹6êÓ5ùGÆÜBÕo{̎BO‘mb昹Š)£þvé{Ø'qª&¸¿2*?šÁciyaÃ.RL!;‘ȧýïž4#—¬àßIrîdzú…“šë{–ÇÎxàœÚ¶_^_ÚßVm”sL‰F¬êJ¬ßbMö'«zë‚J¹BʎZ}fµÉcÕ¤/;¼mßs{›À…3ªÍ>K}dñÎÛºÎë	¸‚.Þ&z;]Ù"Vhþ˜ùÿ ­4+|ð
+ýÒj”¦Ø…P%Œ¸5b×ÑhýڅÌ1lF=¨FHÒô11‰LD)•JNσÁrRÓ'$‘}&ãFÆ3¯¿<ڛ0ÈÄ$2»\ZeËgEÅë$æJ [j¹ìé=ÿ+‚zA߾ȝ‹‚(…nÏK–`K#Ôù“Ó¼ÞÓ)¤B6VUV˜X°6v§åæžbf÷á´ªŸë+ø³¹Y•ssK­ü_}Æô¶ê™1ãâe¦Ç‡Áb^äÍa§»Ô"tܹzóM+J“ëo[Û»«A§§]ña͆šÊùƒ.Ü^e­LÖ¸½…©¸¡g1̾
tŠ6ÎïæåDU{WåâMÕug
&ÔÞÚRŠ[àö[îB4­A×Qt¶1š®ٖV„ó–óÅìe1ðÕpðŠ-͔ƺÖÆäü0u	—üq삗aUJ=+) ŠdÿØfH—¡5G†stqÝÑRg
ÞÀ€í˜"ñ„6·K
ë$݆­h0¢kkòACi.Ü5=˜h‚ºzØ3Eì¡ûÎ,¯S~^n¶Xx9kšW­ö½ƒ¼æ#m)¯«é‹—4^rtǶ/¯Û|ː+USe—›ÝÛ&®ÚªJs¬³Ü¤/ëHÖ,®±±.†hœ“Kϓo±Z¹N)geJÞàbæ1D×ÜzžñtÝpë=+nõÎÞö=G/Üûí+Z£×dª®krO·%5Þ¤WíÛÒÐp΢xxÙU”=À£`DPæò1\½Þ͐¶±HKáç=LT%¶ès,5õLJ܏X
Kú±#,y¥€=žÉeÑcÚ
uâo{ÌG*Šh•Ü¬Àýr3T¶`ä%0ïÆó–Þðk†#ãk†ióå|rRZþÿ¶mqI›Û)‘C5Áœ­qT´.æ
·´nì®PƒuÁàIýÊm­;íœ×´ýkgm}`sÅ{̪µÔjøK¡aד—íxúšÎ֋\ã>ëj€='òE´9ûq;:JíÇjt:ìÇó¦¨í*‘ŽP-o™üÜÅíD
è¢<¿dːµ‡*Ê|;ÕÌ·ú&‹ÙÑtE—»OÓUŒƒ…ã'’'’'ÄVþ3Þ4;̐O™^.ä†%ù`ä.VÆK¤Z‹×dY_¢»ý—ö„ß_é¶êõÎ÷÷ïu–ªä,û®Ã§—JeRm`^d1o*uÔÆ'b…­òÓx­£ÔÄ÷®º~UL©VZB`%Û`å{ˆùj‚µo-&ùxÏBu…”©óõ${žëa\=¸çÕï+0ȒâûƒØ9ˆÍƒxð“l2`dЈÚ`©c>hè*sG[·Ԋ[OÖõ¨Wa
³êÅ´{aÎ|©k÷]ôi¨{ÅáSâA´ªlé¥Ó[zð?n|ªí†Ö[	ۊ՟Úþš©ÌèÀpÁ®¦hºëH7^M3•`-ØÚU5â{ne
W‹æ7ý¤,è*&_b2jÎ4ê«Ö]¿$²À Ð'c¿êÛ1©ßöØÅ~ñŒ¸ÖSáŠÄk"¾²Úõ×-.ë÷`›ÖýÖ¢î@]@·h~°. Ÿ×Õ|ÈêÒK6­N-¨(aF*bæFςK#•ÒotˆŒ	´­ih½xYŸ^Qíi¨M˜Lãóօ|ë»\º´œ—G³t-²DR®ö…æ²Ú‰eå„ÓûÜNM¢ÊŒÓùqùä‡ÌOÁêN sq
+¬K”•dÈÈ!g™eú†JZž.ïñwZúrKpa%·CS:>[ý™éo¢Ñ##g*ïî0?UØ+ýJ»BïO+ÖW,è±åÚîU—õ{½¡Ç-=Վζ‰Ç
+”éÖsº¹aË
èjpöä‡ø&n
¸ÔQȾ0’§‘ÀëàÁ¼ôHÚ¢éÎõþt~*Ïâôks&õé©YG%DïšÝs}Ӓ¥ó—.i(öÙôFQÑW_×Ý7/599¹zz©¨ñ6‹šp|r§¨	­ ÝìEº¿k¥™}€Z=­öû“Č¿í@w‰R¤Ùäv”—
¼‹ypÐÓ\¿‘ü8,1¬ŸßŒŸ™¨xÚ8¦º¿»˜~G&“=€|ý¨­-HW€<=Q ÐÀ‡-”ˆeð¥‡J]Ý%ÜNW~Ö6Ÿ×&“Ô€Ñ>ô*N!ŸßA2ÎÜR˜Á„›üÝçõ„ë­<K/ã\:kЬPØó¡Ü \aϼrE¹ Ð™&{ÀÈs_msà4ææÐ1˜CUSY†• ?^¤€w#ò‘£‡Êˍ|†<N³^+í¶wj‹“BÜž–eø†ꝫÚôÊϐeȉÒpÒ£“f1›gX&+ñTI—B­Î~„c
+Áëå4 «Ä§²¥§ÏßÁ:‘*¨½úì/³å%Ž‚üÀø
¨9¿–¨•Ž Àc%Âܡ鰝¹¡äÓaÅX×°íP<wRì'ËÚTÇr}ÈÁ²[„þ#¿óÖ©§«¼Ó™à׎-j
+ÑHBi¦©§±Þžéëö´ô4u–×u—÷Y¦ã>-Í*õýäýô(ÿÕÃþü$µhÈìyVKäTtƒAë«”¯®
œü'­·Æ[]T–¼5ìr—™øž‹j‡:ÚÒþÞÞЊ]½î"žD[>KmžN™šßg,ZdŠ4"M!}Ãûû‹k	𠁮Èó LOAwŠK
+rjhª½€ûÅ%BQX"X"Ê,þî"FºBùL—Ðÿ̝Ÿm}1ü£õ¥Ù݃ÿ`}™
À±tóqe¥ñÌí¹x¦¸ætM¾É²€Ñ¬Œ¿‹ÅŒ¿‹gfüYÓruO1Ï>=&õ	ŸzÇgÈøcن]™KwŒn«kÜõø¥;G/ªËNƒÍuKjlÆÊ%M©%5Vüæ…ǯëi½<³ýÂo]ÛÓryæŠÖóÇÂϟÇòð‚óaìâ(Åè²Üz…î׫Ùôwñò9éïÓÜå"}$O×MQÛµ‰]!F»&X{
+£ZԆ.:KÎkeËÒҘV4muÖ©–UĬ_žÁO©
eÇH#?vúƒVNË"CE[¼ŽMÎ{G¦	8XÎcíI¾«ÿÉD?1`?#Ϗ
+›‘zÖÒ*ºMwZž«kÚýäî`³­UZmð+–Æ;Ê
»Ÿ¼Ì“v6ËÊËŠÅ@2þY¢4jþGéÓ4¬jpWút
+œwŽ+2é~Òds.?gOÇEǯí‘J¯V«Œ–GËÎÙÓc¯«‰é'>à¸Èà%ø
+–‹.ÞÕ?ï܀ˆÜ›’s@*kQ-AgrÅÓÔ>Ò¢oчêhÀ¼õ’‹ÓŽJ%Ÿ÷F—N¦Iú9ÿ1û
+?öDOg[Æ¢=‹2ØvÄ;-:ž‹‹±ñx. .&‘|J0|ŽÌ¿é¾èl±•œöM¼jmnmÙÐS¡’+©o*U§V]ÔºûP}Ý7/ÚùØÅ¢Do$U÷Å3Ï¿sü¯ÔO튛É$:MÀgy®£Ve6kz–,\R¿ãB€uÁ¢þiìÆÖ­ƒ±²[ç·nˆ…l¥Ñììí,D§G³=5|!š}ͧE³»5ÿ×ÑìôŒéÑì9Tã'E³“ëo[jilpu¤%좻¡Þƒñõ4šý¡6ܖ°TÒhöHUeGԀÇw<½¯K특²«‹ùÒ¿+(Ì3KÃ%ýûÆv¤Î\\©¦Ñì_·u'60Ìï4ŽÕxæF÷£÷éHr¢Ð5ç7_f¤Î=ÔOÜ'6|nM¨uÚP‹Hk{wxý
¹¡¶'ò{:T¸zßü™C•\3å{¸+\š×ÚA#÷ScÝD#¬ÙۙóòRˆ°º„°–¡$KÝBcÄÅjbfÇÄ訵§NdtÕô‹¦ñ'EXÿÕgÌÈݙ¶OE
‘êO±æ­jÁO÷:¨tTm¼m$ÐÞÞ,¥ngØ̟fÍ>S€?â©7:ÄP«:0/²®øm¿ÌÇZÏ^œµŠÖ9&î-oÍ[A5؝i²ªyç%ÃÓЙ@?ՆÓ|:ÒTÜ݆¾\†AÎzXKcr'òvÿëÏ
+óÌehˆ"&!ÇhSVbqêeå`nÌ23|Muuv¥Óm8pMzý1+OÃ:þ†èÄK§ç'Z‚jF*ç†Üç+ß$ïÂè»Ñ›Sy€±b`{¼6†coԂQÎÿ·¶6MÍ©Zw-aÄä=un Æ°‰	|oÐä½£†îs##Ö°Æw‹*„~ê.—Á7,îr¬ŽhƇáwFz`Úý¹µ!k¼›Úró`bUW…QÁÊr!’^Zã­•ûú‰5×.)[˜Žêe,ÃH2y0Õ[áM¸5Á¦…›‚ØÙ·mAHm2Ê£ŸAjqZUÖR«3â¶{£é•Íé³ûÊ:ƒZmp™lÞ©ÁlPY}%®2·ÝM¯ ß)O¹$Ú9·ŠþúÇ¢ÿ½gòOl·­FÀµedx̯¨¥ª®EɇúúZ€[ÇPK%˜tiÃüù
}Z­qàÞe6nAkM¸ËønNé%“É܇câÍÍù\MêNþNünžO
+L“Ân³átá	"~`V_?ämN4rN®’)¬¾¸Ç“ðhíåóêc6{u_\ÊéB‘DgTFµ(Þõ|åì
wŸQ­vX„KUÙ½´«—¶^¼´’Wk5ÁÕg’«´*³Ì䌆ü¥•éÁÚʁ樠™œue6Oãòê7	z…D¢ÐÌ[¾|Á¼ÄŠK{*WwÔV¿¾4•¨ê\8š&ß"7³Q=:›kµÊyaä+§ iFjµë¯Ë¡,”tÓÔÏKKó¢ªï¤hh'''ÚÂç‡Ëÿ•‡ä<vî ïÌа±`
+‘›/^kï=¯Ë{¶¾„Nú³GÎSy–ãÂÏÅ數-Z©Dp»¢q½Zî\Œ¿Ÿ‹ú~T)ǁ*ýn..œîî–Ê¥Rƒк„îé1σ·vv^_
+¡Ü†ž‹¬M«õåÝ!³tç?’þÖ¬­·Ü‡#aiWÕg©>×>ݬLКک»©qáE¢çîÅ«/ë÷ˆƒ‰ÒÀM[W[Ø©óN÷½¶\¿™	YY§è¨‘æ 8nqÉû&W‹¾Ælú»ùü®Ùô÷Ñþiôö<]B¤—åóA™C€j´
<¦ñ¸2äê£iƒÇ-ñøÄl”4r{J»=‚µ[è›Jµš_ž:«R^çI‹Ÿ%œ¶
+ëMµùÜHæf86û§
µÕT·µ\ö=‰0Ã4Mý‰ä{ŒÒâVžy€SiªEsA9…AÄJÜ*	ý<'×*&.°XÈ-
+­œcy5ŸoòCîg0¾tg~ŽÙºX4ª)ː¶´àÐÔ©4,S_¯iȐHZ™f4-ÝÉnM… îªÏLþø£pL«èI½†1ºM}ò¾Bh$™™?*æŒHi2©˜“EŸ9ÇÝùc‰´9ʄ¦N‘ûXM;å~&‘ý™Óx++›|öBö³jSe¢JoÉ9¾@iÂ.0	y˜QZã@Ì&0cù:휸gÜÎ),‰S.Ÿxm
+Y‡GàÕr–å)°
+–¬æ'Îò%V®”Ý E7
ÊqtãTfé~1³´,-Ï¥•šE†¬K«Óô[Ç£àŽ#ŸOà3䥹…p7MíÖNGfH…–¦šÂK¥M7•OÓLç¸WL3-|H"j­ž™#ɔa®‘a{}Ey­KÍ~å+¬ÊQU­2cùûoȱ5U­vª¸îgÖòP´Ú„…ßUrŒ\ÉãÆìs¼RÎp*£?Ž¿ ³¨$ŒDÉgOá2™BƲ*KIöl:ÏÀ^>ùіü§V±\®BVX*[¦ýV7o5gÈE…Êêê¶ðún¾—]ˆzQ¸Ó3°éwÚÑÁ+欣÷09•U«§ŸñVMËI¦Nª±DJ®:G¾¨¿´ÂL¤;”.{RiNÅ#	»JúSæ‰>ZIÙdÙ£TcÖâˆÄ¢bª|
ƒŒQXLÿAÖYµ2™1`¡ÚEŸ¨u¾›×F4EoÏÓAë´ÒYفù3óŠ ‡òX^Àµk%šy⨫^4ïô[còÀôäQGš·t©‹É£p{?)¬ñ(>ûŸz”ñ]3|z2ê´¯Ç($£Âê÷g1­ÿ	›ƒ‘«xAö„ÞÄÁzF<ª%ý#Ÿ=ŒGäà+œá›åþpLç°Ùµ„­¨¦ß£#ÑØ
•%.»]31!3†9†b$"úbÎöbhÌh3î$¿æ<¨
+µ¢
tÆoÈà'Ó<j§¢´©î¦EOI `u?·ÞŒÚ4m¤­MO=‹šqsßÜ^õ­j¢ÎL>sD®ìRÇ/@Í/E†OŒŸÊ%qÂ¹8æüö¢/Uí›;¥3XÌè¤{žÜæÍѝ¶ßXK~"Õ{,6Ÿ^Êx7·¤V6{ʖ]¹²…·E}‘¶J¯`0²2múÂÎþóç{äzãÄõz#±õ¿¨/«ó«+Â:—ݦ"×I)ËÊY8Xn­ZPU;Peq™ýf¥Þš]mÒ*ívGÓÚôĶX(«ñ	Áä1B2EC1\Š;;çCzäAը∭ÄVÂ{aú)Ü(þkZàÍÏ:+ŸáBϨ
°NO…¦‘WÏÌÌϊõ0öøÊ}KWï[^V¾òÚU˯Z^^ª3NüÒXRb$¥FݓJgeГp©ÎDÀ]éÖ2Ï\³&Q¾âª¥‹¯NÄW^9qUaï–u&ÖxG4ÒYi3D;ÅÿÂ<Cn72 #*y¥Í^Î؅šg=‰ãVP¸˜j?•;ƒñßå¬6äsa›'¦š˜§Ü©—eïfÏW–(%ÔïûƒP¢–± ¯ÙsÄv8™'¹[lǑVAC{4X³×ÅaÎ8€šO
[OJƒ$"pºR¯«Ìi৖등@¥ÏªÌ^Ï= ¢
ʕòï)ÍzÃëÔÙ/åÇEŠãâÓn¯fæ¸
+Ú»ø½RŒ¤%Θ'Vm"ògÙA‡/¬aäpKœ~^Xø¯”±âc…15N	ÙÃÙ낁ÍӍ…•_"KêyÕïxƒ³Ìå
kYÅŒ³Õ:žQèÍÊïÁ hcªÏåÇóSyQjl«~úhÚèq”ÁϤ…4ïöx4{mœ—Ž2a=™Ê/~Ó-,\h>ÿ1lúé¾Ø'¥*sÀYQ	ªû%zWÔåŽ8tÒûT¼*rL
+é–ì&v ’2RµU÷{^1àVÊ~¯·¨¥ŒL)ܑ}1‡
+S¨Ðž¶Œ9´ºÑMÛµnNªY—Ö¦%n­vhñ½‚Ë„M^*èððœ=žÕKé´`ücwÔiV>¯ä´e¾p•K+Û¾K®u%ʼ¥ås‚ÕW‘ÜMäÕ)ú•œàäʯß'(d'èT§”9“½¸0~–G·1‡î3ÓÑU‰èr6‘·"ÀÀÛĜýÁéBRÌä.HïY‹º\Q‡ž{@YDøŒìfn%K4ýïåJi
aæïÌN̍°æt„M{,ìu
Îނ0ÎÝãY½¬6¿àŽºL"ÂoáKey„9"Ïê¹³ˆ\«<¥Öó9„¯å¡ßœ WŠ¯Îá˔q#(„JQù!ÞemIÿSH¦€õuÞõºŽ)%—ï
+ê2/?^L-~nΣ¯Éop3em5T„ü¾]ªu™
­lë–ÔÂÆ*»Ó팕{>>ÅÕ]r…Æê°hãA¹ !ôkZ·]ã‹ø"eZA=??›™JÉå(€‚¨íÊgAÇðýH‚´øþ´ÝÂÜâÄÎ?¨U.U\ÅÈT{|Ø÷£KŽåÁœøŽ¿´fx|xzÏÅÞMOs-,tùˆD
&wxËË]œ•Zؔtzò‡¡ÜåL
$iߝïÄY’^mºh§+à
+úä<GÔ¦ÔÐ<—+èòd&þGCÜ?qíH@&0—ÝǑ‚lE:0”¶E¹š1‹˜ž¤ý:5ž‡3ŸÀMÏÀ«{z«jºû’øÚêޞ*Zš0°/tÖV·uÕT·çÙƒù6¿6³Í±ÍÖ²ÍUóU]	¼Î*“PšXžks~m®M8æÚîx%;ómh›·ˆmÞ¶m4nÆf`ÅðgjøÜÚþþšº¾ÕøH]5-}ü;.ÛYWÓ
väÙ
+ºá	."jyíQNcxWXÓOæôSî[
++:Cn…å‚ãèÒGÀÅ
?\«¸‹È>«Õk”ˍ^«Åoà³·ø—âÒoG@N:ÖíU0._•Ìjƒ
qXÆ9i{k†_>u²8²é&„QJó²$¹OE`’r7¥ê—¥ì.8^pñáòÒp(g‡Ùwã=I›µr~ŽÖõëCñh(+Ï~ˆr“Vɯò=	Ӟì{²/­ÌõDÃè•÷ÏØŽ´zWÕÏ[^ïp7­¨ß¶ãîÒx¸¬4^Î.—+ú’vk¢;^Ñ[eÛ°)T--‹Å~újsö‘ÒïúFÞ'
çÕª6fðŽ2Ö^ýdiðO´ÓãŸüm¥IüŸÚÓ¿†4üƒ9¿Ut¥OÏÞÎn«µ4D3ddÌÃ7eÈÚ´*‘@ž¯¬ëvÛÆ3¸kLÙߖÁóJó;~ù”–4O¢ð…laW/r2†9>@‘ûÐÒi¿Qv› µËLCZZ÷6Ç:Œà‰1³·eúº+×ÕР£¿Ò®iì%J“Ê¥Ì9å1-/c;öµšmÖúÆzóÞÓ÷¡&^ÚÔÑFËwycv%Ã0’HýM¾C·¤>Œ\Ǒ‘dÈÍG.`ë×t¢æ旘ߓ/„g˜©ü£™.~ó–ˆË]fá±Uáª.-­r)9¥§&®u+•îÚp¸Æ£ÄzÉÜH­H©R¯üha¸Î«V{ëÂe)ŸZíKQŸðÞÉf|„=‚ÔL¹—ýê3ôÿÜ]4ù³ú[…ºPïqTMž@͈#-GÕÍð
+[3äú´…ý~—¼äÇUÈÛëû]l;XÑIyøòi’u`ŠQý\p`ú—»Ã*I½–\(ù´O+fÖ¯/ÝÑ%õUžr«˱Ìà6ªªû&[í`]rA]€—*dœ¤¤nÁHÕöGÎNd©ôԖ–
€LYi­GÉüvñÕ#õ²çt:Xr„·Ü¥f¹·®/R±¨ÞUb.‘›£^Ÿ»ÄfÒ´œwóÇC³€œ'ÓL+{pêgŽ°N™²¿ÅƒomC†ƒ”!7Ò	&;Ò¼D§óó¹ì·‚íR«/2ða™ÎnØ'՚½V‡_ƒ¹]oUÀ—ð¨3¥-õµŽgx•Œ£Þ*.¹ß[f”JeÀ“šì+øIæ1ð“âÈsÐ_rŒ\è—ÄdŽð®H§Fñ“¹v_¢-ÏÆO;wOžTQ±©ñ(¹£J¦µ—\	=óXì^èÙÅO•Ï[éV3Fêô©ýue‘z¿F㯟Ø!öõ8O³ˆè«fZ_œük¾¯!d;ˆJ2$ó8ïôYú85(ߓÍÐÍäxbî^ÎõÓú7»|z¿ºÊR”*+›Gó¨6ºúó0.…õN>&gú ”7ÓÖ°‡[–,I·,Lß:œnZ“¦_åŠvO¾ÇUwé*éCeO#3Ì['¬•O€&à—xr›š>/™<I¿Œ}œ¾f>šû¤eóŽ¦EéþqóÂEô¬	ÿH¤Aé¦UMËçøƒ±œÍ$ñÿp;AæJÚp†ÜtHç#ŠéeüŒ´ã¼ùY"Å cÕ~1•T”=Ågvú5,›º/Ï6oˆòóÛ~R醖ηT”î\Kûg„›S…òÒ-1Aº¡i“Tj¢³‘©gFĶj‘÷ ýˆ÷ð˜P‚ûÄkL@³IÑ9yêFé$ÒO;ù/µ«Òí‰9•RM¿Gª6¹ÍV·sY¢vUx<1‡Š^ØK/˜¬n¥ñ^o˜‚öÓõ5ö§ dÿò	`6)?ÿÁhŒŽÀNa>ª³!S²0„SãÏk&>?nN*c’j¬%…ª1»]í¬{žÝIû~…Dcr™¬Ôv•+w…ÓÌè£kæîü´èÿ±N³eϘ°CÄ,0fuÐnb:hs·þïíH°%Ukª¨Õ´A&3fŸpb6„–sY‘ã FÈàïY1ŒB:¦0HPüÌ̗ŸŸø°\_Œk
+[RÜó}	6DŽ€YŽ¢ÄšŸK”àØúË
XB”Ù+”•Œ•*åø\cԂWËJÕ%Jh÷kÐîYb»®ƒÈx)•0‡^¡åĆOѲ-¦Bî…mú…WӖÁ¨HŸËw"hRq¿Wa͎B;xÞSèBö6CÔJíøhsDl¹ÕŒ3ø»cv5O‡nA`0‡„j»
Ž‡ËJ*8Š'O'N8%B‘ëÓ\`0ܜ1Iˆ¡Ü)¹ß
D?äTÿ§½÷€«8×ÆgNÛ^µ½K»Ú]i¥]iՋ¥•%˒eɖlɶ\eI¶…­bWLï
L7	ÅJBL1²1¢Hb8àk„$„JBHHØ«ï3gUl'—ûÝû¿ßÿ÷»×ò³Ïœ9s¦¼óÎÌ;§ÌXî@®Ï$7¾(;»üÙjƒZ`dJî4G¸A“ib
+%ïÀÿ\°P¾}P¾¿Hå+{ԙO
+""~Šøˆ¸h'3C9/ð‡'N?*Šü_Iý¬¾¬F¬‹L²ßÄݙVZ S·À¹€xNöÌË2´j„·4ÿªž’O*Ô2–Ü`ÃÝx+„Jž¼ÏqýŒ“?e;øWÀ&µ?
¶h3sˆiWê¡,äŽó[0¥I9•Þ—äõîHzV¡“˜NïÊõe88>yJ£Wòr½Ý ìÕ¨a<3Õüý‚‘¬=¤Òó0݈‰œ¹˜³ZåÊõgäºTÀ~àäwS …g¦ÞÖfðåɋ™þ y™,¡ˆy‚ÉM(ÓU|êóô(Fׁ;ÝƘ198#é•3š‘uªþ³l*ÌÅ©E?>M-ô|…RG–ë¤ë»’o²[øg©dӄ`NÍ4Ž«fJ–Ÿº	7½	»^ÎXã9a˜ð§Ž(Rnî
»WËsr˜Œ8<Ô©Tà½L)³éaÉTO@—Í¡˜4žyÜÃ0¥[rÝb±ã»@
xü÷òh¬¬4ª´‘wŸ&?Ã?ã8fÿtL¾Ǚí'[f³ƒW•SZ‹•”Æ”ö)ùÅøgÂSÌ]HóïåÉ"<e³|´Ú­vþ
›…)-ËÍ-+͋Bn>OÞÈ1“͇î1$S~ƑêYbà˜4ËÉÖ´4+{Ē–ü$ɎÇsÈÛL7a;»ý¬OÍ!¤ÔÔIן6§ØPºþÒ¦¦KºJSÌ\ÜtéúÒÒ.r´¾´¤ëRb;â	|?óGhò}ËoÆ+ÆxÚ=‘i’éX]“X ÖZr?ãâ¯û1ãYäÀ_ÀD\?Gb™ÑCf¯êR±=œ:A'ÿÐǙŒV‹IR
ú°dÝ0Ö¥ËÚKnØ£³xq‘ÃY¼¨ˆQÛ²|¨å—ÿ ÙõƛÉîê­zèT²M¯½þæÖ¡7_?ÞÇË¡×ÓZ ?]#ä'HiFƍfþ)Ȗyñ—‡Ì%Íٛ+u;BºI\XRl,*dB©>ËbdŒŽ¢EŬÎveåZ„%Ë:Úy֞›é
;Tì¦-Œc뛯¿¶‰<’C–Žâýo¾÷ÿ@c!·¼åüϒK ?w$fæò—#/rŽ#³}‚É9¢´¿§s¼Gô†hΩ·ŽBkk>ÕbÓ§^wå2×hH¾ÓµÚä2à"9ŒÐFþ}„ÿ+M>‹7ûÌ
+…9ÃQúb¯Ü’AtuYòaœSv‘†r
+½Â¤Ï®{O’>*6ÔÔóFº…ǬåøqRI&_2y…F~뭔q1dF“´øLÊpܑa‘ó[CŽ’
Ÿ™¤\œ|ˆÙÁ߉¡üC(ZW6Ád'ô6mzuµûdZš¼ðdpÁI¹˜q§¡91lƒÑåTüøQšÔîhdޜґââ¢ÔëÎҗ‡PmfiÙA3yüe-ð°,ØaÖlÇ¢MUv˜ÉoœB£¬_`¯ÞÔâȶµM¡G“gÚancÉo)+kÉ·(ÒܖL­IÅýёnR2_{ÝðƒÕʂ£2ÎL‹‚QŽn½pxoW>Ïc¥Éo'7ç06D›ÏmÞ´tŽFSÙ¾iá·6FŒCM9ô9´¢‚q%šOÄ`ŒÙʱ¬¬æ/y^_xr®ç¤þtA?ª?u´`J5Í©ï.%AT±ôÑp”¥
+¥æÒkà¢,@ò !Áb¿”Üžm—k”äã,yP,yÞ¢²²Ey…Ñc	èLjŽì]aͶ‹rK/*t
+©r,JÌç7vÖBÉ×ÅyžQšÒ©’/X¸gá¶Þ&&Z×Ùü­…9(¹Éï´ûMJ,pùëöŽ<X5'l“a•E\ÿï2f;È_óûŠ„:&é¼VÁEr0®¾ŸHóYlZŸ'ì
Ŭ2^Pªü*NÄ•Š29~T|3ƒ-!¡ÕB¿"	d½É’’XSÅÅV+ÙS|KPRl±Z€Ù•&Öíë_ó9åå9|ø]ØãfÒþøÇ4ÆíÎÒMûëC7kú˜= ˋÇíšý_š-ó—û5ee«V_‡vÿ—&«Õôå~­Sô%åZ‡žfïäw£j/B²	æé„&7Ã)¸>+…ñùqĦ{è=zŠì^F—*´¦zªç%Ó+O‘µè
R-+—/¼“hvòÝ<¹Ö¤aiP
éirVmÒÊò“¿ShÉ-d­;É;´£ö‡›«8V¦„æꒃγï8ŏˆvÔ¦nâÕíê/ÿ±ÂpsÁÚªJŸÖ¢“{ÜÞ9UµAð'ýéä_ØÛùsÑJTwx
ªV-!ßé9¢®Cfxñg…u…ŸYK!üiËçk¦©•Ö×Ó2Ÿ"?©r{X©òªØe¦ŸÏ<«Òäd@;¸•ÉíÙqå}¹Z)ãøêÅ-U¼ W¨åÉ?@+DyXÒ¬Vcòã©c»Ö¤à«ZÂ%>
Ñ° 1Ò#x>‚°&l#ÇøZ;¨~°&Qí·»œŽ`uU"¨´쮀IꫪÜ¢R3+ç]XgwÉ´&u0A˜©,C+«úB
+S,íŽÉ<ö
¾	­Ec¨ûÐ/?g‚©9œ·±¨tÝ3L
Œ—íð[Š2™º„Gn)­—ËëK-Êkr69}‹ßÍÙØÎiæÔûÞÓ@OQ-~dC­?úʄxçqze©ß˜ºÍ={	±¿:’©7¾ÎØ ‹|Ü-#·ÅƒôkoúLÕZ\Ì>`V‡Âá²M×,)]Ӑ†9yâ¨ÐfÍi/K/Ê4é3«r—'ºkýŽhM(.êºdQdq"W+ãYV®’«üÅMñŒ<†„[V³¾.ãÓªº£Wé|ùþ£\LEnëürKpm%yŸ8ÍæPk,‹;`–Ù½v+䴇2ҍ~GeSW"Ò:¿Â쮛·eAH“fQ«-é6g†In¶[Î£#+žæwT,\×Q4ב.ÓÊ,­¹öl¿[ë•éäÖ6Ðï¶I—ÃkQžF
üS0ƒ,ø§	…ÚiQ¿ïkå0ñ©þXÚÎS-ékªé	aærq\(†‹Œ–LgI¸÷®ÁòÊ­÷íÁ¯¸½/ƒ¨8”ŽÏþâqôÌтžëV/»qseùVԃ'Ù7yÊ@yã6µf‚i<’°ª}d£‡…GZÅÝm¨š>L¶Ÿõ`vz‘CÙô*‡Òƒ{öE`.È	¤ø·øã¼ÁWÊÉ7ìlYåápEØ&0K]Fº¢ŸzW\ÞΘáb®ƒé¤ŒÌ)I_WÆü}»• ØÓ(F–¤GiøØ!W<žþŽ"-ÊƱC`ü“	#¨æñã±Y÷ýªd©
ž* ÕMÚÖÙâ肮¢Èܬ,Ÿ×g†¨Ê9fyVcwydnQVØçI·ØVU^Ä0+0]´­fFì KgùÒôdJå\¼cQPçôƒ¯ÞLÆAÙó”a'ۃ{øí©y[ö!¯—nûÍø&5y•á…J‹ßáôègئç¸Ô˜½ÒàŵŸgqJñ.Äͼ!Æ->	13hT:#ÉâÁù$™êO%ešzrZâ3óbÕ9ý&…MíÌñùrœÊädÎ³²C<kòÙk§Öi|65£LÖÌö3›Énž“ð0G]Š6¡sÑ´;¡kÙÁsʺºB½“«j†¹¦sk™[	ù™‚„2¦4Åb&%[Õ7ÁܖТ¬¬ºÆ‘BÏ{§¬¥gûéö´-$[šËȞquÒS.qa7ã¬w»Ä~ÊZV`Çñ4Ɉ™µ7k•Ì›‚©÷Ý< Âq±?c§×ã°IüÈ7õh…M}U§–Åmés»"¿!~ν#}·®ÏËZrîgíü†Y§Ûc™~˜ója›¿ `““·çY™!ì²ÄªÚŠc=ý£skÎíïLðZ{ÐV±(Ïd–³+‚Æ!_åŠrOEY%weÇ"¯?æÑ&ïÄ}¥ÝË£­jÓëww…7×VnXÕñΛWç6–Wº½D[X¥AãË[¿º=“è³6àÏÌ6iT*oAØWa4eUµ÷3¿3çæ—ø|ÅN[¶×˜æZi(t«Òœú@k[kÀˋ³{Äg°“Xx„Ÿƒ†ÐÅè´ãÐ֋m™øLJ£j[néSŒ
ÚænF÷˜­Ý֎ê'mÂÖ=:é
{óϛ4ÈÔG·xƒþÖ̙ÀøȖKZ;'7=1ZƒbdÍ.éÑÔV\ÌS‹&}¬?uÂ@·՘›Q3SëñI©ŒÈyœTUÂé[@ú3âP½ý†ø•—z‰
+hʭﾨ-qeHjjlȌ5ASÔùË;Fš2ʋ\.«Ðá7	¸C›Yì/xÒ9ƒß½aýÝô,(ðhó¶=Sóùk+U2¥À2¼\]ÝwÍÒg’=°Èš×|Î×úéžÇ1ÿíE§Öyj²ü%Ùî4yNaZVn÷¤ƒÅ7_¹cyAZfI \Ð[ÃE‰ú@ltçÖÅZOž¿ÙH&DŠd͂yÁšöÕksïí¯Í[3¸ç‚*ûÜQm4e¦‡ÅcÖ©,fý²û>¼±í;÷ßqõØÒhÛ-¯½QRš^2¯až£²^㎥³µP§wNþAÐó;Ä'KkQËx]˜ŸÀÏ6yZ‹uø»	·g¨7®l\Ù1Ԃ[~\¡œð¯;¿wü:MØ×!ýq˜j¯¦¿¢™°šL¾²g‘¤°	æ:Dþⶥ
R
F|Æâs)ã`öÒk7>¿-^´ë…ë/ûޞÊò=ϳ5k'¿|à@2ùð²5‡1ÿ­˜ydyr	ÃɌ¹U͑ΫÖä•o¼vif]yÔ,çÁúÒ©µÞȜhÇjs´>?RK×
+½¼cßO¶_üò×ìýٕW»l.“x2ùёÎeaæ;OaӑÎ%“É2‹×¬1ºlº’-wôŽ|»¿Hmrša¶š¦÷9ôv·íâókºj|Ît§Üsõ1ëØûøkD¹.k¶2á,YVíi7„‘É£l*^¾¼bY­]—[áçu«@ŽÇßúa\ÿÖ	q3o˜‚¼uü؉£o=¯?qì,õd§½…)KuãâBøfz%µÝ±^Áš²Òw7ýæ‚x1{_ÍЭËVì¨"ܹo`ζœ–þDmK$gÑæšÚæH/¯wZ,Œ1(í6›53äp¸.ðWÇ\GXc’Ý h¬†Ì@†ƒýGÇÍÕs6ß¼¢ã&‘WÕµåÆÚú«j·Š<ÂË8†”ò¹Öó5J¥w8=jW,#·T%ø+ì˜UÔ²5.rŸ8Î<ÏÏ×lï@µ	_CqY^[KGnKY²ÔÖ:¿U0¶DKت‚°Ú݊ªÆãqkÙ±8YÈâ­·ŽéO¼e?n;b,›²Ng/ñ4cöé[™~–¾Áže?¨´´bâ‚ÁQÅÉü¹rS†Ý™‘&ß-(døø~\l‰`p[­nƒÀ\Ń™~îJFл­6ðqÚεxmaM·&ÚæprGÍN½,¹ŽW'(x|—Lï4›Ý™ÌàNrÓÞÉÕj…R…ï™ô‡[eÉ°$ßǶ¬<·C|Kg
3Âou-L¬„¿
éýˆG÷˜?ìG1ú–ï™oĜ©L™ÌHVÓƪªž†`ö‚sªzç‡Ô»ÂVsÈ©§ìÒ%˸¥ë²‚µkJK×ÍÏ®²E<zƒ'Ë
+l0x³Ž’ÚLG<ûw1š- çidÀ“H†æàdB=	•F[qv@bk”‹PN¢²C?jc؄947ÏfÙ¨¸Rnnþ]™Ú³ì=3";tÄÈ`ü¨X¢ÇNÁ(/Ýñ£³µ¯dÒz~1“Îúf¼Q(.0ý^áét°U™‘üœËõÊ´‚œ`Ì­åÛݍ¹áZ[;¯uǂ9&¥áâìܼ¬Ë
S!:Ü-¹Ùó\í„天ôÉM9uy95‹5w^nNM¶™íŒ]µlÙÕ?qLræ€wiô*Õ~ñõU“ßù£üË;WíÍÿXbrN&žÕhá,…³IsaÇFå¢hEG¹;£l1¿Rùý=ïG›ÑµO ~².²Ži^׏W×.&+«}z{ãŠöBTÛ'&?JXá´=Xûj³«Y½ú§K,Kšá/"Ë{
+/CeˆÁYG6–Áßúª	œ;Y²~·?*덭©Uu
g̽#Ǐ’›ú£qñcïՑԧv¡©/í
+IMÒrgÎ
+e©[’étõ¯©CbœIÂïõ®¢æîÊ­ŸÛlX§3²2•|Æ+tZ^¡–m45ï|`kaWKE	íF¡‘ë#ÕË+J—Î	*±Q¦‘óF]ò
Lþ¥£åÁê•ÕË­\£àÌ)p¹íúòþý½¡¨Õ—¦Ð¥ëM!cfÌæK“¯Û?R­³Ùi®ˆ—XÆ®t§·ri‘<Íg‹eêÓMFš"Íg†
+ZK=®—Üš%~¬dæ?ƒqöügÑ2æ&Eþ1Ò£Bü“„º*ª¯jh¨ÒG9°ª˜Û£¶MLþõ0ԓ­î)BÍ0Uq7Ã_FÛæ_–ÉW—´fsfO(v¬àãêcÒw§SۄDV§=–lâÓ•—Dù¯}N}‡*Ý&7Ë<²36üxxÎНë̘|ðàYdŒ9²°*ת$÷hâ-ƒMcÃùm·llˏ¯¹r™	ÂùÞ,‹`rUç<YêI¦‰7®-+\µÄ—ôõ÷µÅñ•WõTÊa¢*ç•Qõ²fµYss2rl
+OÀ³¬!¯*–™]Ú6¶¤i÷ª2åä*GÂ}—Ó¦™
»ßê
›eÃˆ{b‰h0»¤•ì
ÒRœÿ췈ܛîš|îÈ´k‚0y\‡š#‘y<ù{öRÞ²îzTšÀ¯Is:-y¨z‚Ùuؒ›,b 9i,‚¿ºr¨ƒC!g¨Žìo¯–¥ÉBð§IoÓt̼+%bº6>›ÇÑSô¦7%Û¢"zƒ¤dz6r†à§­¡æ@¤À­÷øµ)îy oÙ®âQ–UiÉÏ
ZCVÕûææ4–x]%‹
+
+
+É*´ƒ›"›Íbà¯Jݛ»Ìñ×W‡ÜÓ¬¿25¡»„Õš ˆ5ݒô˜\îô†¡Å̓ó3¼A¯Ñ›²ªƒ‘çô80¿{t΂	溄Úc¨ÍÍ­5°È¦Ê";aÅ㆒	xÀæ>Þh4
+%pŠn;—nTŠŸåGÇDE-˜±ïØÔnß3¿Ì9ˍ$óé{W!wÙN¾­Ðª^¥SœsΔ«xÓ7zrZëJì*%·9µþ¢†x¼>DŽ5
+¹k­U$ÿ‚w¯+dS¦vÃ=
+kÐí
+Z•«v=:\¤±z{ÀA<\é®ôêՕ”Ö ÙòZ‘¼.í[2z†÷ƒö‹Ú×Jµ¯UÒ¾ÖYÚם¼—ÝǯDU¨>aÖ;tÎL]~0/?3ßbÉÏdQvž~{;‚AŸrÏ?T\ïkAÕÓ¦Ó‰/Ù¡â˜þØ´ù“êTeSß5O}08ÕÓÖ.°ûd*
؋®€9P”iå=¯Ñ%/ÿ´뼅™Á|§ï¼3ÍLÄøTº¦bõ¹ÍÞòX†ZàîWéÙv¥L!3†æd¿¥´†Ü%y'÷ªt*^|ir(¯„|	ö•-	ËÔZ•:ÍEF-÷äìŸy´·5O E“Ï!ƒÖ"\1ÁôÎψ„j'ÓãÍÕ!-oÄ
+²O…)æ	5´U·Åð¿…Aå	¦›ÕoÅOÅOÀˆSM>ƒ.(8‹ɲ@ÇĵWG°YzßÝ?í˜þî‹>t,˜vL?E¦·"K¦æk_hiš/èoj{ŸÏµiiÚÏéoò³ÎTY)ö„
wÕ÷ȴ£ÞÌ\FóÃ{B±¼ðñTñ†p^,´'œ
˜l¶…gåzí«¥ƒÅÅe¯j
2–7EÄ¢r¼~òZV£}G<+;¹ïþÙãYمEs¸,­_{¼Á :¸v#q»Ü«V/à\MàN䶗e5¸ÚUªvWCV™€¢‹Û:æ4¾ÖY$tÊV÷d<ð¨m´[Éþo©^ŒŒíq‰ª§î‹‹K«-Mÿ¤lnV³èšÒ¶3õ.-%ñ´©Í¦ÞQ!¯øÁ!û+A©“g¬7˜‰c{&VXC_È$ÃÁwàÀòyƒfXKh£½³Å°# ´…½Þ ‰Ï|'+­aqcÿ:ƒùÔs¿ò³Ûlé&Eò·¡¨-ø…†,ž¬Qà²ä`Iî`ŒœÅî`,/ˆºK<ù&ȵ)wè’äo±jgéäØWù€øžï»©•?L>÷8h5Z€#0Š8¬v¹ÔEO2"D¶£ g  5Ö±êòÔœ0´TÊËãƒÒ"m3—·­N(ÒVԉvÂȓOðk§—KmK¸vÍêã«#¤g_ù^q>бÿU)@-C3ýàÎ0âN[Ë'eP¿Z9úÁÎËÖWeju‘–ݏì6ύêäÄ*Ð*ÕÁâƼ֡z¶”ն䬿zEv2iύ¹Šó̶ØüXt^Ԇ®ÿÖÎyYÍW}såÂûﺾ?¡ÐÂX—æ2yaüÓèՕ¯X¨u™4Å=×49•F»vóÞ¥þŒª%äNÖ±žÈî%h>ö¤jª‘ö?¨ç=ÅÂ*Ì&”ßc‚?eé“Ì
±Ò”´Òt,š;Á\tXY4‡Ÿ¹šEZBa_1Oß¼	lž->i“A²’Êi
+A%µX1+j°<•æc¡ó°P‡…,c¡…X(ÀŠ(VäbEVD°"é˜õaä]ÇþóCë‰@Îü‡ÅßYËԝy•Î—èS›ââ´Bñ¾ýÀ‚}uÎöƒ#÷•¦×tU´•{JúïݲùëëcÞÒ¶Â9ëæú“o›"Ց¥mæœú¼ÆE{Ñâ¢h}ÔÚÛ³¾¯\~ÕÚüœö=­%]KÓ]5Í«Š[Î_.›[±x¾Û×°d
3Ç_25×ùŠó¢ŽÈúSG2çÇöxÉKÛRÒ_–AMŸ÷ô Rõœ+Õs.6=ÉÜUz|F•úžoI;éZCĝx)´Ö%™6ðÚë³}ƞjb㘪[ZŸFHCáÃ
+%fL˜!ñ;'þ/#¦tB´g[7›a!rì‰øÖÇ.¾ôá
Y[»èÒG6„“Wš½9¥͹FKlAa¨2ד&c®¾í‹ƒkVøûíßøRäV]³©
4bø;[¯zlsÄ_ØsyÿšÌAÞ
+ÓiOê„F‘…a,alÄyÒd3‘‡Y”5ÁÜpÈcS&&ß~<
i0íI(ümY:=Vñ`ÁD¦w†BÅ«OƒIʱ£d×½µ«#HT<g–ÆYÎŒ¤H
+_%>¢Ñ«QJO7$e‚ ÙڙÒG|ñ…=H¿SÅrÑLÔ*þüªx3G®Uc¯³…¼0ÈÁRñ=.°dÀÂ!F¡Š]0¢â
ÙA›×¢•æx“Ï¿|Me‰o²"öiп*l”d§år0M¶+Ê°*1!éb[&˜?)Ȅ?Tö$yAjòª–*PUöî;b(-óùÊΦB}	MEˆ.ÑO­3·bÆNñqºhSŒl⇇ÈôR ó5bsw&Òfår¥cÿ+SžîjðéC,¬Ó¾\¦úúüýiž,B`³øL
+Ao7½SÛ5˜³ª²+V΋j`ŽÏ³‚Ò^»~[¢w_O¾máUÃûpRiP›ÝY•ÜšãOeú͟ԏ¬]H¯È±{2½ä>¤Õk5Ø2ý¶‚•{ªw]s`ëmj;™¯·‹kØg¢å¸FZ]E>+뱪3Ui8‚ùQBÓ²$ؒ¶´¬Öù$C6È~ŸÌۑ–ì
+ V¢$©÷î@H×1TÀŸ¥XhqJ Å¤é7.əÀ\ÂàóñdÓNÜ<µsgǬ~ÁH¿éŠÌÜ”TíñHj›#cÙt;©qûÿ}f¦k;Õg	SßÇJO¦'ug~¸4]ýfËYpÉDÿÜÑåF…ŒÕë•ù7Ԕ,­pûçõÍÒÕâ“ä­ås|–H]´pUcš¬QÂ
+S՚Ý
k®ï.ð”/+«ÛÒÆ»»nÙP”æòèMÎ,w^¦ÓëtÄj³r
+\2KÈëÎ4ɝñù‘ôŠˆÝ›é“™‚{ºEŸØs–ì\X±aq©–•-&+ÀWÜ[/Šþ"µp“,Še,¸°LeZ,h°Jì$UDò@ôÑtý³ñpˆãPY&?Mhà¤ÅZ±£ã0¥ŒLàÞÉô6ejçQ2×;!ïF“Læ}t)ˆ4|;Å!Eq(‚ƒ.Òã5ø,y³òÕS¤µ9ÛJ ‹õOO¤¦3žîY-؏ÓÙwÍƵ'/HöMH´yo\‰oàm‘¹±‚†ˆiDoMö1Éx-(ú ucâ™=òłiÌódÉ
òPýägùÌ%§߅‚6z×Œù}©òŘ/šÕ±–L0êÇÂñp\ë~’9*ZpbMÐ6YN¶&ÎÈàgj}ÏxN«b¯<Í&
+Ç6S×É®IÕt³bjgG¦ÚKµ³´ìbœ]‚¥¬ˆ½è&™Ù½ætSšý¦
Xa©ç>S÷K¥Uûك—>5\¹¥£Ä@…)ÔreVíºÚòµsžÄ†ÆòµÙn»7ƒéU÷¦d¡^°ïžÁr|oß}[+uV«Îh:ȝ«Ëj+Z\š×TèP»CL<ìW;"žÊâ䇓¿öòý£4bö%q=½Vq=v-ò¢;S5dļ
«ÒS5”Ž¡5¼|H̆§r‘9UCfœ™Ÿ¹¬
¨¦£U5s³^¢ûâ–-3䯕’€¨u쿼þ´.jê[‚Yá°Oq2µ<Ù!¤e…ŠªÜŒ¿tê³™¬=Ïb£M+ãö»#™éi'3ɚ2ÕÀ~ZR鉸Ô2[ÈDšo€LÈj7šÇÏÂȒ‡æ¢Ÿ§¬Ò:ižX‡Ý0ª\iµhbÖl£b‚ÙùxfBԕÄòùd3õ);¡È^2¥J`É:fúâÄðã£D`3§…uu‚¬ÿ¨„¾}:ò„‚Ä®?m<ø—IÐ4fÌ
¹ÓW9,™µ):7{éàböY}î¢=‡vEÚëó-Jš»:§zqþÒц&zÑҍ×uf•g¨óò®šL]òK[^C^¬.ג–57V¾‘ùþ¢¾yCBm4™Ãô°E¦5j+7\¶À)Þpê®{¶ÏÍn¼âÎøæë:é•mùE­E?ÑX7ó<ÞÇÿŠ‘qXk7ƒOó2³‡ÿøÈ$ŸRæIf«è#'>❫<¼Y€Ò‘û	г'J«A¥V}âÚA^͍Úc³^ᚶ;S÷Öñ>…%ìñ€5¹Ã`VóŒ T<È«M^»ÛoäËT2–…¦ª\Îh<ö4;Ø2›ŽÁ,/ãIÛªš,fö0‹Q1*y™˜ÊÇrÓsÓQÁә0*ü¹.p1.ë/Â;Յ°»Äû­§Ž¯þ8µŒÔÇ3ÞŸ²À‚glc)`fF—tlZ
ò¨»Äµ+ò¢ÞÂ,¯BP’ÇVњ–H]o]º6¶¢©
g«çfx½ÇaKwÙôùKó#¦`Ôh6ÊMéNwºÉnÑyËÇüó–ôÖՒw?K'3™­PšÔ
s4ü焦¾1P_¨¯”²ZûSžp!íœû‹&{CQރ5²ïöxøšŠƒËCü¹ˆìù&™!§ W?–žiežn„ŸnƒO•?8m€Äþ`¶­Ü]m*MWÈ8F¥–¹s+3«ká9‘9dÍè!‰†ú¼Âô²¯\£dX^SÕ›ÛSãkh
+×ÅîÄê9•^§Ð¤ùì^—Ö æZ2íjÁ඘:¡ ÈÖ[ôžÁ¦Sªmf»pAÎüõF†õÄæ^#6ù'æ2æVñ9oÆÓȄ‹Ë¥N(”öýºóýwñ‰çR/Àý;z™ËüF·×¹2GZWŒÌuüPm;íA»ZëÚÝA«7.:¿3_qnSӞUÅ«v-(iγ˜cMÅU‹r
Ö¼&¨µÌÉ/ð=̍Ð|¤<™P[
¨04×ùü…äK|h	«Å¦ù¯šÂ=rkØK_ì0ZÔTòƒœÊè³{i¼‰,ƽÿ¤TÆ©œvƒÍ¨â»†Á/p‹<P-Ȧ咖<BZB.i
+	…Âz |¾¦ð›,Š},î5=õÉüè­F¬…îžgíydò—ðä…\
+òp^¦Ë®hΩ†:Ög7”´bA§«ú8CºÓè0›5ΰ?#ÍÔu2£×ê´ëÍijg~}¶·²¦!+WsüÓehEۈþ’Ð44Ê

rV
úNđº¨(åéóSÞ¾Z”…-Y7xu:òê½LÙ'^|Ћ½^¾öügM¯˜Ó­¢J¬×|^³Z¼¸f5AZLà,íƒûFzñl
	3î1
Ñ%£õYóKÃF¹J©pf•g{sœmFIV5Ys‡,â[—¨ÊŽ»#9ˆfʂ*»jqtÎêj¯!£ #»:Ëô\¼¥È¥ÐŒ
¯Ï¤ÑkÔiÑmRòZ{ZšMÃeù™:ƒŽ×ÚÒtf­\i6ª-‘DØ{äœ=TíD?ùÓÏ\#ÚäÕãÄÖƇ©­=¿–0YBÎg£¯D™è>.’oúyÊÅv0C-øxuœ®²'Y֙ÿľM›eßÊ
+˜~­:¡°‘§CeòC¥^Á3¼Bö*kLgfghJ}òæî{&22º¥@´Yèâu^‡Ùc3kp#òàdJ!y…»’OF'ßfäãÒ÷„øùž™ý=aɬoÉÓ	N‘æ
+»ÓCVÅ~Cat‹nN)S딜\oÖq"ëlÈõ-ùJ'ßæFˆ3£4ær`sŠ¬pȅ±¥BÈÅ6æ68¢g „x„¨€ëÅVdã‹{lÈàŠÏÄ8Ê ÄíbRŠ!L¬EJew*„¼þ´&)µÝbHÿœhM¢µì‹œÅP渀²'ùc6£';à™ÀÁqµ@^Ÿ>vêX
¦”ú`ú¥žé×ý§?_M¼µ^‘ü‘’>QU%_RèÔ2rC—©¨Ÿ—“o™jò¼/ùÐÔæCKÈ3?'Œá¸Mi ~eòa¥•ÜýYŠö±ßf?BùȗÐؑ%ʹ-™š¬…Aü¾µŒ~kBoÁâé-Ï0N™Iâ¾ñ´·b,}qs16ËgfX#×É?$?ô
+c–ߪƶ䇼NhujlÅfA§4fû­¼Œ©I~$ÓËáÀ&ã!ÔG‚Œ\.†²zyZ–ߦI¾WÈ\™! ‹2P„}•[
+#Nšƒ²ÍF̏ªB¥Ò䍕9t|æ˜C;õö1ýÛÄâ);ûBxÖ-¸Yï^I!˜«téeYÙ¥dIŠÒ쬲t®ZùÉÛäqøa{åZ…|òôpì“Ù¥d©ŠR²B…Á¨H®rf’ûs™Ng¦E©´d&{³Êüz½¿,+RABVÑt	¶²÷³ç 
r"÷a¤•™UOcqÈ¿6鍩úúÝÌï$
³D¼ßj>ś­f+ó%üÌp³ª¢œœ¢‚œœdYqvvqAn.Ÿ™7³7reȍìãFd›`ò+¬:;ywC\€|Gv'kšÒ
[è:œØò7
+š4Ý)¬Õp؅I·•kÕ§žcŠÈòfgf!Üyò‚GÈ®ãð¹ÚPeVžK-$?M~!ÓºóI6 Åì®æcö'‰AÇb5ºô‚”ñ#=:JíLŠ1¹ë_\l±’]¬ŽO!!&
Og§^Ö§)Y^cÒ²H£cªA‡ŽM^"cL!¤®á±$õl1É…B"ÿy`G?ÎETƒ
+”˜ô9(ÈMà×;ôAŸcãCœ^Y9ùGãKÁ²;ñVœ¶ëSñ·Žêß:*UË̖<kÃ>CóØÇmÆäqÒhÉmÜäqƒ<4ÄQrC—4m#w€52•N~ò$´x§Y%xòÌ_#É	ñ
¥N"…ŽL‹7*µ¤Ýk•ÉÇ–ÌSmÎ YH+ètQ5$R¡?°÷3B[
©«ð‰q‡Á:¹Gy5Šý˜|î1sÒùµ˜Ùû•0®¸CVÕ©ÝJñã!‚ùG$‚Í©îæ„Ât:Ve8ô¦ÒZQŒÀ\ŠØkxï9Gïð¯ÕU~†ìrÑû©Ï%³Qô½ì¿žwR—Q| »Â*#^!^' ŠŽ*wÃù.Å’ÿÔ?®‹ÓNáWÀçÈúU!N¾FÀ‹®á*Ñ¢³W¡kD¸‘Ž€ý=ºP=ƒ+
̀vÀ˜ä
û \cGg@
þµHÏd k˜ŒÉNà p 
ÐX	¸ü3îGî~Ä2÷O>­ƒ¼Øõ"†Ù­’{2sç¡k„$Ä=ï,Hô¡Åÿ.†) žÅÜ\HÀï
÷…à¦8‡0û"”ÂðOÿ
©g‚/CWUpO!‹,"§ƒÛ„Ò¹0ҟö5T ÁC˜›”_üÞÉßp¥è2öeÔy6p×£Ër÷CÇ`÷Bؽ( ±O‚¨–ü/c—Ãu·£ågÁe"¾‡
+=ºŒÑO®ö/Ԗz
»Áß°pƒ®º«¾É»9®0'E\Êj¨›U£°†.àügÁ>À¨ýßÅ»BtùÄàÞ¿L`ŠNÂì ª•€
ÂÔñnäÈ%vr¢K¾2ŠS¸
+ENÍAöR½¨J‚Eä¿ ù§¡ä,~"„
+®	Ç®@
*f¸d{rÔ h) l÷CÀ5€&´“¡_ÌÈ.|Ù
+dç~2Ã=x.<
’¿pä4¼x$ÿYᛡ‡½yFÜLŸã-æ!»l
²ƒž;O‡XÖ3q×4¹ŸëšüÿmÆŸÜ
ì »‰JÛý€ð—ÎãX´™+GŒjòM	ýìë s	$ Όˆ\͸‰íBç	‘´f¡[ä/&o¹êãßC'…ðŒXw©xš˜Ÿ£ó(&?^Ææ£FŠÉI`”:æSpCè|ÆሬÌûÂ'“×ÃòÈWŸ@VÙU€ðWäsçiXs?쏐…ÿòŸö!è›^‚¶q:¢hžVä¥h´Õvö>´˜yÌ©“©C¥Àą̊¿Š\ÌíÐ}‰:ñ.´_2ùæ9poƒ¾`„ýð*¯#× àrT‰¿€ëàæ>Ð='ò1îٕCß·ú³Kw‘Qûdð[fÓ~¿a‹¡> ïcoýnôœæw —ì›Ã^¸
p‹è¿°‰m…c p…è% Ÿ…ù#;0 úÝ
ØEf{¬ý¾
ØÏì‡üÜø¶è÷ÀÛØÌ÷
AØ߂½aÌÏ':¡@—‘È¿!þ§j	˜~°{Ñ©uÌe"·3ÚÈä¤ì•Éabƒ@ž®áöÌG´!’w1ÚÉ]dl¦öBòF°
‰vÀsȑïÙOP3Ã'uä2n³ßGÈLÇËd3a
dGÆSaÚã|#?œü'·‰c¡úy-J§cYr‚ô­tÜJ¾Àý
µÓq+yƨ6q<ò CjÜaoDËèX29Ÿ\#Ž!»P‹8ˆývòrÂüSè×ùŸ£
î×þדçqOBŸJ°Úijc¿ùɱ@Ÿ
`>@	hÏç‰XöÈ^Ä1ÐNbLî
¸Å~å]ˆúöyÐu3ŒT7Õ'|ù¸*ÔíDõl
´ób¸n4*aæoEs
u _
+þ÷hÿ؀æJ±.9ö¯b]3
´g
+EÐnôh)XŸÃèZ±>Ç$ì„:Z”3lƅ¨œ}Uñ%pN‚d¶[/eoñr¤”e#¥XÏP¯²œvœ’Ö3±SS¶ׅä"~ýÂK´®ÁÖ¼†—A¸kQ³,â8G´gÕB7øõl¡E²Eà¾%`|Pó:€®'ºáBWˆº‘.¡êûˆ8§ì!Ôe>´½ÜA8'A²q–û…SƒAbE}¹]²I^ì“t…Ø]);â²@}; ÿ¢¾€~\Æ]ˆ£V
ì"á1ÿ:°®­fÿöËb˜ÜUÈ
áÝ G$ÔBº[ Œÿ 3$êÖgЯŸð	èÌZTÊ}ú+2ÞÍÃù߁}w*çFA÷FÑaiÜFÆ5
Ø0&¡ùǨÒXÕ¨ŸÏDƒŒ3¤ cÝTßü9ÔÙF4—ôÝÜùv!œ{å	Nˆk1o§i±çC}_€¸O‚Ô?ù9›¹d`¿	e“ºz3
szp
û
,!à”h9ÔÏ+€ëÙ5¨ŸmGó Þ¬¢N¡»?ÚÃ?ŠÎ¿Í¢¿ÄPG=’'²äçd¾ñ}=bЫ€})f‡ÃVÃØt±'ñåpì‚ã9`T°''?#U¡‹gü>‡rÞ4Õæ΃|œ‡º˜¯£;Ë`L*ô1+P? ›ÙŽnôþ³p,±›O¢u€.@÷"jƒ:[n ¿
cëEh'ý?¿
!y
B²<@eá!t'
ô•}üPœÿôß™Ÿ„¹ÊT	þ>p7·qËÑBp?¨ƒcâî½0ƒÛÍþ
+å²ûaüý´áýh)€ŠP™|
ô'‘KV
º\‚ —-ÌÛ`¯}
+á>AµÐÿ{Ø?Àu.ŒßÏ —@Íàžq–
n,´€u€¥€VÀÀ\ÐáåÌC û»P+{)Ì__ƒv|ZËþ-‡vÉ‡þé—ÐOî;z?Èb?ZX ù]˜˜(%8#u_9³åNðÈÍFUÌA°G>F~fÕ2ï‚
wŠÂq%¸‹™×Ao^m•&üjÌÿÏ\ãz®Íd†P3
+׍Á<ý”ÏìBÙLÄù5äa@Ï¿j¸ŸOFÙTÊ_¸	P+q'àÀ0Þ܁*ø
ï£
+A6Ü£¨ÜuüÊáÿ
ôá<TƟ‹êeCœD…€ÀR@`‰än%:ؘh'º
ˆñ€9bÊC;\:ˆ‘ÚT’ØÄ c¦0úƒ€y¨ÚÜ
€Ë
G„ÇÑ6áq,O±r7ºA¢=Ü–î¾TÎó
À8à%²È€,£nœìi€%)‚?-ëęë
ïNC
q*ÁêSA<*¸^•Ðq&Ô`Uj•gB·n^¼»So‘ý'ø‚Âð
+ã-g‡Éƒù¢øÆ4,Àžµ@y-/Þ
üc6l
ösr@ä¬Gȵ!÷/gûtΙ†/|@^é`妃ՙ^'aÕّ
V°ù™#”Y/a„Q„‚)\õ¿øŸŽðzÀÀu€û
O~6L#û~Š¸s-g":÷LÄvM#_‰P¬œøÚpü=	'ÏD¡þÿß(v}5”Øff¢%o>A¨T.ÁwvL£lÝ4Êgâݳ£fås¶ÍÀÕ³QýAÔyÔAՓ¨ƒª÷g#‘AQýÃ\¨§Ú{ªƒ:š÷îlÌ¿jî:
ïS,°ü÷¡Iª¶œ"Ô<~&ZŽ#´è°„K€ñ°Uà¢hƒzX’óߌ›(–r3°IÂñi´ŸGÑŸw(–Ý0ˋ%|4P¶Ç):[fàÁ¯†•ÅžûÏcUñÿâ¿«ëþÿ‹ÿÅ,@Ÿ¹ú¯ka¼^ëú¸¡u…€£˜stMÕ¼~Ã4ºÁ¶ïþd=`¿÷·#´Á2Chãϧ±©\ôÙ}П÷Ý*á7çäH:
0¦m†ùÞæ*	?Ah̶@œým
t"4xÎWÇØt[a®4cÄÌ¿F¯¦ƒ¹ÖاmƒqbŒ!;žœÆ®k§±û=Š=Çym üË).y]ù¾øNŠK^BèÒ?"tÈ÷r-ÅUÿWþò¿_»„⚁ÿ·¸êq/Èáúï t#ÔáÍ ç[@7o
Úºy+‡Ð×op/ààÅÿ8¾
vÑm„n/ÿlÉ;ÀÞº®ÝsŠ»ÂÿI\-áa	¯þ|úÏq7̟ﮚ(¾	6Ê=ÐVïINã^˜ãßíû¾¿Mãþõ_
Ãÿ×Àäô’¡
Ò£‚V¥váĉïÎä2`‰“»à_øˊïÙhÅ#âfœÍ–Ü,*g9ÉÍ!ëÜ<¸«$·îÉ-C_ˆÏԈ[Ž²É³Ñ­@>n“äV2wM¥¥BÜ’[²¹·%·†¹•—Kn-Ú"»k꽟¸\=õnL^%¹Ä)î–Ü,r+®•ÜR+¾.¹ypÜ¸—Ü2´GñÉ-GfERr+^™ÜJ¼x*-Š(Kn52+wKn
^¨¼NrkQ±ê—Ì)$9S7•3uS9S7•3uS9S7•3uS9S7•3uS9S7•3uS9S7•3uS9S7•3uS9?€|(Žòà¯\ͨu£a4ˆFÐ(øՂk
‰¿]àÓ®
…35hüùPømD›à܈xÔÜ¡·Áo„¬…ë¶@˜õà×!úÄp]€~ˆ«G;G#à7 ž£×÷A|€.×1섣íà…´H˜1ˆqü{áˆäy®îóË ë(„è—Ò$!|PÆA1M’ʈX–F±¬À‡”qü{Å+†EŸ-b®G¥rtÙ1æ~Ñg‹cȈú§Ré‡x¶ˆ’r9>ýbª4NRÎÑ9 )‰e¡òNI›æ¤4ðAù©ÄI®ú!l¤?*‘NÕ•MÅ'æ}@*× (ÛõbÈéÏ,‘Úñ:ZêÍpõafm†ÄØúÅvŠr“j~¦¼IÑò÷Šù'å§õ2,jaš"©kÄ14UšÇR˜8Ú%Å>
+¥ 5´mª–ºDéßþYåJis7ä¤KL¿[J?z­/?£œ>4ÎmØʧZLê4¨OÒµ|ˆ-Îξ6wêÚ³·„^I§i	»¤2mÏÒ<öJR$ùîµ™”a³X©kÎ~vèUOk­¯v8êó@Ò_"¶€ÑYu“r08£ÝR[KÙ+ê÷B²6<
+‹õžazÄø狹¢×ŽÂßH7ÛÅ¿¨Øîgç<*ÆÞaFAßHþ7Š%‚v‚/©Õ
bYHkškʟô(´6OÅ·BÌ3Õ䝢Žˆ9ÛڈØ7Ы}bH;íµ¬OLƒJh½xmJzó@~¡—¤×Ï8CÛx(“év»]L«[l×gK—“°Ý Ec¢{¦ÚAxžô4´)ÝK: i?«Wü%­ùôr“ó´×ÃUY¢vöC¹z§Úñ™¹8#æ¯.£éØS=·Oê{©ötÏêÏ,û´¾ÎÎWÅ	’вБ ¥õÃS£JØ¯ˆýk×?-)•s×,™öJÚz R%š7&^Ù#öQ¤4½Sñ[Ä~î_ÕÐU»˜n117¤
ÐÑ)*ÖÕÚñ€/ž—WìkîëÜ0ê«îíˆúj¶lñµõmÜ4:âkëéÞÖÛ­íÚÒ·~¸Ï×7âëòõöôøFºF|p¾oƒoCWߖ¾í}£›|#cëG·ôú†Çzú6Žø!èho?\9Ðãëè‰úG}z»Fdž{G|ý][|}£F÷HŽo¤¿rÐÝ5nrIÿؖѾ!ˆr`¬¿wBŽôŽŠŒø††!ß$Ûû–-ƒÛ}› ã¾¾þ¡®îQ_߀o””r—ø¶ô
@Zƒ|ëû6ŠӄF{wŒÂÅ}›{£>©˜¡_×ÀN_÷žæ{t¤ß»Ý7ÜeîƒbÅ]ý¾±!’ĸ|FúvAðÑA(Ð6R¤.ßö®á~šs÷¦®aÈXïptJôå©4}s·ô”“Š)ê
A‘|ùѼ¸t6—œQ	½ iH°RÚØGrÔYîêéíïÞì$gfn8{U‹‚rµôÂõKF»FiicÁ ˜@7Ôâèp_ïHtáXw¸k$Ë×Óë›?<gGG‡Êc±íÛ·GûS‘G»ûc£;‡7w
mÚëÝ080:"%î
]P€Í$܊Á1òNßØH/dŠDNûº N{‡ûûFI†Öï³7¯}a
œ Æ{ÆhÝnßÔ×½iƵÀ}Ý[Æzˆ,}=}#C[ 
"ý¡á>Ð
¡zF£¾Tڃ á¾,_oÿzrÑtT©Àg͑œ(7ˆÄÓM5p*uQ®R\bÂ}
+4"úaÒTz·l욙(之æ?Uƒc£Cc£ öm}ݽ$̦Þ-C§è«Ô…X±žÞ
]М¢]#C;U°Ìçã·w‚ùǸ'ô÷qOÐß(}Fé¯ôÜ_èѧ”þLéJ¢ôGòcJQÏ)}@é”Þ§ô{JïQú¥wÇ=
+ ßÒ£ßPúõ¸ÛôθÛô«qwèmJoQú%¥7i7èÑ/(ýœÒë”NPú7JÇ)½Fég”~JéUJ¯Pú	ÍÄ1J?¦ô2¥—h²?¢!_¤ô¥RzžÒQJ? ô}Jߣô¥giœÏPú.õ|šÒS”ž¤ô¥	JS:Bé1J‡)¢4NéÑqWè ¥GÆ]@SzˆÒƒ”Púθ+è
Jߦ×}‹Òý”î£t/¥{(}“^~7¥»(í§t'¥;(ÝN£¾Ò7èå_§t+¥}”n¡t3½î&J7RºÒõ”®£´—Òµ4êkèåWSú¥«(]Ié
+zÁå”.£t)¥K(]Lé¢qg!Ѕ”. t>¥ó(í¡t.¥Ý”vQÚIi¥í”¶Q£4Ji„Ò0¥­”†(
Ž;Š€(õSÚBi3¥s(õQÚDi#¥
”z)õPꦴžR¥u”ÖRZCi5¥U”VRꤴbÜ^´œÒ2J”Ú)-¥´„R¥VJ‹)-¢ÔB©™ÒBJM”Pj¤Ô@i>¥zJó(ÕQª¥4—R
¥¥jJU”æPª¤TA©œRÙ¸­¨”R	¥bJE”
+)PŠSʧ”G)F)J)—R¥¥lJY””B”‚”2Ç­@
Jþq+ÑäŒqk9P:õôQòRòPrSrQrRrP²S²Q²R²P2ÓL4…4êi¤d ¤§¤£¤¥¤¡¤¦¤¢¤¤¤ qÊ)ɨ§@‰§ÄQb)1”0%$ž¤”¤tŠÒIJ_Rú‚Òç”þAéïb²øob‰ðgÔó¯”þBéSJ¦ô	¥?Qú#¥)}DéCJPú¥÷)ýž¦÷Þ¸Åô;JïŽ[@³ðo)ýfÜR
+ôkJïŒ[j~5n©z›Ò[”~9n™ô渥è
J¿ ôsõë”NÐÈþFvœÒk”~F#û)½îUJ¯Pú	¥c”~LéezÝK4êQz‘fþJ?¤é=?n™t”^ðšÐ÷i®¿G#{ŽÒ³”ž¡ô]JOSzŠÒ“4ê'hÔ4êÇiÔG(=Fé0Mè¥qJÒdRz„ÒÃ4ê‡(=Hé¥ïPz`Ü.þö¸¹è[”î77Ý7nn
ºwܼèžqsÐ7ÇÍ	 »i»hý4ȝ4ÈôÜí4ämôè4ä×)ÝJ/ØGé–qób ›éå7Qº‘Ò
4K×Ӑ×ѐ{)];nnº††¼šÒ×(]5nZtå¸iÐã¦U@—›V]6nZté¸i%Ð%ôÜÅ4äE4ȅ‰G€?ÑÍóþIÛà}GÝâý>à{€çϪ:¼ã€G

<xpðÀ€o¾¸pà^À=€oîÜظS¹Éû
À×
·ö
n
Ü¸	p#àÀõ€ë›¼{
×®
\
˜À珧‘ÖwÞ¸‘hÒ(¥‘qѤaJ[)
Q¤4@©ŸÒJ›)C©’RŸžP9¥2J¥”J(S*¢TH©€R|\GÔ2ŸR%#%%=%%-%͸–,Ü­¦¤¢¤¤¤ $§$אš+ÿøðàCÀ€?@íý
+ð6à-À/
oÞüjáç€×
ϾxðàIÀ ùەDÒPIï7
ßI…³ƒÒvJÛ(Qª¥4—Ê¡†R‚R5¥*Jsh‘Í”L”Ò(í¦É.¡5ÛFSo¥´˜Ò"J-”š)-¤ÔDi
¥FJ
”æSª§4R¥Jé4ƒ>J^JJnJ.JNJJvJ6Z+%Kâ6àS€“€/
_>‡Jüà
>üð¨¹O
üðàw€w
¿üðk¨Ác€^¼øàEÀ€žü0
xjõà1ÀaÀ!Àmb
ï¡2>—R߸!
+´‰ÒF*
”z)õPꦴžR¥u”ÖRZCi5¥U”VRꤴ‚ÒrJË(uPj§´”RŒR”Ê8—R¥¥lJY””B”‚”2i¥(ù)ñ”8J,%†¦Í
%¾	<	HÞ‰žüà8à5ÀÏ?¼
+xðð€KÙLï%lÔ{1Žz/j¸ ý´Ÿß°§ý¼{ÚU{*ö4íaU{œ@»÷Øóæá܆]í»ìjçv™v1ʝ
ÛÛwØޮڎÕÛÆڗŽ½;ö×1Ö4¶t¬glt즱ãà!»wìðØÑ1–¬&j+­¨¿`ìº1Æç4†uÄ;}L¥­mn90ÜÎ
3ïãW‡1ãƉáÅÃÙzb8®'¡'‡-Žz4ìÎf·6¶lhèo¥o†¢œEê‹nlßt`cû†hO{öîèúö®èºöµÑÕík¬n_íl_y ³}Etyû2ß]ÚÞ~`iû’hk{ہÖöEіöðoŽ6µ/<ÐÔ¾ ÚÐÞx ¡}qž­oŸÇ{‘—ìEŠ<Cž<Ÿx8Õ:÷›r¿ãþÄ͹>q1ç;±Îq¾c¯ƒÕÁCì^û^û~û#v^':Xõñ#3d¸ÀÀä†W
ï8d¸ËÀèöêöëѱ‹tkuÒMê¸Gtøí³ÚW´‰uì"íZí –Õi‰«Oh£ùõ:WÓ°•1Mµf‘†Ý«Á	M4^ŸÐBõÕêEêµjv¿'ÔÁ¬ú?)'•LB	'þ¤˜T0“
+ŒXìÃa=+)Æfo=û4&ϧy„ñu.]‰4MÈ&ۚ*¯<ˆ¯8˜¹„ü&Z;
+WDí+—?Šñµ+ÈâKššZ;éñ¥×\ƒÜs›º—,gïºË=wEÓÁˆ;‘ݓč ȊȚ‘±‘‘ÑÈH~kFÀgtþ‹„áxl”œA$òOþPŒŒ­ƒká`Íȉu,BŽH
+ÿsÿáÿ×øû϶v
Bÿ˜+B}
+endstream
+endobj
+6 0 obj
+<<
+/Type /FontDescriptor
+/ItalicAngle 0
+/FontFile2 8 0 R
+/Ascent 750
+/FontBBox [-476 -193 1213 952]
+/FontName /Calibri
+/StemV 0
+/CapHeight 1220
+/Flags 32
+/Descent -250
+>>
+endobj
+7 0 obj
+<<
+/Type /FontDescriptor
+/ItalicAngle -11
+/FontFile2 16 0 R
+/Ascent 750
+/FontBBox [-476 -193 1213 952]
+/FontName /Calibri-Italic
+/StemV 0
+/CapHeight 1220
+/Flags 96
+/Descent -250
+>>
+endobj
+8 0 obj
+<<
+/Filter /FlateDecode
+/Length 38159
+/Length1 69104
+>>
+
+stream
+xœÔ½xÕ¹0|Êlo³½wmÓJZI«.YZY½Y–å"˖ØWº
6Í!¡„Ü	¡È
L‚I’pc.Éç{“@(É
)NÉ
U«ï=3³«•,’Üÿyþÿy~I»sæÙ™óörÞY!ŒÒ¢½ˆ¢ÌàpªòâM;&
ò#x¯¿dí¶¿ø/„p	BÊ_¯¿üÒÀÓ÷ÿ!5L}þ¶.ùûß´<©\\|Õùûƒ7þ
!GBk7m\»áí˜5ƒÐd;\¯ftOiš`7ìmºäÒ+K7¾ù.ì?Œñ†‹·®_‹Wÿ!ŠÐËE°ó%k¯ÜÇT‡Ð/ž€ó[Ö^²1ºaèO°óÓÛ¶íظmú÷ÿý&B¿û5\Nƒ(§Àw"RÊaÖ>qK_Eû	R"bB8J¸‡ùsv!ég`8@ø„“£,§‘h¡/³cô¸LÏîBù—1º!ùÏaûœüÛ°Ý
W‘¡&t-ރïÆÓÄM¾O~H^§UR-5Q+Óvz½– ·Ñ¯ÐW¸5Üzî2î.ߍ¾¿ø€5à
+ø¡@4Ph,´¶>x"(šƒö` 
+FƒeÁ5ÁûB$$B¦+ä%CÝ¡ñÐÆÈ˟pÓÓÂ\†»Lä%¸ûRDåT-Ü=
+w¿î~Üýsôß8Ä­ãvpwúöúއ»›Ž€'î^/ÝýRéî¶ü݇ƒwJw7†œù»o€»#áEªN·çè;íÍþÞG§Ë¦Ãe'ќŸwÖåGé_«ßI¾c~ç×ïìGèíßžxdéí}oï
¨‡ñvßÛ½oW~»ìíð[Ÿ¼õö[ï¼q+ìb´ùäo$K9`GõÔF]]âÕ©^!ÚMâVq«¹
ÜùÜ6„¸mܥܕÜîÂq—JÛ¯æ!rG¥ÑIî;³ÎeøPÚK¿@Ó¯sõô‹ô^ ñú9n
]FwÐz1ý#=KÿDÿLÿBߣïÓ¿Ò¿Ñÿ¡+èr®kå:è}qȈLÈ
²E1T‚R¨
$©µ£ԇV Q´­FÐ&´]Š®BW£=t/ÝF¯£éÕø,&؀yìÂ>NjñJ<†7ã‹ñV|¾_ƒoÁ·âÛðø~|ŸÄ/â—ð÷ñè>º…^O?³ï£Ó'è×èÓt+½‹(èCøUº‰ëÙ?Lt )ôCú~Ÿ[B僚I1ýÿ˜næJ¸b®’.™—#¨˜
+l‰
ّùQ9ª@•¨
+¹Q7êGhD‹¹´mF¢‹Ð% 1#ø‹˜bË°+°ë°ûqq¯Ækð8^‡½ø*Ìtj/¾ïã2x?~Ǔø9üC|ÿ;Rc%Ò`Òc-2c#²`²a²b3rb7ra
+á"ÆT„£(‚c(€C(Ž‡P/AÅx%ñRTŠÏCexJ㵨¯G5xªÃQ->ÕãP#¾-À—à-¨oC­xÊàí¨
_Š❨_zðÕ¨_‰w¡^¼
áëÑ|Æ7¢åøft¾á;Ð*ü9´߅ÆñÝh>ˆÖâ{ÐùøA´?€.À_BãgÑ|mÅÏ£mø[h;þ6ځ_@WàSèü2ºíŧÑ>üè:ü
+¾é°ñX–á›Ðzüyv-ü
þ”˜H±“0{~üü?`d„'V'â"!°Pe$IJÉýäARA"5¤ž4‘^²˜ì#夒¤I©&µ¤Ž4FÒLZH†´’…¤tNÒEºIé'd$HÙI®"»É^rÙA.%—“+ȕäj²‹\CöëÉ
äF²ŸÜDn!·’ÛÈçÈíär'9Hî%_ _$ב»É
r¹<Až$?%_'?!ß!GÈQrŒ<Kž'¯‘ãä0ùy™|<B%‘ÇÉ7ÉSäi2A‘gÈ$yŽœ ß"/“äEò]r
+lïÀþý;ù9M^!ÿA^%?&ÿ‡œ
K¬£ÊSØ'uQ7õÐ 
ÓØÇ8-¦%´”¦h­¢Õ´†ÖÑzÚ@i]@›i†¶R;uЅÔH[hõQ?
Ð"£m`Y¼´’Ö’ŸÑvòmš /Ñ4ù5¡ËðwÐåø»èJü=´ÿ,ðåôJº’žG×ÑÕt
]Oï wÒ]ôcú	ý”NÑ,ˌ9ðU‡ßädœœSpJNÅ©9
§åtœž3p<gäLœ™>C¿Ì%¹r®”«àÒ\5WÆÕp)®Š«å긷œáVp£`íÖpçq+ÁîqK¹fº›ÄI\†»pîCr¢F‚	ýZÁF~³>×jŸs&úÿ½D‚³ƒõêF‹Ñ%`•(Ø%X&5X¥Ø%f•Ö€]bVé*°HׂMÚVé8X$°GÀÉ,é]ÀÏ»ñéÃô!úü>QpÁ2.åú¹N®‹ë¦OsK¸
àÄ0¹•[„_Å?æ†Àòí§‹h×Ã
Ò'¹6n1ÝD7ÓQˆ1 ¦
Ë	D&3 =\†[¶ïZ.N¥èFÆM£Ý Uë¹°Ç~°ÊA°Å¢
.ì/;Ì,ïf|>þì‚N²ÅÄOJð§)}Ï,Î.†Oì„q/ڏnG÷ Ð/Ð:t=ŒîC£GÑ7ÐzýýìŸHÈÿê'{•ì¤¥Ç
3ÄOŸÍ>
+¯IˆÆf ÷Àž™Ì@¦ùé?́ý){Ï4Ÿ”›Zø¬Žü ÅSÓ“¶?]ÃöÉM06ŸxOñPöéìcsh0rwZ…ÆÐ8Zø3	½ØÅàǶ{[àØð~>쭁³ÖÃYl<sÖV´
^;@r/C—Ãï6ï”öرíÂþeè
+ø½Rî]à#¯‘Þ¯ »áÈÕÂþ•ðºí
Î\‡ö	£ÜV„\n@7×nB7£[þáÞ-ùÑ
t+º
øü9tÇgŽoŸµw'üޅîy8ˆ>îE_¹x=8ú
~?zâêG…cŸȗ…;ú<z	CO¡§Ñ3-×ÕDŠäèr¾@Ãm@ƒÝ€áõ3éwEžZ×î·¦W|_Á'.—èÈμί"ò]åš9”¸pÇ3‰{ŸðŸRåAsôx°€2{l4úYã{ї@¿lôU‹£/ãBøCùsöÿ
}
=¼xLå¶"äQ?†¾ºý8ú&z~gƅ#qûzRàÜ:„£#è(pòtM
+ðtl>ø	~8y=‡N€„|KóøÍA¾°$è)
&î}öÙYâÞKèû`¡^Fÿ¹í ïÁÞ+Âû`ïUôôÐÏ°F?F¿ƒ÷)x¡L׆5«ÇV·rtdÙÒá%C‹
ô÷õötwuv´·-lÍ´4/hjl¨¯«­©N••–Ä£‘¢pÈï°yƒN£V)rd›•t„;ÇÑñ	.îî.eûáµX[Ÿ¨sö9qá´Àì33pæùsÎ̈gfògb>ЄšJKáÀÄéöp`¯ñííáÑÀÄYa< Œ¹¨°£ƒ`>èpljLàñ@ÇDçå›tŒ·ÃõiÔmᶍêÒtH­¡Fñð¶C8ތ…
‰w4‚\[Çn;A#k7L,éhwƒ£µ	ך·M(„k6³9£[‡JN¸m’GëƓÚ
á
kWLеð¡´ãÀ›&ŒÉ‰D¸}"qõ¯€òƉ’p{ÇD2ë[’¿
žEøpàÀÿ ˜|øìgCÖJy„ÿĆÅ<™àxnŒ`n0CÀ/ds¹u2ƒÖÁÎÄÞ¡q?€Ö¹£L*9:AÆّ“¹#ÖeìÈÞܑüÇÇÃAƪŽqéïòMŽ‰½ë¥%@}á/p<0A£ãëÖobÛµ„ÛÛEº-™È´Ã ³VµãPy
+Î_;Hlfd™H…·MXÂÅ`<Ø<<"|Dú؄¥m¯—>5‘êhgó
+to'È®y¥§ß<TpICô0Êæ1ak¦D;Œl8Â?îÞòy~`ĜȌùFÃ#G—ÂüDâM¸]P¸£ð)ÀmÎÙ¹“抈20BÜt”qNx/l‚<°KØe]؁t.wÜE:ƒf]vh¤­›¢ì£mÝîàhPüùSrKs’E&”×â
Ÿ“xŸÏœšx6›P"б±½`‚³.*“&(]mþyFéÆð	%cgwæŒÀeã¢#0FÂãa¡Ì↣µÀß¾ápßÐʁے”,µ'¯÷&PçvHÈ`gҝc«°ß%ìçw»çîÉP†û†°‹‡¥¢h -ö¬½µÎTªÙ	Ö-ܹ6àÖNNï]wàP&s`[Çø¦vpφáá‘&·0×%#׸¯f·2¡>Ü·tai	؞…‡Âøæ¡C|óðʑgy„7/9L0i_8z¨Ž<ã.@	ƒ2 Û	°v¥%°£Îw?›Ah¯p”ÂþúIŒ˜2Ãhý$a|FƉ°Œc?À$Ç& 1˜ÛŽÀƞݣ›Œ2åB6`%üá	nF$Ü|¹vBÞ¸pB^Èà-Þ"Âå®ÁÀ6Äa6éÀxìÔrcQ)»d`rzzéHð´ûìhDm¼VŽL¨’`ûe‘^8¯‹½Æ
Ü5±wýZ6´l„}VéY?
+b›» œÒ3¡‚+¨¤+ÀÂg˜8‡Öo€Âç÷ÂÎÄÞщÑ$»éÈæQAœù	Ôn¶‹×”EٍR£LáJA7Aԑ›ØFsCÃ#"Ä
»p³Q‘H
+-Ì|}­µ9´~D]´¥j·Ù&‘‹n^j·t1´hD£SO¨Êà‚ðÇƚ2¦’²ˆbtTœ¼°w“tܛŸÐÀŒ¢¤”>ԁC=l.ðwL•ú"»ÌÐ$Z¾,›´p%žÐEzւñ?¯
H¸.÷a%³é§D¨‚a®ºÓÈÒÉéÇÂW~JKÂÌ90ÁDîgA°Ñ聹€‰ó’¥%ʹP>p@©›ÿ"½”ºü–
à5àDdh;éO £¢iÖ¹åyÏ#^‚l¨
;fmoW–*¾Û@x)$°·eÑw¹ZÂÇ«å·ScÏ$.=Ú¢¸Ô2õÆÔ+©©7ΚêSgqêõ·Þx‹ïc}*ý֙·*ʱ1h^=Q(,òp¨ŒTÇ¢5éte3©®Š†Cz"Àªjj›iºÒG¨%i&lӟ|º’NÉɵá–åi™Ïe°èä2âq˜J›"üðy‘¦2¯‚*äT¦TÄk†ú.îý\aôZm^“RiòÚ¬^£bê2ýÇïËôŸ´qrÊWµÑ/ª•„“Ë'}gqc°g¹ÁÌs3o´)&£6Þ¾jj¿Õîá±ZÅkM
YÂÓs×Ê,(„¢èKÏ¢¢éwjyÜž”ÑÉé¿ÕÀ@“¨aq±Q„gï:á]+¼gâ8—hð@Q8ù›V£u„¼aµÛ8-ÒòZòtø…ð„iX֚¼KLËdËPKK‹©¾>•3Úë04¦ù³•Æ4P<9–~P2±ÙäÉc4Hõ4ŠFkj±Hg»"LƒÜeJÌGüþˆYÅmúï©Úöx#¬Ä‡93æ»ôÜ.ü+ü6·ž£
+­
+7f¨Ò©8™ÞmãkôJJ•ÍíS»Ø:‚@ù}$
+zŒÿyϹPþމæƒùÖ|CN8Èygà#y¸ò¡øKy¸ËaK¦4ý±ìIõf´ݜ1´j´­KëtÚ3Õ%õ“„ÏhՕ‘H¥š"{¦%9‰µ‡ý­O`Ò ¬Í8ê´N£ÆUç?Y‡_­Ãš:MÑ?d\Vg’/E-gslØ<`làÏ௧NÙá@ê½ïñgœ/ÓÆt%ÍM§NU”G˜€CÑêj‘'¢ð3®-Vá¨q·qPö$§Ò)¦îqijï—ií¯ÕgU)”ä6¹Ñó’¯+)pŠ2+LJa#“
 »ˆÀ§*åÙ[ð5]&·Iéý=û¦Z§¤D¦Q*,î›Zƒ‚*Mn‹ÉmTf7ÃÈlv™”Ù¥ÑÍMu­x!%}(‰êÐ2.¿ƒÇ~ÞÀÞtðæÐÂ[dØ?IÊ2q—5Ç­8nµjJØÉ%ìävr	;¹„\ò©ž<cMƒ3aû—#i«¶?¢¶ïÑ°-pN÷°æ¤†h\±¿UT(Š&±ê0?T5‰5‡_{TSco	ÊPy&)œL֋cP‹žxa¬ªÉ“_᣸ªŒ„ÃFf¤Ì3Cûë×oïÉ>eO$ì8zéÁõ•¶dkqõªŽxvÊU·²÷ð©¶%5ÎE‘®‹†^ù¸q¤-Šw.¸`Is±ÕãöÅü%K¯([ÚUgRW/ÙBpª¿Ú“7N½Þ0ÒäÏÖyj—@L²vú/œVæë¼îˆ5&%ª$%ªÀöŒ*°ý£JR¢JòÛ$ôȁS(ˆ¢¸ä°y˜;‹Q5*Çe‡TËÁTŸ9Ë^8%¢Ï¿&J£¼ÀÜÊ­’ùe†Ùjñ†73œ–È”–Ìš]=×þûÃ÷þxO݅+;ÝJ唥¾rpûàòÛ7ÔV¯¿ó¼CU…ZNó“Þ’ˆ¹—~í½/}åÓ§WYÅn=ˆ–ÅcVÅR±Žý/îÞõ­=­ÑTTnô1̳÷˜/E«ŸG.ü løŒÖ@—¯¿Ô=Ü×ôm²ùÑ  ։Zqò¨«héòÄ	@ºÕâ’cEÃæŸ(W0	`ؚêE|ÏÔן22EåO¿Åƒ[’Ùl¢(8£ðE±Xýgd¸\AÞ²™<éîÒps¯ :î`‘V]6úèMÿ˜.=—
‹t(yÞêâÞÒFW´)aS©•Z“Áou»u1ÛùêEüCjEʵì"m£6
+‰i砝& ÌoK›™Æ™™Æ™- +fŠÙ
Rb>Á4¹D™rI2å’4Í%išK’)×	bD*)íaý{GÉDíÊÉЙœ&áœYË©’¢@qîXþÈ_ÍþIP›È×ßýÒбª­ïúÐîÇwԓû¿þÉ#KDYñoïÞ·ùØ
½Ÿ›÷¾ÈÖ.Ül-0óƒ6,:ZZˆ1å?bSóI’>‚x[lqF£>™Æ¯¦q:-‹0+îª.˜,èüØöôY°ÉgÞâ_¯|«ÂA÷¥	çå?}ÎÜ%+,¡ñÕå
+hÄ÷ålí¾8Cèw_z¦jË7÷?ýG…WüñðîÇ·çQ#f°¤f3Ø^üæ’–¶–¡‹énÀ¶]~È“ô>&ñ(&ñ(&ñ(&ñ(6IŒ•Ê0€U®I¬ÌèöFñÉ(~5Š£Q¹“D7›ñY"AvS‚÷â%Yà›
+íá¹îˆîæÀLÝÃøIÎWŠ¾Fð;y´ˆ`¥NÍI‡ñ6ï`.Tñ³ÉÅ+²@æ¿;ÞBࣆ}b”E
­‚·ïœsöGº^€Žä D½ž­m=1ý1]
+¡U‡f‰¢f‰¢f‰¢f‰¢f‰¢f è1ù¼
+ Ú³Ù)ŸÄñ#¡!'¼¤H7%O7|™rQlŽt)L‘¾(€,Â8£´\ŽE	D젧̠O·‚w[Ín£jê7
+B&ƒ7î)F?/Ãè¼é?qWʨ}5ãõx¦é¦éæ[j-
&:ôBb™ØxŒÆþ	ƒäI’'1Hø&IåÑT®rLbõÑP¨>Õ|«!wPãÄáúaË$.9”Z.ÙX£HÉϞ;•w´]f™ÑšZ#“/¦mµŒÌÏøŽ»’SjÚºÕׯ¼èñË[:®þÆƦ]ÕÙ3F#§‚Øó
Í¤65¬Z·¡âÞ?þÛò±oœ½³wßÆ—š[möš•Ñ²è¢ßÞºûä
í^/¾*TdT*y)kvE½!‡v쉿¼ÿ㉵®pÂåƒ[±|
+Mm©Àa­D"­D"­$"ZID´‰´Œ¸{‘†Q_è¯aÔ×0êk˜Õ°Ŏ2Vl2föÆq?ÊÀqdŸœ>y°í3pÌ^¼˜’Œá¤¿ªÅÚÙQ>¨êÙQËFVIäfTv,’µB©“ÜÀrCn±Òt¸åÔ9™ä)-!‡3hQ’
AaäêƒÈi•¤yê;¹1÷óÜhêc"ύ%ýÂ#@?+Z|¼Å>hÚN‘DB$‘I$D	‘DBôøõôÉã@	5¿D@ÐÌ;”È9Èà‘ܼUÖ ÝY8ۙ‚-˜î…Y­,DJ°žî,G|úcҐ‡Ëñßâììz€öœýÑt=;{z1ÀӂEI‰ÙÆôbÄpVLÿ	ÿpŽ£H»ÿÈz
Y#ðêÃKT'p%2ƒc-;$“"30)ɂ¸”á.Ï%ÁB¶<C‡_{Ú·.ñԖ…4
+¡g(á2¨<À‹2«pçÀޕ*ƒQ«5:M6Ȁ
&ƒ±l¨•>ĨÅtL²Ž&i´.c¬`F£œÉnŠ‚j‰j	5µ„šZBM-¡¦fª µÆ–Õ¼{	?“¶ä‚RxùÆð<b*%¥V‹\±ÍF?TXBîp‰M‘-š+«øe9oº\
³BgÊãWŒ
+sAr^Mnšº*o2gdöEÒ¢Ò*8t.ûÔôÔý.³ämû{ê~YEd­²V	Y«„¬UBÖ
+ÈE*Ãë$NJî§NçøVà?ó
+ȌøDÕÔ){"Ä«,…Í*ðŽOå¦úÉWTF¤Wò$ø­&ôD†oÞÖLtååöTJ]æp¸&ÿÅà1ÆWT¡Õª™•R3+¥fVJͬ”šqZÍÄò¯Œ“ÉhQ͐Æa×¥er|È¿,g„ZLözcÍeQ•Æ4Ÿë¤ tJÏÒÙ0sÛÏò…Bé
§¿úȓJ‹ßiš•$›¦«×bõY4$ۅÁ"9Àä÷¦@y‘C…¯áý—?ê¼Äà6kgTÿ‚O*Ô
+ÊAhÍ]üÉ}yø£ÅEZWÜýé
+ú¨¯Ø©Q™½VÉâ_+3¢èÆ#1ƒÁ"Sؤ­NØþ…Ó"Ó"Ó§.+«dĬtØœXÉkÙN©d§ðÈW·D]fˆqN/0	ÈLjwíRiIdDJn„!1™‡^>jOG¤Š»Vguéj]±pؚÝhõB”f¿Ãá7)K\K¼1¿×ˆ¼5•˜Ùï´LÊ.‹Ç¤Ôx+cäÍúk»ïíýô¯ymy<RÛþ©T­K
~s|[¡e±
+‹å+2RE†õR´~ú,÷®,¦,†vg\F4K;,,í°8Dò¥3ª*z–}Ñ}’û¤@Ä'">‰è¾Òª‘ÂÃp˜iœlùìôclŽÅ̗
…¾ yãÞí½çƒwÿôÖöރo¼ãÌíÇbç}qÛ¶/®IDW~aÇöûWÇɽ_úôКþýáû>~zÍòGþú-ߺuÑÒÛN\°ãä­KïxžE™_ÁWô‰ž½'x–¹ð¿áç…„Þ,€oÈÁžÿYÉÃÕèïˆõ.¯Ÿvq”½*@n{Pé35=ÕÍ\}ë$ŽeÔJKi“Å|Ãõ“@(=#Ñ©³-§@èÎíõ9ÒDcŠ\МËsmv¡èj³ÉÔGƒíeԢѨH<›ûcß½oÜÝ|aÙVª·û­NŸË÷ÖÕ¸{þêà‚M•sz{ÀêôxOÍâZϑږl{p |ÇkâVl¿M¢6#ÒÖd|C®–Q…Þ¬Á4¶å¶Ç72J›M¯ƒê¥Î¬Ífã[<rÑ5?êþtŸ_zÇ·É ÏßþüæëÎt‰Ò&ßÒֈúÑÆC‰!ÂíwªúC©þþTˆ¢v&0FT)¡úd5~µWWËã,
òµ0ê؆{@Œk—פCù”ˆÉ•X¶3¦AI¢˜¼ Jb³×ü£ìçˆ'Æ»ò},ڟú¢©ˆk8¸"'½·WË&²¶ y:’K³¬h§æ¦Êk÷-ÎIèò›ÒB2euCËýàáû?zzMÈí0}Fݎ¾)¾ý¹M;^¸m ,Æjàë¿ŃèÊCErIå’
+Ê%'"—œˆ\RA9£±ÝèeŠíeŠíåµ:ÜïeÕ;/ä	‡‘2nõ¹\
+ª9bÒ$I¢ÉãgçIá¹ÉWP* ßÏ\ñä•÷¨ÌA'ó“Å.l-Ø|IâX㊱’/?°è‚Î"zÏÚ·4eËò–Œ—Â޲ꪃVé§>Šw­GÆÆ6ø¦ép™WΊF&í;µ¨¥°:£–—¯־D˜¹˜Ÿå…Ùƒägm='j±2QõXž›ËeßØüÜüYðâšUOFÚ/îv5:¾z¼y¼-DžÿҖ¦O!|ãX­ˆ{+™}W¡4´Œ]¹bõn«’N}ÌÐa²ß*»	d?Òÿ¹ŒW4ÅOâŒ'qflãÌØƙ±_2jð”{öz¨§Rbu¥ÄêJÉÚVJÖ¶Rb5ø¯ôQSP­+M9jŽpµÌäê˜É=sš±´~Æîæ³<002‰2³”$WK•á9–°Pkå–ÑKoh®¸w}Nný?wt›ÍÅ=[ºãeö‰¹Æy‡Ýo”[V6ùJrÒ¿ü‘÷¿4tð†m¥Mm!ƒ9LÞÜòü­‹r2¿ôŽo‰2ð1§
©¯Aí讌/3Ö*
ÕZFµZA’kkÙj
ÿã	V·N´­`d”hf”ÔÃ(©‡Q¢™Ôã°§ŒŸÄÊg¶ep&c_Zp,8d—B'Á°œÍ® ]/Yay¦Œž£L´¤r´Ýl³áB)ã4rK‘Ï´h¸+¬¥ÍKwæ.aÇæŠVWßÎE±ðÂUõªÒ¸åR½2;Õ¾Øْ¾ëëíëú!tASAàRQµ¢%<õ_yEz*æ—Q]Ýò­m­6XôɦEÙwŠ¼ôÆþÍv…<Ûl\1T×ôYºd±ýöYÔ:ýîQû[%µJ¤k•"¨V‰T­“¤$“¬Ì˜-¸¿2yPQeQ¥Öí`Ÿu³°ÔÍóì
>âfìp?G*XlzÄ-¤Q'8¥­EÜ>c`	µ¶ìŽ¡Z¤Æьƨŵ÷NfÔlTk¬5ښÀÚkuËÃ6m)ŠœŠÂÉ䘤ð3¶I<0'¼àf%dUùmn½XN×·]ñ•±Ö­+íPi¥>½x{oÝX[Qå’Í[6-I7n¾kirÅ@“YÎ*×(4©ö±†šÅU®Êá·\8œÆ÷¹õ•¶@ÈñÛ¼&E(öÕ.N×.j¬H7/Ý>8´gy©Áé7kŒ³ÉcVyÂ^oùÂHÍ¢¦Êô‚áíI8„Ècµëf,¯0€øèCm<îÈ°z‘‘Ñò(KYÿe—À’ãôÉcLä&VóJV¿ø÷’}/ɟJæc3%Šœ}Ò¢Ÿ	¥Âƒ¹F’7¤7…D¡öÉCyñ\§4zÌfq)–aó8DKWA—D÷e¼ã¥8Àt9Àt;À*Àòœ“¥«Æ«1 È&!l“¶IÛ$„m¶çÏ*¬f£f‚¥‚K¨£Kø%îiJ4’uLÎÎ>7ÙµÌM蹫:öN^vÑĵíbIЬ,¾¬§ï²¡¤@ðøËŸÝ»°ùªg® á9>}åþÑҒ‘}+¨½ ú!REàü&)F}Íÿ~b^øGèT
|$‡Xô—Bý#6uP½mÉx‹˜9aÛF]8nÇQ.qâvNJ¦A0cëÈAØ cb §ÃéˆFüK2“X2Õ·MXT?FA46†ÇƃcɈRr,Q‚l&‘XrœÓ;c^[ÐaÔ*hvT‰Mñ'hRqx'ƛ©¦¿HG•>¶d9s¹‡…Em¥NýÉ\ƒ³Em†ãÈ¿ß›ÐG¢M\䇙6fN" âJ6ˆ§p„ r°A"„
6(­À¥å¸´—†qí’â%ár
-,éA6Ø’
?l±^úäóešÍEs6²ë9ޓðù“=—}|Lõ®D Xâ1ÐìãrlŒüEf[9ƪ²D|ž EEq‚`/•›Ã^_˜Ç²¨ÞÈBN£žþøÓTnÌ}ÓîbTÑk>9Å5h,(1h>y‰kTÃX¦wÙ…ÊÁ’ü]¨œ–g¼‰N”á¨Gí8fÃq„K£w‰± Ö`Lø™iKÀ8ߕP€mEL­“™¡@‘UÃeß̾.ÓZ‹|Á¨A¦Ãk³Ok<˜Å¨M-Ç6l‘©Í!¯?fä´Ù‰f›Ë £JŠÐ©)Ha©Ì಑aÒbs8ª£ãÁ¿V꿧¾Çðñ	ñ±£Ñÿ]UO†Á.T†Of´¬TY▛–È%Yƅ^dÆΠ¾Ýž®¬,/É=b•ÈªÌÞ­‘bA_Ħ‘qVºˆ½Ây”jÌ!WQ‚—iðÙ¼1À¯“Ÿ3¶q8do«¾´±~{-¾\­W0†Ù@›ü-¿ZÒþAËEøˆ—u+£F#$ÁO$ëPÈ8‰£GÜCÚ¤›âšZ%üv2€!«Å¶Ýf"#zP¨}q®U›tdÙÔaµžÉ™^M^uû9µQ?õ¹ÒhêfËcpDgsú­ôQHaL¬\áÄx§ËgùtuˆÍÖÅæ%`±Gôj.å­_×B_†8?ƒ&2
ÃBÿÂÔBªQÙ«´À­*檘¨â™í©šÄdô(3 È
˜·@
R¬Ò U$7äìUÃ$Qf,Fû÷P_EOVaT…«ªÊZ‹'±;cx5„C!Îûû²Þ¿Ôp(•K)…呱í«Çr%‹SÉÕcõҊ[%„€«Ç"¦Q bAøœ®–¢f	Â	~B!%å,­¤-¼ÇíòëïêÚ9TÚ|é×7ï¶U,ª_°¶§B«Ôª8…{áòó«ÖÞ¼4úµÛÛ7,ô.nݺÀ¡ÕB¦¦]ÙÒé<¿µ[o¤³jqµÛö*y§Áéu…½æ’e×.=e/mIt/lšԕ]M¢˜4?{	:ªÀïc:.ÇŒ‰RÆ }9(!¾™s}y¨blzîÊĎj —./Cãh+:x$80ÎMâ2Ú
Z7˜ÍZirù	ü!œ|!p+“® žó~¹¸·¥i°‰,֏ë·éi“¾IIíï»Q®Xþ}´
oØËÝɑ“~•Ãíî½ä—Ñ
Õï=bm@\+M­„ Ñ(ö\
oí,¤?ó–Iª@¢X/”Zäáàœv
ÁÐå}>‹µvÑXc5â1˜á¶ìtÌ1uÈß¹}IËúžr
+wªÐÔ,ߖéØ:Úá
+ö/_]5Gz+µÌʼnbYדæË¿¶é‚ƒkJÁÞ¦•VµéÍ­’lì&$ì»ry™ÕeUè&Ù Õ8f[Is<Ö\jyÉÌ+/¶x}¨w°ýÒV˜[Ïõo¬ÍþghU±(B½ Ÿ÷
G*Û¶u
ºñ„Jê`dJk$ÓZ#iÛ4®f˜q[“,«MX¿Óà$‹ð’¼ÐCÔ²ªkªƒœ¬|˞‰öº;ùþz’	Ük‘%U^g´.•ÅÎÍꍢ«ÍF©$öÓôú;ǒ=1¥ÉmÛ$W˜gÀ¤Œ÷uwÇ×ݺ"þ”µjy&М鈵ïnk©uâß^vâ†Nc´!±5g­RV§Ó|åÔoua~Ñõ—uìÛ°ÀT¼°2{ßðŠ¦õ»Àþ®ŠèQ5ºåGÈzDwô¦ä†Þ=ÊÜÏ<-šÝ0ý{±e€h2º”띿õgÔºnÑ$&Gͽô,úWéº+J&±üj€­E%Ï
+oùEÝSùæ€9­Br1å‘vÈБ)œM}#©µ÷n¬nÝ~ßhr¨½Ú¡’“ÎkZÖpŞ`f¬©~yKRËäø«F§QçŒxM™]G.»ñ…«yWÈ¡7;L10<þԊëG’EÉ°Ò,Dü+³÷tY„6>”ø 
+#?¾+£shYwd4Z¤¨F†­1ÖR7XGÊ{3½¤®·®·òròLI¯çeã`Ç$¦‡ÃJÀ5-Ôþ$­fÅ?Ðâta£à,SØ?£[è_¢DËêF—Õì©ê.
µ”Y»Ðî@‘V:ÿæö•8±°¢a¾V¡Mæ]/ÝøIFÐ8H҃²KPÕ£[3þ–F¬q×3Xϲ£z–s×3}ªgêU¢„R¢œ¥$ñJI╒¼dJ¯SAµ9Ø©©¹9=¸BÙaG/¸Wîˆ~@ÖÏBA
[æt	˜_*ªž]ZÍë!-,£B|AT=֐Ûußyëo[¯\wךÁë3
+‹Ÿi¡êѶkÚ[@ç@[ƒ21gNå®X>pý¡u—ž¸¡«£hrkS mëvgÚ÷mík«`‘ÄZ ÖaÙVÔYóþcÚÎ6ÊwOUF›ðvi8Y¸ÌS\æ˜$EÏð2ø-[ƎÙê.Hw%pì%¿ÆëW}ûá׺¨‘QóÊн+UÒÖN*cg¥2£‘µŒÂ„	LüÄn<e´×¿%–ïå"qjkËh,5BÐX[#ÕØb¡¨°öf‡sÍ ¤e´†8.Æ^Õ·5nŸW« †XØ_$u'è“ÉTzÍ7kUØk¶>¾s뽫â5î
gZš¼JW´6úpÝ­ü
+<¶ê‘Öö:Â\9!»™wT¤Bëóûu_Ë9…Fá/å2”ªÙ1^EJºn¹û+ã·ÿòƒý×OlØýüޅOÒëÌô•L
+՘“­Å–ÚÕ×vuîÛÐT¹ù+ŒcÀûÀã'Qz*Sœªi©ÙZCÍ̘¬Ç,aõ¢&»bk©á-ûèX{òkIš&1oQÅIƓ“l¤°¯¶bˆÇ1iK¾?+ð¤~íuüž…D/FSgÆ
+{¨D§òzR4–B©à`æòÅÑXMTtô÷ŜS‡}Û†2zRZ…F.¹ö홭íhhÚþðú??^ú(½êŠ«šCä3ÜtóՓW_úìuí;1ï;Ȝ0‹¥
+
+јOˆÒ΢›Ñ|ð÷qz8DoÛg ¾”(v2[™þ˜ì—]	9ò†Ã6ž9'Á)¹%îÎyr·äêݒÙpw—G&§_͘XWLD}¶¦Ë=[Þè绅ªi%[ãKžJ¿'úŸô©9½DV©[ °j–úŠÒ¹^"²²|¹ÂêK¸#U
ý!”™?T‚ÛvÌÊ=<ÏÜðžp÷%½á…EZÈþ
f»^¦Ò¨顆u
+£Ë\øô¹=µŠÌ.£blõMË:ƒÖìfQi5x¤[èP3ø¤5èՌÕTÚÅìi—Pî
+ðfÜߕn™œþ‘ E²¤°}óv¨E1ÌÎ`ÂýƒnÎPNÓ
+“L^ ×Ɍ¥i…Û­H—rŒÆ™*Fäv‹‘)Žd4°Ê´®÷çÚáw­Öñ:ú»¦îâÀÂÿªë=ￃRÛ_‹Ø®õš%Ó§q…¤Ö@þtþ’¹71¢
çü[ck‚öÙ§bÕªá]´áöáªh>|eMÔà/õTÚ£·˜
ׅ=•c{Õ®w›ì­5hÛ¶¤¬ê¢G·_rߺ>X¨HUFüEU«®ëOtù1o4f³ÇÊ»RöçUt§ìÃk†~H8T7\Þ·±ÙM/
û‹V¤]9\ⵙÊ|á2¢&Á£ÍۖUD2£UÁ溴ÓÙ_²`<[8põÒR•2˜}oՁºžøèùþÚî©Õ
-Dé,MÄ­­mÞòf&ß÷Afü0D­•èª£-U¸x¦=P삾A©BV»OlÚÁ„N0Á$iØ1µØÿå+vòm/í-êtöŽRX(Èw‰jýì&(!¾PÌÓ;#¥ôa¥IŒGe=åÍ»ÛaWh È…©]wö¬ÜÕtæä™V·,›º5)ŒMûzœËZf…oœþÉRȊ‚è¶ã-áÁðÖ0µI™ò¬Z©Yؾ9§¦*ÖPOíȃ¬ŸÕV#‘Ô
+dzFígÏ
ø'qóQ'ß#Ðçµ³IÉÒJ1Äübfˆ1a)ÄÍs	`.ilH²Wžô†Üš.o(NÔËu~m
Œ3‚<_´šÓ[ëhø[y¸¿o`g¯;ˆ
+Îþ`z¥Ð?¶Î~G°šœ(§w I®p3}èi~ö?<ª–gք
+Ú½ÎA¤`þ`Ó(Ui”ˆLÿ4{Þ|*Båhÿ‘ÁJö\‘þÃö}FíHÎÕ±ŽÙ#“dÛá¤Iç”·Dnäë\,ÍV;¨²Œq¦8s$îï±@LsH&Øà1ÎÕ8D
‡d³–Ml³«Þ³˜5äËlè
+”:T¦
+•B¶S>}ÎT3Î'‹
v-M*Õ:£IÇ:ˆe–ÒîúÍs™(jïnÐÞ*ôùŒ¶¥' ßϘð$<¯
+ÈUH
AÃ^+l…€ â‰¡ÒJ4øìPPh—­´1’ˆŠmidñO§1§Ô’)¤Oõ)^ðd•oæd7/¼ÿR;Ün¥9är‡yö†¹Â€—*Mΐòªt†ìsx‹N#,ðQ…N…ßÏêÎUîO‚/Wë@n•ÖÁgŸËFŒÖ¼dͬ(#tsnº9ç/}ÎȈ Á9	þìîÍÏ㙩I³½
+QßbôûŒÛÄz…'¢Bµ=&”Ú·-Áçvm‹ëŽÝÝ¿Ï[eŸÏÆú‹|•bï›Ð'4À	ÆY
ò}|1[ZÜ|n{½xÙsÚðY¥©ñX~¸¯ÒiyF×ÚÛÜYZ×SÚï,àa»R½´úk¬Ïµz2’ùîÈù
ýgY~«”HÂ"{Utf¥¥¤½¬~gÓ{Ь°•´•Õ_š÷r“ÇnóòŠþ;zêFÛËùÒ¡¾®¢—÷øg<C¸~Žg82cz®X6èJµÆ+ڋÍà2úsž8X‰f"ٛäDçré3zðYùǧáùœ/š¬ú«ñ‡Ç%wʜiF]Ú[ì,êɑžÅ:3µü,jÿNÕúϜjžˆ_ø'Nu¡€@ã̓,bV½\¬‡.bž–U}Þº±nº¯g<-	7ᄑ­¨Eµ8ªÄQ.Öpæé {sÞ:–ÔøRj¬.hÍÌnÍ{Ž}‹ØôÉã4°
˜çœÄø°¡7<‰‰TFc• ‰©|ÃÝXîçŸuÞÑ7v>¹cë#[jêw>±¶µO¹›/ìÙÜt·\8Ø}a{ÿf˳ûû^{tl{a»»gߺúª5ûz÷­­¯Z½(&ÐFð²×H™ÌŸ<þ>^</ü)óà}(?8s¶/w6Q […šóÊé•ômn%J ZԆv>S–n\ÈgØ
+‚ÁÊ·Õy9ŸAYžŠpEªI|þaƒµøÜ	!>?ã+ŠºdFYËÛRu\ºñ·J>âådAWoú]-£lA—N±×³~#þÌ[½Š¿5»{OX%`E€|ï“QËþÉçiÝ£o7\úäÎd¿§]•X5KSmIKý¥O^éµ*‹ÂeVíPi[‰õk*kÀ‘ý©¥ÊÕ{qWè[–*ÛFËE¶hÔ·ó‹ý)ÿèÅ»Z·NîïU«o1h-öoz—_¼{ ¾¨gcê.•¢j|?~R¡¬ß¿xøîr‘vgå‚4×¢ûæÈ#þTrlͱVs«9VÇÌg-ê#žŒ+¦×«Y™™“yWöv2Q,é]¢x,TP“ÏUåϲÚIJ,ijÒÉ?*ÂÏÓÂW˜†Ï•Zù…bÅ}ÛPˆޔF¡*îښ[[ox¶¦æèu[Ù*ôõOÔÔ<±s3¤èÐ«YŠ¤O̕ï¹9»É Ó8¦5Ölaß¹ˆºnÍÚñ‚Üý¼ÞëA
V_
+°®®jõuÌ:ܗ=H
+ôdUô½¬Š¬™§'_ôÊ3Íù,%±Št¡”.ôۈµôy+è=üàgVÐç+ Ïc;?»€~÷êx{k¦¨ÀˆZ¬n“"Ñ?0Tºî+ §…zg¬ýê¶æÑZþÝåÏ_ßŇªÂÙæ\ŒÀýl)e«»W7'¬ý7<}YÇušÌ‰¶ŠìýÃ#Mvç©%­9,8\T3³¢$ñηj0?Îíó£ú™k•ëïZïX8ƒj.æ‰vuõ'sk­þÜZÁŠ:i­`6ªò/Í$dÑڈiàú‰ËÙbA×õ®ã€ëƒ’dìϸA4üš$sšIµ6·p":IVß-FiÑI<gý{é9ëÜó×¹ç¬Õµ5Ò£Yôs|«ïºzëX%“`qÿüõÝYòQm,XúbÁJõg×wUÌÕú-ŠDowOŒ‰PqM¼³£«˜}ƒÅcTœSãÍÍŸNԇ
¹:¯1Ҙ¸$'&Ùÿ½â2K[…¡Ç„ãõG·Uã¨AR ™Gà$E2Hf`Šd*hb…\ _‘Œ*Ù5X=Ö~$…|BПÌgñ…¥«ù‚
AŠää1"W)•vo‘ÕY^ÝžjDZ꽺`‘WËQL×Ù|F•J¥´”õ×NMœl\_Ó3P¥Z­Ò»YT=4}–¼÷ W2ÚT_Kß`ߞ¾§ûdm{—Úõ¡he‹Næ9í|BþeÆ/öî	]{LĤÖ=VÜc†û9üwá±5K´Ô…ëµhŸÖmÙëµê?ǍیTlÑûëÏëµ½+*a¾9OjÍcmU­y3U€ÿmky%½zߢòå65ÇZï’-ËëŠÛ+ݱÌâeC™XbÉ®%EÝ
	«‚B†¤–«B5=©âLÂÏ,Y6œ‰a}ÇÅÀo»ÓRä7Cê¸MášH´*î%›—7U¯í)њ¬¼Ö`ãN^asÚÌárO¬:7-e•)Æ!6¹S¨#|:%æ=géû²+Ñ*´ìY´p¸H[Ëôµ•àô÷·º'‰"ãD­g»ºšúFÛЗ—»e‹Ö$ºm¿ɖN§EÊ¥ZZ„fp”oñï½!|Ë? Ĺeië¹*êqôýÒ¥W
ø+"¼N®uÅ«cÑƄ՗δeҾЂe•…­¼·ªiiÚˆÓ°(˜"Ÿ·´„÷YÍeÍ1SÍâՋ«±¶ys‰Æ`ä}^F(ÞÂÛ#UÞh]i,QÞ¼¸¦j¸9®tTûÝ5áx÷ÆÆOäÛ¿µúþ‹kFv,¨X±Èd
•8ÊÛjªºÖ2*§ÿL.ážD
hÕÑ2†K%y.•ä¼T’óRÉؕJ_Ê\kוž
w{ugíݬº¡#ŽÓŒ˜iiõêô)q1”›¿ì<»8mËE!ä%H”Ù;7d¼×LkrNá·¬_Ãdømm—½ÈcQÊT2î<oˆ×«ä‘¾‹ˆ^¬;¿–{ ç5±2U­Q©U2½ÐÙy­óÑç!çº;ã‡LKcÚcÚc½y1Á
Äx!¥Å=#Z1¿D¿DØ~(Ø=68"|‡dý’þûY-He.í‰idÎH|e3‹}…ýåÕuÞž9͐5µ3Ë~*L^«Ýk”Ü+¤V
+‹X²§ºË›wu(,~°Š&U>ãºbÙ¢¦nYGB9Ë7õ·Á5m‘‘eä²|q"üÏ	ë LçŽIùÃç„|ààøûx‘ß?þ
Ú/Àoà¾2…[r]‘tп½ó,
+OCÔÅ
+~¡W0âÇ>qàÃ6‰ŽVik™)_[S¾³|ú/™Z֖ùŸÇx—áPB¸(„ƒlØÄEA 
\À1¾<ˆƒliEe´v`qƒ¬×R¢dkflq:È®¯ezÆ{‚W¦¦_-ɾ=hLÈñ’âŸÐ¹'ò•u+&…ïsÊ?âWàÞÍv±‘ÍGè.L(ɞæt®¸Ïwê¹ì+œŒ=Œf÷†Í*.ËÑOˆÚtÛ}Fý2§RkŸ~ƒ5arJ½š®ÐšTT©UxSM¹´Zòß*­’¥†Q»zúcÙ
@íôƳ¨\Ë@­Ž-¹$êp-ÛFÊp4ˆ£
õã¨G½8æÁq'(nhč
¸±7±oÛ´â
^*Z³mF
êÀà
+¼A³­ÐÚg``Ckp#f?Èoå÷ðŸ1ÙºùtO¤§áÎ\Ž•0Ç›mÝ”\QB:jïW1"ÿ”QrìTKËi ¤Hï™VW±ÙUü	-Ïәƽ¡ó¼`(»“e? :{Üç/vjé·yšê\	Ÿ?{ُdØf»'dRÒÿ"äûDeµò›”äg¿FTæ ËáelQX3L!·«TS;gXd°(TàBR©€C:pšì‘[Gn(Ռ_	Ў>àW
+]—1*X-(cƨ±;@Ÿaíyl—ÌŽ-²aÔbVrdŸiB¸.Œk4X`•!ƍ¦¢<ÑÃÚM{ŒùêØDœÊ73¹Ew,b³ä¾‹ÎÓ~j6Ï´Ÿ¶)Í1¿/lÕpÿù3Nc
y¼#VaGö%6ÇÞ°E͝~•SýnoÄDTُJôf­ŒBºˆ7f`Y£LkÖããø1½YÇQ¹Z‘=„åìqUÅ]-XˆÞwmŠÐ’g‘­fZïÆ	7v…OŽêkô$¦Â.J5¸°³ŽQΉý=Nµ¹GÝÇ
¢>©àÈ:‹“¢Â2Å
R×Z3{ò:Z•ï(6i°Í¢ é+å•®€‘Èw«xš}AÉù|!‹J†1ýPn<EFyöo”i-z\ϙÔt•Õ¡—Q¥A7UF^3kdàƒL`L›ù}ɖª›)Â}\N-ïQH]~F£$j|ñ€·õƒG…§rRp¼JÕ®"ªˆ²ÿ#ÎnCL(HõIݧžcϕŸÓ„Zðå¹&Tð¾?“+õʩ׬n&¹øöìÞÌúR	§1j–½?ªÔ©äf·Qá	†ô6›“'#&ؗëmƀÞawñS÷*xá;Klö®?c8«yìÀ£ä1™U¡…hUf<‘ˆ+p*åº;ÐVޖi£mm†Tý+-ý§d†ÔvÔræÔÙ×ÄQ±”QðkuxþvÐh¾”­ŸÅÖg[°ÜZKVèF‹S/'Ñ󛪖6’C—õ¯Ôkⱅ!o¢J}ã¦Öž-^…Ñ”5M&#þ³ÉøàòÒLÜ\_a‹„Âr£\)ç8¹J^S\î®ì­¨¬r&åAÞl7‡³Vëñ…ZF릶„<žPØãÁoé=qgY¥Úì³
565>’ùQ5rftŽW|§%ò؏ÛÙcec€ÿ¹ïÒ٘Í)͐J†w/^vÍP¬xøÚe‹¯*ŽMS3ˆÜdÜmŒµV”d>¶°<‘IÚè÷¯«J^7¼èº±ªŠÑ½S×KÓ%\ÙpK$Ø8\Y1¼ ì®]Æþ[=Ž"»Y‘
¹3:”ÑìáÅ~¯Ì֍ZÞpÃ)[Ï7±Ç
+:׿¯à4N›ÅeÖ+Ž)‰>ìqm¼2ûCn‹†WËÁ4ª§2ê˜Ài²ëØÝdzb’ßWp7~ï lŒÈlC¨åµí®Óÿàn„SÉÔn»Õc3ªßÖÈôaŸ3ì²i²“²‡4¼†Y!õµInT¯Ë>p.nêŒuìWp¯½üÜr0ÿÈ°ûä¼=äð„õDyL©3º-6—†*n—-wÀ)tFÕïÀƒã5ÇÏÅî$Û;ȯ
:ÎÁkž;
h¬®"§/¤—©ÞQmºÔœêNùN8•ÞH1»
+(Þ)âDœ‚(„ê[ƒI¼î¨-¨	"dê@0(1Ð-1,+
ÍzìL¹¯Cvij7˜GîöÒ·PÚí3ÇØ$םf·W­Ô>"Ó[ý6«Ç¢“=¢Qª|.«“W+öe/æÖª5À`Õð¥JNÙ"æoVð€r­êhö«"M(£‰8S¯Ñ4‰ÿpÔc”ùIüÌA0Ñ^Í }ØC•`ªçÎtÎì3ÇøÇVÕ zMÅi=6_‘M'»ÿËJÞQävº5œêM%P3Û.¿(4@ZƒŠ£j<ùuHãˆL¥W¿Ãœyö2$Qõ1‰ªµs¨ºø	T•íqc÷^>$INå¹3ÅÛY¢k—›Bcrš]>•Róˆ\oõ
M­MÕ^FSh*[3’hª–Qæ>£·
MaþÇþ‚$šgÓô÷shj×ìDkàܐ$yóÌtÎìjf.ÃߝMS­üþ‡F{‘ÛáU˔¿Rš€¦qÙN|–hª–=!ÑÔ hºQ¤(uûŠ¡8ª=¢öÛC'ð*ð:<–1Û#®Ÿ«3{·ÚÿsÓ«Ó8£êXåÙ3IæêÄú¶Xن^è3Íoª˜Ê×HëèÔµi4ÒPEmñ§sšy›N¾a¬fQKm (b
GŸþ·,tá6³/ä37”+`š,ÒúËÅÕU¼ÆÝ•£kL¾
EP-8¢;Ñ	|’##¾(cwRß=Vê3W·>ü†mP…UQQbaÆ«ÇfÍY˜Wa‡l΋IEˆLžö„Šl¬®^ÔZ(©x»¾Èæ©ê)©^”©†SCòE:•Á9vQQ2\Y¬€È„w”÷Uº‹Š‹Ù¿
+ÿÛ
äõað4dGTô<Ғ~d‚P£ÿ0²ª&ñ‚#ê´_˜ÛkoIĔÚd…­¸9^SÕÔFñºÜhjœ{±6«®‹Ç«¥möEé¾Ûgß7"Ü7òÿà¾
ñªªh¬ª*†k…Qº:6u÷bM"V]›ˆWK[ñ¾`_ߑH÷õ³û÷>÷…{¢Ô•§ÿù-;‹ëê≺ºþR¢¾6Q\[ŸòÊ>ª+NÔÖ%âµÒ6ûFÎ&|M¦lºñoý¥Fpgqê´h—Ä/AÈ9rJnÈ=”
*u,[×)‘é§Éhç•JÞn49
Šìã9‚¹BFῐއ±0RãΌÆa°º¤Ž2»ßê±×_;Ç¬0r°)Xי\|f§ª7Uѓ²»Ò}å«6^˜¬()M¤KJ³cÜïm•n¶jo¯p­IÔ§%µÕÙO‘D[ü%i&	6“>a&½À3áeæÂþ_œ‹Œx¼5åé¾J‡»f bí¦mɊ²T²ª¬$»Tn(î¬ôºËÛÉÎ
+ÏÚUÅõ•É²šêŸ@|Cöü>ûzg‚ÌßyÄå2Ø&ñ]ÏPWŸùeå øíCo®O}öwZ¦ñË󴟧ïš÷Ë'·uÈìAn1ä#ý¨õµdx8¨nfÕ1}e%
+Vªuu=Ñ÷`
+âñú¶‚2Y¾ã&TŸûþ.·öù¨užç-Äç™Îy<VøÖÑÅ
+½5´,ÝÀ÷ÜÙÙ0æ'”Ãs—T֍5ïêìÉ`¿ƒw°K!#ýþ€V%çzV,í	ÄlD۞ŸYDʗ‹^Þº{EA±hjG¢>Äs'ÓÚÁêé¿ã_ÊVƒÔ'þ˜,âàY÷ë¯0œFó-M³Yü-ûòhIaÄJkØã[•z•3î÷' Cv$üþ¸S…/ËMŠ>§5ielh?©&ݍ;–:5g)d/Lgð]ÜcÈ@{ÉÜC'‰Ð›÷wºfW…ºQ4£/*ò«,Gd²rU{«ÔáC坌3¯³oä
qÖù¯âf.‚Ïy(霰|EåÊká˜ÕgRʱÊä1ÙZWÕ»™µVdj…FÉÉ-õCk«.ºCyö`膀qÀÓ_Ü<^#{Ï``Elµ{͊DûªÊú5Q§Ï!7zm§Ùï2-ØtÛ§çR`õt†– Ç
+`Tœ}ïDo‚Ž¨kìğ9-6ÑåŽZsž;åz»ñ™Îì4íjÌݨq¹œEvÍþª²Rç+
+µR(_`ó^w€—Ëù³{ÝÙ_áÛéç!‹I¡à¡"Ë	2^‘]ÇÔþd¹Ì€R§á¦‚Ç{éÜ\Æ8ÿTngRˆ3)ˆ˜ÈuvãÍ2‰ÙF˜ÚõZ{‘Ó
S£@	£CI Tʶ¥SÂd¤T+8¶º…ùÉtbúi®1ä>„,“d×qµ/ìì—Àtžn9ÍÊؕóÏr–àž3¿¹ûçÎ+
À0—Vë*e¶ä0Ÿ-ÀðS‡Øœ|†}‘€Šö#6•ä‹ŒUþhKª¹©Œ½.éJ•uÀ‹Ùã{§?àþ‚Þ|]¿€d7f-ÙV‘ÝÇåA«Êm`×L§O³¯Þ~‹ýξ´ì³\àæTSC{áQcc)>•ƒ]ܙ*kŸç˜ÝF/ÃgdW‚Ü©Ëm]€PuVW´EZ¸_ë(r29åOkvšLv
ÇuîqŒr¹1àöU••9^X*}³b1\§t}]ºþÿR¬eQ:UêxE¡Êr*lÞã
+˜är“ ×7Ó+h™p‡Z¤;*Ù*á.@ÀyñðÅg`GÕØÃGȦ
æo’iA„y›˲öyX
í®k¥Y¸|iäÓ9´³g?ã›m’^A~œŸ­&fOçg›§J4Z5CÙ¼Ä"?f“¹™Ó™l2ôµ=촇!k¾¿àLŸŽ°ÙËb~˜ã´Rèh*
+ls}ցÿOìR2û+òcô+"z"up—Êӕ…÷ù‡$ŸcˆK&ˆÍË4‹"óŠ\Š6âÿ¡#R²ÊQŠ=Óažùl¢ùÊ«ó5Öùœ6I-û¥ÞðŸ2Éms±ï#Êì­j£NNäj%^kÛðyJ5ìiy
Üã$ÚHZ…{hk2¸	—ÉS‚<vŠ¹2w]ř™ÊñÛ{ø:Š{mxf÷ìžÞ»N•ŽzïÕ²ŽÕ,ɖ­âc[e«YÅ
LïÐ1š)F€‘H’@œ@b„ 
B0¡%¡ØGïvvTl'—ûÝ÷wï{_d?çyvvvvfvʶ̌»å05xc§‹ÞáLv’œC]ü&é,H÷¸-[ˆEYyÒSÁé[Ë,9PqxáŒÉ´)ù.Ñp;åsƒÈx¯G¯~M„øÄ8<­ð¶Þø¦Q·ß îÓ4UjÜdOràzÁaAkÔDoãþyÆ@œ†8ß=çtsP`qžšî”Ì™‘iù3ܹg­âé‡x¾vLÄÈ5¤.ÓÉC‚ÆâuÆŒÊ×I‹qøÌZá_fgôŒì9’܁{!m"y	"zÒFZA}Ÿ×ρõ¥zÌ1†‹é”˯üŽ´ò~…Þæ³»c-
+‘[­Ð[ýv0
+§z#¹/eՋgéj(Œ6=Âø’èµ\Œ2ìЪšÈ+,3o¹N™ \‚Òâw:ü%°Ã	}|ꕜŸLM 
+Öá#Ñí\ƒðy±YŸ…D“§Æ„²è4bg
+ûô§ë\ƒt¶9[@:Û©ÛÜ? ñãT§än$Ÿ“™L¿Ò°xpû¦fj„ÓF?æíÂS3sL˜*•Óx£hŠõÄ­þäÝJIÚÀ>3Û4
+^€TžŠç á!aÖà'¸L®¡AJíqʒ}3oÔBK’i1G×XàߥÒÃ0ý«$ 1Ñ/šc;ú¸‚ãΆPÌãÊ!ìEÿ, gµž¨°Z,VþµQ-p…‰¡PbBHm–Þe¹àv#=É÷OBrˆ8_—]v‹ðc³+L	S`X±ù*z­Mº ã“H©ù³‚Œ¦Î‚™Ì'ÊÉÍeþ‡&sôX(èÅőöì\˗ñσ­¥iŒ×GäãO1›Ër–VÎ[š³tlp·—üfÃVÕȲœœ¥£ÄR¿ÄÜ3`å˜AÉÚ5V’â)ã÷i‰«cFFçGïß—‚}¶óä¹O^Ä᥇)¼= =Š:Ø~tFê–é{ˆô•R¹›Ç]»zíJ
|nKŒUǶ{%-yXmò:œ^'¬ÿi´íØëÑ/ë rs¢Jè~õ·7oþ͛¿ìQˆ"¹L®ÑˆÑû£X”wYè³n‹ü.á'IÌ,ÒD^ZéM*ôܩù¶¦îlZ
+ò¹$yŒåtXðûÞâæB^g±ÄøôXXµfÍgò:í^³Šëãܛß~ãÕnA%BÃbÖ½„ï{ý¾ï§jr^G¢‹!~ߏ>Ïy„­(£:÷OŒ1?&%(ë8»ü¬‚ÆN½Ê!u•£aé­ÖâÐa$€Çh¸ûnÂѱ¥ÉcÓÈ$Ñä4½_ύNúÝúóø |6ÓOÜÆ‹òÙ:ý«ü
+ÉôË$Òµ§nÒ`3_y÷ݔ'uN‹ök›Ç¤ô̝FQ8ì
š&QiöXə–FŸãª…=h1ò…õ¾ŸX­ªü·ÞRIg”–E)g-“üˆ‰þX)(,,`¯È²;:Jé‹K:]z
+CvqÕÐ䈏µji®Å*J"s,+³¡Þš©WžÏR•âŠ³kM)ÕùùÕ)&=֙ª6¨ÑI“S¯Rà´Èž?¯^R‘¤€+î4šFèãwïÜ×»giV€“‰$›s–¶]SßÓR¦Õ”µv7<·|iŽ˹;iî‚47“4§¤4¾(¦ü·*ýo™NO3”*;ûš‘UÒ"2–R™ „§vɯ	“TK‰î"fMjqÈ`Ë]:Ïcƒ-Q„”§Y¤1'×äåÕ$›I“¡KSj½Úc­\šk%9D†ø\‘ÉaPbE^SG”FŽWéå4Z²!
£uZMzÕò†çÚ"4“Ó d9U“éTFé{Û¹[aôŒK]aƒ?9”åTM¢FÒBÃo‘^kJ“’¬éõq«R$Ó%‘zUètò‰ÒKä|Q¡¥’¯7pN§O÷š—ffyïQßéĆO?5`§Ó¯;ÊÜ_ÓùœNÎð)ŸJJ¶¨o‰~m4A›#Þ¢¶$'…ÄM•¡¤$‹úf,˜à/úÍÍàžRn„xoEÏóAm¨@ΰFô¾_š”dΝo–ºÍ¬¼ãS*8ÉõboßÂ¥)šžb(“O’o³x¥4™ÜEPUÑׂ¢Î¨u6£Ñ
+­“Ú 㢯M͒”&ª•P¼ìq1ù©'(Õ"N#/_ñ2»Mª÷K‡GwV+u䡧NY³stséû*“ÛLÞNK©Ÿ_—¢ÛËfI®««OQݐ’m“ÿà/„QÉJ”¶'7½Ÿ_·ô}‡èȇ†Òù†…lJQy.Ótêü¼“^”¹üŒ„Ñoign“å҈¡#'”Þd%7ûDšð¥9c_Ô*Ã©…yɼBTª”Ñוzù³¸$½É¤‹¾5µªÓ+ù优D0êyÜOO§&„ó¦ÖlÖãT²/’¾ ¡>‘ôÉõõ
)JÈ‹Û¨JßYW»-dŽÅeR.¾r±Å¢ÐèÕÉê’•&—…dgú¶Úºé*È(°?·Lð—óÐZ°ž;TɇcÙ=Å랓æì‰à¯P1JÀ_‡ý*Gq­JU[oöÏO°é×	#=…¾¼6ø¾êt…ôÙÉV¶ÎV–‰|<!M@~äº>uKtöLú¤¹cíÝԋ4§­ùã”çv…ú"}÷LŸ»9ùËÝàX°vï¢ü¶ê½RÁ)”¥!iÎÒò¤êl-½6wٜuUñîÌpRRrÖÒ­uIóËR
¢.F©öçÖ禕%šíé5Ôßw[–-q§Úæ–ÙRÃiDU”r‰)MµåÎøU¥µý­n^kv-1fé…Óø„P~Z‚-ä.®_]‘²¸v®=q]eyGm‚ÎêÔiÌ.úêiŒÓŸåL(JO">ëÖÔ×DbC›ÖÛU*LO4Ç©í:o”ãM“>*P<y†o3āo«u‡îÝ`³`ÁBÅñ#d?r«[˜2båïïÌ3gÿâ£J“ôƶø¢Ê赧ú{î()í¿{¾Öç=CAµJaÅ×÷mÒs¿Ëk¿´­å²
eq`)¢\…ƒâÈH_°øZPőܒ™OÁyåiëÙñç©8SÈWÅü[¼Öã‹%KÙyy“;Þï2)¸!Èë*ãäoHƒÌëVî"5}>¡&sÿqßð?Tôè:õY”… lZñ@XçÍ͍ý̐ú…àp±S–éøÑã¹ôëù
r¦HËëUi¹¢EŽÖaþ\FíªììÚ”„¸øTO\–_´¹BbõÚâ¬ù…©ñ±ñ©^òíklÐ}‚B_Ý]²‡Ò3“_öܐE«PꔞšÞùñö¸4â“N4iɈý¥|7.ƤŽ`š¾oDo÷²o´pœÒè²XÜ¥“tV®X»óL½KÿéR5½ó!r7K!JwÀ=‰óI°GrÏðl‡Û¦Åâ2ŠNœÉ¦ÆÑg¹e'žzj¢¢9³ÝL&²ºßäÇB@h@KÐiø¬°¦~$߿ͽBi˜Àü“‹SRŒ%X|²º±ó#c-[ïHúP!'Û*wò³¦(æsù‚)'Ù-/·Pj=øéù»Ø&}mÉî•óìÓèŒ<îó‡{ê“KL©«¯Ù°üœHZⒽ«ãš–­L·]:¥)àvljklŽ?£*+ ÑXÈ#b]0ƖŽ”¤®î©ªØ¼na'úŽ9{fmNA}–c4TÝ]•²h~ؓ߳®-!·*Å}GŠ:V/K/\¾°&4wó²¼Äڎò²õ«V榴­X–ì©ilJ‰‡¬*£Þ]Ü׳&9>Û¯ãT.7Ý5*ChNf\iŠÓ‘2wñzžó—צ¥Ô„Ãñ¾‚—'cÎÉäü¥!³/řѾ¾=3XQæÏ'OÇ&õâ6!
¡½è<´ññÍ{]	¸?œ“©se£³\WÕvŒ¾Häœý±yÅÇMM”º½™›ãsþ­)ÿ¸ï¼æ]CÚñ£t"¸6dQ®ãr‰³^¦ÂyÁôê1ḩtŌk15sZQ¡\µDòî“B¾8â©«¶…â⥦^”n„Iߞ(ØëRXÜfNœ»bkcJma‚ú°šØ´Ê¼x—Æ,n^,+̍1+¼‰P_®Í”]•R™æ^Öð÷¯Ú2qYgMªC™wöÑ}õ[–jD­‚Ùª+i?wÑ3ѓw×iÅm»~çò{þzë“Ï&6å¥Vç†ê‚
+WnqEâ7'x\}Å[WäYãK’KâMæØì9u©iƒ[6·ƒÙ±Ë
Ò¹D󗵦ԮîéË]vÛÖùùm£{/Þ=”D¾Ç3[ÍJ£Ól°u›Í°üž?]‘áMw|ç®ÒÅWýâùpuʼ–¥Í†&s¨$‰okøèäq!
+VyJ°ꐻ~eýÊEKßÌ	@ò„»}ћe&
Ö<Z‡LGOn>vœþšé=„‹H.cGg0W½øŸ®*8{†¬5·ü|gAéy¿ºé¢—.˜7÷ü_òùmD¿û@ôÈ²ý“÷?½¿9:À	¢5;ܔÑvѪ¬’®Kš’æ—ç:•§€A—9”W_´iÄ_¶´8¯¡ Þ ¨¾}õ=ïì¹äõë5~çß¹òÍ«ë¹MÏEÿòä²¥û1Úÿ4¶\¹ò‘Éh²ÑaÖY‚sñྍcö]A‡ÎäÐëfµ/ä»ë–æ-‹‰
ÑíÎnz¤ÝRŽ5µ
+._^¶¬ÊmÌ(	ÆUSGß~1×ôö±#ÐÜ)9ý>À©ŸNY¶Ò¼Þv:Ægk~ëŒ
'}û-d‡æˆ¿¢|ãU-‘+{JË7^ÙJxEFÓ@¸f°)Mâ¡Åi[xÃj¶ë•œ]ë16‡c$¹<͑ŸîJ5º”;E³×ž™žäO´\Ù[^ÖsE¤åŠÞ9¥=W¬˜?ښž½d°¢v´5#§up›BɃ…¬VÕ$ø.ÓªTZÜãpüì­*11ìÄF­Í¨"O*¸—4«ôRTÖ–d·,Zš±¨¤¹,"jižß,Zeñsó’u¾fTq877×Yr$—ÌðöÛGLÇÞvu=BÖ±e¶Ûì™}fÌ=}K-ÄÓÇÊü–˜±Z‰‚þñ¢J¸\4Ç ¼DT‘g!*_+¨Dž×:‡Ùb×+¸û¸€Çååïæ½Ýdqè…ëB›×nTî:_Ÿj°¹o»‰ÑRA„ãDQÀ/Šà`°ëEQo?ùՔósѹ*øÃ?ˆV279ÜäÞ@ô~¼<r;¤÷ÎáÍR‰J&op ܁lHƒÛú·»…ÛBˆLÔsÆwN/K	ÜK•ËÂñ‰U+
+ò—‡ã϶ÓcÜiA‹%6#ƕ°D³ý9KçÅÇÎY’—·ln|\ْ"OVœÕ—ãˎ³ÚB™Ï“þ¾ÅðÏ+Ð|(çña[e¶Ë/¦¢Â9*{ã›%:ÿ²7íµ£‡³H—zô°d–‘â:ã¥4z]¦_M£ƒšoXIŸ.ÏX}äÔoÆý)iù9Wk}¬Ç„k±1ÉÎ\ØW+Öå5ˆÚ+ )J¿Z+‚äKð¿<?{Ih“Bou{cõJÍ1wAdNQk‘×]´tnas¡‡_‘sQk땅¯šaÃջѸŸÜ€kÈô‹œ+—-»<ÿ(ìU’›ÐZíVÛ~•VàU&—9j)êjÈHª]S\ÞY—-1yÆ3ù	ÿ–àG›Ðè!ÔO&7rëúñꪦ	.;4¹ëÛÚÜù(QçN¬ú¸ÑÛ¨[ýq«£µþ¥)KzJzÖϝÀ‰ãi­ëÉDâJº¸Ô̚O4⬼¼£‡ÉðØt8Wú,uuû)iê®Íç©Mú]áÌq’Ýϊ¥39MmƒGn”ßÒ¹òv–vïÛºÐ<b2“olú0üõMbÛ­ÆömÌZ¹ À!½ç¨QÓÂ++*;ë³ô8ŒPÁbŠ~Ÿƒ?<OÞzY›ÕØ[;oueŠ^©Vr·„âœA¯µt融§XSl®\»?ž\—î{ÇÂ&—Ïb²y­DB[œ²xsŒ"Íñ~{šÛ
-Œ:CÚ‰ÁÄ ÒBVŽ]6©åo>‡Þ,ç©Æ–F_£/®e«žZ– T”ä5Ǒ%`ÌZr‹6ïxő¼©¯M‡OyªZ”)Ìx5mêó8ùæ¨]éWž6Õÿ-åCwu:°`pۜ“À9³[ÂvMè³7]qmaÛæ±ÍË3W]¶Úþ\v‡Ï¨pøç•dš•
+éµFmvýº²ªµež¢¶á­ÃmEx iïšbáM%)·¿!Z.{œßá³*}!ÿк²Å%)©…M#KªF—‰/A_ȓû?áV§É¦µÕkRÅøcb²*“æ4'§å7LN¢uO÷Ÿc‘¿O÷jŸ|þq(´íäkO#–x܈É@šü?[ðUâS&Mà[Z=G6ª Óé»õõÕ¥Ÿ%y’ª?WZ•IðOÛBÖ™¾å!ÔߓÊïáOi–+¦2² €ŽÁ‹¦MðÓryÚdØ©v¤ÌM ý˜Ɨ÷ïÏ]±³AiöØí>³è-)È"³iò*ƒÚ”P™›·¼*)©vmqqkY²NeÏƺ|»p-{|r•ýó7FÝ1_7훝
d¢.©..).1ráú5ç/I¥ÅkíÒ<¤
Ð~?51ZøXyÃgý檌Œ*3\ÚÜ\sÑV‡uñþòÏê-1¾µÁő.8”+ßå’'/8|Dº‘7c¹¡©åhg~p†›öS×e}XÔèÅPê`T­Ñ«Î:kJ÷\³"µ¹¦È£9¨Ñä^E¤lβb/®#OjDNÀ_*õ¡Ɲ*•)ÆJ–Â/Bm³™cÌÊmgÊ3ÆÄŘl.8¨ã’ãRš¶4ž­„
Ôâh©Êì2Ö
+ysPðCÛOËX3-cÍrkžUÆú£wò·	ËÑ\°<¦£'Á˜“˜“ãpä$ð(5Ût<&11¨!_ÖɋIËùÒ[?dÙõ#¦#Ӗkë¦;^v.²Nµ´F‹üm¢F+¨\Á$gVU¦W‹¹h6EŸ§±Ç¹Ý
‹ˆÏ{Åd vý!VW¶bk}Lnj@#ðXqÂ
eN­!Ó–|ý»%>öD]\E§âŸ·xLʯWïmITj•ÞL¾j™üšÿµ`ƒ:µæZL–1.c1.#æÄ¥%UMàŸj¬H2¬&‹/Ù²üIu-…-YøÕ$u¢æ¿FXoçžÌ=–…‰|²——÷inîr-d
+‘#¹ä~Äê4l¥ïÝÆN‹©ǞoM‹ÙÒϚž|bm²è¢1f«F?ÒY,:l›âô¢)9Îrè„BóbcáëkÈH0(u\w¡/òÜîÄy.$ïL(”ZՅž¸€ïvO(à+ä6Ù=<Aˆ~Qqî¼yçV`4w¿Ác'vI¼´v‰
µ¡Õ¨$ìkjYZ^ÿΊqE¾rå;þT³ü‹¯j‰8ٚt!¯ãP)U0ے—ÞI–{"vJM•«üÔ-O~’oçc§žé“÷ˆ`b¤Ö+÷&­¢J¯<?‹&¯Óé7‰85úa*'½NÙJ‘|èT¤l7Z­Æ‹R°Òìwº¼FE*v$a•ÉïrúN1ZO>–Œí©ü³Ë¨Œ>ᏓøAò5™ôeÙҙÚGöªðB0äÇó”4[Åès3u`]ô	¼äá¦Éãü÷„ ô¾àM‡PØ,NRpÚXî®ÀU8¿ÇW`hã«Â6×«ÛQ€7ิ§àØqpaò”| I×Gøà)eë°nbòë°6t¥“ÙÙBâFãÖ¶ê	lLXËîƐÉ=WMK[½ú=éKG™_R’a3ãKuÅiÌ)Sn0‹ñ{ù}÷nnÞ¹ª<ÁdÉ\¼õށ„…átƒRÁa¥V­M,lÌ[}A$…™×¸4§÷ª¶ÄGœ…+*j*bb+ÖT„×Ìõá»#wl¯Onè»äž5­Þ~iϵѢխ4ˆ³aážVý.cI×ÅëJ×VÆë
Ë9ôfd7w‘÷ÔZ oŸ–Vè*Bóñ¹‡P!ùtÚL¦2AwLÈ.Ì%Ÿ¹ä3iRóôäõrQ³™ŸlöQöLiòºì	Îvے¥ç¾ÉÒ'ß²҅Á\á¿1ä÷“õ+mҏßæ×K~ŠÉgÃvn,–”ɁÅOsUM%ÍøŒ‹>µ“<;ùóòLqÏKÁV’75$ŒÊl´’Eº’EºRŽt%)jf
ù¶QSP.dœt·Õœœ*,%S‹¥ ÏZ ‰4þ3æ¦!¥¥É3M§ßô£cz_¿°Ðš/ÝY¢¯kóOÏÙ|ï¦ÎÛJ“ÔÌYŽÍ鸩{ý•«ÓÉìÜó$½á+n-èô”,›Ó՗WÓS]±¶<pþy{öâ…Kö®ÈLmÙÖXÞ½tA\ ¦yUaõÖåyYÍyk–ÔC
‘µÜÚÔêl÷úHR՜’@þÙ'ïÊ\0¯<60·²>½}ã&òÎ)”¥Këj¦¡ÃîS¦
K`ӀeoŒHéÈÀ3&ø"sÝÙȗÿ6rñl.¢žá2BA:éAP.\Ay无üù?ðä
Íø Npaµ†,ÙF<™XF7¸1K³XÃ!éûri9YZ ž—j<Ò MFºgkƍ­dU@¶\çôz>«ÓVCEŸ9'›tÉþÅ\bŠ ‚ÿqVÿsvÜם–Ýw`ÏYÀž´9Ù‘å`OwÕGʓ]jî’ëÿþXû²þqçuÿø¡ö›·DŠÜM—=ÛwõË{Jã«ÖŸÍ×#Pmïœ(ý1ïÇñ>ïÅ!ŽÁñny=›)ï-äsãliF^’ÝÙ‘¬E)ò,)r†¦Èó)¤Èš"ϜBzrƒßEriɯÖ,×#`©^™åz4Ãýyy©9Èz8âN36[-¸âñPKŠi+™9yòˆ4?
+ù;B&Kf+pÑÊ0ý=ùêÙæe¬Y)Š²é wpÒ[ü"Y±r1Eµ^…
_“y‘yQ«Æ©
+Åeq-â‡`cÕd%±Á ä߸^£Ðûf—I'~ŸW(0é~¾¹RmŽ!6ó0äö­P¦ç¢ëÂú”BœæÇ)>òm~x‚uCaì ¥Ø!µ<Ž ô!8—q0/
þ¡9¯Kžæv#-Í-ù_Kf4—ƒ%Pø2æ9ÄÌVSÉNž6¸¥9Qhc
È:Ñ:k0¤oîge±~Ny%^œj;èc×[Éç]'v£’×uß,ë-±xšò¥XHßˁYYÖ¶©lÍå«3ó/<Â婌Z¡¬×¦4ù6¿Ó©ÇšU×l[Ÿ–ÖXö´Êâ·&ƒ=>ä*Xµ£fîYW>:|Lm‘Þzê6áÈ¿åX8„V@–yI–­À9*ȔRñs¤|Ë!ù–3Á„5‹Z-rYqc˜Ì
‘^ÉÔapMóÊÄf쑎ô¥é¹i‘õ@Î?)}s/­7Aê·A.š¹´ȅ³Âe0”‘IPËÂÒ§ÛeØ,[út>âXf.3;
+'°6¬©oMÿ<êÉR|Ú©¥ø²Ž—˜¦Vユ;‹¶÷r[/ÙùdâLKÉt;?½HzáÌ'»¡éAÓéß5L_D;ô×Ì}pÓ¼ÍËK*‘7èÕ­ƒÕ•Õqi­Ûςk¥µõæÊÞú¤˜üæ‚Òö…¹i"8Qe-†W\´2#8wEYÕ`Sn»²»Èî6Ÿ=ÞLÆ͍ä-ÇAõ°[ÝFe\¸­(¹¾0J	FƒÜ²·ÂuÎ\26¿¼·¹DË)šHÛOVÖú•´U&ú&\J&²ÈÀIé8>	Ç'â/NôàÔ@%¸p‚':p¢'Úp¢	Ã%Žp¼§y°ÔZYhk•áppMòÍtfæwŸ"37{33M“'Â>ða"Տ¼Æ
?d҉˜Èëd&²xjRжJ
›D?¬!³è+²³’<™ÒV¤ÅšLšØ
]
j]±Àétiò,:dì#O×ÀSþðìéݧª&žn«8„cù_Ù,×°ÕÂO~¨3éNÔ(ñ/«?Ý›ã7]c¶G÷qѕø><›ý„MƒM"˜ÝV¿Û©ç-äY°cá/†¸?Ÿ,%5®jÜ
‚
Z¬Âú¤"œT(MÂÉK-ÖAÚ`É­R±j´dAQ²(X2d}2Yž•Ô‹dÃâÜÁÜݹ|Ñ}šË“V“ûÒ'¥ù„­dJN2˸Õ'=¬K/ý"H֙қ]³ªŽ<y@6“kÌáÕGi塙Krwº¶Ì~L öÜaj¸,O)ÎßP»ç±¾9}K
+¢À‘—Ï4©ó{몆š3“šw.-_žèu|\¹ÊHފ‰úBõك÷–à;7Ü5Xjv»:sŒÅì1«Ü¾˜`uOÃܵ
]LgŒ
ª¡ŒOŽ^/pí—LN²q	'ò/I³ét@xr>€^?„ÌÐvi̱x¡Ùd’—^½$ër?ù¥TG¥	sLì(“‰Ní"e’’vkɜ<c&RqDy:žXvecñÃö
É µË=òŒYË¥0ß}Ž±æ	œñxL³vj1L©K–®Bš<›Fgzé%†™óVðò‚ZŒf
+Fg|L\¢™ñ‡'¯µZAÍ}f°kEÅa‹Ïã6|ósQ͓§Š†äx+ô+¢Å¹)D 7&­ÒN¶ï…ž#U¢ï…­)™8UÀ)Ò\8©‰8Qƒ«IS$É®†îDÏzߎ\’SŸÓ›Ã§åಀ«A4„8: Ã'H‰-#ýZFìiiDZ2\XV[Ö]ÆǗ‘iaCVN*¿Hmu‘[bòMo:(”†ƒÒ‚C«åaîÌ2,•bÅ©s˜ÍZvX1ûÑH!¯-»ù¬†Òšç¥Û ³´*mryK^û¥ËÓ¹‚ëÖõ]ۖ”»ñžáæ]«ÂIæGã*×UÌ[Uæu¯¨\p÷ô’‡î¸tC™Öd±b1Áh1.8ûÞUì²îËZ—Þ²¥6¥±ÿ’}µ{íËÎZÜYP¶¾:!ƒÌâ^ÆcÂ8¥B«çpYÀ½ÊõRv™ÇæÚ$qRšÌÆc\=ŠEC(?ò„Ó¬Õi'°õqï6á,(SÄÒ;’7ëœiŽÝ£ÆcdMpf×,äåzµòi^f…Í­WL(Õt`j%7Ú¤ä4³Á¦×ƒÆɼB)º·`²ëá¢B”~ÙðOfÄfÄ¢¼	®2¬Q;ßHÞ®Ëÿ!¿ɋt¼'ÙRR”Äi󩈘O‰§-`'[O®Ggˆ¦jÍäي^sSnyœ&\–P–T)Ô"/ZRËê’+ÖÎ
è3—ÕoċtÆ+}~…Îa69¬fí
ً…®¬96‡M4:MÅm7‹e„j"ª»ü$
ó&S¸6HÃ"Ôteà_†õµõñµÅñµµñżÁ=?Ç CCjØS—úè+þwýœß/d¿0o»ãÂNV"WO“æ
•Wy#ÆÇÔýâÌOïg[…SIOœ69È:$<ז¶x¤6kaQN£ƒ¹U)[\9uÙuä›ò ¿¦uùœòøŠœX‘,_)èÒËêç®.÷-jL®É÷ڋ—Ï	êÌf¥Öè´8¼›yN‘/+h
`6ÚtbeYf¡Õiuùô½Zç´¼ùóÓê:MïË	“¶ xòS®‹»Azî¶Ø_crc÷£Æ݁=*œ‰ßÿqÖG_ø<r]qµ›êê7Tb«7Õ/ÞŽ¹ÌK^N‹5YCqÉy
=žßxv[næ²]Mõ;Wä®ÜQ_¼¬Ôç-n-®^Y`÷—µÂõʙüï宁’ï#%ÿÑ°F*ú'¼»…sf–û„Uî÷ªÌ;yùš”{Õâ3
+µÞn²»‚¶8(÷"þr‘’WÛÌà®Q`cN!Hå~dOäL!*$åþèARî3HÁW„Mj“;MÞ­äãüGù=$—r¥lzOLÐï
¿u
ˆÑk¢:è99Q«=?!ׯ/̌+HŠÖ@àCRÁ¼äÇœR_´ûú¯j€Õh·Õ;Bù™éî¤\“•\w³Íf²YtžÜê”ØŠªÆŒ&©dÀu6AjšÉ}æüxX_×_W_W_Êë ¼"]AAŠ)g?XHÁ)÷ŒF[  TíØ°m¿\$.Ët|3ü—Xœ¹>(þ…^8;'Äwa8Sr]÷ܸŠü£¨V«¼©sRC9
£%inz¥RCgš7¿!¿Ä—ŸâPm0/hâ«‹[Š<ÖPž?¹<Åq(£!ߧ6˜MîÅh6˜Ü±fè;õdÆ*£U«ÈËe™¬F…ÎjÐu*Õ¬w§•'ørS|*ELr
ÔÛä×\9w¹du—gÆÂû‚'’
+”1w‡-Ž$O g>(·gkΙ6n7Kߜ)!Ïpri1ͼÕ>=¤œ²[ùŸÇ•ë´È[
dýY­ÌâG¼Áry“ÜšýG܏:ãÝ,’wàg³B粚“o¿à¦¢£N\ý%“&ÃäM½CÈ:ù<[¥FºgUÛì•ôY'ÒìhÊYïQ’ûýq‚Áæµ9<Z^ş'ì»Ý£ãU*µZ	­µU'¨Ud¦ƒMKzºêÉß
+8g’ÂŽ¬Ü…ÀîC2û—"»‘ìCñ3ɇ‹»ö$Ñ=àC:|̇0¼’'Š‘ÂHÆҚÓpÄ;RuàcHòaC&ɇ×ÊgÙÉ|¨ÄS|(å³í”|ڄ}’mY‹úøƒ
+ÊB¶ñÔx?y4¬É®GNÉûWK–OÃ%YiEAP™½v›ÏJ­×ˆ¢F¯Âõ*³ÏF>F
¥×
+\˜¬m½Ž¬tA–Æ}ÐA[-àJO]“VA§£üuèNþVþm”ƒ‚a½92>G‚>%Nm–¾×“¦W RÉÃ.<½0ÆÌ
+’沣͵cùûè~¸õ8S­>¿FԊÑW£¯Šz¥ÎcÖàì諂hóú5z-†r!è”:ùœ®<ú+Q§Ôƨ|	6O@£ÓâlÉì0k£¯€‰»¨ÒP„^‘
+ýK
+*G©¥¢	6_£±²JbŒBÂ!¬F1(ëäo˜~KÚõ’3’Žg߬:Ã|ÜF­'#6.Ý£ÓyÒãb3<Z¼”äå‰GÙl#|3Éß胧úãÄeøôz_F\lá¬èô*è?ಐ‡ŸžèöØ¯^ï…ã²}:/›ôkp1_ôȃ|O ƒÒ®}k™á×%¿¯#“<ó2óìùÌnsOꌛ™ûÂb›©y>9HŽ‹‹.#Sf&ÄÅI_ß¡ÕüŠDäCºÇF7y‰~K= ›²:èlwØσoQ{â#ŽW‚9evšy¥^wr'·GoTñw¹zQ\!$ƛ¼=‡/Óº²|q0ªˆþ(ú’Rk‘‘/ZÃO(À…sZ¼&Q>'´Lõ¼“»ê……'Y¤fB!jÄ՚È;§-wþÉÝp>N¡6iy›FÏÍ5{lZ>:J¾-szãì:
—ãQëùb|¥èˆDry!XÃwBIš‡òÙLé(Q1oy"ƔŒ™ÀêÇ&Í2Î]‚*N{;ê-äû§¹¯6½}XÎü™8ñŒõ÷´òÅp£Ï@!°Ù îFŸ5:È£s\5Üf#ÏÂk•P›EQ«Sžø\©×(EµAÉU:èÄ_Iˆ‹~GI+¸oˆK åoTêHõÖ)£7@™:Ù	¡ˆ"	?Ƭ–ã3·j„ûÒâÛÆcÌNéÖ¹e>N^¸Ÿ9)à¬5¶ù›IÛcõZT'Û¤‡øPö¹Ï’‚xžJþòêIR¢­1f•7‰´‘òÌ.œÈ/µ„!ð¯¸v­qÎߐ†!ð÷Ì_v’Q#z!©®æDNtD}Py;lª'!'¢(‡5‹`ÿeꃲûԟ¢]a˜Þ¿—}(ôm!z&F XRT£ö3â#Ø÷ºQ1‰<üè!@Ìµ2:k
çÈîñ£‡ cWž
+Å	 „QS ‡8Ådp2p	 ÐX8Üý€$Å5àïr¤ä.Ÿ|@‘ÇøÕÎá×ËzykÐCâëvê ,Dÿ!SˆEŠ88@Xz9hŠV¾ù2ì×ÔöŸq&„8ôළâ§ô£òS¡HBÙ–ÿ4|•Éˆ‘ødú¶VMþŽÌ®}ü˨ÿLPt¡}€Š­(—lñ}€l™ƒ2Ò
)€JÙ}ßǝ‹úNÃ6p߆.S܆Âø#´4¹Ø
\HD-€Íàn¸´›ÕÜÉËøŸBØî]	r’õ'·×Ð>Q„ð¯žÂM€m’î<ˆºÿC<M
átó?‚s
>š¢FâŨžbòo€¿Om·!/ß6¥åñrtàV™oŒÉú4ð'Q¬8
+þg¨ß×ìTô¢j*‰_C«NÿnÄ,
+E>º	êÏ
+‹Ëضr­ß`
+ð»Nq`# µóß@_ù-ÀmF	âÍ(AõJPì}‹¬çœ‚ŧ@v·œ‚‹Oì>Ë¿ÎQ5#ì½ÓûÇ)+JP&£þ0*8RZOÇMŠüɇU“_ácè||lrؼ–zÀÝ¸‰¯ð£‹ð‡“¯ÉèàïwÄ •óJ¼ƒ¼ÜIt“ØIÎ5‹$¾kò6‰‹ázÌÆâÓÜæPˆ?“®g÷º‰bò+à
>5S@¹<ɶ…G( ¬›ð§àÿË~̄?¡XÅØ·äu¬r
”ï7¿ ž×
®ù@#àbY_7üm(N˜@§‚ß
+mÒ(î4¤ 6J‰‹Ñ0ߎ:ùmPVBÕÜQ·Hâ:nÍÇ/ xîF¸FF}¸µãþÉ7`»¯öl)øý“„é88ÿ8Uâߣ9úÿÿW”Ν
}Ü(À¡Jn	´gdòÏëH¯}ŒpKOwƒø!~-@r;q ç·Û½x¶oܸ_rï¬ãã!¼¿[- Gr¿p6ÆØֈß8Æ.^ÛF€Yr{ðw5ÿÀ’ÛŸ
¿ãÀÆà~xü¾x‘ÅÈþ@þ9Ø!Ç?§€´4@ÚÎÞÁí–xþ:ËaöÊäÅÄá[¡=•R"úcÒ§Q{!z;雩½Û E²®Gñ¬¿‡<n¥}ø¤C:úm~?Ø&´†þ2:@X´Â9¡?ºJhBk„¦èW´Oœ#}!÷ÔDŽh_}•´­´ßŠU<ºi¿ýôQK¤þè=dfý!ZCû’É2rŒÔ‡¬D¤þ@j·£w §H».,G’þEñØdôýíÂPOs¡<^}YÜë»PF
ÜO 
XûæA{´
‰\.ºŽËü°`”Ú•' }ÝÀ7BYçP#ÏCÝamBJVXÐ8¾
®ÿ*ލxE]%cÀ!¢ˆP#Ë^d@×	× NîbéZj ¯Èµ.ätãâ¡ÜO¢
éz6¢‡¥ë9$c\£$ÄÏ°ÛÅ
pŽ—ЁØW2d{°‰ØzSöÖï/~
xÚJ~ڎS|E¯3±S™í餘€vá:z­/øù`ŠŸA~ÐAFѬG«íh½Rz3Øw“püg`»AÁ–ÊÆÇè.ÉN²ÉH‚ë½fØCéÂ6èƒ÷ eŠ‹aßÅèÀõ²!ö¤u
\[,•—m²Mò`£\VˆÝÅìˆÛ ÌÞ6w¤CCˋâ
+8¦ü}úÅØ;5°½9…½àö
àhÿ	Ø/¹ '¡_‹Š@#™6ÎKÜ¡ÿWTA¾²õ´ë‡e€†2Qvž“ô3ûp.Ø­PöZÁ¦j…>öÃ¤_ã±…9DY…^´V1ú±d¹¯Ê
¤N÷g’Aú7Ґ¾Nn›]ü/Qœ"
+îÐvCY¼I‘'õ¡•ÂQt“…í¤–€Û—BÙ¾âö"è—Q±¢uò+Ò7Ãõvñ6PV¿KÀ݂5Ü-èûü“è|À	¿…²½<Æw¢Ð¬…rœJÊ4àR¾…Ð
àvqg×è"@cÙ-;ˆF
Ï3V¸ÁæsC}™w"̽}£øþ~¶µ°Á@àO€=	PÎE×ϸ}ş@/LÕ¹~t>`7
+iE+¸óÐRÀ†v5î
è çŸùƒ°nlllQ@›å`œ@
åø0º”/@—
+Ð'	Ð7)ÿ
€~C9‡²ø0z”ÆŸ{„{P…ðj„ô"8¶Bñ8”#äÇ	¨ÉvZú 
¶[û!/Ò@çóŸC_}Ôßç`üxø»ì´XT¯Êƒ¶â´ï¿‡2nF>Åuh-÷2´Ë¡õ€f(qüëÀ…èl~l¶Bh
+¡lPàÀ0 t
6
:-ª o.GnþhG =|%ò OAÔ£,(dˆOàr@`= Ð#Åù(?w@y?§Å/ù[Ç/ûLñƒúQ‡¿âZÀ=Œæqo¡î^(#Ð/çrïû;`§|ˆš›¹WÐ2ü,ZXþ_9–»
ã¿¡®Íáê¡\6 WÇ4£l®ÅqË ¬FûÛú{lr
oEÕÂZô¥‚SæL@+à§h‘„4_x
+pàJv¡Ð5з{®NµՁÛ*åOáz€~ýZXH¬‘uê\+º?XJʳðg”®Pø+Ô×¾;öß	¤"ö±HŸ)vA[¼­T8PÔ¹›
7~*Á€Up)cÍ"t³Xc·n”,ß}©œ
n
`pàÀ³€£3ðÑ4 dH€#ñÖÓ¡ÿªG¦¡7
ônš
`iސññéÐ>Þp:‹fà€-€T•g†IGaÖȸ÷ÌCÙ
+g`Ñ4ìÐ#Ú¡U±Cm¿p;ààl8ž¥p~‰ëC„ÜÅ@z¼Õ³áû`¢Óðÿl6¿|PÒL•QyfÄ&"Ww:B.À—ñ&à7þ9Gÿÿ¿#1e%q`êâ]3ðô4’G)R ¾¤>w:Ò>9þidÂ8-êÎdÃvv¾Œ†Ó‘Óôÿ6òR¿òs§Q#Ü°H
+`DU°Qƹ§à×Ó(ü`ÅÞ¸ëÌ(íD¨ì‚¸u6æ@›4ç„Wí]¹9s7RTÀõƒ¿yPFªàzU}95çÍÀͧ£ö]Šùoü÷¡âUm\=ôqõaËό†Z¸åt4^ƒÐ¢U2Fe\‚Ðâ:k(šújþ7ã
+'¦ÑÒ-ã•i´î X’8?§ˆl›¥‰2ŽMcôyË^¤X^:ßùvh‹“ñÐ+âþÿ.¬Ìþ7þc \ùsŠU`߯zåŸc5ôñ«‹Ð'¬Gh-ôkïGhf nß0/!´Úêõp\Gõ@_ÖùÈD)º mî‚~µ;_Ƈ)zT§l©h“{ŽQl€sö‚{/ôu½ÎFèß7ýìÛ£úû~ˆÃôC`?ÝC±ڏÍÞ0äÁ0؂£áilQLck!Ŷ%m¿ˆb{ÖBŠÇ]Î³Ó)v×"´g=à*„ÎÙCqîÓÿ{£ÿ÷pþ
+ŠïýŸÅÅ0†½®ó¥¾ËÁÖ»ò檰ïj_ýB×vˀks-Ø,×ÞúŸÇup-®ûBôðsclƛ`ÜyÓoþk¸¹IÆ°Œëþ	þ€Mx7wRÜ
+cÛÀ¿m|·ƒ
t;äëWÍÀ‰ÿwêþ?“7bÐÃH‰pȄ²Pµãs‘Bzw&ƒƒ«A愂¿N闗޳1H[DsÈÀ+dÍ£lÞ"kÅ?rñ•²g¸+Ñ×ü
+Y«P*ÿŠ¬Õ(¨X"k
wç”-Zª•µ¥*^’µžûŽâYPŸò²©÷~r•_N½¤T¥ÊšCJõYóÈ¥>G֊~¤Sß$kq†»íRWÖ*dW¿+k52iâd­ÁMSþµ(M“+k²kVËZj†em@…Úç &X¡–ó™jšÏTÓ|¦šæ3Պ~h>S-Îp§ùL5Ígªi>SMó™jšÏTÓ|¦šæ3Õ4Ÿ@A”‹²á_!¨Fԋ:Ð0D#€n4
+nU †ÑôÛ.½ P&왇úà_µ€[ÚûF¤­.à.ð½~;Ág×~փ[/øè•üµú!¬NÉïl€Û€´ß1ÚÁ_/„°¶¶‚…s?câ(¸wÁ‰óÝ	û 6$”A9ÔQðÑ/Ÿ“øB¥s’³ŒHi©—ÒÚ
.$càÞ%1,¹ôI±•ÓÑ
{Ò¥û%—>)ÄvÈ#êÎÎÒáôI96$Çr\ú¥³Ò0I:GgĀœqHJÍo–Û4îäLƒAH?Íq«~ðÛ當HŠG§®Í3z– ÷
9]ƒRÞ®—|NÇxfŠH®m“Ž£©ÞۙRy˜y5“¤Ðú¥¶Kù0&_ù™ùM®M—’~z]†¥Ò@˜ž‘\ë „14•ÇÙÏlíC…TÐ+´eê*µKe¤\ûg¥‹•æˆI»tþùü™R‰í‘®Ùsz(=-Õ¥Sµ¦-•KQ¯\Þr ÄlØ{æRß%—_ššv9þ=Ò^Ÿ.9ÇH;¥’KbµIºfì˜3ïíþOÕàéÒB¯M¶z¥8ó·J¥}tÖu̒c08#r½•RÙ%•å…dn”,]ãðÓ)…?_Š=vþ
A.fÁ¿­Ò¿L©ŽÏŽy¦z?ø…²Eâß#¥`BØ®ä
+vKi!5gv¨Ì´ô
+lš
+¯MŠ3-µÛ¥Ò6"ÅpTªW#R;@Ji u²K*Q½Ò9h­—Že¹Wù·ZDzìðŒ=´>wJy2]G·Jçêêð™ÎK·‰ß(EcRvN•ùNiÿTb·Ï(çCRJä’NÃê’~IÍ=5Ýd?m!’ᨩtöCºº¦êìé±8-äoŸGÓ¡³V:(·³´ôtÌjïNOûty¯²9@RBÓB[}VꇧzN©
ÚÒöšRšÏí³ò´K.ý§Ö
’«¤äIGvJíIM×T8ÄgŸÔ¦ý«+ô«^L׉,)6¤О(SºVChÛÁÜììÂ`coÇðàÈ`÷h°jpxhp¸}´wp 38¯¯/ØÒÛ³at$ØÒ5Ò5¼¥«3³ª½¯wýpo°w$Øìì쎴Œaow°»½¿·o{pkïè†àÈØúѾ®àðàØ@gï@ÏHp¼ŽvõѝÁŽÁၮá‘Ì`ýh°»«}tl¸k$8ÜÕÞì…stŒ¤GúÛ!íC É!ýc}£½CäÀX×0øé•	
B¼I´!ô¾¾Á­Á
ñ`oÿP{Çh°w 8JÒ
1ƒC‚}½p®ÁîàúÞ)`z¢Ñ®m£pp瑩̠œÌ¤‘`ûÀö`Ç$žÆ{tœ¿kkp¸Ò2ÜɆÛûƒcCä4b¸Œôî -$IíÁ­íÃýô\$›;6´Cĺ†3[ºzÆúڇ§®@);u)¹4K!‹ QÁœÌìÜYßù§i‡ð{zI<º bÃí]ýíۂƒdόÍî3_`)[ 5‘ÞQ8¾u´}”¦1”NÐ
×nt¸·k$sáXGrûHJ°³+8xöŽŽ•femݺ5³ŸžÙ1؟5º}h°g¸}hÃö¬ŽÑîÁÑÙ+ÑÝ퐀MÄ_ÛàdíöàØHD’DvÛáJv
÷÷Ž’­ß.E¯&²pì–6à:wŽÑ+ºuCodžÇ÷tôu’¼vöŽõÁ	Hž
÷‚‡ðÕ50šd瀑ܛìê_Ošj€y>cŒ$ï¤HCö@ötÐr7uv)_å°Ê¤$÷ÂY è“¬&¤spë@ß`û̓BœÛiL!㧮ÀàØèÐØ(dû–ÞŽ.âgCWßÐ)	ú6×BºY]ÝíP‰2ÛG†`d?®æƒÜyO¨]¸
Ä^&Îeâ&ö0±›‰³™ØÅÄN&ÎbbۙØÆÄV&¶01ÆÄ(#Llfbˆ‰A&˜èg¢‰MLld¢—‰
Lô0ÑÍDLt0±ž‰v&Ö1±–‰5L¬fb+™XÁD˙XÆÄR&"L,a¢•‰&š™hbb1‹˜hdb!˜h`¢ž‰:&æ3QËD
ÕLT1QÉÄ<&ÂLT01—‰r&æ0QÆD)%L3QÄD!Lä3‘ÇD.9Ld3‘ÅD&L¤3‘ÆD*)L$3‘ÄD"	LÄ3b"Ž‰X&‚L˜ð3ácÂ˄‡‰&ÜL¸˜p2á`Â΄	+&ÌL˜˜02a`BτŽ	-&ÔL¨˜P2!2!0¡`‚g‚c3d'™ˆ2q’‰L|ÃÄ×L|ÅėLüƒ‰¿3ñ7&¾`âs&>câS&>aâ¯L|ÌÄq&>bâ/L|Èğ™ø€‰÷™ødâLüž‰ß1ñï2ñ¿eâm&~ÃÄ[Lüš‰7™xƒ‰×™8ÆÄkLeâWLü’‰W™x…‰_0ñs&Ž0ñ3&^fâ%&~ÊÄO˜ø1/2ñ#&3ñC&~ÀÄL<ÏÄ÷™xŽ‰ï1ñ,Ï0ñ4‡˜˜`â)&2ñ$O0ñ8ãL<ÆÄ
&eâ&fâ!&ö3ñ 0q?÷1q/ßeâ&îfâ.&ö1q'w0q;·1q+·0q371ñ&ndâ&®gâ:&®eâ&®fâ*&®dâ
+&.gâ2&.eâ&.fâ"&.dâ&Îg‚™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=˜™=x˜	fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fÿ`fö`fö`fö`fí`fí`fí`fí`fí`fí`fí`fí`fíàªÇ‰«yÜ?76ó¸ßt.Ý:gÜ_
+´‡ní¦tö¸_´‹ní¤t¥”¶ûæ
m÷U
m¥´…ÒÝ7J·F(
SÇÍã¾J !Jƒ”¨—~J}”6{k€6RꥴR¥îqo5PÝê¤ÔAi=¥vJë(­¥´†·šn­¢´’Ò
+Jm”–SZFi)¥¥%”Z)µPj¦ÔDi1¥E”)-¤´€Rø§¨žRݸ§
h>¥ÚqÏ šqÏB jJU”*é¾yô¸0¥
+zÜ\Jå”æPŸe”Jéá%”Š)Q*¤T@˧”GCÉ¥”C)›–E)“—A)R¥TJ)”’)%Ñ )%Ð0ã)…(ÅÑ c)éq
J~J>J^JJ1ã1‹€Ü”\ã1‹œ”ÔÑNÉF­”,”ÌtŸ‰’‘:(é)éè>-%
%5ݧ¢¤¤$Ž»›€„qw3‚O9º…)!‰ð$¥¨äŸ¤['(}Cékºï+ºõ%¥Pú;¥¿»–}1îjúœn}FéSJŸÐ}¥[S:Né#ºï/”>¤Ž¦ô
¥÷)ý‰zù#ÝúÝú=Ýú¥÷(½K÷½Cé·ÔñmJ¿¡ô¥_S/oÒ­7(½>î\tlܹè5JG©ã¯(ý’Ò«”^¡^~AéçÔñ¥ŸQz™ÒKÔËO)ý„:þ˜Ò‹”~Dé0¥RŸ? [/PzžÒ÷é¾ç(}:>KéJOS:Di‚ú|Šn¤ô$¥'(=>î¨w¬zŒÒ
JRz„ÒÔ¢´ŸÒƒãh¯ñ4”û)ÝG÷ÝK黔î¡t7¥»(í£t'¥;h`·ÓPn£t+Ýw¥›)ÝDé;ô€éÖ
”®§tÝw-
åJWÓ}WQº’Ò”.§tõy)ݺ„ÒŔ.¢t!¥Æíí@çÛםGi︽è\JçŒÛ#@{ÆíÐãÝãöB ³)í¢‡ï¤ÇEiǸ½h;=|¥­”¶P£4Ji„=LßLihÜÞ
4H >û)õQÚDi#¥^zÜJ=4fÝôð.JÔg¥õ”Ú)­£´–ÒšèÕ4f«(­¤‰^Aƒn£'ZNiîRz¢
e	¥VJ-”šÇma ¦q9Ãâq)ދÆm{Çm@©—”Æm`àzºUGi>u¬·
T3n»¨zܶ¨jܶ¨rÜR4R˜R¥¹ãèßq9ݚ3nn*£T:n&E£„Rñ¸y>PѸy9Pá¸yP
ݗO)oܜ”K}挛I²ÇͤnfQʤ‡gÐ3¤SJ£¥RJ¡%SJ¢”H)aÜLr)žRˆ†GÌ¥i(
J~zœ’—’‡R%÷¸i5kÜ´È9nZä d§d£d¥d¡˜é
&êh¤d ¤§¤£>µÔ§†:ª)©())‰Ô§@}*¨#O‰£„)¡ð¤q}€ jìœ4vN€þð5à+pûÜþ
ø;ào€/ÀýsÀg°ïSØþðWÀǀãàþà/°ïCØþ3àÀû€?z4lü
ð{ÀïïÛ»Àï~x¶üà׀7
oè7^×çŽ
¿¦ïÕ'~ø%èWõiW¿üö
·Ÿéû/ƒ~	ôOAÿD¿1ðc}oàEý†Àô=Ãpì!¼^„'Ÿ‡ßïž|O·9ð¬n8ðŒn$ð´n4p0
x
+Üž„}OÀ¾ÇÁmðààQíöÀ#ځ‡µ;iwökÏ<xp?à>À½€ïj3÷ß
¸ŽÙ|§vSàзƒ¾
p+è[ ¬›!¬› ¬ï€Û€×®\¸Ž»»J³(p¥fqà
+MOàrÍw—iîœÏ'Îã‹{qqàÜȞÈ9û÷DvGvEÎÞ¿+¢Ý…µ»<»ì:k×þ]oí
+7Šš‘‘³öïˆlllÛ¿5²eÿXD1fã¿ÃûÇpõÎÃ3ÇxÝhd82²8‚†›†÷V”~w˜CÃXC¦%öøkÉ$¾;‡õ¦Ú͑ÁÈÐþÁÈ@wd#D«·¸'²aO¤»¸3Òµ¿3ÒQ¼>Ò^¼.²¶xudÍþՑUÅ+"+÷¯ˆ´/,ÿK‹—D"û—DZ‹›#-û›#‹‹E{cñ‚ÈÂý"
Åu‘úýu‘ùŵ‘H2òš¼A/o"X䅘 ®Ìö„=ïz>ñ(ç€çyo1Æb¸£W-vãA÷n÷•nÞèú…‹»RÒkÎ_8ßqþÕ©°†)™µÈar¼4å²£qI­ÄՔs
+¤´6:B‰µF;6Úv®&`ÇÈü®ù3oÿ¾é&ÎhÄF㤑Á»Ñ0pägÒÀ‡
9EµF}@ϑŸI=ïëÁ…„˜¤kZRkÔ´\¤B»X˅µUµamFv-âqc„M@<™Iñ	lÔòÏbòr™€0¾ê±%­ii&T¨eÁ
UÓÊø¢	­ä7ܼâ€xÑ
Y±rùc_Ñö檖°-h^A·Ï¿ürä«\pÀ׺|œ¿óN_eۂ{ˆ‡%=I4/mikFÆFÒÒF×ÀϚ‘Ñ4é?lá1²•FÉÿ‘QØ&ÿƤí©QÎüG½
­¿QÙmô_ôÿúþŸŽÀÿþ¿ÇÓåó&¹óP'·p.àÀÀnÀـ]€€³;Û
Û[
[c€QÀ`3`0ôú›
½€
€@7 Ð	謴K“"trk
k«
«+
+m€å€e€¥€`	 Ðh4




€z@`> P¨T
*
óa@`. 0P(”Š
E€B@
 Èä²
Y€L@ H¤’
I€D@ Ä
b
A@àø^€p\'À
°l+À0L#ÀÐt-@PT%@żIøå
êÄà†£€“€€o_¾|	øà
¾|øð)àÀ_
Ž>üð!àπïþø#à€ß~xð.àÀo
o~xðkÀ›€7¯Ž
^ü
+ðKÀ«€W¿üpð3Àˀ—?üðcÀ‹€
~ø
àÀó€ïž|ð,àÀӀC€	ÀS€ƒ€'
OŒ<
+xð0à!À~Àƒ€÷îÜø.àÀ݀»ûwîܸ
p+àÀ̀›ß
ܸ
p=à:Àµ€kW®\	¸p9à2À¥€K.\¸p>ꜷCýÇPÿ1ÔõCýÇPÿ1ÔõCýÇPÿ1ÔõCýÇPÿ1ÔõCýÇPÿñ0Úm†6C€¡
ÀÐ`h0´
Úm†6C€¡
ÀÐ`h0´
Úm†6C€¡
ÀÐ`h0´
Úm†6C€¡
ÀÐ`h0´
ê?†ú¡þc¨ûê>†º¡îc¨ûê>†º¡îc¨ûêþÿt;ü¿ü¯í:ÿËÿ\k× ÿ]¿\r
+endstream
+endobj
+9 0 obj
+<<
+/ColorSpace <<
+/DefaultRGB [/ICCBased 14 0 R]
+>>
+/Font <<
+/F1 15 0 R
+/F2 3 0 R
+/F3 13 0 R
+>>
+>>
+endobj
+10 0 obj
+<<
+/Type /Page
+/Contents 17 0 R
+/Parent 2 0 R
+/Resources 19 0 R
+/MediaBox [0 0 595 842]
+>>
+endobj
+12 0 obj
+<<
+/Type /Metadata
+/Length 865
+/Subtype /XML
+>>
+
+stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?><x:xmpmeta xmlns:x="adobe:ns:meta/">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+                       rdf:about=""
+                       xmp:CreateDate="2022-02-18T17:13:46+01:00"
+                       xmp:CreatorTool="PDFA Live 7.1"
+                       xmp:ModifyDate="2022-02-18T17:13:46+01:00"/>
+      <rdf:Description xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+                       pdf:Producer="jPod intarsys consulting pdf library"
+                       rdf:about=""/>
+      <rdf:Description xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
+                       pdfaid:conformance="B"
+                       pdfaid:part="3"
+                       rdf:about=""/>
+   </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
+
+endstream
+endobj
+11 0 obj
+<<
+/Pages 2 0 R
+/Type /Catalog
+/PageMode /UseNone
+/Version /1.4
+/Metadata 12 0 R
+>>
+endobj
+13 0 obj
+<<
+/Widths [506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 226 325 400 498 506 714 682 220
+303 303 498 498 249 306 252 386 506 506
+506 506 506 506 506 506 506 506 267 267
+498 498 498 463 894 578 543 533 615 488
+459 630 623 251 318 519 420 854 645 662
+516 672 542 459 487 641 567 889 519 487
+468 306 386 306 498 498 291 479 525 422
+525 497 305 470 525 229 239 454 229 798
+525 527 525 525 348 391 334 525 451 714
+433 452 395 314 460 314 498 498 506 506
+249 498 418 690 498 498 395 1038 459 338
+866 506 468 506 506 249 249 418 418 498
+498 905 450 705 391 338 849 506 395 487
+226 325 498 506 498 506 498 498 392 834
+402 512 498 306 506 394 338 498 335 334
+291 549 585 252 307 246 422 512 636 671
+675 463 578 578 578 578 578 578 763 533
+488 488 488 488 251 251 251 251 624 645
+662 662 662 662 662 498 663 641 641 641
+641 487 516 527 479 479 479 479 479 479
+772 422 497 497 497 497 229 229 229 229
+525 525 527 527 527 527 527 498 529 525
+525 525 525 452 525 452]
+/Type /Font
+/BaseFont /Calibri
+/LastChar 255
+/Encoding /WinAnsiEncoding
+/Subtype /TrueType
+/FirstChar 0
+/FontDescriptor 6 0 R
+>>
+endobj
+14 0 obj
+<<
+/Length 2573
+/Filter /FlateDecode
+/N 3
+>>
+
+stream
+xœµ–wPSéƏ{J:			Zè5”Л ½b(*E	 ÒChRDŠ‚X@ ö†¸,ˆ+êŠ
T@
E/ˆâª¬¬Â=àÞÑ;sgîì̽Ï̙ï9¿yßó}ß{þy€ÐËÿ	€˜X‘ëlÇZ»ÎŸ…é0 æ€/41øK®Žö¬D´µËþBèúéá··l/ø{¢„ñCÑÏ8 ^‚nŽú‹¨—ñáÚ£¾°Ä°˜°0À=FyaÄR
>x±&⇚è¤
ÊE‹<†ÏKD}!êUB¢âQ†?³È…ßzۗü½"~h$ÊûPNLNâ£{áGP_"Zì%D.ևÆ}ê5B#yh
áêu¾IR‹³a¡C21071asجØ8;/û¿9’ÿ®ÅôÍ©Ô9šzB“„É߀† h
ځÎàJp5è€Á €1 L
3À0ÜîËÁ*°<žρ?ƒÁË`x¼ö‚ýà 8Ž¯À7à{pü-ƒˆQ :$± 5H2€L!kÈr…VA¾?ă" H¥C9P!T
+í…BG SPÔµC7¡è4M@o¡OÐ<ŒÀb0V€Õa}Ø^
»Â\8ƒcà8.‚wÃà£p=Ü_ƒïàçð$ü^@ðQ@´#ÄqCü¤"¹È¤
+9†\@® ·‘~ä92Ìa0F
£ƒ1Ç8a¼1<Lf¦³S‡iÀ\Áta1¯0³XKÃ*bõ±6XOl 6
+»	[„­ÄÇ6c;±±/±Ÿp0ŽSÙàœq~¸\*®W‰;…ûw÷7ðT¼
+ÞïŒ_‡ÂgâKñµøF|'~?…_ P	*3‚;aAHÈ'TÎ:ý„ׄy¢8QhIô"†ӈ;ˆGˆ‰ÝÄ1âg’I…dAZE
+'eöN’ÚHISb ˜ŒGÌE,X,Ul‡Ø1±+býbÓd„¬@6!¯"G’³É•ääÛä1òW
+ƒ¢Gq¥„P2({)ç)·)/(óâÒâFâžâñ<ñjñKâÅg¨Dª՞LÍ VP©½Ô)Ž¦F³£Ó2h•´fZí½E‚-á.)Q qTâšÄ( +ЗÓéôýôKôAúg†4ܱ–‘ÊØÇha0>K2%-%%3$I¶IŽHý$¥,å(!U$uZê®Ô;iª´±ôéMҥۥǙS‹éÁL`–3[˜Oe–ɨɸÉÄÉì‘i‘y*ʪËzÈ
+e÷ɶʎËáäôåüä2äêänÉÍÈKÊÛÈóåKäåŸ(€
+Ú
+Þ
+é
+u
+]
+X²,GV,«‚ÕÆz­HU´Rä+–*¶(Ž)‘”Ì”B”J”š•F•IʦʡÊ;”/)¿PW±V¨”«t¨¼Qeª:«&ªÖªÞUSÓPóUÛ¢v^mX¨n¡.P¯P¿¡þACYƒ«‘£Ñ 1¢IִьլÖì֜×ÒÓÚ µS«]kF[YÛ[{«v“ö„SÇ]'S§^ç9›Ævb§±Ï°‡uÅuuSuOëëÑôœôÒõêõÆô¥ôWêçè7éO°|
¶´|âèpxœ}œnCÈÐÊPhxÂpØHÒÈÓh«Q«ÑGcc¾ñAã~’‰“I–I³ÉŒ©¦iˆé
Ӈfd3W³-f­f³æóhóãæ£rk-Ê,z,ñ–Ž–¹–W,ç¬L¬­ê­¦¬5­Ã­ë¬G–Ë/X^µü‘
ÝÆÛf·M¯-ÙÖöضka…ÛŠm+nÙáí\íŠìnÙãíÝí‹í»Hž¥÷iŽ>Ž{;1‚œjœFU#O9O»p\’\Z\¾¸Úºæ¹ÞrsãºU¸=qWtw?íþn¥éÊ̕W=°«<Ê=†<•<ž
ž¬²Y•¿ªÛ‹áµÞë˜×ôj“ÕY«orŹþÜ:‰÷fï[>4Ÿ Ÿã>3¾V¾¾÷üdý"ýýÖ¸¯©X3¶VomúÚÎuë‚ם]7çïâ_î? ÐÈŒl‚ƒ|‚ê‚Þ¯_±~×ú‘
ú²7ô³‚‚;xT^(¯1ñ9ò9Ô=ô`èÛ0»°²°	¾9¿˜ÿ,œ¾5| B'";¢/R323ò¾@M.èݨº1}cO”jTzÔ½hõèÌè¾í˜Ü˜XýØüØgqÆq%q/â­ãË㧜%Ì
+WO%‚‰A‰Í"Šh£èz’BRZR_²^rQòxŠmÊþ”ÙTïÔú4BZDÚõM¬M™›ÒMÓËÒßgxeœË$d
+2;³Ô²¶fm¶Û\›½,;8»-G!gsÎH®MnÍ`o˵<å¼¼¼—[]¶žÌ'äÇä÷p
+Ê
+f
+[‹XEyE¯¶¹o«ß.±=uû“âÅÇJ%q%ý;,wԔ"¥Ñ¥÷vší¬Þ…ìŠÞõ`·ÅîÚ=¸=	{—Ù–,/O+Ýë¾·±B®¢ âÝ>ÿ}×+ٕûªÀª˜ªÇûíöŸ= } ïÀ»ƒ;ª©&V§U¿¨ñ®i¯e×î?Œ=œ|x¼Ž[×qDÿÈ¡£¤£éG'»}ÜâøÉÌE'æNF:åqªõ´Þéš3Ô3yg><;xÎã\[½aýÑóÒç‹€QÃąÀ½?;üÜÒ¨Ûxø©_JšÀ¦Ô¦éæ°æÁ‹^;[–·ürIçRݯÌ_÷\Æ_ν<ךØ:y%ìÊÓ6¿¶žv—ö«–MWõ®žº¦r­ú:ózùo”߶ßÀÜȽ±Ð¹©söfâÍ··bn½¾q{üNȝᮠ®¡»ëî>îöëîïñéyÐëÝ{ÿÞê{÷ïsïß{À}ð Ï§¯¿ß·ÿÑõ>zö8øñØ`b0jpz(aèã“Ô'>Í~=+&
ïaŒx®øüØ({ô˜ÙXÛ¸ãøÜ/ƒ_NLÄM̾Êz¼.ý‡ä?j&5'/LYN]ãùæÑ4ozòmò;àݶúLí{÷Í¿ÛýÞýÁÿÃˏóŸŠg¥fþÁù£í³çç¡9ÁÜìŸù_$¾Ô}å|í˜÷šYˆ[Xø!“è.f¶ïyāÎKŠ±ƒŠ}\t\’åÏå³Øÿ
+vÿŸœR	Í[ш4ø¡òú¶|ËkKZügýô½d !ŠŽ|gq‡
Àì#Êw&
+"–˜=ׇõÃØ\~8_ȏE¯ê'à§b#Ðûdž	D‚¸X– –õocúŸ\þ}?ç÷¬,⧊–Ο&DDŠX.ü”h¾HÄòâ…Fñ„a:,Ž¾¾nÈYj]FD32<¼°ð»`Êàk韵_Ñ»ƒCОôO T×b
+endstream
+endobj
+16 0 obj
+<<
+/Filter /FlateDecode
+/Length 38834
+/Length1 68180
+>>
+
+stream
+xœÔ½w`Ž>e÷vo÷zÙ«ºÞ¤“têÒ©®ªU-«Ø–ÜåÞ;ÅÆ`‡HL¯	¡„RHBØØ2¦Ç—By„ä½ @Ê+Q
+!€
:ýföŠŠ
!ïýþøýt:Ýìwggg>óo›ïžhÀ€Ü?”(Û¾mïU„òò^³nÇØî½ÿñoÀBøß®»x¿ïø—z
+Á«Û¸{ӎ¯þwËw
ÐûP›7m?°1úëŽ?`¯àá‘ÍÆÖ¿Uøìb~pi¯j3!è;M7‘ã3ä8´yÇþK#WÜEŽÿãUÛw­ƒ—
ÿÿ¶~ÇØ¥»u/b€ÿ~—Ô÷í۱Ṳ†ð?tòî½voxçL€³Ã¦fXx`
ÏÞɖ“^{ҟø%p5<@z!Ĉ¹ ?ËÀwÈüô
ù|߇Œ
+¤<Ã݋"dH_¡ç𓬑ޝ ro7 ¸
Õ¿“#¨3ª§Èç! “û׃+àaxœF.ôôCôf05؄­8†ÛðEø
+|_‡¿ŠʬfÖ117{>çù›Ïà³úœ>/à‹øJ|µ¾_›o·ïßwý¬ßì·ù}þ€?â/ö¯öß@
U@0œ
O è¬	lÿèCfzZéë}äî琽@îþ+°
+ÊÝ#äîûÉݯ"w¿
ßÏf-³—¹ÉsÄó¹»Ùg÷¹}>åîÉÌÝ÷gî.åî>ä¿)swcÀ‘»ûzrw Ü WÕé¶,¾Óy)ÂÓ£ÓÅÓAR`ÞÏÛks¥òß
+oÇß6¿ýÛ·¯à­so¿]C>¯|ë0¡ºi·zÞê~Kiù­â·‚o~øæ[o¾ýúµä‚CÔEï¢å‚¹KØ©Ì¡3Ý:¶“wwâ{™Ì*f=³‘Ù
³›ÙÏ\ÊšÝ#fæók9ÊÝÌñLéæ¹9uéx0îÆ_Ä'ñ·˜$þ¾ƒ`|ßÀ4àÅx/ÁÛññ$þþ3þþ+~ÿ
¿‹ÿŽ—â%LÓÌ´ã>|`€˜€ðRDA!H€ZÂI 
´ƒ°Œ‚e`X6ƒ}`?8‚Ãøލ?ƒoÃá$DP
Ð	=0Áep%Ü·Ã]ð"x1¼~
^¯ƒ7Á/ÃÇà3ðYøü
ü	¾ïğŷ“Þ÷àoãïâðÃx¾qø^øÞÌt‘Þ߇´„S:ðø,|‡Ä·àC¨¿_Æ[˜B¦€)Ã	Ï«G–˜šÈ=°<à
^à% ”
+à ô… ,bšÀ0ض‚m`Y1#ðKC²P9(@-´B/ôA?ÂUp5\×Â<xÒ5u~^ÉÈðjxž„ðqøCxþ"TÔ344
	Z€šº€ºA†@†AF@F@€|8
+àˆÃaP—ƒb¸”Ã1P	ׁ*¸ÔÀ
 nI¸	ÔÁm 
î€;AÜ
šá^ Ã= î-p耗€.x,€—ÂË@7<àgÁ ¼
+Áρ%ðó`9¼¬„7‚ð°ÞÖÀ[ÀZxƒ·‚ðn°
Þ6Á{Àvx
+섧Á.øØ
Ÿ{àS`/|\πËáÀà|\	>
+ïZ(ԁÅð°ÞNۂïϐ	…
±ç…'2EdE1$"'
+	UŒâ¨}ݍJѽ¨
+%Q=êF‹Ð•¨•¡rT*Q5ªAµ¨5¢&$£fԂZQ;ê@P'êB½¨-Dý¨
õ }è:„Ž [Ñ^´]Œ.A—¢ƒè2t9:Œ>‹®BŸCW£kÐеè:tº݈nB·¡;ÐїÐgÐ-è(º݉¾‹B¿@ßB?GÏ¡cè8zBO WÑIô(zý=€¾Ž¾¾‰¾¾ƒ¾‡FãètM ÇÑiô$z=ƒžEßGgˆìý"ÿ~Œ~‚^D?E?C/¡—Ñ¿¢Wˆ$Öb=6`‘ìÄ.ìÆ~Äa"c¸â"œÀ¥¸Wâ*\ƒ“¸×áz܀±Œ›±
Ûq6â&\Œ=؋}8„£¸•H–<\†«Ñ/qz
+ç£p9z›ÀEð9p1ü>¸>.ƒÿB$ðÅøR¼/Çkñ*¼¯Ã7â›ðeøþ„§p
+OÉÄ`†¿aXFÅpϨ
£etŒž10FÆĘñ	ü&Δ0EL)SÎT2ÅL“`*˜j¦†Ég–0#ÌRf”H»ÕÌrf‘{+™a¦búaðö€"BÓzmÖˆ¼±>_jŸWüÿ^E‚Ùˆôê‹À"•0‘K‘L‘J>"—¨TZMä•JˆDº‚Ȥ+‰T:I$‘Gd&ïW$éÍd>o_Â÷á{ñWá;ˆcZˆdfz™f
Ӊf™>2CèZf!|	¾ÌÉw5^ˆ{˜.¦?Ä´2‹ðf¼ƒØ4Dr	¢ðåÂ=ŒÌ,&²ï
+&†¿×ã
t6	"\µŽ©%òØK¤²ŸÈâ´.Qä/ r˜JÞ-p#|ŸÈmFF /*„
ÀÝK4ô­sfv¹b±€«ÁõàVð4ø°|–”î÷o€Á8xüüòpÈ?õ“:Àî|’ŒÁLl‡sӓ©o÷«›E¹•™ßeÚ0ý§y´?¥n6¤&T& (×jÑÏ	õopjúj¢ÇÓUô]CÊz势r÷¦N}sNwº	nÃ`1X¢p`Z“
‚éJ°Œu„#7€`áË´nÛN´ÛNòÞvÝ`Ø«ðëEàbRޟ¡¤/U¸øòÌçeD'^NJ‡H™–®‡	òŸÉ}^™ûœ¡||Ž¼¯"¯׀σ/Oúw.mîÑQp-¸ŽÌç
àÆ\ùÆRiù&p;yßn!³~)‰Ìý—Á]àn…z+¸|Q9ú
+ø9ǜºôÜLý{À½¤Ö}૤æý„{¾9¯.­ùðx’ðÔà)ÂmO“Òsà)?Þ¿
¿ÿ	þ‹È¯*¸¼Þ?#èo$¨SÌw+·¿›rˆ_B°Í"{Al.gÎ¥ñ¼RÁ){îRó2Wκæ¨2OÙ¶híl[³ñ¢c¢#š¡¥GxkŽ23î¹W¥ëÍÆl.‚_V(sÏÎGvvù«{æ~ðuò~€ü¥ó0ÿ([úYáôýmðð]RJÿ9ΖßYð8'ÀI0‘;>NŽfÎ?ªP²u.LœV¸àiðŒ2ÿßgÚÓ¤t*söé̙ǕòsàD
+ý˜x¯/‚ç	ïü@yÿü”ðÇËàçDjý¼žá W
+Â8x	¼ÌDÀ¯Xdñ3à9´\JŽ‰î$3
äŽÕ«V®X¾ltdñðÐàÀ¢þ…}½=Ý]:ÚÛZ[šå¦Æ†úºÚdMuUe¢¸¨0	‡‚
¯Ýb4èµ¢ æ9Ë`Aa{°co<²fœ‰;;‹èqpŒÆf֌û©cnqߥšonM™ÔÜ8¯¦œ®)çjBƒ¯Ôúڃ¾ñۂ¾	¸l`„”¯oŽúÆ'•rŸRf"ʁ–øýä
+_»}s›o®ñµw\¼ùhûš6ÒÞ#¢ÐlÝ ‚G‘ERw?cP) X{í#ÄÝÖÒێãpûØúñE#ím.¿T¡V¥­qUë8§´åÛBû®õ=RøÌÑë&`횸f}pý؊‘q<F.:ŠÛ½fÜ϶çü­yÃxa°­}<$õænÇÙ°!è;úw@:œüã\ÊX†¢
+þh‘19Ÿ-Ò7ÒC2>¿ŸöåÚ	¬%ãGFÒÇ>°Öõ(ñÑq´†žy&{ƺ˜ž9’=“»|MÐO§ª}Mæ÷âÍöñ#k}E…}å7L~Éyß8Ž¬Y»n3ýÛp4Ø֖Æmxd\n#y,3ÖöGJ¤þØ2ˆ-†‘ñDp÷¸%ؒ®@>:[†F”K2—[ZÇÁšu™«Æím´_¾ö£kÚÒ¤mFNòéß<Rás+'Ä(íǸÔJ&%Ò~tdýÆqï×zŸ}#.ÿ¸<Jà
Žl¥³4Œçÿ†ÜίÜQ¹ŠŒm^íle:r.ÌûFÒÙ"_ùl©''dº”C:£-õ¾âÑe«‘»djÐҜvÈ
·vÒS˜^ÚÚéòúÓ?ŸÐ%W¦OlxœŸÕ–r}Jßçc»–®M;”ïkßÐ6«ƒse3Ì´vá~"ŠEæÆä
+žNggö“•Khˆ4£è,Ú}ã`‘o$¸!8$<$/¡c£X+óÛ3ìX6¢Ìv†K†ç¥ÏפÆŸœÎ VƒqWvZ•ãÊqî°sÞé®ìißQ>Ø3t”6Ì4|d‘A«"]c×֘*ÈÒì Ò-Ø1ô|GÇ&¦¬=úˆ,Ýݾfs-m#صþhph¤Þ¥ôupär×Az+è=Ã-E…Dö´<„ŸxD†ŸZ6rʀïóÃ#"ˆZ×´Œ>"çFNùˆlW¨ˆR)‘øè
miðJ}×)€#ÊYF!(Çë& Ph|–Áº	”¦²4DhLš&+4úC&ɾ™@LÄm»o=žC£›®¥‹Hd*É/‡ÁF0Ž‚@¤ÒŒÁ
-ãb°…Ò›(½)MWQ:GJ€CeÒÑ5A"§CL³"¦Mú&¦§‡Gü/º&Gý„ÕV÷²‘quœÈ~6ÜMê- ï5„¼`üȺ1Ú°x„^˅»Ö¶Í6Hªt«IêL¤F‡r
eGrÑ:27d•ëƒñ#£ã£qzӑ-£
+;ÆAg°–L{ºM6Bo”=j
+–)k“,!|
ýP“¾¡‘4ÅEÉÍFÓ qÒóuArjÝA›
놫§e©àJS6‘ÈD6(oÁ•9	è°pXÔ
+ãêbÒ ù¥e±˜.I6̍Ž¦;¯]“©@îmI"³ Ì\@Ð!§ºh_Èï5¤«´ê³´™	0¼”HÚi¥%Žœ׆»ÆˆðO_/J°&{1Oe„˜iãLšÊёkî8<<1ýÍà
ÿ¬Ÿ¢Â U”1ëal0zt>a|y¼¨ŸOÕ*ä£Gyí…/HãÅksŸ„ˆ7
+Rûð¿o
+/³NñŠú+’Š$¾¾Y€“ pp=á~¼Ž8®®—M
+W«ð€KkÜ=Ú84š^{ýµ•¯¿ö"ù|&^›|uÒ0õê¤)™L$JK ÑoTÞâ8•*(FÕÕUUååe¨²¢:òŽTV4¢êF\^æAJÕtM…J*S*þ÷–ãþ)ºÌÛ¾say]:‹†…>Ökãú‹Íze,&'¼œ B,¯âókÛm«j©Ç0'r‚O’œ:–á4¼Úç0;tLªƒÕ{‡Õ}ØÊlÿð6\Z±i°Šý’À#F¥zÂe×uøqŸYo6ht¬Y2©8³IŒ4tO]Ëۜ6N8APÛí¯TÃT
@Ó?š>ÇDY€xòqt9ºŒÄÉo]<"×Ú
fØÖhCZ­… ØC!
J¡`$<)‹äç	Z(11 ÖhLyƒ¦ÅìâXÜÞÔÔdJ&1b㶤ɖ,wöM–ËaâLYґ(//7\~͙3FXn õ¸Köÿï›--
KtZŠQû±“	ŠTUÃôüظ ô3!ŒÍ±€ä3ò°dêw²Z[Øå	éT"úgpÆòüù
ÝS_ƒÏ4H.ƒ9Ö¥þEÐò˜Õ¹$æQQÇcÌëÅë§.ÓÓiìTw¢Yî¨àŸwg©+rT¾·ƒ,}ã,úYâ;eéתÖgéˆ!^^–¾I5’£Äי¹ëó9ºŠäMïŸ>§j&+£ž¬¡ŽÖē§	«kAÙeKƒ«I
:¹AÛJJ@ƒ–	&ô¨³!þdÈ(„¬l©‰=S_ªº]
ï°.Ö'' û(?Ë2H¼iR™²`ÀÊ=qÃ$}•ÁÄä!%äŒÑ–¤Dc2YZ¶è˜ _YGsçÆ_fUNa™4S"ΑŸ]‹YN£WOÝ©‘t*\–j}…78#ž¼ F­Ç—ðæ¼XzЎžðtJ;¿«É"õBjh9üPÔ¦D<5íä¬v‡EË]æ÷R¿ÉMåw4zÈ9»U“Úb2pV‡Ý¢IUi1µ€î´
À¸šUàÚ¹+ã(DÕÇÁ
+&Plð–†%+™”¼NkI‰1<
ѣ΁Ò	È“Ã”i	“6ù’H`&“0ñBYù+šÄdi‰Kÿ‰K	Ÿ+ÂƃÓp"Õf"mü„É9*š‚˜J)\ɔ—¿aiuAWEž;¹xïõ+Súýêßse.(­»z´ð¤TÚÓpbèûý›½Ñ‹/{mÙ_÷ôÆSÎ6¾ iIE嶱¡Æ€?Ì\õúåU+üakjeÅÀÚ©·†–§j}iüußô_˜¬Ԁ-s‘:–—£->QÄ8§U=
­²NÀÂcrlIn|FÊI”}’D»ûÇuÒ—ˆcÆjñ :Ür…øŒ fèÚgèlZ]DÞÐ;|t×pµ;Ö»³cខ*£(`†åÕÖÖ±mØ×[xÑ]Ïíï:¼,Ƶ6†ÂñpÓ¶ëî¼»cÑåK
+ƒñ Á@DªÓf¶DƒŽ†KÙ·ú‡O}ëp—¿,JÇ¿?u+sŒ	Xu
+ÔÁã²~tVu
ubƒ@ ‹ÌÂç奖‹ƒÌsÁq V/qÐAŠCs–)™cÓdnAMI#YN¥%ìÌÀ¬;~Ž³Iô3-#Š¦Êh¯HþìðÛ£ýûï~–ŒuyL/éta
+廆j\œ¾=ƒÕz

GÅ	–Þ›GôjÁW3X樈{9–eÕÍeMË0¼tÍÓûs08?	³Â„ªÞŸ°–vÛ^Í`A-8íFÎà²>Q×#dµ=OV›DÁúùk
 jYíðy
zƒ^í¥’È<à›€¡c²zö
+É.+Â@Ç>¹bz©ÒéüåÃ0ϛ¢£Ý1ñ™Ô›Z›AÅþžKx ñö3Ÿm>‘?ò…=ÇøèÁ®©qâúæë¯ÿüe›{èPèiºô¡Ë»–d¬Ûpõmwѽ‹&2¶_‘±ùAXw¬¨H$B£ZÖÄüʪy9D{>髬Ñ8Übì¥JXYÉÅhçÝU¤órsÅ.•`eœˆƒr*qϔ—)ŠÚ
ŠD!š4'ÒF
+S^~ÞÓÂ63Ú_º/þÎÛ¤Þpùù­Wj4T¦ê…Ï®áŠé Ÿ¿²åD
ô±Áÿ6òH¥ÖèÔÿ³ü‘ƒ_OÙ³êòF‘ÙhRjÖÂßD½ò¥ê>´¬,µEÒª%»Ý$¦ª3x@e®u"ð½yö†Am•xIâcQ§Ö©Q"
 lŠÅ£±q+Ö¿X‘„­V?OÁ‰Häã˜ìŸ#$©]°‡bC–κ†„%|Wœêÿ}{iž9OUYsš-1£ƒDm…7)PŠD=-\…° Eʙ©[D«^Åþ+±¡
6f’µÚVmj+Y+
+~©RƒQ%ÙV
ÕY”§¦§A9ÅL±ÜiK£œf<P$]9*µ4âÔB­„nšUûl+¥RfTì	…Š„a:ƒÓç0Ý·ˆ‚{ç͆N™
^òû´ZàSS5ùC’/¬ë3V&عv‘ÇäЀ+m›ܲÖY2;d2<š™ƒÿE;BŸÚ9Ü%ü'È*¦@t>£˜ô y;­
‡ÃoR¡¿PÄÛujæ*‹Ã)iSF=oµ9-Ú©ßñ"ڈ¡Í|/ê5TvNÿ‰™f} <>•ãñBàš€~¬ø|ÀL–ò‰dÜÎqvÍi%–WbYïvº
t»!Àò}ƏÉ9
fJ‹ôdÆ>"ÆRZó‘|ù5:¦ÇþÏMf›£ ªªÍþŒL qX¥âÒ(ft
+ÃLc–4œ¾|ñÁÅ£w]¹qA¸|Í燯©íIýB£Å¬š˜dð.·ƒ[Ïhyu×®k{¯|áêŽÒ×<üóƒ×´Øyæ3œÕæ0‹¡¢påÊ÷?0<r͊Dž^b4p6»Ý,F|)Ù¦VC®Ö#'ömûÙã÷îmq$K†™wˆ?’˜¼,5ÚyÙm!QƒDX°†‚DÊy²h'LžMÚOá4œqöMi‚‰—ž-+ÏÏY<zìÿÖ,uE²¼9Ã¥iG„Ãþ\é$ZýN»Ï¬Â{§ŽíE‚°;}„Q?€Éï°ûM,܄z7CQRª±ÈÁ¥Ù”CMSÏfË̯³¥©³Ä_͔ÓHÂsI+hŸ‡¤Þ
+DÁ*a
ƒ™‘îýY^¦¤çŸ›=¨Ì  =ËuY+ùít,3œéõZÂÓ琠Ȥ„"«þ<Vd•Dä*GWÁw%Z;I¨ü¬Úg§“Šï³ÐEE†%Ò>Ñ4ÝW†ÓÓBW“±FÀòùc¢Dà¹Ü`Xÿ òÇäô¸2G¶áE:põ'T£jÎbQ®4^Е-Ú³0±°’®²„DÉ[è‹TEÝâÊ|Ú|&šFÊô«Ž³;ݒ^oÔ[ÝÕø!*{¨§ŸY
‡ÉX*À%óÆa̬Éäa
+pÜ\`É·ä{=%ƒ‹‰5ĽùjGhбX›eL[²I1ˆˆé˜<C<d"Ê©Ÿì’-ŸxQÚ²æ œeBÂóØ8ãX3‡­ÒÔàšãÍA—;h™Ô½G¾Pd.e倝°²
+îCU¼Ù¢üÂ1Óz¬SïN}ÝhåÕ:že8­]=u '†ÿ#ÇÓÏ Fµ–#†º&c;`H°qƒ%ó°ÑÚ: ÕÚu˜7«:ÿ˜ÌϙåÓÜ}òãëP&ŸÑç¹K”¤Î¨A˜ú¾ÆJÌÁ?çF…Þ€/iÅ}¬ätJ:E_?œíù‡÷™2òLu†è×Zpl^[
+ýmq±¹V‹¯H¾‹`IÔAÕ&4ÉW1P\¤5Aòi¬ÄŽö×ê\¢&
9D{n,'“]?Ëhp…¤•+ñ¤ú
I#$óN~É:ûyŸºÅÙk>©³‰âàlVPb+ær˜)rì¿"ÁBD—ÏÄ¢7ÑT?_ËÀ_’ršldÑ$c²»të}ñ<sšE-zO¸È½Wo7²ÌŒäØôáí:­^ÃlÿðK9Ú7-³Z댹?ÅßtE]:µ9ϚA˜ÍcÄíZ8aXTKóê "'M¸.f0xe‹§jPo(ŠÆ&¦ÿrÌꤟ²]°väÈ` %-éh)ž©¤|’ãÂÌ1ý”„ Òª"­jñ@±0®3ļu¥G`À±X5œ[V >ëÇ/OO˜óE²0_!ÓµzeÙJËuòÿ#½ËL~: ‰DƒÄV˜mr¥§^’låUU¹µÂb“Í©mv†\VÍߥ6¤õî zÎfóXô'¾ÜÙo9-š¿ÛŠ$¤ó®'œáµÛ¼F\`q›xM^"ˆí¾µ{ðkSºœ<øv, 8ó}SíÍW¶Ž¢'y‘ÈKò‡heþ•øY{&~ö$‡½Ó“¬‰õÑKçrÆÓä|’8›!44 F5å+ò€›‰3£Lq&O}\…Y&VV%psüq†5¹[vÜ÷ëö~w_­§}×Wuݞï쫝ðuìÜ|Ͼž"³·sßЦ»÷ö›ñŠ¾§Îœºq$¹ç;–¼ðü‰ë‡êö=x°ã¢áDß¡{zÁ¾Á¢žƒw}åª5•±)ú±'­MÁ)p!ú»ðŽÒςŸÏ¢¯ÏÒ	v?žEÉÑð7@£b‘i'»Ž}‡ønuäÌY*®³1RôÔk™"ÝiøK 
'ª<^ƒÃE¤€ëzšJ÷6:klZ•ó/i¢®–Q˜ö83Ùt†p"|à_}ÑðÊÔ«“F"‡¹\I[­e’M	®KáF)í	©¤Äޕ˜¢$QØiœ#‰™PY-’m²¾Éݼók¯ÝÜ°½ðËB"îÌÓ°ü㍍_}í&y{Á]꒘ӧaxx£§¯hÛ×ö÷šly›|½…WnÚÔ¶¼e5ßÜ3øÜó7-1[ÞмάI½WóííƒßOÓÞÒ	¼Ö¬}:cÿ‘ûî¿­¢vcd©ÞP¼póŇ.Ú©ÝNó$g%<ÙJ4ÙQYjѵåMryµ ºhqÁÂӄ7m œ`fŽ=Ó_j‚MM\t@;Òdø2ê¬FLžô
ž|Ô°D&ÄãüðœH

(á¢Ó•ÁžøL<éŌµkHû3ZO	)1Yv¶¥}«Æhxs§jU¤ÑWqêNµIÏÃæÛ¯¹ycKTïíØýµ;[ØÞdƒ&4¦S#E•¦TðQ­HÜ
ž8È+Ò
+SgK÷oýÊþžBS°gÿ¢pOwWh'ñŠV-+šµþ@¸yÉÚÍåËüÂcŸT$Ýd2ªr1\•éMU™ðS‘¢þ+î½ï–òþ‹ûc¢=è ò€ÚU1¢‰½D\y¡“ÆgŽñê(yY̱	ˆOZlf5Ï뢐yL¶
èfû¦÷öÅÙáEXÄ>ͅYÑœ+R%›s„w#‘ll&樺øÎ͏®D‚ÚfŽÑ2ÿtY_¨ji½ïDƒl¯õmãýÖv—ûôøõÊý»ÖõÆSETmR{’ùN,Àñš²®5½£Äðš:ë«èèé£xL¿§X‰xþÕ`
E FÖÅÌÞÒ2^í!/‹¹ô4Ä­2â~šxÅá%ƒò’—Î1HF4‹Ó”}²p©µAÐXrÀ¤GËÍ3#¹ì•0e6x=å®Yºÿ¶
ÇË0u‰Ä¿€ç¨¯˜Ž0ú•ªž`Óhµã¤ÖSt4EnßôÀ–Ë{XÓxÙî±ÎØGYÕÀ¼©ÕD‡|Ÿãuu½#½žêâ @0ø cã¾´†hed5&ÀpÃ<ÛAÍÅòuzO€.ÇP’Ç¥˜ÞXIމ¼¡ü/êŒE§a1à@3UƬZxeÒðZ69ùÊÔE|¹ŽýSWî`ӊ…‰æv31_ÃyX<_ͨ±˜ãcÕí=½áÆÛWî%j&/§pDWaã⚚åíq-;îëØ7´ùž½½TùìÚx÷Þ¾"s7ow:,=ZÕVÎÑA;Ë.=|ÕáýåUrȤÑâë.¤’Ò«+BVW)hߘ‹å	›Äkؘ@ò¶,–ÌóԐW~ŒMÒøž.¿PóHjÏååkȒ9)3ÆhzÕØèªIÎ]oSÆä+/*6ý#ÿ|SٍbÁ˜gy:¸Ï]”óvV˜H´ÿ’þÊS%f)êvúŒ*ç‰Q]»ouá6¿‰CáKò cŵ«Ûˇ’ÇF¾4zyO·Ú<à0\ŸzËìתµ„=½–T.i
+Ný*·fŽzCíVj¤ToIÿzjå2ӓøN«ÝàÌ\tŸFTš@JÊZgy°±*Öæí¢Ë—!d]!àÒ`®+,ÕШrÛÑʱc²wÞÆ
+f(A$Sœ²p:ˆ:I·\ý¿ÕìÜØaj*3
x¶o]YQ¬R¶.Ê<¾“¨
AˋцáꆍÞhÓÀð`S´ã3'v7l®ub'jՆ’k[:vöÄ"C‹£{¿¶¾diG™‰g¾ËÓ°”Æ™ç7-Š¶T•”%{ÆäÅ·ïj¶zýN‡Jr=ãû¢­ËʋZ«Šééæþ£›ë
6—ÉL­"8=É°ŠµJ‰U¤”§î'œ¿p~Ì÷?Ԁçíµ™·(ÑMïŒ"˜:C¬ÿW_,W\èüLÄ3Kš‰Ü1ûh°Ó(¤n{)ñMƒùMꝐ֧ø*­Àüч.‹öÃ{sVôZºÏé´[‰÷Gú}+±ñœÄ—Žƒóúm‹¿Ï*‰BdøÉ*úã<kt
vLfg›”àÉ+™¸‘þן‰¢Ì8تy¡æ€}óOìÜÿM>ǽ4úEÆgfÑ=F}ãŽÞžÃëڍ„j¥þ¤Yá/NllºüñË°”èG¹j¤°xô³Ã34:ʈ•ùۜ±š¿
+.DÞyAúYðÔ,úH–N¬cúü
ÏO„Wr)Ææ!궀M’«`ó‰ïmˆV;?'ÄÖDW›â§§=AÙø±5g<sâ›)$ë†+–1ZCó<¾»Obhz=A‡¾Q3«•ÂoH§Òx²ÉÌãf»†Á¼Nøð¦9»CNÇóÓç¸+ÉxêÁ×çÇ®
%D1Ö%%”†ìšRMiY½=xž ¶k•ÈnÙ^=X0(h-X"ÖÛáD™vn씌„š°Æ«“†3eɤ#aO˜’
Ëٿç§ih6&A8k¹8±E*³§ Ï[à$f;Ju°fgÜ(tià&„AŸ#ߤêDðO4¯Ëgbá ‚ï1[؝G\uXgTc¬6hñ+§Ë&ó°Å©%rݤûð§L­¨ç¬Ö‹¾À4栅Ó/™qå>8_šQ5pUÊZB;äeŸF%¤º•Ê:™¾5&@•‹C'ÓP¾–Nc2¥³/(zšV¦‘(¾´yÅ0—•1ÃP3üôà;4çófŸI]Êéí‘<¾^0À7^ã¡¥ àò›fîàtö=£Ö£Û§¾-¹ô,æE5â¦Îª5fõN	­@U’“н&…oñÚ4òÛÓ•-•°k¿	.4P#ŠZßid#l¨X6ÈÚð ¸°U¦ÁÌàÈØl(TÛÓÈÝ
qɺ«L¡ÈIYL@¨:?¸¡À°h5³éš_«°!t,jf“É­E¡îü¿«ôö'5Zø~*
]Á×Ñ¿ÓL.2dmêžÆ}õ×Ã-‚NÉ25y¢Œ[‘33ò§E‘3›úH†®BÂfëþOº»GôM	¸x>ïhÐFà´QÖ©|®|•!Ÿ¼°K¡›à%>¢¢ÃÇd{&æ9õlÓԳĤJ[ïÄx7¼ix“ê£OªOÁ¢~ Ý9âàÌh6®úŠšÂ¿·ØÕ,ætVãGçЭ€N4ˆSØnǬŠHÕ€USêšDVg³h*Ljƒ%ÏòÑ*#qæN«ÖeVIv;Ç-n¾?H÷J-Úéi»‚Øá´&¶¤=šIü&þˆ€:pýãè0:2“‡¢Îã=ðáãĹªã'à÷N}’Ù.@Ùfêºh^D…ý]gÝUȺ>ܛõښ2äIª{m’J¦t^“K–>ŅT2eÓgï dbÔšçLãB&T`qH³Ú¶•{ëmi´Y=[¯=\ff"1‹ËÀÀMìh«ZÚZêՋުxõ®5Ý&‡‘ø¢úÛ¾^¹ fÅþ†šn»nWkgÓrƒMøÇööòám{wۓÁ†í·ŒP.SPc¢D
+–“WœOåà;Ð
.D\§Ðk	ý=¶'Û
+Bµ3µ=9*·w†zg¶
² •çØA‚èÕ_ù[v‚+ÀMÐM ­¬_•Œ.Ye_°Ên_µ³›N#ñ2v‘3ål][Oj“Ú$cÓo<-Ž=µd »1ù•$úsr:‰’Ɂî­/ößôítDzlÏÄG”ÐÈ^ºÅ?õJ:]¦´‘¹NLš²©7É2Ã$1p`Ú
#®€Š†•Òù6”qk£³&·¼ºêB‰¢¶Fi(«ª:mø*ÀLN)§8_Y|qW ñs¿øÒ6»aoúބ`dJ¬ÚPQ¿¡¿Ö]±º´w“ìöÖ/Þv¤ó.½†‰öÔÖo¨"ò‘ú»ºöå›+W·¨}—¥Ü©¸£{»Ýõ¡Ž®^ôS¤.Ö¼¹¿F·mûõC
ü£‚–ÁüÖ]ýqkýV³d¶k=yvN”¬©°1–ßT E偂šÕýõùÖ֊þJg^0Ïj§÷»Íö‚Ú`¸._š’Õ’ÖÛæñ'&덑:øž½Àk,îÝXã*®§+´ÌüKìPZÀÝsW¨ly¯/X]“t'ÝÄ0
º6ÝÅF!Y`¸ò³Ñn·É(2:[‡®·þ™ëËZ–Š0©¬ÑW&Šé ì¤+?&¨¬Tç§o%çŸd#‹Ù<R
ç”"Ãe'K‡ñKRi÷¶k—.;RfBÑX›RS+Õcbà"V§×«í+wÖÔ/©[ø‡„¼êâªÝkzŒþÄö¶Šá¶2¿]Uó­×nkn“GŒ:ƒž­áÓñ>µÓYS]j
+ö4ø*Û:º:êówܺôí-%‹6íÙKtg/Av	þ!¨×̓|n70R óbïǼ,d…÷ݾ÷bÀap 
;,çäpƒ©W”ÍìÉ&RX™*	y²ûŸ½4ã^ϤH3éiªl^õë–p:³Fç)í©•×u•x´ËF›W6x5£ÖÚëûW”~õ+Ö²…{ï‹u7Wæqx¡)â—òBžÊÅÛwnŠlÚêË÷éuÐãå™øZÃÍ·Ý&k%¿SÙ}ëMݪ 2֟ðÛ²6	*“É¢¢d6(,>Üû\cé{1C¯„ßBeŸþýXB‚’ë=a¶ÄH­‰Š
+¥0OU_¥%l$70ëǍžýÄä¼Â͗Îî'Óº+©W«½Éršš§R1L&5XjÓÝ7̂BüXÐòCLíÇ'æ¥u*“dw€BÐ4Ÿ³dÁ_Ô 'ԁjŠ¤Ó(ÄÑBTó@¥+9ë¯ÓÑèLÂKyY6ßEv|êKÏÓ¦3ÑêÜ^|VJimZ„CV§E>E›Ö-­[9©¤gëµ#ñÞÆ
+ëF(X|»×Ä¢Ô«D©V.n+õZºf«Ôoù{šò½í]ÝÞڛn¾v[‹Ù_ì€)NKm<-7µ¶½³tp랝Åc›ê·Þ²” ·ˆ ·ŒÝZÁ(¸ú˜Õ²L ®BcHÝ*´M 5²ÂB($`ìX4¼²£¬1”,²ª½­LLä$}×ÙXrbúYÃk:“ÝCõé;f±$Ñ` OÛü`ÕJSܦDasŒ©h4š:ªØ+P•VFÕќ•kW)ÜÈ¥SŠçDmÅ8j®˜ÍÃ¼ß¬QiÌÚwª}ПsÙh0ëÑ¢ÚujuÞÒ¶¥;¯ê_v¨/h/íÛyã²Ð‚–¤U0:"žîŠÞҚeÊü†ÅKå}ÕASÌê
:¯ÛŠK·
+QEå]_£×DáDÉØÆ­57=²gek¸dô`wÓ-·\½¥Ñn(ôv./:S;ÖIôoܱ£xëö¢®UëÖP®í#ÒðbIßuמ((«V1@=t²:hÔx°ÅLPCÃ
+‚ª§ª«<F£¦ìå‚nͲ§oV‹š‰Iªb”(¢nOQÞ5Š«²òp¶é Ͳf6#9Sß#þ•Û¶rìº]òƞµZÍðZ^Ó0¼¾lôêÑBGՒKî^;|QOàÁEÝÍëûª·\¿8ˆ~×¾sa¿1­ÉµÁçTklfMlèÐpóí·\½±± e º¼©¨wC³¨žØc
+ZŠMçI[€ûÁyTj
êÀùt|íՓ¥"n9õUˆü-e/‹i|}ŽV2yŒÞÓðwÄR7ÂßÉÁ®úN¹«N.¹Ž
š·.ðÔ¿]ç
™:;«Þ–CýYHÏöž:CeoæYƒì®CÆ"7ÿãKçÅ•mëÌvL$šã™ÀT.‘6kÆI.EXÅ*ÎêŽØâ
…ÑøCb}©Ô¢ŽûÑwŒµÃ;ۋ’Ã`†Ôâ8­Þj(hˆçi8"(ɉZá
+‡¡~ñ®V©$Ÿo[Í­ÄâÕ¼³z8¹Loí6«Aøè»Ã—
Du*V#0fZ
cL*Ôá2­‰·Ù%“xùàe‹¢¬Z£bM„ó[âÔªàø<y­-¯¨¯oX”çnp7, ";"æwE=p3lu—w ¡œ	ÉgKºc꿛L¶ÞB}¶7e6‡Ÿ’“9ψbjm•'ÎLžÉØZFXnJOAàÝ"Ýù¸à?üSºNy†;¿¸fèùz²ÄãTkBõ£ÍUK›óc@4t¬Ø™ìÙÜäN‹ÿóÜ©%­e^½Þ_Qdñ¢Kûc~›`Ö«$Én­NI*lK,¿ÔîiŠ–-½¤½–Xl;Zf;XeCÛ÷ì*Šw–{¶ßº”Ø MÓçð8±y›Áåóæ#Xì5‹@Šv±¹‚aÍgådwÐ!€P±Ê“ßáée{g\tó‚Bž É\émÙù©¯›ËSU•}Š-—Ñqž}KŸ.àVª,ÜE¼tWÜ[¹kuqMç±;e\¯1g䶭ØU'/K:yΑ݊C…Îf{^IÐÒ¸ã¶Å©=Yò,w‹³ª²D±pÃÍË*BmA%s~úü3›f¶ÎÅîx¾×â!þÁZY¼Å›Ï„ú	¸à+‡º³áõ¾I£Ú«¯LÓÙo'ÿAÝY
ê̳}óÓÿ‹5º<ybU&)…Í(õþ$Ç ’ìDAc~B„ƒ Ø"nwØ¡V;–fǎ¯ÊîNÒ¼F:Òo)2u£"k'§›”|Ǧϡm9º
+¾ó
¥."Ô³j¿?½H©½S¡{²tÄOïTâÒ´õ/ã'€DÒ¹Ÿ¢UÉïì"|2˔˜I
­ž7æßϝÕoWFç˜/Òà§ÈÓçÐêR·"¤ÌZnΙ5KI])™µ1Y#”zKJ,
u¥Uõt*d5[Õÿ@väDÃë“JòZ9}bðµ™éût×\xÏìÙ9ýHet哙´@Veȋy<dvSÿ¥/éÝޝ_–₆ãY﯈ºÅ§EÁæ»ÐŸ{oáe‹‹4Tb³f"54"sqw~"7ãdN‰T8F¤BÅyVu
Íò¤_"/0Ó$O‹W6Å=fmI—ÅcbãÞ|Îêpôjg-rÅä;sƙÞÕ)˜æ|f2>­ÿðêOÌú„ó²>ñ1£#ujž·nŸE`R¿Y‡2Œ¡BPœ
+÷ïògÐn÷›y|ŸÆiK=’ª398µ–g‰ÄTÃwRZ…83òࣟÃj-‡1'fø÷¯++X0+áfY‚U$ìܑ{
+;3"R<ÿ$kõ¼‘ýþÂÍq¾¤Ê¬'öDÇ.ߜןd[QQqÒ&üËÁrrshÆBM@ê6ÆÎÊ]Ý5ÅD©H,_ؖԕ7v•÷ºsò:#°•Üt"è‰CM7ƒLÉ3äã…춐ÿŸmk¾ìÌý"eÓ3rA«¬F`7ÁÜ,PÚP¶mM7Õ
+Ñ ‚»8¶¬¾|kš˜…ô1¨6çY¬.=úö;’õKªØÒ±b{Më²ûE‘Wá”{¶Ýº$µs†è©u4tÍ%âφÁTç~7Ð+ø“ý‰`oSA¤e¤"ØY½Kf©\6o–"¥N§+Âè0ÐCÖëÂÖ³rUwØ¥cœúÒï‹wùzÕsU(]]d:ÈäæAúÇWeVÕ§‡óÜÂY¥Ë±
óUî4ÛVíi ¢Wɨ§~:™·VjèùDÈò[GˆÝ'(ýA‰Û^œŽÛÆ©æ]H¬ù—	v4wrd.z4SÈ+«Ý`GflQ3RÔäýÝܝÿö¬`Úd&\®lA	çŸþɓøewrä’/®\ó…‘WíR¥4Zð=kiMýÚ¾dØ$•.¬i£%´¯ûË7^±ªºxäÈ@÷—o8¼ª:1rdYÙ¢jO¼kí®‹jÊÕxâÝkwï'#VƦhÏËÓÞÎVp•z;à|:ñv”v	¡þQAíò4j%3u=9*wQ:ª½Œ™e ’`
X"T»€¦LNÀO‚D‰ž1Äñ<÷h¡Óp~›øümðœls.H”7¼¦·µ‚M™ì.Ù,ôÍÒÖ?™lúɬ|ÉIš/i¤ÇT¾Álj$‘â™æy”¦ñ¦Lð20±á«ëJ]µ£—ݳÖY”Ô­ÅýšRWÝÈ¡{Æb}ù«ÄBÒ=l²¥K}-Ûë"¦/˜«ì-[ë#&Ɍ”\½4=˜ˆŒë
¢d=ÿÂÒôĨµ×ê5V[ª&ғ7õ_Ø»~÷~(ª8RØuQub•`FTõþӂ>°
x¬Vç÷0üòɦ…mù%fªìZÝ$´ÅãmöÓHKà^Fcymž§t=µ<ß4ô÷žîÕo7õÅJÿžŸCoTöá—Íó¢ÿƌï‘}¼:ñKŸž"Îý+“
+³ÜñpV~º€2é¼,­o,ê‘?}ëõ‹)èéY±Cº¸'ÐxÍ/nߦR­ÛÕ¼¸ù&F­áź¡õUëÕ}WloXuõR²FܹúÐW7^p
¼švè]ÅuKâe®üæ¡Xë΅…Ù8€]“—G¤,ñ­Em‰‚¶bGñ(Y*wÒIKM+ëcöJÙµŸXr¤nÃ/‘Y(Mà–ù¾¤¿²J£­ÔVÚµ6{:P·iª*ýWr6ÒmÓÚ}ŒÉÕeêO~š@=1WæÓ70K~DgçkͦÑ+N_Qwc…´©‰•nóšX8…”𠧺֕{ëèÎÊCÄŒæÂó•K[KýztUíÍ·]»½Ùä‹;S‹²öóßÄó#rõ;þžæ‚Š¥—ôÇ;+ÜõÄóûzG{ÙðÖ½»³8û¥t€å²>ª«oPžeËaç*³iêcW}¶¨[kØS^‡©_þ€ë›Ã³Ÿ´Ñ‘I²œ
ÈùnݧÅ*Yû¿N£Ó«õm+w%ga3Öý±QÝ£”Ô.µÓ^^^áôÈ9ŒwÞ2<ƒ ѸEÏÛ’BÅEr“FŠ‹€ €bC1Ñ<Å5JÌÙY$Ìƺrqˆ±–žõw×} [ûÒ!†Yceÿ–ªð\ؙp]fkÈñ©Û˜›¾ôBéð3úòô‹òŒCq‘uœ„X°©ÙkMto½nÙü DÍhk‰G» M	A¤Žgф튏èiŒ/¹¤«úÆ[oØÙF#z&y¨Ù¹wktÝØLÜ
½C-ÛçÇícFcžÉ
òܚ	h—
rQ·ÉmŒåEU¶@—-g'§ížÄ™œq
+hþAõù‘µ³(%Ò3Òk-ϛmK`tÉcÿ\:cáømMÝQcÐcS©ð݌Íãs™8«Û|ÃPj×ù†Íù½ÉË©U*j
ª§'Ñÿ:ÀCsx‚~SÄ=­@:9.Ցê+dWûÏb>¶„•YÌ
+?“»}gc ÀP€4¸ ñºìºðNW:Ü>;ORý_ښ»sF“#™¹»E³ó#™L~$EôT¢^­ñ—´¶Û+­ì¯¬Þt˲ÄPk‰–çJùþŸ@õ`Cu…£¢EeÅêÏ
DÔŠ"Þ.ø}DKXñjO¬² ¿n¨©ãÀÒRäÒðF
/Ñ@£ËërÕû*ãÉ!¹eÏP±Æ$‰<ü•X>+é&ÅJúè¯4úOÝÊ@öR°lz4<`œ@š
‹¶.UHw¾•¼V
+4ïîÛVl­Z:Tì†÷–ôÞ.,ýM^_ϛì‚9òoê•ÉŒø3АNtE¾>ixHÀœŽfþ1pªùa°hz3®,½n!c\°óŽ5‹/í—vw•ÄêÔÇê×_¹ ÐXR³<byAËöpe$ÒVæ‰ÕwÔÅ\ŵ
µ	—)¿)^;Ú\ þLŸèÙÑk	8M˜g½Fpxüåa—ˆßY|Ó¦ÚÂΕ‰®uíååMÅÁÊ¢’†¡Ú¾ƒÃE¼Þ¨V4¼ÕF07š
R¡œ¯MÖô%+úê
+c‘âڈ»"æ(è«ùðÝÞ‹‹0Y¼‘¬¥¨³’pþžé?£ç™‡@;8:oíçWÆ«ã-¼ºYÝ\­ŽÇKªmÕ6PÒÒYÝ\Ͼ­Žû«:õÈþœÆ¥_;Sö¢’^¦d
+eôÒO¤7ï̟âê™'>~$iG¹H»›GÏ#• êÔ¿ßÀ¨â%®XžÄód4ï+HØjk\ˆeñ†ËEekêŠ8-™Uü÷z
ߪ¶J’QH	Ö
+cyB-¨E½Öë±sœNTÙËûª4y>ŸžÓšuaŸô*§Q+*ëU‰à¸›ðõ[ø	P.š‡c@´ƒÒú²Ò`Èa¢=Tê֗©Ùê.OWᲡÙ¹Ì<~Z^v&ý.…Ìö)®™å·ç4MÕ¬´YU.蝣BÁ”gµ¸ô,òډÂn[™t¨¹](´Û©R‰JwM©Ÿ¦ÑfcyN‰Á<Htt,Ü<Zéo¢Š¬\ú¹³&ÏS²4l¿}ސ%ŸgEHYù¥½©EÔÚ=‡J½©(8ŸN¼©}”ºM¡z²TÄmSþ§ñLï'ؗÒg}çz ~xÍ£&)vyI}üPe©¨+ uueÂZ¦L
+ òL…òd÷üÓלF¹TÑHN˜š­4“-ã’߯bÂ+÷\³ˆ39|’7bUÃÏAț¼N§hôílÝÚáž(­A§Ýcäð׫¸ã×~±NÔpˆáu^,9-M¶å´ê)§F5úÍGÏ\¬D·X5çÓçØçÈ8{ÀUóÇY¿}Ü0›JNÏ@-¨ƒŸ;nª5ZN#=x!œ’Mr`AWeWq½;¢]sÃzYrûc,Å|T*qö™÷yðä²ig!Å>ÇâÈòWtrVWÀêZÕ­©—Yƒ3êvÇšÕ4³ßé¤fP3‚Éc#¶&»ÙâKú|Hc
8í^‹¿.Úø9¢Û¦våÆ(p.UU½:
§]­FÿÉk)¸~ÊÅó?û£±,¸D½D¸èn‚nb~,šfÚê•L[ÿy™¶:%Ó6¨dÚvÑäÙ.S¯*‹SrVzéüLÛUNgÚfŸ/ùäDÛ¢3*,E½nŸI…ïHýN¥µ‡=y!#àŧTÈ!g‹Ýu*äwy"&¬…¿MuêÌ–~e \—º‡U«1éàð
Bg°JàRãpùÀŒ`ÖŽ³[›®¬°yÞ®lÐbΧùuàÔ1»n“SÌÅ]Aޒ×eéÑõσáL21³ùª¹`½®ÊÞ<‡ŸÊ3<$áûÖ¿póµkRS*“3ìpMH|÷v„8"Ñ]^#/Bë‡x‰wryð¢MXþü/ÿû3©¯ðDp³‹&ñ.…Ñ	S¥ÇO=9FÍD
‘5ÊØ	ôƒ´d/(’É¢Ð=:‘AÊ·‘°`3>IdЎùÜ£F= ðP·ì`óìQV%/`|ð½â΀ú=ÙғQ‚eMô‹š¦ùy¶²æÂu³&©T—`›{›à •CJaxFƒT¼F§žúW³‰aX„T“Ô絙/nAœYogÍV+'ESw˜Œ¼$ÙL¢ÕÄI6ËkvÚj4©%›Í(˜ÒÿS	¯TÐúIÚ®Sò4÷ÀQ|ëFPE¤Ö²S þ†(
ê*SOUµ«'Q­6UYËw»š{ªl¡Õ§zR×ñ#_í…{ˆ=÷teڞ{e’˜mgr‰ò„âj¨ÒO
¢ìÐép«?!V:o+½Íh-ú©×	Œ`1 ˆNãbýQ³ƒ(G«¦´}¸¨¡?a6kú·´6¯	k¨•èÄOùz¡ºb¿Uà­aw`aGžà¼^»ÎÄ{½6ý“
V©Uûm•Ey±–%Eùë7Žõ'Šë4äçda¹¯²£«Ë#Åý–‚¾ÍM­Ï´Ö³%–ÚšN|ÿ„¦DS’ö	ø¾¬UO6ÚCæü'¹¼'Ìóð!H¼NãR‰Y|bÐÔ<2¼ÞmZvIÏðöF›!Ò¸ì@ÿжFÛýOy´¨­ÌgáI)V¨”,dõè§ÎêDFc6³LÃD›7,oËOtŽämÜ°¢£ ±`¤Æ]±ù«Ú:ší´ä«líh™š˜…òÿZðI´…=¬@¥O
ÒífEzY+‹‡
oá+uÎ2í_w¾H³n“TEÁÜs	3yJ­æ°è’,N“ŽûõÁ<»OÒs©³S4dÁj…ÿR‰àçõbj-í«C¿SÝ©ô¡œöá¤Ò‡"ÎDÑX?»šE¬40ëAÖWÁž¸óÅOîÅ/Õ¬Æ%YÝV“ðo£y
·E˜ú5{¯h©^L:5âõÚÔ]$öÍ !"- ßZñY‚„ð)ÈÊËꬊ€ðANkvZ$§Àp_挶€Ãí×b~êKÌ:AC¬BÁ þAÔñ§5ªSÛ28ü…à`ŠƒUÓOOx]Ë'à ôavÞMRž¥Ødy^´¹‚O@Ç	S~öúŒ‡Uú…FÏcµÎ$¤¾•?Î'ã÷ƒè8i“ü@%á4¼Ð':.—
²$Æ»ßp#÷Ö˜ƒÄ
+Eœnæ)+ÁA)9gb¸9øÐ	ÂnâhyœV;1V}ƒ×™fW‘Š?ç’W²ºˆ¦œZÆ\¦·NQiÔǏ¢ŠXVýïxµŠ(5—Z
+Ò¨áŸÔæ÷ûߔ~ÿEé7éq¬ß¸ÚˆŒùð‘®_ ß#`¦Ûá\·ÿ…èF·ä	Xæâg³+âr¸Ô¼jÕf›ÇJú­ã>z‹½S Ã"œ}è[¼†L›Z'¼­9¢Euê–ÌÊ£[éwçIA~Im§áaB±ÂC²Q%Ö˲Þ\À¯¼Ï˜ÎïyÆFž•68Ãh/g°ym·Id.!à»]»Nͬþ§·8ÍN/j?:ͬäS[äw:‰@OúûØc¤ç
+ô©‹2ˆ3LñY=GPéù«™žçVîy;_û§{þ[µÙž
÷A‚Áߤf/}VmvE]v·š?Ò±7©	‡]ª~;
¾À~÷[¼¨"àëÕ©»²˜?Áö(ÿí¨çD>Gı«ð4ÜBXÅ7Ë6W"ð£˜NÖÛ:uRþ¸ØK”Ê:g	ú×	ìÄUyÄãôÉP:e÷!óx00ÿ{ÚèW¹)Jâ'+ÑQNGÃa)QA•În1>Â:wq;9‘ˆ†ÂR°P°å£66¡
+W$K¼fOÀc®-!ö""ÓÁ«"5‰4±²Â jS2sUëA(é#ì§á6ÀÜ.K^6òØEÖ;;-ñºcýz¨/˜5.e%Lž7¬ÆÜ7P*A®ôàfEhª >
+yƒÝ°`3ÑY^ÑېôÅ£,äõvƒß¦2zJÚå=5¾PñG—©r<‹´&XRYä	Ńe*žÅ¢N,H”æ;B¡üÔߔÿžI橎hb3ˆ‚(z‚Ì];€µ?jÑ'`ÛqÖ›+”~¿:™c¤¬«37¹W³GÄé–Ñ;ädÆ©/3gÄá
+˜ˆ–#F™g\a«Zm
»\!I­–B®yÇ©_gû*Îî«…
}Ê)ô¨à`i_ƒúík&îdxΝ¬Áv8}IJF)ù
Ö±FÒW…¨28C„hDS‘¾^¸Ùã?ў0žTÌFuTAu$jEuöbýÔ¨N°z²ÝA3fX+â&%6µŠ1¸ˆG4aµ#šç
+š™©7Ù÷Ý!›Zm¹ÝaúvÏ;N}˜]©2«Ut¡ó$
?á-s"ý¯PÍQËôñs:å×j‰ud„ohÔ=ÃüIe²ÚL½‘óûÆÔéô¼¡‡Xªmƒ *	p5¹™×Èz·þ‡ÿÆ |̆æ®ÿU+ãSŠ¡÷jÖì̈́Äfl¼L¸§
+¢‡<ÉÁŠÒÖSös;oöÙ弉ü­˜zš™.î©ò:
+j¼ôÓYPS ÷Øtuåú<›®6õ~zÎÐ{ªç‰)’
+@5íå1P8&}Æ[\á[H/
,âق¹ë™öóÕôs¶-Š²8‹ÞóÕ
W–¶Z´®hyc°´½Ð²[möÛìQ‡–§Ÿ§nê *Xؗô»
+“^OU"æÖ»Šë
+ô^»ÞèÙõ^›Î˜SâÉÿ•º•~—:ðÀ)`‡ß–Õ@ëî1?ÇöÏ	Óoô/-a?æ‹h¹M’àvor ÌIŸ›`YúÜÄ!C}n"ï:³Zýð…Ÿ†ØÓíOÐ^Ðݼ¿ï¹Éqm[´··Õ&‹¡`SWÐak«-qžd¢]˘ò»<ýï›úº?úæ=yFã-釾i`0Q^f8c4¥¿*=½T#''ÊÍÿÖ¬RIÒܸ_šBþRkÖæ	W-6ÚWl­Ì+	:TöBÄ+Á>?¤I<tCŠ…{„ÿ‡½÷«ºöÅ÷é3s¦÷ÞTf¤‘4£.YmT,YÕ*î]–%KXÍ*6cSL'¡™’B)
bx!Á@Bª!!	‚“FöÌ[ûìi$‹î»ï»ßÿû¿+}¿Yûì³Ï.k·µÛڌ© »d¬·ÕÐI‰F?QÅuHƊ6³/]Ãógs®t¿F<ìYCþ–ê ÒdSßûËùÕϹÂWJ×Vù*w^G]3g7‘]î׊®yGãÿ ÷s[ Ä…QEÔhÍi¢#ÍdCni7¢–ÍRݏ¹ÛµŽ7œ~-¡
+ñ"ÔÚ–¾zá~¼„d2Û5,ý£´¦Û~˼ËQ“fO3œB«Ðfû\遚N¦‡yZ¥9N©W~6¢Ò5t9Uf0Ä{¹Ö*^ŒÒzö^¤aZèãìןǷT~ÿsRWŠºPï30P>ŽÔPÍ÷¤F­AÀr;™ª,£Ç£êåeËÛ£Æ#š|ŽË—·C¢Ÿˆ¶{þžß¸p¡ã5I‹kbuIi‰y<Rïæn¦ zø>çf
+vé›)˜cù;o+a3&—Ž§#¬Æâ4ðk÷´øì…%•[s•
+ä LUݳ%§vçʲmÌC¹6äN‚”§yÎ4#ÏÚºnÞ×!üI£ÁSp”Éâ2¥kw嶗z>»Î¬p9m2•Û¦³†ªVtŸZ÷y|õ_?’øÚμ'ñ•Šß{›*A¿Â*U¢YºcF-ž¥º“ÜÒþ
†*'_ÆU‡æ4’½HIaøˆ*;Co–1Â3è§3œ6ŸAöPùdÙk'ӊ”aÃ«å9•
ÑñGcïP?an€ö;â½NÃ3
+¿q–n›Iwe…ó _WÍhR»Þ“‰(¼¹¨G3›ŽÓܤW2NoðzWÈëÉÔS‚`t†ÜހðQƒ	ÆnG­œÆJ"Êø|9v•ÒžãOϳÉUŽÜÓÃõWe
+	T¤ôs‘‡r8ÿ$ûŠ`-wÃÐéäFiTό­
$‡Å‘ŸÓt·°3NÜÓP4gƒ+äqg(×;Á0R×qwÈãÉ4ð lH†žf¼Þ‡RéÈñúr1Í=…-ö\¿—Xàyµˆg¶”¯,/L |yòê!u?2ŽVB5YJCes
+5ÇïL7Ê8QcÉÊt¥…¯¨3ƒ~«Rfp贁LŸE¥0رÕÿ„}½-ͽ4¡òo£=†*‘•…ÎÑcO*KÛ<mõ!Ã,pgA觏ÃèÀ˜7—ˆ÷ož©ˆ¥êJšQÆ+4æ`†Ëo¨ïpr­9Ççô›N„±@®@Ô±¥ÜÞ¤Êø-*¹Þ®×2½RŠ´_Ðsø#fšþw6¾ûQ¥z–n„ÔÅT(±§¡ÒŠJJçUê%ºš
+Ã3ê,¨3rFxÖÂil0ÅEñþò©Ò×4jH…"vʝŽç•’.™ƒšB³!®3kÕrӢЈİDu ½…\öz)@\I­™RÙçp€‚Ï\kp=Åʆ9•JúÌ{RúÂ(ôhzæ,Ý8cÅMDÓêÁ³ ©ÇN`yóå·¤ô–,‘ÞŒ¥,Oä=¢
+¦éL©£ÀkºÃêÞ¢?õÅÓ6VzáÕ̃哥Çìùã´Ã£öÕKYâºz!¤à`"¹R
+š)xRm<†ÐIxëäËZœŠ_¢¡ã–²dB\¿¥^§Õmb·|N긆²©’ãZ_‘ÒíÁk\жh–²ŒÇ“í3Í3«¥;hnŽ½CFïHi*H͕ÆÇIšž¥:Q$µí^°%[pn)KúpaÞ·TY}‰¾%Ãnóè!]a’¬9{H–^x°|¢ìU-nî”
r
'²f	K¼òˆúé.æ
dGÁ§–zä1;)å,õúdâç3%ŒKՉãÒªZÊ
+OòÚ!iŠÁ{C©Ý6³]+coRpzÊÍ«n³Í­bd4»N¡Sñ4¯Q½Ö ‰Ú(SÀ“R+â:µbÑ.Å"ç)d§šÑjØ£Ô« X ˆ‰Æ$_“·ÈZ'…ƒ=s‘‰®WІØoµÑe¶yU´œÊ¸‚¡48jC‡-AKìžDð
+ê5’Œ”Ôƒ¨Ÿy^ŠI1êz
+Sߜ	e{ž£~€G#|ËýóÑc¨oFåG$=’.7¥F’\òòÖÉ'µøÆ­$†›ããçX_® ‰‚ÊÉð¨hYìçW°´ÄaÀü¿´‡½Zˆýü:H£—¼¤~µ€Å±b7Ìq¿Ï0Q͂ÈS¾AèºØ
+µ‚£x™×ÔQHÿÃK¤ÿ
)ýBçj§$éÿþ\úݐüÈÂLJ¦_Ê©¹ôN†1Ÿcý
Hcì×<f€Ý­fdTæ•óÑiü…/?à՘;^5%P™×±´Æc7ÛÕ8“­AsJ&ŸOíJ2 v+0 ö¤LÁј
Ô(µ¯ä2ÂvÇÞg~È=²»ÿd¢Ê'ÍQh¹ùQ½t}nâ-îÞHð	:«Çäðk(èAÅk²û5ÂÇ*
ž¤6¨øsUhƒ”F.õÄ®§ßå¾
+a£Z|v#©¨¾iÁ(¯f‰!Arڃº˜V<f‹°ÔFJLšcGæ6&~wî(MÉbû‘{B¡Š#(d2…œõ"õƒ¨Zá½\&—©u,×6-Ÿdæ›ååÉÕÏ3Š-z¦/fä$*<sÇÐb†XQ±[h¹Ñm1»!†—Rr“›XӟJ|¦J)Ð7á£1x»Ë¿ÉhÓw$·©`ž½û#}ˆ{2‘?ÔIœ?ԟ—Èi\œ¬IÔ\Óp!Íè|v¬]“Žý‰aô>‡Ý
Âw¤IDØu.˜ZPH§_VPÑåt„fy‰úßÈRŠøÓ'Ò*%]5IÔ)b›UJ|öºò»Ô"í䍋Q©×s‹Õ êñz+u’u@„MÈ>~?Kil¾·øïYƒ×.ÅSÕð^u›ùŽZMoŒ6›QeL腕ôAÜMä_ Îû¯ýþÃœB©?­Ðªð8:‘û®ZEoLvì¿
ûoÀ}:ß»žÙ·‚ÿÖ'Àÿwd+
+´KøÎìÂ,Q+NUaIø3æE•2öwÞ`2DƒšÇ§~EIÊú-ÕÈlfžéÞt)4\Òk>žôzÁ¼³¹t㾺ÚÑÎܒM{ëjǺréëšö­/Ìï©l:gCAAÏøzõ#ê*ú(ÈnžZTìI¤‚B´j1c’ãÎ3ÇÚWa½NÚ»=Í,ÃnUÙ
<ª¦÷é
¿B§é­:0úd*­Bg…§c÷ҏpW¢”û2R—Ì(8çQ2#d¡>}Œói.NáiW´oãðy…4·dIáLˆ‡}n¬Eß?róÖèÔRŸ«³éätFnÖ¶¯O³*“×bqj¸íwǎƾ;qañôÞéBœ“4/ã&)æÆ(3•MÕÜ'(¤54ÈË_@,ÍgÄò5)–ŸA,/Ö¤üšùX2%vi0HÖ/³ÞdT$&u2‹<s‘¤aP¬·édtF^Vï­Ó‰¤:öÆ7¨åTåǑœ*uJÊ7?;}Ó±?Äފ½p?/ERƒËD(ö<}œÛíU~Ô(sÈíÈ¡²;ì&Ùóî&ù·MGzÒlÂñðq²¡—lÈ£
+S¯1¢$EÄôq†Åê6ïŠýì.…‚¨ÞŒ#¥QÃsT…,l¹¼Þh։ŸVjT‚ÞdÒÉñ4
+xp=x	b5±ò¡Â¨ÉèƒVJãÓjÕ>ïlÒ|›]*ZaIãֈ	¢ì\
)¤æßÕBØGr‘aðîË;©À"Ö,¦P)âJ“†c>
º5jˆšI§àŽ©U¸iE|3ðj öý	w>ڄF¢Å+;ðÝé]Å¢ReµÙ
+‡¢Ë
ý{]z±®é>åJE»ÚU찗p55yü뫽¯ç-ˆu8¡KÖ"é¥=ö*aêüv|í‚}ùtÙu¯f$=’D‹·A.Þ)CHé™ÛðQ2¿¼i6ӟà=Žg¶Ï¡Î3ËV–dä;•<W ÈÜÎ<XÁ³*ƒC_ÔÐÉ,¯´g¹ÔЃÊ9™3-ÛâÎRæèBu›ë´6“šein#øfÐå¯Y~tÙΞrQ*‹:í%¶dU[s|•`±˜y–ci{^}¶}uñ_
wQÀÆ2jÌj6°à¯ÑâÞ^ñîʽ
ŠáV%à·Àë¯ÏŠ†ëŠKJË:VvvwÙmV•RT8Š]ŠtRèjî+vä)ºV75a.w›Sû“šÄÄWâÞÄcd7ú™L¦¬ÚW¡ê%'z1ÃJ±6Ù?3ÓêášË
‰§‰æ¯8î;çùœ'f,[Yœq*9>ó9W«dy‘g•F‡¾°!K'ƒÀg[6ð™ä¬Ì‘.ñ¹DªÛR+ñ™ab¿Qz	Ÿ_>ØS|.¯q:‹m¯%>«y‰Ï<K%øü’¡Ðà*
+Ú@~SË-f#+ã1Ÿ·UÆþ¼rïÊ`‚ÑPªÿA
F—¡B´1šÇpùb˜(UYA£Ó€§÷UÈFX§Ò(š"ùF§)ßä49ómŽâiú\z¿Äèã–òª°5yÑà1íUڗ´/XµÇàEŽ”ñ1&ŒQ:SføÌ^ŖVWK«i³ÅbH.+-13oiyM쳟¨x§Ç#>eõç„=|×ô.
ØSä2Z£ÑXôZáåω¸¹ž¿ªìñ`á|YÅWbŸj´Z
ÅEeÊÌ
+r»úY¥Áa0ZA`¼â´ðûìkri¯Ö/ÑóÌ? Í©AM3•òÒY:ý±lwØ¥ž¥¶±ºðN¶Æ¨ÒOTfg
+ÌN”‡¥5)øÁ’9êtÉõW_ÊnH(T¥s]·T3“'Âܓÿ«8ÔÈc?Ö*œþ,­P5½‚å*­²3ö–‹'¢ZNåÐ<Òu¨Ðî×¢Åg¦B¢’•qz³Å z¿b÷ô¹
‚’g¡L	Ë÷Oí^ö¾ßçkÑ+³š›VdéV<Y9\ýêÂ|¶¢Á'6ð*»Ú}”ÆKq«éŒh ½¥º<—
¶7Û
†ö`‹
+«ù-Tå'l¹à?­³)­íÉV‹YAx’Ô²’¸ÏՒu}f5‹S
>~šc®y¾äÄ¡úÀR_bRÑWR’<"®ñ§<óaU²ØÏÈWèû¨lAäXb÷c†_­´fÚí>#G‹&³Uû©LĚ®Dµ@xÑ	š_àaþF)£²8ØêH3ò´Âh²ª©pO1ïélZ™«cÝæ5­6™Æ¦‡G!«µ¥9S¦R°,t$Áææ–,AkÓémYè‚ËdäAXyõJ½œÈƒ­+š³t—Àòx1sW‹¶¡³Ñđ)¤VAF­H¿=0üõ¢:Z
ø{;™kßßÓÊ ü:ÏÔ`§Žßµõ]AùچƼ–UÈJiòðYóHÞþIx?§åf)íÙBʙÏ3Ž;Hz´Kç­-øp"P3ø”„¥šan‡>^®ä솂PcĖQÙÑÕQ™‘]g³³¢¦["5aµLÎà…P™Ú_ÒUYÖUlˬ\ÙÙQ•¬[k3³ª»ªeYJñöœòšZgZ4ÏiÏ-¯‰:ÓjÂNö×¼Ëüf»Å•WíÏ(ÍJËUu—•íX³Üêmrf¬l©/p«-øԉš7á"ïð:¼Euéià4§ª«¬|çš‹»Îê^Q™cuQyºÍÉp9\unEc&6;Ýzl–tʚÙ[95JGa¼Êùˆµ"õDT4ØäŠ7Þ.N›2F:Vó.òøêBÈ*•–ØeHÎïJWçí¥ez§9ÛNS†—aø%×»ŒÙæð¦Kׇ%«&®YG=ä2sÇ¡lrZ·áÓ{ˆ‰~7gåñ55i~;Äﺔ¹Ÿ³#?ªœ±*U³4z"jQzýJÅ,ÍFåH©tqzWwÊò¹´ÍŶâ5!»ö„ý䂽E){l“{´™»xFŸátøô2ê\&6Ëkliv§O%ˆÔ­¼Þ‘n³¥YT4=n°(ñ²<9WøFe6ЗIjêe*¹¤3œþŒÍfGðŒ%ææUÐÊ訫¢
+KÈùeÚIcê€óØÉ_&v}̍LXIâùä)i'ËÜ@‚ͬ¨©ê.Ïü^Mù}
‹¿qpEEWEN¨ ÝIÓÓTšÇhÑpl¤f|u~ZQUQš+R¦՚êñU…iE•E~{8š	£@™4ö	3@}ÌM#
J{ih7Â)9ÿ1£\4AMv»%—ÕH?FÍxÓõK­ òò"é,s‰F'Æ{w>¸-ÿ™nð¯¹T֊0T8€ÜÈCk¾øR ­‰ÊÅgKoZ8‰@æ>É\Т	³°è‘þ%×Yõ‰¸ˆ¿%’ÆƂ”\kKeŠ%sÉܑÁ×±	úÈüÅ6øîðøٟq-¨mF»Ñšz
+åPDå…ÕeÁ´¶z=^³Ô#7Þ¾rd‹ŠÑ£•zø¯îƒ®5j—¡‘²à–´ˆªEάz×6ÑUñéòöÁO˜ÅÝožLœ½$۟ç»é^Œ”áä¼ö¹âÚRÍCʍÐYàÕm³hÞ \§ì4¤VŒlùÍc(æ²Þ_»þË}ÅÁ5—nu¦dºÌêMçum9Ðîn¿ç€·*ZŸYÚìääF-Ç«÷5†¢=“šbe
+µß`W´Ä®8ÐhS§Wå/_Wlæ5öŠŠMÕ>sɺº`Oç
+OvkSÃé÷.iìÎê­¯Þ7±+R¸vE¹É×ÖÚPì	D;ƒÃgV¯ïîÌ®¹|8]#gEû꾡ÜªR¥Fpzj¹6mýR¤»¥Á¯
ǿŠz§!§´ö=OCûÚ_´À­seYóÖoÚNÿJÚWñwsyK‡ÐÅ芧Ð~ê'QCúDèPÎDÈ£ì±ö„B=VfGÉQê-ž6P?ŽfïÈ	ü½nýG­%#Êý9‡&Ò3 ký adó%¡Á#ïWLÿØӒz¹ðÛ'kj´oêÊO¿7eãta(›PH{·7»“-Ú)›‘+bLjà·1I™…¥möŒs_ÒA<išá©YŠ¿Û»bðŠõyÍƽrUOF *×c›ÃÛ÷·ùÊsÍΕ‘aç®ð¦Õ‡;£¯68ðÐÅýàŽ©îB—BhùÚYmû֕`ý-2¥ Tm=°â¼g¯ØXjVgÖ\ó⧷Þü‹«êN?ên*Èm«Îójó
+ýëV5é?{Y]zíWn˜j´†ëC9
y­;»¸Â_x›Ê4¾ˆo½þb+·¯Ÿ8g_ÁòƒÛ—EϺò+·\5á-ؾ¡­Ü«7ê4¥Ói‘	Fƒ2Ø´}ò`]îw?þðm{›Ï{øӚºÐòõ×ùj+Ã]»ªègp.¿?ÉWç
	võ=¾)º)‘ÏRÍx#]G©×ѲQE]‘ÉO–÷¾¾~9ü¯jy~\{Dn+ÏZõâ:’µg¾îiß<ý¶$ÉÑ%§Raɒ\ÊW d“™CýÉ,a3>O‡)ºcόµá¥>rÉö†E®Î¬<¼cüÑK·7d›eꌺÁ˜¢»xõ¾»|ÙôÌ«‹Lð´êœ»ßºlêÑÖ™b·JRåÌm(®ÜXŸëPv÷T®®¨e
+¬;]WÚ¸:÷ºk9MW¬kÉT){Ví>xè¼Ñ`aÿ†¶2oᚉƒïߕ	Oíe^ƓÑõ_=|Ñöò@ãÖñs£‘‹ßrø¾òÀò­ãû˵>—Áá³GÚzû¶ø6ou§¹”j…Óí4^‡öºkŠ/ºèÜ­Ë.Ñ­ãIzš9Å”Zõ´
?¶º¤ª22KõGåÁ••ð¯0¥¶A}sS[£NE뚪ÚʒH0¿ƒ/.._]k;¬É-O»Ó4¥Ô°ýoZ¡niO¿}<qÍñäîœCÇß<©•ôo-½
l~c•`6’ë¥[“>’·ò%„AK@ºµ†h’<Õ8}c×úË7…—﹩kÝ¥›ò7¤7.¯ß»®0Ø2­Ÿ^WðuZ´˜}˜8}.'mv{µô
+Öa
+,ËÐ<!‹Å×pj»)ǜåH3ÉX÷母GË·×°í¶‰šÒ­tWïlË.ÞxފúÁEöïQkå´B[‘™þe¹L&§†Lvµ3ఇ¼0ˆÌÎxU¦…qÑ`‡ô-úûÜýÒ
*kÐà£
å³Tï‘zk^Й\+”ƒ~H Æ¢é:k÷XÓXõdádp’×ßÙ

~¤$-·¼^'4¬Q(]cÊɔíjx‘À‚5>â?¬1
íN¾8NzÛù›~ˆÄ„)xX2×õ.qíåÜ݇‰+»úZ…õK)AcÕë¬*žÚx/°4CÉäržºžŠ¾“âÕfÎ$²Ôz*Ž8ŸÃj£[¨
¯²hu&è¿w²nC“Ñ®S°eß3æøºŒ†ý)^‰-ãxžaxž£^æÁBmRñ¼Êtú_sÖÏŪeðG½«KÚÑÈlÃ3r±û¨uii63ÙSz
ýC®+±71KpcÒÞı¨ÂÉÝá±Ü©IOÝî÷&ْøö’[3S4˜gÐ?6m).Y]éÉnÚZ\´ªÒ³¿²Ô–ë7U”YsÓL§`–m©Ïð–·ç”o­KZ®5¦zêLEO":þ'dcë@²lǧgGýªÝꍨ5ä4(RY'³õ|§fE‰ók6­{JS÷Ö±_BÆÂOBK?Ž¯¤Í–ƺ–“gHNΟHL°¥ì—z­”ýáTßÒÌ.µNFƒÕY;e”6ÍiõdL[pM~n›ó˂֚fqúrÍÓf‡!°,¸SÜ¸
r¦-ssa~§»ñۜ^…\;®ÏŠ†—­«
ٔë7´ïª÷0ë,‘œ±dhǦÀ«:«FÀKoL̓‚‚§e«îuצҢ³ú6^×YµÃ)d÷ëMãCxc½LgÕÅFÒê‹<i­-®u›ëwž²oNüÏì΍Ð}O¡ÁøóQ§†nŸ¤¢m]̆L§ÑxW5€Ä°ÊËæ6Ì҅Q¯Æ Ùð~Wfô}gÐؖÞF£6Šn³5]”¬«+¤¥²Qb©ô'v”ÁÿÖ*|íS¨g+¾P±&Uš¨™ïx°\¼wôØÛhëf §IbÔÇäô‚¥\šYØÊH™;
^‚æ'ÌRöXÌ6Ï““&¤cÿ¾D[‰÷Dމ7ûéj»·EnÜÞ#Š¬¨W
óFù°¨à”õžàYW<xVëÅaƒHs¼\)¨2¡:4SBEðUò‚R¥ˆ=Ëá=qT£ï鈽b+ß²¼®¿9_+S¼¢M÷¹DÏ¡Y¶ûC½Âç±fm	ªôr¿Ï:pÏt4ïvh“ÕjP:ý®;®Ñêalҋ†ÜÜ\“WáóYÚGWø=™¼´Ìq‘9ÁýmE×GÅÚBVË6š¹h
4ƒ_Fj´–.z,¬)RãÇ”I—DUH®AFçl£©a–b£æö`¤=ÚN;۝í¾î3×rˊ¢]>È©Ç4r.õ–Èã…'k
+ë¥	/é惐v^³nb¾!AÂÉ3	ó{¡}Þ\ÃÜù}ó¼"̕_¸¸Ž³Í5ÍÔ՜å³hȒƒ2{Å`[ÿe]i¹+¶lß²"·`ø=U´ ±ÍNpZU´ÍaP€S–*µ[—¯ÜUçÌm§-9Ôí×7s?Si8A%û™ÌkÒX͜Ùb3ªœiμrÂ5‘ô`^ݖºÆˆ›„WxQÆ`mKߓ§UQ0ãëEG¨¾;ªÌËä/ߏ#äÈ{Ü_)ž¹ƎΧPoüù#P‘zg1¥$:£Aí¡Pòïûñ™÷9êB‡ÖÖ¥žD­¨z*jµe‡ZÛ½(«µ¦8TÞj
!Ã,ŽÊ]‚K°*?Œ¶…
+[kÙ¼Ænë,…+ÊÎK­S'^n
¢#ëωa–Êñ¹41NY¥©¢„nõ”¹¢¹£‘óRÜ|V’Ñ×¢|cÞg8<¥©ò´WDûۊ½cnkiÅúúˆA&ÇǏ4Uu~ãÏ69µíiì«vêC
ý—®sIª$%.Îü®L­ŠùPÀ7°©¼
o~çΑ³²ò;Ë=iÙièÏð*4»»V£ÅËÛ׋Ë֌×]xéEíâµÉEïk…Æ‚¨ø'±>hÕ:ÐHÔTÝÒZÕÚZå3X
uÕ¬lžš¥rzŠ©âe³ÕdV{ÿÐâ«Ê4e™=­†YŠš‘¥ÖÈ2ƒÔ0%î>HV‚cDÛÅÜ5©‰å¨¥´B§¶I‚ûR™^|8W#?õ;¥†áJµìÜMç‚/‡ËÏuY×í½qMzSÃ2YÎRË՞¢öÊ=7x­T“†ìUÄf7RŸ(UC¼Ñj1¨Œ:Áh1Dêe£–3š-:åUçÜwVžhñYnnô˜×w~ý³š7šÍz1¶Ì@Îô²ÙœJóƒ¤4w’Òܙ(͝Jó@ìvÖ­CQ´1ê/ÎÎ*ÉÒ»=:®$˓•kÎ5£¬l÷Éâ]E–G¯OWÎRÌcé.¢MÜzZN擥[lMÑ!²P÷ãævv¤ùS8&k¡X^®’ófoЖ×Tžc*¥X·Õ¢Vû8ö'ZiöKJJÿ–•áePŠßip´÷î]Q¼R¯”s6ÖhµšTr…ÜQµ½ùE­Vڍ :UŸÐY%cžI—IlûpÇek22ACv®~ÊàŒh5ºú)´6þüÀ¹mk©ÖYš‰ºVg´TsHï¨ÊdfTgP*µÝ¨Ú‘Ñ<K[¢ŽšêÎnG†U·0TCwu,_QË´{W/˜á;}’‘ÎHçìA¨9–ÔºBx&UócÚcúrí1¼6¿9DÍó-ŔT 2wše~
£4宫y爔I‰/éUBìÊ,<Èb°SÒõWøÞ{{ì#…ȉZeô€1±DLÅ?Ê]ÀçôëåìÔ9‚Öpyҕ*-=PlPz£I«¸]/rz“Q¯¸T&b¥#¢ìRZp»-·ë´œÎ.Šé]&‡šc¥<&£þ)ݦv˜ðl›øþ¯AÐyO8×­]Áºšf©§ŸæT²U.0>èá«ïs4£yÃzÛ¢·Ú»{š+´/X/äÿСÀ¿¿®Û¿Ú´à2ÛäúðÿùÅC‡ão݊ړoÎ)Y”VuGÙhI±
!øRFDd™Wk3wlÁ—TV‡=àà‘
ó ‰\02­Ta	ãâ>=×âPÑÌXìÃ1F¦wZ,.
CMYY¥AshølµR¦Ò‹—Q¢Ñk¶8”4=D™™´\‹SÅÐ;'UÊÓwSæaæ¹×c‰=®×Š^·1ö€V)©ŠX{@¦4ì‚Ù¯ðxLT«A¯ö:ôT-äô°"{ŽªÕ¨‰É0{œj%w+°r·<¨ë.^xrȘr¨¨‚Ò0èi:‚¼ñoî,yLãÍUÀ°Ž™qôÀPš9UÌßš8é€ïŽÁ:±Q¹äÉüd8–TÍïLa“¤ð‚š“$xÞq¬\´—­,¬¸w|Ë%k‚ðPÑQèi^½­dë%«ßÚ:X±5¬ŽxMŠm;+·5ŸIÎܚsðú¯ßxYAåŠÂ¾k7Ãí7]Zè)ðé‹ú®Ýrðœ¬@pÏå×^:–†½—_{É8n)¶Âx«‡³ <|ÙB.E€KVÌ¥$0Û2x#²‹Ù2“q–j9’э·¤£#QYòîµc5§ëðùÖcÇ3p…I>)ˆ7ÿöÛ¯ôb>#¡äAAIGé™NoÄ}”oT'ö¾Ö¨â8Q¯¦º8•Þ¦³ytõî‡jq€7á®È¨Ã¯õ*æµÃ2Ž×*EŸÏ-û6ò.CŸ]-íbò_¾'݁~Ïb¾,O–žå (˜'õú
+ •}–Þ1S¦Ê;JE`äê¡r¢r»¡†‘ö裳TfJZ_Àæé7×t@M–.æ‘õ¸ä폅KÌRSÕÜ£6ìܞ(ƒÒ:p7]“VqºX¥‡±™Òj¢Ú;v·çÙešŒ†¢òÁUå¢B‰š‹‚X»i¼rہf—2­¦ÿê¾Oé N=ě-V½’5
+…73 §Òöî\»¢Âb-xýYiFƒÌ`6
‚˜î·•toe­ÙzÖ¹W¯zˆ¹›?É|¸»
ýl1w7%¹»	W«Yz-ŒVg¡Ú,„²jMÉ,½j¦S£<J• 3j¤2Ÿ¨6ÿ£(­«ó?ÊÈZ{ðx$*ÌßêZ>Y®Mc|sþæ´Þã@ÿ«~§Ôö¥×9é´ùÝBÒq¿3¯`“_“›aη•ôL߸µ`ýÊZ»FEcqB&·í¬_ungÀUÓßt¥V'e¤¸»eÿú‚®-sJ¹‚•kbtÓdÕʽÜž‰†ºÍËìÔ­ùÛV×d(M.Ü†·:L*O†§¨«/?ØXèֳɬW䮬hêNËJ×idn¿W!f¤Ù2–÷U5ž»m¹†ò›ðÍAÖø§‡Fh9
+ÐK‹s±r1‚s±Z`4„
!™<[.7d‡ÃÞ|Çî
ƒ]ÙÑlÆèUCsà)Àl–GåµQ½ZÜ
×`iŠz
–|‰~2¢ÜMŸh\¨x£HC£“ÂüOù›šci‹¯2ž×OŠ[œ4ÊÇ|Gb¸üºZa–”AòLñéIמœç-¾</ìVQ÷\§Q¾BŸþ1u'u­äanÿœÔIiõzÁlw9í"cÀ™œL%?õ²‰þáéz\G\Òýƒjh~¾T¤J¶@9•!¨'åQ
+irP*ÔxQ%#Ô@ó3‚AGN(·b–Êž	wAé·ÒíH-ÃDaabSXZ÷JˆÀ¸r¤¶â¢äÿÿ¿@%ñÏMϏQ'¯õTm9p[oΪ–«Z%‰urE°¾·~ó—6çÙjÚWôzá,>ÃEW©ÕŒ´6æZ‘V‘1ú•m!êdôÀDoSPÔ[•‚	ßâi3«m.{EïÁ¦´hÄ¡´gПWÕ
ožÝÀ²áÎ(ógTa༨µ o,Ε6|
Ε6`QuŽ£ö(mEJTDçGA(t(ýþ@ùGµÕ9L8,Nšz`„—ÚŽ­zø3N_a¼Yòõ‹{±ˆ¿d±dñ$‡î’&“JYæ[açÔMÛ6ž×™¦°å6\ùøîÚ¡L«ŽÆSrÑWԜ¿åðX»iÙM[×îëHĔÛR˜ÑÞÒàV‹½›Š×5úu4]zîž]ݑâ-uöåÞ»nØ]oT+LzÁ€Ç+jºíÀÝ=y9­]Õ9¥Å£_>ž{¼µg5®
÷€Ý5Àƒv/æµxmÀ¼ö
W8^gÒrZžu³Tèñ¨³KL^QNŠòËÒ5É,}ò¹®çG§lRHÝÈÝÌÉõªÓkeG†ÝŸ©eeôK§oVãM×*HÿÅ¡f¯L†ŒŸ½Žðj½Šm1êx¾*քg¸ó fŸ†Þ/U¡®3勞dØ-Â7	Q5"Ê(¯×±ðdDÊl\¸¼h‰š”+ªëuåEÙ2!ü¡£§ýÃ%Bšm^|á2á…M
+âß|}fIJÝ£“XgRÖ~ðN"IÍxr&‡¹ÓZعûúͽ_ޔÙrÅúíë,áæþºú/lw‡{ö6W¯+µwBME;¢nUz}iÝΦ̭悮ò­û[Ü梵µ]S­iԞÜ-ëÚÊ}Y+¶—5ìÙ¹!Xv¨'wCϊO¤ymVÝDoWš¿¡¹ƒÞmËX²jº2½EùOmkÏéCÞò²rovGGW®»<dË^¾Ò² þùPŒÚÐ5‹s¡#Y›;°”—çª'µ¹."¤tUü!/?_Ȃ
+ø¤iMãɨГZ	±šö3ê°Ròëß}˜à·ažÁü-dRÉXrOAòÒöVë\͕ÛòZ†®yf¯¯ª$b°$ënFY[~ÿͻۭ7n]sN{Ú·ŒyÍEíÍ
n•
+×ÝåE~£œ«»íón¾ÿ‡w×ó¢ZPõœIª½zuóy÷löä…Ú¤ÚkUYÜúå9çîò-k]µëª{•þ>]Ëý–XÍ2·€Í!úôGÜû`#$l. ÑïJ62luޏP—ÓÍP狣“Ç#"ˆ˜Háa8q–R=f?›;7uñŒ”ïc’–q<x°${o!y‹`B ú‹´ûÉRµÿN»ß$ÿNԘ´F›Š™äX ‡;D¥Vé°ù1†¡)`²ˆŠ¿/¡‹è6TŠªA¶¡¾•«ÕrDRž7K‹Q¥Qny6kŸªèþœ”ȁˆ.	šºdOšÐ÷T“WŠ·ˆ|žð‡etêO Ɖ±,³†Sê5ß®è
+r‹2¢i"¯`… FªWøjÖ[<uéz…lBîr™4ZÄ
+å×"ÝË«œé£Ù##»Ý,ˆ÷
+£Þ¼õ›«ð<~ü•x
)ëA}øüÞ¯¡•éHCËÒJ[ƈy³Ô+QU³Ø̊ší+²î
zð5³m…ÇÃ~³aŸéanª28rYZ(tP~†”MÖê3ój‰Äô"-
KˆÄ4YAWÙ`HŽ§vårG¨*'ÐPèÒk#Í¢‚Wªå˳›‹½rsÀQW’!Wsr‘—…*›•=EoQS PžiÈ-ßژi´ðjàv™uz­Î_ä7g85Z¥ÊeÕêÓËÒ5N³Ú`1X6›…‡q«Ê‘Wé·–§ËhÆ*„Dÿ˜î¡oDB5x¥òvdE~êvh“­þ  uPŽ{
ƒž*ã^áÂT>¡Ýҏ>T^>¿ûl‘μ”­&,Ý#::F[Êה9EwAûðŠèúËU¹•ÁʐSË”«B­@=™¶µ{GØ]ÖS’¹½[KØ_Ñ]º¬*PÝÖRkŒ–fV¶¶Õâ¾5ÿ”º—¾Šp^Ôõª™B?–³ä.X´>ôø’¬úãs*˜@)¹Þi4Ø¡†õÝmÕ²
+âuF¡1렆±”Ž—ó4T1žúx¥¨Ð*v37BÓE³‡Kâ{øxYŠ¶á:vû“jµùÜ8K½õçÉ%&ºÝA^k£l÷jŒy,ŸuPôQE÷òç§Ö;`®4:ëBÐ
+£Ýxo~ qF-\¨•"eÇ´T
¿Ï*TŠØ#¤I¯¾½°> “½fiÈ%Èä¬L£ÈÙZPޖg°Wlmì§l¢°Jî²Õ:¹ÝéTœ¬.ʳ)-z•Ö Ñ¨v›™³Ø\¹eŽPKsg~+>Ås"þ1õ/H{êŒjn++†´…TáËW=!*t«O¼K¯·ø|Âr(LÊrי…I¯q‡åÚdʓJ
þM•+YR/G²s§~jÌ(nè
+¯ÏTÊYA)È,Á²,y–Eí+ÍjP(X™ZŒv®—™Ò]Þâë½V¨eº¬p‘«¨­ÀfË©ÎH+ôià«È:5#§RñN»Q¥W©]!§ÎaU*ÁfÕGóEÂ&Q­²›tœB§LÁ2¿oY®WÆXÓ²ñéíŸÆ?¥eô—P†:£9úœl]v/¤‚.=;äÈv:t:!;+ÝÉ+=rB©öݡ畩…úÄ1\Hž?v,qD3|æpR*$iÉEÞäÔ´tôh~4ÈÒ2h…Ä3¥0Bá·ªXKì]•‚ƒCËÂG†U¤V6+dÒ±—~Ä9œ¦Ý¼o~ñ»E•èñzEê,™’d|lŠ*ŽýªAìwñ_²6®ðYIµWÚ
º÷ˆLÍͧaî¬dBÏÜäø
Akqsô&ö™Öì2šr^”Éåã²prÖ$¨6Šñx<ÿ%W¡X:L_
+ÔLˆõͲAÊ&ÝÕ7ïÂJ_
oä
¸¾nTý%wä‚n‘üRƒ’+ýŽ¤³¶\Ü ¹0¢k%FFL„²?éBøÛ"B"´ý’K#w‡tGàz4̼Áš¥sû(4K==ã³Ê1dzsf)îˆQ-KÙÜ{üØécxËì±7O'—o|‹‡÷…¾ùÙnÈÑ7ð<¢N›m¡—ÉèÔðTKl$AèEt
+ª¹™VÜF“CËÑÍT³JM÷òF¼f;Œwðqx`?¬3ñ&«Å ¤†aHÏqr•,vXšU,D·1cÞÆ·,Eȯ0³Ôf*d¢L
+dö‡,21Í'S’ðò›/§L|HÒ¸
òXMg
+OŠòhéäuòl‹

+¨´**Ð{?µ­Õ â?ŽÝ(כÍ
+Q¤d2jô/-3j´xþî¯PúŒ&“ÂLëèe±©Óìj-Ç
+T$ö#ãÔ*•Í¨ç©•+h&•JÇqBì
*Þi”Ž,5Œf*ÑjæglHڃVÊ5¢£ô4R  ½gÆ];K­Ÿ)ujf©
G¸gJÊN¼O"BÏr’äÎBµjd631æZøŽþž`ôE¼þl4ÏFžßü£ä4'S©å§¾ec$ýÂL—5¶;ôùà5/½’‰fñçºT*W®ßÁ4»F0Z,z¥ì}ˆ5úr*•3×珸”JWš©2æÓ,¥1ð˜yÄôZ9Å '’Á¯ҚLÕI)I'æŠÛ¼z6âgæjcâ´Z¥åU&-ýWµªC²O«•sVÔíÒBªRo„¢a5RS‚ÑYª7‰~ŸŸ\‹¶°<뇸Ô‘Ë?KGŽm<7K•?µó^/ÌRŏEµ^~žû¶°Ý*mÊOì͇Jr\š4†½”4K 2“Mž™ååZ«út
]oÇSùée‚À‰³Á¨cis^ÀÃÇ^‰½¢±©Ün‡Aà¨/³½2=ÍÅS—Ë•¸ìûÑ&懬âِŒ'prqD‹þmDOéR)f”T‡-‰!ŠÏô+ ¢ô§Ÿ±ál­œ~Iô¬:uQ¿ßœtóT)U®²+=R<c»Yƒâé†æW®Âyw ýŽ½]҃¼þHŽ,$?J=
9¢žŒ|F¯
Øî‹D|+‹Ê¥f‡>b”©«g)v¦dÁzýÛ'Hû³ÔÐ_¨1Z¬%ùwÒ"‡<öL3-78M‡†§WĎª¤ßZÕ°‚
.£Ñ®a©fªI%^-½æÔ§¢–WUŒB­¤?ÆÊ´uÊØÍi­jÐl€"eÖA?$(qk¥b7NïT¥û,ƒ:ÝkÆÚF:(ó4}²#ïc
+dטñj§L©Ï¯BÁ?qâø|M.M™4˜ŒÜQƒö”Î8½^©†(‹Z‘þKÀ)§j¡™dYh&דï@
+à{e‰;š§/Æû
 ÎsþKџnÕTþÙd’õÑ?ìÇz¿ÑÙÛp*?6)Bø:ä£@%¿ãQQǧòOÿZþ„Q_E)l/«ž¢^›;âßû¢àñ)vZÅæ¡É%0Å~„ÖIˆ£æ´P˜ õ€
+À*@{ÂŽà›¨›S¢ÑÅ`O¡n.Š¦huÓl<¨h9 Ð
hì{Ð[ÙëÀݗⳀ»Ù |`6CÛt¥±[Ð:þ'àwp	@X\%šø·¨G™üŸÐ´M݀.®ÌëÀLP‰)óuÄÄÿ
”š{~Ý0'èaΏ®ÿ¢`¯@/ô‹Å`ñ€_ßT$h;`ùvüƒø[üÉ/ˆ'¸Mñ+1X53¢¡¥Àö£6	{Qs>„{>ÊMP/ÀÈ
d¢	ûv¦5±¢]g`Øc܊ÖS¡&ê£x=P'Ѐ`5 °ìu@¿Ä:P]p>ó
+j …Ú%¼— F̏Q;Ï£Fv߀0¿‚¶ý[<š1ÀŸí̋֋h9{'ÚƼf‚å­A4Aüπ?Î=¯Gç3ëãÿ:8È^ŒÎ[„É%ì$0'Ñ
¼ݳÌ«ñŸ3Ð%]‚*Vf(þq*XêZ„eKØIàå(Œ
æ*fjK P“|Qÿ*jã>&¾ŠP'óCÈç/zw¼Š?¯’=¯bŒ{ø‹Àü,˜+aå"$ìù=‹pù"$ìçÜïÈ!Œú¿/š÷‹ý-
§ˆW	0»PÝb0ÇâÏ.Ø×HÈFíÔ[¨†z+ŽñO@'À
t
¶.Ãn˜çÁ½eRÆ+’`î>ÔP.í”ü{œúÕÒ§Q
¿*Ö<BýRü/u ŽEˆœaW	ùàÙÿ'
ꢟC5ñ
qƅäñ¿>N>sw°eñõqÜN?ŒvÓÇ£^ú”;‡v³Ó_œ
íZÑnþg_Ïq@g‚bà|Ú¥Ø3×¢ýÜ,ºz1˜½ñ7˜ÃÈ ÃÈd!.
$Ñ	´›éE0g£
ôOÑôÑmt-ºG2߁î£^ˆÿÌ÷Ò?G·QÛѝÔHü÷ôMèvjºmC·Ó¿¼n‚ö þÏtõMü½Àw˜?¡×èýh}	ºš.CçÑ«@\ÃJÙã^û4§> ×œi'Åïs‘ìNÝعÈîVÀ‡g˜;
÷Iöý€mVÂøw°kì”ìo`ðÜ8kΏóu
@'Ù=¸Ÿ¾¾¿p»d÷{À»4Èô‹€ÇÁí€_#|Ø¿ïäS¯€òà5HK;=Çß¿CŒ
+ô#ê“øûtþœ¼r–A˜è_A?&ɱ—pŸFä…Ø /Ly!ö4–$9à†ø«ÉþxŒHç¥o ïfŒÿ-Ñ?˼»è*ÞaBÊ#ômèו\gìï‰>qîéÏpôe±Hm«ÔoÅ^aEÛH¿{ú¦URôëøSÉ~‡¹‰¤/‰W°gÃ3îC6Æÿ)õ¡‹˜‹bw
ÕrÀ)Ü®sëÐ-৞}4¾
+ú€.	åPΗÅ?r}6C8ænÆ ¿‹Š Ý­‘p6Š²µh˜.@ýtAüຠö'ܦ0A[Õ
aÞ}
+
rƒ
+çڄaıúøàÛVÈÿNÆ|Z¦ȹ
+hïKP¤{w?Ô­ëÐúr)/Ìߤ¼.¡9ôš£J
<ÊàKT<~RÊÏv´^ÊÏqÈŒ=GøPŠì¸Š„¶ç{ˆ
¹§;‰„<؁e½9yë7ñ‡ùO
?!r£ÀÌËqì¿H>cY5){±eЇc<‰^ä“¼æœ ßþ0žãÿ‚V	n0ÿ
ÝÁ[A®¶#7ۋÆ9øµ;þȹ·³Aw€Ìˆ¤²ñGèÿ°œd„üÄ@y8?¾7EÊáΎÿ
¨š½Þ%qVcù…ù.”[¿_*/{2É-€³$Y£I’»’rÄ­ ëAÍdà C*Hya¿ŒZØ!țOÑWù4ÔÂ/‡ç­èî"ˆÛ€ß‚ög´ƒ_Ð&À»Ø>t!äâ)·ÂÄýx=¼ÃeëÇàW3Èph÷j0e‹¥v·.µç[â9›I´¹¸\™èÇ¥>í	èϬ)þ„ó7„x¶ú±`¢¯ò²“}”M,c@ƒû9¾d%©m†¾ç‡PÞî‚0¡íf›íûó¨»á{a,҂Ör«P?s
0WB?õ%ÍA¼¿ÿۊÚqßÌÐNfҖ”Õ»1è[ =¾ú¿[Ðó8úàÔ0o£wémèÀf:
}AÊñ
¸LÓéhÊyw1j†òýà  ¸òè÷€
§7ào@ö»™~íìܸžµhƒq
}pcï¦ß‰•ùú€9EÉz•~½HO¢€
æôI§]¨FwžNRæT|Øÿâsà)zMÓ#ñ_ÐS(DOÅ_¢¡
úPü·tÒQèÛ[À¾žGÐeàîà®ÜýÜíwŸ€_ÿüÐXÎ>‚¾ÍV¡ÛÁ|
àzêú„)FŸpÐ'qÐ7	Ÿ ß*%j俉^Á€ñçIîè-î!t%¤A<ÿÄA­`Ÿþ˜z Í2‚ùûðî<^óð¢Ì-Ì_Q:sr2ρL{¤ý6(×J4,˅vøÀÿ
+ʬ.g£ô÷ÑÆÌGñ·ÙÕÐFÿ$þ3¶`f ”@Ù*öM
m£mxYuüo€ã€“ð|`/ žÿu`+ý%´ž¹ÊÑ$Ò3Aû1åðI´Yjqùx!>Ë
«
Z€`LÐNÀ!@Àñ;â÷%?¤‚þIÃüÉñۗˆ_!„ß>?³ª‘àJÄï?”ÅøÐSÔ?¡l<‚ÑßD€,q}ºÊÊw¡_~–þ5È)ï>D/
}‰~=F=ƒ^ŒÁ·|k¤‰¿J3þ
+ý‹ø÷é{âÇÁ¾åè_CßûàC¤;ýFü|g¡ž‰?Iß
+㮿£Ýn†¾¥ÊLcüº± »(éµñßÑíPžn…2òw4Cw£AºxÙòS#Ȇ]èp÷ez-ÚI·£qúÑØïC<Æm
,	š?Íõ^A[$ìDíܓ€;
ÇQwôCw²ão‚<×+ë@½Ü¨O8yvJÂV@! Ðh
4
Öü&ÜïQË¡üÐe÷ôÉøn°_ƒå
,à>“ïGw°«âßfÍhêÜW
7^‘ FßÔÔ²$Ut@\†nƒ±e01ûÒ¹ôUÈè§
?|%ŸN}0ª’ÀÝ-õ@¢’ÍÌC˜â‰ µ‰ å‰Ëè<Ê
„T¿:šìÌÞ¼ˆh͟ƒw	t1ý#KèGȜŠìyX@ü²¸
%€ÄÑr`!¬ÏØ!]Ž„œm¹@uÿs!¼ûSpÝ<|-ᇖË’·p(¯-4p“þò™Èø%B™o&ðAò2È'àüü¿Ž,î³ .g€òšõ0àX
+~9Ðs¹V„òòÎDxüLD˜GA&B…P¦a$Wx!àæ>ÅÞÿo£d拡ô£y”A»XöG„ÊAR/w&P´wÎcÙwçQñ·yTZÕÐVÕt¦``!¢u€uȗè%€¯
f¢ö=‚zhSChùOjWä,Dó)xèL´f´þ÷¡ýÀ=(£ío&ðáÒè€>®3r&ºêŽ&°.
ð»'‰C«€W«ïùïŚì™Çڂ™ÇºA‚õÞüœ`Ãá…Ø8J°©2 ´ù:‚-Õ)¸ý‹akc§þëØváÿ࿽³ÿƒÿÁÿ Û¡^l¿‘ ÚϾ?~>vlC¨Æ	ý {€<´ÆZ;á»AY
+¾‡ÐЗSðu„ÎÚ
€>i×Ô<†
#©øÁ(ÈkcFÀ…	¼M0^À×
ÚÐÝðÍîc {Mj
ПLA[?}B{õ_gÃøoÐs@~Øýåþ7΃1Ð
è‡@ŸqÆ/çÿmþ|‡	.†¾ùÒÊ~ŠÐåyWÀXí*HïUw|d¥«An¹d–kÎ'€ þC\áÿÿpäç^Dè&èËoþ-B_9åàÛ­ÐÏ~ÊÜmŸw°	À¸÷({w,û?äåÖ]üçð
È«»A~½ÊĽ›º/ú_Ä=	|7—ÆýÊÿPžî_7¬	€,þ ¤ó¡áy|êÔ7ŸAèáÎã[_kþAá1èM$ G4Ò¢0‚Dþ{ª±Òžš\ڏ$]]ð·CúÅf
+©¥'l¦‘’ÉN˜TÍ°	3‹œx¦F2sÈÊÔ%Ì<ØoH˜ô)³'a–¡l棄YŽ¼ìx¬ oŸKDkØkf¥´¦JÌ*úfN›0«Ñ°p_b?ødƹ½A‚¬1a¦/¿?afG~cÂÌ"µüŽ„™CJùã	3ö/$Ì:OþzÂ,C&…"a–#­¢-aVPsa‰(¤Ø”0+Áý¥	³ŠjS|-aV£ñˆ	ÅÊ|&fÂgb&|&fÂgb&|&fÂgb&|&fÂgb&|&fÂgb&|&fÂgb&|&fÂgb&|¾yQ
ŠÀ	˜ÚÑêChMÐØՃiK¿½`3¦Q”ojÑ0ü{Q7ØíDƒðnRzêÚ®÷ÀïpYß
ƒ›í`7.†$w½€ðk‡ävž&ÁnTzG¾‚x
½àn|ØO{Á4aa7ÓàãØ÷ÃŽó4|½ޏBl°/c	_§ÀÅH"LìÂi“ÂÄ¡LJii–Ò:68Ó`ß/}1!ÙK±žJ¤£ÞäH>H6ҏ½À#bŸeü–86žˆå(،H¡?q:§Rb€C—ÒBøä6‰;iá»9DZ
·½þ”ô„S<5—„g$¯÷ÑDºÆ$Þn—\ÎÇ85E˜kgKߑTï‚ç<©<¤æf@òmDòaŸÄ‡éDΧòçI¿œ~’/RiÀ”„ˆóÚ~ŒÏ¥†ÄqgÂÍ$<“ð}
+RArhÏ\.õJe¤lG¤+Yšû &½Rø}‰ðó–(õËÎH'ɟdþ/›«5ÅhM¢
%Ê[>ø·¿Ï]ðýÒ5¢?Q¶IJ{iÛ)½%qíOpLJTªqZvIù™üfé·ÿ©Ú=_’H¾­†§!)8ü)%Sò8œˆÁXJ
+úurJJe¿TÎÛ°.Z”ò?Üìüo’bE¾‚ÿqàpþ÷JÿyRý_ó<Éw¬9|
+ÊŽÿN)ãàÃ>°Å¹; ¥ת…¾&íqËBr`לë¥8“½O*‰“R§¤:7)µäk¯”\_û¥Ò6$…A8´]ú6ɽåÀ¿6h-É·)oH]ß!ñd¾þî•Âê“ê÷Rá’gì¶JÑ´ÄÃsõa‡ô·8$É:0.¥t4Qˆ_ýÒ/®Õ‹Óß“Ö#_eI¥sÒÕ?WŸÏŒÕè>qÍûžlÁ½‰6˜”ž¾má™iŸ/¯ãU‘Â
œ’Ò#$KýÄ\ï²Cj_G¥v¶÷sSJøÜ»€§ý‰Ò¿¸`®â’7-}¹Cj«pjúçüÁ.‡¥öî?Ê¡ÿ[õb¾N„¥Øà:@z©<)¯ÆÑÙ÷{"‘oûPßÄØäØÀ”·~lb|l¢wjhl4Ï[;<ìíÚ985éíîŸìŸØÓ¿#¯¾wxhûĐwhÒÛëÛÑ?1êìôÂû¡
ï@ïÈÐð>ïÞ¡©Aïäôö©á~ïÄØô莡ѝ“Þ1p:Õ?_ŽîðöMŒöOLæy›§¼ý½SÓý“Þ‰þÞaïЄÑ7™ãé…ôõŽƒ22=<54^ŽNôO€ËÉþ)ɃIïøÄÄG|Û너{‡FÆ{û¦¼C£Þ)œˆ|ⅰƼۇvJ“€¦úϞ‚‡võçyÉLzGzG÷yû¦!ñ$ÞSƒ~ÿ^ïD/¤eb’
öŽx§Çq0àãN°™:œOA‚öà$õz÷öNŒ°0›û{' býys¬_–҃ӿgMñ`$ʛŸ)H¼Ï%ïS2¢¸
öBh;‡p¬ú!š½;úGz'vyÇð›”ǁ¥³[b¤mõèÐ|ß3Õ;ERƤú '§&†ú'óÚ¦û‚½“YÞýÞ¦‰1x;55¾,Þ»woÞHÒó¼¾±‘ðÔ¾ñ±½ãƒûÂ}Sc£S“	§Ø<Ð	؅ݭ›FïóNOöC$ Iøµ·òµbdh
+Ghû>)zËW·ÕÂÛ	é
r}Ç4Éß½ƒC}ƒ)ßížÞy1æÝ149>
àŸ}àªt*ϛ{lŠGp(ËÛ?²4ïÕhÒñ’1’œãìŸöô‘R8ºÄׄ_R‚C
+TÌú	\]vŒíëM
âÜKb
+ŒŸË±é©ñé)`ûž¡¾~ìf°x|Q‚¾H^H9ÞÑ?ÐU*¯wrüìGåÌ,}Ό»Ú3Kï#äì·d/!{fÜˀL2EœLθ+€L̸+ì&dœ±wQBFÈÄìšqÕ9‹¡WÁW=„ÒOÈBúÈÛɽ„l#ﶲeƹÈfB6²‘
„¬'d!k	YCÈjBVÒMH!„¬$¤cÆÙ¤<µÒJH!̈́¬ ¤‰FB–Ò0ãhR?ãh
RGH-!ÑG+Bªgm@ª©$¤‚e„ôRNü,#¤”xVBH1!EÄÏBB
+Èwù„D	’GH.ñ,‡|"ße“wY„		—™„dÒ	I#ßù‰K!^B<„¸	qÍØ;€8	qÌØW±b#ÄJÞY1K!FB䝞±Ô’'
!jb©"DIˆHˆ‚ùŒ­ˆlÆÖD „'„#„%NòDB‚$BÅ	‰rZú€:Ež>#äSBþEÈ?	ù„ÌX{€ü¿ÍXW
ù+!!äcBþLœü‰?˓„|DÈù8ù=!ò>y÷!¿#䷄ü†8y—_Ë_ò!orbƲÈ/	ùŌe-Ÿò3bùSB~B,ß"äDŽ¼Iȏˆ“’§§7yX¾FÈqB^%äû„|¸|…ïËÿEÈ˄¼Dȱ3´KÔwfÌ5@^$ä…óF ÏòmBž#äYBž!ä(!O“ïž"d–X>IÈ„<NÈc„!d†GÉw¸|‹<=LÈ7‰“‡y¹ŸûÈw÷’î!–wò
Bî"äNBî ävBn#äë3¦í@n%äk3¦> ·Ì˜vùꌩÈWfL@n&ä&Bn$äBr=!×͘z\Kü¼†øy5ñó˄|‰x}ùàJB® ./'N.›1­r)ñìâÙń"./"¾\H>¿€ó	9HÈ
BÎ#d?!çrΌ	Údj	álâõ^Bö¦I\¦™$áMÏw2NÈ!£„Œ2LÈ.’”³HxC„ΘJ€ì$d`Æx!þ#.»;fŒôÍñwۉeïŒ1
+d±ÜJ,·ÌÙ<c¼ȦãÅ@6Π¦6ÌÜÿ»š3n¢Šâø¼LÙ2™L¦!iKZ^
K
+¶*2ˆÚ±À°„n´Ú"­BAI2"K¤¢œÃYÜDpAÔq	#**
+î»ußP©û.¨¸/ñ?½~æ«:Éo~ïÞܗ¹3'9ïCN†{ÿýîQ³öCÓIÓÜ0–y&Ü0ÖwÖDj$MuÃXæYƒÆÂÎêIun¾×u­›oA5¤)”L&Sri"i‚›u“YT2ž’ãHc]}TíêޗòdWo†LWoª\½:‰t¢«{ŸÖHcHǓF»z2\½å꣡ãH#]Ý;бt cHG»ºw+I®î]È£H#¨—á¤rj)N-
#•QKG’†RCHƒIGфéò0j©”šàt¼¤ª,&ÅhúR©*HQj0BêO}†é@ù$æ…H)HR©$@‘â†fB~7ÔõsCíP_RRoR/ªÌ£J™’>#IfΡî/øOðøü†Ü¯˜øÆ?ƒŸÀà 6‹ÿ¾×fóï´9üØ¾ß ÿ5ø
+¯}‰øð9ø|Šü'àcŒ?‚? ®ñ>ð>x¼ö‚w‚óøÛÁþx¼
^Gî5øUð
+xñKpx¼žρgÁ3àiõþ”z&RƟ€WËùcÈ=Šñ#êBnæö¨ønu>Xíàá•]j%<î,æ;I~_ Åï
¤ù=`¸±oGMÜîw€Ûn·*çñ[”e|›²”ßoUVð›”¿ùÀõ`Ø®›Àµ`#¸FίWù·ñ+ý[ùðåà2p)¸ÄßÁ/ö¯âüùzÿ&¾Î¿™¯Eþ"°ZÌ/”
~
3ø*Ñ)Îw:ÅJ‘ç9¡d˜’‰e™å'³7cÖôö¯ËÄrg™X*–ˆs%âÇyv;mËmæØlœÍ*læ“ì]jˁ´HŠ”“R²>ٙÌ&óÆd“ÝIŸ”d~ïvóÉØ@Ë»íՊ¤²‹Eâlg‘8kîB±mÍ7æ‰gž˜ķ;sÄlc–8Í8U´3E›3Sœb´ŠN«h1šÅtÔO3š„pšD£Ñ ¦:
¢Î¨µÈ×	1ÅIˆÉÆD1ə(&–S–ŠCÅ¥ÅrÈk ¶H1V]3cݱ±<)–í‰ÉùÚ>ÀW¦±±uElQÑÊ¢õE²VØUè3ËÊ-­ «`_Áþ‚¼°YP6’¢¡hiTŽxç­i²z\5Ž\9²ç\k¢ƒ†XZ„iñç&éÝú
]Žìu…|šÆ4-§ùL
åZ}Þ.”Í`å(KS¹êóv9UŽš*2Þ;
Ô7YšÂŸ¨R꟩TµLex…%ɬ”1‰… ¹/jw°·ä]Ìû¬—Ä؆íMñxbgŸÜÔD¶_ýŒ,[“Üèí͆Ölï5YI´ÎhÞÎغïö}MÙþ‰†VŠW¯]+•T'²%Í®¼eKIuK"ÛéM³gœóÆJZâm);§Û°kK¥ã=ODÌö¢¸—ôž©4bïa÷ÄRü•Aí)léréCOúßnìßnà?¾¶·I’ô7h	D(
+endstream
+endobj
+15 0 obj
+<<
+/Widths [506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 506 506 506 506 506 506 506 506
+506 506 226 325 400 498 506 714 682 220
+303 303 498 498 249 306 252 387 506 506
+506 506 506 506 506 506 506 506 267 267
+498 498 498 463 894 578 543 522 615 488
+459 630 623 251 318 519 420 854 644 654
+516 664 542 452 487 641 567 890 519 487
+468 306 384 306 498 498 291 514 514 416
+514 477 305 514 514 229 239 454 229 791
+514 513 514 514 342 389 334 514 445 714
+433 447 395 314 460 314 498 498 506 506
+249 498 418 689 498 498 395 1038 452 338
+866 506 468 506 506 249 249 418 418 498
+498 905 450 705 389 338 814 506 395 487
+226 325 498 506 498 506 498 498 392 834
+430 512 498 306 506 394 338 498 335 334
+291 538 585 252 307 246 422 512 636 671
+675 463 578 578 578 578 578 578 763 522
+488 488 488 488 251 251 251 251 624 644
+654 654 654 654 654 498 657 641 641 641
+641 487 516 527 514 514 514 514 514 514
+754 416 477 477 477 477 229 229 229 229
+525 514 513 513 513 513 513 498 529 514
+514 514 514 447 514 447]
+/Type /Font
+/BaseFont /Calibri-Italic
+/LastChar 255
+/Encoding /WinAnsiEncoding
+/Subtype /TrueType
+/FirstChar 0
+/FontDescriptor 7 0 R
+>>
+endobj
+17 0 obj
+<<
+/Length 9259
+>>
+
+stream
+[]
+ 0 d 0.827 0.827 0.827 RG 0.827 0.827 0.827 rg 538 808 m 57 808 l 57 810 l 538 810 l h f* 0 0 0 RG 0 0 0 rg BT /F1 7 Tf 1 0 0 1 57 820 Tm (Beispiel-Rechnungen für ZUGFeRD 2.2, \(c\) FeRD 2022) Tj 1 0 0 1 494 13 Tm (Seite ) Tj 1 0 0 1 513 13 Tm (    von   ) Tj 1 0 0 1 509 13 Tm (1) Tj 1 0 0 1 534 13 Tm (2) Tj []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg ET 65 758 m 547 758 l 547 757 l 65 757 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 753 m 258 753 l 258 752 l 69 752 l h f* []
+ 0 d 258 737 m 69 737 l 69 738 l 258 738 l h f* []
+ 0 d 260 753 m 543 753 l 543 752 l 260 752 l h f* []
+ 0 d 543 737 m 260 737 l 260 738 l 543 738 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 735 m 69 719 l 258 719 l 258 735 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 735 m 258 735 l 258 734 l 69 734 l h f* []
+ 0 d 258 719 m 69 719 l 69 720 l 258 720 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 735 m 260 719 l 538 719 l 538 735 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 735 m 543 735 l 543 734 l 260 734 l h f* []
+ 0 d 543 719 m 260 719 l 260 720 l 543 720 l h f* []
+ 0 d 69 717 m 258 717 l 258 716 l 69 716 l h f* []
+ 0 d 258 701 m 69 701 l 69 702 l 258 702 l h f* []
+ 0 d 260 717 m 543 717 l 543 716 l 260 716 l h f* []
+ 0 d 543 701 m 260 701 l 260 702 l 543 702 l h f* []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg 65 669 m 547 669 l 547 668 l 65 668 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 664 m 69 650 l 258 650 l 258 664 l h f* 260 664 m 260 650 l 538 650 l 538 664 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 648 m 258 648 l 258 647 l 69 647 l h f* []
+ 0 d 258 632 m 69 632 l 69 633 l 258 633 l h f* []
+ 0 d 260 648 m 543 648 l 543 647 l 260 647 l h f* []
+ 0 d 543 632 m 260 632 l 260 633 l 543 633 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 630 m 69 613 l 258 613 l 258 630 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 630 m 258 630 l 258 629 l 69 629 l h f* []
+ 0 d 258 613 m 69 613 l 69 614 l 258 614 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 630 m 260 613 l 538 613 l 538 630 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 630 m 543 630 l 543 629 l 260 629 l h f* []
+ 0 d 543 613 m 260 613 l 260 614 l 543 614 l h f* []
+ 0 d 69 611 m 258 611 l 258 610 l 69 610 l h f* []
+ 0 d 258 595 m 69 595 l 69 596 l 258 596 l h f* []
+ 0 d 260 611 m 543 611 l 543 610 l 260 610 l h f* []
+ 0 d 543 595 m 260 595 l 260 596 l 543 596 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 593 m 69 577 l 258 577 l 258 593 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 593 m 258 593 l 258 592 l 69 592 l h f* []
+ 0 d 258 577 m 69 577 l 69 578 l 258 578 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 593 m 260 577 l 538 577 l 538 593 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 593 m 543 593 l 543 592 l 260 592 l h f* []
+ 0 d 543 577 m 260 577 l 260 578 l 543 578 l h f* []
+ 0 d 69 575 m 258 575 l 258 574 l 69 574 l h f* []
+ 0 d 258 559 m 69 559 l 69 560 l 258 560 l h f* []
+ 0 d 260 575 m 543 575 l 543 574 l 260 574 l h f* []
+ 0 d 543 559 m 260 559 l 260 560 l 543 560 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 557 m 69 541 l 258 541 l 258 557 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 557 m 258 557 l 258 556 l 69 556 l h f* []
+ 0 d 258 541 m 69 541 l 69 542 l 258 542 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 557 m 260 541 l 538 541 l 538 557 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 557 m 543 557 l 543 556 l 260 556 l h f* []
+ 0 d 543 541 m 260 541 l 260 542 l 543 542 l h f* []
+ 0 d 69 539 m 258 539 l 258 538 l 69 538 l h f* []
+ 0 d 258 523 m 69 523 l 69 524 l 258 524 l h f* []
+ 0 d 260 539 m 543 539 l 543 538 l 260 538 l h f* []
+ 0 d 543 523 m 260 523 l 260 524 l 543 524 l h f* []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg 65 491 m 547 491 l 547 490 l 65 490 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 486 m 69 472 l 258 472 l 258 486 l h f* 260 486 m 260 472 l 538 472 l 538 486 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 470 m 258 470 l 258 469 l 69 469 l h f* []
+ 0 d 258 454 m 69 454 l 69 455 l 258 455 l h f* []
+ 0 d 260 470 m 543 470 l 543 469 l 260 469 l h f* []
+ 0 d 543 454 m 260 454 l 260 455 l 543 455 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 452 m 69 436 l 258 436 l 258 452 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 452 m 258 452 l 258 451 l 69 451 l h f* []
+ 0 d 258 436 m 69 436 l 69 437 l 258 437 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 452 m 260 436 l 538 436 l 538 452 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 452 m 543 452 l 543 451 l 260 451 l h f* []
+ 0 d 543 436 m 260 436 l 260 437 l 543 437 l h f* []
+ 0 d 69 434 m 258 434 l 258 433 l 69 433 l h f* []
+ 0 d 258 418 m 69 418 l 69 419 l 258 419 l h f* []
+ 0 d 260 434 m 543 434 l 543 433 l 260 433 l h f* []
+ 0 d 543 418 m 260 418 l 260 419 l 543 419 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 416 m 69 400 l 258 400 l 258 416 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 416 m 258 416 l 258 415 l 69 415 l h f* []
+ 0 d 258 400 m 69 400 l 69 401 l 258 401 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 260 416 m 260 400 l 538 400 l 538 416 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 260 416 m 543 416 l 543 415 l 260 415 l h f* []
+ 0 d 543 400 m 260 400 l 260 401 l 543 401 l h f* []
+ 0 d 0.867 0.867 0.867 RG 0.867 0.867 0.867 rg 65 385 m 547 385 l 547 384 l 65 384 l h f* 0.808 0.945 1 RG 0.808 0.945 1 rg 69 380 m 69 366 l 164 366 l 164 380 l h f* 166 380 m 166 366 l 538 366 l 538 380 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 364 m 164 364 l 164 363 l 69 363 l h f* []
+ 0 d 164 308 m 69 308 l 69 309 l 164 309 l h f* []
+ 0 d 166 364 m 543 364 l 543 363 l 166 363 l h f* []
+ 0 d 543 308 m 166 308 l 166 309 l 543 309 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 306 m 69 277 l 164 277 l 164 306 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 306 m 164 306 l 164 305 l 69 305 l h f* []
+ 0 d 164 277 m 69 277 l 69 278 l 164 278 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 166 306 m 166 277 l 538 277 l 538 306 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 166 306 m 543 306 l 543 305 l 166 305 l h f* []
+ 0 d 543 277 m 166 277 l 166 278 l 543 278 l h f* []
+ 0 d 69 275 m 164 275 l 164 274 l 69 274 l h f* []
+ 0 d 164 219 m 69 219 l 69 220 l 164 220 l h f* []
+ 0 d 166 275 m 543 275 l 543 274 l 166 274 l h f* []
+ 0 d 543 219 m 166 219 l 166 220 l 543 220 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 69 217 m 69 188 l 164 188 l 164 217 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 69 217 m 164 217 l 164 216 l 69 216 l h f* []
+ 0 d 164 188 m 69 188 l 69 189 l 164 189 l h f* 0.949 0.949 0.949 RG 0.949 0.949 0.949 rg 166 217 m 166 188 l 538 188 l 538 217 l h f* []
+ 0 d 1 1 1 RG 1 1 1 rg 166 217 m 543 217 l 543 216 l 166 216 l h f* []
+ 0 d 543 188 m 166 188 l 166 189 l 543 189 l h f* []
+ 0 d 69 186 m 164 186 l 164 185 l 69 185 l h f* []
+ 0 d 164 94 m 69 94 l 69 95 l 164 95 l h f* []
+ 0 d 166 186 m 543 186 l 543 185 l 166 185 l h f* []
+ 0 d 543 94 m 166 94 l 166 95 l 543 95 l h f* 0 0 0 RG 0 0 0 rg BT /F2 14 Tf 1 0 0 1 65 779 Tm (Handelsrechnung \(380\)) Tj 1 0 0 1 318 779 Tm (13.06.2018) Tj 1 0 0 1 199 778 Tm (   Nr. ) Tj 1 0 0 1 230 778 Tm (471113) Tj 1 0 0 1 273 778 Tm (   vom   ) Tj /F3 10 Tf 1 0 0 1 70 742 Tm (Währung:) Tj 1 0 0 1 261 742 Tm (EUR) Tj 1 0 0 1 70 724 Tm (Liefer- und Leistungsdatum:) Tj 1 0 0 1 261 724 Tm (03.06.2018) Tj 1 0 0 1 70 706 Tm (Bestellung:) Tj 1 0 0 1 261 706 Tm (2018-471331) Tj /F2 10 Tf 1 0 0 1 70 654 Tm (Verkäufer) Tj /F3 10 Tf 1 0 0 1 70 637 Tm (Nummer:) Tj 1 0 0 1 261 637 Tm (549910) Tj 1 0 0 1 70 619 Tm (Globale Nummer:) Tj 1 0 0 1 261 619 Tm (4000001123452 ) Tj 1 0 0 1 329 618 Tm ( \(GLN\)) Tj 1 0 0 1 70 600 Tm (Name:) Tj /F2 10 Tf 1 0 0 1 261 600 Tm (Lieferant GmbH) Tj /F3 10 Tf 1 0 0 1 70 582 Tm (Anschrift:) Tj 1 0 0 1 261 582 Tm (Lieferantenstraße 20) Tj 1 0 0 1 261 564 Tm (DE 80333 München) Tj 1 0 0 1 70 546 Tm (Steuernummer:) Tj 1 0 0 1 261 546 Tm (201/113/40209) Tj 1 0 0 1 70 528 Tm (USt.-Id.-Nr.:) Tj 1 0 0 1 261 528 Tm (DE123456789) Tj /F2 10 Tf 1 0 0 1 70 476 Tm (Käufer/Leistungsempfänger) Tj /F3 10 Tf 1 0 0 1 70 459 Tm (Nummer:) Tj 1 0 0 1 261 459 Tm (GE2020211) Tj 1 0 0 1 70 441 Tm (Name:) Tj /F2 10 Tf 1 0 0 1 261 441 Tm (Kunden AG Mitte) Tj /F3 10 Tf 1 0 0 1 70 423 Tm (Anschrift:) Tj 1 0 0 1 261 423 Tm (Kundenstraße 15) Tj 1 0 0 1 261 405 Tm (DE 69876 Frankfurt) Tj /F2 10 Tf 1 0 0 1 70 370 Tm (Bemerkungen) Tj /F3 8 Tf 1 0 0 1 70 334 Tm (Bemerkung) Tj 1 0 0 1 175 338 Tm (Rechnung gemäß Bestellung Nr. 2018-471331 vom 01.03.2018. ) Tj 1 0 0 1 175 329 Tm (      ) Tj 1 0 0 1 175 320 Tm (      ) Tj 1 0 0 1 70 289 Tm (Betreff: ) Tj 1 0 0 1 175 289 Tm (AAK   Price conditions ) Tj 0.502 0.502 0.502 RG 0.502 0.502 0.502 rg 1 0 0 1 144 245 Tm (Inhalt) Tj 0 0 0 RG 0 0 0 rg 1 0 0 1 175 249 Tm (Es bestehen Rabatt- und Bonusvereinbarungen.) Tj 1 0 0 1 175 240 Tm (                        ) Tj 1 0 0 1 175 231 Tm (      ) Tj 1 0 0 1 70 200 Tm (Betreff: ) Tj 1 0 0 1 175 200 Tm (REG   Regulatory information        ) Tj 0.502 0.502 0.502 RG 0.502 0.502 0.502 rg 1 0 0 1 144 138 Tm (Inhalt) Tj 0 0 0 RG 0 0 0 rg 1 0 0 1 175 169 Tm (Lieferant GmbH                                ) Tj 1 0 0 1 175 160 Tm (Lieferantenstraße 20                                ) Tj 1 0 0 1 175 151 Tm (80333 München                                ) Tj 1 0 0 1 175 142 Tm (Deutschland                                ) Tj 1 0 0 1 175 133 Tm (Geschäftsführer: Hans Muster) Tj 1 0 0 1 175 124 Tm (Handelsregisternummer: H A 123) Tj 1 0 0 1 175 106 Tm (      ) Tj ET 
+endstream
+endobj
+18 0 obj
+<<
+/Type /Page
+/Contents 4 0 R
+/Parent 2 0 R
+/Resources 9 0 R
+/MediaBox [0 0 595 842]
+>>
+endobj
+19 0 obj
+<<
+/ColorSpace <<
+/DefaultRGB [/ICCBased 14 0 R]
+>>
+/Font <<
+/F1 15 0 R
+/F2 3 0 R
+/F3 13 0 R
+>>
+>>
+endobj
+20 0 obj
+<<
+/Type /FontDescriptor
+/ItalicAngle 0
+/FontFile2 5 0 R
+/Ascent 750
+/FontBBox [-492 -193 1239 952]
+/FontName /Calibri-Bold
+/StemV 0
+/CapHeight 1220
+/Flags 262176
+/Descent -250
+>>
+endobj
+xref
+0 21
+0000000000 65535 f
+0000000015 00000 n
+0000008990 00000 n
+0000000185 00000 n
+0000001373 00000 n
+0000009055 00000 n
+0000045986 00000 n
+0000046172 00000 n
+0000046368 00000 n
+0000084620 00000 n
+0000084734 00000 n
+0000085792 00000 n
+0000084841 00000 n
+0000085892 00000 n
+0000087075 00000 n
+0000128659 00000 n
+0000089731 00000 n
+0000129849 00000 n
+0000139165 00000 n
+0000139270 00000 n
+0000139385 00000 n
+trailer
+<<
+/Root 11 0 R
+/Size 21
+/ID [(üF¥àFe5;\fµÖF) (üF¥àFe5;\fµÖF)]
+/Info 1 0 R
+>>
+startxref
+139581
+%%EOF
+1 0 obj
+<<
+/CreationDate (D:20220218171346+01'00')
+/Producer (intarsys PDF/A Live!)
+/Creator (intarsys ZUGFeRD Toolkit 2.1)
+/ModDate (D:20220218171346+01'00')
+>>
+endobj
+22 0 obj
+<<
+/Desc (Factur-X/ZUGFeRD-Rechnung)
+/UF (þÿfactur-x.xml)
+/EF <<
+/UF 23 0 R
+/F 23 0 R
+>>
+/Type /Filespec
+/F (factur-x.xml)
+/AFRelationship /Alternative
+>>
+endobj
+23 0 obj
+<<
+/Type /EmbeddedFile
+/Filter /FlateDecode
+/Length 4005
+/Params <<
+/ModDate (D:20220218171346+01'00')
+>>
+/Subtype /text#2Fxml
+>>
+
+stream
+xœ½ZÙnI–}¶ýC´€AU
Ej±e¡ìm-\ry$Ù=¨·`fŒRf$+2R”ôÔ2¿øêÉoü“þ’9÷Fd2I¦hºË3F-d,w9wúç¿ß¥‰¸U6יyñC·ÝùA(e±6Ã?|¸>Ý>üAüýåæÆÏÛÞ'f˜è|$bG‰Ô©²¢¯’lÒÞÞGÞî¡0Ãܪhä”ØÜøíÃÙ©º<ÇÒ)3Èl*øèىÝön»ÓÝýv;»»›¯”ÎÇZ%ՙú&‘›¨èFÄ*§™-Ò\¨DÝ8›H4—àjÀ^«Âa!‘&n‰‰J¢nÈTìuÛâbúÙ>ˆÝN·#
+ã BŒ{¶¯´Ë‡*UÚà¦81˜~±`9ÑÖù•DƒI6‘‰#6ª->¶ÅP
íô‹‰•“Âƪ%tîDѲ
¤”¸¢Ë:_˜X\Õƒè­,“Тeƒ2ÊÔQÊÁš%ȝ-n\aq
›s
+—7d‘;üd1`}Î@<NäPҖy(àÈz7V§Ú€¢‚ض@JZì0Rûš°Ì’l¨ÁåÇýó,ù¯þ÷Om¶Ë±ÌE“©
ØJHv!§Ÿ†²¯¼ñè\žM²Q">Œ¥à#˜©ÀiÒaú'‰îQ7uØ
ŒUZ<ÃégòHœ‡áÀĵÅ(À°õµr°s’I
+uF„Ưv(
£tð3,­dIfß_ôƒ2Þ3È´ÁÝY§ÂŽT_Yöü ,2ýâÈl
œí9?b 5Œ@ü¡òacjÆÚÜX4—¯…'øb&€Í»Ö
k4Ãù¡°â<'ðmã‚ÛÑfƒ½rv]m„YÀñ»š(
“Uâ<ëS™çÞ²o‹A_ÚD“ɤ=P6Þ6ʵcå…:Oʼn6*!|)µš~ruäq“éçQ
+G¸ôb?Lž¥·ÓÏE꼁þ²y°ðNQ¢°¹1Á$oÔ؅°,ùq
ˆŸH²v0P©ÆŒàXŠÅ­‰ÀÉ~—‹¹$*|BbèXnR†$éþ¼EŽá&:ºIp­f~±¯$§µ2õÀŸûÚÄô5Õ®ÓEñÞf12Œ"OªI9Ô	¹BÞWyÆ'g¸žÔ¹Ñ™BáHñßß {;•„>”n›ZsfÉbÎ4, vz賫ò2>ê£,Ǥ«‰´j›TÛaRWÙÀÑÒ8(DFÓMδ77z&&„ºØSÁ>y¥ûÌW˔©PFòYjxOò8ŸÐIHÑÇ[ÄËËFïÁij·ªK9ŒP}ÙÜ(ªoÒ¤*	â¡j9…’Ä-Ã9¢<A’¯^ª(PUu?£¯ÊÇpŸÉT<r0‡)øšÌ„LovqDæHIß5n³ì	Ï»¿ƒl}Û{ä2P^𸰸C)M­Ÿ‘fb’“ÀF@#Q[1@/¶øzÛq‚·œÇú>Ÿê¡C~õ ùXÖðÛ™ÉëŽê<!Ä
ÙW
+¨ y«²}öî0ýÒÎÊ!ò­’
¿s¯Á!vê1L¬ð))zdæS×ã›,'|}
µDEõ„r"…­{Åôa™"½¡„½m>ýìfõZ	l{wÚÈàôÈ&ÓÏy®‡7äŒm¨Åá#´.Ðo¡ót(ÉCvÕ͍35ÑîËÞ@FG—Ó‚ÙÒ´0¡ÈåÕ2ꌑ°|E룷Ù½Oj€ÐgüÏWrôB³,o2坉éóGO\ùco Ä˜ÍK0“ߊ\¦@ãÍA.f}›Ñ'»{·¶5¾èyLàJyßdæÆ*
+’Í
XÈ=$4¸/-¢ː¿‰™€WÐp°íÅ;Í_Ñ>—õé
¹0tSÒïºäÍøL
x1ý“c˜-ä3q	B¥xÿaÒ®ø	üB@pfREc†Âj)ŠFœµ("ÅÍôO#ú¹€|‰fƒK=D(dQ䓁¡]¼ŸNšiï1¸QKTSÀ52͸°ã,§þV8|åq`¾9nďÄô'à0¢@œ od@KÅ|/$%¨½n«œ"OaÓ$‘ÄðÑiák³-"U?Ð%âhå°æ2YO§²,ò±ŠôàŸÁ9SwZC	ÿã© ÂT¹¡tÄJGþ”º‹È%)D²÷e®iÄLˆÈj·•Òeö¾>€ä憛µÿ¹øq«4VMŒ­Ðú“1¶¡):ý{ч®"ÊÒ1úmÄ Â¸è"!cjl¡ŒïYee–š[ƒÍJT77R£ý°J%÷tF!³ô 
+«‚yå
|žF›S׿À4«uüyé9HÂÝ~„̦HrY:eã{K~Å•¦›ÔÓÃÊcô!c«K›èÜÍ×`=T6g¦7¾Ž¼ ¥§Aæ½Q—µsîH³ZÜΣÐD…¥oe¢ã*ÖPDn¥N$4±56òÔ	;œj1§¡•¦Šdm¢¤ ‚öÍ­;“eD€.õ+fq½àte¨9}K¡êõ#ÌÉWÆtµTv©=oÐK*mz€Ýf#cëÉËb7Õ¶…嘎խJ²1ˆRúiX†;°çâÉÓRM4â#+Ålr‡ºXp¦„¼ꎥu:*$÷$sü »"‡B OÃe‚¨Rš÷œj 7
K¶…›äÝ¡¤ìJJULnD2F!¸8‹){ùs1¢´Ô&Î÷u%Ú, ¡nP&АzÆ*@S•ö)žñ•¤l‹ëÆÓ,Wø̍Qø&æäšd6‰©WV€_#†ƒ“f Âo[9x¢ŠVY‘å¨ù=tÇ+|03ˆ.7¢DVƒ
+ËÒzîžú·…ô$CÇ%J‰48öQ…u–€r\ºsH]Š²0qvhÙÉ]`¸[RžB-fзãZ²d‡”ÔF$ÈU Ûš
G‹ÙFž49‰‚ƒœü»ÄÊ`½H)=¸ŠQåÎ*ŒóR՘ë±DUDŸŸÜQf(ÓG$}0hCÖ
#Xj À7µ9ÜU
ynˆTË'cí]8Ѭ3…KBç¼Ú­êËæzó
5|å
+sö-òý¬÷ÏÙ2ÐT¦Põs˜CÛÙR¿Èéõ0'!‰„ö|?–©ªpPñ6I‰¹Ç…²ˆ(%;j[m1.ݯ$Næ.ɛ¨lSaU`oM¨¾Äí.4Cö':WÁí+‘H-¡CåͨŽ“X÷)V .v¸bìóÜxÂáGò–&\P‚\è<ËNssãg›§G¯É`ç“PÍïÏÍm§wibò#l¿Ø*¬9*èÄþ©
p="³•]P#£n§³ý»õýgj4Ð*¦>÷ú~<GÅÊ5ŹT6àg½áЪ!"ýU0Ïy˜“aµŠóû:ù»üÅÖȹñÑÎÕ½É^ÐÎn§ÓÝù¯‹_Ð׫T–g‹uú`þhT‰:}ÁøŸ„4>Î"CÝkø®ºs|‚ÎÈô謀ÿ$PáÊw;K‡ßKƒ·Ùp+Ü;?~IB"ÊÛª8R¦ûôù^÷Ýú³ŸwÂ~à²óo°Á¥¯É߬a]5ˆ°ÿ¬Ûíî-JDß®×Ø^îvü~µR'‘ç…¢¹÷Z§jltT®bö£üè­ÿb«ÛÙÝz	;O‰ñòÉ9Xšè{ƾ Çï2§ægXÑj¬Âü3ý<ý$^©ò±O¼³m·ÀÞ^Óa*:Ývg¯M«œ{ùOEzgžvMÄeI֖ð$Gvð/fâRö¥süJ(^e¦ 'z–ßÙÐg=yòd•8úUÑÿIŽ-Õë½õ'ë‹ßGø_´¢ªŠ¶å,í¿y²UkôXiåô“Æ~ë°³··‡Qþ‹¡¿V›výÂìý
C*½‰7¨Þâ‚f|»¹ñ†Ÿür$zó²¦HS>#z¢»»Giõ›Ð¹<9ûFt	»Y¼]èáî_Ð©][̂×Ô}H.`Mð.ÿ	àÜ©t^æ^žggC:·ÑÕi¦qü²ëUßÎ4šwÉÄ!\¯…Fˆ›!=²Lø·@§äM›Þ”é‘ôì#¼­Ðۍá_‹özÚgt5¯ž4Þ4Ûk…–[k"ã-_&VFú½oɁ9K²¾LΏéa]îùñ‹­N÷)jÆ~:ÏŸîÎ.Ò¸fÊöèQѨûW§o‚£-n-\}UÜ×·w÷ß¡¼œ³€§Ëëg
ðÜ&Í_²Èë/MžDýø<È«›Ç–àçc=”ÕäžgÔ¯¼·èR¥@
žÈp/Í
+:hÀÁWꋳ¨rÿ·²|ÁÈ+|êcÄjÅý’3i8[Œ¶ŽÛ-A-/e¸[oÏ.àÐíN¥ÁüɯJ¶ÄðÁ®”sI£ôü¤‹>ÑgIy·ŒwÕn|ì]76 uÛ 3{Ï»WÁ,õµ¥—؝Iñ^وÄ|Ö.!iÞ_´îJ=²Îé³¼Ãd~…:&篺ÎXf˜^‚{íîV.n-Êöïq~ÌæK¶œÏÍ_)dF£pÄ®ôrN”>Z¤eŸ|ò¤lZöŸ?ïvšÖêjS
+ï†Þé¢SØ?Ø]Â9ŸÎw8'Ú÷ý¦ìµ‰cŒyù²éLGdgä^Èӛ[o´þ¯¦&I½¯šy
Y	D2K[ö\!*Ê冪/Âyüòø¤,ÈåÊ¢o­TyÁïåÝ%÷köŸ³Ôékv0”ììwv;ϛ¬¼³&ƒ¿"ÈÇÞp`_yúìð/ˆQ/üsþ\ãÌe¿as6§ìÝn÷1¯g›¾-øï|ôΨ-sê;ºìÓç‡Ïž~‹ËzQJoí¬ë­§póz^ûr×P1ÀÌ:¿¢¥µ—†ô²¶8NÏLEój½Á«Í˜µ‰¶©¬I²šÙbéY‘MÏ»Í5¼¹B&å^-©ŸÜ6(ûk䪉–_øÌz¯U¯3}W0€¬#û
+ìyº†¶&UüøöڋéûŽ“—e¡\ޜ‡þ«­Äk™Ð¯)vBÅï¶öË^gakáêZ½”wvú
v¹Ù¨//‰µvïõ:¯¯ö]M³ž¼'k]+›.Õ©úØó›Ñ_\ÚeG2鋽Ž¸–ôwpÐ.¹Lôu.:hœŸñ#QKìý‡¸ºÁԚծtË+t¸{Ðî<åÃß8d5I¼²Ÿôþ¹ª£üý$;Œ¼c'xävÓö2…Únø™7º§j‹0Ùª¹óüÉå	Cëœ{ÕÍ¥½Es„-?P/Ý]Ú[e¡u‘_‘pòˆ[Zý€äÏ4=ù¿ü_ü]â0
+endstream
+endobj
+11 0 obj
+<<
+/Pages 2 0 R
+/Names <<
+/EmbeddedFiles <<
+/Names [(factur-x.xml) 22 0 R]
+>>
+>>
+/Type /Catalog
+/PageMode /UseNone
+/Version /1.4
+/AF 21 0 R
+/Metadata 27 0 R
+>>
+endobj
+27 0 obj
+<<
+/Type /Metadata
+/Length 4075
+/Subtype /XML
+>>
+
+stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?><x:xmpmeta xmlns:x="adobe:ns:meta/">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+                       rdf:about=""
+                       xmp:CreateDate="2022-02-18T17:13:46+01:00"
+                       xmp:CreatorTool="intarsys ZUGFeRD Toolkit 2.1"
+                       xmp:ModifyDate="2022-02-18T17:13:46+01:00"/>
+      <rdf:Description xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+                       pdf:Producer="intarsys PDF/A Live!"
+                       rdf:about=""/>
+      <rdf:Description xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
+                       pdfaid:conformance="B"
+                       pdfaid:part="3"
+                       rdf:about=""/>
+      <rdf:Description xmlns:fx="urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0#"
+                       rdf:about="">
+         <fx:DocumentType>INVOICE</fx:DocumentType>
+         <fx:DocumentFileName>factur-x.xml</fx:DocumentFileName>
+         <fx:Version>1.0</fx:Version>
+         <fx:ConformanceLevel>EN 16931</fx:ConformanceLevel>
+      </rdf:Description>
+      <rdf:Description xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+                       xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#"
+                       xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+                       xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+                       xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
+                       rdf:about="">
+         <pdfaExtension:schemas>
+            <rdf:Bag>
+               <rdf:li rdf:parseType="Resource">
+                  <pdfaSchema:schema>Factur-X PDFA Extension Schema</pdfaSchema:schema>
+                  <pdfaSchema:namespaceURI>urn:factur-x:pdfa:CrossIndustryDocument:invoice:1p0#</pdfaSchema:namespaceURI>
+                  <pdfaSchema:prefix>fx</pdfaSchema:prefix>
+                  <pdfaSchema:property>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <pdfaProperty:name>DocumentFileName</pdfaProperty:name>
+                           <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                           <pdfaProperty:category>external</pdfaProperty:category>
+                           <pdfaProperty:description>name of the embedded XML invoice file</pdfaProperty:description>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <pdfaProperty:name>DocumentType</pdfaProperty:name>
+                           <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                           <pdfaProperty:category>external</pdfaProperty:category>
+                           <pdfaProperty:description>INVOICE</pdfaProperty:description>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <pdfaProperty:name>Version</pdfaProperty:name>
+                           <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                           <pdfaProperty:category>external</pdfaProperty:category>
+                           <pdfaProperty:description>The actual version of the ZUGFeRD data</pdfaProperty:description>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <pdfaProperty:name>ConformanceLevel</pdfaProperty:name>
+                           <pdfaProperty:valueType>Text</pdfaProperty:valueType>
+                           <pdfaProperty:category>external</pdfaProperty:category>
+                           <pdfaProperty:description>The conformance level of the ZUGFeRD data</pdfaProperty:description>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </pdfaSchema:property>
+               </rdf:li>
+            </rdf:Bag>
+         </pdfaExtension:schemas>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
+
+endstream
+endobj
+21 0 obj
+[22 0 R]
+endobj
+xref
+0 2
+0000000000 65535 f
+0000140128 00000 n
+11 1
+0000144653 00000 n
+21 3
+0000148991 00000 n
+0000140297 00000 n
+0000140480 00000 n
+27 1
+0000144829 00000 n
+trailer
+<<
+/ID [(üF¥àFe5;\fµÖF) (%ÿØ5%ß
x\bm/ÁÄ>E)]
+/Root 11 0 R
+/Info 1 0 R
+/Prev 139581
+/Size 28
+>>
+startxref
+149016
+%%EOF
diff --git a/t/xml_invoice/corpus/EN16931_AbweichenderZahlungsempf.ubl.xml b/t/xml_invoice/corpus/EN16931_AbweichenderZahlungsempf.ubl.xml
new file mode 100644
index 000000000..b1b424a38
--- /dev/null
+++ b/t/xml_invoice/corpus/EN16931_AbweichenderZahlungsempf.ubl.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cec="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>471102</cbc:ID>
+  <cbc:IssueDate>2018-03-05</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:Note>Rechnung gemäß Bestellung vom 01.03.2018.</cbc:Note>
+  <cbc:Note>#REG#Lieferant GmbH				
+Lieferantenstraße 20				
+80333 München				
+Deutschland				
+Geschäftsführer: Hans Muster
+Handelsregisternummer: H A 123
+      </cbc:Note>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="0088">4000001123452</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>Lieferant GmbH</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Lieferantenstraße 20</cbc:StreetName>
+        <cbc:CityName>München</cbc:CityName>
+        <cbc:PostalZone>80333</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>201/113/40209</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>FC</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>DE123456789</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Lieferant GmbH</cbc:RegistrationName>
+      </cac:PartyLegalEntity>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID>GE2020211</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>Kunden AG Mitte</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Kundenstraße 15</cbc:StreetName>
+        <cbc:CityName>Frankfurt</cbc:CityName>
+        <cbc:PostalZone>69876</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>Kunden AG Mitte</cbc:RegistrationName>
+      </cac:PartyLegalEntity>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:PayeeParty>
+    <cac:PartyIdentification>
+      <cbc:ID>4711</cbc:ID>
+    </cac:PartyIdentification>
+    <cac:PartyName>
+      <cbc:Name>Factoring GmbH</cbc:Name>
+    </cac:PartyName>
+  </cac:PayeeParty>
+  <cac:Delivery>
+    <cbc:ActualDeliveryDate>2018-03-05</cbc:ActualDeliveryDate>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode>58</cbc:PaymentMeansCode>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>DE12123456781234567890</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Zahlbar innerhalb 30 Tagen netto bis 04.04.2018, 3% Skonto innerhalb 10 Tagen bis 15.03.2018</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">56.87</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">275</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">19.25</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>7</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">198</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">37.62</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>19</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">473</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">473</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">529.87</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="EUR">0</cbc:AllowanceTotalAmount>
+    <cbc:ChargeTotalAmount currencyID="EUR">0</cbc:ChargeTotalAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">529.87</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="H87">20</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">198</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Name>Trennblätter A4</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>TB100A4</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:StandardItemIdentification>
+        <cbc:ID schemeID="0160">4012345001235</cbc:ID>
+      </cac:StandardItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>19</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">9.9</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+  <cac:InvoiceLine>
+    <cbc:ID>2</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="H87">50</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">275</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Name>Joghurt Banane</cbc:Name>
+      <cac:SellersItemIdentification>
+        <cbc:ID>ARNR2</cbc:ID>
+      </cac:SellersItemIdentification>
+      <cac:StandardItemIdentification>
+        <cbc:ID schemeID="0160">4000050986428</cbc:ID>
+      </cac:StandardItemIdentification>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>7</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">5.5</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
\ No newline at end of file
diff --git a/t/xml_invoice/corpus/MustangGnuaccountingBeispielRE-20190610_507.pdf b/t/xml_invoice/corpus/MustangGnuaccountingBeispielRE-20190610_507.pdf
new file mode 100644
index 000000000..4b6231cf6
Binary files /dev/null and b/t/xml_invoice/corpus/MustangGnuaccountingBeispielRE-20190610_507.pdf differ
diff --git a/t/xml_invoice/corpus/README.md b/t/xml_invoice/corpus/README.md
new file mode 100644
index 000000000..297c4a055
--- /dev/null
+++ b/t/xml_invoice/corpus/README.md
@@ -0,0 +1,5 @@
+These are selected examples from the mustangproject corpus:
+
+https://github.com/ZUGFeRD/corpus
+
+These examples are licensed under the MIT licence.
diff --git a/t/xml_invoice/corpus/ZUGFeRD-invoice_rabatte_4_abschlag_taxbasistotalamount.xml b/t/xml_invoice/corpus/ZUGFeRD-invoice_rabatte_4_abschlag_taxbasistotalamount.xml
new file mode 100644
index 000000000..35119f3ad
--- /dev/null
+++ b/t/xml_invoice/corpus/ZUGFeRD-invoice_rabatte_4_abschlag_taxbasistotalamount.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rsm:CrossIndustryInvoice xmlns:a="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:10" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>ST-1496</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20190725</udt:DateTimeString>
+    </ram:IssueDateTime>
+    <ram:IncludedNote>
+      <ram:Content>Rechnung</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>0001</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:SellerAssignedID>0001</ram:SellerAssignedID>
+        <ram:Name>pos1</ram:Name>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>8.76</ram:ChargeAmount>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="H87">23.00</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>201.48</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:SellerTradeParty>
+        <ram:Name>DATAflor Musterbetrieb</ram:Name>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>37079</ram:PostcodeCode>
+          <ram:LineOne>August-Spindler-Straße 20</ram:LineOne>
+          <ram:CityName>Göttingen</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE00000000</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:Name>Thomas Adler</ram:Name>
+        <ram:PostalTradeAddress>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:BuyerTradeParty>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20190725</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>36.94</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>194.43</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:SpecifiedTradeAllowanceCharge>
+        <ram:ChargeIndicator>
+          <udt:Indicator>false</udt:Indicator>
+        </ram:ChargeIndicator>
+        <ram:ActualAmount>7.05</ram:ActualAmount>
+        <ram:Reason>Zu-/Abschlag</ram:Reason>
+        <ram:CategoryTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:CategoryTradeTax>
+      </ram:SpecifiedTradeAllowanceCharge>
+      <ram:SpecifiedTradePaymentTerms>
+        <ram:Description />
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>201.48</ram:LineTotalAmount>
+        <ram:ChargeTotalAmount>0.00</ram:ChargeTotalAmount>
+        <ram:AllowanceTotalAmount>7.05</ram:AllowanceTotalAmount>
+        <ram:TaxBasisTotalAmount>194.43</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="EUR">36.94</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>231.37</ram:GrandTotalAmount>
+        <ram:TotalPrepaidAmount>10.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>221.37</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>
\ No newline at end of file
diff --git a/t/xml_invoice/corpus/sample_inofficial_20190125_atgp_factur-x_v_1_0.pdf b/t/xml_invoice/corpus/sample_inofficial_20190125_atgp_factur-x_v_1_0.pdf
new file mode 100644
index 000000000..6de7171a8
Binary files /dev/null and b/t/xml_invoice/corpus/sample_inofficial_20190125_atgp_factur-x_v_1_0.pdf differ
diff --git a/t/xml_invoice/corpus/zugferd_2p0_EN16931_1_Teilrechnung.pdf b/t/xml_invoice/corpus/zugferd_2p0_EN16931_1_Teilrechnung.pdf
new file mode 100644
index 000000000..50f0418c6
Binary files /dev/null and b/t/xml_invoice/corpus/zugferd_2p0_EN16931_1_Teilrechnung.pdf differ
diff --git a/t/xml_invoice/corpus/zugferd_2p1_BASIC_Einfach.pdf b/t/xml_invoice/corpus/zugferd_2p1_BASIC_Einfach.pdf
new file mode 100644
index 000000000..b94c13796
Binary files /dev/null and b/t/xml_invoice/corpus/zugferd_2p1_BASIC_Einfach.pdf differ
diff --git a/t/xml_invoice/xml_invoice.t b/t/xml_invoice/xml_invoice.t
new file mode 100644
index 000000000..3cb825d45
--- /dev/null
+++ b/t/xml_invoice/xml_invoice.t
@@ -0,0 +1,81 @@
+use Test::More;
+use Test::Exception;
+
+use strict;
+
+use lib 't';
+use utf8;
+
+use File::Find;
+use File::Slurp;
+use SL::ZUGFeRD;
+use Data::Dumper;
+use Support::TestSetup;
+
+Support::TestSetup::login();
+
+File::Find::find(sub {
+  return unless /(xml|pdf)$/;
+
+#   diag "found file $_";
+  test_file($_, SL::ZUGFeRD::RES_OK());
+}, "t/xml_invoice/corpus");
+
+
+sub test_file {
+  my ($filename, $expect_error) = @_;
+
+  open my $fh, '<', $filename or die "can't open $filename: $!";
+  my $data = do { local $/ = undef; <$fh> };
+  close $fh;
+
+  my $res;
+
+  eval {
+    if ($data =~ /^%PDF/) {
+      $res = SL::ZUGFeRD->extract_from_pdf($data);
+    } else {
+      $res = SL::ZUGFeRD->extract_from_xml($data);
+    }
+
+    1;
+  } or do {
+    ok 0, "failure to parse $filename: $@";
+    return;
+  };
+
+  is $res->{result}, $expect_error, "$filename: expected result $expect_error, got $res->{result} with message $res->{message}";
+#   print Dumper($res);
+
+  return if $res->{result} != SL::ZUGFeRD::RES_OK();
+
+  {
+    local $TODO = "invoice parses, but contains warnings. likely missing XMP metadata";
+    ok 0 == @{$res->{warnings}}, "$filename has no warnings.";
+  }
+
+  ok $res->{invoice_xml}, "$filename has parsed xml data";
+
+  my $invoice = $res->{invoice_xml};
+
+  # minimal set of contents that should be present
+
+  ok $invoice->metadata->{vendor_name}, "$filename contains vendor name";
+  ok $invoice->metadata->{gross_total}, "$filename contains net_total";
+  ok $invoice->metadata->{net_total}, "$filename contains net_total";
+  ok $invoice->metadata->{transdate}, "$filename contains transdate";
+  ok $invoice->metadata->{currency}, "$filename contains currency";
+
+  ok $invoice->items, "$filename contains items";
+
+  for my $item (@{ $invoice->items }) {
+    ok $item->{price}, "item of $filename contains price";
+    ok $item->{subtotal}, "item of $filename contains subtotal";
+    ok $item->{tax_rate}, "item of $filename contains tax_rate";
+    ok $item->{tax_scheme}, "item of $filename contains tax_scheme";
+  }
+
+
+}
+
+done_testing;
diff --git a/t/year_end/year_end.t b/t/year_end/year_end.t
index dc0be7c58..7708b7434 100644
--- a/t/year_end/year_end.t
+++ b/t/year_end/year_end.t
@@ -191,9 +191,10 @@ my $start_date = DateTime->new(year => $year, month => 1,  day => 1);
 my $cb_date    = DateTime->new(year => $year, month => 12, day => 31);
 my $ob_date    = $cb_date->clone->add(days => 1);
 
-SL::Controller::YearEndTransactions::_year_end_bookings( start_date => $start_date,
-                                                         cb_date    => $cb_date,
-                                                       );
+my $controller = SL::Controller::YearEndTransactions->new();
+$controller->_year_end_bookings( start_date => $start_date,
+                                 cb_date    => $cb_date,
+                               );
 
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ cb_transaction => 1 ]), 14, 'acc_trans cb_transactions created ok');
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ ob_transaction => 1 ]), 10, 'acc_trans ob_transactions created ok');
@@ -317,9 +318,9 @@ my $final_account_balances = [
 # second and third run should be no-ops, at least while no further bookings where
 # made
 
-SL::Controller::YearEndTransactions::_year_end_bookings( start_date => $start_date,
-                                                         cb_date    => $cb_date,
-                                                       );
+$controller->_year_end_bookings( start_date => $start_date,
+                                 cb_date    => $cb_date,
+                               );
 
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ cb_transaction => 1 ]), 14, 'acc_trans cb_transactions created ok');
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ ob_transaction => 1 ]), 10, 'acc_trans ob_transactions created ok');
@@ -400,9 +401,9 @@ is_deeply( &get_final_balances,
 gl_booking(10, $booking_date, 'foo', 'bar', $cash, $bank, 0, 0);
 gl_booking(5,  $booking_date, 'foo', 'bar', $betriebsbedarf, $cash, 0, 0);
 
-SL::Controller::YearEndTransactions::_year_end_bookings( start_date => $start_date,
-                                                         cb_date    => $cb_date,
-                                                       );
+$controller->_year_end_bookings( start_date => $start_date,
+                                 cb_date    => $cb_date,
+                               );
 
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ cb_transaction => 1 ]), 23, 'acc_trans cb_transactions created ok');
 is(SL::DB::Manager::AccTransaction->get_all_count(where => [ ob_transaction => 1 ]), 16, 'acc_trans ob_transactions created ok');
diff --git a/templates/design40_webpages/acc_trans/_mini_ledger.html b/templates/design40_webpages/acc_trans/_mini_ledger.html
new file mode 100644
index 000000000..8251df296
--- /dev/null
+++ b/templates/design40_webpages/acc_trans/_mini_ledger.html
@@ -0,0 +1,39 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<div class="wrapper">
+
+<table id="acc_trans" class="tbl-list">
+  <caption>[% HTML.escape(title) %]</caption>
+  <thead>
+    <tr>
+      <th class="date">[% LxERP.t8("Date") %]</th>
+      <th class="center">[% LxERP.t8("Chart") %]</th>
+      <th>[% LxERP.t8("Description") %]</th>
+      <th class="right">[% LxERP.t8("Debit") %]</th>
+      <th class="right">[% LxERP.t8("Credit") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH transaction = TRANSACTIONS %]
+    <tr>
+      <td class="date">[% transaction.transdate.to_kivitendo %]</td>
+      <td class="center">[% transaction.chart.accno %]</td>
+      <td>[% transaction.chart.description %]</td>
+      <td class="numeric">[% IF transaction.amount < 0 %] [% LxERP.format_amount(transaction.amount * -1, 2) %] [% END %]</td>
+      <td class="numeric">[% IF transaction.amount > 0 %] [% LxERP.format_amount(transaction.amount , 2) %] [% END %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+     <td colspan="2"></td>
+     <th>[% LxERP.t8("Total") %]</th>
+     <td class="numeric">[% LxERP.format_amount(debit_sum * -1, 2) %]</td>
+     <td class="numeric">[% LxERP.format_amount(credit_sum, 2) %]</td>
+    </tr>
+  </tfoot>
+</table>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/acc_trans/_mini_trial_balance.html b/templates/design40_webpages/acc_trans/_mini_trial_balance.html
new file mode 100644
index 000000000..3f9f58c32
--- /dev/null
+++ b/templates/design40_webpages/acc_trans/_mini_trial_balance.html
@@ -0,0 +1,29 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<div class="wrapper">
+
+<table id="balances" class="tbl-list">
+  <caption>[% HTML.escape(title) %]</caption>
+  <thead>
+    <tr>
+      <th class="numeric-centered">[% LxERP.t8("Chart") %]</th>
+      <th>[% LxERP.t8("Description") %]</th>
+      <th class="right">[% LxERP.t8("Debit") %]</th>
+      <th class="right">[% LxERP.t8("Credit") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH balance = BALANCES %]
+    <tr>
+      <td class="numeric-centered">[% balance.accno %]</td>
+      <td>[% balance.description %]</td>
+      <td class="numeric">[% IF balance.balance < 0 %] [% LxERP.format_amount(balance.balance * -1, 2) %] [% END %]</td>
+      <td class="numeric">[% IF balance.balance > 0 %] [% LxERP.format_amount(balance.balance, 2) %] [% END %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/acc_trans/acc_trans.html b/templates/design40_webpages/acc_trans/acc_trans.html
new file mode 100644
index 000000000..2c7fc1ac4
--- /dev/null
+++ b/templates/design40_webpages/acc_trans/acc_trans.html
@@ -0,0 +1,4 @@
+[% acc_trans_table %]
+<p></p>
+[% balances_table %]
+
diff --git a/templates/design40_webpages/acctranscorrections/analyze_filter.html b/templates/design40_webpages/acctranscorrections/analyze_filter.html
new file mode 100644
index 000000000..a85016975
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/analyze_filter.html
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[% USE HTML %]
+[%- USE L %]
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+  <p>
+  [% 'Earlier versions of kivitendo contained bugs which might have led to wrong entries in the general ledger.' | $T8 %]
+  [% 'These wrong entries cannot be fixed automatically.' | $T8 %]
+  [% 'This module can help you identify and correct such entries by analyzing the general ledger and presenting you likely solutions but also allowing you to fix problems yourself.' | $T8 %]
+  </p>
+
+  <form name="filter" method="post" action="acctranscorrections.pl" id="form">
+
+    <p>[% 'Time period for the analysis:' | $T8 %]</p>
+
+    <p>
+    <table>
+      <tr>
+        <td><input type="radio" name="scope" id="scope_full" value="full" checked></td>
+        <td><label for="scope_full">[% 'All general ledger entries' | $T8 %]</label></td>
+      </tr>
+
+      <tr>
+        <td><input type="radio" name="scope" id="scope_period" value="period"></td>
+        <td>
+          [% 'Period:' | $T8 %]
+          [% 'from (time)' | $T8 %]
+          [% L.date_tag('transdate_from') %]
+          [% 'to (time)' | $T8 %]
+          [% L.date_tag('transdate_to') %]
+        </td>
+      </tr>
+    </table>
+    </p>
+
+    <input type="hidden" name="action" value="analyze">
+  </form>
+</div>
diff --git a/templates/design40_webpages/acctranscorrections/analyze_overview.html b/templates/design40_webpages/acctranscorrections/analyze_overview.html
new file mode 100644
index 000000000..b5a4e4c8b
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/analyze_overview.html
@@ -0,0 +1,154 @@
+[% USE T8 %]
+[% USE HTML %][% USE LxERP %]
+<h1>[% title %]</h1>
+
+ <p>[% 'kivitendo has found one or more problems in the general ledger.' | $T8 %]</p>
+
+ <p>
+  [% 'Period' | $T8 %]:
+  [% IF transdate_from || transdate_to %]
+   [% IF transdate_from %]
+   [% 'from (time)' | $T8 %] [% transdate_from %]
+   [% END %]
+   [% IF transdate_to %]
+   [% 'to (time)' | $T8 %] [% transdate_to %]
+   [% END %]
+  [% ELSE %]
+  [% 'all entries' | $T8 %]
+  [% END %]
+ </p>
+
+  <table width="100%">
+   <tr>
+    <th>[% 'Transaction' | $T8 %]</th>
+    <th>[% 'Problem' | $T8 %]</th>
+    <th>[% 'Solution' | $T8 %]</th>
+   </tr>
+
+   [% FOREACH problem = PROBLEMS %]
+   <tr class="listrow[% loop.count % 2 %]">
+    <td>
+     [% IF problem.type == 'ap_ar_wrong_taxkeys' %]
+      [% IF problem.ap_problems.size %]
+       [% 'AP Transactions' | $T8 %]
+       [% FOREACH ap = problem.ap_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% ap.link %]">[% HTML.escape(ap.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+      [% IF problem.ar_problems.size %]
+       [% IF problem.ap_problems.size %]; [% END %]
+       [% 'AR Transactions' | $T8 %]
+       [% FOREACH ar = problem.ar_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% ar.link %]">[% HTML.escape(ar.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+
+     [% ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+      [% IF problem.ar_problems.size %]
+       [% 'Sales invoices' | $T8 %]
+       [% FOREACH subproblem = problem.ar_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+      [% IF problem.ap_problems.size %]
+       [% IF problem.ar_problems.size %]; [% END %]
+       [% 'Purchase invoices' | $T8 %]
+       [% FOREACH subproblem = problem.ap_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+     [% ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
+      [% IF problem.ar_problems.size %]
+       [% 'Sales invoices' | $T8 %]
+       [% FOREACH subproblem = problem.ar_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+      [% IF problem.ap_problems.size %]
+       [% IF problem.ar_problems.size %]; [% END %]
+       [% 'Purchase invoices' | $T8 %]
+       [% FOREACH subproblem = problem.ap_problems %]
+        [% UNLESS loop.first %], [% END %]
+        <a href="[% subproblem.link %]">[% HTML.escape(subproblem.data.reference) %]</a>
+       [% END %]
+      [% END %]
+
+     [% ELSE %]
+
+     <a href="[% problem.link %]">
+      [% IF problem.data.module == 'ar' %]
+      [% 'AR Transaction' | $T8 %]
+      [% ELSIF problem.data.module == 'ap' %]
+      [% 'AP Transaction' | $T8 %]
+      [% ELSE %]
+      [% 'General Ledger Transaction' | $T8 %]
+      [% END %]
+      [% HTML.escape(problem.data.reference) %]
+     </a>
+
+      <!-- ( [% problem.data.module %].id = acc_trans.trans_id = [% HTML.escape(problem.data.trans_id) %] ) -->
+
+     [% END %]
+    </td>
+
+    <td>
+     [% IF problem.type == 'split_multiple_credit_and_debit' %]
+     [% 'Transaction has been split on both the credit and the debit side' | $T8 %]
+
+     [% ELSIF problem.type == 'wrong_taxkeys' %]
+     [% 'Wrong tax keys recorded' | $T8 %]
+
+     [% ELSIF problem.type == 'wrong_taxes' %]
+     [% 'Wrong taxes recorded' | $T8 %]
+
+     [% ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
+     [% 'AP transactions with sales taxkeys and/or AR transactions with input taxkeys' | $T8 %]
+
+     [% ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+     [% 'Sales and purchase invoices with inventory transactions with taxkeys' | $T8 %]
+
+     [% ELSIF problem.type == 'missing_taxkeys_in_invoices' %]
+     [% 'Missing taxkeys in invoices with taxes.' | $T8 %]
+
+     [% END %]
+    </td>
+
+    <td>
+     [% IF problem.type == 'split_multiple_credit_and_debit' %]
+     [% 'This transaction has to be split into several transactions manually.' | $T8 %]
+
+     [% ELSIF (problem.type == 'wrong_taxkeys') || (problem.type == 'wrong_taxes') %]
+     <a href="acctranscorrections.pl?action=assistant&trans_id=[% HTML.url(problem.data.trans_id) %]&trans_module=[% HTML.url(problem.data.module) %]&trans_reference=[% HTML.url(problem.data.reference) %]&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [% ELSIF problem.type == 'ap_ar_wrong_taxkeys' %]
+     <a href="acctranscorrections.pl?action=assistant_for_ap_ar_wrong_taxkeys&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [% ELSIF problem.type == 'invoice_inventory_with_taxkeys' %]
+     <a href="acctranscorrections.pl?action=assistant_for_invoice_inventory_with_taxkeys&callback=[% callback %]">
+      [% 'Start the correction assistant' | $T8 %]
+     </a>
+
+     [% END %]
+    </td>
+   </tr>
+   [% END %]
+
+  </table>
+
+
+ <hr>
+
diff --git a/templates/design40_webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html b/templates/design40_webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html
new file mode 100644
index 000000000..2796440bd
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html
@@ -0,0 +1,26 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<p>
+  [% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %]
+  [% 'This means that the user has created an AP transaction and chosen a taxkey for sales taxes, or that he has created an AR transaction and chosen a taxkey for input taxes.' | $T8 %]
+</p>
+<p>
+  [% 'kivitendo can fix these problems automatically.' | $T8 %]
+  [% 'For AP transactions it will replace the sales taxkeys with input taxkeys with the same tax rate.' | $T8 %]
+  [% 'For AR transactions it will replace the input taxkeys with sales taxkeys with the same tax rate.' | $T8 %]
+</p>
+
+<form name="Form" action="acctranscorrections.pl" method="post">
+
+<p>
+  <input type="hidden" name="action" value="fix_ap_ar_wrong_taxkeys">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+  <input type="submit" class="submit" value="[% 'Fix transactions' | $T8 %]">
+  <input type="button" class="submit" onclick="history.back()" value="[% 'Back' | $T8 %]">
+</p>
+</form>
+
diff --git a/templates/design40_webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html b/templates/design40_webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html
new file mode 100644
index 000000000..661625a3e
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html
@@ -0,0 +1,18 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<p>[% 'There is at least one sales or purchase invoice for which kivitendo recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %] </p>
+<p>[% 'kivitendo can fix these problems automatically.' | $T8 %] [% 'It will simply set the taxkey to 0 (meaning "no taxes") which is the correct value for such inventory transactions.' | $T8 %] </p>
+
+<form name="Form" action="acctranscorrections.pl" method="post">
+  <div class="buttons">
+    <input type="hidden" name="action" value="fix_invoice_inventory_with_taxkeys">
+    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+    <input type="submit" value="[% 'Fix transactions' | $T8 %]">
+    <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </div>
+</form>
+
diff --git a/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxes.html b/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxes.html
new file mode 100644
index 000000000..007f0285c
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxes.html
@@ -0,0 +1,64 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<p>[% 'The following transaction contains wrong taxes:' | $T8 %] <a href="[% problem.link %]">
+[% IF problem.data.module == 'ar'    %][% 'AR Transaction'             | $T8 %]
+[% ELSIF problem.data.module == 'ap' %][% 'AP Transaction'             | $T8 %]
+[% ELSE                              %][% 'General Ledger Transaction' | $T8 %][% END %]
+[% HTML.escape(problem.data.reference) %]
+</a></p>
+
+<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
+
+<table class="tbl-List">
+<thead>
+  <tr>
+    <th>[% 'Account' | $T8 %]</th>
+    <th>[% 'Debit' | $T8 %]</th>
+    <th>[% 'Credit' | $T8 %]</th>
+    <th>[% 'Taxkey' | $T8 %]</th>
+    <th>[% 'Recorded Tax' | $T8 %]</th>
+    <th>[% 'Expected Tax' | $T8 %]</th>
+    <th></th>
+  </tr>
+</thead>
+
+[% SET curr_row = 0 %]
+[% IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
+  [% SET order = [ 'credit', 'debit' ] %]
+  [% SET other_side = 'debit' %]
+[% ELSE %]
+  [% SET order = [ 'debit', 'credit' ] %]
+  [% SET other_side = 'credit' %]
+[% END %]
+
+<tbody>
+  [% FOREACH idx = order %]
+    [% FOREACH row = problem.acc_trans.$idx.entries %]
+      [% SET curr_row = curr_row + 1 %]
+      <tr class="listrow[% curr_row % 2 %]">
+        <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
+        <td>[% IF idx == 'debit'    %][% LxERP.format_amount(row.display_amount, 2) %][% END %]</td>
+        <td>[% IF idx == 'credit'   %][% LxERP.format_amount(row.display_amount, 2) %][% END %]</td>
+        <td>[% IF idx != other_side %][% HTML.escape(row.taxdescription)            %][% END %]</td>
+        <td>[% IF row.actual_tax    %][% LxERP.format_amount(row.actual_tax, 2)     %][% END %]</td>
+        <td>[% IF row.expected_tax  %][% LxERP.format_amount(row.expected_tax, 2)   %][% END %]</td>
+        <td><img src="image/[% IF row.tax_error %]error[% ELSE %]ok[% END %].png"></td>
+      </tr>
+    [% END %]
+  [% END %]
+</tbody>
+</table>
+
+<form method="post" action="acctranscorrections.pl">
+  <div class="buttons">
+    <input type="hidden" name="action" value="delete_transaction">
+    <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
+    <input type="submit" value="[% 'Delete transaction' | $T8 %]">
+    <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </div>
+</form>
+
diff --git a/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
new file mode 100644
index 000000000..0b3d4d596
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/assistant_for_wrong_taxkeys.html
@@ -0,0 +1,117 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<p>[% 'The following transaction contains wrong taxkeys:' | $T8 %]<a href="[% problem.link %]">
+[% IF problem.data.module == 'ar'    %][% 'AR Transaction'             | $T8 %]
+[% ELSIF problem.data.module == 'ap' %][% 'AP Transaction'             | $T8 %]
+[% ELSE                              %][% 'General Ledger Transaction' | $T8 %][% END %]
+[% HTML.escape(problem.data.reference) %]
+</a></p>
+
+<p>
+  [% 'This could have happened for two reasons:' | $T8 %]
+  [% 'The first reason is that kivitendo contained a bug which resulted in the wrong taxkeys being recorded for transactions in which two entries are posted for the same chart with different taxkeys.' | $T8 %]
+  [% 'The second reason is that kivitendo allowed the user to enter the tax amount manually regardless of the taxkey used.' | $T8 %]
+  [% 'The third reason is that wrong (taxkey) settings for the credit / debit CSV-import were used.' | $T8 %]
+  [% 'Such entries cannot be exported into the DATEV format and have to be fixed as well.' | $T8 %]
+</p>
+<p>
+  [% 'The transaction is shown below in its current state.' | $T8 %]
+  [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %]
+  [% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]
+</p>
+<p>
+  [% 'You can also delete this transaction and re-enter it manually.' | $T8 %]
+  [% 'In order to do that hit the button "Delete transaction".' | $T8 %]
+</p>
+<p>[% 'At the moment the transaction looks like this:' | $T8 %]</p>
+
+ <form method="post" action="acctranscorrections.pl" name="Form">
+   <table>
+    <tr>
+     <th>[% 'Account' | $T8 %]</th>
+     <th>[% 'Debit' | $T8 %]</th>
+     <th>[% 'Credit' | $T8 %]</th>
+     <th>[% 'Recorded Tax' | $T8 %]</th>
+     <th>[% 'Recorded taxkey' | $T8 %]</th>
+     <th>[% 'Expected Tax' | $T8 %]</th>
+     <th></th>
+     <th>[% 'Correct taxkey' | $T8 %]</th>
+    </tr>
+
+    [% SET curr_row = 0 %]
+    [% IF (problem.data.module == 'ar') || ((problem.data.module == 'gl') && (problem.acc_trans.credit.entries.first.acc_trans_id < problem.acc_trans.debit.entries.first.acc_trans_id)) %]
+     [% SET order = [ 'credit', 'debit' ] %]
+     [% SET other_side = 'debit' %]
+    [% ELSE %]
+     [% SET order = [ 'debit', 'credit' ] %]
+     [% SET other_side = 'credit' %]
+    [% END %]
+
+
+    [% IF problem.acc_trans.credit.entries.size > problem.acc_trans.debit.entries.size %]
+    [% ELSE %]
+    [% END %]
+
+
+    [% FOREACH idx = order %]
+     [% FOREACH row = problem.acc_trans.$idx.entries %]
+      [% SET curr_row = curr_row + 1 %]
+      <tr class="listrow[% curr_row % 2 %]">
+       <td>[% HTML.escape(row.accno) %]--[% HTML.escape(row.chartdescription) %]</td>
+       <td>
+        [% IF idx == 'debit' %]
+         [% LxERP.format_amount(row.display_amount, 2) %]
+        [% END %]
+       </td>
+       <td>
+        [% IF idx == 'credit' %]
+         [% LxERP.format_amount(row.display_amount, 2) %]
+        [% END %]
+       </td>
+       <td>[% IF row.actual_tax %][% LxERP.format_amount(row.display_actual_tax, 2) %][% END %]</td>
+       <td>[% IF (problem.data.module == 'gl') || (idx != other_side) %][% HTML.escape(row.taxdescription) %][% END %]</td>
+       <td>[% IF row.expected_tax %][% LxERP.format_amount(row.display_expected_tax, 2) %][% END %]</td>
+       <td><img src="image/[% IF row.taxkey_error %]error[% ELSE %]ok[% END %].png"></td>
+
+       <td>
+        [% IF row.taxkey_error %]
+         <input type="hidden" name="fixes[+].acc_trans_id" value="[% HTML.escape(row.acc_trans_id) %]">
+         <input type="hidden" name="fixes[].tax_entry_acc_trans_id" value="[% HTML.escape(row.tax_entry_acc_trans_id) %]">
+         <select name="fixes[].taxkey" style="width: 250px" onchange="enable_fix_button_maybe()">
+          <option value="">[% '---please select---' | $T8 %]</option>
+          [% FOREACH taxkey = row.correct_taxkeys %]
+           <option value="[% HTML.escape(taxkey.taxkey) %]">[% HTML.escape(taxkey.description) %]</option>
+          [% END %]
+        [% ELSE %]
+        &nbsp;
+        [% END %]
+      </tr>
+     [% END %]
+    [% END %]
+
+   </table>
+  <hr>
+
+  <p>
+   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+   <input type="hidden" name="action" value="dispatcher">
+   <input type="hidden" name="trans_id" value="[% HTML.escape(problem.data.trans_id) %]">
+   <input type="hidden" name="module" value="[% HTML.escape(problem.data.module) %]">
+   <input type="hidden" name="reference" value="[% HTML.escape(problem.data.reference) %]">
+   <input type="submit" id="fix_transaction_button" name="action_fix_wrong_taxkeys" value="[% 'Fix transaction' | $T8 %]" disabled>
+   <input type="submit" name="action_delete_transaction" value="[% 'Delete transaction' | $T8 %]">
+   <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  </p>
+ </form>
+
+ <script type="text/javascript">
+  <!--
+    function enable_fix_button_maybe() {
+      $("#fix_transaction_button").prop('disabled', $("[name='fixes[].taxkey'][value='']").size() != 0);
+    }
+    -->
+ </script>
diff --git a/templates/design40_webpages/acctranscorrections/delete_transaction.html b/templates/design40_webpages/acctranscorrections/delete_transaction.html
new file mode 100644
index 000000000..1987cdefa
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/delete_transaction.html
@@ -0,0 +1,24 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<h1>[% title %]</h1>
+<div class="wrapper">
+  <p>
+  [%- IF module == 'ar' %]
+  [%- LxERP.t8('The AR transaction #1 has been deleted.', reference) | html %]
+  [%- ELSIF module == 'ap' %]
+  [%- LxERP.t8('The AP transaction #1 has been deleted.', reference) | html %]
+  [%- ELSE %]
+  [%- LxERP.t8('The GL transaction #1 has been deleted.', reference) | html %]
+  [%- END %]
+  </p>
+
+  <p>
+  <form method="post" action="acctranscorrections.pl">
+
+    <input type="hidden" name="action" value="redirect">
+    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+    <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+  </form>
+  </p>
+</div>
diff --git a/templates/design40_webpages/acctranscorrections/delete_transaction_confirmation.html b/templates/design40_webpages/acctranscorrections/delete_transaction_confirmation.html
new file mode 100644
index 000000000..5b6a485a1
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/delete_transaction_confirmation.html
@@ -0,0 +1,31 @@
+[%- USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<h1>[% title %]</h1>
+<div class="wrapper">
+  <p>
+  [%- IF module == 'ar' %]
+  [%- LxERP.t8('Do you really want to delete AR transaction #1?', reference) | html %]
+  [%- ELSIF module == 'ap' %]
+  [%- LxERP.t8('Do you really want to delete AP transaction #1?', reference) | html %]
+  [%- ELSE %]
+  [%- LxERP.t8('Do you really want to delete GL transaction #1?', reference) | html %]
+  [%- END %]
+  </p>
+
+  <p>
+  <form method="post" action="acctranscorrections.pl">
+
+    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+    <input type="hidden" name="trans_id" value="[% HTML.escape(trans_id) %]">
+    <input type="hidden" name="module" value="[% HTML.escape(module) %]">
+    <input type="hidden" name="reference" value="[% HTML.escape(reference) %]">
+
+    <input type="hidden" name="confirmation" value="1">
+    <input type="hidden" name="action" value="delete_transaction">
+
+    <input type="submit" value="[% 'Yes' | $T8 %]">
+    <input type="button" onclick="history.back()" value="[% 'No' | $T8 %]">
+  </form>
+  </p>
+</div>
diff --git a/templates/design40_webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html b/templates/design40_webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
new file mode 100644
index 000000000..9524b0af1
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html
@@ -0,0 +1,21 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+  <p>
+    [% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %]
+    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+  </p>
+
+  <p>
+    <form action="acctranscorrections.pl" method="post">
+      <input type="hidden" name="action" value="redirect">
+      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+    </form>
+  </p>
+
+</div>
\ No newline at end of file
diff --git a/templates/design40_webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html b/templates/design40_webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
new file mode 100644
index 000000000..cbd0d59b0
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html
@@ -0,0 +1,21 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+  <p>
+    [% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %]
+    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+  </p>
+
+  <p>
+    <form action="acctranscorrections.pl" method="post">
+      <input type="hidden" name="action" value="redirect">
+      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+    </form>
+  </p>
+
+</div>
diff --git a/templates/design40_webpages/acctranscorrections/fix_wrong_taxkeys.html b/templates/design40_webpages/acctranscorrections/fix_wrong_taxkeys.html
new file mode 100644
index 000000000..def05c3b5
--- /dev/null
+++ b/templates/design40_webpages/acctranscorrections/fix_wrong_taxkeys.html
@@ -0,0 +1,21 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+  <p>
+    [% 'The wrong taxkeys have been fixed.' | $T8 %]
+    [% 'Please re-run the analysis for broken general ledger entries by clicking this button:' | $T8 %]
+  </p>
+
+  <p>
+    <form action="acctranscorrections.pl" method="post">
+      <input type="hidden" name="action" value="redirect">
+      <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+      <input type="submit" value="[% 'Re-run analysis' | $T8 %]">
+    </form>
+  </p>
+
+</div>
\ No newline at end of file
diff --git a/templates/design40_webpages/admin/adminlogin.html b/templates/design40_webpages/admin/adminlogin.html
new file mode 100644
index 000000000..0e08c821a
--- /dev/null
+++ b/templates/design40_webpages/admin/adminlogin.html
@@ -0,0 +1,43 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L -%]
+<div class="login" id="login">
+  <h1>[% LxERP.t8('kivitendo v#1 administration', version) %]</h1>
+     <div class="logo">
+      <a href="http://www.kivitendo.de"><img src="image/kivitendo.png"></a>
+
+      [% IF error %]
+      <div class="message_error_login">[% HTML.escape(error) %]</div>
+      [% END %]
+    </div>
+
+
+  <form method="post" action="controller.pl">
+  [% L.hidden_tag("action",   'Admin/login') %]
+  [% L.hidden_tag("do_login", 1) %]
+  <div class="separate-form">
+  <table class="tbl-horizontal login">
+    <caption>[% 'Admin Login' | $T8 %]</caption>
+    <colgroup><col class="wi-small"><col class="wi-normal"></colgroup>
+ <tbody>
+  <tr>
+    <th>[% 'Password' | $T8 %]</th>
+    <td>[%- L.input_tag("{AUTH}admin_password", '', type="password", class="initial_focus", id="admin_password") %]</td>
+  </tr>
+  <tr>
+    <th></th>
+    <td>[% L.submit_tag('dummy', LxERP.t8('Login')) %]</td>
+  </tr>
+  </tbody>
+  </table>
+  </div>
+  </form>
+
+  <p style="text-align:center;">
+    <a href="controller.pl?action=LoginScreen/user_login" target="_top">[%- LxERP.t8('User login') %]</a>
+    &nbsp;|&nbsp;
+    <b>[% LxERP.t8('Documentation') %]</b>
+    <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('PDF') %]</a>/<a href="doc/html/index.html" target="_top">[%- LxERP.t8('HTML') %]</a>
+  </p>
+</div><!-- /.login -->
diff --git a/templates/design40_webpages/admin/check_auth_database.html b/templates/design40_webpages/admin/check_auth_database.html
new file mode 100644
index 000000000..512cbe942
--- /dev/null
+++ b/templates/design40_webpages/admin/check_auth_database.html
@@ -0,0 +1,53 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<form method="post" action="controller.pl">
+  [% L.hidden_tag("action", 'Admin/create_auth_db') %]
+  [% L.hidden_tag("{AUTH}admin_password", LXCONFIG.authentication.admin_password) %]
+
+  <p>[% 'The database for user management and authentication does not exist. You can create let kivitendo create it with the following parameters:' | $T8 %]</p>
+
+  <table class="tbl-horizontal">
+    <tr>
+      <th>[% 'Host' | $T8 %]:</th>
+      <td>[% HTML.escape(SELF.db_cfg.host) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Port' | $T8 %]:</th>
+      <td>[% HTML.escape(SELF.db_cfg.port) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'User name' | $T8 %]:</th>
+      <td>[% HTML.escape(SELF.db_cfg.user) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Database name' | $T8 %]:</th>
+      <td>[% HTML.escape(SELF.db_cfg.db) %]</td>
+    </tr>
+  </table>
+
+  <p>[% 'Please enter the name of the database that will be used as the template for the new database:' | $T8 %]</p>
+
+  <p>[% 'Template database' | $T8 %]: [% L.input_tag('db_template', "template1") %]</p>
+
+  <p>[% 'If the database user listed above does not have the right to create a database then enter the name and password of the superuser below:' | $T8 %]</p>
+
+  <table class="tbl-horizontal">
+    <tr>
+      <th>[% 'Superuser name' | $T8 %]:</th>
+      <td>[% L.input_tag('db_superuser', AUTH.DB_config.user, class="initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Password' | $T8 %]:</th>
+      <td>[% L.input_tag('db_superuser_password', AUTH.DB_config.password, type='password') %]</td>
+    </tr>
+  </table>
+
+  [% L.submit_tag("dummy", LxERP.t8("Create Dataset")) %]
+  [% L.button_tag("history.back()", LxERP.t8("Back")) %]
+</form>
+
diff --git a/templates/design40_webpages/admin/check_auth_tables.html b/templates/design40_webpages/admin/check_auth_tables.html
new file mode 100644
index 000000000..46b9d0f3b
--- /dev/null
+++ b/templates/design40_webpages/admin/check_auth_tables.html
@@ -0,0 +1,37 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h1>[% title %]</h1>
+
+<p>[% 'The tables for user management and authentication do not exist. They will be created in the next step in the following database:' | $T8 %]</p>
+
+<table>
+  <tr>
+    <td>[% 'Host' | $T8 %]:</td>
+    <td>[% HTML.escape(SELF.db_cfg.host) %]</td>
+  </tr>
+  <tr>
+    <td>[% 'Port' | $T8 %]:</td>
+    <td>[% HTML.escape(SELF.db_cfg.port) %]</td>
+  </tr>
+  <tr>
+    <td>[% 'User name' | $T8 %]:</td>
+    <td>[% HTML.escape(SELF.db_cfg.user) %]</td>
+  </tr>
+  <tr>
+    <td>[% 'Database name' | $T8 %]:</td>
+    <td>[% HTML.escape(SELF.db_cfg.db) %]</td>
+  </tr>
+</table>
+
+<p>[% 'If you want to change any of these parameters then press the "Back" button, edit the file "config/kivitendo.conf" and login into the admin module again.' | $T8 %]</p>
+
+<form method="post" action="controller.pl">
+  [% L.hidden_tag("action", 'Admin/create_auth_tables') %]
+  [% L.hidden_tag("{AUTH}admin_password", LXCONFIG.authentication.admin_password) %]
+  [% L.submit_tag("dummy", LxERP.t8("Create tables")) %]
+  [% L.button_tag("history.back()", LxERP.t8("Back")) %]
+</form>
+
diff --git a/templates/design40_webpages/admin/create_dataset.html b/templates/design40_webpages/admin/create_dataset.html
new file mode 100644
index 000000000..0f17650c5
--- /dev/null
+++ b/templates/design40_webpages/admin/create_dataset.html
@@ -0,0 +1,128 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form method="post" action="controller.pl">
+
+<div class="wrapper">
+
+  <p>
+    [% LxERP.t8('You can either create a new database or chose an existing database.') %]
+    [% LxERP.t8('In the latter case the tables needed by kivitendo will be created in that database.') %]
+  </p>
+ 
+  [% IF !superuser.have_privileges %]
+    <p>
+      [% LxERP.t8("Database superuser privileges are required for parts of the database modifications.") %]
+      [% LxERP.t8("Please provide corresponding credentials.") %]
+    </p>
+  [% END %]
+
+ 
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('Existing Datasets') %]</th>
+        <td>[% FOREACH db = SELF.all_dbsources %][% UNLESS loop.first %] [% END %][[% HTML.escape(db) %]][% END %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Create Dataset') %]</th>
+        <td>[% L.input_tag('db', FORM.db, class="initial_focus") %]</td>
+      </tr>
+      [% IF !superuser.have_privileges %] 
+        <tr>
+          <th>[% LxERP.t8("Database Superuser") %]</th>
+          <td>[% L.input_tag("database_superuser_user", superuser.username) %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Password") %]</th>
+          <td>[% L.input_tag("database_superuser_password", superuser.password, type="password") %]</td>
+        </tr>
+      [% END %] 
+      <tr>
+        <th>[% LxERP.t8('Default currency') %]</th>
+        <td>[% L.input_tag('defaultcurrency', FORM.defaultcurrency) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Precision') %]</th>
+        <td>[% L.input_tag('precision_as_number', LxERP.format_amount(FORM.precision, 2)) %] [% LxERP.t8('Precision Note') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Create Chart of Accounts') %]</th>
+        <td>[% L.select_tag('chart', SELF.all_charts, default=(FORM.chart), onchange='comment_selected_chart(this.value)') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Accounting method') %]</th>
+        <td>[% L.select_tag('accounting_method', SELF.all_accounting_methods, title_key='name', default=(FORM.accounting_method)) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Inventory system') %]</th>
+        <td>[% L.select_tag('inventory_system', SELF.all_inventory_systems, title_key='name', default=(FORM.inventory_system)) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Profit determination') %]</th>
+        <td>[% L.select_tag('profit_determination', SELF.all_profit_determinations, title_key='name', default=(FORM.profit_determination)) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  [% L.hidden_tag("dbhost", FORM.dbhost) %]
+  [% L.hidden_tag("dbport", FORM.dbport) %]
+  [% L.hidden_tag("dbuser", FORM.dbuser) %]
+  [% L.hidden_tag("dbpasswd", FORM.dbpasswd) %]
+  [% L.hidden_tag("dbdefault", FORM.dbdefault) %]
+  [% L.hidden_tag("action", "Admin/do_create_dataset") %]
+  [% L.hidden_tag("feature_balance", FORM.feature_balance) %]
+  [% L.hidden_tag("feature_datev", FORM.feature_datev) %]
+  [% L.hidden_tag("feature_erfolgsrechnung", FORM.feature_erfolgsrechnung) %]
+  [% L.hidden_tag("feature_eurechnung", FORM.feature_eurechnung) %]
+  [% L.hidden_tag("feature_ustva", FORM.feature_ustva) %]
+
+  <div class="buttons">
+    [% L.submit_tag('dummy', LxERP.t8('Create Dataset')) %]
+  </div>
+
+</div><!-- /.wrapper -->
+
+</form>
+
+<script type="text/javascript"><!--
+
+  function comment_selected_chart(s) {
+    if (s == 'Austria') {
+      alert("SKR07 Austria ist noch Stand 2002." +
+           "\n" +
+           "Die Buchungsgruppen sind nicht korrekt vorkonfiguriert" +
+           "\n" +
+           "fuer Kunden im Ausland." +
+           "\n" +
+           "Hinweis vom 20.09.2011");
+    }
+    return true;
+  }
+
+  function select_country_defaults(country) {
+    if (/^CH/.test(country)) {
+      document.getElementById('defaultcurrency').value='CHF';
+      document.getElementById('precision').value='0.05';
+      document.getElementById('chart').value='Switzerland-deutsch-MWST-2014';
+      document.getElementById('accounting_method').value='accrual';
+      document.getElementById('inventory_system').value='periodic';
+      document.getElementById('profit_determination').value='balance';
+    } else {
+      document.getElementById('defaultcurrency').value='EUR';
+      document.getElementById('precision').value='0.01';
+      document.getElementById('chart').value='Germany-DATEV-SKR03EU';
+      document.getElementById('accounting_method').value='cash';
+      document.getElementById('inventory_system').value='periodic';
+      document.getElementById('profit_determination').value='income';
+    }
+    return true;
+  }
+
+--></script>
diff --git a/templates/design40_webpages/admin/dbadmin.html b/templates/design40_webpages/admin/dbadmin.html
new file mode 100644
index 000000000..0511bd90a
--- /dev/null
+++ b/templates/design40_webpages/admin/dbadmin.html
@@ -0,0 +1,46 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% LxERP.t8("Database login (#1)", title) %]</h1>
+
+<div class="wrapper">
+<form method="post" action="controller.pl">
+<p>
+  [% LxERP.t8('Here you only provide the credentials for logging into the database.') %]
+  [% LxERP.t8('Nothing will be created or deleted at this stage!') %]
+</p>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Host') %]</th>
+      <td>[% L.input_tag('dbhost', dbhost, size=30, class="initial_focus wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Port') %]</th>
+      <td>[% L.input_tag('dbport', dbport, class="wi-verysmall") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Database User') %]</th>
+      <td>[% L.input_tag("dbuser", dbuser, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Password') %]</th>
+      <td>[% L.input_tag("dbpasswd", dbpasswd, type='password', class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Database template') %]</th>
+      <td>[% L.input_tag("dbdefault", dbdefault, class="wi-wide") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+[% L.hidden_tag("action", 'Admin/dispatch') %]
+
+<div class="buttons">[% L.submit_tag('action_' _ next_action, LxERP.t8('Login')) %]</div>
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/admin/delete_dataset.html b/templates/design40_webpages/admin/delete_dataset.html
new file mode 100644
index 000000000..6cfb6eb85
--- /dev/null
+++ b/templates/design40_webpages/admin/delete_dataset.html
@@ -0,0 +1,51 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE JavaScript %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<p>
+  [% LxERP.t8('You can only delete datasets that are not in use.') %]
+  [% LxERP.t8('If you want to delete such a dataset you have to edit the client(s) that are using the dataset in question and have them use another dataset.') %]
+</p>
+
+[% IF SELF.all_dbsources.size %]
+
+<form method="post" action="controller.pl">
+<p>
+  [% LxERP.t8('Please select the dataset you want to delete:') %]
+  [% L.select_tag('db', SELF.all_dbsources, class="initial_focus") %]
+</p>
+
+[% L.hidden_tag("dbhost", FORM.dbhost) %]
+[% L.hidden_tag("dbport", FORM.dbport) %]
+[% L.hidden_tag("dbuser", FORM.dbuser) %]
+[% L.hidden_tag("dbpasswd", FORM.dbpasswd) %]
+[% L.hidden_tag("dbdefault", FORM.dbdefault) %]
+[% L.hidden_tag("action", "Admin/do_delete_dataset") %]
+
+<div class="buttons">[% L.submit_tag('dummy', LxERP.t8('Delete Dataset'), id='submit') %]</div>
+
+</form>
+
+<script type="text/javascript"><!--
+
+var used_dbsources = {[% FOREACH client = SELF.all_clients %]
+  "[% JavaScript.escape(client.dbhost || 'localhost') %]:[% JavaScript.escape(client.dbport || '5432') %]:[% JavaScript.escape(client.dbname || 'localhost') %]": "[% JavaScript.escape(client.name) %]"[% UNLESS loop.last %],[% END %][% END %]
+};
+
+$(function() {
+  $('#submit').click(function() {
+    var client   = used_dbsources[$('#dbhost').val() + ':' + $('#dbport').val() + ':' + $('#db').val()];
+    var question = !client ? kivi.t8('Are you sure?') : kivi.t8('The selected database is still configured for client "#1". If you delete the database that client will stop working until you re-configure it. Do you still want to delete the database?', [ client ]);
+
+    return confirm(question);
+  });
+});
+
+--></script>
+
+[% END %]
diff --git a/templates/design40_webpages/admin/edit_client.html b/templates/design40_webpages/admin/edit_client.html
new file mode 100644
index 000000000..9e323ff6f
--- /dev/null
+++ b/templates/design40_webpages/admin/edit_client.html
@@ -0,0 +1,136 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form method="post" action="controller.pl" id="form">
+[% L.hidden_tag("client.id", SELF.client.id) %]
+[% L.hidden_tag("action", "") %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Settings") %]</caption>
+  <colgroup><col class="wi-normal"><col class="wi-normal"></colgroup>
+  <tbody>
+    [% IF SELF.client.id %]
+    <tr>
+      <th>[% LxERP.t8('Database ID') %]</th>
+      <td>[% HTML.escape(SELF.client.id) %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8('Client name') %]</th>
+      <td>[% L.input_tag("client.name", SELF.client.name, class="initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default client') %]</th>
+      <td>[% L.checkbox_tag("client.is_default", label=LxERP.t8('This is the client to be selected by default on the login screen.'), checked=SELF.client.is_default) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Database name') %]</th>
+      <td>[% L.input_tag("client.dbname", SELF.client.dbname, class="contains_dbsettings") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Database host and port') %]</th>
+      <td> [% L.input_tag("client.dbhost", SELF.client.dbhost, class="contains_dbsettings") %] [% L.input_tag("client.dbport", SELF.client.dbport, class="contains_dbsettings", size=6) %] </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Database user and password') %]</th>
+      <td>[% L.input_tag("client.dbuser", SELF.client.dbuser, class="contains_dbsettings") %] [% L.input_tag("client.dbpasswd", SELF.client.dbpasswd, class="contains_dbsettings", type="password") %] </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Run task server for this client with the following user") %]</th>
+      <td>[% L.select_tag("client.task_server_user_id", SELF.all_users, with_empty=1, empty_title=LxERP.t8("Do not run the task server for this client"), title_key="login", default=SELF.client.task_server_user_id) %] </td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.cols -->
+
+<div class="buttons">[% L.button_tag("test_database_connectivity()", LxERP.t8("Test database connectivity")) %] </div>
+
+
+<div class="wrapper">
+
+<div class="col">
+
+<h3>[% LxERP.t8("Access to clients") %]</h3>
+
+[% IF SELF.all_users.size %]
+  <p> [% LxERP.t8("The following users will have access to this client") %]: </p>
+  <div class="clearfix">
+    [% L.select_tag("client.users[]", SELF.all_users, id="client_users", title_key="login", default=SELF.client.users, default_value_key='id', multiple=1) %]
+    [% L.multiselect2side("client_users", labelsx => LxERP.t8("All users"), labeldx => LxERP.t8("Users that have access to this client")) %]
+  </div>
+
+[% ELSE %]
+  <p> [% LxERP.t8("No users have been created yet.") %] </p>
+[% END %]
+
+</div>
+
+
+<div class="col">
+
+<h3>[% LxERP.t8("Group assignment") %]</h3>
+
+[% IF SELF.all_groups.size %]
+  <p> [% LxERP.t8("The following groups are valid for this client") %]: </p>
+  <div class="clearfix">
+    [% L.select_tag("client.groups[]", SELF.all_groups, id="client_groups", title_key="name", default=SELF.client.groups, default_value_key='id', multiple=1) %]
+    [% L.multiselect2side("client_groups", labelsx => LxERP.t8("All groups"), labeldx => LxERP.t8("Groups valid for this client")) %]
+  </div>
+
+[% ELSE %]
+  <p> [% LxERP.t8("No groups have been created yet.") %] </p>
+[% END %]
+
+</div>
+
+</div><!-- /.cols -->
+
+
+<div class="buttons">
+  [% L.link(SELF.url_for(action="show"), LxERP.t8("Back"), class="button neutral") %]
+  [% L.button_tag("submit_with_action('save_client')", LxERP.t8("Save")) %]
+  [% IF SELF.client.id %]
+    [% L.button_tag("save_as_new()", LxERP.t8("Save as new")) %]
+    [% L.button_tag("submit_with_action('delete_client')", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
+  [% END %]
+</div>
+
+</form>
+
+<script type="text/javascript">
+ <!--
+  function submit_with_action(action) {
+    $("#action").val("Admin/" + action);
+    $("#form").submit();
+  }
+
+  function save_as_new() {
+    var new_client_name = prompt("[% LxERP.t8("Please enter the name for the new client.") %]", "");
+    if (!new_client_name)
+      return;
+
+    $("#client_name").val(new_client_name);
+    $("#client_id").val("");
+    submit_with_action("save_client");
+  }
+
+  function test_database_connectivity() {
+    kivi.popup_dialog({
+      url:    'controller.pl?action=Admin/test_database_connectivity',
+      data:   $(".contains_dbsettings").serialize(),
+      type:   'POST',
+      id:     'test_db_connection_window',
+      dialog: { title: kivi.t8('Database Connection Test') }
+    });
+    return true;
+  }
+   -->
+</script>
diff --git a/templates/design40_webpages/admin/edit_group.html b/templates/design40_webpages/admin/edit_group.html
new file mode 100644
index 000000000..e2da2ee49
--- /dev/null
+++ b/templates/design40_webpages/admin/edit_group.html
@@ -0,0 +1,117 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+
+<form method="post" action="controller.pl" id="form">
+[% L.hidden_tag("group.id", SELF.group.id) %]
+[% L.hidden_tag("action", "") %]
+
+<div class="wrapper">
+
+<div class="col wi-wide">
+<h2>[% LxERP.t8("Settings") %]</h2>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Name') %]</th>
+      <td>[% L.input_tag("group.name", SELF.group.name, class="initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Description') %]</th>
+      <td>[% L.input_tag("group.description", SELF.group.description) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<h2>[% LxERP.t8("Access rights") %]</h2>
+
+[% SET granted_rights = SELF.group.rights_map %]
+
+[% FOREACH section = SELF.all_rights %]
+[% SET section_number = loop.count %]
+[% SET num_checked = 0 %]
+[% FOREACH right = section.rights %]
+  [% SET name = right.name %]
+  [% IF granted_rights.$name %][% SET num_checked = num_checked + 1 %][% END %]
+[% END %]
+
+<div class="boxes">
+<h3 title="[% LxERP.t8('Select/Deselect all') %]">[% L.checkbox_tag('dummy' _ section_number, label=LxERP.t8('Section "#1"', section.description), checkall='.checkallgroup' _ section_number, checked=(num_checked == section.rights.size), title=LxERP.t8("Select/Deselect")) %]</h3>
+   [% FOREACH right = section.rights %]
+    [% SET name = right.name %]
+    <div>[% L.checkbox_tag("group.rights_map." _ name, label=right.description, checked=granted_rights.$name, class="checkallgroup" _ section_number) %]</div>
+     [% END %]
+  </div>
+ [% END %]
+
+</div><!-- /.col -->
+
+<div class="col">
+<h2>[% LxERP.t8("Group membership") %]</h2>
+
+[% IF SELF.all_users.size %]
+<div class="ms2side">
+  <p>[% LxERP.t8("The following users are a member of this group") %]:</p>
+  <!-- vormals:.clearfix -->
+  [% L.select_tag("group.users[]", SELF.all_users, id="group_users", title_key="login", default=SELF.group.users, default_value_key='id', multiple=1) %]
+  [% L.multiselect2side("group_users", labelsx => LxERP.t8("All users"), labeldx => LxERP.t8("Users that are a member in this group")) %]
+</div>
+[% ELSE %]
+  <p>[% LxERP.t8("No users have been created yet.") %]</p>
+[% END %]
+
+
+<h2>[% LxERP.t8("Client assignment") %]</h2>
+
+[% IF SELF.all_clients.size %]
+<div class="ms2side">
+  <p>[% LxERP.t8("This group is valid for the following clients") %]:</p>
+  <!-- vormals:.clearfix -->
+  [% L.select_tag("group.clients[]", SELF.all_clients, id="group_clients", title_key="name", default=SELF.group.clients, default_value_key='id', multiple=1) %]
+  [% L.multiselect2side("group_clients", labelsx => LxERP.t8("All clients"), labeldx => LxERP.t8("Clients this Group is valid for")) %]
+</div>
+
+[% ELSE %]
+  <p>[% LxERP.t8("No clients have been created yet.") %]</p>
+[% END %]
+
+
+<div class="buttons">
+  [% L.link(SELF.url_for(action="show"), LxERP.t8("Back"), class="button neutral") %]
+
+  [% L.button_tag("submit_with_action('save_group')", LxERP.t8("Save")) %]
+  [% IF SELF.group.id %]
+    [% L.button_tag("save_as_new()", LxERP.t8("Save as new")) %]
+    [% L.button_tag("submit_with_action('delete_group')", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
+  [% END %]
+</div>
+
+</div><!-- /.col -->
+
+</div><!-- /.wrapper -->
+</form>
+
+<script type="text/javascript">
+ <!--
+  function submit_with_action(action) {
+    $("#action").val("Admin/" + action);
+    $("#form").submit();
+  }
+
+  function save_as_new() {
+    var new_group_name = prompt("[% LxERP.t8("Please enter the name for the new group.") %]", "");
+    if (!new_group_name)
+      return;
+
+    $("#group_name").val(new_group_name);
+    $("#group_id").val("");
+    submit_with_action("save_group");
+  }
+   -->
+</script>
diff --git a/templates/design40_webpages/admin/edit_printer.html b/templates/design40_webpages/admin/edit_printer.html
new file mode 100644
index 000000000..4ab3118c5
--- /dev/null
+++ b/templates/design40_webpages/admin/edit_printer.html
@@ -0,0 +1,56 @@
+[% USE LxERP %]
+[% USE HTML  %]
+[% USE L     %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+[% INCLUDE 'common/flash.html' %]
+
+[% IF !SELF.all_clients.size %]
+<div class="message message_error">
+ <b>[% LxERP.t8("Error") %]:</b> [% LxERP.t8("No clients have been created yet.") %]
+</div>
+
+[% ELSE %]
+
+<form method="post">
+  [% L.hidden_tag("action", 'Admin/dispatch') %]
+  [% L.hidden_tag("printer.id", SELF.printer.id) %]
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Client') %]</th>
+      <td>[% L.select_tag("client.id", SELF.all_clients, default=SELF.client.id, title_key='name') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Printer Description') %]</th>
+      <td>[% L.input_tag("printer.printer_description", SELF.printer.printer_description, size=30, class="initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Printer Command') %]</th>
+      <td>[% L.input_tag("printer.printer_command", SELF.printer.printer_command, size=30) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Template Code') %]</th>
+      <td>[% L.input_tag("printer.template_code", SELF.printer.template_code, size=8) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  <a href="[% SELF.url_for(action='list_printers', 'client.id'=SELF.client.id) %]" class="button neutral">[% LxERP.t8("Back") %]</a>
+  [% L.submit_tag("action_save_printer", LxERP.t8("Save"), class="button") %]
+  [% IF SELF.printer.id %]
+    [% L.submit_tag("action_delete_printer", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
+  [% END %]
+</div>
+
+</form>
+
+</div><!-- /.wrapper -->
+
+
+[% END %]
diff --git a/templates/design40_webpages/admin/edit_user.html b/templates/design40_webpages/admin/edit_user.html
new file mode 100644
index 000000000..b177b2c1d
--- /dev/null
+++ b/templates/design40_webpages/admin/edit_user.html
@@ -0,0 +1,210 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE JavaScript %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form method="post" action="controller.pl" id="form">
+[% L.hidden_tag("user.id", SELF.user.id) %]
+[% L.hidden_tag("action", "") %]
+[% L.hidden_tag("check_previously_used", "0") %]
+[% L.hidden_tag("assign_documents", "0") %]
+[% SET props=SELF.user.config_values %]
+
+<!-- <h2>[% #LxERP.t8("Settings") %]</h2> -->
+<div class="wrapper">
+
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("User & Communication") %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-wide"></colgroup>
+  <tbody>
+  <tr>
+    <th>[% LxERP.t8('Login Name') %]</th>
+    <td>[% L.input_tag("user.login", SELF.user.login, class="initial_focus wi-wide") %]</td>
+  </tr>
+  [% IF AUTH.can_change_password %] 
+  <tr>
+    <th>[% LxERP.t8("New Password") %]</th>
+    <td>[% L.input_tag("new_password", "", type="password", class="wi-wide") %]</td>
+  </tr>
+  [% END %] 
+  <tr>
+    <th>[% LxERP.t8("Name") %]</th>
+    <td>[% L.input_tag("user.config_values.name", props.name, class="wi-wide") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('E-mail') %]</th>
+    <td>[% L.input_tag("user.config_values.email", props.email, class="wi-wide") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Signature') %]</th>
+    <td>[% L.textarea_tag("user.config_values.signature", props.signature, rows=3, cols=24, class="texteditor wi-wide") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Phone') %]</th>
+    <td>[% L.input_tag("user.config_values.tel", props.tel, class="wi-wide") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Fax') %]</th>
+    <td>[% L.input_tag("user.config_values.fax", props.fax, class="wi-wide") %]</td>
+  </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Formats & Language") %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-normal"></colgroup>
+  <tbody>
+  <tr>
+    <th>[% LxERP.t8("Date Format") %]</th>
+    <td>[% L.select_tag("user.config_values.dateformat", SELF.all_dateformats, default=props.dateformat, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Number Format") %]</th>
+    <td>[% L.select_tag("user.config_values.numberformat", SELF.all_numberformats, default=props.numberformat, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Language") %]</th>
+    <td>[% L.select_tag("user.config_values.countrycode", SELF.all_countrycodes, title_key="title", default=props.countrycode, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Stylesheet") %]</th>
+    <td>[% L.select_tag("user.config_values.stylesheet", SELF.all_stylesheets, default=props.stylesheet, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Setup Menu") %]</th>
+    <td>[% L.select_tag("user.config_values.menustyle", SELF.all_menustyles, title_key="title", default=props.menustyle, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Mandatory Departments") %]</th>
+    <td class="clear">
+      [% L.radio_button_tag('user.config_values.mandatory_departments', value='0', id='user.config_values.mandatory_departments_0', label=LxERP.t8('No'), checked=!props.mandatory_departments) %]
+      [% L.radio_button_tag('user.config_values.mandatory_departments', value='1', id='user.config_values.mandatory_departments_1', label=LxERP.t8('Yes'), checked= props.mandatory_departments)%] </td>
+  </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("CTI settings") %]</caption>
+  <tbody>
+  <tr>
+    <th>[% LxERP.t8("Phone extension") %]</th>
+    <td>[% L.input_tag("user.config_values.phone_extension", props.phone_extension, class="wi-normal") %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Phone password") %]</th>
+    <td>[% L.input_tag("user.config_values.phone_password", props.phone_password, class="wi-normal") %]</td>
+  </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+<div class="wrapper">
+
+<div class="col">
+<h3>[% LxERP.t8("Access to clients") %]</h3>
+
+[% IF SELF.all_clients.size %]
+  <p>[% LxERP.t8("This user will have access to the following clients") %]:</p>
+  <div class="clearfix">
+    [% L.select_tag("user.clients[]", SELF.all_clients, id="user_clients", title_key="name", default=SELF.user.clients, default_value_key='id', multiple=1) %]
+    [% L.multiselect2side("user_clients", labelsx => LxERP.t8("All clients"), labeldx => LxERP.t8("Clients this user has access to")) %]
+  </div>
+[% ELSE %]
+  <p>[% LxERP.t8("No clients have been created yet.") %]</p>
+[% END %]
+
+</div>
+
+
+<div class="col">
+<h3 class="caption">[% LxERP.t8("Group membership") %]</h3>
+
+[% IF SELF.all_groups.size %]
+  <p>[% LxERP.t8("This user is a member in the following groups") %]:</p>
+  <div class="clearfix">
+    [% L.select_tag("user.groups[]", SELF.all_groups, id="user_groups", title_key="name", default=SELF.user.groups, default_value_key='id', multiple=1) %]
+    [% L.multiselect2side("user_groups", labelsx => LxERP.t8("All groups"), labeldx => LxERP.t8("Groups this user is a member in")) %]
+  </div>
+[% ELSE %]
+  <p>[% LxERP.t8("No groups have been created yet.") %]</p>
+[% END %]
+</div>
+
+</div><!-- /.wrapper -->
+
+
+
+<div class="buttons">
+  [% L.link(SELF.url_for(action="show"), LxERP.t8("Back"), class="button neutral") %]
+  [% L.button_tag("save_new()", LxERP.t8("Save")) %]
+  [% IF SELF.user.id %]
+    [% L.button_tag("save_as_new()", LxERP.t8("Save as new")) %]
+    [% L.button_tag("submit_delete()", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
+  [% END %]
+</div>
+
+</form>
+
+<script type="text/javascript"><!--
+  function submit_with_action(action) {
+    $("#action").val("Admin/" + action);
+    $("#form").submit();
+  }
+
+  function submit_delete() {
+    [% SET used_for_task_server_in_clients = SELF.is_user_used_for_task_server(SELF.user) %]
+    [% IF used_for_task_server_in_clients %]
+      alert('[% JavaScript.escape(LxERP.t8('The user cannot be deleted as it is used in the following clients: #1', used_for_task_server_in_clients)) %]');
+      return false;
+    [% ELSE %]
+      submit_with_action('delete_user');
+    [% END %]
+  }
+
+  function save() {
+    $("#action").val('Admin/save_user');
+    var data = $('#form').serializeArray();
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  function save_new() {
+    $("#check_previously_used").val("1");
+    save();
+  }
+
+  function save_as_new() {
+    $("#user_id").val("");
+    $("#check_previously_used").val("1");
+    save();
+  }
+
+  function show_loginname_previously_used_dialog() {
+    var buttons = {};
+    buttons[kivi.t8('Yes')] = function() {
+      $("#check_previously_used").val("0");
+      $("#assign_documents").val("1");
+      save();
+    };
+    buttons[kivi.t8('No')] = function() {
+      $("#check_previously_used").val("0");
+      save();
+    };
+    buttons[kivi.t8('Cancel')] = function() { $( this ).dialog('close'); };
+
+    kivi.popup_dialog({
+      id: 'loginname_previously_used_dialog',
+      html: kivi.t8('The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?'),
+      dialog: {
+        title:  kivi.t8('Login name was previously used'),
+        width:  400,
+        height: 250,
+        buttons: buttons
+      }
+    });
+  }
+--></script>
diff --git a/templates/design40_webpages/admin/list_printers.html b/templates/design40_webpages/admin/list_printers.html
new file mode 100644
index 000000000..da058efc9
--- /dev/null
+++ b/templates/design40_webpages/admin/list_printers.html
@@ -0,0 +1,50 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+[% IF !SELF.all_clients.size %] 
+  [% INCLUDE 'common/flash.html' %] 
+  <div class="error">
+    [% LxERP.t8("Error") %]: [% LxERP.t8("No clients have been created yet.") %] 
+  </div>
+[% ELSE %] 
+  <p> [% LxERP.t8("Client to configure the printers for") %]: [% L.select_tag('client.id', SELF.all_clients, id='client_id', title_key='name', default=SELF.client.id) %] </p>
+  [% IF !SELF.all_printers.size %] 
+    <p> [% LxERP.t8("No printers have been created yet.") %] </p>
+  [% ELSE %] 
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th>[% LxERP.t8('Description') %]</th>
+        <th>[% LxERP.t8('Printer Command') %]</th>
+        <th>[% LxERP.t8('Template Code') %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH printer = SELF.all_printers %] 
+      <tr valign="top" class="listrow">
+        <td><a href="[% SELF.url_for(action='edit_printer', 'client.id'=SELF.client.id, id=printer.id) %]">[% HTML.escape(printer.printer_description) %]</a></td>
+        <td>[% HTML.escape(printer.printer_command) %]</td>
+        <td>[% HTML.escape(printer.template_code) %]</td>
+      </tr>
+      [% END %] 
+    </tbody>
+  </table>
+  [% END %]
+[% END %]
+</div>
+
+<script type="text/javascript">
+<!--
+  $(function() {
+    $('#client_id').change(function() {
+      window.location.href = "controller.pl?action=Admin/list_printers&client.id=" + $('#client_id').val();
+    });
+  });
+-->
+</script>
+
+
diff --git a/templates/design40_webpages/admin/show.html b/templates/design40_webpages/admin/show.html
new file mode 100644
index 000000000..92f7ee1cb
--- /dev/null
+++ b/templates/design40_webpages/admin/show.html
@@ -0,0 +1,115 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="tabwidget">
+  <ul>
+    <li><a href="#user_list">[% LxERP.t8("User list") %]</a></li>
+    <li><a href="#client_list">[% LxERP.t8("Client list") %]</a></li>
+    <li><a href="#group_list">[% LxERP.t8("Group list") %]</a></li>
+  </ul>
+  <div id="user_list">
+  [% IF !SELF.all_users.size %]
+    <p>
+      [% LxERP.t8("No users have been created yet.") %]
+      [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
+    </p>
+  [% ELSE %]
+    <table class="tbl-list">
+      <caption>[% LxERP.t8('User') %]</caption>
+      <thead>
+        <tr>
+          <th>[% LxERP.t8('Login Name') %]</th>
+          <th>[% LxERP.t8('Name') %]</th>
+          <th>[% LxERP.t8('Language') %]</th>
+        </tr>
+      </thead>
+      <tbody>
+      [% FOREACH user = SELF.all_users %]
+        [% SET config = user.config_values %]
+        <tr>
+          <td>[% L.link(SELF.url_for(action="edit_user", id=user.id), HTML.escape(user.login)) %]</td>
+          <td>[% HTML.escape(config.name) %]</td>
+          <td>[% HTML.escape(config.countrycode) %]</td>
+        </tr>
+      [% END %]
+      </tbody>
+    </table>
+  [% END %]
+</div>
+
+<div id="client_list">
+[% IF !SELF.all_clients.size %]
+  <p>
+    [% LxERP.t8("No clients have been created yet.") %]
+    [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
+  </p>
+[% ELSE %]
+  <table class="tbl-list">
+    <caption>[% LxERP.t8('Clients') %]</caption>
+    <thead>
+    <tr>
+      <th>[% LxERP.t8('Database ID') %]</th>
+      <th>[% LxERP.t8('Client name') %]</th>
+      <th>[% LxERP.t8('Database name') %]</th>
+      <th>[% LxERP.t8('Database Host') %]</th>
+      <th>[% LxERP.t8('Database User') %]</th>
+      <th>[% LxERP.t8('Default client') %]</th>
+      <th>[% LxERP.t8('Task server') %]</th>
+    </tr>
+    </thead>
+    <tbody>
+    [% FOREACH client = SELF.all_clients %]
+      <tr>
+        <td>[% L.link(SELF.url_for(action="edit_client", id=client.id), HTML.escape(client.id)) %]</td>
+        <td>[% L.link(SELF.url_for(action="edit_client", id=client.id), HTML.escape(client.name)) %]</td>
+        <td>[% HTML.escape(client.dbname) %]</td>
+        <td>[% HTML.escape(client.dbhost) %][% IF client.dbport %]:[% HTML.escape(client.dbport) %][% END %]</td>
+        <td>[% HTML.escape(client.dbuser) %]</td>
+        <td>[% IF client.is_default %][% LxERP.t8("Yes") %][% ELSE %][% LxERP.t8("No") %][% END %]</td>
+        <td>
+         [% IF client.task_server_user %]
+          [% LxERP.t8("execution as user '#1'", client.task_server_user.login) %]
+         [% ELSE %]
+          [% LxERP.t8("no execution for this client") %]
+         [% END %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+  </table>
+[% END %]
+</div>
+
+<div id="group_list">
+[% IF !SELF.all_groups.size %]
+  <p>
+    [% LxERP.t8("No groups have been created yet.") %]
+    [% LxERP.t8("In order to use kivitendo you have to create at least a client, a user and a group.") %]
+  </p>
+
+[% ELSE %]
+  <table class="tbl-list">
+    <caption>[% LxERP.t8('Groups') %]</caption>
+    <thead>
+      <tr>
+        <th>[% LxERP.t8('Name') %]</th>
+        <th>[% LxERP.t8('Description') %]</th>
+      </tr>
+    </thead>
+    <tbody>
+[% FOREACH group = SELF.all_groups %]
+    <tr>
+      <td>[% L.link(SELF.url_for(action="edit_group", id=group.id), HTML.escape(group.name)) %]</td>
+      <td>[% HTML.escape(group.description) %]</td>
+    </tr>
+[% END %]
+    </tbody>
+  </table>
+[% END %]
+  </div>
+</div>
diff --git a/templates/design40_webpages/admin/show_lock.html b/templates/design40_webpages/admin/show_lock.html
new file mode 100644
index 000000000..0b010fb91
--- /dev/null
+++ b/templates/design40_webpages/admin/show_lock.html
@@ -0,0 +1,36 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+[% INCLUDE 'common/flash.html' %]
+
+
+[% IF SELF.is_locked %]
+<p>
+  [% LxERP.t8("The installation is currently locked.") %]
+  [% LxERP.t8("Normal users cannot log in.") %]
+  [% LxERP.t8("The administration area is always accessible.") %]
+</p>
+
+<p><a href="[% SELF.url_for(action='unlock_system') %]" class="button">[% LxERP.t8("Unlock System") %]</a></p>
+
+[% ELSE %]
+
+<p>
+  [% LxERP.t8("The installation is currently unlocked.") %]
+  [% LxERP.t8("Everyone can log in.") %]
+</p>
+
+<p>
+  [% LxERP.t8("If you lock the system normal users won't be able to log in.") %]
+  [% LxERP.t8("The administration area is always accessible.") %]
+</p>
+
+<p><a href="[% SELF.url_for(action='lock_system') %]" class="button">[% LxERP.t8("Lock System") %]</a></p>
+
+[% END %]
+</div>
diff --git a/templates/design40_webpages/admin/test_db_connection.html b/templates/design40_webpages/admin/test_db_connection.html
new file mode 100644
index 000000000..0a25029f9
--- /dev/null
+++ b/templates/design40_webpages/admin/test_db_connection.html
@@ -0,0 +1,23 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% IF ok %]
+<p class="message message_ok">[% LxERP.t8('The connection was established successfully.') %]</p>
+
+[% ELSE %]
+
+<div class="message message_error">
+
+<p>
+  [% LxERP.t8('The connection to the database could not be established.') %]
+  [% LxERP.t8('Error message from the database driver:') %]
+</p>
+<p>[% HTML.escape(error) %]</p>
+</div>
+
+[% END %]
+
+<div>
+  <a href="#" onclick="$('#test_db_connection_window').dialog('close');" class="button neutral">[% LxERP.t8("Close Window") %]</a>
+</div>
diff --git a/templates/design40_webpages/am/_units_header_info.html b/templates/design40_webpages/am/_units_header_info.html
new file mode 100644
index 000000000..7c1b914d4
--- /dev/null
+++ b/templates/design40_webpages/am/_units_header_info.html
@@ -0,0 +1,9 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+<p>
+  [% LxERP.t8('All units have either no or exactly one base unit of which they are multiples.') %]
+  [% LxERP.t8('If you select a base unit then you also have to enter a factor.') %]
+  [% LxERP.t8('You have to define a unit as a multiple of a smaller unit.') %]
+  [% LxERP.t8('Therefore the definition of "kg" with the base unit "g" and a factor of 1000 is valid while defining "g" with a base unit of "kg" and a factor of "0.001" is not.') %]
+</p>
diff --git a/templates/design40_webpages/am/add_unit.html b/templates/design40_webpages/am/add_unit.html
new file mode 100644
index 000000000..e44112f08
--- /dev/null
+++ b/templates/design40_webpages/am/add_unit.html
@@ -0,0 +1,56 @@
+[% USE HTML %]
+[% USE T8 %]
+
+<h1>[% 'Add unit' | $T8 %]</h1>
+
+[% PROCESS "am/_units_header_info.html" %]
+
+<form method="post" action="[% HTML.escape(script) %]" id="form">
+<div class="wrapper">
+  <input type="hidden" name="type" value="unit">
+
+  <table class="tbl-horizontal">
+      <colgroup> <col class="wi-normal"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Unit' | $T8 %]</th>
+        <td><input type="text" name="new_name" size="20" class="wi-normal"></td>
+      </tr>
+      <tr>
+        <th>[% 'Base unit' | $T8 %]</th>
+        <td>
+          <select name="new_base_unit" class="wi-normal">
+            [% FOREACH row = NEW_BASE_UNIT_DDBOX %]
+              <option [% row.selected %]>[% row.name %]</option>
+            [% END %]
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Factor' | $T8 %]</th>
+        <td><input type="text" name="new_factor" class="wi-normal"></td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Translations' | $T8 %]</caption>
+    <colgroup> <col class="wi-normal"><col class="wi-lightwide"><col class="wi-small"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      [% FOREACH language = LANGUAGES %]
+        <tr>
+          <th>[% language.description %]</th>
+          <td><input type="text" name="new_localized_[% language.id %]" class="wi-normal" maxlength="20"></td>
+          <th>[% 'Plural' | $T8 %]</th>
+          <td><input type="text" name="new_localized_plural_[% language.id %]" class="wi-normal" maxlength="20"></td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+
+
+
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/am/audit_control.html b/templates/design40_webpages/am/audit_control.html
new file mode 100644
index 000000000..3022c95e1
--- /dev/null
+++ b/templates/design40_webpages/am/audit_control.html
@@ -0,0 +1,26 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE T8 %]
+[%- USE L %]
+
+<h1>[% title | html %]</h1>
+
+<div class="wrapper">
+<form method="post" action="am.pl" id="form">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Close Books up to' | $T8 %]</th>
+      <td>[% L.date_tag('closedto', closedto) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Maximum future booking interval' | $T8 %]</th>
+      <td><input type="text" name="max_future_booking_interval" id="max_future_booking_interval" value="[% HTML.escape(max_future_booking_interval) %]"></td>
+    </tr>
+  </tbody>
+</table>
+
+
+</form>
+</div>
diff --git a/templates/design40_webpages/am/config.html b/templates/design40_webpages/am/config.html
new file mode 100644
index 000000000..3f5091578
--- /dev/null
+++ b/templates/design40_webpages/am/config.html
@@ -0,0 +1,372 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% title %]</h1>
+
+<form method="post" action="am.pl" name="Form" id="form">
+<div class="tabwidget">
+<ul>
+  <li><a href="#page_personal_settings">[% 'Personal settings' | $T8 %]</a></li>
+  <li><a href="#page_display_options">[% 'Display options' | $T8 %]</a></li>
+  <li><a href="#page_print_options">[% 'Print options' | $T8 %]</a></li>
+  <li><a href="#page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
+  <li><a href="#page_follow_up_options">[% 'Follow-up options' | $T8 %]</a></li>
+</ul>
+
+
+<div id="page_personal_settings">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+      <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+      <caption> [% 'Personal settings' | $T8 %] </caption>
+      <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+      <tbody>
+      <tr>
+        <th>[% 'Name' | $T8 %]</th>
+        <td><input type="text" name="name" class="wi-wide" value="[% HTML.escape(MYCONFIG.name) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Password' | $T8 %]</th>
+        <td>
+          [% IF CAN_CHANGE_PASSWORD %]
+            <input type="password" name="new_password" class="wi-wide" value="********">
+          [% ELSE %]
+            <input type="hidden" name="new_password" value="********" class="wi-wide">
+          [% END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Email address' | $T8 %]</th>
+        <td><input type="text" name="email" class="wi-wide" value="[% HTML.escape(MYCONFIG.email) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Email signature' | $T8 %]</th>
+        <td>
+          [% P.textarea_tag("signature", MYCONFIG.signature, class="texteditor", rows="5", cols="50") %]
+        </td>
+      </tr>
+      <tr>
+        <th class="vmiddle">[% "Company's email signature" | $T8 %]</th>
+        <td>[% P.restricted_html(company_signature) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Phone' | $T8 %]</th>
+        <td><input type="text" name="tel" class="wi-wide" value="[% HTML.escape(MYCONFIG.tel) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'Fax' | $T8 %]</th>
+        <td><input type="text" name="fax" class="wi-wide" value="[% HTML.escape(MYCONFIG.fax) %]"></td>
+      </tr>
+      <tr>
+        <th>[% 'taxincluded checked' | $T8 %]</th>
+        <td> [% L.yes_no_tag('taxincluded_checked', MYCONFIG.taxincluded_checked, class='wi-small') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Focus position after update' | $T8 %]</th>
+        <td> [% L.select_tag( 'focus_position', [ ['new_description', LxERP.t8('New row, description')], ['new_partnumber', LxERP.t8('New row, partnumber')], ['new_qty', LxERP.t8('New row, qty')], ['last_description', LxERP.t8('Last row, description')], ['last_partnumber', LxERP.t8('Last row, partnumber')], ['last_qty', LxERP.t8('Last row, qty')], ], default => MYCONFIG.focus_position, class='wi-wide') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Item multi selection with qty' | $T8 %]</th>
+        <td> [% L.yes_no_tag('item_multiselect', MYCONFIG.item_multiselect, class='wi-small') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Use date and duration for time recordings' | $T8 %]</th>
+        <td> [% L.yes_no_tag('time_recording_use_duration', time_recording_use_duration, class='wi-small') %]
+        </td>
+      </tr>
+    </tbody>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_personal_settings -->
+
+<div id="page_display_options">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+    <colgroup> <col class="wi-lightwide"><col class="wi-lightwide"> </colgroup>
+    <caption>[% 'Display options' | $T8 %]</caption>
+    <tbody>
+    <tr>
+      <th>[% 'Date Format' | $T8 %]</th>
+      <td>[% L.select_tag('dateformat', DATEFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Time Format' | $T8 %]</th>
+      <td>[% L.select_tag('timeformat', TIMEFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Output Number Format' | $T8 %]</th>
+      <td>[% L.select_tag('numberformat', NUMBERFORMATS, value_key='value', title_key='name', class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>[% L.select_tag('countrycode', COUNTRYCODES, value_key = 'value', title_key = 'name', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Forced Layout Style' | $T8 %]</th>
+      <td>
+        [% L.select_tag('layout_style', [['', LxERP.t8('Use settings from client configuration')], ['auto', LxERP.t8('Automatic')], ['desktop', LxERP.t8('desktop version')]], default=layout_style, with_empty=0, class='wi-lightwide') %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Stylesheet' | $T8 %]</th>
+      <td>[% L.select_tag('usestylesheet', STYLESHEETS, value_key = 'value', title_key = 'name', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Setup Menu' | $T8 %]</th>
+      <td>
+        <select name="menustyle" class="wi-lightwide">
+          <option value="old"[% IF MYCONFIG.menustyle == 'old' %] selected[% END %]>[% 'Old (on the side)' | $T8 %]</option>
+          <option value="v3"[% IF MYCONFIG.menustyle == 'v3' %] selected[% END %]>[% 'Top (CSS)' | $T8 %]</option>
+          <option value="neu"[% IF MYCONFIG.menustyle == 'neu' %] selected[% END %]>[% 'Top (Javascript)' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Form details (second row)' | $T8 %]</th>
+      <td>
+        <select name="show_form_details" class="wi-lightwide">
+          <option value="1"[% IF  MYCONFIG.show_form_details %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+          <option value="0"[% IF !MYCONFIG.show_form_details %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Longdescription dialog size percentage from main window' | $T8 %]</th>
+      <td>
+        [% L.input_tag('longdescription_dialog_size_percentage', longdescription_dialog_size_percentage, size = 5) %]
+        <span class="description">
+          [%- '(0 means fix values)' | $T8 %]
+        </span>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Scrollbar height percentage for form postion area' | $T8 %]</th>
+      <td>
+        [% L.input_tag('positions_scrollbar_height',  positions_scrollbar_height, size = 5) %]
+        <span class="description">
+          [%- '(0 means no scrollbar)' | $T8 %]
+        </span>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Search parts by vendor partnumber (model) in purchase order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('purchase_search_makemodel', purchase_search_makemodel) %]
+        <div class="description">
+          [%- 'This also enables displaying a column with the vendor partnumber (model) (new order controller).' | $T8 %]
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Search parts by customer partnumber in sales order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('sales_search_customer_partnumber', sales_search_customer_partnumber) %]
+        <div class="description">
+          [%- 'This also enables displaying a column with the customer partnumber (new order controller).' | $T8 %]
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Show update button for positions in order forms' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('positions_show_update_button', positions_show_update_button) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Show custom variable search inputs' | $T8 %]</th>
+      <td>
+        <select name="hide_cvar_search_options" class="wi-lightwide">
+          <option value="0"[% IF !MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Show by default' | $T8 %]</option>
+          <option value="1"[% IF  MYCONFIG.hide_cvar_search_options %] selected[% END %]>[% 'Hide by default' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Number of columns of custom variables in form details (second row)' | $T8 %]</th>
+      <td>[% L.input_tag('form_cvars_nr_cols', MYCONFIG.form_cvars_nr_cols || 3, class='wi-verysmall') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Quick Searches that will be shown in the header for this user' | $T8 %]</th>
+      <td>
+        <div>
+          [% L.select_tag("quick_search_modules[]",
+            enabled_quick_searchmodules,
+            value_key  = "name",
+            title_key  = "description_config",
+            id         = "quick_searches",
+            multiple   = 1,
+            with_empty = 1,
+            size       = enabled_quick_searchmodules.size,
+            default    = default_quick_searchmodules) %]
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Displayable Name Preferences' | $T8 %]</th>
+      <td>
+        <table>
+          [% FOREACH module=displayable_name_specs_by_module.keys.sort %]
+          [%- SET spec=displayable_name_specs_by_module.$module -%]
+          <tr>
+            <th class="left">[% spec.specs.title %]</th>
+            <td>
+              <table>
+                <tr>
+                  <th class="left">[% 'Option' | $T8 %]</th>
+                  <th class="left">[% 'Name'   | $T8 %]</th>
+                </tr>
+                [% FOREACH option=spec.specs.options %]
+                <tr>
+                  <td>[% option.title %]</td>
+                  <td>[% option.name  %]</td>
+                </tr>
+                [% END %]
+                <tr>
+                  <th class="left">[% 'Display' | $T8 %]:</th>
+                  <td>
+                    [% L.hidden_tag("displayable_name_specs[+].module", module) %]
+                    [% L.input_tag("displayable_name_specs[].value", spec.prefs.get, size=50) %]
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          [% END %]
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Part picker search dialog (magnifying glass): "all as list" defaults to on' | $T8 %]</th>
+      <td>
+        [% L.yes_no_tag('part_picker_search_all_as_list_default', part_picker_search_all_as_list_default) %]
+      </td>
+    </tr>
+     <tr>
+       <th>[% 'Item input position for quotations and orders' | $T8 %]</th>
+       <td>
+        [% L.select_tag('order_item_input_position', [ [ 'default', LxERP.t8('Use settings from client configuration') ], [ 0, LxERP.t8('above the positions') ], [ 1, LxERP.t8('below the positions') ] ], default=order_item_input_position) %]
+      </td>
+    </tr>
+    </tbody>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_display_options -->
+
+
+<div id="page_print_options">
+  <div class="wrapper">
+    <input name="printer" type="hidden" value="[% HTML.escape(MYCONFIG.printer) %]">
+    <table class="tbl-horizontal">
+      <caption>[% 'Print options' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% 'Default template format' | $T8 %]</th>
+          <td> [% L.select_tag('template_format', TEMPLATE_FORMATS, value_key = 'value', title_key = 'name', class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Default output medium' | $T8 %]</th>
+          <td> [% L.select_tag('default_media', MEDIA, value_key = 'value', title_key = 'name', class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Default printer' | $T8 %]</th>
+          <td> [% L.select_tag('default_printer_id', PRINTERS, default = MYCONFIG.default_printer_id, title_key = 'printer_description', with_empty = 1, class='wi-normal') %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Number of copies' | $T8 %]</th>
+          <td>
+          <input type="text" name="copies" size="10" value="[% HTML.escape(MYCONFIG.copies) %]" class="wi-normal">
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_print_options -->
+
+
+<div id="page_todo_list_options">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+    <caption>[% 'TODO list options' | $T8 %]</caption>
+      <colgroup> <col class="wi-normal"><col class="wi-normal"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Show your TODO list after logging in' | $T8 %]</th>
+        <td>
+        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_1" value="1"[% IF todo_cfg.show_after_login %] checked[% END %]>
+        <label for="todo_cfg_show_after_login_1">[% 'Yes' | $T8 %]</label>
+        <input type="radio" name="todo_cfg.show_after_login" id="todo_cfg_show_after_login_0" value="0"[% IF !todo_cfg.show_after_login %] checked[% END %]>
+        <label for="todo_cfg_show_after_login_0">[% 'No' | $T8 %]</label>
+        </td>
+      </tr>
+      <tr>
+        <th colspan="2" class="caption">[% 'Configuration of individual TODO items' | $T8 %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Show follow ups...' | $T8 %]</th>
+        <td>
+          <input type="checkbox" name="todo_cfg.show_follow_ups" id="todo_cfg_show_follow_ups" value="1"[% IF todo_cfg.show_follow_ups %] checked[% END %]>
+          <label for="todo_cfg_show_follow_ups">[% '...on the TODO list' | $T8 %]</label> <br>
+          <input type="checkbox" name="todo_cfg.show_follow_ups_login" id="todo_cfg_show_follow_ups_login" value="1"[% IF todo_cfg.show_follow_ups_login %] checked[% END %]>
+          <label for="todo_cfg_show_follow_ups_login">[% '...after logging in' | $T8 %]</label>
+        </td>
+      </tr>
+      [% IF AUTH.assert('sales_quotation_edit', 'may_fail') %]
+      <tr>
+        <th>[% 'Show overdue sales quotations and requests for quotations...' | $T8 %]</th>
+        <td>
+          <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations" id="todo_cfg_show_overdue_sales_quotations" value="1"[% IF todo_cfg.show_overdue_sales_quotations %] checked[% END %]>
+          <label for="todo_cfg_show_overdue_sales_quotations">[% '...on the TODO list' | $T8 %]</label> <br>
+          <input type="checkbox" name="todo_cfg.show_overdue_sales_quotations_login" id="todo_cfg_show_overdue_sales_quotations_login" value="1"[% IF todo_cfg.show_overdue_sales_quotations_login %] checked[% END %]>
+          <label for="todo_cfg_show_overdue_sales_quotations_login">[% '...after logging in' | $T8 %]</label>
+        </td>
+      </tr>
+      [% END %]
+    </tbody>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_todo_list_options -->
+
+
+<div id="page_follow_up_options">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+    <caption>[% 'Follow-up options' | $T8 %]</caption>
+      <colgroup> <col class="wi-normal"><col class="wi-normal"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Notify me by email for follow-ups' | $T8 %]</th>
+        <td>
+          <input type="radio" name="follow_up_notify_by_email" id="follow_up_notify_by_email_1" value="1"[% IF follow_up_notify_by_email %] checked[% END %]>
+          <label for="follow_up_notify_by_email_1">[% 'Yes' | $T8 %]</label>
+          <input type="radio" name="follow_up_notify_by_email" id="follow_up_notify_by_email_0" value="0"[% IF !follow_up_notify_by_email %] checked[% END %]>
+          <label for="follow_up_notify_by_email_0">[% 'No' | $T8 %]</label>
+        </td>
+      </tr>
+    </table>
+  </div><!-- /.wrapper -->
+</div><!-- /#page_follow_up_options -->
+
+</div>
+</form>
+
+ <script type="text/javascript">
+  <!--
+$(function() {
+  $("#full_signature").toggle();
+  $("#edit_signature").toggle();
+  $('.togglelink').click(function() {
+    $('.toggletextarea').toggle();
+    $('.togglelink').toggle();
+    return false;
+  });
+});
+    -->
+ </script>
diff --git a/templates/design40_webpages/am/edit_accounts.html b/templates/design40_webpages/am/edit_accounts.html
new file mode 100644
index 000000000..0dd38e808
--- /dev/null
+++ b/templates/design40_webpages/am/edit_accounts.html
@@ -0,0 +1,282 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript" src="js/FormManager.js" >
+/****************************************************
+* Form Dependency Manager- By Twey- http://www.twey.co.uk
+* Visit Dynamic Drive for this script and more: http://www.dynamicdrive.com
+****************************************************/
+</script>
+
+<script type="text/javascript">
+$(function() {
+    setupDependencies('EditAccount'); //name of form(s). Separate each with a comma (ie: 'weboptions', 'myotherform' )
+});
+</script>
+
+<form method="post" name="EditAccount" action="am.pl" id="form">
+
+<div class="wrapper">
+
+<input type="hidden" name="id"                 value="[% HTML.escape(id) %]">
+<input type="hidden" name="type"               value="account">
+<input type="hidden" name="orphaned"           value="[% HTML.escape(orphaned) %]">
+<input type="hidden" name="new_chart_valid"    value="[% HTML.escape(new_chart_valid) %]">
+<input type="hidden" name="inventory_accno_id" value="[% HTML.escape(inventory_accno_id) %]">
+<input type="hidden" name="income_accno_id"    value="[% HTML.escape(income_accno_id) %]">
+<input type="hidden" name="expense_accno_id"   value="[% HTML.escape(expense_accno_id) %]">
+<input type="hidden" name="fxgain_accno_id"    value="[% HTML.escape(fxgain_accno_id) %]">
+<input type="hidden" name="fxloss_accno_id"    value="[% HTML.escape(fxloss_accno_id) %]">
+<input type="hidden" name="rndgain_accno_id"   value="[% HTML.escape(rndgain_accno_id) %]">
+<input type="hidden" name="rndloss_accno_id"   value="[% HTML.escape(rndloss_accno_id) %]">
+
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Main Preferences' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th> [% 'Account Number' | $T8 %] </th>
+      <td><input id="accno" name="accno" type="text" size="10" class="wi-small" value="[% HTML.escape(accno) %]"></td>
+    </tr>
+    <tr>
+      <th> [% 'Description' | $T8 %] </th>
+      <td><input id="description" name="description" type="text" size="40" class="wi-wide" value="[% HTML.escape(description) %]"></td>
+    </tr>
+    <tr>
+      <th> [% 'Chart Type' | $T8 %] </th>
+      <td> [% IF AccountIsPosted %]
+              [% L.select_tag('dummy_charttype',
+                              all_charttypes,
+                              title_key => 'name',
+                              value_key => 'value',
+                              default => selected_charttype,
+                              disabled => '1',
+                              class = 'wi-wide') %]
+              [% L.hidden_tag('charttype', selected_charttype) %]
+          [% ELSE %]
+              [% L.select_tag('charttype',
+                              all_charttypes,
+                              title_key => 'name',
+                              value_key => 'value',
+                              default => selected_charttype,
+                              class = 'wi-wide') %]
+          [% END %] </td>
+    </tr>
+    <tr>
+      <th>[% 'Account Type' | $T8 %]</th>
+      <td><select name="category" id="AccountType" class="wi-wide">[% select_category %]</select></td>
+    </tr>
+    <tr>
+     <td>[% 'Invalid' | $T8 %] </td>
+     <td>[% L.checkbox_tag('invalid', value => 1, checked => invalid, class => 'checkbox') %]</td>
+    </tr>
+    [% IF ChartTypeIsAccount %]
+    <tr>
+      <th>[% 'Is this a summary account to record' | $T8 %]</th>
+      <td>
+        [% L.radio_button_tag('summary_account', value => 'AR', disabled => AccountIsPosted, checked  => AR) %]
+        <label for="summary_account_AR">[% 'AR' | $T8 %]</label><br>
+        [% L.radio_button_tag('summary_account', value => 'AP', disabled => AccountIsPosted, checked  => AP) %]
+        <label for="summary_account_AP">[% 'AP' | $T8 %]</label><br>
+        [% L.radio_button_tag('summary_account', value => 'IC', disabled => AccountIsPosted, checked  => IC) %]
+        <label for="summary_account_IC">[% 'Inventory' | $T8 %]</label><br>
+        [% L.radio_button_tag('summary_account', value => '', disabled => AccountIsPosted) %]
+        <label for="summary_account_">[% 'No summary account' | $T8 %]</label>
+
+        [% IF AccountIsPosted %]
+          [% IF AR %] [% L.hidden_tag('AR', 'AR') %] [% END %]
+          [% IF AP %] [% L.hidden_tag('AP', 'AP') %] [% END %]
+          [% IF IC %] [% L.hidden_tag('IC', 'IC') %] [% END %]
+        [% END %]
+
+        [% IF AccountIsPosted %]
+          [% IF AR_amount %] [% L.hidden_tag('AR_amount', 'AR_amount') %] [% END %]
+          [% IF AR_paid   %] [% L.hidden_tag('AR_paid',   'AR_paid')   %] [% END %]
+          [% IF AR_tax    %] [% L.hidden_tag('AR_tax',    'AR_tax')    %] [% END %]
+          [% IF AP_amount %] [% L.hidden_tag('AP_amount', 'AP_amount') %] [% END %]
+          [% IF AP_paid   %] [% L.hidden_tag('AP_paid',   'AP_paid')   %] [% END %]
+          [% IF AP_tax    %] [% L.hidden_tag('AP_tax',    'AP_tax')    %] [% END %]
+          [% SET DIS = ' disabled="disabled"' %]
+        [% END %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<h3 class="caption">[% 'Taxkeys and Taxreport Preferences' | $T8 %]</h3>
+<div class="long-desc small">
+  <p>[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]</p>
+</div>
+<table class="tbl-horizontal">
+  <thead>
+    <tr>
+      <th>[% 'Taxkey' | $T8 %]</th>
+      <th>[% 'valid from' | $T8 %]</th>
+      [% IF feature_ustva %]<th>[% 'pos_ustva' | $T8 %]</th>[% END %]
+      <th>[% 'delete' | $T8 %]? </th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH tk = ACCOUNT_TAXKEYS %]
+      <tr>
+        [% IF tk.id %]
+          <td>
+            <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]">
+            <select name="taxkey_tax_[% tk.runningnumber %]" class="wi-wider">[% tk.selecttaxkey %]</select>
+          </td>
+          <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]" type="text" class="wi-date"></td>
+          [% IF feature_ustva %]
+            <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]" class="wi-wider">[% tk.select_tax %]</select></td>
+          [% END %]
+          <td class="center">
+            <input name="taxkey_del_[% tk.runningnumber %]" type="checkbox" value="delete">
+          </td>
+        [% ELSE %]
+          <td>
+            <input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW">
+            <select name="taxkey_tax_[% tk.runningnumber %]" class="wi-wider">[% tk.selecttaxkey %]</select>
+          </td>
+          <td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]" type="text" class="wi-date"></td>
+          [% IF feature_ustva %]
+            <td><select name="taxkey_pos_ustva_[% tk.runningnumber %]" class="wi-wider">[% tk.select_tax %]</select></td>
+          [% END %]
+          <td>&nbsp;</td>
+        [% END %]
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Report and misc. Preferences' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+  [% IF feature_erfolgsrechnung %]
+    <tr>
+      <th>[% 'Erfolgsrechnung' | $T8 %]</th>
+      <td><select name="pos_er" class="wi-wider">[% select_er %]</select></td>
+    </tr>
+  [% END %]
+  [% IF feature_eurechnung %]
+    <tr>
+      <th>[% 'EUER' | $T8 %]</th>
+      <td><select name="pos_eur" class="wi-wider">[% select_eur %]</select></td>
+    </tr>
+    <tr>
+      <th>[% 'BWA' | $T8 %]</th>
+      <td><select name="pos_bwa" class="wi-wider">[% select_bwa %]</select></td>
+    </tr>
+  [% END %]
+  [% IF feature_datev %]
+    <tr>
+      <th>[% 'Datevautomatik' | $T8 %]</th>
+      <td><input name="datevautomatik" type="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td>
+    </tr>
+  [% END %]
+  <tr>
+    <th>[% 'Folgekonto' | $T8 %]</th>
+    <td>
+      <select name="new_chart_id" class="wi-wider">[% selectnewaccount %]</select>
+      <span class="label with-element">[% 'Valid from' | $T8 %]
+      <input name="valid_from" value="[% valid_from %]" type="text" class="wi-mediumsmall"></span>
+    </td>
+  </tr>
+  [% #IF feature_balance %]
+    <!-- PENDENT: UPDATE: Diese Steuerfunktion hat keine Auswirkung in der Bilanz und wird erstmal deaktiviert. -->
+    <!--
+    <tr>
+      <th>[% 'Bilanz' | $T8 %]</th>
+      <td colspan="3"><select name="pos_bilanz">[% select_bilanz %]</select></td>
+    </tr>
+   -->
+  [% #END %]
+  </tbody>
+</table>
+[% END %]
+
+</div><!-- /.col -->
+
+<div class="col" style="width:30.0em;">
+
+
+<h3 class="caption">[% 'Include in drop-down menus' | $T8 %]</h3>
+<div class="long-description small"><p>[% 'Changes in this block are only sensible if the account is NOT a summary account AND there exists one valid taxkey. To select both Receivables and Payables only make sense for Payment / Receipt (i.e. account cash).' | $T8 %]</p>
+  <p>
+    [% 'Changes to Receivables and Payables are only possible if no transactions to this account are posted yet.' | $T8 %]
+    [% 'The changing of tax-o-matic account is NOT recommended, but if you do so please also (re)configure booking groups and reconfigure ALL charts which point to this tax-o-matic account. ' | $T8 %]</p>
+</div><!-- /.long-description -->
+
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-normal"><col class="wi-normal"></colgroup>
+  <tbody>
+    <tr>
+      <td><b>[% 'Receivables' | $T8 %]</b><br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_amount', disabled => AccountIsPosted, checked  => AR_amount) %]
+        <label for="AR_include_in_dropdown_AR_amount">[% 'Revenue' | $T8 %]</label><br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_paid', disabled => AccountIsPosted, checked  => AR_paid) %]
+        <label for="AR_include_in_dropdown_AR_paid">[% 'Receipt' | $T8 %]</label><br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => 'AR_tax', disabled => AccountIsPosted, checked  => AR_tax) %]
+        <label for="AR_include_in_dropdown_AR_tax">[% 'Tax' | $T8 %]</label><br>
+        [% L.radio_button_tag('AR_include_in_dropdown', value => '', disabled => AccountIsPosted) %]
+        <label for="AR_include_in_dropdown_">[% 'do not include' | $T8 %]</label>
+      </td>
+      <td><b>[% 'Payables' | $T8 %]</b><br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_amount', disabled => AccountIsPosted, checked  => AP_amount) %]
+        <label for="AP_include_in_dropdown_AP_amount">[% 'Expense/Asset' | $T8 %]</label><br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_paid', disabled => AccountIsPosted, checked  => AP_paid) %]
+        <label for="AP_include_in_dropdown_AP_paid">[% 'Payment' | $T8 %]</label><br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => 'AP_tax', disabled => AccountIsPosted, checked  => AP_tax) %]
+        <label for="AP_include_in_dropdown_AP_tax">[% 'Tax' | $T8 %]</label><br>
+        [% L.radio_button_tag('AP_include_in_dropdown', value => '', disabled => AccountIsPosted) %]
+        <label for="AP_include_in_dropdown_">[% 'do not include' | $T8 %]</label></td>
+    </tr>
+    <tr>
+      <td><b>[% 'Parts Inventory' | $T8 %]</b><br>
+        <input id="IC_sale" name="IC_sale" type="checkbox" value="IC_sale"[% HTML.escape(IC_sale) %]>
+        <label for="IC_sale">[% 'Revenue' | $T8 %]</label><br>
+        <input id="IC_cogs" name="IC_cogs" type="checkbox" value="IC_cogs"[% HTML.escape(IC_cogs) %]>
+        <label for="IC_cogs">[% 'Expense' | $T8 %]</label><br>
+        <input id="IC_taxpart" name="IC_taxpart" type="checkbox" value="IC_taxpart" [% HTML.escape(IC_taxpart) %]>
+        <label for="IC_taxpart">[% 'Tax' | $T8 %]</label>
+      </td>
+      <td><b>[% 'Service Items' | $T8 %]</b><br>
+        <input id="IC_income" name="IC_income" type="checkbox" value="IC_income"[% HTML.escape(IC_income) %]>
+        <label for="IC_income">[% 'Revenue' | $T8 %]</label><br>
+        <input id="IC_expense" name="IC_expense" type="checkbox" value="IC_expense"[% HTML.escape(IC_expense) %]>
+        <label for="IC_expense">[% 'Expense' | $T8 %]</label><br>
+        <input id="IC_taxservice" name="IC_taxservice" type="checkbox" value="IC_taxservice"[% HTML.escape(IC_taxservice) %]>
+        <label for="IC_taxservice">[% 'Tax' | $T8 %]</label>
+      </td>
+    </tr>
+  </tbody>
+</table>
+</div><!-- /.col -->
+
+</div>
+
+
+
+[% IF ( id ) %]
+<script type="text/javascript">
+  function callback_save() {
+    var prev_desc = "[% description | html %]";
+    var prev_accno = "[% accno | html %]";
+    var cur_desc = $("#description").val();
+    var cur_accno = $("#accno").val();
+
+    if ( prev_desc != cur_desc || prev_accno != cur_accno )
+      return confirm(kivi.t8("Do you want to set the account number \"#1\" to \"#2\" and the name \"#3\" to \"#4\"?", [prev_accno, cur_accno, prev_desc, cur_desc]));
+    else
+      return true;
+  }
+</script>
+[% END %]
+[% L.hidden_tag('callback', callback) %]
+</form>
diff --git a/templates/design40_webpages/am/edit_bins.html b/templates/design40_webpages/am/edit_bins.html
new file mode 100644
index 000000000..dce5dc57d
--- /dev/null
+++ b/templates/design40_webpages/am/edit_bins.html
@@ -0,0 +1,58 @@
+[%- USE HTML -%][%- USE T8 -%]
+
+<h1>[% title %]</h1>
+<div class="wrapper">
+[% UNLESS BINS.size %]
+ <p>[% 'No bins have been added to this warehouse yet.' | $T8 %]</p>
+
+[% ELSE %]
+
+ <p>
+  [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the &quot;Delete&quot; column.' | $T8 %]
+ </p>
+
+ <form method="post" action="am.pl" id="form">
+
+  <input type="hidden" name="warehouse_id" value="[% HTML.escape(id) %]">
+
+  <input type="hidden" name="type" value="bin">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <!-- UPDATE: dieses unlustige Konstrukt mit einem echten Mehrspalter versehen, und das ab einer bestimmten Anzahl Plaetze-->
+  <table class="tbl-list width-moderate">
+    <thead>
+   <tr>
+    <th>[% 'Delete' | $T8 %]</th><th>[% 'Description' | $T8 %]</th>
+    <!-- <th>[% #'Delete' | $T8 %]</th><th>[% #'Description' | $T8 %]</th> -->
+   </tr>
+   </thead>
+   <tbody>
+   [%- SET row_odd = '1' %]
+   [%- USE bin_it = Iterator(BINS) %]
+   [%- FOREACH bin = bin_it %]
+   [%- #IF row_odd %]
+   <tr>
+    [%- #END %]
+
+    <td class="center">[% IF bin.in_use %]&nbsp;[% ELSE %]<input type="checkbox" name="delete_[% bin_it.count %]" value="1">[% END %]</td>
+    <td>
+     <input type="hidden" name="id_[% bin_it.count %]" value="[% HTML.escape(bin.id) %]">
+     <input name="description_[% bin_it.count %]" value="[% HTML.escape(bin.description) %]" type="text" class="wi-wide">
+    </td>
+
+    [%- #SET end_tr = '0' %]
+    [%- #UNLESS row_odd %][%- #SET end_tr = '1' %][%- #END %]
+    [%- #IF bin_it.last %][%- #SET end_tr = '1' %][%- #END %]
+    [%- #IF end_tr %]
+   </tr>
+   [%- #END %]
+
+   [%- #IF row_odd %][% #SET row_odd = '0' %][% #ELSE %][% #SET row_odd = '1' %][% #END %]
+   [%- END %]
+   </tbody>
+  </table>
+
+  <input type="hidden" name="rowcount" value="[% BINS.size %]">
+ </form>
+</div>
+[% END %]
diff --git a/templates/design40_webpages/am/edit_tax.html b/templates/design40_webpages/am/edit_tax.html
new file mode 100644
index 000000000..cd1a816d7
--- /dev/null
+++ b/templates/design40_webpages/am/edit_tax.html
@@ -0,0 +1,135 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% 'Tax-O-Matic' | $T8 %] [% title %]</h1>
+
+<form method="post" action="am.pl" id="form">
+
+<input type="hidden" name="id" value="[% HTML.escape(id) %]">
+<input type="hidden" name="type" value="tax">
+
+<div class="wrapper cols">
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Tax' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'tax_taxkey' | $T8 %]</th>
+      <td>
+        [% IF tax_already_used %]
+          [% HTML.escape(taxkey) %]
+          <input type="hidden" name="taxkey" value="[% HTML.escape(taxkey) %]">
+        [% ELSE %]
+          <input name="taxkey" value="[% HTML.escape(taxkey) %]" class="wi-tinynumber" type="text">
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <td><input name="taxdescription" value="[% HTML.escape(taxdescription) %]" class="wi-verywide" type="text"></td>
+    </tr>
+    [% FOREACH language = LANGUAGES %]
+    <tr>
+      <th>[% HTML.escape(language.description) %] ([% LxERP.t8('Translation') %])</th>
+      <td><input name="translation_[% language.id %]" value="[% HTML.escape(TAX.translated_attribute('taxdescription', language, 1)) %]" class="wi-verywide" type="text"></td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'tax_percent' | $T8 %]</th>
+      <td>
+        [% IF tax_already_used %]
+          [% HTML.escape(rate) %]%
+          <input type="hidden" name="rate" value="[% HTML.escape(rate) %]">
+        [% ELSE %]
+          <input name="rate" value="[% HTML.escape(rate) %]" class="wi-tinynumber" type="text">%
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'tax_chartaccno' | $T8 %]</th>
+      <td>
+        <select name="chart_id" class="wi-verywide">
+          <option value="">[% 'None' | $T8 %]</option>
+          [% FOREACH row = ACCOUNTS %]
+            <option value="[% HTML.escape(row.id) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.taxaccount) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Automatic skonto chart sales' | $T8 %]</th>
+      <td>[% L.select_tag('skonto_sales_chart_id', AR_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_sales_chart_id, class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Automatic skonto chart purchase' | $T8 %]</th>
+      <td>[% L.select_tag('skonto_purchase_chart_id', AP_PAID, value_title_sub = \skontochart_value_title_sub, with_empty = 1, default = skonto_purchase_chart_id class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Account categories' | $T8 %]</th>
+      <td>
+        [% IF asset %]
+          [% L.checkbox_tag('asset', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('asset', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Asset' | $T8 %] (A) <br>
+
+        [% IF liability %]
+          [% L.checkbox_tag('liability', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('liability', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Liability' | $T8 %] (L) <br>
+
+        [% IF equity %]
+          [% L.checkbox_tag('equity', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('equity', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Equity' | $T8 %] (Q) <br>
+
+        [% IF revenue %]
+          [% L.checkbox_tag('revenue', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('revenue', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Revenue' | $T8 %] (I) <br>
+
+        [% IF expense %]
+          [% L.checkbox_tag('expense', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('expense', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Expense' | $T8 %] (E) <br>
+
+        [% IF costs %]
+          [% L.checkbox_tag('costs', value => 1, checked => 1) %]
+        [% ELSE %]
+          [% L.checkbox_tag('costs', value => 1, checked => 0) %]
+        [% END %]
+        [% 'Costs' | $T8 %] (C)
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+[% UNLESS orphaned %]
+<div class="col">
+  <h3 class="caption">[% 'Chartaccounts connected to this Tax:' | $T8 %]</h3>
+  <ul>
+    [% FOREACH row = TAXINUSE %]
+      <li><a href="am.pl?action=edit_account&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.accno) %]</a></li>
+    [% END %]
+  </ul>
+</div>
+[% END %]
+
+<input type="hidden" name="callback" value="[% #HTML.escape(callback) %]">
+
+</div><!-- /.wrapper -->
+</form>
+
+
diff --git a/templates/design40_webpages/am/edit_templates.html b/templates/design40_webpages/am/edit_templates.html
new file mode 100644
index 000000000..4e50020df
--- /dev/null
+++ b/templates/design40_webpages/am/edit_templates.html
@@ -0,0 +1,68 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+[% IF type == 'templates' %]
+  <p style="text-align: right;">[<a href="doc/html/ch03s03.html" target="_blank" title="[% 'Open in new window' | $T8 %]">[% 'Help Template Variables' | $T8 %]</a>]</p>
+[% END %]
+
+<form method="post" name="Form" action="amtemplates.pl" id="form">
+[% FOREACH var = HIDDEN %]<input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">[% END %]
+
+[% IF SHOW_EDIT_OPTIONS %]
+<table class="tbl-horizontal">
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Template' | $T8 %]</th>
+      <td>
+        <select name="formname">
+          [% FOREACH row = FORMNAME %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == formname %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+        </select>
+      </td>
+    </tr>
+    [% IF LANGUAGE.size %]
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>
+        <select name="language">
+          <option></option>
+          [% FOREACH row = LANGUAGE %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == language %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+        </select>
+      </td>
+    </tr>
+    [% END %]
+    [% IF PRINTER.size %]
+    <tr>
+      <th>[% 'Printer' | $T8 %]</th>
+      <td>
+      <select name="printer">
+        <option></option>
+        [% FOREACH row = PRINTER %]<option value="[% HTML.escape(row.value) %]" [% IF row.value == printer %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
+      </select>
+      </td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<input type="hidden" name="display_nextsub" value="display_template">
+<input name="action" type="submit" value="[% 'Display' | $T8 %]">
+[% END %]
+
+[% IF SHOW_CONTENT %]
+  <h2>
+    [% IF CAN_EDIT %][% 'Edit file' | $T8 %][% ELSE %][% 'Display file' | $T8 %][% END %]
+    [% HTML.escape(display_filename) %]
+  </h2>
+
+  [% IF CAN_EDIT %]
+    <p><textarea name="content" id="edit_content" cols="100" rows="25"[% IF edit %] class="initial_focus"[% END %]>[% HTML.escape(content) %]</textarea></p>
+  [% ELSE %]
+    <p><pre class="filecontent">[% HTML.escape(content) %]</pre></p>
+  [% END %] <!-- CAN_EDIT -->
+
+[% END %] <!-- SHOW_CONTENT -->
+
+</form>
diff --git a/templates/design40_webpages/am/edit_units.html b/templates/design40_webpages/am/edit_units.html
new file mode 100644
index 000000000..2c1a21008
--- /dev/null
+++ b/templates/design40_webpages/am/edit_units.html
@@ -0,0 +1,99 @@
+[%- USE T8 %][%- USE LxERP %][% USE L %]
+[% USE HTML %]
+<h1>
+  [% title %]
+</h1>
+
+[% INCLUDE "common/flash.html" %]
+
+<div class="wrapper">
+
+  <div class="col" style="width:30.0em">
+    [% PROCESS "am/_units_header_info.html" %]
+  </div>
+
+  <div class="col" style="width:30.0em">
+    <p>
+      [% 'Units that have already been used (e.g. for parts and services or in invoices or warehouse transactions) cannot be changed.' | $T8 %]
+    </p>
+    <p>
+      [% 'Units marked for deletion will be deleted upon saving.' | $T8 %]
+    </p>
+    <p>
+      [% 'You can declare different translations for singular and plural for each unit (e.g. &quot;day&quot; and &quot;days).' | $T8 %]
+    </p>
+  </div>
+</div>
+
+<div class="wrapper">
+
+  <form method="post" action="[% HTML.escape(script) %]" id="form">
+    <input type="hidden" name="type" value="unit">
+
+    <table id="unit_list" class="tbl-list wi-moderate">
+      <thead>
+        <tr>
+          <th class="center img"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+          <th>[% 'Delete' | $T8 %]</th>
+          <th>[% 'Unit' | $T8 %]</th>
+          <th>[% 'Base unit' | $T8 %]</th>
+          <th>[% 'Factor' | $T8 %]</th>
+          [% FOREACH language = LANGUAGES %]
+          <th>[% language.description %]<br>
+          [% 'Singular' | $T8 %]</th>
+          <th><br>
+          [% 'Plural' | $T8 %]</th>
+          [% END %]
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH row = UNITS %]
+        <tr id="unit_id_[% row.id %]">
+          <td class="center img dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+        [% IF row.in_use %]
+          <td>
+            <input type="hidden" name="unchangeable_[% loop.count %]" value="1">
+            <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+          </td>
+          <td><span>[% HTML.escape(row.name) %]</span></td>
+          <td><span>[% IF row.base_unit %][% HTML.escape(row.base_unit) %][% ELSE %]---[% END %]</span></td>
+          <td class="numeric"><span>[% IF row.base_unit %][% HTML.escape(row.factor)    %][% ELSE %]---[% END %]</span></td>
+        [% ELSE %]
+          <td class="center">
+            <input type="checkbox" name="delete_[% loop.count %]">
+          </td>
+          <td>
+            <input type="hidden" name="old_name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+            <input name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]" maxlength="20" type="text" class="wi-small">
+          </td>
+          <td>
+            <select name="base_unit_[% loop.count %]" class="wi-small">
+              [% FOREACH option = row.BASE_UNIT_DDBOX %]
+                <option [% option.selected %]>[% HTML.escape(option.name) %]</option>
+              [% END %]
+            </select>
+          </td>
+          <td>
+            <input name="factor_[% loop.count %]" value="[% row.factor %]" maxlength="8" type="text" class="wi-verysmall numeric">
+          </td>
+        [% END %]
+        [% FOREACH language = row.UNITLANGUAGES %]
+          <td>
+            <input type="text" name="localized_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized) %]" maxlength="20" class="wi-mediumsmall">
+          </td>
+          <td>
+            <input type="text" name="localized_plural_[% language.idx %]_[% language.language_id %]" value="[% HTML.escape(language.localized_plural) %]" maxlength="20" class="wi-mediumsmall">
+          </td>
+        [% END %]
+        </tr>
+        [% END %]
+      </tbody>
+    </table>
+
+    <input type="hidden" name="rowcount" value="[% UNITS.size %]">
+
+  </form>
+
+  [% L.sortable_element('#unit_list tbody', url => 'controller.pl?action=Unit/reorder', with => 'unit_id') %]
+</div>
+
diff --git a/templates/design40_webpages/am/edit_warehouse.html b/templates/design40_webpages/am/edit_warehouse.html
new file mode 100644
index 000000000..7e8c93a0d
--- /dev/null
+++ b/templates/design40_webpages/am/edit_warehouse.html
@@ -0,0 +1,44 @@
+[%- USE T8 %]
+[%- USE HTML %]
+<h1>[% IF id %][% 'Edit Warehouse' | $T8 %][% ELSE %][% 'Add Warehouse' | $T8 %][% END %]</h1>
+
+<div class="wrapper">
+  <!-- UPDATE. message container -->
+ [% IF saved_message %]
+  <p>[% saved_message %]</p>
+ [% END %]
+
+ <form method="post" action="am.pl" id="form">
+
+  <input type="hidden" name="id" value="[% HTML.escape(id) %]">
+  <input type="hidden" name="type" value="warehouse">
+  <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+  <table class="tbl-horizontal">
+    <tbody>
+   <tr>
+    <th>[% 'Description' | $T8 %]</th>
+    <td>
+     <input type="text" id='description' name="description" size="60" value="[% HTML.escape(description) %]" class="initial_focus">
+     <input type="hidden" name="orig_description" value="[% HTML.escape(description) %]">
+    </td>
+   </tr>
+
+   <tr>
+    <th>[% 'Invalid' | $T8 %]</th>
+    <td><input type="checkbox" name="invalid" value="1" [% IF invalid %]checked[% END %]></td>
+   </tr>
+
+   <tr>
+    <th>[% 'Number of new bins' | $T8 %]</th>
+    <td><input type="text" name="number_of_new_bins"></td>
+   </tr>
+
+   <tr>
+    <th>[%- 'Prefix for the new bins\' names' | $T8 %]</th>
+    <td><input type="text" name="prefix" value="[% 'Bin' | $T8 %]"></td>
+   </tr>
+   </tbody>
+  </table>
+ </form>
+</div>
diff --git a/templates/design40_webpages/am/list_account_details.html b/templates/design40_webpages/am/list_account_details.html
new file mode 100644
index 000000000..797378ad4
--- /dev/null
+++ b/templates/design40_webpages/am/list_account_details.html
@@ -0,0 +1,70 @@
+[% USE T8 %]
+[% USE HTML %]
+<div class="taxkey-coa">
+[% FOREACH row = CA %]
+
+<div class="table">
+  <div class="field">
+    <span class="label"> [% 'Category' | $T8 %] </span>
+    <span class="value wi-verywide"> [% HTML.escape(row.category) %] </span>
+  </div>
+<div class="field">
+  <span class="label"> [% 'Linked to...' | $T8 %] </span>
+  <span class="value wi-verywide"> [% IF row.link %][% HTML.escape(row.link).replace('\] \[', ']<br>[') %][% ELSE %]-[% END %] </span>
+</div>
+</div>
+<!-- PENDENT: Klasse wo noch im Einsatz? -->
+<div>
+  <div class="col table">
+    <div class="caption">
+      [% 'Taxlink_coa' | $T8 %]
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxkey_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxkeys.size         %][% FOR taxkey         = row.taxkeys         %][% HTML.escape(taxkey)         %]<br>[% END %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxaccount_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxaccounts.size     %][% FOR taxaccount     = row.taxaccounts     %][% HTML.escape(taxaccount)     %]<br>[% END %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Taxdescription_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.taxdescriptions.size %][% FOR taxdescription = row.taxdescriptions %][% HTML.escape(taxdescription) %]<br>[% END %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Posustva_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_ustvas.size      %][% FOR pos_ustva      = row.pos_ustvas      %][% HTML.escape(pos_ustva)      %]<br>[% END %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Startdate_coa' | $T8 %] </span>
+      <span class="value"> [% IF row.startdates.size      %][% FOR startdate      = row.startdates      %][% HTML.escape(startdate)      %]<br>[% END %][% ELSE %]-[% END %] </span>
+    </div>
+  </div>
+  <div class="col table">
+    <div class="caption">
+      [% 'Report Positions' | $T8 %]
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_bwa' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_bwa %][% HTML.escape(row.pos_bwa) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_bilanz' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_bilanz %][% HTML.escape(row.pos_bilanz) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'pos_eur' | $T8 %] </span>
+      <span class="value"> [% IF row.pos_eur %][% HTML.escape(row.pos_eur) %][% ELSE %]-[% END %] </span>
+    </div>
+    <div class="field">
+      <span class="label"> [% 'Datevautomatik' | $T8 %] </span>
+      <span class="value"> [% IF row.datevautomatik %][% 'On' | $T8 %][% ELSE %][% 'Off' | $T8 %][% END %] </span>
+    </div>
+  </div>
+</div>
+
+
+
+
+[% END %]
+</div>
diff --git a/templates/design40_webpages/am/list_accounts.html b/templates/design40_webpages/am/list_accounts.html
new file mode 100644
index 000000000..0c4def83c
--- /dev/null
+++ b/templates/design40_webpages/am/list_accounts.html
@@ -0,0 +1,52 @@
+[% USE T8 %]
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+
+<table class="tbl-plain width-moderate" style="width:70%;" id="tbl-accounts">
+  <thead>
+    <tr>
+      <th class="right">[% 'Account' | $T8 %]</td>
+      <th>[% 'Description (Click on Description for details)' | $T8 %]</td>
+      <th class="right">[% 'Debit' | $T8 %]</td>
+      <th class="right">[% 'Credit' | $T8 %]</td>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH row = CA %]
+  [% IF row.heading %]
+  [% IF row.accno < 10 %] [% SET rwcls='th1' %] [% ELSE %] [% IF row.accno < 100 %] [% SET rwcls='th2' %] [% ELSE %] [% SET rwcls='th3' %] [% END %] [% END %]
+  <tr class="heading [% rwcls %]">
+    <th class="numeric"><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></th>
+    <th colspan="3">[% row.description | html %]</th>
+  </tr>
+  [% ELSE %]
+  <tr>
+    <td class="numeric"><a href="[% row.link_edit_account %]">[% row.accno | html %]</a></td>
+    <td onclick="account_details([% row.id %])">[% row.description | html %]</td>
+    <td class="numeric">[% row.debit | html %]</td>
+    <td class="numeric">[% row.credit | html %]</td>
+  </tr>
+  <tr id="ajaxrow[% row.id %]" style="display:none" onclick="$(this).toggle()" class="ajax-account-details">
+    <td></td>
+    <td colspan="3" id="ajaxcontent[% row.id %]"></td>
+  </tr>
+  [% END %]
+  [% END %]
+  </tbody>
+</table>
+
+
+<script type='text/javascript'>
+  function account_details(id) {
+    $.ajax({
+      url: 'am.pl?action=list_account_details',
+      data: { args: id },
+      dataType: 'html',
+      success: function (data) { $('#ajaxcontent' + id).html(data) },
+    });
+    $('#ajaxrow' + id).toggle();
+  }
+</script>
+
+
diff --git a/templates/design40_webpages/am/list_tax.html b/templates/design40_webpages/am/list_tax.html
new file mode 100644
index 000000000..4864dd9b4
--- /dev/null
+++ b/templates/design40_webpages/am/list_tax.html
@@ -0,0 +1,32 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[% INCLUDE "common/flash.html" %]
+<h1>[% title %]</h1>
+<div class="wrapper">
+<table class="tbl-list width-moderate">
+  <thead>
+    <tr>
+      <th class="center">[% 'tax_taxkey' | $T8 %]</th>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <th>[% 'tax_rate' | $T8 %]</th>
+      <th>[% 'taxnumber' | $T8 %]</th>
+      <th>[% 'account_description' | $T8 %]</th>
+      <th>[% 'Automatic skonto chart sales' | $T8 %]</th>
+      <th>[% 'Automatic skonto chart purchase' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% SET row_odd = '1' %][% FOREACH row = TAX %]
+    <tr>
+      <td class="center">[% HTML.escape(row.taxkey) %]</td>
+      <td><a href="am.pl?action=edit_tax&id=[% HTML.url(row.id) %]&callback=[% HTML.url(callback) %]">[% HTML.escape(row.taxdescription) %]</a></td>
+      <td>[% HTML.escape(row.rate) %] %</td>
+      <td>[% HTML.escape(row.taxnumber) %]</td>
+      <td>[% HTML.escape(row.account_description) %]</td>
+      <td>[% HTML.escape(row.skonto_chart_accno) %] [% HTML.escape(row.skonto_chart_description) %]</td>
+      <td>[% HTML.escape(row.skonto_chart_purchase_accno) %] [% HTML.escape(row.skonto_chart_purchase_description) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+</div>
diff --git a/templates/design40_webpages/am/list_warehouses.html b/templates/design40_webpages/am/list_warehouses.html
new file mode 100644
index 000000000..b861d13d7
--- /dev/null
+++ b/templates/design40_webpages/am/list_warehouses.html
@@ -0,0 +1,33 @@
+[%- USE T8 %][% USE LxERP %][% USE L %]
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+
+<div class="wrapper">
+  <!-- UPDATe: Message Container -->
+  [% IF saved_message %]<p>[% saved_message %]</p>[% END %]
+
+  <table class="tbl-list width-moderate" id="warehouse_list">
+    <thead>
+   <tr>
+    <th><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Number of bins' | $T8 %]</th>
+    <th>[% 'Invalid' | $T8 %]</th>
+   </tr>
+   </thead>
+
+    <tbody>
+   [% FOREACH warehouse = WAREHOUSES %]
+   <tr id="warehouse_id_[% warehouse.id %]">
+    <td class="dragdrop center img"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+    <td><a href="[% url_base %]&action=edit_warehouse&id=[% HTML.url(warehouse.id) %]">[% HTML.escape(warehouse.description) %]</a></td>
+    <td>[% HTML.escape(warehouse.number_of_bins) %]</td>
+    <td>[% IF warehouse.invalid %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+   </tr>
+   [% END %]
+   </tbody>
+  </table>
+
+ [% L.sortable_element('#warehouse_list tbody', url => 'controller.pl?action=Warehouse/reorder', with => 'warehouse_id') %]
+</div>
diff --git a/templates/design40_webpages/amcvar/render_checkboxes.html b/templates/design40_webpages/amcvar/render_checkboxes.html
new file mode 100644
index 000000000..a5d259de2
--- /dev/null
+++ b/templates/design40_webpages/amcvar/render_checkboxes.html
@@ -0,0 +1,7 @@
+[% USE HTML %]
+[% SET var_valid = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) _ '_valid' %]
+[% IF var.partsgroup_filtered %]
+  <input type="hidden" name="[% var_valid %]" value="[% HTML.escape(var.valid) %]">
+[% ELSE %]
+  <input type=checkbox name="[% var_valid %]"[% IF var.valid %] checked[% END %]>
+[% END %]
diff --git a/templates/design40_webpages/amcvar/render_inputs.html b/templates/design40_webpages/amcvar/render_inputs.html
new file mode 100644
index 000000000..e51899ac6
--- /dev/null
+++ b/templates/design40_webpages/amcvar/render_inputs.html
@@ -0,0 +1,50 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+
+[% SET var_name = HTML.escape(name_prefix) _ "cvar_" _ HTML.escape(var.name) _ HTML.escape(name_postfix) %]
+
+[% IF (hide_non_editable && !var.flag_editable) || var.partsgroup_filtered %]
+  <input type="hidden" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
+
+[% ELSIF !var.valid %]
+  [% IF show_disabled_message %]
+    <i>[% 'Element disabled' | $T8 %]</i>
+  [% END %]
+
+[% ELSIF var.type == 'bool' %]
+  <input type="checkbox" name="[% var_name %]" value="1"[% IF var.value %] checked[% END %]>
+
+[% ELSIF var.type == 'textfield' %]
+  <textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]">[% HTML.escape(var.value) %]</textarea>
+
+[%- ELSIF var.type == 'htmlfield' %]
+<textarea name="[% var_name %]" cols="[% HTML.escape(var.width) %]" rows="[% HTML.escape(var.height) %]" class="texteditor">[% HTML.escape(var.value) %]</textarea>
+
+[% ELSIF var.type == 'date' %]
+  [% L.date_tag(var_name, var.value) %]
+
+[% ELSIF var.type == 'timestamp' %]
+  <input type="text" name="[% var_name %]" value="[% HTML.escape(var.value) %]">
+
+[% ELSIF var.type == 'customer' %]
+  [% P.customer_vendor.picker(var_name, var.value, type='customer') %]
+
+[% ELSIF var.type == 'vendor' %]
+  [% P.customer_vendor.picker(var_name, var.value, type='vendor') %]
+
+[% ELSIF var.type == 'part' %]
+  [% P.part.picker(var_name, var.value) %]
+
+[% ELSIF var.type == 'select' %]
+  <select name="[% var_name %]">
+    [% FOREACH option = var.OPTIONS %]
+      <option value="[% option.value | html %]"[% IF option.value == var.value %] selected[% END %]>[% HTML.escape(option.value) %]</option>
+    [% END %]
+  </select>
+
+[% ELSE %]
+  <input type="text" name="[% var_name %]" value="[% HTML.escape(var.value) %]"[% IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+
+[% END %]
diff --git a/templates/design40_webpages/amcvar/render_inputs_block.html b/templates/design40_webpages/amcvar/render_inputs_block.html
new file mode 100644
index 000000000..a115ff109
--- /dev/null
+++ b/templates/design40_webpages/amcvar/render_inputs_block.html
@@ -0,0 +1,84 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE P %]
+
+[% BLOCK cvar_inputs %]
+  [% SET render_cvar_tag_options = {};
+      render_cvar_tag_options.import(cvar_tag_options) IF cvar_tag_options;
+      SET cvar_tag_name = HTML.escape(cvar.name_prefix) _ "cvar_" _ HTML.escape(cvar.var.name) _ HTML.escape(cvar.name_postfix);
+      IF !render_cvar_tag_options.id && (cvar.var.type != 'select');
+        SET render_cvar_tag_options.no_id = 1;
+      END;
+  %]
+
+  [% IF (!cvar.hide_non_editable || cvar.var.flag_editable) && !cvar.partsgroup_filtered %]
+
+    [% IF !cvar.valid %]
+      [% IF show_disabled_message %]
+        <i>[% 'Element disabled' | $T8 %]</i>
+      [% END %]
+
+    [% ELSIF cvar.var.type == 'bool' %]
+      [% render_cvar_tag_options.import(checked=cvar.value, value=1); L.checkbox_tag(cvar_tag_name, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'textfield' %]
+      [% render_cvar_tag_options.import(cols=cvar.var.width, rows=cvar.var.height); L.textarea_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [%- ELSIF cvar.var.type == 'htmlfield' %]
+      [% render_cvar_tag_options.import(cols=cvar.var.width, rows=cvar.var.height, class="texteditor");
+       L.textarea_tag(cvar_tag_name, L.restricted_html(cvar.value), render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'date' %]
+      [% L.date_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'timestamp' %]
+      [% L.input_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'select' %]
+      [% render_cvar_tag_options.name=cvar_tag_name %]
+    
+      <select [% P.stringify_attributes(render_cvar_tag_options) %]>
+        [% IF LxERP.is_rdbo(cvar.var, 'CustomVariableConfig') %]
+          [% FOREACH option = cvar.var.processed_options %]
+            [% SET render_cvar_opts = {
+              value = option
+             };
+             render_cvar_opts.selected = 'selected' IF option == cvar.value;
+             L.html_tag('option', option, render_cvar_opts) %]
+          [% END %]
+        [% ELSE %]
+          [% FOREACH option = cvar.var.OPTIONS %]
+            [% SET render_cvar_opts = {
+                value = option.value
+               };
+               render_cvar_opts.selected = 'selected' IF option.value == cvar.value;
+               L.html_tag('option', option.value, render_cvar_opts) %]
+          [% END %]
+        [% END %]
+      </select>
+
+    [% ELSIF cvar.var.type == 'customer' %]
+      [% render_cvar_tag_options.type = 'customer' %]
+      [% P.customer_vendor.picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'vendor' %]
+      [% render_cvar_tag_options.type = 'vendor' %]
+      [% P.customer_vendor.picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'part' %]
+      [% P.part.picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+
+    [% ELSIF cvar.var.type == 'number' %]
+      [% L.input_tag(cvar_tag_name, LxERP.format_amount(cvar.value, -2), render_cvar_tag_options) %]
+
+    [% ELSE %]
+      [% render_cvar_tag_options.maxlength=cvar.var.maxlength IF cvar.var.maxlength;
+         L.input_tag(cvar_tag_name, cvar.value, render_cvar_tag_options) %]
+    [% END %]
+
+  [% END %]
+
+[% END # BLOCK cvar_inputs %]
diff --git a/templates/design40_webpages/amcvar/search_filter.html b/templates/design40_webpages/amcvar/search_filter.html
new file mode 100644
index 000000000..315a70c79
--- /dev/null
+++ b/templates/design40_webpages/amcvar/search_filter.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+[% FOREACH var = variables %]
+  [% IF var.searchable %]
+    <tr id='cvar_filter_[% var.name %]'>
+     <th>[% HTML.escape(var.description) %]</th>
+     <td>
+
+      [% IF var.type == 'bool' %]
+      <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
+       <option value="">---</option>
+       <option value="yes">[% 'Yes' | $T8 %]</option>
+       <option value="no">[% 'No' | $T8 %]</option>
+      </select>
+
+      [% ELSIF var.type == 'date' %]
+      [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_from') %]
+
+      [% 'to (time)' | $T8 %]
+      [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_to') %]
+
+      [% ELSIF var.type == 'number' %]
+      <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]_qtyop">
+       <option selected>==</option>
+       <option>=/=</option>
+       <option>&gt;</option>
+       <option>&gt;=</option>
+       <option>&lt;</option>
+       <option>&lt;=</option>
+      </select>
+      <input type="text" name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+
+      [% ELSIF var.type == 'customer' %]
+      <input type="text" name="[% filter_prefix %]cvar_[% var.name | html %]">
+
+      [% ELSIF var.type == 'select' %]
+      <select name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]">
+       <option value="" selected>---</option>
+       [% FOREACH option = var.OPTIONS %]
+       <option>[% HTML.escape(option.value) %]</option>
+       [% END %]
+      </select>
+
+      [% ELSE %]
+      <input type="text" name="[% filter_prefix %]cvar_[% HTML.escape(var.name) %]"[% IF var.maxlength %] maxlength="[% HTML.escape(var.maxlength) %]"[% END %]>
+
+      [% END %]
+     </td>
+    </tr>
+  [% END %]
+[% END %]
+[% IF hidden_cvar_filters %]
+  <tr class="cvar_filter-toggle-wrapper">
+    <td></td>
+    <td>
+      <a href="javascript:void(0);" class="cvar_filter-toggle button"><i>[% 'click here to edit cvars' | $T8 %]</i></a>
+    </td>
+  </tr>
+  <script type='text/javascript'>
+    $(function(){
+      $('[id^="cvar_filter_"]').hide();
+      $('[id^="l_cvartd_"]').hide();
+
+      $('a.cvar_filter-toggle').click(function(){
+        $(".cvar_filter-toggle-wrapper").hide();
+        $('[id^="cvar_filter"]').show();
+        $('[id^="l_cvartd_"]').show();
+      });
+    });
+  </script>
+[% END %]
diff --git a/templates/design40_webpages/amcvar/search_include.html b/templates/design40_webpages/amcvar/search_include.html
new file mode 100644
index 000000000..50f188ee6
--- /dev/null
+++ b/templates/design40_webpages/amcvar/search_include.html
@@ -0,0 +1,23 @@
+[% USE HTML %]
+
+[% SET start_new_row = '1' %]
+
+[% FOREACH var = variables %]
+  [% IF var.includeable %]
+    [% IF start_new_row %]
+      <tr>
+      [% SET start_new_row = '0' %]
+    [% END %]
+    <td id="[% HTML.escape(include_prefix) %]cvartd_[% HTML.escape(var.name) %]">
+      <input type="checkbox" name="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]" id="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]" value="[% HTML.escape(include_value) %]"[% IF var.included_by_default %] checked[% END %]>
+      <label for="[% HTML.escape(include_prefix) %]cvar_[% HTML.escape(var.name) %]">[% HTML.escape(var.description) %]</label>
+    </td>
+
+    [% UNLESS loop.count % 4 %][% SET start_new_row = '1' %]
+  [% END %]
+  [% IF start_new_row || loop.last %]
+    </tr>
+  [% END %]
+[% END %]
+
+[% END %]
diff --git a/templates/design40_webpages/ap/form_footer.html b/templates/design40_webpages/ap/form_footer.html
new file mode 100644
index 000000000..255bac178
--- /dev/null
+++ b/templates/design40_webpages/ap/form_footer.html
@@ -0,0 +1,27 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+
+[% IF (num_follow_ups && num_due) %]
+  <p>[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due) %]</p>
+[% END %]
+
+<input name=callback type=hidden value="[% callback | html %]">
+<input name=gldate type=hidden value="[% gldate | html %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
+</form>
+
+<script type="text/javascript"><!--
+$(document).ready(function() {
+  [% SET row=0 %]
+  [% WHILE row < rowcount %]
+   [% SET row=row + 1 %]
+   $('#AP_amount_chart_id_[% row %]').on('set_item:ChartPicker', function(e, item) {
+     kivi.GL.update_taxes(this);
+   });
+  [% END %]
+});
+--></script>
diff --git a/templates/design40_webpages/ap/form_header.html b/templates/design40_webpages/ap/form_header.html
new file mode 100644
index 000000000..122fa81b1
--- /dev/null
+++ b/templates/design40_webpages/ap/form_header.html
@@ -0,0 +1,419 @@
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE T8 %]
+[% USE LxERP %]
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="[% script | html %]" id="form">
+
+<input type="hidden" name="terms" value="[% terms | html %]">
+<input type="hidden" name="creditlimit" value="[% creditlimit | html %]">
+<input type="hidden" name="creditremaining" value="[% creditremaining | html %]">
+<input type="hidden" name="forex" value="[% forex | html %]">
+<input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
+<input id="id" type="hidden" name="id" value="[% id | html %]">
+<input type="hidden" name="sort" value="[% sort | html %]">
+<input type="hidden" name="closedto" value="[% closedto | html %]">
+<input type="hidden" name="locked" value="[% locked | html %]">
+<input type="hidden" name="title" value="[% title_ | html %]">
+<input type="hidden" name="follow_up_trans_id_1" value="[% id | html %]">
+<input type="hidden" name="follow_up_trans_type_1" value="ap_transaction">
+<input type="hidden" name="follow_up_trans_info_1" value="[% follow_up_trans_info | html %]">
+<input type="hidden" name="follow_up_rowcount" value="1">
+<input type="hidden" name="defaultcurrency" value="[% defaultcurrency | html %]">
+<input type="hidden" name="fxgain_accno" value="[% fxgain_accno | html %]">
+<input type="hidden" name="fxloss_accno" value="[% fxloss_accno | html %]">
+<input type="hidden" name="oldinvtotal" value="[% oldinvtotal | html %]">
+<input type="hidden" name="oldtotalpaid" value="[% oldtotalpaid | html %]">
+<input type="hidden" name="taxaccounts" value="[% taxaccounts | html %]">
+<input type="hidden" name="rowcount" value="[% rowcount | html %]">
+<input type="hidden" name="paidaccounts" value="[% paidaccounts | html %]">
+[% L.hidden_tag('zugferd_session_file', zugferd_session_file) %]
+
+[% P.hidden_tag('convert_from_oe_id', convert_from_oe_id) %]
+
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
+[% FOREACH i IN [1..paidaccounts] %]
+  [% temp = "acc_trans_id_"_ i %]
+  <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
+  [% temp = "gldate_"_ i %]
+  <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
+[% END %]
+
+
+[% IF ( saved_message ) %]
+  <p>[% saved_message | html %]</p>
+[% END %]
+
+<div id="ap_tabs" class="tabwidget">
+
+<ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF email_attachment_id || workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
+  [% IF INSTANCE_CONF.get_webdav %]
+    <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+  [% END %]
+  [% IF id AND INSTANCE_CONF.get_doc_storage %]
+    <li><a href="#ui-tabs-docs">[% 'Documents' | $T8 %]</a></li>
+    <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+  [% END %]
+  [% IF id %]
+    [% IF AUTH.assert('record_links', 1) %]
+  <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=PurchaseInvoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+  <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
+  [% END %]
+</ul>
+
+[% IF id AND INSTANCE_CONF.get_doc_storage %]
+  <div id="ui-tabs-docs"></div>
+[% END %]
+
+<div id="ui-tabs-basic-data">
+
+[% IF email_attachment_id || workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             email_attachment_id || workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Vendor & Order' | $T8 %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Vendor' | $T8 %]</th>
+      <td class="wi-lightwide">
+        [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", show_details="1") %]
+        [% L.hidden_tag("previous_vendor_id", vendor_id) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Credit Limit") %]</th>
+      <td><span class="data wi-lightwide">[% creditlimit | html %], [% LxERP.t8("Remaining") %] <span class="plus[% creditremaining_plus %]">[% creditremaining | html %]</span></span> </td>
+    </tr>
+    [% IF invoice_obj.sepa_exports.as_list.size %]
+      <tr>
+        <th>[% LxERP.t8("SEPA exports") %]</th>
+        <td> [% FOREACH export = invoice_obj.sepa_exports.as_list %] <a href="sepa.pl?action=bank_transfer_edit&vc=vendor&id=[% HTML.url(export.id) %]">[% HTML.escape(export.id) %]</a> [% UNLESS loop.last %], [% END %] [% END %] </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Currency' | $T8 %]</th>
+      <td>
+        [%- IF readonly  %]
+          [% HTML.escape(currency) %]
+          [% L.hidden_tag("currency", currency) %]
+        [%- ELSE %]
+          [% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name", class="wi-lightwide") %]
+        [%- END %]
+      </td>
+    </tr>
+    [% IF ( defaultcurrency && (currency != defaultcurrency) ) %]
+      <tr>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td>
+        [%- IF readonly  %]
+          [% LxERP.format_amount(exchangerate, 5) %]
+          [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+        [%- ELSE %]
+          [% L.input_tag("exchangerate", LxERP.format_amount(exchangerate), class="wi-lightwide") %]
+        [%- END %]
+        [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+        [% L.hidden_tag("record_forex", record_forex) %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF ALL_DEPARTMENTS %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, class='wi-lightwide') %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", transaction_description, class="wi-lightwide", "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
+    </tr>
+    <tr>
+      <th></th>
+      <td>[% L.checkbox_tag('taxincluded', checked=taxincluded, label=LxERP.t8('Tax Included')) %]</td>
+    </tr>
+    <tr>
+      <th></th>
+      <td>[% L.checkbox_tag('direct_debit', checked=direct_debit, label=LxERP.t8('direct debit')) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Notes' | $T8 %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <td>
+        [% L.textarea_tag("notes", HTML.escape(notes), rows=textarea_rows, readonly=readonly, class="wi-wide") %]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag("intnotes", HTML.escape(intnotes), rows=textarea_rows, readonly=readonly, class="wi-wide") %]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+        [% L.select_tag('payment_id', payment_terms, default=payment_id, title_key='description', with_empty=1, class="wi-wide", onchange="kivi.SalesPurchase.set_duedate_on_reference_date_change('transdate')") %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Numbers & Dates' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td>[% L.input_tag("invnumber", invnumber, size="11", readonly=readonly) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag("ordnumber", ordnumber, size="11", readonly=readonly) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Invoice Date' | $T8 %]</th>
+      <td>[% L.date_tag('transdate', transdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("transdate")') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Due Date' | $T8 %]</th>
+      <td>[% L.date_tag('duedate', duedate) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Tax point' | $T8 %]</th>
+      <td>[% L.date_tag('tax_point', tax_point, id='tax_point') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %]</th>
+      <td>[% L.date_tag('deliverydate', deliverydate) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>[% P.project.picker('globalproject_id', globalproject_id, onchange="document.getElementById('update_button').click();") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<table class="tbl-list">
+  <caption>[% 'Transactions' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <th class="right">[% 'Amount' | $T8 %]</th>
+      <th class="right">[% 'Tax' | $T8 %]</th>
+      <th>[% 'Taxkey' | $T8 %]</th>
+      <th>[% 'Project' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH i IN [1..rowcount] %]
+    <tr>
+      <td class="wi-wider">
+        [% SET selected_chart_id = "AP_amount_chart_id_"_ i %]
+        [% P.chart.picker("AP_amount_chart_id_" _ i, $selected_chart_id, type="AP_amount", invalid=0, disabled=readonly, class=(initial_focus == 'row_' _ i ? "initial_focus" : "")) %]
+        [% L.hidden_tag("previous_AP_amount_chart_id_" _ i, $selected_chart_id) %]
+        <input type="hidden" name="tax_[% i %]" value="[% temp = " tax"_ i %][% $temp | html %]">
+      </td>
+      <td class="numeric">
+        <input type="text" name="amount_[% i %]" [% readonly ? 'readonly' : '' %] value="[% temp = "amount_"_ i %][% $temp | html %]" class="numeric wi-small">
+      </td>
+      <td class="numeric">
+        [% temp_r = "tax_reverse_"_ i %]
+        [% IF ($temp_r) %]
+          [% $temp_r | html %]
+          &nbsp;&nbsp;&nbsp;
+          [% temp_c = "tax_charge_"_ i %][% $temp_c | html %]
+        [% ELSE %]
+          [% temp = "tax_"_ i %][% $temp | html %]
+        [% END %]
+      </td>
+      <td>
+        [% temp = 'selected_taxchart_'_ i %] [% taxcharts = 'taxcharts_' _ i %]
+        [% L.select_tag('taxchart_'_ i, $taxcharts, value_title_sub = \taxchart_value_title_sub, default = $temp, class='wi-lightwide') %]
+      </td>
+      <td>
+        [% temp = "project_id_"_ i %]
+        [% P.project.picker(temp, loop.last ? globalproject_id : $temp) %]
+      </td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td>[% P.chart.picker('AP_chart_id', AP_chart_id, type="AP", class="wi-wider") %] </td>
+      <td class="numeric">[% invtotal | html %]</td>
+      <td colspan="3"></td>
+    </tr>
+  </tfoot>
+</table>
+
+[% UNLESS no_payment_bookings %]
+  <table class="tbl-list">
+    <caption>[% 'Payments' | $T8 %]</caption>
+    <thead>
+      <tr>
+        <th>[% 'Date' | $T8 %]</th>
+        <th>[% 'Source' | $T8 %]</th>
+        <th>[% 'Memo' | $T8 %]</th>
+        <th class="right">[% 'Amount' | $T8 %]</th>
+        <th></th>
+        [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
+          <th>[% 'Exch' | $T8 %]</th>
+        [% END %]
+        <th>[% 'Account' | $T8 %]</th>
+        <th>[% 'Project Number' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH i IN [1..paidaccounts] %] [% temp = "paidaccount_changeable_"_ i %] [% changeable = $temp %]
+      <tr>
+        [% temp = "datepaid_"_ i %]
+        <td>
+          [% IF( changeable ) %] [% L.date_tag(temp, $temp ? $temp : today) %]
+          [% ELSE %] [% $temp | html %] <input type="hidden" name="[% temp %]" value="[% $temp | html %]"> [% END %]
+        </td>
+        <td>
+          [% temp = "source_"_ i %]
+          [% IF( changeable ) %]  <input type="text" name="[% temp %]" size="11" value="[% $temp | html %]">
+          [% ELSE %] [% $temp | html %]  <input type="hidden" name="[% temp %]" value="[% $temp | html %]">[% END %]
+        </td>
+        <td>
+          [% temp = "memo_"_ i %]
+          [% IF( changeable ) %] <input type="text" name="[% temp %]" size="11" value="[% $temp | html %]">
+          [% ELSE %] [% $temp | html %] <input type="hidden" name="[% temp %]" value="[% $temp | html %]"> [% END %]
+        </td>
+        <td class="numeric">
+          [% temp = "paid_"_ i %]
+          [% IF( changeable ) %]
+            <input name="[% temp %]" data-validate="number" value="[% $temp | html %]" id="[%- 'payment_' _ temp -%]" size="11" class="numeric">
+          [% ELSE %]
+            [% $temp | html %] [% defaultcurrency %]
+            <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
+          [% END %]
+        </td>
+        <td>
+          [% IF changeable && loop.last && paid_missing > 0 %] <input type="button" id="ap_set_to_paid_missing" value="[% 'Set to paid missing' | $T8 %]"> [% END %]
+        </td>
+        [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
+          <td>
+            [% temp = "exchangerate_"_ i %]
+            [% temp_forex = "forex_"_ i %]
+            [% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
+            [% SET record_forex = 'record_forex_' _ i %]
+
+            [% IF( $temp_forex || !changeable ) %]
+              [% $temp | html %] = [% LxERP.format_amount($defaultcurrency_paid,2) %] [% defaultcurrency %] </br>
+              [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+              <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
+            [% ELSE %]
+              <input type="text" name="[% temp %]" size="11" value="[% $temp | html %]">
+            [% END %]
+
+            <input type="hidden" name="[% temp_forex %]" value="[% $temp_forex | html %]">
+          </td>
+        [% END %]
+        <td>
+          [% temp     = "AP_paid_"_ i %]
+          [% readonly = "AP_paid_readonly_desc_"_ i %]
+          [% IF( changeable ) %] [% L.select_tag(temp, ALL_CHARTS_AP_paid, value_title_sub = \AP_paid_value_title_sub, default = ($temp || accno_arap)) %]
+          [% ELSE %] [% $readonly | html %] <input type="hidden" name="[% temp %]" value="[% $temp | html %]"> [% END %]
+        </td>
+        <td>
+          [% temp = "paid_project_id_"_ i %]
+          [% IF( changeable ) %] [% P.project.picker(temp, $temp) %]
+          [% ELSE %] <input type="hidden" name="[% temp %]" value="[% $temp | html %]"> [% temp = "label"_ temp %] [% $temp | html %] [% END %]
+        </td>
+      </tr>
+      [% END %]
+    </tbody>
+    <tfoot>
+    <tr>
+      <td></td>
+      <td></td>
+      <th class="right">[% 'Total' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
+        <td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+        <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+        <input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
+      [% END %]
+      <td></td>
+      <td></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <th class="right">[% 'Missing amount' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
+        <td></td>
+      [% END %]
+      <td></td>
+      <td></td>
+    </tr>
+    </tfoot>
+  </table>
+[% END %]
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#ui-tabs-basic-data -->
+
+[% PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+ [% LxERP.t8('Loading...') %]
+</div>
+
+</div>
+
+
+<script type="text/javascript">
+ $('#ap_set_to_paid_missing').click(function(){ $('input[id^="payment_paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
+</script>
diff --git a/templates/design40_webpages/ap/search.html b/templates/design40_webpages/ap/search.html
new file mode 100644
index 000000000..afd1e0be2
--- /dev/null
+++ b/templates/design40_webpages/ap/search.html
@@ -0,0 +1,234 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% title %]</h1>
+
+<form method="post" name="search" action="ap.pl" id="form">
+ [% L.hidden_tag("sort", "transdate") %]
+
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Vendor & Order' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Vendor' | $T8 %]</th>
+      <td>[% L.input_tag("vendor", vendor, class="initial_focus wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% L.input_tag("cp_name", '', class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% L.input_tag("parts_description", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td>[% L.input_tag("notes", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+    <tr>
+      <th>[% 'Internal Notes' | $T8 %]</th>
+      <td>[% L.input_tag("intnotes", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Full Text' | $T8 %]</th>
+      <td>[% L.input_tag('fulltext', '', class="wi-lightwide") %]</td>
+    </tr>
+
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Dates & Numbers' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Invoice Date' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('transdateto') %] </span></td>
+    </tr>
+    <tr>
+      <th>[% 'Due Date' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('duedatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('duedateto') %] </span></td>
+    </tr>
+    <tr>
+      <th>[% 'Date Paid' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('datepaidfrom') %] [% 'Bis' | $T8 %] [% L.date_tag('datepaidto') %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Insert Date' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %] </span></td>
+    </tr>
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td>[% L.input_tag("invnumber", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag("ordnumber", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag("parts_partnumber", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>[% P.project.picker("project_id", project_id, active="both", valid="both", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Steuersatz' | $T8 %]</th>
+      <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Payment Term' | $T8 %]</th>
+      <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', class="wi-normal") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Status' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Open' | $T8 %]</th>
+      <td><input name="open" id="open" type="checkbox" value="Y" checked></td>
+    </tr>
+    <tr>
+      <th>[% 'Closed' | $T8 %]</th>
+      <td><input name="closed" id="closed" type="checkbox" value="Y"></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+<div class="form-addition control-panel">
+
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+
+  <div class="list col">
+    <h4>[% 'Dates' | $T8 %]</h4>
+    <div>
+      <input name="l_transdate" id="l_transdate" type="checkbox" value="Y" checked><label for="l_transdate">[% 'Invoice Date' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_datepaid" id="l_datepaid" type="checkbox" value="Y"><label for="l_datepaid">[% 'Date Paid' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_duedate" id="l_duedate" type="checkbox" value="Y"><label for="l_duedate">[% 'Due Date' | $T8 %]</label>
+    </div>
+    <div>
+       <input name="l_insertdate" class=checkbox type=checkbox value=Y> [% 'Insert Date' | $T8 %]
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4>[% 'Numbers & IDs' | $T8 %]</h4>
+    <div>
+      <input name="l_id" id="l_id" type="checkbox" value="Y"><label for="l_id">[% 'ID' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_invnumber" id="l_invnumber" type="checkbox" value="Y" checked><label for="l_invnumber">[% 'Invoice Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_ordnumber" id="l_ordnumber" type="checkbox" value="Y"><label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_globalprojectnumber" id="l_globalprojectnumber" type="checkbox" value="Y"><label for="l_globalprojectnumber">[% 'Document Project Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_transaction_description" id="l_transaction_description" class=checkbox type=checkbox value=Y[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]> [% 'Transaction description' | $T8 %]
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4>[% 'Amounts' | $T8 %]</h4>
+    <div>
+      <input name="l_netamount" id="l_netamount" type="checkbox" value="Y"><label for="l_netamount">[% 'Amount' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_tax" id="l_tax" type="checkbox" value="Y"><label for="l_tax">[% 'Tax' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_subtotal" id="l_subtotal" type="checkbox" value="Y"><label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_amount" id="l_amount" type="checkbox" value="Y" checked><label for="l_amount">[% 'Total' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_paid" id="l_paid" type="checkbox" value="Y" checked><label for="l_paid">[% 'Paid' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_due" id="l_due" type="checkbox" value="Y"><label for="l_due">[% 'Amount Due' | $T8 %]</label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4>[% 'Handling' | $T8 %]</h4>
+    <div>
+      <input name="l_employee" id="l_employee" type="checkbox" value="Y"><label for="l_employee">[% 'Employee' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_notes" id="l_notes" type="checkbox" value="Y"><label for="l_notes">[% 'Notes' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_intnotes" id="l_intnotes" type="checkbox" value="Y"><label for="l_intnotes">[% 'Internal Notes' | $T8 %]</label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4>[% 'Miscellaneous' | $T8 %]</h4>
+    <div>
+      <input name="l_department" id="l_department" type="checkbox" value="Y"><label for="l_department">[% 'Department' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_charts" id="l_charts" type="checkbox" value="Y"><label for="l_charts">[% 'Chart' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_taxzone" id="l_taxzone" type="checkbox" value="Y"><label for="l_taxzone">[% 'Steuersatz' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_payment_terms" id="l_payment_terms" type="checkbox" value="Y"><label for="l_payment_terms">[% 'Payment Terms' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_direct_debit" id="l_direct_debit" id="l_direct_debit" type="checkbox" value="Y"><label for="l_direct_debit">[% 'direct debit' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_debit_chart" class=checkbox type=checkbox value=Y> [% 'Debit Account' | $T8 %]
+    </div>
+    <div>
+      <input name="l_items" id="l_items" class=checkbox type=checkbox value=Y> [% 'Positions' | $T8 %]
+    </div>
+  </div>
+
+  <div class="list col">
+  <h4>[% 'Vendor' | $T8 %]</h4>
+  <div>
+    <input name="l_name" id="l_name" type="checkbox" value="Y" checked><label for="l_name">[% 'Vendor' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_vendornumber" id="l_vendornumber" type="checkbox" value="Y"><label for="l_vendornumber">[% 'Vendor Number' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_country" id="l_country" type="checkbox" value="Y"><label for="l_country">[% 'Country' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_ustid" id="l_ustid" type="checkbox" value="Y"><label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
+  </div>
+</div>
+
+</div><!-- /.form-addition -->
+
+</form>
diff --git a/templates/design40_webpages/ar/ar_transactions_bottom.html b/templates/design40_webpages/ar/ar_transactions_bottom.html
new file mode 100644
index 000000000..5aacea675
--- /dev/null
+++ b/templates/design40_webpages/ar/ar_transactions_bottom.html
@@ -0,0 +1,30 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% L.hidden_tag("action", "MassInvoiceCreatePrint/dispatch") %]
+[% L.hidden_tag("printer_id") %]
+[% L.hidden_tag("bothsided") %]
+</form>
+
+<form method="post" action="ar.pl" id="create_new_form">
+  [% L.hidden_tag("callback", callback) %]
+</form>
+
+[% IF ALL_PRINTERS.size %]
+<div id="print_options" class="hidden">
+<p>
+[% LxERP.t8("Print both sided") %]:
+[% L.checkbox_tag('', id="print_options_bothsided") %]
+</p>
+<p>
+[% LxERP.t8("Print destination") %]:
+[% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+   CALL printers.import(ALL_PRINTERS);
+   L.select_tag("", printers, id="print_options_printer_id", title_key="description", default=printer_id) %]
+</p>
+
+<p>[% L.button_tag("kivi.MassInvoiceCreatePrint.massPrint()", LxERP.t8('Print')) %]</p>
+</div>
+[% END %]
diff --git a/templates/design40_webpages/ar/ar_transactions_header.html b/templates/design40_webpages/ar/ar_transactions_header.html
new file mode 100644
index 000000000..fcb318483
--- /dev/null
+++ b/templates/design40_webpages/ar/ar_transactions_header.html
@@ -0,0 +1 @@
+<form method="post" action="controller.pl" id="report_form">
diff --git a/templates/design40_webpages/ar/form_footer.html b/templates/design40_webpages/ar/form_footer.html
new file mode 100644
index 000000000..6b41e5fe0
--- /dev/null
+++ b/templates/design40_webpages/ar/form_footer.html
@@ -0,0 +1,27 @@
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+
+[% IF ( follow_up_length && follow_up_due_length ) %]
+  [% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_up_length , follow_up_due_length) %]
+[% END %]
+
+<input type="hidden" name="gldate" value="[% gldate | html %]">
+<input type="hidden" name="callback" value="[% callback | html %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
+
+</form>
+
+<script type="text/javascript"><!--
+$(document).ready(function() {
+  [% SET row=0 %]
+  [% WHILE row < rowcount %]
+   [% SET row=row + 1 %]
+   $('#AR_amount_chart_id_[% row %]').on('set_item:ChartPicker', function(e, item) {
+     kivi.GL.update_taxes(this);
+   });
+  [% END %]
+});
+--></script>
diff --git a/templates/design40_webpages/ar/form_header.html b/templates/design40_webpages/ar/form_header.html
new file mode 100644
index 000000000..09ae12fc0
--- /dev/null
+++ b/templates/design40_webpages/ar/form_header.html
@@ -0,0 +1,402 @@
+[% USE HTML %]
+[% USE L %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE P %]
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" name="arledger" action="[% script %]" id="form">
+
+[% L.hidden_tag('id', id) %]
+[% L.hidden_tag('sort', sort) %]
+[% L.hidden_tag('closedto', closedto) %]
+[% L.hidden_tag('locked', locked) %]
+[% L.hidden_tag('title', title_str) %]
+[% L.hidden_tag('follow_up_trans_id_1', id) %]
+[% L.hidden_tag('follow_up_trans_type_1', 'ar_transaction') %]
+[% L.hidden_tag('follow_up_trans_info_1', follow_up_trans_info) %]
+[% L.hidden_tag('follow_up_rowcount', 1) %]
+<input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
+
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
+[% IF saved_message %]<p class="message message_info">[% saved_message | html  %]</p>[% END %]
+
+<div class="tabwidget">
+
+<ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF email_attachment_id || workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
+  [% IF id %]
+    [% IF INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+    [% END %]
+    [% IF AUTH.assert('record_links', 1) %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+      <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
+  [% END %]
+</ul>
+
+
+<div id="ui-tabs-basic-data">
+
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             email_attachment_id || workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Customer &amp; Order' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td class="wi-lightwide">
+         [% P.customer_vendor.picker("customer_id", customer_id, type="customer", show_details="1") %]
+         [% L.hidden_tag("previous_customer_id", customer_id) %]
+         [% L.hidden_tag('terms', terms) %]
+       </td>
+      </tr>
+      [% IF max_dunning_level || invoice_obj.dunning_config_id  %]
+      <tr>
+        <th>[% LxERP.t8("Dunning status") %]</th>
+        <td>
+          [% IF invoice_obj.dunning_config_id %]
+          <span class="dunned_invoice">[% LxERP.t8("This invoice's dunning level: #1", invoice_obj.dunning_config.dunning_description) %]</span>
+            [% IF max_dunning_level %]<br>[% END %]
+          [% END %]
+          [% IF max_dunning_level %]
+          <span class="customer_dunning_level">
+            [% LxERP.t8("Customer's current maximum dunning level: #1", max_dunning_level) %] <br>
+            [% LxERP.t8("Dunned open amount: #1", LxERP.format_amount(dunning_amount, 2)) %]
+          </span>
+         [% END %]
+        </td>
+      </tr>
+      [% END %]
+      <tr>
+        <th>[% LxERP.t8("Credit Limit") %]</th>
+        <td>
+          <span class="data wi-lightwide">
+            [% LxERP.format_amount(creditlimit, 0) %][% L.hidden_tag('creditlimit', LxERP.format_amount(creditlimit, 0)) %],
+            [% LxERP.t8("Remaining") %]
+            <span class="plus[% creditremaining < 0 ? 0 : 1 %]">[% LxERP.format_amount(creditremaining, 0) %][% L.hidden_tag('creditremaining', LxERP.format_amount(creditremaining, 0)) %]</span>
+          </span>
+        </td>
+      </tr>
+      [% IF invoice_obj.sepa_exports.as_list.size %]
+      <tr>
+        <th>[% LxERP.t8("SEPA exports") %]</th>
+        <td>
+         [% FOREACH export = invoice_obj.sepa_exports.as_list %]
+          <a href="sepa.pl?action=bank_transfer_edit&vc=customer&id=[% HTML.url(export.id) %]">[% HTML.escape(export.id) %]</a>
+          [% UNLESS loop.last %], [% END %]
+         [% END %]
+        </td>
+      </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Currency' | $T8 %]</th>
+        <td>
+          [%- IF readonly  %]
+            [% HTML.escape(currency) %]
+            [% L.hidden_tag("currency", currency) %]
+          [%- ELSE %]
+            [% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name", class="wi-lightwide") %]
+          [%- END %]
+        </td>
+        [% L.hidden_tag('defaultcurrency', defaultcurrency) %]
+        [% L.hidden_tag('fxgain_accno', fxgain_accno) %]
+        [% L.hidden_tag('fxloss_accno', fxloss_accno) %]
+        [% L.hidden_tag('forex', forex) %]
+      </tr>
+      [% IF show_exch %]
+      <tr>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td>
+          [%- IF readonly  %]
+            [% LxERP.format_amount(exchangerate, 5) %]
+            [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+          [%- ELSE %]
+            [% L.input_tag("exchangerate", LxERP.format_amount(exchangerate), class="wi-lightwide") %]
+          [%- END %]
+          [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+        </td>
+      </tr>
+      [% END %]
+      </tr>
+      [% IF ALL_DEPARTMENTS %]
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default=department_id, title_key='description', with_empty=1, class="wi-lightwide") %]</td>
+        </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Transaction description' | $T8 %]</th>
+        <td>[% L.input_tag("transaction_description", transaction_description, "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', class="wi-lightwide") %]</td>
+      </tr>
+      <tr>
+        <th></th>
+        <td>[% L.checkbox_tag('taxincluded', checked=taxincluded, label=LxERP.t8('Tax Included')) %]</td>
+      </tr>
+      <tr>
+        <th></th>
+        <td>[% L.checkbox_tag('direct_debit', checked=direct_debit, label=LxERP.t8('direct debit')) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Notes' | $T8 %]</caption>
+    <colgroup><col class="wi-wide"></colgroup>
+    <tbody>
+      <tr>
+        <td>
+          [% L.textarea_tag("notes", HTML.escape(notes), rows=rows, class="wi-wide") %]
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <span class="label above">[% 'Notes for customer' | $T8 %]</span>
+          [% L.textarea_tag("intnotes", HTML.escape(intnotes), rows=rows, readonly=readonly, class="wi-wide") %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Numbers & Dates' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Salesperson' | $T8 %]</th>
+        <td>[% P.select_tag("employee_id", employees, default=employee_id, title_key='safe_name') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Invoice Number' | $T8 %]</th>
+        <td>[% L.input_tag("invnumber", invnumber, size="11") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Order Number' | $T8 %]</th>
+        <td>[% L.input_tag("ordnumber", ordnumber, size="11") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Invoice Date' | $T8 %]</th>
+        <td>[% L.date_tag('transdate', transdate) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Due Date' | $T8 %]</th>
+        <td>[% L.date_tag('duedate', duedate) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Tax point') %]</th>
+        <td>[% L.date_tag('tax_point', tax_point, id='tax_point') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Delivery Date' | $T8 %]</th>
+        <td>[% L.date_tag('deliverydate', deliverydate) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Project Number' | $T8 %]</th>
+        <td>[% P.project.picker('globalproject_id', globalproject_id, onchange="document.getElementById('update_button').click();") %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+[% L.hidden_tag('rowcount', rowcount) %]
+
+<div class="wrapper">
+
+<table class="tbl-list">
+  <caption>[% 'Transactions' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <th class="right">[% 'Amount' | $T8 %]</th>
+      <th class="right">[% 'Tax' | $T8 %]</th>
+      <th>[% 'Taxkey' | $T8 %]</th>
+      <th>[% 'Project' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row IN transactions %]
+    <tr>
+      <td class="wi-wider">[% row.selectAR_amount %]</td>
+      <td class="numeric">[% L.input_tag('amount_' _ loop.count, LxERP.format_amount(row.amount, 2), class='wi-small numeric') %]</td>
+      <td class="numeric">[% L.hidden_tag('tax_' _ loop.count, LxERP.format_tax(row.tax, 2)) %][% LxERP.format_amount(row.tax, 2) | html %]</td>
+      <td>[% row.taxchart %]</td>
+      <td>[% P.project.picker("project_id_"_ loop.count, row.project_id) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td>[% P.chart.picker("AR_chart_id", AR_chart_id, type="AR", class="wi-wider") %]</td>
+      <th class="numeric">[% LxERP.format_amount(invtotal, 2) | html %]</th>
+        <input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
+        <input type="hidden" name="oldtotalpaid" value="[% oldtotalpaid %]">
+        <input type="hidden" name="taxaccounts" value="[% taxaccounts | html %]">
+      <td colspan="3"></td>
+    </tr>
+  </tfoot>
+</table>
+
+
+<table class="tbl-list" style="width:90%;">
+  <caption>[% 'Incoming Payments' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Memo' | $T8 %]</th>
+      <th class="right">[% 'Amount' | $T8 %]</th>
+      <th></th>
+      [% IF show_exch %]
+        <th>[% 'Exch' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Account' | $T8 %]</th>
+      <th>[% 'Project Number' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row IN payments %]
+    <tr>
+      <td>
+        [% IF row.changeable %]
+          [% L.date_tag('datepaid_' _ loop.count, row.datepaid ? row.datepaid : today) %]
+        [% ELSE %]
+          [% row.datepaid | html %][% L.hidden_tag('datepaid_' _ loop.count, row.datepaid) %]
+        [% END %]
+      </td>
+      <td>
+      [% IF row.changeable %]
+        <input type="text" name="source_[% loop.count %]" size="11" value="[% row.source | html %]">
+      [% ELSE %]
+        [% row.source | html %]<input type="hidden" name="source_[% loop.count %]" value="[% row.source | html %]">
+      [% END %]
+      </td>
+      <td>
+        [% IF row.changeable %]
+          <input type="text" name="memo_[% loop.count %]" size="11" value="[% row.memo | html %]">
+        [% ELSE %]
+          [% row.memo | html %]<input type="hidden" name="memo_[% loop.count %]" value="[% row.memo | html %]">
+        [% END %]
+      </td>
+      <td class="numeric">
+        [% IF row.changeable %]
+          <input name="paid_[% loop.count %]" id="payment_paid_[% loop.count %]" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]" size="11" type="text" data-validate="number" class="numeric">
+        [% ELSE %]
+          [% LxERP.format_amount(row.paid, 2) | html %]<input type="hidden" name="paid_[% loop.count %]" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]"> [% defaultcurrency %]
+        [% END %]
+      </td>
+      <td>
+        [% IF row.changeable && loop.last && paid_missing > 0 %]
+          <input type="button" id="ar_set_to_paid_missing" value="[% 'Set to paid missing' | $T8 %]">
+        [% END %]
+      </td>
+      [% IF show_exch %]
+        <td class="numeric">
+          [% IF row.forex || !row.changeable%]
+            <input type="hidden" name="exchangerate_[% loop.count %]" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]">
+            [%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.defaultcurrency_paid, 2) %] [% defaultcurrency %]</br>
+            [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+          [% ELSE %]
+            <input type="text" name="exchangerate_[% loop.count %]" size="10" value="[% LxERP.format_amount(row.exchangerate, 5, 1) %]">
+          [% END %]
+            <input type="hidden" name="forex_[% loop.count %]" value="[% row.forex | html %]">
+        </td>
+      [% END %]
+      <td>
+        [% IF row.changeable %]
+          [% row.selectAR_paid %]
+        [% ELSE %]
+          [% row.AR_paid | html %]<input type="hidden" name="AR_paid_[% loop.count %]" value="[% row.AR_paid | html %]">
+        [% END %]
+      </td>
+      <td>
+        [% IF row.changeable %]
+          [% P.project.picker("paid_project_id_"_ loop.count, row.paid_project_id) %]
+        [% ELSE %]
+          [% project_labels.${row.paid_project_id} | html %]
+          <input type="hidden" name="paid_project_id_[% loop.count %]" value="[% row.paid_project_id %]">
+        [% END %]
+        <input type="hidden" name="acc_trans_id_[% loop.count %]" value="[% row.acc_trans_id | html %]">
+        <input type="hidden" name="gldate_[% loop.count %]" value="[% row.gldate | html %]">
+       </td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td></td>
+      <td></td>
+      <th class="right">[% 'Total' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(totalpaid, 2) | html %]  [% currency %] </td>
+      <td></td>
+      [% IF show_exch %]
+        <td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+        <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+        <input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
+      [% END %]
+      <td></td>
+      <td></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <th class="right">[% 'Missing amount' | $T8 %]</th>
+      <td class="numeric">
+        [% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]
+        <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+      </td>
+      <td></td>
+      [% IF show_exch %]
+        <td></td>
+      [% END %]
+      <td></td>
+      <td></td>
+    </tr>
+  </tfoot>
+</table>
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#ui-tabs-basic-data -->
+</div><!-- ./tabwidget -->
+
+<script type="text/javascript">
+ $('#ar_set_to_paid_missing').click(function(){ $('input[id^="payment_paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
+</script>
diff --git a/templates/design40_webpages/ar/search.html b/templates/design40_webpages/ar/search.html
new file mode 100644
index 000000000..ca6d247c2
--- /dev/null
+++ b/templates/design40_webpages/ar/search.html
@@ -0,0 +1,350 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+<h1>[% title %]</h1>
+
+<form method=post name="search" id="form" action=[% script %]>
+[% L.hidden_tag("action", nextsub) %]
+[% L.hidden_tag("sort", "transdate") %]
+
+<div class="wrapper">
+
+    <table class="tbl-horizontal">
+      <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+      <caption>[% 'Customer' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% 'Customer' | $T8 %]</th>
+          <td>[% L.input_tag("customer", customer, class="initial_focus") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Contact Person' | $T8 %]</th>
+          <td>[% L.input_tag("cp_name", '') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1) %]</td>
+        </tr>
+        <tr>
+          <th class="caption" colspan="2">[% 'Employee' | $T8 %]</th>
+        </tr>
+        <tr>
+          <th>[% 'Employee' | $T8 %]</th>
+          <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Salesman' | $T8 %]</th>
+          <td>[% L.select_tag('salesman_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1) %]</td>
+        </tr>
+        <tr>
+          <th class="caption" colspan="2">[% 'Miscellaneous' | $T8 %]</th>
+        </tr>
+        <tr>
+          <th>[% 'Transaction description' | $T8 %]</th>
+          <td>[% L.input_tag("transaction_description", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Payment Term' | $T8 %]</th>
+          <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, title_key = 'description', with_empty = 1) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Notes' | $T8 %]</th>
+          <td>[% L.input_tag("notes", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Part Description' | $T8 %]</th>
+          <td>[% L.input_tag("parts_description", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Part Number' | $T8 %]</th>
+          <td>[% L.input_tag("parts_partnumber", "") %]</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table class="tbl-horizontal">
+      <caption>[% 'Record numbers and dates' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% 'Invoice Number' | $T8 %]</th>
+          <td>[% L.input_tag("invnumber", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Order Number' | $T8 %]</th>
+          <td>[% L.input_tag("ordnumber", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Customer Order Number' | $T8 %]</th>
+          <td>[% L.input_tag("cusordnumber", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Project Number' | $T8 %]</th>
+          <td>[% P.project.picker("project_id", project_id, active="both", valid="both") %]</td>
+        </tr>
+        [% IF ALL_BUSINESS_TYPES.as_list.size > 0 %]
+          <tr>
+            <th>[% 'Customer type' | $T8 %]</th>
+            <td>[% L.select_tag("business_id", ALL_BUSINESS_TYPES, with_empty=1, title_key="description") %]</td>
+          </tr>
+        [% END %]
+        <tr>
+          <th>[% 'Show only marked as paid invoices' | $T8 %]</th>
+          <td>[% L.checkbox_tag('show_marked_as_closed') %]</td>
+        </tr>
+        [% IF INSTANCE_CONF.get_email_journal %]
+        <tr>
+          <th>[% 'Show only not mailed invoices' | $T8 %]</th>
+          <td>[% L.checkbox_tag('show_not_mailed') %]</td>
+        </tr>
+        [% END %]
+        <tr>
+          <th>[% 'Invoice Date' | $T8 %]</th>
+          <td> [% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('transdateto') %] </td>
+        </tr>
+        <tr>
+          <th>[% 'Due Date' | $T8 %]</th>
+          <td> [% L.date_tag('duedatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('duedateto') %] </td>
+        </tr>
+        <tr>
+        <th>[% 'Date Paid' | $T8 %]</th>
+         <td>
+          [% L.date_tag('datepaidfrom') %]
+          [% 'Bis' | $T8 %]
+          [% L.date_tag('datepaidto') %]
+         </td>
+        </tr>
+        <tr>
+         <th>[% 'Steuersatz' | $T8 %]</th>
+         <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description') %]</td>
+        </tr>
+        [% IF CT_CUSTOM_VARIABLES.size %]
+          <tr>
+            <th class="caption" colspan="2">[% 'Custom variables for module' | $T8 %]: [%'Customers and vendors' | $T8 %]</th>
+          </tr>
+          [% CT_CUSTOM_VARIABLES_FILTER_CODE %]
+        [% END %]
+      </tbody>
+    </table>
+
+    <table class="tbl-horizontal">
+      <caption>[% 'Shipping Address' | $T8 %]</caption>
+      <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+      <tbody>
+        <tr>
+          <th>[% 'Name' | $T8 %]</th>
+          <td>[% L.input_tag("shiptoname", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department 1' | $T8 %]</th>
+          <td>[% L.input_tag("shiptodepartment_1", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department 2' | $T8 %]</th>
+          <td>[% L.input_tag("shiptodepartment_2", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Street' | $T8 %]</th>
+          <td>[% L.input_tag("shiptostreet", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Zipcode' | $T8 %]</th>
+          <td>[% L.input_tag("shiptozipcode", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'City' | $T8 %]</th>
+          <td>[% L.input_tag("shiptocity", "") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Country' | $T8 %]</th>
+          <td>[% L.input_tag("shiptocountry", "") %]</td>
+        </tr>
+      </tbody>
+    </table>
+
+   <table class="tbl-horizontal">
+     <caption>[% 'Status' | $T8 %]</caption>
+     <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+     <tbody>
+       <tr>
+         <th>[% 'Open' | $T8 %]</th>
+         <td><input name="open" id="open" type="checkbox" value="Y" checked></td>
+       </tr>
+       <tr>
+         <th>[% 'Closed' | $T8 %]</th>
+         <td><input name="closed" id="closed" type="checkbox" value="Y"></td>
+       </tr>
+     </tbody>
+   </table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <div class="list col">
+    <h4>[% 'Status' | $T8 %]</h4>
+    <div>
+      <input name="l_paid" id="l_paid" type="checkbox" checked><label for="l_paid">[% 'Paid' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_dunning_description" id="l_dunning_description" type="checkbox"><label for="l_dunning_description">[% 'Dunning level' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Numbers' | $T8 %]</h4>
+    <div>
+      <input name="l_id" id="l_id" type="checkbox"><label for="l_id">[% 'ID' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_invnumber" id="l_invnumber" type="checkbox" checked><label for="l_invnumber">[% 'Invoice Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_ordnumber" id="l_ordnumber" type="checkbox"><label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_globalprojectnumber" id="l_globalprojectnumber" type="checkbox"><label for="l_globalprojectnumber">[% 'Document Project Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_cusordnumber" id="l_cusordnumber" type="checkbox"><label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_ustid" id="l_ustid" type="checkbox"><label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_donumber" id="l_donumber" class=checkbox type=checkbox value=Y><label for="l_donumber">[% 'Delivery Order Number' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Date' | $T8 %]</h4>
+    <div>
+      <input name="l_transdate" id="l_transdate" type="checkbox" checked><label for="l_transdate">[% 'Invoice Date' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_datepaid" id="l_datepaid" type="checkbox"><label for="l_datepaid">[% 'Date Paid' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_duedate" id="l_duedate" type="checkbox"><label for="l_duedate">[% 'Due Date' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_deliverydate" id="l_deliverydate" class=checkbox type=checkbox value=Y><label for="l_deliverydate">[% 'Delivery Date' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Customer' | $T8 %]</h4>
+    <div>
+      <input name="l_name" id="l_name" type="checkbox" checked><label for="l_name">[% 'Customer' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_customernumber" id="l_customernumber" type="checkbox"><label for="l_customernumber">[% 'Customer Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_department" id="l_department" type="checkbox"><label for="l_department">[% 'Department' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_country" id="l_country" type="checkbox"><label for="l_country">[% 'Country' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_customer_dunning_lock" id="l_customer_dunning_lock" type="checkbox"><label for="l_customer_dunning_lock">[% 'Dunning lock' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Shipping Address' | $T8 %]</h4>
+    <div>
+      <input name="l_shiptoname" id="l_shiptoname" type="checkbox"><label for="l_shiptoname">[% 'Name' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox"><label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox"><label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptostreet" id="l_shiptostreet" type="checkbox"><label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox"><label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptocity" id="l_shiptocity" type="checkbox"><label for="l_shiptocity">[% 'City' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shiptocountry" id="l_shiptocountry" type="checkbox"><label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Amounts' | $T8 %]</h4>
+    <div>
+      <input name="l_netamount" id="l_netamount" type="checkbox" value="Y" checked><label for="l_netamount">[% 'Amount' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_amount" id="l_amount" type="checkbox" value="Y" checked><label for="l_amount">[% 'Total' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_subtotal" id="l_subtotal" type="checkbox"><label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_due" id="l_due" type="checkbox"><label for="l_due">[% 'Amount Due' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_marge_total" id="l_marge_total" type="checkbox"><label for="l_marge_total">[% 'Ertrag' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_marge_percent" id="l_marge_percent" type="checkbox"><label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_tax" id="l_tax" type="checkbox"><label for="l_tax">[% 'Tax' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_taxzone" id="l_taxzone" type="checkbox"><label for="l_taxzone">[% 'Steuersatz' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Miscellaneous' | $T8 %]</h4>
+    <div>
+      <input name="l_notes" id="l_notes" type="checkbox"><label for="l_notes">[% 'Notes' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shippingpoint" id="l_shippingpoint" type="checkbox"><label for="l_shippingpoint">[% 'Shipping Point' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shipvia" id="l_shipvia" type="checkbox"><label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_transaction_description" id="l_transaction_description" type="checkbox" [% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]><label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_payment_terms" id="l_payment_terms" type="checkbox"><label for="l_payment_terms">[% 'Payment Terms' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_charts" id="l_charts" type="checkbox"><label for="l_charts">[% 'Chart' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_direct_debit" id="l_direct_debit" type="checkbox"><label for="l_direct_debit">[% 'direct debit' | $T8 %]</label>
+    </div>
+    <div>
+    [% IF INSTANCE_CONF.get_doc_storage -%]
+      <input name="l_attachments" id="l_attachments" class=checkbox type=checkbox value=Y>[% 'Attachments' | $T8 %]
+    [% END-%]
+    </div>
+    <div>
+      <input name="l_items" id="l_items" class=checkbox type=checkbox value=Y> [% 'Positions' | $T8 %]
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Employee' | $T8 %]</h4>
+    <div>
+      <input name="l_salesman" id="l_salesman" type="checkbox"><label for="l_salesman">[% 'Salesperson' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_employee" id="l_employee" type="checkbox"><label for="l_employee">[% 'Employee' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Custom Variables' | $T8 %]</h4>
+    <div class="no-rows">
+      [% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]
+    </div>
+  </div>
+</div>
+<!-- /.wrapper.form-addition -->
+
+</form>
diff --git a/templates/design40_webpages/background_job/form.html b/templates/design40_webpages/background_job/form.html
new file mode 100644
index 000000000..7a3b3a1e6
--- /dev/null
+++ b/templates/design40_webpages/background_job/form.html
@@ -0,0 +1,48 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="form">
+  [% L.hidden_tag("id", SELF.background_job.id) %]
+  [% L.hidden_tag("back_to", SELF.back_to) %]
+
+  <table>
+    <tbody>
+       <tr>
+        <th>[% LxERP.t8('Active') %]</th>
+        <td>[% L.yes_no_tag("background_job.active", SELF.background_job.active) %]</td>
+       </tr>
+       <tr>
+        <th>[% LxERP.t8('Execution type') %]</th>
+        <td>[% 
+          L.select_tag('background_job.type', [
+            [ 'once', LxERP.t8('one-time execution') ],
+            [ 'interval', LxERP.t8('repeated execution') ]
+          ],
+          'default' = SELF.background_job.type) 
+        %]</td>
+       </tr>
+       <tr>
+        <th>[% LxERP.t8('Package name') %]</th>
+        <td>[% L.select_tag("background_job.package_name", JOB_CLASSES, 'default' => SELF.background_job.package_name) %]</td>
+       </tr>
+       <tr>
+        <th>[% LxERP.t8('Description') %]</th>
+        <td>[% L.input_tag("background_job.description", SELF.background_job.description, 'size' => 40) %]</td>
+       </tr>
+       <tr>
+        <th>[% LxERP.t8('Execution schedule') %]</th>
+        <td>[% L.input_tag("background_job.cron_spec", SELF.background_job.cron_spec, 'size' => 40) %]</td>
+       </tr>
+       <tr>
+        <th>[% LxERP.t8('Data') %]</th>
+        <td>[% L.textarea_tag("background_job.data", SELF.background_job.data, 'cols' => 80, 'rows' => 10) %]</td>
+       </tr>
+    </tbody>
+  </table>
+
+</form>
diff --git a/templates/design40_webpages/background_job/list.html b/templates/design40_webpages/background_job/list.html
new file mode 100644
index 000000000..a40146768
--- /dev/null
+++ b/templates/design40_webpages/background_job/list.html
@@ -0,0 +1,63 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+[% IF !BACKGROUND_JOBS.size %]
+  <p>[% LxERP.t8('No background job has been created yet.') %]</p>
+
+[% ELSE %]
+  <table id="background_job_list" class="tbl-list" width="100%">
+    <thead>
+      <tr>
+        <th>[% L.sortable_table_header('package_name') %]</th>
+        <th>[% L.sortable_table_header('description') %]</th>
+        <th>[% L.sortable_table_header('type') %]</th>
+        <th>[% L.sortable_table_header('active') %]</th>
+        <th>[% L.sortable_table_header('cron_spec') %]</th>
+        <th>[% L.sortable_table_header('last_run_at') %]</th>
+        <th>[% L.sortable_table_header('next_run_at') %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+    [% FOREACH background_job = BACKGROUND_JOBS %]
+      <tr class="listrow[% loop.count % 2 %]" id="background_job_id_[% background_job.id %]">
+        <td><a href="[% SELF.url_for(action => 'edit', id => background_job.id, back_to => SELF.get_callback) %]">[% HTML.escape(background_job.package_name) %]</a></td>
+        <td>[% HTML.escape(background_job.description) %]</td>
+        <td>
+          [% IF background_job.type == 'once' %]
+            [% LxERP.t8('one-time execution') %]
+          [% ELSIF background_job.type == 'interval' %]
+            [% LxERP.t8('repeated execution') %]
+          [% ELSE %]
+            [% HTML.escape(background_job.type) %]
+          [% END %]
+        </td>
+        <td>[% IF background_job.active %][% LxERP.t8('yes') %][% ELSE %][% LxERP.t8('no') %][% END %]</td>
+        <td>[% HTML.escape(background_job.cron_spec) %]</td>
+        <td>
+          [% IF background_job.last_run_at %]
+            [% HTML.escape(background_job.last_run_at.to_lxoffice('precision' => 'second')) %]
+          [% ELSE %]
+            [% LxERP.t8('never') %]
+          [% END %]
+        </td>
+
+        <td>
+          [% IF background_job.next_run_at %]
+            [% HTML.escape(background_job.next_run_at.to_lxoffice('precision' => 'second')) %]
+          [% ELSE %]
+            [% LxERP.t8('not set') %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+  </table>
+[% END %]
+
+[% L.paginate_controls %]
diff --git a/templates/design40_webpages/background_job_history/_filter.html b/templates/design40_webpages/background_job_history/_filter.html
new file mode 100644
index 000000000..801dc1962
--- /dev/null
+++ b/templates/design40_webpages/background_job_history/_filter.html
@@ -0,0 +1,57 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action="controller.pl" method="post" id="filter_form">
+
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id="filter_table" class="tbl-horizontal">
+  <tr>
+    <th>[% LxERP.t8('Package name') %]</th>
+    <td>[% L.input_tag('filter.package_name:substr::ilike', filter.package_name_substr__ilike, size = 10, class='wi-lightwide') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Description') %]</th>
+    <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, size = 10, class='wi-lightwide') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Result') %]</th>
+    <td>[% L.input_tag('filter.result:substr::ilike', filter.result_substr__ilike, size = 10, class='wi-lightwide') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Error') %]</th>
+    <td>[% L.input_tag('filter.error:substr::ilike', filter.error_substr__ilike, size = 10, class='wi-lightwide') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Status') %]</th>
+    <td>[% L.select_tag('filter.status:eq_ignore_empty', [ [ '', '' ], [ 'failure', LxERP.t8('failed') ], [ 'success', LxERP.t8('succeeded') ] ], default=filter.status_eq_ignore_empty, class='wi-lightwide') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Execution date from') %]</th>
+    <td>[% L.date_tag('filter.run_at:date::ge', filter.run_at_date__ge, class='wi-date') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Execution date to') %]</th>
+    <td>[% L.date_tag('filter.run_at:date::le', filter.run_at_date__le, class='wi-date') %]</td>
+  </tr>
+</table>
+
+
+[% L.hidden_tag('action', 'BackgroundJobHistory/dispatch') %]
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+<div class="buttons">
+  [% L.submit_tag('action_list', LxERP.t8('Continue'))%]
+  [% L.button_tag("\$('#filter_form').resetForm();", LxERP.t8('Reset')) %]
+</div>
+
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+</div><!-- /.wrapper -->
+
+
+</form>
diff --git a/templates/design40_webpages/background_job_history/list.html b/templates/design40_webpages/background_job_history/list.html
new file mode 100644
index 000000000..6e5726db6
--- /dev/null
+++ b/templates/design40_webpages/background_job_history/list.html
@@ -0,0 +1,54 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+[% PROCESS 'background_job_history/_filter.html' filter=SELF.models.filtered.laundered %]
+
+<div class="wrapper">
+[% IF !ENTRIES.size %]
+  <p>[% LxERP.t8('There are no entries in the background job history.') %]</p>
+
+[% ELSE %]
+  <table id="background_job_history_list" class="background_job_list tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% L.sortable_table_header('package_name') %]</th>
+        <th>[% L.sortable_table_header('description') %]</th>
+        <th>[% L.sortable_table_header('run_at') %]</th>
+        <th>[% L.sortable_table_header('status') %]</th>
+        <th>[% L.sortable_table_header('result') %]</th>
+        <th>[% L.sortable_table_header('error') %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+    [% FOREACH entry = ENTRIES %]
+      <tr class="listrow[% loop.count % 2 %]" id="background_job_history_id_[% entry.id %]">
+        <td><a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.models.get_callback) %]">[% HTML.escape(entry.package_name) %]</a></td>
+        <td>[% HTML.escape(entry.description) %]</td>
+        <td>[% HTML.escape(entry.run_at.to_lxoffice('precision' => 'second')) %]</td>
+        <td>
+          [% IF entry.status == 'success' %]
+            [% LxERP.t8('succeeded') %]
+          [% ELSIF entry.status == 'failure' %]
+            [% LxERP.t8('failed') %]
+          [% ELSE %]
+            [% HTML.escape(entry.status) %]
+          [% END %]
+        </td>
+        <td>[% HTML.escape(entry.result) %]</td>
+        <td>[% IF entry.error_col %]<pre>[% L.truncate(entry.error_col) %]</pre>[% END %]</td>
+      </tr>
+    [% END %]
+    </tbody>
+  </table>
+
+[% END %]
+
+[% L.paginate_controls %]
+</div><!-- /.wrapper -->
+
diff --git a/templates/design40_webpages/background_job_history/show.html b/templates/design40_webpages/background_job_history/show.html
new file mode 100644
index 000000000..cbdedadc1
--- /dev/null
+++ b/templates/design40_webpages/background_job_history/show.html
@@ -0,0 +1,52 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<table id="background_job_history_details" class="background_job_details">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Package name') %]</th>
+      <td>[% HTML.escape(SELF.history.package_name) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Description') %]</th>
+      <td>[% HTML.escape(SELF.history.description) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Run at') %]</th>
+      <td>[% HTML.escape(SELF.history.run_at.to_lxoffice('precision' => 'second')) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Execution status') %]</th>
+      <td>
+        [% IF SELF.history.status == 'success' %]
+          [% LxERP.t8('succeeded') %]
+        [% ELSIF SELF.history.status == 'failed' %]
+          [% LxERP.t8('failed') %]
+        [% ELSE %]
+          [% HTML.escape(SELF.history.status) %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Result') %]</th>
+      <td><pre class="pre-wrap">[% HTML.escape(SELF.history.result) %]</pre></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Error') %]</th>
+      <td>[% IF SELF.history.error_col %]<pre class="pre-wrap">[% HTML.escape(SELF.history.error_col) %]
+      </pre>
+      [% END %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Data') %]</th>
+      <td>[% IF SELF.history.data %]<pre class="pre-wrap">[% HTML.escape(SELF.history.data) %]
+      </pre>
+      [% END %]</td>
+    </tr>
+  </tbody>
+ </table>
diff --git a/templates/design40_webpages/bank_import/import_mt940.html b/templates/design40_webpages/bank_import/import_mt940.html
new file mode 100644
index 000000000..211f730d3
--- /dev/null
+++ b/templates/design40_webpages/bank_import/import_mt940.html
@@ -0,0 +1,90 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% FORM.title %]</h1>
+
+[% IF preview %]
+  <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
+    [% L.hidden_tag('file_name', SELF.file_name) %]
+    [% L.hidden_tag('charset', SELF.charset) %]
+  </form>
+[% END %]
+
+<h2>[% LxERP.t8("Overview") %]</h2>
+
+<table class="tbl-horizontal">
+  <tr>
+    <th>[% LxERP.t8("Total number of entries") %]:</th>
+    <td>[% SELF.statistics.total %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Entries with errors") %]:</th>
+    <td>[% SELF.statistics.errors %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8("Already imported entries (duplicates)") %]:</th>
+    <td>[% SELF.statistics.duplicates %]</td>
+  </tr>
+  <tr>
+[% IF preview %]
+    <th>[% LxERP.t8("Entries ready to import") %]:</th>
+    <td>[% SELF.statistics.to_import %]</td>
+[% ELSE %]
+    <th>[% LxERP.t8("Imported entries") %]:</th>
+    <td>[% SELF.statistics.imported %]</td>
+[% END %]
+  </tr>
+</table>
+
+[% IF SELF.statistics.total %]
+
+<h2>[% LxERP.t8("Transactions") %]</h2>
+
+<table class="tbl-list">
+  <thead>
+    <tr class="listheading">
+      <th>[% LxERP.t8("Transaction date") %]</th>
+      <th>[% LxERP.t8("Valutadate") %]</th>
+      <th>[% LxERP.t8("Other party") %]</th>
+      <th>[% LxERP.t8("Purpose") %]</th>
+      <th>[% LxERP.t8("Amount") %]</th>
+      <th>[% LxERP.t8("Remote account") %]</th>
+      <th>[% LxERP.t8("Local account") %]</th>
+      <th>[% LxERP.t8("End to end ID") %]</th>
+      <th>[% LxERP.t8("Information") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH transaction = SELF.transactions %]
+      <tr class="listrow[% IF transaction.error %]_error[% END %]">
+        <td class="center">[% transaction.transdate.to_kivitendo %]</td>
+        <td class="center">[% transaction.valutadate.to_kivitendo %]</td>
+        <td>[% HTML.escape(transaction.remote_name) %]</td>
+        <td>[% HTML.escape(transaction.purpose) %]</td>
+        <td class="numeric">[% LxERP.format_amount(transaction.amount, 2) %]</td>
+        <td>
+          [% IF transaction.remote_bank_code && transaction.remote_account_number %]
+            [% HTML.escape(transaction.remote_bank_code) %] / [% HTML.escape(transaction.remote_account_number) %]
+          [% END %]
+        </td>
+        <td>[% HTML.escape(transaction.bank_account.name) %]</td>
+        <td>[% HTML.escape(transaction.end_to_end_id) %]</td>
+        <td>
+          [% IF transaction.error %]
+            [% HTML.escape(transaction.error) %]
+          [% ELSIF transaction.duplicate %]
+            [% LxERP.t8("Duplicate") %]
+          [% ELSIF preview %]
+            [% LxERP.t8("To import") %]
+          [% ELSE %]
+            [% LxERP.t8("Imported") %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+[% END %]
diff --git a/templates/design40_webpages/bank_import/upload_mt940.html b/templates/design40_webpages/bank_import/upload_mt940.html
new file mode 100644
index 000000000..540ed75e8
--- /dev/null
+++ b/templates/design40_webpages/bank_import/upload_mt940.html
@@ -0,0 +1,26 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% FORM.title %]</h1>
+
+<div class="wrapper">
+  <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
+    <table class="tbl-horizontal">
+    <caption>[% "Import a MT940 file:" | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% LxERP.t8("Charset") %]:</th>
+          <td class="wi-wide">[% L.select_tag('charset', [ [ 'ISO-8859-15', 'ISO-8859-15 (Latin 1)' ], [ 'UTF-8', 'UTF-8' ], [ 'Windows-1252', 'Windows-1252' ] ], default='UTF-8') %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("MT940 file") %]:</th>
+          <td>[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>
+        </tr>
+    <tbody>
+    </table>
+  </form>
+</div>
diff --git a/templates/design40_webpages/bank_transactions/_filter.html b/templates/design40_webpages/bank_transactions/_filter.html
new file mode 100644
index 000000000..cf383d275
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/_filter.html
@@ -0,0 +1,68 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action='controller.pl' method='post' id='filter_form'>
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id='filter_table' class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Bank account' | $T8 %]</th>
+      <td>[% L.select_tag('filter.local_bank_account_id', BANK_ACCOUNTS, default=filter.local_bank_account_id, title_key='displayable_name', with_empty=1, class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transdate from' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Transdate to' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.transdate:date::le', filter.transdate_date__le) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Valutadate from' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.valutadate:date::ge', filter.valutadate_date__ge) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Valutadate to' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.valutadate:date::le', filter.valutadate_date__le) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Remote name' | $T8 %]</th>
+      <td>[% L.input_tag('filter.remote_name:substr::ilike', filter.remote_name_substr__ilike, class='initial_focus wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Remote account number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.remote_account_number:substr::ilike', filter.remote_account_number_substr__ilike, class='initial_focus wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Remote bank code' | $T8 %]</th>
+      <td>[% L.input_tag('filter.remote_bank_code:substr::ilike', filter.remote_bank_code_substr__ilike, size=60, class='initial_focus wi-small') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Amount' | $T8 %]</th>
+      <td>[% L.input_tag('filter.amount:number', filter.amount_number, class="wi-small") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Purpose' | $T8 %]</th>
+      <td>[% L.input_tag('filter.purpose:substr::ilike', filter.purpose_substr__ilike, size=60, class='initial_focus wi-verywide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+<div class="buttons">
+  [% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+</div>
+[% END %]
+
+
+[% INCLUDE 'common/toggle_panel.html'%]
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/bank_transactions/_payment_suggestion.html b/templates/design40_webpages/bank_transactions/_payment_suggestion.html
new file mode 100644
index 000000000..0268f24c8
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/_payment_suggestion.html
@@ -0,0 +1,33 @@
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+[% SELECT_OPTIONS = invoice.get_payment_select_options_for_bank_transaction(bt_id) %]
+[% is_skonto_pt   = SELECT_OPTIONS.1.selected %]
+[% formatted_skonto_amount          = LxERP.format_amount(invoice.skonto_amount, 2) %]
+[% formatted_skonto_amount_selected = is_skonto_pt ? formatted_skonto_amount : LxERP.format_amount(0, 2) %]
+<span id="[% HTML.escape(bt_id) %].[% HTML.escape(invoice.id) %]"
+  data-invoice-amount="[% HTML.escape(invoice.open_amount * 1) %]"
+  data-invoice-amount-less-skonto="[% HTML.escape(invoice.amount_less_skonto * 1) %]">
+ [% P.hidden_tag("invoice_ids." _ bt_id _ "[]", invoice.id) %]
+ [% P.hidden_tag("skonto_pt." _ bt_id _ "." _ invoice.id _ "", is_skonto_pt) %]
+ [% LxERP.t8("Invno.") %]: [% HTML.escape(invoice.invnumber) %]</br>
+ [% LxERP.t8("Open amount") %]: [% LxERP.format_amount(invoice.open_amount, 2) %]</br>
+ [% P.select_tag("invoice_skontos." _ bt_id _ "[]", SELECT_OPTIONS, value_key="payment_type", title_key="display", onChange="kivi.BankTransaction.update_skonto(this, " _ bt_id _ ", " _ invoice.id _ ", '$formatted_skonto_amount')"  ) %]</br>
+ [% LxERP.t8("Skonto amount") %]: [% P.input_tag("free_skonto_amount." _ bt_id _ "." _ invoice.id _ "", "$formatted_skonto_amount_selected", default=0, style=style, disabled=1, size=4, class='numeric', onblur="kivi.BankTransaction.update_invoice_amount(" _ bt_id _ ", 0, this)") %]
+ <!-- PENDENT: Loeschsymbol (einheitliches) -->
+ [% IF invoice.forex %]
+  </br>
+  </br>
+   [% LxERP.t8("Curr") %]: <b>[% HTML.escape(invoice.currency.name) %]</b></br>
+   [% daily_exchangerate           = invoice.get_exchangerate_for_bank_transaction(bt_id) %]
+   [% formatted_daily_exchangerate = daily_exchangerate ? LxERP.format_amount(daily_exchangerate, 5) : LxERP.format_amount(1, 5)  %]
+   [% UNLESS daily_exchangerate  %][% LxERP.t8("new") %] [% END %][% LxERP.t8("default exchange rate") %]: [% P.input_tag("exchangerate_" _ bt_id _ "_" _  invoice.id , "$formatted_daily_exchangerate", style=style, disabled=0, size=4, class='numeric') %]
+   [% P.hidden_tag("currency_id_" _ bt_id _ "_" _ invoice.id, invoice.currency.id) %]
+   </br>
+   [% IF invoice.invoice_type == 'ap_transaction' || invoice.invoice_type == 'purchase_invoice' || invoice.invoice_type == 'credit_note' %]
+     [% P.checkbox_tag("book_fx_bank_fees_" _ bt_id _ "_" _ invoice.id, value=1, checked="1") %] [% LxERP.t8("Bank Fee Booking") %]
+     </br>
+   [% END %]
+ [% END %]
+ [% P.link_tag("#", "x", onclick="kivi.BankTransaction.delete_invoice(" _ bt_id _ "," _ invoice.id _ ")") %]
+</span>
diff --git a/templates/design40_webpages/bank_transactions/_problems.html b/templates/design40_webpages/bank_transactions/_problems.html
new file mode 100644
index 000000000..a121ff6c3
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/_problems.html
@@ -0,0 +1,52 @@
+[% USE LxERP %]
+[% USE T8 %]
+[% USE HTML %]
+[% USE P %]
+
+<h3>[% LxERP.t8("Warnings and errors") %]</h3>
+<p class="message message_info">
+  [% LxERP.t8("Bank transactions with errors have not been posted.") %] <br>
+  [% LxERP.t8("Bank transactions that either only have warnings or no message at all have been posted.") %]
+</p>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("Type") %]</th>
+      <th>[% LxERP.t8("Invoices") %]</th>
+      <th>[% LxERP.t8("Transdate") %]</th>
+      <th>[% LxERP.t8("Amount") %]</th>
+      <th>[% LxERP.t8("Remote name") %]</th>
+      <th>[% LxERP.t8("Purpose") %]</th>
+      <th>[% LxERP.t8("Remote account number") %]</th>
+      <th>[% LxERP.t8("Remote bank code") %]</th>
+      <th>[% LxERP.t8("Message") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH problem = SELF.problems %]
+    <tr[% IF problem.result == 'error' %]class="row_error"[% END %]>
+      <td>
+        [% IF problem.result == 'error' %]
+          [% LxERP.t8("Error") %]
+        [% ELSE %]
+          [% LxERP.t8("Warning") %]
+        [% END %]
+      </td>
+      <td>
+        [% FOREACH invoice = problem.invoices %]
+          [% invoice.presenter.invoice %]
+          [% UNLESS loop.last %]<br>[% END %]
+        [% END %]</td>
+      <td>[% HTML.escape(problem.bank_transaction.transdate.to_kivitendo) %]</td>
+      <td>[% HTML.escape(LxERP.format_amount(problem.bank_transaction.amount, 2)) %]</td>
+      <td>[% HTML.escape(problem.bank_transaction.remote_name) %]</td>
+      <td>[% HTML.escape(problem.bank_transaction.purpose) %]</td>
+      <td>[% HTML.escape(problem.bank_transaction.remote_account_number) %]</td>
+      <td>[% HTML.escape(problem.bank_transaction.remote_bank_code) %]</td>
+      <td>[% HTML.escape(problem.message) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
diff --git a/templates/design40_webpages/bank_transactions/_template_list.html b/templates/design40_webpages/bank_transactions/_template_list.html
new file mode 100644
index 000000000..5a2309aae
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/_template_list.html
@@ -0,0 +1,60 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+
+[% IF TEMPLATES_AP.size %]
+
+  <table class="tbl-list">
+    <caption>[% LxERP.t8('AP template suggestions') %]:</caption>
+    <thead>
+      <tr>
+        <th>[% LxERP.t8('Description') %]</th>
+        <th>[% LxERP.t8('Vendor') %]</th>
+        <th>[% LxERP.t8('Employee') %]</th>
+        <th>[% LxERP.t8('Template date') %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH template = TEMPLATES_AP %]
+      <tr>
+        <td>[% P.link_tag(SELF.load_ap_record_template_url(template), template.template_name) %]</td>
+        <td>[% HTML.escape(template.vendor.name) %]</td>
+        <td>[% HTML.escape(template.employee.name || template.employee.login) %]</td>
+        <td>[% HTML.escape(template.itime_as_date) %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+[% ELSE %]
+  <p class="message message_hint">[% LxERP.t8('No AP template was found.') %]</p>
+[% END %]
+
+
+[% IF TEMPLATES_GL.size %]
+
+  <table class="tbl-list">
+    <caption>[% LxERP.t8('GL template suggestions') %]:</caption>
+    <thead>
+      <tr>
+        <th>[% LxERP.t8('Description') %]</th>
+        <th>[% LxERP.t8('Reference') %]</th>
+        <th>[% LxERP.t8('Employee') %]</th>
+        <th>[% LxERP.t8('Template date') %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH template = TEMPLATES_GL %]
+        <tr>
+          <td>[% P.link_tag(SELF.load_gl_record_template_url(template), template.template_name) %]</td>
+          <td>[% HTML.escape(template.reference) %]</td>
+          <td>[% HTML.escape(template.employee.name || template.employee.login) %]</td>
+          <td>[% HTML.escape(template.itime_as_date) %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+[% ELSE %]
+  <p class="message message_hint">[% LxERP.t8('No GL template was found.') %]</p>
+[% END %]
diff --git a/templates/design40_webpages/bank_transactions/add_list.html b/templates/design40_webpages/bank_transactions/add_list.html
new file mode 100644
index 000000000..3ffc761ec
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/add_list.html
@@ -0,0 +1,47 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% USE L %]
+
+[% IF !INVOICES.size %]
+  <p class="message message_hint">[% 'No data was found.' | $T8 %]</p>
+
+[% ELSE %]
+
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th>[% L.checkbox_tag('invoices_check_all') %]</th>
+        <th>[% LxERP.t8("Invoice number") %]</th>
+        <th>[% LxERP.t8("Amount") %]</th>
+        <th>[% LxERP.t8("Open amount") %]</th>
+        <th>[% LxERP.t8("Amount less skonto") %]</th>
+        <th>[% LxERP.t8("Invoice Date") %]</th>
+        <th>[% LxERP.t8("Customer/Vendor Number") %]</th>
+        <th>[% LxERP.t8("Customer/Vendor Name") %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH invoice = INVOICES %]
+      <tr>
+        <td>[% L.checkbox_tag('invoice_id[]', value=invoice.id) %]</td>
+        <td>[% invoice.invnumber %]</td>
+        <td>[% LxERP.format_amount(invoice.amount, 2) %]</td>
+        <td>[% LxERP.format_amount(invoice.open_amount, 2) %]</td>
+        <td>[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]</td>
+        <td>[% invoice.transdate_as_date %]</td>
+        <td>[% invoice.vendor.vendornumber %][% invoice.customer.customernumber %]</td>
+        <td>[% invoice.vendor.name %][% invoice.customer.name %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <script type="text/javascript"><!--
+    $(function() {
+      $('#invoices_check_all').checkall('INPUT[name="invoice_id[]"]');
+    });
+  --></script>
+
+[% END %]
diff --git a/templates/design40_webpages/bank_transactions/assign_invoice.html b/templates/design40_webpages/bank_transactions/assign_invoice.html
new file mode 100644
index 000000000..b0ba531af
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/assign_invoice.html
@@ -0,0 +1,83 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE T8 %]
+
+[% SET debug = 0 %]
+
+<form method="post" action="javascript:kivi.BankTransaction.filter_invoices();" id="assign_invoice_window_form" data-bank-transaction-id="[% HTML.escape(SELF.transaction.id) %]">
+
+<div class="wrapper">
+
+  <table class="tbl-liste">
+    <caption>[% LxERP.t8("Bank transaction") %]</caption>
+    <thead>
+      <tr>
+        [% IF debug %]
+          <td>[% LxERP.t8("ID") %]:</td>
+        [% END %]
+        <td>[% LxERP.t8("Transdate") %]:</td>
+        <td>[% LxERP.t8("Amount") %]:</td>
+        <td>[% LxERP.t8("Remote name") %]:</td>
+        <td>[% LxERP.t8("Purpose") %]:</td>
+        <td>[% LxERP.t8("Remote account number") %]:</td>
+        <td>[% LxERP.t8("Remote bank code") %]:</td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        [% IF debug %]
+          <td>[% SELF.transaction.id %]</td>
+        [% END %]
+        <td>[% SELF.transaction.transdate_as_date %]</td>
+        <td>[% LxERP.format_amount(SELF.transaction.amount, 2) %]</td>
+        <td>[% SELF.transaction.remote_name %]</td>
+        <td>[% SELF.transaction.purpose %]</td>
+        <td>[% SELF.transaction.remote_account_number %]</td>
+        <td>[% SELF.transaction.remote_bank_code %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% LxERP.t8("Invoice filter") %]</caption>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8("Invoice number") %]</th>
+        <td>[% L.input_tag('invnumber', '', style=style) %]</td>
+        <th>[% LxERP.t8("Customer/Vendor Name") %]</th>
+        <td>[% L.input_tag('vcname', '', style=style) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Amount") %]</th>
+        <td>[% L.input_tag('amount', '', style=style) %]</td>
+        <th>[% LxERP.t8("Customer/Vendor Number") %]</th>
+        <td>[% L.input_tag('vcnumber', '', style=style) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Invdate from") %]</th>
+        <td>[% L.date_tag('transdatefrom') %]</td>
+        <th>[% LxERP.t8("to (date)") %]</th>
+        <td>[% L.date_tag('transdateto') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <div class="buttons">
+    [% L.submit_tag('', LxERP.t8("Search")) %]
+    [% L.button_tag('kivi.BankTransaction.add_selected_invoices()', LxERP.t8("Add invoices"), id='add_selected_record_links_button') %]
+    [% L.button_tag('$("#assign_invoice_window_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+    <a href="#" onclick="$('#assign_invoice_window').dialog('close');" class="neutral">[% LxERP.t8("Cancel") %]</a>
+  </div>
+
+  <div id="record_list_filtered_list"></div>
+
+</div><!-- /.wrapper -->
+
+</form>
+
+<script type="text/javascript"><!--
+$(function() {
+  $('#invnumber').focus();
+});
+//--></script>
diff --git a/templates/design40_webpages/bank_transactions/create_invoice.html b/templates/design40_webpages/bank_transactions/create_invoice.html
new file mode 100644
index 000000000..dc83a09da
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/create_invoice.html
@@ -0,0 +1,75 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+[% USE T8 %]
+<div class="wrapper">
+
+<table class="tbl-list">
+  <caption>[% 'Bank transaction' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("ID") %]</th>
+      <th>[% LxERP.t8("Amount") %]</th>
+      <th>[% LxERP.t8("Date") %]</th>
+      <th>[% LxERP.t8("Remote name") %]</th>
+      <th>[% LxERP.t8("Purpose") %]</th>
+      <th>[% LxERP.t8("Remote bank code") %]</th>
+      <th>[% LxERP.t8("Remote account number") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>[% SELF.transaction.id %]</td>
+      <td>[% LxERP.format_amount(SELF.transaction.amount, 2) %]</td>
+      <td>[% SELF.transaction.valutadate_as_date %]</td>
+      <td>[% SELF.transaction.remote_name %]</td>
+      <td>[% SELF.transaction.purpose %]</td>
+      <td>[% SELF.transaction.remote_bank_code %]</td>
+      <td>[% SELF.transaction.remote_account_number %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<form method="post" action="javascript:kivi.BankTransaction.filter_templates()" id="create_invoice_window_form">
+[% L.hidden_tag("bt_id",               SELF.transaction.id)      %]
+[% L.hidden_tag("filter.bank_account", FORM.filter.bank_account) %]
+[% L.hidden_tag("filter.fromdate",     FORM.filter.fromdate)     %]
+[% L.hidden_tag("filter.todate",       FORM.filter.todate)       %]
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Template Description") %]</th>
+      <td>[% P.input_tag("template", template_name, style="width: 250px") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Vendor") %]</th>
+      <td>[% P.input_tag("vendor", vendor_name, style="width: 250px") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Reference") %]</th>
+      <td>[% P.input_tag("reference", reference_name, style="width: 250px") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% P.submit_tag('', LxERP.t8("Filter")) %]
+  [% P.button_tag('$("#create_invoice_window_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+  <a href="#" onclick="$('#create_invoice_window').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+</p>
+
+</form>
+
+<div id="templates">
+  [% PROCESS "bank_transactions/_template_list.html" %]
+</div>
+</div><!-- /.wrapper -->
+
+<script type="text/javascript"><!--
+$(function() {
+  $('#template').focus();
+});
+//--></script>
diff --git a/templates/design40_webpages/bank_transactions/invoices.html b/templates/design40_webpages/bank_transactions/invoices.html
new file mode 100644
index 000000000..68ca0ad31
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/invoices.html
@@ -0,0 +1,30 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% SET debug=1 %]
+
+[% FOREACH invoice = INVOICES %]
+  <tr id="extra_row_[% HTML.escape(bt_id) %]_[% HTML.escape(invoice.id) %]">
+    <td></td>
+    <td></td>
+    <td id="assigned_invoices_[% bt.id %]_[% invoice.id %]">
+      [% PROCESS "bank_transactions/_payment_suggestion.html" %]
+    </td>
+    <td>[% P.input_tag("sources_" _ bt_id _ "_" _ invoice.id, "") %]</td>
+    <td>[% P.input_tag("memos_" _ bt_id _ "_" _ invoice.id, "") %]</td>
+    [% IF debug %]
+      <td></td>
+    [% END %]
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+[% END %]
diff --git a/templates/design40_webpages/bank_transactions/list.html b/templates/design40_webpages/bank_transactions/list.html
new file mode 100644
index 000000000..e62b3b744
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/list.html
@@ -0,0 +1,61 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+[% IF SELF.problems.size %]
+  [% INCLUDE 'bank_transactions/_problems.html' %]
+[% END %]
+
+<p>[% HTML.escape(bank_account.name) %] [% HTML.escape(bank_account.iban) %], [% 'Bank code' | $T8 %] [% HTML.escape(bank_account.bank_code) %], [% 'Bank' | $T8 %] [% HTML.escape(bank_account.bank) %]</p>
+<p>
+  [% IF FORM.filter.fromdate %] [% 'From'      | $T8 %] [% FORM.filter.fromdate %] [% END %]
+  [% IF FORM.filter.todate %]   [% 'to (date)' | $T8 %] [% FORM.filter.todate   %] [% END %]
+  [% L.hidden_tag("filter.bank_account", FORM.filter.bank_account) %]
+  [% L.hidden_tag("filter.fromdate",     FORM.filter.fromdate)     %]
+  [% L.hidden_tag("filter.todate",       FORM.filter.todate)       %]
+</p>
+
+<div id="bt_tabs" class="tabwidget">
+  <ul>
+    <li><a href="#all">[% 'All transactions' | $T8 %]</a></li>
+    <li><a href="#automatic">[% 'Proposals' | $T8 %]</a></li>
+  </ul>
+
+  <div id="all">
+    [% PROCESS "bank_transactions/tabs/all.html" %]
+  </div>
+  <div id="automatic">
+    [% PROCESS "bank_transactions/tabs/automatic.html" %]
+  </div>
+</div>
+
+
+<div id="set_all_sources_memos_dialog" class="hidden">
+  <table class="tbl-horizontal">
+    <tr>
+      <th>[% LxERP.t8("Source") %]:</th>
+      <td>[% L.input_tag("set_all_sources", "") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Memo") %]:</th>
+      <td>[% L.input_tag("set_all_memos", "") %]</td>
+    </tr>
+  </table>
+
+  <div class="buttons">
+    [% L.button_tag("kivi.BankTransaction.set_all_sources_memos()", LxERP.t8("Set fields")) %]
+    <a href="#" onclick="$('#set_all_sources_memos_dialog').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+  </div>
+</div><!-- /#set_all_sources_memos_dialog -->
+
+
+<script type="text/javascript"><!--
+$(function() {
+  kivi.BankTransaction.init_list([% ui_tab %]);
+});
+//--></script>
diff --git a/templates/design40_webpages/bank_transactions/report_bottom.html b/templates/design40_webpages/bank_transactions/report_bottom.html
new file mode 100644
index 000000000..0f20ab386
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/report_bottom.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% L.paginate_controls(models=SELF.models) %]
+</form>
diff --git a/templates/design40_webpages/bank_transactions/report_top.html b/templates/design40_webpages/bank_transactions/report_top.html
new file mode 100644
index 000000000..54081edc1
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/report_top.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% PROCESS 'bank_transactions/_filter.html' filter=SELF.models.filtered.laundered %]
+<form method="post" action="controller.pl" id="form">
diff --git a/templates/design40_webpages/bank_transactions/search.html b/templates/design40_webpages/bank_transactions/search.html
new file mode 100644
index 000000000..84dc11ae9
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/search.html
@@ -0,0 +1,32 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% INCLUDE 'common/flash.html' %]
+<h1>[% 'Search bank transactions' | $T8 %]</h1>
+
+
+<form method="post" action="controller.pl" id="search_form">
+<div class="wrapper">
+
+  [%- IF INSTANCE_CONF.get_payments_changeable != '0' -%]
+  [% 'Cannot safely book imported bank transactions due to lax posting settings for payments' | $T8 %]
+  [%- ELSE -%]
+  <table class="tbl-horizontal">
+    <tr>
+      <th>[% 'Bank account' | $T8 %]</th>
+      <td>[% L.select_tag('filter.bank_account', BANK_ACCOUNTS, default=bank_account, title_key='displayable_name', with_empty=0, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transdate from' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.fromdate', filter.fromdate) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'to (date)' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('filter.todate', filter.todate) %]</span></td>
+    </tr>
+  </table>
+  [%- END -%]
+</div>
+</form>
diff --git a/templates/design40_webpages/bank_transactions/tabs/all.html b/templates/design40_webpages/bank_transactions/tabs/all.html
new file mode 100644
index 000000000..76157ad55
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/tabs/all.html
@@ -0,0 +1,165 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% USE P %]
+
+[% BLOCK proposal_div %]
+  <div data-proposal-id="[% prop.id %]">
+ <a href=# onclick="kivi.BankTransaction.add_invoices('[% bt.id %]', '[% prop.id %]');" title="<table><tr><th></th><th>[% 'Suggested invoice' | $T8 %][% IF !prop.is_sales %] ([% 'AP' | $T8 %])[% END %]</th><th>[% 'Bank transaction' | $T8 %]</th></tr><tr><th>[% 'Amount' | $T8 %]</th><td>[% prop.realamount %] ([% 'open' | $T8 %]: [% LxERP.format_amount(prop.open_amount, 2) %])</td><td>[% LxERP.format_amount(bt.amount, 2) %]</td></tr>[% IF prop.skonto_date %]<tr><th>[% 'Payment terms' | $T8 %]</th><td>[% LxERP.format_amount(prop.amount_less_skonto, 2) %] [% 'until' | $T8 %] [% HTML.escape(prop.skonto_date.to_kivitendo) %] ([% prop.percent_skonto * 100 %] %)</td><td></td></tr>[% END %]<tr><th>[% 'Customer/Vendor' | $T8 %]</th><td>[% HTML.escape(prop.customer.displayable_name) %][% HTML.escape(prop.vendor.displayable_name) %]</td><td>[% HTML.escape(bt.remote_name) %]</td></tr><tr><th>[% 'Invoice Date' | $T8 %]</th><td>[% HTML.escape(prop.transdate_as_date) %]</td><td>[% HTML.escape(bt.transdate_as_date) %] ([% HTML.escape(bt.transdate.utc_rd_days - prop.transdate.utc_rd_days) %])</td></tr><tr><th>[% 'Invoice Number' | $T8 %]</th><td>[% HTML.escape(prop.invnumber) %]</td><td>[% HTML.escape(bt.purpose) %]</td></tr></table>"
+              class="[% IF bt.agreement >= 5 %]green[% ELSIF bt.agreement < 5 and bt.agreement >= 3 %]orange[% ELSE %]red[% END %] tooltipster-html">&larr;[% HTML.escape(prop.invnumber)%]</a>
+        </div>
+[% END %]
+
+[% SET debug=1 %]
+<form method="post" id="list_all_form">
+  [% L.hidden_tag('filter.bank_account', FORM.filter.bank_account) %]
+  [% L.hidden_tag('filter.fromdate', FORM.filter.fromdate) %]
+  [% L.hidden_tag('filter.todate',   FORM.filter.todate) %]
+  [% L.hidden_tag('action', 'BankTransaction/dispatch') %]
+  [% L.hidden_tag('ui_tab', ui_tab) %]
+
+  <table id="bt_list" class="tbl-list">
+    <thead>
+      <tr>
+        <th></th>
+        <th></th>
+        <th>[% LxERP.t8("Assigned invoices with amount") %]</th>
+        <th style="width: 100px">[% LxERP.t8("Source") %]</th>
+        <th style="width: 100px">[% LxERP.t8("Memo") %]</th>
+        [% IF debug %]
+        <th>[% 'Score' | $T8 %]</th>
+        [% END %]
+        <th>
+          [% IF FORM.sort_by == 'proposal'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=proposal&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+            [% 'Proposal' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=proposal&sort_dir=0" class="sort_link">[% 'Proposal' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>
+          [% IF FORM.sort_by == 'transdate'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=transdate&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+            [% 'Transdate' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=transdate&sort_dir=0" class="sort_link">[% 'Transdate' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>
+          [% IF FORM.sort_by == 'amount'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=amount&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+              [% 'Amount' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=amount&sort_dir=0" class="sort_link">
+              [% 'Amount' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>[% 'Assigned' | $T8 %]</th>
+        <th>
+          [% IF FORM.sort_by == 'remote_name'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_name&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+              [% 'Remote name' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_name&sort_dir=0" class="sort_link">
+              [% 'Remote name' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>[% 'Purpose' | $T8 %]</th>
+        <th>[% 'Type' | $T8 %]</th>
+        <th>
+          [% IF FORM.sort_by == 'remote_account_number'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_account_number&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+              [% 'Remote account number' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_account_number&sort_dir=0" class="sort_link">
+              [% 'Remote account number' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>
+          [% IF FORM.sort_by == 'remote_bank_code'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_bank_code&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+            [% 'Remote bank code' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=remote_bank_code&sort_dir=0" class="sort_link">[% 'Remote bank code' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>
+          [% IF FORM.sort_by == 'valutadate'%]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=valutadate&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+              [% 'Valutadate' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]</a>
+          [% ELSE %]
+            <a href="controller.pl?action=BankTransaction/list&filter.bank_account=[% bank_account.id %]&sort_by=valutadate&sort_dir=0" class="sort_link">
+              [% 'Valutadate' | $T8 %]</a>
+          [% END %]
+        </th>
+        <th>[% 'Currency' | $T8 %]</th>
+      </tr>
+    </thead>
+  [% FOREACH bt = BANK_TRANSACTIONS %]
+    <tbody id="bt_rows_[% HTML.escape(bt.id) %]">
+    [% SET proposals = bt.proposals.as_list.size > 0 ? bt.proposals.as_list : [{}] ;
+      FOREACH prop = proposals %]
+        [% IF loop.first %]
+          <tr id="bt_id_[% bt.id %]">
+            <td><a href=# onclick="kivi.BankTransaction.assign_invoice('[% bt.id %]'); return false;">[% 'Assign invoice' | $T8 %]</a></td>
+            <td><a href=# onclick="kivi.BankTransaction.create_invoice('[% bt.id %]'); return false;">[% 'Create invoice' | $T8 %]</a></td>
+            <td id="assigned_invoices_[% bt.id %]_[% prop.id %]"></td>
+            <td>[% P.input_tag("sources_" _ bt.id _ "_" _ prop.id, "", class="hidden") %]</td>
+            <td>[% P.input_tag("memos_" _ bt.id _ "_" _ prop.id, "", class="hidden") %]</td>
+            [% IF debug %]
+              <td class="tooltipster-html" title="[% FOREACH match = bt.rule_matches %] [% match %]<br> [% END %]">[% bt.agreement %]</td>
+            [% END %]
+            <td>[% IF prop.id ; PROCESS proposal_div ; END %]</td>
+            <td>[% bt.transdate_as_date %]</td>
+            <td>[% LxERP.format_amount(bt.amount, 2) %]</td>
+            <td id="invoice_amount_[% HTML.escape(bt.id) %]"
+              data-invoice-amount="[% HTML.escape(bt.invoice_amount) %]" >
+              <span [% IF bt.invoice_amount %] style="background-color:#FF8000;" [% END %]>
+                [% HTML.escape(LxERP.format_amount(bt.invoice_amount, 2)) %]
+              </span>
+            </td>
+            <td>[% HTML.escape(bt.remote_name) %]</td>
+            <td>[% HTML.escape(bt.purpose) %]</td>
+            <td>[% HTML.escape(bt.transaction_text) %]</td>
+            <td>[% HTML.escape(bt.remote_account_number) %]</td>
+            <td>[% HTML.escape(bt.remote_bank_code) %]</td>
+            <td>[% bt.valutadate_as_date %]</td>
+            <td>[% HTML.escape(bt.currency.name) %]</td>
+          </tr>
+        [% ELSE # loop.first %]
+          <tr>
+            <td></td>
+            <td></td>
+            <td id="assigned_invoices_[% bt.id %]_[% prop.id %]"></td>
+            <td>[% P.input_tag("sources_" _ bt.id _ "_" _ prop.id, "", class="hidden") %]</td>
+            <td>[% P.input_tag("memos_" _ bt.id _ "_" _ prop.id, "", class="hidden") %]</td>
+            [% IF debug %]
+              <td></td>
+            [% END %]
+            <td>
+            [% PROCESS proposal_div %]
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+       [% END # loop.first %]
+    [% END # FOREACH proposal %]
+   </tbody>
+  [% END %]
+  </table>
+
+ <div class="buttons">
+  [% L.submit_tag('action_save_invoices', LxERP.t8('Save invoices')) %]
+  [% L.button_tag('kivi.BankTransaction.show_set_all_sources_memos_dialog("#list_all_form [name^=\\"sources_\\"]:visible", "#list_all_form [name^=\\"memos_\\"]:visible")', LxERP.t8('Set all source and memo fields'), class='neutral') %]
+ </div>
+
+</form>
diff --git a/templates/design40_webpages/bank_transactions/tabs/automatic.html b/templates/design40_webpages/bank_transactions/tabs/automatic.html
new file mode 100644
index 000000000..d2490d8af
--- /dev/null
+++ b/templates/design40_webpages/bank_transactions/tabs/automatic.html
@@ -0,0 +1,128 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<form method="post" id="list_automatic_form" class="box">
+[% L.hidden_tag('filter.bank_account', FORM.filter.bank_account) %]
+[% L.hidden_tag('filter.fromdate', FORM.filter.fromdate) %]
+[% L.hidden_tag('filter.todate',   FORM.filter.todate) %]
+[% L.hidden_tag('action', 'BankTransaction/dispatch') %]
+[% L.hidden_tag('ui_tab', ui_tab) %]
+
+<div class="horizontal-scroll-wrapper">
+
+<table id="bank_transactions_proposals" class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% L.checkbox_tag('check_all') %]</th>
+      <th>[% 'Type' | $T8 %]</th>
+      <th>[% 'ID' | $T8 %]</th>
+      <th>[% 'Transdate' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Skonto' | $T8 %]</th>
+      <th>[% 'Purpose/Reference' | $T8 %]</th>
+      [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+        <th>[% 'QR reference' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Customer/Vendor/Remote name' | $T8 %]</th>
+      <th>[% LxERP.t8("Source") %]</th>
+      <th>[% LxERP.t8("Memo") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+  [% IF !PROPOSALS.size %]
+    <td colspan="10"><p class="message message_hint center">[% 'No data was found.' | $T8 %]</p></td>
+  [% ELSE %]
+    [% FOREACH proposal = PROPOSALS %]
+      <tr>
+        <td rowspan=[% proposal.rowspan %] style="valign:center;">
+          [% L.checkbox_tag('proposal_ids[]', checked=0, value=proposal.id) %]
+        </td>
+        <td>[% HTML.escape(proposal.transaction_text) %]</td>
+        <td>[% proposal.id %]</td>
+        <td>[% proposal.transdate_as_date %]</td>
+        <td>[% LxERP.format_amount(proposal.amount,2) %]</td>
+        <td></td>
+        <td>[%
+            SET purpose = HTML.escape(proposal.purpose)
+                invnumber_found = '' ;
+            FOREACH proposed_invoice = proposal.proposals;
+              IF purpose.match(proposed_invoice.invnumber);
+                SET invnumber_found = proposed_invoice.invnumber ;
+              END ;
+            END ;
+
+            IF invnumber_found ;
+              purpose.replace(invnumber_found, '<span class="invoice_number_highlight">' _ invnumber_found _ '</span>') ;
+            ELSE ;
+              purpose ;
+            END
+        %]</td>
+        [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+          <td>
+          [% SET qr_reference = HTML.escape(proposal.qr_reference)
+              qr_reference_found = '';
+            FOREACH proposed_invoice = proposal.proposals;
+              IF qr_reference.match(proposed_invoice.qr_reference);
+                SET qr_reference_found = proposed_invoice.qr_reference;
+              END;
+            END;
+
+            IF qr_reference_found;
+              qr_reference.replace(qr_reference_found, '<span class="qr_reference_highlight">' _ qr_reference_found _ '</span>');
+            ELSE;
+              purpose;
+            END %]
+          </td>
+        [% END %]
+        <td>[% HTML.escape(proposal.remote_name) %]</td>
+        <td></td>
+        <td></td>
+      </tr>
+
+      [% FOREACH proposed_invoice = proposal.proposals %]
+        <tr>
+          <td></td>
+          <td>[% 'Invoice' | $T8 %]</td>
+          <td>[% proposed_invoice.id %]</td>
+          <td>[% proposed_invoice.transdate_as_date %]
+              [% L.hidden_tag("invoice_ids." _ proposal.id _ "[]", proposed_invoice.id) %]</td>
+          <td>[% proposed_invoice.realamount %]</td>
+          <td>[% IF proposal.rule_matches.0.match('skonto_exact_amount') %]
+                [% 'with_skonto_pt' | $T8 %]
+                [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", 'with_skonto_pt') %]</td>
+              [% ELSIF proposal.rule_matches.0.match('skonto_fuzzy_amount') %]
+                [% 'with_fuzzy_skonto_pt' | $T8 %]
+                [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", 'with_fuzzy_skonto_pt') %]</td>
+              [% END %]
+          <td[% IF proposed_invoice.invnumber == invnumber_found %] class="invoice_number_highlight"[% END %]>[% proposed_invoice.link %]</td>
+          [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+            <td>
+            [% IF proposed_invoice.qr_reference == proposal.qr_reference %]
+              <span class="qr_reference_highlight">[% HTML.escape(proposed_invoice.qr_reference) %]</span>
+            [% ELSE %]
+              [% HTML.escape(proposed_invoice.qr_reference) %]
+            [% END %]
+            </td>
+          [% END %]
+          <td>[% HTML.escape(proposed_invoice.customer.name) %][% HTML.escape(proposed_invoice.vendor.name) %]</td>
+          <td>[% L.input_tag("sources." _ proposal.id _ "[]", "", size=20) %]</td>
+          <td>[% L.input_tag("memos." _ proposal.id _ "[]", "", size=20) %]</td>
+        </tr>
+      [% END %]
+
+        <tr><td style="height:10px" colspan="10"></td></tr>
+      </tbody>
+    [% END %]
+  [% END %]
+</table>
+
+</div><!-- .horizontal-scroll-wrapper -->
+
+<div class="buttons">
+ [% L.submit_tag('action_save_proposals', LxERP.t8('Save proposals')) %]
+ [% L.button_tag('kivi.BankTransaction.show_set_all_sources_memos_dialog("#list_automatic_form [name^=\\"sources.\\"]", "#list_automatic_form [name^=\\"memos.\\"]")', LxERP.t8('Set all source and memo fields'), class='neutral') %]
+</div>
+
+</form>
diff --git a/templates/design40_webpages/bp/list_spool.html b/templates/design40_webpages/bp/list_spool.html
new file mode 100644
index 000000000..70db6cfca
--- /dev/null
+++ b/templates/design40_webpages/bp/list_spool.html
@@ -0,0 +1,83 @@
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE url %]
+[% SET list_spool__callback = href _ '&sort=' _ sort %]
+
+<h1>[% title | html %]</h1>
+
+<form method="post" action="bp.pl" id="form">
+
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <tr>
+    <th>[% LxERP.t8("Printer") %]</th>
+    <td>[% L.select_tag('printer', ALL_PRINTERS, title_key = 'printer_description') %]</td>
+  </tr>
+  <tr>
+    <th>[% 'Options' | $T8 %]</th>
+    <td>[% FOREACH option IN options %][% option %][% ', ' UNLESS loop.last %][% END %]</td>
+  </tr>
+</table>
+</div>
+
+<div class="wrapper">
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% L.checkbox_tag('checkall_box', checkall='input.check_all') %]</td>
+      <th>[% L.link(href _ '&sort=transdate', LxERP.t8('Date')) %]</td>
+    [% IF is_invoice %]
+      <th>[% L.link(href _ '&sort=invoice', LxERP.t8('Invoice')) %]</td>
+    [% END %]
+    [% IF is_order %]
+      <th>[% L.link(href _ '&sort=ordnumber', LxERP.t8('Order')) %]</td>
+    [% END %]
+    [% IF is_quotation %]
+      <th>[% L.link(href _ '&sort=quonumber', LxERP.t8('Quotation')) %]</td>
+    [% END %]
+      <th>[% L.link(href _ '&sort=name', vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor')) %]</td>
+      <th>[% 'Spoolfile' | $T8 %]</td>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = SPOOL %]
+      <tr>
+        <td>[% SET list_spool__checked='checked_' _ loop.count; L.checkbox_tag(list_spool__checked, checked=$list_spool__checked, class='check_all') IF row.new_file %]</td>
+        <td>[% row.transdate %]</td>
+      [% IF is_invoice %]
+        <td>[% L.link(url(row.module _ '.pl', action='edit' ,type=type, callback=list_spool__callback, id=row.id), row.invnumber) %]</td>
+      [% END %]
+      [% IF is_order %]
+        <td>[% L.link(url(row.module _ '.pl', action='edit' ,type=type, callback=list_spool__callback, id=row.id), row.ordnumber) %]</td>
+      [% END %]
+      [% IF is_quotation %]
+        <td>[% L.link(url(row.module _ '.pl', action='edit' ,type=type, callback=list_spool__callback, id=row.id), row.quonumber) %]</td>
+      [% END %]
+        <td>[% row.name | html %]</td>
+        <td>[% L.link(LXCONFIG.paths.spool _ '/' _ row.spoolfile, row.spoolfile) %][% L.hidden_tag('spoolfile_' _ loop.count, row.spoolfile) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+[% L.hidden_tag('rowcount', SPOOL.size) %]
+
+[% L.hidden_tag('callback', callback) %]
+[% L.hidden_tag('title', title) %]
+[% L.hidden_tag('vc', vc) %]
+[% L.hidden_tag('type', type) %]
+[% L.hidden_tag('sort', sort) %]
+[% L.hidden_tag('account', account) %]
+
+[% L.hidden_tag('transdateto', transdateto) %]
+[% L.hidden_tag('transdatefrom', transdatefrom) %]
+[% L.hidden_tag('invnumber', invnumber) %]
+[% L.hidden_tag('ordnumber', ordnumber) %]
+[% L.hidden_tag('quonumber', quonumber) %]
+[% L.hidden_tag('customer', customer) %]
+[% L.hidden_tag('vendor', vendor) %]
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/bp/search.html b/templates/design40_webpages/bp/search.html
new file mode 100644
index 000000000..9b9470d31
--- /dev/null
+++ b/templates/design40_webpages/bp/search.html
@@ -0,0 +1,68 @@
+[% USE L %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<h1>[% 'Print' | $T8 %] [% label.$type.title %]</h1>
+
+<form method="post" action="bp.pl" id="form">
+
+[% L.hidden_tag('title', LxERP.t8('Print') _ ' ' _ label.$type.title) %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-small"><col class="wi-verywide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% L.input_tag(vc, '', class='wi-normal') %]</td>
+    </tr>
+    [% IF show_accounts %]
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <td>[% L.select_tag('account', accounts, value_title_sub=\account_sub, class='wi-verywide') %]</td>
+    </tr>
+    [% END %]
+    [% IF label.$type.invnumber %]
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td>[% L.input_tag('invnumber', '', class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    [% IF label.$type.ordnumber %]
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('ordnumber', '', class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    [% IF label.$type.quonumber %]
+    <tr>
+      <th>[% 'Quotation Number' | $T8 %]</th>
+      <td>[% L.input_tag('quonumber', '', class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    [% IF label.$type.donumber %]
+    <tr>
+      <th>[% 'Delivery Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('donumber', '', class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    [% IF label.$type.chknumber %]
+    <tr>
+      <th>[% 'Reference' | $T8 %]</th>
+      <td>[% L.input_tag('chknumber', '', class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Date' | $T8 %] [% 'from' | $T8 %] </th>
+      <td class="wi-date">[% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('transdateto') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+[% L.hidden_tag('sort', 'transdate') %]
+[% L.hidden_tag('vc', vc) %]
+[% L.hidden_tag('type', type) %]
+</div>
+</form>
diff --git a/templates/design40_webpages/buchungsgruppen/form.html b/templates/design40_webpages/buchungsgruppen/form.html
new file mode 100644
index 000000000..bad2abee8
--- /dev/null
+++ b/templates/design40_webpages/buchungsgruppen/form.html
@@ -0,0 +1,63 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% USE P %]
+
+[% SET style="width: 400px" %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form action="controller.pl" method="post" id="form">
+[% L.hidden_tag("id", SELF.config.id) %]
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <tbody>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag("config.description", SELF.config.description, "data-validate"="required", "data-title"=LxERP.t8("Description")) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Inventory Account' | $T8 %]</th>
+      [% IF NOT SELF.config.id %]
+        <td>[% P.chart.picker("config.inventory_accno_id", SELF.defaults.inventory_accno_id, choose=1, type='IC', style=style) %]</td>
+      [% ELSIF SELF.config.id AND SELF.config.orphaned %]
+        <td>[% P.chart.picker("config.inventory_accno_id", SELF.config.inventory_accno_id, choose=1, type='IC', style=style) %]</td>
+      [% ELSE %]
+        <td>[% CHARTLIST.inventory_accno_description %]</td>
+      [% END %]
+    </tr>
+    [% FOREACH tz = TAXZONES %]
+      <tr>
+        <th>[% 'Revenue' | $T8 %]</th><th>[% HTML.escape(tz.description) %]</th>
+        [% IF NOT SELF.config.id %]
+          <td>[% P.chart.picker('income_accno_id_' _ tz.id, SELF.defaults.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %]</td>
+        [% ELSIF SELF.config.id AND SELF.config.orphaned %]
+          <td>[% P.chart.picker('income_accno_id_' _ tz.id, CHARTLIST.${tz.id}.income_accno_id, choose=1, type='IC_income,IC_sale', style=style) %]</td>
+        [% ELSE %]
+          <td>[% CHARTLIST.${tz.id}.income_accno_description %]</td>
+        [% END %]
+      </tr>
+      <tr>
+        <th>[% 'Expense' | $T8 %]</th><th>[% HTML.escape(tz.description) %]</th>
+        [% IF NOT SELF.config.id %]
+          <td>[% P.chart.picker('expense_accno_id_' _ tz.id, SELF.defaults.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %]</td>
+        [% ELSIF SELF.config.id AND SELF.config.orphaned %]
+          <td>[% P.chart.picker('expense_accno_id_' _ tz.id, CHARTLIST.${tz.id}.expense_accno_id, choose=1, type='IC_expense,IC_cogs', style=style) %]</td>
+        [% ELSE %]
+          <td>[% CHARTLIST.${tz.id}.expense_accno_description %]</td>
+        [% END %]
+      </tr>
+    [% END %]
+      <tr>
+        <th>[% 'Obsolete' | $T8 %]</td>
+        <td>[% L.checkbox_tag('config.obsolete', checked=SELF.config.obsolete, for_submit=1) %]</td>
+      </tr>
+    <tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/buchungsgruppen/list.html b/templates/design40_webpages/buchungsgruppen/list.html
new file mode 100644
index 000000000..e05e55ccc
--- /dev/null
+++ b/templates/design40_webpages/buchungsgruppen/list.html
@@ -0,0 +1,38 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+
+<table id="buchungsgruppen_list" class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+      <th><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Inventory Account' | $T8 %]</th>
+    [% FOREACH tz = TAXZONES %]
+      <th>[% 'Revenue' | $T8 %] [% HTML.escape(tz.description) %]</th>
+      <th>[% 'Expense' | $T8 %] [% HTML.escape(tz.description) %]</th>
+    [% END %]
+      <th>[% 'Obsolete' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH bg = BUCHUNGSGRUPPEN %]
+    <tr id="bg_id_[% bg.id %]">
+      <td class="center dragdrop"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></td>
+      <td class="nowrap"><a href="[% SELF.url_for(action='edit', id=bg.id) %]">[% HTML.escape(bg.description) %]</a></td>
+      <td>[% HTML.escape(CHARTLIST.${bg.id}.inventory_accno) %]</td>
+    [% FOREACH tz = TAXZONES %]
+      <td>[% HTML.escape(CHARTLIST.${bg.id}.${tz.id}.income_accno) %]</td>
+      <td>[% HTML.escape(CHARTLIST.${bg.id}.${tz.id}.expense_accno) %]</td>
+    [% END %]
+      <td>[% IF bg.obsolete %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
+    </tr>
+  [% END %]
+  </tbody>
+</table>
+
+[% L.sortable_element('#buchungsgruppen_list tbody', url=SELF.url_for(action='reorder'), with='bg_id') %]
diff --git a/templates/design40_webpages/ca/list.html b/templates/design40_webpages/ca/list.html
new file mode 100644
index 000000000..293764a86
--- /dev/null
+++ b/templates/design40_webpages/ca/list.html
@@ -0,0 +1,102 @@
+[% USE L %]
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<h1>[% title | html %]</h1>
+
+<form method=post action="[% script | html %]">
+
+
+<div class="wrapper">
+[% L.hidden_tag('accno', accno) %]
+[% L.hidden_tag('description', description) %]
+[% L.hidden_tag('sort', 'transdate') %]
+[% L.hidden_tag('accounttype', accounttype) %]
+
+<table class="tbl-horizontal">
+  <colgroup> <col style="width:1.4em;"><col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <caption>[% 'Periods' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th colspan="3">
+        <h4>
+          [% L.radio_button_tag('reporttype', value='custom', id='reporttype_custom') %]
+          <label for="reporttype_custom">[% LxERP.t8('Customized Report') %]</label>
+        </h4>
+      </th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Year' | $T8 %]</th>
+      <td><input type="text" name=year class="wi-smallest" title="[% 'YYYY' | $T8 %]" value="[% year %]"></td>
+    </tr>
+     <tr>
+      <th></th>
+      <th colspan="2"><h4>[% 'Periods' | $T8 %]</h4></th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Yearly' | $T8 %]</th>
+      <td>[% L.radio_button_tag('duetyp', value=13, label=LxERP.t8('Yearly')) %]</td>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Quarterly' | $T8 %]</th>
+     <td>
+        [% L.radio_button_tag('duetyp', value='A', label='1. ' _ LxERP.t8('Quarter')) %]<br>
+        [% L.radio_button_tag('duetyp', value='B', label='2. ' _ LxERP.t8('Quarter')) %]<br>
+        [% L.radio_button_tag('duetyp', value='C', label='3. ' _ LxERP.t8('Quarter')) %]<br>
+        [% L.radio_button_tag('duetyp', value='D', label='4. ' _ LxERP.t8('Quarter')) %]
+      </td>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Monthly' | $T8 %]</th>
+      <td>
+        [% L.radio_button_tag('duetyp', value='1', label=LxERP.t8('January')) %]<br>
+        [% L.radio_button_tag('duetyp', value='5', label=LxERP.t8('May')) %]<br>
+        [% L.radio_button_tag('duetyp', value='9', label=LxERP.t8('September')) %]<br>
+        [% L.radio_button_tag('duetyp', value='2', label=LxERP.t8('February')) %]<br>
+        [% L.radio_button_tag('duetyp', value='6', label=LxERP.t8('June')) %]<br>
+        [% L.radio_button_tag('duetyp', value='10', label=LxERP.t8('October')) %]<br>
+        [% L.radio_button_tag('duetyp', value='3', label=LxERP.t8('March')) %]<br>
+        [% L.radio_button_tag('duetyp', value='7', label=LxERP.t8('July')) %]<br>
+        [% L.radio_button_tag('duetyp', value='11', label=LxERP.t8('November')) %]<br>
+        [% L.radio_button_tag('duetyp', value='4', label=LxERP.t8('April')) %]<br>
+        [% L.radio_button_tag('duetyp', value='8', label=LxERP.t8('August')) %]<br>
+        [% L.radio_button_tag('duetyp', value='12', label=LxERP.t8('December')) %]
+      </td>
+    </tr>
+    <tr>
+      <th colspan="3">
+        <h4>[% L.radio_button_tag('reporttype', value='free',id='reporttype_free') %]
+        <label for="reporttype_free">[% LxERP.t8('Free report period') %]</label></h4>
+      </th>
+    </tr>
+    <tr>
+      <th></th>
+      <td colspan="2">
+        [% 'From' | $T8 %] [% L.date_tag('fromdate') %]
+        [% 'Bis' | $T8  %] [% L.date_tag('todate')   %]
+      </td>
+    </tr>
+    <tr>
+      <th colspan="3" class="caption">[% 'Miscellaneous' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Decimalplaces' | $T8 %]</th>
+      <td><input type="text" name=decimalplaces size=3 value="2"></td>
+    </tr>
+    <tr>
+      <th colspan="2">[% LxERP.t8('Subtotal') %] </th>
+      <td>[% L.checkbox_tag('subtotal', label=LxERP.t8('Yes')) %]</td>
+    </tr>
+
+</tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="buttons">[% L.submit_tag('action', LxERP.t8('List Transactions')) %]</div>
+
+</form>
diff --git a/templates/design40_webpages/chart/_chart_picker_result.html b/templates/design40_webpages/chart/_chart_picker_result.html
new file mode 100644
index 000000000..7c24d8bf1
--- /dev/null
+++ b/templates/design40_webpages/chart/_chart_picker_result.html
@@ -0,0 +1,25 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% FOREACH chart = SELF.charts %]
+  <div class='chart_picker_chart [% FORM.hide_chart_details ? 'cpc_line' : 'cpc_block' %]'>
+    <input type='hidden' class='chart_picker_id' value='[% chart.id %]'>
+    <input type='hidden' class='chart_picker_description' value='[% chart.displayable_name %]'>
+    <span class='cpc_block_number'>[% chart.accno | html %]</span>
+    <span class='cpc_block_description'>[% chart.description | html %]</span>
+    [% UNLESS FORM.hide_chart_details %]
+      <span class='cpc_block_balance'>[% chart.formatted_balance_dc | html %]</span>
+      <div style='clear:both;'></div>
+      <span class='cpc_block_second_row'>[% LxERP.t8("Chart Type") %]: [% chart.displayable_category %] &nbsp;&nbsp;&nbsp; [% IF chart.has_transaction %][% LxERP.t8("Last transaction")%]: [% chart.date_of_last_transaction.to_kivitendo %][% END %]</span>
+    [% END %]
+  </div>
+[% END %]
+
+<div style='clear:both'></div>
+
+[% L.paginate_controls(target='#chart_picker_result', selector='#chart_picker_result', models=SELF.models) %]
+<script type='text/javascript'>
+  kivi.ChartPicker($('#'+$('#chart_picker_real_id').val())).init_results()
+</script>
\ No newline at end of file
diff --git a/templates/design40_webpages/chart/chart_picker_search.html b/templates/design40_webpages/chart/chart_picker_search.html
new file mode 100644
index 000000000..a562da54b
--- /dev/null
+++ b/templates/design40_webpages/chart/chart_picker_search.html
@@ -0,0 +1,58 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE T8 %]
+
+<div style='overflow:hidden'>
+
+[% LxERP.t8("Filter") %]: [% L.input_tag('chart_picker_filter', SELF.filter.all_substr_multi__ilike, class='chart_picker_filter wi-verywide') %]
+[% L.hidden_tag('chart_picker_real_id', FORM.real_id) %] <a href="javascript:void(0);" onclick="$('#chart_picker_filter').val('').focus();cp.update_results();">x</a>
+
+<div style="padding: 5px 0em 5px 0em">
+  <span>
+    [% L.checkbox_tag('booked', checked=FORM.booked, for_submit=1, label=LxERP.t8('Only booked accounts')) %]
+  </span>
+  <br />
+  <span class='float-right'>
+    [% L.checkbox_tag('hide_chart_details', checked=1, id='hide_chart_details', for_submit=1, label=LxERP.t8('Hide chart details')) %]
+  </span>
+</div>
+
+<div id="category">
+  [% LxERP.t8("Account Type") %]:
+  <br />
+  [% IF FORM.filter.category %]
+    [% FOREACH var IN FORM.filter.category %]
+      [% IF var == 'A' %][% L.checkbox_tag('SELF.filter.selected_category_A', checked=1, value ='A', label=LxERP.t8('Assets')) %]<br />[% END %]
+      [% IF var == 'L' %][% L.checkbox_tag('SELF.filter.selected_category_L', checked=1, value ='L', label=LxERP.t8('Liability')) %]<br />[% END %]
+      [% IF var == 'Q' %][% L.checkbox_tag('SELF.filter.selected_category_Q', checked=1, value ='Q', label=LxERP.t8('Equity')) %]<br />[% END %]
+      [% IF var == 'I' %][% L.checkbox_tag('SELF.filter.selected_category_I', checked=1, value ='I', label=LxERP.t8('Revenue')) %]<br />[% END %]
+      [% IF var == 'E' %][% L.checkbox_tag('SELF.filter.selected_category_E', checked=1, value ='E', label=LxERP.t8('Expense')) %]<br />[% END %]
+    [% END %]
+  [% ELSE %]
+    [% L.checkbox_tag('SELF.filter.selected_category_A', checked=0, value ='A', label=LxERP.t8('Assets')) %]<br />
+    [% L.checkbox_tag('SELF.filter.selected_category_L', checked=0, value ='L', label=LxERP.t8('Liability')) %]<br />
+    [% L.checkbox_tag('SELF.filter.selected_category_Q', checked=0, value ='Q', label=LxERP.t8('Equity')) %]<br />
+    [% L.checkbox_tag('SELF.filter.selected_category_I', checked=0, value ='I', label=LxERP.t8('Revenue')) %]<br />
+    [% L.checkbox_tag('SELF.filter.selected_category_E', checked=0, value ='E', label=LxERP.t8('Expense')) %]
+  [% END %]
+</div>
+
+<div style='clear:both'></div>
+<div id='chart_picker_result'></div>
+</div>
+
+<script type='text/javascript'>
+  var cp = kivi.ChartPicker($('#[% FORM.real_id %]'));
+  $(function(){
+    $('#chart_picker_filter').focus();
+    // empty input field upon opening if we just want to pick a field
+    [% IF FORM.choose %] $('#chart_picker_filter').val(''); [% END %]
+
+    cp.update_results();  // function from js/autocomplete_chart_js
+  });
+  $('#chart_picker_filter').keyup(cp.result_timer);
+  // use keyup instead of keypress to get backspace to work
+  // this messes up numblock though!
+  $("input[type='checkbox']").change(cp.update_results);
+</script>
diff --git a/templates/design40_webpages/chart/report_configuration_overview.html b/templates/design40_webpages/chart/report_configuration_overview.html
new file mode 100644
index 000000000..9c7388ef0
--- /dev/null
+++ b/templates/design40_webpages/chart/report_configuration_overview.html
@@ -0,0 +1,47 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h1>[% LxERP.t8("Chart configuration overview regarding reports") %]</h1>
+
+<div class="wrapper">
+
+[% FOREACH data = DATA %]
+
+  [% UNLESS data.size == 1 %]
+    <div id="[% HTML.escape(data.type) %]" style="clear:left;float:none;" class="select-item control-panel">
+     [% LxERP.t8("Jump to") %]:
+     [% FOREACH jump = DATA %]
+       [% IF jump.type != data.type %] [% L.link("#" _ jump.type, jump.heading) %][% END %]
+     [% END %]
+    </div>
+  [% END %]
+
+ <h2 style="clear:left;">[% HTML.escape(data.heading) %]</h2>
+
+  [% FOREACH pos = data.positions %]
+    [% SET name = data.names.item(pos) %]
+    [% SET charts = data.charts.$pos %]
+    <table class="tbl-plain" style="clear:left;float:none;">
+      <caption>[% IF name %][% LxERP.t8("Position #1: #2", pos, name) %][% ELSE %][% LxERP.t8("Position #1", pos) %][% END %]</caption>
+      <colgroup><col class="wi-verysmall"><col class="wi-lightwide"></colgroup>
+        <thead>
+          <tr>
+            <th>[% LxERP.t8("Account") %]</th>
+            <th>[% LxERP.t8("Description") %]</th>
+          </tr>
+        </thead>
+     <tbody>
+    [% FOREACH chart = charts %]
+      <tr>
+       <td>[% L.link("am.pl?action=edit_account&id=" _ chart.id, chart.accno) %]</td>
+       <td>[% HTML.escape(chart.description) %]</td>
+      </tr>
+      [% END %]
+     </tbody>
+    </table>
+  [% END %]
+
+[% END %]
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/chart/test_page.html b/templates/design40_webpages/chart/test_page.html
new file mode 100644
index 000000000..3b1bd8f59
--- /dev/null
+++ b/templates/design40_webpages/chart/test_page.html
@@ -0,0 +1,65 @@
+[% USE L %]
+[% USE P %]
+[% SET style="width: 400px" %]
+
+<h1>Chart Picker Testpage</h1>
+
+<div class="wrapper">
+
+  <div class="wrapper wi-verywide">
+    All charts: [% P.chart.picker('chart_id', '', style=style) %]text after icon<br>
+    Only booked charts: [% P.chart.picker('chart_id_booked', '', booked=1, style=style) %]<br>
+    All charts choose: [% P.chart.picker('chart_id_choose', '', choose=1, style=style) %]<br>
+  </div>
+
+  <div class="wrapper wi-verywide">
+    Filter by link:<br>
+    AR_paid: [% P.chart.picker('chart_id_ar_paid', undef, type='AR_paid', category='I,A' style=style) %]<br>
+    AR: [% P.chart.picker('chart_id_ar', undef, type='AR', style=style) %]<br>
+    AP: [% P.chart.picker('chart_id_ap', undef, type='AP', style=style) %]<br>
+    AR or AP: [% P.chart.picker('chart_id_arap', undef, type='AR,AP', style=style) %]<br>
+    IC_income,IC_sale: [% P.chart.picker('chart_id_icis', undef, type='IC_income,IC_sale', style=style) %]<br>
+    IC_expense,IC_cogs: [% P.chart.picker('chart_id_icco', undef, type='IC_expense,IC_cogs', style=style) %]<br>
+    IC: [% P.chart.picker('chart_id_ic', undef, type='IC', style=style) %]<br>
+  </div>
+
+  <div class="wrapper wi-verywide">
+    Filter by category:<br>
+    I: [% P.chart.picker('chart_id_i', undef, category='I', style=style) %]<br>
+    IE: [% P.chart.picker('chart_id_ie', undef, category='I,E', style=style) %]<br>
+    AQL: [% P.chart.picker('chart_id_aql', undef, category='A,Q,L', style=style) %]<br>
+  </div>
+
+  <div class="wrapper wi-verywide">
+    Filter by special type:<br>
+    GuV: [% P.chart.picker('chart_id_guv', undef, type='guv', style=style) %]<br>
+  </div>
+
+  <div class="wrapper wi-verywide">
+    bank (fat): [% P.chart.picker('bank_id', '', type='bank', fat_set_item=1, choose=1, style=style) %]
+  </div>
+  <div id="banktext"></div>
+
+  <div class="wrapper wi-verywide">
+    [% FOREACH i IN [ 1 2 3 4 5 6 ] %]
+      S [% i %]: [% P.chart.picker('credit_' _ i) %] - &nbsp;&nbsp;  H [% i %]: [% P.chart.picker('debit' _ i) %] <br>
+    [% END %]
+  </div>
+
+  <div class="wrapper wi-verywide">
+    Pre-filled chart object: [% P.chart.picker('pre_filled_chart_object', pre_filled_chart, style=style) %]<br>
+    Pre-filled chart ID: [% P.chart.picker('pre_filled_chart_id', pre_filled_chart.id, style=style) %]<br>
+  </div>
+
+</div>
+
+<script type='text/javascript'>
+  $(function(){
+      // do something when a chartpicker with fat_set_item and a certain id changes
+      $('#bank_id').on('set_item:ChartPicker', function (e, item) {
+        console.log(item)
+        $('#banktext').html('Selected fat item with category ' + item.category);
+      })
+  });
+
+</script>
\ No newline at end of file
diff --git a/templates/design40_webpages/client_config/_attachments.html b/templates/design40_webpages/client_config/_attachments.html
new file mode 100644
index 000000000..7cee0c4cf
--- /dev/null
+++ b/templates/design40_webpages/client_config/_attachments.html
@@ -0,0 +1,27 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="attachments">
+<div class="wrapper">
+
+[% SET file_type = 'attachment' %]
+[% INCLUDE 'file/rename_dialog.html' %]
+
+<h3>[% LxERP.t8("for Document types") %]</h3>
+</div><!-- /.wrapper -->
+<div class="tabwidget">
+
+<ul>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=sales_quotation&object_id=0&is_global=1">[% LxERP.t8("Sales Quotations") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=sales_order&object_id=0&is_global=1">[% LxERP.t8("Sales Orders") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=sales_delivery_order&object_id=0&is_global=1">[% LxERP.t8("Sales Delivery Orders") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=0&is_global=1">[% LxERP.t8("Invoices") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=request_quotation&object_id=0&is_global=1">[% LxERP.t8("Request Quotations") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_order&object_id=0&is_global=1">[% LxERP.t8("Purchase Orders") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_delivery_order&object_id=0&is_global=1">[% LxERP.t8("Purchase Delivery Orders") %]</a></li>
+  <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_invoice&object_id=0&is_global=1">[% LxERP.t8("Purchase Invoices") %]</a></li>
+</ul>
+
+</div><!-- /.tabwidget -->
+
+</div>
diff --git a/templates/design40_webpages/client_config/_bank.html b/templates/design40_webpages/client_config/_bank.html
new file mode 100644
index 000000000..b91bf8ef0
--- /dev/null
+++ b/templates/design40_webpages/client_config/_bank.html
@@ -0,0 +1,28 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<div id="bank">
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <caption>[% 'SEPA' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('SEPA-XML File extension') %]</th>
+        <td>[% L.yes_no_tag('defaults.sepa_export_xml', SELF.defaults.sepa_export_xml) %]</td>
+        <td class="longdesc">[% LxERP.t8('If enabled the file ending for SEPA exports will be .xml instead of .cct or .cdd') %]</td>
+      </tr>
+    [% 'Bank' | $T8 %]
+      <tr>
+        <th>[% LxERP.t8('Ignore Proposals for Bank Transactions') %]</th>
+        <td>[% L.yes_no_tag('defaults.no_bank_proposals', SELF.defaults.no_bank_proposals) %]</td>
+        <td class="longdesc">
+          [% LxERP.t8('If enabled the tab Proposals will not be the default view for bank transaction bookings') %]<br>
+          [% LxERP.t8('This is helpful if you prefer a chronologic order of bank transactions, i.e. the tab all transactions meanwhile you are still able to use the quick add link for the suggested proposals') %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.wrapper -->
+</div><!-- /#bank -->
diff --git a/templates/design40_webpages/client_config/_datev_check_configuration.html b/templates/design40_webpages/client_config/_datev_check_configuration.html
new file mode 100644
index 000000000..6559c2760
--- /dev/null
+++ b/templates/design40_webpages/client_config/_datev_check_configuration.html
@@ -0,0 +1,47 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="datev_check_configuration">
+<div class="wrapper">
+
+<p>[% LxERP.t8('It is possible to make a quick DATEV export everytime you post a record to ensure things work nicely with their data requirements. This will result in a slight overhead though you can enable this for each type of record independently.') %]</p>
+
+
+
+<table class="tbl-horizontal">
+  <tbody>
+  <tr>
+    <th>[% LxERP.t8('Check on sales invoice') %]</th>
+    <td>[% L.yes_no_tag('defaults.datev_check_on_sales_invoice', SELF.defaults.datev_check_on_sales_invoice) %]</td>
+    <td class="longdesc">[% LxERP.t8('Perform check when a sales invoice or a payment for a sales invoice is posted?') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Check on purchase invoice') %]</th>
+    <td>[% L.yes_no_tag('defaults.datev_check_on_purchase_invoice', SELF.defaults.datev_check_on_purchase_invoice) %]</td>
+    <td class="longdesc">[% LxERP.t8('Perform check when a purchase invoice or a payment for a purchase invoice is posted?') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Check on ar transaction') %]</th>
+    <td>[% L.yes_no_tag('defaults.datev_check_on_ar_transaction', SELF.defaults.datev_check_on_ar_transaction) %]</td>
+    <td class="longdesc">[% LxERP.t8('Perform check when an ar transaction is posted?') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Check on ap transaction') %]</th>
+    <td>[% L.yes_no_tag('defaults.datev_check_on_ap_transaction', SELF.defaults.datev_check_on_ap_transaction) %]</td>
+    <td class="longdesc">[% LxERP.t8('Perform check when an ap transaction is posted?') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Check on gl transaction') %]</th>
+    <td>[% L.yes_no_tag('defaults.datev_check_on_gl_transaction', SELF.defaults.datev_check_on_gl_transaction) %]</td>
+    <td class="longdesc">[% LxERP.t8('Perform check when a gl transaction is posted?') %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Datev export encoding') %]</th>
+    <td>[% L.select_tag('defaults.datev_export_format', [ [ 'cp1252', LxERP.t8('Strict and halt') ],[ 'cp1252-translit', LxERP.t8('Strict but replace') ],[ 'utf-8', LxERP.t8('Relaxed (UTF-8)') ]  ], default=SELF.defaults.datev_export_format) %]</td>
+    <td class="longdesc">[% LxERP.t8('DATEV expects the encoding to be Western Europe conform (LATIN-1, cp1252). By setting this to "Strict and halt" the DATEV export halts with a error if there is a single character in "Posting Text" which is not LATIN-1 encodeable. By setting this to "Strict but replace" kivitendo will replace the character with a similar one and the export will simply warn about those fields. By setting this to relaxed (UTF-8) the DATEV export encoding will be in kivitendo (UTF-8) encoded and the external import program has to handle this (this may work for DATEV deriviates or future versions of DATEV). Background details: For example turkish characters (Ç) are not valid cp1252 charactes and armenian characters like "Գեղարդ" are probably not replaceable in cp1252') %]</td>
+  </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</div><!-- /#datev_check_configuration.wrapper -->
diff --git a/templates/design40_webpages/client_config/_default_accounts.html b/templates/design40_webpages/client_config/_default_accounts.html
new file mode 100644
index 000000000..7c0a66d96
--- /dev/null
+++ b/templates/design40_webpages/client_config/_default_accounts.html
@@ -0,0 +1,103 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% SET style="width: 500px" %]
+
+[%# L.dump( SELF.defaults ) %]
+
+<div id="default_accounts">
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Default Accounts") %]</caption>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Inventory Account") %]</th>
+      <td>[% P.chart.picker('defaults.inventory_accno_id', SELF.defaults.inventory_accno_id, type='IC', choose=1, style=style) %] </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Revenue Account") %]</th>
+      <td>[% P.chart.picker('defaults.income_accno_id', SELF.defaults.income_accno_id, type='IC_income,IC_sale', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Expense Account") %]</th>
+      <td>[% P.chart.picker('defaults.expense_accno_id', SELF.defaults.expense_accno_id, type='IC_expense,IC_cogs', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Foreign Exchange Gain") %]</th>
+      <td>[% P.chart.picker('defaults.fxgain_accno_id', SELF.defaults.fxgain_accno_id, category='I,A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Foreign Exchange Loss") %]</th>
+      <td>[% P.chart.picker('defaults.fxloss_accno_id', SELF.defaults.fxloss_accno_id, category='E,A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Rounding Gain") %]</th>
+      <td>[% P.chart.picker('defaults.rndgain_accno_id', SELF.defaults.rndgain_accno_id, category='I,A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Rounding Loss") %]</th>
+      <td>[% P.chart.picker('defaults.rndloss_accno_id', SELF.defaults.rndloss_accno_id, category='E,A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Current assets account") %]</th>
+      <td>[% P.chart.picker('defaults.ar_paid_accno_id', SELF.defaults.ar_paid_accno_id, type='AR_paid', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Payable account") %]</th>
+      <td>[% P.chart.picker('defaults.ap_chart_id', SELF.defaults.ap_chart_id, type='AP', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Receivable account") %]</th>
+      <td>[% P.chart.picker('defaults.ar_chart_id', SELF.defaults.ar_chart_id, type='AR', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Clearing account for advance payments") %]</th>
+      <td>[% P.chart.picker('defaults.advance_payment_clearing_chart_id', SELF.defaults.advance_payment_clearing_chart_id, choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Account for workflow from purchase order to ap transaction") %]</th>
+      <td>[% P.chart.picker('defaults.workflow_po_ap_chart_id', SELF.defaults.workflow_po_ap_chart_id, type='AP_amount', choose=1, style=style) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Year-end closing") %]</caption>
+  <tbody>
+    [% IF SELF.defaults.yearend_method == 'simple' %] [% THEN %]
+    <tr>
+      <th>[% LxERP.t8("Year-end closing account") %]</th>
+      <td>[% P.chart.picker('defaults.carry_over_account_chart_id', SELF.defaults.carry_over_account_chart_id, choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Profit or loss carried forward account") %]</th>
+      <td>[% P.chart.picker('defaults.profit_carried_forward_chart_id', SELF.defaults.profit_carried_forward_chart_id, choose=1, style=style) %]</td>
+    </tr>
+    [% ELSE %]
+    <tr>
+      <th>[% LxERP.t8("Carry over account for year-end closing") %]</th>
+      <td>[% P.chart.picker('defaults.carry_over_account_chart_id', SELF.defaults.carry_over_account_chart_id, category='A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Profit carried forward account") %]</th>
+      <td>[% P.chart.picker('defaults.profit_carried_forward_chart_id', SELF.defaults.profit_carried_forward_chart_id, category='A', choose=1, style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Loss carried forward account") %]</th>
+      <td>[% P.chart.picker('defaults.loss_carried_forward_chart_id', SELF.defaults.loss_carried_forward_chart_id, category='A', choose=1, style=style) %]</td>
+    </tr>
+    [% END %]
+    <tr>
+   <th>[% LxERP.t8("Transit Items account") %]</th>
+   <td>[% P.chart.picker('defaults.transit_items_chart_id', SELF.defaults.transit_items_chart_id , category='A', choose=1, style=style) %]<td>
+  </tr>
+
+
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</div><!-- /#default_accounts-->
diff --git a/templates/design40_webpages/client_config/_features.html b/templates/design40_webpages/client_config/_features.html
new file mode 100644
index 000000000..70a87f106
--- /dev/null
+++ b/templates/design40_webpages/client_config/_features.html
@@ -0,0 +1,615 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+<div id="features">
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal expanded" style="margin-right:4.0em;">
+    <caption>[% LxERP.t8("DATEV & UStVA") %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-small"><col class="wi-mediumsmall"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('Datevautomatik') %]</th>
+        <td>[% L.yes_no_tag('defaults.feature_datev', SELF.defaults.feature_datev) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use Datevautomatik') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('UStVA') %]</th>
+        <td>[% L.yes_no_tag('defaults.feature_ustva', SELF.defaults.feature_ustva) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use UStVA') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("File Management") %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('WebDAV') %]</th>
+        <td>[% L.yes_no_tag('defaults.webdav', SELF.defaults.webdav) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use WebDAV Repository') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('WebDAV save documents') %]</th>
+        <td>[% L.yes_no_tag('defaults.webdav_documents', SELF.defaults.webdav_documents) %]</td>
+        <td class="long-desc">[% LxERP.t8('Save document in WebDAV repository') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('WebDAV sync extern') %]</td>
+        <td>[% L.yes_no_tag('defaults.webdav_sync_extern', SELF.defaults.webdav_sync_extern) %]</td>
+        <td class="long-desc">[% LxERP.t8('Synchronize WebDAV with owncloud repository') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Destination URL for sync') %]</td>
+        <td>[% L.input_tag('defaults.webdav_sync_extern_url', SELF.defaults.webdav_sync_extern_url, style=style) %]</td>
+        <td class="long-desc">[% LxERP.t8('Complete URL for WebDAV sync external, including port and folders, i.e.: https://foo.com:4433/owncloud/kivitendo') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Login for sync') %]</td>
+        <td>[% L.input_tag('defaults.webdav_sync_extern_login', SELF.defaults.webdav_sync_extern_login, style=style) %]</td>
+        <td class="long-desc">[% LxERP.t8('Login for WebDAV sync external') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Password for sync') %]</td>
+        <td>[% L.input_tag('defaults.webdav_sync_extern_pass', SELF.defaults.webdav_sync_extern_pass, style=style) %]</td>
+        <td class="long-desc">[% LxERP.t8('Password for WebDAV sync external') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Filemanagement') %]</th>
+        <td>[% L.yes_no_tag('defaults.doc_storage', SELF.defaults.doc_storage) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use Filemanagement') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Storage Type for generated/imported PDF Documents') %]</th>
+        <td>[% L.select_tag('defaults.doc_storage_for_documents', [ [ 'None', LxERP.t8('None') ],[ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_documents, onchange="return checkavailable_filebackend(this);") %]</td>
+        <td class="long-desc">[% LxERP.t8('Use this storage backend for all generated PDF-Files') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Storage Type for Attachments') %]</th>
+        <td>[% L.select_tag('defaults.doc_storage_for_attachments', [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_attachments, onchange="return checkavailable_filebackend(this);") %]</td>
+        <td class="long-desc">[% LxERP.t8('Use this storage backend for all uploaded attachments') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Storage Type for images') %]</th>
+        <td>[% L.select_tag('defaults.doc_storage_for_images', [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_images, onchange="return checkavailable_filebackend(this);") %]</td>
+        <td class="long-desc">[% LxERP.t8('Use this storage backend for uploaded images') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Storage Type for shopimages') %]</th>
+        <td>[% L.select_tag('defaults.doc_storage_for_shopimages',
+             [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ],
+                                   default = SELF.defaults.doc_storage_for_shopimages,
+                                   onchange="return checkavailable_filebackend(this);") %]</td>
+        <td class="long-desc">[% LxERP.t8('Use this storage backend for uploaded images') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Delete printfiles') %]</th>
+        <td>[% L.yes_no_tag('defaults.doc_delete_printfiles', SELF.defaults.doc_delete_printfiles) %]</td>
+        <td class="long-desc">[% LxERP.t8('Allow to delete generated printfiles') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('max filesize') %]</th>
+        <td>[% L.input_tag('doc_max_filesize_MB','', size=10, onchange="verifyMBSize(this);", class='wi-small') %] [% L.hidden_tag('defaults.doc_max_filesize',SELF.defaults.doc_max_filesize) %] MB</td>
+        <td class="long-desc">[% LxERP.t8('The maximum of uploadable filesize in Megabyte') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Preselect Customer/Vendor documents as email attachments') %]</th>
+        <td>[% L.yes_no_tag('defaults.email_attachment_vc_files_checked', SELF.defaults.email_attachment_vc_files_checked) %]</td>
+        <td class="long-desc">[% LxERP.t8('Preselect all documents saved for the current customer/vendor as a mail attachment.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Preselect part documents as email attachments') %]</th>
+        <td>[% L.yes_no_tag('defaults.email_attachment_part_files_checked', SELF.defaults.email_attachment_part_files_checked) %]</td>
+        <td class="long-desc">[% LxERP.t8('Preselect all documents for the current selected parts in a record as a mail attachment.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Preselect record documents as email attachments') %]</th>
+        <td>[% L.yes_no_tag('defaults.email_attachment_record_files_checked', SELF.defaults.email_attachment_record_files_checked) %]</td>
+        <td class="long-desc">[% LxERP.t8('Preselect all documents saved for the current record as a mail attachment.') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Storage Backends") %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Files') %]</th>
+        <td>[% L.yes_no_tag('defaults.doc_files', SELF.defaults.doc_files) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use File Storage backend') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('WebDAV') %]</th>
+        <td>[% L.yes_no_tag('defaults.doc_webdav', SELF.defaults.doc_webdav) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use WebDAV Storage backend') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3"> [% LxERP.t8("Reports") %] </th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Balance') %]</th>
+        <td>[% L.yes_no_tag('defaults.feature_balance', SELF.defaults.feature_balance) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use Balance Sheet') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('income') %]</th>
+        <td>[% L.yes_no_tag('defaults.feature_eurechnung', SELF.defaults.feature_eurechnung) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use Income') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Erfolgsrechnung') %]</th>
+        <td>[% L.yes_no_tag('defaults.feature_erfolgsrechnung', SELF.defaults.feature_erfolgsrechnung) %]</td>
+        <td class="long-desc">[% LxERP.t8('Use Erfolgsrechnung') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3"> [% 'E-mail' | $T8 %] </th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Global Record BCC') %]</th>
+        <td colspan="2"> [% L.input_tag('defaults.global_bcc', SELF.defaults.global_bcc, class='wi-wide') %] <div class="description">[% 'Manually sent E-Mails will have their BCC field appended with this address. Will not trigger for employees without the right to send bcc, and will not apply to mails sent by automated jobs.' | $T8 %]</div></td>
+
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Send a BCC to logged in user?') %]</th>
+        <td> [% L.yes_no_tag('defaults.bcc_to_login', SELF.defaults.bcc_to_login) %] </td>
+        <td class="long-desc"> [% LxERP.t8('Send a blind copy of all outgoing emails to current user\'s email address?') %] </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Email journal') %]</th>
+        <td colspan="2"> [% L.select_tag('defaults.email_journal', [ [ 0, LxERP.t8('No Journal') ],[ 1, LxERP.t8('Without Attachments') ],[ 2, LxERP.t8('With Attachments') ] ], default=SELF.defaults.email_journal, class="wi-wide") %] <div class="description">[% 'Sent emails can be optionally stored in the database with or without their attachments.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Sales Quotation') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_sales_quotation', SELF.defaults.email_sender_sales_quotation, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Request Quotation') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_request_quotation', SELF.defaults.email_sender_request_quotation, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Sales Order') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_sales_order', SELF.defaults.email_sender_sales_order, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Purchase Order') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_purchase_order', SELF.defaults.email_sender_purchase_order, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Sales Delivery Order') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_sales_delivery_order', SELF.defaults.email_sender_sales_delivery_order, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Purchase Delivery Order') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_purchase_delivery_order', SELF.defaults.email_sender_purchase_delivery_order, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Sales Invoice') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_invoice', SELF.defaults.email_sender_invoice, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Sales Purchase Invoice') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_purchase_invoice', SELF.defaults.email_sender_purchase_invoice, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Letter') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_letter', SELF.defaults.email_sender_letter, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Email Sender Dunning') %]</th>
+       <td colspan="2">
+         [% L.input_tag('defaults.email_sender_dunning', SELF.defaults.email_sender_dunning, class='wi-wide') %]
+       <div class ="description">[% 'Generic email send address for this record type.' | $T8 %]</div></td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Email Subject Transaction Description') %]</th>
+        <td> [% L.yes_no_tag('defaults.email_subject_transaction_description', SELF.defaults.email_subject_transaction_description) %] </td>
+        <td class="long-desc"> [% LxERP.t8('Include the transaction description in the preset email subject.') %] </td>
+      </tr>
+        <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("SEPA") %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Add Customer/Vendor Number' | $T8 %]</th>
+        <td>[% L.yes_no_tag('defaults.sepa_reference_add_vc_vc_id', SELF.defaults.sepa_reference_add_vc_vc_id) %]</td>
+        <td class="long-desc">[% LxERP.t8('Add Customer/Vendor Number as a reference add-on for SEPA export.') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Execution Date = Invoice Duedate' | $T8 %]</th>
+        <td>[% L.yes_no_tag('defaults.sepa_set_duedate_as_default_exec_date', SELF.defaults.sepa_set_duedate_as_default_exec_date) %]</td>
+        <td class="long-desc">[% LxERP.t8('Set the invoice duedate as the default execution date for SEPA export.') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Execution Date = Skonto Date' | $T8 %]</th>
+        <td>[% L.yes_no_tag('defaults.sepa_set_skonto_date_as_default_exec_date', SELF.defaults.sepa_set_skonto_date_as_default_exec_date) %]</td>
+        <td class="long-desc">[% LxERP.t8('Set the invoice skonto date (if exists) as the default execution date for SEPA export.') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Execution Date Buffer' | $T8 %]</th>
+        <td>[% L.input_tag('defaults.sepa_set_skonto_date_buffer_in_days_as_number', SELF.defaults.sepa_set_skonto_date_buffer_in_days_as_number, size=10, class='wi-small' ) %]</td>
+        <td class="long-desc">[% LxERP.t8('In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.') %]</td>
+      </tr>
+
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Experimental Features") %]</th>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal expanded">
+    <caption>[% 'Customer Master Data' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-small"><col class="wi-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('Representative') %]</th>
+        <td>[% L.yes_no_tag('defaults.vertreter', SELF.defaults.vertreter) %]</td>
+        <td class="long-desc">[% LxERP.t8('Representative for Customer') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Normalize Customer / Vendor names') %]</th>
+        <td>[% L.yes_no_tag('defaults.normalize_vc_names', SELF.defaults.normalize_vc_names) %]</td>
+        <td class="long-desc">[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names') %]</td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Use text field for greetings') %]</th>
+       <td>[% L.yes_no_tag('defaults.vc_greetings_use_textfield', SELF.defaults.vc_greetings_use_textfield) %]</td>
+       <td class="long-desc">[% LxERP.t8('Use a text field to enter (new) greetings if enabled. Otherwise, only a drop down box is offered.') %]</td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Use text field for title of contacts') %]</th>
+       <td>[% L.yes_no_tag('defaults.contact_titles_use_textfield', SELF.defaults.contact_titles_use_textfield) %]</td>
+       <td class="long-desc">[% LxERP.t8('Use a text field to enter (new) contact titles if enabled. Otherwise, only a drop down box is offered.') %]</td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8('Use text field for department of contacts') %]</th>
+       <td>[% L.yes_no_tag('defaults.contact_departments_use_textfield', SELF.defaults.contact_departments_use_textfield) %]</td>
+       <td class="long-desc">[% LxERP.t8('Use a text field to enter (new) contact departments if enabled. Otherwise, only a drop down box is offered.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Hourly Rate') %]</th>
+        <td>[% L.input_tag('defaults.customer_hourly_rate_as_number', SELF.defaults.customer_hourly_rate_as_number, class='wi-small') %]</td>
+        <td class="long-desc">[% LxERP.t8('Default hourly rate for new customers') %]</td>
+      </tr>
+      <tr>
+       <td>[% LxERP.t8('Customers: VAT ID / taxnumber unique') %]</td>
+       <td>[% L.yes_no_tag('defaults.customer_ustid_taxnummer_unique', SELF.defaults.customer_ustid_taxnummer_unique) %]</td>
+       <td class="long-desc">[% LxERP.t8('Should VAT ID or taxnumber be unique for customers? This is checked when saving a customer\'s master data. One of the fields is sufficient and required.') %]</td>
+      </tr>
+      <tr>
+       <td>[% LxERP.t8('Vendors: VAT ID / taxnumber unique') %]</td>
+       <td>[% L.yes_no_tag('defaults.vendor_ustid_taxnummer_unique', SELF.defaults.vendor_ustid_taxnummer_unique) %]</td>
+       <td class="long-desc">[% LxERP.t8('Should VAT ID or taxnumber be unique for all vendors? This is checked when saving a vendor\'s master data. One of the fields is sufficient and required.') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Parts Master Data") %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Pictures for parts') %]</th>
+        <td>[% L.yes_no_tag('defaults.parts_show_image', SELF.defaults.parts_show_image) %]</td>
+        <td class="long-desc">[% LxERP.t8('Show the picture in the part form') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Pictures for search parts') %]</th>
+        <td>[% L.yes_no_tag('defaults.parts_listing_image', SELF.defaults.parts_listing_image) %]</td>
+        <td class="long-desc">[% LxERP.t8('Show the pictures in the result for search parts') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('CSS style for pictures') %]</th>
+        <td> [% L.input_tag('defaults.parts_image_css',SELF.defaults.parts_image_css, class='wi-mediumsmall') %]</td>
+        <td class="long-desc">[% LxERP.t8('Style the picture with the following CSS code') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('If item not found, allow creation of new item') %]</th>
+        <td>[% L.yes_no_tag('defaults.create_part_if_not_found', SELF.defaults.create_part_if_not_found) %]</td>
+        <td class="long-desc">[% LxERP.t8('If searching a part from a document and no part is found then offer to create a new part.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Normalize part description and part notes') %]</th>
+        <td>[% L.yes_no_tag('defaults.normalize_part_descriptions', SELF.defaults.normalize_part_descriptions) %]</td>
+        <td class="long-desc">[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Partsgroup is required for parts') %]</th>
+        <td>[% L.yes_no_tag('defaults.partsgroup_required', SELF.defaults.partsgroup_required) %]</td>
+        <td class="long-desc">[% LxERP.t8('If enabled, when saving parts the partsgroup must be not be empty.') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Purchasing & Sales") %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Require a transaction description in purchase and sales records') %]</th>
+        <td>[% L.yes_no_tag('defaults.require_transaction_description_ps', SELF.defaults.require_transaction_description_ps) %]</td>
+        <td class="long-desc">[% LxERP.t8('If enabled purchase and sales records cannot be saved if no transaction description has been entered.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Only list customer's projects in sales records") %]</th>
+        <td>[% L.yes_no_tag("defaults.customer_projects_only_in_sales", SELF.defaults.customer_projects_only_in_sales) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled only those projects that are assigned to the currently selected customer are offered for selection in sales records.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Allow conversion from sales quotations to sales invoices') %]</th>
+        <td>[% L.yes_no_tag('defaults.allow_sales_invoice_from_sales_quotation', SELF.defaults.allow_sales_invoice_from_sales_quotation) %]</td>
+        <td class="long-desc">[% LxERP.t8('If disabled sales quotations cannot be converted into sales invoices directly.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Allow conversion from sales orders to sales invoices') %]</th>
+        <td>[% L.yes_no_tag('defaults.allow_sales_invoice_from_sales_order', SELF.defaults.allow_sales_invoice_from_sales_order) %]</td>
+        <td class="long-desc">[% LxERP.t8('If disabled sales orders cannot be converted into sales invoices directly.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Allow direct creation of new purchase delivery orders') %]</th>
+        <td>[% L.yes_no_tag('defaults.allow_new_purchase_delivery_order', SELF.defaults.allow_new_purchase_delivery_order) %]</td>
+        <td class="long-desc">[% LxERP.t8('If disabled purchase delivery orders can only be created by conversion from existing requests for quotations and purchase orders.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Allow direct creation of new purchase invoices') %]</th>
+        <td>[% L.yes_no_tag('defaults.allow_new_purchase_invoice', SELF.defaults.allow_new_purchase_invoice) %]</td>
+        <td class="long-desc">[% LxERP.t8('If disabled purchase invoices can only be created by conversion from existing requests for quotations, purchase orders and purchase delivery orders.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Show »not delivered qty/value« column in sales and purchase orders") %]</th>
+        <td>[% L.yes_no_tag("defaults.sales_purchase_order_ship_missing_column", SELF.defaults.sales_purchase_order_ship_missing_column) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled a column will be shown in sales and purchase orders that lists both the amount and the value not shipped yet for each item.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Warn before saving orders with duplicate parts (new controller only)") %]</th>
+        <td>[% L.yes_no_tag("defaults.order_warn_duplicate_parts", SELF.defaults.order_warn_duplicate_parts) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown in sales and purchase orders if there are two or more positions of the same part (new controller only).") %]</td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8("Warn before saving orders without a delivery date") %]</th>
+       <td>[% L.yes_no_tag("defaults.order_warn_no_deliverydate", SELF.defaults.order_warn_no_deliverydate) %]</td>
+       <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown in sales and purchase orders if there the delivery date is empty.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Warn before saving sales orders with missing customer order number (new controller only)") %]</th>
+        <td>[% L.yes_no_tag("defaults.order_warn_no_cusordnumber", SELF.defaults.order_warn_no_cusordnumber) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown in sales delivery orders if the customer order number is missing.") %]</td>
+       </tr>
+      <tr>
+       <th>[% LxERP.t8("For sales delivery orders, warn on workflow to invoice if not stocked out") %]</th>
+       <td>[% L.yes_no_tag("defaults.sales_delivery_order_check_stocked", SELF.defaults.sales_delivery_order_check_stocked) %]</td>
+       <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown in sales delivery orders on workflow to invoices if positions are not stocked out.") %]</td>
+      </tr>
+      <tr>
+       <th>[% LxERP.t8("For purchase delivery orders, warn on workflow to invoice if not stocked in") %]</th>
+       <td>[% L.yes_no_tag("defaults.purchase_delivery_order_check_stocked", SELF.defaults.purchase_delivery_order_check_stocked) %]</td>
+       <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown in purchase delivery orders on workflow to invoices if positions are not stocked in.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("For sales invoices, warn if invoice has no delivery order as a predecessor") %]</th>
+        <td>[% L.yes_no_tag("defaults.warn_no_delivery_order_for_invoice", SELF.defaults.warn_no_delivery_order_for_invoice ) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled a warning will be shown if a sales invoices is created without having a sales delivery order as a predecessor.") %]</td>
+       </tr>
+      <tr>
+       <th>[% LxERP.t8("Create sales invoices with Factur-X/ZUGFeRD data") %]</th>
+       <td>[% L.select_tag("defaults.create_zugferd_invoices", SELF.zugferd_settings, default=SELF.defaults.create_zugferd_invoices) %]</td>
+       <td class="long-desc">
+         [% LxERP.t8("If enabled Factur-X/ZUGFeRD conformant sales invoice PDFs will be created.") %]
+         [% LxERP.t8("If the test mode is enabled, the Factur-X/ZUGFeRD invoices will be flagged so that they're only fit to be used for testing purposes.") %]
+       </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Create sales invoices with Swiss QR-bill") %]</th>
+        <td>[% L.select_tag("defaults.create_qrbill_invoices", [ [ 0, LxERP.t8('Do not create QR-bill invoices') ], [ 1, LxERP.t8('Create variant QR-IBAN with QR reference') ], [ 2, LxERP.t8('Create variant IBAN without reference') ] ], default=SELF.defaults.create_qrbill_invoices) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("When using Swiss QR-bill, copy the invoice number to the unstructured message automatically") %]</th>
+        <td>[% L.yes_no_tag("defaults.qrbill_copy_invnumber", SELF.defaults.qrbill_copy_invnumber) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled the invoice number will be copied to the unstructured message upon booking. If there's a message already the invoice number will be appended to it.") %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Lock RFQ/Quotation and Order Subversion") %]</th>
+        <td>[% L.yes_no_tag("defaults.lock_oe_subversions", SELF.defaults.lock_oe_subversions) %]</td>
+        <td class="long-desc">[% LxERP.t8("If enabled RFQs, Quotations and Orders can only be send once via email. By creating another subversion the current record gets a minor subversion and can be send again via email.") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Documents which are allowed to be saved with no positions' | $T8 %]</th>
+        <td colspan="2">
+          <div>
+            [% L.select_tag("defaults.allowed_documents_with_no_positions[]",
+                            SELF.available_documents_with_no_positions,
+                            default=SELF.defaults.allowed_documents_with_no_positions,
+                            multiple=1,
+                            with_empty=1,
+                            value_key="name",
+                            title_key="description",
+                            id="defaults_allowed_documents_with_no_positions",
+                            size=SELF.available_documents_with_no_positions.size+1) %]
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Item input position for quotations and orders") %]</th>
+        <td>[% L.select_tag("defaults.order_item_input_position", [ [ 0, LxERP.t8('above the positions'), ], [ 1, LxERP.t8('below the positions') ] ], default=SELF.defaults.order_item_input_position) %]</td>
+        <td>[% LxERP.t8("Controls whether the default item input is above (default) or below the positions list in orders and quotations. Can be overridden by user preferences.") %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% 'Show certain sales and purchase documents' | $T8 %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Show sales order intake' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_sales_order_intake", SELF.defaults.show_sales_order_intake) %]</td>
+        <td class="long-desc">[% 'When disabled, sales order intakes do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Show purchase quotation intake' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_purchase_quotation_intake", SELF.defaults.show_purchase_quotation_intake) %]</td>
+        <td class="long-desc">[% 'When disabled, purchase quotation intakes do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Show purchase order confirmation' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_purchase_order_confirmation", SELF.defaults.show_purchase_order_confirmation) %]</td>
+        <td class="long-desc">[% 'When disabled, purchase order confirmations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Show sales reclamation' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_sales_reclamation", SELF.defaults.show_sales_reclamation) %]</td>
+        <td class="long-desc">[% 'When disabled, sales reclamations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Show purchase reclamation' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_purchase_reclamation", SELF.defaults.show_purchase_reclamation) %]</td>
+        <td class="long-desc">[% 'When disabled, purchase reclamations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Show invoice for payment in advance and final invoice' | $T8 %]</th>
+        <td>[% L.yes_no_tag("defaults.show_invoice_for_advance_payment", SELF.defaults.show_invoice_for_advance_payment) %]</td>
+        <td class="long-desc">[% 'When disabled, invoices for payment in advance and final invoices do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8('Transport and service costs reminder') %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Default transport article number') %]</th>
+        <td>[% P.part.picker('defaults.transport_cost_reminder_article_number_id', SELF.defaults.transport_cost_reminder_article_number_id, class='wi-mediumsmall') %]</td>
+        <td class="long-desc">[% LxERP.t8('Before saving a sales order, this article will be checked and a warning is generated.') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Invoice email settings') %]</th>
+        <td>
+          [% L.select_tag('defaults.invoice_mail_settings', [ [ 'cp', LxERP.t8('Contact Person') ],[ 'invoice_mail', LxERP.t8('Invoice email') ],[ 'invoice_mail_cc_cp', LxERP.t8('Invoice email and Contact Person') ]  ], default=SELF.defaults.invoice_mail_settings) %]
+        </td>
+        <td class="long-desc">[% 'The invoice recipient can either be a selected contact person (default) or the email adress set in the master data of the customer. Additionally a contact persons mail and the company\'s invoicing mail can be combined.' | $T8 %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Requirement Specs") %]</th>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Default article for converting into quotations and orders') %]</th>
+        <td>
+          [% IF SELF.h_unit_name %]
+            [% P.part.picker('defaults.requirement_spec_section_order_part_id', SELF.defaults.requirement_spec_section_order_part_id, convertible_unit=SELF.h_unit_name, class='wi-mediumsmall') %]
+          [% ELSE %]
+            [% LxERP.t8("Error: this feature requires that articles with a time-based unit (e.g. 'h' or 'min') exist.") %]
+          [% END %]
+        </td>
+        <td class="long-desc">[% LxERP.t8('When converting a requirement spec into a quotation or an oder each section gets converted into a line position in the new record. This is the article used by default for this conversion.') %]</td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Projects") %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Orders with projectnumber' | $T8 %]</th>
+        <td>[% L.yes_no_tag('defaults.order_always_project', SELF.defaults.order_always_project) %]</td>
+        <td class="long-desc">[% LxERP.t8('Always save orders with a projectnumber (create new projects)') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Project type') %]</th>
+        <td>[% L.select_tag('defaults.project_type_id', SELF.all_project_types, default=SELF.defaults.project_type_id, title_key='description', with_empty=0, class='wi-mediumsmall') %]</td>
+        <td class="long-desc"></td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Project Status') %]</th>
+        <td>[% L.select_tag('defaults.project_status_id', SELF.all_project_statuses, default=SELF.defaults.project_status_id, title_key='description', with_empty=0, class='wi-mediumsmall') %]</td>
+        <td class="long-desc"></td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="3">[% LxERP.t8("Select Mulit-Item Options") %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Long Description' | $T8 %]</th>
+        <td>[% L.yes_no_tag('defaults.show_longdescription_select_item', SELF.defaults.show_longdescription_select_item) %]</td>
+        <td class="long-desc">[% LxERP.t8('Show parts longdescription (notes) in select list') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<table class="tbl-horizontal expanded">
+  <caption>[% LxERP.t8("Disabled Price Sources") %]</caption>
+  <colgroup> <col class="wi-normal"><col class="wi-verywide"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Price Sources to be disabled in this client' | $T8 %]</th>
+      <td colspan="2">
+      <div>
+        [% L.select_tag("defaults.disabled_price_sources[]", SELF.all_price_sources, id="defaults_price_sources", multiple=1, default=SELF.defaults.disabled_price_sources) %] [% L.multiselect2side("defaults_price_sources", labelsx=LxERP.t8("All price sources"), labeldx=LxERP.t8("Price sources deactivated in this client")) %]
+      </div>
+      </td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="3">[% LxERP.t8("Enabled Quick Searched") %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Quick Searches that will be shown in the header in this client' | $T8 %]</th>
+      <td colspan="2">
+      <div>
+        [% L.select_tag("defaults.quick_search_modules[]", SELF.available_quick_search_modules, value_key="name", title_key="description_config", id="defaults_quick_searches", multiple=1, default=SELF.defaults.quick_search_modules) %] [% L.multiselect2side("defaults_quick_searches", labelsx=LxERP.t8("All modules"), labeldx=LxERP.t8("Enabled modules")) %]
+      </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<table class="tbl-horizontal expanded">
+  <caption>[% LxERP.t8("Display options") %]</caption>
+  <colgroup> <col class="wi-normal"><col class="wi-verywide"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr><th class="caption", colspan="4">[% 'Displayable Name Preferences' | $T8 %]</th></tr>
+    [% FOREACH module=SELF.displayable_name_specs_by_module.keys.sort %]
+    [%- SET spec=SELF.displayable_name_specs_by_module.$module -%]
+    <tr>
+      <th class="left">[% spec.specs.title %]</th>
+      <td>
+        <table>
+          <tr>
+            <th class="left">[% 'Option' | $T8 %]</th>
+            <th class="left">[% 'Name'   | $T8 %]</th>
+          </tr>
+          [% FOREACH option=spec.specs.options %]
+          <tr>
+            <td>[% option.title %]</td>
+            <td>[% option.name  %]</td>
+          </tr>
+          [% END %]
+          <tr>
+            <th class="left">[% 'Display' | $T8 %]:</th>
+            <td>
+              [% L.hidden_tag("displayable_name_specs[+].module", module) %]
+              [% L.input_tag("displayable_name_specs[].default", spec.prefs.get_default, size=50) %]
+            </td>
+          </tr>
+        </table>
+      </td>
+      [% IF loop.first %]
+      <td class="long-desc">[% 'The display of (mainly) picker results can be configured. To insert the value of one option use <%Name%>.' | $T8 %]<br>
+        [% 'E.g. "<%customernumber%> <%name%>"' | $T8 %]
+      </td>
+      [% END %]
+    </tr>
+    [% END %]
+    <tr><th class="caption">[% 'Forced Layout Style' | $T8 %]</th></tr>
+    <tr>
+      <th>[% 'Force a layout style' | $T8 %]</th>
+      <td>[% L.select_tag('defaults.layout_style', [['', LxERP.t8('Automatic')], ['desktop', LxERP.t8('desktop version')]], default=SELF.defaults.layout_style, with_empty=0) %]</td>
+      <td class="long-desc">[% 'The layout style normally is choosen by the user agent string the browser sends. Here you can force the desktop or mobile version. Users can override this setting in their user preferences.' | $T8 %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#features -->
diff --git a/templates/design40_webpages/client_config/_miscellaneous.html b/templates/design40_webpages/client_config/_miscellaneous.html
new file mode 100644
index 000000000..af69a1327
--- /dev/null
+++ b/templates/design40_webpages/client_config/_miscellaneous.html
@@ -0,0 +1,159 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE T8 %]
+
+<div id="miscellaneous">
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <caption> [% LxERP.t8("Company name and address") %] </caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-wide"> </colgroup>
+    <tbody>
+    <tr>
+      <th> [% LxERP.t8("Company name") %] </th>
+      <td> [% L.input_tag('defaults.company', SELF.defaults.company, class='wi-wide') %] </td>
+    </tr>
+    <tr>
+     <td>[% LxERP.t8("Street 1") %]</td>
+     <td>[% L.input_tag('defaults.address_street1', SELF.defaults.address_street1, style=style) %]</td>
+    </tr>
+    <tr>
+     <td>[% LxERP.t8("Street 2") %]</td>
+     <td>[% L.input_tag('defaults.address_street2', SELF.defaults.address_street2, style=style) %]</td>
+    </tr>
+    <tr>
+     <td>[% LxERP.t8("Zipcode and city") %]</td>
+     <td>
+       [% L.input_tag('defaults.address_zipcode', SELF.defaults.address_zipcode, size=8) %]
+       [% L.input_tag('defaults.address_city', SELF.defaults.address_city, size=30) %]
+     </td>
+    </tr>
+    <tr>
+     <td>[% LxERP.t8("Country") %]</td>
+     <td>[% L.input_tag('defaults.address_country', SELF.defaults.address_country, style=style) %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% LxERP.t8("Company settings") %]</th>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Signature") %] </th>
+      <td> [% L.textarea_tag('defaults.signature', SELF.defaults.signature, rows=4, class='wi-wide texteditor') %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Tax number") %] </th>
+      [% IF SELF.defaults.feature_ustva %]
+      <td> [% SELF.defaults.taxnumber %]&nbsp;&nbsp; <a href="ustva.pl?action=config_step1"> ([% LxERP.t8("For changeing goto USTVA Config") %]) </a> </td>
+      [% ELSE %]
+      <td> [% L.input_tag('defaults.taxnumber', SELF.defaults.taxnumber, class='wi-medium-small') %] </td>
+      [% END %]
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Tax ID number") %] </th>
+      <td> [% L.input_tag('defaults.co_ustid', SELF.defaults.co_ustid, class='wi-medium-small') %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("SEPA creditor ID") %] </th>
+      <td> [% L.input_tag('defaults.sepa_creditor_id', SELF.defaults.sepa_creditor_id, class='wi-medium-small') %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Business Number") %] </th>
+      <td> [% L.input_tag('defaults.businessnumber', SELF.defaults.businessnumber, class='wi-medium-small') %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("DUNS number") %] </th>
+      <td> [% L.input_tag('defaults.duns', SELF.defaults.duns, class='wi-medium-small') %] </td>
+    </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <colgroup> <col class="wi-small"> <col class="wi-small"> <col class="wi-small"></colgroup>
+    <caption>[% LxERP.t8("Language settings") %]</caption>
+    <tbody>
+    <tr>
+      <th> [% LxERP.t8('Default Customer/Vendor Language') %] </th>
+      <td colspan="2"> [% L.select_tag('defaults.language_id', SELF.all_languages, title_key='description', default=SELF.defaults.language_id, with_empty=1, class='wi-mediumsmall') %] </td>
+    </tr>
+    <tr class="header-caption">
+      <th class="caption">[% LxERP.t8("Currencies") %] </th>
+      <th>[% LxERP.t8("Currency name") %] </th>
+      <th class="center">[% LxERP.t8("Default currency") %] </th>
+    </tr>
+    [% FOREACH currency = SELF.all_currencies %]
+      <tr>
+        <th>
+          [% L.hidden_tag("currencies[+].id", currency.id) %]
+          [% IF loop.count == 1 %][% LxERP.t8("Currencies") %][% END %]
+        </th>
+        <td>
+          [% SET title=LxERP.t8("Edit the currency names in order to rename them.") %]
+          [% L.input_tag("currencies[].name", currency.name, title=title, class='wi-small') %]
+        </td>
+        <td class="center">[% L.radio_button_tag('defaults.currency_id', value=currency.id, id='defaults.currency_id_' _ currency.id, checked=(SELF.defaults.currency_id == currency.id)) %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th></th>
+      <td>[% L.input_tag("new_currency", FORM.new_currency, class='wi-small', placeholder=LxERP.t8('Add new currency'), title=LxERP.t8('Add new currency') ) %] </td>
+      <td class="center">[% L.radio_button_tag('defaults.currency_id', value=-1, id='defaults.currency_id__1', checked=(SELF.defaults.currency_id == -1)) %] </td>
+    </tr>
+    [% IF SELF.all_weightunits.size %]
+    <tr>
+      <th class="caption" colspan="3">[% LxERP.t8("Weight") %] </th>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Weight unit") %] </th>
+      <td>[% L.select_tag('defaults.weightunit', SELF.all_weightunits, default=SELF.defaults.weightunit, value_key='name', title_key='name', class='wi-small') %] </td>
+      <td></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Show weights') %] </th>
+      <td colspan="2">
+        [% L.yes_no_tag('defaults.show_weight', SELF.defaults.show_weight, class='wi-small') %]
+        <div class="description">[% LxERP.t8('Show the weights of articles and the total weight in orders, invoices and delivery notes?') %]</div>
+      </td>
+    </tr>
+    [% END %]
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <caption>[% LxERP.t8("Print templates") %] </caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8("Print templates to use") %] </th>
+        <th>[% 'Templates' | $T8 %] </th>
+      </tr>
+      <tr>
+        <th>[% L.radio_button_tag('use_templates', value='existing', id='use_templates_existing', label=LxERP.t8('Use existing templates'), checked=(FORM.use_templates == 'existing')) %] </th>
+        <td>[% L.select_tag('defaults.templates', SELF.all_templates.print_templates, default=SELF.defaults.templates, value_sub=\make_templates_value, class='wi-normal') %] </td>
+      </tr>
+      <tr>
+        <th>[% L.radio_button_tag('use_templates', value='new', id='use_templates_new', label=LxERP.t8('Create new templates from master templates'), checked=(FORM.use_templates == 'new')) %] </th>
+        <td>[% L.select_tag('new_master_templates', SELF.all_templates.master_templates, default=FORM.new_master_templates, class='wi-normal') %] </td>
+      </tr>
+      <tr>
+        <th></th>
+        <td>[% SET placeholder=LxERP.t8("New name") %] [% L.input_tag('new_templates', FORM.new_templates, placeholder=placeholder, class='wi-normal') %] </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Interpolate variables in texts of positions') %]</th>
+        <td colspan="2">
+          [% L.yes_no_tag('defaults.print_interpolate_variables_in_positions', SELF.defaults.print_interpolate_variables_in_positions) %]
+          <div class="description">[% LxERP.t8('Whether or not to replace variable placeholders such as "<%invdate%>" in texts in positions such as the part description by the record\'s actual value') %]</div>
+        </td>
+       </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#miscellaneous -->
diff --git a/templates/design40_webpages/client_config/_orders_deleteable.html b/templates/design40_webpages/client_config/_orders_deleteable.html
new file mode 100644
index 000000000..d9e42dcbb
--- /dev/null
+++ b/templates/design40_webpages/client_config/_orders_deleteable.html
@@ -0,0 +1,36 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<div id="orders_deleteable">
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Orders / Delivery Orders deleteable' | $T8 %]?</caption>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('Sales Orders') %]</th>
+        <td>[% L.yes_no_tag('defaults.sales_order_show_delete', SELF.defaults.sales_order_show_delete, class='wi-small') %]</td>
+        <td class="long-desc">[% LxERP.t8('Show delete button in sales orders?') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Purchase Orders') %]</th>
+        <td>[% L.yes_no_tag('defaults.purchase_order_show_delete', SELF.defaults.purchase_order_show_delete, class='wi-small') %]</td>
+        <td class="long-desc">[% LxERP.t8('Show delete button in purchase orders?') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Sales Delivery Orders') %]</th>
+        <td>[% L.yes_no_tag('defaults.sales_delivery_order_show_delete', SELF.defaults.sales_delivery_order_show_delete, class='wi-small') %]</td>
+        <td class="long-desc">[% LxERP.t8('Show delete button in sales delivery orders?') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Purchase Delivery Orders') %]</th>
+        <td>[% L.yes_no_tag('defaults.purchase_delivery_order_show_delete', SELF.defaults.purchase_delivery_order_show_delete, class='wi-small') %]</td>
+        <td class="long-desc">[% LxERP.t8('Show delete button in purchase delivery orders?') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+</div><!-- /#orders_deleteable -->
+
diff --git a/templates/design40_webpages/client_config/_posting_configuration.html b/templates/design40_webpages/client_config/_posting_configuration.html
new file mode 100644
index 000000000..10766d6cc
--- /dev/null
+++ b/templates/design40_webpages/client_config/_posting_configuration.html
@@ -0,0 +1,179 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE T8 %]
+
+<div id="posting_configuration">
+
+<div class="wrapper" id="wrapper-5">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Changeable after posting' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-mediumsmall"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Sales invoices') %]</th>
+      <td>[% L.select_tag('defaults.is_changeable', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.is_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should sales invoices be and when should they be changeable or deleteable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase invoices') %]</th>
+      <td>[% L.select_tag('defaults.ir_changeable', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ir_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should purchase invoices be and when should they be deleteable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AR Transactions') %]</th>
+      <td>[% L.select_tag('defaults.ar_changeable', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ar_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should ar transactions be and when should they be changeable or deleteable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AP Transactions') %]</th>
+      <td>[% L.select_tag('defaults.ap_changeable', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ap_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should ap transactions be and when should they be changeable or deleteable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('GL Transactions') %]</th>
+      <td>[% L.select_tag('defaults.gl_changeable', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.gl_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should gl transactions be and when should they be changeable or deleteable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Payments') %]</th>
+      <td>[% L.select_tag('defaults.payments_changeable', SELF.payment_options, value_key = 'value', title_key = 'title', default = SELF.defaults.payments_changeable, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should payments be and when should they be changeable after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Record numbers changeable') %]</th>
+      <td>[% L.yes_no_tag('defaults.sales_purchase_record_numbers_changeable', SELF.defaults.sales_purchase_record_numbers_changeable) %]</td>
+      <td class="longdesc">[% LxERP.t8('If disabled, record numbers for sales records & purchase records produced by our side will always be auto-generated and cannot be changed later.') %]</td>
+     </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Show "mark as paid"' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Sales Invoices') %]</th>
+      <td>[% L.yes_no_tag('defaults.is_show_mark_as_paid', SELF.defaults.is_show_mark_as_paid, class='wi-small') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should the "mark as paid" button showed on sales invoices?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Invoices') %]</th>
+      <td>[% L.yes_no_tag('defaults.ir_show_mark_as_paid', SELF.defaults.ir_show_mark_as_paid, class='wi-small') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should the "mark as paid" button showed in purchase invoices?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AR Transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.ar_show_mark_as_paid', SELF.defaults.ar_show_mark_as_paid, class='wi-small') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should the "mark as paid" button showed in ar transactions?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AP Transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.ap_show_mark_as_paid', SELF.defaults.ap_show_mark_as_paid, class='wi-small') %]</td>
+      <td class="longdesc">[% LxERP.t8('Should the "mark as paid" button showed in ap transactions?') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Add document for' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Purchase invoices') %]</th>
+      <td>[% L.yes_no_tag('defaults.ir_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ir_add_doc) %]</td>
+      <td>[% LxERP.t8('Show document tab after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AR Transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.ar_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ar_add_doc) %]</td>
+      <td>[% LxERP.t8('Do not leave booking form?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('AP Transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.ap_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.ap_add_doc) %]</td>
+      <td>[% LxERP.t8('Show document tab after posting?') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('GL Transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.gl_add_doc', SELF.posting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.gl_add_doc) %]</td>
+      <td>[% LxERP.t8('Show document tab after posting?') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper" id="wrapper-6">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Methods & Preferences' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Accounting method') %]</th>
+      <td>[% L.select_tag('defaults.accounting_method', SELF.accounting_options, value_key = 'value', title_key = 'title', default = SELF.defaults.accounting_method, class='wi-normal') %]</td>
+      <td class="longdesc">[% LxERP.t8('This option controls the posting and calculation behavior for the accounting method.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Inventory system') %]</th>
+      <td>[% L.select_tag('defaults.inventory_system', SELF.inventory_options, value_key = 'value', title_key = 'title', default = SELF.defaults.inventory_system, class='wi-normal') %]</td>
+      <td class="longdesc"> [% LxERP.t8('This option controls the inventory system.') %]<br>
+      [% LxERP.t8('ATTENTION! You can not simply change it from periodic to perpetual once you started posting.') %] </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Profit determination') %]</th>
+      <td>[% L.select_tag('defaults.profit_determination', SELF.profit_options, value_key = 'value', title_key = 'title', default = SELF.defaults.profit_determination, class='wi-morewide') %]</td>
+      <td class="longdesc">[% LxERP.t8('This option controls the method used for profit determination.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Balance startdate method') %]</th>
+      <td>[% L.select_tag('defaults.balance_startdate_method', SELF.balance_startdate_method_options, value_key = 'value', title_key = 'title', default = SELF.defaults.balance_startdate_method, class='wi-morewide') %]</td>
+      <td class="longdesc">[% LxERP.t8('This option controls the method used for determining the startdate for the balance report.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Year-end method') %]</th>
+      <td>[% L.select_tag('defaults.yearend_method', SELF.yearend_options, value_key = 'value', title_key = 'title', default = SELF.defaults.yearend_method, class='wi-morewide') %]</td>
+      <td class="longdesc">[% LxERP.t8('This option controls the method used for the automated year-end bookings.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Set valid until date for Sales Quotation') %]</th>
+      <td>[% L.yes_no_tag('defaults.reqdate_on', SELF.defaults.reqdate_on) %]</td>
+      <td class="longdesc">[% LxERP.t8("If set to no the 'valid until' field for sales quotation won't be set at all.") %]</td>
+     </tr>
+    <tr>
+      <th>[% LxERP.t8('Sales Quotation valid interval') %]</th>
+      <td>[% L.input_tag('defaults.reqdate_interval_as_number', SELF.defaults.reqdate_interval_as_number, class='wi-verysmall') %]</td>
+      <td class="longdesc">[% LxERP.t8('Usually the sales quotation is valid until the next working day. If a value is set here then the quotation will be valid for at least that many days. The resulting date will be adjusted to the next working day if it ends up on a weekend.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Set delivery date for Sales Orders') %]</th>
+      <td>[% L.yes_no_tag('defaults.deliverydate_on', SELF.defaults.deliverydate_on) %]</td>
+      <td class="longdesc">[% LxERP.t8("If set to no the 'delivery date' field for sales orders won't be set at all.") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Sales Order delivery date interval') %]</th>
+      <td>[% L.input_tag('defaults.delivery_date_interval_as_number', SELF.defaults.delivery_date_interval_as_number, class='wi-verysmall') %]</td>
+      <td class="longdesc">[% LxERP.t8('Usually the delivery date of an order is the next working day. If a value is set here this value will be added to the delivery date of the sales order. The resulting date will be adjusted to the next working day if it ends up on a weekend.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Allow fuzzy skonto for payment bookings') %]</th>
+      <td>[% L.yes_no_tag('defaults.fuzzy_skonto', SELF.defaults.fuzzy_skonto) %]</td>
+      <td>[% LxERP.t8("If set to yes a percentage deviation will be allowed for otherwise strict skonto bookings. The deviation will booked to the skonto chart and the allowed deviation is also configurable.") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Allowed skonto percentage deviation') %]</th>
+      <td>[% L.input_tag('defaults.fuzzy_skonto_percentage_as_number', SELF.defaults.fuzzy_skonto_percentage_as_number, size=5, class="numeric") %]%</td>
+      <td>[% LxERP.t8("The allowed Skonto Percentage Deivation defaults to 0.5% of the invoice amount") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Use END-TO-END-ID to detect duplicates in bank import transactions') %]</th>
+      <td>[% L.yes_no_tag('defaults.check_bt_duplicates_endtoend', SELF.defaults.check_bt_duplicates_endtoend) %]</td>
+      <td>[% LxERP.t8("If set to yes and an end-to-end id can be extracted from the transaction this will be used to detect duplicates instead of the transaction purpose.") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#posting_configuration -->
diff --git a/templates/design40_webpages/client_config/_ranges_of_numbers.html b/templates/design40_webpages/client_config/_ranges_of_numbers.html
new file mode 100644
index 000000000..c5be2cb22
--- /dev/null
+++ b/templates/design40_webpages/client_config/_ranges_of_numbers.html
@@ -0,0 +1,109 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE T8 %]
+
+<div id="ranges_of_numbers">
+<div class="wrapper" id="wrapper-4">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Last Numbers / Prefixes' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Customer') %]</th>
+      <td>[% L.input_tag("defaults.customernumber", SELF.defaults.customernumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Vendor') %]</th>
+      <td>[% L.input_tag("defaults.vendornumber", SELF.defaults.vendornumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th></th>
+      <td></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Invoice') %]</th>
+      <td>[% L.input_tag("defaults.invnumber", SELF.defaults.invnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Credit Note') %]</th>
+      <td>[% L.input_tag("defaults.cnnumber", SELF.defaults.cnnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Order Intake') %]</th>
+      <td>[% L.input_tag("defaults.soinumber", SELF.defaults.soinumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Quotation Intake') %]</th>
+      <td>[% L.input_tag("defaults.pqinumber", SELF.defaults.pqinumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Order') %]</th>
+      <td>[% L.input_tag("defaults.sonumber", SELF.defaults.sonumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Order') %]</th>
+      <td>[% L.input_tag("defaults.ponumber", SELF.defaults.ponumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Order Confirmation') %]</th>
+      <td>[% L.input_tag("defaults.pocnumber", SELF.defaults.pocnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Sales quotation') %]</th>
+      <td>[% L.input_tag("defaults.sqnumber", SELF.defaults.sqnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('RFQ') %]</th>
+      <td>[% L.input_tag("defaults.rfqnumber", SELF.defaults.rfqnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Sales Delivery Order') %]</th>
+      <td>[% L.input_tag("defaults.sdonumber", SELF.defaults.sdonumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Delivery Order') %]</th>
+      <td>[% L.input_tag("defaults.pdonumber", SELF.defaults.pdonumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Supplier Delivery Order') %]</th>
+      <td>[% L.input_tag("defaults.sudonumber", SELF.defaults.sudonumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('RMA Delivery Order') %]</th>
+      <td>[% L.input_tag("defaults.rdonumber", SELF.defaults.rdonumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Sales Reclamation') %]</th>
+      <td>[% L.input_tag("defaults.s_reclamation_record_number", SELF.defaults.s_reclamation_record_number, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Reclamation') %]</th>
+      <td>[% L.input_tag("defaults.p_reclamation_record_number", SELF.defaults.p_reclamation_record_number, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th></th>
+      <td></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Article') %]</th>
+      <td>[% L.input_tag("defaults.articlenumber", SELF.defaults.articlenumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Service') %]</th>
+      <td>[% L.input_tag("defaults.servicenumber", SELF.defaults.servicenumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Assembly') %]</th>
+      <td>[% L.input_tag("defaults.assemblynumber", SELF.defaults.assemblynumber, size="15", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Assortment') %]</th>
+      <td>[% L.input_tag("defaults.assortmentnumber", SELF.defaults.assortmentnumber, size="15", class="wi-normal") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</div><!-- /#ranges_of_numbers -->
diff --git a/templates/design40_webpages/client_config/_record_links.html b/templates/design40_webpages/client_config/_record_links.html
new file mode 100644
index 000000000..d4b0214b6
--- /dev/null
+++ b/templates/design40_webpages/client_config/_record_links.html
@@ -0,0 +1,35 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<div id="record_links">
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <caption>[% 'Linked Records' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('View record links from Sales Order') %]</th>
+        <td>[% L.yes_no_tag('defaults.always_record_links_from_order', SELF.defaults.always_record_links_from_order) %]</td>
+        <td class="longdesc">[% LxERP.t8('If enabled the record links view starts always from the sales order including all sublevels') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Include a link to the record itself') %]</th>
+        <td>[% L.yes_no_tag('defaults.record_links_from_order_with_myself', SELF.defaults.record_links_from_order_with_myself) %]</td>
+        <td class="longdesc">
+          [% LxERP.t8('Include the record itself in the list of linked records, if the view for record links from sales order is enabled.') %]<br>
+          [% LxERP.t8('This way you can get a similar list of linked records for every record in the same workflow.') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Include links to sales quotations') %]</th>
+        <td>[% L.yes_no_tag('defaults.record_links_from_order_with_quotations', SELF.defaults.record_links_from_order_with_quotations) %]</td>
+        <td class="longdesc">
+          [% LxERP.t8('Include sales quotations in the list of linked records, if the view for record links from sales order is enabled.') %]<br>
+          [% LxERP.t8('As the view starts from sales orders, normally sales quotations are not included.') %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.wrapper -->
+</div><!-- /#record_links -->
diff --git a/templates/design40_webpages/client_config/_stocktaking.html b/templates/design40_webpages/client_config/_stocktaking.html
new file mode 100644
index 000000000..9ecff4b71
--- /dev/null
+++ b/templates/design40_webpages/client_config/_stocktaking.html
@@ -0,0 +1,38 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<div id="stocktaking">
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <caption>[% 'Stocktaking' | $T8 %]</caption>
+    <tbody>
+    <tr>
+      <th>[% LxERP.t8('Preselected warehouse') %]</th>
+      <td>[% L.select_tag('defaults.stocktaking_warehouse_id', SELF.all_warehouses, id='stocktaking_warehouse_id', with_empty=1, default=SELF.defaults.stocktaking_warehouse_id, title_key='description', onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1 ,'stocktaking_bin_id')", class='wi-normal') %] </td>
+      <td class="long-desc">[% LxERP.t8('If configured this warehouse will be preselected for stocktaking.') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Preselected bin') %]</th>
+      <td>[% L.select_tag('defaults.stocktaking_bin_id', [], id='stocktaking_bin_id', with_empty=1, class='wi-normal') %]</td>
+      <td class="long-desc">[% LxERP.t8('If configured this bin will be preselected for stocktaking.') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Preselected cutoff date') %]</th>
+      <td>[% L.date_tag('defaults.stocktaking_cutoff_date', SELF.defaults.stocktaking_cutoff_date, class='wi-date') %]</td>
+      <td class="long-desc">[% LxERP.t8('If configured this date will used as preselected cutoff date for stocktaking.') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Threshold for warning on quantity difference') %]</th>
+      <td>[% L.input_tag('defaults.stocktaking_qty_threshold_as_number', SELF.defaults.stocktaking_qty_threshold_as_number, class='wi-small', size='15') %]</td>
+      <td class="long-desc">[% LxERP.t8('If the counted quantity differs more than this threshold from the quantity in the database, a warning will be shown. Set to 0 to switch of this feature.') %]<br>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div><!-- /.wrapper -->
+</div><!-- /#stocktaking -->
diff --git a/templates/design40_webpages/client_config/_warehouse.html b/templates/design40_webpages/client_config/_warehouse.html
new file mode 100644
index 000000000..3642a88d0
--- /dev/null
+++ b/templates/design40_webpages/client_config/_warehouse.html
@@ -0,0 +1,120 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<div id="warehouse">
+<div class="wrapper" id="wrapper-3">
+
+<table class="tbl-horizontal expanded">
+  <caption>[% 'Default Warehouse' | $T8 %]</caption>
+  <colgroup> <col class="wi-normal"><col class="wi-mediumsmall"><col class="wi-verywide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Default Transfer') %]</th>
+      <td>[% L.yes_no_tag('defaults.transfer_default', SELF.defaults.transfer_default, class='wi-small') %] </td>
+      <td class="long-desc"> [% LxERP.t8('Show Transfer via default') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Transfer with services') %]</th>
+      <td> [% L.yes_no_tag('defaults.transfer_default_services', SELF.defaults.transfer_default_services, class='wi-small') %] </td>
+      <td class="long-desc"> [% LxERP.t8('Transfer services via default') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Warehouse') %]</th>
+      <td> [% L.select_tag('defaults.warehouse_id', SELF.all_warehouses, id='warehouse_id', with_empty=1, default=SELF.defaults.warehouse_id, title_key='description', onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1)", class='wi-normal') %] </td>
+      <td class="long-desc"> [% LxERP.t8('This is the default bin for parts') %]<br>
+      [% LxERP.t8('If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Bin') %]</th>
+      <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1, class='wi-normal') %]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Transfer with Master Bin') %]</th>
+      <td> [% L.yes_no_tag('defaults.transfer_default_use_master_default_bin', SELF.defaults.transfer_default_use_master_default_bin, class='wi-small') %] </td>
+      <td class="long-desc"> [% LxERP.t8('Use master default bin for Default Transfer, if no default bin for the part is configured') %]<br>
+      </td>
+    </tr>
+    <tr><th class="caption" colspan="3"> [% 'With Ignoring Onhand' | $T8 %] </th></tr>
+    <tr>
+      <th>[% LxERP.t8('Default Transfer Out with negative inventory') %]</th>
+      <td> [% L.yes_no_tag('defaults.transfer_default_ignore_onhand', SELF.defaults.transfer_default_ignore_onhand, class='wi-small') %] </td>
+      <td class="long-desc"> [% LxERP.t8('Default Transfer Out always succeed. The current part onhand is ignored and the inventory can have negative stocks (not recommended).') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Warehouse with ignoring onhand') %]</th>
+      <td> [% L.select_tag('defaults.warehouse_id_ignore_onhand', SELF.all_warehouses, id='warehouse_id_ignore_onhand', with_empty=1, default=SELF.defaults.warehouse_id_ignore_onhand, title_key='description', onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1, 'bin_id_ignore_onhand')", class='wi-normal') %] </td>
+      <td class="long-desc"> [% LxERP.t8('This is the default warehouse for ignoring onhand') %] </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Default Bin with ignoring onhand') %]</th>
+      <td>[% L.select_tag('defaults.bin_id_ignore_onhand', [], id='bin_id_ignore_onhand', with_empty=1, class='wi-normal') %]</td>
+      <td class="long-desc">[% LxERP.t8('If the default transfer out always succeed use this bin for negative stock quantity.') %]</td>
+    </tr>
+    <tr><th class="caption" colspan="3"> [% 'Transfer Out & Assembly Transfer' | $T8 %] </th></tr>
+    <tr>
+      <th>[% LxERP.t8('Transfer out on posting sales invoices?') %]</th>
+      <td> [% L.yes_no_tag('defaults.is_transfer_out', SELF.defaults.is_transfer_out) %] </td>
+      <td class="long-desc"> [% LxERP.t8('Transfer out all items of a sales invoice when posting it. Items are transfered out acording to the settings above.') %] </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Match Sales Invoice Serial numbers with inventory charge numbers?') %]</th>
+     <td>[% L.yes_no_tag('defaults.sales_serial_eq_charge', SELF.defaults.sales_serial_eq_charge) %]</td>
+     <td class="long-desc">[% LxERP.t8('If one or more space separated serial numbers are assigned in a sales invoice, match the charge number of the inventory item. Assumes that Serial Number and Charge Number have 1:1 relation. Otherwise throw a error message for the default sales invoice transfer.') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Undo Transfer Interval') %]</th>
+      <td>[% L.input_tag('defaults.undo_transfer_interval_as_number', SELF.defaults.undo_transfer_interval_as_number, class='wi-verysmall') %]</td>
+      <td class="long-desc">[% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %]</td>
+    </tr>
+    <tr><th class="caption" colspan="3"> [% 'Best Before' | $T8 %] </th></tr>
+    <tr>
+      <th>[% LxERP.t8('Show Bestbefore') %]</th>
+      <td> [% L.yes_no_tag('defaults.show_bestbefore', SELF.defaults.show_bestbefore) %] </td>
+      <td class="long-desc"> [% LxERP.t8('Show fields used for the best before date?') %]<br>
+      [% LxERP.t8('ATTENTION! If you enabled this feature you can not simply turn it off again without taking care that best_before fields are emptied in the database.') %]<br>
+      [% LxERP.t8('This can be done with the following query:') %]<br>
+      <br>
+      UPDATE inventory SET bestbefore = NULL; <br>
+      <br>
+      [% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %] </td>
+    </tr>
+    <tr><th class="caption" colspan="3">[% LxERP.t8("Produce Assembly Configuration") %]</th></tr>
+    <tr>
+      <th>[% LxERP.t8('Assembly creation warehouse dependent') %]</th>
+      <td>[% L.yes_no_tag('defaults.produce_assembly_same_warehouse', SELF.defaults.produce_assembly_same_warehouse) %]</td>
+      <td class="long-desc">[% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Assembly creation transfers services') %]</td>
+      <td>[% L.yes_no_tag('defaults.produce_assembly_transfer_service', SELF.defaults.produce_assembly_transfer_service) %]</td>
+      <td class="long-desc">[% LxERP.t8('Produce assembly consumes services if assigned as a assembly item') %]</td>
+    </tr>
+    <tr><th class="caption" colspan="3">[% LxERP.t8("Services in Delivery Orders") %]</td></tr>
+    <tr>
+      <th>[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
+      <td>[% L.yes_no_tag('defaults.sales_delivery_order_check_service', SELF.defaults.sales_delivery_order_check_service) %]</td>
+      <td class="long-desc">[% LxERP.t8('Ignore services for the sales orders state of delivery') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Purchase Orders Services are deliverable') %]</td>
+      <td>[% L.yes_no_tag('defaults.purchase_delivery_order_check_service', SELF.defaults.purchase_delivery_order_check_service) %]</td>
+      <td class="long-desc">[% LxERP.t8('Ignore services for the purchase orders state of delivery') %]</td>
+     </tr>
+    <tr><th class="caption" colspan="3">[% LxERP.t8("Shipped Quantity Algorithm") %]</td></tr>
+    <tr>
+     <th>[% LxERP.t8('Require stock out to consider a delivery order position delivered?') %]</td>
+     <td>[% L.yes_no_tag('defaults.shipped_qty_require_stock_out', SELF.defaults.shipped_qty_require_stock_out) %]</td>
+     <td class="long-desc">[% LxERP.t8('If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</div><!-- /#warehouse -->
diff --git a/templates/design40_webpages/client_config/form.html b/templates/design40_webpages/client_config/form.html
new file mode 100644
index 000000000..ba0d71933
--- /dev/null
+++ b/templates/design40_webpages/client_config/form.html
@@ -0,0 +1,121 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE T8 %]
+
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript"><!--
+
+  var warehouses = [
+   [% USE warehouses_it = Iterator(SELF.all_warehouses) %][% FOREACH warehouse = warehouses_it %]
+    { id:   [% warehouse.id %],
+      bins: [
+       [% USE bins_it = Iterator(warehouse.bins_sorted_naturally) %][% FOREACH bin = bins_it %]
+        { id: [% bin.id %], description: "[% JavaScript.escape(bin.description) %]" }[% UNLESS bins_it.last %],[% END %]
+       [% END %]
+     ] }[% UNLESS warehouses_it.last %],[% END %]
+   [% END %]
+  ];
+
+  function warehouse_selected(warehouse_id, bin_id, bin_id_name) {
+    // bin_id_name is optional and only used in client_config.html
+    bin_id_name = bin_id_name || 'bin_id';
+
+    // Remove all bins safe for the empty entry
+    var bin_select = $('#' + bin_id_name);
+    bin_select.find('option').filter('[value!=""]').remove();
+
+    // Find selected warehouse
+    var warehouse = warehouses.filter(function(elt) { return elt.id == warehouse_id; })[0];
+    if (!warehouse)
+      return;
+
+    // Add bins as options to select.
+    $(warehouse.bins).each(function(idx, bin) {
+      bin_select.append($('<option>', { value: bin.id, selected: bin.id == bin_id }).text(bin.description));
+    });
+  }
+
+  function enable_template_controls() {
+    var existing = $('#use_templates_existing').prop('checked');
+    $('#defaults_templates').prop('disabled', !existing);
+    $('#new_templates,#new_master_templates').prop('disabled', existing);
+  }
+
+  function verifyMBSize(elem) {
+    var fsize = parseInt($('#doc_max_filesize_MB').val());
+    $('#defaults_doc_max_filesize').val(fsize*1000000.0);
+    $('#doc_max_filesize_MB').val(fsize);
+  }
+
+  function verifyRootPath(elem) {
+    if ( elem.value == "" ) {
+      elem.value="./documents";
+    }
+  }
+
+  function checkavailable_filebackend(elem) {
+    var selval = elem.value;
+    if ( selval == 'Webdav' && $("#defaults_doc_webdav").val() == 0 ) {
+       elem.value = 'Filesystem';
+    }
+    if ( elem.value == 'Filesystem' && $("#defaults_doc_files").val() == 0 ) {
+       elem.value = 'None';
+    }
+    return false;
+  }
+
+  $(function() {
+    warehouse_selected([% SELF.defaults.warehouse_id || -1 %], [% SELF.defaults.bin_id || -1 %], 'bin_id');
+    warehouse_selected([% SELF.defaults.warehouse_id_ignore_onhand || -1 %], [% SELF.defaults.bin_id_ignore_onhand || -1 %], 'bin_id_ignore_onhand');
+    warehouse_selected([% SELF.defaults.stocktaking_warehouse_id || -1 %], [% SELF.defaults.stocktaking_bin_id || -1 %], 'stocktaking_bin_id');
+
+    enable_template_controls();
+    $('#doc_max_filesize_MB').val(parseInt($('#defaults_doc_max_filesize').val())/1000000.0);
+    $('#use_templates_existing,#use_templates_new').change(enable_template_controls);
+  })
+
+--></script>
+
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form action='controller.pl' method='POST' id='form'>
+ <div class="tabwidget">
+  <ul>
+   <li><a href="#miscellaneous">[% LxERP.t8('Miscellaneous') %]</a></li>
+   <li><a href="#ranges_of_numbers">[% LxERP.t8('Ranges of numbers') %]</a></li>
+   <li><a href="#default_accounts">[% LxERP.t8('Default Accounts') %]</a></li>
+   <li><a href="#posting_configuration">[% LxERP.t8('Posting Configuration') %]</a></li>
+   [% IF FORM.feature_datev %]
+     <li><a href="#datev_check_configuration">[% LxERP.t8('DATEV configuration') %]</a></li>
+   [% END %]
+   <li><a href="#orders_deleteable">[% LxERP.t8('Orders / Delivery Orders deleteable') %]</a></li>
+[%- IF INSTANCE_CONF.get_doc_storage %]
+   <li><a href="#attachments">[% LxERP.t8('Global Attachments') %]</a></li>
+[%- END %]
+   <li><a href="#warehouse">[% LxERP.t8('Warehouse') %]</a></li>
+   <li><a href="#features">[% LxERP.t8('Features') %]</a></li>
+   <li><a href="#stocktaking">[% LxERP.t8('Stocktaking') %]</a></li>
+   <li><a href="#record_links">[% LxERP.t8('Linked Records') %]</a></li>
+   <li><a href="#bank">[% LxERP.t8('SEPA/Bank') %]</a></li>
+  </ul>
+
+[% PROCESS 'client_config/_ranges_of_numbers.html' %]
+[% PROCESS 'client_config/_default_accounts.html' %]
+[% PROCESS 'client_config/_posting_configuration.html' %]
+[% PROCESS 'client_config/_datev_check_configuration.html' %]
+[% PROCESS 'client_config/_orders_deleteable.html' %]
+[%- IF INSTANCE_CONF.get_doc_storage %]
+  [% PROCESS 'client_config/_attachments.html' %]
+[%- END %]
+[% PROCESS 'client_config/_warehouse.html' %]
+[% PROCESS 'client_config/_features.html' %]
+[% PROCESS 'client_config/_stocktaking.html' %]
+[% PROCESS 'client_config/_record_links.html' %]
+[% PROCESS 'client_config/_bank.html' %]
+[% PROCESS 'client_config/_miscellaneous.html' %]
+ </div>
+</form>
diff --git a/templates/design40_webpages/common/_print_dialog.html b/templates/design40_webpages/common/_print_dialog.html
new file mode 100644
index 000000000..cee998e30
--- /dev/null
+++ b/templates/design40_webpages/common/_print_dialog.html
@@ -0,0 +1,9 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="print_dialog_print_options"></div>
+
+<div class="buttons">
+ [% L.button_tag("kivi.SalesPurchase.print_record()", LxERP.t8("Print"), id="print_dialog_print_button") %]
+ [% L.button_tag("\$('#print_dialog').dialog('close');", LxERP.t8("Abort"), id="print_dialog_abort_button", class="neutral") %]
+</div>
diff --git a/templates/design40_webpages/common/_send_email_dialog.html b/templates/design40_webpages/common/_send_email_dialog.html
new file mode 100644
index 000000000..ea9e11af5
--- /dev/null
+++ b/templates/design40_webpages/common/_send_email_dialog.html
@@ -0,0 +1,132 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% SET have_files = 0 %]
+
+[% BLOCK attach_file_list %]
+  [% IF files.as_list.size %]
+    [% SET have_files = 1 ;
+       FOREACH file = files.as_list %]
+      <tr>
+        <th>[% IF loop.first %][% label %][% END %]</th>
+        <td>
+        [% IF checked %]
+          [% P.checkbox_tag("email_form.attach_file_ids[]", label=file.db_file.file_name, value=file.db_file.id, checked="1") %]
+        [% ELSE %]
+          [% P.checkbox_tag("email_form.attach_file_ids[]", label=file.db_file.file_name, value=file.db_file.id, checked="0") %]
+        [% END %]
+          </td>
+      </tr>
+    [% END %]
+  [% END %]
+[% END %]
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>
+        [% IF is_invoice_mail  %]
+          [% LxERP.t8("Invoice to:") %]
+        [% ELSE %]
+          [% LxERP.t8("Recipients") %]
+        [% END %]
+        <span class="interactive cursor-pointer" onclick="$('[data-toggle-recipients=1]').toggle()" data-toggle-recipients="1">[+]</span>
+        <span class="interactive cursor-pointer hidden" onclick="$('[data-toggle-recipients=1]').toggle()" data-toggle-recipients="1">[-]</span>
+      </th>
+      <td>
+        [% L.input_tag("email_form.to", email_form.to, class="wi-wider", readonly=is_invoice_mail) %]
+      </td>
+    </tr>
+    [%- IF ALL_PARTNER_EMAIL_ADDRESSES.size %]
+      [%- FOREACH email = ALL_PARTNER_EMAIL_ADDRESSES %]
+        <tr class="hidden" data-toggle-recipients="1">
+          <th>
+            [%- IF loop.first %]
+              [% LxERP.t8("Other recipients") %]
+            [%- END %]
+          </th>
+          <td>
+            [% P.checkbox_tag("email_form.additional_to[]", label=email, value=email, checked="0") %]
+          </td>
+        </tr>
+      [%- END %]
+    [%- END %]
+    [%- IF ALL_EMPLOYEES.size %]
+      <tr class="hidden" data-toggle-recipients="1">
+        <th>[% LxERP.t8("CC to Employee") %]</th>
+        <td>[% L.select_tag('email_form.cc_employee', ALL_EMPLOYEES, value_key='login' title_key='safe_name', with_empty=1, style=style) %]</td>
+      </tr>
+    [%- END %]
+    <tr class="hidden" data-toggle-recipients="1">
+      <th>[% LxERP.t8("Cc") %]</th>
+      <td>[% L.input_tag("email_form.cc", email_form.cc, class="wi-wider") %]</td>
+    </tr>
+    [% IF show_bcc %]
+      <tr class="hidden" data-toggle-recipients="1">
+        <th>[% LxERP.t8("Bcc") %]</th>
+        <td>[% L.input_tag("email_form.bcc", email_form.bcc, class="wi-wider") %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8("Subject") %]</th>
+      <td>[% L.input_tag("email_form.subject", email_form.subject, class="wi-wider") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Message") %] <sup> [% L.link("generictranslations.pl?action=edit_email_strings", "1)", title=LxERP.t8('Tired of copying always nice phrases for this message? Click here to use the new preset message option!'), target="_blank") %]</sup> </th>
+      <td>[% L.textarea_tag("email_form.message", email_form.message, style="height:150px", class="texteditor texteditor-space-for-toolbar wi-wider") %]</td>
+    </tr>
+    [% IF INSTANCE_CONF.get_doc_storage %]
+      <tr>
+        <th>[% LxERP.t8("Send printout of record") %]</th>
+        <td>
+          [% SET no_file_label = have_files ? LxERP.t8("Don't include a printout of the record with the email, only selected files") : LxERP.t8("Don't include a printout of the record with the email") %]
+          [%- IF is_final_version %]
+            [% options = [
+                 [ "old_file", LxERP.t8("Send the last version for this record") ],
+                 [ "no_file",  no_file_label ], ]
+            %]
+          [%- ELSE %]
+            [% options = [
+                 [ "old_file", LxERP.t8("Send the last or create the first version for this record") ],
+                 [ "normal",   LxERP.t8("Create and send a new printout for this record") ],
+                 [ "no_file",  no_file_label ], ]
+            %]
+          [%- END %]
+          [% L.select_tag("email_form.attachment_policy", options, onchange="kivi.SalesPurchase.activate_send_email_actions_regarding_printout()", class="wi-wider") %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% IF !INSTANCE_CONF.get_doc_storage %] [% LxERP.t8("Attachment name") %] [% END %] </th>
+      <td>[% L.input_tag("email_form.attachment_filename", email_form.attachment_filename, class="wi-wider") %]</td>
+    </tr>
+    [% IF INSTANCE_CONF.get_doc_storage %]
+      [% PROCESS attach_file_list
+                 files = FILES.files
+                 checked = INSTANCE_CONF.get_email_attachment_record_files_checked
+                 label = LxERP.t8("Record's files") %]
+      [% PROCESS attach_file_list
+                 files = FILES.vc_files
+                 checked = INSTANCE_CONF.get_email_attachment_vc_files_checked
+                 label = is_customer ? LxERP.t8("Files from customer") : LxERP.t8("Files from vendor") %]
+
+      [% PROCESS attach_file_list
+                 files = FILES.part_files
+                 checked = INSTANCE_CONF.get_email_attachment_part_files_checked
+                 label = LxERP.t8("Files from parts") %]
+      [% PROCESS attach_file_list
+                 files = FILES.project_files
+                 label = LxERP.t8("Files from projects") %]
+    [% END %]
+  </tbody>
+</table>
+
+
+<div id="email_form_print_options"></div>
+
+<div class="buttons">
+  [% L.button_tag(email_form.js_send_function, LxERP.t8("Send email")) %]
+  [% L.button_tag("\$('#send_email_dialog').dialog('close');", LxERP.t8("Abort"), class="button neutral") %]
+</div>
diff --git a/templates/design40_webpages/common/_ship_to_dialog.html b/templates/design40_webpages/common/_ship_to_dialog.html
new file mode 100644
index 000000000..e45d54732
--- /dev/null
+++ b/templates/design40_webpages/common/_ship_to_dialog.html
@@ -0,0 +1,172 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE JavaScript %]
+
+<script type="text/javascript">
+  $(function() {
+    kivi.SalesPurchase.shipto_addresses = [
+      { shiptoname:         "[% JavaScript.escape(vc_obj.name) %]",
+        shiptodepartment_1: "[% JavaScript.escape(vc_obj.department_1) %]",
+        shiptodepartment_2: "[% JavaScript.escape(vc_obj.department_2) %]",
+        shiptostreet:       "[% JavaScript.escape(vc_obj.street) %]",
+        shiptozipcode:      "[% JavaScript.escape(vc_obj.zipcode) %]",
+        shiptocity:         "[% JavaScript.escape(vc_obj.city) %]",
+        shiptocountry:      "[% JavaScript.escape(vc_obj.country) %]",
+        shiptogln:          "[% JavaScript.escape(vc_obj.gln) %]",
+        shiptocontact:      "[% JavaScript.escape(vc_obj.contact) %]",
+        shiptophone:        "[% JavaScript.escape(vc_obj.phone) %]",
+        shiptofax:          "[% JavaScript.escape(vc_obj.fax) %]",
+        shiptoemail:        "[% JavaScript.escape(vc_obj.email) %]"
+      [% FOREACH var = cvars %]
+        , "shiptocvar_[% JavaScript.escape(var.config.name) %]": ""
+      [% END %]
+      }
+
+    [% FOREACH shipto = vc_obj.shipto %]
+      ,
+      { shiptoname:         "[% JavaScript.escape(shipto.shiptoname) %]",
+        shiptodepartment_1: "[% JavaScript.escape(shipto.shiptodepartment_1) %]",
+        shiptodepartment_2: "[% JavaScript.escape(shipto.shiptodepartment_2) %]",
+        shiptostreet:       "[% JavaScript.escape(shipto.shiptostreet) %]",
+        shiptozipcode:      "[% JavaScript.escape(shipto.shiptozipcode) %]",
+        shiptocity:         "[% JavaScript.escape(shipto.shiptocity) %]",
+        shiptocountry:      "[% JavaScript.escape(shipto.shiptocountry) %]",
+        shiptogln:          "[% JavaScript.escape(shipto.shiptogln) %]",
+        shiptocontact:      "[% JavaScript.escape(shipto.shiptocontact) %]",
+        shiptophone:        "[% JavaScript.escape(shipto.shiptophone) %]",
+        shiptofax:          "[% JavaScript.escape(shipto.shiptofax) %]",
+        shiptoemail:        "[% JavaScript.escape(shipto.shiptoemail) %]"
+      [% FOREACH var = shipto.cvars_by_config %]
+        , "shiptocvar_[% JavaScript.escape(var.config.name) %]": "[% JavaScript.escape(var.value_as_text) %]"
+      [% END %]
+      }
+    [% END %]
+    ];
+  });
+</script>
+
+[% select_options = [ [ 0, LxERP.t8("Billing Address") ] ] ;
+    FOREACH shipto = vc_obj.shipto ;
+      tmpcity  = shipto.shiptozipcode _ ' ' _ shipto.shiptocity ;
+      tmptitle = [ shipto.shiptoname, shipto.shiptostreet, tmpcity ] ;
+      CALL select_options.import([ [ loop.count, tmptitle.grep('\S').join("; ") ] ]) ;
+    END ;
+   ''
+%]
+
+<div class="select-item control-panel">
+  [% LxERP.t8("Copy address from master data") %]:
+  [% L.select_tag("", select_options, id="shipto_to_copy", class="wi-normal") %]
+  [% L.button_tag("kivi.SalesPurchase.copy_shipto_address()", LxERP.t8("Copy"), type="button", class="button neutral") %]
+</div>
+
+[% IF cs_obj ;
+  fields = ['shiptoname', 'shiptodepartment_1', 'shiptodepartment_2',
+            'shiptostreet', 'shiptozipcode', 'shiptocity', 'shiptocountry',
+            'shiptogln', 'shiptocontact', 'shiptocp_gender', 'shiptophone',
+            'shiptofax', 'shiptoemail'] ;
+  FOREACH field = fields ;
+      $field = cs_obj.$field ;
+  END ;
+END ;
+'' %]
+
+
+<table class="tbl-horizontal checkered wi-moderate">
+  <thead>
+    <tr>
+      <td></td>
+      <th>[% LxERP.t8('Billing Address') %]</th>
+      <th>[% LxERP.t8('Shipping Address') %]</th>
+    </tr>
+  </thead>
+   <tbody>
+   <tr>
+    <th>[% IF vc == "customer" %][% LxERP.t8('Customer Number') %][% ELSE %][% LxERP.t8('Vendor Number') %][% END %]</th>
+    <td>[% IF vc == "customer" %][% HTML.escape(vc_obj.customernumber) %][% ELSE %][% HTML.escape(vc_obj.vendornumber) %][% END %]</td>
+    <td></td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Company Name') %]</th>
+    <td>[% HTML.escape(vc_obj.name) %]</td>
+    <td>[% L.input_tag("shiptoname", shiptoname, "size", "35", class="wi-normal") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Department') %]</th>
+    <td>[% HTML.escape(vc_obj.department_1) %]</td>
+    <td>[% L.input_tag("shiptodepartment_1", shiptodepartment_1, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Department') %] 2</th>
+    <td>[% HTML.escape(vc_obj.department_2) %]</td>
+    <td>[% L.input_tag("shiptodepartment_2", shiptodepartment_2, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Street') %]</th>
+    <td>[% HTML.escape(vc_obj.street) %]</td>
+    <td>[% L.input_tag("shiptostreet", shiptostreet, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Zipcode') %]</th>
+    <td>[% HTML.escape(vc_obj.zipcode) %]</td>
+    <td>[% L.input_tag("shiptozipcode", shiptozipcode, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('City') %]</th>
+    <td>[% HTML.escape(vc_obj.city) %]</td>
+    <td>[% L.input_tag("shiptocity", shiptocity, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Country') %]</th>
+    <td>[% HTML.escape(vc_obj.country) %]</td>
+    <td>[% L.input_tag("shiptocountry", shiptocountry, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('GLN') %]</th>
+    <td>[% HTML.escape(vc_obj.gln) %]</td>
+    <td>[% L.input_tag("shiptogln", shiptogln, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Contact') %]</th>
+    <td>[% HTML.escape(vc_obj.contact) %]</td>
+    <td>[% L.input_tag("shiptocontact", shiptocontact, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Gender') %]</th>
+    <td></td>
+    <td>
+     [% L.select_tag('shiptocp_gender', [ [ 'm', LxERP.t8('male') ], [ 'f', LxERP.t8('female') ] ], 'default' = shiptocp_gender) %]
+    </td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Phone') %]</th>
+    <td>[% HTML.escape(vc_obj.phone) %]</td>
+    <td>[% L.input_tag("shiptophone", shiptophone, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('Fax') %]</th>
+    <td>[% HTML.escape(vc_obj.fax) %]</td>
+    <td>[% L.input_tag("shiptofax", shiptofax, "size", "35") %]</td>
+   </tr>
+   <tr>
+    <th>[% LxERP.t8('E-mail') %]</th>
+    <td>[% HTML.escape(vc_obj.email) %]</td>
+    <td>[% L.input_tag("shiptoemail", shiptoemail, "size", "35") %]</td>
+   </tr>
+  [% FOREACH var = cvars %]
+   <tr>
+    <th>[% HTML.escape(var.config.description) %]</th>
+    <td></td>
+    <td>[% INCLUDE 'common/render_cvar_input.html' cvar_name_prefix='shiptocvar_' %]</td>
+   </tr>
+  [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+ [% L.button_tag("kivi.SalesPurchase.submit_custom_shipto('" _ id_selector _ "')", LxERP.t8("Apply")) %]
+ [% L.button_tag("kivi.SalesPurchase.reset_shipto_fields()", LxERP.t8("Reset"), class="neutral") %]
+ [% L.button_tag("kivi.SalesPurchase.clear_shipto_fields()", LxERP.t8("Clear fields"), class="neutral") %]
+ [% L.button_tag("\$('#shipto_dialog').dialog('close');", LxERP.t8("Abort"), class="neutral") %]
+</div>
diff --git a/templates/design40_webpages/common/flash.html b/templates/design40_webpages/common/flash.html
new file mode 100644
index 000000000..7f18d3b91
--- /dev/null
+++ b/templates/design40_webpages/common/flash.html
@@ -0,0 +1,31 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+
+[% BLOCK output %]
+<div id="flash_[% type %]" class="flash_message flash_message_[% type %]" [% IF !messages || !messages.size %] style="display: none" [% END %]>
+<div class="icon-container">
+  <a href="#" onclick='$("#flash_[% type %]_content").empty();$("#flash_[% type %]_detail").empty();$("#flash_[% type %]").hide()' class="icon-close"> &#10005;</a>
+  <span id="flash_[% type %]_disp" class="display" style="display: none">
+    <a href="#" onclick='$("#flash_detail_[% type %]").toggle();' class="button"> [% 'Details' | $T8 %] </a>
+  </span>
+</div>
+<div class="message-container">
+  <span class="flash_title">[% title %]:</span>
+  <div class="flash_notification">
+    <span id="flash_[% type %]_content" class="content">
+      [% FOREACH message = messages %] [% HTML.escape(message) %] [% UNLESS loop.last %]<br>[% END %] [% END %]
+    </span>
+    <div id="flash_detail_[% type %]" class="detail" style="display: none">
+      <span id="flash_[% type %]_detail"></span>
+      <a href="#" style="float:left" onclick='$("#flash_detail_[% type %]").hide()' class="icon-close">&#10005;</a>
+    </div>
+  </div><!-- /.flash_notification -->
+</div>
+</div>
+[% END #BLOCK output %]
+
+[% PROCESS output title=LxERP.t8('Error') type='error' messages = FLASH.error %]
+[% PROCESS output title=LxERP.t8('Warning') type='warning' messages = FLASH.warning %]
+[% PROCESS output title=LxERP.t8('Information') type='info' messages = FLASH.info %]
+[% PROCESS output title=LxERP.t8('Ok') type='ok' messages = FLASH.ok %]
diff --git a/templates/design40_webpages/common/paginate.html b/templates/design40_webpages/common/paginate.html
new file mode 100644
index 000000000..cf03585e8
--- /dev/null
+++ b/templates/design40_webpages/common/paginate.html
@@ -0,0 +1,47 @@
+[% USE T8 %]
+[% MACRO build_url BLOCK %]
+ [% IF base_url %]
+  [% base_url %]&page=[% page %]
+ [% ELSE %]
+  [% url_maker('page' => page) %]
+ [% END %]
+[% END %]
+
+[% IF pages.max > 1 %]
+<div class="paginate control-panel">
+[% IF pages.page > 1 %]
+  <a class="paginate-link paginate-prev" href="[% build_url(page=pages.page - 1) %]" title="[% 'prev' | $T8 %]"></a> [% ELSE %]<span class="paginate-prev"></span> [% END %]
+  [% FOR p = pages.common %]
+    [% NEXT UNLESS p.visible %]
+    [% IF p.active %]
+      <a class="paginate-link paginate-page" href="[% build_url(page=p.page) %]">[% p.page %]</a>
+    [% ELSE %]
+      <span class="paginate-page">[% p.page %]</span>
+    [% END %]
+  [% END %]
+  [% IF pages.page < pages.max %]
+    <a class="paginate-link paginate-next" href="[% build_url(page=pages.page + 1) %]" title="[% 'next' | $T8 %]"></a>
+  [% ELSE %]
+    <span class="paginate-next"></span>
+  [% END %]
+</div>
+[% END %]
+
+[% IF target %]
+<script type="text/javascript">
+  var target   = '[% target %]';
+  $(function(){
+    $('.paginate-link').click(function(event){
+      event.preventDefault();
+      var e = this;
+      var url = $(this).attr('href')
+      $.ajax({
+        url: url,
+        success: function(data){
+          $(target).html(data)
+        },
+      })
+    });
+  });
+</script>
+[% END %]
diff --git a/templates/design40_webpages/common/render_cvar_filter_input.html b/templates/design40_webpages/common/render_cvar_filter_input.html
new file mode 100644
index 000000000..864f0ad19
--- /dev/null
+++ b/templates/design40_webpages/common/render_cvar_filter_input.html
@@ -0,0 +1,40 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE P %]
+
+[% SET id__    = cvar_cfg.id
+        name__  = 'filter.cvar.' _ id__
+        value__ = filter.cvar.$id__ %]
+[% IF cvar_cfg.type == 'bool' %]
+ [% L.select_tag(name__, [ '', [ 1, LxERP.t8('Yes') ], [ 0, LxERP.t8('No') ] ], default=value__, class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'number' %]
+ [% L.select_tag(name__ _ '::', [ [ 'eq', '==' ], [ 'ne', '=/=' ], [ 'gt', '>' ], [ 'ge', '>=' ], [ 'lt', '<' ], [ 'le', '<=' ] ], default=filter.cvar.item(cvar_cfg.id _ '__')) %]
+ [% L.input_tag(name__, value__, class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'date' %]
+ [% L.select_tag(name__ _ '::', [ [ 'eq', '==' ], [ 'ne', '=/=' ], [ 'gt', '>' ], [ 'ge', '>=' ], [ 'lt', '<' ], [ 'le', '<=' ] ], default=filter.cvar.item(cvar_cfg.id _ '__')) %]
+ [% L.date_tag(name__, value__, class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'select' %]
+ [% options__ = [ '' ];
+    options__ = options__.import(cvar_cfg.processed_options);
+    L.select_tag(name__, options__, default=value__, class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'customer' %]
+ [% P.customer_vendor.picker(name__, value__, type='customer', class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'vendor' %]
+ [% P.customer_vendor.picker(name__, value__, type='vendor', class=cvar_class) %]
+
+[% ELSIF cvar_cfg.type == 'part' %]
+ [% P.part.picker(name__, value__, class=cvar_class) %]
+
+[% ELSE %]
+ [% SET value_name__ = id__ _ '_substr__ilike'
+        value__      = filter.cvar.$value_name__ %]
+ [% L.input_tag(name__ _ ':substr::ilike', value__, maxlength=cvar_cfg.maxlength, class=cvar_class) %]
+
+[% END %]
diff --git a/templates/design40_webpages/common/render_cvar_input.html b/templates/design40_webpages/common/render_cvar_input.html
new file mode 100644
index 000000000..4db7a1ccf
--- /dev/null
+++ b/templates/design40_webpages/common/render_cvar_input.html
@@ -0,0 +1,38 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+[% DEFAULT var_name = HTML.escape(cvar_name_prefix) _ HTML.escape(var.config.name) _ HTML.escape(cvar_name_postfix) %]
+[%- SET style_ = "width: " _ var.config.processed_options.WIDTH _ "px; height: " _ var.config.processed_options.HEIGHT _ "px" %]
+
+[% IF ( hide_non_editable && !var.config.is_flag('editable') ) %]
+  [% L.hidden_tag(var_name, var.value) %]
+[% ELSIF ( !var.is_valid ) %]
+  [% IF ( show_disabled_message ) %]
+    [% 'Element disabled' | $T8 %]
+  [% END %]
+[% ELSIF ( var.config .type == 'bool' ) %]
+  [% L.checkbox_tag(var_name, checked = var.value, for_submit = 1) %]
+[% ELSIF ( var.config .type == 'textfield' ) %]
+  [% L.textarea_tag(var_name, var.value, style=style_) %]
+[%- ELSIF ( var.config .type == 'htmlfield' ) %]
+  [% L.textarea_tag(var_name, L.restricted_html(var.value), class='texteditor', style=style_) %]
+[% ELSIF ( var.config.type == 'date' ) %]
+  [% L.date_tag(var_name, var.value, class='wi-date') %]
+[% ELSIF ( var.config.type == 'timestamp' ) %]
+  [% L.input_tag(var_name, var.value) %]
+[% ELSIF ( var.config.type == 'customer' ) %]
+  [% P.customer_vendor.picker(var_name, var.value, type='customer') %]
+[% ELSIF ( var.config.type == 'vendor' ) %]
+  [% P.customer_vendor.picker(var_name, var.value, type='vendor') %]
+[% ELSIF ( var.config.type == 'part' ) %]
+  [% P.part.picker(var_name, var.value, class='wi-wide') %]
+[% ELSIF ( var.config.type == 'select' ) %]
+  [% L.select_tag(var_name, var.config.processed_options, default = var.value, class='wi-wide') %]
+[% ELSIF ( var.config.type == 'number' ) %]
+  [% L.input_tag(var_name, LxERP.format_amount(var.value, -2), class='wi-small numeric') %]
+[% ELSE %]
+  [% L.input_tag(var_name, var.value, maxlength = var.config.processed_options.MAXLENGTH, class='wi-wide') %]
+[% END %]
diff --git a/templates/design40_webpages/common/search_history.html b/templates/design40_webpages/common/search_history.html
new file mode 100644
index 000000000..bf32206bd
--- /dev/null
+++ b/templates/design40_webpages/common/search_history.html
@@ -0,0 +1,143 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+<h1>[% 'history search engine' | $T8 %]</h1>
+
+<form method="post" action="am.pl" id="form">
+
+  <input type="hidden" name="action" value="show_am_history">
+
+  <div class="wrapper">
+
+    <table class="tbl-horizontal">
+      <tr>
+        <td>[% '<b>What</b> do you want to look for?' | $T8 %]:</td>
+        <td>
+          <select name="what2search" id="what2search">
+            <option name="Artikelnummer" value="Artikelnummer" id="Artikelnummer">[% 'Part Number' | $T8 %]</option>
+            <option name="Kundennummer" value="Kundennummer" id="Kundennummer">[% 'Customer Number' | $T8 %]</option>
+            <option name="Lieferantennummer" value="Lieferantennummer" id="Lieferantennummer">[% 'Vendor Number' | $T8 %]</option>
+            <option name="Projektnummer" value="Projektnummer" id="Projektnummer">[% 'Project Number' | $T8 %]</option>
+            <option name="Auftragsnummer" value="Auftragsnummer" id="Auftragsnummer">[% 'Order Number' | $T8 %]</option>
+            <option name="Angebotsnummer" value="Angebotsnummer" id="Angebotsnummer">[% 'Quotation Number' | $T8 %]</option>
+            <option name="Eingangsrechnungnummer" value="Eingangsrechnungnummer" id="Eingangsrechnungnummer">[% 'Incoming invoice number' | $T8 %]</option>
+            <option name="Ausgangsrechnungnummer" value="Ausgangsrechnungnummer" id="Ausgangsrechnungnummer">[% 'Sales invoice number' | $T8 %]</option>
+            <option name="Mahnungsnummer" value="Mahnungsnummer" id="Mahnungsnummer">[% 'Dunning number' | $T8 %]</option>
+            <option name="Buchungsnummer" value="Buchungsnummer" id="Buchungsnummer">[% 'ID' | $T8 %]</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>[% 'What <b>term</b> you are looking for?' | $T8 %]</td>
+        <td><input type="text" name="searchid" id="searchid" value="[% searchid  | html %]"></td>
+      </tr>
+      <tr>
+        <td>[% 'Do you want to <b>limit</b> your search?' | $T8 %]</td>
+        <td>
+          <table>
+            <tr>
+              <td>
+                <div id="initForm">
+                  <a id='show_extended_options' href='#'>[% 'Yes' | $T8 %]</a>
+                </div>
+                <div id="selectTable" style="display:none;">
+                  <select id='selectForm'>
+                  </select>
+                </div>
+                <div id="inputHead" style="display:none;"><b>[% 'You\'ve already chosen the following limitations:' | $T8 %]</b></div>
+                <div id="inputText" style="display:none;"></div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div id="selectEmployee" style="display:none;">
+                  <b>Mitarbeiter:</b>&nbsp; <input type="text" name="mitarbeiter" id="mitarbeiter">
+                </div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div id="selectDate" style="display:none;">
+                  <b>[% 'Period' | $T8 %]:&nbsp;</b>
+                  [% 'from (time)' | $T8 %]:&nbsp; [% L.date_tag('fromdate', todate) %]
+                  [% 'to (time)' | $T8 %]:&nbsp; [% L.date_tag('todate', todate) %]
+                </div>
+              </td>
+            </tr>
+          </table>
+          <input type="hidden" name="einschraenkungen" id="einschraenkungen" value="">
+        </td>
+      </tr>
+    </table>
+
+  </div><!-- /.wrapper -->
+
+</form>
+
+<script type="text/javascript">
+  <!--
+  var defaults = ['SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED',
+  'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED',
+  'QUEUED', 'CANCELED' ,'IMPORT', 'UNIMPORT' ];
+  var available;
+  var selected;
+  var translated = {
+    'SAVED'             : '[% 'SAVED' | $T8 %]',
+    'SCREENED'          : '[% 'SCREENED' | $T8 %]',
+    'DELETED'           : '[% 'DELETED' | $T8 %]',
+    'ADDED'             : '[% 'ADDED' | $T8 %]',
+    'PAYMENT POSTED'    : '[% 'PAYMENT POSTED' | $T8 %]',
+    'POSTED'            : '[% 'POSTED' | $T8 %]',
+    'POSTED AS NEW'     : '[% 'POSTED AS NEW' | $T8 %]',
+    'SAVED FOR DUNNING' : '[% 'SAVED FOR DUNNING' | $T8 %]',
+    'DUNNING STARTED'   : '[% 'DUNNING STARTED' | $T8 %]',
+    'PRINTED'           : '[% 'PRINTED' | $T8 %]',
+    'QUEUED'            : '[% 'QUEUED' | $T8 %]',
+    'CANCELED'          : '[% 'CANCELED' | $T8 %]',
+    'IMPORT'            : '[% 'IMPORT' | $T8 %]',
+    'UNIMPORT'          : '[% 'UNIMPORT' | $T8 %]',
+  };
+
+  function addForm(index) {
+    $('#inputHead').show();
+    selected.push(available.splice(index.index-1, 1));
+    $('#inputText').html($(selected).map(function(){ return translated[this]; }).get().join('<br>'));
+    $('#einschraenkungen').val(selected.join(','));
+
+    showForm();
+  }
+
+  function showForm() {
+    $('#selectForm').empty();
+    $('<option/>').appendTo('#selectForm');
+    $(available).map(function(){
+      $('<option/>').val(this).text(translated[this]).click(function(){ addForm(this) }).appendTo('#selectForm');
+    });
+  }
+
+  function resetAll() {
+    available = defaults.slice(0);
+    selected  = [];
+    initForm();
+
+    $('#inputForm').empty();
+    $('#inputText').html('');
+    $('#selectTable, #inputHead, #inputText, #selectEmployee, #selectDate').hide();
+    $('#initForm').show();
+  }
+
+  function initForm() {
+    showForm();
+
+    $('#selectTable, #inputText, #selectEmployee, #selectDate').show();
+    $('#initForm').hide();
+  }
+
+  $(function(){
+    resetAll();
+    $('#show_extended_options').click(initForm);
+    $('#reset_button').click(resetAll);
+  });
+  //-->
+</script>
diff --git a/templates/design40_webpages/common/select_warehouse_bin.html b/templates/design40_webpages/common/select_warehouse_bin.html
new file mode 100644
index 000000000..27fe5e73c
--- /dev/null
+++ b/templates/design40_webpages/common/select_warehouse_bin.html
@@ -0,0 +1,60 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE JavaScript %]
+
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript">
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [% FOREACH warehouse = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
+    [% USE BINS_it = Iterator(warehouse.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+    [% END %]
+  [% END %]
+
+  function warehouse_selected(warehouse_id, bin_id) {
+    var control = document.getElementById("bin_id");
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    var warehouse_index = 0;
+
+    for (i = 0; i < warehouses.length; i++)
+      if (warehouses[i]['id'] == warehouse_id) {
+        warehouse_index = i;
+        break;
+      }
+
+    var warehouse = warehouses[warehouse_index];
+    var bin_index = 0;
+
+    for (i = 0; i < warehouse['bins'].length; i++)
+      if (warehouse['bins'][i]['id'] == bin_id) {
+        bin_index = i;
+        break;
+      }
+
+    for (i = 0; i < warehouse['bins'].length; i++) {
+      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+    }
+
+
+    control.options[bin_index].selected = true;
+  }
+
+  $(function() {
+    warehouse_selected([% warehouse_id %], [% bin_id %]);
+  })
+</script>
\ No newline at end of file
diff --git a/templates/design40_webpages/common/show_history.html b/templates/design40_webpages/common/show_history.html
new file mode 100644
index 000000000..5f215e9e4
--- /dev/null
+++ b/templates/design40_webpages/common/show_history.html
@@ -0,0 +1,61 @@
+[% USE T8 %]
+[% USE HTML %]
+
+[% IF SUCCESS %]
+
+  [% BLOCK column_header %]
+    <span class="sort_symbol">
+      [% IF THIS_COLUMN && !THIS_COLUMN_DOWN %]
+       <a title="[% 'order' | $T8 %]" class="ascending active">&and;</a>
+      [% ELSE %]
+       <a href="[% callback %]&order=[% column %]--0" title="[% 'order' | $T8 %]" class="ascending">&and;</a>
+      [% END %]
+      [% IF THIS_COLUMN &&  THIS_COLUMN_DOWN %]
+       <a title="[% 'order' | $T8 %]" class="descending active">&or;</a>
+      [% ELSE %]
+       <a href="[% callback %]&order=[% column %]--1" title="[% 'order' | $T8 %]" class="descending">&or;</a>
+      [% END %]
+    </span>
+  [% END %]
+
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th><span class="sort">[% 'Time' | $T8 %]</span>[% PROCESS column_header THIS_COLUMN=ITIME THIS_COLUMN_DOWN=ITIMEBY column='h.itime' %]</th>
+        <th><span class="sort">[% 'Employee' | $T8 %]</span>[% PROCESS column_header THIS_COLUMN=NAME THIS_COLUMN_DOWN=NAMEBY column='emp.name' %]</th>
+        <th><span class="sort">[% 'Action' | $T8 %]</span></th>
+        <th><span class="sort">[% 'Addition' | $T8 %]</span></th>
+        <th><span class="sort">[% 'ID number' | $T8 %]</span>[% PROCESS column_header THIS_COLUMN=TRANS_ID THIS_COLUMN_DOWN=TRANS_IDBY column='h.trans_id' %]</th>
+        <th><span class="sort">[% 'Record number' | $T8 %]</span>[% PROCESS column_header THIS_COLUMN=SNUMBERS THIS_COLUMN_DOWN=SNUMBERSBY column='h.snumbers' %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH row = DATEN %]
+        <tr>
+          <td>[% HTML.escape(row.itime) %] </td>
+          <td> [% HTML.escape(row.name) %] </td>
+          <td> [% HTML.escape(row.addition) %] </td>
+          <td> [% HTML.escape(row.what_done) %] </td>
+          <td> [% HTML.escape(row.id) %] </td>
+          <td>
+            [% IF row.haslink %]
+              <a href="[% row.haslink %]" target="_blank">[% HTML.escape(row.snumbers) %]</a>
+            [% ELSE %]
+              [% HTML.escape(row.snumbers) %]
+            [% END %]
+          </td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+[% ELSE %]
+  <b>[% 'No search results found!' | $T8 %]</b><br>
+[% END %]
+
+<div class="buttons">
+  [% IF NONEWWINDOW %]
+    <input type="button" onclick="javascript:history.back(-1);" value="[% 'back' | $T8 %]">
+  [% ELSE %]
+    <input type="button" onclick="javascript:window.close();" value="[% 'close' | $T8 %]">
+  [% END %]
+</div>
diff --git a/templates/design40_webpages/common/show_vc_details.html b/templates/design40_webpages/common/show_vc_details.html
new file mode 100644
index 000000000..f8ac059a8
--- /dev/null
+++ b/templates/design40_webpages/common/show_vc_details.html
@@ -0,0 +1,382 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>
+[% IF is_customer %][% 'Customer details' | $T8 %]
+[% ELSE           %][% 'Vendor details'   | $T8 %]
+[% END %] &quot;[% HTML.escape(name) %]&quot;
+</h1>
+
+[% IF SHIPTO.size || CONTACTS.size %]
+  [% BLOCK jump_block %]
+      <table class="select-item control-panel float-cells-table jump-to right">
+        <caption>[% 'Jump to' | $T8 %]</caption>
+        <tbody>
+          <tr><td colspan="2"><a href="#billing">[% 'Billing Address' | $T8 %]</a></td></tr>
+          [% FOREACH additional_billing_addresses = ADDITIONAL_BILLING_ADDRESSES %]
+            <tr>
+              <td><a href="#additional_billing_address[% loop.count %]">[% 'Additional Billing Address' | $T8 %]</a></td>
+              <td><a href="#additional_billing_address[% loop.count %]">&quot;[% HTML.escape(additional_billing_addresses.name) %]&quot;</a></td>
+            </tr>
+          [% END %]
+          [% FOREACH shipto = SHIPTO %]
+            <tr>
+              <td><a href="#shipping[% loop.count %]"> [% 'Shipping Address' | $T8 %]</a></td>
+              <td><a href="#shipping[% loop.count %]">&quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a></td>
+            </tr>
+          [% END %]
+          [% FOREACH contact = CONTACTS %]
+            <tr>
+              <td><a href="#contact[% loop.count %]">[% 'Contact Person' | $T8 %] </a></td>
+              <td><a href="#contact[% loop.count %]">&quot;[% HTML.escape(contact.cp_name) %]&quot;</a></td>
+            </tr>
+          [% END %]
+        </tbody>
+      </table>
+  [% END # BLOCK jump_block %]
+[% END %]
+
+
+<div class="wrapper">
+
+[% INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
+
+<table class="tbl-horizontal checkered">
+  <caption><a name="billing">[% 'Billing Address' | $T8 %]</a></caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      [% IF is_customer %]
+      <th>[% 'Customer Number' | $T8 %]</th>
+      <td>[% HTML.escape(customernumber) %]</td>
+      [% ELSE %]
+      <th>[% 'Vendor Number' | $T8 %]</th>
+      <td>[% HTML.escape(vendornumber) %]</td>
+      [% END %]
+    </tr>
+    <tr>
+      <th>[% 'Company Name' | $T8 %]</th>
+      <td>[% HTML.escape(name) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Street' | $T8 %]</th>
+      <td>[% HTML.escape(street) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Zip, City' | $T8 %]</th>
+      <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Country' | $T8 %]</th>
+      <td>[% HTML.escape(country) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'GLN' | $T8 %]</th>
+      <td>[% HTML.escape(gln) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone' | $T8 %]</th>
+      <td>[% HTML.escape(phone) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% HTML.escape(fax) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% HTML.escape(email) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Homepage' | $T8 %]</th>
+      <td>[% HTML.escape(homepage) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Credit Limit' | $T8 %]</th>
+      <td>[% HTML.escape(creditlimit) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Discount' | $T8 %]</th>
+      <td>[% HTML.escape(discount_as_percent) %]%</td>
+    </tr>
+    [% IF is_customer %]
+    <tr>
+      <th>[% 'Pricegroup' | $T8 %]</th>
+      <td>[% HTML.escape(pricegroup) %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Payment Terms' | $T8 %]</th>
+      <td>[% HTML.escape(payment_terms) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Terms' | $T8 %]</th>
+      <td>[% HTML.escape(delivery_terms) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Tax Number' | $T8 %]</th>
+      <td>[% HTML.escape(taxnumber) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'USt-IdNr.' | $T8 %]</th>
+      <td>[% HTML.escape(ustid) %]</td>
+    </tr>
+    [% IF is_customer %]
+    <tr>
+      <th>[% 'KNr. beim Kunden' | $T8 %]</th>
+      <td>[% HTML.escape(c_vendor_id) %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Account Number' | $T8 %]</th>
+      <td>[% HTML.escape(account_number) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Bank Code' | $T8 %]</th>
+      <td>[% HTML.escape(bank_code) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Bank' | $T8 %]</th>
+      <td>[% HTML.escape(bank) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <td>[% HTML.escape(iban) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'BIC' | $T8 %]</th>
+      <td>[% HTML.escape(bic) %]</td>
+    </tr>
+    <tr>
+      <th>[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
+      <td>[% HTML.escape(business) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>[% HTML.escape(language) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td>[% HTML.escape(notes) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+
+[% FOREACH row = ADDITIONAL_BILLING_ADDRESSES %]
+<div class="wrapper">
+
+[% INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
+
+<table class="tbl-horizontal checkered">
+  <caption><a id="additional_billing_address[% loop.count %]">[% 'Additional Billing Address' | $T8 %] &quot;[% HTML.escape(row.name) %]&quot;</a></caption>
+  <tbody>
+    <tr>
+      <th>[% 'Default Billing Address' | $T8 %]</th>
+      <td>[% row.default_address ? LxERP.t8('yes') : LxERP.t8('no') %]</td>
+   </tr>
+   <tr>
+     <th>[% 'Name' | $T8 %]</th>
+     <td>[% HTML.escape(row.name) %]</td>
+   </tr>
+   <tr>
+     <th>[% 'Department' | $T8 %]</th>
+     <td>
+       [% HTML.escape(row.department_1) %]
+       [% IF row.department_2 %]
+         [% IF row.department_1 %]; [% END %]
+         [% HTML.escape(row.department_2) %]
+       [% END %]
+     </td>
+   </tr>
+   <tr>
+     <th>[% 'Street' | $T8 %]</th>
+     <td>[% HTML.escape(row.street) %]</td>
+   </tr>
+    <tr>
+      <th>[% 'Zip, City' | $T8 %]</th>
+      <td>[% HTML.escape(row.zipcode) %] [% HTML.escape(row.city) %]</td>
+    </tr>
+   <tr>
+     <th>[% 'Country' | $T8 %]</th>
+     <td>[% HTML.escape(row.country) %]</td>
+   </tr>
+    <tr>
+      <th>[% 'GLN' | $T8 %]</th>
+      <td>[% HTML.escape(row.gln) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Contact' | $T8 %]</th>
+      <td>[% HTML.escape(row.contact) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone' | $T8 %]</th>
+      <td>[% HTML.escape(row.phone) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% HTML.escape(row.fax) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% HTML.escape(row.email) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+[% END %]
+
+
+[% FOREACH row = SHIPTO %]
+<div class="wrapper">
+
+[% INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
+
+<table class="tbl-horizontal checkered">
+  <caption><a id="shipping[% loop.count %]">[% 'Shipping Address' | $T8 %] &quot;[% HTML.escape(row.shiptoname) %]&quot;</a></caption>
+  <tbody>
+    <tr>
+      <th>[% 'Company Name' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptoname) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>
+        [% HTML.escape(row.shiptodepartment_1) %]
+        [% IF row.shiptodepartment_2 %]
+          [% IF row.shiptodepartment_1 %]; [% END %]
+          [% HTML.escape(row.shiptodepartment_2) %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Street' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptostreet) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Zip, City' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Country' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptocountry) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'GLN' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptogln) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptocontact) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptophone) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptofax) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% HTML.escape(row.shiptoemail) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+[% END %]
+
+
+[% FOREACH row = CONTACTS %]
+<div class="wrapper">
+
+[% INCLUDE jump_block CONTACTS = CONTACTS, SHIPTO = SHIPTO, ADDITIONAL_BILLING_ADDRESSES = ADDITIONAL_BILLING_ADDRESSES %]
+
+<table class="tbl-horizontal checkered">
+  <caption><a id="contact[% loop.count %]">[% 'Contact Person' | $T8 %] &quot;[% HTML.escape(row.cp_name) %]&quot;</a></caption>
+  <tbody>
+    <tr>
+      <th>[% 'Greeting' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_greeting) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Title' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_title) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Given Name' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_givenname) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Name' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_name) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_abteilung) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone1' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_phone1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone2' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_phone2) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_fax) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Mobile1' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_mobile1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Mobile2' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_mobile2) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Sat. Phone' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_satphone) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Sat. Fax' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_satfax) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_project) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_email) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Private Phone' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_privatphone) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Private E-mail' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_privatemail) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Birthday' | $T8 %]</th>
+      <td>[% HTML.escape(row.cp_birthday) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+[% END %]
diff --git a/templates/design40_webpages/common/toggle-buttons-for-wrapper.html b/templates/design40_webpages/common/toggle-buttons-for-wrapper.html
new file mode 100644
index 000000000..2b18027cf
--- /dev/null
+++ b/templates/design40_webpages/common/toggle-buttons-for-wrapper.html
@@ -0,0 +1,39 @@
+<!-- 
+  Include this JS and the HTML toggle buttons right first into a .wrapper container 
+  for minimizing / maximizing the surrounded .wrapper-container 
+  First Symbols: &or; & &lt;
+-->
+<div class="toggles" id="toggles">
+  <script type="text/javascript">
+    var toggles_id = "#toggles" ; // container of the toggle buttons
+    var wrapper = new Object() ;
+    $( window ).on( "load", function() {
+      if( $(toggles_id).parent().attr('class') == "wrapper" ) {
+        wrapper = $(toggles_id).parent() ; // closest surrounding wrapper to toggle
+        $(wrapper).addClass("toggled");
+      }
+      if( wrapper != "") {
+        var hi = -1; //height of the wrapper
+        $(wrapper).ready(function(){
+          if( hi <= -1 ) hi = $(wrapper).height(); // height of the wrapper
+          
+        }); 
+        // Toggle to minimum
+        $("#toggler-1").click(function(){
+          $(wrapper).animate({height:"30px"},200).addClass("bordered"); 
+          $(this).toggle(); 
+          $("#toggler-2").toggle();
+        });
+        // Toggle back to maximum
+        $("#toggler-2").click(function(){
+          $(wrapper).animate({height:hi},200).removeClass("bordered"); 
+          $(this).toggle();    
+          $("#toggler-1").toggle(); 
+        });
+      }
+    });  
+  </script>
+  <a class="symbol toggle min" id="toggler-1" href="#" style="display:visible;"></a>
+  <a class="symbol toggle max" id="toggler-2" href="#" style="display:none;"></a>
+
+</div><!-- /.toggles /#toggles -->
diff --git a/templates/design40_webpages/common/toggle_panel.html b/templates/design40_webpages/common/toggle_panel.html
new file mode 100644
index 000000000..6118d4d99
--- /dev/null
+++ b/templates/design40_webpages/common/toggle_panel.html
@@ -0,0 +1,82 @@
+[% USE T8 %]
+[% USE LxERP %]
+[%
+  # Use this include for flip open or shut a filter controlpanel/block.
+  # The source file must contain the BLOCK "filter_toggle_panel"
+
+  # CUSTOM BLOCK NAME
+  # If you want to use MORE THAN ONE filter controlpanel/block
+  # use the variable "block_name" with one of the block names
+  # before the include statement
+
+  # OPEN / CLOSED STATUS
+  # If you want to have the filter block flipped out (open)
+  # then use the optional statement ( SET display_status = 'open' )
+  # before the include statement
+
+  # MINIMAL STATEMENT
+  # At least a BLOCK like the default 'filter_toggle_panel'
+  # and the INCLUDE-Statement are required
+
+  # BLOCK filter_toggle_panel ;          # mandatory, with variable block_name another block name is possible
+  #   <myhtml></myhtml>
+  # END ;                                # END of block filter_toggle_panel
+  # INCLUDE 'common/toggle_panel.html'   #
+  # block_name     = 'this_is_block_2'   # optional / one of all the filter panels, default is 'filter_toggle_panel'
+  # toggle_class   = 'panel_2'           # optional / one of all the button/panel classes, default is 'toggle_panel'
+  # display_status = 'open'              # optional / default/empty is 'closed'
+  # button_closed  = 'Show Filter'       # optional / Term in closed button / default/empty is 'Show Filter' (historical)
+  # button_open    = 'Hide Filter'       # optional / Term in opened button / default/empty is 'Hide Filter' (historical)
+%]
+
+[%
+  IF display_status && display_status == 'open' ;
+    SET display_off = 'style="display:none;"' ;
+    SET display_on  = 'style="display:block;"' ;
+  ELSIF ( display_status && ( display_status == 'closed' || display_status == '' ) ) || !display_status  ;
+    SET display_off = 'style="display:block;"' ;
+    SET display_on  = 'style="display:none;"' ;
+  END ;
+  IF !button_closed || button_closed == '' ;
+    SET button_closed = LxERP.t8('Show Filter') ; # Default Term Filter is historical
+  END ;
+  IF !button_open || button_open == '' ;
+    SET button_open   = LxERP.t8('Hide Filter') ; # Default Term Filter is historical
+  END ;
+  IF !toggle_class || toggle_class == '';
+    toggle_class = 'toggle_panel' ; # this is default for one toggle panel per page
+  END ;
+%]
+
+<div class="toggle_panel control-panel [% toggle_class %]" [% display_off %]>
+  <a href="#" onClick='javascript:$(".[% toggle_class %]").toggle()' class="button toggle off neutral">[% button_closed %]</a>
+  [% IF SELF.filter_summary %]([% LxERP.t8("Current filter") %]: [% SELF.filter_summary | html %])[% END %]
+</div>
+
+<div class="toggle_panel control-panel [% toggle_class %]" [% display_on %]>
+  <a href="#" onClick='javascript:$(".[% toggle_class %]").toggle()' class="button toggle on neutral with-panel">[% button_open %]</a>
+  <div class="toggle_panel_block">
+     [% IF block_name && block_name != ''   %]
+      [%
+        #Dumper.dump_html(block_name) ;
+        IF block_name == 'panel_1' ;
+          PROCESS panel_1 ;
+        ELSIF block_name == 'panel_2' ;
+          PROCESS panel_2 ;
+        ELSIF block_name == 'panel_3' ;
+          PROCESS panel_3 ;
+        END
+      %]
+    [% ELSE %]
+      [% PROCESS filter_toggle_panel %]
+    [% END %]
+
+  </div>
+</div><!-- /.filter_toggle -->
+[%
+  # Reset in case of more than one toggle object
+  SET display_status = '' ; SET display_off = '' ; SET display_on = '' ;
+  SET block_name     = '' ;
+  SET button_closed  = '' ;
+  SET button_open    = '' ;
+%]
diff --git a/templates/design40_webpages/cp/form_footer.html b/templates/design40_webpages/cp/form_footer.html
new file mode 100644
index 000000000..106e7df13
--- /dev/null
+++ b/templates/design40_webpages/cp/form_footer.html
@@ -0,0 +1,5 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<input type=hidden name=rowcount value="[% rowcount | html %]">
+</form>
diff --git a/templates/design40_webpages/cp/form_header.html b/templates/design40_webpages/cp/form_header.html
new file mode 100644
index 000000000..1270e418b
--- /dev/null
+++ b/templates/design40_webpages/cp/form_header.html
@@ -0,0 +1,110 @@
+[% USE L %]
+[% USE HTML %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE P %]
+
+<h1>[% is_receipt ? LxERP.t8('Receipt') : LxERP.t8('Payment') %]</h1>
+
+<form method="post" action="cp.pl" id="form">
+
+[% SET vc_id = vc _ '_id'
+       style = "width: 250px" %]
+[% L.hidden_tag('defaultcurrency', defaultcurrency) %]
+[% L.hidden_tag('closedto', closedto) %]
+[% L.hidden_tag('vc', vc) %]
+[% L.hidden_tag('type', type) %]
+[% L.hidden_tag('formname', type) %]
+[% L.hidden_tag('queued', queued) %]
+[% L.hidden_tag('arap', arap) %]
+[% L.hidden_tag('ARAP', ARAP) %]
+[% L.hidden_tag('openinvoices', openinvoices) %]
+
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-small"><col class="wi-verywide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% is_customer ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]</th>
+      <td>
+        [% P.customer_vendor.picker(vc_id, $vc_id, type=vc, class="initial_focus wi-wide") %]
+        [% P.hidden_tag("previous_" _ vc_id, $vc_id) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Address' | $T8 %]</th>
+      <td>
+        [% IF street || zipcode || city || country %]
+          [% IF street %]<span class="data wi-wide below">[% street | html %]</span>[% END %]
+          [% L.hidden_tag('street', street) %]
+          [% IF zipcode || city %]<span class="data wi-wide below">[% zipcode | html %] [% city | html %]</span>[% END %]
+          [% L.hidden_tag('zipcode', zipcode) %][% L.hidden_tag('city', city) %]
+          [% IF country %]<span class="data wi-wide below">[% country | html %]</span>[% END %]
+          [% L.hidden_tag('country', country) %]
+        [% ELSE %]
+          <span class="data wi-wide">&nbsp;</span>
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Memo' | $T8 %]</th>
+      <td><input type="text" name="memo" class="wi-wide" value="[% memo | html %]"></td>
+    </tr>
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td><input type="text" name="invnumber" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <td>
+        <select name="account" class="wi-verywide">[% selectaccount %]</select>
+        <input type=hidden name="selectaccount" value="[% selectaccount | html %]">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('datepaid', datepaid) %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Currency' | $T8 %]</th>
+      <td>
+        <select name="currency" class="wi-small">[% selectcurrency %]</select>
+        <input type=hidden name="selectcurrency" value="[% selectcurrency | html %]">
+        <input type=hidden name="oldcurrency" value="[% oldcurrency | html %]">
+      </td>
+    </tr>
+    [% IF currency != defaultcurrency %]
+      <tr>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        [% IF forex %]
+          <td><span class="plain-data wi-small">[% LxERP.format_amount(exchangerate) %]</span>[% L.hidden_tag('exchangerate', LxERP.format_amount(exchangerate)) %]</td>
+        [% ELSE %]
+          <td>[% L.input_tag('exchangerate', LxERP.format_amount(exchangerate), class='wi-small') %]</td>
+        [% END %]
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Source' | $T8 %]</th>
+      <td><input type="text" name="source" value="[% source | html %]" class="wi-small">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Amount' | $T8 %]</th>
+      <td><span class="data wi-small numeric">[% LxERP.format_amount(amount, 2) %]</span></td>
+    </tr>
+  </tbody>
+</table>
+
+[% IF openinvoices_other_currencies %]
+  <input type="hidden" name="openinvoices_other_currencies" value="[% openinvoices_other_currencies | html %]">
+  <p class="message message_info"><b>[% 'Note' | $T8 %]:</b><br>
+    [% IF is_customer %]
+      [% LxERP.t8('There are #1 more open invoices for this customer with other currencies.', openinvoices_other_currencies) %]
+    [% ELSE %]
+      [% LxERP.t8('There are #1 more open invoices from this vendor with other currencies.',  openinvoices_other_currencies) %]
+    [% END %]
+  </p>
+[% END %]
+</div>
diff --git a/templates/design40_webpages/cp/invoices.html b/templates/design40_webpages/cp/invoices.html
new file mode 100644
index 000000000..617d70384
--- /dev/null
+++ b/templates/design40_webpages/cp/invoices.html
@@ -0,0 +1,46 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<div class="wrapper">
+<table class="tbl-list wi-moderate">
+  <caption>[% 'Invoices' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Row number' | $T8 %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Due' | $T8 %]</th>
+      <th>[% 'Select' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = invoices %]
+    <tr>
+      <td>[% loop.count %]</td>
+      <td>[% row.invnumber | html %][% L.hidden_tag('invnumber_' _ loop.count, row.invnumber); L.hidden_tag('id_' _ loop.count, row.id) %]</td>
+      <td>[% row.transdate | html %][% L.hidden_tag('transdate_' _ loop.count, row.transdate) %]</td>
+      <td class="numeric">[% LxERP.format_amount(row.amount, 2) %][% L.hidden_tag('amount_' _ loop.count, LxERP.format_amount(row.amount, 2)) %]</td>
+      <td class="numeric">[% LxERP.format_amount(row.due, 2) %][% L.hidden_tag('due_' _ loop.count, LxERP.format_amount(row.due, 2)) %]</td>
+      <td>[% L.checkbox_tag('checked_' _ loop.count, checked=row.checked) %]</td>
+      <td class="numeric">[% L.input_tag('paid_' _ loop.count, LxERP.format_amount(row.paid, 2), size=10) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td class="numeric">[% LxERP.format_amount(totals.amount, 2) %]</td>
+      <td class="numeric">[% LxERP.format_amount(totals.due, 2) %]</td>
+      <td></td>
+      <td class="numeric">[% LxERP.format_amount(totals.paid, 2) %]</td>
+    </tr>
+  </tfoot>
+</table>
+</div>
+
diff --git a/templates/design40_webpages/csv_import/_deferred_report.html b/templates/design40_webpages/csv_import/_deferred_report.html
new file mode 100644
index 000000000..2594718c0
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_deferred_report.html
@@ -0,0 +1,27 @@
+[% INCLUDE 'common/flash.html' %]
+<div id='csv_import_report'></div>
+
+<script type='text/javascript'>
+  function get_report(target, source, data){
+    $.ajax({
+      url:        source,
+      success:    function (rsp) {
+        $(target).html(rsp);
+        $(target).find('.paginate').find('a').click(function(event){ redirect_event(event, target) });
+      },
+      data:       data,
+    });
+  };
+
+  function redirect_event(event, target){
+    event.preventDefault();
+    get_report(target, event.target + '', {});
+  }
+
+  $(document).ready(function(){
+    [%- IF SELF.background_job.data_as_hash.report_id %]
+      get_report('#csv_import_report', 'controller.pl', { action: 'CsvImport/report', 'no_layout': 1, 'id': [% SELF.background_job.data_as_hash.report_id %] });
+    [%- END %]
+  });
+
+</script>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_deferred_results.html b/templates/design40_webpages/csv_import/_deferred_results.html
new file mode 100644
index 000000000..add73710c
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_deferred_results.html
@@ -0,0 +1,32 @@
+[% USE L %]
+[% USE T8 %]
+[% USE HTML %]
+
+<h2>[% 'Import Status' | $T8 %]</h2>
+
+[% INCLUDE 'common/flash.html' %]
+[% UNLESS SELF.background_job.data_as_hash.errors %]
+<div id='progress_description'></div>
+<div id='progressbar'></div>
+[% END  %]
+<script type='text/javascript'>
+  function reload_results () {
+    $.ajax({
+      url: 'controller.pl',
+      data: {
+        action: 'CsvImport/result',
+        'profile.type': '[% SELF.profile.type %]',
+        job: '[% SELF.background_job.id %]'
+      },
+      success: function(data) { $('#results').html(data) },
+      error: function(e) { alert(e) },
+    });
+  }
+[%- UNLESS SELF.background_job.data_as_hash.errors %]
+  $(document).ready(function(){
+    $('#progress_description').html('[% SELF.status_text | html %]');
+    $('#progressbar').progressbar({ value: [% SELF.background_job.data_as_hash.progress.progress * 1 %] });
+    window.setTimeout(reload_results, 500);
+  })
+[%- END %]
+</script>
diff --git a/templates/design40_webpages/csv_import/_form_aptransactions.html b/templates/design40_webpages/csv_import/_form_aptransactions.html
new file mode 100644
index 000000000..47f16cbf2
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_aptransactions.html
@@ -0,0 +1,23 @@
+[% USE LxERP %]
+[% USE L %]
+<tr>
+ <th align="right">[%- LxERP.t8('AP Transaction/AccTrans Item row names') %]:</th>
+ <td colspan="10">
+  [% L.input_tag('settings.ap_column', SELF.profile.get('ap_column'), size => "10") %]
+  [% L.input_tag('settings.transaction_column',  SELF.profile.get('transaction_column'),  size => "20") %]
+ </td>
+
+<tr>
+ <th align="right">[%- LxERP.t8('Maximal amount difference') %]:</th>
+ <td colspan="10">
+  [% L.input_tag('settings.max_amount_diff', LxERP.format_amount(SELF.profile.get('max_amount_diff')), size => "5") %]
+ </td>
+</tr>
+<tr>
+ <th align="right">[%- LxERP.t8('Error handling') %]:</th>
+ <td colspan="10">
+  [% L.checkbox_tag('settings.dont_save_anything_on_errors',
+                    label   => LxERP.t8('Do not save any datasets on errors'),
+                    checked => SELF.profile.get('dont_save_anything_on_errors')) %]
+ </td>
+</tr>
diff --git a/templates/design40_webpages/csv_import/_form_artransactions.html b/templates/design40_webpages/csv_import/_form_artransactions.html
new file mode 100644
index 000000000..17cb174db
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_artransactions.html
@@ -0,0 +1,19 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8('AR Transaction/AccTrans Item row names') %]:</th>
+  <td>
+    [% L.input_tag('settings.ar_column', SELF.profile.get('ar_column'), class='wi-normal') %]
+    [% L.input_tag('settings.transaction_column', SELF.profile.get('transaction_column'),
+                    class='wi-normal') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Maximal amount difference') %]:</th>
+  <td>
+    [% L.input_tag('settings.max_amount_diff',
+                    LxERP.format_amount(SELF.profile.get('max_amount_diff')),
+                    class='wi-verysmall') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_banktransactions.html b/templates/design40_webpages/csv_import/_form_banktransactions.html
new file mode 100644
index 000000000..41157073c
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_banktransactions.html
@@ -0,0 +1,13 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8("Existing bank transactions") %]:</th>
+  <td>
+    [% opts = [
+      [ 'skip', LxERP.t8('Skip entry') ],
+      [ 'insert_new', LxERP.t8('Insert new') ] ] %]
+    [% L.select_tag('settings.update_policy', opts,
+                    default = SELF.profile.get('update_policy'), class='wi-normal') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_contacts.html b/templates/design40_webpages/csv_import/_form_contacts.html
new file mode 100644
index 000000000..c9e1d41e7
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_contacts.html
@@ -0,0 +1,15 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8("Existing contacts (with column 'cp_id')") %]:</th>
+  <td>
+    [% opts = [
+      [ 'update_existing', LxERP.t8('Update properties of existing entries') ],
+      [ 'insert_new', LxERP.t8('Insert with new database ID') ],
+      [ 'skip', LxERP.t8('Skip entry') ] ] %]
+    [% L.select_tag('settings.update_policy',
+                    opts, default = SELF.profile.get('update_policy'),
+                    class='wi-wide') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_customers_vendors.html b/templates/design40_webpages/csv_import/_form_customers_vendors.html
new file mode 100644
index 000000000..e072fbdf0
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_customers_vendors.html
@@ -0,0 +1,32 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8('Target table') %]:</th>
+  <td>
+    [% opts = [
+      [ 'customer', LxERP.t8('Customers') ],
+      [ 'vendor', LxERP.t8('Vendors') ] ] %]
+    [% L.select_tag('settings.table', opts, default = SELF.profile.get('table'),
+                    class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Existing customers/vendors with same customer/vendor number') %]:</th>
+  <td>
+    [% opts = [
+      [ 'update_existing', LxERP.t8('Update properties of existing entries') ],
+      [ 'insert_new', LxERP.t8('Insert with new customer/vendor number') ],
+      [ 'skip', LxERP.t8('Skip entry') ] ] %]
+    [% L.select_tag('settings.update_policy', opts,
+                    default = SELF.profile.get('update_policy'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Default taxzone') %]:</th>
+  <td>
+    [% L.select_tag('settings.default_taxzone', SELF.all_taxzones,
+                    default = SELF.profile.get('default_taxzone'),
+                    title_key = 'description', class='wi-wide') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_delivery_orders.html b/templates/design40_webpages/csv_import/_form_delivery_orders.html
new file mode 100644
index 000000000..aa4380814
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_delivery_orders.html
@@ -0,0 +1,19 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8('Order/Item/Stock row name') %]:</th>
+  <td>
+    [% L.input_tag('settings.order_column', SELF.profile.get('order_column'), class='wi-normal') %]
+    [% L.input_tag('settings.item_column',  SELF.profile.get('item_column'), class='wi-normal') %]
+    [% L.input_tag('settings.stock_column', SELF.profile.get('stock_column'), class='wi-normal') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Error handling') %]:</th>
+  <td>
+    [% L.checkbox_tag('settings.ignore_faulty_positions',
+                      label   => LxERP.t8('Ignore faulty positions'),
+                      checked => SELF.profile.get('ignore_faulty_positions')) %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_inventories.html b/templates/design40_webpages/csv_import/_form_inventories.html
new file mode 100644
index 000000000..77327f8c3
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_inventories.html
@@ -0,0 +1,38 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8('Warehouse') %]/[% LxERP.t8('Bin') %]:</th>
+  <td>
+    [% L.input_tag('settings.warehouse', SELF.profile.get('warehouse'), class='wi-wide') %]
+    <br>
+    [% opts = [
+      [ 'never', LxERP.t8('Do not set this warehouse') ],
+      [ 'missing', LxERP.t8('Apply to transfers without warehouse') ],
+      [ 'all', LxERP.t8('Apply to all transfers') ] ] %]
+    [% L.select_tag('settings.apply_warehouse', opts,
+                    default = SELF.profile.get('apply_warehouse'), class='wi-wide') %]
+    <br>
+    [% L.input_tag('settings.bin', SELF.profile.get('bin'), class='wi-wide') %]
+    <br>
+    [% opts = [
+      [ 'never', LxERP.t8('Do not set this bin') ],
+      [ 'missing', LxERP.t8('Apply to transfers without bin') ],
+      [ 'all', LxERP.t8('Apply to all transfers') ] ] %]
+    [% L.select_tag('settings.apply_bin', opts,
+                    default = SELF.profile.get('apply_bin'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Comment') %]:</th>
+  <td>
+    [% L.input_tag('settings.comment', SELF.profile.get('comment'), class='wi-wide') %]
+    <br>
+    [% opts = [
+      [ 'never', LxERP.t8('Do not set this comment') ],
+      [ 'missing', LxERP.t8('Apply to transfers without comment') ],
+      [ 'all', LxERP.t8('Apply to all transfers') ] ] %]
+    [% L.select_tag('settings.apply_comment', opts,
+                    default = SELF.profile.get('apply_comment'), class='wi-wide') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_orders.html b/templates/design40_webpages/csv_import/_form_orders.html
new file mode 100644
index 000000000..e624eecc0
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_orders.html
@@ -0,0 +1,18 @@
+[% USE LxERP %]
+[% USE L %]
+
+<tr>
+  <th>[% LxERP.t8('Order/Item row name') %]:</th>
+  <td>
+    [% L.input_tag('settings.order_column', SELF.profile.get('order_column'), class='wi-normal') %]
+    [% L.input_tag('settings.item_column', SELF.profile.get('item_column'), class='wi-normal') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Maximal amount difference') %]:</th>
+  <td>
+    [% L.input_tag('settings.max_amount_diff',
+                    LxERP.format_amount(SELF.profile.get('max_amount_diff')),
+                    class='wi-verysmall') %]
+  </td>
+</tr>
\ No newline at end of file
diff --git a/templates/design40_webpages/csv_import/_form_parts.html b/templates/design40_webpages/csv_import/_form_parts.html
new file mode 100644
index 000000000..0f045bd42
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_form_parts.html
@@ -0,0 +1,89 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<tr>
+  <th>[% LxERP.t8('Parts with existing part numbers') %]:</th>
+  <td>
+    [% opts = [
+      [ 'update_parts', LxERP.t8('Update properties of existing entries') ],
+      [ 'update_parts_sn', LxERP.t8('Update properties of existing entries / skip non-existent') ],
+      [ 'update_prices', LxERP.t8('Update prices of existing entries') ],
+      [ 'update_prices_sn', LxERP.t8('Update prices of existing entries / skip non-existent') ],
+      [ 'insert_new', LxERP.t8('Insert with new part number') ],
+      [ 'skip', LxERP.t8('Skip entry') ] ] %]
+    [% L.select_tag('settings.article_number_policy', opts,
+                    default = SELF.profile.get('article_number_policy'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Sellprice significant places') %]:</th>
+  <td>
+    [% L.select_tag('settings.sellprice_places', [ 0, 1, 2, 3, 4, 5 ],
+                    default = SELF.profile.get('sellprice_places'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Sellprice adjustment') %]:</th>
+  <td>
+    [% L.input_tag('settings.sellprice_adjustment',
+                    LxERP.format_amount(SELF.profile.get('sellprice_adjustment')),
+                    size => "5") %]
+    [% opts = [
+      [ 'percent', LxERP.t8('percental') ],
+      [ 'absolute', LxERP.t8('absolute') ] ] %]
+    [% L.select_tag('settings.sellprice_adjustment_type', opts,
+                    default = SELF.profile.get('sellprice_adjustment_type')) %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Mark as shop article if column missing') %]:</th>
+  <td>
+    [% opts = [ [ '1', LxERP.t8('yes') ], [ '0', LxERP.t8('no') ] ] %]
+    [% L.select_tag('settings.shoparticle_if_missing', opts,
+                    default = SELF.profile.get('shoparticle_if_missing'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Type') %]:</th>
+  <td>
+    [% opts = [
+      [ 'part', LxERP.t8('Parts') ],
+      [ 'service', LxERP.t8('Services') ],
+      [ 'mixed', LxERP.t8('Mixed (requires column "type" or "pclass")') ] ] %]
+    [% L.select_tag('settings.part_type', opts,
+                    default = SELF.profile.get('part_type'), class='wi-wide') %]
+  </td>
+</tr>
+<tr>
+  <th>[% LxERP.t8('Parts Classification') %]:</th>
+  <td>
+    [% P.part.select_classification('settings.part_classification',
+                                    default = SELF.profile.get('part_classification'),
+                                    class='wi-wide') %]
+  </td>
+  </tr>
+<tr>
+  <th>[% LxERP.t8('Default booking group') %]:</th>
+  <td>
+    [% L.select_tag('settings.default_buchungsgruppe', SELF.all_buchungsgruppen,
+                    title_key = 'description',
+                    default = SELF.profile.get('default_buchungsgruppe'),
+                    class='wi-wide') %]
+    <br>
+    [% opts = [
+      [ 'never', LxERP.t8('Do not set default booking group') ],
+      [ 'all', LxERP.t8('Apply to all parts') ],
+      [ 'missing', LxERP.t8('Apply to parts without booking group') ] ] %]
+    [% L.select_tag('settings.apply_buchungsgruppe', opts,
+                    default = SELF.profile.get('apply_buchungsgruppe'), class='wi-wide') %]
+  </td>
+  </tr>
+<tr>
+  <th>[% LxERP.t8('Default unit') %]:</th>
+  <td>
+    [% L.select_tag('settings.default_unit', SELF.all_units, title_key='name',
+                    value_key='name', default=SELF.profile.get('default_unit'),
+                    class='wi-wide') %]
+  </td>
+</tr>
diff --git a/templates/design40_webpages/csv_import/_mapping_item.html b/templates/design40_webpages/csv_import/_mapping_item.html
new file mode 100644
index 000000000..d575924eb
--- /dev/null
+++ b/templates/design40_webpages/csv_import/_mapping_item.html
@@ -0,0 +1,15 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<tr>
+  <td><a class='remove_line interact cursor-pointer'>✘</a></td>
+  [% IF item.from %]
+    <td>[% L.hidden_tag('mappings[+].from', item.from) %][% item.from | html %]</td>
+  [% ELSE %]
+    <td>[% L.input_tag('mappings[+].from', '') %]</td>
+  [% END %]
+  <td>[% L.select_tag('mappings[].to', SELF.displayable_columns, value_key='name', title_key='name', default=item.to) %]</td>
+</tr>
+
diff --git a/templates/design40_webpages/csv_import/form.html b/templates/design40_webpages/csv_import/form.html
new file mode 100644
index 000000000..1ee13ea00
--- /dev/null
+++ b/templates/design40_webpages/csv_import/form.html
@@ -0,0 +1,394 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
+[% L.hidden_tag('form_sent', '1') %]
+[% L.hidden_tag('action', 'CsvImport/dispatch') %]
+[% L.hidden_tag('profile.type', SELF.profile.type) %]
+[% L.hidden_tag('tmp_profile_id', SELF.profile.id) %]
+
+[% IF SELF.profile.get('dont_edit_profile') %]
+  [% L.hidden_tag('force_profile', 1) %]
+  [% L.hidden_tag('profile.id', SELF.profile.id) %]
+
+[% ELSE %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8('Import profiles') %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    [% IF SELF.profile.id %]
+    <tr>
+      <th>[% LxERP.t8('Current profile') %]:</th>
+      <td><h3>[% HTML.escape(SELF.profile.name) %]</h3></td>
+    </tr>
+    [% END %]
+    [% IF SELF.all_profiles.size %]
+    <tr>
+      <th>[% LxERP.t8('Existing profiles') %]:</th>
+      <td>
+        [% L.select_tag('profile.id', SELF.all_profiles, title_key = 'name', default = SELF.profile.id, class='wi-wide') %]
+        <div class="buttons below">
+          [% L.submit_tag('action_new', LxERP.t8('Load profile')) %]
+          [% L.submit_tag('action_destroy', LxERP.t8('Delete profile'), confirm => LxERP.t8('Do you really want to delete this object?')) %]
+        </div>
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8('Save settings as') %]:</th>
+      <td>
+        [% L.input_tag('profile.name', '', class='wi-wide') %]
+        <div class="below">
+          [% L.checkbox_tag('profile.is_default', label => LxERP.t8('Make default profile'), class='below') %]
+        </div>
+        <div class="buttons below">
+          [% L.submit_tag('action_save', LxERP.t8('Save profile')) %]
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<div class="col wi-verywide">
+
+<h3 class="caption">[% LxERP.t8('Settings') %]</h3>
+
+[% BLOCK panel_1 %]
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Number Format') %]:</th>
+      <td>[% L.select_tag('settings.numberformat', ['1.000,00', '1000,00', '1,000.00', '1000.00', "1'000.00"], default = SELF.profile.get('numberformat'), class='wi-normal') %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Date Format') %]:</th>
+     <td>[% L.select_tag('settings.dateformat', ['dd.mm.yyyy', 'yyyy-mm-dd', 'dd/mm/yyyy', 'mm/dd/yyyy' ], default = SELF.profile.get('dateformat'), class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Charset') %]:</th>
+      <td>[% L.select_tag('settings.charset', SELF.all_charsets, default = SELF.profile.get('charset'), class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Separator') %]:</th>
+      <td>
+        [% SET custom_sep_char = SELF.sep_char %]
+        [% FOREACH entry = SELF.all_sep_chars %]
+          [% IF SELF.sep_char == entry.first %] [% SET custom_sep_char = '' %] [% END %]
+          [% L.radio_button_tag('sep_char', value => entry.first, label => entry.last, checked => SELF.sep_char == entry.first) %]<br>
+        [% END %]
+        [% L.radio_button_tag('sep_char', value => 'custom', checked => custom_sep_char != '') %]
+        [% L.input_tag('custom_sep_char', custom_sep_char, size => 3, maxlength => 1) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Quote character') %]:</th>
+      <td>
+        [% SET custom_quote_char = SELF.quote_char %]
+        [% FOREACH entry = SELF.all_quote_chars %]
+          [% IF SELF.quote_char == entry.first %] [% SET custom_quote_char = '' %] [% END %]
+          [% L.radio_button_tag('quote_char', value => entry.first, label => entry.last, checked => SELF.quote_char == entry.first) %]<br>
+        [% END %]
+        [% L.radio_button_tag('quote_char', value => 'custom', checked => custom_quote_char != '') %]
+        [% L.input_tag('custom_quote_char', custom_quote_char, size => 3, maxlength => 1) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Escape character') %]:</th>
+      <td>
+        [% SET custom_escape_char = SELF.escape_char %]
+        [% FOREACH entry = SELF.all_escape_chars %]
+          [% IF SELF.escape_char == entry.first %] [% SET custom_escape_char = '' %] [% END %]
+          [% L.radio_button_tag('escape_char', value => entry.first, label => entry.last, checked => SELF.escape_char == entry.first) %]<br>
+        [% END %]
+        [% L.radio_button_tag('escape_char', value => 'custom', checked => custom_escape_char != '') %]
+        [% L.input_tag('custom_escape_char', custom_escape_char, size => 3, maxlength => 1) %]
+      </td>
+    </tr>
+    [% duplicate_fields = SELF.worker.get_duplicate_check_fields() %]
+    [% IF ( duplicate_fields.size ) %]
+      <tr>
+        <th>[% LxERP.t8('Check for duplicates') %]:</th>
+        <td>
+        [% FOREACH key = duplicate_fields.keys %]
+          [% IF (SELF.profile.get('duplicates_'_ key) || (duplicate_fields.$key.default && !FORM.form_sent)) %] [% SET chckd=' checked' %]
+          [% ELSE %] [% SET chckd='' %]
+          [% END %]
+          <input type="checkbox" name="settings.duplicates_[% key | html %]" id="settings.duplicates_[% key | html %]" value="1"[% chckd %]>
+          <label for="settings.duplicates_[% key | html %]">[% duplicate_fields.$key.label | html %]</label><br>
+        [% END %]
+        </td>
+      </tr>
+      <tr>
+        <th></th>
+        <td>
+          [% opts = [ [ 'no_check',  LxERP.t8('Do not check for duplicates') ],
+                      [ 'check_csv', LxERP.t8('Discard duplicate entries in CSV file') ],
+                      [ 'check_db',  LxERP.t8('Discard entries with duplicates in database or CSV file') ] ] %]
+          [% L.select_tag('settings.duplicates', opts, default = SELF.profile.get('duplicates'), class='wi-wide') %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF SELF.type == 'parts' %]
+      [% INCLUDE 'csv_import/_form_parts.html' %]
+    [% ELSIF SELF.type == 'customers_vendors' %]
+      [% INCLUDE 'csv_import/_form_customers_vendors.html' %]
+    [% ELSIF SELF.type == 'contacts' %]
+      [% INCLUDE 'csv_import/_form_contacts.html' %]
+    [% ELSIF SELF.type == 'inventories' %]
+      [% INCLUDE 'csv_import/_form_inventories.html' %]
+    [% ELSIF SELF.type == 'orders' %]
+      [% INCLUDE 'csv_import/_form_orders.html' %]
+    [% ELSIF SELF.type == 'delivery_orders' %]
+      [% INCLUDE 'csv_import/_form_delivery_orders.html' %]
+    [% ELSIF SELF.type == 'ar_transactions' %]
+      [% INCLUDE 'csv_import/_form_artransactions.html' %]
+    [% ELSIF SELF.type == 'ap_transactions' %]
+      [% INCLUDE 'csv_import/_form_aptransactions.html' %]
+    [% ELSIF SELF.type == 'bank_transactions' %]
+      [% INCLUDE 'csv_import/_form_banktransactions.html' %]
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8('Preview Mode') %]:</th>
+      <td>
+        [% L.radio_button_tag('settings.full_preview', value=0, checked=!SELF.profile.get('full_preview'), label=LxERP.t8('Full Preview')) %]
+        [% L.radio_button_tag('settings.full_preview', value=1, checked=SELF.profile.get('full_preview')==1, label=LxERP.t8('Only Lines with Notes or Errors')) %]
+        [% L.radio_button_tag('settings.full_preview', value=2, checked=SELF.profile.get('full_preview')==2,   label=LxERP.t8('First 20 Lines')) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Import file') %]:</th>
+      <td>[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>
+    </tr>
+    [% IF SELF.file.exists %]
+      <tr>
+        <th>[% LxERP.t8('Existing file on server') %]:</th>
+        <td>[% LxERP.t8('Uploaded on #1, size #2 kB', SELF.file.displayable_mtime, LxERP.format_amount(SELF.file.size / 1024, 2)) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+[% END # panel_1 %]
+
+[%
+  INCLUDE 'common/toggle_panel.html'
+  block_name     = 'panel_1'
+  toggle_class   = 'toggle_panel_1'
+  display_status = 'open'
+  button_closed  = LxERP.t8("Show settings")
+  button_open    = LxERP.t8("Hide settings")
+%]
+
+</div><!-- /.col -->
+
+[% UNLESS SELF.worker.is_multiplexed %]
+
+<div class="col wi-verywide">
+
+<h3>[% 'Mappings (csv_import)' | $T8 %]</h3>
+
+[% BLOCK panel_2 %]
+<p>[% 'These mappings can be used to map heading from non standard csv files to known columns. These will also be saved in profiles, so you can save profiles for every source of formats.' | $T8 %]</p>
+<table id="csv_import_mappings" class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'Action' | $T8 %]</th>
+      <th>[% 'Text in CSV File' | $T8 %]</th>
+      <th>[% 'Known Column' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id="mapping_empty" style="display:none">
+      <td colspan="3">[% 'There is nothing here yet (csv_import)' | $T8 %]</td>
+    </tr>
+    [% FOREACH row = SELF.mappings %]
+      [% PROCESS 'csv_import/_mapping_item.html', item=row IF row.from %]
+    [% END %]
+    [% PROCESS 'csv_import/_mapping_item.html', item={} %]
+  </tbody>
+</table>
+<div class="button">
+  <input type="button" id="add_empty_mapping_line" value="[% 'Add empty line (csv_import)' | $T8 %]">
+  <input type="button" id="add_mapping_from_upload" value="[% 'Add headers from last uploaded file (csv_import)' | $T8 %]">
+</div>
+[% END # panel_2 %]
+
+[%
+  INCLUDE 'common/toggle_panel.html'
+  block_name     = 'panel_2'
+  toggle_class   = 'toggle_panel_2'
+  display_status = 'open'
+  button_closed  = LxERP.t8("Show mappings (csv_import)")
+  button_open    = LxERP.t8("Hide mappings (csv_import)")
+%]
+
+</div><!-- /.col -->
+
+[% END # UNLESS SELF.worker.is_multiplexed %]
+
+[% IF SELF.deferred %]
+  <div id="results" class="horizontal-scroll-wrapper">
+    [% PROCESS 'csv_import/_deferred_results.html' %]
+  </div>
+[% END %]
+
+<div class="col wi-verywide">
+
+<h3 class="caption">[% LxERP.t8('Help on column names') %]</h3>
+
+[% BLOCK panel_3 %]
+  <div class="horizontal-scroll-wrapper">
+  [% IF SELF.worker.is_multiplexed %]
+    <table>
+      <tbody>
+        <tr>
+          [% FOREACH p = SELF.worker.profile %]
+            <th>[% p.row_ident %]</th>
+          [% END %]
+        </tr>
+        <tr>
+          [% FOREACH p = SELF.worker.profile %]
+            [% SET ri = p.row_ident %]
+            <td>
+              <table class="tbl-list">
+                <thead>
+                  <tr>
+                    <th>[% LxERP.t8('Column name') %]</th>
+                    <th>[% LxERP.t8('Meaning') %]</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  [% FOREACH row = SELF.displayable_columns.$ri %]
+                    <tr>
+                      <td>[% HTML.escape(row.name) %]</td>
+                      <td>[% HTML.escape(row.description) %]</td>
+                    </tr>
+                  [% END %]
+                </tbody>
+              </table>
+            </td>
+          [% END %]
+        </tr>
+      </tbody>
+    </table>
+  [% ELSE %]
+    <table class="tbl-list">
+      <thead>
+        <tr>
+          <th>[% LxERP.t8('Column name') %]</th>
+          <th>[% LxERP.t8('Meaning') %]</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH row = SELF.displayable_columns %]
+        <tr>
+          <td>[% HTML.escape(row.name) %]</td>
+          <td>[% HTML.escape(row.description) %]</td>
+        </tr>
+        [% END %]
+      </tbody>
+    </table>
+  [% END %]
+  </div><!-- /.horizontal-scroll-wrapper -->
+  [% IF SELF.type == 'contacts' %]
+    <p>
+      [% LxERP.t8("You can update existing contacts by providing the 'cp_id' column with their database IDs. Otherwise: ") %]
+      [% LxERP.t8('At least one of the columns #1, customer, customernumber, customer_gln, vendor, vendornumber, vendor_gln (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'cp_cv_id') %]
+    </p>
+  [% ELSIF SELF.type == 'addresses' %]
+    <p>[% LxERP.t8('At least one of the columns #1, customer, customernumber, customer_gln, vendor, vendornumber, vendor_gln (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'trans_id') %]</p>
+  [% ELSIF SELF.type == 'parts' %]
+    <p>
+      [1]:
+      [% LxERP.t8('The three columns "make_X", "model_X" and "lastcost_X" with the same number "X" are used to import vendor part numbers and vendor prices.') %]
+      [% LxERP.t8('The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).') %]
+      [% LxERP.t8('The items are imported accoring do their number "X" regardless of the column order inside the file.') %]
+      [% LxERP.t8('The column "make_X" can contain either a vendor\'s database ID, a vendor number or a vendor\'s name.') %]
+    </p>
+    <p>
+      [2]:
+      [% LxERP.t8('Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.') %]
+    </p>
+    <p>
+      [3]:
+      [% LxERP.t8("If the article type is set to 'mixed' then a column called 'part_type' or called 'pclass' must be present.") %]
+      [% LxERP.t8("Type can be either 'part', 'service' or 'assembly'.") %]
+      [% LxERP.t8("If column 'pclass' is present the article type is then irrelevant or used as default ") %]
+      [% LxERP.t8("The 'pclass' column has the same abbreviation like a part export. The first letter is for the type Part,Assembly or Service, the second(and third) for Part Classification") %]
+    </p>
+  [% ELSIF SELF.type == 'inventories' %]
+    <p>[% LxERP.t8('One of the columns "qty" or "target_qty" must be given. If "target_qty" is given, the quantity to transfer for each transfer will be calculate, so that the quantity for this part, warehouse and bin will result in the given "target_qty" after each transfer.') %]</p>
+  [% ELSIF SELF.type == 'orders' OR SELF.type == 'delivery_orders' OR SELF.type == 'ar_transactions' %]
+    <p>
+      [1]:
+      [% LxERP.t8('The column "datatype" must be present and must be at the same position / column in each data set. The values must be the row names (see settings) for order and item data respectively.') %]
+    </p>
+    <p>
+    [% IF SELF.type == 'orders' OR SELF.type == 'ar_transactions' %]
+      <p>
+        [2]:
+        [% LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]<br>
+        [% LxERP.t8('If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.') %]<br>
+      </p>
+    [% END %]
+  [% END %][%# IF SELF.type == … %]
+  <p>[% L.submit_tag('action_download_sample', LxERP.t8('Download sample file')) %]</p>
+[% END # panel_3 %]
+
+[%
+  INCLUDE 'common/toggle_panel.html'
+  block_name    = 'panel_3'
+  toggle_class  = 'toggle_panel_3'
+  button_closed = LxERP.t8("Show help text")
+  button_open   = LxERP.t8("Hide help text")
+%]
+
+
+</div><!-- /.col -->
+
+[% END %]<!-- # /ELSE SELF.profile.get('dont_edit_profile') -->
+
+
+
+</form>
+
+<div class="col wi-wide">
+
+
+
+
+</div><!-- /.col -->
+
+</div><!-- /.wrapper -->
+
+
+<script type="text/javascript">
+  $(document).ready(function() {
+    $('#action_save').click(function() {
+      if ($('#profile_name').val() != '')
+        return true;
+      alert('[% LxERP.t8('Please enter a profile name.') %]');
+      return false;
+    });
+    $('#add_empty_mapping_line').click(function(){
+      $.get('controller.pl', { action: 'CsvImport/add_empty_mapping_line', 'profile.type': $('#profile_type').val() }, kivi.eval_json_result);
+    });
+    $('#add_mapping_from_upload').click(function(){
+      $.get('controller.pl?action_add_mapping_from_upload=1', $('form').serialize() , kivi.eval_json_result);
+    });
+    $('#csv_import_mappings').on('click', '.remove_line', function(){ $(this).closest('tr').remove(); if (1==$('#csv_import_mappings tr:visible').length) $('#mapping_empty').show() });
+  });
+</script>
diff --git a/templates/design40_webpages/csv_import/report.html b/templates/design40_webpages/csv_import/report.html
new file mode 100644
index 000000000..c5e99095e
--- /dev/null
+++ b/templates/design40_webpages/csv_import/report.html
@@ -0,0 +1,79 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h2>
+  [% IF SELF.report.test_mode %]
+    [% LxERP.t8('Import preview') %]
+  [% ELSE %]
+    [% LxERP.t8('Import result') %]
+  [% END %]
+  [% IF SELF.num_errors %]
+    <font color="red">([%- SELF.num_errors -%]&nbsp;[%- LxERP.t8('Errors') -%])</font>
+  [% END %]
+</h2>
+
+[% IF SELF.report.test_mode %]
+  <p>
+    [% LxERP.t8("The following is only a preview.") %]
+    [% LxERP.t8("No entries have been imported yet.") %]
+  </p>
+[% END %]
+
+[% PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
+
+<table class="tbl-list">
+
+  [% SET max_col = 0 %]
+  [% FOREACH rownum = SELF.display_rows %]
+    [% SET max_col = max_col > SELF.report_rows.${rownum}.size ? max_col : SELF.report_rows.${rownum}.size  %]
+    [% LAST IF rownum >= SELF.report_numheaders %]
+  [% END %]
+
+  <thead>
+    [% FOREACH rownum = SELF.display_rows %]
+      [% SET to_pad = max_col - SELF.report_rows.${rownum}.size %]
+      [% IF rownum < SELF.report_numheaders %]
+        <tr>
+          [% FOREACH value = SELF.report_rows.${rownum} %]
+          <th>[% value | html %]</th>
+          [% END %]
+          [% IF to_pad %]<th style="text-align:center" colspan="[% to_pad %]">-</th>[% END %]
+          <th>[% LxERP.t8('Notes') %]</th>
+        </tr>
+      [% END %]
+    [% END %]
+  </thead>
+  <tbody>
+    [% FOREACH rownum = SELF.display_rows %]
+      [% SET to_pad = max_col - SELF.report_rows.${rownum}.size %]
+      [% IF rownum >= SELF.report_numheaders %]
+        [% csv_import_report_errors = SELF.report_status.${rownum}.errors %]
+        <tr class="listrow[% IF csv_import_report_errors && csv_import_report_errors.size %]_error[% END %][% (loop.count + SELF.report_numheaders) % 2 %]">
+          [% FOREACH value = SELF.report_rows.${rownum} %]
+            <td>[% value | html  %]</td>
+          [% END %]
+          [% IF to_pad %]<td colspan="[% to_pad %]">-</td>[% END %]
+          <td>
+            [% FOREACH error = csv_import_report_errors %][% error | html %][% UNLESS loop.last %]<br>[% END %][% END %]
+            [% FOREACH info  = SELF.report_status.${rownum}.information %][% IF rownum >= SELF.report_numheaders || csv_import_report_errors.size %]<br>[% END %][% info | html %][% END %]
+          </td>
+        </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+
+</table>
+
+[% PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
+
+<script type='text/javascript'>
+  $(function(){
+    [% IF SELF.reporterror %]
+      kivi.clear_flash('info',0);
+      kivi.display_flash('error','[% SELF.reporterror %]',0);
+    [% ELSIF SELF.report.test_mode %]
+      kivi.ActionBar.Action('#action_import').enable();
+    [% END %]
+  });
+</script>
diff --git a/templates/design40_webpages/ct/list_names_bottom.html b/templates/design40_webpages/ct/list_names_bottom.html
new file mode 100644
index 000000000..624689dc4
--- /dev/null
+++ b/templates/design40_webpages/ct/list_names_bottom.html
@@ -0,0 +1,7 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<form method="post" action="controller.pl" id="new_form">
+  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+  <input name="db" type="hidden" value="[% HTML.escape(db) %]">
+</form>
diff --git a/templates/design40_webpages/ct/search.html b/templates/design40_webpages/ct/search.html
new file mode 100644
index 000000000..1b0f10db7
--- /dev/null
+++ b/templates/design40_webpages/ct/search.html
@@ -0,0 +1,317 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+<form method="post" action="ct.pl" name="Form" id="form">
+<input type="hidden" name="db" value="[% HTML.escape(db) %]">
+
+<div class="wrapper">
+
+    <table class="tbl-horizontal">
+      <caption> [% 'Customer & Contact' | $T8 %] </caption>
+      <tbody>
+        <tr>
+          <th>[% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %] </th>
+          <td><input type="text" name="[% IF IS_CUSTOMER %]customer[% ELSE %]vendor[% END %]number" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][% ELSE %][% 'Vendor Name' | $T8 %][% END %] </th>
+          <td><input type="text" id="name" name="name" class="initial_focus wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td><input type="text" name="department_1" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td><input type="text" name="department_2" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'Contact' | $T8 %] </th>
+          <td><input type="text" name="contact" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'Contact person (surname)' | $T8 %] </th>
+          <td><input type="text" name="cp_name" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'E-mail' | $T8 %] </th>
+          <td><input type="text" name="email" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'All phone numbers' | $T8 %]</th>
+          <td><input type="text" name="all_phonenumbers" class="wi-normal"></td>
+        </tr>
+        [% IF IS_CUSTOMER %]
+        <tr>
+          <th>[% 'Dunning lock' | $T8 %]</th>
+          <td>[% L.yes_no_tag('dunning_lock', dunning_lock, default='', with_empty=1, class="wi-normal") %]</td>
+        </tr>
+        [% END %]
+      </tbody>
+    </table>
+
+    <table class="tbl-horizontal">
+      <caption> [% 'Billing/shipping address' | $T8 %] </caption>
+      <tbody>
+        <tr>
+          <th>[% 'Street' | $T8 %] </th>
+          <td><input type="text" name="addr_street" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'ZIPcode' | $T8 %] </th>
+          <td><input type="text" name="addr_zipcode" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'City' | $T8 %] </th>
+          <td><input type="text" name="addr_city" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'Country' | $T8 %] </th>
+          <td><input type="text" name="addr_country" class="wi-normal"></td>
+        </tr>
+        <tr>
+          <th>[% 'GLN' | $T8 %] </th>
+          <td><input type="text" name="addr_gln" class="wi-number"></td>
+        </tr>
+      </tbody>
+    </table>
+
+
+  <table class="tbl-horizontal">
+    <caption> [% 'Handling & Scope' | $T8 %] </caption>
+    <tbody>
+      [% IF SHOW_BUSINESS_TYPES %]
+      <tr>
+        <th>[% IF IS_CUSTOMER %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %] </th>
+        <td>[% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, class='wi-lightwide') %] </td>
+      </tr>
+      [% END %]
+      [% IF IS_CUSTOMER %]
+         <tr>
+           <th>[% LxERP.t8("Factur-X/ZUGFeRD settings") %]</th>
+           <td>[% L.select_tag('create_zugferd_invoices', ZUGFERD_SETTINGS, with_empty = 1) %]</td>
+         </tr>
+      [% END %]
+      [% IF IS_CUSTOMER && ALL_SALESMEN.size %]
+        <tr>
+          <th>[% 'Salesman' | $T8 %] </th>
+          <td>[% L.select_tag('salesman_id', ALL_SALESMEN, title_key = 'name', with_empty = 1, class='wi-lightwide') %] </td>
+        </tr>
+      [% END %]
+        <tr>
+          <th>[% 'Insert Date' | $T8 %] [% 'From' | $T8 %] </th>
+          <td>[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %] <!-- PENDENT: Klassen implementieren in Funktion --></td>
+        </tr>
+        <tr>
+          <th>[% 'Payment Term' | $T8 %]</th>
+          <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1, class="wi-lightwide") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Tax rate' | $T8 %]</th>
+          <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', class="wi-lightwide") %]</td>
+        </tr>
+      [% CUSTOM_VARIABLES_FILTER_CODE %]
+      <tr>
+        <th>[% 'Scope' | $T8 %] </th>
+        <td>
+          <input name="status" type="radio" value="all" checked id="chckb1"> <label for="chckb1">[% 'All' | $T8 %]</label>
+          <input name="status" type="radio" value="orphaned" id="chckb2"> <label for="chckb2">[% 'Orphaned' | $T8 %]</label>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Validity' | $T8 %] </th>
+        <td>
+          <input name="obsolete" type="radio" value="all" id="rd1"> <label for="rd1">[% 'All' | $T8 %]</label>
+          <input name="obsolete" type="radio" value="Y" id="rd2"> <label for="rd2">[% 'Obsolete' | $T8 %]</label>
+          <input name="obsolete" type="radio" value="N" checked id="rd3"> <label for="rd3">[% 'Not obsolete' | $T8 %]</label>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+</div>
+
+
+<div class="form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+
+  <div class="list col">
+    <h4> [% 'Numbers & IDs' | $T8 %] </h4>
+    <div>
+      <input name="l_id" id="l_id" type="checkbox" value="Y">
+      <label for="l_id"> [% 'ID' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_[% db | html %]number" id="l_[% db | html %]number" type="checkbox" value="Y" checked>
+      <label for="l_[% db | html %]number"> [% IF IS_CUSTOMER %][% 'Customer Number' | $T8 %][% ELSE %][% 'Vendor Number' | $T8 %][% END %] </label>
+    </div>
+    <div>
+      <input name="l_taxnumber" id="l_taxnumber" type="checkbox" value="Y">
+      <label for="l_taxnumber"> [% 'Tax Number' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_invnumber" id="l_invnumber" type="checkbox" value="Y">
+      <label for="l_invnumber"> [% 'Invoices' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Customer' | $T8 %] </h4>
+    <div>
+      <input name="l_name" id="l_name" type="checkbox" value="Y" checked>
+      <label for="l_name"> [% IF IS_CUSTOMER %][% 'Customer Name' | $T8 %][% ELSE %][% 'Vendor Name' | $T8 %][% END %] </label>
+    </div>
+    <div>
+      <input name="l_department_1" id="l_department_1" type="checkbox" value="Y">
+      <label for="l_department_1"> [% 'Department' | $T8 %] 1</label>
+    </div>
+    <div>
+      <input name="l_department_2" id="l_department_2" type="checkbox" value="Y">
+      <label for="l_department_2"> [% 'Department' | $T8 %] 2</label>
+    </div>
+    <div>
+      <input name="l_contact" id="l_contact" type="checkbox" value="Y" checked>
+      <label for="l_contact"> [% 'Contact' | $T8 %] </label>
+    </div>
+    [% IF IS_CUSTOMER %]
+    <div>
+      <input name="l_contact_origin" id="l_contact_origin" type="checkbox" class="checkbox" value="Y">
+      <label for="l_contact_origin">[% 'Origin of personal data' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_invoice_mail" id="l_invoice_mail" type="checkbox" class="checkbox" value="Y">
+      <label for="l_invoice_mail">[% 'Email of the invoice recipient' | $T8 %]</label>
+    </div>
+    [% END %]
+    <div>
+      <input name="l_ustid" id="l_ustid" type="checkbox" class="checkbox" value="Y">
+      <label for="l_ustid">[% 'VAT ID' | $T8 %]</label>
+    </div>
+    [% IF IS_CUSTOMER %]
+    <div>
+      <input name="l_creditlimit" id="l_creditlimit" type="checkbox" class="checkbox" value="Y">
+      <label for="l_creditlimit">[% 'Credit Limit' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_dunning_lock" id="l_dunning_lock" type="checkbox" class="checkbox" value="Y">
+      <label for="l_dunning_lock">[% 'Dunning lock' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_commercial_court" id="l_commercial_court" type="checkbox" class="checkbox" value="Y">
+      <label for="l_commercial_court">[% 'Commercial court' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_main_contact_person" id="l_main_contact_person" type="checkbox" class="checkbox" value="Y">
+      <label for="l_main_contact_person">[% 'Main Contact Person' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_delivery_order_mail" id="l_delivery_order_mail" type="checkbox" class="checkbox" value="Y">
+      <label for="l_delivery_order_mail">[% 'Email of the delivery order recipient' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_department_1" id="l_department_1" type="checkbox" class="checkbox" value="Y">
+      <label for="l_department_1">[% 'Department' | $T8 %] 1</label>
+    </div>
+    <div>
+      <input name="l_department_2" id="l_department_2" type="checkbox" class="checkbox" value="Y">
+      <label for="l_department_2">[% 'Department' | $T8 %] 2</label>
+    </div>
+    [% END %]
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Address' | $T8 %] </h4>
+    <div>
+      <input name="l_street" id="l_street" type="checkbox" value="Y" checked>
+      <label for="l_street"> [% 'Street' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_zipcode" id="l_zipcode" type="checkbox" value="Y" checked>
+      <label for="l_zipcode"> [% 'Zipcode' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_city" id="l_city" type="checkbox" value="Y" checked>
+      <label for="l_city"> [% 'City' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_country" id="l_country" type="checkbox" value="Y" checked>
+      <label for="l_country"> [% 'Country' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_gln" id="l_gln" type="checkbox" value="Y" checked>
+      <label for="l_gln"> [% 'GLN' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Contact' | $T8 %] </h4>
+    <div>
+      <input name="l_phone" id="l_phone" type="checkbox" value="Y" checked>
+      <label for="l_phone"> [% 'Phone' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_fax" id="l_fax" type="checkbox" value="Y">
+      <label for="l_fax"> [% 'Fax' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_email" id="l_email" type="checkbox" value="Y" checked>
+      <label for="l_email"> [% 'E-mail' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Orders' | $T8 %] </h4>
+    <div>
+      <input name="l_ordnumber" id="l_ordnumber" type="checkbox" value="Y">
+      <label for="l_ordnumber"> [% IF IS_CUSTOMER %][% 'Sales Orders' | $T8 %][% ELSE %][% 'Purchase Orders' | $T8 %][% END %] </label>
+    </div>
+    <div>
+      <input name="l_quonumber" id="l_quonumber" type="checkbox" value="Y">
+      <label for="l_quonumber"> [% IF IS_CUSTOMER %][% 'Quotations' | $T8 %][% ELSE %][% 'RFQs' | $T8 %][% END %] </label>
+    </div>
+    <div>
+      <input name="l_discount" id="l_discount" type="checkbox" value="Y">
+      <label for="l_discount"> [% 'Discount' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_payment" id="l_payment" type="checkbox" value="Y">
+      <label for="l_payment"> [% 'Payment Terms' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_taxzone" id="l_taxzone" type="checkbox" value="Y">
+      <label for="l_taxzone"> [% 'Tax rate' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Handling & Scope' | $T8 %] </h4>
+    <div>
+      <input name="l_insertdate" id="l_insertdate" type="checkbox" value="Y">
+      <label for="l_insertdate"> [% 'Insert Date' | $T8 %] </label>
+    </div>
+    [% IF IS_CUSTOMER %]
+    <div>
+      <input name="l_salesman" id="l_salesman" type="checkbox" value="Y">
+      <label for="l_salesman"> [% 'Salesman' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l_pricegroup" id="l_pricegroup" type="checkbox" value="Y">
+      <label for="l_pricegroup"> [% 'Pricegroup' | $T8 %] </label>
+    </div>
+    [% END %]
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Custom Variables' | $T8 %] </h4>
+    <!-- PENDENT: bessere Loesung suchen -->
+    [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+  </div>
+
+
+</div>
+
+</form>
diff --git a/templates/design40_webpages/ct/search_contact.html b/templates/design40_webpages/ct/search_contact.html
new file mode 100644
index 000000000..e9ac830e7
--- /dev/null
+++ b/templates/design40_webpages/ct/search_contact.html
@@ -0,0 +1,143 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% 'Contacts' | $T8 %]</h1>
+
+<form method="post" action="ct.pl" name="Form" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Name' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_name" class="wi-lightwide initial_focus"></td>
+    </tr>
+    <tr>
+      <th>[% 'Greeting' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_greeting" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Title' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_title" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_email" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_abteilung" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Project' | $T8 %] </th>
+      <td><input type="text" name="filter.cp_project" class="wi-lightwide"></td>
+    </tr>
+    [% CUSTOM_VARIABLES_FILTER_CODE %]
+    <tr>
+      <th>[% 'Scope' | $T8 %] </th>
+      <td>
+        <input name="filter.status" type="radio" value="active" checked id="rd1"> <label for="rd1">[% 'Active' | $T8 %]</label>
+        <input name="filter.status" type="radio" value="all" id="rd2"> <label for="rd2">[% 'All' | $T8 %]</label>
+        <input name="filter.status" type="radio" value="orphaned" id="rd3"> <label for="rd3">[% 'Orphaned' | $T8 %]</label>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+</div>
+
+
+<div class="wrapper form-addition control-panel">
+  <h3 class="caption">[% 'Include in Report' | $T8 %] </h3>
+
+
+  <div class="list col">
+    <h4>[% 'Numbers & IDs' | $T8 %]</h4>
+    <div>
+      <input name="l.cp_id" id="l_cp_id" type="checkbox" value="Y">
+      <label for="l_cp_id"> [% 'ID' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.vcnumber" id="l_vcnumber" type="checkbox" value="Y" checked>
+      <label for="l_vcnumber"> [% 'Customer/Vendor Number' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Customer' | $T8 %] </h4>
+    <div>
+      <input name="l.vcname" id="l_vcname" type="checkbox" value="Y" checked>
+      <label for="l_vcname"> [% 'Customer/Vendor Name' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_name" id="l_cp_name" type="checkbox" value="Y" checked>
+      <label for="l_cp_name"> [% 'Name' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_givenname" id="l_cp_givenname" type="checkbox" value="Y" checked>
+      <label for="l_cp_givenname"> [% 'Given Name' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_abteilung" id="l_cp_abteilung" type="checkbox" value="Y">
+      <label for="l_cp_abteilung"> [% 'Department' | $T8 %] </label>
+    </div>
+    <div>
+      [% L.checkbox_tag('l.cp_position', value='Y', label=LxERP.t8('Function/position')) %]
+    </div>
+    <div>
+      <input name="l.cp_gender" id="l_cp_gender" type="checkbox" value="Y">
+      <label for="l_cp_gender"> [% 'Gender' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_birthday" id="l_cp_birthday" type="checkbox" value="Y">
+      <label for="l_cp_birthday"> [% 'Birthday' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Address' | $T8 %] </h4>
+    <div>
+      <input name="l.cp_street" id="l_cp_street" type="checkbox" value="Y">
+      <label for="l_cp_street"> [% 'Street' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_zipcode" id="l_cp_zipcode" type="checkbox" value="Y">
+      <label for="l_cp_zipcode"> [% 'Zipcode' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_city" id="l_cp_city" type="checkbox" value="Y">
+      <label for="l_cp_city"> [% 'City' | $T8 %] </label>
+    </div>
+  </div>
+
+  <div class="list col">
+    <h4> [% 'Contact' | $T8 %] </h4>
+    <div>
+      <input name="l.cp_phone" id="l_cp_phone" type="checkbox" value="Y" checked>
+      <label for="l_cp_phone"> [% 'Phone' | $T8 %] </label>
+    </div>
+    <div>
+      <input name="l.cp_mobile" id="l_cp_mobile" type="checkbox" value="Y" checked>
+      <label for="l_cp_mobile"> [% 'Mobile' | $T8 %] </label>
+    </div>
+    <div>
+      [% L.checkbox_tag('l.cp_privatphone', value='Y', label=LxERP.t8('Private Phone'), checked=1) %]
+    </div>
+    <div>
+      [% L.checkbox_tag('l.cp_fax', value='Y', label=LxERP.t8('Fax')) %]
+    </div>
+    <div>
+      [% L.checkbox_tag('l.cp_email', value='Y', label=LxERP.t8('E-mail'), checked=1) %]
+    </div>
+    <div>
+      [% L.checkbox_tag('l.cp_privatemail', value='Y', label=LxERP.t8('Private E-mail')) %]
+    </div>
+    [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+  </div>
+
+</div>
+</form>
diff --git a/templates/design40_webpages/cti/calling.html b/templates/design40_webpages/cti/calling.html
new file mode 100644
index 000000000..f239e5434
--- /dev/null
+++ b/templates/design40_webpages/cti/calling.html
@@ -0,0 +1,4 @@
+<body>
+[% INCLUDE 'common/flash.html' %]
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/design40_webpages/cti/list_internal_extensions.html b/templates/design40_webpages/cti/list_internal_extensions.html
new file mode 100644
index 000000000..58b361960
--- /dev/null
+++ b/templates/design40_webpages/cti/list_internal_extensions.html
@@ -0,0 +1,32 @@
+[% USE HTML %]
+[% USE LxERP %]
+<body>
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+  [% IF !SELF.internal_extensions.size %]
+   <p>[% LxERP.t8("No internal phone extensions have been configured yet.") %]</p>
+
+  [% ELSE %]
+   <table class="tbl-plain wi-moderate">
+    <thead>
+      <tr>
+       <th>[% LxERP.t8("Name") %]</th>
+       <th>[% LxERP.t8("Phone extension") %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH extension = SELF.internal_extensions %]
+       <tr class="listrow">
+        <td>[% HTML.escape(extension.name) %]</td>
+        <td><a href="[% HTML.escape(extension.call_link) %]" class="cti_call_action">[% HTML.escape(extension.phone_extension) %]</a></td>
+       </tr>
+      [% END %]
+    </tbody>
+   </table>
+  [% END %]
+</div>
+
+</body>
+</html>
diff --git a/templates/design40_webpages/custom_data_export/empty_result_set.html b/templates/design40_webpages/custom_data_export/empty_result_set.html
new file mode 100644
index 000000000..7432b193d
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export/empty_result_set.html
@@ -0,0 +1,10 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+<div class="wrapper">
+  [%- INCLUDE 'common/flash.html' %]
+
+  <p>
+  [% LxERP.t8("The query did not return any data.") %]
+  </p>
+</div>
diff --git a/templates/design40_webpages/custom_data_export/export.html b/templates/design40_webpages/custom_data_export/export.html
new file mode 100644
index 000000000..49af02967
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export/export.html
@@ -0,0 +1,55 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+<div class="wrapper ">
+  [%- INCLUDE 'common/flash.html' %]
+
+  <form method="post" action="controller.pl" id="form">
+    [% L.hidden_tag("id", SELF.query.id) %]
+    [% L.hidden_tag("parameters_set", "1") %]
+
+    [% IF !SELF.parameters.size %]
+    <p>
+    [% LxERP.t8("The SQL query does not contain any parameter that need to be configured.") %]
+    </p>
+
+    [% ELSE %]
+    <div class="input-panel control-panel">
+    <table class="tbl-plain wi-moderate">
+      <tbody>
+        <tr>
+          <td>[% LxERP.t8("Variable Name") %]</td>
+          <td>[% LxERP.t8("Type") %]</td>
+          <td>[% LxERP.t8("Value") %]</td>
+          <td>[% LxERP.t8("Description") %]</td>
+        </tr>
+
+        [% FOREACH parameter = SELF.parameters %]
+        <tr>
+          <td>
+            [% HTML.escape(parameter.name) %]
+          </td>
+
+          [% SET value = parameter.calculate_default_value %]
+
+          [% IF parameter.parameter_type == "number" %]
+          <td>[% LxERP.t8("Number") %]</td>
+          <td>[% L.input_tag("parameters." _ parameter.name, value, style="width: 300px", "data-validate"="required") %]</td>
+
+          [% ELSIF parameter.parameter_type == "date" %]
+          <td>[% LxERP.t8("Date") %]</td>
+          <td>[% L.date_tag("parameters." _ parameter.name, value, style="width: 300px", "data-validate"="required") %]</td>
+
+          [% ELSE %]
+          <td>[% LxERP.t8("Text") %]</td>
+          <td>[% L.input_tag("parameters." _ parameter.name, value, style="width: 300px", "data-validate"="required") %]</td>
+          [% END %]
+
+          <td>[% HTML.escape(parameter.description) %]</td>
+        </tr>
+        [% END %]
+      </tbody>
+</div>
+      [% END %]
+  </form>
+</div>
diff --git a/templates/design40_webpages/custom_data_export/list.html b/templates/design40_webpages/custom_data_export/list.html
new file mode 100644
index 000000000..732b6a86c
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export/list.html
@@ -0,0 +1,35 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+<div class="wrapper">
+  [%- INCLUDE 'common/flash.html' %]
+
+  [% IF !SELF.queries.size %]
+  <p>
+  [%- LxERP.t8("You do not have access to any custom report.") %]
+  </p>
+
+  [%- ELSE %]
+  <table class="tbl-list wi-moderate">
+    <colgroup>
+      <col class="wi-normal">
+      <col>
+    </colgroup>
+    <thead>
+      <tr>
+        <th>[% LxERP.t8("Name") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      [%- FOREACH query = SELF.queries %]
+      <tr>
+        <td>[% L.link(SELF.url_for(action="export", id=query.id), query.name) %]</td>
+        <td>[% IF query.description %][% query.description %][% END %]</td>
+      </tr>
+      [%- END %]
+    </tbody>
+  </table>
+  [%- END %]
+</div>
diff --git a/templates/design40_webpages/custom_data_export_designer/edit.html b/templates/design40_webpages/custom_data_export_designer/edit.html
new file mode 100644
index 000000000..1ca3bd764
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export_designer/edit.html
@@ -0,0 +1,47 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %] — [% LxERP.t8("Step #1/#2", 1, 2) %] — [% LxERP.t8("Basic Data") %]</h1>
+<div class="wrapper">
+  [% INCLUDE 'common/flash.html' %]
+
+  <form method="post" action="controller.pl" id="form">
+    [% L.hidden_tag("id", SELF.query.id) %]
+    <div class="input-panel control-panel">
+      <table class="tbl-horizontal wi-moderate">
+        <tr>
+          <th>[% LxERP.t8("Name") %]</th>
+          <td>[% L.input_tag("query.name", SELF.query.name, style="width: 800px", "data-validate"="required") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Required access right") %]</th>
+          <td>[% L.select_tag("query.access_right", SELF.access_rights, default=SELF.query.access_right, style="width: 800px") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Description") %]</th>
+          <td>[% L.textarea_tag("query.description", SELF.query.description, rows=5, style="width: 800px") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("SQL query") %]</th>
+          <td>[% L.textarea_tag("query.sql_query", SELF.query.sql_query, rows=20, style="width: 800px", "data-validate"="required") %]</td>
+        </tr>
+      </table>
+    </div>
+  </form>
+
+  <p>
+  [% LxERP.t8("The SQL query can be parameterized with variables named as follows: <%name%>.") %]
+  [% LxERP.t8("On the next page the type of all variables can be set.") %]
+  [% LxERP.t8("Note that parameter names must not be quoted.") %]
+  [% LxERP.t8("Example") %]:
+  </p>
+
+  <pre>
+SELECT extract(YEAR FROM oe.transdate) AS &quot;Jahr&quot;, SUM(oe.amount) AS &quot;Angebotssumme&quot;
+FROM oe
+LEFT JOIN employee ON (oe.employee_id = employee.id)
+WHERE record_type = 'sales_quotation'
+  AND (employee.login = &lt;%Benutzer-Login%&gt;)
+GROUP BY &quot;Jahr&quot;
+ORDER BY &quot;Jahr&quot;
+  </pre>
+</div>
diff --git a/templates/design40_webpages/custom_data_export_designer/edit_parameters.html b/templates/design40_webpages/custom_data_export_designer/edit_parameters.html
new file mode 100644
index 000000000..dad4b60cb
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export_designer/edit_parameters.html
@@ -0,0 +1,59 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %] — [% LxERP.t8("Step #1/#2", 2, 2) %] — [% LxERP.t8("Query parameters") %]</h1>
+<div class="wrapper">
+  [%- INCLUDE 'common/flash.html' %]
+
+  <form method="post" action="controller.pl" id="form">
+    [% L.hidden_tag("id", SELF.query.id) %]
+    [% L.hidden_tag("query.name", SELF.query.name) %]
+    [% L.hidden_tag("query.access_right", SELF.query.access_right) %]
+    [% L.hidden_tag("query.description", SELF.query.description) %]
+    [% L.hidden_tag("query.sql_query", SELF.query.sql_query) %]
+
+    [% IF !PARAMETERS.size %]
+    <p>
+    [% LxERP.t8("The SQL query does not contain any parameter that need to be configured.") %]
+    </p>
+
+    [% ELSE %]
+
+    <div class="input-panel control-panel">
+      <table class="tbl-plain condensed"> 
+        <tbody>
+          <tr>
+            <td>[% LxERP.t8("Variable Name") %]</td>
+            <td>[% LxERP.t8("Type") %]</td>
+            <td>[% LxERP.t8("Description") %]</td>
+            <td colspan="2">[% LxERP.t8("Default value") %]</td>
+          </tr>
+
+          [% FOREACH parameter = PARAMETERS %]
+          <tr>
+            <td>
+              [% L.hidden_tag("parameters[+].name", parameter.name) %]
+              [% HTML.escape(parameter.name) %]
+            </td>
+            <td>
+              [% L.select_tag("parameters[].parameter_type", [ [ "text", LxERP.t8("Text") ], [ "number", LxERP.t8("Number") ], [ "date", LxERP.t8("Date") ] ], default=parameter.parameter_type) %]
+            </td>
+            <td>[% L.input_tag("parameters[].description", parameter.description, class="wi-verywide") %]</td>
+            <td>
+              [% L.select_tag("parameters[].default_value_type",
+              [ [ "none", LxERP.t8("No default value") ], [ "current_user_login", LxERP.t8("Current user's login") ], [ "sql_query", LxERP.t8("Result of SQL query") ],
+              [ "fixed_value", LxERP.t8("Fixed value") ] ],
+              default=parameter.default_value_type,
+              id="default_value_type_" _ loop.count) %]
+            </td>
+            <td>
+              [% SET disabled = (parameter.default_value_type == "none") || (parameter.default_value_type == "current_user_login") ? "disabled" : "" %]
+              [% L.textarea_tag("parameters[].default_value", parameter.default_value, id="default_value_" _ loop.count, cols=80, rows=3, disabled=disabled) %]
+            </td>
+          </tr>
+          [% END %]
+        </tbody>
+        [% END %]
+      </table>
+    </div>
+  </form>
+</div>
diff --git a/templates/design40_webpages/custom_data_export_designer/list.html b/templates/design40_webpages/custom_data_export_designer/list.html
new file mode 100644
index 000000000..5827dc841
--- /dev/null
+++ b/templates/design40_webpages/custom_data_export_designer/list.html
@@ -0,0 +1,36 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+<div class="wrapper">
+  [%- INCLUDE 'common/flash.html' %]
+
+  [% IF !SELF.queries.size %]
+  <p>
+  [%- LxERP.t8("No custom reports have been created yet.") %]
+  </p>
+
+  [%- ELSE %]
+  <table class="tbl-list moderate">
+    <colgroup>
+      <col class="wi-wide">
+      <col>
+    </colgroup>
+    <thead>
+      <tr class="listheading">
+        <th>[% LxERP.t8("Name") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      [%- FOREACH query = SELF.queries %]
+      <tr class="listrow">
+        <td>[% L.link(SELF.url_for(action="edit", id=query.id), query.name) %]</td>
+        <td>[% IF query.description %][% query.description %][% END %]</td>
+      </tr>
+      [%- END %]
+    </tbody>
+  </table>
+  [%- END %]
+</div>
diff --git a/templates/design40_webpages/custom_variable_config/form.html b/templates/design40_webpages/custom_variable_config/form.html
new file mode 100644
index 000000000..58cd6fb03
--- /dev/null
+++ b/templates/design40_webpages/custom_variable_config/form.html
@@ -0,0 +1,194 @@
+[% USE HTML -%]
+[% USE LxERP -%]
+[% USE L -%]
+[% USE T8 -%]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+<form action="controller.pl" method="post" id="form">
+ [% L.hidden_tag("id", SELF.config.id) %]
+
+<table class="tbl-horizontal">
+  <caption>[% 'Custom Variable' | $T8 %]</caption>
+  <colgroup><col class="wi-normal"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Module' | $T8 %]</th>
+      <td>[% L.select_tag('module', SELF.modules, value_key='module', title_key='description', default=SELF.module, onchange="update_ic_rows();", class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Variable Name' | $T8 %]<sup>(1)</sup></th>
+      <td>[% L.input_tag("config.name", SELF.config.name, class='initial_focus wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Variable Description' | $T8 %]<sup>(2)</sup></th>
+      <td>[% L.input_tag("config.description", SELF.config.description, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Type' | $T8 %]<sup>(3)</sup></th>
+      <td>[% L.select_tag("config.type", SELF.translated_types, value_key='type', title_key='translation', default=SELF.config.type, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Default value' | $T8 %]<sup>(4)</sup></th>
+      <td>[% L.input_tag("config.default_value", SELF.config.type == 'number' ? LxERP.format_amount(SELF.config.default_value, 2) : SELF.config.default_value, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Options' | $T8 %]<sup>(5)</sup></th>
+      <td>
+        [% L.textarea_tag("config.options", SELF.config.options, cols='5' rows='3' class='wi-wide') %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Is Searchable' | $T8 %]</th>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.searchable', value='1', id='config_searchable_1', label=LxERP.t8('Yes'), checked=(SELF.config.searchable ?  1 : '')) %]
+        [% L.radio_button_tag('config.searchable', value='0', id='config_searchable_0', label=LxERP.t8('No'),  checked=(SELF.config.searchable ? '' :  1)) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Includeable in reports' | $T8 %]</th>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.includeable', value='1', id='config_includeable_1', label=LxERP.t8('Yes'), checked=(SELF.config.includeable ?  1 : ''), onclick='update_included_by_default()') %]
+        [% L.radio_button_tag('config.includeable', value='0', id='config_includeable_0', label=LxERP.t8('No'),  checked=(SELF.config.includeable ? '' :  1), onclick='update_included_by_default()') %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Included in reports by default' | $T8 %]</th>
+      <td class="horizontal">
+        [% SET disabled = SELF.config.includeable ? '' : 'disabled' %]
+        [% L.radio_button_tag('config.included_by_default', value='1', id='config_included_by_default_1', label=LxERP.t8('Yes'), checked=(SELF.config.included_by_default ?  1 : ''), disabled=disabled) %]
+        [% L.radio_button_tag('config.included_by_default', value='0', id='config_included_by_default_0', label=LxERP.t8('No'),  checked=(SELF.config.included_by_default ? '' :  1), disabled=disabled) %]
+      </td>
+    </tr>
+    <tr data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+      <th>[% 'Editable' | $T8 %]<sup>(6)</sup></th>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.flag_editable', value='1', id='config.flag_editable_1', label=LxERP.t8('Yes'), checked=(SELF.flags.editable ?  1 : '')) %]
+        [% L.radio_button_tag('config.flag_editable', value='0', id='config.flag_editable_0', label=LxERP.t8('No'),  checked=(SELF.flags.editable ? '' :  1)) %]
+      </td>
+    </tr>
+    <tr data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+      <th>[% 'Deactivate by default' | $T8 %]<sup>(7)</sup></th>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.flag_defaults_to_invalid', value='1', id='config.flag_defaults_to_invalid_1', label=LxERP.t8('Yes'), checked=(SELF.flags.defaults_to_invalid ?  1 : '')) %]
+        [% L.radio_button_tag('config.flag_defaults_to_invalid', value='0', id='config.flag_defaults_to_invalid_0', label=LxERP.t8('No'),  checked=(SELF.flags.defaults_to_invalid ? '' :  1)) %]
+      </td>
+    </tr>
+    <tr data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+      <th>[% 'Filter by Partsgroups' | $T8 %]</th>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.flag_partsgroup_filter', value='1', id='config_flag_partsgroup_filter_1', label=LxERP.t8('Yes'), checked=(SELF.flags.partsgroup_filter ?  1 : ''), onclick='update_pg_filter_row()') %]
+        [% L.radio_button_tag('config.flag_partsgroup_filter', value='0', id='config_flag_partsgroup_filter_0', label=LxERP.t8('No'),  checked=(SELF.flags.partsgroup_filter ? '' :  1), onclick='update_pg_filter_row()') %]
+      </td>
+    </tr>
+    <tr data-show-for="IC+PGFILTER"[% UNLESS (SELF.module == 'IC' && SELF.flags.partsgroup_filter) %] style="display: none;"[% END %]>
+      <th></th>
+      <td>[% L.select_tag(
+                'config.partsgroups[]',
+                all_partsgroups,
+                id                => "partsgroups",
+                value_key         => "id",
+                title_key         => "partsgroup",
+                default           => SELF.config.partsgroups,
+                default_value_key => "id",
+                multiple          => 1)
+          %]
+          [% L.multiselect2side(
+                "partsgroups",
+                labelsx => LxERP.t8("All partsgroups"),
+                labeldx => LxERP.t8("Partsgroups where variables are shown"))
+          %]
+      </td>
+    </tr>
+    <tr data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+      <td>[% 'Display in basic data tab' | $T8 %]</td>
+      <td class="horizontal">
+        [% L.radio_button_tag('config.first_tab', value='1', id='config.first_tab', label=LxERP.t8('Yes'), checked=(SELF.config.first_tab ?  1 : '')) %]
+        [% L.radio_button_tag('config.first_tab', value='0', id='config.first_tab', label=LxERP.t8('No'),  checked=(SELF.config.first_tab ? '' :  1)) %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="col" style="width:51.0em;">
+   <!--<h3 class="caption">[% 'Annotations' | $T8 %]</h3>-->
+<h3><caption>[% 'Annotations' | $T8 %]</caption></h3>
+<div class="long-description">
+
+<ul class="footnotes">
+  <li><sup>(1)</sup> [% 'The variable name must only consist of letters, numbers and underscores. It must begin with a letter. Example: send_christmas_present' | $T8 %]</li>
+  <li><sup>(2)</sup> [% 'The description is shown on the form. Chose something short and descriptive.' | $T8 %]</li>
+  <li><sup>(3)</sup> [% 'For type "customer" the perl module JSON is required. Please check this on system level: $ ./scripts/installation_check.pl' | $T8 %]</li>
+  <li><sup>(4)</sup> [% 'The default value depends on the variable type:' | $T8 %]
+    <ul>
+      <li>[% 'Text, text field, HTML field and number variables: The default value will be used as-is.' | $T8 %]</li>
+      <li>[% 'Boolean variables: If the default value is non-empty then the checkbox will be checked by default and unchecked otherwise.' | $T8 %]</li>
+      <li>[% 'Date and timestamp variables: If the default value equals \'NOW\' then the current date/current timestamp will be used. Otherwise the default value is copied as-is.' | $T8 %]</li>
+    </ul>
+  </li>
+  <li><sup>(5)</sup> [% 'The available options depend on the varibale type:' | $T8 %]
+    <ul>
+      <li>[% 'Text variables: \'MAXLENGTH=n\' sets the maximum entry length to \'n\'.' | $T8 %]</li>
+      <li>[% 'Text field and HTML field variables: \'WIDTH=w HEIGHT=h\' sets the width and height
+        of the text field. They default to 225 and 90 respectively.' | $T8 %]</li>
+      <li>[% 'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' | $T8 %]</li>
+      <li>[% 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' | $T8 %]</li>
+    </ul>
+  [% 'Other values are ignored.' | $T8 %]</li>
+<div data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+  <li><sup>(6)</sup> [% 'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' | $T8 %] [% 'Otherwise the variable is only available for printing.' | $T8 %]</li>
+</div>
+<div data-show-for="IC"[% UNLESS SELF.module == 'IC' %] style="display: none;"[% END %]>
+  <li><sup>(7)</sup> [% 'A variable marked as \'Deactivate by default\' isn\'t automatically added to all articles, and has to be explicitly added for each desired article in its master data tab. Only then can the variable be used for that article in the records.' | $T8 %]</li>
+</div>
+</ul>
+
+</div><!-- /.long-description -->
+</div><!-- /.col -->
+
+</form>
+</div><!-- /.wrapper -->
+
+
+
+<script type="text/javascript">
+<!--
+function update_included_by_default() {
+  $('INPUT[name="config.included_by_default"]').prop('disabled', !$('#config_includeable_1').prop('checked'));
+}
+
+function update_ic_rows() {
+  $('[data-show-for="IC"]').toggle($('#module').val() === "IC");
+  $('[data-show-for="IC+PGFILTER"]').toggle($('#module').val() === "IC" && $('#config_flag_partsgroup_filter_1').prop('checked'));
+}
+
+function update_pg_filter_row() {
+  $('[data-show-for="IC+PGFILTER"]').toggle($('#module').val() === "IC" && $('#config_flag_partsgroup_filter_1').prop('checked'));
+}
+
+function check_prerequisites() {
+  if (($('#config_type').val() === "select") && ($('#config_options').val() === "")) {
+    alert(kivi.t8('The option field is empty.'));
+    return false;
+  }
+
+  if ($('#config_name').val() === "") {
+    alert(kivi.t8('The name is missing.'));
+    return false;
+  }
+
+  if (!$('#config_name').val().match(/^[a-z][a-z0-9_]*$/i)) {
+    alert(kivi.t8('The name must only consist of letters, numbers and underscores and start with a letter.'));
+    return false;
+  }
+
+  if ($('#config_description').val() === "") {
+    alert(kivi.t8('The description is missing.'));
+    return false;
+  }
+
+  return true;
+}
+-->
+</script>
diff --git a/templates/design40_webpages/custom_variable_config/list.html b/templates/design40_webpages/custom_variable_config/list.html
new file mode 100644
index 000000000..355376489
--- /dev/null
+++ b/templates/design40_webpages/custom_variable_config/list.html
@@ -0,0 +1,68 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<div class="wrapper">
+
+  <div class="select-item control-panel">
+   [% 'Custom variables for module' | $T8 %]
+   [% L.select_tag('module', SELF.modules, value_key='module', title_key='description', default=SELF.module, onchange='show_module_list()') %]
+  </div>
+
+  [% IF SELF.module == 'IC' %]
+    [% SET W="12.5%" %]
+  [% ELSE %]
+    [% SET W="20%" %]
+  [% END %]
+
+  <table id="cvarcfg_list" class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+        <th>[% 'Name' | $T8 %]</th>
+        <th>[% 'Description' | $T8 %]</th>
+        <th>[% 'Type' | $T8 %]</th>
+        <th>[% 'Searchable' | $T8 %]</th>
+        <th>[% 'Includeable in reports' | $T8 %]</th>
+        [% IF SELF.module == 'IC' %]
+        <th>[% 'Editable' | $T8 %]</th>
+        <th>[% 'Deactivate by default' | $T8 %]</th>
+        <th>[% 'Filter by Partsgroups' | $T8 %]</th>
+        <th>[% 'Display in basic data tab' | $T8 %]</th>
+        [% END %]
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH cfg = CONFIGS %]
+      <tr id="cvarcfg_id_[% cfg.id %]">
+        <td class="center dragdrop"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></td>
+        <td><a href="[% SELF.url_for(action='edit', module=SELF.module, id=cfg.id) %]">[% HTML.escape(cfg.name) %]</a></td>
+        <td>[% HTML.escape(cfg.description) %]</td>
+        <td>[% HTML.escape(SELF.get_translation(cfg.type)) %]</td>
+        <td>[% IF cfg.searchable %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        <td>[% IF cfg.included_by_default %][% 'Yes, included by default' | $T8 %][% ELSIF cfg.includeable %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        [% IF SELF.module == 'IC' %]
+        <td>[% IF cfg.flags.match('editable=1') %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        <td>[% IF cfg.flags.match('defaults_to_invalid=1') %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        <td>[% IF cfg.flags.match('partsgroup_filter=1') %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        <td>[% IF cfg.first_tab %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+        [% END %]
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  [% L.sortable_element('#cvarcfg_list tbody', url=SELF.url_for(action='reorder'), with='cvarcfg_id', params='"&module=" + encodeURIComponent($("#module").val())') %]
+
+</div><!-- /.wrapper -->
+
+<script type="text/javascript"><!--
+  function show_module_list() {
+    window.location.href = '[% SELF.url_for(action='list') %]&module=' + encodeURIComponent($('#module').val());
+  }
+--></script>
diff --git a/templates/design40_webpages/customer_vendor/form.html b/templates/design40_webpages/customer_vendor/form.html
new file mode 100644
index 000000000..bceec0898
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/form.html
@@ -0,0 +1,112 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE Dumper %]
+<h1>[% FORM.title %] [% IF SELF.cv.id %] - [% HTML.escape(SELF.cv.displayable_name) %][% END %]</h1>
+[% L.hidden_tag('_cti_enabled', !!LXCONFIG.cti.dial_command) %]
+
+[% cv_cvars = SELF.cv.cvars_by_config %]
+
+<form id='form' method="post" action="controller.pl">
+
+  [% L.hidden_tag('db', FORM.db) %]
+  [% L.hidden_tag('callback', FORM.callback) %]
+  [% L.hidden_tag('cv.id', SELF.cv.id) %]
+
+  [% INCLUDE 'common/flash.html' %]
+
+  [%- SET show_deliveries = ( SELF.cv.id && ((SELF.is_customer && AUTH.assert('sales_all_edit', 1)) || (SELF.is_vendor && AUTH.assert('purchase_all_edit', 1))) ) -%]
+  <div class="tabwidget" id="customer_vendor_tabs">
+    <ul class="ui-tabs">
+      <li><a href="#billing">[% 'Billing Address' | $T8 %]</a></li>
+      [% IF SELF.is_customer %]
+        <li><a href="#additional_billing_addresses">[% 'Additional Billing Addresses' | $T8 %]</a></li>
+      [% END %]
+      <li><a href="#bank">[% 'Bank account' | $T8 %]</a></li>
+      <li><a href="#shipto">[% 'Shipping Address' | $T8 %]</a></li>
+      <li><a href="#contacts">[% 'Contacts' | $T8 %]</a></li>
+      [% IF show_deliveries %]
+        <li><a href="#deliveries">[% 'Supplies' | $T8 %]</a></li>
+      [% END %]
+      [% IF INSTANCE_CONF.get_webdav %]
+        <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+      [% END %]
+      [% IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% FORM.db == 'vendor' ? 'vendor' : 'customer' %]&object_id=[% SELF.cv.id %]">[% 'Attachments' | $T8 %]</a></li>
+      [% END %]
+      <li><a href="#vcnotes">[% 'Notes' | $T8 %]</a></li>
+
+      [% IF ( cv_cvars.size ) %]
+        <li><a href="#custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+      [% END %]
+      [% IF SELF.cv.id %]
+        <li><a href="#price_rules">[% 'Price Rules' | $T8 %]</a></li>
+      [% END %]
+
+      [% IF ( SELF.cv.id && SELF.cv.pricegroup_id && AUTH.assert('part_service_assembly_details', 1) ) %]
+        <li><a href="#price_list">[% 'Price List' | $T8 %]</a></li>
+      [% END %]
+
+      [% IF SELF.cv.id %]
+        [% IF ( FORM.db == 'customer' && AUTH.assert('show_extra_record_tab_customer',1) ) %]
+          <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id _ '&db=' _ FORM.db %]">[% LxERP.t8('Records') %]
+              [%- IF SELF.open_items > 0 %] <span style="color:red;">&nbsp;$</span>[% END %] [%- IF SELF.open_orders > 0 %] <span style="color:red;">&nbsp;!</span>[% END %]</a>
+          </li>
+          <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
+        [% END %]
+        [% IF ( FORM.db == 'vendor' && AUTH.assert('show_extra_record_tab_vendor',1) ) %]
+          <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id _ '&db=' _ FORM.db %]">[% LxERP.t8('Records') %]
+              [%- IF SELF.open_items > 0 %] <span style="color:red;">&nbsp;$</span>[% END %] [%- IF SELF.open_orders > 0 %] <span style="color:red;">&nbsp;!</span>[% END %]</a>
+          </li>
+          <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
+        [% END %]
+      [% END %]
+
+    </ul>
+
+    [% PROCESS "customer_vendor/tabs/billing.html" %]
+    [% IF SELF.is_customer %]
+      [% PROCESS "customer_vendor/tabs/additional_billing_addresses.html" %]
+    [% END %]
+    [% PROCESS "customer_vendor/tabs/bank.html" %]
+    [% PROCESS "customer_vendor/tabs/shipto.html" %]
+    [% PROCESS "customer_vendor/tabs/contacts.html" %]
+    [% IF show_deliveries %]
+      [% PROCESS "customer_vendor/tabs/deliveries.html" %]
+    [% END %]
+    [% PROCESS 'webdav/_list.html' %]
+    [% PROCESS "customer_vendor/tabs/vcnotes.html" %]
+    [% IF ( cv_cvars.size ) %]
+      [% PROCESS "customer_vendor/tabs/custom_variables.html" %]
+    [% END %]
+    [% IF SELF.cv.id %]
+      [% PROCESS "customer_vendor/tabs/price_rules.html" %]
+    [% END %]
+    [% IF ( SELF.cv.id && SELF.cv.pricegroup_id && AUTH.assert('part_service_assembly_details', 1) ) %]
+      [% PROCESS "customer_vendor/tabs/price_list.html" %]
+    [% END %]
+    [% IF SELF.cv.id && ( (FORM.db == 'customer' && AUTH.assert('show_extra_record_tab_customer', 1)) || (FORM.db == 'vendor' && AUTH.assert('show_extra_record_tab_vendor', 1)) ) %]
+      <div id="turnover_stat">[% PROCESS "customer_vendor_turnover/turnover_statistic.html" %]</div>
+    [% END %]
+  </div>
+</form>
+
+<script type="text/javascript"><!--
+  function submitInputButton(action)
+  {
+    var $hidden = $("<input type='hidden' name='action' value='CustomerVendor/" + action + "'>"),
+        $form   = $('#form');
+
+    $form.append($hidden);
+    $form.submit();
+  }
+
+  function check_taxzone_and_ustid() {
+    if ( ($('#cv_taxzone_id').val() == '1') && ($('#cv_ustid').val() == '') ) {
+      alert('[% LxERP.t8('Please enter the sales tax identification number.') %]');
+      return false;
+    }
+    return true;
+  }
+--></script>
diff --git a/templates/design40_webpages/customer_vendor/get_delivery.html b/templates/design40_webpages/customer_vendor/get_delivery.html
new file mode 100644
index 000000000..213e95e23
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/get_delivery.html
@@ -0,0 +1,57 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<div id="delivery">
+
+  <table>
+    <thead>
+    <tr>
+      <th>[% 'Shipping Address' | $T8 %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Order' | $T8 %]</th>
+      <th>[% 'Invdate' | $T8 %]</th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Qty' | $T8 %]</th>
+      <th>[% 'Unit' | $T8 %]</th>
+      [% IF ( SELF.is_customer() ) %]
+        <th>[% 'Sell Price' | $T8 %]</th>
+      [% ELSE %]
+        <th>[% 'Last Cost' | $T8 %]</th>
+      [%- END %]
+    </tr>
+    </thead>
+    <tbody>
+    [% FOREACH row = SELF.delivery %]
+      [% row.script = SELF.is_vendor() ? ( row.invoice ? 'ir' : 'ap' ) : ( row.invoice ? 'is' : 'ar' ) %]
+      <tr>
+        <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
+        <td>
+          [% IF row.id %]
+            <a href="[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]">
+          [% END %]
+          [% HTML.escape(row.invnumber)   || '&nbsp;' %]
+          [% IF row.id %]</a>[% END %]
+        </td>
+        <td>[% IF row.oe_id %]
+              <a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.oe_id) %]'>
+            [% END %]
+          [% HTML.escape(row.ordnumber)   || '&nbsp;' %]
+          [% IF row.oe_id %]</a>[% END %]
+        </td>
+        <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
+        <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
+        <td>[% LxERP.format_amount(HTML.escape(row.qty), 2) || '&nbsp;' %]</td>
+        <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
+        <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
+      </tr>
+    [% END %]
+   </tbody>
+
+  </table>
+
+  [% IF DELIVERY.size == 15 %]
+    <p>[% 'This list is capped at 15 items to keep it fast. If you need a full list, please use reports.' | $T8 %]</p>
+  [% END %]
+
+</div>
diff --git a/templates/design40_webpages/customer_vendor/tabs/additional_billing_addresses.html b/templates/design40_webpages/customer_vendor/tabs/additional_billing_addresses.html
new file mode 100644
index 000000000..9c012a5f9
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/additional_billing_addresses.html
@@ -0,0 +1,109 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+
+<div id="additional_billing_addresses">
+<div class="select-item control-panel">
+  [% 'Billing Address' | $T8 %]
+    [% L.select_tag(
+        'additional_billing_address.id',
+        SELF.additional_billing_addresses,
+        default     = SELF.additional_billing_address.id,
+        value_key   = 'id',
+        title_key   = 'displayable_id',
+        with_empty  = 1,
+        empty_title = LxERP.t8('New address'),
+        onchange    = "kivi.CustomerVendor.selectAdditionalBillingAddress({onFormSet: function(){ additionalBillingAddressMapWidget.testInputs(); kivi.reinit_widgets(); }});",
+      )
+    %]
+</div>
+
+<div class="wrapper">
+
+<div class="buttons">
+  [% 'Default Billing Address' | $T8 %]
+  [% L.yes_no_tag('additional_billing_address.default_address', SELF.additional_billing_address.default_address) %]
+</div>
+
+<div class="item">
+  
+  <table id="additional_billing_address_table" class="tbl-horizontal">
+    <caption>[% 'Name and Address' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% 'Name' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.name', SELF.additional_billing_address.name, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>
+          [% L.input_tag_trim('additional_billing_address.department_1', SELF.additional_billing_address.department_1, class="wi-wide") %]<br>
+          [% L.input_tag_trim('additional_billing_address.department_2', SELF.additional_billing_address.department_2, class="wi-wide addition") %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Street' | $T8 %]</th>
+        <td>
+          [% L.input_tag_trim('additional_billing_address.street', SELF.additional_billing_address.street, class="wi-wide") %]
+
+          <span id="additional_billing_address_map"></span>
+          <script type="text/javascript">
+            additionalBillingAddressMapWidget = new kivi.CustomerVendor.MapWidget('additional_billing_address_');
+            $(function() {
+              additionalBillingAddressMapWidget.render($('#additional_billing_address_map'));
+            });
+          </script>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
+        <td>
+          [% L.input_tag_trim('additional_billing_address.zipcode', SELF.additional_billing_address.zipcode, class="wi-verysmall") %][% L.input_tag_trim('additional_billing_address.city', SELF.additional_billing_address.city, class="wi-wide--verysmall") %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Country' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.country', SELF.additional_billing_address.country, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'GLN' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.gln', SELF.additional_billing_address.gln, class="wi-wide") %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Communication' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% 'Contact' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.contact', SELF.additional_billing_address.contact, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Phone' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.phone', SELF.additional_billing_address.phone, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Fax' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.fax', SELF.additional_billing_address.fax, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'E-mail' | $T8 %]</th>
+        <td>[% L.input_tag_trim('additional_billing_address.email', SELF.additional_billing_address.email, class="wi-wide") %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.item -->
+
+<div class="buttons">
+  [% L.button_tag('submitInputButton("delete_additional_billing_address");', LxERP.t8('Delete address'), class = 'submit') %]
+</div>
+
+</div><!-- /.wrapper -->
+[% IF ( !SELF.additional_billing_address.id ) %]
+  <script type="text/javascript">
+    $('#action_delete_additional_billing_address').hide();
+  </script>
+[% END %]
+</div>
diff --git a/templates/design40_webpages/customer_vendor/tabs/bank.html b/templates/design40_webpages/customer_vendor/tabs/bank.html
new file mode 100644
index 000000000..5c3386f61
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/bank.html
@@ -0,0 +1,58 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %] 
+
+<div id="bank">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+      <caption> [% 'Bank Account' | $T8 %] </caption>
+      <tbody>
+        <tr>
+          <th>[% 'Owner of account' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.depositor', SELF.cv.depositor, class="wi-wide") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'IBAN' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.iban', SELF.cv.iban, class="wi-wide") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Account Number' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.account_number', SELF.cv.account_number, class="wi-wide") %]</td>
+        </tr>
+      </tbody>
+    </table>
+    <table class="tbl-horizontal">
+      <caption> [% 'Bank' | $T8 %] </caption>
+      <tbody>
+        <tr>
+          <th>[% 'Bank' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.bank', SELF.cv.bank, class="wi-normal") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'BIC' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.bic', SELF.cv.bic, class="wi-normal") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Bank Code Number' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.bank_code', SELF.cv.bank_code, class="wi-normal") %]</td>
+        </tr>
+      </tbody>
+    </table>
+    [% IF ( SELF.is_customer ) %] 
+    <table class="tbl-horizontal">
+      <caption> [% 'Mandator' | $T8 %] </caption>
+      <tbody>
+        <tr>
+          <th>[% 'Mandator ID' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.mandator_id', SELF.cv.mandator_id, class="wi-normal") %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Mandate Date of Signature' | $T8 %]</th>
+          <td>[% L.date_tag('cv.mandate_date_of_signature', SELF.cv.mandate_date_of_signature, class="wi-date") %]</td>
+        </tr>
+      </tbody>
+    </table>
+    [% END %] 
+  </div>
+</div>
diff --git a/templates/design40_webpages/customer_vendor/tabs/billing.html b/templates/design40_webpages/customer_vendor/tabs/billing.html
new file mode 100644
index 000000000..ffca9fa1e
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/billing.html
@@ -0,0 +1,344 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE JavaScript %]
+
+<div id="billing">
+
+<div class="wrapper">
+
+[% IF SELF.cv.name %]
+<h2 class="record-title" title="[% IF SELF.is_vendor() %][% 'Vendor Name' | $T8 %][% ELSE %][% 'Customer Name' | $T8 %][% END %]">
+  [% SELF.cv.name %] <small>[% IF SELF.cv.city; IF SELF.cv.name !=""; ", "; END ; SELF.cv.city ; END; %]</small>
+</h2>
+[% END %]
+
+<table class="tbl-horizontal">
+  <caption>[% 'Name and Address' | $T8 %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Greeting' | $T8 %]</th>
+      <td>
+        [% IF INSTANCE_CONF.get_vc_greetings_use_textfield %]
+          [% L.input_tag_trim('cv.greeting', SELF.cv.greeting, class='wi-mediumsmall') %]
+          [% L.select_tag('cv_greeting_select', SELF.all_greetings, default = SELF.cv.greeting, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#cv_greeting").val(this.value);', class='wi-small addition') %]
+        [% ELSE %]
+          [% L.select_tag('cv.greeting', SELF.all_greetings, default = SELF.cv.greeting, value_key = 'description', title_key = 'description', with_empty = 1, class='wi-lightwide') %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% IF SELF.is_vendor() %] [% 'Vendor Name' | $T8 %] [% ELSE %] [% 'Customer Name' | $T8 %] [% END %]</th>
+      <td>[% L.input_tag_trim('cv.name', SELF.cv.name, type='text', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th><label for="cv_natural_person">[% 'natural person' | $T8 %]</label></th>
+      <td>[% L.checkbox_tag('cv.natural_person', checked = SELF.cv.natural_person, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>
+        [% L.input_tag_trim('cv.department_1', SELF.cv.department_1, class='wi-lightwide') %]<br>
+        [% L.input_tag_trim('cv.department_2', SELF.cv.department_2, class='wi-lightwide addition') %]
+      <br>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Street' | $T8 %]</th>
+      <td>
+        [% L.input_tag_trim('cv.street', SELF.cv.street, class='wi-lightwide') %]<button id="billing_map" type="button" class="icon"></button>
+        <script type="text/javascript">
+          billingMapWidget = new kivi.CustomerVendor.MapWidget('cv_', '[% JavaScript.escape(SELF.home_address_for_google_maps) %]');
+          $(function() {
+            billingMapWidget.render($('#billing_map'));
+          });
+        </script>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.zipcode', SELF.cv.zipcode, class='wi-verysmall') %][% L.input_tag_trim('cv.city', SELF.cv.city, class='wi-lightwide--verysmall') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Country' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.country', SELF.cv.country, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'GLN' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.gln', SELF.cv.gln, class='wi-lightwide') %]</td>
+    </tr>
+    [% IF ( SELF.is_customer() ) %]
+    <tr>
+      <th>[% 'Commercial court' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.commercial_court', SELF.cv.commercial_court, class='wi-lightwide') %] </td>
+    </tr>
+    [% END %]
+
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Communication' | $T8 %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Contact' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.contact', SELF.cv.contact, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.phone', SELF.cv.phone, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.fax', SELF.cv.fax, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.email', SELF.cv.email, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Cc E-mail' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.cc', SELF.cv.cc, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Bcc E-mail' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.bcc', SELF.cv.bcc, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% IF SELF.cv.homepage %]
+            <a href="[% IF SELF.cv.homepage.match('http[s]?:\/\/') %][% ELSE %]https://[% END %][% HTML.escape(SELF.cv.homepage) %]" title="[% 'Open in new window' | $T8 %]" target="_blank">[% 'Homepage' | $T8 %]</a>[% ELSE %][% 'Homepage' | $T8 %][% END %]</th>
+      <td>[% L.input_tag_trim('cv.homepage', SELF.cv.homepage, class='wi-lightwide', title = LxERP.t8('Example: http://kivitendo.de')) %]</td>
+    </tr>
+
+    [% IF ( SELF.is_customer() ) %]
+    <tr>
+      <th>[% 'Email of the invoice recipient' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.invoice_mail', SELF.cv.invoice_mail, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Email of the delivery order recipient' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.delivery_order_mail', SELF.cv.delivery_order_mail, class='wi-lightwide') %]</td>
+    </tr>
+    [% END %]
+
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% IF ( SELF.is_vendor() ) %][% 'Vendor' | $T8 %][% ELSE %][% 'Customer' | $T8 %][% END %] [% 'Info & Status' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    [% IF ( 0 && INSTANCE_CONF.get_vertreter ) %]
+      <tr>
+        <th>[% IF SELF.is_vendor() %] [% 'Type of Vendor' | $T8 %] [% ELSE %] [% 'Type of Customer' | $T8 %] [% END %]</th>
+        <td>[% L.select_tag('cv.business_id', SELF.all_business, value_key = 'id', title_key = 'description', default = SELF.cv.business_id, with_empty=1, class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Representative' | $T8 %]</th>
+        <td>[% L.select_tag('cv.salesman_id', SELF.all_salesman_customers, default=SELF.cv.salesman_id, value_key='id', title_key='name', with_empty=1, class='wi-lightwide') %]</td>
+      </tr>
+    [% END %]
+    <!-- PENDENT: zweimal das gleiche Feld aber nicht wirklich angezeigt? Anschauen!!!!!! -->
+    [% IF ( !INSTANCE_CONF.get_vertreter ) %]
+      <tr>
+        <th>[% IF ( SELF.is_vendor() ) %][% 'Type of Vendor' | $T8 %][% ELSE %][% 'Type of Customer' | $T8 %][% END %]</th>
+        <td>[% L.select_tag('cv.business_id', SELF.all_business, default = SELF.cv.business_id, value_key = 'id', title_key = 'description', with_empty=1, class='wi-lightwide') %]</td>
+      </tr>
+    [% END %]
+    [% IF ( SELF.is_customer() && !INSTANCE_CONF.get_vertreter ) %]
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>
+        [% L.select_tag('cv.salesman_id', SELF.all_salesmen, default = SELF.cv.salesman_id, value_key = 'id', title_key = 'safe_name', with_empty = 1, class='wi-lightwide') %]
+      </td>
+    [%- END %]
+    <tr>
+      <th>[% 'Language' | $T8 %]</th>
+      <td>[% L.select_tag('cv.language_id', SELF.all_languages, default = SELF.cv.language_id, value_key = 'id', title_key='description', with_empty=1, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th><label for="cv_obsolete">[% 'Obsolete' | $T8 %]</label> </th>
+      <td>[% L.checkbox_tag('cv.obsolete', checked = SELF.cv.obsolete, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <th colspan="2">
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag('cv.notes', SELF.cv.notes, rows=4, class='wi-small-lightwide') %]
+      </th>
+    </tr>
+    [% IF ( SELF.is_customer() ) %]
+    <tr>
+      <th colspan="2">
+        <span class="label above">[% 'Origin of personal data' | $T8 %]</span>
+        [% L.textarea_tag('cv.contact_origin', SELF.cv.contact_origin, rows=4, class='wi-small-lightwide') %]
+      </th>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Numbers & IDs' | $T8 %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      [% IF SELF.is_vendor() %]
+        <th>[% 'Vendor Number' | $T8 %]</th>
+        <td>[% L.input_tag_trim('cv.vendornumber', SELF.cv.vendornumber, class='wi-normal') %]</td>
+      [% ELSE %]
+        <th>[% 'Customer Number' | $T8 %]</th>
+        <td>[% L.input_tag_trim('cv.customernumber', SELF.cv.customernumber, class='wi-normal') %]</td>
+      [% END %]
+    </tr>
+    <tr>
+      <th>[% 'Tax Number / SSN' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.taxnumber', SELF.cv.taxnumber, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+<!--
+  PENDENT: Ist diese Anmerkung noch gueltig?:
+  Anm.: R&B 15.11.2008     VAT Reg No ist Ust-ID in GB, aber generell sollte es laut Richardson die sales tax id sein
+-->
+      <th>[% 'sales tax identification number' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.ustid', SELF.cv.ustid, class='wi-normal' ) %]</td>
+    </tr>
+    [% IF ( SELF.is_vendor() ) %]
+      <tr>
+          <th>[% 'Customer Number' | $T8 %]</th>
+          <td>[% L.input_tag_trim('cv.v_customer_id', SELF.cv.v_customer_id, class='wi-normal') %]</td>
+      </tr>
+    [% ELSE %]
+      <tr>
+        <th>[% 'our vendor number at customer' | $T8 %]</th>
+        <td>[% L.input_tag_trim('cv.c_vendor_id', SELF.cv.c_vendor_id, class='wi-normal') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Our routing id at customer' | $T8 %]</th>
+        <td>[% L.input_tag_trim('cv.c_vendor_routing_id', SELF.cv.c_vendor_routing_id, size = 20) %]</td>
+      </tr>
+    [% END %]
+<!-- </tbody> -->
+<!-- </table> -->
+<!--
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <caption>[% #'Login details' | $T8 %]</caption>
+  <tbody>
+-->
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Login details' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+<!--
+    <tr>
+      <th class="caption" colspan="2">[% 'Login details' | $T8 %]</th>
+    </tr>
+ -->
+    <tr>
+      <th>[% 'Username' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.username', SELF.cv.username, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Password' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.user_password', SELF.cv.user_password, class='wi-normal') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.col -->
+
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Currency, Prices & Taxes' | $T8 %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    [% IF ( SELF.all_currencies.size ) %]
+      <tr>
+        <th>[% 'Currency' | $T8 %]</th>
+        <td>[% L.select_tag('cv.currency_id', SELF.all_currencies, title_key = 'name', value_key = 'id', default = SELF.cv.currency_id, class='wi-small') %]</td>
+      </tr>
+    [% END %]
+    [% IF ( SELF.is_customer() ) %]
+      <tr>
+        <th>[% 'Price group' | $T8 %]</th>
+        <td>[% L.select_tag('cv.pricegroup_id', SELF.all_pricegroups, default = SELF.cv.pricegroup_id, value_key = 'id', title_key = 'pricegroup', with_empty = 1, class='wi-lightwide') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Tax rate' | $T8 %]</th>
+      <td>[% L.select_tag('cv.taxzone_id', SELF.all_taxzones, default = SELF.cv.taxzone_id, value_key = 'id', title_key = 'description', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+    [% IF ( SELF.is_customer() ) %]
+      <th>[% 'taxincluded checked' | $T8 %]</th>
+      <td>[% L.select_tag('cv.taxincluded_checked', [[undef, LxERP.t8('use user config')], ['1', LxERP.t8('Yes')], ['0', LxERP.t8('No')]], default = SELF.cv.taxincluded_checked, class='wi-lightwide') %]</td>
+    [% END %]
+    </tr>
+    <tr>
+      <th>[% 'Discount' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.discount_as_percent', SELF.cv.discount_as_percent, class='wi-small numeric') %]% </td>
+    </tr>
+    [% IF ( SELF.is_customer() ) %]
+      <tr>
+        <th>[% LxERP.t8("Hourly rate") %]</th>
+        <td>[% L.input_tag_trim("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number, class='wi-small numeric') %]</td>
+      <tr>
+        <th>[% LxERP.t8("Create sales invoices with Factur-X/ZUGFeRD data") %]</th>
+        <td class='wi-wider'>[% L.select_tag("cv.create_zugferd_invoices", SELF.zugferd_settings, default=SELF.cv.create_zugferd_invoices) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Conditions' | $T8 %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Credit Limit' | $T8 %]</th>
+      <td>[% L.input_tag_trim('cv.creditlimit_as_number', SELF.cv.creditlimit_as_number, class='wi-small numeric') %]</td>
+    </tr>
+    [% IF ( SELF.is_customer() ) %]
+      <tr>
+        <th><label for="cv_dunning_lock">[% 'Dunning lock' | $T8 %]</label></th>
+        <td>[% L.checkbox_tag('cv.dunning_lock', checked = SELF.cv.dunning_lock, for_submit=1) %]</td>
+      </tr>
+      <tr>
+        <th><label for="cv_order_lock">[% 'Shoporderlock' | $T8 %]</label></th>
+        <td>[% L.checkbox_tag('cv.order_lock', checked = SELF.cv.order_lock, for_submit=1) %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th><label for="cv_direct_debit">[% 'direct debit' | $T8 %]</label></th>
+      <td>[% L.checkbox_tag('cv.direct_debit', checked = SELF.cv.direct_debit, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+        [% L.select_tag('cv.payment_id', SELF.all_payment_terms, value_key = 'id', title_key = 'description', default = SELF.cv.payment_id, with_empty = 1, class='wi-small-lightwide') %]</td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <span class="label above">[% 'Delivery Terms' | $T8 %]</span>
+        [% L.select_tag('cv.delivery_term_id', SELF.all_delivery_terms, default = SELF.cv.delivery_term_id, value_key = 'id', title_key = 'description', with_empty = 1, class='wi-small-lightwide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+</div><!-- /.wrapper -->
+</div>
diff --git a/templates/design40_webpages/customer_vendor/tabs/contacts.html b/templates/design40_webpages/customer_vendor/tabs/contacts.html
new file mode 100644
index 000000000..0ecbca1ec
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/contacts.html
@@ -0,0 +1,186 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div id="contacts">
+
+<div class="select-item control-panel">
+[% 'Select Contact' | $T8 %][%
+  L.select_tag(
+    'contact.cp_id',
+    SELF.contacts,
+    default = SELF.contact.cp_id,
+    with_empty = 1,
+    empty_title = LxERP.t8('New contact'),
+    value_key = 'cp_id',
+    title_key = 'full_name',
+    onchange = "kivi.CustomerVendor.selectContact({onFormSet: function(){ contactsMapWidget.testInputs();
+                                                                          kivi.CustomerVendor.contacts_update_email_fields();
+                                                                          kivi.reinit_widgets(); }});",
+  )%]
+</div>
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Personal details' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Given Name' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_givenname', SELF.contact.cp_givenname, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Surname' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_name', SELF.contact.cp_name, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Main Contact Person' | $T8 %]</th>
+      <td>[% L.yes_no_tag('contact.cp_main', SELF.contact.cp_main) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Gender' | $T8 %]</th>
+      <td>
+        [% L.select_tag(
+          'contact.cp_gender',
+          [['m', LxERP.t8('male')], ['f', LxERP.t8('female')]],
+          default = SELF.contact.cp_gender,
+          class = 'wi-normal',
+        ) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Birthday' | $T8 %]</th>
+      <td>[% L.date_tag('contact.cp_birthday', SELF.contact.cp_birthday, class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Title' | $T8 %]</th>
+      <td>
+        [% IF INSTANCE_CONF.get_contact_titles_use_textfield %]
+          [% L.select_tag('contact_cp_title_select', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);', class="wi-wide helper") %]
+          [% L.input_tag_trim('contact.cp_title', SELF.contact.cp_title, size = 40, class="wi-wide addition") %]
+        [% ELSE %]
+          [% L.select_tag('contact.cp_title', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1, class="wi-wide helper") %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Project' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_project', SELF.contact.cp_project, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Department & Function' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>
+        [% IF INSTANCE_CONF.get_contact_departments_use_textfield %]
+          [% L.select_tag('contact_cp_abteilung_select', SELF.all_contact_departments, default = SELF.contact.cp_abteilung, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_abteilung").val(this.value);', class='wi-wide helper') %]
+          [% L.input_tag_trim('contact.cp_abteilung', SELF.contact.cp_abteilung, size = 40, class="wi-wide addition") %]
+        [% ELSE %]
+          [% L.select_tag('contact.cp_abteilung', SELF.all_contact_departments, default = SELF.contact.cp_abteilung, value_key = 'description', title_key = 'description', with_empty = 1, class='wi-wide helper') %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Function/position' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_position', SELF.contact.cp_position, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Address' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Street' | $T8 %]</th>
+      <td>
+        [% L.input_tag_trim('contact.cp_street', SELF.contact.cp_street, class="wi-wide") %]
+        <span id="contact_map"></span>
+        <script type="text/javascript">
+          var contactsMapWidget = new kivi.CustomerVendor.MapWidget('contact_cp_');
+          $(function() {
+            contactsMapWidget.render($('#contact_map'));
+          });
+        </script>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Zip, City' | $T8 %]</th>
+      <td>
+        [% L.input_tag_trim('contact.cp_zipcode', SELF.contact.cp_zipcode, class="wi-verysmall") %][% L.input_tag_trim('contact.cp_city', SELF.contact.cp_city, class="wi-wide--verysmall") %]
+      </td>
+    </tr>
+    [% contact_cvars = SELF.contact.cvars_by_config %]
+    [% IF ( contact_cvars.size ) %]
+      <!-- PENDENT: Horizontal Rule -->
+      [% FOREACH var = contact_cvars %]
+        <tr>
+          <th>[% var.config.description | html %]</th>
+          <td>
+            [% INCLUDE 'common/render_cvar_input.html'
+                       cvar_name_prefix = 'contact_cvars.'
+            %]
+          </td>
+        </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Communication' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'E-mail' | $T8 %]</th>
+      <td>[% P.input_email_tag('contact.cp_email', SELF.contact.cp_email, class="update_email wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone1' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_phone1', SELF.contact.cp_phone1, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone2' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_phone2', SELF.contact.cp_phone2, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Fax' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_fax', SELF.contact.cp_fax, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Mobile1' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_mobile1', SELF.contact.cp_mobile1, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Mobile2' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_mobile2', SELF.contact.cp_mobile2, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Sat. Phone' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_satphone', SELF.contact.cp_satphone, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Sat. Fax' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_satfax', SELF.contact.cp_satfax, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Private Phone' | $T8 %]</th>
+      <td>[% L.input_tag_trim('contact.cp_privatphone', SELF.contact.cp_privatphone, class="wi-wide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Private E-mail' | $T8 %]</th>
+      <td>[% P.input_email_tag('contact.cp_privatemail', SELF.contact.cp_privatemail, class="update_email wi-wide") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% L.button_tag('submitInputButton("delete_contact");', LxERP.t8('Delete Contact'), id = 'action_delete_contact', class = 'submit') %]
+  [% IF ( !SELF.contact.cp_id ) %]
+  <script type="text/javascript">
+    $('#action_delete_contact').hide();
+  </script>
+  [% END %]
+</div>
+
+</div><!-- /.cols -->
+
+</div><!-- /#contacts -->
diff --git a/templates/design40_webpages/customer_vendor/tabs/custom_variables.html b/templates/design40_webpages/customer_vendor/tabs/custom_variables.html
new file mode 100644
index 000000000..d90ae82b5
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/custom_variables.html
@@ -0,0 +1,18 @@
+[% USE HTML %]
+[% USE T8 %]
+
+<div id="custom_variables">
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+      <caption>[% 'Custom Variables' | $T8 %]</caption>
+      <tbody>
+        [% FOREACH var = SELF.cv.cvars_by_config %]
+          <tr>
+            <th>[% var.config.description | html %]</th>
+            <td>[% INCLUDE 'common/render_cvar_input.html', cvar_name_prefix = 'cv_cvars.', var_name = '' %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/templates/design40_webpages/customer_vendor/tabs/deliveries.html b/templates/design40_webpages/customer_vendor/tabs/deliveries.html
new file mode 100644
index 000000000..517b3c685
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/deliveries.html
@@ -0,0 +1,55 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+<!-- PENDENT: Element-Klassen neu definieren  -->
+<div id="deliveries">
+
+  <div class="select-item control-panel">
+    <span class="formelement">
+      [% temp = [{shipto_id = 'all', displayable_id = LxERP.t8('All')}] %]
+      [% temp = temp.merge(SELF.shiptos) %]
+      [% 'Select Deliveries' | $T8 %] [%
+        L.select_tag(
+          'delivery_id',
+          temp,
+          value_key = 'shipto_id',
+          title_key = 'displayable_id',
+          with_empty = 1,
+          onchange = "kivi.CustomerVendor.selectDelivery();",
+          class='wi-lightwide',
+          id='delivery_id'
+        )
+      %]
+    </span>
+    <span class="formelement">
+      [% 'From' | $T8 %] [%
+        L.date_tag(
+          'delivery_from',
+          FORM.delivery_from,
+          onchange => "kivi.CustomerVendor.selectDelivery(this.form.delivery_from.value, this.form.delivery_to.value);",
+          class='wi-date'
+        )
+      %]
+    </span>
+    <span class="formelement">
+      &nbsp; [% 'To (time)' | $T8 %] [%
+        L.date_tag(
+          'delivery_to',
+          FORM.delivery_to,
+          onchange => "kivi.CustomerVendor.selectDelivery(this.form.delivery_from.value, this.form.delivery_to.value);",
+          class='wi-date'
+        )
+      %]
+    </span>
+  </div>
+  <!-- PENDENT: ein No-Result-Feature wuerde sich hier noch gut machen -->
+  <div class="wrapper">
+    <div id="delivery">[% 'Please wait!' | $T8 %]</div>
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('#delivery_id option[value=all]').attr('selected','selected');
+  kivi.CustomerVendor.selectDelivery();
+</script>
diff --git a/templates/design40_webpages/customer_vendor/tabs/price_list.html b/templates/design40_webpages/customer_vendor/tabs/price_list.html
new file mode 100644
index 000000000..677306cc7
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/price_list.html
@@ -0,0 +1,10 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE L %]
+
+<div id="price_list">
+<div class="wrapper">
+  [%- LxERP.t8("Loading...") %]
+</div><!-- /.wrapper -->
+</div><!-- /#price_list -->
\ No newline at end of file
diff --git a/templates/design40_webpages/customer_vendor/tabs/price_rules.html b/templates/design40_webpages/customer_vendor/tabs/price_rules.html
new file mode 100644
index 000000000..f76d41452
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/price_rules.html
@@ -0,0 +1,30 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+
+<div id="price_rules">
+<div class="wrapper">
+  <div id='price_rules_customer_report'></div>
+  <div id='price_rules_vendor_report'></div>
+  <script type='text/javascript'>
+    $(function() {
+      window.setTimeout(function(){
+      [% IF SELF.is_customer %]
+        kivi.CustomerVendor.inline_report(
+          '#price_rules_customer_report', 
+          'controller.pl', 
+          { action: 'PriceRule/list', 'filter.item_type_matches[].customer': [% SELF.cv.id %], 'filter.type': 'customer', inline: 1 }
+        );
+      [% END %]
+      [% IF SELF.is_vendor %]
+        kivi.CustomerVendor.inline_report(
+          '#price_rules_vendor_report', 
+          'controller.pl', 
+          { action: 'PriceRule/list', 'filter.item_type_matches[].vendor': [% SELF.cv.id %], 'filter.type': 'vendor', inline: 1 }
+        );
+      [% END %]
+      }, 200);
+    })
+  </script>
+</div><!-- /.wrapper -->
+</div><!-- /#price_rules -->
diff --git a/templates/design40_webpages/customer_vendor/tabs/shipto.html b/templates/design40_webpages/customer_vendor/tabs/shipto.html
new file mode 100644
index 000000000..9af996613
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/shipto.html
@@ -0,0 +1,114 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+
+<div id="shipto">
+<div class="select-item control-panel">
+  [% 'Select Shipping Address' | $T8 %]
+  [% L.select_tag(
+    'shipto.shipto_id',
+    SELF.shiptos,
+    default = SELF.shipto.shipto_id,
+    value_key = 'shipto_id',
+    title_key = 'displayable_id',
+    with_empty = 1,
+    empty_title = LxERP.t8('New shipto'),
+    onchange = "kivi.CustomerVendor.selectShipto({onFormSet: function(){ shiptoMapWidget.testInputs(); kivi.reinit_widgets(); }});",
+  )
+  %]
+</div>
+
+<div class="wrapper">
+
+<div class="item">
+
+  <table id="shipto_table" class="tbl-horizontal">
+    <caption>[% 'Name and Address' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% 'Name' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptoname', SELF.shipto.shiptoname, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>
+          [% L.input_tag_trim('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1, class="wi-wide") %] <br>
+          [% L.input_tag_trim('shipto.shiptodepartment_2', SELF.shipto.shiptodepartment_2, class="wi-wide addition") %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Street' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptostreet', SELF.shipto.shiptostreet, class="wi-wide") %]
+          <span id="shipto_map"></span>
+          <script type="text/javascript">
+            shiptoMapWidget = new kivi.CustomerVendor.MapWidget('shipto_shipto');
+            $(function() {
+              shiptoMapWidget.render($('#shipto_map'));
+            });
+          </script>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
+        <td>
+          [% L.input_tag_trim('shipto.shiptozipcode', SELF.shipto.shiptozipcode, class="wi-verysmall") %][% L.input_tag_trim('shipto.shiptocity', SELF.shipto.shiptocity, class="wi-wide--verysmall", style='width:13.1em;') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Country' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptocountry', SELF.shipto.shiptocountry, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'GLN' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptogln', SELF.shipto.shiptogln, class="wi-wide") %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Communication' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% 'Contact' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptocontact', SELF.shipto.shiptocontact, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Phone' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptophone', SELF.shipto.shiptophone, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Fax' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptofax', SELF.shipto.shiptofax, class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'E-mail' | $T8 %]</th>
+        <td>[% L.input_tag_trim('shipto.shiptoemail', SELF.shipto.shiptoemail, class="wi-wide") %]</td>
+      </tr>
+      [% shipto_cvars = SELF.shipto.cvars_by_config %]
+      [% IF ( shipto_cvars.size ) %]
+        <!-- PENDENT: Horizontal Rule -->
+        [% FOREACH var = shipto_cvars %]
+        <tr>
+          <th>[% var.config.description | html %]</th>
+          <td>
+            [% INCLUDE 'common/render_cvar_input.html', cvar_name_prefix='shipto_cvars.'  %]
+          </td>
+        </tr>
+        [% END %]
+      [% END %]
+    </tbody>
+  </table>
+
+</div><!-- /.item -->
+
+<div class="buttons">
+  [% L.button_tag('submitInputButton("delete_shipto");', LxERP.t8('Delete Shipto'), class = 'submit') %]
+</div>
+
+</div><!-- /.wrapper -->
+</div>
+[% IF ( !SELF.shipto.shipto_id ) %]
+  <script type="text/javascript">
+    $('#action_delete_shipto').hide();
+  </script>
+[% END %]
diff --git a/templates/design40_webpages/customer_vendor/tabs/vcnotes.html b/templates/design40_webpages/customer_vendor/tabs/vcnotes.html
new file mode 100644
index 000000000..3677481e2
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/tabs/vcnotes.html
@@ -0,0 +1,136 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE date %]
+
+<div id="vcnotes">
+
+<div class="wrapper">
+
+<!-- PENDENT: wieso Datum nicht descending sortiert? -->
+[% IF ( SELF.notes && SELF.notes.size ) %]
+<table class="tbl-list width-moderate">
+  <caption>[% 'Follow-Ups' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Delete' | $T8 %]</th>
+      <th>[% 'Subject' | $T8 %]</th>
+      <th>[% 'Created on' | $T8 %]</th>
+      <th>[% 'Created by' | $T8 %]</th>
+      <th>[% 'Follow-Up Date' | $T8 %]</th>
+      <th>[% 'Follow-Up for' | $T8 %]</th>
+      <th>[% 'Follow-Up done' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = SELF.notes %]
+      <tr>
+        <td>
+          [% IF ( !SELF.note || SELF.note.id != row.id ) %]
+            [% L.checkbox_tag('delete_notes[]', value = row.id) %]
+          [% END %]
+        </td>
+        <td>
+          <a href="controller.pl?action=CustomerVendor/edit&db=[% SELF.is_vendor() ? 'vendor' : 'customer' %]&id=[% HTML.url(SELF.cv.id) %]&note_id=[% HTML.url(row.id) %]">[% HTML.escape(row.subject) %]</a>
+        </td>
+        <td>[% row.itime.to_kivitendo | html %]</td>
+        <td>[% row.employee.safe_name | html %]</td>
+        <td>[% row.follow_up.follow_up_date.to_kivitendo | html %]</td>
+        <td>
+          [% FOREACH employee = row.follow_up.created_for_employees -%]
+            [% employee.safe_name | html %][% IF !loop.last %]<br>[% END -%]
+          [% END %]
+        </td>
+        <td>
+          [% IF ( row.follow_up.follow_up_date ) %]
+            [% IF ( row.follow_up.done ) %]
+              [% 'Yes' | $T8 %]
+            [% ELSE %]
+              [% 'No' | $T8 %]
+            [% END %]
+          [% END %]
+        </td>
+      </tr>
+    [% END #/FOREACH %]
+  </tbody>
+</table>
+[% END %]
+
+[% L.hidden_tag('note.id', SELF.note.id) %]
+
+<table class="tbl-horizontal">
+  <caption>
+    [% IF ( SELF.note.id ) %]
+      [% 'Edit note' | $T8 %]
+    [% ELSE %]
+      [% 'Add note' | $T8 %]
+    [% END %]
+  </caption>
+  <tbody>
+    [% IF SELF.note_followup.done -%]
+    <tr class="fu_finished">
+      <th>[% 'Finished' | $T8 %]</th>
+      <td>[% 'by' | $T8 %] [% HTML.escape(SELF.note_followup.done.employee.safe_name) %]</td>
+      <td colspan="2">[% 'at' | $T8 %] [% HTML.escape(SELF.note_followup.done.done_at_as_timestamp_s) %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Subject' | $T8 %]</th>
+      <td>[% L.input_tag_trim('note.subject', SELF.note.subject, class="wi-verywide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Follow-Up On' | $T8 %]</th>
+      <td>
+        [% IF SELF.note_followup.follow_up_date ; SET thedate=SELF.note_followup.follow_up_date ; ELSE; SET thedate=date.format(date.now, '%d.%m.%Y'); END %]
+        [% L.date_tag('note_followup.follow_up_date', thedate, class="wi-date") %]
+      </td>
+    </tr>
+    <tr>
+      <th><label for="note_followup_done" title="[% 'Follow-Up done' | $T8 %]">[% 'Done' | $T8 %]</label></th>
+      <td>[% L.checkbox_tag('note_followup.done', checked = SELF.note_followup.done) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Body' | $T8 %]</th>
+      <td >[% L.textarea_tag('note.body', SELF.note.body, rows=10, class="wi-verywide") %]</td>
+    </tr>
+    <tr>
+      <td>[% 'for' | $T8 %]</td>
+      <td>
+        <table>
+          <tr class="listheading">
+            <th>[% L.checkbox_tag('checkall_checkboxes', label=LxERP.t8('All users'), id='ckeckall', checkall="[data-checkall=1]") %]</th>
+          </tr>
+          [% FOREACH employee = SELF.all_employees %]
+            [% SET checked = 0 %]
+            [% FOREACH cfe = SELF.note_followup.created_for_employees %]
+              [% IF cfe.id == employee.id %][% SET checked = 1 %][% LAST %][% END %]
+            [% END %]
+            <tr class="listrow">
+              <td>[% L.checkbox_tag('note_followup.created_for_employees[]', value=employee.id, checked=checked,
+                                    "data-checkall"=1, class="employee_check", label=employee.safe_name) %]</td>
+            </tr>
+          [% END %]
+        </table>
+      <td>
+      <td>
+        <table>
+          <tr class="listheading">
+            <th>[% LxERP.t8('Users that are a member in this group') %]<br>([% LxERP.t8('click on a group to add the group\'s users') %])</th>
+          </tr>
+          [% FOREACH auth_group = SELF.all_auth_groups %]
+            <tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
+              <td class="listrow1"><b>←&nbsp;[% auth_group.name %]</b>: [% auth_group.description %]</td>
+            </tr>
+            [% FOREACH employee = auth_group.get_employees %]
+              <tr class="listrow0"><td>&nbsp;&nbsp;&nbsp;[% employee.safe_name %]</td></tr>
+            [% END %]
+          [% END %]
+        </table>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+</div>
+</div>
diff --git a/templates/design40_webpages/customer_vendor/test_page.html b/templates/design40_webpages/customer_vendor/test_page.html
new file mode 100644
index 000000000..77b19c6dc
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor/test_page.html
@@ -0,0 +1,58 @@
+[% USE P %]
+
+<h1>Customer Vendor Autocomplete Testpage</h1>
+
+<div class="wrapper">
+
+  Customer: with preselected id 822<br>
+  [% P.customer_vendor.picker('customer_id', 822, type='customer') %]<br>
+
+  <br><hr>
+  Vendor: <br>
+  [% P.customer_vendor.picker('vendor_id', '', type='vendor') %]<br>
+
+  <br><hr>
+  customer with fat change<br>
+  [% P.customer_vendor.picker('customer_id2', '', type='customer', fat_set_item=1) %]<br>
+  <div>id from change <span id='change1'></span></div>
+  <div>greeting from fat change <span id='change2'></span></div>
+
+  <br><hr>
+  fat vendor with change<br>
+  [% P.customer_vendor.picker('vendor_id2', '', type='vendor', fat_set_item=1) %]<br>
+  <div>id  from change<span id='change3'></span></div>
+  <div>greeting from fat change <span id='change4'></span></div>
+
+  <br><hr>
+  this one will be a reinit_widget after 4s:<br>
+  <span id='vendor3' class="customer_vendor_picker">
+  <input id="vendor3_id" class="" type="hidden" name="vendor3_id" value="" data-customer-vendor-picker-data="{&quot;cv_type&quot;:&quot;vendor&quot;}">
+  <input id="vendor3_id_name" type="text" name="" value="">
+  </span>
+
+  <br><hr>
+  this should have three '-' before and after touching:<br>
+  ---[% P.customer_vendor.picker('vendor5_id', '', type='vendor') %]---
+
+  <br><hr>
+  widget including info button and link to edit<br>
+  customer: <br>
+  [% P.customer_vendor.picker('customer_id3', '', type='customer', show_details=1) %]<br>
+  vendor: <br>
+  [% P.customer_vendor.picker('vendor_id3', '', type='vendor', show_details=1) %]<br>
+</div>
+
+<script type="text/javascript">
+ $('#customer_id2').change(function() { $('#change1').html($('#customer_id2').val()) })
+ $('#customer_id2').on('set_item:CustomerVendorPicker', function(e,o) { $('#change2').html(o.greeting) })
+
+ $('#vendor_id2').change(function() { $('#change3').html($('#vendor_id2').val()) })
+ $('#vendor_id2').on('set_item:CustomerVendorPicker', function(e,o) { $('#change4').html(o.greeting) })
+
+window.setTimeout(function() {
+  console.log("adding last one now!");
+  $('#vendor3_id').addClass('customer_vendor_autocomplete');
+  $('#vendor3').addClass('customer_vendor_picker');
+  kivi.reinit_widgets();
+}, 4000);
+</script>
diff --git a/templates/design40_webpages/customer_vendor_turnover/_list_open_items.html b/templates/design40_webpages/customer_vendor_turnover/_list_open_items.html
new file mode 100644
index 000000000..6156e7d5c
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/_list_open_items.html
@@ -0,0 +1,61 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE P %]
+[%- USE HTML %]
+
+<div id="sales_report" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <caption>[%- HTML.escape(title) %]</caption>
+    <thead>
+      <tr>
+        <th>[% 'Type' | $T8 %]</th>
+        <th>[% 'Invoice Number' | $T8 %]</th>
+        <th>[% 'Invoice Date' | $T8 %]</th>
+        <th>[% 'Amount' | $T8 %]</th>
+        <th>[% 'Inv. Duedate' | $T8 %]</th>
+        <th>[% 'Paid' | $T8 %]</th>
+        <th>[% 'Open Amount' | $T8 %]</th>
+        [% IF FORM.db == 'customer' %]
+          <th>[% 'Dunnings (Id -- Dunning Date --Dunning Level -- Dunning Fee)' | $T8 %]</th>
+        [% END %]
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = OPEN_ITEMS %]
+        [% IF FORM.db == 'customer' %]
+          [% IF row.type == 'invoice' %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+          [% ELSIF row.type == 'credit_note' %]
+            [% SET type = 'Credit note (one letter abbreviation)' %]
+          [% ELSE %]
+            [% SET type = 'AR Transaction (abbreviation)' %]
+          [% END %]
+        [% ELSE %]
+          [% IF row.invoice %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+          [% ELSE %]
+            [% SET type = 'AP Transaction (abbreviation)' %]
+          [% END %]
+        [% END %]
+        <tr class="listrow[% loop.count % 2 %]">
+          <td>[% type | $T8 %]</td>
+          <td>[% P.invoice.invoice(row) %]</td>
+          <td>[% row.transdate.to_kivitendo | html %]</td>
+          <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
+          <td>[% row.duedate.to_kivitendo | html %]</td>
+          <td class="numeric">[%- LxERP.format_amount(row.paid, 2) %]</td>
+          <td class="numeric">[%- LxERP.format_amount(row.amount - row.paid,2) %]</td>
+          [% IF FORM.db == 'customer' %]
+            <td>
+            [%- IF row.dunning_config_id != '' %]
+              [%- FOREACH dun = row.dunnings %]
+              [% dun.dunning_id | html %] -- [% dun.transdate.to_kivitendo | html %] -- [% dun.dunning_level | html %] -- [%- LxERP.format_amount(dun.fee, 2) %]<br>
+              [% END %]
+            [% END %]
+            </td>
+          [% END %]
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/_list_open_orders.html b/templates/design40_webpages/customer_vendor_turnover/_list_open_orders.html
new file mode 100644
index 000000000..d2793c89d
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/_list_open_orders.html
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE P %]
+[%- USE HTML %]
+
+<div id="orders_report" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <caption>[%- HTML.escape(title) %]</caption>
+    <thead>
+      <tr>
+        <th>[% 'Type' | $T8 %]</th>
+        <th>[% 'Order/RFQ Number' | $T8 %]</th>
+        <th>[% 'Date' | $T8 %]</th>
+        <th>[% 'Amount' | $T8 %]</th>
+        <th>[% 'Salesman' | $T8 %]</th>
+        <th>[% 'Transaction description' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+
+      [%- FOREACH row = orders %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td>
+          [%- IF row.quotation -%]
+            [% IF FORM.db == 'customer' %][% 'Sales quotation' | $T8 %][% ELSE %][% 'RFQ' | $T8 %][% END %]
+          [%- ELSE -%]
+            [% IF FORM.db == 'customer' %][% 'Sales Order' | $T8 %][% ELSE %][% 'Purchase Order' | $T8 %][% END %]
+          [%- END -%]
+        </td>
+        <td>[% IF row.id %][% P.order.order(row) %][% END %]</td>
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.employee.name | html %]</td>
+        <td>[% row.transaction_description | html %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/_statistic_tabs.html b/templates/design40_webpages/customer_vendor_turnover/_statistic_tabs.html
new file mode 100644
index 000000000..7e3a90da1
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/_statistic_tabs.html
@@ -0,0 +1,25 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<script type="text/javascript">
+  $(function() {
+    $ ( "#statistic_tabs" ).tabs();
+  });
+</script>
+<div class="tabwidget wrapper" id="statistic_tabs">
+  <ul>
+    [% IF FORM.db == "customer" %]<li><a href="#dun_stat">[% 'Dunningstatistic' | $T8 %]</a></li>[% END %]
+    <li><a href="#quotations">[% IF FORM.db == "customer" %][% 'Sales Quotations' | $T8 %][% ELSE %][% 'Request Quotations' | $T8 %][% END %]</a></li>
+    <li><a href="#orders" onclick="kivi.CustomerVendorTurnover.get_orders();">[% 'Orders' | $T8 %]</a></li>
+    <li><a href="#invoices" onclick="kivi.CustomerVendorTurnover.get_invoices();">[% 'Invoices' | $T8 %]</a></li>
+    <li><a href="#mails" onclick="kivi.CustomerVendorTurnover.get_mails();">[% 'Mails' | $T8 %]</a></li>
+    <li><a href="#letters" onclick="kivi.CustomerVendorTurnover.get_letters();">[% 'Letters' | $T8 %]</a></li>
+  </ul>
+  [% IF FORM.db == "customer" %]<div id="dun_stat">[% PROCESS "customer_vendor_turnover/dun_statistic.html" %]</div>[% END %]
+  <div id="quotations"></div>
+  <div id="orders"></div>
+  <div id="invoices"></div>
+  <div id="mails"></div>
+  <div id="letters"></div>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/count_open_items_by_year.html b/templates/design40_webpages/customer_vendor_turnover/count_open_items_by_year.html
new file mode 100644
index 000000000..14fed8a67
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/count_open_items_by_year.html
@@ -0,0 +1,24 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="dun_statistic">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Month/Year' | $T8 %]</th>
+        <th>[% 'Dunnings' | $T8 %]</th>
+        <th>[% 'Highest Dunninglevel' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = SELF.dun_statistic %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td>[% row.date_part | html %]</td>
+        <td>[% row.count | html %]</td>
+        <td>[% row.max | html %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/count_turnover.html b/templates/design40_webpages/customer_vendor_turnover/count_turnover.html
new file mode 100644
index 000000000..1b53e5ea1
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/count_turnover.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div class="wrapper" id="turnover_statistic">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Month/Year' | $T8 %]</td>
+        <th>[% 'Invoices' | $T8 %]</td>
+        <th>[% 'Turnover' | $T8 %]</td>
+        <th>[% 'Net.Turnover' | $T8 %]</td>
+        <th>[% 'Paid' | $T8 %]</td>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = SELF.turnover_statistic %]
+      <tr>
+        <td>[% row.date_part | html %]</td>
+        <td>[% row.count | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount,2) %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.netamount,2) %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.paid,2) %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/dun_statistic.html b/templates/design40_webpages/customer_vendor_turnover/dun_statistic.html
new file mode 100644
index 000000000..5baf44268
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/dun_statistic.html
@@ -0,0 +1,11 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+
+<div class="wrapper">
+[% L.radio_button_tag('period', value='year', label= LxERP.t8('Year'), onclick='kivi.CustomerVendorTurnover.show_dun_stat("y");') %]
+<br>
+[% L.radio_button_tag('period', value='month', label= LxERP.t8('Month'), onclick='kivi.CustomerVendorTurnover.show_dun_stat("m");') %]
+</div>
+<div id="duns" class="wrapper"></div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/email_statistic.html b/templates/design40_webpages/customer_vendor_turnover/email_statistic.html
new file mode 100644
index 000000000..89571410d
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/email_statistic.html
@@ -0,0 +1,37 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE Dumper %]
+
+<div id="email_statistic" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Sent on' | $T8 %]</th>
+        <th>[% 'Subject' | $T8 %]</th>
+        <th>[% 'Record Type' | $T8 %]</th>
+        <th>[% 'Record number' | $T8 %]</th>
+        <th>[% 'From' | $T8 %]</th>
+        <th>[% 'To' | $T8 %]</th>
+        <th>[% 'Status' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = emails %]
+      <tr>
+        <td>[% row.sent_on | html %]</td>
+        <td>
+          <a href="[% SELF.url_for(controller='controller.pl', action => 'EmailJournal/show', id => row.id, back_to => SELF.get_callback) %]">
+            [%- HTML.escape(row.subject) %]
+          </a></td>
+          <td>[% row.type | $T8 %]</td>
+          <td>[% row.recordnumber | html %]</td>
+          <td>[% row.from %]</td>
+          <td>[% row.recipients %]</td>
+          <td>[% row.status %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/invoices_statistic.html b/templates/design40_webpages/customer_vendor_turnover/invoices_statistic.html
new file mode 100644
index 000000000..a2fa8eb7c
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/invoices_statistic.html
@@ -0,0 +1,53 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="invoice_statistic" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Type' | $T8 %]</th>
+        <th>[% 'Invoice Number' | $T8 %]</th>
+        <th>[% 'Invoice Date' | $T8 %]</th>
+        <th>[% 'Amount' | $T8 %]</th>
+        <th>[% 'Inv. Duedate' | $T8 %]</th>
+        <th>[% 'Paid' | $T8 %]</th>
+        <th>[% 'Open Amount' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+
+      [%- FOREACH row = invoices %]
+        [% IF FORM.db == 'customer' %]
+          [% IF row.type == 'invoice' %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSIF row.type == 'credit_note' %]
+            [% SET type = 'Credit note (one letter abbreviation)' %]
+            [% SET link = 'is.pl' %]
+          [% ELSE %]
+            [% SET type = 'AR Transaction (abbreviation)' %]
+            [% SET link = 'ar.pl' %]
+          [% END %]
+          [% ELSE %]
+            [% IF row.invoice %]
+            [% SET type = 'Invoice (one letter abbreviation)' %]
+            [% SET link = 'ir.pl' %]
+          [% ELSE %]
+            [% SET type = 'AP Transaction (abbreviation)' %]
+            [% SET link = 'ap.pl' %]
+          [% END %]
+        [% END %]
+      <tr>
+        <td>[% type | $T8 %]</td>
+        <td><a href="[% link %]?action=edit&id=[% row.id %]">[% row.invnumber | html %]</a></td>
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.duedate.to_kivitendo | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.paid, 2) %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount - row.paid, 2) %]
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/letter_statistic.html b/templates/design40_webpages/customer_vendor_turnover/letter_statistic.html
new file mode 100644
index 000000000..580d98f66
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/letter_statistic.html
@@ -0,0 +1,43 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE Dumper %]
+
+<div id="letter_statistic" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Date' | $T8 %]</th>
+        <th>[% 'Subject' | $T8 %]</th>
+        <th>[% 'Letternumber' | $T8 %]</th>
+        <th>[% 'Contact' | $T8 %]</th>
+        <th>[% 'Author' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = letters %]
+      [% IF row.customer_id %]
+      [% SET is_sales = 1 %]
+      [% ELSE %]
+      [% SET is_sales = 0 %]
+      [% END %]
+      <tr>
+        <td>[% row.date.to_kivitendo | html %]</td>
+        <td>
+          <a href="[% SELF.url_for(controller='controller.pl', action => 'Letter/edit', 'letter.id' => row.id, is_sales=is_sales, back_to => SELF.get_callback) %]">
+            [%- HTML.escape(row.subject) %]
+          </a>
+        </td>
+        <td>
+          <a href="[% SELF.url_for(controller='controller.pl', action => 'Letter/edit', 'letter.id' => row.id, is_sales=is_sales, back_to => SELF.get_callback) %]">
+            [% row.letternumber | html %]
+          </a>
+        </td>
+        <td>[% row.contact.cp_givenname %] [% row.contact.cp_name %]</td>
+        <td>[% row.employee.name %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/order_statistic.html b/templates/design40_webpages/customer_vendor_turnover/order_statistic.html
new file mode 100644
index 000000000..565b922ca
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/order_statistic.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="order_statistic" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Order Number' | $T8 %]</th>
+        <th>[% 'Order Date' | $T8 %]</th>
+        <th>[% 'Amount' | $T8 %]</th>
+        <th>[% 'Delivery Date' | $T8 %]</th>
+        <th>[% 'Transaction description' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = orders %]
+      <tr>
+        <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.reqdate.to_kivitendo | html %]</td>
+        <td>[% row.transaction_description %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/quotation_statistic.html b/templates/design40_webpages/customer_vendor_turnover/quotation_statistic.html
new file mode 100644
index 000000000..fa94c4a94
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/quotation_statistic.html
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div id="quotation_statistic" class="wrapper">
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% IF FORM.db == 'customer' %][% 'Quotation Number' | $T8 %][% ELSE %][% 'RFQ Number' | $T8 %][% END %]</th>
+        <th>[% IF FORM.db == 'customer' %][% 'Quotation Date' | $T8 %][% ELSE %][% 'RFQ Date' | $T8 %][% END %]</th>
+        <th>[% 'Amount' | $T8 %]</th>
+        <th>[% 'Delivery Date' | $T8 %]</th>
+        <th>[% 'Transaction description' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH row = orders %]
+      <tr>
+        <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>
+            [% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
+        <td>[% row.transdate.to_kivitendo | html %]</td>
+        <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
+        <td>[% row.reqdate.to_kivitendo | html %]</td>
+        <td>[% row.transaction_description %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/customer_vendor_turnover/turnover.html b/templates/design40_webpages/customer_vendor_turnover/turnover.html
new file mode 100644
index 000000000..28c8264e4
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/turnover.html
@@ -0,0 +1,15 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE JavaScript -%]
+
+[%- IF open_items %]
+[% open_items %]
+[% END %]
+
+[%- IF open_orders %]
+[% open_orders %]
+[% END %]
+
+[% PROCESS "customer_vendor_turnover/_statistic_tabs.html" %]
diff --git a/templates/design40_webpages/customer_vendor_turnover/turnover_statistic.html b/templates/design40_webpages/customer_vendor_turnover/turnover_statistic.html
new file mode 100644
index 000000000..9b07f11e9
--- /dev/null
+++ b/templates/design40_webpages/customer_vendor_turnover/turnover_statistic.html
@@ -0,0 +1,8 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+<div class="wrapper chart-container" id="turnovers_chart_container" style="position: relative;">
+  [%- LxERP.t8("Loading...") %]
+</div>
+<div id="turnovers"></div>
diff --git a/templates/design40_webpages/datev/export.html b/templates/design40_webpages/datev/export.html
new file mode 100644
index 000000000..081f82eb2
--- /dev/null
+++ b/templates/design40_webpages/datev/export.html
@@ -0,0 +1,53 @@
+[% USE T8 %]
+[%- USE L %]
+<h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
+
+<form method='post' action='[% script | html %]' id='form'>
+
+<table width=100%>
+  <tr>
+    <th>[% 'DATEV Angaben' | $T8 %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <td>[% 'Beraternummer' | $T8 %]</td>
+          <td>[% L.input_tag("beraternr", beraternr, size=10, maxlength=7) %]</td>
+
+          <td>[% 'DFV-Kennzeichen' | $T8 %]</td>
+          <td>[% L.input_tag("dfvkz", dfvkz, size=5, maxlength=2) %]</td>
+        </tr>
+        <tr>
+          <td>[% 'Beratername' | $T8 %]</td>
+          <td>[% L.input_tag("beratername", berater, size=10, maxlength=9) %]</td>
+
+          <td>[% 'Password' | $T8 %]</td>
+          <!-- PENDENT: Maxlength 4 ist ein wenig unrealistisch -->
+          <td>[% L.input_tag("passwort", passwort, size=5, maxlength=4) %]</td>
+        </tr>
+        <tr>
+          <td>[% 'Mandantennummer' | $T8 %]</td>
+          <td>[% L.input_tag("mandantennr", mandantennr, size=10, maxlength=5) %]</td>
+
+          <td>[% 'Medium Number' | $T8 %]</td>
+          <td>[% L.input_tag("datentraegernr", datentraegernr, size=5, maxlength=3) %]</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+
+          <td>[% 'Abrechnungsnummer' | $T8 %]</td>
+          <td>[% L.input_tag("abrechnungsnr", abrechnungsnr, size=5, maxlength=3) %]</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td><hr size=3 noshade></td>
+  </tr>
+</table>
+[%- L.hidden_tag("exporttype",  0) %]
+[%- L.hidden_tag("exportformat",  'csv') %]
+</form>
diff --git a/templates/design40_webpages/datev/export3.html b/templates/design40_webpages/datev/export3.html
new file mode 100644
index 000000000..d36f6522c
--- /dev/null
+++ b/templates/design40_webpages/datev/export3.html
@@ -0,0 +1,27 @@
+[%- USE T8 %]
+[%- USE HTML %]
+  [% 'Working on export' | $T8 %]<br>
+
+  <br>
+  Done.
+  <br>
+
+  <br><b>
+  [% 'CSV Export successful!' | $T8 %]
+
+</b>
+<br/><br/>
+[% IF WARNINGS.size %]
+  <b>[% 'Warning: One or more field value are not in valid DATEV format at:' | $T8 %]</b><br /><br />
+  [%- FOREACH warning = WARNINGS %]
+    [% warning | $T8 %]<br/>
+  [%- END %]
+<br />
+[% END %]
+
+[% IF datev.net_gross_differences.size %]
+[% INCLUDE 'datev/net_gross_difference.html'
+  net_gross_differences     = datev.net_gross_differences,
+  sum_net_gross_differences = datev.sum_net_gross_differences
+%]
+[% END %]
diff --git a/templates/design40_webpages/datev/export_bewegungsdaten.html b/templates/design40_webpages/datev/export_bewegungsdaten.html
new file mode 100644
index 000000000..40a4e812d
--- /dev/null
+++ b/templates/design40_webpages/datev/export_bewegungsdaten.html
@@ -0,0 +1,119 @@
+[% USE T8 %]
+[% USE L %]
+
+<h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
+
+<form method="post" action="[% script %]" id="form">
+<div class="wrapper">
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Zeitraum' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Monat' | $T8 %]</th>
+      <th>[% 'Quartal' | $T8 %]</th>
+      <th>[% 'Period' | $T8 %]</th>
+    </tr>
+    <tr>
+      <td><input checked name="zeitraum" type="radio" value="monat"></td>
+      <td><input name="zeitraum" type="radio" value="quartal"></td>
+      <td><input name="zeitraum" type="radio" value="zeit"></td>
+    </tr>
+    <tr>
+      <td>
+        <select name="monat">
+          <option value="1">[% 'January' | $T8 %]</option>
+          <option value="2">[% 'February' | $T8 %]</option>
+          <option value="3">[% 'March' | $T8 %]</option>
+          <option value="4">[% 'April' | $T8 %]</option>
+          <option value="5">[% 'May' | $T8 %]</option>
+          <option value="6">[% 'June' | $T8 %]</option>
+          <option value="7">[% 'July' | $T8 %]</option>
+          <option value="8">[% 'August' | $T8 %]</option>
+          <option value="9">[% 'September' | $T8 %]</option>
+          <option value="10">[% 'October' | $T8 %]</option>
+          <option value="11">[% 'November' | $T8 %]</option>
+          <option value="12">[% 'December last year period' | $T8 %]</option>
+        </select>
+      </td>
+      <td>
+        <select name="quartal">
+          <option selected value="1">[% 'I' | $T8 %]</option>
+          <option value="2">[% 'II' | $T8 %]</option>
+          <option value="3">[% 'III' | $T8 %]</option>
+          <option value="4">[% 'IV' | $T8 %]</option>
+        </select>
+      </td>
+      <td>[% L.date_tag('transdatefrom') %][% 'bis' | $T8 %][% L.date_tag('transdateto') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="col">
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Gldate' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <th>[% 'From' | $T8 %]</th>
+        <td>[% L.date_tag('gldatefrom') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  [% IF ALL_DEPARTMENTS.as_list.size %]
+    <table class="tbl-horizontal">
+      <caption>[% 'Department' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <td>[% 'Department' | $T8 %]</td>
+          <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1) %]</td>
+        </tr>
+      </tbody>
+    </table>
+  [% END %]
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Options' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        [% IF show_pk_option %]
+          <td>[% 'Export with CV Charts' | $T8 %]</td>
+          <td>[% L.checkbox_tag('use_pk', value => 1, checked => 0) %]</td>
+        [% ELSE %]
+          <td>[% 'Export with CV Charts' | $T8 %]</td>
+          <td>[% L.checkbox_tag('use_pk', value => 1, checked => 0, disabled => 1) %]<br>[% 'Hint: Not all VC Numbers are personal accounts compliant' | $T8 %]</td>
+        [% END %]
+      </tr>
+      <tr>
+        <td>[% 'Lock bookings' | $T8 %]</td>
+        <td>[% L.yes_no_tag('locked', 0) %]</td>
+      </tr>
+      <tr>
+        <td>[% 'Export imported bookings' | $T8 %]</td>
+        <td>[% L.yes_no_tag('imported', 0) %]</td>
+      </tr>
+      <tr>
+        <td>[% 'Export Documents' | $T8 %]</td>
+        [% IF show_documents_option %]
+         <td>[% L.yes_no_tag('documents', 0, disabled => 0) %]</td>
+        [% ELSE %]
+         <td>[% L.yes_no_tag('documents', 0, disabled => 1) %] <font color="gray">[% 'Hint: DMS Feature has to be activated' | $T8 %]</font></td>
+        [% END %]
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.col -->
+</div><!-- /.wrapper -->
+<input type=hidden name=beraternr value="[% beraternr | html %]">
+<input type=hidden name=dfvkz value="[% dfvkz | html %]">
+<input type=hidden name=beratername value="[% beratername | html %]">
+<input type=hidden name=passwort value="[% passwort | html %]">
+<input type=hidden name=mandantennr value="[% mandantennr | html %]">
+<input type=hidden name=datentraegernr value="[% datentraegernr | html %]">
+<input type=hidden name=exportformat value="[% exportformat | html %]">
+<input type=hidden name=abrechnungsnr value="[% abrechnungsnr | html %]">
+<input type=hidden name=exporttype value="[% exporttype | html %]">
+
+</form>
diff --git a/templates/design40_webpages/datev/net_gross_difference.html b/templates/design40_webpages/datev/net_gross_difference.html
new file mode 100644
index 000000000..f2e19e1da
--- /dev/null
+++ b/templates/design40_webpages/datev/net_gross_difference.html
@@ -0,0 +1,27 @@
+[% USE HTML %][% USE LxERP %]
+
+<p>
+ <b>Hinweis:</b>
+</p>
+
+<p>
+ kivitendo speichert Buchungsdaten als aggregierte Nettowerte.
+
+ Das DATEV-Dateiformat hingegen erwartet aufgeteilte Buchungssätze mit
+ Bruttowerten.
+
+ Es ist deshalb technisch nicht immer möglich, aus den vorhandenen
+ aggregierten Nettowerten solche Bruttowerte zu errechnen, sodass für
+ einen Beleg betrachtet die von kivitendo angezeigten und die in den
+ DATEV-Export geschriebenen Bruttowerte exakt übereinstimmen.
+
+ Abweichungen im Cent-Bereich sind in beide Richtungen möglich (Brutto
+ kivitendo ist größer als Brutto DATEV und umgekehrt), werden aber von
+ den Steuerbehörden anstandslos akzeptiert.
+</p>
+
+<p>
+ In dem gerade durchgeführten Export gab es [% net_gross_differences.size | html %]
+ solcher Fälle. Die Summe aller Abweichungen beläuft sich auf
+ [% LxERP.format_amount(sum_net_gross_differences, 2) %].
+</p>
diff --git a/templates/design40_webpages/dbupgrade/SKR04_3804_already_exists.html b/templates/design40_webpages/dbupgrade/SKR04_3804_already_exists.html
new file mode 100644
index 000000000..f326d9db7
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/SKR04_3804_already_exists.html
@@ -0,0 +1,19 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'The account 3804 already exists, the update will be skipped.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/html/ch02s12.html.
+
+<input type="hidden" name="account_exists" value="1">
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/SKR04_3804_update.html b/templates/design40_webpages/dbupgrade/SKR04_3804_update.html
new file mode 100644
index 000000000..3fd517977
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/SKR04_3804_update.html
@@ -0,0 +1,20 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Update SKR04: new tax account 3804 (19%)' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'There are bookings to the account 3803 after 01.01.2007. If you didn\'t change this account manually to 19% the bookings are probably incorrect.' | $T8 %]</p>
+<p>[% 'The account 3804 will not be added automatically.' | $T8 %]</p>
+<p>[% 'Please read the file' | $T8 %]doc/html/ch02s12.html</p>
+
+<input type="hidden" name="bookings_exist" value="1">
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/acc_trans_constraints.html b/templates/design40_webpages/dbupgrade/acc_trans_constraints.html
new file mode 100644
index 000000000..72916cb7f
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/acc_trans_constraints.html
@@ -0,0 +1,95 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+<h1>[% 'Invalid transactions' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'There are invalid transactions in your database.' | $T8 %]</p>
+<p>[% 'The following transactions are concerned:' | $T8 %]</p>
+
+[% IF no_chart_id %]
+  <p>[% 'Transactions without account:' | $T8 %]</p>
+  <table>
+    <tr>
+      <th>[% 'Database ID' | $T8 %]</th>
+      <th>[% 'Gldate' | $T8 %]</th>
+      <th>[% 'Transdate' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'ID' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Reference / Invoice Number' | $T8 %]</th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Notes' | $T8 %]</th>
+      <th>[% 'Employee' | $T8 %]</th>
+      <th>[% 'User' | $T8 %]</th>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <th>[% 'Project Description' | $T8 %]</th>
+    </tr>
+
+    [% SET row_odd = '1' %][% FOREACH row = NO_CHART_ID %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td>[% HTML.escape(row.acc_trans_id) %]</td>
+      <td>[% HTML.escape(row.gldate) %]</td>
+      <td>[% HTML.escape(row.transdate) %]</td>
+      <td>[% HTML.escape(row.amount) %]</td>
+      <td>[% HTML.escape(row.trans_id) %]</td>
+      <td>[% HTML.escape(row.source) %]</td>
+      <td>[% HTML.escape(row.reference) %]</td>
+      <td>[% HTML.escape(row.description) %]</td>
+      <td>[% HTML.escape(row.notes) %]</td>
+      <td>[% HTML.escape(row.name) %]</td>
+      <td>[% HTML.escape(row.user) %]</td>
+      <td>[% HTML.escape(row.projectnumber) %]</td>
+      <td>[% HTML.escape(row.projectdescription) %]</td>
+    </tr>
+    [% END %]
+  </table>
+
+[% END %]
+
+[% IF no_trans_id %]
+  <p>[% 'Transactions without reference:' | $T8 %]</p>
+  <table>
+    <tr>
+      <th>[% 'Database ID' | $T8 %]</th>
+      <th>[% 'Gldate' | $T8 %]</th>
+      <th>[% 'Transdate' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Account Number' | $T8 %]</th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Account Type' | $T8 %]</th>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <th>[% 'Project Description' | $T8 %]</th>
+    </tr>
+
+    [% SET row_odd = '1' %][% FOREACH row = NO_TRANS_ID %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td>[% HTML.escape(row.acc_trans_id) %]</td>
+      <td>[% HTML.escape(row.gldate) %]</td>
+      <td>[% HTML.escape(row.transdate) %]</td>
+      <td>[% HTML.escape(row.amount) %]</td>
+      <td>[% HTML.escape(row.source) %]</td>
+      <td>[% HTML.escape(row.accno) %]</td>
+      <td>[% HTML.escape(row.description) %]</td>
+      <td>[% HTML.escape(row.category) %]</td>
+      <td>[% HTML.escape(row.projectnumber) %]</td>
+      <td>[% HTML.escape(row.projectdescription) %]</td>
+    </tr>
+    [% END %]
+  </table>
+
+[% END %]
+
+<p>[% 'This is a very critical problem.' | $T8 %]</p>
+<p>[% 'Please contact your administrator or a service provider.' | $T8 %]</p>
+<p><a href="http://www.kivitendo.de/partner.html" target="_blank">[% 'Here' | $T8 %]</a> [% 'you can find professional help.' | $T8 %]</p>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/add_file_version_form.html b/templates/design40_webpages/dbupgrade/add_file_version_form.html
new file mode 100644
index 000000000..20ff2c626
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/add_file_version_form.html
@@ -0,0 +1,31 @@
+[%- USE T8 %]
+[%- USE P %]
+[%- USE LxERP %]
+[%- USE HTML %]
+
+<div class="wrapper">
+  <h1>[% 'Missing Files' | $T8 %]</h1>
+  <form name="Form" method="post" action="login.pl">
+    <input type="hidden" name="action" value="login">
+
+    [% 'Please resolve the errors by deleting the invalid database entries or by adding the corresponding files to the expected paths.' | $T8 %]
+    <table class="tbl-list">
+      <thead><tr>
+        <th>[% 'Error Message' | $T8 %]</th>
+      </tr></thead>
+      <tbody>
+        [% FOREACH error = ERRORS %]
+        <tr><td>
+          [% error | html %]
+        </td></tr>
+        [% END %]
+      </tbody>
+    </table>
+    [% P.checkbox_tag(
+      "delete_file_entries_of_missing_files", value=1,
+      label=LxERP.t8("Automatically delete entries for missing files. Ensure that these files are no longer required!")
+    ) %]
+    <br>
+    [% P.submit_tag("rerun_add_file_version", LxERP.t8("Rerun update")) %]
+  </form>
+</div>
diff --git a/templates/design40_webpages/dbupgrade/auth/clients.html b/templates/design40_webpages/dbupgrade/auth/clients.html
new file mode 100644
index 000000000..cabda420c
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/auth/clients.html
@@ -0,0 +1,129 @@
+[% USE LxERP %]
+[% USE L %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% LxERP.t8("Introduction of clients") %]</h1>
+
+<div class="wrapper">
+
+[% L.javascript_tag('jquery.selectboxes', 'jquery.multiselect2side') %]
+
+<p>
+ [% LxERP.t8("kivitendo has been extended to handle multiple clients within a single installation.") %]
+ [% LxERP.t8("Therefore several settings that had to be made for each user in the past have been consolidated into the client configuration.") %]
+ [% LxERP.t8("You have to grant users access to one or more clients.") %]
+ [% LxERP.t8("The user can chose which client to connect to during login.") %]
+</p>
+
+<p>
+ [% LxERP.t8("The access rights a user has within a client instance is still governed by his group membership.") %]
+ [% LxERP.t8("Only groups that have been configured for the client the user logs in to will be considered.") %]
+</p>
+
+<p>
+ [% LxERP.t8("The following list has been generated automatically from existing users collapsing users with identical settings into a single entry.") %]
+ [% LxERP.t8("Please select which client configurations you want to create.") %]
+ [% LxERP.t8("The 'name' is the field shown to the user during login.") %]
+ [% LxERP.t8("It can be changed later but must be unique within the installation.") %]
+</p>
+
+<form method="post" action="controller.pl">
+  [% FOREACH client = SELF.clients %]
+  [% L.hidden_tag("clients[+].dummy", 1) %]
+
+  <h2>[% L.checkbox_tag("clients[].enabled", label=LxERP.t8("Create new client #1", loop.count), checked=client.enabled) %]</h2>
+
+  <table>
+    <tr>
+    <th colspan="6">[% LxERP.t8("General settings") %]</th>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("Client name") %]:</td>
+    <td>[% L.input_tag("clients[].name", client.name) %]</td>
+
+    <td class="right">[% LxERP.t8("Company name") %]:</td>
+    <td>[% L.input_tag("clients[].company", client.company) %]</td>
+
+    <td class="right">[% LxERP.t8("Address") %]:</td>
+    <td>[% L.textarea_tag("clients[].address", client.address, rows=4, cols=40) %]</td>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("Tax number") %]:</td>
+    <td>[% L.input_tag("clients[].taxnumber", client.taxnumber) %]</td>
+
+    <td class="right">[% LxERP.t8("VAT ID") %]:</td>
+    <td>[% L.input_tag("clients[].co_ustid", client.co_ustid) %]</td>
+
+    <td class="right">[% LxERP.t8("DUNS-Nr") %]:</td>
+    <td>[% L.input_tag("clients[].duns", client.duns) %]</td>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("SEPA creditor ID") %]:</td>
+    <td colspan="5">[% L.input_tag("clients[].sepa_creditor_id", client.sepa_creditor_id) %]</td>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("Print templates") %]:</td>
+    <td colspan="5">[% L.select_tag("clients[].templates", SELF.templates, default=client.templates) %]</td>
+    </tr>
+
+    <tr>
+    <th colspan="6">[% LxERP.t8("User access") %]</th>
+    </tr>
+
+    <tr>
+    <td>[% LxERP.t8("Users with access to this client") %]:</td>
+
+    <td colspan="6" class="clearfix">
+      [% L.select_tag('clients[].users[]', SELF.users, id='users_multi_' _ loop.count, value_key='id', title_key='login', default=client.users, multiple=1) %]
+    </td>
+    </tr>
+
+    <tr>
+    <td>[% LxERP.t8("Groups that are valid for this client for access rights") %]:</td>
+
+    <td colspan="6" class="clearfix">
+      [% L.select_tag('clients[].groups[]', SELF.groups, id='groups_multi_' _ loop.count, value_key='id', title_key='name', default=client.groups, multiple=1) %]
+    </td>
+    </tr>
+
+    <tr>
+    <th colspan="6">[% LxERP.t8("Database settings") %]</th>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("Database Host") %]:</td>
+    <td>[% L.input_tag("clients[].dbhost", client.dbhost) %]</td>
+
+    <td class="right">[% LxERP.t8("Port") %]:</td>
+    <td>[% L.input_tag("clients[].dbport", (client.dbport || 5432)) %]</td>
+
+    <td class="right">[% LxERP.t8("Database name") %]:</td>
+    <td>[% L.input_tag("clients[].dbname", client.dbname) %]</td>
+    </tr>
+
+    <tr>
+    <td class="right">[% LxERP.t8("User") %]:</td>
+    <td>[% L.input_tag("clients[].dbuser", client.dbuser) %]</td>
+
+    <td class="right">[% LxERP.t8("Password") %]:</td>
+    <td>[% L.input_tag("clients[].dbpasswd", client.dbpasswd) %]</td>
+    </tr>
+
+  </table>
+
+  [% L.multiselect2side('users_multi_'  _ loop.count, labelsx => LxERP.t8('All users'),  labeldx => LxERP.t8('Users with access')) %]
+  [% L.multiselect2side('groups_multi_' _ loop.count, labelsx => LxERP.t8('All groups'), labeldx => LxERP.t8('Groups valid for this client')) %]
+  [% END %]
+
+  <p>
+    [% L.hidden_tag('action', 'Admin/apply_dbupgrade_scripts') %]
+    [% L.submit_tag('dummy', LxERP.t8('Continue')) %]
+  </p>
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/auth/clients_webdav.html b/templates/design40_webpages/dbupgrade/auth/clients_webdav.html
new file mode 100644
index 000000000..31b84a79e
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/auth/clients_webdav.html
@@ -0,0 +1,28 @@
+[% USE LxERP %]
+[% USE L %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% LxERP.t8("Introduction of clients") %] -- [% LxERP.t8("Handling of WebDAV") %]</h1>
+
+<div class="wrapper">
+
+<p>
+  [% LxERP.t8("The WebDAV feature has been used.") %]
+  [% LxERP.t8("With the introduction of clients each client gets its own WebDAV folder.") %]
+  [% LxERP.t8("In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.") %]
+  [% LxERP.t8("All the other clients will start with an empty set of WebDAV folders.") %]
+</p>
+
+<form method="post" action="controller.pl">
+  <p>
+    [% LxERP.t8("Client to assign the existing WebDAV folders to") %]:
+    [% L.select_tag('client_id', SELF.clients, default=default_client.id, title_key='name') %]
+  </p>
+  <p>
+    [% L.hidden_tag('action', 'Admin/apply_dbupgrade_scripts') %]
+    [% L.submit_tag('dummy', LxERP.t8('Continue')) %]
+  </p>
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/contacts_convert_cp_birthday_to_date_form.html b/templates/design40_webpages/dbupgrade/contacts_convert_cp_birthday_to_date_form.html
new file mode 100644
index 000000000..d46419acd
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/contacts_convert_cp_birthday_to_date_form.html
@@ -0,0 +1,52 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% LxERP.t8('Conversion of "birthday" contact person attribute') %]</h1>
+
+<div class="wrapper">
+
+<p>
+  [% LxERP.t8('The contact person attribute "birthday" is converted from a free-form text field into a date field.') %]
+  [% LxERP.t8('This requires you to manually correct entries for which an automatic conversion failed and to check those for which it succeeded.') %]
+</p>
+
+[% BLOCK birthday_table %]
+  <table>
+
+    <tr>
+      <th>[% LxERP.t8('Database ID') %]</th>
+      <th>[% LxERP.t8('Name') %]</th>
+      <th>[% LxERP.t8('Given Name') %]</th>
+      <th>[% LxERP.t8('Birthday (before conversion)') %]</th>
+      <th>[% LxERP.t8('Birthday (after conversion)') %]</th>
+    </tr>
+
+    [% FOREACH row IN data %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <input type="hidden" name="cp_id_[% row.row_index %]" value="[% row.cp_id %]">
+
+        <td>[% row.cp_id %]</td>
+        <td>[% row.cp_givenname | html %]</td>
+        <td>[% row.cp_name | html %]</td>
+        <td>[% row.cp_birthday_old | html %]</td>
+        <td>[% L.date_tag('cp_birthday_'_ row.row_index, row.cp_birthday) %]</td>
+      </tr>
+    [% END %]
+
+  </table>
+[% END %]
+
+<form action="[% script %]" method="POST">
+  <h2>[% LxERP.t8('Entries for which automatic conversion failed:') %]</h2>
+  [% PROCESS birthday_table data = data %]
+
+  <h2>[% LxERP.t8('Entries for which automatic conversion succeeded:') %]</h2>
+  [% PROCESS birthday_table data = auto_data %]
+
+  <input type="hidden" name="row_length" value="[% row_length %]">
+  <input type="hidden" name="action" value="LoginScreen/login">
+  <input type="submit" name="form_submitted" value="save">
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/cp_greeting_update_form.html b/templates/design40_webpages/dbupgrade/cp_greeting_update_form.html
new file mode 100644
index 000000000..92636e442
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/cp_greeting_update_form.html
@@ -0,0 +1,43 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'cp_greeting to cp_gender migration' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<br>
+<p>The method for generating greetings ("Dear Mr. Smith") is being changed so the greeting is controlled by the gender. For this a new database field cp_gender is introduced, while the old database field cp_greeting will be removed. The various translations (Mr./Herr/Monsieur) will be stored in the database, under generic_translations. The print variable cp_greeting still exists, however, so print templates don't have to be changed, and the variable is assigned according to the gender of the contact person and the desired language.</p>
+
+<p>During the conversion process all contact persons need to be assigned a gender. The gender is detected automatically where possible, but in some cases will have to be set manually.</p>
+
+During the conversion process:<br>
+1. All contact persons will have their gender set to "m" (male) as a default<br>
+2. All contact persons where the greeting contains "frau,mrs,miss" are set to "f" (female)<br>
+
+<p>The gender of the following contact persons couldn't be determined automatically from the greeting, please set the gender manually:</p>
+[% gender_table %]
+
+
+<p>Please enter your desired default greeting for men and women. To change the
+default greeting or add a greeting in more languages, go to: System -> Languages -> Greetings
+</p>
+
+<p>
+Greeting for men: [% default_greeting_text_male %] <br>
+Greeting for women: [% default_greeting_text_female %] <br>
+</p>
+
+<br><br>
+The data from the cp_greeting field will now be dropped. To prevent any data loss if you used the cp_greeting field for anything else, we suggest you transfer this information to the cp_title field:
+<br>
+[% title_table %]
+
+<input type=hidden name="do_migrate" value="1">
+<input type=submit VALUE="submit">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/default_bin_parts.html b/templates/design40_webpages/dbupgrade/default_bin_parts.html
new file mode 100644
index 000000000..0354b4e2f
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/default_bin_parts.html
@@ -0,0 +1,169 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE JavaScript %]
+
+<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
+
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript">
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH warehouse = WAREHOUSES_it %]
+  warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+  warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+  warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+  [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
+  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
+  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
+  [% END %]
+  [% END %]
+  //var rowcount = [% rowcount %];
+  //var rowcount = 3; //[% rowcount %];
+  function warehouse_selected(warehouse_id, bin_id, loop) {
+    var control = document.getElementById("bin_id_" + loop);
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    var warehouse_index = 0;
+
+    for (i = 0; i < warehouses.length; i++)
+      if (warehouses[i]['id'] == warehouse_id) {
+        warehouse_index = i;
+        break;
+      }
+
+    var warehouse = warehouses[warehouse_index];
+    var bin_index = 0;
+
+    for (i = 0; i < warehouse['bins'].length; i++)
+      if (warehouse['bins'][i]['id'] == bin_id) {
+        bin_index = i;
+        break;
+      }
+
+    for (i = 0; i < warehouse['bins'].length; i++) {
+      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+    }
+
+
+    control.options[bin_index].selected = true;
+  }
+
+  function bin_match(rowcount) {
+    for (i = 1; i <= rowcount + 1; i++) {              // über alle parts_id
+      var lagerplatz = document.getElementById("bin_" + i).value;
+      var control = document.getElementById("bin_id_" + i);
+      var bin_index = 0;
+      for (j = 0; j < warehouses.length; j++) {       // über alle lager
+        var warehouse = warehouses[j];
+
+        for (k = 0; k < warehouse['bins'].length; k++) {       // über alle lagerplätze
+
+          if (lagerplatz == warehouse['bins'][k]['description']) {
+            var lager = document.getElementById("warehouse_id_" + i);
+            lager.selectedIndex = j;
+            bin_index = k;
+            for (bin_i = 0; bin_i < warehouse['bins'].length; bin_i++) {
+              control.options[bin_i] = new Option(warehouse['bins'][bin_i]['description'], warehouse['bins'][bin_i]['id']);
+            }
+            control.options[bin_index].selected = true;
+            break;
+            /*var lagerplatz = document.getElementById("bin_id_" + i);
+            alert('lagerplatz ' + lagerplatz.value);
+            lagerplatz.selectedIndex = k; */
+          }
+
+        }
+      }
+    }
+
+  }
+
+
+  $(function() {
+    warehouse_selected([% warehouse_id %], [% bin_id %]);
+  })
+</script>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+  <input type="hidden" name="action" value="login">
+  <input type="hidden" name="continued" value="1">
+
+  <p>[% 'There are Bins defined in your Inventory.' | $T8 %]</p>
+  <p>[% 'The Bins in Inventory were only a information text field.' | $T8 %]</p>
+  <p>[% 'This has been changed in this version, therefore please change the "old" bins to some real warehouse bins.' | $T8 %]</p>
+  <p>[% 'If your old bins match exactly Bins in the Warehouse CLICK on <b>AUTOMATICALLY MATCH BINS</b>.' | $T8 %]</p>
+  <p>[% 'Otherwise you can simply check create warehouse and bins and define a name for the warehouse (Bins will be created automatically) and then continue'  | $T8 %]</p>
+  <p>[% 'Empty selection for warehouse will not be added, even if the old bin is still visible (use back and forth to edit again).'  | $T8 %]</p>
+
+<table>
+<thead>
+  <tr>
+    <th>[% 'Partnumber' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Bin' | $T8 %]</th>
+    <th>[% 'Default Warehouse' | $T8 %]</th>
+    <th>[% 'Default Bin' | $T8 %]</th>
+  </tr>
+</thead>
+
+  [% SET row_odd = '1' %]
+  [% FOREACH row = PARTS %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td> [% HTML.escape(row.partnumber) %]</a></td>
+      <td> [% HTML.escape(row.description) %]</a></td>
+      <td>
+        [% HTML.escape(row.bin) %]
+        <input type="hidden" id="bin_[% loop.count %]" name="bin_[% loop.count %]" value="[% HTML.escape(row.bin) %]">
+      </td>
+      <td>
+        <input type="hidden" name='partid_[% loop.count %]' value='[% HTML.escape(row.id) %]'>
+        <select id="warehouse_id_[% loop.count %]" name="warehouse_id_[% loop.count %]" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0, [% loop.count %])">
+        [% FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id==warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+        [% END %]
+        <option value=""[% IF warehouse_id == 0 %] selected[% END %]></option>
+        </select>
+      </td>
+      <td><select id="bin_id_[% loop.count %]" name="bin_id_[% loop.count %]"></select></td>
+    </tr>
+    [% SET rowcount = loop.count %]
+  [% END %]
+</table>
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+
+<table class="tbl-horizontal">
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% '<b>Automatically create new bins</b> in the following warehouse if not selected in the list above' | $T8 %]</th>
+      <td><input type="checkbox" name="create_new_bins">/td>
+    </tr>
+    <tr>
+      <th>[% '<b>Automatically create new bins</b> in the following warehouse if not selected in the list above' | $T8 %]</th>
+      <td>
+        <select id="warehouse_id_default" name="warehouse_id_default">
+        [% FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id  == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+        [% END %]
+        <option value=""[% IF warehouse_id == 0 %] selected[% END %] ></option>
+        </select>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]">
+  <input style="background-color:#FFEE66" type="button" value="[% 'AUTOMATICALLY MATCH BINS' | $T8 %]" onclick="bin_match([% rowcount %])">
+  <input type="submit" value="[% 'Continue' | $T8 %]">
+</div>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/default_bin_parts_no_warehouse.html b/templates/design40_webpages/dbupgrade/default_bin_parts_no_warehouse.html
new file mode 100644
index 000000000..97f03287a
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/default_bin_parts_no_warehouse.html
@@ -0,0 +1,74 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+<input type="hidden" name="continued" value="1">
+
+<p>[% 'There are Bins defined in your master data.' | $T8 %]</p>
+<p>[% 'The Bins in master data were only a information text field.' | $T8 %]</p>
+<p>[% 'This has been changed in this version.' | $T8 %]</p>
+<p>[% 'Unfortunately you have no warehouse defined.' | $T8 %]</p>
+
+<p>[% 'Three Options:' | $T8 %]</p>
+<p>[% '<b> I DO NOT CARE</b> Please click continue and the following data (see list) will be deleted:' | $T8 %]</p>
+<p>[% '<b> I DO CARE!</b> Please click back and cancel the update and come back after there has been at least one warehouse defined with bin(s).:' | $T8 %]</p>
+<p>[% '<b> I DO CARE!</b> Please check create warehouse and bins and define a name for the warehouse (Bins will be created automatically) and then continue'  | $T8 %]</p>
+
+<table class="tbl-list">
+<thead>
+  <tr>
+    <th>[% 'Partnumber' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Master Data Bin Text Deleted' | $T8 %]</th>
+  </tr>
+</thead>
+
+<tbody>
+
+  [% SET row_odd = '1' %]
+  [% FOREACH row = PARTS %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td>[% HTML.escape(row.partnumber) %]</a></td>
+      <td>[% HTML.escape(row.description) %]</a></td>
+      <td>
+        [% HTML.escape(row.bin) %]
+        <input type="hidden" name='partid_[% loop.count %]' value='[% HTML.escape(row.id) %]'>
+        <input type="hidden" id="bin_[% loop.count %]" name="bin_[% loop.count %]" value="[% HTML.escape(row.bin) %]">
+      </td>
+    </tr>
+    [% SET rowcount = loop.count %]
+  [% END %]
+  <input type="hidden" name="rowcount" value="[% rowcount %]">
+
+</tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'New Bins' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Automatically create new bins' | $T8 %]</th>
+      <td><input type="checkbox" name="create_new_bins"></td>
+    </tr>
+    <tr>
+      <th>[% 'In the following new warehouse ' | $T8 %]</th>
+      <td><input type="text" name="new_warehouse"></td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  <input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]" class="neutral">
+  <input type="submit" value="[% 'Continue' | $T8 %]">
+</div>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/error.html b/templates/design40_webpages/dbupgrade/error.html
new file mode 100644
index 000000000..ff5089f83
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/error.html
@@ -0,0 +1,15 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<div class="wrapper">
+
+<p>
+  [% LxERP.t8('The database update/creation did not succeed. The file #1 contained the following error:', file) | html %]
+  <br>
+  [% error %]
+  <br>
+  [% 'All changes in that file have been reverted.' | $T8 %]
+</p>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/erzeugnisnummern.html b/templates/design40_webpages/dbupgrade/erzeugnisnummern.html
new file mode 100644
index 000000000..8a23f0891
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/erzeugnisnummern.html
@@ -0,0 +1,64 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% 'Double partnumbers' | $T8 %]</h1>
+
+<script type="text/javascript">
+  function show_parts(vc) {
+    var width = 750;
+    var height = 550;
+    var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
+    url = "controller.pl?action=LoginScreen/login&upgrade_action=filter_parts&no_layout=1"
+    //alert(url);
+    window.open(url, "_new_generic", parm);
+  }
+</script>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+<input type="hidden" name="continued" value="1">
+
+<p>[% 'There are double partnumbers in your database.' | $T8 %]</p>
+<p>[% 'From this version on the partnumber of services, articles and assemblies have to be unique.' | $T8 %]</p>
+<p>[% 'So far you could use one partnumber for severel parts, for example a service and an article.' | $T8 %]</p>
+<p>[% 'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' | $T8 %]</p>
+
+<p>[% 'Please change the partnumber of the following parts and run the update again:' | $T8 %]</p>
+<table>
+  <tr>
+    <th>[% 'Partnumber' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Unit' | $T8 %]</th>
+    <th>[% 'Notes' | $T8 %]</th>
+    <th>[% 'EAN' | $T8 %]</th>
+    <th>[% 'Service, assembly or part' | $T8 %]</th>
+    <th>[% 'Obsolete' | $T8 %]</th>
+  </tr>
+
+  [% SET row_odd = '1' %][% FOREACH row = PARTS %]
+  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+    <td><input type="text" name='partnumber_[% loop.count %]' value='[% HTML.escape(row.partnumber) %]'></td>
+    <input type="hidden" name='partid_[% loop.count %]' value='[% HTML.escape(row.id) %]'>
+    <td> [% HTML.escape(row.description) %]</a></td>
+    <td>[% HTML.escape(row.unit) %]</td>
+    <td>[% HTML.escape(row.notes) %]</td>
+    <td>[% HTML.escape(row.ean) %]</td>
+    <td>[% IF row.assembly %] [% 'assembly' | $T8 %] [% ELSE %] [% IF row.inventory_accno_id %] [% 'part' | $T8 %] [% ELSE %] [% 'service' | $T8 %] [% END %] [% END %]</td>
+    <td>[% IF row.obsolete %][% LxERP.t8("Obsolete") %][% ELSE %][% LxERP.t8("Not obsolete") %][% END %]</td>
+  </tr>
+  [% SET rowcount = loop.count %]
+  [% END %]
+  <input type="hidden" name="rowcount" value="[% rowcount %]">
+</table>
+
+<input type="button" value="[% 'Show all parts' | $T8 %]" onclick="show_parts('customer')">
+<br>
+<br>
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/footer.html b/templates/design40_webpages/dbupgrade/footer.html
new file mode 100644
index 000000000..cd557fe50
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/footer.html
@@ -0,0 +1,9 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<p>[% '...done' | $T8 %]</p>
+
+<form action="[% IF is_admin %]controller.pl[% ELSE %]login.pl[% END %]">
+   <input type="hidden" name="action" value="[% IF is_admin %]Admin/apply_dbupgrade_scripts[% ELSE %]company_logo[% END %]">
+   <div class="buttons"><input type="submit" value="[% 'Continue' | $T8 %]"></div>
+</form>
diff --git a/templates/design40_webpages/dbupgrade/header.html b/templates/design40_webpages/dbupgrade/header.html
new file mode 100644
index 000000000..0bac8e726
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/header.html
@@ -0,0 +1,4 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Dataset upgrade' | $T8 %] ([% HTML.escape(dbname) %])</h1>
diff --git a/templates/design40_webpages/dbupgrade/no_default_currency.html b/templates/design40_webpages/dbupgrade/no_default_currency.html
new file mode 100644
index 000000000..4e3e7197c
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/no_default_currency.html
@@ -0,0 +1,21 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'No default currency' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'You have never worked with currencies.' | $T8 %]</p>
+<p>[% 'That is why kivitendo could not find a default currency.' | $T8 %]</p>
+<p>[% 'From this version on it is necessary to name a default value.' | $T8 %]</p>
+<p>[% 'Please enter the currency you are working with.' | $T8 %]</p>
+
+<input name="defaultcurrency" value="EUR">
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/orphaned_currencies.html b/templates/design40_webpages/dbupgrade/orphaned_currencies.html
new file mode 100644
index 000000000..6f1f5ef0c
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/orphaned_currencies.html
@@ -0,0 +1,48 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+<h1>[% 'Orphaned currencies' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+<input type="hidden" name="defaultcurrency" value="[% HTML.escape(defaultcurrency) %]">
+
+<p>[% 'There are undefined currencies in your system.' | $T8 %]</p>
+<p>[% 'The following currencies have been used, but they are not defined:' | $T8 %]</p>
+[% FOREACH row = ORPHANED_CURRENCIES %]
+<input type="text" name="[% row.name %]" value="[% HTML.escape(row.curr) %]"><br>
+<input type="hidden" name="old_[% row.name %]" value="[% HTML.escape(row.curr) %]">
+[% END %]
+<p>[% 'There are several options you can handle this problem, please select one:' | $T8 %]</p>
+
+<table width="100%">
+
+<tr>
+<td>
+[% L.radio_button_tag('continue_options',
+    value => 'insert',
+    disabled => 0,
+    checked  => 0) %]
+&nbsp;[% '(recommended) Insert the used currencies in the system. You can simply change the name of the currencies by editing the textfields above. Do not use a name of a currency that is already in use.' | $T8 %] <br>
+[% L.radio_button_tag('continue_options',
+    value => 'replace',
+    disabled => 0,
+    checked  => 0) %]
+&nbsp;[% 'Replace the orphaned currencies by other not orphaned currencies. To do so, please delete the currency in the textfields above and replace it by another currency. You could loose or change unintentionally exchangerates. Go on very carefully since you could destroy transactions.' | $T8 %] <br>
+[% L.radio_button_tag('continue_options',
+    value => 'break_up',
+    disabled => 0,
+    checked  => 0) %]
+&nbsp;[% 'Break up the update and contact a service provider.' | $T8 %]
+</tr>
+</td>
+</table>
+
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/show_partlist.html b/templates/design40_webpages/dbupgrade/show_partlist.html
new file mode 100644
index 000000000..f04c950ca
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/show_partlist.html
@@ -0,0 +1,93 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% 'Show parts' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form method="post" action="controller.pl">
+  [% L.hidden_tag("action", "LoginScreen/login") %]
+  [% L.hidden_tag("upgrade_action", "filter_parts") %]
+  [% L.hidden_tag("no_layout", 1) %]
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Partnumber' | $T8 %]</th>
+      <td>[% L.input_tag("filter_partnumber", filter_partnumber, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag("filter_description", filter_description, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td>[% L.input_tag("filter_notes", filter_notes, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'EAN' | $T8 %]</th>
+      <td>[% L.input_tag("filter_ean", filter_ean, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Service, assembly or part' | $T8 %]</th>
+      <td>
+        <select name="filter_type">
+          <option value=""></option>
+          <option value="assembly" [% IF filter_type == 'assembly' %]selected[% END %]>[% 'Assembly' | $T8 %]</option>
+          <option value="service" [% IF filter_type == 'service' %]selected[% END %]>[% 'Service' | $T8 %]</option>
+          <option value="part" [% IF filter_type == 'part' %]selected[% END %]>[% 'Part' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Valid/Obsolete' | $T8 %]</th>
+      <td>
+        <select name="filter_obsolete">
+          <option value=""></option>
+          <option value="valid" [% IF filter_obsolete == 'valid' %]selected[% END %]>[% 'Valid' | $T8 %]</option>
+          <option value="obsolete" [% IF filter_obsolete == 'obsolete' %]selected[% END %]>[% 'Obsolete' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<input type="submit" value="[% 'Filter parts' | $T8 %]" onclick="submit()">
+
+<table class="tbl-list">
+<thead>
+  <tr>
+    <th>[% 'Partnumber' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Unit' | $T8 %]</th>
+    <th>[% 'Notes' | $T8 %]</th>
+    <th>[% 'EAN' | $T8 %]</th>
+    <th>[% 'Service, assembly or part' | $T8 %]</th>
+    <th>[% 'Obsolete' | $T8 %]</th>
+  </tr>
+</thead>
+<tbody>
+  [% SET row_odd = '1' %]
+  [% FOREACH row = ALL_PARTS %]
+  <tr>
+    <td>[% HTML.escape(row.partnumber) %]</td>
+    <td> [% HTML.escape(row.description) %]</a></td>
+    <td>[% HTML.escape(row.unit) %]</td>
+    <td>[% HTML.escape(row.notes) %]</td>
+    <td>[% HTML.escape(row.ean) %]</td>
+    <td>[% IF row.assembly %] [% 'assembly' | $T8 %] [% ELSE %] [% IF row.inventory_accno_id %] [% 'part' | $T8 %] [% ELSE %] [% 'service' | $T8 %] [% END %] [% END %]</td>
+    <td>[% IF row.obsolete %][% LxERP.t8("Obsolete") %][% ELSE %][% LxERP.t8("Not obsolete") %][% END %]</td>
+  </tr>
+  [% END %]
+</tbody>
+</table>
+
+<div class="buttons">
+  <input type="button" value="[% 'Close window' | $T8 %]" onclick="window.close()">
+</div>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/steuerfilterung.html b/templates/design40_webpages/dbupgrade/steuerfilterung.html
new file mode 100644
index 000000000..4b8d8f5d2
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/steuerfilterung.html
@@ -0,0 +1,53 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+
+<h1>[% 'New filter for tax accounts' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+<input type="hidden" name="continued_tax" value="1">
+
+<p>[% 'From this version on a new feature is available.' | $T8 %]</p>
+<p>[% 'You can choose account categories for taxes. Depending on these categories taxes will be displayed for transfers in the general ledger or not.' | $T8 %]</p>
+<p>[% 'If you have not chosen for example the category revenue for a tax and you choose an revenue account to create a transfer in the general ledger, this tax will not be displayed in the tax dropdown.' | $T8 %]</p>
+<p>[% 'This feature especially prevents mistakes by mixing up prior tax and sales tax.' | $T8 %]</p>
+<p>[% 'Please choose for which categories the taxes should be displayed (otherwise remove the ticks):' | $T8 %]</p>
+<table>
+  <tr>
+    <th>[% 'Taxkey' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Tax rate' | $T8 %]</th>
+    <th>[% 'Asset' | $T8 %] (A)</th>
+    <th>[% 'Liability' | $T8 %] (L)</th>
+    <th>[% 'Equity' | $T8 %] (Q)</th>
+    <th>[% 'Costs' | $T8 %] (C)</th>
+    <th>[% 'Revenue' | $T8 %] (I)</th>
+    <th>[% 'Expense' | $T8 %] (E)</th>
+  </tr>
+
+  [% SET row_odd = '1' %][% FOREACH row = PARTS %]
+  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+    <td>[% HTML.escape(row.taxkey) %]</td>
+    <td> [% HTML.escape(row.taxdescription) %]</a></td>
+    <td>[% HTML.escape(row.rate) %] %</td>
+    <td>[% L.checkbox_tag('asset_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td>[% L.checkbox_tag('liability_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td>[% L.checkbox_tag('equity_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td>[% L.checkbox_tag('costs_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td>[% L.checkbox_tag('revenue_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+    <td>[% L.checkbox_tag('expense_' _ loop.count, value => 1, checked => 1, class => 'checkbox') %]</td>
+  </tr>
+  <input type="hidden" name="tax_id_[% loop.count %]" value="[% row.tax_id %]">
+  [% SET rowcount = loop.count %]
+  [% END %]
+  <input type="hidden" name="rowcount" value="[% rowcount %]">
+</table>
+
+<input type="submit" value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/tax_constraints.html b/templates/design40_webpages/dbupgrade/tax_constraints.html
new file mode 100644
index 000000000..fd04dcaea
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/tax_constraints.html
@@ -0,0 +1,59 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Inconsistency in database' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'There is an inconsistancy in your database.' | $T8 %]</p>
+<p>[% 'Please contact your administrator.' | $T8 %]</p>
+
+[% IF invalid_tax_account %]
+  <p>[% 'There are invalid taxnumbers in use.' | $T8 %]</p>
+  <p>[% 'Please set another taxnumber for the following taxes and run the update again:' | $T8 %]</p>
+  <table>
+    <tr>
+      <th>[% 'tax_taxkey' | $T8 %]</th>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <th>[% 'tax_rate' | $T8 %]</th>
+    </tr>
+
+    [% SET row_odd = '1' %][% FOREACH row = TAX %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td>[% HTML.escape(row.taxkey) %]</td>
+      <td> [% HTML.escape(row.taxdescription) %]</a></td>
+      <td>[% HTML.escape(row.rate) %] %</td>
+    </tr>
+    [% END %]
+  </table>
+
+[% END %]
+
+[% IF taxkey_is_null %]
+  <p>[% 'There are entries in tax where taxkey is NULL.' | $T8 %]</p>
+  <p>[% 'Please define a taxkey for the following taxes and run the update again:' | $T8 %]</p>
+  <table>
+    <tr>
+      <th>[% 'tax_taxdescription' | $T8 %]</th>
+      <th>[% 'tax_rate' | $T8 %]</th>
+      <th>[% 'taxnumber' | $T8 %]</th>
+      <th>[% 'account_description' | $T8 %]</th>
+    </tr>
+
+    [% SET row_odd = '1' %][% FOREACH row = TAX %]
+    <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td> [% HTML.escape(row.taxdescription) %]</a></td>
+      <td>[% HTML.escape(row.rate) %] %</td>
+      <td>[% HTML.escape(row.taxnumber) %]</td>
+      <td>[% HTML.escape(row.account_description) %]</td>
+    </tr>
+    [% END %]
+  </table>
+
+[% END %]
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/taxkey_update.html b/templates/design40_webpages/dbupgrade/taxkey_update.html
new file mode 100644
index 000000000..ca3145754
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/taxkey_update.html
@@ -0,0 +1,20 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'taxkey 0 is already allocated.' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form name="Form" method="post" action="login.pl">
+<input type="hidden" name="action" value="login">
+
+<p>[% 'There is already a taxkey 0 with tax rate not 0.' | $T8 %]</p>
+<p>[% 'From this version on the taxkey 0 must have a tax rate of 0 (for DATEV compatibility).' | $T8 %]</p>
+<p>[% 'To continue please change the taxkey 0 to another value.' | $T8 %]</p>
+<p>[% 'Do not change the tax rate of taxkey 0.' | $T8 %]</p>
+<p>[% 'During the next update a taxkey 0 with tax rate of 0 will automatically created.' | $T8 %]</p>
+<p>[% 'Please contact your administrator.' | $T8 %]</p>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/upgrade_message2.html b/templates/design40_webpages/dbupgrade/upgrade_message2.html
new file mode 100644
index 000000000..a16282384
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/upgrade_message2.html
@@ -0,0 +1,7 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<ul>
+ <li>[% LxERP.t8('Applying #1:', file) | html %] [% description %]</li>
+</ul>
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/warehouse_form.html b/templates/design40_webpages/dbupgrade/warehouse_form.html
new file mode 100644
index 000000000..6c78ff3bd
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/warehouse_form.html
@@ -0,0 +1,30 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Warehouse Migration' | $T8 %]</h1>
+
+<div class="wrapper">
+
+<form action="[% script %]" method="POST">
+ <p>
+  [% 'kivitendo is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
+  [% 'This update will change the nature the onhand of goods is tracked.' | $T8 %]
+  [% 'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' | $T8 %]
+ </p>
+
+ <p>[% 'Do you want to store the existing onhand values into a new warehouse?' | $T8 %]</p>
+
+ <input id="do_migrate_Y" name="do_migrate" type="radio" value="Y">&nbsp;<label for="do_migrate_Y">[% 'Yes' | $T8 %]</label>
+ <input id="do_migrate_N" name="do_migrate" type="radio" value="N" checked>&nbsp;<label for="do_migrate_N">[% 'No' | $T8 %]</label>
+
+ <p>[% 'Please specify a description for the warehouse designated for these goods.' | $T8 %]</p>
+ <input type="text" name="import_warehouse" size="50">
+
+ <p>[% 'Since bin is not enforced in the parts data, please specify a bin where goods without a specified bin will be put.' | $T8 %]<p>
+
+  <input type="text" name="bin_default" size="50">
+
+ <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/dbupgrade/warning.html b/templates/design40_webpages/dbupgrade/warning.html
new file mode 100644
index 000000000..c51f10a6a
--- /dev/null
+++ b/templates/design40_webpages/dbupgrade/warning.html
@@ -0,0 +1,57 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<div class="wrapper">
+<form name="Form" method="post" action="controller.pl">
+
+  <input type="hidden" name="action" value="LoginScreen/login">
+
+  <div class="buttons"><input type="button" onclick="history.back()" value="[% 'Back' | $T8 %]" class="neutral"></div>
+  <p class="message message_hint"> [% LxERP.t8('kivitendo is about to update the database [ #1 ].', dbname) | html %] </p>
+
+  [% IF superuser.need_privileges && !superuser.have_privileges %]
+    <p>
+     [% LxERP.t8("Database superuser privileges are required for the update.") %]
+     [% LxERP.t8("Please provide corresponding credentials.") %]
+    </p>
+
+    [% IF superuser.error %]
+      <p>[% LxERP.t8("Error: #1", superuser.error) %]</p>
+    [% END %]
+
+    <table class="tbl-horizontal">
+      <tbody>
+        <tr>
+           <th>[% LxERP.t8("User name") %]:</th>
+           <td>[% L.input_tag("database_superuser_username", superuser.username) %]</td>
+        </tr>
+        <tr>
+           <th>[% LxERP.t8("Password") %]:</th>
+           <td>[% L.input_tag("database_superuser_password", superuser.password, type="password") %]</td>
+        </tr>
+      </tbody>
+    </table>
+  [% END %]
+
+  <p>[% 'You should create a backup of the database before proceeding because the backup might not be reversible.' | $T8 %] </p>
+  <div class="buttons"><input type="submit" name="dummy" value="[% 'Continue' | $T8 %]"></div>
+
+</form>
+
+<div id="nodetails" class="toggle_panel">
+  <a href="#" onclick="$('#details,#nodetails').toggle();" class="button toggle off neutral control-panel">[% LxERP.t8('Show details') %]</a>
+</div>
+<div id="details" style="display: none;" class="toggle_panel">
+  <a href="#" onclick="$('#details,#nodetails').toggle();" class="button toggle on neutral with-panel">[% LxERP.t8('Hide details') %]</a>
+  <div class="filter-toggle-panel toggle_panel_block">
+    <p> [% LxERP.t8("List of database upgrades to be applied:") %] </p>
+    <ul>
+      [% FOREACH upgrade_script = unapplied_scripts %]
+        <li>[% HTML.escape(upgrade_script.tag) %]: [% HTML.escape(upgrade_script.description) %]</li>
+      [% END %]
+    </ul>
+  </div><!-- /.filter-toggle-panel -->
+</div>
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/delivery_order/form.html b/templates/design40_webpages/delivery_order/form.html
new file mode 100644
index 000000000..f5666a23e
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/form.html
@@ -0,0 +1,74 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
+<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
+
+<div id="print_options" style="display:none">
+  <form method="post" action="controller.pl" id="print_options_form">
+    [% SELF.print_options %]
+    <br>
+    [% L.button_tag('kivi.DeliveryOrder.print()', LxERP.t8('Print')) %]
+    <a href="#" onclick="$('#print_options').dialog('close');">[% LxERP.t8("Cancel") %]</a>
+  </form>
+</div>
+
+<div id="shipto_dialog" class="hidden"></div>
+
+<form method="post" action="controller.pl" id="order_form">
+  [% L.hidden_tag('callback',             FORM.callback) %]
+  [% L.hidden_tag('type',                 FORM.type) %]
+  [% L.hidden_tag('id',                   SELF.order.id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.order.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.order.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
+
+  [%- INCLUDE 'common/flash.html' %]
+
+  <div class="tabwidget" id="order_tabs">
+    <ul>
+      <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
+[%- IF INSTANCE_CONF.get_webdav %]
+      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.order.id AND INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.order.id) %]">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.order.id) %]">[% 'Attachments' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.order.id %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=DeliveryOrder&object_id=[% HTML.url(SELF.order.id) %]">[% 'Linked Records' | $T8 %]</a></li>
+[%- END %]
+    </ul>
+
+    [% PROCESS "delivery_order/tabs/basic_data.html" %]
+    [% PROCESS 'webdav/_list.html' %]
+    <div id="ui-tabs-1">
+      [%- LxERP.t8("Loading...") %]
+    </div>
+
+    <div id="shipto_inputs" class="hidden">
+      [%- PROCESS 'common/_ship_to_dialog.html'
+        vc_obj=SELF.order.customervendor
+        cs_obj=SELF.order.custom_shipto
+        cvars=SELF.order.custom_shipto.cvars_by_config
+        id_selector='#order_shipto_id' %]
+    </div>
+
+  </div>
+
+</form>
diff --git a/templates/design40_webpages/delivery_order/stock_dialog.html b/templates/design40_webpages/delivery_order/stock_dialog.html
new file mode 100644
index 000000000..d2404e11c
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog.html
@@ -0,0 +1,65 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+<form>
+ <table class="tbl-horizontal col">
+  <tr>
+   <td>[% 'Part Number' | $T8 %]</td>
+   <td><span class="data">[% part.partnumber %]</span></td>
+  </tr>
+  <tr>
+   <td>[% 'Description' | $T8 %]</td>
+   <td><span class="data">[% part.description %]</span></td>
+  </tr>
+  <tr>
+   <td>[% 'Qty according to delivery order' | $T8 %]</td>
+   <td><span class="data">[% LxERP.format_amount(do_qty) %] [% do_unit | html %]</span></td>
+  </tr>
+ </table>
+
+ [% L.hidden_tag("in_out", in_out) %]
+ [% L.hidden_tag("parts_id", part.id) %]
+ [% L.hidden_tag("do_qty", do_qty) %]
+ [% L.hidden_tag("do_unit", do_unit) %]
+ [% L.hidden_tag("row", row, class="data-row") %]
+ [% L.hidden_tag("item_id", item_id) %]
+
+ [%- IF delivered %]
+  [% PROCESS "delivery_order/stock_dialog/_stock_delivered_dialog.html" %]
+ [%- ELSE %]
+
+  [%- IF in_out == "in" %]
+  <p>
+  <table id="stock-info-table" class="tbl-list">
+    [%- PROCESS "delivery_order/stock_dialog/_stock_info_table.html" %]
+  </table>
+  </p>
+  [%- END %]
+
+  <p>
+   <table id="stock-in-out-table" class="tbl-list">
+    [%- IF in_out == "in" %]
+     [%- PROCESS "delivery_order/stock_dialog/_stock_in_table.html" %]
+    [%- ELSE %]
+     [%- PROCESS "delivery_order/stock_dialog/_stock_out_table.html" %]
+    [%- END %]
+   </table>
+  </p>
+
+  [%- IF in_out == "in" %]
+  [% L.button_tag('kivi.DeliveryOrder.add_stock_in_line_to_dialog()', LxERP.t8('+')) %]
+  [%- END %]
+
+  <hr size="3" noshade>
+
+  <p>
+    [% L.button_tag('kivi.DeliveryOrder.save_updated_stock(true)', LxERP.t8('Save and Close')) %]
+    [%- IF next_button %]
+      [% L.button_tag("kivi.DeliveryOrder.next_stock_in_out_dialog($row_ui_id)", LxERP.t8('Save and Next')) %]
+    [%- END %]
+  </p>
+
+  [%- END %]
+ </form>
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html
new file mode 100644
index 000000000..243c49723
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+[%- UNLESS STOCK_INFO.size %]
+<p>[% 'There are no items in stock.' | $T8 %]</p>
+[%- ELSE %]
+
+<p>
+ <table id="stock-in-out-table" class="tbl-list">
+  <tr>
+   <th>&nbsp;</th>
+   <th>[% 'Warehouse' | $T8 %]</th>
+   <th>[% 'Bin' | $T8 %]</th>
+   <th>[% 'Charge Number' | $T8 %]</th>
+   [% IF INSTANCE_CONF.get_show_bestbefore %]
+   <th>[% 'Best Before' | $T8 %]</th>
+   [% END %]
+   <th>[% 'Qty' | $T8 %]</th>
+   <th>[% 'Unit' | $T8 %]</th>
+  </tr>
+
+  [%- FOREACH row = STOCK_INFO %]
+  <tr [% IF row.stock_error %]class="error"[% END %]>
+   <td>[% loop.count %]</td>
+   <td>[% row.warehousedescription | html %]</td>
+   <td>[% row.bindescription | html %]</td>
+   <td>[% row.chargenumber | html %]</td>
+   [% IF INSTANCE_CONF.get_show_bestbefore %]
+   <td>[% row.bestbefore | html %]</td>
+   [% END %]
+
+   <td>[% LxERP.format_amount(row.stock_qty) | html %]</td>
+   <td>
+    [% row.stock_unit | html %]
+    [% L.hidden_tag("unit", row.stock_unit, class="data-unit") %]
+   </td>
+
+   <td style="display:none">
+    [% L.hidden_tag("warehouse_id", row.warehouse_id, class="data-warehouse-id") %]
+    [% L.hidden_tag("bin_id", row.bin_id, class="data-bin-id") %]
+    [% L.hidden_tag("chargenumber", row.chargenumber, class="data-chargenumber") %]
+    [% L.hidden_tag("delivery_order_items_stock_id", row.delivery_order_items_stock_id, class="data-stock-id") %]
+    [% L.hidden_tag("bestbefore", row.bestbefore, class="data-bestbefore") IF INSTANCE_CONF.get_show_bestbefore %]
+   </td>
+  </tr>
+  [%- END %]
+ </table>
+</p>
+<hr size="3" noshade>
+[%- END %]
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_new_row.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_new_row.html
new file mode 100644
index 000000000..5df44c118
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_new_row.html
@@ -0,0 +1,33 @@
+[%- USE L %]
+[%- USE LxERP %]
+[% # L.dump( PART ) %] [% # L.dump( pos ) %] [% # L.dump( remaining_qty ) %]
+<tr class="data-row" >
+ [% L.multi_level_select_tag(
+      "new_wh_bin_" _ pos, WAREHOUSES, 2, surround_tag="td",
+      level_1={
+        name="warehouse_id",
+        value_key="id",
+        title_key="description",
+        default=PART.warehouse_id,
+        class="data-warehouse-id wi-small",
+      },
+      level_2={
+        object_key="bins",
+        name="bin_id",
+        value_key="id",
+        title_key="description",
+        default=PART.bin_id,
+        class="data-bin-id wi-small",
+      },
+    ) %]
+
+ <td>[% L.input_tag("chargenumber", "", class="numeric data-chargenumber wi-small") %]</td>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% L.date_tag('bestbefore', "", class="data-bestbefore wi-small") %]</td>
+ [%- END %]
+ <td>[% L.input_tag("qty", LxERP.format_amount(remaining_qty) , class="numeric data-qty wi-small") %]</td>
+ <td>[% L.select_tag("unit", PART.unit_obj.convertible_units, value_key="name", default=PART.unit, class="data-unit wi-small") %]</td>
+ <td style="display:none">
+  [% L.hidden_tag("delivery_order_items_stock_id", '', class="data-stock-id wi-small") %]
+ </td>
+</tr>
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_row.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_row.html
new file mode 100644
index 000000000..9731a6792
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_row.html
@@ -0,0 +1,34 @@
+[%- USE L %]
+[%- USE LxERP %]
+[% # L.dump( PART ) %] [% # L.dump( pos ) %] [% # L.dump( ROW ) %]
+<tr class="data-row">
+ [% L.multi_level_select_tag(
+      # name has to be unique
+      "wh_bin_" _ pos, WAREHOUSES, 2, surround_tag="td",
+      level_1={
+        name="warehouse_id",
+        value_key="id",
+        title_key="description",
+        default=ROW.warehouse_id,
+        class="data-warehouse-id wi-small",
+      },
+      level_2={
+        object_key="bins",
+        name="bin_id",
+        value_key="id",
+        title_key="description",
+        default=ROW.bin_id,
+        class="data-bin-id wi-small",
+      },
+    ) %]
+
+ <td>[% L.input_tag("chargenumber", ROW.chargenumber, class="numeric data-chargenumber wi-small") %]</td>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% L.date_tag("bestbefore", ROW.bestbefore, class="data-bestbefore wi-small") %]</td>
+ [%- END %]
+ <td>[% L.input_tag("qty", LxERP.format_amount(ROW.qty), class="numeric data-qty wi-small") %]</td>
+ <td>[% L.select_tag("unit", PART.unit_obj.convertible_units, value_key="name", default=ROW.stock_unit, class="data-unit wi-small") %]</td>
+ <td style="display:none">
+  [% L.hidden_tag("delivery_order_items_stock_id", ROW.delivery_order_items_stock_id, class="data-stock-id wi-small") %]
+ </td>
+</tr>
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_table.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_table.html
new file mode 100644
index 000000000..706858516
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_in_table.html
@@ -0,0 +1,19 @@
+[% USE T8 %]
+<tr>
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [% END %]
+ <th>[% 'Qty' | $T8 %]</th>
+ <th>[% 'Unit' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = STOCK_INFO %]
+[%- PROCESS delivery_order/stock_dialog/_stock_in_row.html PART=part ROW=row pos=loop.count %]
+[%- END %]
+
+[%- UNLESS STOCK_INFO.size %]
+[%- PROCESS delivery_order/stock_dialog/_stock_in_new_row.html PART=part remaining_qty=do_qty pos=0 %]
+[% END %]
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_info_table.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_info_table.html
new file mode 100644
index 000000000..0966627e9
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_info_table.html
@@ -0,0 +1,28 @@
+[% USE T8 %]
+<tr>
+ <th>&nbsp;</th>
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [%- END %]
+ <th>[% 'Available qty' | $T8 %]</th>
+ <th>[% 'Unit' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = WHCONTENTS %]
+<tr [% IF row.stock_error %] class="error" [% END %]>
+ <td>[% loop.count %]</td>
+ <td>[% row.warehousedescription | html %]</td>
+ <td>[% row.bindescription | html %]</td>
+ <td>[% row.chargenumber | html %]</td>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ test
+ <td>[% row.bestbefore | html %]</td>
+ [%- END %]
+
+ <td>[% row.available_qty | html %]</td>
+ <td>[% row.stock_unit | html %]</td>
+</tr>
+[%- END %]
diff --git a/templates/design40_webpages/delivery_order/stock_dialog/_stock_out_table.html b/templates/design40_webpages/delivery_order/stock_dialog/_stock_out_table.html
new file mode 100644
index 000000000..7e7615514
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/stock_dialog/_stock_out_table.html
@@ -0,0 +1,44 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+<tr>
+ <th>&nbsp;</th>
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [% END %]
+ <th>[% 'Available qty' | $T8 %]</th>
+ <th>[% 'Qty' | $T8 %]</th>
+ <th>[% 'Unit' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = WHCONTENTS %]
+<tr [% IF row.stock_error %]class="error"[% ELSE %]class="data-row"[% END %]>
+ <td>[% loop.count %]</td>
+ <td>[% row.warehousedescription | html %]</td>
+ <td>[% row.bindescription | html %]</td>
+ <td>[% row.chargenumber | html %]</td>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% row.bestbefore | html %]</td>
+ [% END %]
+
+ <td>[% row.available_qty | html %]</td>
+ <td>
+  [% L.input_tag("qty", row.stock_qty                              ? LxERP.format_amount(row.stock_qty)
+                      : (WHCONTENTS.size == 1) && (!row.stock_qty) ? LxERP.format_amount(do_qty)
+                      : "", class="numeric data-qty", size="12") %]</td>
+ <td>[% L.select_tag("unit_" _ loop.count, part.unit_obj.convertible_units, value_key="name", default=row.stock_unit, class="data-unit") %]</td>
+
+ <td style="display:none">
+  [% L.hidden_tag("warehouse_id", row.warehouse_id, class="data-warehouse-id") %]
+  [% L.hidden_tag("bin_id", row.bin_id, class="data-bin-id") %]
+  [% L.hidden_tag("chargenumber", row.chargenumber, class="data-chargenumber") %]
+  [% L.hidden_tag("delivery_order_items_stock_id", row.delivery_order_items_stock_id, class="data-stock-id") %]
+  [% L.hidden_tag("bestbefore", row.bestbefore, class="data-bestbefore") IF INSTANCE_CONF.get_show_bestbefore %]
+ </td>
+</tr>
+[%- END %]
diff --git a/templates/design40_webpages/delivery_order/tabs/_business_info_row.html b/templates/design40_webpages/delivery_order/tabs/_business_info_row.html
new file mode 100644
index 000000000..1577107ec
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/tabs/_business_info_row.html
@@ -0,0 +1,12 @@
+[%- USE T8 %][%- USE HTML %]
+
+<tr id='business_info_row' [%- IF !SELF.order.customervendor.business_id %]style='display:none'[%- END %]>
+  <th>
+    [%- IF SELF.cv == 'customer' -%]
+      [%- 'Customer type' | $T8 -%]
+    [%- ELSE -%]
+      [%- 'Vendor type' | $T8 -%]
+    [%- END -%]
+  </th>
+  <td><span class="plain-data wi-lightwide">[% HTML.escape(SELF.order.customervendor.business.description) %] ([% 'Trade Discount' | $T8 %] [% SELF.order.customervendor.business.discount_as_percent %]%)</span></td>
+</tr>
diff --git a/templates/design40_webpages/delivery_order/tabs/_item_input.html b/templates/design40_webpages/delivery_order/tabs/_item_input.html
new file mode 100644
index 000000000..644006eec
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/tabs/_item_input.html
@@ -0,0 +1,61 @@
+[%- USE T8 %][%- USE HTML %][%- USE LxERP %][%- USE L %][%- USE P %]
+
+<div class="wrapper panel-wrapper">
+  <div class="input-panel control-panel">
+    <table id="input_row_table_id" class="tbl-plain condensed">
+      <caption>[% 'Add Parts here!' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <td>
+            <span class="label above">[% 'position' | $T8 %] </span>
+            [% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]
+          </td>
+          <td>
+            <span class="label above">[% 'Part' | $T8 %] </span>
+            [%- SET PARAM_KEY = SELF.type_data.properties('is_customer') ? 'with_customer_partnumber' : 'with_makemodel' -%]
+            [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+            [% P.part.picker('add_item.parts_id', SELF.created_part,
+                              class="add_item_input wi-normal",
+                              fat_set_item=1,
+                              multiple_pos_input=1,
+                              action={set_multi_items='kivi.DeliveryOrder.add_multi_items'},
+                              classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                              $PARAM_KEY=PARAM_VAL) %]
+          </td>
+          <td>
+            <span class="label above">[% 'Description' | $T8 %] </span>
+            [% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input") %]
+          </td>
+          <td>
+            <span class="label above">[% 'Qty' | $T8 %]</span>
+            [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %]
+            [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+          </td>
+          <td style="vertical-align:bottom;">
+            [% L.button_tag('kivi.DeliveryOrder.add_item()', LxERP.t8('Add part')) %]
+          </td>
+        </tr>
+        <tr>
+        </tr>
+      </tbody>
+    </table>
+    <div style="clear:both">[% L.button_tag('kivi.DeliveryOrder.open_multi_items_dialog()', LxERP.t8('Add multiple items'), class='neutral') %]</div>
+  </div><!-- /.entry-panel -->
+
+  <div class="input-panel control-panel short">
+    <table id="create_part_table_id" class="tbl-plain condensed">
+      <caption>[% 'Create a new part' | $T8 %]!</caption>
+      <tbody>
+        <tr>
+          <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
+            <span class="label above">[% 'Part Type' | $T8 %] </span>
+            [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ]] %]
+            [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
+            [% L.select_tag('add_item.create_part_type', type_options) %]
+            [% L.button_tag('kivi.DeliveryOrder.create_part()', LxERP.t8('+')) %]
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div><!-- /.entry-panel -->
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/delivery_order/tabs/_row.html b/templates/design40_webpages/delivery_order/tabs/_row.html
new file mode 100644
index 000000000..b5aa07e27
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/tabs/_row.html
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+<tbody class="row_entry listrow" data-position="[%- HTML.escape(ITEM.position) -%]"[%- IF MYCONFIG.show_form_details -%] data-expanded="1"[%- END -%]>
+  <tr>
+    <td>
+      [%- IF MYCONFIG.show_form_details %]
+        [% L.img_tag(src="image/collapse.svg",
+                     alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand row-icon") %]
+      [%- ELSE %]
+        [% L.img_tag(src="image/expand.svg",
+                     alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand row-icon") %]
+      [%- END %]
+      [% L.hidden_tag("orderitem_ids[+]", ID) %]
+      [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+      [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
+      [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
+      [% L.hidden_tag("order.orderitems[].stock_info", ITEM.stock_info, class="data-stock-info") %]
+      [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
+      [% L.hidden_tag("order.orderitems[].sellprice", ITEM.sellprice) %]
+      [% L.hidden_tag("order.orderitems[].discount", ITEM.discount) %]
+      [% L.hidden_tag("order.orderitems[].ordnumber", ITEM.ordnumber) %]
+      [% L.hidden_tag("order.orderitems[].transdate", ITEM.transdate) %]
+      [% L.hidden_tag("order.orderitems[].cusordnumber", ITEM.cusordnumber) %]
+      [% L.hidden_tag("order.orderitems[].base_qty", ITEM.base_qty) %]
+      [% L.hidden_tag("order.orderitems[].lastcost", ITEM.lastcost) %]
+      [% L.hidden_tag("order.orderitems[].price_factor_id", ITEM.price_factor_id) %]
+      [% L.hidden_tag("order.orderitems[].price_factor", ITEM.price_factor) %]
+      [% L.hidden_tag("order.orderitems[].marge_price_factor", ITEM.marge_price_factor) %]
+      [% L.hidden_tag("order.orderitems[].pricegroup_id", ITEM.pricegroup_id) %]
+      [% L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
+      [% L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
+    </td>
+    <td class="center">
+      <div name="position">[% HTML.escape(ITEM.position) %]</div>
+    </td>
+    <td align="center">
+      <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
+    </td>
+    <td>
+      [%- L.button_tag("kivi.DeliveryOrder.delete_order_item_row(this)",
+                       LxERP.t8("X"),
+                       confirm=LxERP.t8("Are you sure?")) %]
+    </td>
+    [%- IF SELF.show_update_button -%]
+    <td>
+      [%- L.img_tag(src="image/rotate_cw.svg",
+                    alt=LxERP.t8('Update from master data'),
+                    title= LxERP.t8('Update from master data'),
+                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.DeliveryOrder.update_row_from_master_data(this);",
+                    id='update_from_master', class="row-icon") %]
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partnumber">
+        [%- P.link_tag(SELF.url_for(controller='Part', action='edit', 'part.id'=ITEM.part.id), ITEM.part.partnumber, target="_blank", title=LxERP.t8('Open in new window')) -%]
+      </div>
+    </td>
+    [%- IF SELF.search_cvpartnumber -%]
+    <td>
+      <div name="cvpartnumber">[% HTML.escape(ITEM.cvpartnumber) %]</div>
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partclassification">[% ITEM.part.presenter.typeclass_abbreviation %]</div>
+    </td>
+    <td>
+      [% L.areainput_tag("order.orderitems[].description",
+                     ITEM.description,
+                     size='40',
+                     class='wi-lightwide') %]
+      [%- L.hidden_tag("order.orderitems[].longdescription", ITEM.longdescription) %]
+      [%- L.button_tag("kivi.DeliveryOrder.show_longdescription_dialog(this)", LxERP.t8("L"), class="wi-tiny neutral") %]
+    </td>
+    [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+    <td nowrap>
+      [%- L.div_tag(LxERP.format_amount(ITEM.shipped_qty, 2, 0) _ ' ' _ ITEM.unit, name="shipped_qty", class="numeric") %]
+    </td>
+    [%- END -%]
+    <td nowrap>
+      [%- L.input_tag("order.orderitems[].qty_as_number",
+                      ITEM.qty_as_number,
+                      size = 5,
+                      class="reformat_number numeric wi-verysmall") %]
+      [%- IF ITEM.part.formel -%]
+        [%- L.button_tag("kivi.DeliveryOrder.show_calculate_qty_dialog(this)", LxERP.t8("*/"), class="neutral") %]
+        [%- L.hidden_tag("formula[+]", ITEM.part.formel) -%]
+      [%- END -%]
+    </td>
+    <td>
+      [%- L.select_tag("order.orderitems[].unit",
+                      ITEM.part.available_units,
+                      default = ITEM.unit,
+                      title_key = 'name',
+                      value_key = 'name',
+                      class = 'unitselect wi-mediumsmall') %]
+    </td>
+
+    <td>
+      <span id="stock_[% ID %]" class="data-stock-qty">[% SELF.calculate_stock_in_out(ITEM) %] [% ITEM.unit %]</span>
+      [% P.button_tag("kivi.DeliveryOrder.open_stock_in_out_dialog(this, '" _ in_out _"')", "?") %]
+    </td>
+  </tr>
+
+  <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>
+    <td colspan="100%">
+      [%- IF MYCONFIG.show_form_details || ITEM.render_second_row %]
+        <div name="second_row" data-loaded="1">
+          [%- PROCESS delivery_order/tabs/_second_row.html ITEM=ITEM TYPE=SELF.type %]
+        </div>
+      [%- ELSE %]
+        <div name="second_row" id="second_row_[% ID %]">
+          [%- LxERP.t8("Loading...") %]
+        </div>
+      [%- END %]
+    </td>
+  </tr>
+
+</tbody>
diff --git a/templates/design40_webpages/delivery_order/tabs/_second_row.html b/templates/design40_webpages/delivery_order/tabs/_second_row.html
new file mode 100644
index 000000000..428d97256
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/tabs/_second_row.html
@@ -0,0 +1,43 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+<table>
+  <tr><td>
+    <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+    [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15 "data-validate"="trimmed_whitespaces") %]&nbsp;
+    <b>[%- 'Project' | $T8 %]</b>&nbsp;
+    [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
+    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
+      <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
+      [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
+    [%- END %]
+    <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
+      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
+        [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
+      </span>&nbsp;
+  </td></tr>
+
+  <tr>
+    [%- SET n = 0 %]
+    [%- FOREACH var = ITEM.cvars_by_config %]
+    [%- NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
+    [%- SET n = n + 1 %]
+    <th>
+      [% var.config.description %]
+    </th>
+    <td>
+      [% L.hidden_tag('order.orderitems[].custom_variables[+].config_id', var.config.id) %]
+      [% L.hidden_tag('order.orderitems[].custom_variables[].id', var.id) %]
+      [% L.hidden_tag('order.orderitems[].custom_variables[].sub_module', var.sub_module) %]
+      [% INCLUDE 'common/render_cvar_input.html' var_name='order.orderitems[].custom_variables[].unparsed_value' %]
+    </td>
+    [%- IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
+
+  </tr><tr>
+    [%- END %]
+    [%- END %]
+  </tr>
+</table>
diff --git a/templates/design40_webpages/delivery_order/tabs/basic_data.html b/templates/design40_webpages/delivery_order/tabs/basic_data.html
new file mode 100644
index 000000000..734ab9ad5
--- /dev/null
+++ b/templates/design40_webpages/delivery_order/tabs/basic_data.html
@@ -0,0 +1,329 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+[%- INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="ui-tabs-basic-data">
+
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             FORM.email_attachment_id || FORM.workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+
+<div class="col">
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Customer & Order Information' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
+        [% SET cv_id = SELF.cv _ '_id' %]
+        <td class="wi-lightwide">
+         [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv,
+              show_details="1") %]
+        </td>
+      </tr>
+
+      <tr id='cp_row' [%- IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none'[%- END %]>
+        <th>[% 'Contact Person' | $T8 %]</th>
+        <td>[% L.select_tag('order.cp_id',
+                            SELF.order.${SELF.cv}.contacts,
+                            default=SELF.order.cp_id,
+                            title_key='full_name_dep',
+                            value_key='cp_id',
+                            with_empty=1,
+                            class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Shipping Address' | $T8 %]</th>
+        <td>
+          <span id='shipto_selection' [%- IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[%- END %]>
+            [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+               FOREACH s = SELF.order.${SELF.cv}.shipto ;
+                 shiptos.push(s) ;
+               END ;
+               L.select_tag('order.shipto_id',
+                             shiptos,
+                             default=SELF.order.shipto_id,
+                             title_key='displayable_id',
+                             value_key='shipto_id',
+                             with_empty=0,
+                             style='wi-lightwide') %]
+          </span>
+          [% L.button_tag("kivi.DeliveryOrder.edit_custom_shipto()",
+                          LxERP.t8("Custom shipto"),
+                          class='button neutral below wi-lightwide') %]
+        </td>
+      </tr>
+
+      [%- PROCESS delivery_order/tabs/_business_info_row.html SELF=SELF %]
+
+[%- IF SELF.all_languages.size %]
+      <tr>
+        <th>[% 'Language' | $T8 %]</th>
+        <td>
+          [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, class='wi-lightwide') %]
+        </td>
+      </tr>
+[%- END %]
+
+[%- IF SELF.all_departments.size %]
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>
+          [% L.select_tag('order.department_id', SELF.all_departments, default=SELF.order.department_id, title_key='description', with_empty=1, class='wi-lightwide') %]
+        </td>
+      </tr>
+[%- END %]
+
+      <tr>
+        <th>[% 'Shipping Point' | $T8 %]</th>
+        <td>[% L.input_tag('order.shippingpoint', SELF.order.shippingpoint, class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Ship via' | $T8 %]</th>
+        <td>[% L.input_tag('order.shipvia', SELF.order.shipvia, class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Transaction description' | $T8 %]</th>
+        <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Project Number' | $T8 %]</th>
+        <td>[% P.project.picker('order.globalproject_id', SELF.order.globalproject_id, class='wi-lightwide') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Terms' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+          [% L.select_tag('order.payment_id',
+          SELF.all_payment_terms,
+          default = SELF.order.payment_id,
+          with_empty = 1,
+          title_key = 'description',
+          class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Delivery Terms' | $T8 %]</span>
+          [% L.select_tag('order.delivery_term_id',
+          SELF.all_delivery_terms,
+          default = SELF.order.delivery_term_id,
+          with_empty = 1,
+          title_key = 'description',
+          class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.col -->
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Notes' | $T8 %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <td class="wi-wide">
+        [% L.textarea_tag('order.notes', SELF.order.notes, rows=7, class="texteditor wi-wide") %]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag('order.intnotes', SELF.order.intnotes, class="wi-wide") %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Handling, Numbers & Dates' | $T8 %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-normal"> </colgroup>
+  <tbody>
+
+    <tr>
+      <th>[% 'Status' | $T8 %]</th>
+      <td rowspan="2">
+        <span id="data-status-line" class="data wi-normal overflow-visible height-auto">
+          [% SELF.order.presenter.status_line || '&nbsp;' %]
+        </span>
+      </td>
+    </tr><tr></tr>
+
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('order.employee_id',
+        SELF.all_employees,
+        default=(SELF.order.employee_id ? SELF.order.employee_id : SELF.current_employee_id),
+        title_key='safe_name',
+        class="wi-normal",
+        ) %]</td>
+    </tr>
+
+    [% IF SELF.cv == 'customer' %]
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag('order.salesman_id',
+        SELF.all_salesmen,
+        default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+        title_key='safe_name',
+        class="wi-normal",
+        ) %]</td>
+    </tr>
+    [% END %]
+
+    <tr>
+      <th>[% 'Delivery Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('order.donumber', SELF.order.donumber, onchange='kivi.DeliveryOrder.set_number_in_title(this)', class='wi-normal numeric') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, class='wi-normal') %]</td>
+    </tr>
+
+    [%- IF SELF.type == 'purchase_delivery_order' %]
+    <tr>
+      <th>[% 'Order Confirmation Number' | $T8 %]</th>
+      [%-
+        numbers = [];
+        FOREACH p = SELF.order.preceding_purchase_order_confirmations();
+          numbers.push(HTML.escape(p.ordnumber));
+        END;
+      %]
+      <td><span class="data wi-normal">[% numbers.join(', ') %]</span></td>
+    </tr>
+
+    <tr>
+      <th>[% 'Vendor Confirmation Number' | $T8 %]</th>
+      <td>[% L.input_tag('order.vendor_confirmation_number', SELF.order.vendor_confirmation_number, class='wi-normal numeric') %]</td>
+    </tr>
+    [%- END %]
+
+    <tr>
+      <th>[% IF SELF.type_data.properties('is_customer') %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
+      <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, class='wi-normal numeric') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Delivery Order Date' | $T8 %]</th>
+      <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date, class='wi-date') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Reqdate' | $T8 %]</th>
+      <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class="wi-date " _ reqdate_class) %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Insert Date' | $T8 %]</th>
+      <td><span class="data wi-normal">[% SELF.order.itime_as_date %]</span></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+[%- PROCESS delivery_order/tabs/_item_input.html SELF=SELF %]
+
+
+[%- IF SELF.positions_scrollbar_height -%]
+  [%- SET scroll_style = 'style="overflow-y: auto; height:' _ SELF.positions_scrollbar_height _ 'vh;"' -%]
+[%- ELSE -%]
+  [%- SET scroll_style = '' -%]
+[%- END -%]
+<div id="row_table_scroll_id" class="wrapper horizontal-scroll-wrapper" [%- scroll_style -%]>
+
+<table id="row_table_id" class="tbl-list">
+  <caption>[% 'Articles' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th class="center" style='text-align:center' nowrap width="1">
+        [%- IF MYCONFIG.show_form_details %]
+          [%- L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', class='row-icon', "data-expanded"="1") %]
+        [%- ELSE %]
+          [%- L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all', class='row-icon') %]
+        [%- END %]
+      </th>
+      <th nowrap width="3">[%- 'position' | $T8 %] </th>
+      <th style='text-align:center'><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+      <th style='text-align:center'><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+      [%- IF SELF.show_update_button -%]
+      <th class="listheading" style='text-align:center' nowrap width="1">
+        [%- L.img_tag(src="image/rotate_cw.svg",
+                      alt=LxERP.t8('Update from master data'),
+                      title= LxERP.t8('Update from master data'),
+                      onclick="if (!confirm('" _ LxERP.t8("Are you sure to update all positions from master data?") _ "')) return false; kivi.DeliveryOrder.update_all_rows_from_master_data();",
+                      id='update_from_master', class='row-icon') %]
+      </th>
+      [%- END %]
+      <th id="partnumber_header_id"><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
+      [%- IF SELF.search_cvpartnumber -%]
+      <th id="cvpartnumber_header_id"><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("cvpartnumber")' > [%- SELF.cv == "customer" ? LxERP.t8('Customer Part Number') : LxERP.t8('Model') %]</a></th>
+      [%- END -%]
+      <th id="partclass_header_id">[%- 'Type'  | $T8 %]</th>
+      <th id="description_header_id"><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
+      [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+      <th id="shipped_qty_header_id"><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
+      [%- END -%]
+      <th id="qty_header_id"><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
+      <th>[%- 'Unit'         | $T8 %] </th>
+      [% IF in_out == 'in' %]
+      <th>[%- 'Transfer To Stock' | $T8 %] </th>
+      [% END %]
+      [% IF in_out == 'out' %]
+      <th>[%- 'Release From Stock' | $T8 %] </th>
+      [% END %]
+    </tr>
+  </thead>
+
+  [%- FOREACH item = SELF.order.items_sorted %]
+    [%- PROCESS delivery_order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id)  -%]
+  [%- END %]
+
+  <tfoot>
+  </tfoot>
+</table>
+
+</div><!-- /#row_table_scroll_id /.wrapper -->
+
+[% L.hidden_tag('order.currency_id', SELF.order.currency_id) %]
+[% L.hidden_tag('order.taxzone_id', SELF.order.taxzone_id) %]
+[% L.hidden_tag('order.taxincluded', SELF.order.taxincluded) %]
+
+</div><!-- /#ui-tabs-basic-data -->
+
+[% L.sortable_element('#row_table_id') %]
diff --git a/templates/design40_webpages/delivery_plan/_filter.html b/templates/design40_webpages/delivery_plan/_filter.html
new file mode 100644
index 000000000..c8c84213b
--- /dev/null
+++ b/templates/design40_webpages/delivery_plan/_filter.html
@@ -0,0 +1,148 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action='controller.pl' method='post' id='filter_form'>
+
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<div class="wrapper">
+<table id='filter_table' class="tbl-horizontal">
+  <caption>[% 'Order & Articles' | $T8 %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.order.ordnumber:substr::ilike', filter.order.ordnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Document Project Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.order.globalproject.projectnumber:substr::ilike', filter.order.globalproject.projectnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.part.partnumber:substr::ilike', filter.part.partnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Assembly Item Number' | $T8 %]</th>
+      <td>[% L.input_tag('assembly_item_number', SELF.assembly_item_number, size = 20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Quantity' | $T8 %]</th>
+      <td>[% L.input_tag('filter.qty:number', filter.qty_number, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Type' | $T8 %]</th>
+      <td>
+        [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part,     value='part',     label=LxERP.t8('Part')) %]
+        [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service,  value='service',  label=LxERP.t8('Service')) %]
+        [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
+        [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+	<caption>[% IF SELF.vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-mediumsmall"> </colgroup>
+	<tbody>
+    [% IF SELF.vc == 'customer' %]
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.customer.name:substr::ilike', filter.order.customer.name_substr__ilike, class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Customer Number' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.customer.customernumber:substr::ilike', filter.order.customer.customernumber_substr__ilike, class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Customer type' | $T8 %]</th>
+        <td>[% L.select_tag('filter.order.customer.business_id', SELF.all_businesses,
+             default    => filter.order.customer.business_id,
+             title_key  => 'description',
+             value_key  => 'id',
+             with_empty => 1,
+             class      => 'wi-mediumsmall') %]
+        </td>
+      </tr>
+    [% ELSE %]
+      <tr>
+        <th>[% 'Vendor' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.vendor.name:substr::ilike', filter.order.vendor.name_substr__ilike, class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Vendor Number' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.vendor.vendornumber:substr::ilike', filter.order.vendor.vendornumber_substr__ilike, class='wi-mediumsmall') %]</td>
+      </tr>
+    [% END %]
+	</tbody>
+</table>
+
+<table class="tbl-horizontal">
+	<caption>[% 'Handling' | $T8 %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup>
+	<tbody>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %] [% 'From Date' | $T8 %]</th>
+      <td class="wi-date">[% L.date_tag('filter.reqdate:date::ge', filter.reqdate_date__ge) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %] [% 'To Date' | $T8 %]</th>
+      <td class="wi-date">[% L.date_tag('filter.reqdate:date::le', filter.reqdate_date__le) %]</td>
+    </tr>
+    [% IF SELF.all_departments.size %]
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>[% L.select_tag('filter.order.department_id', SELF.all_departments, default=filter.order.department_id, title_key='description', with_empty=1, class='wi-lightwide') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('filter.order.employee_id', SELF.all_employees,
+           default    => filter.order.employee_id,
+           title_key  => 'name',
+           value_key  => 'id',
+           with_empty => 1,
+           class      => 'wi-lightwide') %]
+      </td>
+    </tr>
+	</tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Query Type' | $T8 %]</th>
+        <td>[% L.checkbox_tag('use_linked_items', checked=use_linked_items, value='1', label=LxERP.t8('Use linked items')) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.wrapper -->
+
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+[% L.hidden_tag('vc', SELF.vc) %]
+[% L.hidden_tag('mode', SELF.mode) %]
+<div class="buttons">
+  [% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+</div>
+
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/delivery_plan/report_bottom.html b/templates/design40_webpages/delivery_plan/report_bottom.html
new file mode 100644
index 000000000..fb939127e
--- /dev/null
+++ b/templates/design40_webpages/delivery_plan/report_bottom.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[% L.paginate_controls(models=models) %]
diff --git a/templates/design40_webpages/delivery_plan/report_top.html b/templates/design40_webpages/delivery_plan/report_top.html
new file mode 100644
index 000000000..7dd039544
--- /dev/null
+++ b/templates/design40_webpages/delivery_plan/report_top.html
@@ -0,0 +1,4 @@
+[% USE L %]
+
+[% PROCESS 'delivery_plan/_filter.html' filter=SELF.models.filtered.laundered use_linked_items=SELF.use_linked_items %]
+
diff --git a/templates/design40_webpages/delivery_term/form.html b/templates/design40_webpages/delivery_term/form.html
new file mode 100755
index 000000000..576d5b1f1
--- /dev/null
+++ b/templates/design40_webpages/delivery_term/form.html
@@ -0,0 +1,37 @@
+[% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %][%- USE P -%]
+<h1>[% FORM.title %]</h1>
+
+
+<div class="wrapper">
+  <form method="post" action="controller.pl" id="form">
+    [%- INCLUDE 'common/flash.html' %]
+    <table class="tbl-horizontal">
+      <tr>
+        <th> [%- 'Description' | $T8 %] </th>
+        <td> [% P.input_tag("delivery_term.description", SELF.delivery_term.description, size="60", "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+      <tr>
+        <th> [%- 'Long Description' | $T8 %] </th>
+        <td> [% P.input_tag("delivery_term.description_long", SELF.delivery_term.description_long, size="60", "data-validate"="required", "data-title"=LxERP.t8("Long Description")) %] </td>
+      </tr>
+      [%- FOREACH language = SELF.languages %]
+      <tr>
+        <th> [%- HTML.escape(language.description) %] ([%- LxERP.t8('Translation') %]) </th>
+        <td>
+          <input type="text" name="translation_[% language.id %]" value="[%- HTML.escape(SELF.delivery_term.translated_attribute('description_long', language, 1)) %]" size="60"> </td>
+      </tr>
+      [%- END %]
+
+      <tr>
+        <th>[% 'Obsolete' | $T8 %]</th>
+        <td>[% L.checkbox_tag('delivery_term.obsolete', checked=SELF.delivery_term.obsolete, for_submit=1) %]</td>
+      </tr>
+
+      <tr>
+        <th>[% "Delete for customers & vendors" | $T8 %]</th>
+        <td>[% L.checkbox_tag("remove_customer_vendor_delivery_terms", checked=remove_customer_vendor_delivery_terms, for_submit=1, label=LxERP.t8("This will also remove these delivery terms for all customers & vendors.")) %]</td>
+      </tr>
+    </table>
+    [% P.hidden_tag("id", SELF.delivery_term.id) %]
+  </form>
+</div>
diff --git a/templates/design40_webpages/delivery_term/list.html b/templates/design40_webpages/delivery_term/list.html
new file mode 100644
index 000000000..c986cc8c5
--- /dev/null
+++ b/templates/design40_webpages/delivery_term/list.html
@@ -0,0 +1,39 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+<h1>[% FORM.title %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="form">
+<div class="wrapper">
+
+  [% IF !DELIVERY_TERMS.size %]
+  <p>
+    [%- 'No delivery term has been created yet.' | $T8 %]
+  </p>
+  [%- ELSE %]
+  <table id="delivery_term_list" class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th class="center"> <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"> </th>
+        <th> [%- 'Description' | $T8 %] </th>
+        <th> [%- 'Long Description' | $T8 %] </th>
+      </tr>
+    </thead>
+    <tbody>
+      [%- FOREACH delivery_term = DELIVERY_TERMS %]
+      <tr id="delivery_term_id_[% delivery_term.id %]">
+        <td class="center dragdrop"> <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"> </td>
+        <td> <a href="[% SELF.url_for(action => 'edit', id => delivery_term.id) %]"> [%- HTML.escape(delivery_term.description) %] </a> </td>
+        <td> [%- HTML.escape(delivery_term.description_long) %] </td>
+      </tr>
+      [%- END %]
+    </tbody>
+  </table>
+  [%- END %]
+</div>
+</form>
+
+[% L.sortable_element('#delivery_term_list tbody', url => 'controller.pl?action=DeliveryTerm/reorder', with => 'delivery_term_id') %]
diff --git a/templates/design40_webpages/delivery_value_report/_filter.html b/templates/design40_webpages/delivery_value_report/_filter.html
new file mode 100644
index 000000000..0544f9bf5
--- /dev/null
+++ b/templates/design40_webpages/delivery_value_report/_filter.html
@@ -0,0 +1,121 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action="controller.pl" method="post" id="filter_form">
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id="filter_table" class="tbl-horizontal">
+  <caption>[% 'Order' | $T8 %] & [% IF SELF.vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</caption>
+  <colgroup><col class="wi-small"><col class="wi-normal"></colgroup>
+  <tbody>
+    <tr>
+     <th>[% 'Order Number' | $T8 %]</th>
+     <td>[% L.input_tag('filter.order.ordnumber:substr::ilike', filter.order.ordnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+     <th>[% 'Document Project Number' | $T8 %]</th>
+     <td>[% L.input_tag('filter.order.globalproject.projectnumber:substr::ilike', filter.order.globalproject.projectnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    [% IF SELF.vc == 'customer' %]
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.customer.name:substr::ilike', filter.order.customer.name_substr__ilike, class='wi-normal') %]</td>
+     </tr>
+      <tr>
+        <th>[% 'Customer Number' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.customer.customernumber:substr::ilike', filter.order.customer.customernumber_substr__ilike, class='wi-normal') %]</td>
+      </tr>
+    [% ELSE %]
+      <tr>
+        <th>[% 'Vendor' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.vendor.name:substr::ilike', filter.order.vendor.name_substr__ilike, class='wi-normal') %]</td>
+       </tr>
+      <tr>
+        <th>[% 'Vendor Number' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.vendor.vendornumber:substr::ilike', filter.order.vendor.vendornumber_substr__ilike, class='wi-normal') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+     <th>[% 'Customer type' | $T8 %]</th>
+     <td>
+       [% L.select_tag('filter.order.customer.business_id', SELF.all_businesses,
+                       default    => filter.order.customer.business_id,
+                       title_key  => 'description',
+                       value_key  => 'id',
+                       with_empty => 1,
+                       class      => 'wi-normal') %]
+     </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+	<caption>[% 'Article' | $T8 %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-normal"> </colgroup>
+	<tbody>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.part.partnumber:substr::ilike', filter.part.partnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Quantity' | $T8 %]</th>
+      <td>[% L.input_tag('filter.qty:number', filter.qty_number, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Type' | $T8 %]</th>
+      <td>
+       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part,     value='part',     label=LxERP.t8('Part')) %]
+       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service,  value='service',  label=LxERP.t8('Service')) %]
+       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
+       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
+     </td>
+    </tr>
+	</tbody>
+</table>
+
+<table class="tbl-horizontal">
+	<caption>[% 'Handling & Dates' | $T8 %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+	<tbody>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %] [% 'From Date' | $T8 %]</th>
+      <td class="wi-date">[% L.date_tag('filter.reqdate:date::ge', filter.reqdate_date__ge) %]</td>
+    </tr>
+    <tr>
+       <th>[% 'Delivery Date' | $T8 %] [% 'To Date' | $T8 %]</th>
+       <td class="wi-date">[% L.date_tag('filter.reqdate:date::le', filter.reqdate_date__le) %]</td>
+    </tr>
+    <tr>
+       <th>[% 'Employee' | $T8 %]</th>
+       <td>
+       [% L.select_tag('filter.order.employee_id', SELF.all_employees,
+                       default    => filter.order.employee_id,
+                       title_key  => 'name',
+                       value_key  => 'id',
+                       with_empty => 1,
+                       class      => 'wi-lightwide') %]
+     </td>
+    </tr>
+	</tbody>
+</table>
+
+<div class="buttons">
+  [% L.hidden_tag('sort_by', FORM.sort_by) %]
+  [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+  [% L.hidden_tag('page', FORM.page) %]
+  [% L.hidden_tag('vc', SELF.vc) %]
+  [% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+</div>
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/delivery_value_report/report_bottom.html b/templates/design40_webpages/delivery_value_report/report_bottom.html
new file mode 100644
index 000000000..fb939127e
--- /dev/null
+++ b/templates/design40_webpages/delivery_value_report/report_bottom.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[% L.paginate_controls(models=models) %]
diff --git a/templates/design40_webpages/delivery_value_report/report_top.html b/templates/design40_webpages/delivery_value_report/report_top.html
new file mode 100644
index 000000000..a2dac4971
--- /dev/null
+++ b/templates/design40_webpages/delivery_value_report/report_top.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[% PROCESS 'delivery_value_report/_filter.html' filter=SELF.models.filtered.laundered %]
diff --git a/templates/design40_webpages/disposition_manager/_show_vendor_parts.html b/templates/design40_webpages/disposition_manager/_show_vendor_parts.html
new file mode 100644
index 000000000..83a010fc7
--- /dev/null
+++ b/templates/design40_webpages/disposition_manager/_show_vendor_parts.html
@@ -0,0 +1,48 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+[%- USE P -%]
+
+<table id="vendor_parts_table" class="tbl-list">
+  <caption>[% 'All parts of vendor odered by onhand' | $T8 %]</caption>
+    <thead>
+     <tr>
+       <th>[% 'Purchase basket' | $T8 %] </th>
+       <th>[% 'Partnumber'      | $T8 %] </th>
+       <th>[% 'Description'     | $T8 %] </th>
+       <th>[% 'Onhand'          | $T8 %] </th>
+       <th>[% 'Ordered purchase'| $T8 %] </th>
+       <th>[% 'Rop'             | $T8 %] </th>
+       <th>[% 'Order quantity'  | $T8 %] </th>
+       <th>[% 'Vendor'          | $T8 %] </th>
+     </tr>
+    </thead>
+    <tbody>
+    [% FOREACH makemodel_item = MAKEMODEL_ITEMS %]
+      <tr>
+        <td>[% L.checkbox_tag('vendor_part_ids[+]',
+                 checked='0', value=makemodel_item.id) %]</td>
+        <td>[% makemodel_item.presenter.part(target = '_blank') %]
+          [% P.button_tag(
+               "kivi.DispositionManager.show_detail_dialog("
+                 _  makemodel_item.id _ "," _ makemodel_item.partnumber _
+               ")",
+               LxERP.t8('Details (one letter abbreviation)'),
+               title=LxERP.t8('Article details'), class="button") %]
+        </td>
+        <td>[% HTML.escape(makemodel_item.description) %]</td>
+        <td class="numeric">[% makemodel_item.onhand_as_number %]</td>
+        <td class="numeric">[% LxERP.format_amount(makemodel_item.get_open_ordered_qty, 2) %]</td>
+        <td class="numeric">[% makemodel_item.rop_as_number %]</td>
+        <td class="numeric">[% makemodel_item.order_qty_as_number %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', makemodel_item,
+                 default=makemodel_item.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+</table>
diff --git a/templates/design40_webpages/disposition_manager/list_parts.html b/templates/design40_webpages/disposition_manager/list_parts.html
new file mode 100644
index 000000000..b5fccd7a9
--- /dev/null
+++ b/templates/design40_webpages/disposition_manager/list_parts.html
@@ -0,0 +1,53 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+
+[%- INCLUDE 'common/flash.html' %]
+
+<div class="wrapper">
+<form id="form">
+  <table class="tbl-list">
+    <caption>[% 'Short onhand' | $T8 %]</caption>
+    <thead>
+     <tr>
+       <th>
+         [% L.checkbox_tag('check_all', checkall='[data-checkall=1]') %]
+         [% 'Purchase basket' | $T8 %]
+       </th>
+       <th>[% 'Partnumber'                                      | $T8 %] </th>
+       <th>[% 'Description'                                     | $T8 %] </th>
+       <th>[% 'Vendor'                                          | $T8 %] </th>
+       <th>[% 'Onhand'                                          | $T8 %] </th>
+       <th>[% 'Rop'                                             | $T8 %] </th>
+       <th>[% 'Minimum order quantity'                          | $T8 %] </th>
+     </tr>
+    </thead>
+    [% FOREACH part = PARTS %]
+      [% IF !part.get_open_ordered_qty %]
+      <tr>
+        <td>
+          [% IF part.makemodels.size %]
+            [% L.checkbox_tag('ids[+]', 'data-checkall'=1,
+                 checked = '1', value=part.id) %]
+          [% ELSE %]
+            [% 'No Vendor' | $T8 %]
+          [% END %]
+        </td>
+        <td>[% HTML.escape(part.partnumber) %]</td>
+        <td>[% HTML.escape(part.description) %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', part,
+                 default=part.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+        <td class="numeric">[% LxERP.format_amount(part.onhandqty, 2) %]</td>
+        <td class="numeric">[% part.rop_as_number %]</td>
+        <td class="numeric">[% part.order_qty_as_number %]</td>
+      </tr>
+      [% END %]
+    [% END %]
+  </table>
+</form>
+<h3>[% 'Short onhand Ordered' | $T8 %]</h3>
diff --git a/templates/design40_webpages/disposition_manager/reorder_level_list/report_bottom.html b/templates/design40_webpages/disposition_manager/reorder_level_list/report_bottom.html
new file mode 100644
index 000000000..a0cdb6aa3
--- /dev/null
+++ b/templates/design40_webpages/disposition_manager/reorder_level_list/report_bottom.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[%- L.paginate_controls(models=SELF.models)  %]
+</div>
diff --git a/templates/design40_webpages/disposition_manager/show_purchase_basket.html b/templates/design40_webpages/disposition_manager/show_purchase_basket.html
new file mode 100644
index 000000000..d1ab87a55
--- /dev/null
+++ b/templates/design40_webpages/disposition_manager/show_purchase_basket.html
@@ -0,0 +1,76 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+[%- USE P -%]
+
+[%- INCLUDE 'common/flash.html' %]
+<h1>[% title %]</h1>
+
+<div class="wrapper" id="wrapper-1">
+<div class="col">
+  <table class="tbl-horizontal">
+    <caption>[% 'Vendor' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <td>[% P.customer_vendor.picker('vendor_id', '', type='vendor', fat_set_item=1) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+</div><!-- /.wrapper -->
+
+<form id="purchasebasket">
+
+[% L.hidden_tag('vendor_id_selected') %]
+<div class="wrapper">
+  <table id="baskettable" class="tbl-list">
+  <caption>[% 'Purchase basket' | $T8 %]</caption>
+    <thead>
+     <tr>
+       <th>
+         [% L.checkbox_tag("", id="check_all", checkall="[data-checkall=1]") %]
+         [% 'Purchase basket' | $T8 %]
+       </th>
+       <th>[% 'Partnumber'                                      | $T8 %] </th>
+       <th>[% 'Description'                                     | $T8 %] </th>
+       <th>[% 'Onhand'                                          | $T8 %] </th>
+       <th>[% 'Rop'                                             | $T8 %] </th>
+       <th>[% 'Order quantity'                                  | $T8 %] </th>
+       <th>[% 'Vendor'                                          | $T8 %] </th>
+     </tr>
+    </thead>
+    <tbody id="basket_items">
+    [% FOREACH basket_item = BASKET_ITEMS %]
+
+      <tr>
+        <td>
+          [% L.checkbox_tag('ids[+]', "data-checkall"=1, checked = '1',  value=basket_item.id) %]
+          [% L.hidden_tag('basket_ids[+]', basket_item.id) %]
+        </td>
+        <td class="numeric"> [% basket_item.part.presenter.part(target = '_blank') %]
+          [% P.button_tag(
+               "kivi.DispositionManager.show_detail_dialog("
+                 _  basket_item.part.id _ ",'" _ basket_item.part.partnumber _
+               "')",
+               LxERP.t8('Details (one letter abbreviation)'),
+               title=LxERP.t8('Article details'), class="button") %]
+        </td>
+        <td>[% HTML.escape(basket_item.part.description) %]</td>
+        <td class="numeric">[% basket_item.part.onhand_as_number %]</td>
+        <td class="numeric">[% basket_item.part.rop_as_number %]</td>
+        <td class="numeric">[% basket_item.qty_as_number %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', basket_item.part,
+                 default=basket_item.part.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+  </table>
+</div>
+
+<div id="vendor_parts" class="wrapper"></div>
+</form>
diff --git a/templates/design40_webpages/do/form_footer.html b/templates/design40_webpages/do/form_footer.html
new file mode 100644
index 000000000..da309b285
--- /dev/null
+++ b/templates/design40_webpages/do/form_footer.html
@@ -0,0 +1,54 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% IF show_weight %]
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Total weight' | $T8 %]</th>
+      <td>[% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]</td>
+    </tr>
+  </tbody>
+</table>
+[% END %]
+
+</div>
+
+
+
+[% PROCESS 'webdav/_list.html' %]
+ <div id="ui-tabs-1">
+  [% LxERP.t8("Loading...") %]
+ </div>
+</div>
+
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+
+[% IF !delivered %]
+  <div id="shipto_inputs" class="hidden">
+    [% PROCESS 'common/_ship_to_dialog.html' vc_obj=VC_OBJ cvars=shipto_cvars %]
+  </div>
+[% END %]
+
+<div id="email_inputs" class="hidden"></div>
+
+<div id="print_options" class="hidden">
+  [% PRINT_OPTIONS %]
+</div>
+</form>
+
+<script type='text/javascript'>
+ $(kivi.SalesPurchase.init_on_submit_checks);
+</script>
+
+[% IF !delivered %]
+  <div id="shipto_dialog" class="hidden"></div>
+[% END %]
+
+<div id="print_dialog" class="hidden">
+  [% PROCESS 'common/_print_dialog.html' %]
+</div>
diff --git a/templates/design40_webpages/do/form_header.html b/templates/design40_webpages/do/form_header.html
new file mode 100644
index 000000000..c4eb9fb09
--- /dev/null
+++ b/templates/design40_webpages/do/form_header.html
@@ -0,0 +1,396 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% # Determine which shipping address to show if the delivery order has been shipped already. %]
+[% IF delivered;
+  SET shipto_label = [];
+  IF shipto_id;
+    FOREACH row = ALL_SHIPTO ;
+      IF row.shipto_id == shipto_id ;
+        SET shipto_label = [ row.shiptoname, row.shiptodepartment_1, row.shiptostreet, row.shiptocity ] ;
+      END ;
+    END ;
+  ELSE ;
+    SET shipto_label = [ shiptoname, shiptodepartment_1, shiptostreet, shiptocity ] ;
+  END ;
+
+  SET shipto_label = shipto_label.grep('.') ;
+  IF !shipto_label.size ;
+    shipto_label = [ LxERP.t8('no shipping address') ] ;
+  END ;
+END ; %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript" src="js/show_form_details.js"></script>
+<script type="text/javascript" src="js/show_history.js"></script>
+<script type="text/javascript" src="js/show_vc_details.js"></script>
+<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/stock_in_out.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/kivi.SalesPurchase.js"></script>
+
+
+[% IF vc == 'customer' %]
+  [% SET is_customer = '1' %]
+[% ELSE %]
+  [% SET vc = 'vendor' %]
+  [% SET is_customer = '0' %]
+[% END %]
+[% SET vc_id = vc _ "_id" %]
+[% IF delivered %]
+  [% SET DISABLED = ' disabled' %]
+[% END %]
+
+[% INCLUDE 'common/flash.html' %]
+[% INCLUDE 'generic/set_longdescription.html' %]
+
+[% IF ERRORS && ERRORS.size %]
+  <p class="message message_error">[% ERRORS.join('<br>') %]</p>
+[% END %]
+
+<form id="form" method="post" name="do" action="do.pl">
+
+<div id="do_tabs" class="tabwidget">
+  <ul>
+    <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+    [% IF INSTANCE_CONF.get_webdav %]
+      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+    [% END %]
+    [% IF id AND INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(type) %]&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(type) %]&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+    [% END %]
+    [% IF id AND AUTH.assert('record_links', 1) %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=DeliveryOrder&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+  </ul>
+
+<div id="ui-tabs-basic-data">
+<div class="wrapper" id="wrapper-1">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+<input type="hidden" name="follow_up_trans_id_1" id="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
+<input type="hidden" name="follow_up_trans_type_1" id="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
+<input type="hidden" name="follow_up_trans_info_1" id="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+<input type="hidden" name="follow_up_rowcount" id="follow_up_rowcount" value="1">
+
+<input type="hidden" name="business" id="business" value="[% HTML.escape(business) %]">
+<input type="hidden" name="closed" id="closed" value="[% HTML.escape(closed) %]">
+<input type="hidden" name="convert_from_oe_ids" id="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+<input type="hidden" name="currency" id="currency" value="[% HTML.escape(currency) %]">
+<input type="hidden" name="customer_pricegroup_id" id="customer_pricegroup_id" value="[% HTML.escape(customer_pricegroup_id) %]">
+<input type="hidden" name="discount" id="discount" value="[% HTML.escape(discount) %]">
+<input type="hidden" name="dunning_amount" id="dunning_amount" value="[% HTML.escape(dunning_amount) %]">
+<input type="hidden" name="emailed" id="emailed" value="[% HTML.escape(emailed) %]">
+<input type="hidden" name="id" id="id" value="[% HTML.escape(id) %]">
+<input type="hidden" name="max_dunning_level" id="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
+<input type="hidden" name="printed" id="printed" value="[% HTML.escape(printed) %]">
+<input type="hidden" name="proforma" id="proforma" value="[% HTML.escape(proforma) %]">
+<input type="hidden" name="queued" id="queued" value="[% HTML.escape(queued) %]">
+<input type="hidden" name="saved_donumber" id="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
+[% IF delivered %]
+  <input type="hidden" name="shipto_id" id="shipto_id" value="[% HTML.escape(shipto_id) %]">
+  <input type="hidden" name="shiptocity" id="shiptocity" value="[% HTML.escape(shiptocity) %]">
+  <input type="hidden" name="shiptocontact" id="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
+  <input type="hidden" name="shiptocp_gender" id="shiptocp_gender" value="[% HTML.escape(shiptocp_gender) %]">
+  <input type="hidden" name="shiptocountry" id="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
+  <input type="hidden" name="shiptogln" id="shiptogln" value="[% HTML.escape(shiptogln) %]">
+  <input type="hidden" name="shiptodepartment_1" id="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
+  <input type="hidden" name="shiptodepartment_2" id="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
+  <input type="hidden" name="shiptoemail" id="shiptoemail" value="[% HTML.escape(shiptoemail) %]">
+  <input type="hidden" name="shiptofax" id="shiptofax" value="[% HTML.escape(shiptofax) %]">
+  <input type="hidden" name="shiptoname" id="shiptoname" value="[% HTML.escape(shiptoname) %]">
+  <input type="hidden" name="shiptophone" id="shiptophone" value="[% HTML.escape(shiptophone) %]">
+  <input type="hidden" name="shiptostreet" id="shiptostreet" value="[% HTML.escape(shiptostreet) %]">
+  <input type="hidden" name="shiptozipcode" id="shiptozipcode" value="[% HTML.escape(shiptozipcode) %]">
+  <input type="hidden" name="shiptocp_gender" id="shiptocp_gender" value="[% HTML.escape(shiptocp_gender) %]">
+[% END %]
+<input type="hidden" name="show_details" id="show_details" value="[% HTML.escape(show_details) %]">
+<input type="hidden" name="taxincluded" id="taxincluded" value="[% HTML.escape(taxincluded) %]">
+<input type="hidden" name="taxzone_id" id="taxzone_id" value="[% HTML.escape(taxzone_id) %]">
+<input type="hidden" name="title" id="title" value="[% HTML.escape(title) %]">
+<input type="hidden" name="type" id="type" value="[% HTML.escape(type) %]">
+<input type="hidden" name="vc" id="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
+<input type="hidden" name="tax_point" id="tax_point" value="[% HTML.escape(tax_point) %]">
+
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+
+[% IF delivered %][% SET RO=' readonly' %][% END %]
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Customer & Order Information' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
+      <td class="wi-wide">
+        [% IF RO %]
+          [% P.hidden_tag(vc_id, $vc_id) %]
+          [% HTML.escape(VC_OBJ.name) %]
+        [% ELSE %]
+          [% P.customer_vendor.picker(vc_id, $vc_id, type=vc, class="wi-wide tooltipstered", onchange="\$('#update_button').click()", title=VC_OBJ.name ) %]
+        [% END %]
+        [% #P.button_tag("show_vc_details('" _ HTML.escape(vc) _ "')", LxERP.t8("Details (one letter abbreviation)"), class="wi-tiny neutral", title=LxERP.t8('Detailed information about this contact') ) %]
+        <a href="javascript:show_vc_details('[% HTML.escape(vc) %]');" title="[% 'Show detail informationen' | $T8 %]" class="button-image info"><img src="image/detail.png"></a>
+        [% P.hidden_tag("previous_" _ vc_id, $vc_id) %]
+      </td>
+    </tr>
+    [% IF ALL_CONTACTS.size %]
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>
+        [% IF delivered %]
+          <input type="hidden" name="cp_id" value="[% HTML.escape(cp_id) %]">
+          [% IF cp_id == row.cp_id %]
+            <span class="data wi-wide">[% HTML.escape(row.cp_name) %][% IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]</span>
+          [% END %]
+        [% ELSE %]
+          [% L.select_tag('cp_id', ALL_CONTACTS, default = cp_id, value_key = 'cp_id', title_key = 'full_name_dep', with_empty = 1, class='wi-wide') %]
+        [% END %]
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Shipping Address' | $T8 %]</th>
+      <td>
+        [% IF delivered %]
+          <span class="data wi-wide">[% HTML.escape(shipto_label.join('; ')) %]</span>
+        [% ELSE %]
+          [% IF ALL_SHIPTO.size %]
+            [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+               L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', class='wi-wide') %]
+          [% END %]
+          [% L.button_tag("kivi.SalesPurchase.edit_custom_shipto()", LxERP.t8("Custom shipto"), class='button neutral below wi-wide') %]
+        [% END %]
+      </td>
+    </tr>
+    [% IF (vc == 'customer') && VC_OBJ.additional_billing_addresses.as_list.size %]
+    <tr>
+      <th>[% 'Custom Billing Address' | $T8 %]</th>
+      <td>
+        [% L.select_tag('billing_address_id', VC_OBJ.additional_billing_addresses,
+                        with_empty=1, default=billing_address_id, value_key='id', title_key='displayable_id', class='wi-wide') %]
+      </td>
+    </tr>
+    [% END %]
+    [% IF business %]
+      <tr>
+        <th>[% IF is_customer %][% 'Customer type' | $T8 %][% ELSE %][% 'Vendor type' | $T8 %][% END %]</th>
+        <td><span class="data wi-wide">[% HTML.escape(business) %]</span><!-- PENDENT: Behandlung von Text in Formular-Tabellen -->  </td>
+      </tr>
+    [% END %]
+    [% IF max_dunning_level %]
+      <tr>
+        <th>[% 'Max. Dunning Level' | $T8 %]</th>
+        <td>
+          <b>[% HTML.escape(max_dunning_level) %]</b>, [% 'Dunning Amount' | $T8 %]:
+          <b>[% HTML.escape(LxERP.format_amount(dunning_amount, 2)) %]</b>
+        </td>
+      </tr>
+    [% END %]
+    [% IF ALL_LANGUAGES.size %]
+      <tr>
+       <th>[% 'Language' | $T8 %]</th>
+       <td>
+        [% L.select_tag('language_id', ALL_LANGUAGES, default = language_id, title_key = 'description', with_empty = 1, style = 'width: 250px' )%]
+       </td>
+      </tr>
+    [% END %]
+    [% IF ALL_DEPARTMENTS.size %]
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>
+          [% IF ( delivered ) %]
+            [% L.hidden_tag('department_id', department_id) %]
+          [% ELSE %]
+            [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, class='wi-wide', disabled = delivered )%]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Shipping Point' | $T8 %]</th>
+      <td><input type="text" name="shippingpoint" class="wi-wide" value="[% HTML.escape(shippingpoint) %]"[% RO %]></td>
+    </tr>
+    <tr>
+      <th>[% 'Ship via' | $T8 %]</th>
+      <td><input type="text" name="shipvia" class="wi-wide" value="[% HTML.escape(shipvia) %]"[% RO %]></td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", transaction_description, class="wi-wide", "data-validate"=(INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : ''), readonly=delivered) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Delivery Terms' | $T8 %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <td>[% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default=delivery_term_id, with_empty=1, title_key='description', class='wi-wide') %]</td>
+   </tr>
+    <tr>
+      <th class="caption"> [% 'Notes' | $T8 %] </th>
+    </tr>
+    <tr>
+      <td class="wi-wide">
+        [% IF delivered %]
+          [% L.hidden_tag("notes", notes) %]
+          <div class="fake-textarea fake-wi-wide">[% P.restricted_html(notes) %]</div>
+        [% ELSE %]
+          [% L.textarea_tag("notes", notes, rows=3, cols=10, class="texteditor wi-wide") %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2">
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag("intnotes", intnotes, class="wi-wide") %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Status & Handling' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Transfer Status' | $T8 %]</th>
+      <td>
+        <span class="data wi-normal">[% IF delivered %]
+          [% IF is_customer %]
+            [% 'transferred out' | $T8 %]
+          [% ELSE %]
+            [% 'transferred in' | $T8 %]
+          [% END %]
+        [% ELSE %]
+          [% IF is_customer %]
+            [% 'not transferred out yet' | $T8 %]
+          [% ELSE %]
+            [% 'not transferred in yet' | $T8 %]
+          [% END %]
+        [% END %]</span>
+      </td>
+      </tr>
+    <tr>
+      <th>[% 'Status' | $T8 %]</th>
+      <td>
+        <span class="data wi-normal">[% IF closed %][% 'Closed' | $T8 %][% ELSE %][% 'Open' | $T8 %][% END %]</span>
+        <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
+     </td>
+    </tr>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>
+        [% IF delivered %]
+          <input type="hidden" name="employee_id" value="[% HTML.escape(employee_id) %]">
+          [% FOREACH row = ALL_EMPLOYEES %]
+            [% IF row.id == employee_id %]
+              [% IF row.name %]
+                <span class="data wi-normal">[% HTML.escape(row.name) %]</span>
+              [% ELSE %]
+                <span class="data wi-normal">[% HTML.escape(row.login) %]</span>
+              [% END %]
+            [% END %]
+          [% END %]
+        [% ELSE %]
+          [% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title_key = 'safe_name', class='wi-normal') %]
+        [% END %]
+      </td>
+    </tr>
+    [% IF is_customer %]
+      [% IF salesman_id %]
+        [% SET the_salesman_id = salesman_id %]
+      [% ELSE %]
+        [% SET the_salesman_id = employee_id %]
+      [% END %]
+      <tr>
+        <th>[% 'Salesman' | $T8 %]</th>
+        <td>
+          [% IF delivered %]
+            <input type="hidden" name="salesman_id" value="[% HTML.escape(salesman_id) %]">
+            [% FOREACH row = ALL_SALESMEN %]
+              [% IF row.id == the_salesman_id %]
+               [% IF row.name %]
+                 <span class="data wi-normal">[% HTML.escape(row.name) %][% ELSE %][% HTML.escape(row.login) %]</span>
+               [% END %]
+             [% END %]
+            [% END %]
+          [% ELSE %]
+            [% L.select_tag('salesman_id', ALL_SALESMEN, default = (salesman_id ? salesman_id : employee_id), title_key = 'safe_name', class='wi-normal') %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th class="caption" colspan="2">[% 'IDs & Dates' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Order Number' | $T8 %]</th>
+      <td>
+        [% IF !is_customer || INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+          [% L.input_tag("donumber", donumber, readonly=delivered, class="wi-mediumsmall") %]
+        [% ELSIF id %]
+          [% HTML.escape(donumber) %]
+          [% L.hidden_tag("donumber", donumber) %]
+        [% ELSE %]
+          [% LxERP.t8("will be set upon saving") %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td><input type="text" name="ordnumber" id="ordnumber" class="wi-mediumsmall" value="[% HTML.escape(ordnumber) %]"[% RO %]></td>
+    </tr>
+    <tr>
+      <th>[% IF is_customer %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
+      <td><input type="text" name="cusordnumber" id="cusordnumber" class="wi-mediumsmall" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
+    </tr>
+   <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>
+        [% IF delivered %]
+          <input type="hidden" name="globalproject_id" value="[% HTML.escape(globalproject_id) %]">
+          [% FOREACH row = ALL_PROJECTS %]
+            [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %]
+          [% END %]
+        [% ELSE %]
+          <select name="globalproject_id" class="wi-mediumsmall">
+            <option></option>
+            [% FOREACH row = ALL_PROJECTS %]
+              <option value="[% HTML.escape(row.id) %]"[% IF globalproject_id == row.id %] selected[% END %]>[% HTML.escape(row.projectnumber) %]</option>
+            [% END %]
+          </select>
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Order Date' | $T8 %]</th>
+      <td> [% L.date_tag('transdate', transdate, readonly => delivered, class='wi-small') %] </td>
+    </tr>
+    <tr>
+      <th>[% 'Reqdate' | $T8 %]</th>
+      <td> [% L.date_tag('reqdate', reqdate, readonly => delivered, class='wi-small') %] </td>
+    </tr>
+    [% IF is_customer %]
+      <tr>
+        <th>[% 'Insert Date' | $T8 %]</th>
+        <td><span class="data wi-small">[% insertdate %]</span></td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/do/orders_bottom.html b/templates/design40_webpages/do/orders_bottom.html
new file mode 100644
index 000000000..cb8fa5898
--- /dev/null
+++ b/templates/design40_webpages/do/orders_bottom.html
@@ -0,0 +1,20 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE P %]
+
+[% P.hidden_tag("type", type) %]
+[% P.hidden_tag("vc", vc) %]
+[% P.hidden_tag("rowcount", rowcount) %]
+[% P.hidden_tag("callback", callback) %]
+
+<div id="print_options" class="hidden">
+  [% print_options %]
+</div>
+
+</form>
+
+<div id="print_dialog" class="hidden">
+  [% PROCESS 'common/_print_dialog.html' %]
+</div>
+<div id="mass_print_dialog" style="display: none"></div>
diff --git a/templates/design40_webpages/do/orders_top.html b/templates/design40_webpages/do/orders_top.html
new file mode 100644
index 000000000..859ffded7
--- /dev/null
+++ b/templates/design40_webpages/do/orders_top.html
@@ -0,0 +1 @@
+<form method="post" action="do.pl" id="form">
diff --git a/templates/design40_webpages/do/search.html b/templates/design40_webpages/do/search.html
new file mode 100644
index 000000000..0c5b671d2
--- /dev/null
+++ b/templates/design40_webpages/do/search.html
@@ -0,0 +1,270 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+<h1>[% title %]</h1>
+
+[% IF vc == 'customer' %]
+  [% SET is_customer = '1' %]
+[% ELSE %]
+  [% SET is_customer = '0' %]
+[% END %]
+
+[% SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
+
+<form method="post" action="do.pl" name="Form" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Customer' | $T8 %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
+      <td>[% P.input_tag(vc, "", class="fixed_width initial_focus wi-normal") %]</td>
+    </tr>
+    [% IF ALL_BUSINESS_TYPES.size %]
+    <tr>
+      <th>[% vctypelabel %]</th>
+      <td> [% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key='description', with_empty=1, class='wi-normal') %] </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% L.input_tag("cp_name", '', class="fixed_width wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Handling' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, class='fixed_width wi-normal') %]</td>
+    </tr>
+    [% IF is_customer %]
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag('salesman_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, class='fixed_width wi-normal') %]</td>
+    </tr>
+    [% END %] [% IF ALL_DEPARTMENTS.size %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default=department_id, title_key='description', with_empty=1, class="fixed_width wi-normal") %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Delivery Order Date' | $T8 %] [% #'From' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('transdateto') %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Reqdate' | $T8 %] [% #'From' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('reqdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('reqdateto') %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Insert Date' | $T8 %] [% #'From' | $T8 %]</th>
+      <td><span class="wi-date">[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %]</span></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Order & Numbers' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Delivery Order Number' | $T8 %]</th>
+      <td> <input type="text" name="donumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td> <input type="text" name="ordnumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    [%- IF type == "purchase_delivery_order" %]
+    <tr>
+      <th>[% 'Order Confirmation Number' | $T8 %]</th>
+      <td> <input type="text" name="order_confirmation_number" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Vendor Confirmation Number' | $T8 %]</th>
+      <td> <input type="text" name="vendor_confirmation_number" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    [%- END %]
+    <tr>
+      <th>[% 'Customer Order Number' | $T8 %]</th>
+      <td> <input type="text" name="cusordnumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>
+      <select name="project_id" class="fixed_width wi-mediumsmall">
+        <option></option>
+        [% FOREACH row = ALL_PROJECTS %]
+        <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.projectnumber) %]</option>
+        [% END %]
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td> <input type="text" name="transaction_description" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th align="right">[% 'Full Text' | $T8 %]</th>
+      <td>[% L.input_tag('fulltext', '', class="fixed_width wi-mediumsmall") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Article data' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td> <input type="text" name="parts_description" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td> <input type="text" name="parts_partnumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Serial Number' | $T8 %]</th>
+      <td> <input type="text" name="serialnumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Charge Number' | $T8 %]</th>
+      <td> <input type="text" name="chargenumber" class="fixed_width wi-mediumsmall">
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+</div><!-- ./wrapper -->
+
+<div class="form-addition control-panel wrapper">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <div class="list col wi-small">
+    <h4>[% 'Status' | $T8 %]</h4>
+    <div>
+      <input type="checkbox" name="open" value="1" id="open" checked>
+      <label for="open">[% 'Open' | $T8 %]</label>
+    </div>
+    <div>
+      <input type="checkbox" name="closed" value="1" id="closed">
+      <label for="closed">[% 'Closed' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="notdelivered" id="notdelivered" type="checkbox" value="1" checked>
+      <label for="notdelivered">[% 'Not delivered' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="delivered" id="delivered" type="checkbox" value="1" checked>
+      <label for="delivered">[% 'Delivered' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Numbers & IDs' | $T8 %]</h4>
+    <div>
+      <input name="l_id" id="l_id" type="checkbox" value="Y">
+      <label for="l_id">[% 'ID' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_donumber" id="l_donumber" type="checkbox" value="Y" checked>
+      <label for="l_donumber">[% 'Delivery Order Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_ordnumber" id="l_ordnumber" type="checkbox" value="Y" checked>
+      <label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
+    </div>
+    [%- IF type == "purchase_delivery_order" %]
+    <div>
+      <input name="l_order_confirmation_number" id="l_order_confirmation_number" type="checkbox" value="Y" checked>
+      <label for="l_order_confirmation_number">[% 'Order Confirmation Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" type="checkbox" value="Y" checked>
+      <label for="l_vendor_confirmation_number">[% 'Vendor Confirmation Number' | $T8 %]</label>
+    </div>
+    [% END %]
+    <div>
+      <input name="l_cusordnumber" id="l_cusordnumber" type="checkbox" value="Y" checked>
+      <label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
+    </div>
+    [% IF is_customer %]
+    <div>
+      <input name="l_customernumber" id="l_customernumber" type="checkbox" value="Y">
+      <label for="l_customernumber">[% 'Customer Number' | $T8 %]</label>
+    </div>
+    [% END %]
+    <div>
+      <input name="l_globalprojectnumber" id="l_globalprojectnumber" type="checkbox" value="Y">
+      <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Dates' | $T8 %]</h4>
+    <div>
+      <input name="l_transdate" id="l_transdate" type="checkbox" value="Y" checked>
+      <label for="l_transdate">[% 'Delivery Order Date' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_reqdate" id="l_reqdate" type="checkbox" value="Y" checked>
+      <label for="l_reqdate">[% 'Reqdate' | $T8 %]</label>
+    </div>
+    [% IF is_customer %]
+    <div>
+      <input name="l_insertdate" id="l_insertdate" type="checkbox" value="Y">
+      <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
+    </div>
+    [% END %]
+  </div>
+  <div class="list col">
+    <h4>[% 'Order data' | $T8 %]</h4>
+    <div>
+      <input name="l_name" id="l_name" type="checkbox" value="Y" checked>
+      <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
+    </div>
+    <div>
+      <input name="l_transaction_description" id="l_transaction_description" type="checkbox" value="Y" [% IF (instance_conf.get_require_transaction_description_ps) %] checked[% END %]>
+      <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_items" id="l_items" type="checkbox" value="Y">
+      <label for="l_items">[% 'Positions' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Handling' | $T8 %]</h4>
+    <div>
+      <input name="l_employee" id="l_employee" type="checkbox" value="Y" checked>
+      <label for="l_employee">[% 'Employee' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_salesman" id="l_salesman" type="checkbox" value="Y">
+      <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_department" id="l_department" type="checkbox" value="Y">
+      <label for="l_department">[% "Department" | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_shipvia" id="l_shipvia" type="checkbox" value="Y">
+      <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
+    </div>
+  </div>
+</div><!-- /.form-addition /.wrapper -->
+
+
+
+<input type="hidden" name="action" value="orders">
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="type" value="[% HTML.escape(type) %]">
+
+</form>
diff --git a/templates/design40_webpages/do/set_stock_in_out.html b/templates/design40_webpages/do/set_stock_in_out.html
new file mode 100644
index 000000000..4e6e14a5c
--- /dev/null
+++ b/templates/design40_webpages/do/set_stock_in_out.html
@@ -0,0 +1,19 @@
+[% USE HTML %]
+[% USE L %]
+
+<script type="text/javascript"><!--
+  $(function(){
+    var row = $('#row').val();
+    $(window.opener.document.getElementsByName("stock_" + $('#in_out').prop('value') + "_" + row)).val($('#stock').val());
+    $(window.opener.document.getElementById("stock_in_out_qty_display_" + row)).html($('#qty_display').val());
+    $(window.opener.document.getElementById("stock_in_out_qty_matches_" + row)).val([% qty_matches %]);
+    window.close();
+  });
+--></script>
+
+<form name="data">
+  <input type="hidden" name="row" id="row" value="[% HTML.escape(row) %]">
+  <input type="hidden" name="stock" id="stock" value="[% HTML.escape(stock) %]">
+  <input type="hidden" name="in_out" id="in_out" value="[% HTML.escape(in_out) %]">
+  <input type="hidden" name="qty_display" id="qty_display" value="[% HTML.escape(qty_display) %]">
+</form>
diff --git a/templates/design40_webpages/do/stock_in_form.html b/templates/design40_webpages/do/stock_in_form.html
new file mode 100644
index 000000000..798626a5f
--- /dev/null
+++ b/templates/design40_webpages/do/stock_in_form.html
@@ -0,0 +1,172 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE JavaScript %]
+<h1>[% title %]</h1>
+
+[% UNLESS delivered %]
+<script type="text/javascript"><!--
+
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [% FOREACH wh = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+    [% USE BINS_it = Iterator(wh.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
+    [% END %]
+  [% END %]
+
+function warehouse_selected(row, index, initial_bin_index) {
+  var cname = "bin_id_" + row;
+  var control = document.getElementById(cname);
+  for (var i = control.options.length - 1; i >= 0; i--) {
+    control.options[i] = null;
+  }
+  for (i = 0; i < warehouses[index].length; i++) {
+    control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
+  }
+  if (!initial_bin_index)
+    initial_bin_index = 0;
+  control.options[initial_bin_index].selected = true;
+}
+
+$(function(){
+  var bin_id_index       = 0;
+  var warehouse_id_index = 0;
+  [% USE STOCK_INFO_it = Iterator(STOCK_INFO) %][% FOREACH si = STOCK_INFO_it %]
+    // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
+    [% SET warehouse_selected = '0' %]
+    [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH wh = WAREHOUSES_it %]
+      // wh [% wh.id %]
+      [% IF HTML.escape(PART_INFO.warehouse_id) == wh.id %]
+        warehouse_id_index = [% WAREHOUSES_it.count - 1%];
+      [% END %]
+      [% USE BINS_it = Iterator(wh.BINS) %][% FOREACH bin = BINS_it %]
+        // bin [% bin.id %]
+        [% IF HTML.escape(PART_INFO.bin_id) == bin.id %]
+          bin_id_index = [% BINS_it.count - 1%];
+        [% END %]
+        [% IF bin.id == si.bin_id %]
+          warehouse_selected([% STOCK_INFO_it.count %], [% WAREHOUSES_it.count - 1 %], [% BINS_it.count - 1%]);
+          [% SET warehouse_selected = '1' %]
+        [% END %]
+      [% END %]
+    [% END %]
+    [% UNLESS warehouse_selected %]
+      warehouse_selected([% STOCK_INFO_it.count %], warehouse_id_index, bin_id_index);
+    [% END %]
+  [% END %]
+});
+
+--></script>
+[% END %]
+
+<form method="post" action="do.pl" name="Form">
+
+[% IF ERRORS && ERRORS.size %]
+  <div class="message message_error">[% ERRORS.join('<br>') %]</div>
+[% END %]
+
+<table class="tbl-plain">
+  <tbody>
+    <tr>
+      <td>[% 'Part Number' | $T8 %]</td>
+      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
+    </tr>
+    <tr>
+      <td>[% 'Description' | $T8 %]</td>
+      <td>[% HTML.escape(PART_INFO.description) %]</td>
+    </tr>
+    <tr>
+      <td>[% 'Qty according to delivery order' | $T8 %]</td>
+      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<input type="hidden" name="nextsub"        value="set_stock_in">
+<input type="hidden" name="update_nextsub" value="update_stock_in">
+<input type="hidden" name="rowcount"       value="[% HTML.escape(STOCK_INFO.size) %]">
+<input type="hidden" name="in_out"         value="in">
+<input type="hidden" name="parts_id"       value="[% HTML.escape(parts_id) %]">
+<input type="hidden" name="partunit"       value="[% HTML.escape(PART_INFO.unit) %]">
+<input type="hidden" name="do_qty"         value="[% HTML.escape(do_qty) %]">
+<input type="hidden" name="do_unit"        value="[% HTML.escape(do_unit) %]">
+<input type="hidden" name="row"            value="[% HTML.escape(row) %]">
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      <th>[% 'Warehouse' | $T8 %]</th>
+      <th>[% 'Bin' | $T8 %]</th>
+      <th>[% 'Charge Number' | $T8 %]</th>
+      [% IF INSTANCE_CONF.get_show_bestbefore %]
+        <th>[% 'Best Before' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Qty' | $T8 %]</th>
+      <th>[% 'Unit' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = STOCK_INFO %]
+      <tr [% IF row.stock_error %]class="tr_error"[% END %]>
+        <td>[% loop.count %]</td>
+        [% IF delivered %]
+          <td>[% HTML.escape(row.warehouse_description) %]</td>
+          <td>[% HTML.escape(row.bin_description) %]</td>
+          <td>[% HTML.escape(row.chargenumber) %]</td>
+          [% IF INSTANCE_CONF.get_show_bestbefore %]
+            <td>[% HTML.escape(row.bestbefore) %]</td>
+          [% END %]
+          <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
+          <td>[% HTML.escape(row.unit) %]</td>
+        [% ELSE %]
+          <td>
+            <select name="warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
+              [% FOREACH wh = WAREHOUSES %]
+                <option value="[% HTML.escape(wh.id) %]"[% IF wh.id == row.warehouse_id %] selected[% END %] [% IF wh.id == PART_INFO.warehouse_id && STOCK_INFO.size == 1  %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
+              [% END %]
+            </select>
+          </td>
+          <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
+          <td><input type="text" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
+          [% IF INSTANCE_CONF.get_show_bestbefore %]
+            <td>[% L.date_tag('bestbefore_'_ loop.count, row.bestbefore) %]</td>
+          [% END %]
+          <td>
+            <input type="text" name="qty_[% loop.count %]" size="12"
+              [%- IF (!row.qty) && (loop.count == 1) -%]
+                value="[% HTML.escape(do_qty) %]"
+              [%- ELSE -%]
+                value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"
+              [%- END -%]>
+          </td>
+          <td>
+            <select name="unit_[% loop.count %]">
+              [% FOREACH unit = UNITS %]
+                <option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+              [% END %]
+            </select>
+            <input type="hidden" name="delivery_order_items_stock_id_[% loop.count %]" value="[% HTML.escape(row.delivery_order_items_stock_id) %]">
+          </td>
+        [% END %]
+      </tr>
+    [% END %]<!-- /FOREACH row = STOCK_INFO -->
+  </tbody>
+</table>
+
+
+<div class="buttons">
+  [% IF delivered %]
+    <button type="button" name="action" onclick="window.close()" class="neutral">[% 'Close Window' | $T8 %]</button>
+  [% ELSE %]
+    <input type="submit" name="action" value="[% 'Update' | $T8 %]">
+    <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+  [% END %]
+</div>
+
+</form>
diff --git a/templates/design40_webpages/do/stock_out_form.html b/templates/design40_webpages/do/stock_out_form.html
new file mode 100644
index 000000000..0ef6adbd6
--- /dev/null
+++ b/templates/design40_webpages/do/stock_out_form.html
@@ -0,0 +1,136 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<form method="post" action="do.pl" name="Form">
+
+<div class="wrapper">
+
+  <h2>[% title %]</h2>
+
+  [% IF delivered %]
+    [% SET RO = ' readonly' %]
+  [% END %]
+
+  [% IF ERRORS && ERRORS.size %]
+    <div class="message message_error">[% ERRORS.join('<br>') %]</div>
+  [% END %]
+
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% 'Part Number' | $T8 %]</th>
+        <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Description' | $T8 %]</th>
+        <td>[% HTML.escape(PART_INFO.description) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Qty according to delivery order' | $T8 %]</th>
+        <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+[% UNLESS WHCONTENTS.size %]
+
+
+<div class="wrapper">
+  <p class="message message_hint">[% 'There are no items in stock.' | $T8 %]</p>
+  <div class="buttons"><button type="button" onclick="window.close()">[% 'Close Window' | $T8 %]</button></div>
+  <script type="text/javascript"><!--
+    $(function(){
+      $(window.opener.document.getElementsByName("stock_out_[% HTML.escape(row) %]")).val("");
+    });
+   --></script>
+</div><!-- /.wrapper -->
+
+[% ELSE %]
+
+  <div class="wrapper">
+
+  <input type="hidden" name="nextsub"   value="set_stock_out">
+  <input type="hidden" name="rowcount"  value="[% HTML.escape(WHCONTENTS.size) %]">
+  <input type="hidden" name="in_out"    value="out">
+  <input type="hidden" name="parts_id"  value="[% HTML.escape(parts_id) %]">
+  <input type="hidden" name="partunit"  value="[% HTML.escape(PART_INFO.unit) %]">
+  <input type="hidden" name="do_qty"    value="[% HTML.escape(do_qty) %]">
+  <input type="hidden" name="do_unit"   value="[% HTML.escape(do_unit) %]">
+  <input type="hidden" name="row"       value="[% HTML.escape(row) %]">
+  <input type="hidden" name="closed"    value="[% HTML.escape(closed) %]">
+  <input type="hidden" name="delivered" value="[% HTML.escape(delivered) %]">
+
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th>&nbsp;</th>
+        <th>[% 'Warehouse' | $T8 %]</th>
+        <th>[% 'Bin' | $T8 %]</th>
+        <th>[% 'Charge Number' | $T8 %]</th>
+        [% IF INSTANCE_CONF.get_show_bestbefore %]
+          <th>[% 'Best Before' | $T8 %]</th>
+        [% END %] [% UNLESS delivered %]
+          <th>[% 'Available qty' | $T8 %]</th>
+        [% END %]
+        <th>[% 'Qty' | $T8 %]</th>
+        <th>[% 'Unit' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH row = WHCONTENTS %]
+        <tr[% IF row.stock_error %] class="error"[% END %]>
+          <td>[% loop.count %]</td>
+          <td>[% HTML.escape(row.warehousedescription) %]</td>
+          <td>[% HTML.escape(row.bindescription) %]</td>
+          <td>[% HTML.escape(row.chargenumber) %]</td>
+          [% IF INSTANCE_CONF.get_show_bestbefore %]
+            <td>[% HTML.escape(row.bestbefore) %]</td>
+          [% END %]
+          [% IF delivered %]
+            <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
+            <td>[% HTML.escape(row.stock_unit) %]</td>
+          [% ELSE %]
+            <td>[% HTML.escape(row.available_qty) %]</td>
+            <td>
+              [% IF row.stock_qty %]
+                [% qty_value = HTML.escape(LxERP.format_amount(row.stock_qty)) %]
+              [% ELSIF ((whcontents.size == 1) && (!row.stock_qty)) %]
+                [% qty_value = HTML.escape(do_qty) %]
+              [% END %]
+              <input name="qty_[% loop.count %]" style="text-align: right;" size="12" value="[% qty_value %]">
+            </td>
+            <td>
+              <select name="unit_[% loop.count %]">
+                [% FOREACH unit = UNITS %]
+                  <option[% IF unit.name == row.stock_unit %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+                [% END %]
+              </select>
+              <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
+              <input type="hidden" name="bin_id_[% loop.count %]" value="[% HTML.escape(row.bin_id) %]">
+              <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+              <input type="hidden" name="delivery_order_items_stock_id_[% loop.count %]" value="[% HTML.escape(row.stock_delivery_order_items_stock_id) %]">
+              [% IF INSTANCE_CONF.get_show_bestbefore %]
+                <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+              [% END %]
+            </td>
+          [% END %]
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <div class="buttons">
+    [% IF delivered %]
+      <button type="button" name="action" onclick="window.close()" class="neutral">[% 'Close Window' | $T8 %]</button>
+    [% ELSE %]
+      <input type="submit" name="action" value="[% 'Continue' | $T8 %]">
+    [% END %]
+  </div>
+
+</div><!-- /.wrapper -->
+
+[% END %]
+</form>
diff --git a/templates/design40_webpages/drafts/form.html b/templates/design40_webpages/drafts/form.html
new file mode 100644
index 000000000..2ce82db31
--- /dev/null
+++ b/templates/design40_webpages/drafts/form.html
@@ -0,0 +1,43 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+[% INCLUDE 'common/flash.html' %]
+
+[% IF FORM.id %]
+<h3>[% 'Update this draft.' | $T8 %]</h3>
+[% ELSE %]
+<h3>[% 'Save as a new draft.' | $T8 %]</h3>
+[% END %]
+
+[% L.hidden_tag('', FORM.id, id='new_draft_id') %]
+[% 'Description' | $T8 %]: [% L.input_tag('new_draft_description', FORM.description) %]
+[% L.button_tag('kivi.Draft.save("' _ HTML.escape(SELF.module) _ '", "' _ HTML.escape(SELF.submodule) _ '")', LxERP.t8('Save draft')) %]
+
+[% IF drafts_list.size %]
+<h3>[% 'Load an existing draft' | $T8 %]</h3>
+
+<p>[% 'Warning! Loading a draft will discard unsaved data!' | $T8 %]</p>
+
+<table>
+ <tr>
+  <th>[% 'Date' | $T8 %]</th>
+  <th>[% 'Description' | $T8 %]</th>
+ </tr>
+
+[% FOREACH row = drafts_list %]
+ <tr class="listrow">
+  <td>[% row.date | html %]</td>
+  <td>
+  [% IF row.id == FORM.id %]
+   <b>[% row.description | html %]</b>
+  [% ELSE %]
+   [% L.link(SELF.url_for(action='load',id=row.id), row.description) %]
+  [% END %]
+  </td>
+  <td>[% L.html_tag('span', LxERP.t8('Delete'), class='cursor-pointer interact', onclick="kivi.Draft.delete('" _ row.id _ "')") %]</a></td>
+ </tr>
+[% END %]
+</table>
+[% END %]
diff --git a/templates/design40_webpages/dunning/add.html b/templates/design40_webpages/dunning/add.html
new file mode 100644
index 000000000..64b908380
--- /dev/null
+++ b/templates/design40_webpages/dunning/add.html
@@ -0,0 +1,87 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<script type="text/javascript" src="js/common.js"></script>
+
+<h1>[% title %]</h1>
+
+<form method="post" name="search" action="dn.pl" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td><input type="text" name="customer" class="initial_focus wi-lightwide"></td>
+    </tr>
+    [% IF SHOW_DEPARTMENT_SELECTION %]
+    <tr>
+      <th align="right">[% 'Department' | $T8 %]</th>
+      <td colspan="3">
+        [% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, style=style) %]
+      </td>
+    </tr>
+   [% END %]
+    [% IF SHOW_DUNNING_LEVEL_SELECTION %]
+    <tr>
+      <th>[% 'Next Dunning Level' | $T8 %]</th>
+      <td>
+        <select name="dunning_level" class="wi-lightwide">
+          <option></option>
+          [% FOREACH row = DUNNING %]
+            <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td><input type="text" name="invnumber" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td><input type="text" name="ordnumber" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Payment Term' | $T8 %]</th>
+      <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1, class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Type' | $T8 %]</th>
+      <th>[% L.select_tag('invoice', [ ['t', LxERP.t8('Invoice (No Dunning Fees)')], ['f', LxERP.t8('AR transactions (Dunning Fees)')], ], with_empty=1, class="wi-lightwide") %]
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td><input type="text" name="notes" class="wi-lightwide"></td>
+    </tr>
+    <tr class="separator below">
+      <th>[% 'Country' | $T8 %]</th>
+      <td><input type="text" name="country"  class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Minimum Amount' | $T8 %]</th>
+      <td><input type="text" name="minamount" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th><label for="groupinvoices">[% 'Group Invoices' | $T8 %]</label></th>
+      <td><input type="checkbox" value="1" id="groupinvoices" name="groupinvoices" checked></td>
+    </tr>
+    <tr>
+      <th><label for="l_include_direct_debit">[% 'Include invoices with direct debit' | $T8 %]</label></th>
+      <td><input type="checkbox" value="1" id="l_include_direct_debit" name="l_include_direct_debit"></td>
+    </tr>
+    <tr>
+     <th><label for="l_include_credit_notes">[% 'Add open Credit Notes' | $T8 %]</label></th>
+     <td><input type="checkbox" value="1" id="l_include_credit_notes" name="l_include_credit_notes"></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/dunning/edit_config.html b/templates/design40_webpages/dunning/edit_config.html
new file mode 100644
index 000000000..e35c5a71e
--- /dev/null
+++ b/templates/design40_webpages/dunning/edit_config.html
@@ -0,0 +1,188 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+<h1>[% title %]</h1>
+
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/dunning.js"></script>
+
+<form method="post" action="dn.pl" name="Form" id="form">
+
+<div class="wrapper">
+<table class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+      <th class="center">[% 'Dunning Level' | $T8 %]</th>
+      <th>[% 'Dunning Description' | $T8 %]</th>
+      <th class="center">[% 'Active?' | $T8 %]</th>
+      <th class="center">[% 'eMail Send?' | $T8 %]</th>
+<!--     <th>[% 'Auto Send?' | $T8 %]</th>  -->
+      <th class="center">[% 'Create invoice?' | $T8 %]</th>
+      <th class="center">[% 'Include original Invoices?' | $T8 %]</th>
+      <th class="right">[% 'Fristsetzung' | $T8 %]</th>
+      <th class="right">[% 'Duedate +Days' | $T8 %]</th>
+      <th class="right">[% 'Fee' | $T8 %]</th>
+      <th class="right">[% 'Interest Rate' | $T8 %]</th>
+      <th>[% 'Template' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% SET odd = '1' %]
+    [% USE DUNNING_it = Iterator(DUNNING) %]
+    [% FOREACH row = DUNNING_it %]
+    <tr>
+      <td class="center">
+        <input type="hidden" name="dunning_level_[% DUNNING_it.count %]" value="[% DUNNING_it.count %]">
+        <input type="hidden" name="id_[% DUNNING_it.count %]" value="[% HTML.escape(row.id) %]">
+        [% DUNNING_it.count %]
+      </td>
+      <td>
+        <input type="text" name="dunning_description_[% DUNNING_it.count %]" value="[% HTML.escape(row.dunning_description) %]">
+      </td>
+      <td class="center">
+        <input type="checkbox" name="active_[% DUNNING_it.count %]" value="1" [% IF row.active %]checked[% END %]>
+      </td>
+      <td class="center">
+        <input type="checkbox" name="email_[% DUNNING_it.count %]" value="1" [% IF row.email %]checked[% END %]>
+        <button type="button" onclick="set_email_window('email_subject_[% DUNNING_it.count %]', 'email_body_[% DUNNING_it.count %]', 'email_attachment_[% DUNNING_it.count %]')"> [% 'L' | $T8 %]</button>
+        <input type="hidden" name="email_body_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_body) %]">
+        <input type="hidden" name="email_subject_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_subject) %]">
+        <input type="hidden" name="email_attachment_[% DUNNING_it.count %]" value="[% HTML.escape(row.email_attachment) %]">
+      </td>
+  <!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
+      <td class="center">
+        <input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1"[% IF row.create_invoices_for_fees %] checked[% END %]>
+      </td>
+      <td class="center">
+        <input type="checkbox" name="print_original_invoice_[% DUNNING_it.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]>
+      </td>
+      <td class="right">
+        <input type="text" name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]">
+      </td>
+      <td class="right">
+        <input type="text" name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]">
+      </td>
+      <td class="right">
+        <input type="text" name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]">
+      </td>
+      <td class="right">
+        <input type="text" name="interest_rate_[% DUNNING_it.count %]" size="4" value="[% HTML.escape(row.interest_rate) %]">%
+      </td>
+      <td>
+        <input type="text" name="template_[% DUNNING_it.count %]" value="[% HTML.escape(row.template) %]">
+      </td>
+    </tr>
+      [% IF DUNNING_it.last %]
+        [% SET rowcount = DUNNING_it.size + 1 %]
+      [% END %]
+    [% END %]
+
+    [% UNLESS rowcount %][% SET rowcount = '1' %][% END %]
+    <tr>
+      <td class="center">
+        <input type="hidden" name="dunning_level_[% rowcount %]" value="[% rowcount %]">
+        <input type="hidden" name="id_[% rowcount %]">
+        [% rowcount %]
+      </td>
+      <td>
+        <input type="text" name="dunning_description_[% rowcount %]">
+      </td>
+      <td class="center">
+        <input type="checkbox" name="active_[% rowcount %]" value="1" checked>
+      </td>
+      <td class="center">
+        <input type="checkbox" name="email_[% rowcount %]" value="1" checked>
+        <button type="button" onclick="set_email_window('email_subject_[% rowcount %]', 'email_body_[% rowcount %]', 'email_attachment_[% rowcount %]')"> [% 'L' | $T8 %]</button>
+        <input type="hidden" name="email_body_[% rowcount %]">
+        <input type="hidden" name="email_subject_[% rowcount %]">
+        <input type="hidden" name="email_attachment_[% rowcount %]">
+      </td>
+  <!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
+      <td class="center">
+        <input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked>
+      </td>
+      <td class="center">
+        <input type="checkbox" name="print_original_invoice_[% DUNNING_it.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]>
+      </td>
+      <td class="right">
+        <input type="text" name="payment_terms_[% rowcount %]" size="3">
+      </td>
+      <td class="right">
+        <input type="text" name="terms_[% rowcount %]" size="3">
+      </td>
+      <td class="right">
+        <input type="text" name="fee_[% rowcount %]" size="5">
+      </td>
+      <td class="right">
+        <input type="text" name="interest_rate_[% rowcount %]" size="4">%
+      </td>
+      <td>
+        <input type="text" name="template_[% rowcount %]">
+      </td>
+    </tr>
+  </tbody>
+</table>
+</div><!-- /.wrapper -->
+
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+
+<div class="wrapper">
+
+<p>[% 'If the automatic creation of invoices for fees and interest is switched on for a dunning level then the following accounts will be used for the invoice.' | $T8 %]</p>
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Account for fees' | $T8 %]</th>
+      <td>
+        <select name="AR_amount_fee" class="wi-verywide">
+          [% FOREACH row = SELECT_AR_AMOUNT %]
+          <option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_fee_selected %] selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Account for interest' | $T8 %]</th>
+      <td>
+        <select name="AR_amount_interest" class="wi-verywide">
+          [% FOREACH row = SELECT_AR_AMOUNT %]
+          <option value="[% HTML.escape(row.id) %]" [% IF row.AR_amount_interest_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Record in' | $T8 %]</th>
+      <td>
+        <select name="AR" class="wi-verywide">
+          [% FOREACH row = SELECT_AR %]
+          <option value="[% HTML.escape(row.id) %]" [% IF row.AR_selected %]selected[% END %]>[% HTML.escape(row.accno) %]--[% HTML.escape(row.description) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th align="right">[% 'Dunning Creator' | $T8 %]</th>
+      <td>[% L.select_tag('dunning_creator', [ [ 'current_employee', LxERP.t8('Current Employee') ],[ 'invoice_employee', LxERP.t8('Employee from the original invoice') ]  ], default=dunning_creator) %]
+      </td>
+    </tr>
+    <tr>
+      <th align="right">[% 'Original Invoice' | $T8 %]</th>
+      <td>[% L.select_tag('dunning_original_invoice_creation_mode', [
+                 [ 'create_new', LxERP.t8('Create new record.') ],
+                 [ 'use_last_created_or_create_new',
+                   LxERP.t8('Use last created record or create new.') ],
+              ], default=dunning_original_invoice_creation_mode) %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/dunning/search.html b/templates/design40_webpages/dunning/search.html
new file mode 100644
index 000000000..e38b8f8d4
--- /dev/null
+++ b/templates/design40_webpages/dunning/search.html
@@ -0,0 +1,124 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" name="search" action="dn.pl" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Order data' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% P.input_tag("customer", "", class="initial_focus wi-lightwide") %]</td>
+    </tr>
+    [% IF SHOW_DUNNING_LEVELS %]
+    <tr>
+      <th>[% 'Dunning Level' | $T8 %]</th>
+      <td>
+      <select name="dunning_level" class="wi-lightwide">
+        <option value=""></option>
+        [% FOREACH row = DUNNING %]
+          <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.dunning_description) %]</option>
+        [% END %]
+      </select>
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Invoice Number' | $T8 %]</th>
+      <td><input type="text" name="invnumber" class="wi-lightwide">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Dunning number' | $T8 %]</th>
+      <td><input type="text" name="dunning_id" class="wi-lightwide">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td><input type="text" name="ordnumber" class="wi-lightwide">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td><input type="text" name="notes" class="wi-lightwide">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Invdate from' | $T8 %]</th>
+      <td><span class="wi-date"> [% L.date_tag('transdatefrom') %] [% 'To (time)' | $T8 %] [% L.date_tag('transdateto') %]</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Dunning Date from' | $T8 %]</th>
+      <td><span class="wi-date"> [% L.date_tag('dunningfrom') %] [% 'To (time)' | $T8 %] [% L.date_tag('dunningto') %]</span></td>
+    </tr>
+    [% IF ALL_DEPARTMENTS.as_list.size %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>
+        <select name="department_id" class="wi-lightwide">
+          <option value=""></option>
+          [% FOREACH row = ALL_DEPARTMENTS %]
+            <option value="[% HTML.escape(row.id) %]">[% HTML.escape(row.description) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag('salesman_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1, class='wi-lightwide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Options' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Show old dunnings' | $T8 %]</th>
+      <td><input type="checkbox" value="1" name="showold">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Show Salesman' | $T8 %]</th>
+      <td><input type="checkbox" value="1" name="l_salesman">
+      </td>
+    </tr>
+    [%- IF INSTANCE_CONF.get_email_journal %]
+    <tr>
+      <th>[% 'Show E-Mails' | $T8 %]</th>
+      <td><input type="checkbox" value="1" name="l_mails" checked>
+      </td>
+    </tr>
+    [%- END %]
+    [%- IF INSTANCE_CONF.get_webdav %]
+    <tr>
+      <th>[% 'Show documents in WebDAV' | $T8 %]</th>
+      <td><input type="checkbox" value="1" name="l_webdav" checked>
+      </td>
+    </tr>
+    [%- END %]
+    [%- IF INSTANCE_CONF.get_doc_storage %]
+    <tr>
+      <th>[% 'Show documents in file storage' | $T8 %]</th>
+      <td><input type="checkbox" value="1" name="l_documents" checked>
+      </td>
+    </tr>
+    [%- END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+
+
+
+</form>
diff --git a/templates/design40_webpages/dunning/set_email.html b/templates/design40_webpages/dunning/set_email.html
new file mode 100644
index 000000000..7cd94c652
--- /dev/null
+++ b/templates/design40_webpages/dunning/set_email.html
@@ -0,0 +1,49 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript">
+  function email_updated() {
+    window.opener.document.getElementsByName(document.Form.input_subject.value)[0].value = document.getElementsByName("email_subject")[0].value;
+    window.opener.document.getElementsByName(document.Form.input_body.value)[0].value = $("#email_body").val();
+    window.opener.document.getElementsByName(document.Form.input_attachment.value)[0].value = document.getElementsByName("email_attachment")[0].value;
+    self.close();
+  }
+</script>
+
+<div class="wrapper">
+
+<form name="Form">
+
+<input type="hidden" name="input_subject" value="[% HTML.escape(input_subject) %]">
+<input type="hidden" name="input_body" value="[% HTML.escape(input_body) %]">
+<input type="hidden" name="input_attachment" value="[% HTML.escape(input_attachment) %]">
+
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Subject:' | $T8 %]</th>
+      <td><input type="text" id="email_subject" name="email_subject" value="[% HTML.escape(email_subject) %]" class="wi-verywide"></td>
+    </tr>
+    <tr>
+      <th>[% 'Body:' | $T8 %]</th>
+      <td>[% L.textarea_tag('email_body', email_body, rows=18, class='texteditor texteditor-space-for-toolbar wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Attach PDF:' | $T8 %]</th>
+      <td><input id="email_attachment" type="checkbox" name="email_attachment" value="1" [% IF email_attachment %]checked[% END %]></td>
+    </tr>
+  </tbody>
+</table>
+</div>
+
+<div class="buttons">
+  <button type="button" onclick="email_updated()">[% 'Save and close' | $T8 %]</button>
+</div>
+
+</form>
+
+</div>
diff --git a/templates/design40_webpages/dunning/show_dunning_bottom.html b/templates/design40_webpages/dunning/show_dunning_bottom.html
new file mode 100644
index 000000000..284604589
--- /dev/null
+++ b/templates/design40_webpages/dunning/show_dunning_bottom.html
@@ -0,0 +1,2 @@
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+</form>
\ No newline at end of file
diff --git a/templates/design40_webpages/dunning/show_dunning_top.html b/templates/design40_webpages/dunning/show_dunning_top.html
new file mode 100644
index 000000000..8e01c4696
--- /dev/null
+++ b/templates/design40_webpages/dunning/show_dunning_top.html
@@ -0,0 +1,24 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+<form method="post" action="dn.pl" id="form">
+
+<div class="wrapper">
+<div class="col">
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Print options") %]</caption>
+	<colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+	<tbody>
+		<tr>
+			<th></th>
+			<td>[% L.checkbox_tag("force_lang", label=LxERP.t8('Override invoice language'), checked=force_lang) %]</td>
+		</tr>
+	</tbody>
+</table>
+[% PRINT_OPTIONS %]
+</div><!-- /.col -->
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+  <h2>[% LxERP.t8("Dunnings") %]</h2>
+</div>
diff --git a/templates/design40_webpages/dunning/show_invoices.html b/templates/design40_webpages/dunning/show_invoices.html
new file mode 100644
index 000000000..84017d607
--- /dev/null
+++ b/templates/design40_webpages/dunning/show_invoices.html
@@ -0,0 +1,115 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+[% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
+[% SET all_email = 1 %] [% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %]  [% LAST %][% END %][% END %]
+[% SET all_include_invoices = 1 %][% FOREACH row = DUNNINGS %][% IF !row.print_original_invoice %][% SET all_include_invoices = 0 %][% LAST %][% END %][% END %]
+<form name="Form" method="post" action="dn.pl" id="form">
+
+<div class="wrapper">
+  <div class="select-item control-panel">
+    <h3>[% LxERP.t8("Print options") %]</h3>
+    [% L.checkbox_tag("force_lang", label=LxERP.t8('Override invoice language'), checked=force_lang) %]
+    [% PRINT_OPTIONS %]
+  </div>
+  <p>[% 'The columns &quot;Dunning Duedate&quot;, &quot;Total Fees&quot; and &quot;Interest&quot; show data for the previous dunning created for this invoice.' | $T8 %]</p>
+</div><!-- /.wrapper -->
+
+<table id="dunning_invoice_list" class="tbl-list wi-moderate">
+  <caption>[% LxERP.t8("Overdue invoices") %]</caption>
+  <thead>
+    <th colspan="2">[% 'Current / Next Level' | $T8 %]</th>
+    <th>[% 'Payment description' | $T8 %]</th>
+    <th class="center">
+      <label for="selectall_active">[% 'Active?' | $T8 %]</label>
+      [% L.checkbox_tag('selectall_active', checkall='INPUT[name*=active_]', checked=all_active) %]
+    </th>
+    <th class="center">
+      <label for="selectall_email">[% 'eMail?' | $T8 %]</label>
+      [% L.checkbox_tag('selectall_email', checkall='INPUT[name*=email_]', checked=all_email) %]
+    </th>
+    <th class="center">
+      <label for="selectall_include_invoices">[% 'Original Invoices?' | $T8 %]</label>
+      [% L.checkbox_tag('selectall_include_invoices', checkall='INPUT[name*=include_invoice_]', checked=all_include_invoices) %]
+    </th>
+    <th>[% 'Customername' | $T8 %]</th>
+    <th>[% 'Department' | $T8 %]</th>
+    <th>[% 'Language' | $T8 %]</th>
+    <th>[% 'Type' | $T8 %]</th>
+    <th>[% 'Invno.' | $T8 %]</th>
+    <th>[% 'Invdate' | $T8 %]</th>
+    <th>[% 'Inv. Duedate' | $T8 %]</th>
+    <th class="right">[% 'Amount' | $T8 %]</th>
+    <th class="right">[% 'Open Amount' | $T8 %]</th>
+    <th>[% 'Dunning Duedate' | $T8 %]</th>
+    <th class="right">[% 'Total Fees' | $T8 %]</th>
+    <th class="right">[% 'Interest' | $T8 %]</th>
+    [% IF l_include_direct_debit %]
+      <th class="right">[% 'direct debit' | $T8 %]</th>
+    [% END %]
+  </thead>
+  <!-- Ausgabe der einzelnen Zeilen -->
+  <tbody>
+    [% FOREACH row = DUNNINGS %]
+       <tr[% IF row.direct_debit %] class="direct_debit"[% END %]>
+         <td>
+           <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
+           <input type="hidden" name="customer_id_[% loop.count %]" size="2" value="[% HTML.escape(row.customer_id) %]">
+           [% IF row.dunning_level %][% HTML.escape(row.dunning_level) %][% ELSE %]&nbsp;[% END %]
+         </td>
+         <td>
+           [% IF row.credit_note %]
+             [% LxERP.t8("Add Credit Note for this dunning level:") %]
+             <input type="hidden" name="credit_note_[% loop.count %]" value="1">
+           [% END %]
+           <select name="next_dunning_config_id_[% loop.count %]">
+             [% FOREACH cfg_row = row.DUNNING_CONFIG %]<option value="[% HTML.escape(cfg_row.id) %]" [% IF cfg_row.SELECTED %]selected[% END %]>[% HTML.escape(cfg_row.dunning_description) %]</option>[% END %]
+           </select>
+         </td>
+         <td>[% HTML.escape(row.payment_term) %]</td>
+         <td class="center"><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
+         <td class="center">[% IF row.recipient %]<input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email && row.recipient %]checked[% END %]>[% row.recipient %][% ELSE %]<input type="checkbox" name="dummy" disabled="true"> [% LxERP.t8("No invoice email found.") %] [% END %]</td>
+         <td class="center"><input type="checkbox" name="include_invoice_[% loop.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]></td>
+         <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">
+           <a href="controller.pl?action=CustomerVendor/edit&db=customer&id=[% row.customer_id %]">[% HTML.escape(row.customername) %]</a>
+         </td>
+         <td><input type="hidden" name="department_[% loop.count %]" size="6" value="[% HTML.escape(row.departmentname) %]">[% HTML.escape(row.departmentname) %]</td>
+         <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>
+         <td>
+           [% IF row.invoice %]
+             [% 'Invoice (one letter abbreviation)' | $T8 %]
+           [% ELSE %]
+             [% 'AR Transaction (abbreviation)' | $T8 %]
+           [% END %]
+         </td>
+         <td>
+           <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
+           <a href="[% IF row.invoice %]is[% ELSE %]ar[% END %].pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+         </td>
+         <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
+         <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
+         <td class="numeric"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
+         <td class="numeric"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
+         <td>[% HTML.escape(row.dunning_duedate) %]</td>
+         <td class="numeric"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
+         <td class="numeric"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
+         [% IF l_include_direct_debit %]
+           <td class="numeric">
+             [% IF row.direct_debit %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]
+           </td>
+         [% END %]
+       </tr>
+     [% END %]
+  </tbody>
+</table>
+
+<input name="rowcount" type="hidden" value="[% HTML.escape(rowcount) %]">
+<input name="groupinvoices" type="hidden" value="[% HTML.escape(groupinvoices) %]">
+<input name="l_include_credit_notes" type="hidden" value="[% HTML.escape(l_include_credit_notes) %]">
+<input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+
+</form>
diff --git a/templates/design40_webpages/dunning/status.html b/templates/design40_webpages/dunning/status.html
new file mode 100644
index 000000000..d4e8451e5
--- /dev/null
+++ b/templates/design40_webpages/dunning/status.html
@@ -0,0 +1,40 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% USE T8 %]
+[% USE Base64 %]
+
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<div class="wrapper">
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th>[% 'Dunning number' | $T8 %]</th>
+        <th>[% 'Invoice Number' | $T8 %]</th>
+        <th>[% 'Include original Invoices?' | $T8 %]</th>
+        <th>[% 'eMail?' | $T8 %]</th>
+        <th>[% 'Status' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH s = status -%]
+      <tr class=[%- IF s.error %]"listrow_error"[% ELSE %]"listrow"[% END %]>
+        <td>[% IF !s.error %][% P.link_tag('dn.pl?action=show_dunning&showold=1&dunning_id=' _ s.dunning_id, s.dunning_id) %][% END %]</td>
+        <td>[% s.invnumbers.join(", ") %]</td>
+        <td>[% s.print_original_invoice ? LxERP.t8('Yes') : LxERP.t8('No') %]</td>
+        <td>[% s.send_email ? LxERP.t8('Yes') : LxERP.t8('No') %]</td>
+        <td>[% s.error ? s.error : LxERP.t8('Ok') %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
+
+[% IF pdf_filename && pdf_content %]
+  <script type="text/javascript">
+    $(function() {kivi.save_file('[% pdf_content.encode_base64 %]', 'application/pdf', 0, '[% pdf_filename %]');});
+  </script>
+[% END %]
diff --git a/templates/design40_webpages/email_journal/_filter.html b/templates/design40_webpages/email_journal/_filter.html
new file mode 100644
index 000000000..7d0a82d6c
--- /dev/null
+++ b/templates/design40_webpages/email_journal/_filter.html
@@ -0,0 +1,85 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+[% BLOCK filter_toggle_panel %]
+  <table id="filter_table" class="tbl-horizontal">
+    <tbody>
+    <tr>
+      <th>[% LxERP.t8("From") %]</th>
+      <td>[% L.input_tag("filter.from:substr::ilike", filter.from_substr__ilike, size = 20) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Recipients") %]</th>
+      <td>[% L.input_tag("filter.recipients:substr::ilike", filter.recipients_substr__ilike, size = 20) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Sent on") %]</th>
+      <td>[% L.date_tag("filter.sent_on:date::ge", filter.sent_on_date__ge) %] [% LxERP.t8("To Date") %] [% L.date_tag("filter.sent_on:date::le", filter.sent_on_date__le) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Status") %]</th>
+      <td>[% L.select_tag("filter.status:eq_ignore_empty", [
+                 [ "", "" ],
+                 [ "send_failed", LxERP.t8("send failed") ],
+                 [ "sent", LxERP.t8("sent") ],
+                 [ "imported", LxERP.t8("imported") ]
+               ], default=filter.status_eq_ignore_empty) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Record Type") %]</th>
+      <td>
+        [%
+          SET record_type_options = [];
+          record_type_options.push({text=LxERP.t8("Catch-all"), record_type='catch_all'});
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (!record_info.is_template);
+              record_type_options.push(record_info);
+            END;
+          END;
+        %]
+        [% L.select_tag("filter.record_type:eq_ignore_empty",
+             record_type_options,
+             title_key = 'text', value_key = 'record_type',
+             with_empty=1, default=filter.record_type_eq_ignore_empty) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Obsolete") %]</th>
+      <td>[% L.yes_no_tag("filter.obsolete:eq_ignore_empty",
+            filter.obsolete, with_empty=1,
+            default=filter.obsolete_eq_ignore_empty
+            ) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Linked") %]</th>
+      <td>[% L.yes_no_tag("filter.linked_to:eq_ignore_empty",
+            filter.linked_to, with_empty=1,
+            default=filter.linked_to_eq_ignore_empty
+            ) %]
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  [% L.hidden_tag("sort_by", FORM.sort_by) %]
+  [% L.hidden_tag("sort_dir", FORM.sort_dir) %]
+  [% L.hidden_tag("page", FORM.page) %]
+  <div class="buttons">[% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset')) %]</div>
+[% END %]
+
+<div class="wrapper">
+<form action="controller.pl" method="post" id="filter_form">
+
+[% INCLUDE common/toggle_panel.html %]
+
+
+
+</div>
+
+</form>
+</div>
diff --git a/templates/design40_webpages/email_journal/list.html b/templates/design40_webpages/email_journal/list.html
new file mode 100644
index 000000000..d8f8f1229
--- /dev/null
+++ b/templates/design40_webpages/email_journal/list.html
@@ -0,0 +1,61 @@
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+[% PROCESS 'email_journal/_filter.html' filter=SELF.models.filtered.laundered %]
+
+[% IF !ENTRIES.size %]
+  <p>[% LxERP.t8('There are no entries that match the filter.') %]</p>
+
+[% ELSE %]
+
+<table id="email_journal_list" class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+      [% IF SELF.can_view_all %]
+        <th>[% L.sortable_table_header("sender") %]</th>
+      [% END %]
+      <th>[% L.sortable_table_header("from") %]</th>
+      <th>[% L.sortable_table_header("recipients") %]</th>
+      <th>[% L.sortable_table_header("subject") %]</th>
+      <th>[% L.sortable_table_header("sent_on") %]</th>
+      <th>[% L.sortable_table_header("status") %]</th>
+      <th>[% L.sortable_table_header("extended_status") %]</th>
+      <th>[% L.sortable_table_header("record_type") %]</th>
+      <th>[% L.sortable_table_header("obsolete") %]</th>
+      <th>[% L.sortable_table_header("linked_to") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH entry = ENTRIES %]
+    <tr id="email_journal_id_[% entry.id %]" [% IF entry.status == 'send_failed' %] class="listrow_error" [% END %]>
+      [% IF SELF.can_view_all %]
+        <td>[% IF entry.sender %] [% HTML.escape(entry.sender.name) %] [% ELSE %] [% LxERP.t8("kivitendo") %] [% END %]</td>
+      [% END %]
+      [% action_show_link = SELF.url_for(
+           action => 'show', id => entry.id,
+           back_to => SELF.models.get_callback(),
+      ) %]
+      <td><a href="[% action_show_link %]"> [% HTML.escape(entry.from) %] </a></td>
+      <td>[% HTML.escape(entry.recipients) %]</td>
+      <td><a href="[% action_show_link %]"> [% HTML.escape(entry.subject) %] </a></td>
+      <td>[% HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
+      <td> [% P.email_journal.entry_status(entry) %] </td>
+      <td>[% HTML.escape(entry.extended_status) %]</td>
+      <td>[% HTML.escape(RECORD_TYPES_TO_TEXT.${entry.record_type}) %]</td>
+      <td>[% HTML.escape(entry.obsolete_as_bool_yn) %]</td>
+      <td>
+        [% P.record.simple_grouped_record_list(entry.linked_records) %]
+      </td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+[% END %]
+
+[% L.paginate_controls %]
diff --git a/templates/design40_webpages/email_journal/show.html b/templates/design40_webpages/email_journal/show.html
new file mode 100644
index 000000000..94e81ecf2
--- /dev/null
+++ b/templates/design40_webpages/email_journal/show.html
@@ -0,0 +1,259 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+[% USE T8 %]
+
+<h1>[% FORM.title %]</h1>
+
+<form>
+
+[% INCLUDE 'common/flash.html' %]
+
+  <div class="tabwidget" id="email_tabs">
+    <ul>
+      <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=EmailJournal&object_id=[% HTML.url(SELF.entry.id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    </ul>
+
+    [% PROCESS "email_journal/tabs/basic_data.html" %]
+  </div> <!-- /.tabwidget -->
+</form>
+
+<div class="wrapper" id="wrapper-0">
+
+[% SET attachments = SELF.entry.attachments_sorted %]
+
+[% IF attachments.size %]
+<div class="wrapper input-panel">
+  <table id="email_journal_details" class="tbl-list">
+    <caption>[% 'Attachments' | $T8 %]</caption>
+    <thead>
+      <tr>
+        <th>[% 'Attachment name' | $T8 %]</th>
+        <th>[% 'MIME type' | $T8 %]</th>
+        <th>[% 'Size' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH attachment = attachments %]
+      <tr>
+        <td>[% L.link(SELF.url_for(action="download_attachment", id=attachment.id), attachment.name) %]</td>
+        <td>[% HTML.escape(attachment.mime_type) %]</td>
+        <td>[% HTML.escape(LxERP.format_amount(attachment.content.length, 0)) %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
+[% END %]
+
+[% IF SELF.entry.status == 'imported' %]
+<div class="wrapper input-panel control-panel" style="display:block">
+  <form method="post" action="controller.pl" id="record_action_form">
+    [% L.hidden_tag('email_journal_id', SELF.entry.id) %]
+    [% L.hidden_tag('back_to', back_to) %]
+    <h2>[% LxERP.t8("Email Journal Workflow") %]</h2>
+
+    <div id="action_div"><div class="input-panel" style="margin:0">
+
+      <div class="col">
+      [% L.select_tag('attachment_id',
+           attachments, value_key='id', title_key='name',
+           default = attachments.0.id,
+           with_empty=1, empty_value='', empty_title=LxERP.t8("No attachment"),
+           'data-title'=LxERP.t8("Attachment"), class="wi-normal",
+           onchange='kivi.EmailJournal.update_attachment_preview();'
+           )
+        %]
+      </div>
+
+      <div id="action_div" class="col">
+      [% L.select_tag('action_selection',
+         [
+           {value => "workflow_record", name => LxERP.t8("Create from Workflow")},
+           {value => "linking_record",  name => LxERP.t8("Linking to Record")},
+           {value => "new_record",      name => LxERP.t8("Create new")},
+           {value => "template_record", name => LxERP.t8("Create from Record Template")},
+         ],
+         value_key='value', title_key='name',
+         class="wi-normal",
+         onchange='kivi.EmailJournal.update_email_workflow_options();'
+         ) %]
+      </div>
+
+      <div id="customer_vendor_div" class="col">
+      [% L.select_tag('customer_vendor_selection',
+         [
+           {value => "customer", name => LxERP.t8("Sales")},
+           {value => "vendor",   name => LxERP.t8("Purchase")},
+         ],
+         default = CV_TYPE_FOUND,
+         value_key='value', title_key='name',
+         class="wi-verysmall",
+         onchange='kivi.EmailJournal.update_email_workflow_options();'
+         ) %]
+      </div>
+
+      [% FOREACH customer_vendor = ['customer', 'vendor'] %]
+      <div id="[% customer_vendor _ "_workflow_record_types_div" %]" class="col"
+        style=[% IF customer_vendor == CV_TYPE_FOUND %] "display:block" [% ELSE %] "display:none" [% END %]
+        >
+
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && record_info.can_workflow && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_workflow_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      <div id="[% customer_vendor _ "_new_record_types_div" %]" class="col"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && !record_info.workflow_needed && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_new_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      <div id="[% customer_vendor _ "_linking_record_types_div" %]" class="col"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_linking_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+
+
+      <div id="[% customer_vendor _ "_template_record_types_div" %]" class="col"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_template_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      [% END %]
+
+    </div></div> <!-- action_div -->
+
+    <div id="record_selection_div">
+      <div id="filter_div"><div class="input-panel" style="margin:0">
+        [% FOREACH cv_option = [
+             ['customer', 'Customer'],
+             ['vendor',   'Vendor'  ],
+             ] %]
+        [% SET cv_type        = cv_option.0 %]
+        [% SET cv_name        = cv_option.1 %]
+        <div
+          id="[% cv_type _ "_div" %]" class="col"
+          style=[% IF cv_type == CV_TYPE_FOUND %] "display:block" [% ELSE %] "display:none" [% END %]
+          >
+          [% P.customer_vendor.picker(
+               cv_type _ "_id",
+               cv_type == 'customer' ? CUSTOMER : VENDOR,
+               type=cv_type, class="wi-normal", placeholder=LxERP.t8(cv_name)
+               onchange='kivi.EmailJournal.update_record_list();'
+               ) %]
+        </div>
+        [% END %]
+
+        <div id="record_number_div" class="col">
+          [% L.input_tag('record_number', '',
+             class="wi-normal", placeholder=LxERP.t8("Record number")
+             onchange='kivi.EmailJournal.update_record_list();'
+             ) %]
+        </div>
+
+        <div id="with_closed_div" class="col">
+          [% L.select_tag('with_closed',
+             [
+               {value => "1", name => LxERP.t8("With closed")},
+               {value => "0", name => LxERP.t8("Only open")},
+             ],
+             default = 0, value_key='value', title_key='name',
+             onchange='kivi.EmailJournal.update_record_list();'
+             ) %]
+        </div>
+      </div></div> <!-- filter_div -->
+
+      <!-- gets updated on $(document).ready -->
+      <div id="record_div">
+        <div id="record_toggle_closed"
+          class="record_toggle toggle_panel control-panel" style="display:block;">
+          <a href="#" onClick='javascript:$(".record_toggle").toggle()'
+             class="button toggle off neutral">
+            [% LxERP.t8('Show Records') %]
+          </a>
+        </div><!-- /.record_toggle -->
+        <div id="record_toggle_open"
+          class="record_toggle toggle_panel control-panel" style="display:none;">
+          <a href="#" onClick='javascript:$(".record_toggle").toggle()'
+             class="button toggle on neutral with-panel">
+            [% LxERP.t8('Hide Records') %]
+          </a>
+          <div class="toggle_panel_block">
+            <div id="record_list">[% LxERP.t8("Loading...") %]</div>
+          </div>
+        </div><!-- /.record_toggle -->
+      </div><!-- record_div -->
+    </div><!-- record_selection_div -->
+    <div id="new_record_div" class="input-panel" style="display:none;min-width:0;margin:0">
+        [% L.button_tag('kivi.EmailJournal.apply_action_with_attachment();',
+          LxERP.t8('Apply with Attachment')) %]
+    </div>
+
+  </form>
+
+  <!-- kivi.EmailJournal.update_attachment_preview -->
+  <div class="wrapper" style="overflow:auto"><div id="attachment_preview"></div></div>
+
+</div>
+[% END %]
+
+</div> <!-- wrapper-0 -->
+
+<script type="text/javascript">
+  $(document).ready(function() {
+    kivi.EmailJournal.update_email_workflow_options();
+    kivi.EmailJournal.update_attachment_preview();
+  });
+</script>
diff --git a/templates/design40_webpages/email_journal/tabs/basic_data.html b/templates/design40_webpages/email_journal/tabs/basic_data.html
new file mode 100644
index 000000000..8ea76b2c2
--- /dev/null
+++ b/templates/design40_webpages/email_journal/tabs/basic_data.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div id="ui-tabs-basic-data">
+
+<div class="wrapper">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+<table id="email_journal_details" class="tbl-horizontal">
+  <caption>[% 'Email Details' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'From' | $T8 %]</th>
+      <td>[% L.input_tag('from',  SELF.entry.from, style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Recipients' | $T8 %]</th>
+      <td>[% L.input_tag('recipients', SELF.entry.recipients, style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Subject' | $T8 %]</th>
+      <td>[% L.input_tag('subject', SELF.entry.subject, style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Sent on' | $T8 %]</th>
+      <td>[% L.input_tag('sent_on', SELF.entry.sent_on.to_lxoffice("precision" => "second"), style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Status' | $T8 %]</th>
+      <td>[% L.input_tag('status', P.email_journal.entry_status(SELF.entry), style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Extended status' | $T8 %]</th>
+      <td>
+        [% L.textarea_tag('extended_status', SELF.entry.extended_status, style="color:black; height:25px", class="wi-verywide", disabled=1) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'For Record Type' | $T8 %]</th>
+      <td>[% L.input_tag('record_type', RECORD_TYPES_TO_TEXT.${SELF.entry.record_type}, style="color:black", class="wi-verywide", disabled=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Headers' | $T8 %]</th>
+      <td>
+        [% L.textarea_tag('headers', HTML.escape(SELF.entry.headers), style="color:black; height:25px", class="wi-verywide", disabled=1) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Body' | $T8 %]</th>
+      <td>
+        <div style="border:1px solid black; resize: both; overflow: auto; min-height:50px">
+          [% IF SELF.entry.headers.match('(?i)content-type:.*text/html') %]
+            [% P.restricted_html(SELF.entry.body) %]
+          [% ELSE %]
+            <pre>[% SELF.entry.body | html %]</pre>
+          [% END %]
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Obsolete' | $T8 %]</th>
+      <td>
+        [% L.input_tag('obsolete', SELF.entry.obsolete_as_bool_yn, style="color:black", class="wi-verysmall", disabled=1) %]
+        [% L.button_tag("kivi.EmailJournal.toggle_obsolete( $SELF.entry.id );", 'Toggle', class="wi-verysmall") %]
+      </td>
+  </tbody>
+</table>
+</div><!-- /.wrapper -->
+
+</div><!-- /#ui-tabs-basic-data -->
diff --git a/templates/design40_webpages/employee/_list.html b/templates/design40_webpages/employee/_list.html
new file mode 100644
index 000000000..ec61c8933
--- /dev/null
+++ b/templates/design40_webpages/employee/_list.html
@@ -0,0 +1,27 @@
+[% USE T8 %]
+
+<div class="wrapper">
+<table class="tbl-list">
+ <colgroup>
+   <col class="wi-verysmall">
+   <col>
+   <col class="wi-verysmall">
+ </colgroup>
+ <thead>
+ <tr>
+  <th>[% 'Login of User' | $T8 %]</th>
+  <th>[% 'Name' | $T8 %]</th>
+  <th>[% 'Deleted' | $T8 %]</th>
+ </tr>
+ </thead>
+ <tbody>
+[% FOREACH row IN SELF.employees %]
+ <tr class='listrow[% loop.count % 2 %]'>
+  <td><a href='[% SELF.url_for(action="edit", "employee.id"=row.id) %]'>[% row.login | html %]</a></td>
+  <td>[% row.name | html %]</td>
+  <td>[% row.deleted_as_bool_yn | html %]</td>
+ </tr>
+[% END %]
+ </tbody>
+</table>
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/employee/edit.html b/templates/design40_webpages/employee/edit.html
new file mode 100644
index 000000000..0a16a7933
--- /dev/null
+++ b/templates/design40_webpages/employee/edit.html
@@ -0,0 +1,27 @@
+[%- USE LxERP -%][%- USE L -%][%- USE T8 -%]<h1>[% title | html %]</h1>
+
+[% INCLUDE "common/flash.html" %]
+
+<div class="wrapper">
+<form action="controller.pl" method="POST" id="form">
+
+ <table class="tbl-horizontal">
+  <colgroup> <col class="wi-verysmall"><col class="wi-normal"> </colgroup>
+  <tr>
+   <th>[% "Login of User" | $T8 %]</th>
+   <td>[% SELF.employee.login | html %]</td>
+  </tr>
+  <tr>
+   <th>[% "Name" | $T8 %]</th>
+   <td>[% SELF.employee.name | html %]</td>
+  </tr>
+  <tr>
+   <th>[% "Deleted" | $T8 %]</th>
+   <td> [% L.radio_button_tag("employee.deleted", value=1, checked=SELF.employee.deleted, label=LxERP.t8("Yes")) %] [% L.radio_button_tag("employee.deleted", value=0, checked=!SELF.employee.deleted, label=LxERP.t8("No")) %]
+   </td>
+  </tr>
+ </table>
+
+ [%- L.hidden_tag("employee.id", SELF.employee.id) %]
+</form>
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/employee/list.html b/templates/design40_webpages/employee/list.html
new file mode 100644
index 000000000..483c437d9
--- /dev/null
+++ b/templates/design40_webpages/employee/list.html
@@ -0,0 +1,5 @@
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+[% PROCESS 'employee/_list.html' %]
diff --git a/templates/design40_webpages/failed_background_jobs_report/email.txt b/templates/design40_webpages/failed_background_jobs_report/email.txt
new file mode 100644
index 000000000..506a9b7ab
--- /dev/null
+++ b/templates/design40_webpages/failed_background_jobs_report/email.txt
@@ -0,0 +1,12 @@
+Hallo,
+
+die folgenden Hintergrundjobs sind seit [% SELF.start_time.to_kivitendo %] [% SELF.start_time.to_kivitendo_time %] ausgeführt worden und schlugen fehl:
+
+[%- FOREACH entry = SELF.entries %]
+Paketname:     [% entry.package_name %]
+Ausgeführt um: [% entry.run_at.to_kivitendo %] [% entry.run_at.to_kivitendo_time %]
+Fehler:        [% entry.error_col %]
+[% UNLESS loop.last %]============================================================[% END %]
+[%- END %]
+Gruß,
+kivitendo
diff --git a/templates/design40_webpages/file/import_dialog.html b/templates/design40_webpages/file/import_dialog.html
new file mode 100644
index 000000000..593ea77c8
--- /dev/null
+++ b/templates/design40_webpages/file/import_dialog.html
@@ -0,0 +1,38 @@
+[% USE L %]
+[% USE LxERP %]
+
+<form method="post" id="file_import_form" action="controller.pl">
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% L.checkbox_tag(source.chk_action _ '_checkall') %]</th>
+      <th>[% source.chkall_title %]</th>
+      <th>[% LxERP.t8("Attached Filename") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH file = source.files %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td>[% L.checkbox_tag(source.chk_action _ '[]', 'value'=file.name, 'class'=source.chk_action) %]</td>
+        <td></td>
+        <td><span id="[% "filename_" _ file.name %]">[% file.filename %]</span></td>
+     </tr>
+   [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% L.button_tag("kivi.File.importaction(" _ SELF.object_id _ ",'" _ SELF.object_type _ "','" _ SELF.file_type _ "','" _ source.name _ "','" _ source.path _ "','"_ source.chk_action _ "');", LxERP.t8('Continue'), id => "import_cont_btn") %]</td>
+  [% L.button_tag("kivi.File.importclose();" , LxERP.t8('Cancel')  , class => "submit") %]</td></tr>
+</div>
+
+</form>
+
+<script type="text/javascript">
+<!--
+$(function() {
+  $('#[% source.chk_action %]_checkall').checkall('INPUT[name="[% source.chk_action %][]"]');
+});
+-->
+</script>
diff --git a/templates/design40_webpages/file/list.html b/templates/design40_webpages/file/list.html
new file mode 100644
index 000000000..a9fe94a79
--- /dev/null
+++ b/templates/design40_webpages/file/list.html
@@ -0,0 +1,149 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% USE Base64 %]
+[% USE HTML %]
+
+<!-- PENDENT: Ueberpruefen, Tabelle und Buttons -->
+[% IF ! json %]
+  <div id="[% file_type %]_list_[% object_type %]">
+[% END %]
+
+<div class="wrapper scroll">
+<h2>[% title %]</h2>
+
+[% SET can_rename = 0 %]
+[% FOREACH source = SOURCES %]
+
+<table class="tbl-list">
+  <caption>[% source.title %]</caption>
+  <thead>
+    <tr>
+      [% SET checkname = source.chk_action %]
+      [% IF is_global %]
+        [% SET checkname = object_type _ '_' _ source.chk_action %]
+      [% END %]
+      [% IF edit_attachments %]
+        <th>
+          <script type="text/javascript"><!--
+            $(function() { $('#[% checkname %]_checkall').checkall('INPUT[name="[% checkname %][]"]'); });
+          --></script>
+          [% L.checkbox_tag(checkname _ '_checkall') %]
+        </th>
+        <th>[% source.chkall_title %]</th>
+      [% END %]
+      <th>[%  LxERP.t8('Version') _ ' (' _ LxERP.t8('Count') _ ')' %]</th>
+      <th>[%  LxERP.t8('Date') %]</th>
+      <th>[%  source.file_title %]</th>
+      [% IF file_type == 'image' %]
+        <th>[%  LxERP.t8('Title') %]</th>
+        <th>[%  LxERP.t8('ImagePreview') %]</th>
+        <th>[%  LxERP.t8('Description') %]</th>
+      [% ELSE %]
+        <th>[%  LxERP.t8('ImagePreview') %]</th>
+      [% END %]
+   </tr>
+  </thead>
+  <tbody>
+    [% FOREACH file = source.files %]
+      [%- is_other_version = 1 IF last_id == file.id %]
+      [%- last_id = file.id %]
+      [%- IF !is_other_version %]
+        <tr>
+      [%- ELSE %]
+        <tr class="[% 'version_row_' _ file.id %] hidden">
+      [%- END %]
+        [% IF edit_attachments %]
+          <td>[% L.checkbox_tag(checkname _ '[]', 'value'=file.file_version.guid, 'class'=checkname) %]</td>
+          <td></td>
+        [% END %]
+          <td class="right[%- IF file.version_count > 1 && !is_other_version %] cursor-pointer" onclick="kivi.File.toggle_versions('[% file.id %]')"[%- ELSE -%]"[%- END %]>[%#"%]
+            [%- IF file.version_count > 1 && !is_other_version %]<span id="[% 'version_toggle_' _ file.id %]">⏷ </span>[% END %]
+            [% file.version _ ' (' _ file.version_count _ ')' %]
+            [% L.hidden_tag("version[]", file.version) %]
+          </td>
+        <td>[% file.mtime_as_timestamp_s %]</td>
+        <td>
+          <a href="controller.pl?action=File/download&id=[% file.id %][% IF file.version %]&version=[% file.version %][% END %]">
+            <span id="[% "filename_" _ file.id %][% IF file.version %]_[% file.version %][% END %]">[% file.file_name %]</span>
+          </a>
+        </td>
+        [% IF file_type == 'image' %]
+          <td>[% file.title %]</td>
+          <td><img src="controller.pl?action=File/download&id=[% file.id %][% IF file.version %]&version=[% file.version %][% END %]" alt="[% file.title %]"></td>
+          <td>[% file.description %]</td>
+        [% ELSE %]
+          <td class="left">
+            [%- IF file.thumbnail %]
+              <div class="overlay_div">
+                <img id="thumb_[% file.id %]" class="thumbnail"
+                     data-file-id="[% file.id %]" data-file-version="[% file.version %]"
+                     src="data:[% HTML.escape(file.thumbnail.thumbnail_img_content_type) %];base64,[% file.thumbnail.thumbnail_img_content.encode_base64 %]"
+                     alt="[% file.file_name %]">
+                <img id="enlarged_thumb_[% file.id %][% IF file.version %]_[% file.version %][% END %]" class="overlay_img" style="display:none;"
+                     data-file-id="[% file.id %]" data-file-version="[% file.version %]">
+              </div>
+            [%- ELSE %]
+              -
+            [%- END %]
+          </td>
+        [% END %]
+        </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% IF edit_attachments %]
+    [% IF source.can_import %]
+      [% L.button_tag("kivi.File.unimport(" _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "');",source.chk_title) %]
+    [% ELSE %]
+      [% IF source.can_delete %]
+        [% L.button_tag("kivi.File.delete("   _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "'," _ is_global _ ");",  source.chk_title) %]
+      [% END %]
+    [% END %]
+  [% END %]
+  [% IF source.can_rename %]
+    [% can_rename = 1 %]
+    [% L.button_tag("kivi.File.rename(" _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ checkname _ "'," _ is_global _ ");",  source.rename_title ) %]
+  [% END %]
+  [% IF source.can_import %]
+    [% L.button_tag("kivi.File.import("   _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ source.name _ "','" _ source.path _"');",  source.import_title ) %]
+  [% END %]
+  [% IF source.can_upload %]
+    [% L.button_tag("kivi.File.upload(" _ object_id _ ",'" _ object_type _ "','" _ file_type _ "','" _ source.upload_title _ "'," _ is_global _ ");", source.upload_title ) %]
+      <span class="upload_drop_zone"
+            data-object-type="[% object_type %]"
+            data-object-id="[% object_id %]"
+            data-file-type="[% file_type %]"
+            data-is-global="[% is_global %]"
+            data-maxsize="[% INSTANCE_CONF.get_doc_max_filesize %]">
+        [% 'Drag and drop files here' | $T8 %]
+      </span>
+  [% END %]
+</div><!-- /.buttons -->
+
+[% END #FOREACH SOURCES %]
+
+<div class="buttons">
+  [% L.button_tag("kivi.File.update(" _ object_id _ ",'" _ object_type _ "','" _ file_type _ "'," _ is_global _ ");", LxERP.t8('Update')) %]
+</div>
+
+</div><!-- /.wrapper -->
+
+
+[% IF ! json %]
+  </div>
+  [% UNLESS is_global %]
+    [% IF can_rename %]
+      [% INCLUDE 'file/rename_dialog.html' %]
+    [% END %]
+  [% END %]
+[% END %]
+
+<script>
+  $(function() {
+    kivi.File.list_div_id = "[% file_type %]_list_[% object_type %]";
+    kivi.File.init();
+  });
+</script>
diff --git a/templates/design40_webpages/file/rename_dialog.html b/templates/design40_webpages/file/rename_dialog.html
new file mode 100644
index 000000000..c5c717f53
--- /dev/null
+++ b/templates/design40_webpages/file/rename_dialog.html
@@ -0,0 +1,32 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div class="loading" id="rename_dialog_[% file_type %]" style="display:none">
+<div class="wrapper">
+
+<table class="tbl-plain">
+  <tbody>
+    <tr>
+      <td id="rename_extra_text_[% file_type %]"></td>
+    </tr>
+    <tr>
+      <td>
+        <span class="label above">[% LxERP.t8("Please modify filename") %]:</span>
+        <input class="wi-lightwide" name="newfilename" id="newfilename_id_[% file_type %]" value="">
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<input type="hidden" name="next_ids" id="next_ids_id_[% file_type %]" value="">
+<input type="hidden" name="sessionfile" id="sessionfile_id_[% file_type %]" value="">
+<input type="hidden" name="rename_id" id="rename_id_id_[% file_type %]" value="">
+<input type="hidden" name="is_global" id="is_global_id_[% file_type %]" value="">
+
+<div class="buttons">
+  [% L.button_tag("return kivi.File.renameaction('" _ file_type _ "');", LxERP.t8('Continue'), id => "rename_cont_btn") %]
+  [% L.button_tag("return kivi.File.renameclose('" _ file_type _"');" , LxERP.t8('Cancel') , class => "submit neutral") %]
+</div>
+
+</div><!-- /.wrapper -->
+</div><!-- /.loading /Rename Dialog -->
diff --git a/templates/design40_webpages/file/upload_dialog.html b/templates/design40_webpages/file/upload_dialog.html
new file mode 100644
index 000000000..90ea68297
--- /dev/null
+++ b/templates/design40_webpages/file/upload_dialog.html
@@ -0,0 +1,36 @@
+[% USE L %]
+[% USE LxERP %]
+
+<form method="post" id="upload_form" enctype="multipart/form-data" action="controller.pl">
+[% SET multiple = 'true' %]
+[% IF SELF.object_type == 'shop_image' %][% multiple = 'false' %][% END %]
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Filename") %]:</th>
+      <td><input type="file" name="uploadfiles[]" multiple="[% multiple %]" id="upload_files" size="45" accept="[% SELF.accept_types %]" onchange="kivi.File.allow_upload_submit();"></td>
+    </tr>
+    [% IF SELF.object_type == 'shop_image' %]
+    <tr>
+      <th>[% LxERP.t8("Title") %]</th>
+      <td>[% L.input_tag("title",'') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Description") %]</th>
+      <td>[% L.input_tag("description",'') %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+<input value="[% LxERP.t8("Upload file") %]" id="upload_selected_button" onclick="kivi.File.upload_selected_files([% SELF.object_id %],'[% SELF.object_type %]','[% SELF.file_type %]',[% SELF.maxsize %],[% SELF.is_global %]);" type="button" disabled >
+<a href="#" onclick="kivi.File.reset_upload_form();" class="button neutral">[% LxERP.t8("Reset") %]</a>
+<a href="#" onclick="$('#files_upload').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+</div>
+
+<div id="upload_result"><p></p></div>
+
+</form>
diff --git a/templates/design40_webpages/financial_controlling_report/_filter.html b/templates/design40_webpages/financial_controlling_report/_filter.html
new file mode 100644
index 000000000..d182e7d27
--- /dev/null
+++ b/templates/design40_webpages/financial_controlling_report/_filter.html
@@ -0,0 +1,58 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action="controller.pl" method="post" id="filter_form">
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id="filter_table" class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.customer.customernumber:substr::ilike', filter.customer.customernumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.ordnumber:substr::ilike', filter.ordnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.globalproject.projectnumber:substr::ilike', filter.globalproject.projectnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Type' | $T8 %]</th>
+      <td>[% L.select_tag('filter.globalproject.project_type_id', SELF.project_types, default=filter.globalproject.project_type_id, title_key='description', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Transaction description') %]</th>
+      <td>[% L.input_tag('filter.transaction_description:substr::ilike', filter.transaction_description_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Date' | $T8 %] [% 'From Date' | $T8 %]</th>
+      <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge, cal_align = 'BR', class='wi-small') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Date' | $T8 %] [% 'To Date' | $T8 %]</th>
+      <td>[% L.date_tag('filter.transdate:date::le', filter.transdate_date__le, cal_align = 'BR', class='wi-small') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% L.hidden_tag('sort_by', FORM.sort_by) %]
+  [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+  [% L.hidden_tag('page', FORM.page) %]
+  [% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+</div><!-- ./buttons -->
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/financial_controlling_report/report_bottom.html b/templates/design40_webpages/financial_controlling_report/report_bottom.html
new file mode 100644
index 000000000..4cca291a0
--- /dev/null
+++ b/templates/design40_webpages/financial_controlling_report/report_bottom.html
@@ -0,0 +1,4 @@
+[% USE L %]
+<div class="buttons">
+  [% L.paginate_controls(models=models) %]
+</div>
diff --git a/templates/design40_webpages/financial_controlling_report/report_top.html b/templates/design40_webpages/financial_controlling_report/report_top.html
new file mode 100644
index 000000000..283034910
--- /dev/null
+++ b/templates/design40_webpages/financial_controlling_report/report_top.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% PROCESS 'financial_controlling_report/_filter.html' filter=SELF.models.filtered.laundered %]
+
diff --git a/templates/design40_webpages/financial_overview/report_top.html b/templates/design40_webpages/financial_overview/report_top.html
new file mode 100644
index 000000000..91e890dd6
--- /dev/null
+++ b/templates/design40_webpages/financial_overview/report_top.html
@@ -0,0 +1,34 @@
+[% USE L %]
+[% USE LxERP %]
+
+<form method="post" id="form" action="controller.pl">
+
+<div class="select-item control-panel">
+  [% L.hidden_tag('action', 'FinancialOverview/list') %]
+  <div class="floating-boxes">
+    <div class="floating-box">
+      <a href="[% SELF.url_for(action='list', year=(SELF.year - 1), subtotals_per_quarter=SELF.subtotals_per_quarter, salesman_id=SELF.salesman_id) %]" class="button neutral" style="float: left;">&laquo; [% LxERP.t8("Prior year") %]: [% SELF.year - 1 %]</a> &nbsp;
+    </div>
+    <div class="floating-box">
+      <span class="label">[% LxERP.t8("Current year") %]</span>
+      [% L.select_tag('year', YEARS_TO_LIST, default=SELF.year, onchange='$("#form").submit();', class='wi-verysmall') %] &nbsp; &nbsp;
+    </div>
+    [% IF SELF.year < (SELF.current_year + 5) %]
+    <div class="floating-box">
+      <a href="[% SELF.url_for(action='list', year=(SELF.year + 1), subtotals_per_quarter=SELF.subtotals_per_quarter, salesman_id=SELF.salesman_id) %]" class="button neutral" style="float:left;">[% LxERP.t8("Following year") %]: [% SELF.year + 1 %] &raquo;</a>
+    </div>
+    [% END %]
+  </div><!-- /.floating-boxes -->
+  <div class="floating-boxes">
+    <div class="floating-box">
+      [% L.checkbox_tag('subtotals_per_quarter', checked=SELF.subtotals_per_quarter, label=LxERP.t8('Subtotals per quarter'), onchange='$("#form").submit();') %]
+    </div>
+    <div class="floating-box">
+      <span class="label">[% LxERP.t8("Salesperson") %]</span> [% L.select_tag('salesman_id', SELF.employees, with_empty=1, title_key='name', onchange='$("#form").submit();', default=SELF.salesman_id) %]
+    </div>
+  </div>
+
+
+</div><!-- /.select-item -->
+
+</form>
diff --git a/templates/design40_webpages/fu/add_edit.html b/templates/design40_webpages/fu/add_edit.html
new file mode 100644
index 000000000..9e7c694b3
--- /dev/null
+++ b/templates/design40_webpages/fu/add_edit.html
@@ -0,0 +1,178 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+<h1>[% title %]</h1>
+
+<script type="text/javascript">
+  $(function(){ document.Form.subject.focus(); });
+</script>
+
+<div class="wrapper">
+<form action="fu.pl" method="post" name="Form" id="form">
+
+[% IF SAVED_MESSAGE %]
+  <p>[% SAVED_MESSAGE %]</p>
+[% END %]
+
+<input type="hidden" name="id" value="[% HTML.escape(id) %]">
+<input type="hidden" name="note_id" value="[% HTML.escape(note_id) %]">
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+<input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
+
+
+[% IF done_at -%]
+  <div class="message_ok">
+    [% 'Finished' | $T8 %] [% 'by' | $T8 %] [% HTML.escape(done_by_employee_name) %]
+    [% 'at' | $T8 %] [% HTML.escape(done_at) %]
+  </div>
+[% END %]
+
+<div class="wrapper">
+  <table class="tbl-list">
+    <caption>[% 'Follow-Up for user' | $T8 %]</caption>
+    <thead>
+      <tr>
+        <th>[% L.checkbox_tag('checkall_checkboxes', label='', id='checkall', checkall="[data-checkall=1]") %]</th>
+        <th><label for='checkall'>[% LxERP.t8('All users') %]</label></th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH employee = all_employees %]
+        [% SET checked = 0 %]
+        [% FOREACH cfe = created_for_employees %]
+          [% IF cfe.id == employee.id %][% SET checked = 1 %][% LAST %][% END %]
+        [% END %]
+        <tr>
+          <td>[% L.checkbox_tag('created_for_employees[]', value=employee.id, checked=checked, "data-checkall"=1, class="employee_check",
+                                id='created_for_employees_' _ employee.id) %]</td>
+          <td><label for='[% 'created_for_employees_' _ employee.id %]'>[% HTML.escape(employee.safe_name) %]</label></td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th>[% LxERP.t8('Users that are a member in this group') %]<br />([% LxERP.t8('click on a group to add the group\'s users') %])</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH auth_group = all_auth_groups %]
+        <tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
+          <td><b>←&nbsp;[% auth_group.name %]</b>: [% auth_group.description %]
+          <br />
+          <ul>
+            [% FOREACH employee = auth_group.get_employees %]
+              <li>&nbsp;&nbsp;&nbsp;[% employee.safe_name %]</li>
+            [% END %]
+          </ul>
+          </td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% 'Follow-Up Date' | $T8 %]</th>
+        <td>[% L.date_tag('follow_up_date', follow_up_date, class="wi-date") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Subject' | $T8 %]</th>
+        <td><input type="text" name="subject" value="[% HTML.escape(subject) %]" class="wi-wider"></td>
+      </tr>
+      <tr>
+        <th>[% 'Body' | $T8 %]</th>
+        <td><textarea class="wi-wider" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+[% IF POPUP_MODE %]
+<div class="buttons">
+  <input type="hidden" name="action" value="dispatcher">
+  <input type="submit" name="action_save" value="[% 'Save' | $T8 %]">
+  [% IF id %]
+    <input type="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+    <input type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+  [% END %]
+  <input type="submit" onclick="window.close()" value="[% 'Cancel' | $T8 %]" class="neutral">
+</div>
+
+[%- IF FOLLOW_UPS_PENDING.size %]
+<table class="tbl-list">
+  <caption>[% 'Existing pending follow-ups for this item' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-date">
+    <col class="wi-normal">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+  </colgroup>
+  <thead>
+    <tr>
+      <th>[% 'Follow-Up Date' | $T8 %]</th>
+      <th>[% 'Subject' | $T8 %]</th>
+      <th>[% 'Created by' | $T8 %]</th>
+      <th>[% 'Follow-up for' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = FOLLOW_UPS_PENDING %]
+    <tr>
+      <td class="top">[% HTML.escape(row.follow_up_date) %]</td>
+      <td class="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
+      <td class="top">[% HTML.escape(row.created_by_name) %]</td>
+      <td class="top">[% HTML.escape(row.created_for_user_name) | html_line_break %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+[% END %]
+
+[%- IF FOLLOW_UPS_DONE.size %]
+<table class="tbl-list">
+  <caption>[% 'Existing finished follow-ups for this item' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-date">
+    <col class="wi-normal">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+  </colgroup>
+  <thead>
+    <tr>
+      <th>[% 'Follow-Up Date' | $T8 %]</th>
+      <th>[% 'Subject' | $T8 %]</th>
+      <th>[% 'Created by' | $T8 %]</th>
+      <th>[% 'Follow-up for' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = FOLLOW_UPS_DONE %]
+    <tr>
+      <td class="top">[% HTML.escape(row.follow_up_date) %]</td>
+      <td class="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
+      <td class="top">[% HTML.escape(row.created_by_name) %]</td>
+      <td class="top">[% HTML.escape(row.created_for_user_name) | html_line_break %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+[% END %]
+
+[% END #IF POPUP_MODE %]
+
+[% FOREACH row = LINKS %]
+  <input type="hidden" name="trans_id_[% loop.count %]"   value="[% HTML.escape(row.trans_id) %]">
+  <input type="hidden" name="trans_type_[% loop.count %]" value="[% HTML.escape(row.trans_type) %]">
+  <input type="hidden" name="trans_info_[% loop.count %]" value="[% HTML.escape(row.trans_info) %]">
+[% END %]
+
+<input type="hidden" name="trans_rowcount" value="[% LINKS.size %]">
+
+</form>
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/fu/close_window.html b/templates/design40_webpages/fu/close_window.html
new file mode 100644
index 000000000..11022fb15
--- /dev/null
+++ b/templates/design40_webpages/fu/close_window.html
@@ -0,0 +1 @@
+<script type='text/javascript'>$(function(){ window.close() })</script>
\ No newline at end of file
diff --git a/templates/design40_webpages/fu/edit_access_rights.html b/templates/design40_webpages/fu/edit_access_rights.html
new file mode 100644
index 000000000..961cd1608
--- /dev/null
+++ b/templates/design40_webpages/fu/edit_access_rights.html
@@ -0,0 +1,51 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+  [% IF SAVED_MESSAGE %]
+  <p class="message">[% SAVED_MESSAGE %]</p>
+  [% END %]
+
+  <p>[% 'Allow the following users access to my follow-ups:' | $T8 %]</p>
+
+  <form action="fu.pl" method="post" name="Form" id="form">
+
+    <table class="tbl-list width-moderate">
+      <thead>
+        <tr>
+          <th>[% 'User' | $T8 %]</th>
+          <th>[% 'Allow access' | $T8 %]</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH row = EMPLOYEES %]
+        [% UNLESS row.login == login %]
+        <tr>
+          <td>
+            <input type="hidden" name="employee_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+            [% IF row.name %]
+              [% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
+            [% ELSE %]
+              [% HTML.escape(row.login) %]
+            [% END %]
+          </td>
+          <td class="horizontal">
+            <input type="radio" id="access_[% HTML.escape(row.id) %]_yes" name="access_[% HTML.escape(row.id) %]" value="1"[% IF row.access %] checked[% END %]>
+            <label for="access_[% HTML.escape(row.id) %]_yes">[% 'Yes' | $T8 %]</label> &nbsp;
+            <input type="radio" id="access_[% HTML.escape(row.id) %]_no" name="access_[% HTML.escape(row.id) %]" value=""[% UNLESS row.access %] checked[% END %]>
+            <label for="access_[% HTML.escape(row.id) %]_no">[% 'No' | $T8 %]</label>
+          </td>
+        </tr>
+        [% END %]
+        [% END %]
+      </tbody>
+    </table>
+
+    <input type="hidden" name="rowcount" value="[% EMPLOYEES.size %]">
+  </form>
+
+</div>
+
diff --git a/templates/design40_webpages/fu/follow_up_reminder_mail.html b/templates/design40_webpages/fu/follow_up_reminder_mail.html
new file mode 100644
index 000000000..9be64b96f
--- /dev/null
+++ b/templates/design40_webpages/fu/follow_up_reminder_mail.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[%- USE HTML %]
+<!DOCTYPE HTML>
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ </head>
+
+ <body>
+  <h2>[% 'Unfinished follow-ups' | $T8 %]</h2>
+
+  <table>
+   <tr>
+    <th>[% 'Follow-Up Date' | $T8 %]</th>
+    <th>[% 'Subject' | $T8 %]</th>
+    <th>[% 'Created by' | $T8 %]</th>
+   </tr>
+
+   [%- FOREACH fu = follow_ups %]
+   <tr>
+    <td>[% HTML.escape(fu.follow_up_date_as_date) %]</td>
+    <td><a href="[% fu.link %]">[% HTML.escape(fu.note.subject) %]</a></td>
+    <td>[% HTML.escape(fu.created_by_employee.safe_name) %]</td>
+   </tr>
+   [%- END %]
+  </table>
+ </body>
+</html>
diff --git a/templates/design40_webpages/fu/report_bottom.html b/templates/design40_webpages/fu/report_bottom.html
new file mode 100644
index 000000000..6e9fdbc83
--- /dev/null
+++ b/templates/design40_webpages/fu/report_bottom.html
@@ -0,0 +1,8 @@
+[% USE T8 %]
+[% USE HTML%]
+
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+[% FOREACH item = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
+[% END %]
+</form>
diff --git a/templates/design40_webpages/fu/report_for_todo_list.html b/templates/design40_webpages/fu/report_for_todo_list.html
new file mode 100644
index 000000000..f5ccd2722
--- /dev/null
+++ b/templates/design40_webpages/fu/report_for_todo_list.html
@@ -0,0 +1,48 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<div class="wrapper center">
+
+  <form action="fu.pl" method="post" name="TODOFollowUpsForm">
+    <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+    <input type="hidden" name="rowcount" value="[% FOLLOW_UPS.size %]">
+
+    <table class="tbl-list width-moderate">
+      <caption>[% 'Unfinished follow-ups' | $T8 %]</caption>
+      <thead>
+        <tr>
+          <th>&nbsp;</th>
+          <th>[% 'Follow-Up Date' | $T8 %]</th>
+          <th>[% 'Created on' | $T8 %]</th>
+          <th>[% 'Subject' | $T8 %]</th>
+          <th>[% 'Reference' | $T8 %]</th>
+          <th>[% 'Created by' | $T8 %]</th>
+          <th>[% 'Follow-up for' | $T8 %]</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH row = FOLLOW_UPS %]
+        <tr>
+          <td>
+          <input type="hidden" name="follow_up_id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+          <input type="checkbox" name="selected_[% loop.count %]" value="1">
+          </td>
+          <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.follow_up_date) %]</a></td>
+          <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.created_on) %]</a></td>
+          <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
+          <td>[% IF row.reference_link %]<a href="[% row.reference_link | html %]" class="alternative">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
+          <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.created_by_name) %]</a></td>
+          <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.created_for_user_name) | html_line_break %]</a></td>
+        </tr>
+        [% END %]
+      </tbody>
+    </table>
+
+    <div class="buttons">
+      <input type="hidden" name="action" value="dispatcher">
+      <input type="submit" name="action_finish" value="[% 'Finish' | $T8 %]">
+      <input type="submit" name="action_delete" value="[% 'Delete' | $T8 %]">
+    </div>
+
+  </form>
+</div>
diff --git a/templates/design40_webpages/fu/report_top.html b/templates/design40_webpages/fu/report_top.html
new file mode 100644
index 000000000..5bb3e01b4
--- /dev/null
+++ b/templates/design40_webpages/fu/report_top.html
@@ -0,0 +1,13 @@
+[% IF SAVED_MESSAGE %]
+  <p class="message">[% SAVED_MESSAGE %]</p>
+[% END %]
+
+[% IF OPTIONS.size %]
+  <p>
+  [% FOREACH option = OPTIONS %]
+    [% option %][% UNLESS loop.last %]<br>[% END %]
+  [% END %]
+  </p>
+[% END %]
+
+<form action="fu.pl" method="post" name="Form" id="form">
diff --git a/templates/design40_webpages/fu/search.html b/templates/design40_webpages/fu/search.html
new file mode 100644
index 000000000..eaf9ac3eb
--- /dev/null
+++ b/templates/design40_webpages/fu/search.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript">
+  $(function(){ document.Form.subject.focus(); });
+</script>
+
+<form action="fu.pl" method="post" name="Form" id="form">
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% 'Created for' | $T8 %]</th>
+        <td>
+          <select name="created_for" class="wi-wider">
+            <option></option>
+            [% FOREACH row = EMPLOYEES %]
+            <option value="[% HTML.escape(row.id) %]">
+              [% IF row.name %]
+                [% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])
+              [% ELSE %]
+                [% HTML.escape(row.login) %]
+              [% END %]
+            </option>
+            [% END %]
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Subject' | $T8 %]</th>
+        <td><input type="text" name="subject" class="wi-wider"></td>
+      </tr>
+      <tr>
+        <th>[% 'Body' | $T8 %]</th>
+        <td><input type="text" name="body" class="wi-wider"></td>
+      </tr>
+      <tr>
+        <th>[% 'Reference' | $T8 %]</th>
+        <td><input type="text" name="reference" class="wi-wider"></td>
+      </tr>
+      <tr>
+        <th>[% 'Follow-Up Date' | $T8 %]</th>
+        <td>
+          [% 'From'      | $T8 %] [% L.date_tag('follow_up_date_from') %]
+          [% 'To (time)' | $T8 %] [% L.date_tag('follow_up_date_to'  ) %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Created on' | $T8 %]</th>
+        <td>
+          [% 'From'      | $T8 %] [% L.date_tag('itime_from') %]
+          [% 'To (time)' | $T8 %] [% L.date_tag('itime_to'  ) %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <div class="list">
+    <input type="checkbox" name="due_only" id="due_only" value="1" checked>   <label for="due_only">[% 'Only due follow-ups' | $T8 %]</label> <br>
+    <input type="checkbox" name="all_users" id="all_users" value="1" checked> <label for="all_users">[% 'Other users\' follow-ups' | $T8 %]</label>  <br>
+    <input type="checkbox" name="not_done" id="not_done" value="1" checked>   <label for="not_done">[% 'Not done yet' | $T8 %]</label>  <br>
+    <input type="checkbox" name="done" id="done" value="1">                   <label for="done">[% 'Done' | $T8 %]</label>
+  </div>
+</div>
+
+</form>
diff --git a/templates/design40_webpages/generic/calculate_qty.html b/templates/design40_webpages/generic/calculate_qty.html
new file mode 100644
index 000000000..f1cfae464
--- /dev/null
+++ b/templates/design40_webpages/generic/calculate_qty.html
@@ -0,0 +1,50 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<form name="CalcQtyForm" id="calc_qty_form_id">
+
+<!-- <h1>[% #title %]</h1> --><!-- PENDENT: wieso wurde das entfernt? Braucht es hier keinen Titel? -->
+
+<input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+<input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+<table class="tbl-list">
+  <caption>[% 'Please insert object dimensions below.' | $T8 %]</caption>
+  <thead>
+     <tr>
+       [% FOREACH col = HEADER %]
+         <th>[% col.column_title %]</a></th>
+       [% END %]
+     </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = VARIABLES %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td>[% HTML.escape(row.description) %]:</td><td><input type="text" id="[% row.name %]" name="[% row.name %]" value=""></td>
+        <td>[% HTML.escape(row.unit) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+  <button type="button" onclick="calculate_qty()">[% 'Calculate' | $T8 %]</button>
+</div>
+</form>
+
+<script type="text/javascript">
+  function calculate_qty() {
+    [%- FOREACH row = VARIABLES %]
+      var [% row.name %] = kivi.parse_amount($('#calc_qty_form_id #[% row.name %]').val());
+    [%- END %]
+    var result = [% formel %];
+    result = kivi.format_amount(result, 2);
+    /* Every Element should be assigned by ID and not with NAME, modern Browsers handle that since 2006 or a bit later */
+    if (document.CalcQtyForm.input_id.value) {
+      document.getElementById(document.CalcQtyForm.input_id.value).value = result;
+    } else {
+      document.getElementsByName(document.CalcQtyForm.input_name.value)[0].value = result;
+    }
+    $('#calc_qty_dialog').dialog('close');
+  }
+</script>
diff --git a/templates/design40_webpages/generic/error.html b/templates/design40_webpages/generic/error.html
new file mode 100644
index 000000000..9cf6000e4
--- /dev/null
+++ b/templates/design40_webpages/generic/error.html
@@ -0,0 +1,7 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<div class="message message_error">
+  <h4>[% IF title_error %][% title_error %][% ELSE %][% 'Error!' | $T8 %][% END %]</h4>
+  <p>[% label_error %]</p>
+</div>
diff --git a/templates/design40_webpages/generic/exception.html b/templates/design40_webpages/generic/exception.html
new file mode 100644
index 000000000..4519c9058
--- /dev/null
+++ b/templates/design40_webpages/generic/exception.html
@@ -0,0 +1,22 @@
+[% USE LxERP %]
+[% USE HTML %]
+
+<div class="message message_error">[% LxERP.t8('Error!') %]</div>
+
+<div class="wrapper">
+
+<p>[% LxERP.t8('An exception occurred during execution.') %]</p>
+
+<table class="tbl-horizontal">
+  <tr>
+    <td>[% LxERP.t8('Type') %]:</td>
+    <td>[% HTML.escape(error.type) %]</td>
+  </tr>
+  <tr>
+    <td>[% LxERP.t8('Information') %]:</td>
+    <td><code>[% HTML.escape(error.info) %]</code></td>
+  </tr>
+</table>
+
+</div><!-- /.wrapper -->
+
diff --git a/templates/design40_webpages/generic/form_info.html b/templates/design40_webpages/generic/form_info.html
new file mode 100644
index 000000000..db54975f7
--- /dev/null
+++ b/templates/design40_webpages/generic/form_info.html
@@ -0,0 +1,10 @@
+[% USE P %]
+
+<div class="message message_ok">[% P.simple_format(message) %]</div>
+
+<script type="text/javascript"><!--
+ // If JavaScript is enabled, the whole thing will be reloaded.
+ // 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?action=company_logo'",500);
+--></script>
diff --git a/templates/design40_webpages/generic/information.html b/templates/design40_webpages/generic/information.html
new file mode 100644
index 000000000..ace8ba814
--- /dev/null
+++ b/templates/design40_webpages/generic/information.html
@@ -0,0 +1,6 @@
+[% USE T8 %]
+
+<div class="message message_info">
+  <h4>[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]</h4>
+  <p>[% label_information %]</p>
+</div>
diff --git a/templates/design40_webpages/generic/new_item.html b/templates/design40_webpages/generic/new_item.html
new file mode 100644
index 000000000..3fdd4cc02
--- /dev/null
+++ b/templates/design40_webpages/generic/new_item.html
@@ -0,0 +1,38 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<form method="post" action="controller.pl">
+<div class="wrapper">
+  [% IF is_wrong_pclass == NOTFORSALE %]
+    <p class="message message_error">[% 'searched part not for sale' | $T8 %]</p>
+  [% ELSE %]
+    [% IF is_wrong_pclass == NOTFORPURCHASE %]
+      <p class="message message_error">[% 'searched part not for purchase' | $T8 %]</p>
+    [% ELSE %]
+      <p class="message message_error">[% 'Item does not exists in the database' | $T8 %]</p>
+      [% IF INSTANCE_CONF.get_create_part_if_not_found %]
+        <p>[% 'What type of item is this?' | $T8 %]</p>
+        <p>
+          <input type="radio" name="part.part_type" value="part" checked> [% 'Part' | $T8 %]<br>
+          <input type="radio" name="part.part_type" value="assembly"> [% 'Assembly' | $T8 %]<br>
+          <input type="radio" name="part.part_type" value="service"> [% 'Service' | $T8 %]<br>
+          <input type="radio" name="part.part_type" value="assortment"> [% 'Assortment' | $T8 %]
+        </p>
+        [% FOREACH var = HIDDENS %]
+          <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+        [% END %]
+        <input type="hidden" name="action" value="Part/dispatch">
+        <div class="buttons">
+          <input type="submit" name="action_add_from_record" value="[% 'Continue' | $T8 %]">
+        </div>
+      [% END %]<!-- /IF INSTANCE_CONF.get_create_part_if_not_found -->
+    [% END %]<!-- /ELSE -> IF is_wrong_pclass == NOTFORPURCHASE -->
+  [% END %]<!-- /ELSE -> IF is_wrong_pclass == NOTFORSALE -->
+  <div class="buttons"><input id='back_button' type='button' class="neutral" value="[% 'Back' | $T8 %]"></div>
+</div><!-- /.wrapper -->
+</form>
+
+
+<script type='text/javascript'>
+  $(function(){ $('#back_button').click(function(){ window.history.back(-1) }) })
+</script>
diff --git a/templates/design40_webpages/generic/print_options.html b/templates/design40_webpages/generic/print_options.html
new file mode 100644
index 000000000..f130ba93a
--- /dev/null
+++ b/templates/design40_webpages/generic/print_options.html
@@ -0,0 +1,65 @@
+[% USE T8 %]
+[% USE HTML %]
+<!--
+  PENDENT: Was soll diese Form des Dialogs?
+           Show_Headers sollte hier sowieso auf TRUE gestellt sein,
+           und der Dialog könnte vertikal statt horizontal ausgerichtet sein.
+-->
+
+<table class="tbl-horizontal">
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  [% # IF show_headers %]
+    <body>
+       [% FOREACH row = SELECTS %]
+         [% IF row.show %]
+           <tr>
+             <th id="print_options_header_[% row.sname %]">[% row.hname %]</th>
+             <td id="print_options_input_[% row.sname %]">
+               <select name="[% name_prefix %][% row.sname %]" id="[% id_prefix %][% row.sname %]" class="wi-lightwide">
+                 [% FOREACH data = row.DATA %]
+                   <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
+                 [% END %]
+               </select>
+             </td>
+           </tr>
+         [% END %]
+       [% END %]
+       [% IF display_copies %]
+         <tr>
+           <th id="print_options_header_copies">[% 'Copies' | $T8 %]</th>
+           <td id="print_options_input_copies">
+             <input type="text" name="[% name_prefix %]copies" id="[% id_prefix %]copies" size="2" value="[% HTML.escape(copies) %]" class="wi-small">
+           </td>
+         </tr>
+       [% END %]
+       [% IF display_groupitems %]
+         <tr>
+           <th id="print_options_header_groupitems">[% 'Group Items' | $T8 %]</th>
+           <td id="print_options_input_groupitems">
+             <input name="[% name_prefix %]groupitems" id="[% id_prefix %]groupitems" type="checkbox" [% groupitems_checked %]>
+           </td>
+         </tr>
+       [% END %]
+       [% IF display_bothsided %]
+         <tr>
+           <th id="print_options_header_bothsided">[% 'Both-sided' | $T8 %]</th>
+           <td id="print_options_input_bothsided">
+             <input name="[% name_prefix %]bothsided" id="[% id_prefix %]bothsided" type="checkbox" [% bothsided_checked %]>
+           </td>
+         </tr>
+       [% END %]
+       [% IF display_remove_draft %]
+         <tr>
+           <th id="print_options_header_remove_draft">[% 'Remove Draft' | $T8 %]</th>
+           <td id="print_options_input_remove_draft">
+             <input name="[% name_prefix %]remove_draft" id="[% id_prefix %]remove_draft" type="checkbox" [% remove_draft_checked %]>
+           </td>
+         </tr>
+       [% END %]
+    </body>
+  [% # END %]
+</table>
+
+[% IF status_msg %]
+  <div class="message message_hint">[% status_msg %]</div>
+[% END %]
diff --git a/templates/design40_webpages/generic/select_delivery_customer.html b/templates/design40_webpages/generic/select_delivery_customer.html
new file mode 100644
index 000000000..a773ab0d8
--- /dev/null
+++ b/templates/design40_webpages/generic/select_delivery_customer.html
@@ -0,0 +1,57 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<form name="Form">
+
+<input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+<input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+<p>[% 'Please select a customer from the list below.' | $T8 %]</p>
+
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      [% FOREACH col = HEADER %]
+        <th><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = DELIVERY %]
+    <tr class="listrow[% loop.count % 2 %]">
+      <td><button type="button" onclick="customer_selected('[% loop.count %]')" class="neutral">Auswahl</button></td>
+      <td> <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+      <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+      [% HTML.escape(row.name) %] </td>
+      <td>[% HTML.escape(row.customernumber) %]</td>
+      <td>[% HTML.escape(row.address) %]</td>
+<!--
+       <td>
+        <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]">
+        [% HTML.escape(row.description) %]
+       </td>
+ -->
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+<script type="text/javascript">
+  <!--
+      function customer_selected(selected) {
+        var name = document.getElementsByName("name_" + selected)[0].value
+        var id = document.getElementsByName("id_" + selected)[0].value
+        window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
+        if (document.Form.input_id.value != "") {
+          window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
+        }
+        self.close();
+      }
+      //-->
+</script>
diff --git a/templates/design40_webpages/generic/select_vendor.html b/templates/design40_webpages/generic/select_vendor.html
new file mode 100644
index 000000000..99c4cb911
--- /dev/null
+++ b/templates/design40_webpages/generic/select_vendor.html
@@ -0,0 +1,53 @@
+[% USE T8 %]
+[% USE HTML %]
+<h1>[% title %]</h1>
+
+<form name="Form">
+
+<input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+<input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+<p>[% 'Please select a vendor from the list below.' | $T8 %]</p>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      [% FOREACH col = HEADER %]
+        <th><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = VENDOR %]
+      <tr class="listrow[% loop.count % 2 %]">
+        <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
+        <td>[% HTML.escape(name) %]
+          <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+          <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        </td>
+        <td>[% HTML.escape(row.customernumber) %]</td>
+        <td>[% HTML.escape(row.address) %]</td>
+  <!--        <td> -->
+  <!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+  <!--         [% HTML.escape(row.description) %] -->
+  <!--        </td> -->
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+<script type="text/javascript"><!--
+    function vendor_selected(selected) {
+      var name = document.getElementsByName("name_" + selected)[0].value
+      var id = document.getElementsByName("id_" + selected)[0].value
+      window.opener.document.getElementsByName(document.Form.input_name.value)[0].value = name;
+      if (document.Form.input_id.value != "") {
+        window.opener.document.getElementsByName(document.Form.input_id.value)[0].value = id;
+      }
+      self.close();
+    }
+--></script>
+
diff --git a/templates/design40_webpages/generic/set_longdescription.html b/templates/design40_webpages/generic/set_longdescription.html
new file mode 100644
index 000000000..e554e8f81
--- /dev/null
+++ b/templates/design40_webpages/generic/set_longdescription.html
@@ -0,0 +1,45 @@
+[% USE L %]
+[% USE LxERP %]
+
+<div id="edit_longdescription_dialog" class="wrapper" style="display: none">
+<!--
+  PENDENT:
+  Eigentlich gibt es hier kein Formular, sollte es aber,
+  damit wir nicht zuletzt das ganze im CSS-Namensraum FORM
+  designen können. Es werden sonst nur die Standard-Elemente angezeigt.
+-->
+
+<table class="tbl-horizontal checkered" style="clear:left;">
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Row") %]:</th>
+      <td id="popup_edit_longdescription_runningnumber"></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Part Number") %]:</th>
+      <td id="popup_edit_longdescription_partnumber"></td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Description") %]:</th>
+      <td id="popup_edit_longdescription_description"></td>
+    </tr>
+  </tbody>
+</table>
+
+<p class="spacer">&nbsp;</p>
+
+<p id="popup_edit_longdescription_input_container" style="clear:left;"></p>
+
+<div class="buttons">
+  [% L.button_tag("kivi.SalesPurchase.set_longdescription()", LxERP.t8("Assign"), class="button neutral") %]
+  <a onclick="$('#edit_longdescription_dialog').dialog('close');" href="#" class="button neutral">[% LxERP.t8("Abort") %]</a>
+</div>
+
+</div><!-- /#edit_longdescription_dialog -->
+
+<script>
+  $(function() {
+    kivi.SalesPurchase.longdescription_dialog_size_percentage = "[% longdescription_dialog_size_percentage %]";
+  });
+</script>
diff --git a/templates/design40_webpages/generic/toggle_wrapper.html b/templates/design40_webpages/generic/toggle_wrapper.html
new file mode 100644
index 000000000..073addc27
--- /dev/null
+++ b/templates/design40_webpages/generic/toggle_wrapper.html
@@ -0,0 +1,43 @@
+[% USE T8 %]
+[%
+  # Include this JS and these HTML toggle buttons right on the first position of a .wrapper container
+  # for minimizing / maximizing the surrounding .wrapper container
+  # First Symbols: former &or; & &lt; but now with icons
+  # It seems advantageous to give an id to the .wrapper-block e.g. #wrapper-1 or #wrapper-basic-data
+
+  # PENDENT: vielleicht noch generischer programmieren.
+%]
+
+<div class="toggles" id="toggles">
+  <script type="text/javascript">
+    var toggles_id = "#toggles" ; // surrounding container of the toggle buttons
+    var wrapper = new Object() ;
+    $( window ).on( "load", function() {
+      if( $(toggles_id).parent().attr('class') == "wrapper" ) {
+        wrapper = $(toggles_id).parent() ; // closest surrounding wrapper to toggle, must have the class .wrapper
+        $(wrapper).addClass("toggled") ; // change the wrapper into a inline-block instead of a 100%-width-block
+      }
+      if( wrapper != "") {
+        var hi = -1; //height of the wrapper
+        $(wrapper).ready(function(){
+          if( hi <= -1 ) hi = $(wrapper).height(); // height of the wrapper
+        });
+        // Toggle to minimum
+        $("#toggler-1").click(function(){
+          $(wrapper).animate({height:"30px"},200).addClass("bordered");
+          $(this).toggle();
+          $("#toggler-2").toggle();
+        });
+        // Toggle back to maximum
+        $("#toggler-2").click(function(){
+          $(wrapper).animate({height:hi},200).removeClass("bordered");
+          $(this).toggle();
+          $("#toggler-1").toggle();
+        });
+      }
+    });
+  </script>
+  <a class="toggle min" id="toggler-1" href="#" style="display:visible;" title="[% 'Minimize Panel' | $T8 %]"></a>
+  <a class="toggle max" id="toggler-2" href="#" style="display:none;" title="[% 'Open Panel' | $T8 %]"></a>
+
+</div><!-- /.toggles /#toggles -->
diff --git a/templates/design40_webpages/generictranslations/edit_email_strings.html b/templates/design40_webpages/generictranslations/edit_email_strings.html
new file mode 100644
index 000000000..e2894f02f
--- /dev/null
+++ b/templates/design40_webpages/generictranslations/edit_email_strings.html
@@ -0,0 +1,48 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+[% IF message %]<p>[% HTML.escape(message) %]</p>[% END %]
+
+<form method="post" action="generictranslations.pl" id="form">
+
+<div class="long-description">[% 'Default means "if no language selected then..."' | $T8 %]</div>
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-small"><col class="wi-wider"></colgroup>
+  <tbody>
+    [% FOREACH mail_string IN MAIL_STRINGS.keys.sort %]
+      <tr>
+        <th class="caption" colspan="2">[% MAIL_STRINGS.$mail_string %]</th>
+      </tr>
+       [% FOREACH language = LANGUAGES %]
+       <tr>
+        <td>
+         [% IF language.id == 'default' %]
+           [% 'Default (no language selected)' | $T8 %]
+         [% ELSE %]
+           [% HTML.escape(language.description) %]
+         [% END %]
+        </td>
+        <td>
+          [% IF mail_string.search('preset') && !mail_string.search('subject')%]
+            <textarea name="translation__[% language.id %]__[% mail_string %]" rows="4" cols="50" class="wi-wide texteditor" style="float:left;">[% HTML.escape(language.$mail_string) %]</textarea>
+          [% ELSE %]
+            <input name="translation__[% language.id %]__[% mail_string %]" value="[% HTML.escape(language.$mail_string) %]" type="text" class="wi-wide" style="float:left;">
+          [% END %]
+           [% IF mail_string.search('preset_text_periodic_invoices') %]
+             <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank" class="button wi-tiny neutral tooltipster-html" style="float:left;" title="[% 'Documentation about variables in a new window/tab' | $T8 %]">?</a>
+           [% END %]
+        </td>
+      </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/generictranslations/edit_greetings.html b/templates/design40_webpages/generictranslations/edit_greetings.html
new file mode 100644
index 000000000..8984ac57f
--- /dev/null
+++ b/templates/design40_webpages/generictranslations/edit_greetings.html
@@ -0,0 +1,36 @@
+[% USE T8 %]
+[% USE HTML %]
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+<!-- UPDATE: Message -->
+[% IF message %]
+  <p>[% HTML.escape(message) %]</p>
+[% END %]
+
+<form method="post" action="generictranslations.pl" id="form">
+
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      <th>[% 'male' | $T8 %]</th>
+      <th>[% 'female' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH language = LANGUAGES %]
+    <tr>
+      <td>[% IF language.id == 'default' %] [% 'Default (no language selected)' | $T8 %] [% ELSE %] [% HTML.escape(language.description) %] [% END %]</td>
+      <td><input name="translation__[% language.id %]__male" value="[% HTML.escape(language.male) %]" class="wi-wide" type="text"></td>
+      <td><input name="translation__[% language.id %]__female" value="[% HTML.escape(language.female) %]" class="wi-wide" type="text"> </td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/generictranslations/edit_sepa_strings.html b/templates/design40_webpages/generictranslations/edit_sepa_strings.html
new file mode 100644
index 000000000..1a652aebb
--- /dev/null
+++ b/templates/design40_webpages/generictranslations/edit_sepa_strings.html
@@ -0,0 +1,34 @@
+[% USE T8 %]
+[% USE HTML %]
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+[% IF message %]
+  <p>[% HTML.escape(message) %]</p>
+[% END %]
+
+<form method="post" action="generictranslations.pl" id="form">
+
+<table class="tbl-list width-moderate">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      <th>[% 'Remittance information prefix' | $T8 %]</th>
+      <th>[% 'Remittance information optional Vendor/Customer No postfix' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH language = LANGUAGES %]
+    <tr>
+      <th>[% IF language.id == 'default' %] [% 'Default (no language selected)' | $T8 %] [% ELSE %] [% HTML.escape(language.description) %] [% END %]</th>
+      <td><input name="translation__[% language.id %]" value="[% HTML.escape(language.translation) %]" type="text" class="wi-wide"></td>
+      <td><input name="translation__[% language.id %]__vc" value="[% HTML.escape(language.translation_vc) %]" type="text" class="wi-wide"></td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+</div>
diff --git a/templates/design40_webpages/generictranslations/edit_zugferd_notes.html b/templates/design40_webpages/generictranslations/edit_zugferd_notes.html
new file mode 100644
index 000000000..6eb0c1bc8
--- /dev/null
+++ b/templates/design40_webpages/generictranslations/edit_zugferd_notes.html
@@ -0,0 +1,39 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<div class="wrapper">
+
+[% IF message %]
+  <p>[% HTML.escape(message) %]</p>
+[% END %]
+
+<form method="post" action="generictranslations.pl" id="form">
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      <th>[% 'Factur-X/ZUGFeRD notes for each invoice' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH language = LANGUAGES %]
+      <tr>
+        <td>
+          [% IF language.id == 'default' %]
+          [% 'Default (no language selected)' | $T8 %]
+          [% ELSE %]
+          [% HTML.escape(language.description) %]
+          [% END %]
+        </td>
+        <td><input name="translation__[% language.id %]" size="40" value="[% HTML.escape(language.translation) %]"></td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/gl/form_footer.html b/templates/design40_webpages/gl/form_footer.html
new file mode 100644
index 000000000..26279a4d2
--- /dev/null
+++ b/templates/design40_webpages/gl/form_footer.html
@@ -0,0 +1,46 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <th></th>
+      <th></th>
+      <th class="numeric"> [% LxERP.format_amount(totaldebit, 2) | html %]</th>
+      <th class="numeric"> [% LxERP.format_amount(totalcredit, 2) | html %]</th>
+      <td colspan="2"></td>
+      [% IF show_details %]<td colspan="3"></td>[% END %]
+    </tr>
+  </tfoot>
+</table>
+</div><!-- /.wrapper / see form_header.html -->
+</div><!-- /#ui-tabs-basic-data -->
+
+[% PROCESS 'webdav/_list.html' %]
+<!-- /#ui-tabs-webdav -->
+
+<input name=callback type=hidden value="[% callback %]">
+<input name=bt_id    type=hidden value="[% bt_id %]">
+<input name=bt_chart_id type=hidden value="[% bt_chart_id %]">
+
+[% IF id && follow_ups.size %]
+  <p>[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size , follow_ups_due) %]</p>
+[% END %]
+
+</div><!-- /#ir_tabs.tabwidget -->
+
+</form>
+
+<script type="text/javascript"><!--
+$(document).ready(function() {
+  [% SET row=0 %]
+  [% WHILE row < rowcount %]
+   [% SET row=row + 1 %]
+   $('#accno_id_[% row %]').on('set_item:ChartPicker', function(e, item) {
+     kivi.GL.show_chart_balance(this);
+     kivi.GL.update_taxes(this);
+   });
+  [% END %]
+});
+--></script>
diff --git a/templates/design40_webpages/gl/form_header.html b/templates/design40_webpages/gl/form_header.html
new file mode 100644
index 000000000..34449d395
--- /dev/null
+++ b/templates/design40_webpages/gl/form_header.html
@@ -0,0 +1,192 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title | html %]
+</h1>
+
+<script type="text/javascript">
+  <!--
+  function copy_debit_to_credit() {
+    var txt = document.getElementsByName('debit_1')[0].value;
+    document.getElementsByName('credit_2')[0].value = txt;
+  };
+  //-->
+  </script>
+  <script type="text/javascript" src="js/show_form_details.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/kivi.Draft.js"></script>
+
+<form method="post" name="gl" action="gl.pl" id="form">
+
+[%- INCLUDE 'common/flash.html' %]
+
+[% FOREACH name IN [ 'id', 'closedto', 'locked', 'storno', 'storno_id', 'previous_id', 'previous_gldate' ] %]
+  [% L.hidden_tag(name, $name) %]
+[% END %]
+
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
+<input type=hidden name=title value="[% hide_title | html %]">
+
+<input type="hidden" name="follow_up_trans_id_1" value="[% id | html %]">
+<input type="hidden" name="follow_up_trans_type_1" value="gl_transaction">
+<input type="hidden" name="follow_up_trans_info_1" value="[% id | html %]">
+<input type="hidden" name="follow_up_rowcount" value="1">
+
+<div id="ir_tabs" class="tabwidget">
+
+<ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF email_attachment_id || workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
+  [% IF INSTANCE_CONF.get_webdav %]
+    <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+  [% END %]
+  [% IF id %]
+    [% IF INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=document&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=gl_transaction&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+    [% END %]
+    [% IF AUTH.assert('record_links', 1) %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=GLTransaction&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+  [% END %]
+</ul>
+
+<div id="ui-tabs-basic-data">
+
+<div class="wrapper">
+
+[% IF saved_message %]
+  <div class="message">[% saved_message | html %]</div>
+[% END %]
+
+[% IF previous_id %]
+  <div class="message message_hint">
+    [% 'Previous transnumber text' | $T8 %] <b>[% previous_id %]</b> [% 'Previous transdate text' | $T8 %] <b>[% previous_gldate %] </b>
+  </div>
+[% END %]
+
+</div><!-- /.wrapper -->
+
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             email_attachment_id || workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Reference' | $T8 %]</th>
+      <td>[% L.input_tag('reference', reference, class='wi-wide', readonly=readonly) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transdate' | $T8 %]</th>
+      <td>[% L.date_tag('transdate', transdate, readonly=readonly) %]</td>
+    </tr>
+    [% IF id %]
+    <tr>
+      <th>[% 'ID' | $T8 %]</th>
+      <td>[% L.input_tag('id', id, class="wi-small", readonly=readonly) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Gldate' | $T8 %]</th>
+      [%-# hidden img to keep alignment -%]
+      <td>[% L.date_tag('gldate', gldate, readonly=1) %]<img class="ui-datepicker-trigger" src="image/calendar.png" alt="..." title="..." style='visibility:hidden'></td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Tax point' | $T8 %]</th>
+      <td>[% L.date_tag('tax_point', tax_point) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %]</th>
+      <td>[% L.date_tag('deliverydate', deliverydate) %]</td>
+    </tr>
+    [% SET departments_style = "";
+       SET departments_style = "style='visibility:hidden'" IF ALL_DEPARTMENTS.size == 0 %]
+    <tr>
+      <th [%- departments_style -%]>[% 'Department' | $T8 %]</th>
+      <td [%- departments_style -%]>[% L.select_tag('department_id', ALL_DEPARTMENTS, default=department_id, title_key='description', with_empty=1, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", transaction_description, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td class="wi-wide">[% L.areainput_tag('description', description, readonly=readonly, cols=10, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th><label for="ob_transaction">[% 'OB Transaction' | $T8 %]</label></th>
+      <td>[% L.checkbox_tag('ob_transaction' checked=ob_transaction) %]</td>
+    </tr>
+    <tr>
+      <th><label for="cb_transaction">[% 'CB Transaction' | $T8 %]</label></th>
+      <td>[% L.checkbox_tag('cb_transaction' checked=cb_transaction) %]</td>
+    </tr>
+    <tr>
+      <th>[%- IF id %][% 'Mitarbeiter' | $T8 %][% END %]</th>
+      <td>[%- IF id %][% L.input_tag('employee', employee, readonly=readonly, class='wi-wide') %][% END %]</td>
+    </tr>
+    <tr>
+      <th>[% 'MwSt. inkl.' | $T8 %]</th>
+      <td>[% L.checkbox_tag('taxincluded', checked=taxincluded) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+<div class="wrapper">
+
+<div class="buttons positions">
+  <label class="button neutral" for="show_details">[% IF show_details %][% 'Hide details' | $T8 %][% ELSE %][% 'Show details' | $T8 %][% END %]</label>
+  [% L.checkbox_tag('show_details', checked=show_details, onclick='show_form_details();', style='display:none') %]
+</div>
+
+<table class="tbl-list wi-moderate">
+  <caption>[% 'Transaction' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <th class="right">[% 'Chart balance' | $T8 %]</th>
+      <th class="right">[% 'Debit' | $T8 %]</th>
+      <th class="right">[% 'Credit' | $T8 %]</th>
+      <th class="right">[% 'Tax' | $T8 %]</th>
+      <th>[% 'Taxkey' | $T8 %]</th>
+      [% IF show_details %]
+        <th>[% 'Source' | $T8 %]</th>
+        <th>[% 'Memo' | $T8 %]</th>
+        <th>[% 'Project Number' | $T8 %]</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
diff --git a/templates/design40_webpages/gl/generate_report_bottom.html b/templates/design40_webpages/gl/generate_report_bottom.html
new file mode 100644
index 000000000..435dae4ff
--- /dev/null
+++ b/templates/design40_webpages/gl/generate_report_bottom.html
@@ -0,0 +1,4 @@
+[% USE HTML %]
+<form method="post" id="create_new_form" action="gl.pl">
+  <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+</form>
diff --git a/templates/design40_webpages/gl/search.html b/templates/design40_webpages/gl/search.html
new file mode 100755
index 000000000..950c85595
--- /dev/null
+++ b/templates/design40_webpages/gl/search.html
@@ -0,0 +1,146 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+<h1>[% 'Journal' | $T8 %]</h1>
+
+<form method="post" id="form" action="gl.pl">
+
+<input type="hidden" name="sort" value="datesort">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Reference / Invoice Number' | $T8 %]</th>
+      <td>[% L.input_tag('reference', '', class='wi-normal initial_focus', name='reference') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Source' | $T8 %]</th>
+      <td>[% L.input_tag('source', '', class='wi-normal', name='source') %]</td>
+
+    </tr>
+    [% IF ALL_DEPARTMENTS %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key='description', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag('description', '', class='wi-normal', name='description') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Account Number' | $T8 %]</th>
+      <td>[% L.input_tag('accno', '', class='wi-normal', name='accno') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Notes' | $T8 %]</th>
+      <td>[% L.input_tag('notes', '', class='wi-normal', name='notes') %]</td>
+    </tr>
+    <tr>
+          <th>[% 'Transaction description' | $T8 %]</th>
+          <td>[% L.input_tag('transaction_description', '', class='wi-normal') %]</td>
+        </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>[% L.select_tag('project_id', ALL_PROJECTS, title_key='projectnumber', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Filter date by' | $T8 %]</th>
+      <td>
+        <input name="datesort" type="radio" value="transdate" checked> [% 'Transdate' | $T8 %] <br>
+        <input name="datesort" type="radio" value="gldate"> [%            'Gldate'    | $T8 %]</td>
+    </tr>
+    <tr>
+      <th>[% 'From' | $T8 %]</th>
+      <td>[% L.date_tag('datefrom') %] [% 'To (time)' | $T8 %] [% L.date_tag('dateto') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <div class="list col">
+    <h4 class="caption">[% 'Scope' | $T8 %]</h4>
+    <div>
+      <input name="category" type="radio" value="X" checked> [% 'All' | $T8 %]
+    </div>
+    <div>
+      <input name="category" type="radio" value="A"> [% 'Asset' | $T8 %]
+    </div>
+    <div>
+      <input name="category" type="radio" value="L"> [% 'Liability' | $T8 %]
+    </div>
+    <div>
+      <input name="category" type="radio" value="I"> [% 'Revenue' | $T8 %]
+    </div>
+    <div>
+      <input name="category" type="radio" value="E"> [% 'Expense' | $T8 %]
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Transaction Details' | $T8 %]</h4>
+    <div>
+      <input name="l_transdate" type="checkbox" value="Y" checked> [% 'Transdate' | $T8 %]
+    </div>
+    <div>
+      <input name="l_gldate" type="checkbox" value="Y" checked> [% 'Gldate' | $T8 %]
+    </div>
+    <div>
+      <input name="l_id" type="checkbox" value="Y"> [% 'ID' | $T8 %]
+    </div>
+    <div>
+      <input name="l_reference" type="checkbox" value="Y" checked> [% 'Reference' | $T8 %]
+    </div>
+    <div>
+      <input name="l_source" type="checkbox" value="Y" checked> [% 'Source' | $T8 %]
+    </div>
+    <div>
+      <input name="l_description" type="checkbox" value="Y" checked> [% 'Description' | $T8 %]
+    </div>
+    <div>
+      <input name="l_notes" type="checkbox" value="Y"> [% 'Notes' | $T8 %]
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Accounts & Sum' | $T8 %]</h4>
+    <div>
+      <input name="l_debit" type="checkbox" value="Y" checked> [% 'Debit' | $T8 %]
+    </div>
+    <div>
+      <input name="l_credit" type="checkbox" value="Y" checked> [% 'Credit' | $T8 %]
+    </div>
+    <div>
+      <input name="l_accno" type="checkbox" value="Y" checked> [% 'Account' | $T8 %]
+    </div>
+    <div>
+      <input name="l_subtotal" type="checkbox" value="Y"> [% 'Subtotal' | $T8 %]
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Miscellaneous' | $T8 %]</h4>
+    <div>
+      <input name="l_projectnumbers" type="checkbox" value="Y"> [% 'Project Number' | $T8 %]
+    </div>
+    <div>
+      <input name="l_employee" type="checkbox" value="Y"> [% 'Employee' | $T8 %]
+    </div>
+    [%- IF ALL_DEPARTMENTS %]
+      <div>
+        <input name="l_department" class=checkbox type=checkbox value=Y> [% 'Department' | $T8 %]
+      </div>
+    [%- END %]
+  </div>
+</div>
+<!-- /.wrapper.form-addition -->
+
+
+</form>
diff --git a/templates/design40_webpages/gl/update_tax_accounts.html b/templates/design40_webpages/gl/update_tax_accounts.html
new file mode 100644
index 000000000..11e61e6a2
--- /dev/null
+++ b/templates/design40_webpages/gl/update_tax_accounts.html
@@ -0,0 +1,5 @@
+[% USE L %]
+[% USE LxERP %]
+[% FOR row = TAX_ACCOUNTS %]
+<option value='[% row.id %]--[% row.rate %]'[% IF row.is_default %] selected[% END %]>[% row.taxkey _ " - " _ row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
+[% END %]
diff --git a/templates/design40_webpages/gobd/filter.html b/templates/design40_webpages/gobd/filter.html
new file mode 100644
index 000000000..0f8d49903
--- /dev/null
+++ b/templates/design40_webpages/gobd/filter.html
@@ -0,0 +1,36 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% title | html %]</h1>
+
+
+<form id='filter_form'>
+
+<div class="wrapper">
+
+[% INCLUDE 'common/flash.html' %]
+
+<p>[% 'This export will include all records in the given time range and all supplicant information from checked entities. You will receive a single zip file. Please extract this file onto the data medium requested by your auditor.' | $T8 %]</p>
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Year' | $T8 %]</th>
+      <td>[% L.radio_button_tag('method', value='year', checked=1) %]
+      <td>[% L.select_tag('year', SELF.available_years, default=current_year) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Period' | $T8 %]</th>
+      <td>[% L.radio_button_tag('method') %]
+      <!-- <td>[% 'From Date' | $T8 %]</td> -->
+      <td>[% L.date_tag('from', SELF.from) %] [% 'To Date' | $T8 %] [% L.date_tag('to', SELF.to) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div>
+
+</form>
diff --git a/templates/design40_webpages/ic/confirm_price_update.html b/templates/design40_webpages/ic/confirm_price_update.html
new file mode 100644
index 000000000..516b6895d
--- /dev/null
+++ b/templates/design40_webpages/ic/confirm_price_update.html
@@ -0,0 +1,19 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<form method="post" action="controller.pl" id="form">
+<h1>[% 'Update Prices' | $T8 %]</h1>
+<div class="wrapper">
+  <h3 class="confirm">[% 'Confirm!' | $T8 %]</h3>
+  <p>
+    [% LxERP.t8('Approximately #1 prices will be updated.', num_matches) %]<br>
+    [% 'Are you sure you want to update the prices' | $T8 %]?
+  </p>
+
+  [% L.hidden_tag('filter_key', filter_key) %]
+
+</div>
+</form>
+
diff --git a/templates/design40_webpages/ic/generate_report_bottom.html b/templates/design40_webpages/ic/generate_report_bottom.html
new file mode 100644
index 000000000..3bb49bc1a
--- /dev/null
+++ b/templates/design40_webpages/ic/generate_report_bottom.html
@@ -0,0 +1,56 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<div class="wrapper">
+
+<h3>[% 'Abbreviation Legend' | $T8  %]</h3>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+     <th>[% 'TypAbbreviation' | $T8  %]</th>
+     <th>[% 'Description'     | $T8  %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+     <td>[% 'Part (typeabbreviation)'       | $T8 %]</td>
+     <td>[% 'Part'                          | $T8 %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Assembly (typeabbreviation)'   | $T8 %]</td>
+     <td>[%'Assembly'                       | $T8 %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Service (typeabbreviation)'    | $T8 %]</td>
+     <td>[%'Service'                        | $T8 %]</td>
+    </tr>
+    <tr>
+     <td>[% 'Assortment (typeabbreviation)' | $T8 %]</td>
+     <td>[%'Assortment'                     | $T8 %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+     <th>[% 'PartClassAbbreviation' | $T8  %]</th>
+     <th>[% 'Description'           | $T8  %]</th>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH part_classification = PART_CLASSIFICATIONS %]
+    <tr>
+     <td>[% part_classification.abbreviation | $T8 %]</td>
+     <td>[% part_classification.description  | $T8 %]</td>
+    </tr>
+  [% END %]
+  </tbody>
+</table>
+
+</div>
+
+<form method="post" action="controller.pl" id="new_form">
+ <input name="callback" type="hidden" value="[% HTML.escape(callback) %]">
+</form>
diff --git a/templates/design40_webpages/ic/generate_report_top.html b/templates/design40_webpages/ic/generate_report_top.html
new file mode 100644
index 000000000..24fc421ae
--- /dev/null
+++ b/templates/design40_webpages/ic/generate_report_top.html
@@ -0,0 +1,5 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+
+[% 'Options' | $T8 %]: [% options.join(', ') %]
diff --git a/templates/design40_webpages/ic/search.html b/templates/design40_webpages/ic/search.html
new file mode 100644
index 000000000..0be68f81a
--- /dev/null
+++ b/templates/design40_webpages/ic/search.html
@@ -0,0 +1,229 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% SET style="width: 250px" %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+
+<form method="post" action="ic.pl" id="form">
+  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
+  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
+  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
+  <input type="hidden" name="sort" value="description">
+  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
+
+  <div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Article data' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Part Type' | $T8 %]</th>
+        <td>
+          <input name="l_part" id="l_part" type="checkbox" value="Y" checked>
+          <label for="l_part"> [% 'Part' | $T8 %] </label><br>
+          <input name="l_service" id="l_service" type="checkbox" value="Y" checked>
+          <label for="l_service"> [% 'Service' | $T8 %] </label><br>
+          <input name="l_assembly" id="l_assembly" type="checkbox" value="Y" checked>
+          <label for="l_assembly"> [% 'Assembly' | $T8 %] </label><br>
+          <input name="l_assortment" id="l_assortment" type="checkbox" value="Y" checked>
+          <label for="l_assortment"> [% 'Assortment' | $T8 %] </label>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Part Number' | $T8 %]</th>
+        <td>[% L.input_tag("partnumber", "", value='asfasdf', class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Part Description' | $T8 %]</th>
+        <td>[% L.input_tag("description", "", class='initial_focus wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Notes' | $T8 %]</th>
+        <td>[% L.input_tag("notes", "", class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Part Classification' | $T8 %]</th>
+        <td>[% P.part.select_classification('classification_id', class='wi-lightwide', with_empty=1, empty_title='') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Partsgroup' | $T8 %]</th>
+        <td>[% P.select_tag("partsgroup_id", ALL_PARTSGROUPS, with_empty=1, empty_title='', default=partsgroup, title_key="partsgroup", class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Serial Number' | $T8 %]</th>
+        <td>[% L.input_tag("serialnumber", "", class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'EAN' | $T8 %]</th>
+        <td>[% L.input_tag("ean", "", class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Make' | $T8 %]</th>
+        <td>[% L.input_tag("make", "", class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Model' | $T8 %]</th>
+        <td>[% L.input_tag("model", "", class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Shop article' | $T8 %]</th>
+        <td>[% L.yes_no_tag('shop', shop, default='', with_empty=1, empty_title='', class='wi-mediumsmall') %]</td>
+      </tr>
+      [% CUSTOM_VARIABLES_FILTER_CODE %]
+      <tr>
+        <th class="caption" colspan="2"> [% 'Illustrations' | $T8 %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Drawing' | $T8 %]</th>
+        <td>[% L.input_tag("drawing", "", class="wi-wide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Microfiche' | $T8 %]</th>
+        <td>[% L.input_tag("microfiche", "", class="wi-wide") %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption> [% 'Options' | $T8 %]</caption>
+    <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <td colspan="2">
+          [% L.radio_button_tag('itemstatus', value='active', id='itemstatus_active', label=LxERP.t8('Active'), checked=1) %]<br>
+          [% L.radio_button_tag('itemstatus', value='onhand', id='itemstatus_onhand', label=LxERP.t8('On Hand')) %]<br>
+          [% L.radio_button_tag('itemstatus', value='short', id='itemstatus_short', label=LxERP.t8('Short')) %]<br>
+          [% L.radio_button_tag('itemstatus', value='order_locked', id='itemstatus_order_locked', label=LxERP.t8('Do not order anymore')) %]<br>
+          [% L.radio_button_tag('itemstatus', value='obsolete', id='itemstatus_obsolete', label=LxERP.t8('Obsolete')) %]<br>
+          [% L.radio_button_tag('itemstatus', value='orphaned', id='itemstatus_orphaned', label=LxERP.t8('Orphaned')) %]<br>
+          [% L.radio_button_tag('itemstatus', value='', id='itemstatus_all', label=LxERP.t8('All')) %]
+        </td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="2">[% 'Assemblies' | $T8 %]</th>
+      </tr>
+      <tr>
+        <td colspan="2">
+          [% L.radio_button_tag('bom', id='bom_0', value=0, checked=1, label=LxERP.t8('Top Level Designation only')) %]<br>
+          [% L.radio_button_tag('bom', id='bom_1', value=1, label=LxERP.t8('Individual Items')) %]<br>
+          [% L.radio_button_tag('bom', id='bom_2', value=2, label=LxERP.t8('Search for Items used in Assemblies')) %]
+        </td>
+      </tr>
+      <tr>
+        <th class="caption" colspan="2">[% 'Status' | $T8 %]</th>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <div class="list wi-verysmall col">
+            <div class="field">[% L.checkbox_tag('bought', label=LxERP.t8('Bought')) %]</div>
+            <div class="field">[% L.checkbox_tag('sold', label=LxERP.t8('Sold')) %]</div>
+          </div>
+          <div class="list wi-mediumsmall col">
+            <div class="field">[% L.checkbox_tag('onorder', label=LxERP.t8('On Order')) %]</div>
+            <div class="field">[% L.checkbox_tag('ordered', label=LxERP.t8('Ordered')) %]</div>
+          </div>
+          <div class="list wi-verysmall col">
+            <div class="field">[% L.checkbox_tag('rfq', label=LxERP.t8('RFQ')) %]</div>
+            <div class="field">[% L.checkbox_tag('quoted', label=LxERP.t8('Quoted')) %]</div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td class="wi-date" colspan="2" style="vertical-align:middle;padding-top:1.2em;">
+          [% 'From' | $T8 %]
+          [% L.date_tag('transdatefrom') %]
+          [% 'To (time)' | $T8 %]
+          [% L.date_tag('transdateto') %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <table class="tbl-horizontal">
+    <caption>[% 'Handling' | $T8 %]</caption>
+    <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Insert Date' | $T8 %]</th>
+        <td class="wi-date">[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.wrapper -->
+
+
+<div class="wrapper form-addition control-panel">
+
+  <h3 class="caption"> [% 'Include in Report' | $T8 %] </h3>
+  <!-- PENDENT: Klasse col noetig in form-adddition -->
+  <div class="col list">
+    <h4>[% 'Article' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_partnumber', label=LxERP.t8('Part Number'), checked=1, value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_description', label=LxERP.t8('Part Description'), checked=1, value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_serialnumber', label=LxERP.t8('Serial Number'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_unit', label=LxERP.t8('Unit of measure'), value='Y', checked=1) %]</p>
+    <p>[% L.checkbox_tag('l_weight', label=LxERP.t8('Weight'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_partsgroup', label=LxERP.t8('Partsgroup'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_ean', label=LxERP.t8('EAN'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_shop', label=LxERP.t8('Shop article'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_projectnumber', label=LxERP.t8('Project Number'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_projectdescription', label=LxERP.t8('Project Description'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_name', label=LxERP.t8('Name in Selected Records'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %]</p>
+  </div>
+
+  <div class="col list">
+    <h4>[% 'Prices' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_listprice', label=LxERP.t8('List Price'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_sellprice', label=LxERP.t8('Sell Price'), value='Y', checked=1) %]</p>
+    <p>[% L.checkbox_tag('l_lastcost', label=LxERP.t8('Last Cost'), value='Y', checked=1) %]</p>
+    <p>[% L.checkbox_tag('l_priceupdate', label=LxERP.t8('Price updated'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_linetotal', label=LxERP.t8('Line Total'), value='Y', checked=1) %]</p>
+    <p>[% L.checkbox_tag('l_pricegroups', label=LxERP.t8('Pricegroups'), value='Y', checked=1) %]</p>
+    <p>[% L.checkbox_tag('l_price_factor_description', label=LxERP.t8('Price Factor'), value='Y') %]</p>
+  </div>
+
+  <div class="col list">
+    <h4>[% 'Handling' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_insertdate', label=LxERP.t8('Insert Date'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_deliverydate', label=LxERP.t8('Delivery Date'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate Record'), value='Y') %]</p>
+    <p>&nbsp;</p>
+    <h4>[% 'Vendor' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_make', label=LxERP.t8('Make'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_model', label=LxERP.t8('Model'), value='Y') %]</p>
+  </div>
+
+  <div class="col list">
+    <h4>[% 'Warehouse' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_warehouse', label=LxERP.t8('Default Warehouse'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_bin', label=LxERP.t8('Default Bin'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_onhand', label=LxERP.t8('Stocked Qty'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_rop', label=LxERP.t8('ROP'), value='Y') %]</p>
+  </div>
+
+  <div class="col list">
+    <h4>[% 'Illustrations' | $T8 %]</h4>
+    <p>[% L.checkbox_tag('l_image', label=LxERP.t8('Image'), value='Y', checked=(INSTANCE_CONF.get_parts_listing_image ? 1 : 0)) %]</p>
+    <p>[% L.checkbox_tag('l_drawing', label=LxERP.t8('Drawing'), value='Y') %]</p>
+    <p>[% L.checkbox_tag('l_microfiche', label=LxERP.t8('Microfiche'), value='Y') %]</p>
+  </div>
+
+  [% IF CUSTOM_VARIABLES_INCLUSION_CODE %]
+    <div class="col list">
+      <h4>[% 'Custom Variables' | $T8 %] </h4>
+      [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+    </div>
+  [% END %]
+
+</div><!-- ./wrapper.form-addition -->
+
+</form>
diff --git a/templates/design40_webpages/ic/search_update_prices.html b/templates/design40_webpages/ic/search_update_prices.html
new file mode 100644
index 000000000..83f0c2b63
--- /dev/null
+++ b/templates/design40_webpages/ic/search_update_prices.html
@@ -0,0 +1,129 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+<h1>[% 'Update prices' | $T8 %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="form">
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.partnumber', FORM.filter.partnumber, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td colspan="3">[% L.input_tag('filter.description', FORM.filter.description, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Partsgroup' | $T8 %]</th>
+      <td>[% L.input_tag('filter.partsgroup', FORM.filter.partsgroup, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Serial Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.serialnumber', FORM.filter.serialnumber, size=20) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Scope' | $T8 %]</th>
+      <td>
+        <div class="list">
+          [% L.radio_button_tag('filter.itemstatus', value='active', label=LxERP.t8('Active'), checked=!FORM.filter.itemstatus||FORM.filter.itemstatus=='active') %]<br>
+          [% L.radio_button_tag('filter.itemstatus', value='onhand', label=LxERP.t8('On Hand'), checked=FORM.filter.itemstatus=='onhand') %]<br>
+          [% L.radio_button_tag('filter.itemstatus', value='short', label=LxERP.t8('Short'), checked=FORM.filter.itemstatus=='short') %]<br>
+          [% L.radio_button_tag('filter.itemstatus', value='obsolete', label=LxERP.t8('Obsolete'), checked=FORM.filter.itemstatus=='obsolete') %]<br>
+          [% L.radio_button_tag('filter.itemstatus', value='orphaned', label=LxERP.t8('Orphaned'), checked=FORM.filter.itemstatus=='orphaned') %]
+        </div>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+     <th>[% 'Make' | $T8 %]</th>
+     <td>[% P.customer_vendor.picker('filter.make', FORM.filter.make, type='vendor', size=20) %]</td>
+    </tr>
+    <tr>
+     <th>[% 'Model' | $T8 %]</th>
+     <td>[% L.input_tag('filter.model', FORM.filter.model, size=20) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+     <th>[% 'Drawing' | $T8 %]</th>
+     <td>[% L.input_tag('filter.drawing', FORM.filter.drawing, size=20) %]</td>
+    </tr>
+    <tr>
+     <th>[% 'Microfiche' | $T8 %]</th>
+     <td>[% L.input_tag('filter.microfiche', FORM.filter.microfiche, size=20) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <thead>
+    <tr>
+      <th>[% 'Price group' | $T8 %]</th>
+      <th>[% 'Preis' | $T8 %]</th>
+      <th>[% 'Prozentual/Absolut' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>[% 'Sell Price' | $T8 %]</th>
+      <td>[% L.input_tag('filter.prices.sellprice.price_as_number', FORM.filter.prices.sellprice.price_as_number, size=11) %]</td>
+      <td class="center">
+        [% L.radio_button_tag("filter.prices.sellprice.type",
+           value="percent",
+           checked=!FORM.filter.prices.sellprice.type || FORM.filter.prices.sellprice.type == 'percent') %] /
+        [% L.radio_button_tag("filter.prices.sellprice.type",
+           value="absolut",
+           checked=FORM.filter.prices.sellprice.type == 'absolut', class='horizontal') %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'List Price' | $T8 %]</th>
+      <td>[% L.input_tag('filter.prices.listprice.price_as_number', FORM.filter.prices.listprice.price_as_number, size=11) %]</td>
+      <td class="center">
+        [% L.radio_button_tag("filter.prices.listprice.type",
+           value="percent",
+           checked=!FORM.filter.prices.listprice.type || FORM.filter.prices.listprice.type == 'percent', class='horizontal') %] /
+        [% L.radio_button_tag("filter.prices.listprice.type",
+           value="absolut",
+           checked=FORM.filter.prices.listprice.type == 'absolut', class='horizontal') %]
+      </td>
+    </tr>
+    [% FOREACH pg = SELF.pricegroups %]
+    <tr>
+      <th>[% pg.pricegroup | html %]</th>
+      <td>[% L.input_tag('filter.prices.' _ pg.id _ '.price_as_number', FORM.filter.prices.${pg.id}.price_as_number, size=11) %]</td>
+      <td class="center">
+        [% L.radio_button_tag("filter.prices." _ pg.id  _ ".type",
+           value="percent",
+           checked=!FORM.filter.prices.${pg.id}.type || FORM.filter.prices.${pg.id}.type == 'percent', class='horizontal') %] /
+        [% L.radio_button_tag("filter.prices." _ pg.id _ ".type",
+           value="absolut",
+           checked=FORM.filter.prices.${pg.id}.type == 'absolut', class='horizontal') %]
+      </td>
+    </tr>
+    [% END %]
+</tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/inventory/_journal.html b/templates/design40_webpages/inventory/_journal.html
new file mode 100644
index 000000000..08407ef7d
--- /dev/null
+++ b/templates/design40_webpages/inventory/_journal.html
@@ -0,0 +1,45 @@
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+
+<h3>[% 'Journal of Last 20 Transfers' | $T8 %]</h3>
+
+[% IF journal.size %]
+
+  <table class="tbl-list wi-moderate">
+    <thead>
+     <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Trans Type' | $T8 %]</th>
+      <th>[% 'Part' | $T8 %]</th>
+      <th>[% 'Warehouse From' | $T8 %]</th>
+      <th class="right">[% 'Qty' | $T8 %]</th>
+      <th>[% 'Unit' | $T8 %]</th>
+      <th>[% 'Warehouse To' | $T8 %]</th>
+      <th class="right">[% 'Charge Number' | $T8 %]</th>
+      <th>[% 'Comment' | $T8 %]</th>
+      <th>[% 'Document' | $T8 %]</th>
+     </tr>
+    </thead>
+    <tbody>
+      [% FOREACH row = journal %]
+       <tr>
+        <td>[% row.base.itime_as_date  %]</td>
+        <td>[% row.base.trans_type.description | $T8 %]</td>
+        <td>[% row.base.part.displayable_name | html %]</td>
+        <td>[% row.out ? row.out.bin.full_description : '-' | html %]</td>
+        <td class='numeric'>[% row.in ? row.in.qty_as_number : LxERP.format_amount(-1 * row.out.qty, 2) %]</td>
+        <td>[% row.base.part.unit | html %]</td>
+        <td>[% row.in ? row.in.bin.full_description : '-' | html %]</td>
+        <td class="right">[% row.base.chargenumber | html %]</td>
+        <td>[% row.base.comment | html %]</td>
+        <td>[% row.base.oe_id | html %][% row.base.invoice.invoice.invnumber | html %]</td>
+       </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+[% ELSE %]
+  <p>[% 'No transactions yet.' | $T8 %]</p>
+[% END %]
diff --git a/templates/design40_webpages/inventory/_stock.html b/templates/design40_webpages/inventory/_stock.html
new file mode 100644
index 000000000..dc8d54f50
--- /dev/null
+++ b/templates/design40_webpages/inventory/_stock.html
@@ -0,0 +1,39 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+[% IF SELF.part.id %]
+
+<h3>[% LxERP.t8('Stock for part #1', SELF.part.displayable_name) %][% IF SELF.part.ean %] ([% SELF.part.ean %])[% END %]</h3>
+
+[% IF SELF.stock_empty && !SELF.part.bin_id  %]
+  <p>[% 'Nothing stocked yet.' | $T8 %]</p>
+[% ELSE %]
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% 'Warehouse' | $T8 %]</th>
+        <th>[% 'Bin' | $T8 %]</th>
+        <th>[% 'Qty' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+    [% FOREACH wh = SELF.warehouses %]
+      [% FOREACH bin = wh.bins %]
+        [% # display any bins with stock and default bin %]
+        [% SET stock__set = SELF.stock_by_bin.${bin.id} %]
+        [% IF stock__set.sum > 0 || SELF.part.bin_id == bin.id %]
+          <tr>
+            <td>[% bin.warehouse.description %]</td>
+            <td>[% bin.description %]</td>
+            <td class='numeric'>[% LxERP.format_amount(stock__set.sum, 2) %]&nbsp;[% SELF.part.unit %]</td>
+          </tr>
+        [% END %]
+      [% END %]
+    [% END %]
+    </tbody>
+  </table>
+[% END %]
+
+[% END %]
diff --git a/templates/design40_webpages/inventory/report_bottom.html b/templates/design40_webpages/inventory/report_bottom.html
new file mode 100644
index 000000000..a360092f3
--- /dev/null
+++ b/templates/design40_webpages/inventory/report_bottom.html
@@ -0,0 +1 @@
+[% PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
diff --git a/templates/design40_webpages/inventory/stocktaking/_already_counted_dialog.html b/templates/design40_webpages/inventory/stocktaking/_already_counted_dialog.html
new file mode 100644
index 000000000..e244dc66c
--- /dev/null
+++ b/templates/design40_webpages/inventory/stocktaking/_already_counted_dialog.html
@@ -0,0 +1,51 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<form method="post" id="already_counted_form" method="POST">
+
+<p>
+  [% 'This part was already counted for this bin:' | $T8 %]<br>
+  [% SELF.part.displayable_name %] / [% SELF.part.ean %]<br>
+  [% already_counted.first.bin.full_description %], [% 'Stocked Qty' | $T8 %]: [% LxERP.format_amount(stocked_qty, -2) %] [% SELF.part.unit %]
+  [% IF SELF.part.unit != SELF.unit.name %]
+    ([% LxERP.format_amount(stocked_qty_in_form_units, -2) %] [% SELF.unit.name %])<br>
+  [% END %]
+</p>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'Insert Date' | $T8 %]</th>
+      <th>[% 'Employee' | $T8 %]</th>
+      <th>[% 'Bin' | $T8 %]</th>
+      <th class="right">[% 'Target Qty' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH ac = already_counted %]
+      <tr>
+        <td>[% ac.itime_as_timestamp %]</td>
+        <td>[% ac.employee.safe_name %]</td>
+        <td>[% ac.bin.full_description %]</td>
+        <td class="numeric">[% ac.qty_as_number %] [% ac.part.unit %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<p>
+  [% 'Please choose the action to be processed for your target quantity:' | $T8 %]<br>
+  [% 'Correct counted' | $T8 %]: [% 'The stock will be changed to your target quantity.' | $T8 %]<br>
+  [% 'Add counted' | $T8 %]: [% 'Your target quantity will be added to the stocked quantity.' | $T8 %]<br>
+</p>
+
+<div class="buttons">
+  [% L.hidden_tag('action', 'Inventory/dispatch') %]
+  [% L.button_tag('kivi.Inventory.stocktaking_correct_counted()', LxERP.t8("Correct counted")) %]
+  [% L.button_tag('kivi.Inventory.stocktaking_add_counted(' _ stocked_qty_in_form_units _ ')', LxERP.t8("Add counted")) %]
+  <a href="#" onclick="kivi.Inventory.close_already_counted_dialog();" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+</div>
+
+</form>
diff --git a/templates/design40_webpages/inventory/stocktaking/_filter.html b/templates/design40_webpages/inventory/stocktaking/_filter.html
new file mode 100644
index 000000000..ce18a7a1c
--- /dev/null
+++ b/templates/design40_webpages/inventory/stocktaking/_filter.html
@@ -0,0 +1,30 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<table id="filter_table" class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'EAN' | $T8 %]</th>
+      <td>[% L.input_tag('filter.parts.ean:substr::ilike', filter.parts.ean_substr__ilike) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.parts.partnumber:substr::ilike', filter.parts.partnumber_substr__ilike) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.parts.description:substr::ilike', filter.parts.description_substr__ilike) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Cutoff Date' | $T8 %]</th>
+      <td>[% L.date_tag('filter.cutoff_date:date', filter.cutoff_date_date) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Comment' | $T8 %]</th>
+      <td>[% L.input_tag('filter.comment:substr::ilike', filter.comment_substr__ilike, size=60) %]</td>
+    </tr>
+  </tbody>
+</table>
+
diff --git a/templates/design40_webpages/inventory/stocktaking/form.html b/templates/design40_webpages/inventory/stocktaking/form.html
new file mode 100644
index 000000000..1bb569cb8
--- /dev/null
+++ b/templates/design40_webpages/inventory/stocktaking/form.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title | html %]</h1>
+
+<div class="wrapper">
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="stocktaking_form">
+
+<div class="select-item control-panel">
+  [% "Select article" | $T8 %] [% P.part.picker("part_id", "", with_makemodel=1) %]
+</div>
+
+<div id="stock"></div>
+
+<table id="stocktaking_registration_table" class="tbl-horizontal">
+  <caption>[% 'Registration' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Destination warehouse' | $T8 %]</th>
+      <td class="wi-wide">
+        [% L.select_tag('warehouse_id', SELF.warehouses, default=SELF.warehouse.id, title_key='description', class='wi-wide' ) %]
+        [% IF SELF.warehouse.id %]
+          <span class="below wi-wide condensed">[% L.select_tag('bin_id', SELF.warehouse.bins, default=SELF.bin.id, title_key='description', class='wi-wide' ) %]</span>
+        [% ELSE %]
+          <span id="bin_id" class="wi-wide"></span>
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Charge number' | $T8 %]</th>
+      <td>[% L.input_tag('chargenumber', "", size=30, class='wi-wide') %]</td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+      <tr>
+        <th>[% 'Best Before' | $T8 %]</th>
+        <td>[% L.date_tag('bestbefore', "", class='wi-date') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Target Qty' | $T8 %]</th>
+      <td>
+        [% L.input_tag('target_qty', '', size=10, class='numeric wi-small') %]
+        [% IF SELF.part.unit %]
+          [% L.select_tag('unit_id', SELF.part.available_units, title_key='name', default=SELF.unit.id, class='wi-small' ) %]
+        [% ELSE %]
+          [% L.select_tag('unit_id', SELF.units, title_key='name', class='wi-small') %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Cutoff Date' | $T8 %]</th>
+      <td>[% L.date_tag('cutoff_date_as_date', SELF.stocktaking_cutoff_date, class='wi-date' ) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Optional comment' | $T8 %]</th>
+      <td>[% L.input_tag('comment', SELF.stocktaking_comment, size=30, class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</form>
+
+<div id="stocktaking_history">[% LxERP.t8("Loading...") %]</div>
+
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/inventory/stocktaking/full_report_top.html b/templates/design40_webpages/inventory/stocktaking/full_report_top.html
new file mode 100644
index 000000000..0d51ebbd2
--- /dev/null
+++ b/templates/design40_webpages/inventory/stocktaking/full_report_top.html
@@ -0,0 +1,24 @@
+[% USE L %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action='controller.pl' method='post'>
+<div class="wrapper">
+
+  [% BLOCK filter_toggle_panel %]
+    [% PROCESS 'inventory/stocktaking/_filter.html' filter=SELF.stocktaking_models.filtered.laundered %]
+    [% L.hidden_tag('action', 'Inventory/dispatch') %]
+    [% L.hidden_tag('sort_by', FORM.sort_by) %]
+    [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+    [% L.hidden_tag('page', FORM.page) %]
+    <div class="buttons">
+      [% L.input_tag('action_stocktaking_journal', LxERP.t8('Continue'), type = 'submit',)%]
+      <a href='#' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);' class="button neutral">[% 'Reset' | $T8 %]</a>
+    </div>
+  [% END %]
+
+  [% INCLUDE common/toggle_panel.html %]
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/inventory/stocktaking/report_bottom.html b/templates/design40_webpages/inventory/stocktaking/report_bottom.html
new file mode 100644
index 000000000..65c5741ec
--- /dev/null
+++ b/templates/design40_webpages/inventory/stocktaking/report_bottom.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[% L.paginate_controls(models=SELF.stocktaking_models) %]
diff --git a/templates/design40_webpages/inventory/warehouse_selection_stock.html b/templates/design40_webpages/inventory/warehouse_selection_stock.html
new file mode 100644
index 000000000..14eddafbb
--- /dev/null
+++ b/templates/design40_webpages/inventory/warehouse_selection_stock.html
@@ -0,0 +1,101 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form name="Form" method="post" action="controller.pl" id="form">
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal">
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-verywide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Part' | $T8 %]</th>
+        <td>[% P.part.picker('part_id', SELF.part, class='wi-wide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Destination warehouse' | $T8 %]</th>
+        <td class="wi-wide below">
+          [% L.select_tag('warehouse_id', SELF.warehouses, default=SELF.warehouse.id, title_key='description', class='wi-wide') %]
+          [% IF SELF.warehouse.id %]
+            [% L.select_tag('bin_id', SELF.warehouse.bins_sorted_naturally, default=SELF.bin.id, title_key='description', class='wi-wide below') %]
+          [% ELSE %]
+            <span id="bin_id" class="data wi-wide"></span>
+          [% END %]
+          <span id="write_default_bin_span" style="display:none;" class="below">[% L.checkbox_tag('write_default_bin', label=LxERP.t8('Write bin to default bin in part?')) %]</span>
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Charge number' | $T8 %]</th>
+        <td>[% L.input_tag('chargenumber', FORM.chargenumber, class='wi-wide') %]</td>
+      </tr>
+      [% IF INSTANCE_CONF.get_show_bestbefore %]
+        <tr>
+          <th>[% 'Best Before' | $T8 %]</th>
+          <td>[% L.date_tag('bestbefore', FORM.bestbefore) %]</td>
+        </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Quantity' | $T8 %]</th>
+        <td>
+          [% L.input_tag('qty', LxERP.format_amount(FORM.qty), class='wi-verysmall') %]
+          [% IF SELF.part.unit %]
+            [% L.select_tag('unit_id', SELF.part.available_units, title_key='name', default=SELF.unit.id, class='wi-small') %]
+          [% ELSE %]
+            [% L.select_tag('unit_id', SELF.units, title_key='name', class='wi-small') %]
+          [% END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Select type of transfer in' | $T8 %]</th>
+        <td>[% L.select_tag('transfer_type_id', TRANSFER_TYPES, title_key='description', class='wi-wide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Optional comment' | $T8 %]</th>
+        <td>[% L.input_tag('comment', FORM.comment, class='wi-wide') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+</form>
+
+<div class="wrapper">
+
+  <div id="stock">
+    [% PROCESS 'inventory/_stock.html' %]
+  </div>
+  <div id="journal">
+    [% PROCESS 'inventory/_journal.html' journal=SELF.mini_journal %]
+  </div>
+
+</div><!-- /.wrapper -->
+
+
+<script type="text/javascript">
+  function reload_warehouse_selection () {
+    $.post("controller.pl", { action: 'Inventory/part_changed', part_id: function(){ return $('#part_id').val() } }, kivi.eval_json_result);
+    $.post("controller.pl", { action: 'Inventory/mini_stock', part_id: function(){ return $('#part_id').val() } }, kivi.eval_json_result);
+  }
+  function reload_bin_selection () {
+    $.post("controller.pl", { action: 'Inventory/warehouse_changed', warehouse_id: function(){ return $('#warehouse_id').val() } }, kivi.eval_json_result);
+  }
+  function check_part_selection_before_stocking() {
+    if ($('#part_id').val() !== '')
+      return true;
+
+    alert(kivi.t8('No article has been selected yet.'));
+    return false;
+  }
+  $(function(){
+    $('#part_id').change(reload_warehouse_selection);
+    $('#warehouse_id').change(reload_bin_selection);
+  })
+</script>
diff --git a/templates/design40_webpages/inventory/warehouse_usage.html b/templates/design40_webpages/inventory/warehouse_usage.html
new file mode 100644
index 000000000..1e19913c7
--- /dev/null
+++ b/templates/design40_webpages/inventory/warehouse_usage.html
@@ -0,0 +1,122 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% WAREHOUSE_FILTER = 1 %]
+[% PROCESS 'common/select_warehouse_bin.html' %]
+
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form name="Form" method="post" action="controller.pl" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Periods' | $T8 %]</caption>
+  <colgroup> <col class="wi-smallest"><col class="wi-small"><col class="wi-small"><col class="wi-small"> </colgroup>
+  <tbody>
+  <tr>
+    <th colspan="4"><h4><input name=reporttype type=radio value="custom" checked> [% 'Customized Report' | $T8 %]</h4></th>
+  </tr>
+  <tr>
+    <th></th>
+    <th>[% 'Year' | $T8 %]</th>
+    <td colspan="2">
+      <input type="text" name=year title="[% 'YYYY' | $T8 %]" value="[% year %]" class="wi-smallest initial_focus" oninput='set_from_to(duetyp.value, this.value)'>
+    </td>
+  </tr>
+  <tr>
+    <th></th>
+    <th>[% 'Yearly'    | $T8 %]</th>
+    <th>[% 'Quarterly' | $T8 %]</th>
+    <th>[% 'Monthly'   | $T8 %]</th>
+  </tr>
+  <tr>
+    <th></th>
+    <td>
+      <input name=duetyp type=radio value="13" checked onchange='set_from_to(this.value, year.value)'>[% 'Yearly'    | $T8 %]
+    </td>
+    <td>
+      <input name=duetyp type=radio value="A" onchange='set_from_to(this.value, year.value)'>1. [% 'Quarter' | $T8 %]<br>
+      <input name=duetyp type=radio value="B" onchange='set_from_to(this.value, year.value)'>2. [% 'Quarter' | $T8 %]<br>
+      <input name=duetyp type=radio value="C" onchange='set_from_to(this.value, year.value)'>3. [% 'Quarter' | $T8 %]<br>
+      <input name=duetyp type=radio value="D" onchange='set_from_to(this.value, year.value)'>4. [% 'Quarter' | $T8 %]<br>
+    </td>
+    <td>
+      <input name=duetyp type=radio value="1" onchange='set_from_to(this.value, year.value)'>[% 'January' | $T8 %]<br>
+      <input name=duetyp type=radio value="2" onchange='set_from_to(this.value, year.value)'>[% 'February' | $T8 %]<br>
+      <input name=duetyp type=radio value="3" onchange='set_from_to(this.value, year.value)'>[% 'March' | $T8 %]<br>
+      <input name=duetyp type=radio value="4" onchange='set_from_to(this.value, year.value)'>[% 'April' | $T8 %]<br>
+      <input name=duetyp type=radio value="5" onchange='set_from_to(this.value, year.value)'>[% 'May' | $T8 %]<br>
+      <input name=duetyp type=radio value="6" onchange='set_from_to(this.value, year.value)'>[% 'June' | $T8 %]<br>
+      <input name=duetyp type=radio value="7" onchange='set_from_to(this.value, year.value)'>[% 'July' | $T8 %]<br>
+      <input name=duetyp type=radio value="8" onchange='set_from_to(this.value, year.value)'>[% 'August' | $T8 %]<br>
+      <input name=duetyp type=radio value="9" onchange='set_from_to(this.value, year.value)'>[% 'September' | $T8 %]<br>
+      <input name=duetyp type=radio value="10" onchange='set_from_to(this.value, year.value)'>[% 'October' | $T8 %]<br>
+      <input name=duetyp type=radio value="11" onchange='set_from_to(this.value, year.value)'>[% 'November' | $T8 %]<br>
+      <input name=duetyp type=radio value="12" onchange='set_from_to(this.value, year.value)'>[% 'December' | $T8 %]<br>
+    </td>
+  </tr>
+  <tr>
+    <th colspan="4"><h4><input name=reporttype type=radio value="free">[% 'Free report period' | $T8 %]</h4></th>
+  </tr>
+  <tr>
+    <th></th>
+    <td colspan="3">
+      [% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %]
+      [% 'Bis' | $T8 %] [% L.date_tag('todate', todate)  %]
+    </td>
+  </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Warehouse & Article' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Warehouse' | $T8 %]</th>
+      <td>
+        <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(this.value, 0)" class="wi-normal">
+          <option value="">---</option>
+          [% FOREACH warehouse = WAREHOUSES %]
+            <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Bin' | $T8 %]</th>
+      <td><select name="bin_id" id="bin_id" class="wi-normal"></select></td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td><input type="text" name="partnumber" class="wi-normal"></td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td><input type="text" name="description" class="wi-normal"></td>
+    </tr>
+    [% IF PARTSCLASSIFICATIONS %]
+      <tr>
+        <th>[% 'Part Classification' | $T8 %]</th>
+        <td>[% L.select_tag('partsclassification',PARTSCLASSIFICATION,title_key="partsclassification", class='wi-normal') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Charge Number' | $T8 %]</th>
+      <td><input type="text" name="chargenumber" class="wi-normal"></td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+    <tr>
+      <th>[% 'Best Before' | $T8 %]</th>
+      <td>[% L.date_tag('bestbefore') %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div>
+
+</form>
diff --git a/templates/design40_webpages/io/select_item.html b/templates/design40_webpages/io/select_item.html
new file mode 100644
index 000000000..fd8fc2052
--- /dev/null
+++ b/templates/design40_webpages/io/select_item.html
@@ -0,0 +1,83 @@
+[% USE LxERP %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% SET COLS = 8 %]
+<h1>[% title %]</h1>
+
+ <form method="post" action="[% HTML.escape(script) %]" id="form">
+
+<table class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+     [% IF MYCONFIG.item_multiselect %]
+       <th>[% LxERP.t8('Qty') %]</th>
+     [% ELSE %]
+       <th>&nbsp;</th>
+     [% END %]
+     <th>[% LxERP.t8('Number') %]</th>
+     <th>[% LxERP.t8('Part Classification') %]</th>
+     <th>[% LxERP.t8('Part Description') %]</th>
+     [% IF INSTANCE_CONF.get_show_longdescription_select_item %]
+       [% SET COLS = COLS + 1 %]
+       <th>[% LxERP.t8('Long Description') %]</th>
+     [% END %]
+     <th>[% LxERP.t8('Other Matches') %]</th>
+     <th class="right">[% LxERP.t8('Price') %]</th>
+     [% IF IS_PURCHASE %]
+       [% SET COLS = COLS + 1 %]
+       <th class="right">[% LxERP.t8('ROP') %]</th>
+     [% END %]
+     <th class="right">[% LxERP.t8('Qty') %]</th>
+     <th>[% LxERP.t8('Unit') %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH item = ITEM_LIST %]
+    <tr class="listrow[% loop.count % 2 %]">
+      [% IF MYCONFIG.item_multiselect %]
+        <td>[% L.input_tag('select_qty_' _ HTML.escape(item.id), '', size => 5) %]</td>
+      [% ELSE %]
+        <td><input name="select_item_id" type="radio" value="[% HTML.escape(item.id) %]"[% IF loop.first %] checked[% END %]></td>
+      [% END %]
+      <td>[% HTML.escape(item.partnumber) %]</td>
+      <td>[% HTML.escape(item.type_and_classific) %]</td>
+      <td>[% HTML.escape(item.description) %]</td>
+      [% IF INSTANCE_CONF.get_show_longdescription_select_item %]
+        <td>[% P.restricted_html(item.longdescription) %]</td>
+      [% END %]
+      <td>[% HTML.escape(item.matches).join('<br>') %]</td>
+      <td class="numeric">[% LxERP.format_amount(item.display_sellprice, 2) %]</td>
+      [% IF IS_PURCHASE %]
+        <td class="numeric">[% LxERP.format_amount(item.rop, '') %]</td>
+      [% END %]
+      <td class="numeric">[% LxERP.format_amount(item.onhand, '') %]</td>
+      <td>[% HTML.escape(item.unit) %]</td>
+    </tr>
+    [% END %]
+    </tbody>
+  </table>
+  <p>&nbsp;</p>
+  [% L.hidden_tag('select_item_mode', MODE) %]
+  [% L.hidden_tag('select_item_previous_form', PREVIOUS_FORM) %]
+  [% L.hidden_tag('action', 'item_selected') %]
+ </form>
+
+[% IF MYCONFIG.item_multiselect %]
+ <script type='text/javascript'>
+   var first_click = 1;;
+   [% FOREACH item = ITEM_LIST %]
+     [% SET THIS_ID = 'select_qty_' _ HTML.escape(item.id) %]
+     $('#[% THIS_ID %]').click(function(){
+       var qty = '1';
+       if (first_click) {
+         qty = '[% LxERP.format_amount(PRE_ENTERED_QTY, 5) %]';
+       }
+       first_click = 0;
+       if ($('#[% THIS_ID %]').attr('value') == '') {
+         $('#[% THIS_ID %]').attr('value', qty); $('#[% THIS_ID %]').select();
+       }
+     });
+   [% END %]
+ </script>
+[% END %]
diff --git a/templates/design40_webpages/ir/_payments.html b/templates/design40_webpages/ir/_payments.html
new file mode 100644
index 000000000..fa54704ce
--- /dev/null
+++ b/templates/design40_webpages/ir/_payments.html
@@ -0,0 +1,152 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+
+
+<table class="tbl-list wi-moderate">
+  <caption>
+      [% 'Payments' | $T8 %]
+  </caption>
+
+  <thead>
+    <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Memo' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th></th>
+      [% IF show_exchangerate %]
+      <th>[% 'Exch' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Account' | $T8 %]</th>
+    </tr>
+  </thead>
+
+
+
+  <tbody>
+  [% FOREACH i = paid_indices %]
+    [% SET changeable    = 'changeable_'    _ i %]
+    [% SET acc_trans_id  = 'acc_trans_id_'  _ i %]
+    [% SET p_gldate      = 'gldate_'        _ i %]
+    [% SET datepaid      = 'datepaid_'      _ i %]
+    [% SET source        = 'source_'        _ i %]
+    [% SET memo          = 'memo_'          _ i %]
+    [% SET paid          = 'paid_'          _ i %]
+    [% SET AP_paid       = 'AP_paid_'       _ i %]
+    [% SET selectAP_paid_ref = 'selectAP_paid_' _ i %]
+  <tr>
+
+    <td>
+      <input type=hidden name="acc_trans_id_[% i %]" value=[% $acc_trans_id %]>
+      <input type=hidden name="gldate_[% i %]" value=[% $p_gldate %]>
+      [% IF $changeable %]
+        [% IF $datepaid %]
+          [% L.date_tag('datepaid_'_ i, $datepaid) %]
+        [% ELSE %]
+          [% L.date_tag('datepaid_'_ i, today) %]
+        [% END %]
+      [% ELSE %]
+        <input type="hidden" name="datepaid_[% i %]" value="[% $datepaid %]">[% $datepaid %]
+      [% END %]
+    </td>
+    <td>
+      [% IF $changeable %]
+        <input type="text" name="source_[% i %]" size="11" value="[% $source %]">
+      [% ELSE %]
+       <input type="hidden" name="source_[% i %]" value="[% $source %]">[% $source %]
+      [% END %]
+    </td>
+    <td>
+      [% IF $changeable %]
+        <input type="text" name="memo_[% i %]" size="11" value="[% $memo %]">
+      [% ELSE %]
+        <input type="hidden" name="memo_[% i %]" value="[% $memo %]">[% $memo %]
+      [% END %]
+    </td>
+    <td>
+      [% IF $changeable %]
+        <input type="text" name="paid_[% i %]" size="11" value="[% LxERP.format_amount($paid, 2, 1) %]">
+      [% ELSE %]
+        <input type="hidden" name="paid_[% i %]" value="[% LxERP.format_amount($paid, 2, 1) %]">
+        [% LxERP.format_amount($paid, 2, 1) %]
+      [% END %]
+    </td>
+    <td>
+      [% IF $changeable && loop.last && paid_missing > 0 %]
+        <input type='button' id='is_set_to_paid_missing' value='[% 'Set to paid missing' | $T8 %]'>
+      [% END %]
+    </td>
+
+    [% IF show_exchangerate %]
+      <td class="numeric">
+        [% SET forex        = 'forex_'        _ i %]
+        [% SET exchangerate = 'exchangerate_' _ i %]
+        [% SET defaultcurrency_paid  = 'defaultcurrency_paid_' _ i %]
+        [% SET record_forex = 'record_forex_' _ i %]
+        [% IF $forex %]
+          <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
+          <input type="hidden" name="record_forex_[% i %]" value="[% $record_forex %]">
+          <input type="hidden" name="forex_[% i %]"        value="[% $forex %]">
+          <input type="hidden" name="defaultcurrency_paid_[% i %]"      value="[% $defaultcurrency_paid %]">
+          [% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
+          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+        [% ELSE %]
+          [% IF $changeable %]
+            <input type="text" name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
+          [% ELSE %]
+            <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
+            [% LxERP.format_amount($exchangerate, 5, 1) %]
+          [% END %]
+        [% END %]
+        <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
+      </td>
+    [% END %]
+
+    <td>
+      [% IF $changeable %]
+        <select name="AP_paid_[% i %]">[% $selectAP_paid_ref %]</select>
+      [% ELSE %]
+        <input type="hidden" name="AP_paid_[% i %]" value="[% $AP_paid %]">[% $AP_paid %]
+      [% END %]
+    </td>
+
+  </tr>
+  [% END # foreach %]
+  </tbody>
+
+  <tfoot>
+  <tr>
+    <td></td>
+    <td></td>
+    <td>[% 'Total' | $T8 %]</td>
+    <td>[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+    <td></td>
+    [% IF show_exchangerate %]
+      <td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+      <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+    [% END %]
+    <td colspan="2"></td>
+  </tr>
+[% UNLESS show_exchangerate %]
+  <tr>
+    <td></td>
+    <td></td>
+    <td>[% 'Missing amount' | $T8 %]</td>
+    <td>[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+    <td colspan="2"></td>
+  </tr>
+[% END %]
+  </tfoot>
+</table>
+
+<input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+<input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
+<input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
+<input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
+
+
+<script type='text/javascript'>
+  $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
+</script>
diff --git a/templates/design40_webpages/ir/form_footer.html b/templates/design40_webpages/ir/form_footer.html
new file mode 100644
index 000000000..99fe05a7c
--- /dev/null
+++ b/templates/design40_webpages/ir/form_footer.html
@@ -0,0 +1,83 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+
+<div class="list-total">
+
+<table class="tbl-list footer-only right">
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"> </colgroup>
+  <tfoot>
+    [% UNLESS taxincluded %]
+    <tr>
+      <th colspan="3"></th>
+      <th>[% 'Subtotal' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+    </tr>
+    [% END %][% # tax %]
+
+    [% FOREACH item = taxaccounts_array %]
+      [% SET description_ref = item _ '_description' %]
+      [% SET rate_ref        = item _ '_rate' %]
+      [% SET total_ref       = item _ '_total' %]
+      [% SET netto_ref       = item _ '_netto' %]
+      <tr>
+        <th colspan="3"></th>
+        <th>[% 'Including' | $T8 %] [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+        <td class="numeric">[% LxERP.format_amount($total_ref, 2) %]</td>
+      </tr>
+      [% IF taxincluded %]
+      <tr>
+        <th colspan="3"></th>
+        <th>[% 'Net amount' | $T8 %]</th>
+        <td class="numeric">[% LxERP.format_amount($netto_ref, 2) %]</td>
+      </tr>
+      [% END %]
+    [% END %]
+
+    <tr>
+      [% IF show_weight %]
+        <th>[% 'Total weight' | $T8 %]</th>
+        <td class="numeric">[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]</td>
+        <th></th>
+      [% ELSE %]
+        <th colspan="3"></th>
+      [% END %]
+      <th>[% 'Total' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(invtotal, 2) %]</td>
+    </tr>
+  </tfoot>
+</table>
+
+[% IF taxaccounts %]
+<div class="after-item"><input name="taxincluded" type="checkbox"[% IF taxincluded %] checked[% END %]> [% 'Tax Included' | $T8 %]</div>
+[% END %]
+
+</div><!-- /.list-total -->
+</div><!-- /.list-table-with-separate-total-table -->
+
+
+
+[% PROCESS 'ir/_payments.html' %]
+
+</div>
+
+[% PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+  [% LxERP.t8("Loading...") %]
+</div>
+</div>
+
+
+
+<p>[% print_options %]</p>
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
+<input type="hidden" name="vendor_discount" value="[% vendor_discount %]">
+
+</form>
diff --git a/templates/design40_webpages/ir/form_header.html b/templates/design40_webpages/ir/form_header.html
new file mode 100644
index 000000000..a5cb24573
--- /dev/null
+++ b/templates/design40_webpages/ir/form_header.html
@@ -0,0 +1,312 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
+
+[% SET follow_up_trans_info = invnumber _ ' (' _ vendor_obj.name _ ')' %]
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+
+<form id='form' method="post" name="invoice" action="[% script %]">
+
+<p>[% saved_message %]</p>
+
+[% FOREACH key = HIDDENS %]
+[% L.hidden_tag(key, $key) %]
+[% END %]
+<input type="hidden" name="follow_up_trans_id_1" value="[% id %]">
+<input type="hidden" name="follow_up_trans_type_1" value="purchase_invoice">
+<input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+<input type="hidden" name="follow_up_rowcount" value="1">
+<input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
+[% INCLUDE 'common/flash.html' %]
+[% INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="ir_tabs" class="tabwidget">
+
+<ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF email_attachment_id || workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
+  [% IF INSTANCE_CONF.get_webdav %]
+    <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+  [% END %]
+  [% IF id %]
+    [% IF INSTANCE_CONF.get_doc_storage %]
+      <li><a href="#ui-tabs-docs">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+    [% END %]
+    [% IF AUTH.assert('record_links', 1) %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=PurchaseInvoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+    <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
+  [% END %]
+</ul>
+
+[%- IF INSTANCE_CONF.get_doc_storage %]
+  <div id="ui-tabs-docs"></div>
+[%- END %]
+
+<div id="ui-tabs-basic-data">
+
+[% IF email_attachment_id || workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             email_attachment_id || workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+  [% INCLUDE 'generic/toggle_wrapper.html' %]
+
+  <table class="tbl-horizontal col">
+  <caption>[% 'Vendor & Transaction' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Vendor' | $T8 %]</th>
+      <td class="wi-wide">
+        [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", class="initial_focus", show_details="1") %]
+        [% P.hidden_tag("previous_vendor_id", vendor_id) %]
+      </td>
+    </tr>
+    [% IF ALL_CONTACTS.size %]
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% L.select_tag('cp_id', ALL_CONTACTS, default = cp_id, value_key = 'cp_id', title_key = 'full_name_dep', with_empty = 1, class='wi-wide') %]</td>
+    </tr>
+    [% END %]
+    [% IF business %]
+    <tr>
+      <th>[% 'Vendor type' | $T8 %]</th>
+      <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
+    </tr>
+    [% END %]
+    [% IF ALL_DEPARTMENTS.as_list.size %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% P.select_tag("department_id", ALL_DEPARTMENTS, with_empty=1, default=department_id, title_key="description", class="wi-wide") %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Credit Limit' | $T8 %]</th>
+      <td>
+        <span class="data wi-wide">
+          [% LxERP.format_amount(creditlimit, 0, '0') %]; [% 'Remaining' | $T8 %]
+          <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
+        </span>
+      </td>
+    </tr>
+    [% IF invoice_obj.sepa_exports.as_list.size %]
+    <tr>
+      <th>[% LxERP.t8("SEPA exports") %]</th>
+      <td>
+        [% FOREACH export = invoice_obj.sepa_exports.as_list %]
+          <a href="sepa.pl?action=bank_transfer_edit&vc=vendor&id=[% HTML.url(export.id) %]">[% HTML.escape(export.id) %]</a>
+          [% UNLESS loop.last %], [% END %] [% END %]
+        </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Record in' | $T8 %]</th>
+      <td>[% P.chart.picker("AP_chart_id", AP_chart_id, class="wi-wide", type="AP", "data-validate"="required") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Steuersatz' | $T8 %]</th>
+      <td>
+        [% L.select_tag('taxzone_id',
+                         ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) ,
+                         default = taxzone_id,
+                         title_key = 'description',
+                         disabled = (id ? 1 : 0),
+                         class='wi-wide',
+                         onchange = "kivi.io.update_taxzone()"
+        ) %]
+        [% IF id %]
+          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
+        [% END %]
+      </td>
+    </tr>
+    [% IF currencies %]
+      <tr>
+        <th>[% 'Currency' | $T8 %]</th>
+          <td class="wi-small">
+          [%- IF readonly  %]
+            [% HTML.escape(currency) %]
+            [% L.hidden_tag("currency", currency) %]
+          [%- ELSE %]
+            [% currencies %]
+          [%- END %]
+          </td>
+      </tr>
+    [% END %]
+    <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
+    <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+    [% IF show_exchangerate %]
+      <tr>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td class="wi-small">
+        [%- IF readonly  %]
+          [% LxERP.format_amount(exchangerate, 5) %]
+          [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+        [% ELSE %]
+          <input type="text" name="exchangerate" class="wi-small" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+        [% END %]
+        [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td class="wi-wide">[% L.input_tag("transaction_description", transaction_description, "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
+    </tr>
+  </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Payment / Delivery Options' | $T8 %]</caption>
+    <colgroup><col class="wi-wider"> </colgroup>
+    <tbody>
+      <tr>
+        <td>
+          <span class="label-above">[% 'Payment Terms' | $T8 %]</span>
+          [% L.select_tag('payment_id', payment_terms, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %]
+          <script type='text/javascript'>$('#payment_id').change(function(){ kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"); })</script>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <span class="label-above">[% 'Delivery Terms' | $T8 %]</span>
+          [% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default=delivery_term_id, with_empty=1, title_key='description', class='wi-wider') %]
+        </td>
+      </tr>
+      <tr>
+        <td>[% L.checkbox_tag('direct_debit', 'checked', direct_debit) %] <label for="direct_debit">[% 'direct debit' | $T8 %]</label></td>
+      </tr>
+      <tr>
+        <th class="caption">[% 'Notes' | $T8 %]</th>
+      </tr>
+      <tr>
+        <td class="wi-wider">[% L.textarea_tag("notes", notes, style="height:150px", class="texteditor wi-wider") %]</td>
+      </tr>
+      <tr>
+        <td>
+          <span class="label-above">[% 'Internal Notes' | $T8 %]</span>
+          [% L.textarea_tag("intnotes", intnotes, class="wi-wider") %]
+        </td>
+      </tr>
+      [% IF id && follow_ups.size %]
+      <tr>
+        <td>[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]</td>
+      </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Handling, Numbers & Dates' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Employee' | $T8 %]</th>
+        <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title_key = 'safe_name', class='wi-wide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Order Number' | $T8 %]</th>
+        <td><input type="text" class="wi-mediumsmall" name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
+      </tr>
+      [% IF is_type_credit_note %]
+      <tr>
+        <th>[% 'Credit Note Number' | $T8 %]</th>
+        <td><input type="text" class="wi-mediumsmall" name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
+      </tr>
+      [% ELSE %]
+      <tr>
+        <th>[% 'Invoice Number' | $T8 %]</th>
+        <td>[% L.input_tag('invnumber', invnumber, class='wi-mediumsmall') %]</td>
+      </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Project Number' | $T8 %]</th>
+        <td>[% P.project.picker('globalproject_id', globalproject_id, onchange="document.getElementById('update_button').click();", class='wi-mediumsmall') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Quotation Date' | $T8 %]</th>
+        <td>[% L.date_tag('quodate', quodate, class='wi-small') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Order Date' | $T8 %]</th>
+        <td>[% L.date_tag('orddate', orddate, class='wi-small') %]</td>
+      </tr>
+      [% IF is_type_credit_note %]
+        <tr>
+          <th>[% 'Credit Note Date' | $T8 %]</th>
+          <td>[% L.date_tag('invdate', invdate, class='wi-small') %]</td>
+        </tr>
+      [% ELSE %]
+        <tr>
+          <th>[% 'Invoice Date' | $T8 %]</th>
+          <td>[% L.date_tag('invdate', invdate, onChange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")', class='wi-small') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Due Date' | $T8 %]</th>
+          <td><span id="duedate_container"[% IF payment_terms_obj.auto_calculation %] style="display:none"[% END %] class="condensed">[% L.date_tag('duedate', duedate, class='wi-small') %]</span> <span id="duedate_fixed" [% IF !payment_terms_obj.auto_calculation %] style="display:none" [% END %]>[% HTML.escape(duedate) %]</span> </td>
+        </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Tax point' | $T8 %]</th>
+        <td>[% L.date_tag('tax_point', tax_point, id='tax_point', class='wi-small') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Delivery Date' | $T8 %]</th>
+        <td>[% L.date_tag('deliverydate', deliverydate, class='wi-small') %]</td>
+      </tr>
+
+
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+<script type="text/javascript" src="js/show_form_details.js"></script>
+<script type="text/javascript" src="js/show_history.js"></script>
+<script type="text/javascript"><!--
+  $('document').ready(function(){
+  [% IF creditwarning != '' %]
+    alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
+  [% END %]
+    kivi.File.doc_tab_init('ir_tabs', 'ui-tabs-docs', $('#id').val(), 'purchase_invoice');
+     });
+//--></script>
+
+<input type="hidden" name="webdav" value="[% webdav | html %]">
+
+<div class="list-table-with-separate-total-table">
diff --git a/templates/design40_webpages/ir/update_taxes.html b/templates/design40_webpages/ir/update_taxes.html
new file mode 100644
index 000000000..213ee1b6e
--- /dev/null
+++ b/templates/design40_webpages/ir/update_taxes.html
@@ -0,0 +1,4 @@
+[% USE L %][%- USE LxERP -%]
+[% FOR row = TAXES %]
+<option value='[% row.id %]'[% IF row.is_default %] selected[% END %]>[% row.taxkey _ " - " _ row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
+[% END %]
diff --git a/templates/design40_webpages/is/_payments.html b/templates/design40_webpages/is/_payments.html
new file mode 100644
index 000000000..48be85f54
--- /dev/null
+++ b/templates/design40_webpages/is/_payments.html
@@ -0,0 +1,142 @@
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+
+<table class="tbl-list">
+  <caption>
+    [% IF is_type_credit_note %]
+      [% 'Payments' | $T8 %]
+    [% ELSE %]
+      [% 'Incoming Payments' | $T8 %]
+    [% END %]
+  </caption>
+  <thead>
+  <tr>
+    <th>[% 'Date' | $T8 %]</th>
+    <th>[% 'Source' | $T8 %]</th>
+    <th>[% 'Memo' | $T8 %]</th>
+    <th>[% 'Amount' | $T8 %]</th>
+    <th></th>
+    [% IF show_exchangerate %]
+    <th>[% 'Exch' | $T8 %]</th>
+    [% END %]
+    <th>[% 'Account' | $T8 %]</th>
+  </tr>
+  </thead>
+  <tbody>
+    [% FOREACH i = paid_indices %]
+      [% SET changeable    = 'changeable_'    _ i %]
+      [% SET acc_trans_id  = 'acc_trans_id_'  _ i %]
+      [% SET p_gldate      = 'gldate_'        _ i %]
+      [% SET datepaid      = 'datepaid_'      _ i %]
+      [% SET source        = 'source_'        _ i %]
+      [% SET memo          = 'memo_'          _ i %]
+      [% SET paid          = 'paid_'          _ i %]
+      [% SET AR_paid       = 'AR_paid_'       _ i %]
+      [% SET selectAR_paid_ref = 'selectAR_paid_' _ i %]
+      <!-- PENDENT: anders lösen -->
+      <tr style='display:none'>
+        <td>
+          <input type=hidden name="acc_trans_id_[% i %]" value="[% $acc_trans_id %]">
+          <input type=hidden name="gldate_[% i %]" value="[% $p_gldate %]">
+        </td>
+      </tr>
+      <tr>
+        <td>
+          [% IF $changeable %]
+            [% IF $datepaid %]
+              [% L.date_tag('datepaid_'_ i, $datepaid) %]
+            [% ELSE %]
+              [% L.date_tag('datepaid_'_ i, today) %]
+            [% END %]
+          [% ELSE %]
+             <input type="hidden" name="datepaid_[% i %]" value="[% $datepaid %]"> [% $datepaid %]
+          [% END %]
+        </td>
+        <td>
+          [% IF $changeable %]
+            <input type="text" name="source_[% i %]" size="11" value="[% $source %]">
+          [% ELSE %]
+            <input type="hidden" name="source_[% i %]" value="[% $source %]">[% $source %]
+          [% END %]
+        </td>
+        <td>
+          [% IF $changeable %]
+            <input type="text" name="memo_[% i %]" size="11" value="[% $memo %]">
+          [% ELSE %]
+            <input type="hidden" name="memo_[% i %]" value="[% $memo %]">[% $memo %]
+          [% END %]
+        </td>
+        <td class="numeric">
+        [% IF $changeable %]
+          <input name="paid_[% i %]" size="11" data-validate="number" class="numeric" value="[% LxERP.format_amount($paid, 2, 1) %]">
+        [% ELSE %]
+          <input type="hidden" name="paid_[% i %]" value="[% LxERP.format_amount($paid, 2, 1) %]">
+          [% LxERP.format_amount($paid, 2, 1) %] [% defaultcurrency %]
+        [% END %]
+        </td>
+        <td>
+          [% IF $changeable && loop.last && paid_missing > 0 %]
+            <input type="button" id="is_set_to_paid_missing" value="[% 'Set to paid missing' | $T8 %]">
+          [% END %]
+        </td>
+        [% IF show_exchangerate %]
+          <td class="numeric">
+           [% SET forex        = 'forex_'        _ i %]
+           [% SET exchangerate = 'exchangerate_' _ i %]
+           [% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
+           [% SET record_forex = 'record_forex_' _ i %]
+           [% IF $forex %]
+             <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
+             [% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
+             [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+           [% ELSE %]
+             [% IF $changeable %]
+               <input type="text" name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
+             [% ELSE %]
+               <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
+               [% LxERP.format_amount($exchangerate, 5, 1) %]
+             [% END %]
+           [% END %]
+         <input type="hidden" name="forex_[% i %]" value="[% $forex %]">
+        </td>
+        [% END %]
+        <td>
+          [% IF $changeable %]
+            <select name="AR_paid_[% i %]">[% $selectAR_paid_ref %]</select>
+          [% ELSE %]
+            <input type="hidden" name="AR_paid_[% i %]" value="[% $AR_paid %]">[% $AR_paid %]
+          [% END %]
+        </td>
+      </tr>
+    [% END # foreach %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td colspan="2"></td>
+      <td class="right">[% 'Total' | $T8 %]</td>
+      <td align="numeric">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF show_exchangerate %]
+        <td align="numeric">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+      [% ELSE %]
+      [% END %]
+        <td></td>
+    </tr>
+    <tr>
+      <td colspan="2"></td>
+      <td class="right">[% 'Missing amount' | $T8 %]</td>
+      <td align="numeric">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
+      <td colspan="2">
+      </td>
+   </tr>
+  </tfoot>
+</table>
+<input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
+<input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
+<input type="hidden" name="oldinvtotal" value="[% oldinvtotal %]">
+<input type="hidden" name="oldtotalpaid" value="[% totalpaid %]">
+
+<script type='text/javascript'>
+  $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
+</script>
diff --git a/templates/design40_webpages/is/form_footer.html b/templates/design40_webpages/is/form_footer.html
new file mode 100644
index 000000000..d26e59a9a
--- /dev/null
+++ b/templates/design40_webpages/is/form_footer.html
@@ -0,0 +1,126 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<!--
+  Total-Lines of Invoice Items
+  Within the big colspan/rowspan cell there are weight information
+-->
+<table class="tbl-list footer-only full-width">
+  <colgroup>
+    <col style="width: 75%;">
+    <col style="width: 15%;">
+    <col style="width: 10%;">
+  </colgroup>
+  <tfoot>
+  [% UNLESS taxincluded %]
+  <tr>
+    <td>
+      [% IF show_weight %]
+        <div class="info-block"><!-- PENDENT: vereinheitlichen -->
+          <span class="info-label">[% 'Total weight' | $T8 %]</span>
+          <span class="info-value">[% LxERP.format_amount(totalweight) %] [% HTML.escape(weightunit) %]</span>
+        </div>
+      [% END %]
+    </td><!-- <td></td><td></td><td></td><td></td><td></td><td></td><td></td> -->
+    <th>[% 'Subtotal' | $T8 %]</th>
+    <td class="numeric">[% LxERP.format_amount(invsubtotal, 2) %]</td>
+  </tr>
+  [% END %]
+
+  [%# tax %]
+  [% FOREACH item = taxaccounts_array %]
+    [% SET description_ref = item _ '_description' %]
+    [% SET rate_ref        = item _ '_rate' %]
+    [% SET total_ref       = item _ '_total' %]
+    [% SET netto_ref       = item _ '_netto' %]
+    <tr>
+      <td></td>
+      <th>[% 'Including' | $T8 %] [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
+      <td class="numeric">[% LxERP.format_amount($total_ref, 2) %]</td>
+    </tr>
+    [% IF taxincluded %]
+      <tr>
+        <td></td>
+        <th>[% 'Net amount' | $T8 %]</th>
+        <td class="numeric">[% LxERP.format_amount($netto_ref, 2) %]</td>
+      </tr>
+    [% END %]
+  [% END %]
+  [% IF rounding %]
+    <tr>
+    <td></td>
+      <th>[% 'Rounding' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(rounding, 2) %]</td>
+    </tr>
+  [% END %]
+  <tr>
+    <td></td>
+    <th>[% 'Total' | $T8 %]</th>
+    <td class="numeric">[% LxERP.format_amount(invtotal, 2) %]</td>
+  </tr>
+  <tr>
+    <td></td>
+    <th>[% 'Ertrag' | $T8 %]</th>
+    <td class="numeric">
+      [% LxERP.format_amount(marge_total, 2, 0) %]
+      <input type=hidden name="marge_total" value="[% marge_total %]" class="numeric">
+    </td>
+  </tr>
+  <tr>
+    <td></td>
+    <th>[% 'Ertrag prozentual' | $T8 %]</th>
+    <td class="numeric">
+      [% LxERP.format_amount(marge_percent, 2, 0) %] %
+      <input type=hidden name="marge_percent" value="[% marge_percent %]" class="numeric">
+    </td>
+  </tr>
+  </tfoot>
+</table>
+
+[% IF id && follow_ups.size %]
+  <div class="message message_hint">
+      [% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size, follow_ups_unfinished) | html %]
+  </div>
+[% END %]
+
+[% IF is_type_normal_invoice OR  is_type_credit_note %]
+  [% PROCESS 'is/_payments.html' %]
+[% END %]
+
+</div><!--  /.ui-tabs-panel /#ui-tabs-basic-data -->
+
+[% PROCESS 'webdav/_list.html' %]
+
+<div id="ui-tabs-1" class="ui-tabs-panel" style="display:none">
+  <div class="wrapper">
+    [% LxERP.t8('Loading...') %]
+  </div>
+</div><!-- /#ui-tabs-1 -->
+
+</div>
+
+<input type="hidden" name="rowcount" value="[% rowcount %]">
+<input type="hidden" name="callback" value="[% callback | html %]">
+[% P.hidden_tag('draft_id', draft_id) %]
+[% P.hidden_tag('draft_description', draft_description) %]
+<input type="hidden" name="customer_discount" value="[% customer_discount %]">
+<input type="hidden" name="gldate" value="[% gldate %]">
+
+[%- IF INSTANCE_CONF.get_create_qrbill_invoices <= 0 %]
+ <input type="hidden" name="qrbill_without_amount" value="[% qrbill_without_amount %]">
+[%- END %]
+
+<div id="shipto_inputs" class="hidden">[% PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]</div>
+<div id="email_inputs" style="display: none"></div>
+<div id="print_options" style="display: none">[% print_options %]</div>
+
+</form>
+<script type='text/javascript'>
+  $(kivi.SalesPurchase.init_on_submit_checks);
+</script>
+
+<div id="shipto_dialog" class="hidden"></div>
+<div id="print_dialog" class="hidden"><form action="#" name="fake-print-dialog" id="fake-print-dialog">[% PROCESS 'common/_print_dialog.html' %]</form></div>
diff --git a/templates/design40_webpages/is/form_header.html b/templates/design40_webpages/is/form_header.html
new file mode 100644
index 000000000..14d778591
--- /dev/null
+++ b/templates/design40_webpages/is/form_header.html
@@ -0,0 +1,455 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% SET follow_up_trans_info = invnumber _ ' (' _ customer_obj.name _ ')' %]
+<script type="text/javascript" src="js/common.js"></script>
+<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
+<script type="text/javascript" src="js/calculate_qty.js"></script>
+<script type="text/javascript" src="js/follow_up.js"></script>
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %] [% invnumber %]
+</h1>
+
+<form method="post" id='form' name="invoice" action="[% script %]">
+
+[% FOREACH key = HIDDENS %]
+  <input type="hidden" name="[% HTML.escape(key) %]" id="[% HTML.escape(key) %]" value="[% HTML.escape($key)  %]">
+[% END %]
+<input type="hidden" name="follow_up_trans_id_1" id="follow_up_trans_id_1" value="[% id %]">
+<input type="hidden" name="follow_up_trans_type_1" id="follow_up_trans_type_1" value="sales_invoice">
+<input type="hidden" name="follow_up_trans_info_1" id="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
+<input type="hidden" name="follow_up_rowcount" id="follow_up_rowcount" value="1">
+<input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
+<input type="hidden" name="already_printed_flag" id="already_printed_flag" value="0">
+<input type="hidden" name="has_qr_reference" id="has_qr_reference" value="[% has_qr_reference %]">
+[%- IF qr_reference %]
+[%   L.hidden_tag("qr_reference", qr_reference) %]
+[%- END %]
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
+[% IF saved_message != '' %]<p>[% saved_message %]</p>[% END %]
+
+[% INCLUDE 'common/flash.html' %]
+[% INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="is_tabs" class="tabwidget">
+  <ul class="ui-tabs-nav">
+    <li><a href="#ui-tabs-basic-data" class="ui-tabs">[% 'Basic Data' | $T8 %]</a></li>
+    [% IF email_attachment_id || workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+    [% END %]
+    [% IF INSTANCE_CONF.get_webdav %]
+      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+    [% END %]
+    [% IF id %]
+      [% IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% type %]&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
+        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% type %]&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
+      [% END %]
+      [% IF AUTH.assert('record_links', 1) %]
+        <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+      [% END %]
+      [% IF AUTH.assert('invoice_edit', 1) %]
+        <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
+      [% END %]
+    [% END %]
+  </ul>
+
+
+<div id="ui-tabs-basic-data" class="ui-tabs-panel">
+
+[% IF email_attachment_id || workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             email_attachment_id || workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+  [% INCLUDE 'generic/toggle_wrapper.html' %]
+  <table class="tbl-horizontal">
+    <caption>[% 'Customer &amp; Order' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+    <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td><!-- PENDENT: Type sollte text und nicht customer sein. Ueberall bei customer_vendor.picker aendern, auf allen Seiten -->
+        [% P.customer_vendor.picker("customer_id", customer_id, type="customer", class="wi-wide initial_focus",
+             show_details="1") %]
+        [% L.hidden_tag("previous_customer_id", customer_id) %]
+        [% L.hidden_tag("customer_pricegroup_id", customer_pricegroup_id) %]
+      </td>
+    </tr>
+    [% IF ALL_CONTACTS.size %]
+      <tr>
+        <th>[% 'Contact Person' | $T8 %]</th>
+        <td>
+          [% L.select_tag('cp_id', ALL_CONTACTS, default = cp_id, value_key = 'cp_id', title_key = 'full_name_dep', with_empty = 1, class="wi-wide") %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Shipping Address' | $T8 %]</th>
+      <td>
+       [% IF ALL_SHIPTO.size %]
+        [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+           L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', class="wi-wide") %]
+       [% END %]
+       [% L.button_tag("kivi.SalesPurchase.edit_custom_shipto()", LxERP.t8("Custom shipto"), class="wi-wide neutral below") %]
+      </td>
+    </tr>
+    [% IF customer_obj.additional_billing_addresses.as_list.size %]
+    <tr>
+      <th>[% 'Custom Billing Address' | $T8 %]</th>
+      <td>
+        [% L.select_tag('billing_address_id', customer_obj.additional_billing_addresses,
+                        with_empty=1, default=billing_address_id, value_key='id', title_key='displayable_id', class="wi-wide") %]
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Credit Limit' | $T8 %]</th>
+      <td>
+        <span class="data wi-wide">[% LxERP.format_amount(creditlimit, 0, '0') %], [% 'Remaining' | $T8 %] <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span> </span>
+      </td>
+    </tr>
+    [% IF max_dunning_level || dunning_description  %]
+      <tr>
+        <th>[% LxERP.t8("Dunning status") %]</th>
+        <td>
+         [% IF dunning_description %]
+           <span class="dunned_invoice data wi-wide">[% LxERP.t8("This invoice's dunning level: #1", dunning_description) %]</span>
+           [% IF max_dunning_level %]<br>[% END %]
+         [% END %]
+         [% IF max_dunning_level %]
+           <span class="customer_dunning_level data wi-wide">
+             [% LxERP.t8("Customer's current maximum dunning level: #1", max_dunning_level) %]<br>
+             [% LxERP.t8("Dunned open amount: #1", LxERP.format_amount(dunning_amount, 2)) %]
+          </span>
+         [% END %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF invoice_obj.sepa_exports.as_list.size %]
+      <tr>
+        <th>[% LxERP.t8("SEPA exports") %]</th>
+        <td>
+         [% FOREACH export = invoice_obj.sepa_exports.as_list %]
+           <a href="sepa.pl?action=bank_transfer_edit&vc=customer&id=[% HTML.url(export.id) %]">[% HTML.escape(export.id) %]</a>
+           [% UNLESS loop.last %], [% END %]
+         [% END %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF business %]
+      <tr>
+        <th>[% 'Customer type' | $T8 %]</th>
+        <td><span class="data wi-wide">[% business %] ([% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %]%)</span></td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Record in' | $T8 %]</th>
+      <td>[% P.chart.picker("AR_chart_id", AR_chart_id, class="wi-wide", type="AR", "data-validate"="required") %]</td>
+    </tr>
+    [% IF currencies %]
+      <tr>
+        <th>[% 'Currency' | $T8 %]</th>
+        <td>
+         [%- IF readonly  %]
+           [% HTML.escape(currency) %]
+           [% L.hidden_tag("currency", currency) %]
+         [%- ELSE %]
+           [% currencies %]
+         [%- END %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF show_exchangerate %]
+      <tr>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td>
+          [%- IF readonly  %]
+            [% LxERP.format_amount(exchangerate, 5) %]
+            [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+          [% ELSE %]
+            <input type="text" name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+          [% END %]
+          [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Steuersatz' | $T8 %]</th>
+      <td>
+        [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) , default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), class='wi-wide', onchange = "document.getElementById('update_button').click();") %]
+        [% IF id %]
+          <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
+        [% END %]
+      </td>
+    </tr>
+    [% IF taxaccounts %]
+      <tr>
+        <th>[% 'Tax Included' | $T8 %]</th>
+        <td>
+          <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
+          <input name="taxincluded" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" type="checkbox" [% IF taxincluded %]checked[% END %]>
+        </td>
+      </tr>
+    [% END %]
+    [% IF ALL_LANGUAGES %]
+      <tr>
+        <th>[% 'Language' | $T8 %]</th>
+        <td>
+          [% L.select_tag('language_id', ALL_LANGUAGES, default = language_id, title_key = 'description', with_empty = 1, style = 'width:250px') %]
+        </td>
+      </tr>
+    [% END %]
+    [% IF ALL_DEPARTMENTS %]
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, class='wi-wide') %]</td>
+      </tr>
+    [% END %]
+    <tr style='display:none'>
+      <td>
+        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
+        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+        <input type="hidden" name="rndgain_accno" value="[% rndgain_accno %]">
+        <input type="hidden" name="rndloss_accno" value="[% rndloss_accno %]">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Shipping Point' | $T8 %]</th>
+      <td><input type="text" class="wi-wide" name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
+    </tr>
+    <tr>
+      <th>[% 'Ship via' | $T8 %]</th>
+      <td><input type="text" class="wi-wide" name="shipvia" value="[% HTML.escape(shipvia) %]"></td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", transaction_description, class="wi-wide", "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
+    </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Payment / Delivery Options' | $T8 %]</caption>
+    <colgroup> <col class="wi-wide"> </colgroup>
+    <tbody>
+    <tr>
+      <th class="single-col">
+        <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+        [% L.select_tag('payment_id', payment_terms, default = payment_id, title_key = 'description', with_empty = 1, class="wi-wide") %]
+        <script type='text/javascript'>$('#payment_id').change(function(){ kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"); })</script>
+      </th>
+    </tr>
+    <tr>
+      <th class="single-col">
+        <span class="label above">[% 'Delivery Terms' | $T8 %]</span>
+        [% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', class="wi-wide") %]
+      </th>
+    </tr>
+    <tr>
+      <th>[% L.checkbox_tag('direct_debit', 'checked', direct_debit, label=LxERP.t8('direct debit')) %]</th>
+    </tr>
+    [%- IF INSTANCE_CONF.get_create_qrbill_invoices > 0 %]
+    <tr>
+      <th>[% L.checkbox_tag('qrbill_without_amount', 'checked', qrbill_without_amount, label=LxERP.t8('QR bill without amount')) %]</th>
+    </tr>
+    <tr>
+      <th>[% 'QR bill unstructured message' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% L.input_tag('qr_unstructured_message', qr_unstructured_message, class="wi-wide") %]</th>
+    </tr>
+    [%- END %]
+    <tr>
+      <th class="caption">[% 'Notes (will appear on hard copy)' | $T8 %]</th>
+    </tr>
+    <tr>
+      <td class="wi-wide">
+        [% L.textarea_tag("notes", notes, class="wi-wide texteditor") %]
+      </td>
+    </tr>
+     <tr>
+      <th>
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag("intnotes", intnotes, class="wi-wide") %]
+      </th>
+    </tr>
+  </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Numbers & Dates' | $T8 %]</caption>
+    <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-small"> </colgroup>
+    <tbody>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td colspan="2">
+        [% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title_key = 'safe_name', class="wi-lightwide") %]
+      </td>
+    </tr>
+    [% IF ALL_SALESMEN.size %]
+      <tr>
+        <th>[% 'Salesman' | $T8 %]</th>
+        <td colspan="2">
+          [% L.select_tag('salesman_id', ALL_SALESMEN, default = (salesman_id ? salesman_id : employee_id), title_key = 'safe_name', class="wi-lightwide") %]
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>&nbsp;</th>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Number' | $T8 %]</th>
+    </tr>
+    [% IF is_type_credit_note %]
+      <tr>
+        <th>[% 'Credit Note' | $T8 %]</th>
+        <!-- <th>[% 'Credit Note Number' | $T8 %]</th> -->
+        <td>[% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")', class='wi-date') %]</td>
+        <td>
+          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+            [% L.input_tag("invnumber", invnumber, size="11", class="wi-small") %]
+          [%- ELSIF id %]
+            [% L.hidden_tag("invnumber", invnumber) %]
+            [% HTML.escape(invnumber) %]
+          [%- ELSE %]
+            [% LxERP.t8("will be set upon posting") %]
+          [%- END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Invoice' | $T8 %]</th>
+        <td>&nbsp;</td>
+        <td><input type="text" name="invnumber_for_credit_note" id="invnumber_for_credit_note" value="[% HTML.escape(invnumber_for_credit_note) %]"  class="wi-small"></td>
+      </tr>
+      <tr>
+      </tr>
+    [% ELSE %]
+      <tr>
+        <th>[% 'Invoice' | $T8 %]</th>
+        <td>[% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")', class='wi-date') %]</td>
+        <td>
+          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+            [% L.input_tag("invnumber", invnumber, size="11", class="wi-small") %]
+          [%- ELSIF id %]
+            [% L.hidden_tag("invnumber", invnumber) %]
+            [% HTML.escape(invnumber) %]
+          [%- ELSE %]
+            [% LxERP.t8("will be set upon posting") %]
+          [%- END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Due Date' | $T8 %]</th>
+        <td>
+        <span class="condensed" id="duedate_container"[% IF payment_terms_obj.auto_calculation %] style="display:none"[% END %]>[% L.date_tag('duedate', duedate, class='wi-date') %]</span>
+        <span class="condensed" id="duedate_fixed"[% IF !payment_terms_obj.auto_calculation %] style="display:none"[% END %]>[% HTML.escape(duedate, class='wi-date') %]</span>
+        </td>
+        <td></td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Tax point' | $T8 %]</th>
+      <td>[% L.date_tag('tax_point', tax_point, id='tax_point', class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order' | $T8 %]</th>
+      <td>[% L.date_tag('orddate', orddate, class='wi-date') %]</td>
+      <td><input type="text" name="ordnumber" id="ordnumber" value="[% HTML.escape(ordnumber) %]" class="wi-small"></td>
+    </tr>
+    <tr>
+    </tr>
+    <tr>
+      <th>[% 'Quotation' | $T8 %]</th>
+      <td>[% L.date_tag('quodate', quodate, class='wi-date') %]</td>
+      <td><input type="text" name="quonumber" id="quonumber" value="[% HTML.escape(quonumber) %]" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Date' | $T8 %]</th>
+      <td>[% L.date_tag('deliverydate', deliverydate, class='wi-date') %]</td>
+      <td></td>
+    </tr>
+    [% UNLESS is_type_credit_note %]
+      <tr>
+        <th>[% 'Delivery Order Number' | $T8 %]</th>
+        <td></td>
+        <td><input type="text" name="donumber" id="donumber" value="[% HTML.escape(donumber) %]" class="wi-small"></td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Customer Order Number' | $T8 %]</th>
+      <td></td>
+      <td><input type="text" name="cusordnumber" id="cusordnumber" value="[% HTML.escape(cusordnumber) %]" class="wi-small"></td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td></td>
+      <td>[% L.select_tag('globalproject_id', ALL_PROJECTS, title_key = 'projectnumber', default = globalproject_id, with_empty = '1', onChange = "document.getElementById('update_button').click();", class="wi-small") %]</td>
+    </tr>
+    [%- IF has_qr_reference %]
+    <tr>
+      <th>[% 'QR reference' | $T8 %]</th>
+      <td>
+        [%- IF qr_reference %]
+          [% HTML.escape(qr_reference_formatted) %]
+        [%- ELSE %]
+          [% LxERP.t8("will be set upon posting") %]
+        [%- END %]
+      </td>
+    </tr>
+    [%- END %]
+    </tbody>
+  </table>
+
+  </div> <!-- /.wrapper -->
+
+<input type="hidden" name="webdav" value="[% webdav %]">
+
+<script type="text/javascript" src="js/show_form_details.js"></script>
+<script type="text/javascript" src="js/show_history.js"></script>
+[% IF (resubmit && is_format_html) || resubmit || creditwarning != '' %]
+  <script type="text/javascript"><!--
+    $('document').ready(function(){
+      [% IF resubmit && is_format_html %]
+        window.open('about:blank','Beleg');
+        document.invoice.target = 'Beleg';
+        kivi.SalesPurchase.show_print_dialog();
+        kivi.SalesPurchase.print_record();
+      [% ELSIF resubmit %]
+        if ($('#already_printed_flag').val() === "0") {
+          kivi.SalesPurchase.show_print_dialog();
+          kivi.SalesPurchase.print_record();
+          $('#already_printed_flag').val("1");
+        }
+      [% ELSIF creditwarning != '' %]
+        alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
+      [% ELSE %]
+      [% END %]
+     });
+  //--></script>
+[% END %]
diff --git a/templates/design40_webpages/js_tests/run.html b/templates/design40_webpages/js_tests/run.html
new file mode 100644
index 000000000..0e3ce8a66
--- /dev/null
+++ b/templates/design40_webpages/js_tests/run.html
@@ -0,0 +1,34 @@
+[% USE LxERP %]
+[% USE L %]
+
+<h1>JS-Tests</h1>
+
+<div class="wrapper">
+
+<div>
+ <p>
+  [% LxERP.t8("Only run tests from this file:") %]
+  [% opts = [ [ '', LxERP.t8("– all available test files –") ] ];
+     opts = opts.import(SELF.all_scripts);
+     L.select_tag('file_filter', opts, default=FORM.file_filter) %]
+  [% L.button_tag('run_tests_from();', LxERP.t8('Run tests'), id='run_js_tests_button') %]
+ </p>
+</div>
+
+</div><!-- /.wrapper -->
+
+<script type="text/javascript">
+  function run_tests_from() {
+    window.location.href = "controller.pl?action=JSTests/run&file_filter=" + encodeURIComponent($('#file_filter').val());
+    return false;
+  };
+
+  $('#file_filter').change(run_tests_from);
+</script>
+
+<div id="qunit"></div>
+<div id="qunit-fixture"></div>
+<script src="js/qunit.js"></script>
+[% FOREACH script = SELF.scripts_to_run %]
+  <script src="[% script %]"></script>
+[% END %]
diff --git a/templates/design40_webpages/layout/javascript_setup.js b/templates/design40_webpages/layout/javascript_setup.js
new file mode 100644
index 000000000..f941059c1
--- /dev/null
+++ b/templates/design40_webpages/layout/javascript_setup.js
@@ -0,0 +1,38 @@
+[% USE LxERP %]
+[% USE JavaScript %]
+[% USE JSON %]
+kivi.myconfig = [% JSON.json(MYCONFIG) %];
+$(function() {
+  $.datepicker.setDefaults(
+    $.extend({}, $.datepicker.regional[kivi.myconfig.countrycode], {
+      dateFormat: kivi.myconfig.dateformat.replace(/d+/gi, 'dd').replace(/m+/gi, 'mm').replace(/y+/gi, 'yy'),
+      showOn: "button",
+      showButtonPanel: true,
+      changeMonth: true,
+      changeYear: true,
+      buttonImage: "image/calendar.png",
+      buttonImageOnly: true
+  }));
+
+  kivi.setup_formats({
+    numbers: kivi.myconfig.numberformat,
+    dates:   kivi.myconfig.dateformat,
+    times:   kivi.myconfig.timeformat
+  });
+
+  kivi.reinit_widgets();
+
+[% IF ajax_spinner %]
+  $(document).ajaxSend(function() {
+    $('#ajax-spinner').show();
+  }).ajaxStop(function() {
+    $('#ajax-spinner').hide();
+  });
+[% END %]
+});
+
+[% IF focus %]
+function fokus() {
+  $('[% focus %]').focus();
+}
+[% END %]
diff --git a/templates/design40_webpages/letter/edit.html b/templates/design40_webpages/letter/edit.html
new file mode 100644
index 000000000..78488b02d
--- /dev/null
+++ b/templates/design40_webpages/letter/edit.html
@@ -0,0 +1,137 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+[% SET WEBDAV = SELF.webdav_objects %]
+
+<h1>[% title | html %]</h1>
+
+<form action='controller.pl' method='POST' id='form'>
+<input type="hidden" name="letter.id" value="[% letter.id | html %]">
+<input type="hidden" name="draft.id" value="[% draft.id | html %]">
+<input type="hidden" name="type" value="[% FORM.type | html %]">
+[% L.hidden_tag('is_sales', SELF.is_sales) %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<div id="oe_tabs" class="tabwidget">
+  <ul>
+    <li><a href="#ui-tabs-letter">[% LxERP.t8("Letter") %]</a></li>
+    [% IF letter.id %]
+      [% IF INSTANCE_CONF.get_webdav %]
+        <li><a href="#ui-tabs-webdav">[% LxERP.t8('WebDAV') %]</a></li>
+      [% END %]
+      [%- IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(letter.id) %]">[% 'Documents' | $T8 %]</a></li>
+      [%- END %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Letter&object_id=[% HTML.url(letter.id) %]">[% LxERP.t8("Linked Records") %]</a></li>
+    [% END %]
+  </ul>
+
+<div id="ui-tabs-letter">
+
+<div class="wrapper">
+
+  <table class="tbl-horizontal col">
+    <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      [% IF SELF.is_sales %]
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td class="wi-wider">[% P.customer_vendor.picker('letter.customer_id', letter.customer_id, type='customer', class='wi-wider') %]</td>
+      </tr>
+      [% ELSE %]
+      <tr>
+        <th>[% 'Vendor' | $T8 %]</th>
+        <td class="wi-wider">[% P.customer_vendor.picker('letter.vendor_id', letter.vendor_id, type='vendor', class='wi-wider') %]</td>
+      </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Contact Person' | $T8 %]</th>
+        <td class="wi-wider">[% L.select_tag('letter.cp_id', letter.customer_vendor_id ? letter.customer_vendor.contacts : [], value_key='cp_id', title_key='full_name', default=letter.cp_id, class='wi-wider') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <tbody>
+      <tr>
+        <th>[% 'Your Reference' | $T8 %]</th>
+        <td><input type="text" name='letter.reference' value='[% letter.reference | html %]' class="wi-small">
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Letternumber' | $T8 %]:</th>
+        <td><input type="text" name='letter.letternumber' value='[% letter.letternumber | html %]' class="wi-small">
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <tbody>
+      <tr>
+        <th>[% 'Employee' | $T8 %]</th>
+        <td>[% L.select_tag('letter.employee_id', employees, default=letter.employee_id, title_key='safe_name', class='wi-wide', allow_empty=1,) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Salesman' | $T8 %]</th>
+        <td>[% L.select_tag('letter.salesman_id', employees, default=letter.salesman_id, title_key='safe_name', class='wi-wide', allow_empty=1,) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div><!-- /.wrapper -->
+
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <colgroup> <col class="wi-small"><col class="wi-wider"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <td>[% L.date_tag('letter.date_as_date', letter.date_as_date, readonly=readonly, class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Subject' | $T8 %]</th>
+      <td><textarea name='letter.subject' rows="1" class="wi-wider">[% letter.subject | html %]</textarea></td>
+    </tr>
+    <tr>
+      <th>[% 'Greeting' | $T8 %]</th>
+      <td><input type="text" name='letter.greeting' value="[% letter.greeting | html %]" class="wi-wider"> </td>
+    </tr>
+    <tr>
+      <th>[% 'Body' | $T8 %]</th>
+      <td class="wi-wider">[% L.textarea_tag('letter.body_as_restricted_html', letter.body_as_restricted_html, rows=20, class='texteditor wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Internal Notes' | $T8 %]</th>
+      <td><textarea name='letter.intnotes' rows="4" class="wi-wider">[% letter.intnotes | html %]</textarea></td>
+    </tr>
+  </tbody>
+</table>
+
+<div id="email_inputs" class="hidden"></div>
+<div id="print_options" class="hidden">[% print_options %]</div>
+
+</div><!-- /.wrapper -->
+
+</div><!-- /.ui-tabs-letter -->
+
+[% PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+  <div class="wrapper">
+  [% LxERP.t8("Loading...") %]
+  </div>
+</div>
+
+</div><!-- /.tabwidget -->
+
+</form>
+
+<div id="print_dialog" class="hidden">
+  [% PROCESS 'common/_print_dialog.html' %]
+</div>
diff --git a/templates/design40_webpages/letter/load_drafts.html b/templates/design40_webpages/letter/load_drafts.html
new file mode 100644
index 000000000..97beb3619
--- /dev/null
+++ b/templates/design40_webpages/letter/load_drafts.html
@@ -0,0 +1,43 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+
+<h1>[% 'Load letter draft' | $T8 %]</h1>
+
+ <form method="post" name="Form" action="controller.pl" id="form">
+  [% L.hidden_tag('is_sales', SELF.is_sales) %]
+  <p>[% 'The following drafts have been saved and can be loaded.' | $T8 %]</p>
+  <table width="100%">
+    </td>
+   </tr>
+   <tr>
+    <td>
+     <table>
+      <tr>
+       <th>&nbsp;</th>
+       <th>[% 'Date' | $T8 %]</th>
+       <th>[% 'Subject' | $T8 %]</th>
+[% IF SELF.is_sales %]
+       <th>[% 'Customer' | $T8 %]</th>
+[% ELSE %]
+       <th>[% 'Vendor' | $T8 %]</th>
+[% END %]
+      </tr>
+
+      [% FOREACH row = LETTER_DRAFTS %]
+       <tr class="listrow[% loop.count % 2 %]">
+        <td>[% L.checkbox_tag("ids[+]", value=row.id) %]</td>
+        <td>[% row.date.to_kivitendo | html %]</td>
+        <td><a href="[% SELF.url_for(action='edit', 'draft.id'=row.id) %]">[% row.subject | html %]</a></td>
+[% IF SELF.is_sales %]
+        <td>[% row.customer.displayable_name | html %]</td>
+[% ELSE %]
+        <td>[% row.vendor.displayable_name | html %]</td>
+[% END %]
+       </tr>
+      [% END %]
+     </table>
+    </td>
+   </tr>
+  </table>
+ </form>
diff --git a/templates/design40_webpages/letter/report_bottom.html b/templates/design40_webpages/letter/report_bottom.html
new file mode 100644
index 000000000..8fe983430
--- /dev/null
+++ b/templates/design40_webpages/letter/report_bottom.html
@@ -0,0 +1,13 @@
+[% USE HTML%]
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+
+[% L.paginate_controls(models=SELF.models) %]
+</div><!-- /.wrapper -->
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+[% FOREACH item = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(item.key) %]" value="[% HTML.escape(item.value) %]">
+[% END %]
+
+</form>
diff --git a/templates/design40_webpages/letter/report_top.html b/templates/design40_webpages/letter/report_top.html
new file mode 100644
index 000000000..8551edc64
--- /dev/null
+++ b/templates/design40_webpages/letter/report_top.html
@@ -0,0 +1,2 @@
+[% PROCESS 'letter/search.html' filter=SELF.models.filtered.laundered %]
+<div class="wrapper">
diff --git a/templates/design40_webpages/letter/search.html b/templates/design40_webpages/letter/search.html
new file mode 100644
index 000000000..583ef33c3
--- /dev/null
+++ b/templates/design40_webpages/letter/search.html
@@ -0,0 +1,59 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+<form action="controller.pl" method="post" name="Form" id="search_form">
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id='filter_table' class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Letternumber' | $T8 %]</th>
+      <td>[% L.input_tag('filter.letternumber:substr::ilike', filter.letternumber_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    [% IF SELF.is_sales %]
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td class="wi-lightwide">[% P.customer_vendor.picker('filter.customer_id', filter.customer_id, type='customer') %]</td>
+      </tr>
+    [% ELSE %]
+      <tr>
+        <th>[% 'Vendor' | $T8 %]</th>
+        <td class="wi-lightwide">[% P.customer_vendor.picker('filter.vendor_id', filter.vendor_id, type='vendor') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Contact' | $T8 %]</th>
+      <td>[% L.input_tag('filter.contact.cp_name:substr::ilike', filter.contact.cp_name_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Subject' | $T8 %]</th>
+      <td>[% L.input_tag('filter.subject:substr::ilike', filter.subject_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Body' | $T8 %]</th>
+      <td>[% L.input_tag('filter.body:substr::ilike', filter.body_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Date' | $T8 %]</th>
+      <td>[% L.date_tag('filter.date:date::ge', filter.date_date__ge, class='wi-date') %] [% 'To (time)' | $T8 %] [% L.date_tag('filter.date:date::le', filter.date_date__le, class='wi-date') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+[% L.hidden_tag('is_sales', SELF.is_sales) %]
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+<div class="buttons">
+  [% L.button_tag("\$('#search_form').resetForm()", LxERP.t8("Reset"), class='neutral') %]
+</div>
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div>
+</form>
diff --git a/templates/design40_webpages/liquidity_projection/_filter.html b/templates/design40_webpages/liquidity_projection/_filter.html
new file mode 100644
index 000000000..4bb91551d
--- /dev/null
+++ b/templates/design40_webpages/liquidity_projection/_filter.html
@@ -0,0 +1,28 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]  
+<div class="wrapper">
+
+<form method="post" action="controller.pl" id="filter_form">
+  <table class="tbl-horizontal">
+  <caption>[% 'Filter' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Number of months") %]</th>
+      <td>[% L.input_tag("params.months", FORM.params.months, class="initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Break down by") %]</th>
+      <td> 
+        [% L.checkbox_tag("params.type",           value=1, checked=FORM.params.type,           label=LxERP.t8("Basis of calculation")) %] <br>
+        [% L.checkbox_tag("params.salesman",       value=1, checked=FORM.params.salesman,       label=LxERP.t8("Salesman")) %] <br>
+        [% L.checkbox_tag("params.buchungsgruppe", value=1, checked=FORM.params.buchungsgruppe, label=LxERP.t8("Booking group")) %]<br>
+        [% L.checkbox_tag("params.parts_group",    value=1, checked=FORM.params.parts_group,    label=LxERP.t8("Partsgroup")) %]
+      </td>
+    </tr>
+  </tbody>
+  </table>
+</form>
+
+</div><!-- /.wrapper -->
+
diff --git a/templates/design40_webpages/liquidity_projection/_result.html b/templates/design40_webpages/liquidity_projection/_result.html
new file mode 100644
index 000000000..af14d8755
--- /dev/null
+++ b/templates/design40_webpages/liquidity_projection/_result.html
@@ -0,0 +1,87 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% SET name_col = FORM.params.salesman || FORM.params.buchungsgruppe || FROM.params.parts_group || FORM.params.type %]
+
+<table class="tbl-list wi-moderate">
+  <caption>[% 'Result' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("Type") %]</th>
+      [% IF name_col %]
+        <th>[% LxERP.t8("Name") %]</th>
+      [% END %]
+      [% FOREACH month = SELF.liquidity.sorted.month %]
+        <th>[% IF month == 'old' %][% LxERP.t8("old") %][% ELSIF month == 'future' %][% LxERP.t8("prospective") %][% ELSE %][% HTML.escape(month) %][% END %]</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% IF FORM.params.type %] [% FOREACH type = SELF.liquidity.sorted.type %]
+    <tr>
+      <td>[% IF loop.first %][% LxERP.t8("Basis of calculation") %][% END %]</td>
+      <td>[% IF type == 'order' %][% LxERP.t8("Sales Orders") %] [% ELSIF type == 'partial' %][% LxERP.t8("Partial invoices") %] [% ELSE %][% LxERP.t8("Periodic Invoices") %] [% END %] </td>
+      [% FOREACH month = SELF.liquidity.sorted.month %]
+      <td class="numeric">[% LxERP.format_amount(SELF.liquidity.$type.$month, 2) %]</td>
+      [% END %]
+    </tr>
+    [% END %]
+    [% END %]
+
+     [% IF FORM.params.salesman %]
+      [% FOREACH salesman = SELF.liquidity.sorted.salesman %]
+       <tr>
+        <td>[% IF loop.first %][% LxERP.t8("Salesman") %][% END %]</td>
+        <td>[% HTML.escape(salesman) %]</td>
+
+        [% FOREACH month = SELF.liquidity.sorted.month %]
+         <td class="numeric">[% LxERP.format_amount(SELF.liquidity.salesman.$salesman.$month, 2) %]</td>
+        [% END %]
+       </tr>
+      [% END %]
+     [% END %]
+
+     [% IF FORM.params.buchungsgruppe %]
+      [% FOREACH buchungsgruppe = SELF.liquidity.sorted.buchungsgruppe %]
+       <tr>
+        <td>[% IF loop.first %][% LxERP.t8("Booking group") %][% END %]</td>
+        <td>[% HTML.escape(buchungsgruppe) %]</td>
+
+        [% FOREACH month = SELF.liquidity.sorted.month %]
+         <td class="numeric">[% LxERP.format_amount(SELF.liquidity.buchungsgruppe.$buchungsgruppe.$month, 2) %]</td>
+        [% END %]
+       </tr>
+      [% END %]
+     [% END %]
+
+     [% IF FORM.params.parts_group %]
+      [% FOREACH parts_group = SELF.liquidity.sorted.parts_group %]
+       <tr>
+        <td>[% IF loop.first %][% LxERP.t8("Partsgroup") %][% END %]</td>
+        <td>[% HTML.escape(parts_group) || LxERP.t8('no partsgroup') %]</td>
+
+        [% FOREACH month = SELF.liquidity.sorted.month %]
+         <td class="numeric">[% LxERP.format_amount(SELF.liquidity.parts_group.$parts_group.$month, 2) %]</td>
+        [% END %]
+       </tr>
+      [% END %]
+     [% END %]
+  </tbody>
+<tfoot>
+  <tr class="listrow listtotal">
+    <td>[% LxERP.t8("Total") %]</td>
+    [% IF name_col %]<td></td>[% END %]
+    [% FOREACH month = SELF.liquidity.sorted.month %]
+      <td class="numeric">
+        [% IF SELF.liquidity.total.$month > 0 %]
+          <a href="[% HTML.escape(SELF.link_to_old_orders(reqdate=month, months=params.months)) %]">
+        [% END %]
+        [% LxERP.format_amount(SELF.liquidity.total.$month, 2) %]
+        [% IF SELF.liquidity.total.$month > 0 %]
+          </a>
+        [% END %]
+      </td>
+   [% END %]
+  </tr>
+</tfoot>
+</table>
diff --git a/templates/design40_webpages/liquidity_projection/list_orders.html b/templates/design40_webpages/liquidity_projection/list_orders.html
new file mode 100644
index 000000000..130bd4b40
--- /dev/null
+++ b/templates/design40_webpages/liquidity_projection/list_orders.html
@@ -0,0 +1,43 @@
+[%- USE LxERP -%][%- USE HTML -%][%- USE P -%]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[% IF !ORDERS.size %]
+  <p>[% LxERP.t8("There are no orders for the selected time period.") %]</p>
+
+[% ELSE %]
+
+  <table class="tbl-list">
+    <thead>
+      <tr class="listheading">
+        <th class="right">[% LxERP.t8("Date") %]</th>
+        <th class="right">[% LxERP.t8("Delivery Date") %]</th>
+        <th class="right">[% LxERP.t8("Order") %]</th>
+        <th class="right">[% LxERP.t8("Customer Order Number") %]</th>
+        <th>[% LxERP.t8("Customer") %]</th>
+        <th class="right">[% LxERP.t8("Total") %]</th>
+        <th class="right">[% LxERP.t8("Net amount") %]</th>
+        <th>[% LxERP.t8("Employee") %]</th>
+        <th>[% LxERP.t8("Transaction description") %]</th>
+        <th>[% LxERP.t8("Recurring") %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      [% FOREACH order = ORDERS %]
+        <tr>
+          <td class="date">[% HTML.escape(order.transdate.to_kivitendo) %]</td>
+          <td class="date">[% HTML.escape(order.reqdate.to_kivitendo) %]</td>
+          <td class="numeric">[% P.order.sales_order(order) %]</td>
+          <td class="numeric">[% HTML.escape(order.cusordnumber) %]</td>
+          <td>[% P.customer_vendor.customer(order.customer) %]</td>
+          <td class="numeric">[% HTML.escape(LxERP.format_amount(order.amount,    2)) %]</td>
+          <td class="numeric">[% HTML.escape(LxERP.format_amount(order.netamount, 2)) %]</td>
+          <td>[% HTML.escape(order.employee.safe_name) %]</td>
+          <td>[% HTML.escape(order.transaction_description) %]</td>
+          <td>[% IF order.is_recurring %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+[% END %]
diff --git a/templates/design40_webpages/liquidity_projection/show.html b/templates/design40_webpages/liquidity_projection/show.html
new file mode 100644
index 000000000..9627921ab
--- /dev/null
+++ b/templates/design40_webpages/liquidity_projection/show.html
@@ -0,0 +1,15 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+<body>
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[% PROCESS 'liquidity_projection/_filter.html' %]
+
+[% IF SELF.liquidity %]
+  [% PROCESS 'liquidity_projection/_result.html' %]
+[% END %]
+
+</body>
+</html>
diff --git a/templates/design40_webpages/list_transactions/report_settings.html b/templates/design40_webpages/list_transactions/report_settings.html
new file mode 100644
index 000000000..0fe782d00
--- /dev/null
+++ b/templates/design40_webpages/list_transactions/report_settings.html
@@ -0,0 +1,40 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% title | html %]</h1>
+
+<form name="Form" method="post" action="controller.pl" id="report_settings">
+
+  [% L.hidden_tag("action", "ListTransactions/report_settings") %]
+
+  <div class="wrapper">
+    <h3>[% "Account" | $T8 %]</h3>
+    [% P.chart.picker('chart_id', defaults.chart_id) %]
+
+    <h3>[% "Period" | $T8 %]</h3>
+    [% P.date_period.picker('dateperiod', defaults.dateperiod_from_date,
+                                          defaults.dateperiod_to_date,
+                                          dialog_defaults => defaults.dialog) %]
+
+    <h3>[% "Options" | $T8 %]</h3>
+    <div class="wi-lightwide">[% L.checkbox_tag('show_subtotals', checked => defaults.show_subtotals,
+                                              label => LxERP.t8('Show subtotals')) %]</div>
+
+    <h3>[% "Sort by" | $T8 %]</h3>
+    <div class="wi-normal">[% P.radio_button_tag('sort', value => 'transdate',
+                                                  checked => defaults.sort == 'transdate',
+                                                  label => LxERP.t8('Date')) %]</div>
+    <div class="wi-normal">[% P.radio_button_tag('sort', value => 'reference',
+                                                  checked => defaults.sort == 'reference',
+                                                  label => LxERP.t8('Reference')) %]</div>
+    <div class="wi-normal">[% P.radio_button_tag('sort', value => 'description',
+                                                  checked => defaults.sort == 'description',
+                                                  label => LxERP.t8('Description')) %]</div>
+  </div>
+
+</form>
\ No newline at end of file
diff --git a/templates/design40_webpages/login/company_logo.html b/templates/design40_webpages/login/company_logo.html
new file mode 100644
index 000000000..69dce9c2c
--- /dev/null
+++ b/templates/design40_webpages/login/company_logo.html
@@ -0,0 +1,56 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<div class="logged-in">
+  <noscript>
+  [% INCLUDE 'generic/information.html'
+     title_information = LxERP.t8('Your browser does not currently support Javascript.'),
+     label_information = LxERP.t8('A lot of the usability of kivitendo has been enhanced with javascript. Although it is currently possible to use every aspect of kivitendo without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
+  %]
+  </noscript>
+[%- INCLUDE 'common/flash.html' %]
+  <div class="col" style="width:270px">
+    <a class="nomobile" href="http://www.kivitendo.de" target="_blank" title="[% 'kivitendo Homepage' | $T8 %] ([% 'Open in new window' | $T8 %])">
+    <img src="image/kivitendo[% xmas %].png" class="kivitendo-logo" alt="[% 'kivitendo' | $T8 %]"></a>
+  </div>
+  <div class="col">
+    <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>
+
+    [% IF git_head %]
+      <p>[% LxERP.t8("Git revision: #1, #2 #3", git_head.hash.substr(0, 7), git_head.author_date.to_kivitendo, git_head.author_date.strftime('%H:%M:%S %Z')) %]</p>
+    [% END %]
+
+    <table class="tbl-horizontal">
+      <tbody>
+        <tr>
+          <th>[% 'companylogo_subtitle' | $T8 %]</th>
+          <td><b>[% HTML.escape(defaults.company) %]<br></b>[% HTML.escape(defaults.address).replace('\\\\n', '<br>').replace('\n', '<br>') %]</td>
+        </tr>
+        <tr>
+          <th><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'User' | $T8 %]</a></th>
+          <td>[% HTML.escape(MYCONFIG.name) %]</td>
+        </tr>
+        <tr>
+          <th>[% IF AUTH.assert('admin', 'may_fail') %]
+            <a href="controller.pl?action=ClientConfig/edit" title="[% 'Client Configuration' | $T8 %]">[% END %][% 'Client' | $T8 %][% IF AUTH.assert('admin', 'may_fail') %]</a>[% END %]</th>
+          <td>[% HTML.escape(client.name) %]</td>
+        </tr>
+        <tr>
+          <th><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'Language' | $T8 %]</a></th>
+          <td>[% HTML.escape(MYCONFIG.countrycode) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Webserver interface' | $T8 %]</th>
+          <td>[% HTML.escape(interface) %]</td>
+        </tr>
+        <tr class="nomobile">
+          <th>[% 'kivitendo Homepage' | $T8 %]:</th>
+          <td><a href="http://kivitendo.de" target="_blank" title="[% 'kivitendo Homepage' | $T8 %] ,[% 'Open in new window' | $T8 %]">http://kivitendo.de</a></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+[% todo_list %]
diff --git a/templates/design40_webpages/login_screen/auth_db_needs_update.html b/templates/design40_webpages/login_screen/auth_db_needs_update.html
new file mode 100644
index 000000000..fd1bfb2c4
--- /dev/null
+++ b/templates/design40_webpages/login_screen/auth_db_needs_update.html
@@ -0,0 +1,27 @@
+[% USE LxERP %]
+
+<div class="wrapper">
+
+  <p><b>[% LxERP.t8('Error!') %]</b></p>
+
+  <p>
+    [% LxERP.t8('kivitendo needs to update the authentication database before you can proceed.') %]
+    [% LxERP.t8('Please log in to the administration panel.') %]
+    [% LxERP.t8('kivitendo will then update the database automatically.') %]
+  </p>
+
+  <hr>
+
+  <p>
+    [% LxERP.t8('For further information read this: ') %] <a href="doc/html/index.html" target="_blank">kivitendo Installation</a><br>
+    [% LxERP.t8('Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ') %] <a href="doc/kivitendo-Dokumentation.pdf" target="_blank">kivitendo-Dokumentation.pdf</a>
+  </p>
+
+  <hr>
+
+  <p>
+    <a href="controller.pl?action=LoginScreen/user_login" target="_top">[% LxERP.t8('Login') %]</a> |
+    <a href="controller.pl?action=Admin/login" target="_top">[% LxERP.t8('Administration') %]</a>
+  </p>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/login_screen/auth_db_unreachable.html b/templates/design40_webpages/login_screen/auth_db_unreachable.html
new file mode 100644
index 000000000..ce10130a5
--- /dev/null
+++ b/templates/design40_webpages/login_screen/auth_db_unreachable.html
@@ -0,0 +1,25 @@
+[% USE T8 %]
+
+<div class="wrapper">
+
+  <p><b>[% 'Error!' | $T8 %]</b></p>
+
+  <p>[% 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' | $T8 %]</p>
+
+  <p>[% 'If you want to set up the authentication database yourself then log in to the administration panel. kivitendo will then create the database and tables for you.' | $T8 %]</p>
+
+  <hr>
+
+  <p>
+    [% 'For further information read this: ' | $T8 %] <a href="doc/html/index.html" target="_blank">kivitendo Installation</a><br>
+    [% 'Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ' | $T8 %] <a href="doc/kivitendo-Dokumentation.pdf" target="_blank">kivitendo-Dokumentation.pdf</a>
+  </p>
+
+  <hr>
+
+  <p>
+    <a href="controller.pl?action=LoginScreen/user_login" target="_top">[% 'Login' | $T8 %]</a> |
+    <a href="controller.pl?action=Admin/login" target="_top">[% 'Administration' | $T8 %]</a>
+  </p>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/login_screen/basic_tables_missing.html b/templates/design40_webpages/login_screen/basic_tables_missing.html
new file mode 100644
index 000000000..582621c2e
--- /dev/null
+++ b/templates/design40_webpages/login_screen/basic_tables_missing.html
@@ -0,0 +1,28 @@
+[% USE LxERP %]
+
+<div class="wrapper">
+
+  <p><b>[% LxERP.t8('Error!') %]</b></p>
+
+  <p>
+    [% LxERP.t8('The basic client tables have not been created for this client\'s database yet.') %]
+    [% LxERP.t8('Please log in to the administration panel.') %]
+    [% LxERP.t8('Then go to the database administration and chose "create database".') %]
+    [% LxERP.t8('There you can let kivitendo create the basic tables for you, even in an already existing database.') %]
+  </p>
+
+  <hr>
+
+  <p>
+    [% LxERP.t8('For further information read this: ') %] <a href="doc/html/index.html" target="_blank">kivitendo Installation</a><br>
+    [% LxERP.t8('Or download the whole Installation Documentation as PDF (350kB) for off-line study (currently in German Language): ') %] <a href="doc/kivitendo-Dokumentation.pdf" target="_blank">kivitendo-Dokumentation.pdf</a>
+  </p>
+
+  <hr>
+
+  <p>
+    <a href="controller.pl?action=LoginScreen/user_login" target="_top">[% LxERP.t8('Login') %]</a> |
+    <a href="controller.pl?action=Admin/login" target="_top">[% LxERP.t8('Administration') %]</a>
+  </p>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/login_screen/old_configuration_files.html b/templates/design40_webpages/login_screen/old_configuration_files.html
new file mode 100644
index 000000000..8b8c9d0d1
--- /dev/null
+++ b/templates/design40_webpages/login_screen/old_configuration_files.html
@@ -0,0 +1,33 @@
+[% USE LxERP %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+  <p>
+    [% LxERP.t8('Starting with version 2.6.3 the configuration files in "config" have been consolidated.') %]
+    [% LxERP.t8('The following old files whose settings have to be merged manually into the new configuration file "config/kivitendo.conf" still exist:') %]
+  </p>
+
+  <ul>
+    [% FOREACH file = FILES %]
+    <li><code>config/[%- HTML.escape(file) %]</code></li>
+    [% END %]
+  </ul>
+
+  <p>
+    [% LxERP.t8('Due to security concerns these files have to be deleted or moved after the migration before you can continue using kivitendo.') %]
+  </p>
+  <p>
+    [% LxERP.t8('You can find information on the migration in the upgrade chapter of the documentation.') %]
+  </p>
+  <p>
+    [% LxERP.t8('Which is located at doc/kivitendo-Dokumentation.pdf. Click here: ') %] <a href ="doc/kivitendo-Dokumentation.pdf">doc/kivitendo-Dokumentation.pdf</a>
+  </p>
+
+  <p>
+    <a href="controller.pl?action=LoginScreen/user_login">[% LxERP.t8('Back to login') %]</a>
+  </p>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/login_screen/user_login.html b/templates/design40_webpages/login_screen/user_login.html
new file mode 100644
index 000000000..03a2ea45e
--- /dev/null
+++ b/templates/design40_webpages/login_screen/user_login.html
@@ -0,0 +1,90 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% SET auth_client = '{AUTH}client' %]
+[% SET auth_login  = '{AUTH}login'  %]
+
+
+<h1>[% LxERP.t8('kivitendo v#1', version) %]</h1>
+<div id="login-elements">
+<div class="logo">
+  <a href="http://www.kivitendo.de" target="_top" class="no-underlined-links"><img src="image/kivitendo.png" class='kivitendo-logo'></a>
+</div>
+
+[% IF error %]
+  <div class="message message_error">[% HTML.escape(error) %]</div>
+[% END %]
+[% IF warning %]
+  <div class="message message_hint">[% HTML.escape(warning) %]</div>
+[% END %]
+[% IF info %]
+  <div class="message message_ok">[% HTML.escape(info) %]</div>
+[% END %]
+
+<div class="separate-form">
+
+  [% IF SELF.clients.size %]
+  <form method="post" name="loginscreen" action="controller.pl" target="_top">
+    <input type="hidden" name="show_dbupdate_warning" value="1">
+    [% L.hidden_tag("callback", callback) %]
+
+    <table class="tbl-horizontal login">
+      <caption>[% 'User login' | $T8 %]</caption>
+      <colgroup><col class="wi-small"><col class="wi-normal"></colgroup>
+      <tbody>
+        <tr>
+          <th>[% 'Login Name' | $T8 %]</th>
+          <td>[% L.input_tag('{AUTH}login', FORM.$auth_login, id='auth_login', class='initial_focus wi-normal') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Password' | $T8 %]</th>
+          <td>[% L.input_tag('{AUTH}password', '', type='password', class='wi-normal') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Client' | $T8 %]</th>
+          <td>[% L.select_tag('{AUTH}client_id', SELF.clients, title_key='name', default=SELF.default_client_id, class='wi-normal') %]</td>
+        </tr>
+        <tr>
+          <th>&nbsp;</th>
+          <td>
+            <input type="hidden" name="action" value="LoginScreen/login">
+            <input type="submit" value="[% 'Login' | $T8 %]">
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </form>
+</div><!-- /.separate-form -->
+
+[% ELSE %]
+  <p>
+    [% LxERP.t8("No clients have been created yet.") %]
+    [% LxERP.t8("Please do so in the administration area.") %]
+  </p>
+  <p><a href="controller.pl?action=Admin/login">[% LxERP.t8("Administration area") %]</a></p>
+[% END %]
+
+<div>
+  <p>
+    <a href="controller.pl?action=Admin/login" target="_top">[% LxERP.t8('Administration area') %]</a>
+    &nbsp;|&nbsp;
+    [%- LxERP.t8('Documentation') %]
+    <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[% LxERP.t8('PDF') %]</a>
+    /
+    <a href="doc/html/index.html" target="_top">[%- LxERP.t8('HTML') %]</a>
+  </p>
+</div>
+
+</div>
+
+
+[% IF FORM.$auth_client %]
+<script type='text/javascript'>
+$(function() {
+  $('[name="{AUTH}client_id"] option').filter(function() {
+     return ($(this).text() === '[% FORM.$auth_client %]');
+  }).prop('selected', true);
+});
+</script>
+[% END %]
diff --git a/templates/design40_webpages/mass_delivery_order_print/_filter.html b/templates/design40_webpages/mass_delivery_order_print/_filter.html
new file mode 100644
index 000000000..07220e123
--- /dev/null
+++ b/templates/design40_webpages/mass_delivery_order_print/_filter.html
@@ -0,0 +1,42 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+[% BLOCK filter_toggle_panel %]
+  <table id="filter_table" class="tbl-horizontal">
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+      <th>[% LxERP.t8('Customer') %]</th>
+      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
+      </tr>
+      <tr>
+      <th>[% LxERP.t8('Shipping address (name)') %]</th>
+      <td>[% L.input_tag('filter.shipto.shiptoname:substr::ilike', filter.shipto.shiptoname_substr__ilike, size = 20) %]</td>
+      </tr>
+      <tr>
+      <th>[% LxERP.t8('Delivery Date') %] [% LxERP.t8('From Date') %]</th>
+      <td>[% L.date_tag('filter.reqdate:date::ge', filter.reqdate_date__ge) %]</td>
+      </tr>
+      <tr>
+      <th>[% LxERP.t8('Delivery Date') %] [% LxERP.t8('To Date') %]</th>
+      <td>[% L.date_tag('filter.reqdate:date::le', filter.reqdate_date__le) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+   [% L.hidden_tag('action', 'ODMassPrint/dispatch') %]
+   [% L.hidden_tag('sort_by', FORM.sort_by) %]
+   [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+   [% L.hidden_tag('page', FORM.page) %]
+   [% L.submit_tag(LIST_ACTION, LxERP.t8('Continue'))%]
+   <div class="buttons">
+    [% L.button_tag('$("#search_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+  </div>
+[% END %]
+
+<form action="controller.pl" method="post" id="search_form">
+  <div class="wrapper">
+    [% PROCESS common/toggle_panel.html display_status = 'open' %]
+  </div>
+</form>
diff --git a/templates/design40_webpages/mass_delivery_order_print/_print_status.html b/templates/design40_webpages/mass_delivery_order_print/_print_status.html
new file mode 100644
index 000000000..5865877ba
--- /dev/null
+++ b/templates/design40_webpages/mass_delivery_order_print/_print_status.html
@@ -0,0 +1,106 @@
+[%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
+[% SET data = job.data_as_hash %]
+<h2>[% LxERP.t8("Watch status") %]</h2>
+
+[% L.hidden_tag('', job.id, id="mdo_job_id") %]
+
+<p>
+ [% LxERP.t8("This status output will be refreshed every five seconds.") %]
+</p>
+
+<p>
+ [% IF data.status < 2 %]
+  [% L.link("login.pl?action=company_logo", LxERP.t8("Open new tab"), target="_blank") %]
+
+ [% ELSE %]
+ [% IF data.pdf_file_name %]
+   [% L.link(SELF.url_for(action="mass_mdo_download", job_id=job.id), LxERP.t8("Download PDF")) %]
+ [% END %]
+ [% L.link("#", LxERP.t8("Close window"), onclick="kivi.MassDeliveryOrderPrint.massConversionFinishProcess();") %]
+[% END %]
+</p>
+
+<p>
+ <table>
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Current status:") %]</th>
+   <td valign="top">
+    [% IF !data.status %]
+     [% LxERP.t8("waiting for job to be started") %]
+    [% ELSIF data.status == 1 %]
+     [% LxERP.t8("Creating Documents") %]
+    [% ELSIF data.status == 2 %]
+     [% LxERP.t8("Printing Documents") %]
+    [% ELSE %]
+     [% LxERP.t8("Done.") %]
+     [% IF data.pdf_file_name %]
+      [% LxERP.t8("The file is available for download.") %]
+     [% ELSIF data.printer_id %]
+      [% LxERP.t8("The file has been sent to the printer.") %]
+     [% END %]
+    [% END %]
+   </td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Number of delivery orders created:") %]</th>
+   <td valign="top">[% IF data.status > 0 %][% HTML.escape(data.num_created) %] / [% HTML.escape(data.record_ids.size) %][% ELSE %]–[% END %]</td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Number of delivery orders printed:") %]</th>
+   <td valign="top">[% IF data.status > 1 %][% HTML.escape(data.num_printed) %] / [% HTML.escape(data.record_ids.size) %][% ELSE %]–[% END %]</td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Errors during conversion:") %]</th>
+   <td valign="top">
+[% IF !data.status %]
+  –
+[% ELSIF !data.conversion_errors.size %]
+ [% LxERP.t8("No errors have occurred.") %]
+[% ELSE %]
+    <table>
+     <tr class="listheader">
+      <th>[% LxERP.t8("Delivery Order") %]</th>
+      <th>[% LxERP.t8("Error") %]</th>
+     </tr>
+
+ [% FOREACH error = data.conversion_errors %]
+     <tr>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% HTML.escape(error.message) %]</td>
+     </tr>
+ [% END %]
+    </table>
+[% END %]
+   </td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Errors during printing:") %]</th>
+   <td valign="top">
+[% IF data.status < 2 %]
+ –
+[% ELSIF !data.print_errors.size %]
+ [% LxERP.t8("No errors have occurred.") %]
+[% ELSE %]
+    <table>
+     <tr class="listheader">
+      <th>[% LxERP.t8("Invoice") %]</th>
+      <th>[% LxERP.t8("Error") %]</th>
+     </tr>
+
+ [% FOREACH error = data.print_errors %]
+     <tr>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='is.pl', action='edit', type='sales_invoice',id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% HTML.escape(error.message) %]</td>
+     </tr>
+ [% END %]
+    </table>
+[% END %]
+   </td>
+  </tr>
+
+ </table>
+</p>
diff --git a/templates/design40_webpages/mass_delivery_order_print/list_delivery_orders.html b/templates/design40_webpages/mass_delivery_order_print/list_delivery_orders.html
new file mode 100644
index 000000000..3fbc9c825
--- /dev/null
+++ b/templates/design40_webpages/mass_delivery_order_print/list_delivery_orders.html
@@ -0,0 +1,74 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE "common/flash.html" %]
+
+[% LIST_ACTION     = 'action_list_delivery_orders' %]
+[% PROCESS 'mass_delivery_order_print/_filter.html' filter=SELF.filter %]
+
+[% IF nowshow==1 %]
+[% delivery_orders = SELF.delivery_order_models.get;
+   MODELS          = SELF.delivery_order_models %]
+[% IF !delivery_orders.size %]
+ <p>
+  [% LxERP.t8("There are currently no delivery orders, or none matches your filter conditions.") %]
+ </p>
+[% ELSE %]
+
+ <form method="post" action="controller.pl">
+  <table width="100%">
+   <thead>
+    <tr>
+     <th>[% L.checkbox_tag("", id="check_all", checkall="[data-checkall=1]") %]</th>
+     <th>[% L.sortable_table_header("transdate") %]</th>
+     <th>[% L.sortable_table_header("reqdate") %]</th>
+     <th>[% L.sortable_table_header("donumber") %]</th>
+     <th>[% L.sortable_table_header("ordnumber") %]</th>
+     <th>[% L.sortable_table_header("customer") %]</th>
+     <th>[% LxERP.t8("Shipto") %]</th>
+    </tr>
+   </thead>
+
+   <tbody>
+    [% FOREACH delivery_order = delivery_orders %]
+     [% delivery_order_id = delivery_order.id
+        sales_order       = delivery_order.sales_order %]
+     <tr class="listrow">
+      <td>[% L.checkbox_tag('id[]', value=delivery_order.id, "data-checkall"=1, checked=selected_ids.$delivery_order_id) %]</td>
+      <td>[% HTML.escape(delivery_order.transdate_as_date) %]</td>
+      <td>[% HTML.escape(delivery_order.reqdate_as_date) %]</td>
+      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]</td>
+      <td>[% HTML.escape(delivery_order.ordnumber) %]</td>
+      <td>[% HTML.escape(delivery_order.customer.name) %]</td>
+      <td>[% HTML.escape(SELF.make_shipto_title(delivery_order.shipto || delivery_order.custom_shipto)) %]</td>
+     </tr>
+    [% END %]
+   </tbody>
+  </table>
+
+  [% IF !SELF.delivery_order_ids.size %]
+   [% L.paginate_controls %]
+  [% END %]
+
+  <hr size="3" noshade>
+
+  <p>[% print_opt %]</p>
+  [% IF SELF.printers.size %]
+   <p>
+    [% LxERP.t8("Print destination") %]:
+    [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+       CALL printers.import(SELF.printers);
+       L.select_tag("printer_id", printers, title_key="description", default=FORM.printer_id) %]
+   </p>
+  [% END %]
+
+  <p>
+   [% L.hidden_tag("action", "MassDeliveryOrderPrint/dispatch") %]
+   [% L.submit_tag("action_print", LxERP.t8("Print")) %]
+  </p>
+ </form>
+[% END %]
+[% END %]
diff --git a/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_status.html b/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
new file mode 100644
index 000000000..f101782c3
--- /dev/null
+++ b/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
@@ -0,0 +1,105 @@
+[%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
+[% SET data = job.data_as_hash %]
+<h2>[% LxERP.t8("Step 2 -- Watch status") %]</h2>
+
+[% L.hidden_tag('', job.id, id="cpa_job_id") %]
+
+<p>
+ [% LxERP.t8("This status output will be refreshed every five seconds.") %]
+</p>
+
+<p>
+ [% IF data.status < 3 %]
+  [% L.link("login.pl?action=company_logo", LxERP.t8("Open new tab"), target="_blank") %]
+
+ [% ELSE %]
+ [% IF data.pdf_file_name %]
+   [% L.link(SELF.url_for(action="create_print_all_download", job_id=job.id), LxERP.t8("Download PDF")) %]
+ [% END %]
+ [% L.link("#", LxERP.t8("Close window"), onclick="kivi.MassInvoiceCreatePrint.createPrintAllFinishProcess();") %]
+[% END %]
+</p>
+
+ <table>
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Current status:") %]</th>
+   <td valign="top">
+    [% IF !data.status %]
+     [% LxERP.t8("waiting for job to be started") %]
+    [% ELSIF data.status == 1 %]
+     [% LxERP.t8("Creating invoices") %]
+    [% ELSIF data.status == 2 %]
+     [% LxERP.t8("Printing invoices (this can take a while)") %]
+    [% ELSE %]
+     [% LxERP.t8("Done.") %]
+     [% IF data.pdf_file_name %]
+      [% LxERP.t8("The file is available for download.") %]
+     [% ELSIF data.printer_id %]
+      [% LxERP.t8("The file has been sent to the printer.") %]
+     [% END %]
+    [% END %]
+   </td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Number of invoices created:") %]</th>
+   <td valign="top">[% IF data.status > 0 %][% HTML.escape(data.num_created) %] / [% HTML.escape(data.record_ids.size) %][% ELSE %]–[% END %]</td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Number of invoices printed:") %]</th>
+   <td valign="top">[% IF data.status > 1 %][% HTML.escape(data.num_printed) %] / [% HTML.escape(data.invoice_ids.size) %][% ELSE %]–[% END %]</td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Errors during conversion:") %]</th>
+   <td valign="top">
+[% IF !data.status %]
+  –
+[% ELSIF !data.conversion_errors.size %]
+ [% LxERP.t8("No errors have occurred.") %]
+[% ELSE %]
+    <table>
+     <tr class="listheader">
+      <th>[% LxERP.t8("Delivery Order") %]</th>
+      <th>[% LxERP.t8("Error") %]</th>
+     </tr>
+
+ [% FOREACH error = data.conversion_errors %]
+     <tr>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% HTML.escape(error.message) %]</td>
+     </tr>
+ [% END %]
+    </table>
+[% END %]
+   </td>
+  </tr>
+
+  <tr>
+   <th valign="top" align="left">[% LxERP.t8("Errors during printing:") %]</th>
+   <td valign="top">
+[% IF data.status < 2 %]
+ –
+[% ELSIF !data.print_errors.size %]
+ [% LxERP.t8("No errors have occurred.") %]
+[% ELSE %]
+    <table>
+     <tr class="listheader">
+      <th>[% LxERP.t8("Invoice") %]</th>
+      <th>[% LxERP.t8("Error") %]</th>
+     </tr>
+
+ [% FOREACH error = data.print_errors %]
+     <tr>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='is.pl', action='edit', type='sales_invoice',id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% HTML.escape(error.message) %]</td>
+     </tr>
+ [% END %]
+    </table>
+[% END %]
+   </td>
+  </tr>
+
+ </table>
+
diff --git a/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_step_1.html b/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_step_1.html
new file mode 100644
index 000000000..6379fd623
--- /dev/null
+++ b/templates/design40_webpages/mass_invoice_create_print_from_do/_create_print_all_step_1.html
@@ -0,0 +1,40 @@
+[%- USE LxERP -%][%- USE L -%]
+[%- SET num_delivery_orders = SELF.sales_delivery_order_models.count %]
+<h2>[% LxERP.t8("Step 1 -- limit number of delivery orders to process") %]</h2>
+
+<p>
+ [% LxERP.t8("Currently #1 delivery orders can be converted into invoices and printed.", num_delivery_orders) %]
+ [% LxERP.t8("How many do you want to create and print?") %]
+</p>
+
+<table>
+ <tr>
+  <td>[% LxERP.t8("Number of invoices to create") %]:</td>
+  <td>[% L.input_tag('', num_delivery_orders, size="5", id="cpa_number_of_invoices") %]</td>
+ </tr>
+ <tr>
+  <td>[% LxERP.t8("Print both sided") %]:</td>
+  <td>[% L.checkbox_tag('', id="cpa_bothsided") %]</td>
+ </tr>
+ <tr>
+  <td>[% LxERP.t8("Print destination") %]:</td>
+  <td>
+    [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+       CALL printers.import(SELF.printers);
+       L.select_tag("", printers, title_key="description", default=SELF.default_printer_id, id="cpa_printer_id") %]
+  </td>
+ </tr>
+ <!--tr>
+  <td>[% LxERP.t8("Print destination (copy)") %]:</td>
+  <td>
+    [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+       CALL printers.import(SELF.printers);
+       L.select_tag("", printers, title_key="description", default=SELF.default_printer_id, id="cpa_printer_id") %]
+  </td>
+ </tr -->
+</table>
+
+<p>
+ [% L.button_tag("kivi.MassInvoiceCreatePrint.createPrintAllStartProcess();", LxERP.t8("Start process"), id="cpa_start_process_button") %]
+ [% L.link("#", LxERP.t8("Abort"), onclick="\$('#create_print_all_dialog').dialog('close');", id="cpa_start_process_abort_link", class="button neutral") %]
+</p>
diff --git a/templates/design40_webpages/mass_invoice_create_print_from_do/_filter.html b/templates/design40_webpages/mass_invoice_create_print_from_do/_filter.html
new file mode 100644
index 000000000..74e65731c
--- /dev/null
+++ b/templates/design40_webpages/mass_invoice_create_print_from_do/_filter.html
@@ -0,0 +1,48 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+[% BLOCK filter_toggle_panel %]
+  <table id="filter_table" class="tbl-horizontal">
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8('Customer') %]</th>
+        <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20, class='wi-lightwide' ) %]</td>
+      </tr>
+      <tr>
+        <th align="right">[% LxERP.t8('Customer type') %]</th>
+        <td>
+          [% L.select_tag('filter.customer.business_id', SELF.all_businesses,
+                      default    => filter.customer.business_id
+                      title_key  => 'description',
+                      value_key  => 'id',
+                      with_empty => 1,
+                      class      => 'wi-lightwide') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('From Date') %]</th>
+        <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge, class='wi-date' ) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8('Delivery Order Date') %] [% LxERP.t8('To Date') %]</th>
+        <td>[% L.date_tag('filter.transdate:date::le', filter.transdate_date__le, class='wi-date' ) %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  [% L.hidden_tag('action', 'MassInvoiceCreatePrint/' _ LIST_ACTION, id='filter_action') %]
+  [% L.hidden_tag('sort_by', FORM.sort_by) %]
+  [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+  [% L.hidden_tag('page', FORM.page) %]
+  <div class="buttons">
+    [% L.button_tag('$("#search_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+  </div>
+[% END %]
+
+<form action="controller.pl" method="post" id="search_form">
+  <div class="wrapper">
+    [% PROCESS common/toggle_panel.html display_status = 'open' %]
+  </div>
+</form>
diff --git a/templates/design40_webpages/mass_invoice_create_print_from_do/list_invoices.html b/templates/design40_webpages/mass_invoice_create_print_from_do/list_invoices.html
new file mode 100644
index 000000000..7d06757d3
--- /dev/null
+++ b/templates/design40_webpages/mass_invoice_create_print_from_do/list_invoices.html
@@ -0,0 +1,79 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE "common/flash.html" %]
+
+[% LIST_ACTION     = 'list_invoices' %]
+[% PROCESS 'mass_invoice_create_print_from_do/_filter.html' filter=SELF.invoice_models.filtered.laundered %]
+
+[% IF noshow == 1 %]
+  [% invoices = SELF.invoice_models.get;
+     MODELS          = SELF.invoice_models %]
+  [% IF !invoices.size %]
+    <p>[% LxERP.t8("There are currently no open invoices, or none matches your filter conditions.") %]</p>
+  [% ELSE %]
+
+    <form method="post" action="controller.pl" id="report_form">
+      <table class="tbl-list">
+        <thead>
+          <tr>
+            <th>[% L.checkbox_tag("", id="check_all", checkall="[data-checkall=1]") %]</th>
+            <th>[% L.sortable_table_header("transdate") %]</th>
+            <th>[% L.sortable_table_header("reqdate") %]</th>
+            <th>[% L.sortable_table_header("invnumber") %]</th>
+            <th>[% L.sortable_table_header("donumber") %]</th>
+            <th>[% L.sortable_table_header("customer") %]</th>
+            <th>[% LxERP.t8("Shipto") %]</th>
+          </tr>
+        </thead>
+        <tbody>
+          [% FOREACH invoice = invoices %]
+            [% invoice_id = invoice.id
+               delivery_order    = invoice.delivery_order
+            %]
+            <tr>
+              <td>[% L.checkbox_tag('id[]', value=invoice.id, "data-checkall"=1, checked=selected_ids.$invoice_id) %]</td>
+              <td>[% HTML.escape(invoice.transdate_as_date) %]</td>
+              <td>[% HTML.escape(invoice.deliverydate_as_date) %]</td>
+              <td>[% L.link(SELF.url_for(controller="is.pl", action="edit", type="sales_invoice", id=invoice.id), invoice.invnumber) %]</td>
+              <td>
+                [% IF delivery_order %]
+                  [% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]
+                [% ELSE %]
+                  [% HTML.escape(invoice.donumber) %]
+                [% END %]
+              </td>
+              <td>[% HTML.escape(invoice.customer.name) %]</td>
+              <td>[% HTML.escape(SELF.make_shipto_title(invoice.shipto || delivery_order.custom_shipto)) %]</td>
+            </tr>
+         [% END %]
+        </tbody>
+      </table>
+      [% IF !SELF.invoice_ids.size %]
+        [% L.paginate_controls %]
+      [% END %]
+      [% L.hidden_tag("action", "MassInvoiceCreatePrint/dispatch") %]
+      [% L.hidden_tag("printer_id") %]
+      [% L.hidden_tag("bothsided") %]
+    </form>
+
+    [% IF SELF.printers.size %]
+      <div id="print_options" class="hidden">
+        <p>
+          [% LxERP.t8("Print both sided") %]:
+          [% L.checkbox_tag('', id="print_options_bothsided") %]
+        </p>
+        <p>
+          [% LxERP.t8("Print destination") %]:
+          [% SET  printers = [ { description=LxERP.t8("Download PDF, do not print") } ] ;
+             CALL printers.import(SELF.printers);
+             L.select_tag("", printers, id="print_options_printer_id", title_key="description", default=FORM.printer_id) %]
+        </p>
+        <p>[% L.button_tag("kivi.MassInvoiceCreatePrint.massPrint()", LxERP.t8('Print')) %]</p>
+      </div>
+    [% END %]
+  [% END %]
+[% END %]
diff --git a/templates/design40_webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html b/templates/design40_webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
new file mode 100644
index 000000000..192dbcfb2
--- /dev/null
+++ b/templates/design40_webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
@@ -0,0 +1,52 @@
+[% USE Dumper %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE "common/flash.html" %]
+
+[% LIST_ACTION  = 'list_sales_delivery_orders' %]
+[% SET MODELS = SELF.sales_delivery_order_models;
+       dummy  = MODELS.finalize %]
+
+[% PROCESS 'mass_invoice_create_print_from_do/_filter.html' filter=SELF.sales_delivery_order_models.filtered.laundered  %]
+
+[% IF noshow == 1 %]
+  [% SET sales_delivery_orders = MODELS.get %]
+  <form method="post" action="controller.pl">
+    <div class="wrapper">
+        [% IF !sales_delivery_orders.size %]
+          <p>[% LxERP.t8("There are currently no open sales delivery orders.") %]</p>
+        [% ELSE %]
+          <table class="tbl-list">
+            <thead>
+              <tr>
+                <th>[% L.checkbox_tag("", id="check_all", checkall="[data-checkall=1]") %]</th>
+                <th>[% L.sortable_table_header("transdate") %]</th>
+                <th>[% L.sortable_table_header("donumber") %]</th>
+                <th>[% L.sortable_table_header("ordnumber") %]</th>
+                <th>[% L.sortable_table_header("customer") %]</th>
+             </tr>
+            </thead>
+            <tbody>
+              [% FOREACH sales_delivery_order = sales_delivery_orders %]
+                <tr class="listrow">
+                  <td>[% L.checkbox_tag('id[]', value=sales_delivery_order.id, "data-checkall"=1) %]</td>
+                  <td>[% HTML.escape(sales_delivery_order.transdate_as_date) %]</td>
+                  <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
+                  <td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
+                  <td>[% HTML.escape(sales_delivery_order.customer.name) %]</td>
+                </tr>
+              [% END %]
+            </tbody>
+          </table>
+          [% L.paginate_controls %]
+          <div id="create_print_all_dialog" style="display: none;">
+            [% INCLUDE 'mass_invoice_create_print_from_do/_create_print_all_step_1.html' %]
+          </div>
+        [% END %]
+    </div>
+  </form>
+[% END %]
diff --git a/templates/design40_webpages/menu/header.html b/templates/design40_webpages/menu/header.html
new file mode 100644
index 000000000..2f509196e
--- /dev/null
+++ b/templates/design40_webpages/menu/header.html
@@ -0,0 +1,27 @@
+[% USE T8 %]
+[% USE LxERP %]
+
+[% UNLESS skip_frame_header %]
+  <div id="frame-header">
+  [% UNLESS is_links %]
+   <span class="frame-header-element frame-header-left">
+      <span><a href="controller.pl?action=LoginScreen/user_login" title="[% 'Home' | $T8 %]"><img alt="[% 'Home' | $T8 %]" src="image/header-icon-home.png"></a></span>
+      <span><a href="controller.pl?action=LoginScreen/user_login" target="_blank" title="[% 'Open a further kivitendo window or tab' | $T8 %]"><img alt="[% 'New window/tab' | $T8 %]" src="image/header-icon-new-window.png"></a></span>
+      <span><a href="JavaScript:top.print();" title="[% 'Hardcopy' | $T8 %]"><img alt="[% 'Print' | $T8 %]" src="image/header-icon-print.png"></a></span>
+   </span>
+  [% END %]
+   <span class="frame-header-element frame-header-right">
+    <span title="[% 'Client' | $T8 %]" class="client">[% AUTH.client.name | html %]</span>
+    <span><a href="am.pl?action=config" title="[% 'User' | $T8 %]: [% MYCONFIG.login | html %] / [% 'Client' | $T8 %]: [% AUTH.client.name | html %]"><!-- [% #MYCONFIG.login | html %] / [% #AUTH.client.name | html %] --><img alt="[% 'User' | $T8 %]/[% 'Client' | $T8 %]" src="image/header-icon-user.png"></a></span>
+     <span><a href="controller.pl?action=LoginScreen/logout" target="_top" title="[% 'Logout now' | $T8 %]"><img alt="[% 'Logout' | $T8 %]" src="image/header-icon-logout.png"></a></span>
+   </span>
+   <span class="frame-header-element frame-header-right" id="ajax-spinner">
+      <img src="image/spinner-white.gif" alt="[% LxERP.t8('Loading...') %]">
+   </span>
+   <div class="frame-header-quicksearch">
+  [% FOREACH search = quick_search.enabled_modules %]
+     <span class='frame-header-quicksearch'><input type="text" id="top-quick-search-[% search.name %]" module="[% search.name %]" placeholder="[% search.description_field %]" maxlength="20" class="quick-search"></span>
+  [% END %]
+   </div>
+</div>
+[% END %]
diff --git a/templates/design40_webpages/menu/menuv3.html b/templates/design40_webpages/menu/menuv3.html
new file mode 100644
index 000000000..db9f641ab
--- /dev/null
+++ b/templates/design40_webpages/menu/menuv3.html
@@ -0,0 +1,32 @@
+[% USE L %]
+[% USE HTML %]
+
+<div id="menuv3">
+  [% FOREACH node = menu.tree %][% NEXT UNLESS node.visible %]
+  <ul>
+    <li>[% PROCESS submenu top=1 %]</li>
+  </ul>
+  [% END %]
+  </div>
+<div style="clear: both;"></div>
+[% %]
+[% BLOCK submenu %]
+  [% IF top %]
+    [% menu.name_for_node(node) | html %]
+  [% ELSIF node.children %]
+    <div class="x">[% menu.name_for_node(node) | html %]</div>
+  [% ELSE                %]
+    [% IF node.target %]
+      [% L.link(menu.href_for_node(node), menu.name_for_node(node), title=menu.name_for_node(node), target=node.target) %]
+    [% ELSE %]
+      [% L.link(menu.href_for_node(node), menu.name_for_node(node), title=menu.name_for_node(node)) %]
+    [% END %]
+  [% END %]
+  [% IF node.children %]
+    <ul>
+      [% FOREACH node = node.children %]
+        [% NEXT UNLESS node.visible %]<li>[% PROCESS submenu top=0 %]</li>
+      [% END %]
+    </ul>
+  [% END %]
+[% END %]
diff --git a/templates/design40_webpages/oe/edit_periodic_invoices_config.html b/templates/design40_webpages/oe/edit_periodic_invoices_config.html
new file mode 100644
index 000000000..77be19294
--- /dev/null
+++ b/templates/design40_webpages/oe/edit_periodic_invoices_config.html
@@ -0,0 +1,173 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% SET style="width: 400px" %]
+
+[% IF !popup_dialog %]
+  <h1>[% title %]</h1>
+[% END %]
+
+<form name="Form" action="oe.pl" method="post">
+
+[% IF popup_dialog %]
+  <div class="buttons">
+    [% L.button_tag(popup_js_assign_function, LxERP.t8('Assign')) %]
+    [% L.button_tag(popup_js_close_function, LxERP.t8('Cancel'), class='neutral') %]
+  </div>
+[% ELSE %]
+  <div class="buttons">
+    [% L.hidden_tag('action', 'save_periodic_invoices_config') %]
+    [% L.submit_tag('', LxERP.t8('Assign')) %]
+    [% L.submit_tag('', LxERP.t8('Cancel'), onclick => "self.close(); return false;", class='neutral') %]
+  </div>
+[% END %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% title %]</caption>
+  <colgroup> <col class="wi-normal"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+     <th>[% LxERP.t8('Status') %]</th>
+     <td>
+       [% L.checkbox_tag("active", checked => config.active, label => LxERP.t8('Active')) %]<br>
+       [% L.checkbox_tag('terminated', label => LxERP.t8('terminated'), checked => config.terminated) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Billing Periodicity') %]</th>
+     <td>
+       [% L.select_tag("periodicity", [
+           [ "o", LxERP.t8("one time") ],
+           [ "m", LxERP.t8("monthly") ],
+           [ "q", LxERP.t8("every third month") ],
+           [ "b", LxERP.t8("semiannually") ],
+           [ "y", LxERP.t8("yearly") ]
+         ],
+         default=config.periodicity,
+         style=style) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Order value periodicity') %]</th>
+     <td>
+      [% L.select_tag("order_value_periodicity", [
+            [ "p", LxERP.t8("same as periodicity") ],
+            [ "m", LxERP.t8("monthly") ],
+            [ "q", LxERP.t8("every third month") ],
+            [ "b", LxERP.t8("semiannually") ],
+            [ "y", LxERP.t8("yearly") ],
+            [ "2", LxERP.t8("2 years") ],
+            [ "3", LxERP.t8("3 years") ],
+            [ "4", LxERP.t8("4 years") ],
+            [ "5", LxERP.t8("5 years") ],
+          ],
+          default=config.order_value_periodicity,
+          style=style) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Start date') %]</th>
+     <td>[% L.date_tag("start_date_as_date", config.start_date_as_date) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('End date') %]<sup>1</sup></th>
+     <td>[% L.date_tag("end_date_as_date", config.end_date_as_date) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Create first invoice on') %]<sup>2</sup></th>
+     <td>[% L.date_tag("first_billing_date_as_date", config.first_billing_date_as_date) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Extend automatically by n months') %]</th>
+     <td>
+      [% L.input_tag("extend_automatically_by", config.extend_automatically_by, size => 10) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Record in') %]</th>
+     <td>[% L.select_tag("ar_chart_id", AR, title_key => 'description', default => config.ar_chart_id, style=style) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('direct debit') %]</th>
+     <td>[% L.checkbox_tag("direct_debit", checked=config.direct_debit) %]</td>
+    </tr>
+    <tr class="rule-before">
+     <th>[% LxERP.t8('Print automatically') %]</th>
+     <td>
+      [% L.checkbox_tag("print", onclick => "toggle_printer_id_ctrl()", checked => config.print) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Printer') %]</th>
+     <td>
+      [% L.select_tag("printer_id", ALL_PRINTERS, title_key = 'printer_description', default = config.printer_id, disabled = !config.print, id = "pic_printer_id", style=style) %]
+     </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Copies') %]</th>
+     <td>[% L.input_tag("copies", config.copies, size => 6, disabled => !config.print, id = "pic_copies") %]</td>
+    </tr>
+    <tr class="rule-before">
+     <th>[% LxERP.t8("Send invoice via email") %]</th>
+     <td>[% L.checkbox_tag("send_email", onclick => "toggle_send_email_ctrl()", checked=config.send_email, disabled = postal_invoice) %]</td>
+    </tr>
+    <tr>
+     <th>[%- LxERP.t8("Email of the invoice recipient") %]</th>
+     <td>[% email_recipient_invoice_address %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Contact to send to") %]</th>
+     <td>[% L.select_tag("email_recipient_contact_id", ALL_CONTACTS, title_key="full_name_dep", value_key="cp_id", default=config.email_recipient_contact_id, with_empty=1, disabled=!config.send_email, style=style) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Other recipients") %]<sup>3</sup></th>
+     <td>[% L.input_tag("email_recipient_address", config.email_recipient_address, disabled=!config.send_email, style=style) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Sender") %]<sup>4</sup></th>
+     <td>[% L.input_tag("email_sender", config.email_sender, disabled=!config.send_email, style=style) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Subject") %]</th>
+     <td>[% L.input_tag("email_subject", config.email_subject, disabled=!config.send_email, style=style) %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Message") %]</th>
+     <td>[% L.textarea_tag("email_body", config.email_body, disabled=!config.send_email, rows=8, style=style, class="texteditor texteditor-space-for-toolbar") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+</form>
+
+<div class="wrapper long-description">
+  <p><sup>1</sup> [% LxERP.t8('The end date is the last day for which invoices will possibly be created.') %]</p>
+  <p><sup>2</sup> [% LxERP.t8("If missing then the start date will be used.") %]</p>
+  <p><sup>3</sup> [% LxERP.t8("Multiple addresses can be entered separated by commas.") %]</p>
+  <p><sup>4</sup> [% LxERP.t8("If left empty the default sender from the kivitendo configuration will be used (key 'email_from' in section 'periodic_invoices'; current value: #1).", HTML.escape(LXCONFIG.periodic_invoices.email_from)) %]</p>
+</div>
+
+<script type="text/javascript"><!--
+  function toggle_printer_id_ctrl() {
+    var disabled = !$('#print').prop('checked');
+    $('#pic_printer_id').prop('disabled', disabled);
+    $('#pic_copies').prop('disabled', disabled);
+  }
+
+  function toggle_send_email_ctrl() {
+    var disabled = !$('#send_email').prop('checked');
+    $('#email_recipient_contact_id').prop('disabled', disabled);
+    $('#email_recipient_address').prop('disabled', disabled);
+    $('#email_sender').prop('disabled', disabled);
+    $('#email_subject').prop('disabled', disabled);
+    $('#email_body').prop('disabled', disabled);
+    if (disabled)
+      $('#email_body').data('ckeditorInstance').enableReadOnlyMode('disabled')
+    else
+      $('#email_body').data('ckeditorInstance').disableReadOnlyMode('disabled');
+  }
+--></script>
diff --git a/templates/design40_webpages/oe/orders_bottom.html b/templates/design40_webpages/oe/orders_bottom.html
new file mode 100644
index 000000000..ea6a270df
--- /dev/null
+++ b/templates/design40_webpages/oe/orders_bottom.html
@@ -0,0 +1,8 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<input type="hidden" name="type" value="[% HTML.escape(type) %]">
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+</form>
diff --git a/templates/design40_webpages/oe/orders_top.html b/templates/design40_webpages/oe/orders_top.html
new file mode 100644
index 000000000..b94d6f55c
--- /dev/null
+++ b/templates/design40_webpages/oe/orders_top.html
@@ -0,0 +1 @@
+<form method="post" action="oe.pl" id="form">
diff --git a/templates/design40_webpages/oe/periodic_invoices_email.txt b/templates/design40_webpages/oe/periodic_invoices_email.txt
new file mode 100644
index 000000000..5ec1495fa
--- /dev/null
+++ b/templates/design40_webpages/oe/periodic_invoices_email.txt
@@ -0,0 +1,39 @@
+Guten Tag
+
+die folgenden wiederkehrenden Rechnungen wurden automatisch erzeugt:
+
+[% FOREACH inv = POSTED_INVOICES %][% inv.invnumber %] [% END %]
+
+[% IF PRINTED_INVOICES.size -%]
+Davon wurden die folgenden Rechnungen automatisch ausgedruckt:
+
+[% FOREACH inv = PRINTED_INVOICES %][% inv.invnumber %] [% END %]
+[%- END %]
+
+[% IF EMAILED_INVOICES.size -%]
+Davon wurden die folgenden Rechnungen automatisch per E-Mail versandt:
+
+[% FOREACH inv = EMAILED_INVOICES %][% inv.invnumber %] [% END %]
+[%- END %]
+
+[% IF DISABLED_ORDERS.size -%]
+Bei folgenden Auftragsnummern, wurde die Konfiguration auf inaktiv (Periodenwahl 'einmalig') gesetzt.
+
+[% FOREACH disabled_order = DISABLED_ORDERS %][% disabled_order %] [% END %]
+[%- END %]
+[% IF PRINTED_FAILED.size %]
+
+Beim Drucken der folgenden Rechnungen gab es Fehler:
+
+[% FOREACH invoice = PRINTED_FAILED %]
+* [% invoice.0.invnumber %]: [% invoice.1 %]
+[% END %]
+[% END %]
+[% IF EMAILED_FAILED.size %]
+
+Beim Versand der folgenden Rechnungen per E-Mail gab es Fehler:
+
+[% FOREACH invoice = EMAILED_FAILED %]
+* [% invoice.0.invnumber %]: [% invoice.1 %]
+[% END %]
+[% END %]
diff --git a/templates/design40_webpages/oe/price_sources_dialog.html b/templates/design40_webpages/oe/price_sources_dialog.html
new file mode 100644
index 000000000..0238d6c0c
--- /dev/null
+++ b/templates/design40_webpages/oe/price_sources_dialog.html
@@ -0,0 +1,109 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% SET best_price = price_source.best_price %]
+[% SET best_discount = price_source.best_discount %]
+
+
+<table class="tbl-plain full-width lined">
+  <caption>[% 'Prices' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-mediumsmall"> </colgroup>
+  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'Price Source' | $T8 %]</th>
+      <th class="right">[% 'Price' | $T8 %]</th>
+      <th class="right">[% 'Best Price' | $T8 %]</th>
+      <th>[% 'Details' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      [% IF price_source.record_item.active_price_source %]
+        <td><!-- PENDENT: a.buttons komplett ueberpruefen, L.button_tag()-Funktionen deaktivieren oder loeschen -->
+          <a class="button neutral" onclick="kivi.io.update_price_source('[% FORM.row %]', '')">[% LxERP.t8('Select') %]</a>
+          [% #L.button_tag('kivi.io.update_price_source(' _ FORM.row _ ', \'\')', LxERP.t8('Select'), class='button neutral') %]
+        </td>
+      [% ELSE %]
+        <td>[% 'Selected' | $T8 %]</td>
+      [% END %]
+      <td>[% 'None (PriceSource)' | $T8 %]</td>
+      <td class="right">-</td>
+      <td></td>
+      <td></td>
+    </tr>
+    [% FOREACH price IN price_source.available_prices %]
+    <tr>
+      [% IF price_source.record_item.active_price_source != price.source %]
+        <td>
+          <a class="button neutral" onclick="kivi.io.update_price_source([% FORM.row %], '[% price.source %]', '[% LxERP.format_amount(price.price, -2) %]')">[% LxERP.t8('Select') %]</a>
+          [% #L.button_tag('kivi.io.update_price_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ LxERP.format_amount(price.price, -2) _ '\')', LxERP.t8('Select')) %]
+        </td>
+      [% ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
+        <td>
+          <a class="button" onclick="kivi.io.update_price_source([% FORM.row %], '[% price.source %]', '[% LxERP.format_amount(price.price, -2) %]')">[% LxERP.t8('Update Price') %]</a>
+          [% #L.button_tag('kivi.io.update_price_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ LxERP.format_amount(price.price, -2) _ '\')', LxERP.t8('Update Price')) %]
+        </td>
+      [% ELSE %]
+        <td>[% 'Selected' | $T8 %]</td>
+      [% END %]
+      <td>[% price.source_description | html %]</td>
+      <td class="numeric">[% price.price_as_number %]</td>
+      [% IF price.source == best_price.source %]
+        <td class="right">-</td>
+      [% ELSE %]
+        <td></td>
+      [% END %]
+      <td>[% price.description | html %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+<table class="tbl-plain full-width lined">
+  <caption>[% 'Discounts' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-small"><col class="wi-mediumsmall"> </colgroup>  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'Price Source' | $T8 %]</th>
+      <th class="right">[% 'Discount' | $T8 %]</th>
+      <th class="right">[% 'Best Discount' | $T8 %]</th>
+      <th>[% 'Details' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      [% IF price_source.record_item.active_discount_source %]
+      <td>[% L.button_tag('kivi.io.update_discount_source(' _ FORM.row _ ', \'\')', LxERP.t8('Select'), class='neutral') %]</td>
+      [% ELSE %]
+      <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% 'None (PriceSource Discount)' | $T8 %]</td>
+      <td class="right">-</td>
+      <td class="right"></td>
+      <td></td>
+    </tr>
+    [% FOREACH price IN price_source.available_discounts %]
+    <tr>
+      [% IF price_source.record_item.active_discount_source != price.source %]
+        <td>[% L.button_tag('kivi.io.update_discount_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ price.discount_as_percent _ '\')', LxERP.t8('Select')) %]</td>
+      [% ELSIF price_source.record_item.discount * 1 != price.discount * 100 %]
+        <td>[% L.button_tag('kivi.io.update_discount_source(' _ FORM.row _ ', \'' _ price.source _ '\', \'' _ price.discount_as_percent _ '\')', LxERP.t8('Update Discount')) %]</td>
+      [% ELSE %]
+        <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% price.source_description | html %]</td>
+      <td class="right">[% price.discount_as_percent %] %</td>
+      [% IF price.source == best_discount.source %]
+        <td class="right">&#x2022;</td>
+      [% ELSE %]
+        <td></td>
+      [% END %]
+      <td>[% price.description | html %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
diff --git a/templates/design40_webpages/oe/report_for_todo_list.html b/templates/design40_webpages/oe/report_for_todo_list.html
new file mode 100644
index 000000000..4008f43cb
--- /dev/null
+++ b/templates/design40_webpages/oe/report_for_todo_list.html
@@ -0,0 +1,65 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+
+<div class="wrapper center">
+
+<form method="post" action="controller.pl" id="todo_quotations_form">
+[% P.hidden_tag('action', 'Order/dispatch') %]
+[% P.hidden_tag('callback', HTML.escape(callback)) %]
+
+<table class="tbl-list wi-moderate">
+  <caption>[% 'Overdue sales quotations and requests for quotations' | $T8 %]</caption>
+  <thead>
+    <tr>
+     <th>&nbsp;</th>
+     <th>[% 'Date' | $T8 %]</th>
+     <th>[% 'Valid until' | $T8 %]</th>
+     <th>[% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %]</th>
+     <th>[% 'Customer' | $T8 %] / [% 'Vendor' | $T8 %]</th>
+     <th>[% 'Transaction description' | $T8 %]</th>
+     <th>[% 'Amount' | $T8 %]</th>
+     <th>[% 'Employee' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = QUOTATIONS %]
+    [% SET RIGHT_TO_EDIT = ((row.vc == 'customer' && AUTH.assert('sales_quotation_edit', 1)) || (row.vc == 'vendor' && AUTH.assert('request_quotation_edit', 1))) %]
+    <tr>
+     <td>
+      [% IF RIGHT_TO_EDIT %]
+        [% P.checkbox_tag("ids[]", value=HTML.escape(row.id), checked="0") %]
+      [% END %]
+     </td>
+     <td>[% HTML.escape(row.transdate) %]</td>
+     <td>[% HTML.escape(row.reqdate) %]</td>
+     <td>
+      <a href="[% edit_url | html %]&amp;vc=[% row.vc | html %]&amp;type=[% IF row.vc == 'customer' %]sales_quotation[% ELSE %]request_quotation[% END %]&amp;id=[% row.id | html %]">
+       [% IF row.vc == 'customer' %]
+         [% 'Sales quotation' | $T8 %]
+       [% ELSE %]
+         [% 'Request quotation' | $T8 %]
+       [% END %]
+       [% HTML.escape(row.quonumber) %]
+      </a>
+     </td>
+     <td>
+      [% IF row.vc == 'customer' %]
+        [% HTML.escape(row.customer) %]
+      [% ELSE %]
+        [% HTML.escape(row.vendor) %]
+      [% END %]
+     </td>
+     <td>[% HTML.escape(row.transaction_description) %]</td>
+     <td>[% HTML.escape(LxERP.format_amount(row.amount, 2)) %]</td>
+     <td>[% HTML.escape(row.employee) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<div>[% P.submit_tag('action_close_quotations', LxERP.t8('Close Quotations')) %]</div>
+</form>
+
+</div><!-- /.wrapper -->
\ No newline at end of file
diff --git a/templates/design40_webpages/oe/sales_order.html b/templates/design40_webpages/oe/sales_order.html
new file mode 100644
index 000000000..57b58fc4e
--- /dev/null
+++ b/templates/design40_webpages/oe/sales_order.html
@@ -0,0 +1,126 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE Math %]
+
+[% PROCESS 'amcvar/render_inputs_block.html' %]
+
+
+<div class="buttons positions">
+  <input type="button" id="cb_show_details" name="show_details_button" class="positions neutral" value="[% 'Show details' | $T8 %]"[% IF  show_details %] style="display:none"[% END %]>
+  <input type="button" id="cb_hide_details" name="hide_details_button" class="positions neutral" value="[% 'Hide details' | $T8 %]"[% IF !show_details %] style="display:none"[% END %]>
+</div>
+
+<script type="text/javascript">
+ $('#cb_show_details,#cb_hide_details').click(function(){
+   $('[id^="row2"],#cb_show_details,#cb_hide_details').toggle();
+   if ( $('[id^="row2"]').is(":visible") ) {
+    $("[name='show_details']").val(1);
+   } else {
+    $("[name='show_details']").val(0);
+   }}
+ );
+</script>
+[% SET cols = 0; SET colst = 0; %]
+<table id="display_row" class="tbl-list full-width" style="margin-bottom:0;">
+  <caption>[% 'Invoice items' | $T8 %]</caption>
+  <thead>
+    <tr>
+      [% FOREACH header = HEADER %]
+        [% IF header.display %]
+          <th>[% header.value %]</th>
+        [% END %]
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = ROWS %]
+      <tr>
+        [% FOREACH row1 = row.ROW1 %]
+          <td style="[% IF row1.align %]text-align:[% row1.align %];[% END %][% IF row1.nowrap %]white-space:nowrap;[% END %]"[% IF row1.class %] class="[% row1.class %]"[% END %]>
+            [% row1.value %]
+          </td>
+        [% END %]
+      </tr>
+      <tr style="display:none">
+        <td>
+          [% FOREACH hidden = row.HIDDENS %]
+            [% hidden.value %]
+          [% END %]
+        </td>
+      </tr>
+      <tr id="row2.[% loop.count %]" [% UNLESS show_details %]style="display:none;"[% END %]>
+        [% SET colspan1 = 3 ; SET colspan2 = (row.colspan - colspan1) ; %]
+        <td colspan="[% colspan1 %]"></td>
+        <td colspan="[% colspan2 %]" class="row-position-detail">
+          [% # Render all row2 entries except cvars  %]
+          [% SET row2_size = row.ROW2.size ; %]
+          <!-- <h4>Size of row.ROW2: [% row2_size %] / [% row2_half_size %]  / [%  (row.ROW2.size); %] </h4> -->
+          [%
+
+            # PENDENT: ICH WEISS, DAS NACHFOLGENDE IST SCHEISSE, ABER WIE KRIEGE ICH EINEN KORREKTEN ZWEISPALTER HIN????? Hanspi
+            # Es muessen auch noch MATH-Bibliotheken fuer Template-Toolkit geladen werden, die bei der Revamp aber nicht zur Verfuegung stehen.
+            # Zuerich, 2. September 2018
+
+          %]
+          [% SET cvars_count = 0 %]
+          [% FOREACH row2 = row.ROW2 %]
+            [% IF row2.cvar %]
+              [% SET row2_size = row2_size - 1 ; %]
+              [% SET cvars_count = cvars_count + 1 ; %]
+            [% END %]
+          [% END %]
+          [% IF (row2_size % 2) == 0 ; SET row2_half_size = (row2_size / 2); ELSE; SET row2_half_size = ((row2_size / 2) + 0.5) ; END ; %]
+          [%  SET row2_counter = 1; %]
+          [%  SET row2_counter_items = 1; %]
+          <div class="rowspan-table table">
+            [% FOREACH row2 = row.ROW2 %]
+              [% IF row2_counter > row2_half_size %]
+                </div>
+                <div class="rowspan-table table">
+                [% SET row2_half_size = row2_size - row2_half_size ;  %]
+                [% SET row2_counter = 1 ; %]
+              [% END %]
+              [% IF !row2.cvar %]
+                <div class="label-n-value field" title="[% row2_counter %]">[% row2.value %]</div>
+              [% ELSE %]
+                [% SET row2_half_size = row2_half_size - 1 %]
+              [% END %]
+              [% SET row2_counter = row2_counter + 1 %]
+              [% SET row2_counter_items = row2_counter_items + 1 %]
+              [% LAST IF row2_counter_items > row2_size %]
+            [% END %]
+          </div>
+
+          [% # process editable cvars  %]
+            [% IF cvars_count > 0 %]
+            <!-- <table class="row2-cvars-table"> -->
+            <div class="rowspan-table table">
+                [% FOREACH row2 = row.ROW2 %]
+                  [% SET show = ((row2.render_options.var.flag_editable || !row2.render_options.hide_non_editable ) && row2.render_options.valid && !row2.render_options.partsgroup_filtered) %]
+                  [% IF row2.cvar && show %]
+                    [% # IF row2.line_break %]<!-- </tr><tr> -->[% #END %]
+                    <div class="label-n-value field"><!-- <tr> -->
+                      <span class="label horizontal"><!-- <th> -->[% row2.description %]<!-- </th> --></span>
+                      <span class="value"><!-- <td> -->[% PROCESS cvar_inputs cvar = row2.render_options %]<!-- </td> --></span>
+                    <!-- </tr> --></div>
+                  [% END %]
+                [% END %]
+            <!-- </table> -->
+            </div>
+          [% END %]
+          [%# process non editable cvars extra to not disturb the table layout (this will be hidden inputs) %]
+          [% FOREACH row2 = row.ROW2 %]
+            [% SET hide = (!row2.render_options.var.flag_editable && row2.render_options.hide_non_editable) %]
+            [% IF row2.cvar && hide %]
+              [% PROCESS cvar_inputs cvar = row2.render_options %]
+            [% END %]
+          [% END %]
+        </td>
+      </tr>
+    [% END # /FOREACH row = ROWS %]
+    </tbody>
+  </table>
+
+
diff --git a/templates/design40_webpages/oe/search.html b/templates/design40_webpages/oe/search.html
new file mode 100644
index 000000000..f2a572e6a
--- /dev/null
+++ b/templates/design40_webpages/oe/search.html
@@ -0,0 +1,424 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[% SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
+[% SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
+[% SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
+[% SET vcdefault = 'old' _ vc %]
+
+<form method="post" action="oe.pl" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% HTML.escape(vclabel) %]</caption>
+  <tbody>
+    <tr>
+      <th>[% HTML.escape(vclabel) %]</th>
+      <td>[% L.input_tag(vc, $vcdefault, class="initial_focus wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Contact Person' | $T8 %]</th>
+      <td>[% L.input_tag("cp_name", '', class="wi-normal") %]</td>
+    </tr>
+    [% UNLESS ALL_BUSINESS_TYPES.size == 0 %]
+    <tr>
+      <th>[% vctypelabel %]</th>
+      <td>[% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, class="wi-normal") %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% IF is_order %][% 'Order' | $T8 %][% ELSE %][% 'Quotation' | $T8 %][% END %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% HTML.escape(ordlabel) %]</th>
+      <td>[% L.input_tag(ordnrname, "", class="wi-lightwide") %]</td>
+    </tr>
+    [% IF type == "purchase_order_confirmation" %]
+    <tr>
+      <th>[% LxERP.t8("Vendor Confirmation Number") %]</th>
+      <td>[% L.input_tag("vendor_confirmation_number", '', class="wi-lightwide") %]</td>
+    </tr>
+    [% END %]
+    [% IF is_order %]
+    <tr>
+      <th>[% LxERP.t8("Customer Order Number") %]</th>
+      <td>[% L.input_tag("cusordnumber", '', class="wi-lightwide") %]</td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Steuersatz' | $T8 %]</th>
+      <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Shipping Point' | $T8 %]</th>
+      <td>[% L.input_tag('shippingpoint', '', class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transaction description' | $T8 %]</th>
+      <td>[% L.input_tag("transaction_description", "", class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project' | $T8 %]</th>
+      <td>[% P.project.picker("project_id", '', active="both", valid="both", class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Internal Notes' | $T8 %]</th>
+      <td>[% L.input_tag('intnotes', '', class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Phone Notes' | $T8 %]</th>
+      <td>[% L.input_tag('phone_notes', '', class="wi-lightwide") %]</td>
+     </tr>
+     [%- IF type == 'sales_order' %]
+     <tr>
+      <th>[% 'Full Text' | $T8 %]</th>
+      <td>[% L.input_tag('fulltext', '', class="wi-lightwide") %]</td>
+     </tr>
+     [%- END %]
+    <tr>
+      <th>[% IF type == 'purchase_order_confirmation' %][% 'Confirmation Date' | $T8 %][% ELSIF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+      <td>[% L.date_tag('transdatefrom','', class='wi-date') %] [% 'Bis' | $T8 %] [% L.date_tag('transdateto','', class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+      <td>[% L.date_tag('reqdatefrom','', class='wi-date') %] [% 'Bis' | $T8 %] [% L.date_tag('reqdateto','', class='wi-date') %]</td>
+    </tr>
+    [% IF type == 'sales_order' %]
+    <tr>
+      <th>[% 'Insert Date' | $T8 %] [% 'From' | $T8 %]</th>
+      <td>[% L.date_tag('insertdatefrom','', class='wi-date') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto','', class='wi-date') %]</td>
+    </tr>
+    [% END %]
+    [% IF type == 'sales_quotation' %]
+    <tr>
+      <th>[% 'Expected billing date' | $T8 %] [% 'From' | $T8 %]</th>
+      <td>[% L.date_tag('expected_billing_date_from', '', class='wi-date') %] [% 'Bis' | $T8 %] [% L.date_tag('expected_billing_date_to', '', class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order probability' | $T8 %]</th>
+      <td>[% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %] [% L.select_tag('order_probability_value', ORDER_PROBABILITIES, title='title', with_empty=1) %]</td>
+    </tr>
+    [% END %]
+    [% IF CT_CUSTOM_VARIABLES.size %]
+      <tr>
+        <th class="caption" colspan="2">[% 'Custom variables for module' | $T8 %]: [%'Customers and vendors' | $T8 %]</th>
+      </tr>
+      [% CT_CUSTOM_VARIABLES_FILTER_CODE %]
+    [% END %]
+  </tbody>
+</table>
+
+
+<table class="tbl-horizontal">
+  <caption>[% 'Article' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% L.input_tag("parts_description", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% L.input_tag("parts_partnumber", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2"> [% 'Handling' | $T8 %] </th>
+    </tr>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag('salesman_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, class="wi-normal") %]</td>
+    </tr>
+    [% IF ALL_DEPARTMENTS.size %]
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, class="wi-normal") %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Shipping Address' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Name' | $T8 %]</th>
+      <td>[% L.input_tag("shiptoname", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department 1' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_1", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department 2' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_2", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Street' | $T8 %]</th>
+      <td>[% L.input_tag("shiptostreet", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Zipcode' | $T8 %]</th>
+      <td>[% L.input_tag("shiptozipcode", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'City' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocity", "", class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Country' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocountry", "", class="wi-normal") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Status' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Open' | $T8 %]</th>
+      <td><input type="checkbox" name="open" value="1" id="open" checked></td>
+    </tr>
+    <tr>
+      <th>[% 'Closed' | $T8 %]</th>
+      <td><input type="checkbox" name="closed" value="1" id="closed"></td>
+    </tr>
+    <tr>
+      <th>[% 'Status' | $T8 %]</th>
+      <td>[% L.select_tag('order_status_id', ALL_ORDER_STATUSES, default = order_status_id, title_key = 'name', with_empty = 1, class="wi-lightwide") %]</td>
+    </tr>
+    [% IF type == 'sales_order' OR type == 'purchase_order' %]
+    <tr>
+      <th>[% 'Not delivered' | $T8 %]</th>
+      <td><input name="notdelivered" id="notdelivered" type="checkbox" value="1" checked></td>
+    </tr>
+    <tr>
+      <th>[% 'Delivery Order(s) for full qty created' | $T8 %]</th>
+      <td><input name="delivered" id="delivered" type="checkbox" value="1" checked></td>
+    </tr>
+    [% END %] [% IF type == 'sales_order' %]
+    <tr>
+      <th>[% 'Periodic invoices active' | $T8 %]</th>
+      <td>[% L.checkbox_tag("periodic_invoices_active") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Periodic invoices inactive' | $T8 %]</th>
+      <td>[% L.checkbox_tag("periodic_invoices_inactive") %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+</div><!-- /.wrapper -->
+
+
+<div class="wrapper form-addition control-panel">
+
+<h3>[% 'Include in Report' | $T8 %]</h3>
+
+<div class="list col">
+  <h4>[% 'Numbers & IDs' | $T8 %]</h4>
+  <div>
+    <input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" type="checkbox" value="Y" checked>
+    <label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label>
+  </div>
+  <div>
+    <input name="l_id" id="l_id" type="checkbox" value="Y">
+    <label for="l_id">[% 'ID' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_globalprojectnumber" id="l_globalprojectnumber" type="checkbox" value="Y">
+    <label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label>
+  </div>
+  [% IF type == "purchase_order_confirmation" %]
+  <div>
+    <input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" type="checkbox" value="Y" checked>
+    <label for="l_vendor_confirmation_number">[% LxERP.t8("Vendor Confirmation Number") %]</label>
+  </div>
+  [% END %]
+  [% IF is_order %]
+  <div>
+    <input name="l_cusordnumber" id="l_cusordnumber" type="checkbox" value="Y" checked>
+    <label for="l_cusordnumber">[% LxERP.t8("Customer Order Number") %]</label>
+  </div>
+  [% END %]
+</div>
+<div class="list col">
+  <h4> [% 'Handling' | $T8 %] </h4>
+  <div>
+    <input name="l_employee" id="l_employee" type="checkbox" value="Y" checked>
+    <label for="l_employee">[% 'Employee' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_salesman" id="l_salesman" type="checkbox" value="Y">
+    <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_order_status" id="l_order_status" class="checkbox" type="checkbox" value="Y">
+    <label for="l_order_status">[% 'Status' | $T8 %]</label>
+  </div>
+  <div>
+   <input name="l_intnotes" id="l_intnotes" class="checkbox" type="checkbox" value="Y">
+   <label for="l_intnotes">[% 'Internal Notes' | $T8 %]</label>
+  </div>
+</div>
+
+<div class="list col">
+  <h4>[% 'Amounts' | $T8 %]</h4>
+  <div>
+    <input name="l_amount" id="l_amount" type="checkbox" value="Y" checked>
+    <label for="l_amount">[% 'Total' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_marge_total" id="l_marge_total" type="checkbox" value="Y">
+    <label for="l_marge_total">[% 'Ertrag' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_marge_percent" id="l_marge_percent" type="checkbox" value="Y">
+    <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_netamount" id="l_netamount" type="checkbox" value="Y">
+    <label for="l_netamount">[% 'Amount' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_subtotal" id="l_subtotal" type="checkbox" value="Y">
+    <label for="l_subtotal">[% 'Subtotal' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_remaining_amount" id="l_remaining_amount" type="checkbox" value="Y">
+    <label for="l_remaining_amount">[% 'Remaining Amount' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_remaining_netamount" id="l_remaining_netamount" type="checkbox" value="Y">
+    <label for="l_remaining_netamount">[% 'Remaining Net Amount' | $T8 %]</label>
+  </div>
+</div>
+<div class="list col">
+  <h4>[% HTML.escape(vclabel) %]</h4>
+  <div>
+    <input name="l_name" id="l_name" type="checkbox" value="Y" checked>
+    <label for="l_name">[% HTML.escape(vclabel) %]</label>
+  </div>
+  <div>
+    <input name="l_vcnumber" id="l_vcnumber" type="checkbox" value="Y">
+    <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
+  </div>
+  <div>
+    <input name="l_country" id="l_country" type="checkbox" value="Y">
+    <label for="l_country">[% 'Country' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_ustid" id="l_ustid" type="checkbox" value="Y">
+    <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
+  </div>
+</div>
+<div class="list col">
+  <h4>[% 'Shipping Address' | $T8 %]</h4>
+  <div>
+    <input name="l_shiptoname" id="l_shiptoname" type="checkbox"><label for="l_shiptoname">[% 'Name' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox"><label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox"><label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptostreet" id="l_shiptostreet" type="checkbox"><label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox"><label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptocity" id="l_shiptocity" type="checkbox"><label for="l_shiptocity">[% 'City' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_shiptocountry" id="l_shiptocountry" type="checkbox"><label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
+  </div>
+</div>
+<div class="list col">
+  <h4>[% 'Taxes' | $T8 %]</h4>
+  <div>
+    <input name="l_tax" id="l_tax" type="checkbox" value="Y">
+    <label for="l_tax"> [% 'Tax' | $T8 %] </label>
+  </div>
+  <div>
+    [% L.checkbox_tag('l_taxzone', label => LxERP.t8('Steuersatz')) %]
+  </div>
+  <div>
+    <h4>[% 'Date' | $T8 %]</h4>
+  </div>
+  <div>
+    <input name="l_transdate" id="l_transdate" type="checkbox" value="Y" checked>
+    <label for="l_transdate"> [% 'Date' | $T8 %] </label>
+  </div>
+  <div>
+    <input name="l_reqdate" id="l_reqdate" type="checkbox" value="Y" checked>
+    <label for="l_reqdate"> [% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] </label>
+  </div>
+  [% IF type == 'sales_order' %]
+  <div>
+    <input name="l_insertdate" id="l_insertdate" type="checkbox" value="Y">
+    <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
+  </div>
+  [% END %]
+</div>
+<div class="list col">
+  <h4>[% 'Customer & Order Information' | $T8 %]</h4>
+  <div>
+    <input name="l_department" id="l_department" type="checkbox" value="Y">
+    <label for="l_department"> [% 'Department' | $T8 %] </label>
+  </div>
+  <div>
+    <input name="l_shipvia" id="l_shipvia" type="checkbox" value="Y">
+    <label for="l_shipvia"> [% 'Ship via' | $T8 %] </label>
+  </div>
+  <div>
+    [% L.checkbox_tag('l_shippingpoint', label => LxERP.t8('Shipping Point')) %]
+  </div>
+  <div>
+    <input name="l_payment_terms" id="l_payment_terms" type="checkbox" value="Y">
+    <label for="l_payment_terms">[% 'Payment Terms' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_transaction_description" id="l_transaction_description" type="checkbox" value="Y" [% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]>
+    <label for="l_transaction_description">[% 'Transaction description' | $T8 %]</label>
+  </div>
+  [% IF type == 'sales_quotation' %]
+  <div>
+    <input name="l_order_probability_expected_billing_date" id="l_order_probability_expected_billing_date" type="checkbox" value="Y">
+    <label for="l_order_probability_expected_billing_date"> [% 'Order probability & expected billing date' | $T8 %] </label>
+  </div>
+  [% END %]
+  <div>
+    <input name="l_items" id="l_items" type="checkbox" value="Y">
+    <label for="l_items">[% 'Positions' | $T8 %]</label>
+  </div>
+</div>
+  [% IF CT_CUSTOM_VARIABLES.size %]
+<div class="list col">
+  <h4>[% 'Custom Variables' | $T8 %] </h4><!-- PENDENT: Perl-Code anpassen (es werden keine DIVs gesetzt) -->
+  [% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]
+</div>
+  [% END %]
+
+
+</div>
+
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="type" value="[% HTML.escape(type) %]">
+<input type="hidden" name="action" value="orders">
+</form>
diff --git a/templates/design40_webpages/order/form.html b/templates/design40_webpages/order/form.html
new file mode 100644
index 000000000..4bc2b0ac4
--- /dev/null
+++ b/templates/design40_webpages/order/form.html
@@ -0,0 +1,83 @@
+[% USE T8 %]
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
+<h1>[% FORM.title %] <span id='nr_in_title'>[% SELF.order.number %]</span></h1>
+
+<div id="print_options" style="display:none">
+  <form method="post" action="controller.pl" id="print_options_form">
+    [% SELF.print_options %]
+    <br>
+    [% L.button_tag('kivi.Order.print()', LxERP.t8('Print')) %]
+    <a href="#" onclick="$('#print_options').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+  </form>
+</div>
+
+<div id="shipto_dialog" class="hidden"></div>
+
+<form method="post" action="controller.pl" id="order_form"
+      data-transport-cost-reminder-article-id="[% HTML.escape(transport_cost_reminder_article.id) %]"
+      data-transport-cost-reminder-article-description="[% HTML.escape(transport_cost_reminder_article.displayable_name) %]">
+  [% L.hidden_tag('callback',             FORM.callback) %]
+  [% L.hidden_tag('type',                 FORM.type) %]
+  [% L.hidden_tag('id',                   SELF.order.id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.order.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.order.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
+
+  [% INCLUDE 'common/flash.html' %]
+
+<div class="tabwidget" id="order_tabs">
+
+<ul>
+  <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
+  [% IF INSTANCE_CONF.get_webdav %]
+    <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+  [% END %]
+  [% IF SELF.order.id AND INSTANCE_CONF.get_doc_storage %]
+    <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.order.id) %]">[% 'Documents' | $T8 %]</a></li>
+    <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.order.id) %]">[% 'Attachments' | $T8 %]</a></li>
+  [% END %]
+  [% IF SELF.order.id %]
+    <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Order&object_id=[% HTML.url(SELF.order.id) %]">[% 'Linked Records' | $T8 %]</a></li>
+  [% END %]
+  [% IF SELF.order.id %]
+    <li><a href="#ui-tabs-phone-notes">[% 'Phone Notes' | $T8 %]<span id="num_phone_notes">[%- num_phone_notes ? ' (' _ num_phone_notes _ ')' : '' -%]</span></a></li>
+  [% END %]
+</ul>
+
+[% PROCESS "order/tabs/basic_data.html" %]
+[% PROCESS 'webdav/_list.html' %]
+<div id="ui-tabs-1">
+  [% LxERP.t8("Loading...") %]
+</div>
+[% IF SELF.order.id %]
+  <div id="ui-tabs-phone-notes">
+    [% PROCESS "order/tabs/phone_notes.html" %]
+  </div>
+[% END %]
+<div id="shipto_inputs" class="hidden">
+  [%- PROCESS 'common/_ship_to_dialog.html'
+    vc_obj=SELF.order.customervendor
+    cs_obj=SELF.order.custom_shipto
+    cvars=SELF.order.custom_shipto.cvars_by_config
+    id_selector='#order_shipto_id' %]
+</div>
+
+</div><!-- /.tabwidget -->
+</form>
diff --git a/templates/design40_webpages/order/tabs/_business_info_row.html b/templates/design40_webpages/order/tabs/_business_info_row.html
new file mode 100644
index 000000000..9fbd9225a
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_business_info_row.html
@@ -0,0 +1,13 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<tr id='business_info_row' [% IF !SELF.order.customervendor.business_id %]style='display:none'[% END %]>
+  <th>
+    [% IF SELF.cv == 'customer' %]
+      [% 'Customer type' | $T8 %]
+    [% ELSE %]
+      [% 'Vendor type' | $T8 %]
+    [% END %]
+  </th>
+  <td><span class="plain-data wi-lightwide">[% HTML.escape(SELF.order.customervendor.business.description) %] ([% 'Trade Discount' | $T8 %] [% SELF.order.customervendor.business.discount_as_percent %]%)</span></td>
+</tr>
diff --git a/templates/design40_webpages/order/tabs/_item_below_input.html b/templates/design40_webpages/order/tabs/_item_below_input.html
new file mode 100644
index 000000000..4a8b0c647
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_item_below_input.html
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+  <tr>
+    <td>
+      [% L.button_tag('kivi.Order.create_part()', LxERP.t8('+'), title=LxERP.t8('Create a new article from line')) %]
+    </td>
+    <td>[% L.input_tag('add_item.position', '', size=3, class="add_item_input numeric") %]</td>
+    <td></td>
+    <td></td>
+    [%- IF SELF.show_update_button -%]
+    <td></td>
+    [%- END -%]
+    <td colspan="[%- IF SELF.search_cvpartnumber -%]2[% ELSE %]1[% END %]">
+          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+          [% P.part.picker('add_item.parts_id', SELF.created_part, class="add_item_input wi-normal",
+                            multiple_pos_input=1,
+                            action={set_multi_items='kivi.Order.add_multi_items'},
+                            classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                            not_order_locked=SELF.type_data.no_order_locked_parts,
+                            $PARAM_KEY=PARAM_VAL) %]</td>
+    </td>
+    <td>
+          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ], [ 'assortment', LxERP.t8('Assortment')] ] %]
+          [% L.select_tag('add_item.create_part_type', type_options, class="wi-smallest") %]
+    </td>
+    <td>[% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input wi-lightwide") %]</td>
+    [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
+    <td></td>
+    [%- END -%]
+    <td>
+        [% L.input_tag('add_item.qty_as_number', '', placeholder="1", size = 5, class="add_item_input numeric wi-verysmall") %]
+        [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+    </td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td>[% L.input_tag('add_item.sellprice_as_number', price, size = 10, class="add_item_input numeric tooltipster-html wi-verysmall") %]</td>
+    <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric tooltipster-html") %]</td>
+    <td>
+      [% L.button_tag('kivi.Order.add_item()', LxERP.t8('Add part')) %]
+    </td>
+
+  </tr>
diff --git a/templates/design40_webpages/order/tabs/_item_input.html b/templates/design40_webpages/order/tabs/_item_input.html
new file mode 100644
index 000000000..fb3d6ea86
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_item_input.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div class="wrapper panel-wrapper">
+<div class="input-panel control-panel">
+  <table id="input_row_table_id" class="tbl-plain condensed">
+    <caption>[% 'Add Parts here!' | $T8 %]</caption>
+    <tbody>
+      <tr>
+        <td>
+          <span class="label above">[% 'position' | $T8 %] </span>
+          [% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]
+        </td>
+        <td>
+          <span class="label above">[% 'Part' | $T8 %] </span>
+          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+          [% P.part.picker('add_item.parts_id', SELF.created_part, class="add_item_input wi-normal",
+             fat_set_item=1,
+             multiple_pos_input=1,
+             action={set_multi_items='kivi.Order.add_multi_items'},
+             classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+             not_order_locked=SELF.type_data.no_order_locked_parts,
+             $PARAM_KEY=PARAM_VAL) %]
+        </td>
+        <td>
+          <span class="label above">[% 'Description' | $T8 %] </span>
+          [% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input wi-normal") %]
+        </td>
+        <td>
+          <span class="label above">[% 'Qty' | $T8 %]</span>
+          [% L.input_tag('add_item.qty_as_number', '', placeholder="1", class="add_item_input numeric wi-verysmall") %]
+          [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+        </td>
+        [%- SET price = '' %]
+        [%- IF SELF.created_part %]
+          [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order_intake' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
+        [%- END %]
+        <td>
+          <span class="label above">[% 'Price' | $T8 %]</span>
+          [% L.input_tag('add_item.sellprice_as_number', price, class="add_item_input numeric wi-verysmall") %]
+        </td>
+        <td>
+          <span class="label above">[% 'Discount' | $T8 %]</span>
+          [% L.input_tag('add_item.discount_as_percent', '', class="add_item_input numeric wi-smallest") %]
+        </td>
+        <td style="vertical-align:bottom;">[% L.button_tag('kivi.Order.add_item()', LxERP.t8('Add part'), style='margin:0;') %]</td>
+      </tr>
+    </tbody>
+  </table>
+  <div style="clear:both">[% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items'), class='neutral') %]</div>
+</div><!-- /.entry-panel -->
+
+<div class="input-panel control-panel short">
+  <table id="create_part_table_id" class="tbl-plain condensed">
+    <caption>[% 'Create a new part' | $T8 %]!</caption>
+    <tbody>
+      <tr>
+        <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
+          <span class="label above">[% 'Part Type' | $T8 %] </span>
+          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ]] %]
+          [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
+          [% L.select_tag('add_item.create_part_type', type_options) %]
+          [% L.button_tag('kivi.Order.create_part()', LxERP.t8('+')) %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.entry-panel -->
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/order/tabs/_price_sources_dialog.html b/templates/design40_webpages/order/tabs/_price_sources_dialog.html
new file mode 100644
index 000000000..6b19dcc26
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_price_sources_dialog.html
@@ -0,0 +1,127 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% SET best_price = price_source.best_price %]
+[% SET best_discount = price_source.best_discount %]
+[% SET price_editable = 0 %]
+[% IF (FORM.type == "sales_order" || FORM.type == "sales_order_intake" || FORM.type == "sales_quotation") %]
+  [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
+[% END %]
+[% IF (FORM.type == "purchase_order" || FORM.type == "purchase_order_confirmation" || FORM.type == "request_quotation" || FORM.type == "purchase_quotation_intake") %]
+  [% SET price_editable = AUTH.assert('purchase_edit_prices', 1) %]
+[% END %]
+[% SET exfactor = price_source.record.exchangerate ? 1 / price_source.record.exchangerate : 1 %]
+[% SET exnoshow = price_source.record.currency_id==INSTANCE_CONF.get_currency_id %]
+[% SET places   = exnoshow ? -2 : 5 %]
+
+<h2>[% 'Prices' | $T8 %]</h2>
+
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'Price Source' | $T8 %]</th>
+      <th>[% 'Price' | $T8 %]</th>
+      <th [% IF exnoshow -%]style='display:none'[% END %]>
+        [% 'Price' | $T8 -%]/[%- price_source.record.currency.name %]
+      </th>
+      <th>[% 'Best Price' | $T8 %]</th>
+      <th>[% 'Details' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      [% IF price_source.record_item.active_price_source %]
+        <td><!-- PENDENT: a.buttons komplett ueberpruefen und L.button_tag() deaktivieren oder loeschen (3 Stueck hier, siehe weiter unten) -->
+        <a class="button neutral" onclick="kivi.Order.update_price_source('[% FORM.item_id %]', '', '[% LxERP.t8('None (PriceSource)') %]' , '', [% price_editable %])">[% LxERP.t8('Select') %] </a>
+        [% #L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]
+        </td>
+      [% ELSE %]
+        <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% 'None (PriceSource)' | $T8 %]</td>
+      <td>-</td>
+      <td [% IF exnoshow %]style='display:none'[% END %]>-</td>
+      <td></td>
+      <td></td>
+    </tr>
+    [% FOREACH price IN price_source.available_prices %]
+    <tr>
+      [% IF price_source.record_item.active_price_source != price.source %]
+        <td>
+          <a class="button neutral" onclick="kivi.Order.update_price_source('[% FORM.item_id %]', '[% price.source %]', '[% price.source_description %]', '[% LxERP.format_amount(price.price * exfactor, places) %]', [% price_editable %])">[% LxERP.t8('Select') %] </a>
+          [% #L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', ) %]
+        </td>
+      [% ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
+        <td>
+          <a class="button neutral" onclick="kivi.Order.update_price_source('[% FORM.item_id %]', '[% price.source %]', '[% price.source_description %]', '[% LxERP.format_amount(price.price * exfactor, places) %]', [% price_editable %])">[% LxERP.t8('Update Price') %] </a>
+          [% #L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Update Price')) %]
+        </td>
+      [% ELSE %]
+        <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% price.source_description | html %]</td>
+      <td>[% price.price_as_number %]</td>
+      <td [%- IF exnoshow -%]style='display:none'[%- END %]>
+        [% LxERP.format_amount(price.price * exfactor, places) %]
+      </td>
+      [% IF price.source == best_price.source %]
+        <td>&#x2022;</td>
+      [% ELSE %]
+        <td></td>
+      [% END %]
+      <td>[% price.description | html %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+<h2>[% 'Discounts' | $T8 %]</h2>
+
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'Price Source' | $T8 %]</th>
+      <th>[% 'Discount' | $T8 %]</th>
+      <th>[% 'Best Discount' | $T8 %]</th>
+      <th>[% 'Details' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      [% IF price_source.record_item.active_discount_source %]
+        <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource Discount)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+      [% ELSE %]
+        <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% 'None (PriceSource Discount)' | $T8 %]</td>
+      <td>-</td>
+      <td></td>
+      <td></td>
+    </tr>
+    [% FOREACH price IN price_source.available_discounts %]
+    <tr >
+      [% IF price_source.record_item.active_discount_source != price.source %]
+        <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+      [% ELSIF price_source.record_item.discount * 1 != price.discount * 1 %]
+        <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent _ '\', ' _ price_editable _ ')', LxERP.t8('Update Discount')) %]</td>
+      [% ELSE %]
+        <td><b>[% 'Selected' | $T8 %]</b></td>
+      [% END %]
+      <td>[% price.source_description | html %]</td>
+      <td>[% price.discount_as_percent %] %</td>
+      [% IF price.source == best_discount.source %]
+        <td>&#x2022;</td>
+      [% ELSE %]
+        <td></td>
+      [% END %]
+      <td>[% price.description | html %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
diff --git a/templates/design40_webpages/order/tabs/_purchase_delivery_order_item_selection.html b/templates/design40_webpages/order/tabs/_purchase_delivery_order_item_selection.html
new file mode 100644
index 000000000..6a393cbcc
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_purchase_delivery_order_item_selection.html
@@ -0,0 +1,34 @@
+[%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
+<div class="wrapper">
+  [% L.button_tag("kivi.Order.convert_to_purchase_delivery_order_item_selection()", LxERP.t8("Create delivery order")) %]
+</div>
+
+<div class="wrapper">
+  <table class="tbl-list">
+    <thead>
+      <tr class="listheading">
+        <th>[% L.checkbox_tag("item_position_selection_checkall", checkall="input.item_position_selection_checkall", checked="checked") %]</th>
+        <th>[% LxERP.t8("Position") %]</th>
+        <th>[% LxERP.t8("Partnumber") %]</th>
+        <th>[% LxERP.t8("Vendor Part Number") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+        <th>[% LxERP.t8("Qty") %]</th>
+        <th>[% LxERP.t8("Unit") %]</th>
+      </tr>
+    </thead>
+
+    <tbody id="item_position_selection" class="row_entry listrow">
+      [% FOREACH item = ITEMS %]
+        <tr class="listrow">
+          <td>[% L.checkbox_tag("selected_item_positions[+]", class="item_position_selection_checkall", value=loop.count - 1, checked="checked") %]</td>
+          <td class="numeric">[% loop.count %]</td>
+          <td>[% HTML.escape(item.partnumber) %]</td>
+          <td>[% HTML.escape(item.vendor_partnumber) %]</td>
+          <td>[% HTML.escape(item.description) %]</td>
+          <td class="numeric">[% HTML.escape(item.qty_as_number) %]</td>
+          <td>[% HTML.escape(item.unit) %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/order/tabs/_row.html b/templates/design40_webpages/order/tabs/_row.html
new file mode 100644
index 000000000..0c0bd4805
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_row.html
@@ -0,0 +1,151 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<tbody class="row_entry listrow" data-position="[%- HTML.escape(ITEM.position) -%]"[%- IF MYCONFIG.show_form_details -%] data-expanded="1"[%- END -%]>
+  <tr>
+    <td>
+      [% IF MYCONFIG.show_form_details %]
+        [% L.img_tag(src="image/collapse.svg",
+                     alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand row-icon") %]
+      [% ELSE %]
+        [% L.img_tag(src="image/expand.svg",
+                     alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand row-icon") %]
+      [% END %]
+      [% L.hidden_tag("orderitem_ids[+]", ID) %]
+      [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+      [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
+      [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
+      [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
+      [% L.hidden_tag("basket_item_ids[+]", ITEM.basket_item_id) %]
+    </td>
+    <td class="center"><div name="position">[% HTML.escape(ITEM.position) %]</div></td>
+    <td><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></td>
+    <td>
+      [% L.button_tag("kivi.Order.delete_order_item_row(this)",
+                      LxERP.t8("X"),
+                      confirm=LxERP.t8("Are you sure?")) %]
+    </td>
+    [%- IF SELF.show_update_button -%]
+    <td>
+      [%- L.img_tag(src="image/rotate_cw.svg",
+                    alt=LxERP.t8('Update from master data'),
+                    title= LxERP.t8('Update from master data'),
+                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.Order.update_row_from_master_data(this);",
+                    class='row-icon',
+                    id='update_from_master') %]
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partnumber">
+        [%- P.link_tag(SELF.url_for(controller='Part', action='edit', 'part.id'=ITEM.part.id), ITEM.part.partnumber, target="_blank", title=LxERP.t8('Open in new window')) -%]
+      </div>
+    </td>
+    [%- IF SELF.search_cvpartnumber -%]
+    <td><div name="cvpartnumber">[% HTML.escape(ITEM.cvpartnumber) %]</div></td>
+    [%- END -%]
+    <td><div name="partclassification">[% ITEM.part.presenter.typeclass_abbreviation %]</div></td>
+    <td>
+      [% L.areainput_tag("order.orderitems[].description",
+                     ITEM.description,
+                     size='40',
+                     class='wi-lightwide') %]
+      [% L.hidden_tag("order.orderitems[].longdescription", ITEM.longdescription) %]
+      [% L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L"), class="wi-tiny neutral") %]
+    </td>
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %]
+    <td>
+      [%- L.div_tag(LxERP.format_amount(ITEM.shipped_qty, 2, 0) _ ' ' _ ITEM.unit, name="shipped_qty", class="numeric") %]
+    </td>
+    [%- END -%]
+    <td>
+      [% L.input_tag("order.orderitems[].qty_as_number",
+                      ITEM.qty_as_number,
+                      size = 5,
+                      class="recalc reformat_number numeric wi-verysmall") %]
+      [% IF ITEM.part.formel %]
+        [% L.button_tag("kivi.Order.show_calculate_qty_dialog(this)", LxERP.t8("*/"), class="neutral") %]
+        [% L.hidden_tag("formula[+]", ITEM.part.formel) %]
+      [% END %]
+    </td>
+    <td>
+      [% L.select_tag("order.orderitems[].price_factor_id",
+                       SELF.all_price_factors,
+                       default = ITEM.price_factor_id,
+                       title_key = 'description',
+                       with_empty = 1,
+                       class="recalc wi-mediumsmall") %]
+    </td>
+    <td>
+      [% L.select_tag("order.orderitems[].unit",
+                      ITEM.part.available_units,
+                      default = ITEM.unit,
+                      title_key = 'name',
+                      value_key = 'name',
+                      class = 'unitselect wi-mediumsmall') %]
+    </td>
+    <td>
+      [% L.button_tag("kivi.Order.price_chooser_item_row(this)",
+                       ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
+                       name = "price_chooser_button",
+                       class = "neutral") %]
+    </td>
+    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
+    [% END %]
+    [% IF (SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation" || SELF.type == "request_quotation" || SELF.type == "purchase_quotation_intake") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
+    [% END %]
+    <td>
+      [% L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
+      [% SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES && ITEM.active_price_source.source == '') %]
+      <div name="editable_price" [% IF !EDIT_PRICE %]style="display:none"[% END %] class="numeric">
+        [% L.input_tag("order.orderitems[].sellprice_as_number",
+                        ITEM.sellprice_as_number,
+                        size = 10,
+                        disabled=(EDIT_PRICE? '' : 1),
+                        class="recalc reformat_number numeric wi-verysmall") %]
+      </div>
+      <div name="not_editable_price" [% IF EDIT_PRICE %]style="display:none"[% END %]>
+        [% L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric plain-data") %]  <!-- PENDENT: plain-data in DIV noch dem CSS hinzufuegen -->
+        [% L.hidden_tag("order.orderitems[].sellprice_as_number",
+                         ITEM.sellprice_as_number,
+                         disabled=(EDIT_PRICE? 1 : '')) %]
+      </div>
+    </td>
+    <td>
+      [% L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
+      [% SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES && ITEM.active_discount_source.source == '') %]
+      <div name="editable_discount" [% IF !EDIT_DISCOUNT %]style="display:none"[% END %] class="numeric">
+        [% L.input_tag("order.orderitems[].discount_as_percent",
+                        ITEM.discount_as_percent,
+                        size = 5,
+                        disabled=(EDIT_DISCOUNT? '' : 1),
+                        class="recalc reformat_number numeric") %]
+      </div>
+      <div name="not_editable_discount" [% IF EDIT_DISCOUNT %]style="display:none"[% END %]>
+        [% L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %]
+        [% L.hidden_tag("order.orderitems[].discount_as_percent",
+                         ITEM.discount_as_percent,
+                         disabled=(EDIT_DISCOUNT? 1 : '')) %]
+      </div>
+    </td>
+    <td>[% L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal", class="numeric") %]</td>
+  </tr>
+  <tr [% IF !MYCONFIG.show_form_details %]style="display:none"[% END %]>
+    <td colspan="100%">
+      [% IF MYCONFIG.show_form_details || ITEM.render_second_row %]
+        <div name="second_row" data-loaded="1">
+          [% PROCESS order/tabs/_second_row.html ITEM=ITEM TYPE=SELF.type %]
+        </div>
+      [% ELSE %]
+        <div name="second_row" id="second_row_[% ID %]">
+          [% LxERP.t8("Loading...") %]
+        </div>
+      [% END %]
+    </td>
+  </tr>
+</tbody>
diff --git a/templates/design40_webpages/order/tabs/_second_row.html b/templates/design40_webpages/order/tabs/_second_row.html
new file mode 100644
index 000000000..27fe7c32d
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_second_row.html
@@ -0,0 +1,64 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<table>
+  <tr>
+    <td>
+      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order" || TYPE == "purchase_order_confirmation") %]
+        <b>[% 'Serial No.' | $T8 %]</b> [% L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15, "data-validate"="trimmed_whitespaces") %]
+      [% END %]
+      <b>[% 'Project' | $T8 %]</b> [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]
+      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order" || TYPE == "purchase_order_confirmation") %]
+        <b>[% 'Reqdate' | $T8 %]</b> [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]
+      [% END %]
+      <b>[% 'Subtotal' | $T8 %]</b> [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]
+      [% IF TYPE == "sales_order" %]
+        <b>[% 'Recurring billing' | $T8 %]</b>
+        [% L.select_tag("order.orderitems[].recurring_billing_mode", [[ 'always', LxERP.t8('always') ], [ 'once',   LxERP.t8('once')   ], [ 'never',  LxERP.t8('never')  ]], default=ITEM.recurring_billing_mode) %]
+      [% END %]
+      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "sales_quotation") %]
+        <b>[% 'Ertrag' | $T8 %]</b>
+          <span name="linemargin">
+            <span[% IF ITEM.marge_total < 0 %] class="plus0"[% END %]>
+              [% LxERP.format_amount(ITEM.marge_total, 2, 0) %]
+              [% LxERP.format_amount(ITEM.marge_percent, 2, 0) %]%
+            </span>
+          </span>
+        <b> [% 'LP' | $T8 %]</b>
+        [% LxERP.format_amount(ITEM.part.listprice, 2, 0) %]
+        <b>[% 'EK' | $T8 %]</b>
+          [% L.input_tag("order.orderitems[].lastcost_as_number",
+                          ITEM.lastcost_as_number,
+                          size = 5,
+                          class="recalc reformat_number numeric") %]
+      [% END %]
+      <b>[% 'On Hand' | $T8 %]</b>
+        <span class="numeric[%- IF ITEM.part.onhand < ITEM.part.rop -%] plus0[%- END -%]">
+          [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
+        </span>
+      <b>[% 'Optional' | $T8 %]</b>&nbsp;
+        [%- L.yes_no_tag("order.orderitems[].optional", ITEM.optional
+                          class="recalc") %]&nbsp;
+    </td>
+  </tr>
+  <tr>
+    [% SET n = 0 %]
+    [% FOREACH var = ITEM.cvars_by_config %]
+      [% NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
+      [% SET n = n + 1 %]
+      <td>
+        <b>[% var.config.description %]</b>
+        [% L.hidden_tag('order.orderitems[].custom_variables[+].config_id', var.config.id) %]
+        [% L.hidden_tag('order.orderitems[].custom_variables[].id', var.id) %]
+        [% L.hidden_tag('order.orderitems[].custom_variables[].sub_module', var.sub_module) %]
+        [% INCLUDE 'common/render_cvar_input.html' var_name='order.orderitems[].custom_variables[].unparsed_value' %]
+      </td>
+      [% IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
+        </tr><tr>
+      [% END %]
+    [% END %]
+  </tr>
+</table>
diff --git a/templates/design40_webpages/order/tabs/_tax_row.html b/templates/design40_webpages/order/tabs/_tax_row.html
new file mode 100644
index 000000000..ea3158572
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/_tax_row.html
@@ -0,0 +1,31 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% IF QUOTATION %]
+  [% SET n_col = 10 %]
+[% ELSE %]
+  [% SET n_col = 11 %]
+[% END %]
+[% IF SELF.search_cvpartnumber %]
+  [% SET n_col = n_col + 1 %]
+[% END %]
+<tr class="tax_row">
+  <td colspan="[%- n_col %]"></td>
+  [%- IF SELF.show_update_button -%]
+  <td></td>
+  [%- END -%]
+  <th colspan="3">[% IF TAXINCLUDED %][% 'Including' | $T8 %]&nbsp;[% END %][% TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
+  <td class="numeric">[% LxERP.format_amount(TAX.amount, 2, 0) %]</td>
+</tr>
+[% IF TAXINCLUDED %]
+<tr class="tax_row">
+  <td colspan="[%- n_col %]"></td>
+  [%- IF SELF.show_update_button -%]
+  <td></td>
+  [%- END -%]
+  <th colspan="3">[% 'Net amount' | $T8 %]</th>
+  <td class="numeric">[% LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
+</tr>
+[% END%]
diff --git a/templates/design40_webpages/order/tabs/basic_data.html b/templates/design40_webpages/order/tabs/basic_data.html
new file mode 100644
index 000000000..dd3129bf0
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/basic_data.html
@@ -0,0 +1,464 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="ui-tabs-basic-data">
+<!-- PENDENT: EXPERIMENTELL -->
+
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             FORM.email_attachment_id || FORM.workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+<div class="col">
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Customer & Order Information' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
+        [% SET cv_id = SELF.cv _ '_id' %]
+        <td class="wi-lightwide">
+          [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, show_details="1") %]
+        </td>
+      </tr>
+      <tr id='cp_row' [% IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none'[% END %]>
+        <th>[% 'Contact Person' | $T8 %]</th>
+        <td>[% L.select_tag('order.cp_id',
+                            SELF.order.${SELF.cv}.contacts,
+                            default=SELF.order.cp_id,
+                            title_key='full_name_dep',
+                            value_key='cp_id',
+                            with_empty=1,
+                            class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Shipping Address' | $T8 %]</th>
+        <td>
+          <span id='shipto_selection' [% IF !SELF.order.${SELF.cv}.shipto.size %]style='display:none'[% END %]>
+            [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+               FOREACH s = SELF.order.${SELF.cv}.shipto ;
+                 shiptos.push(s) ;
+               END ;
+               L.select_tag('order.shipto_id',
+                             shiptos,
+                             default=SELF.order.shipto_id,
+                             title_key='displayable_id',
+                             value_key='shipto_id',
+                             with_empty=0,
+                             class='wi-lightwide') %]
+          </span>
+          [% L.button_tag("kivi.Order.edit_custom_shipto()",
+                          LxERP.t8("Custom shipto"),
+                          class='button neutral below wi-lightwide') %]
+        </td>
+      </tr>
+      [%- IF SELF.cv == "customer" %]
+      <tr id="billing_address_row"[% IF !SELF.order.customer.additional_billing_addresses.as_list.size %]style="display:none"[% END %]>
+        <th>[% 'Custom Billing Address' | $T8 %]</th>
+        <td>
+          [% L.select_tag('order.billing_address_id',
+                           SELF.order.customer.additional_billing_addresses,
+                           default=SELF.order.billing_address_id,
+                           title_key='displayable_id',
+                           value_key='id',
+                           with_empty=1,
+                           class='wi-lightwide') %]
+        </td>
+      </tr>
+      [%- END %]
+      [% PROCESS order/tabs/_business_info_row.html SELF=SELF %]
+      <tr>
+        <th>[% 'Steuersatz' | $T8 %]</th>
+        <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', class='recalc wi-lightwide') %]</td>
+      </tr>
+      [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
+      [% SET show_exchangerate = (SELF.order.currency_id != INSTANCE_CONF.get_currency_id) %]
+      <tr id="currency_settings">
+        <th>[% 'Currency' | $T8 %]</th>
+        <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name', class='wi-lightwide') %]</td>
+      </tr>
+      <tr id="exchangerate_settings" [%- IF !show_exchangerate %]style='display:none'[%- END %]>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
+          [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, 'data-validate'=show_exchangerate ? 'required' : '', class="reformat_number_as_null_number numeric wi-small") %]
+          [% INSTANCE_CONF.default_currency %]
+          [% L.hidden_tag('old_currency_id', currency_id) %]
+          [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
+        </td>
+      </tr>
+      [% IF SELF.all_languages.size %]
+        <tr>
+          <th>[% 'Language' | $T8 %]</th>
+          <td>
+            [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, class='wi-lightwide') %]
+          </td>
+        </tr>
+      [% END %]
+      [% IF SELF.all_departments.size %]
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>
+            [% L.select_tag('order.department_id', SELF.all_departments, default=SELF.order.department_id, title_key='description', with_empty=1, class='wi-lightwide') %]
+          </td>
+        </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Shipping Point' | $T8 %]</th>
+        <td>[% L.input_tag('order.shippingpoint', SELF.order.shippingpoint, class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Ship via' | $T8 %]</th>
+        <td>[% L.input_tag('order.shipvia', SELF.order.shipvia, class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Transaction description' | $T8 %]</th>
+        <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Project Number' | $T8 %]</th>
+        <td>[% P.project.picker('order.globalproject_id', SELF.order.globalproject_id, class='wi-lightwide') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Terms' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+          [% L.select_tag('order.payment_id',
+                            SELF.all_payment_terms,
+                            default = SELF.order.payment_id,
+                            with_empty = 1,
+                            title_key = 'description',
+                            class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Delivery Terms' | $T8 %]</span>
+          [% L.select_tag('order.delivery_term_id',
+                            SELF.all_delivery_terms,
+                            default = SELF.order.delivery_term_id,
+                            with_empty = 1,
+                            title_key = 'description',
+                            class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+      <tr id="taxincluded_row_id" [% IF !SELF.taxes.size %]class="hidden"[% END %]>
+        <th><label for="order.taxincluded">[% 'Tax Included' | $T8 %]</label></th>
+        <td>[% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %]</td>
+      </tr>
+      [% IF SELF.type == "sales_order" %]
+        <tr>
+          <th>[% 'Periodic Invoices' | $T8 %]</th>
+          <td>
+            <span id='periodic_invoices_status' class="data wi-normal wi-lightwide">[% SELF.periodic_invoices_status %]</span>
+            <span class="button-inline">
+              [% L.button_tag('kivi.Order.show_periodic_invoices_config_dialog()', LxERP.t8('Configure'), class='neutral inline below') %]
+              <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank" class="button wi-tiny neutral" title="[% 'Documentation about periodic invoices in a new window/tab' | $T8 %]">?</a>
+            </span>
+          </td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+</div><!-- /.col -->
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Notes' | $T8 %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <td class="wi-wide">[% L.textarea_tag('order.notes', SELF.order.notes, rows=7, class="texteditor wi-wide") %]</td>
+    </tr>
+    <tr>
+      <td><span class="label above">[% 'Internal Notes' | $T8 %]</span>[% L.textarea_tag('order.intnotes', SELF.order.intnotes, class="wi-wide") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Handling, Numbers & Dates' | $T8 %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    [% IF SELF.order.id %]
+    <tr>
+    <th><label for="order.delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label></th>
+    <td>[% L.yes_no_tag('order.delivered', SELF.order.delivered, class='wi-small') %]</td>
+    </tr>
+    <tr>
+      <th><label for="order.closed">[% 'Closed' | $T8 %]</label></th>
+      <td>[% L.yes_no_tag('order.closed', SELF.order.closed, class='wi-small') %]</td>
+    </tr>
+    [% END %]
+
+    [%- IF SELF.all_statuses.size %]
+    <tr>
+      <th>[% 'Status' | $T8 %]</th>
+      <td>[% L.select_tag('order.order_status_id',
+        SELF.all_statuses,
+        default=SELF.order.order_status_id,
+        with_empty=1,
+        title_key='name') %]</td>
+    </tr>
+    [%- END -%]
+
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('order.employee_id',
+        SELF.all_employees,
+        default=(SELF.order.employee_id ? SELF.order.employee_id : SELF.current_employee_id),
+        class='wi-normal',
+        title_key='safe_name') %]</td>
+    </tr>
+    [% IF SELF.cv == 'customer' %]
+      <tr>
+        <th>[% 'Salesman' | $T8 %]</th>
+        <td>[% L.select_tag('order.salesman_id',
+          SELF.all_salesmen,
+          default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+          class='wi-normal',
+          title_key='safe_name') %]</td>
+      </tr>
+    [% END %]
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %]
+      <tr>
+        <th>[% IF SELF.type == "purchase_order_confirmation" %][% 'Order Confirmation Number' | $T8 %][% ELSE %][% 'Order Number' | $T8 %][% END %]</th>
+        <td>
+          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+            [% L.input_tag('order.ordnumber', SELF.order.ordnumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
+          [%- ELSIF SELF.order.id %]
+            [% HTML.escape(SELF.order.ordnumber) %]
+            [% L.hidden_tag("order.ordnumber", SELF.order.ordnumber) %]
+          [% ELSE %]
+            [% LxERP.t8("will be set upon saving") %]
+          [%- END %]
+        </td>
+      </tr>
+    [% END %]
+
+    [% IF SELF.type == "purchase_order_confirmation" %]
+      <tr>
+        <th>[% 'Order Number' | $T8 %]</th>
+        [%-
+          numbers = [];
+          FOREACH p = SELF.order.preceding_purchase_orders();
+            numbers.push(HTML.escape(p.ordnumber));
+          END;
+        %]
+        <td><span class="data wi-normal">[% numbers.join(', ') %]</span></td>
+      </tr>
+    [% END %]
+
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") %]
+      [% SET quo_nr_txt = 'Quotation Number' %]
+    [% ELSE %]
+      [% SET quo_nr_txt = 'RFQ Number' %]
+    [% END %]
+    <tr>
+      <th>[% quo_nr_txt | $T8 %]</th>
+      <td>
+        [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
+          [% L.input_tag('order.quonumber', SELF.order.quonumber, class='wi-normal') %]
+        [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
+          [% L.input_tag('order.quonumber', SELF.order.quonumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
+        [%- ELSIF SELF.order.id %]
+          [% HTML.escape(SELF.order.quonumber) %]
+          [% L.hidden_tag("order.quonumber", SELF.order.quonumber) %]
+        [% ELSE %]
+          [% LxERP.t8("will be set upon saving") %]
+        [%- END %]
+      </td>
+    </tr>
+    [% IF (SELF.type == "purchase_order_confirmation") -%]
+      <tr>
+        <th>[% 'Vendor Confirmation Number' | $T8 %]</th>
+        <td>[% L.input_tag('order.vendor_confirmation_number', SELF.order.vendor_confirmation_number, class='wi-normal') %]</td>
+      </tr>
+    [%- END %]
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %]
+      <tr>
+        <th>[% 'Customer Order Number' | $T8 %]</th>
+        <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, class='wi-normal') %]</td>
+      </tr>
+    [% END %]
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
+      [% SET transdate_txt = 'Order Date' %]
+    [% ELSIF SELF.type == "purchase_order_confirmation" -%]
+      [%- SET transdate_txt = 'Confirmation Date' -%]
+    [% ELSIF (SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") %]
+      [% SET transdate_txt = 'Quotation Date' %]
+    [% ELSE %]
+      [% SET transdate_txt = 'RFQ Date' %]
+    [% END %]
+    <tr>
+      <th>[% transdate_txt | $T8 %]</th>
+      <td>[% L.date_tag('order.transdate_as_date', SELF.order.transdate_as_date, class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Tax point' | $T8 %]</th>
+      <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class='wi-date recalc') %]</td>
+    </tr>
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") %]
+      [% SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' %]
+    [% ELSIF SELF.type == "sales_quotation" %]
+      [% SET reqdate_txt = 'Valid until'; SET reqdate_class = '' %]
+    [% ELSE %]
+      [% SET reqdate_txt = 'Required by'; SET reqdate_class = 'recalc' %]
+    [% END %]
+    <tr>
+      <th>[% reqdate_txt | $T8 %]</th>
+      <td>[% L.date_tag('order.reqdate_as_date', SELF.order.reqdate_as_date, class='wi-date ' _ reqdate_class) %]</td>
+    </tr>
+    [% IF SELF.type == "sales_quotation" %]
+      <tr>
+        <th>[% 'Order probability' | $T8 %]</th>
+        <td>[% L.select_tag('order.order_probability', SELF.order_probabilities, title='title', default=SELF.order.order_probability) %]%</td>
+      </tr>
+      <tr>
+        <th>[% 'Expected billing date' | $T8 %]</th>
+        <td>[% L.date_tag('order.expected_billing_date_as_date', SELF.order.expected_billing_date_as_date, class='wi-date') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Insert Date' | $T8 %]</th>
+      <td><span class="data wi-normal">[% SELF.order.itime_as_date %]</span></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+[%- IF order_item_input_position == 0 -%]
+  [% PROCESS order/tabs/_item_input.html SELF=SELF %]
+[%- END -%]
+
+[%- IF SELF.positions_scrollbar_height -%]
+  [%- SET scroll_style = 'style="overflow-y: auto; height:' _ SELF.positions_scrollbar_height _ 'vh;"' -%]
+[%- ELSE -%]
+  [%- SET scroll_style = '' -%]
+[%- END -%]
+<div id="row_table_scroll_id" class="wrapper horizontal-scroll-wrapper" [%- scroll_style -%]>
+
+<table id="row_table_id" class="tbl-list">
+  <caption>[% 'Articles' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th class="center">
+        [% IF MYCONFIG.show_form_details %]
+          [% L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', class='row-icon', "data-expanded"="1") %]
+        [% ELSE %]
+          [% L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all', class='row-icon') %]
+        [% END %]
+      </th>
+      <th>[% 'position'     | $T8 %] </th>
+      <th style='text-align:center'><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      <th style='text-align:center'><img src="image/close.png" alt="[% LxERP.t8('delete item') %]"></th>
+      [%- IF SELF.show_update_button -%]
+      <th class="listheading" style='text-align:center' nowrap width="1">
+        [%- L.img_tag(src="image/rotate_cw.svg",
+                      alt=LxERP.t8('Update from master data'),
+                      title= LxERP.t8('Update from master data'),
+                      onclick="if (!confirm('" _ LxERP.t8("Are you sure to update all positions from master data?") _ "')) return false; kivi.Order.update_all_rows_from_master_data();",
+                      id='update_from_master', class='row-icon') %]
+      </th>
+      [%- END %]
+      <th id="partnumber_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("partnumber")'> [% 'Partnumber'  | $T8 %]</a></th>
+      [%- IF SELF.search_cvpartnumber -%]
+      <th id="cvpartnumber_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("cvpartnumber")'>[%- SELF.cv == "customer" ? LxERP.t8('Customer Part Number') : LxERP.t8('Model') %]</a></th>
+      [%- END -%]
+      <th id="partclass_header_id">[% 'Type'  | $T8 %]</th>
+      <th id="description_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[% 'Description' | $T8 %]</a></th>
+      [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
+      <th id="shipped_qty_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("shipped_qty")'>[% 'Delivered' | $T8 %]</a></th>
+      [%- END -%]
+      <th id="qty_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [% 'Qty'         | $T8 %]</a></th>
+      <th >[% 'Price Factor' | $T8 %]</th>
+      <th >[% 'Unit'         | $T8 %]</th>
+      <th >[% 'Price Source' | $T8 %]</th>
+      <th id="sellprice_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("sellprice")'> [% 'Price'       | $T8 %]</a></th>
+      <th id="discount_header_id" ><a href='#' onClick='javascript:kivi.Order.reorder_items("discount")'>  [% 'Discount'    | $T8 %]</a></th>
+      <th>[% 'Extended'     | $T8 %]</th>
+    </tr>
+  </thead>
+  [% FOREACH item = SELF.order.items_sorted %]
+    [% PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id) %]
+  [% END %]
+  <tfoot id="row_table_footer">
+    [%- IF order_item_input_position == 1 -%]
+      [% PROCESS order/tabs/_item_below_input.html SELF=SELF %]
+    [%- END -%]
+
+    [% IF (SELF.type == "sales_quotation") || (SELF.type == "request_quotation")  || (SELF.type == "purchase_quotation_intake") %]
+      [% SET add_col = 0 %]
+    [% ELSE %]
+      [% SET add_col = 1 %]
+    [% END %]
+    [% IF SELF.search_cvpartnumber %]
+      [% SET add_col = add_col + 1 %]
+    [% END %]
+    <tr id="subtotal_row_id">
+      <td colspan="[%- 10 + add_col %]"></td>
+      [%- IF SELF.show_update_button -%]
+      <td></td>
+      [%- END -%]
+      <th colspan="3">[% IF !SELF.order.taxincluded %][% 'Subtotal' | $T8 %][% END %]</th>
+      <td class="numeric">[% IF !SELF.order.taxincluded %][% L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %][% END %]</td>
+    </tr>
+    [% FOREACH tax = SELF.taxes %]
+      [% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]
+    [% END %]
+    <tr id="amount_row_id">
+      [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+      [%- SET marge_class = ((SELF.order.marge_total || 0) < 0) ? 'plus0' : '' -%]
+      <th colspan="2">[% 'Ertrag' | $T8 %]</th>
+      <td colspan="2" class="numeric">[%- L.div_tag(SELF.order.marge_total_as_number, id='marge_total_id', class=marge_class) %]</td>
+      <th colspan="2">[% 'Ertrag prozentual' | $T8 %]</th>
+      <td class="numeric">[%- LxERP.format_amount(SELF.order.marge_percent, 2) %] %</td>
+      [%- ELSE -%]
+      <td colspan="7"></td>
+      [%- END -%]
+      [%- IF SELF.show_update_button -%]
+      <td></td>
+      [%- END -%]
+      <td colspan="[%- 3 + add_col %]"></td>
+      <th colspan="3">[% 'Total' | $T8 %]</th>
+      <td class="numeric">[% L.div_tag(SELF.order.amount_as_number, id='amount_id') %]</td>
+    </tr>
+  </tfoot>
+</table>
+[% IF order_item_input_position == 1 %]
+  [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+[%- END -%]
+
+</div><!-- /#row_table_scroll_id /.wrapper -->
+
+</div><!-- /#ui-tabs-basic-data -->
+
+[% L.sortable_element('#row_table_id') %]
diff --git a/templates/design40_webpages/order/tabs/phone_notes.html b/templates/design40_webpages/order/tabs/phone_notes.html
new file mode 100644
index 000000000..7b3760ccc
--- /dev/null
+++ b/templates/design40_webpages/order/tabs/phone_notes.html
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%- USE P %]
+
+<div id="phone-notes" class="wrapper">
+ [% IF ( SELF.order.phone_notes && SELF.order.phone_notes.size ) %]
+  <table class="tbl-list">
+   <thead>
+    <tr>
+      <th class="listheading">[% 'Subject' | $T8 %]</th>
+      <th class="listheading">[% 'Created on' | $T8 %]</th>
+      <th class="listheading">[% 'Created by' | $T8 %]</th>
+    </tr>
+   </thead>
+   <tbody>
+    [%- FOREACH row = SELF.order.phone_notes %]
+     <tr class="listrow">
+       <td>[% P.link_tag('#', row.subject, onclick="kivi.Order.load_phone_note(" _ HTML.url(row.id) _ ", '" _ HTML.escape(row.subject) _ "', '" _ row.body _ "')") %]</td>
+       <td>[% row.itime.to_kivitendo | html %]</td>
+       <td>[% row.employee.safe_name | html %]</td>
+     </tr>
+    [% END %]
+   </tbody>
+  </table>
+ [% END %]
+
+  [% L.hidden_tag('phone_note.id') %]
+
+  <table tbl-horizontal>
+    <caption id='phone_note_edit_text'>[% 'Add note' | $T8 %]</caption>
+    <colgroup><col class="wi-verysmall"><col class="wi-wider"></colgroup>
+    <tbody>
+     <tr>
+      <th>[% 'Subject' | $T8 %]</th>
+      <td>[% L.input_tag('phone_note.subject', '', class="wi-wider") %]</td>
+     </tr>
+     <tr>
+      <th>[% 'Body' | $T8 %]</th>
+      <td>[% L.textarea_tag('phone_note.body', '', style="height: 350px", class="texteditor wi-wider") %]</td>
+     </tr>
+    </tbody>
+  </table>
+
+ <p>
+   [% P.button_tag("kivi.Order.save_phone_note()",   LxERP.t8('Save')) %]
+   [% P.button_tag("kivi.Order.delete_phone_note()", LxERP.t8('Delete'), id = 'phone_note_delete_button', style='display:none') %]
+   [% P.button_tag("kivi.Order.cancel_phone_note()", LxERP.t8('Cancel'), class="neutral") %]
+ </p>
+
+</div>
diff --git a/templates/design40_webpages/order_items_search/_order_item_list.html b/templates/design40_webpages/order_items_search/_order_item_list.html
new file mode 100644
index 000000000..8a9d3f291
--- /dev/null
+++ b/templates/design40_webpages/order_items_search/_order_item_list.html
@@ -0,0 +1,47 @@
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE P %]
+[% SET qty_round = 2 %]
+
+<table class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+      <th>[%               LxERP.t8("Part")           %]</th>
+      <th>[%               LxERP.t8("Customer")       %]</th>
+      <th class="right">[% LxERP.t8("Order")          %]</th>
+      <th>[%               LxERP.t8("Order Date")     %]</th>
+      <th class="right" colspan="2">[% LxERP.t8("Qty")       ; "/" ;LxERP.t8("Unit") %]</th>
+      <th class="right" colspan="2">[% LxERP.t8("Delivered") ; "/" ;LxERP.t8("Unit") %]</th>
+      <th class="right">[% LxERP.t8("Price")          %]</th>
+      <th class="right">[% LxERP.t8("Discount")       %]%</th>
+      <th>[%               LxERP.t8("Delivery Order") %]</th>
+      [% IF FORM.show_images %]
+        <th>[%             LxERP.t8("Image")          %]</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH order_item = SELF.orderitems %]
+      <tr id="tr_[% loop.count %]">
+      <td>[%                   order_item.part.presenter.part(no_link => 0)               %]</td>
+      <td>[%                   order_item.order.customer.presenter.customer(no_link => 0) %]</td>
+      <td class="numeric">[%   order_item.order.presenter.sales_order(no_link => 0)       %]</td>
+      <td>[%                   order_item.order.transdate.to_kivitendo %]</td>
+      <td class="numeric[% IF order_item.delivered_qty == order_item.qty %] plus[% ELSE %] minus[% END %]">
+          [%                   LxERP.format_amount(order_item.qty, qty_round) %]
+      </td>
+      <td>[% order_item.unit | html %]</td>
+      <td class="numeric">[% LxERP.format_amount(order_item.delivered_qty, qty_round) %]</td>
+      <td>[% order_item.unit | html %]</td>
+      <td class="numeric">[% order_item.sellprice_as_number %]</td>
+      <td class="numeric">[% order_item.discount_as_percent %]</td>
+      <td>[% order_item.deliveryorders %]</td>
+      [% IF FORM.show_images %]
+        <td>[% IF order_item.part.image %]<a href="[% order_item.part.image | html %]" target="_blank"><img height="32" src="[% order_item.part.image | html %]"/></a>[% END %]</td>
+      [% END %]
+      </tr>
+    [% END %]
+  </tbody>
+</table>
diff --git a/templates/design40_webpages/order_items_search/order_items.html b/templates/design40_webpages/order_items_search/order_items.html
new file mode 100644
index 000000000..9dd4b4763
--- /dev/null
+++ b/templates/design40_webpages/order_items_search/order_items.html
@@ -0,0 +1,113 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% SET show_images=0 %]
+
+<h1>[% title %]</h1>
+<div class="wrapper">
+
+
+<form id="filter" name="filter" method="post" action="controller.pl">
+
+[% BLOCK filter_toggle_panel %]
+  <table class="tbl-horizontal text">
+    <tbody>
+      <tr>
+        <th>[% 'Customer' | $T8 %]</th>
+        <td class="wi-lightwide">[% P.customer_vendor.picker('filter.order.customer.id', FORM.customer_id, type='customer', class='filter wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Part' | $T8 %]</th>
+        <td>[% L.input_tag('filter.part.all:substr:multi::ilike', FORM.part, class="filter wi-lightwide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Order Number' | $T8 %]</th>
+        <td>[% L.input_tag('filter.order.ordnumber:substr::ilike', FORM.ordnumber, class="filter wi-lightwide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Order Date' | $T8 %]</th>
+        <td>
+          [% #'From' | $T8 %]
+          [% L.date_tag("filter.order.transdate:date::ge", filter.order.transdate_date___ge, class="filter wi-date") %]
+          [% 'Until' | $T8 %] [% L.date_tag('filter.order.transdate:date::le', filter.order.transdate_date__le, class="filter wi-date") %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Description' | $T8 %]</th>
+        <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, class="filter wi-lightwide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Long Description' | $T8 %]</th>
+        <td>[% L.input_tag('filter.longdescription:substr::ilike', filter.longdescription_substr__ilike, class="filter wi-lightwide") %] </td>
+      </tr>
+      <tr>
+        <th>[% 'Show images' | $T8 %]</th>
+        <td>[% L.checkbox_tag('show_images', checked=show_images) %] </td>
+      </tr>
+    </tbody>
+  </table>
+  <div class="buttons">
+    [% L.button_tag("this.form.reset(); refresh_plot();", LxERP.t8("Reset")) %]
+  </div>
+[% END #filter_toggle_panel %]
+
+
+<div class="wrapper">
+  [% SET display_status = 'open' %]
+  [% INCLUDE 'common/toggle_panel.html' %]
+</div><!-- /.wrapper -->
+
+</form>
+
+
+<div id="orderitems">
+  [% PROCESS 'order_items_search/_order_item_list.html' %]
+</div>
+
+</div><!-- /.wrapper -->
+
+<script type="text/javascript">
+  $(function() {
+    [% IF FORM.customer_id %]
+      $( "#filter_part_all_substr_multi_ilike" ).focus();
+    [% ELSE %]
+      $( "#filter_order_customer_id_name" ).focus();
+    [% END %]
+
+    addInputCallback($(".filter"), refresh_plot , 300 );
+
+    $('#show_images').change(function(){
+      refresh_plot();
+    });
+  });
+
+
+  function refresh_plot() {
+    var filterdata = $('#filter').serialize()
+    var url = './controller.pl?action=OrderItem/order_item_list_dynamic_table&' + filterdata;
+    $.ajax({
+        url : url,
+        type: 'POST',
+        success: function(data){
+            $('#orderitems').html(data);
+        }
+    })
+
+  };
+
+function addInputCallback(inputfield, callback, delay) {
+    var timer = null;
+    inputfield.on('keyup', function() {
+        if (timer) {
+            window.clearTimeout(timer);
+        }
+        timer = window.setTimeout( function() {
+            timer = null;
+            callback();
+        }, delay );
+    });
+    inputfield = null;
+}
+</script>
diff --git a/templates/design40_webpages/part/_assembly.html b/templates/design40_webpages/part/_assembly.html
new file mode 100644
index 000000000..1e669f0fc
--- /dev/null
+++ b/templates/design40_webpages/part/_assembly.html
@@ -0,0 +1,129 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div id="assembly">
+
+[% L.hidden_tag('assembly_id', SELF.part.id) %]
+
+
+<div class="wrapper" style="overflow-y: auto; height:65vh;">
+<table id="assembly_items" class="tbl-list">
+  <caption>[% 'Assembly items' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th style="display:none"></th>
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+        <th class="img"><img src="image/close.png" alt="[% LxERP.t8('delete item') %]"></th>
+      [% END %]
+      <th>[% 'position' | $T8 %]</th>
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+        <th style="img"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      [% END %]
+      <th id="partnumber_header_id"><a href="#" onclick="kivi.Part.reorder_items('partnumber')">[% 'Partnumber' | $T8 %]</a></th>
+      <th>[% 'Type' | $T8 %]</th>
+      <th id="partdescription_header_id"><a href="#" onclick="kivi.Part.reorder_items('description')">[% 'Description' | $T8 %]</a></th>
+      <th id="qty_header_id"><a href="#" onclick="kivi.Part.reorder_items('qty')">[% 'Qty' | $T8 %]</a></th>
+      <th>[% 'Unit' | $T8 %]</th>
+      <th class="right">[% 'BOM' | $T8 %]</th>
+      <th class="right">[% 'Line Total' | $T8 %]</th>
+      <th class="right">[% 'Price Factor' | $T8 %]</th>
+      <th id="sellprice_header_id"><a href="#" onclick="kivi.Part.reorder_items('sellprice')">[% 'Sellprice'| $T8 %]</a></th>
+      <th id="lastcost_header_id"><a href="#" onclick="kivi.Part.reorder_items('lastcost')">[% 'Lastcost' | $T8 %]</a></th>
+      <th id="_header_id"><a href="#" onclick="kivi.Part.reorder_items('partsgroup')">[% 'Partsgroup' | $T8 %]</a></th>
+    </tr>
+  </thead>
+  <tbody id="assembly_rows">
+    [% assembly_html %]
+  </tbody>
+  <tfoot id="assembly_input">
+    <tr>
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+        <td></td>
+        <td></td>
+        <th>[% 'Part' | $T8 %]</th>
+        <td colspan="4">
+          [% P.part.picker(
+              'add_items[+].parts_id',
+              '',
+              class='wi-lightwide',
+              multiple='1',
+              id='assembly_picker',
+              action={set_multi_items='kivi.Part.set_multi_assembly_items', commit_one='kivi.Part.add_assembly_item'}
+          ) %]
+          [% L.button_tag("kivi.Part.add_assembly_item()", LxERP.t8("Add")) %]
+          [% L.hidden_tag('add_items[].qty_as_number', 1) %]
+        </td>
+      [% ELSE %]
+        <td></td>
+        <td></td>
+        <td colspan="3"></td>
+      [% END %]
+      <td></td>
+      <td colspan="3" class="right">[% #'Totals' | $T8 %][% #":" %]</td>
+      <td id="items_sellprice_sum" class="numeric">[% LxERP.format_amount(items_sellprice_sum, 2, 0) %]</td>
+      <td id="items_lastcost_sum" class="numeric">[% LxERP.format_amount(items_lastcost_sum, 2, 0) %]</td>
+      <td></td>
+    </tr>
+    <tr>
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+      <td colspan="9"></td>
+      [% ELSE %]
+      <td colspan="7"></td>
+      [% END %]
+      <td align="right">[% 'Margepercent' | $T8 %]:</td>
+      <td></td>
+      <td id="items_sum_diff"      class="numeric">
+      [% IF items_sellprice_sum > 0 %]
+        [%- LxERP.format_amount(100 - items_lastcost_sum / items_sellprice_sum * 100,      2, 0) %]
+      [% END %]
+      </td>
+      <td colspan="3"></td>
+    </tr>
+    <tr>
+    <tr>
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+      <td colspan="9"></td>
+      [% ELSE %]
+      <td colspan="7"></td>
+      [% END %]
+      <td align="right">[% 'Margetotal' | $T8 %]:</td>
+      <td></td>
+      <td id="items_sum_diff"      class="numeric">[%- LxERP.format_amount(items_sum_diff,      2, 0) %]</td>
+      <td colspan="3"></td>
+    </tr>
+    <tr>
+    </tr>
+    <tr class="blank">
+      [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
+        <td></td>
+        <td></td>
+      [% END %]
+      <td colspan="4">[% L.button_tag('$("#assembly_picker").data("part_picker").open_dialog()', LxERP.t8('Add multiple items'), class="neutral") %]</td>
+      <!--<td></td> <td></td><td></td> -->
+      <td></td>
+      <td colspan="5" class="right">[% L.button_tag("kivi.Part.set_assembly_sellprice()", LxERP.t8("Set sellprice")) %]</td>
+      <td colspan="3"></td>
+    </tr>
+  </tfoot>
+</table>
+</div>
+
+[% L.sortable_element('#assembly_rows') %]
+
+<script type="text/javascript">
+  $(function() {
+    $("#assembly").on( "focusout", ".recalc", function( event )  {
+      kivi.Part.assembly_recalc();
+    });
+
+    $('#assembly_rows').on('sortstop', function(event, ui) {
+      $('#assembly thead a img').remove();
+      kivi.Part.renumber_positions();
+    });
+  })
+</script>
+
+</div>
diff --git a/templates/design40_webpages/part/_assembly_row.html b/templates/design40_webpages/part/_assembly_row.html
new file mode 100644
index 000000000..7abc06c93
--- /dev/null
+++ b/templates/design40_webpages/part/_assembly_row.html
@@ -0,0 +1,46 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<tr class="assembly_item_row">
+  <td style="display:none">
+    [% IF orphaned || AUTH.assert('assembly_edit', 1) %]
+      [% L.hidden_tag("assembly_items[+].parts_id", ITEM.part.id) %]
+    [% END %]
+  </td>
+  <td[% UNLESS orphaned || AUTH.assert('assembly_edit', 1) %] style="display:none"[% END %]>
+    [% L.button_tag("kivi.Part.delete_item_row(this)", LxERP.t8("X"), class="wi-verytiny") %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+  </td>
+  <td class="numeric">
+    <div id="position" class="numeric">[% HTML.escape(position) or HTML.escape(ITEM.position) %]</div>
+  </td>
+  <td class="center"[% UNLESS orphaned || AUTH.assert('assembly_edit', 1) %] style="display:none"[% END %]>
+    <img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop">
+  </td>
+  <td>[% ITEM.part.presenter.part %]</td>
+  <td>[% P.part.type_abbreviation(ITEM.part.part_type) %][% P.part.classification_abbreviation(ITEM.part.classification_id) %]</td>
+  <td>[% HTML.escape(ITEM.part.description) %]</td>
+  <td class="numeric">
+    [% IF orphaned || AUTH.assert('assembly_edit', 1) %]
+      [% L.input_tag("assembly_items[].qty_as_number",
+                      ITEM.qty_as_number,
+                      size = 10,
+                      class="recalc reformat_number numeric") %]
+    [% ELSE %]
+      <span class="data">[% ITEM.qty_as_number | html %]</span>
+    [% END %]
+  </td>
+  <td>[% ITEM.part.unit | html %]</td>
+  [% IF orphaned || AUTH.assert('assembly_edit', 1) %]
+    <td class="center">[% L.checkbox_tag("assembly_items[].bom", checked=ITEM.bom, for_submit=1) %]</td>
+  [% ELSE %]
+    <td class="center">[% IF ITEM.bom %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
+  [% END %]
+  <td class="right">[% L.div_tag(LxERP.format_amount(ITEM.linetotal_sellprice, 3, 0), name="linetotal") %]</td>
+  <td class="right">[% ITEM.part.price_factor.description %]</td>
+  <td class="right">[% ITEM.part.sellprice_as_number %]</td>
+  <td class="right">[% ITEM.part.lastcost_as_number %]</td>
+  <td>[% HTML.escape(ITEM.part.partsgroup.partsgroup) %]</td>
+</tr>
diff --git a/templates/design40_webpages/part/_assortment.html b/templates/design40_webpages/part/_assortment.html
new file mode 100644
index 000000000..c403c51be
--- /dev/null
+++ b/templates/design40_webpages/part/_assortment.html
@@ -0,0 +1,118 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div id="assortment" class="wrapper" style="overflow-y: auto; height:65vh;">
+
+[% L.hidden_tag('assortment_id', SELF.part.id) %]
+
+<table id="assortment_items" class="tbl-list">
+  <caption>[% 'Assortment items' | $T8 %]</caption>
+  <thead>
+    <tr>
+      <th style="display:none"></th>
+      [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
+        <th style="text-align:center"><img src="image/close.png" alt="[% LxERP.t8('delete item') %]"></th>
+      [% END %]
+      <th>[% 'Position' | $T8 %] </th>
+      [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
+        <th style="text-align:center"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      [% END %]
+      <th id="partnumber_header_id" >
+        <a href='javascript:kivi.Part.reorder_items("partnumber")'>[% 'Partnumber' | $T8 %]</a>
+      </th>
+      <th id="partdescription_header_id">
+        <a href='javascript:kivi.Part.reorder_items("description")'>[% 'Description' | $T8 %]</a>
+      </th>
+      <th id="qty_header_id">
+        <a href='javascript:kivi.Part.reorder_items("qty")'>[% 'Qty' | $T8 %]</a>
+      </th>
+      <th>[% 'Unit'         | $T8 %] </th>
+      <th>[% 'Charge'       | $T8 %] </th>
+      <th>[% 'Line Total'   | $T8 %] </th>
+      <th class="right">[% 'Price Factor' | $T8 %]</th>
+      <th id="sellprice_header_id" class="right">
+        <a href='javascript:kivi.Part.reorder_items("sellprice")'> [% 'Sellprice' | $T8 %]</a>
+      </th>
+      <th id="lastcost_header_id" class="right">
+        <a href='javascript:kivi.Part.reorder_items("lastcost")'> [% 'Lastcost' | $T8 %]</a>
+      </th>
+      <th id="_header_id" class="right">
+        <a href='javascript:kivi.Part.reorder_items("partsgroup")'> [% 'Partsgroup' | $T8 %]</a>
+      </th>
+    </tr>
+  </thead>
+  <tbody id="assortment_rows">
+    [% assortment_html %]
+  </tbody>
+  <tfoot id="assortment_input">
+    <tr>
+      [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
+        <td></td>
+        <td></td>
+        <td></td>
+        <td colspan="4">
+          [% P.part.picker('add_items[+].parts_id', '', class='wi-lightwide', multiple=1, id='assortment_picker', action={set_multi_items='kivi.Part.set_multi_assortment_items', commit_one='kivi.Part.add_assortment_item'}, placeholder=LxERP.t8('Search & Add Article')) %]
+          [% L.button_tag("kivi.Part.add_assortment_item()", LxERP.t8("Add")) %]
+          [% L.hidden_tag('add_items[].qty_as_number', 1) %]
+        </td>
+      [% ELSE %]
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      [% END %]
+      <td></td>
+      <td></td>
+      <td></td>
+      <td class="numeric" id="items_sellprice_sum">[% LxERP.format_amount(items_sellprice_sum, 2, 0) %]</td>
+      <td class="numeric" id="items_lastcost_sum" >[% LxERP.format_amount(items_lastcost_sum,  2, 0) %]</td>
+      <td class="numeric" id="items_sum_diff"     >[% LxERP.format_amount(items_sum_diff,      2, 0) %]</td>
+    </tr>
+    <tr class="blank">
+     [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
+       <td></td>
+       <td></td>
+       <td></td>
+       <td colspan="2">[% L.button_tag('$("#assortment_picker").data("part_picker").open_dialog()', LxERP.t8('Add multiple items'), class='neutral') %]</td>
+     [% ELSE %]
+       <td></td>
+       <td></td>
+       <td></td>
+     [% END %]
+     <td></td>
+     <td></td>
+     <td></td>
+     <td></td>
+     <td></td>
+     <td class="right">[% L.button_tag("kivi.Part.set_assortment_sellprice()", LxERP.t8("Set sellprice")) %]</td>
+     <td class="right">[% L.button_tag("kivi.Part.set_assortment_lastcost()",  LxERP.t8("Set lastcost"))  %]</td>
+     <td></td>
+    </tr>
+  </tfoot>
+
+</table><!-- /#assortment.wrapper -->
+
+[% L.sortable_element('#assortment_rows') %]
+
+</div>
+
+<script type="text/javascript">
+  $(function() {
+    $('#assortment').on( 'focusout', '.recalc', function( event )  {
+      kivi.Part.assortment_recalc();
+    });
+
+    $('#assortment').on( 'change', ':checkbox', function( event )  {
+      kivi.Part.assortment_recalc();
+    });
+
+    $('#assortment_rows').on('sortstop', function(event, ui) {
+      $('#assortment thead a img').remove();
+      kivi.Part.renumber_positions();
+    });
+  })
+</script>
diff --git a/templates/design40_webpages/part/_assortment_row.html b/templates/design40_webpages/part/_assortment_row.html
new file mode 100644
index 000000000..0245a250e
--- /dev/null
+++ b/templates/design40_webpages/part/_assortment_row.html
@@ -0,0 +1,73 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<tr>
+  <td style="display:none">
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
+      [% L.hidden_tag("assortment_items[+].parts_id", ITEM.part.id) %]
+    [% END %]
+  </td>
+  <td class="center"[% UNLESS orphaned || AUTH.assert('assortment_edit', 1) %] style="display:none"[% END %]>
+    [% L.button_tag("kivi.Part.delete_item_row(this)", LxERP.t8("✖"), class="wi-verytiny neutral delete-item") %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+  </td>
+  <td class="center">
+    <div id="position">
+      [% HTML.escape(position) or HTML.escape(ITEM.position) %]
+    </div>
+  </td>
+  <td class="center"[% UNLESS orphaned || AUTH.assert('assortment_edit', 1) %] style="display:none"[% END %]>
+    <img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop">
+  </td>
+  <td>
+    [% ITEM.part.presenter.part %]
+  </td>
+  <td>
+     [% HTML.escape(ITEM.part.description) %]
+  </td>
+  <td class="numeric">
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
+      [% L.input_tag("assortment_items[].qty_as_number",
+                      ITEM.qty_as_number,
+                      maxsize = 10,
+                      class="recalc reformat_number numeric wi-verysmall",
+                      size=10) %]
+    [% ELSE %]
+      [% ITEM.qty_as_number | html %]
+    [% END %]
+  </td>
+  <td>
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
+      [% L.select_tag("assortment_items[].unit",
+                      ITEM.part.available_units,
+                      default = ITEM.part.unit,
+                      title_key = 'name',
+                      value_key = 'name',
+                      class = 'unitselect wi-verysmall') %]
+    [% ELSE %]
+      [% ITEM.part.unit | html %]
+    [% END %]
+  </td>
+  <td class="center">
+    [% IF orphaned || AUTH.assert('assortment_edit', 1) %]
+      [% L.checkbox_tag('assortment_items[].charge', checked => ITEM.charge, class => 'checkbox', for_submit=1) %]
+    [% ELSE %]
+      [% IF ITEM.charge %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]
+    [% END %]
+  </td>
+  <td class="numeric">
+    [% L.div_tag(LxERP.format_amount(ITEM.linetotal_sellprice, 2, 0), name="linetotal") %]
+  </td>
+  <td class="right">[% ITEM.part.price_factor.description %]</td>
+  <td class="numeric">
+    [% ITEM.part.sellprice_as_number %]
+  </td>
+  <td class="numeric">
+    [% ITEM.part.lastcost_as_number %]
+  </td>
+  <td class="numeric">
+    [% HTML.escape(ITEM.part.partsgroup.partsgroup) %]
+  </td>
+</tr>
diff --git a/templates/design40_webpages/part/_basic_data.html b/templates/design40_webpages/part/_basic_data.html
new file mode 100644
index 000000000..5f4aac8c6
--- /dev/null
+++ b/templates/design40_webpages/part/_basic_data.html
@@ -0,0 +1,335 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% IF SELF.part.image || SELF.part.description %]
+  [% IF SELF.part.image && INSTANCE_CONF.get_parts_show_image %]
+    <div class="image col">
+      <a href="[% SELF.part.image | html %]" target="_blank">
+        <img style="[% INSTANCE_CONF.get_parts_image_css %]" src="[% SELF.part.image | html %]"/>
+      </a>
+    </div>
+  [% END %]
+  [% IF SELF.part.description %]
+    <h2 class="record-title col">
+      [% SELF.part.description %] [% IF SELF.part.partnumber %]<small>([%  SELF.part.partnumber %])</small>[% END %]
+    </h2>
+  [% END %]
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+<div class="col">
+  <table id="ic3" class="tbl-horizontal">
+    <caption>[% 'Basic Article Data' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Part Number' | $T8 %]</th>
+        <td>[% L.input_tag("part.partnumber", SELF.part.partnumber, size=10, class='initial_focus
+          wi-mediumsmall', "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Part Classification' | $T8 %]</th>
+        <td>[% P.part.select_classification('part.classification_id', default => SELF.part.classification_id, type => SELF.parts_classification_filter, class='wi-wide' ) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Part Description' | $T8 %]</th>
+        <td class="wi-wide">[% L.areainput_tag("part.description", SELF.part.description, class='wi-wide', cols=10, rows=10) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'EAN-Code' | $T8 %]</th>
+        <td>[% L.input_tag("part.ean", SELF.part.ean, class='wi-wide', size=10, "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Tariff Code' | $T8 %]</th>
+        <td>[% L.input_tag("part.tariff_code", SELF.part.tariff_code, class='wi-wide', size=10, "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+      [% IF SELF.all_partsgroups.size %]
+      <tr>
+        <th>[% 'Partsgroup' | $T8 %]</th>
+        <td>
+          [% L.select_tag('part.partsgroup_id', SELF.all_partsgroups, default=SELF.part.partsgroup_id, title_key='partsgroup', value_key='id', with_empty=1, class='wi-wide') %]
+        </td>
+      </tr>
+      [% END %]
+      [% IF SELF.all_buchungsgruppen.size %]
+      <tr>
+        <th>[% 'Booking group' | $T8 %]</th>
+        <td>[% L.select_tag('part.buchungsgruppen_id', SELF.all_buchungsgruppen, default=SELF.part.buchungsgruppen_id, title_key='description', value_key='id', with_empty=0, class='wi-wide') %]</td>
+      </tr>
+      [% END %]
+      [% IF SELF.all_payment_terms.size %]
+      <tr>
+        <th>[% 'Payment Terms' | $T8 %]</th>
+        <td>[% L.select_tag('part.payment_id', SELF.all_payment_terms, default=SELF.part.payment_id, title_key='description', value_key='id', with_empty=1, class='wi-wide') %]</td>
+      </tr>
+      [% END %]
+      <tr>
+        <th> <label for="order_locked">[% 'Do not order anymore' | $T8 %]</label> </th>
+        <td>[% L.checkbox_tag('part.order_locked', checked = SELF.part.order_locked, for_submit=1) %]</td>
+      </tr>
+      [% IF SELF.part.id %]
+      <tr>
+        <th> <label for="part_obsolete">[% 'Obsolete' | $T8 %]</label> </th>
+        <td>[% L.checkbox_tag('part.obsolete', checked = SELF.part.obsolete, for_submit=1) %]</td>
+      </tr>
+      [% END %]
+      <tr>
+        <th> <label for="part_shop">[% 'Shop article' | $T8 %]</label> </th>
+        <td>[% L.checkbox_tag('part.shop', checked = SELF.part.shop, for_submit=1, id='part_shop') %]</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Part Notes' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall-wide"> </colgroup>
+    <tbody>
+      <tr>
+        <td class="wi-mediumsmall-wide">[% L.textarea_tag("part.notes", P.restricted_html(SELF.part.notes), class='texteditor wi-mediumsmall-wide', cols=10, rows=10) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.col -->
+
+<div class="col">
+  <table id="ic5" class="tbl-horizontal">
+    <caption>[% 'Prices' | $T8 %]</caption>
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-mediumsmall"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Price updated' | $T8 %]</th>
+        <td>[% SELF.part.last_price_update.valid_from.to_kivitendo | html %]</td>
+      </tr>
+      <tr>
+        <th>[% 'List Price' | $T8 %]</th>
+        <td>
+          [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+            [% L.input_tag("part.listprice_as_number", SELF.part.listprice_as_number, class='reformat_number numeric wi-mediumsmall', size=10) %]
+          [% ELSE %]
+            <span class="data wi-mediumsmall numeric">[% SELF.part.listprice_as_number %]</span>
+          [% END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Sell Price' | $T8 %]</th>
+        <td>
+          [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+            [% L.input_tag("part.sellprice_as_number", SELF.part.sellprice_as_number, class='reformat_number numeric wi-mediumsmall', size=10) %]
+          [% ELSE %]
+            <span class="data wi-mediumsmall numeric">[% SELF.part.sellprice_as_number %]</span>
+          [% END %]
+          [% IF (SELF.part.is_assortment or SELF.part.is_assembly) %]
+            <span class="data below wi-mediumsmall numeric">(<span id="items_sellprice_sum_basic">[% LxERP.format_amount(SELF.part.items_sellprice_sum, 2) %])</span></span>
+          [% END %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'Last Cost' | $T8 %]</th>
+        <td>
+          [%- UNLESS SELF.part.is_assembly %]
+            [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+              [% L.input_tag("part.lastcost_as_number", SELF.part.lastcost_as_number, class='reformat_number numeric wi-mediumsmall', size=10) %]
+            [% ELSE %]
+              <span class="data wi-mediumsmall numeric">[% SELF.part.lastcost_as_number %]</span>
+            [% END %]
+          [% END %]
+          [% IF SELF.part.is_assortment || SELF.part.is_assembly %]
+            <span class="data below wi-mediumsmall numeric">(<span id="items_lastcost_sum_basic">[% LxERP.format_amount(SELF.part.items_lastcost_sum, 2) %])</span></span>
+          [% END %]
+        </td>
+      </tr>
+      [% IF SELF.all_price_factors.size %]
+      <tr>
+        <th>[% 'Price Factor' | $T8 %]</th>
+        <td>
+          [% L.select_tag('part.price_factor_id', SELF.all_price_factors, default=SELF.part.price_factor_id, title_key='description', value_key='id', with_empty=1, class='wi-mediumsmall') %]
+          </td>
+      </tr>
+      [% END %]
+      <tr>
+        <th><label for="part_not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
+        <td>[% L.checkbox_tag('part.not_discountable', checked = SELF.part.not_discountable, for_submit=1) %]</td>
+      </tr>
+    </tbody>
+  </table>
+  <div id="pricegroups">
+    [% PROCESS 'part/_pricegroup_prices.html' %]
+  </div>
+  <table id="ic5" class="tbl-horizontal">
+    <colgroup> <col class="wi-mediumsmall"><col class="wi-small"> </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Business Volume' | $T8 %]</th>
+        <td>[% L.input_tag("part.gv_as_number", SELF.part.gv_as_number, class='reformat_number numeric wi-mediumsmall', size=10) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Verrechnungseinheit' | $T8 %]</th>
+        <td>[% L.input_tag("part.ve", SELF.part.ve, class='wi-mediumsmall', size=10) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.col -->
+
+<div class="col">
+  <table class="tbl-horizontal">
+    <caption>[% 'Unit' | $T8 %]</caption>
+    <colgroup>
+      <col class="wi-small">
+      <col class="wi-lightwide">
+    </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Unit' | $T8 %]</th>
+        <td>
+          [% IF !SELF.part.id or SELF.part.orphaned # same logic as unit_changable %]
+            [% L.select_tag('part.unit', SELF.all_units, default=SELF.part.unit, title_key='name', value_key='name', class='wi-mediumsmall') %]
+          [% ELSE %]
+            [% L.hidden_tag('part.unit', SELF.part.unit) %] [% HTML.escape(SELF.part.unit) %]
+          [% END %]</td>
+      </tr>
+    </tbody>
+  </table>
+  [% UNLESS SELF.part.is_service %]
+  <table class="tbl-horizontal">
+    <caption>[% 'Warehouse' | $T8 %]</caption>
+    <colgroup>
+      <col class="wi-small">
+      <col class="wi-lightwide">
+    </colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Weight' | $T8 %]</th>
+        <td>
+          [% IF SELF.part.is_assembly %]
+          <span id="items_weight_sum_basic">[% LxERP.format_amount(SELF.part.weight) %]</span>
+          [% ELSE %]
+          [% L.input_tag('part.weight_as_number', SELF.part.weight_as_number, size=10, class='wi-small reformat_number numeric', size=10) %]
+          [% END %]
+          [% HTML.escape(INSTANCE_CONF.get_weightunit) %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% 'On Hand' | $T8 %]</th>
+        <td><span class="data wi-small numeric">[% LxERP.format_amount(SELF.part.onhand) %] [% SELF.part.unit | html %]</span></td>
+      </tr>
+      <tr>
+        <th>[% 'ROP' | $T8 %]</th>
+        <td>[% L.input_tag("part.rop_as_number", SELF.part.rop_as_number, size=10, class='wi-small reformat_number numeric') %]</td>
+      </tr>
+      <tr>
+       <th align="right" nowrap="true">[% 'Order Size' | $T8 %]</th>
+       <td>[% L.input_tag("part.order_qty_as_number", SELF.part.order_qty_as_number, size=10,
+         class="wi-small reformat_number numeric") %]</td>
+      </tr>
+      [% IF SELF.all_warehouses.size %]
+      <tr>
+        <th>[% 'Default Warehouse' | $T8 %]</th>
+        <td>[% L.select_tag('part.warehouse_id', SELF.all_warehouses, default=SELF.part.warehouse.id, title_key='description', with_empty=1, class='wi-lightwide') %]</td>
+      </tr>
+      [% END %]
+      <tr>
+        <th>[% 'Default Bin' | $T8 %]</th>
+        <td class="wi-lightwide">
+          <span id="bin" class="condensed">
+            [% IF SELF.part.warehouse.id %]
+            [% L.select_tag('part.bin_id', SELF.part.warehouse.bins_sorted_naturally, default=SELF.part.bin.id, title_key='description', with_empty=0, class='wi-lightwide') %]
+            [% END %]
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <th><label for="part_has_sernumber">[% 'Has serial number' | $T8 %]</label></th>
+        <td>[% L.checkbox_tag('part.has_sernumber', checked = SELF.part.has_sernumber, for_submit=1) %]</td>
+      </tr>
+    </tbody>
+  </table>
+  [% END #/UNLESS SELF.part.is_service %]
+
+  <table class="tbl-horizontal">
+    <caption>[% 'Formula' | $T8 %]</caption>
+      <colgroup> <col class="wi-small-mediumsmall"> </colgroup>
+    <tbody>
+      <tr>
+        <td> <textarea id="part.formel" name="part.formel" rows="[% IF notes_rows %][% HTML.escape(notes_rows) %][% ELSE %]3[% END %]" cols="10" class="tooltipster-html wi-small-mediumsmall" title="[% 'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' | $T8 %]">[% HTML.escape(SELF.part.formel) %]</textarea>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table id="ic6" class="tbl-horizontal">
+    <caption>[% 'Illustrations' | $T8 %]</caption>
+    <colgroup><col class="wi-small"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[% 'Image' | $T8 %]</th>
+        <td>[% L.input_tag("part.image", SELF.part.image, class='wi-lightwide', size=10,
+          "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Microfiche' | $T8 %]</th>
+        <td>[% L.input_tag("part.microfiche", SELF.part.microfiche, class='wi-lightwide', size=10,
+          "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Drawing' | $T8 %]</th>
+        <td>[% L.input_tag("part.drawing", SELF.part.drawing, class='wi-lightwide', size=10,
+          "data-validate"="trimmed_whitespaces") %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div><!-- /.col -->
+
+[% IF CUSTOM_VARIABLES_FIRST_TAB %]
+<div class="col">
+<table id="custom_variables_table" class="tbl-list wi-moderate">
+  <caption>[% 'Custom Variables' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-smallest">
+    <col class="wi-small">
+    <col class="wi-lightwide">
+  </colgroup>
+  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Value' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+  [%- FOREACH var = CUSTOM_VARIABLES_FIRST_TAB %]
+    <tr>
+      <td>[% var.VALID_BOX %]</td>
+      <td>
+        [%- IF !var.partsgroup_filtered %]
+          [% HTML.escape(var.description) %]
+        [%- END %]
+      </td>
+      <td>[% var.HTML_CODE %]</td>
+    </tr>
+  [%- END %]
+  </tbody>
+</table>
+<div class="wrapper">
+  <p>[% 'Note' | $T8 %]: [% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</p>
+</div>
+</div><!-- /.col -->
+[% END %]
+
+</div><!-- /.wrapper -->
+
+<div id="customerprices" class="wrapper">
+  [% PROCESS 'part/_customerprices.html' %]
+</div>
+
+[% UNLESS SELF.part.is_assembly %]
+  <div id="makemodel" class="wrapper">[% PROCESS 'part/_makemodel.html' %]</div>
+[% END %]
+
+<div id="businessmodels" class="wrapper">
+  [% PROCESS 'part/_businessmodels.html' %]
+</div>
diff --git a/templates/design40_webpages/part/_businessmodel_row.html b/templates/design40_webpages/part/_businessmodel_row.html
new file mode 100644
index 000000000..c738a9b18
--- /dev/null
+++ b/templates/design40_webpages/part/_businessmodel_row.html
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+<tr class="businessmodel_row">
+  <td style='display:none'>
+    [%- L.hidden_tag("businessmodels[+].business_id", businessmodel.business_id) -%]
+  </td>
+  <td class="center">
+    [%- L.button_tag("kivi.Part.delete_businessmodel_row(this)", LxERP.t8("X"), class="neutral") %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+  </td>
+  <td class="center numeric"><span name="position">[% HTML.escape(businessmodel.position) %]</span></td>
+  <td><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></td>
+  <td></td>
+  <td>[% businessmodel.business.description | html %]</td>
+  <td>[% L.input_tag('businessmodels[].model',                    businessmodel.model,                size=10) %]</td>
+  <td>[% L.input_tag('businessmodels[].part_description',         businessmodel.part_description,     size=10) %]</td>
+  <td>[% L.areainput_tag('businessmodels[].part_longdescription', businessmodel.part_longdescription, size=10) %]
+</tr>
diff --git a/templates/design40_webpages/part/_businessmodels.html b/templates/design40_webpages/part/_businessmodels.html
new file mode 100644
index 000000000..471a8c7e7
--- /dev/null
+++ b/templates/design40_webpages/part/_businessmodels.html
@@ -0,0 +1,50 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE P %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+<table id="businessmodel_table" class="tbl-list wi-moderate">
+  <caption>[% 'Business Type Model' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-verytiny">
+    <col>
+    <col class="wi-verytiny">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+  </colgroup>
+  <thead>
+    <tr>
+      <th class="center"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+      <th class="center">[% 'position' | $T8 %]</th>
+      <th class="center"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      <th></th>
+      <th>[% 'Business'            | $T8 %]</th>
+      <th>[% 'Business Type Model' | $T8 %]</th>
+      <th>[% 'Part Description'    | $T8 %]</th>
+      <th>[% 'Long Description'    | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody id="businessmodel_rows">
+    [%- FOREACH businessmodel = SELF.part.businessmodels %]
+      [% PROCESS 'part/_businessmodel_row.html' businessmodel=businessmodel %]
+    [%- END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+      <th class="right"><span class="label">[% 'Business' | $T8 %]</th>
+      <td>[% P.select_tag('add_businessmodel', SELF.all_businesses, title_key="description", with_empty=1, class="wi-mediumsmall", onchange='kivi.Part.add_businessmodel_row()') %]</td>
+      <td>[% L.button_tag('kivi.Part.add_businessmodel_row()', LxERP.t8('Add')) %]</td>
+      <td></td>
+      <td></td>
+    </tr>
+  </tfoot>
+</table>
+
+[% L.sortable_element('#businessmodel_rows') %]
diff --git a/templates/design40_webpages/part/_customerprice_row.html b/templates/design40_webpages/part/_customerprice_row.html
new file mode 100644
index 000000000..6983f80cc
--- /dev/null
+++ b/templates/design40_webpages/part/_customerprice_row.html
@@ -0,0 +1,29 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<tr class="listrow customerprice_row">
+  <td style='display:none'>
+    [% L.hidden_tag("customerprices[+].customer_id", customerprice.customer_id) %]
+    [% L.hidden_tag("customerprices[].id"   , customerprice.id) %]
+  </td>
+  <td class="center">
+    [% L.button_tag("kivi.Part.delete_customerprice_row(this)", LxERP.t8("X"), class="neutral") %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+  </td>
+  <td class="center numeric"><span name="position">[% HTML.escape(customerprice.sortorder) %]</span></td>
+  <td><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></td>
+  <td>[% customerprice.customer.customernumber | html %]</td>
+  <td>[% customerprice.customer.name         | html %]</td>
+  <td>[% L.input_tag('customerprices[].customer_partnumber'     , customerprice.customer_partnumber , size=10) %]</td>
+  <td>[% L.input_tag('customerprices[].part_description'        , customerprice.part_description    , size=10) %]</td>
+  <td>[% L.areainput_tag('customerprices[].part_longdescription', customerprice.part_longdescription, size=10) %]</td>
+  <td>
+    [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+      [% L.input_tag('customerprices[].price_as_number'         , customerprice.price_as_number     , class="reformat_number numeric", size=10) %]
+    [% ELSE %]
+      <span class="data numeric">[% customerprice.price_as_number %]</span>
+    [% END %]
+  </td>
+  <td>[% L.hidden_tag('customerprices[].lastupdate'             , customerprice.lastupdate.to_kivitendo) %][% customerprice.lastupdate.to_kivitendo | html %]</td>
+</tr>
diff --git a/templates/design40_webpages/part/_customerprices.html b/templates/design40_webpages/part/_customerprices.html
new file mode 100644
index 000000000..6ffffb0e0
--- /dev/null
+++ b/templates/design40_webpages/part/_customerprices.html
@@ -0,0 +1,54 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+<table id="customerprice_table" class="tbl-list wi-moderate">
+  <caption>[% 'Customer specific Price' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-verytiny">
+    <col>
+    <col class="wi-verytiny">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-small">
+    <col class="wi-small">
+  </colgroup>
+  <thead>
+    <tr>
+      <th class="center"><img src="image/close.png" alt="[% LxERP.t8('delete item') %]"></th>
+      <th class="center">[% 'position' | $T8 %]</th>
+      <th class="center"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      <th>[% 'Customer Number'      | $T8 %]</th>
+      <th>[% 'Customer'             | $T8 %]</th>
+      <th>[% 'Customer Part Number' | $T8 %]</th>
+      <th>[% 'Part Description'     | $T8 %]</th>
+      <th>[% 'Long Description'     | $T8 %]</th>
+      <th>[% 'Customer Price'       | $T8 %]</th>
+      <th>[% 'Updated'              | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody id="customerprice_rows">
+  [% SET listrow = 0 %]
+  [% FOREACH customerprice = SELF.part.customerprices_sorted %]
+    [% listrow = listrow + 1 %]
+    [% PROCESS 'part/_customerprice_row.html' customerprice=customerprice listrow=listrow %]
+  [% END %]
+ </tbody>
+ <tfoot>
+  <tr>
+   <td></td>
+   <td></td>
+   <td></td>
+   <th class="right"><span class="label">[% 'Search & Add Customer' | $T8 %]</span></th>
+   <td>[% P.customer_vendor.customer_picker('add_customerprice', '', class="add_customerprice_input tooltipstered tooltipster-html wi-mediumsmall", action={commit_one='kivi.Part.add_customerprice_row'}, title=LxERP.t8("Search customer by name and add by selecting")) %]</td>
+   <td>[% L.button_tag('kivi.Part.add_customerprice_row()', LxERP.t8('Add')) %]</td>
+   <td colspan="4"></td>
+  </tr>
+ </tfoot>
+</table>
+
+[% L.sortable_element('#customerprice_rows') %]
diff --git a/templates/design40_webpages/part/_cvars.html b/templates/design40_webpages/part/_cvars.html
new file mode 100644
index 000000000..748ac1ab7
--- /dev/null
+++ b/templates/design40_webpages/part/_cvars.html
@@ -0,0 +1,21 @@
+[% USE HTML  %]
+[% USE T8 %]
+
+<div class="wrapper">
+
+[% IF CUSTOM_VARIABLES.size %]
+  <p>[% 'Unchecked custom variables will not appear in orders and invoices.' | $T8 %]</p>
+  <table class="tbl-horizontal">
+    [% FOREACH var = CUSTOM_VARIABLES %]
+      <tr>
+        <td>[% var.VALID_BOX %]</td>
+        [% IF !var.partsgroup_filtered %]
+          <td>[% HTML.escape(var.description) %]</td>
+        [% END %]
+        <td>[% var.HTML_CODE %]</td>
+      </tr>
+    [% END %]
+  </table>
+[% END %]
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/part/_edit_translations.html b/templates/design40_webpages/part/_edit_translations.html
new file mode 100644
index 000000000..22b4b6fec
--- /dev/null
+++ b/templates/design40_webpages/part/_edit_translations.html
@@ -0,0 +1,39 @@
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+<div id="translations_tab" class="ui-tabs-panel">
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("Language") %]</th>
+      <th>[% LxERP.t8("Description") %]</th>
+      <th>[% LxERP.t8("Long Description") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH language = SELF.all_languages %]
+      <tr>
+        <td>
+          [% SET language_id = language.id translation = translations_map.$language_id %]
+          [% L.hidden_tag('translations[+].language_id', language.id) %]
+          [% HTML.escape(language.description) %]
+        </td>
+        <td>[% L.areainput_tag("translations[].translation", translation.translation, size=40, class="wi-normal") %]</td>
+        <td>
+          [% L.textarea_tag(
+            "translations[].longdescription",
+            P.restricted_html(translation.longdescription),
+            id="translations_longdescription_" _ language_id,
+            class="texteditor wi-lightwide",
+            cols=100, rows=4)
+          %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+</div>
+</div>
diff --git a/templates/design40_webpages/part/_inventory.html b/templates/design40_webpages/part/_inventory.html
new file mode 100644
index 000000000..f566a8d11
--- /dev/null
+++ b/templates/design40_webpages/part/_inventory.html
@@ -0,0 +1,29 @@
+[%- USE HTML %][%- USE L -%][%- USE P -%][%- USE LxERP -%][%- USE T8 -%]
+
+[%- IF AUTH.assert('warehouse_management', 1) -%]
+<div class="wrapper">
+[% 'Actions' | $T8 %]:
+ <span><a href="controller.pl?action=Inventory/stock_in&part_id=[% HTML.escape(SELF.part.id)%]&select_default_bin=1">[% 'Stock' | $T8 %]</a></span>
+ <span><a href="wh.pl?trans_type=transfer&action=transfer_warehouse_selection&parts_id=[% HTML.escape(SELF.part.id) %]">[% 'Transfer' | $T8 %]</a></span>
+ <span><a href="wh.pl?action=transfer_warehouse_selection&trans_type=removal&parts_id=[% HTML.escape(SELF.part.id) %]">[% 'Removal' | $T8 %]</a></span>
+</div>
+[%- END -%]
+
+<div id="inventory_data">
+</div>
+
+<script type='text/javascript'>
+$(function() {
+  $('.tabwidget').on('tabsbeforeactivate', function(event, ui){
+    if (ui.newPanel.attr('id') == 'inventory') {
+      $.ajax({
+        url: 'controller.pl?action=Part/inventory&id=[% SELF.part.id %]',
+        success: function (html) {
+          $("#inventory_data").html(html);
+        },
+      });
+    }
+    return 1;
+   });
+});
+</script>
diff --git a/templates/design40_webpages/part/_inventory_data.html b/templates/design40_webpages/part/_inventory_data.html
new file mode 100644
index 000000000..c1c7930f3
--- /dev/null
+++ b/templates/design40_webpages/part/_inventory_data.html
@@ -0,0 +1,97 @@
+[%- USE HTML %][%- USE L -%][%- USE P -%][%- USE LxERP -%][%- USE T8 -%]
+
+[%- SET dec = 2 %]
+[%- SET show_warehouse_subtotals = 1 %]
+
+<div id="stock_levels" class="wrapper">
+
+<h3>[% 'Stock levels' | $T8 %]</h3>
+
+[%- IF SELF.stock_amounts.size %]
+<a href="wh.pl?action=report&partnumber=[% HTML.escape(SELF.part.partnumber) %]">[% 'Stock levels' | $T8 %]</a>:
+<table class="tbl-list wi-moderate">
+ <thead>
+  <tr>
+   <th>[% 'Warehouse'   | $T8 %]</th>
+   <th>[% 'Bin'         | $T8 %]</th>
+   <th>[% 'Qty'         | $T8 %]</th>
+   <th>[% 'Unit'        | $T8 %]</th>
+   <th>[% 'Stock value' | $T8 %]</th>
+ </tr>
+ </thead>
+ <tbody>
+ [% FOREACH stock = SELF.stock_amounts %]
+  <tr>
+   <td                >[% HTML.escape(stock.warehouse_description)  %]</td>
+   <td                >[% IF stock.order_link %]<a target="_blank" href="[% stock.order_link %]">[% END %]
+                       [% HTML.escape(stock.bin_description)        %]
+                       [% IF stock.order_link %]</a>[% END %]
+   </td>
+   <td class='numeric'>[% LxERP.format_amount(stock.qty, dec)       %]</td>
+   <td                >[% HTML.escape(stock.unit)                   %]</td>
+   <td class='numeric'>[% LxERP.format_amount(stock.stock_value, 2) %]</td>
+  </tr>
+  [% IF show_warehouse_subtotals AND stock.wh_lead != stock.warehouse_description %]
+  <tr class='listheading'>
+   <th                >[% HTML.escape(stock.warehouse_description)           %]</th>
+   <td></td>
+   <td class='numeric bold'>[% LxERP.format_amount(stock.wh_run_qty, dec)         %]</td>
+   <td></td>
+   <td class='numeric bold'>[% LxERP.format_amount(stock.wh_run_stock_value, dec) %]</td>
+  </tr>
+  [% END %]
+  [% IF loop.last %]
+  <tr class='listheading'>
+   <th>[% 'Total' | $T8 %]</th>
+   <td></td>
+   <td class='numeric bold'>[% LxERP.format_amount(stock.run_qty, dec)         %]</td>
+   <td></td>
+   <td class='numeric bold'>[% LxERP.format_amount(stock.run_stock_value, dec) %]</td>
+  </tr>
+  [% END %]
+ [% END %]
+ </tbody>
+</table>
+[% ELSE %]
+  <p>[% 'No transactions yet.' | $T8 %]</p>
+[% END %]
+</div>
+
+[% IF AUTH.assert('warehouse_management', 1) %]
+<div class="wrapper">
+<h3>[% 'Journal of Last 10 Transfers' | $T8 %]</h3>
+<a href="wh.pl?action=journal&partnumber=[% HTML.escape(SELF.part.partnumber) %]">[% 'WHJournal' | $T8 %]</a>:
+[%- IF SELF.journal.size %]
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'Date'           | $T8 %]</th>
+      <th>[% 'Trans Type'     | $T8 %]</th>
+      <th>[% 'Warehouse From' | $T8 %]</th>
+      <th>[% 'Qty'            | $T8 %]</th>
+      <th>[% 'Unit'           | $T8 %]</th>
+      <th>[% 'Warehouse To'   | $T8 %]</th>
+      <th>[% 'Charge Number'  | $T8 %]</th>
+      <th>[% 'Comment'        | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = SELF.journal %]
+    <tr>
+      <td>[% row.base.itime_as_date  %]</td>
+      <td>[% row.base.trans_type.description | $T8 %]</td>
+      <td>[% row.out ? row.out.bin.full_description : '-' | html %]</td>
+      <td class='numeric'>[% row.in ? row.in.qty_as_number : LxERP.format_amount(-1 * row.out.qty, 2) %]</td>
+      <td>[% row.base.part.unit | html %]</td>
+      <td>[% row.in ? row.in.bin.full_description : '-' | html %]</td>
+      <td>[% row.base.chargenumber | html %]</td>
+      <td>[% row.base.comment | html %]</td>
+    </tr>
+    [% END %]
+  <tbody>
+</table>
+[%- ELSE %]
+<p>[% 'No transactions yet.' | $T8 %]</p>
+[%- END %]
+</div>
+[% END # assert warehouse_management %]
diff --git a/templates/design40_webpages/part/_makemodel.html b/templates/design40_webpages/part/_makemodel.html
new file mode 100644
index 000000000..195e959fb
--- /dev/null
+++ b/templates/design40_webpages/part/_makemodel.html
@@ -0,0 +1,68 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<table id="makemodel_table" class="tbl-list wi-moderate">
+  <caption>[% 'Makemodel Price' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-verytiny">
+    <col>
+    <col class="wi-verytiny">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+    <col class="wi-small">
+    <col class="wi-small">
+  </colgroup>
+  <thead>
+    <tr>
+      <th class="center"><img src="image/close.png" alt="[% LxERP.t8('delete item') %]"></th>
+      <th class="center">[% 'position'      | $T8 %]</th>
+      <th class="center"><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]"></th>
+      <th>[% 'Vendor Number'    | $T8 %]</th>
+      <th>[% 'Vendor'           | $T8 %]</th>
+      <th>[% 'Model'            | $T8 %]</th>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <th>[% 'Long Description' | $T8 %]</th>
+      <th>[% 'Last Cost'        | $T8 %]</th>
+      <th>[% 'Updated'          | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody id="makemodel_rows">
+    [% SET listrow = 0 %]
+    [% FOREACH makemodel = SELF.part.makemodels %]
+      [% listrow = listrow + 1 %]
+      [% PROCESS 'part/_makemodel_row.html' makemodel=makemodel listrow=listrow %]
+    [% END %]
+  </tbody>
+  <!-- PENDENT: koennte besser und schoener geloest werden! -->
+  <tfoot>
+    <tr>
+     <td></td>
+     <td></td>
+     <td></td>
+     <th class="right"><span class="label">[% 'Search & Add Vendor' | $T8 %]</span></th>
+     <td>
+        [% SET titleaddmodel=LxERP.t8('Search & Add Vendor by Name') %]
+        [% P.customer_vendor.picker('add_makemodel', '', type='vendor', class='add_makemodel_input tooltipstered tooltipster-html wi-mediumsmall', title=titleaddmodel, action={commit_one='kivi.Part.add_makemodel_row'}, size=10) %]
+      </td>
+     <td>[% L.button_tag('kivi.Part.add_makemodel_row()', LxERP.t8('Add')) %]</td>
+     <td colspan="4"></td>
+    </tr>
+  </tfoot>
+</table>
+[% L.sortable_element('#makemodel_rows') %]
+
+<script type="text/javascript">
+/*
+  $(function() {
+    $('#makemodel_rows').on('sortstop', function(event, ui) {
+      kivi.Part.makemodel_renumber_positions();
+    });
+  })
+ */
+</script><!-- PENDENT: Ueberpruefen -->
diff --git a/templates/design40_webpages/part/_makemodel_row.html b/templates/design40_webpages/part/_makemodel_row.html
new file mode 100644
index 000000000..1f965da82
--- /dev/null
+++ b/templates/design40_webpages/part/_makemodel_row.html
@@ -0,0 +1,31 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<tr class="listrow makemodel_row">
+  <td style='display:none'>
+    [% L.hidden_tag("makemodels[+].make", makemodel.make) %]
+    [% L.hidden_tag("makemodels[].id"   , makemodel.id)   %]
+  </td>
+  <td class="center">
+    [% L.button_tag("kivi.Part.delete_makemodel_row(this)", LxERP.t8("X"), class="neutral") %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+  </td>
+  <td class="center numeric"><span name="position">[% HTML.escape(makemodel.sortorder) %]</span></td>
+  <td><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></td>
+  <td>[% makemodel.vendor.vendornumber | html %]</td>
+  <td>[% makemodel.vendor.name         | html %]</td>
+  <td>[% L.input_tag('makemodels[].model', makemodel.model, size=10) %] </td>
+  <td>[% L.input_tag('makemodels[].part_description', makemodel.part_description, size=10) %]</td>
+  <td>[% L.areainput_tag('makemodels[].part_longdescription', makemodel.part_longdescription, size=10) %]</td>
+  <td>
+    [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+      [% L.input_tag('makemodels[].lastcost_as_number', makemodel.lastcost_as_number, class='reformat_number numeric', size=10) %]
+    [% ELSE %]
+     <span class="data numeric">[% makemodel.lastcost_as_number %]</span>
+    [% END %]
+  <td>
+    [% L.hidden_tag('makemodels[].lastupdate', makemodel.lastupdate.to_kivitendo) %]
+    [% makemodel.lastupdate.to_kivitendo | html %]
+  </td>
+</tr>
diff --git a/templates/design40_webpages/part/_multi_items_dialog.html b/templates/design40_webpages/part/_multi_items_dialog.html
new file mode 100644
index 000000000..fc185e5cd
--- /dev/null
+++ b/templates/design40_webpages/part/_multi_items_dialog.html
@@ -0,0 +1,37 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<form method="post" id="multi_items_form" method="POST">
+
+<div class="select-item control-panel">
+  <table id="multi_items_filter_table" class="tbl-plain">
+    <tr>
+      <th>[% LxERP.t8("Description") %]/[% LxERP.t8("Partnumber") %]</th>
+      <td>[% L.input_tag('multi_items_filter', search_term) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Partsgroup") %]</th>
+      <td>[% L.select_tag('multi_items.filter.partsgroup_id', all_partsgroups, title_key='partsgroup', value_key='id', with_empty=1, class='wi-normal') %]</td>
+    <tr>
+  </table>
+</div>
+
+<div class="buttons">
+  [% L.button_tag('', LxERP.t8('Filter'), id='multi_items_filter_button') %]
+  [% L.button_tag('', LxERP.t8('Reset'), id='multi_items_filter_reset') %]
+</div>
+
+
+<div id="multi_items_result"></div>
+
+[%- IF FORM.show_pos_input -%]
+  [% 'At position' | $T8 %]
+  [% L.input_tag('multi_items.position', '', id='multi_items_position', size=5, class="numeric") %]
+[%- END -%]
+<div class="buttons">
+  [% L.button_tag('', LxERP.t8('Continue'), id='continue_button') %]
+</div>
+
+</form>
diff --git a/templates/design40_webpages/part/_multi_items_result.html b/templates/design40_webpages/part/_multi_items_result.html
new file mode 100644
index 000000000..48b6b721c
--- /dev/null
+++ b/templates/design40_webpages/part/_multi_items_result.html
@@ -0,0 +1,38 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+
+<table id="multi_items" class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'for all' | $T8 %]</th>
+      <th>[% L.input_tag("multi_items.all_qty", '', size=5, class='numeric wi-verysmall') %]</th>
+      <th colspan="4"></th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Qty'        | $T8 %]</th>
+      <th>[% 'Unit'       | $T8 %]</th>
+      <th>[% 'Article'    | $T8 %]</th>
+      <th>[% 'Sellprice'  | $T8 %]</th>
+      <th>[% 'Partsgroup' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH item = multi_items %]
+    <tr>
+      <td></td>
+      <td>
+        [% L.hidden_tag("add_items[+].parts_id", item.id) %]
+        [% L.input_tag("add_items[].qty_as_number", '', size=5, class = 'multi_items_qty numeric wi-verysmall') %]
+      </td>
+      <td>[% HTML.escape(item.unit) %]</td>
+      <td>[% item.presenter.part %] [% HTML.escape(item.description) %]</td>
+      <td class="numeric">[% HTML.escape(item.sellprice_as_number) %]</td>
+      <td class="numeric">[% HTML.escape(item.partsgroup.partsgroup) %]</td>
+    </tr>
+  [% END %]
+  </tbody>
+</table>
diff --git a/templates/design40_webpages/part/_part_picker_result.html b/templates/design40_webpages/part/_part_picker_result.html
new file mode 100644
index 000000000..1caa00436
--- /dev/null
+++ b/templates/design40_webpages/part/_part_picker_result.html
@@ -0,0 +1,35 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+[%# L.dump(SELF.parts) %]
+
+[% BLOCK part_block %]
+<div class="part_picker_part [% FORM.no_paginate ? 'ppp_line' : 'ppp_block' %]">
+  <input type="hidden" class="part_picker_id" value="[% part.id %]">
+  <input type="hidden" class="part_picker_partnumber" value="[% part.partnumber %]">
+  <input type="hidden" class="part_picker_description" value="[% part.displayable_name %]">
+  <input type="hidden" class="part_picker_ean" value="[% part.ean %]">
+  <input type="hidden" class="part_picker_unit" value="[% part.unit %]">
+
+  <span class="ppp_block_number">[% part.partnumber | html %]</span>
+  <span class="ppp_block_ean">[% part.ean | html %]</span>
+  <span class="ppp_block_description">[% part.description | html %]</span>
+  <div style="clear:both;"></div>
+  <span class="ppp_block_sellprice">[% 'Sellprice' | $T8 %]: [% part.sellprice_as_number | html %]</span>
+  <span class="ppp_block_description">[% part.presenter.typeclass_abbreviation %]</span>
+</div>
+[% END %]
+
+[% FOREACH part = SELF.parts %]
+  [% PROCESS part_block %]
+[% END %]
+
+<div style="clear:both"></div>
+
+[% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result', models=SELF.models) %]
+<script type='text/javascript'>
+  $('#'+$('#part_picker_real_id').val()).data("part_picker").dialog.init_results();
+</script>
diff --git a/templates/design40_webpages/part/_pricegroup_prices.html b/templates/design40_webpages/part/_pricegroup_prices.html
new file mode 100644
index 000000000..dfdeda95f
--- /dev/null
+++ b/templates/design40_webpages/part/_pricegroup_prices.html
@@ -0,0 +1,42 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+[% IF SELF.all_pricegroups.size %]
+<table class="tbl-horizontal">
+  <caption>[% 'Pricegroups' | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-mediumsmall">
+    <col class="wi-mediumsmall">
+  </colgroup>
+  <thead>
+    <tr>
+      <th> [% 'Price group' | $T8 %] </th>
+      <th> [% 'Price'       | $T8 %] </th>
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH pricegroup = SELF.all_pricegroups %]
+    [% SET pricegroup_id = pricegroup.id
+           price         = prices_map.$pricegroup_id %]
+    <tr>
+      <th>
+        [% L.hidden_tag('prices[+].pricegroup_id', pricegroup.id) %]
+        [% L.hidden_tag('prices[].price_id', price.id) # id not used? %]
+        [% L.hidden_tag('prices[].pricegroup', pricegroup.pricegroup) %][% HTML.escape(pricegroup.pricegroup) %]
+      </th>
+      <td>
+        [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+          [% L.input_tag('prices[].price', price.price_as_number, size=11, class='wi-mediumsmall numeric reformat_number') %]
+        [% ELSE %]
+            <span class="data wi-mediumsmall numeric">[% price.price_as_number %]</span>
+        [% END %]
+      </td>
+    </tr>
+  [% END %]
+  [% # followed by Storage-Table %]
+
+  </tbody>
+</table>
+[% END %]
diff --git a/templates/design40_webpages/part/_sales_price_information.html b/templates/design40_webpages/part/_sales_price_information.html
new file mode 100644
index 000000000..4de9f2c85
--- /dev/null
+++ b/templates/design40_webpages/part/_sales_price_information.html
@@ -0,0 +1,36 @@
+<div class="wrapper">
+<div id="sales_price_information_sales_order"></div>
+<div id="sales_price_information_sales_quotation"></div>
+<div id="parts_price_history"></div>
+</div><!-- /.wrapper -->
+
+<script type="text/javascript">
+  function get_report(target, source, data){
+    $.ajax({
+      url:        source,
+//      beforeSend: function () { $(target).html('<img src="image/spinner.gif">') },
+      success:    function (rsp) {
+        $(target).html(rsp);
+        $(target).find('.paginate').find('a').click(function(event){ redirect_event(event, target) });
+        $(target).find('a.report-generator-header-link').click(function(event){ redirect_event(event, target) });
+      },
+      data:       data,
+    });
+  };
+
+  function redirect_event(event, target){
+    event.preventDefault();
+    get_report(target, event.target + '', {});
+  }
+
+  $('.tabwidget').on('tabsbeforeactivate', function(event, ui){
+    if (ui.newPanel.attr('id') == 'sales_price_information') {
+      get_report('#sales_price_information_sales_order', 'controller.pl', { action: 'SellPriceInformation/list', 'filter.part.id': [% id %], 'filter.order.type': 'sales_order' });
+      get_report('#sales_price_information_sales_quotation', 'controller.pl', { action: 'SellPriceInformation/list', 'filter.part.id': [% id %], 'filter.order.type': 'sales_quotation' });
+      get_report('#parts_price_history', 'controller.pl', { action: 'PartsPriceHistory/list', 'filter.part_id': [% id %] });
+    }
+    return 1;
+  });
+
+
+</script>
diff --git a/templates/design40_webpages/part/_shop.html b/templates/design40_webpages/part/_shop.html
new file mode 100644
index 000000000..ad04bb690
--- /dev/null
+++ b/templates/design40_webpages/part/_shop.html
@@ -0,0 +1,97 @@
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE Dumper %]
+[% USE JavaScript %]
+
+<div class="wrapper">
+
+<h2>[% LxERP.t8("Active shops:") %]</h2>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+     <th>[% LxERP.t8("Shop") %]</th>
+     <th>[% LxERP.t8("Active") %]</th>
+     <th>[% LxERP.t8("Shop part") %]</th>
+     <th>[% LxERP.t8("Price source") %]</th>
+     <th>[% LxERP.t8("Price") %]</th>
+     <th>[% LxERP.t8("Stock Local/Shop") %]</th>
+     <th>[% LxERP.t8("Last update") %]</th>
+     <th>[% LxERP.t8("Action") %]</th>
+     <th>[% LxERP.t8("Action") %]</th>
+     <th>[% LxERP.t8("Action") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% # L.dump(SELF.part) %]
+    [% FOREACH shop_part = SELF.part.shop_parts %]
+      [% IF !shop_part.shop.obsolete %]
+        <tr>
+          <td>[% HTML.escape( shop_part.shop.description ) %]</td>
+          <td>[% L.html_tag('span', shop_part.active, id => 'shop_part_active_' _ shop_part.id ) %]</td>
+          <td>
+           [% IF shop_part.shop.use_part_longdescription %]
+             [% L.html_tag('span', shop_part.part.notes, id => 'shop_part_description_' _ shop_part.id ) %]
+           [% ELSE %]
+             [% L.html_tag('span', shop_part.shop_description, id => 'shop_part_description_' _ shop_part.id ) %]
+           [% END %]
+          </td>
+          <td>[% L.html_tag('span',LxERP.t8(), id => 'active_price_source_' _ shop_part.id) %]</td>
+          <td>[% L.html_tag('span','Price', id => 'price_' _ shop_part.id) %]</td>
+          <td>[% L.html_tag('span','Stock', id => 'stock_' _ shop_part.id) %]</td>
+          <td>[% L.html_tag('span', shop_part.last_update.to_kivitendo('precision' => 'minute'), id => 'shop_part_last_update_' _ shop_part.id ) %]</td>
+          <td>[% L.button_tag("kivi.ShopPart.edit_shop_part(" _ shop_part.id _ ")", LxERP.t8("Edit"))  %]</td>
+          <td>[% L.button_tag("kivi.ShopPart.update_shop_part(" _ shop_part.id _ ")", LxERP.t8("Upload"))  %]</td>
+          <td>
+            [% L.button_tag("kivi.ShopPart.get_all_categories(" _ shop_part.id _ ")", LxERP.t8("Shopcategories"))  %]<br>
+            [% IF shop_part.shop_category %]
+              [% IF shop_part.shop_category.1.size > 1%]
+                [% FOREACH cat = shop_part.shop_category %]
+                  [% HTML.escape(cat.1) %]<br>
+                [% END %]
+              [% ELSE %]
+                [% HTML.escape(shop_part.shop_category.1) %]<br>
+              [% END %]
+            [% END %]
+            <script type="text/javascript">
+              $(function() {
+                kivi.ShopPart.update_price_n_price_source([% shop_part.id %],'[% shop_part.active_price_source %]');
+                kivi.ShopPart.update_stock([% shop_part.id %]);
+              });
+            </script>
+          </td>
+        </tr>
+      [% END %]
+    [% END %]
+    [% FOREACH shop = SELF.shops_not_assigned %]
+      <tr>
+        <td>[% HTML.escape( shop.description ) %]</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>[% L.button_tag("kivi.ShopPart.create_shop_part(" _ id _ ", " _ shop.id _ ")", LxERP.t8("Add"))  %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+[% # L.dump(shop_part) %]
+<h2>[% LxERP.t8("Shopimages - valid for all shops") %]</h2>
+[% IF shop_part.part_id %]
+  <script type="text/javascript">
+    $(function() {
+      kivi.ShopPart.show_images([% shop_part.part_id %]);
+    });
+  </script>
+  <div id="shop_images"></div>
+[% ELSE %]
+  <div id="shop_images">[% LxERP.t8('To upload images: Please create shoppart first') %]</div>
+[% END %]
+
+</div><!-- /wrapper -->
+
diff --git a/templates/design40_webpages/part/form.html b/templates/design40_webpages/part/form.html
new file mode 100644
index 000000000..77475f87f
--- /dev/null
+++ b/templates/design40_webpages/part/form.html
@@ -0,0 +1,108 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% FORM.title %] [% IF SELF.part.id %]: [% HTML.escape(SELF.part.displayable_name) %][% END %]</h1>
+
+<form method="post" id="ic" name="ic" action="controller.pl">
+
+[% INCLUDE 'common/flash.html' %]
+
+[% L.hidden_tag('part.part_type'   , SELF.part.part_type) %]
+[% L.hidden_tag('part.id'          , SELF.part.id) %]
+[% L.hidden_tag('last_modification', SELF.part.last_modification) %]
+[% L.hidden_tag('callback'         , FORM.callback) %]
+
+<div id="ic_tabs" class="tabwidget">
+
+  <ul class="ui-tabs">
+    <li><a href="#basic_data">[% 'Basic Data' | $T8 %]</a></li>
+    [% IF SELF.part.is_assortment %]
+      <li><a href="#assortment_tab">[% 'Assortment items' | $T8 %]</a></li>
+    [% END %]
+    [% IF SELF.part.is_assembly %]
+      <li><a href="#assembly_tab">[% 'Assembly items' | $T8 %]</a></li>
+    [% END %]
+    [% IF SELF.part.id %]
+      [% IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=part&object_id=[% SELF.part.id %]">[% 'Attachments' | $T8 %]</a></li>
+        <li><a href="controller.pl?action=File/list&file_type=image&object_type=part&object_id=[% SELF.part.id %]">[% 'Images' | $T8 %]</a></li>
+      [% END %]
+    [% END %]
+    [% IF SELF.all_languages.size %]
+      <li><a href="#translations_tab">[% 'Translations' | $T8 %]</a></li>
+    [% END %]
+    [% IF SELF.part.id %]
+      <li><a href="#sales_price_information">[% 'Price information' | $T8 %]</a></li>
+    [% END %]
+    [% IF SELF.part.id  %]
+      <li><a href="#price_rules">[% 'Price Rules' | $T8 %]</a></li>
+    [% END %]
+    [% IF CUSTOM_VARIABLES.size %]
+      <li><a href="#custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+    [% END %]
+    [%- IF (AUTH.assert('warehouse_contents', 1) AND SELF.part.id AND NOT SELF.part.is_service) %]
+      <li><a href="#inventory">[% 'Inventories' | $T8 %]</a></li>
+    [%- END %]
+    [% IF AUTH.assert('shop_part_edit', 1) && SELF.part.id && SELF.part.shop %]
+      <li><a href="#shop_variables">[% 'Shop variables' | $T8 %]</a></li>
+    [% END %]
+  </ul>
+
+  <div id="basic_data" class="ui-tabs-panel">
+    [% PROCESS 'part/_basic_data.html' %]
+  </div>
+
+  [% IF SELF.part.is_assortment %]
+    <div id="assortment_tab" class="ui-tabs-panel">
+      [% PROCESS 'part/_assortment.html' id=part.id assortment_id=SELF.part.id %]
+    </div>
+  [% END %]
+
+  [% IF SELF.part.is_assembly %]
+    <div id="assembly_tab" class="ui-tabs-panel">
+      [% PROCESS 'part/_assembly.html' id=part.id assembly_id=SELF.part.id %]
+    </div>
+  [% END %]
+
+  [% IF SELF.all_languages.size %]
+    [% PROCESS 'part/_edit_translations.html' %]
+  [% END %]
+
+  [% IF SELF.part.id %]
+    <div id="sales_price_information" class="ui-tabs-panel">
+      [% PROCESS part/_sales_price_information.html id=SELF.part.id %]
+    </div>
+  [% END %]
+
+  [% IF AUTH.assert('shop_part_edit', 1) && SELF.part.id && SELF.part.shop %]
+    <div id="shop_variables" class="ui-tabs-panel">
+      [% PROCESS 'part/_shop.html' %]
+    </div>
+  [% END %]
+
+  [% IF AUTH.assert('warehouse_contents', 1) AND SELF.part.id AND NOT SELF.part.is_service %]
+    <div id="inventory">
+      [% PROCESS 'part/_inventory.html' %]
+    </div>
+  [% END %]
+
+  [% IF CUSTOM_VARIABLES.size %]
+    <div id="custom_variables" class="ui-tabs-panel">
+      [% PROCESS 'part/_cvars.html' %]
+    </div>
+  [% END %]
+
+  [% IF SELF.part.id %]
+    <div id="price_rules" class="ui-tabs-panel">
+      <div class="wrapper">
+        <div id="price_rules_customer_report"></div>
+        <div id="price_rules_vendor_report"></div>
+      </div><!-- /.wrapper -->
+    </div>
+  [% END %]
+
+</div><!-- /.tabwidget -->
+</form>
diff --git a/templates/design40_webpages/part/history.html b/templates/design40_webpages/part/history.html
new file mode 100644
index 000000000..789a4bd20
--- /dev/null
+++ b/templates/design40_webpages/part/history.html
@@ -0,0 +1,24 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'Time' | $T8 %]</th>
+      <th>[% 'Aktion' | $T8 %]</th>
+      <th>[% 'Employee' | $T8 %]</th>
+      <th>[% 'Partnumber' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH history = history_entries %]
+    <tr>
+      <td>[% history.itime.to_kivitendo %] [% history.itime.to_kivitendo_time %]</td>
+      <td>[% history.addition | $T8 %]</td>
+      <td>[% HTML.escape(history.employee.name) %]</td>
+      <td>[% HTML.escape(history.parsed_snumber) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
diff --git a/templates/design40_webpages/part/part_picker_search.html b/templates/design40_webpages/part/part_picker_search.html
new file mode 100644
index 000000000..89bb19892
--- /dev/null
+++ b/templates/design40_webpages/part/part_picker_search.html
@@ -0,0 +1,12 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE T8 %]
+
+<div class="select-item control-panel">
+  [% L.hidden_tag('part_picker_real_id', FORM.real_id) %]
+  [% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', search_term, class='part_picker_filter') %]
+  [% L.checkbox_tag('no_paginate', checked=FORM.no_paginate, id='no_paginate', checked=all_as_list, for_submit=1, label=LxERP.t8('All as list')) %]
+</div>
+
+<div id="part_picker_result"></div>
diff --git a/templates/design40_webpages/part/showdetails.html b/templates/design40_webpages/part/showdetails.html
new file mode 100644
index 000000000..5b2f0043f
--- /dev/null
+++ b/templates/design40_webpages/part/showdetails.html
@@ -0,0 +1,125 @@
+[%- USE LxERP -%][% USE L %][% USE HTML %][%- USE JavaScript -%][% USE T8 %][%- USE Dumper %]
+
+<div class="wrapper">
+<div class="col"> <!-- part info -->
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <td><b>[%  LxERP.t8('Description') %]</b></td>
+        <td>[% part.description %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Default Warehouse') %]</b></td>
+        <td>[% part.warehouse.description %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Default Bin') %]</b></td>
+        <td>[% part.bin.description %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('ROP') %]</b></td><td>[% part.rop_as_number %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div class="wrapper">
+  <table class="tbl-list" style="margin-right: 1em;">
+    [%- IF stock_amounts.size %]
+    <thead>
+      <tr class='listheading'>
+        <th>[% 'Warehouse'    | $T8 %]</th>
+        <th>[% 'Bin'          | $T8 %]</th>
+        <th>[% 'Chargenumber' | $T8 %]</th>
+        <th>[% 'Qty'          | $T8 %]</th>
+        <th>[% 'Unit'         | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH stock = stock_amounts %]
+      <tr>
+        <td>[% HTML.escape(stock.warehouse_description) %]</td>
+        <td>[% HTML.escape(stock.bin_description) %]</td>
+        <td>[% HTML.escape(stock.chargenumber) %]</td>
+        <td class='numeric'>[% LxERP.format_amount(stock.qty, dec) %]</td>
+        <td>[% HTML.escape(stock.unit) %]</td>
+      </tr>
+        [% IF stock.wh_lead != stock.warehouse_description %]
+        <tr>
+          <th><b>[% HTML.escape(stock.warehouse_description) %]</b></th>
+          <td></td>
+          <td></td>
+          <td class='numeric bold'>[% LxERP.format_amount(stock.wh_run_qty, dec)         %]</td>
+          <td></td>
+        </tr>
+        [% END %]
+        [% IF loop.last %]
+        <tr>
+          <th><b>[% 'Total' | $T8 %]</b></th>
+          <td></td>
+          <td></td>
+          <td class='numeric bold'>[% LxERP.format_amount(stock.run_qty, dec)         %]</td>
+          <td></td>
+        </tr>
+        [% END %]
+      [% END %]
+    </tbody>
+    [% ELSE %]
+    <thead>
+      <th>
+        <p>[% 'No transactions yet.' | $T8 %]</p>
+      </th>
+    </thead>
+    [% END %]
+  </table>
+</div>
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <td><b>[%  LxERP.t8('Sum Amount') %]</b></td>
+        <td>[% LxERP.format_amount(sum, 2) %] [% part.unit %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Not delivered amount') %]</b></td>
+        <td>[% LxERP.format_amount(not_delivered, 2) %] [% part.unit %]
+        </td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Ordered, but not delivered (purchase)') %]</b></td>
+        <td>[% LxERP.format_amount(ordered, 2) %] [% part.unit %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Available amount') %]</b></td>
+        <td>[% LxERP.format_amount(part.onhandqty, 2) %] [% part.unit %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Consume average') %]</b></td>
+        <td>[% LxERP.format_amount(average, 2) %] [% part.unit %] [% LxERP.t8('per month') %]</td>
+      </tr>
+      <tr>
+        <td colspan="2" nowrap>([%  LxERP.t8('in the time between') %] [% fromdate.to_kivitendo %] - [% todate.to_kivitendo %])</td>
+      </tr>
+    </tbody></table>
+</div>
+
+<td>[%- L.button_tag("return \$('#detail_menu').dialog('close');", LxERP.t8('Close Details'), class => "submit") %]</td>
+</div> <!-- col 1 -->
+
+<div class="col"> <!-- col 2 -->
+<div id="print_options" class="wrapper">
+  <form id="print_options_form">
+    [% print_options %]
+    <br>
+    [% L.button_tag('kivi.Part.print_from_showdetail(' _ part.id _ ')', LxERP.t8('Print')) %]
+  </form>
+</div>
+
+[% IF part.image && INSTANCE_CONF.get_parts_show_image %]
+<div class="wrapper">
+  <a href="[% part.image | html %]" target="_blank"><img style="[% INSTANCE_CONF.get_parts_image_css %]" src="[% part.image | html %]"/></a>
+</div>
+[% END %]
+</div> <!-- col 2 -->
diff --git a/templates/design40_webpages/part/test_page.html b/templates/design40_webpages/part/test_page.html
new file mode 100644
index 000000000..20efd6e66
--- /dev/null
+++ b/templates/design40_webpages/part/test_page.html
@@ -0,0 +1,108 @@
+[% USE L %]
+[% USE P %]
+
+<h1>Part Picker Testpage</h1>
+
+<div class="wrapper">
+
+  Alle: <br>
+  [% P.part.picker('part_id') %] text<br>
+  Nur Waren: <br>
+  [% P.part.picker('part_id2', undef, part_type='part') %]<br>
+  Nur Dienstleistungen: <br>
+  [% P.part.picker('part_id3', undef, part_type='service') %]<br>
+  Nur Erzeugnisse: <br>
+  [% P.part.picker('part_id4', undef, part_type='assembly') %]<br>
+  Waren und Dienstleistungen: <br>
+  [% P.part.picker('part_id5', undef, part_type='part,service') %]<br>
+  Artikel-Klassifizierung: Einkauf <br>
+  [% P.part.picker('part_id10', undef, classification_id='1') %]<br>
+  Artikel-Klassifizierung: Verkauf <br>
+  [% P.part.picker('part_id11', undef, classification_id='2') %]<br>
+  Artikel-Klassifizierung: Handelsware <br>
+  [% P.part.picker('part_id12', undef, classification_id='3') %]<br>
+  Artikel-Klassifizierung: Produktion <br>
+  [% P.part.picker('part_id13', undef, classification_id='4') %]<br>
+  Artikel-Klassifizierung: Eink.,Verk.,Prod. <br>
+  [% P.part.picker('part_id14', undef, classification_id='1,2,4') %]<br>
+  Artikel-Status: Aktiv (default)<br>
+  [% P.part.picker('part_id15') %]<br>
+  Artikel-Status: Aktiv (explizit)<br>
+  [% P.part.picker('part_id16', undef, status="active") %]<br>
+  Artikel-Status: Ungültig<br>
+  [% P.part.picker('part_id17', undef, status="obsolete") %]<br>
+  Artikel-Status: Alle<br>
+  [% P.part.picker('part_id18', undef, status="all") %]<br>
+  Nicht bestellbare Artikel:<br>
+  [% P.part.picker('part_id19', undef, order_locked=1) %]<br>
+  Bestellbare Artikel:<br>
+  [% P.part.picker('part_id19', undef, not_order_locked=1) %]<br>
+  <br>
+  Pre-filled:<br>
+  [% P.part.picker('part_id6', pre_filled_part) %]<br>
+  Convertible unit 'Std': (only select parts with unit Tag/Std/Min)<br>
+  [% P.part.picker('part_id7', undef, convertible_unit='Std') %]<br>
+  <br>
+  With multi select popup<br>
+  [% P.part.picker('part_id8', undef, multiple=1) %]<br>
+  With multi select popup (only obsolete)<br>
+  [% P.part.picker('part_id9', undef, multiple=1, status='obsolete') %]<br>
+  <br>
+  All parts including make models of all vendors: <br>
+  [% P.part.picker('part_id21', undef, with_makemodel=1) %]<br>
+  All parts including make models of all vendors with multi select popup: <br>
+  [% P.part.picker('part_id22', undef, with_makemodel=1, multiple=1) %]<br>
+  All parts including customer partnumbers of all customers: <br>
+  [% P.part.picker('part_id23', undef, with_customer_partnumber=1) %]<br>
+  <br>
+  single select dialog for glass-popup-button; multi select with extra button (and limited to 5 results):<br>
+  [% P.part.picker('part_id31', undef, multiple=0, multiple_limit=5) %]
+  [% L.button_tag('$("#part_id31").data("part_picker").o.multiple=1; $("#part_id31").data("part_picker").open_dialog()', 'Add multiple items') %]<br>
+
+  <h2>Styling</h2>
+
+  In a span:
+  <span>Leading text: [% P.part.picker('p1', undef, part_type='part,service') %] and text after with spacing</span><br>
+  <span>Leading text:[% P.part.picker('p2', undef, part_type='part,service') %]and text after without spacing</span><br>
+  <div>Leading text: [% P.part.picker('p3', undef, part_type='part,service') %] and text after with spacing with div</div><br>
+  <div>Leading text:[% P.part.picker('p4', undef, part_type='part,service') %]and text after with spacing with div</div><br>
+
+  <span>Picker + input next to each other: [% P.part.picker('p5', undef, part_type='part,service', width="100%") %]<input type=text></span>
+
+  <div>[% P.part.picker('p6', undef, part_type='part,service', style="width:500px") %] 500px width</div>
+  <div>[% P.part.picker('p7', undef, part_type='part,service', style="width:200px") %] 200px width</div>
+  <div>[% P.part.picker('p8', undef, part_type='part,service', style="height:40px") %] 40px height</div>
+
+  [%# FOREACH i IN 1..50 %]
+  [%# P.part.picker('part_id_' _ i) %] <br>
+  [%# END %]
+
+  <h2>In tables</h2>
+
+  <p>No classes:</p>
+
+  <table>
+  <tr>
+    <th>Part picker in table heading</th>
+    <th>[% P.part.picker('p9', undef, part_type='part,service') %]</th>
+  </tr>
+  <tr>
+    <td>Part picker in table cell</td>
+    <td>[% P.part.picker('p10', undef, part_type='part,service') %]</td>
+  </tr>
+  </table>
+
+  <p>With classes:</p>
+
+  <table>
+  <tr>
+    <th>Part picker in table heading</th>
+    <th>[% P.part.picker('p11', undef, part_type='part,service') %]</th>
+  </tr>
+  <tr>
+    <td>Part picker in table cell</td>
+    <td>[% P.part.picker('p12', undef, part_type='part,service') %]</td>
+  </tr>
+  </table>
+
+</div>
diff --git a/templates/design40_webpages/parts_price_history/report_bottom.html b/templates/design40_webpages/parts_price_history/report_bottom.html
new file mode 100644
index 000000000..1876b35f0
--- /dev/null
+++ b/templates/design40_webpages/parts_price_history/report_bottom.html
@@ -0,0 +1 @@
+[% PROCESS 'common/paginate.html' pages=SELF.pages, base_url=SELF.self_url %]
diff --git a/templates/design40_webpages/pay_posting_import/form.html b/templates/design40_webpages/pay_posting_import/form.html
new file mode 100644
index 000000000..d6d5bc8ed
--- /dev/null
+++ b/templates/design40_webpages/pay_posting_import/form.html
@@ -0,0 +1,56 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% FORM.title %]</h1>
+
+<div class="wrapper">
+
+[% IF (SELF.gl_trans.size) %]
+ <table class="tbl-list" id="gl_trans">
+  <caption>[% SELF.gl_trans.size %]&nbsp;[% "entries imported" | $T8 %].</caption>
+  <thead>
+   <tr>
+    <th>[%- LxERP.t8("Date") %]</th>
+    <th>[%- LxERP.t8("Description") %]</th>
+    <th>[%- LxERP.t8("Debit") %]</th>
+    <th>[%- LxERP.t8("Credit") %]</th>
+    <th>[%- LxERP.t8("Amount") %]</th>
+   </tr>
+  </thead>
+  <tbody>
+  [%- FOREACH gl = SELF.gl_trans %]
+    <tr>
+    <td>[%- gl.transdate.to_kivitendo -%]</td>
+    <td>[%- gl.description -%]</td>
+    <td>[%- gl.transactions.1.chart.accno -%]&nbsp;[%- gl.transactions.1.chart.description -%]</td>
+    <td>[%- gl.transactions.0.chart.accno -%]&nbsp;[%- gl.transactions.0.chart.description -%]</td>
+    <td class="numeric"> [%- LxERP.format_amount(gl.transactions.0.amount    , 2) %]</td>
+   </tr>
+  [% END %]
+  </tbody>
+ </table>
+[% END %]
+<form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
+<table class="tbl-horizontal">
+  <caption>[% "Import a File" | $T8 %]</caption>
+  <colgroup>
+    <col class="wi-normal">
+    <col class="wi-lightwide">
+  </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("CSV File") %]</th>
+      <td>[% L.input_tag('file', '', type => 'file', accept => '.csv') %]</td>
+    </tr>
+    <tr>
+      <th><label for="set_closedto">[% LxERP.t8("Close Books up to") %]</label></th>
+      <td>[% L.checkbox_tag('set_closedto', value => 1, checked => 1, id => 'set_closedto') %]&nbsp;[% L.date_tag('closedto', closedto) %]</td>
+    </tr>
+  <tbody>
+</table>
+</form>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/payment_term/form.html b/templates/design40_webpages/payment_term/form.html
new file mode 100755
index 000000000..8af1f746e
--- /dev/null
+++ b/templates/design40_webpages/payment_term/form.html
@@ -0,0 +1,173 @@
+[% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %][%- USE P -%]
+<h1>[% FORM.title %]</h1>
+
+ 
+<form method="post" action="controller.pl" id="form">
+  [%- INCLUDE 'common/flash.html' %] 
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption> [% LxERP.t8("General settings") %] </caption>
+  <colgroup><col class="wi-mediumsmall"><col></colgroup>
+  <tbody>
+    <tr>
+      <th> </th>
+      <th> </th>
+    </tr>
+    <tr>
+      <td> [%- 'Description' | $T8 %] </td>
+      <td> [% P.input_tag("payment_term.description", SELF.payment_term.description, "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+    </tr>
+    <tr>
+      <td> [% LxERP.t8("Calculate due date automatically") %] </td>
+      <td> [% L.yes_no_tag("payment_term.auto_calculation", SELF.payment_term.auto_calculation, "data-auto-calculation-toggle"="1") %] </td>
+    </tr>
+    <tr>
+      <td> [%- 'Netto Terms' | $T8 %] </td>
+      <td> [% L.input_tag("payment_term.terms_netto_as_number", SELF.payment_term.terms_netto_as_number, size="6", disabled=(SELF.payment_term.auto_calculation ? '' : 1)) %] </td>
+    </tr>
+    <tr>
+      <td> [%- 'Skonto Terms' | $T8 %] </td>
+      <td> 
+      <input type="text" name="payment_term.terms_skonto_as_number" value="[%- HTML.escape(SELF.payment_term.terms_skonto_as_number) %]" size="6">
+      </td>
+    </tr>
+    <tr>
+      <td> [%- 'Skonto' | $T8 %] </td>
+      <td> 
+      <input type="text" name="payment_term.percent_skonto_as_percent" value="[%- HTML.escape(SELF.payment_term.percent_skonto_as_percent) %]" size="6">
+      % </td>
+    </tr>
+    [% IF SELF.payment_term.id %] 
+    <tr>
+      <td> [% 'Obsolete' | $T8 %] </td>
+      <td> [% L.checkbox_tag('payment_term.obsolete', checked = SELF.payment_term.obsolete, for_submit=1) %] </td>
+    </tr>
+    [% END %] 
+  </tbody>
+</table>
+
+   
+<table class="tbl-horizontal">
+  <caption> [%- 'Long Description' | $T8 %] </caption>
+  <tbody>
+    <tr>
+      <th> [% LxERP.t8("Texts for quotations & orders") %] </th>
+      <td> [% P.input_tag("payment_term.description_long", SELF.payment_term.description_long, size="60", "data-validate"="required", "data-title"=LxERP.t8("Long Description for quotations & orders")) %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Texts for invoices") %] </th>
+      <td> [% P.input_tag("payment_term.description_long_invoice", SELF.payment_term.description_long_invoice, size="60", "data-validate"="required", "data-title"=LxERP.t8("Long Description for invoices")) %] </td>
+    </tr>
+    [%- FOREACH language = SELF.languages %] 
+    <tr><th class="caption" colspan="2">[%- HTML.escape(language.description) %] ([%- LxERP.t8('Translation') %])</th></tr>
+    <tr>
+      <th> [% LxERP.t8("Texts for quotations & orders") %] </th>
+      <td> 
+      <input type="text" name="translation_[% language.id %]" value="[%- HTML.escape(SELF.payment_term.translated_attribute('description_long', language, 1)) %]" size="60">
+      </td>
+      </tr>
+      <tr>
+      <th> [% LxERP.t8("Texts for invoices") %] </th>
+      <td> 
+      <input type="text" name="translation_invoice_[% language.id %]" value="[%- HTML.escape(SELF.payment_term.translated_attribute('description_long_invoice', language, 1)) %]" size="60">
+      </td>
+    </tr>
+    [%- END %] 
+  </tbody>
+</table>
+[% P.hidden_tag("id", SELF.payment_term.id) %] 
+    
+</div>
+
+
+
+
+<div class="instructions">
+<p>[% LxERP.t8("You can use the following strings in the long description and all translations. They will be replaced by their actual values by kivitendo before they're output.") %]</p>
+<p>[% LxERP.t8("As of version 3.7 most of the variables are also availabe as a print variable.") %]</p>
+    
+
+<table class="tbl-list-plain">
+  <thead>
+    <tr>
+      <th> [%- LxERP.t8('Field') %] </th>
+      <th> [%- LxERP.t8('Description') %] </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td> &lt;%netto_date%&gt; </td>
+      <td> [% LxERP.t8("Date the payment is due in full") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%skonto_date%&gt; </td>
+      <td> [% LxERP.t8("Date the payment is due with discount") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%skonto_amount%&gt; </td>
+      <td> [% LxERP.t8("The deductible amount") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%skonto_in_percent%&gt; </td>
+      <td> [% LxERP.t8("The discount in percent") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%total%&gt; </td>
+      <td> [% LxERP.t8("Amount payable") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%total_wo_skonto%&gt; </td>
+      <td> [% LxERP.t8("Amount payable less discount") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%invtotal%&gt; </td>
+      <td> [% LxERP.t8("Invoice total") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%invtotal_wo_skonto%&gt; </td>
+      <td> [% LxERP.t8("Invoice total less discount") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%currency%&gt; </td>
+      <td> [% LxERP.t8("The selected currency") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%terms_netto%&gt; </td>
+      <td> [% LxERP.t8("The number of days for full payment") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%bank%&gt; </td>
+      <td> [% LxERP.t8("Customer's/vendor's bank") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%bic%&gt; </td>
+      <td> [% LxERP.t8("Customer's/vendor's BIC") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%iban%&gt; </td>
+      <td> [% LxERP.t8("Customer's/vendor's IBAN") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%mandator_id%&gt; </td>
+      <td> [% LxERP.t8("Customer's SEPA mandator ID") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%mandate_date_of_signature%&gt; </td>
+      <td> [% LxERP.t8("Customer's Mandate Date of Signature") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%account_number%&gt; </td>
+      <td> [% LxERP.t8("Customer's/vendor's account number") %] </td>
+    </tr>
+    <tr>
+      <td> &lt;%bank_code%&gt; </td>
+      <td> [% LxERP.t8("Customer's/vendor's bank code") %] </td>
+    </tr>
+  </tbody>
+</table>
+
+    
+</div>
+
+</form>
diff --git a/templates/design40_webpages/payment_term/list.html b/templates/design40_webpages/payment_term/list.html
new file mode 100644
index 000000000..e57c0ef40
--- /dev/null
+++ b/templates/design40_webpages/payment_term/list.html
@@ -0,0 +1,60 @@
+[% USE HTML %][% USE T8 %][% USE L %][% USE LxERP %]
+<h1>[% FORM.title %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl">
+[% IF !PAYMENT_TERMS.size %]
+  <p>
+    [%- 'No payment term has been created yet.' | $T8 %]
+  </p>
+
+[%- ELSE %]
+ 
+<div class="wrapper">
+<table id="payment_term_list" class="tbl-list wi-moderate">
+  <colgroup> 
+    <col class="wi-smallest"> 
+    <col class="wi-wide"> 
+    <col class="wi-wide"> 
+    <col class="wi-wide"> 
+    <col class="wi-small"> 
+    <col class="wi-small"> 
+    <col class="wi-small"> 
+    <col class="wi-verysmall"> 
+    <col class="wi-verysmall"> 
+  </colgroup> 
+  <thead>
+    <tr>
+      <th> <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"> </th>
+      <th> [%- 'Description' | $T8 %] </th>
+      <th> [%- 'Long Description (quotations & orders)' | $T8 %] </th>
+      <th> [%- 'Long Description (invoices)' | $T8 %] </th>
+      <th class="center"> [% 'Automatic date calculation' | $T8 %] </th>
+      <th class="center"> [%- 'Netto Terms' | $T8 %] </th>
+      <th class="center"> [%- 'Skonto Terms' | $T8 %] </th>
+      <th class="center"> [%- 'Skonto' | $T8 %] </th>
+      <th class="center"> [%- 'Obsolete' | $T8 %] </th>
+    </tr>
+  </thead>
+  <tbody>
+    [%- FOREACH payment_term = PAYMENT_TERMS %] 
+    <tr id="payment_term_id_[% payment_term.id %]">
+      <td class="dragdrop"> <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"> </td>
+      <td> <a href="[% SELF.url_for(action => 'edit', id => payment_term.id) %]"> [%- HTML.escape(payment_term.description) %] </a> </td>
+      <td> [%- HTML.escape(payment_term.description_long) %] </td>
+      <td> [%- HTML.escape(payment_term.description_long_invoice) %] </td>
+      <td class="center"> [% IF payment_term.auto_calculation %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %] </td>
+      <td class="center"> [%- HTML.escape(payment_term.terms_netto_as_number) %] </td>
+      <td class="center"> [%- HTML.escape(payment_term.terms_skonto_as_number) %] </td>
+      <td class="center"> [%- HTML.escape(payment_term.percent_skonto_as_percent) %] % </td>
+      <td class="center"> [%- HTML.escape(payment_term.obsolete) %] </td>
+    </tr>
+    [%- END %] 
+  </tbody>
+</table>
+</div>
+[%- END %]
+</form>
+
+ [% L.sortable_element('#payment_term_list tbody', url => 'controller.pl?action=PaymentTerm/reorder', with => 'payment_term_id') %]
diff --git a/templates/design40_webpages/presenter/date_period/date_period_picker.html b/templates/design40_webpages/presenter/date_period/date_period_picker.html
new file mode 100644
index 000000000..890c40622
--- /dev/null
+++ b/templates/design40_webpages/presenter/date_period/date_period_picker.html
@@ -0,0 +1,66 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+<div id="[% id %]" class="[% classes.join(' ') %]">
+  [% 'From' | $T8 %] [% L.date_tag(id _ '_from_date',
+                                    defaults.report_period_from_date) %]
+
+  [% 'To' | $T8 %] [% L.date_tag(id _ '_to_date',
+                                  defaults.report_period_to_date) %]
+
+  [% P.button_tag('kivi.ReportPeriod.open_dialog(event.target)',
+                  LxERP.t8('Select from preset'),
+                  id => id _ '_preset_dialog_button',
+                  class => 'neutral') %]
+
+  <div id="[% id _ '_preset_dialog' %]" style="display: none;">
+    <h3>[% 'Year' | $T8 %]</h3>
+    <p>[% L.select_tag(id _ '_preset_dialog_year', years_list, default = defaults.dialog.year) %]</p>
+    <h3>[% 'Period' | $T8 %]</h3>
+    <table class="tbl-horizontal">
+      <colgroup>
+        <col class="wi-mediumsmall">
+        <col class="wi-mediumsmall">
+      </colgroup>
+      <tbody>
+        <tr>
+          <th>[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'yearly',
+                                    checked => defaults.dialog.type == 'yearly' ? 1 : 0,
+                                    label => LxERP.t8('Yearly')) %]</th>
+          <td></td>
+        </tr>
+        <tr>
+          <th>[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'quarterly',
+                                    checked => defaults.dialog.type == 'quarterly' ? 1 : 0,
+                                    label => LxERP.t8('Quarterly')) %]</th>
+          <td>[% L.select_tag(id _ '_preset_dialog_quarter',
+                              [
+                                [ 'A', LxERP.t8('1. Quarter') ],
+                                [ 'B', LxERP.t8('2. Quarter') ],
+                                [ 'C', LxERP.t8('3. Quarter') ],
+                                [ 'D', LxERP.t8('4. Quarter') ],
+                              ],  default => defaults.dialog.quarter) %]</td>
+        </tr>
+        <tr>
+          <th>[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'monthly',
+                                    checked => defaults.dialog.type == 'monthly' ? 1 : 0,
+                                    label => LxERP.t8('Monthly')) %]</th>
+          <td>[% L.select_tag(id _ '_preset_dialog_month', months_list,
+                              default => defaults.dialog.month) %]</td>
+        </tr>
+      </tbody>
+    </table>
+    <p>[% P.button_tag('kivi.ReportPeriod.apply_preset()',
+                        LxERP.t8('Apply')) %]</p>
+  </div>
+  [% L.hidden_tag(id _ '_selected_preset_year', defaults.dialog.year) %]
+  [% L.hidden_tag(id _ '_selected_preset_type', defaults.dialog.type) %]
+  [% L.hidden_tag(id _ '_selected_preset_quarter', defaults.dialog.quarter) %]
+  [% L.hidden_tag(id _ '_selected_preset_month', defaults.dialog.month) %]
+</div>
\ No newline at end of file
diff --git a/templates/design40_webpages/presenter/items_list/items_list.html b/templates/design40_webpages/presenter/items_list/items_list.html
new file mode 100644
index 000000000..68d8d3021
--- /dev/null
+++ b/templates/design40_webpages/presenter/items_list/items_list.html
@@ -0,0 +1,39 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+[% USE T8 %]
+
+[%- IF items.size > 0 %]
+ <table class="tbl-list">
+   <colgroup>
+     <col class="wi-smallest">
+     <col class="wi-verysmall">
+     <col class="wi-small">
+     <col class="wi-smallest">
+     <col class="wi-smallest">
+  </colgroup>
+   <thead>
+    <tr>
+      <th>[% 'Position'    | $T8 %]</th>
+      <th>[% 'Partnumber'  | $T8 %]</th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Qty'         | $T8 %]</th>
+      <th>[% 'Unit'        | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [%- FOREACH item = items %]
+    <tr [% IF !loop.first %]class="item_row_toggle_[% items.0.id %] hidden[% END %]">
+      <td class="right">[% P.escape(item.position) %]</td>
+      <td>[% P.escape(item.part.partnumber) %]</td>
+      <td>[% P.escape(item.description) %]</td>
+      <td class="right">[% P.escape(item.qty_as_number) %]</td>
+      <td>[% P.escape(item.unit) %]</td>
+    </tr>
+    [%- END %]
+  </tbody>
+ </table>
+ [%- IF items.size > 1 %]
+  <a href="javascript:void(0);" onClick="javascript:$('.item_row_toggle_[% items.0.id %]').toggle();$('.item_row_toggle_[% items.0.id %]').is(':hidden') ? $('#toggle_text_[% items.0.id %]').html('… ⏷') : $('#toggle_text_[% items.0.id %]').html('⏶');"><span id='toggle_text_[% items.0.id %]'>… ⏷</span></a>
+ [%- END %]
+[%- END %]
diff --git a/templates/design40_webpages/presenter/items_list/items_list.txt b/templates/design40_webpages/presenter/items_list/items_list.txt
new file mode 100644
index 000000000..7dcbed32a
--- /dev/null
+++ b/templates/design40_webpages/presenter/items_list/items_list.txt
@@ -0,0 +1,3 @@
+[% FOREACH item = items -%]
+[% item.position %]: [% item.part.partnumber %] [% item.description %] [% item.qty_as_number %] [% item.unit %]
+[% END -%]
diff --git a/templates/design40_webpages/presenter/record/grouped_record_list.html b/templates/design40_webpages/presenter/record/grouped_record_list.html
new file mode 100644
index 000000000..b4a05a02f
--- /dev/null
+++ b/templates/design40_webpages/presenter/record/grouped_record_list.html
@@ -0,0 +1,56 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+<div id="record_links_list" class="wrapper">
+  [% IF output %]
+    [% output %]
+  [% ELSE %]
+    <p class="message message_hint">[% LxERP.t8('No data was found.') %]</p>
+  [% END %]
+
+  [% IF edit_record_links %]
+    <div class="buttons">
+      [% L.button_tag('record_links_add()', LxERP.t8('Add links')) %]
+      [% IF output %]
+        [% L.button_tag('record_links_delete()', LxERP.t8('Delete links')) %]
+      [% END %]
+    </div>
+
+<script type="text/javascript"><!--
+  function record_links_add() {
+    kivi.popup_dialog({ url:     'controller.pl',
+                        data:    { action: 'RecordLinks/ajax_add_filter',
+                                   object_model: '[% JavaScript.escape(object_model) %]',
+                                   object_id: '[% JavaScript.escape(object_id) %]'
+                                 },
+                        id:     'record_links_add',
+                        dialog: { title: kivi.t8("Add linked record") } });
+    return true;
+  }
+
+  function record_links_delete() {
+    var checkboxes = $('.record_links_delete').filter(function () { return $(this).prop('checked'); });
+
+    if ((checkboxes.size() == 0) || !confirm('[% LxERP.t8('Do you really want to delete the selected links?') %]'))
+      return false;
+
+    var data = {
+     action:       'RecordLinks/ajax_delete',
+     object_model: '[% JavaScript.escape(object_model) %]',
+     object_id:    '[% JavaScript.escape(object_id) %]'
+    };
+
+    $.ajax({
+      url:     "controller.pl?" + checkboxes.serialize(),
+      data:    data,
+      success: function(new_data) { $('#record_links_list').replaceWith(new_data); }
+    });
+
+    return false;
+  }
+
+ --></script>
+[% END %]
+</div><!-- /#record_links_list /.wrapper -->
diff --git a/templates/design40_webpages/presenter/record/record_list.html b/templates/design40_webpages/presenter/record/record_list.html
new file mode 100644
index 000000000..81b4acc57
--- /dev/null
+++ b/templates/design40_webpages/presenter/record/record_list.html
@@ -0,0 +1,42 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+
+
+<div class="wrapper">
+  <table class="tbl-list wi-moderate" id="record_list_[% type %]">
+   <caption>[% P.escape(title) %]</caption>
+   <thead>
+     <tr>
+      [% IF edit_record_links %]
+        <th>[% L.checkbox_tag('record_links_delete_checkall_' _ type) %]</th>
+      [% END %]
+      [% FOREACH column = TABLE_HEADER %]
+        <th[% IF column.alignment %] class="[% column.alignment %]"[% END %]>[% P.escape(column.value) %]</th>
+      [% END %]
+     </tr>
+   </thead>
+   <tbody>
+     [% FOREACH row = TABLE_ROWS %]
+       <tr class="listrow[% loop.count % 2 %]">
+         [% IF edit_record_links %]
+           <td>[% L.checkbox_tag('record_links_delete[]', 'value'=row.record_link.from_table _ '__' _ row.record_link.from_id _ '__' _ row.record_link.to_table _ '__' _ row.record_link.to_id, 'class'='record_links_delete') %]</td>
+         [% END %]
+         [% FOREACH column = row.columns %]
+           <td[% IF column.alignment %] class="[% column.alignment %]"[% END %]>
+             [% IF column.link %]<a href="[% column.link %]">[% END %]
+             [% P.escape(column.value) %]
+             [% IF column.link %]</a>[% END %]
+           </td>
+         [% END %]
+       </tr>
+     [% END %]
+   </tbody>
+  </table>
+</div>
+
+[% IF edit_record_links %]
+  <script type="text/javascript">
+  $('#record_links_delete_checkall_[% type %]').checkall("#record_list_[% type %] tbody :checkbox");
+  </script>
+[% END %]
diff --git a/templates/design40_webpages/presenter/test_page.html b/templates/design40_webpages/presenter/test_page.html
new file mode 100644
index 000000000..2318a6c65
--- /dev/null
+++ b/templates/design40_webpages/presenter/test_page.html
@@ -0,0 +1,25 @@
+[% USE L %]
+[% USE P %]
+
+<h1>Generic-Presenter-Testpage</h1>
+
+<div class="wrapper">
+
+  <h3>Date</h3>
+
+  [% P.date_tag('my-date-id') %]<br><br>
+
+  [% P.date_tag('my-date-id', defaults.from_date) %]
+  <pre>presets: '1.2.2022'</pre>
+
+  <h3>Date Period</h3>
+
+  [% P.date_period.picker('my-picker-id', '', '') %]<br>
+
+  [% P.date_period.picker('my-other-picker-id',
+                            defaults.from_date,
+                            defaults.to_date,
+                            dialog_defaults => defaults.dialog) %]
+  <pre>presets: '1.2.2022', '3.4.2022', dialog: '2022', 'monthly', 'B', '6'</pre>
+
+</div>
\ No newline at end of file
diff --git a/templates/design40_webpages/price_information/report_bottom.html b/templates/design40_webpages/price_information/report_bottom.html
new file mode 100644
index 000000000..1876b35f0
--- /dev/null
+++ b/templates/design40_webpages/price_information/report_bottom.html
@@ -0,0 +1 @@
+[% PROCESS 'common/paginate.html' pages=SELF.pages, base_url=SELF.self_url %]
diff --git a/templates/design40_webpages/price_rule/_filter.html b/templates/design40_webpages/price_rule/_filter.html
new file mode 100644
index 000000000..04209779e
--- /dev/null
+++ b/templates/design40_webpages/price_rule/_filter.html
@@ -0,0 +1,117 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action="controller.pl" method="post" id="search_form">
+
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+[%
+  # This code contains the form elements within the .filter-toggle-panel
+  # This block must bear the name filter_toggle_panel
+  # For more info have a look in common/toggle_panel.html
+%]
+<table id="filter_table" class="tbl-horizontal">
+  <caption>[% 'Part' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.name:substr::ilike', filter.name_substr__ilike, size = 20, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Type' | $T8 %]</th>
+      <td>[% L.select_tag('filter.type', [ [ 'customer', LxERP.t8('Sales Price Rules '), ] [ 'vendor', LxERP.t8('Purchase Price Rules ') ] ], with_empty=1, default=filter.type, id='price_rule_filter_type', class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part' | $T8 %]</th>
+      <td>[% P.part.picker('filter.item_type_matches[].part', FORM.filter.item_type_matches.0.part, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Partsgroup' | $T8 %]</th>
+      <td>[% L.select_tag('filter.item_type_matches[].partsgroup', SELF.partsgroups, title_key='partsgroup', default=FORM.filter.item_type_matches.0.partsgroup, with_empty=1, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Qty' | $T8 %]</th>
+      <td>[% L.input_tag('filter.item_type_matches[].qty', FORM.filter.item_type_matches.0.qty, class="wi-normal") %]</td>
+    </tr>
+    <tr id="price_rule_filter_customer_tr"[% ' style="display:none" ' UNLESS SELF.vc== 'customer' %]>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% P.customer_vendor.picker('filter.item_type_matches[].customer', FORM.filter.item_type_matches.0.customer, type='customer', id='price_rule_filter_customer', class="wi-normal") %]</td>
+    </tr>
+    <tr id="price_rule_filter_vendor_tr"[% ' style="display:none" ' UNLESS SELF.vc== 'customer' %]><!-- PENDENT: Korrekt mit customer? -->
+      <th>[% 'Vendor' | $T8 %]</th>
+      <td>[% P.customer_vendor.picker('filter.item_type_matches[].vendor', FORM.filter.item_type_matches.0.vendor, type='vendor', id='price_rule_filter_vendor', class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Business' | $T8 %]</th>
+      <td>[% L.select_tag('filter.item_type_matches[].business', SELF.businesses, title_key='description', default=FORM.filter.item_type_matches.0.business, with_empty=1, class="wi-normal") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table id="filter_table2" class="tbl-horizontal">
+  <caption>[% 'Dates' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Reqdate' | $T8 %]</th>
+      <td>[% L.date_tag('filter.item_type_matches[].reqdate', FORM.filter.item_type_matches.0.reqdate, class="wi-date") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Transdate Record' | $T8 %]</th>
+      <td>[% L.date_tag('filter.item_type_matches[].transdate', FORM.filter.item_type_matches.0.transdate, class="wi-date") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Prices & Discounts' | $T8 %]</th>
+    </tr>
+    <tr>
+    <th>[% 'Pricegroup' | $T8 %]</th>
+    <td>[% L.select_tag('filter.item_type_matches[].pricegroup', SELF.pricegroups, default=FORM.filter.item_type_matches.0.pricegroup, title_key='pricegroup', with_empty=1, class="wi-normal") %]<br>
+    </td>
+    </tr>
+    <tr>
+      <th>[% 'Price' | $T8 %]</th>
+      <td>[% L.input_tag('filter.price:number', filter.price_number, size=20, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Reduced Master Data' | $T8 %]</th>
+      <td>[% L.input_tag('filter.reduction:number', filter.reduction_number, size=20, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Discount' | $T8 %]</th>
+      <td>[% L.input_tag('filter.discount:number', filter.discount_number, size=20, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Status' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th>[% 'Priority' | $T8 %]</th>
+      <td>[% L.select_tag('filter.priority', [ [ '', LxERP.t8('All') ], [ 3, LxERP.t8('Normal') ], [ 4 , LxERP.t8('Override')]], default=filter.priority, class="wi-normal") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Obsolete' | $T8 %]</th>
+      <td>[% L.select_tag('filter.obsolete', [ [ '', LxERP.t8('Both') ], [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=filter.obsolete, class="wi-normal") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="col list">
+<h3 class="caption">[% 'Has item type' | $T8 %]</h3>
+  [% FOREACH type = SELF.all_price_rule_item_types %]
+    <div>[% L.checkbox_tag('filter.has_item_type[]', value=type.0, label=type.1, checked=filter.has_item_type_.${type.0})  %]</div>
+  [% END %]
+</div>
+
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+
+<div class="buttons"> [% L.button_tag("\$('#search_form').resetForm()", LxERP.t8("Reset Filter"), class='neutral', type='reset') %]</div>
+
+[% END #BLOCK filter_toggle_panel %]
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div>
+</form>
diff --git a/templates/design40_webpages/price_rule/empty_item.html b/templates/design40_webpages/price_rule/empty_item.html
new file mode 100644
index 000000000..b57a91ba6
--- /dev/null
+++ b/templates/design40_webpages/price_rule/empty_item.html
@@ -0,0 +1,10 @@
+[% USE L %]
+[% USE T8 %]
+<tr>
+  <td>&nbsp;</td>
+  <td>[% L.select_tag('', SELF.all_price_rule_item_types, id='price_rules_empty_item_select') %]</td>
+  <td colspan="2">
+    <a id="price_rule_item_add" class="button cursor-pointer">[% 'Add new price rule item' | $T8 %]</a>
+</td>
+</tr>
+
diff --git a/templates/design40_webpages/price_rule/form.html b/templates/design40_webpages/price_rule/form.html
new file mode 100644
index 000000000..f85360574
--- /dev/null
+++ b/templates/design40_webpages/price_rule/form.html
@@ -0,0 +1,62 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1>[% title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="form">
+[% L.hidden_tag("price_rule.id",   SELF.price_rule.id) %]
+[% L.hidden_tag("price_rule.type", SELF.price_rule.type) %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+       <th>[% 'Name' | $T8 %]</th>
+       <td>[% L.input_tag("price_rule.name", SELF.price_rule.name, class='initial_focus wi-wide') %]</td>
+    </tr>
+    <tr>
+       <th>[% 'Priority' | $T8 %]</th>
+       <td>[% L.select_tag('price_rule.priority', [ [3, LxERP.t8('Normal') ], [ 4, LxERP.t8('Override') ] ], default=SELF.price_rule.priority, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Valid' | $T8 %]</th>
+      <td>[% L.select_tag('price_rule.obsolete', [ [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=SELF.price_rule.obsolete, title_key='description', class='wi-normal') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+<div id="price_rule_items">
+  <table class="tbl-list" style="clear:left;">
+    <caption>[% 'If all of the following match' | $T8 %]:</caption>
+    <thead><tr>
+      <th class="center">X</th>
+      <th>Objekt</th>
+      <th>Bedingung</th>
+      <th>Wert</th>
+    </tr></thead>
+    <tbody>
+      [% FOREACH item = SELF.price_rule.items %]
+         [% PROCESS 'price_rule/item.html' item=item %]
+      [% END %]
+    </tbody>
+    <tbody id="price_rule_new_items"></tbody>
+    <tfoot id="price_rule_emtpy_item" class="blank">[% PROCESS 'price_rule/empty_item.html' %]</tfoot>
+  </table>
+</div>
+
+<div class="input-panel control-panel">
+  <h3>[% 'Then' | $T8 %]…</h3>
+  <p>[% 'Set (set to)' | $T8 %] [% L.select_tag('price_rule.price_type', SELF.all_price_types, default=SELF.price_rule.price_type) %] [% 'to (set to)' | $T8 %] [% L.input_tag('price_rule.price_or_discount_as_number', SELF.price_rule.price_or_discount_as_number) %] <a id="price_rule_price_type_help" class="interact cursor-help" title="[% 'Price type explanation' | $T8 %]">[?]</a></p>
+</div>
+
+</div>
+
+</form>
diff --git a/templates/design40_webpages/price_rule/item.html b/templates/design40_webpages/price_rule/item.html
new file mode 100644
index 000000000..bce60fdcc
--- /dev/null
+++ b/templates/design40_webpages/price_rule/item.html
@@ -0,0 +1,64 @@
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE T8 %]
+[% USE LxERP %]
+[% SET num_compare_ops = [
+  [ 'eq', LxERP.t8('is equal to') ],
+  [ 'le', LxERP.t8('is lower than or equal') ],
+  [ 'ge', LxERP.t8('is greater than or equal') ],
+] %]
+[% SET date_compare_ops = [
+  [ 'eq', LxERP.t8('is equal to') ],
+  [ 'gt', LxERP.t8('is after') ],
+  [ 'lt', LxERP.t8('is before') ],
+] %]
+
+<tr class="item price_rule_item">
+  <td>
+    <a class="price_rule_remove_line interact cursor-pointer button">✘</a><!-- PENDENT: das Loeschzeichen sollte einheitlich angewendet werden. -->
+    [% L.hidden_tag('price_rule.items[+].id', item.id) %]
+    [% L.hidden_tag('price_rule.items[].type', item.type) %]
+  </td>
+
+  [% SWITCH item.type %]
+    [% CASE 'part' %]
+      <td>[% 'Part' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% P.part.picker('price_rule.items[].value_int', item.part,, class='wi-wide') %]</td>
+    [% CASE 'customer' %]
+      <td>[% 'Customer' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% P.customer_vendor.picker('price_rule.items[].value_int', item.customer, type='customer', class='wi-wide') %]</td>
+    [% CASE 'vendor' %]
+      <td>[% 'Vendor' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% P.customer_vendor.picker('price_rule.items[].value_int', item.vendor, type='vendor', class='wi-wide') %]</td>
+    [% CASE 'business' %]
+      <td>[% 'Type of Business' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% L.select_tag('price_rule.items[].value_int', SELF.businesses, title_key='description', default=item.value_int, class='wi-wide') %]</td>
+    [% CASE 'partsgroup' %]
+      <td>[% 'Partsgroup' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% L.select_tag('price_rule.items[].value_int', SELF.partsgroups, title_key='partsgroup', default=item.value_int, class='wi-wide') %]</td>
+    [% CASE 'qty' %]
+      <td>[% 'Quantity' | $T8 %]</td>
+      <th>[% L.select_tag('price_rule.items[].op', num_compare_ops, default=item.op, class='wi-normal' ) %]</th>
+      <td>[% L.input_tag('price_rule.items[].value_num_as_number', item.value_num_as_number, class='wi-small') %]</td>
+    [% CASE 'reqdate' %]
+      <td>[% 'Reqdate' | $T8 %]</td>
+      <th>[% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op, class='wi-normal') %]</th>
+      <td>[% L.date_tag('price_rule.items[].value_date', item.value_date,, class='wi-date') %]</td>
+    [% CASE 'transdate' %]</td>
+      <td>[% 'Transdate Record' | $T8 %]</td>
+      <th>[% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op, class='wi-normal') %]</th>
+      <td>[% L.date_tag('price_rule.items[].value_date', item.value_date,, class='wi-date') %]</td>
+    [% CASE 'pricegroup' %]
+      <td>[% 'Pricegroup' | $T8 %]</td>
+      <th>[% 'is' | $T8 %]</th>
+      <td>[% L.select_tag('price_rule.items[].value_int', SELF.pricegroups, title_key='pricegroup', default=item.value_int, class='wi-wide') %]</td>
+    [% CASE %]
+  [% END %]
+
+</tr>
diff --git a/templates/design40_webpages/price_rule/price_type_help.html b/templates/design40_webpages/price_rule/price_type_help.html
new file mode 100644
index 000000000..905f5d371
--- /dev/null
+++ b/templates/design40_webpages/price_rule/price_type_help.html
@@ -0,0 +1,26 @@
+[% USE T8 %]
+[% 'Matching Price Rules can apply in one of three types:' | $T8 %]
+
+<h3>[% 'Price' | $T8 %]</h3>
+<p>
+  [% 'This will set an exact price.' | $T8 %]
+  [% 'It will not be further modified by any other source, and will be offered in records like this.' | $T8 %]
+</p>
+
+<h3>[% 'Reduced Master Data' | $T8 %]</h3>
+<p>
+  [% 'This will reduce the appropriate Master Data price by this in percent points.' | $T8 %]
+  [% 'This will happen before the price is offered, and the reduction will not be printed in documents.' | $T8 %]
+  [% 'Negative reductions are possible to model price increases.' | $T8 %]
+</p>
+<p>[% 'Example' | $T8 %]:</p>
+<pre>[% 'Set (set to)' | $T8 %] [% 'Reduced Master Data' | $T8 %] [% 'to (set to)' | $T8 %] 3</pre>
+<p>
+  [% 'This will apply a 3% reduction to the master data price before entering it into the record item.' | $T8 %]
+</p>
+<h3>[% 'Discount' | $T8 %]</h3>
+<p>
+  [% 'This will be treated as a discount in percent points.' | $T8 %]
+  [% 'Contrary to Reduced Master Data this will be shown as discount in records.' | $T8 %]
+  [% 'The discounted amount will be shown in documents.' | $T8 %]
+</p>
diff --git a/templates/design40_webpages/price_rule/report_bottom.html b/templates/design40_webpages/price_rule/report_bottom.html
new file mode 100644
index 000000000..331bade34
--- /dev/null
+++ b/templates/design40_webpages/price_rule/report_bottom.html
@@ -0,0 +1,5 @@
+[% USE L %]
+[% USE T8 %]
+[% USE HTML %]
+[% L.paginate_controls(models=SELF.models) %]
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/price_rule/report_top.html b/templates/design40_webpages/price_rule/report_top.html
new file mode 100644
index 000000000..65cff87c2
--- /dev/null
+++ b/templates/design40_webpages/price_rule/report_top.html
@@ -0,0 +1,5 @@
+[% USE L %]
+
+[% PROCESS 'price_rule/_filter.html' filter=SELF.models.filtered.laundered UNLESS FORM.inline %]
+
+<div class="wrapper">
diff --git a/templates/design40_webpages/project/_basic_data.html b/templates/design40_webpages/project/_basic_data.html
new file mode 100644
index 000000000..508b389ff
--- /dev/null
+++ b/templates/design40_webpages/project/_basic_data.html
@@ -0,0 +1,46 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Project' | $T8 %][% IF SELF.project.description %] <i>[% SELF.project.description %]</i>[% END %] </caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Number' | $T8 %]</th>
+      <td>[% L.input_tag("project.projectnumber", SELF.project.projectnumber, class="wi-wide initial_focus") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.areainput_tag("project.description", SELF.project.description, size=37, class='wi-wide', wrap="soft") %] </td>
+    </tr>
+    <tr>
+      <th>[% 'Project Type' | $T8 %]</th>
+      <td>[% L.select_tag('project.project_type_id', SELF.project_types, default=SELF.project.project_type_id, title_key='description', class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Status' | $T8 %]</th>
+      <td>[% L.select_tag('project.project_status_id', SELF.project_statuses, default=SELF.project.project_status_id, title_key='description', class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% P.customer_vendor.picker('project.customer_id', SELF.project.customer_id, type='customer', fat_set_item=1, class='wi-wide', default=SELF.project.customer_id) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Valid' | $T8 %]</th>
+      <td>[% L.select_tag('project.valid', [ [ 1, LxERP.t8('Valid') ], [ 0, LxERP.t8('Invalid') ] ], default=SELF.project.valid, class='wi-wide') %]</td>
+    </tr>
+    [% IF SELF.project.id %]
+    <tr>
+      <th>[% 'Active' | $T8 %]</th>
+      <td>[% L.select_tag('project.active', [ [ 1, LxERP.t8('Active') ], [ 0, LxERP.t8('Inactive') ] ], default=SELF.project.active, class='wi-wide') %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/project/_cvars.html b/templates/design40_webpages/project/_cvars.html
new file mode 100644
index 000000000..355364b23
--- /dev/null
+++ b/templates/design40_webpages/project/_cvars.html
@@ -0,0 +1,9 @@
+[% USE HTML  %]
+<table class="tbl-horizontal">
+[% FOREACH var = CUSTOM_VARIABLES %]
+<tr>
+ <th>[% HTML.escape(var.description) %]</th>
+ <td>[% var.HTML_CODE %]</td>
+</tr>
+[% END %]
+</table>
diff --git a/templates/design40_webpages/project/_filter.html b/templates/design40_webpages/project/_filter.html
new file mode 100644
index 000000000..911e1200b
--- /dev/null
+++ b/templates/design40_webpages/project/_filter.html
@@ -0,0 +1,69 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% BLOCK filter_toggle_panel %]
+<table id="filter_table" class="tbl-horizontal">
+  <caption>[% 'Project' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.projectnumber:substr::ilike', filter.projectnumber_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, class='wi-normal initial_focus') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Type' | $T8 %]</th>
+      <td>[% L.select_tag('filter.project_type_id', SELF.project_types, default=filter.project_type_id, title_key='description', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Status' | $T8 %]</th>
+      <td>[% L.select_tag('filter.project_status_id', SELF.project_statuses, default=filter.project_status_id, title_key='description', with_empty=1, class='wi-normal') %]</td>
+    </tr>
+    [% FOREACH cvar_cfg = SELF.cvar_configs %]
+    [%- IF cvar_cfg.searchable %]
+    <tr>
+      <th align="right">[% HTML.escape(cvar_cfg.description) %]</th>
+      <td>[% INCLUDE 'common/render_cvar_filter_input.html' cvar_cfg=cvar_cfg cvar_class="rs_input_field" %]</td>
+    </tr>
+    [% END %]
+    [% END %]
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Include in Report' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <td>[% L.select_tag('filter.active', [ [ 'active', LxERP.t8('Active') ], [ 'inactive', LxERP.t8('Inactive') ], [ 'both', LxERP.t8('Both') ] ], default=filter.active, style="width: 200px") %]</td>
+    </tr>
+    <tr>
+      <td>[% L.select_tag('filter.valid', [ [ 'valid', LxERP.t8('Valid') ], [ 'invalid', LxERP.t8('Invalid') ], [ 'both', LxERP.t8('Both') ] ], default=filter.valid, style="width: 200px") %]</td>
+    </tr>
+    <tr>
+      <td>[% L.select_tag('filter.status', [ [ 'all', LxERP.t8('All') ], [ 'orphaned', LxERP.t8('Orphaned') ] ], default=filter.status, style="width: 200px") %]</td>
+    </tr>
+    [% FOREACH cvar_cfg = SELF.includeable_cvar_configs %]
+    <tr>
+      <td>
+        [% name__ = cvar_cfg.name;
+        L.checkbox_tag("include_cvars_" _ name__, value="1", checked=(SELF.include_cvars.$name__ ? 1 : ''), label=cvar_cfg.description) %]
+      </td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% L.button_tag('$("#search_form").resetForm()', LxERP.t8('Reset'), class="neutral") %]
+</div>
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
diff --git a/templates/design40_webpages/project/_invoice_permissions.html b/templates/design40_webpages/project/_invoice_permissions.html
new file mode 100644
index 000000000..3d8d714a7
--- /dev/null
+++ b/templates/design40_webpages/project/_invoice_permissions.html
@@ -0,0 +1,7 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div class="wrapper">
+ [% L.select_tag("project.employee_invoice_permissions[]", SELF.employees, id="employee_invoice_permissions", title_key="safe_name", default=SELF.project.employee_invoice_permissions, default_value_key='id', multiple=1) %]
+ [% L.multiselect2side("employee_invoice_permissions", labelsx => LxERP.t8("All employees"), labeldx => LxERP.t8("Employees with read access to the project's invoices")) %]
+</div>
diff --git a/templates/design40_webpages/project/_linked_records.html b/templates/design40_webpages/project/_linked_records.html
new file mode 100644
index 000000000..b9448d10e
--- /dev/null
+++ b/templates/design40_webpages/project/_linked_records.html
@@ -0,0 +1,2 @@
+[% USE P %]
+[% P.record.grouped_list(records) %]
diff --git a/templates/design40_webpages/project/_project_picker_result.html b/templates/design40_webpages/project/_project_picker_result.html
new file mode 100644
index 000000000..eb3c3e800
--- /dev/null
+++ b/templates/design40_webpages/project/_project_picker_result.html
@@ -0,0 +1,20 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% FOREACH project = SELF.projects %]
+  <div class='project_picker_project [% FORM.hide_project_details ? 'ppp_line' : 'ppp_block' %]'>
+    <input type='hidden' class='project_picker_id' value='[% project.id %]'>
+    <input type='hidden' class='project_picker_description' value='[% project.displayable_name %]'>
+    <span class='ppp_block_number'>[% project.projectnumber | html %]</span>
+    <span class='ppp_block_description'>[% project.description | html %]</span>
+  </div>
+[% END %]
+
+<div style='clear:both'></div>
+
+[% L.paginate_controls(target='#project_picker_result', selector='#project_picker_result', models=SELF.models) %]
+<script type='text/javascript'>
+  kivi.ProjectPicker($('#'+$('#project_picker_real_id').val())).init_results();
+</script>
diff --git a/templates/design40_webpages/project/form.html b/templates/design40_webpages/project/form.html
new file mode 100644
index 000000000..fef4662ff
--- /dev/null
+++ b/templates/design40_webpages/project/form.html
@@ -0,0 +1,56 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE LxERP %]
+<h1>[% title | html %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+ <form method="post" action="controller.pl" id="form">
+  [% L.hidden_tag("callback", callback) %]
+  [% L.hidden_tag("id", SELF.project.id) %]
+
+  <div class="tabwidget">
+   <ul>
+    <li><a href="#basic_data">[% 'Basic Data' | $T8 %]</a></li>
+    [% IF CUSTOM_VARIABLES.size %]
+      <li><a href="#custom_variables">[% 'Custom Variables' | $T8 %]</a></li>
+    [% END %]
+    [% IF SELF.may_edit_invoice_permissions %]
+      <li><a href="#invoice_permissions">[% 'Permissions for invoices' | $T8 %]</a></li>
+    [% END %]
+    [%- IF SELF.project.id %]
+      [%- IF INSTANCE_CONF.get_doc_storage %]
+        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=project&object_id=[% SELF.project.id %]">[% 'Attachments' | $T8 %]</a></li>
+      [%- END %]
+    [%- END %]
+    [% IF SELF.project.id and AUTH.assert('record_links', 1) %]
+      <li><a href="#linked_records">[% 'Linked Records' | $T8 %]</a></li>
+    [% END %]
+   </ul>
+
+   <div id="basic_data" class="ui-tabs-panel">
+     [% PROCESS 'project/_basic_data.html' %]
+   </div>
+
+   [% IF CUSTOM_VARIABLES.size %]
+     <div id="custom_variables" class="ui-tabs-panel">
+       [% PROCESS 'project/_cvars.html' %]
+     </div>
+   [% END %]
+
+   [% IF SELF.may_edit_invoice_permissions %]
+     <div id="invoice_permissions">
+      [%- PROCESS 'project/_invoice_permissions.html' %]
+     </div>
+   [% END %]
+
+   [% IF SELF.project.id and AUTH.assert('record_links', 1) %]
+     <div id="linked_records" class="ui-tabs-panel">
+       [% PROCESS 'project/_linked_records.html' records=SELF.linked_records %]
+     </div>
+   [% END %]
+
+  </div>
+ </form>
diff --git a/templates/design40_webpages/project/project_picker_search.html b/templates/design40_webpages/project/project_picker_search.html
new file mode 100644
index 000000000..7114f33db
--- /dev/null
+++ b/templates/design40_webpages/project/project_picker_search.html
@@ -0,0 +1,16 @@
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE T8 %]
+
+[% L.hidden_tag('project_picker_real_id', FORM.real_id) %]
+[% LxERP.t8("Filter") %]: [% L.input_tag('project_picker_filter', SELF.models.filtered.laundered.all_substr_multi__ilike, class='project_picker_filter') %]
+[% P.link_tag("javascript:void(0);", "x", id='project_picker_clear_filter') %]
+<div class='float-right'>
+  [% L.checkbox_tag('no_paginate', checked=FORM.no_paginate, id='no_paginate', for_submit=1, label=LxERP.t8('All as list')) %]
+</div>
+
+<div id='project_picker_result'>
+  [% PROCESS 'project/_project_picker_result.html' %]
+</div>
diff --git a/templates/design40_webpages/project/report_bottom.html b/templates/design40_webpages/project/report_bottom.html
new file mode 100644
index 000000000..b210ab01c
--- /dev/null
+++ b/templates/design40_webpages/project/report_bottom.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% L.paginate_controls(models=SELF.models) %]
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/project/report_top.html b/templates/design40_webpages/project/report_top.html
new file mode 100644
index 000000000..8bf827158
--- /dev/null
+++ b/templates/design40_webpages/project/report_top.html
@@ -0,0 +1,15 @@
+[% USE L %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action="controller.pl" method="post" id="search_form">
+<div class="wrapper">
+  [% PROCESS 'project/_filter.html' filter=SELF.models.filtered.laundered %]
+  [% L.hidden_tag('action', 'Project/dispatch') %]
+  [% L.hidden_tag('sort_by', FORM.sort_by) %]
+  [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+  [% L.hidden_tag('page', FORM.page) %]
+</div><!-- /.wrapper -->
+</form>
+<div class="wrapper">
diff --git a/templates/design40_webpages/project/test_page.html b/templates/design40_webpages/project/test_page.html
new file mode 100644
index 000000000..afae48cc2
--- /dev/null
+++ b/templates/design40_webpages/project/test_page.html
@@ -0,0 +1,83 @@
+[% USE L %]
+[% USE P %]
+
+<h1>Projekt-Picker-Testpage</h1>
+
+<div class="wrapper">
+
+<br>
+[% P.project.picker('project_id', '', style='width: 600px') %] text<br>
+
+<br>
+[% P.project.picker('project3_id', '', customer_id='1323', style='width: 300px') %] Filter one customer id
+<br>
+
+<br>
+[% P.project.picker('project4_id', '', customer_id='1323,1325', style='width: 300px') %] Filter two customer ids
+<br>
+
+<br>
+[% P.project.picker('project5_id', '', style='width: 300px') %] active/valid (default)
+<br>
+
+<br>
+[% P.project.picker('project6_id', '', active='active', style='width: 300px') %] active (explicit)
+<br>
+
+<br>
+[% P.project.picker('project7_id', '', active='inactive', style='width: 300px') %] inactive
+<br>
+
+<br>
+[% P.project.picker('project8_id', '', active='both', style='width: 300px') %] active and inactive
+<br>
+
+<br>
+[% P.project.picker('project9_id', '', valid='valid', style='width: 300px') %] valid (explicit)
+<br>
+
+<br>
+[% P.project.picker('project10_id', '', valid='invalid', style='width: 300px') %] invalid
+<br>
+
+<br>
+[% P.project.picker('project11_id', '', valid='both', style='width: 300px') %] valid and invalid
+<br>
+
+<br>
+[% P.project.picker('project12_id', '', active='both', valid='both',style='width: 300px') %] all (active, inactive, valid, invalid)
+<br>
+
+<br>
+[% P.project.picker('project13_id', '', style='width: 300px') %] description style full (default)
+<br>
+
+<br>
+[% P.project.picker('project14_id', '', description_style='full', style='width: 300px') %] description style full (explicit)
+<br>
+
+<br>
+[% P.project.picker('project15_id', '', description_style='both', style='width: 300px') %] description style both
+<br>
+
+<br>
+[% P.project.picker('project16_id', '', description_style='number', style='width: 300px') %] description style number
+<br>
+
+<br>
+[% P.project.picker('project17_id', '', description_style='description', style='width: 300px') %] description style description
+<br>
+
+<br>
+
+Runtime test:<br>
+<div id='runtime_picker'>
+
+</div><!-- /.wrapper -->
+
+<script>
+$(function() {
+  $('#runtime_picker').html('[% P.project.picker("project2_id") %]');
+  kivi.reinit_widgets();
+})
+</script>
diff --git a/templates/design40_webpages/rc/step1.html b/templates/design40_webpages/rc/step1.html
new file mode 100644
index 000000000..7ef73010e
--- /dev/null
+++ b/templates/design40_webpages/rc/step1.html
@@ -0,0 +1,24 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% 'Reconciliation' | $T8 %]</h1>
+
+<form method="post" action="rc.pl" id="form">
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Account' | $T8 %]</th>
+      <td>[% L.select_tag('accno', PR, value_title_sub=\selection_sub) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Period' | $T8 %]</th>
+      <td>[% L.date_tag('fromdate') %] [% 'Until' | $T8 %] [% L.date_tag('todate') %]</td>
+    </tr>
+  </tbody>
+</table>
+</div>
+</form>
diff --git a/templates/design40_webpages/rc/step2.html b/templates/design40_webpages/rc/step2.html
new file mode 100644
index 000000000..7e35e3247
--- /dev/null
+++ b/templates/design40_webpages/rc/step2.html
@@ -0,0 +1,101 @@
+[% USE HTML  %]
+[% USE L  %]
+[% USE T8 %]
+[% USE LxERP  %]
+
+<h1>[% accno | html %]--[% account | html %]</h1>
+
+<p>[% FOREACH row IN option %][% row %][% ', ' UNLESS loop.last %][% END %]</p>
+
+<form method="post" action="rc.pl" id="form">
+<div class="wrapper">
+
+<table class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+      <th>[% L.checkbox_tag('checkall_checkboxes', checkall='input.checkall') %]</th>
+      <th>[% 'Date' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+      <th>[% 'Description' | $T8 %]</th>
+      [% IF is_asset %]
+      <th>[% 'Payment' | $T8 %]</th>
+      <th>[% 'Deposit' | $T8 %]</th>
+      [% ELSE %]
+      <th>[% 'Decrease' | $T8 %]</th>
+      <th>[% 'Increase' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Balance' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td class='numeric'></td>
+      <td class='numeric'></td>
+      <td class='numeric'>[% LxERP.format_amount(balance.beginning, 2, 0) %]</td>
+    </tr>
+    [% FOREACH row = DATA %]
+    <tr>
+      <td> [% IF row.fx_transaction %] [% L.hidden_tag('fxoid_' _ row.i, row.oid) %] [% ELSE %] [% L.checkbox_tag('cleared_' _ row.i, class='checkall', checked=row.cleared) %] [% L.hidden_tag('oid_' _ row.i, row.oid) %] [% END %] </td>
+      <td>[% row.transdate %]</td>
+      <td>[% row.source %]</td>
+      <td>[% row.name %]</td>
+      <td class='numeric'>[% LxERP.format_amount(row.amount, 2) IF row.amount > 0 %]</td>
+      <td class='numeric'>[% LxERP.format_amount(row.amount * -1, 2) IF row.amount < 0 %]</td>
+      <td class='numeric'>[% LxERP.format_amount(row.balance, 2, 0) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td class='numeric'>[% LxERP.format_amount(total.credit, 2, 0) %]</td>
+    <td class='numeric'>[% LxERP.format_amount(total.debit, 2, 0) %]</td>
+    <td class='numeric'></td>
+  </tr>
+  </tfoot>
+</table>
+
+
+<table class="tbl-horizontal">
+  <tr>
+    <th>[% 'Cleared Balance' | $T8 %]</th>
+    <td>[% LxERP.format_amount(balance.cleared, 2, 0) %]</td>
+  </tr>
+  <tr>
+    <th>[% 'Statement Balance' | $T8 %]</th>
+    <td><input type="text" name="statementbalance" size=11 value="[% LxERP.format_amount(balance.statement, 2, 0) %]">
+    </td>
+  </tr>
+  [% IF fx %]
+    <tr>
+      <th>[% 'Exchangerate Difference' | $T8 %]</th>
+      <td>[% LxERP.format_amount(fx, 2, 0) %]</td>
+    </tr>
+  [% END %]
+  <tr>
+    <th>[% 'Difference' | $T8 %]</th>
+    <td>
+      <input type="text" name="null" size=11 value="[% LxERP.format_amount(difference, 2, 0) %]" readonly>
+      <input type=hidden name="difference" value="[% LxERP.format_amount(difference, 2, 0) %]">
+    </td>
+  </tr>
+</table>
+
+
+
+<input type=hidden name=rowcount value="[% rowcount %]">
+<input type=hidden name=accno value="[% accno %]">
+<input type=hidden name=account value="[% account %]">
+
+<input type=hidden name=fromdate value="[% fromdate %]">
+<input type=hidden name=todate value="[% todate %]">
+
+</div>
+</form>
diff --git a/templates/design40_webpages/reclamation/_report_bottom.html b/templates/design40_webpages/reclamation/_report_bottom.html
new file mode 100644
index 000000000..da08e0758
--- /dev/null
+++ b/templates/design40_webpages/reclamation/_report_bottom.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[%- L.paginate_controls(models=models) %]
diff --git a/templates/design40_webpages/reclamation/_report_top.html b/templates/design40_webpages/reclamation/_report_top.html
new file mode 100644
index 000000000..dfc9f7cf5
--- /dev/null
+++ b/templates/design40_webpages/reclamation/_report_top.html
@@ -0,0 +1,10 @@
+[%- USE L %]
+[% BLOCK filter_toggle_panel %]
+[%- FILTER_HTML %]
+[% END %]
+
+<div class="wrapper">
+  [% SET display_status = 'open' %]
+  [% INCLUDE 'common/toggle_panel.html' %]
+</div><!-- /.wrapper -->
+ <hr>
diff --git a/templates/design40_webpages/reclamation/form.html b/templates/design40_webpages/reclamation/form.html
new file mode 100644
index 000000000..8e8e5a354
--- /dev/null
+++ b/templates/design40_webpages/reclamation/form.html
@@ -0,0 +1,75 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+[% # L.dump( SELF.reclamation.items_sorted ) %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
+<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.reclamation.record_number -%]</span></h1>
+
+<div id="print_options" style="display:none">
+  <form method="post" action="controller.pl" id="print_options_form">
+    [% SELF.print_options %]
+    <br>
+    [% L.button_tag('kivi.Reclamation.print()', LxERP.t8('Print')) %]
+    <a href="#" onclick="$('#print_options').dialog('close');">[% LxERP.t8("Cancel") %]</a>
+  </form>
+</div>
+
+<div id="shipto_dialog" class="hidden"></div>
+
+<form method="post" action="controller.pl" id="reclamation_form">
+  [% L.hidden_tag('callback',             FORM.callback) %]
+  [% L.hidden_tag('type',                 FORM.type) %]
+  [% L.hidden_tag('id',                   SELF.reclamation.id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.reclamation.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.reclamation.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.reclamation.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
+
+  [%- INCLUDE 'common/flash.html' %]
+
+  <div class="tabwidget" id="reclamation_tabs">
+    <ul>
+      <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
+[%- IF INSTANCE_CONF.get_webdav %]
+      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.reclamation.id AND INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.reclamation.id) %]">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.reclamation.id) %]">[% 'Attachments' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.reclamation.id %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Reclamation&object_id=[% SELF.reclamation.id %]">[% 'Linked Records' | $T8 %]</a></li>
+[%- END %]
+    </ul>
+
+    [% PROCESS "reclamation/tabs/basic_data.html" %]
+    [% PROCESS 'webdav/_list.html' %]
+    <div id="ui-tabs-1">
+      [%- LxERP.t8("Loading...") %]
+    </div>
+
+    <div id="shipto_inputs" class="hidden">
+      [%- PROCESS 'common/_ship_to_dialog.html'
+        cv_obj=SELF.reclamation.customervendor
+        cs_obj=SELF.reclamation.custom_shipto
+        cvars=SELF.reclamation.custom_shipto.cvars_by_config
+        id_selector='#reclamation_shipto_id' %]
+    </div>
+
+  </div>
+
+</form>
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data.html b/templates/design40_webpages/reclamation/tabs/basic_data.html
new file mode 100644
index 000000000..0594308f1
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data.html
@@ -0,0 +1,446 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+[%- INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="ui-tabs-basic-data">
+
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id%]
+  <div class="wrapper" id="email_attachment_wrapper">
+    [%
+      BLOCK panel_1;
+        P.email_journal.attachment_preview(
+             FORM.email_attachment_id || FORM.workflow_email_attachment_id,
+             style="height:600px"
+             );
+      END;
+      INCLUDE 'common/toggle_panel.html'
+        block_name='panel_1'
+        button_closed  = LxERP.t8('Show Attachment')
+        button_open    = LxERP.t8('Hide Attachment')
+        ;
+    %]
+  </div>
+[% END %]
+
+<div class="wrapper" id="wrapper-1">
+[% INCLUDE 'generic/toggle_wrapper.html' %]
+
+<div class="col">
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Customer & Order Information' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
+        [% SET cv_id = SELF.cv _ '_id' %]
+        <td class="wi-lightwide">
+          [% P.customer_vendor.picker("reclamation.${SELF.cv}" _ '_id', SELF.reclamation.$cv_id, type=SELF.cv, show_details="1") %]
+        </td>
+      </tr>
+
+      <tr id='contact_row' [%- IF !SELF.reclamation.${SELF.cv}.contacts.size %]style='display:none'[%- END %]>
+        <th>[% 'Contact Person' | $T8 %]</th>
+        <td>[% L.select_tag('reclamation.contact_id',
+                            SELF.reclamation.${SELF.cv}.contacts,
+                            default=SELF.reclamation.contact_id,
+                            title_key='full_name_dep',
+                            value_key='cp_id',
+                            with_empty=1,
+                            class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Shipping Address' | $T8 %]</th>
+        <td>
+          <span id='shipto_selection' [%- IF !SELF.reclamation.${SELF.cv}.shipto.size %] style='display:none'[%- END %] >
+            [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+               FOREACH s = SELF.reclamation.${SELF.cv}.shipto ;
+                 shiptos.push(s) ;
+               END ;
+               L.select_tag('reclamation.shipto_id',
+                             shiptos,
+                             default=SELF.reclamation.shipto_id,
+                             title_key='displayable_id',
+                             value_key='shipto_id',
+                             with_empty=0,
+                             class='wi-lightwide') %]
+          </span>
+          [% L.button_tag("kivi.Reclamation.edit_custom_shipto()",
+                          LxERP.t8("Custom shipto"),
+                          class='button neutral below wi-lightwide') %]
+        </td>
+      </tr>
+
+      [%- IF SELF.cv == "customer" %]
+      <tr id="billing_address_row"[% IF !SELF.reclamation.customer.additional_billing_addresses.as_list.size %] style="display:none"[% END %]>
+        <th>[% 'Custom Billing Address' | $T8 %]</th>
+        <td>
+          [% L.select_tag('reclamation.billing_address_id',
+                           SELF.reclamation.customer.additional_billing_addresses,
+                           default=SELF.reclamation.billing_address_id,
+                           title_key='displayable_id',
+                           value_key='id',
+                           with_empty=1,
+                           class='wi-lightwide') %]
+        </td>
+      </tr>
+      [%- END %]
+
+      [%- PROCESS reclamation/tabs/basic_data/_business_info_row.html SELF=SELF %]
+
+      <tr>
+        <th>[% 'Tax rate' | $T8 %]</th>
+        <td>[% L.select_tag('reclamation.taxzone_id', SELF.all_taxzones, default=SELF.reclamation.taxzone_id, title_key='description', class='recalc wi-lightwide') %]</td>
+      </tr>
+
+      [% SET currency_id = SELF.reclamation.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new reclamation %]
+      [% SET show_exchangerate = (SELF.reclamation.currency_id != INSTANCE_CONF.get_currency_id) %]
+      <tr id="currency_settings">
+        <th>[% 'Currency' | $T8 %]</th>
+        <td>[% L.select_tag('reclamation.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
+      </tr>
+      <tr id="exchangerate_settings" [%- IF !show_exchangerate %]style='display:none'[%- END %]>
+        <th>[% 'Exchangerate' | $T8 %]</th>
+        <td> 1 <span id="currency_name">[% SELF.reclamation.currency.name %]</span> =
+          [% L.input_tag('reclamation.exchangerate_as_null_number', SELF.reclamation.exchangerate_as_null_number, 'data-validate'=show_exchangerate ? 'required' : '', size="15", class="reformat_number_as_null_number numeric") %]
+          [% INSTANCE_CONF.default_currency %]
+          [% L.hidden_tag('old_currency_id', currency_id) %]
+          [% L.hidden_tag('old_exchangerate', SELF.reclamation.exchangerate_as_null_number) %]
+        </td>
+      </tr>
+
+[%- IF SELF.all_languages.size %]
+      <tr>
+        <th>[% 'Language' | $T8 %]</th>
+        <td>
+          [% L.select_tag('reclamation.language_id', SELF.all_languages, default=SELF.reclamation.language_id, title_key='description', with_empty=1, style='wi-lightwide') %]
+        </td>
+      </tr>
+[%- END %]
+
+[%- IF SELF.all_departments.size %]
+      <tr>
+        <th>[% 'Department' | $T8 %]</th>
+        <td>
+          [% L.select_tag('reclamation.department_id', SELF.all_departments, default=SELF.reclamation.department_id, title_key='description', with_empty=1, class='wi-lightwide') %]
+        </td>
+      </tr>
+[%- END %]
+
+      <tr>
+        <th>[% 'Shipping Point' | $T8 %]</th>
+        <td>[% L.input_tag('reclamation.shippingpoint', SELF.reclamation.shippingpoint, class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Ship via' | $T8 %]</th>
+        <td>[% L.input_tag('reclamation.shipvia', SELF.reclamation.shipvia, class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Transaction description' | $T8 %]</th>
+        <td>[% L.input_tag('reclamation.transaction_description', SELF.reclamation.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', class='wi-lightwide') %]</td>
+      </tr>
+
+      <tr>
+        <th>[% 'Project Number' | $T8 %]</th>
+        <td>[% P.project.picker('reclamation.globalproject_id', SELF.reclamation.globalproject_id, class='wi-lightwide') %]</td>
+      </tr>
+
+    </tbody>
+  </table>
+
+  <table class="tbl-horizontal col">
+    <caption>[% 'Terms' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-lightwide"></colgroup>
+    <tbody>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Payment Terms' | $T8 %]</span>
+          [% L.select_tag('reclamation.payment_id',
+                            SELF.all_payment_terms,
+                            default = SELF.reclamation.payment_id,
+                            with_empty = 1,
+                            title_key = 'description',
+                            class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <span class="label above">[% 'Delivery Terms' | $T8 %]</span>
+          [% L.select_tag('reclamation.delivery_term_id',
+                            SELF.all_delivery_terms,
+                            default = SELF.reclamation.delivery_term_id,
+                            with_empty = 1,
+                            title_key = 'description',
+                            class = 'wi-mediumsmall-lightwide') %]
+        </td>
+      </tr>
+
+      <tr id="taxincluded_row_id" [%- IF !SELF.taxes.size %]class="hidden"[% END %]>
+        <th><label for="reclamation.taxincluded">[% 'Tax Included' | $T8 %]</label></th>
+        <td>[% L.yes_no_tag('reclamation.taxincluded', SELF.reclamation.taxincluded, class='recalc') %]</td>
+      </tr>
+
+    </tbody>
+  </table>
+
+</div><!-- /.col -->
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Notes' | $T8 %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <td class="wi-wide">
+        [% L.textarea_tag('reclamation.notes', SELF.reclamation.notes, style="width: 350px; height: 150px", class="texteditor wi-wide") %]
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <span class="label above">[% 'Internal Notes' | $T8 %]</span>
+        [% L.textarea_tag('reclamation.intnotes', SELF.reclamation.intnotes, class="wi-wide") %]
+      </td>
+    </tr>
+
+  </tbody>
+</table>
+
+<table class="tbl-horizontal col">
+  <caption>[% 'Handling, Numbers & Dates' | $T8 %]</caption>
+  <colgroup> <col class="wi-mediumsmall"><col class="wi-normal"> </colgroup>
+  <tbody>
+
+    [%- IF SELF.reclamation.id %]
+    <tr>
+      <th>
+        <label for="reclamation.delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label>
+      </th>
+      <td>
+          [% L.yes_no_tag('reclamation.delivered', SELF.reclamation.delivered, class="wi-normal") %]
+      </td>
+    </tr>
+    <tr>
+      <th>
+        <label for="reclamation.closed">[% 'Closed' | $T8 %]</label>
+      </th>
+      <td>
+        [% L.yes_no_tag('reclamation.closed', SELF.reclamation.closed, class="wi-normal") %]
+      </td>
+    </tr>
+    [%- END %]
+
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag('reclamation.employee_id',
+        SELF.all_employees,
+        default=(SELF.reclamation.employee_id ? SELF.reclamation.employee_id : SELF.current_employee_id),
+        title_key='safe_name',
+        class='wi-normal',
+        ) %]</td>
+    </tr>
+
+    [% IF SELF.cv == 'customer' %]
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag('reclamation.salesman_id',
+        SELF.all_salesmen,
+        default=(SELF.reclamation.salesman_id ? SELF.reclamation.salesman_id : SELF.current_employee_id),
+        title_key='safe_name',
+        class='wi-normal',
+        ) %]</td>
+    </tr>
+    [% END %]
+
+    <tr>
+      <th>[% 'Reclamation Number' | $T8 %]</th>
+      <td>[% L.input_tag('reclamation.record_number', SELF.reclamation.record_number, onchange='kivi.Reclamation.set_number_in_title(this)', class='wi-normal') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Customer Record Number' | $T8 %]</th>
+      <td>[% L.input_tag('reclamation.cv_record_number', SELF.reclamation.cv_record_number, class='wi-normal') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Reclamation Date' | $T8 %]</th>
+      <td>[% L.date_tag('reclamation.transdate_as_date', SELF.reclamation.transdate_as_date, class='wi-date') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Tax point' | $T8 %]</th>
+      <td>[% L.date_tag('reclamation.tax_point_as_date', SELF.reclamation.tax_point_as_date, class='recalc wi-date') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Deadline' | $T8 %]</th>
+      <td>[% L.date_tag('reclamation.reqdate_as_date', SELF.reclamation.reqdate_as_date, class='recalc wi-date') %]</td>
+    </tr>
+
+    <tr>
+      <th>[% 'Insert Date' | $T8 %]</th>
+      <td><span class="data wi-normal">[% SELF.reclamation.itime_as_date %]</span></td>
+    </tr>
+
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+
+  [%- PROCESS reclamation/tabs/basic_data/_item_input.html SELF=SELF %]
+
+[%- IF SELF.positions_scrollbar_height -%]
+  [%- SET scroll_style = 'style="overflow-y: auto; height:' _ SELF.positions_scrollbar_height _ 'vh;"' -%]
+[%- ELSE -%]
+  [%- SET scroll_style = '' -%]
+[%- END -%]
+<div id="row_table_scroll_id" class="wrapper horizontal-scroll-wrapper" [%- scroll_style -%]>
+
+  <table id="row_table_id" class="tbl-list">
+    <caption>[% 'Articles' | $T8 %]</caption>
+    <thead>
+      <tr>
+        <th class="center">
+          [%- IF MYCONFIG.show_form_details %]
+            [%- L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', class='row-icon', "data-expanded"="1") %]
+          [%- ELSE %]
+            [%- L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all', class='row-icon') %]
+          [%- END %]
+        </th>
+          <th>
+            [% L.checkbox_tag("select_all_multi_id", checked=0, alt=LxERP.t8('Select/Deselect all'), title=LxERP.t8('Select/Deselect all'), id='select_all') %]
+          </th>
+        <th>[% 'position' | $T8 %] </th>
+        <th style='text-align:center'><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+        <th style='text-align:center'><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+        [%- IF SELF.show_update_button -%]
+        <th style='text-align:center'>
+          [%- L.img_tag(src="image/rotate_cw.svg",
+                        alt=LxERP.t8('Update from master data'),
+                        title= LxERP.t8('Update from master data'),
+                        onclick="if (!confirm('" _ LxERP.t8("Are you sure to update all positions from master data?") _ "')) return false; kivi.Reclamation.update_all_rows_from_master_data();",
+                        id='update_from_master',
+                        class='row-icon') %]
+        </th>
+        [%- END %]
+        <th id="partnumber_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
+        [%- IF SELF.search_cvpartnumber -%]
+        <th id="cvpartnumber_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("cvpartnumber")' > [%- SELF.cv == "customer" ? LxERP.t8('Customer Part Number') : LxERP.t8('Model') %]</a></th>
+        [%- END -%]
+        <th id="partclass_header_id">[%- 'Type'  | $T8 %]</th>
+        <th id="description_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
+        <th id="reason_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason")'>[%- 'Reason' | $T8 %]</a></th>
+        <th id="reason_description_ext_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason_description_ext")'>[%- 'Reason Description Extern' | $T8 %]</a></th>
+        <th id="reason_description_int_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason_description_int")'>[%- 'Reason Description Intern' | $T8 %]</a></th>
+        <th id="qty_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("qty")'>        [%- 'Qty' | $T8 %]</a></th>
+        <th class="listheading">[%- 'Price Factor' | $T8 %] </th>
+        <th class="listheading">[%- 'Unit'         | $T8 %] </th>
+        <th class="listheading">[%- 'Price Source' | $T8 %] </th>
+        <th id="sellprice_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("sellprice")'> [%- 'Price' | $T8 %]</a></th>
+        <th id="discount_header_id"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("discount")'>  [%- 'Discount'    | $T8 %]</a></th>
+        <th>[%- 'Extended' | $T8 %] </th>
+      </tr>
+      <tr>
+        <th></th>
+        <th class="center">
+          [%- L.button_tag('kivi.Reclamation.toggle_selected_rows();', "🔄",
+                           title=LxERP.t8("Toggle selection"),
+                           alt=LxERP.t8("Toggle selection"),
+                           ) %]
+        </th>
+        <th colspan="2"></th>
+        <th class="center">
+          [%- L.button_tag('kivi.Reclamation.delete_selected_rows();', LxERP.t8("X"),
+                           title=LxERP.t8("Delete selected rows"),
+                           alt=LxERP.t8("Delete selected rows"),
+                           ) %]
+        </th>
+        [%- IF SELF.show_update_button -%]
+        <th></th>
+        [%- END -%]
+        <th colspan="3"></th>
+        <th>
+          [% L.select_tag("reason_id_for_selected",
+                          SELF.reclamation.valid_reclamation_reasons,
+                          title_key = 'name',
+                          value_key = 'id',
+                          with_empty=1,
+                          class="wi-small",
+                          ) %]
+          [%- L.button_tag(
+                'kivi.Reclamation.set_selected_to_value("reason_id")',
+                "↓",
+                alt=LxERP.t8('Apply to selected rows'),
+                title=LxERP.t8('Apply to selected rows'),
+          ) %]
+        </th>
+        <th>
+          [% L.areainput_tag("reason_description_ext_for_selected",
+                             "",
+                             size='40',
+                             class="wi-mediumsmall",
+                             ) %]
+          [%- L.button_tag(
+                'kivi.Reclamation.set_selected_to_value("reason_description_ext")',
+                "↓",
+                alt=LxERP.t8('Apply to selected rows'),
+                title=LxERP.t8('Apply to selected rows'),
+          ) %]
+        </th>
+        <th>
+          [% L.areainput_tag("reason_description_int_for_selected",
+                             "",
+                             size='40',
+                             class="wi-mediumsmall",
+                             ) %]
+          [%- L.button_tag(
+                'kivi.Reclamation.set_selected_to_value("reason_description_int")',
+                "↓",
+                alt=LxERP.t8('Apply to selected rows'),
+                title=LxERP.t8('Apply to selected rows'),
+          ) %]
+        </th>
+        <th colspan="[% (SELF.search_cvpartnumber ? 8 : 7) %]"></th>
+      </tr>
+    </thead>
+
+    [%- FOREACH item = SELF.reclamation.items_sorted %]
+      [%- PROCESS reclamation/tabs/basic_data/_row.html ITEM=item ID=(item.id||item.new_fake_id) -%]
+    [%- END %]
+
+    <tfoot>
+      <tr id="subtotal_row_id">
+        <td colspan="[% (SELF.search_cvpartnumber ? 15 : 14) %]"></td>
+        [%- IF SELF.show_update_button -%]
+        <td></td>
+        [%- END -%]
+        <th colspan="3">[% IF !SELF.reclamation.taxincluded %][%- 'Subtotal' | $T8 %][% END %]</th>
+        <td class="numeric">[% IF !SELF.reclamation.taxincluded %][%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %][% END %]</td>
+      </tr>
+      [%- FOREACH tax = SELF.reclamation.taxes %]
+        [%- PROCESS reclamation/tabs/basic_data/_tax_row.html TAX=tax TAXINCLUDED=SELF.reclamation.taxincluded %]
+      [%- END %]
+      <tr id="amount_row_id">
+        <td colspan="[% (SELF.search_cvpartnumber ? 15 : 14) %]"></td>
+        [%- IF SELF.show_update_button -%]
+        <td></td>
+        [%- END -%]
+        <th colspan="3">[%- 'Total' | $T8 %]</th>
+        <td class="numeric">
+          [%- L.div_tag(SELF.reclamation.amount_as_number, id='amount_id') %]
+        </td>
+      </tr>
+    </tfoot>
+
+  </table>
+</div><!-- /#row_table_scroll_id /.wrapper -->
+
+</div><!-- /#ui-tabs-basic-data -->
+
+[% L.sortable_element('#row_table_id') %]
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_business_info_row.html b/templates/design40_webpages/reclamation/tabs/basic_data/_business_info_row.html
new file mode 100644
index 000000000..c2e1c2a37
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_business_info_row.html
@@ -0,0 +1,12 @@
+[%- USE T8 %][%- USE HTML %]
+
+<tr id='business_info_row' [%- IF !SELF.reclamation.customervendor.business_id %]style='display:none'[%- END %]>
+  <th>
+    [%- IF SELF.cv == 'customer' -%]
+      [%- 'Customer type' | $T8 -%]
+    [%- ELSE -%]
+      [%- 'Vendor type' | $T8 -%]
+    [%- END -%]
+  </th>
+  <td><span class="plain-data wi-lightwide">[% HTML.escape(SELF.reclamation.customervendor.business.description) %] ([% 'Trade Discount' | $T8 %] [% SELF.reclamation.customervendor.business.discount_as_percent %]%)</span></td>
+</tr>
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_item_input.html b/templates/design40_webpages/reclamation/tabs/basic_data/_item_input.html
new file mode 100644
index 000000000..214338b92
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_item_input.html
@@ -0,0 +1,73 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %][%- USE P %]
+
+<div class="wrapper panel-wrapper">
+  <div class="input-panel control-panel">
+    <table id="input_row_table_id" class="tbl-plain condensed">
+      <caption>[% 'Add Parts here!' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <td>
+            <span class="label above">[% 'position' | $T8 %] </span>
+            [% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]
+          </td>
+          <td>
+            <span class="label above">[% 'Part' | $T8 %] </span>
+            [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+            [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+            [% P.part.picker('add_item.parts_id', SELF.created_part, class="add_item_input wi-normal",
+                              fat_set_item=1,
+                              multiple_pos_input=1,
+                              action={set_multi_items='kivi.Reclamation.add_multi_items'},
+                              classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                              $PARAM_KEY=PARAM_VAL) %]</td>
+          <td>
+            <span class="label above">[% 'Description' | $T8 %] </span>
+            [% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input wi-normal") %]
+          </td>
+          <td>
+            <span class="label above">[% 'Qty' | $T8 %]</span>
+            [% L.input_tag('add_item.qty_as_number', '', placeholder="1", class="add_item_input numeric wi-verysmall") %]
+            [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+          </td>
+          [%- SET price = '' %]
+          [%- IF SELF.created_part %]
+            [%- SET price = LxERP.format_amount(((SELF.type == 'sales_reclamation') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
+          [%- END %]
+          <td>
+            <span class="label above">[% 'Price' | $T8 %]</span>
+            [% L.input_tag('add_item.sellprice_as_number', price, class="add_item_input numeric wi-verysmall") %]
+          </td>
+          <td>
+            <span class="label above">[% 'Discount' | $T8 %]</span>
+            [% L.input_tag('add_item.discount_as_percent', '', class="add_item_input numeric wi-smallest") %]
+          </td>
+          <td style="vertical-align:bottom;">
+            [% L.button_tag('kivi.Reclamation.add_item()', LxERP.t8('Add part')) %]
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <div style="clear:both">[% L.button_tag('kivi.Reclamation.open_multi_items_dialog()', LxERP.t8('Add multiple items'), class="neutral") %]</div>
+  </div><!-- /.entry-panel -->
+
+  <div class="input-panel control-panel short">
+    <table id="create_part_table_id" class="tbl-plain condensed">
+      <caption>[% 'Create a new part' | $T8 %]!</caption>
+      <tbody>
+        <tr>
+          <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
+            <span class="label above">[% 'Part Type' | $T8 %] </span>
+            [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ] ] %]
+            [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
+            [% L.select_tag('add_item.create_part_type', type_options) %]
+            [% L.button_tag('kivi.Reclamation.create_part()', LxERP.t8('+')) %]
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div><!-- /.entry-panel -->
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_price_sources_dialog.html b/templates/design40_webpages/reclamation/tabs/basic_data/_price_sources_dialog.html
new file mode 100644
index 000000000..cee696f5a
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_price_sources_dialog.html
@@ -0,0 +1,122 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%-  #L.dump( price_source ) %]
+
+[% SET best_price = price_source.best_price %]
+[% SET best_discount = price_source.best_discount %]
+
+[% SET price_editable = 0 %]
+[% IF (FORM.type == "sales_reclamation") %]
+  [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
+[% END %]
+[% IF (FORM.type == "purchase_reclamation") %]
+  [% SET price_editable = AUTH.assert('purchase_edit_prices', 1) %]
+[% END %]
+
+[% SET exfactor = price_source.record.exchangerate ? 1 / price_source.record.exchangerate : 1 %]
+[% SET exnoshow = price_source.record.currency_id==INSTANCE_CONF.get_currency_id %]
+[% SET places   = exnoshow ? -2 : 5 %]
+<h2>[% 'Prices' | $T8 %]</h2>
+
+<table class="tbl-list">
+  <thead>
+   <tr>
+    <th></th>
+    <th>[% 'Price Source' | $T8 %]</th>
+    <th>[% 'Price' | $T8 %]</th>
+    <th [%- IF exnoshow -%]style='display:none'[%- END %]>
+      [% 'Price' | $T8 -%]/[%- price_source.record.currency.name %]
+    </th>
+    <th>[% 'Best Price' | $T8 %]</th>
+    <th>[% 'Details' | $T8 %]</th>
+   </tr>
+   <tr>
+[%- IF price_source.record_item.active_price_source %]
+    <td>
+      <!-- TODO(Tamino): Was soll gemacht werden? -->
+      <a class="button neutral" onclick="kivi.Reclamation.update_price_source('[% FORM.item_id %]', '', '[% LxERP.t8('None (PriceSource)') %]' , '', [% price_editable %])">[% LxERP.t8('Select') %] </a>
+      [% # L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select'), class="button neutral") %]
+    </td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[%- END %]
+    <td>[% 'None (PriceSource)' | $T8 %]</td>
+    <td>-</td>
+    <td [%- IF exnoshow -%]style='display:none'[%- END %]>-</td>
+    <td></td>
+    <td></td>
+   </tr>
+  </thead>
+  <tbody>
+   [%- FOREACH price IN price_source.available_prices %]
+    <tr>
+[%- IF price_source.record_item.active_price_source != price.source %]
+     <td>[% L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Select'), class="button neutral") %]</td>
+[%- ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
+     <td>[% L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Update Price'), class="button neutral") %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[% END %]
+     <td>[% price.source_description | html %]</td>
+     <td>[% price.price_as_number %]</td>
+     <td [%- IF exnoshow -%]style='display:none'[%- END %]>
+       [% LxERP.format_amount(price.price * exfactor, places) %]
+     </td>
+[% IF price.source == best_price.source %]
+     <td align='center'>&#x2022;</td>
+[% ELSE %]
+     <td></td>
+[% END %]
+     <td>[% price.description | html %]</td>
+    </tr>
+   [%- END %]
+  </tbody>
+</table>
+
+<h2>[% 'Discounts' | $T8 %]</h2>
+
+<table class="tbl-list">
+  <thead>
+   <tr>
+    <th></th>
+    <th>[% 'Price Source' | $T8 %]</th>
+    <th>[% 'Discount' | $T8 %]</th>
+    <th>[% 'Best Discount' | $T8 %]</th>
+    <th>[% 'Details' | $T8 %]</th>
+   </tr>
+  </thead>
+  <tbody>
+   <tr>
+[%- IF price_source.record_item.active_discount_source %]
+    <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource Discount)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[%- END %]
+    <td>[% 'None (PriceSource Discount)' | $T8 %]</td>
+    <td>-</td>
+    <td></td>
+    <td></td>
+   </tr>
+   [%- FOREACH price IN price_source.available_discounts %]
+    <tr>
+[%- IF price_source.record_item.active_discount_source != price.source %]
+     <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSIF price_source.record_item.discount * 1 != price.discount * 1 %]
+     <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent  _ '\', ' _ price_editable _ ')', LxERP.t8('Update Discount')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[% END %]
+     <td>[% price.source_description | html %]</td>
+     <td>[% price.discount_as_percent %] %</td>
+[% IF price.source == best_discount.source %]
+     <td>&#x2022;</td>
+[% ELSE %]
+     <td></td>
+[% END %]
+     <td>[% price.description | html %]</td>
+    </tr>
+   [%- END %]
+  </tbody>
+</table>
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_row.html b/templates/design40_webpages/reclamation/tabs/basic_data/_row.html
new file mode 100644
index 000000000..39a30b806
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_row.html
@@ -0,0 +1,194 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+[% # L.dump( ITEM ) %]
+
+<tbody class="row_entry listrow" data-position="[%- HTML.escape(ITEM.position) -%]"[%- IF MYCONFIG.show_form_details -%] data-expanded="1"[%- END -%]>
+  <tr>
+  [% L.hidden_tag("reclamation_item_ids[+]", ID) %]
+  [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+  [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
+  [% L.hidden_tag("reclamation.reclamation_items[+].id", ITEM.id, id='item_' _ ID) %]
+  [% L.hidden_tag("reclamation.reclamation_items[].parts_id", ITEM.parts_id) %]
+    <td>
+      [%- IF MYCONFIG.show_form_details %]
+        [% L.img_tag(src="image/collapse.svg",
+                     alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand row-icon") %]
+      [%- ELSE %]
+        [% L.img_tag(src="image/expand.svg",
+                     alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand row-icon") %]
+      [%- END %]
+    </td>
+    <td>
+      [% L.checkbox_tag('multi_id_' _ ITEM.position, value=ITEM.id, checked=0) %]
+    </td>
+    <td>
+      <div name="position" class="center">
+        [% HTML.escape(ITEM.position) %]
+      </div>
+    </td>
+    <td align="center">
+      <img src="image/updown.png" alt="[%- LxERP.t8('reclamation item') %]" class="dragdrop">
+    </td>
+    <td>
+      [%- L.button_tag("kivi.Reclamation.delete_reclamation_item_row(this)",
+                       LxERP.t8("X"),
+                       confirm=LxERP.t8("Are you sure?")) %]
+    </td>
+    [%- IF SELF.show_update_button -%]
+    <td>
+      [%- L.img_tag(src="image/rotate_cw.svg",
+                    alt=LxERP.t8('Update from master data'),
+                    title= LxERP.t8('Update from master data'),
+                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.Reclamation.update_row_from_master_data(this);",
+                    id='update_from_master',
+                    class='row-icon') %]
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partnumber">
+        [%- P.link_tag(SELF.url_for(controller='Part', action='edit', 'part.id'=ITEM.part.id), ITEM.part.partnumber, target="_blank", title=LxERP.t8('Open in new window')) -%]
+      </div>
+    </td>
+    [%- IF SELF.search_cvpartnumber -%]
+    <td>
+      <div name="cvpartnumber">[% HTML.escape(ITEM.cvpartnumber) %]</div>
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partclassification">[% ITEM.part.presenter.typeclass_abbreviation %]</div>
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].description",
+                     ITEM.description,
+                     size='40',
+                     class='wi-lightwide') %]
+      [%- L.hidden_tag("reclamation.reclamation_items[].longdescription", ITEM.longdescription) %]
+      [%- L.button_tag("kivi.Reclamation.show_longdescription_dialog(this)", LxERP.t8("L"), class="wi-tiny neutral") %]
+    </td>
+    <td>[% L.select_tag("reclamation.reclamation_items[].reason_id",
+                        SELF.reclamation.valid_reclamation_reasons,
+                        default=ITEM.reason_id,
+                        title_key = 'name',
+                        value_key = 'id',
+                        with_empty=1,
+                        class="wi-small",
+                        ) %]
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].reason_description_ext",
+                         ITEM.reason_description_ext,
+                         size='40',
+                         class="wi-mediumsmall",
+                         ) %]
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].reason_description_int",
+                         ITEM.reason_description_int,
+                         size='40',
+                         class="wi-mediumsmall",
+                         ) %]
+    </td>
+    <td>
+      [%- L.input_tag("reclamation.reclamation_items[].qty_as_number",
+                      ITEM.qty_as_number,
+                      size = 5,
+                      class="recalc reformat_number numeric wi-verysmall") %]
+      [%- IF ITEM.part.formel -%]
+        [%- L.button_tag("kivi.Reclamation.show_calculate_qty_dialog(this)", LxERP.t8("*/"), class="neutral") %]
+        [%- L.hidden_tag("formula[+]", ITEM.part.formel) -%]
+      [%- END -%]
+    </td>
+    <td>
+      [%- L.select_tag("reclamation.reclamation_items[].price_factor_id",
+                       SELF.all_price_factors,
+                       default = ITEM.price_factor_id,
+                       title_key = 'description',
+                       with_empty = 1,
+                       class="recalc wi-mediumsmall") %]
+    </td>
+    <td>
+      [%- L.select_tag("reclamation.reclamation_items[].unit",
+                      ITEM.part.available_units,
+                      default = ITEM.unit,
+                      title_key = 'name',
+                      value_key = 'name',
+                      class = 'unitselect wi-mediumsmall') %]
+    </td>
+    <td>
+      [%- SET EDIT_PRICE_SOURCE = !(ITEM.is_linked_to_record) %]
+      <div name="editable_price_source" [%- IF !EDIT_PRICE_SOURCE %]style="display:none"[%- END %]>
+        [%- L.button_tag("kivi.Reclamation.price_chooser_item_row(this)",
+                         ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
+                         name = "price_chooser_button",
+                         class = "neutral",
+                         ) %]
+      </div>
+      <div name="not_editable_price_source" [%- IF EDIT_PRICE_SOURCE %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.active_price_source.description _ ' | ' _ ITEM.active_discount_source.source_description, style="white-space:nowrap;") %]
+      </div>
+    </td>
+    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
+    [% IF (SELF.type == "sales_reclamation") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
+    [% END %]
+    [% IF (SELF.type == "purchase_reclamation") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
+    [% END %]
+    <td>
+      [%- L.hidden_tag("reclamation.reclamation_items[].active_price_source", ITEM.active_price_source.source) %]
+      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES && ITEM.active_price_source.source == '' && !ITEM.is_linked_to_record) %]
+      <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
+        [%- L.input_tag("reclamation.reclamation_items[].sellprice_as_number",
+                        ITEM.sellprice_as_number,
+                        size = 10,
+                        disabled=(EDIT_PRICE? '' : 1),
+                        class="recalc reformat_number numeric wi-verysmall") %]
+      </div>
+      <div name="not_editable_price" [%- IF EDIT_PRICE %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric plain-data") %]
+        [%- L.hidden_tag("reclamation.reclamation_items[].sellprice_as_number",
+                         ITEM.sellprice_as_number,
+                         disabled=(EDIT_PRICE? 1 : '')) %]
+      </div>
+    </td>
+    <td>
+      [%- L.hidden_tag("reclamation.reclamation_items[].active_discount_source", ITEM.active_discount_source.source) %]
+      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES && ITEM.active_discount_source.source == '' && !ITEM.is_linked_to_record) %]
+      <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
+        [%- L.input_tag("reclamation.reclamation_items[].discount_as_percent",
+                        ITEM.discount_as_percent,
+                        size = 5,
+                        disabled=(EDIT_DISCOUNT? '' : 1),
+                        class="recalc reformat_number numeric") %]
+      </div>
+      <div name="not_editable_discount" [%- IF EDIT_DISCOUNT %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %]
+        [%- L.hidden_tag("reclamation.reclamation_items[].discount_as_percent",
+                         ITEM.discount_as_percent,
+                         disabled=(EDIT_DISCOUNT? 1 : '')) %]
+      </div>
+    </td>
+    <td>
+      [%- L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal", class="numeric") %]
+    </td>
+
+  </tr>
+
+  <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>
+    <td colspan="100%">
+      [%- IF MYCONFIG.show_form_details || ITEM.render_second_row %]
+        <div name="second_row" data-loaded="1">
+          [%- PROCESS reclamation/tabs/basic_data/_second_row.html ITEM=ITEM TYPE=SELF.type %]
+        </div>
+      [%- ELSE %]
+        <div name="second_row" id="second_row_[% ID %]">
+          [%- LxERP.t8("Loading...") %]
+        </div>
+      [%- END %]
+    </td>
+  </tr>
+
+</tbody>
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_second_row.html b/templates/design40_webpages/reclamation/tabs/basic_data/_second_row.html
new file mode 100644
index 000000000..46d0a8fcc
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_second_row.html
@@ -0,0 +1,51 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+<table>
+  <tr>
+    <td>
+      <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+      [%- L.input_tag("reclamation.reclamation_items[].serialnumber", ITEM.serialnumber, size = 15 "data-validate"="trimmed_whitespaces") %]&nbsp;
+    <b>[%- 'Project' | $T8 %]</b>&nbsp;
+    [% P.project.picker("reclamation.reclamation_items[].project_id", ITEM.project_id, size = 15) %]&nbsp;
+      <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
+      [% L.date_tag("reclamation.reclamation_items[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
+    [%- IF (TYPE == "sales_reclamation") %]
+      <b>[%- 'LP' | $T8 %]</b>&nbsp;
+      [%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]&nbsp;
+      <b>[%- 'EK' | $T8 %]</b>&nbsp;
+        [%- L.input_tag("reclamation.reclamation_items[].lastcost_as_number",
+                        ITEM.lastcost_as_number,
+                        size = 5,
+                        class="recalc reformat_number numeric") %]&nbsp;
+    [%- END %]
+    <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
+      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
+        [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
+      </span>&nbsp;
+    </td>
+  </tr>
+
+  <tr>
+    [%- SET n = 0 %]
+    [%- FOREACH var = ITEM.cvars_by_config %]
+      [%- NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
+      [%- SET n = n + 1 %]
+    <th>
+      [% var.config.description %]
+    </th>
+    <td>
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[+].config_id', var.config.id) %]
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[].id', var.id) %]
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[].sub_module', var.sub_module) %]
+      [% INCLUDE 'common/render_cvar_input.html' var_name='reclamation.reclamation_items[].custom_variables[].unparsed_value' %]
+    </td>
+      [%- IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
+        </tr><tr>
+      [%- END %]
+    [%- END %]
+  </tr>
+</table>
diff --git a/templates/design40_webpages/reclamation/tabs/basic_data/_tax_row.html b/templates/design40_webpages/reclamation/tabs/basic_data/_tax_row.html
new file mode 100644
index 000000000..5be39b7b5
--- /dev/null
+++ b/templates/design40_webpages/reclamation/tabs/basic_data/_tax_row.html
@@ -0,0 +1,24 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+[% SET n_col = (SELF.search_cvpartnumber ? 15 : 14) %]
+<tr class="tax_row">
+  <td colspan="[% n_col %]"></td>
+  [%- IF SELF.show_update_button -%]
+  <td></td>
+  [%- END -%]
+  <th colspan="3">[%- IF TAXINCLUDED %][%- 'Including' | $T8 %]&nbsp;[%- END %][%- TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
+  <td class="numeric">[%- LxERP.format_amount(TAX.amount, 2, 0) %]</td>
+</tr>
+[%- IF TAXINCLUDED %]
+<tr class="tax_row">
+  <td colspan="[% n_col %]"></td>
+  [%- IF SELF.show_update_button -%]
+  <td></td>
+  [%- END -%]
+  <th colspan="3">[%- 'Net amount' | $T8 %]</th>
+  <td class="numeric">[%- LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
+</tr>
+[%- END%]
diff --git a/templates/design40_webpages/reclamation_reason/_sort_list_row.html b/templates/design40_webpages/reclamation_reason/_sort_list_row.html
new file mode 100644
index 000000000..2e7e480c6
--- /dev/null
+++ b/templates/design40_webpages/reclamation_reason/_sort_list_row.html
@@ -0,0 +1,10 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%][% USE P %]
+[% FOREACH reason = RECLAMATION_REASONS %]
+<tr id="reclamation_reason_id_[% reason.id %]">
+  <td align="center" class="dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+  <td><a href="[% SELF.url_for(action='edit', id=reason.id) %]">[% HTML.escape(reason.name) %]</a></td>
+  <td>[% reason.description | $T8 %]</td>
+  <td>[% reason.valid_for_sales_as_bool_yn %]</td>
+  <td>[% reason.valid_for_purchase_as_bool_yn %]</td>
+</tr>
+[% END %]
diff --git a/templates/design40_webpages/reclamation_reason/form.html b/templates/design40_webpages/reclamation_reason/form.html
new file mode 100644
index 000000000..7a85b3f16
--- /dev/null
+++ b/templates/design40_webpages/reclamation_reason/form.html
@@ -0,0 +1,30 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 -%]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+<form action="controller.pl" method="post" id="form">
+[%- L.hidden_tag("id", SELF.reclamation_reason.id) %]
+
+<div class="wrapper" id="wrapper-1">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% 'Name' | $T8 %]</th>
+        <td>[%- L.input_tag("reclamation_reason.name", SELF.reclamation_reason.name, "data-validate"="required", "data-title"=LxERP.t8("Name"), class="wi-lightwide") %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Description' | $T8 %]</th>
+        <td>[%- L.textarea_tag("reclamation_reason.description", SELF.reclamation_reason.description, "data-validate"="required", "data-title"=LxERP.t8("Description"), class='wi-lightwide') %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Valid for Sales' | $T8 %]</th>
+        <td>[% L.checkbox_tag("reclamation_reason.valid_for_sales", checked=SELF.reclamation_reason.valid_for_sales, for_submit=1) %]</td>
+      </tr>
+      <tr>
+        <th>[% 'Valid for Purchase' | $T8 %]</th>
+        <td>[% L.checkbox_tag("reclamation_reason.valid_for_purchase", checked=SELF.reclamation_reason.valid_for_purchase, for_submit=1) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+</form>
diff --git a/templates/design40_webpages/reclamation_reason/list.html b/templates/design40_webpages/reclamation_reason/list.html
new file mode 100644
index 000000000..9c0eefaa2
--- /dev/null
+++ b/templates/design40_webpages/reclamation_reason/list.html
@@ -0,0 +1,28 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
+[%- INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper" id="wrapper-1">
+ <table id="partsgroup_list" class="tbl-list">
+  <thead>
+   <tr>
+    <th>[% 'Reclamation Reason' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Valid for Sales' | $T8 %]</th>
+    <th>[% 'Valid for Purchase' | $T8 %]</th>
+   </tr>
+  </thead>
+
+  <tbody>
+    [%- FOREACH reason = RECLAMATION_REASONS %]
+    <tr id="reason_id_[% reason.id %]">
+    <td><a href="[% SELF.url_for(action='edit', id=reason.id) %]">[% HTML.escape(reason.name) %]
+[% # reason.level %]</a></td>
+    <td>[% reason.description | html %]</td>
+    <td>[% reason.valid_for_sales_as_bool_yn %]</td>
+    <td>[% reason.valid_for_purchase_as_bool_yn %]</td>
+   [%- END %]
+  </tbody>
+ </table>
+</div>
diff --git a/templates/design40_webpages/reclamation_reason/sort_list.html b/templates/design40_webpages/reclamation_reason/sort_list.html
new file mode 100644
index 000000000..899474014
--- /dev/null
+++ b/templates/design40_webpages/reclamation_reason/sort_list.html
@@ -0,0 +1,27 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 -%]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+[% SET style="width: 400px" %]
+
+<form method="post" action="controller.pl" id="form">
+<div class="wrapper" id="wrapper-1">
+<table id="reclamation_reasons" class="tbl-list">
+ <thead>
+  <tr>
+    <th align="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+    <th>[% 'Reclamation Reason' | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Valid for Sales' | $T8 %]</th>
+    <th>[% 'Valid for Purchase' | $T8 %]</th>
+  </tr>
+ </thead>
+
+ <tbody id="table_body">
+  [% PROCESS 'reclamation_reason/_sort_list_row.html', RECLAMATION_REASONS = RECLAMATION_REASONS %]
+  </tbody>
+</table>
+</div>
+</form>
+
+[% L.sortable_element('#table_body', url=SELF.url_for(action='reorder'), with='reclamation_reason_id') %]
diff --git a/templates/design40_webpages/reconciliation/_linked_transactions.html b/templates/design40_webpages/reconciliation/_linked_transactions.html
new file mode 100644
index 000000000..d46fcdd40
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/_linked_transactions.html
@@ -0,0 +1,96 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+
+[% SET debug = 0 %]
+
+[% IF !SELF.LINKED_TRANSACTIONS.size %]
+  <tbody>
+    <td colspan="11"><p class="message message_hint">[% 'No data was found.' | $T8 %]</p></td>
+  </tbody>
+[% ELSE %]
+  [% FOREACH link = SELF.LINKED_TRANSACTIONS %]
+    [% IF link.type == 'Link' %]
+      <tbody>
+        [% FOREACH bt = link.BT %]
+          <tr>
+            [% IF loop.count == 1 %]
+              <td rowspan="[% link.BT.size + link.BB.size %]" class="button">
+                [% L.button_tag('delete_reconciliation(' _ link.rec_group  _ ')', LxERP.t8("X")) %]
+              </td>
+            [% END %]
+
+            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
+            <td>[% 'Bank Transaction' | $T8 %]</td>
+            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
+            <td class="date right [% HTML.escape(bt.class) %]">[% HTML.escape(bt.transdate_as_date) %]</td>
+            <td class="numeric right [% HTML.escape(bt.class) %]">[% HTML.escape(bt.amount_as_number) %]</td>
+            <td></td>
+            <td>[% HTML.escape(bt.remote_name) %]</td>
+            <td>[% HTML.escape(bt.purpose) %]</td>
+            <td>[% HTML.escape(bt.remote_account_number) %]</td>
+            <td>[% HTML.escape(bt.remote_bank_code) %]</td>
+            <td></td>
+          </tr>
+        [% END %]
+        [% FOREACH bb = link.BB %]
+          <tr>
+            <td><div class="icon16 general-ledger--reports--journal"></div></td>
+            <td>[% 'Acc Transaction' | $T8 %]</td>
+            [% IF debug %]<td>[% HTML.escape(bb.acc_trans_id) %]</td>[% END %]
+            <td class="date right [% HTML.escape(bb.class) %]">[% HTML.escape(bb.transdate_as_date) %]</td>
+            <td></td>
+            <td class="numeric right [% HTML.escape(bb.class) %]">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
+            <td>[% HTML.escape(bb.record.customer.name) %][% HTML.escape(bb.record.vendor.name) %][% HTML.escape(bb.record.description) %]</td>
+            <td>[% bb.record.link %] [% HTML.escape(bb.source) %] [% HTML.escape(bb.memo) %]</td>
+            <td></td>
+            <td></td>
+            <td>[% HTML.escape(bb.source) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    [% ELSE %]
+      <tbody class="listrow_error">
+        [% FOREACH bt = link.BT %]
+          <tr>
+            <td>
+              [%- L.checkbox_tag('bt_ids[]', value=link.id, onchange='update_reconciliation_table();')     %]
+            </td>
+
+            <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
+            <td>[% 'Bank Transaction' | $T8 %]</td>
+            [% IF debug %]<td>[% HTML.escape(bt.id) %]</td>[% END %]
+            <td class="date right">[% HTML.escape(bt.transdate_as_date) %]</td>
+            <td class="numeric right">[% HTML.escape(bt.amount_as_number) %]</td>
+            <td></td>
+            <td>[% HTML.escape(bt.remote_name) %]</td>
+            <td>[% HTML.escape(bt.purpose) %]</td>
+            <td>[% HTML.escape(bt.remote_account_number) %]</td>
+            <td>[% HTML.escape(bt.remote_bank_code) %]</td>
+            <td></td>
+          </tr>
+        [% END %]
+        [% FOREACH bb = link.BB %]
+          <tr>
+            <td>
+              [%- L.checkbox_tag('bb_ids[]', value=link.id, onchange='update_reconciliation_table();')     %]
+            </td>
+
+            <td><div class="icon16 general-ledger--reports--journal"></div></td>
+            <td>[% 'Acc Transaction' | $T8 %]</td>
+            [% IF debug %]<td>[% HTML.escape(bb.acc_trans_id) %]</td>[% END %]
+            <td class="date right">[% HTML.escape(bb.transdate_as_date) %]</td>
+            <td></td>
+            <td class="numeric right">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
+            <td>[% HTML.escape(bb.record.customer.name) %][% HTML.escape(bb.record.vendor.name) %][% HTML.escape(bb.record.description) %]</td>
+            <td>[% bb.record.link %] [% HTML.escape(bb.source) %] [% HTML.escape(bb.memo) %]</td>
+            <td></td>
+            <td></td>
+            <td>[% HTML.escape(bb.source) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    [% END %]
+  [% END %]
+[% END %]
diff --git a/templates/design40_webpages/reconciliation/assigning_table.html b/templates/design40_webpages/reconciliation/assigning_table.html
new file mode 100644
index 000000000..c71ff6d42
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/assigning_table.html
@@ -0,0 +1,46 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
+
+[% IF SELF.ELEMENTS.size %]
+<table class="tbl-horizontal test">
+  <thead>
+    <tr>
+      <th></th>
+      <th>[% 'ID' | $T8 %]</th>
+      <th>[% 'Type' | $T8 %]</th>
+      <th>[% 'Transdate' | $T8 %]</th>
+      <th>[% 'Amount BT' | $T8 %]</th>
+      <th>[% 'Amount BB' | $T8 %]</th>
+    </tr>
+  </thead>
+  <!-- PENDENT: tbody#assigned_elements war in der foreach-Schlaufe, was falsch ist. Ueberpruefen -->
+  <tbody id="assigned_elements">
+  [% FOREACH element = SELF.ELEMENTS %]
+    <tr id="element[% element.type %][% element.id %]">
+     <td><a href="#" onclick='delete_element("[% element.id %]", "[% element.type %]")'>x</a></td>
+     <td>[% HTML.escape(element.id) %]</td>
+     <td>[% IF element.type == 'BT' %][% 'Bank transaction' | $T8 %][% ELSE %][% 'Acc transaction' | $T8 %][% END %]</td>
+     <td>[% HTML.escape(element.transdate_as_date) %]</td>
+     <td class="numeric right">[% IF element.type == 'BT' %][% HTML.escape(element.amount_as_number) %][% END %]</td>
+     <td class="numeric right">[% IF element.type == 'BB' %][% LxERP.format_amount(-1 * element.amount, 2) %][% END %]</td>
+    </tr>
+  [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td class="numeric">[% bt_sum %]</td>
+      <td class="numeric">[% bb_sum %]</td>
+    </tr>
+  </tfoot>
+</table>
+  [% UNLESS errors %]
+   [% L.button_tag("submit_with_action('reconcile')", LxERP.t8("Reconcile")) %]
+  [% ELSE %]
+    [% FOREACH error IN errors %]
+      [% error %]
+    [% END %]
+  [% END %]
+[% END %]
diff --git a/templates/design40_webpages/reconciliation/form.html b/templates/design40_webpages/reconciliation/form.html
new file mode 100644
index 000000000..70208cdee
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/form.html
@@ -0,0 +1,114 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+<h1>[% title %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form id="reconciliation_form" method="post" action="controller.pl" id="filter_form">
+
+  <table class="tbl-horizontal test">
+    <tbody>
+    <tr>
+     <th>[% 'Bank account' | $T8 %]</th>
+     <td>[% L.select_tag('filter.local_bank_account_id:number',
+                          SELF.BANK_ACCOUNTS,
+                          default=FORM.filter.local_bank_account_id_number,
+                          title_key='displayable_name',
+                          with_empty=0,
+                          style='width:450px',
+                          onchange='filter_table();') %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'From' | $T8 %]</th>
+     <td>[% L.date_tag('filter.fromdate:date::ge', FORM.filter.fromdate_date__ge, onchange='filter_table();') %]</td>
+     <th>[% 'to (date)' | $T8 %]</th>
+     <td>[% L.date_tag('filter.todate:date::le', FORM.filter.todate_date__le, onchange='filter_table();') %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'Cleared/uncleared only' | $T8 %]</th>
+     <td>[% L.select_tag('filter.cleared:eq_ignore_empty', SELF.cleared, value_key = 'value', title_key = 'title', default=FORM.filter.cleared_eq_ignore_empty, onchange='filter_table();') %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'Show Stornos' | $T8 %]</th>
+     <td>[% L.checkbox_tag('filter.show_stornos', checked=FORM.filter.show_stornos, value='1', onchange='filter_table();') %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'Absolute BT Balance' | $T8 %]</th>
+     <td class="absolut_bt_balance">[% LxERP.format_amount(SELF.absolut_bt_balance, 2) %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'Absolute BB Balance' | $T8 %]</th>
+     <td class="absolut_bb_balance">[% LxERP.format_amount(-1 * SELF.absolut_bb_balance, 2) %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'BT Balance' | $T8 %]</th>
+     <td class="bt_balance">[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
+    </tr>
+
+    <tr>
+     <th>[% 'BB Balance' | $T8 %]</th>
+     <td class="bb_balance">[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
+    </tr>
+    </tbody>
+  </table>
+
+  <div id="reconc_tabs" class="tabwidget" style="height:100%">
+    <ul>
+      <li><a href="#overview" onclick='load_overview();'>[% 'Overview' | $T8 %]</a></li>
+      <li><a href="#automatic" onclick='load_proposals();'>[% 'Proposals' | $T8 %]</a></li>
+    </ul>
+
+    <div id="overview" style="height:calc(100% - 60px);overflow: auto;">
+    [%- IF ui_tab == 0 %]
+      [% PROCESS "reconciliation/tabs/overview.html" %]
+    [%- END %]</div>
+    <div id="automatic" style="height:calc(100% - 60px);overflow: auto;">
+    [%- IF ui_tab == 1 %]
+      [% PROCESS "reconciliation/tabs/automatic.html" %]
+    [%- END %]</div>
+  </div>
+
+</form>
+
+<script type="text/javascript">
+<!--
+
+function load_proposals () {
+  var url="controller.pl?action=Reconciliation/load_proposals";
+  $.ajax({
+    url: url,
+    type: "POST",
+    data: $('#reconciliation_form').serialize(),
+    success: function(new_data) {
+      $('#overview').html('');
+      $('#automatic').html(new_data['html']);
+    }
+  });
+}
+
+function load_overview () {
+  var url="controller.pl?action=Reconciliation/load_overview";
+  $.ajax({
+    url: url,
+    type: "GET",
+    data: $('#reconciliation_form').serialize(),
+    success: function(new_data) {
+      $('#overview').html(new_data['html']);
+      $('#automatic').html('');
+    }
+  });
+}
+
+$.cookie('jquery_ui_tab_reconc_tabs', [% ui_tab %] );
+
+//-->
+</script>
diff --git a/templates/design40_webpages/reconciliation/proposals.html b/templates/design40_webpages/reconciliation/proposals.html
new file mode 100644
index 000000000..9f96d2d71
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/proposals.html
@@ -0,0 +1,53 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+
+[% SET debug = 0 %]
+
+[% IF !SELF.PROPOSALS.size %]
+  <tbody class="listrow">
+    <td colspan="11"><p class="message message_hint">[% 'No data was found.' | $T8 %]</p></td>
+  </tbody>
+[% ELSE %]
+  [% FOREACH proposal = SELF.PROPOSALS %]
+      <tbody class="listrow">
+        <tr>
+          <td rowspan=[% proposal.BB.size + 1 %] style="valign:center;">
+            [% L.checkbox_tag('bt_ids[]', checked=0, value=proposal.BT.id) %]
+          </td>
+
+          <td><img width="16px" height="16px" src="image/bank-building.jpg"></td>
+          <td>[% 'Bank Transaction' | $T8 %]</td>
+           [% IF debug %] <td>[% HTML.escape(proposal.BT.id) %]</td>[% END %]
+          <td align="right">[% HTML.escape(proposal.BT.transdate_as_date) %]</td>
+          <td align="right">[% HTML.escape(proposal.BT.amount_as_number) %]</td>
+          <td></td>
+          <td>[% HTML.escape(proposal.BT.remote_name) %]</td>
+          <td>[% HTML.escape(proposal.BT.purpose) %]</td>
+          <td>[% HTML.escape(proposal.BT.remote_account_number) %]</td>
+          <td>[% HTML.escape(proposal.BT.remote_bank_code) %]</td>
+          <td></td>
+          [% L.hidden_tag('proposal_list.' _ proposal.BT.id _ '.BT', proposal.BT.id) %]
+        </tr>
+
+        [% FOREACH bb = proposal.BB %]
+          <tr>
+            <td><div class="icon16 general-ledger--reports--journal"></div></td>
+            <td>[% 'Invoice' | $T8 %]</td>
+             [% IF debug %] <td>[% HTML.escape(bb.acc_trans_id) %]</td>[% END %]
+            <td align="right">[% HTML.escape(bb.transdate_as_date) %]</td>
+            <td></td>
+            <td align="right">[% LxERP.format_amount(-1 * bb.amount, 2) %]</td>
+            <td>[% HTML.escape(bb.record.customer.name) %][% HTML.escape(bb.record.vendor.name) %][% HTML.escape(bb.record.description) %]</td>
+            <td>[% bb.record.link %]</td>
+            <td></td>
+            <td></td>
+            <td>[% HTML.escape(bb.source) %]</td>
+            [% L.hidden_tag('proposal_list.' _ proposal.BT.id _ '.BB[]', bb.acc_trans_id) %]
+          </tr>
+        [% END %]
+      </tbody>
+  [% END %]
+[% END %]
+
diff --git a/templates/design40_webpages/reconciliation/search.html b/templates/design40_webpages/reconciliation/search.html
new file mode 100644
index 000000000..76c31d7ed
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/search.html
@@ -0,0 +1,36 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h1>[% 'Reconciliation with bank' | $T8 %]</h1>
+<form method="post" action="controller.pl" id="search_form">
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <caption>[% 'Choose bank account for reconciliation' | $T8 %]</caption>
+    <tbody>
+      <tr>
+       <th>[% 'Bank account' | $T8 %]</th>
+       <td>[% L.select_tag('filter.local_bank_account_id:number', SELF.BANK_ACCOUNTS, title_key='displayable_name', with_empty=0, class='wi-wide') %]</td>
+      </tr>
+      <tr>
+       <th>[% 'From' | $T8 %]</th>
+       <td><span class="wi-date">[% L.date_tag('filter.fromdate:date::ge') %]</span></td>
+      </tr>
+      <tr>
+       <th>[% 'to (date)' | $T8 %]</th>
+       <td><span class="wi-date">[% L.date_tag('filter.todate:date::le') %]</span></td>
+      </tr>
+      <tr>
+       <th>[% 'Cleared/uncleared only' | $T8 %]</th>
+       <td>[% L.select_tag('filter.cleared:eq_ignore_empty', SELF.cleared, value_key = 'value', title_key = 'title', default = 'FALSE', class='wi-wide' ) %]</td>
+      </tr>
+      <tr>
+       <th>[% 'Show Stornos' | $T8 %]</th>
+       <td>[% L.checkbox_tag('filter.show_stornos', value='1') %]</td>
+      </tr>
+    </tbody>
+   </table>
+</div>
+</form>
diff --git a/templates/design40_webpages/reconciliation/tabs/automatic.html b/templates/design40_webpages/reconciliation/tabs/automatic.html
new file mode 100644
index 000000000..6e981f6cb
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/tabs/automatic.html
@@ -0,0 +1,66 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% SET debug = 0 %]
+
+<table width=100% id="proposal_table">
+  <thead>
+    <tr>
+      <th>[% L.checkbox_tag('proposal_check_all') %]</th>
+
+      <th></th>
+      <th>[% 'Type' | $T8 %]</th>
+      [% IF debug %]<th>[% 'ID/Acc_ID' | $T8 %]</th>[% END %]
+      <th>[% 'Transdate' | $T8 %]</th>
+      <th>[% 'Amount BT' | $T8 %]</th>
+      <th>[% 'Amount BB' | $T8 %]</th>
+      <th>[% 'Remote Name/Customer/Description' | $T8 %]</th>
+      <th>[% 'Purpose/Reference' | $T8 %]</th>
+      <th>[% 'Remote account number' | $T8 %]</th>
+      <th>[% 'Remote bank code' | $T8 %]</th>
+      <th>[% 'Source' | $T8 %]</th>
+    </tr>
+  </thead>
+
+  [% PROCESS "reconciliation/proposals.html" %]
+<table>
+
+[% L.button_tag("reconcile_proposals()", LxERP.t8("Reconcile")) %]
+
+<script type="text/javascript">
+<!--
+
+function filter_table () {
+  var url="controller.pl?action=Reconciliation/filter_proposals&" + $('#reconciliation_form') . serialize();
+  $.ajax({
+    url: url,
+    success: function(new_data) {
+      $("tbody[class^='listrow']").remove();
+      $("#proposal_table").append(new_data['html']);
+      $(".absolut_bt_balance").html(new_data['absolut_bt_balance']);
+      $(".absolut_bb_balance").html(new_data['absolut_bb_balance']);
+      $(".bt_balance").html(new_data['bt_balance']);
+      $(".bb_balance").html(new_data['bb_balance']);
+    }
+  });
+}
+
+function reconcile_proposals() {
+  $('<input>').attr({
+    id : "action",
+    name : "action",
+    type : "hidden",
+    value : "Reconciliation/reconcile_proposals"
+  }).appendTo('#reconciliation_form');
+  $("#reconciliation_form").submit();
+}
+
+$(function() {
+  $('#proposal_check_all').checkall('INPUT[name^="bt_ids"]');
+});
+
+//-->
+</script>
+
diff --git a/templates/design40_webpages/reconciliation/tabs/overview.html b/templates/design40_webpages/reconciliation/tabs/overview.html
new file mode 100644
index 000000000..929d7ee6c
--- /dev/null
+++ b/templates/design40_webpages/reconciliation/tabs/overview.html
@@ -0,0 +1,127 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% SET debug = 0 %]
+
+  <div style="height:500px; overflow:auto;">
+    <table width=99% id="link_table">
+      <thead>
+        <tr>
+          <th></th>
+
+          <th></th>
+          <th>[% 'Type' | $T8 %]</th>
+          [% IF debug %]<th>[% 'ID/Acc_ID' | $T8 %]</th>[% END %]
+          <th>[% 'Transdate' | $T8 %]</th>
+          <th>[% 'Amount BT' | $T8 %]</th>
+          <th>[% 'Amount BB' | $T8 %]</th>
+          <th>[% 'Remote Name/Customer/Description' | $T8 %]</th>
+          <th>[% 'Purpose/Reference' | $T8 %]</th>
+          <th>[% 'Remote account number' | $T8 %]</th>
+          <th>[% 'Remote bank code' | $T8 %]</th>
+          <th>[% 'Source' | $T8 %]</th>
+        </tr>
+      </thead>
+
+      [% PROCESS 'reconciliation/_linked_transactions.html' %]
+
+      <tfoot>
+        <tr class="listtotal">
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="bt_balance top_border">[% LxERP.format_amount(SELF.bt_balance, 2) %]</td>
+          <td class="bb_balance top_border">[% LxERP.format_amount(-1 * SELF.bb_balance, 2) %]</td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+          <td class="top_border"></td>
+        </tr>
+      </tfoot>
+    </table>
+  </div>
+
+  <hr size="3" noshade>
+
+  <div id="assigned_elements"></div>
+
+<script type="text/javascript">
+<!--
+
+function filter_table () {
+  var url="controller.pl?action=Reconciliation/filter_overview";
+  $.ajax({
+    url: url,
+    type: "POST",
+    data: $('#reconciliation_form').serialize(),
+    success: function(new_data) {
+      $("tbody[class^='listrow']").remove();
+      $("#assigned_elements").html('');
+      $("#link_table").append(new_data['html']);
+      $(".absolut_bt_balance").html(new_data['absolut_bt_balance']);
+      $(".absolut_bb_balance").html(new_data['absolut_bb_balance']);
+      $(".bt_balance").html(new_data['bt_balance']);
+      $(".bb_balance").html(new_data['bb_balance']);
+    }
+  });
+}
+
+function update_reconciliation_table () {
+  var url="controller.pl?action=Reconciliation/update_reconciliation_table";
+  $.ajax({
+    url: url,
+    type: "POST",
+    data: $('#reconciliation_form').serialize(),
+    success: function(new_data) {
+      $('#assigned_elements').html(new_data['html']);
+    }
+  });
+}
+
+function delete_element (id, type) {
+  if (type == 'BT') {
+    $("input[name^='bt_ids'][value=" + id + "]").attr('checked', false);
+  }
+  if (type == 'BB') {
+    $("input[name^='bb_ids'][value=" + id + "]").attr('checked', false);
+  }
+  update_reconciliation_table();
+}
+
+function submit_with_action(action) {
+  $('<input>').attr({
+    id : "action",
+    name : "action",
+    type : "hidden",
+    value : "Reconciliation/reconcile"
+  }).appendTo('#reconciliation_form');
+  $("#reconciliation_form").submit();
+}
+
+function delete_reconciliation(rec_group) {
+  var check = confirm('[% 'Really cancel link?' | $T8 %]');
+  if (check == true) {
+    var url="controller.pl?action=Reconciliation/delete_reconciliation&rec_group=" + rec_group + "&" + $('#reconciliation_form') . serialize();
+    $.ajax({
+      url: url,
+      success: function(new_data) {
+        $("tbody[class^='listrow']").remove();
+        $("#assigned_elements").html('');
+        $("#link_table").append(new_data['html']);
+        $(".absolut_bt_balance").html(new_data['absolut_bt_balance']);
+        $(".absolut_bb_balance").html(new_data['absolut_bb_balance']);
+        $(".bt_balance").html(new_data['bt_balance']);
+        $(".bb_balance").html(new_data['bb_balance']);
+      }
+    });
+  }
+}
+
+//-->
+</script>
+
diff --git a/templates/design40_webpages/record_links/add_filter.html b/templates/design40_webpages/record_links/add_filter.html
new file mode 100644
index 000000000..b6c873ea3
--- /dev/null
+++ b/templates/design40_webpages/record_links/add_filter.html
@@ -0,0 +1,125 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE JavaScript %]
+[% SET style='width: 500px' %]
+
+
+<form method="post" action="controller.pl" id="record_links_add_filter_form">
+[% L.hidden_tag('object_model',   SELF.object_model) %]
+[% L.hidden_tag('object_id',      SELF.object_id) %]
+
+<table class="tbl-horizontal">
+  <caption>[% LxERP.t8("Add link: select records to link with") %]</caption>
+  <colgroup> <col class="wi-normal"><col class="wi-verywide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Link to") %]</th>
+      <td>[% L.select_tag('link_type', LINK_TYPES, default=DEFAULT_LINK_TYPE, class='wi-wide', id='record_links_add_filter_link_type') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Link direction") %]</th>
+      <td>[% L.select_tag('link_direction',
+                          [ [ 'from', LxERP.t8("The link target to add has been created from the existing record."), ],
+                            [ 'to',   LxERP.t8("The existing record has been created from the link target to add."), ], ],
+                            class='wi-verywide') %]</td>
+    </tr>
+    <tr>
+      <td>[%- LxERP.t8("Record number") %]:</td>
+      <td>[% L.input_tag('number', '', class='wi-wide') %]</td>
+    </tr>
+    <tr class="record_links_add_filter_cv_row">
+      <th>[% LxERP.t8("Customer/Vendor Number") %]</th>
+      <td>[% L.input_tag('vc_number', is_sales ? SELF.object.customer.customernumber : SELF.object.vendor.vendornumber, class='wi-wide') %]</td>
+    </tr>
+    <tr class="record_links_add_filter_cv_row">
+      <th>[% LxERP.t8("Customer/Vendor Name") %]</th>
+      <td>[% L.input_tag('vc_name', is_sales ? SELF.object.customer.name : SELF.object.vendor.name, class='wi-wide') %]</td>
+    </tr>
+    <tr id="record_links_add_filter_project_row">
+      <th>[% LxERP.t8("Project") %]</tdh>
+      <td>[% L.select_tag('globalproject_id', PROJECTS, default=SELF.object.globalproject_id, with_empty=1, class='wi-wide') %]</td>
+    </tr>
+    <tr id="record_links_add_filter_title_row">
+      <th><span id="record_links_add_filter_title">[% LxERP.t8("Transaction description") %]</span></th>
+      <td>[% L.input_tag('transaction_description', '', class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% L.button_tag('filter_record_links()', LxERP.t8("Search"), class='neutral') %]
+  [% L.button_tag('add_selected_record_links()', LxERP.t8("Add links"), id='add_selected_record_links_button', disabled=1) %]
+  [% L.button_tag('$("#record_links_add_filter_form").resetForm()', LxERP.t8('Reset'), class='neutral') %]
+  <a href="#" onclick="$('#record_links_add').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+</div>
+
+
+<div id="record_list_filtered_list"></div>
+
+</form>
+
+<script type="text/javascript"><!--
+$(function() {
+  $('#record_links_add input[name=vc_name]').focus();
+  $('#record_links_add_filter_link_type').change(record_links_change_form_to_match_type);
+  record_links_change_form_to_match_type();
+});
+
+function filter_record_links() {
+  var url="controller.pl?action=RecordLinks/ajax_add_list&" + $("#record_links_add form").serialize();
+  $.ajax({
+    url: url,
+    success: function(new_data) {
+      if (new_data['error']) {
+        $("#record_list_filtered_list").html(kivi.t8('Error: #1', [ new_data['error'] ]));
+        $('#add_selected_record_links_button').prop('disabled', true);
+      } else {
+        $("#record_list_filtered_list").html(new_data['html']);
+        $('#add_selected_record_links_button').prop('disabled', new_data['count'] == 0);
+      }
+    }
+  });
+}
+
+function add_selected_record_links() {
+  var url="controller.pl?action=RecordLinks/ajax_add_do&" + $("#record_links_add form").serialize();
+  $.ajax({
+    url: url,
+    success: function(new_html) {
+      $('#record_links_list').replaceWith(new_html);
+      $('#record_links_add').dialog('close');
+    }
+  });
+}
+
+function record_links_change_form_to_match_type() {
+  var type  = $('#record_links_add_filter_link_type').val();
+  var title = type == 'requirement_spec' ? kivi.t8('Title')
+            : type == 'letter'           ? kivi.t8('Subject')
+            : type == 'email_journal'    ? kivi.t8('Subject')
+            :                              kivi.t8('Transaction description');
+
+  if (type == 'letter' || type == 'email_journal' || type == 'gl_transaction' ||
+      type == 'dunning' || type == 'shop_order') {
+    $('#record_links_add_filter_project_row').hide();
+
+  } else {
+    $('#record_links_add_filter_project_row').show();
+  }
+
+  if (type == 'email_journal' || type == 'gl_transaction' || type == 'dunning') {
+    $('.record_links_add_filter_cv_row').hide();
+
+  } else {
+    $('.record_links_add_filter_cv_row').show();
+  }
+
+  if (type == 'dunning' || type == 'shop_order') {
+    $('#record_links_add_filter_title_row').hide();
+
+  } else {
+    $('#record_links_add_filter_title').html(title);
+    $('#record_links_add_filter_title_row').show();
+  }
+}
+--></script>
diff --git a/templates/design40_webpages/record_links/add_list.html b/templates/design40_webpages/record_links/add_list.html
new file mode 100644
index 000000000..86a039656
--- /dev/null
+++ b/templates/design40_webpages/record_links/add_list.html
@@ -0,0 +1,62 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% USE L %]
+
+[% IF !OBJECTS.size %]
+
+  <p class="message message_hint">[% 'No data was found.' | $T8 %]</p>
+
+[% ELSE %]
+
+  <table class="tbl-list wi-moderate">
+    <thead>
+      <tr>
+        <th>[% L.checkbox_tag('record_links_check_all') %]</th>
+        [% IF vc %]
+          <th>[% IF vc == 'customer' %][% LxERP.t8("Customer") %][% ELSE %][% LxERP.t8("Vendor") %][% END %]</th>
+        [% END %]
+        <th>[% LxERP.t8("Number") %]</th>
+        [% IF date_column %]
+          <th>[% LxERP.t8("Date") %]</th>
+        [% END %]
+        [% IF description_column %]
+          <th>[% HTML.escape(description_title) %]</th>
+        [% END %]
+        [% IF project_column %]
+          <th>[% LxERP.t8("Project") %]</th>
+        [% END %]
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH object = OBJECTS %]
+        <tr>
+          <td>[% L.checkbox_tag('link_id[]', value=object.id) %]</td>
+          [% IF vc %]
+            <td>[% HTML.escape(object.$vc.name) %]</td>
+          [% END %]
+          <td>[% HTML.escape(object.$number_column) %]</td>
+          [% IF date_column %]
+            <td>[% HTML.escape(object.$date_column.to_kivitendo) %]</td>
+          [% END %]
+          [% IF description_column %]
+            <td>[% HTML.escape(object.$description_column) %]</td>
+          [% END %]
+          [% IF project_column %]
+            <td>[% object.$project_column.presenter.project(no_link=1) %]</td>
+          [% END %]
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <script type="text/javascript"><!--
+
+  $(function() {
+    $('#record_links_check_all').checkall('INPUT[name="link_id[]"]');
+  });
+
+  --></script>
+
+[% END %]
diff --git a/templates/design40_webpages/record_template/dialog.html b/templates/design40_webpages/record_template/dialog.html
new file mode 100644
index 000000000..b2f808693
--- /dev/null
+++ b/templates/design40_webpages/record_template/dialog.html
@@ -0,0 +1,67 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+[% L.hidden_tag("", SELF.template_type, id="record_template_dialog_template_type",
+                "data-controller"=SELF.data.controller,
+                "data-load_action"=SELF.data.load_action,
+                "data-save_action"=SELF.data.save_action,
+                "data-form_selector"=SELF.data.form_selector) %]
+
+<h2>[% LxERP.t8("Add new record template") %]</h2>
+
+<p>
+ [% LxERP.t8("Name") %]:
+ [% L.input_tag("", "", id="record_template_dialog_new_template_name") %]
+ [% L.button_tag("kivi.RecordTemplate.create()", LxERP.t8("Save")) %]
+</p>
+
+<h2 class="listheading">[% LxERP.t8("Filter record template") %]</h2>
+<p>
+<form method="post" action="javascript:kivi.RecordTemplate.filter_templates()">
+ [% LxERP.t8("Name") %]:
+ [% L.input_tag("template_filter", SELF.template_filter) %]
+ [% L.submit_tag('', LxERP.t8("Filter")) %]
+ [% L.button_tag('$("#template_filter").val("")', LxERP.t8('Reset')) %]
+</form>
+</p>
+
+[% SET templates = SELF.templates.as_list %]
+
+[% IF templates.size %]
+
+<h2>[% LxERP.t8("Existing templates") %]</h2>
+
+<table>
+ <thead>
+  <tr>
+   <th>[% LxERP.t8("Action") %]</th>
+   <th>[% LxERP.t8("Name") %]</th>
+   <th>[% LxERP.t8("Modification date") %]</th>
+  </tr>
+ </thead>
+
+ <tbody>
+[% FOREACH template = templates %]
+  <tr class="listrow">
+   <td>
+    [% L.hidden_tag("", template.template_name, id="record_template_dialog_template_name_" _ template.id) %]
+    [% L.button_tag("kivi.RecordTemplate.load(" _ template.id _ ")", LxERP.t8("Load")) %]
+    [% L.button_tag("kivi.RecordTemplate.save(" _ template.id _ ")", LxERP.t8("Save")) %]
+    [% L.button_tag("kivi.RecordTemplate.rename(" _ template.id _ ")", LxERP.t8("Rename")) %]
+    [% L.button_tag("kivi.RecordTemplate.delete(" _ template.id _ ")", LxERP.t8("Delete")) %]
+   </td>
+   <td>[% HTML.escape(template.template_name) %]</td>
+   <td>[% HTML.escape(template.mtime.to_kivitendo) %] [% HTML.escape(template.mtime.to_kivitendo_time) %]</td>
+  </tr>
+[% END %]
+ </tbody>
+
+</table>
+[% ELSE %]
+
+<p>[% LxERP.t8("There are no record templates yet.") %]</p>
+
+[% END %]
diff --git a/templates/design40_webpages/report_generator/chart_export_options.html b/templates/design40_webpages/report_generator/chart_export_options.html
new file mode 100644
index 000000000..bb8d00ada
--- /dev/null
+++ b/templates/design40_webpages/report_generator/chart_export_options.html
@@ -0,0 +1,69 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE P %]
+[%- USE LxERP %]
+
+ <h1>[% HTML.escape(title) %]</h1>
+
+ <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form" id="report_generator_form">
+
+  [%- FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="report_generator_chart_options_set" value="1">
+  <input type="hidden" name="report_generator_dispatch_to" value="">
+
+ <div class="wrapper">
+   <table id="assigment_table" class="tbl-horizontal">
+     <tbody>
+       <tr>
+         <th valign="top" align="right">[% 'Chart assignments' | $T8 %]: [% 'X axis' | $T8 %]</th>
+         <td>
+           [% L.select_tag('report_generator_chart_options_assignment_x',
+                           fields,
+                           default = SELF.report_generator_chart_options_assignment_x
+                           value_key = 'name',
+                           title_key = 'text') %]
+         </td>
+       </tr>
+       <tr id="y_assignment_row">
+         <th valign="top" align="right">[% 'Chart assignments' | $T8 %]: [% 'Y axis' | $T8 %]</th>
+         <td>
+           [% L.select_tag('report_generator_chart_options_assignments_y[]',
+                           fields,
+                           value_key = 'name',
+                           title_key = 'text') %]
+           [% P.link_tag('', "✘", class='remove_data_assignment interact cursor-pointer', onclick='remove_data_assignment(this)', style='display:none') %]
+         </td>
+       </tr>
+     </tbody>
+   </table>
+ </div><!-- /.wrapper -->
+
+  [% L.button_tag('add_data_assignement()', LxERP.t8('Add row')) %]
+
+[%- IF CONTROLLER_DISPATCH %]
+    <input type="hidden" name="CONTROLLER_DISPATCH" value="[% CONTROLLER_DISPATCH | html %]">
+[%- ELSE %]
+   <input type="hidden" name="action" value="report_generator_dispatcher">
+[%- END %]
+
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+   function add_data_assignement() {
+     const new_row = $('#y_assignment_row').clone();
+     new_row.removeAttr('id');
+     new_row.find('a').show();
+     new_row.find('*').removeAttr('id');
+     new_row.appendTo("#assigment_table");
+   }
+   function remove_data_assignment(clicked) {
+     $(clicked).closest('tr').remove();
+   }
+  -->
+ </script>
diff --git a/templates/design40_webpages/report_generator/chart_report.html b/templates/design40_webpages/report_generator/chart_report.html
new file mode 100644
index 000000000..a59a2df33
--- /dev/null
+++ b/templates/design40_webpages/report_generator/chart_report.html
@@ -0,0 +1,29 @@
+[% USE P -%]
+
+<h1>[% TITLE %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+[% IF TOP_INFO_TEXT %]
+ <p>[% TOP_INFO_TEXT %]</p>
+[% END %]
+
+[% RAW_TOP_INFO_TEXT %]
+
+<div class="chart-container" style="position: relative;">
+  <canvas id="chart" height="70vH"></canvas>
+</div>
+
+[% RAW_BOTTOM_INFO_TEXT %]
+
+[% IF BOTTOM_INFO_TEXT %]
+ <p>[% BOTTOM_INFO_TEXT %]</p>
+[% END %]
+
+
+<script>
+  kivi.ChartReport.data = { labels: [% labels %],
+                            datasets: [% datasets %],
+                            data_labels: [% data_labels %],
+                          };
+</script>
diff --git a/templates/design40_webpages/report_generator/csv_export_options.html b/templates/design40_webpages/report_generator/csv_export_options.html
new file mode 100644
index 000000000..994355c42
--- /dev/null
+++ b/templates/design40_webpages/report_generator/csv_export_options.html
@@ -0,0 +1,79 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form action="[% HTML.escape(script) %]" method="post" name="report_generator_form" id="report_generator_form">
+
+[% FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+[% END %]
+
+<input type="hidden" name="report_generator_csv_options_set" value="1">
+<input type="hidden" name="report_generator_dispatch_to" value="">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Quote chararacter' | $T8 %]</th>
+      <td> 
+        <select name="report_generator_csv_options_quote_char" style="width: 300px">
+          <option value="&quot;" selected>&quot;</option>
+          <option value="'">'</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Escape character' | $T8 %]</th>
+      <td> 
+        <select name="report_generator_csv_options_escape_char" style="width: 300px">
+          <option value="QUOTE_CHAR" selected>[% 'Same as the quote character' | $T8 %]</option>
+          <option value="&quot;">&quot;</option>
+          <option value="'">'</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Separator chararacter' | $T8 %]</th>
+      <td> 
+        <select name="report_generator_csv_options_sep_char" style="width: 300px">
+          <option value=";">;</option>
+          <option value="," selected>,</option>
+          <option value=":">:</option>
+          <option value="TAB">TAB ([% 'The tabulator character' | $T8 %])</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Line endings' | $T8 %]</th>
+      <td> 
+        <select name="report_generator_csv_options_eol_style" style="width: 300px">
+          <option value="DOS">DOS/Windows (CR/LF)</option>
+          <option value="Unix" selected>Unix (LF)</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Options' | $T8 %]</th>
+      <td>
+        <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
+        <label for="report_generator_csv_options_headers">[% 'Include column headings' | $T8 %]</label><br>
+        <input type="checkbox" name="report_generator_csv_options_for_import" id="report_generator_csv_options_for_import" value="1">
+        <label for="report_generator_csv_options_for_import">[% 'Make compatible for import' | $T8 %]</label>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+[% IF CONTROLLER_DISPATCH %]
+  <input type="hidden" name="CONTROLLER_DISPATCH" value="[% CONTROLLER_DISPATCH | html %]">
+[% ELSE %]
+  <input type="hidden" name="action" value="report_generator_dispatcher">
+[% END %]
+
+
+</form>
diff --git a/templates/design40_webpages/report_generator/html_report.html b/templates/design40_webpages/report_generator/html_report.html
new file mode 100644
index 000000000..dcc16bd34
--- /dev/null
+++ b/templates/design40_webpages/report_generator/html_report.html
@@ -0,0 +1,133 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% TITLE %]</h1>
+
+[% IF MESSAGE %]
+  <p class="message">[% MESSAGE %]</p>
+[% END %]
+
+[% INCLUDE 'common/flash.html' %]
+
+[% IF TOP_INFO_TEXT %]<p>[% TOP_INFO_TEXT %]</p>[% END %]
+[% RAW_TOP_INFO_TEXT %]
+
+
+
+[% IF DATA_PRESENT %]
+  <div class="horizontal-scroll-wrapper">
+  <table class="tbl-list[% IF TABLE_CLASS %] [% TABLE_CLASS %][% END %]" id="report_table_id">
+    <thead>
+      [% FOREACH row = HEADER_ROWS %]
+        <tr>
+          [% FOREACH col = row %]
+            <th[% IF col.align %] class="[% HTML.escape(col.align) %]"[% END %][% IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END %]>
+              [% IF col.raw_header_data %]
+                [% col.raw_header_data %]
+              [% ELSE %]
+                [% IF col.link %]<a class="[% col.link_class ? col.link_class : 'report-generator-header-link' %]" href="[% HTML.escape(col.link) %]">[% END %]
+                [% col.text %]
+                [% IF col.show_sort_indicator %]<img src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %]
+                [% IF col.link %]</a>[% END %]
+              [% END %]
+            </th>
+          [% END %]
+        </tr>
+      [% END %]
+    </thead>
+    <tbody>
+    [% FOREACH row = ROWS %]
+      [%- IF row.IS_CONTROL %]
+        [%- IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
+      [%- ELSE %]
+        <tr>
+        [%- FOREACH col = row.COLUMNS %]
+          <td class="[%- IF col.align -%][% col.align %][%- END -%][%- IF col.class -%] [% col.class %][%- END -%]"[% IF col.colspan && col.colspan>1 %] colspan="[% HTML.escape(col.colspan) %]"[% END %]>
+            [%- IF col.raw_data %]
+              [%- col.raw_data %]
+            [%- ELSE %]
+              [%- USE iterator(col.CELL_ROWS) %]
+              [%- FOREACH cell_row = iterator %]
+                [%- IF cell_row.data != '' %]
+                  [%- IF cell_row.link %]<a href="[% HTML.escape(cell_row.link) %]"[% IF cell_row.link_class %] class="[% cell_row.link_class %]"[% END %]>[% END %]
+                  [%- cell_row.data %]
+                  [%- IF cell_row.link %]</a>[% END %]
+                [%- END %]
+                [%- UNLESS iterator.last %]<br>[% END %]
+              [%- END %]
+            [%- END -%]
+          </td>
+        [%- END %]
+        </tr>
+      [%- END %]
+    [% END %]
+    </tbody>
+  </table>
+  </div>
+[% ELSE %]
+  <p class="message message_hint">[% 'No data was found.' | $T8 %]</p>
+[% END %]
+
+[% RAW_BOTTOM_INFO_TEXT %]
+
+[% IF BOTTOM_INFO_TEXT %]
+  <p>[% BOTTOM_INFO_TEXT %]</p>
+[% END %]
+
+[% IF SHOW_EXPORT_BUTTONS %]
+  <form action="[% HTML.escape(script) %]" name="report_generator_form" id="report_generator_form" method="post">
+  [% FOREACH var = EXPORT_VARIABLES %]
+    <input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
+  [% END %]
+
+  [% IF ALLOW_CHART_EXPORT %]
+    [% FOREACH row = HEADER_ROWS %]
+      [% FOREACH col = row %]
+        [% IF col.name && col.text %]
+          <input type="hidden" name="report_generator_chart_fields[+].name" value="[% HTML.escape(col.name) %]">
+          <input type="hidden" name="report_generator_chart_fields[].text"  value="[% HTML.escape(col.text) %]">
+        [% END %]
+      [% END %]
+    [% END %]
+  [% END %]
+
+  [% IF CONTROLLER_DISPATCH %]
+    [% IF !SKIP_BUTTONS %]
+      <input type="hidden" name="action" value="[% CONTROLLER_DISPATCH %]/dispatch">
+    [% END %][%# !SKIP_BUTTONS %]
+    <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
+    <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
+    <input type="hidden" name="CONTROLLER_DISPATCH" value="[% CONTROLLER_DISPATCH | html %]">
+
+    [% IF !SKIP_BUTTONS %]
+      <p>
+        [% 'List export' | $T8 %]<br>
+        [% IF ALLOW_PDF_EXPORT %]<input type="submit" name="action_report_generator_export_as_pdf" value="[% 'Export as PDF' | $T8 %]">[% END %]
+        [% IF ALLOW_CSV_EXPORT %]<input type="submit" name="action_report_generator_export_as_csv" value="[% 'Export as CSV' | $T8 %]">[% END %]
+      </p>
+    [% END %][%# !SKIP_BUTTONS %]
+
+  [% ELSE %]
+    <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
+    <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
+    <input type="hidden" name="report_generator_dispatch_to" value="">
+    <input type="hidden" name="action" value="report_generator_dispatcher">
+
+    [% IF !SKIP_BUTTONS %]
+      <p>
+        [% 'List export' | $T8 %]<br>
+        [% IF ALLOW_PDF_EXPORT %]<input type="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="[% 'Export as PDF' | $T8 %]">[% END %]
+        [% IF ALLOW_CSV_EXPORT %]<input type="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="[% 'Export as CSV' | $T8 %]">[% END %]
+      </p>
+      <script type="text/javascript"> <!--
+        function submit_report_generator_form(nextsub) {
+          document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+          document.report_generator_form.submit();
+        } // -->
+      </script>
+    [% END %][%# !SKIP_BUTTONS %]
+
+  [% END %]
+
+  </form>
+[% END %]
diff --git a/templates/design40_webpages/report_generator/pdf_export_options.html b/templates/design40_webpages/report_generator/pdf_export_options.html
new file mode 100644
index 000000000..896ef963c
--- /dev/null
+++ b/templates/design40_webpages/report_generator/pdf_export_options.html
@@ -0,0 +1,130 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+[% SET default_ymargin = LxERP.format_amount(1.5) %]
+[% SET default_xmargin = LxERP.format_amount(0.8) %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form action="[% HTML.escape(script) %]" method="post" name="report_generator_form" id="report_generator_form">
+
+[% FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+[% END %]
+
+<input type="hidden" name="report_generator_pdf_options_set" value="1">
+<input type="hidden" name="report_generator_dispatch_to" value="">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Export format' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Orientation' | $T8 %]</th>
+      <td>
+        <select name="report_generator_pdf_options_paper_size">
+          <option value="A3">A3</option>
+          <option value="A4" selected>A4</option>
+          <option value="A5">A5</option>
+          <option value="letter">Letter</option>
+          <option value="legal">Legal</option>
+        </select>
+        <select name="report_generator_pdf_options_orientation">
+          <option value="portrait">[% 'Portrait' | $T8 %]</option>
+          <option value="landscape" selected>[% 'Landscape' | $T8 %]</option>
+        </select>
+      </td>
+    </tr>
+    [% IF ALLOW_FONT_SELECTION %]
+    <tr>
+      <th>[% 'Font' | $T8 %]</th>
+      <td>
+        <select name="report_generator_pdf_options_font_name">
+          <option>Courier</option>
+          <option>Georgia</option>
+          <option>Helvetica</option>
+          <option>Times</option>
+          <option selected>Verdana</option>
+        </select>
+      </td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Font size' | $T8 %]</th>
+      <td>
+        <select name="report_generator_pdf_options_font_size">
+          <option>6</option>
+          <option selected>7</option>
+          <option>8</option>
+          <option>9</option>
+          <option>10</option>
+          <option>11</option>
+          <option>12</option>
+          <option>13</option>
+          <option>14</option>
+          <option>15</option>
+        </select> pt.</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Margins' | $T8 %]:</th>
+    </tr>
+    <tr>
+      <th>[% 'Top' | $T8 %]</th>
+      <td><input type="text" name="report_generator_pdf_options_margin_top" size="4" value="[% HTML.escape(default_ymargin) %]"> cm</td>
+    </tr>
+    <tr>
+      <th>[% 'Left' | $T8 %]</th>
+      <td><input type="text" name="report_generator_pdf_options_margin_left" size="4" value="[% HTML.escape(default_xmargin) %]"> cm</td>
+    </tr>
+    <tr>
+      <th>[% 'Bottom' | $T8 %]</th>
+      <td><input type="text" name="report_generator_pdf_options_margin_bottom" size="4" value="[% HTML.escape(default_ymargin) %]"> cm</td>
+    </tr>
+    <tr>
+      <th>[% 'Right' | $T8 %]</th>
+      <td><input type="text" name="report_generator_pdf_options_margin_right" size="4" value="[% HTML.escape(default_xmargin) %]"> cm</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% 'Print options' | $T8 %]:</th>
+    </tr>
+    <tr>
+      <th>[% 'Options' | $T8 %]</th>
+      <td>
+        <input type="checkbox" name="report_generator_pdf_options_number" id="report_generator_pdf_options_number" value="1" checked>
+        <label for="report_generator_pdf_options_number">[% 'Number pages' | $T8 %]</label>
+        [% IF ALL_PRINTERS.size %] <br>
+          <input type="checkbox" name="report_generator_pdf_options_print" id="report_generator_pdf_options_print" value="1">
+          <label for="report_generator_pdf_options_print">[% 'Print list' | $T8 %]</label>
+        [% END %]
+      </td>
+    </tr>
+    [% IF ALL_PRINTERS.size %]
+      <tr>
+        <td>[% 'Printer' | $T8 %]</td>
+        <td>
+          <select name="report_generator_pdf_options_printer_id">
+            [% FOREACH printer = ALL_PRINTERS %]
+              <option value="[% HTML.escape(printer.id) %]"[% IF printer.selected %] selected[% END %]>[% HTML.escape(printer.printer_description) %]</option>
+            [% END %]
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>[% 'Copies' | $T8 %]</td>
+        <td><input type="text" name="report_generator_pdf_options_copies" size="4" value="[% HTML.escape(copies) %]"></td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+[% IF CONTROLLER_DISPATCH %]
+  <input type="hidden" name="CONTROLLER_DISPATCH" value="[% CONTROLLER_DISPATCH | html %]">
+[% ELSE %]
+  <input type="hidden" name="action" value="report_generator_dispatcher">
+[% END %]
+
+</form>
diff --git a/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate.html b/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate.html
new file mode 100644
index 000000000..1bfa0192b
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate.html
@@ -0,0 +1,52 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE P %]
+[% DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
+
+<div id="time_cost_estimate_form_container" class="edit-time-cost-estimate-context-menu">
+<div class="wrapper">
+ [% IF !SELF.requirement_spec.sections.size %]
+  <p>[% LxERP.t8("Neither sections nor function blocks have been created yet.") %]</p>
+
+ [% ELSE %]
+
+  [% SET at_least_one_function_block = 0 %]
+
+  <form method="post" id="edit_time_cost_estimate_form">
+   [% L.hidden_tag('id', SELF.requirement_spec.id, id=id_prefix _ '_id') %]
+
+   [%# time-cost-estimate-context-menu %]
+   <table class="tbl-list time-cost-estimate test">
+     [% FOREACH section = SELF.requirement_spec.sections_sorted %]
+     <thead>
+      <tr>
+       <th>[% LxERP.t8("Function block") %]</th>
+       <th>[% LxERP.t8("Complexity") %]</th>
+       <th>[% LxERP.t8("Risk") %]</th>
+       <th class="right">[% LxERP.t8("Time estimate") %]</th>
+      </tr>
+      </thead>
+    <tbody>
+      <tr class="listrow section">
+       <th class="caption" colspan="4">[% HTML.escape(section.fb_number) %]: [% HTML.escape(section.title) %]</td>
+      </tr>
+
+      [% IF section.children.size %]
+       [% SET at_least_one_function_block = 1 %]
+       [% FOREACH child = section.children_sorted %]
+        [% INCLUDE 'requirement_spec/_edit_time_and_cost_estimate_item.html'
+                    id_prefix = id_prefix
+                    item      = child
+                    level     = 1 %]
+       [% END %]
+      [% END %]
+     [% END %]
+    </tbody>
+   </table>
+
+   [% L.button_tag("kivi.requirement_spec.standard_time_cost_estimate_ajax_call('save')", LxERP.t8("Save")) %]
+  </form>
+ [% END %]
+</div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate_item.html b/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate_item.html
new file mode 100644
index 000000000..3ffffaaf9
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_edit_time_and_cost_estimate_item.html
@@ -0,0 +1,31 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% USE L %]
+
+<tr>
+ <td style="padding-left:[% level * 50 %]px;">
+  [% L.hidden_tag("requirement_spec_items[+].id", item.id, id = id_prefix _ '_item_id') %]
+  [% item.fb_number _ ": " _ item.description_as_restricted_html %]
+ </td>
+ <td>
+  [% L.select_tag('requirement_spec_items[].complexity_id', SELF.complexities, id=id_prefix _ '_complexity_id_' _ item.id, title_key='description', default=item.complexity_id, style="width: 100%") %]<br>
+ </td>
+ <td>
+  [% L.select_tag('requirement_spec_items[].risk_id', SELF.risks, id=id_prefix _ '_risk_id_' _ item.id, title_key='description', default=item.risk_id, style="width: 100%") %]<br>
+ </td>
+ [% IF !item.children.size %]
+    <td class="date">[% P.man_days_tag('requirement_spec_items[].time_estimation', item, id=id_prefix _ '_time_estimation') %]</td>
+ [% ELSE %]
+    <td>&nbsp;</td>
+ [% END %]
+</tr>
+
+[% IF item.children.size %]
+ [% FOREACH child = item.children_sorted %]
+  [% INCLUDE 'requirement_spec/_edit_time_and_cost_estimate_item.html'
+              id_prefix = id_prefix
+              item      = child
+              level     = level + 1 %]
+ [% END %]
+[% END %]
diff --git a/templates/design40_webpages/requirement_spec/_filter.html b/templates/design40_webpages/requirement_spec/_filter.html
new file mode 100644
index 000000000..15ccbfff1
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_filter.html
@@ -0,0 +1,79 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<form method="post" action="controller.pl" id="search_form">
+  [% L.hidden_tag("is_template", is_template) %]
+  [% L.hidden_tag("_include_cvars_from_form", 1) %]
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8("Title") %]</th>
+        <td>[% L.input_tag('filter.title:substr::ilike', filter.title_substr__ilike, class="rs_input_field wi-lightwide") %]</td>
+      </tr>
+      [% UNLESS is_template %]
+        <tr>
+          <th>[% LxERP.t8("Customer") %]</th>
+          <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, class="rs_input_field wi-lightwide") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Customer Number") %]</th>
+          <td>[% L.input_tag('filter.customer.customernumber:substr::ilike', filter.customer.customernumber_substr__ilike, class="rs_input_field wi-lightwide") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Requirement Spec Type") %]</th>
+          <td>[% L.select_tag('filter.type_id', SELF.types, default=filter.type_id, title_key="description", with_empty=1, class="rs_input_field wi-lightwide") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Requirement Spec Status") %]</th>
+          <td>
+            [% L.select_tag('filter.status_id[]', SELF.statuses, default=filter.status_id_, title_key="description", multiple=1, class="rs_input_field wi-wide") %]
+            [%# NOTE: the trailing '_' is NOT a mistake -- look at SL::Controller::Helper::Filtered for the explanation! %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Project Number") %]</th>
+          <td>[% L.input_tag('filter.project.projectnumber:substr::ilike', filter.project.projectnumber_substr__ilike, class="rs_input_field wi-lightwide") %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Project Description") %]</th>
+          <td>[% L.input_tag('filter.project.description:substr::ilike', filter.project.description_substr__ilike, class="rs_input_field wi-lightwide") %]</td>
+        </tr>
+        [% FOREACH cvar_cfg = SELF.cvar_configs %]
+          [% IF cvar_cfg.searchable %]
+            <tr>
+              <th>[% HTML.escape(cvar_cfg.description) %]</th>
+              <td>[% INCLUDE 'common/render_cvar_filter_input.html' cvar_cfg=cvar_cfg cvar_class="rs_input_field" %]</td>
+            </tr>
+          [% END %]
+        [% END # %]
+      [% END # /UNLESS is_template %]
+    </tbody>
+  </table>
+  [% IF SELF.includeable_cvar_configs.size %]
+  <table class="tbl-plain">
+    <caption>[% LxERP.t8("Include in Report") %]</caption>
+    <tbody>
+      [% FOREACH cvar_cfg = SELF.includeable_cvar_configs %]
+      <tr>
+        <td>
+          [% name__ = cvar_cfg.name; L.checkbox_tag("include_cvars_" _ name__, value="1", checked=(SELF.include_cvars.$name__ ? 1 : ''), label=cvar_cfg.description) %]
+        </td>
+      [% IF !loop.last && ((loop.count % 3) == 0) %]
+      </tr>
+      <tr>
+        [% END %]
+      </tr>
+      [% END %]
+    <tbody>
+  </table>
+  [% END %]
+</form>
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/requirement_spec/_form.html b/templates/design40_webpages/requirement_spec/_form.html
new file mode 100644
index 000000000..96b797414
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_form.html
@@ -0,0 +1,81 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% 
+  DEFAULT id_prefix = 'basic_settings_form'
+          submit_as = 'post'
+%]
+<form method="post" action="controller.pl" id="[% id_prefix %]"[% UNLESS submit_as == 'post' %] class="edit-basic-settings-context-menu"[% END %]>
+<div class="wrapper">
+
+[% L.hidden_tag("id", SELF.requirement_spec.id, id=id_prefix _ '_id') %]
+[% L.hidden_tag("requirement_spec.is_template", SELF.requirement_spec.is_template, id=id_prefix _ '_is_template') %]
+
+<table class="tbl-horizontal rs_input_field">
+  <caption>[% LxERP.t8("Edit general settings") %]</caption>
+  <tbody>
+    <tr>
+     <th>[% LxERP.t8("Title") %]</th>
+     <td>[% L.input_tag("requirement_spec.title", SELF.requirement_spec.title, id=id_prefix _ '_title') %]</td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8("Requirement Spec Type") %]</th>
+     <td>[% L.select_tag("requirement_spec.type_id",  SELF.types, default=SELF.requirement_spec.type_id, title_key="description", id=id_prefix _ '_type_id') %]</td>
+    </tr>
+    [% UNLESS SELF.requirement_spec.is_template %]
+      <tr>
+       <th>[% LxERP.t8("Requirement Spec Status") %]</th>
+       <td>[% L.select_tag("requirement_spec.status_id",  SELF.statuses, default=SELF.requirement_spec.status_id, title_key="description", id=id_prefix _ '_status_id') %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Customer") %]</th>
+        <td>[% 
+            L.select_tag("requirement_spec.customer_id",  SELF.customers, default=SELF.requirement_spec.customer_id, title_key="name", id=id_prefix _ '_customer_id',
+              onchange="kivi.requirement_spec.basic_settings_customer_changed('#" _ id_prefix _ "_customer_id', '#" _ id_prefix _ "_hourly_rate_as_number')") 
+        %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Hourly Rate") %]</th>
+        <td>[% L.input_tag("requirement_spec.hourly_rate_as_number", SELF.requirement_spec.hourly_rate_as_number, id=id_prefix _ '_hourly_rate_as_number') %]</td>
+      </tr>
+    [% END %]
+    [% cvars = SELF.requirement_spec.cvars_by_config %]
+    [% FOREACH var = cvars %]
+      <tr>
+        <th>[% HTML.escape(var.config.description) %]</th>
+        <td>[% INCLUDE 'common/render_cvar_input.html'
+                        cvar_name_prefix = 'cvars.' %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+[% IF SELF.copy_source %]
+  [% L.hidden_tag('copy_source_id', SELF.copy_source.id) %]
+  <p>
+    [% IF SELF.requirement_spec.is_template %]
+      [% LxERP.t8("The new requirement spec template will be a copy of '#1'.", SELF.copy_source.title) %]
+    [% ELSE %]
+      [% LxERP.t8("The new requirement spec will be a copy of '#1' for customer '#2'.", SELF.copy_source.title, SELF.copy_source.customer.name) %]
+    [% END %]
+  </p>
+[% END %]
+
+<div class="buttons">
+[% IF submit_as != 'post' %]
+  [% L.ajax_submit_tag("controller.pl?action=RequirementSpec/update",  "#" _ id_prefix, LxERP.t8("Save"), id=id_prefix _ '_submit') %]
+  <script type="text/javascript"><!--
+  $(function() {
+    $("#[% id_prefix %] INPUT[type=text]").keydown(function(event) {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        $('#[% id_prefix %]_submit').click();
+        return false;
+      }
+    });
+  });
+--></script>
+[% END %]
+ </div><!-- /.buttons -->
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/requirement_spec/_header.html b/templates/design40_webpages/requirement_spec/_header.html
new file mode 100644
index 000000000..14ab9681a
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_header.html
@@ -0,0 +1,13 @@
+[% USE HTML %]
+[% USE LxERP %]
+
+<h1 id="requirement-spec-header">
+  [% IF SELF.requirement_spec.is_template %]
+    [% HTML.escape(LxERP.t8("Requirement spec template '#1'", SELF.requirement_spec.title)) %]
+  [% ELSE %]
+    [% HTML.escape(SELF.requirement_spec.displayable_name('format', 'with_customer')) %]
+    [% LxERP.t8("for") %]
+    [% HTML.escape(SELF.requirement_spec.customer.displayable_name) %]
+  [% END %]
+</h1>
+
diff --git a/templates/design40_webpages/requirement_spec/_new_project_form.html b/templates/design40_webpages/requirement_spec/_new_project_form.html
new file mode 100644
index 000000000..2a120667b
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_new_project_form.html
@@ -0,0 +1,52 @@
+[% USE LxERP %]
+[% USE L %]
+[% SET id_prefix = "project_link_form" %]
+[% style = "width:300px;" %] 
+
+<form method="post" action="controller.pl" id="[% id_prefix %]"[% UNLESS submit_as == 'post' %] class="edit-project-link-context-menu"[% END %]>
+
+
+[% L.hidden_tag("id", SELF.requirement_spec.id, id=id_prefix _ "_id") %]
+[% L.hidden_tag("project_link_action", "create", id=id_prefix _ "_project_link_action") %]
+
+<table class="tbl-horizontal rs_input_field">
+  <caption>[% LxERP.t8("Edit project link") %]: [% LxERP.t8("Create a new project") %]</caption>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Project Number") %]</th>
+      <td>[% L.input_tag("project.projectnumber", "", id=id_prefix _ "_projectnumber", style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Description") %]</th>
+      <td>[% L.input_tag("project.description", SELF.requirement_spec.title, id=id_prefix _ "_description", style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Project Type") %]</th>
+      <td>[% L.select_tag("project.project_type_id", SELF.project_types, default=SELF.default_project_type.id, title_key="description", id=id_prefix _ "_project_type_id", style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Project Status") %]</th>
+      <td>[% L.select_tag("project.project_status_id", SELF.project_statuses, default=SELF.default_project_status.id, title_key="description", id=id_prefix _ "_project_status_id", style=style) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Customer") %]</th>
+      <td>[% L.select_tag("project.customer_id", SELF.customers, default=SELF.requirement_spec.customer_id, title_key="name", with_empty=1, id=id_prefix _ "_customer_id", style=style) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+ <div class="buttons">
+  [% L.ajax_submit_tag("controller.pl?action=RequirementSpec/update_project_link",  "#" _ id_prefix, LxERP.t8("Save"), id=id_prefix _ '_submit') %]
+  <script type="text/javascript"><!--
+  $(function() {
+    $("#[% id_prefix %] INPUT[type=text]").keydown(function(event) {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        $("#[% id_prefix %]_submit").click();
+        return false;
+      }
+    });
+  });
+--></script>
+</div>
+</form>
diff --git a/templates/design40_webpages/requirement_spec/_project_link_details.html b/templates/design40_webpages/requirement_spec/_project_link_details.html
new file mode 100644
index 000000000..8c061e8c4
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_project_link_details.html
@@ -0,0 +1,27 @@
+[% USE HTML %]
+[% USE LxERP %]
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Project Number") %]:</th>
+      <td>[% HTML.escape(requirement_spec.project.projectnumber) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Description") %]:</th>
+      <td>[% HTML.escape(requirement_spec.project.description) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Customer") %]:</th>
+      <td>[% HTML.escape(requirement_spec.project.customer.name) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Type") %]:</th>
+      <td>[% HTML.escape(requirement_spec.project.project_type.description) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Status") %]:</th>
+      <td>[% HTML.escape(requirement_spec.project.project_status.description) %]</td>
+    </tr>
+  </tbody>
+</table>
diff --git a/templates/design40_webpages/requirement_spec/_project_link_form.html b/templates/design40_webpages/requirement_spec/_project_link_form.html
new file mode 100644
index 000000000..462dc6603
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_project_link_form.html
@@ -0,0 +1,55 @@
+[% USE LxERP %]
+[% USE L %]
+[% SET id_prefix = "project_link_form" %]
+
+<form method="post" action="controller.pl" id="[% id_prefix %]"[% UNLESS submit_as == 'post' %] class="edit-project-link-context-menu"[% END %]>
+
+<h2>[% LxERP.t8("Edit project link") %]</h2>
+
+[% L.hidden_tag("id", SELF.requirement_spec.id, id=id_prefix _ "_id") %]
+
+[% IF !SELF.requirement_spec.project_id %]
+  <p>[% LxERP.t8("This requirement spec is currently not linked to a project.") %]</p>
+[% ELSE %]
+  <p>[% LxERP.t8("This requirement spec is currently linked to the following project:") %]</p>
+  [% INCLUDE "requirement_spec/_project_link_details.html" requirement_spec=SELF.requirement_spec %]
+[% END %]
+
+
+<table class="test">
+  <tr>
+    <td colspan="2"> [% L.radio_button_tag("project_link_action", id=id_prefix _ "_project_link_action_keep", value="keep", label=LxERP.t8("Keep the project link the way it is."), checked="1") %] </td>
+  </tr>
+  [% IF SELF.requirement_spec.project_id %]
+  <tr>
+    <td colspan="2"> [% L.radio_button_tag("project_link_action", id=id_prefix _ "_project_link_action_none", value="none", label=LxERP.t8("Do not link to a project.")) %] </td>
+  </tr>
+  [% END %]
+  <tr>
+    <td colspan="2"> [% L.radio_button_tag("project_link_action", id=id_prefix _ "_project_link_action_new", value="new", label=LxERP.t8("Create a new project and link to it.")) %] </td>
+  </tr>
+  <tr>
+    <td> [% L.radio_button_tag("project_link_action", id=id_prefix _ "_project_link_action_existing", value="existing", label=LxERP.t8("Link to the following project:")) %] </td>
+    <td> [% L.select_tag("new_project_id", SELF.projects, id=id_prefix _ "_new_project_id", title_key="full_description", disabled="true") %] </td>
+  </tr>
+</table>
+
+ <div class="buttons">
+  [% L.ajax_submit_tag("controller.pl?action=RequirementSpec/update_project_link",  "#" _ id_prefix, LxERP.t8("Save"), id=id_prefix _ "_submit") %]
+  <script type="text/javascript"><!--
+  $(function() {
+    $("#[% id_prefix %] INPUT[type=text]").keydown(function(event) {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        $('#[% id_prefix %]_submit').click();
+        return false;
+      }
+    });
+
+    $('[name=project_link_action]').change(function() {
+      $('#[% id_prefix %]_new_project_id').prop('disabled', !$('#[% id_prefix %]_project_link_action_existing').prop('checked'));
+    });
+  });
+--></script>
+ </div>
+</form>
diff --git a/templates/design40_webpages/requirement_spec/_show_basic_settings.html b/templates/design40_webpages/requirement_spec/_show_basic_settings.html
new file mode 100644
index 000000000..b87002860
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_show_basic_settings.html
@@ -0,0 +1,68 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<div id="basic_settings" class="basic-settings-context-menu">
+<div class="wrapper">
+
+<h2>
+[% IF SELF.requirement_spec.is_template %]
+  [% LxERP.t8("Basic Settings for the Requirement Spec Template") %]
+[% ELSE %]
+  [% LxERP.t8("Basic Settings for the Requirement Spec") %]
+[% END %]
+</h2>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Title") %]:</th>
+      <td>[% HTML.escape(SELF.requirement_spec.title) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Requirement Spec Type") %]:</th>
+      <td>[% HTML.escape(SELF.requirement_spec.type.description) %]</td>
+    </tr>
+    [% UNLESS SELF.requirement_spec.is_template %]
+      <tr>
+        <th>[% LxERP.t8("Requirement Spec Status") %]:</th>
+        <td>[% HTML.escape(SELF.requirement_spec.status.description) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Customer") %]:</th>
+        <td>[% HTML.escape(SELF.requirement_spec.customer.name) %]</td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Hourly Rate") %]:</th>
+        <td>[% HTML.escape(SELF.requirement_spec.hourly_rate_as_number) %]</td>
+      </tr>
+      [% cvars = SELF.requirement_spec.cvars_by_config %]
+      [% FOREACH var = cvars %]
+        <tr>
+          <th>[% HTML.escape(var.config.description) %]</th>
+          <td>
+            [%- IF var.config.type == 'htmlfield' -%]
+              [%- L.restricted_html(var.value_as_text) -%]
+            [%- ELSE -%]
+              [%- HTML.escape(var.value_as_text) -%]
+            [%- END -%]
+          </td>
+        </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+</table>
+
+[% UNLESS SELF.requirement_spec.is_template %]
+  <h2>[% LxERP.t8("Project Link") %]</h2>
+
+  [% IF !SELF.requirement_spec.project_id %]
+    <p>[% LxERP.t8("This requirement spec is currently not linked to a project.") %]</p>
+  [% ELSE %]
+    [% INCLUDE 'requirement_spec/_project_link_details.html' requirement_spec=SELF.requirement_spec %]
+  [% END %]
+
+[% END %]
+</div><!-- /.wrapper -->
+
+</div><!-- /#basic_settings -->
diff --git a/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate.html b/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate.html
new file mode 100644
index 000000000..9e6d817f9
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate.html
@@ -0,0 +1,71 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE P %]
+[% DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
+[% SET total_cost = 0 %]
+
+<div id="time_cost_estimate"[% IF initially_hidden %] style="display: none;"[% END %]>
+<div class="wrapper">
+
+[% IF !SELF.requirement_spec.sections.size %]
+  <p class="message message_info">[% LxERP.t8("Neither sections nor function blocks have been created yet.") %]</p>
+
+[% ELSE %]
+
+[% SET at_least_one_function_block = 0 %]
+
+<table class="tbl-list time-cost-estimate time-cost-estimate-context-menu">
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("Function block") %]</th>
+      <th>[% LxERP.t8("Complexity") %]</th>
+      <th>[% LxERP.t8("Risk") %]</th>
+      <th class="right">[% LxERP.t8("Time estimate") %]</th>
+      [% UNLESS SELF.requirement_spec.is_template %]
+       <th class="right">[% LxERP.t8("Price") %]</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+  [% FOREACH section = SELF.requirement_spec.sections_sorted %]
+    <tr class="section">
+      <th colspan="5"><b>[% HTML.escape(section.fb_number) %]: [% HTML.escape(section.title) %]</b></th>
+    </tr>
+    [% IF section.children.size %]
+      [% SET at_least_one_function_block = 1 %]
+      [% FOREACH child = section.children_sorted %]
+        [% INCLUDE 'requirement_spec/_show_time_and_cost_estimate_item.html'
+                    section = section
+                    item    = child
+                    level   = 1 %]
+      [% END %]
+      <tr class="subtotal">
+        <th colspan="3" class="right">[% LxERP.t8("Sum for section") %]:</th>
+        <td class="numeric">[% P.format_man_days(section.time_estimation, 'skip_zero'=1) %]</td>
+        [% UNLESS SELF.requirement_spec.is_template %]
+         [% SET section_cost = section.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor;
+                 total_cost   = total_cost + section_cost %]
+         <!-- PENDENT: hier ist EURO angegeben -->
+         <td class="numeric">[% LxERP.format_amount(section_cost, 2) %] EUR</td>
+        [% END %]
+      </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <th class="right" colspan="3">[% LxERP.t8("Sum for #1", SELF.requirement_spec.type.description) %]:</th>
+      <td class="right">[% P.format_man_days(SELF.requirement_spec.time_estimation) %]</td>
+      [% UNLESS SELF.requirement_spec.is_template %]
+        <!-- PENDENT: hier ist EURO angegeben -->
+        <td class="right" >[% LxERP.format_amount(total_cost, 2) %] EUR</td>
+      [% END %]
+    </tr>
+   </tfoot>
+</table>
+
+[% END %]
+
+</div><!-- /.wrapper -->
+</div><!-- /#time_cost_estimate -->
diff --git a/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate_item.html b/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate_item.html
new file mode 100644
index 000000000..771f6a964
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_show_time_and_cost_estimate_item.html
@@ -0,0 +1,37 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+
+<tr>
+  <td style="padding-left:[% level * 50 %]px;">
+    [% item.fb_number _ ": " _ item.description_as_restricted_html %]
+  </td>
+  <td>[% HTML.escape(item.complexity.description) %]</td>
+  <td>[% HTML.escape(item.risk.description) %]</td>
+  [% IF !item.children.size %]
+    <td class="right">[% P.format_man_days(item.time_estimation, skip_zero=1) %]</td>
+    [% UNLESS SELF.requirement_spec.is_template %]
+      <td class="right">[% LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor, 2) %] EUR</td>
+    [% END %]
+  [% ELSE %]
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  [% END %]
+</tr>
+
+[% IF item.children.size %]
+  [% FOREACH child = item.children_sorted %]
+    [% INCLUDE 'requirement_spec/_show_time_and_cost_estimate_item.html'
+      section = section
+      item    = child
+      level   = level + 1 %]
+  [% END %]
+
+  <tr class="subtotal">
+    <td style="padding-left:[% (level + 1) * 50 %]px;" colspan="3">[% LxERP.t8("Sum for #1", item.fb_number) %]:</td>
+    <td class="right">[% P.format_man_days(item.time_estimation, skip_zero=1) %]</td>
+    [% UNLESS SELF.requirement_spec.is_template %]
+       <td class="right">[% LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor, 2) %] EUR</td>
+    [% END %]
+  </tr>
+[% END %]
diff --git a/templates/design40_webpages/requirement_spec/_version.html b/templates/design40_webpages/requirement_spec/_version.html
new file mode 100644
index 000000000..aa10cdcb4
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/_version.html
@@ -0,0 +1,12 @@
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+[% L.hidden_tag('current_version_id', requirement_spec.version.id) %]
+[% LxERP.t8("Current version") %]:
+[% IF !requirement_spec.version.id %]
+  [% LxERP.t8("Working copy without version") %]
+[% ELSE %]
+  [% LxERP.t8("Version") %] [% HTML.escape(requirement_spec.version.version_number) %]
+  [% LxERP.t8("dated") %] [% HTML.escape(requirement_spec.version.itime.to_kivitendo(precision='minute')) %]
+[% END %]
diff --git a/templates/design40_webpages/requirement_spec/new.html b/templates/design40_webpages/requirement_spec/new.html
new file mode 100644
index 000000000..43fc4abab
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/new.html
@@ -0,0 +1,5 @@
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+[% INCLUDE 'requirement_spec/_form.html' %]
diff --git a/templates/design40_webpages/requirement_spec/report_bottom.html b/templates/design40_webpages/requirement_spec/report_bottom.html
new file mode 100644
index 000000000..5f9631e9b
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/report_bottom.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% L.paginate_controls(models=models) %]
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/requirement_spec/report_top.html b/templates/design40_webpages/requirement_spec/report_top.html
new file mode 100644
index 000000000..e5c701924
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/report_top.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[% PROCESS "requirement_spec/_filter.html" filter=SELF.models.filtered.laundered %]
+<div class="wrapper">
diff --git a/templates/design40_webpages/requirement_spec/select_template_to_paste.html b/templates/design40_webpages/requirement_spec/select_template_to_paste.html
new file mode 100644
index 000000000..4051694b5
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/select_template_to_paste.html
@@ -0,0 +1,86 @@
+[% USE LxERP %]
+[% USE HTML %]
+[% USE L %]
+
+[% BLOCK text_blocks %]
+  [% IF blocks.size %]
+    <li>[% title %]:
+      <ol>
+        [% FOREACH block = blocks %]
+          <li>[% HTML.escape(block.title) %]</li>
+        [% END %]
+      </ol>
+    </li>
+  [% END %]
+[% END %]
+
+[% IF !TEMPLATES.size %]
+  <p>[% LxERP.t8("No requirement spec templates have been created yet.") %]</p>
+
+[% ELSE %]
+<table class="tbl-list">
+  <thead>
+ <tr>
+  <th>[% LxERP.t8("Detail view") %]</th>
+  <th>[% LxERP.t8("Paste template") %]</th>
+  <th>[% LxERP.t8("Title") %]</th>
+  <th>[% LxERP.t8("Type") %]</th>
+  <th>[% LxERP.t8("Last modification") %]</th>
+ </tr>
+ </thead>
+<tbody>
+[% FOREACH template = TEMPLATES %]
+ <tr class="listrow[% loop.count % 2 %]">
+  <td>
+   <a href="#" onclick='$("#select-template-details-row-[% template.id %]").toggle(); $(this).find("span").toggle();'>
+    <span>[+]</span>
+    <span style="display: none;">[-]</span>
+   </a>
+  </td>
+  <td><a href="#" onclick='kivi.requirement_spec.paste_selected_template([% template.id %]);'>[% LxERP.t8("Paste template") %]</a></td>
+  <td>[% HTML.escape(template.title) %]</td>
+  <td>[% HTML.escape(template.type.description) %]</td>
+  <td>[% template.mtime ? template.mtime.to_kivitendo(precision='minute') : template.itime.to_kivitendo(precision='minute') %]</td>
+ </tr>
+
+ <tr style="display: none;" id="select-template-details-row-[% template.id %]">
+  [% SET front    = template.text_blocks_sorted(output_position=0) %]
+  [% SET sections = template.sections_sorted %]
+  [% SET back     = template.text_blocks_sorted(output_position=1) %]
+  [% SET parts    = template.parts_sorted %]
+  <td colspan="4">
+   [% LxERP.t8("What this template contains") %]:<br>
+   <ul>
+    [% PROCESS text_blocks blocks=front title=LxERP.t8("#1 text block(s) front", front.size) %]
+
+    [% IF sections.size %]
+    <li>[% LxERP.t8("#1 section(s)", sections.size) %]:
+     <ol>
+      [% FOREACH section = sections %]
+       <li>[% HTML.escape(section.fb_number) %]: [% HTML.escape(section.title) %]</li>
+      [% END %]
+     </ol>
+    </li>
+    [% END %]
+
+    [% PROCESS text_blocks blocks=back  title=LxERP.t8("#1 text block(s) back",  back.size)  %]
+
+    [% IF parts.size %]
+    <li>[% LxERP.t8("#1 additional part(s)", parts.size) %]:
+     <ol>
+      [% FOREACH part = parts %]
+       <li>[% HTML.escape(part.part.description) %]: [% HTML.escape(part.qty_as_number) %] [% HTML.escape(part.unit.name) %]</li>
+      [% END %]
+     </ol>
+    </li>
+    [% END %]
+   </ul>
+  </td>
+ </tr>
+[% END %]
+</tbody>
+</table>
+
+[% END %]
+
+<p><a href="#" onclick='$("#jqueryui_popup_dialog").dialog("close");' class="button neutral">[% LxERP.t8("Abort") %]</a></p>
diff --git a/templates/design40_webpages/requirement_spec/show.html b/templates/design40_webpages/requirement_spec/show.html
new file mode 100644
index 000000000..0e76f1082
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec/show.html
@@ -0,0 +1,115 @@
+[% USE JSON %]
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+[% USE JavaScript %]
+[% SET sections = SELF.requirement_spec.sections_sorted || [] %]
+
+[% INCLUDE 'common/flash.html' %]
+
+[% INCLUDE 'requirement_spec/_header.html' %]
+
+[% L.hidden_tag('requirement_spec_id', SELF.requirement_spec.id, 'data-is-template'=(SELF.requirement_spec.is_template ? 1 : 0)) %]
+
+<div id="requirement_spec_tabs" class="tabwidget">
+ 
+<ul>
+  <li id="tab-header-function-block"><a href="#function-blocks-tab">[% LxERP.t8("Content") %]</a></li>
+  <li id="tab-header-basic-settings"><a href="controller.pl?action=RequirementSpec/ajax_show_basic_settings&id=[% HTML.url(SELF.requirement_spec.id) %]">[% LxERP.t8("Basic settings") %]</a></li>
+  <li id="tab-header-time-cost-estimate"><a href="controller.pl?action=RequirementSpec/ajax_show_time_and_cost_estimate&id=[% HTML.url(SELF.requirement_spec.id) %]">[% LxERP.t8("Time and price estimate") %]</a></li>
+  <li id="tab-header-additional-parts"><a href="controller.pl?action=RequirementSpecPart/show&requirement_spec_id=[% HTML.url(SELF.requirement_spec.id) %]">[% LxERP.t8("Additional articles") %]</a></li>
+  [% UNLESS SELF.requirement_spec.is_template %] 
+    <li id="tab-header-versions"><a href="controller.pl?action=RequirementSpecVersion/list&requirement_spec_id=[% HTML.url(SELF.requirement_spec.id) %]">[% LxERP.t8("Versions") %]</a></li>
+    <li id="tab-header-quotations-orders"><a href="[% SELF.url_for(controller='RequirementSpecOrder', action='list', requirement_spec_id=SELF.requirement_spec.id) %]">[% LxERP.t8("Quotations and orders") %]</a></li>
+  [% END %] 
+</ul>
+
+<div id="function-blocks-tab" class="section-context-menu">
+  [% UNLESS SELF.requirement_spec.is_template %]
+    <div id="requirement_spec_version">
+      [% INCLUDE 'requirement_spec/_version.html' requirement_spec=SELF.requirement_spec %]
+    </div>
+  [% END %]
+
+  <div id="column-container" class="clearfix">
+    <div id="tree-column">
+     <div id="tree"></div>
+    </div>
+
+    <div id="content-column" class="clearfix">
+      [% L.hidden_tag('current_content_type', SELF.requirement_spec_item.id ? 'section' : '') %]
+      [% L.hidden_tag('current_content_id',   SELF.requirement_spec_item.id) %]
+
+      <div id="column-content">
+        [% IF SELF.requirement_spec_item %]
+          [% INCLUDE 'requirement_spec_item/_section.html' requirement_spec_item=SELF.requirement_spec_item %]
+        [% ELSE %]
+          [% INCLUDE 'requirement_spec_item/_no_section.html' %]
+        [% END %]
+    </div>
+   </div>
+  </div><!-- /#column-container -->
+ </div>
+
+
+
+</div><!-- /#requirement_spec_tabs -->
+
+<script type="text/javascript"><!--
+$(function() {
+  var tree_data = [
+    { data:     [% JSON.json(LxERP.t8("Text blocks front")) %],
+      metadata: { type: "text-blocks-front" },
+      attr:     { id: "tb-front", class: "text-block-context-menu" },
+      children: [
+[% FOREACH tb = SELF.requirement_spec.text_blocks_sorted(output_position=0) %]
+ [% tb.presenter.jstree_data.json %][% IF !loop.last %],[% END %]
+[% END %]
+      ]},
+
+    { data:     [% JSON.json(LxERP.t8("Sections")) %],
+      metadata: { type: "sections" },
+      attr:     { id: "sections", class: "section-context-menu" },
+      children: [
+[% FOREACH section = sections %]
+ [% section.presenter.jstree_data.json %][% IF !loop.last %],[% END %]
+[% END %]
+      ]},
+
+    { data:     [% JSON.json(LxERP.t8("Text blocks back")) %],
+      metadata: { type: "text-blocks-back" },
+      attr:     { id: "tb-back", class: "text-block-context-menu" },
+      children: [
+[% FOREACH tb = SELF.requirement_spec.text_blocks_sorted(output_position=1) %]
+ [% tb.presenter.jstree_data.json %][% IF !loop.last %],[% END %]
+[% END %]
+      ]}
+  ];
+
+  var initially_open = ['tb-front', 'tb-back', 'sections'
+[% FOREACH section = sections %]
+        , "fb-[% section.id %]"
+ [% FOREACH function_block = section.children %]
+        , "fb-[% function_block.id %]"
+ [% END %]
+[% END %]
+  ];
+
+  kivi.requirement_spec.initialize_requirement_spec({
+      initially_open:          initially_open
+    , tree_data:               tree_data
+    , is_template:             [% SELF.requirement_spec.is_template ? 'true' : 'false' %]
+    , html_template_exists:    [% SELF.html_template                ? 'true' : 'false' %]
+[% IF SELF.requirement_spec_item %]
+    , initially_selected_node: '#fb-[% SELF.requirement_spec_item.id %]'
+[% END %]
+    , time_based_units: {
+      [% FOREACH unit = SELF.time_based_units %]
+       [% UNLESS loop.first %], [% END %] "[% JavaScript.escape(unit.name) %]": true
+      [% END %]
+    }
+  });
+});
+
+  --></script>
diff --git a/templates/design40_webpages/requirement_spec_item/_function_block.html b/templates/design40_webpages/requirement_spec_item/_function_block.html
new file mode 100644
index 000000000..8a7c985ca
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_function_block.html
@@ -0,0 +1,25 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+[% USE L %]
+
+<div id="function-block-[%- requirement_spec_item.id -%]" class="function-block[%- IF requirement_spec_item.is_flagged -%] flagged[%- END -%]">
+
+  <div id="function-block-content-[%- requirement_spec_item.id -%]" class="function-block-content function-block-context-menu">
+
+    [% INCLUDE 'requirement_spec_item/_function_block_content_top.html' id_prefix='' %]
+    [% INCLUDE 'requirement_spec_item/_function_block_content_bottom.html' id_prefix='' %]
+
+    <div class="sub-function-block-container" id="sub-function-block-container-[%- requirement_spec_item.id -%]"[%- IF !requirement_spec_item.children.size -%] style="display: none"[%- END -%]>
+      <div class="sub-function-block-header" id="sub-function-block_header_[%- requirement_spec_item.id -%]">
+        [% LxERP.t8("Sub function blocks") -%]
+      </div>
+      [% FOREACH sub_function_block = requirement_spec_item.children_sorted %]
+        [% INCLUDE 'requirement_spec_item/_sub_function_block.html' requirement_spec_item=sub_function_block %]
+      [% END %]
+    </div>
+
+  </div>
+
+</div>
+</div><!-- div ?? -->
diff --git a/templates/design40_webpages/requirement_spec_item/_function_block_content_bottom.html b/templates/design40_webpages/requirement_spec_item/_function_block_content_bottom.html
new file mode 100644
index 000000000..f9040b847
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_function_block_content_bottom.html
@@ -0,0 +1,29 @@
+[% USE LxERP %]
+[% USE P %]
+
+<!-- PENDENT: ggf. DIV-Tabelle anwenden -->
+<div id="[%- id_prefix -%]function-block-content-bottom-[%- requirement_spec_item.id -%]" class="function-block-properties list">
+
+  [% IF requirement_spec_item.dependencies.size %]
+    <div>
+        <span class="label">[% LxERP.t8("Dependencies") %]:</span>
+        <span class="value">[% requirement_spec_item.presenter.requirement_spec_item_dependency_list %]</span>
+    </div>
+  [% END %]
+
+  <div>
+    <span class="label">[% LxERP.t8("Complexity") %]:</span>
+    <span class="value">[% requirement_spec_item.complexity.description %]</span>
+  </div>
+
+  <div>
+    <span class="label">[% LxERP.t8("Risk") %]:</span>
+    <span class="value">[% requirement_spec_item.risk.description %]</span>
+  </div>
+
+  <div>
+    <span class="label">[% LxERP.t8("Time estimate") %]:</span>
+    <span class="value">[% P.format_man_days(requirement_spec_item.time_estimation, skip_zero=1) %]</span>
+  </div>
+
+</div><!-- /.function-block-properties -->
diff --git a/templates/design40_webpages/requirement_spec_item/_function_block_content_top.html b/templates/design40_webpages/requirement_spec_item/_function_block_content_top.html
new file mode 100644
index 000000000..6060e1482
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_function_block_content_top.html
@@ -0,0 +1,7 @@
+[% USE HTML %]
+[% USE L %]
+
+<div id="[%- id_prefix -%]function-block-content-top-[%- requirement_spec_item.id -%]" class="function-block-header">
+  <div class="function-block-number">[% HTML.escape(requirement_spec_item.fb_number) %]</div>
+  <div class="function-block-desc">[% requirement_spec_item.description_as_restricted_html %]</div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_item/_function_block_form.html b/templates/design40_webpages/requirement_spec_item/_function_block_form.html
new file mode 100644
index 000000000..279b4d60c
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_function_block_form.html
@@ -0,0 +1,69 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE P %][% SET style="width: 500px" %]
+
+[% DEFAULT id_base = 'edit_function_block_' _ SELF.item.id %]
+[% SET a_options = '' %]
+[% IF SELF.item.id %]
+  [% SET a_options = "to_show: '#" _ SELF.item.item_type _ "-content-top-" _ SELF.item.id _ "'" %]
+[% END %]
+[% IF SELF.item.item_type == 'sub-function-block' %]
+  [% SET a_options = a_options ? a_options _ ', ' : a_options %]
+  [% SET a_options = a_options _ "to_hide_if_empty: '#sub-function-block-container-" _ SELF.item.parent_id _ "'" %]
+[% END %]
+<form method="post" id="[% id_base %]_form" class="function-block-form">
+ [% L.hidden_tag('form_prefix',                    id_base,      id=id_base _ '_form_prefix') %]
+ [% L.hidden_tag('id',                             SELF.item.id, id=id_base _ '_id') %]
+ [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.item.requirement_spec_id) %]
+ [% L.hidden_tag(id_base _ '.parent_id',           SELF.item.parent_id) %]
+ [% L.hidden_tag(id_base _ '.item_type',           SELF.item.item_type) %]
+ [% IF insert_after %]
+  [% L.hidden_tag(id_base _ '.insert_after',       insert_after) %]
+ [% END %]
+
+<div class="rs-form">
+<table class="tbl-horizontal wi-verywide">
+  <colgroup> <col class="wi-small"><col class="wi-verywide"> </colgroup>
+  <caption>
+    [% IF SELF.item.id %]
+      [% LxERP.t8("Description of #1", SELF.item.fb_number) %]
+    [% ELSIF SELF.item.item_type == 'function-block' %]
+        [% LxERP.t8("Add function block") %]
+    [% ELSE %]
+        [% LxERP.t8("Add sub function block") %]
+    [% END %]
+  </caption>
+  <tbody>
+    <tr>
+      <th class="wi-small-verywide" colspan="2">[% L.textarea_tag(id_base _ '.description_as_restricted_html', SELF.item.description_as_restricted_html, id=id_base _ '_description', rows=8, cols=20, class='texteditor wi-wide') %]</th>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Complexity") %]</th>
+      <td>[% L.select_tag(id_base _ '.complexity_id', SELF.complexities, title_key='description', default=SELF.item.complexity_id, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Risk") %]</th>
+      <td>[% L.select_tag(id_base _ '.risk_id', SELF.risks, title_key='description', default=SELF.item.risk_id, class='wi-wide') %]</td>
+    </tr>
+    [% IF !SELF.item.children.size %]
+      <tr>
+        <th>[% LxERP.t8("Time estimate") %]</th>
+        <td>[% P.man_days_tag(id_base _ '.time_estimation', SELF.item, class='wi-verysmall') %]</td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8("Dependencies") %]</th>
+      <td>[% L.select_tag(id_base _ '.dependencies[]', DEPENDENCIES, default=SELECTED_DEPENDENCIES, with_optgroups=1, multiple=1, size=8 class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+    [% L.ajax_submit_tag('controller.pl?action=RequirementSpecItem/ajax_' _ (SELF.item.id ? 'update' : 'create'), '#' _ id_base _ '_form', LxERP.t8('Save'), id=id_base _ '_submit') %]
+    <a href="#" onclick="kivi.requirement_spec.cancel_edit_item_form('[% id_base %]', { [% a_options %] })" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+</div>
+</div><!-- /.wrapper.rs-fb-form -->
+
+</form>
diff --git a/templates/design40_webpages/requirement_spec_item/_no_section.html b/templates/design40_webpages/requirement_spec_item/_no_section.html
new file mode 100644
index 000000000..aee707b7b
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_no_section.html
@@ -0,0 +1,10 @@
+[% USE LxERP %]
+
+<div class="section-context-menu">
+  <h2>[% LxERP.t8("No sections created yet") %]</h2>
+
+  <p>
+    [% LxERP.t8("No sections have been created so far.") %]<br>
+    [% LxERP.t8("Create one from the context menu by right-clicking on this text.") %]
+  </p>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_item/_section.html b/templates/design40_webpages/requirement_spec_item/_section.html
new file mode 100644
index 000000000..3e941664e
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_section.html
@@ -0,0 +1,20 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<div id="section-[%- requirement_spec_item.id -%]" class="section[%- IF requirement_spec_item.is_flagged -%] flagged[%- END -%]">
+  <div class="section-header section-context-menu" id="section-header-[%- requirement_spec_item.id -%]">
+    [% INCLUDE 'requirement_spec_item/_section_header.html' %]
+  </div>
+
+  <div id="section-list-empty" class="section-context-menu"[%- IF requirement_spec_item.children.size -%] style="display: none"[%- END -%]>
+    [% LxERP.t8("No function blocks have been created yet.") %]
+    [% LxERP.t8("Create one from the context menu by right-clicking on this text.") %]
+  </div>
+
+  <div id="section-list" class="section">
+    [% FOREACH function_block = requirement_spec_item.children_sorted %]
+      [% INCLUDE 'requirement_spec_item/_function_block.html' requirement_spec_item=function_block %]
+    [% END %]
+  </div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_item/_section_form.html b/templates/design40_webpages/requirement_spec_item/_section_form.html
new file mode 100644
index 000000000..a7572d818
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_section_form.html
@@ -0,0 +1,68 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+[% DEFAULT id_base="edit_section" %]
+[% SET style="width: 500px" %]
+
+<form id="[% id_base %]_form">
+
+  [% L.hidden_tag('form_prefix',                    id_base       id=id_base _ '_form_prefix') %]
+  [% L.hidden_tag('id',                             SELF.item.id, id=id_base _ '_id') %]
+  [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.item.requirement_spec_id) %]
+  [% L.hidden_tag(id_base _ '.item_type',           'section') %]
+
+  [% IF insert_after %]
+    [% L.hidden_tag(id_base _ '.insert_after',       insert_after) %]
+  [% END %]
+
+  <table class="tbl-horizontal">
+    [% IF SELF.item.id %]
+      [% SET hidden = '#section-header-' _ SELF.item.id %]
+      <caption>[% LxERP.t8("Edit section #1", SELF.item.fb_number) %]</caption>
+    [% ELSE %]
+      [% SET hidden = '#column-content > *' %]
+      <caption>[% LxERP.t8("Add section") %]</caption>
+    [% END %]
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8("Title") %]:</th>
+        <td>[% L.input_tag(id_base _ '.title', SELF.item.title, style=style) %]</td>
+      </tr>
+    [% IF SELF.predefined_texts.size %]
+      <tr>
+        <th>[% LxERP.t8("Pre-defined Texts") %]:</th>
+        <td>
+          [% L.select_tag(id_base _ '_predefined_text_block', SELF.predefined_texts, title_key='description', style=style) %] <a href="#" onclick='insert_selected_predefined_text()'>[% LxERP.t8("Insert") %]</a>
+        </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% LxERP.t8("Description") %]:</th>
+      <td>
+        [% L.textarea_tag(id_base _ '.description_as_restricted_html', SELF.item.description_as_restricted_html, id=id_base _ '_description', rows=8, cols=80, style=style, class='texteditor') %]<br>
+      </td>
+    </tr>
+    <tr>
+      <td>[% LxERP.t8("Price Factor") %]:</td>
+      <td>
+        [% L.input_tag(id_base _ ".sellprice_factor_as_number", SELF.item.sellprice_factor_as_number, size="6") %]
+      </td>
+    </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>
+        [% L.ajax_submit_tag('controller.pl?action=RequirementSpecItem/ajax_' _ (SELF.item.id ? 'update' : 'create'), '#' _ id_base _ '_form', LxERP.t8('Save')) %]
+        <a href="#" onclick='kivi.requirement_spec.cancel_edit_item_form("[% id_base %]", { to_show: "[% hidden %]" })' class="button">[% LxERP.t8("Cancel") %]</a>
+      </td>
+    </tr>
+
+    </tbody>
+  </table>
+
+  [% IF SELF.predefined_texts.size %]
+    <script type="text/javascript">
+      [% INCLUDE 'requirement_spec_text_block/_predefined_text_inserter.js' title_ctrl_id='_title' text_ctrl_id='_description' %]
+    </script>
+  [% END %]
+</form>
diff --git a/templates/design40_webpages/requirement_spec_item/_section_header.html b/templates/design40_webpages/requirement_spec_item/_section_header.html
new file mode 100644
index 000000000..2088917fe
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_section_header.html
@@ -0,0 +1,31 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<h3>
+  <span class="label">[% HTML.escape(requirement_spec_item.fb_number) %]:</span>
+  [% IF requirement_spec_item.title %]
+    [% HTML.escape(requirement_spec_item.title) %]
+  [% ELSE %]
+    <div class="dimmed-text">
+    [% LxERP.t8("No text has been entered yet.") %]
+    </div>
+  [% END %]
+</h3>
+
+<div class="section-description" id="section-description">
+  <div>
+    [% IF requirement_spec_item.description %]
+      <span class="label section-description-heading">[% LxERP.t8("Preamble") %]:</span><br>
+      [% requirement_spec_item.description_as_restricted_html %]
+    [% ELSE %]
+      <span class="dimmed-text">[% LxERP.t8("No text has been entered yet.") %]</span>
+    [% END %]
+  </div>
+
+  [% IF requirement_spec_item.sellprice_factor %]
+    <div>
+      <span class="label">[% LxERP.t8("Price Factor") %]:</span> [% LxERP.format_amount(requirement_spec_item.sellprice_factor, -2) %]
+    </div>
+  [% END %]
+</div>
diff --git a/templates/design40_webpages/requirement_spec_item/_sub_function_block.html b/templates/design40_webpages/requirement_spec_item/_sub_function_block.html
new file mode 100644
index 000000000..e0a6a2da1
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_item/_sub_function_block.html
@@ -0,0 +1,10 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE P %]
+
+<div id="sub-function-block-[%- requirement_spec_item.id -%]" class="sub-function-block[%- IF requirement_spec_item.is_flagged -%] flagged[%- END -%]">
+  <div id="sub-function-block-content-[%- requirement_spec_item.id -%]" class="sub-function-block-content sub-function-block-context-menu">
+    [% INCLUDE 'requirement_spec_item/_function_block_content_top.html' id_prefix='sub-' %]
+    [% INCLUDE 'requirement_spec_item/_function_block_content_bottom.html' id_prefix='sub-' %]
+  </div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_order/_assignment_form.html b/templates/design40_webpages/requirement_spec_order/_assignment_form.html
new file mode 100644
index 000000000..bfbfb8405
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_order/_assignment_form.html
@@ -0,0 +1,66 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% SET style="width: 400px" %]
+
+<form id="quotations_and_orders_form">
+  <table class="tbl-horizontal">
+    <tbody>
+      [% IF for_new %]
+        <tr>
+          <th>[% LxERP.t8("Record type to create") %]:</th>
+          <td>[% L.select_tag('quotation', [ [ 1, LxERP.t8('Sales quotation') ], [ 0, LxERP.t8('Sales Order') ] ], style=style, no_id=1) %]</td>
+        </tr>
+        <tr>
+          <th>[% LxERP.t8("Customer") %]:</th>
+          <td>[% L.select_tag('customer_id', SELF.all_customers, default=SELF.requirement_spec.customer_id, title_key='name', style=style, no_id=1) %]</td>
+        </tr>
+      [% END %]
+      <tr>
+        <th>[% LxERP.t8("Assign the following article to all sections") %]:</th>
+        <td data-unit="[% HTML.escape(SELF.section_order_part.unit) %]">
+          [% P.part.picker('quotations_and_orders_dummy', SELF.section_order_part.id, id='quotations_and_orders_order_id', style=style) %]
+          [% L.button_tag('kivi.requirement_spec.assign_order_part_id_to_all()', LxERP.t8('Assign article')) %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th class="right">[% LxERP.t8("Number") %]</th>
+        <th>[% LxERP.t8("Title") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+        <th>[% LxERP.t8("Article") %]</th>
+        <th>[% LxERP.t8("Unit") %]</th>
+        <th>[% LxERP.t8("Position type in quotation/order") %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH section = SELF.requirement_spec.sections_sorted %]
+        <tr>
+          [% L.hidden_tag("sections[+].id", section.id, no_id=1) %]
+          <td class="numeric">[% HTML.escape(section.fb_number) %]</td>
+          <td>[% HTML.escape(section.title) %]</td>
+          <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>
+          <td>[% P.part.picker('sections[].order_part_id', section.order_part_id, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %]</td>
+          <td data-unit-column=1>[% HTML.escape(section.order_part.unit) %]</td>
+          <td data-position-type-column=1>
+            [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+              [% LxERP.t8("time and effort based position") %]
+            [% ELSIF section.order_part_id %]
+              [% LxERP.t8("flat-rate position") %]
+            [% END %]
+          </td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <p>
+    [% L.button_tag("kivi.requirement_spec.standard_quotation_order_ajax_call('" _ (for_new ? 'create' : 'save_assignment') _ "')", for_new ? LxERP.t8('Create') : LxERP.t8('Save')) %]
+  </p>
+</form>
diff --git a/templates/design40_webpages/requirement_spec_order/edit_assignment.html b/templates/design40_webpages/requirement_spec_order/edit_assignment.html
new file mode 100644
index 000000000..5cc305e6c
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_order/edit_assignment.html
@@ -0,0 +1,8 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="quotations_and_orders_article_assignment" class="quotations-and-orders-edit-assignment-context-menu">
+  <h2>[% LxERP.t8("Edit assignment of articles to sections") %]</h2>
+
+  [% INCLUDE 'requirement_spec_order/_assignment_form.html' %]
+</div>
diff --git a/templates/design40_webpages/requirement_spec_order/list.html b/templates/design40_webpages/requirement_spec_order/list.html
new file mode 100644
index 000000000..402f3068a
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_order/list.html
@@ -0,0 +1,97 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div id="quotations_and_orders" class="quotations-and-orders-context-menu">
+  <h2>[% LxERP.t8("Assignment of articles to sections") %]</h2>
+
+  [% SET sections = SELF.requirement_spec.sections_sorted %]
+  [% IF !sections.size %]
+    <div>
+      [% LxERP.t8("No sections have been created yet.") %]
+    </div>
+  [% ELSE %]
+    <table id="quotations_and_orders_sections" class="tbl-list">
+      <thead>
+      <tr>
+        <th>[% LxERP.t8("Number") %]</th>
+        <th>[% LxERP.t8("Title") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+        <th>[% LxERP.t8("Article") %]</th>
+        <th>[% LxERP.t8("Unit") %]</th>
+        <th>[% LxERP.t8("Position type in quotation/order") %]</th>
+      </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH section = sections %]
+          <tr>
+          <td>[% HTML.escape(section.fb_number) %]</td>
+          <td>[% HTML.escape(section.title) %]</td>
+          <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>
+          <td>
+            [% IF section.order_part %]
+            [% HTML.escape(section.order_part.partnumber) %] [% HTML.escape(section.order_part.description) %]
+            [% ELSE %]
+            [% LxERP.t8("no article assigned yet") %]
+            [% END %]
+          </td>
+          <td>[% HTML.escape(section.order_part.unit) %]</td>
+          <td>
+            [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+            [% LxERP.t8("time and effort based position") %]
+            [% ELSIF section.order_part_id %]
+            [% LxERP.t8("flat-rate position") %]
+            [% END %]
+          </td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+  [% END %]
+
+  <h2>[% LxERP.t8("Quotations and orders") %]</h2>
+
+  [% SET orders = SELF.requirement_spec.orders_sorted %]
+  [% IF !orders.size %]
+    <div>[% LxERP.t8("No quotations or orders have been created yet.") %]</div>
+  [% ELSE %]
+    <table class="tbl-list">
+      <thead>
+        <tr>
+        <th>[% LxERP.t8("Type") %]</th>
+        <th>[% LxERP.t8("Requirement Spec Version") %]</th>
+        <th class="right">[% LxERP.t8("Record number") %]</th>
+        <th>[% LxERP.t8("Transaction description") %]</th>
+        <th>[% LxERP.t8("Quotation/Order Date") %]</th>
+        <th>[% LxERP.t8("Creation Date") %]</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH rs_order = orders %]
+          <tr class="quotations-and-orders-order-context-menu">
+            [% L.hidden_tag('order_id', rs_order.id, no_id=1) %]
+            <td>[% rs_order.order.type == 'sales_quotation' ? LxERP.t8('Sales quotation') : LxERP.t8('Sales Order') %]</td>
+            <td>
+              [% IF rs_order.version %]
+                [% HTML.escape(rs_order.version.version_number) %]
+              [% ELSE %]
+                [% LxERP.t8("working copy") %]
+              [% END %]
+            </td>
+            <td class="numeric">
+              <a href="controller.pl?action=Order/edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
+              [% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %]
+              </a>
+            </td>
+            <td>[% HTML.escape(rs_order.order.transaction_description) %]</td>
+            <td>[% rs_order.order.transdate.to_kivitendo(precision='day') %]</td>
+            <td>[% rs_order.itime.to_kivitendo(precision='day') %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+  [% END %]
+</div>
diff --git a/templates/design40_webpages/requirement_spec_order/new.html b/templates/design40_webpages/requirement_spec_order/new.html
new file mode 100644
index 000000000..6a146412a
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_order/new.html
@@ -0,0 +1,9 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="quotations_and_orders_new" class="quotations-and-orders-new-context-menu">
+  <h2>[% LxERP.t8("Create new quotation or order") %]</h2>
+
+  [% INCLUDE 'requirement_spec_order/_assignment_form.html'
+              for_new=1 %]
+</div>
diff --git a/templates/design40_webpages/requirement_spec_order/update.html b/templates/design40_webpages/requirement_spec_order/update.html
new file mode 100644
index 000000000..195e1a49f
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_order/update.html
@@ -0,0 +1,64 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% SET style = "width: 400px" %]
+[% SET order = SELF.rs_order.order %]
+
+<div id="quotations_and_orders_update" class="quotations-and-orders-update-context-menu">
+
+  <h2>
+    [% IF order.quotation %]
+      [% LxERP.t8("Update sales quotation #1", order.quonumber) %]
+    [% ELSE %]
+      [% LxERP.t8("Update sales order #1", order.ordnumber) %]
+    [% END %]
+  </h2>
+
+  <form id="quotations_and_orders_form">
+    <h3>[% LxERP.t8("Updating items with sections") %]</h3>
+
+    [% L.hidden_tag("rs_order_id", SELF.rs_order.id, no_id=1) %]
+
+    <table class="tbl-list">
+      <thead>
+        <tr>
+          <th>[% LxERP.t8("Part Number") %]</th>
+          <th>[% LxERP.t8("Description") %]</th>
+          <th class="right">[% LxERP.t8("Qty") %]</th>
+          <th class="right">[% LxERP.t8("Sellprice") %]</th>
+          <th>[% LxERP.t8("Update with section") %]</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH item = orderitems %]
+          <tr>
+            [% L.hidden_tag("orderitems[+].id", item.item.id, no_id=1) %]
+            <td>[% HTML.escape(item.item.part.partnumber) %]</td>
+            <td>[% HTML.escape(item.item.description_as_stripped_html) %]</td>
+            <td class="right">[% LxERP.format_amount(item.item.qty * 1) %] [% HTML.escape(item.item.unit) %]</td>
+            <td class="right">[% LxERP.format_amount(item.item.qty * 1) %] [% HTML.escape(item.item.unit) %]</td>
+            <td>[% L.select_tag('orderitems[].section_id', sections, default=item.section.id, title_sub=\make_section_title, style=style, no_id=1, with_empty=1, empty_title=LxERP.t8('Do not modify this position')) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+
+    <p>
+      [% LxERP.t8("Sections that are not assigned to any of the items above will be added as new positions.") %]
+    </p>
+
+    <h3>[% LxERP.t8("Updating items with additional parts") %]</h3>
+
+    <p>
+      [% LxERP.t8("You cannot modify individual assigments from additional articles to line items.") %]
+      [% LxERP.t8("They will be updated, new ones for additional parts without a line item added automatically.") %]
+    </p>
+
+    <p>
+      [% L.button_tag("kivi.requirement_spec.standard_quotation_order_ajax_call('do_update')", LxERP.t8('Update')) %]
+    </p>
+  </form>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_part/_edit.html b/templates/design40_webpages/requirement_spec_part/_edit.html
new file mode 100644
index 000000000..a03c410af
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_part/_edit.html
@@ -0,0 +1,41 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+[% SET parts = SELF.requirement_spec.parts_sorted %]
+
+<div id="additional_parts_form_container" class="edit-additional-parts-context-menu">
+
+  <h2>[% LxERP.t8("Edit additional articles") %]</h2>
+
+  <div>
+    [% LxERP.t8("Add part") %]:
+    [% P.part.picker('additional_parts_add_part_id', '', style="width: 300px") %]
+    [% L.button_tag('kivi.requirement_spec.add_additional_part()', LxERP.t8('Add part')) %]
+  </div>
+
+  <form method="post" id="edit_additional_parts_form">
+    <div id="edit_additional_parts_list_empty"[% IF parts.size %] style="display: none;"[% END %]>
+      [% LxERP.t8("No articles have been added yet.") %]
+    </div>
+
+    <table id="edit_additional_parts_list" class="tbl-list"[% IF !parts.size %] style="display: none;"[% END %]>
+      <thead>
+        <tr>
+          <th></th>
+          <th>[% LxERP.t8("Part Number") %]</th>
+          <th>[% LxERP.t8("Description") %]</th>
+          <th>[% LxERP.t8("Qty") %]</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH part = parts %]
+          [% INCLUDE 'requirement_spec_part/_part.html' part=part %]
+        [% END %]
+      </tbody>
+    </table>
+
+    [% L.button_tag("kivi.requirement_spec.standard_additional_parts_ajax_call('save')", LxERP.t8("Save")) %]
+  </form>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_part/_part.html b/templates/design40_webpages/requirement_spec_part/_part.html
new file mode 100644
index 000000000..33f76f615
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_part/_part.html
@@ -0,0 +1,17 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<tr class="edit-additional-parts-row-context-menu">
+  <td class="center">
+    [% L.hidden_tag("additional_parts[+].part_id", part.part.id) %]
+    [% L.hidden_tag("additional_parts[].id", part.id) %]
+    [% L.img_tag(src="image/updown.png", alt=LxERP.t8("reorder item"), class="dragdrop") %]
+  </td>
+  <td>[% HTML.escape(part.part.partnumber) %]</td>
+  <td>[% L.input_tag("additional_parts[].description", part.description, size="30") %]</td>
+  <td>
+    [% L.input_tag("additional_parts[].qty_as_number", part.qty_as_number, size="10") %]
+    [% L.select_tag("additional_parts[].unit_id", part.unit.convertible_units, title_key="name", default=part.unit.id) %]
+  </td>
+</tr>
diff --git a/templates/design40_webpages/requirement_spec_part/show.html b/templates/design40_webpages/requirement_spec_part/show.html
new file mode 100644
index 000000000..b00e7e077
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_part/show.html
@@ -0,0 +1,35 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+
+[% SET parts = SELF.requirement_spec.parts_sorted %]
+
+<div id="additional_parts_list_container" class="additional-parts-context-menu"[% IF initially_hidden %] style="display: none;"[% END %]>
+
+  <h2>[% LxERP.t8("Additional articles") %]</h2>
+
+  <div id="additional_parts_list_empty"[% IF parts.size %] style="display: none;"[% END %]>
+    [% LxERP.t8("No articles have been added yet.") %]
+  </div>
+
+  <table id="additional_parts_list"[% IF !parts.size %] style="display:none;"[% END %] class="tbl-list">
+    <thead>
+      <tr>
+        <th>[% LxERP.t8("Part Number") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+        <th>[% LxERP.t8("Qty") %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      [% FOREACH part = parts %]
+        <tr>
+          <td>[% HTML.escape(part.part.partnumber) %]</td>
+          <td>[% HTML.escape(part.description) %]</td>
+          <td class="numeric">[% HTML.escape(part.qty_as_number) %] [% HTML.escape(part.unit.name) %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_text_block/_form.html b/templates/design40_webpages/requirement_spec_text_block/_form.html
new file mode 100644
index 000000000..c53536897
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/_form.html
@@ -0,0 +1,62 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% SET style="width: 500px" %]
+[% DEFAULT id_base = 'edit_text_block_' _ SELF.text_block.id %]
+
+<form method="post" id="[% id_base %]_form">
+
+
+ [% L.hidden_tag('form_prefix',                    id_base,            id=id_base _ '_form_prefix') %]
+ [% L.hidden_tag('id',                             SELF.text_block.id, id=id_base _ '_id') %]
+ [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.text_block.requirement_spec_id) %]
+ [% L.hidden_tag(id_base _ '.output_position',     SELF.text_block.output_position) %]
+ [% IF insert_after %]
+  [% L.hidden_tag(id_base _ '.insert_after',       insert_after) %]
+ [% END %]
+
+ <table>
+ <caption>
+  [% IF SELF.text_block.id %]
+   [% SET title = SELF.text_block.title || '(' _ LxERP.t8('No title yet') _ ')' %]
+   [% LxERP.t8("Edit text block '#1'", title) %]
+  [% ELSE %]
+   [% LxERP.t8("Add text block") %]
+  [% END %]
+ </caption>
+ <tbody>
+  <tr>
+   <th>[% LxERP.t8("Title") %]:</th>
+   <td>[% L.input_tag(id_base _ '.title', SELF.text_block.title, style = style) %]</td>
+  </tr>
+
+ [% IF SELF.predefined_texts.size %]
+  <tr>
+   <th>[% LxERP.t8("Pre-defined Texts") %]:</th>
+   <td>
+    [% L.select_tag(id_base _ '_predefined_text_block', SELF.predefined_texts, title_key='description', style=style) %]
+    <a href="#" onclick="insert_selected_predefined_text()">[% LxERP.t8("Insert") %]</a>
+   </td>
+  </tr>
+ [% END %]
+
+  <tr>
+   <th>[% LxERP.t8("Description") %]:</th>
+   <td>[% L.textarea_tag(id_base _ '.text_as_restricted_html', SELF.text_block.text_as_restricted_html, id = id_base _ '_text', style = style _ '; height: 200px', class='texteditor') %]</td>
+  </tr>
+  </tbody>
+ </table>
+
+ <p>
+  [% L.ajax_submit_tag('controller.pl?action=RequirementSpecTextBlock/ajax_' _ (SELF.text_block.id ? 'update' : 'create'), '#' _ id_base _ '_form', LxERP.t8('Save')) %]
+  <a href="#" onclick="kivi.requirement_spec.cancel_edit_text_block_form('[% id_base %]')">[% LxERP.t8("Cancel") %]</a>
+ </p>
+
+[% IF SELF.predefined_texts.size %]
+ <script type="text/javascript">
+<!--
+[% INCLUDE 'requirement_spec_text_block/_predefined_text_inserter.js' title_ctrl_id='_title' text_ctrl_id='_text' %]
+-->
+ </script>
+[% END %]
+</form>
diff --git a/templates/design40_webpages/requirement_spec_text_block/_picture_form.html b/templates/design40_webpages/requirement_spec_text_block/_picture_form.html
new file mode 100644
index 000000000..5e07d7992
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/_picture_form.html
@@ -0,0 +1,75 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE Base64 %][% SET style="width: 500px" %]
+[% SET id_base = 'edit_text_block_picture_' _ (SELF.picture.id ? SELF.picture.id : 'new') %]
+<form method="post" id="[% id_base %]_form" method="POST" enctype="multipart/form-data">
+ [% L.hidden_tag('form_prefix',                    id_base,         id=id_base _ '_form_prefix') %]
+ [% L.hidden_tag('id',                             SELF.picture.id, no_id=1) %]
+ [% L.hidden_tag(id_base _ '.text_block_id',       SELF.text_block.id) %]
+ [% L.hidden_tag(id_base _ '.requirement_spec_id', SELF.text_block.requirement_spec_id) %]
+
+ <h2>
+  [% IF SELF.picture.id %]
+   [% LxERP.t8("Edit text block picture #1", SELF.picture.number) %]
+  [% ELSE %]
+   [% LxERP.t8("Add picture to text block") %]
+  [% END %]
+ </h2>
+
+ <table>
+[% IF SELF.picture.number %]
+  <tr>
+   <th>[% LxERP.t8("Number") %]:</th>
+   <td>[% HTML.escape(SELF.picture.number) %]</td>
+  </tr>
+[% END %]
+
+  <tr>
+   <th>[% LxERP.t8("Description") %]:</th>
+   <td>[% L.input_tag(id_base _ '.description', SELF.picture.description, style=style) %]</td>
+  </tr>
+
+[% IF SELF.picture.picture_content %]
+  <tr>
+   <th>[% LxERP.t8("File name") %]:</th>
+   <td>[% HTML.escape(SELF.picture.picture_file_name) %]</td>
+  </tr>
+
+  <tr>
+   <th>[% LxERP.t8("MIME type") %]:</th>
+   <td>[% HTML.escape(SELF.picture.picture_content_type) %]</td>
+  </tr>
+
+  <tr>
+   <th>[% LxERP.t8("Dimensions") %]:</th>
+   <td>[% HTML.escape(SELF.picture.picture_width) %]x[% HTML.escape(SELF.picture.picture_height) %]</td>
+  </tr>
+
+  <tr>
+   <th>[% LxERP.t8("Uploaded at") %]:</th>
+   <td>[% HTML.escape(SELF.picture.picture_mtime.to_kivitendo(precision='second')) %]</td>
+  </tr>
+[% END %]
+
+  <tr>
+   <th>[% LxERP.t8("Select file to upload") %]:</th>
+   <td>[% L.input_tag(id_base _ '.picture_content', '', type='file') %]</td>
+  </tr>
+ </table>
+
+ <p>
+  [% L.ajax_submit_tag('controller.pl?action=RequirementSpecTextBlock/ajax_' _ (SELF.picture.id ? 'update' : 'create') _ '_picture', '#' _ id_base _ '_form', LxERP.t8('Save'), no_id=1) %]
+  <a href="#" onclick="$('#jqueryui_popup_dialog').dialog('close');">[% LxERP.t8("Cancel") %]</a>
+ </p>
+
+</form>
+
+[% IF SELF.picture.id %]
+<h2>[% LxERP.t8("Current picture") %]</h2>
+
+<div>
+ <img src="data:[% HTML.escape(SELF.picture.picture_content_type) %];base64,[% SELF.picture.picture_content.encode_base64 %]">
+</div>
+[% END %]
diff --git a/templates/design40_webpages/requirement_spec_text_block/_predefined_text_inserter.js b/templates/design40_webpages/requirement_spec_text_block/_predefined_text_inserter.js
new file mode 100644
index 000000000..290bb72f2
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/_predefined_text_inserter.js
@@ -0,0 +1,30 @@
+[% USE LxERP %]
+[% USE JavaScript %]
+
+function insert_selected_predefined_text() {
+  var data = {
+[%- FOREACH pt = SELF.predefined_texts %]
+    [% JavaScript.escape(pt.id) %]: {
+      title: "[% JavaScript.escape(pt.title) %]",
+      text: "[% JavaScript.escape(pt.text) %]"
+    }[% UNLESS loop.last %],[% END %]
+[% END %]
+  }
+
+  var id = $('#[% id_base %]_predefined_text_block').val();
+  var pt = data[id];
+  if (!pt)
+    return false;
+
+  var title_ctrl = $('#[% id_base %][% title_ctrl_id %]');
+
+  if (   ((pt.title || '') != '')
+      && (   ((title_ctrl.val() || '') == '')
+          || confirm('[%- LxERP.t8("Do you want to overwrite your current title?") %]')))
+    title_ctrl.val(pt.title);
+
+  if ((pt.text || '') != '')
+    $('#[% id_base %][% text_ctrl_id %]').data('ckeditorInstance').setData(pt.text);
+
+  return false;
+}
diff --git a/templates/design40_webpages/requirement_spec_text_block/_text_block.html b/templates/design40_webpages/requirement_spec_text_block/_text_block.html
new file mode 100644
index 000000000..e62874c8c
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/_text_block.html
@@ -0,0 +1,28 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+
+<div id="text-block-[%- HTML.escape(text_block.id) -%]" class="requirement-spec-text-block text-block-context-menu[%- IF text_block.is_flagged -%] flagged[%- END -%]">
+  <h2 class="requirement-spec-text-block-title">
+    [% IF !text_block.title %]
+      <span class="dimmed-text">[% LxERP.t8("No title yet") %]</span>
+    [% END %]
+    [% HTML.escape(text_block.title) %]
+  </h2>
+
+  [% IF !text_block.text %]
+    <div class="dimmed-text">
+      [% LxERP.t8("No text has been entered yet.") %]
+    </div>
+  [% ELSE %]
+    <div class="requirement-spec-text-block-text">
+      [% text_block.text_as_restricted_html %]
+    </div>
+  [% END %]
+
+  <div class="clearfix requirement-spec-text-block-picture-list" id="text-block-[%- HTML.escape(text_block.id) -%]-pictures" [%- UNLESS text_block.pictures.as_list.size -%] style="display: none"[%- END -%]>
+    [% FOREACH picture = text_block.pictures_sorted %]
+      [% INCLUDE 'requirement_spec_text_block/_text_block_picture.html' picture=picture %]
+    [% END %]
+  </div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_text_block/_text_block_picture.html b/templates/design40_webpages/requirement_spec_text_block/_text_block_picture.html
new file mode 100644
index 000000000..eda2b141f
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/_text_block_picture.html
@@ -0,0 +1,12 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE Base64 %]
+[% SET title=LxERP.t8('Picture #1: #2', picture.number, picture.description ? picture.description _ ' (' _ picture.picture_file_name _ ')' : picture.picture_file_name) %]
+<div id="text-block-picture-[% HTML.escape(picture.id) %]" class="requirement-spec-text-block-picture-thumbnail text-block-picture-context-menu">
+ <div class="requirement-spec-text-block-picture-thumbnail-img-container">
+  <img src="data:[% HTML.escape(picture.thumbnail_content_type) %];base64,[% picture.thumbnail_content.encode_base64 %]" alt="[% title %]">
+ </div>
+ <div>
+  [% LxERP.t8('Picture #1: #2', picture.number, picture.description ? picture.description : picture.picture_file_name) %]
+ </div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_text_block/ajax_list.html b/templates/design40_webpages/requirement_spec_text_block/ajax_list.html
new file mode 100644
index 000000000..7e4278c7d
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_text_block/ajax_list.html
@@ -0,0 +1,24 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div id="text-block-list-container">
+  [% L.hidden_tag('text_block_output_position', output_position) %]
+  <h1 class="text-block-context-menu">
+    [% IF output_position == 0 %]
+      [% LxERP.t8("Text blocks front") %]
+    [% ELSE %]
+      [% LxERP.t8("Text blocks back") %]
+    [% END %]
+  </h1>
+
+  <div id="text-block-list-empty" class="text-block-context-menu"[%- IF TEXT_BLOCKS.size -%] style="display: none"[%- END -%]>
+    [% LxERP.t8("No text blocks have been created for this position.") %]
+    [% LxERP.t8("Create one from the context menu by right-clicking on this text.") %]
+  </div>
+
+  <div id="text-block-list">
+    [% FOREACH text_block = TEXT_BLOCKS %]
+      [% INCLUDE 'requirement_spec_text_block/_text_block.html' %]
+    [% END %]
+  </div>
+</div>
diff --git a/templates/design40_webpages/requirement_spec_version/_form.html b/templates/design40_webpages/requirement_spec_version/_form.html
new file mode 100644
index 000000000..cf4802b29
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_version/_form.html
@@ -0,0 +1,42 @@
+[% USE LxERP %]
+[% USE L %]
+
+[% DEFAULT id_prefix = 'edit_version_form'
+            submit_as = 'post'
+%]
+
+<form method="post" action="controller.pl" id="[% id_prefix %]">
+  [% L.hidden_tag("requirement_spec_id", SELF.requirement_spec.id, id=id_prefix _ '_id') %]
+  [% L.hidden_tag("id", SELF.version.id, id=id_prefix _ '_id') %]
+
+  <table class="rs_input_field">
+    <tr>
+      <td>[% LxERP.t8("Version") %]</td>
+      <td>[% SELF.requirement_spec.next_version_number %]</td>
+    </tr>
+    <tr>
+      <td>[% LxERP.t8("Description") %]</td>
+      <td>[% L.textarea_tag("rs_version.description",  SELF.version.description, cols=80, rows=8, id=id_prefix _ '_description') %]</td>
+    </tr>
+    <tr>
+      <td>[% LxERP.t8("Internal comment") %]</td>
+      <td>[% L.textarea_tag("rs_version.comment",  SELF.version.comment, cols=80, rows=8, id=id_prefix _ '_comment') %]</td>
+    </tr>
+  </table>
+
+  <p>
+    [% IF SELF.version.id %]
+      [% L.ajax_submit_tag("controller.pl?action=RequirementSpecVersion/update",  "#" _ id_prefix, LxERP.t8("Save")) %]
+      <a href="[% SELF.url_for(action='list') %]">[%- LxERP.t8("Cancel") %]</a>
+    [% ELSE %]
+      [% L.ajax_submit_tag("controller.pl?action=RequirementSpecVersion/create",  "#" _ id_prefix, LxERP.t8("Save")) %]
+      <a href="#" onclick="$('#jqueryui_popup_dialog').dialog('close');" class="button neutral">[% LxERP.t8("Cancel") %]</a>
+    [% END %]
+  </p>
+</form>
+
+<script type="text/javascript">
+  $(function() {
+    $('#[% id_prefix %]_description').focus();
+  });
+</script>
diff --git a/templates/design40_webpages/requirement_spec_version/list.html b/templates/design40_webpages/requirement_spec_version/list.html
new file mode 100644
index 000000000..726c28e56
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_version/list.html
@@ -0,0 +1,40 @@
+[% USE HTML %]
+[% USE L %]
+[% USE LxERP %]
+[% USE P %]
+
+<table id="versioned_copies_list">
+ <thead>
+  <tr>
+   <th><div class="thingy" style="width: 10px; height: 100%; background-color: red; position: relative; left: -10px;"></div>[% LxERP.t8("Version number") %]</th>
+   <th>[% LxERP.t8("Description") %]</th>
+   <th>[% LxERP.t8("Internal comment") %]</th>
+   <th>[% LxERP.t8("Last modification") %]</th>
+  </tr>
+ </thead>
+
+ <tbody>
+  <tr class="listrow versioned-copy-context-menu">
+   [% IF SELF.requirement_spec.version %]
+    [% L.hidden_tag('versioned_copy_id', SELF.requirement_spec.version.requirement_spec_id, no_id=1) %]
+    <td>[% LxERP.t8("Working copy identical to version number #1", SELF.requirement_spec.version.version_number) %]</td>
+   [% ELSE %]
+    <td>[% LxERP.t8("Working copy without version") %]</td>
+   [% END %]
+   <td>[% LxERP.t8("Working copy; no description yet") %]</td>
+   <td>&nbsp;</td>
+   <td>[% SELF.requirement_spec.mtime.to_kivitendo(precision='minute') %]</td>
+  </tr>
+
+  [% FOREACH versioned_copy = SELF.requirement_spec.versioned_copies_sorted %]
+   [% SET version = versioned_copy.version %]
+   <tr class="listrow versioned-copy-context-menu">
+    [% L.hidden_tag('versioned_copy_id', versioned_copy.id, no_id=1) %]
+    <td>[% HTML.escape(version.version_number) %]</td>
+    <td>[% HTML.escape(P.truncate(version.description)) %]</td>
+    <td>[% HTML.escape(P.truncate(version.comment)) %]</td>
+    <td>[% version.itime.to_kivitendo(precision='minute') %]</td>
+   </tr>
+  [% END %]
+ </tbody>
+</table>
diff --git a/templates/design40_webpages/requirement_spec_version/new.html b/templates/design40_webpages/requirement_spec_version/new.html
new file mode 100644
index 000000000..998742637
--- /dev/null
+++ b/templates/design40_webpages/requirement_spec_version/new.html
@@ -0,0 +1,3 @@
+[% INCLUDE 'common/flash.html' %]
+
+[% INCLUDE 'requirement_spec_version/_form.html' %]
diff --git a/templates/design40_webpages/rp/aging_ar_bottom.html b/templates/design40_webpages/rp/aging_ar_bottom.html
new file mode 100644
index 000000000..4aae59379
--- /dev/null
+++ b/templates/design40_webpages/rp/aging_ar_bottom.html
@@ -0,0 +1,24 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+
+ <input type="hidden" name="todate" value="[% HTML.escape(todate) %]">
+ <input type="hidden" name="fromdate" value="[% HTML.escape(fromdate) %]">
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+ <input type="hidden" name="arap" value="[% HTML.escape(arap) %]">
+ <input type="hidden" name="ct" value="[% HTML.escape(ct) %]">
+ <input type="hidden" name="customer" value="[% HTML.escape(customer) %]">
+ <input type="hidden" name="vendor" value="[% HTML.escape(vendor) %]">
+ <input type="hidden" name="department" value="[% HTML.escape(department) %]">
+ [% L.hidden_tag("formname", "statement") %]
+
+<div id="email_inputs" class="hidden"></div>
+<div id="print_options" class="hidden">
+  [% PRINT_OPTIONS %]
+</div>
+</form>
+
+</form>
+<div id="print_dialog" class="hidden">
+  [% PROCESS 'common/_print_dialog.html' %]
+</div>
diff --git a/templates/design40_webpages/rp/aging_ar_top.html b/templates/design40_webpages/rp/aging_ar_top.html
new file mode 100644
index 000000000..cae322aa9
--- /dev/null
+++ b/templates/design40_webpages/rp/aging_ar_top.html
@@ -0,0 +1 @@
+<form method="post" action="rp.pl" id="form">
diff --git a/templates/design40_webpages/rp/balance_sheet.html b/templates/design40_webpages/rp/balance_sheet.html
new file mode 100644
index 000000000..0ad419a1b
--- /dev/null
+++ b/templates/design40_webpages/rp/balance_sheet.html
@@ -0,0 +1,85 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+
+<!-- PENDENT: Ueberschriften mal genauer anschauen, ebenfalls in Tabellen -->
+<h3>[% company %]
+<br>[% address %] [% 'BALANCE SHEET' | $T8 %]
+<br>[% 'Balance sheet date' | $T8 %]: [% this_period %]
+<br>[% 'Report date' | $T8 %]: [% report_date %]</h3>
+
+<table class="tbl-horizontal test">
+  <tbody>
+    <tr>
+      <th colspan="2"><h3>[% 'ASSETS' | $T8 %]</h3></th>
+      <th>[% this_startdate %] - [% this_period %]</th>
+      <th>[% IF last_period %][% last_startdate %] - [% last_period %][% END %]</th>
+    </tr>
+    [% FOREACH row = A %]
+      <tr>
+        <td class="right">[% row.accno IF l_accno %]</td>
+        [%
+          SET colspan = 1 ;
+          IF row.accno < 1000 ;
+            SET colspan = colspan+1 ;
+            IF last_period      ;
+              SET colspan = colspan+1 ;
+            END ;
+          END ;
+         %]
+        [% IF colspan > 1 %]<td colspan="[% colspan %]">[% ELSE %]<td>[%  END %]
+        [% row.description %]</td>
+        [% IF row.accno > 999 %]
+          <td class="numeric">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+          <td class="numeric">[% IF last_period %][% LxERP.format_amount(row.last, decimalplaces) %][% END %]</td>
+        [% END %]
+      </tr>
+    [% END %]
+    [% IF l_subtotal %]
+      <tr class="subtotal">
+        <th colspan="2">[% 'TOTAL' | $T8 %]</th>
+        <th class="numeric">[% LxERP.format_amount(total.A.this, decimalplaces) %]</th>
+        <th class="numeric">[% IF last_period %][% LxERP.format_amount(total.A.last, decimalplaces) %][% END %]</th>
+      </tr>
+    [% END %]
+    <tr><th colspan="4" class="caption">[% 'LIABILITIES' | $T8 %]</th></tr>
+    [% FOREACH row = L %]
+      <tr>
+        <td class="right">[% row.accno IF l_accno %]</td>
+        <td>[% row.description %]</td>
+        <td class="numeric">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+        <td class="numeric">[% IF last_period %][% LxERP.format_amount(row.last, decimalplaces) %][% END %]</td>
+      </tr>
+    [% END %]
+    [% IF l_subtotal %]
+      <tr class="subtotal">
+        <th colspan="2">[% 'TOTAL' | $T8 %]</th>
+        <td class="numeric">[% LxERP.format_amount(total.L.this, decimalplaces) %]</td>
+        <td class="numeric">[% IF last_period %][% LxERP.format_amount(total.L.last, decimalplaces) %][% END %]</td>
+      </tr>
+    [% END %]
+    <tr><th colspan="4" class="caption">[% 'EQUITY' | $T8 %]</th></tr>
+    [% FOREACH row = Q %]
+      <tr>
+        <td class="right">[% row.accno IF l_accno and row.accno %]</td>
+        <td>[% row.description %]</td>
+        <td class="numeric">[% LxERP.format_amount(row.this, decimalplaces) %]</td>
+        <td class="numeric">[% IF last_period %][% LxERP.format_amount(row.last, decimalplaces) %][% END %]</td>
+      </tr>
+    [% END  %]
+    [% IF l_subtotal %]
+    <tr class="subtotal">
+      <th colspan="2">[% 'TOTAL' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(total.Q.this, decimalplaces) %]</td>
+      <td class="numeric">[% IF last_period %][% LxERP.format_amount(total.Q.last, decimalplaces) %][% END %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <th colspan="2">[% 'TOTAL' | $T8 %] [% 'LIABILITIES' | $T8 %] &amp; [% 'EQUITY' | $T8 %]</th>
+      <td class="numeric">[% LxERP.format_amount(total.this, decimalplaces) %]</td>
+      <td class="numeric">[% IF last_period %][% LxERP.format_amount(total.last, decimalplaces) %][% END %]</td>
+    </tr>
+  </tfoot>
+</table>
diff --git a/templates/design40_webpages/rp/bwa.html b/templates/design40_webpages/rp/bwa.html
new file mode 100644
index 000000000..631179655
--- /dev/null
+++ b/templates/design40_webpages/rp/bwa.html
@@ -0,0 +1,556 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<table>
+<tr class="headline">
+  <td class="left">[% company %]</td>
+  <td class=center colspan="9">
+    <h3>[% title | $T8 %] [% period %]</h3>
+    <h3>[% accounting_method %] - [% report_date %]</h3>
+  </td>
+  <td class="right">Blatt 1</td>
+</tr>
+</tr>
+<tr class="querkopf">
+  <th class="left">&nbsp;</th>
+  <th class="center" colspan="5">Im Betrachtungszeitraum</th>
+  <th class="right" colspan="5">Kumuliert seit Jahresanfang</th>
+</tr>
+<tr>
+  <th class="left">Bezeichnung</th>
+  <th>Wert</th>
+  <th>% Ges.- Leistg.</th>
+  <th>% Ges.- Kosten</th>
+  <th>% Pers.- Kosten</th>
+  <th>Aufschlag</th>
+  <th>Wert</th>
+  <th>% Ges.- Leistg.</th>
+  <th>% Ges.- Kosten</th>
+  <th>% Pers.- Kosten</th>
+  <th class="right">Aufschlag</th>
+</tr>
+<tr class="white">
+  <td class="left right" colspan="11">&nbsp;</td>
+</tr>
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(1)) %]</td>
+ </nobr></td>
+  <td><nobr>[% jetzt1 %]</nobr></td>
+  <td><nobr>[% jetztgl1 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  <td><nobr>[% kumm1 %]</nobr></td>
+  <td><nobr>[% kummgl1 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(2)) %]</nobr></td>
+  <td><nobr>[% jetzt2 %]</nobr></td>
+  <td><nobr>[% jetztgl2 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  <td><nobr>[% kumm2 %]</nobr></td>
+  <td><nobr>[% kummgl2 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(3)) %]</nobr></td>
+  <td><nobr>[% jetzt3 %]</nobr></td>
+  <td><nobr>[% jetztgl3 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td></td>
+  <td><nobr>[% kumm3 %]</nobr></td>
+  <td><nobr>[% kummgl3 %]</nobr></td>
+  <td></td>
+  <td></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Gesamtleistung</nobr></td>
+  <td><nobr>[% jetztgesamtleistung %]</nobr></td>
+  <td><nobr>[% jetztglgesamtleistung %]</nobr></td>
+  <td><nobr>[% jetztgkgesamtleistung %]</nobr></td>
+  <td><nobr>[% jetztpkgesamtleistung %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummgesamtleistung %]</nobr></td>
+  <td><nobr>[% kummglgesamtleistung %]</nobr></td>
+  <td><nobr>[% kummgkgesamtleistung %]</nobr></td>
+  <td><nobr>[% kummpkgesamtleistung %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(4)) %]</nobr></td>
+  <td><nobr>[% jetzt4 %]</nobr></td>
+  <td><nobr>[% jetztgl4 %]</nobr></td>
+  <td><nobr>[% jetztgk4 %]</nobr></td>
+  <td><nobr>[% jetztpk4 %]</nobr></td>
+  <td><nobr>[% jetztauf4 %]</nobr></td>
+  <td><nobr>[% kumm4 %]</nobr></td>
+  <td><nobr>[% kummgl4 %]</nobr></td>
+  <td><nobr>[% kummgk4 %]</nobr></td>
+  <td><nobr>[% kummpk4 %]</nobr></td>
+  <td class="right"><nobr>[% kummauf4 %]</nobr>&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Rohertrag</nobr></td>
+  <td><nobr>[% jetztrohertrag %]</nobr></td>
+  <td><nobr>[% jetztglrohertrag %]</nobr></td>
+  <td><nobr>[% jetztgkrohertrag %]</nobr></td>
+  <td><nobr>[% jetztpkrohertrag %]</nobr></td>
+  <td><nobr>[% jetztaufrohertrag %]</nobr></td>
+  <td><nobr>[% kummrohertrag %]</nobr></td>
+  <td><nobr>[% kummglrohertrag %]</nobr></td>
+  <td><nobr>[% kummgkrohertrag %]</nobr></td>
+  <td><nobr>[% kummpkrohertrag %]</nobr></td>
+  <td class="right"><nobr>[% kummaufrohertrag %]</nobr>&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(5)) %]</nobr></td>
+  <td><nobr>[% jetzt5 %]</nobr></td>
+  <td><nobr>[% jetztgl5 %]</nobr></td>
+  <td><nobr>[% jetztgk5 %]</nobr></td>
+  <td><nobr>[% jetztpk5 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm5 %]</nobr></td>
+  <td><nobr>[% kummgl5 %]</nobr></td>
+  <td><nobr>[% kummgk5 %]</nobr></td>
+  <td><nobr>[% kummpk5 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Betriebl. Rohertrag</nobr></td>
+  <td><nobr>[% jetztbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% jetztglbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% jetztgkbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% jetztpkbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% jetztaufbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% kummbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% kummglbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% kummgkbetriebrohertrag %]</nobr></td>
+  <td><nobr>[% kummpkbetriebrohertrag %]</nobr></td>
+  <td
+class="right"><nobr>[% kummaufbetriebrohertrag %]</nobr>&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left">Kostenarten:</td>
+  <td class="right" colspan="10">&nbsp;</td>
+</tr>
+
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(10)) %]</nobr></td>
+  <td><nobr>[% jetzt10 %]</nobr></td>
+  <td><nobr>[% jetztgl10 %]</nobr></td>
+  <td><nobr>[% jetztgk10 %]</nobr></td>
+  <td><nobr>[% jetztpk10 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm10 %]</nobr></td>
+  <td><nobr>[% kummgl10 %]</nobr></td>
+  <td><nobr>[% kummgk10 %]</nobr></td>
+  <td><nobr>[% kummpk10 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(11)) %]</nobr></td>
+  <td><nobr>[% jetzt11 %]</nobr></td>
+  <td><nobr>[% jetztgl11 %]</nobr></td>
+  <td><nobr>[% jetztgk11 %]</nobr></td>
+  <td><nobr>[% jetztpk11 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm11 %]</nobr></td>
+  <td><nobr>[% kummgl11 %]</nobr></td>
+  <td><nobr>[% kummgk11 %]</nobr></td>
+  <td><nobr>[% kummpk11 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(12)) %]</nobr></td>
+  <td><nobr>[% jetzt12 %]</nobr></td>
+  <td><nobr>[% jetztgl12 %]</nobr></td>
+  <td><nobr>[% jetztgk12 %]</nobr></td>
+  <td><nobr>[% jetztpk12 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm12 %]</nobr></td>
+  <td><nobr>[% kummgl12 %]</nobr></td>
+  <td><nobr>[% kummgk12 %]</nobr></td>
+  <td><nobr>[% kummpk12 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(13)) %]</nobr></td>
+  <td><nobr>[% jetzt13 %]</nobr></td>
+  <td><nobr>[% jetztgl13 %]</nobr></td>
+  <td><nobr>[% jetztgk13 %]</nobr></td>
+  <td><nobr>[% jetztpk13 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm13 %]</nobr></td>
+  <td><nobr>[% kummgl13 %]</nobr></td>
+  <td><nobr>[% kummgk13 %]</nobr></td>
+  <td><nobr>[% kummpk13 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(14)) %]</nobr></td>
+  <td><nobr>[% jetzt14 %]</nobr></td>
+  <td><nobr>[% jetztgl14 %]</nobr></td>
+  <td><nobr>[% jetztgk14 %]</nobr></td>
+  <td><nobr>[% jetztpk14 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm14 %]</nobr></td>
+  <td><nobr>[% kummgl14 %]</nobr></td>
+  <td><nobr>[% kummgk14 %]</nobr></td>
+  <td><nobr>[% kummpk14 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(15)) %]</nobr></td>
+  <td><nobr>[% jetzt15 %]</nobr></td>
+  <td><nobr>[% jetztgl15 %]</nobr></td>
+  <td><nobr>[% jetztgk15 %]</nobr></td>
+  <td><nobr>[% jetztpk15 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm15 %]</nobr></td>
+  <td><nobr>[% kummgl15 %]</nobr></td>
+  <td><nobr>[% kummgk15 %]</nobr></td>
+  <td><nobr>[% kummpk15 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(16)) %]Kosten </nobr></td>
+  <td><nobr>[% jetzt16 %]</nobr></td>
+  <td><nobr>[% jetztgl16 %]</nobr></td>
+  <td><nobr>[% jetztgk16 %]</nobr></td>
+  <td><nobr>[% jetztpk16 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm16 %]</nobr></td>
+  <td><nobr>[% kummgl16 %]</nobr></td>
+  <td><nobr>[% kummgk16 %]</nobr></td>
+  <td><nobr>[% kummpk16 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(17)) %]</nobr></td>
+  <td><nobr>[% jetzt17 %]</nobr></td>
+  <td><nobr>[% jetztgl17 %]</nobr></td>
+  <td><nobr>[% jetztgk17 %]</nobr></td>
+  <td><nobr>[% jetztpk17 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm17 %]</nobr></td>
+  <td><nobr>[% kummgl17 %]</nobr></td>
+  <td><nobr>[% kummgk17 %]</nobr></td>
+  <td><nobr>[% kummpk17 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(18)) %]</nobr></td>
+  <td><nobr>[% jetzt18 %]</nobr></td>
+  <td><nobr>[% jetztgl18 %]</nobr></td>
+  <td><nobr>[% jetztgk18 %]</nobr></td>
+  <td><nobr>[% jetztpk18 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm18 %]</nobr></td>
+  <td><nobr>[% kummgl18 %]</nobr></td>
+  <td><nobr>[% kummgk18 %]</nobr></td>
+  <td><nobr>[% kummpk18 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(20)) %]</nobr></td>
+  <td><nobr>[% jetzt20 %]</nobr></td>
+  <td><nobr>[% jetztgl20 %]</nobr></td>
+  <td><nobr>[% jetztgk20 %]</nobr></td>
+  <td><nobr>[% jetztpk20 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm20 %]</nobr></td>
+  <td><nobr>[% kummgl20 %]</nobr></td>
+  <td><nobr>[% kummgk20 %]</nobr></td>
+  <td><nobr>[% kummpk20 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="grey subtotal">
+  <td class="left"><nobr>Gesamtkosten</nobr></td>
+  <td><nobr>[% jetztgesamtkosten %]</nobr></td>
+  <td><nobr>[% jetztglgesamtkosten %]</nobr></td>
+  <td><nobr>[% jetztgkgesamtkosten %]</nobr></td>
+  <td><nobr>[% jetztpkgesamtkosten %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummgesamtkosten %]</nobr></td>
+  <td><nobr>[% kummglgesamtkosten %]</nobr></td>
+  <td><nobr>[% kummgkgesamtkosten %]</nobr></td>
+  <td><nobr>[% kummpkgesamtkosten %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+<tr class="grey subtotal">
+  <td class="left"><nobr>Betriebsergebnis</nobr></td>
+  <td><nobr>[% jetztbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% jetztglbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% jetztgkbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% jetztpkbetriebsergebnis %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% kummglbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% kummgkbetriebsergebnis %]</nobr></td>
+  <td><nobr>[% kummpkbetriebsergebnis %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(30)) %]</nobr></td>
+  <td><nobr>[% jetzt30 %]</nobr></td>
+  <td><nobr>[% jetztgl30 %]</nobr></td>
+  <td><nobr>[% jetztgk30 %]</nobr></td>
+  <td><nobr>[% jetztpk30 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm30 %]</nobr></td>
+  <td><nobr>[% kummgl30 %]</nobr></td>
+  <td><nobr>[% kummgk30 %]</nobr></td>
+  <td><nobr>[% kummpk30 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(19)) %]</nobr></td>
+  <td><nobr>[% jetzt19 %]</nobr></td>
+  <td><nobr>[% jetztgl19 %]</nobr></td>
+  <td><nobr>[% jetztgk19 %]</nobr></td>
+  <td><nobr>[% jetztpk19 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm19 %]</nobr></td>
+  <td><nobr>[% kummg191 %]</nobr></td>
+  <td><nobr>[% kummgk19 %]</nobr></td>
+  <td><nobr>[% kummpk19 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(31)) %]</nobr></td>
+  <td><nobr>[% jetzt31 %]</nobr></td>
+  <td><nobr>[% jetztgl31 %]</nobr></td>
+  <td><nobr>[% jetztgk31 %]</nobr></td>
+  <td><nobr>[% jetztpk31 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm31 %]</nobr></td>
+  <td><nobr>[% kummgl31 %]</nobr></td>
+  <td><nobr>[% kummgk31 %]</nobr></td>
+  <td><nobr>[% kummpk31 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white subtotal">
+<td class="left"><nobr>Neutraler Aufwand</nobr></td>
+  <td><nobr>[% jetztneutraleraufwand %]</nobr></td>
+  <td><nobr>[% jetztglneutraleraufwand %]</nobr></td>
+  <td><nobr>[% jetztgkneutraleraufwand %]</nobr></td>
+  <td><nobr>[% jetztpkneutraleraufwand %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummneutraleraufwand %]</nobr></td>
+  <td><nobr>[% kummglneutraleraufwand %]</nobr></td>
+  <td><nobr>[% kummgkneutraleraufwand %]</nobr></td>
+  <td><nobr>[% kummpkneutraleraufwand %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(32)) %]</nobr></td>
+  <td><nobr>[% jetzt32 %]</nobr></td>
+  <td><nobr>[% jetztgl32 %]</nobr></td>
+  <td><nobr>[% jetztgk32 %]</nobr></td>
+  <td><nobr>[% jetztpk32 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm32 %]</nobr></td>
+  <td><nobr>[% kummgl32 %]</nobr></td>
+  <td><nobr>[% kummgk32 %]</nobr></td>
+  <td><nobr>[% kummpk32 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(33)) %]</nobr></td>
+  <td><nobr>[% jetzt33 %]</nobr></td>
+  <td><nobr>[% jetztgl33 %]</nobr></td>
+  <td><nobr>[% jetztgk33 %]</nobr></td>
+  <td><nobr>[% jetztpk33 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm33 %]</nobr></td>
+  <td><nobr>[% kummgl33 %]</nobr></td>
+  <td><nobr>[% kummgk33 %]</nobr></td>
+  <td><nobr>[% kummpk33 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(34)) %]</nobr></td>
+  <td><nobr>[% jetzt34 %]</nobr></td>
+  <td><nobr>[% jetztgl34 %]</nobr>
+  <td><nobr>[% jetztgk34 %]</nobr></td>
+  <td><nobr>[% jetztpk34 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm34 %]</nobr></td>
+  <td><nobr>[% kummgl34 %]</nobr></td>
+  <td><nobr>[% kummgk34 %]</nobr></td>
+  <td><nobr>[% kummpk34 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Neutraler Ertrag</nobr></td>
+  <td><nobr>[% jetztneutralerertrag %]</nobr></td>
+  <td><nobr>[% jetztglneutralerertrag %]</nobr></td>
+  <td><nobr>[% jetztgkneutralerertrag %]</nobr></td>
+  <td><nobr>[% jetztpkneutralerertrag %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummneutralerertrag %]</nobr></td>
+  <td><nobr>[% kummglneutralerertrag %]</nobr></td>
+  <td><nobr>[% kummgkneutralerertrag %]</nobr></td>
+  <td><nobr>[% kummpkneutralerertrag %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Ergebnis vor Steuern</nobr></td>
+  <td><nobr>[% jetztergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% jetztglergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% jetztgkergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% jetztpkergebnisvorsteuern %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% kummglergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% kummgkergebnisvorsteuern %]</nobr></td>
+  <td><nobr>[% kummpkergebnisvorsteuern %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey">
+  <td class="left"><nobr>[% HTML.escape(category_names.item(35)) %]</nobr></td>
+  <td><nobr>[% jetzt35 %]</nobr></td>
+  <td><nobr>[% jetztgl35 %]</nobr></td>
+  <td><nobr>[% jetztgk35 %]</nobr></td>
+  <td><nobr>[% jetztpk35 %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kumm35 %]</nobr></td>
+  <td><nobr>[% kummgl35 %]</nobr></td>
+  <td><nobr>[% kummgk35 %]</nobr></td>
+  <td><nobr>[% kummpk35 %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
+
+<tr class="grey subtotal">
+  <td class="left"><nobr>Vorl&auml;ufiges Ergebnis</nobr></td>
+  <td><nobr>[% jetztergebnis %]</nobr></td>
+  <td><nobr>[% jetztglergebnis %]</nobr></td>
+  <td><nobr>[% jetztgkergebnis %]</nobr></td>
+  <td><nobr>[% jetztpkergebnis %]</nobr></td>
+  <td></td>
+  <td><nobr>[% kummergebnis %]</nobr></td>
+  <td><nobr>[% kummglergebnis %]</nobr></td>
+  <td><nobr>[% kummgkergebnis %]</nobr></td>
+  <td><nobr>[% kummpkergebnis %]</nobr></td>
+  <td class="right">&nbsp;</td>
+</tr>
+
+<tr class="white" id=last><td class="left right"
+colspan="11">&nbsp;</td></tr>
+
+<tr>
+  <td colspan=11 class=footer>W&auml;hrung: Euro - FiBu: Kivitendo ERP
+(Version [% version %]) - Formular: 11.01.2007</td>
+</tr>
+
+</table>
+
+<br>
+[% L.button_tag('', LxERP.t8('Show chart list'), id="show_chartlist_button", class="hide") %]
+[% L.button_tag('', LxERP.t8('Hide chart list'), id="hide_chartlist_button", class="hide") %]
+<div id="chartlist">
+<div>[% 'Chart list' | $T8 %]</div>
+<div>
+<table>
+<tr>
+  <th>[% 'Chart'    | $T8 %]</th>
+  <th>[% 'Description'  | $T8 %]</th>
+  <th>[% 'Amount'   | $T8 %]</th>
+  <th>[% 'Category' | $T8 %]</th>
+</tr>
+[% FOREACH key = charts.keys.sort %]
+[% UNLESS charts.$key.pos_bwa %]
+[% NEXT %]
+[% END %]
+<tr>
+ <td>[% charts.$key.accno %]</td>
+ <td>[% charts.$key.description %]</td>
+ <td class="numeric">[%  LxERP.format_amount( charts.$key.amount, 2 ) %]</td>
+ <td>[% HTML.escape(category_names.item(charts.$key.pos_bwa)) %]</td>
+</tr>
+[% END %]
+</table>
+
+</div>
+</div>
+
+[% # L.dump(charts_by_category.item(1)) # Debug Umsatzerlöse %]
+
+<script language="javascript">
+$( document ).ready(function() {
+  $( "#hide_chartlist_button" ).hide();
+  $( "#chartlist" ).hide();
+
+  $( "#show_chartlist_button" ).click(function() {
+    $( "#chartlist" ).toggle();
+    $('html, body').animate({
+        scrollTop: $(this).offset().top
+    }, 500);
+    $(this).hide();
+    $("#hide_chartlist_button").show();
+  });
+
+  $( "#hide_chartlist_button" ).click(function() {
+    $( "#chartlist" ).toggle();
+    $('html, body').animate({
+        scrollTop: $(this).offset().top
+    }, 500);
+    $(this).hide();
+    $("#show_chartlist_button").show();
+  });
+
+})
+
+</script>
diff --git a/templates/design40_webpages/rp/erfolgsrechnung.html b/templates/design40_webpages/rp/erfolgsrechnung.html
new file mode 100644
index 000000000..0f247e5c8
--- /dev/null
+++ b/templates/design40_webpages/rp/erfolgsrechnung.html
@@ -0,0 +1,39 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+<!-- PENDENT: Ueberschriften mal genauer anschauen -->
+<h2>
+  <b>[% company %]<br></b>
+  [% address %]<br>
+  <big>[% 'ERFOLGSRECHNUNG' %]</big><br>
+  <i>[% fromdate %] bis [% todate %]</i>
+</h2>
+
+<table class="tbl-list">
+  <tbody>
+    [% FOREACH category = categories %]
+      <tr>
+        <th class="caption" colspan="3">[% category.name %]</th>
+      </tr>
+      [% FOREACH row = category.accounts %]
+        [% IF row.total != '0.00' %]
+        <tr>
+          <td>[% row.accno %]</td>
+          <td>[% row.description %]</td>
+          <td class="numeric">[% row.total %]</td>
+        </tr>
+        [% END %]
+      [% END %]
+      <tr>
+        <th colspan="2">TOTAL</th>
+        <td class="right">[% category.total %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+  <tfoot>
+    <tr>
+      <th colspan="2">GEWINN/VERLUST</th>
+      <td class="numeric">[% total %]<br><hr noshade size="2"></td>
+    </tr>
+  </tfoot>
+</table>
diff --git a/templates/design40_webpages/rp/html_report_susa.html b/templates/design40_webpages/rp/html_report_susa.html
new file mode 100644
index 000000000..ccf7b99e8
--- /dev/null
+++ b/templates/design40_webpages/rp/html_report_susa.html
@@ -0,0 +1,97 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Summen- und Saldenliste' | $T8 %] [% template_fromto %]</h1>
+
+<script type="text/javascript">
+  <!--
+    function submit_report_generator_form(nextsub) {
+      document.report_generator_form.report_generator_dispatch_to.value = nextsub;
+      document.report_generator_form.submit();
+    }
+  -->
+</script>
+
+[% IF MESSAGE %]
+  <p>[% MESSAGE %]</p>
+[% END %]
+
+[% IF TOP_INFO_TEXT %]
+  <p>[% TOP_INFO_TEXT %]</p>
+[% END %]
+
+[% RAW_TOP_INFO_TEXT %]
+
+[% IF DATA_PRESENT %]
+  <div class="horizontal-scroll-wrapper">
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <th rowspan=2>[% 'Account' | $T8 %]</th>
+        <th rowspan=2>[% 'Description' | $T8 %]</th>
+        <th rowspan=2>[% 'Last Transaction' | $T8 %]</th>
+        <th colspan=2>[% 'Starting Balance' | $T8 %]</th>
+        <th colspan=2>[% 'Sum for' | $T8 %] [% template_fromto %]</th>
+        <th colspan=2>[% 'Sum per' | $T8 %] [% template_to %]</th>
+        <th colspan=2>[% 'Saldo per' | $T8 %] [% template_to %]</th>
+      </tr>
+      <tr>
+        <th>[% 'Assets' | $T8 %]</th>
+        <th>[% 'Equity' | $T8 %]</th>
+        <th>[% 'Debit' | $T8 %]</th>
+        <th>[% 'Credit' | $T8 %]</th>
+        <th>[% 'Debit' | $T8 %]</th>
+        <th>[% 'Credit' | $T8 %]</th>
+        <th>[% 'Debit' | $T8 %]</th>
+        <th>[% 'Credit' | $T8 %]</th>
+      </tr>
+    </thead>
+    <tbody>
+    [% FOREACH row = ROWS %]
+      [% IF row.IS_CONTROL %]
+        [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
+      [% ELSE %]
+        <tr class="listrow[% row.outer_idx_odd %]">
+        [% FOREACH col = row.COLUMNS %]
+          <td[% SET tdclass = '' %]
+             [% IF col.align %][% SET tdclass = "right" %][% END %]
+             [% IF row.BORDER_TOP %][% SET tdclass = "$tdclass top_border" %][% END %]
+             [% IF row.BORDER_BOTTOM %][% SET tdclass = "$tdclass bottom_border" %][% END %]
+             [% IF col.class %][% SET tdclass = "$tdclass $col.class" %][% END %]
+             [% IF tdclass %] class="[% tdclass %]"[% END %]>
+            [% IF col.raw_data %][% col.raw_data %][% END %]
+            [% USE iterator(col.CELL_ROWS) %][% FOREACH cell_row = iterator %]
+            [% IF cell_row.data != '' %]
+              [% IF cell_row.link %]<a href="[% cell_row.link %]">[% END %]
+                [% cell_row.data %]
+                [% IF cell_row.link %]</a>[% END %]
+              [% END %]
+              [% UNLESS iterator.last %]<br>[% END %]
+            [% END %]
+          </td>
+        [% END %]
+        </tr>
+      [% END %]
+    [% END %]
+    </tbody>
+  </table>
+  </div><!-- /.horizontal-scroll-wrapper -->
+[% ELSE %]
+  <p class="message message_hint">[% 'No data was found.' | $T8 %]</p>
+[% END %]
+
+[% RAW_BOTTOM_INFO_TEXT %]
+
+[% IF BOTTOM_INFO_TEXT %]
+  <p>[% BOTTOM_INFO_TEXT %]</p>
+[% END %]
+
+[% IF SHOW_EXPORT_BUTTONS %]
+  <form action="[% HTML.escape(script) %]" name="report_generator_form" id="report_generator_form" method="post">
+    [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">[% END %]
+    <input type="hidden" name="report_generator_nextsub" value="[% HTML.escape(EXPORT_NEXTSUB) %]">
+    <input type="hidden" name="report_generator_variable_list" value="[% HTML.escape(EXPORT_VARIABLE_LIST) %]">
+    <input type="hidden" name="report_generator_dispatch_to" value="">
+    <input type="hidden" name="action" value="report_generator_dispatcher">
+  </form>
+[% END %]
diff --git a/templates/design40_webpages/rp/income_statement.html b/templates/design40_webpages/rp/income_statement.html
new file mode 100644
index 000000000..5baa7de0f
--- /dev/null
+++ b/templates/design40_webpages/rp/income_statement.html
@@ -0,0 +1,152 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[% L.button_tag('', LxERP.t8('Hide buttons'), id="hide_buttons_button", class="hide") %]
+[% L.button_tag('', LxERP.t8('Show charts'),  id="show_charts_button",  class="hide") %]
+[% L.button_tag('', LxERP.t8('Hide charts'),  id="hide_charts_button",  class="hide") %]
+<!-- PENDENT: Ueberschriften mal genauer anschauen -->
+<h3 id="show_buttons"> [% title %]</h3>
+<h3>[% period %]<br><big>[% accounting_method %]<br></big><i>[% report_date %]</i></h3>
+
+<table id="eurtable" class="tbl-list">
+<tbody>
+<tr>
+  <th colspan="2" class="caption">A. Betriebseinnahmen</td>
+</tr>
+
+[% FOREACH i IN categories_income %]
+  <tr class="category" data-catid="cat[% i %]">
+    <td>[% HTML.escape(category_names.item(i)) %]</td>
+    <td class="numeric">[% eur_amounts.item(i) %]</td>
+  </tr>
+  [% FOREACH chart = charts_by_category.item(i).list %]
+  <tr class="chartrow cat[% i %]">
+    <td class="chartname">[% chart.accno %] [% chart.description %]</td>
+    <td class="numeric"> [% LxERP.format_amount(chart.amount,2) %] </td>
+  </tr>
+  [% END %]
+[% END %]
+
+
+<tr class="inrows-footer">
+  <th><b>Summe Einnahmen</b></th>
+  <th class="numeric">[% sumeura %]</td>
+</tr>
+<tr class="spacer">
+  <td colspan="2">&nbsp;</td>
+</tr>
+<tr>
+  <th class="caption" colspan="2">B. Betriebsausgaben</th>
+</tr>
+
+[% FOREACH i IN categories_expense %]
+  <tr class="category" data-catid="cat[% i %]">
+    <td>[% HTML.escape(category_names.item(i)) %]</td>
+    <td class="numeric">[% eur_amounts.item(i) %]</td>
+  </tr>
+  [% FOREACH chart = charts_by_category.item(i).list %]
+  <tr class="chartrow cat[% i %]">
+    <td class="chartname">[% chart.accno %] [% chart.description %]</td>
+    <td class="numeric"> [% LxERP.format_amount(chart.amount,2) %] </td>
+  </tr>
+  [% END %]
+[% END %]
+</tbody>
+<tfoot>
+<tr>
+  <th><b>Summe Ausgaben</b></th>
+  <td>[% sumeurb %]</td>
+</tr>
+<tr>
+  <td>GEWINN / VERLUST</td>
+  <td>[% guvsumme %]<br><hr noshade size=2></td>
+</tr>
+</tfoot>
+</table>
+
+
+<br>
+
+[% L.button_tag('', LxERP.t8('Show chart list'), id="show_chartlist_button", class="hide") %]
+[% L.button_tag('', LxERP.t8('Hide chart list'), id="hide_chartlist_button", class="hide") %]
+
+<div id="chartlist">
+<div>[% 'Chart list' | $T8 %]</div>
+<div>
+<table>
+<tr>
+  <th>[% 'Chart'    | $T8 %]</th>
+  <th>[% 'Amount'   | $T8 %]</th>
+  <th>[% 'Category' | $T8 %]</th>
+</tr>
+[% FOREACH key = charts.keys.sort %]
+[% UNLESS charts.$key.pos_eur %]
+[% NEXT %]
+[% END %]
+<tr>
+ <td>[% charts.$key.accno %]</td>
+ <td class="numeric">[%  LxERP.format_amount( charts.$key.amount, 2 ) %]</td>
+ <td>[% HTML.escape(category_names.item(charts.$key.pos_eur)) %]</td>
+</tr>
+[% END %]
+</table>
+</div>
+</div>
+</body>
+</html>
+
+<script language="javascript">
+$( document ).ready(function() {
+  $( ".chartrow" ).hide();
+  $( "#hide_charts_button" ).hide();
+  $( "#hide_chartlist_button" ).hide();
+  $( "#chartlist" ).hide();
+  $( '.category:even' ).css('background-color','#f0f0f0');
+  $( '.category:odd' ).css('background-color','#f8f8f8');
+
+  $( "#show_chartlist_button" ).click(function() {
+    $( "#chartlist" ).toggle();
+    $('html, body').animate({
+        scrollTop: $(this).offset().top
+    }, 500);
+    $(this).hide();
+    $("#hide_chartlist_button").show();
+  });
+
+  $( "#hide_chartlist_button" ).click(function() {
+    $( "#chartlist" ).toggle();
+    $('html, body').animate({
+        scrollTop: $(this).offset().top
+    }, 500);
+    $(this).hide();
+    $("#show_chartlist_button").show();
+  });
+
+  $( "#hide_buttons_button" ).click(function() {
+    $( ".hide" ).hide();
+  });
+
+  $( "#show_buttons" ).click(function() {
+    $( ".hide" ).show();
+  });
+
+  $( "#show_charts_button" ).click(function() {
+    $( ".chartrow" ).show();
+    $(this).hide();
+    $("#hide_charts_button").show();
+  });
+
+  $( "#hide_charts_button" ).click(function() {
+    $( ".chartrow" ).hide();
+    $(this).hide();
+    $("#show_charts_button").show();
+  });
+
+  $( ".category" ).click(function() {
+    var chartrow_class = $(this).attr('data-catid');
+    $('.' + chartrow_class).toggle();
+  });
+})
+
+</script>
diff --git a/templates/design40_webpages/rp/print_options.html b/templates/design40_webpages/rp/print_options.html
new file mode 100644
index 000000000..8bf6e3a6e
--- /dev/null
+++ b/templates/design40_webpages/rp/print_options.html
@@ -0,0 +1,38 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+<table>
+  <tbody>
+   <tr>
+     <td>
+       <select name="type" id="type">
+         <option value="statement" [% pd.statement %]>[% 'Statement' | $T8 %]</option>
+       </select>
+     </td>
+     <td>
+       <select name="format" id="format">
+         <option value="html" [% df.html %]>[% 'HTML' | $T8 %]</option>
+         <option value="pdf" [% df.pdf %]>[% 'PDF' | $T8 %]</option>
+         <option value="postscript" [% df.postscript %]>[% 'Postscript' | $T8 %]</option>
+       </select>
+     </td>
+     <td>
+       <select name="media">
+         [% IF is_email %]
+           <option value="attachment" [% sm.attachment %]>[% 'Attachment' | $T8 %]</option>
+           <option value="inline" [% sm.inline %]>[% 'In-line' | $T8 %]</option>
+         [% ELSE %]
+           <option value="screen" [% op.screen %]>[% 'Screen' | $T8 %]</option>
+         [% IF MYCONFIG.printer && LXCONFIG.print_templates.latex %]
+           <option value="printer" [% op.printer %]>[% 'Printer' | $T8 %]</option>
+         [% END %] [% END %]
+       </select>
+     </td>
+     [% IF MYCONFIG.printer && LXCONFIG.print_templates.latex && !is_email %]
+       <td>[% 'Copies' | $T8 %]<input type="text" name="copies" size="2" value="[% copies %]"></td>
+     [% END %]
+   </tr>
+  </tbody>
+</table>
+
diff --git a/templates/design40_webpages/rp/report.html b/templates/design40_webpages/rp/report.html
new file mode 100644
index 000000000..ce69bfb04
--- /dev/null
+++ b/templates/design40_webpages/rp/report.html
@@ -0,0 +1,370 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+[% BLOCK customized_report %]
+  <tr>
+    <th class="caption" colspan="4">[% 'Periods' | $T8 %]</th>
+  </tr>
+  <tr>
+    <th colspan="4"><h4><input name="reporttype" type="radio" value="custom" checked> [% 'Customized Report' | $T8 %]</h4></th>
+  </tr>
+  <tr>
+    <th></th>
+    <th>[% 'Year' | $T8 %]</th>
+    <td colspan="2"><input type="text" name="year" title="[% 'YYYY' | $T8 %]" value="[% year %]" class="initial_focus wi-smallest" oninput='set_from_to(duetyp.value, this.value)'></td>
+  </tr>
+  <tr>
+    <th></th>
+    <th>[% 'Yearly'    | $T8 %]</th>
+    <th>[% 'Quarterly' | $T8 %]</th>
+    <th>[% 'Monthly'   | $T8 %]</th>
+  </tr>
+  <tr>
+    <th></th>
+    <td><input name="duetyp" type="radio" value="13" checked onchange='set_from_to(this.value, year.value)'>[% 'Yearly' | $T8 %]</td>
+    <td>
+      <input name="duetyp" type="radio" value="A" onchange='set_from_to(this.value, year.value)'>[% 'Quarter' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="B" onchange='set_from_to(this.value, year.value)'>2. [% 'Quarter' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="C" onchange='set_from_to(this.value, year.value)'>3. [% 'Quarter' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="D" onchange='set_from_to(this.value, year.value)'>4. [% 'Quarter' | $T8 %]<br>
+    </td>
+    <td>
+      <input name="duetyp" type="radio" value="1" onchange='set_from_to(this.value, year.value)'>[% 'January' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="2" onchange='set_from_to(this.value, year.value)'>[% 'February' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="3" onchange='set_from_to(this.value, year.value)'>[% 'March' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="4" onchange='set_from_to(this.value, year.value)'>[% 'April' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="5" onchange='set_from_to(this.value, year.value)'>[% 'May' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="6" onchange='set_from_to(this.value, year.value)'>[% 'June' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="7" onchange='set_from_to(this.value, year.value)'>[% 'July' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="8" onchange='set_from_to(this.value, year.value)'>[% 'August' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="9" onchange='set_from_to(this.value, year.value)'>[% 'September' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="10" onchange='set_from_to(this.value, year.value)'>[% 'October' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="11" onchange='set_from_to(this.value, year.value)'>[% 'November' | $T8 %]<br>
+      <input name="duetyp" type="radio" value="12" onchange='set_from_to(this.value, year.value)'>[% 'December' | $T8 %]<br>
+    </td>
+  </tr>
+  <tr>
+    <th colspan="4"><h4><input name="reporttype" type="radio" value="free"> [% 'Free report period' | $T8 %]</h4></th>
+  </tr>
+  <tr>
+    <th></th>
+    <td colspan="3">
+      [% 'From' | $T8 %] [% L.date_tag('fromdate', fromdate) %]
+      [% 'Bis' | $T8 %] [% L.date_tag('todate', todate)  %]
+    </td>
+  </tr>
+[% END   #BLOCK customized_report %]
+[% BLOCK cash_or_accrual %]
+  <tr>
+    <th colspan="2">[% 'Method' | $T8 %]</th>
+    <td colspan="2">
+      [% L.radio_button_tag('method', value='accrual', checked=(INSTANCE_CONF.get_accounting_method=='accrual'), label=LxERP.t8('Accrual')) %]<br>
+      [% L.radio_button_tag('method', value='cash', checked=(INSTANCE_CONF.get_accounting_method=='cash'), label=LxERP.t8('cash')) %]
+    </td>
+  </tr>
+[% END   #BLOCK cash_or_accrual %]
+[% BLOCK customer %]
+  <tr>
+    <th colspan="2">[% 'Customer' | $T8 %]</th>
+    <td colspan="2" class="wi-lightwide">[% P.customer_vendor.picker('customer_id', '', type='customer') %]</td>
+  </tr>
+[% END   #BLOCK customer %]
+[% BLOCK projectnumber %]
+  <tr>
+    <th colspan="2">[% 'Project' | $T8 %]</th>
+    <td colspan="2">[% P.project.picker('project_id', '', active="both", valid="both", class='wi-lightwide') %]</td>
+  </tr>
+[% END   #BLOCK projectnumber %]
+
+
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+
+<form method="post" action='[% script %]' id="form">
+<input type="hidden" name="title" value="[% title %]">
+
+<table class="tbl-horizontal">
+  <colgroup><col class="wi-smallest"><col class="wi-mediumsmall"><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+
+  [% IF selectdepartment %]
+    <tr>
+      <th colspan="2">[% 'Department' | $T8 %]</th>
+      <td colspan="2"><select name="department" class="wi-lightwide">[% selectdepartment %]</select></td>
+    </tr>
+  [% END #IF selectdepartment %]
+  [% IF is_projects %]
+    [% INCLUDE projectnumber %]
+    <tr>
+      <th colspan="2">
+        <input type="hidden" name="nextsub" value="generate_projects">
+        [% 'Period' | $T8 %] [% 'from' | $T8 %]
+      </th>
+      <td colspan="2">
+        [% L.date_tag('fromdate', fromdate, class='initial_focus') %]
+        [% 'Bis' | $T8 %]
+        [% L.date_tag('todate') %]
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Include in Report' | $T8 %]</th>
+      <td colspan="2">
+        <input name="l_heading" type="checkbox" value="Y"> [% 'Heading' | $T8 %]<br>
+        <input name="l_subtotal" type="checkbox" value="Y"> [% 'Subtotal' | $T8 %]
+      </td>
+    </tr>
+  [% END   #IF is_projects %]
+  [% IF is_income_statement %]
+    [% PROCESS projectnumber %]
+    <input type="hidden" name="nextsub" value="generate_income_statement">
+    [% PROCESS cash_or_accrual %]
+    <tr>
+      <th colspan="2">[% 'Include in Report' | $T8 %]</th>
+      <td colspan="2"><input name="l_cb" type="checkbox" value="Y"> [% 'CB Transactions' | $T8 %]</td>
+    </tr>
+    [% PROCESS customized_report %]
+  [% END   #IF is_income_statement %]
+  [% IF is_bwa %]
+    [% PROCESS projectnumber %]
+    <input type="hidden" name="nextsub" value="generate_bwa">
+    [% PROCESS cash_or_accrual %]
+    <tr>
+      <th colspan="2">[% 'Decimalplaces' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="decimalplaces" class="wi-verysmall" value="2"></td>
+    </tr>
+    [% PROCESS customized_report %]
+  [% END   #IF is_bwa %]
+  [% IF is_erfolgsrechnung %]
+    <input type="hidden" name="nextsub" value="generate_erfolgsrechnung">
+    [% PROCESS customized_report %]
+  [% END   #IF is_erfolgsrechnung %]
+  [% IF is_balance_sheet %]
+    <input type="hidden" name="nextsub" value="generate_balance_sheet">
+    <tr>
+      <th colspan="2">[% 'as at' | $T8 %]</th>
+      <td class="wi-date"> [% L.date_tag('asofdate', asofdate, class="initial_focus") %]</td>
+      <td>
+        <input name="l_cb" type="checkbox" value="Y"> [% 'CB Transactions' | $T8 %]<br>
+        <input name="l_ob" type="checkbox" value="Y"> [% 'only OB Transactions' | $T8 %]
+      </td>
+    </tr>
+    </tr>
+      <th colspan="2">[% 'Compare to' | $T8 %]</th>
+      <td class="wi-date">[% L.date_tag('compareasofdate', compareasofdate) %]</td>
+      <td>
+        <input name="l_cb_compared" type="checkbox" value="Y"> [% 'CB Transactions' | $T8 %]<br>
+        <input name="l_ob_compared" type="checkbox" value="Y"> [% 'only OB Transactions' | $T8 %]
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Decimalplaces' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="decimalplaces" class="wi-verysmall" value="2"></td>
+    </tr>
+    [% PROCESS cash_or_accrual %]
+    <tr>
+      <th colspan="2">[% 'Include in Report' | $T8 %]</th>
+      <td colspan="2">
+        <input name="l_heading" type="checkbox" value="Y"> [% 'Heading' | $T8 %]<br>
+        <input name="l_subtotal" type="checkbox" value="Y"> [% 'Subtotal' | $T8 %]<br>
+        <input name="l_accno" type="checkbox" value="Y"> [% 'Account Number' | $T8 %]
+      </td>
+    </tr>
+  [% END   #IF is_balance_sheet %]
+  [% IF is_trial_balance %]
+    [% PROCESS customer %]
+    [% PROCESS projectnumber %]
+    <input type="hidden" name="nextsub" value="generate_trial_balance">
+    <tr>
+      <th colspan="2">[% 'All Accounts' | $T8 %]</th>
+      <td colspan="2"><input name="all_accounts" type="checkbox" value="1"></td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Decimalplaces' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="decimalplaces" class="wi-verysmall" value="2"></td>
+    </tr>
+    [% PROCESS cash_or_accrual %]
+    [% PROCESS customized_report %]
+  [% END   #IF is_trial_balance %]
+  [% IF is_aging %]
+    <tr>
+      <th colspan="2">[% label %]</th>
+      <td colspan="2" class="wi-lightwide">[% vc %]</td>
+    </tr>
+    <tr>
+      <th colspan="4">
+        <input name="reporttype" type="radio" value="custom" checked>
+        [% 'Reference day' | $T8 %] ([% 'Due Date' | $T8 %][% ', if set' | $T8 %])
+      </th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Review of Aging list' | $T8 %]</th>
+      <td colspan="2">
+        <select name="review_of_aging_list">
+          <option></option>
+          <option>0-30</option>
+          <option>30-60</option>
+          <option>60-90</option>
+          <option>90-120</option>
+          <option>&gt; 120</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+    <th></th>
+    <th>... [% 'for date' | $T8 %]</th>
+    <td colspan="2">[% L.date_tag('fordate', today) %]</td>
+    </tr>
+    <tr>
+      <th colspan="4">
+        <input name="reporttype" type="radio" value="free">
+        [% 'Free report period' | $T8 %] ([% 'Invoice Date' | $T8 %])
+      </th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>[% 'Period' | $T8 %] [% 'from' | $T8 %]</th>
+      <td colspan="2">
+        [% L.date_tag('fromdate', fromdate) %]
+        [% 'Bis' | $T8 %] [% L.date_tag('todate') %]
+
+        <input type="hidden" name="type" value="statement">
+        [% L.hidden_tag("format", format) %]
+        <input type="hidden" name="media" value="screen">
+        <input type="hidden" name="nextsub" value='[% nextsub %]'>
+        <input type="hidden" name="action" value='[% nextsub %]'>
+      </td>
+    </tr>
+  [% END   #IF is_aging %]
+  [% IF is_payments %]
+    <input type="hidden" name="nextsub" value="list_payments">
+    <tr>
+      <th colspan="2">[% 'Account' | $T8 %]</th>
+      <td colspan="2">
+        <select name="account">[% selection %]</select>
+        <input type="hidden" name="paymentaccounts" value="[% paymentaccounts %]">
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Reference' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="reference" class="initial_focus wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Source' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="source" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Memo' | $T8 %]</th>
+      <td colspan="2"><input type="text" name="memo" class="wi-lightwide"></td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Period' | $T8 %] [% 'From' | $T8 %]</th>
+      <td colspan="2">
+        [% L.date_tag('fromdate', fromdate) %]
+        [% 'Bis' | $T8 %]
+        [% L.date_tag('todate') %]
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2"></td>
+      <td colspan="2">
+        <input type="checkbox" style="checkbox" name="fx_transaction" value="1" checked>
+        [% 'Include Exchangerate Difference' | $T8 %]
+        <input type="hidden" name="db" value='[% db %]'>
+        <input type="hidden" name="sort" value="transdate">
+      </td>
+    </tr>
+  [% END   #IF is_payments %]
+  [% IF 0 # is_taxreport %]
+    <tr>
+      <td colspan="2">
+        <input type="hidden" name="nextsub" value="generate_tax_report">
+        [% 'Period' | $T8 %] [% 'from' | $T8 %]
+      </td>
+      <td colspan="2" class="wi-date">[% L.date_tag('fromdate', fromdate) %] [% 'Bis' | $T8 %] [% L.date_tag('todate', todate) %]</td>
+    </tr>
+    <tr>
+      <th colspan="2">[% 'Report for' | $T8 %]</th>
+      <td colspan="2">
+        [% FOREACH row IN taxaccounts %]
+          <input name="accno" type="radio" value='[% row.accno %]' [% loop.first ? 'checked' : '' %]> [% row.description %]
+          <input name="[% row.accno %]_description" type="hidden" value="[% row.description %]">
+          <input name="[% row.accno %]_rate" type="hidden" value="[% row.rate %]">
+        [% END %]
+        <input type="hidden" name="db" value='[% db %]'>
+        <input type="hidden" name="sort" value="transdate">
+      </td>
+    </tr>
+    [% PROCESS cash_or_accrual %]
+  [% END %]
+</table>
+
+[% IF 0 # is_taxreport - formerly at end of table above in a separate row %]
+<div class="form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <table class="tbl-horizontal">
+    <tr>
+      <td><input name="l_id" type="checkbox" value="Y"></td>
+      <td>[% 'ID' | $T8 %]</td>
+      <td><input name="l_invnumber" type="checkbox" value="Y" checked></td>
+      <td>[% 'Invoice' | $T8 %]</td>
+      <td><input name="l_transdate" type="checkbox" value="Y" checked></td>
+      <td>[% 'Date' | $T8 %]</td>
+    </tr>
+    <tr>
+      <td><input name="l_name" type="checkbox" value="Y" checked></td>
+      <td>
+        [% LxERP.t8('Customer') IF db == 'ar' %]
+        [% LxERP.t8('Vendor')   IF db == 'ap' %]
+     </td>
+      <td><input name="l_netamount" type="checkbox" value="Y" checked></td>
+      <td>[% 'Amount' | $T8 %]</td>
+      <td><input name="l_tax" type="checkbox" value="Y" checked></td>
+      <td>[% 'Tax' | $T8 %]</td>
+      <td><input name="l_amount" type="checkbox" value="Y"></td>
+      <td>[% 'Total' | $T8 %]</td>
+    </tr>
+    <tr>
+      <td><input name="l_subtotal" type="checkbox" value="Y"></td>
+      <td>[% 'Subtotal' | $T8 %]</td>
+    </tr>
+  </table>
+</div><!-- /.form-addition -->
+[% END %]
+
+</form>
+</div><!-- /.wrapper -->
+
+
+<script type="text/javascript">
+function set_from_to(duetyp, year) {
+  var date = {
+    1:  [ 1,  1, 1,  31 ],
+    2:  [ 2,  1, 2,  new Date(year, 1, 29).getMonth() == 1 ? 29 : 28 ],
+    3:  [ 3,  1, 3,  31 ],
+    4:  [ 4,  1, 4,  30 ],
+    5:  [ 5,  1, 5,  31 ],
+    6:  [ 6,  1, 6,  30 ],
+    7:  [ 7,  1, 7,  31 ],
+    8:  [ 8,  1, 8,  31 ],
+    9:  [ 9,  1, 9,  30 ],
+    10: [ 10, 1, 10, 31 ],
+    11: [ 11, 1, 11, 30 ],
+    12: [ 12, 1, 12, 31 ],
+    13: [  1, 1, 12, 31 ],
+    'A': [ 1,  1, 3,  31 ],
+    'B': [ 4,  1, 6,  30 ],
+    'C': [ 7,  1, 9,  30 ],
+    'D': [ 10, 1, 12, 31 ]
+  }[duetyp];
+
+  $('#fromdate').val(kivi.format_date(new Date(year, date[0]-1, date[1])));
+  $('#todate').val(kivi.format_date(new Date(year, date[2]-1, date[3])));
+
+  return true;
+}
+</script>
diff --git a/templates/design40_webpages/rp/tax_report.html b/templates/design40_webpages/rp/tax_report.html
new file mode 100644
index 000000000..c617c67c8
--- /dev/null
+++ b/templates/design40_webpages/rp/tax_report.html
@@ -0,0 +1,62 @@
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE T8 %]
+
+[% BLOCK sub_total %]
+  <tr class='[% class %]'>
+  [% FOREACH col IN column_index %]
+    <td class='[% class %] numeric'>
+      [% SWITCH col %]
+      [% CASE [ 'netamount', 'tax', 'amount' ] %][% LxERP.format_amount(row.$col, 2) %]
+      [% CASE %]&nbsp;[% END %]
+    </td>
+  [% END %]
+  </tr>
+[% END %]
+
+<!-- PENDENT: Ueberpruefen, wie sich H1 an dieser Stelle auswirkt -->
+<h1>[% title %] [% SET tax_report__accno_title = accno _ '_description' %][% GET $tax_report__accno_title %]</h1>
+
+<p>
+ [% FOREACH option IN options %][% option %][% '<br>' UNLESS loop.last %][% END %]
+</p>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      [% FOREACH col IN column_index %]
+      <th>
+       [% IF column_sorted.$col %]<a href="[% sort_base %]&sort=[% col %]">[% END %]
+       [% column_header.$col %]
+       [% IF column_sorted.$col %]</a>[% END %]
+      </th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row IN DATA %]
+      [% IF row.subtotal %]
+        [% PROCESS sub_total class='listsubtotal' %]
+      [% ELSIF row.total %]
+        [% PROCESS sub_total class='listtotal' %]
+      [% ELSE %]
+        <tr>
+          [% FOREACH col IN column_index %]
+            <td[% IF row.$col.numeric %] class="numeric"[% END %]>
+              [% IF row.$col.link %]<a href="[% row.$col.link %]">[% END %]
+              [% IF row.$col.numeric %]
+                [% LxERP.format_amount(row.$col.data, 2) | html %]
+              [% ELSE %]
+                [% row.$col.data | html %]
+              [% END %]
+              [% IF row.$col.link %]</a>[% END %]
+            </td>
+          [% END %]
+        </tr>
+      [% END %]
+    [% END %]
+  </tbody>
+</table>
+
+
diff --git a/templates/design40_webpages/sepa/bank_transfer_add.html b/templates/design40_webpages/sepa/bank_transfer_add.html
new file mode 100644
index 000000000..84ddc18cc
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_add.html
@@ -0,0 +1,171 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+[% IF vc == 'vendor' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
+[% ELSE %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
+
+<h1>[% title %]</h1>
+
+<form action="sepa.pl" method="post" id="form">
+<div class="wrapper">
+
+<div class="select-item control-panel">
+  <span class="label above">
+  [% IF is_vendor %]
+    [% 'Please select the source bank account for the transfers:' | $T8 %]
+  [% ELSE %]
+    [% 'Please select the destination bank account for the collections:' | $T8 %]
+  [% END %]</span><br>
+  [% L.select_tag('bank_account',
+      BANK_ACCOUNTS,
+      title_key='displayable_name',
+      with_empty=0,
+      class='wi-wide',
+  ) %]
+</div><!-- /.select-item -->
+</div><!-- /.wrapper -->
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th><input type="checkbox" id="select_all"></th>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'SEPA Transfer Amount' | $T8 %]</th>
+      <th>[% 'Open amount' | $T8 %]</th>
+      <th>[% 'Invoice Date' | $T8 %]</th>
+      <th>[% 'Due Date' | $T8 %]</th>
+      <th>[% 'Purpose' | $T8 %]</th>
+      <th>[% 'Bank transfer amount' | $T8 %]</th>
+      <th>[% 'Payment type' | $T8 %]</th>
+      <th>[% 'Skonto information' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH invoice = INVOICES %]
+      <tr[% IF (!invoice.vc_bank_info_ok && invoice.checked) || invoice.is_sepa_blocked %] class="listrow_error"[% END %]>
+        <td>
+          <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(invoice.id) %]">
+          <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]">
+          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %]">
+          <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.skonto_amount, 2) %]">
+          [% IF invoice.vc_bank_info_ok && !invoice.is_sepa_blocked %]
+            [% L.checkbox_tag("ids[]", value=invoice.id, checked=invoice.checked) %]
+          [% END %]
+        </td>
+        <td>
+         [% IF loop.first || (previous_vcname != invoice.vcname) %]
+          <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(invoice.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
+           [% GET HTML.escape(invoice.vcname);
+               SET previous_vcname = invoice.vcname;
+               IF !invoice.vc_bank_info_ok;
+                 GET ' <sup>(1)</sup>';
+                 SET show_vc_bank_info_footnote = '1';
+               END;
+               IF !invoice.checked;
+                 GET ' <sup>(2)</sup>';
+                 SET show_vc_bank_info_footnote = '1';
+               END; -%]
+          </a>
+         [% END %]
+        </td>
+        <td>
+         <a href="[% IF invoice.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
+          [%- GET HTML.escape(invoice.invnumber);
+              IF invoice.is_sepa_blocked;
+                GET ' <sup>(*)</sup>';
+                SET show_is_sepa_blocked_footnote = '1';
+              END;
+          -%]
+         </a>
+        </td>
+        <td>[% LxERP.format_amount(invoice.invoice_amount, 2) %]</td>
+        <td>[% LxERP.format_amount(invoice.transfer_amount * -1, 2) %]</td>
+        <td>[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %] </td>
+        <td>[% invoice.transdate %]</td>
+        <td>[% invoice.duedate %]</td>
+        <td>
+          [% IF INSTANCE_CONF.get_sepa_reference_add_vc_vc_id %]
+            [% SET reference = invoice.reference_prefix _ invoice.invnumber _ invoice.reference_prefix_vc _ invoice.vc_vc_id %]
+          [% ELSE %]
+            [% SET reference = invoice.reference_prefix _ invoice.invnumber %]
+          [% END %]
+         <input type="text" name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="30">
+        </td>
+        <td>
+          <input type="text" id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %]" style="text-align: right" size="12">
+        </td>
+        <td>
+          [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
+        </td>
+        <td[% IF invoice.within_skonto_period %] class="highlight"[% END %]>
+          [% IF invoice.skonto_amount %]
+            [% LxERP.format_amount(invoice.percent_skonto, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount, 2) %] € bis [% invoice.skonto_date %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+[% IF show_vc_bank_info_footnote || show_is_sepa_blocked_footnote %]
+<div class="long-desc wrapper">
+  [% IF show_vc_bank_info_footnote %]
+  <p><sup>(1)</sup>
+    [% IF is_vendor %]
+      [% 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN and the BIC." | $T8 %]
+    [% ELSE %]
+      [% 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
+    [% END %]
+  </p>
+  <p><sup>(2)</sup>
+    [%- IF is_vendor %]
+     [% LxERP.t8("This invoice is marked for direct debit and cannot be selected for a SEPA Export.") %]
+    [%- ELSE %]
+     [% LxERP.t8("This invoice is not marked for direct debit and cannot be selected for a SEPA Export.") %]
+    [%- END %]
+  </p>
+  [%- END %]
+  [%- IF show_is_sepa_blocked_footnote %]
+  <p>
+    <sup>(*)</sup>
+    [%- 'For this invoice the bank tranfer via SEPA was blocked manually.' | $T8 %]
+  </p>
+  [%- END %]
+</div><!-- /.long-desc -->
+[% END %]
+
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+</form>
+
+<script type="text/javascript">
+  <!--
+    $(function() {
+      $("#select_all").checkall('INPUT[name="ids[]"]');
+    });
+  -->
+
+$( ".type_target" ).change(function() {
+  type_id = $(this).attr('id');
+  var id = type_id.match(/\d*$/);
+  // alert("found id " + id);
+  if ( $(this).val() == "without_skonto" ) {
+      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
+  } else if ( $(this).val() == "with_skonto_pt" ) {
+            $('#' + id).val( $('#amount_less_skonto_' + id).val() );
+  }
+});
+
+</script>
diff --git a/templates/design40_webpages/sepa/bank_transfer_create.html b/templates/design40_webpages/sepa/bank_transfer_create.html
new file mode 100644
index 000000000..77111052f
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_create.html
@@ -0,0 +1,145 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
+[% IF vc == 'vendor' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
+[% ELSE %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
+
+<h1>[% title %]</h1>
+
+[% IF error_message %]
+  <div class="message message_error">[% error_message %]</div>
+[% END %]
+
+<form action="sepa.pl" method="post" id="form">
+<p>1.
+  [% IF is_vendor %]
+    [% 'Please select the source bank account for the transfers:' | $T8 %]
+  [% ELSE %]
+    [% 'Please select the destination bank account for the collections:' | $T8 %]
+  [% END %]
+  <br>
+  [% L.select_tag('bank_account',
+     BANK_ACCOUNTS,
+     title_key='displayable_name',
+     default=bank_account.id,
+     with_empty=0,
+     style='width:450px',
+  ) %]
+</p>
+
+<p>2.
+[% IF is_vendor %]
+  [% 'Please Check the bank information for each vendor:' | $T8 %]
+[% ELSE %]
+  [% 'Please Check the bank information for each customer:' | $T8 %]
+[% END %]
+</p>
+
+<table>
+  <thead>
+    <tr>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      <th>[% 'Bank' | $T8 %]</th>
+      [% IF vc == 'customer' %]
+        <th>[% 'Mandator ID' | $T8 %]</th>
+        <th>[% 'Mandate Date of Signature' | $T8 %]</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH vbi = VC_BANK_INFO %]
+      <tr class="listrow[% loop.count % 1 %]">
+        <td> <input type="hidden" name="vc_bank_info[+].id" value="[% HTML.escape(vbi.id) %]"> <input type="hidden" name="vc_bank_info[].name" value="[% HTML.escape(vbi.name) %]"> [% HTML.escape(vbi.name) %] </td>
+        <td><input type="text" name="vc_bank_info[].iban" size="34" value="[% HTML.escape(vbi.iban.substr(0, 34)) %]" maxlength="34"></td>
+        <td><input type="text" name="vc_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic.substr(0, 20)) %]" maxlength="20"></td>
+        <td><input type="text" name="vc_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
+        [% IF vc == 'customer' %]
+          <td><input type="text" name="vc_bank_info[].mandator_id" size="30" value="[% HTML.escape(vbi.mandator_id) %]"></td>
+          <td>[% L.date_tag("vc_bank_info[].mandate_date_of_signature", vbi.mandate_date_of_signature) %]</td>
+        [% END %]
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<p>3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]</p>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Open amount' | $T8 %]</th>
+      <th>[% 'Purpose' | $T8 %]</th>
+      <th>[% IF is_vendor %][% 'Bank transfer amount' | $T8 %][% ELSE %][% LxERP.t8('Bank collection amount') %][% END %]</th>
+      <th>[% LxERP.t8('Payment type') %]</th>
+      <th>[% LxERP.t8('Skonto information') %]</th>
+      <th>[% 'Execution date' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH bank_transfer = BANK_TRANSFERS %]
+      <tr>
+        <td>
+          <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(bank_transfer.id) %]">
+          <input type="hidden" name="bank_transfers[].vc_id" value="[% HTML.escape(bank_transfer.vc_id) %]">
+          <input type="hidden" name="bank_transfers[].selected" value="1">
+          <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.amount_less_skonto, 2) %]">
+          <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.skonto_amount, 2) %]">
+          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.open_amount, 2) %]">
+          [% IF loop.first || (previous_vcname != bank_transfer.vcname) %]
+            <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(bank_transfer.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
+              [% GET HTML.escape(bank_transfer.vcname); SET previous_vcname = bank_transfer.vcname; %]
+            </a>
+          [% END %]
+        </td>
+        <td><a href="[% IF bank_transfer.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]"> [% HTML.escape(bank_transfer.invnumber) %]</a></td>
+        <td>[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
+        <td>[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
+        <td><input type="text" name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference.substr(0, 140)) %]" size="40" maxlength="140"></td>
+        <td><input type="text" id="[% loop.count %]" name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right" size="12"></td>
+        <td>[% L.select_tag('bank_transfers[].payment_type', bank_transfer.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]</td>
+        <td[% IF bank_transfer.within_skonto_period %] style="background-color:LightGreen"[% END %]>
+          [% IF bank_transfer.skonto_amount %]
+            [% LxERP.format_amount(bank_transfer.percent_skonto, 2) %] % = [% LxERP.format_amount(bank_transfer.skonto_amount, 2) %] € [% 'until' | $T8 %] [% bank_transfer.skonto_date %]
+          [% END %]
+        </td>
+        <td>[% L.date_tag('bank_transfers[].requested_execution_date', bank_transfer.recommended_execution_date) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<p>[% 'Sum open amount' | $T8 %]: [% LxERP.format_amount(total_trans, -2) %]</p>
+
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="confirmation" value="1">
+
+</form>
+
+<script type="text/javascript">
+  $( ".type_target" ).change(function() {
+    type_id = $(this).attr('id');
+    var id = type_id.match(/\d*$/);
+    // alert("found id " + id);
+    if ( $(this).val() == "without_skonto" ) {
+        $('#' + id).val( $('#invoice_open_amount_' + id).val() );
+    } else if ( $(this).val() == "difference_as_skonto" ) {
+        $('#' + id).val( $('#invoice_open_amount_' + id).val() );
+    } else if ( $(this).val() == "with_skonto_pt" ) {
+              $('#' + id).val( $('#amount_less_skonto_' + id).val() );
+    }
+  });
+</script>
diff --git a/templates/design40_webpages/sepa/bank_transfer_created.html b/templates/design40_webpages/sepa/bank_transfer_created.html
new file mode 100644
index 000000000..bda56f36c
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_created.html
@@ -0,0 +1,38 @@
+[%- USE T8 %]
+[% USE HTML %][%- USE LxERP -%][%- USE L -%]
+<h1>[% title %]</h1>
+
+<p>
+  [% 'The SEPA export has been created.' | $T8 %]
+</p>
+
+<h2>[% LxERP.t8('Download SEPA XML export file') %]</h2>
+
+<form method="post" action="sepa.pl">
+  <p>
+    [% LxERP.t8("SEPA XML version") %]:
+    [% L.select_tag('sepa_xml_version', sepa_versions.versions, title_key='description', selected=sepa_versions.default) %]
+  </p>
+
+  <p>
+    [% L.hidden_tag('action', 'bank_transfer_download_sepa_xml') %]
+    [% L.hidden_tag('id', id) %]
+    [% L.hidden_tag('vc', vc) %]
+
+    [% L.submit_tag('dummy', LxERP.t8('Download')) %]
+  </p>
+</form>
+[%- IF INSTANCE_CONF.get_doc_storage %]
+
+<h2>[% LxERP.t8('Download Documents for exported bookings') %]</h2>
+
+<p>
+  <a href="sepa.pl?action=bank_transfer_download_sepa_docs&id=[% HTML.url(id) %]&vc=[% HTML.url(vc) %]"> [% 'Download Documents for exported bookings' | $T8 %]</a>
+</p>
+[% END %]
+
+<h2>[% LxERP.t8('List open SEPA exports') %]</h2>
+
+<p>
+  <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1&vc=[% HTML.url(vc) %]">[% 'List open SEPA exports' | $T8 %]</a>
+</p>
diff --git a/templates/design40_webpages/sepa/bank_transfer_edit.html b/templates/design40_webpages/sepa/bank_transfer_edit.html
new file mode 100644
index 000000000..87fbb622a
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_edit.html
@@ -0,0 +1,110 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% IF vc == 'vendor' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
+[% ELSE %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
+
+<h1>[% title %]: [% HTML.escape(export.ids.join(', ')) %]</h1>
+
+<form action="sepa.pl" method="post" id="form">
+
+<table>
+  <thead>
+    <tr>
+      <th><input type="checkbox" id="select_all"></th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      [% IF is_vendor %]
+      <th colspan="2">[% 'Source bank account' | $T8 %]</th>
+      <th colspan="2">[% 'Target bank account' | $T8 %]</th>
+      [% ELSE %]
+      <th colspan="2">[% 'Target bank account' | $T8 %]</th>
+      <th colspan="2">[% 'Source bank account' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Skonto amount' | $T8 %]</th>
+      <th>[% 'Payment type' | $T8 %]</th>
+      [% IF vc == 'customer' %]
+      <th>[% 'Mandator ID' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Reference' | $T8 %]</th>
+      <th>[% 'Requested execution date' | $T8 %]</th>
+      <th>[% 'Execution date' | $T8 %]</th>
+    </tr>
+    <tr>
+      <th colspan="3">&nbsp;</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      [% IF show_post_payments_button %]
+      <th colspan="[% IF vc == 'customer' %]6[% ELSE %]5[% END %]">&nbsp;</th>
+      <th> [% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %] </th>
+      [% ELSE %]
+      <th colspan="[% IF vc == 'customer' %]7[% ELSE %]6[% END %]">&nbsp;</th>
+      [% END %]
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH item = export.items %]
+      <tr>
+        <td>
+          [% IF (show_post_payments_button && !item.executed) || (!show_post_payments_button && item.executed) %]
+            [% L.hidden_tag("items[+].id", item.id) %]
+            [% L.hidden_tag("items[].sepa_export_id", item.sepa_export_id) %]
+            [% L.checkbox_tag("ids[]", value=item.id) %]
+          [% END %]
+        </td>
+        <td><a href="[% IF item.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&type=invoice&id=[% IF is_vendor %][% HTML.url(item.ap_id) %][% ELSE %][% HTML.url(item.ar_id) %][% END %]">[% HTML.escape(item.invnumber) %]</a></td>
+        <td>[% HTML.escape(item.vc_name) %]</td>
+        <td>[% HTML.escape(item.our_iban) %]</td>
+        <td>[% HTML.escape(item.our_bic) %]</td>
+        <td>[% HTML.escape(item.vc_iban) %]</td>
+        <td>[% HTML.escape(item.vc_bic) %]</td>
+        <td>[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
+        <td>[% HTML.escape(LxERP.format_amount(item.skonto_amount, 2)) %]</td>
+        <td>[% item.payment_type | $T8 %]</td>
+        [% IF vc == 'customer' %]
+          <td>[% HTML.escape(item.mandator_id) %]</td>
+        [% END %]
+        <td>[% HTML.escape(item.reference) %]</td>
+        <td>[% HTML.escape(item.requested_execution_date) %]</td>
+        <td>
+          [% IF item.executed %]
+            [% HTML.escape(item.execution_date) %]
+          [% ELSIF item.export_closed %]
+            [% 'not executed' | $T8 %]
+          [% ELSE %]
+            [% L.date_tag('items[].execution_date', item.requested_execution_date || current_date) %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<script type="text/javascript">
+  function set_all_execution_date_fields(input) {
+    var new_date = $(input).val();
+    $('INPUT[name="items[].execution_date"]').each(function() {
+      $(this).val(new_date);
+    });
+  }
+
+  $(function() {
+    $("#select_all").checkall('INPUT[name="ids[]"]');
+  });
+</script>
+
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+
+</form>
diff --git a/templates/design40_webpages/sepa/bank_transfer_list_bottom.html b/templates/design40_webpages/sepa/bank_transfer_list_bottom.html
new file mode 100644
index 000000000..e4959bac7
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_list_bottom.html
@@ -0,0 +1,15 @@
+[% USE T8 %]
+[% USE HTML %]
+
+[% IF show_buttons %]
+ <input type="hidden" name="mode" value="multi">
+ <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+
+<script type="text/javascript"><!--
+  $(function() {
+    $("#select_all").checkall('INPUT[name="ids[]"]');
+  });
+--></script>
+[% END %]
+
+</form>
diff --git a/templates/design40_webpages/sepa/bank_transfer_list_top.html b/templates/design40_webpages/sepa/bank_transfer_list_top.html
new file mode 100644
index 000000000..92b7f6ec3
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_list_top.html
@@ -0,0 +1,9 @@
+[%- USE LxERP -%][%- USE L -%]
+<form action="sepa.pl" method="post" id="form">
+  [% IF show_buttons %]
+
+    <p>
+      [% LxERP.t8("SEPA XML version") %]:
+      [% L.select_tag('sepa_xml_version', sepa_versions.versions, title_key='description', selected=sepa_versions.default) %]
+    </p>
+  [% END %]
diff --git a/templates/design40_webpages/sepa/bank_transfer_search.html b/templates/design40_webpages/sepa/bank_transfer_search.html
new file mode 100644
index 000000000..8b63c70df
--- /dev/null
+++ b/templates/design40_webpages/sepa/bank_transfer_search.html
@@ -0,0 +1,57 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+<h1>[% title %]</h1>
+
+<form action="sepa.pl" method="post" id="form">
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% IF vc == 'vendor' %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <td><input type="text" name="f_vc" class="initial_focus">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Invoice number' | $T8 %]</th>
+      <td><input type="text" name="f_invnumber">
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("SEPA message ID") %]</th>
+      <td>[% L.input_tag("f_message_id") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Export date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_export_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_export_date_to') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Requested execution date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_requested_execution_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_requested_execution_date_to') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Execution date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_execution_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_execution_date_to') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="form-addition control-panel">
+  <h4>[% 'Include in Report' | $T8 %]</h4>
+  <div class="list">
+    <div><input type="checkbox" name="l_open" id="l_open" value="1" checked> <label for="l_open"> [% 'open' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_closed" id="l_closed" value="1"> <label for="l_closed"> [% 'closed' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked> <label for="l_not_executed"> [% 'not yet executed' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_executed" id="l_executed" value="1" checked> <label for="l_executed"> [% 'executed' | $T8 %]</label></div>
+  </div>
+</div><!-- /.form-addition -->
+
+</div><!-- /.wrapper -->
+
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+
+</form>
diff --git a/templates/design40_webpages/shop_order/_filter.html b/templates/design40_webpages/shop_order/_filter.html
new file mode 100644
index 000000000..ea7674c54
--- /dev/null
+++ b/templates/design40_webpages/shop_order/_filter.html
@@ -0,0 +1,37 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+<form method="post" action="controller.pl" name="shop_orders" id="shoporders">
+
+<div class="wrapper">
+
+<table id='filter_table' class="tbl-horizontal">
+  <tr>
+    <th>[% 'Shop' | $T8 %]</th>
+    <td>[% L.select_tag('filter.shop_id:eq_ignore_empty', SELF.shops, value_key = 'value', title_key = 'title', default=0, class='wi-normal') %]</td>
+  </tr>
+  <tr>
+    <th>[% 'Status' | $T8 %]</th>
+    <td>[% L.select_tag('filter.transferred:eq_ignore_empty', SELF.transferred, value_key = 'value', title_key = 'title', default=0, class='wi-normal') %]</td>
+  </tr>
+  <tr>
+    <th>[% 'from' | $T8 %]</th>
+    <td>[% L.date_tag('filter.order_date:date::ge', FORM.filter.order_date_date__ge, class='wi-date') %]</td>
+  </tr>
+  <tr>
+    <th>[% 'to' | $T8 %]</th>
+    <td>[% L.date_tag('filter.order_date:date::le', FORM.filter.order_date_date__le, class='wi-date') %]</td>
+  </tr>
+  <tr>
+    <th>[% 'Obsolete' | $T8 %]</th>
+    <td>[% L.yes_no_tag('filter.obsolete', FORM.filter.obsolete, default='0', with_empty=1, empty_title='---', class='wi-small') %]</td>
+  </tr>
+</table>
+
+
+<div class="buttons">
+  <a href='#' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);' class="button neutral">[% 'Reset' | $T8 %]</a>
+</div>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/shop_order/_get_one.html b/templates/design40_webpages/shop_order/_get_one.html
new file mode 100644
index 000000000..8aa352132
--- /dev/null
+++ b/templates/design40_webpages/shop_order/_get_one.html
@@ -0,0 +1,17 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
+[% USE Dumper %]
+[%- INCLUDE 'common/flash.html' %]
+<form id="get_one_order_form" action="controller.pl" method="post" style="padding-left:1em;">
+ <table>
+    <tr>
+     <th align="right">[% 'Shop' | $T8 %]</th>
+     <td>[% L.select_tag('shop_id', SELF.shops, value_key = 'value', title_key = 'title', default=1) %]</td>
+    </tr>
+    <tr>
+     <th align="right">[% 'Shop ordernumber' | $T8 %]</th>
+     <td>[% L.input_tag('shop_ordernumber', "") %]</td>
+    </tr>
+ </table>
+  [%  L.hidden_tag("action", "ShopOrder/dispatch") %]
+  [%  L.button_tag("kivi.ShopOrder.get_orders_one()", LxERP.t8('Fetch order')) %]
+</form>
diff --git a/templates/design40_webpages/shop_order/_transfer_status.html b/templates/design40_webpages/shop_order/_transfer_status.html
new file mode 100644
index 000000000..5e6f6e7e0
--- /dev/null
+++ b/templates/design40_webpages/shop_order/_transfer_status.html
@@ -0,0 +1,65 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% SET data = job.data_as_hash %]
+<!-- STANDARD-EINZUG IN DER KIVITENDO-PROGRAMMIERUNG IST 2 LEERZEICHEN - BITTE IN ZUKUNFT EINHALTEN! -->
+
+<h2>[% LxERP.t8("Watch status") %]</h2>
+
+[% L.hidden_tag('', job.id, id="smt_job_id") %]
+
+<p>
+  JOBID: <b>[% job.id %]</b><br>
+  [% LxERP.t8("This status output will be refreshed every five seconds.") %]
+</p>
+
+
+<div class="buttons">
+  [% L.link("#", LxERP.t8("Close window"), onclick="kivi.ShopOrder.processClose();", class="button neutral") %]
+</div>
+
+<table class="tbl-horizontal col">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Current status:") %]</th>
+      <td>
+        [% IF !data.status %]
+          [% LxERP.t8("waiting for job to be started") %] 
+        [% ELSIF data.status == 1 %] 
+          [% LxERP.t8("Converting to deliveryorder") %]
+        [% ELSE %] 
+          [% LxERP.t8("Done.") %] 
+        [% END %] 
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Number of orders created:") %]</th>
+      <td>[% IF data.status > 0 %][% HTML.escape(data.num_order_created) %] / [% HTML.escape(data.shop_order_record_ids.size) %][% ELSE %]–[% END %]</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<h3>[% LxERP.t8("Errors during conversion:") %]</h3>
+[% IF !data.status %]
+  –
+[% ELSIF !data.conversion_errors.size %]
+  [% LxERP.t8("No errors have occurred.") %]
+[% ELSE %]
+  <table clas="tbl-list">
+    <thead>
+      <tr>
+        <th>[% LxERP.t8("Shoporder") %]</th>
+        <th>[% LxERP.t8("Error") %]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH error = data.conversion_errors %]
+        <tr>
+          <td>[% HTML.escape(error.number) %]</td>
+          <td>[% FOREACH message = error.message %][% HTML.escape(message) %]<br>[% END %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+[% END %]
\ No newline at end of file
diff --git a/templates/design40_webpages/shop_order/list.html b/templates/design40_webpages/shop_order/list.html
new file mode 100644
index 000000000..61ef44729
--- /dev/null
+++ b/templates/design40_webpages/shop_order/list.html
@@ -0,0 +1,157 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+[% L.stylesheet_tag('webshop') %]
+[% INCLUDE 'common/flash.html' %]
+<h1>[% title %] &nbsp; <small>[% 'Number of data sets' | $T8 %]: [% SHOPORDERS.size %]</small></h1>
+
+[% PROCESS 'shop_order/_filter.html' filter=SELF.models.filtered.laundered %]
+
+<div class="wrapper">
+<table id="shoplist" class="tbl-list wi-moderate ">
+  <caption>[% 'Orders in Webshop' | $T8 %]</caption>
+  <colgroup>
+    <col>
+    <col>
+    <col>
+    <col>
+    <col>
+    <col class="wi-wide">
+    <col>
+    <col class="wi-wider">
+    <col>
+    <col>
+  </colgroup>
+  <thead class="links-condensed">
+   <tr>
+    <th>[% 'Shop' | $T8 %]</th>
+    [% FOREACH column = [
+    # [ column = [ row = [ element = [ element_text, element_value ], ... ], ... ], ... ]
+    # a link is only generated if 'element_value' is set, otherwise the text is displayed
+                       [ [ [LxERP.t8('Shop orderdate'), 'order_date']],
+                         [ [LxERP.t8('Importdate'), 'itime']]],
+                       [ [ [LxERP.t8('Shop ordernumber'), 'shop_ordernumber']]],
+                       [ [ [LxERP.t8('Shop customernumber'), 'shop_customer_number']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'customer_lastname'], ['|'], [LxERP.t8('Zip'), 'customer_zipcode'], ['|'], [LxERP.t8('Country'), 'customer_country']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'billing_lastname'],  ['|'], [LxERP.t8('Zip'), 'billing_zipcode'],  ['|'], [LxERP.t8('Country'), 'billing_country']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'delivery_lastname'], ['|'], [LxERP.t8('Zip'), 'delivery_zipcode'], ['|'], [LxERP.t8('Country'), 'delivery_country']]],
+                       [ [ [LxERP.t8('Notes'), 'shop_customer_comment']]],
+                       [ [ [LxERP.t8('Positions'), 'positions']],
+                         [ [LxERP.t8('Amount'), 'amount']],
+                         [ [LxERP.t8('Shippingcosts'), 'shipping_costs']]]
+                     ] %]
+
+      <th>
+      [% FOREACH row = column %]
+        [% IF !loop.first %]
+          <br>
+        [% END %]
+        [% FOREACH element = row %]
+          [% SET element_text = element.0 %]
+          [% SET element_value = element.1 %]
+          [% IF element_value %]
+            [% SET sort_dir = (1 - FORM.sort_dir) * (FORM.sort_by == element_value) %]
+            <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=[% element_value %]&sort_dir=[% sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
+            [% element_text %]
+            [% IF FORM.sort_by == element_value %]
+              [% IF sort_dir == 1 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+            [% END %]
+            </a>
+          [% ELSE %]
+            [% element_text %]
+          [% END %]
+        [% END %]
+      [% END %]
+      </th>
+    [% END %]
+    <th>[% 'Action' | $T8 %]<br>[% L.checkbox_tag('check_all') %]</th>
+   </tr>
+  </thead>
+</form>
+<form method="post" action="controller.pl" name="shop_orders_list" id="shoporderslist"><!-- PENDENT: FORM nicht erlaubt hier -->
+  <tbody>
+  [% FOREACH shop_order = SHOPORDERS %]
+    [% IF shop_order.kivi_customer.id && shop_order.kivi_customer.order_lock == 0 && shop_order.open_invoices == 0 %] 
+      [% SET transferable = 1 %] [% SET transferable_class = 'class="shop_transferable"' %] 
+    [% ELSE %] 
+      [% SET transferable = 0 %] 
+      [% SET transferable_class = '' %]
+    [% END %]
+  <tr>
+    <td>[% HTML.escape(shop_order.shop.description) %]</td>
+    <td>[% shop_order.order_date.to_kivitendo('precision' => 'minute') %]<br>[% shop_order.itime.to_kivitendo('precision' => 'minute') %]</td>
+    <td>[% HTML.escape(shop_order.shop_ordernumber) %]</td>
+    <td>[% HTML.escape(shop_order.shop_customer_number) %]</td>
+    <td>
+      [% IF shop_order.customer_company %]<b>[% HTML.escape(shop_order.customer_company) %]</b><br>[% END %]
+      <b>[% HTML.escape(shop_order.customer_lastname) %],&nbsp;[% HTML.escape(shop_order.customer_firstname) %]</b>
+      <br>[% HTML.escape(shop_order.customer_street) %]
+      <br>[% HTML.escape(shop_order.customer_zipcode) %]&nbsp;[% HTML.escape(shop_order.customer_city) %]
+      <br>[% HTML.escape(shop_order.customer_country) %]</td>
+    <td [% transferable_class %]>
+      [% IF shop_order.customer_company %]<b>[% HTML.escape(shop_order.customer_company) %]</b><br>[% END %]
+      <b>[% HTML.escape(shop_order.billing_lastname) %],&nbsp;[% HTML.escape(shop_order.billing_firstname) %]</b>
+      <br>[% HTML.escape(shop_order.billing_street) %]
+      <br>[% HTML.escape(shop_order.billing_zipcode) %]&nbsp;[% HTML.escape(shop_order.billing_city) %]
+      <br>[% HTML.escape(shop_order.billing_country) %]
+      <br>[% IF shop_order.open_invoices > 0 || shop_order.customer.order_lock == 1 %][% SET alertclass = 'class="shop_alert"' %][% ELSE %][% SET alertclass = '' %][% END %]<span [% alertclass %]>&nbsp;&nbsp;[% 'Customernumber' | $T8 %] [% HTML.escape(shop_order.kivi_customer.customernumber) %] -- [% 'Invoices' | $T8 %] [% shop_order.open_invoices %]&nbsp;&nbsp;</span>
+    </td>
+    [% IF (shop_order.delivery_lastname != shop_order.billing_lastname || shop_order.delivery_firstname != shop_order.billing_firstname || shop_order.delivery_street != shop_order.billing_street || shop_order.delivery_city != shop_order.billing_city) %] 
+      [% SET deliveryclass = 'class="shop_delivery"' %]
+    [% ELSE %] 
+      [% SET deliveryclass = '' %]
+    [% END %]
+    <td [% deliveryclass %]>
+      [% IF shop_order.customer_company %]<b>[% HTML.escape(shop_order.customer_company) %]</b><br>[% END %]
+      <b>[% HTML.escape(shop_order.delivery_lastname) %],&nbsp;[% HTML.escape(shop_order.delivery_firstname) %]</b>
+      <br>[% HTML.escape(shop_order.delivery_street) %]
+      <br>[% HTML.escape(shop_order.delivery_zipcode) %]&nbsp;[% HTML.escape(shop_order.delivery_city) %]
+      <br>[% HTML.escape(shop_order.delivery_country) %]
+    </td>
+    <td>[% HTML.escape(shop_order.shop_customer_comment) %]</td>
+    <td>
+      <span class="tooltipster-html" title="[% FOREACH item = shop_order.shop_order_items %] [% LxERP.format_amount(item.quantity,0) %] x [% item.partnumber %] [% item.description %] <br> [% END %]">
+        [% shop_order.positions %]<br>
+        [% shop_order.amount_as_number %]<br>
+        [% shop_order.shipping_costs_as_number %]
+      </span>
+    </td>
+    <td>
+      [% IF shop_order.transferred == 1 %]
+        <a href="controller.pl?id=[% shop_order.id %]&action=ShopOrder/show">[% 'Show order' | $T8 %]<br>[% shop_order.transferred_date_as_date %]</a>
+      [% ELSE %]
+        [% IF transferable == 1 && shop_order.obsolete == 0 %]
+          [% L.checkbox_tag('id[]', checked = '1',  value=shop_order.id) %]<br>
+        [% END %]
+        [% IF shop_order.obsolete == 0 %]
+          <a href="controller.pl?id=[% shop_order.id %]&action=ShopOrder/show">[% 'Create order' | $T8 %]</a><br><br>
+          <a href="controller.pl?import_id=[% shop_order.id %]&action=ShopOrder/delete_order">[% 'Delete shoporder' | $T8 %]</a>
+        [% ELSE %]
+          [% 'Obsolete' | $T8 %]<br><br>
+          <a href="controller.pl?id=[% shop_order.id %]&action=ShopOrder/show">[% 'Show order' | $T8 %]</a>
+        [% END %]
+      [% END %]
+    </td>
+  </tr>
+  [% END %]
+  </tbody>
+</table>
+</div> <!-- ende wrapper -->
+<div id="status_mass_transfer" style="display: none;">
+  [% INCLUDE 'shop_order/_transfer_status.html' %]
+</div>
+
+</form>
+<div id="get_one" style="display:none;">
+  [% INCLUDE 'shop_order/_get_one.html' %]
+</div>
+<script type="text/javascript"><!--
+  $(function() {
+    $('#check_all').checkall('INPUT[name^="id"]');
+  });
+--></script>
diff --git a/templates/design40_webpages/shop_order/show.html b/templates/design40_webpages/shop_order/show.html
new file mode 100644
index 000000000..2023e565d
--- /dev/null
+++ b/templates/design40_webpages/shop_order/show.html
@@ -0,0 +1,469 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+[% L.stylesheet_tag('webshop') %]
+
+<h1>[% title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<!--
+  PENDENT: Die DIV-Tables umwandeln in horizontale Tabellen.
+  Vielleicht vorher mit Werner Hahn absprechen.
+  Einzuege bitte so belassen wie hier, sonst hat man keine Uebersicht und findet die HTML-Fehler kaum!
+  Solches Zeugs bitte schoener formatiert programmieren. Als Programmierer findet ja man sich so auch besser zurecht.
+-->
+<div class="wrapper" id="wrapper-1">
+
+  <div class="input-panel control-panel">
+    <form method="post" action="controller.pl" id="customer">
+      [% L.hidden_tag('create_customer','customer') %]
+      [% L.hidden_tag('import_id', IMPORT.id) %]
+      <div class="col">
+      <table class="tbl-horizontal col">
+        <caption>[% 'Shop Customer Address' | $T8 %]</caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.customer_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Firstname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.customer_firstname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Lastname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.customer_lastname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Company' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.customer_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.customer_department) %]</td>
+        </tr>
+      </table>
+
+        [% SET customer = IMPORT.customer_firstname _ ' ' _ IMPORT.customer_lastname %]
+
+      <table class="tbl-horizontal col">
+        <caption><hr></caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% L.input_tag('customer_greeting', IMPORT.customer_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Customer' | $T8 %]</th>
+          <td>[% L.input_tag('customer_name', customer) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 2' | $T8 %]</th>
+          <td>[% L.input_tag('customer_company', IMPORT.customer_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 3' | $T8 %]</th>
+          <td>[% L.input_tag('customer_department', IMPORT.customer_department) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Street' | $T8 %]</th>
+          <td>[% L.input_tag('customer_street', IMPORT.customer_street) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Zipcode' | $T8 %]</th>
+          <td>[% L.input_tag('customer_zipcode', IMPORT.customer_zipcode) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'City' | $T8 %]</th>
+          <td>[% L.input_tag('customer_city', IMPORT.customer_city) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Country' | $T8 %]</th>
+          <td>[% L.input_tag('customer_country', IMPORT.customer_country) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Phone' | $T8 %]</th>
+          <td>[% L.input_tag('customer_phone', IMPORT.customer_phone) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Email' | $T8 %]</th>
+          <td>[% L.input_tag('customer_email', IMPORT.customer_email) %]</td>
+        </tr>
+
+        [% IF C_ADDRESS %]
+        <tr>
+          <th>[% 'Customernumber' | $T8 %]</th>
+          <td>[% C_ADDRESS.customernumber %]</td>
+        </tr>
+        [% ELSE %]
+        <tr>
+          <td colspan="2">
+            [% L.ajax_submit_tag("controller.pl?action=ShopOrder/apply_customer",  "#customer", LxERP.t8("Apply customer")) %]
+        </tr>
+        [% END %]
+      </table>
+      </div>
+    </form><!-- /#customer -->
+  </div>
+
+  <div class="input-panel control-panel">
+    <form method="post" action="controller.pl" id="billing">
+      [% L.hidden_tag('create_customer','billing') %]
+      [% L.hidden_tag('import_id', IMPORT.id) %]
+
+      <div class="col">
+      <table class="tbl-horizontal col">
+        <caption>[% 'Shop Billing Address' | $T8 %]</caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.billing_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Firstname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.billing_firstname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Lastname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.billing_lastname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Company' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.billing_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.billing_department) %]</td>
+        </tr>
+      </table>
+
+        <!-- PENDENT: vielleicht neue Tabelle -->
+        [% SET billing = IMPORT.billing_firstname _ ' ' _ IMPORT.billing_lastname %]
+
+      <table class="tbl-horizontal col">
+        <caption><hr></caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% L.input_tag('billing_greeting', IMPORT.billing_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Customer' | $T8 %]</th>
+          <td>[% L.input_tag('billing_name', billing) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 2' | $T8 %]</th>
+          <td>[% L.input_tag('billing_company', IMPORT.billing_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 3' | $T8 %]</th>
+          <td>[% L.input_tag('billing_department', IMPORT.billing_department) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Street' | $T8 %]</th>
+          <td>[% L.input_tag('billing_street', IMPORT.billing_street) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Zipcode' | $T8 %]</th>
+          <td>[% L.input_tag('billing_zipcode', IMPORT.billing_zipcode) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'City' | $T8 %]</th>
+          <td>[% L.input_tag('billing_city', IMPORT.billing_city) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Country' | $T8 %]</th>
+          <td>[% L.input_tag('billing_country', IMPORT.billing_country) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Phone' | $T8 %]</th>
+          <td>[% L.input_tag('billing_phone', IMPORT.billing_phone) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Email' | $T8 %]</th>
+          <td>[% L.input_tag('billing_email', IMPORT.billing_email) %]</td>
+        </tr>
+        [% IF D_ADDRESS %]
+        <tr>
+          <th>[% 'Customernumber' | $T8 %]</th>
+          <td>[% D_ADDRESS.customernumber %]</td>
+        </tr>
+        [% ELSE %]
+          <tr>
+            <td colspan="2">
+              [% L.ajax_submit_tag("controller.pl?action=ShopOrder/apply_customer",  "#delivery", LxERP.t8("Apply customer")) %]
+            </td>
+          </tr>
+        [% END %]
+      </table>
+      </div>
+    </form><!-- /#billing -->
+  </div>
+
+  <div class="input-panel control-panel">
+    <form method="post" action="controller.pl" id="delivery">
+      [% L.hidden_tag('create_customer','delivery') %]
+      [% L.hidden_tag('import_id', IMPORT.id) %]
+      <div class="col">
+      <table class="tbl-horizontal col">
+        <caption>[% 'Shop Delivery Address' | $T8 %]</caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.delivery_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Firstname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.delivery_firstname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Lastname' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.delivery_lastname) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Company' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.delivery_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Department' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.delivery_department) %]</td>
+        </tr>
+      </table>
+
+        [% SET delivery = IMPORT.delivery_firstname _ ' ' _ IMPORT.delivery_lastname %]
+
+      <table class="tbl-horizontal col">
+        <caption><hr></caption>
+        <colgroup><col class="wi-verysmall"><col class="wi-mediumsmall"></colgroup>
+        <tr>
+          <th>[% 'Greeting' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_greeting', IMPORT.delivery_greeting) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Customer' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_name', delivery) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 2' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_company', IMPORT.delivery_company) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Name 3' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_department', IMPORT.delivery_department) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Street' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_street', IMPORT.delivery_street) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Zipcode' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_zipcode', IMPORT.delivery_zipcode) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'City' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_city', IMPORT.delivery_city) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Country' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_country', IMPORT.delivery_country) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Phone' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_phone', IMPORT.delivery_phone) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Email' | $T8 %]</th>
+          <td>[% L.input_tag('delivery_email', IMPORT.delivery_email) %]</td>
+        </tr>
+        [% IF D_ADDRESS %]
+        <tr>
+          <th>[% 'Customernumber' | $T8 %]</th>
+          <td>[% D_ADDRESS.customernumber %]</td>
+        </tr>
+        [% ELSE %]
+        <tr>
+          <td colspan="2">
+            [% L.ajax_submit_tag("controller.pl?action=ShopOrder/apply_customer",  "#delivery", LxERP.t8("Apply customer")) %]
+          </td>
+        </tr>
+        [% END %]
+      </table>
+      </div>
+    </form><!-- /#delivery -->
+  </div>
+
+</div><!-- /.wrapper -->
+
+<div class="wrapper" id="wrapper-2">
+
+  <div class="input-panel control-panel" style="vertical-align:top">
+    <table class="tbl-horizontal">
+      <caption>[% 'Shop Headdata' | $T8 %]</caption>
+      <tbody>
+        <tr>
+          <th>[% 'Shop Ordernumber' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.shop_ordernumber) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shop Orderdate' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.order_date.dmy('.')) _ ' ' _ HTML.escape(IMPORT.order_date.hms(':')) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shop Host' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.host) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shop OrderIP' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.remote_ip) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shop Ordernotes' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.shop_customer_comment) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shop Orderamount' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.amount_as_number) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Shipping costs' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.shipping_costs_as_number) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Payment description' | $T8 %]</th>
+          <td>[% HTML.escape(IMPORT.payment_description) %]</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <div class="input-panel control-panel" style="vertical-align:top">
+    [% IF IMPORT.obsolete %]
+      [% L.button_tag %]
+      <b>[% 'Shoporder deleted -- ' | $T8 %]</b> <a href="controller.pl?action=ShopOrder/undelete_order&import_id=[% IMPORT.id %]" class="button">[% 'revert deleted' | $T8 %]</a>
+    [% ELSE %]
+      [% UNLESS IMPORT.transferred %]
+
+        [% IF PROPOSALS %]
+          <form method="post" action="controller.pl" id="create_order">
+            [% L.hidden_tag('import_id', IMPORT.id) %]
+
+            <table class="tbl-list">
+              <caption>[% 'Customer Proposals' | $T8 %]</caption>
+              <tbody>
+                [% FOREACH prop = PROPOSALS %]
+                  [% IF prop.order_lock %]
+                    [% #PENDENT: KLASSE statt STYLE verwenden %]
+                    [% SET orderlock_class = 'style="background:rgba(232, 32, 23, 0.2);"' %]
+                  [% ELSE %]
+                    [% SET orderlock_class = '' %]
+                  [% END %]
+                  <tr [% orderlock_class %]>
+                    <td>[% IF !prop.order_lock %][% L.radio_button_tag('customer', value=prop.id) %][% END %]</td>
+                    <td>
+                      <a href="controller.pl?action=CustomerVendor/edit&id=[% prop.id %]&db=customer&callback=[% HTML.url('controller.pl?action=ShopOrder/show&id=' _ IMPORT.id) %]">
+                        [% HTML.escape(prop.customernumber) %]
+                      </a>
+                    </td>
+                    <td>
+                      [% IF !prop.notes == '' %]
+                        <span class="tooltipster-html" title="[% HTML.escape(prop.notes) %]">
+                          <span style="color:red;font-weight: bold;">[% HTML.escape(prop.name) %]</span>
+                        </span>
+                      [% ELSE %]
+                        [% HTML.escape(prop.name) %]
+                      [% END %]
+                    </td>
+                    <td>[% HTML.escape(prop.street)  %]</td>
+                    <td>[% HTML.escape(prop.zipcode) %]</td>
+                    <td>[% HTML.escape(prop.city)    %]</td>
+                    <td>[% HTML.escape(prop.email)   %]</td>
+                  </tr>
+                [% END %]
+              </tbody>
+            </table>
+
+            <div id="transfer" style="display:none;">
+              [% # 'Customernumber: ' _ %]
+              [% L.ajax_submit_tag('controller.pl?action=ShopOrder/transfer', "#create_order", LxERP.t8('Create order')) %]
+            </div>
+
+            [% FOREACH prop = PROPOSALS %]
+              <div id="shop_update_customer_[% prop.id %]" class="div_hidden" style="display:none;">
+                [% L.ajax_submit_tag("controller.pl?action=ShopOrder/apply_customer&cv_id=" _ prop.id,  "#billing", LxERP.t8("Update customer using billing address")) %]
+              </div>
+            [% END %]
+
+          </form><!-- /#create_order -->
+          <div class="buttons">
+            <a href="controller.pl?action=ShopOrder/delete_order&import_id=[% IMPORT.id %]" class="button neutral">[% 'delete order' | $T8 %]</a>
+          </div>
+        [% END # PROPOSALS %]
+
+      [% ELSE %]
+
+        <div>
+          <h3>[% 'Transferred' | $T8 %]</h3>
+          <div id="recordlinks"></div>
+          <script type="text/javascript">
+            var url = 'controller.pl?action=RecordLinks/ajax_list&object_model=ShopOrder&object_id=[% IMPORT.id %]';
+            $('#recordlinks').load(url);
+          </script>
+        </div>
+      [% END %]
+    [% END %]
+  </div>
+</div>
+
+<div class="wrapper" id="wrapper-3">
+  <form method="post" action="controller.pl" id="create_partial_order">
+  [% L.hidden_tag('import_id', IMPORT.id) %]
+    <table class="tbl-list" style="width:100%">
+      <thead>
+        <tr>
+          <th>[% 'Assign'            | $T8 %]</th>
+          <th>[% 'Position'          | $T8 %]</th>
+          <th>[% 'Partnumber'        | $T8 %]</th>
+          <th>[% 'Partdescriptipion' | $T8 %]</th>
+          <th>[% 'Qty'               | $T8 %]</th>
+          <th>[% 'Price'             | $T8 %]</th>
+          <th>[% 'Discount'          | $T8 %]</th>
+          <th>[% 'Promotion Code'    | $T8 %]</th>
+          <th>[% 'Extended'          | $T8 %]</th>
+        </tr>
+      </thead>
+      <tbody>
+        [% FOREACH pos = IMPORT.shop_order_items %]
+          <tr>
+            <td>[% L.checkbox_tag("pos_ids." _ pos.id _ "[]", value=1, checked=1) %]</td>
+            <td>[% loop.count                                      %]</td>
+            <td>[% HTML.escape(pos.partnumber)                     %]</td>
+            <td>[% HTML.escape(pos.description)                    %]</td>
+            <td>[% pos.quantity_as_number                          %]</td>
+            <td>[% pos.price_as_number                             %]</td>
+            <td>[% pos.discount_as_number * 100                  %] %</td>
+            <td>[% pos.discount_code                               %]</td>
+            <td>[% LxERP.format_amount(pos.price * pos.quantity,2) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+    <div id="partial_transfer" style="float:left; display:none;">
+      [% L.hidden_tag('partial_transfer_customer_id') %]
+      [% L.ajax_submit_tag('controller.pl?action=ShopOrder/transfer', "#create_partial_order", LxERP.t8('Create partial order')) %]
+    </div>
+  </form>
+</div>
+
+
+<script type="text/javascript">
+  $("input[type=radio]").change(function(){
+    $('.div_hidden').css("display", 'none');
+    var cv_id = $("input[type=radio][id="+ this.id + "]").val();
+    $('#shop_update_customer_'+ cv_id).css("display", 'block');
+    $('#transfer').css("display", 'block');
+    $('#partial_transfer').css("display", 'block');
+    $('#partial_transfer_customer_id').val(cv_id);
+  });
+</script>
diff --git a/templates/design40_webpages/shop_part/_filter.html b/templates/design40_webpages/shop_part/_filter.html
new file mode 100644
index 000000000..ce7836f59
--- /dev/null
+++ b/templates/design40_webpages/shop_part/_filter.html
@@ -0,0 +1,33 @@
+[% USE T8 %]
+[% USE L %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<form action='controller.pl' metdod='post' id="shop_part_filter">
+
+<div class="wrapper">
+[% L.hidden_tag('filter.shop.obsolete', 0) %]
+
+<table id="filter_table" class="tbl-horizontal">
+  <caption>[% 'Filter' | $T8 %]</caption>
+  <tbody>
+    <tr>
+      <th>[% 'Shop' | $T8 %]</th>
+      <td>[% L.select_tag('filter.shop_id:eq_ignore_empty', SELF.shops, value_key = 'value', title_key = 'title', default=0, class='wi-small') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part marked as "Shop part"' | $T8 %]</th>
+      <td>[% L.yes_no_tag('filter.part.shop', FORM.filter.part.shop, default='1', with_empty=1, empty_title='---', class='wi-small') %]</td>
+    </tr>
+  </tbody>
+</table>
+ 
+<div class="buttons">
+  <a href='#' onclick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);' class="button neutral">[% 'Reset' | $T8 %]</a>
+  [% L.hidden_tag('action', 'ShopPart/dispatch') %]
+  [% L.submit_tag('action_list_articles',LxERP.t8('renew')) %]
+</div>
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/shop_part/_list_articles.html b/templates/design40_webpages/shop_part/_list_articles.html
new file mode 100644
index 000000000..bff74cd0a
--- /dev/null
+++ b/templates/design40_webpages/shop_part/_list_articles.html
@@ -0,0 +1,161 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% title %]</h1>
+
+[% PROCESS 'shop_part/_filter.html' filter=SELF.models.filtered.laundered %]
+
+<form method="post" action="controller.pl" name="shop_parts" id="shopparts">
+<div class="wrapper">
+  <div class="data_count message message_hint">[% 'Number of Data: ' | $T8 %] [% SHOP_PARTS.size %]</div>
+</div>
+
+[% IF SHOP_PARTS.size > 0 %]
+
+<div class="wrapper">
+<table id="shoplist" class="tbl-list wi-moderate">
+  <thead>
+    <tr>
+    <th>[% L.checkbox_tag('check_all') %]</th>
+    <th>
+      [% IF FORM.sort_by == 'shop.description' %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=shop.description&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+          [% 'Shop Host/Connector' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+        </a>
+      [% ELSE %]
+        <a href="controller.pl?action=ShopPart/list_articles&sort_by=shop.description&sort_dir=0" class="sort_link"> [% 'Shop Host/Connector' | $T8 %]</a>
+      [% END %]
+    </th>
+    <th>
+      [% IF FORM.sort_by == 'part.partnumber' %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.partnumber&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+          [% 'Partnumber' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+        </a>
+      [% ELSE %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.partnumber&sort_dir=0" class="sort_link">
+          [% 'Partnumber' | $T8 %]
+        </a>
+      [% END %]
+    </th>
+    <th>
+      [% IF FORM.sort_by == 'part.description' %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.description&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+          [% 'Description' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+        </a>
+      [% ELSE %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.description&sort_dir=0" class="sort_link">
+          [% 'Description' | $T8 %]
+        </a>
+      [% END %]
+    </th>
+    <th>[% 'Info' | $T8 %]</th>
+    <th>[% 'Active' | $T8 %]</th>
+    <th>[% 'Price source' | $T8 %]</th>
+    <th>[% 'Price' | $T8 %]</th>
+    <th>
+      [% IF FORM.sort_by == 'part.onhand' %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.onhand&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+          [% 'Stock Local/Shop' | $T8 %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+        </a>
+      [% ELSE %]
+        <a href="controller.pl?action=ShopPart/list_articles&sort_by=part.onhand&sort_dir=0" class="sort_link"> [% 'Stock Local/Shop' | $T8 %]</a>
+      [% END %]
+    </th>
+    <th>[% 'Last update' | $T8 %]</th>
+    <th>[% 'Images' | $T8 %]</th>
+    <th>
+      [% IF FORM.sort_by == 'part.partsgroup_id' %]
+        <a href ="controller.pl?action=ShopPart/list_articles&sort_by=part.partsgroup_id&sort_dir=[% 1 - FORM.sort_dir %]" class="sort_link">
+          [% 'Category' %][% IF FORM.sort_dir == 0 %]<img src="image/down.png">[% ELSE %]<img src="image/up.png">[% END %]
+        </a>
+      [% ELSE %]
+        <a href="controller.pl?action=ShopPart/list_articles&sort_by=part.partsgroup_id&sort_dir=0" class="sort_link"> [% 'Category' | $T8 %]</a>
+      [% END %]
+    </th>
+  </tr>
+  </thead>
+  <tbody>
+    [% FOREACH shop_part = SHOP_PARTS %]
+      [% # IF shop_part.shop.obsolete %]
+      <tr>
+        <td>[% L.checkbox_tag('shop_parts_ids[]', checked=0, value=shop_part.id) %]</td>
+        <td>[% HTML.escape( shop_part.shop.description ) %]/[% HTML.escape( shop_part.shop.connector ) %]</td>
+        <td>[% HTML.escape( shop_part.part.partnumber ) %]</td>
+        <td>
+          <a href="controller.pl?part.id=[% shop_part.part.id %]&action=Part/edit&callback=[% HTML.url('controller.pl?action=ShopPart/list_articles') %]#shop_variables">
+            [% HTML.escape( shop_part.part.description ) %]
+          </a>
+        </td>
+        <td>
+          [% IF shop_part.shop_description %]
+            [% 'Info' | $T8 %]
+          [% ELSE %]
+            [% 'No Shopdescription' | $T8 %]
+          [% END %]
+        </td>
+        <td style="vertical-align:middle;text-align:center;">
+          [% IF shop_part.active %]
+            <div id="toogle_[% shop_part.id %]" style="background-image:url(image/gruener_punkt.gif);background-repeat:no-repeat;witdh:15px;height:15px;">&nbsp; </div>
+          [% ELSE %]
+            <div id="toogle_[% shop_part.id %]" style="background-image:url(image/roter_punkt.gif);background-repeat:no-repeat;witdh:15px;height:15px;">&nbsp; </div>
+          [% END %]
+        </td>
+        <td>[% L.html_tag('span',LxERP.t8(), id => 'active_price_source_' _ shop_part.id) %]</td>
+        <td>[% L.html_tag('span','Price', id => 'price_' _ shop_part.id) %]</td>
+        <td>[% L.html_tag('span','Stock', id => 'stock_' _ shop_part.id) %]</td>
+        <td>[% L.html_tag('span', shop_part.last_update.to_kivitendo('precision' => 'minute'), id => 'shop_part_last_update_' _ shop_part.id ) %]</td>
+        <td>
+          [% IF shop_part.images %]
+            [% shop_part.images %]
+          [% ELSE %]
+            [% 'No Shopimages' | $T8 %]
+          [% END %]
+        </td>
+        <td>
+          [% IF shop_part.shop_category %]
+            [% IF shop_part.shop_category.1.size > 1%]
+              [% FOREACH cat = shop_part.shop_category %]
+                [% HTML.escape(cat.1) %]<br>
+              [% END %]
+            [% ELSE %]
+              [% HTML.escape(shop_part.shop_category.1) %]<br>
+            [% END %]
+          [% END %]
+
+          <script type="text/javascript">
+            $(function() {
+               kivi.ShopPart.update_price_n_price_source([% shop_part.id %],'[% shop_part.active_price_source %]');
+               kivi.ShopPart.update_stock([% shop_part.id %]);
+            });
+        </script>
+
+        </td>
+
+      </tr>
+      [% # END %]
+    [% END %]
+  </tbody>
+</table>
+</div>
+
+<div class="wrapper">
+  <div class="buttons">
+    [% L.radio_button_tag('upload_todo', value='all', label= LxERP.t8('All Data')) %]<br>
+    [% L.radio_button_tag('upload_todo', value='price', label= LxERP.t8('Only Price')) %]<br>
+    [% L.radio_button_tag('upload_todo', value='stock', label= LxERP.t8('Only Stock')) %]<br>
+    [% L.radio_button_tag('upload_todo', value='price_stock', checked=1, label= LxERP.t8('Price and Stock')) %]<br>
+    [% L.button_tag("kivi.ShopPart.setup();", LxERP.t8("Upload all marked"), id="mass_transfer") %]
+  </div>
+  <div id="status_mass_upload" style="display: none;">[% INCLUDE 'shop_part/_upload_status.html' %] </div>
+</div><!-- /.wrapper -->
+
+[% END %]
+</form>
+
+<script type="text/javascript"><!--
+  $(function() {
+    $('#check_all').checkall('INPUT[name^="shop_parts_ids"]');
+  });
+--></script>
diff --git a/templates/design40_webpages/shop_part/_list_images.html b/templates/design40_webpages/shop_part/_list_images.html
new file mode 100644
index 000000000..4f506aba4
--- /dev/null
+++ b/templates/design40_webpages/shop_part/_list_images.html
@@ -0,0 +1,36 @@
+[% USE HTML %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE T8 %]
+[% USE Base64 %]
+
+<table class="tbl-list" id="images_list">
+  <thead>
+    <tr>
+      <th><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></th>
+      <th></th>
+      <th>[% 'Title'          | $T8 %]</th>
+      <th>[% 'Description'    | $T8 %]</th>
+      <th>[% 'Filename'       | $T8 %]</th>
+      <th>[% 'Orig. Size w/h' | $T8 %]</th>
+      <th>[% 'Action'         | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+   [% FOREACH img = IMAGES %]
+    <tr class="listrow" id="image_id_[%  img.id %]">
+      <td><img src="image/updown.png" alt="[% LxERP.t8('reorder item') %]" class="dragdrop"></td>
+      <td><img src="data:[%  img.thumbnail_content_type %];base64,[%  img.thumbnail_content.encode_base64 %]" alt="[%  img.file.title %]"></td>
+      <td>[% HTML.escape(img.file.title)       %]</td>
+      <td>[% HTML.escape(img.file.description) %]</td>
+      <td>[% HTML.escape(img.file.file_name)   %]</td>
+      <td>[% HTML.escape(img.org_file_width) _  ' x ' _ HTML.escape(img.org_file_height) %]</td>
+      <td>[% L.button_tag("kivi.File.delete_file(" _ img.file_id _ ", 'ShopPart/ajax_delete_file')", LxERP.t8('Delete'), confirm=LxERP.t8("Are you sure?")) %]</td>
+    </tr>
+   [%  END %]
+  </tbody>
+</table>
+
+[% L.sortable_element('#images_list tbody', url=SELF.url_for(action='reorder'), with='image_id') %]
+<div class="buttons">[% L.button_tag("kivi.ShopPart.imageUpload(" _ FORM.id _ ",'shop_image','image', '',0);", LxERP.t8('File upload') ) %]</div>
diff --git a/templates/design40_webpages/shop_part/_upload_status.html b/templates/design40_webpages/shop_part/_upload_status.html
new file mode 100644
index 000000000..32e3ddbdc
--- /dev/null
+++ b/templates/design40_webpages/shop_part/_upload_status.html
@@ -0,0 +1,66 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE Dumper %]
+[% SET data = job.data_as_hash %]
+
+<h2>[% LxERP.t8("Watch status") %]</h2>
+
+[% L.hidden_tag('', job.id, id="smu_job_id") %]
+
+<p>
+  JOBID: [% job.id %]<br>
+  [% LxERP.t8("This status output will be refreshed every five seconds.") %]
+</p>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Current status:") %]</th>
+      <td>
+        [% IF !data.status %]
+          [% LxERP.t8("waiting for job to be started") %]
+        [% ELSIF data.status == 1 %]
+          [% LxERP.t8("Uploading Data") %]
+        [% ELSE %]
+          [% LxERP.t8("Done.") %]
+        [% END %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Number of data uploaded:") %]</th>
+      <td>
+        [% IF data.status > 0 %]
+          [% HTML.escape(data.num_uploaded) %] / [% HTML.escape(data.shop_part_record_ids.size) %]
+        [% ELSE %]
+          –
+        [% END %]
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+
+
+<table class="tbl-list">
+  <caption>[% LxERP.t8("Conversion:") %]</caption>
+  <thead>
+    <tr>
+      <th>[% LxERP.t8("Part") %]</th>
+      <th>[% LxERP.t8("Partnumber") %]</th>
+      <th>[% LxERP.t8("Message") %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH message = data.conversion %]
+    <tr>
+      <td>[% HTML.escape(message.id) %]</td>
+      <td>[% HTML.escape(message.number) %]</td>
+      <td >[% HTML.escape(message.message) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+
diff --git a/templates/design40_webpages/shop_part/categories.html b/templates/design40_webpages/shop_part/categories.html
new file mode 100644
index 000000000..32c145235
--- /dev/null
+++ b/templates/design40_webpages/shop_part/categories.html
@@ -0,0 +1,34 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+[%  LxERP.t8("Part") %]: [% HTML.escape(SELF.shop_part.part.displayable_name) %]<br>
+[%  LxERP.t8("Shop") %]: [% HTML.escape(SELF.shop_part.shop.description) %]<br>
+
+<form action="controller.pl" method="post">
+  [% BLOCK recurse %]
+    [% FOREACH categorie = categories_array %]
+      <ul>
+        <li>
+        [% checked = '' %]
+        [% FOREACH cat_row = SELF.shop_part.shop_category %]
+          [% IF (cat_row.0 == categorie.id) || (SELF.shop_part.shop.connector == 'shopware6' && cat_row == categorie.id) %]
+            [% checked = 'checked' %]
+          [% END %]
+        [% END %]
+        [% L.checkbox_tag('categories[]',value=categorie.id, checked=checked) %][% HTML.escape(categorie.name) %][% L.hidden_tag("cat_id_" _ categorie.id, categorie.name) %]
+        </li>
+        [% IF categorie.children.size %]
+          [% INCLUDE recurse categories_array=categorie.children %]
+        [% END %]
+      </ul>
+    [% END %]
+  [% END %]
+  <div>
+    <h2>[% LxERP.t8("Shopcategories") %]</h2>
+    [% INCLUDE recurse categories_array=CATEGORIES %]
+  </div>
+    [% L.button_tag("kivi.ShopPart.save_categories(" _ SELF.shop_part.id _", " _ SELF.shop_part.shop.id _")", LxERP.t8("Save"))  %]</td>
+</form>
diff --git a/templates/design40_webpages/shop_part/edit.html b/templates/design40_webpages/shop_part/edit.html
new file mode 100644
index 000000000..18c5fe166
--- /dev/null
+++ b/templates/design40_webpages/shop_part/edit.html
@@ -0,0 +1,84 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+
+<form action="controller.pl" method="post">
+
+<div class="wrapper">
+
+<p>
+  [% LxERP.t8("Part") %]: [% HTML.escape(SELF.shop_part.part.displayable_name) %]<br>
+  [% LxERP.t8("Shop") %]: [% HTML.escape(SELF.shop_part.shop.description) %]
+</p>
+
+[% IF SELF.shop_part.id %]
+  [% L.hidden_tag("shop_part.id", SELF.shop_part.id) %]
+  [% L.hidden_tag("shop_part.shop_id", SELF.shop_part.shop_id) %]
+[% ELSE %]
+  [% L.hidden_tag("shop_part.shop_id", FORM.shop_id) %]
+  [% L.hidden_tag("shop_part.part_id", FORM.part_id) %]
+[% END %]
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8("Description") %]</th>
+     <td colspan="3">
+       [% IF SELF.shop_part.shop.use_part_longdescription %]
+         [% L.textarea_tag('notes', SELF.shop_part.part.notes, readonly="readonly", style="width: 350px; height: 150px", class="texteditor") %]
+       [% ELSE %]
+         [% L.textarea_tag('shop_part.shop_description', SELF.shop_part.shop_description, style="width: 350px; height: 150px", class="texteditor") %]
+       [% END %]
+     </td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Active") %]</th>
+      <td>[% L.yes_no_tag("shop_part.active", SELF.shop_part.active, default = "yes") %]</td>
+      <th>[% LxERP.t8("Date") %]</th>
+      <td>[% L.date_tag("shop_part.show_date", SELF.shop_part.show_date) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Price Source' | $T8 %]</th>
+      <td>
+        [% IF SELF.shop_part.active_price_source %]
+          [% SET price_source = SELF.shop_part.active_price_source %]
+        [% ELSE %]
+          [% SET price_source = SELF.shop_part.shop.price_source %]
+        [% END %]
+        [% L.select_tag('shop_part.active_price_source', SELF.price_sources, value_key = 'id', title_key = 'name', with_empty = 0, default = price_source, default_value_key='id' ) %]
+      </td>
+     <th>[% LxERP.t8("Front page") %]</th>
+     <td>[% L.yes_no_tag('shop_part.front_page', SELF.shop_part.front_page) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Sort order") %]</th>
+      <td>[% L.input_tag("shop_part.sortorder", SELF.shop_part.sortorder, size=2) %]</td>
+      <th>[% LxERP.t8("Meta tag title") %]</th>
+      <td>[% L.input_tag("shop_part.metatag_title", SELF.shop_part.metatag_title, size=12) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8("Meta tag keywords") %]</th>
+      <td>[% L.input_tag("shop_part.metatag_keywords", SELF.shop_part.metatag_keywords, size=22) %]</td>
+      <th>[% LxERP.t8("Meta tag description") %]</th>
+      <td>[% L.textarea_tag("shop_part.metatag_description", SELF.shop_part.metatag_description, rows=4) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<div class="buttons">
+  [% IF SELF.shop_part.id %]
+    [% L.button_tag("kivi.ShopPart.save_shop_part(" _ SELF.shop_part.id _ ")", LxERP.t8("Save"))  %]
+  [% ELSE %]
+    [% L.button_tag("kivi.ShopPart.add_shop_part()", LxERP.t8("Save"))  %]
+  [% END %]
+</div>
+
+[% IF SELF.shop_part.part.image && INSTANCE_CONF.get_parts_show_image %]
+  <a href="[% SELF.shop_part.part.image | html %]" target="_blank"><img style="[% INSTANCE_CONF.get_parts_image_css %]" src="[% SELF.shop_part.part.image | html %]"/></a>
+[% END %]
+
+</div><!-- /.wrapper -->
+
+</form>
diff --git a/templates/design40_webpages/shops/form.html b/templates/design40_webpages/shops/form.html
new file mode 100644
index 000000000..bae05db10
--- /dev/null
+++ b/templates/design40_webpages/shops/form.html
@@ -0,0 +1,125 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+[% SET style="width: 400px" %]
+[% SET size=34 %]
+
+<h1>[% HTML.escape(title) %]</h1>
+<form id="form" action="controller.pl" method="post">
+
+[% INCLUDE 'common/flash.html' %]
+
+[% L.hidden_tag("id", SELF.shop.id) %]
+
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <caption>[% 'Shopconfiguration' %]</caption>
+  <colgroup><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag("shop.description", SELF.shop.description, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Shop type' | $T8 %]</th>
+      <td>[% L.select_tag('shop.connector', SELF.connectors, value_key = 'id', title_key = 'description', with_empty = 0, default = SELF.shop.connector, default_value_key='id', class='wi-wide' ) %]</td>
+      <tr>
+        <tr>
+          <th>[% 'Price type' | $T8 %]</th>
+          <td>[% L.select_tag('shop.pricetype', SELF.price_types, value_key = 'id', title_key = 'name', with_empty = 0, default = SELF.shop.pricetype, default_value_key='id', class='wi-small' ) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Price Source' | $T8 %]</th>
+          <td>[% L.select_tag('shop.price_source', SELF.price_sources, value_key = 'id', title_key = 'name', with_empty = 0, default = SELF.shop.price_source, default_value_key='id', class='wi-wide' ) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Bookinggroup/Tax' | $T8 %]</th>
+          <td>[% L.select_tag('shop.taxzone_id', SELF.taxzone_id, value_key = 'id', title_key = 'name', with_empty = 0, default = SELF.shop.taxzone_id, default_value_key='id', class='wi-wide' ) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Protocol' | $T8 %]</th>
+          <td>[% L.select_tag('shop.protocol', SELF.protocols value_key = 'id', title_key = 'name', with_empty = 0, default = SELF.shop.protocol, default_value_key='id', class='wi-small' ) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Server' | $T8 %]</th>
+          <td>[% L.input_tag("shop.server", SELF.shop.server, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Port' | $T8 %]</th>
+          <td>[% L.input_tag("shop.port", SELF.shop.port, class='wi-small') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Proxy' | $T8 %]</th>
+          <td>[% L.input_tag("shop.proxy", SELF.shop.proxy, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+        <tr>
+          <th>[% 'Path' | $T8 %]</th>
+          <td>[% L.input_tag("shop.path", SELF.shop.path, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Realm' | $T8 %]</th>
+          <td>[% L.input_tag("shop.realm", SELF.shop.realm, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'User' | $T8 %]</th>
+          <td>[% L.input_tag("shop.login", SELF.shop.login, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Password' | $T8 %]</th>
+          <td>[% L.input_tag("shop.password", SELF.shop.password, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Last ordernumber' | $T8 %]</th>
+          <td>[% L.input_tag("shop.last_order_number", SELF.shop.last_order_number, class='wi-small') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Orders to fetch' | $T8 %]</th>
+          <td>[% L.input_tag("shop.orders_to_fetch", SELF.shop.orders_to_fetch, class='wi-small') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Transaction description' | $T8 %]</th>
+          <td>[% L.input_tag("shop.transaction_description", SELF.shop.transaction_description, class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Default part for shipping costs' | $T8 %]</th>
+          <td>[%- P.part.picker('shop.shipping_costs_parts_id', SELF.shop.shipping_costs_parts_id,
+            class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Use Long Description from Parts for Shop Long Description' | $T8 %]</th>
+          <td>[% L.yes_no_tag('shop.use_part_longdescription', SELF.shop.use_part_longdescription,
+            class='wi-small') %]</td>
+        </tr>
+
+        <tr>
+          <th>[% 'Obsolete' | $T8 %]</th>
+          <td>[% L.checkbox_tag('shop.obsolete', checked = SELF.shop.obsolete, for_submit=1) %]</td>
+        </tr>
+  </tbody>
+</table>
+</div>
+
+
+<script type="text/javascript"><!--
+  function check_prerequisites() {
+    if ($('#shop_description').val() === "") {
+      alert(kivi.t8('The name is missing.'));
+      return false;
+    }
+    if ($('#shop_url').val() === "") {
+      alert(kivi.t8('The URL is missing.'));
+      return false;
+    }
+    if ($('#shop_port').val() === "") {
+      alert(kivi.t8('The port is missing.'));
+      return false;
+    }
+
+    return true;
+  }
+--></script>
+</form>
diff --git a/templates/design40_webpages/shops/list.html b/templates/design40_webpages/shops/list.html
new file mode 100644
index 000000000..715b4f46d
--- /dev/null
+++ b/templates/design40_webpages/shops/list.html
@@ -0,0 +1,35 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+<div class="wrapper">
+
+<table class="tbl-list wi-moderate" id="shop_list">
+  <thead>
+    <tr>
+      <th><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></th>
+      <th>[% 'Description' | $T8 %]</th>
+      <th>[% 'Type' | $T8 %]</th>
+      <th>[% 'Obsolete' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH shop = SHOPS %]
+    <tr id="shop_id_[% shop.id %]">
+      <td class="dragdrop"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></td>
+      <td><a href="[% SELF.url_for(action='edit', id=shop.id) %]">[% HTML.escape(shop.description) %]</a></td>
+      <td>[% HTML.escape(shop.connector) %]</a></td>
+      <td>[% HTML.escape(shop.obsolete) %]</td>
+    </tr>
+    [% END %]
+  </tbody>
+</table>
+
+
+[% L.sortable_element('#shop_list tbody', url=SELF.url_for(action='reorder'), with='shop_id') %]
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/shops/test_shop_connection.html b/templates/design40_webpages/shops/test_shop_connection.html
new file mode 100644
index 000000000..c77a169e7
--- /dev/null
+++ b/templates/design40_webpages/shops/test_shop_connection.html
@@ -0,0 +1,15 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
+[% IF ok %]
+  <p class="message message_ok">[% LxERP.t8('The connection to the shop was established successfully.') %]</p>
+  <p>[% LxERP.t8('Version')%][% HTML.escape(version) %]</p>
+[% ELSE %]
+  <p class="message message_error"> [% LxERP.t8('The connection to the shop could not be established.') %] [% LxERP.t8('Error message from the webshop api:') %] </p>
+  <p>[% HTML.escape(version) %]</p>
+[% END %]
+<div>
+  <a href="#" onclick="$('#test_shop_connection_window').dialog('close');" class="button neutral">[% LxERP.t8("Close Window") %]</a>
+</div>
+
diff --git a/templates/design40_webpages/simple_system_setting/_bank_account_form.html b/templates/design40_webpages/simple_system_setting/_bank_account_form.html
new file mode 100644
index 000000000..23b98d253
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_bank_account_form.html
@@ -0,0 +1,83 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Bank account' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+  <tbody>
+    <tr>
+      <th>[% LxERP.t8('Description') %]</th>
+      <td>[% L.input_tag("object.name", SELF.object.name, class='wi-wider', "data-validate"="required", "data-title"=LxERP.t8("Description")) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('IBAN') %]</th>
+      <td>[% L.input_tag("object.iban", SELF.object.iban, class='wi-wider', "data-validate"="required", "data-title"=LxERP.t8("IBAN")) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('QR-IBAN (Swiss)') %]</th>
+      <td>[% L.input_tag("object.qr_iban", SELF.object.qr_iban, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Bank') %]</th>
+      <td>[% L.input_tag("object.bank", SELF.object.bank, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Account number') %]</th>
+      <td>[% L.input_tag("object.account_number", SELF.object.account_number, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('BIC') %]</th>
+      <td>[% L.input_tag("object.bic", SELF.object.bic, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Bank code') %]/[% LxERP.t8('SWIFT') %]</th>
+      <td>[% L.input_tag("object.bank_code", SELF.object.bank_code, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Bank Account Id Number (Swiss)') %]</th>
+      <td>[%- L.input_tag("object.bank_account_id", SELF.object.bank_account_id, class='wi-wider') %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Chart') %]</th>
+      <td>[% P.chart.picker("object.chart_id", SELF.object.chart_id, type='AR_paid,AP_paid', category='A,L,Q', choose=1, class='wi-wider', "data-validate"="required", "data-title"=LxERP.t8("Chart")) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Use with bank import') %]</th>
+      <td>
+        [% L.checkbox_tag('object.use_with_bank_import', checked = SELF.object.use_with_bank_import, for_submit=1) %]
+        <br>
+        <strong>[% LxERP.t8('Warning') %]:</strong> [% LxERP.t8('If this option is disabled, the bank import is not possible for this account anymore. In the case of invoices and accounts payable and receivable entries, incoming and outgoing payments can then be posted directly to the account manually.') %]
+      </td>
+    </tr>
+    <tr>
+     <th>[% LxERP.t8('Use for Factur-X/ZUGFeRD') %]</th>
+     <td>[% L.checkbox_tag('object.use_for_zugferd', checked = SELF.object.use_for_zugferd, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Use for Swiss QR-Bill') %]</th>
+      <td>[% L.checkbox_tag('object.use_for_qrbill', checked = SELF.object.use_for_qrbill, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Obsolete') %]</th>
+      <td>[% L.checkbox_tag('object.obsolete', checked = SELF.object.obsolete, for_submit=1) %]</td>
+    </tr>
+    <tr>
+      <th class="caption" colspan="2">[% LxERP.t8('Reconciliation') %]: </th>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Starting date') %]</th>
+      <td>[% L.date_tag('object.reconciliation_starting_date', SELF.object.reconciliation_starting_date, class="wi-small date") %]</td>
+    </tr>
+    <tr>
+      <th>[% LxERP.t8('Starting balance') %]</th>
+      <td>[% L.input_tag('object.reconciliation_starting_balance_as_number', SELF.object.reconciliation_starting_balance_as_number, class="wi-small numeric") %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
diff --git a/templates/design40_webpages/simple_system_setting/_business_form.html b/templates/design40_webpages/simple_system_setting/_business_form.html
new file mode 100644
index 000000000..7cc78f69c
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_business_form.html
@@ -0,0 +1,26 @@
+[%- USE LxERP -%][%- USE L -%]
+[% SET style="width: 200px" %]
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [%- LxERP.t8("Description") %] </th>
+        <td> [% L.input_tag("object.description", SELF.object.description, style=style, "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+      <tr>
+        <th> [%- LxERP.t8("Discount") %] </th>
+        <td> [% L.input_tag("object.discount_as_percent", SELF.object.discount_as_percent, style=style) %]% </td>
+      </tr>
+      <tr>
+        <th> [%- LxERP.t8("Customernumberinit") %] </th>
+        <td> [% L.input_tag("object.customernumberinit", SELF.object.customernumberinit, style=style) %] </td>
+      </tr>
+      [%- IF LXCONFIG.features.vertreter %] 
+      <tr>
+        <th> [%- LxERP.t8("Representative") %] </th>
+        <td> [% L.checkbox_tag("object.salesman", "value", 1, "checked", SELF.object.salesman, for_submit=1) %] </td>
+      </tr>
+      [%- END %] 
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_default_form.html b/templates/design40_webpages/simple_system_setting/_default_form.html
new file mode 100644
index 000000000..8330242c4
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_default_form.html
@@ -0,0 +1,11 @@
+[%- USE LxERP -%][%- USE L -%]
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Description") %] </th>
+        <td> [% L.input_tag("object.description", LxERP.t8(SELF.object.description), "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_language_form.html b/templates/design40_webpages/simple_system_setting/_language_form.html
new file mode 100644
index 000000000..b7e7f8d3a
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_language_form.html
@@ -0,0 +1,39 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Language") %] </th>
+        <td> [% L.input_tag("object.description", SELF.object.description, class='wi-wider', "data-validate"="required", "data-title"=LxERP.t8("Language")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Template Code") %] </th>
+        <td> [% L.input_tag("object.template_code", SELF.object.template_code, class='wi-wider') %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Article Code") %] </th>
+        <td> [% L.input_tag("object.article_code", SELF.object.article_code, class='wi-wider') %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Number Format") %] </th>
+        <td> [% L.select_tag("object.output_numberformat", SELF.numberformats, default=SELF.object.output_numberformat, with_empty=1, empty_title=LxERP.t8("use program settings"), class='wi-wider') %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Date Format") %] </th>
+        <td> [% L.select_tag("object.output_dateformat", SELF.dateformats, default=SELF.object.output_dateformat, with_empty=1, empty_title=LxERP.t8("use program settings"), class='wi-wider') %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Long Dates") %] </th>
+        <td> [% L.yes_no_tag("object.output_longdates", SELF.object.output_longdates, class='wi-wider') %] </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Obsolete") %]</th>
+        <td>[% L.yes_no_tag("object.obsolete", SELF.object.obsolete, class='wi-wider') %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_order_status_form.html b/templates/design40_webpages/simple_system_setting/_order_status_form.html
new file mode 100644
index 000000000..46160924b
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_order_status_form.html
@@ -0,0 +1,29 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE T8 %]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+  <caption>[% 'RFQ/Order Status' | $T8 %]</caption>
+  <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+    <tbody>
+      <tr>
+        <th>[% LxERP.t8("Name") %]</th>
+        <td>
+          [%- L.input_tag("object.name", SELF.object.name, "data-validate"="required", "data-title"=LxERP.t8("Name"), class='wi-wider') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Description") %]</th>
+        <td>
+          [%- L.input_tag("object.description", SELF.object.description, "data-title"=LxERP.t8("Description"), class='wi-wider') %]
+        </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Obsolete") %]</th>
+        <td>[% L.checkbox_tag("object.obsolete", checked=SELF.object.obsolete, for_submit=1) %]</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_part_classification_form.html b/templates/design40_webpages/simple_system_setting/_part_classification_form.html
new file mode 100644
index 000000000..6783a981d
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_part_classification_form.html
@@ -0,0 +1,28 @@
+[%- USE LxERP -%]
+[%- USE L -%]
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8('Description') %] </th>
+        <td> [% L.input_tag("object.description", LxERP.t8(SELF.object.description), "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8('TypeAbbreviation') %] </th>
+        <td> [% L.input_tag("object.abbreviation", LxERP.t8(SELF.object.abbreviation), size="2", maxlength="2" ) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8('Used for Purchase') %] </th>
+        <td> [% L.checkbox_tag("object.used_for_purchase", checked=(SELF.object.used_for_purchase ? 1:''), for_submit=1) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8('Used for Sale') %] </th>
+        <td> [% L.checkbox_tag("object.used_for_sale", checked=(SELF.object.used_for_sale ? 1:''), for_submit=1) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8('Report separately') %] </th>
+        <td> [% L.checkbox_tag("object.report_separate", checked=(SELF.object.report_separate ? 1:''), for_submit=1) %] </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_parts_group_form.html b/templates/design40_webpages/simple_system_setting/_parts_group_form.html
new file mode 100644
index 000000000..c308f2894
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_parts_group_form.html
@@ -0,0 +1,15 @@
+[%- USE LxERP -%][%- USE L -%]
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th> [% LxERP.t8("Description") %] </th>
+      <td> [%- L.input_tag("object.partsgroup", SELF.object.partsgroup, "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Obsolete") %] </th>
+      <td> [% L.checkbox_tag("object.obsolete", checked=SELF.object.obsolete, for_submit=1) %] </td>
+    </tr>
+  </tbody>
+</table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_price_factor_form.html b/templates/design40_webpages/simple_system_setting/_price_factor_form.html
new file mode 100644
index 000000000..f3ba90c00
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_price_factor_form.html
@@ -0,0 +1,24 @@
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE HTML -%]
+[%- SET orphaned = SELF.object.orphaned %]
+<div class="wrapper">
+  <div class="col">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Description") %] </th>
+        <td> [% L.input_tag("object.description", LxERP.t8(SELF.object.description), "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Factor") %] </th>
+        <td> [% IF orphaned %] [% L.input_tag("object.factor_as_number", LxERP.t8(SELF.object.factor_as_number), "data-validate"="required", "data-title"=LxERP.t8("Factor")) %] [% ELSE %] <span>[% HTML.escape(SELF.object.factor_as_number) %]</span> [% END %] </td>
+      </tr>
+    </tbody>
+  </table>
+
+[% UNLESS orphaned %]
+<div class="long-description" style="float:none;"><p> [% LxERP.t8("Note: the object is already in use. Therefore some values cannot be changed.") %] </p></div>
+[% END %]
+</div>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_pricegroup_form.html b/templates/design40_webpages/simple_system_setting/_pricegroup_form.html
new file mode 100644
index 000000000..268d8c47b
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_pricegroup_form.html
@@ -0,0 +1,28 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE T8 %]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <caption>[% 'Pricegroup' | $T8 %]</caption>
+    <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Description") %] </th>
+        <td> [%- L.input_tag("object.pricegroup", SELF.object.pricegroup, "data-validate"="required", "data-title"=LxERP.t8("Description"), class="wi-wider") %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Obsolete") %] </th>
+        <td> [% L.checkbox_tag("object.obsolete", checked=SELF.object.obsolete, for_submit=1) %] </td>
+      </tr>
+      <tr>
+        <th>[% LxERP.t8("Delete for Customers") %]</th>
+        <td>
+          [% L.checkbox_tag("SELF.remove_customer_pricegroup", checked=SELF.remove_customer_pricegroup, for_submit=1) %]
+          [% LxERP.t8("This will also remove this pricegroup for all customers.") %]
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_requirement_spec_acceptance_status_form.html b/templates/design40_webpages/simple_system_setting/_requirement_spec_acceptance_status_form.html
new file mode 100644
index 000000000..bbdcf665b
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_requirement_spec_acceptance_status_form.html
@@ -0,0 +1,17 @@
+[% USE LxERP %]
+[% USE L %]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Name") %] </th>
+        <td> [% L.select_tag("object.name", SELF.valid_names, default=SELF.object.name, class="wi-wider") %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Description") %] </th>
+        <td> [% L.input_tag("object.description", SELF.object.description, class="wi-wider", "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_requirement_spec_predefined_text_form.html b/templates/design40_webpages/simple_system_setting/_requirement_spec_predefined_text_form.html
new file mode 100644
index 000000000..fa4d5679c
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_requirement_spec_predefined_text_form.html
@@ -0,0 +1,24 @@
+[%- USE LxERP -%]
+[%- USE L -%]
+<div class="wrapper">
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th> [% LxERP.t8("Description") %] </th>
+      <td> [% L.input_tag("object.description", SELF.object.description, size=60, class="initial_focus", "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Title") %] </th>
+      <td> [% L.input_tag("object.title", SELF.object.title, size=60) %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Content") %] </th>
+      <td> [% L.textarea_tag("object.text_as_restricted_html", SELF.object.text_as_restricted_html, class="texteditor", style="width: 800px; height: 300px") %] </td>
+    </tr>
+    <tr>
+      <th> [% LxERP.t8("Useable for…") %] </th>
+      <td> [% L.checkbox_tag("object.useable_for_text_blocks", label=LxERP.t8("Text blocks"), for_submit=1, value=1, checked=SELF.object.useable_for_text_blocks) %] [% L.checkbox_tag("object.useable_for_sections", label=LxERP.t8("Sections"), for_submit=1, value=1, checked=SELF.object.useable_for_sections) %] </td>
+    </tr>
+  </tbody>
+</table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_requirement_spec_status_form.html b/templates/design40_webpages/simple_system_setting/_requirement_spec_status_form.html
new file mode 100644
index 000000000..cd170276f
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_requirement_spec_status_form.html
@@ -0,0 +1,17 @@
+[%- USE LxERP -%]
+[%- USE L -%]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <td> [% LxERP.t8("Name") %] </td>
+        <td> [% L.select_tag("object.name", SELF.valid_names, default=SELF.object.name, class="wi-wide") %] </td>
+      </tr>
+      <tr>
+        <td> [% LxERP.t8("Description") %] </td>
+        <td> [% L.input_tag("object.description", SELF.object.description, "data-validate"="required", "data-title"=LxERP.t8("Description"), class="wi-wide") %] </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_requirement_spec_type_form.html b/templates/design40_webpages/simple_system_setting/_requirement_spec_type_form.html
new file mode 100644
index 000000000..bbc5abcea
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_requirement_spec_type_form.html
@@ -0,0 +1,31 @@
+[% USE HTML %][% USE L %][% USE LxERP %]
+<div class="wrapper">
+  <div class="col">
+  <table class="tbl-horizontal">
+    <tbody>
+      <tr>
+        <th> [% LxERP.t8("Description") %] </th>
+        <td> [% L.input_tag("object.description", SELF.object.description, "data-validate"="required", "data-title"=LxERP.t8("Description")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Print template base file name") %] <sup> (1) </sup> </th>
+        <td> [% L.input_tag("object.template_file_name", SELF.object.template_file_name, "data-validate"="required", "data-title"=LxERP.t8("Print template base file name")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Section number format") %] <sup> (2) </sup> </th>
+        <td> [% L.input_tag("object.section_number_format", SELF.object.section_number_format, size="15", "data-validate"="required", "data-title"=LxERP.t8("Section number format")) %] </td>
+      </tr>
+      <tr>
+        <th> [% LxERP.t8("Function block number format") %] <sup> (2) </sup> </th>
+        <td> [% L.input_tag("object.function_block_number_format", SELF.object.function_block_number_format, size="15", "data-validate"="required", "data-title"=LxERP.t8("Function block number format")) %] </td>
+      </tr>
+    </tbody>
+  </table>
+  <div class="long-description">
+    <p>
+      <sup> (1) </sup> [% LxERP.t8("The base file name without a path or an extension to be used for printing for this type of requirement spec.") %] <br>
+      <sup> (2) </sup> [% LxERP.t8("The numbering will start at 1 with each requirement spec.") %]
+    </p>
+  </div>
+  </div>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/_time_recording_article_form.html b/templates/design40_webpages/simple_system_setting/_time_recording_article_form.html
new file mode 100644
index 000000000..215944b5e
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/_time_recording_article_form.html
@@ -0,0 +1,15 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<div class="wrapper">
+  <table class="tbl-horizontal">
+    <colgroup><col class="wi-mediumsmall"><col class="wi-wide"></colgroup>
+    <tr>
+      <th>[% LxERP.t8("Article") %]</th>
+      <td>
+        [% P.part.picker('object.part_id', SELF.object.part, convertible_unit='min', "data-validate"="required", "data-title"=LxERP.t8("Article"), class="wi-wider") %]
+      </td>
+    </tr>
+  </table>
+</div>
diff --git a/templates/design40_webpages/simple_system_setting/form.html b/templates/design40_webpages/simple_system_setting/form.html
new file mode 100644
index 000000000..dea348a4e
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/form.html
@@ -0,0 +1,17 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[%- INCLUDE "common/flash.html" %]
+
+<form action="controller.pl" method="post" id="form">
+
+ [%- L.hidden_tag("type", SELF.type) %]
+ [%- L.hidden_tag("id", SELF.object.id) %]
+
+ [%- SET sub_file = "simple_system_setting/_" _ sub_form_template _ "_form.html";
+     INCLUDE $sub_file %]
+</form>
diff --git a/templates/design40_webpages/simple_system_setting/list.html b/templates/design40_webpages/simple_system_setting/list.html
new file mode 100644
index 000000000..f0445f6fa
--- /dev/null
+++ b/templates/design40_webpages/simple_system_setting/list.html
@@ -0,0 +1,48 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+<div class="wrapper">
+
+<table id="object_list" class="tbl-list wi-moderate">
+ <thead>
+  <tr>
+   [% IF SELF.supports_reordering %]
+    <th class="img center"><img src="image/updown.png" alt="[ LxERP.t8('reorder item') %]"></th>
+   [% END %]
+   [% FOREACH attribute = SELF.list_attributes %]
+    <th[% IF attribute.align %] align="[% attribute.align %]"[% END %]>[% HTML.escape(attribute.title) %]</th>
+   [% END %]
+  </tr>
+ </thead>
+
+ <tbody>
+  [%- FOREACH object = SELF.all_objects %]
+   <tr id="object_id_[% object.id %]">
+   [% IF SELF.supports_reordering %]
+    <td class="img center dragdrop">[% L.img_tag(src="image/updown.png", alt=LxERP.t8("reorder item")) %]</td>
+   [% END %][%# IF SELF.supports_reordering %]
+   [% FOREACH attribute = SELF.list_attributes %]
+    <td[% IF attribute.align %] align="[% attribute.align %]"[% END %]>
+     [% IF loop.count == 1 %]
+      <a href="[% SELF.url_for(action='edit', type=SELF.type, id=object.id) %]">
+     [% END %][%# IF loop.count == 0 %]
+     [% SET method = attribute.method
+            value  = attribute.exists('formatter') ? attribute.formatter(object) : object.$method ;
+        HTML.escape(value) %]
+     [% IF loop.count == 1 %]
+      </a>
+     [% END %][%# IF loop.count == 0 %]
+    </td>
+   [% END %][%# FOREACH attribute… %]
+   </tr>
+  [%- END %][%# FOREACH object… %]
+ </tbody>
+</table>
+
+</div>
+
+[% IF SELF.supports_reordering %]
+[% L.sortable_element("#object_list tbody", url=SELF.url_for(action="reorder", type=SELF.type), with="object_id") %]
+[% END %]
diff --git a/templates/design40_webpages/t/render.html b/templates/design40_webpages/t/render.html
new file mode 100644
index 000000000..250a6625c
--- /dev/null
+++ b/templates/design40_webpages/t/render.html
@@ -0,0 +1 @@
+[% USE HTML %]Hallo [% HTML.escape(world) %]
diff --git a/templates/design40_webpages/t/render.js b/templates/design40_webpages/t/render.js
new file mode 100644
index 000000000..ac93f8a55
--- /dev/null
+++ b/templates/design40_webpages/t/render.js
@@ -0,0 +1 @@
+Welcome to the [% thingy %]
diff --git a/templates/design40_webpages/task_server/failure_notification_email.txt b/templates/design40_webpages/task_server/failure_notification_email.txt
new file mode 100644
index 000000000..7d9746749
--- /dev/null
+++ b/templates/design40_webpages/task_server/failure_notification_email.txt
@@ -0,0 +1,16 @@
+Hallo,
+
+[% IF history -%]
+der folgende Hintergrundjob ist bei kivitendo für den Mandanten [% client.name %] fehlgeschlagen:
+
+Paketname:  [% history.package_name %]
+Ausgeführt: [% history.run_at_as_timestamp %]
+Fehler:     [% history.error_col %]
+
+[% ELSE -%]
+bei der Ausführung des Task-Servers für den Mandanten [% client.name %] trat die folgende Ausnahme auf:
+
+[% exception %]
+[% END -%]
+MfG,
+kivitendo Task-Server
diff --git a/templates/design40_webpages/task_server/show.html b/templates/design40_webpages/task_server/show.html
new file mode 100644
index 000000000..2ca325d33
--- /dev/null
+++ b/templates/design40_webpages/task_server/show.html
@@ -0,0 +1,37 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+
+<h1>[% FORM.title %]</h1>
+
+[% INCLUDE 'common/flash.html' %]
+
+<div class="wrapper">
+
+  <table id="background_job_history_details" class="background_job_details">
+    <tbody>
+      <tr class="listrow0">
+        <th>[% LxERP.t8('Current status') %]</th>
+        <td>
+          [% IF SELF.task_server.is_running %]
+            [% LxERP.t8('running') %]
+          [% ELSE %]
+            [% LxERP.t8('not running') %]
+          [% END %]
+        </td>
+      </tr>
+      [% IF last_command_output %]
+        <tr class="listrow1">
+          <th>[% LxERP.t8('Last command output') %]</th>
+          <td><pre>[% HTML.escape(last_command_output) %]</pre></td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <form id="form" method="post" action="controller.pl">
+    [% P.hidden_tag("action", "TaskServer/" _ (SELF.task_server.is_running ? "stop" : "start")) %]
+  </form>
+
+</div>
diff --git a/templates/design40_webpages/taxzones/form.html b/templates/design40_webpages/taxzones/form.html
new file mode 100644
index 000000000..482b994da
--- /dev/null
+++ b/templates/design40_webpages/taxzones/form.html
@@ -0,0 +1,50 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+<form action="controller.pl" method="post" id="form">
+[% L.hidden_tag("id", SELF.config.id) %]
+
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag("config.description", SELF.config.description, "data-validate"="required", "data-title"=LxERP.t8("Description")) %]</td>
+    </tr>
+    [% FOREACH bg = BUCHUNGSGRUPPEN %]
+    <tr>
+      <th>[% 'Revenue' | $T8 %] [% HTML.escape(bg.description) %]</th>
+      [% IF NOT SELF.config.id %]
+        <td>[% P.chart.picker('income_accno_id_' _ bg.id, SELF.defaults.income_accno_id, choose=1, type='IC_income,IC_sale', class='wi-wide') %]</td>
+      [% ELSIF SELF.config.id AND SELF.config.orphaned %]
+        <td>[% P.chart.picker('income_accno_id_' _ bg.id, CHARTLIST.${bg.id}.income_accno_id, choose=1, type='IC_income,IC_sale', class='wi-wide') %]</td>
+      [% ELSE %]
+        <td>[% CHARTLIST.${bg.id}.income_accno_description %]</td>
+      [% END %]
+    </tr>
+    <tr>
+      <th>[% 'Expense' | $T8 %] [% HTML.escape(bg.description) %]</th>
+      [% IF NOT SELF.config.id %]
+        <td>[% P.chart.picker('expense_accno_id_' _ bg.id, SELF.defaults.expense_accno_id, choose=1, type='IC_expense,IC_cogs', class='wi-wide') %]</td>
+      [% ELSIF SELF.config.id AND SELF.config.orphaned %]
+        <td>[% P.chart.picker('expense_accno_id_' _ bg.id, CHARTLIST.${bg.id}.expense_accno_id, choose=1, type='IC_expense,IC_cogs', class='wi-wide') %]</td>
+      [% ELSE %]
+        <td>[% CHARTLIST.${bg.id}.expense_accno_description %]</td>
+      [% END %]
+    </tr>
+    [% END %]
+    <tr>
+      <th><i>[% LxERP.t8('Obsolete') %]</i></th>
+      <td>[% L.checkbox_tag('config.obsolete', checked = SELF.config.obsolete, for_submit=1) %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/taxzones/list.html b/templates/design40_webpages/taxzones/list.html
new file mode 100644
index 000000000..b59d96bf2
--- /dev/null
+++ b/templates/design40_webpages/taxzones/list.html
@@ -0,0 +1,26 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%][%- INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+
+<div class="wrapper">
+<table class="tbl-list" id="taxzone_list">
+  <thead>
+    <tr>
+      <th class="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+      <th>[% 'Description' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [%- FOREACH tz = TAXZONES %]
+    <tr id="tzone_id_[% tz.id %]">
+      <td class="center dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+      <td><a href="[% SELF.url_for(action='edit', id=tz.id) %]">[% HTML.escape(tz.description) %]</a></td>
+    </tr>
+    [%- END %]
+  </tbody>
+</table>
+
+
+[% L.sortable_element('#taxzone_list tbody', url=SELF.url_for(action='reorder'), with='tzone_id') %]
+
+</div>
diff --git a/templates/design40_webpages/time_recording/_filter.html b/templates/design40_webpages/time_recording/_filter.html
new file mode 100644
index 000000000..2634279b7
--- /dev/null
+++ b/templates/design40_webpages/time_recording/_filter.html
@@ -0,0 +1,71 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE P %]
+[%- USE LxERP %]
+[%- USE HTML %]
+
+<form action='controller.pl' method='post' id='filter_form'>
+<div class="wrapper">
+
+[% BLOCK filter_toggle_panel %]
+<table id='filter_table' class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Date' | $T8 %] [% 'From Date' | $T8 %]</th>
+      <td>[% L.date_tag('filter.date:date::ge', filter.date_date__ge, class='wi-date') %] [% 'To (time)' | $T8 %][% L.date_tag('filter.date:date::le', filter.date_date__le, class='wi-date') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.customer.customernumber:substr::ilike', filter.customer.customernumber_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Order Number' | $T8 %]</th>
+      <td>[% L.input_tag('filter.order.ordnumber:substr::ilike', filter.order.ordnumber_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project' | $T8 %]</th>
+      <td>[% P.project.picker('filter.project_id', filter.project_id, active="both", valid="both", description_style='both', class='wi-lightwide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Description' | $T8 %]</th>
+      <td>[% L.input_tag('filter.description:substr::ilike', filter.description_substr__ilike, class='wi-lightwide') %]</td>
+    </tr>
+
+    [%- IF SELF.can_view_all -%]
+    <tr>
+      <th>[% 'Mitarbeiter' | $T8 %]</th>
+      <td>
+        [% L.select_tag('filter.staff_member_id', SELF.all_employees,
+                        default    => filter.staff_member_id,
+                        title_key  => 'name',
+                        value_key  => 'id',
+                        with_empty => 1,
+                        class      => 'wi-lightwide') %]
+      </td>
+    </tr>
+  [%- END -%]
+
+    <tr>
+      <th>[% 'Booked' | $T8 %]</th>
+      <td>[% L.select_tag('filter.booked', [ [ '1', LxERP.t8('Yes') ], [ '0', LxERP.t8('No') ] ], default=filter.booked, with_empty=1, class => 'wi-lightwide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+[% L.hidden_tag('sort_by', FORM.sort_by) %]
+[% L.hidden_tag('sort_dir', FORM.sort_dir) %]
+[% L.hidden_tag('page', FORM.page) %]
+<div class="buttons">
+  [% L.button_tag('$("#filter_form").clearForm()', LxERP.t8('Reset'), class='neutral') %]
+</div>
+
+[% END # /BLOCK filter_toggle_panel %]
+
+[% INCLUDE 'common/toggle_panel.html' %]
+
+</div>
+</form>
diff --git a/templates/design40_webpages/time_recording/form.html b/templates/design40_webpages/time_recording/form.html
new file mode 100644
index 000000000..c616ae452
--- /dev/null
+++ b/templates/design40_webpages/time_recording/form.html
@@ -0,0 +1,107 @@
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+[% USE LxERP %]
+[% USE HTML %]
+
+<h1>[% title %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form method="post" action="controller.pl" id="form">
+  [% P.hidden_tag('id',       SELF.time_recording.id) %]
+  [% L.hidden_tag('callback', FORM.callback) %]
+
+  <div class="wrapper">
+    <table class="tbl-horizontal">
+      <tbody>
+        [%- IF SELF.use_duration %]
+        <tr>
+          <th>[% 'Date' | $T8 %]</th>
+          <td>
+            [% P.date_tag('time_recording.date_as_date', SELF.time_recording.date_as_date, class='wi-date', "data-validate"="required", "data-title"=LxERP.t8('Date')) %]<br>
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'Duration' | $T8 %]</th>
+          <td>
+            [% P.input_tag('duration_h', SELF.time_recording.duration_as_hours   || '', class='numeric wi-smallest',
+               "data-validate"="number", "data-title"=LxERP.t8('h'),   "placeholder"=LxERP.format_amount(0.00, 2)) %] [% 'h'   | $T8 %]<sup>(1)</sup>
+            [% P.input_tag('duration_m', SELF.time_recording.duration_as_minutes || '', class='numeric wi-smallest',
+               "data-validate"="number", "data-title"=LxERP.t8('min'), "placeholder"="0"                         ) %] [% 'min' | $T8 %]
+          </td>
+        </tr>
+        [%- ELSE %]
+        <tr>
+          <th>[% 'Start' | $T8 %]</th>
+          <td>
+            [% P.date_tag('start_date',  SELF.start_date, class='wi-date', "data-validate"="required", "data-title"=LxERP.t8('Start date'), onchange='kivi.TimeRecording.set_end_date()') %]
+            [% P.input_tag('start_time', SELF.start_time, type="time", "data-validate"="required", "data-title"=LxERP.t8('Start time')) %]
+            [% P.button_tag('kivi.TimeRecording.set_current_date_time("start")', LxERP.t8('now')) %]
+          </td>
+        </tr>
+        <tr>
+          <th>[% 'End' | $T8 %]</th>
+          <td>
+            [% P.date_tag('end_date',  SELF.end_date, class='wi-date') %]
+            [% P.input_tag('end_time', SELF.end_time, type="time") %]
+            [% P.button_tag('kivi.TimeRecording.set_current_date_time("end")', LxERP.t8('now')) %]
+          </td>
+        </tr>
+        [%- END %]
+        <tr></tr><tr></tr>
+        <tr>
+          <th>[% 'Sales Order' | $T8 %]</th>
+          <td>[% P.select_tag('time_recording.order_id', SELF.all_orders, default=SELF.time_recording.order_id, with_empty=1, class='wi-wide', onchange='kivi.TimeRecording.order_changed(this.value)') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Customer' | $T8 %]</th>
+          <td>[% P.customer_vendor.picker('time_recording.customer_id', SELF.time_recording.customer_id, type='customer', class='wi-wide', "data-validate"="required", "data-title"=LxERP.t8('Customer')) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Project' | $T8 %]</th>
+          <td>[% P.project.picker('time_recording.project_id', SELF.time_recording.project_id, description_style='both', class='wi-wide') %]</td>
+        </tr>
+        <tr></tr><tr></tr>
+        <tr>
+          <th>[% 'Article' | $T8 %]</th>
+          <td>[% P.select_tag('time_recording.part_id', SELF.all_time_recording_articles, default=SELF.time_recording.part_id, with_empty=1, value_key='id', title_key='description', class='wi-wide') %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Description' | $T8 %]</th>
+          <td class="wi-wide">[% L.textarea_tag('time_recording.description', SELF.time_recording.description, style="height: 150px", class="texteditor wi-wide", "data-validate"="required", "data-title"=LxERP.t8('Description')) %]</td>
+        </tr>
+        <tr>
+          <th>[% 'Mitarbeiter' | $T8 %]</th>
+          <td>
+            [%- IF SELF.can_edit_all -%]
+              [% L.select_tag('time_recording.staff_member_id', SELF.all_employees,
+                              default    => SELF.time_recording.staff_member_id,
+                              title_key  => 'safe_name',
+                              value_key  => 'id',
+                              class      => 'wi-wide') %]
+            [%- ELSE -%]
+              [% SELF.time_recording.staff_member.safe_name | html %]
+            [%- END -%]
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  [%- IF SELF.use_duration %]
+  <p>
+    <sup>(1)</sup>
+    [% 'Valid are integer values and floating point numbers, e.g. 4.75h = 4 hours and 45 minutes.' | $T8 %]
+  </p>
+  [%- END %]
+
+</form>
+
+<script type="text/javascript">
+<!--
+  [% FOREACH i = inputs_to_disable %]
+    kivi.TimeRecording.inputs_to_disable.push("[% i %]");
+  [% END %]
+-->
+</script>
diff --git a/templates/design40_webpages/time_recording/report_bottom.html b/templates/design40_webpages/time_recording/report_bottom.html
new file mode 100644
index 000000000..f2c70cd8f
--- /dev/null
+++ b/templates/design40_webpages/time_recording/report_bottom.html
@@ -0,0 +1,4 @@
+[%- USE L %]
+   [% L.paginate_controls(models=SELF.models) %]
+  </form>
+</div>
diff --git a/templates/design40_webpages/time_recording/report_top.html b/templates/design40_webpages/time_recording/report_top.html
new file mode 100644
index 000000000..b1d4f429f
--- /dev/null
+++ b/templates/design40_webpages/time_recording/report_top.html
@@ -0,0 +1,3 @@
+[%- PROCESS 'time_recording/_filter.html' filter=SELF.models.filtered.laundered %]
+<div class="wrapper">
+  <form method="post" action="controller.pl" id="form">
diff --git a/templates/design40_webpages/todo/show_todo_list.html b/templates/design40_webpages/todo/show_todo_list.html
new file mode 100644
index 000000000..7fc835f1d
--- /dev/null
+++ b/templates/design40_webpages/todo/show_todo_list.html
@@ -0,0 +1,12 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Your TODO list' | $T8 %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+[% IF !todo_list %]
+  <p>[% 'There are no items on your TODO list at the moment.' | $T8 %]</p>
+[% ELSE %]
+  [% todo_list %]
+[% END %]
diff --git a/templates/design40_webpages/ustva/config_step1.html b/templates/design40_webpages/ustva/config_step1.html
new file mode 100644
index 000000000..e6a3d504c
--- /dev/null
+++ b/templates/design40_webpages/ustva/config_step1.html
@@ -0,0 +1,61 @@
+[% USE T8 %]
+[% USE HTML %]
+
+<h1>[% 'Tax Office Preferences' | $T8 %]</h1>
+
+<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]" id="form">
+
+[% IF COA_Germany %]
+  <fieldset>
+    <legend><b>[% 'Local Tax Office Preferences' | $T8 %]</b></legend><br>
+    [% select_tax_office %]
+  </fieldset>
+[% END %]
+
+<fieldset>
+  <legend><b>[% 'Taxation' | $T8 %]</b></legend>
+  [% IF method_local %]
+    [% method_local %]
+  [% END %]
+</fieldset>
+       
+<fieldset>
+  <legend><b>[% 'Tax Period' | $T8 %]</b></legend>
+  <input name="fa_voranmeld" id="month" type="radio" value="month" [% checked_monthly %]> 
+    <label for="month">[% 'month' | $T8 %]</label> <br>
+  <input name="fa_voranmeld" id="quarter" type="radio" value="quarter" [% checked_quarterly %]> 
+    <label for="quarter">[% 'quarter' | $T8 %]</label><br>
+  <input name="fa_dauerfrist" id="fa_dauerfrist" type="checkbox" value="1" [% checked_dauerfristverlaengerung %]>
+    <label for="">[% 'Extension Of Time' | $T8 %]</label>
+</fieldset>
+
+
+<fieldset>
+  <legend><b>[% 'Tax Consultant' | $T8 %]</b></legend>
+  <!-- <input name="fa_71" id="fa_71" type="checkbox" value="X" [% checked_kz_71 %]> <label for="fa_71">[% 'Clearing Tax Received (No 71)' | $T8 %]</label> -->
+  <table class="tbl-list">
+    <thead>
+      <tr>
+        <td>[% 'Name' | $T8 %]</td>
+        <td>[% 'Street' | $T8 %]</td>
+        <td>[% 'Zip, City' | $T8 %]</td>
+        <td>[% 'Telephone' | $T8 %]</td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><input type="text" name="fa_steuerberater_name" id="steuerberater" size="25" value="[% HTML.escape(fa_steuerberater_name) %]"></td>
+        <td><input type="text" name="fa_steuerberater_street" id="steuerberater" size="25" value="[% HTML.escape(fa_steuerberater_street) %]"></td>
+        <td><input type="text" name="fa_steuerberater_city" id="steuerberater" size="25" value="[% HTML.escape(fa_steuerberater_city) %]"></td>
+        <td><input type="text" name="fa_steuerberater_tel" id="steuerberater" size="25" value="[% HTML.escape(fa_steuerberater_tel) %]"> 
+      </tr>
+    </tbody>
+  </table>
+</fieldset>
+
+
+[% FOREACH var = hidden_variables %]
+  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+[% END %]
+
+</form>
diff --git a/templates/design40_webpages/ustva/config_step2.html b/templates/design40_webpages/ustva/config_step2.html
new file mode 100644
index 000000000..0e793abad
--- /dev/null
+++ b/templates/design40_webpages/ustva/config_step2.html
@@ -0,0 +1,169 @@
+[%- USE T8 %]
+[% USE HTML %]
+<h1>[% 'Tax Office Preferences' | $T8 %]</h1>
+
+  <form name="elsterform" method="post" action="[% script %]" id="form">
+    <table width="100%">
+       <tr>
+         <td colspan=2>
+           <br>
+           <!-- Start Finanzamtdaten -->
+           <br>
+           <fieldset>
+             <legend>
+               <font size="+1">[% 'Tax Office' | $T8 %]
+               [% HTML.escape(fa_name) %]</font>
+             </legend>
+             <table width="100%" valign="top">
+                <tr>
+                  <td valign="top">
+                    <br>
+                    <fieldset>
+                      <legend>
+                      <b>[% 'Address' | $T8 %]</b>
+                      </legend>
+                      <table width="100%">
+                        <tr>
+                          <td>
+                            [% 'Tax Office' | $T8 %]
+                          </td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <input type="text" name="fa_name" size="40" title="Name" value="[% HTML.escape(fa_name) %]" [% readonly %]>
+                          <td>
+                        </tr>
+                        <tr>
+                          <td colspan="2">
+                            <input type="text" name="fa_strasse" size="40" title="Strasse" value="[% HTML.escape(fa_strasse) %]" [% readonly %]>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td width="116px">
+                            <input type="text" name="fa_plz" size="10" title="PLZ" value="[% HTML.escape(fa_plz) %]" [% readonly %]>
+                          </td>
+                          <td>
+                            <input type="text" name="fa_ort" size="20" title="Ort" value="[% HTML.escape(fa_ort) %]" [% readonly %]>
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            [% 'PLZ Grosskunden' | $T8 %]
+                          </td>
+                          <td>
+                            <input type="text" name="fa_plz_grosskunden" size="20" title="OrtGK" value="[% HTML.escape(fa_plz_grosskunden) %]" [% readonly %]>
+                          </td>
+                        </tr>
+                      </table>
+                    </fieldset>
+                    <br>
+                    <fieldset>
+                      <legend>
+                        <b>[% 'Contact' | $T8 %]</b>
+                      </legend>
+                        [% 'Telephone' | $T8 %]<br>
+                        <input type="text" name="fa_telefon" size="40" title="Telefon" value="[% HTML.escape(fa_telefon) %]" [% readonly %]>
+                        <br>
+                        <br>
+                        [% 'Fax' | $T8 %]<br>
+                        <input type="text" name="fa_fax" size="40" title="Fax" value="[% HTML.escape(fa_fax) %]" [% readonly %]>
+                        <br>
+                        <br>
+                        [% 'Email' | $T8 %]<br>
+                        <input type="text" name="fa_email" size="40" title="Email" value="[% HTML.escape(fa_email) %]" [% readonly %]>
+                        <br>
+                        [% 'Internet' | $T8 %]<br>
+                        <br>
+                        <input type="text" name="fa_internet" size="40" title="Internet" value="[% HTML.escape(fa_internet) %]" [% readonly %]>
+                        <br>
+                    </fieldset>
+                  </td>
+                  <td valign="top">
+                    <br>
+                    <fieldset>
+                    <legend>
+                    <b>[% 'Openings' | $T8 %]</b>
+                    </legend>
+                    <textarea name="fa_oeffnungszeiten" rows="4" cols="40"
+                      [% readonly %]>[% HTML.escape(fa_oeffnungszeiten) %]</textarea>
+                    </fieldset>
+                    <br>
+                      <fieldset>
+                      <legend>
+                        <b>[% 'Bank Connection Tax Office' | $T8 %]</b>
+                      </legend>
+                      <table>
+                      <tr>
+                        <td width="40%">
+                          [% 'Bank' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_bankbezeichnung_1" size="30" value="[% HTML.escape(fa_bankbezeichnung_1) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Account Nummer' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_kontonummer_1" size="15" value="[% HTML.escape(fa_kontonummer_1) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Bank Code (long)' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_blz_1" size="15" value="[% HTML.escape(fa_blz_1) %]" [% readonly %]>
+                        </td>
+                        <td width="40%">
+                          [% 'Bank' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_bankbezeichnung_2" size="30" value="[% HTML.escape(fa_bankbezeichnung_2) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Account Nummer' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_kontonummer_2" size="15" value="[% HTML.escape(fa_kontonummer_2) %]" [% readonly %]>
+                          <br>
+                          <br>
+                          [% 'Bank Code (long)' | $T8 %]
+                          <br>
+                          <input type="text" name="fa_blz_2" size="15" value="[% HTML.escape(fa_blz_2) %]" [% readonly %]>
+                        </td>
+              </tr>
+             </table>
+           </fieldset>
+         </td>
+       </tr>
+    </table>
+  </fieldset>
+
+<!-- Stop Finanzamtdaten  -->
+
+        </td>
+       </tr>
+       <tr>
+         <td colspan="2">
+           <br>
+           <fieldset>
+           <legend>
+           <font size="+1">[% 'Tax Number' | $T8 %]</font>
+           </legend>
+           <br>
+[%- IF COA_Germany %]
+           [% input_steuernummer %]
+[%- ELSE %]
+[% 'Please enter the taxnumber in the client configuration.' | $T8 %]
+[% 'Current value:' | $T8 %] [% HTML.escape(MYCONFIG.taxnumber) %]
+[%- END %]
+
+
+           <br>
+           </fieldset>
+           <br>
+           <br>
+           <hr>
+         </td>
+       </tr>
+  </table>
+
+[%- FOREACH var = hidden_variables %]
+  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+[%- END %]
+
+
+  </form>
diff --git a/templates/design40_webpages/ustva/report.html b/templates/design40_webpages/ustva/report.html
new file mode 100644
index 000000000..cdc66b204
--- /dev/null
+++ b/templates/design40_webpages/ustva/report.html
@@ -0,0 +1,184 @@
+[%- USE T8 %]
+[% USE HTML %][%- USE L -%]
+<h1>[% HTML.escape(title) %]</h1>
+
+ <form method="post" id="form_do" action="[% HTML.escape(script) %]">
+
+ [%- INCLUDE 'common/flash.html' %]
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
+
+ <table width="100%">
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <td width="50%" align="left" valign="top">
+            <fieldset>
+            <legend>
+            <b>[% 'Company' | $T8 %]</b>
+            </legend>
+
+            [% company_given %]
+            [% address_given %]
+
+            <br />
+            <br />
+            [% 'Tel' | $T8 %].:&nbsp;
+            [% HTML.escape(co_tel) %]
+            <br />
+            [% 'Fax' | $T8 %].:&nbsp;
+            [% HTML.escape(co_fax) %]
+            <br />
+            <br />
+            [% HTML.escape(co_email) %]
+            <br />
+            <br />
+
+            [% 'Tax Number' | $T8 %]:&nbsp;
+[%- IF COA_Germany %]
+            [% taxnumber_given %]
+            <br />
+[%- ELSE %]
+            [% taxnumber %]
+[%- END %]
+            </fieldset>
+            <br />
+
+            [%- IF fa_steuerberater_name %]
+              <fieldset>
+              <legend>
+                <input type="checkbox" title="[% 'Assume Tax Consultant Data in Tax Computation?' | $T8 %]" name="fa_steuerberater" id="steuerberater" value="1" checked>
+                 &nbsp;<b>[% 'Tax Consultant' | $T8 %]</b>
+              </legend>
+
+                [% HTML.escape(fa_steuerberater_name) %]<br />
+                [% HTML.escape(fa_steuerberater_street) %]<br />
+                [% HTML.escape(fa_steuerberater_city) %]<br />
+                [% 'Tel.' | $T8 %] [% HTML.escape(fa_steuerberater_tel) %]<br />
+              </fieldset>
+              <br />
+            [%- END %]
+
+            <fieldset>
+            <legend>
+            <b>[% 'Tax Period' | $T8 %]</b>
+            </legend>
+            [% select_year %] [% ustva_vorauswahl %]
+            <br />
+            [% checkbox_kz_10 %]
+            [% checkbox_kz_22 %]
+            <br />
+            [% checkbox_kz_29 %]
+            [% checkbox_kz_26 %]
+            <br />
+            [%- IF fa_voranmeld %]
+              <br />
+              [% period_local %]
+              [%- IF fa_dauerfrist %]
+                [% 'With Extension Of Time' | $T8 %]
+              [%- END %]
+              <br />
+            [%- END %]
+
+            [%- IF method_local %]
+              [% 'Method' | $T8 %]: [% method_local %]
+            [%- END %]
+            </fieldset>
+          </td>
+          <td width="50%" valign="top">
+              <fieldset>
+              <legend>
+                 <b>[% 'Tax Office' | $T8 %]</b>
+              </legend>
+              <h3>[% fa_name_given %]</h3>
+
+              [% HTML.escape(fa_strasse) %]
+              <br>
+              [% HTML.escape(fa_plz) %]&nbsp; &nbsp;[% HTML.escape(fa_ort) %]
+              <br>
+              <br>
+              [% 'Tel' | $T8 %].:&nbsp;
+              [% HTML.escape(fa_telefon) %]
+              <br>
+              [% 'Fax' | $T8 %].:&nbsp;
+              [% HTML.escape(fa_fax) %]
+              <br>
+              <br>
+              <!-- Mailto alles Maskieren! -->
+              <a href="mailto:[% HTML.escape(fa_email) %]
+                ?subject=&quot;[% HTML.escape(taxnumber) %]:&quot;
+                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
+                &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
+                %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
+                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
+              [% HTML.escape(fa_email) %]
+              </a>
+              <br>
+              <a href="[% fa_internet %]">
+              [% HTML.escape(fa_internet) %]
+              </a>
+              <br>
+              <br>
+              [% 'Openings' | $T8 %]
+              <br>
+              [% openings %]
+              <br>
+              <br>
+              [% 'Bank Connections' | $T8 %]
+              <table>
+              <tr>
+
+              [%- FOREACH row = tax_office_banks %]
+                  <td width="40%">
+                  [% HTML.escape(row.Bankbezeichnung) %]
+                  <br>
+                  [% 'Account' | $T8 %]:&nbsp;
+                  [% HTML.escape(row.Kontonummer) %]
+                  <br>
+                  [% 'Bank Code' | $T8 %]:&nbsp;
+                  [% HTML.escape(row.BLZ) %]
+                  </td>
+              [%- END %]
+
+              </tr>
+              </table>
+              <br>
+              </fieldset>
+          </td>
+        </tr>
+      </table>
+     </td>
+    </tr>
+    <tr>
+     <td><hr size="3" noshade></td>
+    </tr>
+  </table>
+
+  <br>
+  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
+  <input type="hidden" name="reporttype" value="custom">
+  <input type="hidden" name="co_zip" value="[% HTML.escape(co_zip) %]">
+  <input type="hidden" name="co_tel" value="[% HTML.escape(co_tel) %]">
+  <input type="hidden" name="co_email" value="[% HTML.escape(co_email) %]">
+  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
+  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
+  <input type="hidden" name="account_method" value="[% HTML.escape(account_method) %]">
+  <input type="hidden" name="fa_bufa_nr" value="[% HTML.escape(fa_bufa_nr) %]">
+  [% L.hidden_tag("format", "html") %]
+</form>
+[%- IF LXCONFIG.paths.geierlein_path %]
+<script type='text/javascript'>
+
+  function sendGeierlein () {
+    kivi.submit_ajax_form('controller.pl?action=ODGeierlein/send', $('#form_do'));
+    return false;
+  }
+
+  function openGeierlein(myimport) {
+    localStorage["geierlein.import"] = myimport;
+    var geierpath = '[% LXCONFIG.paths.geierlein_path %]';
+    window.open(geierpath + '/#importLocalStorage','_blank','');
+    return false;
+  }
+</script>
+[%- END %]
diff --git a/templates/design40_webpages/ustva/ustva.html b/templates/design40_webpages/ustva/ustva.html
new file mode 100644
index 000000000..bd431ab6e
--- /dev/null
+++ b/templates/design40_webpages/ustva/ustva.html
@@ -0,0 +1,411 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+<link rel="stylesheet" type="text/css" href="css/kivitendo/ustva.css">
+
+<body>
+<h1>Vorschau Umsatzsteuer-Voranmeldung</h1>
+<h2>Zeitraum vom [%fromdate%] bis [%todate%] </h2>
+
+<!-- Diese HTML-Formular ist nicht selbstrechnend.
+<p><small>Wenn ein (selbstrechnendes) Formular verwendet wird, genügt es, die
+gelb hinterlegten Felder auszufüllen. Die anderen Felder werden dann
+automatisch berechnet.</small></p>
+-->
+
+<table width="100%">
+<tr align="left">
+  <td class="text">Steuernummer: [%steuernummer%]</td>
+  <td class="text" width="100px">&nbsp</td>
+  <td class="text" align="right">Datum ([%Datum_heute%])</td>
+</tr>
+<tr>
+  <td class="text" colspan="3"><br /></td>
+</tr>
+<tr align="left">
+  <td class="text">
+    Finanzamt [%FA_Name%]<br />
+    [%FA_Strasse%]<br />
+    [%FA_PLZ%] [%FA_Ort%]<br />
+    Fax: [%FA_FAX%]
+  </td>
+  <td class="text">&nbsp;</td>
+  <td class="text">
+    Firma [%company%]<br />
+    [% IF company_street %]
+      [% company_street %]<br />
+    [% END %]
+      [%company_city%]<br />
+    [%IF !company_street%]
+    [%address%]<!--used Address-->
+    [%END %]
+  </td>
+</tr>
+<tr>
+  <td class="text" colspan="3"><br />
+  </td>
+</tr>
+</table>
+<table>
+  <tbody>
+    <tr>
+      <td class="text"><b class="h3">I. Anmeldung der
+Umsatzsteuer-Vorauszahlung </b></td>
+      <td colspan="4"></td>
+    </tr>
+    <tr>
+      <td class="text"><b class="h4">Lieferungen und sonstige Leistungen</b></td>
+      <td colspan="4"></td>
+    </tr>
+        <tr>
+      <td class="text2">an innergemeinschaftliche Abnehmer <b>mit</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>41<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_41%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text">neuer Fahrzeuge an Abnehmer <b>ohne</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>44<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_44%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">neuer Fahrzeuge au&szlig;erhalb eines Unternehmens</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>49<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_49%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text">Weitere steuerfreie Ums&auml;tze mit Vorsteuerabzug</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>43<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_43%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">Steuerfreie Ums&auml;tze ohne
+Vorsteuerabzug. </b><br />Ums&auml;tze nach &sect; 4 Nr. 8 bis 20 UStG</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>48<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_48%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+
+    <tr>
+      <td class="text"><b class="h4">Steuerpflichtige Ums&auml;tze</b></td>
+      <td colspan="4"></td>
+    </tr>
+[% IF !year2007%]
+     <tr>
+      <td class="text2">zum Steuersatz von 16 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_51%]<br></td>
+      <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_511%]</td>
+    </tr>
+[%END%]
+[% IF year2007%]
+    <tr>
+      <td class="text2">zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_81%]<br></td>
+      <td class="spalte"><span class="nodis">(Spalte 81 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_811%]</td>
+    </tr>
+[%END%]
+
+    <tr>
+      <td class="text">zum Steuersatz von 7 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_86%]</td>
+      <td class="spalte"><span class="nodis">(Spalte 86 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_861%]</td>
+    </tr>
+[% IF pos_ustva_81b_kivi || pos_ustva_86b_kivi %]
+    <tr>
+      <td class="text2">zum Steuersatz von 16 v.H.(2020 Konjunktur)</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>81b-kivi<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_81b_kivi%]<br></td>
+      <td class="spalte"><span class="nodis">(Informativ)</span></td>
+      <td class="betrag">[%pos_ustva_811b_kivi%]</td>
+    </tr>
+    <tr>
+      <td class="text2">zum Steuersatz von 5 v.H.(2020 Konjunktur)</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86b-kivi<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_86b_kivi%]<br></td>
+      <td class="spalte"><span class="nodis">(Informativ)</span></td>
+      <td class="betrag">[%pos_ustva_861b_kivi%]</td>
+    </tr>
+[%END%]
+    <tr>
+      <td class="text2">andere Steuers&auml;tze</td>
+      <td class="spalte ausfuellen"><span class="nodis"></span>35 <span class="nodis"></span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_35%]</td>
+      <td class="spalte">36</td>
+      <td class="betrag ausfuellen">[%pos_ustva_36%]</td>
+    </tr>
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+   <tr>
+      <td class="text">Lieferungen in das &uuml;brige Gemeinschaftsgebiet <b>mit</b> USt-IdNr</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>77<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_77%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+    <tr>
+      <td class="text2">Ums&auml;tze, nach &sect;24 UStG (S&auml;gewerkserzeugnisse, alkoholische Getr&auml;nke etc.)</td>
+      <td class="spalte ausfuellen"><span class="nodis"></span>76 <span class="nodis"></span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_76%]</td>
+      <td class="spalte">80</td>
+      <td class="betrag ausfuellen">[%pos_ustva_80%]</td>
+    </tr>
+    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+    <tr>
+      <td class="text"><b class="h3">Innergemeinschaftliche Erwerbe</b></td>
+      <td colspan="4"></td>
+    </tr>
+   <tr>
+      <td class="text2">Steuerfrei nach &sect;4b UStG</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>91<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_91%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+[% IF !year2007%]
+    <tr>
+      <td class="text">Steuerpflichtige zum Steuersatz von 16 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_97%]<br></td>
+      <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_971%]</td>
+    </tr>
+[%END%]
+[%IF year2007%]
+    <tr>
+      <td class="text">Steuerpflichtige zum Steuersatz von 19 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>89<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_89%]<br></td>
+      <td class="spalte"><span class="nodis">(Spalte 89 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_891%]</td>
+    </tr>
+[%END %]
+    <tr>
+      <td class="text2">zum Steuersatz von 7 v.H.</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_93%]</td>
+      <td class="spalte"><span class="nodis">(Spalte 93 rechts)</span></td>
+      <td class="betrag">[%pos_ustva_931%]</td>
+    </tr>
+    <tr>
+      <td class="text">zu anderen Steuers&auml;tzen</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>95<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_95%]</td>
+      <td class="spalte">98</td>
+      <td class="betrag">[%pos_ustva_98%]</td>
+    </tr>
+    <tr>
+      <td class="text2"><b class="h4">neuer Fahrzeuge von Lieferern</b>
+             von Lieferanten <b>ohne</b> USt.IdNr. <br class="nodis" />
+       zum allgemeinen Steuersatz</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>94<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_94%]</td>
+      <td class="spalte"><span class="nodis">(Spalte </span>96<span class="nodis">)</span></td>
+      <td class="betrag">[%pos_ustva_96%]</td>
+    </tr>
+        <tr><td class="text">&nbsp;</td><td colspan="4"></td></tr>
+   <tr>
+      <td class="text">Lieferungen des ersten Abnehmers bei
+        innergemeinschaftlichen Dreiecksgeschften (&sect;25b Abs. 2 UStG)</td>
+      <td class="spalte ausfuellen">42</td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_42%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+   <tr>
+      <td class="text2">Steuerpflichtige Umsätze im Sinne, f&uuml;r die der
+        <b>Leistungsempf&auml;nger die Steuer schuldet</b></td>
+      <td class="spalte ausfuellen">60</td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_60%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+[%IF year2010%]
+   <tr>
+      <td class="text2"><b>Nicht steuerbare Leistungen</b> gem. &sect; 18b Satz 1 Nr. 2 UStG</td>
+      <td class="spalte ausfuellen">21</td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_21%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+[%END%]
+   <tr>
+      <td class="text">Im Inland nicht steuerbare Ums&auml;tze</td>
+      <td class="spalte ausfuellen">45</td>
+      <td class="betrag ausfuellen" width="70">[%pos_ustva_45%]<br></td>
+      <td class="spalte"><span class="nodis"></span></td>
+      <td class="betrag"></td>
+    </tr>
+
+    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="2"></td><td colspan="2"></td></tr>
+
+    <tr>
+      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 43<span class="nodis">)</span></td>
+      <td class="betrag">[%pos_ustva_Z43%]</td>
+    </tr>
+
+    <tr class="uebertrag">
+      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 45<span class="nodis">)</span></td>
+      <td class="betrag">[%Z45%]</td>
+    </tr>
+
+[%IF year2010%]
+    <tr>
+      <td class="text2">Im Inland steuerpflichtige sonstige Leistungen von im &uuml;brigen Gemeinschaftsgebiet ans&auml;ssigen Unternehmen (&sect;13b Abs. 1 UStG)</td>
+      <td class="spalte ausfuellen">46</td>
+      <td class="betrag ausfuellen">[%pos_ustva_46%]</td>
+      <td class="spalte">47</td>
+      <td class="betrag">[%pos_ustva_47%]</td>
+    </tr>
+[%END%]
+    <tr>
+      <td class="text2">Leistungen eines im Ausland ans&auml;ssigen Unternehmers</td>
+      <td class="spalte ausfuellen">52</td>
+      <td class="betrag ausfuellen">[%pos_ustva_52%]</td>
+      <td class="spalte">53</td>
+      <td class="betrag">[%pos_ustva_53%]</td>
+    </tr>
+    <tr>
+      <td class="text">Lieferungen sicherungsübereigneter Gegenst&auml;nde und
+           Ums&auml;tze, die unter das GrEStG fallen.</td>
+      <td class="spalte ausfuellen">73</td>
+      <td class="betrag ausfuellen">[%pos_ustva_73%]</td>
+      <td class="spalte">74</td>
+      <td class="betrag">[%pos_ustva_74%]</td>
+    </tr>
+    <tr>
+      <td class="text2">Bauleistungen eines im Inland ans&auml;ssigen Unternehmers</td>
+      <td class="spalte ausfuellen">84</td>
+      <td class="betrag ausfuellen">[%pos_ustva_84%]</td>
+      <td class="spalte">85</td>
+      <td class="betrag">[%pos_ustva_85%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Steuer wegen Wechsel der Besteuerungsform und
+         Nachsteuer auf versteuerte Anzahlungen wegen Steuersatzerh&ouml;hung.</td>
+      <td class="spalte ausfuellen">65</td>
+      <td class="betrag ausfuellen">[%pos_ustva_65%]</td>
+    </tr>
+
+
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
+      <td class="betrag">[%Z53%]</td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
+
+    <tr>
+      <td class="text" colspan="3"><b class="h3">Abziehbare Vorsteuerbetr&auml;ge</b></td>
+      <td colspan="2"></td></tr>
+    </tr>
+
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge von Rechnungen von anderen Unternehmern</td>
+      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>66<span class="nodis">)</span></td>
+      <td class="betrag ausfuellen">[%pos_ustva_66%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus dem innergemeinschaftlichen Erwerb</td>
+      <td class="spalte ausfuellen">61</td>
+      <td class="betrag ausfuellen">[%pos_ustva_61%]</td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Entrichtete Einfuhrumsatzsteuer</td>
+      <td class="spalte ausfuellen">62</td>
+      <td class="betrag ausfuellen">[%pos_ustva_62%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Vorsteuerbetr&auml;ge aus Leistungen im Sinne
+          des &sect;13b Abs. 1 UStG</td>
+      <td class="spalte ausfuellen">67</td>
+      <td class="betrag ausfuellen">[%pos_ustva_67%]</td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerbetr&auml;ge, die nach allgemeinen
+           Durchschnitts&auml;tzen berechnet sind </td>
+      <td class="spalte ausfuellen">63</td>
+      <td class="betrag ausfuellen">[%pos_ustva_63%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Berichtigung des Vorsteuerabzugs</td>
+      <td class="spalte ausfuellen">64</td>
+      <td class="betrag ausfuellen">[%pos_ustva_64%]</td>
+    </tr>
+    <tr>
+      <td class="text2" colspan="3">Vorsteuerabzug f&uuml;r innergemeinschaftliche Lieferungen
+        neuer Fahrzeuge au&szlig;erhalb eines Unternehmens sowie von Kleinunternehmern</td>
+      <td class="spalte ausfuellen">59</td>
+      <td class="betrag ausfuellen">[%pos_ustva_59%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Verbleibender Betrag</td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 62<span class="nodis">)</span></td>
+      <td class="betrag">[%Z62%]</td>
+    </tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Andere Steuerbetr&auml;ge</b></td>
+      <td colspan="2"></td></tr>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">in Rechnungen unrichtig oder unberechtigt ausgewiesene
+        Steuerbetr&auml;ge sowie Steuerbetr&auml;ge, die nach
+        &sect;4 Nr. 4a, &sect; 6a Abs. 4, &sect;7 oder &sect;25b UStG geschuldet werden</td>
+      <td class="spalte ausfuellen">69</td>
+      <td class="betrag ausfuellen">[%pos_ustva_69%]</td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+
+    <tr>
+      <td class="text2" colspan="3"><b class="h3">Umsatzsteuer-Vorauszahlung/&Uuml;berschuss</b></td>
+      <td class="zeile"><span class="nodis">(</span>Zeile 65<span class="nodis">)</span></td>
+      <td class="betrag">[%Z65%]</td>
+    </tr>
+    <tr>
+      <td class="text" colspan="3">Anrechnung (Abzug) der festgesetzten Sondervorauszahlung
+        f&uuml;r Dauerfristverl&auml;ngerung (nur in der letzten Voranmeldung des
+        Besteuerungszeitraums ausf&uuml;llen)</td>
+      <td class="spalte ausfuellen">39</td>
+      <td class="betrag ausfuellen">[%pos_ustva_39%]</td>
+    </tr>
+
+    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
+
+    <tr class="noborder">
+      <td class="text2" colspan="3"><b class="h3">Verbleibende Umsatzsteuer-Vorauszahlung bzw.
+                                      Verbleibender &Uuml;berschuss</b></td>
+      <td class="spalte ausfuellen">83</td>
+      <td class="summe">[%pos_ustva_83%]</td>
+    </tr>
+
+  </tbody>
+</table>
+[%IF FA_steuerberater%]
+<p>
+Steuerberater:<br />
+[%FA_steuerberater_name%]<br />
+[%FA_steuerberater_street%]<br />
+[%FA_steuerberater_city%]<br />
+Tel:&nbsp;[%FA_steuerberater_tel%]</p>
+[%END%]
diff --git a/templates/design40_webpages/vk/search_invoice.html b/templates/design40_webpages/vk/search_invoice.html
new file mode 100644
index 000000000..b74c8bac3
--- /dev/null
+++ b/templates/design40_webpages/vk/search_invoice.html
@@ -0,0 +1,269 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% SET style="width: 250px" %]
+
+<h1>[% title %]</h1>
+
+<form method=post name="search_invoice" action=[% script %]>
+<div class="wrapper">
+
+<input type="hidden" name="sort" value="transdate">
+<input type=hidden name=nextsub value=[% nextsub %]>
+
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Sorting' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-small"><col class="wi-mediumsmall"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Main sorting' | $T8 %]</th>
+      <td>
+        <select name="mainsort" id="mainsort">
+          <option value="description">[% 'Part' | $T8 %]</option>
+          <option value="customername">[% 'Customer' | $T8 %]</option>
+          <option value="country">[% 'Country' | $T8 %]</option>
+          <option value="partsgroup">[% 'Partsgroup' | $T8 %]</option>
+          <option value="business">[% 'Customer type' | $T8 %]</option>
+          <option value="salesman" selected="selected">[% 'Salesman' | $T8 %]</option>
+          <option value="month">[% 'Month' | $T8 %]</option>
+          <option value="shipvia">[% 'Ship via' | $T8 %]</option>
+        </select>
+      </td>
+      <td>
+        <input name="l_headers_mainsort" id="l_headers_mainsort" type=checkbox value=Y checked><label for="l_headers_mainsort">[% 'Heading' | $T8 %]</label><br>
+        <input name="l_subtotal_mainsort" id="l_subtotal_mainsort" type=checkbox value=Y checked><label for="l_subtotal_mainsort">[% 'Subtotal' | $T8 %]</label>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Secondary sorting' | $T8 %]</th>
+      <td>
+        <select name="subsort" id="subsort">
+          <option value="description">[% 'Part' | $T8 %]</option>
+          <option value="customername">[% 'Customer' | $T8 %]</option>
+          <option value="country">[% 'Country' | $T8 %]</option>
+          <option value="partsgroup">[% 'Partsgroup' | $T8 %]</option>
+          <option value="business">[% 'Customer type' | $T8 %]</option>
+          <option value="salesman">[% 'Salesman' | $T8 %]</option>
+          <option value="month" selected="selected">[% 'Month' | $T8 %]</option>
+        </select>
+      </td>
+      <td>
+        <input name="l_headers_subsort" id="l_headers_subsort" type=checkbox value=Y checked><label for="l_headers_subsort">[% 'Heading' | $T8 %]</label><br>
+        <input name="l_subtotal_subsort" id="l_subtotal_subsort" type=checkbox value=Y checked><label for="l_subtotal_subsort">[% 'Subtotal' | $T8 %]</label>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Item & Sums' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Item mode' | $T8 %]</th>
+      <td><input name="l_parts" type=checkbox value=Y> ([%'Show items from invoices individually' | $T8 %])</td>
+    </tr>
+    <tr>
+      <th>[% 'Total sum' | $T8 %]</th>
+      <td><input name="l_total" type=checkbox value=Y checked> [% 'Decimalplaces' | $T8 %]: <input type="text" name="decimalplaces" size="2" value="2"></td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Parts' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <td>[% P.input_tag("partnumber", "", class='wi-small') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <td>[% P.input_tag("description", "", class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Partsgroup' | $T8 %]</th>
+      <td>[% P.select_tag("partsgroup_id", ALL_PARTSGROUPS, title_key="partsgroup", with_empty=1, class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Invoices' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Invoice Date' | $T8 %]</th>
+      <td><span class="wi-date">
+        [% #'From' | $T8 %]
+        [% L.date_tag('transdatefrom') %]
+        [% 'Bis' | $T8 %]
+        [% L.date_tag('transdateto') %]
+      </span></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.col -->
+
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Customers' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Customer' | $T8 %]</th>
+      <td>[% P.input_tag( "customer", "", class="initial_focus wi-wide" ) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer Number' | $T8 %]</th>
+      <td>[% P.input_tag( "customernumber", "", class='wi-small' ) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Customer type' | $T8 %]</th>
+      <td>[% L.select_tag("business_id", ALL_BUSINESS_TYPES, title_key="description", with_empty=1, class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-horizontal">
+  <caption>[% 'Handling' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    <tr>
+      <th>[% 'Employee' | $T8 %]</th>
+      <td>[% L.select_tag("employee_id", ALL_EMPLOYEES, title_key="safe_name", with_empty=1, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Salesman' | $T8 %]</th>
+      <td>[% L.select_tag("salesman_id", ALL_EMPLOYEES, title_key="safe_name", with_empty=1, class='wi-wide') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Department' | $T8 %]</th>
+      <td>[% L.select_tag( 'department_id', ALL_DEPARTMENTS, title_key='description', with_empty = 1, class='wi-wide' ) %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Project Number' | $T8 %]</th>
+      <td>[% P.project.picker("project_id", "", active="both", valid="both", class='wi-small') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Country' | $T8 %]</th>
+      <td>[% P.input_tag("country", "", class='wi-wide') %]</td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.col -->
+
+<div class="col">
+
+<table class="tbl-horizontal">
+  <caption>[% 'Filter for customer variables' | $T8 %]</caption>
+  <colgroup> <col class="wi-small"><col class="wi-lightwide"> </colgroup>
+  <tbody>
+    [% CUSTOM_VARIABLES_FILTER_CODE_CT %]
+    <tr>
+      <th class="caption" colspan="2">[% 'Filter for item variables' | $T8 %]</th>
+    </tr>
+    [% CUSTOM_VARIABLES_FILTER_CODE_IC %]
+  </tbody>
+</table>
+
+</div>
+
+</div><!-- /.wrapper -->
+
+<div class="buttons">
+  <input type=submit name=action value="[% 'Continue' | $T8 %]">
+</div>
+
+<div class="wrapper form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+
+  <table class="tbl-plain clear">
+    <colgroup><col class="wi-mediumsmall"><col class="wi-mediumsmall"><col class="wi-mediumsmall"><col class="wi-verywide"></colgroup>
+    <tbody>
+    <tr>
+      <th colspan="4"><h4>[% 'Cumulated or averaged values' | $T8 %] ([% 'invoice mode or item mode' | $T8 %]):</h4></th>
+    </tr>
+    <tr>
+      <td><input name="l_sellprice_total" id="l_sellprice_total" type=checkbox value=Y checked><label for="l_sellprice_total">[% 'Sales price total' | $T8 %]</label></td>
+      <td><input name="l_lastcost_total" id="l_lastcost_total" type=checkbox value=Y checked><label for="l_lastcost_total">[% 'Purchase price total' | $T8 %]</label></td>
+      <td><input name="l_marge_total" id="l_marge_total" type=checkbox value=Y checked><label for="l_marge_total">[% 'Margetotal' | $T8 %]</label></td>
+      <td class="long-desc">([% 'Single values in item mode, cumulated values in invoice mode' | $T8 %])</td>
+    </tr>
+    <tr>
+      <td><input name="l_sellprice" id="l_sellprice" type=checkbox value=Y checked><label for="l_sellprice">[% 'Sales price' | $T8 %]</label></td>
+      <td><input name="l_lastcost" id="l_lastcost" type=checkbox value=Y checked><label for="l_lastcost">[% 'Purchase price' | $T8 %]</label></td>
+      <td><input name="l_marge_percent" id="l_marge_percent" type=checkbox value=Y checked><label for="l_marge_percent">[% 'Margepercent' | $T8 %]</label></td>
+      <td class="long-desc">([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])</td>
+    </tr>
+    <tr>
+      <td><input name="l_qty" id="l_qty" type=checkbox value=Y checked><label for="l_qty">[% 'Quantity' | $T8 %]</label></td>
+      <td><input name="l_discount" id="l_discount" type=checkbox value=Y><label for="l_discount">[% 'Discount' | $T8 %]</label></td>
+      <td></td>
+      <td class="long-desc">([% 'averaged values, in invoice mode only useful when filtered by a part' | $T8 %])</td>
+    </tr>
+    <tr>
+      <td><input name="l_weight" id="l_weight" type=checkbox value=Y><label for="l_weight">[% 'Weight' | $T8 %]</label></td>
+      <td></td>
+      <td></td>
+      <td></td>
+    </tr>
+    <tr>
+      <th colspan="4"><h4>[% 'Item values' | $T8 %] ([% 'Only shown in item mode' | $T8 %])</h4></th>
+    </tr>
+    <tr>
+      <td><input name="l_description" id="l_description" type=checkbox value=Y checked><label for="l_description">[% 'Description' | $T8 %]</label></td>
+      <td><input name="l_partnumber" id="l_partnumber" type=checkbox value=Y><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
+      <td><input name="l_invnumber" id="l_invnumber" type=checkbox value=Y><label for="l_invnumber">[% 'Invnumber' | $T8 %]</label></td>
+      <td><input name="l_transdate" id="l_transdate" type=checkbox value=Y><label for="l_transdate">[% 'Invdate' | $T8 %]</label></td>
+    </tr>
+    <tr>
+      <td><input name="l_parts_unit" id="l_parts_unit" type=checkbox value=Y><label for="l_parts_unit">[% 'Base unit' | $T8 %]</label></td>
+      <td><input name="l_partsgroup" id="l_partsgroup" type=checkbox value=Y><label for="l_partsgroup">[% 'Partsgroup' | $T8 %]</label></td>
+      <td><input name="l_salesman" id="l_salesman" type=checkbox value=Y><label for="l_salesman">[% 'Salesperson' | $T8 %]</label></td>
+      <td><input name="l_employee" id="l_employee" type=checkbox value=Y><label for="l_employee">[% 'Employee' | $T8 %]</label></td>
+    </tr>
+    <tr>
+      <td><input name="l_customernumber" id="l_customernumber" type=checkbox value=Y><label for="l_customernumber">[% 'Customer Number' | $T8 %]</label></td>
+      <td><input name="l_customername" id="l_customername" type=checkbox value=Y><label for="l_customername">[% 'Customer Name' | $T8 %]</label></td>
+      <td><input name="l_country" id="l_country" type=checkbox value=Y><label for="l_country">[% 'Country' | $T8 %]</label></td>
+      <td><input name="l_business" id="l_business" type=checkbox value=Y><label for="l_business">[% 'Customer type' | $T8 %]</label></td>
+    </tr>
+    <tr>
+      <td><input name="l_shipvia" class=checkbox type=checkbox value=Y>[% 'Ship via' | $T8 %]</td>
+    </tr>
+    </tbody>
+  </table>
+
+  <table class="tbl-plain clear">
+    <tbody>
+    <tr>
+      <th colspan="4"><h4>[% 'Customer variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %])</h4></th>
+    </tr>
+    [% CUSTOM_VARIABLES_INCLUSION_CODE_CT %]
+    </tbody>
+  </table>
+
+  <table class="tbl-plain clear">
+    <tbody>
+    <tr>
+      <th colspan="4"><h4>[% 'Item variables' | $T8 %] ([% 'Only shown in item mode' | $T8 %])</h4></th>
+    </tr>
+    [% CUSTOM_VARIABLES_INCLUSION_CODE_IC %]
+    </tbody>
+  </table>
+</div>
+
+</form>
+
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+    $('customer').focus();
+  })
+//--></script>
diff --git a/templates/design40_webpages/webdav/_list.html b/templates/design40_webpages/webdav/_list.html
new file mode 100644
index 000000000..4958182a9
--- /dev/null
+++ b/templates/design40_webpages/webdav/_list.html
@@ -0,0 +1,37 @@
+[% USE HTML %]
+[% USE T8 %]
+[% USE LxERP %]
+
+[% IF INSTANCE_CONF.get_webdav %]
+<div id="ui-tabs-webdav" class="ui-tabs-panel" style="display:none;">
+
+<div class="wrapper">
+
+  <h3>[% 'Documents in the WebDAV repository' | $T8 %]</h3>
+
+  [% IF WEBDAV && WEBDAV.size %]
+  <table class="tbl-list wi-moderate">
+    <thead>
+     <tr>
+      <th>[% 'File name' | $T8 %]</th>
+      <th>[% 'WebDAV link' | $T8 %]</th>
+     </tr>
+    </thead>
+    <tbody>
+      [% FOREACH file = WEBDAV %]
+        <tr>
+          <td>[% HTML.escape(file.name) %]</td>
+          <td><a href="[% HTML.escape(file.link) %]">[% HTML.escape(file.type) %]</a></td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  [% ELSE %]
+   <p>[% LxERP.t8("There are no documents in the WebDAV directory at the moment.") %]</p>
+  [% END %]
+
+</div><!-- /.wrapper -->
+
+</div><!-- /#ui-tabs-webdav -->
+[% END %]
diff --git a/templates/design40_webpages/wh/create_assembly_chargenumbers.html b/templates/design40_webpages/wh/create_assembly_chargenumbers.html
new file mode 100644
index 000000000..a20e50e0a
--- /dev/null
+++ b/templates/design40_webpages/wh/create_assembly_chargenumbers.html
@@ -0,0 +1,127 @@
+[%- USE P -%]
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form name="Form" method="post" action="wh.pl" id="form">
+  [%
+    FOREACH key = hidden_vars.keys;
+      P.hidden_tag(key, HTML.escape(hidden_vars.$key));
+    END
+  %]
+
+ <div class="wrapper">
+  <table class="tbl-list">
+    <caption>
+      [% 'The following assembly items are ambigious. Please check the selection.' | $T8 %]
+    </caption>
+    <thead>
+      <tr class="listheading">
+        <th>[% 'Partnumber'   | $T8%]</th>
+        <th>[% 'Description'  | $T8%]</th>
+        <th>[% 'Chargenumber' | $T8%]</th>
+        <th>[% 'Warehouse'    | $T8%]</th>
+        <th>[% 'Bin'          | $T8%]</th>
+        <th>[% 'Onhand'       | $T8%]</th>
+        <th>[% 'Qty'          | $T8%]</th>
+        <th>[% 'Unit'         | $T8%]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
+        [% NEXT UNLESS stocked_by_parts_id.$part_id.size > 1 %]
+        <tr class="listheading">
+          <td colspan="6">[% 'needed qty' | $T8 %]</td>
+          <td class="numeric">[% LxERP.format_amount(needed_by_parts_id.$part_id, -2) %]</td>
+          <td>[% stocked_by_parts_id.$part_id.0.part.unit | html %]</td>
+        </tr>
+        [% FOREACH part = stocked_by_parts_id.$part_id -%]
+          <tr class="listrow">
+            [% SET alloc_qty = '';
+               FOREACH alloc = allocated_by_parts_id.$part_id;
+                 IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
+                   SET alloc_qty = alloc.qty;
+                 END;
+               END
+            -%]
+            <td>
+              [% P.hidden_tag('allocations[+].parts_id', part_id )%]
+              [% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
+              [% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
+              [% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
+              [% part.part.partnumber | html %]
+            </td>
+            <td>[% part.part.description      | html                 %]</td>
+            <td>[% part.chargenumber          | html                 %]</td>
+            <td>[% part.warehouse.description | html                 %]</td>
+            <td>[% part.bin.description       | html                 %]</td>
+            <td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
+            <td>[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, class="wi-verysmall") %]</td>
+            <td>[% part.part.unit             | html                 %]</td>
+          </tr>
+        [% END %]
+        <tr><td colspan="8"></td></tr>
+      [% END %]
+    </tbody>
+  </table>
+ </div>
+
+ <div class="wrapper">
+  <table class="tbl-list">
+    <caption>
+      [% 'The following assembly items are unambigious and will be used for production.' | $T8 %]
+    </caption>
+    <thead>
+      <tr class="listheading">
+        <th>[% 'Partnumber'   | $T8%]</th>
+        <th>[% 'Description'  | $T8%]</th>
+        <th>[% 'Chargenumber' | $T8%]</th>
+        <th>[% 'Warehouse'    | $T8%]</th>
+        <th>[% 'Bin'          | $T8%]</th>
+        <th>[% 'Onhand'       | $T8%]</th>
+        <th>[% 'Qty'          | $T8%]</th>
+        <th>[% 'Unit'         | $T8%]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
+        [% NEXT UNLESS stocked_by_parts_id.$part_id.size <= 1 %]
+        [% FOREACH part = stocked_by_parts_id.$part_id -%]
+          <tr class="listrow">
+            [% SET alloc_qty = '';
+               FOREACH alloc = allocated_by_parts_id.$part_id;
+                 IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
+                   SET alloc_qty = alloc.qty;
+                 END;
+               END
+            -%]
+            <td>
+              [% P.hidden_tag('allocations[+].parts_id', part_id )%]
+              [% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
+              [% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
+              [% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
+              [% part.part.partnumber | html %]
+            </td>
+            <td>[% part.part.description      | html                 %]</td>
+            <td>[% part.chargenumber          | html                 %]</td>
+            <td>[% part.warehouse.description | html                 %]</td>
+            <td>[% part.bin.description       | html                 %]</td>
+            <td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
+            <td class="numeric">
+              [% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
+              [% LxERP.format_amount(alloc_qty, -2) %]
+            </td>
+            <td>[% part.part.unit             | html                 %]</td>
+          </tr>
+        [% END %]
+        <tr><td colspan="8"></td></tr>
+      [% END %]
+    </tbody>
+  </table>
+ </div>
+
+</form>
diff --git a/templates/design40_webpages/wh/journal_filter.html b/templates/design40_webpages/wh/journal_filter.html
new file mode 100644
index 000000000..0023ab33c
--- /dev/null
+++ b/templates/design40_webpages/wh/journal_filter.html
@@ -0,0 +1,243 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+<h1>[% 'Report about warehouse transactions' | $T8 %]</h1>
+
+<script type="text/javascript"><!--
+    warehouses = new Array();
+    warehouses[0] = new Array();
+    warehouses[0]['id'] = "0";
+    warehouses[0]['bins'] = new Array();
+    warehouses[0]['bins'][0] = new Array();
+    warehouses[0]['bins'][0]['description'] = "---";
+    warehouses[0]['bins'][0]['id'] = "";
+    [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+    [% FOREACH warehouse = WAREHOUSES_it %]
+      warehouses[[% WAREHOUSES_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
+      warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
+      [% USE BINS_it = Iterator(warehouse.BINS) %]
+      [% FOREACH bin = BINS_it %]
+        warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
+        warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+        warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+      [% END %]
+    [% END %]
+
+    function warehouse_selected(warehouse_id, bin_id) {
+      var control = document.getElementById("bin_id");
+
+      for (var i = control.options.length - 1; i >= 0; i--) {
+        control.options[i] = null;
+      }
+
+      var warehouse_index = 0;
+
+      for (i = 0; i < warehouses.length; i++)
+        if (warehouses[i]['id'] == warehouse_id) {
+          warehouse_index = i;
+          break;
+        }
+
+      var warehouse = warehouses[warehouse_index];
+      var bin_index = 0;
+
+      for (i = 0; i < warehouse['bins'].length; i++)
+        if (warehouse['bins'][i]['id'] == bin_id) {
+          bin_index = i;
+          break;
+        }
+
+      for (i = 0; i < warehouse['bins'].length; i++) {
+        control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+      }
+
+
+      control.options[bin_index].selected = true;
+    }
+
+    $(function() {
+      warehouse_selected(0, 0);
+      document.Form.partnumber.focus();
+    })
+   --></script>
+
+<form method="post" name="Form" action="wh.pl" id="form">
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Warehouse' | $T8 %]:</th>
+      <td>
+      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)" class="wi-normal">
+        <option value="">---</option>
+        [% FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+        [% END %]
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Bin' | $T8 %]:</th>
+      <td>
+        <select name="bin_id" id="bin_id" class="wi-normal">
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]:</th>
+      <td><input type="text" name="partnumber" id="partnumber" value="[% partnumber %]" class="wi-normal">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Parts Classification' | $T8 %]:</th>
+      <td>[% P.part.select_classification('classification_id', class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]:</th>
+      <td><input type="text" name="description" class="wi-normal">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Charge Number' | $T8 %]:</th>
+      <td><input type="text" name="chargenumber" class="wi-normal">
+      </td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+      <tr>
+        <th>[% 'Best Before' | $T8 %]:</th>
+        <td> [% L.date_tag('bestbefore') %] </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Transfer Quantity' | $T8 %]:</th>
+      <td>
+        <select name="qty_op" class="wi-normal">
+          <option value="dontcare">---</option>
+          <option value="atleast">[% 'At least' | $T8 %]</option>
+          <option value="atmost">[% 'At most' | $T8 %]</option>
+          <option value="exact">[% 'Exact' | $T8 %]</option>
+        </select>
+        <input name="qty" type="text" class="wi-verysmall">
+        <select name="qty_unit" class="wi-small">
+          [% FOREACH unit = UNITS %]
+            <option>[% unit.name %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'From Date' | $T8 %]</th>
+      <td> <span class="wi-date">[% L.date_tag('fromdate') %]</span> </td>
+    </tr>
+    <tr>
+      <th>[% 'To Date' | $T8 %]</th>
+      <td> <span class="wi-date">[% L.date_tag('todate') %]</span> </td>
+    </tr>
+  [% CUSTOM_VARIABLES_FILTER_CODE %]
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="form-addition control-panel">
+<h3>[% 'Include in Report' | $T8 %]</h3>
+
+<div class="col list">
+<h4>[% 'Article data' | $T8 %]</h4>
+  <div>
+    <input name="l_partdescription" id="l_partdescription" type="checkbox" value="Y" checked>
+    <label for="l_partdescription">[% 'Part Description' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_partnumber" id="l_partnumber" type="checkbox" value="Y" checked>
+    <label for="l_partnumber">[% 'Part Number' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_chargenumber" id="l_chargenumber" type="checkbox" value="Y" checked>
+    <label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_qty" id="l_qty" type="checkbox" value="Y" checked>
+    <label for="l_qty">[% 'Quantity' | $T8 %]</label>
+  </div>
+</div>
+
+<div class="col list">
+<h4>[% 'Warehouses' | $T8 %]</h4>
+  <div>
+    <input name="l_warehouse_from" id="l_warehouse_from" type="checkbox" value="Y" checked>
+    <label for="l_warehouse_from">[% 'Warehouse From' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_bin_from" id="l_bin_from" type="checkbox" value="Y" checked>
+    <label for="l_bin_from">[% 'Bin From' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_warehouse_to" id="l_warehouse_to" type="checkbox" value="Y" checked>
+    <label for="l_warehouse_to">[% 'Warehouse To' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_bin_to" id="l_bin_to" type="checkbox" value="Y" checked>
+    <label for="l_bin_to">[% 'Bin To' | $T8 %]</label>
+  </div>
+</div>
+
+<div class="col list">
+<h4>[% 'Miscellaneous' | $T8 %]</h4>
+  <div>
+    <input name="l_date" id="l_date" type="checkbox" value="Y" checked>
+    <label for="l_date">[% 'Date' | $T8 %]</label>
+  </div>
+  [% IF INSTANCE_CONF.get_show_bestbefore %]
+    <div>
+      <input name="l_bestbefore" id="l_bestbefore" type="checkbox" value="Y" checked>
+      <label for="l_bestbefore">[% 'Best Before' | $T8 %]</label>
+    </div>
+  [% END %]
+  <div>
+    <input name="l_trans_id" id="l_trans_id" type="checkbox" value="Y">
+    <label for="l_trans_id">[% 'Trans Id' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_trans_type" id="l_trans_type" type="checkbox" value="Y" checked>
+    <label for="l_trans_type">[% 'Trans Type' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_comment" id="l_comment" type="checkbox" value="Y">
+    <label for="l_comment">[% 'Comment' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_employee" id="l_employee" type="checkbox" value="Y">
+    <label for="l_employee">[% 'Employee' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_oe_id" id="l_oe_id" type="checkbox" value="Y" checked>
+    <label for="l_oe_id">[% 'Document' | $T8 %]</label>
+  </div>
+  <div>
+    <input name="l_projectnumber" id="l_projectnumber" type="checkbox" value="Y" checked>
+    <label for="l_projectnumber">[% 'Project Number' | $T8 %]</label>
+  </div>
+</div>
+[% IF CUSTOM_VARIABLES.size %]
+  <div class="col list">
+    <h4>[% 'Custom Variables' | $T8 %]</h4>
+    <div>
+       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+      </div>
+  </div>
+[% END %]
+
+
+<!-- /.form-addition -->
+
+
+</form>
diff --git a/templates/design40_webpages/wh/produce_assembly_error.html b/templates/design40_webpages/wh/produce_assembly_error.html
new file mode 100644
index 000000000..f8437b32b
--- /dev/null
+++ b/templates/design40_webpages/wh/produce_assembly_error.html
@@ -0,0 +1,43 @@
+[%- USE T8 %][%- USE HTML %][%- USE LxERP -%][%- USE L -%]
+
+<div class="message message_error">
+  <h4>[% LxERP.t8("Error!") %]</h4>
+</div>
+
+[% IF missing_qty_exceptions.size %]
+  <div class="wrapper">[% LxERP.t8("The following parts could not be allocated:") %]</div>
+
+  <div class="wrapper">
+    <table class="tbl-list">
+      <thead>
+        <tr>
+          <th>[% LxERP.t8("Part") %]</th>
+          <th class="right">[% LxERP.t8("Required qty") %]</th>
+          <th class="right">[% LxERP.t8("Missing qty") %]</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH ex = missing_qty_exceptions %]
+          <tr class="listrow">
+            <td>[% HTML.escape(ex.part_description) %]</td>
+            <td class="numeric">[% HTML.escape(LxERP.format_amount(ex.to_allocate_qty)) %]</td>
+            <td class="numeric">[% HTML.escape(LxERP.format_amount(ex.missing_qty)) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+  </div>
+[% END %]
+
+[% IF other_exceptions.size %]
+  <div class="wrapper">[% LxERP.t8("Additional errors:") %]</div>
+
+  <div class="wrapper">
+    <ul>
+      [% FOREACH ex = other_exceptions %]
+        <li>[% HTML.escape(ex.message) %]</li>
+      [% END %]
+    </ul>
+  </div>
+[% END %]
diff --git a/templates/design40_webpages/wh/removal_parts_selection.html b/templates/design40_webpages/wh/removal_parts_selection.html
new file mode 100644
index 000000000..dcea087a4
--- /dev/null
+++ b/templates/design40_webpages/wh/removal_parts_selection.html
@@ -0,0 +1,72 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+<h1>[% title %]</h1>
+
+ <form method="post" action="wh.pl" id="form">
+
+  <input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
+
+  <p>[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]</p>
+
+   <table>
+    <tr>
+     <td>[% 'Select type of removal' | $T8 %]:</td>
+     <td>
+      <select name="transfer_type_id">
+       [% FOREACH type = TRANSFER_TYPES %]<option value="[% HTML.escape(type.id) %]">[% HTML.escape(type.description) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+    <tr>
+     <td>[% 'Optional comment' | $T8 %]:</td>
+     <td><input type="text" name="comment" size="60"></td>
+    </tr>
+   </table>
+
+   <table>
+    <tr>
+     <th>[% 'Bin' | $T8 %]</th>
+     <th>[% 'Part Number' | $T8 %]</th>
+     <th>[% 'Part Description' | $T8 %]</th>
+     <th>[% 'Charge Number' | $T8 %]</th>
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
+     <th>[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     <th>[% 'EAN' | $T8 %]</th>
+     <th>[% 'Available qty' | $T8 %]</th>
+     <th>[% 'Removal qty' | $T8 %]</th>
+    </tr>
+    [% FOREACH row = CONTENTS %]
+    <tr class="listrow[% loop.count % 2 %]">
+     <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
+     <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
+     <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
+     <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
+     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
+     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+     [% END %]
+     <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
+     <td>[% HTML.escape(row.bin) %]</td>
+     <td>[% HTML.escape(row.partnumber) %]</td>
+     <td>[% HTML.escape(row.partdescription) %]</td>
+     <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
+     <td>[% HTML.escape(row.ean) %]</td>
+     <td>[% HTML.escape(row.qty) %]</td>
+     <td>
+      <input type="text" name="qty_[% loop.count %]">
+      <select name="unit_[% loop.count %]">
+       [% FOREACH unit = row.UNITS %]<option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>[% END %]
+      </select>
+     </td>
+    </tr>
+    [% END %]
+    <input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
+    <tr><td colspan="7"><hr size="3" noshade></td></tr>
+   </table>
+ </form>
diff --git a/templates/design40_webpages/wh/report_bottom.html b/templates/design40_webpages/wh/report_bottom.html
new file mode 100644
index 000000000..7688b1c20
--- /dev/null
+++ b/templates/design40_webpages/wh/report_bottom.html
@@ -0,0 +1,3 @@
+[%- USE HTML %]
+<input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
+</form>
\ No newline at end of file
diff --git a/templates/design40_webpages/wh/report_filter.html b/templates/design40_webpages/wh/report_filter.html
new file mode 100644
index 000000000..8bb439756
--- /dev/null
+++ b/templates/design40_webpages/wh/report_filter.html
@@ -0,0 +1,234 @@
+[% USE T8 %]
+[% USE L %]
+[% USE P %]
+[% USE LxERP %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+<h1>[% 'Report about warehouse contents' | $T8 %]</h1>
+
+<script type="text/javascript"><!--
+  warehouses = new Array();
+  warehouses[0] = new Array();
+  warehouses[0]['id'] = "0";
+  warehouses[0]['bins'] = new Array();
+  warehouses[0]['bins'][0] = new Array();
+  warehouses[0]['bins'][0]['description'] = "---";
+  warehouses[0]['bins'][0]['id'] = "";
+  [%- USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [%- FOREACH warehouse = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count %]] = new Array();
+    warehouses[[% WAREHOUSES_it.count %]]['id'] = [% warehouse.id %];
+    warehouses[[% WAREHOUSES_it.count %]]['bins'] = new Array();
+    warehouses[[% WAREHOUSES_it.count %]]['bins'][0] = new Array();
+    warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['description'] = "---";
+    warehouses[[% WAREHOUSES_it.count %]]['bins'][0]['id'] = "";
+    [% USE BINS_it = Iterator(warehouse.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+    [% END %]
+  [% END %]
+
+  function warehouse_selected(warehouse_id, bin_id) {
+    var control = document.getElementById("bin_id");
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    var warehouse_index = 0;
+
+    for (i = 0; i < warehouses.length; i++)
+      if (warehouses[i]['id'] == warehouse_id) {
+        warehouse_index = i;
+        break;
+      }
+
+    var warehouse = warehouses[warehouse_index];
+    var bin_index = 0;
+
+    for (i = 0; i < warehouse['bins'].length; i++)
+      if (warehouse['bins'][i]['id'] == bin_id) {
+        bin_index = i;
+        break;
+      }
+
+    for (i = 0; i < warehouse['bins'].length; i++) {
+      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+    }
+
+
+    control.options[bin_index].selected = true;
+  }
+
+  $(function () {
+    warehouse_selected(0, 0);
+    document.Form.partnumber.focus();
+  });
+
+--></script>
+
+<form method="post" name="Form" action="wh.pl" id="form">
+<div class="wrapper">
+
+<input type="hidden" name="nextsub" value="generate_report">
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Warehouse' | $T8 %]:</th>
+      <td>
+      <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)" class="wi-normal">
+        <option value="">---</option>
+        [% FOREACH warehouse = WAREHOUSES %]
+        <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+        [% END %]
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Bin' | $T8 %]:</th>
+      <td>
+      <select name="bin_id" id="bin_id" class="wi-normal">
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Part Number' | $T8 %]:</th>
+      <td><input type="text" name="partnumber" value="[% partnumber %]" class="wi-normal">
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Parts Classification' | $T8 %]:</th>
+      <td>[% P.part.select_classification('classification_id', class='wi-normal') %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Part Description' | $T8 %]:</th>
+      <td><input type="text" name="description" class="wi-normal">
+      </td>
+    </tr>
+    <tr>
+      <th nowrap>[% 'Partsgroup' | $T8 %]:</th>
+      <td>[% L.select_tag('partsgroup_id', PARTSGROUPS, value_key = 'id', title_key = 'partsgroup', with_empty = 1, class='wi-normal') %]</td>
+     </tr>
+    <tr>
+      <th>[% 'Charge Number' | $T8 %]:</th>
+      <td><input type="text" name="chargenumber" class="wi-normal">
+      </td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+    <tr>
+      <th>[% 'Best Before' | $T8 %]:</th>
+      <td><span class="wi-date">[% L.date_tag('bestbefore') %]</span></td>
+    </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Qty in stock' | $T8 %]:</th>
+      <td>
+      <select name="qty_op" class="wi-normal">
+        <option value="dontcare">---</option>
+        <option value="atleast">[% 'At least' | $T8 %]</option>
+        <option value="atmost">[% 'At most' | $T8 %]</option>
+        <option value="exact">[% 'Exact' | $T8 %]</option>
+      </select>
+      <input type="text" name="qty" class="wi-verysmall">
+      <select name="qty_unit" class="wi-small">
+        [% FOREACH unit = UNITS %]
+          <option>[% unit.name %]</option>
+        [% END %]
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Stock Qty for Date' | $T8 %]:</th>
+      <td><span class="wi-date">[% L.date_tag('date') %]</span></td>
+    </tr>
+    <tr>
+      <th>[% "basis for stock value" | $T8 %]:</th>
+      <td>
+        [% L.radio_button_tag("stock_value_basis", value='purchase_price', checked=1, label=LxERP.t8('Purchase price')) %]
+        [% L.radio_button_tag("stock_value_basis", value='list_price',     checked=0, label=LxERP.t8('List Price')) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% "List all rows" | $T8 %]:</th>
+      <td>
+        [% L.yes_no_tag("allrows", 1) %]
+      </td>
+    </tr>
+    <tr>
+      <th>[% "Results per page" | $T8 %]:</th>
+      <td>[% L.input_number_tag("per_page", 20, size=4) %]</td>
+    </tr>
+    [% CUSTOM_VARIABLES_FILTER_CODE %]
+
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+
+<div class="form-addition control-panel">
+  <h3>[% 'Include in Report' | $T8 %]</h3>
+  <input name="l_partdescription" type="hidden" value="Y">
+  <input name="l_qty" type="hidden" value="Y">
+
+  <div class="list col">
+    <h4>[% 'Warehouse & Article' | $T8 %]</h4>
+    <div>
+      <input name="l_warehouse" id="l_warehouse" type="checkbox" value="Y" checked>
+      <label for="l_warehouse">[% 'Warehouse' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_bin" id="l_bin" type="checkbox" value="Y" checked>
+      <label for="l_bin">[% 'Bin' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_partnumber" id="l_partnumber" type="checkbox" value="Y" checked>
+      <label for="l_partnumber">[% 'Part Number' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="l_chargenumber" id="l_chargenumber" type="checkbox" value="Y" checked>
+      <label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Options' | $T8 %]</h4>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+    <div>
+      <input name="l_bestbefore" id="l_bestbefore" type="checkbox" value="Y" checked>
+      <label for="l_bestbefore">[% 'Best Before' | $T8 %]</label>
+    </div>
+    [% END %]
+    <div>
+      <input name="subtotal" id="subtotal" type="checkbox" value="Y">
+      <label for="subtotal">[% 'Subtotal' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="include_empty_bins" id="include_empty_bins" type="checkbox" value="Y">
+      <label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label>
+    </div>
+    <div>
+      <input name="include_invalid_warehouses" id="include_invalid_warehouses" type="checkbox" value="Y">
+      <label for="include_invalid_warehouses">[% 'Include invalid warehouses ' | $T8 %]</label>
+    </div>
+  </div>
+  <div class="list col">
+    <h4>[% 'Values & Prices' | $T8 %]</h4>
+    <input name="l_stock_value" id="l_stock_value" type="checkbox" value="Y">
+    <label for="l_stock_value">[% 'Stock value' | $T8 %]</label>
+    <input name="l_purchase_price" id="l_purchase_price" type="checkbox" value="Y">
+    <label for="l_purchase_price">[% 'Purchase price' | $T8 %]</label>
+    <input name="l_list_price" id="l_list_price" type="checkbox" value="Y">
+    <label for="l_list_price">[% 'List Price' | $T8 %]</label>
+  </div>
+  <div class="list col">
+    <h4>[% 'Custom Variables' | $T8 %]</h4>
+   [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+  </div>
+
+</div>
+<!-- /.form-addition -->
+
+</form>
diff --git a/templates/design40_webpages/wh/report_top.html b/templates/design40_webpages/wh/report_top.html
new file mode 100644
index 000000000..8311345e5
--- /dev/null
+++ b/templates/design40_webpages/wh/report_top.html
@@ -0,0 +1 @@
+<form method="post" action="wh.pl" id="form">
\ No newline at end of file
diff --git a/templates/design40_webpages/wh/transfer_parts_selection.html b/templates/design40_webpages/wh/transfer_parts_selection.html
new file mode 100644
index 000000000..7fa4e7810
--- /dev/null
+++ b/templates/design40_webpages/wh/transfer_parts_selection.html
@@ -0,0 +1,133 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE JavaScript %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript"><!--
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [% FOREACH wh = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+    [% USE BINS_it = Iterator(wh.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]][[% BINS_it.count - 1 %]] = ["[% JavaScript.escape(bin.description) %]", "[% JavaScript.escape(bin.id) %]"];
+    [% END %]
+  [% END %]
+
+  function warehouse_selected(row, index) {
+    var cname = "dst_bin_id_" + row;
+    var control = document.getElementById(cname);
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    for (i = 0; i < warehouses[index].length; i++) {
+      control.options[i] = new Option(warehouses[index][i][0], warehouses[index][i][1]);
+    }
+
+    control.options[0].selected = true;
+  }
+
+  $(function() {
+    [% FOREACH row = CONTENTS %]
+    warehouse_selected([% loop.count %], [% initial_warehouse_idx %]);
+    [% END %]
+  });
+--></script>
+
+<form method="post" action="wh.pl" id="form">
+
+<input type="hidden" name="warehouse_id" value="[% HTML.escape(warehouse_id) %]">
+
+<p>[% 'Transfer from warehouse' | $T8 %]: [% warehouse_description %]</p>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Select type of transfer' | $T8 %]:</th>
+      <td>
+        <select name="transfer_type_id">
+          [% FOREACH type = TRANSFER_TYPES %]
+           <option value="[% HTML.escape(type.id) %]">[% type.description %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Optional comment' | $T8 %]:</th>
+      <td><input type="text" name="comment" size="20"></td>
+    </tr>
+    <tr>
+      <td>[% 'Change default bin for this parts' | $T8 %]:</th>
+      <td><input type="checkbox" name="change_default_bin"><td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="tbl-list">
+  <thead>
+    <tr>
+      <th>[% 'Source bin' | $T8 %]</th>
+      <th>[% 'Part Number' | $T8 %]</th>
+      <th>[% 'Part Description' | $T8 %]</th>
+      <th>[% 'Charge Number' | $T8 %]</th>
+      [% IF INSTANCE_CONF.get_show_bestbefore %]
+      <th>[% 'Best Before' | $T8 %]</th>
+      [% END %]
+      <th>[% 'EAN' | $T8 %]</th>
+      <th>[% 'Available qty' | $T8 %]</th>
+      <th colspan="2">[% 'Transfer qty' | $T8 %]</th>
+      <th colspan="2">[% 'Destination warehouse and bin' | $T8 %]</th>
+    </tr>
+  </thead>
+  <tbody>
+    [% FOREACH row = CONTENTS %]
+      <tr>
+        <td>
+          <input type="hidden" name="src_bin_id_[% loop.count %]" value="[% HTML.escape(row.binid) %]">
+          <input type="hidden" name="parts_id_[% loop.count %]" value="[% HTML.escape(row.parts_id) %]">
+          <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
+          <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
+          <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+          [% IF INSTANCE_CONF.get_show_bestbefore %]
+            <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+          [% END %]
+          <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
+          [% HTML.escape(row.bin) %]
+        </td>
+        <td>[% HTML.escape(row.partnumber) %]</td>
+        <td>[% HTML.escape(row.partdescription) %]</td>
+        <td>[% HTML.escape(row.chargenumber) %]</td>
+        [% IF INSTANCE_CONF.get_show_bestbefore %]
+          <td>[% HTML.escape(row.bestbefore) %]</td>
+        [% END %]
+        <td>[% HTML.escape(row.ean) %]</td>
+        <td>[% HTML.escape(row.qty) %]</td>
+        <td><input type="text" name="qty_[% loop.count %]" size="8" style="text-align: right"></td>
+        <td>
+          <select name="unit_[% loop.count %]">
+            [% FOREACH unit = row.UNITS %]
+              <option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+            [% END %]
+          </select>
+        </td>
+        <td>
+          <select name="dst_warehouse_id_[% loop.count %]" onchange="warehouse_selected([% loop.count %], this.selectedIndex)">
+            [% FOREACH wh = WAREHOUSES %]
+              <option value="[% HTML.escape(wh.id) %]" [% IF wh.selected %] selected[% END %]>[% HTML.escape(wh.description) %]</option>
+            [% END %]
+          </select>
+        </td>
+        <td>
+          <select id="dst_bin_id_[% loop.count %]" name="dst_bin_id_[% loop.count %]"></select>
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
+
+<input type="hidden" name="rowcount" value="[% CONTENTS.size %]">
+
+</form>
diff --git a/templates/design40_webpages/wh/warehouse_selection.html b/templates/design40_webpages/wh/warehouse_selection.html
new file mode 100644
index 000000000..a23ca4b3b
--- /dev/null
+++ b/templates/design40_webpages/wh/warehouse_selection.html
@@ -0,0 +1,119 @@
+[% USE T8 %]
+[% USE HTML %]
+[% USE L %]
+[% USE JavaScript %]
+[% USE P %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript"><!--
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [% FOREACH warehouse = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['description'] = "---";
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][0]['id'] = "";
+    [% USE BINS_it = Iterator(warehouse.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'][[% BINS_it.count %]]['id'] = [% bin.id %];
+    [% END %]
+  [% END %]
+
+  function warehouse_selected(warehouse_id, bin_id) {
+    var control = document.getElementById("bin_id");
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    var warehouse_index = 0;
+
+    for (i = 0; i < warehouses.length; i++)
+      if (warehouses[i]['id'] == warehouse_id) {
+        warehouse_index = i;
+        break;
+      }
+
+    var warehouse = warehouses[warehouse_index];
+    var bin_index = 0;
+
+    for (i = 0; i < warehouse['bins'].length; i++)
+      if (warehouse['bins'][i]['id'] == bin_id) {
+        bin_index = i;
+        break;
+      }
+
+    for (i = 0; i < warehouse['bins'].length; i++) {
+      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+    }
+
+
+    control.options[bin_index].selected = true;
+  }
+
+      $(function() {
+        warehouse_selected(0, 0);
+        document.Form.part_id_name.focus();
+      });
+     -->
+ </script>
+
+<form name="Form" method="post" action="wh.pl" id="form">
+<div class="wrapper">
+
+[% IF saved_message %]
+  <p>[% saved_message %]</p>
+[% END %]
+
+<p>[% 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' | $T8 %]</p>
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Transfer from warehouse' | $T8 %]</th>
+      <td>
+        <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)" class="wi-lightwide">
+          [% FOREACH warehouse = WAREHOUSES %]
+          <option value="[% HTML.escape(warehouse.id) %]">[% warehouse.description %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Bin' | $T8 %]</th>
+      <td>
+        <select id="bin_id" name="bin_id" class="wi-lightwide"></select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Limit part selection' | $T8 %]</th>
+      <td><span class="plain-data">&nbsp;</span></td>
+    </tr>
+    <tr>
+      <th>[% 'Part' | $T8 %]</th>
+      <td>[% P.part.picker("part_id", parts_id, part_type="part,assembly", class="wi-lightwide") %]</td>
+    </tr>
+    <tr>
+      <th>[% 'Charge number' | $T8 %]</th>
+      <td><input type="text" name="chargenumber" class="wi-lightwide"></td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+      <tr>
+        <th>[% 'Best Before' | $T8 %]</th>
+        <td><span class="wi-date">[% L.date_tag('bestbefore') %]</span></td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'EAN' | $T8 %]</th>
+      <td><input type="text" name="ean" class="wi-lightwide"></td>
+    </tr>
+  </tbody>
+</table>
+
+</div><!-- /.wrapper -->
+</form>
diff --git a/templates/design40_webpages/wh/warehouse_selection_assembly.html b/templates/design40_webpages/wh/warehouse_selection_assembly.html
new file mode 100644
index 000000000..236a3e4eb
--- /dev/null
+++ b/templates/design40_webpages/wh/warehouse_selection_assembly.html
@@ -0,0 +1,132 @@
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE JavaScript %]
+[% USE LxERP %]
+[% USE P %]
+
+<h1>[% title %]</h1>
+
+<script type="text/javascript"><!--
+  warehouses = new Array();
+  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %]
+  [% FOREACH warehouse = WAREHOUSES_it %]
+    warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
+    warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
+    [% USE BINS_it = Iterator(warehouse.BINS) %]
+    [% FOREACH bin = BINS_it %]
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
+      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
+    [% END %]
+  [% END %]
+
+  function warehouse_selected(warehouse_id, bin_id) {
+    var control = document.getElementById("bin_id");
+
+    for (var i = control.options.length - 1; i >= 0; i--) {
+      control.options[i] = null;
+    }
+
+    var warehouse_index = 0;
+
+    for (i = 0; i < warehouses.length; i++)
+      if (warehouses[i]['id'] == warehouse_id) {
+        warehouse_index = i;
+        break;
+      }
+
+    var warehouse = warehouses[warehouse_index];
+    var bin_index = 0;
+
+    for (i = 0; i < warehouse['bins'].length; i++)
+      if (warehouse['bins'][i]['id'] == bin_id) {
+        bin_index = i;
+        break;
+      }
+
+    for (i = 0; i < warehouse['bins'].length; i++) {
+      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
+    }
+
+
+    control.options[bin_index].selected = true;
+  }
+
+  $(function() {
+    warehouse_selected([% warehouse_id %], [% bin_id %]);
+  })
+--></script>
+
+<form name="Form" method="post" action="wh.pl" id="form">
+<div class="wrapper">
+
+[% IF saved_message %]
+  <p>[% saved_message %]</p>
+[% END %]
+
+
+<table class="tbl-horizontal">
+  <tbody>
+    <tr>
+      <th>[% 'Assembly' | $T8 %]</th>
+      <td>[% P.part.picker("parts_id", parts_id, part_type="assembly", class="initial_focus wi-lightwide", fat_set_item="1") %] </td>
+    </tr>
+    <tr>
+      <th>[% 'Destination warehouse' | $T8 %]</th>
+      <td>
+        <select name="warehouse_id" id="warehouse_id" onchange="warehouse_selected(warehouses[this.selectedIndex]['id'], 0)" class="wi-lightwide">
+          [% FOREACH warehouse = WAREHOUSES %]
+            <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Destination bin' | $T8 %]</th>
+      <td><select id="bin_id" name="bin_id" class="wi-lightwide"></select></td>
+    </tr>
+    <tr>
+      <th>[% 'Charge number' | $T8 %]</th>
+      <td><input type="text" name="chargenumber" class="wi-lightwide" value="[% HTML.escape(chargenumber) %]"></td>
+    </tr>
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
+      <tr>
+        <th>[% 'Best Before' | $T8 %]</th>
+        <td><span class="wi-date">[% L.date_tag('bestbefore', bestbefore) %]</span> </td>
+      </tr>
+    [% END %]
+    <tr>
+      <th>[% 'Quantity' | $T8 %]</th>
+      <td>
+        <input type="text" name="qty" class="wi-verysmall" value="[% HTML.escape(LxERP.format_amount(qty)) %]">
+        <select name="unit" class="wi-small">
+          [% FOREACH unit = UNITS %]
+            <option[% IF unit.selected %] selected[% END %]>[% HTML.escape(unit.name) %]</option>
+          [% END %]
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>[% 'Optional comment' | $T8 %]</th>
+      <td><input type="text" name="comment" class="wi-lightwide" value="[% HTML.escape(comment) %]">
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+</div>
+</form>
+
+<script type='text/javascript'>
+  $(function(){
+    $('#parts_id').on('set_item:PartPicker', function(event, item) {
+      if (!item.warehouse_id)
+        return;
+
+      $('#warehouse_id').val(item.warehouse_id);
+      warehouse_selected(item.warehouse_id, item.bin_id);
+    });
+  })
+</script>
diff --git a/templates/design40_webpages/yearend/_charts.html b/templates/design40_webpages/yearend/_charts.html
new file mode 100644
index 000000000..9241eafec
--- /dev/null
+++ b/templates/design40_webpages/yearend/_charts.html
@@ -0,0 +1,91 @@
+[%- USE LxERP -%]
+[%- USE T8    -%]
+[%- USE L     -%]
+[%- USE HTML  -%]
+[%- USE P     -%]
+
+
+[%- SET dec = 2 %]
+
+<h2>[% 'Balance accounts' | $T8 %]</h2>
+<table class="tbl-list wi-moderate">
+ <thead>
+ <tr>
+  <th            >[%- 'Account'          | $T8 %]</th>
+  <th            >[%- 'Description'      | $T8 %]</th>
+  <th colspan="2">[%- 'Starting Balance' | $T8 %]</th>
+  <th colspan="2">[%- 'Balance with CB'  | $T8 %]</th>
+  <th colspan="2">[%- 'Closing Balance'  | $T8 %]</th>
+ </tr>
+ </thead>
+ <thead>
+ <tr>
+  <th></th>
+  <th></th>
+  <th>[%- 'Debit'  | $T8 %]</th>
+  <th>[%- 'Credit' | $T8 %]</th>
+  <th>[%- 'Debit'  | $T8 %]</th>
+  <th>[%- 'Credit' | $T8 %]</th>
+  <th>[%- 'Debit'  | $T8 %]</th>
+  <th>[%- 'Credit' | $T8 %]</th>
+ </tr>
+ </thead>
+ <tbody>
+ [% FOREACH chart = charts %]
+   [%- NEXT UNLESS chart.account_type == 'asset_account' -%]
+ <tr id="tr_[% loop.count %]" class="listrow[% loop.count % 2 %]">
+  <td>                 [% chart.accno | html %]</td>
+  <td>                 [% chart.description | html %]</td>
+  <td class="numeric"> [% IF chart.ob_amount < 0      %]  [% LxERP.format_amount(chart.ob_amount * -1, dec)       %] [% END %]</td>
+  <td class="numeric"> [% IF chart.ob_amount > 0      %]  [% LxERP.format_amount(chart.ob_amount, dec)            %] [% END %]</td>
+  <td class="numeric"> [% IF chart.amount_with_cb < 0 %]  [% LxERP.format_amount(chart.amount_with_cb * -1, dec)  %] [% END %]</td>
+  <td class="numeric"> [% IF chart.amount_with_cb > 0 %]  [% LxERP.format_amount(chart.amount_with_cb, dec)       %] [% END %]</td>
+  [% # cb amounts: >/< are switched and cb_amounts are multiplied with -1. The closing balance as calculated by cb_amount negates the actual balance, but when displaying it as the closing balance we want to display it in the same form as the actual balance %]
+  <td class="numeric"> [% IF chart.cb_amount > 0 %]  [% LxERP.format_amount(chart.cb_amount *  1, dec) %] [% END %]</td>
+  <td class="numeric"> [% IF chart.cb_amount < 0 %]  [% LxERP.format_amount(chart.cb_amount * -1, dec) %] [% END %]</td>
+ </tr>
+ [% END %]
+ </tbody>
+</table>
+
+<h2>[% 'Profit and loss accounts' | $T8 %]</h2>
+
+<p>
+[% IF profit_loss_sum < 0 %] [% THEN %][% 'Loss' | $T8 %] [% ELSE %] [% 'Profit' | $T8 %] [% END %]:   
+[% LxERP.format_amount(profit_loss_sum, dec) %]
+</p>
+
+<table class="tbl-list wi-moderate">
+ <thead>
+ <tr>
+  <th          >[%- 'Account'         | $T8 %]</th>
+  <th          >[%- 'Description'     | $T8 %]</th>
+  <th colspan=2>[%- 'Balance with CB' | $T8 %]</th>
+  <th colspan=2>[%- 'Closing Balance' | $T8 %]</th>
+ </tr>
+ </thead>
+ <thead>
+ <tr>
+  <th></th>
+  <th></th>
+  <th>[%- 'Debit'  | $T8 %]</th>
+  <th>[%- 'Credit' | $T8 %]</th>
+  <th>[%- 'Debit'  | $T8 %]</th>
+  <th>[%- 'Credit' | $T8 %]</th>
+ </tr>
+ </thead>
+ <tbody>
+ [% FOREACH chart = charts %]
+   [%- NEXT UNLESS chart.account_type == 'profit_loss_account' -%]
+ <tr id="tr_[% loop.count %]" class="listrow[% loop.count % 2 %]">
+  <td                >[% chart.accno | html %]</td>
+  <td                >[% chart.description | html %]</td>
+  <td class="numeric">[% IF chart.amount_with_cb < 0 %] [% LxERP.format_amount(chart.amount_with_cb * -1, dec) %] [% END %]</td>
+  <td class="numeric">[% IF chart.amount_with_cb > 0 %] [% LxERP.format_amount(chart.amount_with_cb, dec)      %] [% END %]</td>
+  <td class="numeric">[% IF chart.cb_amount > 0 %] [% LxERP.format_amount(chart.cb_amount *  1, dec) %] [% END %]</td>
+  <td class="numeric">[% IF chart.cb_amount < 0 %] [% LxERP.format_amount(chart.cb_amount * -1, dec)      %] [% END %]</td>
+ </tr>
+ [% END %]
+ </tbody>
+</table>
+[% # L.dump(charts) %]
diff --git a/templates/design40_webpages/yearend/form.html b/templates/design40_webpages/yearend/form.html
new file mode 100644
index 000000000..725f3fc21
--- /dev/null
+++ b/templates/design40_webpages/yearend/form.html
@@ -0,0 +1,115 @@
+[%- USE HTML %]
+[%- USE T8 %]
+[%- USE L %]
+[%- USE LxERP %]
+
+<h1>[% title | html %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<div class="wrapper">
+
+[% IF carry_over_chart AND profit_chart AND (loss_chart OR SELF.defaults.yearend_method == 'simple') %] [% THEN %]
+<form id="filter" name="filter" method="post" action="controller.pl">
+<table class="tbl-horizontal">
+  <tr>
+    <td>[% 'Year-end date' | $T8 %]</td>
+    <td>[% L.date_tag('cb_date', SELF.cb_date) %]</td>
+  </tr>
+  <tr class="startdate">
+   <td>[% 'Startdate method' | $T8 %]</td>
+   <td>[% L.select_tag('balance_startdate_method', balance_startdate_method_options, value_key = 'value', title_key = 'title') %]</td>
+  </tr>
+  <tr class="startdate">
+    <td>[% 'Start date' | $T8 %]</td>
+    <td>[% L.date_tag('cb_startdate', '', readonly=1) %]</td>
+  </tr>
+  [% IF SELF.defaults.yearend_method == 'simple' %] [% THEN %]
+  <tr>
+    <td>[% 'Year-end closing account' | $T8 %]</td>
+    <td>[% carry_over_chart.displayable_name | html %]</td>
+  </tr>
+  <tr>
+    <td>[% 'Profit or loss carried forward account' | $T8 %]</td>
+    <td>[% profit_chart.displayable_name | html %]</td>
+  </tr>
+  [% ELSE %]
+  <tr>
+    <td>[% 'Carry over account for year-end closing' | $T8 %]</td>
+    <td>[% carry_over_chart.displayable_name | html %]</td>
+  </tr>
+  <tr>
+    <td>[% 'Profit carried forward account' | $T8 %]</td>
+    <td>[% profit_chart.displayable_name | html %]</td>
+  </tr>
+  <tr>
+    <td>[% 'Loss carried forward account' | $T8 %]</td>
+    <td>[% loss_chart.displayable_name | html %]</td>
+  </tr>
+  [% END %]
+</table>
+</form>
+[% ELSIF SELF.defaults.yearend_method == 'simple' %]
+  [% 'Please configure the year-end closing and the profit or loss carried forward accounts for year-end closing in the client configuration!' | $T8 %]
+[% ELSE %]
+  [% 'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' | $T8 %]
+[% END %]
+
+[% # L.button_tag("refresh_charts();", LxERP.t8("Preview")) %]
+[% L.button_tag("year_end_bookings();", LxERP.t8("Apply year-end bookings"), id='apply_year_end_bookings_button', confirm=LxERP.t8("Are you sure?")) %]
+
+<div id="charts" style="padding-top: 20px">
+</div>
+
+</div> <!-- wrapper -->
+
+<script type="text/javascript">
+
+  function get_startdate() {
+    $.get("controller.pl", {
+      action:                   'YearEndTransactions/get_start_date',
+      cb_date:                  $('#cb_date').val(),
+      balance_startdate_method: $('#balance_startdate_method').val()
+    }, kivi.eval_json_result)
+  }
+
+  function year_end_bookings() {
+    $.post("controller.pl", {
+      action:  'YearEndTransactions/year_end_bookings',
+      cb_date: $('#cb_date').val(),
+    }, kivi.eval_json_result)
+  }
+
+  function refresh_charts() {
+    var filterdata = $('#filter').serialize()
+    var url = './controller.pl?action=YearEndTransactions/update_charts&' + filterdata;
+    $.ajax({
+       url : url,
+       type: 'GET',
+       success: function(data){
+           $('#charts').html(data);
+       }
+    })
+  };
+
+$(function(){
+
+  $('#apply_year_end_bookings_button').hide();
+  $('.startdate').hide();
+
+  $('#balance_startdate_method').change(function(){
+    get_startdate();
+    setTimeout(function() {
+      refresh_charts();
+    }, 200);    
+  });
+
+  $('#cb_date').change(function(){
+    get_startdate();
+    setTimeout(function() {
+      refresh_charts();
+    }, 200);    
+  });
+})
+
+</script>
diff --git a/templates/design40_webpages/zugferd/form.html b/templates/design40_webpages/zugferd/form.html
new file mode 100644
index 000000000..e251fafbc
--- /dev/null
+++ b/templates/design40_webpages/zugferd/form.html
@@ -0,0 +1,19 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE T8 %]
+
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% FORM.title %]</h1>
+
+<div class="wrapper">
+
+  <p>[% "Import a Factur-X/ZUGFeRD file:" | $T8 %]</p>
+
+  <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
+    [% L.input_tag('file', '', type => 'file', accept => '.pdf', onchange='kivi.ZUGFeRD.update_file_name();') %]
+    [% L.hidden_tag('file_name', '') %]
+  </form>
+
+</div>
diff --git a/templates/mail/below_minimum_stock/error_email.html b/templates/mail/below_minimum_stock/error_email.html
new file mode 100644
index 000000000..167589ac1
--- /dev/null
+++ b/templates/mail/below_minimum_stock/error_email.html
@@ -0,0 +1,3 @@
+kivitendo below minimum stock report.
+
+[% part_table %]
diff --git a/templates/mail/follow_up_notify/email_body.txt b/templates/mail/follow_up_notify/email_body.txt
new file mode 100644
index 000000000..aecb2a7df
--- /dev/null
+++ b/templates/mail/follow_up_notify/email_body.txt
@@ -0,0 +1,7 @@
+Hallo [%recipient_name%],
+
+[%creator_name%] hat eine neue Wiedervorlage für Sie für das
+Datum [%follow_up_date%] mit dem Betreff "[%follow_up_subject%]"
+und dem folgenden Inhalt erstellt:
+
+[%follow_up_body%]
diff --git a/templates/mobile_webpages/file/list.html b/templates/mobile_webpages/file/list.html
index 30c493b7b..d9767b136 100644
--- a/templates/mobile_webpages/file/list.html
+++ b/templates/mobile_webpages/file/list.html
@@ -30,7 +30,7 @@
   [%- FOREACH file = source.files %]
    <tr>
     [%- IF edit_attachments %]
-    <td>[%- P.M.checkbox_tag(checkname _ '[]', value=file.id _ '_' _ file.version, class=checkname, label=' ') %]</td>
+    <td>[%- P.M.checkbox_tag(checkname _ '[]', value=file.file_version.guid, class=checkname, label=' ') %]</td>
     [%- END %]
     <td>[% file.mtime_as_timestamp_s %][% L.hidden_tag("version[]", file.version) %]</td>
     <td><a href="controller.pl?action=File/download&id=[% file.id %][%- IF file.version %]&version=[%- file.version %][%- END %]">
diff --git a/templates/mobile_webpages/login_screen/user_login.html b/templates/mobile_webpages/login_screen/user_login.html
index 6fb5671c4..cf53e9c29 100644
--- a/templates/mobile_webpages/login_screen/user_login.html
+++ b/templates/mobile_webpages/login_screen/user_login.html
@@ -39,6 +39,7 @@
       </div>
 
       <div class="row">
+        [% L.hidden_tag("callback", callback) %]
         [% L.hidden_tag("action", "LoginScreen/login") %]
         [% P.M.submit_tag("btn_login", "Login", class="col s12", large=1) %]
       </div>
diff --git a/templates/mobile_webpages/scan_qrbill/_add_purchase_transaction.html b/templates/mobile_webpages/scan_qrbill/_add_purchase_transaction.html
new file mode 100644
index 000000000..e717083d5
--- /dev/null
+++ b/templates/mobile_webpages/scan_qrbill/_add_purchase_transaction.html
@@ -0,0 +1,73 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE P %]
+[% USE T8 %]
+
+<div class="container">
+  <div class="row">
+
+    <form method="post" action="ap.pl?action=post" id="form" class="col s12">
+      [% L.hidden_tag("rowcount", "1") %]
+      [% L.hidden_tag('form_validity_token', form_validity_token) %]
+      [% L.hidden_tag('callback', 'ScanQRCode') %]
+      [% L.hidden_tag('paidaccounts', '1') %]
+      [% L.hidden_tag('taxincluded', '1') %]
+
+      [% L.hidden_tag('qrbill_data_encoded', qrbill.data_encoded) %]
+
+      <h4>[% 'Add Accounts Payables Transaction' | $T8 %]</h4>
+
+      <div class="card">
+        <div class="card-content">
+          <span class="card-title">[% 'Vendor & Order' | $T8 %]</span>
+          <p>
+            [% 'Vendor' | $T8 %]: [% vendor.number | html %] [% vendor.name | html %]
+            [% L.hidden_tag("vendor_id", vendor.id) %]
+            [% L.hidden_tag("previous_vendor_id", vendor.id) %]
+          </p>
+
+          <p>
+            [% 'Currency' | $T8 %]: [% qrbill.currency | html %]
+            [% L.hidden_tag("currency", qrbill.currency) %]
+          </p>
+        </div>
+      </div>
+
+      <h5>[% 'Notes' | $T8 %]</h5>
+      <div class="row">
+        [% P.M.textarea_tag("notes", notes, label=LxERP.t8('Notes'), class="col s12") %]
+        [% P.M.textarea_tag("intnotes", intnotes, label=LxERP.t8('Internal Notes'), class="col s12") %]
+      </div>
+      <h5>[% 'Numbers & Dates' | $T8 %]</h5>
+      <div class="row">
+        [% P.M.input_tag("invnumber", qrbill.unstructured_message, label=LxERP.t8('Invoice Number'), class="col s12") %]
+        [% P.M.input_tag("ordnumber", '', label=LxERP.t8('Order Number'), class="col s12") %]
+        [% P.M.date_tag('transdate', '', label=LxERP.t8('Invoice Date'), icon="date_range", class="col s12") %]
+        [% P.M.date_tag('duedate', '', label=LxERP.t8('Due Date'), icon="date_range", class="col s12") %]
+      </div>
+      <h5>[% 'Transactions' | $T8 %]</h5>
+      <div class="row">
+        [% P.M.select_tag("AP_amount_chart_id_1", accounts_AP_amount, title_key='text'
+                          label=LxERP.t8('Account'), class="col s12") %]
+        [% L.hidden_tag("AP_amount_chart_id_1_type", "AP_amount") %]
+
+        [% P.M.input_tag("amount_1", qrbill.amount, label=LxERP.t8('Amount'), class="col s12") %]
+        [% P.M.select_tag("taxchart_1", taxcharts, title_key='text'
+                            label=LxERP.t8('Taxkey'), class="col s12") %]
+
+        [% P.M.select_tag("AP_chart_id", accounts_AP, title_key='text'
+                          label=LxERP.t8('Contra Account'), class="col s12") %]
+        [% L.hidden_tag("AP_chart_id_type", "AP") %]
+      </div>
+
+      <div class="row">
+        [% P.M.submit_tag("", LxERP.t8('Post'), class="col s12") %]
+      </div>
+      <div class="row">
+        [% P.M.button_tag("", LxERP.t8('Cancel'), class="col s12", flat=1, small=1, href="controller.pl?action=ScanQRBill/scan_view") %]
+      </div>
+    </form>
+
+  </div>
+</div>
diff --git a/templates/mobile_webpages/scan_qrbill/scan_view.html b/templates/mobile_webpages/scan_qrbill/scan_view.html
new file mode 100644
index 000000000..aa4682377
--- /dev/null
+++ b/templates/mobile_webpages/scan_qrbill/scan_view.html
@@ -0,0 +1,86 @@
+[% USE LxERP %]
+[% USE L %]
+[% USE HTML %]
+[% USE P %]
+[% USE T8 %]
+
+<div id="main-content">
+  <div class="container">
+    <div class="row">
+
+      <h4>[% 'Scan swiss QR bill' | $T8 %]</h4>
+
+      <div id="QRreader" width="600px"></div>
+
+      [% IF developer %]
+        <p>[% P.M.button_tag("kivi.ScanQRBill.sendTestCode(0);", "sendTestCode 0" ) %]</p>
+        <p>[% P.M.button_tag("kivi.ScanQRBill.sendTestCode(1);", "sendTestCode 1" ) %]</p>
+        <p>[% P.M.button_tag("kivi.ScanQRBill.sendTestCode(2);", "sendTestCode 2" ) %]</p>
+        <p>[% P.M.button_tag("kivi.ScanQRBill.sendTestCode(3);", "sendTestCode 3 XSS" ) %]</p>
+        <p>[% P.M.button_tag("kivi.ScanQRBill.sendTestCode(4);", "sendTestCode 4 XSS (invalid)" ) %]</p>
+      [% END %]
+    </div>
+  </div>
+  <hr>
+</div>
+
+<div id="qr_code_invalid_modal" class="modal">
+  <div class="modal-content">
+    <h4>[% 'QR-Code invalid' | $T8 %]</h4>
+
+    <p>[% 'The scanned code is not a valid QR bill.' | $T8 %]</p>
+    <p>[% 'Error' | $T8 %]: <span id="qr_code_invalid_error"></span></p>
+
+  </div>
+  <div class="modal-footer">
+    [% P.M.button_tag("startCamera();", LxERP.t8("Try again"), class="modal-close") %]
+  </div>
+</div>
+
+<div id="vendor_not_found_error" class="modal">
+  <div class="modal-content">
+    <h4>[% 'Vendor not found' | $T8 %]</h4>
+
+    <p>[% 'The vendor could not be found. Please register the vendor with the exact name from the QR bill as shown below.' | $T8 %]</p>
+    <p>[% 'Vendor Name' | $T8 %]: '<span id="vendor_name"></span>'</p>
+
+  </div>
+  <div class="modal-footer">
+    [% P.M.button_tag("startCamera();", LxERP.t8("Try again"), class="modal-close") %]
+  </div>
+</div>
+
+<div id="transaction_successful_modal" class="modal">
+  <div class="modal-content">
+    <h4>[% 'AP transaction posted successfully' | $T8 %]</h4>
+
+    <p>[% 'Invoice number' | $T8 %]: [% invoice_number | html %]</p>
+  </div>
+  <div class="modal-footer">
+    [% P.M.button_tag("", LxERP.t8("Ok"), class="modal-close") %]
+  </div>
+</div>
+
+[% L.hidden_tag("transaction_success", transaction_success) %]
+
+<script>
+  const html5Qrcode = new Html5Qrcode("QRreader",
+    { formatsToSupport: [ Html5QrcodeSupportedFormats.QR_CODE ] });
+
+  const startCamera = () => {
+    html5Qrcode.start({ facingMode: "environment" },
+      { fps: 10, qrbox: { width: 250, height: 250 } },
+      kivi.ScanQRBill.onScanSuccess, kivi.ScanQRBill.onScanFailure
+    );
+  };
+
+  window.onload = () => {
+    // using $(document).ready didn't work here
+    //$(document).ready(() => {
+    if ($('#transaction_success').val() === '1') {
+      $('#transaction_successful_modal').modal('open');
+    }
+
+    startCamera();
+  };
+</script>
diff --git a/templates/mobile_webpages/test/components.html b/templates/mobile_webpages/test/components.html
index f53979940..cc93778ef 100644
--- a/templates/mobile_webpages/test/components.html
+++ b/templates/mobile_webpages/test/components.html
@@ -32,6 +32,12 @@
 [% P.M.input_tag("", "", placeholder="with placeholder", label="test input with placeholder") %]
 [% P.M.input_tag("", "default value", placeholder="with placeholder", label="test input with placeholder and default value") %]
 
+<h3>Textarea:</h3>
+[% P.M.textarea_tag("", "", label="Notes") %]
+[% P.M.textarea_tag("", "default value\nmulti-line", label="Notes with multi-line default value") %]
+[% P.M.textarea_tag("", "", placeholder="with placeholder", label="Notes with placeholder") %]
+[% P.M.textarea_tag("", "default value\nmulti-line", placeholder="with placeholder", label="Notes with placeholder and multi-line default value") %]
+
 <h3>With grid:</h3>
 <div class="row">
 [% P.M.input_tag("", "", label="2 cols", class="col s6") %]
diff --git a/templates/print/RB/deutsch.tex b/templates/print/RB/deutsch.tex
index e7ade80a3..ede3c41d8 100644
--- a/templates/print/RB/deutsch.tex
+++ b/templates/print/RB/deutsch.tex
@@ -58,6 +58,15 @@
 \newcommand{\abweichendeLieferadresse}{abweichende Lieferadresse}
 \newcommand{\optional}{Optionale Position nach Absprache}
 
+% angebotseingang (purchase_quotation_intake)
+\newcommand{\angebotseingang} {Angebotseingang}
+\newcommand{\angebotseingangformel} {vielen Dank für Ihr Angebot. Wir haben es als Angebotseingang erfasst und werden es prüfen.}
+
+% auftragseingang (sales_order_intake)
+\newcommand{\auftragseingang} {Auftragseingang}
+\newcommand{\auftragseingangnummer} {Auftragseingang Nr.}
+\newcommand{\auftragseingangformel} {vielen Dank für Ihren Auftrag, wir haben Ihn als Auftragseingang erfasst.\\Sie erhalten innerhalb von drei Tagen unsere Auftragsbestätigung.}
+
 % auftragbestätigung (sales_order)
 \newcommand{\auftragsbestaetigung} {Auftragsbestätigung}
 \newcommand{\auftragsnummer} {Auftrags-Nr.}
@@ -74,6 +83,16 @@
 % lieferschein (sales_delivery_order)
 \newcommand{\lieferschein} {Lieferschein}
 
+% verkaufsreklamationen (sales_reclamation)
+\newcommand{\vkreklamation}{VK-Reklamation}
+\newcommand{\vkreklamationsformel} {hiermit bestätigen wir Ihnen den Eingang einer Ihrer Reklamation mit folgenden Positionen:}
+
+% einkaufs-reklamationen (purchase_reclamation)
+\newcommand{\ekreklamation}{EK-Reklamation}
+\newcommand{\ekreklamationsformel} {folgende Positionen werden reklamiert:}
+
+\newcommand{\grund}{Grund}
+
 % rechnung (invoice)
 \newcommand{\rechnung} {Rechnung}
 \newcommand{\rechnungsdatum} {Rechnungsdatum}
@@ -134,6 +153,7 @@
 
 % einkaufslieferschein (purchase_delivery_order)
 \newcommand{\einkaufslieferschein} {Eingangslieferschein}
+\newcommand{\beistelllieferschein} {Beistell-Lieferschein}
 
 % Brief/letter
 \newcommand{\ihrzeichen}{Ihr Zeichen}
diff --git a/templates/print/RB/english.tex b/templates/print/RB/english.tex
index a3736c4bd..0af732e48 100644
--- a/templates/print/RB/english.tex
+++ b/templates/print/RB/english.tex
@@ -56,6 +56,15 @@
 \newcommand{\angebotortdatum}{We hereby accept this offer.}
 \newcommand{\abweichendeLieferadresse}{alternate delivery address}
 
+% angebotseingang (purchase_quotation_intake)
+\newcommand{\angebotseingang} {Quotation Intake}
+\newcommand{\angebotseingangformel} {thank you for your offer. We have entered it as quotation intake and will check it.}
+
+% auftragseingang (sales_order_intake)
+\newcommand{\auftragseingang} {Order Intake}
+\newcommand{\auftragseingangnummer} {Order Intake No.}
+\newcommand{\auftragseingangformel} {thank you for your order. We have entered it as order intake.\\You will receive our order confirmation within three days.}
+
 % auftragbestätigung (sales_order)
 \newcommand{\auftragsbestaetigung} {Order}
 \newcommand{\auftragsnummer} {Order No.}
@@ -73,6 +82,16 @@
 % lieferschein (sales_delivery_order)
 \newcommand{\lieferschein} {Delivery order}
 
+% verkaufsreklamationen (sales_reclamation)
+\newcommand{\vkreklamation}{Sales reclamation}
+\newcommand{\vkreklamationsformel} {we hereby confirm receipt of your complaints with the following items:}
+
+% einkaufs-reklamationen (purchase_reclamation)
+\newcommand{\ekreklamation}{Purchase reclamation}
+\newcommand{\ekreklamationsformel} {we hereby complain about the following items:}
+
+\newcommand{\grund}{reason}
+
 % rechnung (invoice)
 \newcommand{\rechnung} {Invoice}
 \newcommand{\rechnungsdatum} {Invoice date}
@@ -133,6 +152,7 @@
 
 % einkaufslieferschein (purchase_delivery_order)
 \newcommand{\einkaufslieferschein} {Purchase delivery order}
+\newcommand{\beistelllieferschein} {Supplier Delivery Order}
 
 % Brief/letter
 \newcommand{\ihrzeichen}{Your reference}
diff --git a/templates/print/RB/inheaders.tex b/templates/print/RB/inheaders.tex
index 080dd0ffe..278afc6e6 100644
--- a/templates/print/RB/inheaders.tex
+++ b/templates/print/RB/inheaders.tex
@@ -10,7 +10,7 @@
 \usepackage{tabularx}
 \usepackage{eurosym}
 \usepackage{substr}
-\usepackage{scrpage2}
+\usepackage{scrlayer-scrpage}
 \usepackage{wallpaper} % Hintergrundbilder
 \usepackage{xcolor,colortbl}
 \usepackage{lastpage}
diff --git a/templates/print/RB/purchase_quotation_intake.tex b/templates/print/RB/purchase_quotation_intake.tex
new file mode 100644
index 000000000..7c8bec835
--- /dev/null
+++ b/templates/print/RB/purchase_quotation_intake.tex
@@ -0,0 +1,169 @@
+\input{inheaders.tex}
+
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
+\newcommand{\lxmedia} {<%media%>}
+\newcommand{\lxcurrency} {<%currency%>}
+\newcommand{\kivicompany} {<%employee_company%>}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+
+% laufende Kopfzeile:
+\ourhead{}{}{\angebotseingang}{<%quonumber%>}{<%quodate%>}
+
+
+\begin{document}
+
+\ourfont
+\begin{minipage}[t]{8cm}
+  \scriptsize
+
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
+
+  \vspace*{0.3cm}
+
+  <%name%>
+
+  <%if department_1%><%department_1%><%end if%>
+
+  <%if department_2%><%department_2%><%end if%>
+
+  <%cp_givenname%> <%cp_name%>
+
+  <%street%>
+
+  ~
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{\auftragseingang}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{\nr ~<%quonumber%>%
+  }}} \vspace*{0.2cm}
+
+  \datum:\hfill <%quodate%>
+
+  \ansprechpartner:\hfill <%employee_name%>
+
+  \textTelefon \hfill <%employee_tel%>
+
+  \textEmail \hfill <%employee_email%>
+\end{minipage}
+
+<%if shiptoname%>
+  \vspace{0.8cm}
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    <%shiptoname%>
+
+                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+
+                 <%shiptodepartment_1%>
+
+                  <%shiptodepartment_2%>
+
+                  <%shiptostreet%>
+
+                  <%shiptozipcode%> <%shiptocity%>
+<%end if%>
+\vspace*{1.5cm}
+
+\hfill
+
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+\ifthenelse{\equal{<%cp_name%>}{}}{
+  <%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}{
+  \ifthenelse{\equal{<%cp_gender%>}{f}}
+    {\anredefrau}{\anredeherr} <%cp_title%> <%cp_name%>,}\\
+
+\angebotseingangformel\\
+
+\vspace{0.5cm}
+
+
+%
+% - longtable kann innerhalb der Tabelle umbrechen
+% - 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)
+%
+\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
+\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
+\begin{longtable}{@{}rrp{7cm}@{\extracolsep{\fill}}rr@{}}
+% Tabellenkopf
+\hline
+\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+\hline\\
+\endhead
+
+% Tabellenkopf erste Seite
+\hline
+\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+\hline\\[-0.5em]
+\endfirsthead
+
+% Tabellenende
+\\
+\multicolumn{5}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\multicolumn{4}{@{}l}{\nettobetrag} & <%subtotal%> \currency\\
+<%foreach tax%>
+\multicolumn{4}{@{}l}{<%taxdescription%>} & <%tax%> \currency\\
+<%end tax%>
+\multicolumn{4}{@{}l}{\textbf{\schlussbetrag}} &  \textbf{<%quototal%>} \currency\\
+\hline\hline\\
+\endlastfoot
+
+% eigentliche Tabelle
+<%foreach number%>
+          <%runningnumber%> &
+          \raggedleft <%qty%> <%unit%> &
+          \textbf{<%description%>} &
+          <%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
+
+          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
+          <%if reqdate%> && \scriptsize \lieferdatum: <%reqdate%>\\<%end reqdate%>
+          <%if serialnumber%> && \scriptsize \seriennummer: <%serialnumber%>\\<%end serialnumber%>
+          <%if ean%> && \scriptsize \ean: <%ean%>\\<%end ean%>
+          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
+          <%if make%>
+            <%foreach make%>
+              \ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>\\}{}
+            <%end foreach%>
+          <%end if%>
+          \\[-0.8em]
+<%end number%>
+
+\end{longtable}
+
+
+\vspace{0.2cm}
+
+<%if notes%>
+        \vspace{5mm}
+        <%notes%>
+        \vspace{5mm}
+<%end if%>
+
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
+\gruesse \\ \\ \\
+  <%employee_name%>
+
+\end{document}
diff --git a/templates/print/RB/purchase_reclamation.tex b/templates/print/RB/purchase_reclamation.tex
new file mode 100644
index 000000000..efa4135db
--- /dev/null
+++ b/templates/print/RB/purchase_reclamation.tex
@@ -0,0 +1,215 @@
+% config: use-template-toolkit=1
+% config: tag-style=$( )$
+$( USE KiviLatex )$
+$( USE L )$
+$( USE LxERP )$
+
+\input{inheaders.tex}
+$( KiviLatex.required_packages_for_html )$
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {$( template_meta.language.template_code )$}
+\newcommand{\lxmedia} {$( media )$}
+\newcommand{\lxcurrency} {$( reclamation.currency.name )$}
+\newcommand{\kivicompany} {$( employee_company )$}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+% laufende Kopfzeile:
+\ourhead{\kundennummer}{$( KiviLatex.filter(reclamation.customervendor.number) )$}{\ekreklamation}{$( KiviLatex.filter(reclamation.record_number) )$}{$( reclamation.transdate_as_date )$}
+
+\begin{document}
+
+\ourfont
+\begin{minipage}[t]{8cm}
+  \scriptsize
+
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
+
+  \vspace*{0.3cm}
+
+  $( KiviLatex.filter(reclamation.customervendor.name ) )$
+
+  $( IF (reclamation.customervendor.department_1) )$$( KiviLatex.filter(reclamation.customervendor.department_1) )$\\$( END )$%
+
+  $( IF (reclamation.customervendor.department_2) )$$( KiviLatex.filter(reclamation.customervendor.department_2) )$\\$( END )$%
+
+  $( KiviLatex.filter(reclamation.contact.cp_givenname) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$
+
+  $( KiviLatex.filter(reclamation.customervendor.street) )$
+
+  ~
+  
+  $( KiviLatex.filter(reclamation.customervendor.zipcode) )$ $( KiviLatex.filter(reclamation.customervendor.city) )$
+
+  $( KiviLatex.filter(reclamation.customervendor.country) )$
+\end{minipage}
+\hfill
+\begin{minipage}[t]{6cm}
+  \hfill{\LARGE\textbf{\ekreklamation}}
+
+  \vspace*{0.2cm}
+
+  \hfill{\large\textbf{\nr ~$( KiviLatex.filter(reclamation.record_number) )$}}
+
+  \vspace*{0.2cm}
+
+  \datum:\hfill $( reclamation.transdate_as_date )$
+
+  \lieferdatum:\hfill $( reclamation.reqdate_as_date )$
+
+  \kundennummer:\hfill $( KiviLatex.filter(reclamation.customervendor.number) )$
+
+  \ansprechpartner:\hfill $( KiviLatex.filter(employee_name) )$
+
+  \textTelefon \hfill $( KiviLatex.filter(employee_tel) )$
+
+  \textEmail \hfill $( KiviLatex.filter(employee_email) )$
+\end{minipage}
+
+$( IF (reclamation.shipto.shiptoname) )$%
+  \vspace{0.8cm}
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    $( KiviLatex.filter(reclamation.shipto.shiptoname) )$
+
+                 $( IF reclamation.shipto.shiptocontact )$ $( KiviLatex.filter(reclamation.shipto.shiptocontact) )$$( END )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptodepartment_1) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptodepartment_2) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptostreet) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptozipcode) )$ $( KiviLatex.filter(reclamation.shipto.shiptocity) )$
+$( END )$
+\vspace*{1.5cm}
+
+\hfill
+
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+\ifthenelse{\equal{$( reclamation.contact.cp_name )$}{}}{
+  $( IF reclamation.customervendor.natural_person )$$( KiviLatex.filter(reclamation.customervendor.greeting) )$ $( KiviLatex.filter(reclamation.customervendor.name) )$,$( ELSE )$\anrede$( END )$}{
+  \ifthenelse{\equal{$( reclamation.contact.cp_gender )$}{f}}
+    {\anredefrau}{\anredeherr} $( KiviLatex.filter(reclamation.contact.cp_title) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$,}\\
+
+\ekreklamationsformel\\
+
+\vspace{0.5cm}
+
+%% Diese Variable kann auf 1 gesetzt werden, wenn Preise angezeigt werden sollen.
+$( SET show_prices = 0 )$
+
+%
+% - longtable kann innerhalb der Tabelle umbrechen
+% - 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)
+%
+\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
+\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
+$( IF show_prices -)$
+\begin{longtable}{@{}rrp{7cm}@{\extracolsep{\fill}}rrr@{}}
+$( ELSE -)$
+\begin{longtable}{@{}rrp{10.7cm}@{\extracolsep{\fill}}r@{}}
+$( END -)$
+
+% Tabellenkopf
+\hline
+$( IF show_prices -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+$( ELSE -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} \\
+$( END -)$
+\hline\\
+\endhead
+
+% Tabellenkopf erste Seite
+\hline
+$( IF show_prices -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+$( ELSE -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} \\
+$( END -)$
+\hline\\[-0.5em]
+\endfirsthead
+
+$( IF show_prices -)$
+% Tabellenende
+\\
+\multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\multicolumn{5}{@{}l}{\nettobetrag} & $( reclamation.netamount_as_number )$ \currency\\
+$( FOREACH tax = reclamation.taxes )$
+\multicolumn{5}{@{}l}{$( KiviLatex.filter(tax.tax.translated_attribute('taxdescription', reclamation.language_id)) )$} & $( LxERP.format_amount(tax.amount, 2) )$ \currency\\
+$( END )$
+\multicolumn{5}{@{}l}{\textbf{\schlussbetrag}} &  \textbf{$( reclamation.amount_as_number )$} \currency\\
+\hline\hline\\
+\endlastfoot
+$( ELSE -)$ %% IF show_prices
+% Tabellenende
+\\
+\multicolumn{4}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\endlastfoot
+$( END )$ %% IF show_prices
+
+% eigentliche Tabelle
+$( FOREACH item = reclamation.items_sorted -)$
+  $( item.position )$ &
+  $( KiviLatex.filter(item.part.partnumber) )$ &
+  \textbf{$( KiviLatex.filter(item.description) )$} &
+  $( item.qty_as_number )$ $( KiviLatex.filter(item.unit_obj.get_translation(reclamation.language_id, item.qty)) )$ $( IF show_prices -)$ &
+  $( item.sellprice_as_number )$ \currency &
+  \ifthenelse{\equal{$( item.discount )$}{0}}{}{\sffamily\scriptsize{(-$( item.discount_as_percent )$ \%)}}
+  \ourfont{$( LxERP.format_amount(item.linetotal, 2) )$ \currency} $( END -)$\\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
+
+  $( IF item.longdescription )$ && \scriptsize $( KiviLatex.filter_html(item.longdescription) )$\\$( END )$
+  $( IF item.reqdate )$         && \scriptsize \lieferdatum: $( item.reqdate_as_date )$\\$( END )$
+  $( IF item.serialnumber )$    && \scriptsize \seriennummer: $( KiviLatex.filter(item.serialnumber) )$\\$( END )$
+  $( IF item.part.ean )$        && \scriptsize \ean: $( KiviLatex.filter(item.part.ean) )$\\$( END )$
+  $( IF item.projectnumber )$   && \scriptsize \projektnummer: $( KiviLatex.filter(item.projectnumber) )$\\$( END )$
+  $( IF item.part.customerprices.size )$
+    $( FOREACH customerprice = item.part.customerprices )$
+      $( IF customerprice.customer_id == reclamation.customervendor.id )$
+        && \kundenartnr: $( KiviLatex.filter(customerprice.customer_partnumber) )$\\
+        $( LAST )$
+      $( END )$
+    $( END )$
+  $( END )$
+
+  $( IF (item.reason.description) )$     && \scriptsize \grund: $( KiviLatex.filter(item.reason.description) )$\\$( END )$
+  $( IF (item.reason_description_ext) )$ && \scriptsize $( KiviLatex.filter(item.reason_description_ext) )$\\$( END )$
+  \\[-0.8em]
+$( END )$
+
+\end{longtable}
+
+
+\vspace{0.2cm}
+
+$( IF reclamation.notes )$
+  \vspace{5mm}
+  $( KiviLatex.filter_html(reclamation.notes) )$
+\vspace{5mm}
+$( END )$
+
+$( IF reclamation.delivery_term )$
+  \lieferung ~$( KiviLatex.filter(reclamation.delivery_term.translated_attribute('description_long', reclamation.language_id)) )$\\
+$( END )$
+
+\gruesse \\ \\ \\
+$( KiviLatex.filter(employee_name) )$
+
+\end{document}
+
diff --git a/templates/print/RB/request_quotation.tex b/templates/print/RB/request_quotation.tex
index 80b426b9c..150e8f7f1 100644
--- a/templates/print/RB/request_quotation.tex
+++ b/templates/print/RB/request_quotation.tex
@@ -114,7 +114,7 @@
 
           <%if make%>
             <%foreach make%>
-              \ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>\\}{}
+              \ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>, \bezeichnung: <%mm_part_description%>\\}{}
             <%end foreach%>
           <%end if%>
 
diff --git a/templates/print/RB/sales_order.tex b/templates/print/RB/sales_order.tex
index dfec85cb1..f2bcb7974 100644
--- a/templates/print/RB/sales_order.tex
+++ b/templates/print/RB/sales_order.tex
@@ -10,6 +10,11 @@
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
 
+<%if template_meta.formname == "sales_order_intake"%>
+  \renewcommand{\auftragsbestaetigung}{\auftragseingang}
+  \renewcommand{\auftragsnummer}{\auftragseingangnummer}
+  \renewcommand{\auftragsformel}{\auftragseingangformel}
+<%end if%>
 
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\auftragsbestaetigung}{<%ordnumber%>}{<%orddate%>}
@@ -175,9 +180,9 @@
   \lieferung ~<%delivery_term.description_long%>\\
 <%end delivery_term%>
 
-<%if reqdate%>
+<%if template_meta.formname != "sales_order_intake"%><%if reqdate%>
 \lieferungErfolgtAm ~<%reqdate%>. \\
-<%end if%>
+<%end if%><%end if%>
 
 \textit{\auftragpruefen} \\ \\
 
diff --git a/templates/print/RB/sales_order_intake.tex b/templates/print/RB/sales_order_intake.tex
new file mode 120000
index 000000000..df07c2a72
--- /dev/null
+++ b/templates/print/RB/sales_order_intake.tex
@@ -0,0 +1 @@
+sales_order.tex
\ No newline at end of file
diff --git a/templates/print/RB/sales_reclamation.tex b/templates/print/RB/sales_reclamation.tex
new file mode 100644
index 000000000..a1f5852e3
--- /dev/null
+++ b/templates/print/RB/sales_reclamation.tex
@@ -0,0 +1,217 @@
+% config: use-template-toolkit=1
+% config: tag-style=$( )$
+$( USE KiviLatex )$
+$( USE L )$
+$( USE LxERP )$
+
+\input{inheaders.tex}
+$( KiviLatex.required_packages_for_html )$
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {$( template_meta.language.template_code )$}
+\newcommand{\lxmedia} {$( media )$}
+\newcommand{\lxcurrency} {$( reclamation.currency.name )$}
+\newcommand{\kivicompany} {$( employee_company )$}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+% laufende Kopfzeile:
+\ourhead{\kundennummer}{$( KiviLatex.filter(reclamation.customervendor.number) )$}{\vkreklamation}{$( KiviLatex.filter(reclamation.record_number) )$}{$( reclamation.transdate_as_date )$}
+
+\begin{document}
+
+\ourfont
+\begin{minipage}[t]{8cm}
+  \scriptsize
+
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
+
+  \vspace*{0.3cm}
+
+  $( KiviLatex.filter(reclamation.customervendor.name ) )$
+
+  $( IF (reclamation.customervendor.department_1) )$$( KiviLatex.filter(reclamation.customervendor.department_1) )$\\$( END )$%
+
+  $( IF (reclamation.customervendor.department_2) )$$( KiviLatex.filter(reclamation.customervendor.department_2) )$\\$( END )$%
+
+  $( KiviLatex.filter(reclamation.contact.cp_givenname) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$
+
+  $( KiviLatex.filter(reclamation.customervendor.street) )$
+
+  ~
+  
+  $( KiviLatex.filter(reclamation.customervendor.zipcode) )$ $( KiviLatex.filter(reclamation.customervendor.city) )$
+
+  $( KiviLatex.filter(reclamation.customervendor.country) )$
+\end{minipage}
+\hfill
+\begin{minipage}[t]{6cm}
+  \hfill{\LARGE\textbf{\vkreklamation}}
+
+  \vspace*{0.2cm}
+
+  \hfill{\large\textbf{\nr ~$( KiviLatex.filter(reclamation.record_number) )$}}
+
+  \vspace*{0.2cm}
+
+  \datum:\hfill $( reclamation.transdate_as_date )$
+
+  \kundennummer:\hfill $( KiviLatex.filter(reclamation.customervendor.number) )$
+
+  \ansprechpartner:\hfill $( KiviLatex.filter(employee_name) )$
+
+  \textTelefon \hfill $( KiviLatex.filter(employee_tel) )$
+
+  \textEmail \hfill $( KiviLatex.filter(employee_email) )$
+\end{minipage}
+
+$( IF (reclamation.shipto.shiptoname) )$%
+  \vspace{0.8cm}
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    $( KiviLatex.filter(reclamation.shipto.shiptoname) )$
+
+                 $( IF reclamation.shipto.shiptocontact )$ $( KiviLatex.filter(reclamation.shipto.shiptocontact) )$$( END )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptodepartment_1) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptodepartment_2) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptostreet) )$
+
+                 $( KiviLatex.filter(reclamation.shipto.shiptozipcode) )$ $( KiviLatex.filter(reclamation.shipto.shiptocity) )$
+$( END )$
+\vspace*{1.5cm}
+
+\hfill
+
+% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+\ifthenelse{\equal{$( reclamation.contact.cp_name )$}{}}{
+  $( IF reclamation.customervendor.natural_person )$$( KiviLatex.filter(reclamation.customervendor.greeting) )$ $( KiviLatex.filter(reclamation.customervendor.name) )$,$( ELSE )$\anrede$( END )$}{
+  \ifthenelse{\equal{$( reclamation.contact.cp_gender )$}{f}}
+    {\anredefrau}{\anredeherr} $( KiviLatex.filter(reclamation.contact.cp_title) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$,}\\
+
+\vkreklamationsformel\\
+
+\vspace{0.5cm}
+
+%% Diese Variable kann auf 1 gesetzt werden, wenn Preise angezeigt werden sollen.
+$( SET show_prices = 0 )$
+
+%
+% - longtable kann innerhalb der Tabelle umbrechen
+% - 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)
+%
+\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
+\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
+$( IF show_prices -)$
+\begin{longtable}{@{}rrp{7cm}@{\extracolsep{\fill}}rrr@{}}
+$( ELSE -)$
+\begin{longtable}{@{}rrp{10.7cm}@{\extracolsep{\fill}}r@{}}
+$( END -)$
+
+% Tabellenkopf
+\hline
+$( IF show_prices -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+$( ELSE -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} \\
+$( END -)$
+\hline\\
+\endhead
+
+% Tabellenkopf erste Seite
+\hline
+$( IF show_prices -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} & \textbf{\einzelpreis} & \textbf{\gesamtpreis} \\
+$( ELSE -)$
+\textbf{\position} & \textbf{\artikelnummer} & \textbf{\bezeichnung} & \textbf{\menge} \\
+$( END -)$
+\hline\\[-0.5em]
+\endfirsthead
+
+$( IF show_prices -)$
+% Tabellenende
+\\
+\multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\multicolumn{5}{@{}l}{\nettobetrag} & $( reclamation.netamount_as_number )$ \currency\\
+$( FOREACH tax = reclamation.taxes )$
+\multicolumn{5}{@{}l}{$( KiviLatex.filter(tax.tax.translated_attribute('taxdescription', reclamation.language_id)) )$} & $( LxERP.format_amount(tax.amount, 2) )$ \currency\\
+$( END )$
+\multicolumn{5}{@{}l}{\textbf{\schlussbetrag}} &  \textbf{$( reclamation.amount_as_number )$} \currency\\
+\hline\hline\\
+\endlastfoot
+$( ELSE -)$ %% IF show_prices
+% Tabellenende
+\\
+\multicolumn{4}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\endlastfoot
+$( END )$ %% IF show_prices
+
+% eigentliche Tabelle
+$( FOREACH item = reclamation.items_sorted -)$
+  $( item.position )$ &
+  $( KiviLatex.filter(item.part.partnumber) )$ &
+  \textbf{$( KiviLatex.filter(item.description) )$} &
+  $( item.qty_as_number )$ $( KiviLatex.filter(item.unit_obj.get_translation(reclamation.language_id, item.qty)) )$ $( IF show_prices -)$ &
+  $( item.sellprice_as_number )$ \currency &
+  \ifthenelse{\equal{$( item.discount )$}{0}}{}{\sffamily\scriptsize{(-$( item.discount_as_percent )$ \%)}}
+  \ourfont{$( LxERP.format_amount(item.linetotal, 2) )$ \currency} $( END -)$\\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
+
+  $( IF item.longdescription )$ && \scriptsize $( KiviLatex.filter_html(item.longdescription) )$\\$( END )$
+  $( IF item.reqdate )$         && \scriptsize \lieferdatum: $( item.reqdate_as_date )$\\$( END )$
+  $( IF item.serialnumber )$    && \scriptsize \seriennummer: $( KiviLatex.filter(item.serialnumber) )$\\$( END )$
+  $( IF item.part.ean )$        && \scriptsize \ean: $( KiviLatex.filter(item.part.ean) )$\\$( END )$
+  $( IF item.projectnumber )$   && \scriptsize \projektnummer: $( KiviLatex.filter(item.projectnumber) )$\\$( END )$
+  $( IF item.part.customerprices.size )$
+    $( FOREACH customerprice = item.part.customerprices )$
+      $( IF customerprice.customer_id == reclamation.customervendor.id )$
+        && \kundenartnr: $( KiviLatex.filter(customerprice.customer_partnumber) )$\\
+        $( LAST )$
+      $( END )$
+    $( END )$
+  $( END )$
+
+  $( IF (item.reason.description) )$     && \scriptsize \grund: $( KiviLatex.filter(item.reason.description) )$\\$( END )$
+  $( IF (item.reason_description_ext) )$ && \scriptsize $( KiviLatex.filter(item.reason_description_ext) )$\\$( END )$
+  \\[-0.8em]
+$( END )$
+
+\end{longtable}
+
+
+\vspace{0.2cm}
+
+$( IF reclamation.notes )$
+  \vspace{5mm}
+  $( KiviLatex.filter_html(reclamation.notes) )$
+\vspace{5mm}
+$( END )$
+
+$( IF reclamation.delivery_term )$
+  \lieferung ~$( KiviLatex.filter(reclamation.delivery_term.translated_attribute('description_long', reclamation.language_id)) )$\\
+$( END )$
+
+$( IF reclamation.reqdate )$
+  \lieferungErfolgtAm ~$( reclamation.reqdate_as_date )$. \\
+$( END )$
+
+\gruesse \\ \\ \\
+$( KiviLatex.filter(employee_name) )$
+
+\end{document}
+
diff --git a/templates/print/RB/supplier_delivery_order.tex b/templates/print/RB/supplier_delivery_order.tex
new file mode 100644
index 000000000..14a5a1bfc
--- /dev/null
+++ b/templates/print/RB/supplier_delivery_order.tex
@@ -0,0 +1,147 @@
+\input{inheaders.tex}
+
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
+\newcommand{\lxmedia} {<%media%>}
+\newcommand{\lxcurrency} {<%currency%>}
+\newcommand{\kivicompany} {<%employee_company%>}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+
+% laufende Kopfzeile:
+\ourhead{}{}{\beistelllieferschein}{<%donumber%>}{<%dodate%>}
+
+
+\begin{document}
+
+\ourfont
+\begin{minipage}[t]{8cm}
+  \scriptsize
+
+  {\color{gray}\underline{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}}
+  \normalsize
+
+  \vspace*{0.3cm}
+
+  <%name%>
+
+  <%if department_1%><%department_1%><%end if%>
+
+  <%if department_2%><%department_2%><%end if%>
+
+  <%cp_givenname%> <%cp_name%>
+
+  <%street%>
+
+  ~
+
+  <%zipcode%> <%city%>
+
+  <%country%>
+\end{minipage}
+\hfill
+\begin{minipage}{6cm}
+  \rightline{\LARGE\textbf{\textit{\beistelllieferschein}}} \vspace*{0.2cm}
+  \rightline{\large\textbf{\textit{\nr ~<%donumber%>
+  }}} \vspace*{0.2cm}
+
+  \datum:\hfill <%dodate%>
+
+  <%if cusordnumber%>\unsereBestellnummer:\hfill <%cusordnumber%><%end if%>
+
+  <%if ordnumber%>\auftragsnummer:\hfill <%ordnumber%><%end if%>
+
+  \ansprechpartner:\hfill <%employee_name%>
+
+  <%if globalprojectnumber%> \projektnummer:\hfill <%globalprojectnumber%> <%end globalprojectnumber%>
+\end{minipage}
+
+<%if shiptoname%>
+  \vspace{0.8cm}
+  \scriptsize \underline{\abweichendeLieferadresse:}\\
+  \normalsize    <%shiptoname%>
+
+                 <%if shiptocontact%> <%shiptocontact%><%end if%>
+
+                 <%shiptodepartment_1%>
+
+                  <%shiptodepartment_2%>
+
+                  <%shiptostreet%>
+
+                  <%shiptozipcode%> <%shiptocity%>
+<%end if%>
+\vspace*{1.5cm}
+
+
+%
+% - longtable kann innerhalb der Tabelle umbrechen
+% - 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)
+%
+\setlength\LTleft\parindent     % Tabelle beginnt am linken Textrand
+\setlength\LTright{0pt}         % Tabelle endet am rechten Textrand
+\begin{longtable}{@{}rrp{10.7cm}@{\extracolsep{\fill}}@{}}
+% Tabellenkopf
+\hline
+\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} \\
+\hline\\
+\endhead
+
+% Tabellenkopf erste Seite
+\hline
+\textbf{\position} & \textbf{\menge} & \textbf{\bezeichnung} \\
+\hline\\[-0.5em]
+\endfirsthead
+
+% Tabellenende
+\\
+\multicolumn{3}{@{}r@{}}{\weiteraufnaechsterseite}
+\endfoot
+
+% Tabellenende letzte Seite
+\hline\\
+\endlastfoot
+
+% eigentliche Tabelle
+<%foreach number%>
+          <%runningnumber%> &
+          <%qty%> <%unit%> &
+          \textbf{<%description%>} \\*  % kein Umbruch nach der ersten Zeile, damit Beschreibung und Langtext nicht getrennt werden
+
+          <%if longdescription%> && \scriptsize <%longdescription%>\\<%end longdescription%>
+          <%if projectnumber%> && \scriptsize \projektnummer: <%projectnumber%>\\<%end projectnumber%>
+          <%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_chargenumber%> && \scriptsize \charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%><%end si_chargenumber%>\\<%end si_number%>
+          <%if make%>
+            <%foreach make%>
+              \ifthenelse{\equal{<%make%>}{<%name%>}}{&& \scriptsize \artikelnummer: <%model%>\\}{}
+            <%end foreach%>
+          <%end if%>
+
+          \\[-0.8em]
+<%end number%>
+
+\end{longtable}
+
+\vspace{0.2cm}
+
+<%if notes%>
+        \vspace{5mm}
+        <%notes%>
+        \vspace{5mm}
+<%end if%>
+
+<%if delivery_term%>
+  \lieferung ~<%delivery_term.description_long%>\\
+<%end delivery_term%>
+
+\end{document}
diff --git a/templates/print/marei/Readme.md b/templates/print/marei/Readme.md
index 3e75424b6..e003c36b9 100644
--- a/templates/print/marei/Readme.md
+++ b/templates/print/marei/Readme.md
@@ -1,6 +1,9 @@
 # Bemerkungen zum Vorlagensatz
 ### © 2020–2021 by Marei Peischl (peiTeX TeXnical Solutions)
 
+Über die in diesem Dokument hinausgehende Konfigurationsoptionen des Paketes *kiviletter.sty* sind dokumentiert unter
+https://peitex.de/materialien/2023-08-04_kivitendo/kiviletter-doc.pdf
+
 ## Quickstart (wo kann was angepasst werden?):
 
   * insettings.tex : Pfad zu Angaben über Mandanten (default: firma)
@@ -174,6 +177,8 @@ Die Optionen für die `PricingTabular` Umgebung können wie folgt konfiguriert w
 ```
 Die Angabe hinter dem Kommentarzeichen entspricht der Voreinstellung.
 
+Ab Dezember 2023 gibt es zudem die Option `color-only-structure=<true/false>`. Somit wird sichergestellt. dass wenn lediglich die Kopf-/oder Fußzeile eingefärbt werden sollen, alle Inhalte ohne zusäzlichen Aufwand umbrechbar bleiben. In diesem fall ist diese Option anstat `color-rows` zu aktivieren.
+
 #### Trennlinien zwischen den Einträgen
 Die Umgebung `PricingTabular` hat die möglichkeit horizontale Linien zwischen den Einträgen der `\FakeTable` einzuziehen.
 Die einfachste Möglichkeit hierfür ist die Option hrule, sie setzt automatisch eine Linie der Dicke `\lightrulewidth`.
diff --git a/templates/print/marei/bin_list.tex b/templates/print/marei/bin_list.tex
index 7907ebe22..b9df0c8cf 100644
--- a/templates/print/marei/bin_list.tex
+++ b/templates/print/marei/bin_list.tex
@@ -15,7 +15,7 @@
 \setkomavar{firsthead}{
   \normalsize
   \noindent\begin{tabular}[t]{@{}l@{}}
-    <%company%>\strut\\
+    <%company%>\strut \\
     <%address%>
   \end{tabular}
   \hfill
@@ -43,43 +43,43 @@
 \makeatother
 
 \begin{letter}{
-<%name%>\ifhmode\\\fi
-<%street%>\ifhmode\\\fi
-<%zipcode%> <%city%>\ifhmode\\\fi
-<%country%>
-}
+    <%name%>\ifhmode\\\fi
+    <%street%>\ifhmode\\\fi
+    <%zipcode%> <%city%>\ifhmode\\\fi
+    <%country%>
+  }
 
-\opening{}
+  \opening{}
 
-\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
-        <%if warehouse%>%
-        &\bfseries\lager%
-        <%end warehouse%>%
-        &\bfseries\lagerplatz&\bfseries\lieferungMit}]
+  \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
+    <%if warehouse%>%
+      &\bfseries\lager%
+    <%end warehouse%>%
+    &\bfseries\lagerplatz&\bfseries\lieferungMit}]
 
-  <%ordnumber%>%
-  &%
-  <%if shippingdate%>%
-  <%shippingdate%>%
-  <%end shippingdate%>%
-  <%if not shippingdate%>%
-  <%orddate%>%
-  <%end shippingdate%>%
-  & <%employee%>%
-  <%if warehouse%>%
-  & <%warehouse%>%
-  <%end warehouse%>%
-  & <%shippingpoint%> & <%shipvia%> \\
-\end{SimpleTabular}
+    <%ordnumber%>%
+    &%
+    <%if shippingdate%>%
+      <%shippingdate%>%
+    <%end shippingdate%>%
+    <%if not shippingdate%>%
+    <%orddate%>%
+    <%end shippingdate%>%
+    & <%employee%>%
+    <%if warehouse%>%
+      & <%warehouse%>%
+    <%end warehouse%>%
+    & <%shippingpoint%> & <%shipvia%> \\
+  \end{SimpleTabular}
 
-\bigskip
+  \bigskip
 
-\begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]
-  <%foreach number%>%
-  <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
-  <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
-  <%end number%>%
-\end{SimpleTabular}
+  \begin{SimpleTabular}[colspec=rlXllrrll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\seriennummer & &\bfseries\menge&\bfseries\erh&&\bfseries\lagerplatz}]
+    <%foreach number%>%
+      <%runningnumber%> & <%number%> & <%description%> & <%serialnumber%> &
+      <%deliverydate%> & <%qty%> & <%ship%> & <%unit%> & <%bin%> \\
+    <%end number%>%
+  \end{SimpleTabular}
 
 \end{letter}
 
diff --git a/templates/print/marei/check.tex b/templates/print/marei/check.tex
index ad428f7de..2425a81a7 100644
--- a/templates/print/marei/check.tex
+++ b/templates/print/marei/check.tex
@@ -30,23 +30,30 @@
 
 \begin{document}
 
-\begin{letter}{
-<%name%>\ifhmode\\\fi
-<%street%>\ifhmode\\\fi
-<%zipcode%> <%city%>\ifhmode\\\fi
-<%country%>%
-}
-
-\opening{<%company%>}
-\pagestyle{empty}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>%
-
-\begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
-  <%foreach invnumber%>%
-  <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
-  <%end invnumber%>%
-\end{SimpleTabular}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
+
+  \opening{<%company%>}
+  \pagestyle{empty}
+
+  <%name%> \hfill <%datepaid%> \hfill <%source%>%
+
+  \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
+    <%foreach invnumber%>%
+      <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
+    <%end invnumber%>%
+  \end{SimpleTabular}
 
 \end{letter}
 
diff --git a/templates/print/marei/credit_note.tex b/templates/print/marei/credit_note.tex
index b764c1da5..7cf4b718c 100644
--- a/templates/print/marei/credit_note.tex
+++ b/templates/print/marei/credit_note.tex
@@ -21,7 +21,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \gutschrift~
   \nr ~<%invnumber%>%
 }
@@ -29,7 +29,7 @@
 <%if invnumber_for_credit_note%>%
   \setkomavar*{myref}{\fuerRechnung}
   \setkomavar{myref}{<%invnumber_for_credit_note%>}
-<%end if%>%
+<%end invnumber_for_credit_note%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
 <%if shiptoname%>%
@@ -52,73 +52,83 @@
   }
 \end{lrbox}
 \makeatother
-<%end if%>%
+<%end shiptoname%>%
 
 \begin{document}
 
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-
-\gutschriftformel
-
-<%if notes%>%
-<%notes%>%
-\vspace{0.5cm}
-<%end if%>%
-
-
-\begin{PricingTabular*}%
-  % eigentliche Tabelle%
-  \FakeTable{%
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline%
-    <%end number%>%
-  }%
-  \begin{PricingTotal}%
-    % Tabellenende letzte Seite
-    \nettobetrag & <%subtotal%>\\%
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\%
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
-  \end{PricingTotal}%
-\end{PricingTabular*}
-
-
-\closing{\gruesse}
+  \thispagestyle{kivitendo.letter.first}
+
+
+  \gutschriftformel
+
+  <%if notes%>%
+    <%notes%>%
+    \vspace{0.5cm}
+  <%end notes%>%
+
+
+  \begin{PricingTabular*}%
+    % eigentliche Tabelle%
+    \FakeTable{%
+      <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline%
+      <%end number%>%
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
+    \end{PricingTotal}%
+  \end{PricingTabular*}
+
+
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/deutsch.tex b/templates/print/marei/deutsch.tex
index 47eafa10b..e8a3e2bff 100644
--- a/templates/print/marei/deutsch.tex
+++ b/templates/print/marei/deutsch.tex
@@ -56,6 +56,15 @@
 \newcommand{\angebotortdatum}{Wir nehmen das vorstehende Angebot an.}
 \newcommand{\abweichendeLieferadresse}{abweichende Lieferadresse}
 
+% angebotseingang (purchase_quotation_intake)
+\newcommand{\angebotseingang} {Angebotseingang}
+\newcommand{\angebotseingangformel} {vielen Dank für Ihr Angebot. Wir haben es als Angebotseingang erfasst und werden es prüfen.}
+
+% auftragseingang (sales_order_intake)
+\newcommand{\auftragseingang} {Auftragseingang}
+\newcommand{\auftragseingangnummer} {Auftragseingang Nr.}
+\newcommand{\auftragseingangformel} {vielen Dank für Ihren Auftrag, wir haben Ihn als Auftragseingang erfasst.\\Sie erhalten innerhalb von drei Tagen unsere Auftragsbestätigung.}
+
 % auftragbestätigung (sales_order)
 \newcommand{\auftragsbestaetigung} {Auftragsbestätigung}
 \newcommand{\auftragsnummer} {Auftrags-Nr.}
@@ -71,6 +80,17 @@
 
 % lieferschein (sales_delivery_order)
 \newcommand{\lieferschein} {Lieferschein}
+\newcommand{\retourenlieferschein} {Retouren-Lieferschein}
+
+% verkaufsreklamationen (sales_reclamation)
+\newcommand{\vkreklamation}{VK-Reklamation}
+\newcommand{\vkreklamationsformel} {hiermit bestätigen wir Ihnen den Eingang einer Ihrer Reklamation mit folgenden Positionen:}
+
+% einkaufs-reklamationen (purchase_reclamation)
+\newcommand{\ekreklamation}{EK-Reklamation}
+\newcommand{\ekreklamationsformel} {folgende Positionen werden reklamiert:}
+
+\newcommand{\grund}{Grund}
 
 % rechnung (invoice)
 \newcommand{\rechnung} {Rechnung}
@@ -94,6 +114,7 @@
 \newcommand{\steuerfreiAUS} {Steuerfreie Lieferung ins außereuropäische Ausland.}
 
 \newcommand{\textUstid} {UStId:}
+\newcommand{\stornorechnung} {Stornorechnung}
 
 % anzahlungsrechnung (invoice_for_advance_payment)
 \newcommand{\anzahlungsrechnung} {Anzahlungsrechnung}
diff --git a/templates/print/marei/english.tex b/templates/print/marei/english.tex
index f757c7827..c57236b03 100644
--- a/templates/print/marei/english.tex
+++ b/templates/print/marei/english.tex
@@ -55,6 +55,15 @@
 \newcommand{\angebotortdatum}{We hereby accept this offer.}
 \newcommand{\abweichendeLieferadresse}{alternate delivery address}
 
+% angebotseingang (purchase_quotation_intake)
+\newcommand{\angebotseingang} {Quotation Intake}
+\newcommand{\angebotseingangformel} {thank you for your offer. We have entered it as quotation intake and will check it.}
+
+% auftragseingang (sales_order_intake)
+\newcommand{\auftragseingang} {Order Intake}
+\newcommand{\auftragseingangnummer} {Order Intake No.}
+\newcommand{\auftragseingangformel} {thank you for your order. We have entered it as order intake.\\You will receive our order confirmation within three days.}
+
 % auftragbestätigung (sales_order)
 \newcommand{\auftragsbestaetigung} {Order}
 \newcommand{\auftragsnummer} {Order No.}
@@ -70,6 +79,17 @@
 
 % lieferschein (sales_delivery_order)
 \newcommand{\lieferschein} {Delivery order}
+\newcommand{\retourenlieferschein} {Return order}
+
+% verkaufsreklamationen (sales_reclamation)
+\newcommand{\vkreklamation}{Sales reclamation}
+\newcommand{\vkreklamationsformel} {we hereby confirm receipt of your complaints with the following items:}
+
+% einkaufs-reklamationen (purchase_reclamation)
+\newcommand{\ekreklamation}{Purchase reclamation}
+\newcommand{\ekreklamationsformel} {we hereby complain about the following items:}
+
+\newcommand{\grund}{reason}
 
 % rechnung (invoice)
 \newcommand{\rechnung} {Invoice}
@@ -93,6 +113,7 @@
 \newcommand{\steuerfreiAUS} {VAT-exempt delivery for outside the EU.}
 
 \newcommand{\textUstid} {VAT number:}
+\newcommand{\stornorechnung} {Reversal Invoice}
 
 % anzahlungsrechnung (invoice_for_advance_payment)
 \newcommand{\anzahlungsrechnung} {Invoice for advance payment}
diff --git a/templates/print/marei/firma/ident.tex b/templates/print/marei/firma/ident.tex
index 3c4097402..d801ef3e6 100644
--- a/templates/print/marei/firma/ident.tex
+++ b/templates/print/marei/firma/ident.tex
@@ -21,4 +21,4 @@
 %\AddLayersToPageStyle{kivitendo.letter.first}{background}%Hintergrund für die erste Seite aktivieren
 %\AddLayersToPageStyle{kivitendo.letter}{background}% Hintergrund für die übrigen Briefseiten aktivieren.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ No newline at end of file
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/templates/print/marei/ic_supply.tex b/templates/print/marei/ic_supply.tex
index 6539b115b..efed55a95 100644
--- a/templates/print/marei/ic_supply.tex
+++ b/templates/print/marei/ic_supply.tex
@@ -17,56 +17,56 @@
 \begin{document}
 
 \begin{Form}
-\large
-Bestätigung über das Gelangen des Gegenstands einer innergemeinschaftlichen Lieferung
-in einen anderen EU-Mitgliedstaat (Gelangensbestätigung)
-\vspace{0.4cm}
+  \large
+  Bestätigung über das Gelangen des Gegenstands einer innergemeinschaftlichen Lieferung
+  in einen anderen EU-Mitgliedstaat (Gelangensbestätigung)
+  \vspace{0.4cm}
 
-{\color{purple} Bitte unterschreiben und faxen/mailen an:
-\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
-\normalsize
-\vspace{0.4cm}
-<%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
-\TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Name und Anschrift des Abnehmers der innergemeinschaftlichen Lieferung, ggf. E-Mail-Adresse)}
+  {\color{purple} Bitte unterschreiben und faxen/mailen an:
+    \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
+  \normalsize
+  \vspace{0.4cm}
+  <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
+  \TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Name und Anschrift des Abnehmers der innergemeinschaftlichen Lieferung, ggf. E-Mail-Adresse)}
 
-\vspace{0.4cm}
+  \vspace{0.4cm}
 
-Hiermit bestätige ich als Abnehmer, dass ich folgenden Gegenstand / dass folgender Gegenstand \textsuperscript{1)} einer
-innergemeinschaftlichen Lieferung\\
+  Hiermit bestätige ich als Abnehmer, dass ich folgenden Gegenstand / dass folgender Gegenstand \textsuperscript{1)} einer
+  innergemeinschaftlichen Lieferung\\
 
 
-\TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Menge des Gegenstands der Lieferung)}\\
+  \TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Menge des Gegenstands der Lieferung)}\\
 
-\TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(handelsübliche Bezeichnung, bei Fahrzeugen zusätzlich die Fahrzeug-Identifikationsnummer)}\\
+  \TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(handelsübliche Bezeichnung, bei Fahrzeugen zusätzlich die Fahrzeug-Identifikationsnummer)}\\
 
-im\\
+  im\\
 
-\uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
+  \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
   {\color{gray}(Monat und Jahr des Erhalts des Liefergegenstands im Mitgliedstaat, in den der Liefergegenstand gelangt ist, wenn der liefernde Unternehmer den Liefergegenstand befördert oder versendet hat oder wenn der Abnehmer den Liefergegenstand versendet hat)}\\
 
 
-\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Monat und Jahr des Endes der Beförderung, wenn der Abnehmer den Liefergegenstand selbst befördert hat)}\\
+  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Monat und Jahr des Endes der Beförderung, wenn der Abnehmer den Liefergegenstand selbst befördert hat)}\\
 
-in / nach \textsuperscript{1)}\\
+  in / nach \textsuperscript{1)}\\
 
 
-\uline{<%country%>\hspace*{\fill}}\\
+  \uline{<%country%>\hspace*{\fill}}\\
   {\color{gray}(Mitgliedstaat und Ort, wohin der Liefergegenstand im Rahmen einer Beförderung oder Versendung gelangt ist)}\\
 
-erhalten habe / gelangt ist.
+  erhalten habe / gelangt ist.
 
-\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Datum der Ausstellung der Bestätigung)}\\
+  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Datum der Ausstellung der Bestätigung)}\\
 
-\uline{\hspace*{\fill}}
+  \uline{\hspace*{\fill}}
 
-{\color{gray}(Unterschrift des Abnehmers oder seines Vertretungsberechtigten sowie Name des Unterzeichnenden in Druckschrift)}\\
+  {\color{gray}(Unterschrift des Abnehmers oder seines Vertretungsberechtigten sowie Name des Unterzeichnenden in Druckschrift)}\\
 
-\textbf{\textsuperscript{1)} Nichtzutreffendes bitte streichen.}
+  \textbf{\textsuperscript{1)} Nichtzutreffendes bitte streichen.}
 \end{Form}
 \end{document}
 
diff --git a/templates/print/marei/ic_supply_EN.tex b/templates/print/marei/ic_supply_EN.tex
index 5f9516c68..41642c3fe 100644
--- a/templates/print/marei/ic_supply_EN.tex
+++ b/templates/print/marei/ic_supply_EN.tex
@@ -17,52 +17,52 @@
 \begin{document}
 
 \begin{Form}
-\large
-Certification of the entry of the object of an intra-Community supply into another EU Member State (Entry Certificate)
+  \large
+  Certification of the entry of the object of an intra-Community supply into another EU Member State (Entry Certificate)
 
-\vspace{0.4cm}
+  \vspace{0.4cm}
 
-{\color{purple} Please sign below and send back to fax-number/mail-address:
-\begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
+  {\color{purple} Please sign below and send back to fax-number/mail-address:
+    \begin{center} <%employee_fax%> / <%employee_email%> \end{center}}
 
-\normalsize
-\vspace{0.4cm}
-<%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
-\TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Name and address of the customer of the intra-Community supply, e-mail address if applicable)}
+  \normalsize
+  \vspace{0.4cm}
+  <%name%>, <%street%>, <%zipcode%> <%city%>, <%country%>\hspace*{\fill}\\
+  \TextField[name=department, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Name and address of the customer of the intra-Community supply, e-mail address if applicable)}
 
 
-\vspace{0.4cm}
-I as the customer hereby certify my receipt / the entry \textsuperscript{1)} of the following object of an intra-Community supply\\
+  \vspace{0.4cm}
+  I as the customer hereby certify my receipt / the entry \textsuperscript{1)} of the following object of an intra-Community supply\\
 
-\TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Quantity of the object of the supply)}\\
+  \TextField[name=qty, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Quantity of the object of the supply)}\\
 
-\TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Standard commercial description – in the case of vehicles, including vehicle identification number)}\\
+  \TextField[name=desc, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Standard commercial description – in the case of vehicles, including vehicle identification number)}\\
 
-in\\
+  in\\
 
-\uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
+  \uline{ \StrGobbleLeft{<%reqdate%>}{3} \hspace*{\fill}}\\
   {\color{gray}(Month and year the object of the supply was received in the Member State of entry if the supplying trader transported or dispatched the object of the supply or if the customer dispatched the object of the supply)}\\
 
-\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
-{\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\
+  \TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
+  {\color{gray}(Month and year the transportation ended if the customer transported the object of the supply himself or herself)}\\
 
-in / at \textsuperscript{1)}\\
+  in / at \textsuperscript{1)}\\
 
-\uline{<%country%>\hspace*{\fill}}\\
+  \uline{<%country%>\hspace*{\fill}}\\
   {\color{gray}(Member State and place of entry as part of the transport or dispatch of the object)}\\
 
 
-% X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
-\uline{X\hspace*{\fill}}\\
-{\color{gray}(Date of issue of the certificate)}\\
+  % X\TextField[name=delivery, bordercolor=gray, width=\linewidth]{}\\
+  \uline{X\hspace*{\fill}}\\
+  {\color{gray}(Date of issue of the certificate)}\\
 
-\uline{X\hspace*{\fill}}\\
-{\color{gray}(Signature of the customer or of the authorised representative as well as the signatory’s name in capitals)}\\
+  \uline{X\hspace*{\fill}}\\
+  {\color{gray}(Signature of the customer or of the authorised representative as well as the signatory’s name in capitals)}\\
 
-\textbf{\textsuperscript{1)} Delete as appropriate.}
+  \textbf{\textsuperscript{1)} Delete as appropriate.}
 
 \end{Form}
 \end{document}
diff --git a/templates/print/marei/inheaders.tex b/templates/print/marei/inheaders.tex
deleted file mode 100644
index 88d4bfeaf..000000000
--- a/templates/print/marei/inheaders.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-%Dokumentenklasse für DIN-Briefe auf A4
-\documentclass[paper=a4,fontsize=10pt]{scrartcl}
-\usepackage{kiviletter}
-
-%TODO babel setup
-\endinput
diff --git a/templates/print/marei/invoice.tex b/templates/print/marei/invoice.tex
index b8970c20c..b5f80b655 100644
--- a/templates/print/marei/invoice.tex
+++ b/templates/print/marei/invoice.tex
@@ -7,7 +7,7 @@
   }]{foreground}
   \AddLayersToPageStyle{kivitendo.letter.first}{foreground}%Hintergrund für die erste Seite aktivieren
   \AddLayersToPageStyle{kivitendo.letter}{foreground}%Hintergrund für die erste Seite aktivieren
-<%end if%>
+<%end template_meta.formname == "invoice_copy"%>
 
 
 
@@ -23,11 +23,15 @@
 
 <%if template_meta.formname == "invoice_for_advance_payment"%>
   \renewcommand{\rechnung}{\anzahlungsrechnung}
-<%end if%>
+<%end template_meta.formname == "invoice_for_advance_payment"%>
 
 <%if template_meta.formname == "final_invoice"%>
   \renewcommand{\rechnung}{\schlussrechnung}
-<%end if%>
+<%end template_meta.formname == "final_invoice"%>
+
+<%if template_meta.formname == "storno_invoice"%>
+  \renewcommand{\rechnung}{\stornorechnung}
+<%end template_meta.formname == "storno_invoice"%>
 
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\rechnung}{<%invnumber%>}{<%invdate%>}
@@ -38,28 +42,36 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+
+<%if template_meta.formname == "storno_invoice"%>%
+\setkomavar{title}{%
+  \rechung~ \nr ~<%invnumber%>%
+}
+<%else%>%
+\setkomavar{title}{%
   \rechnung~ \nr ~<%invnumber%>%
 }
+<%end template_meta.formname == "storno_invoice"%>%
+
 <%if ordnumber%>%
   \setkomavar*{myref}{\auftragsnummer}
   \setkomavar{myref}{<%ordnumber%>}
-<%end if%>%
+<%end ordnumber%>%
 <%if tax_point%>%
   \setkomavar*{taxpoint}{\leistungsdatum}
   \setkomavar{taxpoint}{<%tax_point%>}
-<%end if%>%
+<%end tax_point%>%
 <%if cusordnumber%>%
   \setkomavar*{yourref}{\ihreBestellnummer}
   \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
+<%end cusordnumber%>%
 <%if donumber%>%
   \setkomavar{delivery}{<%donumber%>}
-<%end if%>%
+<%end donumber%>%
 
 <%if quonumber%>%
 \setkomavar{quote}{<%quonumber%>}
-<%end if%>%
+<%end quonumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
 <%if shiptoname%>%
@@ -82,84 +94,94 @@
   }
 \end{lrbox}
 \makeatother
-<%end if%>%
+<%end shiptoname%>%
 
 \begin{document}
 
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%me%>\strut\\%me%>\strut\\%me%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-<%if notes%>%
-<%notes%>%
-\vspace{0.5cm}
-<%end if%>%
-
-
-%PricingTabular* kann automatisch spalten ignorieren
-% \begin{PricingTabular*}[id=false]
-% deaktiviert damit die Spalte der Produktnummer
-% analog ist dies für pos, amount, price, pricetotal möglich.
-% Die Spalte der Bezeichnung ist nicht deaktivierbar
-%
-% Darüber hinaus kann die Reihenfolge verändert werden, die Voreinstellung entspricht:
-% \begin{PricingTabular*[columns={pos, id, desc, amount, price, pricetotal}]
-% Auf diese Art ist auch möglich mehrSpalten anzulegen als definiert sind. Für jede Spalte kann die Breite über weitere Optionen angepasst werden, die Einträge der columns-Liste entspricht den Spaltennamen.
-%
-% id = false, % deaktiviert die Spalte der Artikelnummer
-% amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
-% desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
-\begin{PricingTabular*}%
-  % eigentliche Tabelle
-  \FakeTable{%
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline%
+  \thispagestyle{kivitendo.letter.first}
+
+  <%if notes%>%
+    <%notes%>%
+    \vspace{0.5cm}
+  <%end notes%>%
+
+
+  %PricingTabular* kann automatisch spalten ignorieren
+  % \begin{PricingTabular*}[id=false]
+  % deaktiviert damit die Spalte der Produktnummer
+  % analog ist dies für pos, amount, price, pricetotal möglich.
+  % Die Spalte der Bezeichnung ist nicht deaktivierbar
+  %
+  % Darüber hinaus kann die Reihenfolge verändert werden, die Voreinstellung entspricht:
+  % \begin{PricingTabular*[columns={pos, id, desc, amount, price, pricetotal}]
+  % Auf diese Art ist auch möglich mehrSpalten anzulegen als definiert sind. Für jede Spalte kann die Breite über weitere Optionen angepasst werden, die Einträge der columns-Liste entspricht den Spaltennamen.
+  %
+  % id = false, % deaktiviert die Spalte der Artikelnummer
+  % amount = 1cm, % Setzt die Breite der Mengenspalte auf 1cm
+  % desc/header = Artikelbeschreibung, %Ändert die Überschrift der Bezeichnunsspalte in „Artikelbeschreibung”
+  \begin{PricingTabular*}%
+    % eigentliche Tabelle
+    \FakeTable{%
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline%
     <%end number%>%
-  }%
-  \begin{PricingTotal}%
-    % Tabellenende letzte Seite
-    \nettobetrag & <%subtotal%>\\%
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\%
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
-  \end{PricingTotal}%
-\end{PricingTabular*}
-
-\vspace{0.2cm}
-
-<%if template_meta.formname == "final_invoice"%>
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
+    \end{PricingTotal}%
+  \end{PricingTabular*}
+
+  \vspace{0.2cm}
+
+  <%if template_meta.formname == "final_invoice"%>
   <%if iap_existing%>
     \abzueglichAnzahlungsrechnungen:\\
     \begin{SimpleTabular}[colspec=llr<{\tabcurrency}r<{\tabcurrency},headline={\bfseries\nr& \bfseries\date& \bfseries\betrag & \bfseries\ust}]%
@@ -167,35 +189,37 @@
         <%iap_invnumber%> & <%iap_transdate_as_date%> & <%iap_amount%> & <%iap_taxamount%>\\%
       <%end iap_invnumber%>%
     \end{SimpleTabular}%
-      \bfseries\rechnungsbetrag: <%iap_final_amount%> \currency\\%
-  <%end iap_available%>
-<%end%>%
-
-\Ifstr{<%deliverydate%>}{}{%
-  \leistungsdatumGleichRechnungsdatum%
-}{
-  \lieferungErfolgtAm ~<%deliverydate%>.
-}\\
-
-<%if payment_terms%>%
-\zahlung ~<%payment_terms%>\\
-<%end payment_terms%>%
-
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
-
-<%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
-
-\ifnum<%taxzone_id%>=1
-\steuerfreiEU\\  % EU mit USt-ID Nummer
-\else
-\ifnum<%taxzone_id%>=3
-\steuerfreiAUS\\  % Außerhalb EU
-\fi
-\fi
-
-\closing{\gruesse}
+    \bfseries\rechnungsbetrag: <%iap_final_amount%> \currency\\%
+  <%end iap_existing%>
+  <%end%>%
+
+  \Ifstr{<%deliverydate%>}{}{%
+    \leistungsdatumGleichRechnungsdatum%
+  }{
+    \lieferungErfolgtAm ~<%deliverydate%>.
+  }\\
+
+  <%if template_meta.formname != "storno_invoice"%>%
+    <%if payment_terms%>%
+      \zahlung ~<%payment_terms%>\\
+    <%end payment_terms%>%
+
+    <%if delivery_term%>%
+      \lieferung ~<%delivery_term.description_long%>\\
+    <%end delivery_term%>%
+  <%end template_meta.formname != "storno_invoice"%>%
+
+  <%if ustid%>\ihreustid ~<%ustid%>.\\<%end if%>%
+
+  \ifnum<%taxzone_id%>=1
+    \steuerfreiEU\\  % EU mit USt-ID Nummer
+  \else
+    \ifnum<%taxzone_id%>=3
+      \steuerfreiAUS\\  % Außerhalb EU
+    \fi
+  \fi
+
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 79b33a818..29d505464 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{kiviletter}[2022/04/23 Letter Layouts for Kivitendo]
+\ProvidesPackage{kiviletter}[2023/12/08 Letter Layouts for Kivitendo]
 
 \RequirePackage{l3keys2e}
 
@@ -14,6 +14,7 @@
 \ExplSyntaxOn
 \newif\if@kivi@infobox
 \newif\if@kivi@footer
+\newcommand*{\SetupKiviletter}[1]{\keys_set:nn {kiviletter} {#1}}
 \keys_define:nn {kiviletter} {
   infobox .choices:nn = {true,false} {\use:c {@kivi@infobox\l_keys_choice_tl}},
   infobox .default:n = true,
@@ -171,7 +172,7 @@
 \dim_gset:Nn \g_kivi_tabcolsep_dim {.5\tabcolsep}
 \setlength\tabcolsep{.5\tabcolsep}
 
-\prg_new_conditional:Nnn \kivi_if_Price_col:n {T} {
+\prg_new_conditional:Nnn \kivi_if_Price_col:n {T, TF} {
   \prop_get:cnN {l_kivi_col_#1_prop} {colspec} \l_tmpa_tl
   \exp_args:NV \tl_if_eq:nnTF \l_tmpa_tl {Price}
   {\prg_return_true:}
@@ -180,9 +181,11 @@
 
 
 \cs_new:Nn \__kivi_calc_desc_column: {
-  \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
-  {\dim_set:Nn \l_kivi_tab_desc_leftskip_dim {2\g_kivi_tabcolsep_dim}}
-  {\dim_zero:N \l_kivi_tab_desc_leftskip_dim}
+  \bool_if:NTF \g__kivi_Tabular_rowcolor_bool {
+    \dim_set:Nn \l_kivi_tab_desc_leftskip_dim {2\g_kivi_tabcolsep_dim}
+  }{
+    \dim_zero:N \l_kivi_tab_desc_leftskip_dim
+  }
   \dim_zero:N \l_kivi_tab_desc_dim
   \bool_set_false:N \l_tmpa_bool
   \tl_gclear:N \g_kivi_Pricing_colspec_tl
@@ -204,7 +207,16 @@
             \dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
           }
         }
-        \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K{\dim_use:c {l_kivi_tab_##1_dim}}}
+        \prop_if_in:cnTF {l_kivi_col_##1_prop} {colspec} {
+          \kivi_if_Price_col:nTF {##1} {
+            \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K}
+          }{
+            \tl_gput_right:Nx \g_kivi_Pricing_colspec_tl {\prop_item:cn {l_kivi_col_##1_prop} {colspec}}
+          }
+          \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {{\dim_use:c {l_kivi_tab_##1_dim}}}
+        } {
+          \tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {K{\dim_use:c {l_kivi_tab_##1_dim}}}
+        }
         \kivi_if_Price_col:nT {##1} {\tl_gput_right:Nn \g_kivi_Pricing_colspec_tl {<{\__kivi_tab_column_currency:}}}
       }
     }
@@ -222,23 +234,23 @@
 \tcbuselibrary{breakable, skins}
 
 \tcb@new@skin{kivi@LT}{base@unbroken,%
-  frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
-  skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
-  underlay~first~and~middle={
-    \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
-    \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
+frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
+underlay~first~and~middle={
+\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
+},
+underlay~unbroken~and~last={
+\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
 },
-  underlay~unbroken~and~last={
-    \node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
-    \node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@lastfoot_box}};
-  },
-  boxsep=0pt,
-  boxrule=0pt,
-  left=0pt,
-  right=0pt,
-  bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
-  top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
-  parbox=false,
+boxsep=0pt,
+boxrule=0pt,
+left=0pt,
+right=0pt,
+bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
+top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
+parbox=false,
 }
 
 \tcb@new@skin{kivi@LT@first}{base@first,%
@@ -282,21 +294,17 @@
 }
 \long\def\kivi@color@b@x#1#2#3%
 {\leavevmode
-  \setbox\z@\hbox{{\set@color#3}}%
+  \setbox\z@\hbox to \linewidth{{\set@color\parbox{\linewidth}{\raggedright#3}}}%
   \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
   \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
   {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}}
-
 \long\def\kivi@nocolor@b@x#1#2#3%
 {\leavevmode
-  \setbox\z@\hbox{#3}%
+  \setbox\z@\hbox to \linewidth{\parbox{\linewidth}{\raggedright#3}}%
   \dimen@\ht\z@\advance\dimen@\l__kivi_fboxsep_dim\ht\z@\dimen@
   \dimen@\dp\z@\advance\dimen@\l__kivi_fboxsep_dim\dp\z@\dimen@
   {\box\z@}}
-
 %%%
-
-
 \newcommand{\FakeTable}[1]{
   \par
   \seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
@@ -307,13 +315,14 @@
   \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
   \seq_map_inline:Nn \l_kivi_PricingTable_seq {
     \if_mode_horizontal: \par \fi
-    \bool_if:NT \g__kivi_Tabular_rowcolor_bool {
+    \bool_if:NT \g__kivi_Tabular_content_rowcolor_bool {
       \int_gincr:N \g__kivi_PricingTable_rowcolor_int
       \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
       {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
       {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
     }
-    {\parbox{\linewidth}{
+    {
+      \parbox{\linewidth}{
         \seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
         \seq_gclear:N \g_kivi_extraDescription_seq
         \exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
@@ -323,24 +332,33 @@
           &\seq_item:Nn \l_kivi_columns_seq {####1}
         }
         \endtabular
-        \seq_if_empty:NTF \g_kivi_extraDescription_seq
-        {\par}
-        {\par\nopagebreak
-          \begingroup
-          \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
-          \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
-          \usekomafont{extraDescription}
-          \seq_use:Nn \g_kivi_extraDescription_seq {\\}
-          \par
-          \endgroup
-        }
-      }}
+      }
+    }
+
+    \seq_if_empty:NTF \g_kivi_extraDescription_seq
+    {\par}
+    {\par\nopagebreak
+      \bool_if:NT \g__kivi_Tabular_content_rowcolor_bool {
+        \int_if_odd:nTF {\g__kivi_PricingTable_rowcolor_int}
+        {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_odd_tl}}
+        {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_even_tl}}
+      }
+      {
+        \setlength{\leftskip}{\dim_eval:n {\bool_if:NT \g__kivi_Tabular_rowcolor_bool {-\tabcolsep} +\l_kivi_tab_desc_leftskip_dim}}
+        \setlength{\hsize}{\dim_eval:n {\l_kivi_tab_desc_dim+\leftskip}}
+        \setlength{\linewidth}{\hsize}
+        \addtolength{\leftmargini}{\l_kivi_tab_desc_leftskip_dim}
+        \usekomafont{extraDescription}
+        \seq_use:Nn \g_kivi_extraDescription_seq {\ifhmode\\\fi}
+        \par
+      }
+    }
+    \par
+    \tl_if_empty:NF \l__kivi_Tabular_rowsep_tl {\nointerlineskip\l__kivi_Tabular_rowsep_tl}
   }
-  \endgroup\par
-  \l__kivi_Tabular_rowsep_tl
+  \endgroup
+  \par
 }
-
-
 \seq_new:N  \__l_FakeTable_columns_seq
 \cs_new:Nn \__kivi_setup_FakeTable: {
   \seq_clear:N \__l_FakeTable_columns_seq
@@ -353,14 +371,14 @@
 
 \tl_new:N \g_kivi_Pricing_colspec_tl
 \tl_gset:Nn \g_kivi_Pricing_colspec_tl {
-  \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
-  \bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
-  \bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
-  p{\l_kivi_tab_desc_dim}
-  \bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
-  \bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
-  \bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
-  \bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
+\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
+\bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
+\bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
+p{\l_kivi_tab_desc_dim}
+\bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
+\bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
+\bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
+\bool_if:NF \g__kivi_Tabular_rowcolor_bool {@{}}
 }
 
 \cs_new_protected:Nn \__kivi_tab_column_currency: {\,\currency}
@@ -385,9 +403,12 @@
       \endtabular
     }
   }
+  \bool_if:nT {\g__kivi_Tabular_rowcolor_bool  && ! \g__kivi_Tabular_content_rowcolor_bool } {
+    \box_gset_dp:Nn \g_kivi_LT@head_box  {\box_dp:N \g_kivi_LT@head_box + \l__kivi_fboxsep_dim}
+  }
   \hbox_gset:Nn \g_kivi_LT@foot_box {
     \begin{tabular*}{\textwidth}[t]{@{\extracolsep{\fill}}r@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}}
-      \bool_if:NTF \g__kivi_Tabular_rowcolor_bool
+      \bool_if:NTF \g__kivi_Tabular_content_rowcolor_bool
       {\hline\noalign{\vskip1pt}}
       \midrule
       \strut\weiteraufnaechsterseite
@@ -405,18 +426,18 @@
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \NewDocumentEnvironment{PricingTotal}{+b}{
-  \par\nointerlineskip
+\par\nointerlineskip
 }{
-  \bool_if:NT \g__kivi_Tabular_rowcolor_bool   {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
-  {
-    \tabular[t]{
-      @{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
-      p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
-    }
-    \l__kivi_Tabular_PricingTotal_topsep_tl
-    #1
-    \endtabular
-  }
+\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\nointerlineskip\kivi@tabcolorbox{\g__kivi_Tabular_rowcolor_PricingTotal_tl}}
+{
+\tabular[t]{
+@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
+p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-\bool_if:NTF \g__kivi_Tabular_rowcolor_bool {4}{2}\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{\bool_if:NT \g__kivi_Tabular_rowcolor_bool {\hskip\tabcolsep}}
+}
+\l__kivi_Tabular_PricingTotal_topsep_tl
+#1
+\endtabular
+}
 }
 
 \tl_new:N \l__kivi_Tabular_PricingTotal_topsep_tl
@@ -462,8 +483,8 @@
       \prop_item:cn {l_kivi_col_##1_prop} {header}
     }
   }
-  \cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:
   \\
+  \noalign{\cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:}
   \bool_if:NF \g__kivi_Tabular_rowcolor_bool \midrule
 }
 
@@ -476,10 +497,23 @@
   headline .initial:n = {\usekomafont{tablehead}\position & \usekomafont{tablehead}\menge & \usekomafont{tablehead}\bezeichnung},
 }
 
+\bool_new:N \g__kivi_Tabular_rowcolor_bool
+\bool_new:N \g__kivi_Tabular_content_rowcolor_bool
+
 \keys_define:nn {kivi/Tabular} {
-  color-rows .bool_gset:N =  \g__kivi_Tabular_rowcolor_bool ,
+  color-rows .code:n = {
+      \bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
+      \bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
+    },
   color-rows .initial:n = false,
   color-rows .default:n = true,
+  color-only-structure .code:n  = {
+      \bool_gset_eq:Nc \g__kivi_Tabular_rowcolor_bool {c_#1_bool}
+      \bool_gset_eq:Nc \g__kivi_Tabular_content_rowcolor_bool {c_#1_bool}
+      \bool_gset_inverse:N \g__kivi_Tabular_content_rowcolor_bool
+    },
+  color-only-structure .initial:n = false,
+  color-only-structure .default:n = true,
   rowcolor-odd .tl_gset:N = \g__kivi_Tabular_rowcolor_odd_tl,
   rowcolor-odd .initial:n = black!10,
   rowcolor-even .tl_gset:N = \g__kivi_Tabular_rowcolor_even_tl,
@@ -491,10 +525,10 @@
   rowsep .tl_set:N =\l__kivi_Tabular_rowsep_tl,
   rowsep .initial:n = ,
   hrule .meta:n = {
-    rowsep={
-      \vskip\aboverulesep
-      \leavevmode\hrule\@height\lightrulewidth
-      \vskip\belowrulesep}},
+      rowsep={
+          \vskip\aboverulesep
+          \leavevmode\hrule\@height\lightrulewidth
+          \vskip\belowrulesep}},
 }
 
 \newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
@@ -539,6 +573,7 @@
   \__kivi_setup_LT_boxes:
   \__kivi_setup_FakeTable:
   \dim_set:Nn \parskip {\c_zero_dim}
+  \dim_set:Nn \parindent {\c_zero_dim}
   \PricingTabularBox\ignorespaces
 }{\endPricingTabularBox
   %compensate footer spacing
@@ -621,24 +656,12 @@
 \cs_if_exist:NF \Ifkomavarempty {\let\Ifkomavarempty\ifkomavarempty}
 
 %Definitionen für die insettings.tex
-
-\newcommand*{\setupIdentpath}[1]{
-  \int_set:Nn \l_kivi_tmp_int {1}
-  \bool_set_true:N \l_kivi_tmp_bool
-  \bool_while_do:Nn \l_kivi_tmp_bool {
-    \file_if_exist:nTF {firma\int_use:N \l_kivi_tmp_int/ident.tex}
-    {
-      \exp_args:Nf \str_if_in:nnTF {#1} {Firma\int_use:N \l_kivi_tmp_int}
-      {
-        \newcommand*{\identpath}{firma\int_use:N \l_kivi_tmpa_int}
-        \bool_set_false:N \l_kivi_tmp_bool
-      }
-      {\int_incr:N \l_kivi_tmp_int}
-    }
-    {
-      \bool_set_false:N \l_kivi_tmp_bool
-      \newcommand*{\identpath}{firma}
-    }
+\NewDocumentCommand{\setupIdentpath}{sm}{
+  \file_if_exist:nTF {#2/ident.tex}
+  {
+    \newcommand*{\identpath}{#2}
+  } {
+    \newcommand*{\identpath}{firma}
   }
 }
 
diff --git a/templates/print/marei/letter.tex b/templates/print/marei/letter.tex
index 1f29b1d6b..ea8d1cb71 100644
--- a/templates/print/marei/letter.tex
+++ b/templates/print/marei/letter.tex
@@ -34,19 +34,19 @@ $( IF letter.subject )$
 $( END )$
 
 \begin{letter}{
-$( KiviLatex.filter(customer.name) )$\strut\\
-$( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
-$( KiviLatex.filter(customer.street) )$\strut\\
-$( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
-$( KiviLatex.filter(customer.country) )$%
-}
+    $( KiviLatex.filter(customer.name) )$\strut\\
+    $( KiviLatex.filter(letter.contact.formal_greeting) )$\strut\\
+    $( KiviLatex.filter(customer.street) )$\strut\\
+    $( KiviLatex.filter(customer.zipcode) )$ $( KiviLatex.filter(customer.city) )$\strut\\
+    $( KiviLatex.filter(customer.country) )$%
+  }
 
-\opening{$( KiviLatex.filter(letter.greeting) )$}
-\thispagestyle{kivitendo.letter.first}
+  \opening{$( KiviLatex.filter(letter.greeting) )$}
+  \thispagestyle{kivitendo.letter.first}
 
-$( KiviLatex.filter_html(letter.body) )$
+  $( KiviLatex.filter_html(letter.body) )$
 
-\closing{\gruesse}
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/pick_list.tex b/templates/print/marei/pick_list.tex
index 23736b55b..3981ff513 100644
--- a/templates/print/marei/pick_list.tex
+++ b/templates/print/marei/pick_list.tex
@@ -15,7 +15,7 @@
 \setkomavar{firsthead}{
   \normalsize
   \noindent\begin{tabular}[t]{@{}l@{}}
-    <%company%>\strut\\
+    <%company%>\strut \\
     <%address%>
   \end{tabular}
   \hfill
@@ -28,60 +28,60 @@
 
 \makeatletter
 \setkomavar{location}{
-  \normalsize
-  <%shiptocontact%>%
-  <%if shiptophone%>%
+\normalsize
+<%shiptocontact%>%
+<%if shiptophone%>%
   \\\textTelefon : <%shiptophone%>
-  <%end shiptophone%>%
-  <%if shiptofax%>%
+<%end shiptophone%>%
+<%if shiptofax%>%
   \\\textFax : <%shiptofax%>
-  <%end shiptofax%>%
-  \\%
-  <%shiptoemail%>%
+<%end shiptofax%>%
+\\%
+<%shiptoemail%>%
 }
 \makeatother
 
 \setkomavar{backaddress}{\lieferanschrift}
 
 \begin{letter}{\strut%
-<%shiptoname%>\ifhmode\\\fi
-<%shiptostreet%>\ifhmode\\\fi
-<%shiptozipcode%>\ifhmode\\\fi
-<%shiptocity%>\ifhmode\\\fi
-<%shiptocountry%>%
-}
-
-\opening{}
-
-
-\begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
-        <%if warehouse%>%
-        &\bfseries\lager%
-        <%end warehouse%>%
-        &\bfseries\lagerplatz&\bfseries\lieferungMit}]
-  <%ordnumber%>%
-  &%
-  <%if shippingdate%>%
-  <%shippingdate%>%
-  <%end shippingdate%>%
-  <%if not shippingdate%>%
-  <%orddate%>%
-  <%end shippingdate%>%
-  & <%employee%>%
-  <%if warehouse%>%
-  & <%warehouse%>%
-  <%end warehouse%>%
-  & <%shippingpoint%> & <%shipvia%> \\
-\end{SimpleTabular}
-
-\bigskip
-
-\begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
-  <%foreach number%>%
-  <%runningnumber%> & <%number%> & <%description%> &%
-  <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
-  <%end number%>%
-\end{SimpleTabular}
+    <%shiptoname%>\ifhmode\\\fi
+    <%shiptostreet%>\ifhmode\\\fi
+    <%shiptozipcode%>\ifhmode\\\fi
+    <%shiptocity%>\ifhmode\\\fi
+    <%shiptocountry%>%
+  }
+
+  \opening{}
+
+
+  \begin{SimpleTabular}[colspec=*6X,headline={\bfseries\bestellnummer&\bfseries\datum&\bfseries\kontakt
+    <%if warehouse%>%
+      &\bfseries\lager%
+    <%end warehouse%>%
+    &\bfseries\lagerplatz&\bfseries\lieferungMit}]
+    <%ordnumber%>%
+    &%
+    <%if shippingdate%>%
+      <%shippingdate%>%
+    <%end shippingdate%>%
+    <%if not shippingdate%>%
+    <%orddate%>%
+    <%end shippingdate%>%
+    & <%employee%>%
+    <%if warehouse%>%
+      & <%warehouse%>%
+    <%end warehouse%>%
+    & <%shippingpoint%> & <%shipvia%> \\
+  \end{SimpleTabular}
+
+  \bigskip
+
+  \begin{SimpleTabular}[colspec=rlXrcll,headline={\bfseries\position&\bfseries\nummer&\bfseries\beschreibung&\bfseries\menge&\bfseries\lagerausgang&&\bfseries\lagerplatz}]%
+    <%foreach number%>%
+      <%runningnumber%> & <%number%> & <%description%> &%
+      <%qty%> & [\hspace{1cm}] & <%unit%> & <%bin%> \\%
+    <%end number%>%
+  \end{SimpleTabular}
 
 \end{letter}
 
diff --git a/templates/print/marei/proforma.tex b/templates/print/marei/proforma.tex
index 6730a7ea1..92f4107af 100644
--- a/templates/print/marei/proforma.tex
+++ b/templates/print/marei/proforma.tex
@@ -18,7 +18,7 @@
 
 \begin{document}
 
-\setkomavar{title}{
+\setkomavar{title}{%
   \proformarechnung~
   \nr ~<%ordnumber%>%
 }
@@ -27,9 +27,9 @@
 \setkomavar{date}{<%orddate%>}
 \setkomavar{customer}{<%customernumber%>}
 <%if cusordnumber%>%
-\setkomavar*{yourref}{\ihreBestellnummer}
-\setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
+  \setkomavar*{yourref}{\ihreBestellnummer}
+  \setkomavar{yourref}{<%cusordnumber%>}
+<%end cusordnumber%>%
 <%if quonumber%>\setkomavar{quote}{<%quonumber%>}<%end if%>%
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
@@ -37,94 +37,104 @@
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>%
-\makeatletter
-\begin{lrbox}\shippingAddressBox
-  \parbox{\useplength{toaddrwidth}}{
-    \backaddr@format{\scriptsize\usekomafont{backaddress}%
-      \strut\abweichendeLieferadresse
+  \makeatletter
+  \begin{lrbox}\shippingAddressBox
+    \parbox{\useplength{toaddrwidth}}{
+      \backaddr@format{\scriptsize\usekomafont{backaddress}%
+        \strut\abweichendeLieferadresse
+      }
+      \par\smallskip
+      \setlength{\parskip}{\z@}
+      \par
+      \normalsize
+      <%shiptoname%>\par
+      <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+      <%shiptodepartment_1%>\par
+      <%shiptodepartment_2%>\par
+      <%shiptostreet%>\par
+      <%shiptozipcode%> <%shiptocity%>%
     }
-    \par\smallskip
-    \setlength{\parskip}{\z@}
-    \par
-    \normalsize
-    <%shiptoname%>\par
-    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
-    <%shiptodepartment_1%>\par
-    <%shiptodepartment_2%>\par
-    <%shiptostreet%>\par
-    <%shiptozipcode%> <%shiptocity%>%
+  \end{lrbox}
+  \makeatother
+<%end shiptoname%>%
+
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
   }
-\end{lrbox}
-\makeatother
-<%end if%>%
-
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\auftragsformel
-
-\begin{PricingTabular*}%
-  % eigentliche Tabelle
-  \FakeTable{%
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline%
+  \thispagestyle{kivitendo.letter.first}
+
+  \auftragsformel
+
+  \begin{PricingTabular*}%
+    % eigentliche Tabelle
+    \FakeTable{%
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline%
     <%end number%>%
-  }%
-  \begin{PricingTotal}%
-    % Tabellenende letzte Seite%
-    \nettobetrag & <%subtotal%>\\%
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\%
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
-  \end{PricingTotal}%
-\end{PricingTabular*}
-
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
-
-<%if reqdate%>%
-\lieferungErfolgtAm ~<%reqdate%>. \\
-<%end if%>%
-
-\textit{\auftragpruefen}
-
-\closing{\gruesse}
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite%
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%invtotal%>\\%
+    \end{PricingTotal}%
+  \end{PricingTabular*}
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if reqdate%>%
+    \lieferungErfolgtAm ~<%reqdate%>. \\
+  <%end reqdate%>%
+
+  \textit{\auftragpruefen}
+
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/purchase_delivery_order.tex b/templates/print/marei/purchase_delivery_order.tex
deleted file mode 100644
index ddadec897..000000000
--- a/templates/print/marei/purchase_delivery_order.tex
+++ /dev/null
@@ -1,120 +0,0 @@
-\documentclass[paper=a4,fontsize=10pt]{scrartcl}
-\usepackage{kiviletter}
-
-
-% Variablen, die in settings verwendet werden
-\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
-\newcommand{\lxmedia} {<%media%>}
-\newcommand{\lxcurrency} {<%currency%>}
-\newcommand{\kivicompany} {<%employee_company%>}
-
-% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
-\input{insettings.tex}
-
-<%if template_meta.formname == "supplier_delivery_order"%>
-  \renewcommand{\einkaufslieferschein} {\beistelllieferschein}
-<%end%>
-
-
-% laufende Kopfzeile:
-\ourhead{}{}{\einkaufslieferschein}{<%donumber%>}{<%dodate%>}
-
-\setkomavar*{date}{\datum}
-\setkomavar{date}{<%dodate%>}
-
-\setkomavar{fromname}{<%employee_name%>}
-\setkomavar{fromphone}{<%employee_tel%>}
-\setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
-  \einkaufslieferschein~\nr ~<%donumber%>%
-}
-<%if ordnumber%>
-  \setkomavar{orderID}{<%ordnumber%>}
-<%end if%>%
-<%if cusordnumber%>%
-  \setkomavar*{yourref}{\unsereBestellnummer}
-  \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
-\setkomavar{transaction}{<%transaction_description%>}
-
-<%if globalprojectnumber%>%
-  \setkomavar{projectID}{<%globalprojectnumber%>}
-<%end globalprojectnumber%>%
-
-\setkomavar{transaction}{<%transaction_description%>}
-\setkomafont{extraDescription}{\scriptsize}
-
-<%if shiptoname%>%
-\makeatletter
-\begin{lrbox}\shippingAddressBox
-  \parbox{\useplength{toaddrwidth}}{
-    \backaddr@format{\scriptsize\usekomafont{backaddress}%
-      \strut\abweichendeLieferadresse
-    }
-    \par\smallskip
-    \setlength{\parskip}{\z@}
-    \par
-    \normalsize
-    <%shiptoname%>\par
-    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
-    <%shiptodepartment_1%>\par
-    <%shiptodepartment_2%>\par
-    <%shiptostreet%>\par
-    <%shiptozipcode%> <%shiptocity%>%
-  }
-\end{lrbox}
-\makeatother
-<%end if%>%
-
-
-\begin{document}
-
-
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
-
-
-\opening{}
-\thispagestyle{kivitendo.letter.first}
-
-\begin{PricingTabular*}[columns={pos,amount,desc}]
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &
-  <%qty%> <%unit%> &
-  \textbf{<%description%>}
-    <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-    <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-    <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-    <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-    <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-    <%foreach si_number%>%
-    <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
-    <%end si_number%>%
-    \tabularnewline
-    <%end number%>%
-  }
-\end{PricingTabular*}
-
-\medskip
-
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
-
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
-
-\end{letter}
-
-\end{document}
diff --git a/templates/print/marei/purchase_delivery_order.tex b/templates/print/marei/purchase_delivery_order.tex
new file mode 120000
index 000000000..d8678243d
--- /dev/null
+++ b/templates/print/marei/purchase_delivery_order.tex
@@ -0,0 +1 @@
+supplier_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/marei/purchase_order.tex b/templates/print/marei/purchase_order.tex
index 9c8d610f0..9d2f7ae5f 100644
--- a/templates/print/marei/purchase_order.tex
+++ b/templates/print/marei/purchase_order.tex
@@ -22,7 +22,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \bestellung~
   \nr~<%ordnumber%>%
 }
@@ -30,12 +30,12 @@
 <%if cusordnumber%>%
   \setkomavar*{yourref}{\unsereBestellnummer}
   \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
+<%end cusordnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>
   \setkomavar{quote}{<%quonumber%>}
-<%end if%>%
+<%end quonumber%>%
 
 <%if shiptoname%>%
 \makeatletter
@@ -57,75 +57,75 @@
   }
 \end{lrbox}
 \makeatother
-<%end if%>%
+<%end shiptoname%>%
 
 \begin{document}
 
 \begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\bestellformel
-
-\begin{PricingTabular*}
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline
+  \thispagestyle{kivitendo.letter.first}
+
+  \bestellformel
+
+  \begin{PricingTabular*}
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline
     <%end number%>%
-  }%
-  \begin{PricingTotal}%
-    % Tabellenende letzte Seite
-    \nettobetrag & <%subtotal%>\\%
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\%
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
-  \end{PricingTotal}
-\end{PricingTabular*}
-
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
-
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
-
-\closing{\gruesse}
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
+    \end{PricingTotal}
+  \end{PricingTabular*}
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
+
+  \closing{\gruesse}
 \end{letter}
 
 \end{document}
diff --git a/templates/print/marei/purchase_quotation_intake.tex b/templates/print/marei/purchase_quotation_intake.tex
new file mode 100644
index 000000000..465e7c2ce
--- /dev/null
+++ b/templates/print/marei/purchase_quotation_intake.tex
@@ -0,0 +1,125 @@
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
+
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
+\newcommand{\lxmedia} {<%media%>}
+\newcommand{\lxcurrency} {<%currency%>}
+\newcommand{\kivicompany} {<%employee_company%>}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+% laufende Kopfzeile:
+\ourhead{}{}{\angebotseingang}{<%quonumber%>}{<%quodate%>}
+
+
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%quodate%>}
+
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{%
+  \angebotseingang~
+  \nr~<%quonumber%>%
+}
+
+\setkomavar{transaction}{<%transaction_description%>}
+
+\setkomavar*{quote}{\angebotseingang{}~\nr}
+\setkomavar{quote}{<%quonumber%>}
+
+<%if shiptoname%>%
+\makeatletter
+\begin{lrbox}\shippingAddressBox
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut abweichende Lieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    <%shiptoname%>\par
+    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+    <%shiptodepartment_1%>\par
+    <%shiptodepartment_2%>\par
+    <%shiptostreet%>\par
+    <%shiptozipcode%> <%shiptocity%>%
+  }
+\end{lrbox}
+\makeatother
+<%end shiptoname%>%
+
+\begin{document}
+
+\begin{letter}{
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
+
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
+      <%cp_title%> <%cp_name%>,
+    }
+  }
+  \thispagestyle{kivitendo.letter.first}
+
+  \angebotseingangformel
+
+  \begin{PricingTabular*}
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline
+    <%end number%>%
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%quototal%>\\%
+    \end{PricingTotal}
+  \end{PricingTabular*}
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
+
+  \closing{\gruesse}
+\end{letter}
+
+\end{document}
diff --git a/templates/print/marei/purchase_reclamation.tex b/templates/print/marei/purchase_reclamation.tex
new file mode 100644
index 000000000..5948a0419
--- /dev/null
+++ b/templates/print/marei/purchase_reclamation.tex
@@ -0,0 +1,147 @@
+% config: use-template-toolkit=1
+% config: tag-style=$( )$
+$( USE KiviLatex )$
+$( USE L )$
+$( USE LxERP )$
+
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
+
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {$( template_meta.language.template_code )$}
+\newcommand{\lxmedia} {$( media )$}
+\newcommand{\lxcurrency} {$( currency )$}
+\newcommand{\kivicompany} {$( employee_company )$}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+% laufende Kopfzeile:
+\ourhead{\kundennummer}{$( KiviLatex.filter(reclamation.customervendor.number) )$}{\ekreklamation}{$( KiviLatex.filter(reclamation.record_number) )$}{$( reclamation.transdate_as_date )$}
+
+\setkomavar*{date}{\datum}
+\setkomavar{date}{$( reclamation.transdate_as_date )$}
+\setkomavar{customer}{$( KiviLatex.filter(reclamation.customer.number) )$}
+\setkomavar{fromname}{$( KiviLatex.filter(reclamation.employee.name) )$}
+%\setkomavar{fromphone}{$( KiviLatex.filter(reclamation.employee.deleted_tel) )$}
+%\setkomavar{fromemail}{$( KiviLatex.filter(reclamation.employee.deleted_email) )$}
+\setkomavar{title}{%
+  \ekreklamation~
+  \nr~$( KiviLatex.filter(reclamation.record_number) )$%
+}
+
+$( IF (reclamation.cv_record_number) )$%
+  %\setkomavar*{yourref}{\ihreReclamationsnummer}
+  \setkomavar{yourref}{$( KiviLatex.filter(reclamation.cv_record_number) )$}
+$( END )$%
+\setkomavar{transaction}{$( KiviLatex.filter(reclamation.transaction_description) )$}
+
+%TODO(Tamino): look at shipto
+$( IF (reclamation.shipto_id) )$%
+\makeatletter
+\begin{lrbox}\shippingAddressBox
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut abweichende Lieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    $( KiviLatex.filter(reclamation.shipto.shiptoname) )$\par
+    $( IF (reclamation.shipto.shiptocontact) )$ $( KiviLatex.filter(reclamation.shipto.shiptocontact) )$$( END )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptodepartment_1) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptodepartment_2) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptostreet) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptozipcode) )$ $( KiviLatex.filter(reclamation.shipto.shiptocity) )$%
+  }
+\end{lrbox}
+\makeatother
+$( END )$%
+
+\begin{document}
+
+\begin{letter}{
+  %TODO(Tamino): what name, street, ... ?
+  $( reclamation.customervendor.name )$\strut\\
+  $( IF (reclamation.customervendor.department_1) )$$( reclamation.customervendor.department_1 )$\\$( END )$%
+  $( IF (reclamation.customervendor.department_2) )$$( reclamation.customervendor.department_2 )$\\$( END )$%
+  $( reclamation.contact.cp_givenname )$ $( reclamation.contact.cp_name )$\strut\\
+  $( reclamation.customervendor.street )$\strut\\
+  $( reclamation.customervendor.zipcode )$ $( city )$\strut\\
+  $( reclamation.customervendor.country )$ \strut
+    }
+
+    % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+    % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+    \opening{
+    \Ifstr{$( KiviLatex.filter(reclamation.contact.cp_name) )$}{}{
+  $( IF (reclamation.customervendor.natural_person) )$
+  $( KiviLatex.filter(reclamation.customervendor.greeting) )$ $( KiviLatex.filter(reclamation.customervendor.name) )$,
+  $( ELSE )$
+    \anrede
+  $( END )$
+    }{
+    \Ifstr{$( KiviLatex.filter(reclamation.contact.cp_gender) )$}{f}
+    {\anredefrau}
+    {\anredeherr}
+  $( KiviLatex.filter(reclamation.contact.cp_title) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$,
+    }
+    }
+    \thispagestyle{kivitendo.letter.first}
+
+    \ekreklamationsformel
+
+    \begin{PricingTabular*}
+      % eigentliche Tabelle
+      \FakeTable{
+        $( FOREACH item = reclamation.items_sorted )$%
+        $( item.position )$ &%
+        $( item.part.partnumber )$ &%
+        \textbf{ $( KiviLatex.filter(item.description) )$ }%
+        $( IF (item.longdescription) )$\ExtraDescription{$( KiviLatex.filter_html(item.longdescription) )$}$( END )$%
+        $( IF (item.reqdate) )$\ExtraDescription{\lieferdatum: $( item.reqdate_as_date )$}$( END )$%
+        $( IF (item.serialnumber) )$\ExtraDescription{\seriennummer: $( KiviLatex.filter(item.serialnumber) )$}$( END )$%
+        $( IF (item.projectnumber) )$\ExtraDescription{\projektnummer: $( KiviLatex.filter(item.projectnumber) )$}$( END )$%
+        $( IF (item.reason.description) )$\ExtraDescription{\grund: $( KiviLatex.filter(item.reason.description) )$}$( END )$%
+        $( IF (item.reason_description_ext) )$\ExtraDescription{$( KiviLatex.filter(item.reason_description_ext) )$}$( END )$%
+        &%
+        $( item.qty_as_number )$ $( item.unit )$ &%
+        $( item.sellprice_as_number )$&%
+        % TODO(Tamino): discount in '%'
+        \Ifstr{$( item.discount_as_number )$}{0}{}{\sffamily\scriptsize{(-$( item.discount_as_percent )$\%)}}%
+        % TODO(Tamino): linetotal
+        \normalsize
+        $( LxERP.format_amount(item.linetotal, 2, 0) )$\tabularnewline
+        $( END )$%
+      }%
+      \begin{PricingTotal}%
+        % Tabellenende letzte Seite
+        \nettobetrag & $( reclamation.netamount_as_number )$\\%
+        $( FOREACH tax = reclamation.taxes )$%
+        $( KiviLatex.filter(tax.tax.taxdescription) )$ & $( LxERP.format_amount(tax.amount) )$\\%
+        $( END )$%
+        \bfseries\schlussbetrag &  \bfseries $( reclamation.amount_as_number )$\\%
+      \end{PricingTotal}
+    \end{PricingTabular*}
+
+  $( IF (reclamation.notes) )$%
+  $( KiviLatex.filter_html(reclamation.notes) )$%
+    \medskip
+  $( END )$%
+
+  $( IF (reclamation.delivery_term) )$%
+    \lieferung ~$( KiviLatex.filter(reclamation.delivery_term.description_long) )$\\
+  $( END )$%
+
+  $( IF (reclamation.reqdate) )$%
+    \lieferungErfolgtAm ~$( reclamation.reqdate_as_date )$.
+  $( END )$%
+
+
+  %\closing{\gruesse}
+
+\end{letter}
+
+\end{document}
diff --git a/templates/print/marei/receipt.tex b/templates/print/marei/receipt.tex
index ad428f7de..2eb86a24b 100644
--- a/templates/print/marei/receipt.tex
+++ b/templates/print/marei/receipt.tex
@@ -31,22 +31,22 @@
 \begin{document}
 
 \begin{letter}{
-<%name%>\ifhmode\\\fi
-<%street%>\ifhmode\\\fi
-<%zipcode%> <%city%>\ifhmode\\\fi
-<%country%>%
-}
-
-\opening{<%company%>}
-\pagestyle{empty}
-
-<%name%> \hfill <%datepaid%> \hfill <%source%>%
-
-\begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
-  <%foreach invnumber%>%
-  <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
-  <%end invnumber%>%
-\end{SimpleTabular}
+    <%name%>\ifhmode\\\fi
+    <%street%>\ifhmode\\\fi
+    <%zipcode%> <%city%>\ifhmode\\\fi
+    <%country%>%
+  }
+
+  \opening{<%company%>}
+  \pagestyle{empty}
+
+  <%name%> \hfill <%datepaid%> \hfill <%source%>%
+
+  \begin{SimpleTabular}[colspec=lXrr,headline={\bfseries\rechnung&\bfseries\ausgestellt&\bfseries\faellig&\bfseries\verrechnet}]
+    <%foreach invnumber%>%
+      <%invnumber%> & <%invdate%> & <%due%> & <%paid%> \\
+    <%end invnumber%>%
+  \end{SimpleTabular}
 
 \end{letter}
 
diff --git a/templates/print/marei/request_quotation.tex b/templates/print/marei/request_quotation.tex
index 0cfc11934..99487cf46 100644
--- a/templates/print/marei/request_quotation.tex
+++ b/templates/print/marei/request_quotation.tex
@@ -22,7 +22,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \anfrage~
   \nr ~<%quonumber%>%
 }
@@ -35,68 +35,68 @@
 \begin{document}
 
 \begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\anfrageformel
-
-\begin{PricingTabular*}[columns={pos,amount,desc}]
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &
-  <%qty%> <%unit%> &
-  \textbf{<%description%>}
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  <%if make%>%
-  <%foreach make%>%
-  \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{}
-    <%end foreach%>%
-    <%end if%>%
-    \tabularnewline
+  \thispagestyle{kivitendo.letter.first}
+
+  \anfrageformel
+
+  \begin{PricingTabular*}[columns={pos,amount,desc}]
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &
+      <%qty%> <%unit%> &
+      \textbf{<%description%>}
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+        <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+        <%if make%>%
+        <%foreach make%>%
+        \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>} \ExtraDescription{\bezeichnung: <%mm_part_description%>}}{}
+        <%end foreach%>%
+      <%end longdescription%>%
+      \tabularnewline
     <%end number%>%
-  }%
-\end{PricingTabular*}
+    }%
+  \end{PricingTabular*}
 
 
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
 
 
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
 
-<%if reqdate%>%
-\anfrageBenoetigtBis~<%reqdate%>.
-<%end if%>%
+  <%if reqdate%>%
+    \anfrageBenoetigtBis~<%reqdate%>.
+  <%end reqdate%>%
 
-\anfragedanke
+  \anfragedanke
 
-\closing{\gruesse}
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/rma_delivery_order.tex b/templates/print/marei/rma_delivery_order.tex
new file mode 120000
index 000000000..d8678243d
--- /dev/null
+++ b/templates/print/marei/rma_delivery_order.tex
@@ -0,0 +1 @@
+supplier_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/marei/sales_delivery_order.tex b/templates/print/marei/sales_delivery_order.tex
index 2811e50c7..cbd734041 100644
--- a/templates/print/marei/sales_delivery_order.tex
+++ b/templates/print/marei/sales_delivery_order.tex
@@ -13,24 +13,24 @@
 
 
 % laufende Kopfzeile:
-\ourhead{\kundennummer}{<%customernumber%>}{\lieferschein}{<%donumber%>}{<%dodate%>}
+\ourhead{\kundennummer}{<%customernumber%>}{\lieferschein}{<%donumber%>}{<%transdate%>}
 
 \setkomavar*{date}{\datum}
-\setkomavar{date}{<%dodate%>}
+\setkomavar{date}{<%transdate%>}
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \lieferschein~
   \nr~<%donumber%>%
 }
 <%if ordnumber%>
   \setkomavar{orderID}{<%ordnumber%>}
-<%end if%>%
+<%end ordnumber%>%
 <%if cusordnumber%>%
   \setkomavar*{yourref}{\unsereBestellnummer}
   \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
+<%end cusordnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if globalprojectnumber%>%
@@ -38,64 +38,63 @@
 <%end globalprojectnumber%>%
 
 \setkomavar{transaction}{<%transaction_description%>}
-\setkomafont{extraDescription}{\scriptsize}
 
 \begin{document}
 
 \begin{letter}{
-\Ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
-  <%name%>\strut\\
-  <%if department_1%><%department_1%>\\<%end if%>%
-  <%if department_2%><%department_2%>\\<%end if%>%
-  <%cp_givenname%> <%cp_name%>\strut\\
-  <%street%>\strut\\
-  <%zipcode%> <%city%>\strut\\
-  <%country%> \strut
-}{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
-  <%shiptoname%>\strut\\
-  <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
-  <%shiptodepartment_1%>\strut\\
-  <%shiptodepartment_2%>\strut\\
-  <%shiptostreet%>\strut\\
-  <%shiptozipcode%> <%shiptocity%>\strut
-} % ende ifthenelse LIEFERADRESSE
-}
+    \Ifstr{<%shiptoname%>}{}{ % KEINE ABWEICHENDE LIEFERADRESSE
+      <%name%>\strut\\
+      <%if department_1%><%department_1%>\\<%end if%>%
+      <%if department_2%><%department_2%>\\<%end if%>%
+      <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+      <%street%>\strut\\
+      <%zipcode%> <%city%>\strut\\
+      <%country%> \strut
+    }{ % ABWEICHENDE LIEFERADRESSE (Aus Stammdaten oder Beleg)
+      <%shiptoname%>\strut\\
+      <%if shiptocontact%> <%shiptocontact%><%end if%>\strut\\
+      <%shiptodepartment_1%>\strut\\
+      <%shiptodepartment_2%>\strut\\
+      <%shiptostreet%>\strut\\
+      <%shiptozipcode%> <%shiptocity%>\strut
+    } % ende ifthenelse LIEFERADRESSE
+  }
 
-\opening{}
-\thispagestyle{kivitendo.letter.first}
-
-\begin{PricingTabular*}[columns={pos, id, desc, amount}]
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &
-  <%number%> &
-  \textbf{<%description%>}
-    <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-    <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-    <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-    <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-    <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-    <%foreach si_number%>%
-    <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%><%si_qty%>~<%si_unit%><%end si_chargenumber%>}%
-    <%end si_number%>%
-    &
-    <%qty%> <%unit%>%
-    \tabularnewline
+  \opening{}
+  \thispagestyle{kivitendo.letter.first}
+
+  \begin{PricingTabular*}[columns={pos, id, desc, amount}]
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &
+      <%number%> &
+      \textbf{<%description%>}
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      <%foreach si_number%>%
+      <%if si_chargenumber%>\ExtraDescription{\charge: <%si_chargenumber%> <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end if%> <%si_qty%>~<%si_unit%>}<%end si_chargenumber%>%
+      <%end si_number%>%
+      &
+      <%qty%> <%unit%>%
+      \tabularnewline
     <%end number%>%
-  }
-\end{PricingTabular*}
+    }
+  \end{PricingTabular*}
 
-\medskip
+  \medskip
 
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
 
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
 
 \end{letter}
 
diff --git a/templates/print/marei/sales_order.tex b/templates/print/marei/sales_order.tex
index e0c8f30db..3978009cd 100644
--- a/templates/print/marei/sales_order.tex
+++ b/templates/print/marei/sales_order.tex
@@ -11,6 +11,11 @@
 % settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
 \input{insettings.tex}
 
+<%if template_meta.formname == "sales_order_intake"%>
+  \renewcommand{\auftragsbestaetigung}{\auftragseingang}
+  \renewcommand{\auftragsnummer}{\auftragseingangnummer}
+  \renewcommand{\auftragsformel}{\auftragseingangformel}
+<%end template_meta.formname == "sales_order_intake"%>
 
 % laufende Kopfzeile:
 \ourhead{\kundennummer}{<%customernumber%>}{\auftragsbestaetigung}{<%ordnumber%>}{<%orddate%>}
@@ -23,23 +28,23 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \auftragsbestaetigung~
   \nr~<%ordnumber%>%
 }
 <%if tax_point%>%
   \setkomavar*{taxpoint}{\leistungsdatum}
   \setkomavar{taxpoint}{<%tax_point%>}
-<%end if%>%
+<%end tax_point%>%
 <%if cusordnumber%>%
   \setkomavar*{yourref}{\ihreBestellnummer}
   \setkomavar{yourref}{<%cusordnumber%>}
-<%end if%>%
+<%end cusordnumber%>%
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if quonumber%>
   \setkomavar{quote}{<%quonumber%>}
-<%end if%>%
+<%end quonumber%>%
 
 <%if shiptoname%>%
 \makeatletter
@@ -61,81 +66,81 @@
   }
 \end{lrbox}
 \makeatother
-<%end if%>%
+<%end shiptoname%>%
 
 \begin{document}
 
 \begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\auftragsformel
-
-\begin{PricingTabular*}
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline
+  \thispagestyle{kivitendo.letter.first}
+
+  \auftragsformel
+
+  \begin{PricingTabular*}
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline
     <%end number%>%
-  }%
-  \begin{PricingTotal}%
-    % Tabellenende letzte Seite
-    \nettobetrag & <%subtotal%>\\%
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\%
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
-  \end{PricingTotal}
-\end{PricingTabular*}
-
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
-
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
-
-<%if reqdate%>%
-\lieferungErfolgtAm ~<%reqdate%>.
-<%end if%>%
-
-\textit{\auftragpruefen}
-
-\closing{\gruesse}
+    }%
+    \begin{PricingTotal}%
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\%
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\%
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\%
+    \end{PricingTotal}
+  \end{PricingTabular*}
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
+
+  <%if template_meta.formname != "sales_order_intake"%><%if reqdate%>
+    \lieferungErfolgtAm ~<%reqdate%>.
+  <%end template_meta.formname != "sales_order_intake"%><%end if%>
+
+  \textit{\auftragpruefen}
+
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/sales_order_intake.tex b/templates/print/marei/sales_order_intake.tex
new file mode 120000
index 000000000..df07c2a72
--- /dev/null
+++ b/templates/print/marei/sales_order_intake.tex
@@ -0,0 +1 @@
+sales_order.tex
\ No newline at end of file
diff --git a/templates/print/marei/sales_quotation.tex b/templates/print/marei/sales_quotation.tex
index d6e03c879..497493e5c 100644
--- a/templates/print/marei/sales_quotation.tex
+++ b/templates/print/marei/sales_quotation.tex
@@ -31,7 +31,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \angebot~
   <%quonumber%>%
 }
@@ -39,111 +39,111 @@
 \setkomavar{transaction}{<%transaction_description%>}
 
 <%if shiptoname%>%
-\makeatletter
-\begin{lrbox}\shippingAddressBox
-  \parbox{\useplength{toaddrwidth}}{
-    \backaddr@format{\scriptsize\usekomafont{backaddress}%
-      \strut\abweichendeLieferadresse
+  \makeatletter
+  \begin{lrbox}\shippingAddressBox
+    \parbox{\useplength{toaddrwidth}}{
+      \backaddr@format{\scriptsize\usekomafont{backaddress}%
+        \strut\abweichendeLieferadresse
+      }
+      \par\smallskip
+      \setlength{\parskip}{\z@}
+      \par
+      \normalsize
+      <%shiptoname%>\par
+      <%if shiptocontact%> <%shiptocontact%><%end if%>\par
+      <%shiptodepartment_1%>\par
+      <%shiptodepartment_2%>\par
+      <%shiptostreet%>\par
+      <%shiptozipcode%> <%shiptocity%>%
     }
-    \par\smallskip
-    \setlength{\parskip}{\z@}
-    \par
-    \normalsize
-    <%shiptoname%>\par
-    <%if shiptocontact%> <%shiptocontact%><%end if%>\par
-    <%shiptodepartment_1%>\par
-    <%shiptodepartment_2%>\par
-    <%shiptostreet%>\par
-    <%shiptozipcode%> <%shiptocity%>%
-  }
-\end{lrbox}
-\makeatother
-<%end if%>%
+  \end{lrbox}
+  \makeatother
+<%end shiptoname%>%
 
 
 \begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\angebotsformel
-
-
-\begin{PricingTabular*}
-  % eigentliche Tabelle
-  \FakeTable{
-  <%foreach number%>%
-  <%runningnumber%> &%
-  <%number%> &%
-  \textbf{<%description%>}%
-  <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
-  <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
-  <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
-  <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
-  <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
-  &%
-  <%qty%> <%unit%> &%
-  <%sellprice%>&%
-  \Ifstr{<%p_discount%>}{0}{}{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}%
-    <%linetotal%>\tabularnewline
+  \thispagestyle{kivitendo.letter.first}
+
+  \angebotsformel
+
+
+  \begin{PricingTabular*}
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &%
+      <%number%> &%
+      \textbf{<%description%>}%
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      &%
+      <%qty%> <%unit%> &%
+      <%sellprice%>&%
+      \Ifstr{<%p_discount%>}{0}{}{{\sffamily\scriptsize{(-<%p_discount%>\,\%)}}}%
+      <%linetotal%>\tabularnewline
     <%end number%>%
-  }
-  \begin{PricingTotal}
-    % Tabellenende letzte Seite
-    \nettobetrag & <%subtotal%>\\
-    <%foreach tax%>%
-    <%taxdescription%> & <%tax%>\\
-    <%end tax%>%
-    \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
-  \end{PricingTotal}
-\end{PricingTabular*}
-
-<%if notes%>%
-<%notes%>%
-\medskip
-<%end if%>%
-
-<%if delivery_term%>%
-\lieferung ~<%delivery_term.description_long%>\\
-<%end delivery_term%>%
-
-\angebotdanke\\
-<%if reqdate%>%
-\angebotgueltig~<%reqdate%>.
-<%end if%>%
-\angebotfragen
-
-
-\angebotagb
-
-\closing{\gruesse}
-
-\begin{minipage}{\textwidth}
-  \rule{\linewidth}{.2pt}\par
-  \auftragerteilt\par\bigskip
-  \nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip
-
-  \unterschrift/\stempel:\rule[-.5ex]{6cm}{.2pt}
-\end{minipage}
+    }
+    \begin{PricingTotal}
+      % Tabellenende letzte Seite
+      \nettobetrag & <%subtotal%>\\
+      <%foreach tax%>%
+        <%taxdescription%> & <%tax%>\\
+      <%end tax%>%
+      \bfseries\schlussbetrag &  \bfseries <%ordtotal%>\\
+    \end{PricingTotal}
+  \end{PricingTabular*}
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
+
+  \angebotdanke\\
+  <%if reqdate%>%
+    \angebotgueltig~<%reqdate%>.
+  <%end reqdate%>%
+  \angebotfragen
+
+
+  \angebotagb
+
+  \closing{\gruesse}
+
+  \begin{minipage}{\textwidth}
+    \rule{\linewidth}{.2pt}\par
+    \auftragerteilt\par\bigskip
+    \nurort:\rule[-.5ex]{8cm}{.2pt}\ ,\den\ \rule[-.5ex]{5cm}{.2pt}\par\bigskip
+
+    \unterschrift/\stempel:\rule[-.5ex]{6cm}{.2pt}
+  \end{minipage}
 
 
 \end{letter}
diff --git a/templates/print/marei/sales_reclamation.tex b/templates/print/marei/sales_reclamation.tex
new file mode 100644
index 000000000..93a373d11
--- /dev/null
+++ b/templates/print/marei/sales_reclamation.tex
@@ -0,0 +1,147 @@
+% config: use-template-toolkit=1
+% config: tag-style=$( )$
+$( USE KiviLatex )$
+$( USE L )$
+$( USE LxERP )$
+
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
+$( KiviLatex.required_packages_for_html )$
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {$( template_meta.language.template_code )$}
+\newcommand{\lxmedia} {$( media )$}
+\newcommand{\lxcurrency} {$( currency )$}
+\newcommand{\kivicompany} {$( employee_company )$}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+% laufende Kopfzeile:
+\ourhead{\kundennummer}{$( KiviLatex.filter(reclamation.customervendor.number) )$}{\vkreklamation}{$( KiviLatex.filter(reclamation.record_number) )$}{$( reclamation.transdate_as_date )$}
+
+\setkomavar*{date}{\datum}
+\setkomavar{date}{$( reclamation.transdate_as_date )$}
+\setkomavar{customer}{$( KiviLatex.filter(reclamation.customer.number) )$}
+\setkomavar{fromname}{$( KiviLatex.filter(reclamation.employee.name) )$}
+%\setkomavar{fromphone}{$( KiviLatex.filter(reclamation.employee.deleted_tel) )$}
+%\setkomavar{fromemail}{$( KiviLatex.filter(reclamation.employee.deleted_email) )$}
+\setkomavar{title}{%
+  \vkreklamation~
+  \nr~$( KiviLatex.filter(reclamation.record_number) )$%
+}
+
+$( IF (reclamation.cv_record_number) )$%
+  %\setkomavar*{yourref}{\ihreReclamationsnummer}
+  \setkomavar{yourref}{$( KiviLatex.filter(reclamation.cv_record_number) )$}
+$( END )$%
+\setkomavar{transaction}{$( KiviLatex.filter(reclamation.transaction_description) )$}
+
+%TODO(Tamino): look at shipto
+$( IF (reclamation.shipto_id) )$%
+\makeatletter
+\begin{lrbox}\shippingAddressBox
+  \parbox{\useplength{toaddrwidth}}{
+    \backaddr@format{\scriptsize\usekomafont{backaddress}%
+      \strut abweichende Lieferadresse
+    }
+    \par\smallskip
+    \setlength{\parskip}{\z@}
+    \par
+    \normalsize
+    $( KiviLatex.filter(reclamation.shipto.shiptoname) )$\par
+    $( IF (reclamation.shipto.shiptocontact) )$ $( KiviLatex.filter(reclamation.shipto.shiptocontact) )$$( END )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptodepartment_1) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptodepartment_2) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptostreet) )$\par
+    $( KiviLatex.filter(reclamation.shipto.shiptozipcode) )$ $( KiviLatex.filter(reclamation.shipto.shiptocity) )$%
+  }
+\end{lrbox}
+\makeatother
+$( END )$%
+
+\begin{document}
+
+\begin{letter}{
+  %TODO(Tamino): what name, street, ... ?
+  $( reclamation.customervendor.name )$\strut\\
+  $( IF (reclamation.customervendor.department_1) )$$( reclamation.customervendor.department_1 )$\\$( END )$%
+  $( IF (reclamation.customervendor.department_2) )$$( reclamation.customervendor.department_2 )$\\$( END )$%
+  $( reclamation.contact.cp_givenname )$ $( reclamation.contact.cp_name )$\strut\\
+  $( reclamation.customervendor.street )$\strut\\
+  $( reclamation.customervendor.zipcode )$ $( city )$\strut\\
+  $( reclamation.customervendor.country )$ \strut
+    }
+
+    % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+    % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+    \opening{
+    \Ifstr{$( KiviLatex.filter(reclamation.contact.cp_name) )$}{}{
+  $( IF (reclamation.customervendor.natural_person) )$
+  $( KiviLatex.filter(reclamation.customervendor.greeting) )$ $( KiviLatex.filter(reclamation.customervendor.name) )$,
+  $( ELSE )$
+    \anrede
+  $( END )$
+    }{
+    \Ifstr{$( KiviLatex.filter(reclamation.contact.cp_gender) )$}{f}
+    {\anredefrau}
+    {\anredeherr}
+  $( KiviLatex.filter(reclamation.contact.cp_title) )$ $( KiviLatex.filter(reclamation.contact.cp_name) )$,
+    }
+    }
+    \thispagestyle{kivitendo.letter.first}
+
+    \vkreklamationsformel
+
+    \begin{PricingTabular*}
+      % eigentliche Tabelle
+      \FakeTable{
+        $( FOREACH item = reclamation.items_sorted )$%
+        $( item.position )$ &%
+        $( item.part.partnumber )$ &%
+        \textbf{ $( KiviLatex.filter(item.description) )$ }%
+        $( IF (item.longdescription) )$\ExtraDescription{$( KiviLatex.filter_html(item.longdescription) )$}$( END )$%
+        $( IF (item.reqdate) )$\ExtraDescription{\lieferdatum: $( item.reqdate_as_date )$}$( END )$%
+        $( IF (item.serialnumber) )$\ExtraDescription{\seriennummer: $( KiviLatex.filter(item.serialnumber) )$}$( END )$%
+        $( IF (item.projectnumber) )$\ExtraDescription{\projektnummer: $( KiviLatex.filter(item.projectnumber) )$}$( END )$%
+        $( IF (item.reason.description) )$\ExtraDescription{\grund: $( KiviLatex.filter(item.reason.description) )$}$( END )$%
+        $( IF (item.reason_description_ext) )$\ExtraDescription{$( KiviLatex.filter(item.reason_description_ext) )$}$( END )$%
+        &%
+        $( item.qty_as_number )$ $( item.unit )$ &%
+        $( item.sellprice_as_number )$&%
+        % TODO(Tamino): discount in '%'
+        \Ifstr{$( item.discount_as_number )$}{0}{}{\sffamily\scriptsize{(-$( item.discount_as_percent )$\%)}}%
+        % TODO(Tamino): linetotal
+        \normalsize
+        $( LxERP.format_amount(item.linetotal, 2, 0) )$\tabularnewline
+        $( END )$%
+      }%
+      \begin{PricingTotal}%
+        % Tabellenende letzte Seite
+        \nettobetrag & $( reclamation.netamount_as_number )$\\%
+        $( FOREACH tax = reclamation.taxes )$%
+        $( KiviLatex.filter(tax.tax.taxdescription) )$ & $( LxERP.format_amount(tax.amount) )$\\%
+        $( END )$%
+        \bfseries\schlussbetrag &  \bfseries $( reclamation.amount_as_number )$\\%
+      \end{PricingTotal}
+    \end{PricingTabular*}
+
+  $( IF (reclamation.notes) )$%
+  $( KiviLatex.filter_html(reclamation.notes) )$%
+    \medskip
+  $( END )$%
+
+  $( IF (reclamation.delivery_term) )$%
+    \lieferung ~$( KiviLatex.filter(reclamation.delivery_term.description_long) )$\\
+  $( END )$%
+
+  $( IF (reclamation.reqdate) )$%
+    \lieferungErfolgtAm ~$( reclamation.reqdate_as_date )$.
+  $( END )$%
+
+
+  %\closing{\gruesse}
+
+\end{letter}
+
+\end{document}
diff --git a/templates/print/marei/statement.tex b/templates/print/marei/statement.tex
index 7cd91a020..60b3eff68 100644
--- a/templates/print/marei/statement.tex
+++ b/templates/print/marei/statement.tex
@@ -16,7 +16,7 @@
 \ourhead{}{}{\sammelrechnung}{}{}
 
 
-\setkomavar{title}{
+\setkomavar{title}{%
   \sammelrechnung~
   \nr~<%quonumber%>%
 }
@@ -28,50 +28,60 @@
 
 \begin{document}
 
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
-
-\sammelrechnungsformel
-
-\begin{SimpleTabular}[
-    colspec=l*6X,
-    headline={\bfseries\rechnung~\nr & \bfseries\datum & \bfseries\faellig &
-        \bfseries\aktuell & \bfseries\asDreissig & \bfseries\asSechzig & \bfseries\asNeunzig}
-  ]
-  % eigentliche Tabelle
-  <%foreach invnumber%>%
-  <%invnumber%> & <%invdate%> & <%duedate%> &
-  <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
-  <%end invnumber%>%
-  % Tabellenende letzte Seite
-  \midrule[\heavyrulewidth]
-  \multicolumn{3}{@{}l}{\bfseries\zwischensumme} & \bfseries<%c0total%> & \bfseries<%c30total%> & \bfseries<%c60total%> & \bfseries<%c90total%>\\*
-  \midrule
-  \multicolumn{3}{@{}l}{\bfseries\schlussbetrag} & &&&\bfseries<%total%> \\
-\end{SimpleTabular}
-
-\closing{\gruesse}
+  \thispagestyle{kivitendo.letter.first}
+
+  \sammelrechnungsformel
+
+  \begin{SimpleTabular}[
+      colspec=l*6X,
+      headline={\bfseries\rechnung~\nr & \bfseries\datum & \bfseries\faellig &
+          \bfseries\aktuell & \bfseries\asDreissig & \bfseries\asSechzig & \bfseries\asNeunzig}
+    ]
+    % eigentliche Tabelle
+    <%foreach invnumber%>%
+      <%invnumber%> & <%invdate%> & <%duedate%> &
+      <%c0%> & <%c30%> & <%c60%> & <%c90%> \\
+    <%end invnumber%>%
+    % Tabellenende letzte Seite
+    \midrule[\heavyrulewidth]
+    \multicolumn{3}{@{}l}{\bfseries\zwischensumme} & \bfseries<%c0total%> & \bfseries<%c30total%> & \bfseries<%c60total%> & \bfseries<%c90total%>\\*
+    \midrule
+    \multicolumn{3}{@{}l}{\bfseries\schlussbetrag} & &&&\bfseries<%total%> \\
+  \end{SimpleTabular}
+
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/storno_invoice.tex b/templates/print/marei/storno_invoice.tex
new file mode 120000
index 000000000..b6a6ad821
--- /dev/null
+++ b/templates/print/marei/storno_invoice.tex
@@ -0,0 +1 @@
+invoice.tex
\ No newline at end of file
diff --git a/templates/print/marei/supplier_delivery_order.tex b/templates/print/marei/supplier_delivery_order.tex
deleted file mode 120000
index 7d185e626..000000000
--- a/templates/print/marei/supplier_delivery_order.tex
+++ /dev/null
@@ -1 +0,0 @@
-purchase_delivery_order.tex
\ No newline at end of file
diff --git a/templates/print/marei/supplier_delivery_order.tex b/templates/print/marei/supplier_delivery_order.tex
new file mode 100644
index 000000000..29f55a0bd
--- /dev/null
+++ b/templates/print/marei/supplier_delivery_order.tex
@@ -0,0 +1,125 @@
+\documentclass[paper=a4,fontsize=10pt]{scrartcl}
+\usepackage{kiviletter}
+
+
+% Variablen, die in settings verwendet werden
+\newcommand{\lxlangcode} {<%template_meta.language.template_code%>}
+\newcommand{\lxmedia} {<%media%>}
+\newcommand{\lxcurrency} {<%currency%>}
+\newcommand{\kivicompany} {<%employee_company%>}
+
+% settings: Einstellungen, Logo, Briefpapier, Kopfzeile, Fusszeile
+\input{insettings.tex}
+
+
+<%if template_meta.formname == "rma_delivery_order"%>
+\renewcommand{\beistelllieferschein} {\retourenlieferschein}
+<%end%>
+
+% laufende Kopfzeile:
+\ourhead{}{}{\beistelllieferschein}{<%donumber%>}{<%transdate%>}
+
+\setkomavar*{date}{\datum}
+\setkomavar{date}{<%transdate%>}
+
+\setkomavar{fromname}{<%employee_name%>}
+\setkomavar{fromphone}{<%employee_tel%>}
+\setkomavar{fromemail}{<%employee_email%>}
+\setkomavar{title}{%
+	\beistelllieferschein~\nr ~<%donumber%>%
+}
+<%if ordnumber%>
+	\setkomavar{orderID}{<%ordnumber%>}
+<%end ordnumber%>%
+<%if cusordnumber%>%
+	\setkomavar*{yourref}{\unsereBestellnummer}
+	\setkomavar{yourref}{<%cusordnumber%>}
+<%end cusordnumber%>%
+\setkomavar{transaction}{<%transaction_description%>}
+
+<%if globalprojectnumber%>%
+	\setkomavar{projectID}{<%globalprojectnumber%>}
+<%end globalprojectnumber%>%
+
+\setkomavar{transaction}{<%transaction_description%>}
+
+<%if shiptoname%>%
+\makeatletter
+\begin{lrbox}\shippingAddressBox
+	\parbox{\useplength{toaddrwidth}}{
+		\backaddr@format{\scriptsize\usekomafont{backaddress}%
+			\strut\abweichendeLieferadresse
+		}
+		\par\smallskip
+		\setlength{\parskip}{\z@}
+		\par
+		\normalsize
+		<%shiptoname%>\par
+		<%if shiptocontact%> <%shiptocontact%><%end if%>\par
+		<%shiptodepartment_1%>\par
+		<%shiptodepartment_2%>\par
+		<%shiptostreet%>\par
+		<%shiptozipcode%> <%shiptocity%>%
+	}
+\end{lrbox}
+\makeatother
+<%end shiptoname%>%
+
+
+\begin{document}
+
+
+\begin{letter}{
+    <%name%>\strut\\
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\
+    <%street%>\strut\\
+    <%zipcode%> <%city%>\strut\\
+    <%country%> \strut
+  }
+
+
+  \opening{}
+  \thispagestyle{kivitendo.letter.first}
+
+  \begin{PricingTabular*}[columns={pos,amount,desc}]
+    % eigentliche Tabelle
+    \FakeTable{
+    <%foreach number%>%
+      <%runningnumber%> &
+      <%qty%> <%unit%> &
+      \textbf{<%description%>}
+      <%if longdescription%>\ExtraDescription{<%longdescription%>}<%end longdescription%>%
+      <%if reqdate%>\ExtraDescription{\lieferdatum: <%reqdate%>}<%end reqdate%>%
+      <%if serialnumber%>\ExtraDescription{\seriennummer: <%serialnumber%>}<%end serialnumber%>%
+      <%if ean%>\ExtraDescription{\ean: <%ean%>}<%end ean%>%
+      <%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>%
+      <%foreach si_number%>%
+      \ExtraDescription{<%if si_chargenumber%>\charge: <%si_chargenumber%>
+        <%if si_bestbefore%> \mhd: <%si_bestbefore%><%end si_bestbefore%>~--~<%si_qty%>~<%si_unit%>
+        <%end si_chargenumber%>%%
+      }%
+      <%end si_number%>%
+      <%foreach make%>%
+        \Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{}
+      <%end foreach%>%
+	   \tabularnewline
+    <%end number%>%
+    }
+  \end{PricingTabular*}
+
+  \medskip
+
+  <%if notes%>%
+    <%notes%>%
+    \medskip
+  <%end notes%>%
+
+  <%if delivery_term%>%
+    \lieferung ~<%delivery_term.description_long%>\\
+  <%end delivery_term%>%
+
+\end{letter}
+
+\end{document}
diff --git a/templates/print/marei/zahlungserinnerung.tex b/templates/print/marei/zahlungserinnerung.tex
index abb601f78..66f17d0c7 100644
--- a/templates/print/marei/zahlungserinnerung.tex
+++ b/templates/print/marei/zahlungserinnerung.tex
@@ -21,7 +21,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \mahnung
   <%if dunning_id%>~\nr~<%dunning_id%><%end if%>%
 }
@@ -29,51 +29,61 @@
 
 \begin{document}
 
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
+  \thispagestyle{kivitendo.letter.first}
 
-\mahnungsformel
+  \mahnungsformel
 
-\begin{SimpleTabular}[headline=\bfseries\rechnung~\nr&\bfseries\datum&\bfseries\betrag,colspec=rXr<{\tabcurrency}]
-  % eigentliche Tabelle
-  <%foreach dn_invnumber%>%
-  <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \\[0.1cm]
-  <%end dn_invnumber%>%
-\end{SimpleTabular}
+  \begin{SimpleTabular}[headline=\bfseries\rechnung~\nr&\bfseries\datum&\bfseries\betrag,colspec=rXr<{\tabcurrency}]
+    % eigentliche Tabelle
+    <%foreach dn_invnumber%>%
+      <%dn_invnumber%> & <%dn_transdate%> & <%dn_amount%> \\[0.1cm]
+    <%end dn_invnumber%>%
+  \end{SimpleTabular}
 
 
-\smallskip
+  \smallskip
 
-\bitteZahlenBis~<%dunning_duedate%>.
+  \bitteZahlenBis~<%dunning_duedate%>.
 
 
-\beruecksichtigtBis~<%dunning_date%>.
+  \beruecksichtigtBis~<%dunning_date%>.
 
 
-\schonGezahlt
+  \schonGezahlt
 
-\closing{\gruesse}
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/marei/zahlungserinnerung_invoice.tex b/templates/print/marei/zahlungserinnerung_invoice.tex
index 9acdeab47..f17325310 100644
--- a/templates/print/marei/zahlungserinnerung_invoice.tex
+++ b/templates/print/marei/zahlungserinnerung_invoice.tex
@@ -21,7 +21,7 @@
 \setkomavar{fromname}{<%employee_name%>}
 \setkomavar{fromphone}{<%employee_tel%>}
 \setkomavar{fromemail}{<%employee_email%>}
-\setkomavar{title}{
+\setkomavar{title}{%
   \rechnung~
   \nr ~<%invnumber%>%
 }
@@ -35,44 +35,54 @@
 \begin{document}
 
 
-\begin{letter}{
-<%name%>\strut\\
-<%if department_1%><%department_1%>\\<%end if%>%
-<%if department_2%><%department_2%>\\<%end if%>%
-<%cp_givenname%> <%cp_name%>\strut\\
-<%street%>\strut\\
-<%zipcode%> <%city%>\strut\\
-<%country%> \strut
-}
+\begin{letter}{%
+  <%if billing_address_id%>%
+    <%billing_address_name%> \strut\\%
+    <%if billing_address_department_1%><%billing_address_department_1%>\\<%end if%>%
+    <%if billing_address_department_2%><%billing_address_department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%billing_address_street%>\strut\\%
+    <%billing_address_zipcode%> <%billing_address_city%> \strut\\%
+    <%billing_address_country%>\strut\\%
+  <%else%>%
+    <%name%>\strut\\%
+    <%if department_1%><%department_1%>\\<%end if%>%
+    <%if department_2%><%department_2%>\\<%end if%>%
+    <%cp_title%> <%cp_givenname%> <%cp_name%>\strut\\%
+    <%street%>\strut\\%
+    <%zipcode%> <%city%>\strut\\%
+    <%country%>\strut%
+  <%end billing_address_id%>%
+  }
 
-% Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
-% Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
-\opening{
-\Ifstr{<%cp_name%>}{}
-{<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
-  {
-    \Ifstr{<%cp_gender%>}{f}
-        {\anredefrau}
-        {\anredeherr}
+  % Bei Kontaktperson Anrede nach Geschlecht unterscheiden.
+  % Bei natürlichen Personen persönliche Anrede, sonst allgemeine Anrede.
+  \opening{
+    \Ifstr{<%cp_name%>}{}
+    {<%if natural_person%><%greeting%> <%name%>,<%else%>\anrede<%end if%>}
+    {
+      \Ifstr{<%cp_gender%>}{f}
+      {\anredefrau}
+      {\anredeherr}
       <%cp_title%> <%cp_name%>,
     }
   }
-\thispagestyle{kivitendo.letter.first}
+  \thispagestyle{kivitendo.letter.first}
 
-\mahnungsrechnungsformel
+  \mahnungsrechnungsformel
 
-\begin{SimpleTabular}[colspec=Xr<{\tabcurrency},headline={\bfseries\posten& \bfseries\betrag}]
-  Mahngebühren & <%fee%> \\
-  Zinsen & <%interest%> \\
-  \midrule[\heavyrulewidth]
-  \multicolumn{1}{@{}l}{\schlussbetrag}& <%invamount%>\\
-\end{SimpleTabular}
+  \begin{SimpleTabular}[colspec=Xr<{\tabcurrency},headline={\bfseries\posten& \bfseries\betrag}]
+    Mahngebühren & <%fee%> \\
+    Zinsen & <%interest%> \\
+    \midrule[\heavyrulewidth]
+    \multicolumn{1}{@{}l}{\schlussbetrag}& <%invamount%>\\
+  \end{SimpleTabular}
 
-\smallskip
+  \smallskip
 
-\bitteZahlenBis~<%duedate%>.
+  \bitteZahlenBis~<%duedate%>.
 
-\closing{\gruesse}
+  \closing{\gruesse}
 
 \end{letter}
 
diff --git a/templates/print/rev-odt/credit_note.odt b/templates/print/rev-odt/credit_note.odt
index dda141a7e..c398389ba 100644
Binary files a/templates/print/rev-odt/credit_note.odt and b/templates/print/rev-odt/credit_note.odt differ
diff --git a/templates/print/rev-odt/invoice.odt b/templates/print/rev-odt/invoice.odt
index b338f4d0e..d85355268 100644
Binary files a/templates/print/rev-odt/invoice.odt and b/templates/print/rev-odt/invoice.odt differ
diff --git a/templates/print/rev-odt/invoice_besr.odt b/templates/print/rev-odt/invoice_besr.odt
deleted file mode 100644
index 82b77caaf..000000000
Binary files a/templates/print/rev-odt/invoice_besr.odt and /dev/null differ
diff --git a/templates/print/rev-odt/invoice_qr.odt b/templates/print/rev-odt/invoice_qr.odt
index 621e478aa..374c967c7 100644
Binary files a/templates/print/rev-odt/invoice_qr.odt and b/templates/print/rev-odt/invoice_qr.odt differ
diff --git a/templates/print/rev-odt/mahnung.odt b/templates/print/rev-odt/mahnung.odt
index c689709cc..d83f5a98e 100644
Binary files a/templates/print/rev-odt/mahnung.odt and b/templates/print/rev-odt/mahnung.odt differ
diff --git a/templates/print/rev-odt/mahnung_invoice.odt b/templates/print/rev-odt/mahnung_invoice.odt
index 50c56d76b..31b24f90b 100644
Binary files a/templates/print/rev-odt/mahnung_invoice.odt and b/templates/print/rev-odt/mahnung_invoice.odt differ
diff --git a/templates/print/rev-odt/pick_list.odt b/templates/print/rev-odt/pick_list.odt
index 58aa56e4e..0fdb436d6 100644
Binary files a/templates/print/rev-odt/pick_list.odt and b/templates/print/rev-odt/pick_list.odt differ
diff --git a/templates/print/rev-odt/proforma.odt b/templates/print/rev-odt/proforma.odt
index c5c913ac0..e4fed3407 100644
Binary files a/templates/print/rev-odt/proforma.odt and b/templates/print/rev-odt/proforma.odt differ
diff --git a/templates/print/rev-odt/purchase_delivery_order.odt b/templates/print/rev-odt/purchase_delivery_order.odt
index 54eabe5d2..bd58da235 100644
Binary files a/templates/print/rev-odt/purchase_delivery_order.odt and b/templates/print/rev-odt/purchase_delivery_order.odt differ
diff --git a/templates/print/rev-odt/purchase_order.odt b/templates/print/rev-odt/purchase_order.odt
index 7f53585e2..4b4fa33d0 100644
Binary files a/templates/print/rev-odt/purchase_order.odt and b/templates/print/rev-odt/purchase_order.odt differ
diff --git a/templates/print/rev-odt/request_quotation.odt b/templates/print/rev-odt/request_quotation.odt
index fda58e900..786863c27 100644
Binary files a/templates/print/rev-odt/request_quotation.odt and b/templates/print/rev-odt/request_quotation.odt differ
diff --git a/templates/print/rev-odt/sales_delivery_order.odt b/templates/print/rev-odt/sales_delivery_order.odt
index c4ac65deb..60641d9e0 100644
Binary files a/templates/print/rev-odt/sales_delivery_order.odt and b/templates/print/rev-odt/sales_delivery_order.odt differ
diff --git a/templates/print/rev-odt/sales_order.odt b/templates/print/rev-odt/sales_order.odt
index 051dd8669..3cf13b98a 100644
Binary files a/templates/print/rev-odt/sales_order.odt and b/templates/print/rev-odt/sales_order.odt differ
diff --git a/templates/print/rev-odt/sales_order_besr.odt b/templates/print/rev-odt/sales_order_besr.odt
deleted file mode 100644
index 0c89b69d0..000000000
Binary files a/templates/print/rev-odt/sales_order_besr.odt and /dev/null differ
diff --git a/templates/print/rev-odt/sales_quotation.odt b/templates/print/rev-odt/sales_quotation.odt
index e22414408..c79ea2426 100644
Binary files a/templates/print/rev-odt/sales_quotation.odt and b/templates/print/rev-odt/sales_quotation.odt differ
diff --git a/templates/print/rev-odt/sales_reclamation.odt b/templates/print/rev-odt/sales_reclamation.odt
new file mode 100644
index 000000000..bf8376c7a
Binary files /dev/null and b/templates/print/rev-odt/sales_reclamation.odt differ
diff --git a/templates/print/rev-odt/zahlungserinnerung.odt b/templates/print/rev-odt/zahlungserinnerung.odt
index 22ba13f02..814778b07 100644
Binary files a/templates/print/rev-odt/zahlungserinnerung.odt and b/templates/print/rev-odt/zahlungserinnerung.odt differ
diff --git a/templates/webpages/acc_trans/_mini_ledger.html b/templates/webpages/acc_trans/_mini_ledger.html
index 4164ef5dc..6756638bc 100644
--- a/templates/webpages/acc_trans/_mini_ledger.html
+++ b/templates/webpages/acc_trans/_mini_ledger.html
@@ -23,6 +23,7 @@
     <td align="right">[%- IF transaction.amount > 0 %] [%- LxERP.format_amount(transaction.amount     , 2) %] [%- END -%]</td>
    </tr>
    [%- END %]
+   <tr>
     <td colspan="2"></td>
     <td align="right"><b>[%- LxERP.t8("Total") %]:</b></td>
     <td align="right"><b>[%- LxERP.format_amount(debit_sum * -1, 2) %]</b></td>
@@ -30,4 +31,4 @@
    </tr>
   </tbody>
  </table>
- <div>
+</div>
diff --git a/templates/webpages/acc_trans/_mini_trial_balance.html b/templates/webpages/acc_trans/_mini_trial_balance.html
index 95f532cf5..0b43eb26b 100644
--- a/templates/webpages/acc_trans/_mini_trial_balance.html
+++ b/templates/webpages/acc_trans/_mini_trial_balance.html
@@ -22,4 +22,3 @@
    [%- END %]
   </tbody>
  </table>
-</div>
diff --git a/templates/webpages/admin/adminlogin.html b/templates/webpages/admin/adminlogin.html
index 9fca94a2a..20266c068 100644
--- a/templates/webpages/admin/adminlogin.html
+++ b/templates/webpages/admin/adminlogin.html
@@ -44,5 +44,6 @@
   <p>
    <a href="controller.pl?action=LoginScreen/user_login" target="_top">[%- LxERP.t8('User login') %]</a>
    &nbsp;|&nbsp;
-   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('Documentation') %]</a>
+   [%- LxERP.t8('Documentation') %]
+   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('PDF') %]</a>/<a href="doc/html/index.html" target="_top">[%- LxERP.t8('HTML') %]</a>
   </p>
diff --git a/templates/webpages/admin/edit_user.html b/templates/webpages/admin/edit_user.html
index 1676be313..31a3e9f32 100644
--- a/templates/webpages/admin/edit_user.html
+++ b/templates/webpages/admin/edit_user.html
@@ -8,6 +8,8 @@
 <form method="post" action="controller.pl" id="form">
  [% L.hidden_tag("user.id", SELF.user.id) %]
  [% L.hidden_tag("action", "") %]
+ [% L.hidden_tag("check_previously_used", "0") %]
+ [% L.hidden_tag("assign_documents", "0") %]
  [%- SET props=SELF.user.config_values %]
 
  <h2>[%- LxERP.t8("Settings") %]</h2>
@@ -89,6 +91,7 @@
        [% L.radio_button_tag('user.config_values.mandatory_departments', value='1', id='user.config_values.mandatory_departments_1', label=LxERP.t8('Yes'), checked= props.mandatory_departments) %]
       </td>
      </tr>
+
     </table>
    </td>
   </tr>
@@ -149,7 +152,7 @@
 <p>
  [% L.link(SELF.url_for(action="show"), LxERP.t8("Back")) %]
 
- [% L.button_tag("submit_with_action('save_user')", LxERP.t8("Save")) %]
+ [% L.button_tag("save_new()", LxERP.t8("Save")) %]
  [% IF SELF.user.id %]
   [% L.button_tag("save_as_new()", LxERP.t8("Save as new")) %]
   [% L.button_tag("submit_delete()", LxERP.t8("Delete"), confirm=LxERP.t8("Are you sure?")) %]
@@ -175,9 +178,46 @@
 [% END %]
   }
 
+  function save() {
+    $("#action").val('Admin/save_user');
+    var data = $('#form').serializeArray();
+    $.post("controller.pl", data, kivi.eval_json_result);
+  }
+
+  function save_new() {
+    $("#check_previously_used").val("1");
+    save();
+  }
+
   function save_as_new() {
     $("#user_id").val("");
-    submit_with_action("save_user");
+    $("#check_previously_used").val("1");
+    save();
+  }
+
+  function show_loginname_previously_used_dialog() {
+    var buttons = {};
+    buttons[kivi.t8('Yes')] = function() {
+      $("#check_previously_used").val("0");
+      $("#assign_documents").val("1");
+      save();
+    };
+    buttons[kivi.t8('No')] = function() {
+      $("#check_previously_used").val("0");
+      save();
+    };
+    buttons[kivi.t8('Cancel')] = function() { $( this ).dialog('close'); };
+
+    kivi.popup_dialog({
+      id: 'loginname_previously_used_dialog',
+      html: kivi.t8('The login name you entered was previously used. Do you want to assign documents from the former user that had the same username to the new user?'),
+      dialog: {
+        title:  kivi.t8('Login name was previously used'),
+        width:  400,
+        height: 250,
+        buttons: buttons
+      }
+    });
   }
    -->
 </script>
diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html
index cd0e7eeec..6e42efd22 100644
--- a/templates/webpages/am/config.html
+++ b/templates/webpages/am/config.html
@@ -12,6 +12,7 @@
     <li><a href="#page_display_options">[% 'Display options' | $T8 %]</a></li>
     <li><a href="#page_print_options">[% 'Print options' | $T8 %]</a></li>
     <li><a href="#page_todo_list_options">[% 'TODO list options' | $T8 %]</a></li>
+    <li><a href="#page_follow_up_options">[% 'Follow-up options' | $T8 %]</a></li>
    </ul>
 
    <div id="page_personal_settings">
@@ -131,6 +132,13 @@
       </td>
      </tr>
 
+     <tr>
+      <th align="right">[% 'Forced Layout Style' | $T8 %]</th>
+      <td>
+        [% L.select_tag('layout_style', [['', LxERP.t8('Use settings from client configuration')], ['auto', LxERP.t8('Automatic')], ['desktop', LxERP.t8('desktop version')]], default=layout_style, with_empty=0) %]
+      </td>
+     </tr>
+
      <tr>
       <th align="right">[% 'Stylesheet' | $T8 %]</th>
       <td>
@@ -165,7 +173,6 @@
         [% L.input_tag('longdescription_dialog_size_percentage', longdescription_dialog_size_percentage, size = 5) %]
       </td>
      </tr>
-     [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
      <tr>
       <th align="right">[% 'Scrollbar height percentage for form postion area (0 means no scrollbar)' | $T8 %]</th>
       <td>
@@ -192,7 +199,6 @@
         [% L.yes_no_tag('positions_show_update_button', positions_show_update_button) %]
       </td>
      </tr>
-     [%- END -%]
 
      <tr>
       <th align="right">[% 'Show custom variable search inputs' | $T8 %]</th>
@@ -262,6 +268,20 @@
          </table>
        </td>
 
+     <tr>
+       <th align="right">[% 'Part picker search dialog (magnifying glass): "all as list" defaults to on' | $T8 %]</th>
+       <td>
+        [% L.yes_no_tag('part_picker_search_all_as_list_default', part_picker_search_all_as_list_default) %]
+      </td>
+    </tr>
+
+     <tr>
+       <th align="right">[% 'Item input position for quotations and orders' | $T8 %]</th>
+       <td>
+        [% L.select_tag('order_item_input_position', [ [ 'default', LxERP.t8('Use settings from client configuration') ], [ 0, LxERP.t8('above the positions') ], [ 1, LxERP.t8('below the positions') ] ], default=order_item_input_position) %]
+      </td>
+    </tr>
+
     </table>
    </div>
 
@@ -342,5 +362,20 @@
      [%- END %]
     </table>
    </div>
+
+   <div id="page_follow_up_options">
+    <table>
+     <tr>
+      <th align="right">[% 'Notify me by email for follow-ups' | $T8 %]</th>
+      <td colspan="2">
+       <input type="radio" name="follow_up_notify_by_email" id="follow_up_notify_by_email_1" value="1"[% IF follow_up_notify_by_email %] checked[% END %]>
+       <label for="follow_up_notify_by_email_1">[% 'Yes' | $T8 %]</label>
+       <input type="radio" name="follow_up_notify_by_email" id="follow_up_notify_by_email_0" value="0"[% IF !follow_up_notify_by_email %] checked[% END %]>
+       <label for="follow_up_notify_by_email_0">[% 'No' | $T8 %]</label>
+      </td>
+     </tr>
+    </table>
+   </div>
+
   </div>
  </form>
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index e07484b63..9701100fa 100644
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -75,6 +75,10 @@ $(function() {
 [% END %]
       </td>
     </tr>
+    <tr>
+     <td>[% 'Invalid' | $T8 %] </td>
+     <td>[% L.checkbox_tag('invalid', value => 1, checked => invalid, class => 'checkbox') %]</td>
+    </tr>
   </table>
 </fieldset>
 
diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index e3bc2e9c7..ec1a17a19 100644
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -4,7 +4,10 @@
 [%- USE T8 %]
 [%- USE LxERP %][%- USE P -%]
 
-<h1>[% title | html %]</h1>
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
@@ -41,9 +44,19 @@
 <input type="hidden" name="rowcount" value="[% rowcount | html %]">
 
 <input type="hidden" name="paidaccounts" value="[% paidaccounts | html %]">
+[% L.hidden_tag('zugferd_session_file', zugferd_session_file) %]
 
 [%- P.hidden_tag('convert_from_oe_id', convert_from_oe_id) -%]
 
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
 [% FOREACH i IN [1..paidaccounts] %]
   [% temp = "acc_trans_id_"_ i %]
   <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
@@ -59,6 +72,9 @@
 <div id="ap_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
@@ -89,8 +105,8 @@
               <tr>
                 <th align="right" nowrap>[% 'Vendor' | $T8 %]</th>
                 <td colspan="3">
-                 [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 330px", onchange="\$('#update_button').click()") %]
-                 [% L.button_tag("show_vc_details('vendor')", LxERP.t8('Details (one letter abbreviation)')) %]
+                 [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", show_details="1",
+                      style="width: 330px", class=(initial_focus == 'vendor_id' ? "initial_focus" : "")) %]
                  [% L.hidden_tag("previous_vendor_id", vendor_id) %]
                 </td>
               </tr>
@@ -103,7 +119,6 @@
                  <span class="plus[% creditremaining_plus %]">[% creditremaining | html %]</span>
                 </td>
               </tr>
-
 [%- IF invoice_obj.sepa_exports.as_list.size %]
               <tr>
                 <th align="right">[% LxERP.t8("SEPA exports") %]</th>
@@ -115,20 +130,28 @@
                 </td>
               </tr>
 [%- END %]
-
               <tr>
                 <th align="right" nowrap>[% 'Currency' | $T8 %]</th>
-                <td>[% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name") %]</td>
-
+                <td>
+                   [%- IF readonly  %]
+                     [% HTML.escape(currency) %]
+                     [% L.hidden_tag("currency", currency) %]
+                   [%- ELSE %]
+                     [% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name") %]
+                   [%- END %]
+                </td>
                 [% IF ( defaultcurrency && (currency != defaultcurrency) ) %]
                   <th align=right>[% 'Exchangerate' | $T8 %]</th>
-                  [% IF ( forex ) %]
-                    <td><input type="hidden" name="exchangerate" value="[% exchangerate | html %]">[% exchangerate | html %]</td>
-                  [% ELSE %]
-                    <td><input type="text" name="exchangerate" size="10" value="[% exchangerate | html %]"></td>
-                  [% END %]
+                  <td>
+                     [%- IF readonly  %]
+                       [% LxERP.format_amount(exchangerate, 5) %]
+                       [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+                     [%- ELSE %]
+                       <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                     [%- END %]
+                     [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+                     [% L.hidden_tag("record_forex", record_forex) %]
                 [% END %]
-
               </tr>
 
               [% IF ALL_DEPARTMENTS %]
@@ -207,12 +230,12 @@
           <tr>
             <td>
               [% SET selected_chart_id = "AP_amount_chart_id_"_ i %]
-              [% P.chart.picker("AP_amount_chart_id_" _ i, $selected_chart_id, style="width: 400px", type="AP_amount", class=(initial_focus == 'row_' _ i ? "initial_focus" : "")) %]
+              [% P.chart.picker("AP_amount_chart_id_" _ i, $selected_chart_id, style="width: 400px", type="AP_amount", invalid=0, disabled=readonly, class=(initial_focus == 'row_' _ i ? "initial_focus" : "")) %]
               [% L.hidden_tag("previous_AP_amount_chart_id_" _ i, $selected_chart_id) %]
               <input type="hidden" name="tax_[% i %]" value="[% temp = "tax"_ i %][% $temp | html %]">
             </td>
             <td>
-              <input name="amount_[% i %]" size="10" value="[% temp = "amount_"_ i %][% $temp | html %]">
+              <input name="amount_[% i %]" size="10" [% readonly ? 'readonly' : '' %] value="[% temp = "amount_"_ i %][% $temp | html %]">
             </td>
             <td>
               [% temp_r = "tax_reverse_"_ i %]
@@ -330,12 +353,12 @@
             </td>
 
             [% temp = "paid_"_ i %]
-            <td align="center">
+            <td align="right">
               [% IF( changeable ) %]
                 <input name="[% temp %]" size="11" data-validate="number" class="numeric" value="[% $temp | html %]" id="[%- 'payment_' _ temp -%]">
               [% ELSE %]
                 [% $temp | html %]
-                <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
+                <input type="hidden" name="[% temp %]" value="[% $temp | html %]"> [% defaultcurrency %]
               [% END %]
             </td>
 
@@ -349,15 +372,20 @@
               <td align="center">
                 [% temp = "exchangerate_"_ i %]
                 [% temp_forex = "forex_"_ i %]
+                [% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
+                [% SET record_forex = 'record_forex_' _ i %]
+                [% SET fx_transaction = 'fx_transaction_' _ i %]
 
                 [% IF( $temp_forex || !changeable ) %]
-                  [% $temp | html %]
+                  [% $temp | html %] = [% LxERP.format_amount($defaultcurrency_paid,2) %] [% defaultcurrency %] </br>
+                [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+
                   <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
                 [% ELSE %]
                   <input name="[% temp %]" size="11" value="[% $temp | html %]">
                 [% END %]
-
                 <input type=hidden name="[% temp_forex %]" value="[% $temp_forex | html %]">
+                <input type="hidden" name="[% fx_transaction %]" value="1">
               </td>
             [% END %]
 
@@ -389,13 +417,20 @@
           <td></td>
           <td></td>
           <td align="center">[% 'Total' | $T8 %]</td>
-          <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+          <td align="right">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+        [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
+            <td></td>
+            <td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+            <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+            <input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
+        [% END %]
+
         </tr>
         <tr>
           <td></td>
           <td></td>
           <td align="center">[% 'Missing amount' | $T8 %]</td>
-          <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+          <td align="right">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
         </tr>
       </table>
       [% END %]
diff --git a/templates/webpages/ap/search.html b/templates/webpages/ap/search.html
index a676eb84f..080b726f1 100644
--- a/templates/webpages/ap/search.html
+++ b/templates/webpages/ap/search.html
@@ -14,10 +14,10 @@
       <th align=right>[% 'Vendor' | $T8 %]</th>
       <td>[% L.input_tag("vendor", vendor, style=style, class="initial_focus") %]</td>
      </tr>
-    <tr>
-     <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
-     <td>[% L.input_tag("cp_name", '', style=style) %]</td>
-    </tr>
+     <tr>
+      <th align="right" nowrap>[% 'Contact Person' | $T8 %]</th>
+      <td>[% L.input_tag("cp_name", '', style=style) %]</td>
+     </tr>
      <tr>
       <th align=right nowrap>[% 'Department' | $T8 %]</th>
       <td>[% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, style=style) %]</td>
@@ -34,6 +34,10 @@
       <th align="right">[% 'Steuersatz' | $T8 %]</th>
       <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description', style=style) %]</td>
      </tr>
+     <tr>
+      <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
+      <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', style=style) %]</td>
+     </tr>
      <tr>
       <th align="right" nowrap>[% 'Transaction description' | $T8 %]</th>
       <td>[% L.input_tag("transaction_description", "", style=style) %]</td>
@@ -44,27 +48,51 @@
       <td>[% L.input_tag("parts_description", "", style=style) %]</td>
      </tr>
      <tr>
-      <th align="right">[% 'Project Number' | $T8 %]</th>
-      <td>[% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]</td>
+      <th align="right">[% 'Internal Notes' | $T8 %]</th>
+      <td>[% L.input_tag("intnotes", "", style=style) %]</td>
       <th align="right">[% 'Part Number' | $T8 %]</th>
       <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
      </tr>
+     <tr>
+      <th align="right">[% 'Full Text' | $T8 %]</th>
+      <td>[% L.input_tag('fulltext', '', style=style) %]</td>
+     </tr>
+     <tr>
+      <th align="right">[% 'Project Number' | $T8 %]</th>
+      <td>[% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]</td>
+     </tr>
      <tr>
       <th align=right nowrap>[% 'Invoice Date' | $T8 %]</th>
       <td>
        [% L.date_tag('transdatefrom') %]
        [% 'Bis' | $T8 %]
        [% L.date_tag('transdateto') %]
-     </td>
-    </tr>
+      </td>
+     </tr>
      <tr>
       <th align=right nowrap>[% 'Due Date' | $T8 %]</th>
       <td>
        [% L.date_tag('duedatefrom') %]
        [% 'Bis' | $T8 %]
        [% L.date_tag('duedateto') %]
-     </td>
-    </tr>
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Date Paid' | $T8 %]</th>
+      <td>
+       [% L.date_tag('datepaidfrom') %]
+       [% 'Bis' | $T8 %]
+       [% L.date_tag('datepaidto') %]
+      </td>
+     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Insert Date' | $T8 %]</th>
+      <td>
+       [% L.date_tag('insertdatefrom') %]
+       [% 'Bis' | $T8 %]
+       [% L.date_tag('insertdateto') %]
+      </td>
+     </tr>
    </table>
     </td>
     </tr>
@@ -116,6 +144,8 @@
           <tr>
            <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Notes' | $T8 %]</td>
+           <td align=right><input name="l_intnotes" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Internal Notes' | $T8 %]</td>
            <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Employee' | $T8 %]</td>
            <td align=right><input name="l_department" class=checkbox type=checkbox value=Y></td>
@@ -144,6 +174,8 @@
            <td nowrap>[% 'Debit Account' | $T8 %]</td>
            <td align=right><input name="l_insertdate" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Insert Date' | $T8 %]</td>
+           <td align=right><input name="l_items" id="l_items" class=checkbox type=checkbox value=Y>
+           <td nowrap>[% 'Positions' | $T8 %]</td>
           </tr>
          <tr>
           <td colspan=4 align=left><b>[% 'Vendor' | $T8 %]</b></td>
diff --git a/templates/webpages/ar/form_header.html b/templates/webpages/ar/form_header.html
index d42d70c18..ebcaa0ad1 100644
--- a/templates/webpages/ar/form_header.html
+++ b/templates/webpages/ar/form_header.html
@@ -3,7 +3,10 @@
 [%- USE T8 %]
 [%- USE LxERP %][%- USE P -%]
 
-<h1>[% title | html %]</h1>
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title | html %]
+</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
@@ -20,11 +23,23 @@
 [% L.hidden_tag('follow_up_rowcount', 1) %]
 <input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
 
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
 [%- IF saved_message %]<p>[% saved_message | html  %]</p>[% END %]
 
 <div class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+  [% IF email_attachment_id || workflow_email_attachment_id %]
+    <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+  [% END %]
 [%- IF id %]
   [%- IF INSTANCE_CONF.get_doc_storage %]
   <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
@@ -47,8 +62,8 @@
               <tr>
                 <th align="right" nowrap>[% 'Customer' | $T8 %]</th>
                 <td colspan=3>
-                 [% P.customer_vendor.picker("customer_id", customer_id, type="customer", style="width: 330px", class=(initial_focus == 'customer_id' ? "initial_focus" : ""), onchange="\$('#update_button').click()") %]
-                 [% L.button_tag("show_vc_details('customer')", LxERP.t8('Details (one letter abbreviation)')) %]
+                 [% P.customer_vendor.picker("customer_id", customer_id, type="customer",
+                      show_details="1", style="width: 330px", class=(initial_focus == 'customer_id' ? "initial_focus" : "")) %]
                  [% L.hidden_tag("previous_customer_id", customer_id) %]
                  [% L.hidden_tag('terms', terms) %]
                </td>
@@ -92,7 +107,14 @@
 [%- END %]
               <tr>
                 <th align=right>[% 'Currency' | $T8 %]</th>
-                <td>[% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name") %]</td>
+                <td>
+                   [%- IF readonly  %]
+                     [% HTML.escape(currency) %]
+                     [% L.hidden_tag("currency", currency) %]
+                   [%- ELSE %]
+                     [% L.select_tag("currency", currencies, default=currency, value_key="name", title_key="name") %]
+                   [%- END %]
+                </td>
                 [% L.hidden_tag('defaultcurrency', defaultcurrency) %]
                 [% L.hidden_tag('fxgain_accno', fxgain_accno) %]
                 [% L.hidden_tag('fxloss_accno', fxloss_accno) %]
@@ -100,7 +122,15 @@
                 [% L.hidden_tag('forex', forex) %]
                 [% IF show_exch %]
                    <th align=right>[% 'Exchangerate' | $T8 %]</th>
-                   <td>[%- IF forex %][% L.hidden_tag('exchangerate', LxERP.format_amount(exchangerate, 5, 1)) %][% LxERP.format_amount(exchangerate, 5, 1) %][%- ELSE %][% L.input_tag('exchangerate', LxERP.format_amount(exchangerate, 5, 1), size=10) %][%- END %]</td>
+                   <td>
+                     [%- IF readonly  %]
+                       [% LxERP.format_amount(exchangerate, 5) %]
+                       [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
+                     [%- ELSE %]
+                       <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                     [%- END %]
+                     [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
+                   </td>
                 [% END %]
               </tr>
               [% IF ALL_DEPARTMENTS %]
@@ -268,7 +298,7 @@
   [%- IF row.changeable %]
           <input name="paid_[% loop.count %]" size=11 data-validate="number" class="numeric" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]">
   [%- ELSE %]
-         [% row.paid | html %]<input type=hidden name="paid_[% loop.count %]" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]">
+         [% row.paid | html %]<input type=hidden name="paid_[% loop.count %]" value="[% row.paid ? LxERP.format_amount(row.paid, 2) : '' | html %]"> [% defaultcurrency %]
   [%- END %]
          </td>
          <td>
@@ -278,8 +308,11 @@
          </td>
 [%- IF show_exch %]
          <td align=center>
+          <input type="hidden" name="fx_transaction_[% loop.count %]" value="1">
     [%- IF row.forex || !row.changeable%]
-          <input type=hidden name="exchangerate_[% loop.count %]" value="[%- LxERP.format_amount(row.exchangerate, 5, 1) -%]">[%- LxERP.format_amount(row.exchangerate, 5, 1) -%]
+          <input type=hidden name="exchangerate_[% loop.count %]" value="[%- LxERP.format_amount(row.exchangerate, 5, 1) -%]">
+      [%- LxERP.format_amount(row.exchangerate, 5, 0) -%] = [% LxERP.format_amount(row.defaultcurrency_paid, 2) %] [% defaultcurrency %]</br>
+      [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
     [%- ELSE %]
           <input name="exchangerate_[% loop.count %]" size=10 value="[%- LxERP.format_amount(row.exchangerate, 5, 1) -%]">
     [%- END %]
@@ -310,13 +343,19 @@
           <td></td>
           <td></td>
           <td align="center">[% 'Total' | $T8 %]</td>
-          <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+          <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]  [% currency %] </td>
+        [% IF show_exch %]
+            <td></td>
+            <td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+            <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+            <input type="hidden" name="is_linked_bank_transaction" value="[% is_linked_bank_transaction %]">
+        [% END %]
         </tr>
         <tr>
           <td></td>
           <td></td>
           <td align="center">[% 'Missing amount' | $T8 %]</td>
-          <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+          <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
         </tr>
         <input type=hidden name=paidaccounts value='[% paidaccounts %]'>
 
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 3a6896222..007e17d2f 100644
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -65,6 +65,38 @@
       <th align="right">[% 'Ship via' | $T8 %]</th>
       <td>[% L.input_tag("shipvia", "", style=style) %]</td>
      </tr>
+     <tr>
+      <th align=right nowarp>[% 'Name (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptoname", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 1 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_1", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 2 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_2", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Street (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptostreet", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Zipcode (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptozipcode", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'City (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocity", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Country (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocountry", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
+      <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key="description", style=style) %]</td>
+     </tr>
      <tr>
       <th align="right">[% 'Project Number' | $T8 %]</th>
       <td>[% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]</td>
@@ -101,6 +133,14 @@
        [% L.date_tag('duedateto') %]
      </td>
     </tr>
+     <tr>
+      <th align=right nowrap>[% 'Date Paid' | $T8 %]</th>
+      <td>
+       [% L.date_tag('datepaidfrom') %]
+       [% 'Bis' | $T8 %]
+       [% L.date_tag('datepaidto') %]
+     </td>
+    </tr>
 
 [%- IF CT_CUSTOM_VARIABLES.size %]
     <tr>
@@ -208,12 +248,14 @@
            <td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'direct debit' | $T8 %]</td>
           </tr>
-[% IF INSTANCE_CONF.get_doc_storage -%]
           <tr>
+           <td align=right><input name="l_items" id="l_items" class=checkbox type=checkbox value=Y>
+           <td nowrap>[% 'Positions' | $T8 %]</td>
+[% IF INSTANCE_CONF.get_doc_storage -%]
            <td align=right><input name="l_attachments" id="l_attachments" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Attachments' | $T8 %]</td>
-          </tr>
 [% END-%]
+          </tr>
           <tr>
            <td colspan=4 align=left><b>[% 'Customer' | $T8 %]</b></td>
           </tr>
@@ -224,6 +266,29 @@
            <td nowrap>[% 'Country' | $T8 %]</td>
            <td align=right><input name="l_ustid" id="l_ustid" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'USt-IdNr.' | $T8 %]</td>
+           <td align=right><input name="l_customer_dunning_lock" id="l_customer_dunning_lock" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Dunning lock' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td colspan=4 align=left><b>[% 'Shipping Address' | $T8 %]</b></td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_shiptoname" id="l_shiptoname" type="checkbox"></td>
+           <td nowrap>[% 'Name' | $T8 %]</td>
+           <td align=right><input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox"></td>
+           <td nowrap>[% 'Department 1' | $T8 %]</td>
+           <td align=right><input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox"></td>
+           <td nowrap>[% 'Department 2' | $T8 %]</td>
+          </tr>
+          <tr>
+           <td align=right><input name="l_shiptostreet" id="l_shiptostreet" type="checkbox"></td>
+           <td nowrap>[% 'Street' | $T8 %]</td>
+           <td align=right><input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox"></td>
+           <td nowrap>[% 'Zipcode' | $T8 %]</td>
+           <td align=right><input name="l_shiptocity" id="l_shiptocity" type="checkbox"></td>
+           <td nowrap>[% 'City' | $T8 %]</td>
+           <td align=right><input name="l_shiptocountry" id="l_shiptocountry" type="checkbox"></td>
+           <td nowrap>[% 'Country' | $T8 %]</td>
           </tr>
 
           <table>
diff --git a/templates/webpages/background_job/form.html b/templates/webpages/background_job/form.html
index f7170ec4e..f0b662827 100644
--- a/templates/webpages/background_job/form.html
+++ b/templates/webpages/background_job/form.html
@@ -30,6 +30,11 @@
     <td>[% L.select_tag("background_job.package_name", JOB_CLASSES, 'default' => SELF.background_job.package_name) %]</td>
    </tr>
 
+   <tr>
+    <th align="right">[%- LxERP.t8('Description') %]</th>
+    <td>[% L.input_tag("background_job.description", SELF.background_job.description, 'size' => 40) %]</td>
+   </tr>
+
    <tr>
     <th align="right">[%- LxERP.t8('Execution schedule') %]</th>
     <td>[% L.input_tag("background_job.cron_spec", SELF.background_job.cron_spec, 'size' => 40) %]</td>
diff --git a/templates/webpages/background_job/list.html b/templates/webpages/background_job/list.html
index f5668daa1..1980f8f14 100644
--- a/templates/webpages/background_job/list.html
+++ b/templates/webpages/background_job/list.html
@@ -14,6 +14,7 @@
     <thead>
      <tr class="listheading">
       <th>[% L.sortable_table_header('package_name') %]</th>
+      <th>[% L.sortable_table_header('description') %]</th>
       <th>[% L.sortable_table_header('type') %]</th>
       <th>[% L.sortable_table_header('active') %]</th>
       <th>[% L.sortable_table_header('cron_spec') %]</th>
@@ -30,6 +31,7 @@
        [%- HTML.escape(background_job.package_name) %]
       </a>
      </td>
+     <td>[%- HTML.escape(background_job.description) %]</td>
      <td>
       [%- IF background_job.type == 'once' %]
        [%- LxERP.t8('one-time execution') %]
diff --git a/templates/webpages/background_job_history/_filter.html b/templates/webpages/background_job_history/_filter.html
index 9c0c96eb2..acb8d0844 100644
--- a/templates/webpages/background_job_history/_filter.html
+++ b/templates/webpages/background_job_history/_filter.html
@@ -12,6 +12,10 @@
     <th align="right">[% LxERP.t8('Package name') %]</th>
     <td>[% L.input_tag('filter.package_name:substr::ilike', filter.package_name_substr__ilike, size = 20) %]</td>
    </tr>
+   <tr>
+    <th align="right">[% LxERP.t8('Description') %]</th>
+    <td>[% L.input_tag('filter.package_name:substr::ilike', filter.description_substr__ilike, size = 20) %]</td>
+   </tr>
    <tr>
     <th align="right">[% LxERP.t8('Result') %]</th>
     <td>[% L.input_tag('filter.result:substr::ilike', filter.result_substr__ilike, size = 20) %]</td>
diff --git a/templates/webpages/background_job_history/list.html b/templates/webpages/background_job_history/list.html
index d83bb2816..fad45c93a 100644
--- a/templates/webpages/background_job_history/list.html
+++ b/templates/webpages/background_job_history/list.html
@@ -16,6 +16,7 @@
   <thead>
    <tr class="listheading">
     <th>[% L.sortable_table_header('package_name') %]</th>
+    <th>[% L.sortable_table_header('description') %]</th>
     <th>[% L.sortable_table_header('run_at') %]</th>
     <th>[% L.sortable_table_header('status') %]</th>
     <th>[% L.sortable_table_header('result') %]</th>
@@ -31,6 +32,7 @@
      [%- HTML.escape(entry.package_name) %]
     </a>
    </td>
+   <td>[%- HTML.escape(entry.description) %]</td>
    <td>[%- HTML.escape(entry.run_at.to_lxoffice('precision' => 'second')) %]</td>
    <td>
     [%- IF entry.status == 'success' %]
diff --git a/templates/webpages/background_job_history/show.html b/templates/webpages/background_job_history/show.html
index a2f3ab6f3..a680beb75 100644
--- a/templates/webpages/background_job_history/show.html
+++ b/templates/webpages/background_job_history/show.html
@@ -11,6 +11,11 @@
     <td>[%- HTML.escape(SELF.history.package_name) %]</td>
    </tr>
 
+   <tr class="listrow0">
+    <th>[%- LxERP.t8('Description') %]</th>
+    <td>[%- HTML.escape(SELF.history.description) %]</td>
+   </tr>
+
    <tr class="listrow1">
     <th>[%- LxERP.t8('Run at') %]</th>
     <td>[%- HTML.escape(SELF.history.run_at.to_lxoffice('precision' => 'second')) %]</td>
diff --git a/templates/webpages/bank_import/import_mt940.html b/templates/webpages/bank_import/import_mt940.html
index e2baa5feb..66ebc44af 100644
--- a/templates/webpages/bank_import/import_mt940.html
+++ b/templates/webpages/bank_import/import_mt940.html
@@ -52,11 +52,12 @@
     <tr class="listheading">
       <th>[% LxERP.t8("Transaction date") %]</th>
       <th>[% LxERP.t8("Valutadate") %]</th>
-      <th>[% LxERP.t8("Other party") %]</th>
+      <th>[% LxERP.t8("Remote name") %]</th>
       <th>[% LxERP.t8("Purpose") %]</th>
       <th>[% LxERP.t8("Amount") %]</th>
       <th>[% LxERP.t8("Remote account") %]</th>
       <th>[% LxERP.t8("Local account") %]</th>
+      <th>[% LxERP.t8("End to end ID") %]</th>
       <th>[% LxERP.t8("Information") %]</th>
     </tr>
   </thead>
@@ -75,6 +76,7 @@
           [% END %]
         </td>
         <td>[% HTML.escape(transaction.bank_account.name) %]</td>
+        <td>[% HTML.escape(transaction.end_to_end_id) %]</td>
         <td>
           [% IF transaction.error %]
             [% HTML.escape(transaction.error) %]
diff --git a/templates/webpages/bank_transactions/_payment_suggestion.html b/templates/webpages/bank_transactions/_payment_suggestion.html
index ebc252b09..f2008cecc 100644
--- a/templates/webpages/bank_transactions/_payment_suggestion.html
+++ b/templates/webpages/bank_transactions/_payment_suggestion.html
@@ -12,5 +12,19 @@
  [% LxERP.t8("Open amount") %]: [% LxERP.format_amount(invoice.open_amount, 2) %]</br>
  [% P.select_tag("invoice_skontos." _ bt_id _ "[]", SELECT_OPTIONS, value_key="payment_type", title_key="display", onChange="kivi.BankTransaction.update_skonto(this, " _ bt_id _ ", " _ invoice.id _ ", '$formatted_skonto_amount')"  ) %]</br>
  [% LxERP.t8("Skonto amount") %]: [% P.input_tag("free_skonto_amount." _ bt_id _ "." _ invoice.id _ "", "$formatted_skonto_amount_selected", default=0, style=style, disabled=1, size=4, class='numeric', onblur="kivi.BankTransaction.update_invoice_amount(" _ bt_id _ ", 0, this)") %]
+ [% IF invoice.forex %]
+  </br>
+  </br>
+   [% LxERP.t8("Curr") %]: <b>[% HTML.escape(invoice.currency.name) %]</b></br>
+   [% daily_exchangerate           = invoice.get_exchangerate_for_bank_transaction(bt_id) %]
+   [% formatted_daily_exchangerate = daily_exchangerate ? LxERP.format_amount(daily_exchangerate, 5) : LxERP.format_amount(1, 5)  %]
+   [% UNLESS daily_exchangerate  %][% LxERP.t8("new") %] [% END %][% LxERP.t8("default exchange rate") %]: [% P.input_tag("exchangerate_" _ bt_id _ "_" _  invoice.id , "$formatted_daily_exchangerate", style=style, disabled=0, size=4, class='numeric') %]
+   [% P.hidden_tag("currency_id_" _ bt_id _ "_" _ invoice.id, invoice.currency.id) %]
+   </br>
+   [% IF invoice.invoice_type == 'ap_transaction' || invoice.invoice_type == 'purchase_invoice' || invoice.invoice_type == 'credit_note' %]
+     [% P.checkbox_tag("book_fx_bank_fees_" _ bt_id _ "_" _ invoice.id, value=1, checked="1") %] [% LxERP.t8("Bank Fee Booking") %]
+     </br>
+   [% END %]
+ [% END %]
  [% P.link_tag("#", "x", onclick="kivi.BankTransaction.delete_invoice(" _ bt_id _ "," _ invoice.id _ ")") %]
 </span>
diff --git a/templates/webpages/bank_transactions/tabs/all.html b/templates/webpages/bank_transactions/tabs/all.html
index eae900822..2aabf9c4b 100644
--- a/templates/webpages/bank_transactions/tabs/all.html
+++ b/templates/webpages/bank_transactions/tabs/all.html
@@ -111,7 +111,12 @@
        </td>
        <td align="right">[% bt.transdate_as_date %]</td>
        <td align="right">[% LxERP.format_amount(bt.amount, 2) %]</td>
-       <td align="right" id="invoice_amount_[% HTML.escape(bt.id) %]" data-invoice-amount="[% HTML.escape(bt.invoice_amount) %]">[% HTML.escape(LxERP.format_amount(bt.invoice_amount, 2)) %]</td>
+       <td align="right" id="invoice_amount_[% HTML.escape(bt.id) %]"
+        data-invoice-amount="[% HTML.escape(bt.invoice_amount) %]" >
+        <span [% IF bt.invoice_amount %] style="background-color:#FF8000;" [% END %]>
+         [% HTML.escape(LxERP.format_amount(bt.invoice_amount, 2)) %]
+        </span>
+       </td>
        <td>[% HTML.escape(bt.remote_name) %]</td>
        <td>[% HTML.escape(bt.purpose) %]</td>
        <td>[% HTML.escape(bt.transaction_text) %]</td>
diff --git a/templates/webpages/bank_transactions/tabs/automatic.html b/templates/webpages/bank_transactions/tabs/automatic.html
index b0dcc2ba4..e3ff4078b 100644
--- a/templates/webpages/bank_transactions/tabs/automatic.html
+++ b/templates/webpages/bank_transactions/tabs/automatic.html
@@ -18,6 +18,9 @@
       <th>[% 'Amount' | $T8 %]</th>
       <th>[% 'Skonto' | $T8 %]</th>
       <th>[% 'Purpose/Reference' | $T8 %]</th>
+      [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+        <th>[% 'QR reference' | $T8 %]</th>
+      [% END %]
       <th>[% 'Customer/Vendor/Remote name' | $T8 %]</th>
       <th>[% LxERP.t8("Source") %]</th>
       <th>[% LxERP.t8("Memo") %]</th>
@@ -55,6 +58,23 @@
                 purpose ;
               END %]
           </td>
+          [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+            <td>
+            [% SET qr_reference = HTML.escape(proposal.qr_reference)
+                qr_reference_found = '';
+              FOREACH proposed_invoice = proposal.proposals;
+                IF qr_reference.match(proposed_invoice.qr_reference);
+                  SET qr_reference_found = proposed_invoice.qr_reference;
+                END;
+              END;
+
+              IF qr_reference_found;
+                qr_reference.replace(qr_reference_found, '<span class="qr_reference_highlight">' _ qr_reference_found _ '</span>');
+              ELSE;
+                purpose;
+              END %]
+            </td>
+          [% END %]
           <td>[% HTML.escape(proposal.remote_name) %]</td>
           <td></td>
           <td></td>
@@ -69,9 +89,24 @@
           <td>[% proposed_invoice.transdate_as_date %]
               [% L.hidden_tag("invoice_ids." _ proposal.id _ "[]", proposed_invoice.id) %]</td>
           <td align="right">[% proposed_invoice.realamount %]</td>
-          <td>[% proposed_invoice.skonto_type | $T8 %]
-              [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", proposed_invoice.skonto_type) %]</td>
+          <td>
+              [% IF proposal.rule_matches.0.match('skonto_exact_amount') %]
+                [% 'with_skonto_pt' | $T8 %]
+                [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", 'with_skonto_pt') %]</td>
+              [% ELSIF proposal.rule_matches.0.match('skonto_fuzzy_amount') %]
+                [% 'with_fuzzy_skonto_pt' | $T8 %]
+                [% L.hidden_tag("invoice_skontos." _ proposal.id _ "[]", 'with_fuzzy_skonto_pt') %]</td>
+              [% END %]
           <td[% IF proposed_invoice.invnumber == invnumber_found %] class="invoice_number_highlight"[% END %]>[% proposed_invoice.link %]</td>
+          [% IF INSTANCE_CONF.get_create_qrbill_invoices == 1 %]
+            <td>
+            [% IF proposed_invoice.qr_reference == proposal.qr_reference %]
+              <span class="qr_reference_highlight">[% HTML.escape(proposed_invoice.qr_reference) %]</span>
+            [% ELSE %]
+              [% HTML.escape(proposed_invoice.qr_reference) %]
+            [% END %]
+            </td>
+          [% END %]
           <td>[% HTML.escape(proposed_invoice.customer.name) %][% HTML.escape(proposed_invoice.vendor.name) %]</td>
           <td>[% L.input_tag("sources." _ proposal.id _ "[]", "", size=20) %]</td>
           <td>[% L.input_tag("memos." _ proposal.id _ "[]", "", size=20) %]</td>
diff --git a/templates/webpages/buchungsgruppen/form.html b/templates/webpages/buchungsgruppen/form.html
index d068a0796..a96ed6800 100644
--- a/templates/webpages/buchungsgruppen/form.html
+++ b/templates/webpages/buchungsgruppen/form.html
@@ -43,5 +43,10 @@
     [%- END %]
   </tr>
 [%- END %]
+
+  <tr>
+    <th align="right">[% 'Obsolete' | $T8 %]</td>
+    <td>[% L.checkbox_tag('config.obsolete', checked=SELF.config.obsolete, for_submit=1) %]</td>
+  </tr>
 </table>
 </form>
diff --git a/templates/webpages/buchungsgruppen/list.html b/templates/webpages/buchungsgruppen/list.html
index 319dcb927..cfdd0955a 100644
--- a/templates/webpages/buchungsgruppen/list.html
+++ b/templates/webpages/buchungsgruppen/list.html
@@ -13,6 +13,7 @@
         <th width="20%">[% 'Revenue' | $T8 %] [% HTML.escape(tz.description) %]</th>
         <th width="20%">[% 'Expense' | $T8 %] [% HTML.escape(tz.description) %]</th>
      [%- END %]
+    <th>[% 'Obsolete' | $T8 %]</th>
    </tr>
   </thead>
 
@@ -26,6 +27,8 @@
         <td>[% HTML.escape(CHARTLIST.${bg.id}.${tz.id}.income_accno) %]</td>
         <td>[% HTML.escape(CHARTLIST.${bg.id}.${tz.id}.expense_accno) %]</td>
      [%- END %]
+     <td>[% IF bg.obsolete %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
+    </tr>
    [%- END %]
   </tbody>
  </table>
diff --git a/templates/webpages/chart/test_page.html b/templates/webpages/chart/test_page.html
index 721c0661b..3338c68e0 100644
--- a/templates/webpages/chart/test_page.html
+++ b/templates/webpages/chart/test_page.html
@@ -9,6 +9,9 @@
 <p>
 All charts: [% P.chart.picker('chart_id', '', style=style) %]text after icon<br>
 Only booked charts: [% P.chart.picker('chart_id_booked', '', booked=1, style=style) %]<br>
+Only valid charts: [% P.chart.picker('chart_id_valid', '', style=style) %]<br>
+Only invalid charts: [% P.chart.picker('chart_id_invalid', '', status='invalid', style=style) %]<br>
+Valid and invalid charts: [% P.chart.picker('chart_id_all', '', status='all', style=style) %]<br>
 All charts choose: [% P.chart.picker('chart_id_choose', '', choose=1, style=style) %]<br>
 </p>
 
diff --git a/templates/webpages/client_config/_bank.html b/templates/webpages/client_config/_bank.html
new file mode 100644
index 000000000..aef2ae94c
--- /dev/null
+++ b/templates/webpages/client_config/_bank.html
@@ -0,0 +1,18 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%]
+<div id="bank">
+ <table>
+    <tr>
+      <td align="right" nowrap="true">[% LxERP.t8('SEPA-XML File extension') %]</td>
+      <td>[% L.yes_no_tag('defaults.sepa_export_xml', SELF.defaults.sepa_export_xml) %]</td>
+      <td>[% LxERP.t8('If enabled the file ending for SEPA exports will be .xml instead of .cct or .cdd') %]</td>
+    </tr>
+    <tr>
+      <td align="right" nowrap="true">[% LxERP.t8('Ignore Proposals for Bank Transactions') %]</td>
+      <td>[% L.yes_no_tag('defaults.no_bank_proposals', SELF.defaults.no_bank_proposals) %]</td>
+      <td>
+        [% LxERP.t8('If enabled the tab Proposals will not be the default view for bank transaction bookings') %]<br>
+        [% LxERP.t8('This is helpful if you prefer a chronologic order of bank transactions, i.e. the tab all transactions meanwhile you are still able to use the quick add link for the suggested proposals') %]
+      </td>
+    </tr>
+ </table>
+</div>
diff --git a/templates/webpages/client_config/_default_accounts.html b/templates/webpages/client_config/_default_accounts.html
index 05f4e9e1c..47832a637 100644
--- a/templates/webpages/client_config/_default_accounts.html
+++ b/templates/webpages/client_config/_default_accounts.html
@@ -68,6 +68,16 @@
   <tr>
     <th align="right">[% LxERP.t8("Year-end closing") %]</th>
   </tr>
+  [% IF SELF.defaults.yearend_method == 'simple' %] [% THEN %]
+  <tr>
+    <td>[% LxERP.t8("Year-end closing account") %]</td>
+    <td>[% P.chart.picker('defaults.carry_over_account_chart_id', SELF.defaults.carry_over_account_chart_id, choose=1, style=style) %]</td>
+  </tr>
+  <tr>
+    <td>[% LxERP.t8("Profit or loss carried forward account") %]</td>
+    <td>[% P.chart.picker('defaults.profit_carried_forward_chart_id', SELF.defaults.profit_carried_forward_chart_id, choose=1, style=style) %]</td>
+  </tr>
+  [% ELSE %]
   <tr>
    <td align="right">[% LxERP.t8("Carry over account for year-end closing") %]</td>
    <td>[% P.chart.picker('defaults.carry_over_account_chart_id', SELF.defaults.carry_over_account_chart_id, category='A', choose=1, style=style) %]<td>
@@ -82,5 +92,11 @@
    <td align="right">[% LxERP.t8("Loss carried forward account") %]</td>
    <td>[% P.chart.picker('defaults.loss_carried_forward_chart_id', SELF.defaults.loss_carried_forward_chart_id, category='A', choose=1, style=style) %]<td>
   </tr>
+  [% END %]
+  <tr>
+   <td align="right">[% LxERP.t8("Transit Items account") %]</td>
+   <td>[% P.chart.picker('defaults.transit_items_chart_id', SELF.defaults.transit_items_chart_id , category='A', choose=1, style=style) %]<td>
+  </tr>
+
 </table>
 </div>
diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index cd6aee25f..442b20a87 100644
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -29,6 +29,26 @@
    <td>[% L.yes_no_tag('defaults.webdav_documents', SELF.defaults.webdav_documents) %]</td>
    <td>[% LxERP.t8('Save document in WebDAV repository') %]</td>
   </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('WebDAV sync extern') %]</td>
+   <td>[% L.yes_no_tag('defaults.webdav_sync_extern', SELF.defaults.webdav_sync_extern) %]</td>
+   <td>[% LxERP.t8('Synchronize WebDAV with owncloud repository') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Destination URL for sync') %]</td>
+   <td>[% L.input_tag('defaults.webdav_sync_extern_url', SELF.defaults.webdav_sync_extern_url, style=style) %]</td>
+   <td>[% LxERP.t8('Complete URL for WebDAV sync external, including port and folders, i.e.: https://foo.com:4433/owncloud/kivitendo') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Login for sync') %]</td>
+   <td>[% L.input_tag('defaults.webdav_sync_extern_login', SELF.defaults.webdav_sync_extern_login, style=style) %]</td>
+   <td>[% LxERP.t8('Login for WebDAV sync external') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Password for sync') %]</td>
+   <td>[% L.input_tag('defaults.webdav_sync_extern_pass', SELF.defaults.webdav_sync_extern_pass, style=style) %]</td>
+   <td>[% LxERP.t8('Password for WebDAV sync external') %]</td>
+  </tr>
   <tr>
    <td align="right">[% LxERP.t8('Filemanagement') %]</td>
    <td>[% L.yes_no_tag('defaults.doc_storage', SELF.defaults.doc_storage) %]</td>
@@ -152,7 +172,7 @@
 
   <tr>
    <td align="right">[% LxERP.t8('Hourly Rate') %]</td>
-   <td>[% L.input_tag('defaults.customer_hourly_rate', LxERP.format_amount(SELF.defaults.customer_hourly_rate, 2), style=style) %]</td>
+   <td>[% L.input_tag('defaults.customer_hourly_rate_as_number', SELF.defaults.customer_hourly_rate_as_number, style=style) %]</td>
    <td>[% LxERP.t8('Default hourly rate for new customers') %]</td>
   </tr>
 
@@ -274,6 +294,18 @@
    <td>[% L.yes_no_tag("defaults.warn_no_delivery_order_for_invoice", SELF.defaults.warn_no_delivery_order_for_invoice ) %]</td>
    <td>[% LxERP.t8("If enabled a warning will be shown if a sales invoices is created without having a sales delivery order as a predecessor.") %]</td>
   </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8("Warn before saving reclamations with duplicate parts") %]</td>
+   <td>[% L.yes_no_tag("defaults.reclamation_warn_duplicate_parts", SELF.defaults.reclamation_warn_duplicate_parts) %]</td>
+   <td>[% LxERP.t8("If enabled a warning will be shown in sales and purchase reclamations if there are two or more positions of the same part.") %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8("Warn before saving reclamations without a due date") %]</td>
+   <td>[% L.yes_no_tag("defaults.reclamation_warn_no_reqdate", SELF.defaults.reclamation_warn_no_reqdate) %]</td>
+   <td>[% LxERP.t8("If enabled a warning will be shown in sales and purchase reclamations if there the due date is empty.") %]</td>
+  </tr>
+
   <tr>
    <td align="right">[% LxERP.t8("Create sales invoices with Factur-X/ZUGFeRD data") %]</td>
    <td>[% L.select_tag("defaults.create_zugferd_invoices", SELF.zugferd_settings, default=SELF.defaults.create_zugferd_invoices) %]</td>
@@ -290,9 +322,67 @@
    <td>[% LxERP.t8("If enabled sales invoices created using OpenDocument/OASIS format will include data for Swiss QR-Bill creation.") %]</td>
   </tr>
   <tr>
-   <td align="right">[% LxERP.t8("Prevent browser's back button in sales invoices") %]</td>
-   <td>[% L.yes_no_tag("defaults.invoice_prevent_browser_back", SELF.defaults.invoice_prevent_browser_back) %]</td>
-   <td>[% LxERP.t8("If enabled try to overrule the brower's back button to prevent double booking of sales invoices.") %]</td>
+    <td align="right">[% LxERP.t8("When using Swiss QR-bill, copy the invoice number to the unstructured message automatically") %]</td>
+    <td>[% L.yes_no_tag("defaults.qrbill_copy_invnumber", SELF.defaults.qrbill_copy_invnumber) %]</td>
+    <td>[% LxERP.t8("If enabled the invoice number will be copied to the unstructured message upon booking. If there's a message already the invoice number will be appended to it.") %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8("Lock RFQ/Quotation and Order Subversion") %]</td>
+   <td>[% L.yes_no_tag("defaults.lock_oe_subversions", SELF.defaults.lock_oe_subversions) %]</td>
+   <td>[% LxERP.t8("If enabled RFQs, Quotations and Orders can only be send once via email. By creating another subversion the current record gets a minor subversion and can be send again via email.") %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Documents which are allowed to be saved with no positions' | $T8 %]</td>
+    <td colspan=2>
+      <div class="clearfix">
+        [% L.select_tag("defaults.allowed_documents_with_no_positions[]",
+                        SELF.available_documents_with_no_positions,
+                        default=SELF.defaults.allowed_documents_with_no_positions,
+                        multiple=1,
+                        with_empty=1,
+                        value_key="name",
+                        title_key="description",
+                        id="defaults_allowed_documents_with_no_positions",
+                        size=SELF.available_documents_with_no_positions.size+1) %]
+      </div>
+    </td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8("Item input position for quotations and orders") %]</td>
+   <td>[% L.select_tag("defaults.order_item_input_position", [ [ 0, LxERP.t8('above the positions'), ], [ 1, LxERP.t8('below the positions') ] ], default=SELF.defaults.order_item_input_position) %]</td>
+   <td>[% LxERP.t8("Controls whether the default item input is above (default) or below the positions list in orders and quotations. Can be overridden by user preferences.") %]</td>
+  </tr>
+
+  <tr><td class="listheading" colspan="4">[% 'Show certain sales and purchase documents' | $T8 %]</td></tr>
+  <tr>
+    <td align="right">[% 'Show sales order intake' | $T8 %]</td>
+    <td>[% L.yes_no_tag("defaults.show_sales_order_intake", SELF.defaults.show_sales_order_intake) %]</td>
+    <td>[% 'When disabled, sales order intakes do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Show purchase quotation intake' | $T8 %]</td>
+    <td>[% L.yes_no_tag("defaults.show_purchase_quotation_intake", SELF.defaults.show_purchase_quotation_intake) %]</td>
+    <td>[% 'When disabled, purchase quotation intakes do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Show purchase order confirmation' | $T8 %]</td>
+    <td>[% L.yes_no_tag("defaults.show_purchase_order_confirmation", SELF.defaults.show_purchase_order_confirmation) %]</td>
+    <td>[% 'When disabled, purchase order confirmations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Show sales reclamation' | $T8 %]</td>
+    <td>[% L.yes_no_tag("defaults.show_sales_reclamation", SELF.defaults.show_sales_reclamation) %]</td>
+    <td>[% 'When disabled, sales reclamations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Show purchase reclamation' | $T8 %]</td>
+    <td>[% L.yes_no_tag("defaults.show_purchase_reclamation", SELF.defaults.show_purchase_reclamation) %]</td>
+    <td>[% 'When disabled, purchase reclamations do not show up in the menu and in the workflow actions.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <th align="right">[% 'Show invoice for payment in advance and final invoice' | $T8 %]</th>
+    <td>[% L.yes_no_tag("defaults.show_invoice_for_advance_payment", SELF.defaults.show_invoice_for_advance_payment) %]</td>
+    <td>[% 'When disabled, invoices for payment in advance and final invoices do not show up in the menu and in the workflow actions.' | $T8 %]</td>
   </tr>
 
   <tr><td class="listheading" colspan="4">[% LxERP.t8("E-mail") %]</td></tr>
@@ -329,7 +419,81 @@
    </td>
    <td>[% 'The invoice recipient can either be a selected contact person (default) or the email adress set in the master data of the customer. Additionally a contact persons mail and the company\'s invoicing mail can be combined.' | $T8 %]</td>
   </tr>
-
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Sales Quotation') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_sales_quotation', SELF.defaults.email_sender_sales_quotation, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Request Quotation') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_request_quotation', SELF.defaults.email_sender_request_quotation, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Sales Order') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_sales_order', SELF.defaults.email_sender_sales_order, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Purchase Order') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_purchase_order', SELF.defaults.email_sender_purchase_order, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Sales Delivery Order') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_sales_delivery_order', SELF.defaults.email_sender_sales_delivery_order, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Purchase Delivery Order') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_purchase_delivery_order', SELF.defaults.email_sender_purchase_delivery_order, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Sales Invoice') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_invoice', SELF.defaults.email_sender_invoice, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Sales Purchase Invoice') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_purchase_invoice', SELF.defaults.email_sender_purchase_invoice, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Letter') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_letter', SELF.defaults.email_sender_letter, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Email Sender Dunning') %]</td>
+   <td>
+     [% L.input_tag('defaults.email_sender_dunning', SELF.defaults.email_sender_dunning, style=style) %]
+   </td>
+   <td>[% 'Generic email send address for this record type.' | $T8 %]</td>
+  </tr>
+  <tr>
+    <th>[% LxERP.t8('Email Subject Transaction Description') %]</th>
+    <td> [% L.yes_no_tag('defaults.email_subject_transaction_description', SELF.defaults.email_subject_transaction_description) %] </td>
+    <td class="long-desc"> [% LxERP.t8('Include the transaction description in the preset email subject.') %] </td>
+  </tr>
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Requirement Specs") %]</td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Default article for converting into quotations and orders') %]</td>
@@ -404,17 +568,9 @@
   </tr>
   <tr>
    <td align="right">[% LxERP.t8('In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.') %]</td>
-   <td>[% L.input_tag('defaults.sepa_set_skonto_date_buffer_in_days', LxERP.format_amount(SELF.defaults.sepa_set_skonto_date_buffer_in_days, 0), style=style) %]</td>
+   <td>[% L.input_tag('defaults.sepa_set_skonto_date_buffer_in_days_as_number', SELF.defaults.sepa_set_skonto_date_buffer_in_days_as_number, style=style) %]</td>
   </tr>
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Experimental Features") %]</td></tr>
-  <tr>
-   <td align="right">[% LxERP.t8('new order controller') %]</td>
-   <td>[% L.yes_no_tag('defaults.feature_experimental_order', SELF.defaults.feature_experimental_order) %]</td>
-  </tr>
-  <tr>
-   <td align="right">[% LxERP.t8('Assortment') %]</td>
-   <td>[% L.yes_no_tag('defaults.feature_experimental_assortment', SELF.defaults.feature_experimental_assortment) %]</td>
-  </tr>
  <tr><td class="listheading" colspan="4">[% 'Displayable Name Preferences' | $T8 %]</td></tr>
  [% FOREACH module=SELF.displayable_name_specs_by_module.keys.sort %]
  [%- SET spec=SELF.displayable_name_specs_by_module.$module -%]
@@ -447,8 +603,13 @@
     </td>
     [% END %]
   </tr>
-  [% END %]
-
+ [% END %]
+ <tr><td class="listheading" colspan="4">[% 'Forced Layout Style' | $T8 %]</td></tr>
+ <tr>
+  <td align="right">[% 'Force a layout style' | $T8 %]</td>
+  <td>[% L.select_tag('defaults.layout_style', [['', LxERP.t8('Automatic')], ['desktop', LxERP.t8('desktop version')]], default=SELF.defaults.layout_style, with_empty=0) %]</td>
+  <td>[% 'The layout style normally is choosen by the user agent string the browser sends. Here you can force the desktop or mobile version. Users can override this setting in their user preferences.' | $T8 %]</td>
+ </tr>
 
 </table>
 </div>
diff --git a/templates/webpages/client_config/_orders_deleteable.html b/templates/webpages/client_config/_orders_deleteable.html
index 0b35a72ee..169dc4aa6 100644
--- a/templates/webpages/client_config/_orders_deleteable.html
+++ b/templates/webpages/client_config/_orders_deleteable.html
@@ -21,5 +21,16 @@
    <td>[% L.yes_no_tag('defaults.purchase_delivery_order_show_delete', SELF.defaults.purchase_delivery_order_show_delete) %]</td>
    <td>[% LxERP.t8('Show delete button in purchase delivery orders?') %]</td>
   </tr>
+
+  <tr>
+   <td align="right">[% LxERP.t8('Sales Reclamations deleteable') %]</td>
+   <td>[% L.yes_no_tag('defaults.sales_reclamation_show_delete', SELF.defaults.sales_reclamation_show_delete) %]</td>
+   <td>[% LxERP.t8('Show delete button in sales reclamations?') %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Purchase Reclamations deleteable') %]</td>
+   <td>[% L.yes_no_tag('defaults.purchase_reclamation_show_delete', SELF.defaults.purchase_reclamation_show_delete) %]</td>
+   <td>[% LxERP.t8('Show delete button in purchase reclamations?') %]</td>
+  </tr>
  </table>
 </div>
diff --git a/templates/webpages/client_config/_posting_configuration.html b/templates/webpages/client_config/_posting_configuration.html
index 0235cc3e1..71a9562d1 100644
--- a/templates/webpages/client_config/_posting_configuration.html
+++ b/templates/webpages/client_config/_posting_configuration.html
@@ -113,6 +113,11 @@
    <td>[% L.select_tag('defaults.balance_startdate_method', SELF.balance_startdate_method_options, value_key = 'value', title_key = 'title', default = SELF.defaults.balance_startdate_method) %]</td>
    <td>[% LxERP.t8('This option controls the method used for determining the startdate for the balance report.') %]</td>
   </tr>
+  <tr>
+    <td align="right">[% LxERP.t8('Year-end method') %]</td>
+    <td>[% L.select_tag('defaults.yearend_method', SELF.yearend_options, value_key = 'value', title_key = 'title', default = SELF.defaults.yearend_method, class='wi-morewide') %]</td>
+    <td>[% LxERP.t8('This option controls the method used for the automated year-end bookings.') %]</td>
+  </tr>
   <tr>
    <td align="right">[% LxERP.t8('Set valid until date for Sales Quotation') %]</td>
    <td>[% L.yes_no_tag('defaults.reqdate_on', SELF.defaults.reqdate_on) %]</td>
@@ -120,7 +125,7 @@
   </tr>
   <tr>
    <td align="right">[% LxERP.t8('Sales Quotation valid interval') %]</td>
-   <td>[% L.input_tag('defaults.reqdate_interval', LxERP.format_amount(SELF.defaults.reqdate_interval, 0), style=style) %]</td>
+   <td>[% L.input_tag('defaults.reqdate_interval_as_number', SELF.defaults.reqdate_interval_as_number, style=style) %]</td>
    <td>[% LxERP.t8('Usually the sales quotation is valid until the next working day. If a value is set here then the quotation will be valid for at least that many days. The resulting date will be adjusted to the next working day if it ends up on a weekend.') %]</td>
   </tr>
   <tr>
@@ -130,8 +135,23 @@
   </tr>
   <tr>
    <td align="right">[% LxERP.t8('Sales Order delivery date interval') %]</td>
-   <td>[% L.input_tag('defaults.delivery_date_interval', LxERP.format_amount(SELF.defaults.delivery_date_interval, 0), style=style) %]</td>
+   <td>[% L.input_tag('defaults.delivery_date_interval_as_number', SELF.defaults.delivery_date_interval_as_number, style=style) %]</td>
    <td>[% LxERP.t8('Usually the delivery date of an order is the next working day. If a value is set here this value will be added to the delivery date of the sales order. The resulting date will be adjusted to the next working day if it ends up on a weekend.') %]</td>
   </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Allow fuzzy skonto for payment bookings') %]</td>
+   <td>[% L.yes_no_tag('defaults.fuzzy_skonto', SELF.defaults.fuzzy_skonto) %]</td>
+   <td>[% LxERP.t8("If set to yes a percentage deviation will be allowed for otherwise strict skonto bookings. The deviation will booked to the skonto chart and the allowed deviation is also configurable.") %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Allowed skonto percentage deviation') %]</td>
+   <td>[% L.input_tag('defaults.fuzzy_skonto_percentage_as_number', SELF.defaults.fuzzy_skonto_percentage_as_number, size=5, class="numeric") %]%</td>
+   <td>[% LxERP.t8("The allowed Skonto Percentage Deivation defaults to 0.5% of the invoice amount") %]</td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Use END-TO-END-ID to detect duplicates in bank import transactions') %]</td>
+   <td>[% L.yes_no_tag('defaults.check_bt_duplicates_endtoend', SELF.defaults.check_bt_duplicates_endtoend) %]</td>
+   <td>[% LxERP.t8("If set to yes and an end-to-end id can be extracted from the transaction this will be used to detect duplicates instead of the transaction purpose.") %]</td>
+  </tr>
  </table>
 </div>
diff --git a/templates/webpages/client_config/_ranges_of_numbers.html b/templates/webpages/client_config/_ranges_of_numbers.html
index 90c075168..88e030501 100644
--- a/templates/webpages/client_config/_ranges_of_numbers.html
+++ b/templates/webpages/client_config/_ranges_of_numbers.html
@@ -6,6 +6,8 @@
    <td>[% L.input_tag("defaults.invnumber", SELF.defaults.invnumber, size="15") %]</td>
    <td align="right" nowrap>[% LxERP.t8('Last Customer Number') %]</td>
    <td>[% L.input_tag("defaults.customernumber", SELF.defaults.customernumber, size="15") %]</td>
+   <td align="right" nowrap>[% LxERP.t8('Last Sales Reclamation Number') %]</td>
+   <td>[% L.input_tag("defaults.s_reclamation_record_number", SELF.defaults.s_reclamation_record_number, size="15") %]</td>
   </tr>
 
   <tr>
@@ -13,6 +15,18 @@
    <td>[% L.input_tag("defaults.cnnumber", SELF.defaults.cnnumber, size="15") %]</td>
    <td align="right" nowrap>[% LxERP.t8('Last Vendor Number') %]</td>
    <td>[% L.input_tag("defaults.vendornumber", SELF.defaults.vendornumber, size="15") %]</td>
+   <td align="right" nowrap>[% LxERP.t8('Last Purchase Reclamation Number') %]</td>
+   <td>[% L.input_tag("defaults.p_reclamation_record_number", SELF.defaults.p_reclamation_record_number, size="15") %]</td>
+  </tr>
+
+  <tr>
+   <td align="right" nowrap>[% LxERP.t8('Last Sales Order Intake Number') %]</td>
+   <td>[% L.input_tag("defaults.soinumber", SELF.defaults.soinumber, size="15") %]</td>
+  </tr>
+
+  <tr>
+   <td align="right" nowrap>[% LxERP.t8('Last Purchase Quotation Intake Number') %]</td>
+   <td>[% L.input_tag("defaults.pqinumber", SELF.defaults.pqinumber, size="15") %]</td>
   </tr>
 
   <tr>
@@ -27,6 +41,11 @@
    <td>[% L.input_tag("defaults.articlenumber", SELF.defaults.articlenumber, size="15") %]</td>
   </tr>
 
+  <tr>
+   <td align="right" nowrap>[% LxERP.t8('Last Purchase Order Confirmation Number') %]</td>
+   <td>[% L.input_tag("defaults.pocnumber", SELF.defaults.pocnumber, size="15") %]</td>
+  </tr>
+
   <tr>
    <td align="right" nowrap>[% LxERP.t8('Last Sales Quotation Number') %]</td>
    <td>[% L.input_tag("defaults.sqnumber", SELF.defaults.sqnumber, size="15") %]</td>
@@ -44,15 +63,23 @@
   <tr>
    <td align="right" nowrap>[% LxERP.t8('Last Sales Delivery Order Number') %]</td>
    <td>[% L.input_tag("defaults.sdonumber", SELF.defaults.sdonumber, size="15") %]</td>
-   [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
    <td align="right" nowrap>[% LxERP.t8('Last Assortment Number') %]</td>
    <td>[% L.input_tag("defaults.assortmentnumber", SELF.defaults.assortmentnumber, size="15") %]</td>
-   [%- END -%]
   </tr>
 
   <tr>
    <td align="right" nowrap>[% LxERP.t8('Last Purchase Delivery Order Number') %]</td>
    <td>[% L.input_tag("defaults.pdonumber", SELF.defaults.pdonumber, size="15") %]</td>
   </tr>
+
+  <tr>
+   <td align="right" nowrap>[% LxERP.t8('Last Supplier Delivery Order Number') %]</td>
+   <td>[% L.input_tag("defaults.sudonumber", SELF.defaults.sudonumber, size="15") %]</td>
+  </tr>
+
+  <tr>
+   <td align="right" nowrap>[% LxERP.t8('Last RMA Delivery Order Number') %]</td>
+   <td>[% L.input_tag("defaults.rdonumber", SELF.defaults.rdonumber, size="15") %]</td>
+  </tr>
  </table>
 </div>
diff --git a/templates/webpages/client_config/_record_links.html b/templates/webpages/client_config/_record_links.html
index 5dd49f645..7bd511b9d 100644
--- a/templates/webpages/client_config/_record_links.html
+++ b/templates/webpages/client_config/_record_links.html
@@ -8,5 +8,21 @@
     [% LxERP.t8('If enabled the record links view starts always from the sales order including all sublevels') %]<br>
    </td>
   </tr>
+  <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Include a link to the record itself') %]</td>
+   <td>[% L.yes_no_tag('defaults.record_links_from_order_with_myself', SELF.defaults.record_links_from_order_with_myself) %]</td>
+   <td>
+    [% LxERP.t8('Include the record itself in the list of linked records, if the view for record links from sales order is enabled.') %]<br>
+    [% LxERP.t8('This way you can get a similar list of linked records for every record in the same workflow.') %]<br>
+   </td>
+  </tr>
+  <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Include links to sales quotations') %]</td>
+   <td>[% L.yes_no_tag('defaults.record_links_from_order_with_quotations', SELF.defaults.record_links_from_order_with_quotations) %]</td>
+   <td>
+    [% LxERP.t8('Include sales quotations in the list of linked records, if the view for record links from sales order is enabled.') %]<br>
+    [% LxERP.t8('As the view starts from sales orders, normally sales quotations are not included.') %]<br>
+   </td>
+  </tr>
  </table>
 </div>
diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 60199fc7e..78b9c102c 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -108,7 +108,7 @@
   </tr>
   <tr>
    <td align="right">[% LxERP.t8('Undo Transfer Interval') %]</td>
-   <td>[% L.input_tag('defaults.undo_transfer_interval', LxERP.format_amount(SELF.defaults.undo_transfer_interval, 0), style=style) %]</td>
+   <td>[% L.input_tag('defaults.undo_transfer_interval_as_number', SELF.defaults.undo_transfer_interval_as_number, style=style) %]</td>
    <td>[% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %]</td>
   </tr>
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Produce Assembly Configuration") %]</td></tr>
diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html
index 79c2cdde9..b46dfc489 100644
--- a/templates/webpages/client_config/form.html
+++ b/templates/webpages/client_config/form.html
@@ -6,7 +6,7 @@ var warehouses = [
  [%- USE warehouses_it = Iterator(SELF.all_warehouses) %][%- FOREACH warehouse = warehouses_it %]
   { id:   [% warehouse.id %],
     bins: [
-     [% USE bins_it = Iterator(warehouse.bins_sorted) %][% FOREACH bin = bins_it %]
+     [% USE bins_it = Iterator(warehouse.bins_sorted_naturally) %][% FOREACH bin = bins_it %]
       { id: [% bin.id %], description: "[% JavaScript.escape(bin.description) %]" }[% UNLESS bins_it.last %],[% END %]
      [% END %]
    ] }[% UNLESS warehouses_it.last %],[% END %]
@@ -94,6 +94,7 @@ $(function() {
    <li><a href="#features">[% LxERP.t8('Features') %]</a></li>
    <li><a href="#stocktaking">[% LxERP.t8('Stocktaking') %]</a></li>
    <li><a href="#record_links">[% LxERP.t8('Linked Records') %]</a></li>
+   <li><a href="#bank">[% LxERP.t8('SEPA/Bank') %]</a></li>
   </ul>
 
 [% PROCESS 'client_config/_ranges_of_numbers.html' %]
@@ -108,6 +109,7 @@ $(function() {
 [% PROCESS 'client_config/_features.html' %]
 [% PROCESS 'client_config/_stocktaking.html' %]
 [% PROCESS 'client_config/_record_links.html' %]
+[% PROCESS 'client_config/_bank.html' %]
 [% PROCESS 'client_config/_miscellaneous.html' %]
  </div>
 </form>
diff --git a/templates/webpages/common/_send_email_dialog.html b/templates/webpages/common/_send_email_dialog.html
index 487943c6c..bf4ccd9ff 100644
--- a/templates/webpages/common/_send_email_dialog.html
+++ b/templates/webpages/common/_send_email_dialog.html
@@ -23,6 +23,10 @@
   [% END %]
 [% END %]
 
+[%- IF is_final_version %]
+  <div class="flash_message_warning">[% LxERP.t8('This record is the final version. Changes have not been saved') %]</div>
+[%- END %]
+
 <table>
  <tbody>
   <tr>
@@ -83,20 +87,27 @@
    <th align="right" nowrap>[% LxERP.t8("Message") %]
     <sup> [% L.link("generictranslations.pl?action=edit_email_strings", "1)", title=LxERP.t8('Tired of copying always nice phrases for this message? Click here to use the new preset message option!'), target="_blank") %]</sup>
   </th>
-   <td>[% L.textarea_tag("email_form.message", email_form.message, rows="15", cols="80", class="texteditor texteditor-space-for-toolbar") %]</td>
+   <td>[% L.textarea_tag("email_form.message", email_form.message, style="height:150px", class="texteditor texteditor-space-for-toolbar") %]</td>
   </tr>
 
 [% IF INSTANCE_CONF.get_doc_storage %]
   <tr>
    <th align="right" nowrap>[% LxERP.t8("Send printout of record") %]</th>
    <td>
-    [% SET no_file_label = have_files ? LxERP.t8("Don't include a printout of the record with the email, only selected files") : LxERP.t8("Don't include a printout of the record with the email") ;
-           options       = [
+    [% SET no_file_label = have_files ? LxERP.t8("Don't include a printout of the record with the email, only selected files") : LxERP.t8("Don't include a printout of the record with the email") %]
+      [%- IF is_final_version %]
+        [% options       = [
+             [ "old_file", LxERP.t8("Send the last version for this record") ],
+             [ "no_file",  no_file_label ],
+           ] %]
+      [%- ELSE %]
+        [% options       = [
              [ "old_file", LxERP.t8("Send the last or create the first version for this record") ],
              [ "normal",   LxERP.t8("Create and send a new printout for this record") ],
              [ "no_file",  no_file_label ],
-           ] ;
-       L.select_tag("email_form.attachment_policy", options, onchange="kivi.SalesPurchase.activate_send_email_actions_regarding_printout()") %]
+           ] %]
+      [%- END %]
+      [% L.select_tag("email_form.attachment_policy", options, onchange="kivi.SalesPurchase.activate_send_email_actions_regarding_printout()") %]
    </td>
   </tr>
 [% END %]
diff --git a/templates/webpages/csv_import/_form_aptransactions.html b/templates/webpages/csv_import/_form_aptransactions.html
new file mode 100644
index 000000000..47f16cbf2
--- /dev/null
+++ b/templates/webpages/csv_import/_form_aptransactions.html
@@ -0,0 +1,23 @@
+[% USE LxERP %]
+[% USE L %]
+<tr>
+ <th align="right">[%- LxERP.t8('AP Transaction/AccTrans Item row names') %]:</th>
+ <td colspan="10">
+  [% L.input_tag('settings.ap_column', SELF.profile.get('ap_column'), size => "10") %]
+  [% L.input_tag('settings.transaction_column',  SELF.profile.get('transaction_column'),  size => "20") %]
+ </td>
+
+<tr>
+ <th align="right">[%- LxERP.t8('Maximal amount difference') %]:</th>
+ <td colspan="10">
+  [% L.input_tag('settings.max_amount_diff', LxERP.format_amount(SELF.profile.get('max_amount_diff')), size => "5") %]
+ </td>
+</tr>
+<tr>
+ <th align="right">[%- LxERP.t8('Error handling') %]:</th>
+ <td colspan="10">
+  [% L.checkbox_tag('settings.dont_save_anything_on_errors',
+                    label   => LxERP.t8('Do not save any datasets on errors'),
+                    checked => SELF.profile.get('dont_save_anything_on_errors')) %]
+ </td>
+</tr>
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 568324e28..7086f4367 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -280,6 +280,8 @@
  [%- INCLUDE 'csv_import/_form_delivery_orders.html' %]
 [%- ELSIF SELF.type == 'ar_transactions' %]
  [%- INCLUDE 'csv_import/_form_artransactions.html' %]
+[%- ELSIF SELF.type == 'ap_transactions' %]
+ [%- INCLUDE 'csv_import/_form_aptransactions.html' %]
 [%- ELSIF SELF.type == 'bank_transactions' %]
  [%- INCLUDE 'csv_import/_form_banktransactions.html' %]
 [%- END %]
diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 655762874..984c35bcb 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -18,6 +18,15 @@
     <td><input id="name" name="name" size="35" class="initial_focus"></td>
    </tr>
 
+   <tr>
+    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
+    <td><input type="text" name="department_1" size="35"></td>
+   </tr>
+   <tr>
+    <th></th>
+    <td><input type="text" name="department_2" size="35"></td>
+   </tr>
+
    <tr>
     <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
     <td><input name="contact" size="35"></td>
@@ -65,6 +74,16 @@
    </tr>
    [% END %]
 
+   <tr>
+     <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
+     <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1) %]</td>
+   </tr>
+
+    <tr>
+     <th align="right">[% 'Tax rate' | $T8 %]</th>
+     <td>[% L.select_tag('taxzone_id', ALL_TAXZONES, with_empty=1, title_key='description') %]</td>
+    </tr>
+
 [% IF IS_CUSTOMER %]
    <tr>
      <th align="right" nowrap>[% LxERP.t8("Factur-X/ZUGFeRD settings") %]</th>
@@ -91,6 +110,12 @@
       [% L.date_tag('insertdateto') %]
     </td>
    </tr>
+[% IF IS_CUSTOMER %]
+   <tr>
+     <th align="right" nowrap>[% 'Dunning lock' | $T8 %]</th>
+     <td>[% L.yes_no_tag('dunning_lock', dunning_lock, default='', with_empty=1) %]</td>
+   </tr>
+[% END %]
 
    [% CUSTOM_VARIABLES_FILTER_CODE %]
 
@@ -198,6 +223,10 @@
         <input name="l_payment" id="l_payment" type="checkbox" class="checkbox" value="Y">
         <label for="l_payment">[% 'Payment Terms' | $T8 %]</label>
        </td>
+       <td>
+        <input name="l_taxzone" id="l_taxzone" type="checkbox" class="checkbox" value="Y">
+        <label for="l_taxzone">[% 'Tax rate' | $T8 %]</label>
+       </td>
        <td>
         <input name="l_insertdate" id="l_insertdate" class="checkbox" type="checkbox" value="Y">
         <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
@@ -262,7 +291,10 @@
         <input name="l_department_2" id="l_department_2" type="checkbox" class="checkbox" value="Y">
         <label for="l_department_2">[% 'Department' | $T8 %] 2</label>
        </td>
-        <td></td>
+       <td>
+        <input name="l_dunning_lock" id="l_dunning_lock" type="checkbox" class="checkbox" value="Y">
+        <label for="l_dunning_lock">[% 'Dunning lock' | $T8 %]</label>
+       </td>
       </tr>
       [% END %]
 
diff --git a/templates/webpages/custom_data_export/export.html b/templates/webpages/custom_data_export/export.html
index 283cae33e..b6318acfb 100644
--- a/templates/webpages/custom_data_export/export.html
+++ b/templates/webpages/custom_data_export/export.html
@@ -6,7 +6,7 @@
 
 <form method="post" action="controller.pl" id="form">
  [% L.hidden_tag("id", SELF.query.id) %]
- [% L.hidden_tag("format", "csv") %]
+ [% L.hidden_tag("parameters_set", "1") %]
 
  [% IF !SELF.parameters.size %]
   <p>
diff --git a/templates/webpages/custom_data_export/list.html b/templates/webpages/custom_data_export/list.html
index 7e22b4ef6..fc0c8c871 100644
--- a/templates/webpages/custom_data_export/list.html
+++ b/templates/webpages/custom_data_export/list.html
@@ -6,7 +6,7 @@
 
 [% IF !SELF.queries.size %]
  <p>
-  [%- LxERP.t8("You do not have access to any custom data export.") %]
+  [%- LxERP.t8("You do not have access to any custom report.") %]
  </p>
 
 [%- ELSE %]
diff --git a/templates/webpages/custom_data_export_designer/edit.html b/templates/webpages/custom_data_export_designer/edit.html
index 9b8f68cfe..9008759b2 100644
--- a/templates/webpages/custom_data_export_designer/edit.html
+++ b/templates/webpages/custom_data_export_designer/edit.html
@@ -41,8 +41,7 @@
 SELECT extract(YEAR FROM oe.transdate) AS &quot;Jahr&quot;, SUM(oe.amount) AS &quot;Angebotssumme&quot;
 FROM oe
 LEFT JOIN employee ON (oe.employee_id = employee.id)
-WHERE (oe.customer_id IS NOT NULL)
-  AND COALESCE(oe.quotation, FALSE)
+WHERE oe.record_type = 'sales_quotation'
   AND (employee.login = &lt;%Benutzer-Login%&gt;)
 GROUP BY &quot;Jahr&quot;
 ORDER BY &quot;Jahr&quot;
diff --git a/templates/webpages/custom_data_export_designer/list.html b/templates/webpages/custom_data_export_designer/list.html
index 734ecc754..ac46066dc 100644
--- a/templates/webpages/custom_data_export_designer/list.html
+++ b/templates/webpages/custom_data_export_designer/list.html
@@ -6,7 +6,7 @@
 
 [% IF !SELF.queries.size %]
  <p>
-  [%- LxERP.t8("No custom data exports have been created yet.") %]
+  [%- LxERP.t8("No custom reports have been created yet.") %]
  </p>
 
 [%- ELSE %]
diff --git a/templates/webpages/custom_variable_config/list.html b/templates/webpages/custom_variable_config/list.html
index f17b20dda..94503febe 100644
--- a/templates/webpages/custom_variable_config/list.html
+++ b/templates/webpages/custom_variable_config/list.html
@@ -8,7 +8,7 @@
 </p>
 
 [%- IF SELF.module == 'IC' %]
-  [%- SET W="12.5%" %]
+  [%- SET W="10.5%" %]
 [%- ELSE %]
   [%- SET W="20%" %]
 [%- END %]
@@ -26,6 +26,7 @@
      <th width="[%- W -%]">[% 'Editable' | $T8 %]</th>
      <th width="[%- W -%]">[% 'Deactivate by default' | $T8 %]</th>
      <th width="[%- W -%]">[% 'Filter by Partsgroups' | $T8 %]</th>
+     <th width="[%- W -%]">[% 'Display in basic data tab' | $T8 %]</th>
     [%- END %]
    </tr>
   </thead>
@@ -48,6 +49,7 @@
       <td>[%- IF cfg.flags.match('editable=1') %][% 'Yes' | $T8 %][%- ELSE %][% 'No' | $T8 %][%- END %]</td>
       <td>[%- IF cfg.flags.match('defaults_to_invalid=1') %][% 'Yes' | $T8 %][%- ELSE %][% 'No' | $T8 %][%- END %]</td>
       <td>[%- IF cfg.flags.match('partsgroup_filter=1') %][% 'Yes' | $T8 %][%- ELSE %][% 'No' | $T8 %][%- END %]</td>
+      <td>[% IF cfg.first_tab %][% 'Yes' | $T8 %][% ELSE %][% 'No' | $T8 %][% END %]</td>
      [%- END %]
     </tr>
     [%- END %]
diff --git a/templates/webpages/customer_vendor/form.html b/templates/webpages/customer_vendor/form.html
index 2fce8d6d9..775c06793 100644
--- a/templates/webpages/customer_vendor/form.html
+++ b/templates/webpages/customer_vendor/form.html
@@ -53,11 +53,13 @@
           <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id _ '&db=' _ FORM.db %]">[% LxERP.t8('Records') %]
               [%- IF SELF.open_items > 0 %] <span style="color:red;">&nbsp;$</span>[% END %] [%- IF SELF.open_orders > 0 %] <span style="color:red;">&nbsp;!</span>[% END %]</a>
           </li>
+          <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
         [% END %]
         [% IF ( FORM.db == 'vendor' && AUTH.assert('show_extra_record_tab_vendor',1) ) %]
           <li><a href="[% 'controller.pl?action=CustomerVendorTurnover/list_turnover&id=' _ SELF.cv.id _ '&db=' _ FORM.db %]">[% LxERP.t8('Records') %]
               [%- IF SELF.open_items > 0 %] <span style="color:red;">&nbsp;$</span>[% END %] [%- IF SELF.open_orders > 0 %] <span style="color:red;">&nbsp;!</span>[% END %]</a>
           </li>
+          <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
         [% END %]
       [% END %]
 
@@ -84,6 +86,9 @@
     [% IF ( SELF.cv.id && SELF.cv.pricegroup_id && AUTH.assert('part_service_assembly_details', 1) ) %]
       [% PROCESS "customer_vendor/tabs/price_list.html" %]
     [% END %]
+    [% IF SELF.cv.id && ( (FORM.db == 'customer' && AUTH.assert('show_extra_record_tab_customer', 1)) || (FORM.db == 'vendor' && AUTH.assert('show_extra_record_tab_vendor', 1)) ) %]
+      <div id="turnover_stat">[% PROCESS "customer_vendor_turnover/turnover_statistic.html" %]</div>
+    [% END %]
   </div>
 </form>
 
diff --git a/templates/webpages/customer_vendor/get_delivery.html b/templates/webpages/customer_vendor/get_delivery.html
index fffb3ced9..61e464859 100644
--- a/templates/webpages/customer_vendor/get_delivery.html
+++ b/templates/webpages/customer_vendor/get_delivery.html
@@ -27,14 +27,10 @@
             <tr class="listrow[% loop.count % 2 %]">
               <td>[% HTML.escape(row.shiptoname) UNLESS loop.prev.shiptoname == row.shiptoname %]&nbsp;</td>
               <td>[% IF row.id %]<a href='[% row.script %].pl?action=edit&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.invnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-              [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-                <td>[% IF row.oe_id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
-              [%- ELSE -%]
-                <td>[% IF row.oe_id %]<a href='oe.pl?action=edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&vc=customer&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
-              [%- END -%]
+              <td>[% IF row.oe_id %]<a href='controller.pl?action=Order/edit&type=[% IF SELF.is_customer %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.oe_id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.oe_id %]</a>[% END %]</td>
               <td>[% HTML.escape(row.transdate)   || '&nbsp;' %]</td>
               <td>[% HTML.escape(row.description) || '&nbsp;' %]</td>
-              <td>[% HTML.escape(row.qty)         || '&nbsp;' %]</td>
+              <td>[% LxERP.format_amount(HTML.escape(row.qty), 2) || '&nbsp;' %]</td>
               <td>[% HTML.escape(row.unit)        || '&nbsp;' %]</td>
               <td>[% LxERP.format_amount(row.sellprice, 2) || '&nbsp;' %]</td>
             </tr>
diff --git a/templates/webpages/customer_vendor/tabs/additional_billing_addresses.html b/templates/webpages/customer_vendor/tabs/additional_billing_addresses.html
index d8a284c01..bfbaef268 100644
--- a/templates/webpages/customer_vendor/tabs/additional_billing_addresses.html
+++ b/templates/webpages/customer_vendor/tabs/additional_billing_addresses.html
@@ -31,7 +31,7 @@
       <th align="right" nowrap>[% 'Name' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.name', SELF.additional_billing_address.name,  size = 35) %]
+        [% L.input_tag_trim('additional_billing_address.name', SELF.additional_billing_address.name,  size = 35) %]
       </td>
     </tr>
 
@@ -39,8 +39,8 @@
       <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.department_1', SELF.additional_billing_address.department_1,  size = 16) %]
-        [% L.input_tag('additional_billing_address.department_2', SELF.additional_billing_address.department_2,  size = 16) %]
+        [% L.input_tag_trim('additional_billing_address.department_1', SELF.additional_billing_address.department_1,  size = 16) %]
+        [% L.input_tag_trim('additional_billing_address.department_2', SELF.additional_billing_address.department_2,  size = 16) %]
       </td>
     </tr>
 
@@ -48,7 +48,7 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.street', SELF.additional_billing_address.street,  size = 35) %]
+        [% L.input_tag_trim('additional_billing_address.street', SELF.additional_billing_address.street,  size = 35) %]
 
         <span id="additional_billing_address_map"></span>
         <script type="text/javascript">
@@ -64,8 +64,8 @@
       <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.zipcode', SELF.additional_billing_address.zipcode,  size = 5) %]
-        [% L.input_tag('additional_billing_address.city', SELF.additional_billing_address.city,  size = 30) %]
+        [% L.input_tag_trim('additional_billing_address.zipcode', SELF.additional_billing_address.zipcode,  size = 5) %]
+        [% L.input_tag_trim('additional_billing_address.city', SELF.additional_billing_address.city,  size = 30) %]
       </td>
     </tr>
 
@@ -73,7 +73,7 @@
       <th align="right" nowrap>[% 'Country' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.country', SELF.additional_billing_address.country,  size = 35) %]
+        [% L.input_tag_trim('additional_billing_address.country', SELF.additional_billing_address.country,  size = 35) %]
       </td>
     </tr>
 
@@ -81,7 +81,7 @@
       <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.gln', SELF.additional_billing_address.gln,  size = 30) %]
+        [% L.input_tag_trim('additional_billing_address.gln', SELF.additional_billing_address.gln,  size = 30) %]
       </td>
     </tr>
 
@@ -89,7 +89,7 @@
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.contact', SELF.additional_billing_address.contact,  size = 30) %]
+        [% L.input_tag_trim('additional_billing_address.contact', SELF.additional_billing_address.contact,  size = 30) %]
       </td>
     </tr>
 
@@ -97,7 +97,7 @@
       <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.phone', SELF.additional_billing_address.phone,  size = 30) %]
+        [% L.input_tag_trim('additional_billing_address.phone', SELF.additional_billing_address.phone,  size = 30) %]
       </td>
     </tr>
 
@@ -105,7 +105,7 @@
       <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.fax', SELF.additional_billing_address.fax,  size = 30) %]
+        [% L.input_tag_trim('additional_billing_address.fax', SELF.additional_billing_address.fax,  size = 30) %]
       </td>
     </tr>
 
@@ -113,9 +113,17 @@
       <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('additional_billing_address.email', SELF.additional_billing_address.email,  size = 45) %]
+        [% L.input_tag_trim('additional_billing_address.email', SELF.additional_billing_address.email,  size = 45) %]
       </td>
     </tr>
+    <tr>
+      <th align="right" nowrap>[% 'Dunning email' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag_trim('additional_billing_address.dunning_mail', SELF.additional_billing_address.dunning_mail,  size = 45) %]
+      </td>
+    </tr>
+
   </table>
 
   [% L.button_tag('submitInputButton("delete_additional_billing_address");', LxERP.t8('Delete address'), class = 'submit') %]
diff --git a/templates/webpages/customer_vendor/tabs/bank.html b/templates/webpages/customer_vendor/tabs/bank.html
index 99608bbc6..3ef0c4b4a 100644
--- a/templates/webpages/customer_vendor/tabs/bank.html
+++ b/templates/webpages/customer_vendor/tabs/bank.html
@@ -9,13 +9,13 @@
       <th align="right">[% 'Owner of account' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.depositor', SELF.cv.depositor, size = 20) %]
+        [% L.input_tag_trim('cv.depositor', SELF.cv.depositor, size = 20) %]
       </td>
 
     [%- IF ( SELF.is_customer ) %]
       <th align="right">[% 'Mandator ID' | $T8 %]</th>
       <td>
-        [% L.input_tag('cv.mandator_id', SELF.cv.mandator_id, size = 20) %]
+        [% L.input_tag_trim('cv.mandator_id', SELF.cv.mandator_id, size = 20) %]
       </td>
 
       <th align="right">[% 'Mandate Date of Signature' | $T8 %]</th>
@@ -29,19 +29,19 @@
       <th align="right">[% 'IBAN' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.iban', SELF.cv.iban, size = 34) %]
+        [% L.input_tag_trim('cv.iban', SELF.cv.iban, size = 34) %]
       </td>
 
 
       <th align="right">[% 'BIC' | $T8 %]</th>
       <td>
-        [% L.input_tag('cv.bic', SELF.cv.bic, size = 20) %]
+        [% L.input_tag_trim('cv.bic', SELF.cv.bic, size = 20) %]
       </td>
 
       <th align="right">[% 'Bank' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.bank', SELF.cv.bank, size = 20) %]
+        [% L.input_tag_trim('cv.bank', SELF.cv.bank, size = 20) %]
       </td>
     </tr>
 
@@ -49,14 +49,14 @@
       <th align="right">[% 'Account Number' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.account_number', SELF.cv.account_number, size = 20) %]
+        [% L.input_tag_trim('cv.account_number', SELF.cv.account_number, size = 20) %]
       </td>
 
 
       <th align="right">[% 'Bank Code Number' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.bank_code', SELF.cv.bank_code, size = 20) %]
+        [% L.input_tag_trim('cv.bank_code', SELF.cv.bank_code, size = 20) %]
       </td>
     </tr>
   </table>
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 300643e9e..db99b01d5 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 [%- USE JavaScript -%]
 
 <div id="billing">
@@ -40,12 +41,12 @@
       [% IF SELF.is_vendor() %]
         <th align="right" nowrap>[% 'Vendor Number' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.vendornumber', SELF.cv.vendornumber) %]
+          [% L.input_tag_trim('cv.vendornumber', SELF.cv.vendornumber) %]
         </td>
       [%- ELSE %]
         <th align="right" nowrap>[% 'Customer Number' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.customernumber', SELF.cv.customernumber) %]
+          [% L.input_tag_trim('cv.customernumber', SELF.cv.customernumber) %]
         </td>
       [%- END %]
     </tr>
@@ -55,7 +56,7 @@
 
       <td>
         [%- IF INSTANCE_CONF.get_vc_greetings_use_textfield -%]
-          [% L.input_tag('cv.greeting', SELF.cv.greeting) %]
+          [% L.input_tag_trim('cv.greeting', SELF.cv.greeting) %]
           [% L.select_tag('cv_greeting_select', SELF.all_greetings, default = SELF.cv.greeting, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#cv_greeting").val(this.value);') %]
         [%- ELSE -%]
           [% L.select_tag('cv.greeting', SELF.all_greetings, default = SELF.cv.greeting, value_key = 'description', title_key = 'description', with_empty = 1) %]
@@ -73,7 +74,7 @@
       </th>
 
       <td>
-        [% L.input_tag('cv.name', SELF.cv.name) %]
+        [% L.input_tag_trim('cv.name', SELF.cv.name) %]
         <label for="cv_natural_person">[% 'natural person' | $T8 %]</label>
         [% L.checkbox_tag('cv.natural_person', checked = SELF.cv.natural_person, for_submit=1) %]
       </td>
@@ -83,8 +84,8 @@
       <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.department_1', SELF.cv.department_1, size = 16) %]
-        [% L.input_tag('cv.department_2', SELF.cv.department_2, size = 16) %]
+        [% L.input_tag_trim('cv.department_1', SELF.cv.department_1, size = 16) %]
+        [% L.input_tag_trim('cv.department_2', SELF.cv.department_2, size = 16) %]
       </td>
     </tr>
 
@@ -92,7 +93,7 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.street', SELF.cv.street, size = 35) %]
+        [% L.input_tag_trim('cv.street', SELF.cv.street, size = 35) %]
         <span id="billing_map"></span>
         <script type="text/javascript">
           billingMapWidget = new kivi.CustomerVendor.MapWidget('cv_', '[% JavaScript.escape(SELF.home_address_for_google_maps) %]');
@@ -107,8 +108,8 @@
       <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.zipcode', SELF.cv.zipcode, size = 5) %]
-        [% L.input_tag('cv.city', SELF.cv.city, size = 30) %]
+        [% L.input_tag_trim('cv.zipcode', SELF.cv.zipcode, size = 5) %]
+        [% L.input_tag_trim('cv.city', SELF.cv.city, size = 30) %]
       </td>
     </tr>
 
@@ -116,7 +117,7 @@
       <th align="right" nowrap>[% 'Country' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.country', SELF.cv.country, size = 30) %]
+        [% L.input_tag_trim('cv.country', SELF.cv.country, size = 30) %]
       </td>
     </tr>
 
@@ -124,7 +125,7 @@
       <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.gln', SELF.cv.gln, size = 30) %]
+        [% L.input_tag_trim('cv.gln', SELF.cv.gln, size = 30) %]
       </td>
     </tr>
 
@@ -132,7 +133,7 @@
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.contact', SELF.cv.contact, size = 28) %]
+        [% L.input_tag_trim('cv.contact', SELF.cv.contact, size = 28) %]
       </td>
     </tr>
 
@@ -140,7 +141,7 @@
       <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.phone', SELF.cv.phone, size = 30) %]
+        [% L.input_tag_trim('cv.phone', SELF.cv.phone, size = 30) %]
       </td>
     </tr>
 
@@ -148,7 +149,7 @@
       <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.fax', SELF.cv.fax, size = 30) %]
+        [% L.input_tag_trim('cv.fax', SELF.cv.fax, size = 30) %]
       </td>
     </tr>
 
@@ -156,7 +157,7 @@
       <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.email', SELF.cv.email, size = 45) %]
+        [% P.input_email_tag('cv.email', SELF.cv.email, size = 45) %]
       </td>
     </tr>
 
@@ -164,7 +165,7 @@
       <th align="right">[% 'Cc E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.cc', SELF.cv.cc, size = 45) %]
+        [% P.input_email_tag('cv.cc', SELF.cv.cc, size = 45) %]
       </td>
     </tr>
 
@@ -172,18 +173,23 @@
       <th align="right">[% 'Bcc E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.bcc', SELF.cv.bcc, size = 45) %]
+        [% P.input_email_tag('cv.bcc', SELF.cv.bcc, size = 45) %]
       </td>
     </tr>
     [% IF ( SELF.is_customer() ) %]
     <tr>
       <th align="right">[% 'Email of the invoice recipient' | $T8 %]</th>
-      <td>[% L.input_tag('cv.invoice_mail', SELF.cv.invoice_mail, size = 30) %] <label for="cv_postal_invoice">[% 'Postal Invoice' | $T8 %]</label>
+      <td>[% P.input_email_tag('cv.invoice_mail', SELF.cv.invoice_mail, size = 30) %] <label for="cv_postal_invoice">[% 'Postal Invoice' | $T8 %]</label>
         [% L.checkbox_tag('cv.postal_invoice', checked = SELF.cv.postal_invoice, for_submit=1) %]</td>
     </tr>
+    <tr>
+      <th align="right">[% 'Email of the dunning recipient' | $T8 %]</th>
+      <td>[% P.input_email_tag('cv.dunning_mail', SELF.cv.dunning_mail, size = 30) %]</td>
+    </tr>
+
     <tr>
       <th align="right">[% 'Email of the delivery order recipient' | $T8 %]</th>
-      <td>[% L.input_tag('cv.delivery_order_mail', SELF.cv.delivery_order_mail, size = 45) %]</td>
+      <td>[% P.input_email_tag('cv.delivery_order_mail', SELF.cv.delivery_order_mail, size = 45) %]</td>
     </tr>
     [% END %]
     <tr>
@@ -196,7 +202,7 @@
       </th>
 
       <td>
-        [% L.input_tag('cv.homepage', SELF.cv.homepage, size = 45, title = LxERP.t8('Example: http://kivitendo.de')) %]
+        [% L.input_tag_trim('cv.homepage', SELF.cv.homepage, size = 45, title = LxERP.t8('Example: http://kivitendo.de')) %]
       </td>
     </tr>
 
@@ -204,7 +210,7 @@
       <th align="right" nowrap>[% 'Username' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.username', SELF.cv.username, size = 45) %]
+        [% L.input_tag_trim('cv.username', SELF.cv.username, size = 45) %]
       </td>
     </tr>
 
@@ -212,7 +218,7 @@
       <th align="right" nowrap>[% 'Password' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.user_password', SELF.cv.user_password, size = 45) %]
+        [% L.input_tag_trim('cv.user_password', SELF.cv.user_password, size = 45) %]
       </td>
     </tr>
   </table>
@@ -224,7 +230,7 @@
       <th align="right">[% 'Credit Limit' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.creditlimit_as_number', SELF.cv.creditlimit_as_number, size = 9) %]
+        [% L.input_tag_trim('cv.creditlimit_as_number', SELF.cv.creditlimit_as_number, size = 9) %]
       </td>
 
 
@@ -238,7 +244,7 @@
       <th align="right">[% 'Discount' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.discount_as_percent', SELF.cv.discount_as_percent, size = 4) %]%
+        [% L.input_tag_trim('cv.discount_as_percent', SELF.cv.discount_as_percent, size = 4) %]%
       </td>
     </tr>
 
@@ -253,7 +259,7 @@
       <th align="right">[% 'Tax Number / SSN' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.taxnumber', SELF.cv.taxnumber, size = 20) %]
+        [% L.input_tag_trim('cv.taxnumber', SELF.cv.taxnumber, size = 20) %]
       </td>
 
 
@@ -261,7 +267,7 @@
       <th align="right">[% 'sales tax identification number' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('cv.ustid', SELF.cv.ustid, size = 20 ) %]
+        [% L.input_tag_trim('cv.ustid', SELF.cv.ustid, size = 20 ) %]
       </td>
     </tr>
 
@@ -269,23 +275,23 @@
       [% IF ( SELF.is_customer() ) %]
         <th align="right">[% 'Commercial court' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.commercial_court', SELF.cv.commercial_court, size = 20) %]
+          [% L.input_tag_trim('cv.commercial_court', SELF.cv.commercial_court, size = 20) %]
         </td>
 
         <th align="right">[% 'our vendor number at customer' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.c_vendor_id', SELF.cv.c_vendor_id, size = 20) %]
+          [% L.input_tag_trim('cv.c_vendor_id', SELF.cv.c_vendor_id, size = 20) %]
         </td>
 
         <th align="right">[% 'Our routing id at customer' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.c_vendor_routing_id', SELF.cv.c_vendor_routing_id, size = 20) %]
+          [% L.input_tag_trim('cv.c_vendor_routing_id', SELF.cv.c_vendor_routing_id, size = 20) %]
         </td>
 
       [%- ELSE %]
         <th align="right">[% 'Customer Number' | $T8 %]</th>
         <td>
-          [% L.input_tag('cv.v_customer_id', SELF.cv.v_customer_id, size = 20) %]
+          [% L.input_tag_trim('cv.v_customer_id', SELF.cv.v_customer_id, size = 20) %]
         </td>
       [%- END %]
     </tr>
@@ -376,13 +382,17 @@
     [% IF ( SELF.is_customer() ) %]
      <tr>
       <th align="right">[%- LxERP.t8("Hourly rate") %]</th>
-      <td>[% L.input_tag("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %]</td>
+      <td>[% L.input_tag_trim("cv.hourly_rate_as_number", SELF.cv.hourly_rate_as_number) %]</td>
       <th align="right" valign="top" nowrap>[% 'Shoporderlock' | $T8 %]</th>
       <td>
         [% L.checkbox_tag('cv.order_lock', checked = SELF.cv.order_lock, for_submit=1) %]
       </td>
-      <th align="right">[% LxERP.t8("Create sales invoices with Factur-X/ZUGFeRD data") %]</th>
-      <td>[% L.select_tag("cv.create_zugferd_invoices", SELF.zugferd_settings, default=SELF.cv.create_zugferd_invoices) %]</td>
+      <th align="right" valign="top" nowrap>[% 'Dunning lock' | $T8 %]</th>
+      <td>[% L.checkbox_tag('cv.dunning_lock', checked = SELF.cv.dunning_lock, for_submit=1) %]</td>
+     </tr>
+     <tr>
+      <th align="right" colspan="3">[% LxERP.t8("Create sales invoices with Factur-X/ZUGFeRD data") %]</th>
+      <td colspan="3">[% L.select_tag("cv.create_zugferd_invoices", SELF.zugferd_settings, default=SELF.cv.create_zugferd_invoices) %]</td>
      </tr>
     [% END %]
   </table>
diff --git a/templates/webpages/customer_vendor/tabs/contacts.html b/templates/webpages/customer_vendor/tabs/contacts.html
index 90793f402..437da1eec 100644
--- a/templates/webpages/customer_vendor/tabs/contacts.html
+++ b/templates/webpages/customer_vendor/tabs/contacts.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 
 <div id="contacts">
   <table>
@@ -18,7 +19,9 @@
             empty_title = LxERP.t8('New contact'),
             value_key = 'cp_id',
             title_key = 'full_name',
-            onchange = "kivi.CustomerVendor.selectContact({onFormSet: function(){ contactsMapWidget.testInputs(); kivi.reinit_widgets(); }});",
+            onchange = "kivi.CustomerVendor.selectContact({onFormSet: function(){ contactsMapWidget.testInputs();
+                                                                                  kivi.CustomerVendor.contacts_update_email_fields();
+                                                                                  kivi.reinit_widgets(); }});",
           )
         %]
       </td>
@@ -46,7 +49,7 @@
 
       <td>
         [%- IF INSTANCE_CONF.get_contact_titles_use_textfield -%]
-          [% L.input_tag('contact.cp_title', SELF.contact.cp_title, size = 40) %]
+          [% L.input_tag_trim('contact.cp_title', SELF.contact.cp_title, size = 40) %]
           [% L.select_tag('contact_cp_title_select', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);') %]
         [%- ELSE -%]
           [% L.select_tag('contact.cp_title', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1) %]
@@ -59,7 +62,7 @@
 
       <td>
         [%- IF INSTANCE_CONF.get_contact_departments_use_textfield -%]
-          [% L.input_tag('contact.cp_abteilung', SELF.contact.cp_abteilung, size = 40) %]
+          [% L.input_tag_trim('contact.cp_abteilung', SELF.contact.cp_abteilung, size = 40) %]
           [% L.select_tag('contact_cp_abteilung_select', SELF.all_contact_departments, default = SELF.contact.cp_abteilung, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_abteilung").val(this.value);') %]
         [%- ELSE -%]
           [% L.select_tag('contact.cp_abteilung', SELF.all_contact_departments, default = SELF.contact.cp_abteilung, value_key = 'description', title_key = 'description', with_empty = 1) %]
@@ -71,7 +74,7 @@
       <th align="right" nowrap>[% 'Function/position' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_position', SELF.contact.cp_position, size = 40) %]
+        [% L.input_tag_trim('contact.cp_position', SELF.contact.cp_position, size = 40) %]
       </td>
     </tr>
 
@@ -79,7 +82,7 @@
       <th align="right" nowrap>[% 'Given Name' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_givenname', SELF.contact.cp_givenname, size = 40) %]
+        [% L.input_tag_trim('contact.cp_givenname', SELF.contact.cp_givenname, size = 40) %]
       </td>
     </tr>
 
@@ -87,7 +90,7 @@
       <th align="right" nowrap>[% 'Surname' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_name', SELF.contact.cp_name, size = 40) %]
+        [% L.input_tag_trim('contact.cp_name', SELF.contact.cp_name, size = 40) %]
       </td>
     </tr>
 
@@ -95,7 +98,7 @@
       <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_email', SELF.contact.cp_email, size = 40) %]
+        [% P.input_email_tag('contact.cp_email', SELF.contact.cp_email, class = 'update_email', size = 40) %]
       </td>
     </tr>
 
@@ -103,7 +106,7 @@
       <th align="right" nowrap>[% 'Phone1' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_phone1', SELF.contact.cp_phone1, size = 40) %]
+        [% L.input_tag_trim('contact.cp_phone1', SELF.contact.cp_phone1, size = 40) %]
       </td>
     </tr>
 
@@ -111,7 +114,7 @@
       <th align="right" nowrap>[% 'Phone2' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_phone2', SELF.contact.cp_phone2, size = 40) %]
+        [% L.input_tag_trim('contact.cp_phone2', SELF.contact.cp_phone2, size = 40) %]
       </td>
     </tr>
 
@@ -119,7 +122,7 @@
       <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_fax', SELF.contact.cp_fax, size = 40) %]
+        [% L.input_tag_trim('contact.cp_fax', SELF.contact.cp_fax, size = 40) %]
       </td>
     </tr>
 
@@ -127,7 +130,7 @@
       <th align="right" nowrap>[% 'Mobile1' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_mobile1', SELF.contact.cp_mobile1, size = 40) %]
+        [% L.input_tag_trim('contact.cp_mobile1', SELF.contact.cp_mobile1, size = 40) %]
       </td>
     </tr>
 
@@ -135,7 +138,7 @@
       <th align="right" nowrap>[% 'Mobile2' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_mobile2', SELF.contact.cp_mobile2, size = 40) %]
+        [% L.input_tag_trim('contact.cp_mobile2', SELF.contact.cp_mobile2, size = 40) %]
       </td>
     </tr>
 
@@ -143,7 +146,7 @@
       <th align="right" nowrap>[% 'Sat. Phone' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_satphone', SELF.contact.cp_satphone, size = 40) %]
+        [% L.input_tag_trim('contact.cp_satphone', SELF.contact.cp_satphone, size = 40) %]
       </td>
     </tr>
 
@@ -151,7 +154,7 @@
       <th align="right" nowrap>[% 'Sat. Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_satfax', SELF.contact.cp_satfax, size = 40) %]
+        [% L.input_tag_trim('contact.cp_satfax', SELF.contact.cp_satfax, size = 40) %]
       </td>
     </tr>
 
@@ -159,7 +162,7 @@
       <th align="right" nowrap>[% 'Project' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_project', SELF.contact.cp_project, size = 40) %]
+        [% L.input_tag_trim('contact.cp_project', SELF.contact.cp_project, size = 40) %]
       </td>
     </tr>
 
@@ -167,7 +170,7 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_street', SELF.contact.cp_street, size = 40) %]
+        [% L.input_tag_trim('contact.cp_street', SELF.contact.cp_street, size = 40) %]
         <span id="contact_map"></span>
         <script type="text/javascript">
           var contactsMapWidget = new kivi.CustomerVendor.MapWidget('contact_cp_');
@@ -182,8 +185,8 @@
       <th align="right" nowrap>[% 'Zip, City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5) %]
-        [% L.input_tag('contact.cp_city', SELF.contact.cp_city, size = 25) %]
+        [% L.input_tag_trim('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5) %]
+        [% L.input_tag_trim('contact.cp_city', SELF.contact.cp_city, size = 25) %]
       </td>
     </tr>
 
@@ -191,7 +194,7 @@
       <th align="right" nowrap>[% 'Private Phone' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_privatphone', SELF.contact.cp_privatphone, size = 40) %]
+        [% L.input_tag_trim('contact.cp_privatphone', SELF.contact.cp_privatphone, size = 40) %]
       </td>
     </tr>
 
@@ -199,7 +202,7 @@
       <th align="right" nowrap>[% 'Private E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_privatemail', SELF.contact.cp_privatemail, size = 40) %]
+        [% P.input_email_tag('contact.cp_privatemail', SELF.contact.cp_privatemail, class = 'update_email', size = 40) %]
       </td>
     </tr>
 
diff --git a/templates/webpages/customer_vendor/tabs/shipto.html b/templates/webpages/customer_vendor/tabs/shipto.html
index c47d2721d..6e1f3df26 100644
--- a/templates/webpages/customer_vendor/tabs/shipto.html
+++ b/templates/webpages/customer_vendor/tabs/shipto.html
@@ -26,7 +26,7 @@
       <th align="right" nowrap>[% 'Name' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptoname', SELF.shipto.shiptoname,  size = 35) %]
+        [% L.input_tag_trim('shipto.shiptoname', SELF.shipto.shiptoname,  size = 35) %]
       </td>
     </tr>
 
@@ -34,8 +34,8 @@
       <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1,  size = 16) %]
-        [% L.input_tag('shipto.shiptodepartment_2', SELF.shipto.shiptodepartment_2,  size = 16) %]
+        [% L.input_tag_trim('shipto.shiptodepartment_1', SELF.shipto.shiptodepartment_1,  size = 16) %]
+        [% L.input_tag_trim('shipto.shiptodepartment_2', SELF.shipto.shiptodepartment_2,  size = 16) %]
       </td>
     </tr>
 
@@ -43,7 +43,7 @@
       <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptostreet', SELF.shipto.shiptostreet,  size = 35) %]
+        [% L.input_tag_trim('shipto.shiptostreet', SELF.shipto.shiptostreet,  size = 35) %]
 
         <span id="shipto_map"></span>
         <script type="text/javascript">
@@ -59,8 +59,8 @@
       <th align="right" nowrap>[% 'Zipcode' | $T8 %]/[% 'City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptozipcode', SELF.shipto.shiptozipcode,  size = 5) %]
-        [% L.input_tag('shipto.shiptocity', SELF.shipto.shiptocity,  size = 30) %]
+        [% L.input_tag_trim('shipto.shiptozipcode', SELF.shipto.shiptozipcode,  size = 5) %]
+        [% L.input_tag_trim('shipto.shiptocity', SELF.shipto.shiptocity,  size = 30) %]
       </td>
     </tr>
 
@@ -68,7 +68,7 @@
       <th align="right" nowrap>[% 'Country' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptocountry', SELF.shipto.shiptocountry,  size = 35) %]
+        [% L.input_tag_trim('shipto.shiptocountry', SELF.shipto.shiptocountry,  size = 35) %]
       </td>
     </tr>
 
@@ -76,7 +76,7 @@
       <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptogln', SELF.shipto.shiptogln,  size = 35) %]
+        [% L.input_tag_trim('shipto.shiptogln', SELF.shipto.shiptogln,  size = 35) %]
       </td>
     </tr>
 
@@ -84,7 +84,7 @@
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptocontact', SELF.shipto.shiptocontact,  size = 30) %]
+        [% L.input_tag_trim('shipto.shiptocontact', SELF.shipto.shiptocontact,  size = 30) %]
       </td>
     </tr>
 
@@ -92,7 +92,7 @@
       <th align="right" nowrap>[% 'Phone' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptophone', SELF.shipto.shiptophone,  size = 30) %]
+        [% L.input_tag_trim('shipto.shiptophone', SELF.shipto.shiptophone,  size = 30) %]
       </td>
     </tr>
 
@@ -100,7 +100,7 @@
       <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptofax', SELF.shipto.shiptofax,  size = 30) %]
+        [% L.input_tag_trim('shipto.shiptofax', SELF.shipto.shiptofax,  size = 30) %]
       </td>
     </tr>
 
@@ -108,7 +108,7 @@
       <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('shipto.shiptoemail', SELF.shipto.shiptoemail,  size = 45) %]
+        [% L.input_tag_trim('shipto.shiptoemail', SELF.shipto.shiptoemail,  size = 45) %]
       </td>
     </tr>
 
diff --git a/templates/webpages/customer_vendor/tabs/vcnotes.html b/templates/webpages/customer_vendor/tabs/vcnotes.html
index cf21b519d..f2cacaab2 100644
--- a/templates/webpages/customer_vendor/tabs/vcnotes.html
+++ b/templates/webpages/customer_vendor/tabs/vcnotes.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
+[%- USE LxERP %]
 
 <div id="vcnotes">
   [% IF ( SELF.notes && SELF.notes.size ) %]
@@ -41,7 +42,9 @@
             </td>
 
             <td>
-              [% row.follow_up.created_for_employee.safe_name | html %]
+              [% FOREACH employee = row.follow_up.created_for_employees -%]
+                [% employee.safe_name | html %][% IF !loop.last %]<br>[% END -%]
+              [% END %]
             </td>
 
             <td>
@@ -71,18 +74,25 @@
 
   <p>
     <table>
+      [% IF SELF.note_followup.done -%]
+      <tr class="fu_finished">
+        <td>[% 'Finished' | $T8 %]</td>
+        <td>[% 'by' | $T8 %] [% HTML.escape(SELF.note_followup.done.employee.safe_name) %]</td>
+        <td colspan="2">[% 'at' | $T8 %] [% HTML.escape(SELF.note_followup.done.done_at_as_timestamp_s) %]</td>
+      </tr>
+      [% END %]
       <tr>
         <td valign="right">[% 'Subject' | $T8 %]</td>
 
-        <td>
-          [% L.input_tag('note.subject', SELF.note.subject, size = 50) %]
+        <td colspan="3">
+          [% L.input_tag_trim('note.subject', SELF.note.subject, size = 50) %]
         </td>
       </tr>
 
       <tr>
         <td valign="right" align="top">[% 'Body' | $T8 %]</td>
 
-        <td align="top">
+        <td align="top" colspan="3">
           [% L.textarea_tag('note.body', SELF.note.body, cols = 50 rows = 10) %]
         </td>
       </tr>
@@ -90,24 +100,52 @@
       <tr>
         <td valign="right">[% 'Follow-Up On' | $T8 %]</td>
 
-        <td>
+        <td colspan="3">
           [% L.date_tag('note_followup.follow_up_date', SELF.note_followup.follow_up_date) %]
-          [% 'for' | $T8 %]
-          [% L.select_tag(
-               'note_followup.created_for_user',
-               SELF.all_employees,
-               default = SELF.note_followup.created_for_user,
-               title_key = 'safe_name'
-             )
-          %]
-        </td>
+        <td>
+      </tr>
+
+      <tr>
+        <td valign="right" align="top">[% 'for' | $T8 %]</td>
+<td valign="top">
+      <table>
+       <tr class="listheading">
+       <th>[% L.checkbox_tag('checkall_checkboxes', label='', id='ckeckall', checkall="[data-checkall=1]") %]</th>
+       <th>[% LxERP.t8('All users') %]</th>
+       </tr>
+
+       [% FOREACH employee = SELF.all_employees %]
+        [% SET checked = 0 %]
+        [% FOREACH cfe = SELF.note_followup.created_for_employees %]
+         [% IF cfe.id == employee.id %][% SET checked = 1 %][% LAST %][% END %]
+        [% END %]
+       <tr class="listrow">
+         <td>[% L.checkbox_tag('note_followup.created_for_employees[]', value=employee.id, checked=checked, "data-checkall"=1, class="employee_check") %]</td>
+         <td><label for='created_for_employees[]'>[% HTML.escape(employee.safe_name) %]</label><td>
+       </tr>
+        [% END %]
+      </table>
+     <td>
+     <td valign="top">
+      <table>
+       <tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('click on a group to add the group\'s users') %])</th></tr>
+        [% FOREACH auth_group = SELF.all_auth_groups %]
+         <tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
+          <td class="listrow1"><b>←&nbsp;[% auth_group.name %]</b>: [% auth_group.description %]</td>
+         </tr>
+         [% FOREACH employee = auth_group.get_employees %]
+          <tr class="listrow0"><td>&nbsp;&nbsp;&nbsp;[% employee.safe_name %]</td></tr>
+         [% END %]
+        [% END %]
+      </table>
+     </td>
       </tr>
 
       <tr>
         <td>&nbsp;</td>
 
         <td>
-          [% L.checkbox_tag('note_followup.done', checked = SELF.note_followup.done) %]
+          [% L.checkbox_tag('note_followup_done', checked = SELF.note_followup.done) %]
           <label for="note_followup_done">[% 'Follow-Up done' | $T8 %]</label>
         </td>
       </tr>
diff --git a/templates/webpages/customer_vendor/test_page.html b/templates/webpages/customer_vendor/test_page.html
index 198a64ce0..b9c3c3f3f 100644
--- a/templates/webpages/customer_vendor/test_page.html
+++ b/templates/webpages/customer_vendor/test_page.html
@@ -33,6 +33,12 @@ this one will be a reinit_widget after 4s:<br>
 this should have three '-' before and after touching:<br>
 ---[% P.customer_vendor.picker('vendor5_id', '', type='vendor') %]---
 
+<br><hr>
+widget including info button and link to edit<br>
+customer: <br>
+[% P.customer_vendor.picker('customer_id3', '', type='customer', id='foo', show_details=1) %]<br>
+vendor: <br>
+[% P.customer_vendor.picker('vendor_id3', '', type='vendor', show_details=1) %]<br>
 
 <script type='text/javascript'>
  $('#customer_id2').change(function() { $('#change1').html($('#customer_id2').val()) })
diff --git a/templates/webpages/customer_vendor_turnover/_list_open_items.html b/templates/webpages/customer_vendor_turnover/_list_open_items.html
index f7e8ef1ea..3fd1cc335 100644
--- a/templates/webpages/customer_vendor_turnover/_list_open_items.html
+++ b/templates/webpages/customer_vendor_turnover/_list_open_items.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [%- USE LxERP %]
-[%- USE L %]
+[%- USE P %]
 [%- USE HTML %]
 
 <div id="sales_report">
@@ -24,31 +24,26 @@
         [% IF FORM.db == 'customer' %]
           [% IF row.type == 'invoice' %]
             [% SET type = 'Invoice (one letter abbreviation)' %]
-            [% SET link = 'is.pl' %]
           [% ELSIF row.type == 'credit_note' %]
             [% SET type = 'Credit note (one letter abbreviation)' %]
-            [% SET link = 'is.pl' %]
           [% ELSE %]
             [% SET type = 'AR Transaction (abbreviation)' %]
-            [% SET link = 'ar.pl' %]
           [% END %]
         [% ELSE %]
           [% IF row.invoice %]
             [% SET type = 'Invoice (one letter abbreviation)' %]
-            [% SET link = 'ir.pl' %]
           [% ELSE %]
             [% SET type = 'AP Transaction (abbreviation)' %]
-            [% SET link = 'ap.pl' %]
           [% END %]
         [% END %]
         <tr class="listrow[% loop.count % 2 %]">
           <td>[% type | $T8 %]</td>
-          <td><a href="[% link %]?action=edit&id=[% row.id %]">[% row.invnumber | html %]</a></td>
+          <td>[% P.invoice.invoice(row) %]</td>
           <td>[% row.transdate.to_kivitendo | html %]</td>
           <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
           <td>[% row.duedate.to_kivitendo | html %]</td>
           <td class="numeric">[%- LxERP.format_amount(row.paid, 2) %]</td>
-          <td class="numeric">[%- LxERP.format_amount(row.amount - row.paid,2) %]
+          <td class="numeric">[%- LxERP.format_amount(row.amount - row.paid,2) %]</td>
           [% IF FORM.db == 'customer' %]
             <td>
             [%- IF row.dunning_config_id != '' %]
diff --git a/templates/webpages/customer_vendor_turnover/_list_open_orders.html b/templates/webpages/customer_vendor_turnover/_list_open_orders.html
index d15933ab5..e1d07a04b 100644
--- a/templates/webpages/customer_vendor_turnover/_list_open_orders.html
+++ b/templates/webpages/customer_vendor_turnover/_list_open_orders.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [%- USE LxERP %]
-[%- USE L %]
+[%- USE P %]
 [%- USE HTML %]
 
 <div id="orders_report">
@@ -18,25 +18,14 @@
 
       [%- FOREACH row = orders %]
       <tr class="listrow[% loop.count % 2 %]">
-        <td>[% IF row.quotation %]
-          [% IF FORM.db == 'customer' %][% 'Sales quotation' | $T8 %][% ELSE %][% 'RFQ' | $T8 %][% END %]</td>
-              [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-                <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>
-                    [% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-              [%- ELSE -%]
-                <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&vc=[% FORM.db %]&id=[% HTML.escape(row.oe_id) %]'>
-                    [% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-              [%- END -%]
-            [% ELSE %]
-            [% IF FORM.db == 'customer' %][% 'Sales Order' | $T8 %][% ELSE %][% 'Purchase Order' | $T8 %][% END %]</td>
-              [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-                <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>
-                    [% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-              [%- ELSE -%]
-                <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&vc=[% FORM.db %]&id=[% HTML.escape(row.oe_id) %]'>
-                    [% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-              [%- END -%]
-            [% END %]
+        <td>
+          [%- IF row.quotation -%]
+            [% IF FORM.db == 'customer' %][% 'Sales quotation' | $T8 %][% ELSE %][% 'RFQ' | $T8 %][% END %]
+          [%- ELSE -%]
+            [% IF FORM.db == 'customer' %][% 'Sales Order' | $T8 %][% ELSE %][% 'Purchase Order' | $T8 %][% END %]
+          [%- END -%]
+        </td>
+        <td>[% IF row.id %][% P.order.order(row) %][% END %]</td>
         <td>[% row.transdate.to_kivitendo | html %]</td>
         <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
         <td>[% row.employee.name | html %]</td>
diff --git a/templates/webpages/customer_vendor_turnover/_statistic_tabs.html b/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
index b6fdac402..4709998e0 100644
--- a/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
+++ b/templates/webpages/customer_vendor_turnover/_statistic_tabs.html
@@ -9,16 +9,14 @@
 </script>
 <div class="tabwidget" id="statistic_tabs">
   <ul>
-    <li><a href="#turnover_stat">[% 'Turnoverstatistic' | $T8 %]</a></li>
     [% IF FORM.db == "customer" %]<li><a href="#dun_stat">[% 'Dunningstatistic' | $T8 %]</a></li>[% END %]
-    <li><a href="#quotations" onclick="kivi.CustomerVendorTurnover.get_sales_quotations();">[% IF FORM.db == "customer" %][% 'Sales Quotations' | $T8 %][% ELSE %][% 'Request Quotations' | $T8 %][% END %]</a></li>
+    <li><a href="#quotations">[% IF FORM.db == "customer" %][% 'Sales Quotations' | $T8 %][% ELSE %][% 'Request Quotations' | $T8 %][% END %]</a></li>
     <li><a href="#orders" onclick="kivi.CustomerVendorTurnover.get_orders();">[% 'Orders' | $T8 %]</a></li>
     <li><a href="#invoices" onclick="kivi.CustomerVendorTurnover.get_invoices();">[% 'Invoices' | $T8 %]</a></li>
     <li><a href="#mails" onclick="kivi.CustomerVendorTurnover.get_mails();">[% 'Mails' | $T8 %]</a></li>
     <li><a href="#letters" onclick="kivi.CustomerVendorTurnover.get_letters();">[% 'Letters' | $T8 %]</a></li>
   </ul>
-  <div id="turnover_stat">[% PROCESS "customer_vendor_turnover/turnover_statistic.html" %]</div>
-  <div id="dun_stat">[% PROCESS "customer_vendor_turnover/dun_statistic.html" %]</div>
+  [% IF FORM.db == "customer" %]<div id="dun_stat">[% PROCESS "customer_vendor_turnover/dun_statistic.html" %]</div>[% END %]
   <div id="quotations"></div>
   <div id="orders"></div>
   <div id="invoices"></div>
diff --git a/templates/webpages/customer_vendor_turnover/email_statistic.html b/templates/webpages/customer_vendor_turnover/email_statistic.html
index ba608998f..3107c3793 100644
--- a/templates/webpages/customer_vendor_turnover/email_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/email_statistic.html
@@ -4,7 +4,7 @@
 [%- USE HTML %]
 [%- USE Dumper %]
 
-<div id="invoice_statistic">
+<div id="email_statistic">
   <table width="100%">
     <tbody>
       <tr>
@@ -33,8 +33,4 @@
       [% END %]
     </tbody>
   </table>
-
-
-    </tbody>
-  </table>
 </div>
diff --git a/templates/webpages/customer_vendor_turnover/invoices_statistic.html b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
index 8d6e61bbd..2f8dfc2b0 100644
--- a/templates/webpages/customer_vendor_turnover/invoices_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/invoices_statistic.html
@@ -48,8 +48,4 @@
       [% END %]
     </tbody>
   </table>
-
-
-    </tbody>
-  </table>
 </div>
diff --git a/templates/webpages/customer_vendor_turnover/letter_statistic.html b/templates/webpages/customer_vendor_turnover/letter_statistic.html
index c320884b7..6d4e6ee0f 100644
--- a/templates/webpages/customer_vendor_turnover/letter_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/letter_statistic.html
@@ -4,7 +4,7 @@
 [%- USE HTML %]
 [%- USE Dumper %]
 
-<div id="invoice_statistic">
+<div id="letter_statistic">
   <table width="100%">
     <tbody>
       <tr>
@@ -39,8 +39,4 @@
       [% END %]
     </tbody>
   </table>
-
-
-    </tbody>
-  </table>
 </div>
diff --git a/templates/webpages/customer_vendor_turnover/order_statistic.html b/templates/webpages/customer_vendor_turnover/order_statistic.html
index c295699b9..a2c86fc38 100644
--- a/templates/webpages/customer_vendor_turnover/order_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/order_statistic.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
-<div id="invoice_statistic">
+<div id="order_statistic">
   <table width="100%">
     <tbody>
       <tr>
@@ -15,11 +15,7 @@
 
       [%- FOREACH row = orders %]
       <tr class="listrow[% loop.count % 2 %]">
-        [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-          <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-        [%- ELSE -%]
-          <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&vc=[% FORM.db %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-        [%- END -%]
+        <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_order[% ELSE %]purchase_order[% END %]&id=[% HTML.escape(row.id) %]'>[% END %][% HTML.escape(row.ordnumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
         <td>[% row.transdate.to_kivitendo | html %]</td>
         <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
         <td>[% row.reqdate.to_kivitendo | html %]</td>
@@ -28,8 +24,4 @@
       [% END %]
     </tbody>
   </table>
-
-
-    </tbody>
-  </table>
 </div>
diff --git a/templates/webpages/customer_vendor_turnover/quotation_statistic.html b/templates/webpages/customer_vendor_turnover/quotation_statistic.html
index 02b808d02..69b1a281a 100644
--- a/templates/webpages/customer_vendor_turnover/quotation_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/quotation_statistic.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
-<div id="invoice_statistic">
+<div id="quotation_statistic">
   <table width="100%">
     <tbody>
       <tr>
@@ -15,13 +15,8 @@
 
       [%- FOREACH row = orders %]
       <tr class="listrow[% loop.count % 2 %]">
-        [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-          <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>
+        <td>[% IF row.id %]<a href='controller.pl?action=Order/edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&id=[% HTML.escape(row.id) %]'>
               [% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-        [%- ELSE -%]
-          <td>[% IF row.id %]<a href='oe.pl?action=edit&type=[% IF FORM.db == "customer" %]sales_quotation[% ELSE %]request_quotation[% END %]&vc=[% FORM.db %]&id=[% HTML.escape(row.id) %]'>
-              [% END %][% HTML.escape(row.quonumber)   || '&nbsp;' %][% IF row.id %]</a>[% END %]</td>
-        [%- END -%]
         <td>[% row.transdate.to_kivitendo | html %]</td>
         <td class="numeric">[%- LxERP.format_amount(row.amount, 2) %]</td>
         <td>[% row.reqdate.to_kivitendo | html %]</td>
@@ -30,8 +25,4 @@
       [% END %]
     </tbody>
   </table>
-
-
-    </tbody>
-  </table>
 </div>
diff --git a/templates/webpages/customer_vendor_turnover/turnover_statistic.html b/templates/webpages/customer_vendor_turnover/turnover_statistic.html
index 390835896..ed7c6ec73 100644
--- a/templates/webpages/customer_vendor_turnover/turnover_statistic.html
+++ b/templates/webpages/customer_vendor_turnover/turnover_statistic.html
@@ -2,9 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
-<p>
-[% L.radio_button_tag('period', value='year', label= LxERP.t8('Year'), onclick='kivi.CustomerVendorTurnover.show_turnover_stat("y");') %]
-
-[% L.radio_button_tag('period', value='month', label= LxERP.t8('Month'), onclick='kivi.CustomerVendorTurnover.show_turnover_stat("m");') %]
-</p>
+<div class="chart-container" id="turnovers_chart_container" style="position: relative;">
+  [%- LxERP.t8("Loading...") %]
+</div>
 <div id="turnovers"></div>
diff --git a/templates/webpages/datev/export_bewegungsdaten.html b/templates/webpages/datev/export_bewegungsdaten.html
index 80f6c3a51..979bfe52e 100644
--- a/templates/webpages/datev/export_bewegungsdaten.html
+++ b/templates/webpages/datev/export_bewegungsdaten.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [%- USE L %]
-<h1>[% 'DATEX - Export Assistent' | $T8 %]</h1>
+<h1>[% 'DATEV - Export Assistent' | $T8 %]</h1>
 
 <form method="post" action="[% script %]" id="form">
 
@@ -113,6 +113,17 @@
            <td align=left></td>
            <td colspan="3">[% L.yes_no_tag('imported', 0) %]</td>
         </tr>
+         <tr>
+           <td align=left>[% 'Export Documents' | $T8 %]</td>
+           <td align=left></td>
+          [% IF show_documents_option %]
+           <td colspan="3">[% L.yes_no_tag('documents', 0, disabled => 0) %]</td>
+          [% ELSE %]
+           <td>[% L.yes_no_tag('documents', 0, disabled => 1) %] </td>
+           <td colspan="2"><font color="gray">[% 'Hint: DMS Feature has to be activated' | $T8 %]</font></td>
+          [% END %]
+        </tr>
+
         </table>
      </td>
    </tr>
diff --git a/templates/webpages/dbupgrade/add_file_version_form.html b/templates/webpages/dbupgrade/add_file_version_form.html
new file mode 100644
index 000000000..e173b349a
--- /dev/null
+++ b/templates/webpages/dbupgrade/add_file_version_form.html
@@ -0,0 +1,29 @@
+[%- USE T8 %]
+[%- USE P %]
+[%- USE LxERP %]
+[%- USE HTML %]
+
+<h1>[% 'Missing Files' | $T8 %]</h1>
+<form name="Form" method="post" action="login.pl">
+  <input type="hidden" name="action" value="login">
+
+  [% 'Please resolve the errors by deleting the invalid database entries or by adding the corresponding files to the expected paths.' | $T8 %]
+  <table border="1" style="border-collapse: collapse">
+    <thead><tr>
+      <th>[% 'Error Message' | $T8 %]</th>
+    </tr></thead>
+    <tbody>
+      [% FOREACH error = ERRORS %]
+      <tr><td>
+        [% error | html %]
+      </td></tr>
+      [% END %]
+    </tbody>
+  </table>
+  [% P.checkbox_tag(
+    "delete_file_entries_of_missing_files", value=1,
+    label=LxERP.t8("Automatically delete entries for missing files. Ensure that these files are no longer required!")
+  ) %]
+  <br>
+  [% P.submit_tag("rerun_add_file_version", LxERP.t8("Rerun update")) %]
+</form>
diff --git a/templates/webpages/delivery_order/form.html b/templates/webpages/delivery_order/form.html
index d7facc244..f5666a23e 100644
--- a/templates/webpages/delivery_order/form.html
+++ b/templates/webpages/delivery_order/form.html
@@ -2,6 +2,10 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
 <h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
 
 <div id="print_options" style="display:none">
@@ -19,13 +23,26 @@
   [% L.hidden_tag('callback',             FORM.callback) %]
   [% L.hidden_tag('type',                 FORM.type) %]
   [% L.hidden_tag('id',                   SELF.order.id) %]
-  [% L.hidden_tag('converted_from_oe_id', SELF.converted_from_oe_id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.order.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.order.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
 
   [%- INCLUDE 'common/flash.html' %]
 
   <div class="tabwidget" id="order_tabs">
     <ul>
       <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
       <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
diff --git a/templates/webpages/delivery_order/stock_dialog.html b/templates/webpages/delivery_order/stock_dialog.html
index f4935cf4f..0090efb05 100644
--- a/templates/webpages/delivery_order/stock_dialog.html
+++ b/templates/webpages/delivery_order/stock_dialog.html
@@ -2,10 +2,8 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
- [%- IF delivered %]
- [%- SET RO = ' readonly' %]
- [%- END %]
 
+<form>
  <table>
   <tr>
    <td>[% 'Part Number' | $T8 %]</td>
@@ -21,80 +19,47 @@
   </tr>
  </table>
 
-  [%- UNLESS WHCONTENTS.size %]
-  <p>[% 'There are no items in stock.' | $T8 %]</p>
-  [%- ELSE %]
+ [% L.hidden_tag("in_out", in_out) %]
+ [% L.hidden_tag("parts_id", part.id) %]
+ [% L.hidden_tag("do_qty", do_qty) %]
+ [% L.hidden_tag("do_unit", do_unit) %]
+ [% L.hidden_tag("row", row, class="data-row") %]
+ [% L.hidden_tag("item_id", item_id) %]
 
-  [% L.hidden_tag("in_out", in_out) %]
-  [% L.hidden_tag("parts_id", parts_id) %]
-  [% L.hidden_tag("do_qty", do_qty) %]
-  [% L.hidden_tag("do_unit", do_unit) %]
-  [% L.hidden_tag("row", row, class="data-row") %]
-  [% L.hidden_tag("item_id", item_id) %]
+ [%- IF delivered %]
+  [% PROCESS "delivery_order/stock_dialog/_stock_delivered_dialog.html" %]
+ [%- ELSE %]
 
+  [%- IF in_out == "in" %]
   <p>
-   <table id="stock-in-out-table">
-    <tr class="listheading">
-     <th>&nbsp;</th>
-     <th>[% 'Warehouse' | $T8 %]</th>
-     <th>[% 'Bin' | $T8 %]</th>
-     <th>[% 'Charge Number' | $T8 %]</th>
-     [% IF INSTANCE_CONF.get_show_bestbefore %]
-     <th>[% 'Best Before' | $T8 %]</th>
-     [% END %]
-     [%- UNLESS delivered %]
-     <th align="right">[% 'Available qty' | $T8 %]</th>
-     [%- END %]
-     <th align="right">[% 'Qty' | $T8 %]</th>
-     <th align="right">[% 'Unit' | $T8 %]</th>
-    </tr>
-
-    [%- FOREACH row = WHCONTENTS %]
-    <tr [% IF row.stock_error %] class="error"[% ELSE %]class="listrow"[% END %]>
-     <td>[% loop.count %]</td>
-     <td>[% row.warehousedescription | html %]</td>
-     <td>[% row.bindescription | html %]</td>
-     <td>[% row.chargenumber | html %]</td>
-     [% IF INSTANCE_CONF.get_show_bestbefore %]
-     <td>[% row.bestbefore | html %]</td>
-     [% END %]
-
-     [%- IF delivered %]
-
-     <td>[% LxERP.format_amount(row.stock_qty) | html %]</td>
-     <td>
-      [% row.stock_unit | html %]
-      [% L.hidden_tag("unit", row.stock_unit, class="data-unit") %]
-     </td>
-
-     [%- ELSE %]
-
-     <td>[% row.available_qty | html %]</td>
-     <td>
-      [% L.input_tag("qty", row.stock_qty                              ? LxERP.format_amount(row.stock_qty)
-                          : (WHCONTENTS.size == 1) && (!row.stock_qty) ? LxERP.format_amount(do_qty)
-                          : "", class="numeric data-qty", size="12") %]</td>
-     <td>[% L.select_tag("unit_" _ loop.count, part.unit_obj.convertible_units, value_key="name", default=row.stock_unit, class="data-unit") %]</td>
-
-     [%- END %]
-     <td style="display:none">
-      [% L.hidden_tag("warehouse_id", row.warehouse_id, class="data-warehouse-id") %]
-      [% L.hidden_tag("bin_id", row.bin_id, class="data-bin-id") %]
-      [% L.hidden_tag("chargenumber", row.chargenumber, class="data-chargenumber") %]
-      [% L.hidden_tag("delivery_order_items_stock_id", row.delivery_order_items_stock_id, class="data-stock-id") %]
-      [% L.hidden_tag("bestbefore", row.bestbefore, class="data-bestbefore") IF INSTANCE_CONF.get_show_bestbefore %]
-     </td>
-    </tr>
+   <table id="stock-info-table">
+    [%- PROCESS "delivery_order/stock_dialog/_stock_info_table.html" %]
+   </table>
+  </p>
+  [%- END %]
 
+  <p>
+   <table id="stock-in-out-table">
+    [%- IF in_out == "in" %]
+     [%- PROCESS "delivery_order/stock_dialog/_stock_in_table.html" %]
+    [%- ELSE %]
+     [%- PROCESS "delivery_order/stock_dialog/_stock_out_table.html" %]
     [%- END %]
    </table>
   </p>
 
+  [%- IF in_out == "in" %]
+  [% L.button_tag('kivi.DeliveryOrder.add_stock_in_line_to_dialog()', LxERP.t8('+')) %]
+  [%- END %]
+
   <hr size="3" noshade>
 
-  <p>[% L.button_tag('kivi.DeliveryOrder.save_updated_stock()', LxERP.t8('Save')) IF !delivered %]</p>
+  <p>
+    [% L.button_tag('kivi.DeliveryOrder.save_updated_stock(true)', LxERP.t8('Save and Close')) %]
+    [%- IF next_button %]
+      [% L.button_tag("kivi.DeliveryOrder.next_stock_in_out_dialog($row_ui_id)", LxERP.t8('Save and Next')) %]
+    [%- END %]
+  </p>
 
   [%- END %]
  </form>
-
-
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html b/templates/webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html
new file mode 100644
index 000000000..54281173b
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_delivered_dialog.html
@@ -0,0 +1,52 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+[%- UNLESS STOCK_INFO.size %]
+<p>[% 'There are no items in stock.' | $T8 %]</p>
+[%- ELSE %]
+
+<p>
+ <table id="stock-in-out-table">
+  <tr class="listheading">
+   <th>&nbsp;</th>
+   <th>[% 'Warehouse' | $T8 %]</th>
+   <th>[% 'Bin' | $T8 %]</th>
+   <th>[% 'Charge Number' | $T8 %]</th>
+   [% IF INSTANCE_CONF.get_show_bestbefore %]
+   <th>[% 'Best Before' | $T8 %]</th>
+   [% END %]
+   <th align="right">[% 'Qty' | $T8 %]</th>
+   <th align="right">[% 'Unit' | $T8 %]</th>
+  </tr>
+
+  [%- FOREACH row = STOCK_INFO %]
+  <tr [% IF row.stock_error %] class="error"[% ELSE %]class="listrow"[% END %]>
+   <td>[% loop.count %]</td>
+   <td>[% row.warehousedescription | html %]</td>
+   <td>[% row.bindescription | html %]</td>
+   <td>[% row.chargenumber | html %]</td>
+   [% IF INSTANCE_CONF.get_show_bestbefore %]
+   <td>[% row.bestbefore | html %]</td>
+   [% END %]
+
+   <td>[% LxERP.format_amount(row.stock_qty) | html %]</td>
+   <td>
+    [% row.stock_unit | html %]
+    [% L.hidden_tag("unit", row.stock_unit, class="data-unit") %]
+   </td>
+
+   <td style="display:none">
+    [% L.hidden_tag("warehouse_id", row.warehouse_id, class="data-warehouse-id") %]
+    [% L.hidden_tag("bin_id", row.bin_id, class="data-bin-id") %]
+    [% L.hidden_tag("chargenumber", row.chargenumber, class="data-chargenumber") %]
+    [% L.hidden_tag("delivery_order_items_stock_id", row.delivery_order_items_stock_id, class="data-stock-id") %]
+    [% L.hidden_tag("bestbefore", row.bestbefore, class="data-bestbefore") IF INSTANCE_CONF.get_show_bestbefore %]
+   </td>
+  </tr>
+  [%- END %]
+ </table>
+</p>
+<hr size="3" noshade>
+[%- END %]
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_in_new_row.html b/templates/webpages/delivery_order/stock_dialog/_stock_in_new_row.html
new file mode 100644
index 000000000..bbcfb6d71
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_in_new_row.html
@@ -0,0 +1,33 @@
+[%- USE L %]
+[%- USE LxERP %]
+[% # L.dump( PART ) %] [% # L.dump( pos ) %] [% # L.dump( remaining_qty ) %]
+<tr class="listrow data-row" >
+ [% L.multi_level_select_tag(
+      "new_wh_bin_" _ pos, WAREHOUSES, 2, surround_tag="td",
+      level_1={
+        name="warehouse_id",
+        value_key="id",
+        title_key="description",
+        default=PART.warehouse_id,
+        class="data-warehouse-id",
+      },
+      level_2={
+        object_key="bins",
+        name="bin_id",
+        value_key="id",
+        title_key="description",
+        default=PART.bin_id,
+        class="data-bin-id",
+      },
+    ) %]
+
+ <td>[% L.input_tag("chargenumber", "", class="numeric data-chargenumber", size="12") %]</td>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% L.date_tag('bestbefore', "", class="data-bestbefore") %]</td>
+ [%- END %]
+ <td>[% L.input_tag("qty", LxERP.format_amount(remaining_qty) , class="numeric data-qty", size="12") %]</td>
+ <td>[% L.select_tag("unit", PART.unit_obj.convertible_units, value_key="name", default=PART.unit, class="data-unit") %]</td>
+ <td style="display:none">
+  [% L.hidden_tag("delivery_order_items_stock_id", '', class="data-stock-id") %]
+ </td>
+</tr>
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_in_row.html b/templates/webpages/delivery_order/stock_dialog/_stock_in_row.html
new file mode 100644
index 000000000..088e4df83
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_in_row.html
@@ -0,0 +1,34 @@
+[%- USE L %]
+[%- USE LxERP %]
+[% # L.dump( PART ) %] [% # L.dump( pos ) %] [% # L.dump( ROW ) %]
+<tr class="listrow data-row" >
+ [% L.multi_level_select_tag(
+      # name has to be unique
+      "wh_bin_" _ pos, WAREHOUSES, 2, surround_tag="td",
+      level_1={
+        name="warehouse_id",
+        value_key="id",
+        title_key="description",
+        default=ROW.warehouse_id,
+        class="data-warehouse-id",
+      },
+      level_2={
+        object_key="bins",
+        name="bin_id",
+        value_key="id",
+        title_key="description",
+        default=ROW.bin_id,
+        class="data-bin-id",
+      },
+    ) %]
+
+ <td>[% L.input_tag("chargenumber", ROW.chargenumber, class="numeric data-chargenumber", size="12") %]</td>
+ [%- IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% L.date_tag("bestbefore", ROW.bestbefore, class="data-bestbefore") %]</td>
+ [%- END %]
+ <td>[% L.input_tag("qty", LxERP.format_amount(ROW.qty), class="numeric data-qty", size="12") %]</td>
+ <td>[% L.select_tag("unit", PART.unit_obj.convertible_units, value_key="name", default=ROW.stock_unit, class="data-unit") %]</td>
+ <td style="display:none">
+  [% L.hidden_tag("delivery_order_items_stock_id", ROW.delivery_order_items_stock_id, class="data-stock-id") %]
+ </td>
+</tr>
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_in_table.html b/templates/webpages/delivery_order/stock_dialog/_stock_in_table.html
new file mode 100644
index 000000000..82d593fdb
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_in_table.html
@@ -0,0 +1,19 @@
+[% USE T8 %]
+<tr class="listheading">
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [% END %]
+ <th align="right">[% 'Qty' | $T8 %]</th>
+ <th align="right">[% 'Unit' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = STOCK_INFO %]
+[%- PROCESS delivery_order/stock_dialog/_stock_in_row.html PART=part ROW=row pos=loop.count %]
+[%- END %]
+
+[%- UNLESS STOCK_INFO.size %]
+[%- PROCESS delivery_order/stock_dialog/_stock_in_new_row.html PART=part remaining_qty=do_qty pos=0 %]
+[% END %]
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_info_table.html b/templates/webpages/delivery_order/stock_dialog/_stock_info_table.html
new file mode 100644
index 000000000..bdab3f9c2
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_info_table.html
@@ -0,0 +1,28 @@
+[% USE T8 %]
+<tr class="listheading">
+ <th>&nbsp;</th>
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [% END %]
+ <th align="right">[% 'Available qty' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = WHCONTENTS %]
+<tr [% IF row.stock_error %] class="error" [% END %]>
+ <td>[% loop.count %]</td>
+ <td>[% row.warehousedescription | html %]</td>
+ <td>[% row.bindescription | html %]</td>
+ <td>[% row.chargenumber | html %]</td>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% row.bestbefore | html %]</td>
+ [% END %]
+
+ <td>[% row.available_qty | html %]</td>
+ <td>
+  [% row.stock_unit | html %]
+ </td>
+</tr>
+[%- END %]
diff --git a/templates/webpages/delivery_order/stock_dialog/_stock_out_table.html b/templates/webpages/delivery_order/stock_dialog/_stock_out_table.html
new file mode 100644
index 000000000..a06407c9a
--- /dev/null
+++ b/templates/webpages/delivery_order/stock_dialog/_stock_out_table.html
@@ -0,0 +1,44 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+<tr class="listheading">
+ <th>&nbsp;</th>
+ <th>[% 'Warehouse' | $T8 %]</th>
+ <th>[% 'Bin' | $T8 %]</th>
+ <th>[% 'Charge Number' | $T8 %]</th>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <th>[% 'Best Before' | $T8 %]</th>
+ [% END %]
+ <th align="right">[% 'Available qty' | $T8 %]</th>
+ <th align="right">[% 'Qty' | $T8 %]</th>
+ <th align="right">[% 'Unit' | $T8 %]</th>
+</tr>
+
+[%- FOREACH row = WHCONTENTS %]
+<tr [% IF row.stock_error %] class="error"[% ELSE %]class="listrow data-row"[% END %]>
+ <td>[% loop.count %]</td>
+ <td>[% row.warehousedescription | html %]</td>
+ <td>[% row.bindescription | html %]</td>
+ <td>[% row.chargenumber | html %]</td>
+ [% IF INSTANCE_CONF.get_show_bestbefore %]
+ <td>[% row.bestbefore | html %]</td>
+ [% END %]
+
+ <td>[% row.available_qty | html %]</td>
+ <td>
+  [% L.input_tag("qty", row.stock_qty                              ? LxERP.format_amount(row.stock_qty)
+                      : (WHCONTENTS.size == 1) && (!row.stock_qty) ? LxERP.format_amount(do_qty)
+                      : "", class="numeric data-qty", size="12") %]</td>
+ <td>[% L.select_tag("unit_" _ loop.count, part.unit_obj.convertible_units, value_key="name", default=row.stock_unit, class="data-unit") %]</td>
+
+ <td style="display:none">
+  [% L.hidden_tag("warehouse_id", row.warehouse_id, class="data-warehouse-id") %]
+  [% L.hidden_tag("bin_id", row.bin_id, class="data-bin-id") %]
+  [% L.hidden_tag("chargenumber", row.chargenumber, class="data-chargenumber") %]
+  [% L.hidden_tag("delivery_order_items_stock_id", row.delivery_order_items_stock_id, class="data-stock-id") %]
+  [% L.hidden_tag("bestbefore", row.bestbefore, class="data-bestbefore") IF INSTANCE_CONF.get_show_bestbefore %]
+ </td>
+</tr>
+[%- END %]
diff --git a/templates/webpages/delivery_order/tabs/_item_input.html b/templates/webpages/delivery_order/tabs/_item_input.html
index ab62bd925..f068104bb 100644
--- a/templates/webpages/delivery_order/tabs/_item_input.html
+++ b/templates/webpages/delivery_order/tabs/_item_input.html
@@ -16,9 +16,7 @@
       <tr valign="top" class="listrow">
         <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
           [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ]] %]
-          [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
-            [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
-          [%- END %]
+          [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
           [% L.select_tag('add_item.create_part_type', type_options) %]
           [% L.button_tag('kivi.DeliveryOrder.create_part()', LxERP.t8('+')) %]
         </td>
diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index 82422ef16..50bb01e04 100644
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -15,10 +15,24 @@
                      alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %]
       [%- END %]
       [% L.hidden_tag("orderitem_ids[+]", ID) %]
-      [% L.hidden_tag("converted_from_orderitems_ids[+]", ITEM.converted_from_orderitems_id) %]
+      [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+      [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
       [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
       [% L.hidden_tag("order.orderitems[].stock_info", ITEM.stock_info, class="data-stock-info") %]
       [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
+      [% L.hidden_tag("order.orderitems[].sellprice", ITEM.sellprice) %]
+      [% L.hidden_tag("order.orderitems[].discount", ITEM.discount) %]
+      [% L.hidden_tag("order.orderitems[].ordnumber", ITEM.ordnumber) %]
+      [% L.hidden_tag("order.orderitems[].transdate", ITEM.transdate) %]
+      [% L.hidden_tag("order.orderitems[].cusordnumber", ITEM.cusordnumber) %]
+      [% L.hidden_tag("order.orderitems[].base_qty", ITEM.base_qty) %]
+      [% L.hidden_tag("order.orderitems[].lastcost", ITEM.lastcost) %]
+      [% L.hidden_tag("order.orderitems[].price_factor_id", ITEM.price_factor_id) %]
+      [% L.hidden_tag("order.orderitems[].price_factor", ITEM.price_factor) %]
+      [% L.hidden_tag("order.orderitems[].marge_price_factor", ITEM.marge_price_factor) %]
+      [% L.hidden_tag("order.orderitems[].pricegroup_id", ITEM.pricegroup_id) %]
+      [% L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
+      [% L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
     </td>
     <td>
       <div name="position" class="numeric">
diff --git a/templates/webpages/delivery_order/tabs/_second_row.html b/templates/webpages/delivery_order/tabs/_second_row.html
index 6b140ac9c..df0f15523 100644
--- a/templates/webpages/delivery_order/tabs/_second_row.html
+++ b/templates/webpages/delivery_order/tabs/_second_row.html
@@ -6,10 +6,8 @@
 
 <table>
   <tr><td colspan="100%">
-    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
-      <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
-      [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]&nbsp;
-    [%- END %]
+    <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+    [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15 "data-validate"="trimmed_whitespaces") %]&nbsp;
     <b>[%- 'Project' | $T8 %]</b>&nbsp;
     [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
     [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
diff --git a/templates/webpages/delivery_order/tabs/basic_data.html b/templates/webpages/delivery_order/tabs/basic_data.html
index f4c052bfc..698a07868 100644
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -15,8 +15,8 @@
             <th align="right">[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
             [% SET cv_id = SELF.cv _ '_id' %]
             <td>
-              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]
-              [% P.button_tag("kivi.DeliveryOrder.show_vc_details_dialog()", LxERP.t8("Details (one letter abbreviation)")) %]
+              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px',
+                   show_details="1") %]
             </td>
           </tr>
 
@@ -129,6 +129,24 @@
             <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
           </tr>
 
+          [%- IF SELF.type == 'purchase_delivery_order' %]
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Order Confirmation Number' | $T8 %]</th>
+            [%-
+              numbers = [];
+              FOREACH p = SELF.order.preceding_purchase_order_confirmations();
+                numbers.push(HTML.escape(p.ordnumber));
+              END;
+            %]
+            <td>[% numbers.join(', ') %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Vendor Confirmation Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.vendor_confirmation_number', SELF.order.vendor_confirmation_number, size = 11) %]</td>
+          </tr>
+          [%- END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% IF SELF.type_data.properties('is_customer') %][% 'Customer Order Number' | $T8 %][% ELSE %][% 'Vendor Order Number' | $T8 %][% END %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
@@ -273,7 +291,9 @@
 
   </table>
 
+  [% L.hidden_tag('order.currency_id', SELF.order.currency_id) %]
   [% L.hidden_tag('order.taxzone_id', SELF.order.taxzone_id) %]
+  [% L.hidden_tag('order.taxincluded', SELF.order.taxincluded) %]
 
 </div>
 
diff --git a/templates/webpages/delivery_plan/_filter.html b/templates/webpages/delivery_plan/_filter.html
index 87a94183c..f11a72c18 100644
--- a/templates/webpages/delivery_plan/_filter.html
+++ b/templates/webpages/delivery_plan/_filter.html
@@ -34,6 +34,10 @@
    <th align="right">[% 'Delivery Date' | $T8 %] [% 'To Date' | $T8 %]</th>
    <td>[% L.date_tag('filter.reqdate:date::le', filter.reqdate_date__le) %]</td>
   </tr>
+  <tr>
+   <th align="right">[% 'Assembly Item Number' | $T8 %]</th>
+   <td>[% L.input_tag('assembly_item_number', SELF.assembly_item_number, size = 20) %]</td>
+  </tr>
   <tr>
    <th align="right">[% 'Quantity' | $T8 %]</th>
    <td>[% L.input_tag('filter.qty:number', filter.qty_number, size = 20) %]</td>
@@ -92,9 +96,7 @@
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part,     value='part',     label=LxERP.t8('Part')) %]
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service,  value='service',  label=LxERP.t8('Service')) %]
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
-     [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
-       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
-     [% END %]
+     [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
    </td>
   </tr>
  </table>
diff --git a/templates/webpages/delivery_term/form.html b/templates/webpages/delivery_term/form.html
index 3049617c2..95d4a29f3 100755
--- a/templates/webpages/delivery_term/form.html
+++ b/templates/webpages/delivery_term/form.html
@@ -28,6 +28,16 @@
      </td>
     </tr>
    [%- END %]
+
+   <tr>
+    <td>[% 'Obsolete' | $T8 %]</td>
+    <td>[% L.checkbox_tag('delivery_term.obsolete', checked=SELF.delivery_term.obsolete, for_submit=1) %]</td>
+   </tr>
+
+   <tr>
+    <td>[% "Delete for customers & vendors" | $T8 %]</td>
+    <td>[% L.checkbox_tag("remove_customer_vendor_delivery_terms", checked=remove_customer_vendor_delivery_terms, for_submit=1, label=LxERP.t8("This will also remove these delivery terms for all customers & vendors.")) %]</td>
+   </tr>
   </table>
 
   [% P.hidden_tag("id", SELF.delivery_term.id) %]
diff --git a/templates/webpages/delivery_term/list.html b/templates/webpages/delivery_term/list.html
index 6877e921d..1f6e37c15 100644
--- a/templates/webpages/delivery_term/list.html
+++ b/templates/webpages/delivery_term/list.html
@@ -16,6 +16,7 @@
      <th align="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
      <th>[%- 'Description' | $T8 %]</th>
      <th>[%- 'Long Description' | $T8 %]</th>
+     <th>[%- 'Obsolete' | $T8 %]</th>
     </tr>
     </thead>
 
@@ -29,6 +30,7 @@
       </a>
      </td>
      <td>[%- HTML.escape(delivery_term.description_long) %]</td>
+     <td>[% IF delivery_term.obsolete %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
     </tr>
     [%- END %]
     </tbody>
diff --git a/templates/webpages/delivery_value_report/_filter.html b/templates/webpages/delivery_value_report/_filter.html
index c94135f40..8fecf3b37 100644
--- a/templates/webpages/delivery_value_report/_filter.html
+++ b/templates/webpages/delivery_value_report/_filter.html
@@ -90,9 +90,7 @@
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part,     value='part',     label=LxERP.t8('Part')) %]
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service,  value='service',  label=LxERP.t8('Service')) %]
      [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
-     [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
-       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
-     [% END %]
+     [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
    </td>
   </tr>
  </table>
diff --git a/templates/webpages/disposition_manager/_show_vendor_parts.html b/templates/webpages/disposition_manager/_show_vendor_parts.html
new file mode 100644
index 000000000..ba81423df
--- /dev/null
+++ b/templates/webpages/disposition_manager/_show_vendor_parts.html
@@ -0,0 +1,49 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+[%- USE P -%]
+
+<h2>[% 'All parts of vendor odered by onhand' | $T8 %]</h2>
+<table width="100%">
+    <thead>
+     <tr class="listheading">
+       <th>[% 'Purchase basket' | $T8 %] </th>
+       <th>[% 'Partnumber'      | $T8 %] </th>
+       <th>[% 'Description'     | $T8 %] </th>
+       <th>[% 'Onhand'          | $T8 %] </th>
+       <th>[% 'Ordered purchase'| $T8 %] </th>
+       <th>[% 'Rop'             | $T8 %] </th>
+       <th>[% 'Order quantity'  | $T8 %] </th>
+       <th>[% 'Vendor'          | $T8 %] </th>
+     </tr>
+    </thead>
+    <tbody>
+    [% FOREACH makemodel_item = MAKEMODEL_ITEMS %]
+
+      <tr class="listrow">
+        <td>[% L.checkbox_tag('vendor_part_ids[+]',
+                 checked='0', value=makemodel_item.id) %]</td>
+        <td>[% makemodel_item.presenter.part(target = '_blank') %]
+          [% P.button_tag(
+               "kivi.DispositionManager.show_detail_dialog("
+                 _  makemodel_item.id _ "," _ makemodel_item.partnumber _
+               ")",
+               LxERP.t8('Details (one letter abbreviation)'),
+               title=LxERP.t8('Article details'), class="button") %]
+        </td>
+        <td>[% HTML.escape(makemodel_item.description) %]</td>
+        <td class="numeric">[% makemodel_item.onhand_as_number %]</td>
+        <td class="numeric">[% LxERP.format_amount(makemodel_item.get_open_ordered_qty, 2) %]</td>
+        <td class="numeric">[% makemodel_item.rop_as_number %]</td>
+        <td class="numeric">[% makemodel_item.order_qty_as_number %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', makemodel_item,
+                 default=makemodel_item.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+</table>
diff --git a/templates/webpages/disposition_manager/list_parts.html b/templates/webpages/disposition_manager/list_parts.html
new file mode 100644
index 000000000..7fd4118f1
--- /dev/null
+++ b/templates/webpages/disposition_manager/list_parts.html
@@ -0,0 +1,52 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+
+[%- INCLUDE 'common/flash.html' %]
+<div style="margin:1em;">
+<h2>[% 'Short onhand' | $T8 %]</h2>
+<form id="form">
+  <table width="100%">
+    <thead>
+     <tr class="listheading">
+       <th>
+         [% L.checkbox_tag('check_all', checkall='[data-checkall=1]') %]
+         [% 'Purchase basket' | $T8 %]
+       </th>
+       <th>[% 'Partnumber'                                      | $T8 %] </th>
+       <th>[% 'Description'                                     | $T8 %] </th>
+       <th>[% 'Vendor'                                          | $T8 %] </th>
+       <th>[% 'Onhand'                                          | $T8 %] </th>
+       <th>[% 'Rop'                                             | $T8 %] </th>
+       <th>[% 'Minimum order quantity'                          | $T8 %] </th>
+     </tr>
+    </thead>
+    [% FOREACH part = PARTS %]
+      [% IF !part.get_open_ordered_qty %]
+      <tr class="listrow">
+        <td>
+          [% IF part.makemodels.size %]
+            [% L.checkbox_tag('ids[+]', 'data-checkall'=1,
+                 checked = '1', value=part.id) %]
+          [% ELSE %]
+            [% 'No Vendor' | $T8 %]
+          [% END %]
+        </td>
+        <td>[% HTML.escape(part.partnumber) %]</td>
+        <td>[% HTML.escape(part.description) %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', part,
+                 default=part.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+        <td class="numeric">[% LxERP.format_amount(part.onhandqty, 2) %]</td>
+        <td class="numeric">[% part.rop_as_number %]</td>
+        <td class="numeric">[% part.order_qty_as_number %]</td>
+      </tr>
+      [% END %]
+    [% END %]
+  </table>
+</form>
+<h2>[% 'Short onhand Ordered' | $T8 %]</h2>
diff --git a/templates/webpages/disposition_manager/reorder_level_list/report_bottom.html b/templates/webpages/disposition_manager/reorder_level_list/report_bottom.html
new file mode 100644
index 000000000..a0cdb6aa3
--- /dev/null
+++ b/templates/webpages/disposition_manager/reorder_level_list/report_bottom.html
@@ -0,0 +1,3 @@
+[% USE L %]
+[%- L.paginate_controls(models=SELF.models)  %]
+</div>
diff --git a/templates/webpages/disposition_manager/show_purchase_basket.html b/templates/webpages/disposition_manager/show_purchase_basket.html
new file mode 100644
index 000000000..94b0b3e48
--- /dev/null
+++ b/templates/webpages/disposition_manager/show_purchase_basket.html
@@ -0,0 +1,69 @@
+[%- USE HTML -%]
+[%- USE LxERP -%]
+[%- USE L -%]
+[%- USE T8 -%]
+[%- USE P -%]
+
+[%- INCLUDE 'common/flash.html' %]
+<h1>[% title %]</h1>
+
+<div>
+  <p>
+    [% 'Vendor' | $T8 %]:
+    [% P.customer_vendor.picker('vendor_id', '', type='vendor') %]
+  </p>
+</div>
+
+<form id="purchasebasket" style="margin:1em;">
+<div>
+  <table id="baskettable" width="100%">
+    <thead>
+     <tr class="listheading">
+       <th>
+         [% L.checkbox_tag("", id="check_all", checkall="[data-checkall=1]") %]
+         [% 'Purchase basket' | $T8 %]
+       </th>
+       <th>[% 'Partnumber'                                      | $T8 %] </th>
+       <th>[% 'Description'                                     | $T8 %] </th>
+       <th>[% 'Onhand'                                          | $T8 %] </th>
+       <th>[% 'Rop'                                             | $T8 %] </th>
+       <th>[% 'Order quantity'                                  | $T8 %] </th>
+       <th>[% 'Vendor'                                          | $T8 %] </th>
+     </tr>
+    </thead>
+    <tbody id="basket_items">
+    [% FOREACH basket_item = BASKET_ITEMS %]
+
+      <tr class="listrow">
+        <td>
+          [% L.checkbox_tag('ids[+]', "data-checkall"=1, checked = '1',  value=basket_item.id) %]
+          [% L.hidden_tag('basket_ids[+]', basket_item.id) %]
+        </td>
+        <td> [% basket_item.part.presenter.part(target = '_blank') %]
+          [% P.button_tag(
+               "kivi.DispositionManager.show_detail_dialog("
+                 _  basket_item.part.id _ "," _ basket_item.part.partnumber _
+               ")",
+               LxERP.t8('Details (one letter abbreviation)'),
+               title=LxERP.t8('Article details'), class="button") %]
+        </td>
+        <td>[% HTML.escape(basket_item.part.description) %]</td>
+        <td class="numeric">[% basket_item.part.onhand_as_number %]</td>
+        <td class="numeric">[% basket_item.part.rop_as_number %]</td>
+        <td class="numeric">[% basket_item.qty_as_number %]</td>
+        <td>[% P.part.vendor_price_dropdown(
+                 'vendor_ids[]', basket_item.part,
+                 default=basket_item.part.makemodels.item(0).make,
+                 style='width: 350px;'
+                 ) %]
+        </td>
+      </tr>
+    [% END %]
+    </tbody>
+  </table>
+</div>
+<hr>
+
+<div id="vendor_parts"></div>
+</form>
+<hr>
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index bee0ee6c4..a752361d5 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -122,6 +122,10 @@
   <input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
   <input type="hidden" name="tax_point" id="tax_point" value="[% HTML.escape(tax_point) %]">
 
+  [% IF !id %]
+  [%   L.hidden_tag('form_validity_token', form_validity_token) %]
+  [% END %]
+
   <p>
    <table width="100%">
     <tr valign="top">
diff --git a/templates/webpages/do/orders_top.html b/templates/webpages/do/orders_top.html
index 181f25a2c..859ffded7 100644
--- a/templates/webpages/do/orders_top.html
+++ b/templates/webpages/do/orders_top.html
@@ -1,2 +1 @@
-[%- INCLUDE 'common/flash.html' %]
 <form method="post" action="do.pl" id="form">
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index c143626c3..f35d43a80 100644
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -41,6 +41,18 @@
      <td colspan="3"><input name="ordnumber" class="fixed_width"></td>
     </tr>
 
+    [%- IF type == "purchase_delivery_order" %]
+    <tr>
+     <th align="right">[% 'Order Confirmation Number' | $T8 %]</th>
+     <td colspan="3"><input name="order_confirmation_number" class="fixed_width"></td>
+    </tr>
+
+    <tr>
+     <th align="right">[% 'Vendor Confirmation Number' | $T8 %]</th>
+     <td colspan="3"><input name="vendor_confirmation_number" class="fixed_width"></td>
+    </tr>
+    [%- END %]
+
     <tr>
      <th align="right">[% 'Customer Order Number' | $T8 %]</th>
      <td colspan="3"><input name="cusordnumber" class="fixed_width"></td>
@@ -72,6 +84,11 @@
      <td><input name="parts_description" size="20" class="fixed_width"></td>
     </tr>
 
+    <tr>
+     <th align="right">[% 'Full Text' | $T8 %]</th>
+     <td colspan="3">[% L.input_tag('fulltext', '', class="fixed_width") %]</td>
+    </tr>
+
     <tr>
      <th align="right">[% 'Project Number' | $T8 %]</th>
      <td>
@@ -88,7 +105,9 @@
 
     <tr>
      <th align="right">[% 'Serial Number' | $T8 %]</th>
-     <td colspan="3"><input name="serialnumber" class="fixed_width"></td>
+     <td><input name="serialnumber" class="fixed_width"></td>
+     <th align="right">[% 'Charge Number' | $T8 %]</th>
+     <td><input name="chargenumber" class="fixed_width"></td>
     </tr>
 
     [%- IF ALL_BUSINESS_TYPES.size %]
@@ -170,6 +189,17 @@
          <label for="l_ordnumber">[% 'Order Number' | $T8 %]</label>
         </td>
 
+        [%- IF type == "purchase_delivery_order" %]
+        <td>
+         <input name="l_order_confirmation_number" id="l_order_confirmation_number" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_order_confirmation_number">[% 'Order Confirmation Number' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_vendor_confirmation_number">[% 'Vendor Confirmation Number' | $T8 %]</label>
+        </td>
+        [%- END %]
+
         <td>
          <input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label>
@@ -243,6 +273,13 @@
         </td>
        </tr>
 
+       <tr>
+        <td>
+         <input name="l_items" id="l_items" class="checkbox" type="checkbox" value="Y">
+         <label for="l_items">[% 'Positions' | $T8 %]</label>
+        </td>
+       </tr>
+
       </table>
      </td>
     </tr>
diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
index d061d2c7e..8ef0fcf89 100644
--- a/templates/webpages/dunning/add.html
+++ b/templates/webpages/dunning/add.html
@@ -1,4 +1,5 @@
 [%- USE T8 %][%- USE L %]
+[% USE LxERP %]
 [% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
 <h1>[% title %]</h1>
 
@@ -43,6 +44,16 @@
     <td colspan="3"><input name="ordnumber" size="20"></td>
    </tr>
 
+   <tr>
+    <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
+    <td colspan="3">[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1) %]</td>
+   </tr>
+
+   <tr>
+    <th align="right" nowrap>[% 'Type' | $T8 %]</th>
+    <th>[% L.select_tag('invoice', [ ['t', LxERP.t8('Invoice (No Dunning Fees)')], ['f', LxERP.t8('AR transactions (Dunning Fees)')], ], with_empty=1) %]
+   </tr>
+
    <tr>
     <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
     <td colspan="3"><input name="notes" size="40"></td>
diff --git a/templates/webpages/dunning/edit_config.html b/templates/webpages/dunning/edit_config.html
index 19686f03c..04d964c85 100644
--- a/templates/webpages/dunning/edit_config.html
+++ b/templates/webpages/dunning/edit_config.html
@@ -128,6 +128,15 @@
     <td>[% L.select_tag('dunning_creator', [ [ 'current_employee', LxERP.t8('Current Employee') ],[ 'invoice_employee', LxERP.t8('Employee from the original invoice') ]  ], default=dunning_creator) %]
     </td>
    </tr>
+    <tr>
+      <th align="right">[% 'Original Invoice' | $T8 %]</th>
+      <td>[% L.select_tag('dunning_original_invoice_creation_mode', [
+                 [ 'create_new', LxERP.t8('Create new record.') ],
+                 [ 'use_last_created_or_create_new',
+                   LxERP.t8('Use last created record or create new.') ],
+              ], default=dunning_original_invoice_creation_mode) %]
+      </td>
+    </tr>
   </table>
 
   <input type="hidden" name="callback" value="[% HTML.escape(callback) %]">
diff --git a/templates/webpages/dunning/set_email.html b/templates/webpages/dunning/set_email.html
index b740f589d..39e6b7934 100644
--- a/templates/webpages/dunning/set_email.html
+++ b/templates/webpages/dunning/set_email.html
@@ -27,7 +27,7 @@
 
    <tr>
     <td valign="top">[% 'Body:' | $T8 %]</td>
-    <td valign="top">[% L.textarea_tag('email_body', email_body, rows=20, cols=70, class='texteditor') %]</td>
+    <td valign="top">[% L.textarea_tag('email_body', email_body, rows=20, cols=70, class='texteditor texteditor-space-for-toolbar') %]</td>
    </tr>
 
    <tr>
diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index 949d060e5..b94afb679 100644
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -32,12 +32,13 @@
    </th>
    <th class="listheading">
     [% L.checkbox_tag('selectall_include_invoices', checkall='INPUT[name*=include_invoice_]', checked=all_include_invoices) %]
-    <label for="selectall_include_invoices">[% 'Include original Invoices?' | $T8 %]</label>
+    <label for="selectall_include_invoices">[% 'Original Invoices?' | $T8 %]</label>
    </th>
 
    <th class="listheading">[% 'Customername' | $T8 %]</th>
    <th class="listheading">[% 'Department' | $T8 %]</th>
    <th class="listheading">[% 'Language' | $T8 %]</th>
+   <th class="listheading">[% 'Type' | $T8 %]</th>
    <th class="listheading">[% 'Invno.' | $T8 %]</th>
    <th class="listheading">[% 'Invdate' | $T8 %]</th>
    <th class="listheading">[% 'Inv. Duedate' | $T8 %]</th>
@@ -73,11 +74,20 @@
      <td>[% HTML.escape(row.payment_term) %]</td>
 
      <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
-     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email && row.cv_email %]checked[% END %]>[% HTML.escape(row.cv_email) %]</td>
+     <td>[% IF row.recipient %]<input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email && row.recipient %]checked[% END %]>[% row.recipient %] [% ELSE %]<input type="checkbox" name="dummy" disabled="true"> [% LxERP.t8("No invoice email found.") %] [% END %]</td>
      <td><input type="checkbox" name="include_invoice_[% loop.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]></td>
-     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
+     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">
+      <a href="controller.pl?action=CustomerVendor/edit&db=customer&id=[% row.customer_id %]">[% HTML.escape(row.customername) %]</a>
+     </td>
      <td><input type="hidden" name="department_[% loop.count %]" size="6" value="[% HTML.escape(row.departmentname) %]">[% HTML.escape(row.departmentname) %]</td>
      <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>
+     <td>
+       [% IF row.invoice %]
+         [% 'Invoice (one letter abbreviation)' | $T8 %]
+       [% ELSE %]
+         [% 'AR Transaction (abbreviation)' | $T8 %]
+       [% END %]
+     </td>
      <td>
       <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
       <a href="[% IF row.invoice %]is[% ELSE %]ar[% END %].pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
diff --git a/templates/webpages/email_journal/_filter.html b/templates/webpages/email_journal/_filter.html
index 05a1a75ea..702aa41b3 100644
--- a/templates/webpages/email_journal/_filter.html
+++ b/templates/webpages/email_journal/_filter.html
@@ -26,8 +26,46 @@
    </tr>
    <tr>
     <th align="right">[% LxERP.t8("Status") %]</th>
-    <td>[% L.select_tag("filter.status:eq_ignore_empty", [ [ "", "" ], [ "failed", LxERP.t8("failed") ], [ "ok", LxERP.t8("succeeded") ] ], default=filter.status_eq_ignore_empty) %]</td>
+    <td>[% L.select_tag("filter.status:eq_ignore_empty", [
+               [ "", "" ],
+               [ "send_failed", LxERP.t8("send failed") ],
+               [ "sent", LxERP.t8("sent") ],
+               [ "imported", LxERP.t8("imported") ]
+             ], default=filter.status_eq_ignore_empty) %]</td>
    </tr>
+    <tr>
+      <th align="right">[% LxERP.t8("Record Type") %]</th>
+      <td>
+        [%
+          SET record_type_options = [];
+          record_type_options.push({text=LxERP.t8("Catch-all"), record_type='catch_all'});
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (!record_info.is_template);
+              record_type_options.push(record_info);
+            END;
+          END;
+        %]
+        [% L.select_tag("filter.record_type:eq_ignore_empty",
+             record_type_options,
+             title_key = 'text', value_key = 'record_type',
+             with_empty=1, default=filter.record_type_eq_ignore_empty) %]
+      </td>
+    </tr>
+    <tr>
+      <th align="right">[% LxERP.t8("Obsolete") %]</th>
+      <td>[% L.yes_no_tag("filter.obsolete:eq_ignore_empty",
+            filter.obsolete, with_empty=1,
+            default=filter.obsolete_eq_ignore_empty
+            ) %]
+      </td>
+    <tr>
+      <th align="right">[% LxERP.t8("Linked") %]</th>
+      <td>[% L.yes_no_tag("filter.linked_to:eq_ignore_empty",
+            filter.linked_to, with_empty=1,
+            default=filter.linked_to_eq_ignore_empty
+            ) %]
+      </td>
+    </tr>
   </table>
 
   [% L.hidden_tag("sort_by", FORM.sort_by) %]
diff --git a/templates/webpages/email_journal/list.html b/templates/webpages/email_journal/list.html
index f169aed18..435525c51 100644
--- a/templates/webpages/email_journal/list.html
+++ b/templates/webpages/email_journal/list.html
@@ -1,4 +1,4 @@
-[% USE HTML %][% USE L %][% USE LxERP %]
+[% USE HTML %][% USE L %][% USE P %][% USE LxERP %]
 
 <h1>[% FORM.title %]</h1>
 
@@ -24,12 +24,15 @@
     <th>[% L.sortable_table_header("sent_on") %]</th>
     <th>[% L.sortable_table_header("status") %]</th>
     <th>[% L.sortable_table_header("extended_status") %]</th>
+    <th>[% L.sortable_table_header("record_type") %]</th>
+    <th>[% L.sortable_table_header("obsolete") %]</th>
+    <th>[% L.sortable_table_header("linked_to") %]</th>
    </tr>
   </thead>
 
   <tbody>
   [%- FOREACH entry = ENTRIES %]
-  <tr class="listrow[% IF entry.status != 'ok' %]_error[% END %]" id="email_journal_id_[% entry.id %]">
+  <tr class="listrow[% IF entry.status == 'send_failed' %]_error[% END %]" id="email_journal_id_[% entry.id %]">
    [% IF SELF.can_view_all %]
     <td>
      [% IF entry.sender %]
@@ -39,26 +42,21 @@
      [% END %]
     </td>
    [% END %]
-   <td>
-    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
-     [%- HTML.escape(entry.from) %]
-    </a>
-   </td>
+   [% action_show_link = SELF.url_for(
+        action => 'show', id => entry.id,
+        back_to => SELF.models.get_callback(),
+   ) %]
+   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.from) %]</a></td>
    <td>[%- HTML.escape(entry.recipients) %]</td>
-   <td>
-    <a href="[% SELF.url_for(action => 'show', id => entry.id, back_to => SELF.get_callback) %]">
-     [%- HTML.escape(entry.subject) %]
-    </a>
-   </td>
+   <td><a href="[% action_show_link %]">[%- HTML.escape(entry.subject) %]</a></td>
    <td>[%- HTML.escape(entry.sent_on.to_lxoffice('precision' => 'second')) %]</td>
+   <td> [% P.email_journal.entry_status(entry) %] </td>
+   <td>[%- HTML.escape(entry.extended_status) %]</td>
+   <td>[% HTML.escape(RECORD_TYPES_TO_TEXT.${entry.record_type}) %]</td>
+   <td>[% HTML.escape(entry.obsolete_as_bool_yn) %]</td>
    <td>
-    [%- IF entry.status == 'ok' %]
-     [%- LxERP.t8('succeeded') %]
-    [% ELSE %]
-     [%- LxERP.t8('failed') %]
-    [%- END %]
+     [% P.record.simple_grouped_record_list(entry.linked_records) %]
    </td>
-   <td>[%- HTML.escape(entry.extended_status) %]</td>
   </tr>
   [%- END %]
   </tbody>
diff --git a/templates/webpages/email_journal/show.html b/templates/webpages/email_journal/show.html
index b484bc76c..3809e1fca 100644
--- a/templates/webpages/email_journal/show.html
+++ b/templates/webpages/email_journal/show.html
@@ -1,67 +1,21 @@
-[% USE HTML %][% USE L %][% USE LxERP %][%- USE P -%]
+[% USE HTML %][% USE L %][% USE LxERP %][%- USE P -%] [% USE T8 %]
 
  <h1>[% FORM.title %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
- <table id="email_journal_details" class="email_journal_details">
-  <tbody>
-   <tr class="listrow">
-    <th>[%- LxERP.t8("From") %]</th>
-    <td>[%- HTML.escape(SELF.entry.from) %]</td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Recipients") %]</th>
-    <td>[%- HTML.escape(SELF.entry.recipients) %]</td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Subject") %]</th>
-    <td>[%- HTML.escape(SELF.entry.subject) %]</td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Sent on") %]</th>
-    <td>[%- HTML.escape(SELF.entry.sent_on.to_lxoffice("precision" => "second")) %]</td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Status") %]</th>
-    <td>
-     [%- IF SELF.entry.status == "ok" %]
-      [%- LxERP.t8("succeeded") %]
-     [%- ELSE %]
-      [%- LxERP.t8("failed") %]
-     [%- END %]
-    </td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Extended status") %]</th>
-    <td><pre>[%- HTML.escape(SELF.entry.extended_status) %]</pre></td>
-   </tr>
+<div class="tabwidget" id="email_tabs">
+  <ul>
+    <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+    <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=EmailJournal&object_id=[% HTML.url(SELF.entry.id) %]">[% 'Linked Records' | $T8 %]</a></li>
+  </ul>
 
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Headers") %]</th>
-    <td><pre>[% HTML.escape(SELF.entry.headers) %]</pre></td>
-   </tr>
-
-   <tr class="listrow">
-    <th>[%- LxERP.t8("Body") %]</th>
-    <td>
-     [%- IF SELF.entry.headers.match('(?i)content-type:.*text/html') %]
-      [% P.restricted_html(SELF.entry.body) %]
-     [%- ELSE %]
-      <pre>[% HTML.escape(SELF.entry.body) %]</pre>
-     [%- END %]
-    </td>
-   </tr>
- </table>
+[% PROCESS "email_journal/tabs/basic_data.html" %]
+</div> <!-- /.tabwidget -->
 
  [% SET attachments = SELF.entry.attachments_sorted %]
- [% IF attachments.size %]
   <h2>[% LxERP.t8("Attachments") %]</h2>
+ [% IF attachments.size %]
 
   <table id="email_journal_details" class="email_journal_details">
    <thead>
@@ -83,3 +37,212 @@
    </tbody>
   </table>
  [% END %]
+
+[% IF SELF.entry.status == 'imported' %]
+<form method="post" action="controller.pl" id="record_action_form">
+  [% L.hidden_tag('email_journal_id', SELF.entry.id) %]
+  [% L.hidden_tag('back_to', back_to) %]
+  <h2>[% LxERP.t8("Email Journal Workflow") %]</h2>
+
+  <table> <tr>
+    <div style="display:flex">
+      <div>
+      [% L.select_tag('attachment_id',
+           attachments, value_key='id', title_key='name',
+           default = attachments.0.id,
+           with_empty=1, empty_value='', empty_title=LxERP.t8("No attachment"),
+           'data-title'=LxERP.t8("Attachment"), class="wi-normal",
+           onchange='kivi.EmailJournal.update_attachment_preview();'
+           )
+        %]
+      </div>
+
+      <div>
+      [% L.select_tag('action_selection',
+         [
+           {value => "workflow_record", name => LxERP.t8("Create from Workflow")},
+           {value => "linking_record",  name => LxERP.t8("Linking to Record")},
+           {value => "new_record",      name => LxERP.t8("Create new")},
+           {value => "template_record", name => LxERP.t8("Create from Record Template")},
+         ],
+         value_key='value', title_key='name',
+         class="wi-normal",
+         onchange='kivi.EmailJournal.update_email_workflow_options();'
+         ) %]
+      </div>
+
+      <div>
+      [% L.select_tag('customer_vendor_selection',
+         [
+           {value => "customer", name => LxERP.t8("Sales")},
+           {value => "vendor",   name => LxERP.t8("Purchase")},
+         ],
+         default = CV_TYPE_FOUND,
+         value_key='value', title_key='name',
+         class="wi-verysmall",
+         onchange='kivi.EmailJournal.update_email_workflow_options();'
+         ) %]
+      </div>
+
+      <div>
+      [% FOREACH customer_vendor = ['customer', 'vendor'] %]
+      <div id="[% customer_vendor _ "_workflow_record_types_div" %]"
+        style=[% IF customer_vendor == CV_TYPE_FOUND %] "display:block" [% ELSE %] "display:none" [% END %]
+        >
+
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && record_info.can_workflow && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_workflow_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      <div id="[% customer_vendor _ "_new_record_types_div" %]"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && !record_info.workflow_needed && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_new_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      <div id="[% customer_vendor _ "_linking_record_types_div" %]"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && !record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_linking_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+
+
+      <div id="[% customer_vendor _ "_template_record_types_div" %]"
+        style="display:none"
+        >
+        [%
+          SET options = [];
+          FOREACH record_info = RECORD_TYPES_WITH_INFO;
+            IF (record_info.customervendor == customer_vendor && record_info.is_template);
+              options.push({value => record_info.record_type, name => record_info.text});
+            END;
+          END;
+        %]
+      [% L.select_tag(customer_vendor _ '_template_record_type_selection',
+         options,
+         value_key='value', title_key='name',
+         with_empty=1, empty_value='', empty_title=LxERP.t8("Select record type"),
+         onchange='kivi.EmailJournal.update_record_list();'
+         ) %]
+      </div>
+      [% END %]
+      </div>
+    </div>
+
+  </tr> <tr>
+    <td>
+    <div id="record_selection_div">
+      <div style="display:flex">
+        [% FOREACH cv_option = [
+             ['customer', 'Customer'],
+             ['vendor',   'Vendor'  ],
+             ] %]
+        [% SET cv_type        = cv_option.0 %]
+        [% SET cv_name        = cv_option.1 %]
+        <div
+          id="[% cv_type _ "_div" %]"
+          style=[% IF cv_type == CV_TYPE_FOUND %] "display:block" [% ELSE %] "display:none" [% END %]
+          >
+          [% P.customer_vendor.picker(
+               cv_type _ "_id",
+               cv_type == 'customer' ? CUSTOMER : VENDOR,
+               type=cv_type, class="wi-normal", placeholder=LxERP.t8(cv_name)
+               onchange='kivi.EmailJournal.update_record_list();'
+               ) %]
+        </div>
+        [% END %]
+
+        <div id="record_number_div">
+          [% L.input_tag('record_number', '',
+             class="wi-normal", placeholder=LxERP.t8("Record number")
+             onchange='kivi.EmailJournal.update_record_list();'
+             ) %]
+        </div>
+
+        <div id="with_closed_div">
+          [% L.select_tag('with_closed',
+             [
+               {value => "1", name => LxERP.t8("With closed")},
+               {value => "0", name => LxERP.t8("Only open")},
+             ],
+             default = 0, value_key='value', title_key='name',
+             onchange='kivi.EmailJournal.update_record_list();'
+             ) %]
+        </div>
+      </div>
+      <!-- gets updated on $(document).ready -->
+      <div id="record_div">
+        <div id="record_toggle_closed"
+          class="record_toggle toggle_panel control-panel" style="display:block;">
+          <a href="#" onClick='javascript:$(".record_toggle").toggle()'
+             class="button toggle off neutral">
+            [% LxERP.t8('Show Records') %]
+          </a>
+        </div><!-- /.record_toggle -->
+        <div id="record_toggle_open"
+          class="record_toggle toggle_panel control-panel" style="display:none;">
+          <a href="#" onClick='javascript:$(".record_toggle").toggle()'
+             class="button toggle on neutral with-panel">
+            [% LxERP.t8('Hide Records') %]
+          </a>
+          <div class="toggle_panel_block">
+            <div id="record_list">[% LxERP.t8("Loading...") %]</div>
+          </div>
+        </div><!-- /.record_toggle -->
+      </div><!-- record_div -->
+    </div><!-- record_selection_div -->
+    <div id="new_record_div" class="input-panel" style="display:none;min-width:0;margin:0">
+        [% L.button_tag('kivi.EmailJournal.apply_action_with_attachment();',
+          LxERP.t8('Apply with Attachment')) %]
+    </div>
+    </td>
+
+  </tr> </table>
+</form>
+
+<!-- kivi.EmailJournal.update_attachment_preview -->
+<div id="attachment_preview"></div>
+[% END %]
+
+<script type="text/javascript">
+  $(document).ready(function() {
+    kivi.EmailJournal.update_email_workflow_options();
+    kivi.EmailJournal.update_attachment_preview();
+  });
+</script>
diff --git a/templates/webpages/email_journal/tabs/basic_data.html b/templates/webpages/email_journal/tabs/basic_data.html
new file mode 100644
index 000000000..98f709489
--- /dev/null
+++ b/templates/webpages/email_journal/tabs/basic_data.html
@@ -0,0 +1,68 @@
+[% USE HTML %][% USE L %][% USE LxERP %][%- USE P -%]
+
+<div id="ui-tabs-basic-data">
+
+<table id="email_journal_details" class="email_journal_details">
+ <tbody>
+  <tr class="listrow">
+   <th>[%- LxERP.t8("From") %]</th>
+   <td>[%- HTML.escape(SELF.entry.from) %]</td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Recipients") %]</th>
+   <td>[%- HTML.escape(SELF.entry.recipients) %]</td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Subject") %]</th>
+   <td>[%- HTML.escape(SELF.entry.subject) %]</td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Sent on") %]</th>
+   <td>[%- HTML.escape(SELF.entry.sent_on.to_lxoffice("precision" => "second")) %]</td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Status") %]</th>
+   <td>
+       [% P.email_journal.entry_status(SELF.entry) %]
+   </td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Extended status") %]</th>
+   <td><pre>[%- HTML.escape(SELF.entry.extended_status) %]</pre></td>
+  </tr>
+  
+  <tr class="listrow">
+   <th>[%- LxERP.t8("For Record Type") %]</th>
+   <td>[%- HTML.escape(RECORD_TYPES_TO_TEXT.${SELF.entry.record_type}) %]</td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Headers") %]</th>
+   <td><pre>[% HTML.escape(SELF.entry.headers) %]</pre></td>
+  </tr>
+
+  <tr class="listrow">
+   <th>[%- LxERP.t8("Body") %]</th>
+   <td>
+    [%- IF SELF.entry.headers.match('(?i)content-type:.*text/html') %]
+     [% P.restricted_html(SELF.entry.body) %]
+    [%- ELSE %]
+     <pre>[% HTML.escape(SELF.entry.body) %]</pre>
+    [%- END %]
+   </td>
+  </tr>
+  <tr class="listrow">
+    <th>[% LxERP.t8("Obsolete") %]</th>
+      <td>
+        [% L.input_tag('obsolete', SELF.entry.obsolete_as_bool_yn, style="color:black", disabled=1) %]
+        [% L.button_tag("kivi.EmailJournal.toggle_obsolete( $SELF.entry.id );", 'Toggle') %]
+      </td>
+
+</table>
+
+</div><!-- /#ui-tabs-basic-data -->
diff --git a/templates/webpages/failed_background_jobs_report/email.txt b/templates/webpages/failed_background_jobs_report/email.txt
index 506a9b7ab..4f5fe1a4e 100644
--- a/templates/webpages/failed_background_jobs_report/email.txt
+++ b/templates/webpages/failed_background_jobs_report/email.txt
@@ -3,7 +3,7 @@ Hallo,
 die folgenden Hintergrundjobs sind seit [% SELF.start_time.to_kivitendo %] [% SELF.start_time.to_kivitendo_time %] ausgeführt worden und schlugen fehl:
 
 [%- FOREACH entry = SELF.entries %]
-Paketname:     [% entry.package_name %]
+Paketname:     [% entry.package_name %] / [% entry.description %]
 Ausgeführt um: [% entry.run_at.to_kivitendo %] [% entry.run_at.to_kivitendo_time %]
 Fehler:        [% entry.error_col %]
 [% UNLESS loop.last %]============================================================[% END %]
diff --git a/templates/webpages/file/list.html b/templates/webpages/file/list.html
index 2868d4f47..b4f6ad8e9 100644
--- a/templates/webpages/file/list.html
+++ b/templates/webpages/file/list.html
@@ -29,7 +29,7 @@
       <th class="listheading" width="3%">[% L.checkbox_tag(checkname _ '_checkall') %]</th>
       <th class="listheading" width="7%">[% source.chkall_title %]</th>
      [%- END %]
-     <th class="listheading" width="2%"><b>[%  LxERP.t8('Version') %]</b></th>
+     <th class="listheading" width="2%"><b>[%  LxERP.t8('Version') _ ' (' _ LxERP.t8('Count') _ ')' %]</b></th>
      <th class="listheading" width="15%"><b>[%  LxERP.t8('Date') %]</b></th>
      <th class="listheading" width="20%"><b>[%  source.file_title %]</b></th>
      [%- IF file_type == 'image' %]
@@ -55,12 +55,12 @@
       <tr class="[% 'version_row_' _ file.id %] listrow[% row_cnt % 2 %] hidden">
      [%- END %]
       [%- IF edit_attachments %]
-       <td>[%- L.checkbox_tag(checkname _ '[]', 'value'=file.id _ '_' _ file.version, 'class'=checkname) %]</td>
+       <td>[%- L.checkbox_tag(checkname _ '[]', 'value'=file.file_version.guid, 'class'=checkname) %]</td>
        <td></td>
       [%- END %]
       <td align="right" [%- IF file.version_count > 1 && !is_other_version %] class="cursor-pointer" onclick="kivi.File.toggle_versions('[% file.id %]')"[%- END %]>
        [%- IF file.version_count > 1 && !is_other_version %]<span id="[% 'version_toggle_' _ file.id %]">⏷ </span>[% END %]
-       [% file.version _ '/' _ file.version_count %]
+       [% file.version _ ' (' _ file.version_count _ ')' %]
        [% L.hidden_tag("version[]", file.version) %]
       </td>
       <td>[% file.mtime_as_timestamp_s %]</td>
diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html
index 3a6f126db..c00542f33 100644
--- a/templates/webpages/fu/add_edit.html
+++ b/templates/webpages/fu/add_edit.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %]
+[%- USE LxERP %]
 <h1>[% title %]</h1>
 
  <script type="text/javascript">
@@ -19,33 +20,64 @@
   <input type="hidden" name="POPUP_MODE" value="[% HTML.escape(POPUP_MODE) %]">
 
   <table>
+    [% IF done_at -%]
+    <tr class="fu_finished">
+      <td>[% 'Finished' | $T8 %]</td>
+      <td>[% 'by' | $T8 %] [% HTML.escape(done_by_employee_name) %]</td>
+      <td colspan="2">[% 'at' | $T8 %] [% HTML.escape(done_at) %]</td>
+    </tr>
+    [% END %]
     <tr>
-     <td valign="top">[% 'Follow-Up for user' | $T8 %]</td>
+     <td align="top">[% 'Follow-Up for user' | $T8 %]</td>
+     <td valign="top">
+      <table>
+       <tr class="listheading">
+       <th>[% L.checkbox_tag('checkall_checkboxes', label='', id='ckeckall', checkall="[data-checkall=1]") %]</th>
+       <th>[% LxERP.t8('All users') %]</th>
+       </tr>
+
+       [% FOREACH employee = all_employees %]
+        [% SET checked = 0 %]
+        [% FOREACH cfe = created_for_employees %]
+         [% IF cfe.id == employee.id %][% SET checked = 1 %][% LAST %][% END %]
+        [% END %]
+       <tr class="listrow">
+         <td>[% L.checkbox_tag('created_for_employees[]', value=employee.id, checked=checked, "data-checkall"=1, class="employee_check") %]</td>
+         <td><label for='created_for_employees[]'>[% HTML.escape(employee.safe_name) %]</label><td>
+       </tr>
+        [% END %]
+      </table>
+     <td>
      <td valign="top">
-      <select name="created_for_user">
-       [%- FOREACH row = EMPLOYEES %]
-       <option value="[% HTML.escape(row.id) %]"[% IF created_for_user == row.id %] selected[% END %]>
-        [%- IF row.name %][% HTML.escape(row.name) %] ([% HTML.escape(row.login) %])[% ELSE %][% HTML.escape(row.login) %][% END %]
-       </option>
-       [%- END %]
-      </select>
+      <table>
+       <tr class="listheading"><th>[% LxERP.t8('Users that are a member in this group') %] ([% LxERP.t8('click on a group to add the group\'s users') %])</th></tr>
+        [% FOREACH auth_group = all_auth_groups %]
+         <tr onclick="follow_up_do_select(this)" data-ids='[% FOREACH employee = auth_group.get_employees %][% employee.id %][% IF !loop.last %],[% END%][% END%]' class="interactive cursor-pointer">
+          <td class="listrow1"><b>←&nbsp;[% auth_group.name %]</b>: [% auth_group.description %]</td>
+         </tr>
+         [% FOREACH employee = auth_group.get_employees %]
+          <tr class="listrow0"><td>&nbsp;&nbsp;&nbsp;[% employee.safe_name %]</td></tr>
+         [% END %]
+        [% END %]
+      </table>
      </td>
     </tr>
 
     <tr>
      <td valign="right">[% 'Follow-Up Date' | $T8 %]</td>
-     <td>
+     <td colspan="3">
        [% L.date_tag('follow_up_date', follow_up_date) %]
+     </td>
     </tr>
 
     <tr>
      <td valign="right">[% 'Subject' | $T8 %]</td>
-     <td><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
+     <td colspan="3"><input name="subject" value="[% HTML.escape(subject) %]" size="50"></td>
     </tr>
 
     <tr>
      <td valign="right" align="top">[% 'Body' | $T8 %]</td>
-     <td align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
+     <td colspan="3" align="top"><textarea cols="50" rows="10" name="body">[% HTML.escape(body) %]</textarea></td>
     </tr>
   </table>
 
@@ -78,7 +110,7 @@
      <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
      <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
      <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
-     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
+     <td valign="top">[% HTML.escape(row.created_for_user_name) | html_line_break %]</td>
     </tr>
     [%- END %]
   </table>
@@ -102,7 +134,7 @@
      <td valign="top">[% HTML.escape(row.follow_up_date) %]</td>
      <td valign="top"><a href="fu.pl?action=edit&id=[% HTML.escape(row.id) %][% IF POPUP_MODE %]&POPUP_MODE=1[% END %]">[% HTML.escape(row.subject) %]</a></td>
      <td valign="top">[% HTML.escape(row.created_by_name) %]</td>
-     <td valign="top">[% HTML.escape(row.created_for_user_name) %]</td>
+     <td valign="top">[% HTML.escape(row.created_for_user_name) | html_line_break %]</td>
     </tr>
     [%- END %]
   </table>
diff --git a/templates/webpages/fu/follow_up_reminder_mail.html b/templates/webpages/fu/follow_up_reminder_mail.html
new file mode 100644
index 000000000..9be64b96f
--- /dev/null
+++ b/templates/webpages/fu/follow_up_reminder_mail.html
@@ -0,0 +1,28 @@
+[%- USE T8 %]
+[%- USE HTML %]
+<!DOCTYPE HTML>
+<html>
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ </head>
+
+ <body>
+  <h2>[% 'Unfinished follow-ups' | $T8 %]</h2>
+
+  <table>
+   <tr>
+    <th>[% 'Follow-Up Date' | $T8 %]</th>
+    <th>[% 'Subject' | $T8 %]</th>
+    <th>[% 'Created by' | $T8 %]</th>
+   </tr>
+
+   [%- FOREACH fu = follow_ups %]
+   <tr>
+    <td>[% HTML.escape(fu.follow_up_date_as_date) %]</td>
+    <td><a href="[% fu.link %]">[% HTML.escape(fu.note.subject) %]</a></td>
+    <td>[% HTML.escape(fu.created_by_employee.safe_name) %]</td>
+   </tr>
+   [%- END %]
+  </table>
+ </body>
+</html>
diff --git a/templates/webpages/fu/report_for_todo_list.html b/templates/webpages/fu/report_for_todo_list.html
index d54283cca..558e55e02 100644
--- a/templates/webpages/fu/report_for_todo_list.html
+++ b/templates/webpages/fu/report_for_todo_list.html
@@ -14,6 +14,7 @@
     <td class="listheading">[% 'Subject' | $T8 %]</td>
     <td class="listheading">[% 'Reference' | $T8 %]</td>
     <td class="listheading">[% 'Created by' | $T8 %]</td>
+    <td class="listheading">[% 'Follow-up for' | $T8 %]</td>
    </tr>
 
    [%- FOREACH row = FOLLOW_UPS %]
@@ -27,6 +28,7 @@
     <td><a href="[% edit_url | html %][% HTML.escape(row.id) %]">[% HTML.escape(row.subject) %]</a></td>
     <td>[% IF row.reference_link %]<a href="[% row.reference_link | html %]">[% END %][% HTML.escape(row.reference) %][% IF row.reference_link %]</a>[% END %]</td>
     <td>[% HTML.escape(row.created_by_name) %]</td>
+    <td>[% HTML.escape(row.created_for_user_name) | html_line_break %]</td>
    </tr>
    [%- END %]
   </table>
diff --git a/templates/webpages/gl/form_header.html b/templates/webpages/gl/form_header.html
index 8dd130a7d..16b82c6e2 100644
--- a/templates/webpages/gl/form_header.html
+++ b/templates/webpages/gl/form_header.html
@@ -2,7 +2,11 @@
 [%- USE LxERP %]
 [%- USE T8 %]
 [%- USE L %]
-<h1>[% title | html %]</h1>
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title | html %]
+</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
@@ -24,6 +28,15 @@
 [% L.hidden_tag(name, $name) %]
 [%- END %]
 
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
+
 <input type=hidden name=title value="[% hide_title | html %]">
 
 <input type="hidden" name="follow_up_trans_id_1" value="[% id | html %]">
@@ -34,6 +47,9 @@
 <div id="gl_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
diff --git a/templates/webpages/ic/generate_report_bottom.html b/templates/webpages/ic/generate_report_bottom.html
index 9dc3ea80a..c00442576 100644
--- a/templates/webpages/ic/generate_report_bottom.html
+++ b/templates/webpages/ic/generate_report_bottom.html
@@ -23,12 +23,10 @@
      <td>[%- 'Service (typeabbreviation)'    | $T8 %]</td>
      <td>[%- 'Service'                       | $T8 %]</td>
     </tr>
-    [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
     <tr class="listrow1">
      <td>[%- 'Assortment (typeabbreviation)' | $T8 %]</td>
      <td>[%- 'Assortment'                    | $T8 %]</td>
     </tr>
-    [%- END %]
  </tbody>
  </table></td>
  <td><table valign="top">
diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html
index 91f665cee..b4eb6e3b2 100644
--- a/templates/webpages/ic/search.html
+++ b/templates/webpages/ic/search.html
@@ -38,12 +38,10 @@
           <input name="l_assembly" id="l_assembly" class="checkbox" type="checkbox" value="Y" checked>
           <label for="l_assembly">[% 'Assembly' | $T8 %]</label>
         </td>
-        [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
         <td>
           <input name="l_assortment" id="l_assortment" class="checkbox" type="checkbox" value="Y" checked>
           <label for="l_assortment">[% 'Assortment' | $T8 %]</label>
         </td>
-        [%- END %]
        </tr></table></td>
       </tr>
       <tr>
@@ -84,6 +82,9 @@
       <tr>
        <th align="right" nowrap>[% 'Shop article' | $T8 %]</th>
        <td>[% L.yes_no_tag('shop', shop, default='', with_empty=1, empty_title='---', style=style) %]</td>
+       <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
+       <td>[% L.input_tag("notes", "", style=style) %]</td>
+
       </tr>
 
       <tr>
@@ -112,6 +113,7 @@
         [%- L.radio_button_tag('itemstatus', value='active', id='itemstatus_active', label=LxERP.t8('Active'), checked=1) %]
         [%- L.radio_button_tag('itemstatus', value='onhand', id='itemstatus_onhand', label=LxERP.t8('On Hand')) %]
         [%- L.radio_button_tag('itemstatus', value='short', id='itemstatus_short', label=LxERP.t8('Short')) %]
+        [%- L.radio_button_tag('itemstatus', value='order_locked', id='itemstatus_order_locked', label=LxERP.t8('Do not order anymore')) %]
         [%- L.radio_button_tag('itemstatus', value='obsolete', id='itemstatus_obsolete', label=LxERP.t8('Obsolete')) %]
         [%- L.radio_button_tag('itemstatus', value='orphaned', id='itemstatus_orphaned', label=LxERP.t8('Orphaned')) %]
         [%- L.radio_button_tag('itemstatus', value='', id='itemstatus_all', label=LxERP.t8('All')) %]
@@ -191,6 +193,10 @@
           <td>[%- L.checkbox_tag('l_linetotal', label=LxERP.t8('Line Total'), value='Y', checked=1) %]</td>
          </tr>
 
+         <tr>
+          <td>[%- L.checkbox_tag('l_price_factor_description', label=LxERP.t8('Price Factor'), value='Y') %]</td>
+         </tr>
+
          <tr>
           <td>[%- L.checkbox_tag('l_priceupdate', label=LxERP.t8('Price updated'), value='Y') %]</td>
           <td>[%- L.checkbox_tag('l_deliverydate', label=LxERP.t8('Delivery Date'), value='Y') %]</td>
diff --git a/templates/webpages/ic/search_update_prices.html b/templates/webpages/ic/search_update_prices.html
index ba54126fe..aca6544f1 100644
--- a/templates/webpages/ic/search_update_prices.html
+++ b/templates/webpages/ic/search_update_prices.html
@@ -2,6 +2,7 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 <h1>[% 'Update prices' | $T8 %]</h1>
 
 [% INCLUDE 'common/flash.html' %]
@@ -27,7 +28,7 @@
 
   <tr>
    <th align="right" nowrap>[% 'Make' | $T8 %]</th>
-   <td>[% L.input_tag('filter.make', FORM.filter.make, size=20) %]</td>
+   <td>[% P.customer_vendor.picker('filter.make', FORM.filter.make, type='vendor', size=20) %]</td>
    <th align="right" nowrap>[% 'Model' | $T8 %]</th>
    <td>[% L.input_tag('filter.model', FORM.filter.model, size=20) %]</td>
   </tr>
diff --git a/templates/webpages/inventory/_journal.html b/templates/webpages/inventory/_journal.html
index bee3b9513..f04f2e24b 100644
--- a/templates/webpages/inventory/_journal.html
+++ b/templates/webpages/inventory/_journal.html
@@ -2,7 +2,7 @@
 [% USE HTML %]
 [% USE LxERP %]
 [% USE T8 %]
-<h3>[% 'Journal of Last 10 Transfers' | $T8 %]</h3>
+<h3>[% 'Journal of Last 20 Transfers' | $T8 %]</h3>
 
 [%- IF journal.size %]
 <table>
@@ -16,6 +16,7 @@
   <th>[% 'Warehouse To' | $T8 %]</th>
   <th>[% 'Charge Number' | $T8 %]</th>
   <th>[% 'Comment' | $T8 %]</th>
+  <th>[% 'Document' | $T8 %]</th>
  </tr>
 [% FOREACH row = journal %]
  <tr class='listrow'>
@@ -28,6 +29,7 @@
   <td>[% row.in ? row.in.bin.full_description : '-' | html %]</td>
   <td>[% row.base.chargenumber | html %]</td>
   <td>[% row.base.comment | html %]</td>
+  <td>[% row.base.oe_id | html %][% row.base.invoice.invoice.invnumber | html %]</td>
  </tr>
 [% END %]
 </table>
diff --git a/templates/webpages/inventory/warehouse_selection_stock.html b/templates/webpages/inventory/warehouse_selection_stock.html
index 9aca162ba..d0fa5cb3e 100644
--- a/templates/webpages/inventory/warehouse_selection_stock.html
+++ b/templates/webpages/inventory/warehouse_selection_stock.html
@@ -20,7 +20,7 @@
    <th align="right" nowrap>[% 'Destination warehouse' | $T8 %]</th>
    <td>[% L.select_tag('warehouse_id', SELF.warehouses, default=SELF.warehouse.id, title_key='description') %]
      [% IF SELF.warehouse.id %]
-       [% L.select_tag('bin_id', SELF.warehouse.bins, default=SELF.bin.id, title_key='description') %]
+       [% L.select_tag('bin_id', SELF.warehouse.bins_sorted_naturally, default=SELF.bin.id, title_key='description') %]
       [%- ELSE %]
        <span id='bin_id'></span>
       [% END %]
diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html
index 111083954..df7a722c8 100644
--- a/templates/webpages/ir/_payments.html
+++ b/templates/webpages/ir/_payments.html
@@ -80,9 +80,17 @@
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
+  [% SET defaultcurrency_paid  = 'defaultcurrency_paid_' _ i %]
+  [% SET record_forex = 'record_forex_' _ i %]
+  [% SET fx_transaction = 'fx_transaction_' _ i %]
   [% IF $forex %]
         <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
-        [% LxERP.format_amount($forex, 5) %]
+        <input type="hidden" name="record_forex_[% i %]" value="[% $record_forex %]">
+        <input type="hidden" name="forex_[% i %]"        value="[% $forex %]">
+        <input type="hidden" name="defaultcurrency_paid_[% i %]"      value="[% $defaultcurrency_paid %]">
+        <input type="hidden" name="fx_transaction_[% i %]" value="1">
+          [% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
+          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
   [% ELSE %]
      [% IF $changeable %]
         <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
@@ -110,15 +118,22 @@
     <tr>
       <td></td>
       <td></td>
-      <td align="center">[% 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+      <td align="center">[%- 'Total' | $T8 %]</td>
+      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF show_exchangerate %]
+        <td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+        <input type="hidden" name="defaultcurrency_totalpaid" value="[% defaultcurrency_totalpaid %]">
+      [% END %]
     </tr>
+[% UNLESS show_exchangerate %]
     <tr>
       <td></td>
       <td></td>
-      <td align="center">[% 'Missing amount' | $T8 %]</td>
+      <td align="center">[%- 'Missing amount' | $T8 %]</td>
       <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
     </tr>
+[% END %]
 
      <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
      <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html
index 30f77c596..2b3ea5ae2 100644
--- a/templates/webpages/ir/form_footer.html
+++ b/templates/webpages/ir/form_footer.html
@@ -74,7 +74,7 @@
        <table>
 
 [%- UNLESS taxincluded %]
-        <tr>
+        <tr class="invsubtotal">
          <th align="right">[% 'Subtotal' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
        </tr>
@@ -86,19 +86,19 @@
 [% SET rate_ref        = item _ '_rate' %]
 [% SET total_ref       = item _ '_total' %]
 [% SET netto_ref       = item _ '_netto' %]
-       <tr>
+       <tr class="invtaxamount">
         <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>
+       <tr class="invnetamount">
         <th align="right">[% 'Net amount' | $T8 %]</th>
         <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
        </tr>
   [%- END %]
 [%- END %]
 
-        <tr>
+        <tr class='invtotal'>
          <th align="right">[% 'Total' | $T8 %]</th>
          <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
         </tr>
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index 680d2d1ff..3d7537c2d 100644
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -2,7 +2,11 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %][%- USE P -%]
-<h1>[% title %]</h1>
+
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
 
 [%- SET follow_up_trans_info = invnumber _ ' (' _ vendor_obj.name _ ')' %]
 <script type="text/javascript" src="js/common.js"></script>
@@ -21,6 +25,14 @@
 <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
 <input type="hidden" name="follow_up_rowcount" value="1">
 <input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
 
 [%- INCLUDE 'common/flash.html' %]
 [%- INCLUDE 'generic/set_longdescription.html' %]
@@ -28,6 +40,9 @@
 <div id="ir_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
@@ -55,8 +70,8 @@
         <tr>
           <th align="right">[% 'Vendor' | $T8 %]</th>
           <td>
-           [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 250px", class="initial_focus", onchange="\$('#update_button').click()") %]
-           [% P.button_tag("show_vc_details('vendor')", LxERP.t8('Details (one letter abbreviation)')) %]
+           [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 250px", class="initial_focus",
+                show_details="1") %]
            [% P.hidden_tag("previous_vendor_id", vendor_id) %]
           </td>
         </tr>
@@ -94,13 +109,12 @@
 [%- END %]
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
-          <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>
-          <input type="hidden" name="selectAP" value="[% selectAP %]">
+          <td colspan="3">[% P.chart.picker("AP_chart_id", AP_chart_id, style="width:250px;", type="AP", "data-validate"="required") %]</td>
         </tr>
         <tr>
           <th align="right">[% 'Steuersatz' | $T8 %]</th>
           <td>
-            [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) , default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
+            [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES) , default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "kivi.io.update_taxzone()") %]
   [%- IF id %]
           <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
   [%- END %]
@@ -118,7 +132,14 @@
 [%- IF currencies %]
         <tr>
           <th align="right">[% 'Currency' | $T8 %]</th>
-          <td>[% currencies %]</td>
+          <td>
+           [%- IF readonly  %]
+             [% HTML.escape(currency) %]
+             [% L.hidden_tag("currency", currency) %]
+           [%- ELSE %]
+             [% currencies %]
+           [%- END %]
+          </td>
         </tr>
 [%- END %]
         <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
@@ -127,11 +148,13 @@
         <tr>
           <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 5) %]
+           [%- IF readonly  %]
+             [% LxERP.format_amount(exchangerate, 5) %]
+             [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
            [%- ELSE %]
             <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
            [%- END %]
+           [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
           </td>
         </tr>
 [%- END %]
@@ -197,7 +220,6 @@
     </td>
   </tr>
   <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
   <script type="text/javascript" src="js/show_history.js"></script>
   <script type="text/javascript">
    <!--
diff --git a/templates/webpages/ir/update_taxes.html b/templates/webpages/ir/update_taxes.html
new file mode 100644
index 000000000..213ee1b6e
--- /dev/null
+++ b/templates/webpages/ir/update_taxes.html
@@ -0,0 +1,4 @@
+[% USE L %][%- USE LxERP -%]
+[% FOR row = TAXES %]
+<option value='[% row.id %]'[% IF row.is_default %] selected[% END %]>[% row.taxkey _ " - " _ row.taxdescription %] [% LxERP.round_amount(row.rate * 100) %] %</option>
+[% END %]
diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html
index 8072df314..4c9cca662 100644
--- a/templates/webpages/is/_payments.html
+++ b/templates/webpages/is/_payments.html
@@ -88,9 +88,13 @@
      <td align="center">
   [% SET forex        = 'forex_'        _ i %]
   [% SET exchangerate = 'exchangerate_' _ i %]
+  [% SET defaultcurrency_paid = 'defaultcurrency_paid_' _ i %]
+  [% SET record_forex = 'record_forex_' _ i %]
   [% IF $forex %]
         <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
-        [% LxERP.format_amount($forex, 5) %]
+        <input type="hidden" name="fx_transaction_[% i %]" value="1">
+          [% LxERP.format_amount($forex, 5) %] = [% LxERP.format_amount($defaultcurrency_paid, 5) %] [% defaultcurrency %] </br>
+          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
   [% ELSE %]
      [% IF $changeable %]
         <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
@@ -118,13 +122,17 @@
       <td></td>
       <td></td>
       <td align="center">[%- 'Total' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% currency %]</td>
+      <td></td>
+      [% IF show_exchangerate %]
+        <td align="center">[% LxERP.format_amount(defaultcurrency_totalpaid, 2) | html %] [% defaultcurrency %]</td>
+      [% END %]
     </tr>
     <tr>
       <td></td>
       <td></td>
       <td align="center">[%- 'Missing amount' | $T8 %]</td>
-      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
+      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %] [% currency %]</td>
     </tr>
     <tr style='display:none'>
      <td>
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 7c749cf5a..f5a5b54a1 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -47,6 +47,12 @@
                  [%- L.checkbox_tag('qrbill_without_amount', 'checked', qrbill_without_amount) %]
                </td>
              </tr>
+             <tr>
+              <th align="right">[% 'QR bill unstructured message' | $T8 %]</th>
+              <td>
+                [%- L.input_tag('qr_unstructured_message', qr_unstructured_message) %]
+              </td>
+            </tr>
 [%- END %]
            </table>
          </td>
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index c870191b0..a20befa47 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -19,8 +19,23 @@
 <input type="hidden" name="follow_up_rowcount" id="follow_up_rowcount" value="1">
 <input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
 <input type="hidden" name="already_printed_flag" id="already_printed_flag" value="0">
+<input type="hidden" name="has_qr_reference" id="has_qr_reference" value="[% has_qr_reference %]">
+[%- IF qr_reference %]
+[%   L.hidden_tag("qr_reference", qr_reference) %]
+[%- END %]
+[% IF !id %]
+[%   L.hidden_tag('form_validity_token', form_validity_token) %]
+[% END %]
+[% L.hidden_tag('email_journal_id',             email_journal_id) %]
+[% L.hidden_tag('email_attachment_id',          email_attachment_id) %]
+[% L.hidden_tag('workflow_email_journal_id',    workflow_email_journal_id) %]
+[% L.hidden_tag('workflow_email_attachment_id', workflow_email_attachment_id) %]
+[% L.hidden_tag('workflow_email_callback',      workflow_email_callback) %]
 
-<h1>[% title %]</h1>
+<h1>
+  [% IF workflow_email_journal_id; LxERP.t8("Email Journal Workflow") _ " - "; END; %]
+  [% title %]
+</h1>
 
 <p>[% saved_message %]</p>
 
@@ -30,6 +45,9 @@
 <div id="is_tabs" class="tabwidget">
  <ul>
   <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF email_attachment_id || workflow_email_attachment_id %]
+  <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(email_attachment_id || workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
   <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
@@ -55,9 +73,8 @@
         <tr>
           <th align="right">[% 'Customer' | $T8 %]</th>
           <td>
-           [% P.customer_vendor.picker("customer_id", customer_id, type="customer", style="width: 250px", class="initial_focus", onchange="\$('#update_button').click()") %]
-           [% L.button_tag("show_vc_details('customer')", LxERP.t8('Details (one letter abbreviation)')) %]
-           [% P.link_tag('controller.pl?action=CustomerVendor/edit&db=customer&id=' _ customer_id, LxERP.t8('Edit'), target="_blank", title=LxERP.t8('Open in new window')) %]
+           [% P.customer_vendor.picker("customer_id", customer_id, type="customer", style="width: 250px", class="initial_focus",
+                show_details="1") %]
            [% L.hidden_tag("previous_customer_id", customer_id) %]
            [% L.hidden_tag("customer_pricegroup_id", customer_pricegroup_id) %]
           </td>
@@ -136,8 +153,7 @@
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3">
-            <select name="AR" style="width:250px;">[% selectAR %]</select>
-            <input type="hidden" name="selectAR" value="[% selectAR | html %]">
+            [% P.chart.picker("AR_chart_id", AR_chart_id, style="width:259px;", type="AR", "data-validate"="required") %]
           </td>
         </tr>
         <tr>
@@ -168,7 +184,14 @@
 [%- IF currencies %]
         <tr>
           <th align="right">[% 'Currency' | $T8 %]</th>
-          <td>[% currencies %]</td>
+          <td>
+           [%- IF readonly  %]
+             [% HTML.escape(currency) %]
+             [% L.hidden_tag("currency", currency) %]
+           [%- ELSE %]
+             [% currencies %]
+           [%- END %]
+          </td>
         </tr>
 [%- END %]
         <tr style='display:none'>
@@ -183,11 +206,13 @@
         <tr>
           <th align="right">[% 'Exchangerate' | $T8 %]</th>
           <td>
-           [%- IF forex %]
-            [% LxERP.format_amount(exchangerate, 5) %]
+           [%- IF readonly  %]
+             [% LxERP.format_amount(exchangerate, 5) %]
+             [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
            [%- ELSE %]
             <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
            [%- END %]
+           [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
           </td>
         </tr>
 [%- END %]
@@ -310,6 +335,18 @@
             [%- L.select_tag('globalproject_id', ALL_PROJECTS, title_key = 'projectnumber', default = globalproject_id, with_empty = '1', onChange = "document.getElementById('update_button').click();") %]
           </td>
         </tr>
+        [%- IF has_qr_reference %]
+        <tr>
+          <th align="right" nowrap>[% 'QR reference' | $T8 %]</th>
+          <td>
+            [%- IF qr_reference %]
+              [% HTML.escape(qr_reference_formatted) %]
+            [%- ELSE %]
+              [% LxERP.t8("will be set upon posting") %]
+            [%- END %]
+          </td>
+        </tr>
+        [%- END %]
       </table>
     </td>
   </tr>
@@ -321,17 +358,10 @@
 </table>
 
   <script type="text/javascript" src="js/show_form_details.js"></script>
-  <script type="text/javascript" src="js/show_vc_details.js"></script>
   <script type="text/javascript" src="js/show_history.js"></script>
   <script type="text/javascript">
    <!--
      $('document').ready(function(){
-[% IF INSTANCE_CONF.get_invoice_prevent_browser_back %]
-       function disableBack() { window.history.forward() };
-       window.onload = disableBack();
-       window.onpageshow = function(evt) { if (evt.persisted) disableBack() };
-[% END %]
-
 [% IF resubmit && is_format_html %]
        window.open('about:blank','Beleg');
        document.invoice.target = 'Beleg';
diff --git a/templates/webpages/liquidity_projection/_filter.html b/templates/webpages/liquidity_projection/_filter.html
index 328953979..f07561064 100644
--- a/templates/webpages/liquidity_projection/_filter.html
+++ b/templates/webpages/liquidity_projection/_filter.html
@@ -15,6 +15,8 @@
     [% L.checkbox_tag("params.salesman",       value=1, checked=FORM.params.salesman,       label=LxERP.t8("Salesman")) %]
     <br>
     [% L.checkbox_tag("params.buchungsgruppe", value=1, checked=FORM.params.buchungsgruppe, label=LxERP.t8("Booking group")) %]
+    <br>
+    [% L.checkbox_tag("params.parts_group",    value=1, checked=FORM.params.parts_group,    label=LxERP.t8("Partsgroup")) %]
    </td>
   </tr>
  </table>
diff --git a/templates/webpages/liquidity_projection/_result.html b/templates/webpages/liquidity_projection/_result.html
index 8207d954b..bcbaa191b 100644
--- a/templates/webpages/liquidity_projection/_result.html
+++ b/templates/webpages/liquidity_projection/_result.html
@@ -1,5 +1,5 @@
 [%- USE HTML -%][%- USE LxERP -%]
-[%- SET name_col = FORM.params.salesman || FORM.params.buchungsgruppe || FORM.params.type %]
+[%- SET name_col = FORM.params.salesman || FORM.params.buchungsgruppe || FROM.params.parts_group || FORM.params.type %]
 
 <table border="0">
  <tr>
@@ -56,6 +56,19 @@
   [%- END %]
  [%- END %]
 
+ [%- IF FORM.params.parts_group %]
+  [%- FOREACH parts_group = SELF.liquidity.sorted.parts_group %]
+   <tr class="listrow">
+    <td>[% IF loop.first %][% LxERP.t8("Partsgroup") %][% END %]</td>
+    <td>[%- HTML.escape(parts_group) || LxERP.t8('no partsgroup') %]</td>
+
+    [%- FOREACH month = SELF.liquidity.sorted.month %]
+     <td align="right">[% LxERP.format_amount(SELF.liquidity.parts_group.$parts_group.$month, 2) %]</td>
+    [%- END %]
+   </tr>
+  [%- END %]
+ [%- END %]
+
  <tr class="listrow listtotal">
   <td>[% LxERP.t8("Total") %]</td>
   [% IF name_col %]<td></td>[% END %]
diff --git a/templates/webpages/liquidity_projection/list_orders.html b/templates/webpages/liquidity_projection/list_orders.html
new file mode 100644
index 000000000..8e7291da6
--- /dev/null
+++ b/templates/webpages/liquidity_projection/list_orders.html
@@ -0,0 +1,43 @@
+[%- USE LxERP -%][%- USE HTML -%][%- USE P -%]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[% IF !ORDERS.size %]
+  <p>[% LxERP.t8("There are no orders for the selected time period.") %]</p>
+
+[% ELSE %]
+
+  <table style="width: 100%">
+    <thead>
+      <tr class="listheading">
+        <th align="right">[% LxERP.t8("Date") %]</th>
+        <th align="right">[% LxERP.t8("Delivery Date") %]</th>
+        <th align="right">[% LxERP.t8("Order") %]</th>
+        <th align="right">[% LxERP.t8("Customer Order Number") %]</th>
+        <th>[% LxERP.t8("Customer") %]</th>
+        <th align="right">[% LxERP.t8("Total") %]</th>
+        <th align="right">[% LxERP.t8("Net amount") %]</th>
+        <th>[% LxERP.t8("Employee") %]</th>
+        <th>[% LxERP.t8("Transaction description") %]</th>
+        <th>[% LxERP.t8("Recurring") %]</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      [% FOREACH order = ORDERS %]
+        <tr class="listrow">
+          <td align="right">[% HTML.escape(order.transdate.to_kivitendo) %]</td>
+          <td align="right">[% HTML.escape(order.reqdate.to_kivitendo) %]</td>
+          <td align="right">[% P.order.sales_order(order) %]</td>
+          <td align="right">[% HTML.escape(order.cusordnumber) %]</td>
+          <td>[% P.customer_vendor.customer(order.customer) %]</td>
+          <td align="right">[% HTML.escape(LxERP.format_amount(order.amount,    2)) %]</td>
+          <td align="right">[% HTML.escape(LxERP.format_amount(order.netamount, 2)) %]</td>
+          <td>[% HTML.escape(order.employee.safe_name) %]</td>
+          <td>[% HTML.escape(order.transaction_description) %]</td>
+          <td>[% IF order.is_recurring %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+[% END %]
diff --git a/templates/webpages/list_transactions/report_settings.html b/templates/webpages/list_transactions/report_settings.html
new file mode 100644
index 000000000..45a308add
--- /dev/null
+++ b/templates/webpages/list_transactions/report_settings.html
@@ -0,0 +1,40 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+[%- USE T8 %]
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form name="Form" method="post" action="controller.pl" id="report_settings">
+[% L.hidden_tag("action", "ListTransactions/report_settings") %]
+
+<h2>[% "Account" | $T8 %]</h2>
+
+[% P.chart.picker('chart_id', defaults.chart_id) %]
+
+<h2>[% "Period" | $T8 %]</h2>
+[% P.date_period.picker('dateperiod', defaults.dateperiod_from_date,
+                                      defaults.dateperiod_to_date,
+                                      dialog_defaults => defaults.dialog) %]
+
+<h2>[% "Options" | $T8 %]</h2>
+
+[% L.checkbox_tag('show_subtotals', checked => defaults.show_subtotals,
+                                    label => LxERP.t8('Show subtotals')) %]
+
+<h2>[% "Sort by" | $T8 %]</h2>
+
+[% P.radio_button_tag('sort', value => 'transdate',
+                              checked => defaults.sort == 'transdate',
+                              label => LxERP.t8('Date')) %]
+[% P.radio_button_tag('sort', value => 'reference',
+                              checked => defaults.sort == 'reference',
+                              label => LxERP.t8('Reference')) %]
+[% P.radio_button_tag('sort', value => 'description',
+                              checked => defaults.sort == 'description',
+                              label => LxERP.t8('Description')) %]
+
+</form>
+
+<hr>
\ No newline at end of file
diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
index bfb40167a..068389af4 100644
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -6,6 +6,7 @@
      label_information = LxERP.t8('A lot of the usability of kivitendo has been enhanced with javascript. Although it is currently possible to use every aspect of kivitendo without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
    %]
    </noscript>
+[%- INCLUDE 'common/flash.html' %]
  <center>
   <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo[% xmas %].png" class='kivitendo-logo' border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
 
diff --git a/templates/webpages/login_screen/user_login.html b/templates/webpages/login_screen/user_login.html
index 20c63f1e7..93c78fd9a 100644
--- a/templates/webpages/login_screen/user_login.html
+++ b/templates/webpages/login_screen/user_login.html
@@ -71,7 +71,8 @@
   <p>
    <a href="controller.pl?action=Admin/login" target="_top">[%- LxERP.t8('Administration area') %]</a>
    &nbsp;|&nbsp;
-   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('Documentation') %]</a>
+   [%- LxERP.t8('Documentation') %]
+   <a href="doc/kivitendo-Dokumentation.pdf" target="_top">[%- LxERP.t8('PDF') %]</a>/<a href="doc/html/index.html" target="_top">[%- LxERP.t8('HTML') %]</a>
   </p>
 
 [% IF FORM.$auth_client %]
diff --git a/templates/webpages/mass_delivery_order_print/_print_status.html b/templates/webpages/mass_delivery_order_print/_print_status.html
index 922d89d7d..5865877ba 100644
--- a/templates/webpages/mass_delivery_order_print/_print_status.html
+++ b/templates/webpages/mass_delivery_order_print/_print_status.html
@@ -68,7 +68,7 @@
 
  [% FOREACH error = data.conversion_errors %]
      <tr>
-      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
       <td valign="top">[% HTML.escape(error.message) %]</td>
      </tr>
  [% END %]
diff --git a/templates/webpages/mass_delivery_order_print/list_delivery_orders.html b/templates/webpages/mass_delivery_order_print/list_delivery_orders.html
index a7fa7a2f8..441a1292e 100644
--- a/templates/webpages/mass_delivery_order_print/list_delivery_orders.html
+++ b/templates/webpages/mass_delivery_order_print/list_delivery_orders.html
@@ -38,7 +38,7 @@
       <td>[% L.checkbox_tag('id[]', value=delivery_order.id, "data-checkall"=1, checked=selected_ids.$delivery_order_id) %]</td>
       <td>[% HTML.escape(delivery_order.transdate_as_date) %]</td>
       <td>[% HTML.escape(delivery_order.reqdate_as_date) %]</td>
-      <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=delivery_order.id), delivery_order.donumber) %]</td>
+      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]</td>
       <td>[% HTML.escape(delivery_order.ordnumber) %]</td>
       <td>[% HTML.escape(delivery_order.customer.name) %]</td>
       <td>[% HTML.escape(SELF.make_shipto_title(delivery_order.shipto || delivery_order.custom_shipto)) %]</td>
diff --git a/templates/webpages/mass_invoice_create_print_from_do/_create_print_all_status.html b/templates/webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
index 15f25f0f7..82e138f4a 100644
--- a/templates/webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/_create_print_all_status.html
@@ -68,7 +68,7 @@
 
  [% FOREACH error = data.conversion_errors %]
      <tr>
-      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='do.pl', action='edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
+      <td valign="top">[% IF error.id %][% L.link(SELF.url_for(controller='controller.pl', action='DeliveryOrder/edit', type='sales_delivery_order', id=error.id), HTML.escape(error.number), target="_blank") %][% ELSE %]–[% END %]</td>
       <td valign="top">[% HTML.escape(error.message) %]</td>
      </tr>
  [% END %]
diff --git a/templates/webpages/mass_invoice_create_print_from_do/list_invoices.html b/templates/webpages/mass_invoice_create_print_from_do/list_invoices.html
index c382a5cfb..281e79326 100644
--- a/templates/webpages/mass_invoice_create_print_from_do/list_invoices.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/list_invoices.html
@@ -41,7 +41,7 @@
       <td>[% L.link(SELF.url_for(controller="is.pl", action="edit", type="sales_invoice", id=invoice.id), invoice.invnumber) %]</td>
       <td>
        [% IF delivery_order %]
-        [% L.link(SELF.url_for(controller="do.pl", action="edit", id=delivery_order.id), delivery_order.donumber) %]
+        [% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=delivery_order.id), delivery_order.donumber) %]
        [% ELSE %]
         [% HTML.escape(invoice.donumber) %]
        [% END %]
diff --git a/templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html b/templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
index b020743a9..c50647b4f 100644
--- a/templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/list_sales_delivery_orders.html
@@ -35,12 +35,8 @@
      <tr class="listrow">
       <td>[% L.checkbox_tag('id[]', value=sales_delivery_order.id, "data-checkall"=1) %]</td>
       <td>[% HTML.escape(sales_delivery_order.transdate_as_date) %]</td>
-      <td>[% L.link(SELF.url_for(controller="do.pl", action="edit", type="sales_delivery_order", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
-      [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-        <td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
-      [%- ELSE -%]
-        <td>[% L.link(SELF.url_for(controller="oe.pl", action="edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
-      [%- END -%]
+      <td>[% L.link(SELF.url_for(controller="controller.pl", action="DeliveryOrder/edit", id=sales_delivery_order.id), sales_delivery_order.donumber) %]</td>
+      <td>[% L.link(SELF.url_for(controller="controller.pl", action="Order/edit", type="sales_order", id=sales_delivery_order.sales_order.id), sales_delivery_order.ordnumber) %]</td>
       <td>[% HTML.escape(sales_delivery_order.customer.name) %]</td>
      </tr>
      [%- END %]
diff --git a/templates/webpages/oe/check_for_direct_delivery.html b/templates/webpages/oe/check_for_direct_delivery.html
deleted file mode 100644
index 8160188c5..000000000
--- a/templates/webpages/oe/check_for_direct_delivery.html
+++ /dev/null
@@ -1,96 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-<h1>[% 'Carry over shipping address' | $T8 %]</h1>
-
- <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
-
- <p>
-  <table>
-   <tr>
-    <th align="right" valign="top">[% 'Name' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoname) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Department' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_1) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">&nbsp;</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptodepartment_2) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Street' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptostreet) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Zipcode' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptozipcode) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'City' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocity) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Country' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'GLN' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptogln) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Contact' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Phone' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptophone) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'Fax' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptofax) %]</td>
-   </tr>
-
-   <tr>
-    <th align="right" valign="top">[% 'E-mail' | $T8 %]:</th>
-    <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
-   </tr>
-
-[% FOREACH var = cvars %]
-   <tr valign="top">
-    <th align="right" nowrap>[% HTML.escape(var.config.description) %]</th>
-    <td>[% HTML.escape(var.value_as_text) %]</td>
-   </tr>
-[% END %]
-  </table>
- </p>
-
-  [% 'Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?' | $T8 %]
- </p>
-
- <form method="post" action="oe.pl">
-
-  <p>
-   <input type="submit" name="action" value="[% 'Yes' | $T8 %]">&nbsp;
-   <input type="submit" name="action" value="[% 'No' | $T8 %]">
-  </p>
-
-  <input type="hidden" name="yes_nextsub" value="check_for_direct_delivery_yes">
-  <input type="hidden" name="no_nextsub" value="check_for_direct_delivery_no">
-
-  [%- FOREACH row = VARIABLES %]
-  <input type="hidden" name="[% HTML.escape(row.key) %]" value="[% HTML.escape(row.value) %]">
-  [%- END %]
-
- </form>
-
diff --git a/templates/webpages/oe/edit_periodic_invoices_config.html b/templates/webpages/oe/edit_periodic_invoices_config.html
index 94aeb5ba3..e6f30ceeb 100644
--- a/templates/webpages/oe/edit_periodic_invoices_config.html
+++ b/templates/webpages/oe/edit_periodic_invoices_config.html
@@ -168,7 +168,11 @@
       $('#email_recipient_address').prop('disabled', disabled);
       $('#email_sender').prop('disabled', disabled);
       $('#email_subject').prop('disabled', disabled);
-      $('#email_body').data('ckeditorInstance').setReadOnly(disabled);
+      $('#email_body').prop('disabled', disabled);
+      if (disabled)
+        $('#email_body').data('ckeditorInstance').enableReadOnlyMode('disabled')
+      else
+        $('#email_body').data('ckeditorInstance').disableReadOnlyMode('disabled');
     }
     -->
  </script>
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html
deleted file mode 100644
index 14f29547b..000000000
--- a/templates/webpages/oe/form_footer.html
+++ /dev/null
@@ -1,155 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- USE L %]
-[%- IF is_req_quo || is_pur_ord %]
-  [%- SET allow_invoice=1 %]
-[%- ELSIF is_sales_quo && INSTANCE_CONF.get_allow_sales_invoice_from_sales_quotation %]
-  [%- SET allow_invoice=1 %]
-[%- ELSIF is_sales_ord && INSTANCE_CONF.get_allow_sales_invoice_from_sales_order %]
-  [%- SET allow_invoice=1 %]
-[%- ELSE %]
-  [%- SET allow_invoice=0 %]
-[%- END %]
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign="bottom">
-          <td>
-            <table>
-              <tr>
-                <th align="left">[% 'Notes' | $T8 %]</th>
-                <th align="left">[% 'Internal Notes' | $T8 %]</th>
-              </tr>
-              <tr valign="top">
-                <td>[% L.textarea_tag('notes',    notes,    style="width: 350px; height: 150px", class="texteditor") %]</td>
-                <td>[% L.textarea_tag('intnotes', intnotes, style="width: 350px; height: 150px") %]</td>
-              </tr>
-              <tr>
-                <th align="right">[% 'Payment Terms' | $T8 %]</th>
-                <td>[% L.select_tag('payment_id', ALL_PAYMENTS, default = payment_id, title_key = 'description', with_empty = 1, style="width: 250px") %]</td>
-              </tr>
-              <tr>
-                <th align="right">[% 'Delivery Terms' | $T8 %]</th>
-                <td>[% L.select_tag('delivery_term_id', ALL_DELIVERY_TERMS, default = delivery_term_id, with_empty = 1, title_key = 'description', style = 'width: 250px') %]</td>
-              </tr>
-
-[%- IF is_sales_ord %]
-            <tr>
-             <th align="right">[%- LxERP.t8('Periodic Invoices') %]</th>
-             <td>
-              [% L.button_tag("edit_periodic_invoices_config(); return false;", LxERP.t8('Configure')) %]
-              ([% HTML.escape(periodic_invoices_status) %])
-              [% L.hidden_tag("periodic_invoices_config", periodic_invoices_config) %]
-              <a href="doc/html/ch03.html#features.periodic-invoices.variables" target="_blank">?</a>
-             </td>
-            </tr>
-[%- END %]
-
-      [%- IF id && num_follow_ups %]
-      <tr>
-       <td colspan="2">[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', num_follow_ups, num_due_follow_ups) %]</td>
-      </tr>
-      [%- END %]
-      </table>
-          </td>
-      [%- IF show_weight %]
-          <td>
-            <table>
-            <tr>
-              <th  align="left">[% 'Total weight' | $T8 %]</th>
-              <td align="right">
-                [% LxERP.format_amount(totalweight, 3) %] [% HTML.escape(weightunit) %]
-              </td>
-            </tr>
-            </table>
-          </td>
-      [%- END %]
-[%- IF is_sales %]
-          <td>
-            <table>
-
-            <tr>
-              <th  align="left">[% 'Ertrag' | $T8 %]</th>
-              <td align="right">
-                [% LxERP.format_amount(marge_total, 2) %]
-                <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
-              </td>
-            </tr>
-            <tr>
-              <th  align="left">[% 'Ertrag prozentual' | $T8 %]</th>
-              <td align="right">
-                [% LxERP.format_amount(marge_percent, 2) %]
-                <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
-              </td>
-              <td>%</td>
-            </tr>
-            </table>
-          </td>
-[%- END %]
-          <td align="right">
-
-[%- IF taxaccounts %]
-            <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
-            <input name="taxincluded" class="checkbox" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
-[%- END %]
-            <table>
-[%- IF NOT taxincluded %]
-              <tr>
-                <th align='right'>[% 'Subtotal' | $T8 %]</th>
-                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
-              </tr>
-[%- END %]
-              [% tax %]
-[%- IF rounding %]
-              <tr>
-                <th align='right'>[% 'Rounding' | $T8 %]</th>
-                <td align='right'>[% LxERP.format_amount(rounding, 2) %]</td>
-              </tr>
-[%- END %]
-              <tr>
-                <th align="right">[% 'Total' | $T8 %]</th>
-                <td align="right">[% LxERP.format_amount(invtotal, 2) %]
-                  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
-                  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-</div>
-[%- PROCESS 'webdav/_list.html' %]
-<div id="ui-tabs-1">
- [%- LxERP.t8("Loading...") %]
-</div>
-</div>
-
-<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
-[% L.hidden_tag("rowcount", rowcount) %]
-<input type="hidden" name="callback" value="[% callback | html %]">
-[% IF vc == 'customer' %]
-  <input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
-[% ELSE %]
-  <input type="hidden" name="vendor_discount" value="[% HTML.escape(vendor_discount) %]">
-[% END %]
-
-<div id="shipto_inputs" class="hidden">
- [%- PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]
-</div>
-
-<div id="email_inputs" class="hidden"></div>
-
-<div id="print_options" class="hidden">
- [% print_options %]
-</div>
-</form>
-
-<div id="shipto_dialog" class="hidden"></div>
-<div id="print_dialog" class="hidden">
- [%- PROCESS 'common/_print_dialog.html' %]
-</div>
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
deleted file mode 100644
index 002fa5545..000000000
--- a/templates/webpages/oe/form_header.html
+++ /dev/null
@@ -1,304 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- USE L %][%- USE P -%]
-
-  <form method="post" id='form' name="oe" action="[% script %]"
-        data-transport-cost-reminder-article-id="[% HTML.escape(transport_cost_reminder_article.id) %]"
-        data-transport-cost-reminder-article-description="[% HTML.escape(transport_cost_reminder_article.displayable_name) %]"
-        >
-
-    <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
-    <script type="text/javascript" src="js/calculate_qty.js"></script>
-    <script type="text/javascript" src="js/follow_up.js"></script>
-    [%- IF is_sales_ord %]
-     [% L.javascript_tag("js/edit_periodic_invoices_config") %]
-    [%- END %]
-
-[%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" id="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
-[%- END %]
-
-    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
-
-    <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
-    <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
-    <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
-    <input type="hidden" name="follow_up_rowcount" value="1">
-    <input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
-
-    <h1>[% title %]</h1>
-
-[%- INCLUDE 'common/flash.html' %]
-[%- INCLUDE 'generic/set_longdescription.html' %]
-
-    <div id="oe_tabs" class="tabwidget">
-     <ul>
-      <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
-[%- IF INSTANCE_CONF.get_webdav %]
-      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
-[%- END %]
-[%- IF id AND INSTANCE_CONF.get_doc_storage %]
-      <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(type) %]&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
-      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(type) %]&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
-[%- END %]
-[%- IF id AND AUTH.assert('record_links', 1) %]
-      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Order&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
-[%- END %]
-     </ul>
-
-     <div id="ui-tabs-basic-data">
-
-    <table width="100%">
-      <tr>
-        <td>
-          <table width="100%">
-            <tr valign="top">
-              <td width="50%">
-                <table width="100%">
-                  <tr>
-                    <th align="right">[% IF vc == 'customer' %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
-                    <td>
-                     [%- SET vc_id = vc _ "_id" %]
-                     [% P.customer_vendor.picker(vc_id, $vc_id, type=vc, style="width: 250px", class="initial_focus", onchange="\$('#update_button').click()") %]
-                     [% P.button_tag("show_vc_details('" _ HTML.escape(vc) _  "')", LxERP.t8("Details (one letter abbreviation)")) %]
-                     [% P.hidden_tag("previous_" _ vc_id, $vc_id) %]
-                    </td>
-                  </tr>
-[%- IF ALL_CONTACTS.size %]
-                  <tr>
-                    <th align="right">[% 'Contact Person' | $T8 %]</th>
-                    <td>
-                      [% L.select_tag('cp_id', ALL_CONTACTS, default=cp_id, value_key='cp_id', title_key='full_name_dep', with_empty=1, style='width: 250px') %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">[% 'Shipping Address' | $T8 %]</th>
-                    <td>
-[%- IF ALL_SHIPTO.size %]
-                      [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
-                         L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
-[%- END %]
-                      [% L.button_tag("kivi.SalesPurchase.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
-                    </td>
-                  </tr>
-
-[%- IF is_sales && vc_obj.additional_billing_addresses.as_list.size %]
-                  <tr>
-                    <th align="right">[% 'Custom Billing Address' | $T8 %]</th>
-                    <td>
-                      [% L.select_tag('billing_address_id', vc_obj.additional_billing_addresses,
-                                      with_empty=1, default=billing_address_id, value_key='id', title_key='displayable_id', style='width: 250px') %]
-                    </td>
-                  </tr>
-[%- END %]
-
-[%- IF is_order %]
-                  <tr>
-                    <td align="right">[% 'Credit Limit' | $T8 %]</td>
-                    <td>[% LxERP.format_amount(creditlimit, 0) %]; [% 'Remaining' | $T8 %] <span class="plus[% is_credit_remaining_negativ %]">[% LxERP.format_amount(creditremaining, 0) %]</span></td>
-                  </tr>
-[%- END %]
-[%- IF business %]
-                  <tr>
-                    <th align="right">[% business_label %]</th>
-                    <td>[% HTML.escape(business) %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_percent(tradediscount) %] %</td>
-                  </tr>
-[%- END %]
-[%- IF max_dunning_level %]
-                  <tr>
-                    <th align="right">[% 'Max. Dunning Level' | $T8 %]:</th>
-                    <td>
-                      <b>[% HTML.escape(max_dunning_level) %]</b>;
-                      [% 'Dunning Amount' | $T8 %]: <b>[% LxERP.format_amount(dunning_amount, 2) %]</b>
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">[% 'Steuersatz' | $T8 %]</th>
-                    <td>
-                      [% L.select_tag('taxzone_id', ( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES), default=taxzone_id, title_key='description', style='width: 250px') %]
-                    </td>
-                  </tr>
-[%- IF ALL_LANGUAGES.size %]
-                  <tr>
-                    <th align="right" nowrap>[% 'Language' | $T8 %]</th>
-                    <td colspan="3">
-                      [% L.select_tag('language_id', ALL_LANGUAGES, default=language_id, title_key = 'description', with_empty=1, style='width:250px') %]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF ALL_DEPARTMENTS.size %]
-                  <tr>
-                    <th align="right" nowrap>[% 'Department' | $T8 %]</th>
-                    <td colspan="3">
-                      [% L.select_tag('department_id', ALL_DEPARTMENTS, default=department_id, title_key = 'description', with_empty=1, style='width:250px') %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">[% 'Currency' | $T8 %]</th>
-                    <td>[% L.select_tag("currency", ALL_CURRENCIES, value_key="name", default=currency, onchange="document.getElementById('update_button').click();") %]</td>
-                  </tr>
-[%- IF show_exchangerate %]
-                  <tr>
-                    <th align="right">[% 'Exchangerate' | $T8 %]</th>
-                    <td>
-                     [%- IF forex %]
-                      [% LxERP.format_amount(exchangerate, 5) %]
-                     [%- ELSE %]
-                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right">[% 'Shipping Point' | $T8 %]</th>
-                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">[% 'Ship via' | $T8 %]</th>
-                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
-                  </tr>
-                  <tr>
-                    <th align="right">[% 'Transaction description' | $T8 %]</th>
-                    <td colspan="3">[% L.input_tag("transaction_description", transaction_description, size=35, "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
-                  </tr>
-[%- IF show_delivery_customer %]
-                  <tr>
-                    <td colspan="4">
-                      <table>
-                        <tr>
-                          <td colspan="2">
-                          <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">[% 'Choose Customer' | $T8 %]</button>
-                        </td>
-                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">[% 'Choose Vendor' | $T8 %]</button>
-                          </td>
-                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-              <td align="right">
-                <table>
-              [% openclosed %]
-                  <tr>
-                    <th align="right">[% 'Employee' | $T8 %]</th>
-                    <td>
-                      [% L.select_tag('employee_id', ALL_EMPLOYEES, default=employee_id, title_key='safe_name') %]
-                    </td>
-                  </tr>
-[%- IF is_sales and ALL_SALESMEN.size %]
-                  <tr>
-                    <th align="right">[% 'Salesman' | $T8 %]</th>
-                    <td>
-                      [% L.select_tag('salesman_id', ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title_key='safe_name') %]
-                    </td>
-                  </tr>
-[%- END %]
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
-                    <td>
-[%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
-                      [% L.input_tag("ordnumber", ordnumber, size="11") %]
-[%- ELSIF id %]
-                      [% HTML.escape(ordnumber) %]
-                      [% L.hidden_tag("ordnumber", ordnumber) %]
-[%- ELSE %]
-                      [% LxERP.t8("will be set upon saving") %]
-[%- END %]
-                    </td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% IF is_req_quo %][% 'RFQ Number' | $T8 %][% ELSE %][% 'Quotation Number' | $T8 %][% END %]</th>
-                    <td>
-[%- IF is_order || INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
-                      [% L.input_tag("quonumber", quonumber, size="11") %]
-[%- ELSIF id %]
-                      [% HTML.escape(quonumber) %]
-                      [% L.hidden_tag("quonumber", quonumber) %]
-[%- ELSE %]
-                      [% LxERP.t8("will be set upon saving") %]
-[%- END %]
-                    </td>
-                  </tr>
-[%- IF is_order %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
-                    <td><input name="cusordnumber" id="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
-                  </tr>
-[%- END %]
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_order %]
-                      [% 'Order Date' | $T8 %]
-                     [%- ELSIF is_req_quo %]
-                      [% 'RFQ Date' | $T8 %]
-                     [%- ELSE %]
-                      [% 'Quotation Date' | $T8 %]
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      [% L.date_tag('transdate', transdate, id='transdate') %]
-                    </td>
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>[% LxERP.t8('Tax point') %]</th>
-                    <td nowrap>[% L.date_tag('tax_point', tax_point, id='tax_point') %]</td>
-                  </tr>
-                  <tr>
-                    <th align="right" nowrap>
-                     [%- IF is_sales_quo %]
-                      [% 'Valid until' | $T8 %]
-                     [%- ELSE %]
-                      [% 'Reqdate' | $T8 %]
-                     [%- END %]
-                    </th>
-                    <td nowrap>
-                      [% L.date_tag('reqdate', reqdate, id='reqdate') %]
-                    </td>
-                  </tr>
-                  [%- IF is_sales_ord %]
-                  <tr>
-                    <th align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
-                    <td>[% oe_obj.itime_as_date %]</td>
-                  </tr>
-                  [%- END %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
-                    <td>
-                      [%- L.select_tag('globalproject_id', ALL_PROJECTS, title_key='projectnumber', default=globalproject_id, with_empty='1', onChange="document.getElementById('update_button').click();") %]
-                    </td>
-                  </tr>
-[%- IF type == 'sales_quotation' %]
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% 'Order probability' | $T8 %]</th>
-                    <td nowrap>
-                      [%- L.select_tag('order_probability', ORDER_PROBABILITIES, title='title', default=order_probability) %]%
-                    </td>
-                  </tr>
-                  <tr>
-                    <th width="70%" align="right" nowrap>[% 'Expected billing date' | $T8 %]</th>
-                    <td nowrap>
-                      [%- L.date_tag('expected_billing_date', expected_billing_date) %]
-                    </td>
-                  </tr>
-[%- END %]
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
diff --git a/templates/webpages/oe/report_for_todo_list.html b/templates/webpages/oe/report_for_todo_list.html
index 98b0f4a7b..0c6596055 100644
--- a/templates/webpages/oe/report_for_todo_list.html
+++ b/templates/webpages/oe/report_for_todo_list.html
@@ -1,9 +1,14 @@
 [%- USE T8 %]
-[% USE HTML %][% USE LxERP %]
+[% USE HTML %][% USE LxERP %][% USE P %]
 <h1>[% 'Overdue sales quotations and requests for quotations' | $T8 %]</h1>
 
+<form method="post" action="controller.pl" id="todo_quotations_form">
+  [% P.hidden_tag('action', 'Order/dispatch') %]
+  [% P.hidden_tag('callback', HTML.escape(callback)) %]
+
  <table width="100%">
   <tr>
+   <td class="listheading">&nbsp;</td>
    <td class="listheading">[% 'Date' | $T8 %]</td>
    <td class="listheading">[% 'Valid until' | $T8 %]</td>
    <td class="listheading">[% 'Sales quotation' | $T8 %] / [% 'Request quotation' | $T8 %]</td>
@@ -14,7 +19,14 @@
   </tr>
 
   [%- FOREACH row = QUOTATIONS %]
+  [%- SET RIGHT_TO_EDIT = ((row.vc == 'customer' && AUTH.assert('sales_quotation_edit', 1)) || (row.vc == 'vendor' && AUTH.assert('request_quotation_edit', 1))) %]
+
   <tr class="listrow[% loop.count % 2 %]">
+   <td>
+    [%- IF RIGHT_TO_EDIT %]
+     [% P.checkbox_tag("ids[]", value=HTML.escape(row.id), checked="0") %]
+    [%- END %]
+   </td>
    <td>[% HTML.escape(row.transdate) %]</td>
    <td>[% HTML.escape(row.reqdate) %]</td>
    <td>
@@ -40,3 +52,8 @@
   </tr>
   [%- END %]
  </table>
+
+ <p>
+  [% P.submit_tag('action_close_quotations', LxERP.t8('Close Quotations')) %]
+ </p>
+</form>
diff --git a/templates/webpages/oe/save_periodic_invoices_config.html b/templates/webpages/oe/save_periodic_invoices_config.html
deleted file mode 100644
index 222a49089..000000000
--- a/templates/webpages/oe/save_periodic_invoices_config.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[% USE HTML %]
-[% USE L %]
- <script type="text/javascript">
-  <!--
-      $(function() {
-        window.opener.document.getElementsByName("periodic_invoices_config")[0].value = $("#periodic_invoices_config").prop('value');
-        window.close();
-      })
-    -->
- </script>
-
- <form name="Form">
-  [% L.hidden_tag("periodic_invoices_config", periodic_invoices_config) %]
- </form>
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index 7f85ff379..e4b85ff09 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -33,7 +33,16 @@
     <tr>
      <th align="right">[% HTML.escape(ordlabel) %]</th>
      <td>[% L.input_tag(ordnrname, "", style=style) %]</td>
+     <th align="right">[% 'Status' | $T8 %]</th>
+     <td colspan=3>[% L.select_tag('order_status_id', ALL_ORDER_STATUSES, default = order_status_id, title_key = 'name', with_empty = 1, style=style) %]</td>
     </tr>
+
+[% IF type == "purchase_order_confirmation" %]
+    <tr>
+     <th align="right">[% LxERP.t8("Vendor Confirmation Number") %]</th>
+     <td>[% L.input_tag("vendor_confirmation_number", '', style=style) %]</td>
+    </tr>
+[% END %]
 [% IF is_order %]
     <tr>
      <th align="right">[% LxERP.t8("Customer Order Number") %]</th>
@@ -56,6 +65,34 @@
      <th align="right">[% 'Shipping Point' | $T8 %]</th>
      <td>[% L.input_tag('shippingpoint', '', style=style) %]</td>
     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Name (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptoname", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 1 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_1", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Department 2 (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptodepartment_2", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Street (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptostreet", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Zipcode (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptozipcode", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'City (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocity", "", style=style) %]</td>
+     </tr>
+     <tr>
+      <th align=right nowarp>[% 'Country (Shipping)' | $T8 %]</th>
+      <td>[% L.input_tag("shiptocountry", "", style=style) %]</td>
+     </tr>
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>
      <td>[% L.input_tag("transaction_description", "", style=style) %]</td>
@@ -91,7 +128,7 @@
     </tr>
     [%- END %]
     <tr>
-     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
+     <th align="right">[% IF type == 'purchase_order_confirmation' %][% 'Confirmation Date' | $T8 %][% ELSIF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
        [% L.date_tag('transdatefrom') %]
        [% 'Bis' | $T8 %]
@@ -130,7 +167,7 @@
     <tr>
      <th align="right">[% 'Order probability' | $T8 %]</th>
      <td>
-      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %]
+      [% L.select_tag('order_probability_op', [[ 'ge', '>=' ], [ 'le', '<=' ]]) %] [%-# '> make emacs happy %]
       [% L.select_tag('order_probability_value', ORDER_PROBABILITIES, title='title', with_empty=1) %]
      </td>
     </tr>
@@ -211,6 +248,12 @@
           <label for="l_insertdate">[% 'Insert Date' | $T8 %]</label>
         </td>
         [%- END %]
+[% IF type == "purchase_order_confirmation" %]
+        <td>
+         <input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_vendor_confirmation_number">[% LxERP.t8("Vendor Confirmation Number") %]</label>
+        </td>
+[% END %]
        </tr>
        <tr>
         <td>
@@ -307,6 +350,16 @@
          <input name="l_remaining_netamount" id="l_remaining_netamount" class="checkbox" type="checkbox" value="Y">
          <label for="l_remaining_netamount">[% 'Remaining Net Amount' | $T8 %]</label>
         </td>
+        <td>
+         <input name="l_order_status" id="l_order_status" class="checkbox" type="checkbox" value="Y">
+         <label for="l_order_status">[% 'Status' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_items" id="l_items" class="checkbox" type="checkbox" value="Y">
+         <label for="l_items">[% 'Positions' | $T8 %]</label>
+        </td>
        </tr>
        <tr>
         <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</b></td>
@@ -325,6 +378,43 @@
          <label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label>
         </td>
        </tr>
+       <tr>
+        <td colspan=4 align=left><b>[% 'Shipping Address' | $T8 %]</b></td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptoname" id="l_shiptoname" type="checkbox" value="Y">
+         <label for="l_shiptoname">[% 'Name' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox" value="Y">
+         <label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox" value="Y">
+         <label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptostreet" id="l_shiptostreet" type="checkbox" value="Y">
+         <label for="l_shiptostreet">[% 'Street' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox" value="Y">
+         <label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label>
+        </td>
+        <td>
+         <input name="l_shiptocity" id="l_shiptocity" type="checkbox" value="Y">
+         <label for="l_shiptocity">[% 'City' | $T8 %]</label>
+        </td>
+       </tr>
+       <tr>
+        <td>
+         <input name="l_shiptocountry" id="l_shiptocountry" type="checkbox" value="Y">
+         <label for="l_shiptocountry">[% 'Country' | $T8 %]</label>
+        </td>
+       </tr>
 
       [% CT_CUSTOM_VARIABLES_INCLUSION_CODE %]
 
diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 82bc2f15d..597aae883 100644
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -2,6 +2,10 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE HTML %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
 <h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.order.number -%]</span></h1>
 
 <div id="print_options" style="display:none">
@@ -21,13 +25,26 @@
   [% L.hidden_tag('callback',             FORM.callback) %]
   [% L.hidden_tag('type',                 FORM.type) %]
   [% L.hidden_tag('id',                   SELF.order.id) %]
-  [% L.hidden_tag('converted_from_oe_id', SELF.converted_from_oe_id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.order.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.order.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.order.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
 
   [%- INCLUDE 'common/flash.html' %]
 
   <div class="tabwidget" id="order_tabs">
     <ul>
       <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
 [%- IF INSTANCE_CONF.get_webdav %]
       <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
 [%- END %]
@@ -62,5 +79,4 @@
     </div>
 
   </div>
-
 </form>
diff --git a/templates/webpages/order/tabs/_item_below_input.html b/templates/webpages/order/tabs/_item_below_input.html
new file mode 100644
index 000000000..e758c6518
--- /dev/null
+++ b/templates/webpages/order/tabs/_item_below_input.html
@@ -0,0 +1,48 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+  <tr>
+    <td>
+      [% L.button_tag('kivi.Order.create_part()', LxERP.t8('+'), title=LxERP.t8('Create a new article from line')) %]
+    </td>
+    <td>[% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]</td>
+    <td></td>
+    <td></td>
+    [%- IF SELF.show_update_button -%]
+    <td></td>
+    [%- END -%]
+    <td colspan="[%- IF SELF.search_cvpartnumber -%]2[% ELSE %]1[% END %]">
+          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+          [% P.part.picker('add_item.parts_id', SELF.created_part, style='width: 300px', class="add_item_input",
+                            multiple_pos_input=1,
+                            action={set_multi_items='kivi.Order.add_multi_items'},
+                            classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                            not_order_locked=SELF.type_data.no_order_locked_parts,
+                            $PARAM_KEY=PARAM_VAL) %]</td>
+    </td>
+    <td>
+          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ], [ 'assortment', LxERP.t8('Assortment')] ] %]
+          [% L.select_tag('add_item.create_part_type', type_options) %]
+    </td>
+    <td>[% L.input_tag('add_item.description', SELF.created_part.description, size="40", class="add_item_input", style="wiidth: 300px") %]</td>
+    [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
+    <td></td>
+    [%- END -%]
+    <td>
+        [% L.input_tag('add_item.qty_as_number', '', placeholder="1", size = 5, class="add_item_input numeric") %]
+        [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+    </td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td>[% L.input_tag('add_item.sellprice_as_number', price, size = 10, class="add_item_input numeric tooltipster-html") %]</td>
+    <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric tooltipster-html") %]</td>
+    <td>
+      [% L.button_tag('kivi.Order.add_item()', LxERP.t8('Add part')) %]
+    </td>
+
+  </tr>
diff --git a/templates/webpages/order/tabs/_item_input.html b/templates/webpages/order/tabs/_item_input.html
index 8f75b6f02..3db001119 100644
--- a/templates/webpages/order/tabs/_item_input.html
+++ b/templates/webpages/order/tabs/_item_input.html
@@ -1,6 +1,6 @@
 [%- USE T8 %][%- USE HTML %][%- USE LxERP %][%- USE L %][%- USE P %]
 
- <div>
+<div>
   <table id="input_row_table_id">
     <thead>
       <tr class="listheading">
@@ -18,9 +18,7 @@
       <tr valign="top" class="listrow">
         <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
           [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ] ] %]
-          [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
-            [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
-          [%- END %]
+          [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
           [% L.select_tag('add_item.create_part_type', type_options) %]
           [% L.button_tag('kivi.Order.create_part()', LxERP.t8('+')) %]
         </td>
@@ -32,15 +30,16 @@
                             multiple_pos_input=1,
                             action={set_multi_items='kivi.Order.add_multi_items'},
                             classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                            not_order_locked=SELF.type_data.no_order_locked_parts,
                             $PARAM_KEY=PARAM_VAL) %]</td>
         <td>[% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input") %]</td>
         <td>
-          [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %]
+          [% L.input_tag('add_item.qty_as_number', '', placeholder="1", size = 5, class="add_item_input numeric") %]
           [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
         </td>
         [%- SET price = '' %]
         [%- IF SELF.created_part %]
-          [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
+          [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order_intake' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
         [%- END %]
         <td>[% L.input_tag('add_item.sellprice_as_number', price, size = 10, class="add_item_input numeric tooltipster-html") %]</td>
         <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric tooltipster-html") %]</td>
diff --git a/templates/webpages/order/tabs/_price_sources_dialog.html b/templates/webpages/order/tabs/_price_sources_dialog.html
index 02f1fd396..7f44c9351 100644
--- a/templates/webpages/order/tabs/_price_sources_dialog.html
+++ b/templates/webpages/order/tabs/_price_sources_dialog.html
@@ -5,10 +5,10 @@
 [% SET best_price = price_source.best_price %]
 [% SET best_discount = price_source.best_discount %]
 [% SET price_editable = 0 %]
-[% IF (FORM.type == "sales_order" || FORM.type == "sales_quotation") %]
+[% IF (FORM.type == "sales_order" || FORM.type == "sales_order_intake" || FORM.type == "sales_quotation") %]
   [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
 [% END %]
-[% IF (FORM.type == "purchase_order" || FORM.type == "request_quotation") %]
+[% IF (FORM.type == "purchase_order" || FORM.type == "purchase_order_confirmation" || FORM.type == "request_quotation" || FORM.type == "purchase_quotation_intake") %]
   [% SET price_editable = AUTH.assert('purchase_edit_prices', 1) %]
 [% END %]
 [% SET exfactor = price_source.record.exchangerate ? 1 / price_source.record.exchangerate : 1 %]
diff --git a/templates/webpages/order/tabs/_purchase_delivery_order_item_selection.html b/templates/webpages/order/tabs/_purchase_delivery_order_item_selection.html
new file mode 100644
index 000000000..4ef3dcc6f
--- /dev/null
+++ b/templates/webpages/order/tabs/_purchase_delivery_order_item_selection.html
@@ -0,0 +1,35 @@
+[%- USE LxERP -%][%- USE L -%][%- USE HTML -%]
+<div>
+  [% L.button_tag("kivi.Order.convert_to_purchase_delivery_order_item_selection()", LxERP.t8("Create delivery order")) %]
+</div>
+
+<div>
+  <table>
+    <thead>
+      <tr class="listheading">
+        <th>[% L.checkbox_tag("item_position_selection_checkall", checkall="input.item_position_selection_checkall", checked="checked") %]</th>
+        <th>[% LxERP.t8("Position") %]</th>
+        <th>[% LxERP.t8("Partnumber") %]</th>
+        <th>[% LxERP.t8("Vendor Part Number") %]</th>
+        <th>[% LxERP.t8("Description") %]</th>
+        <th>[% LxERP.t8("Qty") %]</th>
+        <th>[% LxERP.t8("Unit") %]</th>
+      </tr>
+    </thead>
+
+    <tbody id="item_position_selection" class="row_entry listrow">
+      [% FOREACH item = ITEMS %]
+        <tr class="listrow">
+          [% SET pos = loop.count - 1 %]
+          <td>[% L.checkbox_tag("selected_item_positions[+]", class="item_position_selection_checkall", value=loop.count - 1, checked="checked") %]</td>
+          <td align="right">[% loop.count %]</td>
+          <td>[% HTML.escape(item.partnumber) %]</td>
+          <td>[% HTML.escape(item.vendor_partnumber) %]</td>
+          <td>[% HTML.escape(item.description) %]</td>
+          <td align="right">[% HTML.escape(item.qty_as_number) %]</td>
+          <td>[% HTML.escape(item.unit) %]</td>
+        </tr>
+      [% END %]
+    </tbody>
+  </table>
+</div>
diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html
index 0c29b3b5b..6b005fbbe 100644
--- a/templates/webpages/order/tabs/_row.html
+++ b/templates/webpages/order/tabs/_row.html
@@ -15,9 +15,11 @@
                      alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %]
       [%- END %]
       [% L.hidden_tag("orderitem_ids[+]", ID) %]
-      [% L.hidden_tag("converted_from_orderitems_ids[+]", ITEM.converted_from_orderitems_id) %]
+      [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+      [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
       [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
       [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
+      [% L.hidden_tag("purchase_basket_item_ids[+]", ITEM.purchase_basket_item_ids) %]
     </td>
     <td>
       <div name="position" class="numeric">
@@ -62,7 +64,7 @@
       [%- L.hidden_tag("order.orderitems[].longdescription", ITEM.longdescription) %]
       [%- L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L")) %]
     </td>
-    [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+    [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
     <td nowrap>
       [%- L.div_tag(LxERP.format_amount(ITEM.shipped_qty, 2, 0) _ ' ' _ ITEM.unit, name="shipped_qty", class="numeric") %]
     </td>
@@ -99,10 +101,10 @@
                        name = "price_chooser_button") %]
     </td>
     [% SET RIGHT_TO_EDIT_PRICES = 0 %]
-    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
+    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
     [% END %]
-    [% IF (SELF.type == "purchase_order" || SELF.type == "request_quotation") %]
+    [% IF (SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation" || SELF.type == "request_quotation" || SELF.type == "purchase_quotation_intake") %]
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
     [% END %]
     <td>
diff --git a/templates/webpages/order/tabs/_second_row.html b/templates/webpages/order/tabs/_second_row.html
index 8b4d83ad6..8ae6cc6be 100644
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -6,19 +6,23 @@
 
 <table>
   <tr><td colspan="100%">
-    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
+    [%- IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order") %]
       <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
-      [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]&nbsp;
+      [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15 "data-validate"="trimmed_whitespaces") %]&nbsp;
     [%- END %]
     <b>[%- 'Project' | $T8 %]</b>&nbsp;
     [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
-    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
+    [%- IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order") %]
       <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
       [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
     [%- END %]
     <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
     [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;
-    [%- IF (TYPE == "sales_order" || TYPE == "sales_quotation") %]
+    [%- IF TYPE == "sales_order" %]
+      <b>[%- 'Recurring billing' | $T8 %]</b>&nbsp;
+      [% L.select_tag("order.orderitems[].recurring_billing_mode", [[ 'always', LxERP.t8('always') ], [ 'once',   LxERP.t8('once')   ], [ 'never',  LxERP.t8('never')  ]], default=ITEM.recurring_billing_mode) %]&nbsp;
+    [%- END %]
+    [%- IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "sales_quotation") %]
       <b>[%- 'Ertrag' | $T8 %]</b>&nbsp;
         <span name="linemargin">
           <span[%- IF ITEM.marge_total < 0 -%] class="plus0"[%- END -%]>
@@ -35,7 +39,7 @@
                         class="recalc reformat_number numeric") %]&nbsp;
     [%- END %]
     <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
-      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
+      <span class="numeric[%- IF ITEM.part.onhand < ITEM.part.rop -%] plus0[%- END -%]">
         [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
       </span>&nbsp;
     <b>[%- 'Optional' | $T8 %]</b>&nbsp;
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 431490204..79aabd8ad 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -15,9 +15,8 @@
             <th align="right">[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
             [% SET cv_id = SELF.cv _ '_id' %]
             <td>
-              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, style='width: 300px') %]
-              [% P.button_tag("kivi.Order.show_vc_details_dialog()", LxERP.t8("Details (one letter abbreviation)")) %]
-              [% P.link_tag(SELF.url_for(controller='CustomerVendor', action='edit', 'id'=SELF.order.$cv_id, 'db'=SELF.cv), LxERP.t8('Edit'), target="_blank", title=LxERP.t8('Open in new window')) %]
+              [% P.customer_vendor.picker("order.${SELF.cv}" _ '_id', SELF.order.$cv_id, type=SELF.cv, show_details="1",
+                   style='width: 300px') %]
             </td>
           </tr>
 
@@ -75,14 +74,15 @@
           </tr>
 
           [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
+          [% SET show_exchangerate = (SELF.order.currency_id !=INSTANCE_CONF.get_currency_id) %]
           <tr id="currency_settings">
             <th align="right">[% 'Currency' | $T8 %]</th>
             <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
           </tr>
-          <tr id="exchangerate_settings" [%- IF SELF.order.currency_id==INSTANCE_CONF.get_currency_id %]style='display:none'[%- END %]>
+          <tr id="exchangerate_settings" [%- IF !show_exchangerate %]style='display:none'[%- END %]>
             <th align="right">[% 'Exchangerate' | $T8 %]</th>
             <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
-              [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, size="15", class="reformat_number_as_null_number numeric") %]
+              [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, 'data-validate'=show_exchangerate ? 'required' : '', size="15", class="reformat_number_as_null_number numeric") %]
               [% INSTANCE_CONF.default_currency %]
               [% L.hidden_tag('old_currency_id', currency_id) %]
               [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
@@ -144,11 +144,24 @@
             </td>
           </tr>
 
+          [%- IF SELF.all_statuses.size %]
+          <tr>
+            <th align="right">[% 'Status' | $T8 %]</th>
+            <td>[% L.select_tag('order.order_status_id',
+              SELF.all_statuses,
+              default=SELF.order.order_status_id,
+              with_empty=1,
+              style='width:100%',
+              title_key='name') %]</td>
+          </tr>
+          [%- END -%]
+
           <tr>
             <th align="right">[% 'Employee' | $T8 %]</th>
             <td>[% L.select_tag('order.employee_id',
               SELF.all_employees,
               default=(SELF.order.employee_id ? SELF.order.employee_id : SELF.current_employee_id),
+              style='width:100%',
               title_key='safe_name') %]</td>
           </tr>
 
@@ -158,13 +171,14 @@
             <td>[% L.select_tag('order.salesman_id',
               SELF.all_salesmen,
               default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+              style='width:100%',
               title_key='safe_name') %]</td>
           </tr>
           [% END %]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            <th width="70%" align="right" nowrap>[% IF SELF.type == "purchase_order_confirmation" %][% 'Order Confirmation Number' | $T8 %][% ELSE %][% 'Order Number' | $T8 %][% END %]</th>
             <td>
               [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
                 [% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
@@ -178,7 +192,20 @@
           </tr>
           [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+          [% IF SELF.type == "purchase_order_confirmation" %]
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
+            [%-
+              numbers = [];
+              FOREACH p = SELF.order.preceding_purchase_orders();
+                numbers.push(HTML.escape(p.ordnumber));
+              END;
+              %]
+            <td>[% numbers.join(', ') %]</td>
+          </tr>
+          [% END %]
+
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") -%]
             [%- SET quo_nr_txt = 'Quotation Number' -%]
           [%- ELSE -%]
             [%- SET quo_nr_txt = 'RFQ Number' -%]
@@ -186,7 +213,7 @@
           <tr>
             <th width="70%" align="right" nowrap>[% quo_nr_txt | $T8 %]</th>
             <td>
-              [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+              [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
                 [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11) %]
               [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
                 [% L.input_tag('order.quonumber', SELF.order.quonumber, size = 11, onchange='kivi.Order.set_number_in_title(this)') %]
@@ -199,16 +226,25 @@
             </td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "purchase_order_confirmation") -%]
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Vendor Confirmation Number' | $T8 %]</th>
+            <td>[% L.input_tag('order.vendor_confirmation_number', SELF.order.vendor_confirmation_number, size = 11) %]</td>
+          </tr>
+          [%- END -%]
+
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
           <tr>
             <th width="70%" align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size = 11) %]</td>
           </tr>
           [%- END -%]
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
             [%- SET transdate_txt = 'Order Date' -%]
-          [%- ELSIF SELF.type == "sales_quotation" -%]
+          [%- ELSIF SELF.type == "purchase_order_confirmation" -%]
+            [%- SET transdate_txt = 'Confirmation Date' -%]
+          [%- ELSIF (SELF.type == "sales_quotation" || SELF.type == "purchase_quotation_intake") -%]
             [%- SET transdate_txt = 'Quotation Date' -%]
           [%- ELSE -%]
             [%- SET transdate_txt = 'RFQ Date' -%]
@@ -223,7 +259,7 @@
             <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class="recalc") %]</td>
           </tr>
 
-          [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+          [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
             [%- SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' -%]
           [%- ELSIF SELF.type == "sales_quotation" -%]
             [%- SET reqdate_txt = 'Valid until'; SET reqdate_class = '' -%]
@@ -257,9 +293,11 @@
     </tr>
   </table>
 
+  [%- IF order_item_input_position == 0 -%]
   [%- PROCESS order/tabs/_item_input.html SELF=SELF %]
 
   [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+  [%- END -%]
 
   <table width="100%">
     <tr>
@@ -298,7 +336,7 @@
                 [%- END -%]
                 <th id="partclass_header_id"    class="listheading" nowrap width="2">[%- 'Type'  | $T8 %]</th>
                 <th id="description_header_id"  class="listheading" nowrap           ><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
-                [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
+                [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order" || SELF.type == "purchase_order_confirmation") -%]
                 <th id="shipped_qty_header_id"  class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("shipped_qty")'>[%- 'Delivered'   | $T8 %]</a></th>
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
@@ -315,13 +353,23 @@
               [%- PROCESS order/tabs/_row.html ITEM=item ID=(item.id||item.new_fake_id)  -%]
             [%- END %]
 
+            <tbody id="row_table_footer" class="listrow">
+            [% IF order_item_input_position == 1 %]
+              [%- PROCESS order/tabs/_item_below_input.html SELF=SELF %]
+            [%- END -%]
+            </tbody>
+
           </table>
+          [% IF order_item_input_position == 1 %]
+            [% L.button_tag('kivi.Order.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+          [%- END -%]
         </div>
-
       </td>
     </tr>
 
     <tr>
+      <td>
+      </td>
     </tr>
 
     <tr>
@@ -377,8 +425,8 @@
               </table>
             </td>
 
-            [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
-            [%- SET marge_class = (SELF.order.marge_total < 0) ? 'plus0' : '' -%]
+            [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
+            [%- SET marge_class = ((SELF.order.marge_total || 0) < 0) ? 'plus0' : '' -%]
             <td>
               <table>
                 <tr>
diff --git a/templates/webpages/order/tabs/phone_notes.html b/templates/webpages/order/tabs/phone_notes.html
index b1d211752..c5f0015c4 100644
--- a/templates/webpages/order/tabs/phone_notes.html
+++ b/templates/webpages/order/tabs/phone_notes.html
@@ -15,7 +15,7 @@
 
     [%- FOREACH row = SELF.order.phone_notes %]
      <tr class="listrow">
-       <td>[% P.link_tag('#', row.subject, onclick="kivi.Order.load_phone_note(" _ HTML.url(row.id) _ ", '" _ HTML.escape(row.subject) _ "', '" _ HTML.escape(row.body) _ "')") %]</td>
+       <td>[% P.link_tag('#', row.subject, onclick="kivi.Order.load_phone_note(" _ HTML.url(row.id) _ ", '" _ HTML.escape(row.subject) _ "', '" _ row.body _ "')") %]</td>
        <td>[% row.itime.to_kivitendo | html %]</td>
        <td>[% row.employee.safe_name | html %]</td>
      </tr>
@@ -34,7 +34,7 @@
     </tr>
     <tr>
       <td valign="right" align="top">[% 'Body' | $T8 %]</td>
-      <td align="top">[% L.textarea_tag('phone_note.body', '', cols = 50 rows = 10) %]</td>
+      <td align="top">[% L.textarea_tag('phone_note.body', '', wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]</td>
     </tr>
   </table>
 
diff --git a/templates/webpages/part/_assembly.html b/templates/webpages/part/_assembly.html
index bc32cf899..e10ec738b 100644
--- a/templates/webpages/part/_assembly.html
+++ b/templates/webpages/part/_assembly.html
@@ -10,6 +10,7 @@
 
 [% L.hidden_tag('assembly_id', SELF.part.id) %]
 
+<div style="overflow-y: auto; height:65vh;">
 <table id="assembly_items">
  <thead>
    <tr class="listheading">
@@ -28,6 +29,7 @@
      <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
      <th class="listheading" nowrap width="5" >[%- 'BOM'          | $T8 %] </th>
      <th class="listheading" nowrap width="5" >[%- 'Line Total'   | $T8 %] </th>
+     <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
      <th id="sellprice_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("sellprice")' >[%- 'Sellprice'       | $T8 %]</a></th>
      <th id="lastcost_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("lastcost")'   >[%- 'Lastcost'       | $T8 %]</a></th>
      <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'         >[%- 'Partsgroup'       | $T8 %]</a></th>
@@ -54,6 +56,7 @@
  <td></td>
  [% END %]
  <td></td>
+ <td></td>
  <td align="right">[% 'Totals' | $T8 %]:</td>
  <td></td>
  <td id="items_sellprice_sum" class="numeric">[%- LxERP.format_amount(items_sellprice_sum, 2, 0) %]</td>
@@ -61,8 +64,11 @@
  <td></td>
 </tr>
 <tr>
+ [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
  <td></td>
  <td></td>
+ [% END %]
+ <td></td>
  <td></td>
  <td></td>
  <td></td>
@@ -78,8 +84,11 @@
  </td>
 </tr>
 <tr>
+ [% IF SELF.orphaned || AUTH.assert('assembly_edit', 1) %]
  <td></td>
  <td></td>
+ [% END %]
+ <td></td>
  <td></td>
  <td></td>
  <td></td>
@@ -103,12 +112,13 @@
  <td></td>
  <td></td>
  <td></td>
+ <td></td>
  <td align="right">[% L.button_tag("kivi.Part.set_assembly_sellprice()", LxERP.t8("Set sellprice")) %]</td>
  <td></td>
 </tr>
 </tbody>
 </table>
-
+</div>
 [% L.sortable_element('#assembly_rows') %]
 
 <div>
diff --git a/templates/webpages/part/_assembly_row.html b/templates/webpages/part/_assembly_row.html
index a97421200..827961f71 100644
--- a/templates/webpages/part/_assembly_row.html
+++ b/templates/webpages/part/_assembly_row.html
@@ -51,6 +51,9 @@
     <td align="right">
       [%- L.div_tag(LxERP.format_amount(ITEM.linetotal_sellprice, 3, 0), name="linetotal") %]
       </td>
+    <td align="right">
+      [% ITEM.part.price_factor.description %]
+    </td>
     <td align="right">
       [% ITEM.part.sellprice_as_number %]
       </td>
diff --git a/templates/webpages/part/_assortment.html b/templates/webpages/part/_assortment.html
index db4330549..6622311e1 100644
--- a/templates/webpages/part/_assortment.html
+++ b/templates/webpages/part/_assortment.html
@@ -10,6 +10,7 @@
 
 [% L.hidden_tag('assortment_id', SELF.part.id) %]
 
+<div style="overflow-y: auto; height:65vh;">
 <table id="assortment_items">
  <thead>
    <tr class="listheading">
@@ -27,6 +28,7 @@
      <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
      <th class="listheading" nowrap width="5" >[%- 'Charge'       | $T8 %] </th>
      <th class="listheading" nowrap width="5" >[%- 'Line Total'   | $T8 %] </th>
+     <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
      <th id="sellprice_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("sellprice")'> [%- 'Sellprice'   | $T8 %]</a></th>
      <th id="lastcost_header_id"   class="listheading" nowrap width="10" ><a href='#' onClick='javascript:kivi.Part.reorder_items("lastcost")'> [%- 'Lastcost'      | $T8 %]</a></th>
      <th id="_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Part.reorder_items("partsgroup")'> [%- 'Partsgroup'       | $T8 %]</a></th>
@@ -41,7 +43,7 @@
  <td></td>
  <td></td>
  <td align="right">[% 'Part' | $T8 %]:</td>
- <td>[% P.part.picker('add_items[+].parts_id', '', style='width: 300px', multiple=1, id='assortment_picker', action={set_multi_items='kivi.Part.set_multi_assortment_items'}) %]</td>
+ <td>[% P.part.picker('add_items[+].parts_id', '', style='width: 300px', multiple=1, id='assortment_picker', action={set_multi_items='kivi.Part.set_multi_assortment_items', commit_one='kivi.Part.add_assortment_item'}) %]</td>
  <td>[%- L.button_tag("kivi.Part.add_assortment_item()", LxERP.t8("Add")) %]</td>
  <td>[% L.button_tag('$("#assortment_picker").data("part_picker").open_dialog()', LxERP.t8('Add multiple items')) %]</td>
  <td>[% L.hidden_tag('add_items[].qty_as_number', 1) %]</td>
@@ -51,13 +53,13 @@
  <td></td>
  <td></td>
  <td></td>
- <td></td>
  [% END %]
  <td></td>
+ <td></td>
  <td align="right">[% 'Totals' | $T8 %]:</td>
- <th id="items_sellprice_sum" class="numeric">[%- LxERP.format_amount(items_sellprice_sum, 2, 0) %]</td>
- <th id="items_lastcost_sum"  class="numeric">[%- LxERP.format_amount(items_lastcost_sum,  2, 0) %]</td>
- <th id="items_sum_diff"      class="numeric">[%- LxERP.format_amount(items_sum_diff,      2, 0) %]</td>
+ <th id="items_sellprice_sum" class="numeric">[%- LxERP.format_amount(items_sellprice_sum, 2, 0) %]</th>
+ <th id="items_lastcost_sum"  class="numeric">[%- LxERP.format_amount(items_lastcost_sum,  2, 0) %]</th>
+ <th id="items_sum_diff"      class="numeric">[%- LxERP.format_amount(items_sum_diff,      2, 0) %]</th>
 </tr>
 <tr>
  [% IF SELF.orphaned || AUTH.assert('assortment_edit', 1) %]
@@ -71,13 +73,14 @@
  <td></td>
  <td></td>
  <td></td>
+ <td></td>
  <td align="right">[% L.button_tag("kivi.Part.set_assortment_sellprice()", LxERP.t8("Set sellprice")) %]</td>
  <td align="right">[% L.button_tag("kivi.Part.set_assortment_lastcost()",  LxERP.t8("Set lastcost"))  %]</td>
  <td></td>
 </tr>
 </tbody>
 </table>
-
+</div>
 [% L.sortable_element('#assortment_rows') %]
 
 </div>
diff --git a/templates/webpages/part/_assortment_row.html b/templates/webpages/part/_assortment_row.html
index 6edd9bb75..39e1f4f19 100644
--- a/templates/webpages/part/_assortment_row.html
+++ b/templates/webpages/part/_assortment_row.html
@@ -59,6 +59,9 @@
     <td align="right">
       [%- L.div_tag(LxERP.format_amount(ITEM.linetotal_sellprice, 2, 0), name="linetotal") %]
       </td>
+    <td align="right">
+      [% ITEM.part.price_factor.description %]
+      </td>
     <td align="right">
       [% ITEM.part.sellprice_as_number %]
       </td>
diff --git a/templates/webpages/part/_basic_data.html b/templates/webpages/part/_basic_data.html
index a9fa531ca..77351e159 100644
--- a/templates/webpages/part/_basic_data.html
+++ b/templates/webpages/part/_basic_data.html
@@ -35,6 +35,10 @@
                <th align="right">[% 'EAN-Code' | $T8 %]</th>
                <td>[% L.input_tag("part.ean", SELF.part.ean, size=40, "data-validate"="trimmed_whitespaces") %]</td>
              </tr>
+             <tr>
+               <th align="right">[% 'Tariff Code' | $T8 %]</th>
+               <td>[% L.input_tag("part.tariff_code", SELF.part.tariff_code, size=40, "data-validate"="trimmed_whitespaces") %]</td>
+             </tr>
              <tr>
               [%- IF SELF.all_partsgroups.size %]
               <th align="right">[% 'Partsgroup' | $T8 %]</th>
@@ -104,21 +108,38 @@
 
           <tr>
            <th align="right" nowrap="true">[% 'List Price' | $T8 %]</th>
-           <td>[% L.input_tag("part.listprice_as_number", SELF.part.listprice_as_number, size=11 class='reformat_number numeric') %]</td>
+           <td>
+            [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+             [% L.input_tag("part.listprice_as_number", SELF.part.listprice_as_number, size=11 class='reformat_number numeric') %]</td>
+            [% ELSE %]
+             <span class="numeric">[% SELF.part.listprice_as_number %]</span>
+            [% END %]
           </tr>
 
           <tr  >
            <th align="right" nowrap="true">[% 'Sell Price' | $T8 %]</th>
-           <td>[% L.input_tag("part.sellprice_as_number", SELF.part.sellprice_as_number, size=11, class='reformat_number numeric') %] [% IF (SELF.part.is_assortment or SELF.part.is_assembly) %] (<span id="items_sellprice_sum_basic">[% LxERP.format_amount(SELF.part.items_sellprice_sum, 2) %]</span>) [% END %]</td>
+           <td>
+            [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+             [% L.input_tag("part.sellprice_as_number", SELF.part.sellprice_as_number, size=11, class='reformat_number numeric') %]
+             [% IF (SELF.part.is_assortment or SELF.part.is_assembly) %] (<span id="items_sellprice_sum_basic">[% LxERP.format_amount(SELF.part.items_sellprice_sum, 2) %]</span>) [% END %]
+            [% ELSE %]
+             <span class="numeric">[% SELF.part.sellprice_as_number %]</span>
+            [% END %]
+           </td>
           </tr>
-
-          [%- UNLESS SELF.part.is_assembly %]
           <tr>
            <th align="right" nowrap="true">[% 'Last Cost' | $T8 %]</th>
-           <td>[% L.input_tag("part.lastcost_as_number", SELF.part.lastcost_as_number, size=11 class='reformat_number numeric') %]
-           [% IF SELF.part.is_assortment %] (<span id="items_lastcost_sum_basic">[% LxERP.format_amount(SELF.part.items_lastcost_sum, 2) %]</span>) [% END %]</td>
+           <td>
+            [%- UNLESS SELF.part.is_assembly %]
+             [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+              [% L.input_tag("part.lastcost_as_number", SELF.part.lastcost_as_number, size=11 class='reformat_number numeric') %]
+             [% ELSE %]
+              <span class="numeric">[% SELF.part.lastcost_as_number %]</span>
+            [% END %]
+            [%- END %]
+            [% IF SELF.part.is_assortment || SELF.part.is_assembly %] (<span id="items_lastcost_sum_basic">[% LxERP.format_amount(SELF.part.items_lastcost_sum, 2) %]</span>) [% END %]
+           </td>
           </tr>
-          [%- END %]
 
           [%- IF SELF.all_price_factors.size %]
           <tr>
@@ -160,6 +181,10 @@
            <th align="right" nowrap="true">[% 'ROP' | $T8 %]</th>
            <td>[% L.input_tag("part.rop_as_number", SELF.part.rop_as_number, size=10, class="reformat_number numeric") %]</td>
           </tr>
+          <tr>
+           <th align="right" nowrap="true">[% 'Order Size' | $T8 %]</th>
+           <td>[% L.input_tag("part.order_qty_as_number", SELF.part.order_qty_as_number, size=10, class="numeric") %]</td>
+          </tr>
           [% IF SELF.all_warehouses.size %]
           <tr>
            <th align="right" nowrap="true">[% 'Default Warehouse' | $T8 %]</th>
@@ -172,7 +197,7 @@
            <td>
             <span id='bin'>
             [% IF SELF.part.warehouse.id %]
-            [% L.select_tag('part.bin_id', SELF.part.warehouse.bins, default=SELF.part.bin.id, title_key='description') %]
+            [% L.select_tag('part.bin_id', SELF.part.warehouse.bins_sorted_naturally, default=SELF.part.bin.id, title_key='description', with_empty=0) %]
             [%- END %]
             </span>
            </td>
@@ -190,6 +215,10 @@
            <th align="right" nowrap><label for="not_discountable">[% 'Not Discountable' | $T8 %]</label></th>
            <td>[% L.checkbox_tag('part.not_discountable', checked = SELF.part.not_discountable, for_submit=1) %]</td>
           </tr>
+          <tr>
+           <th align="right" nowrap="true"><label for="order_locked">[% 'Do not order anymore' | $T8 %]</label></th>
+           <td>[% L.checkbox_tag('part.order_locked', checked = SELF.part.order_locked, for_submit=1) %]</td>
+          </tr>
         [%- IF SELF.part.id %]
           <tr>
            <th align="right" nowrap="true"><label for="obsolete">[% 'Obsolete' | $T8 %]</label></th>
@@ -236,6 +265,7 @@
 [%- UNLESS SELF.part.is_assembly %]
  [% PROCESS 'part/_makemodel.html' %]
 [% END %]
+ [% PROCESS 'part/_businessmodels.html' %]
 
   <tr>
     <td><hr size="3" noshade></td>
diff --git a/templates/webpages/part/_businessmodel_row.html b/templates/webpages/part/_businessmodel_row.html
new file mode 100644
index 000000000..d26f1060e
--- /dev/null
+++ b/templates/webpages/part/_businessmodel_row.html
@@ -0,0 +1,20 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP %]
+        <tr class="listrow businessmodel_row">
+         <td align="center">
+           [%- L.hidden_tag("businessmodels[+].business_id", businessmodel.business_id) -%]
+           [%- L.button_tag("kivi.Part.delete_businessmodel_row(this)",
+                            LxERP.t8("X")) %] [% # , confirm=LxERP.t8("Are you sure?")) %]
+         </td>
+         <td><span name="position" class="numeric">[% HTML.escape(businessmodel.position) %]</span></td>
+         <td align="center">
+           <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
+         </td>
+         <td></td>
+         <td>[% businessmodel.business.description | html %]</td>
+         <td>[% L.input_tag('businessmodels[].model', businessmodel.model, size=30 ) %]</td>
+         <td>[% L.input_tag('businessmodels[].part_description',         businessmodel.part_description,     size=30 ) %]</td>
+         <td>[% L.areainput_tag('businessmodels[].part_longdescription', businessmodel.part_longdescription, size=30 ) %]
+        </tr>
diff --git a/templates/webpages/part/_businessmodels.html b/templates/webpages/part/_businessmodels.html
new file mode 100644
index 000000000..056958c66
--- /dev/null
+++ b/templates/webpages/part/_businessmodels.html
@@ -0,0 +1,42 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE P %]
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+  </tr>
+  <tr>
+    <td>
+      <table id="businessmodel_table">
+        <thead>
+         <tr>
+          <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+          <th class="listheading">[% 'position'            | $T8 %]</th>
+          <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+          <th class="listheading"></th>
+          <th class="listheading">[% 'Business'            | $T8 %]</th>
+          <th class="listheading">[% 'Business Type Model' | $T8 %]</th>
+          <th class="listheading">[% 'Part Description'    | $T8 %]</th>
+          <th class="listheading">[% 'Long Description'    | $T8 %]</th>
+         </tr>
+        </thead>
+        <tbody id="businessmodel_rows">
+        [%- FOREACH businessmodel = SELF.part.businessmodels_sorted %]
+          [% PROCESS 'part/_businessmodel_row.html' businessmodel=businessmodel %]
+        [%- END %]
+       </tbody>
+       <tbody>
+        <tr>
+         <td></td>
+         <td></td>
+         <td></td>
+         <td align="right">[% 'Business' | $T8 %]</td>
+         <td>[% P.select_tag('add_businessmodel', SELF.all_businesses, title_key="description", with_empty=1, style='width: 300px', onchange='kivi.Part.add_businessmodel_row()') %]</td>
+         <td align="right">[% L.button_tag('kivi.Part.add_businessmodel_row()', LxERP.t8('Add')) %]</td>
+         <td></td>
+        </tr>
+       </tbody>
+      </table>
+    </td>
+  </tr>
+  [% L.sortable_element('#businessmodel_rows') %]
diff --git a/templates/webpages/part/_customerprice_row.html b/templates/webpages/part/_customerprice_row.html
index 5888bba7c..9661f0f56 100644
--- a/templates/webpages/part/_customerprice_row.html
+++ b/templates/webpages/part/_customerprice_row.html
@@ -17,7 +17,15 @@
          </td>
          <td>[% customerprice.customer.customernumber | html %]</td>
          <td>[% customerprice.customer.name         | html %] </td>
-         <td>[% L.input_tag('customerprices[].customer_partnumber', customerprice.customer_partnumber, size=30 ) %]</td>
-         <td>[% L.input_tag('customerprices[].price_as_number'    , customerprice.price_as_number    , size=15 , class="reformat_number numeric") %]</td>
-         <td>[% L.hidden_tag('customerprices[].lastupdate'         , customerprice.lastupdate.to_kivitendo) %][% customerprice.lastupdate.to_kivitendo | html %]</td>
+         <td>[% L.input_tag('customerprices[].customer_partnumber'     , customerprice.customer_partnumber , size=30 ) %]</td>
+         <td>[% L.input_tag('customerprices[].part_description'        , customerprice.part_description    , size=30 ) %]</td>
+         <td>[% L.areainput_tag('customerprices[].part_longdescription', customerprice.part_longdescription, size=30 ) %]</td>
+         <td>
+          [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+           [% L.input_tag('customerprices[].price_as_number'           , customerprice.price_as_number     , size=15 , class="reformat_number numeric") %]
+          [% ELSE %]
+           <span class="numeric">[% customerprice.price_as_number %]</span>
+          [% END %]
+         </td>
+         <td>[% L.hidden_tag('customerprices[].lastupdate'             , customerprice.lastupdate.to_kivitendo) %][% customerprice.lastupdate.to_kivitendo | html %]</td>
         </tr>
diff --git a/templates/webpages/part/_customerprices.html b/templates/webpages/part/_customerprices.html
index 3f7eeb63a..2f7b54de9 100644
--- a/templates/webpages/part/_customerprices.html
+++ b/templates/webpages/part/_customerprices.html
@@ -1,6 +1,6 @@
 [%- USE T8 %]
 [%- USE L %]
-[%- USE HTML %]
+[%- USE P %]
 [%- USE LxERP %]
   <tr>
   </tr>
@@ -15,6 +15,8 @@
           <th class="listheading" style='width:12em'>[% 'Customer Number'      | $T8 %]</th>
           <th class="listheading">[% 'Customer'             | $T8 %]</th>
           <th class="listheading">[% 'Customer Part Number' | $T8 %]</th>
+          <th class="listheading">[% 'Part Description'     | $T8 %]</th>
+          <th class="listheading">[% 'Long Description'     | $T8 %]</th>
           <th class="listheading">[% 'Customer Price'       | $T8 %]</th>
           <th class="listheading">[% 'Updated'              | $T8 %]</th>
          </tr>
diff --git a/templates/webpages/part/_makemodel.html b/templates/webpages/part/_makemodel.html
index e15797767..e93b44d6d 100644
--- a/templates/webpages/part/_makemodel.html
+++ b/templates/webpages/part/_makemodel.html
@@ -14,10 +14,12 @@
           <th class="listheading">[% 'position'     | $T8 %]</th>
           <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
           <th class="listheading" style='width:12em'>[% 'Vendor Number' | $T8 %]</th>
-          <th class="listheading">[% 'Vendor'        | $T8 %]</th>
-          <th class="listheading">[% 'Model'         | $T8 %]</th>
-          <th class="listheading">[% 'Last Cost'     | $T8 %]</th>
-          <th class="listheading">[% 'Updated'       | $T8 %]</th>
+          <th class="listheading">[% 'Vendor'           | $T8 %]</th>
+          <th class="listheading">[% 'Model'            | $T8 %]</th>
+          <th class="listheading">[% 'Part Description' | $T8 %]</th>
+          <th class="listheading">[% 'Long Description' | $T8 %]</th>
+          <th class="listheading">[% 'Last Cost'        | $T8 %]</th>
+          <th class="listheading">[% 'Updated'          | $T8 %]</th>
          </tr>
         </thead>
         <tbody id="makemodel_rows">
diff --git a/templates/webpages/part/_makemodel_row.html b/templates/webpages/part/_makemodel_row.html
index 8e7308ca4..8a3e354b4 100644
--- a/templates/webpages/part/_makemodel_row.html
+++ b/templates/webpages/part/_makemodel_row.html
@@ -17,7 +17,15 @@
          </td>
          <td>[% makemodel.vendor.vendornumber | html %]</td>
          <td>[% makemodel.vendor.name         | html %] </td>
-         <td>[% L.input_tag('makemodels[].model'              , makemodel.model                   , size=30 ) %]</td>
-         <td>[% L.input_tag('makemodels[].lastcost_as_number' , makemodel.lastcost_as_number      , size=15 , class="reformat_number numeric") %]</td>
-         <td>[% L.hidden_tag('makemodels[].lastupdate'         , makemodel.lastupdate.to_kivitendo) %][% makemodel.lastupdate.to_kivitendo | html %]</td>
+         <td>[% L.input_tag('makemodels[].model'                   , makemodel.model               , size=30 ) %]</td>
+         <td>[% L.input_tag('makemodels[].part_description'        , makemodel.part_description    , size=30 ) %]</td>
+         <td>[% L.areainput_tag('makemodels[].part_longdescription', makemodel.part_longdescription, size=30 ) %]</td>
+         <td>
+          [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+           [% L.input_tag('makemodels[].lastcost_as_number'        , makemodel.lastcost_as_number  , size=15 , class="reformat_number numeric") %]
+          [% ELSE %]
+           <span class="numeric">[% makemodel.lastcost_as_number %]</span>
+          [% END %]
+         </td>
+         <td>[% L.hidden_tag('makemodels[].lastupdate'             , makemodel.lastupdate.to_kivitendo) %][% makemodel.lastupdate.to_kivitendo | html %]</td>
         </tr>
diff --git a/templates/webpages/part/_pricegroup_prices.html b/templates/webpages/part/_pricegroup_prices.html
index f481724bf..84cee90b5 100644
--- a/templates/webpages/part/_pricegroup_prices.html
+++ b/templates/webpages/part/_pricegroup_prices.html
@@ -16,7 +16,13 @@
           <td style='display:none'>[% L.hidden_tag('prices[+].pricegroup_id', pricegroup.id) %]
           [% L.hidden_tag('prices[].price_id', price.id) # id not used? %]</td>
           <td width=50%>[% L.hidden_tag('prices[].pricegroup', pricegroup.pricegroup) %][% HTML.escape(pricegroup.pricegroup) %]</td>
-          <td width=50%>[% L.input_tag('prices[].price', price.price_as_number, size=11, class='numeric reformat_number') %]</td>
+          <td width=50%>
+           [% IF (AUTH.assert('part_service_assembly_edit_prices', 'may_fail')) %]
+            [% L.input_tag('prices[].price', price.price_as_number, size=11, class='numeric reformat_number') %]
+           [% ELSE %]
+            <span class="numeric">[% price.price_as_number %]</span>
+           [% END %]
+          </td>
         </tr>
         [%- END %]
       </table>
diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html
index 3147fd132..e46419145 100644
--- a/templates/webpages/part/part_picker_search.html
+++ b/templates/webpages/part/part_picker_search.html
@@ -9,7 +9,7 @@
 [% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', search_term, class='part_picker_filter') %]
 
 <div class='float-right'>
-  [% L.checkbox_tag('no_paginate', checked=FORM.no_paginate, id='no_paginate', for_submit=1, label=LxERP.t8('All as list')) %]
+  [% L.checkbox_tag('no_paginate', checked=FORM.no_paginate, id='no_paginate', checked=all_as_list, for_submit=1, label=LxERP.t8('All as list')) %]
 </div>
 
 <div style='clear:both'></div>
diff --git a/templates/webpages/part/showdetails.html b/templates/webpages/part/showdetails.html
new file mode 100644
index 000000000..8a98066a2
--- /dev/null
+++ b/templates/webpages/part/showdetails.html
@@ -0,0 +1,96 @@
+[%- USE LxERP -%][% USE L %][% USE HTML %][%- USE JavaScript -%][% USE T8 %][%- USE Dumper %]
+
+<div style="padding-bottom: 15px">
+  <table style="width: 100%" border="0px" ><tbody>
+      <tr>
+        <td><b>[%  LxERP.t8('Description') %]</b></td><td colspan="3">[% part.description %]</td>
+      </tr>
+     <tr>
+        <td><b>[%  LxERP.t8('Default Warehouse') %]</b></td><td>[% part.warehouse.description %]</td>
+        <td><b>[%  LxERP.t8('Default Bin') %]</b></td><td>[% part.bin.description %]</td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('ROP') %]</b></td><td>[% part.rop_as_number %]</td>
+      </tr>
+      <tr>
+        [%- IF stock_amounts.size %]
+        <td colspan="4"><table style="width: 100%">
+          <tr class='listheading'>
+           <th class="listheading">[% 'Warehouse'   | $T8 %]</th>
+           <th class="listheading">[% 'Bin'         | $T8 %]</th>
+           <th class="listheading">[% 'Chargenumber'         | $T8 %]</th>
+           <th class="listheading">[% 'Qty'         | $T8 %]</th>
+           <th class="listheading">[% 'Unit'        | $T8 %]</th>
+         </tr>
+         [% FOREACH stock = stock_amounts %]
+          <tr class='listrow'>
+           <td                >[% HTML.escape(stock.warehouse_description)  %]</td>
+           <td                >[% IF stock.order_link %]<a target="_blank" href="[% stock.order_link %]">[% END %]
+                               [% HTML.escape(stock.bin_description)        %]
+                               [% IF stock.order_link %]</a>[% END %]
+           </td>
+           <td                >[% HTML.escape(stock.chargenumber)                   %]</td>
+           <td class='numeric'>[% LxERP.format_amount(stock.qty, dec)       %]</td>
+           <td                >[% HTML.escape(stock.unit)                   %]</td>
+          </tr>
+          [% IF stock.wh_lead != stock.warehouse_description %]
+          <tr class='listheading'>
+           <th class="listheading"                >[% HTML.escape(stock.warehouse_description)           %]</th>
+           <td></td>
+           <td></td>
+           <td class='numeric bold'>[% LxERP.format_amount(stock.wh_run_qty, dec)         %]</td>
+           <td></td>
+          </tr>
+          [% END %]
+          [% IF loop.last %]
+          <tr class='listheading'>
+           <th class="listheading">[% 'Total' | $T8 %]</th>
+           <td></td>
+           <td></td>
+           <td class='numeric bold'>[% LxERP.format_amount(stock.run_qty, dec)         %]</td>
+           <td></td>
+          </tr>
+          [% END %]
+         [% END %]
+        [% ELSE %]
+        <td>
+          <p>[% 'No transactions yet.' | $T8 %]</p>
+        [% END %]
+        </td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Sum Amount') %]</b></td><td>[% LxERP.format_amount(sum, 2) %] [% part.unit %]</td>
+        <td rowspan="5">
+          [%- IF part.image && INSTANCE_CONF.get_parts_show_image %]
+          <a href="[% part.image | html %]" target="_blank"><img style="[% INSTANCE_CONF.get_parts_image_css %]" src="[% part.image | html %]"/></a>
+          [% END %]
+        </td>
+        <td rowspan="5">
+        </td>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Not delivered amount') %]</b></td><td colspan="3">[% LxERP.format_amount(not_delivered, 2) %] [% part.unit %]</td></tr>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Ordered, but not delivered (purchase)') %]</b></td><td colspan="3">[% LxERP.format_amount(ordered, 2) %] [% part.unit %]</td></tr>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Available amount') %]</b></td><td colspan="3">[% LxERP.format_amount(part.onhandqty, 2) %] [% part.unit %]</td></tr>
+      </tr>
+      <tr>
+        <td><b>[%  LxERP.t8('Consume average') %]</b></td><td colspan="3">[% LxERP.format_amount(average, 2) %] [% part.unit %] [% LxERP.t8('per month') %]</td></tr>
+        <tr><td colspan="4" nowrap>([%  LxERP.t8('in the time between') %] [% fromdate.to_kivitendo %] - [% todate.to_kivitendo %])</td>
+      </tr>
+      <tr>
+        <td>[%- L.button_tag("return \$('#detail_menu').dialog('close');", LxERP.t8('Close Details'), class => "submit") %]</td>
+      </tr>
+  </tbody></table>
+</div>
+<div id="print_options" >
+  <form id="print_options_form">
+    [% print_options %]
+    <br>
+    [% L.button_tag('kivi.Part.print_from_showdetail(' _ part.id _ ')', LxERP.t8('Print')) %]
+  </form>
+</div>
+
diff --git a/templates/webpages/part/test_page.html b/templates/webpages/part/test_page.html
index 0101db1e5..00afb7c3a 100644
--- a/templates/webpages/part/test_page.html
+++ b/templates/webpages/part/test_page.html
@@ -32,6 +32,10 @@ Artikel-Status: Ungültig<br>
 [% P.part.picker('part_id17', undef, status="obsolete") %]<br>
 Artikel-Status: Alle<br>
 [% P.part.picker('part_id18', undef, status="all") %]<br>
+Nicht bestellbare Artikel:<br>
+[% P.part.picker('part_id19', undef, order_locked=1) %]<br>
+Bestellbare Artikel:<br>
+[% P.part.picker('part_id19', undef, not_order_locked=1) %]<br>
 <br>
 Pre-filled:<br>
 [% P.part.picker('part_id6', pre_filled_part) %]<br>
diff --git a/templates/webpages/pay_posting_import/form.html b/templates/webpages/pay_posting_import/form.html
index 06f6f02e4..53de95b9c 100644
--- a/templates/webpages/pay_posting_import/form.html
+++ b/templates/webpages/pay_posting_import/form.html
@@ -32,10 +32,11 @@
  </table>
  <div>
 [% END %]
-
 <p>
  [% "Import a File:" | $T8 %]
 </p>
 <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
   [% L.input_tag('file', '', type => 'file', accept => '.csv') %]
+  <p>[% L.checkbox_tag('set_closedto', value => 1, checked => 1, class => 'checkbox') %]  [% 'Close Books up to' | $T8 %]:</p>
+  [% L.date_tag('closedto', closedto) %]
 </form>
diff --git a/templates/webpages/payment_term/form.html b/templates/webpages/payment_term/form.html
index c371c463c..1e0d0e2df 100755
--- a/templates/webpages/payment_term/form.html
+++ b/templates/webpages/payment_term/form.html
@@ -88,6 +88,7 @@
   <hr size="3" noshade>
 
   <p>[% LxERP.t8("You can use the following strings in the long description and all translations. They will be replaced by their actual values by kivitendo before they're output.") %]</p>
+  <p>[% LxERP.t8("As of version 3.7 most of the variables are also availabe as a print variable.") %]</p>
 
   <table>
    <tr class="listheading"><th>[%- LxERP.t8('Field') %]</th><th>[%- LxERP.t8('Description') %]</th></tr>
diff --git a/templates/webpages/payment_term/list.html b/templates/webpages/payment_term/list.html
index bc56b9149..dfc68f2c9 100644
--- a/templates/webpages/payment_term/list.html
+++ b/templates/webpages/payment_term/list.html
@@ -40,7 +40,7 @@
      <td align="right">[%- HTML.escape(payment_term.terms_netto_as_number) %]</td>
      <td align="right">[%- HTML.escape(payment_term.terms_skonto_as_number) %]</td>
      <td align="right">[%- HTML.escape(payment_term.percent_skonto_as_percent) %] %</td>
-     <td align="right">[%- HTML.escape(payment_term.obsolete) %]</td>
+     <td align="right">[% IF payment_term.obsolete %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]</td>
     </tr>
     [%- END %]
     </tbody>
diff --git a/templates/webpages/presenter/date_period/date_period_picker.html b/templates/webpages/presenter/date_period/date_period_picker.html
new file mode 100644
index 000000000..81672ee09
--- /dev/null
+++ b/templates/webpages/presenter/date_period/date_period_picker.html
@@ -0,0 +1,62 @@
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+[% USE P %]
+[% USE T8 %]
+
+<div id="[% id %]" class="[% classes.join(' ') %]">
+  [% 'From' | $T8 %] [% L.date_tag(id _ '_from_date',
+                                    defaults.report_period_from_date) %]
+
+  [% 'To' | $T8 %] [% L.date_tag(id _ '_to_date',
+                                  defaults.report_period_to_date) %]
+
+  [% P.button_tag('kivi.ReportPeriod.open_dialog(event.target)',
+                  LxERP.t8('Select from preset'),
+                  id => id _ '_preset_dialog_button',
+                  class => 'neutral') %]
+
+  <div id="[% id _ '_preset_dialog' %]" style="display: none;">
+    <h4>[% 'Year' | $T8 %]</h4>
+    <p>[% L.select_tag(id _ '_preset_dialog_year', years_list, default = defaults.dialog.year) %]</p>
+    <h4>[% 'Period' | $T8 %]</h4>
+    <table class="tbl-horizontal">
+      <tbody>
+        <tr>
+          <th align="left">[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'yearly',
+                                    checked => defaults.dialog.type == 'yearly' ? 1 : 0,
+                                    label => LxERP.t8('Yearly')) %]</th>
+          <td></td>
+        </tr>
+        <tr>
+          <th align="left">[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'quarterly',
+                                    checked => defaults.dialog.type == 'quarterly' ? 1 : 0,
+                                    label => LxERP.t8('Quarterly')) %]</th>
+          <td>[% L.select_tag(id _ '_preset_dialog_quarter',
+                              [
+                                [ 'A', LxERP.t8('1. Quarter') ],
+                                [ 'B', LxERP.t8('2. Quarter') ],
+                                [ 'C', LxERP.t8('3. Quarter') ],
+                                [ 'D', LxERP.t8('4. Quarter') ],
+                              ],  default => defaults.dialog.quarter) %]</td>
+        </tr>
+        <tr>
+          <th align="left">[% L.radio_button_tag(id _ '_preset_dialog_type',
+                                    value => 'monthly',
+                                    checked => defaults.dialog.type == 'monthly' ? 1 : 0,
+                                    label => LxERP.t8('Monthly')) %]</th>
+          <td>[% L.select_tag(id _ '_preset_dialog_month', months_list,
+                              default => defaults.dialog.month) %]</td>
+        </tr>
+      </tbody>
+    </table>
+    <p>[% P.button_tag('kivi.ReportPeriod.apply_preset()',
+                        LxERP.t8('Apply')) %]</p>
+  </div>
+  [% L.hidden_tag(id _ '_selected_preset_year', defaults.dialog.year) %]
+  [% L.hidden_tag(id _ '_selected_preset_type', defaults.dialog.type) %]
+  [% L.hidden_tag(id _ '_selected_preset_quarter', defaults.dialog.quarter) %]
+  [% L.hidden_tag(id _ '_selected_preset_month', defaults.dialog.month) %]
+</div>
\ No newline at end of file
diff --git a/templates/webpages/presenter/items_list/items_list.html b/templates/webpages/presenter/items_list/items_list.html
new file mode 100644
index 000000000..d72d4f1ce
--- /dev/null
+++ b/templates/webpages/presenter/items_list/items_list.html
@@ -0,0 +1,27 @@
+[% USE L %][% USE LxERP %][%- USE P -%][%- USE T8 -%]
+
+<font size="-2">
+[%- IF items.size > 0 %]
+ <table>
+  <tr class="listheading">
+   <th>[% 'Position'    | $T8 %]</th>
+   <th>[% 'Partnumber'  | $T8 %]</th>
+   <th>[% 'Description' | $T8 %]</th>
+   <th>[% 'Qty'         | $T8 %]</th>
+   <th>[% 'Unit'        | $T8 %]</th>
+  </tr>
+  [%- FOREACH item = items %]
+  <tr class="listrow[% IF !loop.first %] item_row_toggle_[% items.0.id %][% END %]"[% IF !loop.first %] style="display:none"[% END %]>
+   <td align="right">[% P.escape(item.position) %]</td>
+   <td>[% P.escape(item.part.partnumber) %]</td>
+   <td>[% P.escape(item.description) %]</td>
+   <td align="right">[% P.escape(item.qty_as_number) %]</td>
+   <td>[% P.escape(item.unit) %]</td>
+  </tr>
+  [%- END %]
+ </table>
+ [%- IF items.size > 1 %]
+  <a href="javascript:void(0);" onClick="javascript:$('.item_row_toggle_[% items.0.id %]').toggle();$('.item_row_toggle_[% items.0.id %]').is(':hidden') ? $('#toggle_text_[% items.0.id %]').html('… ⏷') : $('#toggle_text_[% items.0.id %]').html('⏶');"><span id='toggle_text_[% items.0.id %]'>… ⏷</span></a>
+ [%- END %]
+[%- END %]
+</font>
diff --git a/templates/webpages/presenter/items_list/items_list.txt b/templates/webpages/presenter/items_list/items_list.txt
new file mode 100644
index 000000000..7dcbed32a
--- /dev/null
+++ b/templates/webpages/presenter/items_list/items_list.txt
@@ -0,0 +1,3 @@
+[% FOREACH item = items -%]
+[% item.position %]: [% item.part.partnumber %] [% item.description %] [% item.qty_as_number %] [% item.unit %]
+[% END -%]
diff --git a/templates/webpages/presenter/test_page.html b/templates/webpages/presenter/test_page.html
new file mode 100644
index 000000000..e746667bf
--- /dev/null
+++ b/templates/webpages/presenter/test_page.html
@@ -0,0 +1,31 @@
+[% USE L %]
+[% USE P %]
+
+<h1>Generic-Presenter-Testpage</h1>
+
+<h2>Date</h2>
+
+[% P.date_tag('my-date-id') %]<br><br>
+
+[% P.date_tag('my-date-id', defaults.from_date) %]
+<pre>presets: '1.2.2022'</pre>
+
+<h2>Date Period</h2>
+
+[% P.date_period.picker('my-picker-id', '', '') %]<br>
+
+[% P.date_period.picker('my-other-picker-id',
+                          defaults.from_date,
+                          defaults.to_date,
+                          dialog_defaults => defaults.dialog) %]
+
+<pre>presets: '1.2.2022', '3.4.2022', dialog: '2022', 'monthly', 'B', '6'</pre>
+
+<h2>Email Input</h2>
+[% P.input_email_tag('email1', 'simple@test') %]<br>
+[% P.input_email_tag('email2', 'id_given@test',     id => 'my_own_email_tag_id') %]<br>
+[% P.input_email_tag('email3', 'no_id_wanted@test', no_id => 1) %]<br>
+[% P.input_email_tag('email4', '', show_icon_always => 1) %] no value, but show_icon_always => 1<br>
+[% P.input_email_tag('email5', '') %]no value, no icon
+[% P.button_tag("if (\$('#email5').val() !== '') {\$('#email5_link').attr('href', 'mailto:'+\$('#email5').val()); \$('#email5_link').show();} else {\$('#email5_link').hide();}", 'update') %]<br>
+[% P.input_email_tag('email6', '', onchange="if (\$('#email6').val() !== '') {\$('#email6_link').attr('href', 'mailto:'+\$('#email6').val()); \$('#email6_link').show();} else {\$('#email6_link').hide();}") %]no value, no icon, dynamically updated
diff --git a/templates/webpages/price_rule/item.html b/templates/webpages/price_rule/item.html
index 291650786..837ec799b 100644
--- a/templates/webpages/price_rule/item.html
+++ b/templates/webpages/price_rule/item.html
@@ -13,10 +13,11 @@
   [ 'gt', LxERP.t8('is after') ],
   [ 'lt', LxERP.t8('is before') ],
 ] %]
-<div>
+<div class="price_rule_item">
 <a class='price_rule_remove_line interact cursor-pointer'>✘</a>
 [% L.hidden_tag('price_rule.items[+].id', item.id) %]
 [% L.hidden_tag('price_rule.items[].type', item.type) %]
+[% L.hidden_tag('price_rule.items[].custom_variable_configs_id', item.custom_variable_configs_id) %]
 [%- SWITCH item.type %]
   [% CASE 'part' %]
     [% 'Part' | $T8 %] [% 'is' | $T8 %] [% P.part.picker('price_rule.items[].value_int', item.part) %]
@@ -36,6 +37,28 @@
     [% 'Transdate Record' | $T8 %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
   [% CASE 'pricegroup' %]
     [% 'Pricegroup' | $T8 %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_int', SELF.pricegroups, title_key='pricegroup', default=item.value_int) %]
+  [% CASE 'cvar' %]
+    [% # Dumper.dump_html(SELF.cvar.processed_options) %]
+    [% SET cvar_config = item.cvar_config %]
+    [% SET description = cvar_config.description %]
+    [% SWITCH cvar_config.type %]
+      [% CASE 'timestamp' %]
+        [% description | html %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
+      [% CASE 'date' %]
+        [% description | html %] [% L.select_tag('price_rule.items[].op', date_compare_ops, default=item.op) %] [% L.date_tag('price_rule.items[].value_date', item.value_date) %]
+      [% CASE 'number' %]
+        [% description | html %] [% L.select_tag('price_rule.items[].op', num_compare_ops, default=item.op) %] [% L.input_tag('price_rule.items[].value_num_as_number', item.value_num_as_number) %]
+      [% CASE 'integer' %]
+        [% description | html %] [% L.select_tag('price_rule.items[].op', num_compare_ops, default=item.op) %] [% L.input_tag('price_rule.items[].value_num_as_number', item.value_num_as_number) %]
+      [% CASE 'customer' %]
+        [% description | html %] [% 'is' | $T8 %] [% P.customer_vendor.picker('price_rule.items[].value_int', item.customer, type='customer') %]
+      [% CASE 'vendor' %]
+        [% description | html %] [% 'is' | $T8 %] [% P.customer_vendor.picker('price_rule.items[].value_int', item.vendor, type='vendor') %]
+      [% CASE 'part' %]
+        [% description | html %] [% 'is' | $T8 %] [% P.part.picker('price_rule.items[].value_int', item.part) %]
+      [% CASE 'select' %]
+        [% description | html %] [% 'is' | $T8 %] [% L.select_tag('price_rule.items[].value_text', cvar_config.processed_options, title_key='options', default=item.value_text ) %]
+    [% END %]
   [% CASE %]
 [%- END %]
 </div>
diff --git a/templates/webpages/project/form.html b/templates/webpages/project/form.html
index ee132ef79..9313665b4 100644
--- a/templates/webpages/project/form.html
+++ b/templates/webpages/project/form.html
@@ -3,7 +3,7 @@
 [%- USE P %]
 [%- USE HTML %]
 [%- USE LxERP %]
-<h1>[% title %]</h1>
+<h1>[% title | html %]</h1>
 
 [%- INCLUDE 'common/flash.html' %]
 
diff --git a/templates/webpages/reclamation/_report_bottom.html b/templates/webpages/reclamation/_report_bottom.html
new file mode 100644
index 000000000..da08e0758
--- /dev/null
+++ b/templates/webpages/reclamation/_report_bottom.html
@@ -0,0 +1,2 @@
+[% USE L %]
+[%- L.paginate_controls(models=models) %]
diff --git a/templates/webpages/reclamation/_report_top.html b/templates/webpages/reclamation/_report_top.html
new file mode 100644
index 000000000..424b9c2df
--- /dev/null
+++ b/templates/webpages/reclamation/_report_top.html
@@ -0,0 +1,3 @@
+[%- USE L %]
+[%- FILTER_HTML %]
+ <hr>
diff --git a/templates/webpages/reclamation/form.html b/templates/webpages/reclamation/form.html
new file mode 100644
index 000000000..8e8e5a354
--- /dev/null
+++ b/templates/webpages/reclamation/form.html
@@ -0,0 +1,75 @@
+[%- USE T8 %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE HTML %]
+[% # L.dump( SELF.reclamation.items_sorted ) %]
+
+[% IF FORM.workflow_email_journal_id %]
+  [% SET FORM.title = LxERP.t8("Email Journal Workflow") _ " - " _ FORM.title %]
+[% END %]
+<h1>[% FORM.title %] <span id='nr_in_title'>[%- SELF.reclamation.record_number -%]</span></h1>
+
+<div id="print_options" style="display:none">
+  <form method="post" action="controller.pl" id="print_options_form">
+    [% SELF.print_options %]
+    <br>
+    [% L.button_tag('kivi.Reclamation.print()', LxERP.t8('Print')) %]
+    <a href="#" onclick="$('#print_options').dialog('close');">[% LxERP.t8("Cancel") %]</a>
+  </form>
+</div>
+
+<div id="shipto_dialog" class="hidden"></div>
+
+<form method="post" action="controller.pl" id="reclamation_form">
+  [% L.hidden_tag('callback',             FORM.callback) %]
+  [% L.hidden_tag('type',                 FORM.type) %]
+  [% L.hidden_tag('id',                   SELF.reclamation.id) %]
+  [% L.hidden_tag('converted_from_record_type_ref', SELF.reclamation.converted_from_record_type_ref) %]
+  [% L.hidden_tag('converted_from_record_id',       SELF.reclamation.converted_from_record_id) %]
+  [% L.hidden_tag('email_journal_id',               FORM.email_journal_id) %]
+  [% L.hidden_tag('email_attachment_id',            FORM.email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_journal_id',      FORM.workflow_email_journal_id) %]
+  [% L.hidden_tag('workflow_email_attachment_id',   FORM.workflow_email_attachment_id) %]
+  [% L.hidden_tag('workflow_email_callback',        FORM.workflow_email_callback) %]
+
+  [% IF !SELF.reclamation.id %]
+  [%   L.hidden_tag('form_validity_token', FORM.form_validity_token) %]
+  [% END %]
+
+  [%- INCLUDE 'common/flash.html' %]
+
+  <div class="tabwidget" id="reclamation_tabs">
+    <ul>
+      <li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
+[% IF FORM.email_attachment_id || FORM.workflow_email_attachment_id %]
+      <li><a href="controller.pl?action=EmailJournal/attachment_preview&attachment_id=[% HTML.url(FORM.email_attachment_id || FORM.workflow_email_attachment_id) %]">[% 'Email Attachment Preview' | $T8 %]</a></li>
+[% END %]
+[%- IF INSTANCE_CONF.get_webdav %]
+      <li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.reclamation.id AND INSTANCE_CONF.get_doc_storage %]
+      <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.reclamation.id) %]">[% 'Documents' | $T8 %]</a></li>
+      <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% HTML.escape(FORM.type) %]&object_id=[% HTML.url(SELF.reclamation.id) %]">[% 'Attachments' | $T8 %]</a></li>
+[%- END %]
+[%- IF SELF.reclamation.id %]
+      <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Reclamation&object_id=[% SELF.reclamation.id %]">[% 'Linked Records' | $T8 %]</a></li>
+[%- END %]
+    </ul>
+
+    [% PROCESS "reclamation/tabs/basic_data.html" %]
+    [% PROCESS 'webdav/_list.html' %]
+    <div id="ui-tabs-1">
+      [%- LxERP.t8("Loading...") %]
+    </div>
+
+    <div id="shipto_inputs" class="hidden">
+      [%- PROCESS 'common/_ship_to_dialog.html'
+        cv_obj=SELF.reclamation.customervendor
+        cs_obj=SELF.reclamation.custom_shipto
+        cvars=SELF.reclamation.custom_shipto.cvars_by_config
+        id_selector='#reclamation_shipto_id' %]
+    </div>
+
+  </div>
+
+</form>
diff --git a/templates/webpages/reclamation/tabs/basic_data.html b/templates/webpages/reclamation/tabs/basic_data.html
new file mode 100644
index 000000000..b00f541e8
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data.html
@@ -0,0 +1,412 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+[%- INCLUDE 'generic/set_longdescription.html' %]
+
+<div id="ui-tabs-basic-data">
+  <table width="100%">
+    <tr valign="top">
+      <td>
+        <table width="100%">
+          <tr>
+            <th align="right">[%- SELF.cv == "customer" ? LxERP.t8('Customer') : LxERP.t8('Vendor') -%]</th>
+            [% SET cv_id = SELF.cv _ '_id' %]
+            <td>
+              [% P.customer_vendor.picker("reclamation.${SELF.cv}" _ '_id', SELF.reclamation.$cv_id, type=SELF.cv, show_details="1",
+                   style='width: 300px') %]
+            </td>
+          </tr>
+
+          <tr id='contact_row' [%- IF !SELF.reclamation.${SELF.cv}.contacts.size %]style='display:none'[%- END %]>
+            <th align="right">[% 'Contact Person' | $T8 %]</th>
+            <td>[% L.select_tag('reclamation.contact_id',
+                                SELF.reclamation.${SELF.cv}.contacts,
+                                default=SELF.reclamation.contact_id,
+                                title_key='full_name_dep',
+                                value_key='cp_id',
+                                with_empty=1,
+                                style='width: 300px') %]</td>
+          </tr>
+
+          <tr>
+            <th align="right">[% 'Shipping Address' | $T8 %]</th>
+            <td>
+              <span id='shipto_selection' [%- IF !SELF.reclamation.${SELF.cv}.shipto.size %] style='display:none'[%- END %] >
+                [% shiptos = [ { shipto_id => "", displayable_id => LxERP.t8("No/individual shipping address") } ] ;
+                   FOREACH s = SELF.reclamation.${SELF.cv}.shipto ;
+                     shiptos.push(s) ;
+                   END ;
+                   L.select_tag('reclamation.shipto_id',
+                                 shiptos,
+                                 default=SELF.reclamation.shipto_id,
+                                 title_key='displayable_id',
+                                 value_key='shipto_id',
+                                 with_empty=0,
+                                 style='width: 300px') %]
+              </span>
+              [% L.button_tag("kivi.Reclamation.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
+            </td>
+          </tr>
+
+          [%- IF SELF.cv == "customer" %]
+          <tr id="billing_address_row"[% IF !SELF.reclamation.customer.additional_billing_addresses.as_list.size %] style="display:none"[% END %]>
+            <th align="right">[% 'Custom Billing Address' | $T8 %]</th>
+            <td>
+              [% L.select_tag('reclamation.billing_address_id',
+                               SELF.reclamation.customer.additional_billing_addresses,
+                               default=SELF.reclamation.billing_address_id,
+                               title_key='displayable_id',
+                               value_key='id',
+                               with_empty=1,
+                               style='width: 300px') %]
+            </td>
+          </tr>
+          [%- END %]
+
+          [%- PROCESS reclamation/tabs/basic_data/_business_info_row.html SELF=SELF %]
+
+          <tr>
+            <th align="right">[% 'Tax rate' | $T8 %]</th>
+            <td>[% L.select_tag('reclamation.taxzone_id', SELF.all_taxzones, default=SELF.reclamation.taxzone_id, title_key='description', style='width: 300px', class='recalc') %]</td>
+          </tr>
+
+          [% SET currency_id = SELF.reclamation.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new reclamation %]
+          [% SET show_exchangerate = (SELF.reclamation.currency_id != INSTANCE_CONF.get_currency_id) %]
+          <tr id="currency_settings">
+            <th align="right">[% 'Currency' | $T8 %]</th>
+            <td>[% L.select_tag('reclamation.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
+          </tr>
+          <tr id="exchangerate_settings" [%- IF !show_exchangerate %]style='display:none'[%- END %]>
+            <th align="right">[% 'Exchangerate' | $T8 %]</th>
+            <td> 1 <span id="currency_name">[% SELF.reclamation.currency.name %]</span> =
+              [% L.input_tag('reclamation.exchangerate_as_null_number', SELF.reclamation.exchangerate_as_null_number, 'data-validate'=show_exchangerate ? 'required' : '', size="15", class="reformat_number_as_null_number numeric") %]
+              [% INSTANCE_CONF.default_currency %]
+              [% L.hidden_tag('old_currency_id', currency_id) %]
+              [% L.hidden_tag('old_exchangerate', SELF.reclamation.exchangerate_as_null_number) %]
+            </td>
+          </tr>
+
+[%- IF SELF.all_languages.size %]
+          <tr>
+            <th align="right">[% 'Language' | $T8 %]</th>
+            <td>
+              [% L.select_tag('reclamation.language_id', SELF.all_languages, default=SELF.reclamation.language_id, title_key='description', with_empty=1, style='width:300px') %]
+            </td>
+          </tr>
+[%- END %]
+
+[%- IF SELF.all_departments.size %]
+          <tr>
+            <th align="right">[% 'Department' | $T8 %]</th>
+            <td>
+              [% L.select_tag('reclamation.department_id', SELF.all_departments, default=SELF.reclamation.department_id, title_key='description', with_empty=1, style='width:300px') %]
+            </td>
+          </tr>
+[%- END %]
+
+          <tr>
+            <th align="right">[% 'Shipping Point' | $T8 %]</th>
+            <td>[% L.input_tag('reclamation.shippingpoint', SELF.reclamation.shippingpoint, style='width: 300px') %]</td>
+          </tr>
+
+          <tr>
+            <th align="right">[% 'Ship via' | $T8 %]</th>
+            <td>[% L.input_tag('reclamation.shipvia', SELF.reclamation.shipvia, style='width: 300px') %]</td>
+          </tr>
+
+          <tr>
+            <th align="right">[% 'Transaction description' | $T8 %]</th>
+            <td>[% L.input_tag('reclamation.transaction_description', SELF.reclamation.transaction_description, 'data-validate'=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '', style='width: 300px') %]</td>
+          </tr>
+
+          <tr>
+            <th align="right">[% 'Project Number' | $T8 %]</th>
+            <td>[% P.project.picker('reclamation.globalproject_id', SELF.reclamation.globalproject_id, style='width: 300px') %]</td>
+          </tr>
+
+        </table>
+      </td>
+
+      <td align="right">
+        <table>
+
+          <tr>
+            <td colspan="2" align="center">
+              [%- IF SELF.reclamation.id %]
+                <label for="reclamation.delivered">[% 'Delivery Order(s) for full qty created' | $T8 %]</label>
+                [% L.yes_no_tag('reclamation.delivered', SELF.reclamation.delivered) %]
+                <label for="reclamation.closed">[% 'Closed' | $T8 %]</label>
+                [% L.yes_no_tag('reclamation.closed', SELF.reclamation.closed) %]
+              [%- END %]
+            </td>
+          </tr>
+
+          <tr>
+            <th align="right">[% 'Employee' | $T8 %]</th>
+            <td>[% L.select_tag('reclamation.employee_id',
+              SELF.all_employees,
+              default=(SELF.reclamation.employee_id ? SELF.reclamation.employee_id : SELF.current_employee_id),
+              title_key='safe_name') %]</td>
+          </tr>
+
+          [% IF SELF.cv == 'customer' %]
+          <tr>
+            <th align="right">[% 'Salesman' | $T8 %]</th>
+            <td>[% L.select_tag('reclamation.salesman_id',
+              SELF.all_salesmen,
+              default=(SELF.reclamation.salesman_id ? SELF.reclamation.salesman_id : SELF.current_employee_id),
+              title_key='safe_name') %]</td>
+          </tr>
+          [% END %]
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Reclamation Number' | $T8 %]</th>
+            <td>[% L.input_tag('reclamation.record_number', SELF.reclamation.record_number, size = 11, onchange='kivi.Reclamation.set_number_in_title(this)') %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Customer Record Number' | $T8 %]</th>
+            <td>[% L.input_tag('reclamation.cv_record_number', SELF.reclamation.cv_record_number, size = 11) %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Reclamation Date' | $T8 %]</th>
+            <td>[% L.date_tag('reclamation.transdate_as_date', SELF.reclamation.transdate_as_date) %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Tax point' | $T8 %]</th>
+            <td>[% L.date_tag('reclamation.tax_point_as_date', SELF.reclamation.tax_point_as_date, class="recalc") %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Deadline' | $T8 %]</th>
+            <td>[% L.date_tag('reclamation.reqdate_as_date', SELF.reclamation.reqdate_as_date, class="recalc") %]</td>
+          </tr>
+
+          <tr>
+            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
+            <td>[% SELF.reclamation.itime_as_date %]</td>
+          </tr>
+
+        </table>
+
+      </td>
+    </tr>
+  </table>
+
+  [%- PROCESS reclamation/tabs/basic_data/_item_input.html SELF=SELF %]
+
+  [% L.button_tag('kivi.Reclamation.open_multi_items_dialog()', LxERP.t8('Add multiple items')) %]
+
+  <table width="100%">
+    <tr>
+      <td>
+        [%- IF SELF.positions_scrollbar_height -%]
+          [%- SET scroll_style = 'style="overflow-y: auto; height:' _ SELF.positions_scrollbar_height _ 'vh;"' -%]
+        [%- ELSE -%]
+          [%- SET scroll_style = '' -%]
+        [%- END -%]
+        <div id="row_table_scroll_id" [%- scroll_style -%]>
+          <table id="row_table_id" width="100%">
+            <thead>
+              <tr class="listheading">
+                <th class="listheading" style='text-align:center' nowrap width="1">
+                  [%- IF MYCONFIG.show_form_details %]
+                    [%- L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', "data-expanded"="1") %]
+                  [%- ELSE %]
+                    [%- L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all') %]
+                  [%- END %]
+                </th>
+                <th>
+                  [% L.checkbox_tag("select_all_multi_id", checked=0, alt=LxERP.t8('Select/Deselect all'), title=LxERP.t8('Select/Deselect all'), id='select_all') %]
+                </th>
+                <th class="listheading" nowrap width="3" >[%- 'position'     | $T8 %] </th>
+                <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+                <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+                [%- IF SELF.show_update_button -%]
+                <th class="listheading" style='text-align:center' nowrap width="1">
+                  [%- L.img_tag(src="image/rotate_cw.svg",
+                                alt=LxERP.t8('Update from master data'),
+                                title= LxERP.t8('Update from master data'),
+                                onclick="if (!confirm('" _ LxERP.t8("Are you sure to update all positions from master data?") _ "')) return false; kivi.Reclamation.update_all_rows_from_master_data();",
+                                id='update_from_master') %]
+                </th>
+                [%- END %]
+                <th id="partnumber_header_id"   class="listheading" nowrap width="15"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("partnumber")'> [%- 'Partnumber'  | $T8 %]</a></th>
+                [%- IF SELF.search_cvpartnumber -%]
+                <th id="cvpartnumber_header_id" class="listheading" nowrap width="15"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("cvpartnumber")' > [%- SELF.cv == "customer" ? LxERP.t8('Customer Part Number') : LxERP.t8('Model') %]</a></th>
+                [%- END -%]
+                <th id="partclass_header_id"    class="listheading" nowrap width="2">[%- 'Type'  | $T8 %]</th>
+                <th id="description_header_id"  class="listheading" nowrap           ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("description")'>[%- 'Description' | $T8 %]</a></th>
+                <th id="reason_header_id"   class="listheading" nowrap width="100"><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason")'>[%- 'Reason' | $T8 %]</a></th>
+                <th id="reason_description_ext_header_id"  class="listheading" nowrap ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason_description_ext")'>[%- 'Reason Description Extern' | $T8 %]</a></th>
+                <th id="reason_description_int_header_id"  class="listheading" nowrap ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("reason_description_int")'>[%- 'Reason Description Intern' | $T8 %]</a></th>
+                <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
+                <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Price Source' | $T8 %] </th>
+                <th id="sellprice_header_id"   class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("sellprice")'> [%- 'Price'       | $T8 %]</a></th>
+                <th id="discount_header_id"    class="listheading" nowrap width="15" ><a href='#' onClick='javascript:kivi.Reclamation.reorder_items("discount")'>  [%- 'Discount'    | $T8 %]</a></th>
+                <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
+              </tr>
+              <tr class="listheading">
+                <th></th>
+                <th class="center">
+                  [%- L.button_tag('kivi.Reclamation.toggle_selected_rows();', "🔄",
+                                   title=LxERP.t8("Toggle selection"),
+                                   alt=LxERP.t8("Toggle selection"),
+                                   ) %]
+                </th>
+                <th colspan="2"></th>
+                <th class="center">
+                  [%- L.button_tag('kivi.Reclamation.delete_selected_rows();', LxERP.t8("X"),
+                                   title=LxERP.t8("Delete selected rows"),
+                                   alt=LxERP.t8("Delete selected rows"),
+                                   ) %]
+                </th>
+                [%- IF SELF.show_update_button -%]
+                <th></th>
+                [%- END -%]
+                <th colspan="3"></th>
+                <th>
+                  [% L.select_tag("reason_id_for_selected",
+                                  SELF.reclamation.valid_reclamation_reasons,
+                                  title_key = 'name',
+                                  value_key = 'id',
+                                  with_empty=1,
+                                  class="wi-small",
+                                  ) %]
+                  [%- L.button_tag(
+                        'kivi.Reclamation.set_selected_to_value("reason_id")',
+                        "↓",
+                        alt=LxERP.t8('Apply to selected rows'),
+                        title=LxERP.t8('Apply to selected rows'),
+                  ) %]
+                </th>
+                <th>
+                  [% L.areainput_tag("reason_description_ext_for_selected",
+                                     "",
+                                     class="wi-mediumsmall",
+                                     ) %]
+                  [%- L.button_tag(
+                        'kivi.Reclamation.set_selected_to_value("reason_description_ext")',
+                        "↓",
+                        alt=LxERP.t8('Apply to selected rows'),
+                        title=LxERP.t8('Apply to selected rows'),
+                  ) %]
+                </th>
+                <th>
+                  [% L.areainput_tag("reason_description_int_for_selected",
+                                     "",
+                                     class="wi-mediumsmall",
+                                     ) %]
+                  [%- L.button_tag(
+                        'kivi.Reclamation.set_selected_to_value("reason_description_int")',
+                        "↓",
+                        alt=LxERP.t8('Apply to selected rows'),
+                        title=LxERP.t8('Apply to selected rows'),
+                  ) %]
+                </th>
+                <th colspan="7"></th>
+              </tr>
+            </thead>
+
+            [%- FOREACH item = SELF.reclamation.items_sorted %]
+              [%- PROCESS reclamation/tabs/basic_data/_row.html ITEM=item ID=(item.id||item.new_fake_id) -%]
+            [%- END %]
+
+          </table>
+        </div>
+
+      </td>
+    </tr>
+
+    <tr>
+    </tr>
+
+    <tr>
+      <td colspan="100%" width="100%">
+        <table width="100%">
+          <tr>
+            <td>
+              <table>
+                <tr>
+                  <th align="left">[% 'Notes' | $T8 %]</th>
+                  <th align="left">[% 'Internal Notes' | $T8 %]</th>
+                </tr>
+                <tr valign="top">
+                  <td>
+                    [% L.textarea_tag('reclamation.notes', SELF.reclamation.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
+                  </td>
+                  <td>
+                    [% L.textarea_tag('reclamation.intnotes', SELF.reclamation.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
+                  </td>
+                </tr>
+              </table>
+            </td>
+
+            <td>
+              <table>
+                <tr>
+                  <th align="right">[% 'Payment Terms' | $T8 %]</th>
+                  <td>[% L.select_tag('reclamation.payment_id',
+                                      SELF.all_payment_terms,
+                                      default = SELF.reclamation.payment_id,
+                                      with_empty = 1,
+                                      title_key = 'description',
+                                      style = 'width: 250px') %]</td>
+                </tr>
+                <tr>
+                  <th align="right">[% 'Delivery Terms' | $T8 %]</th>
+                  <td>[% L.select_tag('reclamation.delivery_term_id',
+                                      SELF.all_delivery_terms,
+                                      default = SELF.reclamation.delivery_term_id,
+                                      with_empty = 1,
+                                      title_key = 'description',
+                                      style = 'width: 250px') %]</td>
+                </tr>
+              </table>
+            </td>
+
+
+            <td align="right">
+              <table>
+                <tr id="taxincluded_row_id" [%- IF !SELF.taxes.size %]style="display:none"[%- END %]>
+                  <td align=right colspan="2">
+                    <label for="reclamation.taxincluded"><b>[% 'Tax Included' | $T8 %]</b></label>
+                    [% L.yes_no_tag('reclamation.taxincluded', SELF.reclamation.taxincluded, class='recalc') %]
+                  </td>
+                </tr>
+
+                <tr id="subtotal_row_id" [%- IF SELF.reclamation.taxincluded %]style="display:none"[%- END %]>
+                  <th align="right">[%- 'Subtotal' | $T8 %]</th>
+                  <td align="right">
+                    [%- L.div_tag(SELF.reclamation.netamount_as_number, id='netamount_id') %]
+                  </td>
+                </tr>
+                [%- FOREACH tax = SELF.reclamation.taxes %]
+                  [%- PROCESS reclamation/tabs/basic_data/_tax_row.html TAX=tax TAXINCLUDED=SELF.reclamation.taxincluded %]
+                [%- END %]
+                <tr id="amount_row_id">
+                  <th align="right">[%- 'Total' | $T8 %]</th>
+                  <td align="right">
+                    [%- L.div_tag(SELF.reclamation.amount_as_number, id='amount_id') %]
+                  </td>
+                </tr>
+              </table>
+            </td>
+
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+  </table>
+
+</div>
+
+[% L.sortable_element('#row_table_id') %]
diff --git a/templates/webpages/reclamation/tabs/basic_data/_business_info_row.html b/templates/webpages/reclamation/tabs/basic_data/_business_info_row.html
new file mode 100644
index 000000000..183ae2556
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_business_info_row.html
@@ -0,0 +1,10 @@
+[%- USE T8 %][%- USE HTML %]
+
+<tr id='business_info_row' [%- IF !SELF.reclamation.customervendor.business_id %]style='display:none'[%- END %]>
+  <th align="right">[%- IF SELF.cv == 'customer' -%]
+                      [%- 'Customer type' | $T8 -%]
+                    [%- ELSE -%]
+                      [%- 'Vendor type' | $T8 -%]
+                    [%- END -%]</th>
+  <td>[% HTML.escape(SELF.reclamation.customervendor.business.description) %]; [% 'Trade Discount' | $T8 %] [% SELF.reclamation.customervendor.business.discount_as_percent %] %</td>
+</tr>
diff --git a/templates/webpages/reclamation/tabs/basic_data/_item_input.html b/templates/webpages/reclamation/tabs/basic_data/_item_input.html
new file mode 100644
index 000000000..342af3999
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_item_input.html
@@ -0,0 +1,47 @@
+[%- USE T8 %][%- USE HTML %][%- USE LxERP %][%- USE L %][%- USE P %]
+
+ <div>
+  <table id="input_row_table_id">
+    <thead>
+      <tr class="listheading">
+        <th class="listheading" nowrap >[%- '+'            | $T8 %] </th>
+        <th class="listheading" nowrap >[%- 'position'     | $T8 %] </th>
+        <th class="listheading" nowrap >[%- 'Part'         | $T8 %] </th>
+        <th class="listheading" nowrap >[%- 'Description'  | $T8 %] </th>
+        <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
+        <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
+        <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr valign="top" class="listrow">
+        <td class="tooltipster-html" title="[%- 'Create a new part' | $T8 -%]">
+          [% SET type_options = [[ 'part', LxERP.t8('Part') ], [ 'assembly', LxERP.t8('Assembly') ], [ 'service', LxERP.t8('Service') ] ] %]
+          [%- type_options.push([ 'assortment', LxERP.t8('Assortment')]) %]
+          [% L.select_tag('add_item.create_part_type', type_options) %]
+          [% L.button_tag('kivi.Reclamation.create_part()', LxERP.t8('+')) %]
+        </td>
+        <td>[% L.input_tag('add_item.position', '', size = 5, class="add_item_input numeric") %]</td>
+        <td>
+          [%- SET PARAM_KEY = SELF.cv == "customer" ? 'with_customer_partnumber' : 'with_makemodel' -%]
+          [%- SET PARAM_VAL = SELF.search_cvpartnumber -%]
+          [% P.part.picker('add_item.parts_id', SELF.created_part, style='width: 300px', class="add_item_input",
+                            fat_set_item=1,
+                            multiple_pos_input=1,
+                            action={set_multi_items='kivi.Reclamation.add_multi_items'},
+                            classification_id=SELF.part_picker_classification_ids.as_list.join(','),
+                            $PARAM_KEY=PARAM_VAL) %]</td>
+        <td>[% L.input_tag('add_item.description', SELF.created_part.description, class="add_item_input") %]</td>
+        <td>
+          [% L.input_tag('add_item.qty_as_number', '', size = 5, class="add_item_input numeric") %]
+          [% L.hidden_tag('add_item.unit', SELF.created_part.unit, class="add_item_input") %]
+        </td>
+        [%- SET price = LxERP.format_amount(((SELF.type == 'sales_reclamation') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
+        <td>[% L.input_tag('add_item.sellprice_as_number', price, size = 10, class="add_item_input numeric") %]</td>
+        <td>[% L.input_tag('add_item.discount_as_percent', '', size = 5, class="add_item_input numeric") %]</td>
+        <td>[% L.button_tag('kivi.Reclamation.add_item()', LxERP.t8('Add part')) %]</td>
+      </tr>
+    </tbody>
+  </table>
+ </div>
diff --git a/templates/webpages/reclamation/tabs/basic_data/_price_sources_dialog.html b/templates/webpages/reclamation/tabs/basic_data/_price_sources_dialog.html
new file mode 100644
index 000000000..75221aca9
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_price_sources_dialog.html
@@ -0,0 +1,110 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%-  #L.dump( price_source ) %]
+
+[% SET best_price = price_source.best_price %]
+[% SET best_discount = price_source.best_discount %]
+
+[% SET price_editable = 0 %]
+[% IF (FORM.type == "sales_reclamation") %]
+  [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
+[% END %]
+[% IF (FORM.type == "purchase_reclamation") %]
+  [% SET price_editable = AUTH.assert('purchase_edit_prices', 1) %]
+[% END %]
+
+[% SET exfactor = price_source.record.exchangerate ? 1 / price_source.record.exchangerate : 1 %]
+[% SET exnoshow = price_source.record.currency_id==INSTANCE_CONF.get_currency_id %]
+[% SET places   = exnoshow ? -2 : 5 %]
+  <h2>[% 'Prices' | $T8 %]</h2>
+
+  <table>
+   <tr class='listheading'>
+    <th></th>
+    <th>[% 'Price Source' | $T8 %]</th>
+    <th>[% 'Price' | $T8 %]</th>
+    <th [%- IF exnoshow -%]style='display:none'[%- END %]>
+      [% 'Price' | $T8 -%]/[%- price_source.record.currency.name %]
+    </th>
+    <th>[% 'Best Price' | $T8 %]</th>
+    <th>[% 'Details' | $T8 %]</th>
+   </tr>
+   <tr class='listrow'>
+[%- IF price_source.record_item.active_price_source %]
+    <td>[% L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[%- END %]
+    <td>[% 'None (PriceSource)' | $T8 %]</td>
+    <td>-</td>
+    <td [%- IF exnoshow -%]style='display:none'[%- END %]>-</td>
+    <td></td>
+    <td></td>
+   </tr>
+   [%- FOREACH price IN price_source.available_prices %]
+    <tr class='listrow'>
+[%- IF price_source.record_item.active_price_source != price.source %]
+     <td>[% L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
+     <td>[% L.button_tag('kivi.Reclamation.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Update Price')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[% END %]
+     <td>[% price.source_description | html %]</td>
+     <td>[% price.price_as_number %]</td>
+     <td [%- IF exnoshow -%]style='display:none'[%- END %]>
+       [% LxERP.format_amount(price.price * exfactor, places) %]
+     </td>
+[% IF price.source == best_price.source %]
+     <td align='center'>&#x2022;</td>
+[% ELSE %]
+     <td></td>
+[% END %]
+     <td>[% price.description | html %]</td>
+    </tr>
+   [%- END %]
+  </table>
+
+  <h2>[% 'Discounts' | $T8 %]</h2>
+
+  <table>
+   <tr class='listheading'>
+    <th></th>
+    <th>[% 'Price Source' | $T8 %]</th>
+    <th>[% 'Discount' | $T8 %]</th>
+    <th>[% 'Best Discount' | $T8 %]</th>
+    <th>[% 'Details' | $T8 %]</th>
+   </tr>
+   <tr class='listrow'>
+[%- IF price_source.record_item.active_discount_source %]
+    <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource Discount)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[%- END %]
+    <td>[% 'None (PriceSource Discount)' | $T8 %]</td>
+    <td>-</td>
+    <td></td>
+    <td></td>
+   </tr>
+   [%- FOREACH price IN price_source.available_discounts %]
+    <tr class='listrow'>
+[%- IF price_source.record_item.active_discount_source != price.source %]
+     <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
+[%- ELSIF price_source.record_item.discount * 1 != price.discount * 1 %]
+     <td>[% L.button_tag('kivi.Reclamation.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent  _ '\', ' _ price_editable _ ')', LxERP.t8('Update Discount')) %]</td>
+[%- ELSE %]
+    <td><b>[% 'Selected' | $T8 %]</b></td>
+[% END %]
+     <td>[% price.source_description | html %]</td>
+     <td>[% price.discount_as_percent %] %</td>
+[% IF price.source == best_discount.source %]
+     <td align='center'>&#x2022;</td>
+[% ELSE %]
+     <td></td>
+[% END %]
+     <td>[% price.description | html %]</td>
+    </tr>
+   [%- END %]
+  </table>
diff --git a/templates/webpages/reclamation/tabs/basic_data/_row.html b/templates/webpages/reclamation/tabs/basic_data/_row.html
new file mode 100644
index 000000000..5ecc85b4c
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_row.html
@@ -0,0 +1,187 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+[% # L.dump( ITEM ) %]
+
+<tbody class="row_entry listrow" data-position="[%- HTML.escape(ITEM.position) -%]"[%- IF MYCONFIG.show_form_details -%] data-expanded="1"[%- END -%]>
+  <tr>
+  [% L.hidden_tag("reclamation_item_ids[+]", ID) %]
+  [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+  [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
+  [% L.hidden_tag("reclamation.reclamation_items[+].id", ITEM.id, id='item_' _ ID) %]
+  [% L.hidden_tag("reclamation.reclamation_items[].parts_id", ITEM.parts_id) %]
+    <td align="center">
+      [%- IF MYCONFIG.show_form_details %]
+        [% L.img_tag(src="image/collapse.svg",
+                     alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand") %]
+      [%- ELSE %]
+        [% L.img_tag(src="image/expand.svg",
+                     alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %]
+      [%- END %]
+    </td>
+    <td>
+      [% L.checkbox_tag('multi_id_' _ ITEM.position, value=ITEM.id, checked=0) %]
+    </td>
+    <td>
+      <div name="position" class="numeric">
+        [% HTML.escape(ITEM.position) %]
+      </div>
+    </td>
+    <td align="center">
+      <img src="image/updown.png" alt="[%- LxERP.t8('reclamation item') %]" class="dragdrop">
+    </td>
+    <td align="center">
+      [%- L.button_tag("kivi.Reclamation.delete_reclamation_item_row(this)",
+                       LxERP.t8("X"),
+                       confirm=LxERP.t8("Are you sure?")) %]
+    </td>
+    [%- IF SELF.show_update_button -%]
+    <td align="center">
+      [%- L.img_tag(src="image/rotate_cw.svg",
+                    alt=LxERP.t8('Update from master data'),
+                    title= LxERP.t8('Update from master data'),
+                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.Reclamation.update_row_from_master_data(this);",
+                    id='update_from_master') %]
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partnumber">
+        [%- P.link_tag(SELF.url_for(controller='Part', action='edit', 'part.id'=ITEM.part.id), ITEM.part.partnumber, target="_blank", title=LxERP.t8('Open in new window')) -%]
+      </div>
+    </td>
+    [%- IF SELF.search_cvpartnumber -%]
+    <td>
+      <div name="cvpartnumber">[% HTML.escape(ITEM.cvpartnumber) %]</div>
+    </td>
+    [%- END -%]
+    <td>
+      <div name="partclassification">[% ITEM.part.presenter.typeclass_abbreviation %]</div>
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].description",
+                     ITEM.description,
+                     size='40',
+                     style='width: 300px') %]
+      [%- L.hidden_tag("reclamation.reclamation_items[].longdescription", ITEM.longdescription) %]
+      [%- L.button_tag("kivi.Reclamation.show_longdescription_dialog(this)", LxERP.t8("L")) %]
+    </td>
+    <td>[% L.select_tag("reclamation.reclamation_items[].reason_id",
+                        SELF.reclamation.valid_reclamation_reasons,
+                        default=ITEM.reason_id,
+                        title_key = 'name',
+                        value_key = 'id',
+                        with_empty=1,) %]
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].reason_description_ext",
+                     ITEM.reason_description_ext,
+                     size='40',
+                     style='width: 150px') %]
+    </td>
+    <td>
+      [% L.areainput_tag("reclamation.reclamation_items[].reason_description_int",
+                     ITEM.reason_description_int,
+                     size='40',
+                     style='width: 150px') %]
+    </td>
+    <td nowrap>
+      [%- L.input_tag("reclamation.reclamation_items[].qty_as_number",
+                      ITEM.qty_as_number,
+                      size = 5,
+                      class="recalc reformat_number numeric") %]
+      [%- IF ITEM.part.formel -%]
+        [%- L.button_tag("kivi.Reclamation.show_calculate_qty_dialog(this)", LxERP.t8("*/")) %]
+        [%- L.hidden_tag("formula[+]", ITEM.part.formel) -%]
+      [%- END -%]
+    </td>
+    <td>
+      [%- L.select_tag("reclamation.reclamation_items[].price_factor_id",
+                       SELF.all_price_factors,
+                       default = ITEM.price_factor_id,
+                       title_key = 'description',
+                       with_empty = 1,
+                       class="recalc") %]
+    </td>
+    <td nowrap>
+      [%- L.select_tag("reclamation.reclamation_items[].unit",
+                      ITEM.part.available_units,
+                      default = ITEM.unit,
+                      title_key = 'name',
+                      value_key = 'name',
+                      class = 'unitselect') %]
+    </td>
+    <td>
+      [%- SET EDIT_PRICE_SOURCE = !(ITEM.is_linked_to_record) %]
+      <div name="editable_price_source" [%- IF !EDIT_PRICE_SOURCE %]style="display:none"[%- END %]>
+        [%- L.button_tag("kivi.Reclamation.price_chooser_item_row(this)",
+                         ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
+                         name = "price_chooser_button") %]
+      </div>
+      <div name="not_editable_price_source" [%- IF EDIT_PRICE_SOURCE %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.active_price_source.description _ ' | ' _ ITEM.active_discount_source.source_description, style="white-space:nowrap;") %]
+      </div>
+    </td>
+    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
+    [% IF (SELF.type == "sales_reclamation") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
+    [% END %]
+    [% IF (SELF.type == "purchase_reclamation") %]
+      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
+    [% END %]
+    <td>
+      [%- L.hidden_tag("reclamation.reclamation_items[].active_price_source", ITEM.active_price_source.source) %]
+      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES && ITEM.active_price_source.source == '' && !ITEM.is_linked_to_record) %]
+      <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
+        [%- L.input_tag("reclamation.reclamation_items[].sellprice_as_number",
+                        ITEM.sellprice_as_number,
+                        size = 10,
+                        disabled=(EDIT_PRICE? '' : 1),
+                        class="recalc reformat_number numeric") %]
+      </div>
+      <div name="not_editable_price" [%- IF EDIT_PRICE %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric") %]
+        [%- L.hidden_tag("reclamation.reclamation_items[].sellprice_as_number",
+                         ITEM.sellprice_as_number,
+                         disabled=(EDIT_PRICE? 1 : '')) %]
+      </div>
+    </td>
+    <td>
+      [%- L.hidden_tag("reclamation.reclamation_items[].active_discount_source", ITEM.active_discount_source.source) %]
+      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES && ITEM.active_discount_source.source == '' && !ITEM.is_linked_to_record) %]
+      <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
+        [%- L.input_tag("reclamation.reclamation_items[].discount_as_percent",
+                        ITEM.discount_as_percent,
+                        size = 5,
+                        disabled=(EDIT_DISCOUNT? '' : 1),
+                        class="recalc reformat_number numeric") %]
+      </div>
+      <div name="not_editable_discount" [%- IF EDIT_DISCOUNT %]style="display:none"[%- END %]>
+        [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %]
+        [%- L.hidden_tag("reclamation.reclamation_items[].discount_as_percent",
+                         ITEM.discount_as_percent,
+                         disabled=(EDIT_DISCOUNT? 1 : '')) %]
+      </div>
+    </td>
+    <td align="right">
+      [%- L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal") %]
+    </td>
+
+  </tr>
+
+  <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>
+    <td colspan="100%">
+      [%- IF MYCONFIG.show_form_details || ITEM.render_second_row %]
+        <div name="second_row" data-loaded="1">
+          [%- PROCESS reclamation/tabs/basic_data/_second_row.html ITEM=ITEM TYPE=SELF.type %]
+        </div>
+      [%- ELSE %]
+        <div name="second_row" id="second_row_[% ID %]">
+          [%- LxERP.t8("Loading...") %]
+        </div>
+      [%- END %]
+    </td>
+  </tr>
+
+</tbody>
diff --git a/templates/webpages/reclamation/tabs/basic_data/_second_row.html b/templates/webpages/reclamation/tabs/basic_data/_second_row.html
new file mode 100644
index 000000000..1600621c2
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_second_row.html
@@ -0,0 +1,49 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE P %]
+
+<table>
+  <tr><td colspan="100%">
+      <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+      [%- L.input_tag("reclamation.reclamation_items[].serialnumber", ITEM.serialnumber, size = 15 "data-validate"="trimmed_whitespaces") %]&nbsp;
+    <b>[%- 'Project' | $T8 %]</b>&nbsp;
+    [% P.project.picker("reclamation.reclamation_items[].project_id", ITEM.project_id, size = 15) %]&nbsp;
+      <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
+      [% L.date_tag("reclamation.reclamation_items[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
+    [%- IF (TYPE == "sales_reclamation") %]
+      <b>[%- 'LP' | $T8 %]</b>&nbsp;
+      [%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]&nbsp;
+      <b>[%- 'EK' | $T8 %]</b>&nbsp;
+        [%- L.input_tag("reclamation.reclamation_items[].lastcost_as_number",
+                        ITEM.lastcost_as_number,
+                        size = 5,
+                        class="recalc reformat_number numeric") %]&nbsp;
+    [%- END %]
+    <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
+      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
+        [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
+      </span>&nbsp;
+  </td></tr>
+
+  <tr>
+    [%- SET n = 0 %]
+    [%- FOREACH var = ITEM.cvars_by_config %]
+      [%- NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
+      [%- SET n = n + 1 %]
+    <th>
+      [% var.config.description %]
+    </th>
+    <td>
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[+].config_id', var.config.id) %]
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[].id', var.id) %]
+      [% L.hidden_tag('reclamation.reclamation_items[].custom_variables[].sub_module', var.sub_module) %]
+      [% INCLUDE 'common/render_cvar_input.html' var_name='reclamation.reclamation_items[].custom_variables[].unparsed_value' %]
+    </td>
+      [%- IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
+        </tr><tr>
+      [%- END %]
+    [%- END %]
+  </tr>
+</table>
diff --git a/templates/webpages/reclamation/tabs/basic_data/_tax_row.html b/templates/webpages/reclamation/tabs/basic_data/_tax_row.html
new file mode 100644
index 000000000..aa09a3a86
--- /dev/null
+++ b/templates/webpages/reclamation/tabs/basic_data/_tax_row.html
@@ -0,0 +1,15 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+
+<tr class="tax_row">
+  <th align="right">[%- IF TAXINCLUDED %][%- 'Including' | $T8 %]&nbsp;[%- END %][%- TAX.tax.taxdescription %] [% TAX.tax.rate_as_percent %]%</th>
+  <td align="right">[%- LxERP.format_amount(TAX.amount, 2, 0) %]</td>
+</tr>
+[%- IF TAXINCLUDED %]
+<tr class="tax_row">
+  <th align="right">[%- 'Net amount' | $T8 %]</th>
+  <td align="right">[%- LxERP.format_amount(TAX.netamount, 2, 0) %]</td>
+</tr>
+[%- END%]
diff --git a/templates/webpages/reclamation_reason/_sort_list_row.html b/templates/webpages/reclamation_reason/_sort_list_row.html
new file mode 100644
index 000000000..e996ffc1f
--- /dev/null
+++ b/templates/webpages/reclamation_reason/_sort_list_row.html
@@ -0,0 +1,10 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%][% USE P %]
+[% FOREACH reason = RECLAMATION_REASONS %]
+<tr class="listrow" id="reclamation_reason_id_[% reason.id %]">
+  <td align="center" class="dragdrop"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></td>
+  <td><a href="[% SELF.url_for(action='edit', id=reason.id) %]">[% HTML.escape(reason.name) %]</a></td>
+  <td>[% reason.description | $T8 %]</td>
+  <td>[% reason.valid_for_sales_as_bool_yn %]</td>
+  <td>[% reason.valid_for_purchase_as_bool_yn %]</td>
+</tr>
+[% END %]
diff --git a/templates/webpages/reclamation_reason/form.html b/templates/webpages/reclamation_reason/form.html
new file mode 100644
index 000000000..ac3606039
--- /dev/null
+++ b/templates/webpages/reclamation_reason/form.html
@@ -0,0 +1,30 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 -%]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+<div style="padding-left:2em">
+[% SET style="width: 400px" %]
+
+<form action="controller.pl" method="post" id="form">
+[%- L.hidden_tag("id", SELF.reclamation_reason.id) %]
+
+<table>
+  <tr>
+    <th align="right">[% 'Name' | $T8 %]</th>
+    <td>[%- L.input_tag("reclamation_reason.name", SELF.reclamation_reason.name, "data-validate"="required", "data-title"=LxERP.t8("Name")) %]</td>
+  </tr>
+  <tr>
+    <th align="right">[% 'Description' | $T8 %]</th>
+    <td>[%- L.textarea_tag("reclamation_reason.description", SELF.reclamation_reason.description, "data-validate"="required", cols = 50 rows = 2, "data-title"=LxERP.t8("Description")) %]</td>
+  </tr>
+  <tr>
+    <th align="right">[% 'Valid for Sales' | $T8 %]</th>
+     <td align="left">[% L.checkbox_tag("reclamation_reason.valid_for_sales", checked=SELF.reclamation_reason.valid_for_sales, for_submit=1) %]</td>
+  </tr>
+  <tr>
+    <th align="right">[% 'Valid for Purchase' | $T8 %]</th>
+     <td align="left">[% L.checkbox_tag("reclamation_reason.valid_for_purchase", checked=SELF.reclamation_reason.valid_for_purchase, for_submit=1) %]</td>
+  </tr>
+</table>
+</form>
+</div>
diff --git a/templates/webpages/reclamation_reason/list.html b/templates/webpages/reclamation_reason/list.html
new file mode 100644
index 000000000..9ad03e329
--- /dev/null
+++ b/templates/webpages/reclamation_reason/list.html
@@ -0,0 +1,28 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE T8 -%]
+[%- INCLUDE 'common/flash.html' %]
+
+<h1>[% title %]</h1>
+
+<p>
+ <table id="partsgroup_list">
+  <thead>
+   <tr class="listheading">
+    <th>[% 'Reclamation Reason'      | $T8 %]</th>
+    <th>[% 'Description' | $T8 %]</th>
+    <th>[% 'Valid for Sales' | $T8 %]</th>
+    <th>[% 'Valid for Purchase' | $T8 %]</th>
+   </tr>
+  </thead>
+
+  <tbody>
+    [%- FOREACH reason = RECLAMATION_REASONS %]
+    <tr class="listrow" id="reason_id_[% reason.id %]">
+    <td><a href="[% SELF.url_for(action='edit', id=reason.id) %]">[% HTML.escape(reason.name) %]
+[% # reason.level %]</a></td>
+    <td>[% reason.description | html %]</td>
+    <td>[% reason.valid_for_sales_as_bool_yn %]</td>
+    <td>[% reason.valid_for_purchase_as_bool_yn %]</td>
+   [%- END %]
+  </tbody>
+ </table>
+</p>
diff --git a/templates/webpages/reclamation_reason/sort_list.html b/templates/webpages/reclamation_reason/sort_list.html
new file mode 100644
index 000000000..6355842ad
--- /dev/null
+++ b/templates/webpages/reclamation_reason/sort_list.html
@@ -0,0 +1,25 @@
+[%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%][%- USE T8 -%]
+[% INCLUDE 'common/flash.html' %]
+
+<h1>[% HTML.escape(title) %]</h1>
+[% SET style="width: 400px" %]
+
+<form method="post" action="controller.pl" id="form">
+<table id="reclamation_reasons">
+ <thead>
+  <tr>
+    <th align="center"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+    <th align="left">[% 'Reclamation Reason' | $T8 %]</th>
+    <th align="left">[% 'Description' | $T8 %]</th>
+    <th align="left">[% 'Valid for Sales' | $T8 %]</th>
+    <th align="left">[% 'Valid for Purchase' | $T8 %]</th>
+  </tr>
+ </thead>
+
+ <tbody id="table_body">
+  [% PROCESS 'reclamation_reason/_sort_list_row.html', RECLAMATION_REASONS = RECLAMATION_REASONS %]
+  </tbody>
+</table>
+</form>
+
+[% L.sortable_element('#table_body', url=SELF.url_for(action='reorder'), with='reclamation_reason_id') %]
diff --git a/templates/webpages/record_links/add_filter.html b/templates/webpages/record_links/add_filter.html
index d9b02093e..77a8d1138 100644
--- a/templates/webpages/record_links/add_filter.html
+++ b/templates/webpages/record_links/add_filter.html
@@ -26,12 +26,12 @@
    <td>[% L.input_tag('number', '', style=style) %]</td>
   </tr>
 
-  <tr>
+  <tr class="record_links_add_filter_cv_row">
    <td>[%- LxERP.t8("Customer/Vendor Number") %]:</td>
    <td>[% L.input_tag('vc_number', is_sales ? SELF.object.customer.customernumber : SELF.object.vendor.vendornumber, style=style) %]</td>
   </tr>
 
-  <tr>
+  <tr class="record_links_add_filter_cv_row">
    <td>[%- LxERP.t8("Customer/Vendor Name") %]:</td>
    <td>[% L.input_tag('vc_name', is_sales ? SELF.object.customer.name : SELF.object.vendor.name, style=style) %]</td>
   </tr>
@@ -41,7 +41,7 @@
    <td>[% L.select_tag('globalproject_id', PROJECTS, default=SELF.object.globalproject_id, with_empty=1, style=style) %]</td>
   </tr>
 
-  <tr>
+  <tr id="record_links_add_filter_title_row">
    <td><span id="record_links_add_filter_title">[%- LxERP.t8("Transaction description") %]</span>:</td>
    <td>[% L.input_tag('transaction_description', '', style=style) %]</td>
   </tr>
@@ -73,8 +73,13 @@ function filter_record_links() {
   $.ajax({
     url: url,
     success: function(new_data) {
-      $("#record_list_filtered_list").html(new_data['html']);
-      $('#add_selected_record_links_button').prop('disabled', new_data['count'] == 0);
+      if (new_data['error']) {
+        $("#record_list_filtered_list").html(kivi.t8('Error: #1', [ new_data['error'] ]));
+        $('#add_selected_record_links_button').prop('disabled', true);
+      } else {
+        $("#record_list_filtered_list").html(new_data['html']);
+        $('#add_selected_record_links_button').prop('disabled', new_data['count'] == 0);
+      }
     }
   });
 }
@@ -94,16 +99,31 @@ function record_links_change_form_to_match_type() {
   var type  = $('#record_links_add_filter_link_type').val();
   var title = type == 'requirement_spec' ? kivi.t8('Title')
             : type == 'letter'           ? kivi.t8('Subject')
+            : type == 'email_journal'    ? kivi.t8('Subject')
             :                              kivi.t8('Transaction description');
 
-  if (type == 'letter') {
+  if (type == 'letter' || type == 'email_journal' || type == 'gl_transaction' ||
+      type == 'dunning' || type == 'shop_order') {
     $('#record_links_add_filter_project_row').hide();
 
   } else {
     $('#record_links_add_filter_project_row').show();
   }
 
-  $('#record_links_add_filter_title').html(title);
+  if (type == 'email_journal' || type == 'gl_transaction' || type == 'dunning') {
+    $('.record_links_add_filter_cv_row').hide();
+
+  } else {
+    $('.record_links_add_filter_cv_row').show();
+  }
+
+  if (type == 'dunning' || type == 'shop_order') {
+    $('#record_links_add_filter_title_row').hide();
+
+  } else {
+    $('#record_links_add_filter_title').html(title);
+    $('#record_links_add_filter_title_row').show();
+  }
 }
 -->
 </script>
diff --git a/templates/webpages/record_links/add_list.html b/templates/webpages/record_links/add_list.html
index 0c97bd682..604637ac3 100644
--- a/templates/webpages/record_links/add_list.html
+++ b/templates/webpages/record_links/add_list.html
@@ -5,12 +5,16 @@
 <table width="100%">
  <tr class="listheading">
   <th>[% L.checkbox_tag('record_links_check_all') %]</th>
+  [% IF vc %]
   <th>[% IF vc == 'customer' %][%- LxERP.t8("Customer") %][%- ELSE %][%- LxERP.t8("Vendor") %][%- END %]</th>
+  [% END %]
   <th>[%- LxERP.t8("Number") %]</th>
   [% IF date_column %]
    <th>[%- LxERP.t8("Date") %]</th>
   [% END %]
-  <th>[% HTML.escape(description_title) %]</th>
+  [% IF description_column %]
+   <th>[% HTML.escape(description_title) %]</th>
+  [% END %]
   [% IF project_column %]
    <th>[%- LxERP.t8("Project") %]</th>
   [% END %]
@@ -19,12 +23,16 @@
  [%- FOREACH object = OBJECTS %]
  <tr class="listrow[% loop.count % 2 %]">
   <td>[% L.checkbox_tag('link_id[]', value=object.id) %]</td>
+  [% IF vc %]
   <td>[%- HTML.escape(object.$vc.name) %]</td>
+  [% END %]
   <td>[%- HTML.escape(object.$number_column) %]</td>
   [% IF date_column %]
    <td>[%- HTML.escape(object.$date_column.to_kivitendo) %]</td>
   [% END %]
-  <td>[%- HTML.escape(object.$description_column) %]</td>
+  [% IF description_column %]
+   <td>[%- HTML.escape(object.$description_column) %]</td>
+  [% END %]
   [% IF project_column %]
    <td>[%- object.$project_column.presenter.project(no_link=1) %]</td>
   [% END %]
diff --git a/templates/webpages/report_generator/chart_export_options.html b/templates/webpages/report_generator/chart_export_options.html
new file mode 100644
index 000000000..2e95231e3
--- /dev/null
+++ b/templates/webpages/report_generator/chart_export_options.html
@@ -0,0 +1,65 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE P %]
+[%- USE LxERP %]
+
+ <h1>[% HTML.escape(title) %]</h1>
+
+ <form action="[% HTML.escape(script) %]" method="post" name="report_generator_form" id="report_generator_form">
+
+  [%- FOREACH var = HIDDEN %]
+  <input type="hidden" name="[% HTML.escape(var.key) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="report_generator_chart_options_set" value="1">
+  <input type="hidden" name="report_generator_dispatch_to" value="">
+
+  <table id="assigment_table">
+   <tr>
+     <th valign="top" align="right">[% 'Chart assignments' | $T8 %]: [% 'X axis' | $T8 %]</th>
+     <td>
+       [% L.select_tag('report_generator_chart_options_assignment_x',
+                       fields,
+                       default = SELF.report_generator_chart_options_assignment_x
+                       value_key = 'name',
+                       title_key = 'text') %]
+     </td>
+   </tr>
+    <tr id="y_assignment_row">
+     <th valign="top" align="right">[% 'Chart assignments' | $T8 %]: [% 'Y axis' | $T8 %]</th>
+     <td>
+       [% L.select_tag('report_generator_chart_options_assignments_y[]',
+                       fields,
+                       value_key = 'name',
+                       title_key = 'text') %]
+       [% P.link_tag('', "✘", class='remove_data_assignment interact cursor-pointer', onclick='remove_data_assignment(this)', style='display:none') %]
+     </td>
+    </tr>
+  </table>
+
+  [% L.button_tag('add_data_assignement()', LxERP.t8('Add row')) %]
+
+[%- IF CONTROLLER_DISPATCH %]
+    <input type="hidden" name="CONTROLLER_DISPATCH" value="[% CONTROLLER_DISPATCH | html %]">
+[%- ELSE %]
+   <input type="hidden" name="action" value="report_generator_dispatcher">
+[%- END %]
+
+
+ </form>
+
+ <script type="text/javascript">
+  <!--
+   function add_data_assignement() {
+     const new_row = $('#y_assignment_row').clone();
+     new_row.removeAttr('id');
+     new_row.find('a').show();
+     new_row.find('*').removeAttr('id');
+     new_row.appendTo("#assigment_table");
+   }
+   function remove_data_assignment(clicked) {
+     $(clicked).closest('tr').remove();
+   }
+  -->
+ </script>
diff --git a/templates/webpages/report_generator/chart_report.html b/templates/webpages/report_generator/chart_report.html
new file mode 100644
index 000000000..a59a2df33
--- /dev/null
+++ b/templates/webpages/report_generator/chart_report.html
@@ -0,0 +1,29 @@
+[% USE P -%]
+
+<h1>[% TITLE %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+[% IF TOP_INFO_TEXT %]
+ <p>[% TOP_INFO_TEXT %]</p>
+[% END %]
+
+[% RAW_TOP_INFO_TEXT %]
+
+<div class="chart-container" style="position: relative;">
+  <canvas id="chart" height="70vH"></canvas>
+</div>
+
+[% RAW_BOTTOM_INFO_TEXT %]
+
+[% IF BOTTOM_INFO_TEXT %]
+ <p>[% BOTTOM_INFO_TEXT %]</p>
+[% END %]
+
+
+<script>
+  kivi.ChartReport.data = { labels: [% labels %],
+                            datasets: [% datasets %],
+                            data_labels: [% data_labels %],
+                          };
+</script>
diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
index 4ed1ca88e..cf829c096 100644
--- a/templates/webpages/report_generator/html_report.html
+++ b/templates/webpages/report_generator/html_report.html
@@ -102,6 +102,17 @@
    [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
    [% END %]
 
+   [% IF ALLOW_CHART_EXPORT %]
+    [% FOREACH row = HEADER_ROWS %]
+     [% FOREACH col = row %]
+      [% IF col.name && col.text %]
+       <input type="hidden" name="report_generator_chart_fields[+].name" value="[% HTML.escape(col.name) %]">
+       <input type="hidden" name="report_generator_chart_fields[].text"  value="[% HTML.escape(col.text) %]">
+      [% END %]
+     [% END %]
+    [% END %]
+   [% END %]
+
 [%- IF CONTROLLER_DISPATCH %]
 [% IF !SKIP_BUTTONS %]
    <input type="hidden" name="action" value="[% CONTROLLER_DISPATCH %]/dispatch">
diff --git a/templates/webpages/requirement_spec_order/list.html b/templates/webpages/requirement_spec_order/list.html
index d1c227891..d368f3a2c 100644
--- a/templates/webpages/requirement_spec_order/list.html
+++ b/templates/webpages/requirement_spec_order/list.html
@@ -79,11 +79,7 @@
       [% END %]
      </td>
      <td>
-      [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
-        <a href="controller.pl?action=Order/edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
-      [%- ELSE -%]
-        <a href="oe.pl?action=edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
-      [%- END -%]
+      <a href="controller.pl?action=Order/edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
        [% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %]
       </a>
      </td>
diff --git a/templates/webpages/requirement_spec_text_block/_predefined_text_inserter.js b/templates/webpages/requirement_spec_text_block/_predefined_text_inserter.js
index cc1e39886..a19e903a0 100644
--- a/templates/webpages/requirement_spec_text_block/_predefined_text_inserter.js
+++ b/templates/webpages/requirement_spec_text_block/_predefined_text_inserter.js
@@ -22,7 +22,7 @@ function insert_selected_predefined_text() {
     title_ctrl.val(pt.title);
 
   if ((pt.text || '') != '')
-    $('#[% id_base %][% text_ctrl_id %]').ckeditorGet().insertHtml(pt.text);
+    $('#[% id_base %][% text_ctrl_id %]').data('ckeditorInstance').setData(pt.text);
 
   return false;
 }
diff --git a/templates/webpages/rp/erfolgsrechnung.html b/templates/webpages/rp/erfolgsrechnung.html
index f3a73c76d..6cf3c5dfb 100644
--- a/templates/webpages/rp/erfolgsrechnung.html
+++ b/templates/webpages/rp/erfolgsrechnung.html
@@ -17,11 +17,13 @@
       <th align="left" colspan="4">[% category.name %]<b><hr align="left" width="250" size="5" noshade></th>
     </tr>
     [%- FOREACH row = category.accounts %]
+      [% IF row.total != '0.00' %]
       <tr>
         <td align="left">[% row.accno %]</td>
         <td align="left">[% row.description %]</td>
         <td align="right">[% row.total %]</td>
       </tr>
+      [% END %]
     [%- END %]
     <tr>
       <td colspan="2"> </td>
diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
index c8cc07c01..8e7cdd15e 100644
--- a/templates/webpages/sepa/bank_transfer_add.html
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -36,6 +36,7 @@
      <th class="listheading">[% IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
      <th class="listheading">[% 'Invoice' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'SEPA Transfer Amount' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Invoice Date' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Due Date' | $T8 %]</th>
@@ -48,13 +49,13 @@
     [%- FOREACH invoice = INVOICES %]
      <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(invoice.id) %]">
      <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]">
-     <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.open_sepa_transfer_amount, 2) %]">
+     <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %]">
      <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.skonto_amount, 2) %]">
 
 
-     <tr class="listrow[% IF !invoice.vc_bank_info_ok && invoice.checked %]_error[% END %]">
+     <tr class="listrow[% IF (!invoice.vc_bank_info_ok && invoice.checked) || invoice.is_sepa_blocked %]_error[% END %]">
       <td align="center">
-       [%- IF invoice.vc_bank_info_ok %]
+       [%- IF invoice.vc_bank_info_ok && !invoice.is_sepa_blocked %]
         [% L.checkbox_tag("ids[]", value=invoice.id, checked=invoice.checked) %]
        [%- END %]
       </td>
@@ -64,11 +65,11 @@
          [%- GET HTML.escape(invoice.vcname);
              SET previous_vcname = invoice.vcname;
              IF !invoice.vc_bank_info_ok;
-               IF invoice.checked;
-                 GET ' <sup>(2)</sup>';
-               ELSE;
-                 GET ' <sup>(1)</sup>';
-               END;
+               GET ' <sup>(1)</sup>';
+               SET show_vc_bank_info_footnote = '1';
+             END;
+             IF !invoice.checked;
+               GET ' <sup>(2)</sup>';
                SET show_vc_bank_info_footnote = '1';
              END; -%]
         </a>
@@ -77,12 +78,18 @@
 
       <td>
        <a href="[% IF invoice.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
-        [% HTML.escape(invoice.invnumber) %]
+         [%- GET HTML.escape(invoice.invnumber);
+             IF invoice.is_sepa_blocked;
+               GET ' <sup>(*)</sup>';
+               SET show_is_sepa_blocked_footnote = '1';
+             END;
+         -%]
        </a>
       </td>
 
-      <td align="right">[% LxERP.format_amount(invoice.invoice_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
-      <td align="right">[% LxERP.format_amount(invoice.open_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
+      <td align="right">[% LxERP.format_amount(invoice.invoice_amount, 2) %]</td>
+      <td align="right">[% LxERP.format_amount(invoice.transfer_amount * -1, 2) %]</td>
+      <td align="right">[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %] </td>
       <td align="right">[% invoice.transdate %]</td>
       <td align="right">[% invoice.duedate %]</td>
       <td>
@@ -94,7 +101,7 @@
        <input name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="30">
       </td>
       <td align="right">
-       <input id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.invoice_amount_suggestion, 2) %]" style="text-align: right" size="12">
+       <input id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %]" style="text-align: right" size="12">
       </td>
       <td>
       [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
@@ -120,18 +127,21 @@
    <p>
     <sup>(2)</sup>
     [%- IF is_vendor %]
-     [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN and the BIC." | $T8 %]
-     [% LxERP.t8("Additionally the invoice is not marked for direct debit and would have been checked automatically had the bank information been entered.") %]
+     [% LxERP.t8("This invoice is marked for direct debit and cannot be selected for a SEPA Export.") %]
     [%- ELSE %]
-     [%- 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
-     [% LxERP.t8("Additionally the invoice is marked for direct debit and would have been checked automatically had the bank information been entered.") %]
+     [% LxERP.t8("This invoice is not marked for direct debit and cannot be selected for a SEPA Export.") %]
     [%- END %]
    </p>
   [%- END %]
 
-  <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
+  [%- IF show_is_sepa_blocked_footnote %]
+   <p>
+    <sup>(*)</sup>
+     [%- 'For this invoice the bank tranfer via SEPA was blocked manually.' | $T8 %]
+   </p>
+   [%- END %]
+
+   <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
  </form>
 
  <script type="text/javascript">
@@ -147,8 +157,6 @@ $( ".type_target" ).change(function() {
   // alert("found id " + id);
   if ( $(this).val() == "without_skonto" ) {
       $('#' + id).val( $('#invoice_open_amount_' + id).val() );
-  } else if ( $(this).val() == "difference_as_skonto" ) {
-      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
   } else if ( $(this).val() == "with_skonto_pt" ) {
             $('#' + id).val( $('#amount_less_skonto_' + id).val() );
   }
diff --git a/templates/webpages/sepa/bank_transfer_created.html b/templates/webpages/sepa/bank_transfer_created.html
index e4930156c..bda56f36c 100644
--- a/templates/webpages/sepa/bank_transfer_created.html
+++ b/templates/webpages/sepa/bank_transfer_created.html
@@ -1,24 +1,38 @@
 [%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE LxERP -%][%- USE L -%]
 <h1>[% title %]</h1>
 
- <p>
+<p>
   [% 'The SEPA export has been created.' | $T8 %]
- </p>
-
- <p>
-  <ul>
-   <li>
-    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]&vc=[% HTML.url(vc) %]">
-     [% 'Download SEPA XML export file' | $T8 %]
-    </a>
-   </li>
-
-   <li>
-    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1&vc=[% HTML.url(vc) %]">
-     [% 'List open SEPA exports' | $T8 %]
-    </a>
-   </li>
-  </ul>
- </p>
+</p>
 
+<h2>[% LxERP.t8('Download SEPA XML export file') %]</h2>
+
+<form method="post" action="sepa.pl">
+  <p>
+    [% LxERP.t8("SEPA XML version") %]:
+    [% L.select_tag('sepa_xml_version', sepa_versions.versions, title_key='description', selected=sepa_versions.default) %]
+  </p>
+
+  <p>
+    [% L.hidden_tag('action', 'bank_transfer_download_sepa_xml') %]
+    [% L.hidden_tag('id', id) %]
+    [% L.hidden_tag('vc', vc) %]
+
+    [% L.submit_tag('dummy', LxERP.t8('Download')) %]
+  </p>
+</form>
+[%- IF INSTANCE_CONF.get_doc_storage %]
+
+<h2>[% LxERP.t8('Download Documents for exported bookings') %]</h2>
+
+<p>
+  <a href="sepa.pl?action=bank_transfer_download_sepa_docs&id=[% HTML.url(id) %]&vc=[% HTML.url(vc) %]"> [% 'Download Documents for exported bookings' | $T8 %]</a>
+</p>
+[% END %]
+
+<h2>[% LxERP.t8('List open SEPA exports') %]</h2>
+
+<p>
+  <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1&vc=[% HTML.url(vc) %]">[% 'List open SEPA exports' | $T8 %]</a>
+</p>
diff --git a/templates/webpages/sepa/bank_transfer_list_top.html b/templates/webpages/sepa/bank_transfer_list_top.html
index 6dd43d39a..92b7f6ec3 100644
--- a/templates/webpages/sepa/bank_transfer_list_top.html
+++ b/templates/webpages/sepa/bank_transfer_list_top.html
@@ -1 +1,9 @@
+[%- USE LxERP -%][%- USE L -%]
 <form action="sepa.pl" method="post" id="form">
+  [% IF show_buttons %]
+
+    <p>
+      [% LxERP.t8("SEPA XML version") %]:
+      [% L.select_tag('sepa_xml_version', sepa_versions.versions, title_key='description', selected=sepa_versions.default) %]
+    </p>
+  [% END %]
diff --git a/templates/webpages/shop_order/list.html b/templates/webpages/shop_order/list.html
index e8c10340c..49a008b43 100644
--- a/templates/webpages/shop_order/list.html
+++ b/templates/webpages/shop_order/list.html
@@ -11,135 +11,48 @@
   <thead>
    <tr class="listheading">
     <th>[% 'Shop' | $T8 %]</th>
-    <th>[% IF FORM.sort_by == 'order_date' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=order_date&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop orderdate' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=order_date&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop orderdate' | $T8 %]</a>
-    [% END %]
-    <br>
-    [% IF FORM.sort_by == 'itime' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=itime&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Importdate' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=itime&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Importdate' | $T8 %]</a>
-    [% END %]
-    </th>
-    <th>[% IF FORM.sort_by == 'shop_ordernumber' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_ordernumber&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop ordernumber' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_ordernumber&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop ordernumber' | $T8 %]</a>
-    [% END %]
-    </th>
-    <th>[% IF FORM.sort_by == 'shop_customer_number' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_customer_number&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop customernumber' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_customer_number&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shop customernumber' | $T8 %]</a>
-    [% END %]
-    </th>
-    <th>[% 'Shop Customer Address' | $T8 %]<br>
-    [% IF FORM.sort_by == 'customer_lastname' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_lastname&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_lastname&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'customer_zipcode' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_zipcode&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_zipcode&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'customer_country' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_country&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=customer_country&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %]</a>
-    [% END %]
-      </th>
-    <th>[% 'Shop Billing Address' | $T8 %]</br>
-    [% IF FORM.sort_by == 'billing_lastname' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_lastname&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_lastname&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'billing_zipcode' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_zipcode&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_zipcode&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'billing_country' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_country&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=billing_country&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %]</a>
-    [% END %]
-      </th>
-    <th>[% 'Shop Delivery Address' | $T8 %]</br>
-    [% IF FORM.sort_by == 'delivery_lastname' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_lastname&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_lastname&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Name' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'delivery_zipcode' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_zipcode&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>|
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_zipcode&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Zip' | $T8 %]</a>|
-    [% END %]
-    [% IF FORM.sort_by == 'delivery_country' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_country&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=delivery_country&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Country' | $T8 %]</a>
-    [% END %]
+    [% FOREACH column = [
+    # [ column = [ row = [ element = [ element_text, element_value ], ... ], ... ], ... ]
+    # a link is only generated if 'element_value' is set, otherwise the text is displayed
+                       [ [ [LxERP.t8('Shop orderdate'), 'order_date']],
+                         [ [LxERP.t8('Importdate'), 'itime']]],
+                       [ [ [LxERP.t8('Shop ordernumber'), 'shop_ordernumber']]],
+                       [ [ [LxERP.t8('Shop customernumber'), 'shop_customer_number']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'customer_lastname'], ['|'], [LxERP.t8('Zip'), 'customer_zipcode'], ['|'], [LxERP.t8('Country'), 'customer_country']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'billing_lastname'],  ['|'], [LxERP.t8('Zip'), 'billing_zipcode'],  ['|'], [LxERP.t8('Country'), 'billing_country']]],
+                       [ [ [LxERP.t8('Shop Customer Address')]],
+                         [ [LxERP.t8('Name'), 'delivery_lastname'], ['|'], [LxERP.t8('Zip'), 'delivery_zipcode'], ['|'], [LxERP.t8('Country'), 'delivery_country']]],
+                       [ [ [LxERP.t8('Notes'), 'shop_customer_comment']]],
+                       [ [ [LxERP.t8('Positions'), 'positions']],
+                         [ [LxERP.t8('Amount'), 'amount']],
+                         [ [LxERP.t8('Shippingcosts'), 'shipping_costs']]]
+                     ] %]
+
+      <th>
+      [% FOREACH row = column %]
+        [% IF !loop.first %]
+          <br>
+        [% END %]
+        [% FOREACH element = row %]
+          [% SET element_text = element.0 %]
+          [% SET element_value = element.1 %]
+          [% IF element_value %]
+            [% SET sort_dir = (1 - FORM.sort_dir) * (FORM.sort_by == element_value) %]
+            <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=[% element_value %]&sort_dir=[% sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
+            [% element_text %]
+            [% IF FORM.sort_by == element_value %]
+              [% IF sort_dir == 1 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]
+            [% END %]
+            </a>
+          [% ELSE %]
+            [% element_text %]
+          [% END %]
+        [% END %]
+      [% END %]
       </th>
-    <th>[% IF FORM.sort_by == 'shop_customer_comment' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_customer_comment&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Notes' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-    [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shop_customer_comment&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Notes' | $T8 %]</a>
     [% END %]
-    </th>
-    <th>
-      [% IF FORM.sort_by == 'positions' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=positions&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Positions' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a><br>
-      [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=positions&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link"> [% 'Positions' | $T8 %]</a><br>
-      [% END %]
-      [% IF FORM.sort_by == 'amount' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=amount&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Amount' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a><br>
-      [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=amount&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link"> [% 'Amount' | $T8 %]</a><br>
-      [% END %]
-      [% IF FORM.sort_by == 'shipping_costs' %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shipping_costs&sort_dir=[% 1 - FORM.sort_dir %]&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link">
-        [% 'Shippingcosts' | $T8 %][% IF FORM.sort_dir == 0 %]<img border="0" src="image/down.png">[% ELSE %]<img border="0" src="image/up.png">[% END %]</a>
-      [% ELSE %]
-      <a href ="controller.pl?action=ShopOrder/list&filter.transferred:eq_ignore_empty=[% FORM.filter.transferred_eq_ignore_empty %]&sort_by=shipping_costs&sort_dir=0&filter.order_date:date::ge=[% FORM.filter.order_date_date__ge %]&filter.order_date:date::le=[% FORM.filter.order_date_date__le %]&filter.obsolete=[% FORM.filter.obsolete %]" class="sort_link"> [% 'Shippingcosts' | $T8 %]</a>
-      [% END %]
-    </th>
     <th>[% 'Action' | $T8 %]<br>[% L.checkbox_tag('check_all') %]</th>
    </tr>
   </thead>
diff --git a/templates/webpages/shop_order/show.html b/templates/webpages/shop_order/show.html
index da045f145..56c954740 100644
--- a/templates/webpages/shop_order/show.html
+++ b/templates/webpages/shop_order/show.html
@@ -175,26 +175,39 @@
   </table>
   <hr>
   <div style="height: 250px; overflow:auto; margin:15px;">
-    <table width="99%">
-      <tr class="listheading">
-        <th>[% 'Position'          | $T8 %]</th>
-        <th>[% 'Partnumber'        | $T8 %]</th>
-        <th>[% 'Partdescriptipion' | $T8 %]</th>
-        <th>[% 'Qty'               | $T8 %]</th>
-        <th>[% 'Price'             | $T8 %]</th>
-        <th>[% 'Extended'          | $T8 %]</th>
-      </tr>
-      <tr class="listrow">
-      [% FOREACH pos = IMPORT.shop_order_items %]
-        <td>[% loop.count                                      %]</td>
-        <td>[% HTML.escape(pos.partnumber)                     %]</td>
-        <td>[% HTML.escape(pos.description)                    %]</td>
-        <td>[% pos.quantity_as_number                          %]</td>
-        <td>[% pos.price_as_number                             %]</td>
-        <td>[% LxERP.format_amount(pos.price * pos.quantity,2) %]</td>
-      </tr>
-      [% END %]
-    </table>
+    <form method="post" action="controller.pl" id="create_partial_order">
+    [% L.hidden_tag('import_id', IMPORT.id) %]
+      <table width="99%">
+        <tr class="listheading">
+          <th>[% 'Assign'            | $T8 %]</th>
+          <th>[% 'Position'          | $T8 %]</th>
+          <th>[% 'Partnumber'        | $T8 %]</th>
+          <th>[% 'Partdescriptipion' | $T8 %]</th>
+          <th>[% 'Qty'               | $T8 %]</th>
+          <th>[% 'Price'             | $T8 %]</th>
+          <th>[% 'Discount'          | $T8 %]</th>
+          <th>[% 'Promotion Code'    | $T8 %]</th>
+          <th>[% 'Extended'          | $T8 %]</th>
+        </tr>
+        <tr class="listrow">
+        [% FOREACH pos = IMPORT.shop_order_items %]
+          <td>[% L.checkbox_tag("pos_ids." _ pos.id _ "[]", value=1, checked=1) %]</td>
+          <td>[% loop.count                                      %]</td>
+          <td>[% HTML.escape(pos.partnumber)                     %]</td>
+          <td>[% HTML.escape(pos.description)                    %]</td>
+          <td>[% pos.quantity_as_number                          %]</td>
+          <td>[% pos.price_as_number                             %]</td>
+          <td>[% pos.discount_as_number * 100                    %] %</td>
+          <td>[% pos.discount_code                               %]</td>
+          <td>[% LxERP.format_amount(pos.price * pos.quantity,2) %]</td>
+        </tr>
+        [% END %]
+      </table>
+      <div id="partial_transfer" style="float:left; display:none;">
+        [% L.hidden_tag('partial_transfer_customer_id') %]
+        [% L.ajax_submit_tag('controller.pl?action=ShopOrder/transfer', "#create_partial_order", LxERP.t8('Create partial order')) %]
+      </div>
+    </form>
   </div>
   <hr>
 <script type="text/javascript">
@@ -203,5 +216,7 @@ $("input[type=radio]").change(function(){
       var cv_id = $("input[type=radio][id="+ this.id + "]").val();
       $('#shop_update_customer_'+ cv_id).css("display", 'block');
       $('#transfer').css("display", 'block');
+      $('#partial_transfer').css("display", 'block');
+      $('#partial_transfer_customer_id').val(cv_id);
 });
 </script>
diff --git a/templates/webpages/simple_system_setting/_bank_account_form.html b/templates/webpages/simple_system_setting/_bank_account_form.html
index 2d364aa33..358c999b7 100644
--- a/templates/webpages/simple_system_setting/_bank_account_form.html
+++ b/templates/webpages/simple_system_setting/_bank_account_form.html
@@ -11,6 +11,10 @@
   <th align="right">[% LxERP.t8('IBAN') %]</th>
   <td>[%- L.input_tag("object.iban", SELF.object.iban, style=style, "data-validate"="required", "data-title"=LxERP.t8("IBAN")) %]</td>
  </tr>
+ <tr>
+  <th align="right">[% LxERP.t8('QR-IBAN (Swiss)') %]</th>
+  <td>[% L.input_tag("object.qr_iban", SELF.object.qr_iban, style=style) %]</td>
+ </tr>
  <tr>
   <th align="right">[% LxERP.t8('Bank') %]</th>
   <td>[%- L.input_tag("object.bank", SELF.object.bank, style=style) %]</td>
@@ -24,7 +28,7 @@
   <td>[%- L.input_tag("object.bic", SELF.object.bic, style=style) %]</td>
  </tr>
  <tr>
-  <th align="right">[% LxERP.t8('Bank code') %]</th>
+  <th align="right">[% LxERP.t8('Bank code') %]/[% LxERP.t8('SWIFT') %]</th>
   <td>[%- L.input_tag("object.bank_code", SELF.object.bank_code, style=style) %]</td>
  </tr>
  <tr>
@@ -35,6 +39,13 @@
   <th align="right">[% LxERP.t8('Chart') %]</th>
   <td>[% P.chart.picker('object.chart_id', SELF.object.chart_id, type='AR_paid,AP_paid', category='A,L,Q', choose=1, style=style, "data-validate"="required", "data-title"=LxERP.t8("Chart")) %]</td>
  </tr>
+ <tr>
+  <th align="right">[% LxERP.t8('Use with bank import') %]</th>
+  <td>
+    [% L.checkbox_tag('object.use_with_bank_import', checked = SELF.object.use_with_bank_import, for_submit=1) %]
+    <strong>[% LxERP.t8('Warning') %]:</strong> [% LxERP.t8('If this option is disabled, the bank import is not possible for this account anymore. In the case of invoices and accounts payable and receivable entries, incoming and outgoing payments can then be posted directly to the account manually.') %]
+  </td>
+</tr>
  <tr>
   <th align="right">[% LxERP.t8('Use for Factur-X/ZUGFeRD') %]</th>
   <td>[% L.checkbox_tag('object.use_for_zugferd', checked = SELF.object.use_for_zugferd, for_submit=1) %]</td>
diff --git a/templates/webpages/simple_system_setting/_order_status_form.html b/templates/webpages/simple_system_setting/_order_status_form.html
new file mode 100644
index 000000000..6706daf0b
--- /dev/null
+++ b/templates/webpages/simple_system_setting/_order_status_form.html
@@ -0,0 +1,20 @@
+[%- USE LxERP -%][%- USE L -%]
+<table>
+ <tr>
+  <th align="right">[% LxERP.t8("Name") %]</th>
+  <td>
+   [%- L.input_tag("object.name", SELF.object.name, "data-validate"="required", "data-title"=LxERP.t8("Name")) %]
+  </td>
+ </tr>
+ <tr>
+  <th align="right">[% LxERP.t8("Description") %]</th>
+  <td>
+   [%- L.input_tag("object.description", SELF.object.description, "data-title"=LxERP.t8("Description")) %]
+  </td>
+ </tr>
+ <tr>
+  <th align="right">[% LxERP.t8("Obsolete") %]</th>
+  <td>[% L.checkbox_tag("object.obsolete", checked=SELF.object.obsolete, for_submit=1) %]</td>
+ </tr>
+
+</table>
diff --git a/templates/webpages/task_server/failure_notification_email.txt b/templates/webpages/task_server/failure_notification_email.txt
index 7d9746749..05c9989f8 100644
--- a/templates/webpages/task_server/failure_notification_email.txt
+++ b/templates/webpages/task_server/failure_notification_email.txt
@@ -3,7 +3,7 @@ Hallo,
 [% IF history -%]
 der folgende Hintergrundjob ist bei kivitendo für den Mandanten [% client.name %] fehlgeschlagen:
 
-Paketname:  [% history.package_name %]
+Paketname:  [% history.package_name %] / [% history.description %]
 Ausgeführt: [% history.run_at_as_timestamp %]
 Fehler:     [% history.error_col %]
 
diff --git a/templates/webpages/test/ckeditor.html b/templates/webpages/test/ckeditor.html
new file mode 100644
index 000000000..c5d126697
--- /dev/null
+++ b/templates/webpages/test/ckeditor.html
@@ -0,0 +1,54 @@
+[% USE P %]
+
+<h1>CKeditor</h1>
+
+<h3>standard empty</h3>
+
+[% P.textarea_tag('name1', "", class="texteditor") %]
+
+<h3>prefilled</h3>
+
+[% P.textarea_tag('name2', "<p>this is a text</p>", class="texteditor") %]
+
+<h3>inside form (check if enter triggers form.submit)</h3>
+
+<fieldset>
+<form onsubmit="return alert('Submit was triggered');">
+[% P.textarea_tag('name3', "<p>Try to hit enter here</p>", class="texteditor") %]
+[% P.input_tag('name4', 'and here...') %]
+</form>
+</fieldset>
+
+<h3>inside div with enter listener</h3>
+
+<fieldset>
+  <div id='name3div'>
+    [% P.textarea_tag('name3', "<p>Try to hit enter here</p>", class="texteditor") %]
+  </div>
+  <script>
+    document.querySelector('#name3div').addEventListener('keypress', function(e) {
+      alert("got keypressed event!" + e);
+    });
+  </script>
+</fieldset>
+
+<h3>inside div with jquery enter listener</h3>
+
+<fieldset>
+  <div id='name4div'>
+    [% P.textarea_tag('name4', "<p>Try to hit enter here</p>", class="texteditor") %]
+  </div>
+  <script>
+    $('#name4div').on('keypress', function(e) {
+      alert("got keypressed event!" + e);
+    });
+  </script>
+</fieldset>
+
+<h3>initial focus</h3>
+
+[% P.textarea_tag('name5', "<p>this is a text</p>", class="texteditor texteditor-autofocus") %]
+
+<h3>with custom width/height</h3>
+
+[% P.textarea_tag('name6', "<p>this is a text</p>", style="width: 350px; height: 150px", class="texteditor") %]
diff --git a/templates/webpages/todo/show_todo_list.html b/templates/webpages/todo/show_todo_list.html
index 466e6bb6b..45b006432 100644
--- a/templates/webpages/todo/show_todo_list.html
+++ b/templates/webpages/todo/show_todo_list.html
@@ -2,6 +2,8 @@
 [%- USE HTML %]
 <h1>[% 'Your TODO list' | $T8 %]</h1>
 
+ [%- INCLUDE 'common/flash.html' %]
+
  [%- IF !todo_list %]
  <p>
   [% 'There are no items on your TODO list at the moment.' | $T8 %]
@@ -12,4 +14,3 @@
  [%- todo_list %]
 
  [%- END %]
-
diff --git a/templates/webpages/wh/create_assembly_chargenumbers.html b/templates/webpages/wh/create_assembly_chargenumbers.html
new file mode 100644
index 000000000..4e7708d06
--- /dev/null
+++ b/templates/webpages/wh/create_assembly_chargenumbers.html
@@ -0,0 +1,125 @@
+[%- USE P -%]
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+
+<h1>[% HTML.escape(title) %]</h1>
+
+[%- INCLUDE 'common/flash.html' %]
+
+<form name="Form" method="post" action="wh.pl" id="form">
+  [%
+    FOREACH key = hidden_vars.keys;
+      P.hidden_tag(key, HTML.escape(hidden_vars.$key));
+    END
+  %]
+
+  <p>
+    [% 'The following assembly items are ambigious. Please check the selection.' | $T8 %]
+  </p>
+
+  <table>
+    <thead>
+      <tr class="listheading">
+        <th>[% 'Partnumber'   | $T8%]</th>
+        <th>[% 'Description'  | $T8%]</th>
+        <th>[% 'Chargenumber' | $T8%]</th>
+        <th>[% 'Warehouse'    | $T8%]</th>
+        <th>[% 'Bin'          | $T8%]</th>
+        <th>[% 'Onhand'       | $T8%]</th>
+        <th>[% 'Qty'          | $T8%]</th>
+        <th>[% 'Unit'         | $T8%]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
+        [% NEXT UNLESS stocked_by_parts_id.$part_id.size > 1 %]
+        <tr class="listheading">
+          <td colspan="6">[% 'needed qty' | $T8 %]</td>
+          <td class="numeric">[% LxERP.format_amount(needed_by_parts_id.$part_id, -2) %]</td>
+          <td>[% stocked_by_parts_id.$part_id.0.part.unit | html %]</td>
+        </tr>
+        [% FOREACH part = stocked_by_parts_id.$part_id -%]
+          <tr class="listrow">
+            [% SET alloc_qty = '';
+               FOREACH alloc = allocated_by_parts_id.$part_id;
+                 IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
+                   SET alloc_qty = alloc.qty;
+                 END;
+               END
+            -%]
+            <td>
+              [% P.hidden_tag('allocations[+].parts_id', part_id )%]
+              [% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
+              [% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
+              [% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
+              [% part.part.partnumber | html %]
+            </td>
+            <td>[% part.part.description      | html                 %]</td>
+            <td>[% part.chargenumber          | html                 %]</td>
+            <td>[% part.warehouse.description | html                 %]</td>
+            <td>[% part.bin.description       | html                 %]</td>
+            <td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
+            <td>[% P.input_number_tag('allocations[].qty', alloc_qty, precision => -2, size => 8) %]</td>
+            <td>[% part.part.unit             | html                 %]</td>
+          </tr>
+        [% END %]
+        <tr></tr>
+        <tr></tr>
+      [% END %]
+    </tbody>
+  </table>
+
+  <p>
+    [% 'The following assembly items are unambigious and will be used for production.' | $T8 %]
+  </p>
+
+  <table>
+    <thead>
+      <tr class="listheading">
+        <th>[% 'Partnumber'   | $T8%]</th>
+        <th>[% 'Description'  | $T8%]</th>
+        <th>[% 'Chargenumber' | $T8%]</th>
+        <th>[% 'Warehouse'    | $T8%]</th>
+        <th>[% 'Bin'          | $T8%]</th>
+        <th>[% 'Onhand'       | $T8%]</th>
+        <th>[% 'Qty'          | $T8%]</th>
+        <th>[% 'Unit'         | $T8%]</th>
+      </tr>
+    </thead>
+    <tbody>
+      [% FOREACH part_id = stocked_by_parts_id.keys.sort -%]
+        [% NEXT UNLESS stocked_by_parts_id.$part_id.size <= 1 %]
+        [% FOREACH part = stocked_by_parts_id.$part_id -%]
+          <tr class="listrow">
+            [% SET alloc_qty = '';
+               FOREACH alloc = allocated_by_parts_id.$part_id;
+                 IF (alloc.warehouse_id == part.warehouse.id && alloc.bin_id == part.bin_id && HTML.escape(alloc.chargenumber) == HTML.escape(part.chargenumber));
+                   SET alloc_qty = alloc.qty;
+                 END;
+               END
+              -%]
+            <td>
+              [% P.hidden_tag('allocations[+].parts_id', part_id )%]
+              [% P.hidden_tag('allocations[].chargenumber', part.chargenumber )%]
+              [% P.hidden_tag('allocations[].warehouse_id', part.warehouse_id )%]
+              [% P.hidden_tag('allocations[].bin_id', part.bin_id )%]
+              [% part.part.partnumber | html %]
+            </td>
+            <td>[% part.part.description      | html                 %]</td>
+            <td>[% part.chargenumber          | html                 %]</td>
+            <td>[% part.warehouse.description | html                 %]</td>
+            <td>[% part.bin.description       | html                 %]</td>
+            <td class="numeric">[% LxERP.format_amount(part.qty, -2) %]</td>
+            <td class="numeric">
+              [% P.hidden_tag('allocations[].qty', LxERP.format_amount(alloc_qty, -2)) %]
+              [% LxERP.format_amount(alloc_qty, -2) %]
+            </td>
+            <td>[% part.part.unit             | html                 %]</td>
+          </tr>
+        [% END %]
+      [% END %]
+    </tbody>
+  </table>
+
+</form>
diff --git a/templates/webpages/wh/produce_assembly_error.html b/templates/webpages/wh/produce_assembly_error.html
new file mode 100644
index 000000000..e898b5a6b
--- /dev/null
+++ b/templates/webpages/wh/produce_assembly_error.html
@@ -0,0 +1,45 @@
+[%- USE T8 %][%- USE HTML %][%- USE LxERP -%][%- USE L -%]
+
+<div class="message_error">
+  <p>[% LxERP.t8("Error!") %]</p>
+
+  <p class="message_error_label">[% LxERP.t8("The assembly could not be produced.") %]</p>
+</div>
+
+[% IF missing_qty_exceptions.size %]
+  <p>[% LxERP.t8("The following parts could not be allocated:") %]</p>
+
+  <div>
+    <table>
+      <thead>
+        <tr class="listheading">
+          <th>[% LxERP.t8("Part") %]</th>
+          <th align="right">[% LxERP.t8("Required qty") %]</th>
+          <th align="right">[% LxERP.t8("Missing qty") %]</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        [% FOREACH ex = missing_qty_exceptions %]
+          <tr class="listrow">
+            <td>[% HTML.escape(ex.part_description) %]</td>
+            <td align="right">[% HTML.escape(LxERP.format_amount(ex.to_allocate_qty)) %]</td>
+            <td align="right">[% HTML.escape(LxERP.format_amount(ex.missing_qty)) %]</td>
+          </tr>
+        [% END %]
+      </tbody>
+    </table>
+  </div>
+[% END %]
+
+[% IF other_exceptions.size %]
+  <p>[% LxERP.t8("Additional errors:") %]</p>
+
+  <div>
+    <ul>
+      [% FOREACH ex = other_exceptions %]
+        <li>[% HTML.escape(ex.message) %]</li>
+      [% END %]
+    </ul>
+  </div>
+[% END %]
diff --git a/templates/webpages/wh/removal_parts_selection.html b/templates/webpages/wh/removal_parts_selection.html
index edc45d369..08705c13a 100644
--- a/templates/webpages/wh/removal_parts_selection.html
+++ b/templates/webpages/wh/removal_parts_selection.html
@@ -52,7 +52,7 @@
      <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      [% END %]
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
+     <td>[% HTML.escape(row.bin) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
index f0635c1d2..ec61639a5 100644
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -184,10 +184,10 @@
 
       <table>
        <tr>
-        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
-        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
-        <td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
+        <td align="right"><input name="l_warehouse" id="l_warehouse" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_warehouse">[% 'Warehouse' | $T8 %]</label></td>
+        <td align="right"><input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y" checked></td>
+        <td nowrap><label for="l_bin">[% 'Bin' | $T8 %]</label></td>
        </tr>
 
        <tr>
diff --git a/templates/webpages/wh/transfer_parts_selection.html b/templates/webpages/wh/transfer_parts_selection.html
index 245da8b05..0e286f74c 100644
--- a/templates/webpages/wh/transfer_parts_selection.html
+++ b/templates/webpages/wh/transfer_parts_selection.html
@@ -89,7 +89,7 @@
      <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
      [% END %]
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
-     <td>[% HTML.escape(row.bindescription) %]</td>
+     <td>[% HTML.escape(row.bin) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
diff --git a/templates/webpages/yearend/form.html b/templates/webpages/yearend/form.html
index d28dfc155..a59626972 100644
--- a/templates/webpages/yearend/form.html
+++ b/templates/webpages/yearend/form.html
@@ -7,7 +7,7 @@
 
 [%- INCLUDE 'common/flash.html' %]
 
-[% IF carry_over_chart AND profit_chart AND loss_chart %] [% THEN %]
+[% IF carry_over_chart AND profit_chart AND (loss_chart OR SELF.defaults.yearend_method == 'simple') %] [% THEN %]
 <form id="filter" name="filter" method="post" action="controller.pl">
 <table>
   <tr>
@@ -22,6 +22,16 @@
     <td align="right">[% 'Start date' | $T8 %]</td>
     <td>[% L.date_tag('cb_startdate', '', readonly=1) %]</td>
   </tr>
+  [% IF SELF.defaults.yearend_method == 'simple' %] [% THEN %]
+  <tr>
+    <td align="right">[% 'Year-end closing account' | $T8 %]</td>
+    <td>[% carry_over_chart.displayable_name | html %]</td>
+  </tr>
+  <tr>
+    <td align="right">[% 'Profit or loss carried forward account' | $T8 %]</td>
+    <td>[% profit_chart.displayable_name | html %]</td>
+  </tr>
+  [% ELSE %]
   <tr>
     <td align="right">[% 'Carry over account for year-end closing' | $T8 %]</td>
     <td>[% carry_over_chart.displayable_name | html %]</td>
@@ -34,8 +44,11 @@
     <td align="right">[% 'Loss carried forward account' | $T8 %]</td>
     <td>[% loss_chart.displayable_name | html %]</td>
   </tr>
+  [% END %]
 </table>
 </form>
+[% ELSIF SELF.defaults.yearend_method == 'simple' %]
+  [% 'Please configure the year-end closing and the profit or loss carried forward accounts for year-end closing in the client configuration!' | $T8 %]
 [% ELSE %]
   [% 'Please configure the carry over and profit and loss accounts for year-end closing in the client configuration!' | $T8 %]
 [% END %]
diff --git a/templates/webpages/zugferd/form.html b/templates/webpages/zugferd/form.html
index 49f88f54c..4eb0bbd89 100644
--- a/templates/webpages/zugferd/form.html
+++ b/templates/webpages/zugferd/form.html
@@ -10,5 +10,6 @@
  </p>
 
  <form method="post" action="controller.pl" enctype="multipart/form-data" id="form">
-    [% L.input_tag('file', '', type => 'file', accept => '.pdf') %]
+    [% L.input_tag('file', '', type => 'file', accept => '.pdf,.xml', onchange='kivi.ZUGFeRD.update_file_name();') %]
+    [% L.hidden_tag('file_name', '') %]
  </form>
diff --git a/texmf/embedfile.sty b/texmf/embedfile.sty
deleted file mode 100644
index 167dea12b..000000000
--- a/texmf/embedfile.sty
+++ /dev/null
@@ -1,799 +0,0 @@
-%% !!NOTE NOTE NOTE!!
-%%
-%% This is a modified version of `embedfile.sty' generated from a
-%% modified `embedfile.dtx' incorporating the following pull request:
-%% https://github.com/ho-tex/oberdiek/pull/72
-%%
-%% This PR adds support for creating PDF/A-compliant attachments. See
-%% also the following issue:
-%% https://github.com/ho-tex/oberdiek/issues/37
-%%
-%% !!END OF NOTE NOTE NOTE!!
-%%
-%%
-%% This is file `embedfile.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% embedfile.dtx  (with options: `package')
-%%
-%% This is a generated file.
-%%
-%% Project: embedfile
-%% Version: 2018/11/01 v2.8
-%%
-%% Copyright (C) 2006-2011 by
-%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This Current Maintainer of this work is Heiko Oberdiek.
-%%
-%% The Base Interpreter refers to any `TeX-Format',
-%% because some files are installed in TDS:tex/generic//.
-%%
-%% This work consists of the main source file embedfile.dtx
-%% and the derived files
-%%    embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv,
-%%    dtx-attach.sty, embedfile-example-plain.tex,
-%%    embedfile-example-collection.tex, embedfile-test1.tex,
-%%    embedfile-test2.tex, embedfile-test3.tex,
-%%    embedfile-test4.tex.
-%%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@embedfile.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{embedfile}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@embedfile.sty\endcsname
-\ProvidesPackage{embedfile}%
-  [2018/11/01 v2.8 Embed files into PDF (HO)]%
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname EmFi@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\EmFi@AtEnd{%
-    \EmFi@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{62}{12}% >
-\TMP@EnsureCode{91}{12}% [
-\TMP@EnsureCode{93}{12}% ]
-\TMP@EnsureCode{96}{12}% `
-\edef\EmFi@AtEnd{\EmFi@AtEnd\noexpand\endinput}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
-  \def\EmFi@RequirePackage#1[#2]{%
-    \input #1.sty\relax
-  }%
-\else
-  \let\EmFi@RequirePackage\RequirePackage
-\fi
-\EmFi@RequirePackage{infwarerr}[2007/09/09]%
-\def\EmFi@Error{%
-  \@PackageError{embedfile}%
-}
-\ifx\pdfextension\@undefined\else
-    \protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax}
-    \protected\def\pdfnames   {\pdfextension names }
-    \protected\def\pdfobj     {\pdfextension obj }
-    \let\pdfoutput            \outputmode
-\fi
-\EmFi@RequirePackage{ifpdf}[2007/09/09]
-\ifpdf
-\else
-  \EmFi@Error{%
-    Missing pdfTeX in PDF mode%
-  }{%
-    Currently other drivers are not supported. %
-    Package loading is aborted.%
-  }%
-  \expandafter\EmFi@AtEnd
-\fi%
-\EmFi@RequirePackage{pdftexcmds}[2007/11/11]
-\EmFi@RequirePackage{ltxcmds}[2010/03/01]
-\EmFi@RequirePackage{kvsetkeys}[2010/03/01]
-\EmFi@RequirePackage{kvdefinekeys}[2010/03/01]
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdf@filesize\endcsname\relax
-  \EmFi@Error{%
-    Unsupported pdfTeX version%
-  }{%
-    At least version 1.30 is necessary. Package loading is aborted.%
-  }%
-  \expandafter\EmFi@AtEnd
-\fi%
-\EmFi@RequirePackage{pdfescape}[2007/11/11]
-\def\EmFi@temp#1{%
-  \expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}%
-}
-\EmFi@temp{details}%
-\EmFi@temp{tile}%
-\EmFi@temp{hidden}%
-\EmFi@temp{text}
-\EmFi@temp{date}
-\EmFi@temp{number}
-\EmFi@temp{file}
-\EmFi@temp{desc}
-\EmFi@temp{afrelationship}
-\EmFi@temp{moddate}
-\EmFi@temp{creationdate}
-\EmFi@temp{size}
-\EmFi@temp{ascending}
-\EmFi@temp{descending}
-\EmFi@temp{true}
-\EmFi@temp{false}
-\ltx@newif\ifEmFi@collection
-\ltx@newif\ifEmFi@sort
-\ltx@newif\ifEmFi@visible
-\ltx@newif\ifEmFi@edit
-\ltx@newif\ifEmFi@item
-\ltx@newif\ifEmFi@finished
-\ltx@newif\ifEmFi@id
-\def\EmFi@GlobalKey#1#2{%
-  \global\expandafter\let\csname KV@#1@#2\expandafter\endcsname
-                         \csname KV@#1@#2\endcsname
-}
-\def\EmFi@GlobalDefaultKey#1#2{%
-  \EmFi@GlobalKey{#1}{#2}%
-  \global\expandafter\let
-      \csname KV@#1@#2@default\expandafter\endcsname
-      \csname KV@#1@#2@default\endcsname
-}
-\def\EmFi@DefineKey#1#2{%
-  \kv@define@key{EmFi}{#1}{%
-    \expandafter\def\csname EmFi@#1\endcsname{##1}%
-  }%
-  \expandafter\def\csname EmFi@#1\endcsname{#2}%
-}
-\EmFi@DefineKey{mimetype}{}
-\EmFi@DefineKey{filespec}{\EmFi@file}
-\EmFi@DefineKey{ucfilespec}{}
-\EmFi@DefineKey{filesystem}{}
-\EmFi@DefineKey{desc}{}
-\EmFi@DefineKey{afrelationship}{}
-\EmFi@DefineKey{stringmethod}{%
-  \ifx\pdfstringdef\@undefined
-    escape%
-  \else
-    \ifx\pdfstringdef\relax
-      escape%
-    \else
-      psd%
-    \fi
-  \fi
-}
-\kv@define@key{EmFi}{id}{%
-  \def\EmFi@id{#1}%
-  \EmFi@idtrue
-}
-\def\EmFi@defobj#1{%
-  \ifEmFi@id
-    \expandafter\xdef\csname EmFi@#1@\EmFi@id\endcsname{%
-      \the\pdflastobj\ltx@space 0 R%
-    }%
-  \fi
-}
-\def\embedfileifobjectexists#1#2{%
-  \expandafter\ifx\csname EmFi@#2@#1\endcsname\relax
-    \expandafter\ltx@secondoftwo
-  \else
-    \expandafter\ltx@firstoftwo
-  \fi
-}
-\def\embedfilegetobject#1#2{%
-  \embedfileifobjectexists{#1}{#2}{%
-    \csname EmFi@#2@#1\endcsname
-  }{%
-    0 0 R%
-  }%
-}
-\kv@define@key{EmFi}{view}[]{%
-  \EdefSanitize\EmFi@temp{#1}%
-  \def\EmFi@next{%
-    \global\EmFi@collectiontrue
-  }%
-  \ifx\EmFi@temp\ltx@empty
-    \let\EmFi@view\EmFi@S@details
-  \else\ifx\EmFi@temp\EmFi@S@details
-    \let\EmFi@view\EmFi@S@details
-  \else\ifx\EmFi@temp\EmFi@S@tile
-    \let\EmFi@view\EmFi@S@tile
-  \else\ifx\EmFi@temp\EmFi@S@hidden
-    \let\EmFi@view\EmFi@S@hidden
-  \else
-    \let\EmFi@next\relax
-    \EmFi@Error{%
-      Unknown value `\EmFi@temp' for key `view'.\MessageBreak
-      Supported values: `details', `tile', `hidden'.%
-    }\@ehc
-  \fi\fi\fi\fi
-  \EmFi@next
-}
-\EmFi@DefineKey{initialfile}{}
-\def\embedfilesetup{%
-  \ifEmFi@finished
-    \def\EmFi@next##1{}%
-    \EmFi@Error{%
-      \string\embedfilefield\ltx@space after \string\embedfilefinish
-    }{%
-      The list of embedded files is already written.%
-    }%
-  \else
-    \def\EmFi@next{%
-      \kvsetkeys{EmFi}%
-    }%
-  \fi
-  \EmFi@next
-}
-\def\EmFi@schema{}
-\gdef\EmFi@order{0}
-\let\EmFi@@order\relax
-\def\EmFi@fieldlist{}
-\def\EmFi@sortcase{0}%
-\def\embedfilefield#1#2{%
-  \ifEmFi@finished
-    \EmFi@Error{%
-      \string\embedfilefield\ltx@space after \string\embedfilefinish
-    }{%
-      The list of embedded files is already written.%
-    }%
-  \else
-    \global\EmFi@collectiontrue
-    \EdefSanitize\EmFi@key{#1}%
-    \expandafter\ifx\csname KV@EmFi@\EmFi@key.prefix\endcsname\relax
-      \begingroup
-        \count@=\EmFi@order
-        \advance\count@ 1 %
-        \xdef\EmFi@order{\the\count@}%
-        \let\EmFi@title\EmFi@key
-        \let\EmFi@type\EmFi@S@text
-        \EmFi@visibletrue
-        \EmFi@editfalse
-        \kvsetkeys{EmFiFi}{#2}%
-        \EmFi@convert\EmFi@title\EmFi@title
-        \xdef\EmFi@schema{%
-          \EmFi@schema
-          /\pdf@escapename{\EmFi@key}<<%
-            /Subtype/%
-            \ifx\EmFi@type\EmFi@S@date D%
-            \else\ifx\EmFi@type\EmFi@S@number N%
-            \else\ifx\EmFi@type\EmFi@S@file F%
-            \else\ifx\EmFi@type\EmFi@S@desc Desc%
-            \else\ifx\EmFi@type\EmFi@S@afrelationship AFRelationship%
-            \else\ifx\EmFi@type\EmFi@S@moddate ModDate%
-            \else\ifx\EmFi@type\EmFi@S@creationdate CreationDate%
-            \else\ifx\EmFi@type\EmFi@S@size Size%
-            \else S%
-            \fi\fi\fi\fi\fi\fi\fi
-            /N(\EmFi@title)%
-            \EmFi@@order{\EmFi@order}%
-            \ifEmFi@visible
-            \else
-              /V false%
-            \fi
-            \ifEmFi@edit
-              /E true%
-            \fi
-          >>%
-        }%
-        \let\do\relax
-        \xdef\EmFi@fieldlist{%
-          \EmFi@fieldlist
-          \do{\EmFi@key}%
-        }%
-        \ifx\EmFi@type\EmFi@S@text
-          \kv@define@key{EmFi}{\EmFi@key.value}{%
-            \EmFi@itemtrue
-            \def\EmFi@temp{##1}%
-            \EmFi@convert\EmFi@temp\EmFi@temp
-            \expandafter\def\csname EmFi@V@#1%
-            \expandafter\endcsname\expandafter{%
-              \expandafter(\EmFi@temp)%
-            }%
-          }%
-          \EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
-        \else\ifx\EmFi@type\EmFi@S@date
-          \kv@define@key{EmFi}{\EmFi@key.value}{%
-            \EmFi@itemtrue
-            \def\EmFi@temp{##1}%
-            \EmFi@convert\EmFi@temp\EmFi@temp
-            \expandafter\def\csname EmFi@V@#1%
-            \expandafter\endcsname\expandafter{%
-              \expandafter(\EmFi@temp)%
-            }%
-          }%
-          \EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
-        \else\ifx\EmFi@type\EmFi@S@number
-          \kv@define@key{EmFi}{\EmFi@key.value}{%
-            \EmFi@itemtrue
-            \expandafter\EdefSanitize\csname EmFi@V@#1\endcsname{ ##1}%
-          }%
-          \EmFi@GlobalKey{EmFi}{\EmFi@key.value}%
-        \fi\fi\fi
-        \kv@define@key{EmFi}{\EmFi@key.prefix}{%
-          \EmFi@itemtrue
-          \expandafter\def\csname EmFi@P@#1\endcsname{##1}%
-        }%
-        \EmFi@GlobalKey{EmFi}{\EmFi@key.prefix}%
-        \kv@define@key{EmFiSo}{\EmFi@key}[ascending]{%
-          \EdefSanitize\EmFi@temp{##1}%
-          \ifx\EmFi@temp\EmFi@S@ascending
-            \def\EmFi@temp{true}%
-          \else\ifx\EmFi@temp\EmFi@S@descending
-            \def\EmFi@temp{false}%
-          \else
-            \def\EmFi@temp{}%
-            \EmFi@Error{%
-              Unknown sort order `\EmFi@temp'.\MessageBreak
-              Supported values: `\EmFi@S@ascending', %
-              `\EmFi@S@descending
-            }\@ehc
-          \fi\fi
-          \ifx\EmFi@temp\ltx@empty
-          \else
-            \xdef\EmFi@sortkeys{%
-              \EmFi@sortkeys
-              /\pdf@escapename{#1}%
-            }%
-            \ifx\EmFi@sortorders\ltx@empty
-              \global\let\EmFi@sortorders\EmFi@temp
-              \gdef\EmFi@sortcase{1}%
-            \else
-              \xdef\EmFi@sortorders{%
-                \EmFi@sortorders
-                \ltx@space
-                \EmFi@temp
-              }%
-              \xdef\EmFi@sortcase{2}%
-            \fi
-          \fi
-        }%
-        \EmFi@GlobalDefaultKey{EmFiSo}\EmFi@key
-      \endgroup
-    \else
-      \EmFi@Error{%
-        Field `\EmFi@key' is already defined%
-      }\@ehc
-    \fi
-  \fi
-}
-\kv@define@key{EmFiFi}{type}{%
-  \EdefSanitize\EmFi@temp{#1}%
-  \ifx\EmFi@temp\EmFi@S@text
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@date
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@number
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@file
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@desc
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@afrelationship
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@moddate
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@creationdate
-    \let\EmFi@type\EmFi@temp
-  \else\ifx\EmFi@temp\EmFi@S@size
-    \let\EmFi@type\EmFi@temp
-  \else
-    \EmFi@Error{%
-      Unknown type `\EmFi@temp'.\MessageBreak
-      Supported types: `text', `date', `number', `file',\MessageBreak
-      `desc', `afrelationship', `moddate', `creationdate', `size'%
-    }%
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi
-}
-\kv@define@key{EmFiFi}{title}{%
-  \def\EmFi@title{#1}%
-}
-\def\EmFi@setboolean#1#2{%
-  \EdefSanitize\EmFi@temp{#2}%
-  \ifx\EmFi@temp\EmFi@S@true
-    \csname EmFi@#1true\endcsname
-  \else
-    \ifx\EmFi@temp\EmFi@S@false
-      \csname EmFi@#1false\endcsname
-    \else
-      \EmFi@Error{%
-        Unknown value `\EmFi@temp' for key `#1'.\MessageBreak
-        Supported values: `true', `false'%
-      }\@ehc
-    \fi
-  \fi
-}
-\kv@define@key{EmFiFi}{visible}[true]{%
-  \EmFi@setboolean{visible}{#1}%
-}
-\kv@define@key{EmFiFi}{edit}[true]{%
-  \EmFi@setboolean{edit}{#1}%
-}
-\def\EmFi@sortkeys{}
-\def\EmFi@sortorders{}
-\def\embedfilesort{%
-  \kvsetkeys{EmFiSo}%
-}
-\def\embedfile{%
-  \ltx@ifnextchar[\EmFi@embedfile{\EmFi@embedfile[]}%
-}
-\def\EmFi@embedfile[#1]#2{%
-  \ifEmFi@finished
-    \EmFi@Error{%
-      \string\embedfile\ltx@space after \string\embedfilefinish
-    }{%
-      The list of embedded files is already written.%
-    }%
-  \else
-    \begingroup
-      \def\EmFi@file{#2}%
-      \kvsetkeys{EmFi}{#1}%
-      \expandafter\expandafter\expandafter
-      \ifx\expandafter\expandafter\expandafter
-          \\\pdf@filesize{\EmFi@file}\\%
-        \EmFi@Error{%
-          File `\EmFi@file' not found%
-        }{%
-          The unknown file is not embedded.%
-        }%
-      \else
-        \edef\EmFi@@filespec{%
-          \pdf@escapestring{\EmFi@filespec}%
-        }%
-        \ifx\EmFi@ucfilespec\ltx@empty
-          \let\EmFi@@ucfilespec\ltx@empty
-        \else
-          \EmFi@convert\EmFi@ucfilespec\EmFi@@ucfilespec
-        \fi
-        \ifx\EmFi@desc\ltx@empty
-          \let\EmFi@@desc\ltx@empty
-        \else
-          \EmFi@convert\EmFi@desc\EmFi@@desc
-        \fi
-        \ifx\EmFi@afrelationship\ltx@empty
-          \let\EmFi@@afrelationship\ltx@empty
-        \else
-          \EmFi@convert\EmFi@afrelationship\EmFi@@afrelationship
-        \fi
-        \ifEmFi@item
-          \let\do\EmFi@do
-          \immediate\pdfobj{%
-            <<%
-              \EmFi@fieldlist
-            >>%
-          }%
-          \edef\EmFi@ci{\the\pdflastobj}%
-        \fi
-        \immediate\pdfobj stream attr{%
-          /Type/EmbeddedFile%
-          \ifx\EmFi@mimetype\ltx@empty
-          \else
-            /Subtype/\pdf@escapename{\EmFi@mimetype}%
-          \fi
-          /Params<<%
-            /ModDate(\pdf@filemoddate{\EmFi@file})%
-            /Size \pdf@filesize{\EmFi@file}%
-            /CheckSum<\pdf@filemdfivesum{\EmFi@file}>%
-          >>%
-        }file{\EmFi@file}\relax
-        \EmFi@defobj{EmbeddedFile}%
-        \immediate\pdfobj{%
-          <<%
-            /Type/Filespec%
-            \ifx\EmFi@filesystem\ltx@empty
-            \else
-            /FS/\pdf@escapename{\EmFi@filesystem}%
-            \fi
-            /F(\EmFi@@filespec)%
-            \ifx\EmFi@@ucfilespec\ltx@empty
-            \else
-              /UF(\EmFi@@ucfilespec)%
-            \fi
-            \ifx\EmFi@@desc\ltx@empty
-            \else
-              /Desc(\EmFi@@desc)%
-            \fi
-            \ifx\EmFi@@afrelationship\ltx@empty
-            \else
-              /AFRelationship\EmFi@@afrelationship%
-            \fi
-            /EF<<%
-              /F \the\pdflastobj\ltx@space 0 R%
-            >>%
-            \ifEmFi@item
-              /CI \EmFi@ci\ltx@space 0 R%
-            \fi
-          >>%
-        }%
-        \EmFi@defobj{Filespec}%
-        \EmFi@add{%
-          \EmFi@@filespec
-        }{\the\pdflastobj\ltx@space 0 R}%
-      \fi
-    \endgroup
-  \fi
-}
-\def\EmFi@do#1{%
-  \expandafter\ifx\csname EmFi@P@#1\endcsname\relax
-    \expandafter\ifx\csname EmFi@V@#1\endcsname\relax
-    \else
-      /\pdf@escapename{#1}\csname EmFi@V@#1\endcsname
-    \fi
-  \else
-    /\pdf@escapename{#1}<<%
-      \expandafter\ifx\csname EmFi@V@#1\endcsname\relax
-      \else
-        /D\csname EmFi@V@#1\endcsname
-      \fi
-      /P(\csname EmFi@P@#1\endcsname)%
-    >>%
-  \fi
-}
-\def\EmFi@convert#1#2{%
-  \ifnum\pdf@strcmp{\EmFi@stringmethod}{psd}=0 %
-    \pdfstringdef\EmFi@temp{#1}%
-    \let#2\EmFi@temp
-  \else
-    \edef#2{\pdf@escapestring{#1}}%
-  \fi
-}
-\global\let\EmFi@list\ltx@empty
-\def\EmFi@add#1#2{%
-  \begingroup
-    \ifx\EmFi@list\ltx@empty
-      \xdef\EmFi@list{\noexpand\do{#1}{#2}}%
-    \else
-      \def\do##1##2{%
-        \ifnum\pdf@strcmp{##1}{#1}>0 %
-          \edef\x{%
-            \toks@{%
-              \the\toks@%
-              \noexpand\do{#1}{#2}%
-              \noexpand\do{##1}{##2}%
-            }%
-          }%
-          \x
-          \def\do####1####2{%
-            \toks@\expandafter{\the\toks@\do{####1}{####2}}%
-          }%
-          \def\stop{%
-            \xdef\EmFi@list{\the\toks@}%
-          }%
-        \else
-          \toks@\expandafter{\the\toks@\do{##1}{##2}}%
-        \fi
-      }%
-      \def\stop{%
-        \xdef\EmFi@list{\the\toks@\noexpand\do{#1}{#2}}%
-      }%
-      \toks@{}%
-      \EmFi@list\stop
-    \fi
-  \endgroup
-}
-\def\embedfilefinish{%
-  \ifEmFi@finished
-    \EmFi@Error{%
-      Too many invocations of \string\embedfilefinish
-    }{%
-      The list of embedded files is already written.%
-    }%
-  \else
-    \ifx\EmFi@list\ltx@empty
-    \else
-      \global\EmFi@finishedtrue
-      \begingroup
-        \def\do##1##2{%
-          (##1)##2%
-        }%
-        \immediate\pdfobj{%
-          <<%
-            /Names[\EmFi@list]%
-          >>%
-        }%
-        \pdfnames{%
-          /EmbeddedFiles \the\pdflastobj\ltx@space 0 R%
-        }%
-      \endgroup
-      \begingroup
-        \def\do##1##2{%
-          \ltx@space##2%
-        }%
-        \immediate\pdfobj{%
-          [\EmFi@list]%
-        }%
-        \pdfcatalog{%
-          /AF \the\pdflastobj\ltx@space 0 R%
-        }%
-      \endgroup
-      \ifx\EmFi@initialfile\ltx@empty
-      \else
-        \EmFi@collectiontrue
-      \fi
-      \ifEmFi@collection
-        \ifx\EmFi@initialfile\ltx@empty
-          \let\EmFi@@initialfile\ltx@empty
-        \else
-          \edef\EmFi@@initialfile{%
-            \pdf@escapestring{\EmFi@initialfile}%
-          }%
-        \fi
-        \begingroup
-          \let\f=N%
-          \def\do##1##2{%
-            \def\x{##1}%
-            \ifx\x\EmFi@@initialfile
-              \let\f=Y%
-              \let\do\ltx@gobbletwo
-            \fi
-          }%
-          \EmFi@list
-        \expandafter\endgroup
-        \ifx\f Y%
-        \else
-          \@PackageWarningNoLine{embedfile}{%
-            Missing initial file `\EmFi@initialfile'\MessageBreak
-            among the embedded files%
-          }%
-          \let\EmFi@initialfile\ltx@empty
-          \let\EmFi@@initialfile\ltx@empty
-        \fi
-        \ifcase\EmFi@sortcase
-          \def\EmFi@temp{}%
-        \or
-          \def\EmFi@temp{%
-            /S\EmFi@sortkeys
-            /A \EmFi@sortorders
-          }%
-        \else
-          \def\EmFi@temp{%
-            /S[\EmFi@sortkeys]%
-            /A[\EmFi@sortorders]%
-          }%
-        \fi
-        \def\EmFi@@order##1{%
-          \ifnum\EmFi@order>1 %
-            /O ##1%
-          \fi
-        }%
-        \immediate\pdfobj{%
-          <<%
-            \ifx\EmFi@schema\ltx@empty
-            \else
-              /Schema<<\EmFi@schema>>%
-            \fi
-            \ifx\EmFi@@initialfile\ltx@empty
-            \else
-              /D(\EmFi@@initialfile)%
-            \fi
-            \ifx\EmFi@view\EmFi@S@tile
-              /View/T%
-            \else\ifx\EmFi@view\EmFi@S@hidden
-              /View/H%
-            \fi\fi
-            \ifx\EmFi@temp\ltx@empty
-              \EmFi@temp
-            \else
-              /Sort<<\EmFi@temp>>%
-            \fi
-          >>%
-        }%
-        \pdfcatalog{%
-          /Collection \the\pdflastobj\ltx@space0 R%
-        }%
-      \fi
-    \fi
-  \fi
-}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname AtEndDocument\endcsname\relax
-\else
-  \AtEndDocument{\embedfilefinish}%
-\fi
-\EmFi@AtEnd%
-\endinput
-%%
-%% End of file `embedfile.sty'.